From 548ea7b21c772587e8428d6f57dc506be64a78e7 Mon Sep 17 00:00:00 2001
From: rani-webkul <rani.priya4392webkul.com>
Date: Thu, 1 Aug 2019 14:50:13 +0530
Subject: [PATCH 0001/1718] fixed disabled guest checkout issue in case of
 downloadable product #23971

---
 .../Observer/IsAllowedGuestCheckoutObserver.php          | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php b/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
index 7f77c8b5f10bf..199b903611993 100644
--- a/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
+++ b/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
@@ -15,6 +15,11 @@ class IsAllowedGuestCheckoutObserver implements ObserverInterface
      */
     const XML_PATH_DISABLE_GUEST_CHECKOUT = 'catalog/downloadable/disable_guest_checkout';
 
+    /**
+     *  Xml path to get downloadable Shareable setting
+     */
+    const XML_PATH_DOWNLOADABLE_SHAREABLE = 'catalog/downloadable/shareable';
+
     /**
      * Core store config
      *
@@ -46,6 +51,10 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             self::XML_PATH_DISABLE_GUEST_CHECKOUT,
             ScopeInterface::SCOPE_STORE,
             $store
+        ) && $this->_scopeConfig->isSetFlag(
+            self::XML_PATH_DOWNLOADABLE_SHAREABLE,
+            ScopeInterface::SCOPE_STORE,
+            $store
         )) {
             return $this;
         }

From 1cf138978ca83bb9ba313ac0c4f59b5f132b2151 Mon Sep 17 00:00:00 2001
From: rani-webkul <rani.priya4392webkul.com>
Date: Wed, 14 Aug 2019 10:13:18 +0530
Subject: [PATCH 0002/1718] fixed disabled guest checkout issue in case of
 downloadable product #23971

---
 .../IsAllowedGuestCheckoutObserverTest.php     | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php b/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
index 89eb29e0f398a..b2f579cee8c88 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
@@ -144,6 +144,15 @@ public function testIsAllowedGuestCheckoutConfigSetToTrue($productType, $isAllow
                 $this->storeMock
             )
             ->willReturn(true);
+        
+        $this->scopeConfig->expects($this->once())
+            ->method('isSetFlag')
+            ->with(
+                IsAllowedGuestCheckoutObserver::XML_PATH_DOWNLOADABLE_SHAREABLE,
+                ScopeInterface::SCOPE_STORE,
+                $this->storeMock
+            )
+            ->willReturn(false);
 
         $this->observerMock->expects($this->exactly(3))
             ->method('getEvent')
@@ -185,6 +194,15 @@ public function testIsAllowedGuestCheckoutConfigSetToFalse()
             )
             ->willReturn(false);
 
+        $this->scopeConfig->expects($this->once())
+            ->method('isSetFlag')
+            ->with(
+                IsAllowedGuestCheckoutObserver::XML_PATH_DOWNLOADABLE_SHAREABLE,
+                ScopeInterface::SCOPE_STORE,
+                $this->storeMock
+            )
+            ->willReturn(true);
+
         $this->observerMock->expects($this->exactly(2))
             ->method('getEvent')
             ->will($this->returnValue($this->eventMock));

From a1dd986c3830ef082d84ef0b9ad75fb68c683022 Mon Sep 17 00:00:00 2001
From: rani-webkul <rani.priya4392webkul.com>
Date: Wed, 14 Aug 2019 13:14:27 +0530
Subject: [PATCH 0003/1718] fixed disabled guest checkout issue in case of
 downloadable product #23971

---
 .../Observer/IsAllowedGuestCheckoutObserver.php     |  3 ++-
 .../Observer/IsAllowedGuestCheckoutObserverTest.php | 13 ++-----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php b/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
index 199b903611993..6b76a86e131f5 100644
--- a/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
+++ b/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
@@ -55,7 +55,8 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             self::XML_PATH_DOWNLOADABLE_SHAREABLE,
             ScopeInterface::SCOPE_STORE,
             $store
-        )) {
+        )
+        ) {
             return $this;
         }
 
diff --git a/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php b/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
index b2f579cee8c88..7501e40083173 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
@@ -144,15 +144,6 @@ public function testIsAllowedGuestCheckoutConfigSetToTrue($productType, $isAllow
                 $this->storeMock
             )
             ->willReturn(true);
-        
-        $this->scopeConfig->expects($this->once())
-            ->method('isSetFlag')
-            ->with(
-                IsAllowedGuestCheckoutObserver::XML_PATH_DOWNLOADABLE_SHAREABLE,
-                ScopeInterface::SCOPE_STORE,
-                $this->storeMock
-            )
-            ->willReturn(false);
 
         $this->observerMock->expects($this->exactly(3))
             ->method('getEvent')
@@ -185,7 +176,7 @@ public function testIsAllowedGuestCheckoutConfigSetToFalse()
             ->method('getResult')
             ->will($this->returnValue($this->resultMock));
 
-        $this->scopeConfig->expects($this->once())
+        $this->scopeConfig->expects($this->at(0))
             ->method('isSetFlag')
             ->with(
                 IsAllowedGuestCheckoutObserver::XML_PATH_DISABLE_GUEST_CHECKOUT,
@@ -194,7 +185,7 @@ public function testIsAllowedGuestCheckoutConfigSetToFalse()
             )
             ->willReturn(false);
 
-        $this->scopeConfig->expects($this->once())
+        $this->scopeConfig->expects($this->at(1))
             ->method('isSetFlag')
             ->with(
                 IsAllowedGuestCheckoutObserver::XML_PATH_DOWNLOADABLE_SHAREABLE,

From c3e1ce024a233131764970d8ba31ca5b00fcce15 Mon Sep 17 00:00:00 2001
From: rani-webkul <rani.priya4392webkul.com>
Date: Wed, 14 Aug 2019 15:11:00 +0530
Subject: [PATCH 0004/1718] fixed disabled guest checkout issue in case of
 downloadable product #23971

---
 .../Downloadable/Observer/IsAllowedGuestCheckoutObserver.php | 3 +++
 .../Downloadable/Test/Mftf/Data/CatalogConfigData.xml        | 5 +++++
 .../Test/LinkDownloadableProductFromGuestToCustomerTest.xml  | 1 +
 3 files changed, 9 insertions(+)

diff --git a/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php b/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
index 6b76a86e131f5..041165a3d2202 100644
--- a/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
+++ b/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
@@ -8,6 +8,9 @@
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Store\Model\ScopeInterface;
 
+/**
+ * Check is allowed guest checkout for downloadable items.
+ */
 class IsAllowedGuestCheckoutObserver implements ObserverInterface
 {
     /**
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Data/CatalogConfigData.xml b/app/code/Magento/Downloadable/Test/Mftf/Data/CatalogConfigData.xml
index 8bb81f9c7579d..d8fb9a0497332 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Data/CatalogConfigData.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Data/CatalogConfigData.xml
@@ -18,4 +18,9 @@
         <data key="scope_id">0</data>
         <data key="value">1</data>
     </entity>
+    <entity name="EnableShareableDownloadableItems">
+        <data key="path">catalog/downloadable/shareable</data>
+        <data key="scope_id">0</data>
+        <data key="value">1</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/LinkDownloadableProductFromGuestToCustomerTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/LinkDownloadableProductFromGuestToCustomerTest.xml
index b960d15b2fdf1..6275884d17bf0 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/LinkDownloadableProductFromGuestToCustomerTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/LinkDownloadableProductFromGuestToCustomerTest.xml
@@ -19,6 +19,7 @@
         </annotations>
         <before>
             <magentoCLI command="config:set {{EnableGuestCheckoutWithDownloadableItems.path}} {{EnableGuestCheckoutWithDownloadableItems.value}}" stepKey="enableGuestCheckoutWithDownloadableItems" />
+            <magentoCLI command="config:set {{EnableShareableDownloadableItems.path}} {{EnableShareableDownloadableItems.value}}" stepKey="enableShareableDownloadableItems" />
             <createData entity="_defaultCategory" stepKey="createCategory"/>
             <createData entity="DownloadableProductWithOneLink" stepKey="createProduct">
                 <requiredEntity createDataKey="createCategory"/>

From caf9ef781155b4e26ab0d2ad7f7c21550376b35e Mon Sep 17 00:00:00 2001
From: Rani Priya <rani.priya439@webkul.com>
Date: Wed, 4 Sep 2019 09:40:19 +0530
Subject: [PATCH 0005/1718] made const as private

---
 .../Downloadable/Observer/IsAllowedGuestCheckoutObserver.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php b/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
index 041165a3d2202..a77db638031e7 100644
--- a/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
+++ b/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
@@ -16,12 +16,12 @@ class IsAllowedGuestCheckoutObserver implements ObserverInterface
     /**
      *  Xml path to disable checkout
      */
-    const XML_PATH_DISABLE_GUEST_CHECKOUT = 'catalog/downloadable/disable_guest_checkout';
+    private const XML_PATH_DISABLE_GUEST_CHECKOUT = 'catalog/downloadable/disable_guest_checkout';
 
     /**
      *  Xml path to get downloadable Shareable setting
      */
-    const XML_PATH_DOWNLOADABLE_SHAREABLE = 'catalog/downloadable/shareable';
+    private const XML_PATH_DOWNLOADABLE_SHAREABLE = 'catalog/downloadable/shareable';
 
     /**
      * Core store config

From 98dd6c0298041f35831616f0252996e865d3643d Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@adobe.com>
Date: Thu, 5 Sep 2019 11:39:24 -0500
Subject: [PATCH 0006/1718] Revert const visibility modifier

---
 .../Downloadable/Observer/IsAllowedGuestCheckoutObserver.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php b/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
index a77db638031e7..41479bd148ff1 100644
--- a/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
+++ b/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
@@ -16,7 +16,7 @@ class IsAllowedGuestCheckoutObserver implements ObserverInterface
     /**
      *  Xml path to disable checkout
      */
-    private const XML_PATH_DISABLE_GUEST_CHECKOUT = 'catalog/downloadable/disable_guest_checkout';
+    const XML_PATH_DISABLE_GUEST_CHECKOUT = 'catalog/downloadable/disable_guest_checkout';
 
     /**
      *  Xml path to get downloadable Shareable setting

From 9f37b2f3a283735257b8d3ff6df8132b1e7b68d8 Mon Sep 17 00:00:00 2001
From: Rani Priya <rani.priya439@webkul.com>
Date: Tue, 10 Sep 2019 16:10:30 +0530
Subject: [PATCH 0007/1718] item wise check added for shareable links

---
 .../IsAllowedGuestCheckoutObserver.php        | 69 +++++++++++++------
 1 file changed, 48 insertions(+), 21 deletions(-)

diff --git a/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php b/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
index 41479bd148ff1..60ebd4f032281 100644
--- a/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
+++ b/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
@@ -8,9 +8,6 @@
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Store\Model\ScopeInterface;
 
-/**
- * Check is allowed guest checkout for downloadable items.
- */
 class IsAllowedGuestCheckoutObserver implements ObserverInterface
 {
     /**
@@ -21,7 +18,7 @@ class IsAllowedGuestCheckoutObserver implements ObserverInterface
     /**
      *  Xml path to get downloadable Shareable setting
      */
-    private const XML_PATH_DOWNLOADABLE_SHAREABLE = 'catalog/downloadable/shareable';
+    const XML_PATH_DOWNLOADABLE_SHAREABLE = 'catalog/downloadable/shareable';
 
     /**
      * Core store config
@@ -30,13 +27,22 @@ class IsAllowedGuestCheckoutObserver implements ObserverInterface
      */
     protected $_scopeConfig;
 
+    /**
+     * Downloadable link collection factory
+     *
+     * @var \Magento\Downloadable\Model\ResourceModel\Link\CollectionFactory
+     */
+    protected $_linksFactory;
+
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      */
     public function __construct(
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+        \Magento\Downloadable\Model\ResourceModel\Link\CollectionFactory $linksFactory
     ) {
         $this->_scopeConfig = $scopeConfig;
+        $this->_linksFactory = $linksFactory;
     }
 
     /**
@@ -50,19 +56,6 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         $store = $observer->getEvent()->getStore();
         $result = $observer->getEvent()->getResult();
 
-        if (!$this->_scopeConfig->isSetFlag(
-            self::XML_PATH_DISABLE_GUEST_CHECKOUT,
-            ScopeInterface::SCOPE_STORE,
-            $store
-        ) && $this->_scopeConfig->isSetFlag(
-            self::XML_PATH_DOWNLOADABLE_SHAREABLE,
-            ScopeInterface::SCOPE_STORE,
-            $store
-        )
-        ) {
-            return $this;
-        }
-
         /* @var $quote \Magento\Quote\Model\Quote */
         $quote = $observer->getEvent()->getQuote();
 
@@ -70,11 +63,45 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             if (($product = $item->getProduct())
                 && $product->getTypeId() == \Magento\Downloadable\Model\Product\Type::TYPE_DOWNLOADABLE
             ) {
-                $result->setIsAllowed(false);
-                break;
+                if ($this->_scopeConfig->isSetFlag(
+                    self::XML_PATH_DISABLE_GUEST_CHECKOUT,
+                    ScopeInterface::SCOPE_STORE,
+                    $store
+                ) || !$this->checkForShareableLinks($item)) {
+                    $result->setIsAllowed(false);
+                    break;
+                }
             }
         }
-
         return $this;
     }
+
+    /**
+     * Check for shareable link
+     *
+     * @param \Magento\Quote\Api\Data\CartItemInterface $item
+     * @return boolean
+     */
+    private function checkForShareableLinks($item)
+    {
+        $isSharable = true;
+        $option = $item->getOptionByCode('downloadable_link_ids');
+        if (!empty($option)) {
+            $downloadableLinkIds = explode(',', $option->getValue());
+            $links = $this->linksFactory->create()->addFieldToFilter("link_id", ["in" => $downloadableLinkIds]);
+            foreach ($links as $link) {
+                if (!$link->getIsShareable() ||
+                    ($link->getIsShareable() == 2 && !$this->_scopeConfig->isSetFlag(
+                        self::XML_PATH_DOWNLOADABLE_SHAREABLE,
+                        ScopeInterface::SCOPE_STORE,
+                        $store
+                    )
+                    )
+                ) {
+                    $isSharable = false;
+                }
+            }
+        }
+        return $isSharable;
+    }
 }

From 993a1e5b31a939f21b7d9579dceb769eb7c33a58 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Tue, 8 Oct 2019 15:38:26 +0300
Subject: [PATCH 0008/1718] magento/magento2#23972: Refactoring, static and
 unit tests fix.

---
 .../IsAllowedGuestCheckoutObserver.php        | 64 ++++++++++++-------
 .../IsAllowedGuestCheckoutObserverTest.php    | 57 ++++++++++++-----
 2 files changed, 81 insertions(+), 40 deletions(-)

diff --git a/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php b/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
index 60ebd4f032281..6b794f8a3116a 100644
--- a/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
+++ b/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
@@ -3,86 +3,100 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Downloadable\Observer;
 
+use Magento\Downloadable\Model\Product\Type;
+use Magento\Downloadable\Model\ResourceModel\Link\CollectionFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Quote\Api\Data\CartItemInterface;
+use Magento\Quote\Model\Quote;
 use Magento\Store\Model\ScopeInterface;
 
+/**
+ * Checks if guest checkout is allowed then quote contains downloadable products.
+ */
 class IsAllowedGuestCheckoutObserver implements ObserverInterface
 {
     /**
      *  Xml path to disable checkout
      */
-    const XML_PATH_DISABLE_GUEST_CHECKOUT = 'catalog/downloadable/disable_guest_checkout';
+    private const XML_PATH_DISABLE_GUEST_CHECKOUT = 'catalog/downloadable/disable_guest_checkout';
 
     /**
      *  Xml path to get downloadable Shareable setting
      */
-    const XML_PATH_DOWNLOADABLE_SHAREABLE = 'catalog/downloadable/shareable';
+    private const XML_PATH_DOWNLOADABLE_SHAREABLE = 'catalog/downloadable/shareable';
 
     /**
      * Core store config
      *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     * @var ScopeConfigInterface
      */
-    protected $_scopeConfig;
+    private $scopeConfig;
 
     /**
      * Downloadable link collection factory
      *
-     * @var \Magento\Downloadable\Model\ResourceModel\Link\CollectionFactory
+     * @var CollectionFactory
      */
-    protected $_linksFactory;
+    private $linksFactory;
 
     /**
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param ScopeConfigInterface $scopeConfig
+     * @param CollectionFactory $linksFactory
      */
     public function __construct(
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Downloadable\Model\ResourceModel\Link\CollectionFactory $linksFactory
+        ScopeConfigInterface $scopeConfig,
+        CollectionFactory $linksFactory
     ) {
-        $this->_scopeConfig = $scopeConfig;
-        $this->_linksFactory = $linksFactory;
+        $this->scopeConfig = $scopeConfig;
+        $this->linksFactory = $linksFactory;
     }
 
     /**
      * Check is allowed guest checkout if quote contain downloadable product(s)
      *
-     * @param \Magento\Framework\Event\Observer $observer
+     * @param Observer $observer
      * @return $this
      */
-    public function execute(\Magento\Framework\Event\Observer $observer)
+    public function execute(Observer $observer)
     {
         $store = $observer->getEvent()->getStore();
         $result = $observer->getEvent()->getResult();
 
-        /* @var $quote \Magento\Quote\Model\Quote */
+        /* @var $quote Quote */
         $quote = $observer->getEvent()->getQuote();
 
         foreach ($quote->getAllItems() as $item) {
             if (($product = $item->getProduct())
-                && $product->getTypeId() == \Magento\Downloadable\Model\Product\Type::TYPE_DOWNLOADABLE
+                && $product->getTypeId() == Type::TYPE_DOWNLOADABLE
             ) {
-                if ($this->_scopeConfig->isSetFlag(
+                if ($this->scopeConfig->isSetFlag(
                     self::XML_PATH_DISABLE_GUEST_CHECKOUT,
                     ScopeInterface::SCOPE_STORE,
                     $store
-                ) || !$this->checkForShareableLinks($item)) {
+                )
+                    || !$this->checkForShareableLinks($item, $store)) {
                     $result->setIsAllowed(false);
                     break;
                 }
             }
         }
+
         return $this;
     }
 
     /**
      * Check for shareable link
      *
-     * @param \Magento\Quote\Api\Data\CartItemInterface $item
+     * @param CartItemInterface $item
+     * @param int $store
      * @return boolean
      */
-    private function checkForShareableLinks($item)
+    private function checkForShareableLinks(CartItemInterface $item, int $store): bool
     {
         $isSharable = true;
         $option = $item->getOptionByCode('downloadable_link_ids');
@@ -91,17 +105,19 @@ private function checkForShareableLinks($item)
             $links = $this->linksFactory->create()->addFieldToFilter("link_id", ["in" => $downloadableLinkIds]);
             foreach ($links as $link) {
                 if (!$link->getIsShareable() ||
-                    ($link->getIsShareable() == 2 && !$this->_scopeConfig->isSetFlag(
-                        self::XML_PATH_DOWNLOADABLE_SHAREABLE,
-                        ScopeInterface::SCOPE_STORE,
-                        $store
-                    )
+                    (
+                        $link->getIsShareable() == 2 && !$this->scopeConfig->isSetFlag(
+                            self::XML_PATH_DOWNLOADABLE_SHAREABLE,
+                            ScopeInterface::SCOPE_STORE,
+                            $store
+                        )
                     )
                 ) {
                     $isSharable = false;
                 }
             }
         }
+
         return $isSharable;
     }
 }
diff --git a/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php b/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
index 7501e40083173..69537d6a1f6ac 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Downloadable\Test\Unit\Observer;
 
 use Magento\Downloadable\Observer\IsAllowedGuestCheckoutObserver;
@@ -136,10 +137,10 @@ public function testIsAllowedGuestCheckoutConfigSetToTrue($productType, $isAllow
             ->method('getQuote')
             ->will($this->returnValue($quote));
 
-        $this->scopeConfig->expects($this->once())
+        $this->scopeConfig->expects($this->any())
             ->method('isSetFlag')
             ->with(
-                IsAllowedGuestCheckoutObserver::XML_PATH_DISABLE_GUEST_CHECKOUT,
+                'catalog/downloadable/disable_guest_checkout',
                 ScopeInterface::SCOPE_STORE,
                 $this->storeMock
             )
@@ -168,33 +169,57 @@ public function dataProviderForTestisAllowedGuestCheckoutConfigSetToTrue()
 
     public function testIsAllowedGuestCheckoutConfigSetToFalse()
     {
+        $storeCode = 1;
+
+        $product = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getTypeId'])
+            ->getMock();
+
+        $product->expects($this->once())
+            ->method('getTypeId')
+            ->willReturn(Type::TYPE_DOWNLOADABLE);
+
+        $item = $this->getMockBuilder(\Magento\Quote\Model\Quote\Item::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getProduct'])
+            ->getMock();
+
+        $item->expects($this->once())
+            ->method('getProduct')
+            ->willReturn($product);
+
+        $quote = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getAllItems'])
+            ->getMock();
+
+        $quote->expects($this->once())
+            ->method('getAllItems')
+            ->willReturn([$item]);
+
         $this->eventMock->expects($this->once())
             ->method('getStore')
-            ->will($this->returnValue($this->storeMock));
+            ->willReturn($storeCode);
 
         $this->eventMock->expects($this->once())
             ->method('getResult')
             ->will($this->returnValue($this->resultMock));
 
-        $this->scopeConfig->expects($this->at(0))
-            ->method('isSetFlag')
-            ->with(
-                IsAllowedGuestCheckoutObserver::XML_PATH_DISABLE_GUEST_CHECKOUT,
-                ScopeInterface::SCOPE_STORE,
-                $this->storeMock
-            )
-            ->willReturn(false);
+        $this->eventMock->expects($this->once())
+            ->method('getQuote')
+            ->will($this->returnValue($quote));
 
-        $this->scopeConfig->expects($this->at(1))
+        $this->scopeConfig->expects($this->once())
             ->method('isSetFlag')
             ->with(
-                IsAllowedGuestCheckoutObserver::XML_PATH_DOWNLOADABLE_SHAREABLE,
+                'catalog/downloadable/disable_guest_checkout',
                 ScopeInterface::SCOPE_STORE,
-                $this->storeMock
+                $storeCode
             )
-            ->willReturn(true);
+            ->willReturn(false);
 
-        $this->observerMock->expects($this->exactly(2))
+        $this->observerMock->expects($this->exactly(3))
             ->method('getEvent')
             ->will($this->returnValue($this->eventMock));
 

From 575d9e5f1c4699d5aafe18d3b832a993bf4545e5 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Fri, 18 Oct 2019 14:20:01 +0300
Subject: [PATCH 0009/1718] magento/magento2#23972: MFTF test fix.

---
 .../Magento/Downloadable/Test/Mftf/Data/LinkData.xml  | 11 +++++++++++
 ...LinkDownloadableProductFromGuestToCustomerTest.xml |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Downloadable/Test/Mftf/Data/LinkData.xml b/app/code/Magento/Downloadable/Test/Mftf/Data/LinkData.xml
index 08f1c2349357d..8df9685d03a95 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Data/LinkData.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Data/LinkData.xml
@@ -31,6 +31,17 @@
         <data key="file">magento-logo.png</data>
         <data key="sample">https://static.magento.com/sites/all/themes/mag_redesign/images/magento-logo.svg</data>
     </entity>
+    <entity name="downloadableLinkSharable" type="downloadable_link">
+        <data key="title" unique="suffix">link-1</data>
+        <data key="price">2.43</data>
+        <data key="number_of_downloads">2</data>
+        <data key="sample_type">url</data>
+        <data key="sample_url">http://example.com</data>
+        <data key="link_type">url</data>
+        <data key="link_url">http://example.com</data>
+        <data key="is_shareable">1</data>
+        <data key="sort_order">1</data>
+    </entity>
     <entity name="downloadableLink1" type="downloadable_link">
         <data key="title" unique="suffix">link-1</data>
         <data key="price">2.43</data>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/LinkDownloadableProductFromGuestToCustomerTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/LinkDownloadableProductFromGuestToCustomerTest.xml
index 6275884d17bf0..522df430576de 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/LinkDownloadableProductFromGuestToCustomerTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/LinkDownloadableProductFromGuestToCustomerTest.xml
@@ -24,7 +24,7 @@
             <createData entity="DownloadableProductWithOneLink" stepKey="createProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
-            <createData entity="downloadableLink1" stepKey="addDownloadableLink">
+            <createData entity="downloadableLinkSharable" stepKey="addDownloadableLink">
                 <requiredEntity createDataKey="createProduct"/>
             </createData>
         </before>

From 4ac223bb23fce658e1e14b01e3f75bfb44b1e0fb Mon Sep 17 00:00:00 2001
From: "vishalverma.magento279" <vishalverma.magento279@webkul.com>
Date: Wed, 23 Oct 2019 19:02:42 +0530
Subject: [PATCH 0010/1718] #25192 fixed

---
 app/code/Magento/Dhl/Model/Carrier.php | 1 +
 app/code/Magento/Dhl/etc/config.xml    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
index 5959294fe6dc7..ee2ef84db1f8e 100644
--- a/app/code/Magento/Dhl/Model/Carrier.php
+++ b/app/code/Magento/Dhl/Model/Carrier.php
@@ -675,6 +675,7 @@ public function getDhlProducts($doc)
             'H' => __('Economy select'),
             'J' => __('Jumbo box'),
             'M' => __('Express 10:30'),
+            'N' => __('Domestic express'),
             'V' => __('Europack'),
             'Y' => __('Express 12:00'),
         ];
diff --git a/app/code/Magento/Dhl/etc/config.xml b/app/code/Magento/Dhl/etc/config.xml
index b46152fb0ecad..ea47e4de90f05 100644
--- a/app/code/Magento/Dhl/etc/config.xml
+++ b/app/code/Magento/Dhl/etc/config.xml
@@ -21,7 +21,7 @@
                 <active>0</active>
                 <title>DHL</title>
                 <sallowspecific>0</sallowspecific>
-                <nondoc_methods>1,3,4,8,P,Q,E,F,H,J,M,V,Y</nondoc_methods>
+                <nondoc_methods>1,3,4,8,P,Q,E,F,H,J,M,N,V,Y</nondoc_methods>
                 <doc_methods>2,5,6,7,9,B,C,D,U,K,L,G,W,I,N,O,R,S,T,X</doc_methods>
                 <free_method>G</free_method>
                 <gateway_url>https://xmlpi-ea.dhl.com/XMLShippingServlet</gateway_url>

From a220df1e08597bd04e97f531e654d11937725796 Mon Sep 17 00:00:00 2001
From: "vishalverma.magento279" <vishalverma.magento279@webkul.com>
Date: Wed, 23 Oct 2019 19:38:49 +0530
Subject: [PATCH 0011/1718] testcase update

---
 app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php b/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
index d1b35c8e2b77f..e9400e65bc405 100644
--- a/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
+++ b/app/code/Magento/Dhl/Test/Unit/Model/CarrierTest.php
@@ -332,6 +332,7 @@ public function dhlProductsDataProvider(): array
                     'H' => 'Economy select',
                     'J' => 'Jumbo box',
                     'M' => 'Express 10:30',
+                    'N' => 'Domestic express',
                     'V' => 'Europack',
                     'Y' => 'Express 12:00',
                 ],

From 354b9cc8972bf9e256a2b96c01941e59d68be30d Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Mon, 11 Nov 2019 11:24:41 -0600
Subject: [PATCH 0012/1718] MC-25175: Incorrect/Missed edits on
 templates/email-templates

- Ported changes to 2.4-develop
---
 app/code/Magento/Directory/Block/Data.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Directory/Block/Data.php b/app/code/Magento/Directory/Block/Data.php
index 66c962d6656a6..5d94eacf9de96 100644
--- a/app/code/Magento/Directory/Block/Data.php
+++ b/app/code/Magento/Directory/Block/Data.php
@@ -142,7 +142,7 @@ public function getCountryHtmlSelect($defValue = null, $name = 'country_id', $id
         )->setId(
             $id
         )->setTitle(
-            __($title)
+            $this->escapeHtmlAttr(__($title))
         )->setValue(
             $defValue
         )->setOptions(

From 8c1168446f01c376b9a226b96ed64366143dabb8 Mon Sep 17 00:00:00 2001
From: Sachin Admane <sadmane@magento.com>
Date: Sun, 8 Dec 2019 14:22:32 -0600
Subject: [PATCH 0013/1718] MC-22963: Identify and Refactor GET requests which
 modify data.

Refactor Search and Multishipping modules.
Add integration for admin synonyms delete action.
---
 .../Multishipping/Controller/Checkout/RemoveItem.php   |  9 ++++++++-
 .../view/frontend/templates/checkout/addresses.phtml   |  6 +++++-
 .../Search/Controller/Adminhtml/Synonyms/Delete.php    |  4 +++-
 .../Ui/Component/Listing/Column/SynonymActions.php     |  4 +++-
 .../Controller/Adminhtml/Synonyms/DeleteTest.php       | 10 ++++++++++
 .../testsuite/Magento/Search/_files/synonym_group.php  |  1 +
 6 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Search/Controller/Adminhtml/Synonyms/DeleteTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Search/_files/synonym_group.php

diff --git a/app/code/Magento/Multishipping/Controller/Checkout/RemoveItem.php b/app/code/Magento/Multishipping/Controller/Checkout/RemoveItem.php
index 1bb333faaf2e4..d6d8ec9de0d58 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/RemoveItem.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/RemoveItem.php
@@ -6,7 +6,14 @@
  */
 namespace Magento\Multishipping\Controller\Checkout;
 
-class RemoveItem extends \Magento\Multishipping\Controller\Checkout
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
+/**
+ * Class RemoveItem
+ *
+ * Removes multishipping items
+ */
+class RemoveItem extends \Magento\Multishipping\Controller\Checkout implements HttpPostActionInterface
 {
     /**
      * Multishipping checkout remove item action
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml
index 418efa5033263..375a42793c2a5 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml
@@ -86,8 +86,12 @@
                             <?php endif; ?>
                         </td>
                         <td class="col actions" data-th="<?= $block->escapeHtml(__('Actions')) ?>">
-                            <a href="<?= $block->escapeUrl($block->getItemDeleteUrl($_item)) ?>"
+                            <a href="#"
                                title="<?= $block->escapeHtml(__('Remove Item')) ?>"
+                               data-post='<?= /* @noEscape */
+                               $this->helper(\Magento\Framework\Data\Helper\PostHelper::class)
+                                   ->getPostData($block->getItemDeleteUrl($_item))
+                               ?>'
                                class="action delete"
                                data-multiship-item-remove="">
                                 <span><?= $block->escapeHtml(__('Remove item')) ?></span>
diff --git a/app/code/Magento/Search/Controller/Adminhtml/Synonyms/Delete.php b/app/code/Magento/Search/Controller/Adminhtml/Synonyms/Delete.php
index 9d8b612cefadf..06d15d4d7124e 100644
--- a/app/code/Magento/Search/Controller/Adminhtml/Synonyms/Delete.php
+++ b/app/code/Magento/Search/Controller/Adminhtml/Synonyms/Delete.php
@@ -6,10 +6,12 @@
 
 namespace Magento\Search\Controller\Adminhtml\Synonyms;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
+
 /**
  * Delete Controller
  */
-class Delete extends \Magento\Backend\App\Action
+class Delete extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
diff --git a/app/code/Magento/Search/Ui/Component/Listing/Column/SynonymActions.php b/app/code/Magento/Search/Ui/Component/Listing/Column/SynonymActions.php
index f42ce50d2804b..5cf02c725739d 100644
--- a/app/code/Magento/Search/Ui/Component/Listing/Column/SynonymActions.php
+++ b/app/code/Magento/Search/Ui/Component/Listing/Column/SynonymActions.php
@@ -64,7 +64,9 @@ public function prepareDataSource(array $dataSource)
                         'title' => __('Delete'),
                         'message' => __('Are you sure you want to delete synonym group with id: %1?', $item['group_id'])
                     ],
-                    '__disableTmpl' => true
+                    '__disableTmpl' => true,
+
+                    'post'=>true
                 ];
                 $item[$name]['edit'] = [
                     'href' => $this->urlBuilder->getUrl(self::SYNONYM_URL_PATH_EDIT, ['group_id' => $item['group_id']]),
diff --git a/dev/tests/integration/testsuite/Magento/Search/Controller/Adminhtml/Synonyms/DeleteTest.php b/dev/tests/integration/testsuite/Magento/Search/Controller/Adminhtml/Synonyms/DeleteTest.php
new file mode 100644
index 0000000000000..ce5e59778cd68
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Search/Controller/Adminhtml/Synonyms/DeleteTest.php
@@ -0,0 +1,10 @@
+<?php
+
+
+namespace Magento\Search\Controller\Adminhtml\Synonyms;
+
+
+class DeleteTest
+{
+
+}
\ No newline at end of file
diff --git a/dev/tests/integration/testsuite/Magento/Search/_files/synonym_group.php b/dev/tests/integration/testsuite/Magento/Search/_files/synonym_group.php
new file mode 100644
index 0000000000000..b3d9bbc7f3711
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Search/_files/synonym_group.php
@@ -0,0 +1 @@
+<?php

From fb066d8950073839e7b22be5d0500a140e649bd1 Mon Sep 17 00:00:00 2001
From: Sachin Admane <sadmane@magento.com>
Date: Sun, 8 Dec 2019 14:40:13 -0600
Subject: [PATCH 0014/1718] MC-22963: Identify and Refactor GET requests which
 modify data.

Added new line in Synonyms/DeleteTest
Added new fixture file
---
 .../Adminhtml/Synonyms/DeleteTest.php         | 58 ++++++++++++++++++-
 .../Magento/Search/_files/synonym_group.php   | 19 ++++++
 2 files changed, 74 insertions(+), 3 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Search/Controller/Adminhtml/Synonyms/DeleteTest.php b/dev/tests/integration/testsuite/Magento/Search/Controller/Adminhtml/Synonyms/DeleteTest.php
index ce5e59778cd68..39624a725ad72 100644
--- a/dev/tests/integration/testsuite/Magento/Search/Controller/Adminhtml/Synonyms/DeleteTest.php
+++ b/dev/tests/integration/testsuite/Magento/Search/Controller/Adminhtml/Synonyms/DeleteTest.php
@@ -1,10 +1,62 @@
 <?php
-
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
 
 namespace Magento\Search\Controller\Adminhtml\Synonyms;
 
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Search\Model\SynonymGroup;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+use Magento\Search\Model\ResourceModel\SynonymGroup\Collection;
 
-class DeleteTest
+/**
+ * Test for class \Magento\Search\Controller\Adminhtml\Synonyms\Delete
+ *
+ * @magentoAppArea adminhtml
+ */
+class DeleteTest extends AbstractBackendController
 {
 
-}
\ No newline at end of file
+    /** Test Delete Synonyms
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation enabled
+     * @magentoDataFixture Magento/Search/_files/synonym_group.php
+     * @return void
+     */
+    public function testExecute(): void
+    {
+        $synonymGroupModel=$this->gettestFixture();
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue(['group_id' => $synonymGroupModel->getGroupId()]);
+        $this->dispatch('backend/search/synonyms/delete');
+        $this->assertSessionMessages($this->equalTo([(string)__('The synonym group has been deleted.')]));
+    }
+
+    /**
+     * Test execute with no params
+     *
+     * @return void
+     */
+    public function testExecuteNoId(): void
+    {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->dispatch('backend/search/synonyms/delete');
+        $this->assertSessionMessages($this->equalTo([(string)__('We can&#039;t find a synonym group to delete.')]));
+    }
+
+    /**
+     * Gets synonym group Fixture.
+     *
+     * @return SynonymGroup
+     */
+    private function gettestFixture(): SynonymGroup
+    {
+        /** @var Collection */
+        $synonymGroupCollection = Bootstrap::getObjectManager()->get(Collection::class);
+        return $synonymGroupCollection->getLastItem();
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Search/_files/synonym_group.php b/dev/tests/integration/testsuite/Magento/Search/_files/synonym_group.php
index b3d9bbc7f3711..3eb10ffda0f85 100644
--- a/dev/tests/integration/testsuite/Magento/Search/_files/synonym_group.php
+++ b/dev/tests/integration/testsuite/Magento/Search/_files/synonym_group.php
@@ -1 +1,20 @@
 <?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Search\Model\SynonymGroupRepository;
+use Magento\Search\Api\Data\SynonymGroupInterface;
+
+$objectManager = Bootstrap::getObjectManager();
+
+$synonymsGroupModel = $objectManager->create(SynonymGroupInterface::class);
+$synonymGroupRepository=$objectManager->create(SynonymGroupRepository::class);
+$synonymsGroupModel->setStoreId(Magento\Store\Model\Store::DEFAULT_STORE_ID)
+    ->setSynonymGroup('a,b,c')
+    ->setWebsiteId(0);
+
+$synonymGroupRepository->save($synonymsGroupModel);

From a93e89dbe69c6a8d7af42a2e29cb41041155f1fa Mon Sep 17 00:00:00 2001
From: Sachin Admane <sadmane@magento.com>
Date: Mon, 9 Dec 2019 20:59:19 -0600
Subject: [PATCH 0015/1718] MC-22963: Identify and Refactor GET requests which
 modify data.

Added rollback for fixture.
Fix integration test.
---
 .../Model/ResourceModel/SynonymGroupTest.php   | 18 +++++++++++++++---
 .../Magento/Search/_files/synonym_group.php    |  4 +---
 .../Search/_files/synonym_group_rollback.php   | 17 +++++++++++++++++
 3 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Search/_files/synonym_group_rollback.php

diff --git a/dev/tests/integration/testsuite/Magento/Search/Model/ResourceModel/SynonymGroupTest.php b/dev/tests/integration/testsuite/Magento/Search/Model/ResourceModel/SynonymGroupTest.php
index 73f3424eab53c..78b57ab6bcc37 100644
--- a/dev/tests/integration/testsuite/Magento/Search/Model/ResourceModel/SynonymGroupTest.php
+++ b/dev/tests/integration/testsuite/Magento/Search/Model/ResourceModel/SynonymGroupTest.php
@@ -5,8 +5,16 @@
  */
 namespace Magento\Search\Model\ResourceModel;
 
+/**
+ * Test for class \Magento\Search\Model\ResourceModel\SynonymGroup
+ */
 class SynonymGroupTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * Test Get By Scope
+     *
+     * @return void
+     */
     public function testGetByScope()
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -16,32 +24,36 @@ public function testGetByScope()
         $synonymGroupModel1->setStoreId(0);
         $synonymGroupModel1->setSynonymGroup('a,b,c');
         $synonymGroupModel1->save();
+        $group1 = $synonymGroupModel1->getGroupId();
         /** @var \Magento\Search\Model\SynonymGroup $synonymGroupModel2 */
         $synonymGroupModel2 = $objectManager->create(\Magento\Search\Model\SynonymGroup::class);
         $synonymGroupModel2->setWebsiteId(0);
         $synonymGroupModel2->setStoreId(1);
         $synonymGroupModel2->setSynonymGroup('d,e,f');
         $synonymGroupModel2->save();
+        $group2 = $synonymGroupModel2->getGroupId();
         /** @var \Magento\Search\Model\SynonymGroup $synonymGroupModel3 */
         $synonymGroupModel3 = $objectManager->create(\Magento\Search\Model\SynonymGroup::class);
         $synonymGroupModel3->setWebsiteId(1);
         $synonymGroupModel3->setStoreId(0);
         $synonymGroupModel3->setSynonymGroup('g,h,i');
         $synonymGroupModel3->save();
+        $group3 = $synonymGroupModel3->getGroupId();
         /** @var \Magento\Search\Model\SynonymGroup $synonymGroupModel4 */
         $synonymGroupModel4 = $objectManager->create(\Magento\Search\Model\SynonymGroup::class);
         $synonymGroupModel4->setWebsiteId(0);
         $synonymGroupModel4->setStoreId(0);
         $synonymGroupModel4->setSynonymGroup('d,e,f');
         $synonymGroupModel4->save();
+        $group4 = $synonymGroupModel4->getGroupId();
 
         /** @var \Magento\Search\Model\ResourceModel\SynonymGroup $resourceModel */
         $resourceModel = $objectManager->create(\Magento\Search\Model\ResourceModel\SynonymGroup::class);
         $this->assertEquals(
-            [['group_id' => 1, 'synonyms' => 'a,b,c'], ['group_id' => 4, 'synonyms' => 'd,e,f']],
+            [['group_id' => $group1, 'synonyms' => 'a,b,c'], ['group_id' => $group4, 'synonyms' => 'd,e,f']],
             $resourceModel->getByScope(0, 0)
         );
-        $this->assertEquals([['group_id' => 2, 'synonyms' => 'd,e,f']], $resourceModel->getByScope(0, 1));
-        $this->assertEquals([['group_id' => 3, 'synonyms' => 'g,h,i']], $resourceModel->getByScope(1, 0));
+        $this->assertEquals([['group_id' => $group2, 'synonyms' => 'd,e,f']], $resourceModel->getByScope(0, 1));
+        $this->assertEquals([['group_id' => $group3, 'synonyms' => 'g,h,i']], $resourceModel->getByScope(1, 0));
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Search/_files/synonym_group.php b/dev/tests/integration/testsuite/Magento/Search/_files/synonym_group.php
index 3eb10ffda0f85..d66a3a84ec13d 100644
--- a/dev/tests/integration/testsuite/Magento/Search/_files/synonym_group.php
+++ b/dev/tests/integration/testsuite/Magento/Search/_files/synonym_group.php
@@ -13,8 +13,6 @@
 
 $synonymsGroupModel = $objectManager->create(SynonymGroupInterface::class);
 $synonymGroupRepository=$objectManager->create(SynonymGroupRepository::class);
-$synonymsGroupModel->setStoreId(Magento\Store\Model\Store::DEFAULT_STORE_ID)
-    ->setSynonymGroup('a,b,c')
-    ->setWebsiteId(0);
+$synonymsGroupModel->setStoreId(Magento\Store\Model\Store::DEFAULT_STORE_ID)->setStoreId(0)->setWebsiteId(0);
 
 $synonymGroupRepository->save($synonymsGroupModel);
diff --git a/dev/tests/integration/testsuite/Magento/Search/_files/synonym_group_rollback.php b/dev/tests/integration/testsuite/Magento/Search/_files/synonym_group_rollback.php
new file mode 100644
index 0000000000000..47027dcc54404
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Search/_files/synonym_group_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\Search\Model\ResourceModel\SynonymGroup\Collection;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Search\Model\SynonymGroupRepository;
+
+$objectManager = Bootstrap::getObjectManager();
+
+$synonymGroupModel = $objectManager->get(Collection::class)->getLastItem();
+
+$synonymGroupRepository=$objectManager->create(SynonymGroupRepository::class);
+$synonymGroupRepository->delete($synonymGroupModel);

From cfab7825e1d5ce33d38bc81963ee60d3dd04f41a Mon Sep 17 00:00:00 2001
From: korostii <24894168+korostii@users.noreply.github.com>
Date: Tue, 17 Dec 2019 14:29:37 +0000
Subject: [PATCH 0016/1718] Fix #26080

---
 app/code/Magento/MessageQueue/etc/di.xml | 1 -
 app/etc/di.xml                           | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MessageQueue/etc/di.xml b/app/code/Magento/MessageQueue/etc/di.xml
index f60eb5fbc20df..b283280dc4580 100644
--- a/app/code/Magento/MessageQueue/etc/di.xml
+++ b/app/code/Magento/MessageQueue/etc/di.xml
@@ -6,7 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <preference for="Magento\Framework\MessageQueue\ConfigInterface" type="Magento\Framework\MessageQueue\Config\Proxy" />
     <preference for="Magento\Framework\MessageQueue\LockInterface" type="Magento\Framework\MessageQueue\Lock" />
     <preference for="Magento\Framework\MessageQueue\Lock\WriterInterface" type="Magento\MessageQueue\Model\ResourceModel\Lock" />
     <preference for="Magento\Framework\MessageQueue\Lock\ReaderInterface" type="Magento\MessageQueue\Model\ResourceModel\Lock" />
diff --git a/app/etc/di.xml b/app/etc/di.xml
index dfbf4f2373ac5..3a094477e35be 100644
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -187,6 +187,7 @@
     <preference for="Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaWriterInterface" type="Magento\Framework\Setup\Declaration\Schema\Db\MySQL\DbSchemaWriter" />
     <preference for="Magento\Framework\Setup\Declaration\Schema\SchemaConfigInterface" type="Magento\Framework\Setup\Declaration\Schema\SchemaConfig" />
     <preference for="Magento\Framework\Setup\Declaration\Schema\DataSavior\DumpAccessorInterface" type="Magento\Framework\Setup\Declaration\Schema\FileSystem\Csv" />
+    <preference for="Magento\Framework\MessageQueue\ConfigInterface" type="Magento\Framework\MessageQueue\Config\Proxy" />
     <preference for="Magento\Framework\MessageQueue\PublisherInterface" type="Magento\Framework\MessageQueue\PublisherPool" />
     <preference for="Magento\Framework\MessageQueue\BulkPublisherInterface" type="Magento\Framework\MessageQueue\Bulk\PublisherPool" />
     <preference for="Magento\Framework\MessageQueue\MessageIdGeneratorInterface" type="Magento\Framework\MessageQueue\MessageIdGenerator" />

From f6d2c9a7946f276303f5d275b0f2b1c4deea0611 Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Thu, 19 Dec 2019 09:40:52 +0200
Subject: [PATCH 0017/1718] MC-29623: Improve Jwt Management

---
 app/code/Magento/CardinalCommerce/Model/JwtManagement.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/CardinalCommerce/Model/JwtManagement.php b/app/code/Magento/CardinalCommerce/Model/JwtManagement.php
index 953af1751fd65..076e122e8e819 100644
--- a/app/code/Magento/CardinalCommerce/Model/JwtManagement.php
+++ b/app/code/Magento/CardinalCommerce/Model/JwtManagement.php
@@ -8,6 +8,7 @@
 namespace Magento\CardinalCommerce\Model;
 
 use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\Encryption\Helper\Security;
 
 /**
  * JSON Web Token management.
@@ -62,7 +63,8 @@ public function decode(string $jwt, string $key): array
         $payload = $this->json->unserialize($payloadJson);
 
         $signature = $this->urlSafeB64Decode($signatureB64);
-        if ($signature !== $this->sign($headB64 . '.' . $payloadB64, $key, $header['alg'])) {
+
+        if (!Security::compareStrings($signature, $this->sign($headB64 . '.' . $payloadB64, $key, $header['alg']))) {
             throw new \InvalidArgumentException('JWT signature verification failed');
         }
 

From fcde97f38d11090e6399afa0ff35fa871a31b9fa Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Fri, 20 Dec 2019 09:18:32 +0200
Subject: [PATCH 0018/1718] MC-29467: File upload changes

---
 nginx.conf.sample                  | 7 ++++++-
 pub/media/custom_options/.htaccess | 7 +++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 pub/media/custom_options/.htaccess

diff --git a/nginx.conf.sample b/nginx.conf.sample
index 9219400f6aacd..b937021a399f3 100644
--- a/nginx.conf.sample
+++ b/nginx.conf.sample
@@ -93,7 +93,7 @@ location / {
 }
 
 location /pub/ {
-    location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) {
+    location ~ ^/pub/media/(downloadable|customer|import|custom_options|theme_customization/.*\.xml) {
         deny all;
     }
     alias $MAGE_ROOT/pub/;
@@ -166,6 +166,11 @@ location /media/downloadable/ {
 location /media/import/ {
     deny all;
 }
+
+location /media/custom_options/ {
+    deny all;
+}
+
 location /errors/ {
     location ~* \.xml$ {
         deny all;
diff --git a/pub/media/custom_options/.htaccess b/pub/media/custom_options/.htaccess
new file mode 100644
index 0000000000000..87cd9785472ac
--- /dev/null
+++ b/pub/media/custom_options/.htaccess
@@ -0,0 +1,7 @@
+<IfVersion < 2.4>
+    order deny,allow
+    deny from all
+</IfVersion>
+<IfVersion >= 2.4>
+    Require all denied
+</IfVersion>

From 31684a1a9956309b82c6cc57462ccf9a9dda199d Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Fri, 20 Dec 2019 10:38:25 +0200
Subject: [PATCH 0019/1718] MC-29455: Removal of SID in Magento Staging preview
 view

---
 .../Magento/Catalog/Block/Product/ListProduct.php | 15 +++++++--------
 .../Test/Unit/Block/Product/ListProductTest.php   |  2 +-
 .../frontend/templates/js/customer-data.phtml     | 11 ++++++++---
 .../Review/view/frontend/templates/review.phtml   |  2 +-
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Product/ListProduct.php b/app/code/Magento/Catalog/Block/Product/ListProduct.php
index 144cb682e2d22..13706cbd88be2 100644
--- a/app/code/Magento/Catalog/Block/Product/ListProduct.php
+++ b/app/code/Magento/Catalog/Block/Product/ListProduct.php
@@ -346,17 +346,16 @@ public function getIdentities()
 
         $category = $this->getLayer()->getCurrentCategory();
         if ($category) {
-            $identities[] = Product::CACHE_PRODUCT_CATEGORY_TAG . '_' . $category->getId();
+            $identities[] = [Product::CACHE_PRODUCT_CATEGORY_TAG . '_' . $category->getId()];
         }
 
         //Check if category page shows only static block (No products)
-        if ($category->getData('display_mode') == Category::DM_PAGE) {
-            return $identities;
-        }
-
-        foreach ($this->_getProductCollection() as $item) {
-            $identities = array_merge($identities, $item->getIdentities());
+        if ($category->getData('display_mode') != Category::DM_PAGE) {
+            foreach ($this->_getProductCollection() as $item) {
+                $identities[] = $item->getIdentities();
+            }
         }
+        $identities = array_merge(...$identities);
 
         return $identities;
     }
@@ -369,7 +368,7 @@ public function getIdentities()
      */
     public function getAddToCartPostParams(Product $product)
     {
-        $url = $this->getAddToCartUrl($product);
+        $url = $this->getAddToCartUrl($product, ['_escape' => false]);
         return [
             'action' => $url,
             'data' => [
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/ListProductTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/ListProductTest.php
index fe07f69e8046f..c53168b7bf7c3 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Product/ListProductTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/ListProductTest.php
@@ -217,7 +217,7 @@ public function testGetAddToCartPostParams()
             ->will($this->returnValue(true));
         $this->cartHelperMock->expects($this->any())
             ->method('getAddUrl')
-            ->with($this->equalTo($this->productMock), $this->equalTo([]))
+            ->with($this->equalTo($this->productMock), $this->equalTo(['_escape' => false]))
             ->will($this->returnValue($url));
         $this->productMock->expects($this->once())
             ->method('getEntityId')
diff --git a/app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml b/app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml
index a1a784076bac3..eb50ea6454788 100644
--- a/app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml
@@ -5,16 +5,21 @@
  */
 
 /** @var \Magento\Customer\Block\CustomerData $block */
+
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundHelper
 ?>
 <script type="text/x-magento-init">
     {
         "*": {
             "Magento_Customer/js/customer-data": {
-                "sectionLoadUrl": "<?= $block->escapeJs($block->escapeUrl($block->getCustomerDataUrl('customer/section/load'))) ?>",
+                "sectionLoadUrl": "<?= $block->escapeJs($block->getCustomerDataUrl('customer/section/load')) ?>",
                 "expirableSectionLifetime": <?= (int)$block->getExpirableSectionLifetime() ?>,
-                "expirableSectionNames": <?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getExpirableSectionNames()) ?>,
+                "expirableSectionNames": <?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)
+                    ->jsonEncode($block->getExpirableSectionNames()) ?>,
                 "cookieLifeTime": "<?= $block->escapeJs($block->getCookieLifeTime()) ?>",
-                "updateSessionUrl": "<?= $block->escapeJs($block->escapeUrl($block->getCustomerDataUrl('customer/account/updateSession'))) ?>"
+                "updateSessionUrl": "<?= $block->escapeJs(
+                    $block->getCustomerDataUrl('customer/account/updateSession')
+                ) ?>"
             }
         }
     }
diff --git a/app/code/Magento/Review/view/frontend/templates/review.phtml b/app/code/Magento/Review/view/frontend/templates/review.phtml
index ea4b4bc42a1ed..04782080fc775 100644
--- a/app/code/Magento/Review/view/frontend/templates/review.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/review.phtml
@@ -13,7 +13,7 @@
     {
         "*": {
             "Magento_Review/js/process-reviews": {
-                "productReviewUrl": "<?= $block->escapeJs($block->escapeUrl($block->getProductReviewUrl())) ?>",
+                "productReviewUrl": "<?= $block->escapeJs($block->getProductReviewUrl()) ?>",
                 "reviewsTabSelector": "#tab-label-reviews"
             }
         }

From 9383fe1e8933adf30e0f18be383738719856442f Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Tue, 24 Dec 2019 13:54:35 +0200
Subject: [PATCH 0020/1718] Static properties serialization fix.

---
 .../integration/etc/di/preferences/ce.php     |  2 +
 .../TestFramework/Serialize/Serializer.php    | 52 +++++++++++++++++++
 .../Workaround/Cleanup/StaticProperties.php   |  4 +-
 3 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 dev/tests/integration/framework/Magento/TestFramework/Serialize/Serializer.php

diff --git a/dev/tests/integration/etc/di/preferences/ce.php b/dev/tests/integration/etc/di/preferences/ce.php
index 2770283637dc7..2546866ceeaf5 100644
--- a/dev/tests/integration/etc/di/preferences/ce.php
+++ b/dev/tests/integration/etc/di/preferences/ce.php
@@ -16,6 +16,8 @@
     \Magento\Framework\App\Response\Http::class => \Magento\TestFramework\Response::class,
     \Magento\Framework\Interception\PluginListInterface::class =>
         \Magento\TestFramework\Interception\PluginList::class,
+    \Magento\Framework\Serialize\SerializerInterface::class =>
+        \Magento\TestFramework\Serialize\Serializer::class,
     \Magento\Framework\Interception\ObjectManager\ConfigInterface::class =>
         \Magento\TestFramework\ObjectManager\Config::class,
     \Magento\Framework\Interception\ObjectManager\Config\Developer::class =>
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Serialize/Serializer.php b/dev/tests/integration/framework/Magento/TestFramework/Serialize/Serializer.php
new file mode 100644
index 0000000000000..60f2a7ce6c4cc
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Serialize/Serializer.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Serialize;
+
+use Magento\Framework\Serialize\SerializerInterface;
+
+/**
+ * Insecure SerializerInterface implementation for test use only.
+ */
+class Serializer implements SerializerInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function serialize($data)
+    {
+        if (is_resource($data)) {
+            throw new \InvalidArgumentException('Unable to serialize value.');
+        }
+
+        // phpcs:ignore Magento2.Security.InsecureFunction
+        return serialize($data);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function unserialize($string)
+    {
+        if (false === $string || null === $string || '' === $string) {
+            throw new \InvalidArgumentException('Unable to unserialize value.');
+        }
+        set_error_handler(
+            function () {
+                restore_error_handler();
+                throw new \InvalidArgumentException('Unable to unserialize value, string is corrupted.');
+            },
+            E_NOTICE
+        );
+        // phpcs:ignore Magento2.Security.InsecureFunction
+        $result = unserialize($string);
+        restore_error_handler();
+
+        return $result;
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php b/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
index 73786707b417b..c5ecee34feb2e 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
@@ -186,8 +186,8 @@ public static function backupStaticVariables()
             ),
             function ($classFile) {
                 return StaticProperties::_isClassInCleanableFolders($classFile)
-                // phpcs:ignore Magento2.Functions.DiscouragedFunction
-                && strpos(file_get_contents($classFile), ' static ')  > 0;
+                    // phpcs:ignore Magento2.Functions.DiscouragedFunction
+                    && strpos(file_get_contents($classFile), ' static ')  > 0;
             }
         );
         $namespacePattern = '/namespace [a-zA-Z0-9\\\\]+;/';

From 5053e7b7fe96cc3cc513c54adf5e33c92b2e19ae Mon Sep 17 00:00:00 2001
From: Mark Berube <berube@adobe.com>
Date: Thu, 2 Jan 2020 13:58:40 -0600
Subject: [PATCH 0021/1718] MC-24196: Validating Wysiwyg directives

---
 .../Magento/Cms/Model/Template/Filter.php     |  6 +--
 .../Test/Unit/Model/Template/FilterTest.php   | 20 +++++++
 .../Magento/Email/Model/Template/Filter.php   | 43 +++++++++++++--
 .../Test/Unit/Model/Template/FilterTest.php   | 53 +++++++++++++++----
 .../Magento/Ui/Controller/Index/Render.php    |  2 +
 .../Php/_files/phpstan/blacklist/common.txt   |  1 +
 .../Magento/Framework/Image/Adapter/Gd2.php   | 19 ++++++-
 .../Framework/Image/Adapter/ImageMagick.php   | 35 ++++++++++--
 .../Image/Test/Unit/Adapter/Gd2Test.php       |  8 +++
 .../Test/Unit/Adapter/ImageMagickTest.php     |  8 +++
 10 files changed, 175 insertions(+), 20 deletions(-)

diff --git a/app/code/Magento/Cms/Model/Template/Filter.php b/app/code/Magento/Cms/Model/Template/Filter.php
index 7e71a06de1f31..a22daab950149 100644
--- a/app/code/Magento/Cms/Model/Template/Filter.php
+++ b/app/code/Magento/Cms/Model/Template/Filter.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Cms\Model\Template;
 
-use Magento\Framework\Exception\LocalizedException;
-
 /**
  * Cms Template Filter Model
  */
@@ -41,8 +39,8 @@ public function mediaDirective($construction)
     {
         // phpcs:ignore Magento2.Functions.DiscouragedFunction
         $params = $this->getParameters(html_entity_decode($construction[2], ENT_QUOTES));
-        if (preg_match('/\.\.(\\\|\/)/', $params['url'])) {
-            throw new \InvalidArgumentException('Image path must be absolute');
+        if (preg_match('/(^.*:\/\/.*|\.\.\/.*)/', $params['url'])) {
+            throw new \InvalidArgumentException('Image path must be absolute and not include URLs');
         }
 
         return $this->_storeManager->getStore()->getBaseMediaDir() . '/' . $params['url'];
diff --git a/app/code/Magento/Cms/Test/Unit/Model/Template/FilterTest.php b/app/code/Magento/Cms/Test/Unit/Model/Template/FilterTest.php
index b6b802a8a4e6d..c7acddf926770 100644
--- a/app/code/Magento/Cms/Test/Unit/Model/Template/FilterTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Model/Template/FilterTest.php
@@ -105,4 +105,24 @@ public function testMediaDirectiveRelativePath()
             ->willReturn($baseMediaDir);
         $this->filter->mediaDirective($construction);
     }
+
+    /**
+     * Test using media directive with a URL path including schema.
+     *
+     * @covers \Magento\Cms\Model\Template\Filter::mediaDirective
+     * @expectedException \InvalidArgumentException
+     */
+    public function testMediaDirectiveURL()
+    {
+        $baseMediaDir = 'pub/media';
+        $construction = [
+            '{{media url="http://wysiwyg/images/image.jpg"}}',
+            'media',
+            ' url="http://wysiwyg/images/../image.jpg"'
+        ];
+        $this->storeMock->expects($this->any())
+            ->method('getBaseMediaDir')
+            ->willReturn($baseMediaDir);
+        $this->filter->mediaDirective($construction);
+    }
 }
diff --git a/app/code/Magento/Email/Model/Template/Filter.php b/app/code/Magento/Email/Model/Template/Filter.php
index 82ebc8c78d8b2..5bb2c42144508 100644
--- a/app/code/Magento/Email/Model/Template/Filter.php
+++ b/app/code/Magento/Email/Model/Template/Filter.php
@@ -6,8 +6,9 @@
 namespace Magento\Email\Model\Template;
 
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\MailException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Filesystem;
-use Magento\Framework\Filesystem\Directory\ReadInterface;
 use Magento\Framework\Filter\VariableResolverInterface;
 use Magento\Framework\View\Asset\ContentProcessorException;
 use Magento\Framework\View\Asset\ContentProcessorInterface;
@@ -734,27 +735,32 @@ public function modifierEscape($value, $type = 'html')
      *     {{protocol store="1"}} - Optional parameter which gets protocol from provide store based on store ID or code
      *
      * @param string[] $construction
-     * @throws \Magento\Framework\Exception\MailException
      * @return string
+     * @throws MailException
+     * @throws NoSuchEntityException
      */
     public function protocolDirective($construction)
     {
         $params = $this->getParameters($construction[2]);
+
         $store = null;
         if (isset($params['store'])) {
             try {
                 $store = $this->_storeManager->getStore($params['store']);
             } catch (\Exception $e) {
-                throw new \Magento\Framework\Exception\MailException(
+                throw new MailException(
                     __('Requested invalid store "%1"', $params['store'])
                 );
             }
         }
+
         $isSecure = $this->_storeManager->getStore($store)->isCurrentlySecure();
         $protocol = $isSecure ? 'https' : 'http';
         if (isset($params['url'])) {
             return $protocol . '://' . $params['url'];
         } elseif (isset($params['http']) && isset($params['https'])) {
+            $this->validateProtocolDirectiveHttpScheme($params);
+
             if ($isSecure) {
                 return $params['https'];
             }
@@ -764,6 +770,37 @@ public function protocolDirective($construction)
         return $protocol;
     }
 
+    /**
+     * Validate protocol directive HTTP parameters.
+     *
+     * @param string[] $params
+     * @return void
+     * @throws MailException
+     */
+    private function validateProtocolDirectiveHttpScheme(array $params) : void
+    {
+        $parsed_http = parse_url($params['http']);
+        $parsed_https = parse_url($params['https']);
+
+        if (empty($parsed_http)) {
+            throw new MailException(
+                __('Contents of %1 could not be loaded or is empty', $params['http'])
+            );
+        } elseif (empty($parsed_https)) {
+            throw new MailException(
+                __('Contents of %1 could not be loaded or is empty', $params['https'])
+            );
+        } elseif ($parsed_http['scheme'] !== 'http') {
+            throw new MailException(
+                __('Contents of %1 could not be loaded or is empty', $params['http'])
+            );
+        } elseif ($parsed_https['scheme'] !== 'https') {
+            throw new MailException(
+                __('Contents of %1 could not be loaded or is empty', $params['https'])
+            );
+        }
+    }
+
     /**
      * Store config directive
      *
diff --git a/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php b/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
index 778573396b011..4698ae5a60b3f 100644
--- a/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
+++ b/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
@@ -12,7 +12,8 @@
 use Magento\Email\Model\Template\Filter;
 use Magento\Framework\App\Area;
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Filesystem\Directory\ReadInterface;
+use Magento\Framework\Exception\MailException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\View\Asset\File\FallbackContext;
 
 /**
@@ -194,20 +195,16 @@ protected function setUp()
                 ->getMock();
 
         $this->directiveProcessors = [
-            'depend' =>
-                $this->getMockBuilder(\Magento\Framework\Filter\DirectiveProcessor\DependDirective::class)
+            'depend' => $this->getMockBuilder(\Magento\Framework\Filter\DirectiveProcessor\DependDirective::class)
                     ->disableOriginalConstructor()
                     ->getMock(),
-            'if' =>
-                $this->getMockBuilder(\Magento\Framework\Filter\DirectiveProcessor\IfDirective::class)
+            'if' => $this->getMockBuilder(\Magento\Framework\Filter\DirectiveProcessor\IfDirective::class)
                     ->disableOriginalConstructor()
                     ->getMock(),
-            'template' =>
-                $this->getMockBuilder(\Magento\Framework\Filter\DirectiveProcessor\TemplateDirective::class)
+            'template' => $this->getMockBuilder(\Magento\Framework\Filter\DirectiveProcessor\TemplateDirective::class)
                     ->disableOriginalConstructor()
                     ->getMock(),
-            'legacy' =>
-                $this->getMockBuilder(\Magento\Framework\Filter\DirectiveProcessor\LegacyDirective::class)
+            'legacy' => $this->getMockBuilder(\Magento\Framework\Filter\DirectiveProcessor\LegacyDirective::class)
                     ->disableOriginalConstructor()
                     ->getMock(),
         ];
@@ -432,4 +429,42 @@ public function testConfigDirectiveUnavailable()
 
         $this->assertEquals($scopeConfigValue, $this->getModel()->configDirective($construction));
     }
+
+    /**
+     * @throws MailException
+     * @throws NoSuchEntityException
+     */
+    public function testProtocolDirectiveWithValidSchema()
+    {
+        $model = $this->getModel();
+        $storeMock = $this->createMock(\Magento\Store\Model\Store::class);
+        $storeMock->expects($this->once())->method('isCurrentlySecure')->willReturn(true);
+        $this->storeManager->expects($this->once())->method('getStore')->willReturn($storeMock);
+
+        $data = [
+            "{{protocol http=\"http://url\" https=\"https://url\"}}",
+            "protocol",
+            " http=\"http://url\" https=\"https://url\""
+        ];
+        $this->assertEquals('https://url', $model->protocolDirective($data));
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\MailException
+     * @throws NoSuchEntityException
+     */
+    public function testProtocolDirectiveWithInvalidSchema()
+    {
+        $model = $this->getModel();
+        $storeMock = $this->createMock(\Magento\Store\Model\Store::class);
+        $storeMock->expects($this->once())->method('isCurrentlySecure')->willReturn(true);
+        $this->storeManager->expects($this->once())->method('getStore')->willReturn($storeMock);
+
+        $data = [
+            "{{protocol http=\"https://url\" https=\"http://url\"}}",
+            "protocol",
+            " http=\"https://url\" https=\"http://url\""
+        ];
+        $model->protocolDirective($data);
+    }
 }
diff --git a/app/code/Magento/Ui/Controller/Index/Render.php b/app/code/Magento/Ui/Controller/Index/Render.php
index faab203547064..e49b25c88c6c8 100644
--- a/app/code/Magento/Ui/Controller/Index/Render.php
+++ b/app/code/Magento/Ui/Controller/Index/Render.php
@@ -105,6 +105,8 @@ public function execute()
 
                 $contentType = $this->contentTypeResolver->resolve($component->getContext());
                 $this->getResponse()->setHeader('Content-Type', $contentType, true);
+
+                return;
             } else {
                 /** @var \Magento\Framework\Controller\Result\Json $resultJson */
                 $resultJson = $this->resultJsonFactory->create();
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/blacklist/common.txt
index f54defbd57604..d153593a5ed4f 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/blacklist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/blacklist/common.txt
@@ -5,6 +5,7 @@
 # dev/tests/static/framework/bootstrap.php
 lib/internal/Magento/Framework/Interception/Test/Unit/Config/ConfigTest.php
 lib/internal/Magento/Framework/Cache/Backend/Eaccelerator.php
+lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php
 dev/tests/integration/framework/deployTestModules.php
 dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php
 dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php
diff --git a/lib/internal/Magento/Framework/Image/Adapter/Gd2.php b/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
index 7e92b336cfdc0..5eb663c5a2329 100644
--- a/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
+++ b/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
@@ -60,7 +60,7 @@ protected function _reset()
      */
     public function open($filename)
     {
-        if (!$filename || filesize($filename) === 0) {
+        if (!$filename || filesize($filename) === 0 || !$this->validateURLScheme($filename)) {
             throw new \InvalidArgumentException('Wrong file');
         }
         $this->_fileName = $filename;
@@ -87,6 +87,23 @@ public function open($filename)
         }
     }
 
+    /**
+     * Checks for invalid URL schema if it exists
+     *
+     * @param string $filename
+     * @return bool
+     */
+    private function validateURLScheme(string $filename) : bool
+    {
+        $allowed_schemes = ['ftp', 'ftps', 'http', 'https'];
+        $url = parse_url($filename);
+        if ($url && isset($url['scheme']) && !in_array($url['scheme'], $allowed_schemes)) {
+            return false;
+        }
+
+        return true;
+    }
+
     /**
      * Checks whether memory limit is reached.
      *
diff --git a/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php b/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php
index cd49f283d33a7..2f1c90331a1dd 100644
--- a/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php
+++ b/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Framework\Image\Adapter;
 
+/**
+ * ImageMagick adapter.
+ */
 class ImageMagick extends \Magento\Framework\Image\Adapter\AbstractAdapter
 {
     /**
@@ -70,6 +73,10 @@ public function backgroundColor($color = null)
      */
     public function open($filename)
     {
+        if (!empty($filename) && !$this->validateURLScheme($filename)) {
+            throw new \InvalidArgumentException('Wrong file');
+        }
+
         $this->_fileName = $filename;
         $this->_checkCanProcess();
         $this->_getFileAttributes();
@@ -77,6 +84,7 @@ public function open($filename)
         try {
             $this->_imageHandler = new \Imagick($this->_fileName);
         } catch (\ImagickException $e) {
+            //phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception(sprintf('Unsupported image format. File: %s', $this->_fileName), $e->getCode(), $e);
         }
 
@@ -85,8 +93,24 @@ public function open($filename)
     }
 
     /**
-     * Save image to specific path.
-     * If some folders of path does not exist they will be created
+     * Checks for invalid URL schema if it exists
+     *
+     * @param string $filename
+     * @return bool
+     */
+    private function validateURLScheme(string $filename) : bool
+    {
+        $allowed_schemes = ['ftp', 'ftps', 'http', 'https'];
+        $url = parse_url($filename);
+        if ($url && isset($url['scheme']) && !in_array($url['scheme'], $allowed_schemes)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Save image to specific path. If some folders of path does not exist they will be created
      *
      * @param null|string $destination
      * @param null|string $newName
@@ -124,6 +148,8 @@ protected function _applyOptions()
     }
 
     /**
+     * Render image and return its binary contents
+     *
      * @see \Magento\Framework\Image\Adapter\AbstractAdapter::getImage
      * @return string
      */
@@ -134,11 +160,12 @@ public function getImage()
     }
 
     /**
-     * Change the image size
+     * Change the image size.
      *
      * @param null|int $frameWidth
      * @param null|int $frameHeight
      * @return void
+     * @throws \ImagickException
      */
     public function resize($frameWidth = null, $frameHeight = null)
     {
@@ -333,6 +360,7 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
                 );
             }
         } catch (\ImagickException $e) {
+            //phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception('Unable to create watermark.', $e->getCode(), $e);
         }
 
@@ -351,6 +379,7 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
     public function checkDependencies()
     {
         if (!class_exists('\Imagick', false)) {
+            //phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception("Required PHP extension 'Imagick' was not loaded.");
         }
     }
diff --git a/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/Gd2Test.php b/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/Gd2Test.php
index ccf52c7c59ceb..f9c1a1e6f3a55 100644
--- a/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/Gd2Test.php
+++ b/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/Gd2Test.php
@@ -151,4 +151,12 @@ public function testOpenDifferentTypes()
 
         $this->assertNotEquals($type1, $type2);
     }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testOpenInvalidURL()
+    {
+        $this->adapter->open('bar://foo.bar');
+    }
 }
diff --git a/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/ImageMagickTest.php b/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/ImageMagickTest.php
index ae0348f489fd2..337588b2100c0 100644
--- a/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/ImageMagickTest.php
+++ b/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/ImageMagickTest.php
@@ -91,4 +91,12 @@ public function testSaveWithException()
         $this->loggerMock->expects($this->once())->method('critical')->with($exception);
         $this->imageMagic->save('product/cache', 'sample.jpg');
     }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testOpenInvalidUrl()
+    {
+        $this->imageMagic->open('bar://foo.bar');
+    }
 }

From e2123017375ee389cb49514c7b1e3d60b9aa6e1b Mon Sep 17 00:00:00 2001
From: Matthew O'Loughlin <matthew.oloughlin@aligent.com.au>
Date: Sat, 4 Jan 2020 09:15:47 +1030
Subject: [PATCH 0022/1718] GH-26255: Refactor CacheInvalidate sendPurgeRequest
 to allow correct purge batching, regardless of the size and content of
 provided tag pattern.

---
 .../CacheInvalidate/Model/PurgeCache.php      | 35 +++++++++++--------
 .../Observer/FlushAllCacheObserver.php        |  2 +-
 .../Observer/InvalidateVarnishObserver.php    |  2 +-
 .../Test/Unit/Model/PurgeCacheTest.php        |  5 +--
 .../Observer/FlushAllCacheObserverTest.php    |  2 +-
 5 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
index b2aa0d000e9cf..551d1fe1d188a 100644
--- a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
+++ b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
@@ -39,7 +39,7 @@ class PurgeCache
      *
      * @var int
      */
-    private $requestSize = 7680;
+    private $requestSize;
 
     /**
      * Constructor
@@ -47,31 +47,38 @@ class PurgeCache
      * @param \Magento\PageCache\Model\Cache\Server $cacheServer
      * @param \Magento\CacheInvalidate\Model\SocketFactory $socketAdapterFactory
      * @param InvalidateLogger $logger
+     * @param int $maxHeaderSize
      */
     public function __construct(
         \Magento\PageCache\Model\Cache\Server $cacheServer,
         \Magento\CacheInvalidate\Model\SocketFactory $socketAdapterFactory,
-        InvalidateLogger $logger
+        InvalidateLogger $logger,
+        $maxHeaderSize = 7680
     ) {
         $this->cacheServer = $cacheServer;
         $this->socketAdapterFactory = $socketAdapterFactory;
         $this->logger = $logger;
+        $this->requestSize = $maxHeaderSize;
     }
 
     /**
      * Send curl purge request to invalidate cache by tags pattern
      *
-     * @param string $tagsPattern
+     * @param array|string $tags
      * @return bool Return true if successful; otherwise return false
      */
-    public function sendPurgeRequest($tagsPattern)
+    public function sendPurgeRequest($tags)
     {
+        if (!is_string($tags)) {
+            $tags = [$tags];
+        }
+
         $successful = true;
         $socketAdapter = $this->socketAdapterFactory->create();
         $servers = $this->cacheServer->getUris();
         $socketAdapter->setOptions(['timeout' => 10]);
 
-        $formattedTagsChunks = $this->splitTags($tagsPattern);
+        $formattedTagsChunks = $this->chunkTags($tags);
         foreach ($formattedTagsChunks as $formattedTagsChunk) {
             if (!$this->sendPurgeRequestToServers($socketAdapter, $servers, $formattedTagsChunk)) {
                 $successful = false;
@@ -82,24 +89,24 @@ public function sendPurgeRequest($tagsPattern)
     }
 
     /**
-     * Split tags by batches
+     * Split tags into batches to suit Varnish max. header size
      *
-     * @param string $tagsPattern
+     * @param array $tags
      * @return \Generator
      */
-    private function splitTags($tagsPattern)
+    private function chunkTags($tags)
     {
-        $tagsBatchSize = 0;
+        $currentBatchSize = 0;
         $formattedTagsChunk = [];
-        $formattedTags = explode('|', $tagsPattern);
-        foreach ($formattedTags as $formattedTag) {
-            if ($tagsBatchSize + strlen($formattedTag) > $this->requestSize - count($formattedTagsChunk) - 1) {
+        foreach ($tags as $formattedTag) {
+            // Check if (currentBatchSize + length of next tag + number of pipe delimiters) would exceed header size.
+            if ($currentBatchSize + strlen($formattedTag) + count($formattedTagsChunk) > $this->requestSize) {
                 yield implode('|', $formattedTagsChunk);
                 $formattedTagsChunk = [];
-                $tagsBatchSize = 0;
+                $currentBatchSize = 0;
             }
 
-            $tagsBatchSize += strlen($formattedTag);
+            $currentBatchSize += strlen($formattedTag);
             $formattedTagsChunk[] = $formattedTag;
         }
         if (!empty($formattedTagsChunk)) {
diff --git a/app/code/Magento/CacheInvalidate/Observer/FlushAllCacheObserver.php b/app/code/Magento/CacheInvalidate/Observer/FlushAllCacheObserver.php
index 97e11e8bd2f3f..067f101131bf0 100644
--- a/app/code/Magento/CacheInvalidate/Observer/FlushAllCacheObserver.php
+++ b/app/code/Magento/CacheInvalidate/Observer/FlushAllCacheObserver.php
@@ -43,7 +43,7 @@ public function __construct(
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
         if ($this->config->getType() == \Magento\PageCache\Model\Config::VARNISH && $this->config->isEnabled()) {
-            $this->purgeCache->sendPurgeRequest('.*');
+            $this->purgeCache->sendPurgeRequest(['.*']);
         }
     }
 }
diff --git a/app/code/Magento/CacheInvalidate/Observer/InvalidateVarnishObserver.php b/app/code/Magento/CacheInvalidate/Observer/InvalidateVarnishObserver.php
index 3527d4f6cdf4e..b5f473e649bf0 100644
--- a/app/code/Magento/CacheInvalidate/Observer/InvalidateVarnishObserver.php
+++ b/app/code/Magento/CacheInvalidate/Observer/InvalidateVarnishObserver.php
@@ -62,7 +62,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                 $tags[] = sprintf($pattern, $tag);
             }
             if (!empty($tags)) {
-                $this->purgeCache->sendPurgeRequest(implode('|', array_unique($tags)));
+                $this->purgeCache->sendPurgeRequest(array_unique($tags));
             }
         }
     }
diff --git a/app/code/Magento/CacheInvalidate/Test/Unit/Model/PurgeCacheTest.php b/app/code/Magento/CacheInvalidate/Test/Unit/Model/PurgeCacheTest.php
index c66e27ea41025..1bc1f8d0cf84f 100644
--- a/app/code/Magento/CacheInvalidate/Test/Unit/Model/PurgeCacheTest.php
+++ b/app/code/Magento/CacheInvalidate/Test/Unit/Model/PurgeCacheTest.php
@@ -53,6 +53,7 @@ protected function setUp()
     public function testSendPurgeRequest($hosts)
     {
         $uris = [];
+        /** @var array $host */
         foreach ($hosts as $host) {
             $port = isset($host['port']) ? $host['port'] : \Magento\PageCache\Model\Cache\Server::DEFAULT_PORT;
             $uris[] = UriFactory::factory('')->setHost($host['host'])
@@ -81,7 +82,7 @@ public function testSendPurgeRequest($hosts)
         $this->loggerMock->expects($this->once())
             ->method('execute');
 
-        $this->assertTrue($this->model->sendPurgeRequest('tags'));
+        $this->assertTrue($this->model->sendPurgeRequest(['tags']));
     }
 
     /**
@@ -119,6 +120,6 @@ public function testSendPurgeRequestWithException()
         $this->loggerMock->expects($this->once())
             ->method('critical');
 
-        $this->assertFalse($this->model->sendPurgeRequest('tags'));
+        $this->assertFalse($this->model->sendPurgeRequest(['tags']));
     }
 }
diff --git a/app/code/Magento/CacheInvalidate/Test/Unit/Observer/FlushAllCacheObserverTest.php b/app/code/Magento/CacheInvalidate/Test/Unit/Observer/FlushAllCacheObserverTest.php
index 5143683153e39..c37a3ecc9edc0 100644
--- a/app/code/Magento/CacheInvalidate/Test/Unit/Observer/FlushAllCacheObserverTest.php
+++ b/app/code/Magento/CacheInvalidate/Test/Unit/Observer/FlushAllCacheObserverTest.php
@@ -47,7 +47,7 @@ public function testFlushAllCache()
             $this->returnValue(\Magento\PageCache\Model\Config::VARNISH)
         );
 
-        $this->purgeCache->expects($this->once())->method('sendPurgeRequest')->with('.*');
+        $this->purgeCache->expects($this->once())->method('sendPurgeRequest')->with(['.*']);
         $this->model->execute($this->observerMock);
     }
 }

From 4c223031e12bf6de7380ff8b13688d475f92f8d0 Mon Sep 17 00:00:00 2001
From: Matthew O'Loughlin <matthew.oloughlin@aligent.com.au>
Date: Mon, 6 Jan 2020 11:58:13 +1030
Subject: [PATCH 0023/1718] GH-26255: Fix logic error around handling both
 string/array params. Fix failing test case.

---
 app/code/Magento/CacheInvalidate/Model/PurgeCache.php           | 2 +-
 .../Test/Unit/Observer/InvalidateVarnishObserverTest.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
index 551d1fe1d188a..f93f0ff5b9ee9 100644
--- a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
+++ b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
@@ -69,7 +69,7 @@ public function __construct(
      */
     public function sendPurgeRequest($tags)
     {
-        if (!is_string($tags)) {
+        if (is_string($tags)) {
             $tags = [$tags];
         }
 
diff --git a/app/code/Magento/CacheInvalidate/Test/Unit/Observer/InvalidateVarnishObserverTest.php b/app/code/Magento/CacheInvalidate/Test/Unit/Observer/InvalidateVarnishObserverTest.php
index b333fcaaa678a..9ce6535d3bfd4 100644
--- a/app/code/Magento/CacheInvalidate/Test/Unit/Observer/InvalidateVarnishObserverTest.php
+++ b/app/code/Magento/CacheInvalidate/Test/Unit/Observer/InvalidateVarnishObserverTest.php
@@ -54,7 +54,7 @@ protected function setUp()
     public function testInvalidateVarnish()
     {
         $tags = ['cache_1', 'cache_group'];
-        $pattern = '((^|,)cache_1(,|$))|((^|,)cache_group(,|$))';
+        $pattern = ['((^|,)cache_1(,|$))', '((^|,)cache_group(,|$))'];
 
         $this->configMock->expects($this->once())->method('isEnabled')->will($this->returnValue(true));
         $this->configMock->expects(

From fc2ce73d3352ad7180f64540c5369193ebb413f9 Mon Sep 17 00:00:00 2001
From: Matthew O'Loughlin <matthew.oloughlin@aligent.com.au>
Date: Mon, 6 Jan 2020 12:03:38 +1030
Subject: [PATCH 0024/1718] GH-26255: Fix codesniff errors/warnings

---
 app/code/Magento/CacheInvalidate/Model/PurgeCache.php    | 1 +
 .../CacheInvalidate/Observer/FlushAllCacheObserver.php   | 4 ++++
 .../Observer/InvalidateVarnishObserver.php               | 9 +++++++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
index f93f0ff5b9ee9..8d3cf142bd319 100644
--- a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
+++ b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
@@ -9,6 +9,7 @@
 
 /**
  * Class PurgeCache
+ * @package Magento\CacheInvalidate\Model
  */
 class PurgeCache
 {
diff --git a/app/code/Magento/CacheInvalidate/Observer/FlushAllCacheObserver.php b/app/code/Magento/CacheInvalidate/Observer/FlushAllCacheObserver.php
index 067f101131bf0..0b22a83c1f27a 100644
--- a/app/code/Magento/CacheInvalidate/Observer/FlushAllCacheObserver.php
+++ b/app/code/Magento/CacheInvalidate/Observer/FlushAllCacheObserver.php
@@ -7,6 +7,10 @@
 
 use Magento\Framework\Event\ObserverInterface;
 
+/**
+ * Class FlushAllCacheObserver
+ * @package Magento\CacheInvalidate\Observer
+ */
 class FlushAllCacheObserver implements ObserverInterface
 {
     /**
diff --git a/app/code/Magento/CacheInvalidate/Observer/InvalidateVarnishObserver.php b/app/code/Magento/CacheInvalidate/Observer/InvalidateVarnishObserver.php
index b5f473e649bf0..15d8c8e0ed467 100644
--- a/app/code/Magento/CacheInvalidate/Observer/InvalidateVarnishObserver.php
+++ b/app/code/Magento/CacheInvalidate/Observer/InvalidateVarnishObserver.php
@@ -7,6 +7,10 @@
 
 use Magento\Framework\Event\ObserverInterface;
 
+/**
+ * Class InvalidateVarnishObserver
+ * @package Magento\CacheInvalidate\Observer
+ */
 class InvalidateVarnishObserver implements ObserverInterface
 {
     /**
@@ -41,8 +45,7 @@ public function __construct(
     }
 
     /**
-     * If Varnish caching is enabled it collects array of tags
-     * of incoming object and asks to clean cache.
+     * If Varnish caching is enabled, it collects array of tags of incoming object and asks to clean cache.
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return void
@@ -68,6 +71,8 @@ public function execute(\Magento\Framework\Event\Observer $observer)
     }
 
     /**
+     * Resolve tags for the provided model instance being purged.
+     *
      * @deprecated 100.1.2
      * @return \Magento\Framework\App\Cache\Tag\Resolver
      */

From 70e04faaabaf9baed2310b74e04848cc61561324 Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Tue, 7 Jan 2020 13:40:59 -0600
Subject: [PATCH 0025/1718] MC-25175: Incorrect/Missed edits on
 templates/email-templates

- Added test coverage for Data update
---
 .../Directory/Test/Unit/Block/DataTest.php    | 44 ++++++++++++++-----
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/Directory/Test/Unit/Block/DataTest.php b/app/code/Magento/Directory/Test/Unit/Block/DataTest.php
index 81cdfea2821dc..938398ebbee52 100644
--- a/app/code/Magento/Directory/Test/Unit/Block/DataTest.php
+++ b/app/code/Magento/Directory/Test/Unit/Block/DataTest.php
@@ -17,6 +17,7 @@
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Escaper;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -56,9 +57,16 @@ class DataTest extends \PHPUnit\Framework\TestCase
     /** @var SerializerInterface|\PHPUnit_Framework_MockObject_MockObject */
     private $serializerMock;
 
+    /** @var \Magento\Framework\Escaper */
+    private $escaper;
+
     protected function setUp()
     {
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->escaper = $this->getMockBuilder(Escaper::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['escapeHtmlAttr'])
+            ->getMock();
         $this->prepareContext();
 
         $this->helperDataMock = $this->getMockBuilder(\Magento\Directory\Helper\Data::class)
@@ -123,6 +131,10 @@ protected function prepareContext()
         $this->contextMock->expects($this->any())
             ->method('getLayout')
             ->willReturn($this->layoutMock);
+
+        $this->contextMock->expects($this->once())
+            ->method('getEscaper')
+            ->willReturn($this->escaper);
     }
 
     protected function prepareCountryCollection()
@@ -135,9 +147,11 @@ protected function prepareCountryCollection()
             \Magento\Directory\Model\ResourceModel\Country\CollectionFactory::class
         )
             ->disableOriginalConstructor()
-            ->setMethods([
-                'create'
-            ])
+            ->setMethods(
+                [
+                    'create'
+                ]
+            )
             ->getMock();
 
         $this->countryCollectionFactoryMock->expects($this->any())
@@ -285,15 +299,17 @@ protected function mockElementHtmlSelect($defaultCountry, $options, $resultHtml)
 
         $elementHtmlSelect = $this->getMockBuilder(\Magento\Framework\View\Element\Html\Select::class)
             ->disableOriginalConstructor()
-            ->setMethods([
-                'setName',
-                'setId',
-                'setTitle',
-                'setValue',
-                'setOptions',
-                'setExtraParams',
-                'getHtml',
-            ])
+            ->setMethods(
+                [
+                    'setName',
+                    'setId',
+                    'setTitle',
+                    'setValue',
+                    'setOptions',
+                    'setExtraParams',
+                    'getHtml',
+                ]
+            )
             ->getMock();
 
         $elementHtmlSelect->expects($this->once())
@@ -323,6 +339,10 @@ protected function mockElementHtmlSelect($defaultCountry, $options, $resultHtml)
         $elementHtmlSelect->expects($this->once())
             ->method('getHtml')
             ->willReturn($resultHtml);
+        $this->escaper->expects($this->once())
+            ->method('escapeHtmlAttr')
+            ->with(__($title))
+            ->willReturn(__($title));
 
         return $elementHtmlSelect;
     }

From 29a2c390837706adc2ae78928ec5871ebc3e4e49 Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Tue, 7 Jan 2020 14:52:48 -0600
Subject: [PATCH 0026/1718] MC-24935: [MFTF] Flaky Test:
 AdminRestrictedUserAddCategoryFromProductPageTest

- Ported changes to 2.4-develop
---
 .../AdminDeleteRoleActionGroup.xml            | 20 ++++++++++++++++---
 .../AdminCreateUserActionGroup.xml            |  2 ++
 .../Mftf/Section/AdminDeleteRoleSection.xml   |  1 +
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml
index 9ee3c79d1288e..c88949f3fde26 100644
--- a/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml
+++ b/app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml
@@ -10,18 +10,32 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminDeleteRoleActionGroup">
         <annotations>
-            <description>Deletes a User Role that contains the text 'Role'. PLEASE NOTE: The Action Group values are Hardcoded.</description>
+            <description>Deletes a User Role.</description>
         </annotations>
         <arguments>
             <argument name="role" defaultValue=""/>
         </arguments>
 
-        <click stepKey="clickOnRole" selector="{{AdminDeleteRoleSection.theRole}}"/>
+        <click stepKey="clickResetFilterButtonBefore" selector="{{AdminRoleGridSection.resetButton}}"/>
+        <waitForPageLoad stepKey="waitForRolesGridFilterResetBefore" time="10"/>
+        <fillField stepKey="TypeRoleFilter" selector="{{AdminRoleGridSection.roleNameFilterTextField}}" userInput="{{role.name}}"/>
+        <waitForElementVisible stepKey="waitForFilterSearchButtonBefore" selector="{{AdminRoleGridSection.searchButton}}" time="10"/>
+        <click stepKey="clickFilterSearchButton" selector="{{AdminRoleGridSection.searchButton}}"/>
+        <waitForPageLoad stepKey="waitForUserRoleFilter" time="10"/>
+        <waitForElementVisible stepKey="waitForRoleInRoleGrid" selector="{{AdminDeleteRoleSection.role(role.name)}}" time="10"/>
+        <click stepKey="clickOnRole" selector="{{AdminDeleteRoleSection.role(role.name)}}"/>
+        <waitForPageLoad stepKey="waitForRolePageToLoad" time="10"/>
         <fillField stepKey="TypeCurrentPassword" selector="{{AdminDeleteRoleSection.current_pass}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
+        <waitForElementVisible stepKey="waitForDeleteRoleButton" selector="{{AdminDeleteRoleSection.delete}}" time="10"/>
         <click stepKey="clickToDeleteRole" selector="{{AdminDeleteRoleSection.delete}}"/>
-        <waitForAjaxLoad stepKey="waitForDeleteConfirmationPopup" time="5"/>
+        <waitForPageLoad stepKey="waitForDeleteConfirmationPopup" time="5"/>
+        <waitForElementVisible stepKey="waitForConfirmButton" selector="{{AdminDeleteRoleSection.confirm}}" time="10"/>
         <click stepKey="clickToConfirm" selector="{{AdminDeleteRoleSection.confirm}}"/>
         <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
         <see stepKey="seeSuccessMessage" userInput="You deleted the role."/>
+        <waitForPageLoad stepKey="waitForRolesGridLoad" />
+        <waitForElementVisible stepKey="waitForResetFilterButtonAfter" selector="{{AdminRoleGridSection.resetButton}}" time="10"/>
+        <click stepKey="clickResetFilterButtonAfter" selector="{{AdminRoleGridSection.resetButton}}"/>
+        <waitForPageLoad stepKey="waitForRolesGridFilterResetAfter" time="10"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserActionGroup.xml
index 8abb4e9224b0a..bd587f4463eef 100644
--- a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserActionGroup.xml
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserActionGroup.xml
@@ -29,8 +29,10 @@
         <fillField selector="{{AdminEditUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="enterCurrentPassword"/>
         <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
         <click selector="{{AdminEditUserSection.userRoleTab}}" stepKey="clickUserRole"/>
+        <waitForPageLoad stepKey="waitForAdminUserRoleTabLoad"/>
         <fillField selector="{{AdminEditUserSection.roleNameFilterTextField}}" userInput="{{role.name}}" stepKey="filterRole"/>
         <click selector="{{AdminEditUserSection.searchButton}}" stepKey="clickSearch"/>
+        <waitForPageLoad stepKey="waitForLoadingMaskToDisappear1"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear1"/>
         <click selector="{{AdminEditUserSection.searchResultFirstRow}}" stepKey="selectRole"/>
         <click selector="{{AdminEditUserSection.saveButton}}" stepKey="clickSaveUser"/>
diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminDeleteRoleSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminDeleteRoleSection.xml
index a3a82f6ce38e0..6a0d0c9210396 100644
--- a/app/code/Magento/User/Test/Mftf/Section/AdminDeleteRoleSection.xml
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminDeleteRoleSection.xml
@@ -11,6 +11,7 @@
     <section name="AdminDeleteRoleSection">
         <element name="theRole" selector="//td[contains(text(), 'Role')]" type="button"/>
         <element name="salesRole" selector="//td[contains(text(), 'Sales')]" type="button"/>
+        <element name="role" parameterized="true" selector="//td[contains(@class,'col-role_name') and contains(text(), '{{roleName}}')]" type="button"/>
         <element name="current_pass" type="button" selector="#current_password"/>
         <element name="delete" selector="//button/span[contains(text(), 'Delete Role')]" type="button"/>
         <element name="confirm" selector="//*[@class='action-primary action-accept']" type="button"/>

From 66654b9315825655dec8684bd8edaff4fe81adfb Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Tue, 7 Jan 2020 14:55:43 -0600
Subject: [PATCH 0027/1718] MC-24935: [MFTF] Flaky Test:
 AdminRestrictedUserAddCategoryFromProductPageTest

- Removed duplicate test step
---
 .../User/Test/Mftf/ActionGroup/AdminCreateUserActionGroup.xml    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserActionGroup.xml
index bd587f4463eef..139d6b2a0f49c 100644
--- a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserActionGroup.xml
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserActionGroup.xml
@@ -33,7 +33,6 @@
         <fillField selector="{{AdminEditUserSection.roleNameFilterTextField}}" userInput="{{role.name}}" stepKey="filterRole"/>
         <click selector="{{AdminEditUserSection.searchButton}}" stepKey="clickSearch"/>
         <waitForPageLoad stepKey="waitForLoadingMaskToDisappear1"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear1"/>
         <click selector="{{AdminEditUserSection.searchResultFirstRow}}" stepKey="selectRole"/>
         <click selector="{{AdminEditUserSection.saveButton}}" stepKey="clickSaveUser"/>
         <waitForPageLoad stepKey="waitForPageLoad2"/>

From a9d376d7c9c9a0e0dd37cb4c485ff7e93f56c764 Mon Sep 17 00:00:00 2001
From: Matthew O'Loughlin <matthew.oloughlin@aligent.com.au>
Date: Wed, 8 Jan 2020 09:33:01 +1030
Subject: [PATCH 0028/1718] GH-26255: Add test coverage for multi-request purge
 tag splitting.

---
 .../CacheInvalidate/Model/PurgeCache.php      |  3 +-
 .../Test/Unit/Model/PurgeCacheTest.php        | 44 +++++++++++++++++++
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
index 8d3cf142bd319..4531eeeee3fce 100644
--- a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
+++ b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
@@ -9,7 +9,6 @@
 
 /**
  * Class PurgeCache
- * @package Magento\CacheInvalidate\Model
  */
 class PurgeCache
 {
@@ -54,7 +53,7 @@ public function __construct(
         \Magento\PageCache\Model\Cache\Server $cacheServer,
         \Magento\CacheInvalidate\Model\SocketFactory $socketAdapterFactory,
         InvalidateLogger $logger,
-        $maxHeaderSize = 7680
+        int $maxHeaderSize = 7680
     ) {
         $this->cacheServer = $cacheServer;
         $this->socketAdapterFactory = $socketAdapterFactory;
diff --git a/app/code/Magento/CacheInvalidate/Test/Unit/Model/PurgeCacheTest.php b/app/code/Magento/CacheInvalidate/Test/Unit/Model/PurgeCacheTest.php
index 1bc1f8d0cf84f..5979e82dd726b 100644
--- a/app/code/Magento/CacheInvalidate/Test/Unit/Model/PurgeCacheTest.php
+++ b/app/code/Magento/CacheInvalidate/Test/Unit/Model/PurgeCacheTest.php
@@ -42,6 +42,7 @@ protected function setUp()
                 'cacheServer' => $this->cacheServer,
                 'socketAdapterFactory' => $socketFactoryMock,
                 'logger' => $this->loggerMock,
+                'maxHeaderSize' => 256
             ]
         );
     }
@@ -85,6 +86,49 @@ public function testSendPurgeRequest($hosts)
         $this->assertTrue($this->model->sendPurgeRequest(['tags']));
     }
 
+    public function testSendMultiPurgeRequest()
+    {
+        $tags = [
+            '(^|,)cat_p_95(,|$)', '(^|,)cat_p_96(,|$)', '(^|,)cat_p_97(,|$)', '(^|,)cat_p_98(,|$)',
+            '(^|,)cat_p_99(,|$)', '(^|,)cat_p_100(,|$)', '(^|,)cat_p_10038(,|$)', '(^|,)cat_p_142985(,|$)',
+            '(^|,)cat_p_199(,|$)', '(^|,)cat_p_300(,|$)', '(^|,)cat_p_12038(,|$)', '(^|,)cat_p_152985(,|$)',
+            '(^|,)cat_p_299(,|$)', '(^|,)cat_p_400(,|$)', '(^|,)cat_p_13038(,|$)', '(^|,)cat_p_162985(,|$)',
+        ];
+
+        $tagsSplitA = array_slice($tags, 0, 12);
+        $tagsSplitB = array_slice($tags, 12, 4);
+
+        $uri =  UriFactory::factory('')->setHost('localhost')
+            ->setPort(80)
+            ->setScheme('http');
+
+        $this->cacheServer->expects($this->once())
+            ->method('getUris')
+            ->willReturn([$uri]);
+
+        $this->socketAdapterMock->expects($this->exactly(2))
+            ->method('connect')
+            ->with($uri->getHost(), $uri->getPort());
+
+        $this->socketAdapterMock->expects($this->exactly(2))
+            ->method('write')
+            ->withConsecutive(
+                [
+                    'PURGE', $uri, '1.1',
+                    ['X-Magento-Tags-Pattern' => implode('|', $tagsSplitA), 'Host' => $uri->getHost()]
+                ],
+                [
+                    'PURGE', $uri, '1.1',
+                    ['X-Magento-Tags-Pattern' => implode('|', $tagsSplitB), 'Host' => $uri->getHost()]
+                ]
+            );
+
+        $this->socketAdapterMock->expects($this->exactly(2))
+            ->method('close');
+
+        $this->assertTrue($this->model->sendPurgeRequest($tags));
+    }
+
     /**
      * @return array
      */

From 5e69e824709d2a3eece6cffd4b04c82f9c891dd0 Mon Sep 17 00:00:00 2001
From: Matthew O'Loughlin <matthew.oloughlin@aligent.com.au>
Date: Wed, 8 Jan 2020 09:59:31 +1030
Subject: [PATCH 0029/1718] GH-26255: Add class descriptions to satisfy
 codesniff rules

---
 app/code/Magento/CacheInvalidate/Model/PurgeCache.php          | 2 +-
 .../Magento/CacheInvalidate/Observer/FlushAllCacheObserver.php | 3 +--
 .../CacheInvalidate/Observer/InvalidateVarnishObserver.php     | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
index 4531eeeee3fce..db629db4d0de0 100644
--- a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
+++ b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
@@ -8,7 +8,7 @@
 use Magento\Framework\Cache\InvalidateLogger;
 
 /**
- * Class PurgeCache
+ * Invalidate external HTTP cache(s) based on tag pattern
  */
 class PurgeCache
 {
diff --git a/app/code/Magento/CacheInvalidate/Observer/FlushAllCacheObserver.php b/app/code/Magento/CacheInvalidate/Observer/FlushAllCacheObserver.php
index 0b22a83c1f27a..574263ca1ee0c 100644
--- a/app/code/Magento/CacheInvalidate/Observer/FlushAllCacheObserver.php
+++ b/app/code/Magento/CacheInvalidate/Observer/FlushAllCacheObserver.php
@@ -8,8 +8,7 @@
 use Magento\Framework\Event\ObserverInterface;
 
 /**
- * Class FlushAllCacheObserver
- * @package Magento\CacheInvalidate\Observer
+ * Clear configured Varnish hosts when triggering a full cache flush (e.g. from the Cache Management admin dashboard)
  */
 class FlushAllCacheObserver implements ObserverInterface
 {
diff --git a/app/code/Magento/CacheInvalidate/Observer/InvalidateVarnishObserver.php b/app/code/Magento/CacheInvalidate/Observer/InvalidateVarnishObserver.php
index 15d8c8e0ed467..62619d3054409 100644
--- a/app/code/Magento/CacheInvalidate/Observer/InvalidateVarnishObserver.php
+++ b/app/code/Magento/CacheInvalidate/Observer/InvalidateVarnishObserver.php
@@ -8,8 +8,7 @@
 use Magento\Framework\Event\ObserverInterface;
 
 /**
- * Class InvalidateVarnishObserver
- * @package Magento\CacheInvalidate\Observer
+ * Trigger invalidations on configured HTTP cache hosts upon cache_clean_by_tags
  */
 class InvalidateVarnishObserver implements ObserverInterface
 {

From 113f81640d92ce30e76317b04ccaa34f28934fea Mon Sep 17 00:00:00 2001
From: Nathan Smith <nathsmit@adobe.com>
Date: Fri, 10 Jan 2020 14:00:00 -0600
Subject: [PATCH 0030/1718] MC-25219: Update messages mechanism

---
 .../AdminUnassignCustomOrderStatusTest.xml    |   2 +-
 .../Security/view/base/requirejs-config.js    |  12 ++
 .../Security/view/base/web/js/escaper.js      | 169 ++++++++++++++++++
 .../Theme/Controller/Result/MessagePlugin.php |   3 +-
 .../view/frontend/templates/messages.phtml    |   5 +-
 .../view/frontend/web/js/view/messages.js     |  16 +-
 .../Security/view/base/web/js/escaper.test.js | 160 +++++++++++++++++
 lib/internal/Magento/Framework/Escaper.php    |  17 +-
 .../Framework/Test/Unit/EscaperTest.php       |   8 +-
 .../Message/InterpretationMediator.php        |   7 +-
 10 files changed, 388 insertions(+), 11 deletions(-)
 create mode 100644 app/code/Magento/Security/view/base/requirejs-config.js
 create mode 100644 app/code/Magento/Security/view/base/web/js/escaper.js
 create mode 100644 dev/tests/js/jasmine/tests/app/code/Magento/Security/view/base/web/js/escaper.test.js

diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminUnassignCustomOrderStatusTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminUnassignCustomOrderStatusTest.xml
index 5f7a7c7606619..ee86b23cff508 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminUnassignCustomOrderStatusTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminUnassignCustomOrderStatusTest.xml
@@ -55,7 +55,7 @@
 
         <!--Click unassign and verify AssertOrderStatusSuccessUnassignMessage-->
         <click selector="{{AdminOrderStatusGridSection.unassign}}" stepKey="clickUnassign"/>
-        <see selector="{{AdminMessagesSection.success}}" userInput="You have unassigned the order status." stepKey="seeAssertOrderStatusSuccessUnassignMessage"/>
+        <waitForText selector="{{AdminMessagesSection.success}}" userInput="You have unassigned the order status." stepKey="seeAssertOrderStatusSuccessUnassignMessage"/>
 
         <!--Verify the order status grid page shows the updated order status and verify AssertOrderStatusInGrid-->
         <actionGroup ref="AssertOrderStatusExistsInGrid" stepKey="seeAssertOrderStatusInGrid">
diff --git a/app/code/Magento/Security/view/base/requirejs-config.js b/app/code/Magento/Security/view/base/requirejs-config.js
new file mode 100644
index 0000000000000..579980336f2cb
--- /dev/null
+++ b/app/code/Magento/Security/view/base/requirejs-config.js
@@ -0,0 +1,12 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+var config = {
+    map: {
+        '*': {
+            escaper: 'Magento_Security/js/escaper'
+        }
+    }
+};
diff --git a/app/code/Magento/Security/view/base/web/js/escaper.js b/app/code/Magento/Security/view/base/web/js/escaper.js
new file mode 100644
index 0000000000000..98769e378ea14
--- /dev/null
+++ b/app/code/Magento/Security/view/base/web/js/escaper.js
@@ -0,0 +1,169 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * A loose JavaScript version of Magento\Framework\Escaper
+ *
+ * Due to differences in how XML/HTML is processed in PHP vs JS there are a couple of minor differences in behavior
+ * from the PHP counterpart.
+ *
+ * The first difference is that the default invocation of escapeHtml without allowedTags will double-escape existing
+ * entities as the intention of such an invocation is that the input isn't supposed to contain any HTML.
+ *
+ * The second difference is that escapeHtml will not escape quotes. Since the input is actually being processed by the
+ * DOM there is no chance of quotes being mixed with HTML syntax. And, since escapeHtml is not
+ * intended to be used with raw injection into a HTML attribute, this is acceptable.
+ *
+ * @api
+ */
+define([], function () {
+    'use strict';
+
+    return {
+        neverAllowedElements: ['script', 'img', 'embed', 'iframe', 'video', 'source', 'object', 'audio'],
+        generallyAllowedAttributes: ['id', 'class', 'href', 'title', 'style'],
+        forbiddenAttributesByElement: {
+            a: ['style']
+        },
+
+        /**
+         * Escape a string for safe injection into HTML
+         *
+         * @param {String} data
+         * @param {Array|null} allowedTags
+         * @returns {String}
+         */
+        escapeHtml: function (data, allowedTags) {
+            var domParser = new DOMParser(),
+                fragment = domParser.parseFromString('<div></div>', 'text/html');
+
+            fragment = fragment.body.childNodes[0];
+            allowedTags = typeof allowedTags === 'object' && allowedTags.length ? allowedTags : null;
+
+            if (allowedTags) {
+                fragment.innerHTML = data || '';
+                allowedTags = this._filterProhibitedTags(allowedTags);
+
+                this._removeComments(fragment);
+                this._removeNotAllowedElements(fragment, allowedTags);
+                this._removeNotAllowedAttributes(fragment);
+
+                return fragment.innerHTML;
+            }
+
+            fragment.textContent = data || '';
+
+            return fragment.innerHTML;
+        },
+
+        /**
+         * Remove the always forbidden tags from a list of provided tags
+         *
+         * @param {Array} tags
+         * @returns {Array}
+         * @private
+         */
+        _filterProhibitedTags: function (tags) {
+            return tags.filter(function (n) {
+                return this.neverAllowedElements.indexOf(n) === -1;
+            }.bind(this));
+        },
+
+        /**
+         * Remove comment nodes from the given node
+         *
+         * @param {Node} node
+         * @private
+         */
+        _removeComments: function (node) {
+            var treeWalker = node.ownerDocument.createTreeWalker(
+                    node,
+                    NodeFilter.SHOW_COMMENT,
+                    function () {
+                        return NodeFilter.FILTER_ACCEPT;
+                    },
+                    false
+                );
+
+            while (treeWalker.nextNode()) {
+                treeWalker.currentNode.parentNode.removeChild(treeWalker.currentNode);
+            }
+        },
+
+        /**
+         * Strip the given node of all disallowed tags while permitting any nested text nodes
+         *
+         * @param {Node} node
+         * @param {Array|null} allowedTags
+         * @private
+         */
+        _removeNotAllowedElements: function (node, allowedTags) {
+            var treeWalker = node.ownerDocument.createTreeWalker(
+                    node,
+                    NodeFilter.SHOW_ELEMENT,
+                    function (currentNode) {
+                        return allowedTags.indexOf(currentNode.nodeName.toLowerCase()) === -1 ?
+                            NodeFilter.FILTER_ACCEPT
+                            // SKIP instead of REJECT because REJECT also rejects child nodes
+                            : NodeFilter.FILTER_SKIP;
+                    },
+                false
+                ),
+                nodesToRemove = [];
+
+            while (treeWalker.nextNode()) {
+                if (allowedTags.indexOf(treeWalker.currentNode.nodeName.toLowerCase()) === -1) {
+                    nodesToRemove.push(treeWalker.currentNode);
+                }
+            }
+
+            nodesToRemove.forEach(function (nodeToRemove) {
+                nodeToRemove.parentNode.replaceChild(
+                    node.ownerDocument.createTextNode(nodeToRemove.textContent),
+                    nodeToRemove
+                );
+            });
+        },
+
+        /**
+         * Remove any invalid attributes from the given node
+         *
+         * @param {Node} node
+         * @private
+         */
+        _removeNotAllowedAttributes: function (node) {
+            var treeWalker = node.ownerDocument.createTreeWalker(
+                    node,
+                    NodeFilter.SHOW_ELEMENT,
+                    function () {
+                        return NodeFilter.FILTER_ACCEPT;
+                    },
+                false
+                ),
+                i,
+                attribute,
+                nodeName,
+                attributesToRemove = [];
+
+            while (treeWalker.nextNode()) {
+                for (i = 0; i < treeWalker.currentNode.attributes.length; i++) {
+                    attribute = treeWalker.currentNode.attributes[i];
+                    nodeName = treeWalker.currentNode.nodeName.toLowerCase();
+
+                    if (this.generallyAllowedAttributes.indexOf(attribute.name) === -1 || // eslint-disable-line max-depth,max-len
+                        this.forbiddenAttributesByElement[nodeName] &&
+                        this.forbiddenAttributesByElement[nodeName].indexOf(attribute.name) !== -1
+                    ) {
+                        attributesToRemove.push(attribute);
+                    }
+                }
+            }
+
+            attributesToRemove.forEach(function (attributeToRemove) {
+                attributeToRemove.ownerElement.removeAttribute(attributeToRemove.name);
+            });
+        }
+    };
+});
diff --git a/app/code/Magento/Theme/Controller/Result/MessagePlugin.php b/app/code/Magento/Theme/Controller/Result/MessagePlugin.php
index 83172df748a47..10cba6e869030 100644
--- a/app/code/Magento/Theme/Controller/Result/MessagePlugin.php
+++ b/app/code/Magento/Theme/Controller/Result/MessagePlugin.php
@@ -14,6 +14,8 @@
 
 /**
  * Plugin for putting messages to cookies
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class MessagePlugin
 {
@@ -116,7 +118,6 @@ public function afterRenderResult(
      *   ],
      * ]
      *
-     *
      * @param array $messages List of Magento messages that must be set as 'mage-messages' cookie.
      * @return void
      */
diff --git a/app/code/Magento/Theme/view/frontend/templates/messages.phtml b/app/code/Magento/Theme/view/frontend/templates/messages.phtml
index dd9b81ecb38b9..85e752635fb3a 100644
--- a/app/code/Magento/Theme/view/frontend/templates/messages.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/messages.phtml
@@ -11,17 +11,18 @@
             class: 'message-' + message.type + ' ' + message.type + ' message',
             'data-ui-id': 'message-' + message.type
         }">
-            <div data-bind="html: message.text"></div>
+            <div data-bind="html: $parent.prepareMessageForHtml(message.text)"></div>
         </div>
     </div>
     <!-- /ko -->
+
     <!-- ko if: messages().messages && messages().messages.length > 0 -->
     <div role="alert" data-bind="foreach: { data: messages().messages, as: 'message' }" class="messages">
         <div data-bind="attr: {
             class: 'message-' + message.type + ' ' + message.type + ' message',
             'data-ui-id': 'message-' + message.type
         }">
-            <div data-bind="html: message.text"></div>
+            <div data-bind="html: $parent.prepareMessageForHtml(message.text)"></div>
         </div>
     </div>
     <!-- /ko -->
diff --git a/app/code/Magento/Theme/view/frontend/web/js/view/messages.js b/app/code/Magento/Theme/view/frontend/web/js/view/messages.js
index cefbf11d73933..8d2ffed2d3bac 100644
--- a/app/code/Magento/Theme/view/frontend/web/js/view/messages.js
+++ b/app/code/Magento/Theme/view/frontend/web/js/view/messages.js
@@ -11,14 +11,16 @@ define([
     'uiComponent',
     'Magento_Customer/js/customer-data',
     'underscore',
+    'escaper',
     'jquery/jquery-storageapi'
-], function ($, Component, customerData, _) {
+], function ($, Component, customerData, _, escaper) {
     'use strict';
 
     return Component.extend({
         defaults: {
             cookieMessages: [],
-            messages: []
+            messages: [],
+            allowedTags: ['div', 'span', 'b', 'strong', 'i', 'em', 'u', 'a']
         },
 
         /**
@@ -38,6 +40,16 @@ define([
             }
 
             $.cookieStorage.set('mage-messages', '');
+        },
+
+        /**
+         * 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/dev/tests/js/jasmine/tests/app/code/Magento/Security/view/base/web/js/escaper.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Security/view/base/web/js/escaper.test.js
new file mode 100644
index 0000000000000..661b3f45ea528
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Security/view/base/web/js/escaper.test.js
@@ -0,0 +1,160 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'escaper'
+], function (escaper) {
+    'use strict';
+
+    /**
+     * Dataprovider for escapeHtml tests
+     *
+     * @return {Object}
+     */
+    function escapeHtmlDataProvider() {
+        return {
+            'empty input': {
+                data: '',
+                expected: ''
+            },
+            'null input': {
+                data: null,
+                expected: ''
+            },
+            'empty with allowed tags': {
+                data: '',
+                expected: '',
+                allowedTags: ['div']
+            },
+            'null allowed tags': {
+                data: null,
+                expected: '',
+                allowedTags: ['div']
+            },
+            'malicious code not executed during processing of allowedTags': {
+                data: '<div>foo<img src="bad" onerror="document.body.innerHTML = &quot;&quot;"></div>',
+                expected: '<div>foo</div>',
+                allowedTags: ['div']
+            },
+            'text with special characters': {
+                data: '&<>"\'&amp;&lt;&gt;&quot;&#039;&#9;',
+                expected: '&amp;&lt;&gt;"\'&amp;amp;&amp;lt;&amp;gt;&amp;quot;&amp;#039;&amp;#9;'
+            },
+            'text with special characters and allowed tag': {
+                data: '&<br/>"\'&amp;&lt;&gt;&quot;&#039;&#9;',
+                expected: '&amp;<br>"\'&amp;&lt;&gt;"\'\t',
+                allowedTags: ['br']
+            },
+            'text with multiple allowed tags, includes self closing tag': {
+                data: '<span>some text in tags<br /></span>',
+                expected: '<span>some text in tags<br></span>',
+                allowedTags: ['span', 'br']
+            },
+            'text with multiple allowed tags and allowed attribute in double quotes': {
+                data: 'Only <span id="sku_max_allowed"><b>2</b></span> in stock',
+                expected: 'Only <span id="sku_max_allowed"><b>2</b></span> in stock',
+                allowedTags: ['span', 'b']
+            },
+            'text with multiple allowed tags and allowed attribute in single quotes': {
+                data: 'Only <span id=\'sku_max_allowed\'><b>2</b></span> in stock',
+                expected: 'Only <span id="sku_max_allowed"><b>2</b></span> in stock',
+                allowedTags: ['span', 'b']
+            },
+            'text with multiple allowed tags with allowed attribute': {
+                data: 'Only registered users can write reviews. Please <a href="%1">Sign in</a> or <a href="%2">' +
+                    'create an account</a>',
+                expected: 'Only registered users can write reviews. Please <a href="%1">Sign in</a> or ' +
+                    '<a href="%2">create an account</a>',
+                allowedTags: ['a']
+            },
+            'text with not allowed attribute in single quotes': {
+                data: 'Only <span type=\'1\'><b>2</b></span> in stock',
+                expected: 'Only <span><b>2</b></span> in stock',
+                allowedTags: ['span', 'b']
+            },
+            'text with allowed and not allowed tags': {
+                data: 'Only registered users can write reviews. Please <a href="%1">Sign in<span>three</span></a> ' +
+                    'or <a href="%2"><span id="action">create an account</span></a>',
+                expected: 'Only registered users can write reviews. Please <a href="%1">Sign inthree</a> or ' +
+                    '<a href="%2">create an account</a>',
+                allowedTags: ['a']
+            },
+            'text with allowed and not allowed tags, with allowed and not allowed attributes': {
+                data: 'Some test <span style="fine">text in span tag</span> <strong>text in strong tag</strong> ' +
+                    '<a type="some-type" href="http://domain.com/" style="bad" onclick="alert(1)">' +
+                    'Click here</a><script>alert(1)' +
+                    '</script>',
+                expected: 'Some test <span style="fine">text in span tag</span> text in strong tag ' +
+                    '<a href="http://domain.com/">' +
+                    'Click here</a>alert(1)',
+                allowedTags: ['a', 'span']
+            },
+            'text with html comment': {
+                data: 'Only <span><b>2</b></span> in stock <!-- HTML COMMENT -->',
+                expected: 'Only <span><b>2</b></span> in stock ',
+                allowedTags: ['span', 'b']
+            },
+            'text with multi-line html comment': {
+                data: 'Only <span><b>2</b></span> in stock <!-- --!\n\n><img src=#>-->',
+                expected: 'Only <span><b>2</b></span> in stock ',
+                allowedTags: ['span', 'b']
+            },
+            'text with non ascii characters': {
+                data: 'абвгдمثال幸福',
+                expected: 'абвгдمثال幸福',
+                allowedTags: []
+            },
+            'html and body tags': {
+                data: '<html><body><span>String</span></body></html>',
+                expected: '<span>String</span>',
+                allowedTags: ['span']
+            },
+            'invalid tag': {
+                data: '<some tag> some text',
+                expected: ' some text',
+                allowedTags: ['span']
+            },
+            'text with allowed script tag': {
+                data: '<span><script>some text in tags</script></span>',
+                expected: '<span>some text in tags</span>',
+                allowedTags: ['span', 'script']
+            },
+            'text with invalid html': {
+                data: '<spa>n id="id1">Some string</span>',
+                expected: 'n id="id1"&gt;Some string',
+                allowedTags: ['span']
+            }
+        };
+    }
+
+    describe('Magento_Security/js/escaper', function () {
+        describe('escapeHtml', function () {
+            var data = escapeHtmlDataProvider(),
+                scenarioName,
+                testData;
+
+            for (scenarioName in data) { // eslint-disable-line guard-for-in
+                testData = data[scenarioName];
+
+                (function (dataSet) { // eslint-disable-line no-loop-func
+                    /*
+                     * Change to "it" instead of "xit" to run the tests.
+                     * These are skipped due to PhantomJS not supporting DOMParser. The limitations of this ancient
+                     * testing framework were not considered a limitation for a cross-browser solution of the escaper
+                     * and the compromise was these tests won't be run automatically. Jasmine will generate
+                     * _SpecRunner.html which can be loaded in a real browser to execute the tests when they need to be
+                     * run. Regarding risk, this escaper doesn't have any external dependencies so it's very unlikely
+                     * it will break unless modified directly. And in the event it's modified, run the tests in real
+                     * supported browsers before merging.
+                     */
+                    xit(scenarioName, function () {
+                        expect(escaper.escapeHtml(dataSet.data, dataSet.allowedTags)).toEqual(dataSet.expected);
+                    });
+                })(testData);
+            }
+        });
+    });
+});
diff --git a/lib/internal/Magento/Framework/Escaper.php b/lib/internal/Magento/Framework/Escaper.php
index dd7a780af09fe..6af03a868cc49 100644
--- a/lib/internal/Magento/Framework/Escaper.php
+++ b/lib/internal/Magento/Framework/Escaper.php
@@ -41,7 +41,12 @@ class Escaper
     /**
      * @var string[]
      */
-    private $allowedAttributes = ['id', 'class', 'href', 'target', 'title', 'style'];
+    private $allowedAttributes = ['id', 'class', 'href', 'title', 'style'];
+
+    /**
+     * @var array
+     */
+    private $notAllowedAttributes = ['a' => ['style']];
 
     /**
      * @var string
@@ -168,6 +173,16 @@ private function removeNotAllowedAttributes(\DOMDocument $domDocument)
         foreach ($nodes as $node) {
             $node->parentNode->removeAttribute($node->nodeName);
         }
+
+        foreach ($this->notAllowedAttributes as $tag => $attributes) {
+            $nodes = $xpath->query(
+                '//@*[name() =\'' . implode('\' or name() = \'', $attributes) . '\']'
+                . '[parent::node()[name() = \'' . $tag . '\']]'
+            );
+            foreach ($nodes as $node) {
+                $node->parentNode->removeAttribute($node->nodeName);
+            }
+        }
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php b/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php
index cde91cbda4891..581053a9823b1 100644
--- a/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php
@@ -230,10 +230,12 @@ public function escapeHtmlDataProvider()
                 'allowedTags' => ['a'],
             ],
             'text with allowed and not allowed tags, with allowed and not allowed attributes' => [
-                'data' => 'Some test <span>text in span tag</span> <strong>text in strong tag</strong> '
-                    . '<a type="some-type" href="http://domain.com/" onclick="alert(1)">Click here</a><script>alert(1)'
+                'data' => 'Some test <span style="fine">text in span tag</span> <strong>text in strong tag</strong> '
+                    . '<a type="some-type" href="http://domain.com/" style="bad" onclick="alert(1)">'
+                    . 'Click here</a><script>alert(1)'
                     . '</script>',
-                'expected' => 'Some test <span>text in span tag</span> text in strong tag <a href="http://domain.com/">'
+                'expected' => 'Some test <span style="fine">text in span tag</span> text in strong tag '
+                    . '<a href="http://domain.com/">'
                     . 'Click here</a>alert(1)',
                 'allowedTags' => ['a', 'span'],
             ],
diff --git a/lib/internal/Magento/Framework/View/Element/Message/InterpretationMediator.php b/lib/internal/Magento/Framework/View/Element/Message/InterpretationMediator.php
index eb4312e523b45..306cf89c0bb01 100644
--- a/lib/internal/Magento/Framework/View/Element/Message/InterpretationMediator.php
+++ b/lib/internal/Magento/Framework/View/Element/Message/InterpretationMediator.php
@@ -3,10 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\View\Element\Message;
 
 use Magento\Framework\Message\MessageInterface;
 
+/**
+ * Can try and interpret a given message or fall back to the message text if not possible
+ */
 class InterpretationMediator implements InterpretationStrategyInterface
 {
     /**
@@ -34,8 +39,8 @@ public function interpret(MessageInterface $message)
         if ($message->getIdentifier()) {
             try {
                 return $this->interpretationStrategy->interpret($message);
+                // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock.DetectedCatch
             } catch (\LogicException $e) {
-                // pass
             }
         }
 

From e8ecc493e3ff81f7daf2f3bfc2d4c6861318e629 Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Mon, 13 Jan 2020 11:29:28 +0200
Subject: [PATCH 0031/1718] MC-29736: Minor changes ui render

---
 app/code/Magento/Ui/Controller/Index/Render.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Ui/Controller/Index/Render.php b/app/code/Magento/Ui/Controller/Index/Render.php
index faab203547064..64c950d50c308 100644
--- a/app/code/Magento/Ui/Controller/Index/Render.php
+++ b/app/code/Magento/Ui/Controller/Index/Render.php
@@ -92,11 +92,8 @@ public function __construct(
     public function execute()
     {
         if ($this->_request->getParam('namespace') === null) {
-            $this->_redirect('admin/noroute');
-
-            return;
+            return $this->_redirect('noroute');
         }
-
         try {
             $component = $this->uiComponentFactory->create($this->getRequest()->getParam('namespace'));
             if ($this->validateAclResource($component->getContext()->getDataProvider()->getConfigData())) {
@@ -105,6 +102,7 @@ public function execute()
 
                 $contentType = $this->contentTypeResolver->resolve($component->getContext());
                 $this->getResponse()->setHeader('Content-Type', $contentType, true);
+                return $this->getResponse();
             } else {
                 /** @var \Magento\Framework\Controller\Result\Json $resultJson */
                 $resultJson = $this->resultJsonFactory->create();

From 3768575ff4e1c1af47e4b844786e9d88b6895c0a Mon Sep 17 00:00:00 2001
From: Nathan Smith <nathsmit@adobe.com>
Date: Mon, 13 Jan 2020 09:55:20 -0600
Subject: [PATCH 0032/1718] MC-25219: Update messages mechanism

---
 app/code/Magento/Security/view/base/web/js/escaper.js    | 9 +++++++--
 .../Magento/Security/view/base/web/js/escaper.test.js    | 5 +++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Security/view/base/web/js/escaper.js b/app/code/Magento/Security/view/base/web/js/escaper.js
index 98769e378ea14..dc1c896ad6836 100644
--- a/app/code/Magento/Security/view/base/web/js/escaper.js
+++ b/app/code/Magento/Security/view/base/web/js/escaper.js
@@ -85,11 +85,16 @@ define([], function () {
                         return NodeFilter.FILTER_ACCEPT;
                     },
                     false
-                );
+                ),
+                nodesToRemove = [];
 
             while (treeWalker.nextNode()) {
-                treeWalker.currentNode.parentNode.removeChild(treeWalker.currentNode);
+                nodesToRemove.push(treeWalker.currentNode);
             }
+
+            nodesToRemove.forEach(function (nodeToRemove) {
+                nodeToRemove.parentNode.removeChild(nodeToRemove);
+            });
         },
 
         /**
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Security/view/base/web/js/escaper.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Security/view/base/web/js/escaper.test.js
index 661b3f45ea528..f8fa6bc70435f 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Security/view/base/web/js/escaper.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Security/view/base/web/js/escaper.test.js
@@ -97,6 +97,11 @@ define([
                 expected: 'Only <span><b>2</b></span> in stock ',
                 allowedTags: ['span', 'b']
             },
+            'text with multiple comments': {
+                data: 'Only <span><b>2</b></span> <!-- HTML COMMENT -->in stock <!-- HTML COMMENT -->',
+                expected: 'Only <span><b>2</b></span> in stock ',
+                allowedTags: ['span', 'b']
+            },
             'text with multi-line html comment': {
                 data: 'Only <span><b>2</b></span> in stock <!-- --!\n\n><img src=#>-->',
                 expected: 'Only <span><b>2</b></span> in stock ',

From 7c35aede8fb732e6063d81144a5e2260e7293310 Mon Sep 17 00:00:00 2001
From: Mark Berube <berube@adobe.com>
Date: Wed, 15 Jan 2020 14:39:38 -0600
Subject: [PATCH 0033/1718] MC-30416: Validating AreaList's FrontEndName
 argument

---
 lib/internal/Magento/Framework/App/AreaList.php     |  5 ++++-
 .../Framework/App/Test/Unit/AreaListTest.php        | 13 +++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/App/AreaList.php b/lib/internal/Magento/Framework/App/AreaList.php
index fb28d09d5fe09..3257307eb6cdd 100644
--- a/lib/internal/Magento/Framework/App/AreaList.php
+++ b/lib/internal/Magento/Framework/App/AreaList.php
@@ -7,6 +7,9 @@
  */
 namespace Magento\Framework\App;
 
+/**
+ * Lists router area codes & processes resolves FrontEndNames to area codes
+ */
 class AreaList
 {
     /**
@@ -72,7 +75,7 @@ public function getCodeByFrontName($frontName)
                 $resolver = $this->_resolverFactory->create($areaInfo['frontNameResolver']);
                 $areaInfo['frontName'] = $resolver->getFrontName(true);
             }
-            if ($areaInfo['frontName'] == $frontName) {
+            if ($areaInfo['frontName'] === $frontName) {
                 return $areaCode;
             }
         }
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/AreaListTest.php b/lib/internal/Magento/Framework/App/Test/Unit/AreaListTest.php
index 8688cc3fcb2e9..e0fbb0e8b64e7 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/AreaListTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/AreaListTest.php
@@ -100,6 +100,19 @@ public function testGetFrontNameWhenAreaCodeAndFrontNameArentSet()
         $this->assertSame('test', $model->getArea($code));
     }
 
+    public function testGetFrontNameWhenFrontNameIsInvalid() : void
+    {
+        $this->_model = new AreaList(
+            $this->objectManagerMock,
+            $this->_resolverFactory,
+            [
+                'testAreaCode' => []
+            ]
+        );
+
+        $this->assertNull($this->_model->getFrontName('0'));
+    }
+
     public function testGetCodes()
     {
         $areas = ['area1' => 'value1', 'area2' => 'value2'];

From 30741f6aa83e9904c62c928f8f7994d63f04b94b Mon Sep 17 00:00:00 2001
From: Serhii Voloshkov <serhii.voloshkov@transoftgroup.com>
Date: Wed, 29 Jan 2020 11:39:23 +0200
Subject: [PATCH 0034/1718] MC-30845: Fix error message rendering

---
 .../Controller/Sidebar/RemoveItem.php         | 13 +++++-
 .../Controller/Sidebar/RemoveItemTest.php     | 46 +++++++++++++++++++
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php b/app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php
index f589e702de950..e0c7f34a4c7d0 100644
--- a/app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php
+++ b/app/code/Magento/Checkout/Controller/Sidebar/RemoveItem.php
@@ -7,6 +7,9 @@
 
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 
+/**
+ * Controller for removing quote item from shopping cart.
+ */
 class RemoveItem extends \Magento\Framework\App\Action\Action implements HttpPostActionInterface
 {
     /**
@@ -56,7 +59,7 @@ public function __construct(
     }
 
     /**
-     * @return $this
+     * @inheritdoc
      */
     public function execute()
     {
@@ -67,11 +70,17 @@ public function execute()
         try {
             $this->sidebar->checkQuoteItem($itemId);
             $this->sidebar->removeQuoteItem($itemId);
+
             return $this->jsonResponse();
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             return $this->jsonResponse($e->getMessage());
+        } catch (\Zend_Db_Exception $e) {
+            $this->logger->critical($e);
+
+            return $this->jsonResponse(__('An unspecified error occurred. Please contact us for assistance.'));
         } catch (\Exception $e) {
             $this->logger->critical($e);
+
             return $this->jsonResponse($e->getMessage());
         }
     }
@@ -92,6 +101,8 @@ protected function jsonResponse($error = '')
     }
 
     /**
+     * Return formKey Validator object instance.
+     *
      * @return \Magento\Framework\Data\Form\FormKey\Validator
      * @deprecated 100.0.9
      */
diff --git a/app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/RemoveItemTest.php b/app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/RemoveItemTest.php
index 7653a51b2f9b7..50f5c0ba42986 100644
--- a/app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/RemoveItemTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/RemoveItemTest.php
@@ -234,6 +234,52 @@ public function testExecuteWithException()
         $this->assertEquals('json represented', $this->removeItem->execute());
     }
 
+    /**
+     * Test controller when DB exception is thrown.
+     *
+     * @return void
+     */
+    public function testExecuteWithDbException(): void
+    {
+        $itemId = 1;
+        $dbError = 'Error';
+        $message = __('An unspecified error occurred. Please contact us for assistance.');
+        $response = [
+            'success' => false,
+            'error_message' => $message,
+        ];
+
+        $this->getPropertyValue($this->removeItem, 'formKeyValidator')
+            ->expects($this->once())
+            ->method('validate')
+            ->with($this->requestMock)
+            ->willReturn(true);
+        $this->requestMock->expects($this->once())->method('getParam')->with('item_id')->willReturn($itemId);
+
+        $exception = new \Zend_Db_Exception($dbError);
+
+        $this->sidebarMock->expects($this->once())
+            ->method('checkQuoteItem')
+            ->with($itemId)
+            ->willThrowException($exception);
+
+        $this->loggerMock->expects($this->once())->method('critical')->with($exception);
+
+        $this->sidebarMock->expects($this->once())->method('getResponseData')->with($message)->willReturn($response);
+        $encodedResponse = json_encode($response);
+        $this->jsonHelperMock->expects($this->once())
+            ->method('jsonEncode')
+            ->with($response)
+            ->willReturn($encodedResponse);
+
+        $this->responseMock->expects($this->once())
+            ->method('representJson')
+            ->with($encodedResponse)
+            ->willReturn($this->responseMock);
+
+        $this->removeItem->execute();
+    }
+
     public function testExecuteWhenFormKeyValidationFailed()
     {
         $resultRedirect = $this->createMock(\Magento\Framework\Controller\Result\Redirect::class);

From 4459cb0829e96f5ac9835a999cf3d649cf81278e Mon Sep 17 00:00:00 2001
From: Aditya Yadav <adityayadav@cedcommerce.com>
Date: Sun, 2 Feb 2020 14:57:43 +0530
Subject: [PATCH 0035/1718] Update Save.php

This keeps the form data persistent when the an Integration Exception is throw as a case when name of Integration being added is same.
---
 .../Integration/Controller/Adminhtml/Integration/Save.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php
index 8bcbb45653494..ea255487b9df1 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php
@@ -74,7 +74,7 @@ public function execute()
             $this->_redirectOnSaveError();
         } catch (IntegrationException $e) {
             $this->messageManager->addError($this->escaper->escapeHtml($e->getMessage()));
-            $this->_getSession()->setIntegrationData($integrationData);
+            $this->_getSession()->setIntegrationData($this->getRequest()->getPostValue());
             $this->_redirectOnSaveError();
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             $this->messageManager->addError($this->escaper->escapeHtml($e->getMessage()));

From 1e217f392f942d7d8e0b174ebf8a89bd4a21105b Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Wed, 5 Feb 2020 14:10:18 +0200
Subject: [PATCH 0036/1718] MC-30942: Improve Newsletter Queue

---
 .../Magento/Newsletter/Block/Adminhtml/Queue/Preview.php    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview.php b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview.php
index dd6f51a5342f2..69512775f4e93 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview.php
@@ -26,8 +26,8 @@ class Preview extends \Magento\Newsletter\Block\Adminhtml\Template\Preview
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Newsletter\Model\TemplateFactory $templateFactory
-     * @param \Magento\Newsletter\Model\QueueFactory $queueFactory
      * @param \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory
+     * @param \Magento\Newsletter\Model\QueueFactory $queueFactory
      * @param array $data
      */
     public function __construct(
@@ -42,6 +42,8 @@ public function __construct(
     }
 
     /**
+     * Return template.
+     *
      * @param \Magento\Newsletter\Model\Template $template
      * @param string $id
      * @return $this
@@ -50,9 +52,11 @@ protected function loadTemplate(\Magento\Newsletter\Model\Template $template, $i
     {
         /** @var \Magento\Newsletter\Model\Queue $queue */
         $queue = $this->_queueFactory->create()->load($id);
+        $template->setId($queue->getTemplateId());
         $template->setTemplateType($queue->getNewsletterType());
         $template->setTemplateText($queue->getNewsletterText());
         $template->setTemplateStyles($queue->getNewsletterStyles());
+
         return $this;
     }
 }

From 3347656e5431122e09114fa868ed8af0c4848b5e Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Thu, 6 Feb 2020 14:51:25 +0200
Subject: [PATCH 0037/1718] MC-30942: Improve Newsletter Queue

---
 .../Block/Adminhtml/Queue/PreviewTest.php     | 72 +++++++++++++------
 1 file changed, 50 insertions(+), 22 deletions(-)

diff --git a/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Queue/PreviewTest.php b/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Queue/PreviewTest.php
index b64453594df41..19e0f4704a379 100644
--- a/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Queue/PreviewTest.php
+++ b/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Queue/PreviewTest.php
@@ -49,18 +49,18 @@ protected function setUp()
     {
         $context = $this->createMock(\Magento\Backend\Block\Template\Context::class);
         $eventManager = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
-        $context->expects($this->once())->method('getEventManager')->will($this->returnValue($eventManager));
+        $context->expects($this->once())->method('getEventManager')->willReturn($eventManager);
         $scopeConfig = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
-        $context->expects($this->once())->method('getScopeConfig')->will($this->returnValue($scopeConfig));
+        $context->expects($this->once())->method('getScopeConfig')->willReturn($scopeConfig);
         $this->request = $this->createMock(\Magento\Framework\App\Request\Http::class);
-        $context->expects($this->once())->method('getRequest')->will($this->returnValue($this->request));
+        $context->expects($this->once())->method('getRequest')->willReturn($this->request);
         $this->storeManager = $this->createPartialMock(
             \Magento\Store\Model\StoreManager::class,
             ['getStores', 'getDefaultStoreView']
         );
-        $context->expects($this->once())->method('getStoreManager')->will($this->returnValue($this->storeManager));
+        $context->expects($this->once())->method('getStoreManager')->willReturn($this->storeManager);
         $appState = $this->createMock(\Magento\Framework\App\State::class);
-        $context->expects($this->once())->method('getAppState')->will($this->returnValue($appState));
+        $context->expects($this->once())->method('getAppState')->willReturn($appState);
 
         $backendSession = $this->getMockBuilder(\Magento\Backend\Model\Session::class)
             ->disableOriginalConstructor()
@@ -69,16 +69,34 @@ protected function setUp()
         $context->expects($this->once())->method('getBackendSession')->willReturn($backendSession);
 
         $templateFactory = $this->createPartialMock(\Magento\Newsletter\Model\TemplateFactory::class, ['create']);
-        $this->template = $this->createMock(\Magento\Newsletter\Model\Template::class);
-        $templateFactory->expects($this->once())->method('create')->will($this->returnValue($this->template));
+        $this->template = $this->createPartialMock(
+            \Magento\Newsletter\Model\Template::class,
+            [
+                'isPlain',
+                'setId',
+                'setTemplateType',
+                'setTemplateText',
+                'setTemplateStyles',
+            ]
+        );
+        $templateFactory->expects($this->once())->method('create')->willReturn($this->template);
 
         $subscriberFactory = $this->createPartialMock(\Magento\Newsletter\Model\SubscriberFactory::class, ['create']);
         $this->subscriber = $this->createMock(\Magento\Newsletter\Model\Subscriber::class);
-        $subscriberFactory->expects($this->once())->method('create')->will($this->returnValue($this->subscriber));
+        $subscriberFactory->expects($this->once())->method('create')->willReturn($this->subscriber);
 
         $queueFactory = $this->createPartialMock(\Magento\Newsletter\Model\QueueFactory::class, ['create']);
-        $this->queue = $this->createPartialMock(\Magento\Newsletter\Model\Queue::class, ['load']);
-        $queueFactory->expects($this->any())->method('create')->will($this->returnValue($this->queue));
+        $this->queue = $this->createPartialMock(
+            \Magento\Newsletter\Model\Queue::class,
+            [
+                'load',
+                'getTemplateId',
+                'getNewsletterType',
+                'getNewsletterText',
+                'getNewsletterStyles',
+            ]
+        );
+        $queueFactory->expects($this->any())->method('create')->willReturn($this->queue);
 
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
@@ -100,27 +118,37 @@ public function testToHtmlEmpty()
     {
         /** @var \Magento\Store\Model\Store $store */
         $store = $this->createPartialMock(\Magento\Store\Model\Store::class, ['getId']);
-        $this->storeManager->expects($this->once())->method('getDefaultStoreView')->will($this->returnValue($store));
+        $this->storeManager->expects($this->once())->method('getDefaultStoreView')->willReturn($store);
         $result = $this->preview->toHtml();
         $this->assertEquals('', $result);
     }
 
     public function testToHtmlWithId()
     {
-        $this->request->expects($this->any())->method('getParam')->will(
-            $this->returnValueMap(
-                [
-                    ['id', null, 1],
-                    ['store_id', null, 0]
-                ]
-            )
+        $templateId = 1;
+        $newsletterType = 2;
+        $newsletterText = 'newsletter text';
+        $newsletterStyle = 'style';
+        $this->request->expects($this->any())->method('getParam')->willReturnMap(
+            [
+                ['id', null, 1],
+                ['store_id', null, 0],
+            ]
         );
-        $this->queue->expects($this->once())->method('load')->will($this->returnSelf());
-        $this->template->expects($this->any())->method('isPlain')->will($this->returnValue(true));
+        $this->queue->expects($this->once())->method('load')->willReturnSelf();
+        $this->queue->expects($this->once())->method('getTemplateId')->willReturn($templateId);
+        $this->queue->expects($this->once())->method('getNewsletterType')->willReturn($newsletterType);
+        $this->queue->expects($this->once())->method('getNewsletterText')->willReturn($newsletterText);
+        $this->queue->expects($this->once())->method('getNewsletterStyles')->willReturn($newsletterStyle);
+        $this->template->expects($this->any())->method('isPlain')->willReturn(true);
+        $this->template->expects($this->once())->method('setId')->willReturn($templateId);
+        $this->template->expects($this->once())->method('setTemplateType')->willReturn($newsletterType);
+        $this->template->expects($this->once())->method('setTemplateText')->willReturn($newsletterText);
+        $this->template->expects($this->once())->method('setTemplateStyles')->willReturn($newsletterStyle);
         /** @var \Magento\Store\Model\Store $store */
-        $this->storeManager->expects($this->once())->method('getDefaultStoreView')->will($this->returnValue(null));
+        $this->storeManager->expects($this->once())->method('getDefaultStoreView')->willReturn(null);
         $store = $this->createPartialMock(\Magento\Store\Model\Store::class, ['getId']);
-        $this->storeManager->expects($this->once())->method('getStores')->will($this->returnValue([0 => $store]));
+        $this->storeManager->expects($this->once())->method('getStores')->willReturn([0 => $store]);
         $result = $this->preview->toHtml();
         $this->assertEquals('<pre></pre>', $result);
     }

From 045f7f2168b9e3597df0628de3280686483a6008 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Mon, 10 Feb 2020 10:10:14 +0200
Subject: [PATCH 0038/1718] MC-30946: Improve legacy email template

---
 .../Framework/Filter/VariableResolver/LegacyResolver.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Filter/VariableResolver/LegacyResolver.php b/lib/internal/Magento/Framework/Filter/VariableResolver/LegacyResolver.php
index 179f36e1683d1..a46dc64ed0b5b 100644
--- a/lib/internal/Magento/Framework/Filter/VariableResolver/LegacyResolver.php
+++ b/lib/internal/Magento/Framework/Filter/VariableResolver/LegacyResolver.php
@@ -160,7 +160,7 @@ private function handleObjectMethod(Template $filter, array $templateVariables,
     {
         $object = $stackArgs[$i - 1]['variable'];
         $method = $stackArgs[$i]['name'];
-        if (method_exists($object, $method)) {
+        if (method_exists($object, $method) && substr($method, 0, 3) !== 'set') {
             $args = $this->getStackArgs($stackArgs[$i]['args'], $filter, $templateVariables);
             $stackArgs[$i]['variable'] = call_user_func_array([$object, $method], $args);
         }

From 7853ddc6101d454009d23830f1c1552193fb7c93 Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Tue, 11 Feb 2020 14:14:04 -0600
Subject: [PATCH 0039/1718] MC-31362: Media folder update

- Fixed issues with folder deletion
- Fixed issue with image upload extensions
- Added test coverage for changes
---
 .../Adminhtml/Wysiwyg/Images/DeleteFolder.php |  7 ++-
 .../Theme/Model/Design/Backend/File.php       | 26 +++++++++--
 .../App/Filesystem/DirectoryResolverTest.php  | 46 +++++++++++++++++++
 .../App/Filesystem/DirectoryResolver.php      | 21 +++++++++
 4 files changed, 93 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
index 5344472a79a9d..b483da185a3ea 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
@@ -60,13 +60,16 @@ public function execute()
     {
         try {
             $path = $this->getStorage()->getCmsWysiwygImages()->getCurrentPath();
-            if (!$this->directoryResolver->validatePath($path, DirectoryList::MEDIA)) {
+            if (
+                !$this->directoryResolver->validatePath($path, DirectoryList::MEDIA)
+                || $this->directoryResolver->validateSamePath($path, DirectoryList::MEDIA)
+            ) {
                 throw new \Magento\Framework\Exception\LocalizedException(
                     __('Directory %1 is not under storage root path.', $path)
                 );
             }
             $this->getStorage()->deleteDirectory($path);
-            
+
             return $this->resultRawFactory->create();
         } catch (\Exception $e) {
             $result = ['error' => true, 'message' => $e->getMessage()];
diff --git a/app/code/Magento/Theme/Model/Design/Backend/File.php b/app/code/Magento/Theme/Model/Design/Backend/File.php
index 8f81ace8c9047..2fb90566e9ae7 100644
--- a/app/code/Magento/Theme/Model/Design/Backend/File.php
+++ b/app/code/Magento/Theme/Model/Design/Backend/File.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Theme\Model\Design\Backend;
 
-use Magento\Config\Model\Config\Backend\File\RequestData\RequestDataInterface;
 use Magento\Config\Model\Config\Backend\File as BackendFile;
+use Magento\Config\Model\Config\Backend\File\RequestData\RequestDataInterface;
 use Magento\Framework\App\Cache\TypeListInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ObjectManager;
@@ -15,13 +15,14 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\File\Mime;
 use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Io\File as IoFileSystem;
 use Magento\Framework\Model\Context;
 use Magento\Framework\Model\ResourceModel\AbstractResource;
 use Magento\Framework\Registry;
 use Magento\Framework\UrlInterface;
+use Magento\MediaStorage\Helper\File\Storage\Database;
 use Magento\MediaStorage\Model\File\UploaderFactory;
 use Magento\Theme\Model\Design\Config\FileUploader\FileProcessor;
-use Magento\MediaStorage\Helper\File\Storage\Database;
 
 /**
  * File Backend
@@ -45,6 +46,11 @@ class File extends BackendFile
      */
     private $databaseHelper;
 
+    /**
+     * @var IoFileSystem
+     */
+    private $ioFileSystem;
+
     /**
      * @param Context $context
      * @param Registry $registry
@@ -54,6 +60,7 @@ class File extends BackendFile
      * @param RequestDataInterface $requestData
      * @param Filesystem $filesystem
      * @param UrlInterface $urlBuilder
+     * @param IoFileSystem $ioFileSystem
      * @param AbstractResource|null $resource
      * @param AbstractDb|null $resourceCollection
      * @param array $data
@@ -69,6 +76,7 @@ public function __construct(
         RequestDataInterface $requestData,
         Filesystem $filesystem,
         UrlInterface $urlBuilder,
+        IoFileSystem $ioFileSystem,
         AbstractResource $resource = null,
         AbstractDb $resourceCollection = null,
         array $data = [],
@@ -86,6 +94,7 @@ public function __construct(
             $resourceCollection,
             $data
         );
+        $this->ioFileSystem = $ioFileSystem;
         $this->urlBuilder = $urlBuilder;
         $this->databaseHelper = $databaseHelper ?: ObjectManager::getInstance()->get(Database::class);
     }
@@ -108,11 +117,18 @@ public function beforeSave()
                 __('%1 does not contain field \'file\'', $this->getData('field_config/field'))
             );
         }
+
+        if (!in_array($this->ioFileSystem->getPathInfo(($file))['extension'], $this->getAllowedExtensions())) {
+            throw new LocalizedException(
+                __('Something is wrong with the file upload settings.')
+            );
+        }
+
         if (isset($value['exists'])) {
             $this->setValue($file);
             return $this;
         }
-      
+
         //phpcs:ignore Magento2.Functions.DiscouragedFunction
         $this->updateMediaDirectory(basename($file), $value['url']);
 
@@ -156,7 +172,7 @@ public function afterLoad()
      */
     public function getAllowedExtensions()
     {
-        return [];
+        return ['jpg', 'jpeg', 'gif', 'png'];
     }
 
     /**
@@ -196,7 +212,7 @@ protected function getStoreMediaUrl($fileName)
             $urlType = ['_type' => empty($baseUrl['type']) ? 'link' : (string)$baseUrl['type']];
             $baseUrl = $baseUrl['value'] . '/';
         }
-        return $this->urlBuilder->getBaseUrl($urlType) . $baseUrl  . $fileName;
+        return $this->urlBuilder->getBaseUrl($urlType) . $baseUrl . $fileName;
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/Filesystem/DirectoryResolverTest.php b/dev/tests/integration/testsuite/Magento/Framework/App/Filesystem/DirectoryResolverTest.php
index 90d8473032c69..b7f13112384df 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/App/Filesystem/DirectoryResolverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/App/Filesystem/DirectoryResolverTest.php
@@ -120,4 +120,50 @@ public function validatePathDataProvider()
             ],
         ];
     }
+
+    /**
+     * @param string $path
+     * @param string $directoryConfig
+     * @param bool $expectation
+     * @dataProvider validateSamePathDataProvider
+     * @throws \Magento\Framework\Exception\FileSystemException
+     * @magentoAppIsolation enabled
+     * @return void
+     */
+    public function testValidateSamePath($path, $directoryConfig, $expectation)
+    {
+        $directory = $this->filesystem
+            ->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::MEDIA);
+        $path = $directory->getAbsolutePath() .'/' .$path;
+        $this->assertEquals($expectation, $this->directoryResolver->validateSamePath($path, $directoryConfig));
+    }
+
+    /**
+     * @return array
+     */
+    public function validateSamePathDataProvider()
+    {
+        return [
+            [
+                '/',
+                DirectoryList::MEDIA,
+                true,
+            ],
+            [
+                '/.',
+                DirectoryList::MEDIA,
+                true,
+            ],
+            [
+                '/../../pub/media/.',
+                DirectoryList::MEDIA,
+                true,
+            ],
+            [
+                '/../../pub/',
+                DirectoryList::MEDIA,
+                false,
+            ],
+        ];
+    }
 }
diff --git a/lib/internal/Magento/Framework/App/Filesystem/DirectoryResolver.php b/lib/internal/Magento/Framework/App/Filesystem/DirectoryResolver.php
index 5ad3d888ffb57..ecdef2269522d 100644
--- a/lib/internal/Magento/Framework/App/Filesystem/DirectoryResolver.php
+++ b/lib/internal/Magento/Framework/App/Filesystem/DirectoryResolver.php
@@ -55,4 +55,25 @@ public function validatePath($path, $directoryConfig = DirectoryList::MEDIA)
 
         return strpos($realPath, $root) === 0;
     }
+
+    /**
+     * Validate same path.
+     *
+     * Gets real path for directory provided in parameters and compares it with specified root directory.
+     * Will return TRUE if real path of provided value is root directory path and FALSE if not.
+     * Throws the \Magento\Framework\Exception\FileSystemException in case when directory path is absent
+     * in Directories configuration.
+     *
+     * @param string $path
+     * @param string $directoryConfig
+     * @return bool
+     * @throws \Magento\Framework\Exception\FileSystemException
+     */
+    public function validateSamePath($path, $directoryConfig = DirectoryList::MEDIA)
+    {
+        $root = $this->directoryList->getPath($directoryConfig);
+        $traverseRealPath = realpath($path);
+
+        return $root === $traverseRealPath;
+    }
 }

From 9d4fa81ef0857aa564c33160e6fe129ee06fbf09 Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Tue, 11 Feb 2020 16:56:18 -0600
Subject: [PATCH 0040/1718] MC-31362: Media folder update

- Resolved unit test failures
---
 .../Theme/Model/Design/Backend/File.php       |  5 +-
 .../Unit/Model/Design/Backend/FileTest.php    | 54 +++++++++++++++++++
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Theme/Model/Design/Backend/File.php b/app/code/Magento/Theme/Model/Design/Backend/File.php
index 2fb90566e9ae7..dd102d7e27dc7 100644
--- a/app/code/Magento/Theme/Model/Design/Backend/File.php
+++ b/app/code/Magento/Theme/Model/Design/Backend/File.php
@@ -118,7 +118,10 @@ public function beforeSave()
             );
         }
 
-        if (!in_array($this->ioFileSystem->getPathInfo(($file))['extension'], $this->getAllowedExtensions())) {
+        if (
+            !isset($this->ioFileSystem->getPathInfo(($file))['extension']) ||
+            !in_array($this->ioFileSystem->getPathInfo(($file))['extension'], $this->getAllowedExtensions())
+        ) {
             throw new LocalizedException(
                 __('Something is wrong with the file upload settings.')
             );
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
index 91f176efbc7b9..1513ebf466f2a 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
@@ -8,6 +8,7 @@
 use Magento\Framework\UrlInterface;
 use Magento\Theme\Model\Design\Backend\File;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem\Io\File as IoFileSystem;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -23,6 +24,9 @@ class FileTest extends \PHPUnit\Framework\TestCase
     /** @var File */
     protected $fileBackend;
 
+    /** @var IoFileSystem|\PHPUnit_Framework_MockObject_MockObject */
+    protected $ioFileSystem;
+
     /**
      * @var \Magento\Framework\File\Mime|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -56,6 +60,9 @@ public function setUp()
         $this->urlBuilder = $this->getMockBuilder(\Magento\Framework\UrlInterface::class)
             ->getMockForAbstractClass();
 
+        $this->ioFileSystem = $this->getMockBuilder(\Magento\Framework\Filesystem\Io\File::class)
+            ->getMockForAbstractClass();
+
         $this->mime = $this->getMockBuilder(\Magento\Framework\File\Mime::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -80,6 +87,7 @@ public function setUp()
             $requestData,
             $filesystem,
             $this->urlBuilder,
+            $this->ioFileSystem,
             $abstractResource,
             $abstractDb,
             [],
@@ -240,6 +248,52 @@ public function beforeSaveDataProvider()
     {
         return [
             'Normal file name' => ['filename.jpg'],
+        ];
+    }
+
+    /**
+     * @dataProvider beforeSaveInvalidDataProvider
+     * @param string $fileName
+     *
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Something is wrong with the file upload settings.
+     */
+    public function testBeforeSaveInvalidFile($fileName)
+    {
+        {
+            $expectedFileName = basename($fileName);
+            $expectedTmpMediaPath = 'tmp/design/file/' . $expectedFileName;
+            $this->fileBackend->setScope('store');
+            $this->fileBackend->setScopeId(1);
+            $this->fileBackend->setValue(
+                [
+                    [
+                        'url' => 'http://magento2.com/pub/media/tmp/image/' . $fileName,
+                        'file' => $fileName,
+                        'size' => 234234,
+                    ]
+                ]
+            );
+            $this->fileBackend->setFieldConfig(
+                [
+                    'upload_dir' => [
+                        'value' => 'value',
+                        'config' => 'system/filesystem/media',
+                    ],
+                ]
+            );
+
+            $this->fileBackend->beforeSave();
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public function beforeSaveInvalidDataProvider()
+    {
+        return [
+            'Invalid Extension' => ['file.invalid'],
             'Vulnerable file name' => ['../../../../../../../../etc/passwd'],
         ];
     }

From e1124c114baeffce8a9ba2f333b7b88154c9ed91 Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Tue, 11 Feb 2020 18:58:59 -0600
Subject: [PATCH 0041/1718] MC-31362: Media folder update

- Resolved static test failures
---
 .../Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php   | 3 +--
 app/code/Magento/Theme/Model/Design/Backend/File.php           | 3 +--
 .../Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php  | 1 -
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
index b483da185a3ea..0e6c74b66a01d 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
@@ -60,8 +60,7 @@ public function execute()
     {
         try {
             $path = $this->getStorage()->getCmsWysiwygImages()->getCurrentPath();
-            if (
-                !$this->directoryResolver->validatePath($path, DirectoryList::MEDIA)
+            if (!$this->directoryResolver->validatePath($path, DirectoryList::MEDIA)
                 || $this->directoryResolver->validateSamePath($path, DirectoryList::MEDIA)
             ) {
                 throw new \Magento\Framework\Exception\LocalizedException(
diff --git a/app/code/Magento/Theme/Model/Design/Backend/File.php b/app/code/Magento/Theme/Model/Design/Backend/File.php
index dd102d7e27dc7..65b7182b9944b 100644
--- a/app/code/Magento/Theme/Model/Design/Backend/File.php
+++ b/app/code/Magento/Theme/Model/Design/Backend/File.php
@@ -118,8 +118,7 @@ public function beforeSave()
             );
         }
 
-        if (
-            !isset($this->ioFileSystem->getPathInfo(($file))['extension']) ||
+        if (!isset($this->ioFileSystem->getPathInfo(($file))['extension']) ||
             !in_array($this->ioFileSystem->getPathInfo(($file))['extension'], $this->getAllowedExtensions())
         ) {
             throw new LocalizedException(
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
index 1513ebf466f2a..49dc7de14f2cc 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
@@ -262,7 +262,6 @@ public function testBeforeSaveInvalidFile($fileName)
     {
         {
             $expectedFileName = basename($fileName);
-            $expectedTmpMediaPath = 'tmp/design/file/' . $expectedFileName;
             $this->fileBackend->setScope('store');
             $this->fileBackend->setScopeId(1);
             $this->fileBackend->setValue(

From 9009c5c69869e3f3c0f5a8503c62c81a963e34ff Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Wed, 12 Feb 2020 10:31:59 -0600
Subject: [PATCH 0042/1718] MC-31362: Media folder update

- Resolved static test failures
---
 .../Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
index 49dc7de14f2cc..75e58a356c670 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
@@ -261,7 +261,6 @@ public function beforeSaveDataProvider()
     public function testBeforeSaveInvalidFile($fileName)
     {
         {
-            $expectedFileName = basename($fileName);
             $this->fileBackend->setScope('store');
             $this->fileBackend->setScopeId(1);
             $this->fileBackend->setValue(

From 73dff292f88e2bd607a0ab140b266e3356342b5d Mon Sep 17 00:00:00 2001
From: Serhii Voloshkov <serhii.voloshkov@transoftgroup.com>
Date: Thu, 13 Feb 2020 15:52:40 +0200
Subject: [PATCH 0043/1718] MC-31363: Minor changes in product attribute save
 controller

---
 .../Catalog/Controller/Adminhtml/Product/Attribute/Save.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
index 853cc65270306..dc77b130d225f 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
@@ -221,7 +221,7 @@ public function execute()
                     return $this->returnResult('catalog/*/', [], ['error' => true]);
                 }
                 // entity type check
-                if ($model->getEntityTypeId() != $this->_entityTypeId) {
+                if ($model->getEntityTypeId() != $this->_entityTypeId || array_key_exists('backend_model', $data)) {
                     $this->messageManager->addErrorMessage(__('We can\'t update the attribute.'));
                     $this->_session->setAttributeData($data);
                     return $this->returnResult('catalog/*/', [], ['error' => true]);

From 33b6850ab694fd2da16dc29a4c98f788c45fc459 Mon Sep 17 00:00:00 2001
From: Stas Kozar <stas.kozar@transoftgroup.com>
Date: Fri, 14 Feb 2020 12:17:12 +0200
Subject: [PATCH 0044/1718] MC-31519: Improve product attribute mass update
 validation

---
 .../Product/Action/Attribute/Save.php         | 42 +++++++--
 .../Product/Action/AttributeTest.php          | 89 ++++++++++++-------
 2 files changed, 96 insertions(+), 35 deletions(-)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
index 2d10d7148fb71..a001fdd6d25f5 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/Save.php
@@ -7,14 +7,16 @@
 namespace Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute;
 
 use Magento\AsynchronousOperations\Api\Data\OperationInterface;
+use Magento\Catalog\Model\ProductFactory;
 use Magento\Eav\Model\Config;
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Backend\App\Action;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 
 /**
- * Class Save
+ * Class responsible for saving product attributes.
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute implements HttpPostActionInterface
@@ -59,6 +61,11 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribut
      */
     private $eavConfig;
 
+    /**
+     * @var ProductFactory
+     */
+    private $productFactory;
+
     /**
      * @param Action\Context $context
      * @param \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeHelper
@@ -70,6 +77,7 @@ class Save extends \Magento\Catalog\Controller\Adminhtml\Product\Action\Attribut
      * @param int $bulkSize
      * @param TimezoneInterface $timezone
      * @param Config $eavConfig
+     * @param ProductFactory $productFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -82,7 +90,8 @@ public function __construct(
         \Magento\Authorization\Model\UserContextInterface $userContext,
         int $bulkSize = 100,
         TimezoneInterface $timezone = null,
-        Config $eavConfig = null
+        Config $eavConfig = null,
+        ProductFactory $productFactory = null
     ) {
         parent::__construct($context, $attributeHelper);
         $this->bulkManagement = $bulkManagement;
@@ -95,6 +104,7 @@ public function __construct(
             ->get(TimezoneInterface::class);
         $this->eavConfig = $eavConfig ?: ObjectManager::getInstance()
             ->get(Config::class);
+        $this->productFactory = $productFactory ?? ObjectManager::getInstance()->get(ProductFactory::class);
     }
 
     /**
@@ -120,9 +130,10 @@ public function execute()
         $attributesData = $this->sanitizeProductAttributes($attributesData);
 
         try {
+            $this->validateProductAttributes($attributesData);
             $this->publish($attributesData, $websiteRemoveData, $websiteAddData, $storeId, $websiteId, $productIds);
             $this->messageManager->addSuccessMessage(__('Message is added to queue'));
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
+        } catch (LocalizedException $e) {
             $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
             $this->messageManager->addExceptionMessage(
@@ -147,10 +158,12 @@ private function sanitizeProductAttributes($attributesData)
 
         foreach ($attributesData as $attributeCode => $value) {
             $attribute = $this->eavConfig->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode);
+
             if (!$attribute->getAttributeId()) {
                 unset($attributesData[$attributeCode]);
                 continue;
             }
+
             if ($attribute->getBackendType() === 'datetime') {
                 if (!empty($value)) {
                     $filterInput = new \Zend_Filter_LocalizedToNormalized(['date_format' => $dateFormat]);
@@ -178,6 +191,25 @@ private function sanitizeProductAttributes($attributesData)
         return $attributesData;
     }
 
+    /**
+     * Validate product attributes data.
+     *
+     * @param array $attributesData
+     *
+     * @return void
+     * @throws LocalizedException
+     */
+    private function validateProductAttributes(array $attributesData): void
+    {
+        $product = $this->productFactory->create();
+        $product->setData($attributesData);
+
+        foreach (array_keys($attributesData) as $attributeCode) {
+            $attribute = $this->eavConfig->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode);
+            $attribute->getBackend()->validate($product);
+        }
+    }
+
     /**
      * Schedule new bulk
      *
@@ -187,7 +219,7 @@ private function sanitizeProductAttributes($attributesData)
      * @param int $storeId
      * @param int $websiteId
      * @param array $productIds
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      *
      * @return void
      */
@@ -241,7 +273,7 @@ private function publish(
                 $this->userContext->getUserId()
             );
             if (!$result) {
-                throw new \Magento\Framework\Exception\LocalizedException(
+                throw new LocalizedException(
                     __('Something went wrong while processing the request.')
                 );
             }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php
index 2f35a5fdafc3a..a49cd3ae19b59 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/AttributeTest.php
@@ -5,16 +5,26 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Action;
 
+use Magento\Backend\Model\Session;
+use Magento\Catalog\Block\Product\ListProduct;
+use Magento\Catalog\Helper\Product\Edit\Action\Attribute;
+use Magento\Catalog\Model\CategoryFactory;
 use Magento\Catalog\Model\Product\Visibility;
+use Magento\Framework\Message\MessageInterface;
 use Magento\Catalog\Model\ProductRepository;
 use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\UrlInterface;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\MessageQueue\EnvironmentPreconditionException;
+use Magento\TestFramework\MessageQueue\PreconditionFailedException;
 use Magento\TestFramework\MessageQueue\PublisherConsumerController;
+use Magento\TestFramework\TestCase\AbstractBackendController;
 
 /**
  * @magentoAppArea adminhtml
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendController
+class AttributeTest extends AbstractBackendController
 {
     /** @var PublisherConsumerController */
     private $publisherConsumerController;
@@ -22,7 +32,9 @@ class AttributeTest extends \Magento\TestFramework\TestCase\AbstractBackendContr
 
     protected function setUp()
     {
-        $this->publisherConsumerController = Bootstrap::getObjectManager()->create(
+        parent::setUp();
+
+        $this->publisherConsumerController = $this->_objectManager->create(
             PublisherConsumerController::class,
             [
                 'consumers' => $this->consumers,
@@ -34,15 +46,13 @@ protected function setUp()
 
         try {
             $this->publisherConsumerController->startConsumers();
-        } catch (\Magento\TestFramework\MessageQueue\EnvironmentPreconditionException $e) {
+        } catch (EnvironmentPreconditionException $e) {
             $this->markTestSkipped($e->getMessage());
-        } catch (\Magento\TestFramework\MessageQueue\PreconditionFailedException $e) {
+        } catch (PreconditionFailedException $e) {
             $this->fail(
                 $e->getMessage()
             );
         }
-
-        parent::setUp();
     }
 
     protected function tearDown()
@@ -59,10 +69,8 @@ protected function tearDown()
      */
     public function testSaveActionRedirectsSuccessfully()
     {
-        $objectManager = Bootstrap::getObjectManager();
-
-        /** @var $session \Magento\Backend\Model\Session */
-        $session = $objectManager->get(\Magento\Backend\Model\Session::class);
+        /** @var $session Session */
+        $session = $this->_objectManager->get(Session::class);
         $session->setProductIds([1]);
         $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
 
@@ -70,10 +78,10 @@ public function testSaveActionRedirectsSuccessfully()
 
         $this->assertEquals(302, $this->getResponse()->getHttpResponseCode());
         /** @var \Magento\Backend\Model\UrlInterface $urlBuilder */
-        $urlBuilder = $objectManager->get(\Magento\Framework\UrlInterface::class);
+        $urlBuilder = $this->_objectManager->get(UrlInterface::class);
 
-        /** @var \Magento\Catalog\Helper\Product\Edit\Action\Attribute $attributeHelper */
-        $attributeHelper = $objectManager->get(\Magento\Catalog\Helper\Product\Edit\Action\Attribute::class);
+        /** @var Attribute $attributeHelper */
+        $attributeHelper = $this->_objectManager->get(Attribute::class);
         $expectedUrl = $urlBuilder->getUrl(
             'catalog/product/index',
             ['store' => $attributeHelper->getSelectedStoreId()]
@@ -98,18 +106,15 @@ public function testSaveActionRedirectsSuccessfully()
      */
     public function testSaveActionChangeVisibility($attributes)
     {
-        $objectManager = Bootstrap::getObjectManager();
         /** @var ProductRepository $repository */
-        $repository = Bootstrap::getObjectManager()->create(
-            ProductRepository::class
-        );
+        $repository = $this->_objectManager->create(ProductRepository::class);
         $product = $repository->get('simple');
         $product->setOrigData();
         $product->setVisibility(Visibility::VISIBILITY_NOT_VISIBLE);
         $product->save();
 
-        /** @var $session \Magento\Backend\Model\Session */
-        $session = $objectManager->get(\Magento\Backend\Model\Session::class);
+        /** @var $session Session */
+        $session = $this->_objectManager->get(Session::class);
         $session->setProductIds([$product->getId()]);
         $this->getRequest()->setParam('attributes', $attributes);
         $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
@@ -117,13 +122,9 @@ public function testSaveActionChangeVisibility($attributes)
         $this->dispatch('backend/catalog/product_action_attribute/save/store/0');
 
         /** @var \Magento\Catalog\Model\Category $category */
-        $categoryFactory = Bootstrap::getObjectManager()->get(
-            \Magento\Catalog\Model\CategoryFactory::class
-        );
-        /** @var \Magento\Catalog\Block\Product\ListProduct $listProduct */
-        $listProduct = Bootstrap::getObjectManager()->get(
-            \Magento\Catalog\Block\Product\ListProduct::class
-        );
+        $categoryFactory = $this->_objectManager->get(CategoryFactory::class);
+        /** @var ListProduct $listProduct */
+        $listProduct = $this->_objectManager->get(ListProduct::class);
 
         $this->publisherConsumerController->waitForAsynchronousResult(
             function () use ($repository) {
@@ -159,10 +160,8 @@ function () use ($repository) {
      */
     public function testValidateActionWithMassUpdate($attributes)
     {
-        $objectManager = Bootstrap::getObjectManager();
-
-        /** @var $session \Magento\Backend\Model\Session */
-        $session = $objectManager->get(\Magento\Backend\Model\Session::class);
+        /** @var $session Session */
+        $session = $this->_objectManager->get(Session::class);
         $session->setProductIds([1, 2]);
 
         $this->getRequest()->setParam('attributes', $attributes);
@@ -214,4 +213,34 @@ public function saveActionVisibilityAttrDataProvider()
             ['arguments' => ['visibility' => Visibility::VISIBILITY_IN_CATALOG]]
         ];
     }
+
+    /**
+     * Assert that custom layout update can not be change for existing entity.
+     *
+     * @return void
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     */
+    public function testSaveActionCantChangeCustomLayoutUpdate(): void
+    {
+        /** @var ProductRepository $repository */
+        $repository = $this->_objectManager->get(ProductRepository::class);
+        $product = $repository->get('simple');
+
+        $product->setOrigData('custom_layout_update', 'test');
+        $product->setData('custom_layout_update', 'test');
+        $product->save();
+        /** @var $session Session */
+        $session = $this->_objectManager->get(Session::class);
+        $session->setProductIds([$product->getId()]);
+        $this->getRequest()->setParam('attributes', ['custom_layout_update' => 'test2']);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+
+        $this->dispatch('backend/catalog/product_action_attribute/save/store/0');
+
+        $this->assertSessionMessages(
+            $this->equalTo(['Custom layout update text cannot be changed, only removed']),
+            MessageInterface::TYPE_ERROR
+        );
+        $this->assertEquals('test', $product->getData('custom_layout_update'));
+    }
 }

From 2e43c3a38c733bb0e72bd6fa3988249f2403511c Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Fri, 14 Feb 2020 12:53:18 -0600
Subject: [PATCH 0045/1718] MC-31362: Media folder update

- Corrected uneeded parantheses
- Corrected dependencies.
- Removed allowedExtensions from base files
- Updated Backend fileTest
- Added Backend imageTest
---
 .../Theme/Model/Design/Backend/File.php       |  25 +--
 .../Unit/Model/Design/Backend/FileTest.php    |  48 +----
 .../Unit/Model/Design/Backend/ImageTest.php   | 179 ++++++++++++++++++
 3 files changed, 194 insertions(+), 58 deletions(-)
 create mode 100644 app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php

diff --git a/app/code/Magento/Theme/Model/Design/Backend/File.php b/app/code/Magento/Theme/Model/Design/Backend/File.php
index 65b7182b9944b..429ad34cb2dea 100644
--- a/app/code/Magento/Theme/Model/Design/Backend/File.php
+++ b/app/code/Magento/Theme/Model/Design/Backend/File.php
@@ -39,17 +39,17 @@ class File extends BackendFile
     /**
      * @var Mime
      */
-    private $mime;
+    protected $mime;
 
     /**
-     * @var Database
+     * @var IoFileSystem
      */
-    private $databaseHelper;
+    protected $ioFileSystem;
 
     /**
-     * @var IoFileSystem
+     * @var Database
      */
-    private $ioFileSystem;
+    private $databaseHelper;
 
     /**
      * @param Context $context
@@ -60,11 +60,11 @@ class File extends BackendFile
      * @param RequestDataInterface $requestData
      * @param Filesystem $filesystem
      * @param UrlInterface $urlBuilder
-     * @param IoFileSystem $ioFileSystem
      * @param AbstractResource|null $resource
      * @param AbstractDb|null $resourceCollection
      * @param array $data
      * @param Database $databaseHelper
+     * @param IoFileSystem $ioFileSystem
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -76,11 +76,11 @@ public function __construct(
         RequestDataInterface $requestData,
         Filesystem $filesystem,
         UrlInterface $urlBuilder,
-        IoFileSystem $ioFileSystem,
         AbstractResource $resource = null,
         AbstractDb $resourceCollection = null,
         array $data = [],
-        Database $databaseHelper = null
+        Database $databaseHelper = null,
+        IoFileSystem $ioFileSystem = null
     ) {
         parent::__construct(
             $context,
@@ -94,9 +94,9 @@ public function __construct(
             $resourceCollection,
             $data
         );
-        $this->ioFileSystem = $ioFileSystem;
         $this->urlBuilder = $urlBuilder;
         $this->databaseHelper = $databaseHelper ?: ObjectManager::getInstance()->get(Database::class);
+        $this->ioFileSystem = $ioFileSystem ?: ObjectManager::getInstance()->get(IoFileSystem::class);
     }
 
     /**
@@ -118,8 +118,9 @@ public function beforeSave()
             );
         }
 
-        if (!isset($this->ioFileSystem->getPathInfo(($file))['extension']) ||
-            !in_array($this->ioFileSystem->getPathInfo(($file))['extension'], $this->getAllowedExtensions())
+        if (!empty($this->getAllowedExtensions()) &&
+            (!isset($this->ioFileSystem->getPathInfo($file)['extension']) ||
+            !in_array($this->ioFileSystem->getPathInfo($file)['extension'], $this->getAllowedExtensions()))
         ) {
             throw new LocalizedException(
                 __('Something is wrong with the file upload settings.')
@@ -174,7 +175,7 @@ public function afterLoad()
      */
     public function getAllowedExtensions()
     {
-        return ['jpg', 'jpeg', 'gif', 'png'];
+        return [];
     }
 
     /**
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
index 75e58a356c670..65c675acdec12 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
@@ -87,11 +87,11 @@ public function setUp()
             $requestData,
             $filesystem,
             $this->urlBuilder,
-            $this->ioFileSystem,
             $abstractResource,
             $abstractDb,
             [],
-            $this->databaseHelper
+            $this->databaseHelper,
+            $this->ioFileSystem
         );
 
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -248,50 +248,6 @@ public function beforeSaveDataProvider()
     {
         return [
             'Normal file name' => ['filename.jpg'],
-        ];
-    }
-
-    /**
-     * @dataProvider beforeSaveInvalidDataProvider
-     * @param string $fileName
-     *
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Something is wrong with the file upload settings.
-     */
-    public function testBeforeSaveInvalidFile($fileName)
-    {
-        {
-            $this->fileBackend->setScope('store');
-            $this->fileBackend->setScopeId(1);
-            $this->fileBackend->setValue(
-                [
-                    [
-                        'url' => 'http://magento2.com/pub/media/tmp/image/' . $fileName,
-                        'file' => $fileName,
-                        'size' => 234234,
-                    ]
-                ]
-            );
-            $this->fileBackend->setFieldConfig(
-                [
-                    'upload_dir' => [
-                        'value' => 'value',
-                        'config' => 'system/filesystem/media',
-                    ],
-                ]
-            );
-
-            $this->fileBackend->beforeSave();
-        }
-    }
-
-    /**
-     * @return array
-     */
-    public function beforeSaveInvalidDataProvider()
-    {
-        return [
-            'Invalid Extension' => ['file.invalid'],
             'Vulnerable file name' => ['../../../../../../../../etc/passwd'],
         ];
     }
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php
new file mode 100644
index 0000000000000..c55cc0ed6e374
--- /dev/null
+++ b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php
@@ -0,0 +1,179 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Theme\Test\Unit\Model\Design\Backend;
+
+use Magento\Framework\UrlInterface;
+use Magento\Theme\Model\Design\Backend\Image;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem\Io\File as IoFileSystem;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ImageTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var \Magento\Framework\Filesystem\Directory\WriteInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $mediaDirectory;
+
+    /** @var UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
+    protected $urlBuilder;
+
+    /** @var Image */
+    protected $imageBackend;
+
+    /** @var IoFileSystem|\PHPUnit_Framework_MockObject_MockObject */
+    protected $ioFileSystem;
+
+    /**
+     * @var \Magento\Framework\File\Mime|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $mime;
+
+    /**
+     * @var \Magento\MediaStorage\Helper\File\Storage\Database|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $databaseHelper;
+
+    public function setUp()
+    {
+        $context = $this->getMockObject(\Magento\Framework\Model\Context::class);
+        $registry = $this->getMockObject(\Magento\Framework\Registry::class);
+        $config = $this->getMockObjectForAbstractClass(\Magento\Framework\App\Config\ScopeConfigInterface::class);
+        $cacheTypeList = $this->getMockObjectForAbstractClass(\Magento\Framework\App\Cache\TypeListInterface::class);
+        $uploaderFactory = $this->getMockObject(\Magento\MediaStorage\Model\File\UploaderFactory::class, ['create']);
+        $requestData = $this->getMockObjectForAbstractClass(
+            \Magento\Config\Model\Config\Backend\File\RequestData\RequestDataInterface::class
+        );
+        $filesystem = $this->getMockBuilder(\Magento\Framework\Filesystem::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->mediaDirectory = $this->getMockBuilder(\Magento\Framework\Filesystem\Directory\WriteInterface::class)
+            ->getMockForAbstractClass();
+
+        $filesystem->expects($this->once())
+            ->method('getDirectoryWrite')
+            ->with(DirectoryList::MEDIA)
+            ->willReturn($this->mediaDirectory);
+        $this->urlBuilder = $this->getMockBuilder(\Magento\Framework\UrlInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->ioFileSystem = $this->getMockBuilder(\Magento\Framework\Filesystem\Io\File::class)
+            ->getMockForAbstractClass();
+
+        $this->mime = $this->getMockBuilder(\Magento\Framework\File\Mime::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->databaseHelper = $this->getMockBuilder(\Magento\MediaStorage\Helper\File\Storage\Database::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $abstractResource = $this->getMockBuilder(\Magento\Framework\Model\ResourceModel\AbstractResource::class)
+            ->getMockForAbstractClass();
+
+        $abstractDb = $this->getMockBuilder(\Magento\Framework\Data\Collection\AbstractDb::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->imageBackend = new Image(
+            $context,
+            $registry,
+            $config,
+            $cacheTypeList,
+            $uploaderFactory,
+            $requestData,
+            $filesystem,
+            $this->urlBuilder,
+            $abstractResource,
+            $abstractDb,
+            [],
+            $this->databaseHelper,
+            $this->ioFileSystem
+        );
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $objectManager->setBackwardCompatibleProperty(
+            $this->imageBackend,
+            'mime',
+            $this->mime
+        );
+    }
+
+    public function tearDown()
+    {
+        unset($this->imageBackend);
+    }
+
+    /**
+     * @param string $class
+     * @param array $methods
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected function getMockObject($class, $methods = [])
+    {
+        $builder =  $this->getMockBuilder($class)
+            ->disableOriginalConstructor();
+        if (count($methods)) {
+            $builder->setMethods($methods);
+        }
+        return  $builder->getMock();
+    }
+
+    /**
+     * @param string $class
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected function getMockObjectForAbstractClass($class)
+    {
+        return  $this->getMockBuilder($class)
+            ->getMockForAbstractClass();
+    }
+
+    /**
+     * @dataProvider beforeSaveInvalidDataProvider
+     * @param string $imageName
+     *
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Something is wrong with the file upload settings.
+     */
+    public function testBeforeSaveInvalidImage($imageName)
+    {
+        {
+            $this->imageBackend->setScope('store');
+            $this->imageBackend->setScopeId(1);
+            $this->imageBackend->setValue(
+                [
+                    [
+                        'url' => 'http://magento2.com/pub/media/tmp/image/' . $imageName,
+                        'file' => $imageName,
+                        'size' => 234234,
+                    ]
+                ]
+            );
+            $this->imageBackend->setFieldConfig(
+                [
+                    'upload_dir' => [
+                        'value' => 'value',
+                        'config' => 'system/filesystem/media',
+                    ],
+                ]
+            );
+
+            $this->imageBackend->beforeSave();
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public function beforeSaveInvalidDataProvider()
+    {
+        return [
+            'Invalid Extension' => ['file.invalid'],
+            'Vulnerable file name' => ['../../../../../../../../etc/passwd'],
+        ];
+    }
+}

From ce1a47e62695f2d590289189b93a81bda9badb35 Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Mon, 17 Feb 2020 11:28:26 +0200
Subject: [PATCH 0046/1718] MC-31361: Remove ability to change entity type for
 attributes

---
 .../Adminhtml/Product/Attribute/Save.php      |  2 +
 .../Magento/Eav/Model/Entity/Attribute.php    | 19 ++++
 .../Model/ResourceModel/Entity/Attribute.php  |  1 +
 .../Model/ResourceModel/Eav/AttributeTest.php | 68 ++++++++++----
 .../Magento/Customer/Model/AttributeTest.php  | 94 +++++++++++++++++++
 5 files changed, 167 insertions(+), 17 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Customer/Model/AttributeTest.php

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
index 853cc65270306..692c15435a4d7 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
@@ -258,6 +258,8 @@ public function execute()
                 unset($data['apply_to']);
             }
 
+            unset($data['entity_type_id']);
+
             $model->addData($data);
 
             if (!$attributeId) {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute.php b/app/code/Magento/Eav/Model/Entity/Attribute.php
index 651bc96193780..04175c2da94d1 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute.php
@@ -260,6 +260,8 @@ public function beforeSave()
             );
         }
 
+        $this->validateEntityType();
+
         $defaultValue = $this->getDefaultValue();
         $hasDefaultValue = (string)$defaultValue != '';
 
@@ -535,4 +537,21 @@ public function __wakeup()
         $this->reservedAttributeList = $objectManager->get(\Magento\Catalog\Model\Product\ReservedAttributeList::class);
         $this->dateTimeFormatter = $objectManager->get(DateTimeFormatterInterface::class);
     }
+
+    /**
+     * Entity type for existing attribute shouldn't be changed.
+     *
+     * @return void
+     * @throws LocalizedException
+     */
+    private function validateEntityType(): void
+    {
+        if ($this->getId() !== null) {
+            $origEntityTypeId = $this->getOrigData('entity_type_id');
+
+            if (($origEntityTypeId !== null) && ((int)$this->getEntityTypeId() !== (int)$origEntityTypeId)) {
+                throw new LocalizedException(__('Do not change entity type.'));
+            }
+        }
+    }
 }
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php
index 9e4ad6fb53a33..e9551c620ef85 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php
@@ -107,6 +107,7 @@ public function loadByCode(AbstractModel $object, $entityTypeId, $code)
 
         if ($data) {
             $object->setData($data);
+            $object->setOrigData('entity_type_id', $object->getEntityTypeId());
             $this->_afterLoad($object);
             return true;
         }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Eav/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Eav/AttributeTest.php
index 498c3167ed734..0d81a7973a3bc 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Eav/AttributeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Eav/AttributeTest.php
@@ -5,21 +5,47 @@
  */
 namespace Magento\Catalog\Model\ResourceModel\Eav;
 
+use Magento\Eav\Api\AttributeRepositoryInterface;
+use Magento\Eav\Model\Config;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
 /**
  * Test for \Magento\Catalog\Model\ResourceModel\Eav\Attribute.
  */
 class AttributeTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var Attribute
+     */
+    private $model;
+
+    /**
+     * @var AttributeRepositoryInterface
+     */
+    private $attributeRepository;
+
+    /**
+     * @var int|string
      */
-    protected $_model;
+    private $catalogProductEntityType;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
-        $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
-        );
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->model = $this->objectManager->get(Attribute::class);
+        $this->attributeRepository = $this->objectManager->get(AttributeRepositoryInterface::class);
+        $this->catalogProductEntityType = $this->objectManager->get(Config::class)
+            ->getEntityType('catalog_product')
+            ->getId();
     }
 
     /**
@@ -29,18 +55,26 @@ protected function setUp()
      */
     public function testCRUD()
     {
-        $this->_model->setAttributeCode(
-            'test'
-        )->setEntityTypeId(
-            \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                \Magento\Eav\Model\Config::class
-            )->getEntityType(
-                'catalog_product'
-            )->getId()
-        )->setFrontendLabel(
-            'test'
-        )->setIsUserDefined(1);
-        $crud = new \Magento\TestFramework\Entity($this->_model, ['frontend_label' => uniqid()]);
+        $this->model->setAttributeCode('test')
+            ->setEntityTypeId($this->catalogProductEntityType)
+            ->setFrontendLabel('test')
+            ->setIsUserDefined(1);
+        $crud = new \Magento\TestFramework\Entity($this->model, ['frontend_label' => uniqid()]);
         $crud->testCrud();
     }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_attribute.php
+     *
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Do not change entity type.
+     *
+     * @return void
+     */
+    public function testAttributeSaveWithChangedEntityType(): void
+    {
+        $attribute = $this->attributeRepository->get($this->catalogProductEntityType, 'test_attribute_code_333');
+        $attribute->setEntityTypeId(1);
+        $attribute->save();
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/AttributeTest.php
new file mode 100644
index 0000000000000..8f547e18e64ac
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/AttributeTest.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Model;
+
+use Magento\Eav\Api\AttributeRepositoryInterface;
+use Magento\Eav\Model\Config;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Test for \Magento\Customer\Model\Attribute.
+ */
+class AttributeTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var Attribute
+     */
+    private $model;
+
+    /**
+     * @var AttributeRepositoryInterface
+     */
+    private $attributeRepository;
+
+    /**
+     * @var int|string
+     */
+    private $customerEntityType;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->model = $this->objectManager->get(Attribute::class);
+        $this->attributeRepository = $this->objectManager->get(AttributeRepositoryInterface::class);
+        $this->customerEntityType = $this->objectManager->get(Config::class)
+            ->getEntityType('customer')
+            ->getId();
+    }
+
+    /**
+     * Test Create -> Read -> Update -> Delete attribute operations.
+     *
+     * @return void
+     */
+    public function testCRUD(): void
+    {
+        $this->model->setAttributeCode('test')
+            ->setEntityTypeId($this->customerEntityType)
+            ->setFrontendLabel('test')
+            ->setIsUserDefined(1);
+        $crud = new \Magento\TestFramework\Entity($this->model, ['frontend_label' => uniqid()]);
+        $crud->testCrud();
+    }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/attribute_user_defined_customer.php
+     *
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Do not change entity type.
+     *
+     * @return void
+     */
+    public function testAttributeSaveWithChangedEntityType(): void
+    {
+        $attribute = $this->attributeRepository->get($this->customerEntityType, 'user_attribute');
+        $attribute->setEntityTypeId(5);
+        $attribute->save();
+    }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/attribute_user_defined_customer.php
+     *
+     * @return void
+     */
+    public function testAttributeSaveWithoutChangedEntityType(): void
+    {
+        $attribute = $this->attributeRepository->get($this->customerEntityType, 'user_attribute');
+        $attribute->setSortOrder(1250);
+        $attribute->save();
+    }
+}

From 7eb5025ef90035585a6ef6fc678628ae4dffd0c8 Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Tue, 18 Feb 2020 13:17:59 +0200
Subject: [PATCH 0047/1718] MC-31361: Remove ability to change entity type for
 attributes

---
 .../Magento/Catalog/Model/ResourceModel/Eav/AttributeTest.php  | 3 ++-
 .../testsuite/Magento/Customer/Model/AttributeTest.php         | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Eav/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Eav/AttributeTest.php
index 0d81a7973a3bc..ac2a3a1818cf4 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Eav/AttributeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Eav/AttributeTest.php
@@ -6,6 +6,7 @@
 namespace Magento\Catalog\Model\ResourceModel\Eav;
 
 use Magento\Eav\Api\AttributeRepositoryInterface;
+use Magento\Eav\Api\Data\AttributeInterface;
 use Magento\Eav\Model\Config;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
@@ -59,7 +60,7 @@ public function testCRUD()
             ->setEntityTypeId($this->catalogProductEntityType)
             ->setFrontendLabel('test')
             ->setIsUserDefined(1);
-        $crud = new \Magento\TestFramework\Entity($this->model, ['frontend_label' => uniqid()]);
+        $crud = new \Magento\TestFramework\Entity($this->model, [AttributeInterface::FRONTEND_LABEL => uniqid()]);
         $crud->testCrud();
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/AttributeTest.php
index 8f547e18e64ac..dde20a8049437 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/AttributeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/AttributeTest.php
@@ -8,6 +8,7 @@
 namespace Magento\Customer\Model;
 
 use Magento\Eav\Api\AttributeRepositoryInterface;
+use Magento\Eav\Api\Data\AttributeInterface;
 use Magento\Eav\Model\Config;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
@@ -61,7 +62,7 @@ public function testCRUD(): void
             ->setEntityTypeId($this->customerEntityType)
             ->setFrontendLabel('test')
             ->setIsUserDefined(1);
-        $crud = new \Magento\TestFramework\Entity($this->model, ['frontend_label' => uniqid()]);
+        $crud = new \Magento\TestFramework\Entity($this->model, [AttributeInterface::FRONTEND_LABEL => uniqid()]);
         $crud->testCrud();
     }
 

From d3cf7544692b3235feda1d1deb346fc8e1d4a7b4 Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Tue, 18 Feb 2020 13:40:28 -0600
Subject: [PATCH 0048/1718] MC-31362: Media folder update

- Corrected variable scope
---
 app/code/Magento/Theme/Model/Design/Backend/File.php     | 4 ++--
 .../Theme/Test/Unit/Model/Design/Backend/FileTest.php    | 2 +-
 .../Theme/Test/Unit/Model/Design/Backend/ImageTest.php   | 9 +--------
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/Theme/Model/Design/Backend/File.php b/app/code/Magento/Theme/Model/Design/Backend/File.php
index 429ad34cb2dea..860a31041f2d0 100644
--- a/app/code/Magento/Theme/Model/Design/Backend/File.php
+++ b/app/code/Magento/Theme/Model/Design/Backend/File.php
@@ -39,12 +39,12 @@ class File extends BackendFile
     /**
      * @var Mime
      */
-    protected $mime;
+    private $mime;
 
     /**
      * @var IoFileSystem
      */
-    protected $ioFileSystem;
+    private $ioFileSystem;
 
     /**
      * @var Database
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
index 65c675acdec12..0a7e7c321ebe4 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
@@ -25,7 +25,7 @@ class FileTest extends \PHPUnit\Framework\TestCase
     protected $fileBackend;
 
     /** @var IoFileSystem|\PHPUnit_Framework_MockObject_MockObject */
-    protected $ioFileSystem;
+    private $ioFileSystem;
 
     /**
      * @var \Magento\Framework\File\Mime|\PHPUnit_Framework_MockObject_MockObject
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php
index c55cc0ed6e374..ebfe83239ed21 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php
@@ -25,7 +25,7 @@ class ImageTest extends \PHPUnit\Framework\TestCase
     protected $imageBackend;
 
     /** @var IoFileSystem|\PHPUnit_Framework_MockObject_MockObject */
-    protected $ioFileSystem;
+    private $ioFileSystem;
 
     /**
      * @var \Magento\Framework\File\Mime|\PHPUnit_Framework_MockObject_MockObject
@@ -93,13 +93,6 @@ public function setUp()
             $this->databaseHelper,
             $this->ioFileSystem
         );
-
-        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $objectManager->setBackwardCompatibleProperty(
-            $this->imageBackend,
-            'mime',
-            $this->mime
-        );
     }
 
     public function tearDown()

From 14320e805d9740e5a8ed3fe0e7552e09332a121e Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Tue, 18 Feb 2020 15:23:03 -0600
Subject: [PATCH 0049/1718] MC-31362: Media folder update

- Reverted changes to model
- Updated storage path check
---
 .../Adminhtml/Wysiwyg/Images/DeleteFolder.php |  7 ---
 .../Cms/Model/Wysiwyg/Images/Storage.php      |  5 +-
 .../App/Filesystem/DirectoryResolverTest.php  | 46 -------------------
 .../App/Filesystem/DirectoryResolver.php      | 21 ---------
 4 files changed, 3 insertions(+), 76 deletions(-)

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
index 0e6c74b66a01d..eec5c40c6e33b 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
@@ -60,13 +60,6 @@ public function execute()
     {
         try {
             $path = $this->getStorage()->getCmsWysiwygImages()->getCurrentPath();
-            if (!$this->directoryResolver->validatePath($path, DirectoryList::MEDIA)
-                || $this->directoryResolver->validateSamePath($path, DirectoryList::MEDIA)
-            ) {
-                throw new \Magento\Framework\Exception\LocalizedException(
-                    __('Directory %1 is not under storage root path.', $path)
-                );
-            }
             $this->getStorage()->deleteDirectory($path);
 
             return $this->resultRawFactory->create();
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
index f0a232bdccccc..1cb1aa20c5a16 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
@@ -765,12 +765,13 @@ public function getCmsWysiwygImages()
     protected function _validatePath($path)
     {
         $root = $this->_sanitizePath($this->_cmsWysiwygImages->getStorageRoot());
-        if ($root == $path) {
+        $realPath = realpath($path);
+        if ($root == $realPath) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('We can\'t delete root directory %1 right now.', $path)
             );
         }
-        if (strpos($path, (string) $root) !== 0) {
+        if (strpos($realPath, (string) $root) !== 0) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('Directory %1 is not under storage root path.', $path)
             );
diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/Filesystem/DirectoryResolverTest.php b/dev/tests/integration/testsuite/Magento/Framework/App/Filesystem/DirectoryResolverTest.php
index b7f13112384df..90d8473032c69 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/App/Filesystem/DirectoryResolverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/App/Filesystem/DirectoryResolverTest.php
@@ -120,50 +120,4 @@ public function validatePathDataProvider()
             ],
         ];
     }
-
-    /**
-     * @param string $path
-     * @param string $directoryConfig
-     * @param bool $expectation
-     * @dataProvider validateSamePathDataProvider
-     * @throws \Magento\Framework\Exception\FileSystemException
-     * @magentoAppIsolation enabled
-     * @return void
-     */
-    public function testValidateSamePath($path, $directoryConfig, $expectation)
-    {
-        $directory = $this->filesystem
-            ->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::MEDIA);
-        $path = $directory->getAbsolutePath() .'/' .$path;
-        $this->assertEquals($expectation, $this->directoryResolver->validateSamePath($path, $directoryConfig));
-    }
-
-    /**
-     * @return array
-     */
-    public function validateSamePathDataProvider()
-    {
-        return [
-            [
-                '/',
-                DirectoryList::MEDIA,
-                true,
-            ],
-            [
-                '/.',
-                DirectoryList::MEDIA,
-                true,
-            ],
-            [
-                '/../../pub/media/.',
-                DirectoryList::MEDIA,
-                true,
-            ],
-            [
-                '/../../pub/',
-                DirectoryList::MEDIA,
-                false,
-            ],
-        ];
-    }
 }
diff --git a/lib/internal/Magento/Framework/App/Filesystem/DirectoryResolver.php b/lib/internal/Magento/Framework/App/Filesystem/DirectoryResolver.php
index ecdef2269522d..5ad3d888ffb57 100644
--- a/lib/internal/Magento/Framework/App/Filesystem/DirectoryResolver.php
+++ b/lib/internal/Magento/Framework/App/Filesystem/DirectoryResolver.php
@@ -55,25 +55,4 @@ public function validatePath($path, $directoryConfig = DirectoryList::MEDIA)
 
         return strpos($realPath, $root) === 0;
     }
-
-    /**
-     * Validate same path.
-     *
-     * Gets real path for directory provided in parameters and compares it with specified root directory.
-     * Will return TRUE if real path of provided value is root directory path and FALSE if not.
-     * Throws the \Magento\Framework\Exception\FileSystemException in case when directory path is absent
-     * in Directories configuration.
-     *
-     * @param string $path
-     * @param string $directoryConfig
-     * @return bool
-     * @throws \Magento\Framework\Exception\FileSystemException
-     */
-    public function validateSamePath($path, $directoryConfig = DirectoryList::MEDIA)
-    {
-        $root = $this->directoryList->getPath($directoryConfig);
-        $traverseRealPath = realpath($path);
-
-        return $root === $traverseRealPath;
-    }
 }

From 20bf889a02e744f81818e72e655946ca5d87a486 Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Wed, 19 Feb 2020 11:18:52 -0600
Subject: [PATCH 0050/1718] MC-31362: Media folder update

- Updated storage path check
- Removed extra test
---
 .../Cms/Model/Wysiwyg/Images/Storage.php      |   2 +-
 .../Unit/Model/Design/Backend/ImageTest.php   | 172 ------------------
 2 files changed, 1 insertion(+), 173 deletions(-)
 delete mode 100644 app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php

diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
index 1cb1aa20c5a16..c54f4c5bae3d8 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
@@ -765,7 +765,7 @@ public function getCmsWysiwygImages()
     protected function _validatePath($path)
     {
         $root = $this->_sanitizePath($this->_cmsWysiwygImages->getStorageRoot());
-        $realPath = realpath($path);
+        $realPath = $this->_sanitizePath($path);
         if ($root == $realPath) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('We can\'t delete root directory %1 right now.', $path)
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php
deleted file mode 100644
index ebfe83239ed21..0000000000000
--- a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Theme\Test\Unit\Model\Design\Backend;
-
-use Magento\Framework\UrlInterface;
-use Magento\Theme\Model\Design\Backend\Image;
-use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Filesystem\Io\File as IoFileSystem;
-
-/**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class ImageTest extends \PHPUnit\Framework\TestCase
-{
-    /** @var \Magento\Framework\Filesystem\Directory\WriteInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $mediaDirectory;
-
-    /** @var UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $urlBuilder;
-
-    /** @var Image */
-    protected $imageBackend;
-
-    /** @var IoFileSystem|\PHPUnit_Framework_MockObject_MockObject */
-    private $ioFileSystem;
-
-    /**
-     * @var \Magento\Framework\File\Mime|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $mime;
-
-    /**
-     * @var \Magento\MediaStorage\Helper\File\Storage\Database|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $databaseHelper;
-
-    public function setUp()
-    {
-        $context = $this->getMockObject(\Magento\Framework\Model\Context::class);
-        $registry = $this->getMockObject(\Magento\Framework\Registry::class);
-        $config = $this->getMockObjectForAbstractClass(\Magento\Framework\App\Config\ScopeConfigInterface::class);
-        $cacheTypeList = $this->getMockObjectForAbstractClass(\Magento\Framework\App\Cache\TypeListInterface::class);
-        $uploaderFactory = $this->getMockObject(\Magento\MediaStorage\Model\File\UploaderFactory::class, ['create']);
-        $requestData = $this->getMockObjectForAbstractClass(
-            \Magento\Config\Model\Config\Backend\File\RequestData\RequestDataInterface::class
-        );
-        $filesystem = $this->getMockBuilder(\Magento\Framework\Filesystem::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->mediaDirectory = $this->getMockBuilder(\Magento\Framework\Filesystem\Directory\WriteInterface::class)
-            ->getMockForAbstractClass();
-
-        $filesystem->expects($this->once())
-            ->method('getDirectoryWrite')
-            ->with(DirectoryList::MEDIA)
-            ->willReturn($this->mediaDirectory);
-        $this->urlBuilder = $this->getMockBuilder(\Magento\Framework\UrlInterface::class)
-            ->getMockForAbstractClass();
-
-        $this->ioFileSystem = $this->getMockBuilder(\Magento\Framework\Filesystem\Io\File::class)
-            ->getMockForAbstractClass();
-
-        $this->mime = $this->getMockBuilder(\Magento\Framework\File\Mime::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->databaseHelper = $this->getMockBuilder(\Magento\MediaStorage\Helper\File\Storage\Database::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $abstractResource = $this->getMockBuilder(\Magento\Framework\Model\ResourceModel\AbstractResource::class)
-            ->getMockForAbstractClass();
-
-        $abstractDb = $this->getMockBuilder(\Magento\Framework\Data\Collection\AbstractDb::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-
-        $this->imageBackend = new Image(
-            $context,
-            $registry,
-            $config,
-            $cacheTypeList,
-            $uploaderFactory,
-            $requestData,
-            $filesystem,
-            $this->urlBuilder,
-            $abstractResource,
-            $abstractDb,
-            [],
-            $this->databaseHelper,
-            $this->ioFileSystem
-        );
-    }
-
-    public function tearDown()
-    {
-        unset($this->imageBackend);
-    }
-
-    /**
-     * @param string $class
-     * @param array $methods
-     * @return \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected function getMockObject($class, $methods = [])
-    {
-        $builder =  $this->getMockBuilder($class)
-            ->disableOriginalConstructor();
-        if (count($methods)) {
-            $builder->setMethods($methods);
-        }
-        return  $builder->getMock();
-    }
-
-    /**
-     * @param string $class
-     * @return \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected function getMockObjectForAbstractClass($class)
-    {
-        return  $this->getMockBuilder($class)
-            ->getMockForAbstractClass();
-    }
-
-    /**
-     * @dataProvider beforeSaveInvalidDataProvider
-     * @param string $imageName
-     *
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Something is wrong with the file upload settings.
-     */
-    public function testBeforeSaveInvalidImage($imageName)
-    {
-        {
-            $this->imageBackend->setScope('store');
-            $this->imageBackend->setScopeId(1);
-            $this->imageBackend->setValue(
-                [
-                    [
-                        'url' => 'http://magento2.com/pub/media/tmp/image/' . $imageName,
-                        'file' => $imageName,
-                        'size' => 234234,
-                    ]
-                ]
-            );
-            $this->imageBackend->setFieldConfig(
-                [
-                    'upload_dir' => [
-                        'value' => 'value',
-                        'config' => 'system/filesystem/media',
-                    ],
-                ]
-            );
-
-            $this->imageBackend->beforeSave();
-        }
-    }
-
-    /**
-     * @return array
-     */
-    public function beforeSaveInvalidDataProvider()
-    {
-        return [
-            'Invalid Extension' => ['file.invalid'],
-            'Vulnerable file name' => ['../../../../../../../../etc/passwd'],
-        ];
-    }
-}

From e6b3c6152fd53e4a7f88174d8315ca8389ac29b3 Mon Sep 17 00:00:00 2001
From: Stas Kozar <stas.kozar@transoftgroup.com>
Date: Thu, 20 Feb 2020 09:53:08 +0200
Subject: [PATCH 0051/1718] MC-31359: Remove possibility to upload svg files.

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

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

From f14771412e6eceee39633395697caf8d6eb1daf7 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Mon, 24 Feb 2020 10:19:43 +0200
Subject: [PATCH 0052/1718] MC-24883: [Forward Port 2.4] Session cleaner
 functionality improvement

---
 .../Customer/Api/SessionCleanerInterface.php  |  22 +++
 .../Customer/Model/AccountManagement.php      | 148 +++++++-----------
 .../Customer/Model/Session/SessionCleaner.php | 100 ++++++++++++
 app/code/Magento/Customer/Model/Visitor.php   |  23 ++-
 .../StorefrontUpdateCustomerPasswordTest.xml  |  15 +-
 .../Test/Unit/Model/AccountManagementTest.php |  54 ++-----
 app/code/Magento/Customer/etc/di.xml          |   1 +
 .../Customer/Model/AccountManagementTest.php  |  15 ++
 8 files changed, 241 insertions(+), 137 deletions(-)
 create mode 100644 app/code/Magento/Customer/Api/SessionCleanerInterface.php
 create mode 100644 app/code/Magento/Customer/Model/Session/SessionCleaner.php

diff --git a/app/code/Magento/Customer/Api/SessionCleanerInterface.php b/app/code/Magento/Customer/Api/SessionCleanerInterface.php
new file mode 100644
index 0000000000000..eb24712105f96
--- /dev/null
+++ b/app/code/Magento/Customer/Api/SessionCleanerInterface.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Api;
+
+/**
+ * Interface for cleaning customer session data.
+ */
+interface SessionCleanerInterface
+{
+    /**
+     * Destroy all active customer sessions related to given customer id, including current session.
+     *
+     * @param int $customerId
+     * @return void
+     */
+    public function clearFor(int $customerId): void;
+}
diff --git a/app/code/Magento/Customer/Model/AccountManagement.php b/app/code/Magento/Customer/Model/AccountManagement.php
index e2d997ed445b8..abd74c01ba71e 100644
--- a/app/code/Magento/Customer/Model/AccountManagement.php
+++ b/app/code/Magento/Customer/Model/AccountManagement.php
@@ -13,6 +13,7 @@
 use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Api\Data\ValidationResultsInterfaceFactory;
+use Magento\Customer\Api\SessionCleanerInterface;
 use Magento\Customer\Helper\View as CustomerViewHelper;
 use Magento\Customer\Model\Config\Share as ConfigShare;
 use Magento\Customer\Model\Customer as CustomerModel;
@@ -68,55 +69,55 @@ class AccountManagement implements AccountManagementInterface
     /**
      * Configuration paths for create account email template
      *
-     * @deprecated Get rid of Helpers in Password Security Management
-     * @see EmailNotification::XML_PATH_REGISTER_EMAIL_TEMPLATE
+     * @deprecated get rid of Helpers in Password Security Management.
+     * @see \Magento\Customer\Model\EmailNotification::XML_PATH_REGISTER_EMAIL_TEMPLATE
      */
     const XML_PATH_REGISTER_EMAIL_TEMPLATE = 'customer/create_account/email_template';
 
     /**
      * Configuration paths for register no password email template
      *
-     * @deprecated Get rid of Helpers in Password Security Management
-     * @see EmailNotification::XML_PATH_REGISTER_EMAIL_TEMPLATE
+     * @deprecated get rid of Helpers in Password Security Management.
+     * @see \Magento\Customer\Model\EmailNotification::XML_PATH_REGISTER_NO_PASSWORD_EMAIL_TEMPLATE
      */
     const XML_PATH_REGISTER_NO_PASSWORD_EMAIL_TEMPLATE = 'customer/create_account/email_no_password_template';
 
     /**
      * Configuration paths for remind email identity
      *
-     * @deprecated Get rid of Helpers in Password Security Management
-     * @see EmailNotification::XML_PATH_REGISTER_EMAIL_TEMPLATE
+     * @deprecated get rid of Helpers in Password Security Management.
+     * @see \Magento\Customer\Model\EmailNotification::XML_PATH_REGISTER_EMAIL_IDENTITY
      */
     const XML_PATH_REGISTER_EMAIL_IDENTITY = 'customer/create_account/email_identity';
 
     /**
      * Configuration paths for remind email template
      *
-     * @deprecated Get rid of Helpers in Password Security Management
-     * @see EmailNotification::XML_PATH_REGISTER_EMAIL_TEMPLATE
+     * @deprecated get rid of Helpers in Password Security Management.
+     * @see \Magento\Customer\Model\EmailNotification::XML_PATH_REMIND_EMAIL_TEMPLATE
      */
     const XML_PATH_REMIND_EMAIL_TEMPLATE = 'customer/password/remind_email_template';
 
     /**
      * Configuration paths for forgot email email template
      *
-     * @deprecated Get rid of Helpers in Password Security Management
-     * @see EmailNotification::XML_PATH_REGISTER_EMAIL_TEMPLATE
+     * @deprecated get rid of Helpers in Password Security Management.
+     * @see \Magento\Customer\Model\EmailNotification::XML_PATH_FORGOT_EMAIL_TEMPLATE
      */
     const XML_PATH_FORGOT_EMAIL_TEMPLATE = 'customer/password/forgot_email_template';
 
     /**
      * Configuration paths for forgot email identity
      *
-     * @deprecated Get rid of Helpers in Password Security Management
-     * @see EmailNotification::XML_PATH_REGISTER_EMAIL_TEMPLATE
+     * @deprecated get rid of Helpers in Password Security Management.
+     * @see \Magento\Customer\Model\EmailNotification::XML_PATH_FORGOT_EMAIL_IDENTITY
      */
     const XML_PATH_FORGOT_EMAIL_IDENTITY = 'customer/password/forgot_email_identity';
 
     /**
      * Configuration paths for account confirmation required
      *
-     * @deprecated Get rid of Helpers in Password Security Management
+     * @deprecated get rid of Helpers in Password Security Management.
      * @see AccountConfirmation::XML_PATH_IS_CONFIRM
      */
     const XML_PATH_IS_CONFIRM = 'customer/create_account/confirm';
@@ -124,48 +125,48 @@ class AccountManagement implements AccountManagementInterface
     /**
      * Configuration paths for account confirmation email template
      *
-     * @deprecated Get rid of Helpers in Password Security Management
-     * @see EmailNotification::XML_PATH_REGISTER_EMAIL_TEMPLATE
+     * @deprecated get rid of Helpers in Password Security Management.
+     * @see \Magento\Customer\Model\EmailNotification::XML_PATH_CONFIRM_EMAIL_TEMPLATE
      */
     const XML_PATH_CONFIRM_EMAIL_TEMPLATE = 'customer/create_account/email_confirmation_template';
 
     /**
      * Configuration paths for confirmation confirmed email template
      *
-     * @deprecated Get rid of Helpers in Password Security Management
-     * @see EmailNotification::XML_PATH_REGISTER_EMAIL_TEMPLATE
+     * @deprecated get rid of Helpers in Password Security Management.
+     * @see \Magento\Customer\Model\EmailNotification::XML_PATH_CONFIRMED_EMAIL_TEMPLATE
      */
     const XML_PATH_CONFIRMED_EMAIL_TEMPLATE = 'customer/create_account/email_confirmed_template';
 
     /**
      * Constants for the type of new account email to be sent
      *
-     * @deprecated Get rid of Helpers in Password Security Management
-     * @see EmailNotificationInterface::NEW_ACCOUNT_EMAIL_REGISTERED
+     * @deprecated get rid of Helpers in Password Security Management.
+     * @see \Magento\Customer\Model\EmailNotificationInterface::NEW_ACCOUNT_EMAIL_REGISTERED
      */
     const NEW_ACCOUNT_EMAIL_REGISTERED = 'registered';
 
     /**
      * Welcome email, when password setting is required
      *
-     * @deprecated Get rid of Helpers in Password Security Management
-     * @see EmailNotificationInterface::NEW_ACCOUNT_EMAIL_REGISTERED
+     * @deprecated get rid of Helpers in Password Security Management.
+     * @see \Magento\Customer\Model\EmailNotificationInterface::NEW_ACCOUNT_EMAIL_REGISTERED_NO_PASSWORD
      */
     const NEW_ACCOUNT_EMAIL_REGISTERED_NO_PASSWORD = 'registered_no_password';
 
     /**
      * Welcome email, when confirmation is enabled
      *
-     * @deprecated Get rid of Helpers in Password Security Management
-     * @see EmailNotificationInterface::NEW_ACCOUNT_EMAIL_REGISTERED
+     * @deprecated get rid of Helpers in Password Security Management.
+     * @see \Magento\Customer\Model\EmailNotificationInterface::NEW_ACCOUNT_EMAIL_CONFIRMATION
      */
     const NEW_ACCOUNT_EMAIL_CONFIRMATION = 'confirmation';
 
     /**
      * Confirmation email, when account is confirmed
      *
-     * @deprecated Get rid of Helpers in Password Security Management
-     * @see EmailNotificationInterface::NEW_ACCOUNT_EMAIL_REGISTERED
+     * @deprecated get rid of Helpers in Password Security Management.
+     * @see \Magento\Customer\Model\EmailNotificationInterface::NEW_ACCOUNT_EMAIL_CONFIRMED
      */
     const NEW_ACCOUNT_EMAIL_CONFIRMED = 'confirmed';
 
@@ -191,15 +192,16 @@ class AccountManagement implements AccountManagementInterface
     /**
      * Configuration path to customer reset password email template
      *
-     * @deprecated Get rid of Helpers in Password Security Management
-     * @see Magento/Customer/Model/EmailNotification::XML_PATH_REGISTER_EMAIL_TEMPLATE
+     * @deprecated get rid of Helpers in Password Security Management.
+     * @see \Magento\Customer\Model\EmailNotification::XML_PATH_RESET_PASSWORD_TEMPLATE
      */
     const XML_PATH_RESET_PASSWORD_TEMPLATE = 'customer/password/reset_password_template';
 
     /**
      * Minimum password length
      *
-     * @deprecated Get rid of Helpers in Password Security Management
+     * @deprecated get rid of Helpers in Password Security Management.
+     * @see \Magento\Customer\Model\AccountManagement::XML_PATH_MINIMUM_PASSWORD_LENGTH
      */
     const MIN_PASSWORD_LENGTH = 6;
 
@@ -283,21 +285,6 @@ class AccountManagement implements AccountManagementInterface
      */
     private $transportBuilder;
 
-    /**
-     * @var SessionManagerInterface
-     */
-    private $sessionManager;
-
-    /**
-     * @var SaveHandlerInterface
-     */
-    private $saveHandler;
-
-    /**
-     * @var CollectionFactory
-     */
-    private $visitorCollectionFactory;
-
     /**
      * @var DataObjectProcessor
      */
@@ -383,6 +370,11 @@ class AccountManagement implements AccountManagementInterface
      */
     private $getByToken;
 
+    /**
+     * @var SessionCleanerInterface
+     */
+    private $sessionCleaner;
+
     /**
      * @param CustomerFactory $customerFactory
      * @param ManagerInterface $eventManager
@@ -417,10 +409,12 @@ class AccountManagement implements AccountManagementInterface
      * @param AddressRegistry|null $addressRegistry
      * @param GetCustomerByToken|null $getByToken
      * @param AllowedCountries|null $allowedCountriesReader
+     * @param SessionCleanerInterface|null $sessionCleaner
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.LongVariable)
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         CustomerFactory $customerFactory,
@@ -455,7 +449,8 @@ public function __construct(
         SearchCriteriaBuilder $searchCriteriaBuilder = null,
         AddressRegistry $addressRegistry = null,
         GetCustomerByToken $getByToken = null,
-        AllowedCountries $allowedCountriesReader = null
+        AllowedCountries $allowedCountriesReader = null,
+        SessionCleanerInterface $sessionCleaner = null
     ) {
         $this->customerFactory = $customerFactory;
         $this->eventManager = $eventManager;
@@ -486,12 +481,6 @@ public function __construct(
         $this->dateTimeFactory = $dateTimeFactory ?: $objectManager->get(DateTimeFactory::class);
         $this->accountConfirmation = $accountConfirmation ?: $objectManager
             ->get(AccountConfirmation::class);
-        $this->sessionManager = $sessionManager
-            ?: $objectManager->get(SessionManagerInterface::class);
-        $this->saveHandler = $saveHandler
-            ?: $objectManager->get(SaveHandlerInterface::class);
-        $this->visitorCollectionFactory = $visitorCollectionFactory
-            ?: $objectManager->get(CollectionFactory::class);
         $this->searchCriteriaBuilder = $searchCriteriaBuilder
             ?: $objectManager->get(SearchCriteriaBuilder::class);
         $this->addressRegistry = $addressRegistry
@@ -500,6 +489,7 @@ public function __construct(
             ?: $objectManager->get(GetCustomerByToken::class);
         $this->allowedCountriesReader = $allowedCountriesReader
             ?: $objectManager->get(AllowedCountries::class);
+        $this->sessionCleaner = $sessionCleaner ?? $objectManager->get(SessionCleanerInterface::class);
     }
 
     /**
@@ -538,7 +528,10 @@ public function resendConfirmation($email, $websiteId = null, $redirectUrl = '')
         } catch (MailException $e) {
             // If we are not able to send a new account email, this should be ignored
             $this->logger->critical($e);
+
+            return false;
         }
+
         return true;
     }
 
@@ -685,16 +678,18 @@ public function initiatePasswordReset($email, $template, $websiteId = null)
      */
     private function handleUnknownTemplate($template)
     {
-        $phrase = __(
-            'Invalid value of "%value" provided for the %fieldName field. Possible values: %template1 or %template2.',
-            [
-                'value' => $template,
-                'fieldName' => 'template',
-                'template1' => AccountManagement::EMAIL_REMINDER,
-                'template2' => AccountManagement::EMAIL_RESET
-            ]
+        throw new InputException(
+            __(
+                'Invalid value of "%value" provided for the %fieldName field. '
+                    . 'Possible values: %template1 or %template2.',
+                [
+                    'value' => $template,
+                    'fieldName' => 'template',
+                    'template1' => AccountManagement::EMAIL_REMINDER,
+                    'template2' => AccountManagement::EMAIL_RESET
+                ]
+            )
         );
-        throw new InputException($phrase);
     }
 
     /**
@@ -725,7 +720,7 @@ public function resetPassword($email, $resetToken, $newPassword)
         $customerSecure->setRpToken(null);
         $customerSecure->setRpTokenCreatedAt(null);
         $customerSecure->setPasswordHash($this->createPasswordHash($newPassword));
-        $this->destroyCustomerSessions($customer->getId());
+        $this->sessionCleaner->clearFor((int)$customer->getId());
         $this->customerRepository->save($customer);
 
         return true;
@@ -872,6 +867,7 @@ public function createAccountWithPasswordHash(CustomerInterface $customer, $hash
         if ($customer->getId()) {
             $customer = $this->customerRepository->get($customer->getEmail());
             $websiteId = $customer->getWebsiteId();
+
             if ($this->isCustomerInStore($websiteId, $customer->getStoreId())) {
                 throw new InputException(__('This customer already exists in this store.'));
             }
@@ -1050,7 +1046,7 @@ private function changePasswordForCustomer($customer, $currentPassword, $newPass
         $customerSecure->setRpTokenCreatedAt(null);
         $this->checkPasswordStrength($newPassword);
         $customerSecure->setPasswordHash($this->createPasswordHash($newPassword));
-        $this->destroyCustomerSessions($customer->getId());
+        $this->sessionCleaner->clearFor((int)$customer->getId());
         $this->disableAddressValidation($customer);
         $this->customerRepository->save($customer);
 
@@ -1619,36 +1615,6 @@ private function getEmailNotification()
         }
     }
 
-    /**
-     * Destroy all active customer sessions by customer id (current session will not be destroyed).
-     *
-     * Customer sessions which should be deleted are collecting from the "customer_visitor" table considering
-     * configured session lifetime.
-     *
-     * @param string|int $customerId
-     * @return void
-     */
-    private function destroyCustomerSessions($customerId)
-    {
-        $sessionLifetime = $this->scopeConfig->getValue(
-            \Magento\Framework\Session\Config::XML_PATH_COOKIE_LIFETIME,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        );
-        $dateTime = $this->dateTimeFactory->create();
-        $activeSessionsTime = $dateTime->setTimestamp($dateTime->getTimestamp() - $sessionLifetime)
-            ->format(DateTime::DATETIME_PHP_FORMAT);
-        /** @var \Magento\Customer\Model\ResourceModel\Visitor\Collection $visitorCollection */
-        $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();
-            $this->saveHandler->destroy($sessionId);
-        }
-    }
-
     /**
      * Set ignore_validation_flag for reset password flow to skip unnecessary address and customer validation
      *
diff --git a/app/code/Magento/Customer/Model/Session/SessionCleaner.php b/app/code/Magento/Customer/Model/Session/SessionCleaner.php
new file mode 100644
index 0000000000000..1423c94782535
--- /dev/null
+++ b/app/code/Magento/Customer/Model/Session/SessionCleaner.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Model\Session;
+
+use Magento\Customer\Api\SessionCleanerInterface;
+use Magento\Customer\Model\ResourceModel\Visitor\CollectionFactory as VisitorCollectionFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Intl\DateTimeFactory;
+use Magento\Framework\Session\Config;
+use Magento\Framework\Session\SaveHandlerInterface;
+use Magento\Framework\Session\SessionManagerInterface;
+use Magento\Framework\Stdlib\DateTime;
+use Magento\Store\Model\ScopeInterface;
+
+/**
+ * Deletes all session data which relates to customer, including current session data.
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ */
+class SessionCleaner implements SessionCleanerInterface
+{
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var DateTimeFactory
+     */
+    private $dateTimeFactory;
+
+    /**
+     * @var VisitorCollectionFactory
+     */
+    private $visitorCollectionFactory;
+
+    /**
+     * @var SessionManagerInterface
+     */
+    private $sessionManager;
+
+    /**
+     * @var SaveHandlerInterface
+     */
+    private $saveHandler;
+
+    /**
+     * @inheritdoc
+     */
+    public function __construct(
+        ScopeConfigInterface $scopeConfig,
+        DateTimeFactory $dateTimeFactory,
+        VisitorCollectionFactory $visitorCollectionFactory,
+        SessionManagerInterface $sessionManager,
+        SaveHandlerInterface $saveHandler
+    ) {
+        $this->scopeConfig = $scopeConfig;
+        $this->dateTimeFactory = $dateTimeFactory;
+        $this->visitorCollectionFactory = $visitorCollectionFactory;
+        $this->sessionManager = $sessionManager;
+        $this->saveHandler = $saveHandler;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    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
+        );
+        $dateTime = $this->dateTimeFactory->create();
+        $activeSessionsTime = $dateTime->setTimestamp($dateTime->getTimestamp() - $sessionLifetime)
+            ->format(DateTime::DATETIME_PHP_FORMAT);
+        /** @var \Magento\Customer\Model\ResourceModel\Visitor\Collection $visitorCollection */
+        $visitorCollection = $this->visitorCollectionFactory->create();
+        $visitorCollection->addFieldToFilter('customer_id', $customerId);
+        $visitorCollection->addFieldToFilter('last_visit_at', ['from' => $activeSessionsTime]);
+        /** @var \Magento\Customer\Model\Visitor $visitor */
+        foreach ($visitorCollection->getItems() as $visitor) {
+            $sessionId = $visitor->getSessionId();
+            $this->sessionManager->start();
+            $this->saveHandler->destroy($sessionId);
+            $this->sessionManager->writeClose();
+        }
+    }
+}
diff --git a/app/code/Magento/Customer/Model/Visitor.php b/app/code/Magento/Customer/Model/Visitor.php
index 5fa1af69e9bdd..1f1487c58c168 100644
--- a/app/code/Magento/Customer/Model/Visitor.php
+++ b/app/code/Magento/Customer/Model/Visitor.php
@@ -10,7 +10,7 @@
 use Magento\Framework\App\RequestSafetyInterface;
 
 /**
- * Class Visitor
+ * Class Visitor responsible for initializing visitor's.
  *
  *  Used to track sessions of the logged in customers
  *
@@ -195,7 +195,9 @@ public function initByRequest($observer)
     public function saveByRequest($observer)
     {
         // prevent saving Visitor for safe methods, e.g. GET request
-        if ($this->skipRequestLogging || $this->requestSafety->isSafeMethod() || $this->isModuleIgnored($observer)) {
+        if (($this->skipRequestLogging || $this->requestSafety->isSafeMethod() || $this->isModuleIgnored($observer))
+            && !$this->sessionIdHasChanged()
+        ) {
             return $this;
         }
 
@@ -212,6 +214,23 @@ public function saveByRequest($observer)
         return $this;
     }
 
+    /**
+     * Check if visitor session id was changed.
+     *
+     * @return bool
+     */
+    private function sessionIdHasChanged(): bool
+    {
+        $visitorData = $this->session->getVisitorData();
+        $hasChanged = false;
+
+        if (isset($visitorData['session_id'])) {
+            $hasChanged = $this->session->getSessionId() !== $visitorData['session_id'];
+        }
+
+        return $hasChanged;
+    }
+
     /**
      * Returns true if the module is required
      *
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerPasswordTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerPasswordTest.xml
index 9bc253c91af92..36a561e47f8ab 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerPasswordTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontUpdateCustomerPasswordTest.xml
@@ -78,4 +78,17 @@
         <remove keyForRemoval="loginWithNewPassword"/>
         <remove keyForRemoval="seeMyEmail"/>
     </test>
-</tests>
\ No newline at end of file
+    <test name="StorefrontUpdateCustomerPasswordRedirectOnLoginPage" extends="StorefrontUpdateCustomerPasswordValidCurrentPasswordTest">
+        <annotations>
+            <title value="Update Customer Password on Storefront Redirect on Login Page"/>
+            <description value="Update Customer Password on Storefront Redirect on Login Page"/>
+            <testCaseId value="MC-29687"/>
+            <useCaseId value="MC-24883"/>
+        </annotations>
+        <remove keyForRemoval="logout"/>
+        <remove keyForRemoval="loginWithNewPassword"/>
+        <remove keyForRemoval="seeMyEmail"/>
+
+        <seeInCurrentUrl url="{{StorefrontCustomerSignInPage.url}}" stepKey="assertStorefrontCustomerLoginPage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php b/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
index 2344e0c8bce02..6dff700ba729b 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php
@@ -7,6 +7,7 @@
 namespace Magento\Customer\Test\Unit\Model;
 
 use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Api\SessionCleanerInterface;
 use Magento\Customer\Model\AccountConfirmation;
 use Magento\Customer\Model\AccountManagement;
 use Magento\Customer\Model\AuthenticationInterface;
@@ -161,6 +162,11 @@ class AccountManagementTest extends \PHPUnit\Framework\TestCase
      */
     private $allowedCountriesReader;
 
+    /**
+     * @var SessionCleanerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $sessionCleanerMock;
+
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -1447,6 +1453,7 @@ private function reInitModel()
             ->setMethods(['create'])
             ->getMock();
         $dateTimeFactory->expects($this->any())->method('create')->willReturn($dateTimeMock);
+        $this->sessionCleanerMock = $this->createMock(SessionCleanerInterface::class);
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->accountManagement = $this->objectManagerHelper->getObject(
@@ -1467,6 +1474,7 @@ private function reInitModel()
                 'storeManager' => $this->storeManager,
                 'addressRegistry' => $this->addressRegistryMock,
                 'transportBuilder' => $this->transportBuilder,
+                'sessionCleaner' => $this->sessionCleanerMock,
             ]
         );
         $this->objectManagerHelper->setBackwardCompatibleProperty(
@@ -1545,33 +1553,13 @@ public function testChangePassword()
             ->with($newPassword)
             ->willReturn(7);
 
+        $this->sessionCleanerMock->expects($this->once())->method('clearFor')->with($customerId)->willReturnSelf();
+
         $this->customerRepository
             ->expects($this->once())
             ->method('save')
             ->with($customer);
 
-        $this->sessionManager->expects($this->atLeastOnce())->method('getSessionId');
-
-        $visitor = $this->getMockBuilder(\Magento\Customer\Model\Visitor::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getSessionId'])
-            ->getMock();
-        $visitor->expects($this->atLeastOnce())->method('getSessionId')
-            ->willReturnOnConsecutiveCalls('session_id_1', 'session_id_2');
-        $visitorCollection = $this->getMockBuilder(
-            \Magento\Customer\Model\ResourceModel\Visitor\CollectionFactory::class
-        )
-            ->disableOriginalConstructor()->setMethods(['addFieldToFilter', 'getItems'])->getMock();
-        $visitorCollection->expects($this->atLeastOnce())->method('addFieldToFilter')->willReturnSelf();
-        $visitorCollection->expects($this->atLeastOnce())->method('getItems')->willReturn([$visitor, $visitor]);
-        $this->visitorCollectionFactory->expects($this->atLeastOnce())->method('create')
-            ->willReturn($visitorCollection);
-        $this->saveHandler->expects($this->atLeastOnce())->method('destroy')
-            ->withConsecutive(
-                ['session_id_1'],
-                ['session_id_2']
-            );
-
         $this->assertTrue($this->accountManagement->changePassword($email, $currentPassword, $newPassword));
     }
 
@@ -1625,28 +1613,8 @@ function ($string) {
         $this->customerSecure->expects($this->once())->method('setRpToken')->with(null);
         $this->customerSecure->expects($this->once())->method('setRpTokenCreatedAt')->with(null);
         $this->customerSecure->expects($this->any())->method('setPasswordHash')->willReturn(null);
+        $this->sessionCleanerMock->expects($this->once())->method('clearFor')->with($customerId)->willReturnSelf();
 
-        $this->sessionManager->method('isSessionExists')->willReturn(false);
-        $this->sessionManager->expects($this->atLeastOnce())->method('getSessionId');
-        $visitor = $this->getMockBuilder(\Magento\Customer\Model\Visitor::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getSessionId'])
-            ->getMock();
-        $visitor->expects($this->atLeastOnce())->method('getSessionId')
-            ->willReturnOnConsecutiveCalls('session_id_1', 'session_id_2');
-        $visitorCollection = $this->getMockBuilder(
-            \Magento\Customer\Model\ResourceModel\Visitor\CollectionFactory::class
-        )
-            ->disableOriginalConstructor()->setMethods(['addFieldToFilter', 'getItems'])->getMock();
-        $visitorCollection->expects($this->atLeastOnce())->method('addFieldToFilter')->willReturnSelf();
-        $visitorCollection->expects($this->atLeastOnce())->method('getItems')->willReturn([$visitor, $visitor]);
-        $this->visitorCollectionFactory->expects($this->atLeastOnce())->method('create')
-            ->willReturn($visitorCollection);
-        $this->saveHandler->expects($this->atLeastOnce())->method('destroy')
-            ->withConsecutive(
-                ['session_id_1'],
-                ['session_id_2']
-            );
         $this->assertTrue($this->accountManagement->resetPassword($customerEmail, $resetToken, $newPassword));
     }
 
diff --git a/app/code/Magento/Customer/etc/di.xml b/app/code/Magento/Customer/etc/di.xml
index be219a81fd990..dbbe1b5862a08 100644
--- a/app/code/Magento/Customer/etc/di.xml
+++ b/app/code/Magento/Customer/etc/di.xml
@@ -61,6 +61,7 @@
                 type="Magento\Customer\Block\Account\SortLink"/>
     <preference for="Magento\Customer\Model\Group\RetrieverInterface"
                 type="Magento\Customer\Model\Group\Retriever"/>
+    <preference for="Magento\Customer\Api\SessionCleanerInterface" type="Magento\Customer\Model\Session\SessionCleaner"/>
     <type name="Magento\Customer\Model\Session">
         <arguments>
             <argument name="configShare" xsi:type="object">Magento\Customer\Model\Config\Share\Proxy</argument>
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php
index 754c949747d61..93b8e9ad35e24 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\NoSuchEntityException;
 use Magento\Framework\Exception\State\ExpiredException;
 use Magento\Framework\Reflection\DataObjectProcessor;
+use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 
@@ -177,8 +178,22 @@ public function testLoginWrongUsername()
      */
     public function testChangePassword()
     {
+        /** @var SessionManagerInterface $session */
+        $session = $this->objectManager->get(SessionManagerInterface::class);
+        $oldSessionId = $session->getSessionId();
+        $session->setTestData('test');
         $this->accountManagement->changePassword('customer@example.com', 'password', 'new_Password123');
 
+        $this->assertTrue(
+            $oldSessionId !== $session->getSessionId(),
+            'Customer session id wasn\'t regenerated after change password'
+        );
+
+        $session->destroy();
+        $session->setSessionId($oldSessionId);
+
+        $this->assertNull($session->getTestData(), 'Customer session data wasn\'t cleaned');
+
         $this->accountManagement->authenticate('customer@example.com', 'new_Password123');
     }
 

From b5799c4cb3a29cb845c7cc1c6b53ba3953d5e4fa Mon Sep 17 00:00:00 2001
From: Nathan Smith <nathsmit@adobe.com>
Date: Mon, 24 Feb 2020 13:53:08 -0600
Subject: [PATCH 0053/1718] MC-31733: Media gallery breaks in some filesystems

---
 app/code/Magento/Theme/Helper/Storage.php     | 25 +++++++++++++++++--
 .../Magento/Theme/Model/Wysiwyg/Storage.php   |  6 ++++-
 .../Test/Unit/Model/Wysiwyg/StorageTest.php   | 24 ++++++++++++++++++
 app/code/Magento/Theme/etc/di.xml             |  5 ++++
 4 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Theme/Helper/Storage.php b/app/code/Magento/Theme/Helper/Storage.php
index e41bc8b145e38..41daee8507307 100644
--- a/app/code/Magento/Theme/Helper/Storage.php
+++ b/app/code/Magento/Theme/Helper/Storage.php
@@ -11,6 +11,7 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Filesystem\DriverInterface;
 
 /**
  * Handles the storage of media files like images and fonts.
@@ -97,6 +98,10 @@ class Storage extends \Magento\Framework\App\Helper\AbstractHelper
      * @var \Magento\Framework\Filesystem\Io\File
      */
     private $file;
+    /**
+     * @var DriverInterface
+     */
+    private $filesystemDriver;
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
@@ -105,6 +110,7 @@ class Storage extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\View\Design\Theme\FlyweightFactory $themeFactory
      * @param \Magento\Framework\Filesystem\Io\File|null $file
      *
+     * @param DriverInterface|null $filesystemDriver
      * @throws \Magento\Framework\Exception\FileSystemException
      * @throws \Magento\Framework\Exception\ValidatorException
      */
@@ -113,7 +119,8 @@ public function __construct(
         \Magento\Framework\Filesystem $filesystem,
         \Magento\Backend\Model\Session $session,
         \Magento\Framework\View\Design\Theme\FlyweightFactory $themeFactory,
-        \Magento\Framework\Filesystem\Io\File $file = null
+        \Magento\Framework\Filesystem\Io\File $file = null,
+        DriverInterface $filesystemDriver = null
     ) {
         parent::__construct($context);
         $this->filesystem = $filesystem;
@@ -124,6 +131,7 @@ public function __construct(
         $this->file = $file ?: ObjectManager::getInstance()->get(
             \Magento\Framework\Filesystem\Io\File::class
         );
+        $this->filesystemDriver = $filesystemDriver ?: ObjectManager::getInstance()->get(DriverInterface::class);
     }
 
     /**
@@ -247,7 +255,20 @@ public function getCurrentPath()
             if ($path && $path !== self::NODE_ROOT) {
                 $path = $this->convertIdToPath($path);
 
-                if ($this->mediaDirectoryWrite->isDirectory($path) && 0 === strpos($path, (string) $currentPath)) {
+                $realPath = $this->filesystemDriver->getRealPath(
+                    $this->filesystemDriver->getRealPathSafety($path)
+                );
+
+                $path = $realPath ?: $path;
+
+                if (strpos($path, $currentPath) !== 0) {
+                    $path = $currentPath;
+                }
+
+                if ($this->mediaDirectoryWrite->isDirectory($path)
+                    && strpos($path, $currentPath) === 0
+                    && $path !== $currentPath
+                ) {
                     $currentPath = $this->mediaDirectoryWrite->getRelativePath($path);
                 }
             }
diff --git a/app/code/Magento/Theme/Model/Wysiwyg/Storage.php b/app/code/Magento/Theme/Model/Wysiwyg/Storage.php
index edf8c148f8e68..658e4d78490cd 100644
--- a/app/code/Magento/Theme/Model/Wysiwyg/Storage.php
+++ b/app/code/Magento/Theme/Model/Wysiwyg/Storage.php
@@ -18,11 +18,15 @@ class Storage
 {
     /**
      * Type font
+     *
+     * Represents the font type
      */
     const TYPE_FONT = 'font';
 
     /**
      * Type image
+     *
+     * Represents the image type
      */
     const TYPE_IMAGE = 'image';
 
@@ -328,7 +332,7 @@ public function deleteDirectory($path)
         $rootCmp = rtrim($this->_helper->getStorageRoot(), '/');
         $pathCmp = rtrim($path, '/');
 
-        if ($rootCmp == $pathCmp) {
+        if ($rootCmp == $pathCmp || $rootCmp === $this->mediaWriteDirectory->getAbsolutePath($path)) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('We can\'t delete root directory %1 right now.', $path)
             );
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Wysiwyg/StorageTest.php b/app/code/Magento/Theme/Test/Unit/Model/Wysiwyg/StorageTest.php
index 7ca25ee2ccac3..3cd3049172d0a 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Wysiwyg/StorageTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Wysiwyg/StorageTest.php
@@ -562,6 +562,30 @@ public function testDeleteRootDirectory()
         $this->_storageModel->deleteDirectory($directoryPath);
     }
 
+    /**
+     * cover \Magento\Theme\Model\Wysiwyg\Storage::deleteDirectory
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     */
+    public function testDeleteRootDirectoryRelative()
+    {
+        $directoryPath = $this->_storageRoot;
+        $fakePath = 'fake/relative/path';
+
+        $this->directoryWrite->method('getAbsolutePath')
+            ->with($fakePath)
+            ->willReturn($directoryPath);
+
+        $this->_helperStorage->expects(
+            $this->atLeastOnce()
+        )->method(
+            'getStorageRoot'
+        )->will(
+            $this->returnValue($directoryPath)
+        );
+
+        $this->_storageModel->deleteDirectory($fakePath);
+    }
+
     /**
      * @return array
      */
diff --git a/app/code/Magento/Theme/etc/di.xml b/app/code/Magento/Theme/etc/di.xml
index 9e06f6c0f4e51..ac5c83952281d 100644
--- a/app/code/Magento/Theme/etc/di.xml
+++ b/app/code/Magento/Theme/etc/di.xml
@@ -289,4 +289,9 @@
             <argument name="identifierName" xsi:type="string">theme_id</argument>
         </arguments>
     </type>
+    <type name="Magento\Theme\Helper\Storage">
+        <arguments>
+            <argument name="filesystemDriver" xsi:type="object">Magento\Framework\Filesystem\Driver\File</argument>
+        </arguments>
+    </type>
 </config>

From aa01632b74342484d57e50e5f6352db381c31b78 Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Tue, 25 Feb 2020 13:22:20 -0600
Subject: [PATCH 0054/1718] MC-31362: Media folder update

- Updated storage path handling logic
- Updated file driver path check logic
- Updated unit test for path check logic
- Updated test for image class
---
 .../Cms/Model/Wysiwyg/Images/Storage.php      |  46 +++++--
 .../Unit/Model/Design/Backend/FileTest.php    | 115 ++++++++++--------
 .../Unit/Model/Design/Backend/ImageTest.php   |  89 ++++++++++++++
 .../Framework/Filesystem/Driver/File.php      |   2 +-
 .../Filesystem/Test/Unit/Driver/FileTest.php  |  31 +++++
 5 files changed, 221 insertions(+), 62 deletions(-)
 create mode 100644 app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php

diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
index c54f4c5bae3d8..cec6c3aa50609 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
@@ -225,6 +225,8 @@ public function __construct(
      *
      * @param string $path
      * @return void
+     * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws \Magento\Framework\Exception\ValidatorException
      */
     protected function createSubDirectories($path)
     {
@@ -295,6 +297,7 @@ protected function removeItemFromCollection($collection, $conditions)
      *
      * @param string $path Parent directory path
      * @return \Magento\Framework\Data\Collection\Filesystem
+     * @throws \Exception
      */
     public function getDirsCollection($path)
     {
@@ -393,6 +396,7 @@ public function getFilesCollection($path, $type = null)
      *
      * @param string $path Path to the directory
      * @return \Magento\Cms\Model\Wysiwyg\Images\Storage\Collection
+     * @throws \Exception
      */
     public function getCollection($path = null)
     {
@@ -485,6 +489,9 @@ public function deleteDirectory($path)
      *
      * @param string $path
      * @return void
+     * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\ValidatorException
      */
     protected function _deleteByPath($path)
     {
@@ -500,6 +507,8 @@ protected function _deleteByPath($path)
      *
      * @param string $target File path to be deleted
      * @return $this
+     * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws \Magento\Framework\Exception\ValidatorException
      */
     public function deleteFile($target)
     {
@@ -561,9 +570,11 @@ public function uploadFile($targetPath, $type = null)
     /**
      * Thumbnail path getter
      *
-     * @param  string $filePath original file path
-     * @param  bool $checkFile OPTIONAL is it necessary to check file availability
+     * @param string $filePath original file path
+     * @param bool $checkFile OPTIONAL is it necessary to check file availability
      * @return string|false
+     * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws \Magento\Framework\Exception\ValidatorException
      */
     public function getThumbnailPath($filePath, $checkFile = false)
     {
@@ -587,9 +598,11 @@ public function getThumbnailPath($filePath, $checkFile = false)
     /**
      * Thumbnail URL getter
      *
-     * @param  string $filePath original file path
-     * @param  bool $checkFile OPTIONAL is it necessary to check file availability
+     * @param string $filePath original file path
+     * @param bool $checkFile OPTIONAL is it necessary to check file availability
      * @return string|false
+     * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws \Magento\Framework\Exception\ValidatorException
      */
     public function getThumbnailUrl($filePath, $checkFile = false)
     {
@@ -610,6 +623,8 @@ public function getThumbnailUrl($filePath, $checkFile = false)
      * @param string $source Image path to be resized
      * @param bool $keepRatio Keep aspect ratio or not
      * @return bool|string Resized filepath or false if errors were occurred
+     * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws \Magento\Framework\Exception\ValidatorException
      */
     public function resizeFile($source, $keepRatio = true)
     {
@@ -643,6 +658,9 @@ public function resizeFile($source, $keepRatio = true)
      *
      * @param string $filename File basename
      * @return bool|string Thumbnail path or false for errors
+     * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\ValidatorException
      */
     public function resizeOnTheFly($filename)
     {
@@ -658,6 +676,8 @@ public function resizeOnTheFly($filename)
      *
      * @param bool|string $filePath Path to the file
      * @return string
+     * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws \Magento\Framework\Exception\ValidatorException
      */
     public function getThumbsPath($filePath = false)
     {
@@ -765,13 +785,12 @@ public function getCmsWysiwygImages()
     protected function _validatePath($path)
     {
         $root = $this->_sanitizePath($this->_cmsWysiwygImages->getStorageRoot());
-        $realPath = $this->_sanitizePath($path);
-        if ($root == $realPath) {
+        if ($root == $path) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('We can\'t delete root directory %1 right now.', $path)
             );
         }
-        if (strpos($realPath, (string) $root) !== 0) {
+        if (strpos($path, (string) $root) !== 0) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('Directory %1 is not under storage root path.', $path)
             );
@@ -783,10 +802,20 @@ protected function _validatePath($path)
      *
      * @param string $path
      * @return string
+     * @throws \Magento\Framework\Exception\ValidatorException
      */
     protected function _sanitizePath($path)
     {
-        return rtrim(preg_replace('~[/\\\]+~', '/', $this->_directory->getDriver()->getRealPathSafety($path)), '/');
+        return rtrim(
+            preg_replace(
+                '~[/\\\]+~',
+                '/',
+                $this->_directory->getDriver()->getRealPathSafety(
+                    $this->_directory->getAbsolutePath($path)
+                )
+            ),
+            '/'
+        );
     }
 
     /**
@@ -794,6 +823,7 @@ protected function _sanitizePath($path)
      *
      * @param string $path
      * @return string|bool
+     * @throws \Magento\Framework\Exception\ValidatorException
      */
     protected function _getRelativePathToRoot($path)
     {
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
index 0a7e7c321ebe4..4278afe8f1bb0 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
@@ -5,10 +5,11 @@
  */
 namespace Magento\Theme\Test\Unit\Model\Design\Backend;
 
-use Magento\Framework\UrlInterface;
-use Magento\Theme\Model\Design\Backend\File;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filesystem\Io\File as IoFileSystem;
+use Magento\Framework\UrlInterface;
+use Magento\Theme\Model\Design\Backend\File;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -24,7 +25,7 @@ class FileTest extends \PHPUnit\Framework\TestCase
     /** @var File */
     protected $fileBackend;
 
-    /** @var IoFileSystem|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var IoFileSystem */
     private $ioFileSystem;
 
     /**
@@ -41,43 +42,48 @@ public function setUp()
     {
         $context = $this->getMockObject(\Magento\Framework\Model\Context::class);
         $registry = $this->getMockObject(\Magento\Framework\Registry::class);
-        $config = $this->getMockObjectForAbstractClass(\Magento\Framework\App\Config\ScopeConfigInterface::class);
-        $cacheTypeList = $this->getMockObjectForAbstractClass(\Magento\Framework\App\Cache\TypeListInterface::class);
-        $uploaderFactory = $this->getMockObject(\Magento\MediaStorage\Model\File\UploaderFactory::class, ['create']);
+        $config = $this->getMockObjectForAbstractClass(
+            \Magento\Framework\App\Config\ScopeConfigInterface::class
+        );
+        $cacheTypeList = $this->getMockObjectForAbstractClass(
+            \Magento\Framework\App\Cache\TypeListInterface::class
+        );
+        $uploaderFactory = $this->getMockObject(
+            \Magento\MediaStorage\Model\File\UploaderFactory::class,
+            ['create']
+        );
         $requestData = $this->getMockObjectForAbstractClass(
             \Magento\Config\Model\Config\Backend\File\RequestData\RequestDataInterface::class
         );
         $filesystem = $this->getMockBuilder(\Magento\Framework\Filesystem::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->mediaDirectory = $this->getMockBuilder(\Magento\Framework\Filesystem\Directory\WriteInterface::class)
+        $this->mediaDirectory = $this->getMockBuilder(
+            \Magento\Framework\Filesystem\Directory\WriteInterface::class
+        )
             ->getMockForAbstractClass();
-
         $filesystem->expects($this->once())
             ->method('getDirectoryWrite')
             ->with(DirectoryList::MEDIA)
             ->willReturn($this->mediaDirectory);
         $this->urlBuilder = $this->getMockBuilder(\Magento\Framework\UrlInterface::class)
             ->getMockForAbstractClass();
-
-        $this->ioFileSystem = $this->getMockBuilder(\Magento\Framework\Filesystem\Io\File::class)
-            ->getMockForAbstractClass();
-
         $this->mime = $this->getMockBuilder(\Magento\Framework\File\Mime::class)
             ->disableOriginalConstructor()
             ->getMock();
-
-        $this->databaseHelper = $this->getMockBuilder(\Magento\MediaStorage\Helper\File\Storage\Database::class)
+        $this->databaseHelper = $this->getMockBuilder(
+            \Magento\MediaStorage\Helper\File\Storage\Database::class
+        )
             ->disableOriginalConstructor()
             ->getMock();
-
-        $abstractResource = $this->getMockBuilder(\Magento\Framework\Model\ResourceModel\AbstractResource::class)
+        $abstractResource = $this->getMockBuilder(
+            \Magento\Framework\Model\ResourceModel\AbstractResource::class
+        )
             ->getMockForAbstractClass();
-
         $abstractDb = $this->getMockBuilder(\Magento\Framework\Data\Collection\AbstractDb::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
-
+        $this->ioFileSystem = new IoFileSystem();
         $this->fileBackend = new File(
             $context,
             $registry,
@@ -93,7 +99,6 @@ public function setUp()
             $this->databaseHelper,
             $this->ioFileSystem
         );
-
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $objectManager->setBackwardCompatibleProperty(
             $this->fileBackend,
@@ -139,16 +144,18 @@ public function testAfterLoad()
 
         $absoluteFilePath = '/absolute_path/' . $value;
 
-        $this->fileBackend->setValue($value);
-        $this->fileBackend->setFieldConfig(
+        $this->fileBackend->setData(
             [
-                'upload_dir' => [
-                    'value' => 'value',
-                    'config' => 'system/filesystem/media',
-                ],
-                'base_url' => [
-                    'type' => 'media',
-                    'value' => 'design/file'
+                'value' => $value,
+                'field_config' => [
+                    'upload_dir' => [
+                        'value' => 'value',
+                        'config' => 'system/filesystem/media',
+                    ],
+                    'base_url' => [
+                        'type' => 'media',
+                        'value' => 'design/file'
+                    ],
                 ],
             ]
         );
@@ -161,7 +168,6 @@ public function testAfterLoad()
             ->method('getAbsolutePath')
             ->with('value/' . $value)
             ->willReturn($absoluteFilePath);
-
         $this->urlBuilder->expects($this->once())
             ->method('getBaseUrl')
             ->with(['_type' => UrlInterface::URL_TYPE_MEDIA])
@@ -174,12 +180,10 @@ public function testAfterLoad()
             ->method('stat')
             ->with('value/' . $value)
             ->willReturn(['size' => 234234]);
-
         $this->mime->expects($this->once())
             ->method('getMimeType')
             ->with($absoluteFilePath)
             ->willReturn($mime);
-
         $this->fileBackend->afterLoad();
         $this->assertEquals(
             [
@@ -199,27 +203,28 @@ public function testAfterLoad()
     /**
      * @dataProvider beforeSaveDataProvider
      * @param string $fileName
+     * @throws LocalizedException
      */
     public function testBeforeSave($fileName)
     {
         $expectedFileName = basename($fileName);
         $expectedTmpMediaPath = 'tmp/design/file/' . $expectedFileName;
-        $this->fileBackend->setScope('store');
-        $this->fileBackend->setScopeId(1);
-        $this->fileBackend->setValue(
-            [
-                [
-                    'url' => 'http://magento2.com/pub/media/tmp/image/' . $fileName,
-                    'file' => $fileName,
-                    'size' => 234234,
-                ]
-            ]
-        );
-        $this->fileBackend->setFieldConfig(
+        $this->fileBackend->setData(
             [
-                'upload_dir' => [
-                    'value' => 'value',
-                    'config' => 'system/filesystem/media',
+                'scope' => 'store',
+                'scope_id' => 1,
+                'value' => [
+                    [
+                        'url' => 'http://magento2.com/pub/media/tmp/image/' . $fileName,
+                        'file' => $fileName,
+                        'size' => 234234,
+                    ]
+                ],
+                'field_config' => [
+                    'upload_dir' => [
+                        'value' => 'value',
+                        'config' => 'system/filesystem/media',
+                    ],
                 ],
             ]
         );
@@ -274,16 +279,19 @@ public function testBeforeSaveWithoutFile()
     public function testBeforeSaveWithExistingFile()
     {
         $value = 'filename.jpg';
-        $this->fileBackend->setValue(
+        $this->fileBackend->setData(
             [
-                [
-                    'url' => 'http://magento2.com/pub/media/tmp/image/' . $value,
-                    'file' => $value,
-                    'size' => 234234,
-                    'exists' => true
-                ]
+                'value' => [
+                    [
+                        'url' => 'http://magento2.com/pub/media/tmp/image/' . $value,
+                        'file' => $value,
+                        'size' => 234234,
+                        'exists' => true
+                    ]
+                ],
             ]
         );
+
         $this->fileBackend->beforeSave();
         $this->assertEquals(
             $value,
@@ -297,6 +305,7 @@ public function testBeforeSaveWithExistingFile()
      * @param string $path
      * @param string $filename
      * @dataProvider getRelativeMediaPathDataProvider
+     * @throws \ReflectionException
      */
     public function testGetRelativeMediaPath(string $path, string $filename)
     {
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php
new file mode 100644
index 0000000000000..c79fdbf9168ce
--- /dev/null
+++ b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Theme\Test\Unit\Model\Design\Backend;
+
+use Magento\Framework\Filesystem\Io\File as IoFileSystem;
+use Magento\Theme\Model\Design\Backend\Image;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ImageTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var Image */
+    protected $imageBackend;
+
+    public function setUp()
+    {
+        $context = $this->getMockObject(\Magento\Framework\Model\Context::class);
+        $registry = $this->getMockObject(\Magento\Framework\Registry::class);
+        $config = $this->getMockObject(\Magento\Framework\App\Config\ScopeConfigInterface::class);
+        $cacheTypeList = $this->getMockObject(\Magento\Framework\App\Cache\TypeListInterface::class);
+        $uploaderFactory = $this->getMockObject(\Magento\MediaStorage\Model\File\UploaderFactory::class);
+        $requestData = $this->getMockObject(
+            \Magento\Config\Model\Config\Backend\File\RequestData\RequestDataInterface::class
+        );
+        $filesystem = $this->getMockObject(\Magento\Framework\Filesystem::class);
+        $urlBuilder = $this->getMockObject(\Magento\Framework\UrlInterface::class);
+        $databaseHelper = $this->getMockObject(\Magento\MediaStorage\Helper\File\Storage\Database::class);
+        $abstractResource = $this->getMockObject(\Magento\Framework\Model\ResourceModel\AbstractResource::class);
+        $abstractDb = $this->getMockObject(\Magento\Framework\Data\Collection\AbstractDb::class);
+        $ioFileSystem = new IoFileSystem();
+        $this->imageBackend = new Image(
+            $context,
+            $registry,
+            $config,
+            $cacheTypeList,
+            $uploaderFactory,
+            $requestData,
+            $filesystem,
+            $urlBuilder,
+            $abstractResource,
+            $abstractDb,
+            [],
+            $databaseHelper,
+            $ioFileSystem
+        );
+    }
+
+    public function tearDown()
+    {
+        unset($this->imageBackend);
+    }
+
+    /**
+     * @param string $class
+     * @param array $methods
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected function getMockObject($class, $methods = [])
+    {
+        $builder =  $this->getMockBuilder($class)
+            ->disableOriginalConstructor();
+        if (count($methods)) {
+            $builder->setMethods($methods);
+        }
+        return  $builder->getMock();
+    }
+
+    /**
+     * @expectedException \Magento\Framework\Exception\LocalizedException
+     * @expectedExceptionMessage Something is wrong with the file upload settings.
+     */
+    public function testBeforeSaveWithInvalidExtensionFile()
+    {
+        $this->imageBackend->setData(
+            [
+                'value' => [
+                    [
+                        'file' => 'fileName.invalidExtension',
+                    ]
+                ],
+            ]
+        );
+        $this->imageBackend->beforeSave();
+    }
+}
diff --git a/lib/internal/Magento/Framework/Filesystem/Driver/File.php b/lib/internal/Magento/Framework/Filesystem/Driver/File.php
index 4d5ba7a1918ce..1a847a518a3f9 100644
--- a/lib/internal/Magento/Framework/Filesystem/Driver/File.php
+++ b/lib/internal/Magento/Framework/Filesystem/Driver/File.php
@@ -972,7 +972,7 @@ public function getRealPath($path)
      */
     public function getRealPathSafety($path)
     {
-        if (strpos($path, DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR) === false) {
+        if (strpos($path, DIRECTORY_SEPARATOR . '.') === false) {
             return $path;
         }
 
diff --git a/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/FileTest.php b/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/FileTest.php
index 5d1f9664bde61..e5926a815172e 100644
--- a/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/FileTest.php
+++ b/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/FileTest.php
@@ -24,6 +24,9 @@ public function setUp()
 
     /**
      * @dataProvider dataProviderForTestGetAbsolutePath
+     * @param $basePath
+     * @param $path
+     * @param $expected
      */
     public function testGetAbsolutePath($basePath, $path, $expected)
     {
@@ -46,6 +49,9 @@ public function dataProviderForTestGetAbsolutePath()
 
     /**
      * @dataProvider dataProviderForTestGetRelativePath
+     * @param $basePath
+     * @param $path
+     * @param $expected
      */
     public function testGetRelativePath($basePath, $path, $expected)
     {
@@ -65,4 +71,29 @@ public function dataProviderForTestGetRelativePath()
             ['/root/path/sub', '/root/path/other', '/root/path/other'],
         ];
     }
+
+    /**
+     * @dataProvider dataProviderForTestRealPathSafety
+     * @param $path
+     * @param $expected
+     */
+    public function testGetRealPathSafety($path, $expected)
+    {
+        $file = new File();
+        $this->assertEquals($expected, $file->getRealPathSafety($path));
+    }
+
+    /**
+     * @return array
+     */
+    public function dataProviderForTestRealPathSafety()
+    {
+        return [
+            ['/1/2/3', '/1/2/3'],
+            ['/1/2/3/../..', '/1'],
+            ['/1/2/3/.', '/1/2/3'],
+            ['/1/2/3/./4/5', '/1/2/3/4/5'],
+            ['/1/2/3/../4/5', '/1/2/4/5'],
+        ];
+    }
 }

From 4dc80f084392de86456ee12a884040a2f5981f9d Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Tue, 25 Feb 2020 16:13:41 -0600
Subject: [PATCH 0055/1718] MC-31362: Media folder update

- Added strict typing
- Added docblocks and type hints to tests
- Updated unit tests
---
 .../Adminhtml/Wysiwyg/Images/DeleteFolder.php |  3 +
 .../Theme/Model/Design/Backend/File.php       |  2 +
 .../Unit/Model/Design/Backend/FileTest.php    | 72 +++++++++++++------
 .../Unit/Model/Design/Backend/ImageTest.php   | 21 ++++--
 .../Filesystem/Test/Unit/Driver/FileTest.php  | 47 ++++++++----
 5 files changed, 105 insertions(+), 40 deletions(-)

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
index eec5c40c6e33b..29f84e0b2e534 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
@@ -4,6 +4,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
 
 use Magento\Framework\App\Action\HttpPostActionInterface;
diff --git a/app/code/Magento/Theme/Model/Design/Backend/File.php b/app/code/Magento/Theme/Model/Design/Backend/File.php
index 860a31041f2d0..143889364781f 100644
--- a/app/code/Magento/Theme/Model/Design/Backend/File.php
+++ b/app/code/Magento/Theme/Model/Design/Backend/File.php
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Theme\Model\Design\Backend;
 
 use Magento\Config\Model\Config\Backend\File as BackendFile;
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
index 4278afe8f1bb0..91ba3941ca937 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
@@ -3,41 +3,51 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Theme\Test\Unit\Model\Design\Backend;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\File\Mime;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
 use Magento\Framework\Filesystem\Io\File as IoFileSystem;
 use Magento\Framework\UrlInterface;
+use Magento\MediaStorage\Helper\File\Storage\Database;
 use Magento\Theme\Model\Design\Backend\File;
+use PHPUnit_Framework_MockObject_MockObject;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class FileTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var \Magento\Framework\Filesystem\Directory\WriteInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $mediaDirectory;
+    /** @var WriteInterface|PHPUnit_Framework_MockObject_MockObject */
+    private $mediaDirectory;
 
-    /** @var UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $urlBuilder;
+    /** @var UrlInterface|PHPUnit_Framework_MockObject_MockObject */
+    private $urlBuilder;
 
     /** @var File */
-    protected $fileBackend;
+    private $fileBackend;
 
-    /** @var IoFileSystem */
+    /** @var IoFileSystem|PHPUnit_Framework_MockObject_MockObject */
     private $ioFileSystem;
 
     /**
-     * @var \Magento\Framework\File\Mime|\PHPUnit_Framework_MockObject_MockObject
+     * @var Mime|PHPUnit_Framework_MockObject_MockObject
      */
     private $mime;
 
     /**
-     * @var \Magento\MediaStorage\Helper\File\Storage\Database|\PHPUnit_Framework_MockObject_MockObject
+     * @var Database|PHPUnit_Framework_MockObject_MockObject
      */
     private $databaseHelper;
 
+    /**
+     * @inheritdoc
+     */
     public function setUp()
     {
         $context = $this->getMockObject(\Magento\Framework\Model\Context::class);
@@ -59,7 +69,7 @@ public function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $this->mediaDirectory = $this->getMockBuilder(
-            \Magento\Framework\Filesystem\Directory\WriteInterface::class
+            WriteInterface::class
         )
             ->getMockForAbstractClass();
         $filesystem->expects($this->once())
@@ -68,11 +78,13 @@ public function setUp()
             ->willReturn($this->mediaDirectory);
         $this->urlBuilder = $this->getMockBuilder(\Magento\Framework\UrlInterface::class)
             ->getMockForAbstractClass();
-        $this->mime = $this->getMockBuilder(\Magento\Framework\File\Mime::class)
+        $this->ioFileSystem = $this->getMockBuilder(\Magento\Framework\Filesystem\Io\File::class)
+            ->getMockForAbstractClass();
+        $this->mime = $this->getMockBuilder(Mime::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->databaseHelper = $this->getMockBuilder(
-            \Magento\MediaStorage\Helper\File\Storage\Database::class
+            Database::class
         )
             ->disableOriginalConstructor()
             ->getMock();
@@ -83,7 +95,6 @@ public function setUp()
         $abstractDb = $this->getMockBuilder(\Magento\Framework\Data\Collection\AbstractDb::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
-        $this->ioFileSystem = new IoFileSystem();
         $this->fileBackend = new File(
             $context,
             $registry,
@@ -107,17 +118,22 @@ public function setUp()
         );
     }
 
+    /**
+     * @inheritdoc
+     */
     public function tearDown()
     {
         unset($this->fileBackend);
     }
 
     /**
+     * Gets the mock object.
+     *
      * @param string $class
      * @param array $methods
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * @return PHPUnit_Framework_MockObject_MockObject
      */
-    protected function getMockObject($class, $methods = [])
+    private function getMockObject(string $class, array $methods = []): PHPUnit_Framework_MockObject_MockObject
     {
         $builder =  $this->getMockBuilder($class)
             ->disableOriginalConstructor();
@@ -128,15 +144,20 @@ protected function getMockObject($class, $methods = [])
     }
 
     /**
+     * Gets mock objects for abstract class.
+     *
      * @param string $class
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * @return PHPUnit_Framework_MockObject_MockObject
      */
-    protected function getMockObjectForAbstractClass($class)
+    private function getMockObjectForAbstractClass(string $class): PHPUnit_Framework_MockObject_MockObject
     {
         return  $this->getMockBuilder($class)
             ->getMockForAbstractClass();
     }
 
+    /**
+     * Test for afterLoad method.
+     */
     public function testAfterLoad()
     {
         $value = 'filename.jpg';
@@ -201,11 +222,13 @@ public function testAfterLoad()
     }
 
     /**
+     * Test for beforeSave method.
+     *
      * @dataProvider beforeSaveDataProvider
      * @param string $fileName
      * @throws LocalizedException
      */
-    public function testBeforeSave($fileName)
+    public function testBeforeSave(string $fileName)
     {
         $expectedFileName = basename($fileName);
         $expectedTmpMediaPath = 'tmp/design/file/' . $expectedFileName;
@@ -247,17 +270,21 @@ public function testBeforeSave($fileName)
     }
 
     /**
+     * Data provider for testBeforeSave.
+     *
      * @return array
      */
-    public function beforeSaveDataProvider()
+    public function beforeSaveDataProvider(): array
     {
         return [
             'Normal file name' => ['filename.jpg'],
-            'Vulnerable file name' => ['../../../../../../../../etc/passwd'],
+            'Vulnerable file name' => ['../../../../../../../../etc/pass'],
         ];
     }
 
     /**
+     * Test for beforeSave method without file.
+     *
      * @expectedException \Magento\Framework\Exception\LocalizedException
      * @expectedExceptionMessage header_logo_src does not contain field 'file'
      */
@@ -276,6 +303,11 @@ public function testBeforeSaveWithoutFile()
         $this->fileBackend->beforeSave();
     }
 
+    /**
+     * Test for beforeSave method with existing file.
+     *
+     * @throws LocalizedException
+     */
     public function testBeforeSaveWithExistingFile()
     {
         $value = 'filename.jpg';
@@ -327,7 +359,7 @@ public function getRelativeMediaPathDataProvider(): array
     {
         return [
             'Normal path' => ['pub/media/', 'filename.jpg'],
-            'Complex path' => ['somepath/pub/media/', 'filename.jpg'],
+            'Complex path' => ['some_path/pub/media/', 'filename.jpg'],
         ];
     }
 }
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php
index c79fdbf9168ce..4f5b47db93dd7 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php
@@ -3,10 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Theme\Test\Unit\Model\Design\Backend;
 
-use Magento\Framework\Filesystem\Io\File as IoFileSystem;
 use Magento\Theme\Model\Design\Backend\Image;
+use PHPUnit_Framework_MockObject_MockObject;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -14,8 +17,11 @@
 class ImageTest extends \PHPUnit\Framework\TestCase
 {
     /** @var Image */
-    protected $imageBackend;
+    private $imageBackend;
 
+    /**
+     * @inheritdoc
+     */
     public function setUp()
     {
         $context = $this->getMockObject(\Magento\Framework\Model\Context::class);
@@ -31,7 +37,7 @@ public function setUp()
         $databaseHelper = $this->getMockObject(\Magento\MediaStorage\Helper\File\Storage\Database::class);
         $abstractResource = $this->getMockObject(\Magento\Framework\Model\ResourceModel\AbstractResource::class);
         $abstractDb = $this->getMockObject(\Magento\Framework\Data\Collection\AbstractDb::class);
-        $ioFileSystem = new IoFileSystem();
+        $ioFileSystem = $this->getMockObject(\Magento\Framework\Filesystem\Io\File::class);
         $this->imageBackend = new Image(
             $context,
             $registry,
@@ -49,6 +55,9 @@ public function setUp()
         );
     }
 
+    /**
+     * @inheritdoc
+     */
     public function tearDown()
     {
         unset($this->imageBackend);
@@ -57,9 +66,9 @@ public function tearDown()
     /**
      * @param string $class
      * @param array $methods
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * @return PHPUnit_Framework_MockObject_MockObject
      */
-    protected function getMockObject($class, $methods = [])
+    private function getMockObject(string $class, array $methods = []): PHPUnit_Framework_MockObject_MockObject
     {
         $builder =  $this->getMockBuilder($class)
             ->disableOriginalConstructor();
@@ -70,6 +79,8 @@ protected function getMockObject($class, $methods = [])
     }
 
     /**
+     * Test for beforeSave method with invalid file extension.
+     *
      * @expectedException \Magento\Framework\Exception\LocalizedException
      * @expectedExceptionMessage Something is wrong with the file upload settings.
      */
diff --git a/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/FileTest.php b/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/FileTest.php
index e5926a815172e..83cb9ea80e1ab 100644
--- a/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/FileTest.php
+++ b/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/FileTest.php
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Framework\Filesystem\Test\Unit\Driver;
 
 use Magento\Framework\Filesystem\Driver\File;
@@ -16,6 +18,9 @@ class FileTest extends \PHPUnit\Framework\TestCase
     /** @var bool Result of file_put_contents() function */
     public static $filePutContents;
 
+    /**
+     * @inheritdoc
+     */
     public function setUp()
     {
         self::$fileGetContents = '';
@@ -23,21 +28,25 @@ public function setUp()
     }
 
     /**
+     * Test for getAbsolutePath method.
+     *
      * @dataProvider dataProviderForTestGetAbsolutePath
-     * @param $basePath
-     * @param $path
-     * @param $expected
+     * @param string $basePath
+     * @param string $path
+     * @param string $expected
      */
-    public function testGetAbsolutePath($basePath, $path, $expected)
+    public function testGetAbsolutePath(string $basePath, string $path, string $expected)
     {
         $file = new File();
         $this->assertEquals($expected, $file->getAbsolutePath($basePath, $path));
     }
 
     /**
+     * Data provider for testGetAbsolutePath.
+     *
      * @return array
      */
-    public function dataProviderForTestGetAbsolutePath()
+    public function dataProviderForTestGetAbsolutePath(): array
     {
         return [
             ['/root/path/', 'sub', '/root/path/sub'],
@@ -48,21 +57,25 @@ public function dataProviderForTestGetAbsolutePath()
     }
 
     /**
+     * Test for getRelativePath method.
+     *
      * @dataProvider dataProviderForTestGetRelativePath
-     * @param $basePath
-     * @param $path
-     * @param $expected
+     * @param string $basePath
+     * @param string $path
+     * @param string $expected
      */
-    public function testGetRelativePath($basePath, $path, $expected)
+    public function testGetRelativePath(string $basePath, string $path, string $expected)
     {
         $file = new File();
         $this->assertEquals($expected, $file->getRelativePath($basePath, $path));
     }
 
     /**
+     * Data provider for testGetRelativePath.
+     *
      * @return array
      */
-    public function dataProviderForTestGetRelativePath()
+    public function dataProviderForTestGetRelativePath(): array
     {
         return [
             ['/root/path/', 'sub', 'sub'],
@@ -73,20 +86,24 @@ public function dataProviderForTestGetRelativePath()
     }
 
     /**
-     * @dataProvider dataProviderForTestRealPathSafety
-     * @param $path
-     * @param $expected
+     * Test for getRealPathSafety method.
+     *
+     * @dataProvider dataProviderForTestGetRealPathSafety
+     * @param string $path
+     * @param string $expected
      */
-    public function testGetRealPathSafety($path, $expected)
+    public function testGetRealPathSafety(string $path, string $expected)
     {
         $file = new File();
         $this->assertEquals($expected, $file->getRealPathSafety($path));
     }
 
     /**
+     * Data provider for testGetRealPathSafety;
+     *
      * @return array
      */
-    public function dataProviderForTestRealPathSafety()
+    public function dataProviderForTestGetRealPathSafety(): array
     {
         return [
             ['/1/2/3', '/1/2/3'],

From d53c7cabcd4fccb871b350a3c74c388db1ed8c89 Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Tue, 25 Feb 2020 17:39:55 -0600
Subject: [PATCH 0056/1718] MC-31362: Media folder update

- Fixed missed unit test mock data
---
 .../Unit/Model/Design/Backend/ImageTest.php   | 54 +++++++++++++------
 1 file changed, 38 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php
index 4f5b47db93dd7..2bc60ffa7aa04 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php
@@ -8,6 +8,18 @@
 
 namespace Magento\Theme\Test\Unit\Model\Design\Backend;
 
+use Magento\Config\Model\Config\Backend\File\RequestData\RequestDataInterface;
+use Magento\Framework\App\Cache\TypeListInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Io\File;
+use Magento\Framework\Model\Context;
+use Magento\Framework\Model\ResourceModel\AbstractResource;
+use Magento\Framework\Registry;
+use Magento\Framework\UrlInterface;
+use Magento\MediaStorage\Helper\File\Storage\Database;
+use Magento\MediaStorage\Model\File\UploaderFactory;
 use Magento\Theme\Model\Design\Backend\Image;
 use PHPUnit_Framework_MockObject_MockObject;
 
@@ -19,25 +31,26 @@ class ImageTest extends \PHPUnit\Framework\TestCase
     /** @var Image */
     private $imageBackend;
 
+    /** @var File */
+    private $ioFileSystem;
+
     /**
      * @inheritdoc
      */
     public function setUp()
     {
-        $context = $this->getMockObject(\Magento\Framework\Model\Context::class);
-        $registry = $this->getMockObject(\Magento\Framework\Registry::class);
-        $config = $this->getMockObject(\Magento\Framework\App\Config\ScopeConfigInterface::class);
-        $cacheTypeList = $this->getMockObject(\Magento\Framework\App\Cache\TypeListInterface::class);
-        $uploaderFactory = $this->getMockObject(\Magento\MediaStorage\Model\File\UploaderFactory::class);
-        $requestData = $this->getMockObject(
-            \Magento\Config\Model\Config\Backend\File\RequestData\RequestDataInterface::class
-        );
-        $filesystem = $this->getMockObject(\Magento\Framework\Filesystem::class);
-        $urlBuilder = $this->getMockObject(\Magento\Framework\UrlInterface::class);
-        $databaseHelper = $this->getMockObject(\Magento\MediaStorage\Helper\File\Storage\Database::class);
-        $abstractResource = $this->getMockObject(\Magento\Framework\Model\ResourceModel\AbstractResource::class);
-        $abstractDb = $this->getMockObject(\Magento\Framework\Data\Collection\AbstractDb::class);
-        $ioFileSystem = $this->getMockObject(\Magento\Framework\Filesystem\Io\File::class);
+        $context = $this->getMockObject(Context::class);
+        $registry = $this->getMockObject(Registry::class);
+        $config = $this->getMockObject(ScopeConfigInterface::class);
+        $cacheTypeList = $this->getMockObject(TypeListInterface::class);
+        $uploaderFactory = $this->getMockObject(UploaderFactory::class);
+        $requestData = $this->getMockObject(RequestDataInterface::class);
+        $filesystem = $this->getMockObject(Filesystem::class);
+        $urlBuilder = $this->getMockObject(UrlInterface::class);
+        $databaseHelper = $this->getMockObject(Database::class);
+        $abstractResource = $this->getMockObject(AbstractResource::class);
+        $abstractDb = $this->getMockObject(AbstractDb::class);
+        $this->ioFileSystem = $this->getMockObject(File::class);
         $this->imageBackend = new Image(
             $context,
             $registry,
@@ -51,7 +64,7 @@ public function setUp()
             $abstractDb,
             [],
             $databaseHelper,
-            $ioFileSystem
+            $this->ioFileSystem
         );
     }
 
@@ -86,15 +99,24 @@ private function getMockObject(string $class, array $methods = []): PHPUnit_Fram
      */
     public function testBeforeSaveWithInvalidExtensionFile()
     {
+        $invalidFileName = 'fileName.invalidExtension';
         $this->imageBackend->setData(
             [
                 'value' => [
                     [
-                        'file' => 'fileName.invalidExtension',
+                        'file' => $invalidFileName,
                     ]
                 ],
             ]
         );
+        $expectedPathInfo = [
+            'extension' => 'invalidExtension'
+        ];
+        $this->ioFileSystem
+            ->expects($this->any())
+            ->method('getPathInfo')
+            ->with($invalidFileName)
+            ->willReturn($expectedPathInfo);
         $this->imageBackend->beforeSave();
     }
 }

From 412c747844c48c5fef50fcb517126c90bfc43282 Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Wed, 26 Feb 2020 11:09:27 -0600
Subject: [PATCH 0057/1718] MC-31357: Customer file uploader update

- Updated customer metadata form image logic
- Updated corresponding unit and integration tests
---
 .../Customer/Model/Metadata/Form/Image.php    | 115 +++++++---
 .../Unit/Model/Metadata/Form/ImageTest.php    | 172 +++++++++++---
 .../Model/Metadata/Form/ImageTest.php         | 214 ++++++++++++++++++
 .../Magento/Customer/_files/image/magento.jpg | Bin 0 -> 1393 bytes
 4 files changed, 448 insertions(+), 53 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Customer/Model/Metadata/Form/ImageTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Customer/_files/image/magento.jpg

diff --git a/app/code/Magento/Customer/Model/Metadata/Form/Image.php b/app/code/Magento/Customer/Model/Metadata/Form/Image.php
index 33bdf827f80fa..d023db1454906 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/Image.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/Image.php
@@ -3,17 +3,33 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Customer\Model\Metadata\Form;
 
 use Magento\Customer\Api\AddressMetadataInterface;
 use Magento\Customer\Api\CustomerMetadataInterface;
+use Magento\Customer\Api\Data\AttributeMetadataInterface;
 use Magento\Customer\Model\FileProcessor;
+use Magento\Customer\Model\FileProcessorFactory;
 use Magento\Framework\Api\ArrayObjectSearch;
 use Magento\Framework\Api\Data\ImageContentInterface;
 use Magento\Framework\Api\Data\ImageContentInterfaceFactory;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\File\UploaderFactory;
 use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\Filesystem\Io\File as IoFileSystem;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem\Directory\WriteFactory;
+use Magento\Framework\Locale\ResolverInterface;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Framework\Url\EncoderInterface;
+use Magento\MediaStorage\Model\File\Validator\NotProtectedExtension;
+use Psr\Log\LoggerInterface;
 
 /**
  * Metadata for form image field
@@ -27,38 +43,55 @@ class Image extends File
      */
     private $imageContentFactory;
 
+    /**
+     * @var IoFileSystem
+     */
+    private $ioFileSystem;
+
+    /**
+     * @var WriteInterface
+     */
+    private $mediaEntityTmpDirectory;
+
     /**
      * Constructor
      *
-     * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
-     * @param \Psr\Log\LoggerInterface $logger
-     * @param \Magento\Customer\Api\Data\AttributeMetadataInterface $attribute
-     * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
+     * @param TimezoneInterface $localeDate
+     * @param LoggerInterface $logger
+     * @param AttributeMetadataInterface $attribute
+     * @param ResolverInterface $localeResolver
      * @param null|string $value
      * @param string $entityTypeCode
      * @param bool $isAjax
-     * @param \Magento\Framework\Url\EncoderInterface $urlEncoder
-     * @param \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension $fileValidator
+     * @param EncoderInterface $urlEncoder
+     * @param NotProtectedExtension $fileValidator
      * @param Filesystem $fileSystem
      * @param UploaderFactory $uploaderFactory
-     * @param \Magento\Customer\Model\FileProcessorFactory|null $fileProcessorFactory
-     * @param \Magento\Framework\Api\Data\ImageContentInterfaceFactory|null $imageContentInterfaceFactory
+     * @param FileProcessorFactory|null $fileProcessorFactory
+     * @param ImageContentInterfaceFactory|null $imageContentInterfaceFactory
+     * @param IoFileSystem|null $ioFileSystem
+     * @param DirectoryList|null $directoryList
+     * @param WriteFactory|null $writeFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @throws FileSystemException
      */
     public function __construct(
-        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
-        \Psr\Log\LoggerInterface $logger,
-        \Magento\Customer\Api\Data\AttributeMetadataInterface $attribute,
-        \Magento\Framework\Locale\ResolverInterface $localeResolver,
+        TimezoneInterface $localeDate,
+        LoggerInterface $logger,
+        AttributeMetadataInterface $attribute,
+        ResolverInterface $localeResolver,
         $value,
         $entityTypeCode,
         $isAjax,
-        \Magento\Framework\Url\EncoderInterface $urlEncoder,
-        \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension $fileValidator,
+        EncoderInterface $urlEncoder,
+        NotProtectedExtension $fileValidator,
         Filesystem $fileSystem,
         UploaderFactory $uploaderFactory,
-        \Magento\Customer\Model\FileProcessorFactory $fileProcessorFactory = null,
-        \Magento\Framework\Api\Data\ImageContentInterfaceFactory $imageContentInterfaceFactory = null
+        FileProcessorFactory $fileProcessorFactory = null,
+        ImageContentInterfaceFactory $imageContentInterfaceFactory = null,
+        IoFileSystem $ioFileSystem = null,
+        ?DirectoryList $directoryList = null,
+        ?WriteFactory $writeFactory = null
     ) {
         parent::__construct(
             $localeDate,
@@ -75,7 +108,16 @@ public function __construct(
             $fileProcessorFactory
         );
         $this->imageContentFactory = $imageContentInterfaceFactory ?: ObjectManager::getInstance()
-            ->get(\Magento\Framework\Api\Data\ImageContentInterfaceFactory::class);
+            ->get(ImageContentInterfaceFactory::class);
+        $this->ioFileSystem = $ioFileSystem ?: ObjectManager::getInstance()
+            ->get(IoFileSystem::class);
+        $writeFactory = $writeFactory ?? ObjectManager::getInstance()->get(WriteFactory::class);
+        $directoryList = $directoryList ?? ObjectManager::getInstance()->get(DirectoryList::class);
+        $this->mediaEntityTmpDirectory = $writeFactory->create(
+            $directoryList->getPath($directoryList::MEDIA)
+            . '/' . $this->_entityTypeCode
+            . '/' . FileProcessor::TMP_DIR
+        );
     }
 
     /**
@@ -85,6 +127,7 @@ public function __construct(
      *
      * @param array $value
      * @return string[]
+     * @throws LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -93,7 +136,11 @@ protected function _validateByRules($value)
         $label = $value['name'];
         $rules = $this->getAttribute()->getValidationRules();
 
-        $imageProp = @getimagesize($value['tmp_name']);
+        try {
+            $imageProp = getimagesize($value['tmp_name']);
+        } catch (\Throwable $e) {
+            $imageProp = false;
+        }
 
         if (!$this->_isUploadedFile($value['tmp_name']) || !$imageProp) {
             return [__('"%1" is not a valid file.', $label)];
@@ -106,9 +153,11 @@ protected function _validateByRules($value)
         }
 
         // modify image name
-        $extension = pathinfo($value['name'], PATHINFO_EXTENSION);
+        $extension = $this->ioFileSystem->getPathInfo($value['name'])['extension'];
         if ($extension != $allowImageTypes[$imageProp[2]]) {
-            $value['name'] = pathinfo($value['name'], PATHINFO_FILENAME) . '.' . $allowImageTypes[$imageProp[2]];
+            $value['name'] = $this->ioFileSystem->getPathInfo($value['name'])['filename']
+                . '.'
+                . $allowImageTypes[$imageProp[2]];
         }
 
         $maxFileSize = ArrayObjectSearch::getArrayElementByName(
@@ -153,6 +202,7 @@ protected function _validateByRules($value)
      *
      * @param array $value
      * @return bool|int|ImageContentInterface|string
+     * @throws LocalizedException
      */
     protected function processUiComponentValue(array $value)
     {
@@ -174,11 +224,23 @@ protected function processUiComponentValue(array $value)
      *
      * @param array $value
      * @return string
+     * @throws LocalizedException
      */
     protected function processCustomerAddressValue(array $value)
     {
-        $result = $this->getFileProcessor()->moveTemporaryFile($value['file']);
-        return $result;
+        $fileName = $this->mediaEntityTmpDirectory
+            ->getDriver()
+            ->getRealPathSafety(
+                $this->mediaEntityTmpDirectory->getAbsolutePath(
+                    ltrim(
+                        $value['file'],
+                        '/'
+                    )
+                )
+            );
+        return $this->getFileProcessor()->moveTemporaryFile(
+            $this->mediaEntityTmpDirectory->getRelativePath($fileName)
+        );
     }
 
     /**
@@ -186,20 +248,19 @@ protected function processCustomerAddressValue(array $value)
      *
      * @param array $value
      * @return bool|int|ImageContentInterface|string
+     * @throws LocalizedException
      */
     protected function processCustomerValue(array $value)
     {
-        $temporaryFile = FileProcessor::TMP_DIR . '/' . ltrim($value['file'], '/');
-
-        if ($this->getFileProcessor()->isExist($temporaryFile)) {
+        $file = ltrim($value['file'], '/');
+        if ($this->mediaEntityTmpDirectory->isExist($file)) {
+            $temporaryFile = FileProcessor::TMP_DIR . '/' . $file;
             $base64EncodedData = $this->getFileProcessor()->getBase64EncodedData($temporaryFile);
-
             /** @var ImageContentInterface $imageContentDataObject */
             $imageContentDataObject = $this->imageContentFactory->create()
                 ->setName($value['name'])
                 ->setBase64EncodedData($base64EncodedData)
                 ->setType($value['type']);
-
             // Remove temporary file
             $this->getFileProcessor()->removeUploadedFile($temporaryFile);
 
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php
index 31d2a31ceae4c..e64c9d87b8b82 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php
@@ -3,101 +3,173 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Customer\Test\Unit\Model\Metadata\Form;
 
 use Magento\Customer\Api\AddressMetadataInterface;
 use Magento\Customer\Api\CustomerMetadataInterface;
 use Magento\Customer\Model\FileProcessor;
-use Magento\MediaStorage\Model\File\Validator\NotProtectedExtension;
+use Magento\Customer\Model\FileProcessorFactory;
+use Magento\Customer\Model\Metadata\Form\Image;
 use Magento\Framework\Api\Data\ImageContentInterfaceFactory;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\Request\Http;
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\File\UploaderFactory;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\WriteFactory;
+use Magento\Framework\Filesystem\Directory\Write;
+use Magento\Framework\Filesystem\Driver\File as Driver;
+use Magento\Framework\Filesystem\Io\File;
+use Magento\Framework\Url\EncoderInterface;
+use Magento\MediaStorage\Model\File\Validator\NotProtectedExtension;
+use PHPUnit_Framework_MockObject_MockObject;
 
 /**
+ * Tests Metadata/Form/Image class
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ImageTest extends AbstractFormTestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Url\EncoderInterface
+     * @var PHPUnit_Framework_MockObject_MockObject|EncoderInterface
      */
     private $urlEncode;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\MediaStorage\Model\File\Validator\NotProtectedExtension
+     * @var PHPUnit_Framework_MockObject_MockObject|NotProtectedExtension
      */
     private $fileValidatorMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Filesystem
+     * @var PHPUnit_Framework_MockObject_MockObject|Filesystem
      */
     private $fileSystemMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\Request\Http
+     * @var PHPUnit_Framework_MockObject_MockObject|Http
      */
     private $requestMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\File\UploaderFactory
+     * @var PHPUnit_Framework_MockObject_MockObject|UploaderFactory
      */
     private $uploaderFactoryMock;
 
     /**
-     * @var FileProcessor|\PHPUnit_Framework_MockObject_MockObject
+     * @var FileProcessor|PHPUnit_Framework_MockObject_MockObject
      */
     private $fileProcessorMock;
 
     /**
-     * @var \Magento\Framework\Api\Data\ImageContentInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var ImageContentInterfaceFactory|PHPUnit_Framework_MockObject_MockObject
      */
     private $imageContentFactory;
 
     /**
-     * @var \Magento\Customer\Model\FileProcessorFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var FileProcessorFactory|PHPUnit_Framework_MockObject_MockObject
      */
     private $fileProcessorFactoryMock;
 
+    /**
+     * @var File|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $ioFileSystemMock;
+
+    /**
+     * @var DirectoryList|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $directoryListMock;
+
+    /**
+     * @var WriteFactory|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $writeFactoryMock;
+
+    /**
+     * @var Write|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $mediaEntityTmpDirectoryMock;
+
+    /**
+     * @var Driver|PHPUnit_Framework_MockObject_MockObject
+     */
+    private $driverMock;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         parent::setUp();
 
-        $this->urlEncode = $this->getMockBuilder(\Magento\Framework\Url\EncoderInterface::class)
+        $this->urlEncode = $this->getMockBuilder(EncoderInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->fileValidatorMock = $this->getMockBuilder(NotProtectedExtension::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->fileSystemMock = $this->getMockBuilder(\Magento\Framework\Filesystem::class)
+        $this->fileSystemMock = $this->getMockBuilder(Filesystem::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
+        $this->requestMock = $this->getMockBuilder(Http::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->uploaderFactoryMock = $this->getMockBuilder(\Magento\Framework\File\UploaderFactory::class)
+        $this->uploaderFactoryMock = $this->getMockBuilder(UploaderFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->fileProcessorMock = $this->getMockBuilder(\Magento\Customer\Model\FileProcessor::class)
+        $this->fileProcessorMock = $this->getMockBuilder(FileProcessor::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->imageContentFactory = $this->getMockBuilder(ImageContentInterfaceFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-        $this->fileProcessorFactoryMock = $this->getMockBuilder(\Magento\Customer\Model\FileProcessorFactory::class)
+        $this->fileProcessorFactoryMock = $this->getMockBuilder(FileProcessorFactory::class)
             ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->fileProcessorFactoryMock->expects($this->any())
             ->method('create')
             ->willReturn($this->fileProcessorMock);
+        $this->ioFileSystemMock = $this->getMockBuilder(File::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->directoryListMock = $this->getMockBuilder(DirectoryList::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->writeFactoryMock = $this->getMockBuilder(WriteFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->mediaEntityTmpDirectoryMock = $this->getMockBuilder(Write::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->driverMock = $this->getMockBuilder(Driver::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->writeFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->mediaEntityTmpDirectoryMock);
+        $this->mediaEntityTmpDirectoryMock->expects($this->any())
+            ->method('getDriver')
+            ->willReturn($this->driverMock);
     }
 
     /**
+     * Initializes an image instance
+     *
      * @param array $data
-     * @return \Magento\Customer\Model\Metadata\Form\File
+     * @return Image
+     * @throws FileSystemException
      */
-    private function initialize(array $data)
+    private function initialize(array $data): Image
     {
-        return new \Magento\Customer\Model\Metadata\Form\Image(
+        return new Image(
             $this->localeMock,
             $this->loggerMock,
             $this->attributeMetadataMock,
@@ -110,10 +182,17 @@ private function initialize(array $data)
             $this->fileSystemMock,
             $this->uploaderFactoryMock,
             $this->fileProcessorFactoryMock,
-            $this->imageContentFactory
+            $this->imageContentFactory,
+            $this->ioFileSystemMock,
+            $this->directoryListMock,
+            $this->writeFactoryMock
         );
     }
 
+    /**
+     * Test for validateValue method for not valid file
+     * @throws LocalizedException
+     */
     public function testValidateIsNotValidFile()
     {
         $value = [
@@ -139,6 +218,10 @@ public function testValidateIsNotValidFile()
         $this->assertEquals(['"realFileName" is not a valid file.'], $model->validateValue($value));
     }
 
+    /**
+     * Test for validateValue method
+     * @throws LocalizedException
+     */
     public function testValidate()
     {
         $value = [
@@ -164,6 +247,10 @@ public function testValidate()
         $this->assertTrue($model->validateValue($value));
     }
 
+    /**
+     * Test for validateValue method for max file size
+     * @throws LocalizedException
+     */
     public function testValidateMaxFileSize()
     {
         $value = [
@@ -205,6 +292,10 @@ public function testValidateMaxFileSize()
         $this->assertEquals(['"logo.gif" exceeds the allowed file size.'], $model->validateValue($value));
     }
 
+    /**
+     * Test for validateValue method for max image width
+     * @throws LocalizedException
+     */
     public function testValidateMaxImageWidth()
     {
         $value = [
@@ -245,6 +336,10 @@ public function testValidateMaxImageWidth()
         $this->assertEquals(['"logo.gif" width exceeds allowed value of 1 px.'], $model->validateValue($value));
     }
 
+    /**
+     * Test for validateValue method for max image height
+     * @throws LocalizedException
+     */
     public function testValidateMaxImageHeight()
     {
         $value = [
@@ -285,6 +380,10 @@ public function testValidateMaxImageHeight()
         $this->assertEquals(['"logo.gif" height exceeds allowed value of 1 px.'], $model->validateValue($value));
     }
 
+    /**
+     * Test for compactValue method
+     * @throws LocalizedException
+     */
     public function testCompactValueNoChanges()
     {
         $originValue = 'filename.ext1';
@@ -302,6 +401,10 @@ public function testCompactValueNoChanges()
         $this->assertEquals($originValue, $model->compactValue($value));
     }
 
+    /**
+     * Test for compactValue method for address image
+     * @throws LocalizedException
+     */
     public function testCompactValueUiComponentAddress()
     {
         $originValue = 'filename.ext1';
@@ -310,20 +413,33 @@ public function testCompactValueUiComponentAddress()
             'file' => 'filename.ext2',
         ];
 
+        $this->driverMock->expects($this->once())
+            ->method('getRealPathSafety')
+            ->with($value['file'])
+            ->willReturn($value['file']);
+        $this->mediaEntityTmpDirectoryMock->expects($this->once())
+            ->method('getAbsolutePath')
+            ->willReturn($value['file']);
+        $this->mediaEntityTmpDirectoryMock->expects($this->once())
+            ->method('getRelativePath')
+            ->willReturn($value['file']);
         $this->fileProcessorMock->expects($this->once())
             ->method('moveTemporaryFile')
             ->with($value['file'])
-            ->willReturn(true);
-
+            ->willReturn($value['file']);
         $model = $this->initialize([
             'value' => $originValue,
             'isAjax' => false,
             'entityTypeCode' => AddressMetadataInterface::ENTITY_TYPE_ADDRESS,
         ]);
 
-        $this->assertTrue($model->compactValue($value));
+        $this->assertEquals($value['file'], $model->compactValue($value));
     }
 
+    /**
+     * Test for compactValue method for image
+     * @throws LocalizedException
+     */
     public function testCompactValueUiComponentCustomer()
     {
         $originValue = 'filename.ext1';
@@ -336,9 +452,9 @@ public function testCompactValueUiComponentCustomer()
 
         $base64EncodedData = 'encoded_data';
 
-        $this->fileProcessorMock->expects($this->once())
+        $this->mediaEntityTmpDirectoryMock->expects($this->once())
             ->method('isExist')
-            ->with(FileProcessor::TMP_DIR . '/' . $value['file'])
+            ->with($value['file'])
             ->willReturn(true);
         $this->fileProcessorMock->expects($this->once())
             ->method('getBase64EncodedData')
@@ -378,6 +494,10 @@ public function testCompactValueUiComponentCustomer()
         $this->assertEquals($imageContentMock, $model->compactValue($value));
     }
 
+    /**
+     * Test for compactValue method for non-existing customer
+     * @throws LocalizedException
+     */
     public function testCompactValueUiComponentCustomerNotExists()
     {
         $originValue = 'filename.ext1';
@@ -388,9 +508,9 @@ public function testCompactValueUiComponentCustomerNotExists()
             'type' => 'image',
         ];
 
-        $this->fileProcessorMock->expects($this->once())
+        $this->mediaEntityTmpDirectoryMock->expects($this->once())
             ->method('isExist')
-            ->with(FileProcessor::TMP_DIR . '/' . $value['file'])
+            ->with($value['file'])
             ->willReturn(false);
 
         $model = $this->initialize([
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/Metadata/Form/ImageTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/Metadata/Form/ImageTest.php
new file mode 100644
index 0000000000000..578525a0d8161
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/Metadata/Form/ImageTest.php
@@ -0,0 +1,214 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Customer\Model\Metadata\Form;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+class ImageTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var string
+     */
+    private $fileName = 'magento.jpg';
+
+    /**
+     * @var string
+     */
+    private $invalidFileName = '../../invalidFile.xyz';
+
+    /**
+     * @var string
+     */
+    private $imageFixtureDir;
+
+    /**
+     * @var string
+     */
+    private $expectedFileName;
+
+    /**
+     * @var WriteInterface
+     */
+    private $mediaDirectory;
+
+    /**
+     * @inheritDoc
+     */
+    public function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(Filesystem::class);
+        $this->mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        $this->imageFixtureDir = realpath(__DIR__ . '/../../../_files/image');
+        $this->expectedFileName = '/m/a/' . $this->fileName;
+    }
+
+    /**
+     * Test for processCustomerAddressValue method
+     *
+     * @magentoAppIsolation enabled
+     * @throws FileSystemException
+     * @throws \ReflectionException
+     */
+    public function testProcessCustomerAddressValue()
+    {
+        $this->mediaDirectory->delete('customer_address');
+        $this->mediaDirectory->create($this->mediaDirectory->getRelativePath('customer_address/tmp/'));
+        $tmpFilePath = $this->mediaDirectory->getAbsolutePath('customer_address/tmp/' . $this->fileName);
+        copy($this->imageFixtureDir . DIRECTORY_SEPARATOR . $this->fileName, $tmpFilePath);
+
+        $imageFile = [
+            'name' => $this->fileName,
+            'type' => 'image/jpeg',
+            'tmp_name' => $this->fileName,
+            'file' => $this->fileName,
+            'error' => 0,
+            'size' => 12500,
+            'previewType' => 'image',
+        ];
+
+        $params = [
+            'entityTypeCode' => 'customer_address',
+            'formCode' => 'customer_address_edit',
+            'isAjax' => false,
+            'value' => $imageFile
+        ];
+
+        $expectedPath = $this->mediaDirectory->getAbsolutePath('customer_address' . $this->expectedFileName);
+
+        /** @var Image $image */
+        $image = $this->objectManager->create(\Magento\Customer\Model\Metadata\Form\Image::class, $params);
+        $processCustomerAddressValueMethod = new \ReflectionMethod(
+            \Magento\Customer\Model\Metadata\Form\Image::class,
+            'processCustomerAddressValue'
+        );
+        $processCustomerAddressValueMethod->setAccessible(true);
+        $actual = $processCustomerAddressValueMethod->invoke($image, $imageFile);
+        $this->assertEquals($this->expectedFileName, $actual);
+        $this->assertFileExists($expectedPath);
+        $this->assertFileNotExists($tmpFilePath);
+    }
+
+    /**
+     * Test for processCustomerValue method
+     *
+     * @magentoAppIsolation enabled
+     * @throws FileSystemException
+     * @throws \ReflectionException
+     */
+    public function testProcessCustomerValue()
+    {
+        $this->mediaDirectory->delete('customer');
+        $this->mediaDirectory->create($this->mediaDirectory->getRelativePath('customer/tmp/'));
+        $tmpFilePath = $this->mediaDirectory->getAbsolutePath('customer/tmp/' . $this->fileName);
+        copy($this->imageFixtureDir . DIRECTORY_SEPARATOR . $this->fileName, $tmpFilePath);
+
+        $imageFile = [
+            'name' => $this->fileName,
+            'type' => 'image/jpeg',
+            'tmp_name' => $this->fileName,
+            'file' => $this->fileName,
+            'error' => 0,
+            'size' => 12500,
+            'previewType' => 'image',
+        ];
+
+        $params = [
+            'entityTypeCode' => 'customer',
+            'formCode' => 'customer_edit',
+            'isAjax' => false,
+            'value' => $imageFile
+        ];
+
+        /** @var Image $image */
+        $image = $this->objectManager->create(\Magento\Customer\Model\Metadata\Form\Image::class, $params);
+        $processCustomerAddressValueMethod = new \ReflectionMethod(
+            \Magento\Customer\Model\Metadata\Form\Image::class,
+            'processCustomerValue'
+        );
+        $processCustomerAddressValueMethod->setAccessible(true);
+        $result = $processCustomerAddressValueMethod->invoke($image, $imageFile);
+        $this->assertInstanceOf('Magento\Framework\Api\ImageContent', $result);
+        $this->assertFileNotExists($tmpFilePath);
+    }
+
+    /**
+     * Test for processCustomerValue method with invalid value
+     *
+     * @magentoAppIsolation enabled
+     * @expectedException \Magento\Framework\Exception\ValidatorException
+     * @throws FileSystemException
+     * @throws \ReflectionException
+     */
+    public function testProcessCustomerInvalidValue()
+    {
+        $this->mediaDirectory->delete('customer');
+        $this->mediaDirectory->create($this->mediaDirectory->getRelativePath('customer/tmp/'));
+        $tmpFilePath = $this->mediaDirectory->getAbsolutePath('customer/tmp/' . $this->fileName);
+        copy($this->imageFixtureDir . DIRECTORY_SEPARATOR . $this->fileName, $tmpFilePath);
+
+        $imageFile = [
+            'name' => $this->fileName,
+            'type' => 'image/jpeg',
+            'tmp_name' => $this->fileName,
+            'file' => $this->invalidFileName,
+            'error' => 0,
+            'size' => 12500,
+            'previewType' => 'image',
+        ];
+
+        $params = [
+            'entityTypeCode' => 'customer',
+            'formCode' => 'customer_edit',
+            'isAjax' => false,
+            'value' => $imageFile
+        ];
+
+        /** @var Image $image */
+        $image = $this->objectManager->create(\Magento\Customer\Model\Metadata\Form\Image::class, $params);
+        $processCustomerAddressValueMethod = new \ReflectionMethod(
+            \Magento\Customer\Model\Metadata\Form\Image::class,
+            'processCustomerValue'
+        );
+        $processCustomerAddressValueMethod->setAccessible(true);
+        $processCustomerAddressValueMethod->invoke($image, $imageFile);
+    }
+
+    /**
+     * @inheritdoc
+     * @throws FileSystemException
+     */
+    public static function tearDownAfterClass()
+    {
+        parent::tearDownAfterClass();
+        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            Filesystem::class
+        );
+        /** @var WriteInterface $mediaDirectory */
+        $mediaDirectory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        $mediaDirectory->delete('customer');
+        $mediaDirectory->delete('customer_address');
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/image/magento.jpg b/dev/tests/integration/testsuite/Magento/Customer/_files/image/magento.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..5704eccd795dea8d001650abc3bc375d5b76d042
GIT binary patch
literal 1393
zcmb7EX;6~~5dD%b7ZHUoV8S6F2{v3o0c(`A90o*N<rG4hhzbZokqAU0!XQclCLCtK
zgTo>MVvLq>YKnlIqBK%aKmy7kjB$`d<i-?g$Nzo%XLsJtd%Hh&6@7|#fT|nq01be_
zV8F@s02BkjB>;s$qL2s_3W-9aQ5dW$7OSL$Ro|kbtV&SV&>*Pe@me}N^t7}|+wl19
zrrSwBkd2IuH1#OED2BUs7#bPE&}cLkgH^*~)eN=pT894{iUt6}01kjN2qOY;2nIqh
zMKd4(U;rH481*~Q7#I?TfP<<43;}~9Km<}5{FmJ5T;Bph<Mhqd90G~%QCSv_9>>KP
z^{pfWODE5y!rSE)jngn-UGKZvMuI?sC}=|sgd;)Ze-s>mfd~kxZ;n&j>fl~DoK@bX
z9+)&Tt#|_{gX>lh2m$uMJudeWk<yyieZ$r%<Z0{CoxloHQlvS<T4Q;dU3;m)r>Z^@
z#K%rnl;s3gM%{YcJt1eW;(Q*q_=m{qG(C%o53{1eRfIFMzYC*9o{+ZpIHx7j+J=Vz
zOdX<rBIMJz@%GAO#B_S@QgEcrp(=>i{<cQbHX*>v^ZwodW`=E^(uIyD<}v%aV{<Ev
zsjfhV7nqRhf2U4xboV}@?j-Az%A~Z5#(h%IMq4nSq@4Yw87fD{-%G<0iK<sBhhz0N
z<#f8nXjICNR9at!qs_^Yr=^h`@0JH2FN@47vIdsI6+n;?+c6z(KJnhZ#L<$D=@d(E
zRS1=6m(P2&q;{#_i0M3K^9Qx*A`m|oJ7}lVlT~sqiuZIj=*NJ&kwd(T-DaI4*ow$j
zS|+b#2qdefdkXD+eFK-A>tn+(Us4JrVg1oQ!<Qrt<XAXnS#KrA3Nyl`{d)3w%<-OT
zQ_aR#+{Wp}c@Mjirs1<yq_z<KhbBP=j=h<^9M~YImel3UzUC0TyF34c-e_?7W;q=_
zc_f1q3M`e8>5a-uHm>4#?R^6l1U<_2SEDc4qW=3OZpluaY*U`tPo;YH0D3w4vpiP}
z{Y(z?8C*;pHNrA|g#`I_N^Z{V1oqD;aC4F6xe)r<f>mLWSvp<x{=6&tj)X7aSKD6b
zs4+p_r3YlbfCk#i7iB`Z^bj?nc9oM6^PonfV*eiMp64q>qVYYPk#=(CV)bnDpqf48
z-Z53X|E~FUo8s1>v1s!*Cw!m9u}-^^Kg1>VK6dg1tx6jD6LY-gLLIfs^D<Jx*Yf?o
zD!YZf>@l5Oo>u_P1av8Ls#H1q*?e&SEek?ulV)J{&7@bs>8JQ9_$O2jT-oWjLYLdZ
z(Hts1tKv;!yJ3#OnY4Pr==9?-04I%j%lqmz+-f5^)pR9?3_m!LQ7VLwE$)nZTWrZx
zo9icxFr@@=T*Qm?h>ttGczJx-c}q&GbEb<WNl#WXmc8ogvi6jw!D-~KDu4<z^bSUI
zg5OG_mUM(E>Szo3qN}Zx-kv*u{UfeV-1m;lX`hN{s>%FfZ9G!-_fLJ}#EAU)1-Fj^
z7X$AGMwHH19+xXJi-RDHzsRI)cG;geP<v4PT2N|DXPr!zjn9)t?k8ltW;6VHBYd~X
zHC_1pP}#oJh1O4hEwbjk{em7)&QJ`X9%xKZ<4UoNValw+M9)mD=j@~%681$IBe#0K
zsLHL*EpKS3g>S%5wJun*+MO5!pD{_BtkIsiY3v{Up+2^+s-85V>rn3}nwoet=bpl_
z&3+-4SUlR~GZ2uJrF6$^vu^Iv@&dgjo2`Rm6(<zY51vc2YY(@(VsP~Undt*<RZm+#
TsEubp)W>kSj^B!%ivE89DK$)d

literal 0
HcmV?d00001


From 525cf22a6116aed580957dc9286503f11eb7f0a4 Mon Sep 17 00:00:00 2001
From: Nathan Smith <nathsmit@adobe.com>
Date: Wed, 26 Feb 2020 15:08:40 -0600
Subject: [PATCH 0058/1718] MC-31733: Media gallery breaks in some filesystems

---
 app/code/Magento/Theme/Helper/Storage.php     |   4 +-
 .../Magento/Theme/Model/Wysiwyg/Storage.php   |  15 ++-
 .../Theme/Test/Unit/Helper/StorageTest.php    | 106 ++++++++++++++----
 .../Test/Unit/Model/Wysiwyg/StorageTest.php   |  27 +++--
 4 files changed, 116 insertions(+), 36 deletions(-)

diff --git a/app/code/Magento/Theme/Helper/Storage.php b/app/code/Magento/Theme/Helper/Storage.php
index 41daee8507307..99b2e47a49a4d 100644
--- a/app/code/Magento/Theme/Helper/Storage.php
+++ b/app/code/Magento/Theme/Helper/Storage.php
@@ -255,9 +255,7 @@ public function getCurrentPath()
             if ($path && $path !== self::NODE_ROOT) {
                 $path = $this->convertIdToPath($path);
 
-                $realPath = $this->filesystemDriver->getRealPath(
-                    $this->filesystemDriver->getRealPathSafety($path)
-                );
+                $realPath = $this->filesystemDriver->getRealPathSafety($path);
 
                 $path = $realPath ?: $path;
 
diff --git a/app/code/Magento/Theme/Model/Wysiwyg/Storage.php b/app/code/Magento/Theme/Model/Wysiwyg/Storage.php
index 658e4d78490cd..a48d34c6df93d 100644
--- a/app/code/Magento/Theme/Model/Wysiwyg/Storage.php
+++ b/app/code/Magento/Theme/Model/Wysiwyg/Storage.php
@@ -8,6 +8,7 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Filesystem\DriverInterface;
 
 /**
  * Theme wysiwyg storage model
@@ -86,6 +87,11 @@ class Storage
      */
     private $file;
 
+    /**
+     * @var DriverInterface
+     */
+    private $filesystemDriver;
+
     /**
      * Initialize dependencies
      *
@@ -96,6 +102,7 @@ class Storage
      * @param \Magento\Framework\Url\EncoderInterface $urlEncoder
      * @param \Magento\Framework\Url\DecoderInterface $urlDecoder
      * @param \Magento\Framework\Filesystem\Io\File|null $file
+     * @param DriverInterface|null $filesystemDriver
      *
      * @throws \Magento\Framework\Exception\FileSystemException
      */
@@ -106,7 +113,8 @@ public function __construct(
         \Magento\Framework\Image\AdapterFactory $imageFactory,
         \Magento\Framework\Url\EncoderInterface $urlEncoder,
         \Magento\Framework\Url\DecoderInterface $urlDecoder,
-        \Magento\Framework\Filesystem\Io\File $file = null
+        \Magento\Framework\Filesystem\Io\File $file = null,
+        DriverInterface $filesystemDriver = null
     ) {
         $this->mediaWriteDirectory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA);
         $this->_helper = $helper;
@@ -117,6 +125,8 @@ public function __construct(
         $this->file = $file ?: ObjectManager::getInstance()->get(
             \Magento\Framework\Filesystem\Io\File::class
         );
+        $this->filesystemDriver = $filesystemDriver ?: ObjectManager::getInstance()
+            ->get(DriverInterface::class);
     }
 
     /**
@@ -331,8 +341,9 @@ public function deleteDirectory($path)
     {
         $rootCmp = rtrim($this->_helper->getStorageRoot(), '/');
         $pathCmp = rtrim($path, '/');
+        $absolutePath = $this->filesystemDriver->getRealPathSafety($this->mediaWriteDirectory->getAbsolutePath($path));
 
-        if ($rootCmp == $pathCmp || $rootCmp === $this->mediaWriteDirectory->getAbsolutePath($path)) {
+        if ($rootCmp == $pathCmp || $rootCmp === $absolutePath) {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('We can\'t delete root directory %1 right now.', $path)
             );
diff --git a/app/code/Magento/Theme/Test/Unit/Helper/StorageTest.php b/app/code/Magento/Theme/Test/Unit/Helper/StorageTest.php
index c2ee34dfbba0a..f9f97281c2e3b 100644
--- a/app/code/Magento/Theme/Test/Unit/Helper/StorageTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Helper/StorageTest.php
@@ -9,7 +9,9 @@
  */
 namespace Magento\Theme\Test\Unit\Helper;
 
+use Magento\Framework\Filesystem\DriverInterface;
 use Magento\Theme\Helper\Storage;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -37,7 +39,7 @@ class StorageTest extends \PHPUnit\Framework\TestCase
     protected $request;
 
     /**
-     * @var \Magento\Theme\Helper\Storage
+     * @var Storage
      */
     protected $helper;
 
@@ -78,6 +80,11 @@ class StorageTest extends \PHPUnit\Framework\TestCase
 
     protected $requestParams;
 
+    /**
+     * @var DriverInterface|MockObject
+     */
+    private $filesystemDriver;
+
     protected function setUp()
     {
         $this->customizationPath = '/' . implode('/', ['var', 'theme']);
@@ -102,6 +109,7 @@ protected function setUp()
         $this->contextHelper->expects($this->any())->method('getUrlEncoder')->willReturn($this->urlEncoder);
         $this->contextHelper->expects($this->any())->method('getUrlDecoder')->willReturn($this->urlDecoder);
         $this->themeFactory->expects($this->any())->method('create')->willReturn($this->theme);
+        $this->filesystemDriver = $this->createMock(DriverInterface::class);
 
         $this->theme->expects($this->any())
             ->method('getCustomization')
@@ -109,18 +117,20 @@ protected function setUp()
 
         $this->request->expects($this->at(0))
             ->method('getParam')
-            ->with(\Magento\Theme\Helper\Storage::PARAM_THEME_ID)
+            ->with(Storage::PARAM_THEME_ID)
             ->will($this->returnValue(6));
         $this->request->expects($this->at(1))
             ->method('getParam')
-            ->with(\Magento\Theme\Helper\Storage::PARAM_CONTENT_TYPE)
+            ->with(Storage::PARAM_CONTENT_TYPE)
             ->will($this->returnValue(\Magento\Theme\Model\Wysiwyg\Storage::TYPE_IMAGE));
 
-        $this->helper = new \Magento\Theme\Helper\Storage(
+        $this->helper = new Storage(
             $this->contextHelper,
             $this->filesystem,
             $this->session,
-            $this->themeFactory
+            $this->themeFactory,
+            null,
+            $this->filesystemDriver
         );
     }
 
@@ -196,7 +206,7 @@ public function testGetRequestParams()
         )->method(
             'getParam'
         )->with(
-            \Magento\Theme\Helper\Storage::PARAM_THEME_ID
+            Storage::PARAM_THEME_ID
         )->will(
             $this->returnValue(6)
         );
@@ -205,7 +215,7 @@ public function testGetRequestParams()
         )->method(
             'getParam'
         )->with(
-            \Magento\Theme\Helper\Storage::PARAM_CONTENT_TYPE
+            Storage::PARAM_CONTENT_TYPE
         )->will(
             $this->returnValue('image')
         );
@@ -214,15 +224,15 @@ public function testGetRequestParams()
         )->method(
             'getParam'
         )->with(
-            \Magento\Theme\Helper\Storage::PARAM_NODE
+            Storage::PARAM_NODE
         )->will(
             $this->returnValue('node')
         );
 
         $expectedResult = [
-            \Magento\Theme\Helper\Storage::PARAM_THEME_ID => 6,
-            \Magento\Theme\Helper\Storage::PARAM_CONTENT_TYPE => \Magento\Theme\Model\Wysiwyg\Storage::TYPE_IMAGE,
-            \Magento\Theme\Helper\Storage::PARAM_NODE => 'node',
+            Storage::PARAM_THEME_ID => 6,
+            Storage::PARAM_CONTENT_TYPE => \Magento\Theme\Model\Wysiwyg\Storage::TYPE_IMAGE,
+            Storage::PARAM_NODE => 'node',
         ];
         $this->assertEquals($expectedResult, $this->helper->getRequestParams());
     }
@@ -234,7 +244,7 @@ public function testGetAllowedExtensionsByType()
         )->method(
             'getParam'
         )->with(
-            \Magento\Theme\Helper\Storage::PARAM_CONTENT_TYPE
+            Storage::PARAM_CONTENT_TYPE
         )->will(
             $this->returnValue(\Magento\Theme\Model\Wysiwyg\Storage::TYPE_FONT)
         );
@@ -244,7 +254,7 @@ public function testGetAllowedExtensionsByType()
         )->method(
             'getParam'
         )->with(
-            \Magento\Theme\Helper\Storage::PARAM_CONTENT_TYPE
+            Storage::PARAM_CONTENT_TYPE
         )->will(
             $this->returnValue(\Magento\Theme\Model\Wysiwyg\Storage::TYPE_IMAGE)
         );
@@ -273,17 +283,17 @@ public function testGetThumbnailPathNotFound()
             ->willReturnMap(
                 [
                     [
-                        \Magento\Theme\Helper\Storage::PARAM_THEME_ID,
+                        Storage::PARAM_THEME_ID,
                         null,
                         6,
                     ],
                     [
-                        \Magento\Theme\Helper\Storage::PARAM_CONTENT_TYPE,
+                        Storage::PARAM_CONTENT_TYPE,
                         null,
                         \Magento\Theme\Model\Wysiwyg\Storage::TYPE_IMAGE
                     ],
                     [
-                        \Magento\Theme\Helper\Storage::PARAM_NODE,
+                        Storage::PARAM_NODE,
                         null,
                         $node
                     ],
@@ -349,17 +359,17 @@ public function testGetRelativeUrl()
             ->willReturnMap(
                 [
                     'type' => [
-                        \Magento\Theme\Helper\Storage::PARAM_CONTENT_TYPE,
+                        Storage::PARAM_CONTENT_TYPE,
                         null,
                         \Magento\Theme\Model\Wysiwyg\Storage::TYPE_IMAGE,
                     ],
                     'node' => [
-                        \Magento\Theme\Helper\Storage::PARAM_NODE,
+                        Storage::PARAM_NODE,
                         null,
                         $notRoot,
                     ],
                     'filenaem' => [
-                        \Magento\Theme\Helper\Storage::PARAM_FILENAME,
+                        Storage::PARAM_FILENAME,
                         null,
                         $filename,
                     ],
@@ -389,8 +399,8 @@ public function testGetRelativeUrl()
     public function getStorageTypeForNameDataProvider()
     {
         return [
-            'font' => [\Magento\Theme\Model\Wysiwyg\Storage::TYPE_FONT, \Magento\Theme\Helper\Storage::FONTS],
-            'image' => [\Magento\Theme\Model\Wysiwyg\Storage::TYPE_IMAGE, \Magento\Theme\Helper\Storage::IMAGES],
+            'font' => [\Magento\Theme\Model\Wysiwyg\Storage::TYPE_FONT, Storage::FONTS],
+            'image' => [\Magento\Theme\Model\Wysiwyg\Storage::TYPE_IMAGE, Storage::IMAGES],
         ];
     }
 
@@ -405,7 +415,7 @@ public function testGetStorageTypeName($type, $name)
     {
         $this->request->expects($this->once())
             ->method('getParam')
-            ->with(\Magento\Theme\Helper\Storage::PARAM_CONTENT_TYPE)
+            ->with(Storage::PARAM_CONTENT_TYPE)
             ->willReturn($type);
 
         $this->assertEquals($name, $this->helper->getStorageTypeName());
@@ -433,7 +443,7 @@ public function testGetThemeNotFound()
         $this->themeFactory->expects($this->once())
             ->method('create')
             ->willReturn(null);
-        $helper = new \Magento\Theme\Helper\Storage(
+        $helper = new Storage(
             $this->contextHelper,
             $this->filesystem,
             $this->session,
@@ -441,4 +451,54 @@ public function testGetThemeNotFound()
         );
         $helper->getStorageRoot();
     }
+
+    /**
+     * @dataProvider getCurrentPathDataProvider
+     */
+    public function testGetCurrentPath(
+        string $expectedPath,
+        string $requestedPath,
+        ?bool $isDirectory = null,
+        ?string $relativePath = null,
+        ?string $resolvedPath = null
+    ) {
+        $this->directoryWrite->method('isDirectory')
+            ->willReturn($isDirectory);
+
+        $this->directoryWrite->method('getRelativePath')
+            ->willReturn($relativePath);
+
+        $this->urlDecoder->method('decode')
+            ->willReturnArgument(0);
+
+        if ($resolvedPath) {
+            $this->filesystemDriver->method('getRealpathSafety')
+                ->willReturn($resolvedPath);
+        } else {
+            $this->filesystemDriver->method('getRealpathSafety')
+                ->willReturnArgument(0);
+        }
+
+        $this->request->expects($this->once())
+            ->method('getParam')
+            ->with(Storage::PARAM_NODE)
+            ->willReturn($requestedPath);
+
+        $actualPath = $this->helper->getCurrentPath();
+
+        self::assertSame($expectedPath, $actualPath);
+    }
+
+    public function getCurrentPathDataProvider(): array
+    {
+        $rootPath = '/' . \Magento\Theme\Model\Wysiwyg\Storage::TYPE_IMAGE;
+
+        return [
+            [$rootPath, Storage::NODE_ROOT],
+            [$rootPath, $rootPath . '/foo'],
+            [$rootPath, $rootPath . '/something', true, null, '/bar'],
+            ['foo/', $rootPath . '/foo', true, 'foo/'],
+            [$rootPath, $rootPath . '/foo', false],
+        ];
+    }
 }
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Wysiwyg/StorageTest.php b/app/code/Magento/Theme/Test/Unit/Model/Wysiwyg/StorageTest.php
index 3cd3049172d0a..2c1bb013ad0ec 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Wysiwyg/StorageTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Wysiwyg/StorageTest.php
@@ -9,6 +9,9 @@
  */
 namespace Magento\Theme\Test\Unit\Model\Wysiwyg;
 
+use Magento\Framework\Filesystem\DriverInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -59,6 +62,11 @@ class StorageTest extends \PHPUnit\Framework\TestCase
      */
     protected $urlDecoder;
 
+    /**
+     * @var DriverInterface|MockObject
+     */
+    private $filesystemDriver;
+
     protected function setUp()
     {
         $this->_filesystem = $this->createMock(\Magento\Framework\Filesystem::class);
@@ -99,6 +107,7 @@ function ($path) {
         $this->directoryWrite = $this->createMock(\Magento\Framework\Filesystem\Directory\Write::class);
         $this->urlEncoder = $this->createPartialMock(\Magento\Framework\Url\EncoderInterface::class, ['encode']);
         $this->urlDecoder = $this->createPartialMock(\Magento\Framework\Url\DecoderInterface::class, ['decode']);
+        $this->filesystemDriver = $this->createMock(DriverInterface::class);
 
         $this->_filesystem->expects(
             $this->once()
@@ -114,7 +123,9 @@ function ($path) {
             $this->_objectManager,
             $this->_imageFactory,
             $this->urlEncoder,
-            $this->urlDecoder
+            $this->urlDecoder,
+            null,
+            $this->filesystemDriver
         );
 
         $this->_storageRoot = '/root';
@@ -575,13 +586,13 @@ public function testDeleteRootDirectoryRelative()
             ->with($fakePath)
             ->willReturn($directoryPath);
 
-        $this->_helperStorage->expects(
-            $this->atLeastOnce()
-        )->method(
-            'getStorageRoot'
-        )->will(
-            $this->returnValue($directoryPath)
-        );
+        $this->filesystemDriver->method('getRealPathSafety')
+            ->with($directoryPath)
+            ->willReturn($directoryPath);
+
+        $this->_helperStorage
+            ->method('getStorageRoot')
+            ->willReturn($directoryPath);
 
         $this->_storageModel->deleteDirectory($fakePath);
     }

From 8a52ac736ff879416ed4e6cfb2502f06d3e122df Mon Sep 17 00:00:00 2001
From: Nathan Smith <nathsmit@adobe.com>
Date: Thu, 27 Feb 2020 08:12:50 -0600
Subject: [PATCH 0059/1718] MC-31733: Media gallery breaks in some filesystems

---
 app/code/Magento/Theme/Helper/Storage.php     |  4 +--
 .../Theme/Test/Unit/Helper/StorageTest.php    | 29 ++++++++++++++-----
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Theme/Helper/Storage.php b/app/code/Magento/Theme/Helper/Storage.php
index 99b2e47a49a4d..aff70c5d1ee97 100644
--- a/app/code/Magento/Theme/Helper/Storage.php
+++ b/app/code/Magento/Theme/Helper/Storage.php
@@ -255,9 +255,7 @@ public function getCurrentPath()
             if ($path && $path !== self::NODE_ROOT) {
                 $path = $this->convertIdToPath($path);
 
-                $realPath = $this->filesystemDriver->getRealPathSafety($path);
-
-                $path = $realPath ?: $path;
+                $path = $this->filesystemDriver->getRealPathSafety($path);
 
                 if (strpos($path, $currentPath) !== 0) {
                     $path = $currentPath;
diff --git a/app/code/Magento/Theme/Test/Unit/Helper/StorageTest.php b/app/code/Magento/Theme/Test/Unit/Helper/StorageTest.php
index f9f97281c2e3b..83e0490ff6f58 100644
--- a/app/code/Magento/Theme/Test/Unit/Helper/StorageTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Helper/StorageTest.php
@@ -274,6 +274,8 @@ public function testGetAllowedExtensionsByType()
      */
     public function testGetThumbnailPathNotFound()
     {
+        $this->filesystemDriver->method('getRealpathSafety')
+            ->willReturnArgument(0);
         $image = 'notFoundImage.png';
         $root = '/image';
         $sourceNode = '/not/a/root';
@@ -452,6 +454,20 @@ public function testGetThemeNotFound()
         $helper->getStorageRoot();
     }
 
+    /**
+     * @dataProvider getCurrentPathDataProvider
+     */
+    public function testGetCurrentPathCachesResult()
+    {
+        $this->request->expects($this->once())
+            ->method('getParam')
+            ->with(Storage::PARAM_NODE)
+            ->willReturn(Storage::NODE_ROOT);
+
+        $actualPath = $this->helper->getCurrentPath();
+        self::assertSame('/image', $actualPath);
+    }
+
     /**
      * @dataProvider getCurrentPathDataProvider
      */
@@ -479,8 +495,7 @@ public function testGetCurrentPath(
                 ->willReturnArgument(0);
         }
 
-        $this->request->expects($this->once())
-            ->method('getParam')
+        $this->request->method('getParam')
             ->with(Storage::PARAM_NODE)
             ->willReturn($requestedPath);
 
@@ -494,11 +509,11 @@ public function getCurrentPathDataProvider(): array
         $rootPath = '/' . \Magento\Theme\Model\Wysiwyg\Storage::TYPE_IMAGE;
 
         return [
-            [$rootPath, Storage::NODE_ROOT],
-            [$rootPath, $rootPath . '/foo'],
-            [$rootPath, $rootPath . '/something', true, null, '/bar'],
-            ['foo/', $rootPath . '/foo', true, 'foo/'],
-            [$rootPath, $rootPath . '/foo', false],
+            'requested path "root" should short-circuit' => [$rootPath, Storage::NODE_ROOT],
+            'non-existent directory should default to the base path' => [$rootPath, $rootPath . '/foo'],
+            'requested path that resolves to a bad path should default to root' =>
+                [$rootPath, $rootPath . '/something', true, null, '/bar'],
+            'real path should resolve to relative path' => ['foo/', $rootPath . '/foo', true, 'foo/'],
         ];
     }
 }

From 438a7aba20444ad69baf8dd1c3f934d31cfbf2d7 Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Thu, 27 Feb 2020 17:07:49 +0200
Subject: [PATCH 0060/1718] MAGETWO-90070: Image uploader improvements

---
 .../MediaStorage/Model/File/Uploader.php      | 24 +++++-
 .../Model/File/Validator/Image.php            | 74 +++++++++++++++++++
 2 files changed, 97 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/MediaStorage/Model/File/Validator/Image.php

diff --git a/app/code/Magento/MediaStorage/Model/File/Uploader.php b/app/code/Magento/MediaStorage/Model/File/Uploader.php
index 3f3cefe1d6330..2f3d683fd8d41 100644
--- a/app/code/Magento/MediaStorage/Model/File/Uploader.php
+++ b/app/code/Magento/MediaStorage/Model/File/Uploader.php
@@ -6,6 +6,8 @@
 
 namespace Magento\MediaStorage\Model\File;
 
+use Magento\Framework\Validation\ValidationException;
+
 /**
  * Core file uploader model
  *
@@ -40,21 +42,29 @@ class Uploader extends \Magento\Framework\File\Uploader
      */
     protected $_validator;
 
+    /**
+     * @var \Magento\MediaStorage\Model\File\Validator\Image
+     */
+    private $imageValidator;
+
     /**
      * @param string $fileId
      * @param \Magento\MediaStorage\Helper\File\Storage\Database $coreFileStorageDb
      * @param \Magento\MediaStorage\Helper\File\Storage $coreFileStorage
      * @param \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension $validator
+     * @param \Magento\MediaStorage\Model\File\Validator\Image $imageValidator
      */
     public function __construct(
         $fileId,
         \Magento\MediaStorage\Helper\File\Storage\Database $coreFileStorageDb,
         \Magento\MediaStorage\Helper\File\Storage $coreFileStorage,
-        \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension $validator
+        \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension $validator,
+        \Magento\MediaStorage\Model\File\Validator\Image $imageValidator
     ) {
         $this->_coreFileStorageDb = $coreFileStorageDb;
         $this->_coreFileStorage = $coreFileStorage;
         $this->_validator = $validator;
+        $this->imageValidator = $imageValidator;
         parent::__construct($fileId);
     }
 
@@ -130,4 +140,16 @@ public function validateFile()
         $this->_validateFile();
         return $this->_file;
     }
+
+    /**
+     * @inheritDoc
+     */
+    protected function _validateFile()
+    {
+        parent::_validateFile();
+
+        if (!$this->imageValidator->isValid($this->_file['tmp_name'])) {
+            throw new ValidationException(__('File validation failed.'));
+        }
+    }
 }
diff --git a/app/code/Magento/MediaStorage/Model/File/Validator/Image.php b/app/code/Magento/MediaStorage/Model/File/Validator/Image.php
new file mode 100644
index 0000000000000..a8bce7cfee20b
--- /dev/null
+++ b/app/code/Magento/MediaStorage/Model/File/Validator/Image.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaStorage\Model\File\Validator;
+
+use Magento\Framework\File\Mime;
+use Magento\Framework\Filesystem\Driver\File;
+
+/**
+ * Image validator
+ */
+class Image extends \Zend_Validate_Abstract
+{
+    /**
+     * @var array
+     */
+    private $imageMimeTypes = [
+        'png'  => 'image/png',
+        'jpe'  => 'image/jpeg',
+        'jpeg' => 'image/jpeg',
+        'jpg'  => 'image/jpeg',
+        'gif'  => 'image/gif',
+        'bmp'  => 'image/bmp',
+        'ico'  => 'image/vnd.microsoft.icon',
+    ];
+
+    /**
+     * @var Mime
+     */
+    private $fileMime;
+
+    /**
+     * @var File
+     */
+    private $file;
+
+    /**
+     * @param Mime $fileMime
+     * @param File $file
+     */
+    public function __construct(
+        Mime $fileMime,
+        File $file
+    ) {
+        $this->fileMime = $fileMime;
+        $this->file = $file;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function isValid($filePath): bool
+    {
+        $fileMimeType = $this->fileMime->getMimeType($filePath);
+        $isValid = true;
+
+        if (in_array($fileMimeType, $this->imageMimeTypes)) {
+            try {
+                //phpcs:ignore Magento2.Functions.DiscouragedFunction
+                $image = imagecreatefromstring($this->file->fileGetContents($filePath));
+
+                $isValid = $image ? true : false;
+            } catch (\Exception $e) {
+                $isValid = false;
+            }
+        }
+
+        return $isValid;
+    }
+}

From 02eeaa92c938f708326ca0a5c474533fd8cee53b Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Thu, 27 Feb 2020 13:56:59 -0600
Subject: [PATCH 0061/1718] MC-31357: Customer file uploader update

- Fixed minor setup typo in integration test
---
 .../Magento/Customer/Model/Metadata/Form/ImageTest.php         | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/Metadata/Form/ImageTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/Metadata/Form/ImageTest.php
index 578525a0d8161..5d00feec17407 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/Metadata/Form/ImageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/Metadata/Form/ImageTest.php
@@ -58,8 +58,7 @@ class ImageTest extends \PHPUnit\Framework\TestCase
     public function setUp()
     {
         $this->objectManager = Bootstrap::getObjectManager();
-        $this->filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->get(Filesystem::class);
+        $this->filesystem = $this->objectManager->get(Filesystem::class);
         $this->mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
         $this->imageFixtureDir = realpath(__DIR__ . '/../../../_files/image');
         $this->expectedFileName = '/m/a/' . $this->fileName;

From a7c1740f76811eed5189e8a037cc51e1d643d5bb Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Fri, 28 Feb 2020 09:45:08 +0200
Subject: [PATCH 0062/1718] MAGETWO-90070: Image uploader improvements

---
 app/code/Magento/MediaStorage/Model/File/Uploader.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/MediaStorage/Model/File/Uploader.php b/app/code/Magento/MediaStorage/Model/File/Uploader.php
index 2f3d683fd8d41..90e29353879bc 100644
--- a/app/code/Magento/MediaStorage/Model/File/Uploader.php
+++ b/app/code/Magento/MediaStorage/Model/File/Uploader.php
@@ -6,7 +6,9 @@
 
 namespace Magento\MediaStorage\Model\File;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Validation\ValidationException;
+use Magento\MediaStorage\Model\File\Validator\Image;
 
 /**
  * Core file uploader model
@@ -43,7 +45,7 @@ class Uploader extends \Magento\Framework\File\Uploader
     protected $_validator;
 
     /**
-     * @var \Magento\MediaStorage\Model\File\Validator\Image
+     * @var Image
      */
     private $imageValidator;
 
@@ -52,19 +54,19 @@ class Uploader extends \Magento\Framework\File\Uploader
      * @param \Magento\MediaStorage\Helper\File\Storage\Database $coreFileStorageDb
      * @param \Magento\MediaStorage\Helper\File\Storage $coreFileStorage
      * @param \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension $validator
-     * @param \Magento\MediaStorage\Model\File\Validator\Image $imageValidator
+     * @param Image $imageValidator
      */
     public function __construct(
         $fileId,
         \Magento\MediaStorage\Helper\File\Storage\Database $coreFileStorageDb,
         \Magento\MediaStorage\Helper\File\Storage $coreFileStorage,
         \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension $validator,
-        \Magento\MediaStorage\Model\File\Validator\Image $imageValidator
+        Image $imageValidator = null
     ) {
         $this->_coreFileStorageDb = $coreFileStorageDb;
         $this->_coreFileStorage = $coreFileStorage;
         $this->_validator = $validator;
-        $this->imageValidator = $imageValidator;
+        $this->imageValidator = $imageValidator?: ObjectManager::getInstance()->get(Image::class);
         parent::__construct($fileId);
     }
 

From 70eb207cf615a24ca57afcc8b473961de4c1fef0 Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Fri, 28 Feb 2020 13:48:09 +0200
Subject: [PATCH 0063/1718] MAGETWO-90070: Image uploader improvements

---
 .../MediaStorage/Model/File/Uploader.php      | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/MediaStorage/Model/File/Uploader.php b/app/code/Magento/MediaStorage/Model/File/Uploader.php
index 90e29353879bc..daa9116e5138d 100644
--- a/app/code/Magento/MediaStorage/Model/File/Uploader.php
+++ b/app/code/Magento/MediaStorage/Model/File/Uploader.php
@@ -54,19 +54,16 @@ class Uploader extends \Magento\Framework\File\Uploader
      * @param \Magento\MediaStorage\Helper\File\Storage\Database $coreFileStorageDb
      * @param \Magento\MediaStorage\Helper\File\Storage $coreFileStorage
      * @param \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension $validator
-     * @param Image $imageValidator
      */
     public function __construct(
         $fileId,
         \Magento\MediaStorage\Helper\File\Storage\Database $coreFileStorageDb,
         \Magento\MediaStorage\Helper\File\Storage $coreFileStorage,
-        \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension $validator,
-        Image $imageValidator = null
+        \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension $validator
     ) {
         $this->_coreFileStorageDb = $coreFileStorageDb;
         $this->_coreFileStorage = $coreFileStorage;
         $this->_validator = $validator;
-        $this->imageValidator = $imageValidator?: ObjectManager::getInstance()->get(Image::class);
         parent::__construct($fileId);
     }
 
@@ -150,8 +147,24 @@ protected function _validateFile()
     {
         parent::_validateFile();
 
-        if (!$this->imageValidator->isValid($this->_file['tmp_name'])) {
+        if (!$this->getImageValidator()->isValid($this->_file['tmp_name'])) {
             throw new ValidationException(__('File validation failed.'));
         }
     }
+
+    /**
+     * Return image validator class.
+     *
+     * Child classes __construct() don't call parent, so we have to retrieve class instance with private function.
+     *
+     * @return Image
+     */
+    private function getImageValidator(): Image
+    {
+        if (!$this->imageValidator) {
+            $this->imageValidator = ObjectManager::getInstance()->get(Image::class);
+        }
+
+        return $this->imageValidator;
+    }
 }

From 89194c47022311d3d079304ce00f22d9acdc02c9 Mon Sep 17 00:00:00 2001
From: Dmytro Voskoboinikov <voskoboi@adobe.com>
Date: Mon, 2 Mar 2020 13:08:24 -0600
Subject: [PATCH 0064/1718] MC-30944: Incorrect flow of saving Newsletter
 templates

---
 .../Magento/Newsletter/Controller/Adminhtml/Template/Save.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php
index 8fc729ea34078..ac7371a08571f 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php
@@ -32,9 +32,7 @@ public function execute()
         }
 
         try {
-            $template->addData(
-                $request->getParams()
-            )->setTemplateSubject(
+            $template->setTemplateSubject(
                 $request->getParam('subject')
             )->setTemplateCode(
                 $request->getParam('code')

From a050516262c70eb314769f4795d5b897778f9a9d Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Mon, 2 Mar 2020 16:00:21 -0600
Subject: [PATCH 0065/1718] MC-31362: Media folder update

- Fixed edge case in file driver
---
 lib/internal/Magento/Framework/Filesystem/Driver/File.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/internal/Magento/Framework/Filesystem/Driver/File.php b/lib/internal/Magento/Framework/Filesystem/Driver/File.php
index 1a847a518a3f9..e5fa134f6d38a 100644
--- a/lib/internal/Magento/Framework/Filesystem/Driver/File.php
+++ b/lib/internal/Magento/Framework/Filesystem/Driver/File.php
@@ -983,6 +983,9 @@ public function getRealPathSafety($path)
             $path
         );
         $pathParts = explode(DIRECTORY_SEPARATOR, $path);
+        if (end($pathParts) == '.') {
+            $pathParts[count($pathParts)] = '';
+        }
         $realPath = [];
         foreach ($pathParts as $pathPart) {
             if ($pathPart == '.') {

From f70f1d23c76939e9b1cce5231d178a963d7ae622 Mon Sep 17 00:00:00 2001
From: Andrii Kasian <akasian@magento.com>
Date: Mon, 2 Mar 2020 22:25:05 -0600
Subject: [PATCH 0066/1718] Explicitly define type for in condition

---
 .../Model/ResourceModel/Index.php             |  4 +--
 .../ResourceModel/Selection/Collection.php    |  4 +--
 .../Model/Resolver/Links/Collection.php       |  2 +-
 .../Indexer/Category/Flat/AbstractAction.php  |  9 ++++--
 .../Indexer/Category/Flat/Action/Rows.php     |  3 +-
 .../Category/Product/AbstractAction.php       |  9 +++---
 .../Indexer/Product/Category/Action/Rows.php  | 10 +++----
 .../Indexer/Product/Flat/FlatTableBuilder.php |  8 ++++--
 .../Indexer/Product/Flat/TableBuilder.php     | 12 ++++++--
 .../Indexer/Product/Price/AbstractAction.php  |  4 +--
 .../Product/Attribute/AttributeSetFinder.php  |  2 +-
 .../Model/Product/Price/PricePersistence.php  |  2 +-
 .../Product/Price/TierPricePersistence.php    |  2 +-
 .../Model/ResourceModel/AbstractResource.php  | 14 ++++++++--
 .../Catalog/Model/ResourceModel/Category.php  |  7 +++--
 .../Model/ResourceModel/Category/Flat.php     |  5 ++--
 .../Collection/AbstractCollection.php         | 12 +++++---
 .../Catalog/Model/ResourceModel/Product.php   |  8 ++++--
 .../ResourceModel/Product/Collection.php      |  9 +++---
 .../Model/ResourceModel/Product/Gallery.php   |  3 +-
 .../Product/Indexer/Price/DefaultPrice.php    |  2 +-
 .../Product/Indexer/Price/TierPrice.php       |  2 +-
 .../Product/Link/Product/Collection.php       |  8 +++---
 .../Model/ResourceModel/Product/Website.php   |  3 +-
 .../Model/Indexer/ProductPriceIndexFilter.php |  2 +-
 .../Model/Indexer/Stock/CacheCleaner.php      |  2 +-
 .../Model/ResourceModel/Stock.php             |  6 ++--
 .../Model/ResourceModel/Stock/Status.php      |  2 +-
 .../Indexer/ProductPriceIndexModifier.php     |  2 +-
 .../Model/ConfigurableProductsProvider.php    |  2 +-
 .../Indexer/Fulltext/Action/DataProvider.php  |  7 +++--
 .../Model/Indexer/Fulltext/Action/Full.php    |  2 +-
 .../Model/ResourceModel/Fulltext.php          |  3 +-
 .../Model/ResourceModel/Search/Collection.php |  6 ++--
 .../Product/Indexer/Price/Configurable.php    |  2 +-
 .../Product/Type/Configurable.php             |  3 +-
 .../Configurable/Attribute/Collection.php     |  3 +-
 .../Type/Configurable/Product/Collection.php  |  2 +-
 .../Entity/Collection/AbstractCollection.php  |  6 ++--
 .../Model/ResourceModel/Entity/Attribute.php  |  3 +-
 .../Entity/Attribute/Collection.php           |  6 ++--
 .../Eav/Model/ResourceModel/ReadHandler.php   |  2 +-
 lib/internal/Magento/Framework/DB/Select.php  |  2 +-
 test.php                                      | 28 +++++++++++++++++++
 44 files changed, 154 insertions(+), 81 deletions(-)
 create mode 100644 test.php

diff --git a/app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php b/app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php
index b20872da2f8e7..be2e68cf30e1e 100644
--- a/app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php
+++ b/app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php
@@ -108,7 +108,7 @@ protected function _getCatalogProductPriceData($productIds = null)
                     ['entity_id', 'customer_group_id', 'website_id', 'min_price']
                 );
                 if ($productIds) {
-                    $select->where('entity_id IN (?)', $productIds);
+                    $select->where('entity_id IN (?)', $productIds, \Zend_Db::BIGINT_TYPE);
                 }
                 $catalogProductIndexPriceSelect[] = $select;
             }
@@ -177,7 +177,7 @@ public function getCategoryProductIndexData($storeId = null, $productIds = null)
         );
 
         if ($productIds) {
-            $select->where('product_id IN (?)', $productIds);
+            $select->where('product_id IN (?)', $productIds, \Zend_Db::BIGINT_TYPE);
         }
 
         $result = [];
diff --git a/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php b/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php
index 7b3f6dd8bbefa..11c83622a3b54 100644
--- a/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php
+++ b/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php
@@ -215,7 +215,7 @@ public function joinPrices($websiteId)
     public function setOptionIdsFilter($optionIds)
     {
         if (!empty($optionIds)) {
-            $this->getSelect()->where('selection.option_id IN (?)', $optionIds);
+            $this->getSelect()->where('selection.option_id IN (?)', $optionIds, \Zend_Db::BIGINT_TYPE);
         }
         return $this;
     }
@@ -229,7 +229,7 @@ public function setOptionIdsFilter($optionIds)
     public function setSelectionIdsFilter($selectionIds)
     {
         if (!empty($selectionIds)) {
-            $this->getSelect()->where('selection.selection_id IN (?)', $selectionIds);
+            $this->getSelect()->where('selection.selection_id IN (?)', $selectionIds, \Zend_Db::BIGINT_TYPE);
         }
         return $this;
     }
diff --git a/app/code/Magento/BundleGraphQl/Model/Resolver/Links/Collection.php b/app/code/Magento/BundleGraphQl/Model/Resolver/Links/Collection.php
index 13bf10bc6aca7..76e670721c31d 100644
--- a/app/code/Magento/BundleGraphQl/Model/Resolver/Links/Collection.php
+++ b/app/code/Magento/BundleGraphQl/Model/Resolver/Links/Collection.php
@@ -108,7 +108,7 @@ private function fetch() : array
         }
 
         $linkCollection->getSelect()
-            ->where($field . ' IN (?)', $this->parentIds);
+            ->where($field . ' IN (?)', $this->parentIds, \Zend_Db::BIGINT_TYPE);
 
         /** @var Selection $link */
         foreach ($linkCollection as $link) {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
index 1506ccf6963bf..50e8df10d57ff 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
@@ -414,7 +414,8 @@ private function getLinkIds(array $entityIds)
             [$linkField]
         )->where(
             'e.entity_id IN (?)',
-            $entityIds
+            $entityIds,
+            \Zend_Db::BIGINT_TYPE
         );
 
         return $this->connection->fetchCol($select);
@@ -459,10 +460,12 @@ protected function getAttributeTypeValues($type, $entityIds, $storeId)
             ]
         )->where(
             "e.entity_id IN (?)",
-            $entityIds
+            $entityIds,
+            \Zend_Db::BIGINT_TYPE
         )->where(
             'def.store_id IN (?)',
-            [\Magento\Store\Model\Store::DEFAULT_STORE_ID, $storeId]
+            [\Magento\Store\Model\Store::DEFAULT_STORE_ID, $storeId],
+            \Zend_Db::BIGINT_TYPE
         );
 
         return $this->connection->fetchAll($select);
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Rows.php
index c722206193eb3..00499232c8c33 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Rows.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Rows.php
@@ -119,7 +119,8 @@ protected function filterIdsByStore(array $ids, $store)
             "path = {$rootIdExpr} OR path = {$rootCatIdExpr} OR path like {$catIdExpr}"
         )->where(
             "entity_id IN (?)",
-            $ids
+            $ids,
+            \Zend_Db::BIGINT_TYPE
         );
 
         $resultIds = [];
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
index 178f4172ce6fa..b0aeea3230d70 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
@@ -502,10 +502,11 @@ protected function createAnchorSelect(Store $store)
             []
         )->joinInner(
             ['cc2' => $temporaryTreeTable],
-            'cc2.parent_id = cc.entity_id AND cc.entity_id NOT IN (' . implode(
-                ',',
-                $rootCatIds
-            ) . ')',
+            $this->connection->quoteInto(
+                'cc2.parent_id = cc.entity_id AND cc.entity_id NOT IN ()',
+                $rootCatIds,
+                \Zend_Db::BIGINT_TYPE
+            ),
             []
         )->joinInner(
             ['ccp' => $this->getTable('catalog_category_product')],
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 ec3d0d57330ec..3a9c4a94e58e5 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
@@ -151,7 +151,7 @@ private function getProductIdsWithParents(array $childProductIds): array
             ->select()
             ->from(['relation' => $this->getTable('catalog_product_relation')], [])
             ->distinct(true)
-            ->where('child_id IN (?)', $childProductIds)
+            ->where('child_id IN (?)', $childProductIds, \Zend_Db::BIGINT_TYPE)
             ->join(
                 ['cpe' => $this->getTable('catalog_product_entity')],
                 'relation.parent_id = cpe.' . $fieldForParent,
@@ -215,7 +215,7 @@ protected function removeEntries()
     protected function getNonAnchorCategoriesSelect(\Magento\Store\Model\Store $store)
     {
         $select = parent::getNonAnchorCategoriesSelect($store);
-        return $select->where('ccp.product_id IN (?)', $this->limitationByProducts);
+        return $select->where('ccp.product_id IN (?)', $this->limitationByProducts, \Zend_Db::BIGINT_TYPE);
     }
 
     /**
@@ -227,7 +227,7 @@ protected function getNonAnchorCategoriesSelect(\Magento\Store\Model\Store $stor
     protected function getAnchorCategoriesSelect(\Magento\Store\Model\Store $store)
     {
         $select = parent::getAnchorCategoriesSelect($store);
-        return $select->where('ccp.product_id IN (?)', $this->limitationByProducts);
+        return $select->where('ccp.product_id IN (?)', $this->limitationByProducts, \Zend_Db::BIGINT_TYPE);
     }
 
     /**
@@ -239,7 +239,7 @@ protected function getAnchorCategoriesSelect(\Magento\Store\Model\Store $store)
     protected function getAllProducts(\Magento\Store\Model\Store $store)
     {
         $select = parent::getAllProducts($store);
-        return $select->where('cp.entity_id IN (?)', $this->limitationByProducts);
+        return $select->where('cp.entity_id IN (?)', $this->limitationByProducts, \Zend_Db::BIGINT_TYPE);
     }
 
     /**
@@ -265,7 +265,7 @@ private function getCategoryIdsFromIndex(array $productIds): array
             $storeCategories = $this->connection->fetchCol(
                 $this->connection->select()
                     ->from($this->getIndexTable($store->getId()), ['category_id'])
-                    ->where('product_id IN (?)', $productIds)
+                    ->where('product_id IN (?)', $productIds, \Zend_Db::BIGINT_TYPE)
                     ->distinct()
             );
             $categoryIds[] = $storeCategories;
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 2252b3e3d5506..0d62f780c9aa2 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
@@ -340,7 +340,9 @@ protected function _updateTemporaryTableByStoreValues(
                             [$attributeCode => 't.value']
                         );
                     if (!empty($changedIds)) {
-                        $select->where($this->_connection->quoteInto('et.entity_id IN (?)', $changedIds));
+                        $select->where(
+                            $this->_connection->quoteInto('et.entity_id IN (?)', $changedIds, \Zend_Db::BIGINT_TYPE)
+                        );
                     }
                     $sql = $select->crossUpdateFromSelect(['et' => $temporaryFlatTableName]);
                     $this->_connection->query($sql);
@@ -363,7 +365,9 @@ protected function _updateTemporaryTableByStoreValues(
                         [$columnName => $columnValue]
                     )->where($columnValue . ' IS NOT NULL');
                     if (!empty($changedIds)) {
-                        $select->where($this->_connection->quoteInto('et.entity_id IN (?)', $changedIds));
+                        $select->where(
+                            $this->_connection->quoteInto('et.entity_id IN (?)', $changedIds, \Zend_Db::BIGINT_TYPE))
+                        ;
                     }
                     $sql = $select->crossUpdateFromSelect(['et' => $temporaryFlatTableName]);
                     $this->_connection->query($sql);
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
index c0722901e3b1c..c0632c6c246ce 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
@@ -233,7 +233,9 @@ protected function _fillTemporaryEntityTable($tableName, array $columns, array $
             $select->from(['e' => $tableName], $columns);
             $onDuplicate = false;
             if (!empty($changedIds)) {
-                $select->where($this->_connection->quoteInto('e.entity_id IN (?)', $changedIds));
+                $select->where(
+                    $this->_connection->quoteInto('e.entity_id IN (?)', $changedIds, \Zend_Db::BIGINT_TYPE)
+                );
                 $onDuplicate = true;
             }
             $sql = $select->insertFromSelect($temporaryEntityTable, $columns, $onDuplicate);
@@ -347,7 +349,9 @@ protected function _fillTemporaryTable(
                 }
 
                 if (!empty($changedIds)) {
-                    $select->where($this->_connection->quoteInto('e.entity_id IN (?)', $changedIds));
+                    $select->where(
+                        $this->_connection->quoteInto('e.entity_id IN (?)', $changedIds, \Zend_Db::BIGINT_TYPE)
+                    );
                 }
 
                 $sql = $select->insertFromSelect($temporaryTableName, $columns, true);
@@ -355,7 +359,9 @@ protected function _fillTemporaryTable(
 
                 if (count($valueColumns) > 1) {
                     if (!empty($changedIds)) {
-                        $selectValue->where($this->_connection->quoteInto('e.entity_id IN (?)', $changedIds));
+                        $selectValue->where(
+                            $this->_connection->quoteInto('e.entity_id IN (?)', $changedIds, \Zend_Db::BIGINT_TYPE)
+                        );
                     }
                     $sql = $selectValue->insertFromSelect($temporaryValueTableName, $valueColumns, true);
                     $this->_connection->query($sql);
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 e9a907f0b5097..1b4d61c899428 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
@@ -410,7 +410,7 @@ private function deleteIndexData(array $entityIds)
             $select = $this->getConnection()->select()->from(
                 ['index_price' => $this->tableMaintainer->getMainTable($dimensions)],
                 null
-            )->where('index_price.entity_id IN (?)', $entityIds);
+            )->where('index_price.entity_id IN (?)', $entityIds, \Zend_Db::BIGINT_TYPE);
             $query = $select->deleteFromSelect('index_price');
             $this->getConnection()->query($query);
         }
@@ -519,7 +519,7 @@ private function getProductsTypes(array $changedIds = [])
             ['entity_id', 'type_id']
         );
         if ($changedIds) {
-            $select->where('entity_id IN (?)', $changedIds);
+            $select->where('entity_id IN (?)', $changedIds, \Zend_Db::BIGINT_TYPE);
         }
         $pairs = $this->getConnection()->fetchPairs($select);
 
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/AttributeSetFinder.php b/app/code/Magento/Catalog/Model/Product/Attribute/AttributeSetFinder.php
index 4df67d1c01f16..5211f7470afc2 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/AttributeSetFinder.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/AttributeSetFinder.php
@@ -37,7 +37,7 @@ public function findAttributeSetIdsByProductIds(array $productIds)
             ->getSelect()
             ->reset(Select::COLUMNS)
             ->columns(ProductInterface::ATTRIBUTE_SET_ID)
-            ->where('entity_id IN (?)', $productIds)
+            ->where('entity_id IN (?)', $productIds, \Zend_Db::BIGINT_TYPE)
             ->group(ProductInterface::ATTRIBUTE_SET_ID);
         $result = $collection->getConnection()->fetchCol($select);
         return $result;
diff --git a/app/code/Magento/Catalog/Model/Product/Price/PricePersistence.php b/app/code/Magento/Catalog/Model/Product/Price/PricePersistence.php
index e3085f7cdefe3..0b8baa56243b3 100644
--- a/app/code/Magento/Catalog/Model/Product/Price/PricePersistence.php
+++ b/app/code/Magento/Catalog/Model/Product/Price/PricePersistence.php
@@ -97,7 +97,7 @@ public function get(array $skus)
             ->select()
             ->from($this->attributeResource->getTable($this->table));
         return $this->attributeResource->getConnection()->fetchAll(
-            $select->where($this->getEntityLinkField() . ' IN (?)', $ids)
+            $select->where($this->getEntityLinkField() . ' IN (?)', $ids, \Zend_Db::BIGINT_TYPE)
                 ->where('attribute_id = ?', $this->getAttributeId())
         );
     }
diff --git a/app/code/Magento/Catalog/Model/Product/Price/TierPricePersistence.php b/app/code/Magento/Catalog/Model/Product/Price/TierPricePersistence.php
index fd247d2ce9e32..1088fa7417444 100644
--- a/app/code/Magento/Catalog/Model/Product/Price/TierPricePersistence.php
+++ b/app/code/Magento/Catalog/Model/Product/Price/TierPricePersistence.php
@@ -56,7 +56,7 @@ public function get(array $ids)
     {
         $select = $this->tierpriceResource->getConnection()->select()->from($this->tierpriceResource->getMainTable());
         return $this->tierpriceResource->getConnection()->fetchAll(
-            $select->where($this->getEntityLinkField() . ' IN (?)', $ids)
+            $select->where($this->getEntityLinkField() . ' IN (?)', $ids, \Zend_Db::BIGINT_TYPE)
         );
     }
 
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php b/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
index 3946be32184ec..cf0e82046f3a5 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
@@ -147,7 +147,7 @@ protected function _getLoadAttributesSelect($object, $table)
             ->select()
             ->from(['attr_table' => $table], [])
             ->where("attr_table.{$this->getLinkField()} = ?", $object->getData($this->getLinkField()))
-            ->where('attr_table.store_id IN (?)', $storeIds);
+            ->where('attr_table.store_id IN (?)', $storeIds, \Zend_Db::BIGINT_TYPE);
 
         if ($setId) {
             $select->join(
@@ -562,7 +562,11 @@ public function getAttributeRawValue($entityId, $attribute, $store)
         if ($typedAttributes) {
             foreach ($typedAttributes as $table => $_attributes) {
                 $defaultJoinCondition = [
-                    $connection->quoteInto('default_value.attribute_id IN (?)', array_keys($_attributes)),
+                    $connection->quoteInto(
+                        'default_value.attribute_id IN (?)',
+                        array_keys($_attributes),
+                        \Zend_Db::BIGINT_TYPE
+                    ),
                     "default_value.{$this->getLinkField()} = e.{$this->getLinkField()}",
                     'default_value.store_id = 0',
                 ];
@@ -589,7 +593,11 @@ public function getAttributeRawValue($entityId, $attribute, $store)
                         'store_value.attribute_id'
                     );
                     $joinCondition = [
-                        $connection->quoteInto('store_value.attribute_id IN (?)', array_keys($_attributes)),
+                        $connection->quoteInto(
+                            'store_value.attribute_id IN (?)',
+                            array_keys($_attributes),
+                            \Zend_Db::BIGINT_TYPE
+                        ),
                         "store_value.{$this->getLinkField()} = e.{$this->getLinkField()}",
                         'store_value.store_id = :store_id',
                     ];
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category.php b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
index c4980c917d069..86868a7b28ff6 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
@@ -13,13 +13,13 @@
 
 namespace Magento\Catalog\Model\ResourceModel;
 
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Indexer\Category\Product\Processor;
+use Magento\Catalog\Setup\CategorySetup;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject;
 use Magento\Framework\EntityManager\EntityManager;
-use Magento\Catalog\Setup\CategorySetup;
 use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Catalog\Api\Data\ProductInterface;
 
 /**
  * Resource model for category entity
@@ -666,7 +666,8 @@ public function findWhereAttributeIs($entityIdsFilter, $attribute, $expectedValu
                 'ci.value = :value'
             )->where(
                 'ce.entity_id IN (?)',
-                $entityIdsFilter
+                $entityIdsFilter,
+                \Zend_Db::BIGINT_TYPE
             );
             $this->entitiesWhereAttributesIs[$entityIdsFilterHash][$attribute->getId()][$expectedValue] =
                 $this->getConnection()->fetchCol($selectEntities, $bind);
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php
index 05950531e2178..ffe485a31018f 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php
@@ -294,7 +294,7 @@ protected function _loadNodes($parentNode = null, $recursionLevel = 0, $storeId
         $inactiveCategories = $this->getInactiveCategoryIds();
 
         if (!empty($inactiveCategories)) {
-            $select->where('main_table.entity_id NOT IN (?)', $inactiveCategories);
+            $select->where('main_table.entity_id NOT IN (?)', $inactiveCategories, \Zend_Db::BIGINT_TYPE);
         }
 
         // Allow extensions to modify select (e.g. add custom category attributes to select)
@@ -681,7 +681,8 @@ public function getAnchorsAbove(array $filterIds, $storeId = 0)
             1
         )->where(
             'entity_id IN (?)',
-            $filterIds
+            $filterIds,
+            \Zend_Db::BIGINT_TYPE
         );
 
         return $this->getConnection()->fetchCol($select);
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php b/app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php
index 3a0d47fe573fb..490406d7f68f5 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php
@@ -170,10 +170,12 @@ protected function _getLoadAttributesSelect($table, $attributeIds = [])
                 ['e.entity_id']
             )->where(
                 "e.entity_id IN (?)",
-                array_keys($this->_itemsById)
+                array_keys($this->_itemsById),
+                \Zend_Db::BIGINT_TYPE
             )->where(
                 't_d.attribute_id IN (?)',
-                $attributeIds
+                $attributeIds,
+                \Zend_Db::BIGINT_TYPE
             )->joinLeft(
                 ['t_s' => $table],
                 implode(' AND ', $joinCondition),
@@ -192,10 +194,12 @@ protected function _getLoadAttributesSelect($table, $attributeIds = [])
                 ['e.entity_id']
             )->where(
                 "e.entity_id IN (?)",
-                array_keys($this->_itemsById)
+                array_keys($this->_itemsById),
+                \Zend_Db::BIGINT_TYPE
             )->where(
                 'attribute_id IN (?)',
-                $attributeIds
+                $attributeIds,
+                \Zend_Db::BIGINT_TYPE
             )->where(
                 'store_id = ?',
                 $this->getDefaultStoreId()
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product.php b/app/code/Magento/Catalog/Model/ResourceModel/Product.php
index c5587d3b25665..747893875d23b 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product.php
@@ -232,7 +232,8 @@ public function getWebsiteIdsByProductIds($productIds)
             ['product_id', 'website_id']
         )->where(
             'product_id IN (?)',
-            $productIds
+            $productIds,
+            \Zend_Db::BIGINT_TYPE
         );
         $productsWebsites = [];
         foreach ($this->getConnection()->fetchAll($select) as $productInfo) {
@@ -357,7 +358,7 @@ private function deleteSelectedEntityAttributeRows(DataObject $product, array $a
         $entityId = $product->getData($entityIdField);
         foreach ($backendTables as $backendTable => $attributes) {
             $connection = $this->getConnection();
-            $where = $connection->quoteInto('attribute_id IN (?)', $attributes);
+            $where = $connection->quoteInto('attribute_id IN (?)', $attributes, \Zend_Db::BIGINT_TYPE);
             $where .= $connection->quoteInto(" AND {$entityIdField} = ?", $entityId);
             $connection->delete($backendTable, $where);
         }
@@ -594,7 +595,8 @@ public function getProductsSku(array $productIds)
             ['entity_id', 'sku']
         )->where(
             'entity_id IN (?)',
-            $productIds
+            $productIds,
+            \Zend_Db::BIGINT_TYPE
         );
         return $this->getConnection()->fetchAll($select);
     }
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
index afbe279045a38..5f43adc3ab349 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
@@ -857,7 +857,8 @@ protected function doAddWebsiteNamesToResult()
                 ['name']
             )->where(
                 'product_website.product_id IN (?)',
-                array_keys($productWebsites)
+                array_keys($productWebsites),
+                \Zend_Db::BIGINT_TYPE
             )->where(
                 'website.website_id > ?',
                 0
@@ -1333,7 +1334,7 @@ public function addCountToCategories($categoryCollection)
                 $anchorStmt = clone $select;
                 $anchorStmt->limit();
                 //reset limits
-                $anchorStmt->where('count_table.category_id IN (?)', $isAnchor);
+                $anchorStmt->where('count_table.category_id IN (?)', $isAnchor, \Zend_Db::BIGINT_TYPE);
                 $productCounts += $this->getConnection()->fetchPairs($anchorStmt);
                 $anchorStmt = null;
             }
@@ -1341,7 +1342,7 @@ public function addCountToCategories($categoryCollection)
                 $notAnchorStmt = clone $select;
                 $notAnchorStmt->limit();
                 //reset limits
-                $notAnchorStmt->where('count_table.category_id IN (?)', $isNotAnchor);
+                $notAnchorStmt->where('count_table.category_id IN (?)', $isNotAnchor, \Zend_Db::BIGINT_TYPE);
                 $notAnchorStmt->where('count_table.is_parent = 1');
                 $productCounts += $this->getConnection()->fetchPairs($notAnchorStmt);
                 $notAnchorStmt = null;
@@ -2151,7 +2152,7 @@ public function addCategoryIds()
         $select = $this->getConnection()->select();
 
         $select->from($this->_productCategoryTable, ['product_id', 'category_id']);
-        $select->where('product_id IN (?)', $ids);
+        $select->where('product_id IN (?)', $ids, \Zend_Db::BIGINT_TYPE);
 
         $data = $this->getConnection()->fetchAll($select);
 
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php
index a9741cd8e1ec7..b3caeb80b2da7 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php
@@ -487,7 +487,8 @@ public function getProductImages($product, $storeIds)
             $product->getData($this->metadata->getLinkField())
         )->where(
             'store_id IN (?)',
-            $storeIds
+            $storeIds,
+            \Zend_Db::BIGINT_TYPE
         )->where(
             'attribute_code IN (?)',
             ['small_image', 'thumbnail', 'image']
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 b64cca4ff1b26..fb77a3fad8939 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
@@ -775,7 +775,7 @@ protected function _movePriceDataToIndexTable($entityIds = null)
         $select = $connection->select()->from($table, $columns);
 
         if ($entityIds !== null) {
-            $select->where('entity_id in (?)', count($entityIds) > 0 ? $entityIds : 0);
+            $select->where('entity_id in (?)', count($entityIds) > 0 ? $entityIds : 0, \Zend_Db::BIGINT_TYPE);
         }
 
         $query = $select->insertFromSelect($this->getIdxTable(), [], false);
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/TierPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/TierPrice.php
index a866c1eaa413f..602c2c781443e 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/TierPrice.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/TierPrice.php
@@ -193,7 +193,7 @@ private function getTierPriceSelect(bool $isAllWebsites, bool $isAllCustomerGrou
             []
         );
         if (!empty($entityIds)) {
-            $select->where('entity.entity_id IN (?)', $entityIds);
+            $select->where('entity.entity_id IN (?)', $entityIds, \Zend_Db::BIGINT_TYPE);
         }
         $this->joinWebsites($select, $isAllWebsites);
         $this->joinCustomerGroups($select, $isAllCustomerGroups);
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php
index f1d4552cf37f0..7d702eb76e555 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php
@@ -239,7 +239,7 @@ public function addExcludeProductFilter($products)
                 $products = [$products];
             }
             $this->_hasLinkFilter = true;
-            $this->getSelect()->where('links.linked_product_id NOT IN (?)', $products);
+            $this->getSelect()->where('links.linked_product_id NOT IN (?)', $products, \Zend_Db::BIGINT_TYPE);
         }
         return $this;
     }
@@ -257,7 +257,7 @@ public function addProductFilter($products)
                 $products = [$products];
             }
             $identifierField = $this->getLinkField();
-            $this->getSelect()->where("product_entity_table.$identifierField IN (?)", $products);
+            $this->getSelect()->where("product_entity_table.$identifierField IN (?)", $products, \Zend_Db::BIGINT_TYPE);
             $this->_hasLinkFilter = true;
         }
 
@@ -319,10 +319,10 @@ protected function _joinLinks()
         $linkField = $this->getLinkField();
         if ($this->productIds) {
             if ($this->_isStrongMode) {
-                $this->getSelect()->where('links.product_id in (?)', $this->productIds);
+                $this->getSelect()->where('links.product_id in (?)', $this->productIds, \Zend_Db::BIGINT_TYPE);
             } else {
                 $joinType = 'joinLeft';
-                $joinCondition[] = $connection->quoteInto('links.product_id in (?)', $this->productIds);
+                $joinCondition[] = $connection->quoteInto('links.product_id in (?)', $this->productIds, \Zend_Db::BIGINT_TYPE);
             }
             if (count($this->productIds) === 1) {
                 $this->addFieldToFilter(
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Website.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Website.php
index 771f781678e44..dc5efb83c86c7 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Website.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Website.php
@@ -125,7 +125,8 @@ public function getWebsites($productIds)
             ['product_id', 'website_id']
         )->where(
             'product_id IN (?)',
-            $productIds
+            $productIds,
+            \Zend_Db::BIGINT_TYPE
         );
         $rowset = $this->getConnection()->fetchAll($select);
 
diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/ProductPriceIndexFilter.php b/app/code/Magento/CatalogInventory/Model/Indexer/ProductPriceIndexFilter.php
index 35231b8460b19..514cd2e3e88c5 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/ProductPriceIndexFilter.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/ProductPriceIndexFilter.php
@@ -105,7 +105,7 @@ public function modifyPrice(IndexTableStructure $priceTable, array $entityIds =
         }
 
         if (!empty($entityIds)) {
-            $select->where('stock_item.product_id in (?)', $entityIds);
+            $select->where('stock_item.product_id in (?)', $entityIds, \Zend_Db::BIGINT_TYPE);
         }
 
         $select->group('stock_item.product_id');
diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/CacheCleaner.php b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/CacheCleaner.php
index b3fa07479a712..e38ff58dfe1f6 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/CacheCleaner.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/CacheCleaner.php
@@ -118,7 +118,7 @@ private function getProductStockStatuses(array $productIds)
                 'cpr.parent_id = cpe.' . $linkField,
                 ['parent_id' => 'cpe.entity_id']
             )
-            ->where('product_id IN (?)', $productIds)
+            ->where('product_id IN (?)', $productIds, \Zend_Db::BIGINT_TYPE)
             ->where('stock_id = ?', Stock::DEFAULT_STOCK_ID)
             ->where('website_id = ?', $this->stockConfiguration->getDefaultScopeId());
 
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock.php
index 53f00529b9bcc..bb8ff4ce65bba 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock.php
@@ -127,12 +127,12 @@ public function lockProductsStock(array $productIds, $websiteId)
         $itemTable = $this->getTable('cataloginventory_stock_item');
         $select = $this->getConnection()->select()->from(['si' => $itemTable])
             ->where('website_id = ?', $websiteId)
-            ->where('product_id IN(?)', $productIds)
+            ->where('product_id IN(?)', $productIds, \Zend_Db::BIGINT_TYPE)
             ->forUpdate(true);
 
         $productTable = $this->getTable('catalog_product_entity');
         $selectProducts = $this->getConnection()->select()->from(['p' => $productTable], [])
-            ->where('entity_id IN (?)', $productIds)
+            ->where('entity_id IN (?)', $productIds, \Zend_Db::BIGINT_TYPE)
             ->columns(
                 [
                     'product_id' => 'entity_id',
@@ -147,7 +147,7 @@ public function lockProductsStock(array $productIds, $websiteId)
         foreach ($this->getConnection()->fetchAll($selectProducts) as $p) {
             $items[$p['product_id']]['type_id'] = $p['type_id'];
         }
-        
+
         return $items;
     }
 
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php
index 402ce5f2f611e..6ffa6f4a1169b 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php
@@ -321,7 +321,7 @@ public function getProductStatus($productIds, $storeId = null)
 
         if ($storeId === null || $storeId == \Magento\Store\Model\Store::DEFAULT_STORE_ID) {
             $select = $connection->select()->from($attributeTable, [$linkField, 'value'])
-                ->where("{$linkField} IN (?)", $productIds)
+                ->where("{$linkField} IN (?)", $productIds, \Zend_Db::BIGINT_TYPE)
                 ->where('attribute_id = ?', $attribute->getAttributeId())
                 ->where('store_id = ?', \Magento\Store\Model\Store::DEFAULT_STORE_ID);
 
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/ProductPriceIndexModifier.php b/app/code/Magento/CatalogRule/Model/Indexer/ProductPriceIndexModifier.php
index 404fc32e0c0d4..7f64573587ca0 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/ProductPriceIndexModifier.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/ProductPriceIndexModifier.php
@@ -71,7 +71,7 @@ public function modifyPrice(IndexTableStructure $priceTable, array $entityIds =
             []
         );
         if ($entityIds) {
-            $select->where('i.entity_id IN (?)', $entityIds);
+            $select->where('i.entity_id IN (?)', $entityIds, \Zend_Db::BIGINT_TYPE);
         }
 
         $finalPrice = $priceTable->getFinalPriceField();
diff --git a/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/ConfigurableProductsProvider.php b/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/ConfigurableProductsProvider.php
index dd020114b03ab..d6e8033987ee8 100644
--- a/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/ConfigurableProductsProvider.php
+++ b/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/ConfigurableProductsProvider.php
@@ -40,7 +40,7 @@ public function getIds(array $ids)
                     ->select()
                     ->from(['e' => $this->resource->getTableName('catalog_product_entity')], ['e.entity_id'])
                     ->where('e.type_id = ?', \Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE)
-                    ->where('e.entity_id IN (?)', $ids)
+                    ->where('e.entity_id IN (?)', $ids, \Zend_Db::BIGINT_TYPE)
             );
         }
         return $this->productIds[$key];
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 cd2529a8fd725..9ec48cfa05694 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php
@@ -242,7 +242,7 @@ private function getSelectForSearchableProducts(
         $this->joinAttribute($select, 'status', $storeId, [Status::STATUS_ENABLED]);
 
         if ($productIds !== null) {
-            $select->where('e.entity_id IN (?)', $productIds);
+            $select->where('e.entity_id IN (?)', $productIds, \Zend_Db::BIGINT_TYPE);
         }
         $select->where('e.entity_id > ?', $lastProductId);
         $select->order('e.entity_id');
@@ -323,7 +323,7 @@ public function getSearchableAttributes($backendType = null)
                 'catelogsearch_searchable_attributes_load_after',
                 ['engine' => $this->engine, 'attributes' => $attributes]
             );
-            
+
             $this->eventManager->dispatch(
                 'catalogsearch_searchable_attributes_load_after',
                 ['engine' => $this->engine, 'attributes' => $attributes]
@@ -410,7 +410,8 @@ public function getProductAttributes($storeId, array $productIds, array $attribu
                 [$linkField, 'entity_id']
             )->where(
                 'cpe.entity_id IN (?)',
-                $productIds
+                $productIds,
+                \Zend_Db::BIGINT_TYPE
             )
         );
         foreach ($attributeTypes as $backendType => $attributeIds) {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
index f56a4fe4d1b76..55b9649f26614 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
@@ -324,7 +324,7 @@ protected function getProductIdsFromParents(array $entityIds)
             ->select()
             ->from(['relation' => $this->getTable('catalog_product_relation')], [])
             ->distinct(true)
-            ->where('child_id IN (?)', $entityIds)
+            ->where('child_id IN (?)', $entityIds, \Zend_Db::BIGINT_TYPE)
             ->join(
                 ['cpe' => $this->getTable('catalog_product_entity')],
                 'relation.parent_id = cpe.' . $linkField,
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php
index 0835fb66f876a..da95e9cf3603b 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php
@@ -115,7 +115,8 @@ public function getRelationsByChild($childIds)
                 ['cpe.entity_id']
             )->where(
                 'relation.child_id IN (?)',
-                $childIds
+                $childIds,
+                \Zend_Db::BIGINT_TYPE
             );
 
         return $connection->fetchCol($select);
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php
index e625ccbe51fe3..df4f834006e80 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php
@@ -258,7 +258,8 @@ protected function _getSearchEntityIdsSql($query, $searchOnlyInCurrentStore = tr
                 []
             )->where(
                 't1.attribute_id IN (?)',
-                $attributeIds
+                $attributeIds,
+                \Zend_Db::BIGINT_TYPE
             )->where(
                 't1.store_id = ?',
                 0
@@ -332,7 +333,8 @@ protected function _getSearchInOptionSql($query)
             'd.store_id=0'
         )->where(
             'o.attribute_id IN (?)',
-            $attributeIds
+            $attributeIds,
+            \Zend_Db::BIGINT_TYPE
         )->where(
             $this->_resourceHelper->getCILike($ifValue, $this->_searchQuery, ['position' => 'any'])
         );
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 b7bbf7aa1871c..b60ea1d07b85a 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
@@ -222,7 +222,7 @@ private function fillTemporaryOptionsTable(string $temporaryOptionsTableName, ar
             ['le.entity_id', 'customer_group_id', 'website_id']
         );
         if ($entityIds !== null) {
-            $select->where('le.entity_id IN (?)', $entityIds);
+            $select->where('le.entity_id IN (?)', $entityIds, \Zend_Db::BIGINT_TYPE);
         }
         $query = $select->insertFromSelect($temporaryOptionsTableName);
         $this->getConnection()->query($query);
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable.php
index feffd22a0fb3d..0abfd953e3435 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable.php
@@ -173,7 +173,8 @@ public function getChildrenIds($parentId, $required = true)
             []
         )->where(
             'p.entity_id IN (?)',
-            $parentId
+            $parentId,
+            \Zend_Db::BIGINT_TYPE
         );
 
         $childrenIds = [
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php
index 57f701721a6f3..61ebdc5531b6a 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php
@@ -285,7 +285,8 @@ protected function _loadLabels()
                 ['use_default' => $useDefaultCheck, 'label' => $labelCheck]
             )->where(
                 'def.product_super_attribute_id IN (?)',
-                array_keys($this->_items)
+                array_keys($this->_items),
+                \Zend_Db::BIGINT_TYPE
             )->where(
                 'def.store_id = ?',
                 0
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php
index b76954075bcde..d25423dd6e9d2 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php
@@ -84,7 +84,7 @@ protected function _renderFilters()
             $parentIds[] = $product->getData($metadata->getLinkField());
         }
 
-        $this->getSelect()->where('link_table.parent_id in (?)', $parentIds);
+        $this->getSelect()->where('link_table.parent_id in (?)', $parentIds,\Zend_Db::BIGINT_TYPE);
 
         return $this;
     }
diff --git a/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php b/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
index e50abbc11e54a..8cf21f6108d93 100644
--- a/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
+++ b/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
@@ -1238,10 +1238,12 @@ protected function _getLoadAttributesSelect($table, $attributeIds = [])
                 ['t_d.attribute_id']
             )->where(
                 " e.entity_id IN (?)",
-                array_keys($this->_itemsById)
+                array_keys($this->_itemsById),
+                \Zend_Db::BIGINT_TYPE
             )->where(
                 't_d.attribute_id IN (?)',
-                $attributeIds
+                $attributeIds,
+                \Zend_Db::BIGINT_TYPE
             );
 
         if ($entity->getEntityTable() == \Magento\Eav\Model\Entity::DEFAULT_ENTITY_TABLE && $entity->getTypeId()) {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php
index 9e4ad6fb53a33..84e3092879f5c 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php
@@ -769,7 +769,8 @@ public function getValidAttributeIds($attributeIds)
             ['attribute_id']
         )->where(
             'attribute_id IN (?)',
-            $attributeIds
+            $attributeIds,
+            \Zend_Db::BIGINT_TYPE
         );
 
         return $connection->fetchCol($select);
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php
index 6fce6bd2dc44e..e54f888b0ffab 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php
@@ -221,7 +221,8 @@ public function setInAllAttributeSetsFilter(array $setIds)
                 )
                 ->where(
                     'entity_attribute.attribute_set_id IN (?)',
-                    $setIds
+                    $setIds,
+                    \Zend_Db::BIGINT_TYPE
                 )
                 ->group('entity_attribute.attribute_id')
                 ->having(new \Zend_Db_Expr('COUNT(*)') . ' = ' . count($setIds));
@@ -394,7 +395,8 @@ protected function _addSetInfo()
                     ['group_sort_order' => 'sort_order']
                 )->where(
                     'attribute_id IN (?)',
-                    $attributeIds
+                    $attributeIds,
+                    \Zend_Db::BIGINT_TYPE
                 );
                 $result = $connection->fetchAll($select);
 
diff --git a/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php b/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php
index bf1405fa64122..54eb815fd10a6 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php
@@ -152,7 +152,7 @@ public function execute($entityType, $entityData, $arguments = [])
                         ['value' => 't.value', 'attribute_id' => 't.attribute_id']
                     )
                     ->where($metadata->getLinkField() . ' = ?', $entityData[$metadata->getLinkField()])
-                    ->where('attribute_id IN (?)', $attributeIds);
+                    ->where('attribute_id IN (?)', $attributeIds, \Zend_Db::BIGINT_TYPE);
                 $attributeIdentifiers = [];
                 foreach ($context as $scope) {
                     //TODO: if (in table exists context field)
diff --git a/lib/internal/Magento/Framework/DB/Select.php b/lib/internal/Magento/Framework/DB/Select.php
index ceeed40787123..f7ffece8fa3c0 100644
--- a/lib/internal/Magento/Framework/DB/Select.php
+++ b/lib/internal/Magento/Framework/DB/Select.php
@@ -113,7 +113,7 @@ public function where($cond, $value = null, $type = null)
             $type = null;
         }
         if (is_array($value)) {
-            $cond = $this->getConnection()->quoteInto($cond, $value);
+            $cond = $this->getConnection()->quoteInto($cond, $value, $type);
             $value = null;
         }
         return parent::where($cond, $value, $type);
diff --git a/test.php b/test.php
new file mode 100644
index 0000000000000..cb6a19e52b4ec
--- /dev/null
+++ b/test.php
@@ -0,0 +1,28 @@
+<?php
+use Magento\Framework\App\Bootstrap;
+require __DIR__ . '/app/bootstrap.php';
+
+$bootstrap = Bootstrap::create(BP, $_SERVER);
+$om = $bootstrap->getObjectManager();
+
+$state = $om->get('Magento\Framework\App\State');
+$state->setAreaCode('frontend');
+$pc = $om->get(\Magento\Catalog\Model\ResourceModel\Product\Collection::class)
+    ->setPageSize(10)
+    ->load();
+var_dump($pc);
+
+//
+///** @var \Magento\Eav\Model\Cache\Type $cache */
+//$cache = $om->get(\Magento\Eav\Model\Cache\Type::class);
+//$i = 0;
+//$d = 0;
+//while (true) {
+//    echo '-\\|/'[$i % 4], "\r";
+//    $key = "my_test_data" . $i++;
+//    $cache->save('data',$key , ['tag1', 'tag2' ], 1000);
+//    if ( 'data' !== $cache->load($key)) {
+//        $d ++;
+//       echo ' : Missread is - ' . number_format($d/$i, 2) , "\r";
+//    }
+//}
\ No newline at end of file

From 27e1c6ee41698a5b624fdb937018bde53a248705 Mon Sep 17 00:00:00 2001
From: Andrii Kasian <akasian@magento.com>
Date: Mon, 2 Mar 2020 22:41:52 -0600
Subject: [PATCH 0067/1718] Explicitly define type for in condition

---
 .../Catalog/Model/Indexer/Category/Product/Action/Full.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
index eee347c36910d..71bbc45d77532 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
@@ -282,7 +282,7 @@ private function reindexCategoriesBySelect(Select $basicSelect, $whereCondition,
             $this->connection->delete($this->tableMaintainer->getMainTmpTable((int)$store->getId()));
             $entityIds = $this->connection->fetchCol($query);
             $resultSelect = clone $basicSelect;
-            $resultSelect->where($whereCondition, $entityIds);
+            $resultSelect->where($whereCondition, $entityIds, \Zend_Db::BIGINT_TYPE);
             $this->connection->query(
                 $this->connection->insertFromSelect(
                     $resultSelect,

From 4a22091f79ec0c551f2863f9053ed952b6cf6fcf Mon Sep 17 00:00:00 2001
From: Andrii Kasian <akasian@magento.com>
Date: Mon, 2 Mar 2020 22:47:36 -0600
Subject: [PATCH 0068/1718] Explicitly define type for in condition

---
 .../Catalog/Model/Indexer/Category/Product/AbstractAction.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
index b0aeea3230d70..b9433fda47235 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
@@ -503,7 +503,7 @@ protected function createAnchorSelect(Store $store)
         )->joinInner(
             ['cc2' => $temporaryTreeTable],
             $this->connection->quoteInto(
-                'cc2.parent_id = cc.entity_id AND cc.entity_id NOT IN ()',
+                'cc2.parent_id = cc.entity_id AND cc.entity_id NOT IN (?)',
                 $rootCatIds,
                 \Zend_Db::BIGINT_TYPE
             ),

From a36c9a988c4fca9f9b525477976192000d3ce605 Mon Sep 17 00:00:00 2001
From: Andrii Kasian <akasian@magento.com>
Date: Mon, 2 Mar 2020 22:53:10 -0600
Subject: [PATCH 0069/1718] Explicitly define type for in condition

---
 test.php | 28 ----------------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 test.php

diff --git a/test.php b/test.php
deleted file mode 100644
index cb6a19e52b4ec..0000000000000
--- a/test.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-use Magento\Framework\App\Bootstrap;
-require __DIR__ . '/app/bootstrap.php';
-
-$bootstrap = Bootstrap::create(BP, $_SERVER);
-$om = $bootstrap->getObjectManager();
-
-$state = $om->get('Magento\Framework\App\State');
-$state->setAreaCode('frontend');
-$pc = $om->get(\Magento\Catalog\Model\ResourceModel\Product\Collection::class)
-    ->setPageSize(10)
-    ->load();
-var_dump($pc);
-
-//
-///** @var \Magento\Eav\Model\Cache\Type $cache */
-//$cache = $om->get(\Magento\Eav\Model\Cache\Type::class);
-//$i = 0;
-//$d = 0;
-//while (true) {
-//    echo '-\\|/'[$i % 4], "\r";
-//    $key = "my_test_data" . $i++;
-//    $cache->save('data',$key , ['tag1', 'tag2' ], 1000);
-//    if ( 'data' !== $cache->load($key)) {
-//        $d ++;
-//       echo ' : Missread is - ' . number_format($d/$i, 2) , "\r";
-//    }
-//}
\ No newline at end of file

From 727862d55e477927c9c2801e39fa1042a1abea40 Mon Sep 17 00:00:00 2001
From: Dmytro Voskoboinikov <voskoboi@adobe.com>
Date: Tue, 3 Mar 2020 11:19:24 -0600
Subject: [PATCH 0070/1718] MC-30944: Incorrect flow of saving Newsletter
 templates

---
 .../Magento/Newsletter/Controller/Adminhtml/Template/Save.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php
index ac7371a08571f..dc4d50c22b162 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -10,6 +9,9 @@
 use Magento\Framework\App\TemplateTypesInterface;
 use Magento\Framework\Exception\LocalizedException;
 
+/**
+ * An action that saves a template.
+ */
 class Save extends \Magento\Newsletter\Controller\Adminhtml\Template implements HttpPostActionInterface
 {
     /**

From 421fdc45a71f7c889a9d45b9d704544c95f26d5d Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Tue, 3 Mar 2020 12:16:11 -0600
Subject: [PATCH 0071/1718] MC-31362: Media folder update

- Fixed unit test failures
- Fixed minor invalid logic in filedriver
---
 .../Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php    | 4 +++-
 lib/internal/Magento/Framework/Filesystem/Driver/File.php | 2 +-
 .../Framework/Filesystem/Test/Unit/Driver/FileTest.php    | 8 ++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
index f87eee62e1095..6bdadfa07ff3d 100644
--- a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
@@ -139,7 +139,7 @@ protected function setUp()
 
         $this->directoryMock = $this->createPartialMock(
             \Magento\Framework\Filesystem\Directory\Write::class,
-            ['delete', 'getDriver', 'create', 'getRelativePath', 'isExist', 'isFile']
+            ['delete', 'getDriver', 'create', 'getRelativePath', 'getAbsolutePath', 'isExist', 'isFile']
         );
         $this->directoryMock->expects(
             $this->any()
@@ -283,6 +283,7 @@ public function testGetResizeHeight()
     public function testDeleteDirectoryOverRoot()
     {
         $this->driverMock->expects($this->atLeastOnce())->method('getRealPathSafety')->will($this->returnArgument(0));
+        $this->directoryMock->expects($this->atLeastOnce())->method('getAbsolutePath')->will($this->returnArgument(0));
         $this->imagesStorage->deleteDirectory(self::INVALID_DIRECTORY_OVER_ROOT);
     }
 
@@ -294,6 +295,7 @@ public function testDeleteDirectoryOverRoot()
     public function testDeleteRootDirectory()
     {
         $this->driverMock->expects($this->atLeastOnce())->method('getRealPathSafety')->will($this->returnArgument(0));
+        $this->directoryMock->expects($this->atLeastOnce())->method('getAbsolutePath')->will($this->returnArgument(0));
         $this->imagesStorage->deleteDirectory(self::STORAGE_ROOT_DIR);
     }
 
diff --git a/lib/internal/Magento/Framework/Filesystem/Driver/File.php b/lib/internal/Magento/Framework/Filesystem/Driver/File.php
index e5fa134f6d38a..948ba21226ca5 100644
--- a/lib/internal/Magento/Framework/Filesystem/Driver/File.php
+++ b/lib/internal/Magento/Framework/Filesystem/Driver/File.php
@@ -984,7 +984,7 @@ public function getRealPathSafety($path)
         );
         $pathParts = explode(DIRECTORY_SEPARATOR, $path);
         if (end($pathParts) == '.') {
-            $pathParts[count($pathParts)] = '';
+            $pathParts[count($pathParts) - 1] = '';
         }
         $realPath = [];
         foreach ($pathParts as $pathPart) {
diff --git a/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/FileTest.php b/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/FileTest.php
index 83cb9ea80e1ab..9d00d6210bd70 100644
--- a/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/FileTest.php
+++ b/lib/internal/Magento/Framework/Filesystem/Test/Unit/Driver/FileTest.php
@@ -107,10 +107,14 @@ public function dataProviderForTestGetRealPathSafety(): array
     {
         return [
             ['/1/2/3', '/1/2/3'],
+            ['/1/.test', '/1/.test'],
+            ['/1/..test', '/1/..test'],
+            ['/1/.test/.test', '/1/.test/.test'],
+            ['/1/2/./.', '/1/2/'],
             ['/1/2/3/../..', '/1'],
-            ['/1/2/3/.', '/1/2/3'],
+            ['/1/2/3/.', '/1/2/3/'],
             ['/1/2/3/./4/5', '/1/2/3/4/5'],
-            ['/1/2/3/../4/5', '/1/2/4/5'],
+            ['/1/2/3/../4/5', '/1/2/4/5']
         ];
     }
 }

From 606372927496e210ff2e25f616c14de6f4e17736 Mon Sep 17 00:00:00 2001
From: Dmytro Voskoboinikov <voskoboi@adobe.com>
Date: Wed, 4 Mar 2020 14:55:01 -0600
Subject: [PATCH 0072/1718] MC-30944: Incorrect flow of saving Newsletter
 templates

---
 .../Adminhtml/NewsletterTemplateTest.php           | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterTemplateTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterTemplateTest.php
index ae57703f9e8e2..c19ca5aa6f4d8 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterTemplateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/NewsletterTemplateTest.php
@@ -62,11 +62,19 @@ protected function tearDown()
     public function testSaveActionCreateNewTemplateAndVerifySuccessMessage()
     {
         $this->getRequest()->setParam('id', $this->model->getId());
+        $this->getRequest()->setParam('is_legacy', 1);
+
         $this->dispatch('backend/newsletter/template/save');
+
         /**
          * Check that errors was generated and set to session
          */
         $this->assertSessionMessages($this->isEmpty(), \Magento\Framework\Message\MessageInterface::TYPE_ERROR);
+
+        $this->model->load($this->getRequest()->getPostValue('code'), 'template_code');
+
+        $this->assertEquals(0, $this->model->getIsLegacy());
+
         /**
          * Check that success message is set
          */
@@ -90,6 +98,8 @@ public function testSaveActionEditTemplateAndVerifySuccessMessage()
         $this->assertEquals('some_unique_code', $this->model->getTemplateCode());
 
         $this->getRequest()->setParam('id', $this->model->getId());
+        $this->getRequest()->setParam('is_legacy', 1);
+
         $this->dispatch('backend/newsletter/template/save');
 
         /**
@@ -97,6 +107,10 @@ public function testSaveActionEditTemplateAndVerifySuccessMessage()
          */
         $this->assertSessionMessages($this->isEmpty(), \Magento\Framework\Message\MessageInterface::TYPE_ERROR);
 
+        $this->model->load($this->getRequest()->getPostValue('code'), 'template_code');
+
+        $this->assertEquals(0, $this->model->getIsLegacy());
+
         /**
          * Check that success message is set
          */

From 258d99860973f9caf522542ffc613e79c118874e Mon Sep 17 00:00:00 2001
From: Serhii Voloshkov <serhii.voloshkov@transoftgroup.com>
Date: Thu, 5 Mar 2020 12:27:23 +0200
Subject: [PATCH 0073/1718] MC-31491: Export file controller improvement

---
 .../Adminhtml/Export/File/Delete.php          | 44 +++++++++++++++----
 .../Magento/TestFramework/Application.php     |  1 +
 .../Adminhtml/Export/File/DeleteTest.php      |  4 +-
 .../App/Filesystem/DirectoryList.php          | 10 ++++-
 4 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Delete.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Delete.php
index 1e9d194653c9c..0bcff0899d35d 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Delete.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Delete.php
@@ -13,9 +13,15 @@
 use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\ValidatorException;
 use Magento\ImportExport\Controller\Adminhtml\Export as ExportController;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\DriverInterface;
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\App\Filesystem\DirectoryResolver;
+use Magento\Framework\Filesystem\Directory\WriteFactory;
+use Magento\Backend\Model\View\Result\Redirect;
 
 /**
  * Controller that delete file by name.
@@ -37,26 +43,43 @@ class Delete extends ExportController implements HttpPostActionInterface
      */
     private $file;
 
+    /**
+     * @var DirectoryResolver
+     */
+    private $directoryResolver;
+
+    /**
+     * @var WriteFactory
+     */
+    private $writeFactory;
+
     /**
      * Delete constructor.
+     *
      * @param Action\Context $context
      * @param Filesystem $filesystem
      * @param DriverInterface $file
+     * @param DirectoryResolver $directoryResolver
+     * @param WriteFactory $writeFactory
      */
     public function __construct(
         Action\Context $context,
         Filesystem $filesystem,
-        DriverInterface $file
+        DriverInterface $file,
+        DirectoryResolver $directoryResolver,
+        WriteFactory $writeFactory
     ) {
         $this->filesystem = $filesystem;
         $this->file = $file;
+        $this->directoryResolver = $directoryResolver;
+        $this->writeFactory = $writeFactory;
         parent::__construct($context);
     }
 
     /**
      * Controller basic method implementation.
      *
-     * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface
+     * @return ResponseInterface|ResultInterface
      * @throws LocalizedException
      */
     public function execute()
@@ -65,17 +88,20 @@ public function execute()
             if (empty($fileName = $this->getRequest()->getParam('filename'))) {
                 throw new LocalizedException(__('Please provide export file name'));
             }
-            $directory = $this->filesystem->getDirectoryRead(DirectoryList::VAR_DIR);
-            $path = $directory->getAbsolutePath() . 'export/' . $fileName;
-
-            if (!$directory->isFile($path)) {
+            $directoryWrite = $this->writeFactory->create(
+                $this->filesystem->getDirectoryRead(DirectoryList::VAR_EXPORT)->getAbsolutePath()
+            );
+            try {
+                $directoryWrite->delete($directoryWrite->getAbsolutePath($fileName));
+            } catch (ValidatorException $exception) {
+                throw new LocalizedException(__('Filename has not permitted symbols in it'));
+            } catch (FileSystemException $exception) {
                 throw new LocalizedException(__('Sorry, but the data is invalid or the file is not uploaded.'));
             }
-
-            $this->file->deleteFile($path);
-            /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
+            /** @var Redirect $resultRedirect */
             $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
             $resultRedirect->setPath('adminhtml/export/index');
+
             return $resultRedirect;
         } catch (FileSystemException $exception) {
             throw new LocalizedException(__('There are no export file with such name %1', $fileName));
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Application.php b/dev/tests/integration/framework/Magento/TestFramework/Application.php
index f0ce2e24545eb..62f1101bae847 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Application.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Application.php
@@ -704,6 +704,7 @@ protected function getCustomDirs()
         $customDirs = [
             DirectoryList::CONFIG => [$path => "{$this->installDir}/etc"],
             DirectoryList::VAR_DIR => [$path => $var],
+            DirectoryList::VAR_EXPORT => [$path => "{$var}/export"],
             DirectoryList::MEDIA => [$path => "{$this->installDir}/pub/media"],
             DirectoryList::STATIC_VIEW => [$path => "{$this->installDir}/pub/static"],
             DirectoryList::TMP_MATERIALIZATION_DIR => [$path => "{$var}/view_preprocessed/pub/static"],
diff --git a/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Export/File/DeleteTest.php b/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Export/File/DeleteTest.php
index 6b1463aa1a9df..77caf7a88bbd4 100644
--- a/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Export/File/DeleteTest.php
+++ b/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Export/File/DeleteTest.php
@@ -22,7 +22,7 @@ class DeleteTest extends AbstractBackendController
     /**
      * @var WriteInterface
      */
-    private $varDirectory;
+    protected $varDirectory;
 
     /**
      * @var string
@@ -83,7 +83,7 @@ public function testExecute($file): void
      * @param $destinationFilePath
      * @return void
      */
-    private function copyFile($destinationFilePath): void
+    protected function copyFile($destinationFilePath): void
     {
         //Refers to application root directory
         $rootDirectory = $this->fileSystem->getDirectoryWrite(DirectoryList::ROOT);
diff --git a/lib/internal/Magento/Framework/App/Filesystem/DirectoryList.php b/lib/internal/Magento/Framework/App/Filesystem/DirectoryList.php
index 4b10a503f423c..6caf2c0f88dfa 100644
--- a/lib/internal/Magento/Framework/App/Filesystem/DirectoryList.php
+++ b/lib/internal/Magento/Framework/App/Filesystem/DirectoryList.php
@@ -57,6 +57,11 @@ class DirectoryList extends \Magento\Framework\Filesystem\DirectoryList
      */
     const VAR_DIR = 'var';
 
+    /**
+     * Storage of files which was exported.
+     */
+    const VAR_EXPORT = 'var_export';
+
     /**
      * Temporary files
      */
@@ -136,7 +141,7 @@ class DirectoryList extends \Magento\Framework\Filesystem\DirectoryList
     const GENERATED_METADATA = 'metadata';
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDefaultConfig()
     {
@@ -146,6 +151,7 @@ public static function getDefaultConfig()
             self::CONFIG => [parent::PATH => 'app/etc'],
             self::LIB_INTERNAL => [parent::PATH => 'lib/internal'],
             self::VAR_DIR => [parent::PATH => 'var'],
+            self::VAR_EXPORT => [parent::PATH => 'var/export'],
             self::CACHE => [parent::PATH => 'var/cache'],
             self::LOG => [parent::PATH => 'var/log'],
             self::DI => [parent::PATH => 'generated/metadata'],
@@ -169,7 +175,7 @@ public static function getDefaultConfig()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function __construct($root, array $config = [])
     {

From 1515252083346dc1db63961c22c35aff79b93ea3 Mon Sep 17 00:00:00 2001
From: Andrii Kasian <akasian@magento.com>
Date: Mon, 9 Mar 2020 22:54:24 -0500
Subject: [PATCH 0074/1718] Update
 app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php

Co-Authored-By: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
---
 .../Product/Type/Configurable/Product/Collection.php            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php
index d25423dd6e9d2..c8e761fb5ed22 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php
@@ -84,7 +84,7 @@ protected function _renderFilters()
             $parentIds[] = $product->getData($metadata->getLinkField());
         }
 
-        $this->getSelect()->where('link_table.parent_id in (?)', $parentIds,\Zend_Db::BIGINT_TYPE);
+        $this->getSelect()->where('link_table.parent_id in (?)', $parentIds, \Zend_Db::BIGINT_TYPE);
 
         return $this;
     }

From 8ec11ad2e5797eeeafce815d2fbbbd422277d9b1 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <svizev.igor@gmail.com>
Date: Tue, 10 Mar 2020 10:13:33 +0200
Subject: [PATCH 0075/1718] Store longer X-Forwarded-For header

---
 app/code/Magento/Sales/etc/db_schema.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/etc/db_schema.xml b/app/code/Magento/Sales/etc/db_schema.xml
index ea7c768b0a786..425987fea5773 100644
--- a/app/code/Magento/Sales/etc/db_schema.xml
+++ b/app/code/Magento/Sales/etc/db_schema.xml
@@ -220,7 +220,7 @@
         <column xsi:type="varchar" name="shipping_method" nullable="true" length="120"/>
         <column xsi:type="varchar" name="store_currency_code" nullable="true" length="3" comment="Store Currency Code"/>
         <column xsi:type="varchar" name="store_name" nullable="true" length="255" comment="Store Name"/>
-        <column xsi:type="varchar" name="x_forwarded_for" nullable="true" length="32" comment="X Forwarded For"/>
+        <column xsi:type="varchar" name="x_forwarded_for" nullable="true" length="255" comment="X Forwarded For"/>
         <column xsi:type="text" name="customer_note" nullable="true" comment="Customer Note"/>
         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
                 comment="Created At"/>

From 52d72b8010c9cecb5b8e3d98ec5edc1ddcc65fb4 Mon Sep 17 00:00:00 2001
From: Stas Kozar <stas.kozar@transoftgroup.com>
Date: Tue, 10 Mar 2020 12:26:51 +0200
Subject: [PATCH 0076/1718] MC-32188: Improve validation of secret keys

---
 app/code/Magento/Backend/App/AbstractAction.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Backend/App/AbstractAction.php b/app/code/Magento/Backend/App/AbstractAction.php
index 2f01700bdf51c..c6d6c9fc5f8a8 100644
--- a/app/code/Magento/Backend/App/AbstractAction.php
+++ b/app/code/Magento/Backend/App/AbstractAction.php
@@ -16,6 +16,7 @@
 use Magento\Framework\Data\Form\FormKey\Validator as FormKeyValidator;
 use Magento\Framework\Locale\ResolverInterface;
 use Magento\Framework\View\Element\AbstractBlock;
+use Magento\Framework\Encryption\Helper\Security;
 
 /**
  * Generic backend controller
@@ -386,7 +387,7 @@ protected function _validateSecretKey()
         }
 
         $secretKey = $this->getRequest()->getParam(UrlInterface::SECRET_KEY_PARAM_NAME, null);
-        if (!$secretKey || $secretKey != $this->_backendUrl->getSecretKey()) {
+        if (!$secretKey || !Security::compareStrings($secretKey, $this->_backendUrl->getSecretKey())) {
             return false;
         }
         return true;

From 9dd8b9684cdcaa068d74554dbc360d2ae962abdf Mon Sep 17 00:00:00 2001
From: Serhii Voloshkov <serhii.voloshkov@transoftgroup.com>
Date: Wed, 11 Mar 2020 11:08:39 +0200
Subject: [PATCH 0077/1718] MC-31491: Export file controller improvement

---
 .../Adminhtml/Export/File/Delete.php          | 22 +------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Delete.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Delete.php
index 0bcff0899d35d..e7b0515cbe98e 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Delete.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Delete.php
@@ -16,10 +16,8 @@
 use Magento\Framework\Exception\ValidatorException;
 use Magento\ImportExport\Controller\Adminhtml\Export as ExportController;
 use Magento\Framework\Filesystem;
-use Magento\Framework\Filesystem\DriverInterface;
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Controller\ResultInterface;
-use Magento\Framework\App\Filesystem\DirectoryResolver;
 use Magento\Framework\Filesystem\Directory\WriteFactory;
 use Magento\Backend\Model\View\Result\Redirect;
 
@@ -38,16 +36,6 @@ class Delete extends ExportController implements HttpPostActionInterface
      */
     private $filesystem;
 
-    /**
-     * @var DriverInterface
-     */
-    private $file;
-
-    /**
-     * @var DirectoryResolver
-     */
-    private $directoryResolver;
-
     /**
      * @var WriteFactory
      */
@@ -58,20 +46,14 @@ class Delete extends ExportController implements HttpPostActionInterface
      *
      * @param Action\Context $context
      * @param Filesystem $filesystem
-     * @param DriverInterface $file
-     * @param DirectoryResolver $directoryResolver
      * @param WriteFactory $writeFactory
      */
     public function __construct(
         Action\Context $context,
         Filesystem $filesystem,
-        DriverInterface $file,
-        DirectoryResolver $directoryResolver,
         WriteFactory $writeFactory
     ) {
         $this->filesystem = $filesystem;
-        $this->file = $file;
-        $this->directoryResolver = $directoryResolver;
         $this->writeFactory = $writeFactory;
         parent::__construct($context);
     }
@@ -88,9 +70,7 @@ public function execute()
             if (empty($fileName = $this->getRequest()->getParam('filename'))) {
                 throw new LocalizedException(__('Please provide export file name'));
             }
-            $directoryWrite = $this->writeFactory->create(
-                $this->filesystem->getDirectoryRead(DirectoryList::VAR_EXPORT)->getAbsolutePath()
-            );
+            $directoryWrite = $this->filesystem->getDirectoryWrite(DirectoryList::VAR_EXPORT);
             try {
                 $directoryWrite->delete($directoryWrite->getAbsolutePath($fileName));
             } catch (ValidatorException $exception) {

From 3e2c40110b1b8c4b7c9bb4fb0006440eb33ee8c8 Mon Sep 17 00:00:00 2001
From: Nathan Smith <nathsmit@adobe.com>
Date: Wed, 11 Mar 2020 09:50:43 -0500
Subject: [PATCH 0078/1718] MC-31733: Media gallery breaks in some filesystems

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

diff --git a/app/code/Magento/Theme/Model/Wysiwyg/Storage.php b/app/code/Magento/Theme/Model/Wysiwyg/Storage.php
index a48d34c6df93d..5c38d99dd6a22 100644
--- a/app/code/Magento/Theme/Model/Wysiwyg/Storage.php
+++ b/app/code/Magento/Theme/Model/Wysiwyg/Storage.php
@@ -341,7 +341,10 @@ public function deleteDirectory($path)
     {
         $rootCmp = rtrim($this->_helper->getStorageRoot(), '/');
         $pathCmp = rtrim($path, '/');
-        $absolutePath = $this->filesystemDriver->getRealPathSafety($this->mediaWriteDirectory->getAbsolutePath($path));
+        $absolutePath = rtrim(
+            $this->filesystemDriver->getRealPathSafety($this->mediaWriteDirectory->getAbsolutePath($path)),
+            '/'
+        );
 
         if ($rootCmp == $pathCmp || $rootCmp === $absolutePath) {
             throw new \Magento\Framework\Exception\LocalizedException(

From de530f7be37c64617225ed428c269e34875bda23 Mon Sep 17 00:00:00 2001
From: Baljinder Hayre <bal@wearejh.com>
Date: Thu, 12 Mar 2020 16:33:48 +0000
Subject: [PATCH 0079/1718] #26288  Will now throw an exception when a customer
 does not exist who wants to reset password

---
 .../Customer/Model/ForgotPasswordToken/GetCustomerByToken.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/Model/ForgotPasswordToken/GetCustomerByToken.php b/app/code/Magento/Customer/Model/ForgotPasswordToken/GetCustomerByToken.php
index 09af4e296bd92..368770766f45a 100644
--- a/app/code/Magento/Customer/Model/ForgotPasswordToken/GetCustomerByToken.php
+++ b/app/code/Magento/Customer/Model/ForgotPasswordToken/GetCustomerByToken.php
@@ -73,7 +73,7 @@ public function execute(string $resetPasswordToken):CustomerInterface
         }
         if ($found->getTotalCount() === 0) {
             //Customer with such token not found.
-            new NoSuchEntityException(
+           throw new NoSuchEntityException(
                 new Phrase(
                     'No such entity with rp_token = %value',
                     [

From f44add27fbdd5e41023dc7994d13962d84eba69b Mon Sep 17 00:00:00 2001
From: Baljinder Hayre <bal@wearejh.com>
Date: Thu, 12 Mar 2020 16:33:48 +0000
Subject: [PATCH 0080/1718] #26288 Throw an exception when a customer does not
 exist requests password reset

---
 .../Customer/Model/ForgotPasswordToken/GetCustomerByToken.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/Model/ForgotPasswordToken/GetCustomerByToken.php b/app/code/Magento/Customer/Model/ForgotPasswordToken/GetCustomerByToken.php
index 09af4e296bd92..211a71d827f7e 100644
--- a/app/code/Magento/Customer/Model/ForgotPasswordToken/GetCustomerByToken.php
+++ b/app/code/Magento/Customer/Model/ForgotPasswordToken/GetCustomerByToken.php
@@ -73,7 +73,7 @@ public function execute(string $resetPasswordToken):CustomerInterface
         }
         if ($found->getTotalCount() === 0) {
             //Customer with such token not found.
-            new NoSuchEntityException(
+            throw new NoSuchEntityException(
                 new Phrase(
                     'No such entity with rp_token = %value',
                     [

From bad241b24aad62b3844c76cf1517f2c74a765a9c Mon Sep 17 00:00:00 2001
From: Aditya Yadav <adityayadav@cedcommerce.com>
Date: Fri, 13 Mar 2020 21:27:57 +0530
Subject: [PATCH 0081/1718] Add supporting change for same name integration
 test

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

diff --git a/app/code/Magento/Integration/Test/Mftf/Test/AdminCreateIntegrationEntityWithDuplicatedNameTest.xml b/app/code/Magento/Integration/Test/Mftf/Test/AdminCreateIntegrationEntityWithDuplicatedNameTest.xml
index b23436d474ed8..16be7a7f0b982 100644
--- a/app/code/Magento/Integration/Test/Mftf/Test/AdminCreateIntegrationEntityWithDuplicatedNameTest.xml
+++ b/app/code/Magento/Integration/Test/Mftf/Test/AdminCreateIntegrationEntityWithDuplicatedNameTest.xml
@@ -46,5 +46,6 @@
             <argument name="message" value="The integration with name &quot;Integration1&quot; exists."/>
             <argument value="error" name="messageType"/>
         </actionGroup>
+        <seeInField stepKey="checkEnteredValueIsPreserved" selector="{{AdminNewIntegrationSection.name}}" userInput="Integration1"/>
     </test>
 </tests>

From 4f1c2a75706fa5219b6bd8c31838315329c45e25 Mon Sep 17 00:00:00 2001
From: Serhii Voloshkov <serhii.voloshkov@transoftgroup.com>
Date: Mon, 16 Mar 2020 13:07:51 +0200
Subject: [PATCH 0082/1718] MC-31491: Export file controller improvement

---
 .../ImportExport/Controller/Adminhtml/Export/File/Delete.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Delete.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Delete.php
index e7b0515cbe98e..9c4cfc0df0af5 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Delete.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Delete.php
@@ -74,7 +74,7 @@ public function execute()
             try {
                 $directoryWrite->delete($directoryWrite->getAbsolutePath($fileName));
             } catch (ValidatorException $exception) {
-                throw new LocalizedException(__('Filename has not permitted symbols in it'));
+                throw new LocalizedException(__('Sorry, but the data is invalid or the file is not uploaded.'));
             } catch (FileSystemException $exception) {
                 throw new LocalizedException(__('Sorry, but the data is invalid or the file is not uploaded.'));
             }

From aa59c0b82a9bc23338e11dbaae4f9ec576e5d4e1 Mon Sep 17 00:00:00 2001
From: Aditya Yadav <adityayadav@cedcommerce.com>
Date: Mon, 16 Mar 2020 17:09:40 +0530
Subject: [PATCH 0083/1718] Update
 AdminCreateIntegrationEntityWithDuplicatedNameTest.xml

---
 .../AdminCreateIntegrationEntityWithDuplicatedNameTest.xml    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Integration/Test/Mftf/Test/AdminCreateIntegrationEntityWithDuplicatedNameTest.xml b/app/code/Magento/Integration/Test/Mftf/Test/AdminCreateIntegrationEntityWithDuplicatedNameTest.xml
index 16be7a7f0b982..fe5cb9ab34398 100644
--- a/app/code/Magento/Integration/Test/Mftf/Test/AdminCreateIntegrationEntityWithDuplicatedNameTest.xml
+++ b/app/code/Magento/Integration/Test/Mftf/Test/AdminCreateIntegrationEntityWithDuplicatedNameTest.xml
@@ -46,6 +46,8 @@
             <argument name="message" value="The integration with name &quot;Integration1&quot; exists."/>
             <argument value="error" name="messageType"/>
         </actionGroup>
-        <seeInField stepKey="checkEnteredValueIsPreserved" selector="{{AdminNewIntegrationSection.name}}" userInput="Integration1"/>
+        <actionGroup ref="AssertAdminIntegrationNameInFormActionGroup" stepKey="submitTheFormWithDuplicatedName">
+            <seeInField stepKey="checkEnteredValueIsPreserved" selector="{{AdminNewIntegrationSection.name}}" userInput="Integration1"/>
+        </actionGroup>
     </test>
 </tests>

From 3343d815c472354e44de9280d845e4917bbd5d0e Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Wed, 18 Mar 2020 12:57:53 +0200
Subject: [PATCH 0084/1718] Static properties serialization fix - update.

---
 dev/tests/integration/etc/di/preferences/ce.php                 | 2 --
 .../TestFramework/Workaround/Cleanup/StaticProperties.php       | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/dev/tests/integration/etc/di/preferences/ce.php b/dev/tests/integration/etc/di/preferences/ce.php
index 2546866ceeaf5..2770283637dc7 100644
--- a/dev/tests/integration/etc/di/preferences/ce.php
+++ b/dev/tests/integration/etc/di/preferences/ce.php
@@ -16,8 +16,6 @@
     \Magento\Framework\App\Response\Http::class => \Magento\TestFramework\Response::class,
     \Magento\Framework\Interception\PluginListInterface::class =>
         \Magento\TestFramework\Interception\PluginList::class,
-    \Magento\Framework\Serialize\SerializerInterface::class =>
-        \Magento\TestFramework\Serialize\Serializer::class,
     \Magento\Framework\Interception\ObjectManager\ConfigInterface::class =>
         \Magento\TestFramework\ObjectManager\Config::class,
     \Magento\Framework\Interception\ObjectManager\Config\Developer::class =>
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php b/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
index c5ecee34feb2e..d4b7f1b04f68e 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
@@ -168,7 +168,7 @@ public static function backupStaticVariables()
 
         $objectManager = Bootstrap::getInstance()->getObjectManager();
         $cache = $objectManager->get(CacheInterface::class);
-        $serializer = $objectManager->get(SerializerInterface::class);
+        $serializer = $objectManager->get(\Magento\TestFramework\Serialize\Serializer::class);
         $cachedProperties = $cache->load(self::CACHE_NAME);
 
         if ($cachedProperties) {

From baa17d79f94f4375a31c593ec757e8c7be2a70c6 Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Thu, 19 Mar 2020 02:40:12 +0200
Subject: [PATCH 0085/1718] =?UTF-8?q?magento/magento2#:=20GraphQl.=20Remov?=
 =?UTF-8?q?e=20a=20redundant=20logic=20in=20=E2=80=9CSetShippingMethodsOnC?=
 =?UTF-8?q?art=E2=80=9D=20mutation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../QuoteGraphQl/Model/Cart/SetShippingMethodsOnCart.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCart.php
index b2526bdc04e98..654a4bb558632 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingMethodsOnCart.php
@@ -42,12 +42,12 @@ public function execute(ContextInterface $context, CartInterface $cart, array $s
         }
         $shippingMethodInput = current($shippingMethodsInput);
 
-        if (!isset($shippingMethodInput['carrier_code']) || empty($shippingMethodInput['carrier_code'])) {
+        if (empty($shippingMethodInput['carrier_code'])) {
             throw new GraphQlInputException(__('Required parameter "carrier_code" is missing.'));
         }
         $carrierCode = $shippingMethodInput['carrier_code'];
 
-        if (!isset($shippingMethodInput['method_code']) || empty($shippingMethodInput['method_code'])) {
+        if (empty($shippingMethodInput['method_code'])) {
             throw new GraphQlInputException(__('Required parameter "method_code" is missing.'));
         }
         $methodCode = $shippingMethodInput['method_code'];

From f4d3015cefe1423e5cb5d8f39a6feddc451bcadd Mon Sep 17 00:00:00 2001
From: Andrii Kasian <akasian@magento.com>
Date: Fri, 20 Mar 2020 13:39:09 -0500
Subject: [PATCH 0086/1718] Speedup bin/magento

---
 .../Model/ConfigOptionsListCollectorTest.php  | 20 +++++---
 .../Framework/Module/DependencyChecker.php    | 51 ++++++++-----------
 .../Test/Unit/DependencyCheckerTest.php       | 18 ++-----
 .../Model/ConfigOptionsListCollector.php      | 27 +++++-----
 4 files changed, 53 insertions(+), 63 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Setup/Model/ConfigOptionsListCollectorTest.php b/dev/tests/integration/testsuite/Magento/Setup/Model/ConfigOptionsListCollectorTest.php
index 455d6436f724d..0d2a9e8eaacbc 100644
--- a/dev/tests/integration/testsuite/Magento/Setup/Model/ConfigOptionsListCollectorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Setup/Model/ConfigOptionsListCollectorTest.php
@@ -5,6 +5,10 @@
  */
 namespace Magento\Setup\Model;
 
+use Magento\Framework\Component\ComponentRegistrarInterface;
+use Magento\Setup\Validator\DbValidator;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
 class ConfigOptionsListCollectorTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -14,7 +18,7 @@ class ConfigOptionsListCollectorTest extends \PHPUnit\Framework\TestCase
 
     public function setUp()
     {
-        $this->objectManagerProvider = $this->createMock(\Magento\Setup\Model\ObjectManagerProvider::class);
+        $this->objectManagerProvider = $this->createMock(ObjectManagerProvider::class);
         $this->objectManagerProvider
             ->expects($this->any())
             ->method('get')
@@ -24,11 +28,13 @@ public function setUp()
     public function testCollectOptionsLists()
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $fullModuleListMock = $this->createMock(\Magento\Framework\Module\FullModuleList::class);
-        $fullModuleListMock->expects($this->once())->method('getNames')->willReturn(['Magento_Backend']);
+        $componentRegistrar = $this->createMock(ComponentRegistrarInterface::class);
+        $componentRegistrar->expects($this->once())
+            ->method('getPaths')
+            ->willReturn(['Magento_Backend'=>'app/code/Magento/Backend']);
 
-        $dbValidator = $this->createMock(\Magento\Setup\Validator\DbValidator::class);
-        $configGenerator = $this->createMock(\Magento\Setup\Model\ConfigGenerator::class);
+        $dbValidator = $this->createMock(DbValidator::class);
+        $configGenerator = $this->createMock(ConfigGenerator::class);
 
         $setupOptions = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->create(
@@ -39,7 +45,7 @@ public function testCollectOptionsLists()
                 ]
             );
 
-        $serviceLocator = $this->getMockForAbstractClass(\Zend\ServiceManager\ServiceLocatorInterface::class);
+        $serviceLocator = $this->getMockForAbstractClass(ServiceLocatorInterface::class);
 
         $serviceLocator->expects($this->once())
             ->method('get')
@@ -51,7 +57,7 @@ public function testCollectOptionsLists()
             \Magento\Setup\Model\ConfigOptionsListCollector::class,
             [
                 'objectManagerProvider' => $this->objectManagerProvider,
-                'fullModuleList' => $fullModuleListMock,
+                'componentRegistrar' => $componentRegistrar,
                 'serviceLocator' => $serviceLocator
             ]
         );
diff --git a/lib/internal/Magento/Framework/Module/DependencyChecker.php b/lib/internal/Magento/Framework/Module/DependencyChecker.php
index 5855c5cf4143e..bfdda2e10501f 100644
--- a/lib/internal/Magento/Framework/Module/DependencyChecker.php
+++ b/lib/internal/Magento/Framework/Module/DependencyChecker.php
@@ -13,43 +13,31 @@
 class DependencyChecker
 {
     /**
-     * Enabled module list from configuration
-     *
-     * @var array
-     */
-    private $enabledModuleList;
-
-    /**
-     * The full module list information from filesystem
-     *
-     * @var array
+     * @var PackageInfo
      */
-    private $fullModuleList;
+    protected $packageInfo;
 
     /**
-     * Graph
-     *
-     * @var Graph
+     * @var ModuleList
      */
-    private $graph;
-
+    private $list;
     /**
-     * @var PackageInfo
+     * @var ModuleList\Loader
      */
-    protected $packageInfo;
+    private $loader;
 
     /**
      * Constructor
      *
      * @param ModuleList $list
      * @param ModuleList\Loader $loader
-     * @param PackageInfoFactory $packageInfoFactory
+     * @param PackageInfo $packageInfo
      */
-    public function __construct(ModuleList $list, ModuleList\Loader $loader, PackageInfoFactory $packageInfoFactory)
+    public function __construct(ModuleList $list, ModuleList\Loader $loader, PackageInfo $packageInfo)
     {
-        $this->enabledModuleList = $list->getNames();
-        $this->fullModuleList = $loader->load();
-        $this->packageInfo = $packageInfoFactory->create();
+        $this->list = $list;
+        $this->loader = $loader;
+        $this->packageInfo = $packageInfo;
     }
 
     /**
@@ -61,7 +49,7 @@ public function __construct(ModuleList $list, ModuleList\Loader $loader, Package
      */
     public function checkDependenciesWhenDisableModules($toBeDisabledModules, $currentlyEnabledModules = null)
     {
-        $masterList = isset($currentlyEnabledModules) ? $currentlyEnabledModules : $this->enabledModuleList;
+        $masterList = $currentlyEnabledModules ?? $this->list->getNames();
         // assume disable succeeds: currently enabled modules - to-be-disabled modules
         $enabledModules = array_diff($masterList, $toBeDisabledModules);
         return $this->checkDependencyGraph(false, $toBeDisabledModules, $enabledModules);
@@ -76,7 +64,7 @@ public function checkDependenciesWhenDisableModules($toBeDisabledModules, $curre
      */
     public function checkDependenciesWhenEnableModules($toBeEnabledModules, $currentlyEnabledModules = null)
     {
-        $masterList = isset($currentlyEnabledModules) ? $currentlyEnabledModules : $this->enabledModuleList;
+        $masterList = $currentlyEnabledModules ?? $this->list->getNames();
         // assume enable succeeds: union of currently enabled modules and to-be-enabled modules
         $enabledModules = array_unique(array_merge($masterList, $toBeEnabledModules));
         return $this->checkDependencyGraph(true, $toBeEnabledModules, $enabledModules);
@@ -89,17 +77,19 @@ public function checkDependenciesWhenEnableModules($toBeEnabledModules, $current
      * @param string[] $moduleNames list of modules to be enabled/disabled
      * @param string[] $enabledModules list of enabled modules assuming enable/disable succeeds
      * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     private function checkDependencyGraph($isEnable, $moduleNames, $enabledModules)
     {
-        $this->graph = $this->createGraph();
+        $fullModuleList = $this->loader->load();
+        $graph = $this->createGraph($fullModuleList);
         $dependenciesMissingAll = [];
         $graphMode = $isEnable ? Graph::DIRECTIONAL : Graph::INVERSE;
         foreach ($moduleNames as $moduleName) {
             $dependenciesMissing = [];
-            $paths = $this->graph->findPathsToReachableNodes($moduleName, $graphMode);
+            $paths = $graph->findPathsToReachableNodes($moduleName, $graphMode);
             $modules = array_merge(
-                array_keys($this->fullModuleList),
+                array_keys($fullModuleList),
                 $this->packageInfo->getNonExistingDependencies()
             );
             foreach ($modules as $module) {
@@ -119,15 +109,16 @@ private function checkDependencyGraph($isEnable, $moduleNames, $enabledModules)
     /**
      * Create the dependency graph
      *
+     * @param array $fullModuleList
      * @return Graph
      */
-    private function createGraph()
+    private function createGraph($fullModuleList)
     {
         $nodes = [];
         $dependencies = [];
 
         // build the graph data
-        foreach (array_keys($this->fullModuleList) as $moduleName) {
+        foreach (array_keys($fullModuleList) as $moduleName) {
             $nodes[] = $moduleName;
             foreach ($this->packageInfo->getRequire($moduleName) as $dependModuleName) {
                 if ($dependModuleName) {
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/DependencyCheckerTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/DependencyCheckerTest.php
index ced028c0ef47b..ff37cd99e489c 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/DependencyCheckerTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/DependencyCheckerTest.php
@@ -19,11 +19,6 @@ class DependencyCheckerTest extends \PHPUnit\Framework\TestCase
      */
     private $packageInfoMock;
 
-    /**
-     * @var \Magento\Framework\Module\PackageInfoFactory|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $packageInfoFactoryMock;
-
     /**
      * @var \Magento\Framework\Module\ModuleList|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -49,10 +44,7 @@ protected function setUp()
             ->method('getRequire')
             ->will($this->returnValueMap($requireMap));
 
-        $this->packageInfoFactoryMock = $this->createMock(\Magento\Framework\Module\PackageInfoFactory::class);
-        $this->packageInfoFactoryMock->expects($this->once())
-            ->method('create')
-            ->will($this->returnValue($this->packageInfoMock));
+
 
         $this->listMock = $this->createMock(\Magento\Framework\Module\ModuleList::class);
         $this->loaderMock = $this->createMock(\Magento\Framework\Module\ModuleList\Loader::class);
@@ -70,7 +62,7 @@ public function testCheckDependenciesWhenDisableModules()
         $this->packageInfoMock->expects($this->atLeastOnce())
             ->method('getNonExistingDependencies')
             ->willReturn([]);
-        $this->checker = new DependencyChecker($this->listMock, $this->loaderMock, $this->packageInfoFactoryMock);
+        $this->checker = new DependencyChecker($this->listMock, $this->loaderMock, $this->packageInfoMock);
 
         $actual = $this->checker->checkDependenciesWhenDisableModules(['B', 'D']);
         $expected = ['B' => ['A' => ['A', 'B']], 'D' => ['A' => ['A', 'B', 'D']]];
@@ -82,7 +74,7 @@ public function testCheckDependenciesWhenDisableModulesWithCurEnabledModules()
         $this->packageInfoMock->expects($this->atLeastOnce())
             ->method('getNonExistingDependencies')
             ->willReturn([]);
-        $this->checker = new DependencyChecker($this->listMock, $this->loaderMock, $this->packageInfoFactoryMock);
+        $this->checker = new DependencyChecker($this->listMock, $this->loaderMock, $this->packageInfoMock);
 
         $actual = $this->checker->checkDependenciesWhenDisableModules(['B', 'D'], ['C', 'D', 'E']);
         $expected = ['B' => [], 'D' => []];
@@ -97,7 +89,7 @@ public function testCheckDependenciesWhenEnableModules()
         $this->packageInfoMock->expects($this->atLeastOnce())
             ->method('getNonExistingDependencies')
             ->willReturn([]);
-        $this->checker = new DependencyChecker($this->listMock, $this->loaderMock, $this->packageInfoFactoryMock);
+        $this->checker = new DependencyChecker($this->listMock, $this->loaderMock, $this->packageInfoMock);
         $actual = $this->checker->checkDependenciesWhenEnableModules(['B', 'D']);
         $expected = [
             'B' => ['A' => ['B', 'D', 'A'], 'E' => ['B', 'E']],
@@ -111,7 +103,7 @@ public function testCheckDependenciesWhenEnableModulesWithCurEnabledModules()
         $this->packageInfoMock->expects($this->atLeastOnce())
             ->method('getNonExistingDependencies')
             ->willReturn([]);
-        $this->checker = new DependencyChecker($this->listMock, $this->loaderMock, $this->packageInfoFactoryMock);
+        $this->checker = new DependencyChecker($this->listMock, $this->loaderMock, $this->packageInfoMock);
         $actual = $this->checker->checkDependenciesWhenEnableModules(['B', 'D'], ['C']);
         $expected = [
             'B' => ['A' => ['B', 'D', 'A'], 'E' => ['B', 'E']],
diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsListCollector.php b/setup/src/Magento/Setup/Model/ConfigOptionsListCollector.php
index cd2442c215bb3..a7aa46c7dd12b 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsListCollector.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsListCollector.php
@@ -6,8 +6,9 @@
 namespace Magento\Setup\Model;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Component\ComponentRegistrarInterface;
 use Magento\Framework\Filesystem;
-use Magento\Framework\Module\FullModuleList;
 use Magento\Framework\Setup\ConfigOptionsListInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
 
@@ -30,13 +31,6 @@ class ConfigOptionsListCollector
      */
     private $filesystem;
 
-    /**
-     * Module list including enabled and disabled modules
-     *
-     * @var FullModuleList
-     */
-    private $fullModuleList;
-
     /**
      * Object manager provider
      *
@@ -51,27 +45,34 @@ class ConfigOptionsListCollector
      */
     private $serviceLocator;
 
+    /**
+     * Component list
+     *
+     * @var ComponentRegistrarInterface
+     */
+    private $componentRegistrar;
+
     /**
      * Constructor
      *
      * @param DirectoryList $directoryList
      * @param Filesystem $filesystem
-     * @param FullModuleList $fullModuleList
+     * @param ComponentRegistrarInterface $componentRegistrar
      * @param ObjectManagerProvider $objectManagerProvider
      * @param ServiceLocatorInterface $serviceLocator
      */
     public function __construct(
         DirectoryList $directoryList,
         Filesystem $filesystem,
-        FullModuleList $fullModuleList,
+        ComponentRegistrarInterface $componentRegistrar,
         ObjectManagerProvider $objectManagerProvider,
         ServiceLocatorInterface $serviceLocator
     ) {
         $this->directoryList = $directoryList;
         $this->filesystem = $filesystem;
-        $this->fullModuleList = $fullModuleList;
         $this->objectManagerProvider = $objectManagerProvider;
         $this->serviceLocator = $serviceLocator;
+        $this->componentRegistrar = $componentRegistrar;
     }
 
     /**
@@ -84,8 +85,8 @@ public function collectOptionsLists()
     {
         $optionsList = [];
 
-        // go through modules
-        foreach ($this->fullModuleList->getNames() as $moduleName) {
+        $modulePaths = $this->componentRegistrar->getPaths(ComponentRegistrar::MODULE);
+        foreach ($modulePaths as $moduleName => $modulePath) {
             $optionsClassName = str_replace('_', '\\', $moduleName) . '\Setup\ConfigOptionsList';
             if (class_exists($optionsClassName)) {
                 $optionsClass = $this->objectManagerProvider->get()->create($optionsClassName);

From 7bc112b8a8567ac9ef3014a62adf01f31e6b1a8f Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Fri, 20 Mar 2020 14:04:41 -0500
Subject: [PATCH 0087/1718] MC-29566: [2.4.x] Deprecate SID query
 parameter-related methods

---
 .../Magento/Catalog/Model/Template/Filter.php | 10 +++-
 .../Magento/Cms/Model/Template/Filter.php     | 19 ------
 .../Magento/Email/Model/Template/Filter.php   |  7 ++-
 .../Model/StoreSwitcher/CleanTargetUrl.php    | 25 ++------
 .../Framework/Session/SessionManagerTest.php  | 16 -----
 .../testsuite/Magento/Framework/UrlTest.php   |  7 ---
 .../Magento/Store/Model/StoreSwitcherTest.php |  2 +-
 .../Framework/Session/SessionManager.php      |  8 +--
 .../Magento/Framework/Session/SidResolver.php | 58 ++++++-------------
 .../Session/SidResolverInterface.php          |  6 ++
 .../Magento/Framework/Test/Unit/UrlTest.php   | 27 ---------
 lib/internal/Magento/Framework/Url.php        |  8 ++-
 .../Magento/Framework/UrlInterface.php        | 11 +---
 13 files changed, 55 insertions(+), 149 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Template/Filter.php b/app/code/Magento/Catalog/Model/Template/Filter.php
index 8cd61415b958a..0a46af3ef021d 100644
--- a/app/code/Magento/Catalog/Model/Template/Filter.php
+++ b/app/code/Magento/Catalog/Model/Template/Filter.php
@@ -14,8 +14,6 @@
 
 /**
  * Work with catalog(store, website) urls
- *
- * @package Magento\Catalog\Model\Template
  */
 class Filter extends \Magento\Framework\Filter\Template
 {
@@ -30,6 +28,7 @@ class Filter extends \Magento\Framework\Filter\Template
      * Whether to allow SID in store directive: NO
      *
      * @var bool
+     * @deprecated SID query parameter is not used in URLs anymore.
      */
     protected $_useSessionInUrl = false;
 
@@ -81,10 +80,14 @@ public function setUseAbsoluteLinks($flag)
      *
      * @param bool $flag
      * @return $this
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @deprecated SID query parameter is not used in URLs anymore.
      */
     public function setUseSessionInUrl($flag)
     {
-        $this->_useSessionInUrl = $flag;
+        // phpcs:disable Magento2.Functions.DiscouragedFunction
+        trigger_error('Session ID is not used as URL parameter anymore.', E_USER_DEPRECATED);
+
         return $this;
     }
 
@@ -126,6 +129,7 @@ public function viewDirective($construction)
      */
     public function mediaDirective($construction)
     {
+        // phpcs:disable Magento2.Functions.DiscouragedFunction
         $params = $this->getParameters(html_entity_decode($construction[2], ENT_QUOTES));
         return $this->_storeManager->getStore()
                 ->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA) . $params['url'];
diff --git a/app/code/Magento/Cms/Model/Template/Filter.php b/app/code/Magento/Cms/Model/Template/Filter.php
index a22daab950149..66bca1052b797 100644
--- a/app/code/Magento/Cms/Model/Template/Filter.php
+++ b/app/code/Magento/Cms/Model/Template/Filter.php
@@ -10,25 +10,6 @@
  */
 class Filter extends \Magento\Email\Model\Template\Filter
 {
-    /**
-     * Whether to allow SID in store directive: AUTO
-     *
-     * @var bool
-     */
-    protected $_useSessionInUrl;
-
-    /**
-     * Setter whether SID is allowed in store directive
-     *
-     * @param bool $flag
-     * @return $this
-     */
-    public function setUseSessionInUrl($flag)
-    {
-        $this->_useSessionInUrl = (bool)$flag;
-        return $this;
-    }
-
     /**
      * Retrieve media file URL directive
      *
diff --git a/app/code/Magento/Email/Model/Template/Filter.php b/app/code/Magento/Email/Model/Template/Filter.php
index 5bb2c42144508..cd075a5115ff0 100644
--- a/app/code/Magento/Email/Model/Template/Filter.php
+++ b/app/code/Magento/Email/Model/Template/Filter.php
@@ -45,6 +45,7 @@ class Filter extends \Magento\Framework\Filter\Template
      * Whether to allow SID in store directive: NO
      *
      * @var bool
+     * @deprecated SID is not being used as query parameter anymore.
      */
     protected $_useSessionInUrl = false;
 
@@ -264,10 +265,14 @@ public function setUseAbsoluteLinks($flag)
      *
      * @param bool $flag
      * @return $this
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @deprecated SID query parameter is not used in URLs anymore.
      */
     public function setUseSessionInUrl($flag)
     {
-        $this->_useSessionInUrl = $flag;
+        // phpcs:disable Magento2.Functions.DiscouragedFunction
+        trigger_error('Session ID is not used as URL parameter anymore.', E_USER_DEPRECATED);
+
         return $this;
     }
 
diff --git a/app/code/Magento/Store/Model/StoreSwitcher/CleanTargetUrl.php b/app/code/Magento/Store/Model/StoreSwitcher/CleanTargetUrl.php
index 3328a21e8f5e1..c907ab14c0137 100644
--- a/app/code/Magento/Store/Model/StoreSwitcher/CleanTargetUrl.php
+++ b/app/code/Magento/Store/Model/StoreSwitcher/CleanTargetUrl.php
@@ -14,6 +14,8 @@
 
 /**
  * Remove SID, from_store, store from target url.
+ *
+ * Used in store-switching process in HTML frontend.
  */
 class CleanTargetUrl implements StoreSwitcherInterface
 {
@@ -22,42 +24,27 @@ class CleanTargetUrl implements StoreSwitcherInterface
      */
     private $urlHelper;
 
-    /**
-     * @var \Magento\Framework\Session\Generic
-     */
-    private $session;
-
-    /**
-     * @var \Magento\Framework\Session\SidResolverInterface
-     */
-    private $sidResolver;
-
     /**
      * @param UrlHelper $urlHelper
-     * @param \Magento\Framework\Session\Generic $session
-     * @param \Magento\Framework\Session\SidResolverInterface $sidResolver
      */
     public function __construct(
-        UrlHelper $urlHelper,
-        \Magento\Framework\Session\Generic $session,
-        \Magento\Framework\Session\SidResolverInterface $sidResolver
+        UrlHelper $urlHelper
     ) {
         $this->urlHelper = $urlHelper;
-        $this->session = $session;
-        $this->sidResolver = $sidResolver;
     }
 
     /**
+     * Generate target URL to switch stores through other mechanism then via URL params.
+     *
      * @param StoreInterface $fromStore store where we came from
      * @param StoreInterface $targetStore store where to go to
      * @param string $redirectUrl original url requested for redirect after switching
      * @return string redirect url
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function switch(StoreInterface $fromStore, StoreInterface $targetStore, string $redirectUrl): string
     {
         $targetUrl = $redirectUrl;
-        $sidName = $this->sidResolver->getSessionIdQueryParam($this->session);
-        $targetUrl = $this->urlHelper->removeRequestParam($targetUrl, $sidName);
         $targetUrl = $this->urlHelper->removeRequestParam($targetUrl, '___from_store');
         $targetUrl = $this->urlHelper->removeRequestParam($targetUrl, StoreResolverInterface::PARAM_NAME);
 
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php
index 482a3c9cbd619..6ce5f0cf39c29 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php
@@ -225,22 +225,6 @@ public function testSetSessionId()
             $this->assertEquals('test', $this->model->getSessionId());
         }
 
-        /**
-         * @magentoConfigFixture current_store web/session/use_frontend_sid 1
-         */
-        public function testSetSessionIdFromParam()
-        {
-            $this->initializeModel();
-            $this->appState->expects($this->any())
-                ->method('getAreaCode')
-                ->willReturn(\Magento\Framework\App\Area::AREA_FRONTEND);
-            $currentId = $this->model->getSessionId();
-            $this->assertNotEquals('test_id', $this->model->getSessionId());
-            $this->request->getQuery()->set(SidResolverInterface::SESSION_ID_QUERY_PARAM, 'test-id');
-            $this->model->setSessionId($this->sidResolver->getSid($this->model));
-            $this->assertEquals($currentId, $this->model->getSessionId());
-        }
-
         public function testGetSessionIdForHost()
         {
             $this->initializeModel();
diff --git a/dev/tests/integration/testsuite/Magento/Framework/UrlTest.php b/dev/tests/integration/testsuite/Magento/Framework/UrlTest.php
index 081857348d7da..f30fd205c6012 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/UrlTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/UrlTest.php
@@ -23,13 +23,6 @@ protected function setUp()
         $this->model = Bootstrap::getObjectManager()->create(\Magento\Framework\Url::class);
     }
 
-    public function testSetGetUseSession()
-    {
-        $this->assertFalse((bool)$this->model->getUseSession());
-        $this->model->setUseSession(false);
-        $this->assertFalse($this->model->getUseSession());
-    }
-
     public function testSetRouteFrontName()
     {
         $value = 'route';
diff --git a/dev/tests/integration/testsuite/Magento/Store/Model/StoreSwitcherTest.php b/dev/tests/integration/testsuite/Magento/Store/Model/StoreSwitcherTest.php
index 0e4d129d17aa6..abf133afa9078 100644
--- a/dev/tests/integration/testsuite/Magento/Store/Model/StoreSwitcherTest.php
+++ b/dev/tests/integration/testsuite/Magento/Store/Model/StoreSwitcherTest.php
@@ -42,7 +42,7 @@ protected function setUp()
      */
     public function testSwitch(): void
     {
-        $redirectUrl = "http://domain.com/?SID=e5h3e086dce3ckkqt9ia7avl27&___store=fixture_second_store";
+        $redirectUrl = "http://domain.com/?___store=fixture_second_store";
         $expectedUrl = "http://domain.com/";
         $fromStoreCode = 'test';
         /** @var \Magento\Store\Api\StoreRepositoryInterface $storeRepository */
diff --git a/lib/internal/Magento/Framework/Session/SessionManager.php b/lib/internal/Magento/Framework/Session/SessionManager.php
index b96925facf528..7e43a9f2d99c0 100644
--- a/lib/internal/Magento/Framework/Session/SessionManager.php
+++ b/lib/internal/Magento/Framework/Session/SessionManager.php
@@ -10,7 +10,8 @@
 use Magento\Framework\Session\Config\ConfigInterface;
 
 /**
- * Session Manager
+ * Standard session management.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
@@ -200,9 +201,6 @@ public function start()
                     session_commit();
                     session_id($_SESSION['new_session_id']);
                 }
-                $sid = $this->sidResolver->getSid($this);
-                // potential custom logic for session id (ex. switching between hosts)
-                $this->setSessionId($sid);
                 session_start();
                 if (isset($_SESSION['destroyed'])
                     && $_SESSION['destroyed'] < time() - $this->sessionConfig->getCookieLifetime()
@@ -211,7 +209,7 @@ public function start()
                 }
 
                 $this->validator->validate($this);
-                $this->renewCookie($sid);
+                $this->renewCookie(null);
 
                 register_shutdown_function([$this, 'writeClose']);
 
diff --git a/lib/internal/Magento/Framework/Session/SidResolver.php b/lib/internal/Magento/Framework/Session/SidResolver.php
index fd7af781981a9..3455ccf5cab2d 100644
--- a/lib/internal/Magento/Framework/Session/SidResolver.php
+++ b/lib/internal/Magento/Framework/Session/SidResolver.php
@@ -56,7 +56,7 @@ class SidResolver implements SidResolverInterface
      * @var bool|null
      * @see \Magento\Framework\UrlInterface
      */
-    protected $_useSessionInUrl;
+    protected $_useSessionInUrl = false;
 
     /**
      * @var string
@@ -88,26 +88,21 @@ public function __construct(
     }
 
     /**
-     * Get Sid
-     *
-     * @param SessionManagerInterface $session
-     * @return string|null
-     * @throws \Magento\Framework\Exception\LocalizedException
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @inheritDoc
      */
     public function getSid(SessionManagerInterface $session)
     {
+        trigger_error('Session ID is not used as URL parameter anymore.', E_USER_DEPRECATED);
+
         return null;
     }
 
     /**
-     * Get session id query param
-     *
-     * @param SessionManagerInterface $session
-     * @return string
+     * @inheritDoc
      */
     public function getSessionIdQueryParam(SessionManagerInterface $session)
     {
+        trigger_error('Session ID is not used as URL parameter anymore.', E_USER_DEPRECATED);
         $sessionName = $session->getName();
         if ($sessionName && isset($this->sidNameMap[$sessionName])) {
             return $this->sidNameMap[$sessionName];
@@ -116,57 +111,42 @@ public function getSessionIdQueryParam(SessionManagerInterface $session)
     }
 
     /**
-     * Set use session var instead of SID for URL
-     *
-     * @param bool $var
-     * @return $this
+     * @inheritDoc
      */
     public function setUseSessionVar($var)
     {
-        $this->_useSessionVar = (bool)$var;
+        trigger_error('Session ID is not used as URL parameter anymore.', E_USER_DEPRECATED);
+
         return $this;
     }
 
     /**
-     * Retrieve use flag session var instead of SID for URL
-     *
-     * @return bool
-     * @SuppressWarnings(PHPMD.BooleanGetMethodName)
+     * @inheritDoc
      */
     public function getUseSessionVar()
     {
-        return $this->_useSessionVar;
+        trigger_error('Session ID is not used as URL parameter anymore.', E_USER_DEPRECATED);
+
+        return false;
     }
 
     /**
-     * Set Use session in URL flag
-     *
-     * @param bool $flag
-     * @return $this
+     * @inheritDoc
      */
     public function setUseSessionInUrl($flag = true)
     {
-        $this->_useSessionInUrl = (bool)$flag;
+        trigger_error('Session ID is not used as URL parameter anymore.', E_USER_DEPRECATED);
+
         return $this;
     }
 
     /**
-     * Retrieve use session in URL flag.
-     *
-     * @return bool
-     * @SuppressWarnings(PHPMD.BooleanGetMethodName)
+     * @inheritDoc
      */
     public function getUseSessionInUrl()
     {
-        if ($this->_useSessionInUrl === null) {
-            //Using config value by default, can be overridden by using the
-            //setter.
-            $this->_useSessionInUrl = $this->scopeConfig->isSetFlag(
-                self::XML_PATH_USE_FRONTEND_SID,
-                $this->_scopeType
-            );
-        }
+        trigger_error('Session ID is not used as URL parameter anymore.', E_USER_DEPRECATED);
 
-        return $this->_useSessionInUrl;
+        return false;
     }
 }
diff --git a/lib/internal/Magento/Framework/Session/SidResolverInterface.php b/lib/internal/Magento/Framework/Session/SidResolverInterface.php
index 6f242c1c9e308..3c30921e7bce3 100644
--- a/lib/internal/Magento/Framework/Session/SidResolverInterface.php
+++ b/lib/internal/Magento/Framework/Session/SidResolverInterface.php
@@ -10,6 +10,7 @@
 /**
  * Interface \Magento\Framework\Session\SidResolverInterface
  *
+ * @deprecated 2.3.3 SIDs in URLs are no longer used
  */
 interface SidResolverInterface
 {
@@ -23,6 +24,7 @@ interface SidResolverInterface
      *
      * @param \Magento\Framework\Session\SessionManagerInterface $session
      * @return string|null
+     * @deprecated SID query parameter is not used in URLs anymore.
      */
     public function getSid(\Magento\Framework\Session\SessionManagerInterface $session);
 
@@ -31,6 +33,7 @@ public function getSid(\Magento\Framework\Session\SessionManagerInterface $sessi
      *
      * @param \Magento\Framework\Session\SessionManagerInterface $session
      * @return string
+     * @deprecated SID query parameter is not used in URLs anymore.
      */
     public function getSessionIdQueryParam(\Magento\Framework\Session\SessionManagerInterface $session);
 
@@ -39,6 +42,7 @@ public function getSessionIdQueryParam(\Magento\Framework\Session\SessionManager
      *
      * @param bool $var
      * @return $this
+     * @deprecated SID query parameter is not used in URLs anymore.
      */
     public function setUseSessionVar($var);
 
@@ -55,6 +59,7 @@ public function getUseSessionVar();
      *
      * @param bool $flag
      * @return $this
+     * @deprecated SID query parameter is not used in URLs anymore.
      */
     public function setUseSessionInUrl($flag = true);
 
@@ -62,6 +67,7 @@ public function setUseSessionInUrl($flag = true);
      * Retrieve use session in URL flag
      *
      * @return bool
+     * @deprecated SID query parameter is not used in URLs anymore.
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
      */
     public function getUseSessionInUrl();
diff --git a/lib/internal/Magento/Framework/Test/Unit/UrlTest.php b/lib/internal/Magento/Framework/Test/Unit/UrlTest.php
index ee39b612852b9..8e95e4e7bbfea 100644
--- a/lib/internal/Magento/Framework/Test/Unit/UrlTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/UrlTest.php
@@ -175,17 +175,6 @@ public function getCurrentUrlProvider()
         ];
     }
 
-    public function testGetUseSession()
-    {
-        $model = $this->getUrlModel();
-
-        $model->setUseSession(false);
-        $this->assertFalse((bool)$model->getUseSession());
-
-        $model->setUseSession(true);
-        $this->assertFalse($model->getUseSession());
-    }
-
     public function testGetBaseUrlNotLinkType()
     {
         $model = $this->getUrlModel(
@@ -532,22 +521,6 @@ public function testGetRouteUrlWithValidUrl()
         $this->assertEquals('http://example.com', $model->getRouteUrl('http://example.com'));
     }
 
-    public function testAddSessionParam()
-    {
-        $model = $this->getUrlModel([
-            'session' => $this->sessionMock,
-            'sidResolver' => $this->sidResolverMock,
-            'queryParamsResolver' => $this->queryParamsResolverMock,
-        ]);
-
-        $this->sidResolverMock->expects($this->never())->method('getSessionIdQueryParam')->with($this->sessionMock)
-            ->will($this->returnValue('sid'));
-        $this->sessionMock->expects($this->never())->method('getSessionId')->will($this->returnValue('session-id'));
-        $this->queryParamsResolverMock->expects($this->never())->method('setQueryParam')->with('sid', 'session-id');
-
-        $model->addSessionParam();
-    }
-
     /**
      * @param bool $result
      * @param string $referrer
diff --git a/lib/internal/Magento/Framework/Url.php b/lib/internal/Magento/Framework/Url.php
index a2318f1169715..f7ac3e21ba99e 100644
--- a/lib/internal/Magento/Framework/Url.php
+++ b/lib/internal/Magento/Framework/Url.php
@@ -292,6 +292,8 @@ public function setUseSession($useSession)
      */
     public function getUseSession()
     {
+        trigger_error('Session ID is not used as URL parameter anymore.', E_USER_DEPRECATED);
+
         return false;
     }
 
@@ -754,12 +756,12 @@ public function getRouteUrl($routePath = null, $routeParams = null)
     }
 
     /**
-     * Add session param
-     *
-     * @return \Magento\Framework\UrlInterface
+     * @inheritDoc
      */
     public function addSessionParam()
     {
+        trigger_error('Session ID is not used as URL parameter anymore.', E_USER_DEPRECATED);
+
         return $this;
     }
 
diff --git a/lib/internal/Magento/Framework/UrlInterface.php b/lib/internal/Magento/Framework/UrlInterface.php
index 59806e14eb7c9..c1fbbfc8407d3 100644
--- a/lib/internal/Magento/Framework/UrlInterface.php
+++ b/lib/internal/Magento/Framework/UrlInterface.php
@@ -28,19 +28,10 @@ interface UrlInterface
      */
     const DEFAULT_URL_TYPE = 'link';
 
-    /**
-     * Default controller name
-     */
     const DEFAULT_CONTROLLER_NAME = 'index';
 
-    /**
-     * Default action name
-     */
     const DEFAULT_ACTION_NAME = 'index';
 
-    /**
-     * Rewrite request path alias
-     */
     const REWRITE_REQUEST_PATH_ALIAS = 'rewrite_request_path';
 
     /**
@@ -52,6 +43,7 @@ interface UrlInterface
      * Retrieve use session rule
      *
      * @return bool
+     * @deprecated SID is not being passed in URLs anymore.
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
      */
     public function getUseSession();
@@ -84,6 +76,7 @@ public function getRouteUrl($routePath = null, $routeParams = null);
      * Add session param
      *
      * @return \Magento\Framework\UrlInterface
+     * @deprecated SID is not being passed in URLs anymore.
      */
     public function addSessionParam();
 

From e1b6729489b4356fc37c84ac1f1c5cfd7763bfb4 Mon Sep 17 00:00:00 2001
From: Andrii Kasian <akasian@magento.com>
Date: Fri, 20 Mar 2020 15:18:02 -0500
Subject: [PATCH 0088/1718] Fix errors found by static test

---
 .../Framework/Module/DependencyChecker.php    | 19 +++++++++++--------
 .../Test/Unit/DependencyCheckerTest.php       |  2 --
 .../Model/ConfigOptionsListCollector.php      |  3 ++-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/lib/internal/Magento/Framework/Module/DependencyChecker.php b/lib/internal/Magento/Framework/Module/DependencyChecker.php
index bfdda2e10501f..a36af333f8b1f 100644
--- a/lib/internal/Magento/Framework/Module/DependencyChecker.php
+++ b/lib/internal/Magento/Framework/Module/DependencyChecker.php
@@ -15,12 +15,13 @@ class DependencyChecker
     /**
      * @var PackageInfo
      */
-    protected $packageInfo;
+    private $packageInfo;
 
     /**
      * @var ModuleList
      */
     private $list;
+
     /**
      * @var ModuleList\Loader
      */
@@ -46,6 +47,7 @@ public function __construct(ModuleList $list, ModuleList\Loader $loader, Package
      * @param string[] $toBeDisabledModules
      * @param string[] $currentlyEnabledModules
      * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function checkDependenciesWhenDisableModules($toBeDisabledModules, $currentlyEnabledModules = null)
     {
@@ -61,8 +63,9 @@ public function checkDependenciesWhenDisableModules($toBeDisabledModules, $curre
      * @param string[] $toBeEnabledModules
      * @param string[] $currentlyEnabledModules
      * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
-    public function checkDependenciesWhenEnableModules($toBeEnabledModules, $currentlyEnabledModules = null)
+    public function checkDependenciesWhenEnableModules(array $toBeEnabledModules, array $currentlyEnabledModules = null)
     {
         $masterList = $currentlyEnabledModules ?? $this->list->getNames();
         // assume enable succeeds: union of currently enabled modules and to-be-enabled modules
@@ -79,19 +82,19 @@ public function checkDependenciesWhenEnableModules($toBeEnabledModules, $current
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    private function checkDependencyGraph($isEnable, $moduleNames, $enabledModules)
+    private function checkDependencyGraph(bool $isEnable, array $moduleNames, array $enabledModules)
     {
         $fullModuleList = $this->loader->load();
         $graph = $this->createGraph($fullModuleList);
         $dependenciesMissingAll = [];
         $graphMode = $isEnable ? Graph::DIRECTIONAL : Graph::INVERSE;
+        $modules = array_merge(
+            array_keys($fullModuleList),
+            $this->packageInfo->getNonExistingDependencies()
+        );
         foreach ($moduleNames as $moduleName) {
             $dependenciesMissing = [];
             $paths = $graph->findPathsToReachableNodes($moduleName, $graphMode);
-            $modules = array_merge(
-                array_keys($fullModuleList),
-                $this->packageInfo->getNonExistingDependencies()
-            );
             foreach ($modules as $module) {
                 if (isset($paths[$module])) {
                     if ($isEnable && !in_array($module, $enabledModules)) {
@@ -112,7 +115,7 @@ private function checkDependencyGraph($isEnable, $moduleNames, $enabledModules)
      * @param array $fullModuleList
      * @return Graph
      */
-    private function createGraph($fullModuleList)
+    private function createGraph(array $fullModuleList): Graph
     {
         $nodes = [];
         $dependencies = [];
diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/DependencyCheckerTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/DependencyCheckerTest.php
index ff37cd99e489c..e78c846a3382e 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/DependencyCheckerTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/DependencyCheckerTest.php
@@ -44,8 +44,6 @@ protected function setUp()
             ->method('getRequire')
             ->will($this->returnValueMap($requireMap));
 
-
-
         $this->listMock = $this->createMock(\Magento\Framework\Module\ModuleList::class);
         $this->loaderMock = $this->createMock(\Magento\Framework\Module\ModuleList\Loader::class);
         $this->loaderMock
diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsListCollector.php b/setup/src/Magento/Setup/Model/ConfigOptionsListCollector.php
index a7aa46c7dd12b..d84357d9d3eb9 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsListCollector.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsListCollector.php
@@ -77,6 +77,7 @@ public function __construct(
 
     /**
      * Auto discover ConfigOptionsList class and collect them.
+     *
      * These classes should reside in <module>/Setup directories.
      *
      * @return \Magento\Framework\Setup\ConfigOptionsListInterface[]
@@ -86,7 +87,7 @@ public function collectOptionsLists()
         $optionsList = [];
 
         $modulePaths = $this->componentRegistrar->getPaths(ComponentRegistrar::MODULE);
-        foreach ($modulePaths as $moduleName => $modulePath) {
+        foreach (array_keys($modulePaths) as $moduleName) {
             $optionsClassName = str_replace('_', '\\', $moduleName) . '\Setup\ConfigOptionsList';
             if (class_exists($optionsClassName)) {
                 $optionsClass = $this->objectManagerProvider->get()->create($optionsClassName);

From 8f08efe13dfc83c5e7f5ee5c504ff3fd0781410f Mon Sep 17 00:00:00 2001
From: bradleybrecher <bbrecher@somethingdigital.com>
Date: Sat, 21 Mar 2020 21:09:54 -0400
Subject: [PATCH 0089/1718] Add aria-atomic to messages appearing on storefront

---
 app/code/Magento/Theme/view/frontend/templates/messages.phtml | 4 ++--
 app/code/Magento/Ui/view/frontend/web/template/messages.html  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Theme/view/frontend/templates/messages.phtml b/app/code/Magento/Theme/view/frontend/templates/messages.phtml
index dd9b81ecb38b9..e9fc4c65ec9e9 100644
--- a/app/code/Magento/Theme/view/frontend/templates/messages.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/messages.phtml
@@ -6,7 +6,7 @@
 ?>
 <div data-bind="scope: 'messages'">
     <!-- ko if: cookieMessages && cookieMessages.length > 0 -->
-    <div role="alert" data-bind="foreach: { data: cookieMessages, as: 'message' }" class="messages">
+    <div aria-atomic="true" role="alert" data-bind="foreach: { data: cookieMessages, as: 'message' }" class="messages">
         <div data-bind="attr: {
             class: 'message-' + message.type + ' ' + message.type + ' message',
             'data-ui-id': 'message-' + message.type
@@ -16,7 +16,7 @@
     </div>
     <!-- /ko -->
     <!-- ko if: messages().messages && messages().messages.length > 0 -->
-    <div role="alert" data-bind="foreach: { data: messages().messages, as: 'message' }" class="messages">
+    <div aria-atomic="true" role="alert" data-bind="foreach: { data: messages().messages, as: 'message' }" class="messages">
         <div data-bind="attr: {
             class: 'message-' + message.type + ' ' + message.type + ' message',
             'data-ui-id': 'message-' + message.type
diff --git a/app/code/Magento/Ui/view/frontend/web/template/messages.html b/app/code/Magento/Ui/view/frontend/web/template/messages.html
index 0a8f672765b3c..c094d9d58bb75 100644
--- a/app/code/Magento/Ui/view/frontend/web/template/messages.html
+++ b/app/code/Magento/Ui/view/frontend/web/template/messages.html
@@ -6,12 +6,12 @@
 -->
 <div data-role="checkout-messages" class="messages" data-bind="visible: isVisible(), click: removeAll">
     <!-- ko foreach: messageContainer.getErrorMessages() -->
-    <div role="alert" class="message message-error error">
+    <div aria-atomic="true" role="alert" class="message message-error error">
         <div data-ui-id="checkout-cart-validationmessages-message-error" data-bind="text: $data"></div>
     </div>
     <!--/ko-->
     <!-- ko foreach: messageContainer.getSuccessMessages() -->
-    <div role="alert" class="message message-success success">
+    <div aria-atomic="true" role="alert" class="message message-success success">
         <div data-ui-id="checkout-cart-validationmessages-message-success" data-bind="text: $data"></div>
     </div>
     <!--/ko-->

From 9ace0175dcb2d4d363c050f9a5fc0c1f7f670d5b Mon Sep 17 00:00:00 2001
From: Sachin Admane <sadmane@adobe.com>
Date: Mon, 23 Mar 2020 12:09:30 -0500
Subject: [PATCH 0090/1718] MC-22963: Identify and Refactor GET requests which
 modify data.

Fix unit test and static errors.
---
 .../templates/checkout/addresses.phtml         | 18 +++++++++---------
 .../Listing/Column/SynonymActionsTest.php      |  3 ++-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml
index 375a42793c2a5..e941ecf63255b 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml
@@ -4,8 +4,8 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Files.LineLength
-
+// phpcs:disable Generic.Files.LineLength
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundHelper
 ?>
 <?php
 /**
@@ -43,8 +43,8 @@
             </tr>
             </thead>
             <tbody>
-            <?php foreach ($block->getItems() as $_index => $_item) : ?>
-                <?php if ($_item->getQuoteItem()) : ?>
+            <?php foreach ($block->getItems() as $_index => $_item): ?>
+                <?php if ($_item->getQuoteItem()): ?>
                     <tr>
                         <td class="col product" data-th="<?= $block->escapeHtml(__('Product')) ?>">
                             <?= $block->getItemHtml($_item->getQuoteItem()) ?>
@@ -69,11 +69,11 @@
                             </div>
                         </td>
                         <td class="col address" data-th="<?= $block->escapeHtml(__('Send To')) ?>">
-                            <?php if ($_item->getProduct()->getIsVirtual()) : ?>
+                            <?php if ($_item->getProduct()->getIsVirtual()): ?>
                                 <div class="applicable">
                                     <?= $block->escapeHtml(__('A shipping selection is not applicable.')) ?>
                                 </div>
-                            <?php else : ?>
+                            <?php else: ?>
                                 <div class="field address">
                                     <label for="ship_<?= $block->escapeHtml($_index) ?>_<?= $block->escapeHtml($_item->getQuoteItemId()) ?>_address"
                                            class="label">
@@ -89,9 +89,9 @@
                             <a href="#"
                                title="<?= $block->escapeHtml(__('Remove Item')) ?>"
                                data-post='<?= /* @noEscape */
-                               $this->helper(\Magento\Framework\Data\Helper\PostHelper::class)
+                                $this->helper(\Magento\Framework\Data\Helper\PostHelper::class)
                                    ->getPostData($block->getItemDeleteUrl($_item))
-                               ?>'
+                                ?>'
                                class="action delete"
                                data-multiship-item-remove="">
                                 <span><?= $block->escapeHtml(__('Remove item')) ?></span>
@@ -110,7 +110,7 @@
                     class="action primary continue<?= $block->isContinueDisabled() ? ' disabled' : '' ?>"
                     data-role="can-continue"
                     data-flag="1"
-                <?php if ($block->isContinueDisabled()) : ?>
+                <?php if ($block->isContinueDisabled()): ?>
                     disabled="disabled"
                 <?php endif; ?>>
                 <span><?= $block->escapeHtml(__('Go to Shipping Information')) ?></span>
diff --git a/app/code/Magento/Search/Test/Unit/Ui/Component/Listing/Column/SynonymActionsTest.php b/app/code/Magento/Search/Test/Unit/Ui/Component/Listing/Column/SynonymActionsTest.php
index d5563ec1cb289..99a8c2f838cda 100644
--- a/app/code/Magento/Search/Test/Unit/Ui/Component/Listing/Column/SynonymActionsTest.php
+++ b/app/code/Magento/Search/Test/Unit/Ui/Component/Listing/Column/SynonymActionsTest.php
@@ -112,7 +112,8 @@ public function testPrepareDataSourceWithItems()
                                         self::STUB_SYNONYM_GROUP_ID
                                     )
                                 ],
-                                '__disableTmpl' => true
+                                '__disableTmpl' => true,
+                                'post' => true
                             ],
                             'edit' => [
                                 'href' => sprintf(

From 7fadc75c5695242ff91c56e2c80fb4217150c9a6 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Mon, 23 Mar 2020 15:56:53 -0500
Subject: [PATCH 0091/1718] MC-24063: [2.4.x Port] Implement CSP

---
 .../Csp/Model/Collector/CspWhitelistXml/Converter.php     | 1 -
 .../Magento/TestModuleCspConfig/etc/csp_whitelist.xml     | 1 +
 .../Csp/Model/Collector/CspWhitelistXmlCollectorTest.php  | 8 +++++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Csp/Model/Collector/CspWhitelistXml/Converter.php b/app/code/Magento/Csp/Model/Collector/CspWhitelistXml/Converter.php
index ab1ee8bb0befe..e0b3af9f9ed81 100644
--- a/app/code/Magento/Csp/Model/Collector/CspWhitelistXml/Converter.php
+++ b/app/code/Magento/Csp/Model/Collector/CspWhitelistXml/Converter.php
@@ -43,7 +43,6 @@ public function convert($source)
                 }
             }
             $policyConfig[$id]['hosts'] = array_unique($policyConfig[$id]['hosts']);
-            $policyConfig[$id]['hashes'] = array_unique($policyConfig[$id]['hashes']);
         }
 
         return $policyConfig;
diff --git a/dev/tests/integration/_files/Magento/TestModuleCspConfig/etc/csp_whitelist.xml b/dev/tests/integration/_files/Magento/TestModuleCspConfig/etc/csp_whitelist.xml
index e9eb1fe21aa4f..7c5d66427aecb 100644
--- a/dev/tests/integration/_files/Magento/TestModuleCspConfig/etc/csp_whitelist.xml
+++ b/dev/tests/integration/_files/Magento/TestModuleCspConfig/etc/csp_whitelist.xml
@@ -11,6 +11,7 @@
             <values>
                 <value id="mage-base" type="host">https://magento.com</value>
                 <value id="hash" type="hash" algorithm="sha256">B2yPHKaXnvFWtRChIbabYmUBFZdVfKKXHbWtWidDVF8=</value>
+                <value id="hash2" type="hash" algorithm="sha256">B2yPHKaXnvFWtRChIbabYmUBFZdVfKKXHbWtWidDVF9=</value>
             </values>
         </policy>
         <policy id="media-src">
diff --git a/dev/tests/integration/testsuite/Magento/Csp/Model/Collector/CspWhitelistXmlCollectorTest.php b/dev/tests/integration/testsuite/Magento/Csp/Model/Collector/CspWhitelistXmlCollectorTest.php
index bbaabba9dd268..1c13766c6bec4 100644
--- a/dev/tests/integration/testsuite/Magento/Csp/Model/Collector/CspWhitelistXmlCollectorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Csp/Model/Collector/CspWhitelistXmlCollectorTest.php
@@ -53,7 +53,13 @@ public function testCollecting(): void
             if ($policy->getId() === 'object-src') {
                 $this->assertInstanceOf(FetchPolicy::class, $policy);
                 $this->assertEquals(['http://magento.com', 'https://devdocs.magento.com'], $policy->getHostSources());
-                $this->assertEquals(['B2yPHKaXnvFWtRChIbabYmUBFZdVfKKXHbWtWidDVF8=' => 'sha256'], $policy->getHashes());
+                $this->assertEquals(
+                    [
+                        'B2yPHKaXnvFWtRChIbabYmUBFZdVfKKXHbWtWidDVF8=' => 'sha256',
+                        'B2yPHKaXnvFWtRChIbabYmUBFZdVfKKXHbWtWidDVF9=' => 'sha256'
+                    ],
+                    $policy->getHashes()
+                );
                 $objectSrcChecked = true;
             } elseif ($policy->getId() === 'media-src') {
                 $this->assertInstanceOf(FetchPolicy::class, $policy);

From 1b15e46974e28ca8f14ce9ee6f4f64908c8e9562 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Mon, 23 Mar 2020 16:03:33 -0500
Subject: [PATCH 0092/1718] MC-24063: [2.4.x Port] Implement CSP

---
 .../Csp/Api/CspAwareActionInterface.php       |  27 ++
 .../Magento/Csp/Api/InlineUtilInterface.php   |  40 +++
 app/code/Magento/Csp/Helper/InlineUtil.php    | 212 ++++++++++++++
 .../Model/Collector/ControllerCollector.php   |  45 +++
 .../Csp/Model/Collector/DynamicCollector.php  |  41 +++
 .../Csp/Model/CompositePolicyCollector.php    |  44 +--
 .../Csp/Plugin/CspAwareControllerPlugin.php   |  49 ++++
 .../Csp/Plugin/TemplateRenderingPlugin.php    |  48 ++++
 app/code/Magento/Csp/etc/di.xml               |  13 +-
 .../Controller/Csp/Aware.php                  |  54 ++++
 .../Controller/Csp/Helper.php                 |  26 ++
 .../Magento/TestModuleCspUtil/composer.json   |  21 ++
 .../TestModuleCspUtil/etc/csp_whitelist.xml   |  16 ++
 .../TestModuleCspUtil/etc/frontend/routes.xml |  14 +
 .../Magento/TestModuleCspUtil/etc/module.xml  |  10 +
 .../TestModuleCspUtil/registration.php        |  12 +
 .../frontend/layout/csputil_csp_aware.xml     |  17 ++
 .../frontend/layout/csputil_csp_helper.xml    |  17 ++
 .../view/frontend/templates/helper.phtml      |  12 +
 .../Magento/Csp/CspAwareActionTest.php        |  45 +++
 .../testsuite/Magento/Csp/CspUtilTest.php     |  39 +++
 .../Magento/Csp/Helper/InlineUtilTest.php     | 260 ++++++++++++++++++
 .../Collector/ControllerCollectorTest.php     |  85 ++++++
 23 files changed, 1124 insertions(+), 23 deletions(-)
 create mode 100644 app/code/Magento/Csp/Api/CspAwareActionInterface.php
 create mode 100644 app/code/Magento/Csp/Api/InlineUtilInterface.php
 create mode 100644 app/code/Magento/Csp/Helper/InlineUtil.php
 create mode 100644 app/code/Magento/Csp/Model/Collector/ControllerCollector.php
 create mode 100644 app/code/Magento/Csp/Model/Collector/DynamicCollector.php
 create mode 100644 app/code/Magento/Csp/Plugin/CspAwareControllerPlugin.php
 create mode 100644 app/code/Magento/Csp/Plugin/TemplateRenderingPlugin.php
 create mode 100644 dev/tests/integration/_files/Magento/TestModuleCspUtil/Controller/Csp/Aware.php
 create mode 100644 dev/tests/integration/_files/Magento/TestModuleCspUtil/Controller/Csp/Helper.php
 create mode 100644 dev/tests/integration/_files/Magento/TestModuleCspUtil/composer.json
 create mode 100644 dev/tests/integration/_files/Magento/TestModuleCspUtil/etc/csp_whitelist.xml
 create mode 100644 dev/tests/integration/_files/Magento/TestModuleCspUtil/etc/frontend/routes.xml
 create mode 100644 dev/tests/integration/_files/Magento/TestModuleCspUtil/etc/module.xml
 create mode 100644 dev/tests/integration/_files/Magento/TestModuleCspUtil/registration.php
 create mode 100644 dev/tests/integration/_files/Magento/TestModuleCspUtil/view/frontend/layout/csputil_csp_aware.xml
 create mode 100644 dev/tests/integration/_files/Magento/TestModuleCspUtil/view/frontend/layout/csputil_csp_helper.xml
 create mode 100644 dev/tests/integration/_files/Magento/TestModuleCspUtil/view/frontend/templates/helper.phtml
 create mode 100644 dev/tests/integration/testsuite/Magento/Csp/CspAwareActionTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Csp/CspUtilTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Csp/Helper/InlineUtilTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Csp/Model/Collector/ControllerCollectorTest.php

diff --git a/app/code/Magento/Csp/Api/CspAwareActionInterface.php b/app/code/Magento/Csp/Api/CspAwareActionInterface.php
new file mode 100644
index 0000000000000..f4d58dd2bf55a
--- /dev/null
+++ b/app/code/Magento/Csp/Api/CspAwareActionInterface.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Api;
+
+use Magento\Framework\App\ActionInterface;
+
+/**
+ * Interface for controllers that can provide route-specific CSPs.
+ */
+interface CspAwareActionInterface extends ActionInterface
+{
+    /**
+     * Return CSPs that will be applied to current route (page).
+     *
+     * The array returned will be used as is so if you need to keep policies that have been already applied they need
+     * to be included in the resulting array.
+     *
+     * @param \Magento\Csp\Api\Data\PolicyInterface[] $appliedPolicies
+     * @return \Magento\Csp\Api\Data\PolicyInterface[]
+     */
+    public function modifyCsp(array $appliedPolicies): array;
+}
diff --git a/app/code/Magento/Csp/Api/InlineUtilInterface.php b/app/code/Magento/Csp/Api/InlineUtilInterface.php
new file mode 100644
index 0000000000000..dac2adbfd2270
--- /dev/null
+++ b/app/code/Magento/Csp/Api/InlineUtilInterface.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Api;
+
+use Magento\Csp\Api\Data\PolicyInterface;
+
+/**
+ * Utility for classes responsible for rendering and templates that allows whitelist inline sources.
+ */
+interface InlineUtilInterface
+{
+    /**
+     * Render HTML tag and whitelist it as trusted source.
+     *
+     * Use this method to whitelist remote static resources and inline styles/scripts.
+     * Do not use user-provided as any of the parameters.
+     *
+     * @param string $tagName
+     * @param string[] $attributes
+     * @param string|null $content
+     * @return string
+     */
+    public function renderTag(string $tagName, array $attributes, ?string $content = null): string;
+
+    /**
+     * Render event listener as an HTML attribute and whitelist it as trusted source.
+     *
+     * Do not use user-provided values as any of the parameters.
+     *
+     * @param string $eventName Full attribute name like "onclick".
+     * @param string $javascript
+     * @return string
+     */
+    public function renderEventListener(string $eventName, string $javascript): string;
+}
diff --git a/app/code/Magento/Csp/Helper/InlineUtil.php b/app/code/Magento/Csp/Helper/InlineUtil.php
new file mode 100644
index 0000000000000..f0de25fb81d7a
--- /dev/null
+++ b/app/code/Magento/Csp/Helper/InlineUtil.php
@@ -0,0 +1,212 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Helper;
+
+use Magento\Csp\Api\InlineUtilInterface;
+use Magento\Csp\Model\Collector\DynamicCollector;
+use Magento\Csp\Model\Policy\FetchPolicy;
+
+/**
+ * Helper for classes responsible for rendering and templates.
+ *
+ * Allows to whitelist dynamic sources specific to a certain page.
+ */
+class InlineUtil implements InlineUtilInterface
+{
+    /**
+     * @var DynamicCollector
+     */
+    private $dynamicCollector;
+
+    /**
+     * @var bool
+     */
+    private $useUnsafeHashes;
+
+    private static $tagMeta = [
+        'script' => ['id' => 'script-src', 'remote' => ['src'], 'hash' => true],
+        'style' => ['id' => 'style-src', 'remote' => [], 'hash' => true],
+        'img' => ['id' => 'img-src', 'remote' => ['src']],
+        'audio' => ['id' => 'media-src', 'remote' => ['src']],
+        'video' => ['id' => 'media-src', 'remote' => ['src']],
+        'track' => ['id' => 'media-src', 'remote' => ['src']],
+        'source' => ['id' => 'media-src', 'remote' => ['src']],
+        'object' => ['id' => 'object-src', 'remote' => ['data', 'archive']],
+        'embed' => ['id' => 'object-src', 'remote' => ['src']],
+        'applet' => ['id' => 'object-src', 'remote' => ['code', 'archive']],
+        'link' => ['id' => 'style-src', 'remote' => ['href']],
+        'form' => ['id' => 'form-action', 'remote' => ['action']],
+        'iframe' => ['id' => 'frame-src', 'remote' => ['src']],
+        'frame' => ['id' => 'frame-src', 'remote' => ['src']]
+    ];
+
+    /**
+     * @param DynamicCollector $dynamicCollector
+     * @param bool $useUnsafeHashes Use 'unsafe-hashes' policy (not supported by CSP v2).
+     */
+    public function __construct(DynamicCollector $dynamicCollector, bool $useUnsafeHashes = false)
+    {
+        $this->dynamicCollector = $dynamicCollector;
+        $this->useUnsafeHashes = $useUnsafeHashes;
+    }
+
+    /**
+     * Generate fetch policy hash for some content.
+     *
+     * @param string $content
+     * @return array Hash data to insert into a FetchPolicy.
+     */
+    private function generateHashValue(string $content): array
+    {
+        return [base64_encode(hash('sha256', $content, true)) => 'sha256'];
+    }
+
+    /**
+     * Extract host for a fetch policy from a URL.
+     *
+     * @param string $url
+     * @return string|null Null is returned when URL does not point to a remote host.
+     */
+    private function extractHost(string $url): ?string
+    {
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        $urlData = parse_url($url);
+        if (!$urlData
+            || empty($urlData['scheme'])
+            || ($urlData['scheme'] !== 'http' && $urlData['scheme'] !== 'https')
+        ) {
+            return null;
+        }
+
+        return $urlData['scheme'] .'://' .$urlData['host'];
+    }
+
+    /**
+     * Extract remote hosts used to get fonts.
+     *
+     * @param string $styleContent
+     * @return string[]
+     */
+    private function extractRemoteFonts(string $styleContent): array
+    {
+        $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));
+    }
+
+    /**
+     * Extract remote hosts utilized.
+     *
+     * @param string $tag
+     * @param string[] $attributes
+     * @param string|null $content
+     * @return string[]
+     */
+    private function extractRemoteHosts(string $tag, array $attributes, ?string $content): array
+    {
+        /** @var string[] $remotes */
+        $remotes = [];
+        foreach (self::$tagMeta[$tag]['remote'] as $remoteAttr) {
+            if (!empty($attributes[$remoteAttr]) && $host = $this->extractHost($attributes[$remoteAttr])) {
+                $remotes[] = $host;
+                break;
+            }
+        }
+        if ($tag === 'style' && $content) {
+            $remotes += $this->extractRemoteFonts($content);
+        }
+
+        return $remotes;
+    }
+
+    /**
+     * Render tag.
+     *
+     * @param string $tag
+     * @param string[] $attributes
+     * @param string|null $content
+     * @return string
+     */
+    private function render(string $tag, array $attributes, ?string $content): string
+    {
+        $html = '<' .$tag;
+        foreach ($attributes as $attribute => $value) {
+            $html .= ' ' .$attribute .'="' .$value .'"';
+        }
+        if ($content) {
+            $html .= '>' .$content .'</' .$tag .'>';
+        } else {
+            $html .= ' />';
+        }
+
+        return $html;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function renderTag(string $tagName, array $attributes, ?string $content = null): string
+    {
+        //Processing tag data
+        if (!array_key_exists($tagName, self::$tagMeta)) {
+            throw new \InvalidArgumentException('Unknown source type - ' .$tagName);
+        }
+        /** @var string $policyId */
+        $policyId = self::$tagMeta[$tagName]['id'];
+        $remotes = $this->extractRemoteHosts($tagName, $attributes, $content);
+        if (empty($remotes) && !$content) {
+            throw new \InvalidArgumentException('Either remote URL or hashable content is required to whitelist');
+        }
+
+        //Adding required policies.
+        if ($remotes) {
+            $this->dynamicCollector->add(
+                new FetchPolicy($policyId, false, $remotes)
+            );
+        }
+        if ($content && !empty(self::$tagMeta[$tagName]['hash'])) {
+            $this->dynamicCollector->add(
+                new FetchPolicy($policyId, false, [], [], false, false, false, [], $this->generateHashValue($content))
+            );
+        }
+
+        return $this->render($tagName, $attributes, $content);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function renderEventListener(string $eventName, string $javascript): string
+    {
+        if ($this->useUnsafeHashes) {
+            $policy = new FetchPolicy(
+                'script-src',
+                false,
+                [],
+                [],
+                false,
+                false,
+                false,
+                [],
+                $this->generateHashValue($javascript),
+                false,
+                true
+            );
+        } else {
+            $policy = new FetchPolicy('script-src', false, [], [], false, true);
+        }
+        $this->dynamicCollector->add($policy);
+
+        return $eventName .'="' .$javascript .'"';
+    }
+}
diff --git a/app/code/Magento/Csp/Model/Collector/ControllerCollector.php b/app/code/Magento/Csp/Model/Collector/ControllerCollector.php
new file mode 100644
index 0000000000000..0239601951744
--- /dev/null
+++ b/app/code/Magento/Csp/Model/Collector/ControllerCollector.php
@@ -0,0 +1,45 @@
+<?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\CspAwareActionInterface;
+use Magento\Csp\Api\PolicyCollectorInterface;
+
+/**
+ * Asks for route-specific policies from a compatible controller.
+ */
+class ControllerCollector implements PolicyCollectorInterface
+{
+    /**
+     * @var CspAwareActionInterface|null
+     */
+    private $controller;
+
+    /**
+     * Set the action interface that is responsible for processing current HTTP request.
+     *
+     * @param CspAwareActionInterface $cspAwareAction
+     * @return void
+     */
+    public function setCurrentActionInstance(CspAwareActionInterface $cspAwareAction): void
+    {
+        $this->controller = $cspAwareAction;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function collect(array $defaultPolicies = []): array
+    {
+        if ($this->controller) {
+            return $this->controller->modifyCsp($defaultPolicies);
+        }
+
+        return $defaultPolicies;
+    }
+}
diff --git a/app/code/Magento/Csp/Model/Collector/DynamicCollector.php b/app/code/Magento/Csp/Model/Collector/DynamicCollector.php
new file mode 100644
index 0000000000000..6478e9622f910
--- /dev/null
+++ b/app/code/Magento/Csp/Model/Collector/DynamicCollector.php
@@ -0,0 +1,41 @@
+<?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;
+use Magento\Csp\Api\PolicyCollectorInterface;
+
+/**
+ * CSPs dynamically added during the rendering of current page (from .phtml templates for instance).
+ */
+class DynamicCollector implements PolicyCollectorInterface
+{
+    /**
+     * @var PolicyInterface[]
+     */
+    private $added = [];
+
+    /**
+     * Add a policy for current page.
+     *
+     * @param PolicyInterface $policy
+     * @return void
+     */
+    public function add(PolicyInterface $policy): void
+    {
+        $this->added[] = $policy;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function collect(array $defaultPolicies = []): array
+    {
+        return array_merge($defaultPolicies, $this->added);
+    }
+}
diff --git a/app/code/Magento/Csp/Model/CompositePolicyCollector.php b/app/code/Magento/Csp/Model/CompositePolicyCollector.php
index b775c91b4e1ef..6c1459b791835 100644
--- a/app/code/Magento/Csp/Model/CompositePolicyCollector.php
+++ b/app/code/Magento/Csp/Model/CompositePolicyCollector.php
@@ -32,27 +32,39 @@ class CompositePolicyCollector implements PolicyCollectorInterface
      */
     public function __construct(array $collectors, array $mergers)
     {
+        ksort($collectors);
         $this->collectors = $collectors;
         $this->mergers = $mergers;
     }
 
     /**
-     * Merge 2 policies with the same ID.
+     * Merge policies with same IDs and return a list of policies with 1 DTO per policy ID.
      *
-     * @param PolicyInterface $policy1
-     * @param PolicyInterface $policy2
-     * @return PolicyInterface
+     * @param PolicyInterface[] $collected
+     * @return PolicyInterface[]
      * @throws \RuntimeException When failed to merge.
      */
-    private function merge(PolicyInterface $policy1, PolicyInterface $policy2): PolicyInterface
+    private function merge(array $collected): array
     {
-        foreach ($this->mergers as $merger) {
-            if ($merger->canMerge($policy1, $policy2)) {
-                return $merger->merge($policy1, $policy2);
+        /** @var PolicyInterface[] $merged */
+        $merged = [];
+
+        foreach ($collected as $policy) {
+            if (array_key_exists($policy->getId(), $merged)) {
+                foreach ($this->mergers as $merger) {
+                    if ($merger->canMerge($merged[$policy->getId()], $policy)) {
+                        $merged[$policy->getId()] = $merger->merge($merged[$policy->getId()], $policy);
+                        continue 2;
+                    }
+                }
+
+                throw new \RuntimeException(sprintf('Merge for policies #%s was not found', $policy->getId()));
+            } else {
+                $merged[$policy->getId()] = $policy;
             }
         }
 
-        throw new \RuntimeException(sprintf('Merge for policies #%s was not found', $policy1->getId()));
+        return $merged;
     }
 
     /**
@@ -62,19 +74,9 @@ public function collect(array $defaultPolicies = []): array
     {
         $collected = $defaultPolicies;
         foreach ($this->collectors as $collector) {
-            $collected = $collector->collect($collected);
-        }
-        //Merging policies.
-        /** @var PolicyInterface[] $result */
-        $result = [];
-        foreach ($collected as $policy) {
-            if (array_key_exists($policy->getId(), $result)) {
-                $result[$policy->getId()] = $this->merge($result[$policy->getId()], $policy);
-            } else {
-                $result[$policy->getId()] = $policy;
-            }
+            $collected = $this->merge($collector->collect($collected));
         }
 
-        return array_values($result);
+        return array_values($collected);
     }
 }
diff --git a/app/code/Magento/Csp/Plugin/CspAwareControllerPlugin.php b/app/code/Magento/Csp/Plugin/CspAwareControllerPlugin.php
new file mode 100644
index 0000000000000..09dc7256568bc
--- /dev/null
+++ b/app/code/Magento/Csp/Plugin/CspAwareControllerPlugin.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Plugin;
+
+use Magento\Csp\Api\CspAwareActionInterface;
+use Magento\Csp\Model\Collector\ControllerCollector;
+use Magento\Framework\App\ActionInterface;
+use Magento\Framework\App\RouterInterface;
+
+/**
+ * Plugin that registers CSP aware action instance processing current request.
+ */
+class CspAwareControllerPlugin
+{
+    /**
+     * @var ControllerCollector
+     */
+    private $collector;
+
+    /**
+     * @param ControllerCollector $collector
+     */
+    public function __construct(ControllerCollector $collector)
+    {
+        $this->collector = $collector;
+    }
+
+    /**
+     * Register matched action instance.
+     *
+     * @param RouterInterface $router
+     * @param ActionInterface|null $matched
+     * @return ActionInterface|null
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterMatch(RouterInterface $router, $matched)
+    {
+        if ($matched && $matched instanceof CspAwareActionInterface) {
+            $this->collector->setCurrentActionInstance($matched);
+        }
+
+        return $matched;
+    }
+}
diff --git a/app/code/Magento/Csp/Plugin/TemplateRenderingPlugin.php b/app/code/Magento/Csp/Plugin/TemplateRenderingPlugin.php
new file mode 100644
index 0000000000000..781fb06e487a8
--- /dev/null
+++ b/app/code/Magento/Csp/Plugin/TemplateRenderingPlugin.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Plugin;
+
+use Magento\Csp\Api\InlineUtilInterface;
+use Magento\Framework\View\Element\BlockInterface;
+use Magento\Framework\View\TemplateEngine\Php;
+
+/**
+ * Plugin that adds CSP utility to templates context.
+ */
+class TemplateRenderingPlugin
+{
+    /**
+     * @var InlineUtilInterface
+     */
+    private $util;
+
+    /**
+     * @param InlineUtilInterface $util
+     */
+    public function __construct(InlineUtilInterface $util)
+    {
+        $this->util = $util;
+    }
+
+    /**
+     * Add $csp variable to a template scope.
+     *
+     * @param Php $renderer
+     * @param BlockInterface $block
+     * @param string $fileName
+     * @param array $dictionary
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeRender(Php $renderer, BlockInterface $block, $fileName, array $dictionary): array
+    {
+        $dictionary['csp'] = $this->util;
+
+        return [$block, $fileName, $dictionary];
+    }
+}
diff --git a/app/code/Magento/Csp/etc/di.xml b/app/code/Magento/Csp/etc/di.xml
index 0804f6d579137..e6e4f166117f7 100644
--- a/app/code/Magento/Csp/etc/di.xml
+++ b/app/code/Magento/Csp/etc/di.xml
@@ -18,8 +18,10 @@
     <type name="Magento\Csp\Model\CompositePolicyCollector">
         <arguments>
             <argument name="collectors" xsi:type="array">
-                <item name="config" xsi:type="object">Magento\Csp\Model\Collector\ConfigCollector</item>
-                <item name="csp_whitelist" xsi:type="object">Magento\Csp\Model\Collector\CspWhitelistXmlCollector</item>
+                <item name="1" xsi:type="object">Magento\Csp\Model\Collector\ConfigCollector</item>
+                <item name="2" xsi:type="object">Magento\Csp\Model\Collector\CspWhitelistXmlCollector</item>
+                <item name="3" xsi:type="object">Magento\Csp\Model\Collector\DynamicCollector</item>
+                <item name="100" xsi:type="object">Magento\Csp\Model\Collector\ControllerCollector</item>
             </argument>
             <argument name="mergers" xsi:type="array">
                 <item name="fetch" xsi:type="object">Magento\Csp\Model\Collector\FetchPolicyMerger</item>
@@ -47,4 +49,11 @@
             <argument name="fileName" xsi:type="string">csp_whitelist.xml</argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\View\TemplateEngine\Php">
+        <plugin name="csp_helper_plugin" type="Magento\Csp\Plugin\TemplateRenderingPlugin" />
+    </type>
+    <type name="Magento\Framework\App\RouterInterface">
+        <plugin name="csp_aware_plugin" type="Magento\Csp\Plugin\CspAwareControllerPlugin" />
+    </type>
+    <preference for="Magento\Csp\Api\InlineUtilInterface" type="Magento\Csp\Helper\InlineUtil" />
 </config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleCspUtil/Controller/Csp/Aware.php b/dev/tests/integration/_files/Magento/TestModuleCspUtil/Controller/Csp/Aware.php
new file mode 100644
index 0000000000000..567c308330ba3
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleCspUtil/Controller/Csp/Aware.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestModuleCspUtil\Controller\Csp;
+
+use Magento\Csp\Api\CspAwareActionInterface;
+use Magento\Csp\Model\Policy\FetchPolicy;
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\Controller\ResultFactory;
+
+/**
+ * CSP Aware controller.
+ */
+class Aware extends Action implements CspAwareActionInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function execute()
+    {
+        return $this->resultFactory->create(ResultFactory::TYPE_PAGE);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function modifyCsp(array $appliedPolicies): array
+    {
+        $policies = [];
+        foreach ($appliedPolicies as $policy) {
+            if ($policy instanceof FetchPolicy
+                && in_array('http://controller.magento.com', $policy->getHostSources(), true)
+            ) {
+                $policies[] = new FetchPolicy(
+                    'script-src',
+                    false,
+                    ['https://controller.magento.com'],
+                    [],
+                    true,
+                    false,
+                    false,
+                    [],
+                    ['H4RRnauTM2X2Xg/z9zkno1crqhsaY3uKKu97uwmnXXE=' => 'sha256']
+                );
+            }
+        }
+
+        return $policies;
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleCspUtil/Controller/Csp/Helper.php b/dev/tests/integration/_files/Magento/TestModuleCspUtil/Controller/Csp/Helper.php
new file mode 100644
index 0000000000000..8dde67de73dfa
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleCspUtil/Controller/Csp/Helper.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestModuleCspUtil\Controller\Csp;
+
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\View\Result\PageFactory;
+
+/**
+ * .phtml templates utilizes CSP helper.
+ */
+class Helper extends Action
+{
+    /**
+     * @inheritDoc
+     */
+    public function execute()
+    {
+        return $this->resultFactory->create(ResultFactory::TYPE_PAGE);
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleCspUtil/composer.json b/dev/tests/integration/_files/Magento/TestModuleCspUtil/composer.json
new file mode 100644
index 0000000000000..aece82306d9d5
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleCspUtil/composer.json
@@ -0,0 +1,21 @@
+{
+  "name": "magento/module-csp-util",
+  "description": "test csp module",
+  "config": {
+    "sort-packages": true
+  },
+  "require": {
+    "php": "~7.1.3||~7.2.0||~7.3.0",
+    "magento/framework": "*",
+    "magento/module-integration": "*"
+  },
+  "type": "magento2-module",
+  "extra": {
+    "map": [
+      [
+        "*",
+        "Magento/TestModuleCspUtil"
+      ]
+    ]
+  }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleCspUtil/etc/csp_whitelist.xml b/dev/tests/integration/_files/Magento/TestModuleCspUtil/etc/csp_whitelist.xml
new file mode 100644
index 0000000000000..c39e74edafd5e
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleCspUtil/etc/csp_whitelist.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp/etc/csp_whitelist.xsd">
+    <policies>
+        <policy id="script-src">
+            <values>
+                <value id="devdocs-base" type="host">https://devdocs.magento.com</value>
+            </values>
+        </policy>
+    </policies>
+</csp_whitelist>
diff --git a/dev/tests/integration/_files/Magento/TestModuleCspUtil/etc/frontend/routes.xml b/dev/tests/integration/_files/Magento/TestModuleCspUtil/etc/frontend/routes.xml
new file mode 100644
index 0000000000000..f78ddb740ec6c
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleCspUtil/etc/frontend/routes.xml
@@ -0,0 +1,14 @@
+<?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:App/etc/routes.xsd">
+    <router id="standard">
+        <route id="csputil" frontName="csputil">
+            <module name="Magento_TestModuleCspUtil" />
+        </route>
+    </router>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleCspUtil/etc/module.xml b/dev/tests/integration/_files/Magento/TestModuleCspUtil/etc/module.xml
new file mode 100644
index 0000000000000..1e9bc9b6fa9bc
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleCspUtil/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_TestModuleCspUtil" active="true" />
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleCspUtil/registration.php b/dev/tests/integration/_files/Magento/TestModuleCspUtil/registration.php
new file mode 100644
index 0000000000000..570aed9fe5ce6
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleCspUtil/registration.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+$registrar = new ComponentRegistrar();
+if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestModuleCspUtil') === null) {
+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestModuleCspUtil', __DIR__);
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleCspUtil/view/frontend/layout/csputil_csp_aware.xml b/dev/tests/integration/_files/Magento/TestModuleCspUtil/view/frontend/layout/csputil_csp_aware.xml
new file mode 100644
index 0000000000000..89550403fa6bf
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleCspUtil/view/frontend/layout/csputil_csp_aware.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceContainer name="content">
+            <block class="Magento\Framework\View\Element\Template"
+                   name="csp_helper"
+                   cacheable="false"
+                   template="Magento_TestModuleCspUtil::helper.phtml" />
+        </referenceContainer>
+    </body>
+</page>
diff --git a/dev/tests/integration/_files/Magento/TestModuleCspUtil/view/frontend/layout/csputil_csp_helper.xml b/dev/tests/integration/_files/Magento/TestModuleCspUtil/view/frontend/layout/csputil_csp_helper.xml
new file mode 100644
index 0000000000000..89550403fa6bf
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleCspUtil/view/frontend/layout/csputil_csp_helper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceContainer name="content">
+            <block class="Magento\Framework\View\Element\Template"
+                   name="csp_helper"
+                   cacheable="false"
+                   template="Magento_TestModuleCspUtil::helper.phtml" />
+        </referenceContainer>
+    </body>
+</page>
diff --git a/dev/tests/integration/_files/Magento/TestModuleCspUtil/view/frontend/templates/helper.phtml b/dev/tests/integration/_files/Magento/TestModuleCspUtil/view/frontend/templates/helper.phtml
new file mode 100644
index 0000000000000..fa349062aafcb
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleCspUtil/view/frontend/templates/helper.phtml
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Csp\Api\InlineUtilInterface $csp */
+?>
+<h1>Hello there!</h1>
+<?= /* @noEscape */ $csp->renderTag('script', ['src' => 'http://my.magento.com/static/script.js']); ?>
+<?= /* @noEscape */ $csp->renderTag('script', [], "\n    let myVar = 1;\n") ?>
+
diff --git a/dev/tests/integration/testsuite/Magento/Csp/CspAwareActionTest.php b/dev/tests/integration/testsuite/Magento/Csp/CspAwareActionTest.php
new file mode 100644
index 0000000000000..20ed4d1b79bc8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Csp/CspAwareActionTest.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp;
+
+use Magento\TestFramework\TestCase\AbstractController;
+
+/**
+ * Test that controllers can modify CSPs for a page.
+ *
+ * @magentoAppArea frontend
+ */
+class CspAwareActionTest extends AbstractController
+{
+    /**
+     * Check that a CSP aware action can modify CSPs after ALL other policies had been gathered.
+     *
+     * @return void
+     * @magentoConfigFixture default_store csp/mode/storefront/report_only 0
+     * @magentoConfigFixture default_store csp/policies/storefront/script/policy_id script-src
+     * @magentoConfigFixture default_store csp/policies/storefront/script/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/script/hosts/example http://controller.magento.com
+     * @magentoConfigFixture default_store csp/policies/storefront/script/self 0
+     * @magentoConfigFixture default_store csp/policies/storefront/script/inline 0
+     */
+    public function testAwareAction(): void
+    {
+        $this->getRequest()->setMethod('GET');
+        $this->dispatch('csputil/csp/aware');
+        $headers = '';
+        foreach ($this->getResponse()->getHeaders() as $header) {
+            $headers .= $header->getFieldName() .': ' .$header->getFieldValue() .PHP_EOL;
+        }
+
+        $this->assertContains(
+            'Content-Security-Policy: script-src https://controller.magento.com'
+                .' \'self\' \'sha256-H4RRnauTM2X2Xg/z9zkno1crqhsaY3uKKu97uwmnXXE=\'',
+            $headers
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Csp/CspUtilTest.php b/dev/tests/integration/testsuite/Magento/Csp/CspUtilTest.php
new file mode 100644
index 0000000000000..f33476c669111
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Csp/CspUtilTest.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp;
+
+use Magento\TestFramework\TestCase\AbstractController;
+
+/**
+ * Test CSP util use cases.
+ *
+ * @magentoAppArea frontend
+ */
+class CspUtilTest extends AbstractController
+{
+    /**
+     * Test that CSP helper for templates works.
+     *
+     * @return void
+     */
+    public function testPhtmlHelper(): void
+    {
+        $this->getRequest()->setMethod('GET');
+        $this->dispatch('csputil/csp/helper');
+        $content = $this->getResponse()->getContent();
+
+        $this->assertContains('<script src="http://my.magento.com/static/script.js" />', $content);
+        $this->assertContains("<script>\n    let myVar = 1;\n</script>", $content);
+        $headers = '';
+        foreach ($this->getResponse()->getHeaders() as $header) {
+            $headers .= $header->getFieldName() .': ' .$header->getFieldValue() .PHP_EOL;
+        }
+        $this->assertContains('http://my.magento.com', $headers);
+        $this->assertContains('\'sha256-H4RRnauTM2X2Xg/z9zkno1crqhsaY3uKKu97uwmnXXE=\'', $headers);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Csp/Helper/InlineUtilTest.php b/dev/tests/integration/testsuite/Magento/Csp/Helper/InlineUtilTest.php
new file mode 100644
index 0000000000000..9dc08ca0337bb
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Csp/Helper/InlineUtilTest.php
@@ -0,0 +1,260 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Helper;
+
+use Magento\Csp\Api\Data\PolicyInterface;
+use Magento\Csp\Model\Collector\DynamicCollector;
+use Magento\Csp\Model\Policy\FetchPolicy;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Cover CSP util use cases.
+ */
+class InlineUtilTest extends TestCase
+{
+    /**
+     * @var InlineUtil
+     */
+    private $util;
+
+    /**
+     * @var PolicyInterface[]
+     */
+    private $policiesAdded = [];
+
+    /**
+     * @inheritDoc
+     */
+    public function setUp()
+    {
+        $this->policiesAdded = [];
+        $collectorMock = $this->getMockBuilder(DynamicCollector::class)->disableOriginalConstructor()->getMock();
+        $collectorMock->method('add')
+            ->willReturnCallback(
+                function (PolicyInterface $policy) {
+                    $this->policiesAdded[] = $policy;
+                }
+            );
+        $this->util = Bootstrap::getObjectManager()->create(InlineUtil::class, ['dynamicCollector' => $collectorMock]);
+    }
+
+    /**
+     * Test tag rendering.
+     *
+     * @param string $tagName
+     * @param array $attributes
+     * @param string|null $content
+     * @param string $result Expected result.
+     * @param PolicyInterface[] $policiesExpected
+     * @return void
+     * @dataProvider getTags
+     */
+    public function testRenderTag(
+        string $tagName,
+        array $attributes,
+        ?string $content,
+        string $result,
+        array $policiesExpected
+    ): void {
+        $this->assertEquals($result, $this->util->renderTag($tagName, $attributes, $content));
+        $this->assertEquals($policiesExpected, $this->policiesAdded);
+    }
+
+    /**
+     * Test data for tag rendering test.
+     *
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function getTags(): array
+    {
+        return [
+            'remote-script' => [
+                'script',
+                ['src' => 'http://magento.com/static/some-script.js'],
+                null,
+                '<script src="http://magento.com/static/some-script.js" />',
+                [new FetchPolicy('script-src', false, ['http://magento.com'])]
+            ],
+            'inline-script' => [
+                'script',
+                ['type' => 'text/javascript'],
+                "\n    let someVar = 25;\n    document.getElementById('test').innerText = someVar;\n",
+                "<script type=\"text/javascript\">\n    let someVar = 25;"
+                    ."\n    document.getElementById('test').innerText = someVar;\n</script>",
+                [
+                    new FetchPolicy(
+                        'script-src',
+                        false,
+                        [],
+                        [],
+                        false,
+                        false,
+                        false,
+                        [],
+                        ['U+SKpEef030N2YgyKKdIBIvPy8Fmd42N/JcTZgQV+DA=' => 'sha256']
+                    )
+                ]
+            ],
+            'remote-style' => [
+                'link',
+                ['rel' => 'stylesheet', 'type' => 'text/css', 'href' => 'http://magento.com/static/style.css'],
+                null,
+                '<link rel="stylesheet" type="text/css" href="http://magento.com/static/style.css" />',
+                [new FetchPolicy('style-src', false, ['http://magento.com'])]
+            ],
+            'inline-style' => [
+                'style',
+                [],
+                "\n    h1 {color: red;}\n    p {color: green;}\n",
+                "<style>\n    h1 {color: red;}\n    p {color: green;}\n</style>",
+                [
+                    new FetchPolicy(
+                        'style-src',
+                        false,
+                        [],
+                        [],
+                        false,
+                        false,
+                        false,
+                        [],
+                        ['KISO7smrk+XdGrEsiPvVjX6qx4wNef/UKjNb26RaKGM=' => 'sha256']
+                    )
+                ]
+            ],
+            'remote-image' => [
+                'img',
+                ['src' => 'http://magento.com/static/my.jpg'],
+                null,
+                '<img src="http://magento.com/static/my.jpg" />',
+                [new FetchPolicy('img-src', false, ['http://magento.com'])]
+            ],
+            'remote-font' => [
+                'style',
+                ['type' => 'text/css'],
+                "\n    @font-face {\n        font-family: \"MyCustomFont\";"
+                    ."\n        src: url(\"http://magento.com/static/font.ttf\");\n    }\n"
+                    ."    @font-face {\n        font-family: \"MyCustomFont2\";"
+                    ."\n        src: url('https://magento.com/static/font-2.ttf'),"
+                    ."\n             url(static/font.ttf),"
+                    ."\n             url(https://devdocs.magento.com/static/another-font.woff),"
+                    ."\n             url(http://devdocs.magento.com/static/font.woff);\n    }\n",
+                "<style type=\"text/css\">"
+                    ."\n    @font-face {\n        font-family: \"MyCustomFont\";"
+                    ."\n        src: url(\"http://magento.com/static/font.ttf\");\n    }\n"
+                    ."    @font-face {\n        font-family: \"MyCustomFont2\";"
+                    ."\n        src: url('https://magento.com/static/font-2.ttf'),"
+                    ."\n             url(static/font.ttf),"
+                    ."\n             url(https://devdocs.magento.com/static/another-font.woff),"
+                    ."\n             url(http://devdocs.magento.com/static/font.woff);\n    }\n"
+                    ."</style>",
+                [
+                    new FetchPolicy(
+                        'style-src',
+                        false,
+                        [
+                            'http://magento.com',
+                            'https://magento.com',
+                            'https://devdocs.magento.com',
+                            'http://devdocs.magento.com'
+                        ]
+                    ),
+                    new FetchPolicy(
+                        'style-src',
+                        false,
+                        [],
+                        [],
+                        false,
+                        false,
+                        false,
+                        [],
+                        ['TP6Ulnz1kstJ8PYUKvowgJm0phHhtqJnJCnWxKLXkf0=' => 'sha256']
+                    )
+                ]
+            ],
+            'cross-origin-form' => [
+                'form',
+                ['action' => 'https://magento.com/submit', 'method' => 'post'],
+                "\n    <input type=\"text\" name=\"test\" /><input type=\"submit\" value=\"Submit\" />\n",
+                "<form action=\"https://magento.com/submit\" method=\"post\">"
+                    ."\n    <input type=\"text\" name=\"test\" /><input type=\"submit\" value=\"Submit\" />\n"
+                    ."</form>",
+                [new FetchPolicy('form-action', false, ['https://magento.com'])]
+            ],
+            'cross-origin-iframe' => [
+                'iframe',
+                ['src' => 'http://magento.com/some-page'],
+                null,
+                '<iframe src="http://magento.com/some-page" />',
+                [new FetchPolicy('frame-src', false, ['http://magento.com'])]
+            ],
+            'remote-track' => [
+                'track',
+                ['src' => 'http://magento.com/static/track.vtt', 'kind' => 'subtitles'],
+                null,
+                '<track src="http://magento.com/static/track.vtt" kind="subtitles" />',
+                [new FetchPolicy('media-src', false, ['http://magento.com'])]
+            ],
+            'remote-source' => [
+                'source',
+                ['src' => 'http://magento.com/static/track.ogg', 'type' => 'audio/ogg'],
+                null,
+                '<source src="http://magento.com/static/track.ogg" type="audio/ogg" />',
+                [new FetchPolicy('media-src', false, ['http://magento.com'])]
+            ],
+            'remote-video' => [
+                'video',
+                ['src' => 'https://magento.com/static/video.mp4'],
+                null,
+                '<video src="https://magento.com/static/video.mp4" />',
+                [new FetchPolicy('media-src', false, ['https://magento.com'])]
+            ],
+            'remote-audio' => [
+                'audio',
+                ['src' => 'https://magento.com/static/audio.mp3'],
+                null,
+                '<audio src="https://magento.com/static/audio.mp3" />',
+                [new FetchPolicy('media-src', false, ['https://magento.com'])]
+            ],
+            'remote-object' => [
+                'object',
+                ['data' => 'http://magento.com/static/flash.swf'],
+                null,
+                '<object data="http://magento.com/static/flash.swf" />',
+                [new FetchPolicy('object-src', false, ['http://magento.com'])]
+            ],
+            'remote-embed' => [
+                'embed',
+                ['src' => 'http://magento.com/static/flash.swf'],
+                null,
+                '<embed src="http://magento.com/static/flash.swf" />',
+                [new FetchPolicy('object-src', false, ['http://magento.com'])]
+            ],
+            'remote-applet' => [
+                'applet',
+                ['code' => 'SomeApplet.class', 'archive' => 'https://magento.com/applet/my-applet.jar'],
+                null,
+                '<applet code="SomeApplet.class" archive="https://magento.com/applet/my-applet.jar" />',
+                [new FetchPolicy('object-src', false, ['https://magento.com'])]
+            ]
+        ];
+    }
+
+    /**
+     * Test that inline event listeners are rendered properly.
+     *
+     * @return void
+     */
+    public function testRenderEventListener(): void
+    {
+        $result = $this->util->renderEventListener('onclick', 'alert()');
+        $this->assertEquals('onclick="alert()"', $result);
+        $this->assertEquals([new FetchPolicy('script-src', false, [], [], false, true)], $this->policiesAdded);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Csp/Model/Collector/ControllerCollectorTest.php b/dev/tests/integration/testsuite/Magento/Csp/Model/Collector/ControllerCollectorTest.php
new file mode 100644
index 0000000000000..87a307933a035
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Csp/Model/Collector/ControllerCollectorTest.php
@@ -0,0 +1,85 @@
+<?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\CspAwareActionInterface;
+use Magento\Csp\Model\Policy\FetchPolicy;
+use Magento\Csp\Model\Policy\FlagPolicy;
+use Magento\Framework\Exception\NotFoundException;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test collecting policies from a CSP-aware controllers.
+ */
+class ControllerCollectorTest extends TestCase
+{
+    /**
+     * @var ControllerCollector
+     */
+    private $collector;
+
+    /**
+     * @inheritDoc
+     */
+    public function setUp()
+    {
+        $this->collector = Bootstrap::getObjectManager()->create(ControllerCollector::class);
+    }
+
+    /**
+     * Test collection.
+     *
+     * @return void
+     */
+    public function testCollect(): void
+    {
+        $controller = new class implements CspAwareActionInterface {
+            /**
+             * @inheritDoc
+             */
+            public function execute()
+            {
+                throw new NotFoundException(__('Page not found.'));
+            }
+
+            /**
+             * @inheritDoc
+             */
+            public function modifyCsp(array $appliedPolicies): array
+            {
+                $processed = [];
+                foreach ($appliedPolicies as $policy) {
+                    if ($policy instanceof FetchPolicy && $policy->getHostSources()) {
+                        $policy = new FetchPolicy(
+                            'default-src',
+                            false,
+                            array_map(
+                                function ($host) {
+                                    return str_replace('http://', 'https://', $host);
+                                },
+                                $policy->getHostSources()
+                            )
+                        );
+                    }
+                    $processed[] = $policy;
+                }
+                $processed[] = new FlagPolicy(FlagPolicy::POLICIES[0]);
+
+                return $processed;
+            }
+        };
+
+        $this->collector->setCurrentActionInstance($controller);
+        $collected = $this->collector->collect([new FetchPolicy('default-src', false, ['http://magento.com'])]);
+        $this->assertEquals(
+            [new FetchPolicy('default-src', false, ['https://magento.com']), new FlagPolicy(FlagPolicy::POLICIES[0])],
+            $collected
+        );
+    }
+}

From f4db9a422c331902b41a37f413706ec40168f6e9 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Mon, 23 Mar 2020 16:08:20 -0500
Subject: [PATCH 0093/1718] MC-24063: [2.4.x Port] Implement CSP

---
 .../AdminAnalytics/etc/csp_whitelist.xml      |  17 ++
 .../AdminNotification/etc/csp_whitelist.xml   |  18 ++
 .../Authorizenet/etc/csp_whitelist.xml        |  30 +++
 .../etc/csp_whitelist.xml                     |  18 ++
 .../Magento/Braintree/etc/csp_whitelist.xml   |  25 +++
 .../CardinalCommerce/etc/csp_whitelist.xml    |  52 +++++
 app/code/Magento/Csp/etc/config.xml           | 202 ++++++++++++++++++
 .../GoogleAdwords/etc/csp_whitelist.xml       |  24 +++
 app/code/Magento/Paypal/etc/csp_whitelist.xml |  35 +++
 .../ProductVideo/etc/csp_whitelist.xml        |  25 +++
 .../Magento/Signifyd/etc/csp_whitelist.xml    |  17 ++
 .../Magento/Tinymce3/etc/csp_whitelist.xml    |  28 +++
 .../testsuite/Magento/Csp/CspTest.php         |   4 +-
 .../Model/Collector/ConfigCollectorTest.php   | 135 ++++++------
 14 files changed, 567 insertions(+), 63 deletions(-)
 create mode 100644 app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml
 create mode 100644 app/code/Magento/AdminNotification/etc/csp_whitelist.xml
 create mode 100644 app/code/Magento/Authorizenet/etc/csp_whitelist.xml
 create mode 100644 app/code/Magento/AuthorizenetAcceptjs/etc/csp_whitelist.xml
 create mode 100644 app/code/Magento/Braintree/etc/csp_whitelist.xml
 create mode 100644 app/code/Magento/CardinalCommerce/etc/csp_whitelist.xml
 create mode 100644 app/code/Magento/GoogleAdwords/etc/csp_whitelist.xml
 create mode 100644 app/code/Magento/Paypal/etc/csp_whitelist.xml
 create mode 100644 app/code/Magento/ProductVideo/etc/csp_whitelist.xml
 create mode 100644 app/code/Magento/Signifyd/etc/csp_whitelist.xml
 create mode 100644 app/code/Magento/Tinymce3/etc/csp_whitelist.xml

diff --git a/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml b/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml
new file mode 100644
index 0000000000000..e937a3e18148a
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp:etc/csp_whitelist.xsd">
+        <policies>
+            <policy id="script-src">
+                <values>
+                    <value id="adobedtm" type="host">assets.adobedtm.com</value>
+                </values>
+            </policy>
+        </policies>
+</csp_whitelist>
diff --git a/app/code/Magento/AdminNotification/etc/csp_whitelist.xml b/app/code/Magento/AdminNotification/etc/csp_whitelist.xml
new file mode 100644
index 0000000000000..c3327a716947b
--- /dev/null
+++ b/app/code/Magento/AdminNotification/etc/csp_whitelist.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp:etc/csp_whitelist.xsd">
+    <policies>
+        <policy id="img-src">
+            <values>
+                <value id="commerce_widgets" type="host">widgets.magentocommerce.com</value>
+            </values>
+        </policy>
+    </policies>
+</csp_whitelist>
+
diff --git a/app/code/Magento/Authorizenet/etc/csp_whitelist.xml b/app/code/Magento/Authorizenet/etc/csp_whitelist.xml
new file mode 100644
index 0000000000000..0af163606fcaf
--- /dev/null
+++ b/app/code/Magento/Authorizenet/etc/csp_whitelist.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp:etc/csp_whitelist.xsd">
+    <policies>
+        <policy id="script-src">
+            <values>
+                <value id="authorize_net_direct" type="host">secure.authorize.net</value>
+                <value id="authorize_net_direct_test" type="host">test.authorize.net</value>
+            </values>
+        </policy>
+        <policy id="frame-src">
+            <values>
+                <value id="authorize_net_direct" type="host">secure.authorize.net</value>
+                <value id="authorize_net_direct_test" type="host">test.authorize.net</value>
+            </values>
+        </policy>
+        <policy id="form-action">
+            <values>
+                <value id="authorize_net_direct" type="host">secure.authorize.net</value>
+                <value id="authorize_net_direct_test" type="host">test.authorize.net</value>
+            </values>
+        </policy>
+    </policies>
+</csp_whitelist>
diff --git a/app/code/Magento/AuthorizenetAcceptjs/etc/csp_whitelist.xml b/app/code/Magento/AuthorizenetAcceptjs/etc/csp_whitelist.xml
new file mode 100644
index 0000000000000..df6d02387d3d7
--- /dev/null
+++ b/app/code/Magento/AuthorizenetAcceptjs/etc/csp_whitelist.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp:etc/csp_whitelist.xsd">
+    <policies>
+        <policy id="script-src">
+            <values>
+                <value id="authorize_net_js" type="host">js.authorize.net</value>
+                <value id="authorize_net_jstest" type="host">jstest.authorize.net</value>
+            </values>
+        </policy>
+    </policies>
+</csp_whitelist>
diff --git a/app/code/Magento/Braintree/etc/csp_whitelist.xml b/app/code/Magento/Braintree/etc/csp_whitelist.xml
new file mode 100644
index 0000000000000..b023d2adf03fd
--- /dev/null
+++ b/app/code/Magento/Braintree/etc/csp_whitelist.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp:etc/csp_whitelist.xsd">
+    <policies>
+        <policy id="script-src">
+            <values>
+                <value id="paypal_objects" type="host">www.paypalobjects.com</value>
+                <value id="braintree_js_gateway" type="host">js.braintreegateway.com</value>
+                <value id="paypal_tag_gateway" type="host">www.paypal.com</value>
+            </values>
+        </policy>
+        <policy id="img-src">
+            <values>
+                <value id="paypal_objects" type="host">www.paypalobjects.com</value>
+                <value id="paypal_analytics" type="host">t.paypal.com</value>
+            </values>
+        </policy>
+    </policies>
+</csp_whitelist>
diff --git a/app/code/Magento/CardinalCommerce/etc/csp_whitelist.xml b/app/code/Magento/CardinalCommerce/etc/csp_whitelist.xml
new file mode 100644
index 0000000000000..946f22b219909
--- /dev/null
+++ b/app/code/Magento/CardinalCommerce/etc/csp_whitelist.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp:etc/csp_whitelist.xsd">
+    <policies>
+        <policy id="script-src">
+            <values>
+                <value id="cardinal_commerce_geo_stag" type="host">geostag.cardinalcommerce.com</value>
+                <value id="cardinal_commerce_1eaf_stag" type="host">1eafstag.cardinalcommerce.com</value>
+                <value id="cardinal_commerce_geo" type="host">geoapi.cardinalcommerce.com</value>
+                <value id="cardinal_commerce_1eaf" type="host">1eafapi.cardinalcommerce.com</value>
+                <value id="cardinal_commerce_songbird" type="host">songbird.cardinalcommerce.com</value>
+                <value id="cardinal_commerce_test" type="host">includestest.ccdc02.com</value>
+            </values>
+        </policy>
+        <policy id="connect-src">
+            <values>
+                <value id="cardinal_commerce_geo_stag" type="host">geostag.cardinalcommerce.com</value>
+                <value id="cardinal_commerce_geo" type="host">geo.cardinalcommerce.com</value>
+                <value id="cardinal_commerce_1eaf_stag" type="host">1eafstag.cardinalcommerce.com</value>
+                <value id="cardinal_commerce_1eaf" type="host">1eaf.cardinalcommerce.com</value>
+                <value id="cardinal_commerce_cent_stag" type="host">centinelapistag.cardinalcommerce.com</value>
+                <value id="cardinal_commerce_cent" type="host">centinelapi.cardinalcommerce.com</value>
+            </values>
+        </policy>
+        <policy id="frame-src">
+            <values>
+                <value id="cardinal_commerce_geo_stag" type="host">geostag.cardinalcommerce.com</value>
+                <value id="cardinal_commerce_geo" type="host">geo.cardinalcommerce.com</value>
+                <value id="cardinal_commerce_1eaf_stag" type="host">1eafstag.cardinalcommerce.com</value>
+                <value id="cardinal_commerce_1eaf" type="host">1eaf.cardinalcommerce.com</value>
+                <value id="cardinal_commerce_cent_stag" type="host">centinelapistag.cardinalcommerce.com</value>
+                <value id="cardinal_commerce_cent" type="host">centinelapi.cardinalcommerce.com</value>
+            </values>
+        </policy>
+        <policy id="form-action">
+            <values>
+                <value id="cardinal_commerce_geo_stag" type="host">geostag.cardinalcommerce.com</value>
+                <value id="cardinal_commerce_geo" type="host">geo.cardinalcommerce.com</value>
+                <value id="cardinal_commerce_1eaf_stag" type="host">1eafstag.cardinalcommerce.com</value>
+                <value id="cardinal_commerce_1eaf" type="host">1eaf.cardinalcommerce.com</value>
+                <value id="cardinal_commerce_cent_stag" type="host">centinelapistag.cardinalcommerce.com</value>
+                <value id="cardinal_commerce_cent" type="host">centinelapi.cardinalcommerce.com</value>
+            </values>
+        </policy>
+    </policies>
+</csp_whitelist>
diff --git a/app/code/Magento/Csp/etc/config.xml b/app/code/Magento/Csp/etc/config.xml
index e45f6b223ed22..c13cd37ca0340 100644
--- a/app/code/Magento/Csp/etc/config.xml
+++ b/app/code/Magento/Csp/etc/config.xml
@@ -16,6 +16,208 @@
                     <report_only>1</report_only>
                 </admin>
             </mode>
+            <policies>
+                <storefront>
+                    <base>
+                        <policy_id>base-uri</policy_id>
+                        <self>1</self>
+                        <inline>1</inline>
+                        <eval>0</eval>
+                        <dynamic>0</dynamic>
+                    </base>
+                    <default>
+                        <policy_id>default-src</policy_id>
+                        <self>1</self>
+                        <inline>1</inline>
+                        <eval>1</eval>
+                        <dynamic>0</dynamic>
+                    </default>
+                    <children>
+                        <policy_id>child-src</policy_id>
+                        <self>1</self>
+                        <inline>1</inline>
+                        <eval>0</eval>
+                        <dynamic>0</dynamic>
+                    </children>
+                    <connections>
+                        <policy_id>connect-src</policy_id>
+                        <self>1</self>
+                        <inline>1</inline>
+                        <eval>0</eval>
+                        <dynamic>0</dynamic>
+                    </connections>
+                    <manifests>
+                        <policy_id>manifest-src</policy_id>
+                        <self>1</self>
+                        <inline>1</inline>
+                        <eval>0</eval>
+                        <dynamic>0</dynamic>
+                    </manifests>
+                    <media>
+                        <policy_id>media-src</policy_id>
+                        <self>1</self>
+                        <inline>1</inline>
+                        <eval>0</eval>
+                        <dynamic>0</dynamic>
+                    </media>
+                    <objects>
+                        <policy_id>object-src</policy_id>
+                        <self>1</self>
+                        <inline>1</inline>
+                        <eval>0</eval>
+                        <dynamic>0</dynamic>
+                    </objects>
+                    <styles>
+                        <policy_id>style-src</policy_id>
+                        <self>1</self>
+                        <inline>1</inline>
+                        <eval>0</eval>
+                        <dynamic>0</dynamic>
+                    </styles>
+                    <scripts>
+                        <policy_id>script-src</policy_id>
+                        <self>1</self>
+                        <inline>1</inline>
+                        <eval>1</eval>
+                        <dynamic>0</dynamic>
+                    </scripts>
+                    <images>
+                        <policy_id>img-src</policy_id>
+                        <self>1</self>
+                        <inline>1</inline>
+                        <eval>0</eval>
+                        <dynamic>0</dynamic>
+                    </images>
+                    <frames>
+                        <policy_id>frame-src</policy_id>
+                        <self>1</self>
+                        <inline>1</inline>
+                        <eval>0</eval>
+                        <dynamic>0</dynamic>
+                    </frames>
+                    <frame-ancestors>
+                        <policy_id>frame-ancestors</policy_id>
+                        <self>1</self>
+                        <inline>1</inline>
+                        <eval>0</eval>
+                        <dynamic>0</dynamic>
+                    </frame-ancestors>
+                    <forms>
+                        <policy_id>form-action</policy_id>
+                        <self>1</self>
+                        <inline>1</inline>
+                        <eval>0</eval>
+                        <dynamic>0</dynamic>
+                    </forms>
+                    <fonts>
+                        <policy_id>font-src</policy_id>
+                        <self>1</self>
+                        <inline>1</inline>
+                        <eval>0</eval>
+                        <dynamic>0</dynamic>
+                    </fonts>
+                </storefront>
+                <admin>
+                    <base>
+                        <policy_id>base-uri</policy_id>
+                        <self>1</self>
+                        <inline>1</inline>
+                        <eval>0</eval>
+                        <dynamic>0</dynamic>
+                    </base>
+                    <default>
+                        <policy_id>default-src</policy_id>
+                        <self>1</self>
+                        <inline>1</inline>
+                        <eval>1</eval>
+                        <dynamic>0</dynamic>
+                    </default>
+                    <children>
+                        <policy_id>child-src</policy_id>
+                        <self>1</self>
+                        <inline>1</inline>
+                        <eval>0</eval>
+                        <dynamic>0</dynamic>
+                    </children>
+                    <connections>
+                        <policy_id>connect-src</policy_id>
+                        <self>1</self>
+                        <inline>1</inline>
+                        <eval>0</eval>
+                        <dynamic>0</dynamic>
+                    </connections>
+                    <manifests>
+                        <policy_id>manifest-src</policy_id>
+                        <self>1</self>
+                        <inline>1</inline>
+                        <eval>0</eval>
+                        <dynamic>0</dynamic>
+                    </manifests>
+                    <media>
+                        <policy_id>media-src</policy_id>
+                        <self>1</self>
+                        <inline>1</inline>
+                        <eval>0</eval>
+                        <dynamic>0</dynamic>
+                    </media>
+                    <objects>
+                        <policy_id>object-src</policy_id>
+                        <self>1</self>
+                        <inline>1</inline>
+                        <eval>0</eval>
+                        <dynamic>0</dynamic>
+                    </objects>
+                    <styles>
+                        <policy_id>style-src</policy_id>
+                        <self>1</self>
+                        <inline>1</inline>
+                        <eval>0</eval>
+                        <dynamic>0</dynamic>
+                    </styles>
+                    <scripts>
+                        <policy_id>script-src</policy_id>
+                        <self>1</self>
+                        <inline>1</inline>
+                        <eval>1</eval>
+                        <dynamic>0</dynamic>
+                    </scripts>
+                    <images>
+                        <policy_id>img-src</policy_id>
+                        <self>1</self>
+                        <inline>1</inline>
+                        <eval>0</eval>
+                        <dynamic>0</dynamic>
+                    </images>
+                    <frames>
+                        <policy_id>frame-src</policy_id>
+                        <self>1</self>
+                        <inline>1</inline>
+                        <eval>0</eval>
+                        <dynamic>0</dynamic>
+                    </frames>
+                    <frame-ancestors>
+                        <policy_id>frame-ancestors</policy_id>
+                        <self>1</self>
+                        <inline>1</inline>
+                        <eval>0</eval>
+                        <dynamic>0</dynamic>
+                    </frame-ancestors>
+                    <forms>
+                        <policy_id>form-action</policy_id>
+                        <self>1</self>
+                        <inline>1</inline>
+                        <eval>0</eval>
+                        <dynamic>0</dynamic>
+                    </forms>
+                    <fonts>
+                        <policy_id>font-src</policy_id>
+                        <self>1</self>
+                        <inline>1</inline>
+                        <eval>0</eval>
+                        <dynamic>0</dynamic>
+                    </fonts>
+                </admin>
+            </policies>
         </csp>
     </default>
 </config>
diff --git a/app/code/Magento/GoogleAdwords/etc/csp_whitelist.xml b/app/code/Magento/GoogleAdwords/etc/csp_whitelist.xml
new file mode 100644
index 0000000000000..d700b0e9e7668
--- /dev/null
+++ b/app/code/Magento/GoogleAdwords/etc/csp_whitelist.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp:etc/csp_whitelist.xsd">
+    <policies>
+        <policy id="script-src">
+            <values>
+                <value id="google_ad_services" type="host">www.googleadservices.com</value>
+                <value id="google_analytics" type="host">www.google-analytics.com</value>
+            </values>
+        </policy>
+        <policy id="img-src">
+            <values>
+                <value id="google_ad_services" type="host">www.googleadservices.com</value>
+                <value id="google_analytics" type="host">www.google-analytics.com</value>
+            </values>
+        </policy>
+    </policies>
+</csp_whitelist>
diff --git a/app/code/Magento/Paypal/etc/csp_whitelist.xml b/app/code/Magento/Paypal/etc/csp_whitelist.xml
new file mode 100644
index 0000000000000..932664bde9e09
--- /dev/null
+++ b/app/code/Magento/Paypal/etc/csp_whitelist.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp:etc/csp_whitelist.xsd">
+    <policies>
+        <policy id="img-src">
+            <values>
+                <value id="paypal_analytics" type="host">t.paypal.com</value>
+                <value id="www_paypal" type="host">www.paypal.com</value>
+                <value id="paypal_objects" type="host">www.paypalobjects.com</value>
+                <value id="paypal_fpdbs" type="host">fpdbs.paypal.com</value>
+                <value id="paypal_fpdbs_sandbox" type="host">fpdbs.sandbox.paypal.com</value>
+            </values>
+        </policy>
+        <policy id="script-src">
+            <values>
+                <value id="www_paypal" type="host">www.paypal.com</value>
+                <value id="www_sandbox_paypal" type="host">www.sandbox.paypal.com</value>
+                <value id="paypal_objects" type="host">www.paypalobjects.com</value>
+                <value id="paypal_analytics" type="host">t.paypal.com</value>
+            </values>
+        </policy>
+        <policy id="frame-src">
+            <values>
+                <value id="www_paypal" type="host">www.paypal.com</value>
+                <value id="www_sandbox_paypal" type="host">www.sandbox.paypal.com</value>
+            </values>
+        </policy>
+    </policies>
+</csp_whitelist>
diff --git a/app/code/Magento/ProductVideo/etc/csp_whitelist.xml b/app/code/Magento/ProductVideo/etc/csp_whitelist.xml
new file mode 100644
index 0000000000000..ca4536057104d
--- /dev/null
+++ b/app/code/Magento/ProductVideo/etc/csp_whitelist.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp:etc/csp_whitelist.xsd">
+    <policies>
+        <policy id="script-src">
+            <values>
+                <value id="youtube_cdn" type="host">s.ytimg.com</value>
+                <value id="google_video" type="host">www.googleapis.com</value>
+                <value id="vimeo" type="host">vimeo.com</value>
+                <value id="www_vimeo" type="host">www.vimeo.com</value>
+            </values>
+        </policy>
+        <policy id="img-src">
+            <values>
+                <value id="vimeo_cdn" type="host">*.vimeocdn.com</value>
+            </values>
+        </policy>
+    </policies>
+</csp_whitelist>
diff --git a/app/code/Magento/Signifyd/etc/csp_whitelist.xml b/app/code/Magento/Signifyd/etc/csp_whitelist.xml
new file mode 100644
index 0000000000000..35af3809cb225
--- /dev/null
+++ b/app/code/Magento/Signifyd/etc/csp_whitelist.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp:etc/csp_whitelist.xsd">
+    <policies>
+        <policy id="script-src">
+            <values>
+                <value id="signifyd_cdn" type="host">cdn-scripts.signifyd.com</value>
+            </values>
+        </policy>
+    </policies>
+</csp_whitelist>
diff --git a/app/code/Magento/Tinymce3/etc/csp_whitelist.xml b/app/code/Magento/Tinymce3/etc/csp_whitelist.xml
new file mode 100644
index 0000000000000..e2b2364dc80e8
--- /dev/null
+++ b/app/code/Magento/Tinymce3/etc/csp_whitelist.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp:etc/csp_whitelist.xsd">
+    <policies>
+        <policy id="style-src">
+            <values>
+                <value id="firebug" type="host">getfirebug.com</value>
+            </values>
+        </policy>
+        <policy id="script-src">
+            <values>
+                <value id="www_youtube" type="host">www.youtube.com</value>
+                <value id="google_video" type="host">video.google.com</value>
+            </values>
+        </policy>
+        <policy id="img-src">
+            <values>
+                <value id="youtube_cdn" type="host">s.ytimg.com</value>
+            </values>
+        </policy>
+    </policies>
+</csp_whitelist>
diff --git a/dev/tests/integration/testsuite/Magento/Csp/CspTest.php b/dev/tests/integration/testsuite/Magento/Csp/CspTest.php
index e66c6af36e42c..eeb96d8943ced 100644
--- a/dev/tests/integration/testsuite/Magento/Csp/CspTest.php
+++ b/dev/tests/integration/testsuite/Magento/Csp/CspTest.php
@@ -67,7 +67,7 @@ public function testStorefrontPolicies(): void
         $this->assertFalse($this->searchInResponse($response, '\'none\''));
         $this->assertTrue($this->searchInResponse($response, 'script-src'));
         $this->assertTrue($this->searchInResponse($response, '\'unsafe-inline\''));
-        $this->assertFalse($this->searchInResponse($response, 'font-src'));
+        $this->assertTrue($this->searchInResponse($response, 'font-src'));
         //Policies configured in cps_whitelist.xml files
         $this->assertTrue($this->searchInResponse($response, 'object-src'));
         $this->assertTrue($this->searchInResponse($response, 'media-src'));
@@ -104,7 +104,7 @@ public function testAdminPolicies(): void
         $this->assertFalse($this->searchInResponse($response, '\'none\''));
         $this->assertTrue($this->searchInResponse($response, 'script-src'));
         $this->assertTrue($this->searchInResponse($response, '\'unsafe-inline\''));
-        $this->assertFalse($this->searchInResponse($response, 'font-src'));
+        $this->assertTrue($this->searchInResponse($response, 'font-src'));
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Csp/Model/Collector/ConfigCollectorTest.php b/dev/tests/integration/testsuite/Magento/Csp/Model/Collector/ConfigCollectorTest.php
index 6d8876012df1e..6cfafcb55b46f 100644
--- a/dev/tests/integration/testsuite/Magento/Csp/Model/Collector/ConfigCollectorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Csp/Model/Collector/ConfigCollectorTest.php
@@ -86,59 +86,74 @@ private function getExpectedPolicies(): array
      * Test initiating policies from config.
      *
      * @magentoAppArea frontend
-     * @magentoConfigFixture default_store csp/policies/storefront/default_src/policy_id default-src
-     * @magentoConfigFixture default_store csp/policies/storefront/default_src/none 0
-     * @magentoConfigFixture default_store csp/policies/storefront/default_src/hosts/example http://magento.com
-     * @magentoConfigFixture default_store csp/policies/storefront/default_src/hosts/example2 http://devdocs.magento.com
-     * @magentoConfigFixture default_store csp/policies/storefront/default_src/self 1
-     * @magentoConfigFixture default_store csp/policies/storefront/child_src/policy_id child-src
-     * @magentoConfigFixture default_store csp/policies/storefront/child_src/none 0
-     * @magentoConfigFixture default_store csp/policies/storefront/child_src/hosts/example http://magento.com
-     * @magentoConfigFixture default_store csp/policies/storefront/child_src/hosts/example2 http://devdocs.magento.com
-     * @magentoConfigFixture default_store csp/policies/storefront/child_src/self 1
-     * @magentoConfigFixture default_store csp/policies/storefront/child_src/inline 1
-     * @magentoConfigFixture default_store csp/policies/storefront/child_src/schemes/scheme1 http
-     * @magentoConfigFixture default_store csp/policies/storefront/child_src/dynamic 1
-     * @magentoConfigFixture default_store csp/policies/storefront/child_src2/policy_id child-src
-     * @magentoConfigFixture default_store csp/policies/storefront/child_src2/none 0
-     * @magentoConfigFixture default_store csp/policies/storefront/child_src2/eval 1
-     * @magentoConfigFixture default_store csp/policies/storefront/connect_src/policy_id connect-src
-     * @magentoConfigFixture default_store csp/policies/storefront/connect_src/none 1
-     * @magentoConfigFixture default_store csp/policies/storefront/font_src/policy_id font-src
-     * @magentoConfigFixture default_store csp/policies/storefront/font_src/none 0
-     * @magentoConfigFixture default_store csp/policies/storefront/font_src/self 1
-     * @magentoConfigFixture default_store csp/policies/storefront/frame_src/policy_id frame-src
-     * @magentoConfigFixture default_store csp/policies/storefront/frame_src/none 0
-     * @magentoConfigFixture default_store csp/policies/storefront/frame_src/self 1
-     * @magentoConfigFixture default_store csp/policies/storefront/frame_src/dynamic 1
-     * @magentoConfigFixture default_store csp/policies/storefront/img_src/policy_id img-src
-     * @magentoConfigFixture default_store csp/policies/storefront/img_src/none 0
-     * @magentoConfigFixture default_store csp/policies/storefront/img_src/self 1
-     * @magentoConfigFixture default_store csp/policies/storefront/manifest_src/policy_id manifest-src
-     * @magentoConfigFixture default_store csp/policies/storefront/manifest_src/none 0
-     * @magentoConfigFixture default_store csp/policies/storefront/manifest_src/self 1
-     * @magentoConfigFixture default_store csp/policies/storefront/media_src/policy_id media-src
-     * @magentoConfigFixture default_store csp/policies/storefront/media_src/none 0
-     * @magentoConfigFixture default_store csp/policies/storefront/media_src/self 1
-     * @magentoConfigFixture default_store csp/policies/storefront/object_src/policy_id object-src
-     * @magentoConfigFixture default_store csp/policies/storefront/object_src/none 0
-     * @magentoConfigFixture default_store csp/policies/storefront/object_src/self 1
-     * @magentoConfigFixture default_store csp/policies/storefront/script_src/policy_id script-src
-     * @magentoConfigFixture default_store csp/policies/storefront/script_src/none 0
-     * @magentoConfigFixture default_store csp/policies/storefront/script_src/self 1
-     * @magentoConfigFixture default_store csp/policies/storefront/script_src/event_handlers 1
+     * @magentoConfigFixture default_store csp/policies/storefront/default/policy_id default-src
+     * @magentoConfigFixture default_store csp/policies/storefront/default/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/default/hosts/example http://magento.com
+     * @magentoConfigFixture default_store csp/policies/storefront/default/hosts/example2 http://devdocs.magento.com
+     * @magentoConfigFixture default_store csp/policies/storefront/default/self 1
+     * @magentoConfigFixture default_store csp/policies/storefront/default/eval 0
+     * @magentoConfigFixture default_store csp/policies/storefront/default/inline 0
+     * @magentoConfigFixture default_store csp/policies/storefront/children/policy_id child-src
+     * @magentoConfigFixture default_store csp/policies/storefront/children/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/children/hosts/example http://magento.com
+     * @magentoConfigFixture default_store csp/policies/storefront/children/hosts/example2 http://devdocs.magento.com
+     * @magentoConfigFixture default_store csp/policies/storefront/children/self 1
+     * @magentoConfigFixture default_store csp/policies/storefront/children/inline 1
+     * @magentoConfigFixture default_store csp/policies/storefront/children/schemes/scheme1 http
+     * @magentoConfigFixture default_store csp/policies/storefront/children/dynamic 1
+     * @magentoConfigFixture default_store csp/policies/storefront/children-2/policy_id child-src
+     * @magentoConfigFixture default_store csp/policies/storefront/children-2/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/children-2/eval 1
+     * @magentoConfigFixture default_store csp/policies/storefront/connections/policy_id connect-src
+     * @magentoConfigFixture default_store csp/policies/storefront/connections/none 1
+     * @magentoConfigFixture default_store csp/policies/storefront/connections/self 0
+     * @magentoConfigFixture default_store csp/policies/storefront/connections/inline 0
+     * @magentoConfigFixture default_store csp/policies/storefront/fonts/policy_id font-src
+     * @magentoConfigFixture default_store csp/policies/storefront/fonts/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/fonts/self 1
+     * @magentoConfigFixture default_store csp/policies/storefront/fonts/inline 0
+     * @magentoConfigFixture default_store csp/policies/storefront/frames/policy_id frame-src
+     * @magentoConfigFixture default_store csp/policies/storefront/frames/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/frames/self 1
+     * @magentoConfigFixture default_store csp/policies/storefront/frames/dynamic 1
+     * @magentoConfigFixture default_store csp/policies/storefront/frames/inline 0
+     * @magentoConfigFixture default_store csp/policies/storefront/images/policy_id img-src
+     * @magentoConfigFixture default_store csp/policies/storefront/images/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/images/self 1
+     * @magentoConfigFixture default_store csp/policies/storefront/images/inline 0
+     * @magentoConfigFixture default_store csp/policies/storefront/manifests/policy_id manifest-src
+     * @magentoConfigFixture default_store csp/policies/storefront/manifests/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/manifests/self 1
+     * @magentoConfigFixture default_store csp/policies/storefront/manifests/inline 0
+     * @magentoConfigFixture default_store csp/policies/storefront/media/policy_id media-src
+     * @magentoConfigFixture default_store csp/policies/storefront/media/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/media/self 1
+     * @magentoConfigFixture default_store csp/policies/storefront/media/inline 0
+     * @magentoConfigFixture default_store csp/policies/storefront/objects/policy_id object-src
+     * @magentoConfigFixture default_store csp/policies/storefront/objects/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/objects/self 1
+     * @magentoConfigFixture default_store csp/policies/storefront/objects/inline 0
+     * @magentoConfigFixture default_store csp/policies/storefront/scripts/policy_id script-src
+     * @magentoConfigFixture default_store csp/policies/storefront/scripts/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/scripts/self 1
+     * @magentoConfigFixture default_store csp/policies/storefront/scripts/inline 0
+     * @magentoConfigFixture default_store csp/policies/storefront/scripts/eval 0
+     * @magentoConfigFixture default_store csp/policies/storefront/scripts/event_handlers 1
      * @magentoConfigFixture default_store csp/policies/storefront/base_uri/policy_id base-uri
      * @magentoConfigFixture default_store csp/policies/storefront/base_uri/none 0
      * @magentoConfigFixture default_store csp/policies/storefront/base_uri/self 1
-     * @magentoConfigFixture default_store csp/policies/storefront/style_src/policy_id style-src
-     * @magentoConfigFixture default_store csp/policies/storefront/style_src/none 0
-     * @magentoConfigFixture default_store csp/policies/storefront/style_src/self 1
-     * @magentoConfigFixture default_store csp/policies/storefront/form_action/policy_id form-action
-     * @magentoConfigFixture default_store csp/policies/storefront/form_action/none 0
-     * @magentoConfigFixture default_store csp/policies/storefront/form_action/self 1
-     * @magentoConfigFixture default_store csp/policies/storefront/frame_ancestors/policy_id frame-ancestors
-     * @magentoConfigFixture default_store csp/policies/storefront/frame_ancestors/none 0
-     * @magentoConfigFixture default_store csp/policies/storefront/frame_ancestors/self 1
+     * @magentoConfigFixture default_store csp/policies/storefront/styles/policy_id style-src
+     * @magentoConfigFixture default_store csp/policies/storefront/styles/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/styles/self 1
+     * @magentoConfigFixture default_store csp/policies/storefront/styles/inline 0
+     * @magentoConfigFixture default_store csp/policies/storefront/forms/policy_id form-action
+     * @magentoConfigFixture default_store csp/policies/storefront/forms/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/forms/self 1
+     * @magentoConfigFixture default_store csp/policies/storefront/forms/inline 0
+     * @magentoConfigFixture default_store csp/policies/storefront/frame-ancestors/policy_id frame-ancestors
+     * @magentoConfigFixture default_store csp/policies/storefront/frame-ancestors/none 0
+     * @magentoConfigFixture default_store csp/policies/storefront/frame-ancestors/self 1
+     * @magentoConfigFixture default_store csp/policies/storefront/frame-ancestors/inline 0
      * @magentoConfigFixture default_store csp/policies/storefront/plugin_types/policy_id plugin-types
      * @magentoConfigFixture default_store csp/policies/storefront/plugin_types/types/fl application/x-shockwave-flash
      * @magentoConfigFixture default_store csp/policies/storefront/plugin_types/types/applet application/x-java-applet
@@ -155,32 +170,30 @@ private function getExpectedPolicies(): array
      * @magentoConfigFixture default_store csp/policies/storefront/sandbox/navigation 1
      * @magentoConfigFixture default_store csp/policies/storefront/sandbox/navigation_by_user 1
      * @magentoConfigFixture default_store csp/policies/storefront/mixed_content/policy_id block-all-mixed-content
+     * @magentoConfigFixture default_store csp/policies/storefront/base/policy_id base-uri
+     * @magentoConfigFixture default_store csp/policies/storefront/base/inline 0
      * @magentoConfigFixture default_store csp/policies/storefront/upgrade/policy_id upgrade-insecure-requests
      * @return void
      */
     public function testCollecting(): void
     {
         $policies = $this->collector->collect([new FlagPolicy('upgrade-insecure-requests')]);
-        $checked = [];
         $expectedPolicies = $this->getExpectedPolicies();
-
-        //Policies were collected
         $this->assertNotEmpty($policies);
-        //Default policies are being kept
-        /** @var PolicyInterface $defaultPolicy */
         $defaultPolicy = array_shift($policies);
         $this->assertEquals('upgrade-insecure-requests', $defaultPolicy->getId());
-        //Comparing collected with configured
-        /** @var PolicyInterface $policy */
+        $expectedPolicyKeys = array_keys($expectedPolicies);
+        $checkedKeys = [];
+
         foreach ($policies as $policy) {
             $id = $policy->getId();
+            $this->assertTrue(in_array($id, $expectedPolicyKeys));
             if ($id === 'child-src' && $policy->isEvalAllowed()) {
                 $id = 'child-src2';
             }
-            $this->assertEquals($expectedPolicies[$id], $policy);
-            $checked[] = $id;
+            $this->assertEquals($expectedPolicies[$id]->getValue(), $policy->getValue());
+            $checkedKeys[] = $id;
         }
-        $expectedIds = array_keys($expectedPolicies);
-        $this->assertEquals(sort($expectedIds), sort($checked));
+        $this->assertEmpty(array_diff($expectedPolicyKeys, $checkedKeys));
     }
 }

From a900ac08b9b8e775c9b392aaee8e7929f4b84e8e Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Mon, 23 Mar 2020 16:11:06 -0500
Subject: [PATCH 0094/1718] MC-24063: [2.4.x Port] Implement CSP

---
 .../Renderer/SimplePolicyHeaderRenderer.php   |  7 +++--
 .../Magento/Csp/CspAwareActionTest.php        | 10 +++---
 .../testsuite/Magento/Csp/CspUtilTest.php     | 11 +++----
 .../SimplePolicyHeaderRendererTest.php        | 22 ++-----------
 .../HTTP/PhpEnvironment/Response.php          | 31 +++++++++++++++++--
 5 files changed, 46 insertions(+), 35 deletions(-)

diff --git a/app/code/Magento/Csp/Model/Policy/Renderer/SimplePolicyHeaderRenderer.php b/app/code/Magento/Csp/Model/Policy/Renderer/SimplePolicyHeaderRenderer.php
index 14ae23eb3fe37..d419c25acc4ce 100644
--- a/app/code/Magento/Csp/Model/Policy/Renderer/SimplePolicyHeaderRenderer.php
+++ b/app/code/Magento/Csp/Model/Policy/Renderer/SimplePolicyHeaderRenderer.php
@@ -45,7 +45,7 @@ public function render(PolicyInterface $policy, HttpResponse $response): void
             $header = 'Content-Security-Policy';
         }
         $value = $policy->getId() .' ' .$policy->getValue() .';';
-        if ($config->getReportUri()) {
+        if ($config->getReportUri() && !$response->getHeader('Report-To')) {
             $reportToData = [
                 'group' => 'report-endpoint',
                 'max_age' => 10886400,
@@ -57,7 +57,10 @@ public function render(PolicyInterface $policy, HttpResponse $response): void
             $value .= ' report-to '. $reportToData['group'] .';';
             $response->setHeader('Report-To', json_encode($reportToData), true);
         }
-        $response->setHeader($header, $value, false);
+        if ($existing = $response->getHeader($header)) {
+            $value = $value .' ' .$existing->getFieldValue();
+        }
+        $response->setHeader($header, $value, true);
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Csp/CspAwareActionTest.php b/dev/tests/integration/testsuite/Magento/Csp/CspAwareActionTest.php
index 20ed4d1b79bc8..7e1e2c236eed9 100644
--- a/dev/tests/integration/testsuite/Magento/Csp/CspAwareActionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Csp/CspAwareActionTest.php
@@ -31,15 +31,13 @@ public function testAwareAction(): void
     {
         $this->getRequest()->setMethod('GET');
         $this->dispatch('csputil/csp/aware');
-        $headers = '';
-        foreach ($this->getResponse()->getHeaders() as $header) {
-            $headers .= $header->getFieldName() .': ' .$header->getFieldValue() .PHP_EOL;
-        }
+        $header = $this->getResponse()->getHeader('Content-Security-Policy');
+        $this->assertNotEmpty($header);
 
         $this->assertContains(
-            'Content-Security-Policy: script-src https://controller.magento.com'
+            'script-src https://controller.magento.com'
                 .' \'self\' \'sha256-H4RRnauTM2X2Xg/z9zkno1crqhsaY3uKKu97uwmnXXE=\'',
-            $headers
+            $header->getFieldValue()
         );
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Csp/CspUtilTest.php b/dev/tests/integration/testsuite/Magento/Csp/CspUtilTest.php
index f33476c669111..362fb412eae12 100644
--- a/dev/tests/integration/testsuite/Magento/Csp/CspUtilTest.php
+++ b/dev/tests/integration/testsuite/Magento/Csp/CspUtilTest.php
@@ -20,6 +20,7 @@ class CspUtilTest extends AbstractController
      * Test that CSP helper for templates works.
      *
      * @return void
+     * @magentoConfigFixture default_store csp/mode/storefront/report_only 0
      */
     public function testPhtmlHelper(): void
     {
@@ -29,11 +30,9 @@ public function testPhtmlHelper(): void
 
         $this->assertContains('<script src="http://my.magento.com/static/script.js" />', $content);
         $this->assertContains("<script>\n    let myVar = 1;\n</script>", $content);
-        $headers = '';
-        foreach ($this->getResponse()->getHeaders() as $header) {
-            $headers .= $header->getFieldName() .': ' .$header->getFieldValue() .PHP_EOL;
-        }
-        $this->assertContains('http://my.magento.com', $headers);
-        $this->assertContains('\'sha256-H4RRnauTM2X2Xg/z9zkno1crqhsaY3uKKu97uwmnXXE=\'', $headers);
+        $header = $this->getResponse()->getHeader('Content-Security-Policy');
+        $this->assertNotEmpty($header);
+        $this->assertContains('http://my.magento.com', $header->getFieldValue());
+        $this->assertContains('\'sha256-H4RRnauTM2X2Xg/z9zkno1crqhsaY3uKKu97uwmnXXE=\'', $header->getFieldValue());
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Csp/Model/Policy/Renderer/SimplePolicyHeaderRendererTest.php b/dev/tests/integration/testsuite/Magento/Csp/Model/Policy/Renderer/SimplePolicyHeaderRendererTest.php
index 12ed71b708b88..a67665c6d3c48 100644
--- a/dev/tests/integration/testsuite/Magento/Csp/Model/Policy/Renderer/SimplePolicyHeaderRendererTest.php
+++ b/dev/tests/integration/testsuite/Magento/Csp/Model/Policy/Renderer/SimplePolicyHeaderRendererTest.php
@@ -53,15 +53,7 @@ public function testRenderRestrictMode(): void
 
         $this->assertNotEmpty($header = $this->response->getHeader('Content-Security-Policy'));
         $this->assertEmpty($this->response->getHeader('Content-Security-Policy-Report-Only'));
-        $contentSecurityPolicyContent = [];
-        if ($header instanceof \ArrayIterator) {
-            foreach ($header as $item) {
-                $contentSecurityPolicyContent[] = $item->getFieldValue();
-            }
-        } else {
-            $contentSecurityPolicyContent = [$header->getFieldValue()];
-        }
-        $this->assertEquals(['default-src https://magento.com \'self\';'], $contentSecurityPolicyContent);
+        $this->assertEquals('default-src https://magento.com \'self\';', $header->getFieldValue());
     }
 
     /**
@@ -81,17 +73,9 @@ public function testRenderRestrictWithReportingMode(): void
 
         $this->assertNotEmpty($header = $this->response->getHeader('Content-Security-Policy'));
         $this->assertEmpty($this->response->getHeader('Content-Security-Policy-Report-Only'));
-        $contentSecurityPolicyContent = [];
-        if ($header instanceof \ArrayIterator) {
-            foreach ($header as $item) {
-                $contentSecurityPolicyContent[] = $item->getFieldValue();
-            }
-        } else {
-            $contentSecurityPolicyContent = [$header->getFieldValue()];
-        }
         $this->assertEquals(
-            ['default-src https://magento.com \'self\'; report-uri /csp-reports/; report-to report-endpoint;'],
-            $contentSecurityPolicyContent
+            'default-src https://magento.com \'self\'; report-uri /csp-reports/; report-to report-endpoint;',
+            $header->getFieldValue()
         );
         $this->assertNotEmpty($reportToHeader = $this->response->getHeader('Report-To'));
         $this->assertNotEmpty($reportData = json_decode("[{$reportToHeader->getFieldValue()}]", true));
diff --git a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Response.php b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Response.php
index dfc68cf975d50..5f0e3212434c9 100644
--- a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Response.php
+++ b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Response.php
@@ -98,8 +98,13 @@ public function clearHeader($name)
     {
         $headers = $this->getHeaders();
         if ($headers->has($name)) {
-            $header = $headers->get($name);
-            $headers->removeHeader($header);
+            $headerValues = $headers->get($name);
+            if (!is_iterable($headerValues)) {
+                $headerValues = [$headerValues];
+            }
+            foreach ($headerValues as $headerValue) {
+                $headers->removeHeader($headerValue);
+            }
         }
 
         return $this;
@@ -187,4 +192,26 @@ public function __sleep()
     {
         return ['content', 'isRedirect', 'statusCode'];
     }
+
+    /**
+     * Sending provided headers.
+     *
+     * Had to be overridden because the original did not work correctly with multi-headers.
+     */
+    public function sendHeaders()
+    {
+        if ($this->headersSent()) {
+            return $this;
+        }
+
+        $status  = $this->renderStatusLine();
+        header($status);
+
+        /** @var \Zend\Http\Header\HeaderInterface $header */
+        foreach ($this->getHeaders() as $header) {
+            header($header->toString(), false);
+        }
+
+        return $this;
+    }
 }

From 6d31a61a535ab6368db35115a695bf7f010f8a18 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Mon, 23 Mar 2020 16:11:57 -0500
Subject: [PATCH 0095/1718] MC-24063: [2.4.x Port] Implement CSP

---
 .../Model/Collector/CspWhitelistXml/Data.php  | 44 +++++++++++++++++++
 .../Collector/CspWhitelistXmlCollector.php    |  4 +-
 app/code/Magento/Csp/etc/di.xml               | 10 +++++
 3 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/Csp/Model/Collector/CspWhitelistXml/Data.php

diff --git a/app/code/Magento/Csp/Model/Collector/CspWhitelistXml/Data.php b/app/code/Magento/Csp/Model/Collector/CspWhitelistXml/Data.php
new file mode 100644
index 0000000000000..015327df90efb
--- /dev/null
+++ b/app/code/Magento/Csp/Model/Collector/CspWhitelistXml/Data.php
@@ -0,0 +1,44 @@
+<?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\Serialize\SerializerInterface;
+use Magento\Framework\Config\Data\Scoped;
+use Magento\Framework\Config\ScopeInterface;
+use Magento\Framework\Config\CacheInterface;
+
+/**
+ * Provides CSP whitelist configuration
+ */
+class Data extends Scoped
+{
+    /**
+     * Scope priority loading scheme
+     *
+     * @var array
+     */
+    protected $_scopePriorityScheme = ['global'];
+
+    /**
+     * Constructor
+     *
+     * @param Reader $reader
+     * @param ScopeInterface $configScope
+     * @param CacheInterface $cache
+     * @param SerializerInterface $serializer
+     */
+    public function __construct(
+        Reader $reader,
+        ScopeInterface $configScope,
+        CacheInterface $cache,
+        SerializerInterface $serializer
+    ) {
+        parent::__construct($reader, $configScope, $cache, 'csp_whitelist_config', $serializer);
+    }
+}
diff --git a/app/code/Magento/Csp/Model/Collector/CspWhitelistXmlCollector.php b/app/code/Magento/Csp/Model/Collector/CspWhitelistXmlCollector.php
index 9f19a5299c063..7fa16fda52ab9 100644
--- a/app/code/Magento/Csp/Model/Collector/CspWhitelistXmlCollector.php
+++ b/app/code/Magento/Csp/Model/Collector/CspWhitelistXmlCollector.php
@@ -9,7 +9,7 @@
 namespace Magento\Csp\Model\Collector;
 
 use Magento\Csp\Api\PolicyCollectorInterface;
-use Magento\Csp\Model\Collector\CspWhitelistXml\Reader as ConfigReader;
+use Magento\Framework\Config\DataInterface as ConfigReader;
 use Magento\Csp\Model\Policy\FetchPolicy;
 
 /**
@@ -36,7 +36,7 @@ public function __construct(ConfigReader $configReader)
     public function collect(array $defaultPolicies = []): array
     {
         $policies = $defaultPolicies;
-        $config = $this->configReader->read();
+        $config = $this->configReader->get(null);
         foreach ($config as $policyId => $values) {
             $policies[] = new FetchPolicy(
                 $policyId,
diff --git a/app/code/Magento/Csp/etc/di.xml b/app/code/Magento/Csp/etc/di.xml
index e6e4f166117f7..6b380ab2d00d7 100644
--- a/app/code/Magento/Csp/etc/di.xml
+++ b/app/code/Magento/Csp/etc/di.xml
@@ -49,6 +49,16 @@
             <argument name="fileName" xsi:type="string">csp_whitelist.xml</argument>
         </arguments>
     </type>
+    <type name="Magento\Csp\Model\Collector\CspWhitelistXml\Data">
+        <arguments>
+            <argument name="reader" xsi:type="object">Magento\Csp\Model\Collector\CspWhitelistXml\Reader\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Csp\Model\Collector\CspWhitelistXmlCollector">
+        <arguments>
+            <argument name="configReader" xsi:type="object">Magento\Csp\Model\Collector\CspWhitelistXml\Data</argument>
+        </arguments>
+    </type>
     <type name="Magento\Framework\View\TemplateEngine\Php">
         <plugin name="csp_helper_plugin" type="Magento\Csp\Plugin\TemplateRenderingPlugin" />
     </type>

From 900fdb1cd758f52743cb62fbb0d10024195b0273 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Mon, 23 Mar 2020 16:13:29 -0500
Subject: [PATCH 0096/1718] MC-24063: [2.4.x Port] Implement CSP

---
 .../HTTP/PhpEnvironment/Response.php          | 22 -------------------
 1 file changed, 22 deletions(-)

diff --git a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Response.php b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Response.php
index 5f0e3212434c9..97c0ceb7c006f 100644
--- a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Response.php
+++ b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Response.php
@@ -192,26 +192,4 @@ public function __sleep()
     {
         return ['content', 'isRedirect', 'statusCode'];
     }
-
-    /**
-     * Sending provided headers.
-     *
-     * Had to be overridden because the original did not work correctly with multi-headers.
-     */
-    public function sendHeaders()
-    {
-        if ($this->headersSent()) {
-            return $this;
-        }
-
-        $status  = $this->renderStatusLine();
-        header($status);
-
-        /** @var \Zend\Http\Header\HeaderInterface $header */
-        foreach ($this->getHeaders() as $header) {
-            header($header->toString(), false);
-        }
-
-        return $this;
-    }
 }

From f084eb53aaeea813177dafe0b5b8adb243beb136 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Mon, 23 Mar 2020 16:28:15 -0500
Subject: [PATCH 0097/1718] MC-24063: [2.4.x Port] Implement CSP

---
 .../System/Config/CollectionTimeLabelTest.php |   7 +-
 .../Config/SubscriptionStatusLabelTest.php    |   2 +-
 .../Adminhtml/System/Config/VerticalTest.php  |   2 +-
 .../Magento/Backend/Block/Widget/Button.php   |  84 ++++++++++-
 .../Block/Widget/Button/SplitButton.php       | 104 +++++++++++++-
 .../form/renderer/fieldset/element.phtml      |  20 ++-
 .../templates/widget/button/split.phtml       |   9 +-
 .../templates/widget/form/element.phtml       | 130 +++++++++++++-----
 .../System/Config/Form/Field/ImageTest.php    |  21 ++-
 .../Form/Field/Select/AllowspecificTest.php   |  16 ++-
 app/code/Magento/Csp/Helper/InlineUtil.php    | 110 +++++++++------
 .../Magento/Csp/Model/Policy/FetchPolicy.php  |  12 +-
 .../Csp/Plugin/TemplateRenderingPlugin.php    |  48 -------
 app/code/Magento/Csp/etc/di.xml               |  44 +++++-
 .../Test/Unit/Model/Renderer/RegionTest.php   |  37 ++++-
 .../Block/Adminhtml/Form/Field/ImportTest.php |  11 +-
 .../Field/Enable/AbstractEnableTest.php       |  35 ++++-
 .../Magento/Ui/Component/Control/Button.php   | 102 +++++++++++++-
 .../Ui/Component/Control/SplitButton.php      | 115 +++++++++++++++-
 .../Unit/Component/Control/ButtonTest.php     |   4 +-
 .../base/templates/control/button/split.phtml |   9 +-
 app/etc/di.xml                                |   7 +
 .../Test/Block/Adminhtml/Order/Create.php     |   4 +-
 .../Block/Adminhtml/Order/Create/Coupons.php  |   2 +-
 .../Controller/Secure/Helper.php              |  25 ++++
 .../composer.json                             |  21 +++
 .../etc/frontend/routes.xml                   |  14 ++
 .../etc/module.xml                            |  10 ++
 .../registration.php                          |  12 ++
 .../layout/securehtml_secure_helper.xml       |  17 +++
 .../view/frontend/templates/helper.phtml      |  13 ++
 .../integration/etc/di/preferences/ce.php     |   8 +-
 .../Block/Widget/Button/SplitButtonTest.php   |  89 ++++++++++++
 .../Backend/Block/Widget/ButtonTest.php       |  82 +++++++++++
 .../Magento/Backend/Block/WidgetTest.php      |   9 +-
 .../Tab/Bundle/Option/Search/GridTest.php     |   2 +-
 .../Controller/Adminhtml/CategoryTest.php     |   6 +
 .../Controller/Adminhtml/ProductTest.php      |   7 +
 .../Catalog/Controller/CategoryTest.php       |   6 +
 .../Catalog/Controller/ProductTest.php        |   6 +
 .../Backend/AbstractLayoutUpdateTest.php      |   6 +
 .../Model/Category/DataProviderTest.php       |   8 +-
 .../Catalog/Model/CategoryRepositoryTest.php  |   6 +
 .../Catalog/Model/ProductRepositoryTest.php   |   6 +
 .../Form/Modifier/LayoutUpdateTest.php        |   6 +
 .../Controller/Adminhtml/PageDesignTest.php   |   6 +
 .../Magento/Cms/Controller/PageTest.php       |  14 ++
 .../Model/Page/CustomLayoutRepositoryTest.php |   8 ++
 .../Cms/Model/Page/DataProviderTest.php       |   6 +
 .../Magento/Cms/Model/PageRepositoryTest.php  |   6 +
 .../Cms/_files/pages_with_layout_xml.php      |   6 +
 .../testsuite/Magento/Csp/CspUtilTest.php     |   5 +-
 .../Magento/Csp/Helper/InlineUtilTest.php     | 104 ++++++++++----
 .../Model/Collector/DynamicCollectorMock.php  |  44 ++++++
 .../SimplePolicyHeaderRendererTest.php        |  39 +++++-
 .../Helper/SecureHtmlRendererTemplateTest.php |  48 +++++++
 .../View/Helper/SecureHtmlRendererTest.php    |  91 ++++++++++++
 .../Order/Create/Form/AccountTest.php         |  20 +--
 .../Ui/Component/Control/ButtonTest.php       |  82 +++++++++++
 .../Ui/Component/Control/SplitButtonTest.php  |  91 ++++++++++++
 .../Block/Catalog/Category/EditTest.php       |  26 ++--
 .../Block/Catalog/Product/EditTest.php        |  28 ++--
 .../UrlRewrite/Block/Cms/Page/EditTest.php    |  28 ++--
 .../Adminhtml/Widget/InstanceTest.php         |   5 +-
 .../Data/Form/Element/AbstractElement.php     |  97 ++++++++++++-
 .../Data/Form/Element/Checkboxes.php          |  45 +++---
 .../Data/Form/Element/Editablemultiselect.php |  59 ++++++--
 .../Framework/Data/Form/Element/Editor.php    | 117 ++++++++++++----
 .../Framework/Data/Form/Element/Gallery.php   |  95 +++++++++----
 .../Framework/Data/Form/Element/Image.php     |  46 +++++--
 .../Framework/Data/Form/Element/Link.php      |  16 ++-
 .../Data/Form/Element/Multiselect.php         | 116 +++++++++++-----
 .../Framework/Data/Form/Element/Radios.php    |  61 ++++++--
 .../Framework/Data/Form/Element/Select.php    |  42 +++++-
 .../Framework/Data/Form/Element/Time.php      |  34 ++++-
 .../Unit/Form/Element/AbstractElementTest.php |  44 ++++--
 .../Form/Element/EditablemultiselectTest.php  |  34 ++++-
 .../Test/Unit/Form/Element/EditorTest.php     |  29 +++-
 .../Data/Test/Unit/Form/Element/ImageTest.php |  30 +++-
 .../Data/Test/Unit/Form/Element/LinkTest.php  |  15 +-
 .../Unit/Form/Element/MultiselectTest.php     |  29 +++-
 .../SecureHtmlRender/EventHandlerData.php     |  55 ++++++++
 .../Helper/SecureHtmlRender/HtmlRenderer.php  |  72 ++++++++++
 .../SecurityProcessorInterface.php            |  31 +++++
 .../View/Helper/SecureHtmlRender/TagData.php  |  89 ++++++++++++
 .../View/Helper/SecureHtmlRenderer.php        | 117 ++++++++++++++++
 .../Framework/View/TemplateEngine/Php.php     |  15 +-
 87 files changed, 2773 insertions(+), 466 deletions(-)
 delete mode 100644 app/code/Magento/Csp/Plugin/TemplateRenderingPlugin.php
 create mode 100644 dev/tests/integration/_files/Magento/TestModuleSecureHtmlRenderer/Controller/Secure/Helper.php
 create mode 100644 dev/tests/integration/_files/Magento/TestModuleSecureHtmlRenderer/composer.json
 create mode 100644 dev/tests/integration/_files/Magento/TestModuleSecureHtmlRenderer/etc/frontend/routes.xml
 create mode 100644 dev/tests/integration/_files/Magento/TestModuleSecureHtmlRenderer/etc/module.xml
 create mode 100644 dev/tests/integration/_files/Magento/TestModuleSecureHtmlRenderer/registration.php
 create mode 100644 dev/tests/integration/_files/Magento/TestModuleSecureHtmlRenderer/view/frontend/layout/securehtml_secure_helper.xml
 create mode 100644 dev/tests/integration/_files/Magento/TestModuleSecureHtmlRenderer/view/frontend/templates/helper.phtml
 create mode 100644 dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Button/SplitButtonTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Backend/Block/Widget/ButtonTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Csp/Model/Collector/DynamicCollectorMock.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTemplateTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Ui/Component/Control/ButtonTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Ui/Component/Control/SplitButtonTest.php
 create mode 100644 lib/internal/Magento/Framework/View/Helper/SecureHtmlRender/EventHandlerData.php
 create mode 100644 lib/internal/Magento/Framework/View/Helper/SecureHtmlRender/HtmlRenderer.php
 create mode 100644 lib/internal/Magento/Framework/View/Helper/SecureHtmlRender/SecurityProcessorInterface.php
 create mode 100644 lib/internal/Magento/Framework/View/Helper/SecureHtmlRender/TagData.php
 create mode 100644 lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php

diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php
index 3a98fd6acbf4d..cf2c6d46539fa 100644
--- a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php
@@ -53,13 +53,18 @@ class CollectionTimeLabelTest extends TestCase
      */
     private $abstractElementMock;
 
+    /**
+     * @var \PHPUnit\Framework\MockObject\MockObject
+     */
+    private $formMock;
+
     /**
      * @inheritDoc
      */
     protected function setUp()
     {
         $this->abstractElementMock = $this->getMockBuilder(AbstractElement::class)
-            ->setMethods(['getComment'])
+            ->setMethods(['getComment', 'getElementHtml'])
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/SubscriptionStatusLabelTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/SubscriptionStatusLabelTest.php
index b43225be9570d..34a1a0129362e 100644
--- a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/SubscriptionStatusLabelTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/SubscriptionStatusLabelTest.php
@@ -48,7 +48,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $this->abstractElementMock = $this->getMockBuilder(AbstractElement::class)
-            ->setMethods(['getComment'])
+            ->setMethods(['getComment', 'getElementHtml'])
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/VerticalTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/VerticalTest.php
index 0b5e86a523339..f462fbe62d8e7 100644
--- a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/VerticalTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/VerticalTest.php
@@ -36,7 +36,7 @@ class VerticalTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $this->abstractElementMock = $this->getMockBuilder(AbstractElement::class)
-            ->setMethods(['getComment', 'getLabel', 'getHint'])
+            ->setMethods(['getComment', 'getLabel', 'getHint', 'getElementHtml'])
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/app/code/Magento/Backend/Block/Widget/Button.php b/app/code/Magento/Backend/Block/Widget/Button.php
index 8385ecaa40a8b..6e449b4a33382 100644
--- a/app/code/Magento/Backend/Block/Widget/Button.php
+++ b/app/code/Magento/Backend/Block/Widget/Button.php
@@ -5,6 +5,11 @@
  */
 namespace Magento\Backend\Block\Widget;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Math\Random;
+use Magento\Backend\Block\Template\Context;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 /**
  * Button widget
  *
@@ -15,6 +20,33 @@
  */
 class Button extends \Magento\Backend\Block\Widget
 {
+    /**
+     * @var Random
+     */
+    private $random;
+
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
+    /**
+     * @param Context $context
+     * @param array $data
+     * @param Random|null $random
+     * @param SecureHtmlRenderer|null $htmlRenderer
+     */
+    public function __construct(
+        Context $context,
+        array $data = [],
+        ?Random $random = null,
+        ?SecureHtmlRenderer $htmlRenderer = null
+    ) {
+        parent::__construct($context, $data);
+        $this->random = $random ?? ObjectManager::getInstance()->get(Random::class);
+        $this->secureRenderer = $htmlRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+    }
+
     /**
      * Define block template
      *
@@ -90,11 +122,12 @@ protected function _prepareAttributes($title, $classes, $disabled)
             'title' => $title,
             'type' => $this->getType(),
             'class' => join(' ', $classes),
-            'onclick' => $this->getOnClick(),
-            'style' => $this->getStyle(),
             'value' => $this->getValue(),
             'disabled' => $disabled,
         ];
+        if ($this->hasData('backend_button_widget_hook_id')) {
+            $attributes['backend-button-widget-hook-id'] = $this->getData('backend_button_widget_hook_id');
+        }
         if ($this->getDataAttribute()) {
             foreach ($this->getDataAttribute() as $key => $attr) {
                 $attributes['data-' . $key] = is_scalar($attr) ? $attr : json_encode($attr);
@@ -121,4 +154,51 @@ protected function _attributesToHtml($attributes)
 
         return $html;
     }
+
+    /**
+     * Generate "style" tag aimed to replace "style" attribute of the button.
+     *
+     * @return string
+     */
+    private function generateStyle(): string
+    {
+        $buttonId = $this->getData('backend_button_widget_hook_id');
+        $style = $this->getStyle();
+
+        return <<<style
+            #{$this->getId()} {
+                $style
+            }
+style;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function _beforeToHtml()
+    {
+        parent::_beforeToHtml();
+
+        $this->setData('backend_button_widget_hook_id', $buttonId = 'buttonId' .$this->random->getRandomString(32));
+
+        $afterHtml = $this->getAfterHtml();
+        if ($this->getOnClick()) {
+            $afterHtml .= $this->secureRenderer->renderEventListenerAsTag(
+                'onclick',
+                $this->getOnClick(),
+                "*[backend-button-widget-hook-id='$buttonId']"
+            );
+        }
+        if ($this->getStyle()) {
+            $afterHtml .= $this->secureRenderer->renderTag(
+                'style',
+                [],
+                $this->generateStyle(),
+                false
+            );
+        }
+        $this->setAfterHtml($afterHtml);
+
+        return $this;
+    }
 }
diff --git a/app/code/Magento/Backend/Block/Widget/Button/SplitButton.php b/app/code/Magento/Backend/Block/Widget/Button/SplitButton.php
index db3f5466fbacb..a458097751698 100644
--- a/app/code/Magento/Backend/Block/Widget/Button/SplitButton.php
+++ b/app/code/Magento/Backend/Block/Widget/Button/SplitButton.php
@@ -5,6 +5,11 @@
  */
 namespace Magento\Backend\Block\Widget\Button;
 
+use Magento\Backend\Block\Template\Context;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Math\Random;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 /**
  * Split button widget
  *
@@ -21,6 +26,33 @@
  */
 class SplitButton extends \Magento\Backend\Block\Widget
 {
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
+    /**
+     * @var Random
+     */
+    private $random;
+
+    /**
+     * @param Context $context
+     * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
+     * @param Random|null $random
+     */
+    public function __construct(
+        Context $context,
+        array $data = [],
+        ?SecureHtmlRenderer $secureRenderer = null,
+        ?Random $random = null
+    ) {
+        parent::__construct($context, $data);
+        $this->secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+        $this->random = $random ?? ObjectManager::getInstance()->get(Random::class);
+    }
+
     /**
      * Define block template
      *
@@ -61,6 +93,16 @@ public function getAttributesHtml()
         return $html;
     }
 
+    /**
+     * Get main button's "id" attribute value.
+     *
+     * @return string
+     */
+    private function getButtonId(): string
+    {
+        return $this->getId() .'-button';
+    }
+
     /**
      * Retrieve button attributes html
      *
@@ -84,11 +126,10 @@ public function getButtonAttributesHtml()
             $classes[] = $disabled;
         }
         $attributes = [
-            'id' => $this->getId() . '-button',
+            'id' => $this->getButtonId(),
             'title' => $title,
             'class' => join(' ', $classes),
-            'disabled' => $disabled,
-            'style' => $this->getStyle(),
+            'disabled' => $disabled
         ];
 
         //TODO perhaps we need to skip data-mage-init when disabled="disabled"
@@ -180,7 +221,7 @@ public function hasSplit()
      * Add data attributes to $attributes array
      *
      * @param array $data
-     * @param array &$attributes
+     * @param array $attributes
      * @return void
      */
     protected function _getDataAttributes($data, &$attributes)
@@ -190,6 +231,22 @@ protected function _getDataAttributes($data, &$attributes)
         }
     }
 
+    /**
+     * Set and return "id" attribute value for an option.
+     *
+     * @param array $option
+     * @return string
+     */
+    private function identifyOption(array &$option): string
+    {
+        $id = isset($option['id'])
+            ? $option['id']
+            : (isset($option['id_attribute']) ? $option['id_attribute'] : 'optId' .$this->random->getRandomString(32));
+        $option['id_attribute'] = $id;
+
+        return $this->getId() .'-' .$id;
+    }
+
     /**
      * Prepare option attributes
      *
@@ -203,11 +260,9 @@ protected function _getDataAttributes($data, &$attributes)
     protected function _prepareOptionAttributes($option, $title, $classes, $disabled)
     {
         $attributes = [
-            'id' => isset($option['id']) ? $this->getId() . '-' . $option['id'] : '',
+            'id' => $this->identifyOption($option),
             'title' => $title,
             'class' => join(' ', $classes),
-            'onclick' => isset($option['onclick']) ? $option['onclick'] : '',
-            'style' => isset($option['style']) ? $option['style'] : '',
             'disabled' => $disabled,
         ];
 
@@ -235,4 +290,39 @@ protected function _getAttributesString($attributes)
         }
         return join(' ', $html);
     }
+
+    /**
+     * @inheritDoc
+     */
+    protected function _beforeToHtml()
+    {
+        parent::_beforeToHtml();
+
+        $afterHtml = $this->getAfterHtml();
+        /** @var array|null $options */
+        $options = $this->getOptions() ?? [];
+        foreach ($options as &$option) {
+            $id = $this->identifyOption($option);
+            if (!empty($option['onclick'])) {
+                $afterHtml .= $this->secureRenderer->renderEventListenerAsTag('onclick', $option['onclick'], "#$id");
+            }
+            if (!empty($option['style'])) {
+                $afterHtml .= $this->secureRenderer->renderTag(
+                    'style',
+                    [],
+                    <<<style
+                    #$id {
+                        {$option['style']}
+                    }
+style
+                    ,
+                    false
+                );
+            }
+        }
+        $this->setOptions($options);
+        $this->setAfterHtml($afterHtml);
+
+        return $this;
+    }
 }
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml
index 959a27279e5c2..eb64cc602eaf9 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml
@@ -21,19 +21,25 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" '
     . $block->getUiId('form-field', $element->getId());
 ?>
 
-<?php if (!$element->getNoDisplay()) : ?>
-    <?php if ($element->getType() == 'hidden') : ?>
+<?php if (!$element->getNoDisplay()): ?>
+    <?php if ($element->getType() == 'hidden'): ?>
         <?= $element->getElementHtml() ?>
-    <?php else : ?>
-    <div<?= /* @noEscape */ $fieldAttributes ?>>
-        <?php if ($elementBeforeLabel) : ?>
+    <?php else: ?>
+    <div <?= /* @noEscape */ $fieldAttributes ?>>
+        <?php if ($elementBeforeLabel): ?>
             <?= $element->getElementHtml() ?>
             <?= $element->getLabelHtml('', $element->getScopeLabel()) ?>
             <?= /* @noEscape */ $note ?>
-        <?php else : ?>
+        <?php else: ?>
             <?= $element->getLabelHtml('', $element->getScopeLabel()) ?>
             <div class="admin__field-control control">
-                <?= /* @noEscape */ ($addOn) ? '<div class="addon">' . $element->getElementHtml() . '</div>' : $element->getElementHtml() ?>
+                <?php if ($addOn): ?>
+                <div class="addon">
+                <?php endif; ?>
+                    <?= /* @noEscape */ $element->getElementHtml() ?>
+                <?php if ($addOn): ?>
+                </div>
+                <?php endif; ?>
                 <?= $block->getHintHtml() ?>
                 <?= /* @noEscape */ $note ?>
             </div>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml
index 0123de098a9e0..49b79ddfd7c16 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml
@@ -12,19 +12,19 @@
     <button <?= $block->getButtonAttributesHtml() ?>>
         <span><?= $block->escapeHtml($block->getLabel()) ?></span>
     </button>
-    <?php if ($block->hasSplit()) : ?>
+    <?php if ($block->hasSplit()): ?>
         <button <?= $block->getToggleAttributesHtml() ?>>
             <span>Select</span>
         </button>
 
-        <?php if (!$block->getDisabled()) : ?>
+        <?php if (!$block->getDisabled()): ?>
             <ul class="dropdown-menu" <?= /* @noEscape */ $block->getUiId("dropdown-menu") ?>>
-                <?php foreach ($block->getOptions() as $key => $option) : ?>
+                <?php foreach ($block->getOptions() as $key => &$option): ?>
                 <li>
                     <span <?= $block->getOptionAttributesHtml($key, $option) ?>>
                         <?= $block->escapeHtml($option['label']) ?>
                     </span>
-                    <?php if (isset($option['hint'])) : ?>
+                    <?php if (isset($option['hint'])): ?>
                     <div class="tooltip" <?= /* @noEscape */ $block->getUiId('item', $key, 'tooltip') ?>>
                         <a href="<?= $block->escapeHtml($option['hint']['href']) ?>" class="help">
                             <?= $block->escapeHtml($option['hint']['label']) ?>
@@ -37,6 +37,7 @@
         <?php endif; ?>
     <?php endif; ?>
 </div>
+<?= /* @noEscape */$block->getAfterHtml() ?>
 
 <script type="text/x-magento-init">
     {
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml
index ec53f7e5c74ce..fce4d094ee0b1 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml
@@ -4,46 +4,86 @@
  * See COPYING.txt for license details.
  */
 
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+
 $type = $element->getType();
+$htmlId = $element->getHtmlId();
 ?>
-<?php if ($type === 'fieldset') : ?>
+<?php if ($type === 'fieldset'): ?>
     <fieldset>
         <legend><?= $block->escapeHtml($element->getLegend()) ?></legend><br />
-        <?php foreach ($element->getElements() as $_element) : ?>
+        <?php foreach ($element->getElements() as $_element): ?>
             <?= /* @noEscape */ $formBlock->drawElement($_element) ?>
         <?php endforeach; ?>
     </fieldset>
-<?php elseif ($type === 'hidden') : ?>
-    <input type="<?= $block->escapeHtmlAttr($element->getType()) ?>" name="<?= $block->escapeHtmlAttr($element->getName()) ?>" id="<?= $element->getHtmlId() ?>" value="<?= $block->escapeHtmlAttr($element->getValue()) ?>">
-    <?php elseif ($type === 'select') : ?>
+<?php elseif ($type === 'hidden'): ?>
+    <input type="<?= $block->escapeHtmlAttr($element->getType()) ?>"
+           name="<?= $block->escapeHtmlAttr($element->getName()) ?>"
+           id="<?= /* @noEscape */ $htmlId ?>"
+           value="<?= $block->escapeHtmlAttr($element->getValue()) ?>">
+    <?php elseif ($type === 'select'): ?>
     <span class="form_row">
-        <?php if ($element->getLabel()) : ?><label for="<?= $element->getHtmlId() ?>"><?= $block->escapeHtml($element->getLabel()) ?>:</label><?php endif; ?>
-        <select name="<?= $block->escapeHtmlAttr($element->getName()) ?>" id="<?= $element->getHtmlId() ?>" class="select<?= $block->escapeHtmlAttr($element->getClass()) ?>" title="<?=  $block->escapeHtmlAttr($element->getTitle()) ?>">
-        <?php foreach ($element->getValues() as $_value) : ?>
-            <option <?= /* @noEscape */ $_value->serialize() ?><?php if ($_value->getValue() == $element->getValue()) : ?> selected="selected"<?php endif; ?>><?= $block->escapeHtml($_value->getLabel()) ?></option>
+        <?php if ($element->getLabel()): ?>
+            <label for="<?= /* @noEscape */ $htmlId ?>"><?= $block->escapeHtml($element->getLabel()) ?>:</label>
+        <?php endif; ?>
+        <select name="<?= $block->escapeHtmlAttr($element->getName()) ?>"
+                id="<?= /* @noEscape */ $htmlId ?>"
+                class="select<?= $block->escapeHtmlAttr($element->getClass()) ?>"
+                title="<?=  $block->escapeHtmlAttr($element->getTitle()) ?>">
+        <?php foreach ($element->getValues() as $_value): ?>
+            <option <?= /* @noEscape */ $_value->serialize() ?>
+                <?php if ($_value->getValue() == $element->getValue()): ?> selected="selected"<?php endif; ?>>
+                <?= $block->escapeHtml($_value->getLabel()) ?>
+            </option>
         <?php endforeach; ?>
         </select>
     </span>
-<?php elseif ($type === 'text' || $type === 'button' || $type === 'password') : ?>
+<?php elseif ($type === 'text' || $type === 'button' || $type === 'password'): ?>
     <span class="form_row">
-        <?php if ($element->getLabel()) : ?><label for="<?= $element->getHtmlId() ?>" <?= /* @noEscape */ $block->getUiId('label') ?>><?= $block->escapeHtml($element->getLabel()) ?>:</label><?php endif; ?>
-        <input type="<?= $block->escapeHtmlAttr($element->getType()) ?>" name="<?= $block->escapeHtmlAttr($element->getName()) ?>" id="<?= /* @noEscape */ $element->getHtmlId() ?>" value="<?= $block->escapeHtmlAttr($element->getValue()) ?>" class="input-text <?= $block->escapeHtmlAttr($element->getClass()) ?>" title="<?= $block->escapeHtmlAttr($element->getTitle()) ?>" <?= /* @noEscape */ ($element->getOnClick() ? 'onClick="' . $element->getOnClick() . '"' : '') ?>/>
+        <?php if ($element->getLabel()): ?>
+            <label for="<?= /* @noEscape */ $htmlId ?>" <?= /* @noEscape */ $block->getUiId('label') ?>>
+                <?= $block->escapeHtml($element->getLabel()) ?>:
+            </label>
+        <?php endif; ?>
+        <input type="<?= $block->escapeHtmlAttr($element->getType()) ?>"
+               name="<?= $block->escapeHtmlAttr($element->getName()) ?>"
+               id="<?= /* @noEscape */ $htmlId ?>"
+               value="<?= $block->escapeHtmlAttr($element->getValue()) ?>"
+               class="input-text <?= $block->escapeHtmlAttr($element->getClass()) ?>"
+               title="<?= $block->escapeHtmlAttr($element->getTitle()) ?>" />
+        <?php if ($listener = $element->getOnclick()): ?>
+            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag('onclick', $listener, "#{$htmlId}")  ?>
+        <?php endif; ?>
     </span>
-<?php elseif ($type === 'radio') : ?>
+<?php elseif ($type === 'radio'): ?>
     <span class="form_row">
-        <?php if ($element->getLabel()) : ?><label for="<?= $element->getHtmlId() ?>"><?= $block->escapeHtml($element->getLabel()) ?>:</label><?php endif; ?>
-        <input type="<?=  $block->escapeHtmlAttr($element->getType()) ?>" name="<?=  $block->escapeHtmlAttr($element->getName()) ?>" id="<?= $element->getHtmlId() ?>" value="<?=  $block->escapeHtmlAttr($element->getValue()) ?>" class="input-text <?= $block->escapeHtmlAttr($element->getClass()) ?>" title="<?=  $block->escapeHtmlAttr($element->getTitle()) ?>"/>
+        <?php if ($element->getLabel()): ?>
+            <label for="<?= /* @noEscape */ $htmlId ?>"><?= $block->escapeHtml($element->getLabel()) ?>:</label>
+        <?php endif; ?>
+        <input type="<?=  $block->escapeHtmlAttr($element->getType()) ?>"
+               name="<?=  $block->escapeHtmlAttr($element->getName()) ?>"
+               id="<?= /* @noEscape */ $htmlId ?>"
+               value="<?=  $block->escapeHtmlAttr($element->getValue()) ?>"
+               class="input-text <?= $block->escapeHtmlAttr($element->getClass()) ?>"
+               title="<?=  $block->escapeHtmlAttr($element->getTitle()) ?>"/>
     </span>
-<?php elseif ($type === 'radios') : ?>
+<?php elseif ($type === 'radios'): ?>
     <span class="form_row">
-        <label for="<?= $element->getHtmlId() ?>"><?= $block->escapeHtml($element->getLabel()) ?>:</label>
-    <?php foreach ($element->getRadios() as $_radio) : ?>
-    <input type="radio" name="<?=  $block->escapeHtmlAttr($_radio->getName()) ?>" id="<?= $_radio->getHtmlId() ?>" value="<?=  $block->escapeHtmlAttr($_radio->getValue()) ?>" class="input-radio <?= $block->escapeHtmlAttr($_radio->getClass()) ?>" title="<?=  $block->escapeHtmlAttr($_radio->getTitle()) ?>" <?= ($_radio->getValue() == $element->getChecked()) ? 'checked="true"' : '' ?> >&nbsp;<?= $block->escapeHtml($_radio->getLabel()) ?>
+        <label for="<?= /* @noEscape */ $htmlId ?>"><?= $block->escapeHtml($element->getLabel()) ?>:</label>
+    <?php foreach ($element->getRadios() as $_radio): ?>
+    <input type="radio"
+           name="<?=  $block->escapeHtmlAttr($_radio->getName()) ?>"
+           id="<?= $_radio->getHtmlId() ?>"
+           value="<?=  $block->escapeHtmlAttr($_radio->getValue()) ?>"
+           class="input-radio <?= $block->escapeHtmlAttr($_radio->getClass()) ?>"
+           title="<?=  $block->escapeHtmlAttr($_radio->getTitle()) ?>"
+           <?= ($_radio->getValue() == $element->getChecked()) ? 'checked="true"' : '' ?> >
+        <?= $block->escapeHtml($_radio->getLabel()) ?>
     <?php endforeach; ?>
     </span>
-<?php elseif ($type === 'wysiwyg') : ?>
+<?php elseif ($type === 'wysiwyg'): ?>
     <span class="form_row">
-      <label for="<?= $element->getHtmlId() ?>"><?= $block->escapeHtml($element->getLabel()) ?>:</label>
+      <label for="<?= /* @noEscape */ $htmlId ?>"><?= $block->escapeHtml($element->getLabel()) ?>:</label>
         <script>
         require([
             "wysiwygAdapter"
@@ -53,33 +93,57 @@ $type = $element->getType();
                 mode : "exact",
                 theme : "advanced",
                 elements : "<?= $block->escapeJs($element->getName()) ?>",
-                plugins : "inlinepopups,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,zoom,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras",
-                theme_advanced_buttons1 : "newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect,fontselect,fontsizeselect",
-                theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor",
-                theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,ltr,rtl,|,fullscreen",
-                theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,|,cite,abbr,acronym,del,ins,|,visualchars,nonbreaking",
+                plugins : "inlinepopups,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,"
+                    + "insertdatetime,preview,zoom,media,searchreplace,print,contextmenu,paste,directionality,"
+                    + "fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras",
+                theme_advanced_buttons1 : "newdocument,|,bold,italic,underline,strikethrough,|"
+                    + ",justifyleft,justifycenter,justifyright,justifyfull,|"
+                    + ",styleselect,formatselect,fontselect,fontsizeselect",
+                theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|"
+                    + ",outdent,indent,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|"
+                    + ",insertdate,inserttime,preview,|,forecolor,backcolor",
+                theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|"
+                    + ",charmap,emotions,iespell,media,advhr,|,print,|,ltr,rtl,|,fullscreen",
+                theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,|"
+                    + ",cite,abbr,acronym,del,ins,|,visualchars,nonbreaking",
                 theme_advanced_toolbar_location : "top",
                 theme_advanced_toolbar_align : "left",
                 theme_advanced_path_location : "bottom",
-                extended_valid_elements : "a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]",
+                extended_valid_elements : "a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace"
+                    + "|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size"
+                    + "|noshade],font[face|size|color|style],span[class|align|style]",
                 theme_advanced_resize_horizontal : 'false',
                 theme_advanced_resizing : 'true',
                 apply_source_formatting : 'true',
                 convert_urls : 'false',
                 force_br_newlines : 'true',
-                doctype : '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'
+                doctype : '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"'
+                    + ' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'
             });
         });
 </script>
-      <textarea name="<?= $block->escapeHtmlAttr($element->getName()) ?>" title="<?=  $block->escapeHtmlAttr($element->getTitle()) ?>" id="<?= $element->getHtmlId() ?>" class="textarea <?= $block->escapeHtmlAttr($element->getClass()) ?>" cols="80" rows="20"><?= $block->escapeHtml($element->getValue()) ?></textarea>
+      <textarea name="<?= $block->escapeHtmlAttr($element->getName()) ?>"
+                title="<?=  $block->escapeHtmlAttr($element->getTitle()) ?>"
+                id="<?= /* @noEscape */ $htmlId ?>"
+                class="textarea <?= $block->escapeHtmlAttr($element->getClass()) ?>"
+                cols="80" rows="20">
+          <?= $block->escapeHtml($element->getValue()) ?>
+      </textarea>
     </span>
-<?php elseif ($type === 'textarea') : ?>
+<?php elseif ($type === 'textarea'): ?>
             <span class="form_row">
-                    <label for="<?= $element->getHtmlId() ?>"><?= $block->escapeHtml($element->getLabel()) ?>:</label>
-                    <textarea name="<?= $block->escapeHtmlAttr($element->getName()) ?>" title="<?=  $block->escapeHtmlAttr($element->getTitle()) ?>" id="<?= $element->getHtmlId() ?>" class="textarea <?= $block->escapeHtmlAttr($element->getClass()) ?>" cols="15" rows="2"><?= $block->escapeHtml($element->getValue()) ?></textarea>
+                    <label for="<?= /* @noEscape */ $htmlId ?>"><?= $block->escapeHtml($element->getLabel()) ?>:</label>
+                    <textarea name="<?= $block->escapeHtmlAttr($element->getName()) ?>"
+                              title="<?=  $block->escapeHtmlAttr($element->getTitle()) ?>"
+                              id="<?= /* @noEscape */ $htmlId ?>"
+                              class="textarea <?= $block->escapeHtmlAttr($element->getClass()) ?>"
+                              cols="15"
+                              rows="2">
+                        <?= $block->escapeHtml($element->getValue()) ?>
+                    </textarea>
             </span>
 <?php endif; ?>
-<?php if ($element->getScript()) : ?>
+<?php if ($element->getScript()): ?>
 <script>
     <?= /* @noEscape */ $element->getScript() ?>
 </script>
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php
index b752f79f73446..0d73fd51debbf 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php
@@ -9,6 +9,9 @@
  */
 namespace Magento\Config\Test\Unit\Block\System\Config\Form\Field;
 
+use Magento\Framework\Math\Random;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 class ImageTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -29,12 +32,23 @@ class ImageTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $randomMock = $this->createMock(Random::class);
+        $randomMock->method('getRandomString')->willReturn('some-rando-string');
+        $secureRendererMock = $this->createMock(SecureHtmlRenderer::class);
+        $secureRendererMock->method('renderEventListenerAsTag')
+            ->willReturnCallback(
+                function (string $event, string $listener, string $selector): string {
+                    return "<script>document.querySelector('{$selector}').{$event} = () => { {$listener} };</script>";
+                }
+            );
         $this->urlBuilderMock = $this->createMock(\Magento\Framework\Url::class);
         $this->image = $objectManager->getObject(
             \Magento\Config\Block\System\Config\Form\Field\Image::class,
             [
                 'urlBuilder' => $this->urlBuilderMock,
-                '_escaper' => $objectManager->getObject(\Magento\Framework\Escaper::class)
+                '_escaper' => $objectManager->getObject(\Magento\Framework\Escaper::class),
+                'random' => $randomMock,
+                'secureRenderer' => $secureRendererMock
             ]
         );
 
@@ -99,14 +113,15 @@ public function testGetElementHtmlWithValue()
         $this->assertContains('type="file"', $html);
         $this->assertContains('value="test_value"', $html);
         $this->assertContains(
-            '<a href="'
+            '<a previewlinkid="linkIdsome-rando-string" href="'
             . $url
             . $this->testData['path']
             . '/'
             . $this->testData['value']
-            . '" onclick="imagePreview(\'' . $expectedHtmlId . '_image\'); return false;"',
+            . '"',
             $html
         );
+        $this->assertContains("imagePreview('{$expectedHtmlId}_image');\nreturn false;", $html);
         $this->assertContains('<input type="checkbox"', $html);
     }
 }
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php
index e7ba2e8aaa2e7..75c46c1168843 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Config\Test\Unit\Block\System\Config\Form\Field\Select;
 
+use Magento\Framework\Math\Random;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 class AllowspecificTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -20,10 +23,21 @@ class AllowspecificTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $testHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $randomMock = $this->createMock(Random::class);
+        $randomMock->method('getRandomString')->willReturn('some-rando-string');
+        $secureRendererMock = $this->createMock(SecureHtmlRenderer::class);
+        $secureRendererMock->method('renderEventListenerAsTag')
+            ->willReturnCallback(
+                function (string $event, string $listener, string $selector): string {
+                    return "<script>document.querySelector('{$selector}').{$event} = () => { {$listener} };</script>";
+                }
+            );
         $this->_object = $testHelper->getObject(
             \Magento\Config\Block\System\Config\Form\Field\Select\Allowspecific::class,
             [
-                '_escaper' => $testHelper->getObject(\Magento\Framework\Escaper::class)
+                '_escaper' => $testHelper->getObject(\Magento\Framework\Escaper::class),
+                'random' => $randomMock,
+                'secureRenderer' => $secureRendererMock
             ]
         );
         $this->_object->setData('html_id', 'spec_element');
diff --git a/app/code/Magento/Csp/Helper/InlineUtil.php b/app/code/Magento/Csp/Helper/InlineUtil.php
index f0de25fb81d7a..f9dd9aafa459e 100644
--- a/app/code/Magento/Csp/Helper/InlineUtil.php
+++ b/app/code/Magento/Csp/Helper/InlineUtil.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 declare(strict_types=1);
 
 namespace Magento\Csp\Helper;
@@ -10,13 +11,18 @@
 use Magento\Csp\Api\InlineUtilInterface;
 use Magento\Csp\Model\Collector\DynamicCollector;
 use Magento\Csp\Model\Policy\FetchPolicy;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Helper\SecureHtmlRender\EventHandlerData;
+use Magento\Framework\View\Helper\SecureHtmlRender\HtmlRenderer;
+use Magento\Framework\View\Helper\SecureHtmlRender\SecurityProcessorInterface;
+use Magento\Framework\View\Helper\SecureHtmlRender\TagData;
 
 /**
  * Helper for classes responsible for rendering and templates.
  *
  * Allows to whitelist dynamic sources specific to a certain page.
  */
-class InlineUtil implements InlineUtilInterface
+class InlineUtil implements InlineUtilInterface, SecurityProcessorInterface
 {
     /**
      * @var DynamicCollector
@@ -28,6 +34,11 @@ class InlineUtil implements InlineUtilInterface
      */
     private $useUnsafeHashes;
 
+    /**
+     * @var HtmlRenderer
+     */
+    private $htmlRenderer;
+
     private static $tagMeta = [
         'script' => ['id' => 'script-src', 'remote' => ['src'], 'hash' => true],
         'style' => ['id' => 'style-src', 'remote' => [], 'hash' => true],
@@ -48,11 +59,16 @@ class InlineUtil implements InlineUtilInterface
     /**
      * @param DynamicCollector $dynamicCollector
      * @param bool $useUnsafeHashes Use 'unsafe-hashes' policy (not supported by CSP v2).
+     * @param HtmlRenderer|null $htmlRenderer
      */
-    public function __construct(DynamicCollector $dynamicCollector, bool $useUnsafeHashes = false)
-    {
+    public function __construct(
+        DynamicCollector $dynamicCollector,
+        bool $useUnsafeHashes = false,
+        ?HtmlRenderer $htmlRenderer = null
+    ) {
         $this->dynamicCollector = $dynamicCollector;
         $this->useUnsafeHashes = $useUnsafeHashes;
+        $this->htmlRenderer = $htmlRenderer ?? ObjectManager::getInstance()->get(HtmlRenderer::class);
     }
 
     /**
@@ -130,63 +146,71 @@ private function extractRemoteHosts(string $tag, array $attributes, ?string $con
     }
 
     /**
-     * Render tag.
-     *
-     * @param string $tag
-     * @param string[] $attributes
-     * @param string|null $content
-     * @return string
+     * @inheritDoc
      */
-    private function render(string $tag, array $attributes, ?string $content): string
+    public function renderTag(string $tagName, array $attributes, ?string $content = null): string
     {
-        $html = '<' .$tag;
-        foreach ($attributes as $attribute => $value) {
-            $html .= ' ' .$attribute .'="' .$value .'"';
-        }
-        if ($content) {
-            $html .= '>' .$content .'</' .$tag .'>';
-        } else {
-            $html .= ' />';
+        if (!array_key_exists($tagName, self::$tagMeta)) {
+            throw new \InvalidArgumentException('Unknown source type - ' .$tagName);
         }
 
-        return $html;
+        return $this->htmlRenderer->renderTag($this->processTag(new TagData($tagName, $attributes, $content, false)));
     }
 
     /**
      * @inheritDoc
      */
-    public function renderTag(string $tagName, array $attributes, ?string $content = null): string
+    public function renderEventListener(string $eventName, string $javascript): string
+    {
+        return $this->htmlRenderer->renderEventHandler(
+            $this->processEventHandler(new EventHandlerData($eventName, $javascript))
+        );
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function processTag(TagData $tagData): TagData
     {
         //Processing tag data
-        if (!array_key_exists($tagName, self::$tagMeta)) {
-            throw new \InvalidArgumentException('Unknown source type - ' .$tagName);
-        }
-        /** @var string $policyId */
-        $policyId = self::$tagMeta[$tagName]['id'];
-        $remotes = $this->extractRemoteHosts($tagName, $attributes, $content);
-        if (empty($remotes) && !$content) {
-            throw new \InvalidArgumentException('Either remote URL or hashable content is required to whitelist');
-        }
+        if (array_key_exists($tagData->getTag(), self::$tagMeta)) {
+            /** @var string $policyId */
+            $policyId = self::$tagMeta[$tagData->getTag()]['id'];
+            $remotes = $this->extractRemoteHosts($tagData->getTag(), $tagData->getAttributes(), $tagData->getContent());
+            if (empty($remotes) && !$tagData->getContent()) {
+                throw new \InvalidArgumentException('Either remote URL or hashable content is required to whitelist');
+            }
 
-        //Adding required policies.
-        if ($remotes) {
-            $this->dynamicCollector->add(
-                new FetchPolicy($policyId, false, $remotes)
-            );
-        }
-        if ($content && !empty(self::$tagMeta[$tagName]['hash'])) {
-            $this->dynamicCollector->add(
-                new FetchPolicy($policyId, false, [], [], false, false, false, [], $this->generateHashValue($content))
-            );
+            //Adding required policies.
+            if ($remotes) {
+                $this->dynamicCollector->add(
+                    new FetchPolicy($policyId, false, $remotes)
+                );
+            }
+            if ($tagData->getContent() && !empty(self::$tagMeta[$tagData->getTag()]['hash'])) {
+                $this->dynamicCollector->add(
+                    new FetchPolicy(
+                        $policyId,
+                        false,
+                        [],
+                        [],
+                        false,
+                        false,
+                        false,
+                        [],
+                        $this->generateHashValue($tagData->getContent())
+                    )
+                );
+            }
         }
 
-        return $this->render($tagName, $attributes, $content);
+        return $tagData;
     }
 
     /**
      * @inheritDoc
      */
-    public function renderEventListener(string $eventName, string $javascript): string
+    public function processEventHandler(EventHandlerData $eventHandlerData): EventHandlerData
     {
         if ($this->useUnsafeHashes) {
             $policy = new FetchPolicy(
@@ -198,7 +222,7 @@ public function renderEventListener(string $eventName, string $javascript): stri
                 false,
                 false,
                 [],
-                $this->generateHashValue($javascript),
+                $this->generateHashValue($eventHandlerData->getCode()),
                 false,
                 true
             );
@@ -207,6 +231,6 @@ public function renderEventListener(string $eventName, string $javascript): stri
         }
         $this->dynamicCollector->add($policy);
 
-        return $eventName .'="' .$javascript .'"';
+        return $eventHandlerData;
     }
 }
diff --git a/app/code/Magento/Csp/Model/Policy/FetchPolicy.php b/app/code/Magento/Csp/Model/Policy/FetchPolicy.php
index 7350cbe80aecb..d045ee48b0ba2 100644
--- a/app/code/Magento/Csp/Model/Policy/FetchPolicy.php
+++ b/app/code/Magento/Csp/Model/Policy/FetchPolicy.php
@@ -226,11 +226,13 @@ public function getValue(): string
             if ($this->areEventHandlersAllowed()) {
                 $sources[] = '\'unsafe-hashes\'';
             }
-            foreach ($this->getNonceValues() as $nonce) {
-                $sources[] = '\'nonce-' .base64_encode($nonce) .'\'';
-            }
-            foreach ($this->getHashes() as $hash => $algorithm) {
-                $sources[]= "'$algorithm-$hash'";
+            if (!$this->isInlineAllowed()) {
+                foreach ($this->getNonceValues() as $nonce) {
+                    $sources[] = '\'nonce-' . base64_encode($nonce) . '\'';
+                }
+                foreach ($this->getHashes() as $hash => $algorithm) {
+                    $sources[] = "'$algorithm-$hash'";
+                }
             }
 
             return implode(' ', $sources);
diff --git a/app/code/Magento/Csp/Plugin/TemplateRenderingPlugin.php b/app/code/Magento/Csp/Plugin/TemplateRenderingPlugin.php
deleted file mode 100644
index 781fb06e487a8..0000000000000
--- a/app/code/Magento/Csp/Plugin/TemplateRenderingPlugin.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Csp\Plugin;
-
-use Magento\Csp\Api\InlineUtilInterface;
-use Magento\Framework\View\Element\BlockInterface;
-use Magento\Framework\View\TemplateEngine\Php;
-
-/**
- * Plugin that adds CSP utility to templates context.
- */
-class TemplateRenderingPlugin
-{
-    /**
-     * @var InlineUtilInterface
-     */
-    private $util;
-
-    /**
-     * @param InlineUtilInterface $util
-     */
-    public function __construct(InlineUtilInterface $util)
-    {
-        $this->util = $util;
-    }
-
-    /**
-     * Add $csp variable to a template scope.
-     *
-     * @param Php $renderer
-     * @param BlockInterface $block
-     * @param string $fileName
-     * @param array $dictionary
-     * @return array
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function beforeRender(Php $renderer, BlockInterface $block, $fileName, array $dictionary): array
-    {
-        $dictionary['csp'] = $this->util;
-
-        return [$block, $fileName, $dictionary];
-    }
-}
diff --git a/app/code/Magento/Csp/etc/di.xml b/app/code/Magento/Csp/etc/di.xml
index 6b380ab2d00d7..5f9b9f7b0fc50 100644
--- a/app/code/Magento/Csp/etc/di.xml
+++ b/app/code/Magento/Csp/etc/di.xml
@@ -18,10 +18,10 @@
     <type name="Magento\Csp\Model\CompositePolicyCollector">
         <arguments>
             <argument name="collectors" xsi:type="array">
-                <item name="1" xsi:type="object">Magento\Csp\Model\Collector\ConfigCollector</item>
-                <item name="2" xsi:type="object">Magento\Csp\Model\Collector\CspWhitelistXmlCollector</item>
-                <item name="3" xsi:type="object">Magento\Csp\Model\Collector\DynamicCollector</item>
-                <item name="100" xsi:type="object">Magento\Csp\Model\Collector\ControllerCollector</item>
+                <item name="1" xsi:type="object">Magento\Csp\Model\Collector\ConfigCollector\Proxy</item>
+                <item name="2" xsi:type="object">Magento\Csp\Model\Collector\CspWhitelistXmlCollector\Proxy</item>
+                <item name="3" xsi:type="object">Magento\Csp\Model\Collector\DynamicCollector\Proxy</item>
+                <item name="100" xsi:type="object">Magento\Csp\Model\Collector\ControllerCollector\Proxy</item>
             </argument>
             <argument name="mergers" xsi:type="array">
                 <item name="fetch" xsi:type="object">Magento\Csp\Model\Collector\FetchPolicyMerger</item>
@@ -59,11 +59,43 @@
             <argument name="configReader" xsi:type="object">Magento\Csp\Model\Collector\CspWhitelistXml\Data</argument>
         </arguments>
     </type>
+    <type name="Magento\Csp\Model\Collector\CspWhitelistXml\Data">
+        <arguments>
+            <argument name="reader" xsi:type="object">Magento\Csp\Model\Collector\CspWhitelistXml\Reader\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Csp\Model\Collector\CspWhitelistXmlCollector">
+        <arguments>
+            <argument name="configReader" xsi:type="object">Magento\Csp\Model\Collector\CspWhitelistXml\Data</argument>
+        </arguments>
+    </type>
+    <preference for="Magento\Csp\Api\InlineUtilInterface" type="Magento\Csp\Helper\InlineUtil" />
+    <type name="Magento\Csp\Plugin\TemplateRenderingPlugin">
+        <arguments>
+            <argument name="util" xsi:type="object">Magento\Csp\Api\InlineUtilInterface\Proxy</argument>
+        </arguments>
+    </type>
     <type name="Magento\Framework\View\TemplateEngine\Php">
-        <plugin name="csp_helper_plugin" type="Magento\Csp\Plugin\TemplateRenderingPlugin" />
+        <arguments>
+            <argument name="blockVariables" xsi:type="array">
+                <item name="csp" xsi:type="object">Magento\Csp\Api\InlineUtilInterface\Proxy</item>
+                <item name="secureRenderer" xsi:type="object">Magento\Framework\View\Helper\SecureHtmlRenderer\Proxy</item>
+            </argument>
+        </arguments>
     </type>
     <type name="Magento\Framework\App\RouterInterface">
         <plugin name="csp_aware_plugin" type="Magento\Csp\Plugin\CspAwareControllerPlugin" />
     </type>
-    <preference for="Magento\Csp\Api\InlineUtilInterface" type="Magento\Csp\Helper\InlineUtil" />
+    <type name="Magento\Framework\View\Helper\SecureHtmlRenderer">
+        <arguments>
+            <argument name="processors" xsi:type="array">
+                <item name="csp" xsi:type="object">Magento\Csp\Helper\InlineUtil\Proxy</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Csp\Observer\Render">
+        <arguments>
+            <argument name="cspRenderer" xsi:type="object">Magento\Csp\Api\CspRendererInterface</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Renderer/RegionTest.php b/app/code/Magento/Customer/Test/Unit/Model/Renderer/RegionTest.php
index e67adc47b8884..3db6b592b2e63 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Renderer/RegionTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Renderer/RegionTest.php
@@ -5,10 +5,32 @@
  */
 namespace Magento\Customer\Test\Unit\Model\Renderer;
 
+use Magento\Framework\Data\Form\Element\AbstractElement;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\MockObject\MockObject;
 
 class RegionTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * Simulate "serialize" method of a form element.
+     *
+     * @param string[] $keys
+     * @param array $data
+     * @return string
+     */
+    private function mockSerialize(array $keys, array $data): string
+    {
+        $attributes = [];
+        foreach ($keys as $key) {
+            if (empty($data[$key])) {
+                continue;
+            }
+            $attributes[] = $key .'="' .$data[$key] .'"';
+        }
+
+        return implode(' ', $attributes);
+    }
+
     /**
      * @param array $regionCollection
      * @dataProvider renderDataProvider
@@ -23,13 +45,24 @@ public function testRender($regionCollection)
             ['isRegionRequired']
         );
         $escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
+        /** @var MockObject|AbstractElement $elementMock */
         $elementMock = $this->createPartialMock(
             \Magento\Framework\Data\Form\Element\AbstractElement::class,
-            ['getForm', 'getHtmlAttributes']
+            ['getForm', 'getHtmlAttributes', 'serialize']
+        );
+        $elementMock->method('serialize')->willReturnCallback(
+            function (array $attributes) use ($elementMock): string {
+                return $this->mockSerialize($attributes, $elementMock->getData());
+            }
         );
         $countryMock = $this->createPartialMock(
             \Magento\Framework\Data\Form\Element\AbstractElement::class,
-            ['getValue']
+            ['getValue', 'serialize']
+        );
+        $countryMock->method('serialize')->willReturnCallback(
+            function (array $attributes) use ($countryMock): string {
+                return $this->mockSerialize($attributes, $countryMock->getData());
+            }
         );
         $regionMock = $this->createMock(
             \Magento\Framework\Data\Form\Element\AbstractElement::class
diff --git a/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php b/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php
index a1fb2e449d7bf..8a8e06f8194aa 100644
--- a/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php
+++ b/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php
@@ -11,6 +11,8 @@
  */
 namespace Magento\OfflineShipping\Test\Unit\Block\Adminhtml\Form\Field;
 
+use Magento\Framework\Math\Random;
+
 class ImportTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -29,13 +31,16 @@ protected function setUp()
             \Magento\Framework\Data\Form::class,
             ['getFieldNameSuffix', 'addSuffixToName', 'getHtmlIdPrefix', 'getHtmlIdSuffix']
         );
+        $randomMock = $this->getMockBuilder(Random::class)->disableOriginalConstructor()->getMock();
+        $randomMock->method('getRandomString')->willReturn('123456abcdefg');
         $testData = ['name' => 'test_name', 'html_id' => 'test_html_id'];
         $testHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->_object = $testHelper->getObject(
             \Magento\OfflineShipping\Block\Adminhtml\Form\Field\Import::class,
             [
                 'data' => $testData,
-                '_escaper' => $testHelper->getObject(\Magento\Framework\Escaper::class)
+                '_escaper' => $testHelper->getObject(\Magento\Framework\Escaper::class),
+                'random' => $randomMock
             ]
         );
         $this->_object->setForm($this->_formMock);
@@ -78,9 +83,9 @@ public function testGetElementHtml()
             '<input id="time_condition" type="hidden" name="test_name" value="',
             $testString
         );
-        $this->assertStringEndsWith(
+        $this->assertContains(
             '<input id="test_name_prefixtest_html_idtest_name_suffix" ' .
-            'name="test_name"  data-ui-id="form-element-test_name" value="" type="file"/>',
+            'name="test_name"  data-ui-id="form-element-test_name" value="" type="file"',
             $testString
         );
     }
diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/Enable/AbstractEnableTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/Enable/AbstractEnableTest.php
index b9ea53c154014..e4253291cac57 100644
--- a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/Enable/AbstractEnableTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/Enable/AbstractEnableTest.php
@@ -5,7 +5,12 @@
  */
 namespace Magento\Paypal\Test\Unit\Block\Adminhtml\System\Config\Field\Enable;
 
+use Magento\Framework\Data\Form\Element\CollectionFactory;
+use Magento\Framework\Escaper;
+use Magento\Framework\Math\Random;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Class AbstractEnableTest
@@ -26,6 +31,22 @@ class AbstractEnableTest extends \PHPUnit\Framework\TestCase
      */
     protected $elementMock;
 
+    /**
+     * Create mock objects.
+     *
+     * @param string[] $classes
+     * @return MockObject[]
+     */
+    private function createMocks(array $classes): array
+    {
+        $mocks = [];
+        foreach ($classes as $class) {
+            $mocks[] = $this->getMockBuilder($class)->disableOriginalConstructor()->getMock();
+        }
+
+        return $mocks;
+    }
+
     /**
      * Set up
      *
@@ -35,14 +56,24 @@ protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
+        $randomMock = $this->getMockBuilder(Random::class)->disableOriginalConstructor()->getMock();
+        $randomMock->method('getRandomString')->willReturn('12345abcdef');
+        $mockArguments = $this->createMocks([
+            \Magento\Framework\Data\Form\Element\Factory::class,
+            CollectionFactory::class,
+            Escaper::class
+        ]);
+        $mockArguments[] = [];
+        $mockArguments[] = $this->createMock(SecureHtmlRenderer::class);
+        $mockArguments[] = $randomMock;
         $this->elementMock = $this->getMockBuilder(\Magento\Framework\Data\Form\Element\AbstractElement::class)
             ->setMethods(
                 [
                     'getHtmlId',
                     'getTooltip',
-                    'getForm',
+                    'getForm'
                 ]
-            )->disableOriginalConstructor()
+            )->setConstructorArgs($mockArguments)
             ->getMockForAbstractClass();
 
         $objectManager = new ObjectManager($this);
diff --git a/app/code/Magento/Ui/Component/Control/Button.php b/app/code/Magento/Ui/Component/Control/Button.php
index 952f1f62fa2d7..7875713059cf7 100644
--- a/app/code/Magento/Ui/Component/Control/Button.php
+++ b/app/code/Magento/Ui/Component/Control/Button.php
@@ -5,14 +5,45 @@
  */
 namespace Magento\Ui\Component\Control;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Math\Random;
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Element\UiComponent\Control\ControlInterface;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+use Magento\Framework\View\Element\Template\Context;
 
 /**
- * Class Button
+ * Widget for standard button.
  */
 class Button extends Template implements ControlInterface
 {
+    /**
+     * @var Random
+     */
+    private $random;
+
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
+    /**
+     * @param Context $context
+     * @param array $data
+     * @param Random|null $random
+     * @param SecureHtmlRenderer|null $htmlRenderer
+     */
+    public function __construct(
+        Context $context,
+        array $data = [],
+        ?Random $random = null,
+        ?SecureHtmlRenderer $htmlRenderer = null
+    ) {
+        parent::__construct($context, $data);
+        $this->random = $random ?? ObjectManager::getInstance()->get(Random::class);
+        $this->secureRenderer = $htmlRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+    }
+
     /**
      * Define block template
      *
@@ -80,7 +111,7 @@ public function getAttributesHtml()
     public function getOnClick()
     {
         if ($this->hasData('on_click')) {
-            return $this->getData('on_click');
+            return $this->getData('on_click');//No onclick
         } else {
             $url = $this->hasData('url') ? $this->getData('url') : $this->getUrl();
             if (!empty($url)) {
@@ -91,6 +122,18 @@ public function getOnClick()
         }
     }
 
+    /**
+     * @inheritDoc
+     */
+    protected function _beforeToHtml()
+    {
+        parent::_beforeToHtml();
+
+        $this->setData('ui_button_widget_hook_id', 'buttonId' .$this->random->getRandomString(32));
+
+        return $this;
+    }
+
     /**
      * Prepare attributes
      *
@@ -107,8 +150,6 @@ protected function prepareAttributes($title, $classes, $disabled)
             'title' => $title,
             'type' => $this->getType(),
             'class' => implode(' ', $classes),
-            'onclick' => $this->getOnClick(),
-            'style' => $this->getStyle(),
             'value' => $this->getValue(),
             'disabled' => $disabled,
         ];
@@ -117,6 +158,9 @@ protected function prepareAttributes($title, $classes, $disabled)
                 $attributes['data-' . $key] = is_scalar($attr) ? $attr : json_encode($attr);
             }
         }
+        if ($this->hasData('ui_button_widget_hook_id')) {
+            $attributes['ui-button-widget-hook-id'] = $this->getData('ui_button_widget_hook_id');
+        }
 
         return $attributes;
     }
@@ -139,4 +183,54 @@ protected function attributesToHtml($attributes)
 
         return $html;
     }
+
+    /**
+     * Return HTML to be rendered after the button.
+     *
+     * @return string|null
+     */
+    public function getAfterHtml(): ?string
+    {
+        $afterHtml = $this->getData('after_html');
+        $buttonId = $this->getData('ui_button_widget_hook_id');
+        if ($handler = $this->getOnClick()) {
+            $functionName = 'OnClickHandler' . $this->random->getRandomString(32);
+            $afterHtml .= $this->secureRenderer->renderTag(
+                'script',
+                ['type' => 'text/javascript'],
+                <<<script
+                    function {$functionName} () {
+                            {$handler};
+                    }
+                    let button{$buttonId} = document.querySelector("*[ui-button-widget-hook-id='$buttonId']");
+                    if (button{$buttonId}) {
+                        button{$buttonId}.onclick = function (e) {
+                            {$functionName}.apply(e.target);
+                        };
+                    }
+script
+                ,
+                false
+            );
+        }
+        if ($this->getStyle()) {
+            $selector = "*[ui-button-widget-hook-id='$buttonId']";
+            if ($this->getId()) {
+                $selector = "#{$this->getId()}";
+            }
+            $afterHtml .= $this->secureRenderer->renderTag(
+                'style',
+                [],
+                <<<style
+                     {$selector} {
+                         {$this->getStyle()}
+                     }
+style
+                ,
+                false
+            );
+        }
+
+        return $afterHtml;
+    }
 }
diff --git a/app/code/Magento/Ui/Component/Control/SplitButton.php b/app/code/Magento/Ui/Component/Control/SplitButton.php
index 5c9d09565fc66..615627918e412 100644
--- a/app/code/Magento/Ui/Component/Control/SplitButton.php
+++ b/app/code/Magento/Ui/Component/Control/SplitButton.php
@@ -6,8 +6,13 @@
 
 namespace Magento\Ui\Component\Control;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Math\Random;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 /**
- * Class SplitButton
+ * Widget for standard button with a selection.
  *
  * @method string getTitle
  * @method string getLabel
@@ -22,6 +27,32 @@
  */
 class SplitButton extends Button
 {
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
+    /**
+     * @var Random
+     */
+    private $random;
+
+    /**
+     * @inheritDoc
+     */
+    public function __construct(
+        Context $context,
+        array $data = [],
+        ?Random $random = null,
+        ?SecureHtmlRenderer $htmlRenderer = null
+    ) {
+        $random = $random ?? ObjectManager::getInstance()->get(Random::class);
+        $htmlRenderer = $htmlRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+        parent::__construct($context, $data, $random, $htmlRenderer);
+        $this->random = $random;
+        $this->secureRenderer = $htmlRenderer;
+    }
+
     /**
      * @inheritdoc
      */
@@ -54,6 +85,16 @@ public function getAttributesHtml()
         return $this->attributesToHtml(['title' => $title, 'class' => join(' ', $classes)]);
     }
 
+    /**
+     * Get main button's "id" attribute value.
+     *
+     * @return string
+     */
+    private function getButtonId(): string
+    {
+        return $this->getId() .'-button';
+    }
+
     /**
      * Retrieve button attributes html
      *
@@ -77,11 +118,10 @@ public function getButtonAttributesHtml()
         }
 
         $attributes = [
-            'id' => $this->getId() . '-button',
+            'id' => $this->getButtonId(),
             'title' => $title,
             'class' => join(' ', $classes),
             'disabled' => $disabled,
-            'style' => $this->getStyle(),
         ];
 
         if ($idHard = $this->getIdHard()) {
@@ -159,6 +199,22 @@ public function getOptionAttributesHtml($key, $option)
         return $html;
     }
 
+    /**
+     * Set and return "id" attribute value for an option.
+     *
+     * @param array $option
+     * @return string
+     */
+    private function identifyOption(array &$option): string
+    {
+        $id = isset($option['id'])
+            ? $option['id']
+            : (isset($option['id_attribute']) ? $option['id_attribute'] : 'topId' .$this->random->getRandomString(32));
+        $option['id_attribute'] = $id;
+
+        return $this->getId() .'-' .$id;
+    }
+
     /**
      * Prepare option attributes
      *
@@ -172,11 +228,9 @@ public function getOptionAttributesHtml($key, $option)
     protected function prepareOptionAttributes($option, $title, $classes, $disabled)
     {
         $attributes = [
-            'id' => isset($option['id']) ? $this->getId() . '-' . $option['id'] : '',
+            'id' => $this->identifyOption($option),
             'title' => $title,
             'class' => join(' ', $classes),
-            'onclick' => isset($option['onclick']) ? $option['onclick'] : '',
-            'style' => isset($option['style']) ? $option['style'] : '',
             'disabled' => $disabled,
         ];
 
@@ -215,4 +269,53 @@ protected function getDataAttributes($data, &$attributes)
             $attributes['data-' . $key] = is_scalar($attr) ? $attr : json_encode($attr);
         }
     }
+
+    /**
+     * @inheritDoc
+     */
+    protected function _beforeToHtml()
+    {
+        parent::_beforeToHtml();
+
+        /** @var array|null $options */
+        $options = $this->getOptions() ?? [];
+        foreach ($options as &$option) {
+            $this->identifyOption($option);
+        }
+        $this->setOptions($options);
+
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getAfterHtml(): ?string
+    {
+        $afterHtml = parent::getAfterHtml();
+
+        /** @var array|null $options */
+        $options = $this->getOptions() ?? [];
+        foreach ($options as $option) {
+            $id = $this->identifyOption($option);
+            if (!empty($option['onclick'])) {
+                $afterHtml .= $this->secureRenderer->renderEventListenerAsTag('onclick', $option['onclick'], "#$id");
+            }
+            if (!empty($option['style'])) {
+                $afterHtml .= $this->secureRenderer->renderTag(
+                    'style',
+                    [],
+                    <<<style
+                    #$id {
+                        {$option['style']}
+                    }
+style
+                    ,
+                    false
+                );
+            }
+        }
+
+        return $afterHtml;
+    }
 }
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Control/ButtonTest.php b/app/code/Magento/Ui/Test/Unit/Component/Control/ButtonTest.php
index 97c77c158c147..9f46cb4bb5b86 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Control/ButtonTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Control/ButtonTest.php
@@ -11,7 +11,7 @@
 use Magento\Ui\Component\Control\Button;
 
 /**
- * Class ButtonTest
+ * Test for the Button widget.
  */
 class ButtonTest extends \PHPUnit\Framework\TestCase
 {
@@ -58,7 +58,7 @@ public function testGetType()
     public function testGetAttributesHtml()
     {
         $expected = 'type="button" class="action- scalable classValue disabled" '
-            . 'onclick="location.href = &#039;url2&#039;;" disabled="disabled" data-attributeKey="attributeValue" ';
+            . 'disabled="disabled" data-attributeKey="attributeValue" ';
         $this->button->setDisabled(true);
         $this->button->setData('url', 'url2');
         $this->button->setData('class', 'classValue');
diff --git a/app/code/Magento/Ui/view/base/templates/control/button/split.phtml b/app/code/Magento/Ui/view/base/templates/control/button/split.phtml
index 08230184d5a4d..ce7112c400509 100644
--- a/app/code/Magento/Ui/view/base/templates/control/button/split.phtml
+++ b/app/code/Magento/Ui/view/base/templates/control/button/split.phtml
@@ -11,19 +11,19 @@
     <button <?= $block->getButtonAttributesHtml() ?>>
         <span><?= $block->escapeHtml($block->getLabel()) ?></span>
     </button>
-    <?php if ($block->hasSplit()) : ?>
+    <?php if ($block->hasSplit()): ?>
         <button <?= $block->getToggleAttributesHtml() ?>>
             <span><?= $block->escapeHtml(__('Select')) ?></span>
         </button>
 
-        <?php if (!$block->getDisabled()) : ?>
+        <?php if (!$block->getDisabled()): ?>
             <ul class="dropdown-menu" <?= /* @noEscape */ $block->getUiId("dropdown-menu") ?>>
-                <?php foreach ($block->getOptions() as $key => $option) : ?>
+                <?php foreach ($block->getOptions() as $key => $option): ?>
                 <li>
                     <span <?= $block->getOptionAttributesHtml($key, $option) ?>>
                         <?= $block->escapeHtml($option['label']) ?>
                     </span>
-                    <?php if (isset($option['hint'])) : ?>
+                    <?php if (isset($option['hint'])): ?>
                     <div class="tooltip" <?= /* @noEscape */ $block->getUiId('item', $key, 'tooltip') ?>>
                         <a href="<?= $block->escapeUrl($option['hint']['href']) ?>" class="help">
                             <?= $block->escapeHtml($option['hint']['label']) ?>
@@ -36,6 +36,7 @@
         <?php endif; ?>
     <?php endif; ?>
 </div>
+<?= /* @noEscape */$block->getAfterHtml() ?>
 <script type="text/x-magento-init">
     {
         ".actions-split": {
diff --git a/app/etc/di.xml b/app/etc/di.xml
index d38138ce29965..3ec48b82e921b 100644
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -1825,4 +1825,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\View\TemplateEngine\Php">
+        <arguments>
+            <argument name="blockVariables" xsi:type="array">
+                <item name="secureRenderer" xsi:type="object">Magento\Framework\View\Helper\SecureHtmlRenderer\Proxy</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php
index f460cd91167de..3da4eef9e08f1 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create.php
@@ -84,14 +84,14 @@ class Create extends Block
      *
      * @var string
      */
-    protected $updateItems = '[onclick="order.itemsUpdate()"]';
+    protected $updateItems = '[title="Update Items and Quantities"]';
 
     /**
      * 'Add Selected Product(s) to Order' button.
      *
      * @var string
      */
-    protected $addSelectedProducts = 'button[onclick="order.productGridAddSelected()"]';
+    protected $addSelectedProducts = 'button[title="Add Selected Product(s) to Order"]';
 
     /**
      * Sales order create account information block.
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Coupons.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Coupons.php
index dd04f7d32968b..5d9872141fc0f 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Coupons.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Create/Coupons.php
@@ -28,7 +28,7 @@ class Coupons extends Form
      *
      * @var string
      */
-    protected $applyButton = './/*[@id="coupons:code"]/following-sibling::button[contains(@onclick,"coupons:code")]';
+    protected $applyButton = './/*[@id="coupons:code"]/following-sibling::button[contains(@title,"Apply")]';
 
     /**
      * Selector for template block.
diff --git a/dev/tests/integration/_files/Magento/TestModuleSecureHtmlRenderer/Controller/Secure/Helper.php b/dev/tests/integration/_files/Magento/TestModuleSecureHtmlRenderer/Controller/Secure/Helper.php
new file mode 100644
index 0000000000000..4657f10374514
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSecureHtmlRenderer/Controller/Secure/Helper.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestModuleSecureHtmlRenderer\Controller\Secure;
+
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\Controller\ResultFactory;
+
+/**
+ * .phtml template utilizing secure-html helper.
+ */
+class Helper extends Action
+{
+    /**
+     * @inheritDoc
+     */
+    public function execute()
+    {
+        return $this->resultFactory->create(ResultFactory::TYPE_PAGE);
+    }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleSecureHtmlRenderer/composer.json b/dev/tests/integration/_files/Magento/TestModuleSecureHtmlRenderer/composer.json
new file mode 100644
index 0000000000000..316d3c8428d08
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSecureHtmlRenderer/composer.json
@@ -0,0 +1,21 @@
+{
+  "name": "magento/module-secure-html-renderer",
+  "description": "test secure html renderer module",
+  "config": {
+    "sort-packages": true
+  },
+  "require": {
+    "php": "~7.1.3||~7.2.0||~7.3.0",
+    "magento/framework": "*",
+    "magento/module-integration": "*"
+  },
+  "type": "magento2-module",
+  "extra": {
+    "map": [
+      [
+        "*",
+        "Magento/TestModuleSecureHtmlRenderer"
+      ]
+    ]
+  }
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleSecureHtmlRenderer/etc/frontend/routes.xml b/dev/tests/integration/_files/Magento/TestModuleSecureHtmlRenderer/etc/frontend/routes.xml
new file mode 100644
index 0000000000000..8cfe6080149b8
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSecureHtmlRenderer/etc/frontend/routes.xml
@@ -0,0 +1,14 @@
+<?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:App/etc/routes.xsd">
+    <router id="standard">
+        <route id="securehtml" frontName="securehtml">
+            <module name="Magento_TestModuleSecureHtmlRenderer" />
+        </route>
+    </router>
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleSecureHtmlRenderer/etc/module.xml b/dev/tests/integration/_files/Magento/TestModuleSecureHtmlRenderer/etc/module.xml
new file mode 100644
index 0000000000000..653ce176d4e0e
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSecureHtmlRenderer/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_TestModuleSecureHtmlRenderer" active="true" />
+</config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleSecureHtmlRenderer/registration.php b/dev/tests/integration/_files/Magento/TestModuleSecureHtmlRenderer/registration.php
new file mode 100644
index 0000000000000..4fff392257f8a
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSecureHtmlRenderer/registration.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+$registrar = new ComponentRegistrar();
+if ($registrar->getPath(ComponentRegistrar::MODULE, 'Magento_TestModuleSecureHtmlRenderer') === null) {
+    ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_TestModuleSecureHtmlRenderer', __DIR__);
+}
diff --git a/dev/tests/integration/_files/Magento/TestModuleSecureHtmlRenderer/view/frontend/layout/securehtml_secure_helper.xml b/dev/tests/integration/_files/Magento/TestModuleSecureHtmlRenderer/view/frontend/layout/securehtml_secure_helper.xml
new file mode 100644
index 0000000000000..0ea70a15a3299
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSecureHtmlRenderer/view/frontend/layout/securehtml_secure_helper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceContainer name="content">
+            <block class="Magento\Framework\View\Element\Template"
+                   name="secure_helper"
+                   cacheable="false"
+                   template="Magento_TestModuleSecureHtmlRenderer::helper.phtml" />
+        </referenceContainer>
+    </body>
+</page>
diff --git a/dev/tests/integration/_files/Magento/TestModuleSecureHtmlRenderer/view/frontend/templates/helper.phtml b/dev/tests/integration/_files/Magento/TestModuleSecureHtmlRenderer/view/frontend/templates/helper.phtml
new file mode 100644
index 0000000000000..a7a5eb9555cc3
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleSecureHtmlRenderer/view/frontend/templates/helper.phtml
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+?>
+<h1 <?= /* @noEscape */$secureRenderer->renderEventListener('onclick', 'alert()') ?>>Hello there!</h1>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', ['src' => 'http://my.magento.com/static/script.js'], false); ?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], "\n    let myVar = 1;\n", false) ?>
+<?= /* @noEscape */ $secureRenderer->renderTag('div', [], 'I am just <a> text', true) ?>
+
diff --git a/dev/tests/integration/etc/di/preferences/ce.php b/dev/tests/integration/etc/di/preferences/ce.php
index 2770283637dc7..bb55f123aa251 100644
--- a/dev/tests/integration/etc/di/preferences/ce.php
+++ b/dev/tests/integration/etc/di/preferences/ce.php
@@ -30,11 +30,5 @@
     \Magento\Framework\Lock\Backend\Cache::class =>
         \Magento\TestFramework\Lock\Backend\DummyLocker::class,
     \Magento\Framework\Session\SessionStartChecker::class => \Magento\TestFramework\Session\SessionStartChecker::class,
-    \Magento\Framework\HTTP\AsyncClientInterface::class => \Magento\TestFramework\HTTP\AsyncClientInterfaceMock::class,
-    \Magento\Catalog\Model\Category\Attribute\LayoutUpdateManager::class =>
-        \Magento\TestFramework\Catalog\Model\CategoryLayoutUpdateManager::class,
-    \Magento\Catalog\Model\Product\Attribute\LayoutUpdateManager::class =>
-        \Magento\TestFramework\Catalog\Model\ProductLayoutUpdateManager::class,
-    \Magento\Cms\Model\Page\CustomLayoutManagerInterface::class =>
-        \Magento\TestFramework\Cms\Model\CustomLayoutManager::class
+    \Magento\Framework\HTTP\AsyncClientInterface::class => \Magento\TestFramework\HTTP\AsyncClientInterfaceMock::class
 ];
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Button/SplitButtonTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Button/SplitButtonTest.php
new file mode 100644
index 0000000000000..911ce8d0e25c2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Button/SplitButtonTest.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Backend\Block\Widget\Button;
+
+use Magento\Framework\View\LayoutInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Testing SplitButton widget
+ *
+ * @magentoAppArea adminhtml
+ */
+class SplitButtonTest extends TestCase
+{
+
+    /**
+     * @var LayoutInterface
+     */
+    private $layout;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->layout = $objectManager->get(LayoutInterface::class);
+    }
+
+    /**
+     * Create the block.
+     *
+     * @return SplitButton
+     */
+    private function createBlock(): SplitButton
+    {
+        /** @var SplitButton $block */
+        $block = $this->layout->createBlock(SplitButton::class, 'button_block');
+        $block->setLayout($this->layout);
+
+        return $block;
+    }
+
+    /**
+     * Test resulting button HTML.
+     *
+     * @return void
+     */
+    public function testToHtml(): void
+    {
+        $block = $this->createBlock();
+        $block->addData(
+            [
+                'title' => 'A button',
+                'label' => 'A button',
+                'has_split' => true,
+                'button_class' => 'aclass',
+                'id' => 'split-button',
+                'disabled' => false,
+                'class' => 'aclass',
+                'data_attribute' => ['bind' => ['var' => 'val']],
+                'options' => [
+                    [
+                        'disabled' => false,
+                        'title' => 'An option',
+                        'label' => 'An option',
+                        'onclick' => $onclick = 'console.log("option")',
+                        'style' => $style = 'width: 100px'
+                    ]
+                ]
+            ]
+        );
+
+        $html = $block->toHtml();
+        $this->assertContains('<button ', $html);
+        $this->assertContains('<span>A button</span>', $html);
+        $this->assertNotContains('onclick=', $html);
+        $this->assertNotContains('style=', $html);
+        $this->assertRegExp('/\<script.*?\>.*?' . preg_quote($onclick) . '.*?\<\/script\>/ims', $html);
+        $this->assertRegExp('/\<style.*?\>.*?' . preg_quote($style) . '.*?\<\/style\>/ims', $html);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/ButtonTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/ButtonTest.php
new file mode 100644
index 0000000000000..d627672fefd96
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/ButtonTest.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Backend\Block\Widget;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+use Magento\Framework\View\LayoutInterface;
+
+/**
+ * Test for the button widget.
+ *
+ * @magentoAppArea adminhtml
+ */
+class ButtonTest extends TestCase
+{
+    /**
+     * @var LayoutInterface
+     */
+    private $layout;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->layout = $objectManager->get(LayoutInterface::class);
+    }
+
+    /**
+     * Create the block.
+     *
+     * @return Button
+     */
+    private function createBlock(): Button
+    {
+        /** @var Button $block */
+        $block = $this->layout->createBlock(Button::class, 'button_block');
+        $block->setLayout($this->layout);
+
+        return $block;
+    }
+
+    /**
+     * Test resulting button HTML.
+     *
+     * @return void
+     */
+    public function testToHtml(): void
+    {
+        $block = $this->createBlock();
+        $block->addData(
+            [
+                'type' => 'button',
+                'onclick' => 'console.log("Button pressed!")',
+                'disabled' => false,
+                'title' => 'A button',
+                'label' => 'A button',
+                'class' => 'button',
+                'id' => 'button',
+                'element_name' => 'some-name',
+                'value' => 'Press a button',
+                'data-style' => 'width: 100px',
+                'style' => 'height: 200px'
+            ]
+        );
+
+        $html = $block->toHtml();
+        $this->assertContains('<button ', $html);
+        $this->assertContains('<span>A button</span>', $html);
+        $this->assertNotContains('onclick=', $html);
+        $this->assertNotContains('style=', $html);
+        $this->assertRegExp('/\<script.*?\>.*?' .preg_quote($block->getOnClick()) .'.*?\<\/script\>/ims', $html);
+        $this->assertRegExp('/\<style.*?\>.*?' .preg_quote($block->getStyle()) .'.*?\<\/style\>/ims', $html);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/WidgetTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/WidgetTest.php
index b51edec1bcea3..14f6533c4107d 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Block/WidgetTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Block/WidgetTest.php
@@ -27,7 +27,8 @@ public function testGetButtonHtml()
         $widget = $layout->createBlock(\Magento\Backend\Block\Widget::class);
 
         $this->assertRegExp(
-            '/<button.*onclick\=\"this.form.submit\(\)\".*\>[\s\S]*Button Label[\s\S]*<\/button>/iu',
+            '/\<button.*\>[\s\S]*Button Label[\s\S]*<\/button>'
+                . '.*?\<script.*?\>.*?this\.form\.submit\(\).*?\<\/script\>/is',
             $widget->getButtonHtml('Button Label', 'this.form.submit()')
         );
     }
@@ -49,12 +50,14 @@ public function testGetButtonHtmlForTwoButtonsInOneBlock()
         $widget = $layout->createBlock(\Magento\Backend\Block\Widget::class);
 
         $this->assertRegExp(
-            '/<button.*onclick\=\"this.form.submit\(\)\".*\>[\s\S]*Button Label[\s\S]*<\/button>/iu',
+            '/<button.*\>[\s\S]*Button Label[\s\S]*<\/button>'
+                . '.*?\<script.*?\>.*?this\.form\.submit\(\).*?\<\/script\>/ius',
             $widget->getButtonHtml('Button Label', 'this.form.submit()')
         );
 
         $this->assertRegExp(
-            '/<button.*onclick\=\"this.form.submit\(\)\".*\>[\s\S]*Button Label2[\s\S]*<\/button>/iu',
+            '/<button.*\>[\s\S]*Button Label2[\s\S]*<\/button>'
+                . '.*?\<script.*?\>.*?this\.form\.submit\(\).*?\<\/script\>/ius',
             $widget->getButtonHtml('Button Label2', 'this.form.submit()')
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/GridTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/GridTest.php
index 7e147156eec34..e5fb645cfb018 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/GridTest.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/GridTest.php
@@ -27,7 +27,7 @@ public function testToHtmlHasOnClick()
 
         $html = $block->toHtml();
 
-        $regexpTemplate = '/<button [^>]* onclick="temp_id[^"]*\\.%s/i';
+        $regexpTemplate = '/\<script.*?\>.*?temp_id[^"]*\\.%s/is';
         $jsFuncs = ['doFilter', 'resetFilter'];
         foreach ($jsFuncs as $func) {
             $regexp = sprintf($regexpTemplate, $func);
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 e89e5aae92cf5..d1fceb3f511cd 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php
@@ -67,6 +67,12 @@ class CategoryTest extends AbstractBackendController
      */
     protected function setUp()
     {
+        Bootstrap::getObjectManager()->configure([
+            'preferences' => [
+                \Magento\Catalog\Model\Category\Attribute\LayoutUpdateManager::class
+                => \Magento\TestFramework\Catalog\Model\CategoryLayoutUpdateManager::class
+            ]
+        ]);
         parent::setUp();
 
         /** @var ProductResource $productResource */
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php
index 7ca04863f58a1..dd7c84f42ec57 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/ProductTest.php
@@ -49,6 +49,12 @@ class ProductTest extends \Magento\TestFramework\TestCase\AbstractBackendControl
      */
     protected function setUp()
     {
+        Bootstrap::getObjectManager()->configure([
+            'preferences' => [
+                \Magento\Catalog\Model\Product\Attribute\LayoutUpdateManager::class =>
+                    \Magento\TestFramework\Catalog\Model\ProductLayoutUpdateManager::class
+            ]
+        ]);
         parent::setUp();
 
         $this->aclBuilder = Bootstrap::getObjectManager()->get(Builder::class);
@@ -412,6 +418,7 @@ private function getProductData(array $tierPrice)
         $repo = $this->repositoryFactory->create();
         $product = $repo->get('tier_prices')->getData();
         $product['tier_price'] = $tierPrice;
+        $product['entity_id'] = null;
         unset($product['entity_id']);
         return $product;
     }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/CategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/CategoryTest.php
index c18a867a9b76e..fd1006909543e 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/CategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/CategoryTest.php
@@ -53,6 +53,12 @@ protected function setUp()
         parent::setUp();
 
         $this->objectManager = Bootstrap::getObjectManager();
+        $this->objectManager->configure([
+            'preferences' => [
+                \Magento\Catalog\Model\Category\Attribute\LayoutUpdateManager::class
+                => \Magento\TestFramework\Catalog\Model\CategoryLayoutUpdateManager::class
+            ]
+        ]);
         $this->registry = $this->objectManager->get(Registry::class);
         $this->layout = $this->objectManager->get(LayoutInterface::class);
         $this->session = $this->objectManager->get(Session::class);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/ProductTest.php
index 20805271f6b5b..28c6d5cba7ce8 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/ProductTest.php
@@ -43,6 +43,12 @@ protected function setUp()
         if (defined('HHVM_VERSION')) {
             $this->markTestSkipped('Randomly fails due to known HHVM bug (DOMText mixed with DOMElement)');
         }
+        Bootstrap::getObjectManager()->configure([
+            'preferences' => [
+                \Magento\Catalog\Model\Product\Attribute\LayoutUpdateManager::class =>
+                    \Magento\TestFramework\Catalog\Model\ProductLayoutUpdateManager::class
+            ]
+        ]);
         parent::setUp();
 
         $this->registry = $this->_objectManager->get(Registry::class);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Attribute/Backend/AbstractLayoutUpdateTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Attribute/Backend/AbstractLayoutUpdateTest.php
index 40725d3ee58be..6770072e8a2d4 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Attribute/Backend/AbstractLayoutUpdateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Attribute/Backend/AbstractLayoutUpdateTest.php
@@ -55,6 +55,12 @@ private function recreateCategory(): void
      */
     protected function setUp()
     {
+        Bootstrap::getObjectManager()->configure([
+            'preferences' => [
+                \Magento\Catalog\Model\Category\Attribute\LayoutUpdateManager::class
+                => \Magento\TestFramework\Catalog\Model\CategoryLayoutUpdateManager::class
+            ]
+        ]);
         $this->categoryFactory = Bootstrap::getObjectManager()->get(CategoryFactory::class);
         $this->recreateCategory();
         $this->attribute = $this->category->getAttributes()['custom_layout_update_file']->getBackend();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/DataProviderTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/DataProviderTest.php
index 6d66055cd1548..3556942f63514 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/DataProviderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/DataProviderTest.php
@@ -62,8 +62,14 @@ private function createDataProvider(): DataProvider
      */
     protected function setUp()
     {
-        parent::setUp();
         $objectManager = Bootstrap::getObjectManager();
+        $objectManager->configure([
+            'preferences' => [
+                \Magento\Catalog\Model\Category\Attribute\LayoutUpdateManager::class
+                => \Magento\TestFramework\Catalog\Model\CategoryLayoutUpdateManager::class
+            ]
+        ]);
+        parent::setUp();
         $this->dataProvider = $this->createDataProvider();
         $this->registry = $objectManager->get(Registry::class);
         $this->categoryFactory = $objectManager->get(CategoryFactory::class);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php
index c4cabe46f5b32..95c171ba321aa 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php
@@ -53,6 +53,12 @@ class CategoryRepositoryTest extends TestCase
      */
     protected function setUp()
     {
+        Bootstrap::getObjectManager()->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);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductRepositoryTest.php
index fb07d08faca58..d9c4a20f4a78e 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductRepositoryTest.php
@@ -58,6 +58,12 @@ class ProductRepositoryTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp()
     {
+        Bootstrap::getObjectManager()->configure([
+            'preferences' => [
+                \Magento\Catalog\Model\Product\Attribute\LayoutUpdateManager::class =>
+                    \Magento\TestFramework\Catalog\Model\ProductLayoutUpdateManager::class
+            ]
+        ]);
         $this->productRepository = Bootstrap::getObjectManager()->create(ProductRepositoryInterface::class);
         $this->searchCriteriaBuilder = Bootstrap::getObjectManager()->get(SearchCriteriaBuilder::class);
         $this->productFactory = Bootstrap::getObjectManager()->get(ProductFactory::class);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/LayoutUpdateTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/LayoutUpdateTest.php
index ebfbd06d7edad..eabc3f8e8591a 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/LayoutUpdateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/LayoutUpdateTest.php
@@ -58,6 +58,12 @@ class LayoutUpdateTest extends TestCase
      */
     protected function setUp()
     {
+        Bootstrap::getObjectManager()->configure([
+            'preferences' => [
+                \Magento\Catalog\Model\Product\Attribute\LayoutUpdateManager::class =>
+                    \Magento\TestFramework\Catalog\Model\ProductLayoutUpdateManager::class
+            ]
+        ]);
         $this->locator = $this->getMockForAbstractClass(LocatorInterface::class);
         $store = Bootstrap::getObjectManager()->create(StoreInterface::class);
         $this->locator->method('getStore')->willReturn($store);
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/PageDesignTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/PageDesignTest.php
index 8bc7a89280559..9008464215a32 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/PageDesignTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/PageDesignTest.php
@@ -66,6 +66,12 @@ class PageDesignTest extends AbstractBackendController
      */
     protected function setUp()
     {
+        Bootstrap::getObjectManager()->configure([
+            'preferences' => [
+                \Magento\Cms\Model\Page\CustomLayoutManagerInterface::class =>
+                    \Magento\TestFramework\Cms\Model\CustomLayoutManager::class
+            ]
+        ]);
         parent::setUp();
 
         $this->aclBuilder = Bootstrap::getObjectManager()->get(Builder::class);
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/PageTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/PageTest.php
index d80644caca086..4fb8685c491cc 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Controller/PageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Controller/PageTest.php
@@ -15,6 +15,20 @@
 
 class PageTest extends \Magento\TestFramework\TestCase\AbstractController
 {
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        Bootstrap::getObjectManager()->configure([
+            'preferences' => [
+                \Magento\Cms\Model\Page\CustomLayoutManagerInterface::class =>
+                    \Magento\TestFramework\Cms\Model\CustomLayoutManager::class
+            ]
+        ]);
+        parent::setUp();
+    }
+
     public function testViewAction()
     {
         $this->dispatch('/enable-cookies');
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Model/Page/CustomLayoutRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Cms/Model/Page/CustomLayoutRepositoryTest.php
index e3422cd81638b..8a500c97d0cd9 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Model/Page/CustomLayoutRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Model/Page/CustomLayoutRepositoryTest.php
@@ -21,6 +21,8 @@
 
 /**
  * Test the repository.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CustomLayoutRepositoryTest extends TestCase
 {
@@ -50,6 +52,12 @@ class CustomLayoutRepositoryTest extends TestCase
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
+        $objectManager->configure([
+            'preferences' => [
+                \Magento\Cms\Model\Page\CustomLayoutManagerInterface::class =>
+                    \Magento\TestFramework\Cms\Model\CustomLayoutManager::class
+            ]
+        ]);
         $this->fakeManager = $objectManager->get(CustomLayoutManager::class);
         $this->repo = $objectManager->create(CustomLayoutRepositoryInterface::class, ['manager' => $this->fakeManager]);
         $this->pageFactory = $objectManager->get(PageFactory::class);
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Model/Page/DataProviderTest.php b/dev/tests/integration/testsuite/Magento/Cms/Model/Page/DataProviderTest.php
index 2028f5d8a04b6..e66d10eaa35a1 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Model/Page/DataProviderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Model/Page/DataProviderTest.php
@@ -48,6 +48,12 @@ class DataProviderTest extends TestCase
     protected function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
+        $objectManager->configure([
+            'preferences' => [
+                \Magento\Cms\Model\Page\CustomLayoutManagerInterface::class =>
+                    \Magento\TestFramework\Cms\Model\CustomLayoutManager::class
+            ]
+        ]);
         $this->repo = $objectManager->get(GetPageByIdentifierInterface::class);
         $this->filesFaker = $objectManager->get(CustomLayoutManager::class);
         $this->request = $objectManager->get(HttpRequest::class);
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Model/PageRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Cms/Model/PageRepositoryTest.php
index 5e7e0c962fcde..d9787c2ea49d6 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Model/PageRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Model/PageRepositoryTest.php
@@ -34,6 +34,12 @@ class PageRepositoryTest extends TestCase
      */
     protected function setUp()
     {
+        Bootstrap::getObjectManager()->configure([
+            'preferences' => [
+                \Magento\Cms\Model\Page\CustomLayoutManagerInterface::class =>
+                    \Magento\TestFramework\Cms\Model\CustomLayoutManager::class
+            ]
+        ]);
         $this->repo = Bootstrap::getObjectManager()->get(PageRepositoryInterface::class);
         $this->retriever = Bootstrap::getObjectManager()->get(GetPageByIdentifierInterface::class);
     }
diff --git a/dev/tests/integration/testsuite/Magento/Cms/_files/pages_with_layout_xml.php b/dev/tests/integration/testsuite/Magento/Cms/_files/pages_with_layout_xml.php
index 9734ed3abaeed..8092be3c426a9 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/_files/pages_with_layout_xml.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/_files/pages_with_layout_xml.php
@@ -12,6 +12,12 @@
 use Magento\TestFramework\Helper\Bootstrap;
 
 $objectManager = Bootstrap::getObjectManager();
+$objectManager->configure([
+    'preferences' => [
+        \Magento\Cms\Model\Page\CustomLayoutManagerInterface::class =>
+            \Magento\TestFramework\Cms\Model\CustomLayoutManager::class
+    ]
+]);
 $pageFactory = $objectManager->get(PageModelFactory::class);
 /** @var CustomLayoutManager $fakeManager */
 $fakeManager = $objectManager->get(CustomLayoutManager::class);
diff --git a/dev/tests/integration/testsuite/Magento/Csp/CspUtilTest.php b/dev/tests/integration/testsuite/Magento/Csp/CspUtilTest.php
index 362fb412eae12..9b584ba7028ee 100644
--- a/dev/tests/integration/testsuite/Magento/Csp/CspUtilTest.php
+++ b/dev/tests/integration/testsuite/Magento/Csp/CspUtilTest.php
@@ -28,7 +28,10 @@ public function testPhtmlHelper(): void
         $this->dispatch('csputil/csp/helper');
         $content = $this->getResponse()->getContent();
 
-        $this->assertContains('<script src="http://my.magento.com/static/script.js" />', $content);
+        $this->assertContains(
+            '<script src="http&#x3A;&#x2F;&#x2F;my.magento.com&#x2F;static&#x2F;script.js"/>',
+            $content
+        );
         $this->assertContains("<script>\n    let myVar = 1;\n</script>", $content);
         $header = $this->getResponse()->getHeader('Content-Security-Policy');
         $this->assertNotEmpty($header);
diff --git a/dev/tests/integration/testsuite/Magento/Csp/Helper/InlineUtilTest.php b/dev/tests/integration/testsuite/Magento/Csp/Helper/InlineUtilTest.php
index 9dc08ca0337bb..e1b666bc351e6 100644
--- a/dev/tests/integration/testsuite/Magento/Csp/Helper/InlineUtilTest.php
+++ b/dev/tests/integration/testsuite/Magento/Csp/Helper/InlineUtilTest.php
@@ -9,7 +9,9 @@
 
 use Magento\Csp\Api\Data\PolicyInterface;
 use Magento\Csp\Model\Collector\DynamicCollector;
+use Magento\Csp\Model\Collector\DynamicCollectorMock;
 use Magento\Csp\Model\Policy\FetchPolicy;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 
@@ -24,24 +26,39 @@ class InlineUtilTest extends TestCase
     private $util;
 
     /**
-     * @var PolicyInterface[]
+     * @var SecureHtmlRenderer
      */
-    private $policiesAdded = [];
+    private $secureHtmlRenderer;
+
+    /**
+     * @var DynamicCollectorMock
+     */
+    private $dynamicCollector;
 
     /**
      * @inheritDoc
      */
     public function setUp()
     {
-        $this->policiesAdded = [];
-        $collectorMock = $this->getMockBuilder(DynamicCollector::class)->disableOriginalConstructor()->getMock();
-        $collectorMock->method('add')
-            ->willReturnCallback(
-                function (PolicyInterface $policy) {
-                    $this->policiesAdded[] = $policy;
-                }
-            );
-        $this->util = Bootstrap::getObjectManager()->create(InlineUtil::class, ['dynamicCollector' => $collectorMock]);
+        Bootstrap::getObjectManager()->configure([
+            'preferences' => [
+                DynamicCollector::class => DynamicCollectorMock::class
+            ]
+        ]);
+        $this->util = Bootstrap::getObjectManager()->get(InlineUtil::class);
+        $this->secureHtmlRenderer = Bootstrap::getObjectManager()->get(SecureHtmlRenderer::class);
+        $this->dynamicCollector = Bootstrap::getObjectManager()->get(DynamicCollector::class);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function tearDown()
+    {
+        $this->util = null;
+        $this->secureHtmlRenderer = null;
+        $this->dynamicCollector->consumeAdded();
+        $this->dynamicCollector = null;
     }
 
     /**
@@ -63,7 +80,7 @@ public function testRenderTag(
         array $policiesExpected
     ): void {
         $this->assertEquals($result, $this->util->renderTag($tagName, $attributes, $content));
-        $this->assertEquals($policiesExpected, $this->policiesAdded);
+        $this->assertEquals($policiesExpected, $this->dynamicCollector->consumeAdded());
     }
 
     /**
@@ -79,14 +96,14 @@ public function getTags(): array
                 'script',
                 ['src' => 'http://magento.com/static/some-script.js'],
                 null,
-                '<script src="http://magento.com/static/some-script.js" />',
+                '<script src="http&#x3A;&#x2F;&#x2F;magento.com&#x2F;static&#x2F;some-script.js"/>',
                 [new FetchPolicy('script-src', false, ['http://magento.com'])]
             ],
             'inline-script' => [
                 'script',
                 ['type' => 'text/javascript'],
                 "\n    let someVar = 25;\n    document.getElementById('test').innerText = someVar;\n",
-                "<script type=\"text/javascript\">\n    let someVar = 25;"
+                "<script type=\"text&#x2F;javascript\">\n    let someVar = 25;"
                     ."\n    document.getElementById('test').innerText = someVar;\n</script>",
                 [
                     new FetchPolicy(
@@ -106,7 +123,8 @@ public function getTags(): array
                 'link',
                 ['rel' => 'stylesheet', 'type' => 'text/css', 'href' => 'http://magento.com/static/style.css'],
                 null,
-                '<link rel="stylesheet" type="text/css" href="http://magento.com/static/style.css" />',
+                '<link rel="stylesheet" type="text&#x2F;css"'
+                    . ' href="http&#x3A;&#x2F;&#x2F;magento.com&#x2F;static&#x2F;style.css"/>',
                 [new FetchPolicy('style-src', false, ['http://magento.com'])]
             ],
             'inline-style' => [
@@ -132,7 +150,7 @@ public function getTags(): array
                 'img',
                 ['src' => 'http://magento.com/static/my.jpg'],
                 null,
-                '<img src="http://magento.com/static/my.jpg" />',
+                '<img src="http&#x3A;&#x2F;&#x2F;magento.com&#x2F;static&#x2F;my.jpg"/>',
                 [new FetchPolicy('img-src', false, ['http://magento.com'])]
             ],
             'remote-font' => [
@@ -145,7 +163,7 @@ public function getTags(): array
                     ."\n             url(static/font.ttf),"
                     ."\n             url(https://devdocs.magento.com/static/another-font.woff),"
                     ."\n             url(http://devdocs.magento.com/static/font.woff);\n    }\n",
-                "<style type=\"text/css\">"
+                "<style type=\"text&#x2F;css\">"
                     ."\n    @font-face {\n        font-family: \"MyCustomFont\";"
                     ."\n        src: url(\"http://magento.com/static/font.ttf\");\n    }\n"
                     ."    @font-face {\n        font-family: \"MyCustomFont2\";"
@@ -182,7 +200,7 @@ public function getTags(): array
                 'form',
                 ['action' => 'https://magento.com/submit', 'method' => 'post'],
                 "\n    <input type=\"text\" name=\"test\" /><input type=\"submit\" value=\"Submit\" />\n",
-                "<form action=\"https://magento.com/submit\" method=\"post\">"
+                "<form action=\"https&#x3A;&#x2F;&#x2F;magento.com&#x2F;submit\" method=\"post\">"
                     ."\n    <input type=\"text\" name=\"test\" /><input type=\"submit\" value=\"Submit\" />\n"
                     ."</form>",
                 [new FetchPolicy('form-action', false, ['https://magento.com'])]
@@ -191,56 +209,57 @@ public function getTags(): array
                 'iframe',
                 ['src' => 'http://magento.com/some-page'],
                 null,
-                '<iframe src="http://magento.com/some-page" />',
+                '<iframe src="http&#x3A;&#x2F;&#x2F;magento.com&#x2F;some-page"/>',
                 [new FetchPolicy('frame-src', false, ['http://magento.com'])]
             ],
             'remote-track' => [
                 'track',
                 ['src' => 'http://magento.com/static/track.vtt', 'kind' => 'subtitles'],
                 null,
-                '<track src="http://magento.com/static/track.vtt" kind="subtitles" />',
+                '<track src="http&#x3A;&#x2F;&#x2F;magento.com&#x2F;static&#x2F;track.vtt" kind="subtitles"/>',
                 [new FetchPolicy('media-src', false, ['http://magento.com'])]
             ],
             'remote-source' => [
                 'source',
                 ['src' => 'http://magento.com/static/track.ogg', 'type' => 'audio/ogg'],
                 null,
-                '<source src="http://magento.com/static/track.ogg" type="audio/ogg" />',
+                '<source src="http&#x3A;&#x2F;&#x2F;magento.com&#x2F;static&#x2F;track.ogg" type="audio&#x2F;ogg"/>',
                 [new FetchPolicy('media-src', false, ['http://magento.com'])]
             ],
             'remote-video' => [
                 'video',
                 ['src' => 'https://magento.com/static/video.mp4'],
                 null,
-                '<video src="https://magento.com/static/video.mp4" />',
+                '<video src="https&#x3A;&#x2F;&#x2F;magento.com&#x2F;static&#x2F;video.mp4"/>',
                 [new FetchPolicy('media-src', false, ['https://magento.com'])]
             ],
             'remote-audio' => [
                 'audio',
                 ['src' => 'https://magento.com/static/audio.mp3'],
                 null,
-                '<audio src="https://magento.com/static/audio.mp3" />',
+                '<audio src="https&#x3A;&#x2F;&#x2F;magento.com&#x2F;static&#x2F;audio.mp3"/>',
                 [new FetchPolicy('media-src', false, ['https://magento.com'])]
             ],
             'remote-object' => [
                 'object',
                 ['data' => 'http://magento.com/static/flash.swf'],
                 null,
-                '<object data="http://magento.com/static/flash.swf" />',
+                '<object data="http&#x3A;&#x2F;&#x2F;magento.com&#x2F;static&#x2F;flash.swf"/>',
                 [new FetchPolicy('object-src', false, ['http://magento.com'])]
             ],
             'remote-embed' => [
                 'embed',
                 ['src' => 'http://magento.com/static/flash.swf'],
                 null,
-                '<embed src="http://magento.com/static/flash.swf" />',
+                '<embed src="http&#x3A;&#x2F;&#x2F;magento.com&#x2F;static&#x2F;flash.swf"/>',
                 [new FetchPolicy('object-src', false, ['http://magento.com'])]
             ],
             'remote-applet' => [
                 'applet',
                 ['code' => 'SomeApplet.class', 'archive' => 'https://magento.com/applet/my-applet.jar'],
                 null,
-                '<applet code="SomeApplet.class" archive="https://magento.com/applet/my-applet.jar" />',
+                '<applet code="SomeApplet.class" '
+                    . 'archive="https&#x3A;&#x2F;&#x2F;magento.com&#x2F;applet&#x2F;my-applet.jar"/>',
                 [new FetchPolicy('object-src', false, ['https://magento.com'])]
             ]
         ];
@@ -254,7 +273,36 @@ public function getTags(): array
     public function testRenderEventListener(): void
     {
         $result = $this->util->renderEventListener('onclick', 'alert()');
-        $this->assertEquals('onclick="alert()"', $result);
-        $this->assertEquals([new FetchPolicy('script-src', false, [], [], false, true)], $this->policiesAdded);
+        $this->assertEquals('onclick="alert&#x28;&#x29;"', $result);
+        $this->assertEquals(
+            [new FetchPolicy('script-src', false, [], [], false, true)],
+            $this->dynamicCollector->consumeAdded()
+        );
+    }
+
+    /**
+     * Check that CSP logic was added to SecureHtmlRenderer
+     *
+     * @return void
+     */
+    public function testSecureHtmlRenderer(): void
+    {
+        $scriptTag = $this->secureHtmlRenderer->renderTag(
+            'script',
+            ['src' => 'https://test.magento.com/static/script.js']
+        );
+        $eventListener = $this->secureHtmlRenderer->renderEventListener('onclick', 'alert()');
+
+        $this->assertEquals(
+            '<script src="https&#x3A;&#x2F;&#x2F;test.magento.com&#x2F;static&#x2F;script.js"/>',
+            $scriptTag
+        );
+        $this->assertEquals(
+            'onclick="alert&#x28;&#x29;"',
+            $eventListener
+        );
+        $policies = $this->dynamicCollector->consumeAdded();
+        $this->assertTrue(in_array(new FetchPolicy('script-src', false, ['https://test.magento.com']), $policies));
+        $this->assertTrue(in_array(new FetchPolicy('script-src', false, [], [], false, true), $policies));
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Csp/Model/Collector/DynamicCollectorMock.php b/dev/tests/integration/testsuite/Magento/Csp/Model/Collector/DynamicCollectorMock.php
new file mode 100644
index 0000000000000..744df4c92018b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Csp/Model/Collector/DynamicCollectorMock.php
@@ -0,0 +1,44 @@
+<?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;
+
+/**
+ * Helps with testing CSP policies.
+ */
+class DynamicCollectorMock extends DynamicCollector
+{
+    /**
+     * @var PolicyInterface[]
+     */
+    private $added = [];
+
+    /**
+     * @inheritDoc
+     */
+    public function add(PolicyInterface $policy): void
+    {
+        $this->added[] = $policy;
+
+        parent::add($policy);
+    }
+
+    /**
+     * Collect added policies and start a new cycle.
+     *
+     * @return PolicyInterface[]
+     */
+    public function consumeAdded(): array
+    {
+        $policies = $this->added;
+        $this->added = [];
+
+        return $policies;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Csp/Model/Policy/Renderer/SimplePolicyHeaderRendererTest.php b/dev/tests/integration/testsuite/Magento/Csp/Model/Policy/Renderer/SimplePolicyHeaderRendererTest.php
index a67665c6d3c48..2e02c78f2fb04 100644
--- a/dev/tests/integration/testsuite/Magento/Csp/Model/Policy/Renderer/SimplePolicyHeaderRendererTest.php
+++ b/dev/tests/integration/testsuite/Magento/Csp/Model/Policy/Renderer/SimplePolicyHeaderRendererTest.php
@@ -99,7 +99,7 @@ public function testRenderReportMode(): void
             ['https://magento.com'],
             ['https'],
             true,
-            true,
+            false,
             true,
             ['5749837589457695'],
             ['B2yPHKaXnvFWtRChIbabYmUBFZdVfKKXHbWtWidDVF8=' => 'sha256'],
@@ -112,13 +112,48 @@ public function testRenderReportMode(): void
         $this->assertNotEmpty($header = $this->response->getHeader('Content-Security-Policy-Report-Only'));
         $this->assertEmpty($this->response->getHeader('Content-Security-Policy'));
         $this->assertEquals(
-            'default-src https://magento.com https: \'self\' \'unsafe-inline\' \'unsafe-eval\' \'strict-dynamic\''
+            'default-src https://magento.com https: \'self\' \'unsafe-eval\' \'strict-dynamic\''
             . ' \'unsafe-hashes\' \'nonce-'.base64_encode($policy->getNonceValues()[0]).'\''
             . ' \'sha256-B2yPHKaXnvFWtRChIbabYmUBFZdVfKKXHbWtWidDVF8=\';',
             $header->getFieldValue()
         );
     }
 
+    /**
+     * Test rendering a fetch policy with inline allowed.
+     *
+     * @magentoAppArea frontend
+     * @magentoConfigFixture default_store csp/mode/storefront/report_only 1
+     * @magentoConfigFixture default_store csp/mode/storefront/report_uri 0
+     *
+     * @return void
+     */
+    public function testFetchPolicyInlineAllowed(): void
+    {
+        $policy = new FetchPolicy(
+            'script-src',
+            false,
+            ['https://magento.com'],
+            ['https'],
+            true,
+            true,
+            true,
+            ['5749837589457695'],
+            ['B2yPHKaXnvFWtRChIbabYmUBFZdVfKKXHbWtWidDVF8=' => 'sha256'],
+            false,
+            false
+        );
+
+        $this->renderer->render($policy, $this->response);
+
+        $this->assertNotEmpty($header = $this->response->getHeader('Content-Security-Policy-Report-Only'));
+        $this->assertEmpty($this->response->getHeader('Content-Security-Policy'));
+        $this->assertEquals(
+            'script-src https://magento.com https: \'self\' \'unsafe-inline\' \'unsafe-eval\';',
+            $header->getFieldValue()
+        );
+    }
+
     /**
      * Test policy rendering in report-only mode with report URL provided.
      *
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTemplateTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTemplateTest.php
new file mode 100644
index 0000000000000..154c6832b045d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTemplateTest.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\View\Helper;
+
+use Magento\TestFramework\TestCase\AbstractController;
+
+/**
+ * Test the secure HTML helper and templates.
+ *
+ * @magentoAppArea frontend
+ */
+class SecureHtmlRendererTemplateTest extends AbstractController
+{
+    /**
+     * Test using the helper inside templates.
+     *
+     * @return void
+     */
+    public function testTemplateUsage(): void
+    {
+        $this->getRequest()->setMethod('GET');
+        $this->dispatch('securehtml/secure/helper');
+        $content = $this->getResponse()->getContent();
+
+        $this->assertContains(
+            '<h1 onclick="alert&#x28;&#x29;">Hello there!</h1>',
+            $content
+        );
+        $this->assertContains(
+            '<script src="http&#x3A;&#x2F;&#x2F;my.magento.com&#x2F;static&#x2F;script.js"/>',
+            $content
+        );
+        $this->assertContains(
+            "<script>\n    let myVar = 1;\n</script>",
+            $content
+        );
+        $this->assertContains(
+            '<div>I am just &lt;a&gt; text</div>',
+            $content
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTest.php
new file mode 100644
index 0000000000000..aae50ec02857d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTest.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\View\Helper;
+
+use Magento\Framework\View\Helper\SecureHtmlRender\TagData;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for the secure HTML helper.
+ */
+class SecureHtmlRendererTest extends TestCase
+{
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $helper;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        //Clearing the processors list to ensure stable results.
+        $this->helper = $objectManager->create(SecureHtmlRenderer::class, ['processors' => []]);
+    }
+
+    /**
+     * Provides tags to render.
+     *
+     * @return array
+     */
+    public function getTags(): array
+    {
+        return [
+            [
+                new TagData('div', ['style' => 'display: none;', 'width' => '20px'], 'some <text>', true),
+                '<div style="display&#x3A;&#x20;none&#x3B;" width="20px">some &lt;text&gt;</div>'
+            ],
+            [
+                new TagData('div', [], 'some <b>HTML</b>', false),
+                '<div>some <b>HTML</b></div>'
+            ],
+            [
+                new TagData('img', ['src' => 'https://magento.com/img.jpg'], null, true),
+                '<img src="https&#x3A;&#x2F;&#x2F;magento.com&#x2F;img.jpg"/>'
+            ]
+        ];
+    }
+
+    /**
+     * Test tag rendering.
+     *
+     * @param TagData $tagData
+     * @param string $expected Expected HTML.
+     * @return void
+     * @dataProvider getTags
+     */
+    public function testRenderTag(TagData $tagData, string $expected): void
+    {
+        $this->assertEquals(
+            $expected,
+            $this->helper->renderTag(
+                $tagData->getTag(),
+                $tagData->getAttributes(),
+                $tagData->getContent(),
+                $tagData->isTextContent()
+            )
+        );
+    }
+
+    /**
+     * Test rendering an event listener.
+     *
+     * @return void
+     */
+    public function testRenderEventHandler(): void
+    {
+        $this->assertEquals(
+            'onclick="alert&#x28;this.parent.getAttribute&#x28;&quot;data-title&quot;&#x29;&#x29;"',
+            $this->helper->renderEventListener('onclick', 'alert(this.parent.getAttribute("data-title"))')
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AccountTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AccountTest.php
index b75501911be6b..5883856ec81ee 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AccountTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Form/AccountTest.php
@@ -90,26 +90,26 @@ public function testGetFormWithCustomer()
 
         $expectedFields = ['group_id', 'email'];
         $form = $this->accountBlock->getForm();
-        self::assertEquals(1, $form->getElements()->count(), "Form has invalid number of fieldsets");
+        $this->assertEquals(1, $form->getElements()->count(), "Form has invalid number of fieldsets");
         $fieldset = $form->getElements()[0];
         $content = $form->toHtml();
 
-        self::assertEquals(count($expectedFields), $fieldset->getElements()->count());
+        $this->assertEquals(count($expectedFields), $fieldset->getElements()->count());
 
         foreach ($fieldset->getElements() as $element) {
-            self::assertTrue(
+            $this->assertTrue(
                 in_array($element->getId(), $expectedFields),
                 sprintf('Unexpected field "%s" in form.', $element->getId())
             );
         }
 
-        self::assertContains(
-            '<option value="'.$customerGroup.'" selected="selected">Wholesale</option>',
+        $this->assertRegExp(
+            '/<option value="'.$customerGroup.'".*?selected="selected"\>Wholesale\<\/option\>/is',
             $content,
             'The Customer Group specified for the chosen customer should be selected.'
         );
 
-        self::assertContains(
+        $this->assertContains(
             'value="'.$customer->getEmail().'"',
             $content,
             'The Customer Email specified for the chosen customer should be input '
@@ -146,14 +146,14 @@ public function testGetFormWithUserDefinedAttribute()
         $form->setUseContainer(true);
         $content = $form->toHtml();
 
-        self::assertContains(
-            '<option value="1" selected="selected">Yes</option>',
+        $this->assertRegExp(
+            '/\<option value="1".*?selected="selected"\>Yes\<\/option\>/is',
             $content,
             'Default value for user defined custom attribute should be selected.'
         );
 
-        self::assertContains(
-            '<option value="3" selected="selected">Retailer</option>',
+        $this->assertRegExp(
+            '/<option value="3".*?selected="selected"\>Retailer\<\/option\>/is',
             $content,
             'The Customer Group specified for the chosen store should be selected.'
         );
diff --git a/dev/tests/integration/testsuite/Magento/Ui/Component/Control/ButtonTest.php b/dev/tests/integration/testsuite/Magento/Ui/Component/Control/ButtonTest.php
new file mode 100644
index 0000000000000..12154f9ff4683
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Ui/Component/Control/ButtonTest.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Ui\Component\Control;
+
+use Magento\Framework\View\LayoutInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for the button control.
+ *
+ * @magentoAppArea frontend
+ */
+class ButtonTest extends TestCase
+{
+    /**
+     * @var LayoutInterface
+     */
+    private $layout;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->layout = $objectManager->get(LayoutInterface::class);
+    }
+
+    /**
+     * Create the block.
+     *
+     * @return Button
+     */
+    private function createBlock(): Button
+    {
+        /** @var Button $block */
+        $block = $this->layout->createBlock(Button::class, 'button_block');
+        $block->setLayout($this->layout);
+
+        return $block;
+    }
+
+    /**
+     * Test resulting button HTML.
+     *
+     * @return void
+     */
+    public function testToHtml(): void
+    {
+        $block = $this->createBlock();
+        $block->addData(
+            [
+                'type' => 'button',
+                'on_click' => $onclick = 'console.log("Button pressed!")',
+                'disabled' => false,
+                'title' => 'A button control',
+                'label' => 'A button control',
+                'class' => 'button',
+                'id' => 'button',
+                'element_name' => 'some-name',
+                'value' => 'Press a button',
+                'data-style' => 'width: 100px',
+                'style' => $style = 'height: 200px'
+            ]
+        );
+
+        $html = $block->toHtml();
+        $this->assertContains('<button ', $html);
+        $this->assertContains('<span>A button control</span>', $html);
+        $this->assertNotContains('onclick=', $html);
+        $this->assertNotContains('style=', $html);
+        $this->assertRegExp('/\<script.*?\>.*?' .preg_quote($onclick) .'.*?\<\/script\>/ims', $html);
+        $this->assertRegExp('/\<style.*?\>.*?' .preg_quote($style) .'.*?\<\/style\>/ims', $html);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Ui/Component/Control/SplitButtonTest.php b/dev/tests/integration/testsuite/Magento/Ui/Component/Control/SplitButtonTest.php
new file mode 100644
index 0000000000000..ccc9723ce2729
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Ui/Component/Control/SplitButtonTest.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Ui\Component\Control;
+
+use Magento\Framework\View\LayoutInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Testing SplitButton widget
+ *
+ * @magentoAppArea frontend
+ */
+class SplitButtonTest extends TestCase
+{
+
+    /**
+     * @var LayoutInterface
+     */
+    private $layout;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->layout = $objectManager->get(LayoutInterface::class);
+    }
+
+    /**
+     * Create the block.
+     *
+     * @return SplitButton
+     */
+    private function createBlock(): SplitButton
+    {
+        /** @var SplitButton $block */
+        $block = $this->layout->createBlock(SplitButton::class, 'button_block');
+        $block->setLayout($this->layout);
+
+        return $block;
+    }
+
+    /**
+     * Test resulting button HTML.
+     *
+     * @return void
+     */
+    public function testToHtml(): void
+    {
+        $block = $this->createBlock();
+        $block->addData(
+            [
+                'title' => 'Split button control',
+                'label' => 'Split button control',
+                'has_split' => true,
+                'button_class' => 'aclass',
+                'id' => 'split-button',
+                'disabled' => false,
+                'class' => 'aclass',
+                'data_attribute' => ['bind' => ['var' => 'val']],
+                'id_hard' => 'split-button',
+                'options' => [
+                    [
+                        'id' => 'an-option',
+                        'disabled' => false,
+                        'title' => 'An option',
+                        'label' => 'An option',
+                        'onclick' => $onclick = 'console.log("option")',
+                        'style' => $style = 'width: 100px'
+                    ]
+                ]
+            ]
+        );
+
+        $html = $block->toHtml();
+        $this->assertContains('<button ', $html);
+        $this->assertContains('<span>Split button control</span>', $html);
+        $this->assertNotContains('onclick=', $html);
+        $this->assertNotContains('style=', $html);
+        $this->assertRegExp('/\<script.*?\>.*?' . preg_quote($onclick) . '.*?\<\/script\>/ims', $html);
+        $this->assertRegExp('/\<style.*?\>.*?' . preg_quote($style) . '.*?\<\/style\>/ims', $html);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/EditTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/EditTest.php
index cde7c1a28ac1f..8b976492a0a0f 100644
--- a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/EditTest.php
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Category/EditTest.php
@@ -123,24 +123,20 @@ private function _checkButtons($block, $expected)
         if (isset($expected['back_button'])) {
             if ($expected['back_button']) {
                 if ($block->getCategory()->getId()) {
-                    $this->assertEquals(
-                        1,
-                        \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
-                            '//button[contains(@class, "back") and contains(@onclick, "/category")]',
-                            $buttonsHtml
-                        ),
-                        'Back button is not present in category URL rewrite edit block'
-                    );
-                } else {
-                    $this->assertEquals(
-                        1,
-                        \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
-                            '//button[contains(@class,"back")]',
-                            $buttonsHtml
-                        ),
+                    $this->assertRegExp(
+                        '/setLocation\([\\\'\"]\S+?\/category/i',
+                        $buttonsHtml,
                         'Back button is not present in category URL rewrite edit block'
                     );
                 }
+                $this->assertEquals(
+                    1,
+                    \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
+                        '//button[contains(@class,"back")]',
+                        $buttonsHtml
+                    ),
+                    'Back button is not present in category URL rewrite edit block'
+                );
             } else {
                 $this->assertEquals(
                     0,
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Product/EditTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Product/EditTest.php
index 9a20f9430519d..5873cd856086e 100644
--- a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Product/EditTest.php
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Catalog/Product/EditTest.php
@@ -155,24 +155,20 @@ private function _checkButtons($block, $expected)
         if (isset($expected['back_button'])) {
             if ($expected['back_button']) {
                 if ($block->getProduct()->getId()) {
-                    $this->assertEquals(
-                        1,
-                        \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
-                            '//button[contains(@class, "back") and contains(@onclick, "/product")]',
-                            $buttonsHtml
-                        ),
-                        'Back button is not present in product URL rewrite edit block'
-                    );
-                } else {
-                    $this->assertEquals(
-                        1,
-                        \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
-                            '//button[contains(@class,"back")]',
-                            $buttonsHtml
-                        ),
-                        'Back button is not present in product URL rewrite edit block'
+                    $this->assertRegExp(
+                        '/setLocation\([\\\'\"]\S+?\/product/i',
+                        $buttonsHtml,
+                        'Back button is not present in category URL rewrite edit block'
                     );
                 }
+                $this->assertEquals(
+                    1,
+                    \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
+                        '//button[contains(@class,"back")]',
+                        $buttonsHtml
+                    ),
+                    'Back button is not present in product URL rewrite edit block'
+                );
             } else {
                 $this->assertEquals(
                     0,
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Cms/Page/EditTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Cms/Page/EditTest.php
index 19f595191051b..03b73e3161df0 100644
--- a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Cms/Page/EditTest.php
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Cms/Page/EditTest.php
@@ -123,24 +123,20 @@ private function _checkButtons($block, $expected)
         if (isset($expected['back_button'])) {
             if ($expected['back_button']) {
                 if ($block->getCmsPage()->getId()) {
-                    $this->assertEquals(
-                        1,
-                        \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
-                            '//button[contains(@class, "back") and contains(@onclick, "/cms_page")]',
-                            $buttonsHtml
-                        ),
-                        'Back button is not present in CMS page URL rewrite edit block'
-                    );
-                } else {
-                    $this->assertEquals(
-                        1,
-                        \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
-                            '//button[contains(@class,"back")]',
-                            $buttonsHtml
-                        ),
-                        'Back button is not present in CMS page URL rewrite edit block'
+                    $this->assertRegExp(
+                        '/setLocation\([\\\'\"]\S+?\/cms_page/i',
+                        $buttonsHtml,
+                        'Back button is not present in category URL rewrite edit block'
                     );
                 }
+                $this->assertEquals(
+                    1,
+                    \Magento\TestFramework\Helper\Xpath::getElementsCountForXpath(
+                        '//button[contains(@class, "back")]',
+                        $buttonsHtml
+                    ),
+                    'Back button is not present in CMS page URL rewrite edit block'
+                );
             } else {
                 $this->assertEquals(
                     0,
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Controller/Adminhtml/Widget/InstanceTest.php b/dev/tests/integration/testsuite/Magento/Widget/Controller/Adminhtml/Widget/InstanceTest.php
index cc6f2793fcfef..2a85e7020964b 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Controller/Adminhtml/Widget/InstanceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Controller/Adminhtml/Widget/InstanceTest.php
@@ -33,7 +33,10 @@ protected function setUp()
     public function testEditAction()
     {
         $this->dispatch('backend/admin/widget_instance/edit');
-        $this->assertContains('<option value="cms_page_link" selected="selected">', $this->getResponse()->getBody());
+        $this->assertRegExp(
+            '/<option value="cms_page_link".*?selected="selected"\>/is',
+            $this->getResponse()->getBody()
+        );
     }
 
     public function testBlocksAction()
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
index ff1e3ba63ba8a..759db7c093abc 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
@@ -5,10 +5,13 @@
  */
 namespace Magento\Framework\Data\Form\Element;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Data\Form;
 use Magento\Framework\Data\Form\AbstractForm;
 use Magento\Framework\Data\Form\Element\Renderer\RendererInterface;
 use Magento\Framework\Escaper;
+use Magento\Framework\Math\Random;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
 /**
  * Data form abstract class
@@ -64,21 +67,51 @@ abstract class AbstractElement extends AbstractForm
      */
     private $lockHtmlAttribute = 'data-locked';
 
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
+    /**
+     * @var Random
+     */
+    private $random;
+
     /**
      * @param Factory $factoryElement
      * @param CollectionFactory $factoryCollection
      * @param Escaper $escaper
      * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
+     * @param Random|null $random
      */
     public function __construct(
         Factory $factoryElement,
         CollectionFactory $factoryCollection,
         Escaper $escaper,
-        $data = []
+        $data = [],
+        ?SecureHtmlRenderer $secureRenderer = null,
+        ?Random $random = null
     ) {
         $this->_escaper = $escaper;
         parent::__construct($factoryElement, $factoryCollection, $data);
         $this->_renderer = \Magento\Framework\Data\Form::getElementRenderer();
+        $this->secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+        $this->random = $random ?? ObjectManager::getInstance()->get(Random::class);
+    }
+
+    /**
+     * Generate this element's ID.
+     *
+     * @return string
+     */
+    private function generateElementId(): string
+    {
+        if (!$this->hasData('formelementhookid')) {
+            $this->setData('formelementhookid', 'elemId' .$this->random->getRandomString(32));
+        }
+
+        return $this->getData('formelementhookid');
     }
 
     /**
@@ -394,6 +427,56 @@ public function getBeforeElementHtml()
         return $this->getData('before_element_html');
     }
 
+    /**
+     * Generate HTML to replace unsecure attributes.
+     *
+     * @return string
+     */
+    private function generateAttributesSubstitute(): string
+    {
+        $html = '';
+
+        //Rendering element's style as separate tag.
+        if ($this->getStyle()) {
+            $selector = "*[formelementhookid='{$this->generateElementId()}']";
+            if ($id = $this->getHtmlId()) {
+                $selector = "#{$this->getHtmlId()}";
+            }
+            $html .= $this->secureRenderer->renderTag(
+                'style',
+                [],
+                <<<style
+                    {$selector} {
+                        {$this->getStyle()}
+                    }
+style
+                ,
+                false
+            );
+        }
+
+        //Rendering each event listener as a separate script tag.
+        $events = array_filter(
+            $this->getHtmlAttributes(),
+            function (string $attribute): bool {
+                return mb_strpos($attribute, 'on') === 0;
+            }
+        );
+        foreach ($events as $event) {
+            $eventShort = mb_substr($event, 2);
+            $methodName = 'getOn' .$eventShort;
+            if ($eventListener = $this->$methodName()) {
+                $html .= $this->secureRenderer->renderEventListenerAsTag(
+                    $event,
+                    $eventListener,
+                    "*[formelementhookid='{$this->generateElementId()}']"
+                );
+            }
+        }
+
+        return $html;
+    }
+
     /**
      * Get the after element html.
      *
@@ -401,7 +484,7 @@ public function getBeforeElementHtml()
      */
     public function getAfterElementHtml()
     {
-        return $this->getData('after_element_html');
+        return $this->getData('after_element_html') .$this->generateAttributesSubstitute();
     }
 
     /**
@@ -507,6 +590,16 @@ public function serialize($attributes = [], $valueSeparator = '=', $fieldSeparat
         } else {
             unset($this->_data['checked']);
         }
+        $attributes[] = 'formelementhookid';
+        $this->generateElementId();
+        //Unset attributes that are to be rendered as separate tags
+        $attributes = array_filter(
+            $attributes,
+            function (string $attribute): bool {
+                return $attribute !== 'style' && mb_strpos($attribute, 'on') !== 0;
+            }
+        );
+
         return parent::serialize($attributes, $valueSeparator, $fieldSeparator, $quote);
     }
 
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php b/lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php
index 2a68432207b23..ce6639a98db2c 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Checkboxes.php
@@ -110,15 +110,16 @@ public function getElementHtml()
     }
 
     /**
-     * @param mixed $value
-     * @return string|void
+     * Was given value selected?
+     *
+     * @param string $value
+     * @return string|null
      */
     public function getChecked($value)
     {
-        if ($checked = $this->getValue()) {
-        } elseif ($checked = $this->getData('checked')) {
-        } else {
-            return;
+        $checked = $this->getValue() ?? $this->getData('checked');
+        if (!$checked) {
+            return null;
         }
         if (!is_array($checked)) {
             $checked = [(string)$checked];
@@ -130,12 +131,14 @@ public function getChecked($value)
         if (in_array((string)$value, $checked)) {
             return 'checked';
         }
-        return;
+        return null;
     }
 
     /**
-     * @param mixed $value
-     * @return string
+     * Was value disabled for selection?
+     *
+     * @param string $value
+     * @return string|null
      */
     public function getDisabled($value)
     {
@@ -151,34 +154,40 @@ public function getDisabled($value)
                 return 'disabled';
             }
         }
-        return;
+        return null;
     }
 
     /**
-     * @param mixed $value
-     * @return mixed
+     * Get onclick event handler.
+     *
+     * @param string $value
+     * @return string|null
      */
-    public function getOnclick($value)
+    public function getOnclick($value = '$value')
     {
         if ($onclick = $this->getData('onclick')) {
             return str_replace('$value', $value, $onclick);
         }
-        return;
+        return null;
     }
 
     /**
-     * @param mixed $value
-     * @return mixed
+     * Get onchange event handler.
+     *
+     * @param string $value
+     * @return string|null
      */
-    public function getOnchange($value)
+    public function getOnchange($value = '$value')
     {
         if ($onchange = $this->getData('onchange')) {
             return str_replace('$value', $value, $onchange);
         }
-        return;
+        return null;
     }
 
     /**
+     * Render a checkbox.
+     *
      * @param array $option
      * @return string
      */
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Editablemultiselect.php b/lib/internal/Magento/Framework/Data/Form/Element/Editablemultiselect.php
index 70dca9ec16618..c9e2a16f586dc 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Editablemultiselect.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Editablemultiselect.php
@@ -13,7 +13,10 @@
  */
 namespace Magento\Framework\Data\Form\Element;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Escaper;
+use Magento\Framework\Math\Random;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
 /**
  * Form editable multiselect element.
@@ -26,24 +29,40 @@ class Editablemultiselect extends \Magento\Framework\Data\Form\Element\Multisele
     private $serializer;
 
     /**
-     * Editablemultiselect constructor.
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
+    /**
+     * @var Random
+     */
+    private $random;
+
+    /**
      * @param Factory $factoryElement
      * @param CollectionFactory $factoryCollection
      * @param Escaper $escaper
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
-     * @throws \RuntimeException
+     * @param SecureHtmlRenderer|null $secureRenderer
+     * @param Random|null $random
      */
     public function __construct(
         Factory $factoryElement,
         CollectionFactory $factoryCollection,
         Escaper $escaper,
         array $data = [],
-        \Magento\Framework\Serialize\Serializer\Json $serializer = null
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null,
+        ?SecureHtmlRenderer $secureRenderer = null,
+        ?Random $random = null
     ) {
-        parent::__construct($factoryElement, $factoryCollection, $escaper, $data);
-        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
+        $secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+        $random = $random ?? ObjectManager::getInstance()->get(Random::class);
+        parent::__construct($factoryElement, $factoryCollection, $escaper, $data, $secureRenderer, $random);
+        $this->serializer = $serializer ?: ObjectManager::getInstance()
             ->get(\Magento\Framework\Serialize\Serializer\Json::class);
+        $this->secureRenderer = $secureRenderer;
+        $this->random = $random;
     }
 
     /**
@@ -77,8 +96,10 @@ public function getElementHtml()
         $jsObjectName = $this->getJsObjectName();
 
         // TODO: TaxRateEditableMultiselect should be moved to a static .js module.
-        $html .= "
-                <script type='text/javascript'>
+        $html .= $this->secureRenderer->renderTag(
+            'script',
+            ['type' => 'text/javascript'],
+            <<<script
                 require([
                     'jquery'
                 ], function( $ ){
@@ -108,7 +129,11 @@ function check( tries, delay ){
                    check(8, 500);
 
                 });
-                </script>";
+script
+            ,
+            false
+        );
+
         return $html;
     }
 
@@ -121,9 +146,9 @@ function check( tries, delay ){
      */
     protected function _optionToHtml($option, $selected)
     {
-        $html = '<option value="' . $this->_escape($option['value']) . '"';
+        $optionId = 'optId' .$this->random->getRandomString(32);
+        $html = '<option value="' . $this->_escape($option['value']) . '" id="' . $optionId . '" ';
         $html .= isset($option['title']) ? 'title="' . $this->_escape($option['title']) . '"' : '';
-        $html .= isset($option['style']) ? 'style="' . $option['style'] . '"' : '';
         if (in_array((string)$option['value'], $selected)) {
             $html .= ' selected="selected"';
         }
@@ -134,6 +159,20 @@ protected function _optionToHtml($option, $selected)
         }
 
         $html .= '>' . $this->_escape($option['label']) . '</option>' . "\n";
+        if (isset($option['style'])) {
+            $html .= $this->secureRenderer->renderTag(
+                'style',
+                [],
+                <<<style
+                    #$optionId {
+                        {$option['style']}
+                    }
+style
+                ,
+                false
+            );
+        }
+
         return $html;
     }
 }
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
index 08a5edd09bf35..bb0dea4c76088 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
@@ -6,7 +6,10 @@
 
 namespace Magento\Framework\Data\Form\Element;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Escaper;
+use Magento\Framework\Math\Random;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
 /**
  * Form editor element
@@ -20,6 +23,16 @@ class Editor extends Textarea
      */
     private $serializer;
 
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
+    /**
+     * @var Random
+     */
+    private $random;
+
     /**
      * Editor constructor.
      * @param Factory $factoryElement
@@ -27,6 +40,8 @@ class Editor extends Textarea
      * @param Escaper $escaper
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
+     * @param Random|null $random
+     * @param SecureHtmlRenderer|null $secureRenderer
      * @throws \RuntimeException
      */
     public function __construct(
@@ -34,7 +49,9 @@ public function __construct(
         CollectionFactory $factoryCollection,
         Escaper $escaper,
         $data = [],
-        \Magento\Framework\Serialize\Serializer\Json $serializer = null
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null,
+        ?Random $random = null,
+        ?SecureHtmlRenderer $secureRenderer = null
     ) {
         parent::__construct($factoryElement, $factoryCollection, $escaper, $data);
 
@@ -45,8 +62,10 @@ public function __construct(
             $this->setType('textarea');
             $this->setExtType('textarea');
         }
-        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Framework\Serialize\Serializer\Json::class);
+        $this->serializer = $serializer ?? ObjectManager::getInstance()
+                ->get(\Magento\Framework\Serialize\Serializer\Json::class);
+        $this->random = $random ?? ObjectManager::getInstance()->get(Random::class);
+        $this->secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
     }
 
     /**
@@ -120,9 +139,11 @@ public function getPluginConfigOptions($pluginName, $key = null)
      */
     public function getElementHtml()
     {
-        $js = '
-            <script type="text/javascript">
-            //<![CDATA[
+        $js = $this->secureRenderer->renderTag(
+            'script',
+            ['type' => 'text/javascript'],
+            <<<script
+                //<![CDATA[
                 openEditorPopup = function(url, name, specs, parent) {
                     if ((typeof popups == "undefined") || popups[name] == undefined || popups[name].closed) {
                         if (typeof popups == "undefined") {
@@ -142,7 +163,10 @@ public function getElementHtml()
                     }
                 }
             //]]>
-            </script>';
+script
+            ,
+            false
+        );
 
         if ($this->isEnabled()) {
             $jsSetupObject = 'wysiwyg' . $this->getHtmlId();
@@ -189,15 +213,21 @@ public function getElementHtml()
             if ($this->getPluginConfigOptions('magentowidget', 'window_url')) {
                 $html = $this->_getButtonsHtml() . $js . parent::getElementHtml();
                 if ($this->getConfig('add_widgets')) {
-                    $html .= '<script type="text/javascript">
-                    //<![CDATA[
-                    require(["jquery", "mage/translate", "mage/adminhtml/wysiwyg/widget"], function(jQuery){
-                        (function($) {
-                            $.mage.translate.add(' . $this->serializer->serialize($this->getButtonTranslations()) . ')
-                        })(jQuery);
-                    });
-                    //]]>
-                    </script>';
+                    $html .= $this->secureRenderer->renderTag(
+                        'script',
+                        ['type' => 'text/javascript'],
+                        <<<script
+                            //<![CDATA[
+                            require(["jquery", "mage/translate", "mage/adminhtml/wysiwyg/widget"], function(jQuery){
+                                (function($) {
+                                    $.mage.translate.add({$this->serializer->serialize($this->getButtonTranslations())})
+                                })(jQuery);
+                            });
+                            //]]>'
+script
+                        ,
+                        false
+                    );
                 }
                 $html = $this->_wrapIntoContainer($html);
                 return $html;
@@ -386,14 +416,30 @@ protected function _prepareOptions($options)
      */
     protected function _getButtonHtml($data)
     {
+        $id = empty($data['id']) ? 'buttonId' .$this->random->getRandomString(32) : $data['id'];
+
         $html = '<button type="button"';
         $html .= ' class="scalable ' . (isset($data['class']) ? $data['class'] : '') . '"';
-        $html .= isset($data['onclick']) ? ' onclick="' . $data['onclick'] . '"' : '';
-        $html .= isset($data['style']) ? ' style="' . $data['style'] . '"' : '';
-        $html .= isset($data['id']) ? ' id="' . $data['id'] . '"' : '';
+        $html .= ' id="' . $id . '"';
         $html .= '>';
         $html .= isset($data['title']) ? '<span><span><span>' . $data['title'] . '</span></span></span>' : '';
         $html .= '</button>';
+        if (isset($data['onclick'])) {
+            $html .= $this->secureRenderer->renderEventListenerAsTag('onclick', $data['onclick'], "#$id");
+        }
+        if (isset($data['style'])) {
+            $html .= $this->secureRenderer->renderTag(
+                'style',
+                [],
+                <<<style
+                    #{$id} {
+                        {$data['style']}
+                    }
+style
+                ,
+                false
+            );
+        }
 
         return $html;
     }
@@ -412,11 +458,24 @@ protected function _wrapIntoContainer($html)
             return '<div class="admin__control-wysiwig">' . $html . '</div>';
         }
 
-        $html = '<div id="editor' . $this->getHtmlId() . '"'
-            . ($this->getConfig('no_display') ? ' style="display:none;"' : '')
+        $id = 'editor' .$this->getHtmlId();
+        $html = '<div id="' .$id .'" '
             . ($this->getConfig('container_class') ? ' class="admin__control-wysiwig '
                 . $this->getConfig('container_class') . '"' : '')
             . '>' . $html . '</div>';
+        if ($this->getConfig('no_display')) {
+            $html .= $this->secureRenderer->renderTag(
+                'style',
+                [],
+                <<<style
+                    #{$id} {
+                        display: none;
+                    }
+style
+                ,
+                false
+            );
+        }
 
         return $html;
     }
@@ -494,15 +553,14 @@ protected function isToggleButtonVisible()
     protected function getInlineJs($jsSetupObject, $forceLoad)
     {
         $jsString = '
-                <script type="text/javascript">
                 //<![CDATA[
-                window.tinyMCE_GZ = window.tinyMCE_GZ || {}; 
+                window.tinyMCE_GZ = window.tinyMCE_GZ || {};
                 window.tinyMCE_GZ.loaded = true;
                 require([
-                "jquery", 
-                "mage/translate", 
-                "mage/adminhtml/events", 
-                "mage/adminhtml/wysiwyg/tiny_mce/setup", 
+                "jquery",
+                "mage/translate",
+                "mage/adminhtml/events",
+                "mage/adminhtml/wysiwyg/tiny_mce/setup",
                 "mage/adminhtml/wysiwyg/widget"
                 ], function(jQuery){' .
             "\n" .
@@ -534,9 +592,8 @@ protected function getInlineJs($jsSetupObject, $forceLoad)
             '));
                     varienGlobalEvents.attachEventHandler("formSubmit", editorFormValidationHandler);
                 //]]>
-                });
-                </script>';
-        return $jsString;
+                });';
+        return $this->secureRenderer->renderTag('script', ['type' => 'text/javascript'], $jsString, false);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php b/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php
index 9f9a3306ae65a..aaa48611b02c5 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php
@@ -11,28 +11,53 @@
  */
 namespace Magento\Framework\Data\Form\Element;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Escaper;
+use Magento\Framework\Math\Random;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
+/**
+ * Gallery form element widget.
+ */
 class Gallery extends AbstractElement
 {
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
+    /**
+     * @var Random
+     */
+    private $random;
+
     /**
      * @param Factory $factoryElement
      * @param CollectionFactory $factoryCollection
      * @param Escaper $escaper
      * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
+     * @param Random|null $random
      */
     public function __construct(
         Factory $factoryElement,
         CollectionFactory $factoryCollection,
         Escaper $escaper,
-        $data = []
+        $data = [],
+        ?SecureHtmlRenderer $secureRenderer = null,
+        ?Random $random = null
     ) {
-        parent::__construct($factoryElement, $factoryCollection, $escaper, $data);
+        $secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+        $random = $random ?? ObjectManager::getInstance()->get(Random::class);
+        parent::__construct($factoryElement, $factoryCollection, $escaper, $data, $secureRenderer, $random);
         $this->setType('file');
+        $this->secureRenderer = $secureRenderer;
+        $this->random = $random;
     }
 
     /**
-     * @return string
+     * @inheritDoc
+     *
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
@@ -71,17 +96,12 @@ public function getElementHtml()
                 $i++;
                 $html .= '<tr class="gallery">';
                 foreach ($this->getValue()->getAttributeBackend()->getImageTypes() as $type) {
+                    $linkId = 'linkId' .$this->random->getRandomString(32);
                     $url = $image->setType($type)->getSourceUrl();
-                    $html .= '<td class="gallery" align="center" style="vertical-align:bottom;">';
-                    $html .= '<a href="' .
+                    $html .= '<td class="gallery vertical-gallery-cell" align="center">';
+                    $html .= '<a previewlinkid="' .$linkId .'" href="' .
                         $url .
-                        '" target="_blank" onclick="imagePreview(\'' .
-                        $this->getHtmlId() .
-                        '_image_' .
-                        $type .
-                        '_' .
-                        $image->getValueId() .
-                        '\');return false;" ' .
+                        '" target="_blank" ' .
                         $this->_getUiId(
                             'image-' . $image->getValueId()
                         ) .
@@ -107,8 +127,13 @@ public function getElementHtml()
                         $this->_getUiId(
                             'file'
                         ) . ' ></td>';
+                    $html .= $this->secureRenderer->renderEventListenerAsTag(
+                        'onclick',
+                        "imagePreview('{$this->getHtmlId()}_image_{$type}_{$image->getValueId()}');\nreturn false;",
+                        "*[previewlinkid='{$linkId}']"
+                    );
                 }
-                $html .= '<td class="gallery" align="center" style="vertical-align:bottom;">' .
+                $html .= '<td class="gallery vertical-gallery-cell" align="center">' .
                     '<input type="input" name="' .
                     parent::getName() .
                     '[position][' .
@@ -123,7 +148,7 @@ public function getElementHtml()
                     $this->_getUiId(
                         'position-' . $image->getValueId()
                     ) . '/></td>';
-                $html .= '<td class="gallery" align="center" style="vertical-align:bottom;">' .
+                $html .= '<td class="gallery vertical-gallery-cell" align="center">' .
                     '<input type="checkbox" name="' .
                     parent::getName() .
                     '[delete][' .
@@ -140,11 +165,26 @@ public function getElementHtml()
                     ) . '/></td>';
                 $html .= '</tr>';
             }
+
+            $html .= $this->secureRenderer->renderTag(
+                'style',
+                [],
+                <<<style
+                    .vertical-gallery-cell {
+                        vertical-align:bottom;
+                    }
+style
+                ,
+                false
+            );
         }
         if ($i == 0) {
-            $html .= '<script type="text/javascript">' .
-                'document.getElementById("gallery_thead").style.visibility="hidden";' .
-                '</script>';
+            $html .= $this->secureRenderer->renderTag(
+                'script',
+                ['type' => 'text/javascript'],
+                'document.getElementById("gallery_thead").style.visibility="hidden";',
+                false
+            );
         }
 
         $html .= '</tbody></table>';
@@ -152,9 +192,10 @@ public function getElementHtml()
         $name = $this->getName();
         $parentName = parent::getName();
 
-        $html .= <<<EndSCRIPT
-
-        <script language="javascript">
+        $html .= $this->secureRenderer->renderTag(
+            'script',
+            ['type' => 'text/javascript'],
+            <<<EndSCRIPT
         id = 0;
 
         function addNewImg(){
@@ -218,15 +259,17 @@ function addNewImg(){
 		    };
 
 	    }
-        </script>
-
-EndSCRIPT;
+EndSCRIPT
+            ,
+            false
+        );
         $html .= $this->getAfterElementHtml();
+
         return $html;
     }
 
     /**
-     * @return mixed
+     * @inheritDoc
      */
     public function getName()
     {
@@ -234,7 +277,9 @@ public function getName()
     }
 
     /**
-     * @return mixed
+     * Get name in the usual way.
+     *
+     * @return string|null
      */
     public function getParentName()
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Image.php b/lib/internal/Magento/Framework/Data/Form/Element/Image.php
index 0b37a9ab18c8c..65c8424a75051 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Image.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Image.php
@@ -11,7 +11,10 @@
  */
 namespace Magento\Framework\Data\Form\Element;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Math\Random;
 use Magento\Framework\UrlInterface;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
 class Image extends \Magento\Framework\Data\Form\Element\AbstractElement
 {
@@ -21,22 +24,40 @@ class Image extends \Magento\Framework\Data\Form\Element\AbstractElement
     protected $_urlBuilder;
 
     /**
-     * @param \Magento\Framework\Data\Form\Element\Factory $factoryElement
-     * @param \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
+    /**
+     * @var Random
+     */
+    private $random;
+
+    /**
+     * @param Factory $factoryElement
+     * @param CollectionFactory $factoryCollection
      * @param \Magento\Framework\Escaper $escaper
      * @param UrlInterface $urlBuilder
      * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
+     * @param Random|null $random
      */
     public function __construct(
-        \Magento\Framework\Data\Form\Element\Factory $factoryElement,
-        \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection,
+        Factory $factoryElement,
+        CollectionFactory $factoryCollection,
         \Magento\Framework\Escaper $escaper,
         UrlInterface $urlBuilder,
-        $data = []
+        $data = [],
+        ?SecureHtmlRenderer $secureRenderer = null,
+        ?Random $random = null
     ) {
+        $secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+        $random = $random ?? ObjectManager::getInstance()->get(Random::class);
         $this->_urlBuilder = $urlBuilder;
-        parent::__construct($factoryElement, $factoryCollection, $escaper, $data);
+        parent::__construct($factoryElement, $factoryCollection, $escaper, $data, $secureRenderer, $random);
         $this->setType('file');
+        $this->secureRenderer = $secureRenderer;
+        $this->random = $random;
     }
 
     /**
@@ -55,12 +76,10 @@ public function getElementHtml()
                 $url = $this->_urlBuilder->getBaseUrl(['_type' => UrlInterface::URL_TYPE_MEDIA]) . $url;
             }
 
-            $html = '<a href="' .
+            $linkId = 'linkId' .$this->random->getRandomString(32);
+            $html = '<a previewlinkid="' .$linkId .'" href="' .
                 $url .
-                '"' .
-                ' onclick="imagePreview(\'' .
-                $this->getHtmlId() .
-                '_image\'); return false;" ' .
+                '" ' .
                 $this->_getUiId(
                     'link'
                 ) .
@@ -78,6 +97,11 @@ public function getElementHtml()
                 $this->_getUiId() .
                 ' />' .
                 '</a> ';
+            $html .= $this->secureRenderer->renderEventListenerAsTag(
+                'onclick',
+                "imagePreview('{$this->getHtmlId()}_image');\nreturn false;",
+                "*[previewlinkid='{$linkId}']"
+            );
         }
         $this->setClass('input-file');
         $html .= parent::getElementHtml();
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Link.php b/lib/internal/Magento/Framework/Data/Form/Element/Link.php
index 83f9922304a5c..24e7a8253cdcd 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Link.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Link.php
@@ -11,8 +11,14 @@
  */
 namespace Magento\Framework\Data\Form\Element;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Escaper;
+use Magento\Framework\Math\Random;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
+/**
+ * Link form element widget.
+ */
 class Link extends AbstractElement
 {
     /**
@@ -20,14 +26,20 @@ class Link extends AbstractElement
      * @param CollectionFactory $factoryCollection
      * @param Escaper $escaper
      * @param array $data
+     * @param SecureHtmlRenderer|null $secureHtmlRenderer
+     * @param Random|null $random
      */
     public function __construct(
         Factory $factoryElement,
         CollectionFactory $factoryCollection,
         Escaper $escaper,
-        $data = []
+        $data = [],
+        ?SecureHtmlRenderer $secureHtmlRenderer = null,
+        ?Random $random = null
     ) {
-        parent::__construct($factoryElement, $factoryCollection, $escaper, $data);
+        $secureHtmlRenderer = $secureHtmlRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+        $random = $random ?? ObjectManager::getInstance()->get(Random::class);
+        parent::__construct($factoryElement, $factoryCollection, $escaper, $data, $secureHtmlRenderer, $random);
         $this->setType('link');
     }
 
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php b/lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php
index 03daa6c08fff4..dc5462a81627a 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php
@@ -11,26 +11,50 @@
  */
 namespace Magento\Framework\Data\Form\Element;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Escaper;
+use Magento\Framework\Math\Random;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
+/**
+ * Multi-select form element widget.
+ */
 class Multiselect extends AbstractElement
 {
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
+    /**
+     * @var Random
+     */
+    private $random;
+
     /**
      * @param Factory $factoryElement
      * @param CollectionFactory $factoryCollection
      * @param Escaper $escaper
      * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
+     * @param Random|null $random
      */
     public function __construct(
         Factory $factoryElement,
         CollectionFactory $factoryCollection,
         Escaper $escaper,
-        $data = []
+        $data = [],
+        ?SecureHtmlRenderer $secureRenderer = null,
+        ?Random $random = null
     ) {
-        parent::__construct($factoryElement, $factoryCollection, $escaper, $data);
+        $secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+        $random = $random ?? ObjectManager::getInstance()->get(Random::class);
+        parent::__construct($factoryElement, $factoryCollection, $escaper, $data, $secureRenderer, $random);
         $this->setType('select');
         $this->setExtType('multiple');
         $this->setSize(10);
+        $this->secureRenderer = $secureRenderer;
+        $this->random = $random;
     }
 
     /**
@@ -129,38 +153,48 @@ public function getDefaultHtml()
         $result .= $this->getElementHtml();
 
         if ($this->getSelectAll() && $this->getDeselectAll()) {
-            $result .= '<a href="#" onclick="return ' .
-                $this->getJsObjectName() .
-                '.selectAll()">' .
-                $this->getSelectAll() .
-                '</a> <span class="separator">&nbsp;|&nbsp;</span>';
-            $result .= '<a href="#" onclick="return ' .
-                $this->getJsObjectName() .
-                '.deselectAll()">' .
-                $this->getDeselectAll() .
-                '</a>';
+            $selectAllId = 'selId' .$this->random->getRandomString(32);
+            $deselectAllId = 'deselId' .$this->random->getRandomString(32);
+            $result .= '<a href="#" id="' .$selectAllId .'">' .$this->getSelectAll()
+                .'</a> <span class="separator">&nbsp;|&nbsp;</span>';
+            $result .= '<a href="#" id="' .$deselectAllId .'">' .$this->getDeselectAll() .'</a>';
+
+            $result .= $this->secureRenderer->renderEventListenerAsTag(
+                'onclick',
+                "return {$this->getJsObjectName()}.selectAll();\nreturn false;",
+                "#{$selectAllId}"
+            );
+            $result .= $this->secureRenderer->renderEventListenerAsTag(
+                'onclick',
+                "return {$this->getJsObjectName()}.deselectAll();",
+                "#{$deselectAllId}"
+            );
         }
 
         $result .= $this->getNoSpan() === true ? '' : '</span>' . "\n";
 
-        $result .= '<script type="text/javascript">' . "\n";
-        $result .= '   var ' . $this->getJsObjectName() . ' = {' . "\n";
-        $result .= '     selectAll: function() { ' . "\n";
-        $result .= '         var sel = $("' . $this->getHtmlId() . '");' . "\n";
-        $result .= '         for(var i = 0; i < sel.options.length; i ++) { ' . "\n";
-        $result .= '             sel.options[i].selected = true; ' . "\n";
-        $result .= '         } ' . "\n";
-        $result .= '         return false; ' . "\n";
-        $result .= '     },' . "\n";
-        $result .= '     deselectAll: function() {' . "\n";
-        $result .= '         var sel = $("' . $this->getHtmlId() . '");' . "\n";
-        $result .= '         for(var i = 0; i < sel.options.length; i ++) { ' . "\n";
-        $result .= '             sel.options[i].selected = false; ' . "\n";
-        $result .= '         } ' . "\n";
-        $result .= '         return false; ' . "\n";
-        $result .= '     }' . "\n";
-        $result .= '  }' . "\n";
-        $result .= "\n" . '</script>';
+        $script = '   var ' . $this->getJsObjectName() . ' = {' . "\n";
+        $script .= '     selectAll: function() { ' . "\n";
+        $script .= '         var sel = $("' . $this->getHtmlId() . '");' . "\n";
+        $script .= '         for(var i = 0; i < sel.options.length; i ++) { ' . "\n";
+        $script .= '             sel.options[i].selected = true; ' . "\n";
+        $script .= '         } ' . "\n";
+        $script .= '         return false; ' . "\n";
+        $script .= '     },' . "\n";
+        $script .= '     deselectAll: function() {' . "\n";
+        $script .= '         var sel = $("' . $this->getHtmlId() . '");' . "\n";
+        $script .= '         for(var i = 0; i < sel.options.length; i ++) { ' . "\n";
+        $script .= '             sel.options[i].selected = false; ' . "\n";
+        $script .= '         } ' . "\n";
+        $script .= '         return false; ' . "\n";
+        $script .= '     }' . "\n";
+        $script .= '  }' . "\n";
+        $result .= $this->secureRenderer->renderTag(
+            'script',
+            ['type' => 'text/javascript'],
+            $script,
+            false
+        );
 
         return $result;
     }
@@ -176,19 +210,35 @@ public function getJsObjectName()
     }
 
     /**
+     * Render an option for the select.
+     *
      * @param array $option
-     * @param array $selected
+     * @param string[] $selected
      * @return string
      */
     protected function _optionToHtml($option, $selected)
     {
-        $html = '<option value="' . $this->_escape($option['value']) . '"';
+        $optionId = 'optId' .$this->random->getRandomString(32);
+        $html = '<option value="' . $this->_escape($option['value']) . '" id="' . $optionId . '" ';
         $html .= isset($option['title']) ? 'title="' . $this->_escape($option['title']) . '"' : '';
-        $html .= isset($option['style']) ? 'style="' . $option['style'] . '"' : '';
         if (in_array((string)$option['value'], $selected)) {
             $html .= ' selected="selected"';
         }
         $html .= '>' . $this->_escape($option['label']) . '</option>' . "\n";
+        if (isset($option['style'])) {
+            $html .= $this->secureRenderer->renderTag(
+                'style',
+                [],
+                <<<style
+                    #$optionId {
+                        {$option['style']}
+                    }
+style
+                ,
+                false
+            );
+        }
+
         return $html;
     }
 }
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Radios.php b/lib/internal/Magento/Framework/Data/Form/Element/Radios.php
index 1eb7c2e21c54a..cb48c3fde4fd9 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Radios.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Radios.php
@@ -11,28 +11,43 @@
  */
 namespace Magento\Framework\Data\Form\Element;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DataObject;
 use Magento\Framework\Escaper;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
+/**
+ * Radio buttons form element widget.
+ */
 class Radios extends AbstractElement
 {
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
     /**
      * @param Factory $factoryElement
      * @param CollectionFactory $factoryCollection
      * @param Escaper $escaper
      * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
      */
     public function __construct(
         Factory $factoryElement,
         CollectionFactory $factoryCollection,
         Escaper $escaper,
-        $data = []
+        $data = [],
+        ?SecureHtmlRenderer $secureRenderer = null
     ) {
-        parent::__construct($factoryElement, $factoryCollection, $escaper, $data);
+        $this->secureRenderer
+            = $secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+        parent::__construct($factoryElement, $factoryCollection, $escaper, $data, $secureRenderer);
         $this->setType('radios');
     }
 
     /**
-     * @return string
+     * @inheritDoc
      */
     public function getElementHtml()
     {
@@ -48,8 +63,10 @@ public function getElementHtml()
     }
 
     /**
+     * Render choices.
+     *
      * @param array $option
-     * @param array $selected
+     * @param string[] $selected
      * @return string
      */
     protected function _optionToHtml($option, $selected)
@@ -57,9 +74,11 @@ protected function _optionToHtml($option, $selected)
         $html = '<div class="admin__field admin__field-option">' .
             '<input type="radio"' . $this->getRadioButtonAttributes($option);
         if (is_array($option)) {
+            $option = new DataObject($option);
+            $optionId = $this->getHtmlId() . $option['value'];
             $html .= 'value="' . $this->_escape(
                 $option['value']
-            ) . '" class="admin__control-radio" id="' . $this->getHtmlId() . $option['value'] . '"';
+            ) . '" class="admin__control-radio" id="' .$optionId  .'"';
             if ($option['value'] == $selected) {
                 $html .= ' checked="checked"';
             }
@@ -70,9 +89,10 @@ protected function _optionToHtml($option, $selected)
                 '"><span>' .
                 $option['label'] .
                 '</span></label>';
-        } elseif ($option instanceof \Magento\Framework\DataObject) {
-            $html .= 'id="' . $this->getHtmlId() . $option->getValue() . '"' . $option->serialize(
-                ['label', 'title', 'value', 'class', 'style']
+        } elseif ($option instanceof DataObject) {
+            $optionId = $this->getHtmlId() . $option->getValue();
+            $html .= 'id="' .$optionId  .'"' .$option->serialize(
+                ['label', 'title', 'value', 'class']
             );
             if (in_array($option->getValue(), $selected)) {
                 $html .= ' checked="checked"';
@@ -85,12 +105,33 @@ protected function _optionToHtml($option, $selected)
                 $option->getLabel() .
                 '</label>';
         }
+
+        if ($option->getStyle()) {
+            $html .= $html .= $this->secureRenderer->renderTag(
+                'style',
+                [],
+                <<<style
+                    #$optionId {
+                        {$option->getStyle()}
+                    }
+style
+                ,
+                false
+            );
+        }
+        if ($option->getOnclick()) {
+            $this->secureRenderer->renderEventListenerAsTag('onclick', $option->getOnclick(), "#$optionId");
+        }
+        if ($option->getOnchange()) {
+            $this->secureRenderer->renderEventListenerAsTag('onchange', $option->getOnchange(), "#$optionId");
+        }
         $html .= '</div>';
+
         return $html;
     }
 
     /**
-     * @return array
+     * @inheritDoc
      */
     public function getHtmlAttributes()
     {
@@ -98,6 +139,8 @@ public function getHtmlAttributes()
     }
 
     /**
+     * Get a choice's HTML attributes.
+     *
      * @param array $option
      * @return string
      */
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Select.php b/lib/internal/Magento/Framework/Data/Form/Element/Select.php
index d6d95ef9da63b..b9649206f1ffc 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Select.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Select.php
@@ -5,7 +5,10 @@
  */
 namespace Magento\Framework\Data\Form\Element;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Escaper;
+use Magento\Framework\Math\Random;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
 /**
  * Form select element
@@ -15,22 +18,40 @@
  */
 class Select extends AbstractElement
 {
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
+    /**
+     * @var Random
+     */
+    private $random;
+
     /**
      * @param Factory $factoryElement
      * @param CollectionFactory $factoryCollection
      * @param Escaper $escaper
      * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
+     * @param Random|null $random
      */
     public function __construct(
         Factory $factoryElement,
         CollectionFactory $factoryCollection,
         Escaper $escaper,
-        $data = []
+        $data = [],
+        ?SecureHtmlRenderer $secureRenderer = null,
+        ?Random $random = null
     ) {
-        parent::__construct($factoryElement, $factoryCollection, $escaper, $data);
+        $secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+        $random = $random ?? ObjectManager::getInstance()->get(Random::class);
+        parent::__construct($factoryElement, $factoryCollection, $escaper, $data, $secureRenderer, $random);
         $this->setType('select');
         $this->setExtType('combobox');
         $this->_prepareOptions();
+        $this->secureRenderer = $secureRenderer;
+        $this->random = $random;
     }
 
     /**
@@ -104,13 +125,26 @@ protected function _optionToHtml($option, $selected)
             }
             $html .= '</optgroup>' . "\n";
         } else {
-            $html = '<option value="' . $this->_escape($option['value']) . '"';
+            $optionId = 'optId' .$this->random->getRandomString(32);
+            $html = '<option value="' . $this->_escape($option['value']) . '" id="' .$optionId .'" ';
             $html .= isset($option['title']) ? 'title="' . $this->_escape($option['title']) . '"' : '';
-            $html .= isset($option['style']) ? 'style="' . $option['style'] . '"' : '';
             if (in_array($option['value'], $selected)) {
                 $html .= ' selected="selected"';
             }
             $html .= '>' . $this->_escape($option['label']) . '</option>' . "\n";
+            if (isset($option['style'])) {
+                $html .= $this->secureRenderer->renderTag(
+                    'style',
+                    [],
+                    <<<style
+                    #$optionId {
+                        {$option['style']}
+                    }
+style
+                    ,
+                    false
+                );
+            }
         }
         return $html;
     }
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Time.php b/lib/internal/Magento/Framework/Data/Form/Element/Time.php
index f56dbedb744a5..53d72d704483c 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Time.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Time.php
@@ -6,7 +6,9 @@
 
 namespace Magento\Framework\Data\Form\Element;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Escaper;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
 /**
  * Form time element
@@ -15,20 +17,29 @@
  */
 class Time extends AbstractElement
 {
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
     /**
      * @param Factory $factoryElement
      * @param CollectionFactory $factoryCollection
      * @param Escaper $escaper
      * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
      */
     public function __construct(
         Factory $factoryElement,
         CollectionFactory $factoryCollection,
         Escaper $escaper,
-        $data = []
+        $data = [],
+        ?SecureHtmlRenderer $secureRenderer = null
     ) {
-        parent::__construct($factoryElement, $factoryCollection, $escaper, $data);
+        $secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+        parent::__construct($factoryElement, $factoryCollection, $escaper, $data, $secureRenderer);
         $this->setType('time');
+        $this->secureRenderer = $secureRenderer;
     }
 
     /**
@@ -51,6 +62,7 @@ public function getName()
     public function getElementHtml()
     {
         $this->addClass('select admin__control-select');
+        $this->addClass('select80wide');
 
         $valueHrs = 0;
         $valueMin = 0;
@@ -66,7 +78,7 @@ public function getElementHtml()
         }
 
         $html = '<input type="hidden" id="' . $this->getHtmlId() . '" ' . $this->_getUiId() . '/>';
-        $html .= '<select name="' . $this->getName() . '" style="width:80px" '
+        $html .= '<select name="' . $this->getName() . '" '
             . $this->serialize($this->getHtmlAttributes())
             . $this->_getUiId('hour') . '>' . "\n";
         for ($i = 0; $i < 24; $i++) {
@@ -77,7 +89,7 @@ public function getElementHtml()
         $html .= '</select>' . "\n";
 
         $html .= '<span class="time-separator">:&nbsp;</span><select name="'
-            . $this->getName() . '" style="width:80px" '
+            . $this->getName() . '" '
             . $this->serialize($this->getHtmlAttributes())
             . $this->_getUiId('minute') . '>' . "\n";
         for ($i = 0; $i < 60; $i++) {
@@ -88,7 +100,7 @@ public function getElementHtml()
         $html .= '</select>' . "\n";
 
         $html .= '<span class="time-separator">:&nbsp;</span><select name="'
-            . $this->getName() . '" style="width:80px" '
+            . $this->getName() . '" '
             . $this->serialize($this->getHtmlAttributes())
             . $this->_getUiId('second') . '>' . "\n";
         for ($i = 0; $i < 60; $i++) {
@@ -98,6 +110,18 @@ public function getElementHtml()
         }
         $html .= '</select>' . "\n";
         $html .= $this->getAfterElementHtml();
+        $html .= $this->secureRenderer->renderTag(
+            'style',
+            [],
+            <<<style
+                .select80wide {
+                    width: 80px;
+                }
+style
+            ,
+            false
+        );
+
         return $html;
     }
 }
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php
index 2bd6a29477050..8e9c5dfeaa1a8 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php
@@ -5,11 +5,16 @@
  */
 namespace Magento\Framework\Data\Test\Unit\Form\Element;
 
+use Magento\Framework\Math\Random;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 /**
  * Tests for \Magento\Framework\Data\Form\Element\AbstractElement
  */
 class AbstractElementTest extends \PHPUnit\Framework\TestCase
 {
+    private const RANDOM_STRING = '123456abcdefg';
+
     /**
      * @var \Magento\Framework\Data\Form\Element\AbstractElement|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -38,13 +43,18 @@ protected function setUp()
         $this->_collectionFactoryMock =
             $this->createMock(\Magento\Framework\Data\Form\Element\CollectionFactory::class);
         $this->_escaperMock = $objectManager->getObject(\Magento\Framework\Escaper::class);
+        $randomMock = $this->createMock(Random::class);
+        $randomMock->method('getRandomString')->willReturn(self::RANDOM_STRING);
 
         $this->_model = $this->getMockForAbstractClass(
             \Magento\Framework\Data\Form\Element\AbstractElement::class,
             [
                 $this->_factoryMock,
                 $this->_collectionFactoryMock,
-                $this->_escaperMock
+                $this->_escaperMock,
+                [],
+                $this->createMock(SecureHtmlRenderer::class),
+                $randomMock
             ]
         );
     }
@@ -325,7 +335,8 @@ public function testGetHtmlWithoutRenderer()
         );
         $expectedHtml = '<div class="admin__field">'
             . "\n"
-            . '<input id="" name=""  data-ui-id="form-element-" value="" class=" required-entry _required"/></div>'
+            . '<input id="" name=""  data-ui-id="form-element-" value="" class=" required-entry _required"'
+            .' formelementhookid="elemId' .self::RANDOM_STRING .'"/></div>'
             . "\n";
 
         $this->assertEquals($expectedHtml, $this->_model->getHtml());
@@ -368,7 +379,8 @@ public function testSerialize(array $initialData, $expectedValue)
             unset($initialData['attributes']);
         }
         $this->_model->setData($initialData);
-        $this->assertEquals($expectedValue, $this->_model->serialize($attributes));
+        $expectedValue .= ' formelementhookid="elemId' .self::RANDOM_STRING .'"';
+        $this->assertEquals(trim($expectedValue), $this->_model->serialize($attributes));
     }
 
     /**
@@ -525,7 +537,8 @@ public function testGetDefaultHtmlDataProvider()
             [
                 [],
                 '<div class="admin__field">' . "\n"
-                . '<input id="" name=""  data-ui-id="form-element-" value="" /></div>' . "\n",
+                . '<input id="" name=""  data-ui-id="form-element-" value=""'
+                .' formelementhookid="elemId' .self::RANDOM_STRING .'"/></div>' . "\n",
             ],
             [
                 ['default_html' => 'some default html'],
@@ -541,7 +554,8 @@ public function testGetDefaultHtmlDataProvider()
                 '<div class="admin__field">' . "\n"
                 . '<label class="label admin__field-label" for="html-id" data-ui-id="form-element-some-namelabel">'
                 . '<span>some label</span></label>' . "\n"
-                . '<input id="html-id" name="some-name"  data-ui-id="form-element-some-name" value="some-value" />'
+                . '<input id="html-id" name="some-name"  data-ui-id="form-element-some-name" value="some-value"'
+                .' formelementhookid="elemId' .self::RANDOM_STRING .'"/>'
                 . '</div>' . "\n"
             ],
             [
@@ -554,7 +568,8 @@ public function testGetDefaultHtmlDataProvider()
                 ],
                 '<label class="label admin__field-label" for="html-id" data-ui-id="form-element-some-namelabel">'
                 . '<span>some label</span></label>' . "\n"
-                . '<input id="html-id" name="some-name"  data-ui-id="form-element-some-name" value="some-value" />'
+                . '<input id="html-id" name="some-name"  data-ui-id="form-element-some-name" value="some-value"'
+                .' formelementhookid="elemId' .self::RANDOM_STRING .'"/>'
             ],
         ];
     }
@@ -603,7 +618,8 @@ public function getElementHtmlDataProvider()
         return [
             [
                 [],
-                '<input id="" name=""  data-ui-id="form-element-" value="" />',
+                '<input id="" name=""  data-ui-id="form-element-" value="" formelementhookid="elemId'
+                    .self::RANDOM_STRING .'"/>',
             ],
             [
                 [
@@ -611,7 +627,8 @@ public function getElementHtmlDataProvider()
                     'name' => 'some-name',
                     'value' => 'some-value',
                 ],
-                '<input id="html-id" name="some-name"  data-ui-id="form-element-some-name" value="some-value" />'
+                '<input id="html-id" name="some-name"  data-ui-id="form-element-some-name" value="some-value"'
+                    .' formelementhookid="elemId' .self::RANDOM_STRING .'"/>'
             ],
             [
                 [
@@ -621,7 +638,8 @@ public function getElementHtmlDataProvider()
                     'before_element_html' => 'some-html',
                 ],
                 '<label class="addbefore" for="html-id">some-html</label>'
-                . '<input id="html-id" name="some-name"  data-ui-id="form-element-some-name" value="some-value" />'
+                . '<input id="html-id" name="some-name"  data-ui-id="form-element-some-name" value="some-value"'
+                .' formelementhookid="elemId' .self::RANDOM_STRING .'"/>'
             ],
             [
                 [
@@ -630,7 +648,8 @@ public function getElementHtmlDataProvider()
                     'value' => 'some-value',
                     'after_element_js' => 'some-js',
                 ],
-                '<input id="html-id" name="some-name"  data-ui-id="form-element-some-name" value="some-value" />some-js'
+                '<input id="html-id" name="some-name"  data-ui-id="form-element-some-name" value="some-value"'
+                    .' formelementhookid="elemId' .self::RANDOM_STRING .'"/>some-js'
             ],
             [
                 [
@@ -639,8 +658,9 @@ public function getElementHtmlDataProvider()
                     'value' => 'some-value',
                     'after_element_html' => 'some-html',
                 ],
-                '<input id="html-id" name="some-name"  data-ui-id="form-element-some-name" value="some-value" />'
-                . '<label class="addafter" for="html-id">some-html</label>'
+                '<input id="html-id" name="some-name"  data-ui-id="form-element-some-name" value="some-value"'
+                    .' formelementhookid="elemId' .self::RANDOM_STRING .'"/>'
+                    . '<label class="addafter" for="html-id">some-html</label>'
             ]
         ];
     }
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/EditablemultiselectTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/EditablemultiselectTest.php
index 930350b371a9e..329ce9292471a 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/EditablemultiselectTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/EditablemultiselectTest.php
@@ -5,6 +5,14 @@
  */
 namespace Magento\Framework\Data\Test\Unit\Form\Element;
 
+use Magento\Framework\Math\Random;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
+/**
+ * Test for the widget.
+ *
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
 class EditablemultiselectTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -12,10 +20,34 @@ class EditablemultiselectTest extends \PHPUnit\Framework\TestCase
      */
     protected $_model;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
         $testHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->_model = $testHelper->getObject(\Magento\Framework\Data\Form\Element\Editablemultiselect::class);
+        $randomMock = $this->createMock(Random::class);
+        $randomMock->method('getRandomString')->willReturn('some-rando-string');
+        $secureRendererMock = $this->createMock(SecureHtmlRenderer::class);
+        $secureRendererMock->method('renderEventListenerAsTag')
+            ->willReturnCallback(
+                function (string $event, string $listener, string $selector): string {
+                    return "<script>document.querySelector('{$selector}').{$event} = () => { {$listener} };</script>";
+                }
+            );
+        $secureRendererMock->method('renderTag')
+            ->willReturnCallback(
+                function (string $tag, array $attrs, ?string $content): string {
+                    return "<$tag>$content</$tag>";
+                }
+            );
+        $this->_model = $testHelper->getObject(
+            \Magento\Framework\Data\Form\Element\Editablemultiselect::class,
+            [
+                'random' => $randomMock,
+                'secureRenderer' => $secureRendererMock
+            ]
+        );
         $values = [
             ['value' => 1, 'label' => 'Value1'],
             ['value' => 2, 'label' => 'Value2'],
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/EditorTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/EditorTest.php
index 3296dd6b31c26..f207458899a7c 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/EditorTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/EditorTest.php
@@ -10,7 +10,14 @@
 namespace Magento\Framework\Data\Test\Unit\Form\Element;
 
 use Magento\Framework\Data\Form\Element\Editor;
+use Magento\Framework\Math\Random;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
+/**
+ * Test for the widget.
+ *
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
 class EditorTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -53,9 +60,27 @@ class EditorTest extends \PHPUnit\Framework\TestCase
      */
     private $serializer;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $randomMock = $this->createMock(Random::class);
+        $randomMock->method('getRandomString')->willReturn('some-rando-string');
+        $secureRendererMock = $this->createMock(SecureHtmlRenderer::class);
+        $secureRendererMock->method('renderEventListenerAsTag')
+            ->willReturnCallback(
+                function (string $event, string $listener, string $selector): string {
+                    return "<script>document.querySelector('{$selector}').{$event} = () => { {$listener} };</script>";
+                }
+            );
+        $secureRendererMock->method('renderTag')
+            ->willReturnCallback(
+                function (string $tag, array $attrs, ?string $content): string {
+                    return "<$tag>$content</$tag>";
+                }
+            );
         $this->factoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\Factory::class);
         $this->collectionFactoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\CollectionFactory::class);
         $this->escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
@@ -70,7 +95,9 @@ protected function setUp()
                 'factoryCollection' => $this->collectionFactoryMock,
                 'escaper' => $this->escaperMock,
                 'data' => ['config' => $this->configMock],
-                'serializer' => $this->serializer
+                'serializer' => $this->serializer,
+                'random' => $randomMock,
+                'secureRenderer' => $secureRendererMock
             ]
         );
 
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ImageTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ImageTest.php
index 47df8390890bf..64031147679f8 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ImageTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ImageTest.php
@@ -9,8 +9,15 @@
  */
 namespace Magento\Framework\Data\Test\Unit\Form\Element;
 
+use Magento\Framework\Math\Random;
 use Magento\Framework\UrlInterface;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
+/**
+ * Test for the widget.
+ *
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
 class ImageTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -30,6 +37,21 @@ class ImageTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
+        $randomMock = $this->createMock(Random::class);
+        $randomMock->method('getRandomString')->willReturn('some-rando-string');
+        $secureRendererMock = $this->createMock(SecureHtmlRenderer::class);
+        $secureRendererMock->method('renderEventListenerAsTag')
+            ->willReturnCallback(
+                function (string $event, string $listener, string $selector): string {
+                    return "<script>document.querySelector('{$selector}').{$event} = () => { {$listener} };</script>";
+                }
+            );
+        $secureRendererMock->method('renderTag')
+            ->willReturnCallback(
+                function (string $tag, array $attrs, ?string $content): string {
+                    return "<$tag>$content</$tag>";
+                }
+            );
         $factoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\Factory::class);
         $collectionFactoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\CollectionFactory::class);
         $escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
@@ -38,7 +60,10 @@ protected function setUp()
             $factoryMock,
             $collectionFactoryMock,
             $escaperMock,
-            $this->urlBuilder
+            $this->urlBuilder,
+            [],
+            $secureRendererMock,
+            $randomMock
         );
         $formMock = new \Magento\Framework\DataObject();
         $formMock->getHtmlIdPrefix('id_prefix');
@@ -92,9 +117,10 @@ public function testGetElementHtmlWithValue()
         $this->assertContains('type="file"', $html);
         $this->assertContains('value="test_value"', $html);
         $this->assertContains(
-            '<a href="http://localhost/media/test_value" onclick="imagePreview(\'_image\'); return false;"',
+            '<a previewlinkid="linkIdsome-rando-string" href="http://localhost/media/test_value"',
             $html
         );
+        $this->assertContains("imagePreview('_image');\nreturn false;", $html);
         $this->assertContains('<input type="checkbox"', $html);
     }
 }
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LinkTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LinkTest.php
index cf3cd0345e174..eec2d955f0344 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LinkTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LinkTest.php
@@ -9,8 +9,13 @@
  */
 namespace Magento\Framework\Data\Test\Unit\Form\Element;
 
+use Magento\Framework\Math\Random;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 class LinkTest extends \PHPUnit\Framework\TestCase
 {
+    private const RANDOM_STRING = '123456abcdef';
+
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
@@ -27,10 +32,15 @@ protected function setUp()
         $factoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\Factory::class);
         $collectionFactoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\CollectionFactory::class);
         $escaperMock = $objectManager->getObject(\Magento\Framework\Escaper::class);
+        $randomMock = $this->createMock(Random::class);
+        $randomMock->method('getRandomString')->willReturn(self::RANDOM_STRING);
         $this->_link = new \Magento\Framework\Data\Form\Element\Link(
             $factoryMock,
             $collectionFactoryMock,
-            $escaperMock
+            $escaperMock,
+            [],
+            $this->createMock(SecureHtmlRenderer::class),
+            $randomMock
         );
         $formMock = new \Magento\Framework\DataObject();
         $formMock->getHtmlIdPrefix('id_prefix');
@@ -58,7 +68,8 @@ public function testGetElementHtml()
         $this->_link->setValue('Link Text');
         $html = $this->_link->getElementHtml();
         $this->assertEquals(
-            "link_before<a id=\"link_id\"  data-ui-id=\"form-element-\">Link Text</a>\nlink_after",
+            "link_before<a id=\"link_id\" formelementhookid=\"elemId" .self::RANDOM_STRING
+            ."\" data-ui-id=\"form-element-\">Link Text</a>\nlink_after",
             $html
         );
     }
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultiselectTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultiselectTest.php
index c515e0aca01df..ce83705e105b8 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultiselectTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultiselectTest.php
@@ -6,7 +6,14 @@
 namespace Magento\Framework\Data\Test\Unit\Form\Element;
 
 use Magento\Framework\Escaper;
+use Magento\Framework\Math\Random;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
+/**
+ * Test for the widget.
+ *
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
 class MultiselectTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -14,14 +21,34 @@ class MultiselectTest extends \PHPUnit\Framework\TestCase
      */
     protected $_model;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
         $testHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $randomMock = $this->createMock(Random::class);
+        $randomMock->method('getRandomString')->willReturn('some-rando-string');
+        $secureRendererMock = $this->createMock(SecureHtmlRenderer::class);
+        $secureRendererMock->method('renderEventListenerAsTag')
+            ->willReturnCallback(
+                function (string $event, string $listener, string $selector): string {
+                    return "<script>document.querySelector('{$selector}').{$event} = () => { {$listener} };</script>";
+                }
+            );
+        $secureRendererMock->method('renderTag')
+            ->willReturnCallback(
+                function (string $tag, array $attrs, ?string $content): string {
+                    return "<$tag>$content</$tag>";
+                }
+            );
         $escaper = new Escaper();
         $this->_model = $testHelper->getObject(
             \Magento\Framework\Data\Form\Element\Editablemultiselect::class,
             [
-                '_escaper' => $escaper
+                '_escaper' => $escaper,
+                'random' => $randomMock,
+                'secureRenderer' => $secureRendererMock
             ]
         );
         $this->_model->setForm(new \Magento\Framework\DataObject());
diff --git a/lib/internal/Magento/Framework/View/Helper/SecureHtmlRender/EventHandlerData.php b/lib/internal/Magento/Framework/View/Helper/SecureHtmlRender/EventHandlerData.php
new file mode 100644
index 0000000000000..9d7afc5211cd2
--- /dev/null
+++ b/lib/internal/Magento/Framework/View/Helper/SecureHtmlRender/EventHandlerData.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\View\Helper\SecureHtmlRender;
+
+/**
+ * JS event handler data.
+ */
+class EventHandlerData
+{
+    /**
+     * @var string
+     */
+    private $event;
+
+    /**
+     * @var string
+     */
+    private $code;
+
+    /**
+     * @param string $event
+     * @param string $code
+     */
+    public function __construct(string $event, string $code)
+    {
+        $this->event = $event;
+        $this->code = $code;
+    }
+
+    /**
+     * Full event name like "onclick"
+     *
+     * @return string
+     */
+    public function getEvent(): string
+    {
+        return $this->event;
+    }
+
+    /**
+     * JavaScript code.
+     *
+     * @return string
+     */
+    public function getCode(): string
+    {
+        return $this->code;
+    }
+}
diff --git a/lib/internal/Magento/Framework/View/Helper/SecureHtmlRender/HtmlRenderer.php b/lib/internal/Magento/Framework/View/Helper/SecureHtmlRender/HtmlRenderer.php
new file mode 100644
index 0000000000000..d8705b63cd0a9
--- /dev/null
+++ b/lib/internal/Magento/Framework/View/Helper/SecureHtmlRender/HtmlRenderer.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\View\Helper\SecureHtmlRender;
+
+use Magento\Framework\Escaper;
+
+/**
+ * Renders HTML based on provided data.
+ */
+class HtmlRenderer
+{
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
+    /**
+     * @param Escaper $escaper
+     */
+    public function __construct(Escaper $escaper)
+    {
+        $this->escaper = $escaper;
+    }
+
+    /**
+     * Render the tag.
+     *
+     * @param TagData $tagData
+     * @return string
+     */
+    public function renderTag(TagData $tagData): string
+    {
+        $attributesHtmls = [];
+        foreach ($tagData->getAttributes() as $attribute => $value) {
+            $attributesHtmls[] = $attribute . '="' .$this->escaper->escapeHtmlAttr($value) .'"';
+        }
+        $content = null;
+        if ($tagData->getContent() !== null) {
+            $content = $tagData->isTextContent()
+                ? $this->escaper->escapeHtml($tagData->getContent()) : $tagData->getContent();
+        }
+        $attributesHtml = '';
+        if ($attributesHtmls) {
+            $attributesHtml = ' ' .implode(' ', $attributesHtmls);
+        }
+
+        $html = '<' .$tagData->getTag() .$attributesHtml;
+        if ($content) {
+            $html .= '>' .$content .'</' .$tagData->getTag() .'>';
+        } else {
+            $html .= '/>';
+        }
+
+        return $html;
+    }
+
+    /**
+     * Render the handler as an HTML attribute.
+     *
+     * @param EventHandlerData $eventHandlerData
+     * @return string
+     */
+    public function renderEventHandler(EventHandlerData $eventHandlerData): string
+    {
+        return $eventHandlerData->getEvent() .'="'
+            .$this->escaper->escapeHtmlAttr($eventHandlerData->getCode()) .'"';
+    }
+}
diff --git a/lib/internal/Magento/Framework/View/Helper/SecureHtmlRender/SecurityProcessorInterface.php b/lib/internal/Magento/Framework/View/Helper/SecureHtmlRender/SecurityProcessorInterface.php
new file mode 100644
index 0000000000000..c02394a17e1aa
--- /dev/null
+++ b/lib/internal/Magento/Framework/View/Helper/SecureHtmlRender/SecurityProcessorInterface.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\View\Helper\SecureHtmlRender;
+
+/**
+ * Perform security related modifications or logic for HTML being rendered.
+ */
+interface SecurityProcessorInterface
+{
+    /**
+     * Process a tag.
+     *
+     * @param TagData $tagData
+     * @return TagData
+     */
+    public function processTag(TagData $tagData): TagData;
+
+    /**
+     * Process an event handler.
+     *
+     * @param EventHandlerData $eventHandlerData
+     * @return EventHandlerData
+     */
+    public function processEventHandler(EventHandlerData $eventHandlerData): EventHandlerData;
+}
diff --git a/lib/internal/Magento/Framework/View/Helper/SecureHtmlRender/TagData.php b/lib/internal/Magento/Framework/View/Helper/SecureHtmlRender/TagData.php
new file mode 100644
index 0000000000000..c856dae75d023
--- /dev/null
+++ b/lib/internal/Magento/Framework/View/Helper/SecureHtmlRender/TagData.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\View\Helper\SecureHtmlRender;
+
+/**
+ * Tag data to render.
+ */
+class TagData
+{
+    /**
+     * @var string
+     */
+    private $tag;
+
+    /**
+     * @var string[]
+     */
+    private $attributes;
+
+    /**
+     * @var string|null
+     */
+    private $content;
+
+    /**
+     * @var bool
+     */
+    private $textContent;
+
+    /**
+     * @param string $tag
+     * @param string[] $attributes
+     * @param string|null $content
+     * @param bool $textContent
+     */
+    public function __construct(string $tag, array $attributes, ?string $content, bool $textContent)
+    {
+        $this->tag = $tag;
+        $this->attributes = $attributes;
+        $this->content = $content;
+        $this->textContent = $textContent;
+    }
+
+    /**
+     * Tag name (like "style", "script" etc)
+     *
+     * @return string
+     */
+    public function getTag(): string
+    {
+        return $this->tag;
+    }
+
+    /**
+     * Attributes list, not escaped.
+     *
+     * @return string[]
+     */
+    public function getAttributes(): array
+    {
+        return $this->attributes;
+    }
+
+    /**
+     * Text or HTML inner content.
+     *
+     * @return string|null
+     */
+    public function getContent(): ?string
+    {
+        return $this->content;
+    }
+
+    /**
+     * Is the content to be treated as text or HTML?
+     *
+     * @return bool
+     */
+    public function isTextContent(): bool
+    {
+        return $this->textContent;
+    }
+}
diff --git a/lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php b/lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php
new file mode 100644
index 0000000000000..5213e0b35d94d
--- /dev/null
+++ b/lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\View\Helper;
+
+use Magento\Framework\Math\Random;
+use Magento\Framework\View\Helper\SecureHtmlRender\EventHandlerData;
+use Magento\Framework\View\Helper\SecureHtmlRender\HtmlRenderer;
+use Magento\Framework\View\Helper\SecureHtmlRender\SecurityProcessorInterface;
+use Magento\Framework\View\Helper\SecureHtmlRender\TagData;
+
+/**
+ * Render HTML elements with consideration to application security.
+ */
+class SecureHtmlRenderer
+{
+    /**
+     * @var HtmlRenderer
+     */
+    private $renderer;
+
+    /**
+     * @var SecurityProcessorInterface[]
+     */
+    private $processors;
+
+    /**
+     * @var Random
+     */
+    private $random;
+
+    /**
+     * @param HtmlRenderer $renderer
+     * @param Random $random
+     * @param SecurityProcessorInterface[] $processors
+     */
+    public function __construct(HtmlRenderer $renderer, Random $random, array $processors = [])
+    {
+        $this->renderer = $renderer;
+        $this->random = $random;
+        $this->processors = $processors;
+    }
+
+    /**
+     * Renders HTML tag while possibly modifying or using it's attributes and content for security reasons.
+     *
+     * @param string $tagName Like "script" or "style"
+     * @param string[] $attributes Attributes map, values must not be escaped.
+     * @param string|null $content Tag's content.
+     * @param bool $textContent Whether to treat the tag's content as text or HTML.
+     * @return string
+     */
+    public function renderTag(
+        string $tagName,
+        array $attributes,
+        ?string $content = null,
+        bool $textContent = true
+    ): string {
+        $tag = new TagData($tagName, $attributes, $content, $textContent);
+        foreach ($this->processors as $processor) {
+            $tag = $processor->processTag($tag);
+        }
+
+        return $this->renderer->renderTag($tag);
+    }
+
+    /**
+     * Render event listener as an HTML attribute while possibly modifying or using it's content for security reasons.
+     *
+     * @param string $eventName Full attribute name like "onclick".
+     * @param string $javascript
+     * @return string
+     */
+    public function renderEventListener(string $eventName, string $javascript): string
+    {
+        $event = new EventHandlerData($eventName, $javascript);
+        foreach ($this->processors as $processor) {
+            $event = $processor->processEventHandler($event);
+        }
+
+        return $this->renderer->renderEventHandler($event);
+    }
+
+    /**
+     * Render event listener script as a separate tag instead of an attribute.
+     *
+     * @param string $eventName Full event name like "onclick".
+     * @param string $attributeJavascript JS that would've gone to an HTML attribute.
+     * @param string $elementSelector CSS selector for the element we handle the event for.
+     * @return string Result script tag.
+     */
+    public function renderEventListenerAsTag(
+        string $eventName,
+        string $attributeJavascript,
+        string $elementSelector
+    ): string {
+        $eventName = mb_strtolower(mb_substr($eventName, 2));
+        $listenerFunction = 'eventListener' .$this->random->getRandomString(32);
+        $elementName = 'listenedElement' .$this->random->getRandomString(32);
+        $script = <<<script
+            function {$listenerFunction} () {
+                {$attributeJavascript};
+            }
+            let {$elementName} = document.querySelector("{$elementSelector}");
+            if ({$elementName}) {
+                {$elementName}.addEventListener("{$eventName}", (event) => {$listenerFunction}.apply(event.target));
+            }
+script;
+
+        return $this->renderTag('script', ['type' => 'text/javascript'], $script, false);
+    }
+}
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Php.php b/lib/internal/Magento/Framework/View/TemplateEngine/Php.php
index 0437386e4fc2b..6ffcf02f1b869 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Php.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Php.php
@@ -31,22 +31,22 @@ class Php implements TemplateEngineInterface
     protected $_helperFactory;
 
     /**
-     * @var Escaper
+     * @var object[]
      */
-    private $escaper;
+    private $blockVariables = [];
 
     /**
      * Constructor
      *
      * @param \Magento\Framework\ObjectManagerInterface $helperFactory
-     * @param Escaper|null $escaper
+     * @param object[] $blockVariables
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $helperFactory,
-        ?Escaper $escaper = null
+        array $blockVariables = []
     ) {
         $this->_helperFactory = $helperFactory;
-        $this->escaper = $escaper ?? $helperFactory->get(Escaper::class);
+        $this->blockVariables = $blockVariables;
     }
 
     /**
@@ -60,7 +60,6 @@ public function __construct(
      * @param array                    $dictionary
      * @return string
      * @throws \Exception
-     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
     public function render(BlockInterface $block, $fileName, array $dictionary = [])
     {
@@ -68,10 +67,8 @@ public function render(BlockInterface $block, $fileName, array $dictionary = [])
         try {
             $tmpBlock = $this->_currentBlock;
             $this->_currentBlock = $block;
+            $dictionary = array_merge($this->blockVariables, $dictionary);
             extract($dictionary, EXTR_SKIP);
-            //So it can be used in the template.
-            $escaper = $this->escaper;
-            // phpcs:ignore
             include $fileName;
             $this->_currentBlock = $tmpBlock;
         } catch (\Exception $exception) {

From 6cd54be7b4beb513f1bb3471dd0ea157c87de5bb Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Mon, 23 Mar 2020 16:30:04 -0500
Subject: [PATCH 0098/1718] MC-24063: [2.4.x Port] Implement CSP

---
 app/etc/di.xml                                           | 1 +
 .../Magento/Framework/View/TemplateEngine/Php.php        | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/etc/di.xml b/app/etc/di.xml
index 3ec48b82e921b..60335341d782a 100644
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -1829,6 +1829,7 @@
         <arguments>
             <argument name="blockVariables" xsi:type="array">
                 <item name="secureRenderer" xsi:type="object">Magento\Framework\View\Helper\SecureHtmlRenderer\Proxy</item>
+                <item name="escaper" xsi:type="object">Magento\Framework\Escaper</item>
             </argument>
         </arguments>
     </type>
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Php.php b/lib/internal/Magento/Framework/View/TemplateEngine/Php.php
index 6ffcf02f1b869..0a4e90504a350 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Php.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Php.php
@@ -7,7 +7,6 @@
 
 namespace Magento\Framework\View\TemplateEngine;
 
-use Magento\Framework\Escaper;
 use Magento\Framework\View\Element\BlockInterface;
 use Magento\Framework\View\TemplateEngineInterface;
 
@@ -55,11 +54,11 @@ public function __construct(
      * Include the named PHTML template using the given block as the $this
      * reference, though only public methods will be accessible.
      *
-     * @param BlockInterface           $block
-     * @param string                   $fileName
-     * @param array                    $dictionary
+     * @param BlockInterface $block
+     * @param string $fileName
+     * @param array $dictionary
      * @return string
-     * @throws \Exception
+     * @throws \Throwable
      */
     public function render(BlockInterface $block, $fileName, array $dictionary = [])
     {

From 0a3efcceea3fbadc0a07e3a5aa6ea3d940c3976c Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Mon, 23 Mar 2020 16:48:58 -0500
Subject: [PATCH 0099/1718] MC-24063: [2.4.x Port] Implement CSP

---
 app/code/Magento/Csp/etc/di.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Csp/etc/di.xml b/app/code/Magento/Csp/etc/di.xml
index 5f9b9f7b0fc50..489eefb7e1d31 100644
--- a/app/code/Magento/Csp/etc/di.xml
+++ b/app/code/Magento/Csp/etc/di.xml
@@ -80,6 +80,7 @@
             <argument name="blockVariables" xsi:type="array">
                 <item name="csp" xsi:type="object">Magento\Csp\Api\InlineUtilInterface\Proxy</item>
                 <item name="secureRenderer" xsi:type="object">Magento\Framework\View\Helper\SecureHtmlRenderer\Proxy</item>
+                <item name="escaper" xsi:type="object">Magento\Framework\Escaper</item>
             </argument>
         </arguments>
     </type>

From 7aaf832a9f91398597bc90012af59ac2bd03d9f1 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Mon, 23 Mar 2020 18:18:33 -0500
Subject: [PATCH 0100/1718] MC-24063: [2.4.x Port] Implement CSP

---
 .../Magento/Backend/Block/AbstractBlock.php   |   4 +-
 .../Widget/Grid/Column/Renderer/Action.php    |  38 ++++-
 .../Widget/Grid/Column/Renderer/Checkbox.php  |  33 +++-
 .../Adminhtml/Grid/Renderer/Multiaction.php   |  37 +++-
 .../Widget/Grid/Column/Renderer/Button.php    | 158 +++++++++++++++---
 .../Framework/View/Element/Html/Link.php      |  73 +++++++-
 6 files changed, 307 insertions(+), 36 deletions(-)

diff --git a/app/code/Magento/Backend/Block/AbstractBlock.php b/app/code/Magento/Backend/Block/AbstractBlock.php
index fc91f99e3dbaf..bfac54f8c555c 100644
--- a/app/code/Magento/Backend/Block/AbstractBlock.php
+++ b/app/code/Magento/Backend/Block/AbstractBlock.php
@@ -22,10 +22,10 @@ class AbstractBlock extends \Magento\Framework\View\Element\AbstractBlock
     protected $_authorization;
 
     /**
-     * @param \Magento\Backend\Block\Context $context
+     * @param Context $context
      * @param array $data
      */
-    public function __construct(\Magento\Backend\Block\Context $context, array $data = [])
+    public function __construct(Context $context, array $data = [])
     {
         $this->_authorization = $context->getAuthorization();
         parent::__construct($context, $data);
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php
index a7d85a4cfef4c..5cae7b838a5af 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php
@@ -6,6 +6,10 @@
 
 namespace Magento\Backend\Block\Widget\Grid\Column\Renderer;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Math\Random;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 /**
  * Grid column widget for rendering action grid cells
  *
@@ -20,18 +24,34 @@ class Action extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text
      */
     protected $_jsonEncoder;
 
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureHtmlRenderer;
+
+    /**
+     * @var Random
+     */
+    private $random;
+
     /**
      * @param \Magento\Backend\Block\Context $context
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param array $data
+     * @param SecureHtmlRenderer|null $secureHtmlRenderer
+     * @param Random|null $random
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
         \Magento\Framework\Json\EncoderInterface $jsonEncoder,
-        array $data = []
+        array $data = [],
+        ?SecureHtmlRenderer $secureHtmlRenderer = null,
+        ?Random $random = null
     ) {
         $this->_jsonEncoder = $jsonEncoder;
         parent::__construct($context, $data);
+        $this->secureHtmlRenderer = $secureHtmlRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+        $this->random = $random ?? ObjectManager::getInstance()->get(Random::class);
     }
 
     /**
@@ -111,8 +131,22 @@ protected function _toLinkHtml($action, \Magento\Framework\DataObject $row)
             unset($action['confirm']);
         }
 
+        if (empty($action['id'])) {
+            $action['id'] = 'id' .$this->random->getRandomString(32);
+        }
         $actionAttributes->setData($action);
-        return '<a ' . $actionAttributes->serialize() . '>' . $actionCaption . '</a>';
+        $onclick = $actionAttributes->getData('onclick');
+        $style = $actionAttributes->getData('style');
+        $actionAttributes->unsetData(['onclick', 'style']);
+        $html = '<a ' . $actionAttributes->serialize() . '>' . $actionCaption . '</a>';
+        if ($onclick) {
+            $html .= $this->secureHtmlRenderer->renderEventListenerAsTag('onclick', $onclick, "#{$action['id']}");
+        }
+        if ($style) {
+            $html .= $this->secureHtmlRenderer->renderTag('style', [], "#{$action['id']} { {$style} }", false);
+        }
+
+        return $html;
     }
 
     /**
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php
index 1297f5cd330b8..a83527ccbe0a8 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php
@@ -5,6 +5,10 @@
  */
 namespace Magento\Backend\Block\Widget\Grid\Column\Renderer;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Math\Random;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 /**
  * Grid checkbox column renderer
  *
@@ -29,18 +33,34 @@ class Checkbox extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
      */
     protected $_converter;
 
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
+    /**
+     * @var Random
+     */
+    private $random;
+
     /**
      * @param \Magento\Backend\Block\Context $context
-     * @param \Magento\Backend\Block\Widget\Grid\Column\Renderer\Options\Converter $converter
+     * @param Options\Converter $converter
      * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
+     * @param Random|null $random
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
         \Magento\Backend\Block\Widget\Grid\Column\Renderer\Options\Converter $converter,
-        array $data = []
+        array $data = [],
+        ?SecureHtmlRenderer $secureRenderer = null,
+        ?Random $random = null
     ) {
         parent::__construct($context, $data);
         $this->_converter = $converter;
+        $this->secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+        $this->random = $random ?? ObjectManager::getInstance()->get(Random::class);
     }
 
     /**
@@ -154,11 +174,18 @@ public function renderHeader()
         if ($this->getColumn()->getDisabled()) {
             $disabled = ' disabled="disabled"';
         }
+        $id = 'id' .$this->random->getRandomString(32);
         $html = '<th class="data-grid-th data-grid-actions-cell"><input type="checkbox" ';
+        $html .= 'id="' .$id .'" ';
         $html .= 'name="' . $this->getColumn()->getFieldName() . '" ';
-        $html .= 'onclick="' . $this->getColumn()->getGrid()->getJsObjectName() . '.checkCheckboxes(this)" ';
         $html .= 'class="admin__control-checkbox"' . $checked . $disabled . ' ';
         $html .= 'title="' . __('Select All') . '"/><label></label></th>';
+        $html .= $this->secureRenderer->renderEventListenerAsTag(
+            'onclick',
+            $this->getColumn()->getGrid()->getJsObjectName() . '.checkCheckboxes(this)',
+            "#$id"
+        );
+
         return $html;
     }
 }
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Grid/Renderer/Multiaction.php b/app/code/Magento/Customer/Block/Adminhtml/Grid/Renderer/Multiaction.php
index bd6e8b69a29ea..b440e8d17de53 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Grid/Renderer/Multiaction.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Grid/Renderer/Multiaction.php
@@ -5,6 +5,10 @@
  */
 namespace Magento\Customer\Block\Adminhtml\Grid\Renderer;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Math\Random;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 /**
  * Adminhtml customers wishlist grid item action renderer for few action controls in one cell
  *
@@ -12,6 +16,32 @@
  */
 class Multiaction extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Action
 {
+
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureHtmlRenderer;
+
+    /**
+     * @var Random
+     */
+    private $random;
+
+    /**
+     * @inheritDoc
+     */
+    public function __construct(
+        \Magento\Backend\Block\Context $context,
+        \Magento\Framework\Json\EncoderInterface $jsonEncoder,
+        array $data = [],
+        ?SecureHtmlRenderer $secureHtmlRenderer = null,
+        ?Random $random = null
+    ) {
+        parent::__construct($context, $jsonEncoder, $data, $secureHtmlRenderer, $random);
+        $this->secureHtmlRenderer = $secureHtmlRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+        $this->random = $random ?? ObjectManager::getInstance()->get(Random::class);
+    }
+
     /**
      * Renders column
      *
@@ -55,9 +85,10 @@ protected function _toLinkHtml($action, \Magento\Framework\DataObject $row)
 
         if (isset($action['process']) && $action['process'] == 'configurable') {
             if ($product->canConfigure()) {
-                $style = '';
-                $onClick = sprintf('onclick="return %s.configureItem(%s)"', $action['control_object'], $row->getId());
-                return sprintf('<a href="%s" %s %s>%s</a>', $action['url'], $style, $onClick, $action['caption']);
+                $id = 'id' .$this->random->getRandomString(32);
+                $onClick = sprintf('return %s.configureItem(%s)', $action['control_object'], $row->getId());
+                return sprintf('<a href="%s" id="%s">%s</a>', $action['url'], $id, $action['caption'])
+                    .$this->secureHtmlRenderer->renderEventListenerAsTag('onclick', $onClick, "#$id");
             } else {
                 return false;
             }
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button.php b/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button.php
index 1345a04b357ab..4e100b4a816fc 100644
--- a/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button.php
+++ b/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button.php
@@ -6,8 +6,12 @@
 namespace Magento\Integration\Block\Adminhtml\Widget\Grid\Column\Renderer;
 
 use Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject;
+use Magento\Framework\Math\Random;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 use Magento\Integration\Model\Integration;
+use Magento\Backend\Block\Context;
 
 /**
  * Render HTML <button> tag.
@@ -15,20 +19,76 @@
  */
 class Button extends AbstractRenderer
 {
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
+    /**
+     * @var Random
+     */
+    private $random;
+
+    /**
+     * Button constructor.
+     * @param Context $context
+     * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
+     * @param Random|null $random
+     */
+    public function __construct(
+        Context $context,
+        array $data = [],
+        ?SecureHtmlRenderer $secureRenderer = null,
+        ?Random $random = null
+    ) {
+        parent::__construct($context, $data);
+        $this->secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+        $this->random = $random ?? ObjectManager::getInstance()->get(Random::class);
+    }
+
     /**
      * {@inheritdoc}
      */
-    public function render(\Magento\Framework\DataObject $row)
+    public function render(DataObject $row)
     {
-        /** @var array $attributes */
-        $attributes = $this->_prepareAttributes($row);
-        return sprintf('<button %s>%s</button>', $this->_getAttributesStr($attributes), $this->_getValue($row));
+        $attributes = $this->extractAttributes($row);
+        $attributes['button-renderer-hook-id'] = 'hook' .$this->random->getRandomString(32);
+
+        return sprintf('<button %s>%s</button>', $this->renderAttributes($attributes), $this->_getValue($row))
+            .$this->renderSpecialAttributes($attributes);
+    }
+
+    /**
+     * Extract attributes to render.
+     *
+     * @param DataObject $row
+     * @return string[]
+     */
+    private function extractAttributes(DataObject $row): array
+    {
+        $attributes = [];
+        foreach ($this->_getValidAttributes() as $attributeName) {
+            $methodName = sprintf('_get%sAttribute', ucfirst($attributeName));
+            $rowMethodName = sprintf('get%s', ucfirst($attributeName));
+            $attributeValue = method_exists(
+                $this,
+                $methodName
+            ) ? $this->{$methodName}(
+                $row
+            ) : $this->getColumn()->{$rowMethodName}();
+            if ($attributeValue) {
+                $attributes[$attributeName] = $attributeValue;
+            }
+        }
+
+        return $attributes;
     }
 
     /**
      * Determine whether current integration came from config file
      *
-     * @param \Magento\Framework\DataObject $row
+     * @param DataObject $row
      * @return bool
      */
     protected function _isConfigBasedIntegration(DataObject $row)
@@ -43,7 +103,7 @@ protected function _isConfigBasedIntegration(DataObject $row)
     /**
      * Whether current item is disabled.
      *
-     * @param \Magento\Framework\DataObject $row
+     * @param DataObject $row
      * @return bool
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -53,7 +113,7 @@ protected function _isDisabled(DataObject $row)
     }
 
     /**
-     * @param \Magento\Framework\DataObject $row
+     * @param DataObject $row
      * @return string
      */
     protected function _getDisabledAttribute(DataObject $row)
@@ -68,33 +128,47 @@ protected function _getDisabledAttribute(DataObject $row)
      * - Then it tries to get it from the button's column layout description.
      * If received attribute value is empty - attribute is not added to final HTML.
      *
-     * @param \Magento\Framework\DataObject $row
+     * @param DataObject $row
      * @return array
      */
     protected function _prepareAttributes(DataObject $row)
     {
-        $attributes = [];
-        foreach ($this->_getValidAttributes() as $attributeName) {
-            $methodName = sprintf('_get%sAttribute', ucfirst($attributeName));
-            $rowMethodName = sprintf('get%s', ucfirst($attributeName));
-            $attributeValue = method_exists(
-                $this,
-                $methodName
-            ) ? $this->{$methodName}(
-                $row
-            ) : $this->getColumn()->{$rowMethodName}();
-
-            if ($attributeValue) {
-                $attributes[] = sprintf(
-                    '%s="%s"',
-                    $attributeName,
-                    $this->escapeHtmlAttr($attributeValue, false)
-                );
+        $attributes = $this->extractAttributes($row);
+        foreach ($attributes as $attributeName => $attributeValue) {
+            if ($attributeName === 'style' || mb_strpos($attributeName, 'on') === 0) {
+                //Will render event handlers and style as separate tags
+                continue;
             }
+            $attributes[] = sprintf(
+                '%s="%s"',
+                $attributeName,
+                $this->escapeHtmlAttr($attributeValue, false)
+            );
         }
+
         return $attributes;
     }
 
+    /**
+     * Render HTML attributes.
+     *
+     * @param array $attributes
+     * @return string
+     */
+    private function renderAttributes(array $attributes): string
+    {
+        $html = '';
+        foreach ($attributes as $attributeName => $attributeValue) {
+            if ($attributeName === 'style' || mb_strpos($attributeName, 'on') === 0) {
+                //Will render event handlers and style as separate tags
+                continue;
+            }
+            $html .= ($html ? ' ' : '') ."{$attributeName}=\"{$this->escapeHtmlAttr($attributeValue)}\"";
+        }
+
+        return $html;
+    }
+
     /**
      * Get list of available HTML attributes for this element.
      *
@@ -140,4 +214,38 @@ protected function _getAttributesStr($attributes)
     {
         return join(' ', $attributes);
     }
+
+    /**
+     * Render special attributes as separate tags.
+     *
+     * @param string[]
+     * @return string
+     */
+    private function renderSpecialAttributes(array $attributes): string
+    {
+        if (!$hookId = $attributes['button-renderer-hook-id']) {
+            return '';
+        }
+
+        $html = '';
+        if (isset($attributes['style'])) {
+            $html = $this->secureRenderer->renderTag(
+                'style',
+                [],
+                "[button-renderer-hook-id='$hookId'] { {$attributes['style']} }",
+                false
+            );
+        }
+        foreach ($this->_getValidAttributes() as $attr) {
+            if (isset($attributes[$attr]) && mb_strpos($attr, 'on') === 0) {
+                $html .= $this->secureRenderer->renderEventListenerAsTag(
+                    $attr,
+                    $attributes[$attr],
+                    "*[button-renderer-hook-id='$hookId']"
+                );
+            }
+        }
+
+        return $html;
+    }
 }
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Link.php b/lib/internal/Magento/Framework/View/Element/Html/Link.php
index 6c5761f8cea25..97ad6031c1a76 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Link.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Link.php
@@ -5,6 +5,12 @@
  */
 namespace Magento\Framework\View\Element\Html;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Math\Random;
+use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+use Magento\Framework\View\Element\Template\Context;
+
 /**
  * HTML anchor element block
  *
@@ -51,6 +57,33 @@ class Link extends \Magento\Framework\View\Element\Template
         'onkeyup', // %events
     ];
 
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
+    /**
+     * @var Random
+     */
+    private $random;
+
+    /**
+     * @param Context $context
+     * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
+     * @param Random|null $random
+     */
+    public function __construct(
+        Context $context,
+        array $data = [],
+        ?SecureHtmlRenderer $secureRenderer = null,
+        ?Random $random = null
+    ) {
+        parent::__construct($context, $data);
+        $this->secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+        $this->random = $random ?? ObjectManager::getInstance()->get(Random::class);
+    }
+
     /**
      * Prepare link attributes as serialized and formatted string
      *
@@ -60,6 +93,9 @@ public function getLinkAttributes()
     {
         $attributes = [];
         foreach ($this->allowedAttributes as $attribute) {
+            if ($attribute === 'style' || mb_strpos($attribute, 'on') === 0) {
+                continue;
+            }
             $value = $this->getDataUsingMethod($attribute);
             if ($value !== null) {
                 $attributes[$attribute] = $this->escapeHtml($value);
@@ -103,7 +139,12 @@ protected function _toHtml()
             return parent::_toHtml();
         }
 
-        return '<li><a ' . $this->getLinkAttributes() . ' >' . $this->escapeHtml($this->getLabel()) . '</a></li>';
+        if (!$this->getDataUsingMethod('id')) {
+            $this->setDataUsingMethod('id', 'id' .$this->random->getRandomString(32));
+        }
+
+        return '<li><a ' . $this->getLinkAttributes() . ' >' . $this->escapeHtml($this->getLabel()) . '</a></li>'
+            .$this->renderSpecialAttributes();
     }
 
     /**
@@ -115,4 +156,34 @@ public function getHref()
     {
         return $this->getUrl($this->getPath());
     }
+
+    /**
+     * Render attributes that require separate tags.
+     *
+     * @return string
+     */
+    private function renderSpecialAttributes(): string
+    {
+        $id = $this->getDataUsingMethod('id');
+        if (!$id) {
+            throw new \RuntimeException('ID is required to render the link');
+        }
+
+        $html = '';
+        $style = $this->getDataUsingMethod('style');
+        if ($style) {
+            $html .= $this->secureRenderer->renderTag('style', [], "#$id { $style }", false);
+        }
+        foreach ($this->allowedAttributes as  $attribute) {
+            if (mb_strpos($attribute, 'on') === 0) {
+                $html .= $this->secureRenderer->renderEventListenerAsTag(
+                    $attribute,
+                    $this->getDataUsingMethod($attribute),
+                    "#$id"
+                );
+            }
+        }
+
+        return $html;
+    }
 }

From d201c3c0639c1db423876ae2e802d3bf2be1349f Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Tue, 24 Mar 2020 11:41:05 -0500
Subject: [PATCH 0101/1718] MC-24063: [2.4.x Port] Implement CSP

---
 .../System/Config/CollectionTimeLabelTest.php          |  5 -----
 app/code/Magento/Csp/etc/di.xml                        | 10 ----------
 .../Magento/Framework/View/Element/Html/Link.php       |  4 ++--
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php
index cf2c6d46539fa..60aab4bcb0ffc 100644
--- a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php
@@ -53,11 +53,6 @@ class CollectionTimeLabelTest extends TestCase
      */
     private $abstractElementMock;
 
-    /**
-     * @var \PHPUnit\Framework\MockObject\MockObject
-     */
-    private $formMock;
-
     /**
      * @inheritDoc
      */
diff --git a/app/code/Magento/Csp/etc/di.xml b/app/code/Magento/Csp/etc/di.xml
index 489eefb7e1d31..1de1191390725 100644
--- a/app/code/Magento/Csp/etc/di.xml
+++ b/app/code/Magento/Csp/etc/di.xml
@@ -49,11 +49,6 @@
             <argument name="fileName" xsi:type="string">csp_whitelist.xml</argument>
         </arguments>
     </type>
-    <type name="Magento\Csp\Model\Collector\CspWhitelistXml\Data">
-        <arguments>
-            <argument name="reader" xsi:type="object">Magento\Csp\Model\Collector\CspWhitelistXml\Reader\Proxy</argument>
-        </arguments>
-    </type>
     <type name="Magento\Csp\Model\Collector\CspWhitelistXmlCollector">
         <arguments>
             <argument name="configReader" xsi:type="object">Magento\Csp\Model\Collector\CspWhitelistXml\Data</argument>
@@ -64,11 +59,6 @@
             <argument name="reader" xsi:type="object">Magento\Csp\Model\Collector\CspWhitelistXml\Reader\Proxy</argument>
         </arguments>
     </type>
-    <type name="Magento\Csp\Model\Collector\CspWhitelistXmlCollector">
-        <arguments>
-            <argument name="configReader" xsi:type="object">Magento\Csp\Model\Collector\CspWhitelistXml\Data</argument>
-        </arguments>
-    </type>
     <preference for="Magento\Csp\Api\InlineUtilInterface" type="Magento\Csp\Helper\InlineUtil" />
     <type name="Magento\Csp\Plugin\TemplateRenderingPlugin">
         <arguments>
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Link.php b/lib/internal/Magento/Framework/View/Element/Html/Link.php
index 97ad6031c1a76..f5f1bdbbbb40c 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Link.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Link.php
@@ -175,10 +175,10 @@ private function renderSpecialAttributes(): string
             $html .= $this->secureRenderer->renderTag('style', [], "#$id { $style }", false);
         }
         foreach ($this->allowedAttributes as  $attribute) {
-            if (mb_strpos($attribute, 'on') === 0) {
+            if (mb_strpos($attribute, 'on') === 0 && $value = $this->getDataUsingMethod($attribute)) {
                 $html .= $this->secureRenderer->renderEventListenerAsTag(
                     $attribute,
-                    $this->getDataUsingMethod($attribute),
+                    $value,
                     "#$id"
                 );
             }

From 99033804fd57f19b7f6f39591173eeb637a809fd Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Tue, 24 Mar 2020 14:38:23 -0500
Subject: [PATCH 0102/1718] MC-24063: [2.4.x Port] Implement CSP

---
 .../Widget/Grid/Column/Renderer/Checkbox.php  |  2 +
 .../Adminhtml/Grid/Renderer/Multiaction.php   |  9 ++-
 .../Widget/Grid/Column/Renderer/Button.php    |  6 +-
 .../Grid/Column/Renderer/ButtonTest.php       | 45 +++++++++--
 .../Customer/Edit/Tab/Wishlist/Grid.php       |  4 +-
 .../Column/Renderer/Button/DeleteTest.php     | 14 ++--
 .../Grid/Column/Renderer/Button/EditTest.php  |  6 +-
 .../HTTP/PhpEnvironment/Response.php          |  3 +
 .../Framework/View/Element/Html/Link.php      |  2 +-
 .../View/Test/Unit/Element/Html/LinkTest.php  | 75 +++++++++++++------
 10 files changed, 122 insertions(+), 44 deletions(-)

diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php
index a83527ccbe0a8..6609e03baeed3 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php
@@ -132,6 +132,8 @@ public function render(\Magento\Framework\DataObject $row)
     }
 
     /**
+     * Render checkbox HTML.
+     *
      * @param string $value   Value of the element
      * @param bool   $checked Whether it is checked
      * @return string
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Grid/Renderer/Multiaction.php b/app/code/Magento/Customer/Block/Adminhtml/Grid/Renderer/Multiaction.php
index b440e8d17de53..5de36c60f0212 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Grid/Renderer/Multiaction.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Grid/Renderer/Multiaction.php
@@ -87,8 +87,13 @@ protected function _toLinkHtml($action, \Magento\Framework\DataObject $row)
             if ($product->canConfigure()) {
                 $id = 'id' .$this->random->getRandomString(32);
                 $onClick = sprintf('return %s.configureItem(%s)', $action['control_object'], $row->getId());
-                return sprintf('<a href="%s" id="%s">%s</a>', $action['url'], $id, $action['caption'])
-                    .$this->secureHtmlRenderer->renderEventListenerAsTag('onclick', $onClick, "#$id");
+                return sprintf(
+                    '<a href="%s" id="%s" class="configure-item-link">%s</a>%s',
+                    $action['url'],
+                    $id,
+                    $action['caption'],
+                    $this->secureHtmlRenderer->renderEventListenerAsTag('onclick', $onClick, "#$id")
+                );
             } else {
                 return false;
             }
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button.php b/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button.php
index 4e100b4a816fc..66718d981e84e 100644
--- a/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button.php
+++ b/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button.php
@@ -48,7 +48,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function render(DataObject $row)
     {
@@ -113,6 +113,8 @@ protected function _isDisabled(DataObject $row)
     }
 
     /**
+     * Retrieve "disabled" attribute value for the row.
+     *
      * @param DataObject $row
      * @return string
      */
@@ -218,7 +220,7 @@ protected function _getAttributesStr($attributes)
     /**
      * Render special attributes as separate tags.
      *
-     * @param string[]
+     * @param string[] $attributes
      * @return string
      */
     private function renderSpecialAttributes(array $attributes): string
diff --git a/app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Widget/Grid/Column/Renderer/ButtonTest.php b/app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Widget/Grid/Column/Renderer/ButtonTest.php
index 583ee91857c28..68c412697a463 100644
--- a/app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Widget/Grid/Column/Renderer/ButtonTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Widget/Grid/Column/Renderer/ButtonTest.php
@@ -6,6 +6,10 @@
 
 namespace Magento\Integration\Test\Unit\Block\Adminhtml\Widget\Grid\Column\Renderer;
 
+use Magento\Framework\DataObject;
+use Magento\Framework\Math\Random;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 class ButtonTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -32,13 +36,31 @@ protected function setUp()
     {
         $this->escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
         $this->escaperMock->expects($this->any())->method('escapeHtml')->willReturnArgument(0);
+        $this->escaperMock->expects($this->any())->method('escapeHtmlAttr')->willReturnArgument(0);
         $this->contextMock = $this->createPartialMock(\Magento\Backend\Block\Context::class, ['getEscaper']);
         $this->contextMock->expects($this->any())->method('getEscaper')->will($this->returnValue($this->escaperMock));
+        $randomMock = $this->createMock(Random::class);
+        $randomMock->method('getRandomString')->willReturn('random');
+        $secureRendererMock = $this->createMock(SecureHtmlRenderer::class);
+        $secureRendererMock->method('renderTag')
+            ->willReturnCallback(
+                function (string $tag, array $attributes, string $content): string {
+                    $attributes = new DataObject($attributes);
+
+                    return "<$tag {$attributes->serialize()}>$content</$tag>";
+                }
+            );
+        $secureRendererMock->method('renderEventListenerAsTag')
+            ->willReturnCallback(
+                function (string $event, string $js, string $selector): string {
+                    return "<script>document.querySelector('$selector').$event = function () { $js };</script>";
+                }
+            );
 
         $this->objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->buttonRenderer = $this->objectManagerHelper->getObject(
             \Magento\Integration\Block\Adminhtml\Widget\Grid\Column\Renderer\Button::class,
-            ['context' => $this->contextMock]
+            ['context' => $this->contextMock, 'random' => $randomMock, 'secureRenderer' => $secureRendererMock]
         );
     }
 
@@ -47,10 +69,9 @@ protected function setUp()
      */
     public function testRender()
     {
-        $expectedResult = '<button id="1" type="bigButton">my button</button>';
         $column = $this->getMockBuilder(\Magento\Backend\Block\Widget\Grid\Column::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getType', 'getId', 'getIndex'])
+            ->setMethods(['getType', 'getId', 'getIndex', 'getStyle', 'getOnclick'])
             ->getMock();
         $column->expects($this->any())
             ->method('getType')
@@ -58,15 +79,25 @@ public function testRender()
         $column->expects($this->any())
             ->method('getId')
             ->willReturn('1');
-        $this->escaperMock->expects($this->at(0))->method('escapeHtmlAttr')->willReturn('1');
-        $this->escaperMock->expects($this->at(1))->method('escapeHtmlAttr')->willReturn('bigButton');
         $column->expects($this->any())
             ->method('getIndex')
             ->willReturn('name');
+        $column->expects($this->any())
+            ->method('getStyle')
+            ->willReturn('display: block;');
+        $column->expects($this->any())
+            ->method('getOnclick')
+            ->willReturn('alert(1);');
         $this->buttonRenderer->setColumn($column);
 
-        $object = new \Magento\Framework\DataObject(['name' => 'my button']);
+        $object = new DataObject(['name' => 'my button']);
         $actualResult = $this->buttonRenderer->render($object);
-        $this->assertEquals($expectedResult, $actualResult);
+        $this->assertEquals(
+            '<button id="1" type="bigButton" button-renderer-hook-id="hookrandom">my button</button>'
+            .'<style >[button-renderer-hook-id=\'hookrandom\'] { display: block; }</style>'
+            .'<script>document.querySelector(\'*[button-renderer-hook-id=\'hookrandom\']\').onclick = '
+            .'function () { alert(1); };</script>',
+            $actualResult
+        );
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist/Grid.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist/Grid.php
index f3c462de91893..c7c75757c585e 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist/Grid.php
@@ -41,14 +41,14 @@ class Grid extends \Magento\Backend\Test\Block\Widget\Grid
      *
      * @var string
      */
-    protected $deleteLink = 'a[onclick*="removeItem"]';
+    protected $deleteLink = 'a[text()="Delete"]';
 
     /**
      * Configure link selector
      *
      * @var string
      */
-    protected $configureLink = 'a[onclick*="configureItem"]';
+    protected $configureLink = 'a.configure-item-link';
 
     /**
      * Secondary part of row locator template for getRow() method with strict option.
diff --git a/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button/DeleteTest.php b/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button/DeleteTest.php
index c6cc68582ae6b..a44d21f0ef180 100644
--- a/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button/DeleteTest.php
+++ b/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button/DeleteTest.php
@@ -39,8 +39,8 @@ public function testRender()
         $buttonHtml = $this->deleteButtonBlock->render($integration);
         $this->assertContains('title="Remove"', $buttonHtml);
         $this->assertContains(
-            'onclick="this.setAttribute(&#039;data-url&#039;, '
-            . '&#039;http://localhost/index.php/backend/admin/integration/delete/id/'
+            'this.setAttribute(\'data-url\', '
+            . '\'http://localhost/index.php/backend/admin/integration/delete/id/'
             . $integration->getId(),
             $buttonHtml
         );
@@ -52,10 +52,14 @@ public function testRenderDisabled()
         $integration = $this->getFixtureIntegration();
         $integration->setSetupType(Integration::TYPE_CONFIG);
         $buttonHtml = $this->deleteButtonBlock->render($integration);
-        $this->assertContains('title="Uninstall the extension to remove this integration"', $buttonHtml);
         $this->assertContains(
-            'onclick="this.setAttribute(&#039;data-url&#039;, '
-            . '&#039;http://localhost/index.php/backend/admin/integration/delete/id/'
+            'title="' .$this->deleteButtonBlock->escapeHtmlAttr('Uninstall the extension to remove this integration')
+            .'"',
+            $buttonHtml
+        );
+        $this->assertContains(
+            'this.setAttribute(\'data-url\', '
+            . '\'http://localhost/index.php/backend/admin/integration/delete/id/'
             . $integration->getId(),
             $buttonHtml
         );
diff --git a/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button/EditTest.php b/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button/EditTest.php
index 0463053e6b5f1..7c78750a66cad 100644
--- a/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button/EditTest.php
+++ b/dev/tests/integration/testsuite/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button/EditTest.php
@@ -38,9 +38,9 @@ public function testRenderEdit()
         $integration = $this->getFixtureIntegration();
         $buttonHtml = $this->editButtonBlock->render($integration);
         $this->assertContains('title="Edit"', $buttonHtml);
-        $this->assertContains('class="action edit"', $buttonHtml);
+        $this->assertContains('class="' .$this->editButtonBlock->escapeHtmlAttr('action edit') .'"', $buttonHtml);
         $this->assertContains(
-            'onclick="window.location.href=&#039;http://localhost/index.php/backend/admin/integration/edit/id/'
+            'window.location.href=\'http://localhost/index.php/backend/admin/integration/edit/id/'
             . $integration->getId(),
             $buttonHtml
         );
@@ -52,7 +52,7 @@ public function testRenderView()
         $integration->setSetupType(Integration::TYPE_CONFIG);
         $buttonHtml = $this->editButtonBlock->render($integration);
         $this->assertContains('title="View"', $buttonHtml);
-        $this->assertContains('class="action info"', $buttonHtml);
+        $this->assertContains('class="' .$this->editButtonBlock->escapeHtmlAttr('action info') .'"', $buttonHtml);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Response.php b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Response.php
index dd8e1a9ccd634..f5180eb96acfc 100644
--- a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Response.php
+++ b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/Response.php
@@ -28,6 +28,9 @@ public function getHeader($name)
         $headers = $this->getHeaders();
         if ($headers->has($name)) {
             $header = $headers->get($name);
+            if (is_iterable($header)) {
+                $header = $header[0];
+            }
         }
         return $header;
     }
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Link.php b/lib/internal/Magento/Framework/View/Element/Html/Link.php
index f5f1bdbbbb40c..8322e904f940e 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Link.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Link.php
@@ -174,7 +174,7 @@ private function renderSpecialAttributes(): string
         if ($style) {
             $html .= $this->secureRenderer->renderTag('style', [], "#$id { $style }", false);
         }
-        foreach ($this->allowedAttributes as  $attribute) {
+        foreach ($this->allowedAttributes as $attribute) {
             if (mb_strpos($attribute, 'on') === 0 && $value = $this->getDataUsingMethod($attribute)) {
                 $html .= $this->secureRenderer->renderEventListenerAsTag(
                     $attribute,
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php
index 4c76087bfea12..a5c7d899086de 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php
@@ -6,15 +6,17 @@
 
 namespace Magento\Framework\View\Test\Unit\Element\Html;
 
+use Magento\Framework\DataObject;
+use Magento\Framework\Math\Random;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 class LinkTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
     private $objectManager;
 
-    protected function setUp()
-    {
-        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-    }
-
     /**
      * @var array
      */
@@ -32,18 +34,18 @@ protected function setUp()
      */
     protected $link;
 
-    public function testGetLinkAttributes()
+    protected function setUp()
     {
+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
         $escaperMock = $this->getMockBuilder(\Magento\Framework\Escaper::class)
             ->setMethods(['escapeHtml'])->disableOriginalConstructor()->getMock();
-
         $escaperMock->expects($this->any())
             ->method('escapeHtml')
             ->will($this->returnArgument(0));
 
         $urlBuilderMock = $this->getMockBuilder(\Magento\Framework\UrlInterface::class)
             ->setMethods(['getUrl'])->disableOriginalConstructor()->getMockForAbstractClass();
-
         $urlBuilderMock->expects($this->any())
             ->method('getUrl')
             ->willReturn('http://site.com/link.html');
@@ -55,7 +57,8 @@ public function testGetLinkAttributes()
             ->willReturn(false);
 
         $scopeConfigMock = $this->getMockBuilder(\Magento\Framework\App\Config::class)
-            ->setMethods(['isSetFlag'])->disableOriginalConstructor()->getMock();
+            ->disableOriginalConstructor()
+            ->getMock();
         $scopeConfigMock->expects($this->any())
             ->method('isSetFlag')
             ->willReturn(true);
@@ -64,54 +67,82 @@ public function testGetLinkAttributes()
             ->setMethods([])->disableOriginalConstructor()->getMock();
 
         $contextMock = $this->getMockBuilder(\Magento\Framework\View\Element\Template\Context::class)
-            ->setMethods(['getEscaper', 'getUrlBuilder', 'getValidator', 'getResolver', 'getScopeConfig'])
             ->disableOriginalConstructor()
             ->getMock();
-
         $contextMock->expects($this->any())
             ->method('getValidator')
             ->willReturn($validtorMock);
-
         $contextMock->expects($this->any())
             ->method('getResolver')
             ->willReturn($resolverMock);
-
         $contextMock->expects($this->any())
             ->method('getEscaper')
             ->willReturn($escaperMock);
-
         $contextMock->expects($this->any())
             ->method('getUrlBuilder')
             ->willReturn($urlBuilderMock);
-
         $contextMock->expects($this->any())
             ->method('getScopeConfig')
             ->willReturn($scopeConfigMock);
+        $contextMock->method('getEventManager')
+            ->willReturn($this->createMock(\Magento\Framework\Event\ManagerInterface::class));
+        $randomMock = $this->createMock(Random::class);
+        $randomMock->method('getRandomString')->willReturn('random');
+        $secureRendererMock = $this->createMock(SecureHtmlRenderer::class);
+        $secureRendererMock->method('renderTag')
+            ->willReturnCallback(
+                function (string $tag, array $attributes, string $content): string {
+                    $attributes = new DataObject($attributes);
+
+                    return "<$tag {$attributes->serialize()}>$content</$tag>";
+                }
+            );
+        $secureRendererMock->method('renderEventListenerAsTag')
+            ->willReturnCallback(
+                function (string $event, string $js, string $selector): string {
+                    return "<script>document.querySelector('$selector').$event = function () { $js };</script>";
+                }
+            );
 
         /** @var \Magento\Framework\View\Element\Html\Link $linkWithAttributes */
-        $linkWithAttributes = $this->objectManager->getObject(
+        $this->link = $this->objectManager->getObject(
             \Magento\Framework\View\Element\Html\Link::class,
-            ['context' => $contextMock]
+            ['context' => $contextMock, 'random' => $randomMock, 'secureRenderer' => $secureRendererMock]
         );
+    }
 
+    public function testGetLinkAttributes()
+    {
+        $linkWithAttributes = clone $this->link;
         $this->assertEquals(
             'href="http://site.com/link.html"',
             $linkWithAttributes->getLinkAttributes()
         );
 
         /** @var \Magento\Framework\View\Element\Html\Link $linkWithoutAttributes */
-        $linkWithoutAttributes = $this->objectManager->getObject(
-            \Magento\Framework\View\Element\Html\Link::class,
-            ['context' => $contextMock]
-        );
+        $linkWithoutAttributes = clone $this->link;
         foreach ($this->allowedAttributes as $attribute) {
             $linkWithoutAttributes->setDataUsingMethod($attribute, $attribute);
         }
 
         $this->assertEquals(
             'href="http://site.com/link.html" shape="shape" tabindex="tabindex"'
-            . ' onfocus="onfocus" onblur="onblur" id="id"',
+            . ' id="id"',
             $linkWithoutAttributes->getLinkAttributes()
         );
     }
+
+    public function testLinkHtml(): void
+    {
+        $this->link->setDataUsingMethod('style', 'display: block;');
+        $this->link->setDataUsingMethod('onclick', 'alert("clicked");');
+
+        $html = $this->link->toHtml();
+        $this->assertEquals(
+            '<li><a href="http://site.com/link.html" id="idrandom" ></a></li>'
+            .'<style >#idrandom { display: block; }</style>'
+            .'<script>document.querySelector(\'#idrandom\').onclick = function () { alert("clicked"); };</script>',
+            $html
+        );
+    }
 }

From 0031c45e144a8284f4d2d73b157eb471f825ea3b Mon Sep 17 00:00:00 2001
From: Sachin Admane <sadmane@adobe.com>
Date: Tue, 24 Mar 2020 16:20:36 -0500
Subject: [PATCH 0103/1718] MC-22963: Identify and Refactor GET requests that
 modify data.

Fix  delete button code.
---
 .../Search/Block/Adminhtml/Synonyms/Edit/DeleteButton.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Search/Block/Adminhtml/Synonyms/Edit/DeleteButton.php b/app/code/Magento/Search/Block/Adminhtml/Synonyms/Edit/DeleteButton.php
index a73edcce99760..3fa8fa9d417f3 100644
--- a/app/code/Magento/Search/Block/Adminhtml/Synonyms/Edit/DeleteButton.php
+++ b/app/code/Magento/Search/Block/Adminhtml/Synonyms/Edit/DeleteButton.php
@@ -8,11 +8,13 @@
 use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
 
 /**
- * Class DeleteButton
+ * Delete Synonyms Group Button Class
  */
 class DeleteButton extends GenericButton implements ButtonProviderInterface
 {
     /**
+     * Delete Button Data
+     *
      * @return array
      */
     public function getButtonData()
@@ -24,7 +26,7 @@ public function getButtonData()
                 'class' => 'delete',
                 'on_click' => 'deleteConfirm(\''
                     . __('Are you sure you want to delete this synonym group?')
-                    . '\', \'' . $this->getDeleteUrl() . '\')',
+                    . '\', \'' . $this->getDeleteUrl() . '\', {data: {}})',
                 'sort_order' => 20,
             ];
         }
@@ -32,6 +34,8 @@ public function getButtonData()
     }
 
     /**
+     * Delete Url
+     *
      * @return string
      */
     public function getDeleteUrl()

From 65cae6e82206e45da773eb3c232a7050e6290d8b Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Wed, 25 Mar 2020 11:02:44 -0500
Subject: [PATCH 0104/1718] MC-24063: [2.4.x Port] Implement CSP

---
 app/code/Magento/Backend/Block/Widget/Button.php         | 1 -
 .../integration/testsuite/Magento/Csp/CspUtilTest.php    | 1 +
 .../Framework/Data/Form/Element/AbstractElement.php      | 2 +-
 .../Test/Unit/Form/Element/EditablemultiselectTest.php   | 7 +++++--
 .../Framework/Data/Test/Unit/Form/Element/EditorTest.php | 9 ++++++---
 .../Framework/Data/Test/Unit/Form/Element/ImageTest.php  | 7 +++++--
 .../Data/Test/Unit/Form/Element/MultiselectTest.php      | 7 +++++--
 .../Framework/View/Test/Unit/Element/Html/LinkTest.php   | 5 +++++
 8 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/Backend/Block/Widget/Button.php b/app/code/Magento/Backend/Block/Widget/Button.php
index 6e449b4a33382..7aa7a7a36056e 100644
--- a/app/code/Magento/Backend/Block/Widget/Button.php
+++ b/app/code/Magento/Backend/Block/Widget/Button.php
@@ -162,7 +162,6 @@ protected function _attributesToHtml($attributes)
      */
     private function generateStyle(): string
     {
-        $buttonId = $this->getData('backend_button_widget_hook_id');
         $style = $this->getStyle();
 
         return <<<style
diff --git a/dev/tests/integration/testsuite/Magento/Csp/CspUtilTest.php b/dev/tests/integration/testsuite/Magento/Csp/CspUtilTest.php
index 9b584ba7028ee..6af97bf83b4d0 100644
--- a/dev/tests/integration/testsuite/Magento/Csp/CspUtilTest.php
+++ b/dev/tests/integration/testsuite/Magento/Csp/CspUtilTest.php
@@ -21,6 +21,7 @@ class CspUtilTest extends AbstractController
      *
      * @return void
      * @magentoConfigFixture default_store csp/mode/storefront/report_only 0
+     * @magentoConfigFixture default_store csp/policies/storefront/scripts/inline 0
      */
     public function testPhtmlHelper(): void
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
index 759db7c093abc..0df5f2a9ca52f 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
@@ -440,7 +440,7 @@ private function generateAttributesSubstitute(): string
         if ($this->getStyle()) {
             $selector = "*[formelementhookid='{$this->generateElementId()}']";
             if ($id = $this->getHtmlId()) {
-                $selector = "#{$this->getHtmlId()}";
+                $selector = "#{$id}";
             }
             $html .= $this->secureRenderer->renderTag(
                 'style',
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/EditablemultiselectTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/EditablemultiselectTest.php
index 329ce9292471a..956e09db87959 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/EditablemultiselectTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/EditablemultiselectTest.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Framework\Data\Test\Unit\Form\Element;
 
+use Magento\Framework\DataObject;
 use Magento\Framework\Math\Random;
 use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
@@ -38,7 +39,9 @@ function (string $event, string $listener, string $selector): string {
         $secureRendererMock->method('renderTag')
             ->willReturnCallback(
                 function (string $tag, array $attrs, ?string $content): string {
-                    return "<$tag>$content</$tag>";
+                    $attrs = new DataObject($attrs);
+
+                    return "<$tag {$attrs->serialize()}>$content</$tag>";
                 }
             );
         $this->_model = $testHelper->getObject(
@@ -54,7 +57,7 @@ function (string $tag, array $attrs, ?string $content): string {
             ['value' => 3, 'label' => 'Value3'],
         ];
         $value = [1, 3];
-        $this->_model->setForm(new \Magento\Framework\DataObject());
+        $this->_model->setForm(new DataObject());
         $this->_model->setData(['values' => $values, 'value' => $value]);
     }
 
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/EditorTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/EditorTest.php
index f207458899a7c..6e5c80a15caea 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/EditorTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/EditorTest.php
@@ -10,6 +10,7 @@
 namespace Magento\Framework\Data\Test\Unit\Form\Element;
 
 use Magento\Framework\Data\Form\Element\Editor;
+use Magento\Framework\DataObject;
 use Magento\Framework\Math\Random;
 use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
@@ -78,13 +79,15 @@ function (string $event, string $listener, string $selector): string {
         $secureRendererMock->method('renderTag')
             ->willReturnCallback(
                 function (string $tag, array $attrs, ?string $content): string {
-                    return "<$tag>$content</$tag>";
+                    $attrs = new DataObject($attrs);
+
+                    return "<$tag {$attrs->serialize()}>$content</$tag>";
                 }
             );
         $this->factoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\Factory::class);
         $this->collectionFactoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\CollectionFactory::class);
         $this->escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
-        $this->configMock = $this->createPartialMock(\Magento\Framework\DataObject::class, ['getData']);
+        $this->configMock = $this->createPartialMock(DataObject::class, ['getData']);
 
         $this->serializer = $this->createMock(\Magento\Framework\Serialize\Serializer\Json::class);
 
@@ -213,7 +216,7 @@ public function testTranslate()
 
     public function testGetConfig()
     {
-        $config = $this->createPartialMock(\Magento\Framework\DataObject::class, ['getData']);
+        $config = $this->createPartialMock(DataObject::class, ['getData']);
         $this->assertEquals($config, $this->model->getConfig());
 
         $this->configMock->expects($this->once())->method('getData')->with('test')->willReturn('test');
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ImageTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ImageTest.php
index 64031147679f8..f0235badf5a54 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ImageTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/ImageTest.php
@@ -9,6 +9,7 @@
  */
 namespace Magento\Framework\Data\Test\Unit\Form\Element;
 
+use Magento\Framework\DataObject;
 use Magento\Framework\Math\Random;
 use Magento\Framework\UrlInterface;
 use Magento\Framework\View\Helper\SecureHtmlRenderer;
@@ -49,7 +50,9 @@ function (string $event, string $listener, string $selector): string {
         $secureRendererMock->method('renderTag')
             ->willReturnCallback(
                 function (string $tag, array $attrs, ?string $content): string {
-                    return "<$tag>$content</$tag>";
+                    $attrs = new DataObject($attrs);
+
+                    return "<$tag {$attrs->serialize()}>$content</$tag>";
                 }
             );
         $factoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\Factory::class);
@@ -65,7 +68,7 @@ function (string $tag, array $attrs, ?string $content): string {
             $secureRendererMock,
             $randomMock
         );
-        $formMock = new \Magento\Framework\DataObject();
+        $formMock = new DataObject();
         $formMock->getHtmlIdPrefix('id_prefix');
         $formMock->getHtmlIdPrefix('id_suffix');
         $this->_image->setForm($formMock);
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultiselectTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultiselectTest.php
index ce83705e105b8..68b4670a13aad 100644
--- a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultiselectTest.php
+++ b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultiselectTest.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Framework\Data\Test\Unit\Form\Element;
 
+use Magento\Framework\DataObject;
 use Magento\Framework\Escaper;
 use Magento\Framework\Math\Random;
 use Magento\Framework\View\Helper\SecureHtmlRenderer;
@@ -39,7 +40,9 @@ function (string $event, string $listener, string $selector): string {
         $secureRendererMock->method('renderTag')
             ->willReturnCallback(
                 function (string $tag, array $attrs, ?string $content): string {
-                    return "<$tag>$content</$tag>";
+                    $attrs = new DataObject($attrs);
+
+                    return "<$tag {$attrs->serialize()}>$content</$tag>";
                 }
             );
         $escaper = new Escaper();
@@ -51,7 +54,7 @@ function (string $tag, array $attrs, ?string $content): string {
                 'secureRenderer' => $secureRendererMock
             ]
         );
-        $this->_model->setForm(new \Magento\Framework\DataObject());
+        $this->_model->setForm(new DataObject());
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php
index a5c7d899086de..2cc07c88cc6df 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php
@@ -10,6 +10,11 @@
 use Magento\Framework\Math\Random;
 use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
+/**
+ * Test Link widget.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class LinkTest extends \PHPUnit\Framework\TestCase
 {
     /**

From 0138a2c7c4b74e8060ca259932f32d5aa5629c9d Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Wed, 25 Mar 2020 11:23:02 -0500
Subject: [PATCH 0105/1718] MC-24063: [2.4.x Port] Implement CSP

---
 .../Wishlist/view/adminhtml/layout/customer_index_wishlist.xml  | 1 +
 .../Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist/Grid.php    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Wishlist/view/adminhtml/layout/customer_index_wishlist.xml b/app/code/Magento/Wishlist/view/adminhtml/layout/customer_index_wishlist.xml
index e364087405ed9..0ee4233029105 100644
--- a/app/code/Magento/Wishlist/view/adminhtml/layout/customer_index_wishlist.xml
+++ b/app/code/Magento/Wishlist/view/adminhtml/layout/customer_index_wishlist.xml
@@ -99,6 +99,7 @@
                                 <item name="caption" xsi:type="string" translate="true">Delete</item>
                                 <item name="url" xsi:type="string">#</item>
                                 <item name="onclick" xsi:type="string">return wishlistControl.removeItem($wishlist_item_id);</item>
+                                <item name="class" xsi:type="string">wishlist-remove-button</item>
                             </item>
                         </argument>
                     </arguments>
diff --git a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist/Grid.php b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist/Grid.php
index c7c75757c585e..541fcacd45b1a 100644
--- a/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist/Grid.php
+++ b/dev/tests/functional/tests/app/Magento/Wishlist/Test/Block/Adminhtml/Customer/Edit/Tab/Wishlist/Grid.php
@@ -41,7 +41,7 @@ class Grid extends \Magento\Backend\Test\Block\Widget\Grid
      *
      * @var string
      */
-    protected $deleteLink = 'a[text()="Delete"]';
+    protected $deleteLink = 'a.wishlist-remove-button';
 
     /**
      * Configure link selector

From 0233a975b7026969fbb93f25ace9cfb1da3effc7 Mon Sep 17 00:00:00 2001
From: Sachin Admane <sadmane@adobe.com>
Date: Wed, 25 Mar 2020 15:13:01 -0500
Subject: [PATCH 0106/1718] MC-22963: Identify and refactor GET requests that
 modify data.

Refactor Tax rate delete class to use POST.
Add integration test.
---
 .../Tax/Block/Adminhtml/Rate/Toolbar/Save.php |  2 +-
 .../Tax/Controller/Adminhtml/Rate/Delete.php  |  3 +-
 .../Tax/Controller/Adminhtml/RateTest.php     | 32 +++++++++++++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php
index 87e9d9e006064..8ba846dc710b2 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Toolbar/Save.php
@@ -133,7 +133,7 @@ protected function _prepareLayout()
                     ) . '\', \'' . $this->getUrl(
                         'tax/*/delete',
                         ['rate' => $rate]
-                    ) . '\')',
+                    ) . '\', {data: {}})',
                     'class' => 'delete'
                 ]
             );
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Delete.php b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Delete.php
index 1c5013c34c6e9..a77216cd3b46a 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Delete.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Delete.php
@@ -8,8 +8,9 @@
 
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 
-class Delete extends \Magento\Tax\Controller\Adminhtml\Rate
+class Delete extends \Magento\Tax\Controller\Adminhtml\Rate implements HttpPostActionInterface
 {
     /**
      * Delete Rate and Data
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Controller/Adminhtml/RateTest.php b/dev/tests/integration/testsuite/Magento/Tax/Controller/Adminhtml/RateTest.php
index ae5f81817ddbf..ddf5b10af1639 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Controller/Adminhtml/RateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Controller/Adminhtml/RateTest.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Tax\Controller\Adminhtml;
 
+use Magento\Framework\App\Request\Http as HttpRequest;
+
 /**
  * @magentoAppArea adminhtml
  */
@@ -283,4 +285,34 @@ public function testAjaxNonLoadAction()
         $this->assertArrayHasKey('error_message', $result);
         $this->assertTrue(strlen($result['error_message'])>0);
     }
+
+    /** Test Delete Tax Rate
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation enabled
+     * @return void
+     */
+    public function testDeleteRate(): void
+    {
+        $rateId = 2;
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue(['rate' => $rateId]);
+        $this->dispatch('backend/tax/rate/delete');
+        $successMessage = (string)__('You deleted the tax rate.');
+        $this->assertSessionMessages($this->equalTo([$successMessage]));
+    }
+
+    /** Test Delete Incorrect Tax Rate
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation enabled
+     * @return void
+     */
+    public function testDeleteIncorrectRate(): void
+    {
+        $incorrectRateId = 20999;
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setPostValue(['rate' => $incorrectRateId]);
+        $this->dispatch('backend/tax/rate/delete');
+        $errorMessage = (string)_("We can't delete this rate because of an incorrect rate ID.");
+        $this->assertSessionMessages($this->equalTo([$errorMessage]));
+    }
 }

From 6b0b28eb889ed264a44f3f8de1e4ba4a70ada7cd Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Wed, 25 Mar 2020 16:30:16 -0500
Subject: [PATCH 0107/1718] MC-24063: [2.4.x Port] Implement CSP

---
 .../Magento/Backend/Block/Widget/Button.php   |  7 +--
 .../Block/Widget/Button/SplitButton.php       | 12 +----
 .../Widget/Grid/Column/Renderer/Action.php    |  2 +-
 .../Widget/Grid/Column/Renderer/Button.php    |  8 ++-
 .../Magento/Ui/Component/Control/Button.php   | 33 ++----------
 .../Ui/Component/Control/SplitButton.php      | 12 +----
 .../View/Helper/SecureHtmlRendererTest.php    | 50 +++++++++++++++++++
 .../Data/Form/Element/AbstractElement.php     | 12 +----
 .../Data/Form/Element/Editablemultiselect.php | 12 +----
 .../Framework/Data/Form/Element/Editor.php    | 24 +--------
 .../Data/Form/Element/Multiselect.php         | 12 +----
 .../Framework/Data/Form/Element/Radios.php    | 12 +----
 .../Framework/Data/Form/Element/Select.php    | 12 +----
 .../Framework/View/Element/Html/Link.php      |  2 +-
 .../View/Helper/SecureHtmlRenderer.php        | 45 +++++++++++++++++
 15 files changed, 115 insertions(+), 140 deletions(-)

diff --git a/app/code/Magento/Backend/Block/Widget/Button.php b/app/code/Magento/Backend/Block/Widget/Button.php
index 7aa7a7a36056e..cc3629d1c70a9 100644
--- a/app/code/Magento/Backend/Block/Widget/Button.php
+++ b/app/code/Magento/Backend/Block/Widget/Button.php
@@ -189,12 +189,7 @@ protected function _beforeToHtml()
             );
         }
         if ($this->getStyle()) {
-            $afterHtml .= $this->secureRenderer->renderTag(
-                'style',
-                [],
-                $this->generateStyle(),
-                false
-            );
+            $afterHtml .= $this->secureRenderer->renderStyleAsTag($this->getStyle(), "#{$this->getId()}");
         }
         $this->setAfterHtml($afterHtml);
 
diff --git a/app/code/Magento/Backend/Block/Widget/Button/SplitButton.php b/app/code/Magento/Backend/Block/Widget/Button/SplitButton.php
index a458097751698..0ca9d2e0449c4 100644
--- a/app/code/Magento/Backend/Block/Widget/Button/SplitButton.php
+++ b/app/code/Magento/Backend/Block/Widget/Button/SplitButton.php
@@ -307,17 +307,7 @@ protected function _beforeToHtml()
                 $afterHtml .= $this->secureRenderer->renderEventListenerAsTag('onclick', $option['onclick'], "#$id");
             }
             if (!empty($option['style'])) {
-                $afterHtml .= $this->secureRenderer->renderTag(
-                    'style',
-                    [],
-                    <<<style
-                    #$id {
-                        {$option['style']}
-                    }
-style
-                    ,
-                    false
-                );
+                $afterHtml .= $this->secureRenderer->renderStyleAsTag($option['style'], "#$id");
             }
         }
         $this->setOptions($options);
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php
index 5cae7b838a5af..c12b0c0e11b7b 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php
@@ -143,7 +143,7 @@ protected function _toLinkHtml($action, \Magento\Framework\DataObject $row)
             $html .= $this->secureHtmlRenderer->renderEventListenerAsTag('onclick', $onclick, "#{$action['id']}");
         }
         if ($style) {
-            $html .= $this->secureHtmlRenderer->renderTag('style', [], "#{$action['id']} { {$style} }", false);
+            $html .= $this->secureHtmlRenderer->renderStyleAsTag($style, "#{$action['id']}");
         }
 
         return $html;
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button.php b/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button.php
index 66718d981e84e..608ea5f012e67 100644
--- a/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button.php
+++ b/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button.php
@@ -231,11 +231,9 @@ private function renderSpecialAttributes(array $attributes): string
 
         $html = '';
         if (isset($attributes['style'])) {
-            $html = $this->secureRenderer->renderTag(
-                'style',
-                [],
-                "[button-renderer-hook-id='$hookId'] { {$attributes['style']} }",
-                false
+            $html .= $this->secureRenderer->renderStyleAsTag(
+                $attributes['style'],
+                "[button-renderer-hook-id='$hookId']"
             );
         }
         foreach ($this->_getValidAttributes() as $attr) {
diff --git a/app/code/Magento/Ui/Component/Control/Button.php b/app/code/Magento/Ui/Component/Control/Button.php
index 7875713059cf7..3d9b4206b2a7b 100644
--- a/app/code/Magento/Ui/Component/Control/Button.php
+++ b/app/code/Magento/Ui/Component/Control/Button.php
@@ -194,23 +194,10 @@ public function getAfterHtml(): ?string
         $afterHtml = $this->getData('after_html');
         $buttonId = $this->getData('ui_button_widget_hook_id');
         if ($handler = $this->getOnClick()) {
-            $functionName = 'OnClickHandler' . $this->random->getRandomString(32);
-            $afterHtml .= $this->secureRenderer->renderTag(
-                'script',
-                ['type' => 'text/javascript'],
-                <<<script
-                    function {$functionName} () {
-                            {$handler};
-                    }
-                    let button{$buttonId} = document.querySelector("*[ui-button-widget-hook-id='$buttonId']");
-                    if (button{$buttonId}) {
-                        button{$buttonId}.onclick = function (e) {
-                            {$functionName}.apply(e.target);
-                        };
-                    }
-script
-                ,
-                false
+            $afterHtml .= $this->secureRenderer->renderEventListenerAsTag(
+                'onclick',
+                $handler,
+                "*[ui-button-widget-hook-id='$buttonId']"
             );
         }
         if ($this->getStyle()) {
@@ -218,17 +205,7 @@ function {$functionName} () {
             if ($this->getId()) {
                 $selector = "#{$this->getId()}";
             }
-            $afterHtml .= $this->secureRenderer->renderTag(
-                'style',
-                [],
-                <<<style
-                     {$selector} {
-                         {$this->getStyle()}
-                     }
-style
-                ,
-                false
-            );
+            $afterHtml .= $this->secureRenderer->renderStyleAsTag($this->getStyle(), $selector);
         }
 
         return $afterHtml;
diff --git a/app/code/Magento/Ui/Component/Control/SplitButton.php b/app/code/Magento/Ui/Component/Control/SplitButton.php
index 615627918e412..3d7f902ad0bf6 100644
--- a/app/code/Magento/Ui/Component/Control/SplitButton.php
+++ b/app/code/Magento/Ui/Component/Control/SplitButton.php
@@ -302,17 +302,7 @@ public function getAfterHtml(): ?string
                 $afterHtml .= $this->secureRenderer->renderEventListenerAsTag('onclick', $option['onclick'], "#$id");
             }
             if (!empty($option['style'])) {
-                $afterHtml .= $this->secureRenderer->renderTag(
-                    'style',
-                    [],
-                    <<<style
-                    #$id {
-                        {$option['style']}
-                    }
-style
-                    ,
-                    false
-                );
+                $this->secureRenderer->renderStyleAsTag($option['style'], "#$id");
             }
         }
 
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTest.php
index aae50ec02857d..7cee8d5b33fc7 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTest.php
@@ -88,4 +88,54 @@ public function testRenderEventHandler(): void
             $this->helper->renderEventListener('onclick', 'alert(this.parent.getAttribute("data-title"))')
         );
     }
+
+    /**
+     * Test rendering JS listeners as separate tags.
+     *
+     * @return void
+     */
+    public function testRenderEventListenerAsTag(): void
+    {
+        $html = $this->helper->renderEventListenerAsTag('onclick', 'alert(1)', '#id');
+        $this->assertContains('alert(1)', $html);
+        $this->assertContains('#id', $html);
+        $this->assertContains('click', $html);
+    }
+
+    /**
+     * Check handler validation
+     *
+     * @return void
+     * @expectedException \InvalidArgumentException
+     */
+    public function testInvalidEventListener(): void
+    {
+        $this->helper->renderEventListenerAsTag('nonevent', '', '');
+    }
+
+    /**
+     * Test rendering "style" attribute as separate tag.
+     *
+     * @return void
+     */
+    public function testRenderStyleAsTag(): void
+    {
+        $html = $this->helper->renderStyleAsTag('display: none; font-size: 3em;', '#id');
+        $this->assertContains('#id', $html);
+        $this->assertContains('display', $html);
+        $this->assertContains('none', $html);
+        $this->assertContains('fontSize', $html);
+        $this->assertContains('3em', $html);
+    }
+
+    /**
+     * Check style validation
+     *
+     * @return void
+     * @expectedException \InvalidArgumentException
+     */
+    public function testInvalidStyle(): void
+    {
+        $this->helper->renderStyleAsTag('display;', '');
+    }
 }
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
index 0df5f2a9ca52f..08c94a9c310d0 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
@@ -442,17 +442,7 @@ private function generateAttributesSubstitute(): string
             if ($id = $this->getHtmlId()) {
                 $selector = "#{$id}";
             }
-            $html .= $this->secureRenderer->renderTag(
-                'style',
-                [],
-                <<<style
-                    {$selector} {
-                        {$this->getStyle()}
-                    }
-style
-                ,
-                false
-            );
+            $html .= $this->secureRenderer->renderStyleAsTag($this->getStyle(), $selector);
         }
 
         //Rendering each event listener as a separate script tag.
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Editablemultiselect.php b/lib/internal/Magento/Framework/Data/Form/Element/Editablemultiselect.php
index c9e2a16f586dc..7ef5892e54c09 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Editablemultiselect.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Editablemultiselect.php
@@ -160,17 +160,7 @@ protected function _optionToHtml($option, $selected)
 
         $html .= '>' . $this->_escape($option['label']) . '</option>' . "\n";
         if (isset($option['style'])) {
-            $html .= $this->secureRenderer->renderTag(
-                'style',
-                [],
-                <<<style
-                    #$optionId {
-                        {$option['style']}
-                    }
-style
-                ,
-                false
-            );
+            $html .= $this->secureRenderer->renderStyleAsTag($option['style'], "#$optionId");
         }
 
         return $html;
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
index bb0dea4c76088..300056ad61188 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
@@ -428,17 +428,7 @@ protected function _getButtonHtml($data)
             $html .= $this->secureRenderer->renderEventListenerAsTag('onclick', $data['onclick'], "#$id");
         }
         if (isset($data['style'])) {
-            $html .= $this->secureRenderer->renderTag(
-                'style',
-                [],
-                <<<style
-                    #{$id} {
-                        {$data['style']}
-                    }
-style
-                ,
-                false
-            );
+            $html .= $this->secureRenderer->renderStyleAsTag($data['style'], "#$id");
         }
 
         return $html;
@@ -464,17 +454,7 @@ protected function _wrapIntoContainer($html)
                 . $this->getConfig('container_class') . '"' : '')
             . '>' . $html . '</div>';
         if ($this->getConfig('no_display')) {
-            $html .= $this->secureRenderer->renderTag(
-                'style',
-                [],
-                <<<style
-                    #{$id} {
-                        display: none;
-                    }
-style
-                ,
-                false
-            );
+            $html .= $this->secureRenderer->renderStyleAsTag('display: none;', "#$id");
         }
 
         return $html;
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php b/lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php
index dc5462a81627a..275aea9022c8c 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php
@@ -226,17 +226,7 @@ protected function _optionToHtml($option, $selected)
         }
         $html .= '>' . $this->_escape($option['label']) . '</option>' . "\n";
         if (isset($option['style'])) {
-            $html .= $this->secureRenderer->renderTag(
-                'style',
-                [],
-                <<<style
-                    #$optionId {
-                        {$option['style']}
-                    }
-style
-                ,
-                false
-            );
+            $html .= $this->secureRenderer->renderStyleAsTag($option['style'], "#$optionId");
         }
 
         return $html;
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Radios.php b/lib/internal/Magento/Framework/Data/Form/Element/Radios.php
index cb48c3fde4fd9..d7ac0d115a3f2 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Radios.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Radios.php
@@ -107,17 +107,7 @@ protected function _optionToHtml($option, $selected)
         }
 
         if ($option->getStyle()) {
-            $html .= $html .= $this->secureRenderer->renderTag(
-                'style',
-                [],
-                <<<style
-                    #$optionId {
-                        {$option->getStyle()}
-                    }
-style
-                ,
-                false
-            );
+            $html .= $this->secureRenderer->renderStyleAsTag($option->getStyle(), "#$optionId");
         }
         if ($option->getOnclick()) {
             $this->secureRenderer->renderEventListenerAsTag('onclick', $option->getOnclick(), "#$optionId");
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Select.php b/lib/internal/Magento/Framework/Data/Form/Element/Select.php
index b9649206f1ffc..e0a81c49c1577 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Select.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Select.php
@@ -133,17 +133,7 @@ protected function _optionToHtml($option, $selected)
             }
             $html .= '>' . $this->_escape($option['label']) . '</option>' . "\n";
             if (isset($option['style'])) {
-                $html .= $this->secureRenderer->renderTag(
-                    'style',
-                    [],
-                    <<<style
-                    #$optionId {
-                        {$option['style']}
-                    }
-style
-                    ,
-                    false
-                );
+                $html .= $this->secureRenderer->renderStyleAsTag($option['style'], "#$optionId");
             }
         }
         return $html;
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Link.php b/lib/internal/Magento/Framework/View/Element/Html/Link.php
index 8322e904f940e..f92c35ddedd6d 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Link.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Link.php
@@ -172,7 +172,7 @@ private function renderSpecialAttributes(): string
         $html = '';
         $style = $this->getDataUsingMethod('style');
         if ($style) {
-            $html .= $this->secureRenderer->renderTag('style', [], "#$id { $style }", false);
+            $html .= $this->secureRenderer->renderStyleAsTag($style, "#$id");
         }
         foreach ($this->allowedAttributes as $attribute) {
             if (mb_strpos($attribute, 'on') === 0 && $value = $this->getDataUsingMethod($attribute)) {
diff --git a/lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php b/lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php
index 5213e0b35d94d..b23b988d17bc6 100644
--- a/lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php
+++ b/lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php
@@ -8,6 +8,7 @@
 
 namespace Magento\Framework\View\Helper;
 
+use Magento\Framework\Api\SimpleDataObjectConverter;
 use Magento\Framework\Math\Random;
 use Magento\Framework\View\Helper\SecureHtmlRender\EventHandlerData;
 use Magento\Framework\View\Helper\SecureHtmlRender\HtmlRenderer;
@@ -99,6 +100,9 @@ public function renderEventListenerAsTag(
         string $attributeJavascript,
         string $elementSelector
     ): string {
+        if (!$eventName || !$attributeJavascript || !$elementSelector || mb_strpos($eventName, 'on') !== 0) {
+            throw new \InvalidArgumentException('Invalid JS event handler data provided');
+        }
         $eventName = mb_strtolower(mb_substr($eventName, 2));
         $listenerFunction = 'eventListener' .$this->random->getRandomString(32);
         $elementName = 'listenedElement' .$this->random->getRandomString(32);
@@ -114,4 +118,45 @@ function {$listenerFunction} () {
 
         return $this->renderTag('script', ['type' => 'text/javascript'], $script, false);
     }
+
+    /**
+     * Render "style" attribute as a separate tag instead.
+     *
+     * @param string $style
+     * @param string $selector Must resolve to a single node.
+     * @return string
+     */
+    public function renderStyleAsTag(string $style, string $selector): string
+    {
+        $stylePairs = array_filter(explode(';', $style));
+        if (!$stylePairs || !$selector) {
+            throw new \InvalidArgumentException('Invalid style data given');
+        }
+
+        $elementVariable = 'elem' .$this->random->getRandomString(32);
+        /** @var string[] $styles */
+        $stylesAssignments = [];
+        foreach ($stylePairs as $stylePair) {
+            $exploded = explode(':', $stylePair);
+            if (count($exploded) < 2) {
+                throw new \InvalidArgumentException('Invalid CSS given');
+            }
+            $styleAttribute = SimpleDataObjectConverter::snakeCaseToCamelCase(
+                str_replace('-', '_', trim($exploded[0]))
+            );
+            if (count($exploded) > 2) {
+                //For cases when ":" is encountered in the style's value.
+                $exploded[1] = join('', array_slice($exploded, 1));
+            }
+            $styleValue = trim($exploded[1]);
+            $stylesAssignments[] = "$elementVariable.style.$styleAttribute = '$styleValue';";
+        }
+
+        return $this->renderTag(
+            'script',
+            ['type' => 'text/javascript'],
+            "let $elementVariable = document.querySelector('$selector');\n" .join("\n", $stylesAssignments),
+            false
+        );
+    }
 }

From d274261fe08c9a927a38ff44bef697cbe30e80a4 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Thu, 26 Mar 2020 10:07:19 -0500
Subject: [PATCH 0108/1718] MC-24063: [2.4.x Port] Implement CSP

---
 .../Block/Adminhtml/Widget/Grid/Column/Renderer/Button.php    | 4 ++--
 .../Framework/Data/Form/Element/Editablemultiselect.php       | 2 +-
 lib/internal/Magento/Framework/Data/Form/Element/Editor.php   | 4 ++--
 .../Magento/Framework/Data/Form/Element/Multiselect.php       | 2 +-
 lib/internal/Magento/Framework/Data/Form/Element/Select.php   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button.php b/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button.php
index 608ea5f012e67..e5f5870c0154a 100644
--- a/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button.php
+++ b/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button.php
@@ -230,14 +230,14 @@ private function renderSpecialAttributes(array $attributes): string
         }
 
         $html = '';
-        if (isset($attributes['style'])) {
+        if (!empty($attributes['style'])) {
             $html .= $this->secureRenderer->renderStyleAsTag(
                 $attributes['style'],
                 "[button-renderer-hook-id='$hookId']"
             );
         }
         foreach ($this->_getValidAttributes() as $attr) {
-            if (isset($attributes[$attr]) && mb_strpos($attr, 'on') === 0) {
+            if (!empty($attributes[$attr]) && mb_strpos($attr, 'on') === 0) {
                 $html .= $this->secureRenderer->renderEventListenerAsTag(
                     $attr,
                     $attributes[$attr],
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Editablemultiselect.php b/lib/internal/Magento/Framework/Data/Form/Element/Editablemultiselect.php
index 7ef5892e54c09..a5a8ac8b7c52d 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Editablemultiselect.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Editablemultiselect.php
@@ -159,7 +159,7 @@ protected function _optionToHtml($option, $selected)
         }
 
         $html .= '>' . $this->_escape($option['label']) . '</option>' . "\n";
-        if (isset($option['style'])) {
+        if (!empty($option['style'])) {
             $html .= $this->secureRenderer->renderStyleAsTag($option['style'], "#$optionId");
         }
 
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
index 300056ad61188..a00a8549d125d 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
@@ -424,10 +424,10 @@ protected function _getButtonHtml($data)
         $html .= '>';
         $html .= isset($data['title']) ? '<span><span><span>' . $data['title'] . '</span></span></span>' : '';
         $html .= '</button>';
-        if (isset($data['onclick'])) {
+        if (!empty($data['onclick'])) {
             $html .= $this->secureRenderer->renderEventListenerAsTag('onclick', $data['onclick'], "#$id");
         }
-        if (isset($data['style'])) {
+        if (!empty($data['style'])) {
             $html .= $this->secureRenderer->renderStyleAsTag($data['style'], "#$id");
         }
 
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php b/lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php
index 275aea9022c8c..f8984de7a647a 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php
@@ -225,7 +225,7 @@ protected function _optionToHtml($option, $selected)
             $html .= ' selected="selected"';
         }
         $html .= '>' . $this->_escape($option['label']) . '</option>' . "\n";
-        if (isset($option['style'])) {
+        if (!empty($option['style'])) {
             $html .= $this->secureRenderer->renderStyleAsTag($option['style'], "#$optionId");
         }
 
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Select.php b/lib/internal/Magento/Framework/Data/Form/Element/Select.php
index e0a81c49c1577..e50db9271d5a9 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Select.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Select.php
@@ -132,7 +132,7 @@ protected function _optionToHtml($option, $selected)
                 $html .= ' selected="selected"';
             }
             $html .= '>' . $this->_escape($option['label']) . '</option>' . "\n";
-            if (isset($option['style'])) {
+            if (!empty($option['style'])) {
                 $html .= $this->secureRenderer->renderStyleAsTag($option['style'], "#$optionId");
             }
         }

From 77b6ba2a511244dca3903ac5be6147aa7a348c30 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Thu, 26 Mar 2020 11:59:13 -0500
Subject: [PATCH 0109/1718] MC-24063: [2.4.x Port] Implement CSP

---
 .../Framework/View/Helper/SecureHtmlRendererTest.php       | 2 +-
 .../Magento/Framework/View/Helper/SecureHtmlRenderer.php   | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTest.php
index 7cee8d5b33fc7..a4ec5f0170e52 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTest.php
@@ -120,7 +120,7 @@ public function testInvalidEventListener(): void
      */
     public function testRenderStyleAsTag(): void
     {
-        $html = $this->helper->renderStyleAsTag('display: none; font-size: 3em;', '#id');
+        $html = $this->helper->renderStyleAsTag('display: none; font-size: 3em;  ', '#id');
         $this->assertContains('#id', $html);
         $this->assertContains('display', $html);
         $this->assertContains('none', $html);
diff --git a/lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php b/lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php
index b23b988d17bc6..7bd0fa7ae50f3 100644
--- a/lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php
+++ b/lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php
@@ -103,7 +103,6 @@ public function renderEventListenerAsTag(
         if (!$eventName || !$attributeJavascript || !$elementSelector || mb_strpos($eventName, 'on') !== 0) {
             throw new \InvalidArgumentException('Invalid JS event handler data provided');
         }
-        $eventName = mb_strtolower(mb_substr($eventName, 2));
         $listenerFunction = 'eventListener' .$this->random->getRandomString(32);
         $elementName = 'listenedElement' .$this->random->getRandomString(32);
         $script = <<<script
@@ -112,7 +111,7 @@ function {$listenerFunction} () {
             }
             let {$elementName} = document.querySelector("{$elementSelector}");
             if ({$elementName}) {
-                {$elementName}.addEventListener("{$eventName}", (event) => {$listenerFunction}.apply(event.target));
+                {$elementName}.{$eventName} = (event) => {$listenerFunction}.apply(event.target);
             }
 script;
 
@@ -128,7 +127,7 @@ function {$listenerFunction} () {
      */
     public function renderStyleAsTag(string $style, string $selector): string
     {
-        $stylePairs = array_filter(explode(';', $style));
+        $stylePairs = array_filter(array_map('trim', explode(';', $style)));
         if (!$stylePairs || !$selector) {
             throw new \InvalidArgumentException('Invalid style data given');
         }
@@ -137,7 +136,7 @@ public function renderStyleAsTag(string $style, string $selector): string
         /** @var string[] $styles */
         $stylesAssignments = [];
         foreach ($stylePairs as $stylePair) {
-            $exploded = explode(':', $stylePair);
+            $exploded = array_map('trim', explode(':', $stylePair));
             if (count($exploded) < 2) {
                 throw new \InvalidArgumentException('Invalid CSS given');
             }

From 05434a2b5d634ea574eb3baa99d36b6c5f7105af Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Thu, 26 Mar 2020 12:20:18 -0500
Subject: [PATCH 0110/1718] MC-24063: [2.4.x Port] Implement CSP

---
 app/code/Magento/Backend/Block/Widget/Button.php | 16 ----------------
 .../Widget/Grid/Column/Renderer/ButtonTest.php   |  8 +++++++-
 .../Magento/Ui/Component/Control/SplitButton.php |  2 +-
 .../Block/Widget/Button/SplitButtonTest.php      |  5 +++--
 .../Magento/Backend/Block/Widget/ButtonTest.php  |  3 ++-
 .../Magento/Ui/Component/Control/ButtonTest.php  |  5 +++--
 .../Ui/Component/Control/SplitButtonTest.php     |  5 +++--
 .../View/Test/Unit/Element/Html/LinkTest.php     |  8 +++++++-
 8 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/app/code/Magento/Backend/Block/Widget/Button.php b/app/code/Magento/Backend/Block/Widget/Button.php
index cc3629d1c70a9..a06c280a14e90 100644
--- a/app/code/Magento/Backend/Block/Widget/Button.php
+++ b/app/code/Magento/Backend/Block/Widget/Button.php
@@ -155,22 +155,6 @@ protected function _attributesToHtml($attributes)
         return $html;
     }
 
-    /**
-     * Generate "style" tag aimed to replace "style" attribute of the button.
-     *
-     * @return string
-     */
-    private function generateStyle(): string
-    {
-        $style = $this->getStyle();
-
-        return <<<style
-            #{$this->getId()} {
-                $style
-            }
-style;
-    }
-
     /**
      * @inheritDoc
      */
diff --git a/app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Widget/Grid/Column/Renderer/ButtonTest.php b/app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Widget/Grid/Column/Renderer/ButtonTest.php
index 68c412697a463..b3227a4068899 100644
--- a/app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Widget/Grid/Column/Renderer/ButtonTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Widget/Grid/Column/Renderer/ButtonTest.php
@@ -56,6 +56,12 @@ function (string $event, string $js, string $selector): string {
                     return "<script>document.querySelector('$selector').$event = function () { $js };</script>";
                 }
             );
+        $secureRendererMock->method('renderStyleAsTag')
+            ->willReturnCallback(
+                function (string $style, string $selector): string {
+                    return "<style>$selector { $style }</style>";
+                }
+            );
 
         $this->objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->buttonRenderer = $this->objectManagerHelper->getObject(
@@ -94,7 +100,7 @@ public function testRender()
         $actualResult = $this->buttonRenderer->render($object);
         $this->assertEquals(
             '<button id="1" type="bigButton" button-renderer-hook-id="hookrandom">my button</button>'
-            .'<style >[button-renderer-hook-id=\'hookrandom\'] { display: block; }</style>'
+            .'<style>[button-renderer-hook-id=\'hookrandom\'] { display: block; }</style>'
             .'<script>document.querySelector(\'*[button-renderer-hook-id=\'hookrandom\']\').onclick = '
             .'function () { alert(1); };</script>',
             $actualResult
diff --git a/app/code/Magento/Ui/Component/Control/SplitButton.php b/app/code/Magento/Ui/Component/Control/SplitButton.php
index 3d7f902ad0bf6..b430e05cedd2a 100644
--- a/app/code/Magento/Ui/Component/Control/SplitButton.php
+++ b/app/code/Magento/Ui/Component/Control/SplitButton.php
@@ -302,7 +302,7 @@ public function getAfterHtml(): ?string
                 $afterHtml .= $this->secureRenderer->renderEventListenerAsTag('onclick', $option['onclick'], "#$id");
             }
             if (!empty($option['style'])) {
-                $this->secureRenderer->renderStyleAsTag($option['style'], "#$id");
+                $afterHtml .= $this->secureRenderer->renderStyleAsTag($option['style'], "#$id");
             }
         }
 
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Button/SplitButtonTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Button/SplitButtonTest.php
index 911ce8d0e25c2..d35b0802eb2f1 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Button/SplitButtonTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Button/SplitButtonTest.php
@@ -72,7 +72,7 @@ public function testToHtml(): void
                         'title' => 'An option',
                         'label' => 'An option',
                         'onclick' => $onclick = 'console.log("option")',
-                        'style' => $style = 'width: 100px'
+                        'style' => 'width: 100px'
                     ]
                 ]
             ]
@@ -84,6 +84,7 @@ public function testToHtml(): void
         $this->assertNotContains('onclick=', $html);
         $this->assertNotContains('style=', $html);
         $this->assertRegExp('/\<script.*?\>.*?' . preg_quote($onclick) . '.*?\<\/script\>/ims', $html);
-        $this->assertRegExp('/\<style.*?\>.*?' . preg_quote($style) . '.*?\<\/style\>/ims', $html);
+        $this->assertContains('width', $html);
+        $this->assertContains('100px', $html);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/ButtonTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/ButtonTest.php
index d627672fefd96..d0df81e8b2309 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/ButtonTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/ButtonTest.php
@@ -77,6 +77,7 @@ public function testToHtml(): void
         $this->assertNotContains('onclick=', $html);
         $this->assertNotContains('style=', $html);
         $this->assertRegExp('/\<script.*?\>.*?' .preg_quote($block->getOnClick()) .'.*?\<\/script\>/ims', $html);
-        $this->assertRegExp('/\<style.*?\>.*?' .preg_quote($block->getStyle()) .'.*?\<\/style\>/ims', $html);
+        $this->assertContains('height', $html);
+        $this->assertContains('200px', $html);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Ui/Component/Control/ButtonTest.php b/dev/tests/integration/testsuite/Magento/Ui/Component/Control/ButtonTest.php
index 12154f9ff4683..988d9a387add3 100644
--- a/dev/tests/integration/testsuite/Magento/Ui/Component/Control/ButtonTest.php
+++ b/dev/tests/integration/testsuite/Magento/Ui/Component/Control/ButtonTest.php
@@ -67,7 +67,7 @@ public function testToHtml(): void
                 'element_name' => 'some-name',
                 'value' => 'Press a button',
                 'data-style' => 'width: 100px',
-                'style' => $style = 'height: 200px'
+                'style' => 'height: 200px'
             ]
         );
 
@@ -77,6 +77,7 @@ public function testToHtml(): void
         $this->assertNotContains('onclick=', $html);
         $this->assertNotContains('style=', $html);
         $this->assertRegExp('/\<script.*?\>.*?' .preg_quote($onclick) .'.*?\<\/script\>/ims', $html);
-        $this->assertRegExp('/\<style.*?\>.*?' .preg_quote($style) .'.*?\<\/style\>/ims', $html);
+        $this->assertContains('height', $html);
+        $this->assertContains('200px', $html);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Ui/Component/Control/SplitButtonTest.php b/dev/tests/integration/testsuite/Magento/Ui/Component/Control/SplitButtonTest.php
index ccc9723ce2729..e4a2d2809cf08 100644
--- a/dev/tests/integration/testsuite/Magento/Ui/Component/Control/SplitButtonTest.php
+++ b/dev/tests/integration/testsuite/Magento/Ui/Component/Control/SplitButtonTest.php
@@ -74,7 +74,7 @@ public function testToHtml(): void
                         'title' => 'An option',
                         'label' => 'An option',
                         'onclick' => $onclick = 'console.log("option")',
-                        'style' => $style = 'width: 100px'
+                        'style' => 'width: 100px'
                     ]
                 ]
             ]
@@ -86,6 +86,7 @@ public function testToHtml(): void
         $this->assertNotContains('onclick=', $html);
         $this->assertNotContains('style=', $html);
         $this->assertRegExp('/\<script.*?\>.*?' . preg_quote($onclick) . '.*?\<\/script\>/ims', $html);
-        $this->assertRegExp('/\<style.*?\>.*?' . preg_quote($style) . '.*?\<\/style\>/ims', $html);
+        $this->assertContains('width', $html);
+        $this->assertContains('100px', $html);
     }
 }
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php
index 2cc07c88cc6df..cbbcfc1c3ac6d 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php
@@ -108,6 +108,12 @@ function (string $event, string $js, string $selector): string {
                     return "<script>document.querySelector('$selector').$event = function () { $js };</script>";
                 }
             );
+        $secureRendererMock->method('renderStyleAsTag')
+            ->willReturnCallback(
+                function (string $style, string $selector): string {
+                    return "<style>$selector { $style }</style>";
+                }
+            );
 
         /** @var \Magento\Framework\View\Element\Html\Link $linkWithAttributes */
         $this->link = $this->objectManager->getObject(
@@ -145,7 +151,7 @@ public function testLinkHtml(): void
         $html = $this->link->toHtml();
         $this->assertEquals(
             '<li><a href="http://site.com/link.html" id="idrandom" ></a></li>'
-            .'<style >#idrandom { display: block; }</style>'
+            .'<style>#idrandom { display: block; }</style>'
             .'<script>document.querySelector(\'#idrandom\').onclick = function () { alert("clicked"); };</script>',
             $html
         );

From bf17a5acfce2ed6ee55a49649c9dad2a78c48818 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Thu, 26 Mar 2020 14:47:07 -0500
Subject: [PATCH 0111/1718] MC-24063: [2.4.x Port] Implement CSP

---
 .../Test/Mftf/Section/AdminEncryptionKeyChangeFormSection.xml  | 2 +-
 .../Magento/Framework/View/Helper/SecureHtmlRenderer.php       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/EncryptionKey/Test/Mftf/Section/AdminEncryptionKeyChangeFormSection.xml b/app/code/Magento/EncryptionKey/Test/Mftf/Section/AdminEncryptionKeyChangeFormSection.xml
index 7ce37af60fd7f..b0bf115915c2d 100644
--- a/app/code/Magento/EncryptionKey/Test/Mftf/Section/AdminEncryptionKeyChangeFormSection.xml
+++ b/app/code/Magento/EncryptionKey/Test/Mftf/Section/AdminEncryptionKeyChangeFormSection.xml
@@ -10,7 +10,7 @@
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminEncryptionKeyChangeFormSection">
         <element name="autoGenerate" type="select" selector="#generate_random"/>
-        <element name="cryptKey" type="input" selector="#crypt_key"/>
+        <element name="cryptKey" type="input" selector="input#crypt_key"/>
         <element name="changeEncryptionKey" type="button" selector=".page-actions-buttons #save" timeout="10"/>
     </section>
 </sections>
diff --git a/lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php b/lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php
index 7bd0fa7ae50f3..53ae5ab684142 100644
--- a/lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php
+++ b/lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php
@@ -154,7 +154,8 @@ public function renderStyleAsTag(string $style, string $selector): string
         return $this->renderTag(
             'script',
             ['type' => 'text/javascript'],
-            "let $elementVariable = document.querySelector('$selector');\n" .join("\n", $stylesAssignments),
+            "let $elementVariable = document.querySelector('$selector');\n"
+            ."if ($elementVariable) {\n" .join("\n", $stylesAssignments) ." }",
             false
         );
     }

From 9565c44b1ca474825731b4ed265724238540f6ad Mon Sep 17 00:00:00 2001
From: Franciszek Wawrzak <f.wawrzak@macopedia.com>
Date: Fri, 27 Mar 2020 23:55:28 +0100
Subject: [PATCH 0112/1718] improve exception handling in Layout render

---
 lib/internal/Magento/Framework/View/Layout.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/View/Layout.php b/lib/internal/Magento/Framework/View/Layout.php
index a622006f32a1e..02dbd5e005535 100644
--- a/lib/internal/Magento/Framework/View/Layout.php
+++ b/lib/internal/Magento/Framework/View/Layout.php
@@ -545,8 +545,7 @@ public function renderNonCachedElement($name)
             if ($this->appState->getMode() === AppState::MODE_DEVELOPER) {
                 throw $e;
             }
-            $message = ($e instanceof LocalizedException) ? $e->getLogMessage() : $e->getMessage();
-            $this->logger->critical($message);
+            $this->logger->critical($e);
         }
         return $result;
     }

From a4c74d8fd1cb4a67faee123607dab819bea54f04 Mon Sep 17 00:00:00 2001
From: Rudolf Vince <rudolf@mediotype.com>
Date: Mon, 30 Mar 2020 10:32:44 +0200
Subject: [PATCH 0113/1718] Implement ActionInterface for Wishlist/Shared

---
 .../Wishlist/Controller/Shared/Allcart.php    | 49 ++++++++++++-------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/app/code/Magento/Wishlist/Controller/Shared/Allcart.php b/app/code/Magento/Wishlist/Controller/Shared/Allcart.php
index 6300b14dcf515..8d160d270a6f0 100644
--- a/app/code/Magento/Wishlist/Controller/Shared/Allcart.php
+++ b/app/code/Magento/Wishlist/Controller/Shared/Allcart.php
@@ -3,55 +3,68 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Wishlist\Controller\Shared;
 
-use Magento\Framework\App\Action\Context;
-use Magento\Wishlist\Model\ItemCarrier;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Controller\Result\Forward;
+use Magento\Framework\Controller\Result\Redirect;
+use Magento\Wishlist\Model\ItemCarrier;
 
-class Allcart extends \Magento\Framework\App\Action\Action
+class Allcart  implements HttpGetActionInterface
 {
+    /**
+     * @var ItemCarrier
+     */
+    private $itemCarrier;
+
     /**
      * @var WishlistProvider
      */
-    protected $wishlistProvider;
+    private $wishlistProvider;
 
     /**
-     * @var \Magento\Wishlist\Model\ItemCarrier
+     * @var RequestInterface
      */
-    protected $itemCarrier;
+    private $request;
 
     /**
-     * @param Context $context
-     * @param WishlistProvider $wishlistProvider
-     * @param ItemCarrier $itemCarrier
+     * @var ResultFactory
      */
+    private $resultFactory;
+
     public function __construct(
-        Context $context,
-        WishlistProvider $wishlistProvider,
-        ItemCarrier $itemCarrier
+        ItemCarrier $itemCarrier,
+        RequestInterface $request,
+        ResultFactory $resultFactory,
+        WishlistProvider $wishlistProvider
     ) {
-        $this->wishlistProvider = $wishlistProvider;
         $this->itemCarrier = $itemCarrier;
-        parent::__construct($context);
+        $this->request = $request;
+        $this->resultFactory = $resultFactory;
+        $this->wishlistProvider = $wishlistProvider;
     }
 
     /**
      * Add all items from wishlist to shopping cart
      *
-     * @return \Magento\Framework\Controller\ResultInterface
+     * @inheritDoc
      */
     public function execute()
     {
         $wishlist = $this->wishlistProvider->getWishlist();
         if (!$wishlist) {
-            /** @var \Magento\Framework\Controller\Result\Forward $resultForward */
+            /** @var Forward $resultForward */
             $resultForward = $this->resultFactory->create(ResultFactory::TYPE_FORWARD);
             $resultForward->forward('noroute');
             return $resultForward;
         }
-        $redirectUrl = $this->itemCarrier->moveAllToCart($wishlist, $this->getRequest()->getParam('qty'));
-        /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
+        $redirectUrl = $this->itemCarrier->moveAllToCart($wishlist, $this->request->getParam('qty'));
+        /** @var Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         $resultRedirect->setUrl($redirectUrl);
         return $resultRedirect;

From 18e7519bb69cd05bb73a9c0afb8d4948850b9f9a Mon Sep 17 00:00:00 2001
From: Rudolf Vince <rudolf@mediotype.com>
Date: Mon, 30 Mar 2020 10:56:02 +0200
Subject: [PATCH 0114/1718] Unit test for Wishlist/Shared Controller

---
 .../Unit/Controller/Shared/AllcartTest.php    | 72 +++++++++----------
 1 file changed, 33 insertions(+), 39 deletions(-)

diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php
index d5ac5e9485424..4422c13a72e60 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php
@@ -5,82 +5,86 @@
  */
 namespace Magento\Wishlist\Test\Unit\Controller\Shared;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Request\Http;
+use Magento\Framework\Controller\Result\Forward;
+use Magento\Framework\Controller\Result\Redirect;
 use Magento\Framework\Controller\ResultFactory;
-
-class AllcartTest extends \PHPUnit\Framework\TestCase
+use Magento\Wishlist\Controller\Shared\Allcart;
+use Magento\Wishlist\Controller\Shared\WishlistProvider;
+use Magento\Wishlist\Model\ItemCarrier;
+use Magento\Wishlist\Model\Wishlist;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class AllcartTest extends TestCase
 {
     /**
-     * @var \Magento\Wishlist\Controller\Shared\Allcart
+     * @var Allcart
      */
     protected $allcartController;
 
     /**
-     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
-     */
-    protected $objectManagerHelper;
-
-    /**
-     * @var \Magento\Framework\App\Action\Context
+     * @var Context
      */
     protected $context;
 
     /**
-     * @var \Magento\Wishlist\Controller\Shared\WishlistProvider|\PHPUnit\Framework\MockObject\MockObject
+     * @var WishlistProvider|MockObject
      */
     protected $wishlistProviderMock;
 
     /**
-     * @var \Magento\Wishlist\Model\ItemCarrier|\PHPUnit\Framework\MockObject\MockObject
+     * @var ItemCarrier|MockObject
      */
     protected $itemCarrierMock;
 
     /**
-     * @var \Magento\Wishlist\Model\Wishlist|\PHPUnit\Framework\MockObject\MockObject
+     * @var Wishlist|MockObject
      */
     protected $wishlistMock;
 
     /**
-     * @var \Magento\Framework\App\Request\Http|\PHPUnit\Framework\MockObject\MockObject
+     * @var Http|MockObject
      */
     protected $requestMock;
 
     /**
-     * @var \Magento\Framework\Controller\ResultFactory|\PHPUnit\Framework\MockObject\MockObject
+     * @var ResultFactory|MockObject
      */
     protected $resultFactoryMock;
 
     /**
-     * @var \Magento\Framework\Controller\Result\Redirect|\PHPUnit\Framework\MockObject\MockObject
+     * @var Redirect|MockObject
      */
     protected $resultRedirectMock;
 
     /**
-     * @var \Magento\Framework\Controller\Result\Forward|\PHPUnit\Framework\MockObject\MockObject
+     * @var Forward|MockObject
      */
     protected $resultForwardMock;
 
     protected function setUp()
     {
-        $this->wishlistProviderMock = $this->getMockBuilder(\Magento\Wishlist\Controller\Shared\WishlistProvider::class)
+        $this->wishlistProviderMock = $this->getMockBuilder(WishlistProvider::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->itemCarrierMock = $this->getMockBuilder(\Magento\Wishlist\Model\ItemCarrier::class)
+        $this->itemCarrierMock = $this->getMockBuilder(ItemCarrier::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->wishlistMock = $this->getMockBuilder(\Magento\Wishlist\Model\Wishlist::class)
+        $this->wishlistMock = $this->getMockBuilder(Wishlist::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\Request\Http::class)
+        $this->requestMock = $this->getMockBuilder(Http::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->resultFactoryMock = $this->getMockBuilder(\Magento\Framework\Controller\ResultFactory::class)
+        $this->resultFactoryMock = $this->getMockBuilder(ResultFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->resultRedirectMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
+        $this->resultRedirectMock = $this->getMockBuilder(Redirect::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->resultForwardMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Forward::class)
+        $this->resultForwardMock = $this->getMockBuilder(Forward::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -93,21 +97,11 @@ protected function setUp()
                 ]
             );
 
-        $this->objectManagerHelper = new ObjectManagerHelper($this);
-        $this->context = $this->objectManagerHelper->getObject(
-            \Magento\Framework\App\Action\Context::class,
-            [
-                'request' => $this->requestMock,
-                'resultFactory' => $this->resultFactoryMock
-            ]
-        );
-        $this->allcartController = $this->objectManagerHelper->getObject(
-            \Magento\Wishlist\Controller\Shared\Allcart::class,
-            [
-                'context' => $this->context,
-                'wishlistProvider' => $this->wishlistProviderMock,
-                'itemCarrier' => $this->itemCarrierMock
-            ]
+        $this->allcartController = new Allcart(
+            $this->itemCarrierMock,
+            $this->requestMock,
+            $this->resultFactoryMock,
+            $this->wishlistProviderMock
         );
     }
 

From a002bf27f2a680bde1d13f82fb867a8bbb65a372 Mon Sep 17 00:00:00 2001
From: Rudolf Vince <rudolf@mediotype.com>
Date: Mon, 30 Mar 2020 11:05:56 +0200
Subject: [PATCH 0115/1718] PSR2 linted

---
 app/code/Magento/Wishlist/Controller/Shared/Allcart.php         | 2 +-
 .../Wishlist/Test/Unit/Controller/Shared/AllcartTest.php        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Wishlist/Controller/Shared/Allcart.php b/app/code/Magento/Wishlist/Controller/Shared/Allcart.php
index 8d160d270a6f0..89c1b88d9568e 100644
--- a/app/code/Magento/Wishlist/Controller/Shared/Allcart.php
+++ b/app/code/Magento/Wishlist/Controller/Shared/Allcart.php
@@ -15,7 +15,7 @@
 use Magento\Framework\Controller\Result\Redirect;
 use Magento\Wishlist\Model\ItemCarrier;
 
-class Allcart  implements HttpGetActionInterface
+class Allcart implements HttpGetActionInterface
 {
     /**
      * @var ItemCarrier
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php
index 4422c13a72e60..9b931290befbd 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Wishlist\Test\Unit\Controller\Shared;
 
 use Magento\Framework\App\Action\Context;

From df2c759db53ef19d4f1d37bfdca6a02a76fde27c Mon Sep 17 00:00:00 2001
From: Rudolf Vince <rudolf@mediotype.com>
Date: Mon, 30 Mar 2020 12:32:26 +0200
Subject: [PATCH 0116/1718] Implement ActionInterface for Wishlist/Shared/Cart
 + unit test

---
 .../Wishlist/Controller/Shared/Cart.php       | 64 ++++++++++-----
 .../Test/Unit/Controller/Shared/CartTest.php  | 81 ++++++++++---------
 2 files changed, 88 insertions(+), 57 deletions(-)

diff --git a/app/code/Magento/Wishlist/Controller/Shared/Cart.php b/app/code/Magento/Wishlist/Controller/Shared/Cart.php
index 38f100602972a..77dc52e05f077 100644
--- a/app/code/Magento/Wishlist/Controller/Shared/Cart.php
+++ b/app/code/Magento/Wishlist/Controller/Shared/Cart.php
@@ -3,16 +3,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Wishlist\Controller\Shared;
 
 use Magento\Catalog\Model\Product\Exception as ProductException;
 use Magento\Checkout\Helper\Cart as CartHelper;
 use Magento\Checkout\Model\Cart as CustomerCart;
-use Magento\Framework\App\Action\Context as ActionContext;
 use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Controller\Result\Redirect as ResultRedirect;
 use Magento\Framework\Escaper;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Message\ManagerInterface as MessageManagerInterface;
+use Magento\Framework\App\Response\RedirectInterface;
 use Magento\Wishlist\Model\Item;
 use Magento\Wishlist\Model\Item\OptionFactory;
 use Magento\Wishlist\Model\ItemFactory;
@@ -23,55 +29,73 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Cart extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface
+class Cart implements HttpGetActionInterface
 {
     /**
      * @var CustomerCart
      */
-    protected $cart;
+    private $cart;
 
     /**
      * @var OptionFactory
      */
-    protected $optionFactory;
+    private $optionFactory;
 
     /**
      * @var ItemFactory
      */
-    protected $itemFactory;
+    private $itemFactory;
 
     /**
      * @var CartHelper
      */
-    protected $cartHelper;
+    private $cartHelper;
 
     /**
      * @var Escaper
      */
-    protected $escaper;
+    private $escaper;
+
+    /**
+     * @var RequestInterface
+     */
+    private $request;
+
+    /**
+     * @var RedirectInterface
+     */
+    private $redirect;
+
+    /**
+     * @var MessageManagerInterface
+     */
+    private $messageManager;
 
     /**
-     * @param ActionContext $context
-     * @param CustomerCart $cart
-     * @param OptionFactory $optionFactory
-     * @param ItemFactory $itemFactory
-     * @param CartHelper $cartHelper
-     * @param Escaper $escaper
+     * @var ResultFactory
      */
+    private $resultFactory;
+
     public function __construct(
-        ActionContext $context,
         CustomerCart $cart,
         OptionFactory $optionFactory,
         ItemFactory $itemFactory,
         CartHelper $cartHelper,
-        Escaper $escaper
+        Escaper $escaper,
+        RequestInterface $request,
+        RedirectInterface $redirect,
+        MessageManagerInterface $messageManager,
+        ResultFactory $resultFactory
     ) {
         $this->cart = $cart;
         $this->optionFactory = $optionFactory;
         $this->itemFactory = $itemFactory;
         $this->cartHelper = $cartHelper;
         $this->escaper = $escaper;
-        parent::__construct($context);
+        $this->request = $request;
+        $this->redirect = $redirect;
+        $this->messageManager = $messageManager;
+        $this->resultFactory = $resultFactory;
     }
 
     /**
@@ -80,17 +104,17 @@ public function __construct(
      * If Product has required options - redirect
      * to product view page with message about needed defined required options
      *
-     * @return \Magento\Framework\Controller\Result\Redirect
+     * @inheritDoc
      */
     public function execute()
     {
-        $itemId = (int)$this->getRequest()->getParam('item');
+        $itemId = (int)$this->request->getParam('item');
 
         /* @var $item Item */
         $item = $this->itemFactory->create()
             ->load($itemId);
 
-        $redirectUrl = $this->_redirect->getRefererUrl();
+        $redirectUrl = $this->redirect->getRefererUrl();
 
         try {
             /** @var OptionCollection $options */
@@ -120,7 +144,7 @@ public function execute()
         } catch (\Exception $e) {
             $this->messageManager->addExceptionMessage($e, __('We can\'t add the item to the cart right now.'));
         }
-        /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
+        /** @var ResultRedirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         $resultRedirect->setUrl($redirectUrl);
         return $resultRedirect;
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php
index eba5666114139..c495ea6651342 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php
@@ -3,9 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Wishlist\Test\Unit\Controller\Shared;
 
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Exception;
 use Magento\Checkout\Helper\Cart as CartHelper;
 use Magento\Checkout\Model\Cart;
 use Magento\Framework\App\Action\Context as ActionContext;
@@ -23,80 +25,82 @@
 use Magento\Wishlist\Model\Item\OptionFactory;
 use Magento\Wishlist\Model\ItemFactory;
 use Magento\Wishlist\Model\ResourceModel\Item\Option\Collection as OptionCollection;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class CartTest extends \PHPUnit\Framework\TestCase
+class CartTest extends TestCase
 {
-    /** @var  SharedCart|\PHPUnit\Framework\MockObject\MockObject */
+    /** @var  SharedCart|MockObject */
     protected $model;
 
-    /** @var  RequestInterface|\PHPUnit\Framework\MockObject\MockObject */
+    /** @var  RequestInterface|MockObject */
     protected $request;
 
-    /** @var  ManagerInterface|\PHPUnit\Framework\MockObject\MockObject */
+    /** @var  ManagerInterface|MockObject */
     protected $messageManager;
 
-    /** @var  ActionContext|\PHPUnit\Framework\MockObject\MockObject */
+    /** @var  ActionContext|MockObject */
     protected $context;
 
-    /** @var  Cart|\PHPUnit\Framework\MockObject\MockObject */
+    /** @var  Cart|MockObject */
     protected $cart;
 
-    /** @var  CartHelper|\PHPUnit\Framework\MockObject\MockObject */
+    /** @var  CartHelper|MockObject */
     protected $cartHelper;
 
-    /** @var  Quote|\PHPUnit\Framework\MockObject\MockObject */
+    /** @var  Quote|MockObject */
     protected $quote;
 
-    /** @var  OptionCollection|\PHPUnit\Framework\MockObject\MockObject */
+    /** @var  OptionCollection|MockObject */
     protected $optionCollection;
 
-    /** @var  OptionFactory|\PHPUnit\Framework\MockObject\MockObject */
+    /** @var  OptionFactory|MockObject */
     protected $optionFactory;
 
-    /** @var  Option|\PHPUnit\Framework\MockObject\MockObject */
+    /** @var  Option|MockObject */
     protected $option;
 
-    /** @var  ItemFactory|\PHPUnit\Framework\MockObject\MockObject */
+    /** @var  ItemFactory|MockObject */
     protected $itemFactory;
 
-    /** @var  Item|\PHPUnit\Framework\MockObject\MockObject */
+    /** @var  Item|MockObject */
     protected $item;
 
-    /** @var  Escaper|\PHPUnit\Framework\MockObject\MockObject */
+    /** @var  Escaper|MockObject */
     protected $escaper;
 
-    /** @var  RedirectInterface|\PHPUnit\Framework\MockObject\MockObject */
+    /** @var  RedirectInterface|MockObject */
     protected $redirect;
 
-    /** @var  ResultFactory|\PHPUnit\Framework\MockObject\MockObject */
+    /** @var  ResultFactory|MockObject */
     protected $resultFactory;
 
-    /** @var  Redirect|\PHPUnit\Framework\MockObject\MockObject */
+    /** @var  Redirect|MockObject */
     protected $resultRedirect;
 
-    /** @var  Product|\PHPUnit\Framework\MockObject\MockObject */
+    /** @var  Product|MockObject */
     protected $product;
 
     protected function setUp()
     {
-        $this->request = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
+        $this->request = $this->getMockBuilder(RequestInterface::class)
             ->getMockForAbstractClass();
 
-        $this->redirect = $this->getMockBuilder(\Magento\Framework\App\Response\RedirectInterface::class)
+        $this->redirect = $this->getMockBuilder(RedirectInterface::class)
             ->getMockForAbstractClass();
 
-        $this->messageManager = $this->getMockBuilder(\Magento\Framework\Message\ManagerInterface::class)
+        $this->messageManager = $this->getMockBuilder(ManagerInterface::class)
             ->getMockForAbstractClass();
 
-        $this->resultRedirect = $this->getMockBuilder(\Magento\Framework\Controller\Result\Redirect::class)
+        $this->resultRedirect = $this->getMockBuilder(Redirect::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->resultFactory = $this->getMockBuilder(\Magento\Framework\Controller\ResultFactory::class)
+        $this->resultFactory = $this->getMockBuilder(ResultFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->resultFactory->expects($this->once())
@@ -104,7 +108,7 @@ protected function setUp()
             ->with(ResultFactory::TYPE_REDIRECT)
             ->willReturn($this->resultRedirect);
 
-        $this->context = $this->getMockBuilder(\Magento\Framework\App\Action\Context::class)
+        $this->context = $this->getMockBuilder(ActionContext::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->context->expects($this->any())
@@ -120,28 +124,28 @@ protected function setUp()
             ->method('getResultFactory')
             ->willReturn($this->resultFactory);
 
-        $this->cart = $this->getMockBuilder(\Magento\Checkout\Model\Cart::class)
+        $this->cart = $this->getMockBuilder(Cart::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->cartHelper = $this->getMockBuilder(\Magento\Checkout\Helper\Cart::class)
+        $this->cartHelper = $this->getMockBuilder(CartHelper::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->quote = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
+        $this->quote = $this->getMockBuilder(Quote::class)
             ->disableOriginalConstructor()
             ->setMethods(['getHasError'])
             ->getMock();
 
         $this->optionCollection = $this->getMockBuilder(
-            \Magento\Wishlist\Model\ResourceModel\Item\Option\Collection::class
+            OptionCollection::class
         )->disableOriginalConstructor()->getMock();
 
-        $this->option = $this->getMockBuilder(\Magento\Wishlist\Model\Item\Option::class)
+        $this->option = $this->getMockBuilder(Option::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->optionFactory = $this->getMockBuilder(\Magento\Wishlist\Model\Item\OptionFactory::class)
+        $this->optionFactory = $this->getMockBuilder(OptionFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
@@ -149,11 +153,11 @@ protected function setUp()
             ->method('create')
             ->willReturn($this->option);
 
-        $this->item = $this->getMockBuilder(\Magento\Wishlist\Model\Item::class)
+        $this->item = $this->getMockBuilder(Item::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->itemFactory = $this->getMockBuilder(\Magento\Wishlist\Model\ItemFactory::class)
+        $this->itemFactory = $this->getMockBuilder(ItemFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
@@ -161,21 +165,24 @@ protected function setUp()
             ->method('create')
             ->willReturn($this->item);
 
-        $this->escaper = $this->getMockBuilder(\Magento\Framework\Escaper::class)
+        $this->escaper = $this->getMockBuilder(Escaper::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->product = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
+        $this->product = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
             ->getMock();
 
         $this->model = new SharedCart(
-            $this->context,
             $this->cart,
             $this->optionFactory,
             $this->itemFactory,
             $this->cartHelper,
-            $this->escaper
+            $this->escaper,
+            $this->request,
+            $this->redirect,
+            $this->messageManager,
+            $this->resultFactory
         );
     }
 
@@ -353,7 +360,7 @@ public function testExecuteProductException()
 
         $this->option->expects($this->once())
             ->method('getCollection')
-            ->willThrowException(new \Magento\Catalog\Model\Product\Exception(__('LocalizedException')));
+            ->willThrowException(new Exception(__('LocalizedException')));
 
         $this->resultRedirect->expects($this->once())
             ->method('setUrl')

From d3021f9c1ceeebc0c560598d0af10cf11567043c Mon Sep 17 00:00:00 2001
From: madhu-ranosys <madhu.rajawat@ranosys.com>
Date: Tue, 31 Mar 2020 19:26:43 +0530
Subject: [PATCH 0117/1718] fix-26191

---
 .../Sales/Block/Adminhtml/Order/Totals.php    |  2 +-
 app/code/Magento/Sales/Model/Order.php        | 23 +++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 app/code/Magento/Sales/Block/Adminhtml/Order/Totals.php
 mode change 100644 => 100755 app/code/Magento/Sales/Model/Order.php

diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Totals.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Totals.php
old mode 100644
new mode 100755
index a9f7bf3516517..e1e6b0b4ada28
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Totals.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Totals.php
@@ -48,7 +48,7 @@ protected function _initTotals()
                 'strong' => true,
                 'value' => $this->getSource()->getTotalDue(),
                 'base_value' => $this->getSource()->getBaseTotalDue(),
-                'label' => __('Total Due'),
+                'label' => $this->getSource()->getTotalDueCancelLabel(),
                 'area' => 'footer',
             ]
         );
diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
old mode 100644
new mode 100755
index 89564f97ccf16..ec70ab9b09b2b
--- a/app/code/Magento/Sales/Model/Order.php
+++ b/app/code/Magento/Sales/Model/Order.php
@@ -1816,6 +1816,29 @@ public function getTotalDue()
         $total = $this->priceCurrency->round($total);
         return max($total, 0);
     }
+    
+    /**
+     * Retrieve order total due or cancel label
+     *
+     * @return float|null
+     */
+    public function getTotalDueCancelLabel() {
+        $itemCancel = true;
+        foreach ($this->getAllItems() as $item) {
+            if ($item->getQtyCanceled() > 0) {
+                $itemCancel = false;
+                break;
+            }
+        }
+        if ($this->isCanceled() || $itemCancel == false) {
+
+            $label = __('Total Cancel');
+        } else {
+
+            $label = __('Total Due');
+        }
+        return $label;
+    }
 
     /**
      * Retrieve order total due value

From c54b8f36bead34315e245bd1a8a516ffd1f6023a Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 1 Apr 2020 19:42:53 +0300
Subject: [PATCH 0118/1718] Validate phone field on checkout page

---
 ...rontOnePageCheckoutPhoneValidationTest.xml | 43 +++++++++++++++++++
 .../frontend/layout/checkout_index_index.xml  |  3 ++
 .../view/base/web/js/lib/validation/rules.js  |  7 +++
 3 files changed, 53 insertions(+)
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutPhoneValidationTest.xml

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutPhoneValidationTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutPhoneValidationTest.xml
new file mode 100644
index 0000000000000..1558b4dc3943c
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutPhoneValidationTest.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="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" />
+        </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, 123-456-7890, +(123)4567890, +1234567890" 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 c33b784fcd20c..01596fd64896b 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,6 +223,9 @@
                                                                         </item>
                                                                     </item>
                                                                     <item name="telephone" xsi:type="array">
+                                                                        <item name="validation" xsi:type="array">
+                                                                            <item name="validate-phone" 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/Ui/view/base/web/js/lib/validation/rules.js b/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js
index f9778ad8d688c..f53c27d22349c 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js
@@ -432,6 +432,13 @@ define([
             },
             $.mage.__('Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.')
         ],
+        'validate-phone': [
+            function (value) {
+                return utils.isEmptyNoTrim(value) ||
+                    /^[+]*[(]{0,1}[0-9]{1,4}[)]{0,1}[-\s\./0-9]*$/.test(value);
+            },
+            $.mage.__('Please enter a valid phone number. For example (123) 456-7890, 123-456-7890, +(123)4567890, +1234567890')
+        ],
         'validate-fax': [
             function (value) {
                 return utils.isEmptyNoTrim(value) || /^(\()?\d{3}(\))?(-|\s)?\d{3}(-|\s)\d{4}$/.test(value);

From f738e4fc5d670c4f871ee142629b923233b46254 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Wed, 1 Apr 2020 15:48:15 -0500
Subject: [PATCH 0119/1718] MC-24063: [2.4.x Port] Implement CSP

---
 app/code/Magento/Backend/Block/Widget/Button.php           | 3 ++-
 .../Magento/Backend/Block/Widget/Button/SplitButton.php    | 7 +++----
 app/code/Magento/Ui/Component/Control/Button.php           | 2 +-
 app/code/Magento/Ui/Component/Control/SplitButton.php      | 7 +++----
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Backend/Block/Widget/Button.php b/app/code/Magento/Backend/Block/Widget/Button.php
index a06c280a14e90..6dba39bdee7e8 100644
--- a/app/code/Magento/Backend/Block/Widget/Button.php
+++ b/app/code/Magento/Backend/Block/Widget/Button.php
@@ -162,7 +162,8 @@ protected function _beforeToHtml()
     {
         parent::_beforeToHtml();
 
-        $this->setData('backend_button_widget_hook_id', $buttonId = 'buttonId' .$this->random->getRandomString(32));
+        $buttonId = 'buttonId' .$this->random->getRandomString(32);
+        $this->setData('backend_button_widget_hook_id', $buttonId);
 
         $afterHtml = $this->getAfterHtml();
         if ($this->getOnClick()) {
diff --git a/app/code/Magento/Backend/Block/Widget/Button/SplitButton.php b/app/code/Magento/Backend/Block/Widget/Button/SplitButton.php
index 0ca9d2e0449c4..611668cb20f24 100644
--- a/app/code/Magento/Backend/Block/Widget/Button/SplitButton.php
+++ b/app/code/Magento/Backend/Block/Widget/Button/SplitButton.php
@@ -232,17 +232,16 @@ protected function _getDataAttributes($data, &$attributes)
     }
 
     /**
-     * Set and return "id" attribute value for an option.
+     * Retrieve "id" attribute value for an option.
      *
      * @param array $option
      * @return string
      */
-    private function identifyOption(array &$option): string
+    private function identifyOption(array $option): string
     {
         $id = isset($option['id'])
             ? $option['id']
             : (isset($option['id_attribute']) ? $option['id_attribute'] : 'optId' .$this->random->getRandomString(32));
-        $option['id_attribute'] = $id;
 
         return $this->getId() .'-' .$id;
     }
@@ -302,7 +301,7 @@ protected function _beforeToHtml()
         /** @var array|null $options */
         $options = $this->getOptions() ?? [];
         foreach ($options as &$option) {
-            $id = $this->identifyOption($option);
+            $id = $option['id_attribute'] = $this->identifyOption($option);
             if (!empty($option['onclick'])) {
                 $afterHtml .= $this->secureRenderer->renderEventListenerAsTag('onclick', $option['onclick'], "#$id");
             }
diff --git a/app/code/Magento/Ui/Component/Control/Button.php b/app/code/Magento/Ui/Component/Control/Button.php
index 3d9b4206b2a7b..0944b9d17a7e5 100644
--- a/app/code/Magento/Ui/Component/Control/Button.php
+++ b/app/code/Magento/Ui/Component/Control/Button.php
@@ -111,7 +111,7 @@ public function getAttributesHtml()
     public function getOnClick()
     {
         if ($this->hasData('on_click')) {
-            return $this->getData('on_click');//No onclick
+            return $this->getData('on_click');
         } else {
             $url = $this->hasData('url') ? $this->getData('url') : $this->getUrl();
             if (!empty($url)) {
diff --git a/app/code/Magento/Ui/Component/Control/SplitButton.php b/app/code/Magento/Ui/Component/Control/SplitButton.php
index b430e05cedd2a..7d7b6a902c79f 100644
--- a/app/code/Magento/Ui/Component/Control/SplitButton.php
+++ b/app/code/Magento/Ui/Component/Control/SplitButton.php
@@ -200,17 +200,16 @@ public function getOptionAttributesHtml($key, $option)
     }
 
     /**
-     * Set and return "id" attribute value for an option.
+     * Retrieve "id" attribute value for an option.
      *
      * @param array $option
      * @return string
      */
-    private function identifyOption(array &$option): string
+    private function identifyOption(array $option): string
     {
         $id = isset($option['id'])
             ? $option['id']
             : (isset($option['id_attribute']) ? $option['id_attribute'] : 'topId' .$this->random->getRandomString(32));
-        $option['id_attribute'] = $id;
 
         return $this->getId() .'-' .$id;
     }
@@ -280,7 +279,7 @@ protected function _beforeToHtml()
         /** @var array|null $options */
         $options = $this->getOptions() ?? [];
         foreach ($options as &$option) {
-            $this->identifyOption($option);
+            $option['id_attribute'] = $this->identifyOption($option);
         }
         $this->setOptions($options);
 

From b3d0090b0d51285162c40cbae02a5e6f63e0a107 Mon Sep 17 00:00:00 2001
From: Serhii Voloshkov <serhii.voloshkov@transoftgroup.com>
Date: Thu, 2 Apr 2020 11:11:03 +0300
Subject: [PATCH 0120/1718] MC-31491: Export file controller improvement

---
 .../Adminhtml/Export/File/Delete.php          | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Delete.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Delete.php
index 0b96895db84fa..937197fb0e046 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Delete.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Delete.php
@@ -10,15 +10,12 @@
 use Magento\Backend\App\Action;
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Exception\FileSystemException;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\ValidatorException;
 use Magento\ImportExport\Controller\Adminhtml\Export as ExportController;
 use Magento\Framework\Filesystem;
-use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\Filesystem\Directory\WriteFactory;
-use Magento\Backend\Model\View\Result\Redirect;
 
 /**
  * Controller that delete file by name.
@@ -61,7 +58,6 @@ public function __construct(
      * Controller basic method implementation.
      *
      * @return ResultInterface
-     * @throws LocalizedException
      */
     public function execute()
     {
@@ -79,17 +75,18 @@ public function execute()
                 $directoryWrite->delete($directoryWrite->getAbsolutePath($fileName));
                 $this->messageManager->addSuccessMessage(__('File %1 deleted', $fileName));
             } catch (ValidatorException $exception) {
-                $this->messageManager->addErrorMessage(__('%1 is not a valid file', $fileName));
+                $this->messageManager->addErrorMessage(
+                    __('Sorry, but the data is invalid or the file is not uploaded.')
+                );
             } catch (FileSystemException $exception) {
-                $this->messageManager->addErrorMessage(__('%1 is not a valid file', $fileName));
-                throw new LocalizedException(__('Sorry, but the data is invalid or the file is not uploaded.'));
+                $this->messageManager->addErrorMessage(
+                    __('Sorry, but the data is invalid or the file is not uploaded.')
+                );
             }
-
-            return $resultRedirect;
         } catch (FileSystemException $exception) {
-            $this->messageManager->addErrorMessage(__('%1 is not a valid file', $fileName));
-            throw new LocalizedException(__('There are no export file with such name %1', $fileName));
-            return $resultRedirect;
+            $this->messageManager->addErrorMessage(__('There are no export file with such name %1', $fileName));
         }
+
+        return $resultRedirect;
     }
 }

From d09d8a133e9e97029c86d3036b1189e77b653c6e Mon Sep 17 00:00:00 2001
From: Serhii Voloshkov <serhii.voloshkov@transoftgroup.com>
Date: Thu, 2 Apr 2020 12:27:15 +0300
Subject: [PATCH 0121/1718] MC-31491: Export file controller improvement

---
 .../Adminhtml/Export/File/Delete.php          |   4 +-
 .../Adminhtml/Export/File/DeleteTest.php      | 198 ------------------
 2 files changed, 2 insertions(+), 200 deletions(-)
 delete mode 100644 app/code/Magento/ImportExport/Test/Unit/Controller/Adminhtml/Export/File/DeleteTest.php

diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Delete.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Delete.php
index 937197fb0e046..e31f36e627a66 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Delete.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/File/Delete.php
@@ -33,9 +33,9 @@ class Delete extends ExportController implements HttpPostActionInterface
     private $filesystem;
 
     /**
-     * @var DriverInterface
+     * @var WriteFactory
      */
-    private $file;
+    private $writeFactory;
 
     /**
      * Delete constructor.
diff --git a/app/code/Magento/ImportExport/Test/Unit/Controller/Adminhtml/Export/File/DeleteTest.php b/app/code/Magento/ImportExport/Test/Unit/Controller/Adminhtml/Export/File/DeleteTest.php
deleted file mode 100644
index ef40651f95be9..0000000000000
--- a/app/code/Magento/ImportExport/Test/Unit/Controller/Adminhtml/Export/File/DeleteTest.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\ImportExport\Test\Unit\Controller\Adminhtml\Export\File;
-
-use Magento\Backend\App\Action\Context;
-use Magento\Backend\Model\View\Result\Redirect;
-use Magento\Framework\App\Request\Http;
-use Magento\Framework\Controller\Result\Raw;
-use Magento\Framework\Controller\Result\RedirectFactory;
-use Magento\Framework\Filesystem;
-use Magento\Framework\Filesystem\Directory\ReadInterface;
-use Magento\Framework\Filesystem\DriverInterface;
-use Magento\Framework\Message\ManagerInterface;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\ImportExport\Controller\Adminhtml\Export\File\Delete;
-use PHPUnit\Framework\MockObject\MockObject;
-use PHPUnit\Framework\TestCase;
-
-/**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
-class DeleteTest extends TestCase
-{
-    /**
-     * @var Context|MockObject
-     */
-    private $contextMock;
-
-    /**
-     * @var ObjectManagerHelper
-     */
-    private $objectManagerHelper;
-
-    /**
-     * @var Http|MockObject
-     */
-    private $requestMock;
-
-    /**
-     * @var Raw|MockObject
-     */
-    private $redirectMock;
-
-    /**
-     * @var RedirectFactory|MockObject
-     */
-    private $resultRedirectFactoryMock;
-
-    /**
-     * @var Filesystem|MockObject
-     */
-    private $fileSystemMock;
-
-    /**
-     * @var DriverInterface|MockObject
-     */
-    private $fileMock;
-
-    /**
-     * @var Delete|MockObject
-     */
-    private $deleteControllerMock;
-
-    /**
-     * @var ManagerInterface|MockObject
-     */
-    private $messageManagerMock;
-
-    /**
-     * @var ReadInterface|MockObject
-     */
-    private $directoryMock;
-
-    /**
-     * Set up
-     */
-    protected function setUp()
-    {
-        $this->requestMock = $this->getMockBuilder(Http::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->fileSystemMock = $this->getMockBuilder(Filesystem::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->directoryMock = $this->getMockBuilder(ReadInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->fileMock = $this->getMockBuilder(DriverInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->messageManagerMock = $this->getMockBuilder(ManagerInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->contextMock = $this->createPartialMock(
-            Context::class,
-            ['getRequest', 'getResultRedirectFactory', 'getMessageManager']
-        );
-
-        $this->redirectMock = $this->createPartialMock(Redirect::class, ['setPath']);
-
-        $this->resultRedirectFactoryMock = $this->createPartialMock(
-            RedirectFactory::class,
-            ['create']
-        );
-        $this->resultRedirectFactoryMock->expects($this->any())->method('create')->willReturn($this->redirectMock);
-        $this->contextMock->expects($this->any())->method('getRequest')->willReturn($this->requestMock);
-        $this->contextMock->expects($this->any())
-            ->method('getResultRedirectFactory')
-            ->willReturn($this->resultRedirectFactoryMock);
-
-        $this->contextMock->expects($this->any())
-            ->method('getMessageManager')
-            ->willReturn($this->messageManagerMock);
-
-        $this->objectManagerHelper = new ObjectManagerHelper($this);
-        $this->deleteControllerMock = $this->objectManagerHelper->getObject(
-            Delete::class,
-            [
-                'context' => $this->contextMock,
-                'filesystem' => $this->fileSystemMock,
-                'file' => $this->fileMock
-            ]
-        );
-    }
-
-    /**
-     * Tests download controller with different file names in request.
-     */
-    public function testExecuteSuccess()
-    {
-        $this->requestMock->method('getParam')
-            ->with('filename')
-            ->willReturn('sampleFile');
-
-        $this->fileSystemMock->expects($this->once())
-            ->method('getDirectoryRead')
-            ->will($this->returnValue($this->directoryMock));
-        $this->directoryMock->expects($this->once())->method('isFile')->willReturn(true);
-        $this->fileMock->expects($this->once())->method('deleteFile')->willReturn(true);
-        $this->messageManagerMock->expects($this->once())->method('addSuccessMessage');
-
-        $this->deleteControllerMock->execute();
-    }
-
-    /**
-     * Tests download controller with different file names in request.
-     */
-    public function testExecuteFileDoesntExists()
-    {
-        $this->requestMock->method('getParam')
-            ->with('filename')
-            ->willReturn('sampleFile');
-
-        $this->fileSystemMock->expects($this->once())
-            ->method('getDirectoryRead')
-            ->will($this->returnValue($this->directoryMock));
-        $this->directoryMock->expects($this->once())->method('isFile')->willReturn(false);
-        $this->messageManagerMock->expects($this->once())->method('addErrorMessage');
-
-        $this->deleteControllerMock->execute();
-    }
-
-    /**
-     * Test execute() with invalid file name
-     * @param string $requestFilename
-     * @dataProvider invalidFileDataProvider
-     */
-    public function testExecuteInvalidFileName($requestFilename)
-    {
-        $this->requestMock->method('getParam')->with('filename')->willReturn($requestFilename);
-        $this->messageManagerMock->expects($this->once())->method('addErrorMessage');
-
-        $this->deleteControllerMock->execute();
-    }
-
-    /**
-     * Data provider to test possible invalid filenames
-     * @return array
-     */
-    public function invalidFileDataProvider()
-    {
-        return [
-            'Relative file name' => ['../.htaccess'],
-            'Empty file name' => [''],
-            'Null file name' => [null],
-        ];
-    }
-}

From eba218b8981e2693e2300c12501c7ff7daa7eb3b Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Thu, 2 Apr 2020 13:35:45 -0500
Subject: [PATCH 0122/1718] MC-24063: [2.4.x Port] Implement CSP

---
 .../Block/Widget/Button/SplitButton.php       | 10 +++----
 .../templates/widget/button/split.phtml       |  2 +-
 .../Model/Collector/ControllerCollector.php   | 11 ++++++--
 .../PrioritizedPolicyCollectorInterface.php   | 23 ++++++++++++++++
 .../Csp/Model/CompositePolicyCollector.php    | 11 +++++++-
 app/code/Magento/Csp/etc/di.xml               |  8 +++---
 .../Ui/Component/Control/SplitButton.php      | 10 +++----
 .../Config/Form/Field/YtdStartTest.php        | 27 +++++++++----------
 8 files changed, 70 insertions(+), 32 deletions(-)
 create mode 100644 app/code/Magento/Csp/Model/Collector/PrioritizedPolicyCollectorInterface.php

diff --git a/app/code/Magento/Backend/Block/Widget/Button/SplitButton.php b/app/code/Magento/Backend/Block/Widget/Button/SplitButton.php
index 611668cb20f24..0e3d51dfe3721 100644
--- a/app/code/Magento/Backend/Block/Widget/Button/SplitButton.php
+++ b/app/code/Magento/Backend/Block/Widget/Button/SplitButton.php
@@ -239,11 +239,11 @@ protected function _getDataAttributes($data, &$attributes)
      */
     private function identifyOption(array $option): string
     {
-        $id = isset($option['id'])
-            ? $option['id']
-            : (isset($option['id_attribute']) ? $option['id_attribute'] : 'optId' .$this->random->getRandomString(32));
-
-        return $this->getId() .'-' .$id;
+        return isset($option['id'])
+            ? $this->getId() .'-' .$option['id']
+            : (isset($option['id_attribute']) ?
+                $option['id_attribute']
+                : $this->getId() .'-optId' .$this->random->getRandomString(32));
     }
 
     /**
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml
index 49b79ddfd7c16..6ebbd4118e7a0 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml
@@ -19,7 +19,7 @@
 
         <?php if (!$block->getDisabled()): ?>
             <ul class="dropdown-menu" <?= /* @noEscape */ $block->getUiId("dropdown-menu") ?>>
-                <?php foreach ($block->getOptions() as $key => &$option): ?>
+                <?php foreach ($block->getOptions() as $key => $option): ?>
                 <li>
                     <span <?= $block->getOptionAttributesHtml($key, $option) ?>>
                         <?= $block->escapeHtml($option['label']) ?>
diff --git a/app/code/Magento/Csp/Model/Collector/ControllerCollector.php b/app/code/Magento/Csp/Model/Collector/ControllerCollector.php
index 0239601951744..aef68a27a7735 100644
--- a/app/code/Magento/Csp/Model/Collector/ControllerCollector.php
+++ b/app/code/Magento/Csp/Model/Collector/ControllerCollector.php
@@ -8,12 +8,11 @@
 namespace Magento\Csp\Model\Collector;
 
 use Magento\Csp\Api\CspAwareActionInterface;
-use Magento\Csp\Api\PolicyCollectorInterface;
 
 /**
  * Asks for route-specific policies from a compatible controller.
  */
-class ControllerCollector implements PolicyCollectorInterface
+class ControllerCollector implements PrioritizedPolicyCollectorInterface
 {
     /**
      * @var CspAwareActionInterface|null
@@ -42,4 +41,12 @@ public function collect(array $defaultPolicies = []): array
 
         return $defaultPolicies;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function getPriority(): int
+    {
+        return -100;
+    }
 }
diff --git a/app/code/Magento/Csp/Model/Collector/PrioritizedPolicyCollectorInterface.php b/app/code/Magento/Csp/Model/Collector/PrioritizedPolicyCollectorInterface.php
new file mode 100644
index 0000000000000..677aa2678f9ae
--- /dev/null
+++ b/app/code/Magento/Csp/Model/Collector/PrioritizedPolicyCollectorInterface.php
@@ -0,0 +1,23 @@
+<?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\PolicyCollectorInterface;
+
+/**
+ * Policy collector that has a priority over other collectors.
+ */
+interface PrioritizedPolicyCollectorInterface extends PolicyCollectorInterface
+{
+    /**
+     * The higher the priority the earlier the collector will be called.
+     *
+     * @return int
+     */
+    public function getPriority(): int;
+}
diff --git a/app/code/Magento/Csp/Model/CompositePolicyCollector.php b/app/code/Magento/Csp/Model/CompositePolicyCollector.php
index 6c1459b791835..e89eba677ff98 100644
--- a/app/code/Magento/Csp/Model/CompositePolicyCollector.php
+++ b/app/code/Magento/Csp/Model/CompositePolicyCollector.php
@@ -10,6 +10,7 @@
 use Magento\Csp\Api\Data\PolicyInterface;
 use Magento\Csp\Api\PolicyCollectorInterface;
 use Magento\Csp\Model\Collector\MergerInterface;
+use Magento\Csp\Model\Collector\PrioritizedPolicyCollectorInterface;
 
 /**
  * Delegates collecting to multiple collectors.
@@ -32,7 +33,15 @@ class CompositePolicyCollector implements PolicyCollectorInterface
      */
     public function __construct(array $collectors, array $mergers)
     {
-        ksort($collectors);
+        usort(
+            $collectors,
+            function (PolicyCollectorInterface $a, PolicyCollectorInterface $b): int {
+                $priorityA = ($a instanceof PrioritizedPolicyCollectorInterface) ? $a->getPriority() : 0;
+                $priorityB = ($b instanceof PrioritizedPolicyCollectorInterface) ? $b->getPriority() : 0;
+
+                return $priorityB <=> $priorityA;
+            }
+        );
         $this->collectors = $collectors;
         $this->mergers = $mergers;
     }
diff --git a/app/code/Magento/Csp/etc/di.xml b/app/code/Magento/Csp/etc/di.xml
index 1de1191390725..c3a8cc8104463 100644
--- a/app/code/Magento/Csp/etc/di.xml
+++ b/app/code/Magento/Csp/etc/di.xml
@@ -18,10 +18,10 @@
     <type name="Magento\Csp\Model\CompositePolicyCollector">
         <arguments>
             <argument name="collectors" xsi:type="array">
-                <item name="1" xsi:type="object">Magento\Csp\Model\Collector\ConfigCollector\Proxy</item>
-                <item name="2" xsi:type="object">Magento\Csp\Model\Collector\CspWhitelistXmlCollector\Proxy</item>
-                <item name="3" xsi:type="object">Magento\Csp\Model\Collector\DynamicCollector\Proxy</item>
-                <item name="100" xsi:type="object">Magento\Csp\Model\Collector\ControllerCollector\Proxy</item>
+                <item name="config" xsi:type="object">Magento\Csp\Model\Collector\ConfigCollector\Proxy</item>
+                <item name="whitelist" xsi:type="object">Magento\Csp\Model\Collector\CspWhitelistXmlCollector\Proxy</item>
+                <item name="dynamic" xsi:type="object">Magento\Csp\Model\Collector\DynamicCollector\Proxy</item>
+                <item name="controller" xsi:type="object">Magento\Csp\Model\Collector\ControllerCollector\Proxy</item>
             </argument>
             <argument name="mergers" xsi:type="array">
                 <item name="fetch" xsi:type="object">Magento\Csp\Model\Collector\FetchPolicyMerger</item>
diff --git a/app/code/Magento/Ui/Component/Control/SplitButton.php b/app/code/Magento/Ui/Component/Control/SplitButton.php
index 7d7b6a902c79f..38ff5e4473b54 100644
--- a/app/code/Magento/Ui/Component/Control/SplitButton.php
+++ b/app/code/Magento/Ui/Component/Control/SplitButton.php
@@ -207,11 +207,11 @@ public function getOptionAttributesHtml($key, $option)
      */
     private function identifyOption(array $option): string
     {
-        $id = isset($option['id'])
-            ? $option['id']
-            : (isset($option['id_attribute']) ? $option['id_attribute'] : 'topId' .$this->random->getRandomString(32));
-
-        return $this->getId() .'-' .$id;
+        return isset($option['id'])
+            ? $this->getId() .'-' .$option['id']
+            : (isset($option['id_attribute']) ?
+                $option['id_attribute']
+                : $this->getId() .'-optId' .$this->random->getRandomString(32));
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Config/Form/Field/YtdStartTest.php b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Config/Form/Field/YtdStartTest.php
index d378b3e7344e1..2ff5b7c6ee3d2 100644
--- a/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Config/Form/Field/YtdStartTest.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Config/Form/Field/YtdStartTest.php
@@ -33,26 +33,25 @@ public function testGetElementHtml(): void
         $this->dispatch('backend/admin/system_config/edit/section/reports/');
         $body = $this->getResponse()->getBody();
 
-        $this->assertContains($this->getOptionsHtml('01'), $body);
+        $this->assertOptionSelected('01', $body);
     }
 
     /**
-     * Options html
+     * Assert that given option is selected.
      *
-     * @param string $selected
-     * @return string
+     * @param string $option Option value.
+     * @param string $content HTML content
+     * @return void
      */
-    private function getOptionsHtml(string $selected): string
+    private function assertOptionSelected(string $option, string $content): void
     {
-        $html = '';
-        foreach ($this->monthNumbers as $number) {
-            $html .= $number === $selected
-                ? '<option value="' . $selected . '" selected="selected">' . $selected . '</option>'
-                : '<option value="' . $number . '">' . $number . '</option>';
-
-            $html .= PHP_EOL;
+        foreach ($this->monthNumbers as $monthNumber) {
+            $regEx = "\<option[^\>]+value\=\\\"$monthNumber\\\"[^\>]*?";
+            if ($monthNumber ===  $option) {
+                $regEx .= 'selected\=\"selected\"[^\>]*?';
+            }
+            $regEx .= "\>$monthNumber\<\/option\>";
+            $this->assertRegExp("#$regEx#", $content);
         }
-
-        return $html;
     }
 }

From b769ae9f2d311fac7a44800e25a6610ef049a6b2 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Thu, 2 Apr 2020 16:59:21 -0500
Subject: [PATCH 0123/1718] MC-24063: [2.4.x Port] Implement CSP

---
 .../Magento/Framework/View/Helper/SecureHtmlRenderer.php  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php b/lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php
index 53ae5ab684142..22e53c5751f86 100644
--- a/lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php
+++ b/lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php
@@ -111,7 +111,13 @@ function {$listenerFunction} () {
             }
             let {$elementName} = document.querySelector("{$elementSelector}");
             if ({$elementName}) {
-                {$elementName}.{$eventName} = (event) => {$listenerFunction}.apply(event.target);
+                {$elementName}.{$eventName} = (event) => {
+                    let targetElement = {$elementName};
+                    if (event && event.target) {
+                        targetElement = event.target;
+                    }
+                    {$listenerFunction}.apply(targetElement);
+                }
             }
 script;
 

From 6633a3cdf9e8b2930f6a4e688ecd0513f16fbbb1 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Thu, 2 Apr 2020 17:46:06 -0500
Subject: [PATCH 0124/1718] MC-24063: [2.4.x Port] Implement CSP

---
 .../Mftf/ActionGroup/AssertAdminItemOrderedErrorActionGroup.xml | 2 +-
 .../Test/Mftf/Section/AdminOrderFormItemsOrderedSection.xml     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertAdminItemOrderedErrorActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertAdminItemOrderedErrorActionGroup.xml
index a2f35b9c5fca8..6526c28d6d3e1 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertAdminItemOrderedErrorActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertAdminItemOrderedErrorActionGroup.xml
@@ -16,6 +16,6 @@
             <argument name="messageType" defaultValue="error" type="string"/>
             <argument name="message" defaultValue="The requested qty is not available" type="string"/>
         </arguments>
-        <see userInput="{{message}}" selector="{{AdminOrderFormItemsOrderedSection.productMessage(productName, messageType)}}" stepKey="assertItemErrorVisible"/>
+        <see userInput="{{message}}" selector="{{AdminOrderFormItemsOrderedSection.flashMessage(messageType)}}" stepKey="assertItemErrorVisible"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsOrderedSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsOrderedSection.xml
index 4437f6e6775f2..8a51941292104 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsOrderedSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsOrderedSection.xml
@@ -19,5 +19,6 @@
         <element name="itemsSKU" type="text" selector="(//div[contains(@class, 'product-sku-block')])[{{productNumber}}]" parameterized="true"/>
         <element name="moveProduct" type="select" selector="//td[contains(.,'{{productName}}')]/../..//td//select" parameterized="true"/>
         <element name="productMessage" type="text" selector="//section[@id = 'order-items']//span[text()='{{productName}}']/ancestor::tr/..//div[contains(@class, 'message-{{messageType}}')]" parameterized="true"/>
+        <element name="flashMessage" type="text" selector="//div[@id = 'order-message']//div[contains(@class, 'message-{{messageType}}')]" parameterized="true"/>
     </section>
 </sections>

From cbb2c4c33ccc81f2d1e8178da7710e31156fe06c Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Thu, 2 Apr 2020 18:20:46 -0500
Subject: [PATCH 0125/1718] MC-24063: [2.4.x Port] Implement CSP

---
 .../Model/Collector/ControllerCollector.php   | 11 ++-------
 .../PrioritizedPolicyCollectorInterface.php   | 23 -------------------
 .../Csp/Model/CompositePolicyCollector.php    | 10 --------
 app/code/Magento/Csp/etc/di.xml               |  8 +++----
 4 files changed, 6 insertions(+), 46 deletions(-)
 delete mode 100644 app/code/Magento/Csp/Model/Collector/PrioritizedPolicyCollectorInterface.php

diff --git a/app/code/Magento/Csp/Model/Collector/ControllerCollector.php b/app/code/Magento/Csp/Model/Collector/ControllerCollector.php
index aef68a27a7735..0239601951744 100644
--- a/app/code/Magento/Csp/Model/Collector/ControllerCollector.php
+++ b/app/code/Magento/Csp/Model/Collector/ControllerCollector.php
@@ -8,11 +8,12 @@
 namespace Magento\Csp\Model\Collector;
 
 use Magento\Csp\Api\CspAwareActionInterface;
+use Magento\Csp\Api\PolicyCollectorInterface;
 
 /**
  * Asks for route-specific policies from a compatible controller.
  */
-class ControllerCollector implements PrioritizedPolicyCollectorInterface
+class ControllerCollector implements PolicyCollectorInterface
 {
     /**
      * @var CspAwareActionInterface|null
@@ -41,12 +42,4 @@ public function collect(array $defaultPolicies = []): array
 
         return $defaultPolicies;
     }
-
-    /**
-     * @inheritDoc
-     */
-    public function getPriority(): int
-    {
-        return -100;
-    }
 }
diff --git a/app/code/Magento/Csp/Model/Collector/PrioritizedPolicyCollectorInterface.php b/app/code/Magento/Csp/Model/Collector/PrioritizedPolicyCollectorInterface.php
deleted file mode 100644
index 677aa2678f9ae..0000000000000
--- a/app/code/Magento/Csp/Model/Collector/PrioritizedPolicyCollectorInterface.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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\PolicyCollectorInterface;
-
-/**
- * Policy collector that has a priority over other collectors.
- */
-interface PrioritizedPolicyCollectorInterface extends PolicyCollectorInterface
-{
-    /**
-     * The higher the priority the earlier the collector will be called.
-     *
-     * @return int
-     */
-    public function getPriority(): int;
-}
diff --git a/app/code/Magento/Csp/Model/CompositePolicyCollector.php b/app/code/Magento/Csp/Model/CompositePolicyCollector.php
index e89eba677ff98..d2c35fe993ed5 100644
--- a/app/code/Magento/Csp/Model/CompositePolicyCollector.php
+++ b/app/code/Magento/Csp/Model/CompositePolicyCollector.php
@@ -10,7 +10,6 @@
 use Magento\Csp\Api\Data\PolicyInterface;
 use Magento\Csp\Api\PolicyCollectorInterface;
 use Magento\Csp\Model\Collector\MergerInterface;
-use Magento\Csp\Model\Collector\PrioritizedPolicyCollectorInterface;
 
 /**
  * Delegates collecting to multiple collectors.
@@ -33,15 +32,6 @@ class CompositePolicyCollector implements PolicyCollectorInterface
      */
     public function __construct(array $collectors, array $mergers)
     {
-        usort(
-            $collectors,
-            function (PolicyCollectorInterface $a, PolicyCollectorInterface $b): int {
-                $priorityA = ($a instanceof PrioritizedPolicyCollectorInterface) ? $a->getPriority() : 0;
-                $priorityB = ($b instanceof PrioritizedPolicyCollectorInterface) ? $b->getPriority() : 0;
-
-                return $priorityB <=> $priorityA;
-            }
-        );
         $this->collectors = $collectors;
         $this->mergers = $mergers;
     }
diff --git a/app/code/Magento/Csp/etc/di.xml b/app/code/Magento/Csp/etc/di.xml
index c3a8cc8104463..ac2d73fd01add 100644
--- a/app/code/Magento/Csp/etc/di.xml
+++ b/app/code/Magento/Csp/etc/di.xml
@@ -18,10 +18,10 @@
     <type name="Magento\Csp\Model\CompositePolicyCollector">
         <arguments>
             <argument name="collectors" xsi:type="array">
-                <item name="config" xsi:type="object">Magento\Csp\Model\Collector\ConfigCollector\Proxy</item>
-                <item name="whitelist" xsi:type="object">Magento\Csp\Model\Collector\CspWhitelistXmlCollector\Proxy</item>
-                <item name="dynamic" xsi:type="object">Magento\Csp\Model\Collector\DynamicCollector\Proxy</item>
-                <item name="controller" xsi:type="object">Magento\Csp\Model\Collector\ControllerCollector\Proxy</item>
+                <item name="config" xsi:type="object" sortOrder="1">Magento\Csp\Model\Collector\ConfigCollector\Proxy</item>
+                <item name="whitelist" xsi:type="object" sortOrder="2">Magento\Csp\Model\Collector\CspWhitelistXmlCollector\Proxy</item>
+                <item name="controller" xsi:type="object" sortOrder="100">Magento\Csp\Model\Collector\ControllerCollector\Proxy</item>
+                <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>

From 3b47faf1ffe74d8235943c253146ea089be5115c Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Fri, 3 Apr 2020 13:38:41 -0500
Subject: [PATCH 0126/1718] MC-24063: [2.4.x Port] Implement CSP

---
 .../NoOptionAvailableToConfigureDisabledProductTest.xml   | 8 ++++----
 .../Mftf/Section/AdminInvoicePaymentShippingSection.xml   | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml
index 99d905b6d5467..0a954ce79e770 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml
@@ -156,17 +156,17 @@
         <see userInput="This product is out of stock." stepKey="seeTheErrorMessageDisplayed"/>
         <!-- Select shipping method -->
         <comment userInput="Select shipping method" stepKey="selectShippingMethod"/>
+        <!-- Shipping is not available because we couldn't add the product -->
         <click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
         <waitForPageLoad stepKey="waitForShippingMethods"/>
-        <click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
-        <waitForPageLoad stepKey="waitForShippingMethodLoad"/>
+        <waitForElementVisible selector="{{AdminInvoicePaymentShippingSection.shippingNotAvailable}}" stepKey="checkThatShippingIsUnavailable"/>
         <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
         <waitForPageLoad stepKey="waitForError"/>
-        <!-- Check that error remains -->
+        <!-- Check order could not be created without products -->
         <actionGroup ref="AssertAdminItemOrderedErrorActionGroup" stepKey="assertProductErrorRemains">
             <argument name="productName" value="$createConfigChildProduct2.name$"/>
             <argument name="messageType" value="error"/>
-            <argument name="message" value="This product is out of stock."/>
+            <argument name="message" value="Validation is failed"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicePaymentShippingSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicePaymentShippingSection.xml
index 32e987bea919b..185330f4f7fac 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicePaymentShippingSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicePaymentShippingSection.xml
@@ -19,5 +19,6 @@
         <element name="shippingMethod" type="button" selector="//label[contains(text(), 'Fixed')]" timeout="60"/>
         <element name="fixedPriceShippingMethod" type="button" selector="#s_method_{{methodName}}_{{methodTitle}}"  parameterized="true"/>
         <element name="getShippingMethod" type="button" selector="#order-shipping-method-summary a"/>
+        <element name="shippingNotAvailable" type="button" selector=".order-shipping-method-summary .order-shipping-method-not-available"/>
     </section>
 </sections>

From 55f780673a113b154191111ac3c36fc363d2a63c Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Fri, 3 Apr 2020 15:27:08 -0500
Subject: [PATCH 0127/1718] MC-24063: [2.4.x Port] Implement CSP

---
 .../Mftf/ActionGroup/AssertAdminItemOrderedErrorActionGroup.xml | 2 +-
 .../Test/Mftf/Section/AdminOrderFormItemsOrderedSection.xml     | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertAdminItemOrderedErrorActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertAdminItemOrderedErrorActionGroup.xml
index 6526c28d6d3e1..a2f35b9c5fca8 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertAdminItemOrderedErrorActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertAdminItemOrderedErrorActionGroup.xml
@@ -16,6 +16,6 @@
             <argument name="messageType" defaultValue="error" type="string"/>
             <argument name="message" defaultValue="The requested qty is not available" type="string"/>
         </arguments>
-        <see userInput="{{message}}" selector="{{AdminOrderFormItemsOrderedSection.flashMessage(messageType)}}" stepKey="assertItemErrorVisible"/>
+        <see userInput="{{message}}" selector="{{AdminOrderFormItemsOrderedSection.productMessage(productName, messageType)}}" stepKey="assertItemErrorVisible"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsOrderedSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsOrderedSection.xml
index 8a51941292104..4437f6e6775f2 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsOrderedSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsOrderedSection.xml
@@ -19,6 +19,5 @@
         <element name="itemsSKU" type="text" selector="(//div[contains(@class, 'product-sku-block')])[{{productNumber}}]" parameterized="true"/>
         <element name="moveProduct" type="select" selector="//td[contains(.,'{{productName}}')]/../..//td//select" parameterized="true"/>
         <element name="productMessage" type="text" selector="//section[@id = 'order-items']//span[text()='{{productName}}']/ancestor::tr/..//div[contains(@class, 'message-{{messageType}}')]" parameterized="true"/>
-        <element name="flashMessage" type="text" selector="//div[@id = 'order-message']//div[contains(@class, 'message-{{messageType}}')]" parameterized="true"/>
     </section>
 </sections>

From a24925fd84097adb68645668f53958ec6861ba77 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Fri, 3 Apr 2020 15:31:09 -0500
Subject: [PATCH 0128/1718] MC-24063: [2.4.x Port] Implement CSP

---
 .../NoOptionAvailableToConfigureDisabledProductTest.xml   | 8 ++++----
 .../Mftf/Section/AdminInvoicePaymentShippingSection.xml   | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml
index 0a954ce79e770..99d905b6d5467 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml
@@ -156,17 +156,17 @@
         <see userInput="This product is out of stock." stepKey="seeTheErrorMessageDisplayed"/>
         <!-- Select shipping method -->
         <comment userInput="Select shipping method" stepKey="selectShippingMethod"/>
-        <!-- Shipping is not available because we couldn't add the product -->
         <click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
         <waitForPageLoad stepKey="waitForShippingMethods"/>
-        <waitForElementVisible selector="{{AdminInvoicePaymentShippingSection.shippingNotAvailable}}" stepKey="checkThatShippingIsUnavailable"/>
+        <click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
+        <waitForPageLoad stepKey="waitForShippingMethodLoad"/>
         <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
         <waitForPageLoad stepKey="waitForError"/>
-        <!-- Check order could not be created without products -->
+        <!-- Check that error remains -->
         <actionGroup ref="AssertAdminItemOrderedErrorActionGroup" stepKey="assertProductErrorRemains">
             <argument name="productName" value="$createConfigChildProduct2.name$"/>
             <argument name="messageType" value="error"/>
-            <argument name="message" value="Validation is failed"/>
+            <argument name="message" value="This product is out of stock."/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicePaymentShippingSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicePaymentShippingSection.xml
index 185330f4f7fac..32e987bea919b 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicePaymentShippingSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicePaymentShippingSection.xml
@@ -19,6 +19,5 @@
         <element name="shippingMethod" type="button" selector="//label[contains(text(), 'Fixed')]" timeout="60"/>
         <element name="fixedPriceShippingMethod" type="button" selector="#s_method_{{methodName}}_{{methodTitle}}"  parameterized="true"/>
         <element name="getShippingMethod" type="button" selector="#order-shipping-method-summary a"/>
-        <element name="shippingNotAvailable" type="button" selector=".order-shipping-method-summary .order-shipping-method-not-available"/>
     </section>
 </sections>

From 1e8e825abdc37dbd9ea196867552169a91cad082 Mon Sep 17 00:00:00 2001
From: korostii <24894168+korostii@users.noreply.github.com>
Date: Sat, 4 Apr 2020 14:17:53 +0000
Subject: [PATCH 0129/1718] Fix #27523: throw informative error if the
 requested module does not exist

---
 .../Magento/Developer/Console/Command/GeneratePatchCommand.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Developer/Console/Command/GeneratePatchCommand.php b/app/code/Magento/Developer/Console/Command/GeneratePatchCommand.php
index 78531c7e6c22c..3093c06962080 100644
--- a/app/code/Magento/Developer/Console/Command/GeneratePatchCommand.php
+++ b/app/code/Magento/Developer/Console/Command/GeneratePatchCommand.php
@@ -133,6 +133,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         }
         $type = $input->getOption(self::INPUT_KEY_PATCH_TYPE);
         $modulePath = $this->componentRegistrar->getPath(ComponentRegistrar::MODULE, $moduleName);
+        if (null === $modulePath) {
+            throw new \InvalidArgumentException(sprintf('Cannot find a registered module with name "%s"', $moduleName));
+        }
         $preparedModuleName = str_replace('_', '\\', $moduleName);
         $preparedType = ucfirst($type);
         $patchInterface = sprintf('%sPatchInterface', $preparedType);

From 352a3d62bacff95cd896f1a289b3c15c1b707fa3 Mon Sep 17 00:00:00 2001
From: Ledian Hymetllari <ledian.hymetllari@vaimo.com>
Date: Sat, 4 Apr 2020 16:47:29 +0200
Subject: [PATCH 0130/1718] magento/magneto2#27570: fixed issue withsue with
 store id for cash on delivery method

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

diff --git a/app/code/Magento/Sales/Model/Order/Payment/Info.php b/app/code/Magento/Sales/Model/Order/Payment/Info.php
index 479d96b5842d9..c7641cb861b3e 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Info.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Info.php
@@ -118,6 +118,7 @@ public function getMethodInstance()
                 $instance = $this->paymentData->getMethodInstance(Substitution::CODE);
             }
             $instance->setInfoInstance($this);
+            $instance->setStore($this->getOrder()->getStoreId());
             $this->setMethodInstance($instance);
         }
         return $this->getData('method_instance');

From 1dd5290fcb7b379a9fdad38136a7dd13ae907fa3 Mon Sep 17 00:00:00 2001
From: korostii <24894168+korostii@users.noreply.github.com>
Date: Sat, 4 Apr 2020 15:02:53 +0000
Subject: [PATCH 0131/1718] Fix #27523: add tests for GeneratePatchCommand

---
 .../Command/GeneratePatchCommandTest.php      | 118 ++++++++++++++++++
 1 file changed, 118 insertions(+)
 create mode 100644 app/code/Magento/Developer/Test/Unit/Console/Command/GeneratePatchCommandTest.php

diff --git a/app/code/Magento/Developer/Test/Unit/Console/Command/GeneratePatchCommandTest.php b/app/code/Magento/Developer/Test/Unit/Console/Command/GeneratePatchCommandTest.php
new file mode 100644
index 0000000000000..b9482ce07eb2d
--- /dev/null
+++ b/app/code/Magento/Developer/Test/Unit/Console/Command/GeneratePatchCommandTest.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Developer\Test\Unit\Console\Command;
+
+use Magento\Developer\Console\Command\GeneratePatchCommand;
+use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Filesystem\Directory\ReadFactory;
+use Magento\Framework\Filesystem\Directory\WriteFactory;
+use Magento\Framework\Filesystem\DirectoryList;
+use Symfony\Component\Console\Tester\CommandTester;
+
+class GeneratePatchCommandTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ComponentRegistrar
+     */
+    private $componentRegistrar;
+
+    /**
+     * @var DirectoryList
+     */
+    private $directoryList;
+
+    /**
+     * @var ReadFactory
+     */
+    private $readFactory;
+
+    /**
+     * @var WriteFactory
+     */
+    private $writeFactory;
+
+    /**
+     * @var GeneratePatchCommand
+     */
+    private $command;
+
+    protected function setUp()
+    {
+        $this->componentRegistrar = $this->createMock(ComponentRegistrar::class);
+        $this->directoryList = $this->createMock(DirectoryList::class);
+        $this->readFactory = $this->createMock(ReadFactory::class);
+        $this->writeFactory = $this->createMock(WriteFactory::class);
+
+        $this->command = new GeneratePatchCommand(
+            $this->componentRegistrar,
+            $this->directoryList,
+            $this->readFactory,
+            $this->writeFactory
+        );
+    }
+
+    public function testExecute()
+    {
+        $this->componentRegistrar->expects($this->once())
+            ->method('getPath')
+            ->with('module', 'Vendor_Module')
+            ->willReturn('/long/path/to/Vendor/Module');
+
+        $read = $this->createMock(\Magento\Framework\Filesystem\Directory\Read::class);
+        $read->expects($this->at(0))
+            ->method('readFile')
+            ->with('patch_template.php.dist')
+            ->willReturn('something');
+        $this->readFactory->method('create')->willReturn($read);
+
+        $write = $this->createMock(\Magento\Framework\Filesystem\Directory\Write::class);
+        $write->expects($this->once())->method('writeFile');
+        $this->writeFactory->method('create')->willReturn($write);
+
+        $this->directoryList->expects($this->once())->method('getRoot')->willReturn('/some/path');
+
+        $commandTester = new CommandTester($this->command);
+        $commandTester->execute(
+            [
+                GeneratePatchCommand::MODULE_NAME => 'Vendor_Module',
+                GeneratePatchCommand::INPUT_KEY_PATCH_NAME => 'SomePatch'
+            ]
+        );
+        $this->assertContains('successfully generated', $commandTester->getDisplay());
+    }
+
+    /**
+     * @expectedException \RuntimeException
+     * @expectedExceptionMessage Not enough arguments
+     */
+    public function testWrongParameter()
+    {
+        $commandTester = new CommandTester($this->command);
+        $commandTester->execute([]);
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Cannot find a registered module with name "Fake_Module"
+     */
+    public function testBadModule()
+    {
+        $this->componentRegistrar->expects($this->once())
+            ->method('getPath')
+            ->with('module', 'Fake_Module')
+            ->willReturn(null);
+
+        $commandTester = new CommandTester($this->command);
+        $commandTester->execute(
+            [
+                GeneratePatchCommand::MODULE_NAME => 'Fake_Module',
+                GeneratePatchCommand::INPUT_KEY_PATCH_NAME => 'SomePatch'
+            ]
+        );
+        $this->assertContains('successfully generated', $commandTester->getDisplay());
+    }
+}

From c1d8feffe1c547eacbfbfc031708be51e0787503 Mon Sep 17 00:00:00 2001
From: korostii <24894168+korostii@users.noreply.github.com>
Date: Sat, 4 Apr 2020 19:05:31 +0300
Subject: [PATCH 0132/1718] Fix #27523: fix tests for phpunit8 and code style

---
 .../Command/GeneratePatchCommandTest.php      | 69 ++++++++++---------
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/app/code/Magento/Developer/Test/Unit/Console/Command/GeneratePatchCommandTest.php b/app/code/Magento/Developer/Test/Unit/Console/Command/GeneratePatchCommandTest.php
index b9482ce07eb2d..2047c17c40b15 100644
--- a/app/code/Magento/Developer/Test/Unit/Console/Command/GeneratePatchCommandTest.php
+++ b/app/code/Magento/Developer/Test/Unit/Console/Command/GeneratePatchCommandTest.php
@@ -8,72 +8,76 @@
 
 use Magento\Developer\Console\Command\GeneratePatchCommand;
 use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Filesystem\Directory\Read;
 use Magento\Framework\Filesystem\Directory\ReadFactory;
+use Magento\Framework\Filesystem\Directory\Write;
 use Magento\Framework\Filesystem\Directory\WriteFactory;
 use Magento\Framework\Filesystem\DirectoryList;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Tester\CommandTester;
 
-class GeneratePatchCommandTest extends \PHPUnit\Framework\TestCase
+class GeneratePatchCommandTest extends TestCase
 {
     /**
-     * @var ComponentRegistrar
+     * @var ComponentRegistrar|MockObject
      */
-    private $componentRegistrar;
+    private $componentRegistrarMock;
 
     /**
-     * @var DirectoryList
+     * @var DirectoryList|MockObject
      */
-    private $directoryList;
+    private $directoryListMock;
 
     /**
-     * @var ReadFactory
+     * @var ReadFactory|MockObject
      */
-    private $readFactory;
+    private $readFactoryMock;
 
     /**
-     * @var WriteFactory
+     * @var WriteFactory|MockObject
      */
-    private $writeFactory;
+    private $writeFactoryMock;
 
     /**
-     * @var GeneratePatchCommand
+     * @var GeneratePatchCommand|MockObject
      */
     private $command;
 
     protected function setUp()
     {
-        $this->componentRegistrar = $this->createMock(ComponentRegistrar::class);
-        $this->directoryList = $this->createMock(DirectoryList::class);
-        $this->readFactory = $this->createMock(ReadFactory::class);
-        $this->writeFactory = $this->createMock(WriteFactory::class);
+        $this->componentRegistrarMock = $this->createMock(ComponentRegistrar::class);
+        $this->directoryListMock = $this->createMock(DirectoryList::class);
+        $this->readFactoryMock = $this->createMock(ReadFactory::class);
+        $this->writeFactoryMock = $this->createMock(WriteFactory::class);
 
         $this->command = new GeneratePatchCommand(
-            $this->componentRegistrar,
-            $this->directoryList,
-            $this->readFactory,
-            $this->writeFactory
+            $this->componentRegistrarMock,
+            $this->directoryListMock,
+            $this->readFactoryMock,
+            $this->writeFactoryMock
         );
     }
 
     public function testExecute()
     {
-        $this->componentRegistrar->expects($this->once())
+        $this->componentRegistrarMock->expects($this->once())
             ->method('getPath')
             ->with('module', 'Vendor_Module')
             ->willReturn('/long/path/to/Vendor/Module');
 
-        $read = $this->createMock(\Magento\Framework\Filesystem\Directory\Read::class);
+        $read = $this->createMock(Read::class);
         $read->expects($this->at(0))
             ->method('readFile')
             ->with('patch_template.php.dist')
             ->willReturn('something');
-        $this->readFactory->method('create')->willReturn($read);
+        $this->readFactoryMock->method('create')->willReturn($read);
 
-        $write = $this->createMock(\Magento\Framework\Filesystem\Directory\Write::class);
+        $write = $this->createMock(Write::class);
         $write->expects($this->once())->method('writeFile');
-        $this->writeFactory->method('create')->willReturn($write);
+        $this->writeFactoryMock->method('create')->willReturn($write);
 
-        $this->directoryList->expects($this->once())->method('getRoot')->willReturn('/some/path');
+        $this->directoryListMock->expects($this->once())->method('getRoot')->willReturn('/some/path');
 
         $commandTester = new CommandTester($this->command);
         $commandTester->execute(
@@ -85,27 +89,25 @@ public function testExecute()
         $this->assertContains('successfully generated', $commandTester->getDisplay());
     }
 
-    /**
-     * @expectedException \RuntimeException
-     * @expectedExceptionMessage Not enough arguments
-     */
     public function testWrongParameter()
     {
+        $this->expectExceptionMessage('Not enough arguments');
+        $this->expectException(\RuntimeException::class);
+
         $commandTester = new CommandTester($this->command);
         $commandTester->execute([]);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Cannot find a registered module with name "Fake_Module"
-     */
     public function testBadModule()
     {
-        $this->componentRegistrar->expects($this->once())
+        $this->componentRegistrarMock->expects($this->once())
             ->method('getPath')
             ->with('module', 'Fake_Module')
             ->willReturn(null);
 
+        $this->expectExceptionMessage('Cannot find a registered module with name "Fake_Module"');
+        $this->expectException(\InvalidArgumentException::class);
+
         $commandTester = new CommandTester($this->command);
         $commandTester->execute(
             [
@@ -113,6 +115,5 @@ public function testBadModule()
                 GeneratePatchCommand::INPUT_KEY_PATCH_NAME => 'SomePatch'
             ]
         );
-        $this->assertContains('successfully generated', $commandTester->getDisplay());
     }
 }

From 766a6ab88961289c46e7441be0d26b66f2f0ef75 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Sun, 5 Apr 2020 04:26:09 +0200
Subject: [PATCH 0133/1718] magento/magento2#27357 Fix the test coverage for
 e-mail contents

---
 .../Newsletter/Model/SubscriberTest.php       | 73 ++++++++++++++-----
 1 file changed, 56 insertions(+), 17 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php
index 06c8902f45897..0fdcfdb659b5d 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php
@@ -8,6 +8,7 @@
 namespace Magento\Newsletter\Model;
 
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\Mail\EmailMessage;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Mail\Template\TransportBuilderMock;
@@ -20,13 +21,16 @@
  */
 class SubscriberTest extends TestCase
 {
-    /** @var ObjectManagerInterface  */
+    private const CONFIRMATION_SUBSCRIBE = 'You have been successfully subscribed to our newsletter.';
+    const CONFIRMATION_UNSUBSCRIBE = 'You have been unsubscribed from the newsletter.';
+
+    /** @var ObjectManagerInterface */
     private $objectManager;
 
     /** @var SubscriberFactory */
     private $subscriberFactory;
 
-    /** @var TransportBuilderMock  */
+    /** @var TransportBuilderMock */
     private $transportBuilder;
 
     /** @var CustomerRepositoryInterface */
@@ -87,17 +91,19 @@ public function testUnsubscribeSubscribe(): void
         $subscriber = $this->subscriberFactory->create();
         $this->assertSame($subscriber, $subscriber->loadByCustomerId(1));
         $this->assertEquals($subscriber, $subscriber->unsubscribe());
-        $this->assertContains(
-            'You have been unsubscribed from the newsletter.',
-            $this->transportBuilder->getSentMessage()->getRawMessage()
+        $this->assertConfirmationParagraphExists(
+            self::CONFIRMATION_UNSUBSCRIBE,
+            $this->transportBuilder->getSentMessage()
         );
+
         $this->assertEquals(Subscriber::STATUS_UNSUBSCRIBED, $subscriber->getSubscriberStatus());
         // Subscribe and verify
         $this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $subscriber->subscribe('customer@example.com'));
         $this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $subscriber->getSubscriberStatus());
-        $this->assertContains(
-            'You have been successfully subscribed to our newsletter.',
-            $this->transportBuilder->getSentMessage()->getRawMessage()
+
+        $this->assertConfirmationParagraphExists(
+            self::CONFIRMATION_SUBSCRIBE,
+            $this->transportBuilder->getSentMessage()
         );
     }
 
@@ -114,16 +120,17 @@ public function testUnsubscribeSubscribeByCustomerId(): void
         // Unsubscribe and verify
         $this->assertSame($subscriber, $subscriber->unsubscribeCustomerById(1));
         $this->assertEquals(Subscriber::STATUS_UNSUBSCRIBED, $subscriber->getSubscriberStatus());
-        $this->assertContains(
-            'You have been unsubscribed from the newsletter.',
-            $this->transportBuilder->getSentMessage()->getRawMessage()
+        $this->assertConfirmationParagraphExists(
+            self::CONFIRMATION_UNSUBSCRIBE,
+            $this->transportBuilder->getSentMessage()
         );
+
         // Subscribe and verify
         $this->assertSame($subscriber, $subscriber->subscribeCustomerById(1));
         $this->assertEquals(Subscriber::STATUS_SUBSCRIBED, $subscriber->getSubscriberStatus());
-        $this->assertContains(
-            'You have been successfully subscribed to our newsletter.',
-            $this->transportBuilder->getSentMessage()->getRawMessage()
+        $this->assertConfirmationParagraphExists(
+            self::CONFIRMATION_SUBSCRIBE,
+            $this->transportBuilder->getSentMessage()
         );
     }
 
@@ -141,9 +148,10 @@ public function testConfirm(): void
         $subscriber->subscribe($customerEmail);
         $subscriber->loadByEmail($customerEmail);
         $subscriber->confirm($subscriber->getSubscriberConfirmCode());
-        $this->assertContains(
-            'You have been successfully subscribed to our newsletter.',
-            $this->transportBuilder->getSentMessage()->getRawMessage()
+
+        $this->assertConfirmationParagraphExists(
+            self::CONFIRMATION_SUBSCRIBE,
+            $this->transportBuilder->getSentMessage()
         );
     }
 
@@ -174,4 +182,35 @@ public function testSubscribeUnconfirmedCustomerWithoutSubscription(): void
         $subscriber->subscribeCustomerById($customer->getId());
         $this->assertEquals(Subscriber::STATUS_UNCONFIRMED, $subscriber->getStatus());
     }
+
+    /**
+     * Verifies if Paragraph with specified message is in e-mail
+     *
+     * @param string $expectedMessage
+     * @param EmailMessage $message
+     */
+    private function assertConfirmationParagraphExists(string $expectedMessage, EmailMessage $message): void
+    {
+        $messageContent = $this->getMessageRawContent($message);
+
+        $emailDom = new \DOMDocument();
+        $emailDom->loadHTML($messageContent);
+
+        $emailXpath = new \DOMXPath($emailDom);
+        $greeting = $emailXpath->query("//p[contains(text(), '$expectedMessage')]");
+
+        $this->assertSame(1, $greeting->length, "Cannot find the confirmation paragraph in e-mail contents");
+    }
+
+    /**
+     * Returns raw content of provided message
+     *
+     * @param EmailMessage $message
+     * @return string
+     */
+    private function getMessageRawContent(EmailMessage $message): string
+    {
+        $emailParts = $message->getBody()->getParts();
+        return current($emailParts)->getRawContent();
+    }
 }

From dcd807bd2e8500bd4a53916a5307fa9e26eb4035 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Sun, 5 Apr 2020 04:28:13 +0200
Subject: [PATCH 0134/1718] magento/magento2#27357 Add missing visibility

---
 .../testsuite/Magento/Newsletter/Model/SubscriberTest.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php
index 0fdcfdb659b5d..6715304239eb6 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Model/SubscriberTest.php
@@ -22,7 +22,7 @@
 class SubscriberTest extends TestCase
 {
     private const CONFIRMATION_SUBSCRIBE = 'You have been successfully subscribed to our newsletter.';
-    const CONFIRMATION_UNSUBSCRIBE = 'You have been unsubscribed from the newsletter.';
+    private const CONFIRMATION_UNSUBSCRIBE = 'You have been unsubscribed from the newsletter.';
 
     /** @var ObjectManagerInterface */
     private $objectManager;

From 4dc11772390da80b27fb04bad61afec11a3958ca Mon Sep 17 00:00:00 2001
From: Mateusz Krzeszowiak <mateusz.krzeszowiak@creativestyle.pl>
Date: Sun, 5 Apr 2020 09:30:16 +0200
Subject: [PATCH 0135/1718] Cleanup base theme JavaScript modules

---
 .../blank/Magento_Theme/requirejs-config.js   |  1 -
 .../blank/Magento_Theme/web/js/responsive.js  | 82 -------------------
 .../blank/Magento_Theme/web/js/theme.js       | 12 ---
 lib/web/mage/ie-class-fixer.js                | 20 ++---
 4 files changed, 6 insertions(+), 109 deletions(-)
 delete mode 100644 app/design/frontend/Magento/blank/Magento_Theme/web/js/responsive.js

diff --git a/app/design/frontend/Magento/blank/Magento_Theme/requirejs-config.js b/app/design/frontend/Magento/blank/Magento_Theme/requirejs-config.js
index 87632a6962cc5..cae30c83d95bc 100644
--- a/app/design/frontend/Magento/blank/Magento_Theme/requirejs-config.js
+++ b/app/design/frontend/Magento/blank/Magento_Theme/requirejs-config.js
@@ -5,7 +5,6 @@
 
 var config = {
     deps: [
-        'Magento_Theme/js/responsive',
         'Magento_Theme/js/theme'
     ]
 };
diff --git a/app/design/frontend/Magento/blank/Magento_Theme/web/js/responsive.js b/app/design/frontend/Magento/blank/Magento_Theme/web/js/responsive.js
deleted file mode 100644
index 011417f54ad9a..0000000000000
--- a/app/design/frontend/Magento/blank/Magento_Theme/web/js/responsive.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-define([
-    'jquery',
-    'matchMedia',
-    'mage/tabs',
-    'domReady!'
-], function ($, mediaCheck) {
-    'use strict';
-
-    mediaCheck({
-        media: '(min-width: 768px)',
-
-        /**
-         * Switch to Desktop Version.
-         */
-        entry: function () {
-            var galleryElement;
-
-            (function () {
-
-                var productInfoMain = $('.product-info-main'),
-                    productInfoAdditional = $('#product-info-additional');
-
-                if (productInfoAdditional.length) {
-                    productInfoAdditional.addClass('hidden');
-                    productInfoMain.removeClass('responsive');
-                }
-
-            })();
-
-            galleryElement = $('[data-role=media-gallery]');
-
-            if (galleryElement.length && galleryElement.data('mageZoom')) {
-                galleryElement.zoom('enable');
-            }
-
-            if (galleryElement.length && galleryElement.data('mageGallery')) {
-                galleryElement.gallery('option', 'disableLinks', true);
-                galleryElement.gallery('option', 'showNav', false);
-                galleryElement.gallery('option', 'showThumbs', true);
-            }
-        },
-
-        /**
-         * Switch to Mobile Version.
-         */
-        exit: function () {
-            var galleryElement;
-
-            $('.action.toggle.checkout.progress').on('click.gotoCheckoutProgress', function () {
-                var myWrapper = '#checkout-progress-wrapper';
-
-                scrollTo(myWrapper + ' .title');
-                $(myWrapper + ' .title').addClass('active');
-                $(myWrapper + ' .content').show();
-            });
-
-            $('body').on('click.checkoutProgress', '#checkout-progress-wrapper .title', function () {
-                $(this).toggleClass('active');
-                $('#checkout-progress-wrapper .content').toggle();
-            });
-
-            galleryElement = $('[data-role=media-gallery]');
-
-            setTimeout(function () {
-                if (galleryElement.length && galleryElement.data('mageZoom')) {
-                    galleryElement.zoom('disable');
-                }
-
-                if (galleryElement.length && galleryElement.data('mageGallery')) {
-                    galleryElement.gallery('option', 'disableLinks', false);
-                    galleryElement.gallery('option', 'showNav', true);
-                    galleryElement.gallery('option', 'showThumbs', false);
-                }
-            }, 2000);
-        }
-    });
-});
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 ab8a6063f29a7..e4edd3bd8662c 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
@@ -12,21 +12,9 @@ define([
 ], function ($, keyboardHandler) {
     'use strict';
 
-    if ($('body').hasClass('checkout-cart-index')) {
-        if ($('#co-shipping-method-form .fieldset.rates').length > 0 &&
-            $('#co-shipping-method-form .fieldset.rates :checked').length === 0
-        ) {
-            $('#block-shipping').on('collapsiblecreate', function () {
-                $('#block-shipping').collapsible('forceActivate');
-            });
-        }
-    }
-
     $('.cart-summary').mage('sticky', {
         container: '#maincontent'
     });
 
-    $('.panel.header > .header.links').clone().appendTo('#store\\.links');
-
     keyboardHandler.apply();
 });
diff --git a/lib/web/mage/ie-class-fixer.js b/lib/web/mage/ie-class-fixer.js
index 683090b1d1386..fe07f273a0b58 100644
--- a/lib/web/mage/ie-class-fixer.js
+++ b/lib/web/mage/ie-class-fixer.js
@@ -3,18 +3,10 @@
  * See COPYING.txt for license details.
  */
 
-/* eslint-disable strict */
-(function () {
-    var userAgent = navigator.userAgent, // user agent identifier
-        html = document.documentElement, // html tag
-        gap = ''; // gap between classes
+define([], function () {
+    'use strict';
 
-    if (html.className) { // check if neighbour class exist in html tag
-        gap = ' ';
-    } // end if
-
-    if (userAgent.match(/Trident.*rv[ :]*11\./)) { // Special case for IE11
-        html.className += gap + 'ie11';
-    } // end if
-
-})();
+    if (navigator.userAgent.match(/Trident.*rv[ :]*11\./)) {
+        document.documentElement.classList.add('ie11');
+    }
+});

From 196e42310e77b478df519d7f61b072eca73ac9fb Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Sun, 5 Apr 2020 13:38:33 +0300
Subject: [PATCH 0136/1718] add slash and fix static issue

---
 app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js b/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js
index f53c27d22349c..3cb30e0d21ab1 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js
@@ -435,9 +435,9 @@ define([
         'validate-phone': [
             function (value) {
                 return utils.isEmptyNoTrim(value) ||
-                    /^[+]*[(]{0,1}[0-9]{1,4}[)]{0,1}[-\s\./0-9]*$/.test(value);
+                    /^[+]*[(]{0,1}[0-9]{1,4}[)]{0,1}[-\s\.\/0-9]*$/.test(value);
             },
-            $.mage.__('Please enter a valid phone number. For example (123) 456-7890, 123-456-7890, +(123)4567890, +1234567890')
+            $.mage.__('Please enter a valid phone number. For example (123) 456-7890, 123-456-7890, +(123)4567890, +1234567890')//eslint-disable-line max-len
         ],
         'validate-fax': [
             function (value) {

From 012821a975ff2b1ceafbb1c5aebd2d14449956ef Mon Sep 17 00:00:00 2001
From: madhu-ranosys <madhu.rajawat@ranosys.com>
Date: Mon, 6 Apr 2020 11:24:47 +0530
Subject: [PATCH 0137/1718] [Fixed #26191] Changed total canceled text and
 added translatable strings

---
 app/code/Magento/Sales/Model/Order.php | 2 +-
 app/code/Magento/Sales/i18n/en_US.csv  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 app/code/Magento/Sales/i18n/en_US.csv

diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
index ec70ab9b09b2b..82dc888c10bb3 100755
--- a/app/code/Magento/Sales/Model/Order.php
+++ b/app/code/Magento/Sales/Model/Order.php
@@ -1832,7 +1832,7 @@ public function getTotalDueCancelLabel() {
         }
         if ($this->isCanceled() || $itemCancel == false) {
 
-            $label = __('Total Cancel');
+            $label = __('Total Canceled');
         } else {
 
             $label = __('Total Due');
diff --git a/app/code/Magento/Sales/i18n/en_US.csv b/app/code/Magento/Sales/i18n/en_US.csv
old mode 100644
new mode 100755
index 970df2770a524..5ac50d14fe1f0
--- a/app/code/Magento/Sales/i18n/en_US.csv
+++ b/app/code/Magento/Sales/i18n/en_US.csv
@@ -117,6 +117,7 @@ Capture,Capture
 "Total Paid","Total Paid"
 "Total Refunded","Total Refunded"
 "Total Due","Total Due"
+"Total Canceled","Total Canceled"
 Edit,Edit
 "Are you sure you want to send an order email to customer?","Are you sure you want to send an order email to customer?"
 "This will create an offline refund. To create an online refund, open an invoice and create credit memo for it. Do you want to continue?","This will create an offline refund. To create an online refund, open an invoice and create credit memo for it. Do you want to continue?"

From 8c2159c13e6dbc6a91e3ccaffdab273b04de0876 Mon Sep 17 00:00:00 2001
From: madhu-ranosys <madhu.rajawat@ranosys.com>
Date: Mon, 6 Apr 2020 11:32:38 +0530
Subject: [PATCH 0138/1718] [Fixed #26191] Changed total canceled text and
 added translatable strings

---
 app/code/Magento/Sales/Model/Order.php | 0
 app/code/Magento/Sales/i18n/en_US.csv  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 app/code/Magento/Sales/Model/Order.php
 mode change 100755 => 100644 app/code/Magento/Sales/i18n/en_US.csv

diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
old mode 100755
new mode 100644
diff --git a/app/code/Magento/Sales/i18n/en_US.csv b/app/code/Magento/Sales/i18n/en_US.csv
old mode 100755
new mode 100644

From fda92b13ea4859974b213a0698173a668db836b5 Mon Sep 17 00:00:00 2001
From: Stas Kozar <stas.kozar@transoftgroup.com>
Date: Wed, 8 Apr 2020 19:47:34 +0300
Subject: [PATCH 0139/1718] MC-31149: Improve customer custom attribute value
 validation

---
 .../Magento/Eav/Model/Attribute/Data/File.php | 28 +++++++---
 .../Unit/Model/Attribute/Data/FileTest.php    | 53 +++++++++++++------
 2 files changed, 57 insertions(+), 24 deletions(-)

diff --git a/app/code/Magento/Eav/Model/Attribute/Data/File.php b/app/code/Magento/Eav/Model/Attribute/Data/File.php
index a52c88261166e..4ff1a602ec7ea 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/File.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/File.php
@@ -7,12 +7,14 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Filesystem\Io\File as FileIo;
 
 /**
  * EAV Entity Attribute File Data Model
  *
  * @api
  * @since 100.0.2
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class File extends \Magento\Eav\Model\Attribute\Data\AbstractData
 {
@@ -38,6 +40,11 @@ class File extends \Magento\Eav\Model\Attribute\Data\AbstractData
      */
     protected $_directory;
 
+    /**
+     * @var FileIo
+     */
+    private $fileIo;
+
     /**
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Psr\Log\LoggerInterface $logger
@@ -45,6 +52,7 @@ class File extends \Magento\Eav\Model\Attribute\Data\AbstractData
      * @param \Magento\Framework\Url\EncoderInterface $urlEncoder
      * @param \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension $fileValidator
      * @param \Magento\Framework\Filesystem $filesystem
+     * @param FileIo $fileIo
      * @codeCoverageIgnore
      */
     public function __construct(
@@ -53,12 +61,14 @@ public function __construct(
         \Magento\Framework\Locale\ResolverInterface $localeResolver,
         \Magento\Framework\Url\EncoderInterface $urlEncoder,
         \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension $fileValidator,
-        \Magento\Framework\Filesystem $filesystem
+        \Magento\Framework\Filesystem $filesystem,
+        FileIo $fileIo
     ) {
         parent::__construct($localeDate, $logger, $localeResolver);
         $this->urlEncoder = $urlEncoder;
         $this->_fileValidator = $fileValidator;
         $this->_directory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        $this->fileIo = $fileIo;
     }
 
     /**
@@ -86,7 +96,7 @@ public function extractValue(RequestInterface $request)
                 $mainScope = $this->_requestScope;
                 $scopes = [];
             }
-
+            // phpcs:disable Magento2.Security.Superglobal
             if (!empty($_FILES[$mainScope])) {
                 foreach ($_FILES[$mainScope] as $fileKey => $scopeData) {
                     foreach ($scopes as $scopeName) {
@@ -104,12 +114,15 @@ public function extractValue(RequestInterface $request)
             } else {
                 $value = [];
             }
+            // phpcs:enable Magento2.Security.Superglobal
         } else {
+            // phpcs:disable Magento2.Security.Superglobal
             if (isset($_FILES[$attrCode])) {
                 $value = $_FILES[$attrCode];
             } else {
                 $value = [];
             }
+            // phpcs:enable Magento2.Security.Superglobal
         }
 
         if (!empty($extend['delete'])) {
@@ -129,7 +142,7 @@ protected function _validateByRules($value)
     {
         $label = $this->getAttribute()->getStoreLabel();
         $rules = $this->getAttribute()->getValidateRules();
-        $extension = pathinfo($value['name'], PATHINFO_EXTENSION);
+        $extension = $this->fileIo->getPathInfo($value['name'])[PATHINFO_EXTENSION];
 
         if (!empty($rules['file_extensions'])) {
             $extensions = explode(',', $rules['file_extensions']);
@@ -146,7 +159,9 @@ protected function _validateByRules($value)
             return $this->_fileValidator->getMessages();
         }
 
-        if (!empty($value['tmp_name']) && !file_exists($value['tmp_name'])) {
+        if (!empty($value['tmp_name'])
+            && !$this->_directory->getDriver()->isExists($value['tmp_name'])
+        ) {
             return [__('"%1" is not a valid file.', $label)];
         }
 
@@ -177,8 +192,9 @@ public function validateValue($value)
 
         if (is_string($value) && !empty($value)) {
             $dir = $this->_directory->getAbsolutePath($this->getAttribute()->getEntityType()->getEntityTypeCode());
+            $stat = $this->_directory->getDriver()->stat($dir . $value);
             $fileData = [
-                'size' => filesize($dir . $value),
+                'size' => $stat['size'],
                 'name' => $value,
                 'tmp_name' => $dir . $value
             ];
@@ -209,8 +225,6 @@ public function validateValue($value)
 
         if (count($errors) == 0) {
             return true;
-        } elseif (is_string($value) && !empty($value)) {
-            $this->_directory->delete($dir . $value);
         }
 
         return $errors;
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/FileTest.php b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/FileTest.php
index eca6bd212b2dd..3060aaa60ec3f 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/FileTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/FileTest.php
@@ -6,15 +6,32 @@
 
 namespace Magento\Eav\Test\Unit\Model\Attribute\Data;
 
+use Magento\Eav\Model\Attribute;
+use Magento\Eav\Model\Attribute\Data\File;
+use Magento\Eav\Model\AttributeDataFactory;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Io\File as FileIo;
+use Magento\Framework\Locale\ResolverInterface;
+use Magento\Framework\Model\AbstractModel;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Framework\Url\EncoderInterface;
+use Magento\MediaStorage\Model\File\Validator\NotProtectedExtension;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Test for Magento\Eav\Model\Attribute\Data\File class.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class FileTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Eav\Model\Attribute\Data\File
+     * @var File
      */
     protected $model;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Url\EncoderInterface
+     * @var \PHPUnit_Framework_MockObject_MockObject|EncoderInterface
      */
     protected $urlEncoder;
 
@@ -25,23 +42,25 @@ class FileTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $timezoneMock = $this->createMock(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class);
-        $loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
-        $localeResolverMock = $this->createMock(\Magento\Framework\Locale\ResolverInterface::class);
-        $this->urlEncoder = $this->createMock(\Magento\Framework\Url\EncoderInterface::class);
+        $timezoneMock = $this->createMock(TimezoneInterface::class);
+        $loggerMock = $this->createMock(LoggerInterface::class);
+        $localeResolverMock = $this->createMock(ResolverInterface::class);
+        $this->urlEncoder = $this->createMock(EncoderInterface::class);
         $this->fileValidatorMock = $this->createPartialMock(
-            \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension::class,
+            NotProtectedExtension::class,
             ['isValid', 'getMessages']
         );
-        $filesystemMock = $this->createMock(\Magento\Framework\Filesystem::class);
+        $filesystemMock = $this->createMock(Filesystem::class);
+        $fileIo = $this->createMock(FileIo::class);
 
-        $this->model = new \Magento\Eav\Model\Attribute\Data\File(
+        $this->model = new File(
             $timezoneMock,
             $loggerMock,
             $localeResolverMock,
             $this->urlEncoder,
             $this->fileValidatorMock,
-            $filesystemMock
+            $filesystemMock,
+            $fileIo
         );
     }
 
@@ -56,10 +75,10 @@ protected function setUp()
      */
     public function testOutputValue($format, $value, $callTimes, $expectedResult)
     {
-        $entityMock = $this->createMock(\Magento\Framework\Model\AbstractModel::class);
+        $entityMock = $this->createMock(AbstractModel::class);
         $entityMock->expects($this->once())->method('getData')->will($this->returnValue($value));
 
-        $attributeMock = $this->createMock(\Magento\Eav\Model\Attribute::class);
+        $attributeMock = $this->createMock(Attribute::class);
         $this->urlEncoder->expects($this->exactly($callTimes))
             ->method('encode')
             ->will($this->returnValue('url_key'));
@@ -76,19 +95,19 @@ public function outputValueDataProvider()
     {
         return [
             [
-                'format' => \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_JSON,
+                'format' => AttributeDataFactory::OUTPUT_FORMAT_JSON,
                 'value' => 'value',
                 'callTimes' => 1,
                 'expectedResult' => ['value' => 'value', 'url_key' => 'url_key'],
             ],
             [
-                'format' => \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_TEXT,
+                'format' => AttributeDataFactory::OUTPUT_FORMAT_TEXT,
                 'value' => 'value',
                 'callTimes' => 0,
                 'expectedResult' => ''
             ],
             [
-                'format' => \Magento\Eav\Model\AttributeDataFactory::OUTPUT_FORMAT_TEXT,
+                'format' => AttributeDataFactory::OUTPUT_FORMAT_TEXT,
                 'value' => false,
                 'callTimes' => 0,
                 'expectedResult' => ''
@@ -119,10 +138,10 @@ public function testValidateValue(
         $expectedResult
     ) {
         $this->markTestSkipped('MAGETWO-34751: Test fails after being moved.  Might have hidden dependency.');
-        $entityMock = $this->createMock(\Magento\Framework\Model\AbstractModel::class);
+        $entityMock = $this->createMock(AbstractModel::class);
         $entityMock->expects($this->any())->method('getData')->will($this->returnValue($originalValue));
 
-        $attributeMock = $this->createMock(\Magento\Eav\Model\Attribute::class);
+        $attributeMock = $this->createMock(Attribute::class);
         $attributeMock->expects($this->any())->method('getStoreLabel')->will($this->returnValue('Label'));
         $attributeMock->expects($this->any())->method('getIsRequired')->will($this->returnValue($isRequired));
         $attributeMock->expects($this->any())->method('getIsAjaxRequest')->will($this->returnValue($isAjaxRequest));

From b2a3ad6b105c7cf44e7703fc6ac3afd0466b9b31 Mon Sep 17 00:00:00 2001
From: Stas Kozar <stas.kozar@transoftgroup.com>
Date: Thu, 9 Apr 2020 12:25:49 +0300
Subject: [PATCH 0140/1718] MC-31149: Improve customer custom attribute value
 validation

---
 app/code/Magento/Eav/Model/Attribute/Data/File.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Eav/Model/Attribute/Data/File.php b/app/code/Magento/Eav/Model/Attribute/Data/File.php
index 4ff1a602ec7ea..be237c70ffd93 100644
--- a/app/code/Magento/Eav/Model/Attribute/Data/File.php
+++ b/app/code/Magento/Eav/Model/Attribute/Data/File.php
@@ -142,7 +142,7 @@ protected function _validateByRules($value)
     {
         $label = $this->getAttribute()->getStoreLabel();
         $rules = $this->getAttribute()->getValidateRules();
-        $extension = $this->fileIo->getPathInfo($value['name'])[PATHINFO_EXTENSION];
+        $extension = $this->fileIo->getPathInfo($value['name'])['extension'];
 
         if (!empty($rules['file_extensions'])) {
             $extensions = explode(',', $rules['file_extensions']);

From 9e9bc694ce17e354deebf92033d7681f16fad6c7 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Thu, 9 Apr 2020 15:54:33 +0300
Subject: [PATCH 0141/1718] Fixed disabled guest checkout issue in case of
 downloadable product

Fix static tests
---
 .../IsAllowedGuestCheckoutObserverTest.php    | 53 +++++++++++--------
 1 file changed, 31 insertions(+), 22 deletions(-)

diff --git a/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php b/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
index 69537d6a1f6ac..fa764039e9a96 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
@@ -6,42 +6,51 @@
 
 namespace Magento\Downloadable\Test\Unit\Observer;
 
-use Magento\Downloadable\Observer\IsAllowedGuestCheckoutObserver;
+use Magento\Catalog\Model\Product;
 use Magento\Downloadable\Model\Product\Type;
 use Magento\Downloadable\Model\ResourceModel\Link\Purchased\Item\CollectionFactory;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Downloadable\Observer\IsAllowedGuestCheckoutObserver;
+use Magento\Framework\App\Config;
+use Magento\Framework\DataObject;
+use Magento\Framework\Event;
+use Magento\Framework\Event\Observer;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Item as QuoteItem;
+use Magento\Store\Model\ScopeInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class IsAllowedGuestCheckoutObserverTest extends \PHPUnit\Framework\TestCase
+class IsAllowedGuestCheckoutObserverTest extends TestCase
 {
     /** @var IsAllowedGuestCheckoutObserver */
     private $isAllowedGuestCheckoutObserver;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\App\Config
+     * @var MockObject|Config
      */
     private $scopeConfig;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\DataObject
+     * @var MockObject|DataObject
      */
     private $resultMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Event
+     * @var MockObject|Event
      */
     private $eventMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Event\Observer
+     * @var MockObject|Observer
      */
     private $observerMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\DataObject
+     * @var MockObject|DataObject
      */
     private $storeMock;
 
@@ -51,32 +60,32 @@ class IsAllowedGuestCheckoutObserverTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp()
     {
-        $this->scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config::class)
+        $this->scopeConfig = $this->getMockBuilder(Config::class)
             ->disableOriginalConstructor()
             ->setMethods(['isSetFlag', 'getValue'])
             ->getMock();
 
-        $this->resultMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
+        $this->resultMock = $this->getMockBuilder(DataObject::class)
             ->disableOriginalConstructor()
             ->setMethods(['setIsAllowed'])
             ->getMock();
 
-        $this->eventMock = $this->getMockBuilder(\Magento\Framework\Event::class)
+        $this->eventMock = $this->getMockBuilder(Event::class)
             ->disableOriginalConstructor()
             ->setMethods(['getStore', 'getResult', 'getQuote', 'getOrder'])
             ->getMock();
 
-        $this->observerMock = $this->getMockBuilder(\Magento\Framework\Event\Observer::class)
+        $this->observerMock = $this->getMockBuilder(Observer::class)
             ->disableOriginalConstructor()
             ->setMethods(['getEvent'])
             ->getMock();
 
-        $this->storeMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
+        $this->storeMock = $this->getMockBuilder(DataObject::class)
             ->disableOriginalConstructor()
             ->getMock();
 
         $this->isAllowedGuestCheckoutObserver = (new ObjectManagerHelper($this))->getObject(
-            \Magento\Downloadable\Observer\IsAllowedGuestCheckoutObserver::class,
+            IsAllowedGuestCheckoutObserver::class,
             [
                 'scopeConfig' => $this->scopeConfig,
             ]
@@ -98,7 +107,7 @@ public function testIsAllowedGuestCheckoutConfigSetToTrue($productType, $isAllow
                 ->with(false);
         }
 
-        $product = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
+        $product = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
             ->setMethods(['getTypeId'])
             ->getMock();
@@ -107,7 +116,7 @@ public function testIsAllowedGuestCheckoutConfigSetToTrue($productType, $isAllow
             ->method('getTypeId')
             ->willReturn($productType);
 
-        $item = $this->getMockBuilder(\Magento\Quote\Model\Quote\Item::class)
+        $item = $this->getMockBuilder(QuoteItem::class)
             ->disableOriginalConstructor()
             ->setMethods(['getProduct'])
             ->getMock();
@@ -116,7 +125,7 @@ public function testIsAllowedGuestCheckoutConfigSetToTrue($productType, $isAllow
             ->method('getProduct')
             ->willReturn($product);
 
-        $quote = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
+        $quote = $this->getMockBuilder(Quote::class)
             ->disableOriginalConstructor()
             ->setMethods(['getAllItems'])
             ->getMock();
@@ -151,7 +160,7 @@ public function testIsAllowedGuestCheckoutConfigSetToTrue($productType, $isAllow
             ->will($this->returnValue($this->eventMock));
 
         $this->assertInstanceOf(
-            \Magento\Downloadable\Observer\IsAllowedGuestCheckoutObserver::class,
+            IsAllowedGuestCheckoutObserver::class,
             $this->isAllowedGuestCheckoutObserver->execute($this->observerMock)
         );
     }
@@ -171,7 +180,7 @@ public function testIsAllowedGuestCheckoutConfigSetToFalse()
     {
         $storeCode = 1;
 
-        $product = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
+        $product = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
             ->setMethods(['getTypeId'])
             ->getMock();
@@ -180,7 +189,7 @@ public function testIsAllowedGuestCheckoutConfigSetToFalse()
             ->method('getTypeId')
             ->willReturn(Type::TYPE_DOWNLOADABLE);
 
-        $item = $this->getMockBuilder(\Magento\Quote\Model\Quote\Item::class)
+        $item = $this->getMockBuilder(QuoteItem::class)
             ->disableOriginalConstructor()
             ->setMethods(['getProduct'])
             ->getMock();
@@ -189,7 +198,7 @@ public function testIsAllowedGuestCheckoutConfigSetToFalse()
             ->method('getProduct')
             ->willReturn($product);
 
-        $quote = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
+        $quote = $this->getMockBuilder(Quote::class)
             ->disableOriginalConstructor()
             ->setMethods(['getAllItems'])
             ->getMock();
@@ -224,7 +233,7 @@ public function testIsAllowedGuestCheckoutConfigSetToFalse()
             ->will($this->returnValue($this->eventMock));
 
         $this->assertInstanceOf(
-            \Magento\Downloadable\Observer\IsAllowedGuestCheckoutObserver::class,
+            IsAllowedGuestCheckoutObserver::class,
             $this->isAllowedGuestCheckoutObserver->execute($this->observerMock)
         );
     }

From 4380ff6042714e74bc61d6549935543f225c1fb6 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Thu, 9 Apr 2020 15:56:08 +0300
Subject: [PATCH 0142/1718] fixed disabled guest checkout issue in case of
 downloadable product

Fix static tests
---
 .../Unit/Observer/IsAllowedGuestCheckoutObserverTest.php  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php b/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
index fa764039e9a96..14d07d5785a6f 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
@@ -58,7 +58,7 @@ class IsAllowedGuestCheckoutObserverTest extends TestCase
      * Sets up the fixture, for example, open a network connection.
      * This method is called before a test is executed.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->scopeConfig = $this->getMockBuilder(Config::class)
             ->disableOriginalConstructor()
@@ -99,7 +99,7 @@ protected function setUp()
      * @param $productType
      * @param $isAllowed
      */
-    public function testIsAllowedGuestCheckoutConfigSetToTrue($productType, $isAllowed)
+    public function testIsAllowedGuestCheckoutConfigSetToTrue($productType, $isAllowed): void
     {
         if ($isAllowed) {
             $this->resultMock->expects($this->at(0))
@@ -168,7 +168,7 @@ public function testIsAllowedGuestCheckoutConfigSetToTrue($productType, $isAllow
     /**
      * @return array
      */
-    public function dataProviderForTestisAllowedGuestCheckoutConfigSetToTrue()
+    public function dataProviderForTestisAllowedGuestCheckoutConfigSetToTrue(): array
     {
         return [
             1 => [Type::TYPE_DOWNLOADABLE, true],
@@ -176,7 +176,7 @@ public function dataProviderForTestisAllowedGuestCheckoutConfigSetToTrue()
         ];
     }
 
-    public function testIsAllowedGuestCheckoutConfigSetToFalse()
+    public function testIsAllowedGuestCheckoutConfigSetToFalse(): void
     {
         $storeCode = 1;
 

From f4eb33e7532e4c2e1050402efce6242f04dd5262 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Thu, 9 Apr 2020 15:57:16 +0300
Subject: [PATCH 0143/1718] fixed disabled guest checkout issue in case of
 downloadable product

Fix static tests
---
 .../Observer/IsAllowedGuestCheckoutObserverTest.php    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php b/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
index 14d07d5785a6f..619425cafa557 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
@@ -32,7 +32,7 @@ class IsAllowedGuestCheckoutObserverTest extends TestCase
     /**
      * @var MockObject|Config
      */
-    private $scopeConfig;
+    private $scopeConfigMock;
 
     /**
      * @var MockObject|DataObject
@@ -60,7 +60,7 @@ class IsAllowedGuestCheckoutObserverTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->scopeConfig = $this->getMockBuilder(Config::class)
+        $this->scopeConfigMock = $this->getMockBuilder(Config::class)
             ->disableOriginalConstructor()
             ->setMethods(['isSetFlag', 'getValue'])
             ->getMock();
@@ -87,7 +87,7 @@ protected function setUp(): void
         $this->isAllowedGuestCheckoutObserver = (new ObjectManagerHelper($this))->getObject(
             IsAllowedGuestCheckoutObserver::class,
             [
-                'scopeConfig' => $this->scopeConfig,
+                'scopeConfig' => $this->scopeConfigMock,
             ]
         );
     }
@@ -146,7 +146,7 @@ public function testIsAllowedGuestCheckoutConfigSetToTrue($productType, $isAllow
             ->method('getQuote')
             ->will($this->returnValue($quote));
 
-        $this->scopeConfig->expects($this->any())
+        $this->scopeConfigMock->expects($this->any())
             ->method('isSetFlag')
             ->with(
                 'catalog/downloadable/disable_guest_checkout',
@@ -219,7 +219,7 @@ public function testIsAllowedGuestCheckoutConfigSetToFalse(): void
             ->method('getQuote')
             ->will($this->returnValue($quote));
 
-        $this->scopeConfig->expects($this->once())
+        $this->scopeConfigMock->expects($this->once())
             ->method('isSetFlag')
             ->with(
                 'catalog/downloadable/disable_guest_checkout',

From df40d239f58f862fb9f5fc10678b7ab7d096ba9d Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Thu, 9 Apr 2020 17:48:40 +0300
Subject: [PATCH 0144/1718] MC-29420: Remove event handlers from CE

---
 .../adminhtml/templates/notification.phtml    |  16 +-
 .../view/adminhtml/templates/tracking.phtml   |  18 +-
 .../templates/notification/window.phtml       |   2 +
 .../templates/system/messages/popup.phtml     |   6 +-
 .../templates/directpost/iframe.phtml         |  32 +--
 .../adminhtml/templates/directpost/info.phtml |  42 ++--
 .../adminhtml/templates/payment/script.phtml  |  13 +-
 .../Block/Widget/Form/Element/Dependence.php  |  14 +-
 .../Block/Widget/Form/Element/Gallery.php     |  26 ++-
 .../adminhtml/templates/dashboard/chart.phtml |   9 +-
 .../adminhtml/templates/dashboard/grid.phtml  | 164 +++++++------
 .../templates/dashboard/store/switcher.phtml  |  36 ++-
 .../templates/page/js/calendar.phtml          |  48 ++--
 .../templates/page/js/require_js.phtml        |  17 +-
 .../adminhtml/templates/store/switcher.phtml  | 124 ++++++----
 .../templates/system/cache/edit.phtml         |  56 ++++-
 .../templates/system/design/edit.phtml        |   9 +-
 .../system/shipping/applicable_country.phtml  |  11 +-
 .../widget/form/element/gallery.phtml         |  88 +++++--
 .../adminhtml/templates/widget/grid.phtml     | 216 +++++++++++-------
 .../templates/widget/grid/massaction.phtml    |  66 +++---
 .../adminhtml/templates/widget/tabs.phtml     |  67 ++++--
 .../templates/widget/tabshoriz.phtml          |  57 +++--
 .../view/adminhtml/templates/confirm.phtml    |  22 +-
 .../frontend/templates/cart/minicart.phtml    |  21 +-
 .../frontend/templates/cart/shipping.phtml    |  17 +-
 .../view/frontend/templates/onepage.phtml     |  21 +-
 .../templates/system/config/edit.phtml        |  74 +++---
 .../templates/system/config/js.phtml          |  18 +-
 .../view/base/templates/html/cookie.phtml     |   9 +-
 .../templates/system/config/validatevat.phtml |  42 +++-
 .../account/authentication-popup.phtml        |  13 +-
 .../templates/page_cache_validation.phtml     |  11 +-
 .../templates/system/config/rules.phtml       |  14 +-
 .../view/frontend/templates/js/calendar.phtml |  45 ++--
 .../frontend/templates/js/cookie_status.phtml |   7 +-
 .../templates/page/js/require_js.phtml        |  15 +-
 .../view/base/templates/translate.phtml       |  31 ++-
 .../Ui/view/base/templates/logger.phtml       |  12 +-
 .../templates/wysiwyg/active_editor.phtml     |  12 +-
 .../Block/Backend/System/CarrierConfig.php    |   3 +
 .../system/shipping/carrier_config.phtml      |  43 ++--
 .../Magento/Framework/View/Helper/Js.php      |  10 +-
 43 files changed, 1018 insertions(+), 559 deletions(-)

diff --git a/app/code/Magento/AdminAnalytics/view/adminhtml/templates/notification.phtml b/app/code/Magento/AdminAnalytics/view/adminhtml/templates/notification.phtml
index 4b1f971670184..a8fdb2e04ef31 100644
--- a/app/code/Magento/AdminAnalytics/view/adminhtml/templates/notification.phtml
+++ b/app/code/Magento/AdminAnalytics/view/adminhtml/templates/notification.phtml
@@ -4,13 +4,21 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
-<script>
+<?php
+$isAnaliticsVisible = $block->getNotification()->isAnalyticsVisible() ? 1 : 0;
+$isReleaseVisible = $block->getNotification()->isReleaseVisible() ? 1 : 0;
+$scriptString = <<<script
     define('analyticsPopupConfig', function () {
         return {
-            analyticsVisible: <?= $block->getNotification()->isAnalyticsVisible() ? 1 : 0; ?>,
-            releaseVisible: <?= $block->getNotification()->isReleaseVisible() ? 1 : 0; ?>,
+            analyticsVisible: {$isAnaliticsVisible},
+            releaseVisible: {$isReleaseVisible},
         }
     });
-</script>
+script
+?>
+
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
diff --git a/app/code/Magento/AdminAnalytics/view/adminhtml/templates/tracking.phtml b/app/code/Magento/AdminAnalytics/view/adminhtml/templates/tracking.phtml
index 0ea5c753c9337..7e01f84b8322c 100644
--- a/app/code/Magento/AdminAnalytics/view/adminhtml/templates/tracking.phtml
+++ b/app/code/Magento/AdminAnalytics/view/adminhtml/templates/tracking.phtml
@@ -3,13 +3,19 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/**
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
 
 <script src="<?= $block->escapeUrl($block->getTrackingUrl()) ?>" async></script>
-<script>
+
+<?php $scriptString = '
     var adminAnalyticsMetadata = {
-        "version": "<?= $block->escapeJs($block->getMetadata()->getMagentoVersion()) ?>",
-        "user": "<?= $block->escapeJs($block->getMetadata()->getCurrentUser()) ?>",
-        "mode": "<?= $block->escapeJs($block->getMetadata()->getMode()) ?>"
-    };
-</script>
+        "version": "' . $block->escapeJs($block->getMetadata()->getMagentoVersion()) . '",
+        "user": "' . $block->escapeJs($block->getMetadata()->getCurrentUser()) . '",
+        "mode": "' . $block->escapeJs($block->getMetadata()->getMode()) . '"
+    };';
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml
index b4f19bda36cbf..980d8e89137ba 100644
--- a/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml
+++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml
@@ -6,6 +6,7 @@
 
 /**
  * @see \Magento\AdminNotification\Block\Window
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
 <ul class="message-system-list"
@@ -25,3 +26,4 @@
         </a>
     </li>
 </ul>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display:none', '.message-system-list'); ?>
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml
index 494e60865623b..2217d441d96ad 100644
--- a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml
+++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml
@@ -5,18 +5,20 @@
  */
 
 /** @var $block \Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
-<div style="display:none" id="system_messages_list" data-role="system_messages_list"
+<div id="system_messages_list" data-role="system_messages_list"
      title="<?= $block->escapeHtmlAttr($block->getPopupTitle()) ?>">
     <ul class="message-system-list messages">
-        <?php foreach ($block->getUnreadMessages() as $message) : ?>
+        <?php foreach ($block->getUnreadMessages() as $message): ?>
             <li class="message message-warning <?= $block->escapeHtmlAttr($block->getItemClass($message)) ?>">
                 <?= $block->escapeHtml($message->getText()) ?>
             </li>
         <?php endforeach;?>
     </ul>
 </div>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display:none', '#system_messages_list'); ?>
 
 <script type="text/x-magento-init">
     {
diff --git a/app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/iframe.phtml b/app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/iframe.phtml
index 3088713989453..8c61f441be3f0 100644
--- a/app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/iframe.phtml
+++ b/app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/iframe.phtml
@@ -6,26 +6,30 @@
 
 /**
  * @var $block \Magento\Authorizenet\Block\Transparent\Iframe
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 $params = $block->getParams();
 $helper = $block->getHelper('adminhtml');
 ?>
 <html>
     <head>
-        <script>
-        <?php if (isset($params['redirect'])) : ?>
-            window.location="<?= $block->escapeUrl($params['redirect']) ?>";
-        <?php endif; ?>
-        <?php if (isset($params['redirect_parent'])) : ?>
-            window.top.location="<?= $block->escapeUrl($params['redirect_parent']) ?>";
-        <?php endif; ?>
-        <?php if (isset($params['error_msg'])) : ?>
-            window.top.directPostModel.showError(<?= /* @noEscape */ json_encode((array)$params['error_msg']) ?>);
-            <?php if (isset($params['x_invoice_num'])) : ?>
-                window.top.directPostModel.successUrl="<?= $block->escapeUrl($helper->getSuccessOrderUrl($params)) ?>";
-            <?php endif; ?>
-        <?php endif; ?>
-        </script>
+<?php $scriptString = '';
+if (isset($params['redirect'])) {
+    $scriptString .= 'window.location="<?=' . $block->escapeUrl($params['redirect']) . '";' . PHP_EOL;
+}
+if (isset($params['redirect_parent'])) {
+    $scriptString .= 'window.top.location="' . $block->escapeUrl($params['redirect_parent']) . '";' . PHP_EOL;
+}
+if (isset($params['error_msg'])) {
+    $scriptString .= 'window.top.directPostModel.showError(<?=' .
+        /* @noEscape */ json_encode((array)$params['error_msg']) . ');' . PHP_EOL;
+    if (isset($params['x_invoice_num'])) {
+        $scriptString .= 'window.top.directPostModel.successUrl="' .
+            $block->escapeUrl($helper->getSuccessOrderUrl($params)) . '";' . PHP_EOL;
+    }
+}
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
     </head>
     <body></body>
 </html>
diff --git a/app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/info.phtml b/app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/info.phtml
index bec87738a83c1..6f196c70b2e88 100644
--- a/app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/info.phtml
+++ b/app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/info.phtml
@@ -7,6 +7,7 @@
 /**
  * @var \Magento\Authorizenet\Block\Transparent\Iframe $block
  * @see \Magento\Authorizenet\Block\Transparent\Iframe
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 $code = $block->escapeHtml($block->getMethodCode());
 $method = $block->getMethod();
@@ -40,9 +41,9 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
                         'validate-cc-type-select':'#<?= /* @noEscape */ $code ?>_cc_number'
                         }">
                 <option value=""><?= $block->escapeHtml(__('Please Select')) ?></option>
-                <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName) : ?>
+                <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName): ?>
                     <option value="<?= $block->escapeHtml($typeCode) ?>"
-                            <?php if ($typeCode == $ccType) : ?>selected="selected"<?php endif; ?>>
+                            <?php if ($typeCode == $ccType): ?>selected="selected"<?php endif; ?>>
                         <?= $block->escapeHtml($typeName) ?>
                     </option>
                 <?php endforeach; ?>
@@ -80,9 +81,9 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
                         'required':true,
                         'validate-cc-exp':'#<?= /* @noEscape */ $code ?>_expiration_yr'
                         }">
-                <?php foreach ($block->getCcMonths() as $k => $v) : ?>
+                <?php foreach ($block->getCcMonths() as $k => $v): ?>
                     <option value="<?= $block->escapeHtml($k) ?>"
-                            <?php if ($k == $ccExpMonth) : ?>selected="selected"<?php endif; ?>>
+                            <?php if ($k == $ccExpMonth): ?>selected="selected"<?php endif; ?>>
                         <?= $block->escapeHtml($v) ?>
                     </option>
                 <?php endforeach; ?>
@@ -92,9 +93,9 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
                     class="admin__control-select admin__control-select-year"
                     data-container="<?= /* @noEscape */ $code ?>-cc-year"
                     data-validate="{required:true}">
-                <?php foreach ($block->getCcYears() as $k => $v) : ?>
-                    <option value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
-                            <?php if ($k == $ccExpYear) : ?>selected="selected"<?php endif; ?>>
+                <?php foreach ($block->getCcYears() as $k => $v): ?>
+                    <option value="<?= /* @noEscape */ $k ? $block->escapeHtml($k): '' ?>"
+                            <?php if ($k == $ccExpYear): ?>selected="selected"<?php endif; ?>>
                         <?= $block->escapeHtml($v) ?>
                     </option>
                 <?php endforeach; ?>
@@ -102,7 +103,7 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
         </div>
     </div>
 
-    <?php if ($block->hasVerification()) : ?>
+    <?php if ($block->hasVerification()): ?>
     <div class="admin__field _required field-cvv">
         <label class="admin__field-label"
                for="<?= /* @noEscape */ $code ?>_cc_cid"
@@ -126,7 +127,12 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
     </div>
     <?php endif; ?>
 </fieldset>
-<script>
+<?php
+$codeString = /* @noEscape */ $code;
+$controllerString = /* @noEscape */ $controller;
+$orderUrlString = /* @noEscape */ $orderUrl;
+
+$scriptString = <<<script
     require([
         'prototype',
         'Magento_Sales/order/create/scripts',
@@ -137,16 +143,16 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
         /**
          * Disable card server validation in admin
          */
-        order.addExcludedPaymentMethod('<?= /* @noEscape */ $code ?>');
+        order.addExcludedPaymentMethod('{$codeString}');
 
         directPostModel = new directPost(
-            '<?= /* @noEscape */ $code ?>',
+            '{$codeString}',
             'directpost-iframe',
-            '<?= /* @noEscape */ $controller ?>',
-            '<?= /* @noEscape */ $orderUrl ?>',
-            '<?= $block->escapeUrl($method->getCgiUrl()) ?>',
-            '<?= $block->escapeUrl($block->getUrl('*/*/save', [
-                '_secure' => $block->getRequest()->isSecure()
-            ]));?>');
+            '$controllerString',
+            '$orderUrlString',
+            '{$block->escapeUrl($method->getCgiUrl())}',
+            '{$block->escapeUrl($block->getUrl('*/*/save', ['_secure' => $block->getRequest()->isSecure()]))}');
     });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/templates/payment/script.phtml b/app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/templates/payment/script.phtml
index 6be6008dba507..d9cfc62c9b247 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/templates/payment/script.phtml
+++ b/app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/templates/payment/script.phtml
@@ -5,8 +5,9 @@
  */
 
 /** @var Magento\AuthorizenetAcceptjs\Block\Payment $block */
+/** @var Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<script>
+<?php $scriptString = <<<script
     //<![CDATA[
     require(
         [
@@ -14,11 +15,15 @@
             'jquery',
             'domReady!'
         ], function(AuthorizenetAcceptjs, $) {
-            var config = <?= /* @noEscape */ $block->getPaymentConfig() ?>,
-                form = $('#payment_form_<?= /* @noEscape */ $block->escapeJs($block->escapeHtml($block->getMethodCode())) ?>');
+script;
+$scriptString .= 'var config = ' . /* @noEscape */ $block->getPaymentConfig() . ',
+    form = $(\'#payment_form_' . /* @noEscape */ $block->escapeJs($block->escapeHtml($block->getMethodCode())) . '\');';
+$scriptString .= <<<script
 
             config.active = form.length > 0 && !form.is(':hidden');
             new AuthorizenetAcceptjs(config);
         });
     //]]>
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php b/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php
index d599d5fbad5e0..45024ad16b31f 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php
@@ -6,6 +6,9 @@
 
 namespace Magento\Backend\Block\Widget\Form\Element;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 /**
  * Form element dependencies mapper
  * Assumes that one element may depend on other element values.
@@ -131,11 +134,12 @@ protected function _toHtml()
             $params .= ', ' .  $this->_jsonEncoder->encode($this->_configOptions);
         }
 
-        return "<script>
-require(['mage/adminhtml/form'], function(){
-    new FormElementDependenceController({$params});
-});
-</script>";
+        $secureHtmlRenderer = ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+        $scriptString = 'require([\'mage/adminhtml/form\'], function(){
+    new FormElementDependenceController(' . $params . ');
+});';
+
+        return /* @noEscape */ $secureHtmlRenderer->renderTag('script', [], $scriptString, false);
     }
 
     /**
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Element/Gallery.php b/app/code/Magento/Backend/Block/Widget/Form/Element/Gallery.php
index aa0b0c3352ebe..95d3d17f9f342 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Element/Gallery.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Element/Gallery.php
@@ -6,7 +6,9 @@
 
 namespace Magento\Backend\Block\Widget\Form\Element;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\Json\Helper\Data as JsonHelper;
 
 /**
  * Backend image gallery item renderer
@@ -27,6 +29,18 @@ class Gallery extends \Magento\Backend\Block\Template implements
     protected $_template = 'Magento_Backend::widget/form/element/gallery.phtml';
 
     /**
+     * @param Template\Context $context
+     * @param array $data
+     */
+    public function __construct(Template\Context $context, array $data = [])
+    {
+        $data['jsonHelper'] = ObjectManager::getInstance()->get(JsonHelper::class);
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Renderer.
+     *
      * @param AbstractElement $element
      * @return string
      */
@@ -37,6 +51,8 @@ public function render(AbstractElement $element)
     }
 
     /**
+     * Set element.
+     *
      * @param AbstractElement $element
      * @return $this
      */
@@ -47,6 +63,8 @@ public function setElement(AbstractElement $element)
     }
 
     /**
+     * Get element.
+     *
      * @return AbstractElement|null
      */
     public function getElement()
@@ -55,6 +73,8 @@ public function getElement()
     }
 
     /**
+     * Get value.
+     *
      * @return array
      */
     public function getValues()
@@ -63,7 +83,7 @@ public function getValues()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _prepareLayout()
     {
@@ -82,6 +102,8 @@ protected function _prepareLayout()
     }
 
     /**
+     * Return add button.
+     *
      * @return string
      */
     public function getAddButtonHtml()
@@ -90,6 +112,8 @@ public function getAddButtonHtml()
     }
 
     /**
+     * Return delete button.
+     *
      * @param string $image
      * @return string|string[]
      */
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/chart.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/chart.phtml
index 65c0d292ee187..df47f3f41be1b 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/chart.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/chart.phtml
@@ -7,18 +7,23 @@
 use Magento\Backend\ViewModel\ChartsPeriod;
 use Magento\Framework\Escaper;
 use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
 /**
  * @var Template $block
  * @var Escaper $escaper
  * @var ChartsPeriod $viewModel
+ * @var SecureHtmlRenderer $secureRenderer
  */
 $viewModel = $block->getViewModel();
 ?>
 <div class="dashboard-diagram">
     <div class="dashboard-diagram-graph">
-        <canvas id="chart_<?= $escaper->escapeHtmlAttr($block->getData('html_id')) ?>_period"
-                style="display: none;"></canvas>
+        <canvas id="chart_<?= $escaper->escapeHtmlAttr($block->getData('html_id')) ?>_period"/>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+            'display:none',
+            '#chart_' . $escaper->escapeHtmlAttr($block->getData('html_id')) . '_period'
+        ) ?>
         <div class="dashboard-diagram-nodata">
             <span><?= $escaper->escapeHtml(__('No Data Found')) ?></span>
         </div>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml
index 7c05335642ba7..a2eb24476726e 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml
@@ -3,89 +3,113 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?php
 
 $numColumns = count($block->getColumns());
 ?>
-<?php if ($block->getCollection()) : ?>
-<div class="dashboard-item-content">
-    <?php if ($block->getCollection()->getSize() > 0) : ?>
-        <table class="admin__table-primary dashboard-data" id="<?= $block->escapeHtmlAttr($block->getId()) ?>_table">
-            <?php
-            /* This part is commented to remove all <col> tags from the code. */
-            /* foreach ($block->getColumns() as $_column): ?>
-            <col <?= $_column->getHtmlProperty() ?> />
-            <?php endforeach; */ ?>
-            <?php if ($block->getHeadersVisibility() || $block->getFilterVisibility()) : ?>
-                <thead>
-                <?php if ($block->getHeadersVisibility()) : ?>
-                    <tr>
-                        <?php foreach ($block->getColumns() as $_column) : ?>
-                            <?= $_column->getHeaderHtml() ?>
-                        <?php endforeach; ?>
-                    </tr>
+<?php if ($block->getCollection()): ?>
+    <div class="dashboard-item-content">
+        <?php if ($block->getCollection()->getSize() > 0): ?>
+            <table class="admin__table-primary dashboard-data"
+                   id="<?= $block->escapeHtmlAttr($block->getId()) ?>_table">
+                <?php
+                /* This part is commented to remove all <col> tags from the code. */
+                /* foreach ($block->getColumns() as $_column): ?>
+                <col <?= $_column->getHtmlProperty() ?> />
+                <?php endforeach; */ ?>
+                <?php if ($block->getHeadersVisibility() || $block->getFilterVisibility()): ?>
+                    <thead>
+                    <?php if ($block->getHeadersVisibility()): ?>
+                        <tr>
+                            <?php foreach ($block->getColumns() as $_column): ?>
+                                <?= $_column->getHeaderHtml() ?>
+                            <?php endforeach; ?>
+                        </tr>
+                    <?php endif; ?>
+                    </thead>
                 <?php endif; ?>
-                </thead>
-            <?php endif; ?>
-            <?php if (!$block->getIsCollapsed()) : ?>
-                <tbody>
-                <?php foreach ($block->getCollection() as $_index => $_item) : ?>
-                    <tr title="<?= $block->escapeHtmlAttr($block->getRowUrl($_item)) ?>">
-                    <?php $i = 0; foreach ($block->getColumns() as $_column) : ?>
-                        <td class="<?= $block->escapeHtmlAttr($_column->getCssProperty()) ?> <?= /* @noEscape */ ++$i == $numColumns ? 'last' : '' ?>"><?= /* @noEscape */ (($_html = $_column->getRowField($_item)) != '' ? $_html : '&nbsp;') ?></td>
+                <?php if (!$block->getIsCollapsed()): ?>
+                    <tbody>
+                    <?php foreach ($block->getCollection() as $_index => $_item): ?>
+                        <tr title="<?= $block->escapeHtmlAttr($block->getRowUrl($_item)) ?>">
+                            <?php $i = 0; foreach ($block->getColumns() as $_column): ?>
+                                <td class="<?= $block->escapeHtmlAttr($_column->getCssProperty());
+                                ?> <?= /* @noEscape */ ++$i == $numColumns ? 'last' : '';
+?>"><?= /* @noEscape */ (($_html = $_column->getRowField($_item)) != '' ?
+                                        $_html : '&nbsp;') ?></td>
+                            <?php endforeach; ?>
+                        </tr>
                     <?php endforeach; ?>
-                    </tr>
-                <?php endforeach; ?>
-                </tbody>
-            <?php endif; ?>
-        </table>
-    <?php else : ?>
-        <div class="<?= $block->escapeHtmlAttr($block->getEmptyTextClass()) ?>"><?= $block->escapeHtml($block->getEmptyText()) ?></div>
-    <?php endif; ?>
-</div>
-    <?php if ($block->canDisplayContainer()) : ?>
-<script>
-var deps = [];
-
-        <?php if ($block->getDependencyJsObject()) : ?>
-deps.push('uiRegistry');
+                    </tbody>
+                <?php endif; ?>
+            </table>
+        <?php else: ?>
+            <div class="<?= $block->escapeHtmlAttr($block->getEmptyTextClass());
+            ?>"><?= $block->escapeHtml($block->getEmptyText()) ?></div>
         <?php endif; ?>
+    </div>
+    <?php if ($block->canDisplayContainer()): ?>
+        <?php $scriptString = 'var deps = [];' . PHP_EOL;
+        if ($block->getDependencyJsObject()) {
+            $scriptString .= 'deps.push(\'uiRegistry\');' . PHP_EOL;
+        }
 
-        <?php if (strpos($block->getRowClickCallback(), 'order.') !== false) : ?>
-deps.push('Magento_Sales/order/create/form');
-        <?php endif; ?>
+        if (strpos($block->getRowClickCallback(), 'order.') !== false) {
+            $scriptString .= 'deps.push(\'Magento_Sales/order/create/form\');' . PHP_EOL;
+        }
 
-deps.push('mage/adminhtml/grid');
+        $scriptString .= 'deps.push(\'mage/adminhtml/grid\');' . PHP_EOL;
 
-require(deps, function(<?= ($block->getDependencyJsObject() ? 'registry' : '') ?>){
-        <?php //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed ?>
+        $scriptString .= 'require(deps, function('. ($block->getDependencyJsObject() ? 'registry' : '') .'){' .
+            PHP_EOL .
+        '//TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed' . PHP_EOL;
 
-        <?php if ($block->getDependencyJsObject()) : ?>
-        registry.get('<?= $block->escapeJs($block->getDependencyJsObject()) ?>', function (<?= $block->escapeJs($block->getDependencyJsObject()) ?>) {
-        <?php endif; ?>
+        if ($block->getDependencyJsObject()) {
+            $scriptString .= 'registry.get(\'' . $block->escapeJs($block->getDependencyJsObject()) .
+                '\', function ('. $block->escapeJs($block->getDependencyJsObject()) . ') {' . PHP_EOL;
+        }
 
-        <?= $block->escapeJs($block->getJsObjectName()) ?> = new varienGrid('<?= $block->escapeJs($block->getId()) ?>', '<?= $block->escapeJs($block->getGridUrl()) ?>', '<?= $block->escapeJs($block->getVarNamePage()) ?>', '<?= $block->escapeJs($block->getVarNameSort()) ?>', '<?= $block->escapeJs($block->getVarNameDir()) ?>', '<?= $block->escapeJs($block->getVarNameFilter()) ?>');
-        <?= $block->escapeJs($block->getJsObjectName()) ?>.useAjax = '<?= $block->escapeJs($block->getUseAjax()) ?>';
-        <?php if ($block->getRowClickCallback()) : ?>
-            <?= $block->escapeJs($block->getJsObjectName()) ?>.rowClickCallback = <?= /* @noEscape */ $block->getRowClickCallback() ?>;
-        <?php endif; ?>
-        <?php if ($block->getCheckboxCheckCallback()) : ?>
-            <?= $block->escapeJs($block->getJsObjectName()) ?>.checkboxCheckCallback = <?= /* @noEscape */ $block->getCheckboxCheckCallback() ?>;
-        <?php endif; ?>
-        <?php if ($block->getRowInitCallback()) : ?>
-            <?= $block->escapeJs($block->getJsObjectName()) ?>.initRowCallback = <?= /* @noEscape */ $block->getRowInitCallback() ?>;
-            <?= $block->escapeJs($block->getJsObjectName()) ?>.rows.each(function(row){<?= /* @noEscape */ $block->getRowInitCallback() ?>(<?= $block->escapeJs($block->getJsObjectName()) ?>, row)});
-        <?php endif; ?>
-        <?php if ($block->getMassactionBlock()->isAvailable()) : ?>
-            <?= /* @noEscape */ $block->getMassactionBlock()->getJavaScript() ?>
-        <?php endif ?>
+        $scriptString .= $block->escapeJs($block->getJsObjectName()) . ' = new varienGrid(\'' .
+            $block->escapeJs($block->getId()) . '\', \'' . $block->escapeJs($block->getGridUrl()) . '\', \'' .
+            $block->escapeJs($block->getVarNamePage()) .'\', \'' .
+            $block->escapeJs($block->getVarNameSort()) . '\', \'' .
+            $block->escapeJs($block->getVarNameDir()) . '\', \'' .
+            $block->escapeJs($block->getVarNameFilter()) .'\');' . PHP_EOL;
 
-        <?php if ($block->getDependencyJsObject()) : ?>
-    });
-        <?php endif; ?>
+        $scriptString .= $block->escapeJs($block->getJsObjectName()) .'.useAjax = \'' .
+            $block->escapeJs($block->getUseAjax()) . '\';' . PHP_EOL;
+        if ($block->getRowClickCallback()) {
+            $scriptString .= $block->escapeJs($block->getJsObjectName()) . '.rowClickCallback = ' .
+                /* @noEscape */ $block->getRowClickCallback() . ';' . PHP_EOL;
+        }
+
+        if ($block->getCheckboxCheckCallback()) {
+            $scriptString .= $block->escapeJs($block->getJsObjectName()) . '.checkboxCheckCallback = ' .
+                /* @noEscape */ $block->getCheckboxCheckCallback() . ';' . PHP_EOL;
+        }
+
+        if ($block->getRowInitCallback()) {
+            $scriptString .= $block->escapeJs($block->getJsObjectName()) . '.initRowCallback = ' .
+                /* @noEscape */ $block->getRowInitCallback() . ';' . PHP_EOL;
+            $scriptString .= $block->escapeJs($block->getJsObjectName()) . '.rows.each(function(row){' .
+                /* @noEscape */ $block->getRowInitCallback() . '(' . $block->escapeJs($block->getJsObjectName()) .
+                ', row)});' . PHP_EOL;
+        }
 
-});
-</script>
-<?php endif; ?>
+        if ($block->getMassactionBlock()->isAvailable()) {
+            $scriptString .= /* @noEscape */ $block->getMassactionBlock()->getJavaScript();
+        }
+
+        if ($block->getDependencyJsObject()) {
+            $scriptString .=  '});' . PHP_EOL;
+        }
+
+        $scriptString .= '});' . PHP_EOL;
+
+        echo /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false);
+        ?>
+    <?php endif; ?>
 <?php endif ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml
index 87e5399ddda44..870c1dbb7ef1e 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml
@@ -3,35 +3,45 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <p class="switcher"><label for="store_switcher"><?= $block->escapeHtml(__('View Statistics For:')) ?></label>
 <?= $block->getHintHtml() ?>
 <select name="store_switcher" id="store_switcher" class="left-col-block" onchange="return switchStore(this);">
     <option value=""><?= $block->escapeHtml(__('All Websites')) ?></option>
-    <?php foreach ($block->getWebsiteCollection() as $_website) : ?>
+    <?php foreach ($block->getWebsiteCollection() as $_website): ?>
         <?php $showWebsite = false; ?>
-        <?php foreach ($block->getGroupCollection($_website) as $_group) : ?>
+        <?php foreach ($block->getGroupCollection($_website) as $_group): ?>
             <?php $showGroup = false; ?>
-            <?php foreach ($block->getStoreCollection($_group) as $_store) : ?>
-                <?php if ($showWebsite == false) : ?>
+            <?php foreach ($block->getStoreCollection($_group) as $_store): ?>
+                <?php if ($showWebsite == false): ?>
                     <?php $showWebsite = true; ?>
-                    <option website="true" value="<?= $block->escapeHtmlAttr($_website->getId()) ?>"<?php if ($block->getRequest()->getParam('website') == $_website->getId()) : ?> selected="selected"<?php endif; ?>><?= $block->escapeHtml($_website->getName()) ?></option>
+                    <option website="true"
+                            value="<?= $block->escapeHtmlAttr($_website->getId()) ?>"<?php
+                            if ($block->getRequest()->getParam('website') == $_website->getId()):
+                                ?> selected="selected"<?php endif; ?>><?= $block->escapeHtml($_website->getName()) ?>
+                    </option>
                 <?php endif; ?>
-                <?php if ($showGroup == false) : ?>
+                <?php if ($showGroup == false): ?>
                     <?php $showGroup = true; ?>
                     <!--optgroup label="&nbsp;&nbsp;&nbsp;<?= $block->escapeHtmlAttr($_group->getName()) ?>"-->
-                    <option group="true" value="<?= $block->escapeHtmlAttr($_group->getId()) ?>"<?php if ($block->getRequest()->getParam('group') == $_group->getId()) : ?> selected="selected"<?php endif; ?>>&nbsp;&nbsp;&nbsp;<?= $block->escapeHtml($_group->getName()) ?></option>
+                    <option group="true" value="<?= $block->escapeHtmlAttr($_group->getId()) ?>"<?php
+                    if ($block->getRequest()->getParam('group') == $_group->getId()): ?> selected="selected"<?php
+                    endif; ?>>&nbsp;&nbsp;&nbsp;<?= $block->escapeHtml($_group->getName()) ?></option>
                 <?php endif; ?>
-                <option value="<?= $block->escapeHtmlAttr($_store->getId()) ?>"<?php if ($block->getStoreId() == $_store->getId()) : ?> selected="selected"<?php endif; ?>>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?= $block->escapeHtml($_store->getName()) ?></option>
+                <option value="<?= $block->escapeHtmlAttr($_store->getId()) ?>"<?php
+                if ($block->getStoreId() == $_store->getId()): ?> selected="selected"<?php
+                endif; ?>>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?= $block->escapeHtml($_store->getName()) ?></option>
             <?php endforeach; ?>
-            <?php if ($showGroup) : ?>
+            <?php if ($showGroup): ?>
                 <!--</optgroup>-->
             <?php endif; ?>
         <?php endforeach; ?>
     <?php endforeach; ?>
 </select>
 </p>
-<script>
+<?php $scriptString = <<<script
     require([
         'prototype'
     ], function () {
@@ -54,7 +64,9 @@
                 var select = $('order_amounts_period');
             }
             var periodParam = select.value ? 'period/' + select.value + '/' : '';
-            setLocation('<?= $block->escapeJs($block->getSwitchUrl()) ?>' + storeParam + periodParam);
+            setLocation('{$block->escapeJs($block->getSwitchUrl())}' + storeParam + periodParam);
         }
     });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/js/calendar.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/js/calendar.phtml
index 94df9ef9eb872..1ea5e225c8402 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/js/calendar.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/js/calendar.phtml
@@ -11,9 +11,10 @@
  *
  * @see \Magento\Framework\View\Element\Html\Calendar
  */
-?>
 
-<script>
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+
+$scriptString = '
 require([
     "jquery",
     "jquery/ui"
@@ -21,20 +22,20 @@ require([
 
     $.extend(true, $, {
         calendarConfig: {
-            dayNames: <?= /* @noEscape */ $days['wide'] ?>,
-            dayNamesMin: <?= /* @noEscape */ $days['abbreviated'] ?>,
-            monthNames: <?= /* @noEscape */ $months['wide'] ?>,
-            monthNamesShort: <?= /* @noEscape */ $months['abbreviated'] ?>,
-            infoTitle: "<?= $block->escapeJs(__('About the calendar')) ?>",
-            firstDay: <?= /* @noEscape */ $firstDay ?>,
-            closeText: "<?= $block->escapeJs(__('Close')) ?>",
-            currentText: "<?= $block->escapeJs(__('Go Today')) ?>",
-            prevText: "<?= $block->escapeJs(__('Previous')) ?>",
-            nextText: "<?= $block->escapeJs(__('Next')) ?>",
-            weekHeader: "<?= $block->escapeJs(__('WK')) ?>",
-            timeText: "<?= $block->escapeJs(__('Time')) ?>",
-            hourText: "<?= $block->escapeJs(__('Hour')) ?>",
-            minuteText: "<?= $block->escapeJs(__('Minute')) ?>",
+            dayNames: ' .  /* @noEscape */ $days['wide'] . ',
+            dayNamesMin: ' . /* @noEscape */ $days['abbreviated'] . ',
+            monthNames: ' . /* @noEscape */ $months['wide'] . ',
+            monthNamesShort: ' . /* @noEscape */ $months['abbreviated'] . ',
+            infoTitle: "' . $block->escapeJs(__('About the calendar')) . '",
+            firstDay: ' . /* @noEscape */ $firstDay . ',
+            closeText: "' . $block->escapeJs(__('Close')) . '",
+            currentText: "' . $block->escapeJs(__('Go Today')) . '",
+            prevText: "' . $block->escapeJs(__('Previous')) . '",
+            nextText: "' . $block->escapeJs(__('Next')) . '",
+            weekHeader: "' . $block->escapeJs(__('WK')) . '",
+            timeText: "' . $block->escapeJs(__('Time')) . '",
+            hourText: "' . $block->escapeJs(__('Hour')) . '",
+            minuteText: "' . $block->escapeJs(__('Minute')) . '",
             dateFormat: $.datepicker.RFC_2822,
             showOn: "button",
             showAnim: "",
@@ -45,17 +46,18 @@ require([
             showButtonPanel: true,
             showOtherMonths: true,
             showWeek: false,
-            timeFormat: '',
+            timeFormat: \'\',
             showTime: false,
             showHour: false,
             showMinute: false,
-            serverTimezoneSeconds: <?= (int) $block->getStoreTimestamp() ?>,
-            serverTimezoneOffset: <?= (int) $block->getTimezoneOffsetSeconds() ?>,
-            yearRange: '<?= $block->escapeJs($block->getYearRange()) ?>'
+            serverTimezoneSeconds: ' . (int) $block->getStoreTimestamp() . ',
+            serverTimezoneOffset: ' . (int) $block->getTimezoneOffsetSeconds() . ',
+            yearRange: \'' . $block->escapeJs($block->getYearRange()) . '\'
         }
     });
 
-enUS = <?= /* @noEscape */ $enUS ?>; // en_US locale reference
+enUS = ' . /* @noEscape */ $enUS . '; // en_US locale reference
+
+});';
 
-});
-</script>
+echo /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false);
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/js/require_js.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/js/require_js.phtml
index 68453d9ff8ff2..6fa41e1079950 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/js/require_js.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/js/require_js.phtml
@@ -3,11 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-<script>
-    var BASE_URL = '<?= /* @noEscape */ $block->getUrl('*') ?>';
-    var FORM_KEY = '<?= /* @noEscape */ $block->getFormKey() ?>';
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+
+$scriptString = '
+    var BASE_URL = \'' . /* @noEscape */ $block->getUrl('*') . '\';
+    var FORM_KEY = \'' . /* @noEscape */ $block->getFormKey() . '\';
     var require = {
-        "baseUrl": "<?= /* @noEscape */ $block->getViewFileUrl('/') ?>"
-    };
-</script>
+        \'baseUrl\': \'' . /* @noEscape */ $block->getViewFileUrl('/') . '\'
+    };';
+
+echo /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false);
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
index df9323a7276df..3251b367b6f56 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
@@ -5,24 +5,27 @@
  */
 
 /* @var $block \Magento\Backend\Block\Store\Switcher */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<?php if ($websites = $block->getWebsites()) : ?>
-
+<?php if ($websites = $block->getWebsites()): ?>
 <div class="store-switcher store-view">
     <span class="store-switcher-label"><?= $block->escapeHtml(__('Scope:')) ?></span>
     <div class="actions dropdown closable">
         <input type="hidden" name="store_switcher" id="store_switcher"
                data-role="store-view-id" data-param="<?= $block->escapeHtmlAttr($block->getStoreVarName()) ?>"
                value="<?= $block->escapeHtml($block->getStoreId()) ?>"
-               onchange="switchScope(this);"<?= /* @noEscape */ $block->getUiId() ?> />
+               <?= /* @noEscape */ $secureRenderer->renderEventListener('onchange', 'switchScope(this);') ?>
+               <?= /* @noEscape */ $block->getUiId() ?> />
         <input type="hidden" name="store_group_switcher" id="store_group_switcher"
                data-role="store-group-id" data-param="<?= $block->escapeHtmlAttr($block->getStoreGroupVarName()) ?>"
                value="<?= $block->escapeHtml($block->getStoreGroupId()) ?>"
-               onchange="switchScope(this);"<?= /* @noEscape */ $block->getUiId() ?> />
+                <?= /* @noEscape */ $secureRenderer->renderEventListener('onchange', 'switchScope(this);') ?>
+               <?= /* @noEscape */ $block->getUiId() ?> />
         <input type="hidden" name="website_switcher" id="website_switcher"
                data-role="website-id" data-param="<?= $block->escapeHtmlAttr($block->getWebsiteVarName()) ?>"
                value="<?= $block->escapeHtml($block->getWebsiteId()) ?>"
-               onchange="switchScope(this);"<?= /* @noEscape */ $block->getUiId() ?> />
+               <?= /* @noEscape */ $secureRenderer->renderEventListener('onchange', 'switchScope(this);') ?>
+               <?= /* @noEscape */ $block->getUiId() ?> />
         <button
             type="button"
             class="admin__action-dropdown"
@@ -33,61 +36,75 @@
             <?= $block->escapeHtml($block->getCurrentSelectionName()) ?>
         </button>
         <ul class="dropdown-menu" data-role="stores-list">
-            <?php if ($block->hasDefaultOption()) : ?>
-                <li class="store-switcher-all <?php if (!($block->getDefaultSelectionName() != $block->getCurrentSelectionName())) : ?>disabled<?php endif; ?> <?php if (!$block->hasScopeSelected()) : ?>current<?php endif; ?>">
-                    <?php if ($block->getDefaultSelectionName() != $block->getCurrentSelectionName()) : ?>
+            <?php if ($block->hasDefaultOption()): ?>
+                <li class="store-switcher-all <?php
+                if (!($block->getDefaultSelectionName() != $block->getCurrentSelectionName())): ?>disabled<?php endif;
+                ?> <?php if (!$block->hasScopeSelected()): ?>current<?php endif; ?>">
+                    <?php if ($block->getDefaultSelectionName() != $block->getCurrentSelectionName()): ?>
                         <a data-role="store-view-id" data-value="" href="#">
                             <?= $block->escapeHtml($block->getDefaultSelectionName()) ?>
                         </a>
-                    <?php else : ?>
+                    <?php else: ?>
                         <span><?= $block->escapeHtml($block->getDefaultSelectionName()) ?></span>
                     <?php endif; ?>
                 </li>
             <?php endif; ?>
-            <?php foreach ($websites as $website) : ?>
+            <?php foreach ($websites as $website): ?>
                 <?php $showWebsite = false; ?>
-                <?php foreach ($website->getGroups() as $group) : ?>
+                <?php foreach ($website->getGroups() as $group): ?>
                     <?php $showGroup = false; ?>
-                    <?php foreach ($block->getStores($group) as $store) : ?>
-                        <?php if ($showWebsite == false) : ?>
+                    <?php foreach ($block->getStores($group) as $store): ?>
+                        <?php if ($showWebsite == false): ?>
                             <?php $showWebsite = true; ?>
-                            <li class="store-switcher-website <?php if (!($block->isWebsiteSwitchEnabled() && ! $block->isWebsiteSelected($website))) : ?>disabled<?php endif; ?> <?php if ($block->isWebsiteSelected($website)) : ?>current<?php endif; ?>">
-                                <?php if ($block->isWebsiteSwitchEnabled() && ! $block->isWebsiteSelected($website)) : ?>
-                                    <a data-role="website-id" data-value="<?= $block->escapeHtml($website->getId()) ?>" href="#">
+                            <li class="store-switcher-website <?php if (!($block->isWebsiteSwitchEnabled() &&
+                                ! $block->isWebsiteSelected($website))): ?>disabled<?php endif; ?> <?php
+if ($block->isWebsiteSelected($website)): ?>current<?php endif; ?>">
+                                <?php if ($block->isWebsiteSwitchEnabled() && ! $block->isWebsiteSelected($website)): ?>
+                                    <a data-role="website-id" data-value="<?= $block->escapeHtmlAttr($website->getId());
+                                    ?>" href="#">
                                         <?= $block->escapeHtml($website->getName()) ?>
                                     </a>
-                                <?php else : ?>
+                                <?php else: ?>
                                     <span><?= $block->escapeHtml($website->getName()) ?></span>
                                 <?php endif; ?>
                             </li>
                         <?php endif; ?>
-                        <?php if ($showGroup == false) : ?>
+                        <?php if ($showGroup == false): ?>
                             <?php $showGroup = true; ?>
-                            <li class="store-switcher-store <?php if (!($block->isStoreGroupSwitchEnabled() && ! $block->isStoreGroupSelected($group))) : ?>disabled<?php endif; ?> <?php if ($block->isStoreGroupSelected($group)) : ?>current<?php endif; ?>">
-                                <?php if ($block->isStoreGroupSwitchEnabled() && ! $block->isStoreGroupSelected($group)) : ?>
-                                    <a data-role="store-group-id" data-value="<?= $block->escapeHtml($group->getId()) ?>" href="#">
+                            <li class="store-switcher-store <?php if (!($block->isStoreGroupSwitchEnabled() &&
+                                ! $block->isStoreGroupSelected($group))): ?>disabled<?php endif; ?> <?php
+if ($block->isStoreGroupSelected($group)): ?>current<?php endif; ?>">
+                                <?php if ($block->isStoreGroupSwitchEnabled() &&
+                                    ! $block->isStoreGroupSelected($group)): ?>
+                                    <a data-role="store-group-id"
+                                       data-value="<?= $block->escapeHtmlAttr($group->getId()) ?>" href="#">
                                         <?= $block->escapeHtml($group->getName()) ?>
                                     </a>
-                                <?php else : ?>
+                                <?php else: ?>
                                     <span><?= $block->escapeHtml($group->getName()) ?></span>
                                 <?php endif; ?>
                             </li>
                         <?php endif; ?>
-                        <li class="store-switcher-store-view <?php if (!($block->isStoreSwitchEnabled() && !$block->isStoreSelected($store))) : ?>disabled<?php endif; ?> <?php if ($block->isStoreSelected($store)) :?>current<?php endif; ?>">
-                            <?php if ($block->isStoreSwitchEnabled() && ! $block->isStoreSelected($store)) : ?>
-                                <a data-role="store-view-id" data-value="<?= $block->escapeHtml($store->getId()) ?>" href="#">
+                        <li class="store-switcher-store-view <?php if (!($block->isStoreSwitchEnabled() &&
+                        !$block->isStoreSelected($store))): ?>disabled<?php endif; ?> <?php
+if ($block->isStoreSelected($store)):?>current<?php endif; ?>">
+                            <?php if ($block->isStoreSwitchEnabled() && ! $block->isStoreSelected($store)): ?>
+                                <a data-role="store-view-id"
+                                   data-value="<?= $block->escapeHtmlAttr($store->getId()) ?>" href="#">
                                     <?= $block->escapeHtml($store->getName()) ?>
                                 </a>
-                            <?php else : ?>
+                            <?php else: ?>
                                 <span><?= $block->escapeHtml($store->getName()) ?></span>
                             <?php endif; ?>
                         </li>
                     <?php endforeach; ?>
                 <?php endforeach; ?>
             <?php endforeach; ?>
-            <?php if ($block->getShowManageStoresLink() && $block->getAuthorization()->isAllowed('Magento_Backend::store')) : ?>
+            <?php if ($block->getShowManageStoresLink() &&
+                $block->getAuthorization()->isAllowed('Magento_Backend::store')): ?>
                 <li class="dropdown-toolbar">
-                    <a href="<?= /* @noEscape */ $block->getUrl('*/system_store') ?>"><?= $block->escapeHtml(__('Stores Configuration')) ?></a>
+                    <a href="<?= /* @noEscape */ $block->getUrl('*/system_store');
+                    ?>"><?= $block->escapeHtml(__('Stores Configuration')) ?></a>
                 </li>
             <?php endif; ?>
         </ul>
@@ -95,15 +112,17 @@
     <?= $block->getHintHtml() ?>
 </div>
 
-<script>
+    <?php
+    $useConfirm = (int)$block->getUseConfirm();
+    $scriptString = <<<script
 require([
     'jquery',
     'Magento_Ui/js/modal/confirm'
 ], function(jQuery, confirm){
 
     (function($) {
-        var $storesList = $('[data-role=stores-list]');
-        $storesList.on('click', '[data-value]', function(event) {
+        var storesList = $('[data-role=stores-list]');
+        storesList.on('click', '[data-value]', function(event) {
             var val = $(event.target).data('value');
             var role = $(event.target).data('role');
             var switcher = $('[data-role='+role+']');
@@ -134,35 +153,42 @@ require([
             var switcherParams = {
                 scopeId: scopeId,
                 scopeParams: scopeParams,
-                useConfirm: <?= (int)$block->getUseConfirm() ?>
+                useConfirm: {$useConfirm}
             };
             scopeSwitcherHandler(switcherParams);
         } else {
-
-            <?php if ($block->getUseConfirm()) : ?>
-
+script;
+    if ($block->getUseConfirm()) {
+                $scriptString .= '
             confirm({
-                content:  "<?= $block->escapeJs(__('Please confirm scope switching. All data that hasn\'t been saved will be lost.')) ?>",
+                content:  "' . $block->escapeJs(__(
+                    'Please confirm scope switching. All data that hasn\'t been saved will be lost.'
+                )) . '",
                 actions: {
                     confirm: function() {
                         reload();
                     },
                     cancel: function() {
-                        obj.value = '<?= $block->escapeHtml($block->getStoreId()) ?>';
+                        obj.value = \'' . $block->escapeHtml($block->getStoreId()) . '\';
                     }
                 }
             });
-
-            <?php else : ?>
-                reload();
-            <?php endif; ?>
+';
+    } else {
+        $scriptString .= 'reload();';
+    }
+    $scriptString .= '
         }
 
         function reload() {
-            <?php if (!$block->isUsingIframe()) : ?>
-            var url = '<?= $block->escapeJs($block->getSwitchUrl()) ?>' + scopeParams;
-            setLocation(url);
-            <?php else : ?>
+        ';
+    if (!$block->isUsingIframe()) {
+        $scriptString .= '
+                var url = \'' . $block->escapeJs($block->getSwitchUrl()) . '\' + scopeParams;
+                setLocation(url);
+';
+    } else {
+        $scriptString .= <<<script
             jQuery('#preview_selected_store').val(scopeId);
             jQuery('#preview_form').submit();
 
@@ -175,7 +201,9 @@ require([
             });
 
             jQuery('#store-change-button').click();
-            <?php endif; ?>
+script;
+    }
+    $scriptString .= <<<script
         }
     }
 
@@ -183,5 +211,7 @@ require([
     window.switchScope = switchScope;
 
 });
-</script>
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml
index d1c51f0755a72..1361b46a3cec9 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?php
 /**
@@ -14,16 +16,19 @@
  */
 ?>
 <div data-mage-init='{"floatingHeader": {}}' class="page-actions"><?= $block->getSaveButtonHtml() ?></div>
-<form action="<?= $block->escapeUrl($block->getSaveUrl()) ?>" method="post" id="config-edit-form" enctype="multipart/form-data">
+<form action="<?= $block->escapeUrl($block->getSaveUrl()) ?>" method="post" id="config-edit-form"
+      enctype="multipart/form-data">
     <?= $block->getBlockHtml('formkey') ?>
 
-    <script>
+    <?php $scriptString = <<<script
     window.setCacheAction = function(id, button) {
         document.getElementById(id).value = button.id;
 
         configForm.submit();
     }
-    </script>
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
 
     <input type="hidden" id="catalog_action" name="catalog_action" value="" />
     <input type="hidden" id="jscss_action" name="jscss_action" value="" />
@@ -36,7 +41,7 @@
         <fieldset id="catalog">
             <table class="form-list">
                 <tbody>
-                    <?php foreach ($block->getCatalogData() as $_item) : ?>
+                    <?php foreach ($block->getCatalogData() as $_item): ?>
                         <?php /* disable reindex buttons. functionality moved to index management*/?>
                         <?php
                         if ($_item['buttons'][0]['name'] != 'clear_images_cache') {
@@ -46,15 +51,30 @@
                     <tr>
                         <td class="label"><label><?= $block->escapeHtml($_item['label']) ?></label></td>
                         <td class="value">
-                            <?php foreach ($_item['buttons'] as $_button) : ?>
+                            <?php foreach ($_item['buttons'] as $_button): ?>
                                 <?php $clickAction = "setCacheAction('catalog_action',this)"; ?>
-                                <?php if (isset($_button['warning']) && $_button['warning']) : ?>
+                                <?php if (isset($_button['warning']) && $_button['warning']): ?>
                                     <?php //phpcs:disable ?>
-                                    <?php $clickAction = "if (confirm('" . addslashes($_button['warning']) . "')) {{$clickAction}}"; ?>
+                                    <?php $clickAction = "if (confirm('" . addslashes($_button['warning']) .
+                                        "')) {{$clickAction}}"; ?>
                                     <?php //phpcs:enable ?>
                                 <?php endif; ?>
-                                <button <?php if (!isset($_button['disabled']) || !$_button['disabled']) :?>onclick="<?=  /* @noEscape */ $clickAction ?>"<?php endif; ?> id="<?= $block->escapeHtmlAttr($_button['name']) ?>" type="button" class="scalable <?php if (isset($_button['disabled']) && $_button['disabled']) :?>disabled<?php endif; ?>" style=""><span><span><span><?= $block->escapeHtml($_button['action']) ?></span></span></span></button>
-                                <?php if (isset($_button['comment'])) : ?> <br /> <small><?= $block->escapeHtml($_button['comment']) ?></small> <?php endif; ?>
+                                <button <?php if (!isset($_button['disabled']) || !$_button['disabled']):?>
+                                    <?= /* @noEscape */ $secureRenderer->renderEventListener(
+                                        'onclick',
+                                        /* @noEscape */ $clickAction
+                                    ) ?>
+                                <?php endif; ?>
+                                    id="<?= $block->escapeHtmlAttr($_button['name']) ?>"
+                                    type="button"
+                                    class="scalable
+                                <?php if (isset($_button['disabled']) && $_button['disabled']):?>disabled<?php endif;?>"
+                                        style=""
+                                ><span><span><span><?= $block->escapeHtml($_button['action']) ?></span></span></span>
+                                </button>
+                                <?php if (isset($_button['comment'])): ?> <br />
+                                    <small><?= $block->escapeHtml($_button['comment']) ?></small>
+                                <?php endif; ?>
                             <?php endforeach; ?>
                         </td>
                         <td><small>&nbsp;</small></td>
@@ -76,7 +96,16 @@
                     <tr>
                         <td class="label"><label><?= $block->escapeHtml(__('JavaScript/CSS Cache')) ?></label></td>
                         <td class="value">
-                            <button onclick="setCacheAction('jscss_action', this)" id='jscss_action' type="button" class="scalable"><span><span><span><?= $block->escapeHtml(__('Clear')) ?></span></span></span></button>
+                            <button
+                                <?= /* @noEscape */ $secureRenderer->renderEventListener(
+                                    'onclick',
+                                    "setCacheAction('jscss_action', this)"
+                                ) ?>
+                                    id='jscss_action'
+                                    type="button"
+                                    class="scalable">
+                                <span><span><span><?= $block->escapeHtml(__('Clear')) ?></span></span></span>
+                            </button>
                         </td>
                     </tr>
                 </tbody>
@@ -84,8 +113,11 @@
         </fieldset>
     </div>
 </form>
-<script>
+<?php $scriptString = <<<script
     require(["jquery","mage/mage"],function($){
        $('#config-edit-form').mage('form').mage('validation');
     });
-</script>
+script;
+?>
+
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/design/edit.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/design/edit.phtml
index c9cd765de35be..2d68012b2c5dc 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/design/edit.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/design/edit.phtml
@@ -3,11 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <form action="<?= $block->escapeUrl($block->getSaveUrl()) ?>" method="post" id="design-edit-form">
     <?= $block->getBlockHtml('formkey') ?>
 </form>
-<script>
+
+<?php $scriptString = <<<script
 require([
     "jquery",
     "mage/mage"
@@ -16,4 +19,6 @@ require([
     $('#design-edit-form').mage('form').mage('validation');
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/shipping/applicable_country.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/shipping/applicable_country.phtml
index 2a43baa4e24c8..0846fd2020b36 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/shipping/applicable_country.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/shipping/applicable_country.phtml
@@ -3,8 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/**
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
-<script>
+
+<?php $scriptString = <<<script
 require([
     'prototype'
 ], function () {
@@ -115,4 +120,6 @@ CountryModel.prototype = {
 }
 countryApply = new CountryModel();
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml
index 5c07b35e72a19..b2f1530dd865b 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <tr>
 <td colspan="2">
@@ -25,35 +27,70 @@
 
 <tbody class="gallery">
 
-<?php $i = 0; if ($block->getValues() !== null) : ?>
-    <?php foreach ($block->getValues() as $image) : $i++; ?>
-        <tr id="<?= $block->getElement()->getHtmlId() ?>_tr_<?= $block->escapeHtmlAttr($image->getValueId()) ?>" class="gallery">
-        <?php foreach ($block->getValues()->getAttributeBackend()->getImageTypes() as $type) : ?>
+<?php $i = 0; if ($block->getValues() !== null): ?>
+    <?php foreach ($block->getValues() as $image): $i++; ?>
+        <tr id="<?= $block->getElement()->getHtmlId() ?>_tr_<?= $block->escapeHtmlAttr($image->getValueId()) ?>"
+            class="gallery">
+        <?php foreach ($block->getValues()->getAttributeBackend()->getImageTypes() as $type): ?>
             <td class="gallery" align="center" style="vertical-align:bottom;">
-            <a href="<?= $block->escapeUrl($image->setType($type)->getSourceUrl()) ?>" target="_blank" onclick="imagePreview('<?= $block->getElement()->getHtmlId() ?>_image_<?= $block->escapeHtmlAttr($block->escapeJs($type)) ?>_<?= $block->escapeHtmlAttr($block->escapeJs($image->getValueId())) ?>');return false;">
-            <img id="<?= $block->getElement()->getHtmlId() ?>_image_<?= $block->escapeHtmlAttr($type) ?>_<?= $block->escapeHtmlAttr($image->getValueId()) ?>" src="<?= $block->escapeUrl($image->setType($type)->getSourceUrl()) ?>?<?= /* @noEscape */ time() ?>" alt="<?= $block->escapeHtmlAttr($image->getValue()) ?>" title="<?= $block->escapeHtmlAttr($image->getValue()) ?>" height="25" class="small-image-preview v-middle"/></a><br/>
-            <input type="file" name="<?= $block->escapeHtmlAttr($block->getElement()->getName()) ?>_<?= $block->escapeHtmlAttr($type) ?>[<?= $block->escapeHtmlAttr($image->getValueId()) ?>]" size="1"></td>
+            <a href="<?= $block->escapeUrl($image->setType($type)->getSourceUrl()) ?>"
+               target="_blank"
+               <?= /* @noEscape */ $secureRenderer->renderEventListener(
+                   'onclick',
+                   "imagePreview('<?= $block->getElement()->getHtmlId() ?>_image_<?=
+                $block->escapeHtmlAttr($block->escapeJs($type)) ?>_<?=
+                 $block->escapeHtmlAttr($block->escapeJs($image->getValueId())) ?>');return false;"
+               ) ?>
+            <img id="<?= $block->getElement()->getHtmlId() ?>_image_<?= $block->escapeHtmlAttr($type)
+            ?>_<?= $block->escapeHtmlAttr($image->getValueId()) ?>"
+                 src="<?= $block->escapeUrl($image->setType($type)->getSourceUrl()) ?>?<?= /* @noEscape */ time() ?>"
+                 alt="<?= $block->escapeHtmlAttr($image->getValue()) ?>"
+                 title="<?= $block->escapeHtmlAttr($image->getValue()) ?>"
+                 height="25"
+                 class="small-image-preview v-middle"/>
+            </a><br/>
+            <input type="file"
+                   name="<?= $block->escapeHtmlAttr($block->getElement()->getName())
+                    ?>_<?= $block->escapeHtmlAttr($type) ?>[<?= $block->escapeHtmlAttr($image->getValueId()) ?>]"
+                   size="1"></td>
         <?php endforeach; ?>
-        <td class="gallery" align="center" style="vertical-align:bottom;"><input type="input" name="<?= $block->escapeHtmlAttr($block->getElement()->getParentName()) ?>[position][<?= $block->escapeHtmlAttr($image->getValueId()) ?>]" value="<?= $block->escapeHtmlAttr($image->getPosition()) ?>" id="<?= $block->getElement()->getHtmlId() ?>_position_<?= $block->escapeHtmlAttr($image->getValueId()) ?>" size="3"/></td>
-        <td class="gallery" align="center" style="vertical-align:bottom;"><?= $block->getDeleteButtonHtml($image->getValueId()) ?><input type="hidden" name="<?= $block->escapeHtmlAttr($block->getElement()->getParentName()) ?>[delete][<?= $block->escapeHtmlAttr($image->getValueId()) ?>]" id="<?= $block->getElement()->getHtmlId() ?>_delete_<?= $block->escapeHtmlAttr($image->getValueId()) ?>"/></td>
+        <td class="gallery" align="center" style="vertical-align:bottom;">
+            <input type="input"
+                   name="<?= $block->escapeHtmlAttr($block->getElement()->getParentName())
+                    ?>[position][<?= $block->escapeHtmlAttr($image->getValueId()) ?>]"
+                   value="<?= $block->escapeHtmlAttr($image->getPosition()) ?>"
+                   id="<?= $block->getElement()->getHtmlId()
+                    ?>_position_<?= $block->escapeHtmlAttr($image->getValueId()) ?>"
+                   size="3"/></td>
+        <td class="gallery" align="center"
+            style="vertical-align:bottom;"><?= $block->getDeleteButtonHtml($image->getValueId()) ?>
+            <input type="hidden"
+                   name="<?= $block->escapeHtmlAttr($block->getElement()->getParentName())
+                    ?>[delete][<?= $block->escapeHtmlAttr($image->getValueId()) ?>]"
+                   id="<?= $block->getElement()->getHtmlId()
+                    ?>_delete_<?= $block->escapeHtmlAttr($image->getValueId()) ?>"/></td>
         </tr>
     <?php endforeach; ?>
 <?php endif; ?>
 
-<?php if ($i == 0) : ?>
-    <script>
+<?php if ($i == 0): ?>
+    <?php $scriptString = <<<script
 document.getElementById("gallery_thead").style.visibility="hidden";
-</script>
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
 <?php endif; ?>
 
 </tbody></table>
 
-<script>
+<?php $jsonHelper = $block->getData('jsonHelper');
+
+$scriptString = <<<script
 require([
     'prototype'
 ], function () {
 id = 0;
-num_of_images = <?= /* @noEscape */ $i ?>;
+num_of_images = {$i};
 
 window.addNewImage = function()
 {
@@ -62,19 +99,24 @@ window.addNewImage = function()
 
     id--;
     num_of_images++;
-    new_file_input = '<input type="file" name="<?= $block->escapeHtmlAttr($block->getElement()->getName()) ?>_%j%[%id%]" size="1">';
+script;
+
+    $elementName = $block->escapeHtmlAttr($block->getElement()->getName());
+    $parentName = $block->escapeJs($block->getElement()->getParentName());
+    $deleteButton = /* @noEscape */ $jsonHelper->jsonEncode($block->getDeleteButtonHtml("this"));
+    $elementNameDel = $block->escapeJs($block->getElement()->getName());
+    $scriptString .= <<<script
+    new_file_input = '<input type="file" name="{$elementName}_%j%[%id%]" size="1">';
 
     // Sort order input
     var new_row_input = document.createElement( 'input' );
     new_row_input.type = 'text';
-    new_row_input.name = '<?= $block->escapeJs($block->getElement()->getParentName()) ?>[position]['+id+']';
+    new_row_input.name = '{$parentName}[position]['+id+']';
     new_row_input.size = '3';
     new_row_input.value = '0';
 
     // Delete button
-    <?php //phpcs:disable ?>
-    new_row_button = <?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getDeleteButtonHtml("this")) ?>;
-    <?php // phpcs:enable ?>
+    new_row_button = {$deleteButton};
 
     table = document.getElementById( "gallery" );
 
@@ -113,13 +155,15 @@ window.deleteImage = function(image)
         document.getElementById("gallery_thead").style.visibility="hidden";
     }
     if (image>0) {
-        document.getElementById('<?= $block->escapeJs($block->getElement()->getName()) ?>_delete_'+image).value=image;
-        document.getElementById('<?= $block->escapeJs($block->getElement()->getName()) ?>_tr_'+image).style.display='none';
+        document.getElementById('{$elementNameDel}_delete_'+image).value=image;
+        document.getElementById('{$elementNameDel}_tr_'+image).style.display='none';
     } else {
         image.parentNode.parentNode.parentNode.removeChild( image.parentNode.parentNode );
     }
 }
 });
-</script>
+script;
+?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
index 7f6f2bbd13fa5..80a5638555dc2 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
@@ -16,63 +16,73 @@
  *
  */
 /* @var $block \Magento\Backend\Block\Widget\Grid */
-$numColumns = $block->getColumns() !== null ? count($block->getColumns()) : 0;
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+
+$numColumns = $block->getColumns() !== null ? count($block->getColumns()): 0;
 ?>
-<?php if ($block->getCollection()) : ?>
+<?php if ($block->getCollection()): ?>
 
-    <?php if ($block->canDisplayContainer()) : ?>
+    <?php if ($block->canDisplayContainer()): ?>
 <div id="<?= $block->escapeHtml($block->getId()) ?>" data-grid-id="<?= $block->escapeHtml($block->getId()) ?>">
-    <?php else : ?>
+    <?php else: ?>
         <?= $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
     <?php endif; ?>
 
         <div class="admin__data-grid-header admin__data-grid-toolbar">
-            <?php $massActionAvailable = $block->getChildBlock('grid.massaction') && $block->getChildBlock('grid.massaction')->isAvailable() ?>
-            <?php if ($block->getPagerVisibility() || $block->getExportTypes() || $block->getChildBlock('grid.columnSet')->getFilterVisibility() || $massActionAvailable) : ?>
+            <?php $massActionAvailable = $block->getChildBlock('grid.massaction') &&
+                $block->getChildBlock('grid.massaction')->isAvailable() ?>
+            <?php if ($block->getPagerVisibility() || $block->getExportTypes() ||
+                $block->getChildBlock('grid.columnSet')->getFilterVisibility() || $massActionAvailable): ?>
             <div class="admin__data-grid-header-row">
-                <?php if ($massActionAvailable) : ?>
-                    <?= $block->getMainButtonsHtml() ? '<div class="admin__filter-actions">' . $block->getMainButtonsHtml() . '</div>' : '' ?>
+                <?php if ($massActionAvailable): ?>
+                    <?= $block->getMainButtonsHtml() ? '<div class="admin__filter-actions">' .
+                        $block->getMainButtonsHtml() . '</div>' : '' ?>
                 <?php endif; ?>
 
-                <?php if ($block->getChildBlock('grid.export')) : ?>
+                <?php if ($block->getChildBlock('grid.export')): ?>
                     <?= $block->getChildHtml('grid.export') ?>
                 <?php endif; ?>
             </div>
             <?php endif; ?>
             <div class="<?php if ($massActionAvailable) { echo '_massaction ';} ?>admin__data-grid-header-row">
-                <?php if ($massActionAvailable) : ?>
+                <?php if ($massActionAvailable): ?>
                     <?= $block->getChildHtml('grid.massaction') ?>
-                <?php else : ?>
-                    <?= $block->getMainButtonsHtml() ? '<div class="admin__filter-actions">' . $block->getMainButtonsHtml() . '</div>' : '' ?>
+                <?php else: ?>
+                    <?= $block->getMainButtonsHtml() ? '<div class="admin__filter-actions">' .
+                        $block->getMainButtonsHtml() . '</div>' : '' ?>
                 <?php endif; ?>
                     <?php $countRecords = $block->getCollection()->getSize(); ?>
                     <div class="admin__control-support-text">
-                        <span id="<?= $block->escapeHtml($block->getHtmlId()) ?>-total-count" <?= /* @noEscape */ $block->getUiId('total-count') ?>>
+                        <span id="<?= $block->escapeHtml($block->getHtmlId()) ?>-total-count"
+                            <?= /* @noEscape */ $block->getUiId('total-count') ?>>
                             <?= /* @noEscape */ $countRecords ?>
                         </span>
                         <?= $block->escapeHtml(__('records found')) ?>
                         <span id="<?= $block->escapeHtml($block->getHtmlId()) ?>_massaction-count"
-                              class="mass-select-info _empty"><strong data-role="counter">0</strong> <span><?= $block->escapeHtml(__('selected')) ?></span></span>
+                              class="mass-select-info _empty"><strong data-role="counter">0</strong>
+                            <span><?= $block->escapeHtml(__('selected')) ?></span>
+                        </span>
                     </div>
-                <?php if ($block->getPagerVisibility()) : ?>
+                <?php if ($block->getPagerVisibility()): ?>
                     <div class="admin__data-grid-pager-wrap">
                         <select name="<?= $block->escapeHtmlAttr($block->getVarNameLimit()) ?>"
                                 id="<?= $block->escapeHtml($block->getHtmlId()) ?>_page-limit"
-                                onchange="<?= /* @noEscape */ $block->getJsObjectName() ?>.loadByElement(this)" <?= /* @noEscape */ $block->getUiId('per-page') ?>
+                                onchange="<?= /* @noEscape */ $block->getJsObjectName() ?>.loadByElement(this)"
+                            <?= /* @noEscape */ $block->getUiId('per-page') ?>
                                 class="admin__control-select">
-                            <option value="20"<?php if ($block->getCollection()->getPageSize() == 20) : ?>
+                            <option value="20"<?php if ($block->getCollection()->getPageSize() == 20): ?>
                                 selected="selected"<?php endif; ?>>20
                             </option>
-                            <option value="30"<?php if ($block->getCollection()->getPageSize() == 30) : ?>
+                            <option value="30"<?php if ($block->getCollection()->getPageSize() == 30): ?>
                                 selected="selected"<?php endif; ?>>30
                             </option>
-                            <option value="50"<?php if ($block->getCollection()->getPageSize() == 50) : ?>
+                            <option value="50"<?php if ($block->getCollection()->getPageSize() == 50): ?>
                                 selected="selected"<?php endif; ?>>50
                             </option>
-                            <option value="100"<?php if ($block->getCollection()->getPageSize() == 100) : ?>
+                            <option value="100"<?php if ($block->getCollection()->getPageSize() == 100): ?>
                                 selected="selected"<?php endif; ?>>100
                             </option>
-                            <option value="200"<?php if ($block->getCollection()->getPageSize() == 200) : ?>
+                            <option value="200"<?php if ($block->getCollection()->getPageSize() == 200): ?>
                                 selected="selected"<?php endif; ?>>200
                             </option>
                         </select>
@@ -82,14 +92,17 @@ $numColumns = $block->getColumns() !== null ? count($block->getColumns()) : 0;
                             <?php $_curPage = $block->getCollection()->getCurPage() ?>
                             <?php $_lastPage = $block->getCollection()->getLastPageNumber() ?>
 
-                            <?php if ($_curPage > 1) : ?>
+                            <?php if ($_curPage > 1): ?>
                                 <button class="action-previous"
                                         type="button"
-                                        onclick="<?= /* @noEscape */ $block->getJsObjectName() ?>.setPage('<?= /* @noEscape */ ($_curPage - 1) ?>');return false;">
+                                        onclick="<?= /* @noEscape */ $block->getJsObjectName() ?>.setPage('<?=
+                                        /* @noEscape */ ($_curPage - 1) ?>');return false;">
                                             <span><?= $block->escapeHtml(__('Previous page')) ?></span>
                                 </button>
-                            <?php else : ?>
-                                <button type="button" class="action-previous disabled"><span><?= $block->escapeHtml(__('Previous page')) ?></span></button>
+                            <?php else: ?>
+                                <button type="button" class="action-previous disabled">
+                                    <span><?= $block->escapeHtml(__('Previous page')) ?></span>
+                                </button>
                             <?php endif; ?>
 
                             <input type="text"
@@ -97,20 +110,26 @@ $numColumns = $block->getColumns() !== null ? count($block->getColumns()) : 0;
                                    name="<?= $block->escapeHtmlAttr($block->getVarNamePage()) ?>"
                                    value="<?= $block->escapeHtmlAttr($_curPage) ?>"
                                    class="admin__control-text"
-                                   onkeypress="<?= /* @noEscape */ $block->getJsObjectName() ?>.inputPage(event, '<?= /* @noEscape */ $_lastPage ?>')" <?= /* @noEscape */ $block->getUiId('current-page') ?> />
+                                   onkeypress="<?= /* @noEscape */ $block->getJsObjectName() ?>.inputPage(event, '<?=
+                                   /* @noEscape */ $_lastPage ?>')" <?=
+                            /* @noEscape */ $block->getUiId('current-page') ?> />
 
                             <label class="admin__control-support-text" for="<?= $block->escapeHtml($block->getHtmlId())
                             ?>_page-current">
-                                <?= /* @noEscape */ __('of %1', '<span>' . $block->getCollection()->getLastPageNumber() . '</span>') ?>
+                                <?= /* @noEscape */ __('of %1', '<span>' .
+                                    $block->getCollection()->getLastPageNumber() . '</span>') ?>
                             </label>
-                            <?php if ($_curPage < $_lastPage) : ?>
+                            <?php if ($_curPage < $_lastPage): ?>
                                 <button type="button" title="<?= $block->escapeHtmlAttr(__('Next page')) ?>"
                                         class="action-next"
-                                        onclick="<?= /* @noEscape */ $block->getJsObjectName() ?>.setPage('<?= /* @noEscape */ ($_curPage + 1) ?>');return false;">
+                                        onclick="<?= /* @noEscape */ $block->getJsObjectName() ?>.setPage('<?=
+                                        /* @noEscape */ ($_curPage + 1) ?>');return false;">
+                                    <span><?= $block->escapeHtml(__('Next page')) ?></span>
+                                </button>
+                            <?php else: ?>
+                                <button type="button" class="action-next disabled">
                                     <span><?= $block->escapeHtml(__('Next page')) ?></span>
                                 </button>
-                            <?php else : ?>
-                                <button type="button" class="action-next disabled"><span><?= $block->escapeHtml(__('Next page')) ?></span></button>
                             <?php endif; ?>
                         </div>
                     </div>
@@ -118,79 +137,104 @@ $numColumns = $block->getColumns() !== null ? count($block->getColumns()) : 0;
             </div>
         </div>
         <div class="admin__data-grid-wrap admin__data-grid-wrap-static">
-        <?php if ($block->getGridCssClass()) : ?>
-            <table class="<?= $block->escapeHtmlAttr($block->getGridCssClass()) ?> data-grid" id="<?= $block->escapeHtml($block->getId()) ?>_table">
+        <?php if ($block->getGridCssClass()): ?>
+            <table class="<?= $block->escapeHtmlAttr($block->getGridCssClass()) ?> data-grid"
+                   id="<?= $block->escapeHtml($block->getId()) ?>_table">
                 <!-- Rendering column set -->
                 <?= $block->getChildHtml('grid.columnSet') ?>
             </table>
-        <?php else : ?>
+        <?php else: ?>
 
             <table class="data-grid" id="<?= $block->escapeHtml($block->getId()) ?>_table">
                 <!-- Rendering column set -->
                 <?= $block->getChildHtml('grid.columnSet') ?>
             </table>
 
-            <?php if ($block->getChildBlock('grid.bottom.links')) : ?>
+            <?php if ($block->getChildBlock('grid.bottom.links')): ?>
                 <?= $block->getChildHtml('grid.bottom.links') ?>
             <?php endif; ?>
 
         <?php endif ?>
         </div>
-    <?php if ($block->canDisplayContainer()) : ?>
+    <?php if ($block->canDisplayContainer()): ?>
 </div>
-<script>
-    var deps = [];
-
-        <?php if ($block->getDependencyJsObject()) : ?>
-    deps.push('uiRegistry');
-        <?php endif; ?>
-
-        <?php if (strpos($block->getRowClickCallback(), 'order.') !== false) : ?>
-    deps.push('Magento_Sales/order/create/form');
-    deps.push('jquery');
-        <?php endif; ?>
-
-    deps.push('mage/adminhtml/grid');
-
-    require(deps, function(<?= ($block->getDependencyJsObject() ? 'registry' : '') ?>){
-        <?php //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed ?>
-
-        <?php if ($block->getDependencyJsObject()) : ?>
-            registry.get('<?= $block->escapeJs($block->getDependencyJsObject()) ?>', function (<?= $block->escapeJs($block->getDependencyJsObject()) ?>) {
-        <?php endif; ?>
-
-        <?= $block->escapeJs($block->getJsObjectName()) ?> = new varienGrid('<?= $block->escapeHtml($block->getId()) ?>', '<?= $block->escapeJs($block->getGridUrl()) ?>', '<?= $block->escapeJs($block->getVarNamePage()) ?>', '<?= $block->escapeJs($block->getVarNameSort()) ?>', '<?= $block->escapeJs($block->getVarNameDir()) ?>', '<?= $block->escapeJs($block->getVarNameFilter()) ?>');
-        <?= $block->escapeJs($block->getJsObjectName()) ?>.useAjax = <?= /* @noEscape */ $block->getUseAjax() ? 'true' : 'false' ?>;
-        <?php if ($block->getRowClickCallback()) : ?>
-                <?= $block->escapeJs($block->getJsObjectName()) ?>.rowClickCallback = <?= /* @noEscape */ $block->getRowClickCallback() ?>;
-        <?php endif; ?>
-        <?php if ($block->getCheckboxCheckCallback()) : ?>
-                <?= $block->escapeJs($block->getJsObjectName()) ?>.checkboxCheckCallback = <?= /* @noEscape */ $block->getCheckboxCheckCallback() ?>;
-        <?php endif; ?>
-        <?php if ($block->getSortableUpdateCallback()) : ?>
-                <?= $block->escapeJs($block->getJsObjectName()) ?>.sortableUpdateCallback = <?= /* @noEscape */ $block->getSortableUpdateCallback() ?>;
-        <?php endif; ?>
-        <?php if ($block->getFilterKeyPressCallback()) : ?>
-            <?= $block->escapeJs($block->getJsObjectName()) ?>.filterKeyPressCallback = <?= /* @noEscape */ $block->getFilterKeyPressCallback() ?>;
-        <?php endif; ?>
-        <?= $block->escapeJs($block->getJsObjectName()) ?>.bindSortable();
-        <?php if ($block->getRowInitCallback()) : ?>
-                <?= $block->escapeJs($block->getJsObjectName()) ?>.initRowCallback = <?= /* @noEscape */ $block->getRowInitCallback() ?>;
-                <?= $block->escapeJs($block->getJsObjectName()) ?>.initGridRows();
-        <?php endif; ?>
-        <?php if ($block->getChildBlock('grid.massaction') && $block->getChildBlock('grid.massaction')->isAvailable()) : ?>
-                <?= /* @noEscape */ $block->getChildBlock('grid.massaction')->getJavaScript() ?>
-        <?php endif ?>
-        <?= /* @noEscape */ $block->getAdditionalJavaScript() ?>
+        <?php
+        $scriptString = 'var deps = [];' . PHP_EOL;
+
+        if ($block->getDependencyJsObject()) {
+            $scriptString .= 'deps.push(\'uiRegistry\');' . PHP_EOL;
+        }
+
+        if (strpos($block->getRowClickCallback(), 'order.') !== false) {
+            $scriptString .= 'deps.push(\'Magento_Sales/order/create/form\');' . PHP_EOL;
+            $scriptString .= 'deps.push(\'jquery\');' . PHP_EOL;
+        }
+
+        $scriptString .= 'deps.push(\'mage/adminhtml/grid\');' . PHP_EOL;
+
+        $scriptString .= '
+require(deps, function('. ($block->getDependencyJsObject() ? 'registry' : '') .'){' . PHP_EOL .'
+        //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed' . PHP_EOL;
+        if ($block->getDependencyJsObject()) {
+            $scriptString .= 'registry.get(\'' . $block->escapeJs($block->getDependencyJsObject()) .
+                '\', function ('. $block->escapeJs($block->getDependencyJsObject()) . ') {' . PHP_EOL;
+        }
+
+        $scriptString .= $block->escapeJs($block->getJsObjectName()) . ' = new varienGrid(\'' .
+            $block->escapeJs($block->getId()) . '\', \'' . $block->escapeJs($block->getGridUrl()) . '\', \'' .
+            $block->escapeJs($block->getVarNamePage()) .'\', \'' .
+            $block->escapeJs($block->getVarNameSort()) . '\', \'' .
+            $block->escapeJs($block->getVarNameDir()) . '\', \'' . $block->escapeJs($block->getVarNameFilter()) .'\');
+' . PHP_EOL;
+        $scriptString .= $block->escapeJs($block->getJsObjectName()) . '.useAjax = ' .
+            (/* @noEscape */ $block->escapeJs($block->getUseAjax()) ? 'true' : 'false') . ';' . PHP_EOL;
+        if ($block->getRowClickCallback()) {
+            $scriptString .= $block->escapeJs($block->getJsObjectName()) . '.rowClickCallback = ' .
+                /* @noEscape */ $block->getRowClickCallback() . ';' . PHP_EOL;
+        }
+
+        if ($block->getCheckboxCheckCallback()) {
+            $scriptString .= $block->escapeJs($block->getJsObjectName()) . '.checkboxCheckCallback = ' .
+                /* @noEscape */ $block->getCheckboxCheckCallback() . ';' . PHP_EOL;
+        }
+
+        if ($block->getSortableUpdateCallback()) {
+            $scriptString .= $block->escapeJs($block->getJsObjectName()) . '.sortableUpdateCallback = ' .
+                /* @noEscape */ $block->getSortableUpdateCallback() . ';' . PHP_EOL;
+        }
+
+        if ($block->getFilterKeyPressCallback()) {
+            $scriptString .= $block->escapeJs($block->getJsObjectName()) . '.filterKeyPressCallback = ' .
+                /* @noEscape */ $block->getFilterKeyPressCallback() . ';' . PHP_EOL;
+        }
+
+        $scriptString .= $block->escapeJs($block->getJsObjectName()) . '.bindSortable();' . PHP_EOL;
+
+        if ($block->getRowInitCallback()) {
+            $scriptString .= $block->escapeJs($block->getJsObjectName()) . '.initRowCallback = ' .
+                /* @noEscape */ $block->getRowInitCallback() . ';' . PHP_EOL;
+            $scriptString .= $block->escapeJs($block->getJsObjectName()) . '..initGridRows();' . PHP_EOL;
+        }
+
+        if ($block->getChildBlock('grid.massaction') &&
+            $block->getChildBlock('grid.massaction')->isAvailable()) {
+            $scriptString .= /* @noEscape */ $block->getChildBlock('grid.massaction')->getJavaScript();
+        }
+
+        $scriptString .= /* @noEscape */ $block->getAdditionalJavaScript();
+
+        if ($block->getDependencyJsObject()) {
+            $scriptString .=  '});' . PHP_EOL;
+        }
+
+        $scriptString .= '});' . PHP_EOL;
+
+        echo /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false);
+        ?>
 
-        <?php if ($block->getDependencyJsObject()) : ?>
-            });
-        <?php endif; ?>
-    });
-</script>
 <?php endif; ?>
 
-    <?php if ($block->getChildBlock('grid.js')) : ?>
+    <?php if ($block->getChildBlock('grid.js')): ?>
         <?= $block->getChildHtml('grid.js') ?>
     <?php endif; ?>
 
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction.phtml
index 9a21cd4ef71a1..179557c2984e5 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction.phtml
@@ -3,11 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?= /* @noEscape */ $block->getSomething() ?>
 <div id="<?= $block->getHtmlId() ?>" class="admin__grid-massaction">
 
-    <?php if ($block->getHideFormElement() !== true) : ?>
+    <?php if ($block->getHideFormElement() !== true): ?>
     <form action="" id="<?= $block->getHtmlId() ?>-form" method="post">
     <?php endif ?>
         <div class="admin__grid-massaction-form">
@@ -16,22 +18,26 @@
                 id="<?= $block->getHtmlId() ?>-select"
                 class="required-entry local-validation admin__control-select"
                 <?= /* @noEscape */ $block->getUiId('select') ?>>
-                <option class="admin__control-select-placeholder" value="" selected><?= $block->escapeHtml(__('Actions')) ?></option>
-                <?php foreach ($block->getItems() as $_item) : ?>
-                    <option value="<?= $block->escapeHtmlAttr($_item->getId()) ?>"<?= ($_item->getSelected() ? ' selected="selected"' : '') ?>><?= $block->escapeHtml($_item->getLabel()) ?></option>
+                <option class="admin__control-select-placeholder" value="" selected>
+                    <?= $block->escapeHtml(__('Actions')) ?></option>
+                <?php foreach ($block->getItems() as $_item): ?>
+                    <option value="<?= $block->escapeHtmlAttr($_item->getId()) ?>"
+                        <?= ($_item->getSelected() ? ' selected="selected"' : '') ?>>
+                        <?= $block->escapeHtml($_item->getLabel()) ?>
+                    </option>
                 <?php endforeach; ?>
             </select>
             <span class="outer-span" id="<?= $block->getHtmlId() ?>-form-hiddens"></span>
             <span class="outer-span" id="<?= $block->getHtmlId() ?>-form-additional"></span>
             <?= $block->getApplyButtonHtml() ?>
         </div>
-    <?php if ($block->getHideFormElement() !== true) :?>
+    <?php if ($block->getHideFormElement() !== true):?>
     </form>
     <?php endif ?>
     <div class="no-display">
-    <?php foreach ($block->getItems() as $_item) : ?>
+    <?php foreach ($block->getItems() as $_item): ?>
         <div id="<?= $block->getHtmlId() ?>-item-<?= /* @noEscape */ $_item->getId() ?>-block">
-            <?php if ('' != $_item->getBlockName()) :?>
+            <?php if ('' != $_item->getBlockName()):?>
                 <?= $block->getChildHtml($_item->getBlockName()) ?>
             <?php endif;?>
         </div>
@@ -46,7 +52,7 @@
             data-menu="grid-mass-select">
             <optgroup label="<?= $block->escapeHtmlAttr(__('Mass Actions')) ?>">
                 <option disabled selected></option>
-                <?php if ($block->getUseSelectAll()) :?>
+                <?php if ($block->getUseSelectAll()):?>
                     <option value="selectAll">
                         <?= $block->escapeHtml(__('Select All')) ?>
                     </option>
@@ -65,35 +71,43 @@
         <label for="<?= $block->getHtmlId() ?>-mass-select"></label>
     </div>
 
-<script>
+<?php $scriptString = <<<script
     require(['jquery', 'domReady!'], function($){
         'use strict';
-        $('#<?= $block->getHtmlId() ?>-mass-select')
+script;
+$scriptString .= '$(\'#' . $block->getHtmlId() . '-mass-select\')';
+$scriptString .= <<<script
             .removeClass('_disabled')
             .prop('disabled', false)
             .change(function () {
             var massAction = $('option:selected', this).val();
             this.blur();
             switch (massAction) {
-                <?php if ($block->getUseSelectAll()) : ?>
-                case 'selectAll':
-                    return <?= $block->escapeJs($block->getJsObjectName()) ?>.selectAll();
-                    break;
-                case 'unselectAll':
-                    return <?= $block->escapeJs($block->getJsObjectName()) ?>.unselectAll();
+script;
+if ($block->getUseSelectAll()):
+    $scriptString .= '
+                case \'selectAll\':
+                    return ' . $block->escapeJs($block->getJsObjectName()) . '.selectAll();
                     break;
-                <?php endif; ?>
-                case 'selectVisible':
-                    return <?= $block->escapeJs($block->getJsObjectName()) ?>.selectVisible();
+                case \'unselectAll\':
+                    return ' . $block->escapeJs($block->getJsObjectName()) . '.unselectAll();
+                    break;';
+endif;
+    $scriptString .= '
+                case \'selectVisible\':
+                    return  ' . $block->escapeJs($block->getJsObjectName()) . '.selectVisible();
                     break;
-                case 'unselectVisible':
-                    return <?= $block->escapeJs($block->getJsObjectName()) ?>.unselectVisible();
+                case \'unselectVisible\':
+                    return ' . $block->escapeJs($block->getJsObjectName()) . '.unselectVisible();
                     break;
             }
         });
-    });
-    <?php if (!$block->getParentBlock()->canDisplayContainer()) : ?>
-        <?= $block->escapeJs($block->getJsObjectName()) ?>.setGridIds('<?= $block->escapeJs($block->getGridIdsJson()) ?>');
-    <?php endif; ?>
-</script>
+    });';
+
+if (!$block->getParentBlock()->canDisplayContainer()):
+    $scriptString .= $block->escapeJs($block->getJsObjectName()) .
+        '.setGridIds(\'' . $block->escapeJs($block->getGridIdsJson()) .'\');';
+endif;
+?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
 </div>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml
index 5246aac088a5b..f48af7d066df3 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml
@@ -5,29 +5,38 @@
  */
 
 /** @var $block \Magento\Backend\Block\Widget\Tabs */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<?php if (!empty($tabs)) : ?>
+<?php if (!empty($tabs)): ?>
 
 <div class="admin__page-nav" data-role="container" id="<?=  $block->escapeHtmlAttr($block->getId()) ?>">
-    <?php if ($block->getTitle()) : ?>
+    <?php if ($block->getTitle()): ?>
         <div class="admin__page-nav-title" data-role="title" <?= /* @noEscape */ $block->getUiId('title') ?>>
             <strong><?= $block->escapeHtml($block->getTitle()) ?></strong>
             <span data-role="title-messages" class="admin__page-nav-title-messages"></span>
         </div>
     <?php endif ?>
-    <ul <?= /* @noEscape */ $block->getUiId('tab', $block->getId()) ?> class="<?= /* @noEscape */ $block->getIsHoriz() ? 'tabs-horiz' : 'tabs admin__page-nav-items' ?>">
-        <?php foreach ($tabs as $_tab) : ?>
+    <ul <?= /* @noEscape */ $block->getUiId('tab', $block->getId()) ?>
+        class="<?= /* @noEscape */ $block->getIsHoriz() ? 'tabs-horiz' : 'tabs admin__page-nav-items' ?>">
+        <?php foreach ($tabs as $_tab): ?>
             <?php
-            if (!$block->canShowTab($_tab)) :
+            if (!$block->canShowTab($_tab)):
                 continue;
             endif;
             ?>
-            <?php $_tabClass = 'tab-item-link ' . $block->getTabClass($_tab) . ' ' . (preg_match('/\s?ajax\s?/', $_tab->getClass()) ? 'notloaded' : '') ?>
-            <?php $_tabType = (!preg_match('/\s?ajax\s?/', $_tabClass) && $block->getTabUrl($_tab) != '#') ? 'link' : '' ?>
-            <?php $_tabHref = $block->getTabUrl($_tab) == '#' ? '#' . $block->getTabId($_tab) . '_content' : $block->getTabUrl($_tab) ?>
+            <?php $_tabClass = 'tab-item-link ' . $block->getTabClass($_tab) . ' ' .
+                (preg_match('/\s?ajax\s?/', $_tab->getClass()) ? 'notloaded' : '') ?>
+            <?php $_tabType = (!preg_match('/\s?ajax\s?/', $_tabClass) && $block->getTabUrl($_tab) != '#') ?
+                'link' : '' ?>
+            <?php $_tabHref = $block->getTabUrl($_tab) == '#' ? '#' . $block->getTabId($_tab) . '_content' :
+                $block->getTabUrl($_tab) ?>
 
-            <li class="admin__page-nav-item" <?php if ($block->getTabIsHidden($_tab)) : ?> style="display:none"<?php endif; ?><?= /* @noEscape */ $block->getUiId('tab', 'item', $_tab->getId()) ?>>
-                <a href="<?=  $block->escapeUrl($_tabHref) ?>" id="<?=  $block->escapeHtmlAttr($block->getTabId($_tab)) ?>" name="<?=  $block->escapeHtmlAttr($block->getTabId($_tab, false)) ?>" title="<?=  $block->escapeHtmlAttr($block->getTabTitle($_tab)) ?>"
+            <li class="admin__page-nav-item" <?php if ($block->getTabIsHidden($_tab)): ?> style="display:none"<?php
+            endif; ?><?= /* @noEscape */ $block->getUiId('tab', 'item', $_tab->getId()) ?>>
+                <a href="<?=  $block->escapeUrl($_tabHref) ?>"
+                   id="<?=  $block->escapeHtmlAttr($block->getTabId($_tab)) ?>"
+                   name="<?=  $block->escapeHtmlAttr($block->getTabId($_tab, false)) ?>"
+                   title="<?=  $block->escapeHtmlAttr($block->getTabTitle($_tab)) ?>"
                    class="admin__page-nav-link <?= $block->escapeHtmlAttr($_tabClass) ?>"
                    data-tab-type="<?=  $block->escapeHtmlAttr($_tabType) ?>"
                    <?= /* @noEscape */ $block->getUiId('tab', 'link', $_tab->getId()) ?>>
@@ -38,13 +47,17 @@
                        <span class="admin__page-nav-item-message _changed">
                            <span class="admin__page-nav-item-message-icon"></span>
                            <span class="admin__page-nav-item-message-tooltip">
-                               <?= $block->escapeHtml(__('Changes have been made to this section that have not been saved.')) ?>
+                               <?= $block->escapeHtml(__(
+                                   'Changes have been made to this section that have not been saved.'
+                               )) ?>
                            </span>
                        </span>
                        <span class="admin__page-nav-item-message _error">
                            <span class="admin__page-nav-item-message-icon"></span>
                            <span class="admin__page-nav-item-message-tooltip">
-                               <?= $block->escapeHtml(__('This tab contains invalid data. Please resolve this before saving.')) ?>
+                               <?= $block->escapeHtml(__(
+                                   'This tab contains invalid data. Please resolve this before saving.'
+                               )) ?>
                            </span>
                        </span>
                         <span class="admin__page-nav-item-message-loader">
@@ -55,23 +68,33 @@
                        </span>
                    </span>
                 </a>
-                <div id="<?=  $block->escapeHtmlAttr($block->getTabId($_tab)) ?>_content" style="display:none;"<?= /* @noEscape */ $block->getUiId('tab', 'content', $_tab->getId()) ?>><?= /* @noEscape */ $block->getTabContent($_tab) ?></div>
+                <div id="<?=  $block->escapeHtmlAttr($block->getTabId($_tab)) ?>_content"
+                    <?= /* @noEscape */ $block->getUiId('tab', 'content', $_tab->getId()) ?>>
+                    <?= /* @noEscape */ $block->getTabContent($_tab) ?>
+                </div>
+                <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                    'display:none',
+                    '#' . $block->escapeHtmlAttr($block->getTabId($_tab))
+                ); ?>
             </li>
         <?php endforeach; ?>
     </ul>
 </div>
-
-<script>
-require(['jquery',"mage/backend/tabs"], function($){
+    <?php $scriptString = <<<script
+require(['jquery','mage/backend/tabs'], function($){
     $(function() {
-        $('#<?= /* @noEscape */ $block->getId() ?>').tabs({
-            active: '<?= /* @noEscape */ $block->getActiveTabId() ?>',
-            destination: '#<?= /* @noEscape */ $block->getDestElementId() ?>',
-            shadowTabs: <?= /* @noEscape */ $block->getAllShadowTabs() ?>,
-            tabsBlockPrefix: '<?= /* @noEscape */ $block->getId() ?>_',
+script;
+    $scriptString .= '$(\'#' . /* @noEscape */ $block->getId() . '\').tabs({' . PHP_EOL .
+            'active: \'' . /* @noEscape */ $block->getActiveTabId() . '\',' . PHP_EOL .
+            'destination: \'#' . /* @noEscape */ $block->getDestElementId() . '\',' . PHP_EOL .
+            'shadowTabs: ' . /* @noEscape */ $block->getAllShadowTabs() . ',' . PHP_EOL .
+            'tabsBlockPrefix: \'' . /* @noEscape */ $block->getId() . '_\',' . PHP_EOL;
+    $scriptString .= <<<script
             tabIdArgument: 'active_tab'
         });
     });
 });
-</script>
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml
index 747dc577d2348..3d77d12604930 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml
@@ -3,40 +3,61 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<!-- <?php if ($block->getTitle()) : ?>
+<!-- <?php if ($block->getTitle()): ?>
     <h3><?= $block->escapeHtml($block->getTitle()) ?></h3>
 <?php endif ?> -->
-<?php if (!empty($tabs)) : ?>
+<?php if (!empty($tabs)): ?>
 <div id="<?=  $block->escapeHtmlAttr($block->getId()) ?>">
 <ul  class="tabs-horiz">
-    <?php foreach ($tabs as $_tab) : ?>
-        <?php $_tabClass = 'tab-item-link ' . $block->getTabClass($_tab) . ' ' . (preg_match('/\s?ajax\s?/', $_tab->getClass()) ? 'notloaded' : '') ?>
+    <?php foreach ($tabs as $_tab): ?>
+        <?php $_tabClass = 'tab-item-link ' . $block->getTabClass($_tab) . ' ' .
+            (preg_match('/\s?ajax\s?/', $_tab->getClass()) ? 'notloaded' : '') ?>
         <?php $_tabType = (!preg_match('/\s?ajax\s?/', $_tabClass) && $block->getTabUrl($_tab) != '#') ? 'link' : '' ?>
-        <?php $_tabHref = $block->getTabUrl($_tab) == '#' ? '#' . $block->getTabId($_tab) . '_content' : $block->getTabUrl($_tab) ?>
+        <?php $_tabHref = $block->getTabUrl($_tab) == '#' ?
+            '#' . $block->getTabId($_tab) . '_content' :
+            $block->getTabUrl($_tab) ?>
     <li>
-        <a href="<?= $block->escapeHtmlAttr($_tabHref) ?>" id="<?= $block->escapeHtmlAttr($block->getTabId($_tab)) ?>" title="<?= $block->escapeHtmlAttr($block->getTabTitle($_tab)) ?>" class="<?= $block->escapeHtmlAttr($_tabClass) ?>" data-tab-type="<?= $block->escapeHtmlAttr($_tabType) ?>">
+        <a href="<?= $block->escapeUrl($_tabHref) ?>"
+           id="<?= $block->escapeHtmlAttr($block->getTabId($_tab)) ?>"
+           title="<?= $block->escapeHtmlAttr($block->getTabTitle($_tab)) ?>"
+           class="<?= $block->escapeHtmlAttr($_tabClass) ?>"
+           data-tab-type="<?= $block->escapeHtmlAttr($_tabType) ?>">
             <span>
-                <span class="changed" title="<?= $block->escapeHtmlAttr(__('The information in this tab has been changed.')) ?>"></span>
-                <span class="error" title="<?= $block->escapeHtmlAttr(__('This tab contains invalid data. Please resolve this before saving.')) ?>"></span>
-                <span class="loader" title="<?= $block->escapeHtmlAttr(__('Loading...')) ?>"></span>
+                <span class="changed"
+                      title="<?= $block->escapeHtmlAttr(__('The information in this tab has been changed.')) ?>"></span>
+                <span class="error"
+                      title="<?= $block->escapeHtmlAttr(__(
+                          'This tab contains invalid data. Please resolve this before saving.'
+                      )) ?>"></span>
+                <span class="loader"
+                      title="<?= $block->escapeHtmlAttr(__('Loading...')) ?>"></span>
                 <?= $block->escapeHtml($block->getTabLabel($_tab)) ?>
             </span>
         </a>
-        <div id="<?=  $block->escapeHtmlAttr($block->getTabId($_tab)) ?>_content" style="display:none"><?= /* @noEscape */ $block->getTabContent($_tab) ?></div>
+        <div id="<?=  $block->escapeHtmlAttr($block->getTabId($_tab)) ?>_content">
+            <?= /* @noEscape */ $block->getTabContent($_tab) ?>
+        </div>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+            'display:none',
+            '#' . $block->escapeHtmlAttr($block->getTabId($_tab))
+        ); ?>
     </li>
     <?php endforeach; ?>
 </ul>
 </div>
-<script>
-require(["jquery","mage/backend/tabs"], function($){
+    <?php $scriptString = '
+require([\'jquery\',\'mage/backend/tabs\'], function($){
     $(function() {
-        $('#<?= /* @noEscape */ $block->getId() ?>').tabs({
-            active: '<?= /* @noEscape */ $block->getActiveTabId() ?>',
-            destination: '#<?= /* @noEscape */ $block->getDestElementId() ?>',
-            shadowTabs: <?= /* @noEscape */ $block->getAllShadowTabs() ?>
+        $(\'#' . /* @noEscape */ $block->getId() . '\').tabs({
+            active: \'' . /* @noEscape */ $block->getActiveTabId() . '\',
+            destination: \'#' . /* @noEscape */ $block->getDestElementId() . '\',
+            shadowTabs: ' . /* @noEscape */ $block->getAllShadowTabs() . '
         });
     });
-});
-</script>
+});';
+    ?>
+    <?= $secureRenderer->renderTag('script', [], /* @noEscape */ $scriptString, false); ?>
 <?php endif; ?>
diff --git a/app/code/Magento/CatalogUrlRewrite/view/adminhtml/templates/confirm.phtml b/app/code/Magento/CatalogUrlRewrite/view/adminhtml/templates/confirm.phtml
index 800ecfd8a6e2f..9708f89f6377f 100644
--- a/app/code/Magento/CatalogUrlRewrite/view/adminhtml/templates/confirm.phtml
+++ b/app/code/Magento/CatalogUrlRewrite/view/adminhtml/templates/confirm.phtml
@@ -3,20 +3,28 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/**
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
-<script>
+
+<?php $scriptString = <<<script
     require([
         "jquery",
         "Magento_Ui/js/modal/confirm",
         "mage/translate",
-    ], function(jQuery, confirmation, $t) {
+    ], function(jQuery, confirmation, _t) {
     //confirmation for removing category/product URL rewrites
         jQuery('select.generate_category_product_rewrites').on('change', function () {
             if (this.value == 0) {
                 confirmation({
-                    title: $t('Turn off "category/products" URL rewrites?'),
-                    content: $t('Turning off automatic generation of "category/products" URL rewrites will result in permanent removal of all the currently existing “category/product” type URL rewrites without an ability to restore them back. ' +
-                        'This may potentially cause unresolved “category/product” type URL conflicts which you have to resolve by updating URL key manually.'),
+                    title: _t('Turn off "category/products" URL rewrites?'),
+                    content: _t('Turning off automatic generation of "category/products" URL rewrites will result in ' +
+                     'permanent removal of all the currently existing “category/product” type URL rewrites without ' +
+                      'an ability to restore them back. ' +
+                        'This may potentially cause unresolved “category/product” type URL conflicts which you have ' +
+                        'to resolve by updating URL key manually.'),
                     actions: {
                         cancel: function () {
                             jQuery('select.generate_category_product_rewrites').val(1);
@@ -27,4 +35,6 @@
             }
         });
     });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
index 28275e0223936..56cd8cd7a1fab 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
@@ -5,6 +5,7 @@
  */
 
 /** @var $block \Magento\Checkout\Block\Cart\Sidebar */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
 <div data-block="minicart" class="minicart-wrapper">
@@ -12,7 +13,8 @@
        data-bind="scope: 'minicart_content'">
         <span class="text"><?= $block->escapeHtml(__('My Cart')) ?></span>
         <span class="counter qty empty"
-              data-bind="css: { empty: !!getCartParam('summary_count') == false && !isLoading() }, blockLoader: isLoading">
+              data-bind="css: { empty: !!getCartParam('summary_count') == false && !isLoading() },
+               blockLoader: isLoading">
             <span class="counter-number"><!-- ko text: getCartParam('summary_count') --><!-- /ko --></span>
             <span class="counter-label">
             <!-- ko if: getCartParam('summary_count') -->
@@ -22,7 +24,7 @@
             </span>
         </span>
     </a>
-    <?php if ($block->getIsNeedToDisplaySideBar()) :?>
+    <?php if ($block->getIsNeedToDisplaySideBar()):?>
         <div class="block block-minicart"
              data-role="dropdownDialog"
              data-mage-init='{"dropdownDialog":{
@@ -39,18 +41,19 @@
             </div>
             <?= $block->getChildHtml('minicart.addons') ?>
         </div>
-    <?php else :?>
-        <script>
+    <?php else: ?>
+        <?php $scriptString = <<<script
             require(['jquery'], function ($) {
                 $('a.action.showcart').click(function() {
                     $(document.body).trigger('processStart');
                 });
             });
-        </script>
+script;
+        ?>
+        <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
     <?php endif ?>
-    <script>
-        window.checkout = <?= /* @noEscape */ $block->getSerializedConfig() ?>;
-    </script>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], 'window.checkout = ' .
+     /* @noEscape */ $block->getSerializedConfig(), false); ?>
     <script type="text/x-magento-init">
     {
         "[data-block='minicart']": {
@@ -64,5 +67,3 @@
     }
     </script>
 </div>
-
-
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
index a44d37dccfdc5..78625521403a4 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
@@ -6,7 +6,7 @@
 
 ?>
 <?php /** @var $block \Magento\Checkout\Block\Cart\Shipping */ ?>
-
+<?php /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */ ?>
 <div id="block-shipping"
      class="block shipping"
      data-mage-init='{"collapsible":{"openedState": "active", "saveState": true}}'
@@ -33,8 +33,11 @@
                 }
             }
         </script>
-        <script>
-            window.checkoutConfig = <?= /* @noEscape */ $block->getSerializedCheckoutConfig() ?>;
+<?php $serializedCheckoutConfig = /* @noEscape */ $block->getSerializedCheckoutConfig();
+
+$scriptString = <<<script
+
+            window.checkoutConfig = {$serializedCheckoutConfig};
             window.customerData = window.checkoutConfig.customerData;
             window.isCustomerLoggedIn = window.checkoutConfig.isCustomerLoggedIn;
             require([
@@ -42,10 +45,12 @@
                 'Magento_Ui/js/block-loader'
             ], function(url, blockLoader) {
                 blockLoader(
-                    "<?= $block->escapeJs($block->escapeUrl($block->getViewFileUrl('images/loader-1.gif'))) ?>"
+                    "{$block->escapeJs($block->escapeUrl($block->getViewFileUrl('images/loader-1.gif')))}"
                 );
-                return url.setBaseUrl('<?= $block->escapeJs($block->escapeUrl($block->getBaseUrl())) ?>');
+                return url.setBaseUrl('{$block->escapeJs($block->escapeUrl($block->getBaseUrl()))}');
             })
-        </script>
+script;
+?>
+        <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
     </div>
 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
index 55f7039f33344..39df3cb121ba5 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
@@ -5,7 +5,9 @@
  */
 
 /** @var $block \Magento\Checkout\Block\Onepage */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
+
 <div id="checkout" data-bind="scope:'checkout'" class="checkout-container">
     <div id="checkout-loader" data-role="checkout-loader" class="loading-mask" data-mage-init='{"checkoutLoader": {}}'>
         <div class="loader">
@@ -22,19 +24,24 @@
             }
         }
     </script>
-    <script>
-        window.checkoutConfig = <?= /* @noEscape */ $block->getSerializedCheckoutConfig() ?>;
+    <?php $serializedCheckoutConfig = /* @noEscape */ $block->getSerializedCheckoutConfig();
+    $scriptString = <<<script
+        window.checkoutConfig = {$serializedCheckoutConfig};
         // Create aliases for customer.js model from customer module
         window.isCustomerLoggedIn = window.checkoutConfig.isCustomerLoggedIn;
         window.customerData = window.checkoutConfig.customerData;
-    </script>
-    <script>
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
+    <?php $scriptString = <<<script
         require([
             'mage/url',
             'Magento_Ui/js/block-loader'
         ], function(url, blockLoader) {
-            blockLoader("<?= $block->escapeJs($block->escapeUrl($block->getViewFileUrl('images/loader-1.gif'))) ?>");
-            return url.setBaseUrl('<?= $block->escapeJs($block->escapeUrl($block->getBaseUrl())) ?>');
+            blockLoader("{$block->escapeJs($block->escapeUrl($block->getViewFileUrl('images/loader-1.gif')))}");
+            return url.setBaseUrl('{$block->escapeJs($block->escapeUrl($block->getBaseUrl()))}');
         })
-    </script>
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 </div>
diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml
index 7e7a540e88b2e..5b9a17fca15c3 100644
--- a/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml
+++ b/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml
@@ -3,6 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/**
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
 <?php
 /**
@@ -14,11 +18,13 @@
  *  getConfigSearchParamsJson() - string
  */
 ?>
-<style>
-    .highlighted {
-        background-color: #DFF7FF!important;
-    }
-</style>
+
+<?= /* @noEscape */ $secureRenderer->renderTag(
+    'style',
+    [],
+    '.highlighted { background-color: #DFF7FF!important; }'
+) ?>
+
 <form action="<?= $block->escapeUrl($block->getSaveUrl()) ?>" method="post" id="config-edit-form"
       enctype="multipart/form-data">
     <?= $block->getBlockHtml('formkey') ?>
@@ -26,7 +32,8 @@
         <?= $block->getChildHtml('form') ?>
     </div>
 </form>
-<script>
+
+<?php $scriptString = <<<script
 require([
     "jquery",
     "uiRegistry",
@@ -73,14 +80,14 @@ require([
             }
         },
         getUp: function (element, tag) {
-            var $element = Element.extend(element);
-            if (typeof $element.upTag == 'undefined') {
-                $element.upTag = {};
+            var _element = Element.extend(element);
+            if (typeof _element.upTag == 'undefined') {
+                _element.upTag = {};
             }
-            if (typeof $element.upTag[tag] == 'undefined') {
-                $element.upTag[tag] = Element.extend($element.up(tag));
+            if (typeof _element.upTag[tag] == 'undefined') {
+                _element.upTag[tag] = Element.extend(_element.up(tag));
             }
-            return $element.upTag[tag];
+            return _element.upTag[tag];
         },
         getUpTd: function (element) {
             return this.getUp(element, 'td');
@@ -89,26 +96,26 @@ require([
             return this.getUp(element, 'tr');
         },
         getScopeElement: function(element) {
-            var $element = Element.extend(element);
-            if (typeof $element.scopeElement == 'undefined') {
+            var _element = Element.extend(element);
+            if (typeof _element.scopeElement == 'undefined') {
                 var scopeElementName = element.getAttribute('name').replace(/\[value\]$/, '[inherit]');
-                $element.scopeElement = this.getUpTr(element).select('input[name="' + scopeElementName + '"]')[0];
-                if (typeof $element.scopeElement == 'undefined') {
-                    $element.scopeElement = false;
+                _element.scopeElement = this.getUpTr(element).select('input[name="' + scopeElementName + '"]')[0];
+                if (typeof _element.scopeElement == 'undefined') {
+                    _element.scopeElement = false;
                 }
             }
-            return $element.scopeElement;
+            return _element.scopeElement;
         },
         getDeleteElement: function(element) {
-            var $element = Element.extend(element);
-            if (typeof $element.deleteElement == 'undefined') {
-                $element.deleteElement = this.getUpTd(element)
+            var _element = Element.extend(element);
+            if (typeof _element.deleteElement == 'undefined') {
+                _element.deleteElement = this.getUpTd(element)
                     .select('input[name="'+ element.getAttribute('name') + '[delete]"]')[0];
-                if (typeof $element.deleteElement == 'undefined') {
-                    $element.deleteElement = false;
+                if (typeof _element.deleteElement == 'undefined') {
+                    _element.deleteElement = false;
                 }
             }
-            return $element.deleteElement;
+            return _element.deleteElement;
         },
         mapClasses: function(element, full, callback, classPrefix) {
             if (typeof classPrefix == 'undefined') {
@@ -159,11 +166,11 @@ require([
 
                     var tagName = el.tagName.toLowerCase();
                     if (tagName == 'input' && el.getAttribute('type') == 'file') {
-                        var $el = Element.extend(el);
+                        var _el = Element.extend(el);
                         var events = adminSystemConfig.getRegisteredEvents(el);
-                        $el.stopObserving('change');
-                        var elId = $el.id;
-                        $el.replace($el.outerHTML);
+                        _el.stopObserving('change');
+                        var elId = _el.id;
+                        _el.replace(_el.outerHTML);
                         events.each(function(event) {
                             Event.observe(
                                 Element.extend(document.getElementById(elId)), event.eventName, event.handler
@@ -176,9 +183,9 @@ require([
                                 Element.extend(el).click();
                             }
                         } else if (tagName == 'select') {
-                            var $el = Element.extend(el);
+                            var _el = Element.extend(el);
                             Element.extend(element).select('option').each(function(option) {
-                                var relatedOption = $el.select('option[value="' + option.value + '"]')[0];
+                                var relatedOption = _el.select('option[value="' + option.value + '"]')[0];
                                 if (typeof relatedOption != 'undefined') {
                                     relatedOption.selected = option.selected;
                                 }
@@ -392,7 +399,8 @@ require([
     handleHash();
 
     registry.set('adminSystemConfig', adminSystemConfig);
+script;
+$scriptString .= 'adminSystemConfig.navigateToElement(' . /* @noEscape */ $block->getConfigSearchParamsJson() . ');
+});';
 
-    adminSystemConfig.navigateToElement(<?= /* @noEscape */ $block->getConfigSearchParamsJson(); ?>);
-});
-</script>
+echo /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false);
diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/js.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/js.phtml
index 297687786833d..de83471e5eff4 100644
--- a/app/code/Magento/Config/view/adminhtml/templates/system/config/js.phtml
+++ b/app/code/Magento/Config/view/adminhtml/templates/system/config/js.phtml
@@ -3,8 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/**
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
-<script>
+
+<?php $scriptString = <<<script
 require([
     'prototype'
 ], function () {
@@ -68,7 +73,11 @@ originModel.prototype = {
     {
         this.reload = false;
         this.loader = new varienLoader(true);
-        this.regionsUrl = "<?= $block->escapeJs($block->escapeUrl($block->getUrl('directory/json/countryRegion'))) ?>";
+script;
+
+$scriptString .= 'this.regionsUrl = "' .
+    $block->escapeJs($block->escapeUrl($block->getUrl('directory/json/countryRegion'))) . '";';
+$scriptString .= <<<script
 
         this.bindCountryRegionRelation();
     },
@@ -259,4 +268,7 @@ function showHint() {
 Event.observe(window, 'load', showHint);
 
 });
-</script>
+script;
+?>
+
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
diff --git a/app/code/Magento/Cookie/view/base/templates/html/cookie.phtml b/app/code/Magento/Cookie/view/base/templates/html/cookie.phtml
index b05c53db02abf..f9d9c9071d69d 100644
--- a/app/code/Magento/Cookie/view/base/templates/html/cookie.phtml
+++ b/app/code/Magento/Cookie/view/base/templates/html/cookie.phtml
@@ -8,10 +8,11 @@
  * Cookie settings initialization script
  *
  * @var $block \Magento\Framework\View\Element\Js\Cookie
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
-?>
 
-<script>
+$scriptString = '
     window.cookiesConfig = window.cookiesConfig || {};
-    window.cookiesConfig.secure = <?= /* @noEscape */ $block->getSessionConfig()->getCookieSecure() ? 'true' : 'false' ?>;
-</script>
+    window.cookiesConfig.secure = ' . /* @noEscape */ $block->getSessionConfig()->getCookieSecure() ? 'true' : 'false';
+
+echo /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false);
diff --git a/app/code/Magento/Customer/view/adminhtml/templates/system/config/validatevat.phtml b/app/code/Magento/Customer/view/adminhtml/templates/system/config/validatevat.phtml
index 6525e7f29f36b..60b351100eb33 100644
--- a/app/code/Magento/Customer/view/adminhtml/templates/system/config/validatevat.phtml
+++ b/app/code/Magento/Customer/view/adminhtml/templates/system/config/validatevat.phtml
@@ -5,8 +5,16 @@
  */
 
 /** @var \Magento\Customer\Block\Adminhtml\System\Config\Validatevat $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<script>
+
+<?php
+ $merchantCountryField = $block->escapeJs($block->getMerchantCountryField());
+ $merchantVatNumberField = $block->escapeJs($block->getMerchantVatNumberField());
+ $ajaxUrl = $block->escapeJs($block->escapeUrl($block->getAjaxUrl()));
+ $errorMessage = $block->escapeJs($block->escapeHtml(__('Error during VAT Number verification.')));
+
+ $scriptString = <<<script
 require(['prototype'], function(){
 
 //<![CDATA[
@@ -14,21 +22,22 @@ require(['prototype'], function(){
         var validationMessage = $('validation_result');
 
         params = {
-            country: $('<?= $block->escapeJs($block->getMerchantCountryField()) ?>').value,
-            vat: $('<?= $block->escapeJs($block->getMerchantVatNumberField()) ?>').value
+            country: $('{$merchantCountryField}').value,
+            vat: $('{$merchantVatNumberField}').value
         };
 
-        new Ajax.Request('<?= $block->escapeJs($block->escapeUrl($block->getAjaxUrl())) ?>', {
+        new Ajax.Request('{$ajaxUrl}', {
             parameters: params,
             onSuccess: function(response) {
-                var result = '<?= $block->escapeJs($block->escapeHtml(__('Error during VAT Number verification.'))) ?>';
+                var result = '{$errorMessage}';
                 try {
                     if (response.responseText.isJSON()) {
                         response = response.responseText.evalJSON();
                         result = response.message;
                     }
                     if (response.valid == 1) {
-                        validationMessage.removeClassName('hidden').removeClassName('admin__field-error').addClassName('note');
+                        validationMessage.removeClassName('hidden').removeClassName('admin__field-error').
+                        addClassName('note');
                         validationMessage.setStyle({color:'green'});
                     } else {
                         validationMessage.removeClassName('hidden').addClassName('admin__field-error');
@@ -45,11 +54,26 @@ require(['prototype'], function(){
 //]]>
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
+
 <div class="actions actions-validate-vat">
-    <p class="admin__field-error hidden" id="validation_result" style="margin-bottom:10px;"></p>
-    <button onclick="javascript:validateVat(); return false;" class="action-validate-vat" type="button" id="<?= $block->escapeHtmlAttr($block->getHtmlId()) ?>">
+    <p class="admin__field-error hidden" id="validation_result"></p>
+    <button class="action-validate-vat" type="button" id="<?= /* @noEscape */ $block->getHtmlId() ?>">
         <span><?= $block->escapeHtml($block->getButtonLabel()) ?></span>
     </button>
 </div>
+<?= /* @noEscape */ $secureRenderer->renderTag('style', [], '#validation_result {margin-bottom: 10px;}', false); ?>
 
+<?php
+ $htmlId = /* @noEscape */ $block->getHtmlId();
+ $scriptString =<<<script
+require(['jquery'], function($) {
+    $('#{$htmlId}').on('click', function() {
+        javascript:validateVat(); return false;
+        });
+    });
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
diff --git a/app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml b/app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml
index 0d4cf3c721d14..55ff54a519afd 100644
--- a/app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml
@@ -5,11 +5,11 @@
  */
 
 /** @var \Magento\Customer\Block\Account\AuthenticationPopup $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<div id="authenticationPopup" data-bind="scope:'authenticationPopup'" style="display: none;">
-    <script>
-        window.authenticationPopup = <?= /* @noEscape */ $block->getSerializedConfig() ?>;
-    </script>
+<div id="authenticationPopup" data-bind="scope:'authenticationPopup'">
+    <?php $scriptString = 'window.authenticationPopup = ' . /* @noEscape */ $block->getSerializedConfig(); ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>;
     <!-- ko template: getTemplate() --><!-- /ko -->
     <script type="text/x-magento-init">
         {
@@ -17,8 +17,11 @@
                 "Magento_Ui/js/core/app": <?= /* @noEscape */ $block->getJsLayout() ?>
             },
             "*": {
-                "Magento_Ui/js/block-loader": "<?= $block->escapeJs($block->escapeUrl($block->getViewFileUrl('images/loader-1.gif'))) ?>"
+                "Magento_Ui/js/block-loader": "<?= $block->escapeJs($block->escapeUrl($block->getViewFileUrl(
+                    'images/loader-1.gif'
+                ))) ?>"
             }
         }
     </script>
 </div>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display:none', '#authenticationPopup'); ?>
diff --git a/app/code/Magento/PageCache/view/adminhtml/templates/page_cache_validation.phtml b/app/code/Magento/PageCache/view/adminhtml/templates/page_cache_validation.phtml
index 57bb5be87e138..b83e0a172574b 100644
--- a/app/code/Magento/PageCache/view/adminhtml/templates/page_cache_validation.phtml
+++ b/app/code/Magento/PageCache/view/adminhtml/templates/page_cache_validation.phtml
@@ -4,9 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\PageCache\Block\System\Config\Form\Field\Export $block */
+/**
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
-<script>
+
+<?php $scriptString = <<<script
 require(['jquery'], function($){
 
     //<![CDATA[
@@ -31,4 +34,6 @@ require(['jquery'], function($){
     //]]>
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/rules.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/rules.phtml
index ee97d60aa72f8..cd52dd06f9bc1 100644
--- a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/rules.phtml
+++ b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/rules.phtml
@@ -6,14 +6,18 @@
 
 /**
  * @var \Magento\Paypal\Block\Adminhtml\System\Config\ResolutionRules $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
-
 ?>
-<script>
+
+<?php $scriptString = <<<script
     require([
         "Magento_Paypal/js/solutions",
         "domReady!"
     ], function (Solutions) {
-        var solutions = new Solutions({config: {solutions: <?= /* @noEscape */ $block->getJson() ?>}});
-    });
-</script>
+script;
+
+$scriptString .= 'var solutions = new Solutions({config: {solutions: ' . /* @noEscape */ $block->getJson() . '}});
+    });';
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
diff --git a/app/code/Magento/Theme/view/frontend/templates/js/calendar.phtml b/app/code/Magento/Theme/view/frontend/templates/js/calendar.phtml
index 55798169cdf75..596333595eb5c 100644
--- a/app/code/Magento/Theme/view/frontend/templates/js/calendar.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/js/calendar.phtml
@@ -4,6 +4,9 @@
  * See COPYING.txt for license details.
  */
 
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/** @var \Magento\Framework\View\Element\Html\Calendar $block */
+
 /**
  * Calendar localization script. Should be put into page header.
  *
@@ -11,7 +14,9 @@
  */
 ?>
 
-<script>
+<?php $intFirstDay = (int)$firstDay;
+$scriptString = <<<script
+
 require([
     'jquery',
     'jquery-ui-modules/datepicker'
@@ -20,23 +25,23 @@ require([
 //<![CDATA[
     $.extend(true, $, {
         calendarConfig: {
-            dayNames: <?= /* @noEscape */ $days['wide'] ?>,
-            dayNamesMin: <?= /* @noEscape */ $days['abbreviated'] ?>,
-            monthNames: <?= /* @noEscape */ $months['wide'] ?>,
-            monthNamesShort: <?= /* @noEscape */ $months['abbreviated'] ?>,
-            infoTitle: "<?= $block->escapeJs(__('About the calendar')) ?>",
-            firstDay: <?= (int)$firstDay ?>,
-            closeText: "<?= $block->escapeJs(__('Close')) ?>",
-            currentText: "<?= $block->escapeJs(__('Go Today')) ?>",
-            prevText: "<?= $block->escapeJs(__('Previous')) ?>",
-            nextText: "<?= $block->escapeJs(__('Next')) ?>",
-            weekHeader: "<?= $block->escapeJs(__('WK')) ?>",
-            timeText: "<?= $block->escapeJs(__('Time')) ?>",
-            hourText: "<?= $block->escapeJs(__('Hour')) ?>",
-            minuteText: "<?= $block->escapeJs(__('Minute')) ?>",
+            dayNames: {$days['wide']},
+            dayNamesMin: {$days['abbreviated']},
+            monthNames: {$months['wide']},
+            monthNamesShort: {$months['abbreviated']},
+            infoTitle: '{$block->escapeJs(__('About the calendar'))}',
+            firstDay: {$intFirstDay},
+            closeText: '{$block->escapeJs(__('Close'))}',
+            currentText: '{$block->escapeJs(__('Go Today'))}',
+            prevText: '{$block->escapeJs(__('Previous'))}',
+            nextText: '{$block->escapeJs(__('Next'))}',
+            weekHeader: '{$block->escapeJs(__('WK'))}',
+            timeText: '{$block->escapeJs(__('Time'))}',
+            hourText: '{$block->escapeJs(__('Hour'))}',
+            minuteText: '{$block->escapeJs(__('Minute'))}',
             dateFormat: $.datepicker.RFC_2822,
-            showOn: "button",
-            showAnim: "",
+            showOn: 'button',
+            showAnim: '',
             changeMonth: true,
             changeYear: true,
             buttonImageOnly: null,
@@ -50,8 +55,10 @@ require([
         }
     });
 
-    enUS = <?= /* @noEscape */ $enUS ?>; // en_US locale reference
+    enUS = {$enUS}; // en_US locale reference
 //]]>
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Theme/view/frontend/templates/js/cookie_status.phtml b/app/code/Magento/Theme/view/frontend/templates/js/cookie_status.phtml
index 2da71c90b5657..ad6c88fc2108d 100644
--- a/app/code/Magento/Theme/view/frontend/templates/js/cookie_status.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/js/cookie_status.phtml
@@ -3,11 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
-<div id="cookie-status" style="display: none">
+<div id="cookie-status">
     <?= $block->escapeHtml(__('The store will not work correctly in the case when cookies are disabled.')); ?>
 </div>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display:none', '#cookie-status'); ?>
 
 <script type="text/x-magento-init">
     {
@@ -16,5 +19,3 @@
         }
     }
 </script>
-
-
diff --git a/app/code/Magento/Theme/view/frontend/templates/page/js/require_js.phtml b/app/code/Magento/Theme/view/frontend/templates/page/js/require_js.phtml
index ad998c56b963f..b56468ba07f9d 100644
--- a/app/code/Magento/Theme/view/frontend/templates/page/js/require_js.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/page/js/require_js.phtml
@@ -3,10 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-<script>
-    var BASE_URL = '<?= $block->escapeUrl($block->getBaseUrl()) ?>';
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+
+$scriptString = '
+    var BASE_URL = \'' . /* @noEscape */ $block->escapeUrl($block->getBaseUrl()) .'\';
     var require = {
-        "baseUrl": "<?= $block->escapeUrl($block->getViewFileUrl('/')) ?>"
-    };
-</script>
+        \'baseUrl\': \'' . /* @noEscape */ $block->escapeUrl($block->getViewFileUrl('/')) . '\'
+    };';
+
+echo /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false);
diff --git a/app/code/Magento/Translation/view/base/templates/translate.phtml b/app/code/Magento/Translation/view/base/templates/translate.phtml
index 4c257eb76843f..bd74db151387d 100644
--- a/app/code/Magento/Translation/view/base/templates/translate.phtml
+++ b/app/code/Magento/Translation/view/base/templates/translate.phtml
@@ -4,14 +4,22 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Translation\Block\Js $block */
+/**
+ * @var \Magento\Translation\Block\Js $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
 <!--
-    For frontend area dictionary file is inserted into html head in Magento/Translation/view/base/templates/dictionary.phtml
-    Same translation mechanism should be introduced for admin area in 2.4 version.
+For frontend area dictionary file is inserted into html head in Magento/Translation/view/base/templates/dictionary.phtml
+Same translation mechanism should be introduced for admin area in 2.4 version.
 -->
-<?php if ($block->dictionaryEnabled()) : ?>
-    <script>
+<?php
+if ($block->dictionaryEnabled()) {
+    $version = $block->getTranslationFileVersion();
+    $escapedVersion = $block->escapeJs($version);
+    $dictionaryFileName = /* @noEscape */ Magento\Translation\Model\Js\Config::DICTIONARY_FILE_NAME;
+
+    $scriptString = <<<script
         require.config({
             deps: [
                 'jquery',
@@ -28,11 +36,9 @@
                 $.initNamespaceStorage('mage-translation-file-version');
                 versionObj = $.localStorage.get('mage-translation-file-version');
 
-                <?php $version = $block->getTranslationFileVersion(); ?>
-
-                if (versionObj.version !== '<?= $block->escapeJs($version) ?>') {
+                if (versionObj.version !== '{$escapedVersion}') {
                     dependencies.push(
-                        'text!<?= /* @noEscape */ Magento\Translation\Model\Js\Config::DICTIONARY_FILE_NAME ?>'
+                        'text!{$dictionaryFileName}'
                     );
 
                 }
@@ -46,7 +52,7 @@
                             $.localStorage.set(
                                 'mage-translation-file-version',
                                 {
-                                    version: '<?= $block->escapeJs($version) ?>'
+                                    version: '{$escapedVersion}'
                                 }
                             );
                         } else {
@@ -56,5 +62,6 @@
                 });
             }
         });
-    </script>
-<?php endif; ?>
+script;
+    echo /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false);
+}
diff --git a/app/code/Magento/Ui/view/base/templates/logger.phtml b/app/code/Magento/Ui/view/base/templates/logger.phtml
index 7466781a606f1..b93ac7542464b 100644
--- a/app/code/Magento/Ui/view/base/templates/logger.phtml
+++ b/app/code/Magento/Ui/view/base/templates/logger.phtml
@@ -5,11 +5,13 @@
  */
 
 /** @var $block \Magento\Ui\Block\Logger */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<?php if ($block->isLoggingEnabled()) : ?>
-    <script>
+<?php if ($block->isLoggingEnabled()): ?>
+    <?php $scriptString = <<<script
+
         window.onerror = function(msg, url, line) {
-            var key = "<?= $block->escapeJs($block->getSessionStorageKey()) ?>";
+            var key = "{$block->escapeJs($block->getSessionStorageKey())}";
             var errors = {};
             if (sessionStorage.getItem(key)) {
                 errors = JSON.parse(sessionStorage.getItem(key));
@@ -20,5 +22,7 @@
             errors[window.location.href].push("error: \'" + msg + "\' " + "file: " + url + " " + "line: " + line);
             sessionStorage.setItem(key, JSON.stringify(errors));
         };
-    </script>
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Ui/view/base/templates/wysiwyg/active_editor.phtml b/app/code/Magento/Ui/view/base/templates/wysiwyg/active_editor.phtml
index a7c279c431665..ff8236478bbbd 100644
--- a/app/code/Magento/Ui/view/base/templates/wysiwyg/active_editor.phtml
+++ b/app/code/Magento/Ui/view/base/templates/wysiwyg/active_editor.phtml
@@ -5,13 +5,17 @@
  */
 
 /** @var Magento\Ui\Block\Wysiwyg\ActiveEditor $block */
-?>
-<script>
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+
+$wysiwygAdapterPath = /* @noEscape */ $block->getWysiwygAdapterPath();
+$scriptString = <<<script
     require.config({
         map: {
             '*': {
-                wysiwygAdapter: '<?= /* @noEscape */ $block->getWysiwygAdapterPath() ?>'
+                wysiwygAdapter: '{$wysiwygAdapterPath}'
             }
         }
     });
-</script>
+script;
+
+echo /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false);
diff --git a/app/code/Magento/Ups/Block/Backend/System/CarrierConfig.php b/app/code/Magento/Ups/Block/Backend/System/CarrierConfig.php
index 15e782efd0757..94540b13f13c6 100644
--- a/app/code/Magento/Ups/Block/Backend/System/CarrierConfig.php
+++ b/app/code/Magento/Ups/Block/Backend/System/CarrierConfig.php
@@ -7,8 +7,10 @@
 
 use Magento\Backend\Block\Template;
 use Magento\Backend\Block\Template\Context as TemplateContext;
+use Magento\Framework\App\ObjectManager;
 use Magento\Store\Model\Website;
 use Magento\Ups\Helper\Config as ConfigHelper;
+use Magento\Framework\Json\Helper\Data as JsonHelper;
 
 /**
  * Backend shipping UPS content block
@@ -44,6 +46,7 @@ public function __construct(
     ) {
         $this->carrierConfig = $carrierConfig;
         $this->_websiteModel = $websiteModel;
+        $data['jsonHelper'] = ObjectManager::getInstance()->get(JsonHelper::class);
         parent::__construct($context, $data);
     }
 
diff --git a/app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml b/app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml
index c4298cd8dc046..8ebb1155c9f51 100644
--- a/app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml
+++ b/app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml
@@ -8,6 +8,8 @@
 
 /** @var $upsModel \Magento\Ups\Helper\Config */
 /** @var $block \Magento\Ups\Block\Backend\System\CarrierConfig */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+
 $upsCarrierConfig = $block->getCarrierConfig();
 $orShipArr = $upsCarrierConfig->getCode('originShipment');
 $defShipArr = $upsCarrierConfig->getCode('method');
@@ -16,6 +18,8 @@ $sectionCode = $block->getRequest()->getParam('section');
 $websiteCode = $block->getRequest()->getParam('website');
 $storeCode = $block->getRequest()->getParam('store');
 
+$jsonHelper = $block->getData('jsonHelper');
+
 if (!$storeCode && $websiteCode) {
     /** @var $web \Magento\Store\Model\Website */
     $web = $block->getWebsiteModel()->load($websiteCode);
@@ -35,7 +39,8 @@ if (!$storeCode && $websiteCode) {
     $storedUpsType        = $block->escapeHtml($block->getConfig('carriers/ups/type'));
 }
 ?>
-<script>
+
+<?php $scriptString = <<<script
 require(["prototype"], function(){
 
 //<![CDATA[
@@ -85,14 +90,17 @@ require(["prototype"], function(){
                 'carriers_ups_mode_xml','carriers_ups_include_taxes'];
             this.onlyUpsElements = ['carriers_ups_gateway_url'];
 
-            this.storedOriginShipment = '<?= /* @noEscape */ $storedOriginShipment ?>';
-            this.storedFreeShipment = '<?= /* @noEscape */ $storedFreeShipment ?>';
-            this.storedUpsType = '<?= /* @noEscape */ $storedUpsType ?>';
-            <?php /** @var $jsonHelper \Magento\Framework\Json\Helper\Data */ $jsonHelper = $this->helper(\Magento\Framework\Json\Helper\Data::class); ?>
-            this.storedAllowedMethods = <?= /* @noEscape */ $jsonHelper->jsonEncode($storedAllowedMethods) ?>;
-            this.originShipmentObj = <?= /* @noEscape */ $jsonHelper->jsonEncode($orShipArr) ?>;
-            this.originShipmentObj['default'] = <?= /* @noEscape */ $jsonHelper->jsonEncode($defShipArr) ?>;
+script;
+$scriptString .= 'this.storedOriginShipment = \'' . /* @noEscape */ $storedOriginShipment . '\';
+            this.storedFreeShipment = \'' . /* @noEscape */ $storedFreeShipment . '\';
+            this.storedUpsType = \'' .  /* @noEscape */ $storedUpsType . '\';';
+?>
+<?php $scriptString .= 'this.storedAllowedMethods = ' . /* @noEscape */ $jsonHelper->jsonEncode($storedAllowedMethods) .
+    ';
+            this.originShipmentObj = ' . /* @noEscape */ $jsonHelper->jsonEncode($orShipArr) . ';
+            this.originShipmentObj[\'default\'] = ' . /* @noEscape */ $jsonHelper->jsonEncode($defShipArr) . ';';
 
+$scriptString .= <<<script
             this.setFormValues();
             Event.observe($(this.carriersUpsTypeId), 'change', this.setFormValues.bind(this));
             Event.observe($(this.carriersUpsActiveId), 'change', this.setFormValues.bind(this));
@@ -110,8 +118,13 @@ require(["prototype"], function(){
             while (freeMethod.length > 0) {
                 freeMethod.remove(0);
             }
-            freeMethod.insert(new Element('option', {value:''}).update('<?= $block->escapeHtml(__('None')) ?>'));
 
+script;
+
+$scriptString .= 'freeMethod.insert(new Element(\'option\', {value:\'\'}).update(\'' . $block->escapeHtml(__('None')) .
+    '\'));';
+
+$scriptString .= <<<script
             var code, option;
             for (code in originShipment) {
                 option = new Element('option', {value:code}).update(originShipment[code]);
@@ -145,7 +158,7 @@ require(["prototype"], function(){
         setFormValues: function()
         {
             var a;
-            if ($F(this.carriersUpsTypeId) == 'UPS') {
+            if ($(this.carriersUpsTypeId) == 'UPS') {
                 for (a = 0; a < this.checkingUpsXmlId.length; a++) {
                     $(this.checkingUpsXmlId[a]).removeClassName('required-entry');
                 }
@@ -173,13 +186,13 @@ require(["prototype"], function(){
         },
         changeOriginShipment: function(Event, key)
         {
-            this.originShipmentTitle = key ? key : $F('carriers_ups_origin_shipment');
+            this.originShipmentTitle = key ? key : $('carriers_ups_origin_shipment');
             this.updateAllowedMethods(this.originShipmentTitle);
         },
         changeFieldsDisabledState: function (fields, key) {
-            $(fields[key]).disabled = $F(this.carriersUpsActiveId) !== '1'
+            $(fields[key]).disabled = $(this.carriersUpsActiveId) !== '1'
                 || $(fields[key] + '_inherit') !== null
-                && $F(fields[key] + '_inherit') === '1';
+                && $(fields[key] + '_inherit') === '1';
 
             if ($(fields[key]).next() !== undefined) {
                 $(fields[key]).removeClassName('mage-error').next().remove();
@@ -191,4 +204,6 @@ require(["prototype"], function(){
     //]]>
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
diff --git a/lib/internal/Magento/Framework/View/Helper/Js.php b/lib/internal/Magento/Framework/View/Helper/Js.php
index e2a30cdd1a527..fe120562cb79e 100644
--- a/lib/internal/Magento/Framework/View/Helper/Js.php
+++ b/lib/internal/Magento/Framework/View/Helper/Js.php
@@ -9,6 +9,11 @@
  */
 namespace Magento\Framework\View\Helper;
 
+use Magento\Framework\App\ObjectManager;
+
+/**
+ * Class Js help render script.
+ */
 class Js
 {
     /**
@@ -19,6 +24,9 @@ class Js
      */
     public function getScript($script)
     {
-        return '<script type="text/javascript">//<![CDATA[' . "\n{$script}\n" . '//]]></script>';
+        $secureHtmlRenderer = ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+        $scriptString = '//<![CDATA[' . "\n{$script}\n" . '//]]>';
+
+        return /* @noEscape */ $secureHtmlRenderer->renderTag('script', [], $scriptString, false);
     }
 }

From 6f2b414aa6160e770d647e221ed59b11b5b5b9b5 Mon Sep 17 00:00:00 2001
From: Sachin Admane <sadmane@adobe.com>
Date: Thu, 9 Apr 2020 18:35:34 -0500
Subject: [PATCH 0145/1718] MC-22963: Identify and Refactor GET requests which
 modify data.

Fix typo in function.
---
 .../Search/Controller/Adminhtml/Synonyms/DeleteTest.php       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Search/Controller/Adminhtml/Synonyms/DeleteTest.php b/dev/tests/integration/testsuite/Magento/Search/Controller/Adminhtml/Synonyms/DeleteTest.php
index 39624a725ad72..ed8c3dba8f8d0 100644
--- a/dev/tests/integration/testsuite/Magento/Search/Controller/Adminhtml/Synonyms/DeleteTest.php
+++ b/dev/tests/integration/testsuite/Magento/Search/Controller/Adminhtml/Synonyms/DeleteTest.php
@@ -29,7 +29,7 @@ class DeleteTest extends AbstractBackendController
      */
     public function testExecute(): void
     {
-        $synonymGroupModel=$this->gettestFixture();
+        $synonymGroupModel=$this->getTestFixture();
         $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue(['group_id' => $synonymGroupModel->getGroupId()]);
         $this->dispatch('backend/search/synonyms/delete');
@@ -53,7 +53,7 @@ public function testExecuteNoId(): void
      *
      * @return SynonymGroup
      */
-    private function gettestFixture(): SynonymGroup
+    private function getTestFixture(): SynonymGroup
     {
         /** @var Collection */
         $synonymGroupCollection = Bootstrap::getObjectManager()->get(Collection::class);

From a9ca0f632da13071b9f44f706fda8740809e29d9 Mon Sep 17 00:00:00 2001
From: "v.prokopov" <v.prokopov@atwix.com>
Date: Fri, 10 Apr 2020 16:27:39 +0300
Subject: [PATCH 0146/1718] fixed condition when can show password input. Fixed
 logic for pulling email value from persistent storage

---
 .../Checkout/view/frontend/web/js/view/form/element/email.js   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js b/app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js
index c570bda51a80e..8311d97522980 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js
@@ -113,6 +113,7 @@ define([
 
             $.when(this.isEmailCheckComplete).done(function () {
                 this.isPasswordVisible(false);
+                checkoutData.setCheckedEmailValue('');
             }.bind(this)).fail(function () {
                 this.isPasswordVisible(true);
                 checkoutData.setCheckedEmailValue(this.email());
@@ -192,7 +193,7 @@ define([
          * @returns {Boolean} - initial visibility state.
          */
         resolveInitialPasswordVisibility: function () {
-            if (checkoutData.getInputFieldEmailValue() !== '' && checkoutData.getCheckedEmailValue() === '') {
+            if (checkoutData.getInputFieldEmailValue() !== '' && checkoutData.getCheckedEmailValue() !== '') {
                 return true;
             }
 

From 71bb134ba3cd0b45da7d7e7c857ae2cdd412b05b Mon Sep 17 00:00:00 2001
From: Buba Suma <soumah@adobe.com>
Date: Tue, 7 Apr 2020 18:17:34 -0500
Subject: [PATCH 0147/1718] MC-32962: [Magento Cloud] - Shopping Cart Rules not
 applying to children of Bundle

- Fix cart price rule should not be applied to all children of bundle item if only some child items pass the condition
---
 .../SalesRule/Model/Quote/Discount.php        |  95 ++++---
 .../Magento/SalesRule/Model/RulesApplier.php  |  23 +-
 .../Magento/SalesRule/Model/Validator.php     |   7 +
 .../Test/Unit/Model/Quote/DiscountTest.php    | 255 +++++-------------
 .../Test/Unit/Model/RulesApplierTest.php      |  46 ++--
 .../bundle_product_with_dynamic_price.php     |  84 ++++++
 ...le_product_with_dynamic_price_rollback.php |  32 +++
 ...with_bundle_product_with_dynamic_price.php |  53 ++++
 ...le_product_with_dynamic_price_rollback.php |  27 ++
 .../SalesRule/Model/Quote/DiscountTest.php    | 153 +++++++++++
 .../_files/cart_rule_product_sku.php          |  77 ++++++
 .../_files/cart_rule_product_sku_rollback.php |  39 +++
 12 files changed, 633 insertions(+), 258 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_with_dynamic_price.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_with_dynamic_price_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_bundle_product_with_dynamic_price.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_bundle_product_with_dynamic_price_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/SalesRule/Model/Quote/DiscountTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_product_sku.php
 create mode 100644 dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_product_sku_rollback.php

diff --git a/app/code/Magento/SalesRule/Model/Quote/Discount.php b/app/code/Magento/SalesRule/Model/Quote/Discount.php
index a580a8f9d2eaa..a32fe249920b1 100644
--- a/app/code/Magento/SalesRule/Model/Quote/Discount.php
+++ b/app/code/Magento/SalesRule/Model/Quote/Discount.php
@@ -6,37 +6,53 @@
 namespace Magento\SalesRule\Model\Quote;
 
 use Magento\Framework\App\ObjectManager;
-use Magento\SalesRule\Api\Data\RuleDiscountInterfaceFactory;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Quote\Api\Data\AddressInterface;
+use Magento\Quote\Api\Data\ShippingAssignmentInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Address\Total;
+use Magento\Quote\Model\Quote\Address\Total\AbstractTotal;
+use Magento\Quote\Model\Quote\Item;
+use Magento\Quote\Model\Quote\Item\AbstractItem;
+use Magento\SalesRule\Api\Data\DiscountDataInterface;
 use Magento\SalesRule\Api\Data\DiscountDataInterfaceFactory;
+use Magento\SalesRule\Api\Data\RuleDiscountInterfaceFactory;
+use Magento\SalesRule\Model\Data\RuleDiscount;
+use Magento\SalesRule\Model\Discount\PostProcessorFactory;
+use Magento\SalesRule\Model\Validator;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Discount totals calculation model.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Discount extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
+class Discount extends AbstractTotal
 {
     const COLLECTOR_TYPE_CODE = 'discount';
 
     /**
      * Discount calculation object
      *
-     * @var \Magento\SalesRule\Model\Validator
+     * @var Validator
      */
     protected $calculator;
 
     /**
      * Core event manager proxy
      *
-     * @var \Magento\Framework\Event\ManagerInterface
+     * @var ManagerInterface
      */
     protected $eventManager = null;
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     protected $storeManager;
 
     /**
-     * @var \Magento\Framework\Pricing\PriceCurrencyInterface
+     * @var PriceCurrencyInterface
      */
     protected $priceCurrency;
 
@@ -51,18 +67,18 @@ class Discount extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
     private $discountDataInterfaceFactory;
 
     /**
-     * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\SalesRule\Model\Validator $validator
-     * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
+     * @param ManagerInterface $eventManager
+     * @param StoreManagerInterface $storeManager
+     * @param Validator $validator
+     * @param PriceCurrencyInterface $priceCurrency
      * @param RuleDiscountInterfaceFactory|null $discountInterfaceFactory
      * @param DiscountDataInterfaceFactory|null $discountDataInterfaceFactory
      */
     public function __construct(
-        \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\SalesRule\Model\Validator $validator,
-        \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
+        ManagerInterface $eventManager,
+        StoreManagerInterface $storeManager,
+        Validator $validator,
+        PriceCurrencyInterface $priceCurrency,
         RuleDiscountInterfaceFactory $discountInterfaceFactory = null,
         DiscountDataInterfaceFactory $discountDataInterfaceFactory = null
     ) {
@@ -80,17 +96,17 @@ public function __construct(
     /**
      * Collect address discount amount
      *
-     * @param \Magento\Quote\Model\Quote $quote
-     * @param \Magento\Quote\Api\Data\ShippingAssignmentInterface $shippingAssignment
-     * @param \Magento\Quote\Model\Quote\Address\Total $total
+     * @param Quote $quote
+     * @param ShippingAssignmentInterface $shippingAssignment
+     * @param Total $total
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function collect(
-        \Magento\Quote\Model\Quote $quote,
-        \Magento\Quote\Api\Data\ShippingAssignmentInterface $shippingAssignment,
-        \Magento\Quote\Model\Quote\Address\Total $total
+        Quote $quote,
+        ShippingAssignmentInterface $shippingAssignment,
+        Total $total
     ) {
         parent::collect($quote, $shippingAssignment, $total);
 
@@ -122,7 +138,7 @@ public function collect(
         $address->getExtensionAttributes()->setDiscounts([]);
         $addressDiscountAggregator = [];
 
-        /** @var \Magento\Quote\Model\Quote\Item $item */
+        /** @var Item $item */
         foreach ($items as $item) {
             if ($item->getNoDiscount() || !$this->calculator->canApplyDiscount($item)) {
                 $item->setDiscountAmount(0);
@@ -147,7 +163,6 @@ public function collect(
 
             if ($item->getHasChildren() && $item->isChildrenCalculated()) {
                 $this->calculator->process($item);
-                $this->distributeDiscount($item);
                 foreach ($item->getChildren() as $child) {
                     $eventArgs['item'] = $child;
                     $this->eventManager->dispatch('sales_quote_address_discount_item', $eventArgs);
@@ -175,13 +190,13 @@ public function collect(
     /**
      * Aggregate item discount information to total data and related properties
      *
-     * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
-     * @param \Magento\Quote\Model\Quote\Address\Total $total
+     * @param AbstractItem $item
+     * @param Total $total
      * @return $this
      */
     protected function aggregateItemDiscount(
-        \Magento\Quote\Model\Quote\Item\AbstractItem $item,
-        \Magento\Quote\Model\Quote\Address\Total $total
+        AbstractItem $item,
+        Total $total
     ) {
         $total->addTotalAmount($this->getCode(), -$item->getDiscountAmount());
         $total->addBaseTotalAmount($this->getCode(), -$item->getBaseDiscountAmount());
@@ -191,10 +206,12 @@ protected function aggregateItemDiscount(
     /**
      * Distribute discount at parent item to children items
      *
-     * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
+     * @param AbstractItem $item
      * @return $this
+     * @deprecated No longer used.
+     * @see \Magento\SalesRule\Model\RulesApplier::applyRule()
      */
-    protected function distributeDiscount(\Magento\Quote\Model\Quote\Item\AbstractItem $item)
+    protected function distributeDiscount(AbstractItem $item)
     {
         $parentBaseRowTotal = $item->getBaseRowTotal();
         $keys = [
@@ -230,12 +247,12 @@ protected function distributeDiscount(\Magento\Quote\Model\Quote\Item\AbstractIt
     /**
      * Add discount total information to address
      *
-     * @param \Magento\Quote\Model\Quote $quote
-     * @param \Magento\Quote\Model\Quote\Address\Total $total
+     * @param Quote $quote
+     * @param Total $total
      * @return array|null
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Quote\Address\Total $total)
+    public function fetch(Quote $quote, Total $total)
     {
         $result = null;
         $amount = $total->getDiscountAmount();
@@ -254,25 +271,25 @@ public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Qu
     /**
      * Aggregates discount per rule
      *
-     * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
-     * @param \Magento\Quote\Api\Data\AddressInterface $address
+     * @param AbstractItem $item
+     * @param AddressInterface $address
      * @param array $addressDiscountAggregator
      * @return void
      */
     private function aggregateDiscountPerRule(
-        \Magento\Quote\Model\Quote\Item\AbstractItem $item,
-        \Magento\Quote\Api\Data\AddressInterface $address,
+        AbstractItem $item,
+        AddressInterface $address,
         array &$addressDiscountAggregator
     ) {
         $discountBreakdown = $item->getExtensionAttributes()->getDiscounts();
         if ($discountBreakdown) {
             foreach ($discountBreakdown as $value) {
-                /* @var \Magento\SalesRule\Api\Data\DiscountDataInterface $discount */
+                /* @var DiscountDataInterface $discount */
                 $discount = $value->getDiscountData();
                 $ruleLabel = $value->getRuleLabel();
                 $ruleID = $value->getRuleID();
                 if (isset($addressDiscountAggregator[$ruleID])) {
-                    /** @var \Magento\SalesRule\Model\Data\RuleDiscount $cartDiscount */
+                    /** @var RuleDiscount $cartDiscount */
                     $cartDiscount = $addressDiscountAggregator[$ruleID];
                     $discountData = $cartDiscount->getDiscountData();
                     $discountData->setBaseAmount($discountData->getBaseAmount()+$discount->getBaseAmount());
@@ -294,12 +311,12 @@ private function aggregateDiscountPerRule(
                         'rule' => $ruleLabel,
                         'rule_id' => $ruleID,
                     ];
-                    /** @var \Magento\SalesRule\Model\Data\RuleDiscount $cartDiscount */
+                    /** @var RuleDiscount $cartDiscount */
                     $cartDiscount = $this->discountInterfaceFactory->create(['data' => $data]);
                     $addressDiscountAggregator[$ruleID] = $cartDiscount;
                 }
             }
         }
-            $address->getExtensionAttributes()->setDiscounts(array_values($addressDiscountAggregator));
+        $address->getExtensionAttributes()->setDiscounts(array_values($addressDiscountAggregator));
     }
 }
diff --git a/app/code/Magento/SalesRule/Model/RulesApplier.php b/app/code/Magento/SalesRule/Model/RulesApplier.php
index 270732c8e0278..ede889c79fb9d 100644
--- a/app/code/Magento/SalesRule/Model/RulesApplier.php
+++ b/app/code/Magento/SalesRule/Model/RulesApplier.php
@@ -16,9 +16,7 @@
 use Magento\SalesRule\Api\Data\DiscountDataInterfaceFactory;
 
 /**
- * Class RulesApplier
- *
- * @package Magento\SalesRule\Model\Validator
+ * Rule applier model
  */
 class RulesApplier
 {
@@ -115,7 +113,6 @@ public function applyRules($item, $rules, $skipValidation, $couponCode)
             if (!$this->validatorUtility->canProcessRule($rule, $address)) {
                 continue;
             }
-
             if (!$skipValidation && !$rule->getActions()->validate($item)) {
                 if (!$this->childrenValidationLocator->isChildrenValidationRequired($item)) {
                     continue;
@@ -189,8 +186,22 @@ public function addDiscountDescription($address, $rule)
      */
     protected function applyRule($item, $rule, $address, $couponCode)
     {
-        $discountData = $this->getDiscountData($item, $rule, $address);
-        $this->setDiscountData($discountData, $item);
+        if ($item->getChildren() && $item->isChildrenCalculated()) {
+            $cloneItem = clone $item;
+            /**
+             * validate without children
+             */
+            $applyAll = $rule->getActions()->validate($cloneItem);
+            foreach ($item->getChildren() as $childItem) {
+                if ($applyAll || $rule->getActions()->validate($childItem)) {
+                    $discountData = $this->getDiscountData($childItem, $rule, $address);
+                    $this->setDiscountData($discountData, $childItem);
+                }
+            }
+        } else {
+            $discountData = $this->getDiscountData($item, $rule, $address);
+            $this->setDiscountData($discountData, $item);
+        }
 
         $this->maintainAddressCouponCode($address, $rule, $couponCode);
         $this->addDiscountDescription($address, $rule);
diff --git a/app/code/Magento/SalesRule/Model/Validator.php b/app/code/Magento/SalesRule/Model/Validator.php
index cdaac97fe6fb5..93acf4e699394 100644
--- a/app/code/Magento/SalesRule/Model/Validator.php
+++ b/app/code/Magento/SalesRule/Model/Validator.php
@@ -265,6 +265,13 @@ public function process(AbstractItem $item)
         $item->setDiscountAmount(0);
         $item->setBaseDiscountAmount(0);
         $item->setDiscountPercent(0);
+        if ($item->getChildren() && $item->isChildrenCalculated()) {
+            foreach ($item->getChildren() as $child) {
+                $child->setDiscountAmount(0);
+                $child->setBaseDiscountAmount(0);
+                $child->setDiscountPercent(0);
+            }
+        }
 
         $itemPrice = $this->getItemPrice($item);
         if ($itemPrice < 0) {
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/Quote/DiscountTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/Quote/DiscountTest.php
index 72355625318c5..640c2145f7704 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/Quote/DiscountTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/Quote/DiscountTest.php
@@ -5,58 +5,77 @@
  */
 namespace Magento\SalesRule\Test\Unit\Model\Quote;
 
+use Magento\Framework\Api\ExtensionAttributesInterface;
+use Magento\Framework\Event\Manager;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Quote\Api\Data\ShippingAssignmentInterface;
+use Magento\Quote\Api\Data\ShippingInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Address;
+use Magento\Quote\Model\Quote\Address\Total;
+use Magento\Quote\Model\Quote\Item;
+use Magento\SalesRule\Model\Quote\Discount;
+use Magento\SalesRule\Model\Rule\Action\Discount\Data;
+use Magento\SalesRule\Model\Rule\Action\Discount\DataFactory;
+use Magento\SalesRule\Model\Validator;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManager;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
 /**
- * Class DiscountTest
+ * Test discount totals calculation model
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class DiscountTest extends \PHPUnit\Framework\TestCase
+class DiscountTest extends TestCase
 {
     /**
-     * @var \Magento\SalesRule\Model\Quote\Discount
+     * @var Discount
      */
     protected $discount;
 
     /**
-     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     * @var ObjectManager
      */
     protected $objectManager;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     protected $storeManagerMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     protected $validatorMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     protected $eventManagerMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     protected $shippingAssignmentMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     protected $addressMock;
 
     /**
-     * @var \Magento\SalesRule\Model\Rule\Action\Discount\DataFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var DataFactory|MockObject
      */
     private $discountFactory;
 
     protected function setUp()
     {
-        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManager::class);
-        $this->validatorMock = $this->getMockBuilder(\Magento\SalesRule\Model\Validator::class)
+        $this->objectManager = new ObjectManager($this);
+        $this->storeManagerMock = $this->createMock(StoreManager::class);
+        $this->validatorMock = $this->getMockBuilder(Validator::class)
             ->disableOriginalConstructor()
             ->setMethods(
                 [
@@ -73,8 +92,8 @@ protected function setUp()
                 ]
             )
             ->getMock();
-        $this->eventManagerMock = $this->createMock(\Magento\Framework\Event\Manager::class);
-        $priceCurrencyMock = $this->createMock(\Magento\Framework\Pricing\PriceCurrencyInterface::class);
+        $this->eventManagerMock = $this->createMock(Manager::class);
+        $priceCurrencyMock = $this->createMock(PriceCurrencyInterface::class);
         $priceCurrencyMock->expects($this->any())
             ->method('round')
             ->will(
@@ -86,7 +105,7 @@ function ($argument) {
             );
 
         $this->addressMock = $this->createPartialMock(
-            \Magento\Quote\Model\Quote\Address::class,
+            Address::class,
             [
                 'getQuote',
                 'getAllItems',
@@ -97,7 +116,7 @@ function ($argument) {
             ]
         );
         $addressExtension = $this->getMockBuilder(
-            \Magento\Framework\Api\ExtensionAttributesInterface::class
+            ExtensionAttributesInterface::class
         )->setMethods(['setDiscounts', 'getDiscounts'])->getMock();
         $addressExtension->method('getDiscounts')->willReturn([]);
         $addressExtension->expects($this->any())
@@ -110,18 +129,18 @@ function ($argument) {
             ->method('getCustomAttributesCodes')
             ->willReturn([]);
 
-        $shipping = $this->createMock(\Magento\Quote\Api\Data\ShippingInterface::class);
+        $shipping = $this->createMock(ShippingInterface::class);
         $shipping->expects($this->any())->method('getAddress')->willReturn($this->addressMock);
-        $this->shippingAssignmentMock = $this->createMock(\Magento\Quote\Api\Data\ShippingAssignmentInterface::class);
+        $this->shippingAssignmentMock = $this->createMock(ShippingAssignmentInterface::class);
         $this->shippingAssignmentMock->expects($this->any())->method('getShipping')->willReturn($shipping);
         $this->discountFactory = $this->createPartialMock(
-            \Magento\SalesRule\Model\Rule\Action\Discount\DataFactory::class,
+            DataFactory::class,
             ['create']
         );
 
-        /** @var \Magento\SalesRule\Model\Quote\Discount $discount */
+        /** @var Discount $discount */
         $this->discount = $this->objectManager->getObject(
-            \Magento\SalesRule\Model\Quote\Discount::class,
+            Discount::class,
             [
                 'storeManager' => $this->storeManagerMock,
                 'validator' => $this->validatorMock,
@@ -129,7 +148,7 @@ function ($argument) {
                 'priceCurrency' => $priceCurrencyMock,
             ]
         );
-        $discountData = $this->getMockBuilder(\Magento\SalesRule\Model\Rule\Action\Discount\Data::class)
+        $discountData = $this->getMockBuilder(Data::class)
             ->setConstructorArgs(
                 [
                     'amount' => 0,
@@ -148,11 +167,11 @@ function ($argument) {
     public function testCollectItemNoDiscount()
     {
         $itemNoDiscount = $this->createPartialMock(
-            \Magento\Quote\Model\Quote\Item::class,
+            Item::class,
             ['getNoDiscount', '__wakeup', 'getExtensionAttributes']
         );
         $itemExtension = $this->getMockBuilder(
-            \Magento\Framework\Api\ExtensionAttributesInterface::class
+            ExtensionAttributesInterface::class
         )->setMethods(['setDiscounts', 'getDiscounts'])->getMock();
         $itemExtension->method('getDiscounts')->willReturn([]);
         $itemExtension->expects($this->any())
@@ -165,17 +184,17 @@ public function testCollectItemNoDiscount()
         $this->validatorMock->expects($this->once())->method('sortItemsByPriority')
             ->with([$itemNoDiscount], $this->addressMock)
             ->willReturnArgument(0);
-        $storeMock = $this->createPartialMock(\Magento\Store\Model\Store::class, ['getStore', '__wakeup']);
+        $storeMock = $this->createPartialMock(Store::class, ['getStore', '__wakeup']);
         $this->storeManagerMock->expects($this->any())->method('getStore')->willReturn($storeMock);
-        $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
+        $quoteMock = $this->createMock(Quote::class);
         $this->addressMock->expects($this->any())->method('getQuote')->willReturn($quoteMock);
         $this->shippingAssignmentMock->expects($this->any())->method('getItems')->willReturn([$itemNoDiscount]);
         $this->addressMock->expects($this->any())->method('getShippingAmount')->willReturn(true);
 
-        $totalMock = $this->createMock(\Magento\Quote\Model\Quote\Address\Total::class);
+        $totalMock = $this->createMock(Total::class);
 
         $this->assertInstanceOf(
-            \Magento\SalesRule\Model\Quote\Discount::class,
+            Discount::class,
             $this->discount->collect($quoteMock, $this->shippingAssignmentMock, $totalMock)
         );
     }
@@ -183,7 +202,7 @@ public function testCollectItemNoDiscount()
     public function testCollectItemHasParent()
     {
         $itemWithParentId = $this->createPartialMock(
-            \Magento\Quote\Model\Quote\Item::class,
+            Item::class,
             ['getNoDiscount', 'getParentItem', '__wakeup']
         );
         $itemWithParentId->expects($this->once())->method('getNoDiscount')->willReturn(false);
@@ -194,177 +213,25 @@ public function testCollectItemHasParent()
             ->with([$itemWithParentId], $this->addressMock)
             ->willReturnArgument(0);
 
-        $storeMock = $this->createPartialMock(\Magento\Store\Model\Store::class, ['getStore', '__wakeup']);
+        $storeMock = $this->createPartialMock(Store::class, ['getStore', '__wakeup']);
         $this->storeManagerMock->expects($this->any())->method('getStore')->willReturn($storeMock);
 
-        $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
+        $quoteMock = $this->createMock(Quote::class);
 
         $this->addressMock->expects($this->any())->method('getQuote')->willReturn($quoteMock);
         $this->addressMock->expects($this->any())->method('getShippingAmount')->willReturn(true);
         $this->shippingAssignmentMock->expects($this->any())->method('getItems')->willReturn([$itemWithParentId]);
-        $totalMock = $this->createMock(\Magento\Quote\Model\Quote\Address\Total::class);
+        $totalMock = $this->createMock(Total::class);
 
         $this->assertInstanceOf(
-            \Magento\SalesRule\Model\Quote\Discount::class,
+            Discount::class,
             $this->discount->collect($quoteMock, $this->shippingAssignmentMock, $totalMock)
         );
     }
 
-    /**
-     * @dataProvider collectItemHasChildrenDataProvider
-     */
-    public function testCollectItemHasChildren($childItemData, $parentData, $expectedChildData)
-    {
-        $childItems = [];
-        foreach ($childItemData as $itemId => $itemData) {
-            $item = $this->objectManager->getObject(\Magento\Quote\Model\Quote\Item::class)->setData($itemData);
-            $childItems[$itemId] = $item;
-        }
-
-        $itemWithChildren = $this->getMockBuilder(\Magento\Quote\Model\Quote\Item::class)
-            ->disableOriginalConstructor()
-            ->setMethods(
-                [
-                    'getNoDiscount',
-                    'getParentItem',
-                    'getHasChildren',
-                    'isChildrenCalculated',
-                    'getChildren',
-                    'getExtensionAttributes',
-                    '__wakeup',
-                ]
-            )
-            ->getMock();
-        $itemExtension = $this->getMockBuilder(
-            \Magento\Framework\Api\ExtensionAttributesInterface::class
-        )->setMethods(['setDiscounts', 'getDiscounts'])->getMock();
-        $itemExtension->method('getDiscounts')->willReturn([]);
-        $itemExtension->expects($this->any())
-            ->method('setDiscounts')
-            ->willReturn([]);
-        $itemWithChildren->expects(
-            $this->any()
-        )->method('getExtensionAttributes')->will($this->returnValue($itemExtension));
-        $itemWithChildren->expects($this->once())->method('getNoDiscount')->willReturn(false);
-        $itemWithChildren->expects($this->once())->method('getParentItem')->willReturn(false);
-        $itemWithChildren->expects($this->once())->method('getHasChildren')->willReturn(true);
-        $itemWithChildren->expects($this->once())->method('isChildrenCalculated')->willReturn(true);
-        $itemWithChildren->expects($this->any())->method('getChildren')->willReturn($childItems);
-        foreach ($parentData as $key => $value) {
-            $itemWithChildren->setData($key, $value);
-        }
-
-        $this->validatorMock->expects($this->any())->method('canApplyDiscount')->willReturn(true);
-        $this->validatorMock->expects($this->once())->method('sortItemsByPriority')
-            ->with([$itemWithChildren], $this->addressMock)
-            ->willReturnArgument(0);
-        $this->validatorMock->expects($this->any())->method('canApplyRules')->willReturn(true);
-
-        $storeMock = $this->getMockBuilder(\Magento\Store\Model\Store::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getStore', '__wakeup'])
-            ->getMock();
-        $this->storeManagerMock->expects($this->any())->method('getStore')->willReturn($storeMock);
-
-        $quoteMock = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->addressMock->expects($this->any())->method('getQuote')->willReturn($quoteMock);
-        $this->addressMock->expects($this->any())->method('getShippingAmount')->willReturn(true);
-
-        $this->shippingAssignmentMock->expects($this->any())->method('getItems')->willReturn([$itemWithChildren]);
-        $totalMock = $this->createMock(\Magento\Quote\Model\Quote\Address\Total::class);
-
-        $this->assertInstanceOf(
-            \Magento\SalesRule\Model\Quote\Discount::class,
-            $this->discount->collect($quoteMock, $this->shippingAssignmentMock, $totalMock)
-        );
-
-        foreach ($expectedChildData as $itemId => $expectedItemData) {
-            $childItem = $childItems[$itemId];
-            foreach ($expectedItemData as $key => $value) {
-                $this->assertEquals($value, $childItem->getData($key), 'Incorrect value for ' . $key);
-            }
-        }
-    }
-
-    /**
-     * @return array
-     */
-    public function collectItemHasChildrenDataProvider()
-    {
-        $data = [
-            // 3 items, each $100, testing that discount are distributed to item correctly
-            [
-                    'child_item_data' => [
-                        'item1' => [
-                            'base_row_total' => 0,
-                        ]
-                    ],
-                    'parent_item_data' => [
-                        'discount_amount' => 20,
-                        'base_discount_amount' => 10,
-                        'original_discount_amount' => 40,
-                        'base_original_discount_amount' => 20,
-                        'base_row_total' => 0,
-                    ],
-                    'expected_child_item_data' => [
-                        'item1' => [
-                            'discount_amount' => 0,
-                            'base_discount_amount' => 0,
-                            'original_discount_amount' => 0,
-                            'base_original_discount_amount' => 0,
-                        ]
-                    ],
-                ],
-            [
-                // 3 items, each $100, testing that discount are distributed to item correctly
-                'child_item_data' => [
-                    'item1' => [
-                        'base_row_total' => 100,
-                    ],
-                    'item2' => [
-                        'base_row_total' => 100,
-                    ],
-                    'item3' => [
-                        'base_row_total' => 100,
-                    ],
-                ],
-                'parent_item_data' => [
-                    'discount_amount' => 20,
-                    'base_discount_amount' => 10,
-                    'original_discount_amount' => 40,
-                    'base_original_discount_amount' => 20,
-                    'base_row_total' => 300,
-                ],
-                'expected_child_item_data' => [
-                    'item1' => [
-                        'discount_amount' => 6.67,
-                        'base_discount_amount' => 3.33,
-                        'original_discount_amount' => 13.33,
-                        'base_original_discount_amount' => 6.67,
-                    ],
-                    'item2' => [
-                        'discount_amount' => 6.66,
-                        'base_discount_amount' => 3.34,
-                        'original_discount_amount' => 13.34,
-                        'base_original_discount_amount' => 6.66,
-                    ],
-                    'item3' => [
-                        'discount_amount' => 6.67,
-                        'base_discount_amount' => 3.33,
-                        'original_discount_amount' => 13.33,
-                        'base_original_discount_amount' => 6.67,
-                    ],
-                ],
-            ],
-        ];
-        return $data;
-    }
-
     public function testCollectItemHasNoChildren()
     {
-        $itemWithChildren = $this->getMockBuilder(\Magento\Quote\Model\Quote\Item::class)
+        $itemWithChildren = $this->getMockBuilder(Item::class)
             ->disableOriginalConstructor()
             ->setMethods(
                 [
@@ -379,7 +246,7 @@ public function testCollectItemHasNoChildren()
             )
             ->getMock();
         $itemExtension = $this->getMockBuilder(
-            \Magento\Framework\Api\ExtensionAttributesInterface::class
+            ExtensionAttributesInterface::class
         )->setMethods(['setDiscounts', 'getDiscounts'])->getMock();
         $itemExtension->method('getDiscounts')->willReturn([]);
         $itemExtension->expects($this->any())
@@ -397,20 +264,20 @@ public function testCollectItemHasNoChildren()
             ->with([$itemWithChildren], $this->addressMock)
             ->willReturnArgument(0);
 
-        $storeMock = $this->getMockBuilder(\Magento\Store\Model\Store::class)
+        $storeMock = $this->getMockBuilder(Store::class)
             ->disableOriginalConstructor()
             ->setMethods(['getStore', '__wakeup'])
             ->getMock();
         $this->storeManagerMock->expects($this->any())->method('getStore')->willReturn($storeMock);
 
-        $quoteMock = $this->getMockBuilder(\Magento\Quote\Model\Quote::class)->disableOriginalConstructor()->getMock();
+        $quoteMock = $this->getMockBuilder(Quote::class)->disableOriginalConstructor()->getMock();
         $this->addressMock->expects($this->any())->method('getQuote')->willReturn($quoteMock);
         $this->addressMock->expects($this->any())->method('getShippingAmount')->willReturn(true);
         $this->shippingAssignmentMock->expects($this->any())->method('getItems')->willReturn([$itemWithChildren]);
 
-        $totalMock = $this->createMock(\Magento\Quote\Model\Quote\Address\Total::class);
+        $totalMock = $this->createMock(Total::class);
         $this->assertInstanceOf(
-            \Magento\SalesRule\Model\Quote\Discount::class,
+            Discount::class,
             $this->discount->collect($quoteMock, $this->shippingAssignmentMock, $totalMock)
         );
     }
@@ -425,9 +292,9 @@ public function testFetch()
             'title' => __('Discount (%1)', $discountDescription)
         ];
 
-        $quoteMock = $this->createMock(\Magento\Quote\Model\Quote::class);
+        $quoteMock = $this->createMock(Quote::class);
         $totalMock = $this->createPartialMock(
-            \Magento\Quote\Model\Quote\Address\Total::class,
+            Total::class,
             ['getDiscountAmount', 'getDiscountDescription']
         );
 
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/RulesApplierTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/RulesApplierTest.php
index 4260e6b415091..dd1581d966e5a 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/RulesApplierTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/RulesApplierTest.php
@@ -6,6 +6,8 @@
 
 namespace Magento\SalesRule\Test\Unit\Model;
 
+use Magento\Catalog\Model\Product;
+use Magento\Framework\Api\ExtensionAttributesInterface;
 use Magento\Framework\Event\Manager;
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\Quote\Address;
@@ -16,11 +18,12 @@
 use Magento\SalesRule\Model\Rule;
 use Magento\SalesRule\Model\Rule\Action\Discount\CalculatorFactory;
 use Magento\SalesRule\Model\Rule\Action\Discount\Data;
+use Magento\SalesRule\Model\Rule\Action\Discount\DataFactory;
 use Magento\SalesRule\Model\Rule\Action\Discount\DiscountInterface;
 use Magento\SalesRule\Model\RulesApplier;
 use Magento\SalesRule\Model\Utility;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use PHPUnit_Framework_MockObject_MockObject;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -33,27 +36,27 @@ class RulesApplierTest extends TestCase
     protected $rulesApplier;
 
     /**
-     * @var CalculatorFactory|PHPUnit_Framework_MockObject_MockObject
+     * @var CalculatorFactory|MockObject
      */
     protected $calculatorFactory;
 
     /**
-     * @var \Magento\SalesRule\Model\Rule\Action\Discount\DataFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var DataFactory|MockObject
      */
     protected $discountFactory;
 
     /**
-     * @var Manager|PHPUnit_Framework_MockObject_MockObject
+     * @var Manager|MockObject
      */
     protected $eventManager;
 
     /**
-     * @var Utility|PHPUnit_Framework_MockObject_MockObject
+     * @var Utility|MockObject
      */
     protected $validatorUtility;
 
     /**
-     * @var ChildrenValidationLocator|PHPUnit_Framework_MockObject_MockObject
+     * @var ChildrenValidationLocator|MockObject
      */
     protected $childrenValidationLocator;
 
@@ -63,10 +66,10 @@ protected function setUp()
             CalculatorFactory::class
         );
         $this->discountFactory = $this->createPartialMock(
-            \Magento\SalesRule\Model\Rule\Action\Discount\DataFactory::class,
+            DataFactory::class,
             ['create']
         );
-        $this->eventManager = $this->createPartialMock(\Magento\Framework\Event\Manager::class, ['dispatch']);
+        $this->eventManager = $this->createPartialMock(Manager::class, ['dispatch']);
         $this->validatorUtility = $this->createPartialMock(
             Utility::class,
             ['canProcessRule', 'minFix', 'deltaRoundingFix', 'getItemQty']
@@ -99,7 +102,7 @@ public function testApplyRulesWhenRuleWithStopRulesProcessingIsUsed($isChildren,
 
         $ruleId = 1;
         $appliedRuleIds = [$ruleId => $ruleId];
-        $discountData = $this->getMockBuilder(\Magento\SalesRule\Model\Rule\Action\Discount\Data::class)
+        $discountData = $this->getMockBuilder(Data::class)
             ->setConstructorArgs(
                 [
                     'amount' => 0,
@@ -114,14 +117,14 @@ public function testApplyRulesWhenRuleWithStopRulesProcessingIsUsed($isChildren,
             ->with($this->anything())
             ->will($this->returnValue($discountData));
         /**
-         * @var Rule|PHPUnit_Framework_MockObject_MockObject $ruleWithStopFurtherProcessing
+         * @var Rule|MockObject $ruleWithStopFurtherProcessing
          */
         $ruleWithStopFurtherProcessing = $this->createPartialMock(
             Rule::class,
             ['getStoreLabel', 'getCouponType', 'getRuleId', '__wakeup', 'getActions']
         );
         /**
-         * @var Rule|PHPUnit_Framework_MockObject_MockObject $ruleThatShouldNotBeRun
+         * @var Rule|MockObject $ruleThatShouldNotBeRun
         */
         $ruleThatShouldNotBeRun = $this->createPartialMock(
             Rule::class,
@@ -162,6 +165,10 @@ public function testApplyRulesWhenRuleWithStopRulesProcessingIsUsed($isChildren,
                 ->method('validate')
                 ->with($item)
                 ->willReturn(!$isContinue);
+            $product = $this->createPartialMock(Product::class, []);
+            $item->expects($this->atLeastOnce())
+                ->method('getProduct')
+                ->willReturn($product);
         }
 
         //
@@ -187,7 +194,7 @@ public function testAddCouponDescriptionWithRuleDescriptionIsUsed()
         $ruleDescription = 'Rule description';
 
         /**
-         * @var Rule|PHPUnit_Framework_MockObject_MockObject $rule
+         * @var Rule|MockObject $rule
          */
         $rule = $this->createPartialMock(
             Rule::class,
@@ -197,7 +204,7 @@ public function testAddCouponDescriptionWithRuleDescriptionIsUsed()
         $rule->setDescription($ruleDescription);
 
         /**
-         * @var Address|PHPUnit_Framework_MockObject_MockObject $address
+         * @var Address|MockObject $address
         */
         $address = $this->createPartialMock(
             Address::class,
@@ -227,12 +234,12 @@ public function dataProviderChildren()
     }
 
     /**
-     * @return AbstractItem|PHPUnit_Framework_MockObject_MockObject
+     * @return AbstractItem|MockObject
      */
     protected function getPreparedItem()
     {
         /**
-         * @var Address|PHPUnit_Framework_MockObject_MockObject $address
+         * @var Address|MockObject $address
         */
         $address = $this->createPartialMock(
             Address::class,
@@ -244,7 +251,7 @@ protected function getPreparedItem()
             ]
         );
         /**
-         * @var AbstractItem|PHPUnit_Framework_MockObject_MockObject $item
+         * @var AbstractItem|MockObject $item
         */
         $item = $this->createPartialMock(
             Item::class,
@@ -256,17 +263,18 @@ protected function getPreparedItem()
                 'setAppliedRuleIds',
                 '__wakeup',
                 'getChildren',
-                'getExtensionAttributes'
+                'getExtensionAttributes',
+                'getProduct'
             ]
         );
         $itemExtension = $this->getMockBuilder(
-            \Magento\Framework\Api\ExtensionAttributesInterface::class
+            ExtensionAttributesInterface::class
         )->setMethods(['setDiscounts', 'getDiscounts'])->getMock();
         $itemExtension->method('getDiscounts')->willReturn([]);
         $itemExtension->expects($this->any())
             ->method('setDiscounts')
             ->willReturn([]);
-        $quote = $this->createPartialMock(\Magento\Quote\Model\Quote::class, ['getStore', '__wakeUp']);
+        $quote = $this->createPartialMock(Quote::class, ['getStore', '__wakeUp']);
         $item->expects($this->any())->method('getAddress')->will($this->returnValue($address));
         $item->expects($this->any())->method('getExtensionAttributes')->will($this->returnValue($itemExtension));
         $address->expects($this->any())
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_with_dynamic_price.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_with_dynamic_price.php
new file mode 100644
index 0000000000000..d325e0918685d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_with_dynamic_price.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Bundle\Model\Product\Price;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Type\AbstractType;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Bundle\Model\PrepareBundleLinks;
+use Magento\Catalog\Api\Data\ProductInterfaceFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+
+require __DIR__ . '/../../../Magento/Catalog/_files/multiple_products.php';
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var PrepareBundleLinks $prepareBundleLinks */
+$prepareBundleLinks = $objectManager->get(PrepareBundleLinks::class);
+/** @var StoreManagerInterface $storeManager */
+$storeManager = $objectManager->get(StoreManagerInterface::class);
+$defaultWebsiteId = $storeManager->getWebsite('base')->getId();
+/** @var ProductInterfaceFactory $productFactory */
+$productFactory = $objectManager->get(ProductInterfaceFactory::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+/** @var Magento\Catalog\Api\Data\ProductInterface $bundleProduct */
+$bundleProduct = $productFactory->create();
+$bundleProduct->setTypeId(Type::TYPE_BUNDLE)
+    ->setAttributeSetId($bundleProduct->getDefaultAttributeSetId())
+    ->setWebsiteIds([$defaultWebsiteId])
+    ->setName('Bundle Product With Dynamic Price')
+    ->setSku('bundle_product_with_dynamic_price')
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setStockData(
+        [
+            'use_config_manage_stock' => 0,
+            'qty' => 100,
+            'is_qty_decimal' => 0,
+            'is_in_stock' => 1,
+        ]
+    )
+    ->setSkuType(0)
+    ->setPriceView(0)
+    ->setPriceType(Price::PRICE_TYPE_DYNAMIC)
+    ->setPrice(null)
+    ->setWeightType(0)
+    ->setShipmentType(AbstractType::SHIPMENT_TOGETHER);
+
+$bundleOptionsData = [
+    [
+        'title' => 'Option 1',
+        'default_title' => 'Option 1',
+        'type' => 'select',
+        'required' => 1,
+    ],
+    [
+        'title' => 'Option 2',
+        'default_title' => 'Option 2',
+        'type' => 'select',
+        'required' => 1,
+    ],
+];
+$bundleSelectionsData = [
+    [
+        [
+            'sku' => 'simple1',
+            'selection_qty' => 1,
+        ],
+    ],
+    [
+        [
+            'sku' => 'simple2',
+            'selection_qty' => 1,
+        ],
+    ]
+];
+$bundleProduct = $prepareBundleLinks->execute($bundleProduct, $bundleOptionsData, $bundleSelectionsData);
+$productRepository->save($bundleProduct);
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_with_dynamic_price_rollback.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_with_dynamic_price_rollback.php
new file mode 100644
index 0000000000000..e84dfc4c6799c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/bundle_product_with_dynamic_price_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\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+try {
+    $product = $productRepository->get('bundle_product_with_dynamic_price', false, null, true);
+    $productRepository->delete($product);
+} catch (NoSuchEntityException $e) {
+    //product already deleted.
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+
+require __DIR__ . '/../../../Magento/Catalog/_files/multiple_products_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_bundle_product_with_dynamic_price.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_bundle_product_with_dynamic_price.php
new file mode 100644
index 0000000000000..dbe4c436b0f11
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_bundle_product_with_dynamic_price.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Bundle\Model\Option;
+use Magento\Bundle\Model\Product\Type;
+use Magento\Bundle\Model\Selection;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Checkout\Model\Cart;
+use Magento\Checkout\Model\Session;
+use Magento\Framework\DataObject;
+use Magento\TestFramework\Helper\Bootstrap;
+
+require __DIR__ . '/../../../Magento/Bundle/_files/bundle_product_with_dynamic_price.php';
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+/** @var Product $product */
+$product = $productRepository->get('bundle_product_with_dynamic_price');
+
+/** @var $typeInstance Type */
+//Load options
+$typeInstance = $product->getTypeInstance();
+$typeInstance->setStoreFilter($product->getStoreId(), $product);
+$optionCollection = $typeInstance->getOptionsCollection($product);
+
+$bundleOptions = [];
+$bundleOptionsQty = [];
+/** @var $option Option */
+foreach ($optionCollection as $option) {
+    $selectionCollection = $typeInstance->getSelectionsCollection([$option->getId()], $product);
+    /** @var $selection Selection */
+    $selection = $selectionCollection->getFirstItem();
+    $bundleOptions[$option->getId()] = $selection->getSelectionId();
+    $bundleOptionsQty[$option->getId()] = 1;
+}
+
+$requestInfo = new DataObject(
+    ['qty' => 1, 'bundle_option' => $bundleOptions, 'bundle_option_qty' => $bundleOptionsQty]
+);
+
+/** @var Cart $cart */
+$cart = $objectManager->create(Cart::class);
+$cart->addProduct($product, $requestInfo);
+$cart->getQuote()->setReservedOrderId('quote_with_bundle_product_with_dynamic_price');
+$cart->save();
+
+$objectManager->removeSharedInstance(Session::class);
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_bundle_product_with_dynamic_price_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_bundle_product_with_dynamic_price_rollback.php
new file mode 100644
index 0000000000000..1cc5f475c5267
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_bundle_product_with_dynamic_price_rollback.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Registry;
+use Magento\Quote\Model\Quote;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+$quote = $objectManager->create(Quote::class);
+$quote->load('quote_with_bundle_product_with_dynamic_price', 'reserved_order_id')->delete();
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+
+require __DIR__ . '/../../Bundle/_files/bundle_product_with_dynamic_price_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/Model/Quote/DiscountTest.php b/dev/tests/integration/testsuite/Magento/SalesRule/Model/Quote/DiscountTest.php
new file mode 100644
index 0000000000000..38e049e8818f4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/Model/Quote/DiscountTest.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesRule\Model\Quote;
+
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\Quote\Item;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test discount totals calculation model
+ */
+class DiscountTest extends TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $criteriaBuilder;
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $quoteRepository;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->criteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+        $this->quoteRepository = $this->objectManager->get(CartRepositoryInterface::class);
+    }
+
+    /**
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture bundleProductWithDynamicPriceAndCartPriceRuleFixture
+     * @magentoDataFixture Magento/Checkout/_files/quote_with_bundle_product_with_dynamic_price.php
+     * @dataProvider bundleProductWithDynamicPriceAndCartPriceRuleDataProvider
+     * @param string $coupon
+     * @param array $discounts
+     * @param float $totalDiscount
+     * @return void
+     */
+    public function testBundleProductWithDynamicPriceAndCartPriceRule(
+        string $coupon,
+        array $discounts,
+        float $totalDiscount
+    ): void {
+        $quote = $this->getQuote('quote_with_bundle_product_with_dynamic_price');
+        $quote->setCouponCode($coupon);
+        $quote->collectTotals();
+        $this->quoteRepository->save($quote);
+        $this->assertEquals(21.98, $quote->getBaseSubtotal());
+        $this->assertEquals($totalDiscount, $quote->getShippingAddress()->getDiscountAmount());
+        $items = $quote->getAllItems();
+        $this->assertCount(3, $items);
+        /** @var Item $item*/
+        $item = array_shift($items);
+        $this->assertEquals('bundle_product_with_dynamic_price-simple1-simple2', $item->getSku());
+        $this->assertEquals($discounts[$item->getSku()], $item->getDiscountAmount());
+        $item = array_shift($items);
+        $this->assertEquals('simple1', $item->getSku());
+        $this->assertEquals(5.99, $item->getPrice());
+        $this->assertEquals($discounts[$item->getSku()], $item->getDiscountAmount());
+        $item = array_shift($items);
+        $this->assertEquals('simple2', $item->getSku());
+        $this->assertEquals(15.99, $item->getPrice());
+        $this->assertEquals($discounts[$item->getSku()], $item->getDiscountAmount());
+    }
+
+    public function bundleProductWithDynamicPriceAndCartPriceRuleDataProvider(): array
+    {
+        return [
+            [
+                'bundle_product_with_dynamic_price_coupon_code',
+                [
+                    'bundle_product_with_dynamic_price-simple1-simple2' => 0,
+                    'simple1' => 3,
+                    'simple2' => 7.99,
+                ],
+                -10.99
+            ],
+            [
+                'simple1_coupon_code',
+                [
+                    'bundle_product_with_dynamic_price-simple1-simple2' => 0,
+                    'simple1' => 3,
+                    'simple2' => 0,
+                ],
+                -3
+            ],
+            [
+                'simple2_coupon_code',
+                [
+                    'bundle_product_with_dynamic_price-simple1-simple2' => 0,
+                    'simple1' => 0,
+                    'simple2' => 8,
+                ],
+                -8
+            ]
+        ];
+    }
+
+    public static function bundleProductWithDynamicPriceAndCartPriceRuleFixture(): void
+    {
+        $skus = [
+            'bundle_product_with_dynamic_price',
+            'simple1',
+            'simple2',
+        ];
+        foreach ($skus as $sku) {
+            if ($sku) {
+                require __DIR__ . '/../../_files/cart_rule_product_sku.php';
+            }
+        }
+    }
+
+    public static function bundleProductWithDynamicPriceAndCartPriceRuleFixtureRollback(): void
+    {
+        $skus = [
+            'bundle_product_with_dynamic_price',
+            'simple1',
+            'simple2',
+        ];
+        foreach ($skus as $sku) {
+            if ($sku) {
+                require __DIR__ . '/../../_files/cart_rule_product_sku_rollback.php';
+            }
+        }
+    }
+
+    private function getQuote(string $reservedOrderId): Quote
+    {
+        $searchCriteria = $this->criteriaBuilder->addFilter('reserved_order_id', $reservedOrderId)
+            ->create();
+        $carts = $this->quoteRepository->getList($searchCriteria)
+            ->getItems();
+        return array_shift($carts);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_product_sku.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_product_sku.php
new file mode 100644
index 0000000000000..8be1547062dc0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_product_sku.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Customer\Model\GroupManagement;
+use Magento\SalesRule\Api\CouponRepositoryInterface;
+use Magento\SalesRule\Model\Coupon;
+use Magento\SalesRule\Model\Rule;
+use Magento\SalesRule\Model\Rule\Condition\Combine;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+if (!isset($sku)) {
+    $sku = 'simple1';
+}
+$objectManager = Bootstrap::getObjectManager();
+/** @var Rule $salesRule */
+$salesRule = $objectManager->create(Rule::class);
+$salesRule->loadPost(
+    [
+        'name' => '50% Off for ' . $sku,
+        'is_active' => 1,
+        'customer_group_ids' => [GroupManagement::NOT_LOGGED_IN_ID],
+        'coupon_type' => Rule::COUPON_TYPE_SPECIFIC,
+        'simple_action' => 'by_percent',
+        'discount_amount' => 50,
+        'discount_step' => 0,
+        'stop_rules_processing' => 0,
+        'website_ids' => [
+            $objectManager->get(StoreManagerInterface::class)->getWebsite()->getId()
+        ],
+        'conditions' => [
+            1 => [
+                    'type' => Combine::class,
+                    'attribute' => null,
+                    'operator' => null,
+                    'value' => '1',
+                    'is_value_processed' => null,
+                    'aggregator' => 'all',
+            ]
+        ],
+        'actions' => [
+            1 => [
+                'type' => Magento\SalesRule\Model\Rule\Condition\Product\Combine::class,
+                'attribute' => null,
+                'operator' => null,
+                'value' => '1',
+                'is_value_processed' => null,
+                'aggregator' => 'all',
+                'actions' => [
+                    1 => [
+                        'type' => Magento\SalesRule\Model\Rule\Condition\Product::class,
+                        'attribute' => 'sku',
+                        'operator' => '==',
+                        'value' => $sku,
+                        'is_value_processed' => false,
+                    ]
+                ]
+            ]
+        ],
+        'store_labels' => [
+
+                'store_id' => 0,
+                'store_label' => 'Promo code for ' . $sku,
+
+        ]
+    ]
+);
+$salesRule->save();
+$coupon = $objectManager->create(Coupon::class);
+$coupon->setRuleId($salesRule->getId())
+    ->setCode($sku . '_coupon_code')
+    ->setType(0);
+$objectManager->get(CouponRepositoryInterface::class)->save($coupon);
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_product_sku_rollback.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_product_sku_rollback.php
new file mode 100644
index 0000000000000..e4843c2d6bd84
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_product_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\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Registry;
+use Magento\SalesRule\Api\RuleRepositoryInterface;
+use Magento\SalesRule\Model\Rule;
+use Magento\TestFramework\Helper\Bootstrap;
+
+if (!isset($sku)) {
+    $sku = 'simple1';
+}
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+$searchCriteria = $searchCriteriaBuilder->addFilter('name', '50% Off for ' . $sku)
+    ->create();
+/** @var RuleRepositoryInterface $ruleRepository */
+$ruleRepository = $objectManager->get(RuleRepositoryInterface::class);
+$items = $ruleRepository->getList($searchCriteria)
+    ->getItems();
+/** @var Rule $salesRule */
+$salesRule = array_pop($items);
+if ($salesRule !== null) {
+    $ruleRepository->deleteById($salesRule->getRuleId());
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);

From 28d1af5276caa759139299096e0cbc40f4618da2 Mon Sep 17 00:00:00 2001
From: Mateusz Krzeszowiak <mateusz.krzeszowiak@creativestyle.pl>
Date: Fri, 10 Apr 2020 17:15:35 +0200
Subject: [PATCH 0148/1718] Initialize inline translations module only when
 they are enabled

---
 .../view/frontend/requirejs-config.js         |  1 -
 lib/web/mage/translate-inline.js              | 62 ++++++++-----------
 lib/web/mage/utils/misc.js                    | 20 ++++--
 3 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/app/code/Magento/Translation/view/frontend/requirejs-config.js b/app/code/Magento/Translation/view/frontend/requirejs-config.js
index b5351b9d471cf..cb1088ec49b50 100644
--- a/app/code/Magento/Translation/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Translation/view/frontend/requirejs-config.js
@@ -13,7 +13,6 @@ var config = {
         }
     },
     deps: [
-        'mage/translate-inline',
         'mageTranslationDictionary'
     ]
 };
diff --git a/lib/web/mage/translate-inline.js b/lib/web/mage/translate-inline.js
index 56acef5a49a42..8f460c31aafae 100644
--- a/lib/web/mage/translate-inline.js
+++ b/lib/web/mage/translate-inline.js
@@ -6,9 +6,10 @@
 define([
     'jquery',
     'mage/template',
+    'mage/utils/misc',
+    'mage/translate',
     'jquery-ui-modules/dialog',
-    'mage/translate'
-], function ($, mageTemplate) {
+], function ($, mageTemplate, miscUtils) {
     'use strict';
 
     $.widget('mage.translateInline', $.ui.dialog, {
@@ -59,11 +60,12 @@ define([
              * Open.
              */
             open: function () {
-                var topMargin;
+                var $uiDialog = $(this).closest('.ui-dialog'),
+                    topMargin = $uiDialog.children('.ui-dialog-titlebar').outerHeight() + 45;
 
-                $(this).closest('.ui-dialog').addClass('ui-dialog-active');
-                topMargin = jQuery(this).closest('.ui-dialog').children('.ui-dialog-titlebar').outerHeight() + 45;
-                jQuery(this).closest('.ui-dialog').css('margin-top', topMargin);
+                $uiDialog
+                    .addClass('ui-dialog-active')
+                    .css('margin-top', topMargin)
             },
 
             /**
@@ -79,11 +81,15 @@ define([
          * @protected
          */
         _create: function () {
+            var $translateArea = $(this.options.translateArea);
+
+            if (!$translateArea.length) {
+                $translateArea = $('body');
+            }
+            $translateArea.on('edit.editTrigger', $.proxy(this._onEdit, this));
+
             this.tmpl = mageTemplate(this.options.translateForm.template);
-            (this.options.translateArea && $(this.options.translateArea).length ?
-                $(this.options.translateArea) :
-                this.element.closest('body'))
-                    .on('edit.editTrigger', $.proxy(this._onEdit, this));
+
             this._super();
         },
 
@@ -95,7 +101,7 @@ define([
         _prepareContent: function (templateData) {
             var data = $.extend({
                 items: templateData,
-                escape: $.mage.escapeHTML
+                escape: miscUtils.escape,
             }, this.options.translateForm.data);
 
             this.data = data;
@@ -131,16 +137,14 @@ define([
          * @protected
          */
         _formSubmit: function () {
-            var parameters;
+            var parameters = $.param({
+                    area: this.options.area
+                }) + '&' + $('#' + this.options.translateForm.data.id).serialize();
 
             this.formIsSubmitted = true;
-            parameters = $.param({
-                area: this.options.area
-            }) + '&' + $('#' + this.options.translateForm.data.id).serialize();
 
-            $.ajax({
+            $.post({
                 url: this.options.ajaxUrl,
-                type: 'POST',
                 data: parameters,
                 loaderContext: this.element,
                 showLoader: true
@@ -162,11 +166,13 @@ define([
          * @private
          */
         _updatePlaceholder: function (newValue) {
-            var target = jQuery(this.target);
+            var $target = $(this.target),
+                translateObject = $target.data('translate')[0];
+
+            translateObject.shown = newValue;
+            translateObject.translated = newValue;
 
-            target.data('translate')[0].shown = newValue;
-            target.data('translate')[0].translated = newValue;
-            target.html(newValue);
+            $target.html(newValue);
         },
 
         /**
@@ -177,20 +183,6 @@ define([
             this._super();
         }
     });
-    // @TODO move the "escapeHTML" method into the file with global utility functions
-    $.extend(true, $, {
-        mage: {
-            /**
-             * @param {String} str
-             * @return {Boolean}
-             */
-            escapeHTML: function (str) {
-                return str ?
-                    jQuery('<div/>').text(str).html().replace(/"/g, '&quot;') :
-                    false;
-            }
-        }
-    });
 
     return $.mage.translateInline;
 });
diff --git a/lib/web/mage/utils/misc.js b/lib/web/mage/utils/misc.js
index 3829f5ed467e2..46261ff490114 100644
--- a/lib/web/mage/utils/misc.js
+++ b/lib/web/mage/utils/misc.js
@@ -6,8 +6,8 @@
 define([
     'underscore',
     'jquery',
-    'FormData'
-], function (_, $) {
+    'mage/utils/objects'
+], function (_, $, utils) {
     'use strict';
 
     var defaultAttributes,
@@ -120,7 +120,7 @@ define([
          */
         submit: function (options, attrs) {
             var form        = document.createElement('form'),
-                data        = this.serialize(options.data),
+                data        = utils.serialize(options.data),
                 attributes  = _.extend({}, defaultAttributes, attrs || {});
 
             if (!attributes.action) {
@@ -205,11 +205,11 @@ define([
 
             if (type === 'default') {
                 formData = new FormData();
-                _.each(this.serialize(data), function (val, name) {
+                _.each(utils.serialize(data), function (val, name) {
                     formData.append(name, val);
                 });
             } else if (type === 'simple') {
-                formData = this.serialize(data);
+                formData = utils.serialize(data);
             }
 
             return formData;
@@ -242,6 +242,16 @@ define([
             return data;
         },
 
+        /**
+         * Replaces special characters with their corresponding HTML entities.
+         * 
+         * @param {String} string Text to escape.
+         * @returns {String} Escaped text.
+         */
+        escape: function (string) {
+            return string ? $('<p/>').text(str).html().replace(/"/g, '&quot;') : string;
+        },
+
         /**
          * Replaces symbol codes with their unescaped counterparts.
          *

From 573308eb1faddd826206119e09d1ec675f85b77a Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Fri, 10 Apr 2020 18:39:46 +0300
Subject: [PATCH 0149/1718] Use actionGroup to go products grid page

---
 .../AdminAddDefaultImageBundleProductTest.xml     |  3 +--
 .../Test/AdminEditRelatedBundleProductTest.xml    |  3 +--
 .../AdminRemoveDefaultImageBundleProductTest.xml  |  3 +--
 .../Test/EnableDisableBundleProductStatusTest.xml |  3 +--
 .../NewProductsListWidgetBundleProductTest.xml    |  3 +--
 .../Test/StorefrontAddBundleOptionsToCartTest.xml |  3 +--
 .../Mftf/Test/StorefrontAdminEditDataTest.xml     |  6 ++----
 .../Test/StorefrontBundleAddToCartSuccessTest.xml |  3 +--
 .../Test/Mftf/Test/StorefrontBundleCartTest.xml   |  3 +--
 ...frontCustomerSelectAndSetBundleOptionsTest.xml |  4 ++--
 .../Mftf/Test/StorefrontEditBundleProductTest.xml |  3 +--
 .../AdminOpenProductIndexPageActionGroup.xml      |  3 +++
 .../AdminAddDefaultImageSimpleProductTest.xml     |  3 +--
 .../AdminAddDefaultImageVirtualProductTest.xml    |  3 +--
 .../AdminAddDefaultVideoSimpleProductTest.xml     |  3 +--
 .../Test/AdminAddInStockProductToTheCartTest.xml  |  3 +--
 .../AdminApplyTierPriceToProductTest.xml          | 15 +++++----------
 ...erPriceToProductWithPercentageDiscountTest.xml |  3 +--
 ...leProductPriceWithDisabledChildProductTest.xml |  3 +--
 ...utOfStockProductIsNotVisibleInCategoryTest.xml |  3 +--
 ...ckOutOfStockProductIsVisibleInCategoryTest.xml |  3 +--
 .../Test/AdminCreateAttributeSetEntityTest.xml    |  3 +--
 .../AdminCreateCategoryFromProductPageTest.xml    |  3 +--
 ...inCreateCategoryWithProductsGridFilterTest.xml |  6 ++----
 ...ustomProductAttributeWithDropdownFieldTest.xml |  3 +--
 .../AdminCreateNewGroupForAttributeSetTest.xml    |  3 +--
 ...nCreateProductAttributeFromProductPageTest.xml |  3 +--
 ...reateProductAttributeRequiredTextFieldTest.xml |  4 +---
 .../AdminCreateProductDuplicateUrlkeyTest.xml     |  2 +-
 ...eateSimpleProductWithDatetimeAttributeTest.xml |  2 +-
 .../Mftf/Test/AdminDeleteAttributeSetTest.xml     |  3 +--
 .../Mftf/Test/AdminDeleteProductAttributeTest.xml |  3 +--
 ...tFieldProductAttributeFromAttributeSetTest.xml |  6 ++----
 .../AdminEditTextEditorProductAttributeTest.xml   |  3 +--
 ...inFilterByNameByStoreViewOnProductGridTest.xml |  2 +-
 .../Test/AdminMassChangeProductsStatusTest.xml    |  3 +--
 .../Mftf/Test/AdminMassProductPriceUpdateTest.xml |  3 +--
 ...MassUpdateProductAttributesGlobalScopeTest.xml |  3 +--
 ...eProductAttributesMissingRequiredFieldTest.xml |  3 +--
 ...teProductAttributesStoreViewScopeMysqlTest.xml |  3 +--
 ...sUpdateProductAttributesStoreViewScopeTest.xml |  3 +--
 ...UpdateProductStatusStoreViewScopeMysqlTest.xml |  8 +++-----
 ...nMassUpdateProductStatusStoreViewScopeTest.xml |  9 +++------
 .../AdminMultipleWebsitesUseDefaultValuesTest.xml |  3 +--
 .../AdminNavigateMultipleUpSellProductsTest.xml   |  3 +--
 ...nProductGridFilteringByCustomAttributeTest.xml |  3 +--
 ...minProductGridFilteringByDateAttributeTest.xml |  3 +--
 ...roductStatusAttributeDisabledByDefaultTest.xml |  3 +--
 .../AdminRemoveCustomOptionsFromProductTest.xml   |  2 +-
 .../AdminRemoveDefaultImageSimpleProductTest.xml  |  3 +--
 .../AdminRemoveDefaultImageVirtualProductTest.xml |  3 +--
 .../AdminRemoveDefaultVideoSimpleProductTest.xml  |  3 +--
 .../Test/AdminRemoveImageAffectsAllScopesTest.xml |  6 ++----
 ...quiredFieldsHaveRequiredFieldIndicatorTest.xml |  2 +-
 .../AdminSimpleProductImagesTest.xml              |  9 +++------
 .../AdminSimpleProductRemoveImagesTest.xml        | 12 ++++--------
 .../Test/AdminSimpleProductSetEditContentTest.xml |  3 +--
 .../AdminSimpleSetEditRelatedProductsTest.xml     |  3 +--
 .../Test/Mftf/Test/AdminSortingByWebsitesTest.xml |  6 ++----
 .../Test/Mftf/Test/EndToEndB2CAdminTest.xml       |  9 +++------
 .../NewProductsListWidgetSimpleProductTest.xml    |  3 +--
 .../NewProductsListWidgetVirtualProductTest.xml   |  3 +--
 ...eProductWithCustomOptionsSecondWebsiteTest.xml |  3 +--
 .../Test/SimpleProductTwoCustomOptionsTest.xml    |  3 +--
 .../StorefrontProductNameWithDoubleQuoteTest.xml  |  3 +--
 ...roductCustomOptionsDifferentStoreViewsTest.xml |  8 +++-----
 ...ortImportConfigurableProductWithImagesTest.xml |  2 +-
 ...torefrontCheckoutDisabledBundleProductTest.xml |  2 +-
 ...stomerCheckoutDisabledProductAndCouponTest.xml |  4 ++--
 .../Test/AdminAddDefaultImageConfigurableTest.xml |  3 +--
 ...thImagesAndPricesToConfigurableProductTest.xml |  2 +-
 ...llyChangedWhenSavingProductWithSameSkuTest.xml |  3 +--
 ...dminCheckResultsOfColorAndOtherFiltersTest.xml |  3 +--
 ...AdminCheckValidatorConfigurableProductTest.xml |  3 +--
 ...ProductAfterGettingIncorrectSKUMessageTest.xml |  3 +--
 .../AdminConfigurableProductBulkDeleteTest.xml    |  3 +--
 .../AdminConfigurableProductDeleteTest.xml        |  3 +--
 ...nConfigurableProductChildrenOutOfStockTest.xml |  6 ++----
 ...eProductOutOfStockAndDeleteCombinationTest.xml |  3 +--
 .../AdminConfigurableProductFilterByTypeTest.xml  |  3 +--
 .../AdminConfigurableProductSearchTest.xml        |  3 +--
 ...dminConfigurableProductUpdateAttributeTest.xml |  3 +--
 ...onfigurableProductUpdateChildAttributeTest.xml |  3 +--
 .../AdminConfigurableProductBulkUpdateTest.xml    |  6 ++----
 ...ateConfigurableProductBasedOnParentSkuTest.xml |  3 +--
 ...roductWithCreatingCategoryAndAttributeTest.xml |  6 ++----
 ...bleProductWithDisabledChildrenProductsTest.xml |  6 ++----
 ...minCreateConfigurableProductWithImagesTest.xml |  3 +--
 ...hThreeProductDisplayOutOfStockProductsTest.xml |  3 +--
 ...eeProductDontDisplayOutOfStockProductsTest.xml |  3 +--
 ...igurableProductWithTierPriceForOneItemTest.xml |  3 +--
 ...roductWithTwoOptionsAssignedToCategoryTest.xml |  3 +--
 ...ithTwoOptionsWithoutAssignedToCategoryTest.xml |  3 +--
 .../Test/Mftf/Test/AdminRelatedProductsTest.xml   |  6 ++----
 .../AdminRemoveDefaultImageConfigurableTest.xml   |  3 +--
 ...fyConfigurableProductLayeredNavigationTest.xml |  3 +--
 ...dminAddDefaultImageDownloadableProductTest.xml |  3 +--
 ...oadableProductAndAssignItToCustomStoreTest.xml |  3 +--
 ...teDownloadableProductWithCustomOptionsTest.xml |  3 +--
 ...DownloadableProductWithDefaultSetLinksTest.xml |  6 ++----
 ...reateDownloadableProductWithGroupPriceTest.xml |  6 ++----
 ...AdminCreateDownloadableProductWithLinkTest.xml |  3 +--
 ...eateDownloadableProductWithManageStockTest.xml |  6 ++----
 ...ownloadableProductWithOutOfStockStatusTest.xml |  6 ++----
 ...ateDownloadableProductWithSpecialPriceTest.xml |  6 ++----
 ...eProductWithoutFillingQuantityAndStockTest.xml |  6 ++----
 ...teDownloadableProductWithoutTaxClassIdTest.xml |  6 ++----
 ...nRemoveDefaultImageDownloadableProductTest.xml |  3 +--
 ...adableProductWithSeparateLinksFromCartTest.xml |  3 +--
 ...llDownloadableLinksDownloadableProductTest.xml |  3 +--
 ...wProductsListWidgetDownloadableProductTest.xml |  3 +--
 ...llDownloadableLinksDownloadableProductTest.xml |  3 +--
 ...efrontElasticsearch6SearchInvalidValueTest.xml |  3 +--
 .../AdminAddDefaultImageGroupedProductTest.xml    |  3 +--
 .../Mftf/Test/AdminGroupedProductsListTest.xml    |  3 +--
 .../AdminRemoveDefaultImageGroupedProductTest.xml |  3 +--
 .../Test/AdminSortingAssociatedProductsTest.xml   |  6 ++----
 .../NewProductsListWidgetGroupedProductTest.xml   |  3 +--
 ...tributesChangedValueToEmptyAfterImportTest.xml |  3 +--
 .../Test/YoutubeVideoWindowOnProductPageTest.xml  |  3 +--
 ...StorefrontGuestCheckoutDisabledProductTest.xml |  6 +++---
 ...minCreateCreditMemoConfigurableProductTest.xml |  2 +-
 .../AdminCartRulesAppliedForProductInCartTest.xml |  3 +--
 .../Test/AdminGlobalSearchOnProductPageTest.xml   |  3 +--
 .../Test/Mftf/Test/AdminCreateTextSwatchTest.xml  |  3 +--
 .../Mftf/Test/AdminCreateVisualSwatchTest.xml     |  3 +--
 .../Test/AdminDisablingSwatchTooltipsTest.xml     |  3 +--
 .../Test/StorefrontFilterByImageSwatchTest.xml    |  3 +--
 .../Test/StorefrontFilterByTextSwatchTest.xml     |  3 +--
 .../Test/StorefrontFilterByVisualSwatchTest.xml   |  3 +--
 ...rontSwatchAttributesDisplayInWidgetCMSTest.xml |  6 ++----
 ...frontSwatchProductWithFileCustomOptionTest.xml |  3 +--
 .../Mftf/Test/AdminCheckingTaxReportGridTest.xml  |  2 +-
 ...nGridFilterDeleteAndVerifyErrorMessageTest.xml |  3 +--
 ...WithSeveralWebsitesAndCheckURLRewritesTest.xml |  3 +--
 .../AdminRemoveProductWeeeAttributeOptionTest.xml |  3 +--
 ...InShoppingCartForCustomerPhysicalQuoteTest.xml |  2 +-
 ...ionInShoppingCartForGuestPhysicalQuoteTest.xml |  2 +-
 ...oductChildImageShouldBeShownOnWishListTest.xml |  6 ++----
 ...rontAddMultipleStoreProductsToWishlistTest.xml |  2 +-
 140 files changed, 183 insertions(+), 339 deletions(-)

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultImageBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultImageBundleProductTest.xml
index 55038b0c68c44..3b2fe8c1fb9fc 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultImageBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultImageBundleProductTest.xml
@@ -31,8 +31,7 @@
         </after>
 
         <!-- Create a bundle product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageBundle"/>
-        <waitForPageLoad stepKey="waitForProductPageLoadBundle"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPageBundle"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateBundleProduct">
             <argument name="product" value="BundleProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml
index 4ba5d0f66e096..ded750726209a 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml
@@ -37,8 +37,7 @@
         </after>
 
         <!-- Create a bundle product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageBundle"/>
-        <waitForPageLoad stepKey="waitForProductPageLoadBundle"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPageBundle"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateBundleProduct">
             <argument name="product" value="BundleProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultImageBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultImageBundleProductTest.xml
index ab1d4bb5ce68a..83c5276d70e34 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultImageBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultImageBundleProductTest.xml
@@ -35,8 +35,7 @@
         </after>
 
         <!-- Create a bundle product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageBundle"/>
-        <waitForPageLoad stepKey="waitForProductPageLoadBundle"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPageBundle"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateBundleProduct">
             <argument name="product" value="BundleProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/EnableDisableBundleProductStatusTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/EnableDisableBundleProductStatusTest.xml
index 90619eeeadae9..fbbb86710c42d 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/EnableDisableBundleProductStatusTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/EnableDisableBundleProductStatusTest.xml
@@ -76,8 +76,7 @@
         <seeElement stepKey="LookingForNameOfProduct" selector="{{StorefrontBundledSection.bundleProductName}}"/>
 
         <!--Testing disabled view-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="GoToProductCatalog"/>
-        <waitForPageLoad stepKey="WaitForCatalogProductPageToLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="GoToProductCatalog"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="FindProductEditPage">
             <argument name="product" value="BundleProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/NewProductsListWidgetBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/NewProductsListWidgetBundleProductTest.xml
index cc2aeb0602d36..395f21155169d 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/NewProductsListWidgetBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/NewProductsListWidgetBundleProductTest.xml
@@ -35,8 +35,7 @@
 
         <!-- Create a product to appear in the widget, fill in basic info first -->
 
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductList"/>
-        <waitForPageLoad stepKey="waitForProductList"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductList"/>
         <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
         <click selector="{{AdminProductGridActionSection.addBundleProduct}}" stepKey="clickAddBundleProduct"/>
         <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{_defaultProduct.name}}" stepKey="fillProductName"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleOptionsToCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleOptionsToCartTest.xml
index 8e0197697e691..5f9697f666e7b 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleOptionsToCartTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleOptionsToCartTest.xml
@@ -53,8 +53,7 @@
         </after>
 
         <!-- Start creating a bundle product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
-        <waitForPageLoad stepKey="waitForProductList"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductList"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProduct">
             <argument name="product" value="BundleProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml
index a37ec0cffbbb8..86b52cda68f3e 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml
@@ -31,8 +31,7 @@
         </after>
 
         <!-- Create a bundle product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageBundle"/>
-        <waitForPageLoad stepKey="waitForProductPageLoadBundle"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPageBundle"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateBundleProduct">
             <argument name="product" value="BundleProduct"/>
         </actionGroup>
@@ -85,8 +84,7 @@
         <grabTextFrom selector="{{CheckoutCartProductSection.nthBundleOptionName('1')}}" stepKey="grabTotalBefore"/>
 
         <!-- Find the product that we just created using the product grid -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-        <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPage"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="findCreatedProduct">
             <argument name="product" value="BundleProduct"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleAddToCartSuccessTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleAddToCartSuccessTest.xml
index 85be636ec269c..c476d614765bd 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleAddToCartSuccessTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleAddToCartSuccessTest.xml
@@ -30,8 +30,7 @@
         </after>
 
         <!-- Start creating a bundle product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
-        <waitForPageLoad stepKey="waitForProductList"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductList"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProduct">
             <argument name="product" value="BundleProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleCartTest.xml
index 966082739aa68..604e317f9d7e6 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleCartTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleCartTest.xml
@@ -31,8 +31,7 @@
         </after>
 
         <!-- Start creating a bundle product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
-        <waitForPageLoad stepKey="waitForProductList"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductList"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProduct">
             <argument name="product" value="BundleProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml
index ffcf5ba35dce8..246a9b50612c6 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml
@@ -36,8 +36,8 @@
         </after>
 
         <!-- Start creating a bundle product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
-        <waitForPageLoad stepKey="waitForProductList"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductList"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductList"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProduct">
             <argument name="product" value="BundleProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
index 3082e467ec734..8449f0d6d1402 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
@@ -31,8 +31,7 @@
         </after>
 
         <!-- Create a bundle product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageBundle"/>
-        <waitForPageLoad stepKey="waitForProductPageLoadBundle"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPageBundle"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateBundleProduct">
             <argument name="product" value="BundleProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenProductIndexPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenProductIndexPageActionGroup.xml
index ca1303f180ca4..153227e462f32 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenProductIndexPageActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenProductIndexPageActionGroup.xml
@@ -8,6 +8,9 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminOpenProductIndexPageActionGroup">
+        <annotations>
+            <description>Go to products grid page.</description>
+        </annotations>
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndexPage"/>
         <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
     </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageSimpleProductTest.xml
index 92f24fe76502d..fd19555081a2c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageSimpleProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageSimpleProductTest.xml
@@ -26,8 +26,7 @@
         </after>
 
         <!--Create product-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductIndexPage"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
         <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGridColumnsInitial"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateSimpleProduct">
             <argument name="product" value="SimpleProduct3"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageVirtualProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageVirtualProductTest.xml
index 7cf388914207b..ca5613d859299 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageVirtualProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageVirtualProductTest.xml
@@ -26,8 +26,7 @@
         </after>
 
         <!--Create product-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductIndexPage"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
         <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGridColumnsInitial"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProduct">
             <argument name="product" value="defaultVirtualProduct"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml
index 61d197d34a31d..a7f4ccd1c5e84 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml
@@ -30,8 +30,7 @@
         </after>
 
         <!-- Create product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="adminProductIndexPageAdd"/>
-        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="adminProductIndexPageAdd"/>
         <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGridColumnsInitial"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProductPage">
             <argument name="product" value="ApiSimpleProduct"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml
index 4aa96c91eb299..6c2899da11443 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml
@@ -34,8 +34,7 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!--Open Product Index Page and filter the product-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProduct">
             <argument name="product" value="SimpleProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml
index b2181164070dc..ad0afa726c049 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml
@@ -31,8 +31,7 @@
             <deleteData createDataKey="createSimpleUSCustomer" stepKey="deleteCustomer"/>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex1"/>
-            <waitForPageLoad time="30" stepKey="waitForProductIndexPageLoad"/>
+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex1"/>
             <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetGridToDefaultKeywordSearch"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
         </after>
@@ -69,8 +68,7 @@
         <seeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('Regular Price')}}" stepKey="assertRegularPriceLabel_2"/>
         <seeElement selector="{{StorefrontCategoryProductSection.productPriceOld('100')}}" stepKey="assertRegularPriceAmount_2"/>
         <!--Case: Tier Price for General Customer Group-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex2"/>
-        <waitForPageLoad time="30" stepKey="waitForProductPageToLoad1"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex2"/>
         <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct2">
             <argument name="product" value="$$createSimpleProduct$$"/>
         </actionGroup>
@@ -94,8 +92,7 @@
         <seeElement selector="{{StorefrontCategoryProductSection.productPriceLabel('Regular Price')}}" stepKey="assertRegularPriceLabel_4"/>
         <seeElement selector="{{StorefrontCategoryProductSection.productPriceOld('100')}}" stepKey="assertRegularPriceAmount_3"/>
         <!--Case: Tier Price applied if Product quantity meets Tier Price Condition-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex3"/>
-        <waitForPageLoad time="30" stepKey="waitForProductPageToLoad2"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex3"/>
         <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct3">
             <argument name="product" value="$$createSimpleProduct$$"/>
         </actionGroup>
@@ -160,8 +157,7 @@
             <actualResult type="variable">grabTextFromSubtotalField3</actualResult>
         </assertEquals>
         <!--Tier Price is changed in Shopping Cart and is changed on Product page if Tier Price parameters are changed in Admin-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex4"/>
-        <waitForPageLoad time="30" stepKey="waitForProductPageToLoa4"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex4"/>
         <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct4">
             <argument name="product" value="$$createSimpleProduct$$"/>
         </actionGroup>
@@ -228,8 +224,7 @@
         <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceAmount('2', '75')}}" stepKey="assertProductTierPriceAmountForSecondRow2"/>
         <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceSavePercentageAmount('1', '10')}}" stepKey="assertProductTierPriceSavePercentageAmountForFirstRow2"/>
         <seeElement selector="{{StorefrontProductInfoMainSection.productTierPriceSavePercentageAmount('2', '25')}}" stepKey="assertProductTierPriceSavePercentageAmountForSecondRow2"/>
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex5"/>
-        <waitForPageLoad time="30" stepKey="waitForProductPageToLoad3"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex5"/>
         <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct5">
             <argument name="product" value="$$createSimpleProduct$$"/>
         </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductWithPercentageDiscountTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductWithPercentageDiscountTest.xml
index fd8c0ba29fdfa..45284e69a54e0 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductWithPercentageDiscountTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductWithPercentageDiscountTest.xml
@@ -27,8 +27,7 @@
         <after>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-            <waitForPageLoad time="30" stepKey="waitForProductIndexPageLoad"/>
+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
             <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetGridToDefaultKeywordSearch"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
         </after>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckConfigurableProductPriceWithDisabledChildProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckConfigurableProductPriceWithDisabledChildProductTest.xml
index 39351539d14a6..6c1257f3849a1 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckConfigurableProductPriceWithDisabledChildProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckConfigurableProductPriceWithDisabledChildProductTest.xml
@@ -146,8 +146,7 @@
         <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$$createConfigChildProduct3.price$$" stepKey="seeChildProduct3PriceInStoreFront"/>
 
         <!-- Open Product Index Page and Filter First Child product  -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProduct">
             <argument name="product" value="ApiSimpleOne"/>
         </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckOutOfStockProductIsNotVisibleInCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckOutOfStockProductIsNotVisibleInCategoryTest.xml
index a94610abf0918..e715cee7e9912 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckOutOfStockProductIsNotVisibleInCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckOutOfStockProductIsNotVisibleInCategoryTest.xml
@@ -34,8 +34,7 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!--Open Product Index Page and filter the product-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProduct">
             <argument name="product" value="SimpleProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckOutOfStockProductIsVisibleInCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckOutOfStockProductIsVisibleInCategoryTest.xml
index e64707a895fd4..7f940136283ff 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckOutOfStockProductIsVisibleInCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckOutOfStockProductIsVisibleInCategoryTest.xml
@@ -37,8 +37,7 @@
             <magentoCLI stepKey="setDisplayOutOfStockProduct" command="config:set cataloginventory/options/show_out_of_stock 0" />
         </after>
         <!--Open Product Index Page and filter the product-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProduct">
             <argument name="product" value="SimpleProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAttributeSetEntityTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAttributeSetEntityTest.xml
index 04d032511ded0..9b9f7cf468985 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAttributeSetEntityTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAttributeSetEntityTest.xml
@@ -57,8 +57,7 @@
         <see userInput="$$createProductAttribute.attribute_code$$" selector="{{AdminProductAttributeSetEditSection.groupTree}}" stepKey="seeAttributeInGroup2"/>
 
         <!-- Assert attribute can be used in product creation -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToCatalogProductGrid"/>
-        <waitForPageLoad stepKey="waitForPageLoad3"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToCatalogProductGrid"/>
         <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
         <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryFromProductPageTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryFromProductPageTest.xml
index b94c12d1d7a39..a9d3bd89f8d23 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryFromProductPageTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryFromProductPageTest.xml
@@ -32,8 +32,7 @@
         </after>
 
         <!-- Find the product that we just created using the product grid and go to its page-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-        <waitForPageLoad stepKey="waitForAdminProductGridLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPage"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="findCreatedProduct">
             <argument name="product" value="SimpleTwo"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilterTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilterTest.xml
index 99d0f88cf0e9a..9e4f0325e9155 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilterTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilterTest.xml
@@ -31,8 +31,7 @@
             <actionGroup ref="NavigateToAndResetProductGridToDefaultViewActionGroup" stepKey="NavigateToAndResetProductGridToDefaultView"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductList"/>
-        <waitForPageLoad stepKey="waitForProductList"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductList"/>
         <!--Create Default Product-->
         <click selector="{{AdminProductGridActionSection.addProductBtn}}" stepKey="clickAddDefaultProduct"/>
         <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{SimpleProduct.name}}" stepKey="fillDefaultProductName"/>
@@ -45,8 +44,7 @@
         <waitForPageLoad stepKey="waitForPDefaultProductSaved"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="successMessageYouSavedTheProductIsShown"/>
         <!--Create product with grid filter Not Visible Individually-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="ProductList"/>
-        <waitForPageLoad stepKey="waitForProductPage"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="ProductList"/>
         <click selector="{{AdminProductGridActionSection.addProductBtn}}" stepKey="clickAddFilterProduct"/>
         <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{defaultSimpleProduct.name}}" stepKey="fillProductName"/>
         <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{defaultSimpleProduct.sku}}" stepKey="fillProductSku"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml
index 7b2c67b205ea8..d925f81a68c1e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml
@@ -46,8 +46,7 @@
         </after>
 
         <!-- Open Product Index Page-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
 
         <!-- Select Created Product-->
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProductGridBySku">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateNewGroupForAttributeSetTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateNewGroupForAttributeSetTest.xml
index 573fc1f83a5a8..fc5fa60f754c4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateNewGroupForAttributeSetTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateNewGroupForAttributeSetTest.xml
@@ -91,8 +91,7 @@
         <dontSeeElement selector="{{AdminProductAttributeSetEditSection.attributesInGroup(emptyGroup.name)}}" stepKey="seeNoAttributes"/>
 
         <!-- Navigate to Catalog > Products -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductPage"/>
-        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductPage"/>
 
         <!-- Start to create a new simple product with the custom attribute set from the preconditions -->
         <click selector="{{AdminProductGridActionSection.addProductBtn}}" stepKey="clickAddProduct"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml
index 7fdab11d0a050..e09c73845dc38 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml
@@ -43,8 +43,7 @@
         </after>
 
         <!-- Open Product Index Page-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
 
         <!-- Select Created Product-->
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProductGridBySku">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeRequiredTextFieldTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeRequiredTextFieldTest.xml
index 274a560d343d8..0257f0314fb51 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeRequiredTextFieldTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeRequiredTextFieldTest.xml
@@ -41,9 +41,7 @@
         </after>
 
         <!-- Open Product Index Page-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
-
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
         <!-- Select Created Product-->
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProductGridBySku">
             <argument name="product" value="$$createSimpleProduct$$"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDuplicateUrlkeyTest/AdminCreateProductDuplicateUrlkeyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDuplicateUrlkeyTest/AdminCreateProductDuplicateUrlkeyTest.xml
index c461aa8bfcf18..16a4887d4a934 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDuplicateUrlkeyTest/AdminCreateProductDuplicateUrlkeyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDuplicateUrlkeyTest/AdminCreateProductDuplicateUrlkeyTest.xml
@@ -27,7 +27,7 @@
         </after>
 
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
         <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
         <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/>
         <fillField userInput="$$simpleProduct.name$$new" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithDatetimeAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithDatetimeAttributeTest.xml
index 2141f44113057..39dac5b12b6e1 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithDatetimeAttributeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithDatetimeAttributeTest.xml
@@ -58,7 +58,7 @@
         <waitForElementVisible selector="{{AdminProductAttributesSection.attributeTextInputByCode($createDatetimeAttribute.attribute_code$)}}" stepKey="waitForSlideOutAttributes"/>
         <seeInField selector="{{AdminProductAttributesSection.attributeTextInputByCode($createDatetimeAttribute.attribute_code$)}}" userInput="$generateDefaultValue" stepKey="checkDefaultValue"/>
         <!-- Check datetime grid filter -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToAdminProductIndexPage"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToAdminProductIndexPage"/>
         <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
         <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openProductFilters"/>
         <fillField selector="{{AdminProductGridFilterSection.inputByCodeRangeFrom($createDatetimeAttribute.attribute_code$)}}" userInput="{$generateDefaultValue}" stepKey="fillProductDatetimeFromFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteAttributeSetTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteAttributeSetTest.xml
index 3dfeea2c33af0..b82c6ba13550c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteAttributeSetTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteAttributeSetTest.xml
@@ -45,8 +45,7 @@
         <click selector="{{AdminProductAttributeSetGridSection.searchBtn}}" stepKey="clickSearch2"/>
         <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage"/>
         <!-- Search for the product by sku and name on the product page -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToAdminProductIndex"/>
-        <waitForPageLoad stepKey="waitForAdminProductIndex"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToAdminProductIndex"/>
         <actionGroup ref="FilterProductGridBySkuAndNameActionGroup" stepKey="filerProductsBySkuAndName">
             <argument name="product" value="SimpleProductWithCustomAttributeSet"/>
         </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductAttributeTest.xml
index c0cbb44ebc681..30bc0315bcf13 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductAttributeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductAttributeTest.xml
@@ -45,8 +45,7 @@
         </actionGroup>
         <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage2"/>
          <!--Go to the Catalog > Products page and create Simple Product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductList"/>
-        <waitForPageLoad stepKey="waitForProductList"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductList"/>
         <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="toggleAddProductBtn"/>
         <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="chooseAddSimpleProduct"/>
         <waitForPageLoad stepKey="waitForProductAdded"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteTextFieldProductAttributeFromAttributeSetTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteTextFieldProductAttributeFromAttributeSetTest.xml
index 36001bd0b570a..a6cd3c8b52b23 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteTextFieldProductAttributeFromAttributeSetTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteTextFieldProductAttributeFromAttributeSetTest.xml
@@ -48,8 +48,7 @@
         <waitForPageLoad stepKey="waitForAttributeSetEditPageToLoad"/>
         <see selector="{{AdminProductAttributeSetEditSection.groupTree}}" userInput="$$attribute.attribute_code$$" stepKey="seeAttributeInAttributeGroupTree"/>
         <!--Open Product Index Page and filter the product-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProduct">
             <argument name="product" value="SimpleProduct2"/>
         </actionGroup>
@@ -82,8 +81,7 @@
         <dontSee userInput="$$attribute.attribute_code$$" selector="{{AdminProductAttributeSetEditSection.groupTree}}" stepKey="dontSeeAttributeInAttributeGroupTree"/>
         <dontSee userInput="$$attribute.attribute_code$$" selector="{{AdminProductAttributeSetEditSection.unassignedAttributesTree}}" stepKey="dontSeeAttributeInUnassignedAttributeTree"/>
         <!--Verify Product Attribute is not present in Product Index Page -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="openProductIndexPage"/>
-        <waitForPageLoad stepKey="waitForProductIndexPageToLoad1"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="openProductIndexPage"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProduct1">
             <argument name="product" value="SimpleProduct2"/>
         </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminEditTextEditorProductAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminEditTextEditorProductAttributeTest.xml
index ebbfdc4d72f40..58901f17d7493 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminEditTextEditorProductAttributeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminEditTextEditorProductAttributeTest.xml
@@ -62,8 +62,7 @@
         <dontSeeElement selector="{{StorefrontPropertiesSection.EnableWYSIWYG}}" stepKey="dontSeeWYSIWYGEnableField2" />
         <click selector="{{AttributePropertiesSection.Save}}" stepKey="saveAttribute8" />
         <waitForPageLoad stepKey="waitForPageLoad8"/>
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGrid" />
-        <waitForPageLoad stepKey="waitForPageLoad9"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGrid"/>
         <actionGroup ref="SortByIdDescendingActionGroup" stepKey="sortByIdDescending" />
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.enabledFilters}}" visible="true" stepKey="clearAllExistingFilter"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingAfterFilterIsCleared"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilterByNameByStoreViewOnProductGridTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilterByNameByStoreViewOnProductGridTest.xml
index 843221782ebd9..eb9fe693f8b3b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilterByNameByStoreViewOnProductGridTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilterByNameByStoreViewOnProductGridTest.xml
@@ -38,7 +38,7 @@
         <click selector="{{AdminProductFormSection.productNameUseDefault}}" stepKey="uncheckUseDefault"/>
         <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{SimpleProduct.name}}" stepKey="fillNewName"/>
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveSimpleProduct"/>
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
         <actionGroup ref="FilterProductGridByNameActionGroup" stepKey="filterGridByName">
             <argument name="product" value="SimpleProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassChangeProductsStatusTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassChangeProductsStatusTest.xml
index 0214f9141b903..07a453b3e6e5e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassChangeProductsStatusTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassChangeProductsStatusTest.xml
@@ -37,8 +37,7 @@
         </after>
 
         <!-- Search and select products -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
         <actionGroup ref="SearchProductGridByKeyword2ActionGroup" stepKey="searchByKeyword">
             <argument name="keyword" value="api-simple-product"/>
         </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml
index e8e0d449aee4e..b920b8a73ce4d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml
@@ -30,8 +30,7 @@
         </after>
 
         <!--Open Product Index Page-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
 
         <!--Search products using keyword -->
         <actionGroup ref="SearchProductGridByKeyword2ActionGroup" stepKey="searchByKeyword">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
index 31b5961edaaaa..02d364f6becaa 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
@@ -42,8 +42,7 @@
         </after>
 
         <!-- Search and select products -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
         <actionGroup ref="SearchProductGridByKeyword2ActionGroup" stepKey="searchByKeyword">
             <argument name="keyword" value="api-simple-product"/>
         </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesMissingRequiredFieldTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesMissingRequiredFieldTest.xml
index e4d69e9169613..64bdceea417d4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesMissingRequiredFieldTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesMissingRequiredFieldTest.xml
@@ -37,8 +37,7 @@
         </after>
 
         <!-- Search and select products -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
         <actionGroup ref="SearchProductGridByKeyword2ActionGroup" stepKey="searchByKeyword">
             <argument name="keyword" value="api-simple-product"/>
         </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest/AdminMassUpdateProductAttributesStoreViewScopeMysqlTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest/AdminMassUpdateProductAttributesStoreViewScopeMysqlTest.xml
index 7cdfd6dabed47..d692bd8969d3e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest/AdminMassUpdateProductAttributesStoreViewScopeMysqlTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest/AdminMassUpdateProductAttributesStoreViewScopeMysqlTest.xml
@@ -33,8 +33,7 @@
         </after>
 
         <!-- Search and select products -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
         <actionGroup ref="SearchProductGridByKeyword2ActionGroup" stepKey="searchByKeyword">
             <argument name="keyword" value="api-simple-product"/>
         </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest/AdminMassUpdateProductAttributesStoreViewScopeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest/AdminMassUpdateProductAttributesStoreViewScopeTest.xml
index 08b2d924e2a5e..2e86c025af00c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest/AdminMassUpdateProductAttributesStoreViewScopeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest/AdminMassUpdateProductAttributesStoreViewScopeTest.xml
@@ -35,8 +35,7 @@
         </after>
 
         <!-- Search and select products -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
         <actionGroup ref="SearchProductGridByKeyword2ActionGroup" stepKey="searchByKeyword">
             <argument name="keyword" value="api-simple-product"/>
         </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest/AdminMassUpdateProductStatusStoreViewScopeMysqlTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest/AdminMassUpdateProductStatusStoreViewScopeMysqlTest.xml
index 63e22fc5a12d9..e43e01e6777f6 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest/AdminMassUpdateProductStatusStoreViewScopeMysqlTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest/AdminMassUpdateProductStatusStoreViewScopeMysqlTest.xml
@@ -70,7 +70,7 @@
             <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteSecondWebsite">
                 <argument name="websiteName" value="Second Website"/>
             </actionGroup>
-            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
 
             <!--Delete Products -->
             <actionGroup ref="DeleteProductActionGroup" stepKey="deleteProduct1">
@@ -83,8 +83,7 @@
         </after>
 
         <!-- Search and select products -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
         <actionGroup ref="SearchProductGridByKeyword2ActionGroup" stepKey="searchByKeyword">
             <argument name="keyword" value="{{simpleProductForMassUpdate.keyword}}"/>
         </actionGroup>
@@ -127,8 +126,7 @@
         <see userInput="2 items" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="seeInDefault"/>
 
         <!-- Enable the product in Default store view -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex2"/>
-        <waitForPageLoad stepKey="waitForProductIndexPageLoad2"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex2"/>
         <click selector="{{AdminProductGridSection.productGridCheckboxOnRow('1')}}" stepKey="clickCheckboxDefaultStoreView"/>
         <click selector="{{AdminProductGridSection.productGridCheckboxOnRow('2')}}" stepKey="clickCheckboxDefaultStoreView2"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest/AdminMassUpdateProductStatusStoreViewScopeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest/AdminMassUpdateProductStatusStoreViewScopeTest.xml
index 54921d3fc2dda..e1be9112711d4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest/AdminMassUpdateProductStatusStoreViewScopeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest/AdminMassUpdateProductStatusStoreViewScopeTest.xml
@@ -70,8 +70,7 @@
             <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteSecondWebsite">
                 <argument name="websiteName" value="Second Website"/>
             </actionGroup>
-            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-
+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
             <!--Delete Products -->
             <actionGroup ref="DeleteProductActionGroup" stepKey="deleteProduct1">
                 <argument name="productName" value="simpleProductForMassUpdate.name"/>
@@ -83,8 +82,7 @@
         </after>
 
         <!-- Search and select products -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
         <actionGroup ref="SearchProductGridByKeyword2ActionGroup" stepKey="searchByKeyword">
             <argument name="keyword" value="{{simpleProductForMassUpdate.keyword}}"/>
         </actionGroup>
@@ -136,8 +134,7 @@
         <see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="seeInDefaultSecondProductResults"/>
 
         <!--Enable the product in Default store view-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex2"/>
-        <waitForPageLoad stepKey="waitForProductIndexPageLoad2"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex2"/>
         <click selector="{{AdminProductGridSection.productGridCheckboxOnRow('1')}}" stepKey="clickCheckboxDefaultStoreView"/>
         <click selector="{{AdminProductGridSection.productGridCheckboxOnRow('2')}}" stepKey="clickCheckboxDefaultStoreView2"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml
index c1cfcf7ebe10f..1f4728c4a2277 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml
@@ -52,8 +52,7 @@
         <see userInput="You saved the store view." stepKey="seeSaveMessage"/>
 
         <!--Create a Simple Product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToCatalogProductGrid"/>
-        <waitForPageLoad stepKey="waitForProductGrid"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToCatalogProductGrid"/>
         <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
         <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/>
         <fillField userInput="{{_defaultProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillProductName"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminNavigateMultipleUpSellProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminNavigateMultipleUpSellProductsTest.xml
index 659521ed9e467..94d7ea14b096c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminNavigateMultipleUpSellProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminNavigateMultipleUpSellProductsTest.xml
@@ -96,8 +96,7 @@
         </after>
 
         <!--Open Product Index Page-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
 
         <!--Select SimpleProduct -->
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="findCreatedProduct">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByCustomAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByCustomAttributeTest.xml
index 9536ee030cdf8..d677eda5b0920 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByCustomAttributeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByCustomAttributeTest.xml
@@ -94,8 +94,7 @@
             <!-- Reindex invalidated indices after product attribute has been created/deleted -->
             <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
         </after>
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
         <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearProductGridFilters"/>
         <!--Sort by custom attribute DESC using grabbed value-->
         <conditionalClick selector="{{AdminProductGridSection.columnHeader($$createDropdownAttribute.attribute[frontend_labels][0][label]$$)}}" dependentSelector="{{AdminProductGridSection.columnHeader($$createDropdownAttribute.attribute[frontend_labels][0][label]$$)}}" visible="true" stepKey="ascendSortByCustomAttribute"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByDateAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByDateAttributeTest.xml
index d47730a99308b..ab84f70930b51 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByDateAttributeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByDateAttributeTest.xml
@@ -38,8 +38,7 @@
         <click selector="{{AttributePropertiesSection.Save}}" stepKey="saveAttribute"/>
         <waitForPageLoad stepKey="waitForSaveAttribute"/>
         <actionGroup ref="ClearCacheActionGroup" stepKey="clearCache"/>
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad time="30" stepKey="waitForProductGridPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
         <click selector="{{AdminProductGridFilterSection.columnsDropdown}}" stepKey="openColumnsdropDown1"/>
         <checkOption selector="{{AdminProductGridFilterSection.viewColumnOption('Set Product as New from Date')}}" stepKey="showProductAsNewColumn"/>
         <click selector="{{AdminProductGridFilterSection.columnsDropdown}}" stepKey="closeColumnsDropdown1"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml
index ae63158990b96..c70cea66173a2 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml
@@ -48,8 +48,7 @@
         <click selector="{{AttributePropertiesSection.Save}}" stepKey="saveAttribute"/>
         <waitForPageLoad stepKey="waitForAttributeToSave"/>
         <actionGroup ref="ClearCacheActionGroup" stepKey="clearCache"/>
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad time="30" stepKey="waitForProductGridPageToLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
         <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickOnAddProductDropdown"/>
         <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickOnAddSimpleProduct"/>
         <waitForPageLoad stepKey="waitForProductEditToLoad"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveCustomOptionsFromProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveCustomOptionsFromProductTest.xml
index 96ee795998459..99fe4dd0c135d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveCustomOptionsFromProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveCustomOptionsFromProductTest.xml
@@ -26,7 +26,7 @@
         </before>
         <after>
             <deleteData createDataKey="createProduct" stepKey="deleteProductWithOptions"/>
-            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
             <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearProductFilter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageSimpleProductTest.xml
index 00eaa623e2bca..0260b6c73278c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageSimpleProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageSimpleProductTest.xml
@@ -26,8 +26,7 @@
         </after>
 
         <!--Create product-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductIndexPage"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
         <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGridColumnsInitial"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateSimpleProduct">
             <argument name="product" value="SimpleProduct3"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageVirtualProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageVirtualProductTest.xml
index 6cc1b256e5ec9..ffbb775a5babf 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageVirtualProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageVirtualProductTest.xml
@@ -26,8 +26,7 @@
         </after>
 
         <!--Create product-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductIndexPage"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
         <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGridColumnsInitial"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProduct">
             <argument name="product" value="defaultVirtualProduct"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoSimpleProductTest.xml
index 60c32004e3ca8..27c657fce301e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoSimpleProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoSimpleProductTest.xml
@@ -30,8 +30,7 @@
         </after>
 
         <!-- Create product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="adminProductIndexPageAdd"/>
-        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="adminProductIndexPageAdd"/>
         <actionGroup ref="EnableAdminAccountSharingActionGroup" stepKey="enableAdminAccountSharing"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProductPage">
             <argument name="product" value="ApiSimpleProduct"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml
index 6cd76c4cc06b8..c0d4fb17f023e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml
@@ -71,8 +71,7 @@
         </after>
 
         <!--Create product-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductIndexPage"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
         <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGridColumnsInitial"/>
 
         <!--Open created product-->
@@ -97,8 +96,7 @@
         </actionGroup>
 
         <!--Go to "Catalog" -> "Products". Open created product-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductPage"/>
-        <waitForPageLoad stepKey="waitForProductPageLoaded"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductPage"/>
         <click selector="{{AdminProductGridSection.productGridNameProduct($$product.name$$)}}" stepKey="openCreatedProduct"/>
         <waitForPageLoad stepKey="waitForCreatedProductOpened"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRequiredFieldsHaveRequiredFieldIndicatorTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRequiredFieldsHaveRequiredFieldIndicatorTest.xml
index 0281fded3a8e4..1946552997f77 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRequiredFieldsHaveRequiredFieldIndicatorTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRequiredFieldsHaveRequiredFieldIndicatorTest.xml
@@ -39,7 +39,7 @@
 			<expectedResult type="string">rgb(226, 38, 38)</expectedResult>
         </assertEquals>
 
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndexPage"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndexPage"/>
         <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="addProductDropdown"/>
         <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="addSimpleProduct"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductImagesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductImagesTest.xml
index 9819890ed3751..e6c4c6ae937f2 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductImagesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductImagesTest.xml
@@ -37,8 +37,7 @@
         </after>
 
         <!-- Go to the first product edit page -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex"/>
-        <waitForPageLoad stepKey="wait1"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductIndex"/>
         <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGrid"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProductGridBySku">
             <argument name="product" value="$$firstProduct$$"/>
@@ -123,8 +122,7 @@
         <seeElement selector=".products-grid img[src*='placeholder/small_image.jpg']" stepKey="seePlaceholder"/>
 
         <!-- Go to the second product edit page -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex2"/>
-        <waitForPageLoad stepKey="wait2"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductIndex2"/>
         <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGrid2"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProductGridBySku2">
             <argument name="product" value="$$secondProduct$$"/>
@@ -147,8 +145,7 @@
         <magentoCLI command="cache:flush" stepKey="flushCache"/>
 
         <!-- Go to the admin grid and see the uploaded image -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex3"/>
-        <waitForPageLoad stepKey="wait3"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductIndex3"/>
         <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGrid3"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProductGridBySku3">
             <argument name="product" value="$$secondProduct$$"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductRemoveImagesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductRemoveImagesTest.xml
index ec82bdcf5bc94..b2bf6ce94c4aa 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductRemoveImagesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductRemoveImagesTest.xml
@@ -33,8 +33,7 @@
         </after>
 
         <!-- Go to the product edit page -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex"/>
-        <waitForPageLoad stepKey="wait1"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductIndex"/>
         <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGrid"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProductGridBySku">
             <argument name="product" value="$$product$$"/>
@@ -98,8 +97,7 @@
         <seeElement selector="{{StorefrontCategoryProductSection.ProductImageBySrc('/adobe-small')}}" stepKey="seeThumb"/>
 
         <!-- Go to the admin grid and see the Thumbnail image -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex2"/>
-        <waitForPageLoad stepKey="wait2"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductIndex2"/>
         <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGrid2"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProductGridBySku2">
             <argument name="product" value="$$product$$"/>
@@ -107,8 +105,7 @@
         <seeElement selector="{{AdminProductGridSection.productThumbnailBySrc('/adobe-thumb')}}" stepKey="seeBaseInGrid"/>
 
         <!-- Go to the product edit page again -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex3"/>
-        <waitForPageLoad stepKey="wait5"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductIndex3"/>
         <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGrid3"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProductGridBySku3">
             <argument name="product" value="$$product$$"/>
@@ -123,8 +120,7 @@
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct2"/>
 
         <!-- Check admin grid for placeholder -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex4"/>
-        <waitForPageLoad stepKey="wait6"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductIndex4"/>
         <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGrid4"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProductGridBySku4">
             <argument name="product" value="$$product$$"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductSetEditContentTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductSetEditContentTest.xml
index 51a91a17ff41a..422705894afba 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductSetEditContentTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductSetEditContentTest.xml
@@ -34,8 +34,7 @@
         </after>
 
         <!-- Create product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductIndexPage"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProduct">
             <argument name="product" value="SimpleProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml
index 534924e0f70c9..7d4d252a3ffb5 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml
@@ -46,8 +46,7 @@
         </after>
 
         <!--Create product-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductIndexPage"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProduct">
             <argument name="product" value="SimpleProduct3"/>
         </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml
index 71e827a64ae2d..e9140ccb415cf 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml
@@ -49,8 +49,7 @@
         </after>
 
         <!--Assign Custom Website to Simple Product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToCatalogProductGrid"/>
-        <waitForPageLoad stepKey="waitForCatalogProductGrid"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToCatalogProductGrid"/>
 
         <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
         <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="assignCustomWebsiteToProduct">
@@ -67,8 +66,7 @@
         <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessageAgain"/>
 
         <!--Navigate To Product Grid To Check Website Sorting-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToCatalogProductGridToSortByWebsite"/>
-        <waitForPageLoad stepKey="waitForCatalogProductGridLoaded"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToCatalogProductGridToSortByWebsite"/>
 
         <!--Sorting works (By Websites) ASC-->
         <click selector="{{AdminProductGridSection.columnHeader('Websites')}}" stepKey="clickWebsitesHeaderToSortAsc"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml
index 151046f0474e0..fb210f382cbdd 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml
@@ -29,8 +29,7 @@
 
         <!--Admin creates product-->
         <!--Create Simple Product-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageSimple"/>
-        <waitForPageLoad time="30" stepKey="waitForProductPageLoadSimple"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPageSimple"/>
         <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGridColumnsInitial"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateSimpleProduct">
                 <argument name="product" value="SimpleProduct"/>
@@ -57,8 +56,7 @@
         </actionGroup>
 
         <!--Create Virtual Product-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageVirtual"/>
-        <waitForPageLoad time="30" stepKey="waitForProductPageLoadVirtual"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPageVirtual"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateVirtualProduct">
             <argument name="product" value="VirtualProduct"/>
         </actionGroup>
@@ -73,8 +71,7 @@
 
         <!--Admin uses product grid-->
         <!--Start with default view-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPageGrid"/>
-        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPageGrid"/>
 
         <!--Search by keyword-->
         <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetGridToDefaultKeywordSearch"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/NewProductsListWidgetSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/NewProductsListWidgetSimpleProductTest.xml
index 9ee56c02c7710..6fc4b77c08e55 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/NewProductsListWidgetSimpleProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/NewProductsListWidgetSimpleProductTest.xml
@@ -23,8 +23,7 @@
         <!-- A Cms page containing the New Products Widget gets created here via extends -->
 
         <!-- Create a Simple Product to appear in the widget -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductList"/>
-        <waitForPageLoad stepKey="waitForProductList"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductList"/>
         <click selector="{{AdminProductGridActionSection.addProductBtn}}" stepKey="clickAddProduct"/>
         <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{_defaultProduct.name}}" stepKey="fillProductName"/>
         <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{_defaultProduct.sku}}" stepKey="fillProductSku"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/NewProductsListWidgetVirtualProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/NewProductsListWidgetVirtualProductTest.xml
index a4e0d8708eb49..780557c523854 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/NewProductsListWidgetVirtualProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/NewProductsListWidgetVirtualProductTest.xml
@@ -25,8 +25,7 @@
 
         <!-- Create a Virtual Product to appear in the widget -->
 
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductList"/>
-        <waitForPageLoad stepKey="waitForProductList"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductList"/>
         <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="toggleAddProductButton"/>
         <click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickAddVirtualProduct"/>
         <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{_defaultProduct.name}}" stepKey="fillProductName"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
index b206a33ebde88..172e7422adee0 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
@@ -58,8 +58,7 @@
 
         <actionGroup ref="EnableWebUrlOptionsActionGroup" stepKey="addStoreCodeToUrls"/>
         <!--Create a Simple Product with Custom Options -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToCatalogProductGrid"/>
-        <waitForPageLoad stepKey="waitForCatalogProductGrid"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToCatalogProductGrid"/>
         <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
         <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickAddSimpleProduct"/>
         <fillField userInput="{{_defaultProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/SimpleProductTwoCustomOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/SimpleProductTwoCustomOptionsTest.xml
index 7b2e004495fea..7c063abc535c4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/SimpleProductTwoCustomOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/SimpleProductTwoCustomOptionsTest.xml
@@ -23,8 +23,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
 
             <!--Create product-->
-            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-            <waitForPageLoad stepKey="waitForProductIndexPage"/>
+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
             <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateSimpleProduct">
                 <argument name="product" value="SimpleProduct3"/>
             </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest/StorefrontProductNameWithDoubleQuoteTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest/StorefrontProductNameWithDoubleQuoteTest.xml
index bcd5d7b851db3..39be2f2ab171c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest/StorefrontProductNameWithDoubleQuoteTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest/StorefrontProductNameWithDoubleQuoteTest.xml
@@ -26,8 +26,7 @@
 
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         <!--Create product via admin-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductIndexPage"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductIndex"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToProductCreatePage">
             <argument name="product" value="SimpleProductNameWithDoubleQuote"/>
         </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml
index 95af6e299662b..a92b9441362ef 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml
@@ -67,7 +67,7 @@
 
             <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFilter"/>
 
-            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
             <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearProductsGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogoutStorefront"/>
@@ -75,8 +75,7 @@
 
         <!-- Open Product Grid, Filter product and open -->
 
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
 
         <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="filterGroupedProductOptions">
             <argument name="product" value="_defaultProduct"/>
@@ -272,8 +271,7 @@
 
         <!-- Open Product Grid, Filter product and open -->
 
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage1"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad15"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage1"/>
 
         <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="filterGroupedProductOptions1">
             <argument name="product" value="_defaultProduct"/>
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportImportConfigurableProductWithImagesTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportImportConfigurableProductWithImagesTest.xml
index 64b1680d2e9a1..163de560016a8 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportImportConfigurableProductWithImagesTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportImportConfigurableProductWithImagesTest.xml
@@ -147,7 +147,7 @@
             <deleteData createDataKey="createConfigChildProduct" stepKey="deleteConfigChildProduct"/>
             <deleteData createDataKey="createConfigProductAttr" stepKey="deleteConfigProductAttr"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
             <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGridColumnsInitial"/>
             <!-- Admin logout-->
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutDisabledBundleProductTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutDisabledBundleProductTest.xml
index 444ebf653b94f..0249951d14048 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutDisabledBundleProductTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutDisabledBundleProductTest.xml
@@ -63,7 +63,7 @@
         <openNewTab stepKey="openNewTab"/>
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         <!-- Find the first simple product that we just created using the product grid and go to its page-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPage"/>
         <!-- Disabled bundle product from grid -->
         <actionGroup ref="ChangeStatusProductUsingProductGridActionGroup" stepKey="disabledProductFromGrid">
             <argument name="product" value="$$createBundleDynamicProduct$$"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutDisabledProductAndCouponTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutDisabledProductAndCouponTest.xml
index b962d80a4d88b..6f4942003ea13 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutDisabledProductAndCouponTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutDisabledProductAndCouponTest.xml
@@ -35,7 +35,7 @@
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createUSCustomer" stepKey="deleteCustomer"/>
             <deleteData createDataKey="createSalesRule" stepKey="deleteSalesRule"/>
-            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductListing"/>
+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductListing"/>
             <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetGridToDefaultKeywordSearch"/>
         </after>
 
@@ -70,7 +70,7 @@
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
 
         <!-- Find the first simple product that we just created using the product grid and go to its page-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPage"/>
 
         <!-- Disabled simple product from grid -->
         <actionGroup ref="ChangeStatusProductUsingProductGridActionGroup" stepKey="disabledProductFromGrid">
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddDefaultImageConfigurableTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddDefaultImageConfigurableTest.xml
index 0d83cc6610194..9a2df86fa0793 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddDefaultImageConfigurableTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddDefaultImageConfigurableTest.xml
@@ -94,8 +94,7 @@
             <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
         </after>
 
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="productIndexPage"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="productIndexPage"/>
         <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGridColumnsInitial"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProductGrid">
             <argument name="product" value="$$baseConfigProductHandle$$"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddingNewOptionsWithImagesAndPricesToConfigurableProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddingNewOptionsWithImagesAndPricesToConfigurableProductTest.xml
index 72ebd7962f420..aae100e55414b 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddingNewOptionsWithImagesAndPricesToConfigurableProductTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddingNewOptionsWithImagesAndPricesToConfigurableProductTest.xml
@@ -29,7 +29,7 @@
             <deleteData createDataKey="createConfigProductAttributeCreateConfigurableProduct" stepKey="deleteConfigProductAttribute"/>
             <deleteData createDataKey="createConfigChildProduct1CreateConfigurableProduct" stepKey="deleteConfigChildProduct1"/>
             <deleteData createDataKey="createConfigChildProduct2CreateConfigurableProduct" stepKey="deleteConfigChildProduct2"/>
-            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
             <actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearProductFilters"/>
             <actionGroup ref="DeleteProductActionGroup" stepKey="deleteProduct1">
                 <argument name="productName" value="$$createConfigProductCreateConfigurableProduct.name$$"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAssertNoticeThatExistingSkuAutomaticallyChangedWhenSavingProductWithSameSkuTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAssertNoticeThatExistingSkuAutomaticallyChangedWhenSavingProductWithSameSkuTest.xml
index d58e7cfab1350..37c6ca128b5ed 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAssertNoticeThatExistingSkuAutomaticallyChangedWhenSavingProductWithSameSkuTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAssertNoticeThatExistingSkuAutomaticallyChangedWhenSavingProductWithSameSkuTest.xml
@@ -36,8 +36,7 @@
         </after>
 
         <!-- Create configurable product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="createConfigurableProduct">
             <argument name="product" value="ApiConfigurableProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml
index 7d75f5d53c1f4..96a3c98ff49ce 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml
@@ -115,8 +115,7 @@
             <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
         </after>
         <!-- Create three configurable products with options -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-        <waitForPageLoad time="30" stepKey="wait1"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
         <!-- Edit created first product as configurable product with options -->
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterGridByFirstProduct">
             <argument name="product" value="$$createFirstConfigurableProduct$$"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml
index dc8c09864d0ab..006f4477b0199 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml
@@ -50,8 +50,7 @@
         </after>
 
         <!-- Find the product that we just created using the product grid -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-        <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPage"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}"
             dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="findCreatedProduct">
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest/AdminCreateConfigurableProductAfterGettingIncorrectSKUMessageTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest/AdminCreateConfigurableProductAfterGettingIncorrectSKUMessageTest.xml
index 274a75aedbc5f..335f7e2999fb2 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest/AdminCreateConfigurableProductAfterGettingIncorrectSKUMessageTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest/AdminCreateConfigurableProductAfterGettingIncorrectSKUMessageTest.xml
@@ -72,8 +72,7 @@
         <actionGroup stepKey="deleteProduct1" ref="DeleteProductBySkuActionGroup">
             <argument name="sku" value="$grabTextFromContent"/>
         </actionGroup>
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-        <waitForPageLoad time="60" stepKey="waitForPageLoadInitial"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPage"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
     </test>
 </tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductDeleteTest/AdminConfigurableProductBulkDeleteTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductDeleteTest/AdminConfigurableProductBulkDeleteTest.xml
index a7615d5565828..4f6407ca4150c 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductDeleteTest/AdminConfigurableProductBulkDeleteTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductDeleteTest/AdminConfigurableProductBulkDeleteTest.xml
@@ -139,8 +139,7 @@
         </after>
 
         <!-- Search for prefix of the 3 products we created via api -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
-        <waitForPageLoad stepKey="wait1"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductList"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" stepKey="clearAll" visible="true"/>
         <actionGroup ref="SearchProductGridByKeywordActionGroup" stepKey="searchForProduct">
             <argument name="keyword" value="ApiConfigurableProduct.name"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductDeleteTest/AdminConfigurableProductDeleteTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductDeleteTest/AdminConfigurableProductDeleteTest.xml
index 807ea69bb3958..186752fd52684 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductDeleteTest/AdminConfigurableProductDeleteTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductDeleteTest/AdminConfigurableProductDeleteTest.xml
@@ -81,8 +81,7 @@
 
         <!-- go to admin and delete -->
         <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
-        <waitForPageLoad stepKey="wait2"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductList"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" stepKey="clearAll" visible="true"/>
         <actionGroup ref="SearchProductGridByKeywordActionGroup" stepKey="searchForProduct">
             <argument name="keyword" value="ApiConfigurableProduct.name"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest/AdminConfigurableProductChildrenOutOfStockTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest/AdminConfigurableProductChildrenOutOfStockTest.xml
index 8d2f80ef262fd..0506fbb9b857f 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest/AdminConfigurableProductChildrenOutOfStockTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest/AdminConfigurableProductChildrenOutOfStockTest.xml
@@ -93,8 +93,7 @@
         <see stepKey="checkForOutOfStock" selector="{{StorefrontProductInfoMainSection.stockIndication}}" userInput="IN STOCK"/>
 
         <!-- Find the first simple product that we just created using the product grid and go to its page-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-        <waitForPageLoad stepKey="waitForAdminProductGridLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPage"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="findCreatedProduct">
             <argument name="product" value="ApiSimpleOne"/>
@@ -113,8 +112,7 @@
         <see stepKey="checkForOutOfStock2" selector="{{StorefrontProductInfoMainSection.stockIndication}}" userInput="IN STOCK"/>
 
         <!-- Find the second simple product that we just created using the product grid and go to its page-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage2"/>
-        <waitForPageLoad stepKey="waitForAdminProductGridLoad2"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPage2"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial2"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="findCreatedProduct2">
             <argument name="product" value="ApiSimpleTwo"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest/AdminConfigurableProductOutOfStockAndDeleteCombinationTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest/AdminConfigurableProductOutOfStockAndDeleteCombinationTest.xml
index 3121725c23fe9..4130350744e41 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest/AdminConfigurableProductOutOfStockAndDeleteCombinationTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest/AdminConfigurableProductOutOfStockAndDeleteCombinationTest.xml
@@ -102,8 +102,7 @@
         <see stepKey="checkForOutOfStock2" selector="{{StorefrontProductInfoMainSection.stockIndication}}" userInput="IN STOCK"/>
 
         <!-- Find the second simple product that we just created using the product grid and go to its page-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage2"/>
-        <waitForPageLoad stepKey="waitForAdminProductGridLoad2"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPage2"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial2"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="findCreatedProduct2">
             <argument name="product" value="ApiSimpleTwo"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductSearchTest/AdminConfigurableProductFilterByTypeTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductSearchTest/AdminConfigurableProductFilterByTypeTest.xml
index a35ef058dfd80..6311eaa9f2f99 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductSearchTest/AdminConfigurableProductFilterByTypeTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductSearchTest/AdminConfigurableProductFilterByTypeTest.xml
@@ -77,8 +77,7 @@
             <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
         </after>
 
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
-        <waitForPageLoad stepKey="wait1"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductList"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" stepKey="clearAll" visible="true"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickShowFilters"/>
         <selectOption selector="{{AdminProductGridFilterSection.typeFilter}}" userInput="{{ApiConfigurableProduct.type_id}}" stepKey="selectConfigurableType"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductSearchTest/AdminConfigurableProductSearchTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductSearchTest/AdminConfigurableProductSearchTest.xml
index 6d9015b5d1cbf..0c0645ff00ef0 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductSearchTest/AdminConfigurableProductSearchTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductSearchTest/AdminConfigurableProductSearchTest.xml
@@ -77,8 +77,7 @@
             <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
         </after>
 
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
-        <waitForPageLoad stepKey="wait1"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductList"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" stepKey="clearAll" visible="true"/>
         <actionGroup ref="SearchProductGridByKeywordActionGroup" stepKey="searchForProduct">
             <argument name="keyword" value="ApiConfigurableProduct.name"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateAttributeTest/AdminConfigurableProductUpdateAttributeTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateAttributeTest/AdminConfigurableProductUpdateAttributeTest.xml
index 4b6baf8c58493..a19eb19e7b517 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateAttributeTest/AdminConfigurableProductUpdateAttributeTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateAttributeTest/AdminConfigurableProductUpdateAttributeTest.xml
@@ -116,8 +116,7 @@
         <grabTextFrom stepKey="getBeforeOption" selector="{{StorefrontProductInfoMainSection.nthAttributeOnPage('1')}}"/>
 
         <!-- Find the product that we just created using the product grid -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-        <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPage"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="findCreatedProduct">
             <argument name="product" value="ApiConfigurableProduct"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateAttributeTest/AdminConfigurableProductUpdateChildAttributeTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateAttributeTest/AdminConfigurableProductUpdateChildAttributeTest.xml
index 56f53519e69af..e0150f08d8360 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateAttributeTest/AdminConfigurableProductUpdateChildAttributeTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateAttributeTest/AdminConfigurableProductUpdateChildAttributeTest.xml
@@ -94,8 +94,7 @@
         </after>
 
         <!-- Find the product that we just created using the product grid -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-        <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPage"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="findCreatedProduct">
             <argument name="product" value="$$createConfigProduct$$"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest/AdminConfigurableProductBulkUpdateTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest/AdminConfigurableProductBulkUpdateTest.xml
index bd409d0e4bfde..ccaa57bab42d8 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest/AdminConfigurableProductBulkUpdateTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest/AdminConfigurableProductBulkUpdateTest.xml
@@ -37,15 +37,13 @@
             <deleteData createDataKey="createProduct1" stepKey="deleteFirstProduct"/>
             <deleteData createDataKey="createProduct2" stepKey="deleteSecondProduct"/>
             <deleteData createDataKey="createProduct3" stepKey="deleteThirdProduct"/>
-            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
-            <waitForPageLoad stepKey="waitForPageLoad"/>
+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductList"/>
             <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearProductsGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
         <!-- Search for prefix of the 3 products we created via api -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
-        <waitForPageLoad stepKey="wait1"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductList"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clearAll"/>
         <actionGroup ref="SearchProductGridByKeywordActionGroup" stepKey="searchForProduct">
             <argument name="keyword" value="ApiConfigurableProduct.name"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductBasedOnParentSkuTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductBasedOnParentSkuTest.xml
index 78cbca2d4c099..459d3dea4e80c 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductBasedOnParentSkuTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductBasedOnParentSkuTest.xml
@@ -36,8 +36,7 @@
         </after>
 
         <!-- Create configurable product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="createConfigurableProduct">
             <argument name="product" value="ApiConfigurableProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithCreatingCategoryAndAttributeTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithCreatingCategoryAndAttributeTest.xml
index 3913139c9b7e6..287e4a93e6ba9 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithCreatingCategoryAndAttributeTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithCreatingCategoryAndAttributeTest.xml
@@ -53,8 +53,7 @@
         </after>
 
         <!-- Create configurable product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="createConfigurableProduct">
             <argument name="product" value="ApiConfigurableProduct"/>
         </actionGroup>
@@ -88,8 +87,7 @@
         <actionGroup ref="SaveConfigurableProductWithNewAttributeSetActionGroup" stepKey="saveConfigurableProduct"/>
 
         <!-- Find configurable product in grid -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-        <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPage"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="findCreatedConfigurableProduct">
             <argument name="product" value="ApiConfigurableProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithDisabledChildrenProductsTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithDisabledChildrenProductsTest.xml
index 3bf5666d5a997..6fc2417ac259c 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithDisabledChildrenProductsTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithDisabledChildrenProductsTest.xml
@@ -60,8 +60,7 @@
         </after>
 
         <!-- Create configurable product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="createConfigurableProduct">
             <argument name="product" value="ApiConfigurableProduct"/>
         </actionGroup>
@@ -89,8 +88,7 @@
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveConfigurableProduct"/>
 
         <!-- Find configurable product in grid -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-        <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPage"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="findCreatedConfigurableProduct">
             <argument name="product" value="ApiConfigurableProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithImagesTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithImagesTest.xml
index fa8866fa7d91c..6268fd207c342 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithImagesTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithImagesTest.xml
@@ -63,8 +63,7 @@
         </after>
 
         <!--Create configurable product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="createConfigurableProduct">
             <argument name="product" value="ApiConfigurableProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithThreeProductDisplayOutOfStockProductsTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithThreeProductDisplayOutOfStockProductsTest.xml
index e76d14f3a6aae..c8e285449b19a 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithThreeProductDisplayOutOfStockProductsTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithThreeProductDisplayOutOfStockProductsTest.xml
@@ -83,8 +83,7 @@
         </after>
 
         <!--Create configurable product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="createConfigurableProduct">
             <argument name="product" value="ApiConfigurableProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithThreeProductDontDisplayOutOfStockProductsTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithThreeProductDontDisplayOutOfStockProductsTest.xml
index 9516216d4a62e..15bf0aeeb8227 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithThreeProductDontDisplayOutOfStockProductsTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithThreeProductDontDisplayOutOfStockProductsTest.xml
@@ -82,8 +82,7 @@
         </after>
 
         <!--Create configurable product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="createConfigurableProduct">
             <argument name="product" value="ApiConfigurableProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTierPriceForOneItemTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTierPriceForOneItemTest.xml
index 660eb82a9eacb..1491081a82ee4 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTierPriceForOneItemTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTierPriceForOneItemTest.xml
@@ -71,8 +71,7 @@
         </after>
 
         <!--Create configurable product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-        <waitForPageLoad stepKey="waitProductGridPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="createConfigurableProduct">
             <argument name="product" value="ApiConfigurableProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsAssignedToCategoryTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsAssignedToCategoryTest.xml
index 868690e19f6ba..462384e037669 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsAssignedToCategoryTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsAssignedToCategoryTest.xml
@@ -56,8 +56,7 @@
         </after>
 
         <!-- Create configurable product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="createConfigurableProduct">
             <argument name="product" value="ApiConfigurableProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsWithoutAssignedToCategoryTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsWithoutAssignedToCategoryTest.xml
index 9335f49c9bc2e..ec5b1b36666c8 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsWithoutAssignedToCategoryTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsWithoutAssignedToCategoryTest.xml
@@ -49,8 +49,7 @@
         </after>
 
         <!-- Create configurable product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="createConfigurableProduct">
             <argument name="product" value="ApiConfigurableProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRelatedProductsTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRelatedProductsTest.xml
index b6b3d21c8a626..d485991955bad 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRelatedProductsTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRelatedProductsTest.xml
@@ -95,8 +95,7 @@
         </after>
 
         <comment userInput="Filter and edit simple product 1" stepKey="filterAndEditComment1"/>
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="productIndexPage"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="productIndexPage"/>
         <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGridColumnsInitial"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProductGridSimple">
             <argument name="product" value="$$simple1Handle$$"/>
@@ -140,8 +139,7 @@
         </actionGroup>
 
         <comment userInput="Filter and edit config product" stepKey="filterAndEditComment2"/>
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="productIndexPage2"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad5"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="productIndexPage2"/>
         <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGridColumnsInitial2"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProductGridConfig">
             <argument name="product" value="$$baseConfigProductHandle$$"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRemoveDefaultImageConfigurableTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRemoveDefaultImageConfigurableTest.xml
index 86d4070a9a2c8..59e3a649b3e92 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRemoveDefaultImageConfigurableTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRemoveDefaultImageConfigurableTest.xml
@@ -93,8 +93,7 @@
             <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
         </after>
 
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="productIndexPage"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="productIndexPage"/>
         <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGridColumnsInitial"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProductGrid">
             <argument name="product" value="$$baseConfigProductHandle$$"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVerifyConfigurableProductLayeredNavigationTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVerifyConfigurableProductLayeredNavigationTest.xml
index 7acece767760d..ed838afde4f5a 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVerifyConfigurableProductLayeredNavigationTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVerifyConfigurableProductLayeredNavigationTest.xml
@@ -123,8 +123,7 @@
         </after>
 
         <!-- Open Product Index Page and Filter First Child product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProduct">
             <argument name="product" value="ApiSimpleOne"/>
         </actionGroup>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultImageDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultImageDownloadableProductTest.xml
index c634a8426eac0..c03727a8d00d2 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultImageDownloadableProductTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultImageDownloadableProductTest.xml
@@ -31,8 +31,7 @@
         </after>
 
         <!-- Create product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="adminProductIndexPageAdd"/>
-        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="adminProductIndexPageAdd"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProductPage">
             <argument name="product" value="DownloadableProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductAndAssignItToCustomStoreTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductAndAssignItToCustomStoreTest.xml
index 2f43c6f8278cc..e53c05cfb92cf 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductAndAssignItToCustomStoreTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductAndAssignItToCustomStoreTest.xml
@@ -48,8 +48,7 @@
         <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView"/>
 
         <!-- Create Downloadable product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
         <actionGroup ref="GoToSpecifiedCreateProductPageActionGroup" stepKey="createProduct">
             <argument name="productType" value="downloadable"/>
         </actionGroup>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithCustomOptionsTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithCustomOptionsTest.xml
index f1ea344d4e45c..7685017adc426 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithCustomOptionsTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithCustomOptionsTest.xml
@@ -42,8 +42,7 @@
         </after>
 
         <!-- Create Downloadable product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
         <actionGroup ref="GoToSpecifiedCreateProductPageActionGroup" stepKey="createProduct">
             <argument name="productType" value="downloadable"/>
         </actionGroup>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithDefaultSetLinksTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithDefaultSetLinksTest.xml
index 850a73cd354a5..af9861fe989ec 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithDefaultSetLinksTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithDefaultSetLinksTest.xml
@@ -44,8 +44,7 @@
         </after>
 
         <!-- Create downloadable product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
         <actionGroup ref="GoToSpecifiedCreateProductPageActionGroup" stepKey="createProduct">
             <argument name="productType" value="downloadable"/>
         </actionGroup>
@@ -80,8 +79,7 @@
         <magentoCLI command="cache:flush" stepKey="flushCache"/>
 
         <!-- Find downloadable product in grid -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-        <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPage"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="findCreatedConfigurableProduct">
             <argument name="product" value="DownloadableProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithGroupPriceTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithGroupPriceTest.xml
index ba2e5e89005cf..5279b51731f45 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithGroupPriceTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithGroupPriceTest.xml
@@ -42,8 +42,7 @@
         </after>
 
         <!-- Create downloadable product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
         <actionGroup ref="GoToSpecifiedCreateProductPageActionGroup" stepKey="createProduct">
             <argument name="productType" value="downloadable"/>
         </actionGroup>
@@ -82,8 +81,7 @@
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
 
         <!-- Find downloadable product in grid -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-        <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPage"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="findCreatedConfigurableProduct">
             <argument name="product" value="ApiDownloadableProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithLinkTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithLinkTest.xml
index 9ae046210181b..663d1762680d7 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithLinkTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithLinkTest.xml
@@ -42,8 +42,7 @@
         </after>
 
         <!-- Create downloadable product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
         <actionGroup ref="GoToSpecifiedCreateProductPageActionGroup" stepKey="createProduct">
             <argument name="productType" value="downloadable"/>
         </actionGroup>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithManageStockTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithManageStockTest.xml
index 0ff7c9bab26ca..a618e4e29bbfc 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithManageStockTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithManageStockTest.xml
@@ -42,8 +42,7 @@
         </after>
 
         <!-- Create downloadable product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
         <actionGroup ref="GoToSpecifiedCreateProductPageActionGroup" stepKey="createProduct">
             <argument name="productType" value="downloadable"/>
         </actionGroup>
@@ -89,8 +88,7 @@
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
 
         <!-- Find downloadable product in grid -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-        <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPage"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="findCreatedConfigurableProduct">
             <argument name="product" value="DownloadableProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithOutOfStockStatusTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithOutOfStockStatusTest.xml
index 5615c66762c52..7746c52832656 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithOutOfStockStatusTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithOutOfStockStatusTest.xml
@@ -42,8 +42,7 @@
         </after>
 
         <!-- Create Downloadable product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
         <actionGroup ref="GoToSpecifiedCreateProductPageActionGroup" stepKey="createProduct">
             <argument name="productType" value="downloadable"/>
         </actionGroup>
@@ -81,8 +80,7 @@
         <see selector="{{StorefrontProductInfoMainSection.productStockStatus}}" userInput="OUT OF STOCK" stepKey="seeProductStatusInStoreFront"/>
 
         <!-- Find downloadable product in grid -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-        <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPage"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="findCreatedConfigurableProduct">
             <argument name="product" value="DownloadableProductOutOfStock"/>
         </actionGroup>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithSpecialPriceTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithSpecialPriceTest.xml
index f1d00d83b6666..5a22741a9bd41 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithSpecialPriceTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithSpecialPriceTest.xml
@@ -42,8 +42,7 @@
         </after>
 
         <!-- Create downloadable product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
         <actionGroup ref="GoToSpecifiedCreateProductPageActionGroup" stepKey="createProduct">
             <argument name="productType" value="downloadable"/>
         </actionGroup>
@@ -81,8 +80,7 @@
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
 
         <!-- Find downloadable product in grid -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-        <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPage"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="findCreatedConfigurableProduct">
             <argument name="product" value="ApiDownloadableProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithoutFillingQuantityAndStockTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithoutFillingQuantityAndStockTest.xml
index fb0532d9d1fbe..3d25cb2e08ae3 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithoutFillingQuantityAndStockTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithoutFillingQuantityAndStockTest.xml
@@ -42,8 +42,7 @@
         </after>
 
         <!-- Create downloadable product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
         <actionGroup ref="GoToSpecifiedCreateProductPageActionGroup" stepKey="createProduct">
             <argument name="productType" value="downloadable"/>
         </actionGroup>
@@ -78,8 +77,7 @@
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
 
         <!-- Find downloadable product in grid -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-        <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPage"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="findCreatedConfigurableProduct">
             <argument name="product" value="DownloadableProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithoutTaxClassIdTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithoutTaxClassIdTest.xml
index 50a2215d441ad..4546b98d1bfd4 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithoutTaxClassIdTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithoutTaxClassIdTest.xml
@@ -42,8 +42,7 @@
         </after>
 
         <!-- Create downloadable product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-        <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
         <actionGroup ref="GoToSpecifiedCreateProductPageActionGroup" stepKey="createProduct">
             <argument name="productType" value="downloadable"/>
         </actionGroup>
@@ -79,8 +78,7 @@
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
 
         <!-- Find downloadable product in grid -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-        <waitForPageLoad stepKey="waitForAdminProductPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPage"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="findCreatedConfigurableProduct">
             <argument name="product" value="DownloadableProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultImageDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultImageDownloadableProductTest.xml
index 27d3d3d10a0b7..cedee65b547cd 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultImageDownloadableProductTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultImageDownloadableProductTest.xml
@@ -28,8 +28,7 @@
         </after>
 
         <!-- Create product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="adminProductIndexPageAdd"/>
-        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="adminProductIndexPageAdd"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProductPage">
             <argument name="product" value="DownloadableProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/EditDownloadableProductWithSeparateLinksFromCartTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/EditDownloadableProductWithSeparateLinksFromCartTest.xml
index 30e31be6c8ec4..7765c1184c2b4 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/EditDownloadableProductWithSeparateLinksFromCartTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/EditDownloadableProductWithSeparateLinksFromCartTest.xml
@@ -28,8 +28,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
 
             <!-- Create downloadable product -->
-            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-            <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
             <actionGroup ref="GoToSpecifiedCreateProductPageActionGroup" stepKey="createProduct">
                 <argument name="productType" value="downloadable"/>
             </actionGroup>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/ManualSelectAllDownloadableLinksDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/ManualSelectAllDownloadableLinksDownloadableProductTest.xml
index 4a7f1dde227da..45c8cc71486f3 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/ManualSelectAllDownloadableLinksDownloadableProductTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/ManualSelectAllDownloadableLinksDownloadableProductTest.xml
@@ -28,8 +28,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
 
             <!-- Create downloadable product -->
-            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-            <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
             <actionGroup ref="GoToSpecifiedCreateProductPageActionGroup" stepKey="createProduct">
                 <argument name="productType" value="downloadable"/>
             </actionGroup>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/NewProductsListWidgetDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/NewProductsListWidgetDownloadableProductTest.xml
index 55c673146021d..27494a3183cf9 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/NewProductsListWidgetDownloadableProductTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/NewProductsListWidgetDownloadableProductTest.xml
@@ -31,8 +31,7 @@
 
         <!-- Create a Downloadable product to appear in the widget -->
 
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductList"/>
-        <waitForPageLoad stepKey="waitForProductList"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductList"/>
         <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProduct"/>
         <click selector="{{AdminProductGridActionSection.addDownloadableProduct}}" stepKey="clickAddDownloadableProduct"/>
         <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{_defaultProduct.name}}" stepKey="fillProductName"/>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/SelectAllDownloadableLinksDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/SelectAllDownloadableLinksDownloadableProductTest.xml
index 0ed826e944a4f..64449b9436e11 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/SelectAllDownloadableLinksDownloadableProductTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/SelectAllDownloadableLinksDownloadableProductTest.xml
@@ -28,8 +28,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
 
             <!-- Create downloadable product -->
-            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-            <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
             <actionGroup ref="GoToSpecifiedCreateProductPageActionGroup" stepKey="createProduct">
                 <argument name="productType" value="downloadable"/>
             </actionGroup>
diff --git a/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticsearch6SearchInvalidValueTest.xml b/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticsearch6SearchInvalidValueTest.xml
index 237562f256692..d1fd3018055c5 100644
--- a/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticsearch6SearchInvalidValueTest.xml
+++ b/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticsearch6SearchInvalidValueTest.xml
@@ -66,8 +66,7 @@
         </actionGroup>
         <actionGroup ref="SaveAttributeSetActionGroup" stepKey="saveAttributeSet"/>
         <!--Create product and fill new attribute field-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductIndexPage"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProduct">
             <argument name="product" value="SimpleProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultImageGroupedProductTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultImageGroupedProductTest.xml
index 04b704b9193ca..f3be573f1fb99 100644
--- a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultImageGroupedProductTest.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultImageGroupedProductTest.xml
@@ -39,8 +39,7 @@
         </after>
 
         <!-- Create product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductIndexPage"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
         <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGridColumnsInitial"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProduct">
             <argument name="product" value="GroupedProduct"/>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedProductsListTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedProductsListTest.xml
index 6514b5ddc5f78..ef1665d965200 100644
--- a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedProductsListTest.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminGroupedProductsListTest.xml
@@ -37,8 +37,7 @@
         </after>
 
         <!-- Create product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="adminProductIndexPageAdd"/>
-        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="adminProductIndexPageAdd"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProductPage">
             <argument name="product" value="GroupedProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminRemoveDefaultImageGroupedProductTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminRemoveDefaultImageGroupedProductTest.xml
index 053949fa20fb2..86e31fcc60a69 100644
--- a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminRemoveDefaultImageGroupedProductTest.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminRemoveDefaultImageGroupedProductTest.xml
@@ -36,8 +36,7 @@
         </after>
 
         <!-- Create product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductIndexPage"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
         <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGridColumnsInitial"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProduct">
             <argument name="product" value="GroupedProduct"/>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminSortingAssociatedProductsTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminSortingAssociatedProductsTest.xml
index 7f03765720069..fbe77270a6177 100644
--- a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminSortingAssociatedProductsTest.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminSortingAssociatedProductsTest.xml
@@ -127,8 +127,7 @@
         </after>
 
         <!--Create grouped Product-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductIndexPage"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
         <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGridColumnsInitial"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProduct">
             <argument name="product" value="GroupedProduct"/>
@@ -156,8 +155,7 @@
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
 
         <!--Open created Product group-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductIndex"/>
         <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetFiltersIfExist"/>
         <actionGroup ref="SearchProductGridByKeywordActionGroup" stepKey="searchProductGridForm">
             <argument name="keyword" value="GroupedProduct.name"/>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/NewProductsListWidgetGroupedProductTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/NewProductsListWidgetGroupedProductTest.xml
index d563796b21da9..6d9f9f26752b0 100644
--- a/app/code/Magento/GroupedProduct/Test/Mftf/Test/NewProductsListWidgetGroupedProductTest.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/NewProductsListWidgetGroupedProductTest.xml
@@ -40,8 +40,7 @@
 
         <!-- Create a grouped product to appear in the widget -->
 
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductList"/>
-        <waitForPageLoad stepKey="waitForProductList"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductList"/>
         <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="toggleAddProductButton"/>
         <click selector="{{AdminProductGridActionSection.addGroupedProduct}}" stepKey="clickAddGroupedProduct"/>
         <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{_defaultProduct.name}}" stepKey="fillProductName"/>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminCheckThatSomeAttributesChangedValueToEmptyAfterImportTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminCheckThatSomeAttributesChangedValueToEmptyAfterImportTest.xml
index a45783767e6a2..25331ae3cd058 100644
--- a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminCheckThatSomeAttributesChangedValueToEmptyAfterImportTest.xml
+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminCheckThatSomeAttributesChangedValueToEmptyAfterImportTest.xml
@@ -33,8 +33,7 @@
         </before>
         <after>
             <!--Delete Product and Category-->
-            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-            <waitForPageLoad stepKey="waitForProductGridPageLoad"/>
+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
             <actionGroup ref="DeleteProductActionGroup" stepKey="deleteProduct1">
                 <argument name="productName" value="simpleProductWithShortNameAndSku.name"/>
             </actionGroup>
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Test/YoutubeVideoWindowOnProductPageTest.xml b/app/code/Magento/ProductVideo/Test/Mftf/Test/YoutubeVideoWindowOnProductPageTest.xml
index 92ea0aa86000f..7fce5326306f1 100644
--- a/app/code/Magento/ProductVideo/Test/Mftf/Test/YoutubeVideoWindowOnProductPageTest.xml
+++ b/app/code/Magento/ProductVideo/Test/Mftf/Test/YoutubeVideoWindowOnProductPageTest.xml
@@ -36,8 +36,7 @@
         </before>
 
         <!--Open simple product-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex"/>
-        <waitForPageLoad stepKey="wait1"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductIndex"/>
         <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGrid"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProductGridBySku">
             <argument name="product" value="$$createProduct$$"/>
diff --git a/app/code/Magento/Quote/Test/Mftf/Test/StorefrontGuestCheckoutDisabledProductTest.xml b/app/code/Magento/Quote/Test/Mftf/Test/StorefrontGuestCheckoutDisabledProductTest.xml
index 12427c2caec25..03ec851e3db72 100644
--- a/app/code/Magento/Quote/Test/Mftf/Test/StorefrontGuestCheckoutDisabledProductTest.xml
+++ b/app/code/Magento/Quote/Test/Mftf/Test/StorefrontGuestCheckoutDisabledProductTest.xml
@@ -85,7 +85,7 @@
             <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
             <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
             <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
-            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductListing"/>
+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductListing"/>
             <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetGridToDefaultKeywordSearch"/>
 
             <!-- Reindex invalidated indices after product attribute has been created/deleted -->
@@ -105,7 +105,7 @@
         <openNewTab stepKey="openNewTab"/>
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         <!-- Find the first simple product that we just created using the product grid and go to its page-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPage"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="findCreatedProduct">
             <argument name="product" value="$$createConfigChildProduct1$$"/>
         </actionGroup>
@@ -137,7 +137,7 @@
         <!-- Disabled via admin panel -->
         <openNewTab stepKey="openNewTab2"/>
         <!-- Find the first simple product that we just created using the product grid and go to its page -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage2"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPage2"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="findCreatedProduct2">
             <argument name="product" value="$$createSimpleProduct2$$"/>
         </actionGroup>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoConfigurableProductTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoConfigurableProductTest.xml
index ab3a2cc647740..ff5dc0e36fdbd 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoConfigurableProductTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoConfigurableProductTest.xml
@@ -93,7 +93,7 @@
             <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
             <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
             <deleteData createDataKey="createCategory" stepKey="deleteApiCategory"/>
-            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
             <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearProductGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <!-- Reindex invalidated indices after product attribute has been created/deleted -->
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCartRulesAppliedForProductInCartTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCartRulesAppliedForProductInCartTest.xml
index 1433d660d3535..61c80f32b6546 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCartRulesAppliedForProductInCartTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCartRulesAppliedForProductInCartTest.xml
@@ -50,8 +50,7 @@
         </after>
 
         <!--Start creating a bundle product-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductList"/>
-        <waitForPageLoad stepKey="waitForProductList"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductList"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProduct">
             <argument name="product" value="BundleProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/Search/Test/Mftf/Test/AdminGlobalSearchOnProductPageTest.xml b/app/code/Magento/Search/Test/Mftf/Test/AdminGlobalSearchOnProductPageTest.xml
index 82ec95b24d3ca..189b8962957a2 100644
--- a/app/code/Magento/Search/Test/Mftf/Test/AdminGlobalSearchOnProductPageTest.xml
+++ b/app/code/Magento/Search/Test/Mftf/Test/AdminGlobalSearchOnProductPageTest.xml
@@ -38,8 +38,7 @@
         </after>
 
         <!-- Create Simple Product -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="adminProductIndexPageAdd"/>
-        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="adminProductIndexPageAdd"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProductPage">
             <argument name="product" value="SimpleProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateTextSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateTextSwatchTest.xml
index 6b2a29d8ec451..d51f4dbc3a163 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateTextSwatchTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateTextSwatchTest.xml
@@ -51,8 +51,7 @@
         <seeInField selector="{{AdminManageSwatchSection.nthSwatchAdminDescription('3')}}" userInput="Something blue." stepKey="seeDescription2"/>
 
         <!-- Create a configurable product to verify the storefront with -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-        <waitForPageLoad time="30" stepKey="waitForProductGrid"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateConfigurableProduct">
             <argument name="product" value="BaseConfigurableProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateVisualSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateVisualSwatchTest.xml
index 1a6c0341c0704..f341a24077789 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateVisualSwatchTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateVisualSwatchTest.xml
@@ -102,8 +102,7 @@
         </actionGroup>
 
         <!-- Create a configurable product to verify the storefront with -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-        <waitForPageLoad stepKey="waitForProductGridPage"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
         <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickOnAddProductToggle"/>
         <click selector="{{AdminProductGridActionSection.addConfigurableProduct}}" stepKey="clickOnAddConfigurableProduct"/>
         <fillField userInput="{{_defaultProduct.name}}" selector="{{AdminProductFormSection.productName}}" stepKey="fillName"/>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/AdminDisablingSwatchTooltipsTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/AdminDisablingSwatchTooltipsTest.xml
index 8fd21acbd51d9..cd12b8617f9fe 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/AdminDisablingSwatchTooltipsTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/AdminDisablingSwatchTooltipsTest.xml
@@ -83,8 +83,7 @@
         </actionGroup>
 
         <!-- Create a configurable product to verify the storefront with -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-        <waitForPageLoad stepKey="waitForProductGridPage"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
         <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickOnAddProductToggle"/>
         <click selector="{{AdminProductGridActionSection.addConfigurableProduct}}"
                stepKey="clickOnAddConfigurableProduct"/>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByImageSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByImageSwatchTest.xml
index 47018a1b142b2..097839bebad32 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByImageSwatchTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByImageSwatchTest.xml
@@ -80,8 +80,7 @@
         <waitForElementVisible selector="{{AdminProductMessagesSection.successMessage}}" stepKey="waitForSuccess"/>
 
         <!-- Create a configurable product to verify the storefront with -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-        <waitForPageLoad time="30" stepKey="waitForProductGrid"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateConfigurableProduct">
             <argument name="product" value="ApiConfigurableProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByTextSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByTextSwatchTest.xml
index 82dbff950d62f..1fc883bb099db 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByTextSwatchTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByTextSwatchTest.xml
@@ -67,8 +67,7 @@
         <waitForElementVisible selector="{{AdminProductMessagesSection.successMessage}}" stepKey="waitForSuccess"/>
 
         <!-- Create a configurable product to verify the storefront with -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-        <waitForPageLoad stepKey="waitForProductGrid"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateConfigurableProduct">
             <argument name="product" value="BaseConfigurableProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByVisualSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByVisualSwatchTest.xml
index b6b3e58bd7c01..b0f06fd17bb09 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByVisualSwatchTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByVisualSwatchTest.xml
@@ -79,8 +79,7 @@
         <waitForElementVisible selector="{{AdminProductMessagesSection.successMessage}}" stepKey="waitForSuccess"/>
 
         <!-- Create a configurable product to verify the storefront with -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
-        <waitForPageLoad time="30" stepKey="waitForProductGrid"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateConfigurableProduct">
             <argument name="product" value="BaseConfigurableProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml
index a1d346ffa2744..2ac4556ca2300 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml
@@ -33,8 +33,7 @@
             <actionGroup ref="DeleteProductUsingProductGridActionGroup" stepKey="deleteProduct">
                 <argument name="product" value="BaseConfigurableProduct"/>
             </actionGroup>
-            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
-            <waitForPageLoad stepKey="waitForAdminProductGridLoad"/>
+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="visitAdminProductPage"/>
             <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
             <actionGroup ref="DeleteProductAttributeByLabelActionGroup" stepKey="deleteAttribute">
                 <argument name="ProductAttribute" value="visualSwatchAttribute"/>
@@ -56,8 +55,7 @@
         <!--Login-->
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdmin"/>
          <!--Create a configurable swatch product via the UI -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductPage"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductIndex"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProductPage">
             <argument name="product" value="BaseConfigurableProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchProductWithFileCustomOptionTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchProductWithFileCustomOptionTest.xml
index e027a41cd9d2a..f0ee4cb9b9d73 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchProductWithFileCustomOptionTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchProductWithFileCustomOptionTest.xml
@@ -32,8 +32,7 @@
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
 
         <!-- Create a configurable swatch product via the UI -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductPage"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductIndex"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProductPage">
             <argument name="product" value="BaseConfigurableProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCheckingTaxReportGridTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCheckingTaxReportGridTest.xml
index 0990daf1ecfbf..60b078050d6e9 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCheckingTaxReportGridTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCheckingTaxReportGridTest.xml
@@ -106,7 +106,7 @@
             <deleteData createDataKey="createSecondProductTaxClass" stepKey="deleteSecondProductTaxClass"/>
 
             <!-- Clear filter Product -->
-            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="amOnProductGridPage"/>
             <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilterProduct"/>
 
             <!-- Delete Customer and clear filter -->
diff --git a/app/code/Magento/Ui/Test/Mftf/Test/AdminGridFilterDeleteAndVerifyErrorMessageTest.xml b/app/code/Magento/Ui/Test/Mftf/Test/AdminGridFilterDeleteAndVerifyErrorMessageTest.xml
index 3cc120ad98176..c30dfb6c32cdc 100644
--- a/app/code/Magento/Ui/Test/Mftf/Test/AdminGridFilterDeleteAndVerifyErrorMessageTest.xml
+++ b/app/code/Magento/Ui/Test/Mftf/Test/AdminGridFilterDeleteAndVerifyErrorMessageTest.xml
@@ -51,8 +51,7 @@
         </after>
 
         <!--Filter created simple product in grid and add category and website created in create data-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="openProductCatalogPage"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="openProductCatalogPage"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProduct">
             <argument name="product" value="$$createProduct$$"/>
         </actionGroup>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductWithSeveralWebsitesAndCheckURLRewritesTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductWithSeveralWebsitesAndCheckURLRewritesTest.xml
index 653995da1a3a8..55bea10fca0aa 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductWithSeveralWebsitesAndCheckURLRewritesTest.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductWithSeveralWebsitesAndCheckURLRewritesTest.xml
@@ -63,8 +63,7 @@
         </actionGroup>
 
         <!-- Create simple product with categories created in create data -->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="openProductCatalogPage"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="openProductCatalogPage"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProduct">
             <argument name="product" value="$$createProduct$$"/>
         </actionGroup>
diff --git a/app/code/Magento/Weee/Test/Mftf/Test/AdminRemoveProductWeeeAttributeOptionTest.xml b/app/code/Magento/Weee/Test/Mftf/Test/AdminRemoveProductWeeeAttributeOptionTest.xml
index 60c39dd5058b5..0d7c21b6efffc 100644
--- a/app/code/Magento/Weee/Test/Mftf/Test/AdminRemoveProductWeeeAttributeOptionTest.xml
+++ b/app/code/Magento/Weee/Test/Mftf/Test/AdminRemoveProductWeeeAttributeOptionTest.xml
@@ -38,8 +38,7 @@
             <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProductInitial"/>
         </before>
         <after>
-            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductListing"/>
-            <waitForPageLoad stepKey="waitForProductListingPageLoad"/>
+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductListing"/>
             <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetGridToDefaultKeywordSearch"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <deleteData createDataKey="createProductFPTAttribute" stepKey="deleteProductFPTAttribute"/>
diff --git a/app/code/Magento/Weee/Test/Mftf/Test/StorefrontFPTTaxInformationInShoppingCartForCustomerPhysicalQuoteTest.xml b/app/code/Magento/Weee/Test/Mftf/Test/StorefrontFPTTaxInformationInShoppingCartForCustomerPhysicalQuoteTest.xml
index 74d6c2a97b089..e78036458301b 100644
--- a/app/code/Magento/Weee/Test/Mftf/Test/StorefrontFPTTaxInformationInShoppingCartForCustomerPhysicalQuoteTest.xml
+++ b/app/code/Magento/Weee/Test/Mftf/Test/StorefrontFPTTaxInformationInShoppingCartForCustomerPhysicalQuoteTest.xml
@@ -68,7 +68,7 @@
             <createData entity="WeeeConfigDisable" stepKey="disableFPT"/>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
             <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearProductsGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
             <magentoCron groups="index" stepKey="reindexBrokenIndices"/>
diff --git a/app/code/Magento/Weee/Test/Mftf/Test/StorefrontFPTTaxInformationInShoppingCartForGuestPhysicalQuoteTest.xml b/app/code/Magento/Weee/Test/Mftf/Test/StorefrontFPTTaxInformationInShoppingCartForGuestPhysicalQuoteTest.xml
index 92f526c79e926..74ba7c1f2bff3 100644
--- a/app/code/Magento/Weee/Test/Mftf/Test/StorefrontFPTTaxInformationInShoppingCartForGuestPhysicalQuoteTest.xml
+++ b/app/code/Magento/Weee/Test/Mftf/Test/StorefrontFPTTaxInformationInShoppingCartForGuestPhysicalQuoteTest.xml
@@ -63,7 +63,7 @@
             <createData entity="DefaultTaxConfig" stepKey="defaultTaxConfiguration"/>
             <createData entity="WeeeConfigDisable" stepKey="disableFPT"/>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
-            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
             <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearProductsGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
             <magentoCron groups="index" stepKey="reindexBrokenIndices"/>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/ConfigurableProductChildImageShouldBeShownOnWishListTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/ConfigurableProductChildImageShouldBeShownOnWishListTest.xml
index 738bbc6bda35c..4d00f474cfbb4 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/ConfigurableProductChildImageShouldBeShownOnWishListTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/ConfigurableProductChildImageShouldBeShownOnWishListTest.xml
@@ -34,8 +34,7 @@
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
         </after>
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
-        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
         <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetFiltersIfPresent"/>
         <actionGroup ref="SearchProductGridByKeywordActionGroup" stepKey="searchProductGrid">
             <argument name="keyword" value="_defaultProduct.name"/>
@@ -46,8 +45,7 @@
             <argument name="image" value="MagentoLogo"/>
         </actionGroup>
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex1"/>
-        <waitForPageLoad stepKey="waitForProductIndexPageLoad1"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex1"/>
         <click selector="{{AdminProductGridSection.selectRowBasedOnName(colorProductAttribute1.name)}}" stepKey="selectProductToAddImage1"/>
         <waitForPageLoad stepKey="waitForProductEditPageLoad1"/>
         <actionGroup ref="AddProductImageActionGroup" stepKey="addImageForChildProduct">
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml
index eed4dc8d4767e..bdb7cb61acdb2 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml
@@ -45,7 +45,7 @@
             <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearWebsitesGridFilter"/>
 
             <!--Clear products filter-->
-            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
             <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearProductsFilters"/>
             <!--Logout everywhere-->
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>

From b842083a7b6e08418f5bbb16f0a90abaf1bd8b44 Mon Sep 17 00:00:00 2001
From: Mateusz Krzeszowiak <mateusz.krzeszowiak@creativestyle.pl>
Date: Fri, 10 Apr 2020 17:47:26 +0200
Subject: [PATCH 0150/1718] Fix static tests

---
 lib/web/mage/translate-inline.js | 6 +++---
 lib/web/mage/utils/misc.js       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/web/mage/translate-inline.js b/lib/web/mage/translate-inline.js
index 8f460c31aafae..a559426ed41d2 100644
--- a/lib/web/mage/translate-inline.js
+++ b/lib/web/mage/translate-inline.js
@@ -8,7 +8,7 @@ define([
     'mage/template',
     'mage/utils/misc',
     'mage/translate',
-    'jquery-ui-modules/dialog',
+    'jquery-ui-modules/dialog'
 ], function ($, mageTemplate, miscUtils) {
     'use strict';
 
@@ -65,7 +65,7 @@ define([
 
                 $uiDialog
                     .addClass('ui-dialog-active')
-                    .css('margin-top', topMargin)
+                    .css('margin-top', topMargin);
             },
 
             /**
@@ -101,7 +101,7 @@ define([
         _prepareContent: function (templateData) {
             var data = $.extend({
                 items: templateData,
-                escape: miscUtils.escape,
+                escape: miscUtils.escape
             }, this.options.translateForm.data);
 
             this.data = data;
diff --git a/lib/web/mage/utils/misc.js b/lib/web/mage/utils/misc.js
index 46261ff490114..b1c0c33324c28 100644
--- a/lib/web/mage/utils/misc.js
+++ b/lib/web/mage/utils/misc.js
@@ -244,12 +244,12 @@ define([
 
         /**
          * Replaces special characters with their corresponding HTML entities.
-         * 
-         * @param {String} string Text to escape.
+         *
+         * @param {String} string - Text to escape.
          * @returns {String} Escaped text.
          */
         escape: function (string) {
-            return string ? $('<p/>').text(str).html().replace(/"/g, '&quot;') : string;
+            return string ? $('<p/>').text(string).html().replace(/"/g, '&quot;') : string;
         },
 
         /**

From e3c47c6c7b6085d8ec77542094ce8dc2ad166577 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Fri, 10 Apr 2020 18:50:46 +0300
Subject: [PATCH 0151/1718] minor fix

---
 .../Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml
index 246a9b50612c6..82295166bccd6 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml
@@ -37,7 +37,6 @@
 
         <!-- Start creating a bundle product -->
         <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductList"/>
-        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="goToProductList"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProduct">
             <argument name="product" value="BundleProduct"/>
         </actionGroup>

From fc1a6c5264353b9e5adc9fb84851ea2d1b4c063f Mon Sep 17 00:00:00 2001
From: "v.prokopov" <v.prokopov@atwix.com>
Date: Sat, 11 Apr 2020 16:02:36 +0300
Subject: [PATCH 0152/1718] added mftf test for case if on checkout page
 entered unregistered email

---
 ...UnregisteredEmailOnCheckoutActionGroup.xml | 19 +++++++
 ...refrontOpenCheckoutCartPageActionGroup.xml | 21 ++++++++
 ...ieldForUnregisteredEmailOnCheckoutTest.xml | 50 +++++++++++++++++++
 3 files changed, 90 insertions(+)
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontVisiblePasswordFieldForUnregisteredEmailOnCheckoutActionGroup.xml
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontOpenCheckoutCartPageActionGroup.xml
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/Test/StorefrontVisiblePasswordFieldForUnregisteredEmailOnCheckoutTest.xml

diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontVisiblePasswordFieldForUnregisteredEmailOnCheckoutActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontVisiblePasswordFieldForUnregisteredEmailOnCheckoutActionGroup.xml
new file mode 100644
index 0000000000000..8210fe1df73ba
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontVisiblePasswordFieldForUnregisteredEmailOnCheckoutActionGroup.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="AssertStorefrontVisiblePasswordFieldForUnregisteredEmailOnCheckoutActionGroup">
+        <annotations>
+            <description>Checks if visible password field for unregistered email on checkout page</description>
+        </annotations>
+
+        <waitForPageLoad stepKey="waitForCheckoutPageLoaded"/>
+        <dontSeeElement selector="{{StorefrontCheckoutCheckoutCustomerLoginSection.password}}" stepKey="checkIfPasswordVisible"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontOpenCheckoutCartPageActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontOpenCheckoutCartPageActionGroup.xml
new file mode 100644
index 0000000000000..958e4ad5b45fb
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontOpenCheckoutCartPageActionGroup.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="StorefrontOpenCheckoutCartPageActionGroup">
+        <annotations>
+            <description>Goes to the Storefront Checkout Cart page.</description>
+        </annotations>
+
+        <amOnPage url="{{CheckoutPage.url}}/cart" stepKey="openCheckoutCartPage"/>
+        <waitForPageLoad stepKey="waitForCheckoutCartPageLoaded"/>
+        <amOnPage url="{{CheckoutPage.url}}" stepKey="openCheckoutPage"/>
+        <waitForPageLoad stepKey="waitForCheckoutPageLoaded"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontVisiblePasswordFieldForUnregisteredEmailOnCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontVisiblePasswordFieldForUnregisteredEmailOnCheckoutTest.xml
new file mode 100644
index 0000000000000..ca9f81a0e418a
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontVisiblePasswordFieldForUnregisteredEmailOnCheckoutTest.xml
@@ -0,0 +1,50 @@
+<?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="StorefrontVisiblePasswordFieldForUnregisteredEmailOnCheckoutTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Visible password field for unregistered e-mail on Checkout"/>
+            <title value="Visibility password field for unregistered e-mail on Checkout process"/>
+            <description value="Guest should not be able to see password field if entered unregistered email"/>
+            <stories value="Guest Checkout"/>
+            <testCaseId value="MC-14695"/>
+            <severity value="CRITICAL"/>
+            <group value="checkout"/>
+            <group value="shoppingCart"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleTwo" stepKey="simpleProduct"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
+        </after>
+
+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductStorefront">
+            <argument name="productUrl" value="$$simpleProduct.custom_attributes[url_key]$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontClickAddToCartOnProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage"/>
+
+        <actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="openCheckoutPage"/>
+        <actionGroup ref="AssertStorefrontEmailTooltipContentOnCheckoutActionGroup" stepKey="assertEmailTooltipContent"/>
+        <actionGroup ref="AssertStorefrontEmailNoteMessageOnCheckoutActionGroup" stepKey="assertEmailNoteMessage"/>
+
+        <actionGroup ref="StorefrontFillEmailFieldOnCheckoutActionGroup" stepKey="fillUnregisteredEmailFirstAttempt">
+            <argument name="email" value="unregistered@email.test"/>
+        </actionGroup>
+        <actionGroup ref="AssertStorefrontVisiblePasswordFieldForUnregisteredEmailOnCheckoutActionGroup"
+                     stepKey="checkIfPasswordVisibleAfterFieldFilling"/>
+        <actionGroup ref="StorefrontOpenCheckoutCartPageActionGroup" stepKey="openCheckoutCartPage" />
+        <actionGroup ref="AssertStorefrontVisiblePasswordFieldForUnregisteredEmailOnCheckoutActionGroup"
+                     stepKey="checkIfPasswordVisibleAfterPageReload"/>
+    </test>
+</tests>

From e5271144dd535e4473bed3b72a1fa4c3ecfe805e Mon Sep 17 00:00:00 2001
From: "v.prokopov" <v.prokopov@atwix.com>
Date: Sat, 11 Apr 2020 18:21:36 +0300
Subject: [PATCH 0153/1718] refactored code

---
 .../CatalogInventory/Model/StockState.php     | 53 ++++++++-----------
 1 file changed, 23 insertions(+), 30 deletions(-)

diff --git a/app/code/Magento/CatalogInventory/Model/StockState.php b/app/code/Magento/CatalogInventory/Model/StockState.php
index ac6dc16366798..c22a670420cc1 100644
--- a/app/code/Magento/CatalogInventory/Model/StockState.php
+++ b/app/code/Magento/CatalogInventory/Model/StockState.php
@@ -9,6 +9,7 @@
 use Magento\CatalogInventory\Api\StockStateInterface;
 use Magento\CatalogInventory\Model\Spi\StockRegistryProviderInterface;
 use Magento\CatalogInventory\Model\Spi\StockStateProviderInterface;
+use Magento\Framework\DataObject;
 
 /**
  * Interface StockState
@@ -50,12 +51,11 @@ public function __construct(
      * @param int $scopeId
      * @return bool
      */
-    public function verifyStock($productId, $scopeId = null)
+    public function verifyStock($productId, $scopeId = null): bool
     {
-        // if ($scopeId === null) {
-            $scopeId = $this->stockConfiguration->getDefaultScopeId();
-        // }
+        $scopeId = $this->stockConfiguration->getDefaultScopeId();
         $stockItem = $this->stockRegistryProvider->getStockItem($productId, $scopeId);
+
         return $this->stockStateProvider->verifyStock($stockItem);
     }
 
@@ -64,12 +64,11 @@ public function verifyStock($productId, $scopeId = null)
      * @param int $scopeId
      * @return bool
      */
-    public function verifyNotification($productId, $scopeId = null)
+    public function verifyNotification($productId, $scopeId = null): bool
     {
-        // if ($scopeId === null) {
-            $scopeId = $this->stockConfiguration->getDefaultScopeId();
-        // }
+        $scopeId = $this->stockConfiguration->getDefaultScopeId();
         $stockItem = $this->stockRegistryProvider->getStockItem($productId, $scopeId);
+
         return $this->stockStateProvider->verifyNotification($stockItem);
     }
 
@@ -79,15 +78,13 @@ public function verifyNotification($productId, $scopeId = null)
      * @param int $productId
      * @param float $qty
      * @param int $scopeId
-     * @exception \Magento\Framework\Exception\LocalizedException
      * @return bool
      */
-    public function checkQty($productId, $qty, $scopeId = null)
+    public function checkQty($productId, $qty, $scopeId = null): bool
     {
-        // if ($scopeId === null) {
-            $scopeId = $this->stockConfiguration->getDefaultScopeId();
-        // }
+        $scopeId = $this->stockConfiguration->getDefaultScopeId();
         $stockItem = $this->stockRegistryProvider->getStockItem($productId, $scopeId);
+
         return $this->stockStateProvider->checkQty($stockItem, $qty);
     }
 
@@ -100,12 +97,11 @@ public function checkQty($productId, $qty, $scopeId = null)
      * @param int $scopeId
      * @return float
      */
-    public function suggestQty($productId, $qty, $scopeId = null)
+    public function suggestQty($productId, $qty, $scopeId = null): float
     {
-        // if ($scopeId === null) {
-            $scopeId = $this->stockConfiguration->getDefaultScopeId();
-        // }
+        $scopeId = $this->stockConfiguration->getDefaultScopeId();
         $stockItem = $this->stockRegistryProvider->getStockItem($productId, $scopeId);
+
         return $this->stockStateProvider->suggestQty($stockItem, $qty);
     }
 
@@ -116,12 +112,11 @@ public function suggestQty($productId, $qty, $scopeId = null)
      * @param int $scopeId
      * @return float
      */
-    public function getStockQty($productId, $scopeId = null)
+    public function getStockQty($productId, $scopeId = null): float
     {
-        // if ($scopeId === null) {
-            $scopeId = $this->stockConfiguration->getDefaultScopeId();
-        // }
+        $scopeId = $this->stockConfiguration->getDefaultScopeId();
         $stockItem = $this->stockRegistryProvider->getStockItem($productId, $scopeId);
+
         return $this->stockStateProvider->getStockQty($stockItem);
     }
 
@@ -129,14 +124,13 @@ public function getStockQty($productId, $scopeId = null)
      * @param int $productId
      * @param float $qty
      * @param int $websiteId
-     * @return \Magento\Framework\DataObject
+     * @return DataObject
      */
-    public function checkQtyIncrements($productId, $qty, $websiteId = null)
+    public function checkQtyIncrements($productId, $qty, $websiteId = null): DataObject
     {
-        // if ($websiteId === null) {
-            $websiteId = $this->stockConfiguration->getDefaultScopeId();
-        // }
+        $websiteId = $this->stockConfiguration->getDefaultScopeId();
         $stockItem = $this->stockRegistryProvider->getStockItem($productId, $websiteId);
+
         return $this->stockStateProvider->checkQtyIncrements($stockItem, $qty);
     }
 
@@ -148,12 +142,11 @@ public function checkQtyIncrements($productId, $qty, $websiteId = null)
      * @param int $scopeId
      * @return int
      */
-    public function checkQuoteItemQty($productId, $itemQty, $qtyToCheck, $origQty, $scopeId = null)
+    public function checkQuoteItemQty($productId, $itemQty, $qtyToCheck, $origQty, $scopeId = null): int
     {
-        // if ($scopeId === null) {
-            $scopeId = $this->stockConfiguration->getDefaultScopeId();
-        // }
+        $scopeId = $this->stockConfiguration->getDefaultScopeId();
         $stockItem = $this->stockRegistryProvider->getStockItem($productId, $scopeId);
+
         return $this->stockStateProvider->checkQuoteItemQty($stockItem, $itemQty, $qtyToCheck, $origQty);
     }
 }

From c412681b7f9fac6e70120cf51ada319dabd510bd Mon Sep 17 00:00:00 2001
From: "v.prokopov" <v.prokopov@atwix.com>
Date: Sat, 11 Apr 2020 21:08:31 +0300
Subject: [PATCH 0154/1718] apply code review recommendations

---
 ...refrontOpenCheckoutCartPageActionGroup.xml | 21 -------------------
 ...ieldForUnregisteredEmailOnCheckoutTest.xml | 15 +++----------
 2 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontOpenCheckoutCartPageActionGroup.xml

diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontOpenCheckoutCartPageActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontOpenCheckoutCartPageActionGroup.xml
deleted file mode 100644
index 958e4ad5b45fb..0000000000000
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontOpenCheckoutCartPageActionGroup.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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="StorefrontOpenCheckoutCartPageActionGroup">
-        <annotations>
-            <description>Goes to the Storefront Checkout Cart page.</description>
-        </annotations>
-
-        <amOnPage url="{{CheckoutPage.url}}/cart" stepKey="openCheckoutCartPage"/>
-        <waitForPageLoad stepKey="waitForCheckoutCartPageLoaded"/>
-        <amOnPage url="{{CheckoutPage.url}}" stepKey="openCheckoutPage"/>
-        <waitForPageLoad stepKey="waitForCheckoutPageLoaded"/>
-    </actionGroup>
-</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontVisiblePasswordFieldForUnregisteredEmailOnCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontVisiblePasswordFieldForUnregisteredEmailOnCheckoutTest.xml
index ca9f81a0e418a..41b5f734d0096 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontVisiblePasswordFieldForUnregisteredEmailOnCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontVisiblePasswordFieldForUnregisteredEmailOnCheckoutTest.xml
@@ -14,36 +14,27 @@
             <stories value="Visible password field for unregistered e-mail on Checkout"/>
             <title value="Visibility password field for unregistered e-mail on Checkout process"/>
             <description value="Guest should not be able to see password field if entered unregistered email"/>
-            <stories value="Guest Checkout"/>
-            <testCaseId value="MC-14695"/>
-            <severity value="CRITICAL"/>
+            <severity value="MINOR"/>
             <group value="checkout"/>
-            <group value="shoppingCart"/>
-            <group value="mtf_migrated"/>
         </annotations>
         <before>
             <createData entity="SimpleTwo" stepKey="simpleProduct"/>
         </before>
-
         <after>
             <deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
         </after>
-
         <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductStorefront">
             <argument name="productUrl" value="$$simpleProduct.custom_attributes[url_key]$$"/>
         </actionGroup>
         <actionGroup ref="StorefrontClickAddToCartOnProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage"/>
-
         <actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="openCheckoutPage"/>
         <actionGroup ref="AssertStorefrontEmailTooltipContentOnCheckoutActionGroup" stepKey="assertEmailTooltipContent"/>
         <actionGroup ref="AssertStorefrontEmailNoteMessageOnCheckoutActionGroup" stepKey="assertEmailNoteMessage"/>
-
         <actionGroup ref="StorefrontFillEmailFieldOnCheckoutActionGroup" stepKey="fillUnregisteredEmailFirstAttempt">
             <argument name="email" value="unregistered@email.test"/>
         </actionGroup>
-        <actionGroup ref="AssertStorefrontVisiblePasswordFieldForUnregisteredEmailOnCheckoutActionGroup"
-                     stepKey="checkIfPasswordVisibleAfterFieldFilling"/>
-        <actionGroup ref="StorefrontOpenCheckoutCartPageActionGroup" stepKey="openCheckoutCartPage" />
+        <actionGroup ref="AssertStorefrontVisiblePasswordFieldForUnregisteredEmailOnCheckoutActionGroup" stepKey="checkIfPasswordVisibleAfterFieldFilling"/>
+        <actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="reloadCheckoutPage" />
         <actionGroup ref="AssertStorefrontVisiblePasswordFieldForUnregisteredEmailOnCheckoutActionGroup"
                      stepKey="checkIfPasswordVisibleAfterPageReload"/>
     </test>

From 7199dfe99bc248c04c91bec7c920ca20b0819575 Mon Sep 17 00:00:00 2001
From: "v.prokopov" <v.prokopov@atwix.com>
Date: Sun, 12 Apr 2020 13:30:51 +0300
Subject: [PATCH 0155/1718] removed return types

---
 .../Magento/CatalogInventory/Model/StockState.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/CatalogInventory/Model/StockState.php b/app/code/Magento/CatalogInventory/Model/StockState.php
index c22a670420cc1..8549803dd858f 100644
--- a/app/code/Magento/CatalogInventory/Model/StockState.php
+++ b/app/code/Magento/CatalogInventory/Model/StockState.php
@@ -51,7 +51,7 @@ public function __construct(
      * @param int $scopeId
      * @return bool
      */
-    public function verifyStock($productId, $scopeId = null): bool
+    public function verifyStock($productId, $scopeId = null)
     {
         $scopeId = $this->stockConfiguration->getDefaultScopeId();
         $stockItem = $this->stockRegistryProvider->getStockItem($productId, $scopeId);
@@ -64,7 +64,7 @@ public function verifyStock($productId, $scopeId = null): bool
      * @param int $scopeId
      * @return bool
      */
-    public function verifyNotification($productId, $scopeId = null): bool
+    public function verifyNotification($productId, $scopeId = null)
     {
         $scopeId = $this->stockConfiguration->getDefaultScopeId();
         $stockItem = $this->stockRegistryProvider->getStockItem($productId, $scopeId);
@@ -78,9 +78,10 @@ public function verifyNotification($productId, $scopeId = null): bool
      * @param int $productId
      * @param float $qty
      * @param int $scopeId
+     * @exception \Magento\Framework\Exception\LocalizedException
      * @return bool
      */
-    public function checkQty($productId, $qty, $scopeId = null): bool
+    public function checkQty($productId, $qty, $scopeId = null)
     {
         $scopeId = $this->stockConfiguration->getDefaultScopeId();
         $stockItem = $this->stockRegistryProvider->getStockItem($productId, $scopeId);
@@ -97,7 +98,7 @@ public function checkQty($productId, $qty, $scopeId = null): bool
      * @param int $scopeId
      * @return float
      */
-    public function suggestQty($productId, $qty, $scopeId = null): float
+    public function suggestQty($productId, $qty, $scopeId = null)
     {
         $scopeId = $this->stockConfiguration->getDefaultScopeId();
         $stockItem = $this->stockRegistryProvider->getStockItem($productId, $scopeId);
@@ -112,7 +113,7 @@ public function suggestQty($productId, $qty, $scopeId = null): float
      * @param int $scopeId
      * @return float
      */
-    public function getStockQty($productId, $scopeId = null): float
+    public function getStockQty($productId, $scopeId = null)
     {
         $scopeId = $this->stockConfiguration->getDefaultScopeId();
         $stockItem = $this->stockRegistryProvider->getStockItem($productId, $scopeId);
@@ -126,7 +127,7 @@ public function getStockQty($productId, $scopeId = null): float
      * @param int $websiteId
      * @return DataObject
      */
-    public function checkQtyIncrements($productId, $qty, $websiteId = null): DataObject
+    public function checkQtyIncrements($productId, $qty, $websiteId = null)
     {
         $websiteId = $this->stockConfiguration->getDefaultScopeId();
         $stockItem = $this->stockRegistryProvider->getStockItem($productId, $websiteId);
@@ -142,7 +143,7 @@ public function checkQtyIncrements($productId, $qty, $websiteId = null): DataObj
      * @param int $scopeId
      * @return int
      */
-    public function checkQuoteItemQty($productId, $itemQty, $qtyToCheck, $origQty, $scopeId = null): int
+    public function checkQuoteItemQty($productId, $itemQty, $qtyToCheck, $origQty, $scopeId = null)
     {
         $scopeId = $this->stockConfiguration->getDefaultScopeId();
         $stockItem = $this->stockRegistryProvider->getStockItem($productId, $scopeId);

From 6d024bb2f344b59b014f34a04e2e86364f7c4b4b Mon Sep 17 00:00:00 2001
From: "v.prokopov" <v.prokopov@atwix.com>
Date: Sun, 12 Apr 2020 16:33:03 +0300
Subject: [PATCH 0156/1718] added short descriptions for methods

---
 .../Magento/CatalogInventory/Model/StockState.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CatalogInventory/Model/StockState.php b/app/code/Magento/CatalogInventory/Model/StockState.php
index 8549803dd858f..1ac9f5dc54478 100644
--- a/app/code/Magento/CatalogInventory/Model/StockState.php
+++ b/app/code/Magento/CatalogInventory/Model/StockState.php
@@ -12,6 +12,8 @@
 use Magento\Framework\DataObject;
 
 /**
+ * Provides functionality for stock state information
+ *
  * Interface StockState
  */
 class StockState implements StockStateInterface
@@ -32,6 +34,8 @@ class StockState implements StockStateInterface
     protected $stockConfiguration;
 
     /**
+     * StockState constructor
+     *
      * @param StockStateProviderInterface $stockStateProvider
      * @param StockRegistryProviderInterface $stockRegistryProvider
      * @param StockConfigurationInterface $stockConfiguration
@@ -47,6 +51,8 @@ public function __construct(
     }
 
     /**
+     * Verify stock by product id
+     *
      * @param int $productId
      * @param int $scopeId
      * @return bool
@@ -60,6 +66,8 @@ public function verifyStock($productId, $scopeId = null)
     }
 
     /**
+     * Verify notification by product id
+     *
      * @param int $productId
      * @param int $scopeId
      * @return bool
@@ -90,8 +98,7 @@ public function checkQty($productId, $qty, $scopeId = null)
     }
 
     /**
-     * Returns suggested qty that satisfies qty increments and minQty/maxQty/minSaleQty/maxSaleQty conditions
-     * or original qty if such value does not exist
+     * Returns suggested qty that satisfies qty increments/minQty/maxQty/minSaleQty/maxSaleQty conditions else original qty
      *
      * @param int $productId
      * @param float $qty
@@ -122,6 +129,8 @@ public function getStockQty($productId, $scopeId = null)
     }
 
     /**
+     * Check qty increments by product id
+     *
      * @param int $productId
      * @param float $qty
      * @param int $websiteId
@@ -136,6 +145,8 @@ public function checkQtyIncrements($productId, $qty, $websiteId = null)
     }
 
     /**
+     * Check quote item qty
+     *
      * @param int $productId
      * @param float $itemQty
      * @param float $qtyToCheck

From a3d9095b1352eb585399e7cce850112471955607 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Sun, 12 Apr 2020 19:02:34 +0300
Subject: [PATCH 0157/1718] MC-29420: Remove event handlers from CE

---
 .../Block/Widget/Grid/Column/Filter/Date.php  |  29 ++-
 .../Widget/Grid/Column/Filter/Datetime.php    |  10 +-
 .../adminhtml/templates/store/switcher.phtml  |  18 +-
 .../templates/system/cache/additional.phtml   |  31 ++-
 .../templates/system/cache/edit.phtml         |  27 ++-
 .../widget/form/element/gallery.phtml         |  41 ++--
 .../adminhtml/templates/widget/grid.phtml     |  34 ++-
 .../templates/widget/grid/extended.phtml      | 225 +++++++++++-------
 .../adminhtml/templates/widget/tabs.phtml     |  12 +-
 .../adminhtml/templates/backup/dialogs.phtml  | 125 +++++++---
 .../view/adminhtml/templates/form/cc.phtml    |  18 +-
 .../adminhtml/templates/payment/script.phtml  |  15 +-
 .../templates/multishipping/form.phtml        |   8 +-
 .../templates/multishipping/form_paypal.phtml |   9 +-
 .../templates/product/stock/disabler.phtml    |   9 +-
 .../view/adminhtml/templates/default.phtml    |  24 +-
 .../templates/catalog/category/edit.phtml     |   5 +-
 .../templates/catalog/category/tree.phtml     |  99 +++++---
 .../catalog/category/widget/tree.phtml        |  60 +++--
 .../attribute/set/main/tree/group.phtml       |   8 +-
 .../catalog/product/composite/configure.phtml |  60 ++++-
 .../product/edit/category/new/form.phtml      |   7 +-
 .../catalog/product/edit/options.phtml        |  21 +-
 .../product/image_with_borders.phtml          |  15 +-
 .../product/view/options/type/file.phtml      |  34 ++-
 .../affected-attribute-set-selector/js.phtml  |  78 +++---
 .../product/configurable/stock/disabler.phtml |   9 +-
 app/code/Magento/Csp/etc/config.xml           |   6 +-
 .../templates/product/stock/disabler.phtml    |   9 +-
 .../Test/Block/Adminhtml/Category/Tree.php    |   2 +-
 30 files changed, 701 insertions(+), 347 deletions(-)

diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php
index 632603d389d21..65c63c9689fc5 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php
@@ -7,6 +7,8 @@
 namespace Magento\Backend\Block\Widget\Grid\Column\Filter;
 
 use Magento\Framework\Stdlib\DateTime\DateTimeFormatterInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
 /**
  * Date grid column filter
@@ -30,6 +32,11 @@ class Date extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFilt
      */
     protected $dateTimeFormatter;
 
+    /**
+     * @var SecureHtmlRenderer
+     */
+    protected $secureHtmlRenderer;
+
     /**
      * @param \Magento\Backend\Block\Context $context
      * @param \Magento\Framework\DB\Helper $resourceHelper
@@ -37,6 +44,7 @@ class Date extends \Magento\Backend\Block\Widget\Grid\Column\Filter\AbstractFilt
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param DateTimeFormatterInterface $dateTimeFormatter
      * @param array $data
+     * @param SecureHtmlRenderer|null $secureHtmlRenderer
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
@@ -44,16 +52,18 @@ public function __construct(
         \Magento\Framework\Math\Random $mathRandom,
         \Magento\Framework\Locale\ResolverInterface $localeResolver,
         DateTimeFormatterInterface $dateTimeFormatter,
-        array $data = []
+        array $data = [],
+        ?SecureHtmlRenderer $secureHtmlRenderer = null
     ) {
         $this->mathRandom = $mathRandom;
         $this->localeResolver = $localeResolver;
         parent::__construct($context, $resourceHelper, $data);
         $this->dateTimeFormatter = $dateTimeFormatter;
+        $this->secureHtmlRenderer = $secureHtmlRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
     }
 
     /**
-     * @return string
+     * @inheritDoc
      */
     public function getHtml()
     {
@@ -99,7 +109,7 @@ public function getHtml()
             ' value="' .
             $this->localeResolver->getLocale() .
             '"/>';
-        $html .= '<script>
+        $scriptString = '
             require(["jquery", "mage/calendar"], function($){
                 $("#' .
             $htmlId .
@@ -120,12 +130,15 @@ public function getHtml()
             '_to"
                     }
                 })
-            });
-        </script>';
+            });';
+        $html .= $this->secureHtmlRenderer->renderTag('script', [], $scriptString, false);
+
         return $html;
     }
 
     /**
+     * Return escaped value.
+     *
      * @param string|null $index
      * @return array|string|int|float|null
      */
@@ -147,6 +160,8 @@ public function getEscapedValue($index = null)
     }
 
     /**
+     * Return value.
+     *
      * @param string|null $index
      * @return array|string|int|float|null
      */
@@ -166,6 +181,8 @@ public function getValue($index = null)
     }
 
     /**
+     * Return conditions.
+     *
      * @return array|string|int|float|null
      */
     public function getCondition()
@@ -176,6 +193,8 @@ public function getCondition()
     }
 
     /**
+     * Set value.
+     *
      * @param array|string|int|float $value
      * @return $this
      */
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
index 1d8d658267020..a139d20191b57 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
@@ -20,7 +20,7 @@ class Datetime extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Date
     const END_OF_DAY_IN_SECONDS = 86399;
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getValue($index = null)
     {
@@ -117,8 +117,7 @@ public function getHtml()
             ) . '/>' . '</div></div>';
         $html .= '<input type="hidden" name="' . $this->_getHtmlName() . '[locale]"' . ' value="'
             . $this->localeResolver->getLocale() . '"/>';
-        $html .= '<script>
-            require(["jquery", "mage/calendar"],function($){
+        $scriptString = 'require(["jquery", "mage/calendar"],function($){
                     $("#' . $htmlId . '_range").dateRange({
                         dateFormat: "' . $format . '",
                         timeFormat: "' . $timeFormat . '",
@@ -131,8 +130,9 @@ public function getHtml()
                             id: "' . $htmlId . '_to"
                         }
                     })
-            });
-        </script>';
+            });';
+        $html .= $this->secureHtmlRenderer->renderTag('script', [], $scriptString, false);
+
         return $html;
     }
 
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
index 3251b367b6f56..2a6d7e39c5db2 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
@@ -14,18 +14,30 @@
         <input type="hidden" name="store_switcher" id="store_switcher"
                data-role="store-view-id" data-param="<?= $block->escapeHtmlAttr($block->getStoreVarName()) ?>"
                value="<?= $block->escapeHtml($block->getStoreId()) ?>"
-               <?= /* @noEscape */ $secureRenderer->renderEventListener('onchange', 'switchScope(this);') ?>
                <?= /* @noEscape */ $block->getUiId() ?> />
+        <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+            'onchange',
+            'switchScope(this);',
+            '#store_switcher'
+        ) ?>
         <input type="hidden" name="store_group_switcher" id="store_group_switcher"
                data-role="store-group-id" data-param="<?= $block->escapeHtmlAttr($block->getStoreGroupVarName()) ?>"
                value="<?= $block->escapeHtml($block->getStoreGroupId()) ?>"
-                <?= /* @noEscape */ $secureRenderer->renderEventListener('onchange', 'switchScope(this);') ?>
                <?= /* @noEscape */ $block->getUiId() ?> />
+        <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+            'onchange',
+            'switchScope(this);',
+            '#store_group_switcher'
+        ) ?>
         <input type="hidden" name="website_switcher" id="website_switcher"
                data-role="website-id" data-param="<?= $block->escapeHtmlAttr($block->getWebsiteVarName()) ?>"
                value="<?= $block->escapeHtml($block->getWebsiteId()) ?>"
-               <?= /* @noEscape */ $secureRenderer->renderEventListener('onchange', 'switchScope(this);') ?>
                <?= /* @noEscape */ $block->getUiId() ?> />
+        <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+            'onchange',
+            'switchScope(this);',
+            '#website_switcher'
+        ) ?>
         <button
             type="button"
             class="admin__action-dropdown"
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml
index c392ebf3883d2..4b80d2863ad93 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml
@@ -5,34 +5,51 @@
  */
 
 /** @var \Magento\Backend\Block\Cache\Permissions|null $permissions */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+
 $permissions = $block->getData('permissions');
 ?>
-<?php if ($permissions && $permissions->hasAccessToAdditionalActions()) : ?>
+<?php if ($permissions && $permissions->hasAccessToAdditionalActions()): ?>
     <div class="additional-cache-management">
         <h2>
             <span><?= $block->escapeHtml(__('Additional Cache Management')); ?></span>
         </h2>
-        <?php if ($permissions->hasAccessToFlushCatalogImages()) : ?>
+        <?php if ($permissions->hasAccessToFlushCatalogImages()): ?>
             <p>
-                <button onclick="setLocation('<?= $block->escapeJs($block->getCleanImagesUrl()); ?>')" type="button">
+                <button id="flushCatalogImages" type="button">
                     <?= $block->escapeHtml(__('Flush Catalog Images Cache')); ?>
                 </button>
+                <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                    'onclick',
+                    'setLocation(\'' . $block->escapeJs($block->getCleanImagesUrl()) . '\')',
+                    'button#flushCatalogImages'
+                ) ?>
                 <span><?= $block->escapeHtml(__('Pregenerated product images files')); ?></span>
             </p>
         <?php endif; ?>
-        <?php if ($permissions->hasAccessToFlushJsCss()) : ?>
+        <?php if ($permissions->hasAccessToFlushJsCss()): ?>
             <p>
-                <button onclick="setLocation('<?= $block->escapeJs($block->getCleanMediaUrl()); ?>')" type="button">
+                <button id="flushJsCss" type="button">
                     <?= $block->escapeHtml(__('Flush JavaScript/CSS Cache')); ?>
                 </button>
+                <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                    'onclick',
+                    'setLocation(\'' . $block->escapeJs($block->getCleanMediaUrl()) . '\')',
+                    'button#flushJsCss'
+                ) ?>
                 <span><?= $block->escapeHtml(__('Themes JavaScript and CSS files combined to one file')) ?></span>
             </p>
         <?php endif; ?>
-        <?php if (!$block->isInProductionMode() && $permissions->hasAccessToFlushStaticFiles()) : ?>
+        <?php if (!$block->isInProductionMode() && $permissions->hasAccessToFlushStaticFiles()): ?>
             <p>
-                <button onclick="setLocation('<?= $block->escapeJs($block->getCleanStaticFilesUrl()); ?>')" type="button">
+                <button id="flushStaticFiles" type="button">
                     <?= $block->escapeHtml(__('Flush Static Files Cache')); ?>
                 </button>
+                <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                    'onclick',
+                    'setLocation(\'' . $block->escapeJs($block->getCleanStaticFilesUrl()) . '\')',
+                    'button#flushStaticFiles'
+                ) ?>
                 <span><?= $block->escapeHtml(__('Preprocessed view files and static files')); ?></span>
             </p>
         <?php endif; ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml
index 1361b46a3cec9..36184816dc172 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml
@@ -59,17 +59,18 @@ script;
                                         "')) {{$clickAction}}"; ?>
                                     <?php //phpcs:enable ?>
                                 <?php endif; ?>
-                                <button <?php if (!isset($_button['disabled']) || !$_button['disabled']):?>
-                                    <?= /* @noEscape */ $secureRenderer->renderEventListener(
-                                        'onclick',
-                                        /* @noEscape */ $clickAction
-                                    ) ?>
-                                <?php endif; ?>
+                                <button
                                     id="<?= $block->escapeHtmlAttr($_button['name']) ?>"
                                     type="button"
                                     class="scalable
+                                <?php if (!isset($_button['disabled']) || !$_button['disabled']):?>
+                                    <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                                        'onclick',
+                                        /* @noEscape */ $clickAction,
+                                        '#' . $block->escapeHtmlAttr($_button['name'])
+                                    ) ?>
+                                <?php endif; ?>
                                 <?php if (isset($_button['disabled']) && $_button['disabled']):?>disabled<?php endif;?>"
-                                        style=""
                                 ><span><span><span><?= $block->escapeHtml($_button['action']) ?></span></span></span>
                                 </button>
                                 <?php if (isset($_button['comment'])): ?> <br />
@@ -96,16 +97,16 @@ script;
                     <tr>
                         <td class="label"><label><?= $block->escapeHtml(__('JavaScript/CSS Cache')) ?></label></td>
                         <td class="value">
-                            <button
-                                <?= /* @noEscape */ $secureRenderer->renderEventListener(
-                                    'onclick',
-                                    "setCacheAction('jscss_action', this)"
-                                ) ?>
-                                    id='jscss_action'
+                            <button id='jscss_action'
                                     type="button"
                                     class="scalable">
                                 <span><span><span><?= $block->escapeHtml(__('Clear')) ?></span></span></span>
                             </button>
+                            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                                'onclick',
+                                "setCacheAction('jscss_action', this)",
+                                '#jscss_action'
+                            ) ?>
                         </td>
                     </tr>
                 </tbody>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml
index b2f1530dd865b..4120348daec00 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml
@@ -29,46 +29,53 @@
 
 <?php $i = 0; if ($block->getValues() !== null): ?>
     <?php foreach ($block->getValues() as $image): $i++; ?>
-        <tr id="<?= $block->getElement()->getHtmlId() ?>_tr_<?= $block->escapeHtmlAttr($image->getValueId()) ?>"
-            class="gallery">
+        <?php $trId = $block->getElement()->getHtmlId() . '_tr_' . $block->escapeHtmlAttr($image->getValueId()); ?>
+        <tr id="<?= /* @noEscape */ $trId ?>" class="gallery">
         <?php foreach ($block->getValues()->getAttributeBackend()->getImageTypes() as $type): ?>
-            <td class="gallery" align="center" style="vertical-align:bottom;">
+            <?php $typeId = $block->getElement()->getHtmlId() . '_image_' . $block->escapeHtmlAttr($type);
+            $imgId =  $typeId . '_' . $block->escapeHtmlAttr($image->getValueId()); ?>
+            <td class="gallery" align="center" id="<?= /* @noEscape */ $typeId ?>">
             <a href="<?= $block->escapeUrl($image->setType($type)->getSourceUrl()) ?>"
+               id = <?= /* @noEscape */ 'a_' . $imgId ?>
                target="_blank"
-               <?= /* @noEscape */ $secureRenderer->renderEventListener(
-                   'onclick',
-                   "imagePreview('<?= $block->getElement()->getHtmlId() ?>_image_<?=
-                $block->escapeHtmlAttr($block->escapeJs($type)) ?>_<?=
-                 $block->escapeHtmlAttr($block->escapeJs($image->getValueId())) ?>');return false;"
-               ) ?>
-            <img id="<?= $block->getElement()->getHtmlId() ?>_image_<?= $block->escapeHtmlAttr($type)
-            ?>_<?= $block->escapeHtmlAttr($image->getValueId()) ?>"
+            <img id="<?= /* @noEscape */ $imgId ?>"
                  src="<?= $block->escapeUrl($image->setType($type)->getSourceUrl()) ?>?<?= /* @noEscape */ time() ?>"
                  alt="<?= $block->escapeHtmlAttr($image->getValue()) ?>"
                  title="<?= $block->escapeHtmlAttr($image->getValue()) ?>"
                  height="25"
                  class="small-image-preview v-middle"/>
             </a><br/>
+                <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                    'onclick',
+                    "imagePreview('<?= $imgId ?>');return false;",
+                    '#a_' . $imgId
+                ) ?>
             <input type="file"
                    name="<?= $block->escapeHtmlAttr($block->getElement()->getName())
                     ?>_<?= $block->escapeHtmlAttr($type) ?>[<?= $block->escapeHtmlAttr($image->getValueId()) ?>]"
-                   size="1"></td>
+                   size="1">
+            </td>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('vertical-align:bottom;', 'td#' . $typeId) ?>
         <?php endforeach; ?>
-        <td class="gallery" align="center" style="vertical-align:bottom;">
+        <td class="gallery" align="center" id="<?= /* @noEscape */ $trId . '_td_input' ?>">
             <input type="input"
                    name="<?= $block->escapeHtmlAttr($block->getElement()->getParentName())
                     ?>[position][<?= $block->escapeHtmlAttr($image->getValueId()) ?>]"
                    value="<?= $block->escapeHtmlAttr($image->getPosition()) ?>"
                    id="<?= $block->getElement()->getHtmlId()
                     ?>_position_<?= $block->escapeHtmlAttr($image->getValueId()) ?>"
-                   size="3"/></td>
-        <td class="gallery" align="center"
-            style="vertical-align:bottom;"><?= $block->getDeleteButtonHtml($image->getValueId()) ?>
+                   size="3"/>
+        </td>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('vertical-align:bottom;', $trId . '_td_input') ?>
+        <td class="gallery" align="center" id="<?= /* @noEscape */ $trId . '_td_delete' ?>">
+            <?= $block->getDeleteButtonHtml($image->getValueId()) ?>
             <input type="hidden"
                    name="<?= $block->escapeHtmlAttr($block->getElement()->getParentName())
                     ?>[delete][<?= $block->escapeHtmlAttr($image->getValueId()) ?>]"
                    id="<?= $block->getElement()->getHtmlId()
-                    ?>_delete_<?= $block->escapeHtmlAttr($image->getValueId()) ?>"/></td>
+                    ?>_delete_<?= $block->escapeHtmlAttr($image->getValueId()) ?>"/>
+        </td>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('vertical-align:bottom;', $trId . '_td_delete') ?>
         </tr>
     <?php endforeach; ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
index 80a5638555dc2..79c9ce1f4cefd 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
@@ -93,12 +93,15 @@ $numColumns = $block->getColumns() !== null ? count($block->getColumns()): 0;
                             <?php $_lastPage = $block->getCollection()->getLastPageNumber() ?>
 
                             <?php if ($_curPage > 1): ?>
-                                <button class="action-previous"
-                                        type="button"
-                                        onclick="<?= /* @noEscape */ $block->getJsObjectName() ?>.setPage('<?=
-                                        /* @noEscape */ ($_curPage - 1) ?>');return false;">
-                                            <span><?= $block->escapeHtml(__('Previous page')) ?></span>
+                                <button class="action-previous" type="button">
+                                    <span><?= $block->escapeHtml(__('Previous page')) ?></span>
                                 </button>
+                                <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                                    'onclick',
+                                    /* @noEscape */ $block->getJsObjectName() . '.setPage(\'' .
+                                        /* @noEscape */ ($_curPage - 1) . '\');return false;',
+                                    'button.action-previous'
+                                ) ?>
                             <?php else: ?>
                                 <button type="button" class="action-previous disabled">
                                     <span><?= $block->escapeHtml(__('Previous page')) ?></span>
@@ -110,9 +113,14 @@ $numColumns = $block->getColumns() !== null ? count($block->getColumns()): 0;
                                    name="<?= $block->escapeHtmlAttr($block->getVarNamePage()) ?>"
                                    value="<?= $block->escapeHtmlAttr($_curPage) ?>"
                                    class="admin__control-text"
-                                   onkeypress="<?= /* @noEscape */ $block->getJsObjectName() ?>.inputPage(event, '<?=
-                                   /* @noEscape */ $_lastPage ?>')" <?=
-                            /* @noEscape */ $block->getUiId('current-page') ?> />
+                                   <?= /* @noEscape */ $block->getUiId('current-page') ?> />
+
+                            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                                'onkeypress',
+                                /* @noEscape */ $block->getJsObjectName() . '.inputPage(event, \'' .
+                                /* @noEscape */ $_lastPage . '\')',
+                                '#' . $block->escapeHtml($block->getHtmlId()) . '_page-current'
+                            ) ?>
 
                             <label class="admin__control-support-text" for="<?= $block->escapeHtml($block->getHtmlId())
                             ?>_page-current">
@@ -121,11 +129,15 @@ $numColumns = $block->getColumns() !== null ? count($block->getColumns()): 0;
                             </label>
                             <?php if ($_curPage < $_lastPage): ?>
                                 <button type="button" title="<?= $block->escapeHtmlAttr(__('Next page')) ?>"
-                                        class="action-next"
-                                        onclick="<?= /* @noEscape */ $block->getJsObjectName() ?>.setPage('<?=
-                                        /* @noEscape */ ($_curPage + 1) ?>');return false;">
+                                        class="action-next">
                                     <span><?= $block->escapeHtml(__('Next page')) ?></span>
                                 </button>
+                                <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                                    'onclick',
+                                    /* @noEscape */ $block->getJsObjectName() . '.setPage(\'' .
+                                    /* @noEscape */ ($_curPage + 1) . '\');return false;',
+                                    'button.action-next'
+                                ) ?>
                             <?php else: ?>
                                 <button type="button" class="action-next disabled">
                                     <span><?= $block->escapeHtml(__('Next page')) ?></span>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
index 527ddc436207f..3044985ef65f2 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
@@ -18,31 +18,39 @@ $numColumns = count($block->getColumns());
 
 /**
  * @var \Magento\Backend\Block\Widget\Grid\Extended $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
-<?php if ($block->getCollection()) : ?>
-    <?php if ($block->canDisplayContainer()) : ?>
+<?php if ($block->getCollection()): ?>
+    <?php if ($block->canDisplayContainer()): ?>
 
     <div id="<?= $block->escapeHtml($block->getId()) ?>" data-grid-id="<?= $block->escapeHtml($block->getId()) ?>">
-    <?php else : ?>
+    <?php else: ?>
         <?= $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
     <?php endif; ?>
     <?php $massActionAvailable = $block->getMassactionBlock() && $block->getMassactionBlock()->isAvailable() ?>
-    <?php if ($block->getPagerVisibility() || $block->getExportTypes() || $block->getFilterVisibility() || $massActionAvailable) : ?>
+    <?php if ($block->getPagerVisibility() || $block->getExportTypes() || $block->getFilterVisibility() ||
+        $massActionAvailable): ?>
         <div class="admin__data-grid-header admin__data-grid-toolbar">
             <div class="admin__data-grid-header-row">
-                <?php if ($massActionAvailable) : ?>
-                    <?= $block->getMainButtonsHtml() ? '<div class="admin__filter-actions">' . $block->getMainButtonsHtml() . '</div>' : '' ?>
+                <?php if ($massActionAvailable): ?>
+                    <?= $block->getMainButtonsHtml() ?
+                        '<div class="admin__filter-actions">' . $block->getMainButtonsHtml() . '</div>' : '' ?>
                 <?php endif; ?>
-            <?php if ($block->getExportTypes()) : ?>
+            <?php if ($block->getExportTypes()): ?>
                 <div class="admin__data-grid-export">
                     <label
                         class="admin__control-support-text"
-                        for="<?= $block->escapeHtml($block->getId()) ?>_export"><?= $block->escapeHtml(__('Export to:')) ?></label>
-                    <select name="<?= $block->escapeHtml($block->getId()) ?>_export" id="<?= $block->escapeHtml($block->getId()) ?>_export"
+                        for="<?= $block->escapeHtml($block->getId()) ?>_export">
+                        <?= $block->escapeHtml(__('Export to:')) ?>
+                    </label>
+                    <select name="<?= $block->escapeHtml($block->getId()) ?>_export"
+                            id="<?= $block->escapeHtml($block->getId()) ?>_export"
                             class="admin__control-select">
-                        <?php foreach ($block->getExportTypes() as $_type) : ?>
-                            <option value="<?= $block->escapeHtmlAttr($_type->getUrl()) ?>"><?= $block->escapeHtml($_type->getLabel()) ?></option>
+                        <?php foreach ($block->getExportTypes() as $_type): ?>
+                            <option value="<?= $block->escapeHtmlAttr($_type->getUrl()) ?>">
+                                <?= $block->escapeHtml($_type->getLabel()) ?>
+                            </option>
                         <?php endforeach; ?>
                     </select>
                     <?= $block->getExportButtonHtml() ?>
@@ -51,76 +59,103 @@ $numColumns = count($block->getColumns());
             </div>
 
             <div class="admin__data-grid-header-row <?= $massActionAvailable ? '_massaction' : '' ?>">
-                <?php if ($massActionAvailable) : ?>
+                <?php if ($massActionAvailable): ?>
                     <?= $block->getMassactionBlockHtml() ?>
-                <?php else : ?>
-                    <?= $block->getMainButtonsHtml() ? '<div class="admin__filter-actions">' . $block->getMainButtonsHtml() . '</div>' : '' ?>
+                <?php else: ?>
+                    <?= $block->getMainButtonsHtml() ?
+                        '<div class="admin__filter-actions">' . $block->getMainButtonsHtml() . '</div>' : '' ?>
                 <?php endif; ?>
                 <?php $countRecords = $block->getCollection()->getSize(); ?>
                 <div class="admin__control-support-text">
-                        <span id="<?= $block->escapeHtml($block->getHtmlId()) ?>-total-count" <?= /* @noEscape */ $block->getUiId('total-count') ?>>
+                        <span id="<?= $block->escapeHtml($block->getHtmlId()) ?>-total-count"
+                            <?= /* @noEscape */ $block->getUiId('total-count') ?>>
                             <?= /* @noEscape */ $countRecords ?>
                         </span>
                     <?= $block->escapeHtml(__('records found')) ?>
                     <span id="<?= $block->escapeHtml($block->getHtmlId()) ?>_massaction-count"
-                          class="mass-select-info _empty"><strong data-role="counter">0</strong> <span><?= $block->escapeHtml(__('selected')) ?></span></span>
+                          class="mass-select-info _empty">
+                        <strong data-role="counter">0</strong>
+                        <span><?= $block->escapeHtml(__('selected')) ?></span>
+                    </span>
                 </div>
 
-            <?php if ($block->getPagerVisibility()) : ?>
+            <?php if ($block->getPagerVisibility()): ?>
                 <div class="admin__data-grid-pager-wrap">
                     <select name="<?= $block->escapeHtmlAttr($block->getVarNameLimit()) ?>"
                             id="<?= $block->escapeHtml($block->getHtmlId()) ?>_page-limit"
                             onchange="<?= /* @noEscape */ $block->getJsObjectName() ?>.loadByElement(this)"
                             class="admin__control-select">
-                        <option value="20"<?php if ($block->getCollection()->getPageSize() == 20) : ?>
+                        <option value="20"<?php if ($block->getCollection()->getPageSize() == 20): ?>
                             selected="selected"<?php endif; ?>>20
                         </option>
-                        <option value="30"<?php if ($block->getCollection()->getPageSize() == 30) : ?>
+                        <option value="30"<?php if ($block->getCollection()->getPageSize() == 30): ?>
                             selected="selected"<?php endif; ?>>30
                         </option>
-                        <option value="50"<?php if ($block->getCollection()->getPageSize() == 50) : ?>
+                        <option value="50"<?php if ($block->getCollection()->getPageSize() == 50): ?>
                             selected="selected"<?php endif; ?>>50
                         </option>
-                        <option value="100"<?php if ($block->getCollection()->getPageSize() == 100) : ?>
+                        <option value="100"<?php if ($block->getCollection()->getPageSize() == 100): ?>
                             selected="selected"<?php endif; ?>>100
                         </option>
-                        <option value="200"<?php if ($block->getCollection()->getPageSize() == 200) : ?>
+                        <option value="200"<?php if ($block->getCollection()->getPageSize() == 200): ?>
                             selected="selected"<?php endif; ?>>200
                         </option>
                     </select>
-                    <label for="<?= $block->escapeHtml($block->getHtmlId()) ?><?= $block->escapeHtml($block->getHtmlId()) ?>_page-limit"
+                    <label for="<?= $block->escapeHtml($block->getHtmlId())
+                    ?><?= $block->escapeHtml($block->getHtmlId()) ?>_page-limit"
                         class="admin__control-support-text"><?= $block->escapeHtml(__('per page')) ?></label>
 
                     <div class="admin__data-grid-pager">
                         <?php $_curPage = $block->getCollection()->getCurPage() ?>
                         <?php $_lastPage = $block->getCollection()->getLastPageNumber() ?>
-                        <?php if ($_curPage > 1) : ?>
-                            <button class="action-previous"
-                                    type="button"
-                                    onclick="<?= /* @noEscape */ $block->getJsObjectName() ?>.setPage('<?= /* @noEscape */ ($_curPage - 1) ?>');return false;">
+                        <?php if ($_curPage > 1): ?>
+                            <button class="action-previous" type="button">
+                                <span><?= $block->escapeHtml(__('Previous page')) ?></span>
+                            </button>
+                            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                                'onclick',
+                                /* @noEscape */ $block->getJsObjectName() . '.setPage(\'' .
+                                /* @noEscape */ ($_curPage - 1) . '\');return false;',
+                                'button.action-previous'
+                            ) ?>
+                        <?php else: ?>
+                            <button type="button" class="action-previous disabled">
                                 <span><?= $block->escapeHtml(__('Previous page')) ?></span>
                             </button>
-                        <?php else : ?>
-                            <button type="button" class="action-previous disabled"><span><?= $block->escapeHtml(__('Previous page')) ?></span></button>
                         <?php endif; ?>
                         <input type="text"
                                id="<?= $block->escapeHtml($block->getHtmlId()) ?>_page-current"
                                name="<?= $block->escapeHtmlAttr($block->getVarNamePage()) ?>"
                                value="<?= $block->escapeHtmlAttr($_curPage) ?>"
                                class="admin__control-text"
-                               onkeypress="<?= /* @noEscape */ $block->getJsObjectName() ?>.inputPage(event, '<?= /* @noEscape */ $_lastPage ?>')" <?= /* @noEscape */ $block->getUiId('current-page') ?> />
-                        <label class="admin__control-support-text" for="<?= $block->escapeHtml($block->getHtmlId()) ?>_page-current">
-                            <?= /* @noEscape */ __('of %1', '<span>' . $block->getCollection()->getLastPageNumber() . '</span>') ?>
+                               <?= /* @noEscape */ $block->getUiId('current-page') ?> />
+                        <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                            'onkeypress',
+                            /* @noEscape */ $block->getJsObjectName() . '.inputPage(event, \'' .
+                            /* @noEscape */ $_lastPage . '\')',
+                            '#' . $block->escapeHtml($block->getHtmlId()) . '_page-current'
+                        ) ?>
+                        <label class="admin__control-support-text"
+                               for="<?= $block->escapeHtml($block->getHtmlId()) ?>_page-current">
+                            <?= /* @noEscape */ __('of %1', '<span>' .
+                                $block->getCollection()->getLastPageNumber() . '</span>') ?>
                         </label>
-                        <?php if ($_curPage < $_lastPage) : ?>
+                        <?php if ($_curPage < $_lastPage): ?>
                             <button type="button"
                                     title="<?= $block->escapeHtmlAttr(__('Next page')) ?>"
-                                    class="action-next"
-                                    onclick="<?= /* @noEscape */ $block->getJsObjectName() ?>.setPage('<?= /* @noEscape */ ($_curPage + 1) ?>');return false;">
+                                    class="action-next">
+                                <span><?= $block->escapeHtml(__('Next page')) ?></span>
+                            </button>
+                            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                                'onclick',
+                                /* @noEscape */ $block->getJsObjectName() . '.setPage(\'' .
+                                /* @noEscape */ ($_curPage + 1) . '\');return false;',
+                                'button.action-next'
+                            ) ?>
+                        <?php else: ?>
+                            <button type="button" class="action-next disabled">
                                 <span><?= $block->escapeHtml(__('Next page')) ?></span>
                             </button>
-                        <?php else : ?>
-                        <button type="button" class="action-next disabled"><span><?= $block->escapeHtml(__('Next page')) ?></span></button>
                         <?php endif; ?>
                     </div>
                 </div>
@@ -137,25 +172,26 @@ $numColumns = count($block->getColumns());
             <col <?= $_column->getHtmlProperty() ?> />
             <?php endforeach; */
             ?>
-            <?php if ($block->getHeadersVisibility() || $block->getFilterVisibility()) : ?>
+            <?php if ($block->getHeadersVisibility() || $block->getFilterVisibility()): ?>
                 <thead>
-                <?php if ($block->getHeadersVisibility()) : ?>
+                <?php if ($block->getHeadersVisibility()): ?>
                     <tr>
-                        <?php foreach ($block->getColumns() as $_column) : ?>
-                            <?php if ($_column->getHeaderHtml() == '&nbsp;') : ?>
+                        <?php foreach ($block->getColumns() as $_column): ?>
+                            <?php if ($_column->getHeaderHtml() == '&nbsp;'): ?>
                                 <th class="data-grid-th" data-column="<?= $block->escapeHtmlAttr($_column->getId()) ?>"
                                     <?= $_column->getHeaderHtmlProperty() ?>>&nbsp;</th>
-                            <?php else : ?>
+                            <?php else: ?>
                                 <?= $_column->getHeaderHtml() ?>
                             <?php endif; ?>
                         <?php endforeach; ?>
                     </tr>
                 <?php endif; ?>
-                <?php if ($block->getFilterVisibility()) : ?>
+                <?php if ($block->getFilterVisibility()): ?>
                     <tr class="data-grid-filters" data-role="filter-form">
                         <?php $i = 0;
-                        foreach ($block->getColumns() as $_column) : ?>
-                            <td data-column="<?= $block->escapeHtmlAttr($_column->getId()) ?>" <?= $_column->getHeaderHtmlProperty() ?>>
+                        foreach ($block->getColumns() as $_column): ?>
+                            <td data-column="<?= $block->escapeHtmlAttr($_column->getId()) ?>"
+                                <?= $_column->getHeaderHtmlProperty() ?>>
                                 <?= $_column->getFilterHtml() ?>
                             </td>
                         <?php endforeach; ?>
@@ -163,12 +199,14 @@ $numColumns = count($block->getColumns());
                 <?php endif ?>
                 </thead>
             <?php endif; ?>
-            <?php if ($block->getCountTotals()) : ?>
+            <?php if ($block->getCountTotals()): ?>
                 <tfoot>
                 <tr class="totals">
-                    <?php foreach ($block->getColumns() as $_column) : ?>
+                    <?php foreach ($block->getColumns() as $_column): ?>
                         <th class="<?= $block->escapeHtmlAttr($_column->getCssProperty()) ?>">
-                            <?= /* @noEscape */ ($_column->hasTotalsLabel()) ? $block->escapeHtml($_column->getTotalsLabel()) : $_column->getRowField($_column->getGrid()->getTotals()) ?>
+                            <?= /* @noEscape */ ($_column->hasTotalsLabel()) ?
+                                $block->escapeHtml($_column->getTotalsLabel()) :
+                                $_column->getRowField($_column->getGrid()->getTotals()) ?>
                         </th>
                     <?php endforeach; ?>
                 </tr>
@@ -176,21 +214,26 @@ $numColumns = count($block->getColumns());
             <?php endif; ?>
 
             <tbody>
-            <?php if (($block->getCollection()->getSize() > 0) && (!$block->getIsCollapsed())) : ?>
-                <?php foreach ($block->getCollection() as $_index => $_item) : ?>
-                    <tr title="<?= $block->escapeHtmlAttr($block->getRowUrl($_item)) ?>"<?php if ($_class = $block->getRowClass($_item)) : ?>
-                        class="<?= $block->escapeHtmlAttr($_class) ?>"<?php endif; ?> ><?php
+            <?php if (($block->getCollection()->getSize() > 0) && (!$block->getIsCollapsed())): ?>
+                <?php foreach ($block->getCollection() as $_index => $_item): ?>
+                    <tr title="<?= $block->escapeHtmlAttr($block->getRowUrl($_item)) ?>"
+                        <?php if ($_class = $block->getRowClass($_item)): ?>
+                        class="<?= $block->escapeHtmlAttr($_class) ?>"
+                        <?php endif; ?>>
+                        <?php
                         $i = 0;
-                        foreach ($block->getColumns() as $_column) :
-                            if ($block->shouldRenderCell($_item, $_column)) :
+                        foreach ($block->getColumns() as $_column):
+                            if ($block->shouldRenderCell($_item, $_column)):
                                 $_rowspan = $block->getRowspan($_item, $_column);
                                 ?>
                             <td <?= /* @noEscape */ ($_rowspan ? 'rowspan="' . $_rowspan . '" ' : '') ?>
                                 class="<?= $block->escapeHtmlAttr($_column->getCssProperty()) ?>
-                                        <?= /* @noEscape */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': '' ?>">
-                                <?= /* @noEscape */ (($_html = $_column->getRowField($_item)) != '' ? $_html : '&nbsp;') ?>
+                                        <?= /* @noEscape */ $_column->getId() == 'massaction' ?
+                                        'data-grid-checkbox-cell': '' ?>">
+                                <?= /* @noEscape */ (($_html = $_column->getRowField($_item)) != '' ?
+                                $_html : '&nbsp;') ?>
                                 </td><?php
-                                if ($block->shouldRenderEmptyCell($_item, $_column)) :
+                                if ($block->shouldRenderEmptyCell($_item, $_column)):
                                     ?>
                                     <td colspan="<?= $block->escapeHtmlAttr($block->getEmptyCellColspan($_item)) ?>"
                                         class="last"><?= $block->escapeHtml($block->getEmptyCellLabel()) ?></td><?php
@@ -198,59 +241,66 @@ $numColumns = count($block->getColumns());
                             endif;
                         endforeach; ?>
                     </tr>
-                    <?php if ($_multipleRows = $block->getMultipleRows($_item)) : ?>
-                        <?php foreach ($_multipleRows as $_i) : ?>
+                    <?php if ($_multipleRows = $block->getMultipleRows($_item)): ?>
+                        <?php foreach ($_multipleRows as $_i): ?>
                             <tr>
                                 <?php $i = 0;
-                                foreach ($block->getMultipleRowColumns($_i) as $_column) : ?>
+                                foreach ($block->getMultipleRowColumns($_i) as $_column): ?>
                                     <td class="<?= $block->escapeHtmlAttr($_column->getCssProperty()) ?>
-                                        <?= /* @noEscape */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': '' ?>">
-                                        <?= /* @noEscape */ (($_html = $_column->getRowField($_i)) != '' ? $_html : '&nbsp;') ?>
+                                        <?= /* @noEscape */ $_column->getId() == 'massaction' ?
+                                        'data-grid-checkbox-cell': '' ?>">
+                                        <?= /* @noEscape */ (($_html = $_column->getRowField($_i)) != '' ?
+                                            $_html : '&nbsp;') ?>
                                     </td>
                                 <?php endforeach; ?>
                             </tr>
                         <?php endforeach; ?>
                     <?php endif; ?>
 
-                    <?php if ($block->shouldRenderSubTotal($_item)) : ?>
+                    <?php if ($block->shouldRenderSubTotal($_item)): ?>
                         <tr class="subtotals">
                             <?php $i = 0;
-                            foreach ($block->getSubTotalColumns() as $_column) : ?>
+                            foreach ($block->getSubTotalColumns() as $_column): ?>
                                 <td class="<?= $block->escapeHtmlAttr($_column->getCssProperty()) ?>
-                                           <?= /* @noEscape */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': '' ?>">
-                                    <?= /* @noEscape */ $_column->hasSubtotalsLabel() ? $block->escapeHtml($_column->getSubtotalsLabel()) : $_column->getRowField($block->getSubTotalItem($_item)) ?>
+                                <?= /* @noEscape */ $_column->getId() == 'massaction' ?
+                                    'data-grid-checkbox-cell': '' ?>">
+                                    <?= /* @noEscape */ $_column->hasSubtotalsLabel() ?
+                                        $block->escapeHtml($_column->getSubtotalsLabel()) :
+                                        $_column->getRowField($block->getSubTotalItem($_item)) ?>
                                 </td>
                             <?php endforeach; ?>
                         </tr>
                     <?php endif; ?>
                 <?php endforeach; ?>
-            <?php elseif ($block->getEmptyText()) : ?>
+            <?php elseif ($block->getEmptyText()): ?>
                 <tr class="data-grid-tr-no-data">
                     <td class="<?= $block->escapeHtmlAttr($block->getEmptyTextClass()) ?>"
-                        colspan="<?= $block->escapeHtmlAttr($numColumns) ?>"><?= $block->escapeHtml($block->getEmptyText()) ?></td>
+                        colspan="<?= $block->escapeHtmlAttr($numColumns) ?>">
+                        <?= $block->escapeHtml($block->getEmptyText()) ?>
+                    </td>
                 </tr>
             <?php endif; ?>
             </tbody>
         </table>
 
     </div>
-    <?php if ($block->canDisplayContainer()) : ?>
+    <?php if ($block->canDisplayContainer()): ?>
 </div>
 <script>
     var deps = [];
 
-        <?php if ($block->getDependencyJsObject()) : ?>
+        <?php if ($block->getDependencyJsObject()): ?>
     deps.push('uiRegistry');
         <?php endif; ?>
 
-        <?php if (strpos($block->getRowClickCallback(), 'order.') !== false) : ?>
+        <?php if (strpos($block->getRowClickCallback(), 'order.') !== false): ?>
     deps.push('Magento_Sales/order/create/form')
         <?php endif; ?>
 
     deps.push('mage/adminhtml/grid');
 
-        <?php if (is_array($block->getRequireJsDependencies())) : ?>
-            <?php foreach ($block->getRequireJsDependencies() as $dependency) : ?>
+        <?php if (is_array($block->getRequireJsDependencies())): ?>
+            <?php foreach ($block->getRequireJsDependencies() as $dependency): ?>
             deps.push('<?= $block->escapeJs($dependency) ?>');
             <?php endforeach; ?>
         <?php endif; ?>
@@ -259,32 +309,37 @@ $numColumns = count($block->getColumns());
         <?php //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed ?>
 
         //<![CDATA[
-        <?php if ($block->getDependencyJsObject()) : ?>
-        registry.get('<?= $block->escapeJs($block->getDependencyJsObject()) ?>', function (<?= $block->escapeJs($block->getDependencyJsObject()) ?>) {
+        <?php if ($block->getDependencyJsObject()): ?>
+        registry.get('<?= $block->escapeJs($block->getDependencyJsObject())
+        ?>', function (<?= $block->escapeJs($block->getDependencyJsObject()) ?>) {
         <?php endif; ?>
     <?php // phpcs:disable ?>
     <?= $block->escapeJs($block->getJsObjectName()) ?> = new varienGrid(<?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getId()) ?>, '<?= $block->escapeJs($block->getGridUrl()) ?>', '<?= $block->escapeJs($block->getVarNamePage()) ?>', '<?= $block->escapeJs($block->getVarNameSort()) ?>', '<?= $block->escapeJs($block->getVarNameDir()) ?>', '<?= $block->escapeJs($block->getVarNameFilter()) ?>');
     <?php //phpcs:enable ?>
         <?= $block->escapeJs($block->getJsObjectName()) ?>.useAjax = '<?= $block->escapeJs($block->getUseAjax()) ?>';
-        <?php if ($block->getRowClickCallback()) : ?>
-            <?= $block->escapeJs($block->getJsObjectName()) ?>.rowClickCallback = <?= /* @noEscape */ $block->getRowClickCallback() ?>;
+        <?php if ($block->getRowClickCallback()): ?>
+            <?= $block->escapeJs($block->getJsObjectName())
+            ?>.rowClickCallback = <?= /* @noEscape */ $block->getRowClickCallback() ?>;
         <?php endif; ?>
-        <?php if ($block->getCheckboxCheckCallback()) : ?>
-            <?= $block->escapeJs($block->getJsObjectName()) ?>.checkboxCheckCallback = <?= /* @noEscape */ $block->getCheckboxCheckCallback() ?>;
+        <?php if ($block->getCheckboxCheckCallback()): ?>
+            <?= $block->escapeJs($block->getJsObjectName())
+            ?>.checkboxCheckCallback = <?= /* @noEscape */ $block->getCheckboxCheckCallback() ?>;
         <?php endif; ?>
-        <?php if ($block->getFilterKeyPressCallback()) : ?>
-            <?= $block->escapeJs($block->getJsObjectName()) ?>.filterKeyPressCallback = <?= /* @noEscape */ $block->getFilterKeyPressCallback() ?>;
+        <?php if ($block->getFilterKeyPressCallback()): ?>
+            <?= $block->escapeJs($block->getJsObjectName())
+            ?>.filterKeyPressCallback = <?= /* @noEscape */ $block->getFilterKeyPressCallback() ?>;
         <?php endif; ?>
-        <?php if ($block->getRowInitCallback()) : ?>
-            <?= $block->escapeJs($block->getJsObjectName()) ?>.initRowCallback = <?= /* @noEscape */ $block->getRowInitCallback() ?>;
+        <?php if ($block->getRowInitCallback()): ?>
+            <?= $block->escapeJs($block->getJsObjectName())
+            ?>.initRowCallback = <?= /* @noEscape */ $block->getRowInitCallback() ?>;
             <?= $block->escapeJs($block->getJsObjectName()) ?>.initGridRows();
         <?php endif; ?>
-        <?php if ($block->getMassactionBlock() && $block->getMassactionBlock()->isAvailable()) : ?>
+        <?php if ($block->getMassactionBlock() && $block->getMassactionBlock()->isAvailable()): ?>
             <?= /* @noEscape */ $block->getMassactionBlock()->getJavaScript() ?>
         <?php endif ?>
         <?= /* @noEscape */ $block->getAdditionalJavaScript() ?>
 
-        <?php if ($block->getDependencyJsObject()) : ?>
+        <?php if ($block->getDependencyJsObject()): ?>
         });
         <?php endif; ?>
     //]]>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml
index f48af7d066df3..498b403508f2c 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml
@@ -31,8 +31,8 @@
             <?php $_tabHref = $block->getTabUrl($_tab) == '#' ? '#' . $block->getTabId($_tab) . '_content' :
                 $block->getTabUrl($_tab) ?>
 
-            <li class="admin__page-nav-item" <?php if ($block->getTabIsHidden($_tab)): ?> style="display:none"<?php
-            endif; ?><?= /* @noEscape */ $block->getUiId('tab', 'item', $_tab->getId()) ?>>
+            <li class="admin__page-nav-item" id="<?= $block->escapeHtmlAttr($block->getTabId($_tab)) ?>"
+                <?= /* @noEscape */ $block->getUiId('tab', 'item', $_tab->getId()) ?>>
                 <a href="<?=  $block->escapeUrl($_tabHref) ?>"
                    id="<?=  $block->escapeHtmlAttr($block->getTabId($_tab)) ?>"
                    name="<?=  $block->escapeHtmlAttr($block->getTabId($_tab, false)) ?>"
@@ -72,9 +72,15 @@
                     <?= /* @noEscape */ $block->getUiId('tab', 'content', $_tab->getId()) ?>>
                     <?= /* @noEscape */ $block->getTabContent($_tab) ?>
                 </div>
+                <?php if ($block->getTabIsHidden($_tab)): ?>
+                    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                        'display:none',
+                        'li.admin__page-nav-item#' . $block->escapeHtmlAttr($block->getTabId($_tab))
+                    ); ?>
+                <?php endif; ?>
                 <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
                     'display:none',
-                    '#' . $block->escapeHtmlAttr($block->getTabId($_tab))
+                    'div#' . $block->escapeHtmlAttr($block->getTabId($_tab))
                 ); ?>
             </li>
         <?php endforeach; ?>
diff --git a/app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml b/app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml
index 81aa49efd11e8..5251feb8c6710 100644
--- a/app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml
+++ b/app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml
@@ -3,16 +3,21 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <!-- TODO: refactor form styles and js -->
 <script type="text/x-magento-template" id="rollback-warning-template">
-<p><?= $block->escapeHtml(__('You will lose any data created since the backup was made, including admin users, customers and orders.')) ?></p>
+<p><?= $block->escapeHtml(__(
+    'You will lose any data created since the backup was made, including admin users, customers and orders.'
+)) ?></p>
 <p><?= $block->escapeHtml(__('Are you sure you want to continue?')) ?></p>
 </script>
 <script type="text/x-magento-template" id="backup-options-template">
-    <div class="backup-messages" style="display: none;">
+    <div class="backup-messages">
         <div class="messages"></div>
     </div>
+    <?=/* @noEscape */ $secureRenderer->renderStyleAsTag('display:none', 'div.backup-messages') ?>
     <div class="messages">
         <div class="message message-warning">
             <?= $block->escapeHtml(__('This may take a few moments.')) ?>
@@ -21,44 +26,68 @@
     <form action="" method="post" id="backup-form" class="form-inline">
         <fieldset class="admin__fieldset form-list question">
             <div class="admin__field field _required">
-                <label for="backup_name" class="admin__field-label"><span><?= $block->escapeHtml(__('Backup Name')) ?></span></label>
+                <label for="backup_name" class="admin__field-label">
+                    <span><?= $block->escapeHtml(__('Backup Name')) ?></span>
+                </label>
                 <div class="admin__field-control">
                     <input type="text" name="backup_name" id="backup_name"
-                           class="admin__control-text required-entry validate-alphanum-with-spaces validate-length maximum-length-50"
+                           class="admin__control-text required-entry validate-alphanum-with-spaces validate-length
+                            maximum-length-50"
                            maxlength="50" />
                     <div class="admin__field-note">
-                        <?= $block->escapeHtml(__('Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field.')) ?>
+                        <?= $block->escapeHtml(__(
+                            'Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field.'
+                        )) ?>
                     </div>
                 </div>
             </div>
 
             <div class="admin__field field maintenance-checkbox-container">
-                <label for="backup_maintenance_mode" class="admin__field-label"><span><?= $block->escapeHtml(__('Maintenance mode')) ?></span></label>
+                <label for="backup_maintenance_mode" class="admin__field-label">
+                    <span><?= $block->escapeHtml(__('Maintenance mode')) ?></span>
+                </label>
                 <div class="admin__field-control">
                     <div class="admin__field-option">
-                        <input class="admin__control-checkbox" type="checkbox" name="maintenance_mode" value="1" id="backup_maintenance_mode"/>
-                        <label class="admin__field-label" for="backup_maintenance_mode"><?= $block->escapeHtml(__('Please put your store into maintenance mode during backup.')) ?></label>
+                        <input class="admin__control-checkbox"
+                               type="checkbox"
+                               name="maintenance_mode"
+                               value="1"
+                               id="backup_maintenance_mode"/>
+                        <label class="admin__field-label"
+                               for="backup_maintenance_mode"><?= $block->escapeHtml(__(
+                                   'Please put your store into maintenance mode during backup.'
+                               )) ?></label>
                     </div>
                 </div>
             </div>
 
-            <div class="admin__field field maintenance-checkbox-container" id="exclude-media-checkbox-container" style="display: none;">
-                <label for="exclude_media" class="admin__field-label"><span><?= $block->escapeHtml(__('Exclude')) ?></span></label>
+            <div class="admin__field field maintenance-checkbox-container" id="exclude-media-checkbox-container">
+                <label for="exclude_media" class="admin__field-label">
+                    <span><?= $block->escapeHtml(__('Exclude')) ?></span>
+                </label>
                 <div class="admin__field-control">
                     <div class="admin__field-option">
-                        <input class="admin__control-checkbox" type="checkbox" name="exclude_media" value="1" id="exclude_media"/>
-                        <label class="admin__field-label" for="exclude_media"><?= $block->escapeHtml(__('Exclude media folder from backup')) ?></label>
+                        <input class="admin__control-checkbox"
+                               type="checkbox"
+                               name="exclude_media"
+                               value="1"
+                               id="exclude_media"/>
+                        <label class="admin__field-label"
+                               for="exclude_media"><?= $block->escapeHtml(__('Exclude media folder from backup')) ?>
+                        </label>
                     </div>
                 </div>
             </div>
+            <?=/* @noEscape */ $secureRenderer->renderStyleAsTag('display:none', '#exclude-media-checkbox-container') ?>
         </fieldset>
     </form>
 </script>
 
 <script type="text/x-magento-template" id="rollback-request-password-template">
-    <div class="backup-messages" style="display: none;">
+    <div class="backup-messages">
         <div class="messages"></div>
     </div>
+    <?=/* @noEscape */ $secureRenderer->renderStyleAsTag('display:none', 'div.backup-messages') ?>
     <div class="messages">
         <div class="message message-warning">
             <?= $block->escapeHtml(__('Please enter the password to confirm rollback.')) ?><br>
@@ -69,44 +98,63 @@
     <form action="" method="post" id="rollback-form" class="form-inline">
         <fieldset class="admin__fieldset password-box-container">
             <div class="admin__field field _required">
-                <label for="password" class="admin__field-label"><span><?= $block->escapeHtml(__('User Password')) ?></span></label>
-                <div class="admin__field-control"><input type="password" name="password" id="password" class="admin__control-text required-entry" autocomplete="new-password"></div>
+                <label for="password" class="admin__field-label">
+                    <span><?= $block->escapeHtml(__('User Password')) ?></span>
+                </label>
+                <div class="admin__field-control">
+                    <input type="password" name="password" id="password" class="admin__control-text required-entry"
+                           autocomplete="new-password">
+                </div>
             </div>
 
             <div class="admin__field field maintenance-checkbox-container">
-                <label for="rollback_maintenance_mode" class="admin__field-label"><span><?= $block->escapeHtml(__('Maintenance mode')) ?></span></label>
+                <label for="rollback_maintenance_mode" class="admin__field-label">
+                    <span><?= $block->escapeHtml(__('Maintenance mode')) ?></span>
+                </label>
                 <div class="admin__field-control">
                     <div class="admin__field-option">
-                        <input class="admin__control-checkbox" type="checkbox" name="maintenance_mode" value="1" id="rollback_maintenance_mode"/>
-                        <label class="admin__field-label" for="rollback_maintenance_mode"><?= $block->escapeHtml(__('Please put your store into maintenance mode during rollback processing.')) ?></label>
-                    </div>  
+                        <input class="admin__control-checkbox" type="checkbox" name="maintenance_mode" value="1"
+                               id="rollback_maintenance_mode"/>
+                        <label class="admin__field-label" for="rollback_maintenance_mode">
+                            <?= $block->escapeHtml(__(
+                                'Please put your store into maintenance mode during rollback processing.'
+                            )) ?></label>
+                    </div>
                 </div>
             </div>
 
-            <div class="admin__field field maintenance-checkbox-container" id="use-ftp-checkbox-row" style="display: none;">
+            <div class="admin__field field maintenance-checkbox-container" id="use-ftp-checkbox-row">
                 <label for="use_ftp" class="admin__field-label">
                     <span><?= $block->escapeHtml(__('FTP')) ?></span>
                 </label>
                 <div class="admin__field-control">
                     <div class="admin__field-option">
-                        <input class="admin__control-checkbox" type="checkbox" name="use_ftp" value="1" id="use_ftp" onclick="backup.toggleFtpCredentialsForm(event)"/>
-                        <label class="admin__field-label" for="use_ftp"><?= $block->escapeHtml(__('Use FTP Connection')) ?></label>
+                        <input class="admin__control-checkbox" type="checkbox" name="use_ftp" value="1" id="use_ftp"/>
+                        <label class="admin__field-label" for="use_ftp">
+                            <?= $block->escapeHtml(__('Use FTP Connection')) ?>
+                        </label>
                     </div>
                 </div>
             </div>
         </fieldset>
-        <div class="entry-edit" id="ftp-credentials-container" style="display: none;">
+        <div class="entry-edit" id="ftp-credentials-container">
             <fieldset class="admin__fieldset">
-                <legend class="admin__legend legend"><span><?= $block->escapeHtml(__('FTP credentials')) ?></span></legend><br />
+                <legend class="admin__legend legend">
+                    <span><?= $block->escapeHtml(__('FTP credentials')) ?></span>
+                </legend><br />
                 <div class="admin__field field _required">
-                    <label class="admin__field-label" for="ftp_host"><span><?= $block->escapeHtml(__('FTP Host')) ?></span></label>
+                    <label class="admin__field-label" for="ftp_host">
+                        <span><?= $block->escapeHtml(__('FTP Host')) ?></span>
+                    </label>
                     <div class="admin__field-control">
                         <input type="text" class="admin__control-text" name="ftp_host" id="ftp_host">
                     </div>
                 </div>
 
                 <div class="admin__field field _required">
-                    <label class="admin__field-label" for="ftp_user"><span><?= $block->escapeHtml(__('FTP Login')) ?></span></label>
+                    <label class="admin__field-label" for="ftp_user">
+                        <span><?= $block->escapeHtml(__('FTP Login')) ?></span>
+                    </label>
                     <div class="admin__field-control">
                         <input type="text" class="admin__control-text" name="ftp_user" id="ftp_user">
                     </div>
@@ -116,7 +164,8 @@
                         <span><?= $block->escapeHtml(__('FTP Password')) ?></span>
                     </label>
                     <div class="admin__field-control">
-                        <input type="password" class="admin__control-text" name="ftp_pass" id="ftp_pass" autocomplete="new-password">
+                        <input type="password" class="admin__control-text" name="ftp_pass" id="ftp_pass"
+                               autocomplete="new-password">
                     </div>
                 </div>
                 <div class="admin__field field">
@@ -136,17 +185,27 @@
     $backupUrl = $block->getUrl('*/*/create');
 ?>
 
-<script>
+<?php $scriptString = <<<script
+
 require([
-    "prototype",
-    "mage/adminhtml/backup"
+    'prototype',
+    'mage/adminhtml/backup'
 ], function(){
 
 //<![CDATA[
     backup = new AdminBackup();
-    backup.rollbackUrl = '<?= $block->escapeUrl($rollbackUrl) ?>';
-    backup.backupUrl = '<?= $block->escapeUrl($backupUrl) ?>';
+    backup.rollbackUrl = '{$block->escapeJs($rollbackUrl)}';
+    backup.backupUrl = '{$block->escapeJs($backupUrl)}';
 //]]>
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display:none', '#use-ftp-checkbox-row') ?>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display:none', '#ftp-credentials-container') ?>
+<?=/* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+    'onclick',
+    'backup.toggleFtpCredentialsForm(event)',
+    '#use_ftp'
+) ?>
diff --git a/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml b/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml
index 0d2599ff45f25..995db82618106 100644
--- a/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml
+++ b/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml
@@ -5,14 +5,12 @@
  */
 
 /** @var Magento\Braintree\Block\Form $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 
 $code = $block->escapeHtml($block->getMethodCode());
 $ccType = $block->getInfoData('cc_type');
 ?>
-<fieldset class="admin__fieldset payment-method"
-          id="payment_form_<?= /* @noEscape */ $code ?>"
-          style="display:none"
-    >
+<fieldset class="admin__fieldset payment-method" id="payment_form_<?= /* @noEscape */ $code ?>">
     <div class="admin__field _required">
         <label class="label admin__field-label" for="<?= /* @noEscape */ $code ?>_cc_type" >
             <span><?= $block->escapeHtml(__('Credit Card Type')) ?></span>
@@ -20,9 +18,9 @@ $ccType = $block->getInfoData('cc_type');
         <div class="admin__field-control control">
             <select id="<?= /* @noEscape */ $code ?>_cc_type" name="payment[cc_type]"
                     class="required-entry select admin__control-select validate-cc-type-select">
-                <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName) : ?>
+                <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName): ?>
                     <option value="<?= $block->escapeHtml($typeCode) ?>"
-                        <?php if ($typeCode == $ccType) : ?> selected="selected"<?php endif; ?>>
+                        <?php if ($typeCode == $ccType): ?> selected="selected"<?php endif; ?>>
                         <?= $block->escapeHtml($typeName) ?>
                     </option>
                 <?php endforeach; ?>
@@ -59,7 +57,7 @@ $ccType = $block->getInfoData('cc_type');
             </div>
         </div>
     </div>
-    <?php if ($block->hasVerification()) : ?>
+    <?php if ($block->hasVerification()): ?>
         <div class="admin__field _required">
             <label class="label admin__field-label">
                 <span><?= $block->escapeHtml(__('Card Verification Number')) ?></span>
@@ -75,7 +73,7 @@ $ccType = $block->getInfoData('cc_type');
         </div>
     <?php endif; ?>
 
-    <?php if ($block->isVaultEnabled()) : ?>
+    <?php if ($block->isVaultEnabled()): ?>
         <div class="field-tooltip-content">
             <input type="checkbox"
                    id="<?= /* @noEscape */ $code ?>_vault"
@@ -89,5 +87,7 @@ $ccType = $block->getInfoData('cc_type');
 
     <input type="hidden" id="<?= /* @noEscape */ $code ?>_payment_method_nonce"
            name="payment[payment_method_nonce]"/>
-    <input type="submit" name="Submit" style="display: none;">
+    <input type="submit" name="Submit">
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display;none', 'input[name=\'Submit\']') ?>
 </fieldset>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display;none', 'payment_form_' . /* @noEscape */ $code) ?>
diff --git a/app/code/Magento/Braintree/view/adminhtml/templates/payment/script.phtml b/app/code/Magento/Braintree/view/adminhtml/templates/payment/script.phtml
index 1b188b68948bf..ec345f6af2233 100644
--- a/app/code/Magento/Braintree/view/adminhtml/templates/payment/script.phtml
+++ b/app/code/Magento/Braintree/view/adminhtml/templates/payment/script.phtml
@@ -5,11 +5,14 @@
  */
 
 /** @var Magento\Braintree\Block\Payment $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 
 $code = $block->escapeHtml($block->getCode());
-
 ?>
-<script>
+<?php
+$paymentConfig = /* @noEscape */ $block->getPaymentConfig();
+$payment_code = /* @noEscape */ $code;
+$scriptString = <<<script
     //<![CDATA[
     require(
         [
@@ -17,12 +20,14 @@ $code = $block->escapeHtml($block->getCode());
             'jquery',
             'domReady!'
         ], function(Braintree, $) {
-            var config = <?= /* @noEscape */ $block->getPaymentConfig() ?>,
+            var config = {$paymentConfig},
                 payment,
-                form = $('#payment_form_<?= /* @noEscape */ $code ?>');
+                form = $('#payment_form_{$payment_code}');
 
             config.active = form.length > 0 && !form.is(':hidden');
             payment = new Braintree(config);
         });
     //]]>
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
diff --git a/app/code/Magento/Braintree/view/frontend/templates/multishipping/form.phtml b/app/code/Magento/Braintree/view/frontend/templates/multishipping/form.phtml
index fc3030b6a4b36..3c0828cb3677d 100644
--- a/app/code/Magento/Braintree/view/frontend/templates/multishipping/form.phtml
+++ b/app/code/Magento/Braintree/view/frontend/templates/multishipping/form.phtml
@@ -3,8 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Csp\Api\InlineUtilInterface $csp */
 ?>
-<script>
+<?php $scriptString = <<<script
     require([
         'uiLayout',
         'jquery'
@@ -25,5 +27,7 @@
             $('body').trigger('contentUpdated');
         })
     })
-</script>
+script;
+?>
+<?= /* @noEscape */ $csp->renderTag('script', [], $scriptString) ?>
 <!-- ko template: getTemplate() --><!-- /ko -->
diff --git a/app/code/Magento/Braintree/view/frontend/templates/multishipping/form_paypal.phtml b/app/code/Magento/Braintree/view/frontend/templates/multishipping/form_paypal.phtml
index ea3eb2214c2d8..abb99e5290442 100644
--- a/app/code/Magento/Braintree/view/frontend/templates/multishipping/form_paypal.phtml
+++ b/app/code/Magento/Braintree/view/frontend/templates/multishipping/form_paypal.phtml
@@ -3,8 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Csp\Api\InlineUtilInterface $csp */
 ?>
-<script>
+<?php $scriptString = <<<script
+
     require([
         'uiLayout',
         'jquery'
@@ -25,5 +28,7 @@
             $('body').trigger('contentUpdated');
         })
     })
-</script>
+script;
+?>
+<?= /* @noEscape */ $csp->renderTag('script', [], $scriptString) ?>
 <!-- ko template: getTemplate() --><!-- /ko -->
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/stock/disabler.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/stock/disabler.phtml
index b540b59ada343..14cb5f29be69a 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/stock/disabler.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/stock/disabler.phtml
@@ -3,8 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<script>
+
+<?php $scriptString = <<<script
 require(['jquery'], function($){
     $('[data-tab-panel=product-details]').on('stockbeforedisable', function(e) {
         if (e.productType === 'bundle') {
@@ -13,4 +15,7 @@ require(['jquery'], function($){
         }
     });
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
+
diff --git a/app/code/Magento/Captcha/view/adminhtml/templates/default.phtml b/app/code/Magento/Captcha/view/adminhtml/templates/default.phtml
index 88e0d5edc2a7d..490bd159f28bd 100644
--- a/app/code/Magento/Captcha/view/adminhtml/templates/default.phtml
+++ b/app/code/Magento/Captcha/view/adminhtml/templates/default.phtml
@@ -5,8 +5,9 @@
  */
 
 /** @var \Magento\Captcha\Block\Captcha\DefaultCaptcha $block */
-
 /** @var \Magento\Captcha\Model\DefaultModel $captcha */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+
 $captcha = $block->getCaptchaModel();
 ?>
 <div class="admin__field _required">
@@ -18,11 +19,13 @@ $captcha = $block->getCaptchaModel();
             id="captcha"
             class="admin__control-text"
             type="text"
-            name="<?= $block->escapeHtmlAttr(\Magento\Captcha\Helper\Data::INPUT_NAME_FIELD_VALUE) ?>[<?= $block->escapeHtml($block->getFormId()) ?>]"
+            name="<?= $block->escapeHtmlAttr(\Magento\Captcha\Helper\Data::INPUT_NAME_FIELD_VALUE)
+            ?>[<?= $block->escapeHtml($block->getFormId()) ?>]"
             data-validate="{required:true}"/>
-        <?php if ($captcha->isCaseSensitive()) :?>
+        <?php if ($captcha->isCaseSensitive()):?>
             <div class="admin__field-note">
-                <span><?= $block->escapeHtml(__('<strong>Attention</strong>: Captcha is case sensitive.'), ['strong']) ?></span>
+                <span><?= $block->escapeHtml(__('<strong>Attention</strong>: Captcha is case sensitive.'), ['strong'])
+                ?></span>
             </div>
         <?php endif; ?>
     </div>
@@ -39,11 +42,16 @@ $captcha = $block->getCaptchaModel();
         height="<?= /* @noEscape */ (float) $block->getImgHeight() ?>"
         src="<?= $block->escapeUrl($captcha->getImgSrc()) ?>" />
 </div>
-<script>
+
+<?php
+$url = $block->escapeJs($block->escapeUrl($block->getRefreshUrl()));
+$formId = $block->escapeJs($block->escapeHtml($block->getFormId()));
+$scriptString = <<<script
+
     require(["prototype", "mage/captcha"], function(){
 
 //<![CDATA[
-        var captcha = new Captcha('<?= $block->escapeJs($block->escapeUrl($block->getRefreshUrl())) ?>', '<?= $block->escapeJs($block->escapeHtml($block->getFormId())) ?>');
+        var captcha = new Captcha('{$url}', '{$formId}');
 
         $('captcha-reload').observe('click', function () {
             captcha.refresh(this);
@@ -52,4 +60,6 @@ $captcha = $block->getCaptchaModel();
 //]]>
 
     });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit.phtml
index c77b66733afc4..c19f140687bbc 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit.phtml
@@ -6,13 +6,16 @@
 
 /**
  * @var $block \Magento\Catalog\Block\Adminhtml\Category\Edit
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
-<div data-id="information-dialog-category" class="messages" style="display: none;">
+<div data-id="information-dialog-category" class="messages">
     <div class="message message-notice">
         <div><?= $block->escapeHtml(__('This operation can take a long time')) ?></div>
     </div>
 </div>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display: none;', 'div[data-id="information-dialog-category"]') ?>
+
 <script type="text/x-magento-init">
     {
         "*": {
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml
index d6340330df8ea..ff5d203076987 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml
@@ -5,36 +5,48 @@
  */
 
 /** @var $block \Magento\Catalog\Block\Adminhtml\Category\Tree */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <div class="categories-side-col">
     <div class="sidebar-actions">
-        <?php if ($block->getRoot()) :?>
+        <?php if ($block->getRoot()):?>
             <?= $block->getAddRootButtonHtml() ?><br/>
             <?= $block->getAddSubButtonHtml() ?>
         <?php endif; ?>
     </div>
     <div class="tree-actions">
-        <?php if ($block->getRoot()) :?>
-            <?php //echo $block->getCollapseButtonHtml() ?>
-            <?php //echo $block->getExpandButtonHtml() ?>
-            <a href="#"
-               onclick="tree.collapseTree(); return false;"><?= $block->escapeHtml(__('Collapse All')) ?></a>
-            <span class="separator">|</span> <a href="#"
-                                                onclick="tree.expandTree(); return false;"><?= $block->escapeHtml(__('Expand All')) ?></a>
+        <?php if ($block->getRoot()):?>
+            <a id="colapseAll" href="#"><?= $block->escapeHtml(__('Collapse All')) ?></a>
+            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                'onclick',
+                'tree.collapseTree(); return false;',
+                '#colapseAll'
+            ) ?>
+            <span class="separator">|</span>
+            <a id="expandAll" href="#"><?= $block->escapeHtml(__('Expand All')) ?></a>
+            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                'onclick',
+                'tree.expandTree(); return false;',
+                '#expandAll'
+            ) ?>
         <?php endif; ?>
     </div>
-    <?php if ($block->getRoot()) :?>
+    <?php if ($block->getRoot()):?>
     <div class="tree-holder">
         <div id="tree-div" class="tree-wrapper"></div>
     </div>
 </div>
 
-    <div data-id="information-dialog-tree" class="messages" style="display: none;">
+    <div data-id="information-dialog-tree" class="messages">
         <div class="message message-notice">
             <div><?= $block->escapeHtml(__('This operation can take a long time')) ?></div>
         </div>
     </div>
-    <script>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+            'display: none;',
+            'div[data-id="information-dialog-tree"]'
+        ) ?>
+        <?php $scriptString = <<<script
         var tree;
         require([
             "jquery",
@@ -171,7 +183,7 @@
 
                     if (!this.collapsed) {
                         this.collapsed = true;
-                        this.loader.dataUrl = '<?= $block->escapeJs($block->escapeUrl($block->getLoadTreeUrl(false))) ?>';
+                        this.loader.dataUrl = '{$block->escapeJs($block->getLoadTreeUrl(false))}';
                         this.request(this.loader.dataUrl, false);
                     }
                 },
@@ -180,7 +192,7 @@
                     this.expandAll();
                     if (this.collapsed) {
                         this.collapsed = false;
-                        this.loader.dataUrl = '<?= $block->escapeJs($block->escapeUrl($block->getLoadTreeUrl(true))) ?>';
+                        this.loader.dataUrl = '{$block->escapeJs($block->getLoadTreeUrl(true))}';
                         this.request(this.loader.dataUrl, false);
                     }
                 },
@@ -215,7 +227,9 @@
                 if (tree && switcherParams) {
                     var url;
                     if (switcherParams.useConfirm) {
-                        if (!confirm("<?= $block->escapeJs(__('Please confirm site switching. All data that hasn\'t been saved will be lost.')) ?>")) {
+                        if (!confirm("{$block->escapeJs(__(
+    'Please confirm site switching. All data that hasn\'t been saved will be lost.'
+))}")) {
                             return false;
                         }
                     }
@@ -258,7 +272,7 @@
                             }
                         });
                     } else {
-                        var baseUrl = '<?= $block->escapeJs($block->escapeUrl($block->getEditUrl())) ?>';
+                        var baseUrl = '{$block->escapeJs($block->getEditUrl())}';
                         var urlExt = switcherParams.scopeParams + 'id/' + tree.currentNodeId + '/';
                         url = parseSidUrl(baseUrl, urlExt);
                         setLocation(url);
@@ -295,18 +309,22 @@
                 if (scopeParams) {
                     url = url + scopeParams;
                 }
-                <?php if ($block->isClearEdit()) :?>
+script;
+        if ($block->isClearEdit()):
+            $scriptString .= <<<script
                 if (selectedNode) {
                     url = url + 'id/' + config.parameters.category_id;
                 }
-                <?php endif;?>
+script;
+endif;
+        $scriptString .= <<<script
                 //updateContent(url); //commented since ajax requests replaced with http ones to load a category
                 jQuery('#tree-div').find('.x-tree-node-el').first().remove();
             }
 
             jQuery(function () {
                 categoryLoader = new Ext.tree.TreeLoader({
-                    dataUrl: '<?= $block->escapeJs($block->escapeUrl($block->getLoadTreeUrl())) ?>'
+                    dataUrl: '{$block->escapeJs($block->getLoadTreeUrl())}'
                 });
 
                 categoryLoader.processResponse = function (response, parent, callback) {
@@ -388,31 +406,32 @@
                     enableDD: true,
                     containerScroll: true,
                     selModel: new Ext.tree.CheckNodeMultiSelectionModel(),
-                    rootVisible: '<?= (bool)$block->getRoot()->getIsVisible() ?>',
-                    useAjax: <?= $block->escapeJs($block->getUseAjax()) ?>,
-                    switchTreeUrl: '<?= $block->escapeJs($block->escapeUrl($block->getSwitchTreeUrl())) ?>',
-                    editUrl: '<?= $block->escapeJs($block->escapeUrl($block->getEditUrl())) ?>',
-                    currentNodeId: <?= (int)$block->getCategoryId() ?>,
-                    baseUrl: '<?= $block->escapeJs($block->escapeUrl($block->getEditUrl())) ?>'
+script;
+        $scriptString .= '
+                    rootVisible: \'' . ($block->getRoot()->getIsVisible() ? 'true' : 'false') . '\',
+                    useAjax: ' . $block->escapeJs($block->getUseAjax()) . ',
+                    switchTreeUrl: \'' . $block->escapeJs($block->escapeUrl($block->getSwitchTreeUrl())) .'\',
+                    editUrl: \'' . $block->escapeJs($block->escapeUrl($block->getEditUrl())) .'\',
+                    currentNodeId: ' . (int)$block->getCategoryId() . ',
+                    baseUrl: \'' . $block->escapeJs($block->escapeUrl($block->getEditUrl())) . '\'
                 };
 
                 defaultLoadTreeParams = {
                     parameters: {
-                        text: <?= /* @noEscape */ json_encode(htmlentities($block->getRoot()->getName())) ?>,
+                        text: ' . /* @noEscape */ json_encode(htmlentities($block->getRoot()->getName())) . ',
                         draggable: false,
-                        allowDrop: <?php if ($block->getRoot()->getIsVisible()) :?>true<?php else :?>false<?php endif; ?>,
-                        id: <?= (int)$block->getRoot()->getId() ?>,
-                        expanded: <?= (int)$block->getIsWasExpanded() ?>,
-                        store_id: <?= (int)$block->getStore()->getId() ?>,
-                        category_id: <?= (int)$block->getCategoryId() ?>,
-                        parent: <?= (int)$block->getRequest()->getParam('parent') ?>
+                        allowDrop: ' . ($block->getRoot()->getIsVisible() ? 'true' : 'false') . ',
+                        id: ' . (int)$block->getRoot()->getId() . ',
+                        expanded: ' . (int)$block->getIsWasExpanded() . ',
+                        store_id: ' . (int)$block->getStore()->getId() . ',
+                        category_id: ' . (int)$block->getCategoryId() . ',
+                        parent: ' . (int)$block->getRequest()->getParam('parent') . '
                     },
-                    data: <?= /* @noEscape */ $block->getTreeJson() ?>
-                };
-
-                reRenderTree();
-            });
-
+                    data: ' . /* @noEscape */ $block->getTreeJson() . '
+                    };
+                    reRenderTree();
+                });' . PHP_EOL;
+        $scriptString .= <<<script
             function addNew(url, isRoot) {
                 if (isRoot) {
                     tree.currentNodeId = tree.root.id;
@@ -485,7 +504,7 @@
                         click: function () {
                             (function ($) {
                                 $.ajax({
-                                    url: '<?= $block->escapeJs($block->escapeUrl($block->getMoveUrl())) ?>',
+                                    url: '{$block->escapeJs($block->getMoveUrl())}',
                                     method: 'POST',
                                     data: registry.get('pd'),
                                     showLoader: true
@@ -521,5 +540,7 @@
             window.addNew = addNew;
 
         });
-    </script>
+script;
+        ?>
+        <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml
index e24d676974b01..3efdf1a82b40a 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Csp\Api\InlineUtilInterface $csp */
 ?>
 
 <?php $_divId = 'tree' . $block->getId() ?>
@@ -10,14 +12,20 @@
 <!--[if IE]>
 <script id="ie-deferred-loader" defer="defer" src="//:"></script>
 <![endif]-->
-<script>
-require(['jquery', "prototype", "extjs/ext-tree-checkbox"], function(jQuery){
+<?php
+$isUseMassaction = $block->getUseMassaction() ? 1 : 0;
+$isAnchorOnly = $block->getIsAnchorOnly() ? 1 : 0;
+$intCategoryId = (int)$block->getCategoryId();
+$intRootId = (int) $block->getRoot()->getId();
+$scriptString = <<<script
 
-var tree<?= $block->escapeJs($block->getId()) ?>;
+require(['jquery', 'prototype', 'extjs/ext-tree-checkbox'], function(jQuery){
 
-var useMassaction = <?= $block->getUseMassaction() ? 1 : 0 ?>;
+var tree{$block->escapeJs($block->getId())};
 
-var isAnchorOnly = <?= $block->getIsAnchorOnly() ? 1 : 0 ?>;
+var useMassaction = {$isUseMassaction};
+
+var isAnchorOnly = {$isAnchorOnly};
 
 Ext.tree.TreePanel.Enhanced = function(el, config)
 {
@@ -41,9 +49,13 @@ Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {
         this.setRootNode(root);
 
         if (firstLoad) {
-            <?php if ($block->getNodeClickListener()) :?>
-                this.addListener('click', <?= /* @noEscape */ $block->getNodeClickListener() ?>.createDelegate(this));
-            <?php endif; ?>
+
+script;
+if ($block->getNodeClickListener()):
+    $scriptString .= 'this.addListener(\'click\', ' . /* @noEscape */ $block->getNodeClickListener() .
+    '.createDelegate(this));' . PHP_EOL;
+endif;
+$scriptString .= <<<script
         }
 
         this.loader.buildCategoryTree(root, data);
@@ -55,10 +67,14 @@ Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {
 
 jQuery(function()
 {
-    var emptyNodeAdded = <?= ($block->getWithEmptyNode() ? 'false' : 'true') ?>;
+
+script;
+    $scriptString .= 'var emptyNodeAdded = ' . ($block->getWithEmptyNode() ? 'false' : 'true') . ';' . PHP_EOL;
+
+$scriptString .= <<<script
 
     var categoryLoader = new Ext.tree.TreeLoader({
-       dataUrl: '<?= $block->escapeJs($block->escapeUrl($block->getLoadTreeUrl())) ?>'
+       dataUrl: '{$block->escapeJs($block->escapeUrl($block->getLoadTreeUrl()))}'
     });
 
     categoryLoader.buildCategoryTree = function(parent, config)
@@ -77,7 +93,7 @@ jQuery(function()
                 // Add empty node to reset category filter
                 if(!emptyNodeAdded) {
                     var empty = Object.clone(_node);
-                    empty.text = '<?= $block->escapeJs(__('None')) ?>';
+                    empty.text = '{$block->escapeJs(__('None'))}';
                     empty.children = [];
                     empty.id = 'none';
                     empty.path = '1/none';
@@ -148,39 +164,41 @@ jQuery(function()
     };
 
     categoryLoader.on("beforeload", function(treeLoader, node) {
-        $('<?= $block->escapeJs($_divId) ?>').fire('category:beforeLoad', {treeLoader:treeLoader});
+        $('{$block->escapeJs($_divId)}').fire('category:beforeLoad', {treeLoader:treeLoader});
         treeLoader.baseParams.id = node.attributes.id;
     });
 
-    tree<?= $block->escapeJs($block->getId()) ?> = new Ext.tree.TreePanel.Enhanced('<?= $block->escapeJs($_divId) ?>', {
+    tree{$block->escapeJs($block->getId())} = new Ext.tree.TreePanel.Enhanced('{$block->escapeJs($_divId)}', {
         animate:          false,
         loader:           categoryLoader,
         enableDD:         false,
         containerScroll:  true,
         rootVisible:      false,
         useAjax:          true,
-        currentNodeId:    <?= (int) $block->getCategoryId() ?>,
+        currentNodeId:    {$intCategoryId},
         addNodeTo:        false
     });
 
     if (useMassaction) {
-        tree<?= $block->escapeJs($block->getId()) ?>.on('check', function(node) {
-            $('<?= $block->escapeJs($_divId) ?>').fire('node:changed', {node:node});
-        }, tree<?= $block->escapeJs($block->getId()) ?>);
+        tree{$block->escapeJs($block->getId())}.on('check', function(node) {
+            $('{$block->escapeJs($_divId)}').fire('node:changed', {node:node});
+        }, tree{$block->escapeJs($block->getId())});
     }
 
     // set the root node
     var parameters = {
         text:        'Psw',
         draggable:   false,
-        id:          <?= (int) $block->getRoot()->getId() ?>,
+        id:          {$intRootId},
         expanded:    true,
-        category_id: <?= (int) $block->getCategoryId() ?>
+        category_id: {$intCategoryId}
     };
 
-    tree<?= $block->escapeJs($block->getId()) ?>.loadTree({parameters:parameters, data:<?= /* @noEscape */ $block->getTreeJson() ?>},true);
+    tree{$block->escapeJs($block->getId())}.loadTree({parameters:parameters, data:{$block->getTreeJson()}},true);
 
 });
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $csp->renderTag('script', [], $scriptString); ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main/tree/group.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main/tree/group.phtml
index 5717e9f0a0f0b..4ecfdd16a882d 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main/tree/group.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main/tree/group.phtml
@@ -3,5 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<div id="tree-div1" style="height:400px;margin-top:5px;overflow:auto"></div>
+<div id="tree-div1"/>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    "height:400px;margin-top:5px;overflow:auto",
+    '#tree-div1'
+) ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
index 32466a1dfa965..cad35ece5603e 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
@@ -3,24 +3,59 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<div id="product_composite_configure" class="product-configure-popup" style="display:none;">
-    <iframe name="product_composite_configure_iframe" id="product_composite_configure_iframe" style="width:0; height:0; border:0px solid #fff; position:absolute; top:-1000px; left:-1000px" onload="window.productConfigure && productConfigure.onLoadIFrame()"></iframe>
-    <form action="" method="post" id="product_composite_configure_form" enctype="multipart/form-data" onsubmit="productConfigure.onConfirmBtn(); return false;" target="product_composite_configure_iframe">
+<div id="product_composite_configure" class="product-configure-popup">
+    <iframe name="product_composite_configure_iframe" id="product_composite_configure_iframe"></iframe>
+    <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+        'onload',
+        "window.productConfigure && productConfigure.onLoadIFrame()",
+        '#product_composite_configure_form'
+    ) ?>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+        "width:0; height:0; border:0px solid #fff; position:absolute; top:-1000px; left:-1000px",
+        '#product_composite_configure_confirmed'
+    ) ?>
+
+    <form action="" method="post" id="product_composite_configure_form" enctype="multipart/form-data"
+          target="product_composite_configure_iframe">
         <div class="entry-edit">
-            <div id="product_composite_configure_messages" style="display: none;" >
+            <div id="product_composite_configure_messages">
                 <div class="messages"><div class="message message-error error"><div></div></div></div>
             </div>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                'display:none;',
+                '#product_composite_configure_messages'
+            ) ?>
             <div id="product_composite_configure_form_fields" class="content product-composite-configure-inner"></div>
-            <div id="product_composite_configure_form_additional" style="display:none;"></div>
-            <div id="product_composite_configure_form_confirmed" style="display:none;"></div>
+            <div id="product_composite_configure_form_additional"></div>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                'display:none;',
+                '#product_composite_configure_form_additional'
+            ) ?>
+            <div id="product_composite_configure_form_confirmed"></div>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                'display:none;',
+                '#product_composite_configure_form_confirmed'
+            ) ?>
         </div>
         <input type="hidden" name="as_js_varname" value="iFrameResponse" />
         <input type="hidden" name="form_key" value="<?= $block->escapeHtmlAttr($block->getFormKey()) ?>" />
     </form>
-    <div id="product_composite_configure_confirmed" style="display:none;"></div>
+    <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+        'onsubmit',
+        "productConfigure.onConfirmBtn(); return false;",
+        '#product_composite_configure_form'
+    ) ?>
 
-    <script>
+    <div id="product_composite_configure_confirmed"></div>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+        'display:none;',
+        '#product_composite_configure_confirmed'
+    ) ?>
+
+    <?php $scriptString = <<<script
         require([
             "jquery",
             "mage/mage"
@@ -29,5 +64,12 @@
             jQuery('#product_composite_configure_form').mage('form').mage('validation');
 
         });
-    </script>
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
 </div>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    'display:none',
+    '#product_composite_configure'
+) ?>
+
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/category/new/form.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/category/new/form.phtml
index f12a99e6c7843..85876946fda02 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/category/new/form.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/category/new/form.phtml
@@ -4,8 +4,13 @@
  * See COPYING.txt for license details.
  */
 /* @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\NewCategory */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<div id="<?= $block->escapeHtmlAttr($block->getNameInLayout()) ?>" style="display:none">
+<div id="<?= $block->escapeHtmlAttr($block->getNameInLayout()) ?>">
     <?= $block->getFormHtml() ?>
     <?= $block->getAfterElementHtml() ?>
 </div>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    'display:none',
+    $block->escapeHtmlAttr($block->getNameInLayout())
+) ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options.phtml
index ad38d250a3345..7129190d47fb5 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options.phtml
@@ -3,8 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<?php /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options */ ?>
 
 <div class="fieldset-wrapper" id="product-custom-options-wrapper" data-block="product-custom-options">
     <div class="fieldset-wrapper-title">
@@ -12,14 +14,19 @@
             <span><?= $block->escapeHtml(__('Custom Options')) ?></span>
         </strong>
     </div>
-    <div class="fieldset-wrapper-content" id="product-custom-options-content" data-role="product-custom-options-content">
+    <div class="fieldset-wrapper-content" id="product-custom-options-content"
+         data-role="product-custom-options-content">
         <fieldset class="fieldset">
             <div class="messages">
-                <div class="message message-error" id="dynamic-price-warning" style="display: none;">
+                <div class="message message-error" id="dynamic-price-warning">
                     <div class="message-inner">
-                        <div class="message-content"><?= $block->escapeHtml(__('We can\'t save custom-defined options for bundles with dynamic pricing.')) ?></div>
+                        <div class="message-content">
+                            <?= $block->escapeHtml(__(
+                                'We can\'t save custom-defined options for bundles with dynamic pricing.'
+                            )) ?></div>
                     </div>
                 </div>
+                <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display: none;", '#dynamic-price-warning') ?>
             </div>
 
             <div id="product_options_container" class="sortable-wrapper">
@@ -35,7 +42,7 @@
     </div>
 </div>
 
-<script>
+<?php $scriptString = <<<script
 require(['jquery'], function($){
     var priceType = $('#price_type');
     var priceWarning = $('#dynamic-price-warning');
@@ -43,4 +50,6 @@ require(['jquery'], function($){
         priceWarning.show();
     }
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
index 2f352438297d4..bfc8adcc70107 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
@@ -7,12 +7,11 @@
 <?php
 /** @var $block \Magento\Catalog\Block\Product\Image */
 /** @var $escaper \Magento\Framework\Escaper */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
-<span class="product-image-container"
-      style="width:<?= $escaper->escapeHtmlAttr($block->getWidth()) ?>px;">
-    <span class="product-image-wrapper"
-          style="padding-bottom: <?= ($block->getRatio() * 100) ?>%;">
+<span class="product-image-container">
+    <span class="product-image-wrapper">
         <img class="<?= $escaper->escapeHtmlAttr($block->getClass()) ?>"
             <?php foreach ($block->getCustomAttributes() as $name => $value): ?>
                 <?= $escaper->escapeHtmlAttr($name) ?>="<?= $escaper->escapeHtmlAttr($value) ?>"
@@ -23,3 +22,11 @@
             height="<?= $escaper->escapeHtmlAttr($block->getHeight()) ?>"
             alt="<?= $escaper->escapeHtmlAttr($block->getLabel()) ?>"/></span>
 </span>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    'width:' . $escaper->escapeHtmlAttr($block->getWidth()) . 'px;',
+    'span.product-image-container'
+) ?>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    'padding-bottom: '. ($block->getRatio() * 100) . '%;',
+    'span.product-image-wrapper'
+) ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml
index e83e55ad2a03c..0dce2d978eb38 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml
@@ -3,8 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/* @var $block \Magento\Catalog\Block\Product\View\Options\Type\File */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\File */ ?>
 <?php $_option = $block->getOption(); ?>
 <?php $_fileInfo = $block->getFileInfo(); ?>
 <?php $_fileExists = $_fileInfo->hasData(); ?>
@@ -19,13 +21,13 @@
         <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
         <?= /* @noEscape */ $block->getFormattedPrice() ?>
     </label>
-    <?php if ($_fileExists) :?>
+    <?php if ($_fileExists):?>
     <div class="control">
         <span class="<?= /* @noEscape */ $_fileNamed ?>"><?= $block->escapeHtml($_fileInfo->getTitle()) ?></span>
         <a href="javascript:void(0)" class="label" id="change-<?= /* @noEscape */ $_fileName ?>" >
             <?= $block->escapeHtml(__('Change')) ?>
         </a>
-        <?php if (!$_option->getIsRequire()) :?>
+        <?php if (!$_option->getIsRequire()):?>
             <input type="checkbox" id="delete-<?= /* @noEscape */ $_fileName ?>" />
             <span class="label"><?= $block->escapeHtml(__('Delete')) ?></span>
         <?php endif; ?>
@@ -38,28 +40,36 @@
                 "fieldNameAction":"<?= /* @noEscape */ $_fieldNameAction ?>",
                 "changeFileSelector":"#change-<?= /* @noEscape */ $_fileName ?>",
                 "deleteFileSelector":"#delete-<?= /* @noEscape */ $_fileName ?>"}
-             }'
-            <?= $_fileExists ? 'style="display:none"' : '' ?>>
+             }'>
         <input type="file"
                name="<?= /* @noEscape */ $_fileName ?>"
                id="<?= /* @noEscape */ $_fileName ?>"
                class="product-custom-option<?= $_option->getIsRequire() ? ' required' : '' ?>"
             <?= $_fileExists ? 'disabled="disabled"' : '' ?> />
-        <input type="hidden" name="<?= /* @noEscape */ $_fieldNameAction ?>" value="<?= /* @noEscape */ $_fieldValueAction ?>" />
-        <?php if ($_option->getFileExtension()) :?>
+        <input type="hidden" name="<?= /* @noEscape */ $_fieldNameAction ?>"
+               value="<?= /* @noEscape */ $_fieldValueAction ?>" />
+        <?php if ($_option->getFileExtension()):?>
             <p class="note">
-                <?= $block->escapeHtml(__('Compatible file extensions to upload')) ?>: <strong><?= $block->escapeHtml($_option->getFileExtension()) ?></strong>
+                <?= $block->escapeHtml(__('Compatible file extensions to upload')) ?>:
+                <strong><?= $block->escapeHtml($_option->getFileExtension()) ?></strong>
             </p>
         <?php endif; ?>
-        <?php if ($_option->getImageSizeX() > 0) :?>
+        <?php if ($_option->getImageSizeX() > 0):?>
             <p class="note">
-                <?= $block->escapeHtml(__('Maximum image width')) ?>: <strong><?= (int)$_option->getImageSizeX() ?> <?= $block->escapeHtml(__('px.')) ?></strong>
+                <?= $block->escapeHtml(__('Maximum image width')) ?>:
+                <strong><?= (int)$_option->getImageSizeX() ?> <?= $block->escapeHtml(__('px.')) ?></strong>
             </p>
         <?php endif; ?>
-        <?php if ($_option->getImageSizeY() > 0) :?>
+        <?php if ($_option->getImageSizeY() > 0):?>
             <p class="note">
-                <?= $block->escapeHtml(__('Maximum image height')) ?>: <strong><?= (int)$_option->getImageSizeY() ?> <?= $block->escapeHtml(__('px.')) ?></strong>
+                <?= $block->escapeHtml(__('Maximum image height')) ?>:
+                <strong><?= (int)$_option->getImageSizeY() ?> <?= $block->escapeHtml(__('px.')) ?></strong>
             </p>
         <?php endif; ?>
     </div>
+    <?= $_fileExists ?
+        /* @noEscape */ $secureRenderer->renderStyleAsTag(
+            'display:none',
+            'input-box-' . /* @noEscape */ $_fileName
+        ) : '' ?>
 </div>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml
index cdb12b54e5e67..d5c946621e90d 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml
@@ -5,22 +5,24 @@
  */
 
 /* @var $block \Magento\ConfigurableProduct\Block\Product\Configurable\AttributeSelector */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<script>
+
+<?php $scriptString = <<<script
 (function(){
     'use strict';
-    
-    var $form;
+
+    var _form;
 
     require([
         'jquery',
         'jquery/ui',
         'Magento_Ui/js/modal/modal'
     ], function($){
-        $form = $('[data-role=affected-attribute-set-selector]');
+        _form = $('[data-role=affected-attribute-set-selector]');
         var resetValidation = function() {
-                $form.find('.messages .message.error').hide();
-                $form.find('form').validation().data('validator').resetForm();
+                _form.find('.messages .message.error').hide();
+                _form.find('form').validation().data('validator').resetForm();
             },
             setAttributeSetId = function (id) {
                 $('[data-role=new-variations-attribute-set-id]').val(id);
@@ -31,10 +33,10 @@
             newAttributeSetContainer = $('[data-role=affected-attribute-set-new-name-container]'),
             existingAttributeSetContainer = $('[data-role=affected-attribute-set-existing-name-container]');
 
-        $form.find('input[type=text]').on('keypress',function(e){
+        _form.find('input[type=text]').on('keypress',function(e){
             if(e.keyCode === 13){
                 e.preventDefault();
-                $form.closest('[data-role=modal]').find('button[data-action=confirm]').click();
+                _form.closest('[data-role=modal]').find('button[data-action=confirm]').click();
             }
         });
 
@@ -44,66 +46,67 @@
             'data-role': 'new-variations-attribute-set-id'
         }));
 
-        $form
+        _form
             .modal({
-                title: '<?= $block->escapeJs(__('Choose Affected Attribute Set')) ?>',
+                title: '{$block->escapeJs(__('Choose Affected Attribute Set'))}',
                 closed: function () {
                     resetValidation();
                 },
                 buttons: [{
-                    text: '<?= $block->escapeJs(__('Confirm')) ?>',
+                    text: '{$block->escapeJs(__('Confirm'))}',
                     attr: {
                         'data-action': 'confirm'
                     },
                     'class': 'action-primary',
                     click: function() {
-                        var affectedAttributeSetId = $form.find('input[name=affected-attribute-set]:checked').val();
+                        var affectedAttributeSetId = _form.find('input[name=affected-attribute-set]:checked').val();
                         if (affectedAttributeSetId == 'current') {
                             setAttributeSetId($('#attribute_set_id').val());
-                            closeDialogAndProcessForm($form);
+                            closeDialogAndProcessForm(_form);
                             return;
                         } else if (affectedAttributeSetId == 'existing') {
                             setAttributeSetId($('select', existingAttributeSetContainer).val());
-                            closeDialogAndProcessForm($form);
+                            closeDialogAndProcessForm(form);
                         }
 
-                        $form.find('.messages .message.error').hide();
-                        if (!$form.find('form').validation().valid()) {
-                            $form.find('input[name=new-attribute-set-name]').focus();
+                        _form.find('.messages .message.error').hide();
+                        if (!_form.find('form').validation().valid()) {
+                            _form.find('input[name=new-attribute-set-name]').focus();
                             return false;
                         }
 
                         $.ajax({
                             type: 'POST',
-                            url: '<?= $block->escapeUrl($block->getAttributeSetCreationUrl()) ?>',
+                            url: '{$block->escapeUrl($block->getAttributeSetCreationUrl())}',
                             data: {
                                 gotoEdit: 1,
-                                attribute_set_name: $form.find('input[name=new-attribute-set-name]').val(),
+                                attribute_set_name: _form.find('input[name=new-attribute-set-name]').val(),
                                 skeleton_set: $('#attribute_set_id').val(),
-                                form_key: '<?= $block->escapeJs($block->getFormKey()) ?>',
+                                form_key: '{$block->escapeJs($block->getFormKey())}',
                                 return_session_messages_only: 1
                             },
                             dataType: 'json',
                             showLoader: true,
-                            context: $form
+                            context: _form
                         })
                             .done(function (data) {
                                 if (!data.error) {
                                     setAttributeSetId(data.id);
-                                    closeDialogAndProcessForm($form);
+                                    closeDialogAndProcessForm(_form);
                                 } else {
-                                    $form.find('.messages .message.error').replaceWith($(data.messages).find('.message.error'));
+                                    _form.find('.messages .message.error').replaceWith($(data.messages)
+                                    .find('.message.error'));
                                 }
                             });
 
                         return false;
                     }
                 },{
-                    text: '<?= $block->escapeJs(__('Cancel')) ?>',
-                    id: '<?= $block->escapeJs($block->getJsId('close-button')) ?>',
+                    text: '{$block->escapeJs(__('Cancel'))}',
+                    id: '{$block->escapeJs($block->getJsId('close-button'))}',
                     'class': 'action-close',
                     click: function() {
-                        $form.modal('closeModal');
+                        _form.modal('closeModal');
                     }
                 }]
             })
@@ -117,7 +120,7 @@
                 }
             });
     });
-    
+
     require([
         'jquery'
     ], function ($) {
@@ -127,17 +130,17 @@
          *
          * @return {Array}
          */
-        var getAttributes = function ($node) {
+        var getAttributes = function (_node) {
             return $.map(
-                $node.find('[data-role=configurable-attributes-container] [data-role=attribute-info]') || [],
+                _node.find('[data-role=configurable-attributes-container] [data-role=attribute-info]') || [],
                 function (attribute) {
-                    var $attribute = $(attribute);
+                    var _attribute = $(attribute);
 
                     return {
-                        id: $attribute.find('[name$="[attribute_id]"]').val(),
-                        code: $attribute.find('[name$="[code]"]').val(),
-                        label: $attribute.find('[name$="[label]"]').val(),
-                        position: $attribute.find('[name$="[position]"]').val()
+                        id: _attribute.find('[name$="[attribute_id]"]').val(),
+                        code: _attribute.find('[name$="[code]"]').val(),
+                        label: _attribute.find('[name$="[label]"]').val(),
+                        position: _attribute.find('[name$="[position]"]').val()
                     };
                 }
             );
@@ -170,10 +173,13 @@
 
             event.stopImmediatePropagation();
 
-            $form.data('target', event.target).modal('openModal');
+            _form.data('target', event.target).modal('openModal');
         });
 
     });
 
 })();
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
+
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/stock/disabler.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/stock/disabler.phtml
index fe41f07a4434d..c0f3f8617bd16 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/stock/disabler.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/stock/disabler.phtml
@@ -3,8 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<script>
+
+<?php $scriptString = <<<script
 require(['jquery'], function($){
     $('[data-tab-panel=product-details]').on('stockbeforedisable', function(e) {
         var variations = $('[data-panel=product-variations]');
@@ -14,4 +17,6 @@ require(['jquery'], function($){
         }
     });
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Csp/etc/config.xml b/app/code/Magento/Csp/etc/config.xml
index c13cd37ca0340..68328ac7bc540 100644
--- a/app/code/Magento/Csp/etc/config.xml
+++ b/app/code/Magento/Csp/etc/config.xml
@@ -70,7 +70,7 @@
                     <styles>
                         <policy_id>style-src</policy_id>
                         <self>1</self>
-                        <inline>1</inline>
+                        <inline>0</inline>
                         <eval>0</eval>
                         <dynamic>0</dynamic>
                     </styles>
@@ -170,14 +170,14 @@
                     <styles>
                         <policy_id>style-src</policy_id>
                         <self>1</self>
-                        <inline>1</inline>
+                        <inline>0</inline>
                         <eval>0</eval>
                         <dynamic>0</dynamic>
                     </styles>
                     <scripts>
                         <policy_id>script-src</policy_id>
                         <self>1</self>
-                        <inline>1</inline>
+                        <inline>0</inline>
                         <eval>1</eval>
                         <dynamic>0</dynamic>
                     </scripts>
diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/stock/disabler.phtml b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/stock/disabler.phtml
index 991ef2b5f4c7c..4e62b5539549f 100644
--- a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/stock/disabler.phtml
+++ b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/stock/disabler.phtml
@@ -3,8 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<script>
+
+<?php $scriptString = <<<script
 require(['jquery'], function($){
     $('[data-tab-panel=product-details]').on('stockbeforedisable', function(e) {
         if (e.productType === 'grouped') {
@@ -13,4 +16,6 @@ require(['jquery'], function($){
         }
     });
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
index 30a323eebb736..71fe62c98b9b6 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Tree.php
@@ -36,7 +36,7 @@ class Tree extends Block
      *
      * @var string
      */
-    protected $expandAll = 'a[onclick*=expandTree]';
+    protected $expandAll = 'a#expandAll';
 
     /**
      * Backend abstract block.

From 707297a309600de4c46bb5969913e3126a7fa4bb Mon Sep 17 00:00:00 2001
From: "v.prokopov" <v.prokopov@atwix.com>
Date: Mon, 13 Apr 2020 08:45:22 +0300
Subject: [PATCH 0158/1718] changed count characters in short description line

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

diff --git a/app/code/Magento/CatalogInventory/Model/StockState.php b/app/code/Magento/CatalogInventory/Model/StockState.php
index 1ac9f5dc54478..e28a2096942d4 100644
--- a/app/code/Magento/CatalogInventory/Model/StockState.php
+++ b/app/code/Magento/CatalogInventory/Model/StockState.php
@@ -98,7 +98,7 @@ public function checkQty($productId, $qty, $scopeId = null)
     }
 
     /**
-     * Returns suggested qty that satisfies qty increments/minQty/maxQty/minSaleQty/maxSaleQty conditions else original qty
+     * Returns suggested qty that satisfies qty increments/minQty/maxQty/minSaleQty/maxSaleQty else returns original qty
      *
      * @param int $productId
      * @param float $qty

From d5f73d25565aed193d69987e5fe2cb8982dbfd74 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Tue, 14 Apr 2020 00:05:20 +0300
Subject: [PATCH 0159/1718] MC-29420: Remove event handlers from CE

---
 .../Block/Widget/Form/Element/Gallery.php     |   5 +-
 .../Fieldset/Options/Type/Checkbox.php        |  59 +++++++++-
 .../Composite/Fieldset/Options/Type/Multi.php |  59 +++++++++-
 .../Composite/Fieldset/Options/Type/Radio.php |  63 ++++++++--
 .../Fieldset/Options/Type/Select.php          |  62 ++++++++--
 .../Catalog/Product/Edit/Tab/Attributes.php   |  41 ++++++-
 .../Product/Edit/Tab/Bundle/Option.php        |   3 +
 .../Adminhtml/Sales/Order/Items/Renderer.php  |   9 +-
 .../product/edit/tab/attributes/extend.phtml  |  60 ++++++----
 .../composite/fieldset/options/bundle.phtml   |  24 ++--
 .../templates/product/edit/bundle.phtml       |  28 +++--
 .../product/edit/bundle/option.phtml          |  84 ++++++++-----
 .../edit/bundle/option/selection.phtml        |  75 +++++++-----
 .../creditmemo/create/items/renderer.phtml    | 111 ++++++++++--------
 .../creditmemo/view/items/renderer.phtml      |  75 ++++++------
 .../sales/invoice/create/items/renderer.phtml |  99 ++++++++--------
 .../sales/invoice/view/items/renderer.phtml   |  75 ++++++------
 .../sales/order/view/items/renderer.phtml     | 101 ++++++++--------
 .../shipment/create/items/renderer.phtml      |  66 ++++++-----
 .../sales/shipment/view/items/renderer.phtml  |  66 ++++++-----
 .../Catalog/Block/Product/ListProduct.php     |   3 +
 .../frontend/templates/product/gallery.phtml  |  42 ++++---
 .../frontend/templates/product/list.phtml     |  82 ++++++++-----
 .../templates/product/list/items.phtml        |  51 ++++----
 .../templates/helper/summary_short.phtml      |  24 +++-
 .../templates/product/view/list.phtml         |  33 ++++--
 .../Magento/Framework/View/Helper/Js.php      |  17 ++-
 27 files changed, 937 insertions(+), 480 deletions(-)

diff --git a/app/code/Magento/Backend/Block/Widget/Form/Element/Gallery.php b/app/code/Magento/Backend/Block/Widget/Form/Element/Gallery.php
index 95d3d17f9f342..25ea5b6100e28 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Element/Gallery.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Element/Gallery.php
@@ -9,6 +9,7 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Data\Form\Element\AbstractElement;
 use Magento\Framework\Json\Helper\Data as JsonHelper;
+use Magento\Backend\Block\Template\Context;
 
 /**
  * Backend image gallery item renderer
@@ -29,10 +30,10 @@ class Gallery extends \Magento\Backend\Block\Template implements
     protected $_template = 'Magento_Backend::widget/form/element/gallery.phtml';
 
     /**
-     * @param Template\Context $context
+     * @param Context $context
      * @param array $data
      */
-    public function __construct(Template\Context $context, array $data = [])
+    public function __construct(Context $context, array $data = [])
     {
         $data['jsonHelper'] = ObjectManager::getInstance()->get(JsonHelper::class);
         parent::__construct($context, $data);
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php
index 46db8a9907341..85ddc9c207e8d 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 /**
  * Bundle option checkbox type renderer
  *
@@ -19,18 +22,66 @@ class Checkbox extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Op
      */
     protected $_template = 'Magento_Bundle::product/composite/fieldset/options/type/checkbox.phtml';
 
+    /**
+     * @var SecureHtmlRenderer
+     */
+    protected $secureRenderer;
+
+    /**
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
+     * @param \Magento\Catalog\Helper\Data $catalogData
+     * @param \Magento\Framework\Registry $registry
+     * @param \Magento\Framework\Stdlib\StringUtils $string
+     * @param \Magento\Framework\Math\Random $mathRandom
+     * @param \Magento\Checkout\Helper\Cart $cartHelper
+     * @param \Magento\Tax\Helper\Data $taxData
+     * @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
+     * @param array $data
+     * @param SecureHtmlRenderer|null $htmlRenderer
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        \Magento\Framework\View\Element\Template\Context $context,
+        \Magento\Framework\Json\EncoderInterface $jsonEncoder,
+        \Magento\Catalog\Helper\Data $catalogData,
+        \Magento\Framework\Registry $registry,
+        \Magento\Framework\Stdlib\StringUtils $string,
+        \Magento\Framework\Math\Random $mathRandom,
+        \Magento\Checkout\Helper\Cart $cartHelper,
+        \Magento\Tax\Helper\Data $taxData,
+        \Magento\Framework\Pricing\Helper\Data $pricingHelper,
+        array $data = [],
+        ?SecureHtmlRenderer $htmlRenderer = null
+    ) {
+        parent::__construct(
+            $context,
+            $jsonEncoder,
+            $catalogData,
+            $registry,
+            $string,
+            $mathRandom,
+            $cartHelper,
+            $taxData,
+            $pricingHelper,
+            $data
+        );
+        $this->secureRenderer = $htmlRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+    }
+
     /**
      * @inheritdoc
      */
     public function setValidationContainer($elementId, $containerId)
     {
-        return '<script>
-            document.getElementById(\'' .
+        $scriptString = 'document.getElementById(\'' .
             $elementId .
             '\').advaiceContainer = \'' .
             $containerId .
-            '\';
-            </script>';
+            '\';';
+
+        return /* @noEscape */ $this->secureRenderer->renderTag('script', [], $scriptString, false);
     }
 
     /**
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php
index 629f08dc75106..0b33ad546c5d0 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 /**
  * Bundle option multi select type renderer
  *
@@ -19,18 +22,66 @@ class Multi extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio
      */
     protected $_template = 'Magento_Bundle::product/composite/fieldset/options/type/multi.phtml';
 
+    /**
+     * @var SecureHtmlRenderer
+     */
+    protected $secureRenderer;
+
+    /**
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
+     * @param \Magento\Catalog\Helper\Data $catalogData
+     * @param \Magento\Framework\Registry $registry
+     * @param \Magento\Framework\Stdlib\StringUtils $string
+     * @param \Magento\Framework\Math\Random $mathRandom
+     * @param \Magento\Checkout\Helper\Cart $cartHelper
+     * @param \Magento\Tax\Helper\Data $taxData
+     * @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
+     * @param array $data
+     * @param SecureHtmlRenderer|null $htmlRenderer
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        \Magento\Framework\View\Element\Template\Context $context,
+        \Magento\Framework\Json\EncoderInterface $jsonEncoder,
+        \Magento\Catalog\Helper\Data $catalogData,
+        \Magento\Framework\Registry $registry,
+        \Magento\Framework\Stdlib\StringUtils $string,
+        \Magento\Framework\Math\Random $mathRandom,
+        \Magento\Checkout\Helper\Cart $cartHelper,
+        \Magento\Tax\Helper\Data $taxData,
+        \Magento\Framework\Pricing\Helper\Data $pricingHelper,
+        array $data = [],
+        ?SecureHtmlRenderer $htmlRenderer = null
+    ) {
+        parent::__construct(
+            $context,
+            $jsonEncoder,
+            $catalogData,
+            $registry,
+            $string,
+            $mathRandom,
+            $cartHelper,
+            $taxData,
+            $pricingHelper,
+            $data
+        );
+        $this->secureRenderer = $htmlRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+    }
+
     /**
      * @inheritdoc
      */
     public function setValidationContainer($elementId, $containerId)
     {
-        return '<script>
-            document.getElementById(\'' .
+        $scriptString = 'document.getElementById(\'' .
             $elementId .
             '\').advaiceContainer = \'' .
             $containerId .
-            '\';
-            </script>';
+            '\';';
+
+        return /* @noEscape */ $this->secureRenderer->renderTag('script', [], $scriptString, false);
     }
 
     /**
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php
index 1519b3a67ac97..e5d2e3e830379 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 /**
  * Bundle option radiobox type renderer
  *
@@ -20,18 +23,64 @@ class Radio extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio
     protected $_template = 'Magento_Bundle::product/composite/fieldset/options/type/radio.phtml';
 
     /**
-     * @param  string $elementId
-     * @param  string $containerId
-     * @return string
+     * @var SecureHtmlRenderer
+     */
+    protected $secureRenderer;
+
+    /**
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
+     * @param \Magento\Catalog\Helper\Data $catalogData
+     * @param \Magento\Framework\Registry $registry
+     * @param \Magento\Framework\Stdlib\StringUtils $string
+     * @param \Magento\Framework\Math\Random $mathRandom
+     * @param \Magento\Checkout\Helper\Cart $cartHelper
+     * @param \Magento\Tax\Helper\Data $taxData
+     * @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
+     * @param array $data
+     * @param SecureHtmlRenderer|null $htmlRenderer
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        \Magento\Framework\View\Element\Template\Context $context,
+        \Magento\Framework\Json\EncoderInterface $jsonEncoder,
+        \Magento\Catalog\Helper\Data $catalogData,
+        \Magento\Framework\Registry $registry,
+        \Magento\Framework\Stdlib\StringUtils $string,
+        \Magento\Framework\Math\Random $mathRandom,
+        \Magento\Checkout\Helper\Cart $cartHelper,
+        \Magento\Tax\Helper\Data $taxData,
+        \Magento\Framework\Pricing\Helper\Data $pricingHelper,
+        array $data = [],
+        ?SecureHtmlRenderer $htmlRenderer = null
+    ) {
+        parent::__construct(
+            $context,
+            $jsonEncoder,
+            $catalogData,
+            $registry,
+            $string,
+            $mathRandom,
+            $cartHelper,
+            $taxData,
+            $pricingHelper,
+            $data
+        );
+        $this->secureRenderer = $htmlRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+    }
+
+    /**
+     * @inheritdoc
      */
     public function setValidationContainer($elementId, $containerId)
     {
-        return '<script>
-            document.getElementById(\'' .
+        $scriptString = 'document.getElementById(\'' .
             $elementId .
             '\').advaiceContainer = \'' .
             $containerId .
-            '\';
-            </script>';
+            '\';';
+
+        return /* @noEscape */ $this->secureRenderer->renderTag('script', [], $scriptString, false);
     }
 }
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php
index 502dfa32044a3..0f0f4a62eb7fc 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 /**
  * Bundle option dropdown type renderer
  *
@@ -20,18 +23,63 @@ class Select extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Opti
     protected $_template = 'Magento_Bundle::product/composite/fieldset/options/type/select.phtml';
 
     /**
-     * @param  string $elementId
-     * @param  string $containerId
-     * @return string
+     * @var SecureHtmlRenderer
+     */
+    protected $secureRenderer;
+
+    /**
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
+     * @param \Magento\Catalog\Helper\Data $catalogData
+     * @param \Magento\Framework\Registry $registry
+     * @param \Magento\Framework\Stdlib\StringUtils $string
+     * @param \Magento\Framework\Math\Random $mathRandom
+     * @param \Magento\Checkout\Helper\Cart $cartHelper
+     * @param \Magento\Tax\Helper\Data $taxData
+     * @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
+     * @param array $data
+     * @param SecureHtmlRenderer|null $htmlRenderer
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        \Magento\Framework\View\Element\Template\Context $context,
+        \Magento\Framework\Json\EncoderInterface $jsonEncoder,
+        \Magento\Catalog\Helper\Data $catalogData,
+        \Magento\Framework\Registry $registry,
+        \Magento\Framework\Stdlib\StringUtils $string,
+        \Magento\Framework\Math\Random $mathRandom,
+        \Magento\Checkout\Helper\Cart $cartHelper,
+        \Magento\Tax\Helper\Data $taxData,
+        \Magento\Framework\Pricing\Helper\Data $pricingHelper,
+        array $data = [],
+        ?SecureHtmlRenderer $htmlRenderer = null
+    ) {
+        parent::__construct(
+            $context,
+            $jsonEncoder,
+            $catalogData,
+            $registry,
+            $string,
+            $mathRandom,
+            $cartHelper,
+            $taxData,
+            $pricingHelper,
+            $data
+        );
+        $this->secureRenderer = $htmlRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+    }
+
+    /**
+     * @inheritdoc
      */
     public function setValidationContainer($elementId, $containerId)
     {
-        return '<script>
-            document.getElementById(\'' .
+        $scriptString = 'document.getElementById(\'' .
             $elementId .
             '\').advaiceContainer = \'' .
             $containerId .
-            '\';
-            </script>';
+            '\';';
+
+        return /* @noEscape */ $this->secureRenderer->renderTag('script', [], $scriptString, false);
     }
 }
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php
index 0fe8c38cc4992..f2f62c0914b4a 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php
@@ -6,12 +6,43 @@
 
 namespace Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 /**
  * Bundle product attributes tab
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
  */
 class Attributes extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes
 {
+    /**
+     * @var SecureHtmlRenderer
+     */
+    protected $secureRenderer;
+
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Framework\Registry $registry
+     * @param \Magento\Framework\Data\FormFactory $formFactory
+     * @param array $data
+     * @param SecureHtmlRenderer|null $htmlRenderer
+     */
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Framework\Registry $registry,
+        \Magento\Framework\Data\FormFactory $formFactory,
+        array $data = [],
+        SecureHtmlRenderer $htmlRenderer = null
+    ) {
+        parent::__construct(
+            $context,
+            $registry,
+            $formFactory,
+            $data
+        );
+        $this->secureRenderer = $htmlRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+    }
+
     /**
      * Prepare attributes form of bundle product
      *
@@ -69,9 +100,7 @@ protected function _prepareForm()
 
         $tax = $this->getForm()->getElement('tax_class_id');
         if ($tax) {
-            $tax->setAfterElementHtml(
-                '<script>' .
-                "
+            $scriptString = "
                 require(['prototype'], function(){
                 function changeTaxClassId() {
                     if ($('price_type').value == '" .
@@ -96,8 +125,10 @@ function changeTaxClassId() {
                     changeTaxClassId();
                 }
                 });
-                " .
-                '</script>'
+                ";
+
+            $tax->setAfterElementHtml(
+                /* @noEscape */ $this->secureRenderer->renderTag('script', [], $scriptString, false)
             );
         }
 
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
index 491f6c3fb1096..63542b381d34b 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
@@ -9,6 +9,8 @@
 
 use Magento\Framework\Data\Form\Element\AbstractElement;
 use Magento\Store\Model\Store;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Json\Helper\Data as JsonHelper;
 
 /**
  * Block for rendering option of bundle product
@@ -70,6 +72,7 @@ public function __construct(
         $this->_coreRegistry = $registry;
         $this->_optionTypes = $optionTypes;
         $this->_yesno = $yesno;
+        $data['jsonHelper'] = ObjectManager::getInstance()->get(JsonHelper::class);
         parent::__construct($context, $data);
     }
 
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php b/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
index 82a0086ad67ec..de1caac75e143 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
@@ -7,6 +7,8 @@
 
 use Magento\Catalog\Model\Product\Type\AbstractType;
 use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Json\Helper\Data as JsonHelper;
 
 /**
  * Adminhtml sales order item renderer
@@ -39,9 +41,8 @@ public function __construct(
         array $data = [],
         Json $serializer = null
     ) {
-        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(Json::class);
-
+        $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
+        $data['jsonHelper'] = ObjectManager::getInstance()->get(JsonHelper::class);
         parent::__construct($context, $stockRegistry, $stockConfiguration, $registry, $data);
     }
 
@@ -51,7 +52,7 @@ public function __construct(
      * @param string $value
      * @param int $length
      * @param string $etc
-     * @param string &$remainder
+     * @param string $remainder
      * @param bool $breakWords
      * @return string
      */
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/catalog/product/edit/tab/attributes/extend.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/catalog/product/edit/tab/attributes/extend.phtml
index f028c7013df90..81a6034b9218d 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/catalog/product/edit/tab/attributes/extend.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/catalog/product/edit/tab/attributes/extend.phtml
@@ -5,6 +5,7 @@
  */
 
 /** @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Attributes\Extend */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 $elementHtml = $block->getParentElementHtml();
 
 $attributeCode = $block->getAttribute()
@@ -18,18 +19,19 @@ $isElementReadonly = $block->getElement()
     ->getReadonly();
 ?>
 
-<?php if (!($attributeCode === 'price' && $block->getCanReadPrice() === false)) : ?>
+<?php if (!($attributeCode === 'price' && $block->getCanReadPrice() === false)): ?>
     <div class="<?= $block->escapeHtmlAttr($attributeCode) ?> "><?= /* @noEscape */ $elementHtml ?></div>
 <?php endif; ?>
 
 <?= $block->getExtendedElement($switchAttributeCode)->toHtml() ?>
 
-<?php if (!$isElementReadonly && $block->getDisableChild()) { ?>
-    <script>
+<?php if (!$isElementReadonly && $block->getDisableChild()) {
+    $switchAttributeCode = /* @noEscape */ $switchAttributeCode;
+    $scriptString = <<<script
         require(['prototype'], function () {
-            function <?= /* @noEscape */ $switchAttributeCode ?>_change() {
-                var $attribute = $('<?= $block->escapeJs($attributeCode) ?>');
-                if ($('<?= /* @noEscape */ $switchAttributeCode ?>').value == '<?= $block->escapeJs($block::DYNAMIC) ?>') {
+            function {$switchAttributeCode}_change() {
+                var $attribute = $('{$block->escapeJs($attributeCode)}');
+                if ($('{$switchAttributeCode}').value == '{$block->escapeJs($block::DYNAMIC)}') {
                     if ($attribute) {
                         $attribute.disabled = true;
                         $attribute.value = '';
@@ -40,28 +42,36 @@ $isElementReadonly = $block->getElement()
                     }
                 } else {
                     if ($attribute) {
-                        <?php if ($attributeCode === 'price' && !$block->getCanEditPrice() && $block->getCanReadPrice()
-                                && $block->getProduct()->isObjectNew()) : ?>
-                                        <?php $defaultProductPrice = $block->getDefaultProductPrice() ?: "''"; ?>
-                            $attribute.value = <?= /* @noEscape */ (string)$defaultProductPrice ?>;
-                        <?php else : ?>
-                            $attribute.disabled = false;
-                            $attribute.addClassName('required-entry');
-                        <?php endif; ?>
-                    }
-                    if ($('dynamic-price-warning')) {
-                        $('dynamic-price-warning').hide();
-                    }
+script;
+    if ($attributeCode === 'price' && !$block->getCanEditPrice() &&
+        $block->getCanReadPrice() && $block->getProduct()->isObjectNew()):
+        $defaultProductPrice = $block->getDefaultProductPrice() ?: "''";
+        $scriptString .= '$attribute.value = ' . /* @noEscape */ (string)$defaultProductPrice . ';';
+    else:
+        $scriptString = <<<script
+            $attribute.disabled = false;
+            $attribute.addClassName('required-entry');
+script;
+    endif;
+    $scriptString .= <<<script
+            }
+                if ($('dynamic-price-warning')) {
+                    $('dynamic-price-warning').hide();
                 }
             }
-
-            <?php if (!($attributeCode === 'price' && !$block->getCanEditPrice()
-                    && !$block->getProduct()->isObjectNew())) : ?>
-                $('<?= /* @noEscape */ $switchAttributeCode ?>').observe('change', <?= /* @noEscape */ $switchAttributeCode ?>_change);
-            <?php endif; ?>
+        }
+script;
+    if (!($attributeCode === 'price' && !$block->getCanEditPrice() && !$block->getProduct()->isObjectNew())):
+        $scriptString .= <<<script
+            $('{$switchAttributeCode}').observe('change', {$switchAttributeCode}_change);
+script;
+    endif;
+    $scriptString .= <<<script
             Event.observe(window, 'load', function(){
-                <?= /* @noEscape */ $switchAttributeCode ?>_change();
+                {$switchAttributeCode}_change();
             });
         });
-    </script>
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <?php } ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml
index 53ad0a963244d..91517cf8284dd 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml
@@ -5,22 +5,26 @@
  */
 ?>
 
-<?php /* @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Bundle */ ?>
+<?php
+/* @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Bundle */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+?>
+
 <?php $options = $block->decorateArray($block->getOptions(true)); ?>
-<?php if (count($options)) : ?>
+<?php if (count($options)): ?>
 <fieldset id="catalog_product_composite_configure_fields_bundle"
           class="fieldset admin__fieldset composite-bundle<?= $block->getIsLastFieldset() ? ' last-fieldset' : '' ?>">
     <legend class="legend admin__legend">
         <span><?= $block->escapeHtml(__('Bundle Items')) ?></span>
     </legend><br />
-    <?php foreach ($options as $option) : ?>
-        <?php if ($option->getSelections()) : ?>
+    <?php foreach ($options as $option): ?>
+        <?php if ($option->getSelections()): ?>
             <?= $block->getOptionHtml($option) ?>
         <?php endif; ?>
     <?php endforeach; ?>
 </fieldset>
 
-<script>
+    <?php $scriptString = <<<script
 require([
     "Magento_Catalog/catalog/product/composite/configure"
 ], function(){
@@ -70,8 +74,12 @@ require([
             }
         }
     };
-    ProductConfigure.bundleControl = new BundleControl(<?= /* @noEscape */ $block->getJsonConfig() ?>);
+script;
+    $scriptString .= 'ProductConfigure.bundleControl = new BundleControl(' . /* @noEscape */ $block->getJsonConfig() .
+     ');';
+    $scriptString .= <<<script
 });
-</script>
-
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle.phtml
index c8ab6cc5b98d2..89c0f930e21c2 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle.phtml
@@ -5,27 +5,29 @@
  */
 
 /** @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<script>
 
+<?php $scriptString = <<<script
 if(typeof Bundle=='undefined') {
     Bundle = {};
 }
-
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 
 <div id="bundle_product_container" class="entry-edit form-inline">
     <fieldset class="fieldset">
         <div class="field field-ship-bundle-items">
             <label for="shipment_type" class="label"><?= $block->escapeHtml(__('Ship Bundle Items')) ?></label>
             <div class="control">
-                <select <?php if ($block->isReadonly()) : ?>disabled="disabled" <?php endif;?>
+                <select <?php if ($block->isReadonly()): ?>disabled="disabled" <?php endif;?>
                         id="shipment_type"
                         name="<?= $block->escapeHtmlAttr($block->getFieldSuffix()) ?>[shipment_type]"
                         class="select">
                     <option value="1"><?= $block->escapeHtml(__('Separately')) ?></option>
                     <option value="0"
-                        <?php if ($block->getProduct()->getShipmentType() == 0) : ?>
+                        <?php if ($block->getProduct()->getShipmentType() == 0): ?>
                             selected="selected"
                         <?php endif; ?>
                     >
@@ -47,18 +49,24 @@ if(typeof Bundle=='undefined') {
 
 <input type="hidden" name="affect_bundle_product_selections" value="1" />
 
-<script>
+<?php $scriptString = <<<script
+
 require(["prototype", "mage/adminhtml/form"], function(){
     // re-bind form elements onchange
     varienWindowOnload(true);
-
-    <?php if ($block->isReadonly()) :?>
+script;
+if ($block->isReadonly()):
+    $scriptString .= <<<script
     $('product_bundle_container').select('input', 'select', 'textarea', 'button').each(function(input){
         input.disabled = true;
         if (input.tagName.toLowerCase() == 'button') {
             input.addClassName('disabled');
         }
     });
-    <?php endif; ?>
+script;
+endif;
+$scriptString .= <<<script
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml
index 4d68d363b7484..4582de57a8b4a 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml
@@ -5,12 +5,15 @@
  */
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 /** @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <script id="bundle-option-template" type="text/x-magento-template">
     <div id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>" class="option-box">
-        <div class="fieldset-wrapper admin__collapsible-block-wrapper opened" id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>-wrapper">
+        <div class="fieldset-wrapper admin__collapsible-block-wrapper opened"
+             id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>-wrapper">
             <div class="fieldset-wrapper-title">
-                <strong class="admin__collapsible-title" data-toggle="collapse" data-target="#<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>-content">
+                <strong class="admin__collapsible-title" data-toggle="collapse"
+                        data-target="#<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>-content">
                     <span><%- data.default_title %></span>
                 </strong>
                 <div class="actions">
@@ -18,55 +21,67 @@
                 </div>
                 <div data-role="draggable-handle" class="draggable-handle"></div>
             </div>
-            <div class="fieldset-wrapper-content in collapse" id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>-content">
+            <div class="fieldset-wrapper-content in collapse"
+                 id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>-content">
                 <fieldset class="fieldset">
                     <fieldset class="fieldset-alt">
                         <div class="field field-option-title required">
-                            <label class="label" for="id_<?= $block->escapeHtmlAttr($block->getFieldName()) ?>_<%- data.index %>_title">
+                            <label class="label" for="id_<?= $block->escapeHtmlAttr($block->getFieldName())
+                            ?>_<%- data.index %>_title">
                                 <?= $block->escapeHtml(__('Option Title')) ?>
                             </label>
                             <div class="control">
-                                <?php if ($block->isDefaultStore()) : ?>
+                                <?php if ($block->isDefaultStore()): ?>
                                 <input class="input-text required-entry"
                                        type="text"
-                                       name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.index %>][title]"
-                                       id="id_<?= $block->escapeHtmlAttr($block->getFieldName()) ?>_<%- data.index %>_title"
+                                       name="<?= $block->escapeHtmlAttr($block->getFieldName())
+                                        ?>[<%- data.index %>][title]"
+                                       id="id_<?= $block->escapeHtmlAttr($block->getFieldName())
+                                        ?>_<%- data.index %>_title"
                                        value="<%- data.title %>"
                                        data-original-value="<%- data.title %>" />
-                                <?php else : ?>
+                                <?php else: ?>
                                 <input class="input-text required-entry"
                                        type="text"
-                                       name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.index %>][default_title]"
-                                       id="id_<?= $block->escapeHtmlAttr($block->getFieldName()) ?>_<%- data.index %>_default_title"
+                                       name="<?= $block->escapeHtmlAttr($block->getFieldName())
+                                        ?>[<%- data.index %>][default_title]"
+                                       id="id_<?= $block->escapeHtmlAttr($block->getFieldName())
+                                        ?>_<%- data.index %>_default_title"
                                        value="<%- data.default_title %>"
                                        data-original-value="<%- data.default_title %>" />
                                 <?php endif; ?>
                                 <input type="hidden"
                                        id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_id_<%- data.index %>"
-                                       name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.index %>][option_id]"
+                                       name="<?= $block->escapeHtmlAttr($block->getFieldName())
+                                        ?>[<%- data.index %>][option_id]"
                                        value="<%- data.option_id %>" />
                                 <input type="hidden"
-                                       name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.index %>][delete]"
+                                       name="<?= $block->escapeHtmlAttr($block->getFieldName())
+                                        ?>[<%- data.index %>][delete]"
                                        value=""
                                        data-state="deleted" />
                             </div>
                         </div>
-                        <?php if (!$block->isDefaultStore()) : ?>
+                        <?php if (!$block->isDefaultStore()): ?>
                         <div class="field field-option-store-view required">
-                            <label class="label" for="id_<?= $block->escapeHtmlAttr($block->getFieldName()) ?>_<%- data.index %>_title_store">
+                            <label class="label" for="id_<?= $block->escapeHtmlAttr($block->getFieldName())
+                            ?>_<%- data.index %>_title_store">
                                 <?= $block->escapeHtml(__('Store View Title')) ?>
                             </label>
                             <div class="control">
                                 <input class="input-text required-entry"
                                        type="text"
-                                       name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.index %>][title]"
-                                       id="id_<?= $block->escapeHtmlAttr($block->getFieldName()) ?>_<%- data.index %>_title_store"
+                                       name="<?= $block->escapeHtmlAttr($block->getFieldName())
+                                        ?>[<%- data.index %>][title]"
+                                       id="id_<?= $block->escapeHtmlAttr($block->getFieldName())
+                                        ?>_<%- data.index %>_title_store"
                                        value="<%- data.title %>" />
                             </div>
                         </div>
                         <?php endif; ?>
                         <div class="field field-option-input-type required">
-                            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId() . '_<%- data.index %>_type') ?>">
+                            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId() .
+                                '_<%- data.index %>_type') ?>">
                                 <?= $block->escapeHtml(__('Input Type')) ?>
                             </label>
                             <div class="control">
@@ -82,9 +97,13 @@
                                 <label for="field-option-req">
                                     <?= $block->escapeHtml(__('Required')) ?>
                                 </label>
-                                <span style="display:none"><?= $block->getRequireSelectHtml() ?></span>
+                                <span><?= $block->getRequireSelectHtml() ?></span>
                             </div>
                         </div>
+                        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                            'display:none',
+                            'div.field.field-option-req span'
+                        ) ?>
                         <div class="field field-option-position no-display">
                             <label class="label" for="field-option-position">
                                 <?= $block->escapeHtml(__('Position')) ?>
@@ -92,7 +111,8 @@
                             <div class="control">
                                 <input class="input-text validate-zero-or-greater"
                                        type="text"
-                                       name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.index %>][position]"
+                                       name="<?= $block->escapeHtmlAttr($block->getFieldName())
+                                        ?>[<%- data.index %>][position]"
                                        value="<%- data.position %>"
                                        id="field-option-position" />
                             </div>
@@ -106,13 +126,16 @@
                 </fieldset>
             </div>
         </div>
-        <div id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_search_<%- data.index %>" class="selection-search"></div>
+        <div id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_search_<%- data.index %>"
+             class="selection-search">
+        </div>
     </div>
 </script>
 
 <?= $block->getSelectionHtml() ?>
 
-<script>
+<?php $helper = $block->getData('jsonHelper');
+$scriptString = <<<script
 require([
     'jquery',
     'mage/template',
@@ -140,7 +163,7 @@ function changeInputType(oldObject, oType) {
 
 Bundle.Option = Class.create();
 Bundle.Option.prototype = {
-    idLabel : '<?= $block->escapeJs($block->getFieldId()) ?>',
+    idLabel : '{$block->escapeJs($block->getFieldId())}',
     templateText : '',
     itemsCount : 0,
     initialize : function(template) {
@@ -149,7 +172,9 @@ Bundle.Option.prototype = {
 
     add : function(data) {
         if (!data) {
-            data = <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode(['default_title' => __('New Option')]) ?>;
+script;
+$scriptString .= 'data = ' . $helper->jsonEncode(['default_title' => __('New Option')]) . ';';
+$scriptString .= <<<script
         } else {
             data.title = data.title.replace(/</g, "&lt;");
             data.title = data.title.replace(/"/g, "&quot;");
@@ -278,19 +303,21 @@ Bundle.Option.prototype = {
 
 var optionIndex = 0;
 bOption = new Bundle.Option(optionTemplate);
-<?php
+script;
+
 foreach ($block->getOptions() as $_option) {
     /** @var $_option \Magento\Bundle\Model\Option */
-    /* @noEscape */ echo 'optionIndex = bOption.add(', $_option->toJson(), ');', PHP_EOL;
+    $scriptString .= /* @noEscape */ 'optionIndex = bOption.add('. $_option->toJson() . ');' . PHP_EOL;
     if ($_option->getSelections()) {
         foreach ($_option->getSelections() as $_selection) {
             /** @var $_selection \Magento\Catalog\Model\Product */
             $_selection->setName($block->escapeHtml($_selection->getName()));
-            /* @noEscape */ echo 'bSelection.addRow(optionIndex,', $_selection->toJson(), ');', PHP_EOL;
+            $scriptString .= /* @noEscape */ 'bSelection.addRow(optionIndex,' . $_selection->toJson() . ');' . PHP_EOL;
         }
     }
 }
 ?>
+$scriptString .= <<<script
 function togglePriceType() {
     bOption['priceType' + ($('price_type').value == '1' ? 'Fixed' : 'Dynamic')]();
 }
@@ -304,7 +331,10 @@ jQuery(window).on('load', function() {
 });
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
+
 <script type="text/x-magento-init">
     {
         "*": {
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml
index 0f1167f3d3eaa..4ada5496ab5a7 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml
@@ -5,6 +5,7 @@
  */
 
 /** @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option\Selection */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <script id="bundle-option-selection-box-template" type="text/x-magento-template">
     <table class="admin__control-table">
@@ -14,15 +15,16 @@
                 <th class="col-default"><?= $block->escapeHtml(__('Default')) ?></th>
                 <th class="col-name"><?= $block->escapeHtml(__('Name')) ?></th>
                 <th class="col-sku"><?= $block->escapeHtml(__('SKU')) ?></th>
-            <?php if ($block->getCanReadPrice() !== false) : ?>
+            <?php if ($block->getCanReadPrice() !== false): ?>
                 <th class="col-price price-type-box"><?= $block->escapeHtml(__('Price')) ?></th>
                 <th class="col-price price-type-box"><?= $block->escapeHtml(__('Price Type')) ?></th>
             <?php endif; ?>
                 <th class="col-qty"><?= $block->escapeHtml(__('Default Quantity')) ?></th>
                 <th class="col-uqty qty-box"><?= $block->escapeHtml(__('User Defined')) ?></th>
-                <th class="col-order type-order" style="display:none"><?= $block->escapeHtml(__('Position')) ?></th>
+                <th class="col-order type-order"><?= $block->escapeHtml(__('Position')) ?></th>
                 <th class="col-actions"></th>
             </tr>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display:none', 'th.col-order.type-order') ?>
         </thead>
         <tbody>
         </tbody>
@@ -33,16 +35,20 @@
         <span data-role="draggable-handle" class="draggable-handle"></span>
         <input type="hidden"
                id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_id<%- data.index %>"
-               name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][selection_id]"
+               name="<?= $block->escapeHtmlAttr($block->getFieldName())
+                ?>[<%- data.parentIndex %>][<%- data.index %>][selection_id]"
                value="<%- data.selection_id %>"/>
         <input type="hidden"
-               name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][option_id]"
+               name="<?= $block->escapeHtmlAttr($block->getFieldName())
+                ?>[<%- data.parentIndex %>][<%- data.index %>][option_id]"
                value="<%- data.option_id %>"/>
         <input type="hidden"
                class="product"
-               name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][product_id]"
+               name="<?= $block->escapeHtmlAttr($block->getFieldName())
+                ?>[<%- data.parentIndex %>][<%- data.index %>][product_id]"
                value="<%- data.product_id %>"/>
-        <input type="hidden" name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][delete]"
+        <input type="hidden" name="<?= $block->escapeHtmlAttr($block->getFieldName())
+        ?>[<%- data.parentIndex %>][<%- data.index %>][delete]"
                value=""
                class="delete"/>
     </td>
@@ -50,19 +56,21 @@
         <input onclick="bSelection.checkGroup(event)"
                type="<%- data.option_type %>"
                class="default"
-               name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][is_default]"
+               name="<?= $block->escapeHtmlAttr($block->getFieldName())
+                ?>[<%- data.parentIndex %>][<%- data.index %>][is_default]"
                value="1" <%- data.checked %> />
     </td>
     <td class="col-name"><%- data.name %></td>
     <td class="col-sku"><%- data.sku %></td>
-<?php if ($block->getCanReadPrice() !== false) : ?>
+<?php if ($block->getCanReadPrice() !== false): ?>
     <td class="col-price price-type-box">
         <input id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>_price_value"
                class="input-text required-entry validate-zero-or-greater"
                type="text"
-               name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][selection_price_value]"
+               name="<?= $block->escapeHtmlAttr($block->getFieldName())
+                ?>[<%- data.parentIndex %>][<%- data.index %>][selection_price_value]"
                value="<%- data.selection_price_value %>"
-            <?php if ($block->getCanEditPrice() === false) : ?>
+            <?php if ($block->getCanEditPrice() === false): ?>
                disabled="disabled"
             <?php endif; ?>/>
     </td>
@@ -70,42 +78,51 @@
         <?= $block->getPriceTypeSelectHtml() ?>
         <div><?= $block->getCheckboxScopeHtml() ?></div>
     </td>
-<?php else : ?>
+<?php else: ?>
     <input type="hidden"
            id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>_price_value"
-           name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][selection_price_value]" value="0" />
+           name="<?= $block->escapeHtmlAttr($block->getFieldName())
+            ?>[<%- data.parentIndex %>][<%- data.index %>][selection_price_value]" value="0" />
     <input type="hidden"
            id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>_price_type"
-           name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][selection_price_type]" value="0" />
-    <?php if ($block->isUsedWebsitePrice()) : ?>
+           name="<?= $block->escapeHtmlAttr($block->getFieldName())
+            ?>[<%- data.parentIndex %>][<%- data.index %>][selection_price_type]" value="0" />
+    <?php if ($block->isUsedWebsitePrice()): ?>
     <input type="hidden"
            id="<?= $block->escapeHtmlAttr($block->getFieldId()) ?>_<%- data.index %>_price_scope"
-           name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][default_price_scope]" value="1" />
+           name="<?= $block->escapeHtmlAttr($block->getFieldName())
+            ?>[<%- data.parentIndex %>][<%- data.index %>][default_price_scope]" value="1" />
     <?php endif; ?>
 <?php endif; ?>
     <td class="col-qty">
         <input class="input-text required-entry validate-greater-zero-based-on-option validate-zero-or-greater"
                type="text"
-               name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][selection_qty]"
+               name="<?= $block->escapeHtmlAttr($block->getFieldName())
+                ?>[<%- data.parentIndex %>][<%- data.index %>][selection_qty]"
                value="<%- data.selection_qty %>" />
     </td>
     <td class="col-uqty qty-box">
         <input type="checkbox" class="is-user-defined-qty" checked="checked" />
-        <span style="display:none"><?= $block->getQtyTypeSelectHtml() ?></span>
+        <span><?= $block->getQtyTypeSelectHtml() ?></span>
     </td>
-    <td class="col-order type-order" style="display:none">
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display:none', 'td.col-uqty.qty-box span') ?>
+    <td class="col-order type-order"">
         <input class="input-text required-entry validate-zero-or-greater"
                type="text"
-               name="<?= $block->escapeHtmlAttr($block->getFieldName()) ?>[<%- data.parentIndex %>][<%- data.index %>][position]"
+               name="<?= $block->escapeHtmlAttr($block->getFieldName())
+                ?>[<%- data.parentIndex %>][<%- data.index %>][position]"
                value="<%- data.position %>" />
     </td>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display:none', 'td.col-order.type-order') ?>
     <td class="col-actions">
         <span title="Delete Row">
             <?= $block->getSelectionDeleteButtonHtml() ?>
         </span>
     </td>
 </script>
-<script>
+
+<?php $isUsedWebsitePrice = (int)$block->isUsedWebsitePrice();
+$scriptString = <<<script
 require([
     'jquery',
     'mage/template',
@@ -116,8 +133,8 @@ var bundleTemplateBox = jQuery('#bundle-option-selection-box-template').html(),
 
 Bundle.Selection = Class.create();
 Bundle.Selection.prototype = {
-    idLabel : '<?= $block->escapeJs($block->getFieldId()) ?>',
-    scopePrice : <?= (int)$block->isUsedWebsitePrice() ?>,
+    idLabel : '{$block->escapeJs($block->getFieldId())}',
+    scopePrice : {$isUsedWebsitePrice},
     templateBox : '',
     templateRow : '',
     itemsCount : 0,
@@ -125,12 +142,14 @@ Bundle.Selection.prototype = {
     gridSelection: new Hash(),
     gridRemoval: new Hash(),
     gridSelectedProductSkus: [],
-    selectionSearchUrl: '<?= $block->escapeUrl($block->getSelectionSearchUrl()) ?>',
+    selectionSearchUrl: '{$block->escapeJs($block->getSelectionSearchUrl())}',
 
     initialize : function() {
-        this.templateBox = '<div class="tier form-list" id="' + this.idLabel + '_box_<%- data.parentIndex %>">' + bundleTemplateBox + '</div>';
+        this.templateBox = '<div class="tier form-list"
+         id="' + this.idLabel + '_box_<%- data.parentIndex %>">' + bundleTemplateBox + '</div>';
 
-        this.templateRow = '<tr class="selection" id="' + this.idLabel + '_row_<%- data.index %>">' + bundleTemplateRow + '</tr>';
+        this.templateRow = '<tr class="selection"
+         id="' + this.idLabel + '_row_<%- data.index %>">' + bundleTemplateRow + '</tr>';
     },
 
     gridUpdateCallback: function () {
@@ -197,7 +216,7 @@ Bundle.Selection.prototype = {
         var escapedHTML = this.template({
             data: data
         }).replace(/<(\/?)script/g, '&lt;$1script');
-        
+
         Element.insert(tbody[0], {bottom: escapedHTML});
 
         if (data.selection_price_type) {
@@ -366,4 +385,6 @@ Bundle.Selection.prototype = {
 bSelection = new Bundle.Selection();
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml
index c480d9b126da6..f42e1eb070479 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml
@@ -10,28 +10,32 @@
  * @see \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer
  */
 /** @var $block \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
 <?php $_item = $block->getItem() ?>
 <?php $items = $block->getChildren($_item); ?>
 <?php $_count = count($items) ?>
 <?php $_index = 0 ?>
+<?php $helper = $block->getData('jsonHelper') ?>
 
 <?php $_prevOptionId = '' ?>
 
-<?php if ($block->getOrderOptions() || $_item->getDescription()) : ?>
+<?php if ($block->getOrderOptions() || $_item->getDescription()): ?>
     <?php $_showlastRow = true ?>
-<?php else : ?>
+<?php else: ?>
     <?php $_showlastRow = false ?>
 <?php endif; ?>
 
-<?php foreach ($items as $_item) : ?>
+<?php foreach ($items as $_item): ?>
     <?php $block->setPriceDataObject($_item) ?>
     <?php $attributes = $block->getSelectionAttributes($_item) ?>
-    <?php if ($_item->getOrderItem()->getParentItem()) : ?>
-        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
+    <?php if ($_item->getOrderItem()->getParentItem()): ?>
+        <?php if ($_prevOptionId != $attributes['option_id']): ?>
         <tr>
-            <td class="col-product"><div class="option-label"><?= $block->escapeHtml($attributes['option_label']) ?></div></td>
+            <td class="col-product">
+                <div class="option-label"><?= $block->escapeHtml($attributes['option_label']) ?></div>
+            </td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
@@ -45,160 +49,165 @@
         <?php endif; ?>
     <?php endif; ?>
     <tr<?= (++$_index == $_count && !$_showlastRow) ? ' class="border"' : '' ?>>
-        <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
+        <?php if (!$_item->getOrderItem()->getParentItem()): ?>
         <td class="col-product">
             <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
             <div class="product-sku-block">
                 <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
-                <?= /* @noEscape */ implode('<br />', $this->helper(Magento\Catalog\Helper\Data::class)->splitSku($_item->getSku())) ?>
+                <?= /* @noEscape */ implode('<br />', $helper->splitSku($_item->getSku())) ?>
             </div>
         </td>
-        <?php else : ?>
+        <?php else: ?>
         <td class="col-product"><div class="option-value"><?= $block->getValueHtml($_item) ?></div></td>
         <?php endif; ?>
         <td class="col-price">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?= $block->getColumnHtml($_item, 'price') ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-ordered-qty">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
                 <table class="qty-table">
                     <tr>
                         <th><?= $block->escapeHtml(__('Ordered')) ?></th>
                         <td><?= (float)$_item->getOrderItem()->getQtyOrdered() * 1 ?></td>
                     </tr>
-                    <?php if ((float) $_item->getOrderItem()->getQtyInvoiced()) : ?>
+                    <?php if ((float) $_item->getOrderItem()->getQtyInvoiced()): ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Invoiced')) ?></th>
                         <td><?= (float)$_item->getOrderItem()->getQtyInvoiced() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
-                    <?php if ((float) $_item->getOrderItem()->getQtyShipped() && $block->isShipmentSeparately($_item)) : ?>
+                    <?php if ((float) $_item->getOrderItem()->getQtyShipped() &&
+                        $block->isShipmentSeparately($_item)): ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Shipped')) ?></th>
                         <td><?= (float)$_item->getOrderItem()->getQtyShipped() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
-                    <?php if ((float) $_item->getOrderItem()->getQtyRefunded()) : ?>
+                    <?php if ((float) $_item->getOrderItem()->getQtyRefunded()): ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Refunded')) ?></th>
                         <td><?= (float)$_item->getOrderItem()->getQtyRefunded() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
-                    <?php if ((float) $_item->getOrderItem()->getQtyCanceled()) : ?>
+                    <?php if ((float) $_item->getOrderItem()->getQtyCanceled()): ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Canceled')) ?></th>
                         <td><?= (float)$_item->getOrderItem()->getQtyCanceled() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
-            <?php elseif ($block->isShipmentSeparately($_item)) : ?>
+            <?php elseif ($block->isShipmentSeparately($_item)): ?>
                 <table class="qty-table">
                     <tr>
                         <th><?= $block->escapeHtml(__('Ordered')) ?></th>
                         <td><?= (float)$_item->getOrderItem()->getQtyOrdered() * 1 ?></td>
                     </tr>
-                    <?php if ((float) $_item->getOrderItem()->getQtyShipped()) : ?>
+                    <?php if ((float) $_item->getOrderItem()->getQtyShipped()): ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Shipped')) ?></th>
                         <td><?= (float)$_item->getOrderItem()->getQtyShipped() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
-        <?php if ($block->canParentReturnToStock($_item)) : ?>
+        <?php if ($block->canParentReturnToStock($_item)): ?>
         <td class="col-return-to-stock">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
-                <?php if ($block->canReturnItemToStock($_item)) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
+                <?php if ($block->canReturnItemToStock($_item)): ?>
                     <input type="checkbox"
                            class="admin__control-checkbox"
-                           name="creditmemo[items][<?= $block->escapeHtmlAttr($_item->getOrderItemId()) ?>][back_to_stock]"
-                           value="1"<?php if ($_item->getBackToStock()) :?> checked="checked"<?php endif;?> />
+                           name="creditmemo[items][<?= $block->escapeHtmlAttr($_item->getOrderItemId())
+                            ?>][back_to_stock]"
+                           value="1"<?php if ($_item->getBackToStock()):?> checked="checked"<?php endif;?> />
                     <label class="admin__field-label"></label>
                 <?php endif; ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <?php endif; ?>
         <td class="col-refund col-qty">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
-                <?php if ($block->canEditQty()) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
+                <?php if ($block->canEditQty()): ?>
                     <input type="text"
                            class="input-text admin__control-text qty-input"
                            name="creditmemo[items][<?= $block->escapeHtmlAttr($_item->getOrderItemId()) ?>][qty]"
                            value="<?= (float)$_item->getQty() * 1 ?>" />
-                <?php else : ?>
+                <?php else: ?>
                     <?= (float)$_item->getQty() * 1 ?>
                 <?php endif; ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-subtotal">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?= $block->getColumnHtml($_item, 'subtotal') ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-tax-amount">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?= /* @noEscape */ $block->displayPriceAttribute('tax_amount') ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-discont">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?= /* @noEscape */ $block->displayPriceAttribute('discount_amount') ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-total last">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?= $block->getColumnHtml($_item, 'total') ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
     </tr>
 <?php endforeach; ?>
-<?php if ($_showlastRow) : ?>
+<?php if ($_showlastRow): ?>
     <tr class="border">
         <td class="col-product">
-            <?php if ($block->getOrderOptions($_item->getOrderItem())) : ?>
+            <?php if ($block->getOrderOptions($_item->getOrderItem())): ?>
                 <dl class="item-options">
-                <?php foreach ($block->getOrderOptions($_item->getOrderItem()) as $option) : ?>
+                <?php foreach ($block->getOrderOptions($_item->getOrderItem()) as $option): ?>
                     <dt><?= $block->escapeHtml($option['label']) ?></dt>
                     <dd>
-                    <?php if (isset($option['custom_view']) && $option['custom_view']) : ?>
+                    <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
                         <?= $block->escapeHtml($option['value']) ?>
-                    <?php else : ?>
+                    <?php else: ?>
                         <?= $block->escapeHtml($block->truncateString($option['value'], 55, '', $_remainder)) ?>
-                        <?php if ($_remainder) :?>
-                            ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
-                            <script>
+                        <?php if ($_remainder):?>
+                            ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid())
+                            ?>"><?= $block->escapeHtml($_remainder) ?></span>
+                            <?php $escapedId = /* @noEscape */ $block->escapeJs($_id);
+                            $scriptString = <<<script
                                 require(['prototype'], function(){
-                                    <?php $escapedId = $block->escapeJs($_id) ?>
-                                    $('<?= /* @noEscape */ $escapedId ?>').hide();
-                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $escapedId ?>').show();});
-                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $escapedId ?>').hide();});
+                                    $('{$escapedId}').hide();
+                                    $('{$escapedId}').up().observe('mouseover', function(){\$('{$escapedId}').show();});
+                                    $('{$escapedId}').up().observe('mouseout',  function(){\$('{$escapedId}').hide();});
                                 });
-                            </script>
+script;
+                            ?>
+                            <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
                         <?php endif;?>
                     <?php endif;?>
                     </dd>
                 <?php endforeach; ?>
                 </dl>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
             <?= $block->escapeHtml($_item->getDescription()) ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml
index 0d54e1528dfe9..49df0468ec992 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml
@@ -10,28 +10,32 @@
  * @see \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer
  */
 /** @var $block \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
 <?php $_item = $block->getItem() ?>
 <?php $items = $block->getChildren($_item); ?>
 <?php $_count = count($items) ?>
 <?php $_index = 0 ?>
+<?php $helper = $block->getData('jsonHelper') ?>
 
 <?php $_prevOptionId = '' ?>
 
-<?php if ($block->getOrderOptions() || $_item->getDescription()) : ?>
+<?php if ($block->getOrderOptions() || $_item->getDescription()): ?>
     <?php $_showlastRow = true ?>
-<?php else : ?>
+<?php else: ?>
     <?php $_showlastRow = false ?>
 <?php endif; ?>
 
-<?php foreach ($items as $_item) : ?>
+<?php foreach ($items as $_item): ?>
     <?php $block->setPriceDataObject($_item) ?>
     <?php $attributes = $block->getSelectionAttributes($_item) ?>
-    <?php if ($_item->getOrderItem()->getParentItem()) : ?>
-        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
+    <?php if ($_item->getOrderItem()->getParentItem()): ?>
+        <?php if ($_prevOptionId != $attributes['option_id']): ?>
         <tr>
-            <td class="col-product"><div class="option-label"><?= $block->escapeHtml($attributes['option_label']) ?></div></td>
+            <td class="col-product">
+                <div class="option-label"><?= $block->escapeHtml($attributes['option_label']) ?></div>
+            </td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
@@ -43,83 +47,86 @@
         <?php endif; ?>
     <?php endif; ?>
     <tr<?= (++$_index == $_count && !$_showlastRow) ? ' class="border"' : '' ?>>
-        <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
+        <?php if (!$_item->getOrderItem()->getParentItem()): ?>
         <td class="col-product">
             <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
             <div class="product-sku-block">
                 <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
-                <?= /* @noEscape */ implode('<br />', $this->helper(Magento\Catalog\Helper\Data::class)->splitSku($_item->getSku())) ?>
+                <?= /* @noEscape */ implode('<br />', $helper->splitSku($_item->getSku())) ?>
             </div>
         </td>
-        <?php else : ?>
+        <?php else: ?>
         <td class="col-product"><div class="option-value"><?= $block->getValueHtml($_item) ?></div></td>
         <?php endif; ?>
         <td class="col-price">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?= $block->getColumnHtml($_item, 'price') ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-qty">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?= (float)$_item->getQty() * 1 ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-subtotal">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?= $block->getColumnHtml($_item, 'subtotal') ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-tax">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?= /* @noEscape */ $block->displayPriceAttribute('tax_amount') ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-discount">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?= /* @noEscape */ $block->displayPriceAttribute('discount_amount') ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-total last">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?= $block->getColumnHtml($_item, 'total') ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
     </tr>
 <?php endforeach; ?>
-<?php if ($_showlastRow) : ?>
+<?php if ($_showlastRow): ?>
     <tr class="border">
         <td class="col-product">
-            <?php if ($block->getOrderOptions()) : ?>
+            <?php if ($block->getOrderOptions()): ?>
                 <dl class="item-options">
-                <?php foreach ($block->getOrderOptions() as $option) : ?>
+                <?php foreach ($block->getOrderOptions() as $option): ?>
                     <dt><?= $block->escapeHtml($option['label']) ?></dt>
                     <dd>
-                    <?php if (isset($option['custom_view']) && $option['custom_view']) : ?>
+                    <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
                         <?= $block->escapeHtml($option['value']) ?>
-                    <?php else : ?>
+                    <?php else: ?>
                         <?= $block->escapeHtml($block->truncateString($option['value'], 55, '', $_remainder)) ?>
-                        <?php if ($_remainder) :?>
-                            ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
-                            <script>
+                        <?php if ($_remainder):?>
+                            ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid())
+                            ?>"><?= $block->escapeHtml($_remainder) ?></span>
+                            <?php $escapedId = /* @noEscape */ $block->escapeJs($_id);
+                            $scriptString = <<<script
                                 require(['prototype'], function(){
-                                    <?php $escapedId = $block->escapeJs($_id) ?>
-                                    $('<?= /* @noEscape */ $escapedId ?>').hide();
-                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $escapedId ?>').show();});
-                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $escapedId ?>').hide();});
+                                    $('{$escapedId}').hide();
+                                    $('{$escapedId}').up().observe('mouseover', function(){\$('{$escapedId}').show();});
+                                    $('{$escapedId}').up().observe('mouseout',  function(){\$('{$escapedId}').hide();});
                                 });
-                            </script>
+script;
+                            ?>
+                            <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
                         <?php endif;?>
                     <?php endif;?>
                     </dd>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml
index a7d49b4b3530a..2bcede5899e56 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml
@@ -10,37 +10,41 @@
  * @see \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer
  */
 /** @var $block \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
 <?php $_item = $block->getItem() ?>
 <?php $items = $block->getChildren($_item); ?>
 <?php $_count = count($items) ?>
 <?php $_index = 0 ?>
+<?php $helper = $block->getData('jsonHelper') ?>
 
 <?php $_prevOptionId = '' ?>
 
-<?php if ($block->getOrderOptions() || $_item->getDescription()) : ?>
+<?php if ($block->getOrderOptions() || $_item->getDescription()): ?>
     <?php $_showlastRow = true ?>
-<?php else : ?>
+<?php else: ?>
     <?php $_showlastRow = false ?>
 <?php endif; ?>
 
-<?php foreach ($items as $_item) : ?>
+<?php foreach ($items as $_item): ?>
     <?php
     $shipTogether = ($_item->getOrderItem()->getProductType() == \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE) ?
         !$_item->getOrderItem()->isShipSeparately() : !$_item->getOrderItem()->getParentItem()->isShipSeparately()
     ?>
     <?php $block->setPriceDataObject($_item) ?>
-    <?php if ($_item->getOrderItem()->getParentItem()) : ?>
+    <?php if ($_item->getOrderItem()->getParentItem()): ?>
         <?php
         if ($shipTogether) {
             continue;
         }
         ?>
         <?php $attributes = $block->getSelectionAttributes($_item) ?>
-        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
+        <?php if ($_prevOptionId != $attributes['option_id']): ?>
         <tr>
-            <td class="col-product"><div class="option-label"><?= $block->escapeHtml($attributes['option_label']) ?></div></td>
+            <td class="col-product">
+                <div class="option-label"><?= $block->escapeHtml($attributes['option_label']) ?></div>
+            </td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
@@ -53,148 +57,151 @@
         <?php endif; ?>
     <?php endif; ?>
     <tr<?= (++$_index == $_count && !$_showlastRow) ? ' class="border"' : '' ?>>
-        <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
+        <?php if (!$_item->getOrderItem()->getParentItem()): ?>
         <td class="col-product">
             <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
             <div class="product-sku-block">
                 <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
-                <?= /* @noEscape */ implode('<br />', $this->helper(Magento\Catalog\Helper\Data::class)->splitSku($_item->getSku())) ?>
+                <?= /* @noEscape */ implode('<br />', $helper->splitSku($_item->getSku())) ?>
             </div>
         </td>
-        <?php else : ?>
+        <?php else: ?>
         <td class="col-product">
             <div class="option-value"><?= $block->getValueHtml($_item) ?></div>
         </td>
         <?php endif; ?>
         <td class="col-price">
-            <?php if ($block->canShowPriceInfo($_item) || $shipTogether) : ?>
+            <?php if ($block->canShowPriceInfo($_item) || $shipTogether): ?>
                 <?= $block->getColumnHtml($_item, 'price') ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-qty">
-            <?php if ($block->canShowPriceInfo($_item) || $shipTogether) : ?>
+            <?php if ($block->canShowPriceInfo($_item) || $shipTogether): ?>
                 <table class="qty-table">
                     <tr>
                         <th><?= $block->escapeHtml(__('Ordered')) ?></th>
                         <td><span><?= (float)$_item->getOrderItem()->getQtyOrdered() * 1 ?></span></td>
                     </tr>
-                    <?php if ((float) $_item->getOrderItem()->getQtyInvoiced()) : ?>
+                    <?php if ((float) $_item->getOrderItem()->getQtyInvoiced()): ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Invoiced')) ?></th>
                         <td><?= (float)$_item->getOrderItem()->getQtyInvoiced() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
-                    <?php if ((float) $_item->getOrderItem()->getQtyShipped() && $block->isShipmentSeparately($_item)) : ?>
+                    <?php if ((float) $_item->getOrderItem()->getQtyShipped() &&
+                        $block->isShipmentSeparately($_item)): ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Shipped')) ?></th>
                         <td><?= (float)$_item->getOrderItem()->getQtyShipped() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
-                    <?php if ((float) $_item->getOrderItem()->getQtyRefunded()) : ?>
+                    <?php if ((float) $_item->getOrderItem()->getQtyRefunded()): ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Refunded')) ?></th>
                         <td><?= (float)$_item->getOrderItem()->getQtyRefunded() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
-                    <?php if ((float) $_item->getOrderItem()->getQtyCanceled()) : ?>
+                    <?php if ((float) $_item->getOrderItem()->getQtyCanceled()): ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Canceled')) ?></th>
                         <td><?= (float)$_item->getOrderItem()->getQtyCanceled() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
-            <?php elseif ($block->isShipmentSeparately($_item)) : ?>
+            <?php elseif ($block->isShipmentSeparately($_item)): ?>
                 <table class="qty-table">
                     <tr>
                         <th><?= $block->escapeHtml(__('Ordered')) ?></th>
                         <td><?= (float)$_item->getOrderItem()->getQtyOrdered() * 1 ?></td>
                     </tr>
-                    <?php if ((float) $_item->getOrderItem()->getQtyShipped()) : ?>
+                    <?php if ((float) $_item->getOrderItem()->getQtyShipped()): ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Shipped')) ?></th>
                         <td><?= (float)$_item->getOrderItem()->getQtyShipped() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
                         <?php endif; ?>
         </td>
         <td class="col-qty-invoice">
-            <?php if ($block->canShowPriceInfo($_item) || $shipTogether) : ?>
-                <?php if ($block->canEditQty()) : ?>
+            <?php if ($block->canShowPriceInfo($_item) || $shipTogether): ?>
+                <?php if ($block->canEditQty()): ?>
                     <input type="text"
                            class="input-text admin__control-text qty-input"
                            name="invoice[items][<?= $block->escapeHtmlAttr($_item->getOrderItemId()) ?>]"
                            value="<?= (float)$_item->getQty() * 1 ?>" />
-                <?php else : ?>
+                <?php else: ?>
                     <?= (float)$_item->getQty() * 1 ?>
                 <?php endif; ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-subtotal">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?= $block->getColumnHtml($_item, 'subtotal') ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-tax">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?= /* @noEscape */ $block->displayPriceAttribute('tax_amount') ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-discount">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?= /* @noEscape */ $block->displayPriceAttribute('discount_amount') ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-total last">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?= $block->getColumnHtml($_item, 'total') ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
     </tr>
 <?php endforeach; ?>
-<?php if ($_showlastRow) : ?>
+<?php if ($_showlastRow): ?>
     <tr class="border">
         <td class="col-product">
-            <?php if ($block->getOrderOptions($_item->getOrderItem())) : ?>
+            <?php if ($block->getOrderOptions($_item->getOrderItem())): ?>
                 <dl class="item-options">
-                <?php foreach ($block->getOrderOptions($_item->getOrderItem()) as $option) : ?>
+                <?php foreach ($block->getOrderOptions($_item->getOrderItem()) as $option): ?>
                     <dt><?= $block->escapeHtml($option['label']) ?></dt>
                     <dd>
-                    <?php if (isset($option['custom_view']) && $option['custom_view']) : ?>
+                    <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
                         <?= $block->escapeHtml($option['value']) ?>
-                    <?php else : ?>
+                    <?php else: ?>
                         <?= $block->escapeHtml($block->truncateString($option['value'], 55, '', $_remainder)) ?>
-                        <?php if ($_remainder) :?>
-                            ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
-                            <script>
+                        <?php if ($_remainder):?>
+                            ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid())
+                            ?>"><?= $block->escapeHtml($_remainder) ?></span>
+                            <?php $escapedId = /* @noEscape */ $block->escapeJs($_id);
+                            $scriptString = <<<script
                                 require(['prototype'], function(){
-                                    <?php $escapedId = $block->escapeJs($_id) ?>
-                                    $('<?= /* @noEscape */ $escapedId ?>').hide();
-                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $escapedId?>').show();});
-                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $escapedId ?>').hide();});
-
+                                    $('{$escapedId}').hide();
+                                    $('{$escapedId}').up().observe('mouseover', function(){\$('{$escapedId}').show();});
+                                    $('{$escapedId}').up().observe('mouseout',  function(){\$('{$escapedId}').hide();});
                                 });
-                            </script>
+script;
+                            ?>
+                            <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
                         <?php endif;?>
                     <?php endif;?>
                     </dd>
                 <?php endforeach; ?>
                 </dl>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
             <?= $block->escapeHtml($_item->getDescription()) ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml
index e29bb5dbc9479..b783003958b59 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml
@@ -10,28 +10,32 @@
  * @see \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer
  */
 /** @var $block \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
 <?php $_item = $block->getItem() ?>
 <?php $items = $block->getChildren($_item); ?>
 <?php $_count = count($items) ?>
 <?php $_index = 0 ?>
+<?php $helper = $block->getData('jsonHelper') ?>
 
 <?php $_prevOptionId = '' ?>
 
-<?php if ($block->getOrderOptions() || $_item->getDescription()) : ?>
+<?php if ($block->getOrderOptions() || $_item->getDescription()): ?>
     <?php $_showlastRow = true ?>
-<?php else : ?>
+<?php else: ?>
     <?php $_showlastRow = false ?>
 <?php endif; ?>
 
-<?php foreach ($items as $_item) : ?>
+<?php foreach ($items as $_item): ?>
     <?php $block->setPriceDataObject($_item) ?>
-    <?php if ($_item->getOrderItem()->getParentItem()) : ?>
+    <?php if ($_item->getOrderItem()->getParentItem()): ?>
         <?php $attributes = $block->getSelectionAttributes($_item) ?>
-        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
+        <?php if ($_prevOptionId != $attributes['option_id']): ?>
         <tr>
-            <td class="col-product"><div class="option-label"><?= $block->escapeHtml($attributes['option_label']) ?></div></td>
+            <td class="col-product">
+                <div class="option-label"><?= $block->escapeHtml($attributes['option_label']) ?></div>
+            </td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
@@ -43,84 +47,87 @@
         <?php endif; ?>
     <?php endif; ?>
     <tr<?= (++$_index == $_count && !$_showlastRow) ? ' class="border"' : '' ?>>
-        <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
+        <?php if (!$_item->getOrderItem()->getParentItem()): ?>
         <td class="col-product">
             <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
             <div class="product-sku-block">
                 <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
-                <?= /* @noEscape */ implode('<br />', $this->helper(Magento\Catalog\Helper\Data::class)->splitSku($_item->getSku())) ?>
+                <?= /* @noEscape */ implode('<br />', $helper->splitSku($_item->getSku())) ?>
             </div>
-        <?php else : ?>
+        <?php else: ?>
         <td class="col-product">
             <div class="option-value"><?= $block->getValueHtml($_item) ?></div>
         </td>
         <?php endif; ?>
         <td class="col-price">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?= $block->getColumnHtml($_item, 'price') ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-qty">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?= (float)$_item->getQty() * 1 ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-subtotal">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?= $block->getColumnHtml($_item, 'subtotal') ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-tax">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?= /* @noEscape */ $block->displayPriceAttribute('tax_amount') ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-discount">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?= /* @noEscape */ $block->displayPriceAttribute('discount_amount') ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-total last">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?= $block->getColumnHtml($_item, 'total') ?>
-                <?php else : ?>
+                <?php else: ?>
                  &nbsp;
             <?php endif; ?>
         </td>
     </tr>
 <?php endforeach; ?>
-<?php if ($_showlastRow) : ?>
+<?php if ($_showlastRow): ?>
     <tr class="border">
         <td class="col-product">
-            <?php if ($block->getOrderOptions()) : ?>
+            <?php if ($block->getOrderOptions()): ?>
                 <dl class="item-options">
-                <?php foreach ($block->getOrderOptions() as $option) : ?>
+                <?php foreach ($block->getOrderOptions() as $option): ?>
                     <dt><?= $block->escapeHtml($option['label']) ?></dt>
                     <dd>
-                    <?php if (isset($option['custom_view']) && $option['custom_view']) : ?>
+                    <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
                         <?= $block->escapeHtml($option['value']) ?>
-                    <?php else : ?>
+                    <?php else: ?>
                         <?= $block->escapeHtml($block->truncateString($option['value'], 55, '', $_remainder)) ?>
-                        <?php if ($_remainder) :?>
-                            ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
-                            <script>
+                        <?php if ($_remainder):?>
+                            ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid())
+                            ?>"><?= $block->escapeHtml($_remainder) ?></span>
+                            <?php $escapedId = /* @noEscape */ $block->escapeJs($_id);
+                            $scriptString = <<<script
                                 require(['prototype'], function(){
-                                    <?php $escapedId = $block->escapeJs($_id) ?>
-                                    $('<?= /* @noEscape */ $escapedId ?>').hide();
-                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $escapedId ?>').show();});
-                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $escapedId ?>').hide();});
+                                    $('{$escapedId}').hide();
+                                    $('{$escapedId}').up().observe('mouseover', function(){\$('{$escapedId}').show();});
+                                    $('{$escapedId}').up().observe('mouseout',  function(){\$('{$escapedId}').hide();});
                                 });
-                            </script>
+script;
+                            ?>
+                            <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
                         <?php endif;?>
                     <?php endif;?>
                     </dd>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
index 233e57a003397..3f0987f129f21 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
@@ -10,28 +10,32 @@
  * @see \Magento\Bundle\Block\Adminhtml\Sales\Order\View\Items\Renderer
  */
 /** @var $block \Magento\Bundle\Block\Adminhtml\Sales\Order\View\Items\Renderer */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
 <?php $_item = $block->getItem() ?>
 <?php $items = array_merge([$_item], $_item->getChildrenItems()); ?>
 <?php $_count = count($items) ?>
 <?php $_index = 0 ?>
+<?php $helper = $block->getData('jsonHelper') ?>
 
 <?php $_prevOptionId = '' ?>
 
-<?php if ($block->getOrderOptions() || $_item->getDescription() || $block->canDisplayGiftmessage()) : ?>
+<?php if ($block->getOrderOptions() || $_item->getDescription() || $block->canDisplayGiftmessage()): ?>
     <?php $_showlastRow = true ?>
-<?php else : ?>
+<?php else: ?>
     <?php $_showlastRow = false ?>
 <?php endif; ?>
 
-<?php foreach ($items as $_item) : ?>
+<?php foreach ($items as $_item): ?>
     <?php $block->setPriceDataObject($_item) ?>
     <?php $attributes = $block->getSelectionAttributes($_item) ?>
-    <?php if ($_item->getParentItem()) : ?>
-        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
+    <?php if ($_item->getParentItem()): ?>
+        <?php if ($_prevOptionId != $attributes['option_id']): ?>
         <tr>
-            <td class="col-product"><div class="option-label"><?= $block->escapeHtml($attributes['option_label']) ?></div></td>
+            <td class="col-product">
+                <div class="option-label"><?= $block->escapeHtml($attributes['option_label']) ?></div>
+            </td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
@@ -46,156 +50,159 @@
         <?php endif; ?>
     <?php endif; ?>
     <tr<?= (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?>>
-        <?php if (!$_item->getParentItem()) : ?>
+        <?php if (!$_item->getParentItem()): ?>
         <td class="col-product">
             <div class="product-title" id="order_item_<?= $block->escapeHtmlAttr($_item->getId()) ?>_title">
                 <?= $block->escapeHtml($_item->getName()) ?>
             </div>
             <div class="product-sku-block">
                 <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
-                <?= /* @noEscape */ implode('<br />', $this->helper(Magento\Catalog\Helper\Data::class)->splitSku($_item->getSku())) ?>
+                <?= /* @noEscape */ implode('<br />', $helper->splitSku($_item->getSku())) ?>
             </div>
         </td>
-        <?php else : ?>
+        <?php else: ?>
         <td class="col-product">
             <div class="option-value"><?= $block->getValueHtml($_item) ?></div>
         </td>
         <?php endif; ?>
         <td class="col-status">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?= $block->escapeHtml($_item->getStatus()) ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-price-original">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?= /* @noEscape */ $block->displayPriceAttribute('original_price') ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-price">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?= $block->getColumnHtml($_item, 'price') ?>
-            <?php else : ?>
+            <?php else: ?>
                     &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-ordered-qty">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
                 <table class="qty-table">
                     <tr>
                         <th><?= $block->escapeHtml(__('Ordered')) ?></th>
                         <td><?= (float)$_item->getQtyOrdered() * 1 ?></td>
                     </tr>
-                    <?php if ((float) $_item->getQtyInvoiced()) : ?>
+                    <?php if ((float) $_item->getQtyInvoiced()): ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Invoiced')) ?></th>
                         <td><?= (float)$_item->getQtyInvoiced() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
-                    <?php if ((float) $_item->getQtyShipped() && $block->isShipmentSeparately($_item)) : ?>
+                    <?php if ((float) $_item->getQtyShipped() && $block->isShipmentSeparately($_item)): ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Shipped')) ?></th>
                         <td><?= (float)$_item->getQtyShipped() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
-                    <?php if ((float) $_item->getQtyRefunded()) : ?>
+                    <?php if ((float) $_item->getQtyRefunded()): ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Refunded')) ?></th>
                         <td><?= (float)$_item->getQtyRefunded() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
-                    <?php if ((float) $_item->getQtyCanceled()) : ?>
+                    <?php if ((float) $_item->getQtyCanceled()): ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Canceled')) ?></th>
                         <td><?= (float)$_item->getQtyCanceled() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
-            <?php elseif ($block->isShipmentSeparately($_item)) : ?>
+            <?php elseif ($block->isShipmentSeparately($_item)): ?>
                 <table class="qty-table">
                     <tr>
                         <th><?= $block->escapeHtml(__('Ordered')) ?></th>
                         <td><?= (float)$_item->getQtyOrdered() * 1 ?></td>
                     </tr>
-                    <?php if ((float) $_item->getQtyShipped()) : ?>
+                    <?php if ((float) $_item->getQtyShipped()): ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Shipped')) ?></th>
                         <td><?= (float)$_item->getQtyShipped() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-subtotal">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?= $block->getColumnHtml($_item, 'subtotal') ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-tax-amount">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?= /* @noEscape */ $block->displayPriceAttribute('tax_amount') ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-tax-percent">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?= /* @noEscape */ $block->displayTaxPercent($_item) ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-discont">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?= /* @noEscape */ $block->displayPriceAttribute('discount_amount') ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-total last">
-            <?php if ($block->canShowPriceInfo($_item)) : ?>
+            <?php if ($block->canShowPriceInfo($_item)): ?>
                 <?= $block->getColumnHtml($_item, 'total') ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
     </tr>
 <?php endforeach; ?>
-<?php if ($_showlastRow) : ?>
+<?php if ($_showlastRow): ?>
     <tr<?php if (!$block->canDisplayGiftmessage()) { echo ' class="border"'; } ?>>
         <td class="col-product">
-            <?php if ($block->getOrderOptions()) : ?>
+            <?php if ($block->getOrderOptions()): ?>
                 <dl class="item-options">
-                <?php foreach ($block->getOrderOptions() as $option) : ?>
+                <?php foreach ($block->getOrderOptions() as $option): ?>
                     <dt><?= $block->escapeHtml($option['label']) ?>:</dt>
                     <dd>
-                    <?php if (isset($option['custom_view']) && $option['custom_view']) : ?>
+                    <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
                         <?= $block->escapeHtml($option['value']) ?>
-                    <?php else : ?>
+                    <?php else: ?>
                         <?= $block->escapeHtml($block->truncateString($option['value'], 55, '', $_remainder)) ?>
-                        <?php if ($_remainder) :?>
-                            ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
-                            <script>
+                        <?php if ($_remainder):?>
+                            ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid())
+                            ?>"><?= $block->escapeHtml($_remainder) ?></span>
+                            <?php $escapedId = /* @noEscape */ $block->escapeJs($_id);
+                            $scriptString = <<<script
                                 require(['prototype'], function(){
-                                    <?php $escapedId = $block->escapeJs($_id) ?>
-                                    $('<?= /* @noEscape */ $escapedId ?>').hide();
-                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $escapedId ?>').show();});
-                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $escapedId ?>').hide();});
+                                    $('{$escapedId}').hide();
+                                    $('{$escapedId}').up().observe('mouseover', function(){\$('{$escapedId}').show();});
+                                    $('{$escapedId}').up().observe('mouseout',  function(){\$('{$escapedId}').hide();});
                                 });
-                            </script>
+script;
+                            ?>
+                            <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
                         <?php endif;?>
                     <?php endif;?>
                     </dd>
                 <?php endforeach; ?>
                 </dl>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
             <?= $block->escapeHtml($_item->getDescription()) ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml
index 2e52ed906626b..d40eaa83e76ba 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml
@@ -6,8 +6,12 @@
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 
-<?php /** @var $block \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer */ ?>
+<?php
+/** @var $block \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+?>
 
+<?php $helper = $block->getData('jsonHelper'); ?>
 <?php $_item = $block->getItem() ?>
 <?php $items = $block->getChildren($_item); ?>
 <?php $_count = count($items) ?>
@@ -15,19 +19,21 @@
 
 <?php $_prevOptionId = '' ?>
 
-<?php if ($block->getOrderOptions() || $_item->getDescription()) : ?>
+<?php if ($block->getOrderOptions() || $_item->getDescription()): ?>
     <?php $_showlastRow = true ?>
-<?php else : ?>
+<?php else: ?>
     <?php $_showlastRow = false ?>
 <?php endif; ?>
 
-<?php foreach ($items as $_item) : ?>
+<?php foreach ($items as $_item): ?>
     <?php $block->setPriceDataObject($_item) ?>
-    <?php if ($_item->getOrderItem()->getParentItem()) : ?>
+    <?php if ($_item->getOrderItem()->getParentItem()): ?>
         <?php $attributes = $block->getSelectionAttributes($_item) ?>
-        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
+        <?php if ($_prevOptionId != $attributes['option_id']): ?>
         <tr>
-            <td class="col-product"><div class="option-label"><?= $block->escapeHtml($attributes['option_label']) ?></div></td>
+            <td class="col-product">
+                <div class="option-label"><?= $block->escapeHtml($attributes['option_label']) ?></div>
+            </td>
             <td class="col-product">&nbsp;</td>
             <td class="col-qty last">&nbsp;</td>
         </tr>
@@ -35,64 +41,68 @@
         <?php endif; ?>
     <?php endif; ?>
     <tr class="<?= (++$_index == $_count && !$_showlastRow) ? 'border' : '' ?>">
-        <?php if (!$_item->getOrderItem()->getParentItem()) : ?>
+        <?php if (!$_item->getOrderItem()->getParentItem()): ?>
         <td class="col-product">
             <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
             <div class="product-sku-block">
                 <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
-                <?= /* @noEscape */ implode('<br />', $this->helper(Magento\Catalog\Helper\Data::class)->splitSku($_item->getSku())) ?>
+                <?= /* @noEscape */ implode('<br />', $helper->splitSku($_item->getSku())) ?>
             </div>
         </td>
-        <?php else : ?>
+        <?php else: ?>
         <td class="col-product"><div class="option-value"><?= $block->getValueHtml($_item) ?></div></td>
         <?php endif; ?>
         <td class="col-ordered-qty">
-            <?php if ($block->isShipmentSeparately($_item)) : ?>
+            <?php if ($block->isShipmentSeparately($_item)): ?>
                 <?= $block->getColumnHtml($_item, 'qty') ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-qty last">
-            <?php if ($block->isShipmentSeparately($_item)) : ?>
+            <?php if ($block->isShipmentSeparately($_item)): ?>
                 <input type="text"
                        class="input-text admin__control-text"
                        name="shipment[items][<?= $block->escapeHtmlAttr($_item->getOrderItemId()) ?>]"
                        value="<?= (float)$_item->getQty() * 1 ?>" />
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
     </tr>
 <?php endforeach; ?>
-<?php if ($_showlastRow) : ?>
+<?php if ($_showlastRow): ?>
     <tr class="border">
         <td class="col-product">
-            <?php if ($block->getOrderOptions($_item->getOrderItem())) : ?>
+            <?php if ($block->getOrderOptions($_item->getOrderItem())): ?>
                 <dl class="item-options">
-                <?php foreach ($block->getOrderOptions($_item->getOrderItem()) as $option) : ?>
+                <?php foreach ($block->getOrderOptions($_item->getOrderItem()) as $option): ?>
                     <dt><?= $block->escapeHtml($option['label']) ?></dt>
                     <dd>
-                    <?php if (isset($option['custom_view']) && $option['custom_view']) : ?>
+                    <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
                         <?= $block->escapeHtml($option['value']) ?>
-                    <?php else : ?>
+                    <?php else: ?>
                         <?= $block->escapeHtml($block->truncateString($option['value'], 55, '', $_remainder)) ?>
-                        <?php if ($_remainder) :?>
-                            ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
-                            <script>
+                        <?php if ($_remainder):?>
+                            ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>">
+                                <?= $block->escapeHtml($_remainder) ?>
+                            </span>
+                            <?php $escapedId = /* @noEscape */ $block->escapeJs($_id);
+                            $scriptString = <<<script
                                 require(['prototype'], function(){
-                                    <?php $escapedId = $block->escapeJs($_id) ?>
-                                    $('<?= /* @noEscape */ $escapedId ?>').hide();
-                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $escapedId ?>').show();});
-                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $escapedId ?>').hide();});
+                                    $('{$escapedId}').hide();
+                                    $('{$escapedId}').up().observe('mouseover', function(){\$('{$escapedId}').show();});
+                                    $('{$escapedId}').up().observe('mouseout',  function(){\$('{$escapedId}').hide();});
                                 });
-                            </script>
+script;
+                            ?>
+                            <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
                         <?php endif;?>
                     <?php endif;?>
                     </dd>
                 <?php endforeach; ?>
                 </dl>
-                        <?php else : ?>
+                        <?php else: ?>
                 &nbsp;
                         <?php endif; ?>
             <?= $block->escapeHtml($_item->getDescription()) ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml
index 521669700e10a..6f4a2888b13f7 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml
@@ -5,83 +5,93 @@
  */
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
-<?php /** @var $block \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer */ ?>
+<?php
+/** @var $block \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+?>
 
 <?php $_item = $block->getItem() ?>
 <?php $items = array_merge([$_item->getOrderItem()], $_item->getOrderItem()->getChildrenItems()) ?>
 <?php $shipItems = $block->getChildren($_item) ?>
 <?php $_count = count($items) ?>
 <?php $_index = 0 ?>
+<?php $helper = $block->getData('jsonHelper') ?>
 
 <?php $_prevOptionId = '' ?>
 
-<?php if ($block->getOrderOptions() || $_item->getDescription()) : ?>
+<?php if ($block->getOrderOptions() || $_item->getDescription()): ?>
     <?php $_showlastRow = true ?>
-<?php else : ?>
+<?php else: ?>
     <?php $_showlastRow = false ?>
 <?php endif; ?>
 
-<?php foreach ($items as $_item) : ?>
+<?php foreach ($items as $_item): ?>
     <?php $block->setPriceDataObject($_item) ?>
-    <?php if ($_item->getParentItem()) : ?>
+    <?php if ($_item->getParentItem()): ?>
         <?php $attributes = $block->getSelectionAttributes($_item) ?>
-        <?php if ($_prevOptionId != $attributes['option_id']) : ?>
+        <?php if ($_prevOptionId != $attributes['option_id']): ?>
         <tr>
-            <td class="col-product"><div class="option-label"><?= $block->escapeHtml($attributes['option_label']) ?></div></td>
+            <td class="col-product">
+                <div class="option-label"><?= $block->escapeHtml($attributes['option_label']) ?></div>
+            </td>
             <td class="col-qty last">&nbsp;</td>
         </tr>
             <?php $_prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
     <tr<?= (++$_index == $_count && !$_showlastRow) ? ' class="border"' : '' ?>>
-        <?php if (!$_item->getParentItem()) : ?>
+        <?php if (!$_item->getParentItem()): ?>
         <td class="col-product">
             <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
             <div class="product-sku-block">
                 <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
-                <?= /* @noEscape */ implode('<br />', $this->helper(Magento\Catalog\Helper\Data::class)->splitSku($_item->getSku())) ?>
+                <?= /* @noEscape */ implode('<br />', $helper->splitSku($_item->getSku())) ?>
             </div>
         </td>
-        <?php else : ?>
+        <?php else: ?>
         <td class="col-product"><div class="option-value"><?= $block->getValueHtml($_item) ?></div></td>
         <?php endif; ?>
         <td class="col-qty last">
-            <?php if (($block->isShipmentSeparately() && $_item->getParentItem()) || (!$block->isShipmentSeparately() && !$_item->getParentItem())) : ?>
-                <?php if (isset($shipItems[$_item->getId()])) : ?>
+            <?php if (($block->isShipmentSeparately() && $_item->getParentItem()) ||
+                (!$block->isShipmentSeparately() && !$_item->getParentItem())): ?>
+                <?php if (isset($shipItems[$_item->getId()])): ?>
                     <?= (float)$shipItems[$_item->getId()]->getQty() * 1 ?>
-                <?php elseif ($_item->getIsVirtual()) : ?>
+                <?php elseif ($_item->getIsVirtual()): ?>
                     <?= $block->escapeHtml(__('N/A')) ?>
-                <?php else : ?>
+                <?php else: ?>
                     0
                 <?php endif; ?>
-            <?php else : ?>
+            <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
     </tr>
 <?php endforeach; ?>
-<?php if ($_showlastRow) : ?>
+<?php if ($_showlastRow): ?>
     <tr class="border">
         <td class="col-product">
-            <?php if ($block->getOrderOptions($_item->getOrderItem())) : ?>
+            <?php if ($block->getOrderOptions($_item->getOrderItem())): ?>
                 <dl class="item-options">
-                <?php foreach ($block->getOrderOptions($_item->getOrderItem()) as $option) : ?>
+                <?php foreach ($block->getOrderOptions($_item->getOrderItem()) as $option): ?>
                     <dt><?= $block->escapeHtml($option['label']) ?></dt>
                     <dd>
-                    <?php if (isset($option['custom_view']) && $option['custom_view']) : ?>
+                    <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
                         <?= $block->escapeHtml($option['value']) ?>
-                    <?php else : ?>
+                    <?php else: ?>
                         <?= $block->escapeHtml($block->truncateString($option['value'], 55, '', $_remainder)) ?>
-                        <?php if ($_remainder) :?>
-                            ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
-                            <script>
+                        <?php if ($_remainder):?>
+                            ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid())
+                            ?>"><?= $block->escapeHtml($_remainder) ?></span>
+                            <?php $escapedId = /* @noEscape */ $block->escapeJs($_id);
+                            $scriptString = <<<script
                                 require(['prototype'], function(){
-                                    <?php $escapedId = $block->escapeJs($_id) ?>
-                                    $('<?= /* @noEscape */ $escapedId ?>').hide();
-                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $escapedId ?>').show();});
-                                    $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $escapedId ?>').hide();});
+                                    $('{$escapedId}').hide();
+                                    $('{$escapedId}').up().observe('mouseover', function(){\$('{$escapedId}').show();});
+                                    $('{$escapedId}').up().observe('mouseout',  function(){\$('{$escapedId}').hide();});
                                 });
-                            </script>
+script;
+                            ?>
+                            <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
                         <?php endif;?>
                     <?php endif;?>
                     </dd>
diff --git a/app/code/Magento/Catalog/Block/Product/ListProduct.php b/app/code/Magento/Catalog/Block/Product/ListProduct.php
index 59f5cc1b53b26..e0bfdb18cfe2c 100644
--- a/app/code/Magento/Catalog/Block/Product/ListProduct.php
+++ b/app/code/Magento/Catalog/Block/Product/ListProduct.php
@@ -23,6 +23,8 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Pricing\Render;
 use Magento\Framework\Url\Helper\Data;
+use Magento\Framework\App\ObjectManager;
+use Magento\Catalog\Helper\Output;
 
 /**
  * Product list
@@ -88,6 +90,7 @@ public function __construct(
         $this->_postDataHelper = $postDataHelper;
         $this->categoryRepository = $categoryRepository;
         $this->urlHelper = $urlHelper;
+        $data['jsonHelper'] = ObjectManager::getInstance()->get(Output::class);
         parent::__construct(
             $context,
             $data
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/gallery.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/gallery.phtml
index e0443d5a55d97..aab181a8f7321 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/gallery.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/gallery.phtml
@@ -5,28 +5,32 @@
  */
 
 /** @var \Magento\Catalog\Block\Product\Gallery $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?php $_width = $block->getImageWidth(); ?>
-<div class="product-image-popup" style="width:<?= /* @noEscape */ $_width ?>px;">
-    <div class="buttons-set"><a href="#" class="button" role="close-window"><span><?= $block->escapeHtml(__('Close Window')) ?></span></a></div>
-    <?php if ($block->getPreviousImageUrl() || $block->getNextImageUrl()) :?>
+<div class="product-image-popup">
+    <div class="buttons-set"><a href="#" class="button" role="close-window">
+            <span><?= $block->escapeHtml(__('Close Window')) ?></span></a></div>
+    <?php if ($block->getPreviousImageUrl() || $block->getNextImageUrl()):?>
         <div class="nav">
-            <?php if ($_prevUrl = $block->getPreviousImageUrl()) :?>
-                <a href="<?= $block->escapeUrl($_prevUrl) ?>" class="prev">&laquo; <?= $block->escapeHtml(__('Prev')) ?></a>
+            <?php if ($_prevUrl = $block->getPreviousImageUrl()):?>
+                <a href="<?= $block->escapeUrl($_prevUrl) ?>"
+                   class="prev">&laquo; <?= $block->escapeHtml(__('Prev')) ?></a>
             <?php endif; ?>
-            <?php if ($_nextUrl = $block->getNextImageUrl()) :?>
-                <a href="<?= $block->escapeUrl($_nextUrl) ?>" class="next"><?= $block->escapeHtml(__('Next')) ?> &raquo;</a>
+            <?php if ($_nextUrl = $block->getNextImageUrl()):?>
+                <a href="<?= $block->escapeUrl($_nextUrl) ?>"
+                   class="next"><?= $block->escapeHtml(__('Next')) ?> &raquo;</a>
             <?php endif; ?>
         </div>
     <?php endif; ?>
-    <?php if ($_imageTitle = $block->escapeHtml($block->getCurrentImage()->getLabel())) :?>
+    <?php if ($_imageTitle = $block->escapeHtml($block->getCurrentImage()->getLabel())):?>
         <h1 class="image-label"><?= /* @noEscape */ $_imageTitle ?></h1>
     <?php endif; ?>
     <?php
     $imageUrl = $block->getImageUrl();
     ?>
     <img src="<?= $block->escapeUrl($imageUrl) ?>"
-        <?php if ($_width) :?>
+        <?php if ($_width):?>
             width="<?= /* @noEscape */ $_width ?>"
         <?php endif; ?>
          alt="<?= $block->escapeHtmlAttr($block->getCurrentImage()->getLabel()) ?>"
@@ -34,15 +38,23 @@
          id="product-gallery-image"
          class="image"
          data-mage-init='{"catalogGallery":{}}'/>
-    <div class="buttons-set"><a href="#" class="button" role="close-window"><span><?= $block->escapeHtml(__('Close Window')) ?></span></a></div>
-    <?php if ($block->getPreviousImageUrl() || $block->getNextImageUrl()) :?>
+    <div class="buttons-set"><
+        a href="#" class="button" role="close-window"><span><?= $block->escapeHtml(__('Close Window')) ?></span></a>
+    </div>
+    <?php if ($block->getPreviousImageUrl() || $block->getNextImageUrl()):?>
         <div class="nav">
-            <?php if ($_prevUrl = $block->getPreviousImageUrl()) :?>
-                <a href="<?= $block->escapeUrl($_prevUrl) ?>" class="prev">&laquo; <?= $block->escapeHtml(__('Prev')) ?></a>
+            <?php if ($_prevUrl = $block->getPreviousImageUrl()):?>
+                <a href="<?= $block->escapeUrl($_prevUrl) ?>"
+                   class="prev">&laquo; <?= $block->escapeHtml(__('Prev')) ?></a>
             <?php endif; ?>
-            <?php if ($_nextUrl = $block->getNextImageUrl()) :?>
-                <a href="<?= $block->escapeUrl($_nextUrl) ?>" class="next"><?= $block->escapeHtml(__('Next')) ?> &raquo;</a>
+            <?php if ($_nextUrl = $block->getNextImageUrl()):?>
+                <a href="<?= $block->escapeUrl($_nextUrl) ?>"
+                   class="next"><?= $block->escapeHtml(__('Next')) ?> &raquo;</a>
             <?php endif; ?>
         </div>
     <?php endif; ?>
 </div>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    'width:' . /* @noEscape */ $_width . 'px;',
+    'div.product-image-popup'
+) ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
index 554caf6026001..f088be85262e3 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
@@ -7,23 +7,23 @@ use Magento\Framework\App\Action\Action;
 
 ?>
 <?php
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-
 /**
  * Product list template
  *
  * @var $block \Magento\Catalog\Block\Product\ListProduct
  * @var \Magento\Framework\Escaper $escaper
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
 <?php
 $_productCollection = $block->getLoadedProductCollection();
-/** @var \Magento\Catalog\Helper\Output $_helper */
-$_helper = $this->helper(Magento\Catalog\Helper\Output::class);
+$_helper = $block->getData('jsonHelper');
 ?>
-<?php if (!$_productCollection->count()) :?>
-    <div class="message info empty"><div><?= $escaper->escapeHtml(__('We can\'t find products matching the selection.')) ?></div></div>
-<?php else :?>
+<?php if (!$_productCollection->count()):?>
+    <div class="message info empty">
+        <div><?= $escaper->escapeHtml(__('We can\'t find products matching the selection.')) ?></div>
+    </div>
+<?php else:?>
     <?= $block->getToolbarHtml() ?>
     <?= $block->getAdditionalHtml() ?>
     <?php
@@ -46,14 +46,16 @@ $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
     <div class="products wrapper <?= /* @noEscape */ $viewMode ?> products-<?= /* @noEscape */ $viewMode ?>">
         <ol class="products list items product-items">
             <?php /** @var $_product \Magento\Catalog\Model\Product */ ?>
-            <?php foreach ($_productCollection as $_product) :?>
+            <?php foreach ($_productCollection as $_product):?>
             <li class="item product product-item">
-                <div class="product-item-info" data-container="product-<?= /* @noEscape */ $viewMode ?>">
+                <div class="product-item-info"
+                     id="product-item-info_<?= /* @noEscape */ $_product->getId() ?>"
+                     data-container="product-<?= /* @noEscape */ $viewMode ?>">
                     <?php
                     $productImage = $block->getImage($_product, $imageDisplayArea);
                     if ($pos != null) {
-                        $position = ' style="left:' . $productImage->getWidth() . 'px;'
-                            . 'top:' . $productImage->getHeight() . 'px;"';
+                        $position = 'left:' . $productImage->getWidth() . 'px;'
+                            . 'top:' . $productImage->getHeight() . 'px;';
                     }
                     ?>
                     <?php // Product Image ?>
@@ -69,19 +71,19 @@ $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
                         <strong class="product name product-item-name">
                             <a class="product-item-link"
                                href="<?= $escaper->escapeUrl($_product->getProductUrl()) ?>">
-                                <?= /* @noEscape */ $_helper->productAttribute($_product, $_product->getName(), 'name') ?>
+                                <?=/* @noEscape */ $_helper->productAttribute($_product, $_product->getName(), 'name')?>
                             </a>
                         </strong>
                         <?= $block->getReviewsSummaryHtml($_product, $templateType) ?>
                         <?= /* @noEscape */ $block->getProductPrice($_product) ?>
-                        <?php if ($_product->isAvailable()) :?>
+                        <?php if ($_product->isAvailable()):?>
                             <?= $block->getProductDetailsHtml($_product) ?>
                         <?php endif; ?>
 
                         <div class="product-item-inner">
-                            <div class="product actions product-item-actions"<?= strpos($pos, $viewMode . '-actions') ? $escaper->escapeHtmlAttr($position) : '' ?>>
-                                <div class="actions-primary"<?= strpos($pos, $viewMode . '-primary') ? $escaper->escapeHtmlAttr($position) : '' ?>>
-                                    <?php if ($_product->isSaleable()) :?>
+                            <div class="product actions product-item-actions">
+                                <div class="actions-primary">
+                                    <?php if ($_product->isSaleable()):?>
                                         <?php $postParams = $block->getAddToCartPostParams($_product); ?>
                                         <form data-role="tocart-form"
                                               data-product-sku="<?= $escaper->escapeHtml($_product->getSku()) ?>"
@@ -90,8 +92,11 @@ $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
                                             <input type="hidden"
                                                    name="product"
                                                    value="<?= /* @noEscape */ $postParams['data']['product'] ?>">
-                                            <input type="hidden" name="<?= /* @noEscape */ Action::PARAM_NAME_URL_ENCODED ?>"
-                                                   value="<?= /* @noEscape */ $postParams['data'][Action::PARAM_NAME_URL_ENCODED] ?>">
+                                            <input type="hidden"
+                                                   name="<?= /* @noEscape */ Action::PARAM_NAME_URL_ENCODED ?>"
+                                                   value="<?=
+                                                   /* @noEscape */ $postParams['data'][Action::PARAM_NAME_URL_ENCODED]
+                                                    ?>">
                                             <?= $block->getBlockHtml('formkey') ?>
                                             <button type="submit"
                                                     title="<?= $escaper->escapeHtmlAttr(__('Add to Cart')) ?>"
@@ -99,23 +104,39 @@ $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
                                                 <span><?= $escaper->escapeHtml(__('Add to Cart')) ?></span>
                                             </button>
                                         </form>
-                                    <?php else :?>
-                                        <?php if ($_product->isAvailable()) :?>
-                                            <div class="stock available"><span><?= $escaper->escapeHtml(__('In stock')) ?></span></div>
-                                        <?php else :?>
-                                            <div class="stock unavailable"><span><?= $escaper->escapeHtml(__('Out of stock')) ?></span></div>
+                                    <?php else:?>
+                                        <?php if ($_product->isAvailable()):?>
+                                            <div class="stock available">
+                                                <span><?= $escaper->escapeHtml(__('In stock')) ?></span></div>
+                                        <?php else:?>
+                                            <div class="stock unavailable">
+                                                <span><?= $escaper->escapeHtml(__('Out of stock')) ?></span></div>
                                         <?php endif; ?>
                                     <?php endif; ?>
                                 </div>
-                                <div data-role="add-to-links" class="actions-secondary"<?= strpos($pos, $viewMode . '-secondary') ? $escaper->escapeHtmlAttr($position) : '' ?>>
-                                    <?php if ($addToBlock = $block->getChildBlock('addto')) :?>
+                                <?= strpos($pos, $viewMode . '-primary') ?
+                                    /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                                        $position,
+                                        'product-item-info_' . $_product->getId() . ' div.actions-primary'
+                                    ) : '' ?>
+                                <div data-role="add-to-links" class="actions-secondary">
+                                    <?php if ($addToBlock = $block->getChildBlock('addto')):?>
                                         <?= $addToBlock->setProduct($_product)->getChildHtml() ?>
                                     <?php endif; ?>
                                 </div>
+                                <?= strpos($pos, $viewMode . '-secondary') ?
+                                    /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                                        $position,
+                                        'product-item-info_' . $_product->getId() . ' div.actions-secondary'
+                                    ) : '' ?>
                             </div>
-                            <?php if ($showDescription) :?>
+                            <?php if ($showDescription):?>
                                 <div class="product description product-item-description">
-                                    <?= /* @noEscape */ $_helper->productAttribute($_product, $_product->getShortDescription(), 'short_description') ?>
+                                    <?= /* @noEscape */ $_helper->productAttribute(
+                                        $_product,
+                                        $_product->getShortDescription(),
+                                        'short_description'
+                                    ) ?>
                                     <a href="<?= $escaper->escapeUrl($_product->getProductUrl()) ?>"
                                        title="<?= /* @noEscape */ $_productNameStripped ?>"
                                        class="action more"><?= $escaper->escapeHtml(__('Learn More')) ?></a>
@@ -124,12 +145,17 @@ $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
                         </div>
                     </div>
                 </div>
+                <?= strpos($pos, $viewMode . '-actions') ?
+                /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                    $position,
+                    'product-item-info_' . $_product->getId() . ' div.product-item-actions'
+                ) : '' ?>
             </li>
             <?php endforeach; ?>
         </ol>
     </div>
     <?= $block->getToolbarHtml() ?>
-    <?php if (!$block->isRedirectToCartEnabled()) :?>
+    <?php if (!$block->isRedirectToCartEnabled()):?>
         <script type="text/x-magento-init">
         {
             "[data-role=tocart-form], .form.map.checkout": {
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml
index 89dcef49d2bac..91774600618f0 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml
@@ -7,12 +7,8 @@
 use Magento\Catalog\ViewModel\Product\Listing\PreparePostData;
 use Magento\Framework\App\ActionInterface;
 
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-// phpcs:disable Generic.WhiteSpace.ScopeIndent.Incorrect
-// phpcs:disable Generic.Files.LineLength
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundHelper
-
 /* @var $block \Magento\Catalog\Block\Product\AbstractProduct */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
 <?php
@@ -164,11 +160,19 @@ $_item = null;
 
 <?php if ($exist):?>
 
-<?php if ($type == 'related' || $type == 'upsell'):?>
-<?php if ($type == 'related'):?>
-<div class="block <?= $block->escapeHtmlAttr($class) ?>" data-mage-init='{"relatedProducts":{"relatedCheckbox":".related.checkbox"}}' data-limit="<?= $block->escapeHtmlAttr($limit) ?>" data-shuffle="<?= /* @noEscape */ $shuffle ?>" data-shuffle-weighted="<?= /* @noEscape */ $isWeightedRandom ?>">
+    <?php if ($type == 'related' || $type == 'upsell'):?>
+        <?php if ($type == 'related'):?>
+<div class="block <?= $block->escapeHtmlAttr($class) ?>"
+     data-mage-init='{"relatedProducts":{"relatedCheckbox":".related.checkbox"}}'
+     data-limit="<?= $block->escapeHtmlAttr($limit) ?>"
+     data-shuffle="<?= /* @noEscape */ $shuffle ?>"
+     data-shuffle-weighted="<?= /* @noEscape */ $isWeightedRandom ?>">
     <?php else:?>
-    <div class="block <?= $block->escapeHtmlAttr($class) ?>" data-mage-init='{"upsellProducts":{}}' data-limit="<?= $block->escapeHtmlAttr($limit) ?>" data-shuffle="<?= /* @noEscape */ $shuffle ?>" data-shuffle-weighted="<?= /* @noEscape */ $isWeightedRandom ?>">
+    <div class="block <?= $block->escapeHtmlAttr($class) ?>"
+         data-mage-init='{"upsellProducts":{}}'
+         data-limit="<?= $block->escapeHtmlAttr($limit) ?>"
+         data-shuffle="<?= /* @noEscape */ $shuffle ?>"
+         data-shuffle-weighted="<?= /* @noEscape */ $isWeightedRandom ?>">
         <?php endif; ?>
         <?php else:?>
         <div class="block <?= $block->escapeHtmlAttr($class) ?>">
@@ -195,7 +199,13 @@ $_item = null;
                                 <?php endif; ?>
                             <?php endif; ?>
                             <?php if ($type == 'related' || $type == 'upsell'):?>
-                                <li class="item product product-item" style="display: none;"  data-shuffle-group="<?= $block->escapeHtmlAttr($_item->getPriority()) ?>" >
+                                <li class="item product product-item"
+                                id="product-item_<?= /* @noEscape */ $_item->getId() ?>"
+                                data-shuffle-group="<?= $block->escapeHtmlAttr($_item->getPriority()) ?>" >
+                                <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                                    'display:none;',
+                                    'li#product-item_' . $_item->getId()
+                                ) ?>
                             <?php else:?>
                                 <li class="item product product-item">
                             <?php endif; ?>
@@ -222,17 +232,16 @@ $_item = null;
                                     <?php if ($canItemsAddToCart && !$_item->isComposite() && $_item->isSaleable()
                                         && $type == 'related'):?>
                                         <?php if (!$_item->getRequiredOptions()):?>
-                                            <div class="field choice related"><input
-                                                        type="checkbox"
-                                                        class="checkbox related"
-                                                        id="related-checkbox<?= $block->escapeHtmlAttr($_item->getId()) ?>"
-                                                        name="related_products[]"
-                                                        value="<?= $block->escapeHtmlAttr($_item->getId()) ?>" />
-                                                <label
-                                                        class="label"
-                                                        for="related-checkbox<?= $block->escapeHtmlAttr(
-                                                            $_item->getId()
-                                                        ) ?>"><span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                            <div class="field choice related">
+                                                <input
+                                                    type="checkbox"
+                                                    class="checkbox related"
+                                                    id="related-checkbox<?= $block->escapeHtmlAttr($_item->getId()) ?>"
+                                                    name="related_products[]"
+                                                    value="<?= $block->escapeHtmlAttr($_item->getId()) ?>" />
+                                                <label class="label"
+                                                       for="related-checkbox<?= $block->escapeHtmlAttr($_item->getId())
+                                                        ?>"><span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
                                                 </label>
                                             </div>
                                         <?php endif; ?>
diff --git a/app/code/Magento/Review/view/frontend/templates/helper/summary_short.phtml b/app/code/Magento/Review/view/frontend/templates/helper/summary_short.phtml
index 7ea84c952eaaa..20d695195c920 100644
--- a/app/code/Magento/Review/view/frontend/templates/helper/summary_short.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/helper/summary_short.phtml
@@ -5,26 +5,38 @@
  */
 
 /** @var \Magento\Review\Block\Product\ReviewRenderer $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 
 $url = $block->getReviewsUrl() . '#reviews';
 $urlForm = $block->getReviewsUrl() . '#review-form';
 ?>
-<?php if ($block->isReviewEnabled() && $block->getReviewsCount()) : ?>
+<?php if ($block->isReviewEnabled() && $block->getReviewsCount()): ?>
     <?php $rating = $block->getRatingSummary(); ?>
     <div class="product-reviews-summary short<?= !$rating ? ' no-rating' : '' ?>">
-        <?php if ($rating) :?>
+        <?php if ($rating):?>
         <div class="rating-summary">
             <span class="label"><span><?= $block->escapeHtml(__('Rating')) ?>:</span></span>
-            <div class="rating-result" title="<?= $block->escapeHtmlAttr($rating) ?>%">
-                <span style="width:<?= $block->escapeHtmlAttr($rating) ?>%"><span><?= $block->escapeHtml($rating) ?>%</span></span>
+            <div class="rating-result"
+                 id="rating-result_<?= /* @noEscape */ $block->getProduct()->getId() ?>"
+                 title="<?= $block->escapeHtmlAttr($rating) ?>%">
+                <span><span><?= $block->escapeHtml($rating) ?>%</span></span>
             </div>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                'width:' . $block->escapeHtmlAttr($rating) . '%',
+                '#rating-result_' . $block->getProduct()->getId() . ' span'
+            ) ?>
         </div>
         <?php endif;?>
         <div class="reviews-actions">
-            <a class="action view" href="<?= $block->escapeUrl($url) ?>"><?= $block->escapeHtml($block->getReviewsCount()) ?>&nbsp;<span><?= ($block->getReviewsCount() == 1) ? $block->escapeHtml(__('Review')) : $block->escapeHtml(__('Reviews')) ?></span></a>
+            <a class="action view"
+               href="<?= $block->escapeUrl($url) ?>"><?= $block->escapeHtml($block->getReviewsCount()) ?>
+                &nbsp;<span><?= ($block->getReviewsCount() == 1) ?
+                        $block->escapeHtml(__('Review')) : $block->escapeHtml(__('Reviews')) ?>
+                </span>
+            </a>
         </div>
     </div>
-<?php elseif ($block->isReviewEnabled() && $block->getDisplayIfEmpty()) : ?>
+<?php elseif ($block->isReviewEnabled() && $block->getDisplayIfEmpty()): ?>
     <div class="product-reviews-summary short empty">
         <div class="reviews-actions">
             <a class="action add" href="<?= $block->escapeUrl($urlForm) ?>">
diff --git a/app/code/Magento/Review/view/frontend/templates/product/view/list.phtml b/app/code/Magento/Review/view/frontend/templates/product/view/list.phtml
index d00c310069573..93fb7b250c777 100644
--- a/app/code/Magento/Review/view/frontend/templates/product/view/list.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/product/view/list.phtml
@@ -5,13 +5,14 @@
  */
 
 /** @var Magento\Review\Block\Product\View\ListView $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 
 $_items = $block->getReviewsCollection()->getItems();
 $format = $block->getDateFormat() ?: \IntlDateFormatter::SHORT;
 ?>
-<?php if (count($_items)) : ?>
+<?php if (count($_items)): ?>
 <div class="block review-list" id="customer-reviews">
-    <?php if (!$block->getHideTitle()) : ?>
+    <?php if (!$block->getHideTitle()): ?>
         <div class="block-title">
             <strong><?= $block->escapeHtml(__('Customer Reviews')) ?></strong>
         </div>
@@ -21,15 +22,20 @@ $format = $block->getDateFormat() ?: \IntlDateFormatter::SHORT;
             <?= $block->getChildHtml('toolbar') ?>
         </div>
         <ol class="items review-items">
-        <?php foreach ($_items as $_review) : ?>
+        <?php foreach ($_items as $_review): ?>
             <li class="item review-item" itemscope itemprop="review" itemtype="http://schema.org/Review">
                 <div class="review-title" itemprop="name"><?= $block->escapeHtml($_review->getTitle()) ?></div>
-                <?php if (count($_review->getRatingVotes())) : ?>
+                <?php if (count($_review->getRatingVotes())): ?>
                     <div class="review-ratings">
-                    <?php foreach ($_review->getRatingVotes() as $_vote) : ?>
-                    <div class="rating-summary item" itemprop="reviewRating" itemscope itemtype="http://schema.org/Rating">
-                        <span class="label rating-label"><span><?= $block->escapeHtml($_vote->getRatingCode()) ?></span></span>
-                        <div class="rating-result" title="<?= $block->escapeHtmlAttr($_vote->getPercent()) ?>%">
+                    <?php foreach ($_review->getRatingVotes() as $_vote): ?>
+                    <div class="rating-summary item"
+                         itemprop="reviewRating" itemscope itemtype="http://schema.org/Rating">
+                        <span class="label rating-label">
+                            <span><?= $block->escapeHtml($_vote->getRatingCode()) ?></span>
+                        </span>
+                        <div class="rating-result"
+                             id="rating-result_<?= 'a'?>"
+                             title="<?= $block->escapeHtmlAttr($_vote->getPercent()) ?>%">
                             <meta itemprop="worstRating" content = "1"/>
                             <meta itemprop="bestRating" content = "100"/>
                             <span style="width:<?= $block->escapeHtmlAttr($_vote->getPercent()) ?>%">
@@ -46,11 +52,18 @@ $format = $block->getDateFormat() ?: \IntlDateFormatter::SHORT;
                 <div class="review-details">
                     <p class="review-author">
                         <span class="review-details-label"><?= $block->escapeHtml(__('Review by')) ?></span>
-                        <strong class="review-details-value" itemprop="author"><?= $block->escapeHtml($_review->getNickname()) ?></strong>
+                        <strong class="review-details-value"
+                                itemprop="author"><?= $block->escapeHtml($_review->getNickname()) ?></strong>
                     </p>
                     <p class="review-date">
                         <span class="review-details-label"><?= $block->escapeHtml(__('Posted on')) ?></span>
-                        <time class="review-details-value" itemprop="datePublished" datetime="<?= $block->escapeHtmlAttr($block->formatDate($_review->getCreatedAt(), $format)) ?>"><?= $block->escapeHtml($block->formatDate($_review->getCreatedAt(), $format)) ?></time>
+                        <time class="review-details-value"
+                              itemprop="datePublished"
+                              datetime="<?= $block->escapeHtmlAttr($block->formatDate(
+                                  $_review->getCreatedAt(),
+                                  $format
+                              )) ?>"><?= $block->escapeHtml($block->formatDate($_review->getCreatedAt(), $format)) ?>
+                        </time>
                     </p>
                 </div>
             </li>
diff --git a/lib/internal/Magento/Framework/View/Helper/Js.php b/lib/internal/Magento/Framework/View/Helper/Js.php
index fe120562cb79e..c4b14ad88d45a 100644
--- a/lib/internal/Magento/Framework/View/Helper/Js.php
+++ b/lib/internal/Magento/Framework/View/Helper/Js.php
@@ -16,6 +16,20 @@
  */
 class Js
 {
+    /**
+     * @var SecureHtmlRenderer
+     */
+    protected $secureRenderer;
+
+    /**
+     * @param SecureHtmlRenderer $htmlRenderer
+     */
+    public function __construct(
+        SecureHtmlRenderer $htmlRenderer
+    ) {
+        $this->secureRenderer = $htmlRenderer;
+    }
+
     /**
      * Retrieve framed javascript
      *
@@ -24,9 +38,8 @@ class Js
      */
     public function getScript($script)
     {
-        $secureHtmlRenderer = ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
         $scriptString = '//<![CDATA[' . "\n{$script}\n" . '//]]>';
 
-        return /* @noEscape */ $secureHtmlRenderer->renderTag('script', [], $scriptString, false);
+        return /* @noEscape */ $this->secureRenderer->renderTag('script', [], $scriptString, false);
     }
 }

From a3c8b9727aa29a8ed98985ecc2684064abb80835 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Tue, 14 Apr 2020 12:10:41 +0300
Subject: [PATCH 0160/1718] MC-33346: [2.4.0][Unit]
 Magento.Checkout.Test.Unit.Controller.Sidebar.RemoveItemTest.testExecuteWithDbException
 fails because of changes from 2.4

---
 .../Controller/Sidebar/RemoveItemTest.php     | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/RemoveItemTest.php b/app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/RemoveItemTest.php
index c3b57664b3aea..94a8660619d80 100644
--- a/app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/RemoveItemTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/RemoveItemTest.php
@@ -231,12 +231,12 @@ public function testExecuteWithDbException(): void
         $itemId = 1;
         $dbError = 'Error';
         $message = __('An unspecified error occurred. Please contact us for assistance.');
-        $response = [
+        $responseData = [
             'success' => false,
             'error_message' => $message,
         ];
 
-        $this->getPropertyValue($this->removeItem, 'formKeyValidator')
+        $this->formKeyValidatorMock
             ->expects($this->once())
             ->method('validate')
             ->with($this->requestMock)
@@ -252,19 +252,18 @@ public function testExecuteWithDbException(): void
 
         $this->loggerMock->expects($this->once())->method('critical')->with($exception);
 
-        $this->sidebarMock->expects($this->once())->method('getResponseData')->with($message)->willReturn($response);
-        $encodedResponse = json_encode($response);
-        $this->jsonHelperMock->expects($this->once())
-            ->method('jsonEncode')
-            ->with($response)
-            ->willReturn($encodedResponse);
+        $this->sidebarMock->expects($this->once())->method('getResponseData')->with($message)->willReturn($responseData);
 
-        $this->responseMock->expects($this->once())
-            ->method('representJson')
-            ->with($encodedResponse)
-            ->willReturn($this->responseMock);
+        $resultJson = $this->createMock(ResultJson::class);
+        $resultJson->expects($this->once())
+            ->method('setData')
+            ->with($responseData)
+            ->willReturnSelf();
+        $this->resultJsonFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($resultJson);
 
-        $this->removeItem->execute();
+        $this->action->execute();
     }
 
     public function testExecuteWhenFormKeyValidationFailed()

From 75039dadeba22933be1eda6aa27dfb6320e7e480 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Tue, 14 Apr 2020 23:37:47 +0300
Subject: [PATCH 0161/1718] MC-33346: [2.4.0][Unit]
 Magento.Checkout.Test.Unit.Controller.Sidebar.RemoveItemTest.testExecuteWithDbException
 fails because of changes from 2.4

---
 .../Test/Unit/Controller/Sidebar/RemoveItemTest.php    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/RemoveItemTest.php b/app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/RemoveItemTest.php
index 94a8660619d80..a915078424424 100644
--- a/app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/RemoveItemTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/RemoveItemTest.php
@@ -241,7 +241,10 @@ public function testExecuteWithDbException(): void
             ->method('validate')
             ->with($this->requestMock)
             ->willReturn(true);
-        $this->requestMock->expects($this->once())->method('getParam')->with('item_id')->willReturn($itemId);
+        $this->requestMock->expects($this->once())
+            ->method('getParam')
+            ->with('item_id')
+            ->willReturn($itemId);
 
         $exception = new \Zend_Db_Exception($dbError);
 
@@ -252,7 +255,10 @@ public function testExecuteWithDbException(): void
 
         $this->loggerMock->expects($this->once())->method('critical')->with($exception);
 
-        $this->sidebarMock->expects($this->once())->method('getResponseData')->with($message)->willReturn($responseData);
+        $this->sidebarMock->expects($this->once())
+            ->method('getResponseData')
+            ->with($message)
+            ->willReturn($responseData);
 
         $resultJson = $this->createMock(ResultJson::class);
         $resultJson->expects($this->once())

From 9855f2c31695d4ea59fa9cafc606d88ca0fca794 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Tue, 14 Apr 2020 23:42:28 +0300
Subject: [PATCH 0162/1718] MC-31149: Improve customer custom attribute value
 validation

---
 .../Eav/Test/Unit/Model/Attribute/Data/FileTest.php       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/FileTest.php b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/FileTest.php
index 3060aaa60ec3f..efc2c904c3549 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/FileTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/FileTest.php
@@ -17,6 +17,7 @@
 use Magento\Framework\Url\EncoderInterface;
 use Magento\MediaStorage\Model\File\Validator\NotProtectedExtension;
 use Psr\Log\LoggerInterface;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Test for Magento\Eav\Model\Attribute\Data\File class.
@@ -31,15 +32,18 @@ class FileTest extends \PHPUnit\Framework\TestCase
     protected $model;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|EncoderInterface
+     * @var MockObject|EncoderInterface
      */
     protected $urlEncoder;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var MockObject
      */
     protected $fileValidatorMock;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
         $timezoneMock = $this->createMock(TimezoneInterface::class);

From 4aa10676c0b54be6a2063bf11b93524802f99e3b Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Wed, 15 Apr 2020 19:09:40 +0300
Subject: [PATCH 0163/1718] MC-29420: Remove event handlers from CE

---
 app/code/Magento/Backend/Block/Template.php   |   4 +
 .../Adminhtml/Category/Helper/Pricestep.php   |  47 ++-
 .../Category/Helper/Sortby/Available.php      |  19 +-
 .../Category/Helper/Sortby/DefaultSortby.php  |  19 +-
 .../Catalog/Block/Adminhtml/Category/Tree.php |  33 +-
 .../Block/Adminhtml/Helper/Form/Wysiwyg.php   |  44 ++-
 .../Catalog/Block/Adminhtml/Product/Edit.php  |   5 +-
 .../Edit/Action/Attribute/Tab/Attributes.php  |  21 +-
 .../Adminhtml/Product/Edit/AttributeSet.php   |   4 +
 .../Block/Adminhtml/Product/Edit/Js.php       |   3 +
 .../Adminhtml/Product/Edit/NewCategory.php    |  22 +-
 .../Product/Edit/Tab/Attributes/Search.php    |   4 +
 .../Product/Edit/Tab/Options/Option.php       |   5 +
 .../Adminhtml/Product/Edit/Tab/Price/Tier.php |  42 +++
 .../Adminhtml/Product/Helper/Form/Apply.php   |  18 +-
 .../Product/Helper/Form/Category.php          |  30 +-
 .../Adminhtml/Product/Helper/Form/Config.php  |  23 +-
 .../Product/Helper/Form/Gallery/Content.php   |   4 +
 .../Adminhtml/Product/Helper/Form/Image.php   |  19 +-
 .../Adminhtml/Product/Helper/Form/Weight.php  |  21 +-
 .../category/edit/assign_products.phtml       |   7 +-
 .../form/renderer/fieldset/element.phtml      |  34 +-
 .../catalog/product/attribute/js.phtml        |  48 ++-
 .../catalog/product/attribute/set/main.phtml  |  81 +++--
 .../attribute/set/main/tree/group.phtml       |   7 +-
 .../product/attribute/set/toolbar/add.phtml   |  11 +-
 .../composite/fieldset/options/js.phtml       |   8 +-
 .../fieldset/options/type/date.phtml          |  52 ++-
 .../fieldset/options/type/file.phtml          |  70 ++--
 .../templates/catalog/product/edit.phtml      |  38 +-
 .../product/edit/action/inventory.phtml       |  49 ++-
 .../product/edit/action/websites.phtml        |  39 +-
 .../catalog/product/edit/attribute_set.phtml  |  11 +-
 .../catalog/product/edit/options/option.phtml |  60 ++--
 .../catalog/product/edit/price/tier.phtml     | 164 ++++++---
 .../catalog/product/edit/websites.phtml       |  37 +-
 .../catalog/product/helper/gallery.phtml      |  21 +-
 .../templates/catalog/product/js.phtml        |  30 +-
 .../catalog/product/tab/inventory.phtml       | 334 ++++++++++++------
 .../product/edit/attribute/search.phtml       |  26 +-
 .../product/grid/massaction_extended.phtml    |  52 +--
 .../fieldset/options/view/checkable.phtml     |  13 +-
 .../catalog/product/attribute/set/js.phtml    |  22 +-
 app/code/Magento/Csp/etc/config.xml           |  12 +-
 44 files changed, 1161 insertions(+), 452 deletions(-)

diff --git a/app/code/Magento/Backend/Block/Template.php b/app/code/Magento/Backend/Block/Template.php
index 3ae4451a2592f..46777427ec70b 100644
--- a/app/code/Magento/Backend/Block/Template.php
+++ b/app/code/Magento/Backend/Block/Template.php
@@ -8,6 +8,9 @@
 
 namespace Magento\Backend\Block;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Json\Helper\Data;
+
 /**
  * Standard admin block. Adds admin-specific behavior and event.
  * Should be used when you declare a block in admin layout handle.
@@ -69,6 +72,7 @@ public function __construct(\Magento\Backend\Block\Template\Context $context, ar
         $this->_backendSession = $context->getBackendSession();
         $this->formKey = $context->getFormKey();
         $this->nameBuilder = $context->getNameBuilder();
+        $data['jsonHelper'] = ObjectManager::getInstance()->get(Data::class);
         parent::__construct($context, $data);
     }
 
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php
index 3266922d116ec..acffce3ca0b8c 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Pricestep.php
@@ -11,11 +11,45 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Category\Helper;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Data\Form\Element\CollectionFactory;
+use Magento\Framework\Data\Form\Element\Factory;
+use Magento\Framework\Escaper;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 /**
  * Pricestep Helper
  */
 class Pricestep extends \Magento\Framework\Data\Form\Element\Text
 {
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
+    /**
+     * @param Factory $factoryElement
+     * @param CollectionFactory $factoryCollection
+     * @param Escaper $escaper
+     * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
+     */
+    public function __construct(
+        Factory $factoryElement,
+        CollectionFactory $factoryCollection,
+        Escaper $escaper,
+        $data = [],
+        ?SecureHtmlRenderer $secureRenderer = null
+    ) {
+        parent::__construct(
+            $factoryElement,
+            $factoryCollection,
+            $escaper,
+            $data
+        );
+        $this->secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+    }
+
     /**
      * Returns js code that is used instead of default toggle code for "Use default config" checkbox
      *
@@ -53,18 +87,23 @@ public function getElementHtml()
             $html .= ' disabled="disabled"';
         }
 
-        $html .= ' onclick="toggleValueElements(this, this.parentNode);" class="checkbox" type="checkbox" />';
+        $html .= ' class="checkbox" type="checkbox" />';
 
         $html .= ' <label for="' . $htmlId . '" class="normal">' . __('Use Config Settings') . '</label>';
-        $html .= '<script>' .
+        $scriptString =
             'require(["prototype"], function(){'.
             'toggleValueElements($(\'' .
             $htmlId .
             '\'), $(\'' .
             $htmlId .
             '\').parentNode);' .
-            '});'.
-            '</script>';
+            '});';
+        $html .= /* @noEscape */ $this->secureRenderer->renderTag('script', [], $scriptString, false);
+        $html .= /* @noEscape */ $this->secureRenderer->renderEventListenerAsTag(
+            'onclick',
+            "toggleValueElements(this, this.parentNode);",
+            '#' . $htmlId
+        );
 
         return $html;
     }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/Available.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/Available.php
index 2a88d0f4d4f15..dbd4385059c73 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/Available.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/Available.php
@@ -11,8 +11,15 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby;
 
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 class Available extends \Magento\Framework\Data\Form\Element\Multiselect
 {
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
     /**
      * Returns js code that is used instead of default toggle code for "Use default config" checkbox
      *
@@ -49,13 +56,19 @@ public function getElementHtml()
             $html .= ' disabled="disabled"';
         }
 
-        $html .= ' onclick="toggleValueElements(this, this.parentNode);" class="checkbox" type="checkbox" />';
+        $html .= ' class="checkbox" type="checkbox" />';
         $html .= ' <label for="' . $htmlId . '" class="normal">' . __('Use All Available Attributes') . '</label>';
-        $html .= '<script>require(["prototype"], function(){toggleValueElements($(\'' .
+        $scriptString = 'require(["prototype"], function(){toggleValueElements($(\'' .
             $htmlId .
             '\'), $(\'' .
             $htmlId .
-            '\').parentNode);});</script>';
+            '\').parentNode);});';
+        $html .= /* @noEscape */ $this->secureRenderer->renderTag('script', [], $scriptString, false);
+        $html .= /* @noEscape */ $this->secureRenderer->renderEventListenerAsTag(
+            'onclick',
+            "toggleValueElements(this, this.parentNode);",
+            '#' . $htmlId
+        );
 
         return $html;
     }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/DefaultSortby.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/DefaultSortby.php
index 2d887d05f62ad..bac0e8465411d 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/DefaultSortby.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/DefaultSortby.php
@@ -11,8 +11,15 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby;
 
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 class DefaultSortby extends \Magento\Framework\Data\Form\Element\Select
 {
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
     /**
      * Returns js code that is used instead of default toggle code for "Use default config" checkbox
      *
@@ -49,13 +56,19 @@ public function getElementHtml()
             $html .= ' disabled="disabled"';
         }
 
-        $html .= ' onclick="toggleValueElements(this, this.parentNode);" class="checkbox" type="checkbox" />';
+        $html .= ' class="checkbox" type="checkbox" />';
         $html .= ' <label for="' . $htmlId . '" class="normal">' . __('Use Config Settings') . '</label>';
-        $html .= '<script>require(["prototype"], function(){toggleValueElements($(\'' .
+        $scriptString = 'require(["prototype"], function(){toggleValueElements($(\'' .
             $htmlId .
             '\'), $(\'' .
             $htmlId .
-            '\').parentNode);});</script>';
+            '\').parentNode);});';
+        $html .= /* @noEscape */ $this->secureRenderer->renderTag('script', [], $scriptString, false);
+        $html .= /* @noEscape */ $this->secureRenderer->renderEventListenerAsTag(
+            'onclick',
+            "toggleValueElements(this, this.parentNode);",
+            '#' . $htmlId
+        );
 
         return $html;
     }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
index 929c181bf820c..7d6db21fd4cef 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
@@ -10,16 +10,19 @@
 namespace Magento\Catalog\Block\Adminhtml\Category;
 
 use Magento\Catalog\Model\ResourceModel\Category\Collection;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Data\Tree\Node;
+use Magento\Framework\Math\Random;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 use Magento\Store\Model\Store;
 
 /**
- * Class Tree
+ * Class Category Tree
  *
  * @api
- * @package Magento\Catalog\Block\Adminhtml\Category
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
  * @since 100.0.2
  */
 class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
@@ -44,6 +47,16 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
      */
     protected $_jsonEncoder;
 
+    /**
+     * @var SecureHtmlRenderer
+     */
+    protected $secureRenderer;
+
+    /**
+     * @var Random
+     */
+    private $random;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Catalog\Model\ResourceModel\Category\Tree $categoryTree
@@ -53,6 +66,8 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
      * @param \Magento\Framework\DB\Helper $resourceHelper
      * @param \Magento\Backend\Model\Auth\Session $backendSession
      * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
+     * @param Random|null $random
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -62,12 +77,18 @@ public function __construct(
         \Magento\Framework\Json\EncoderInterface $jsonEncoder,
         \Magento\Framework\DB\Helper $resourceHelper,
         \Magento\Backend\Model\Auth\Session $backendSession,
-        array $data = []
+        array $data = [],
+        ?SecureHtmlRenderer $secureRenderer = null,
+        ?Random $random = null
     ) {
         $this->_jsonEncoder = $jsonEncoder;
         $this->_resourceHelper = $resourceHelper;
         $this->_backendSession = $backendSession;
         parent::__construct($context, $categoryTree, $registry, $categoryFactory, $data);
+        $secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+        $random = $random ?? ObjectManager::getInstance()->get(Random::class);
+        $this->secureRenderer = $secureRenderer;
+        $this->random = $random;
     }
 
     /**
@@ -336,12 +357,14 @@ public function getBreadcrumbsJavascript($path, $javascriptVarName)
         foreach ($categories as $key => $category) {
             $categories[$key] = $this->_getNodeJson($category);
         }
-        return '<script>require(["prototype"], function(){' . $javascriptVarName . ' = ' . $this->_jsonEncoder->encode(
+        $scriptString = 'require(["prototype"], function(){' . $javascriptVarName . ' = ' . $this->_jsonEncoder->encode(
             $categories
         ) .
             ';' .
             ($this->canAddSubCategory() ? '$("add_subcategory_button").show();' : '$("add_subcategory_button").hide();')
-            . '});</script>';
+            . '});';
+
+        return /* @noEscape */ $this->secureRenderer->renderTag('script', [], $scriptString, false);
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php b/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php
index c58ed58370e3a..95b7397e385a6 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php
@@ -11,8 +11,14 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Helper\Form;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Math\Random;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 /**
  * Wysiwyg helper.
+ *
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
  */
 class Wysiwyg extends \Magento\Framework\Data\Form\Element\Textarea
 {
@@ -40,6 +46,16 @@ class Wysiwyg extends \Magento\Framework\Data\Form\Element\Textarea
      */
     protected $_layout;
 
+    /**
+     * @var SecureHtmlRenderer
+     */
+    protected $secureRenderer;
+
+    /**
+     * @var Random
+     */
+    private $random;
+
     /**
      * @param \Magento\Framework\Data\Form\Element\Factory $factoryElement
      * @param \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection
@@ -49,6 +65,8 @@ class Wysiwyg extends \Magento\Framework\Data\Form\Element\Textarea
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Backend\Helper\Data $backendData
      * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
+     * @param Random|null $random
      */
     public function __construct(
         \Magento\Framework\Data\Form\Element\Factory $factoryElement,
@@ -58,13 +76,19 @@ public function __construct(
         \Magento\Framework\View\LayoutInterface $layout,
         \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Backend\Helper\Data $backendData,
-        array $data = []
+        array $data = [],
+        ?SecureHtmlRenderer $secureRenderer = null,
+        ?Random $random = null
     ) {
         $this->_wysiwygConfig = $wysiwygConfig;
         $this->_layout = $layout;
         $this->_moduleManager = $moduleManager;
         $this->_backendData = $backendData;
         parent::__construct($factoryElement, $factoryCollection, $escaper, $data);
+        $secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+        $random = $random ?? ObjectManager::getInstance()->get(Random::class);
+        $this->secureRenderer = $secureRenderer;
+        $this->random = $random;
     }
 
     /**
@@ -79,24 +103,22 @@ public function getAfterElementHtml()
 
         $html = parent::getAfterElementHtml();
         if ($this->getIsWysiwygEnabled()) {
+            $buttonId = 'wysiwyg_action_button_' . $this->random->getRandomString(32);
             $disabled = $this->getDisabled() || $this->getReadonly();
             $html .= $this->_layout->createBlock(
                 \Magento\Backend\Block\Widget\Button::class,
                 '',
                 [
                     'data' => [
+                        'id' => $buttonId,
                         'label' => __('WYSIWYG Editor'),
                         'type' => 'button',
                         'disabled' => $disabled,
                         'class' => 'action-wysiwyg',
-                        'onclick' => 'catalogWysiwygEditor.open(\'' . $this->_backendData->getUrl(
-                            'catalog/product/wysiwyg'
-                        ) . '\', \'' . $this->getHtmlId() . '\')',
                     ]
                 ]
             )->toHtml();
-            $html .= <<<HTML
-<script>
+            $scriptString = <<<HTML
 require([
     'jquery',
     'mage/adminhtml/wysiwyg/tiny_mce/setup'
@@ -119,9 +141,17 @@ public function getAfterElementHtml()
         editor
     );
 });
-</script>
 HTML;
+            $html .= /* @noEscape */ $this->secureRenderer->renderTag('script', [], $scriptString, false);
+            $html .= /* @noEscape */ $this->secureRenderer->renderEventListenerAsTag(
+                'onclick',
+                'catalogWysiwygEditor.open(\'' . $this->_backendData->getUrl(
+                    'catalog/product/wysiwyg'
+                ) . '\', \'' . $this->getHtmlId() . '\')',
+                $buttonId
+            );
         }
+
         return $html;
     }
 
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
index e6afc41ebebac..5be85db894c40 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
@@ -12,10 +12,12 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Product;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Escaper;
+use Magento\Framework\Json\Helper\Data;
 
 /**
- * Class Edit
+ * Class for Product Edit.
  */
 class Edit extends \Magento\Backend\Block\Widget
 {
@@ -74,6 +76,7 @@ public function __construct(
         $this->_coreRegistry = $registry;
         $this->jsonEncoder = $jsonEncoder;
         $this->escaper = $escaper;
+        $data['helper'] = ObjectManager::getInstance()->get(Data::class);
         parent::__construct($context, $data);
     }
 
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
index 1ebfa14200364..287a24e0aaca0 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
@@ -22,9 +22,11 @@
 use Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Weight;
 use Magento\Catalog\Helper\Product\Edit\Action\Attribute;
 use Magento\Catalog\Model\ProductFactory;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Data\Form\Element\AbstractElement;
 use Magento\Framework\Data\FormFactory;
 use Magento\Framework\Registry;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
 /**
  * Attributes tab block
@@ -51,6 +53,11 @@ class Attributes extends Form implements TabInterface
      */
     private $excludeFields;
 
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
     /**
      * @param Context $context
      * @param Registry $registry
@@ -59,6 +66,7 @@ class Attributes extends Form implements TabInterface
      * @param Attribute $attributeAction
      * @param array $data
      * @param array|null $excludeFields
+     * @param SecureHtmlRenderer|null $secureRenderer
      */
     public function __construct(
         Context $context,
@@ -67,13 +75,15 @@ public function __construct(
         ProductFactory $productFactory,
         Attribute $attributeAction,
         array $data = [],
-        array $excludeFields = null
+        array $excludeFields = null,
+        ?SecureHtmlRenderer $secureRenderer = null
     ) {
         $this->_attributeAction = $attributeAction;
         $this->_productFactory = $productFactory;
         $this->excludeFields = $excludeFields ?: [];
 
         parent::__construct($context, $registry, $formFactory, $data);
+        $this->secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
     }
 
     /**
@@ -146,13 +156,20 @@ protected function _getAdditionalElementHtml($element)
         // @codingStandardsIgnoreStart
         $html = <<<HTML
 <span class="attribute-change-checkbox">
-    <input type="checkbox" id="$dataCheckboxName" name="$dataCheckboxName" class="checkbox" $nameAttributeHtml onclick="toogleFieldEditMode(this, '{$elementId}')" $dataAttribute />
+    <input type="checkbox" id="$dataCheckboxName" name="$dataCheckboxName"
+           class="checkbox" $nameAttributeHtml $dataAttribute />
     <label class="label" for="$dataCheckboxName">
         {$checkboxLabel}
     </label>
 </span>
 HTML;
 
+        $html .= /* @noEscape */ $this->secureRenderer->renderEventListenerAsTag(
+            'onclick',
+            "toogleFieldEditMode(this, '{$elementId}')",
+            "#". $dataCheckboxName
+        );
+
         // @codingStandardsIgnoreEnd
         return $html;
     }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/AttributeSet.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/AttributeSet.php
index d95ee7f8f2cf9..01c82df6b2293 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/AttributeSet.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/AttributeSet.php
@@ -11,6 +11,9 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Product\Edit;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Json\Helper\Data;
+
 /**
  * Admin AttributeSet block
  */
@@ -34,6 +37,7 @@ public function __construct(
         array $data = []
     ) {
         $this->_coreRegistry = $registry;
+        $data['jsonHelper'] = ObjectManager::getInstance()->get(Data::class);
         parent::__construct($context, $data);
     }
 
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Js.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Js.php
index 9712c0e03d609..4436099c215d9 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Js.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Js.php
@@ -9,6 +9,8 @@
 use Magento\Customer\Helper\Session\CurrentCustomer;
 use Magento\Tax\Api\TaxCalculationInterface;
 use Magento\Tax\Model\TaxClass\Source\Product as ProductTaxClassSource;
+use Magento\Framework\App\ObjectManager;
+use Magento\Tax\Helper\Data;
 
 class Js extends \Magento\Backend\Block\Template
 {
@@ -66,6 +68,7 @@ public function __construct(
         $this->jsonHelper = $jsonHelper;
         $this->calculationService = $calculationService;
         $this->productTaxClassSource = $productTaxClassSource;
+        $data['helper'] = ObjectManager::getInstance()->get(Data::class);
         parent::__construct($context, $data);
     }
 
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/NewCategory.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/NewCategory.php
index 0a766bc4c0cb3..ebc269f85d054 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/NewCategory.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/NewCategory.php
@@ -11,6 +11,9 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Product\Edit;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 /**
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
  */
@@ -26,13 +29,19 @@ class NewCategory extends \Magento\Backend\Block\Widget\Form\Generic
      */
     protected $_categoryFactory;
 
+    /**
+     * @var SecureHtmlRenderer
+     */
+    protected $secureRenderer;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\Data\FormFactory $formFactory
+     * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
      * @param array $data
+     * @param SecureHtmlRenderer|null $htmlRenderer
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -40,12 +49,14 @@ public function __construct(
         \Magento\Framework\Data\FormFactory $formFactory,
         \Magento\Framework\Json\EncoderInterface $jsonEncoder,
         \Magento\Catalog\Model\CategoryFactory $categoryFactory,
-        array $data = []
+        array $data = [],
+        SecureHtmlRenderer $htmlRenderer = null
     ) {
         $this->_jsonEncoder = $jsonEncoder;
         $this->_categoryFactory = $categoryFactory;
         parent::__construct($context, $registry, $formFactory, $data);
         $this->setUseContainer(true);
+        $this->secureRenderer = $htmlRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
     }
 
     /**
@@ -153,14 +164,13 @@ public function getAfterElementHtml()
             ]
         );
         //TODO: JavaScript logic should be moved to separate file or reviewed
-        return <<<HTML
-<script>
+        $scriptString =  <<<HTML
 require(["jquery","mage/mage"],function($) {  // waiting for dependencies at first
     $(function(){ // waiting for page to load to have '#category_ids-template' available
-        $('#new-category').mage('newCategoryDialog', $widgetOptions);
+        $('#new-category').mage('newCategoryDialog', {$widgetOptions});
     });
 });
-</script>
 HTML;
+        return /* @noEscape */ $this->secureRenderer->renderTag('script', [], $scriptString, false);
     }
 }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
index 42463354926dd..7bef31e0839a3 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
@@ -11,6 +11,9 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Json\Helper\Data;
+
 /**
  * Admin product attribute search block
  */
@@ -50,6 +53,7 @@ public function __construct(
         $this->_resourceHelper = $resourceHelper;
         $this->_collectionFactory = $collectionFactory;
         $this->_coreRegistry = $registry;
+        $data['jsonHelper'] = ObjectManager::getInstance()->get(Data::class);
         parent::__construct($context, $data);
     }
 
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
index ccf207938ab06..642f383d4134f 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
@@ -14,6 +14,8 @@
 use Magento\Backend\Block\Widget;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Json\Helper\Data;
 use Magento\Store\Model\Store;
 
 /**
@@ -95,6 +97,7 @@ public function __construct(
         $this->_product = $product;
         $this->_productOptionConfig = $productOptionConfig;
         $this->_coreRegistry = $registry;
+        $data['jsonHelper'] = ObjectManager::getInstance()->get(Data::class);
         parent::__construct($context, $data);
     }
 
@@ -482,6 +485,8 @@ public function getPriceValue($value, $type)
         } elseif ($type == 'fixed') {
             return number_format((float)$value, 2, null, '');
         }
+
+        return '';
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php
index 7cb1c2c9e4263..993b256fb7317 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php
@@ -5,6 +5,11 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Price;
 
+use Magento\Customer\Api\GroupManagementInterface;
+use Magento\Customer\Api\GroupRepositoryInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Json\Helper\Data;
+
 /**
  * Adminhtml tier price item renderer
  */
@@ -15,6 +20,42 @@ class Tier extends Group\AbstractGroup
      */
     protected $_template = 'Magento_Catalog::catalog/product/edit/price/tier.phtml';
 
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param GroupRepositoryInterface $groupRepository
+     * @param \Magento\Directory\Helper\Data $directoryHelper
+     * @param \Magento\Framework\Module\Manager $moduleManager
+     * @param \Magento\Framework\Registry $registry
+     * @param GroupManagementInterface $groupManagement
+     * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param \Magento\Framework\Locale\CurrencyInterface $localeCurrency
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        GroupRepositoryInterface $groupRepository,
+        \Magento\Directory\Helper\Data $directoryHelper,
+        \Magento\Framework\Module\Manager $moduleManager,
+        \Magento\Framework\Registry $registry,
+        GroupManagementInterface $groupManagement,
+        \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder,
+        \Magento\Framework\Locale\CurrencyInterface $localeCurrency,
+        array $data = []
+    ) {
+        $data['jsonHelper'] = ObjectManager::getInstance()->get(Data::class);
+        parent::__construct(
+            $context,
+            $groupRepository,
+            $directoryHelper,
+            $moduleManager,
+            $registry,
+            $groupManagement,
+            $searchCriteriaBuilder,
+            $localeCurrency,
+            $data
+        );
+    }
+
     /**
      * Retrieve list of initial customer groups
      *
@@ -62,6 +103,7 @@ protected function _sortTierPrices($a, $b)
 
     /**
      * Prepare global layout
+     *
      * Add "Add tier" button to layout
      *
      * @return $this
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Apply.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Apply.php
index 86ed3d09d5728..101daec2b4906 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Apply.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Apply.php
@@ -11,9 +11,18 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form;
 
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 class Apply extends \Magento\Framework\Data\Form\Element\Multiselect
 {
     /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
+    /**
+     * Return html of the element.
+     *
      * @return string
      */
     public function getElementHtml()
@@ -28,12 +37,19 @@ public function getElementHtml()
             $elementAttributeHtml = $elementAttributeHtml . ' disabled="disabled"';
         }
 
-        $html = '<select onchange="toggleApplyVisibility(this)"' . $elementAttributeHtml . '>'
+        $html = '<select id="' . $this->getHtmlId() . '"' . $elementAttributeHtml . '>'
             . '<option value="0">' . $this->getModeLabels('all') . '</option>'
             . '<option value="1" ' . ($this->getValue() == null ? '' : 'selected') . '>'
             . $this->getModeLabels('custom') . '</option>' . '</select><br /><br />';
 
+        $html .= /* @noEscape */ $this->secureRenderer->renderEventListenerAsTag(
+            'onchange',
+            "toggleApplyVisibility(this)",
+            'select#' . $this->getHtmlId()
+        );
+
         $html .= parent::getElementHtml();
+
         return $html;
     }
 
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php
index df372312613f4..f1d3483e9dbd0 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php
@@ -7,7 +7,9 @@
 namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form;
 
 use Magento\Catalog\Model\ResourceModel\Category\Collection;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\AuthorizationInterface;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
 /**
  * Product form category field helper
@@ -41,6 +43,11 @@ class Category extends \Magento\Framework\Data\Form\Element\Multiselect
      */
     protected $authorization;
 
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
     /**
      * @param \Magento\Framework\Data\Form\Element\Factory $factoryElement
      * @param \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection
@@ -51,6 +58,8 @@ class Category extends \Magento\Framework\Data\Form\Element\Multiselect
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param AuthorizationInterface $authorization
      * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\Data\Form\Element\Factory $factoryElement,
@@ -61,7 +70,8 @@ public function __construct(
         \Magento\Framework\View\LayoutInterface $layout,
         \Magento\Framework\Json\EncoderInterface $jsonEncoder,
         AuthorizationInterface $authorization,
-        array $data = []
+        array $data = [],
+        ?SecureHtmlRenderer $secureRenderer = null
     ) {
         $this->_jsonEncoder = $jsonEncoder;
         $this->_collectionFactory = $collectionFactory;
@@ -69,6 +79,7 @@ public function __construct(
         $this->authorization = $authorization;
         parent::__construct($factoryElement, $factoryCollection, $escaper, $data);
         $this->_layout = $layout;
+        $this->secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
         if (!$this->isAllowed()) {
             $this->setType('hidden');
             $this->addClass('hidden');
@@ -130,19 +141,26 @@ public function getAfterElementHtml()
                 'id' => 'add_category_button',
                 'label' => $newCategoryCaption,
                 'title' => $newCategoryCaption,
-                'onclick' => 'jQuery("#new-category").modal("openModal")',
                 'disabled' => $this->getDisabled(),
             ]
         );
         $return = <<<HTML
     <input id="{$htmlId}-suggest" placeholder="$suggestPlaceholder" />
-    <script>
+HTML;
+        $scriptString = <<<script
         require(["jquery", "mage/mage"], function($){
             $('#{$htmlId}-suggest').mage('treeSuggest', {$selectorOptions});
         });
-    </script>
-HTML;
-        return $return . $button->toHtml();
+script;
+
+        return $return .
+            /* @noEscape */ $this->secureRenderer->renderTag('script', [], $scriptString, false) .
+            $button->toHtml() .
+            /* @noEscape */ $this->secureRenderer->renderEventListenerAsTag(
+                'onclick',
+                'jQuery("#new-category").modal("openModal")',
+                '#add_category_button'
+            );
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Config.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Config.php
index 0c82ac537689f..bec1a57320aa0 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Config.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Config.php
@@ -11,8 +11,19 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form;
 
+use Magento\Framework\Data\Form\Element\CollectionFactory;
+use Magento\Framework\Data\Form\Element\Factory;
+use Magento\Framework\Escaper;
+use Magento\Framework\Math\Random;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 class Config extends \Magento\Framework\Data\Form\Element\Select
 {
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
     /**
      * Retrieve element html
      *
@@ -31,13 +42,19 @@ public function getElementHtml()
         $disabled = $this->getReadonly() ? ' disabled="disabled"' : '';
 
         $html .= '<input id="' . $htmlId . '" name="product[' . $htmlId . ']" ' . $disabled . ' value="1" ' . $checked;
-        $html .= ' onclick="toggleValueElements(this, this.parentNode);" class="checkbox" type="checkbox" />';
+        $html .= ' class="checkbox" type="checkbox" />';
         $html .= ' <label for="' . $htmlId . '">' . __('Use Config Settings') . '</label>';
-        $html .= '<script>require(["prototype"], function(){toggleValueElements($(\'' .
+        $scriptString = 'require(["prototype"], function(){toggleValueElements($(\'' .
             $htmlId .
             '\'), $(\'' .
             $htmlId .
-            '\').parentNode);});</script>';
+            '\').parentNode);});';
+        $html .= /* @noEscape */ $this->secureRenderer->renderTag('script', [], $scriptString, false);
+        $html .= /* @noEscape */ $this->secureRenderer->renderEventListenerAsTag(
+            'onclick',
+            "toggleValueElements(this, this.parentNode);",
+            '#' . $htmlId
+        );
 
         return $html;
     }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
index 8e6011c09a27f..c5a7bf3ae5fd6 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
@@ -15,6 +15,7 @@
 
 use Magento\Framework\App\ObjectManager;
 use Magento\Backend\Block\Media\Uploader;
+use Magento\Framework\Json\Helper\Data;
 use Magento\Framework\View\Element\AbstractBlock;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\FileSystemException;
@@ -23,6 +24,8 @@
 
 /**
  * Block for gallery content.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Content extends \Magento\Backend\Block\Widget
 {
@@ -74,6 +77,7 @@ public function __construct(
     ) {
         $this->_jsonEncoder = $jsonEncoder;
         $this->_mediaConfig = $mediaConfig;
+        $data['jsonHelper'] = ObjectManager::getInstance()->get(Data::class);
         parent::__construct($context, $data);
         $this->imageUploadConfigDataProvider = $imageUploadConfigDataProvider
             ?: ObjectManager::getInstance()->get(ImageUploadConfigDataProvider::class);
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php
index 1cc6a5b56bf2c..5fa07b2077053 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php
@@ -11,9 +11,18 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form;
 
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 class Image extends \Magento\Framework\Data\Form\Element\Image
 {
     /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
+    /**
+     * Return generated url.
+     *
      * @return bool|string
      */
     protected function _getUrl()
@@ -24,10 +33,13 @@ protected function _getUrl()
                 ['_type' => \Magento\Framework\UrlInterface::URL_TYPE_MEDIA]
             ) . 'catalog/product/' . $this->getValue();
         }
+
         return $url;
     }
 
     /**
+     * Return generated delete checkbox.
+     *
      * @return string
      */
     protected function _getDeleteCheckbox()
@@ -39,18 +51,19 @@ protected function _getDeleteCheckbox()
             } else {
                 $inputField = '<input value="%s" id="%s_hidden" type="hidden" class="required-entry" />';
                 $html .= sprintf($inputField, $this->getValue(), $this->getHtmlId());
-                $html .= '<script>require(["prototype"], function(){
+                $scriptString = 'require(["prototype"], function(){
                     syncOnchangeValue(\'' .
                     $this->getHtmlId() .
                     '\', \'' .
                     $this->getHtmlId() .
                     '_hidden\');
-                });
-                </script>';
+                });';
+                $html .= /* @noEscape */ $this->secureRenderer->renderTag('script', [], $scriptString, false);
             }
         } else {
             $html .= parent::_getDeleteCheckbox();
         }
+
         return $html;
     }
 }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Weight.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Weight.php
index 70b2948501d2d..7fe51a7327d64 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Weight.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Weight.php
@@ -9,6 +9,7 @@
 
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Directory\Helper\Data;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Data\Form;
 use Magento\Catalog\Model\Product\Edit\WeightResolver;
 use Magento\Framework\Data\Form\Element\CollectionFactory;
@@ -17,6 +18,7 @@
 use Magento\Framework\Data\Form\Element\Text;
 use Magento\Framework\Escaper;
 use Magento\Framework\Locale\Format;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
 /**
  * Product form weight field helper
@@ -40,6 +42,11 @@ class Weight extends Text
      */
     protected $directoryHelper;
 
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
     /**
      * @param Factory $factoryElement
      * @param CollectionFactory $factoryCollection
@@ -47,6 +54,7 @@ class Weight extends Text
      * @param Format $localeFormat
      * @param Data $directoryHelper
      * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
      */
     public function __construct(
         Factory $factoryElement,
@@ -54,7 +62,8 @@ public function __construct(
         Escaper $escaper,
         Format $localeFormat,
         Data $directoryHelper,
-        array $data = []
+        array $data = [],
+        ?SecureHtmlRenderer $secureRenderer = null
     ) {
         $this->directoryHelper = $directoryHelper;
         $this->localeFormat = $localeFormat;
@@ -75,6 +84,7 @@ public function __construct(
         );
         parent::__construct($factoryElement, $factoryCollection, $escaper, $data);
         $this->addClass('validate-zero-or-greater');
+        $this->secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
     }
 
     /**
@@ -199,8 +209,7 @@ private function getHtmlForWeightSwitcher()
         $checkboxLabel = __('Change');
         $html .= <<<HTML
 <span class="attribute-change-checkbox">
-    <input type="checkbox" id="$dataCheckboxName" name="$dataCheckboxName" class="checkbox" $nameAttributeHtml
-        onclick="toogleFieldEditMode(this, 'weight-switcher1'); toogleFieldEditMode(this, 'weight-switcher0');" />
+    <input type="checkbox" id="$dataCheckboxName" name="$dataCheckboxName" class="checkbox" $nameAttributeHtml/>
     <label class="label" for="$dataCheckboxName">
         {$checkboxLabel}
     </label>
@@ -209,6 +218,12 @@ private function getHtmlForWeightSwitcher()
 
         $html .= '</label></div></div>';
 
+        $html .= /* @noEscape */ $this->secureRenderer->renderEventListenerAsTag(
+            'onclick',
+            "toogleFieldEditMode(this, 'weight-switcher1'); toogleFieldEditMode(this, 'weight-switcher0');",
+            "#". $dataCheckboxName
+        );
+
         return $html;
     }
 }
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit/assign_products.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit/assign_products.phtml
index af7aec12a57ed..e52b43b1c3d24 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit/assign_products.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit/assign_products.phtml
@@ -5,8 +5,9 @@
  */
 
 /** @var \Magento\Catalog\Block\Adminhtml\Category\AssignProducts $block */
-
 /** @var \Magento\Catalog\Block\Adminhtml\Category\Tab\Product $blockGrid */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+
 $blockGrid = $block->getBlockGrid();
 $gridJsObjectName = $blockGrid->getJsObjectName();
 ?>
@@ -23,6 +24,4 @@ $gridJsObjectName = $blockGrid->getJsObjectName();
     }
 </script>
 <!-- @todo remove when "UI components" will support such initialization -->
-<script>
-    require('mage/apply/main').apply();
-</script>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], "require('mage/apply/main').apply();", false) ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/form/renderer/fieldset/element.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/form/renderer/fieldset/element.phtml
index cbda491a64740..e340e83e1f520 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/form/renderer/fieldset/element.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/form/renderer/fieldset/element.phtml
@@ -5,14 +5,14 @@
  */
 ?>
 <?php
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-
 /** @var $block \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Element */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?php
 /* @var $block \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element */
 $element = $block->getElement();
-$note = $element->getNote() ? '<div class="note admin__field-note">' . $block->escapeHtml($element->getNote()) . '</div>' : '';
+$note = $element->getNote() ?
+    '<div class="note admin__field-note">' . $block->escapeHtml($element->getNote()) . '</div>' : '';
 $elementBeforeLabel = $element->getExtType() == 'checkbox' || $element->getExtType() == 'radio';
 $addOn = $element->getBeforeElementHtml() || $element->getAfterElementHtml();
 $fieldId = ($element->getHtmlId()) ? ' id="attribute-' . $element->getHtmlId() . '-container"' : '';
@@ -26,6 +26,7 @@ $fieldClass .= ($entity && $entity->getIsUserDefined()) ? ' user-defined type-'
 
 $fieldAttributes = $fieldId . ' class="' . $block->escapeHtmlAttr($fieldClass) . '" '
     . $block->getUiId('form-field', $block->escapeHtmlAttr($element->getId()));
+$jsonHelper = $block->getData('jsonHelper');
 ?>
 
 <?php $block->checkFieldDisable() ?>
@@ -33,20 +34,19 @@ $fieldAttributes = $fieldId . ' class="' . $block->escapeHtmlAttr($fieldClass) .
     $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode()
         : 'toggleValueElements(this, this.parentNode.parentNode.parentNode)';
 ?>
-<?php if (!$element->getNoDisplay()) :?>
-    <?php if ($element->getType() == 'hidden') :?>
+<?php if (!$element->getNoDisplay()):?>
+    <?php if ($element->getType() == 'hidden'):?>
         <?= $element->getElementHtml() ?>
-    <?php else :?>
+    <?php else:?>
     <div<?= /* @noEscape */ $fieldAttributes ?> data-attribute-code="<?= $element->getHtmlId() ?>"
-        data-apply-to="<?= $block->escapeHtmlAttr($this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode(
-            $element->hasEntityAttribute() ? $element->getEntityAttribute()->getApplyTo() : []
-        ))?>"
+        data-apply-to="<?= /* @noEscape */ $jsonHelper->jsonEncode($element->hasEntityAttribute() ?
+            $element->getEntityAttribute()->getApplyTo() : []) ?>"
         >
-        <?php if ($elementBeforeLabel) :?>
+        <?php if ($elementBeforeLabel):?>
             <?= $block->getElementHtml() ?>
             <?= $element->getLabelHtml('', $block->getScopeLabel()) ?>
             <?= /* @noEscape */ $note ?>
-        <?php else :?>
+        <?php else:?>
             <?= $element->getLabelHtml('', $block->getScopeLabel()) ?>
             <div class="admin__field-control control">
                 <?= ($addOn) ? '<div class="addon">' . $block->getElementHtml() . '</div>' : $block->getElementHtml() ?>
@@ -54,16 +54,20 @@ $fieldAttributes = $fieldId . ' class="' . $block->escapeHtmlAttr($fieldClass) .
             </div>
         <?php endif; ?>
         <div class="field-service">
-            <?php if ($block->canDisplayUseDefault()) :?>
+            <?php if ($block->canDisplayUseDefault()):?>
                 <label for="<?= $element->getHtmlId() ?>_default" class="choice use-default">
-                    <input <?php if ($element->getReadonly()) :?> disabled="disabled"<?php endif; ?>
+                    <input <?php if ($element->getReadonly()):?> disabled="disabled"<?php endif; ?>
                             type="checkbox"
                             name="use_default[]"
                             class="use-default-control"
                             id="<?= $element->getHtmlId() ?>_default"
-                            <?php if ($block->usedDefault()) :?> checked="checked"<?php endif; ?>
-                            onclick="<?= $block->escapeHtmlAttr($elementToggleCode) ?>"
+                            <?php if ($block->usedDefault()):?> checked="checked"<?php endif; ?>
                             value="<?= $block->escapeHtmlAttr($block->getAttributeCode()) ?>"/>
+                    <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                        'onclick',
+                        "toggleValueElements(this, this.parentNode);",
+                        "#" . $element->getHtmlId() . "_default"
+                    ) ?>
                     <span class="use-default-label"><?= $block->escapeHtml(__('Use Default Value')) ?></span>
                 </label>
             <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml
index 64384ac391a8d..1290df418e5a6 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml
@@ -5,9 +5,12 @@
  */
 use Magento\Catalog\Helper\Data;
 
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+/** @var \Magento\Backend\Block\Template $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<script>
+
+<?php $jsonHelper = $block->getData('jsonHelper');
+$scriptString = <<<script
 require([
     "jquery",
     'Magento_Ui/js/modal/alert',
@@ -207,32 +210,39 @@ function switchDefaultValueField()
             setRowVisibility('is_unique', false);
             setRowVisibility('frontend_class', false);
         break;
-
-        <?php // phpcs:ignore Magento2.Templates.ThisInTemplate ?>
-        <?php foreach ($this->helper(Data::class)->getAttributeHiddenFields() as $type => $fields): ?>
-            case '<?= $block->escapeJs($type) ?>':
+script;
+foreach ($jsonHelper->getAttributeHiddenFields() as $type => $fields):
+            $scriptString .= <<<script
+            case '{$block->escapeJs($type)}':
                 var isFrontTabHidden = false;
-                <?php foreach ($fields as $one): ?>
-                    <?php if ($one == '_front_fieldset'): ?>
+script;
+    foreach ($fields as $one):
+        if ($one == '_front_fieldset'):
+            $scriptString .= <<<script
                         getFrontTab().hide();
                         isFrontTabHidden = true;
-                    <?php elseif ($one == '_default_value'): ?>
+script;
+        elseif ($one == '_default_value'):
+            $scriptString .= <<<script
                         defaultValueTextVisibility =
                         defaultValueTextareaVisibility =
                         defaultValueDateVisibility =
                         defaultValueYesnoVisibility = false;
-                    <?php elseif ($one == '_scope'): ?>
-                        scopeVisibility = false;
-                    <?php else: ?>
-                        setRowVisibility('<?= $block->escapeJs($one) ?>', false);
-                    <?php endif; ?>
-                <?php endforeach; ?>
-
+script;
+        elseif ($one == '_scope'):
+            $scriptString .= 'scopeVisibility = false;';
+        else:
+            $scriptString .= "setRowVisibility('" . $block->escapeJs($one) . "', false);";
+        endif;
+    endforeach;
+    $scriptString .= <<<script
                 if (!isFrontTabHidden){
                   getFrontTab().show();
                 }
             break;
-        <?php endforeach; ?>
+script;
+        endforeach;
+        $scriptString .= <<<script
 
         default:
             getFrontTab().show();
@@ -364,4 +374,6 @@ window.getFrontTab = getFrontTab;
 window.toggleApplyVisibility = toggleApplyVisibility;
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml
index dd1009cc5e033..447a9c4149bfa 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml
@@ -5,6 +5,7 @@
  */
 
 /** @var $block Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <div class="attribute-set">
 
@@ -17,7 +18,7 @@
     </div>
     <div class="edit-attribute-set attribute-set-col">
         <?= $block->getSetFormHtml() ?>
-        <script>
+        <?php $scriptString = <<<script
             require([
                 "jquery",
                 "mage/mage"
@@ -26,14 +27,17 @@
                 jQuery('#set-prop-form').mage('validation', {errorClass: 'mage-error'});
 
             });
-        </script>
+script;
+        ?>
+        <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
     </div>
     <div class="attribute-set-col fieldset-wrapper">
         <div class="fieldset-wrapper-title">
             <span class="title"><?= $block->escapeHtml(__('Groups')) ?></span>
         </div>
-        <?php if (!$block->getIsReadOnly()) :?>
-            <?= /* @noEscape */ $block->getAddGroupButton() ?>&nbsp;<?= /* @noEscape */ $block->getDeleteGroupButton() ?>
+        <?php if (!$block->getIsReadOnly()):?>
+            <?= /* @noEscape */ $block->getAddGroupButton() ?>&nbsp;
+            <?= /* @noEscape */ $block->getDeleteGroupButton() ?>
             <p class="note-block"><?= $block->escapeHtml(__('Double click on a group to rename it.')) ?></p>
         <?php endif; ?>
 
@@ -45,8 +49,19 @@
             <span class="title"><?= $block->escapeHtml(__('Unassigned Attributes')) ?></span>
         </div>
         <div id="tree-div2" class="attribute-set-tree"></div>
-        <script id="ie-deferred-loader" defer="defer" src="//:"></script>
-        <script>
+        <?= /* @noEscape */ $secureRenderer->renderTag(
+            'script',
+            ['id' => "ie-deferred-loader",  'defer' => "defer", 'src' => "//:"],
+            '&nbsp;',
+            false
+        ) ?>
+        <?php $readOnly = ($block->getIsReadOnly() ? 'false' : 'true');
+        $groupTree = /* @noEscape */ $block->getGroupTreeJson();
+        $attributeTreeJson = /* @noEscape */ $block->getAttributeTreeJson();
+        $systemAttributeWarning = $block->escapeJs(
+            __('This group contains system attributes. Please move system attributes to another group and try again.')
+        );
+        $scriptString = <<<script
             define("tree-panel",
                 [
                     "jquery",
@@ -57,8 +72,8 @@
                 ], function(jQuery, prompt, alert){
 
                 //<![CDATA[
-                var allowDragAndDrop = <?= ($block->getIsReadOnly() ? 'false' : 'true') ?>;
-                var canEditGroups = <?=  ($block->getIsReadOnly() ? 'false' : 'true') ?>;
+                var allowDragAndDrop = {$readOnly};
+                var canEditGroups = {$readOnly};
 
                 var TreePanels = function() {
                     // shorthand
@@ -85,7 +100,7 @@
                             });
 
                             tree.setRootNode(this.root);
-                            buildCategoryTree(this.root, <?= /* @noEscape */ $block->getGroupTreeJson() ?>);
+                            buildCategoryTree(this.root, {$groupTree});
                             // render the tree
                             tree.render();
                             this.root.expand(false, false);
@@ -93,7 +108,7 @@
 
                             this.ge = new Ext.tree.TreeEditor(tree, {
                                 allowBlank:false,
-                                blankText:'<?= $block->escapeJs(__('A name is required.')) ?>',
+                                blankText:'{$block->escapeJs(__('A name is required.'))}',
                                 selectOnFocus:true,
                                 cls:'folder'
                             });
@@ -124,7 +139,7 @@
                                 id:'free'
                             });
                             tree2.setRootNode(this.root2);
-                            buildCategoryTree(this.root2, <?= /* @noEscape */ $block->getAttributeTreeJson() ?>);
+                            buildCategoryTree(this.root2, {$attributeTreeJson});
 
                             this.root2.addListener('beforeinsert', editSet.rightBeforeInsert);
                             this.root2.addListener('beforeappend', editSet.rightBeforeAppend);
@@ -144,12 +159,15 @@
                             for( i in rootNode.childNodes ) {
                                 if(rootNode.childNodes[i].id) {
                                     var group = rootNode.childNodes[i];
-                                    editSet.req.groups[gIterator] = new Array(group.id, group.attributes.text.strip(), (gIterator+1));
+                                    editSet.req.groups[gIterator] = new Array(group.id, group.attributes.text.strip(),
+                                     (gIterator+1));
                                     var iterator = 0
                                     for( j in group.childNodes ) {
                                         iterator ++;
                                         if( group.childNodes[j].id > 0 ) {
-                                            editSet.req.attributes[group.childNodes[j].id] = new Array(group.childNodes[j].id, group.id, iterator, group.childNodes[j].attributes.entity_id);
+                                            editSet.req.attributes[group.childNodes[j].id] =
+                                             new Array(group.childNodes[j].id, group.id, iterator,
+                                              group.childNodes[j].attributes.entity_id);
                                         }
                                     }
                                     iterator = 0;
@@ -164,7 +182,8 @@
                             for( i in rootNode.childNodes ) {
                                 if(rootNode.childNodes[i].id) {
                                     if( rootNode.childNodes[i].id > 0 ) {
-                                        editSet.req.not_attributes[iterator] = rootNode.childNodes[i].attributes.entity_id;
+                                        editSet.req.not_attributes[iterator] =
+                                         rootNode.childNodes[i].attributes.entity_id;
                                     }
                                     iterator ++;
                                 }
@@ -231,7 +250,7 @@
 
                             if( editSet.SystemNodesExists(editSet.currentNode) ) {
                                 alert({
-                                    content: '<?= $block->escapeJs(__('This group contains system attributes. Please move system attributes to another group and try again.')) ?>'
+                                    content: '{$systemAttributeWarning}'
                                 });
                                 return;
                             }
@@ -258,7 +277,7 @@
                         SystemNodesExists : function(currentNode) {
                             if (!currentNode) {
                                 alert({
-                                    content: '<?= $block->escapeJs(__('Please select a node.')) ?>'
+                                    content: '{$block->escapeJs(__('Please select a node.'))}'
                                 });
                                 return;
                             }
@@ -279,8 +298,8 @@
 
                         addGroup : function() {
                             prompt({
-                                title: "<?= $block->escapeJs($block->escapeHtml(__('Add New Group'))) ?>",
-                                content: "<?= $block->escapeJs($block->escapeHtml(__('Please enter a new group name.'))) ?>",
+                                title: "{$block->escapeJs($block->escapeHtml(__('Add New Group')))}",
+                                content: "{$block->escapeJs($block->escapeHtml(__('Please enter a new group name.')))}",
                                 value: "",
                                 validation: true,
                                 validationRules: ['required-entry'],
@@ -344,8 +363,11 @@
                                 result = false;
                             }
                             for (var i=0; i < TreePanels.root.childNodes.length; i++) {
-                                if (TreePanels.root.childNodes[i].text.toLowerCase() == name.toLowerCase() && TreePanels.root.childNodes[i].id != exceptNodeId) {
-                                    errorText = '<?= $block->escapeJs(__('An attribute group named "/name/" already exists.')) ?>';
+                                if (TreePanels.root.childNodes[i].text.toLowerCase() == name.toLowerCase() &&
+                                    TreePanels.root.childNodes[i].id != exceptNodeId) {
+                                    errorText = '{$block->escapeJs(
+                                        __('An attribute group named "/name/" already exists.')
+                                    )}';
                                     alert({
                                         content: errorText.replace("/name/",name)
                                     });
@@ -373,7 +395,8 @@
                                 editSet.req.form_key = FORM_KEY;
                             }
                             var req = {data : Ext.util.JSON.encode(editSet.req)};
-                            var con = new Ext.lib.Ajax.request('POST', '<?= $block->escapeJs($block->escapeUrl($block->getMoveUrl())) ?>', {success:editSet.success,failure:editSet.failure}, req);
+                            var con = new Ext.lib.Ajax.request('POST', '{$block->escapeJs($block->getMoveUrl())}',
+                             {success:editSet.success,failure:editSet.failure}, req);
                         },
 
                         success : function(o) {
@@ -391,7 +414,7 @@
 
                         failure : function(o) {
                             alert({
-                                content: '<?= $block->escapeJs(__('Sorry, we\'re unable to complete this request.')) ?>'
+                                content: '{$block->escapeJs(__('Sorry, we\'re unable to complete this request.'))}'
                             });
                         },
 
@@ -408,7 +431,9 @@
                         rightBeforeAppend : function(tree, nodeThis, node, newParent) {
                             if (node.attributes.is_user_defined == 0) {
                                 alert({
-                                    content: '<?= $block->escapeJs(__('You can\'t remove attributes from this attribute set.')) ?>'
+                                    content: '{$block->escapeJs(
+                                        __('You can\'t remove attributes from this attribute set.')
+                                    )}'
                                 });
                                 return false;
                             } else {
@@ -424,7 +449,9 @@
 
                             if (node.attributes.is_unassignable == 0) {
                                 alert({
-                                    content: '<?= $block->escapeJs(__('You can\'t remove attributes from this attribute set.')) ?>'
+                                    content: '{$block->escapeJs(
+                                        __('You can\'t remove attributes from this attribute set.')
+                                    )}'
                                 });
                                 return false;
                             } else {
@@ -448,7 +475,7 @@
                         rightRemove : function(tree, nodeThis, node) {
                             if( nodeThis.firstChild == null && node.id != 'empty' ) {
                                 var newNode = new Ext.tree.TreeNode({
-                                    text : '<?= $block->escapeJs(__('Empty')) ?>',
+                                    text : '{$block->escapeJs(__('Empty'))}',
                                     id : 'empty',
                                     cls : 'folder',
                                     is_user_defined : 1,
@@ -485,6 +512,8 @@
 
             });
             require(["tree-panel"]);
-        </script>
+script;
+        ?>
+        <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
     </div>
 </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main/tree/group.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main/tree/group.phtml
index 4ecfdd16a882d..c3d8d5bc0f44e 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main/tree/group.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main/tree/group.phtml
@@ -6,8 +6,5 @@
 
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<div id="tree-div1"/>
-<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-    "height:400px;margin-top:5px;overflow:auto",
-    '#tree-div1'
-) ?>
+<?= /* @noEscape */ $secureRenderer->renderTag('div', ['id' => "tree-div1"], '&nbsp;', false) ?>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag("height:400px;margin-top:5px;overflow:auto", '#tree-div1') ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/toolbar/add.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/toolbar/add.phtml
index 227ed4be81fae..8f58d357f83e4 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/toolbar/add.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/toolbar/add.phtml
@@ -3,12 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?= $block->getFormHtml() ?>
-<script>
+
+<?php $scriptString = <<<script
 require(['jquery', "mage/mage"], function(jQuery){
 
-    jQuery('#<?= $block->escapeJs($block->getFormId()) ?>').mage('form').mage('validation');
+    jQuery('#{$block->escapeJs($block->getFormId())}').mage('form').mage('validation');
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/js.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/js.phtml
index 722e4ae7ef1f0..f5dfc3ae79fbe 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/js.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/js.phtml
@@ -3,9 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
-<script>
+<?php $scriptString = <<<script
 require([
     "prototype",
     "Magento_Catalog/catalog/product/composite/configure"
@@ -89,4 +91,6 @@ var DateOption = Class.create({
 productConfigure.opConfig.dateOption = new DateOption();
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml
index 68a7a3a69cfd3..fde7a9351756c 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/date.phtml
@@ -3,10 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Date */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Date */ ?>
+
 <?php $_option = $block->getOption(); ?>
 <?php $_optionId = (int)$_option->getId(); ?>
+<?php $optionId = /* @noEscape */ $_optionId ?>
 <div class="admin__field field<?= $_option->getIsRequire() ? ' required' : '' ?>">
     <label class="label admin__field-label">
         <?= $block->escapeHtml($_option->getTitle()) ?>
@@ -15,28 +19,30 @@
     <div class="admin__field-control control">
 
         <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME
-            || $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DATE) :?>
+            || $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DATE):?>
 
             <?= $block->getDateHtml() ?>
 
-            <?php if (!$block->useCalendar()) :?>
-                <script>
+            <?php if (!$block->useCalendar()):?>
+                <?php $scriptString = <<<script
                     require([
                         "prototype",
                         "Magento_Catalog/catalog/product/composite/configure"
                     ], function(){
 
                         window.dateOption = productConfigure.opConfig.dateOption;
-                        Event.observe('options_<?= /* @noEscape */ $_optionId ?>_month', 'change', dateOption.reloadMonth.bind(dateOption));
-                        Event.observe('options_<?= /* @noEscape */ $_optionId ?>_year', 'change', dateOption.reloadMonth.bind(dateOption));
+                        Event.observe('options_{$optionId}_month', 'change', dateOption.reloadMonth.bind(dateOption));
+                        Event.observe('options_{$optionId}_year', 'change', dateOption.reloadMonth.bind(dateOption));
                     });
-                </script>
+script;
+                ?>
+                <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
             <?php endif; ?>
 
         <?php endif; ?>
 
         <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME
-            || $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_TIME) :?>
+            || $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_TIME):?>
             <span class="time-picker"><?= $block->getTimeHtml() ?></span>
         <?php endif; ?>
 
@@ -44,24 +50,28 @@
                name="validate_datetime_<?= /* @noEscape */ $_optionId ?>"
                class="validate-datetime-<?= /* @noEscape */ $_optionId ?>"
                value="" />
-        <script>
+        <?php $scriptString = <<<script
             require([
                 "jquery",
                 "mage/backend/validation"
             ], function(jQuery){
 
                 //<![CDATA[
-                <?php if ($_option->getIsRequire()) :?>
-                jQuery.validator.addMethod('validate-datetime-<?= /* @noEscape */ $_optionId ?>', function(v) {
-                    var dateTimeParts = jQuery('.datetime-picker[id^="options_<?= /* @noEscape */ $_optionId ?>"]');
+script;
+        if ($_option->getIsRequire()):
+            $scriptString .= <<<script
+                jQuery.validator.addMethod('validate-datetime-{$optionId}', function(v) {
+                    var dateTimeParts = jQuery('.datetime-picker[id^="options_{$optionId}"]');
                     for (var i=0; i < dateTimeParts.length; i++) {
                         if (dateTimeParts[i].value == "") return false;
                     }
                     return true;
-                }, '<?= $block->escapeJs(__('This is a required option.')) ?>');
-                <?php else :?>
-                jQuery.validator.addMethod('validate-datetime-<?= /* @noEscape */ $_optionId ?>', function(v) {
-                    var dateTimeParts = jQuery('.datetime-picker[id^="options_<?= /* @noEscape */ $_optionId ?>"]');
+                }, '{$block->escapeJs(__('This is a required option.'))}');
+script;
+        else:
+            $scriptString .= <<<script
+                jQuery.validator.addMethod('validate-datetime-{$optionId}', function(v) {
+                    var dateTimeParts = jQuery('.datetime-picker[id^="options_{$optionId}"]');
                     var hasWithValue = false, hasWithNoValue = false;
                     var pattern = /day_part$/i;
                     for (var i=0; i < dateTimeParts.length; i++) {
@@ -74,11 +84,15 @@
                         }
                     }
                     return hasWithValue ^ hasWithNoValue;
-                }, '<?= $block->escapeJs(__('The field isn\'t complete.')) ?>');
-                <?php endif; ?>
+                }, '{$block->escapeJs(__('The field isn\'t complete.'))}');
+script;
+        endif;
+        $scriptString .= <<<script
                 //]]>
 
             });
-        </script>
+script;
+        ?>
+        <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
     </div>
 </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml
index 89d005a178fac..cda4e363d3f1e 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml
@@ -3,8 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/* @var $block \Magento\Catalog\Block\Product\View\Options\Type\File */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\File */ ?>
 <?php $_option = $block->getOption(); ?>
 <?php $_fileInfo = $block->getFileInfo(); ?>
 <?php $_fileExists = $_fileInfo->hasData() ? true : false; ?>
@@ -14,15 +16,20 @@
 <?php $_fileNamed = $_fileName . '_name'; ?>
 <?php $_rand = rand(); ?>
 
-<script>
+<?php
+$rand = /* @noEscape */ $_rand;
+$fileName = /* @noEscape */ $_fileName;
+$fieldNameAction = /* @noEscape */ $_fieldNameAction;
+$fileNamed = /* @noEscape */ $_fileNamed;
+$scriptString = <<<script
 require(['prototype'], function(){
 
 //<![CDATA[
-    opFile<?= /* @noEscape */ $_rand ?> = {
+    opFile{$rand} = {
         initializeFile: function(inputBox) {
-            this.inputFile = inputBox.select('input[name="<?= /* @noEscape */ $_fileName ?>"]')[0];
-            this.inputFileAction = inputBox.select('input[name="<?= /* @noEscape */ $_fieldNameAction ?>"]')[0];
-            this.fileNameBox = inputBox.up('div').select('.<?= /* @noEscape */ $_fileNamed ?>')[0];
+            this.inputFile = inputBox.select('input[name="{$fileName}"]')[0];
+            this.inputFileAction = inputBox.select('input[name="{$fieldNameAction}"]')[0];
+            this.fileNameBox = inputBox.up('div').select('.{$fileNamed}')[0];
         },
 
         toggleFileChange: function(inputBox) {
@@ -57,44 +64,67 @@ require(['prototype'], function(){
 //]]>
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 
 <div class="admin__field <?= $_option->getIsRequire() ? ' required _required' : '' ?>">
     <label class="admin__field-label label">
         <?= $block->escapeHtml($_option->getTitle()) ?>
         <?= /* @noEscape */ $block->getFormattedPrice() ?>
     </label>
-    <div class="admin__field-control control">
-        <?php if ($_fileExists) :?>
+    <div class="admin__field-control control" id="<?= /* @noEscape */ $_fileName ?>">
+        <?php if ($_fileExists):?>
             <span class="<?= /* @noEscape */ $_fileNamed ?>"><?= $block->escapeHtml($_fileInfo->getTitle()) ?></span>
-            <a href="javascript:void(0)" class="label" onclick="opFile<?= /* @noEscape */ $_rand ?>.toggleFileChange($(this).next('.input-box'))">
+            <a href="javascript:void(0)" class="label">
                 <?= $block->escapeHtml(__('Change')) ?>
             </a>&nbsp;
-            <?php if (!$_option->getIsRequire()) :?>
-                <input type="checkbox" onclick="opFile<?= /* @noEscape */ $_rand ?>.toggleFileDelete($(this), $(this).next('.input-box'))" price="<?= $block->escapeHtmlAttr($block->getCurrencyPrice($_option->getPrice(true))) ?>"/>
+            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                'onclick',
+                "opFile" . /* @noEscape */ $_rand . ".toggleFileChange($(this).next('.input-box'))",
+                '#' . /* @noEscape */ $_fileName . ' a'
+            ); ?>
+            <?php if (!$_option->getIsRequire()):?>
+                <input type="checkbox"
+                       price="<?= $block->escapeHtmlAttr($block->getCurrencyPrice($_option->getPrice(true))) ?>"/>
+                <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                    'onclick',
+                    "opFile" . /* @noEscape */ $_rand . ".toggleFileDelete($(this), $(this).next('.input-box'))",
+                    '#' . /* @noEscape */ $_fileName . ' input[type="checkbox"]'
+                ) ?>
                 <span class="label"><?= $block->escapeHtml(__('Delete')) ?></span>
             <?php endif; ?>
         <?php endif; ?>
         <div class="input-box" <?= $_fileExists ? 'style="display:none"' : '' ?>>
             <!-- ToDo UI: add appropriate file class when z-index issue in ui dialog will be resolved  -->
-            <input type="file" name="<?= /* @noEscape */ $_fileName ?>" class="product-custom-option<?= $_option->getIsRequire() ? ' required-entry' : '' ?>" price="<?= $block->escapeHtmlAttr($block->getCurrencyPrice($_option->getPrice(true))) ?>" <?= $_fileExists ? 'disabled="disabled"' : '' ?>/>
-            <input type="hidden" name="<?= /* @noEscape */ $_fieldNameAction ?>" value="<?= /* @noEscape */ $_fieldValueAction ?>" />
+            <input type="file" name="<?= /* @noEscape */ $_fileName ?>"
+                   class="product-custom-option<?= $_option->getIsRequire() ? ' required-entry' : '' ?>"
+                   price="<?= $block->escapeHtmlAttr($block->getCurrencyPrice($_option->getPrice(true))) ?>"
+                <?= $_fileExists ? 'disabled="disabled"' : '' ?>/>
+            <input type="hidden" name="<?= /* @noEscape */ $_fieldNameAction ?>"
+                   value="<?= /* @noEscape */ $_fieldValueAction ?>" />
 
-            <?php if ($_option->getFileExtension()) :?>
+            <?php if ($_option->getFileExtension()):?>
                 <div class="admin__field-note">
-                    <span><?= $block->escapeHtml(__('Compatible file extensions to upload')) ?>: <strong><?= $block->escapeHtml($_option->getFileExtension()) ?></strong></span>
+                    <span><?= $block->escapeHtml(__('Compatible file extensions to upload')) ?>:
+                        <strong><?= $block->escapeHtml($_option->getFileExtension()) ?></strong>
+                    </span>
                 </div>
             <?php endif; ?>
 
-            <?php if ($_option->getImageSizeX() > 0) :?>
+            <?php if ($_option->getImageSizeX() > 0):?>
                 <div class="admin__field-note">
-                    <span><?= $block->escapeHtml(__('Maximum image width')) ?>: <strong><?= (int)$_option->getImageSizeX() ?> <?= $block->escapeHtml(__('px.')) ?></strong></span>
+                    <span><?= $block->escapeHtml(__('Maximum image width')) ?>:
+                        <strong><?= (int)$_option->getImageSizeX() ?> <?= $block->escapeHtml(__('px.')) ?></strong>
+                    </span>
                 </div>
             <?php endif; ?>
 
-            <?php if ($_option->getImageSizeY() > 0) :?>
+            <?php if ($_option->getImageSizeY() > 0):?>
                 <div class="admin__field-note">
-                    <span><?= $block->escapeHtml(__('Maximum image height')) ?>: <strong><?= (int)$_option->getImageSizeY() ?> <?= $block->escapeHtml(__('px.')) ?></strong></span>
+                    <span><?= $block->escapeHtml(__('Maximum image height')) ?>:
+                        <strong><?= (int)$_option->getImageSizeY() ?> <?= $block->escapeHtml(__('px.')) ?></strong>
+                    </span>
                 </div>
             <?php endif; ?>
         </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml
index 66df098a194ae..624e006bab9a1 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml
@@ -9,6 +9,7 @@
 
 /**
  * @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
 <div class="admin__scope-old">
@@ -34,30 +35,38 @@
                    title="<?= $block->escapeHtmlAttr(__('Product online status')) ?>"></label>
         </div>
 
-        <?php if ($block->getProductId()) :?>
+        <?php if ($block->getProductId()):?>
             <?= $block->getDeleteButtonHtml() ?>
         <?php endif; ?>
-        <?php if ($block->getProductSetId()) :?>
+        <?php if ($block->getProductSetId()):?>
             <?= $block->getChangeAttributeSetButtonHtml() ?>
             <?= $block->getSaveSplitButtonHtml() ?>
         <?php endif; ?>
         <?= $block->getBackButtonHtml() ?>
     </div>
 </div>
-<?php if ($block->getUseContainer()) :?>
+<?php if ($block->getUseContainer()): ?>
 <form action="<?= $block->escapeUrl($block->getSaveUrl()) ?>" method="post" enctype="multipart/form-data"
       data-form="edit-product" data-product-id="<?= $block->escapeHtmlAttr($block->getProduct()->getId()) ?>">
 <?php endif; ?>
     <?= $block->getBlockHtml('formkey') ?>
-    <div data-role="tabs" id="product-edit-form-tabs"></div> <?php /* @TODO: remove id after elimination of setDestElementId('product-edit-form-tabs') */?>
+    <div data-role="tabs" id="product-edit-form-tabs"></div>
+    <?php /* @TODO: remove id after elimination of setDestElementId('product-edit-form-tabs') */?>
     <?= $block->getChildHtml('product-type-tabs') ?>
-    <input type="hidden" id="product_type_id" value="<?= $block->escapeHtmlAttr($block->getProduct()->getTypeId()) ?>"/>
-    <input type="hidden" id="attribute_set_id" value="<?= $block->escapeHtmlAttr($block->getProduct()->getAttributeSetId()) ?>"/>
+    <input type="hidden" id="product_type_id"
+           value="<?= $block->escapeHtmlAttr($block->getProduct()->getTypeId()) ?>"/>
+    <input type="hidden" id="attribute_set_id"
+           value="<?= $block->escapeHtmlAttr($block->getProduct()->getAttributeSetId()) ?>"/>
     <button type="submit" class="hidden"></button>
-<?php if ($block->getUseContainer()) :?>
+<?php if ($block->getUseContainer()):?>
 </form>
 <?php endif; ?>
-<script>
+<?php $helper = $block->getData('helper');
+$jsonFieldsAutogenerationMasks  = /* @noEscape */ $helper->jsonEncode($block->getFieldsAutogenerationMasks());
+$jsonAttributesAllowedForAutogeneration = /* @noEscape */ $helper->jsonEncode(
+    $block->getAttributesAllowedForAutogeneration()
+);
+$scriptString = <<<scriptStr
 require([
     "jquery",
     "Magento_Catalog/catalog/type-events",
@@ -129,10 +138,10 @@ require([
             }
         }
     });
-    $form.mage('validation', {validationUrl: '<?= $block->escapeJs($block->escapeUrl($block->getValidationUrl())) ?>'});
+    $form.mage('validation', {validationUrl: '{$block->escapeJs($block->getValidationUrl())}'});
 
-    var masks = <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getFieldsAutogenerationMasks()) ?>;
-    var availablePlaceholders = <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getAttributesAllowedForAutogeneration()) ?>;
+    var masks = {$jsonFieldsAutogenerationMasks};
+    var availablePlaceholders = {$jsonAttributesAllowedForAutogeneration};
     var Autogenerator = function(masks) {
         this._masks = masks || {};
         this._fieldReverseIndex = this._buildReverseIndex(this._masks);
@@ -306,7 +315,8 @@ require([
                             $tabToMove.insertAfter($tabs.eq(index - 1).closest('li'));
                         }
                         $tabToMove.removeClass(removedElementClass).removeClass('ignore-validate');
-                        $tabs = $tabContainer.find('li:not(.' + removedElementClass + ')  .tab-item-link.user-defined:not(.ajax)');
+                        $tabs = $tabContainer
+                        .find('li:not(.' + removedElementClass + ')  .tab-item-link.user-defined:not(.ajax)');
                     });
                 });
             });
@@ -405,7 +415,9 @@ require([
 
     });
 });
-</script>
+scriptStr;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <script type="text/x-magento-init">
     {
         "*": {
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/inventory.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/inventory.phtml
index 792af12494af6..129b4d9177dc1 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/inventory.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/inventory.phtml
@@ -5,8 +5,10 @@
  */
 
 /** @var Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Inventory $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<script>
+
+<?php $scriptString = <<<script
     require(['jquery'], function($){
         $('[data-role=toggle-editability-all]').change(function(e) {
             var toggler = $(this);
@@ -27,7 +29,9 @@
             someEditable.prop('disabled', useConfigSettings.prop('checked'));
         });
     });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 
 <?php
 $defaultMinSaleQty = $block->getDefaultConfigValue('min_sale_qty');
@@ -52,17 +56,19 @@ if (!is_numeric($defaultMinSaleQty)) {
             <div class="control">
                 <div class="fields-group-2">
                     <div class="field">
-                        <select id="inventory_manage_stock" name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[manage_stock]"
+                        <select id="inventory_manage_stock"
+                                name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[manage_stock]"
                                 class="select" disabled="disabled">
                             <option value="1"><?= $block->escapeHtml(__('Yes')) ?></option>
                             <option value="0"
-                                <?php if ($block->getFieldValue('manage_stock') == 0) :?>
+                                <?php if ($block->getFieldValue('manage_stock') == 0):?>
                                     selected="selected"
                                 <?php endif; ?>><?= $block->escapeHtml(__('No')) ?></option>
                         </select>
                     </div>
                     <div class="field choice">
-                        <input name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[use_config_manage_stock]" type="checkbox"
+                        <input name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[use_config_manage_stock]"
+                               type="checkbox"
                                id="inventory_use_config_manage_stock" data-role="toggle-editability" value="1"
                                checked="checked" disabled="disabled"/>
                         <label for="inventory_use_config_manage_stock"
@@ -211,13 +217,14 @@ if (!is_numeric($defaultMinSaleQty)) {
                                 disabled="disabled">
                             <option value="0"><?= $block->escapeHtml(__('No')) ?></option>
                             <option value="1"
-                                <?php if ($block->getDefaultConfigValue('is_qty_decimal') == 1) :?>
+                                <?php if ($block->getDefaultConfigValue('is_qty_decimal') == 1):?>
                                     selected="selected"
                                 <?php endif; ?>><?= $block->escapeHtml(__('Yes')) ?></option>
                         </select>
                     </div>
                     <div class="field choice">
-                        <input type="checkbox" id="inventory_is_qty_decimal_checkbox" data-role="toggle-editability-all"/>
+                        <input type="checkbox" id="inventory_is_qty_decimal_checkbox"
+                               data-role="toggle-editability-all"/>
                         <label for="inventory_is_qty_decimal_checkbox"
                                class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
                     </div>
@@ -238,10 +245,13 @@ if (!is_numeric($defaultMinSaleQty)) {
                                 name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[backorders]"
                                 class="select"
                                 disabled="disabled">
-                            <?php foreach ($block->getBackordersOption() as $option) :?>
-                                <?php $_selected = ($option['value'] == $block->getDefaultConfigValue('backorders')) ? ' selected="selected"' : '' ?>
+                            <?php foreach ($block->getBackordersOption() as $option):?>
+                                <?php $_selected = ($option['value'] == $block->getDefaultConfigValue('backorders')) ?
+                                    ' selected="selected"' : '' ?>
                                 <option
-                                    value="<?= $block->escapeHtmlAttr($option['value']) ?>"<?= /* @noEscape */ $_selected ?>><?= $block->escapeHtml($option['label']) ?></option>
+                                    value="<?= $block->escapeHtmlAttr($option['value']) ?>"
+                                    <?= /* @noEscape */ $_selected ?>><?= $block->escapeHtml($option['label']) ?>
+                                </option>
                             <?php endforeach; ?>
                         </select>
                     </div>
@@ -291,7 +301,8 @@ if (!is_numeric($defaultMinSaleQty)) {
                                class="label"><span><?= $block->escapeHtml(__('Use Config Settings')) ?></span></label>
                     </div>
                     <div class="field choice">
-                        <input type="checkbox" id="inventory_notify_stock_qty_checkbox" data-role="toggle-editability-all"/>
+                        <input type="checkbox" id="inventory_notify_stock_qty_checkbox"
+                               data-role="toggle-editability-all"/>
                         <label for="inventory_notify_stock_qty_checkbox"
                                class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
                     </div>
@@ -314,7 +325,7 @@ if (!is_numeric($defaultMinSaleQty)) {
                                 disabled="disabled">
                             <option value="1"><?= $block->escapeHtml(__('Yes')) ?></option>
                             <option value="0"
-                                <?php if ($block->getDefaultConfigValue('enable_qty_increments') == 0) :?>
+                                <?php if ($block->getDefaultConfigValue('enable_qty_increments') == 0):?>
                                     selected="selected"
                                 <?php endif; ?>><?= $block->escapeHtml(__('No')) ?></option>
                         </select>
@@ -330,7 +341,8 @@ if (!is_numeric($defaultMinSaleQty)) {
                                class="label"><span><?= $block->escapeHtml(__('Use Config Settings')) ?></span></label>
                     </div>
                     <div class="field choice">
-                        <input type="checkbox" id="inventory_enable_qty_increments_checkbox" data-role="toggle-editability-all"/>
+                        <input type="checkbox" id="inventory_enable_qty_increments_checkbox"
+                               data-role="toggle-editability-all"/>
                         <label for="inventory_enable_qty_increments_checkbox"
                                class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
                     </div>
@@ -364,7 +376,8 @@ if (!is_numeric($defaultMinSaleQty)) {
                                class="label"><span><?= $block->escapeHtml(__('Use Config Settings')) ?></span></label>
                     </div>
                     <div class="field choice">
-                        <input type="checkbox" id="inventory_qty_increments_checkbox" data-role="toggle-editability-all"/>
+                        <input type="checkbox" id="inventory_qty_increments_checkbox"
+                               data-role="toggle-editability-all"/>
                         <label for="inventory_qty_increments_checkbox"
                                class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
                     </div>
@@ -385,11 +398,15 @@ if (!is_numeric($defaultMinSaleQty)) {
                                 name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[is_in_stock]" class="select"
                                 disabled="disabled">
                             <option value="1"><?= $block->escapeHtml(__('In Stock')) ?></option>
-                            <option value="0"<?php if ($block->getDefaultConfigValue('is_in_stock') == 0) :?> selected<?php endif; ?>><?= $block->escapeHtml(__('Out of Stock')) ?></option>
+                            <option value="0"
+                                <?php if ($block->getDefaultConfigValue('is_in_stock') == 0):?> selected<?php endif; ?>>
+                                <?= $block->escapeHtml(__('Out of Stock')) ?>
+                            </option>
                         </select>
                     </div>
                     <div class="field choice">
-                        <input type="checkbox" id="inventory_stock_availability_checkbox" data-role="toggle-editability-all"/>
+                        <input type="checkbox" id="inventory_stock_availability_checkbox"
+                               data-role="toggle-editability-all"/>
                         <label for="inventory_stock_availability_checkbox"
                                class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
                     </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/websites.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/websites.phtml
index 98b06050e0d1d..d5859240875cd 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/websites.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/websites.phtml
@@ -5,6 +5,7 @@
  */
 
 /** @var $block Magento\Catalog\Block\Adminhtml\Product\Edit\Action\Attribute\Tab\Websites */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
 <div class="fieldset-wrapper" id="add-products-to-website-wrapper">
@@ -15,24 +16,27 @@
         <br>
         <div class="store-scope">
             <div class="store-tree" id="add-products-to-website-content">
-                <?php foreach ($block->getWebsiteCollection() as $_website) :?>
+                <?php foreach ($block->getWebsiteCollection() as $_website):?>
                     <div class="website-name">
                         <input name="add_website_ids[]"
                                value="<?= $block->escapeHtmlAttr($_website->getId()) ?>"
-                            <?php if ($block->getWebsitesReadonly()) :?>
+                            <?php if ($block->getWebsitesReadonly()):?>
                                 disabled="disabled"
                             <?php endif;?>
                                class="checkbox website-checkbox"
                                id="add_product_website_<?= $block->escapeHtmlAttr($_website->getId()) ?>"
                                type="checkbox" />
-                        <label for="add_product_website_<?= $block->escapeHtmlAttr($_website->getId()) ?>"><?= $block->escapeHtml($_website->getName()) ?></label>
+                        <label for="add_product_website_<?= $block->escapeHtmlAttr($_website->getId()) ?>">
+                            <?= $block->escapeHtml($_website->getName()) ?>
+                        </label>
                     </div>
-                    <dl class="webiste-groups" id="add_product_website_<?= $block->escapeHtmlAttr($_website->getId()) ?>_data">
-                        <?php foreach ($block->getGroupCollection($_website) as $_group) :?>
+                    <dl class="webiste-groups"
+                        id="add_product_website_<?= $block->escapeHtmlAttr($_website->getId()) ?>_data">
+                        <?php foreach ($block->getGroupCollection($_website) as $_group):?>
                             <dt><?= $block->escapeHtml($_group->getName()) ?></dt>
                             <dd class="group-stores">
                                 <ul>
-                                <?php foreach ($block->getStoreCollection($_group) as $_store) :?>
+                                <?php foreach ($block->getStoreCollection($_group) as $_store):?>
                                     <li>
                                         <?= $block->escapeHtml($_store->getName()) ?>
                                     </li>
@@ -55,30 +59,35 @@
         <br>
         <div class="messages">
             <div class="message message-notice">
-                <div><?= $block->escapeHtml(__('To hide an item in catalog or search results, set the status to "Disabled".')) ?></div>
+                <div><?= $block->escapeHtml(
+                    __('To hide an item in catalog or search results, set the status to "Disabled".')
+                ) ?>
+                </div>
             </div>
         </div>
         <div class="store-scope">
             <div class="store-tree" id="remove-products-to-website-content">
-                <?php foreach ($block->getWebsiteCollection() as $_website) :?>
+                <?php foreach ($block->getWebsiteCollection() as $_website):?>
                     <div class="website-name">
                         <input name="remove_website_ids[]"
                                value="<?= $block->escapeHtmlAttr($_website->getId()) ?>"
-                            <?php if ($block->getWebsitesReadonly()) :?>
+                            <?php if ($block->getWebsitesReadonly()):?>
                                 disabled="disabled"
                             <?php endif;?>
                                class="checkbox website-checkbox"
                                id="remove_product_website_<?= $block->escapeHtmlAttr($_website->getId()) ?>"
                                type="checkbox" />
-                        <label for="remove_product_website_<?= $block->escapeHtmlAttr($_website->getId()) ?>"><?= $block->escapeHtml($_website->getName()) ?></label>
+                        <label for="remove_product_website_<?= $block->escapeHtmlAttr($_website->getId()) ?>">
+                            <?= $block->escapeHtml($_website->getName()) ?>
+                        </label>
                     </div>
                     <dl class="webiste-groups"
                         id="remove_product_website_<?= $block->escapeHtmlAttr($_website->getId()) ?>_data">
-                        <?php foreach ($block->getGroupCollection($_website) as $_group) :?>
+                        <?php foreach ($block->getGroupCollection($_website) as $_group):?>
                             <dt><?= $block->escapeHtml($_group->getName()) ?></dt>
                             <dd class="group-stores">
                                 <ul>
-                                <?php foreach ($block->getStoreCollection($_group) as $_store) :?>
+                                <?php foreach ($block->getStoreCollection($_group) as $_store):?>
                                     <li>
                                         <?= $block->escapeHtml($_store->getName()) ?>
                                     </li>
@@ -93,7 +102,7 @@
     </fieldset>
 </div>
 
-<script>
+<?php $scriptString = <<<script
 require([
     'prototype'
 ], function () {
@@ -120,4 +129,6 @@ require([
         }
     }
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml
index d073053e2f854..3a25ed1e135bd 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml
@@ -7,6 +7,7 @@
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 
 /* @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\AttributeSet */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <script id="product-template-selector-template" type="text/x-magento-template">
 <% if (!data.term && data.items.length && !data.allShown()) { %>
@@ -23,7 +24,9 @@
 </button>
 <% } %>
 </script>
-<script>
+<?php $jsonHelper = $block->getData('jsonHelper');
+$selectorOptions = /* @noEscape */ $jsonHelper->jsonEncode($block->getSelectorOptions());
+$scriptString = <<<script
     require(["jquery","mage/mage","mage/backend/suggest"],function ($) {
         var $suggest = $('#product-template-suggest');
         $suggest.closest('.dropdown-menu').siblings('[data-toggle=dropdown]').on('click.toggleDropdown', function () {
@@ -32,7 +35,7 @@
             }
         });
         $suggest
-            .mage('suggest',<?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getSelectorOptions()) ?>)
+            .mage('suggest', {$selectorOptions})
             .on('suggestselect', function (e, ui) {
                 if (ui.item.id) {
                     $('[data-form=edit-product]').trigger('changeAttributeSet', ui.item);
@@ -40,4 +43,6 @@
                 }
             });
     });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml
index 713366e73aba5..1811217eeac11 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml
@@ -5,8 +5,10 @@
  */
 
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+
+/** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Option */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<?php /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Option */ ?>
 <?= $block->getTemplatesHtml() ?>
 <script id="custom-option-base-template" type="text/x-magento-template">
     <div class="fieldset-wrapper admin__collapsible-block-wrapper opened" id="option_<%- data.id %>">
@@ -68,7 +70,8 @@
                                    type="text"
                                    value="<%- data.title %>"
                                    data-store-label="<%- data.title %>"
-                                   <% if (typeof data.scopeTitleDisabled != 'undefined' && data.scopeTitleDisabled != null) { %> disabled="disabled" <% } %>
+                                   <% if (typeof data.scopeTitleDisabled != 'undefined' &&
+                                          data.scopeTitleDisabled != null) { %> disabled="disabled" <% } %>
                                    >
                             <%- data.checkboxScopeTitle %>
                         </div>
@@ -92,20 +95,39 @@
                             <label for="field-option-req">
                                 <?= $block->escapeHtml(__('Required')) ?>
                             </label>
-                            <span style="display:none"><?= $block->getRequireSelectHtml() ?></span>
+                            <span><?= $block->getRequireSelectHtml() ?></span>
                         </div>
                     </div>
+                    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                        "display:none",
+                        "input#" . /* @noEscape */ $block->getFieldId() ."_<%- data.id %>_required"
+                    ) ?>
                 </fieldset>
             </fieldset>
         </div>
     </div>
 </script>
 
-<div id="import-container" style="display: none;"></div>
-<?php if (!$block->isReadonly()) :?>
+<div id="import-container"></div>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display: none;", 'div#import-container') ?>
+<?php if (!$block->isReadonly()):?>
 <div><input type="hidden" name="affect_product_custom_options" value="1"/></div>
 <?php endif; ?>
-<script>
+<?php $jsonHelper = $block->getData('jsonHelper');
+
+$customOptions = /* @noEscape */ $jsonHelper->jsonEncode(
+    [
+        'fieldId' => $block->getFieldId(),
+        'productGridUrl' => $block->escapeJs($block->getProductGridUrl()),
+        'formKey' => $block->getFormKey(),
+        'customOptionsUrl' => $block->escapeJs($block->getCustomOptionsUrl()),
+        'isReadonly' => (bool) $block->isReadonly(),
+        'itemCount' => (int) $block->getItemCount(),
+        'currentProductId' => (int) $block->getCurrentProductId(),
+    ]
+);
+
+$scriptString = <<<script
 require([
     "jquery",
     "Magento_Catalog/js/custom-options"
@@ -113,23 +135,17 @@ require([
 
 jQuery(function ($) {
     var fieldSet = $('[data-block=product-custom-options]');
-    fieldSet.customOptions(<?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode(
-        [
-            'fieldId' => $block->getFieldId(),
-            'productGridUrl' => $block->escapeUrl($block->getProductGridUrl()),
-            'formKey' => $block->getFormKey(),
-            'customOptionsUrl' => $block->escapeUrl($block->getCustomOptionsUrl()),
-            'isReadonly' => (bool) $block->isReadonly(),
-            'itemCount' => (int) $block->getItemCount(),
-            'currentProductId' => (int) $block->getCurrentProductId(),
-        ]
-    )?>);
+    fieldSet.customOptions({$customOptions});
     //adding data to templates
-    <?php /** @var $_value \Magento\Framework\DataObject */ ?>
-    <?php foreach ($block->getOptionValues() as $_value) :?>
-        fieldSet.customOptions('addOption', <?= /* @noEscape */ $_value->toJson() ?>);
-    <?php endforeach; ?>
+script;
+/** @var $_value \Magento\Framework\DataObject */
+foreach ($block->getOptionValues() as $_value):
+    $scriptString .= " fieldSet.customOptions('addOption', " . /* @noEscape */ $_value->toJson() . ');' . PHP_EOL;
+endforeach;
+$scriptString .= <<<script
 });
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml
index e66a18c677cc3..34fcebba8854c 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml
@@ -7,6 +7,7 @@
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 
 /* @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Price\Tier */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 $element = $block->getElement();
 ?>
 <?php $_htmlId      = $block->getElement()->getHtmlId() ?>
@@ -20,33 +21,41 @@ $element = $block->getElement();
 
 <?php $_showWebsite = $block->isShowWebsiteColumn(); ?>
 <?php $_showWebsite = $block->isMultiWebsites(); ?>
-<div class="field" id="attribute-<?= /* @noEscape */ $_htmlId ?>-container" data-attribute-code="<?= /* @noEscape */ $_htmlId ?>"
+<?php $jsonHelper = $block->getData('jsonHelper'); ?>
+<div class="field" id="attribute-<?= /* @noEscape */ $_htmlId ?>-container"
+     data-attribute-code="<?= /* @noEscape */ $_htmlId ?>"
      data-apply-to="<?= $block->escapeHtml(
-         $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode(
-             $element->hasEntityAttribute() ? $element->getEntityAttribute()->getApplyTo() : []
-         )
+         $jsonHelper->jsonEncode($element->hasEntityAttribute() ? $element->getEntityAttribute()->getApplyTo() : [])
      )?>">
     <label class="label"><span><?= $block->escapeHtml($block->getElement()->getLabel()) ?></span></label>
     <div class="control">
         <table class="admin__control-table tiers_table" id="tiers_table">
             <thead>
                 <tr>
-                    <th class="col-websites" <?php if (!$_showWebsite) :?>style="display:none"<?php endif; ?>><?= $block->escapeHtml(__('Web Site')) ?></th>
+                    <th class="col-websites"><?= $block->escapeHtml(__('Web Site')) ?></th>
                     <th class="col-customer-group"><?= $block->escapeHtml(__('Customer Group')) ?></th>
                     <th class="col-qty required"><?= $block->escapeHtml(__('Quantity')) ?></th>
-                    <th class="col-price required"><?= $block->escapeHtml($block->getPriceColumnHeader(__('Item Price'))) ?></th>
+                    <th class="col-price required">
+                        <?= $block->escapeHtml($block->getPriceColumnHeader(__('Item Price'))) ?>
+                    </th>
                     <th class="col-delete"><?= $block->escapeHtml(__('Action')) ?></th>
                 </tr>
+                <?php if (!$_showWebsite): ?>
+                    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display:none', 'th.col-websites'); ?>
+                <?php endif; ?>
             </thead>
             <tbody id="<?= /* @noEscape */ $_htmlId ?>_container"></tbody>
             <tfoot>
                 <tr>
-                    <td colspan="<?php if (!$_showWebsite) :?>4<?php else :?>5<?php endif; ?>" class="col-actions-add"><?= $block->getAddButtonHtml() ?></td>
+                    <td colspan="<?php if (!$_showWebsite):?>4<?php else:?>5<?php endif; ?>"
+                        class="col-actions-add"><?= $block->getAddButtonHtml() ?>
+                    </td>
                 </tr>
             </tfoot>
         </table>
 
-<script>
+<?php $htmlName = /* @noEscape */ $_htmlName;
+$scriptString = <<<script
 require([
     'mage/template',
     "prototype",
@@ -55,39 +64,81 @@ require([
 
 //<![CDATA[
 var tierPriceRowTemplate = '<tr>'
-    + '<td class="col-websites"<?php if (!$_showWebsite) :?> style="display:none"<?php endif; ?>>'
-    + '<select class="<?= $block->escapeHtmlAttr($_htmlClass) ?> required-entry" name="<?= /* @noEscape */ $_htmlName ?>[<%- data.index %>][website_id]" id="tier_price_row_<%- data.index %>_website">'
-    <?php foreach ($block->getWebsites() as $_websiteId => $_info) :?>
-    + '<option value="<?= $block->escapeHtmlAttr($_websiteId) ?>"><?= $block->escapeHtml($_info['name']) ?><?php if (!empty($_info['currency'])) :?> [<?= $block->escapeHtml($_info['currency']) ?>]<?php endif; ?></option>'
-    <?php endforeach ?>
+    + '<td class="col-websites">'
+    + '<select class="{$block->escapeHtmlAttr($_htmlClass)} required-entry"
+     name="{$htmlName}[<%- data.index %>][website_id]" id="tier_price_row_<%- data.index %>_website">'
+script;
+foreach ($block->getWebsites() as $_websiteId => $_info):
+    $scriptString .= <<<script
+    + '<option value="{$block->escapeHtmlAttr($_websiteId)}">{$block->escapeHtml($_info['name'])}
+script;
+    if (!empty($_info['currency'])):
+        $scriptString .= <<<script
+            [{$block->escapeHtml($_info['currency'])}]
+script;
+    endif;
+    $scriptString .= <<<script
+    </option>'
+script;
+    endforeach;
+    $scriptString .= <<<script
     + '</select></td>'
-    + '<td class="col-customer-group"><select class="<?= $block->escapeHtmlAttr($_htmlClass) ?> custgroup required-entry" name="<?= /* @noEscape */ $_htmlName ?>[<%- data.index %>][cust_group]" id="tier_price_row_<%- data.index %>_cust_group">'
-    <?php foreach ($block->getCustomerGroups() as $_groupId => $_groupName) :?>
-    + '<option value="<?= $block->escapeHtmlAttr($_groupId) ?>"><?= $block->escapeHtml($_groupName) ?></option>'
-    <?php endforeach ?>
+    + '<td class="col-customer-group"><select class="{$block->escapeJs($_htmlClass)} custgroup required-entry"
+     name="{$htmlName}[<%- data.index %>][cust_group]" id="tier_price_row_<%- data.index %>_cust_group">'
+script;
+foreach ($block->getCustomerGroups() as $_groupId => $_groupName):
+    $scriptString .= <<<script
+    + '<option value="{$block->escapeJs($_groupId)}">{$block->escapeJs($_groupName)}</option>'
+script;
+    endforeach;
+    $scriptString .= <<<script
     + '</select></td>'
     + '<td class="col-qty">'
-        + '<input class="<?= $block->escapeHtmlAttr($_htmlClass) ?> qty required-entry validate-greater-than-zero" type="text" name="<?= /* @noEscape */ $_htmlName ?>[<%- data.index %>][price_qty]" value="<%- data.qty %>" id="tier_price_row_<%- data.index %>_qty" />'
-        + '<span><?= $block->escapeHtml(__("and above")) ?></span>'
+        + '<input class="{$block->escapeJs($_htmlClass)} qty required-entry validate-greater-than-zero"
+         type="text" name="{$htmlName}[<%- data.index %>][price_qty]" value="<%- data.qty %>"
+          id="tier_price_row_<%- data.index %>_qty" />'
+        + '<span>{$block->escapeHtml(__("and above"))}</span>'
     + '</td>'
-    + '<td class="col-price"><input class="<?= $block->escapeHtmlAttr($_htmlClass) ?> required-entry <?= $block->escapeHtmlAttr($_priceValueValidation) ?>" type="text" name="<?= /* @noEscape */ $_htmlName ?>[<%- data.index %>][price]" value="<%- data.price %>" id="tier_price_row_<%- data.index %>_price" /></td>'
-    + '<td class="col-delete"><input type="hidden" name="<?= /* @noEscape */ $_htmlName ?>[<%- data.index %>][delete]" class="delete" value="" id="tier_price_row_<%- data.index %>_delete" />'
-    + '<button title="<?= $block->escapeHtml(__('Delete Tier')) ?>" type="button" class="action- scalable delete icon-btn delete-product-option" id="tier_price_row_<%- data.index %>_delete_button" onclick="return tierPriceControl.deleteItem(event);">'
-    + '<span><?= $block->escapeHtml(__("Delete")) ?></span></button></td>'
+    + '<td class="col-price"><input class="{$block->escapeJs($_htmlClass)} required-entry
+     {$block->escapeJs($_priceValueValidation)}" type="text" name="{$htmlName}[<%- data.index %>][price]"
+      value="<%- data.price %>" id="tier_price_row_<%- data.index %>_price" /></td>'
+    + '<td class="col-delete"><input type="hidden" name="{$htmlName}[<%- data.index %>][delete]" class="delete"
+     value="" id="tier_price_row_<%- data.index %>_delete" />'
+    + '<button title="{$block->escapeJs(__('Delete Tier'))}" type="button"
+     class="action- scalable delete icon-btn delete-product-option"
+      id="tier_price_row_<%- data.index %>_delete_button">'
+    + '<span>{$block->escapeJs(__("Delete"))}</span></button></td>'
     + '</tr>';
-
+script;
+
+if (!$_showWebsite):
+    $scriptString .= /* @noEscape */ $secureRenderer->renderStyleAsTag('display:none', 'td.col-websites');
+endif;
+    $scriptString .= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+        'onclick',
+        'return tierPriceControl.deleteItem(event);',
+        "'td#tier_price_row_<%- data.index %>_delete_button"
+    );
+
+    $defaultWesite = (int) $block->getDefaultWebsite();
+    $defaultCustomerGroup = (int) $block->getDefaultCustomerGroup();
+    $scriptString .= <<<script
 var tierPriceControl = {
     template: mageTemplate(tierPriceRowTemplate),
     itemsCount: 0,
     addItem : function () {
-        <?php if ($_readonly) :?>
+script;
+    if ($_readonly):
+        $scriptString .= <<<script
         if (arguments.length < 4) {
             return;
         }
-        <?php endif; ?>
+script;
+    endif;
+    $scriptString .= <<<script
         var data = {
-            website_id: '<?= (int) $block->getDefaultWebsite() ?>',
-            group: '<?= (int) $block->getDefaultCustomerGroup() ?>',
+            website_id: '{$defaultWesite}',
+            group: '{$defaultCustomerGroup}',
             qty: '',
             price: '',
             readOnly: false,
@@ -104,7 +155,7 @@ var tierPriceControl = {
             data.readOnly = arguments[4];
         }
 
-        Element.insert($('<?= $block->escapeJs($_htmlId) ?>_container'), {
+        Element.insert($('{$block->escapeJs($_htmlId)}_container'), {
             bottom : this.template({
                 data: data
             })
@@ -113,14 +164,17 @@ var tierPriceControl = {
         $('tier_price_row_' + data.index + '_cust_group').value = data.group;
         $('tier_price_row_' + data.index + '_website').value    = data.website_id;
 
-        <?php if ($block->isShowWebsiteColumn() && !$block->isAllowChangeWebsite()) :?>
+script;
+    if ($block->isShowWebsiteColumn() && !$block->isAllowChangeWebsite()):
+        $scriptString .= <<<script
         var wss = $('tier_price_row_' + data.index + '_website');
         var txt = wss.options[wss.selectedIndex].text;
 
         wss.insert({after:'<span class="website-name">' + txt + '</span>'});
         wss.hide();
-        <?php endif;?>
-
+script;
+    endif;
+    $scriptString .= <<<script
         if (data.readOnly == '1') {
             ['website', 'cust_group', 'qty', 'price', 'delete'].each(function(idx){
                 $('tier_price_row_'+data.index+'_'+idx).disabled = true;
@@ -128,12 +182,20 @@ var tierPriceControl = {
             $('tier_price_row_'+data.index+'_delete_button').hide();
         }
 
-        <?php if ($_readonly) :?>
-        $('<?= $block->escapeJs($_htmlId) ?>_container').select('input', 'select').each(this.disableElement);
-        $('<?= $block->escapeJs($_htmlId) ?>_container').up('table').select('button').each(this.disableElement);
-        <?php else :?>
-        $('<?= $block->escapeJs($_htmlId) ?>_container').select('input', 'select').each(function(el){ Event.observe(el, 'change', el.setHasChanges.bind(el)); });
-        <?php endif; ?>
+script;
+    if ($_readonly):
+        $scriptString .= <<<script
+        $('{$block->escapeJs($_htmlId)}_container').select('input', 'select').each(this.disableElement);
+        $('{$block->escapeJs($_htmlId)}_container').up('table').select('button').each(this.disableElement);
+script;
+    else:
+        $scriptString .= <<<script
+        $('{$block->escapeJs($_htmlId)}_container').select('input', 'select').each(function(el) {
+            Event.observe(el, 'change', el.setHasChanges.bind(el));
+        });
+script;
+        endif;
+        $scriptString .= <<<script
     },
     disableElement: function(el) {
         el.disabled = true;
@@ -150,18 +212,30 @@ var tierPriceControl = {
         return false;
     }
 };
-<?php foreach ($block->getValues() as $_item) :?>
-tierPriceControl.addItem('<?= $block->escapeJs($_item['website_id']) ?>', '<?= $block->escapeJs($_item['cust_group']) ?>', '<?= $_item['price_qty']*1 ?>', '<?= $block->escapeJs($_item['price']) ?>', <?= (int)!empty($_item['readonly']) ?>);
+script;
+    ?>
+<?php foreach ($block->getValues() as $_item):?>
+    <?php $readonly = (int)!empty($_item['readonly']);
+    $price_qty = $_item['price_qty']*1;
+     $scriptString .= <<<script
+tierPriceControl.addItem('{$block->escapeJs($_item['website_id'])}', '{$block->escapeJs($_item['cust_group'])}',
+ '{$price_qty}', '{$block->escapeJs($_item['price'])}', {$readonly});
+script;
+    ?>
 <?php endforeach; ?>
-<?php if ($_readonly) :?>
-$('<?= $block->escapeJs($_htmlId) ?>_container').up('table').select('button')
-    .each(tierPriceControl.disableElement);
+<?php if ($_readonly):?>
+    <?php $scriptString .= <<<script
+$('{$block->escapeJs($_htmlId)}_container').up('table').select('button').each(tierPriceControl.disableElement);
+script;
+    ?>
 <?php endif; ?>
-
+<?php $scriptString .= <<<script
 window.tierPriceControl = tierPriceControl;
 //]]>
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
     </div>
 </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/websites.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/websites.phtml
index 0193d7764cbb5..f24293971ee07 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/websites.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/websites.phtml
@@ -5,11 +5,12 @@
  */
 
 /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Websites */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <fieldset id="grop_fields" class="fieldset">
     <legend class="legend"><span><?= $block->escapeHtml(__('Product In Websites')) ?></span></legend>
     <br>
-    <?php if ($block->getProductId()) :?>
+    <?php if ($block->getProductId()):?>
     <div class="messages">
         <div class="message message-notice">
             <?= $block->escapeHtml(__('To hide an item in catalog or search results, set the status to "Disabled".')) ?>
@@ -20,37 +21,44 @@
         <?= $block->getHintHtml() ?>
         <div class="store-tree">
             <?php $_websites = $block->getWebsiteCollection() ?>
-            <?php foreach ($_websites as $_website) :?>
+            <?php foreach ($_websites as $_website):?>
             <div class="website-name">
                 <input name="product[website_ids][]"
                        value="<?= (int) $_website->getId() ?>"
-                    <?php if ($block->isReadonly()) :?>
+                    <?php if ($block->isReadonly()):?>
                         disabled="disabled"
                     <?php endif;?>
                        class="checkbox website-checkbox"
                        id="product_website_<?= (int) $_website->getId() ?>"
                        type="checkbox"
-                    <?php if ($block->hasWebsite($_website->getId()) || !$block->getProductId() && count($_websites) === 1) :?>
+                    <?php if ($block->hasWebsite($_website->getId()) ||
+                        !$block->getProductId() && count($_websites) === 1):?>
                         checked="checked"
                     <?php endif; ?>
                 />
-                <label for="product_website_<?= (int) $_website->getId() ?>"><?= $block->escapeHtml($_website->getName()) ?></label>
+                <label for="product_website_<?= (int) $_website->getId() ?>">
+                    <?= $block->escapeHtml($_website->getName()) ?>
+                </label>
             </div>
             <dl class="webiste-groups" id="product_website_<?= (int) $_website->getId() ?>_data">
-                <?php foreach ($block->getGroupCollection($_website) as $_group) :?>
+                <?php foreach ($block->getGroupCollection($_website) as $_group):?>
                 <dt><?= $block->escapeHtml($_group->getName()) ?></dt>
                 <dd>
                     <ul>
-                        <?php foreach ($block->getStoreCollection($_group) as $_store) :?>
+                        <?php foreach ($block->getStoreCollection($_group) as $_store):?>
                         <li>
                             <?= $block->escapeHtml($_store->getName()) ?>
-                            <?php if ($block->getWebsites() && !$block->hasWebsite($_website->getId())) :?>
-                                <span class="website-<?= (int) $_website->getId() ?>-select" style="display:none">
+                            <?php if ($block->getWebsites() && !$block->hasWebsite($_website->getId())):?>
+                                <span class="website-<?= (int) $_website->getId() ?>-select">
                                 <?= $block->escapeHtml(
                                     __('(Copy data from: %1)', $block->getChooseFromStoreHtml($_store)),
                                     ['select', 'option', 'optgroup']
                                 ) ?>
-                            </span>
+                                </span>
+                                <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                                    'display:none',
+                                    'span.website-' . (int)$_website->getId() . '-select'
+                                ) ?>
                             <?php endif; ?>
                         </li>
                         <?php endforeach; ?>
@@ -63,7 +71,7 @@
     </div>
 </fieldset>
 
-<script>
+<?php $scriptString = <<<script
 require(["prototype"], function(){
 
     //<![CDATA[
@@ -76,7 +84,8 @@ require(["prototype"], function(){
     function toggleStoreFromChoosers(event) {
         var element = Event.element(event);
         var selects = $('product_website_' + element.value + '_data').getElementsBySelector('select');
-        var selectBlocks = $('product_website_' + element.value + '_data').getElementsByClassName('website-' + element.value + '-select');
+        var selectBlocks = $('product_website_' + element.value + '_data')
+        .getElementsByClassName('website-' + element.value + '-select');
         for (var i = 0; i < selects.length; i++) {
             selects[i].disabled = !element.checked;
         }
@@ -93,4 +102,6 @@ require(["prototype"], function(){
     //]]>
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml
index d5db46f706ce3..7bbba8b752ced 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml
@@ -4,20 +4,18 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-
 /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery\Content */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 $elementName = $block->getElement()->getName() . '[images]';
 $formName = $block->getFormName();
+$jsonHelper = $block->getData('jsonHelper');
 ?>
 <div id="<?= $block->getHtmlId() ?>"
      class="gallery"
      data-mage-init='{"productGallery":{"template":"#<?= $block->getHtmlId() ?>-template"}}'
      data-parent-component="<?= $block->escapeHtml($block->getData('config/parentComponent')) ?>"
      data-images="<?= $block->escapeHtml($block->getImagesJson()) ?>"
-     data-types="<?= $block->escapeHtml(
-         $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getImageTypes())
-     ) ?>"
+     data-types="<?= $block->escapeHtml($jsonHelper->jsonEncode($block->getImageTypes())) ?>"
 >
     <?php if (!$block->getElement()->getReadonly()) {?>
         <div class="image image-placeholder">
@@ -138,7 +136,9 @@ $formName = $block->getFormName();
                             <textarea data-role="image-description"
                                       rows="3"
                                       class="admin__control-textarea"
-                                      name="<?= $block->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][label]"><%- data.label %></textarea>
+                                      name="<?= $block->escapeHtmlAttr($elementName)
+                                        ?>[<%- data.file_id %>][label]"><%- data.label %>
+                            </textarea>
                       </div>
                 </div>
 
@@ -149,7 +149,7 @@ $formName = $block->getFormName();
                     <div class="admin__field-control">
                         <ul class="multiselect-alt">
                             <?php
-                            foreach ($block->getMediaAttributes() as $attribute) :
+                            foreach ($block->getMediaAttributes() as $attribute):
                                 ?>
                                 <li class="item">
                                     <label>
@@ -182,7 +182,8 @@ $formName = $block->getFormName();
                     <label class="admin__field-label">
                         <span><?= $block->escapeHtml(__('Image Resolution')) ?></span>
                     </label>
-                    <div class="admin__field-value" data-message="<?= $block->escapeHtmlAttr(__('{width}^{height} px')) ?>"></div>
+                    <div class="admin__field-value"
+                         data-message="<?= $block->escapeHtmlAttr(__('{width}^{height} px')) ?>"></div>
                 </div>
 
                 <div class="admin__field field-image-hide">
@@ -208,6 +209,4 @@ $formName = $block->getFormName();
     </script>
     <?= $block->getChildHtml('new-video') ?>
 </div>
-<script>
-    jQuery('body').trigger('contentUpdated');
-</script>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], "jQuery('body').trigger('contentUpdated');", false) ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/js.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/js.phtml
index 0a13aee5930ad..bdf985d0a3436 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/js.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/js.phtml
@@ -7,8 +7,14 @@
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 
 /** @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Js $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<script>
+
+<?php
+$helper = $block->getData('helper');
+$priceFormat = /* @noEscape */ $helper->getPriceFormat($block->getStore());
+$allRatesByProductClassJson = /* @noEscape */ $block->getAllRatesByProductClassJson();
+$scriptString = <<<script
 require([
     "jquery",
     "prototype",
@@ -30,8 +36,8 @@ function registerTaxRecalcs() {
     Event.observe($('tax_class_id'), 'change', recalculateTax);
 }
 
-var priceFormat = <?= /* @noEscape */ $this->helper(Magento\Tax\Helper\Data::class)->getPriceFormat($block->getStore()) ?>;
-var taxRates = <?= /* @noEscape */ $block->getAllRatesByProductClassJson() ?>;
+var priceFormat = {$priceFormat};
+var taxRates = {$allRatesByProductClassJson};
 
 function recalculateTax() {
     if (typeof dynamicTaxes == 'undefined') {
@@ -75,16 +81,22 @@ function bindActiveProductTab(event, ui) {
 jQuery(document).on('tabsactivate', bindActiveProductTab);
 
 // bind active tab
-<?php if ($tabsBlock = $block->getLayout()->getBlock('product_tabs')) :?>
+script;
+if ($tabsBlock = $block->getLayout()->getBlock('product_tabs')):
+    $scriptString .= <<<script
 jQuery(function () {
-    if (jQuery('#<?= $block->escapeJs($tabsBlock->getId()) ?>').length && jQuery('#<?= $block->escapeJs($tabsBlock->getId()) ?>').is(':mage-tabs')) {
-        var activeAnchor = jQuery('#<?= $block->escapeJs($tabsBlock->getId()) ?>').tabs('activeAnchor');
+    if (jQuery('#{$block->escapeJs($tabsBlock->getId())}').length &&
+        jQuery('#{$block->escapeJs($tabsBlock->getId())}').is(':mage-tabs')) {
+        var activeAnchor = jQuery('#{$block->escapeJs($tabsBlock->getId())}').tabs('activeAnchor');
         if (activeAnchor && $('store_switcher')) {
             $('store_switcher').switchParams = 'active_tab/' + activeAnchor.prop('name') + '/';
         }
     }
 });
-<?php endif; ?>
+script;
+endif;
+
+$scriptString .= <<<script
 
 window.recalculateTax = recalculateTax;
 window.bindActiveProductTab = bindActiveProductTab;
@@ -92,4 +104,6 @@ window.registerTaxRecalcs = registerTaxRecalcs;
 //]]>
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml
index 5028d3c1e83d0..4311e52c7c122 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml
@@ -5,10 +5,11 @@
  */
 
 /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Inventory */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<?php if ($block->isReadonly()) :?>
+<?php if ($block->isReadonly()):?>
     <?php $_readonly = ' disabled="disabled" '; ?>
-<?php else :?>
+<?php else: ?>
     <?php $_readonly = ''; ?>
 <?php endif; ?>
 <fieldset class="fieldset form-inline">
@@ -21,43 +22,56 @@
             </label>
             <div class="control">
                 <select id="inventory_manage_stock"
-                        name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][manage_stock]" <?= /* @noEscape */ $_readonly ?>>
+                        name="<?= /* @noEscape */ $block->getFieldSuffix()
+                        ?>[stock_data][manage_stock]" <?= /* @noEscape */ $_readonly ?>>
                     <option value="1"><?= $block->escapeHtml(__('Yes')) ?></option>
-                    <option value="0"<?php if ($block->getFieldValue('manage_stock') == 0) :?> selected="selected"<?php endif; ?>><?= $block->escapeHtml(__('No')) ?></option>
+                    <option value="0"<?php if ($block->getFieldValue('manage_stock') == 0):?>
+                        selected="selected"<?php endif; ?>><?= $block->escapeHtml(__('No')) ?>
+                    </option>
                 </select>
                 <input type="hidden"
                        id="inventory_manage_stock_default"
                        value="<?= $block->escapeHtmlAttr($block->getDefaultConfigValue('manage_stock')) ?>">
-                <?php $_checked = ($block->getFieldValue('use_config_manage_stock') || $block->isNew()) ? 'checked="checked"' : '' ?>
+                <?php $_checked = ($block->getFieldValue('use_config_manage_stock') || $block->isNew()) ?
+                    'checked="checked"' : '' ?>
                 <input type="checkbox"
                        id="inventory_use_config_manage_stock"
                        name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][use_config_manage_stock]"
-                       value="1" <?= /* @noEscape */ $_checked ?>
-                       onclick="toggleValueElements(this, this.parentNode);" <?= /* @noEscape */ $_readonly ?>>
-                <label for="inventory_use_config_manage_stock"><?= $block->escapeHtml(__('Use Config Settings')) ?></label>
-                <?php if (!$block->isReadonly()) :?>
-                    <script>
+                       value="1" <?= /* @noEscape */ $_checked ?> <?= /* @noEscape */ $_readonly ?>>
+                <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                    'onclick',
+                    "toggleValueElements(this, this.parentNode);",
+                    "#inventory_use_config_manage_stock"
+                ) ?>
+                <label for="inventory_use_config_manage_stock"><?= $block->escapeHtml(__('Use Config Settings')) ?>
+                </label>
+                <?php if (!$block->isReadonly()):?>
+                    <?php $scriptString = <<<script
                         require(['prototype'], function(){
-                            toggleValueElements($('inventory_use_config_manage_stock'), $('inventory_use_config_manage_stock').parentNode);
+                            toggleValueElements($('inventory_use_config_manage_stock'),
+                             $('inventory_use_config_manage_stock').parentNode);
                         });
-                    </script>
+script;
+                    ?>
+                    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
                 <?php endif; ?>
             </div>
-            <?php if (!$block->isSingleStoreMode()) :?>
+            <?php if (!$block->isSingleStoreMode()): ?>
                 <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
             <?php endif; ?>
         </div>
 
-        <?php if (!$block->getProduct()->isComposite()) :?>
+        <?php if (!$block->getProduct()->isComposite()): ?>
             <div class="field">
                 <label class="label" for="inventory_qty">
                     <span><?= $block->escapeHtml(__('Qty')) ?></span>
                 </label>
                 <div class="control">
-                    <?php if (!$_readonly) :?>
+                    <?php if (!$_readonly): ?>
                         <input type="hidden"
                                id="original_inventory_qty"
-                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][original_inventory_qty]"
+                               name="<?= /* @noEscape */ $block->getFieldSuffix()
+                                ?>[stock_data][original_inventory_qty]"
                                value="<?= $block->getFieldValue('qty') * 1 ?>">
                     <?php endif;?>
                     <input type="text"
@@ -66,7 +80,7 @@
                            name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][qty]"
                            value="<?= $block->getFieldValue('qty') * 1 ?>" <?= /* @noEscape */ $_readonly ?>>
                 </div>
-                <?php if (!$block->isSingleStoreMode()) :?>
+                <?php if (!$block->isSingleStoreMode()): ?>
                     <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
                 <?php endif; ?>
             </div>
@@ -83,24 +97,34 @@
                            value="<?= $block->getFieldValue('min_qty') * 1 ?>" <?= /* @noEscape */ $_readonly ?>>
 
                     <div class="control-inner-wrap">
-                        <?php $_checked = ($block->getFieldValue('use_config_min_qty') || $block->isNew()) ? 'checked="checked"' : '' ?>
+                        <?php $_checked = ($block->getFieldValue('use_config_min_qty') || $block->isNew()) ?
+                            'checked="checked"' : '' ?>
                         <input type="checkbox"
                                id="inventory_use_config_min_qty"
                                name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][use_config_min_qty]"
-                               value="1" <?= /* @noEscape */ $_checked ?>
-                               onclick="toggleValueElements(this, this.parentNode);" <?= /* @noEscape */ $_readonly ?>>
-                        <label for="inventory_use_config_min_qty"><?= $block->escapeHtml(__('Use Config Settings')) ?></label>
+                               value="1" <?= /* @noEscape */ $_checked ?> <?= /* @noEscape */ $_readonly ?>>
+                        <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                            'onclick',
+                            "toggleValueElements(this, this.parentNode);",
+                            "#inventory_use_config_min_qty"
+                        ) ?>
+
+                        <label for="inventory_use_config_min_qty"><?= $block->escapeHtml(__('Use Config Settings')) ?>
+                        </label>
                     </div>
 
-                    <?php if (!$block->isReadonly()) :?>
-                        <script>
+                    <?php if (!$block->isReadonly()): ?>
+                        <?php $scriptString = <<<script
                             require(["prototype"], function(){
-                                toggleValueElements($('inventory_use_config_min_qty'), $('inventory_use_config_min_qty').parentNode);
+                                toggleValueElements($('inventory_use_config_min_qty'),
+                                 $('inventory_use_config_min_qty').parentNode);
                             });
-                        </script>
+script;
+                        ?>
+                        <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
                     <?php endif; ?>
                 </div>
-                <?php if (!$block->isSingleStoreMode()) :?>
+                <?php if (!$block->isSingleStoreMode()):?>
                     <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
                 <?php endif; ?>
             </div>
@@ -114,24 +138,35 @@
                            name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][min_sale_qty]"
                            value="<?= $block->getFieldValue('min_sale_qty') * 1 ?>" <?= /* @noEscape */ $_readonly ?>>
                     <div class="control-inner-wrap">
-                        <?php $_checked = ($block->getFieldValue('use_config_min_sale_qty') || $block->isNew()) ? 'checked="checked"' : '' ?>
+                        <?php $_checked = ($block->getFieldValue('use_config_min_sale_qty') || $block->isNew()) ?
+                            'checked="checked"' : '' ?>
                         <input type="checkbox"
                                id="inventory_use_config_min_sale_qty"
-                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][use_config_min_sale_qty]"
+                               name="<?= /* @noEscape */ $block->getFieldSuffix()
+                                ?>[stock_data][use_config_min_sale_qty]"
                                value="1" <?= /* @noEscape */ $_checked ?>
-                               onclick="toggleValueElements(this, this.parentNode);"
                                class="checkbox" <?= /* @noEscape */ $_readonly ?>>
-                        <label for="inventory_use_config_min_sale_qty"><?= $block->escapeHtml(__('Use Config Settings')) ?></label>
+                        <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                            'onclick',
+                            "toggleValueElements(this, this.parentNode);",
+                            "#inventory_use_config_min_sale_qty"
+                        ) ?>
+                        <label for="inventory_use_config_min_sale_qty">
+                            <?= $block->escapeHtml(__('Use Config Settings')) ?>
+                        </label>
                     </div>
-                    <?php if (!$block->isReadonly()) :?>
-                        <script>
+                    <?php if (!$block->isReadonly()):?>
+                        <?php $scriptString = <<<script
                             require(['prototype'], function(){
-                                toggleValueElements($('inventory_use_config_min_sale_qty'), $('inventory_use_config_min_sale_qty').parentNode);
+                                toggleValueElements($('inventory_use_config_min_sale_qty'),
+                                 $('inventory_use_config_min_sale_qty').parentNode);
                             });
-                        </script>
+script;
+                        ?>
+                        <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
                     <?php endif; ?>
                 </div>
-                <?php if (!$block->isSingleStoreMode()) :?>
+                <?php if (!$block->isSingleStoreMode()): ?>
                     <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
                 <?php endif; ?>
             </div>
@@ -146,60 +181,75 @@
                            id="inventory_max_sale_qty"
                            name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][max_sale_qty]"
                            value="<?= $block->getFieldValue('max_sale_qty') * 1 ?>" <?= /* @noEscape */ $_readonly ?>>
-                    <?php $_checked = ($block->getFieldValue('use_config_max_sale_qty') || $block->isNew()) ? 'checked="checked"' : '' ?>
+                    <?php $_checked = ($block->getFieldValue('use_config_max_sale_qty') || $block->isNew()) ?
+                        'checked="checked"' : '' ?>
                     <div class="control-inner-wrap">
                         <input type="checkbox"
                                id="inventory_use_config_max_sale_qty"
-                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][use_config_max_sale_qty]"
+                               name="<?= /* @noEscape */ $block->getFieldSuffix()
+                                ?>[stock_data][use_config_max_sale_qty]"
                                value="1" <?= /* @noEscape */ $_checked ?>
-                               onclick="toggleValueElements(this, this.parentNode);"
                                class="checkbox" <?= /* @noEscape */ $_readonly ?>>
-                        <label for="inventory_use_config_max_sale_qty"><?= $block->escapeHtml(__('Use Config Settings')) ?></label>
+                        <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                            'onclick',
+                            "toggleValueElements(this, this.parentNode);",
+                            "#inventory_use_config_max_sale_qty"
+                        ) ?>
+                        <label for="inventory_use_config_max_sale_qty">
+                            <?= $block->escapeHtml(__('Use Config Settings')) ?>
+                        </label>
                     </div>
-                    <?php if (!$block->isReadonly()) :?>
-                        <script>
+                    <?php if (!$block->isReadonly()):?>
+                        <?php $scriptString = <<<script
                             require(['prototype'], function(){
-                                toggleValueElements($('inventory_use_config_max_sale_qty'), $('inventory_use_config_max_sale_qty').parentNode);
+                                toggleValueElements($('inventory_use_config_max_sale_qty'),
+                                 $('inventory_use_config_max_sale_qty').parentNode);
                             });
-                        </script>
+script;
+                        ?>
+                        <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
                     <?php endif; ?>
                 </div>
-                <?php if (!$block->isSingleStoreMode()) :?>
+                <?php if (!$block->isSingleStoreMode()):?>
                     <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
                 <?php endif; ?>
             </div>
 
-            <?php if ($block->canUseQtyDecimals()) :?>
+            <?php if ($block->canUseQtyDecimals()): ?>
                 <div class="field">
                     <label class="label" for="inventory_is_qty_decimal">
                         <span><?= $block->escapeHtml(__('Qty Uses Decimals')) ?></span>
                     </label>
                     <div class="control">
                         <select id="inventory_is_qty_decimal"
-                                name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][is_qty_decimal]" <?= /* @noEscape */ $_readonly ?>>
+                                name="<?= /* @noEscape */ $block->getFieldSuffix()
+                                ?>[stock_data][is_qty_decimal]" <?= /* @noEscape */ $_readonly ?>>
                             <option value="0"><?= $block->escapeHtml(__('No')) ?></option>
-                            <option value="1"<?php if ($block->getFieldValue('is_qty_decimal') == 1) :?> selected="selected"<?php endif; ?>><?= $block->escapeHtml(__('Yes')) ?></option>
+                            <option value="1"<?php if ($block->getFieldValue('is_qty_decimal') == 1):?>
+                                selected="selected"<?php endif; ?>><?= $block->escapeHtml(__('Yes')) ?>
+                            </option>
                         </select>
                     </div>
-                    <?php if (!$block->isSingleStoreMode()) :?>
+                    <?php if (!$block->isSingleStoreMode()): ?>
                         <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
                     <?php endif; ?>
                 </div>
 
-                <?php if (!$block->isVirtual()) :?>
+                <?php if (!$block->isVirtual()): ?>
                     <div class="field">
                         <label class="label" for="inventory_is_decimal_divided">
                             <span><?= $block->escapeHtml(__('Allow Multiple Boxes for Shipping')) ?></span>
                         </label>
                         <div class="control">
                             <select id="inventory_is_decimal_divided"
-                                    name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][is_decimal_divided]" <?= /* @noEscape */ $_readonly ?>>
+                                    name="<?= /* @noEscape */ $block->getFieldSuffix()
+                                    ?>[stock_data][is_decimal_divided]" <?= /* @noEscape */ $_readonly ?>>
                                 <option value="0"><?= $block->escapeHtml(__('No')) ?></option>
-                                <option value="1"<?php if ($block->getFieldValue('is_decimal_divided') == 1) :?>
+                                <option value="1"<?php if ($block->getFieldValue('is_decimal_divided') == 1): ?>
                                     selected="selected"<?php endif; ?>><?= $block->escapeHtml(__('Yes')) ?></option>
                             </select>
                         </div>
-                        <?php if (!$block->isSingleStoreMode()) :?>
+                        <?php if (!$block->isSingleStoreMode()):?>
                             <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
                         <?php endif; ?>
                     </div>
@@ -212,31 +262,45 @@
                 </label>
                 <div class="control">
                     <select id="inventory_backorders"
-                            name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][backorders]" <?= /* @noEscape */ $_readonly ?>>
-                        <?php foreach ($block->getBackordersOption() as $option) :?>
-                            <?php $_selected = ($option['value'] == $block->getFieldValue('backorders')) ? 'selected="selected"' : '' ?>
-                            <option value="<?= $block->escapeHtmlAttr($option['value']) ?>" <?= /* @noEscape */ $_selected ?>><?= $block->escapeHtml($option['label']) ?></option>
+                            name="<?= /* @noEscape */ $block->getFieldSuffix()
+                            ?>[stock_data][backorders]" <?= /* @noEscape */ $_readonly ?>>
+                        <?php foreach ($block->getBackordersOption() as $option):?>
+                            <?php $_selected = ($option['value'] == $block->getFieldValue('backorders')) ?
+                                'selected="selected"' : '' ?>
+                            <option value="<?= $block->escapeHtmlAttr($option['value']) ?>"
+                                <?= /* @noEscape */ $_selected ?>><?= $block->escapeHtml($option['label']) ?>
+                            </option>
                         <?php endforeach; ?>
                     </select>
 
                     <div class="control-inner-wrap">
-                        <?php $_checked = ($block->getFieldValue('use_config_backorders') || $block->isNew()) ? 'checked="checked"' : '' ?>
+                        <?php $_checked = ($block->getFieldValue('use_config_backorders') || $block->isNew()) ?
+                            'checked="checked"' : '' ?>
                         <input type="checkbox"
                                id="inventory_use_config_backorders"
                                name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][use_config_backorders]"
-                               value="1" <?= /* @noEscape */ $_checked ?>
-                               onclick="toggleValueElements(this, this.parentNode);" <?= /* @noEscape */ $_readonly ?>>
-                        <label for="inventory_use_config_backorders"><?= $block->escapeHtml(__('Use Config Settings')) ?></label>
+                               value="1" <?= /* @noEscape */ $_checked ?> <?= /* @noEscape */ $_readonly ?>>
+                        <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                            'onclick',
+                            "toggleValueElements(this, this.parentNode);",
+                            "#inventory_use_config_backorders"
+                        ) ?>
+                        <label for="inventory_use_config_backorders">
+                            <?= $block->escapeHtml(__('Use Config Settings')) ?>
+                        </label>
                     </div>
-                    <?php if (!$block->isReadonly()) :?>
-                        <script>
+                    <?php if (!$block->isReadonly()): ?>
+                        <?php $scriptString = <<<script
                             require(['prototype'], function(){
-                                toggleValueElements($('inventory_use_config_backorders'), $('inventory_use_config_backorders').parentNode);
+                                toggleValueElements($('inventory_use_config_backorders'),
+                                 $('inventory_use_config_backorders').parentNode);
                             });
-                        </script>
+script;
+                        ?>
+                        <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
                     <?php endif; ?>
                 </div>
-                <?php if (!$block->isSingleStoreMode()) :?>
+                <?php if (!$block->isSingleStoreMode()): ?>
                     <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
                 <?php endif; ?>
             </div>
@@ -250,26 +314,38 @@
                            class="input-text validate-number"
                            id="inventory_notify_stock_qty"
                            name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][notify_stock_qty]"
-                           value="<?= $block->getFieldValue('notify_stock_qty') * 1 ?>" <?= /* @noEscape */ $_readonly ?>>
+                           value="<?= $block->getFieldValue('notify_stock_qty') * 1 ?>"
+                        <?= /* @noEscape */ $_readonly ?>>
 
                     <div class="control-inner-wrap">
-                        <?php $_checked = ($block->getFieldValue('use_config_notify_stock_qty') || $block->isNew()) ? 'checked="checked"' : '' ?>
+                        <?php $_checked = ($block->getFieldValue('use_config_notify_stock_qty') || $block->isNew()) ?
+                            'checked="checked"' : '' ?>
                         <input type="checkbox"
                                id="inventory_use_config_notify_stock_qty"
-                               name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][use_config_notify_stock_qty]"
-                               value="1" <?= /* @noEscape */ $_checked ?>
-                               onclick="toggleValueElements(this, this.parentNode);" <?= /* @noEscape */ $_readonly ?>>
-                        <label for="inventory_use_config_notify_stock_qty"><?= $block->escapeHtml(__('Use Config Settings')) ?></label>
+                               name="<?= /* @noEscape */ $block->getFieldSuffix()
+                                ?>[stock_data][use_config_notify_stock_qty]"
+                               value="1" <?= /* @noEscape */ $_checked ?> <?= /* @noEscape */ $_readonly ?>>
+                        <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                            'onclick',
+                            "toggleValueElements(this, this.parentNode);",
+                            "#inventory_use_config_notify_stock_qty"
+                        ) ?>
+                        <label for="inventory_use_config_notify_stock_qty">
+                            <?= $block->escapeHtml(__('Use Config Settings')) ?>
+                        </label>
                     </div>
-                    <?php if (!$block->isReadonly()) :?>
-                        <script>
+                    <?php if (!$block->isReadonly()): ?>
+                        <?php $scriptString = <<<script
                             require(['prototype'], function(){
-                                toggleValueElements($('inventory_use_config_notify_stock_qty'), $('inventory_use_config_notify_stock_qty').parentNode);
+                                toggleValueElements($('inventory_use_config_notify_stock_qty'),
+                                 $('inventory_use_config_notify_stock_qty').parentNode);
                             });
-                        </script>
+script;
+                        ?>
+                        <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
                     <?php endif; ?>
                 </div>
-                <?php if (!$block->isSingleStoreMode()) :?>
+                <?php if (!$block->isSingleStoreMode()):?>
                     <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
                 <?php endif; ?>
             </div>
@@ -282,32 +358,48 @@
             <div class="control">
                 <?php $qtyIncrementsEnabled = $block->getFieldValue('enable_qty_increments'); ?>
                 <select id="inventory_enable_qty_increments"
-                        name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][enable_qty_increments]" <?= /* @noEscape */ $_readonly ?>>
-                    <option value="1"<?php if ($qtyIncrementsEnabled) :?> selected="selected"<?php endif; ?>><?= $block->escapeHtml(__('Yes')) ?></option>
-                    <option value="0"<?php if (!$qtyIncrementsEnabled) :?> selected="selected"<?php endif; ?>><?= $block->escapeHtml(__('No')) ?></option>
+                        name="<?= /* @noEscape */ $block->getFieldSuffix()
+                        ?>[stock_data][enable_qty_increments]" <?= /* @noEscape */ $_readonly ?>>
+                    <option value="1"<?php if ($qtyIncrementsEnabled):?> selected="selected"<?php endif; ?>>
+                        <?= $block->escapeHtml(__('Yes')) ?>
+                    </option>
+                    <option value="0"<?php if (!$qtyIncrementsEnabled):?> selected="selected"<?php endif; ?>>
+                        <?= $block->escapeHtml(__('No')) ?>
+                    </option>
                 </select>
                 <input type="hidden"
                        id="inventory_enable_qty_increments_default"
                        value="<?= $block->escapeHtmlAttr($block->getDefaultConfigValue('enable_qty_increments')) ?>">
 
                 <div class="control-inner-wrap">
-                    <?php $_checked = ($block->getFieldValue('use_config_enable_qty_inc') || $block->isNew()) ? 'checked="checked"' : '' ?>
+                    <?php $_checked = ($block->getFieldValue('use_config_enable_qty_inc') || $block->isNew()) ?
+                        'checked="checked"' : '' ?>
                     <input type="checkbox"
                            id="inventory_use_config_enable_qty_increments"
-                           name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][use_config_enable_qty_increments]"
-                           value="1" <?= /* @noEscape */ $_checked ?>
-                           onclick="toggleValueElements(this, this.parentNode);" <?= /* @noEscape */ $_readonly ?>>
-                    <label for="inventory_use_config_enable_qty_increments"><?= $block->escapeHtml(__('Use Config Settings')) ?></label>
+                           name="<?= /* @noEscape */ $block->getFieldSuffix()
+                            ?>[stock_data][use_config_enable_qty_increments]"
+                           value="1" <?= /* @noEscape */ $_checked ?> <?= /* @noEscape */ $_readonly ?>>
+                    <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                        'onclick',
+                        "toggleValueElements(this, this.parentNode);",
+                        "#inventory_use_config_enable_qty_increments"
+                    ) ?>
+                    <label for="inventory_use_config_enable_qty_increments">
+                        <?= $block->escapeHtml(__('Use Config Settings')) ?>
+                    </label>
                 </div>
-                <?php if (!$block->isReadonly()) :?>
-                    <script>
+                <?php if (!$block->isReadonly()): ?>
+                    <?php $scriptString = <<<script
                         require(['prototype'], function(){
-                            toggleValueElements($('inventory_use_config_enable_qty_increments'), $('inventory_use_config_enable_qty_increments').parentNode);
+                            toggleValueElements($('inventory_use_config_enable_qty_increments'),
+                             $('inventory_use_config_enable_qty_increments').parentNode);
                         });
-                    </script>
+script;
+                    ?>
+                    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
                 <?php endif; ?>
             </div>
-            <?php if (!$block->isSingleStoreMode()) :?>
+            <?php if (!$block->isSingleStoreMode()): ?>
                 <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
             <?php endif; ?>
         </div>
@@ -323,23 +415,33 @@
                        name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][qty_increments]"
                        value="<?= $block->getFieldValue('qty_increments') * 1 ?>" <?= /* @noEscape */ $_readonly ?>>
                 <div class="control-inner-wrap">
-                    <?php $_checked = ($block->getFieldValue('use_config_qty_increments') || $block->isNew()) ? 'checked="checked"' : '' ?>
+                    <?php $_checked = ($block->getFieldValue('use_config_qty_increments') || $block->isNew()) ?
+                        'checked="checked"' : '' ?>
                     <input type="checkbox"
                            id="inventory_use_config_qty_increments"
                            name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][use_config_qty_increments]"
-                           value="1" <?= /* @noEscape */ $_checked ?>
-                           onclick="toggleValueElements(this, this.parentNode);" <?= /* @noEscape */ $_readonly ?>>
-                    <label for="inventory_use_config_qty_increments"><?= $block->escapeHtml(__('Use Config Settings')) ?></label>
+                           value="1" <?= /* @noEscape */ $_checked ?> <?= /* @noEscape */ $_readonly ?>>
+                    <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                        'onclick',
+                        "toggleValueElements(this, this.parentNode);",
+                        "#inventory_use_config_qty_increments"
+                    ) ?>
+                    <label for="inventory_use_config_qty_increments">
+                        <?= $block->escapeHtml(__('Use Config Settings')) ?>
+                    </label>
                 </div>
-                <?php if (!$block->isReadonly()) :?>
-                    <script>
+                <?php if (!$block->isReadonly()): ?>
+                    <?php $scriptString = <<<script
                         require(['prototype'], function(){
-                            toggleValueElements($('inventory_use_config_qty_increments'), $('inventory_use_config_qty_increments').parentNode);
+                            toggleValueElements($('inventory_use_config_qty_increments'),
+                             $('inventory_use_config_qty_increments').parentNode);
                         });
-                    </script>
+script;
+                    ?>
+                    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
                 <?php endif; ?>
             </div>
-            <?php if (!$block->isSingleStoreMode()) :?>
+            <?php if (!$block->isSingleStoreMode()): ?>
                 <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
             <?php endif; ?>
         </div>
@@ -350,21 +452,25 @@
             </label>
             <div class="control">
                 <select id="inventory_stock_availability"
-                        name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[stock_data][is_in_stock]" <?= /* @noEscape */ $_readonly ?>>
-                    <?php foreach ($block->getStockOption() as $option) :?>
-                        <?php $_selected = ($block->getFieldValue('is_in_stock') !== null && $option['value'] == $block->getFieldValue('is_in_stock')) ? 'selected="selected"' : '' ?>
-                        <option value="<?= $block->escapeHtmlAttr($option['value']) ?>" <?= /* @noEscape */ $_selected ?>><?= $block->escapeHtml($option['label']) ?></option>
+                        name="<?= /* @noEscape */ $block->getFieldSuffix()
+                        ?>[stock_data][is_in_stock]" <?= /* @noEscape */ $_readonly ?>>
+                    <?php foreach ($block->getStockOption() as $option):?>
+                        <?php $_selected = ($block->getFieldValue('is_in_stock') !== null &&
+                            $option['value'] == $block->getFieldValue('is_in_stock')) ? 'selected="selected"' : '' ?>
+                        <option value="<?= $block->escapeHtmlAttr($option['value']) ?>"
+                            <?= /* @noEscape */ $_selected ?>><?= $block->escapeHtml($option['label']) ?>
+                        </option>
                     <?php endforeach; ?>
                 </select>
             </div>
-            <?php if (!$block->isSingleStoreMode()) :?>
+            <?php if (!$block->isSingleStoreMode()):?>
                 <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
             <?php endif; ?>
         </div>
     </div>
 </fieldset>
 
-<script>
+<?php $scriptString = <<<script
     require(["jquery","prototype"], function(jQuery){
 
         //<![CDATA[
@@ -406,15 +512,23 @@
         }
 
         function applyEnableDecimalDivided() {
-            <?php if (!$block->isVirtual()) :?>
+script;
+if (!$block->isVirtual()):
+    $scriptString .= <<<script
             $('inventory_is_decimal_divided').up('.field').hide();
-            <?php endif; ?>
+script;
+            endif;
+            $scriptString .= <<<script
             $('inventory_qty_increments').removeClassName('validate-digits').removeClassName('validate-number');
             $('inventory_min_sale_qty').removeClassName('validate-digits').removeClassName('validate-number');
             if ($('inventory_is_qty_decimal').value == 1) {
-                <?php if (!$block->isVirtual()) :?>
+script;
+if (!$block->isVirtual()):
+    $scriptString .= <<<script
                 $('inventory_is_decimal_divided').up('.field').show();
-                <?php endif; ?>
+script;
+                endif;
+                $scriptString .= <<<script
                 $('inventory_qty_increments').addClassName('validate-number');
                 $('inventory_min_sale_qty').addClassName('validate-number');
             } else {
@@ -448,4 +562,6 @@
         //]]>
 
     });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml
index 17fb517b32547..77f64930071e7 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml
@@ -4,13 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-
 /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes\Search */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <div id="product-attribute-search-container" class="suggest-expandable attribute-selector">
     <div class="action-dropdown">
-        <button type="button" class="action-toggle action-choose" data-mage-init='{"dropdown":{}}' data-toggle="dropdown">
+        <button type="button" class="action-toggle action-choose" data-mage-init='{"dropdown":{}}'
+                data-toggle="dropdown">
             <span><?= $block->escapeHtml(__('Add Attribute')) ?></span>
         </button>
         <div class="dropdown-menu">
@@ -21,7 +21,8 @@
         </div>
     </div>
 
-<script data-template-for="product-attribute-search-<?= $block->escapeHtmlAttr($block->getGroupId()) ?>" type="text/x-magento-template">
+<script data-template-for="product-attribute-search-<?= $block->escapeHtmlAttr($block->getGroupId()) ?>"
+        type="text/x-magento-template">
     <ul data-mage-init='{"menu":[]}'>
         <% if (data.items.length) { %>
         <% _.each(data.items, function(value){ %>
@@ -32,9 +33,14 @@
     <div class="actions"><?= $block->escapeHtml($block->getAttributeCreate()) ?></div>
 </script>
 
-<script>
+<?php
+$jsonHelper = $block->getData('jsonHelper');
+$selectorOptions = /* @noEscape */ $jsonHelper->jsonEncode($block->getSelectorOptions());
+$scriptString = <<<script
     require(["jquery","mage/mage","mage/backend/suggest"], function($) {
-        var $suggest = $('[data-role="product-attribute-search"][data-group="<?= $block->escapeHtml($block->getGroupCode()) ?>"]');
+        var $suggest = $('[data-role="product-attribute-search"][data-group="{$block->escapeHtml(
+            $block->getGroupCode()
+        )}"]');
 
         $suggest.on('suggestclose', function(e) {
             $suggest.closest('.dropdown-menu').siblings('[data-toggle=dropdown]').trigger('close.dropdown');
@@ -51,13 +57,13 @@
             });
         });
 
-        $suggest.mage('suggest', <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getSelectorOptions()) ?>)
+        $suggest.mage('suggest', {$selectorOptions})
             .on('suggestselect', function (e, ui) {
                 $(this).val('');
                 var templateId = $('#attribute_set_id').val();
                 if (ui.item.id) {
                     $.ajax({
-                        url: '<?= $block->escapeJs($block->escapeUrl($block->getAddAttributeUrl())) ?>',
+                        url: '{$block->escapeJs($block->getAddAttributeUrl())}',
                         type: 'POST',
                         dataType: 'json',
                         data: {attribute_id: ui.item.id, template_id: templateId, group: $(this).data('group')},
@@ -70,5 +76,7 @@
                 }
         });
     });
-</script>
+script;
+?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/massaction_extended.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/massaction_extended.phtml
index c814298d1dbc5..3ba507d2b3ebb 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/massaction_extended.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/massaction_extended.phtml
@@ -5,9 +5,10 @@
  */
 
 /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Grid */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <div id="<?= $block->getHtmlId() ?>" class="admin__grid-massaction">
-    <?php if ($block->getHideFormElement() !== true) :?>
+    <?php if ($block->getHideFormElement() !== true):?>
     <form action="" id="<?= $block->getHtmlId() ?>-form" method="post">
     <?php endif ?>
         <div class="admin__grid-massaction-form">
@@ -15,20 +16,25 @@
             <select
                 id="<?= $block->getHtmlId() ?>-select"
                 class="local-validation admin__control-select">
-                <option class="admin__control-select-placeholder" value="" selected><?= $block->escapeHtml(__('Actions')) ?></option>
-                <?php foreach ($block->getItems() as $_item) :?>
-                    <option value="<?= $block->escapeHtmlAttr($_item->getId()) ?>"<?= ($_item->getSelected() ? ' selected="selected"' : '') ?>><?= $block->escapeHtml($_item->getLabel()) ?></option>
+                <option class="admin__control-select-placeholder" value=""
+                        selected><?= $block->escapeHtml(__('Actions')) ?>
+                </option>
+                <?php foreach ($block->getItems() as $_item):?>
+                    <option value="<?= $block->escapeHtmlAttr($_item->getId()) ?>"
+                        <?= ($_item->getSelected() ? ' selected="selected"' : '') ?>>
+                        <?= $block->escapeHtml($_item->getLabel()) ?>
+                    </option>
                 <?php endforeach; ?>
             </select>
             <span class="outer-span" id="<?= $block->getHtmlId() ?>-form-hiddens"></span>
             <span class="outer-span" id="<?= $block->getHtmlId() ?>-form-additional"></span>
             <?= $block->getApplyButtonHtml() ?>
         </div>
-    <?php if ($block->getHideFormElement() !== true) :?>
+    <?php if ($block->getHideFormElement() !== true):?>
     </form>
     <?php endif ?>
     <div class="no-display">
-    <?php foreach ($block->getItems() as $_item) :?>
+    <?php foreach ($block->getItems() as $_item):?>
         <div id="<?= $block->getHtmlId() ?>-item-<?= $block->escapeHtmlAttr($_item->getId()) ?>-block">
             <?= $_item->getAdditionalActionBlockHtml() ?>
         </div>
@@ -39,7 +45,7 @@
         <select id="<?= $block->escapeHtmlAttr($block->getHtmlId()) ?>-mass-select" data-menu="grid-mass-select">
             <optgroup label="<?= $block->escapeHtmlAttr(__('Mass Actions')) ?>">
                 <option disabled selected></option>
-                <?php if ($block->getUseSelectAll()) :?>
+                <?php if ($block->getUseSelectAll()):?>
                     <option value="selectAll">
                         <?= $block->escapeHtml(__('Select All')) ?>
                     </option>
@@ -58,34 +64,40 @@
         <label for="<?= $block->getHtmlId() ?>-mass-select"></label>
     </div>
 
-<script>
+    <?php $scriptString = <<<script
     require(['jquery'], function($){
         'use strict';
-        $('#<?= $block->getHtmlId() ?>-mass-select').change(function () {
+        $('#{$block->getHtmlId()}-mass-select').change(function () {
             var massAction = $('option:selected', this).val();
             switch (massAction) {
-                <?php if ($block->getUseSelectAll()) :?>
+script;
+    if ($block->getUseSelectAll()):
+        $scriptString .= <<<script
                 case 'selectAll':
-                    return <?= $block->escapeJs($block->getJsObjectName()) ?>.selectAll();
+                    return {$block->escapeJs($block->getJsObjectName())}.selectAll();
                     break
                 case 'unselectAll':
-                    return <?= $block->escapeJs($block->getJsObjectName()) ?>.unselectAll();
+                    return {$block->escapeJs($block->getJsObjectName())}.unselectAll();
                     break
-                <?php endif; ?>
+script;
+    endif;
+    $scriptString .= <<<script
                 case 'selectVisible':
-                    return <?= $block->escapeJs($block->getJsObjectName()) ?>.selectVisible();
+                    return {$block->escapeJs($block->getJsObjectName())}.selectVisible();
                     break
                 case 'unselectVisible':
-                    return <?= $block->escapeJs($block->getJsObjectName()) ?>.unselectVisible();
+                    return {$block->escapeJs($block->getJsObjectName())}.unselectVisible();
                     break
             }
             this.blur();
         });
 
     });
-
-    <?php if (!$block->getParentBlock()->canDisplayContainer()) :?>
-        <?= $block->escapeJs($block->getJsObjectName())  ?>.setGridIds('<?= /* @noEscape */ $block->getGridIdsJson() ?>');
-    <?php endif; ?>
-</script>
+script;
+    if (!$block->getParentBlock()->canDisplayContainer()):
+        $scriptString .= $block->escapeJs($block->getJsObjectName()) . ".setGridIds('" .
+            /* @noEscape */ $block->getGridIdsJson() . "');";
+    endif;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 </div>
diff --git a/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml b/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml
index 78d2883d7401a..79e1ce352a4c1 100644
--- a/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml
+++ b/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml
@@ -8,9 +8,10 @@ use Magento\Catalog\Model\Product\Option;
 
 /**
  * @var $block \Magento\Catalog\Block\Product\View\Options\Type\Select\Checkable
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 $option = $block->getOption();
-if ($option) : ?>
+if ($option): ?>
     <?php
     $configValue = $block->getPreconfiguredValue($option);
     $optionType = $option->getType();
@@ -19,17 +20,21 @@ if ($option) : ?>
     ?>
 
 <div class="options-list nested" id="options-<?= $block->escapeHtmlAttr($option->getId()) ?>-list">
-    <?php if ($optionType === Option::OPTION_TYPE_RADIO && !$option->getIsRequire()) :?>
+    <?php if ($optionType === Option::OPTION_TYPE_RADIO && !$option->getIsRequire()):?>
     <div class="field choice admin__field admin__field-option">
         <input type="radio"
                id="options_<?= $block->escapeHtmlAttr($option->getId()) ?>"
                class="radio admin__control-radio product-custom-option"
                name="options[<?= $block->escapeHtmlAttr($option->getId()) ?>]"
                data-selector="options[<?= $block->escapeHtmlAttr($option->getId()) ?>]"
-               onclick="<?= $block->getSkipJsReloadPrice() ? '' : 'opConfig.reloadPrice()' ?>"
                value=""
                checked="checked"
         />
+        <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+            'onclick',
+            $block->getSkipJsReloadPrice() ? '' : 'opConfig.reloadPrice()',
+            "options_" . $block->escapeHtmlAttr($option->getId())
+        ) ?>
         <label class="label admin__field-label" for="options_<?= $block->escapeHtmlAttr($option->getId()) ?>">
                         <span>
                             <?= $block->escapeHtml(__('None'))  ?>
@@ -38,7 +43,7 @@ if ($option) : ?>
     </div>
 <?php endif; ?>
 
-    <?php foreach ($option->getValues() as $value) : ?>
+    <?php foreach ($option->getValues() as $value): ?>
         <?php
         $checked = '';
         $count++;
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/set/js.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/set/js.phtml
index 5f49d5eb47442..272234a0ee074 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/set/js.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/set/js.phtml
@@ -5,8 +5,11 @@
  * See COPYING.txt for license details.
  */
 
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<script>
+
+<?php $scriptString = <<<script
+
 require([
     "Magento_Ui/js/modal/alert",
     "tree-panel"
@@ -27,7 +30,10 @@ editSet.submit = editSet.submit.wrap(function(original) {
     if (editSet.currentNode){
         if (ConfigurableNodeExists(editSet.currentNode)) {
             alert({
-                content: '<?= $block->escapeJs(__('This group contains attributes used in configurable products. Please move these attributes to another group and try again.')) ?>'
+                content: '{$block->escapeJs(
+                    __('This group contains attributes used in configurable products. ' .
+                        'Please move these attributes to another group and try again.')
+                )}'
             });
             return;
         }
@@ -38,7 +44,9 @@ editSet.submit = editSet.submit.wrap(function(original) {
 editSet.rightBeforeAppend = editSet.rightBeforeAppend.wrap(function(original, tree, nodeThis, node, newParent) {
     if (node.attributes.is_configurable == 1) {
         alert({
-            content: '<?= $block->escapeJs(__('This attribute is used in configurable products. You cannot remove it from the attribute set.')) ?>'
+            content: '{$block->escapeJs(
+                __('This attribute is used in configurable products. You cannot remove it from the attribute set.')
+            )}'
         });
         return false;
     }
@@ -48,7 +56,9 @@ editSet.rightBeforeAppend = editSet.rightBeforeAppend.wrap(function(original, tr
 editSet.rightBeforeInsert = editSet.rightBeforeInsert.wrap(function(original, tree, nodeThis, node, newParent) {
     if (node.attributes.is_configurable == 1) {
         alert({
-            content: '<?= $block->escapeJs(__('This attribute is used in configurable products. You cannot remove it from the attribute set.')) ?>'
+            content: '{$block->escapeJs(
+                __('This attribute is used in configurable products. You cannot remove it from the attribute set.')
+            )}'
         });
         return false;
     }
@@ -56,4 +66,6 @@ editSet.rightBeforeInsert = editSet.rightBeforeInsert.wrap(function(original, tr
 });
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Csp/etc/config.xml b/app/code/Magento/Csp/etc/config.xml
index 68328ac7bc540..dd3ddcbbf85bc 100644
--- a/app/code/Magento/Csp/etc/config.xml
+++ b/app/code/Magento/Csp/etc/config.xml
@@ -38,6 +38,11 @@
                         <inline>1</inline>
                         <eval>0</eval>
                         <dynamic>0</dynamic>
+                        <schemes>
+                            <http>http</http>
+                            <https>https</https>
+                            <blob>blob</blob>
+                        </schemes>
                     </children>
                     <connections>
                         <policy_id>connect-src</policy_id>
@@ -77,7 +82,7 @@
                     <scripts>
                         <policy_id>script-src</policy_id>
                         <self>1</self>
-                        <inline>1</inline>
+                        <inline>0</inline>
                         <eval>1</eval>
                         <dynamic>0</dynamic>
                     </scripts>
@@ -138,6 +143,11 @@
                         <inline>1</inline>
                         <eval>0</eval>
                         <dynamic>0</dynamic>
+                        <schemes>
+                            <http>http</http>
+                            <https>https</https>
+                            <blob>blob</blob>
+                        </schemes>
                     </children>
                     <connections>
                         <policy_id>connect-src</policy_id>

From 756ad5996476d5f4f13a0fd1a1638ed64bfaa609 Mon Sep 17 00:00:00 2001
From: Dmytro Voskoboinikov <voskoboi@adobe.com>
Date: Wed, 15 Apr 2020 19:47:50 -0500
Subject: [PATCH 0164/1718] MC-31362: Media folder update

---
 .../Unit/Model/Wysiwyg/Images/StorageTest.php | 36 +++++++++----------
 .../Unit/Model/Design/Backend/FileTest.php    | 19 +++++-----
 .../Unit/Model/Design/Backend/ImageTest.php   |  5 ++-
 3 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
index 6bdadfa07ff3d..3dea9648e2b38 100644
--- a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
@@ -29,17 +29,17 @@ class StorageTest extends \PHPUnit\Framework\TestCase
     protected $imagesStorage;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit\Framework\MockObject\MockObject
      */
     protected $filesystemMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit\Framework\MockObject\MockObject
      */
     protected $adapterFactoryMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit\Framework\MockObject\MockObject
      */
     protected $imageHelperMock;
 
@@ -49,67 +49,67 @@ class StorageTest extends \PHPUnit\Framework\TestCase
     protected $resizeParameters;
 
     /**
-     * @var \Magento\Cms\Model\Wysiwyg\Images\Storage\CollectionFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Cms\Model\Wysiwyg\Images\Storage\CollectionFactory|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $storageCollectionFactoryMock;
 
     /**
-     * @var \Magento\MediaStorage\Model\File\Storage\FileFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\MediaStorage\Model\File\Storage\FileFactory|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $storageFileFactoryMock;
 
     /**
-     * @var \Magento\MediaStorage\Model\File\Storage\DatabaseFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\MediaStorage\Model\File\Storage\DatabaseFactory|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $storageDatabaseFactoryMock;
 
     /**
-     * @var \Magento\MediaStorage\Model\File\Storage\Directory\DatabaseFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\MediaStorage\Model\File\Storage\Directory\DatabaseFactory|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $directoryDatabaseFactoryMock;
 
     /**
-     * @var \Magento\MediaStorage\Model\File\Storage\Directory\Database|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\MediaStorage\Model\File\Storage\Directory\Database|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $directoryCollectionMock;
 
     /**
-     * @var \Magento\MediaStorage\Model\File\UploaderFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\MediaStorage\Model\File\UploaderFactory|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $uploaderFactoryMock;
 
     /**
-     * @var \Magento\Backend\Model\Session|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Backend\Model\Session|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $sessionMock;
 
     /**
-     * @var \Magento\Backend\Model\Url|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Backend\Model\Url|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $backendUrlMock;
 
     /**
-     * @var \Magento\Framework\Filesystem\Directory\Write|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Filesystem\Directory\Write|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $directoryMock;
 
     /**
-     * @var \Magento\Framework\Filesystem\DriverInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Filesystem\DriverInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $driverMock;
 
     /**
-     * @var \Magento\MediaStorage\Helper\File\Storage\Database|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\MediaStorage\Helper\File\Storage\Database|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $coreFileStorageMock;
 
     /**
-     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $objectManagerHelper;
 
     /**
-     * @var \Magento\Framework\Filesystem\Io\File|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Filesystem\Io\File|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $ioFileMock;
 
@@ -357,7 +357,7 @@ public function testGetDirsCollection($exclude, $include, $fileNames, $expectedR
 
         $collection = [];
         foreach ($fileNames as $filename) {
-            /** @var \Magento\Framework\DataObject|\PHPUnit_Framework_MockObject_MockObject $objectMock */
+            /** @var \Magento\Framework\DataObject|\PHPUnit\Framework\MockObject\MockObject $objectMock */
             $objectMock = $this->createPartialMock(\Magento\Framework\DataObject::class, ['getFilename']);
             $objectMock->expects($this->any())
                 ->method('getFilename')
@@ -430,7 +430,7 @@ public function dirsCollectionDataProvider()
      */
     protected function generalTestGetDirsCollection($path, $collectionArray = [], $expectedRemoveKeys = [])
     {
-        /** @var StorageCollection|\PHPUnit_Framework_MockObject_MockObject $storageCollectionMock */
+        /** @var StorageCollection|\PHPUnit\Framework\MockObject\MockObject $storageCollectionMock */
         $storageCollectionMock = $this->getMockBuilder(\Magento\Cms\Model\Wysiwyg\Images\Storage\Collection::class)
             ->disableOriginalConstructor()
             ->getMock();
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
index 91ba3941ca937..a8dc3a725f4a4 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
@@ -16,32 +16,31 @@
 use Magento\Framework\UrlInterface;
 use Magento\MediaStorage\Helper\File\Storage\Database;
 use Magento\Theme\Model\Design\Backend\File;
-use PHPUnit_Framework_MockObject_MockObject;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class FileTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var WriteInterface|PHPUnit_Framework_MockObject_MockObject */
+    /** @var WriteInterface|\PHPUnit\Framework\MockObject\MockObject */
     private $mediaDirectory;
 
-    /** @var UrlInterface|PHPUnit_Framework_MockObject_MockObject */
+    /** @var UrlInterface|\PHPUnit\Framework\MockObject\MockObject */
     private $urlBuilder;
 
     /** @var File */
     private $fileBackend;
 
-    /** @var IoFileSystem|PHPUnit_Framework_MockObject_MockObject */
+    /** @var IoFileSystem|\PHPUnit\Framework\MockObject\MockObject */
     private $ioFileSystem;
 
     /**
-     * @var Mime|PHPUnit_Framework_MockObject_MockObject
+     * @var Mime|\PHPUnit\Framework\MockObject\MockObject
      */
     private $mime;
 
     /**
-     * @var Database|PHPUnit_Framework_MockObject_MockObject
+     * @var Database|\PHPUnit\Framework\MockObject\MockObject
      */
     private $databaseHelper;
 
@@ -131,9 +130,9 @@ public function tearDown()
      *
      * @param string $class
      * @param array $methods
-     * @return PHPUnit_Framework_MockObject_MockObject
+     * @return \PHPUnit\Framework\MockObject\MockObject
      */
-    private function getMockObject(string $class, array $methods = []): PHPUnit_Framework_MockObject_MockObject
+    private function getMockObject(string $class, array $methods = []): \PHPUnit\Framework\MockObject\MockObject
     {
         $builder =  $this->getMockBuilder($class)
             ->disableOriginalConstructor();
@@ -147,9 +146,9 @@ private function getMockObject(string $class, array $methods = []): PHPUnit_Fram
      * Gets mock objects for abstract class.
      *
      * @param string $class
-     * @return PHPUnit_Framework_MockObject_MockObject
+     * @return \PHPUnit\Framework\MockObject\MockObject
      */
-    private function getMockObjectForAbstractClass(string $class): PHPUnit_Framework_MockObject_MockObject
+    private function getMockObjectForAbstractClass(string $class): \PHPUnit\Framework\MockObject\MockObject
     {
         return  $this->getMockBuilder($class)
             ->getMockForAbstractClass();
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php
index 2bc60ffa7aa04..38d0c8dc75754 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php
@@ -21,7 +21,6 @@
 use Magento\MediaStorage\Helper\File\Storage\Database;
 use Magento\MediaStorage\Model\File\UploaderFactory;
 use Magento\Theme\Model\Design\Backend\Image;
-use PHPUnit_Framework_MockObject_MockObject;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -79,9 +78,9 @@ public function tearDown()
     /**
      * @param string $class
      * @param array $methods
-     * @return PHPUnit_Framework_MockObject_MockObject
+     * @return \PHPUnit\Framework\MockObject\MockObject
      */
-    private function getMockObject(string $class, array $methods = []): PHPUnit_Framework_MockObject_MockObject
+    private function getMockObject(string $class, array $methods = []): \PHPUnit\Framework\MockObject\MockObject
     {
         $builder =  $this->getMockBuilder($class)
             ->disableOriginalConstructor();

From 859098b2869aa05db36add385000219b2cd2a201 Mon Sep 17 00:00:00 2001
From: Dmytro Voskoboinikov <voskoboi@adobe.com>
Date: Wed, 15 Apr 2020 19:52:33 -0500
Subject: [PATCH 0165/1718] MC-31357: Customer file uploader update

---
 .../Unit/Model/Metadata/Form/ImageTest.php    | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php
index e64c9d87b8b82..93fbd7d096591 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php
@@ -26,7 +26,6 @@
 use Magento\Framework\Filesystem\Io\File;
 use Magento\Framework\Url\EncoderInterface;
 use Magento\MediaStorage\Model\File\Validator\NotProtectedExtension;
-use PHPUnit_Framework_MockObject_MockObject;
 
 /**
  * Tests Metadata/Form/Image class
@@ -36,67 +35,67 @@
 class ImageTest extends AbstractFormTestCase
 {
     /**
-     * @var PHPUnit_Framework_MockObject_MockObject|EncoderInterface
+     * @var \PHPUnit\Framework\MockObject\MockObject|EncoderInterface
      */
     private $urlEncode;
 
     /**
-     * @var PHPUnit_Framework_MockObject_MockObject|NotProtectedExtension
+     * @var \PHPUnit\Framework\MockObject\MockObject|NotProtectedExtension
      */
     private $fileValidatorMock;
 
     /**
-     * @var PHPUnit_Framework_MockObject_MockObject|Filesystem
+     * @var \PHPUnit\Framework\MockObject\MockObject|Filesystem
      */
     private $fileSystemMock;
 
     /**
-     * @var PHPUnit_Framework_MockObject_MockObject|Http
+     * @var \PHPUnit\Framework\MockObject\MockObject|Http
      */
     private $requestMock;
 
     /**
-     * @var PHPUnit_Framework_MockObject_MockObject|UploaderFactory
+     * @var \PHPUnit\Framework\MockObject\MockObject|UploaderFactory
      */
     private $uploaderFactoryMock;
 
     /**
-     * @var FileProcessor|PHPUnit_Framework_MockObject_MockObject
+     * @var FileProcessor|\PHPUnit\Framework\MockObject\MockObject
      */
     private $fileProcessorMock;
 
     /**
-     * @var ImageContentInterfaceFactory|PHPUnit_Framework_MockObject_MockObject
+     * @var ImageContentInterfaceFactory|\PHPUnit\Framework\MockObject\MockObject
      */
     private $imageContentFactory;
 
     /**
-     * @var FileProcessorFactory|PHPUnit_Framework_MockObject_MockObject
+     * @var FileProcessorFactory|\PHPUnit\Framework\MockObject\MockObject
      */
     private $fileProcessorFactoryMock;
 
     /**
-     * @var File|PHPUnit_Framework_MockObject_MockObject
+     * @var File|\PHPUnit\Framework\MockObject\MockObject
      */
     private $ioFileSystemMock;
 
     /**
-     * @var DirectoryList|PHPUnit_Framework_MockObject_MockObject
+     * @var DirectoryList|\PHPUnit\Framework\MockObject\MockObject
      */
     private $directoryListMock;
 
     /**
-     * @var WriteFactory|PHPUnit_Framework_MockObject_MockObject
+     * @var WriteFactory|\PHPUnit\Framework\MockObject\MockObject
      */
     private $writeFactoryMock;
 
     /**
-     * @var Write|PHPUnit_Framework_MockObject_MockObject
+     * @var Write|\PHPUnit\Framework\MockObject\MockObject
      */
     private $mediaEntityTmpDirectoryMock;
 
     /**
-     * @var Driver|PHPUnit_Framework_MockObject_MockObject
+     * @var Driver|\PHPUnit\Framework\MockObject\MockObject
      */
     private $driverMock;
 

From 1aca83fe5305a6ef173e81bba727e4059129be16 Mon Sep 17 00:00:00 2001
From: Stas Kozar <stas.kozar@transoftgroup.com>
Date: Thu, 16 Apr 2020 10:21:32 +0300
Subject: [PATCH 0166/1718] MC-33404: Incorrect display of file name in import
 history

---
 .../Grid/Column/Renderer/Download.php         |  6 ++--
 .../Adminhtml/Grid/Column/Renderer/Error.php  |  6 ++--
 .../Grid/Column/Renderer/DownloadTest.php     | 36 +++++++++++++++----
 3 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Download.php b/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Download.php
index 81fa9767fbaa4..110503a505752 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Download.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Download.php
@@ -20,9 +20,9 @@ class Download extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text
      */
     public function _getValue(\Magento\Framework\DataObject $row)
     {
-        return '<p> ' . $row->getData('imported_file') .  '</p><a href="'
-        . $this->getUrl('*/*/download', ['filename' => $row->getData('imported_file')]) . '">'
-        . __('Download')
+        return '<p> ' . $this->escapeHtml($row->getData('imported_file')) .  '</p><a href="'
+        . $this->escapeUrl($this->getUrl('*/*/download', ['filename' => $row->getData('imported_file')])) . '">'
+        . $this->escapeHtml(__('Download'))
         . '</a>';
     }
 }
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Error.php b/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Error.php
index 527bc5025d139..5760d26de68b1 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Error.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Error.php
@@ -22,9 +22,9 @@ public function _getValue(\Magento\Framework\DataObject $row)
     {
         $result = '';
         if ($row->getData('error_file') != '') {
-            $result = '<p> ' . $row->getData('error_file') .  '</p><a href="'
-                . $this->getUrl('*/*/download', ['filename' => $row->getData('error_file')]) . '">'
-                . __('Download')
+            $result = '<p> ' . $this->escapeHtml($row->getData('error_file')) .  '</p><a href="'
+                . $this->escapeUrl($this->getUrl('*/*/download', ['filename' => $row->getData('error_file')])) . '">'
+                . $this->escapeHtml(__('Download'))
                 . '</a>';
         }
         return $result;
diff --git a/app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Grid/Column/Renderer/DownloadTest.php b/app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Grid/Column/Renderer/DownloadTest.php
index b0d16dadb0a4d..a4ede993098b3 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Grid/Column/Renderer/DownloadTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Grid/Column/Renderer/DownloadTest.php
@@ -5,12 +5,20 @@
  */
 namespace Magento\ImportExport\Test\Unit\Block\Adminhtml\Grid\Column\Renderer;
 
+use Magento\Backend\Block\Context;
+use Magento\Backend\Model\Url;
+use Magento\Framework\DataObject;
+use Magento\Framework\Escaper;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\ImportExport\Block\Adminhtml\Grid\Column\Renderer\Download;
 
+/**
+ * Test for \Magento\ImportExport\Block\Adminhtml\Grid\Column\Renderer\Download class.
+ */
 class DownloadTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Backend\Block\Context
+     * @var Context
      */
     protected $context;
 
@@ -20,24 +28,31 @@ class DownloadTest extends \PHPUnit\Framework\TestCase
     protected $objectManagerHelper;
 
     /**
-     * @var \Magento\ImportExport\Block\Adminhtml\Grid\Column\Renderer\Download
+     * @var Download
      */
     protected $download;
 
+    /**
+     * @var Escaper|\PHPUnit_Framework_MockObject_MockObjecti
+     */
+    private $escaperMock;
+
     /**
      * Set up
      */
     protected function setUp()
     {
-        $urlModel = $this->createPartialMock(\Magento\Backend\Model\Url::class, ['getUrl']);
+        $this->escaperMock = $this->createMock(Escaper::class);
+        $urlModel = $this->createPartialMock(Url::class, ['getUrl']);
         $urlModel->expects($this->any())->method('getUrl')->willReturn('url');
-        $this->context = $this->createPartialMock(\Magento\Backend\Block\Context::class, ['getUrlBuilder']);
+        $this->context = $this->createPartialMock(Context::class, ['getUrlBuilder', 'getEscaper']);
         $this->context->expects($this->any())->method('getUrlBuilder')->willReturn($urlModel);
+        $this->context->expects($this->any())->method('getEscaper')->willReturn($this->escaperMock);
         $data = [];
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->download = $this->objectManagerHelper->getObject(
-            \Magento\ImportExport\Block\Adminhtml\Grid\Column\Renderer\Download::class,
+            Download::class,
             [
                 'context' => $this->context,
                 'data' => $data
@@ -51,7 +66,16 @@ protected function setUp()
     public function testGetValue()
     {
         $data = ['imported_file' => 'file.csv'];
-        $row = new \Magento\Framework\DataObject($data);
+        $row = new DataObject($data);
+        $this->escaperMock->expects($this->at(0))
+            ->method('escapeHtml')
+            ->with('file.csv')
+            ->willReturn('file.csv');
+        $this->escaperMock->expects($this->once())->method('escapeUrl')->willReturn('url');
+        $this->escaperMock->expects($this->at(2))
+            ->method('escapeHtml')
+            ->with('Download')
+            ->willReturn('Download');
         $this->assertEquals('<p> file.csv</p><a href="url">Download</a>', $this->download->_getValue($row));
     }
 }

From 11f21bf52d15d27972932f2f862c2d1d81f1ab4c Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Thu, 16 Apr 2020 11:42:15 +0300
Subject: [PATCH 0167/1718] fixed disabled guest checkout issue in case of
 downloadable product

Remove not needed comments
---
 .../Observer/IsAllowedGuestCheckoutObserver.php           | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php b/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
index 6b794f8a3116a..6319c1b9d45c6 100644
--- a/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
+++ b/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
@@ -20,19 +20,11 @@
  */
 class IsAllowedGuestCheckoutObserver implements ObserverInterface
 {
-    /**
-     *  Xml path to disable checkout
-     */
     private const XML_PATH_DISABLE_GUEST_CHECKOUT = 'catalog/downloadable/disable_guest_checkout';
 
-    /**
-     *  Xml path to get downloadable Shareable setting
-     */
     private const XML_PATH_DOWNLOADABLE_SHAREABLE = 'catalog/downloadable/shareable';
 
     /**
-     * Core store config
-     *
      * @var ScopeConfigInterface
      */
     private $scopeConfig;

From 34296032303531706db50bbde3543b8b104d4e82 Mon Sep 17 00:00:00 2001
From: Dmytro Voskoboinikov <voskoboi@adobe.com>
Date: Thu, 16 Apr 2020 14:30:06 -0500
Subject: [PATCH 0168/1718] MC-29566: [2.4.x] Deprecate SID query
 parameter-related methods

---
 .../Session/Test/Unit/SessionManagerTest.php  |  6 ++---
 .../Magento/Framework/Test/Unit/UrlTest.php   | 24 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lib/internal/Magento/Framework/Session/Test/Unit/SessionManagerTest.php b/lib/internal/Magento/Framework/Session/Test/Unit/SessionManagerTest.php
index 2d19ee4224801..062635eaa6bb2 100644
--- a/lib/internal/Magento/Framework/Session/Test/Unit/SessionManagerTest.php
+++ b/lib/internal/Magento/Framework/Session/Test/Unit/SessionManagerTest.php
@@ -31,17 +31,17 @@ class SessionManagerTest extends \PHPUnit\Framework\TestCase
         private $sessionManager;
 
         /**
-         * @var \Magento\Framework\Session\Config\ConfigInterface | \PHPUnit_Framework_MockObject_MockObject
+         * @var \Magento\Framework\Session\Config\ConfigInterface | \PHPUnit\Framework\MockObject\MockObject
          */
         private $mockSessionConfig;
 
         /**
-         * @var \Magento\Framework\Stdlib\CookieManagerInterface | \PHPUnit_Framework_MockObject_MockObject
+         * @var \Magento\Framework\Stdlib\CookieManagerInterface | \PHPUnit\Framework\MockObject\MockObject
          */
         private $mockCookieManager;
 
         /**
-         * @var \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory | \PHPUnit_Framework_MockObject_MockObject
+         * @var \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory | \PHPUnit\Framework\MockObject\MockObject
          */
         private $mockCookieMetadataFactory;
 
diff --git a/lib/internal/Magento/Framework/Test/Unit/UrlTest.php b/lib/internal/Magento/Framework/Test/Unit/UrlTest.php
index 8e95e4e7bbfea..56c63bebf7963 100644
--- a/lib/internal/Magento/Framework/Test/Unit/UrlTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/UrlTest.php
@@ -15,52 +15,52 @@
 class UrlTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Framework\Url\RouteParamsResolver|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Url\RouteParamsResolver|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $routeParamsResolverMock;
 
     /**
-     * @var \Magento\Framework\Url\RouteParamsPreprocessorInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Url\RouteParamsPreprocessorInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $routeParamsPreprocessorMock;
 
     /**
-     * @var \Magento\Framework\Url\ScopeResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Url\ScopeResolverInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $scopeResolverMock;
 
     /**
-     * @var \Magento\Framework\Url\ScopeInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Url\ScopeInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $scopeMock;
 
     /**
-     * @var \Magento\Framework\Url\QueryParamsResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Url\QueryParamsResolverInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $queryParamsResolverMock;
 
     /**
-     * @var \Magento\Framework\Session\SidResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Session\SidResolverInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $sidResolverMock;
 
     /**
-     * @var \Magento\Framework\Session\Generic|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Session\Generic|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $sessionMock;
 
     /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $scopeConfig;
 
     /**
-     * @var \Magento\Framework\Url\ModifierInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Url\ModifierInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $urlModifier;
 
     /**
-     * @var HostChecker|\PHPUnit_Framework_MockObject_MockObject
+     * @var HostChecker|\PHPUnit\Framework\MockObject\MockObject
      */
     private $hostChecker;
 
@@ -102,7 +102,7 @@ protected function setUp()
 
     /**
      * @param bool $resolve
-     * @return \Magento\Framework\Url\RouteParamsResolverFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @return \Magento\Framework\Url\RouteParamsResolverFactory|\PHPUnit\Framework\MockObject\MockObject
      */
     protected function getRouteParamsResolverFactory($resolve = true)
     {
@@ -116,7 +116,7 @@ protected function getRouteParamsResolverFactory($resolve = true)
 
     /**
      * @param array $mockMethods
-     * @return \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject
+     * @return \Magento\Framework\App\Request\Http|\PHPUnit\Framework\MockObject\MockObject
      */
     protected function getRequestMock()
     {

From cc063648b8cb874ea44ec96e1eb9503bf0130dd1 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Fri, 17 Apr 2020 19:52:33 +0300
Subject: [PATCH 0169/1718] MC-29420: Remove event handlers from CE

---
 .../Category/Helper/Sortby/Available.php      |  26 +++
 .../Category/Helper/Sortby/DefaultSortby.php  |  26 +++
 .../Product/Edit/Tab/Options/Option.php       |  17 +-
 .../adminhtml/templates/promo/fieldset.phtml  |  29 ++--
 .../CatalogSearch/Block/Advanced/Form.php     |   5 +-
 .../frontend/templates/advanced/form.phtml    |  39 +++--
 .../templates/product/widget/conditions.phtml |  11 +-
 .../Checkout/Block/Total/DefaultTotal.php     |  35 +++-
 .../view/frontend/templates/onepage.phtml     |   4 +-
 .../frontend/templates/total/default.phtml    |  35 ++--
 .../view/frontend/templates/agreements.phtml  |  33 ++--
 .../templates/multishipping_agreements.phtml  |  34 ++--
 .../templates/browser/content/files.phtml     |  24 ++-
 .../templates/browser/content/uploader.phtml  |  41 +++--
 .../adminhtml/templates/browser/tree.phtml    |  21 ++-
 .../Config/Block/System/Config/Form/Field.php |  37 ++++-
 .../Block/System/Config/Form/Fieldset.php     |  35 +++-
 .../page/system/config/robots/reset.phtml     |  16 +-
 .../system/config/form/field/array.phtml      |  87 ++++++----
 .../templates/system/config/switcher.phtml    |  36 ++--
 .../Composite/Fieldset/Configurable.php       |  56 +++++++
 .../Block/Adminhtml/Product/Steps/Bulk.php    |  15 +-
 .../product/attribute/new/created.phtml       |  10 +-
 .../composite/fieldset/configurable.phtml     |  23 +--
 .../product/edit/attribute/steps/bulk.phtml   | 156 +++++++++++-------
 .../attribute/steps/select_attributes.phtml   |  13 +-
 .../catalog/product/edit/super/matrix.phtml   |  60 ++++---
 .../product/edit/super/wizard-ajax.phtml      |  14 +-
 .../catalog/product/edit/super/wizard.phtml   |  39 +++--
 .../configurable/attribute-selector/js.phtml  |  14 +-
 .../Magento/Cookie/Block/Html/Notices.php     |  14 ++
 .../frontend/templates/html/notices.phtml     |  19 ++-
 .../templates/cart/gift_options.phtml         |  11 +-
 .../Adminhtml/Frontend/Region/Updater.php     |  25 ++-
 .../Magento/Tax/Block/Adminhtml/Rate/Form.php |   3 +
 .../view/adminhtml/templates/rate/js.phtml    |  14 +-
 .../view/adminhtml/templates/rule/edit.phtml  |  56 ++++---
 .../adminhtml/templates/rule/rate/form.phtml  |   7 +-
 .../templates/toolbar/class/add.phtml         |   8 +-
 .../templates/toolbar/class/save.phtml        |  12 +-
 .../templates/toolbar/rate/save.phtml         |  13 +-
 .../templates/toolbar/rule/add.phtml          |   8 +-
 .../templates/toolbar/rule/save.phtml         |  12 +-
 .../templates/checkout/grandtotal.phtml       |  28 ++--
 .../templates/checkout/shipping.phtml         |  37 +++--
 .../templates/checkout/subtotal.phtml         |  29 ++--
 .../frontend/templates/checkout/tax.phtml     |  43 ++---
 47 files changed, 927 insertions(+), 403 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/Available.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/Available.php
index dbd4385059c73..b0f00d0f2b04b 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/Available.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/Available.php
@@ -11,6 +11,11 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Data\Form\Element\CollectionFactory;
+use Magento\Framework\Data\Form\Element\Factory;
+use Magento\Framework\Escaper;
+use Magento\Framework\Math\Random;
 use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
 class Available extends \Magento\Framework\Data\Form\Element\Multiselect
@@ -20,6 +25,27 @@ class Available extends \Magento\Framework\Data\Form\Element\Multiselect
      */
     private $secureRenderer;
 
+    /**
+     * @param Factory $factoryElement
+     * @param CollectionFactory $factoryCollection
+     * @param Escaper $escaper
+     * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
+     * @param Random|null $random
+     */
+    public function __construct(
+        Factory $factoryElement,
+        CollectionFactory $factoryCollection,
+        Escaper $escaper,
+        $data = [],
+        ?SecureHtmlRenderer $secureRenderer = null,
+        ?Random $random = null
+    ) {
+        $secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+        parent::__construct($factoryElement, $factoryCollection, $escaper, $data, $secureRenderer, $random);
+        $this->secureRenderer = $secureRenderer;
+    }
+
     /**
      * Returns js code that is used instead of default toggle code for "Use default config" checkbox
      *
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/DefaultSortby.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/DefaultSortby.php
index bac0e8465411d..e0836a0d7cb25 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/DefaultSortby.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Sortby/DefaultSortby.php
@@ -11,6 +11,11 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Category\Helper\Sortby;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Data\Form\Element\CollectionFactory;
+use Magento\Framework\Data\Form\Element\Factory;
+use Magento\Framework\Escaper;
+use Magento\Framework\Math\Random;
 use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
 class DefaultSortby extends \Magento\Framework\Data\Form\Element\Select
@@ -20,6 +25,27 @@ class DefaultSortby extends \Magento\Framework\Data\Form\Element\Select
      */
     private $secureRenderer;
 
+    /**
+     * @param Factory $factoryElement
+     * @param CollectionFactory $factoryCollection
+     * @param Escaper $escaper
+     * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
+     * @param Random|null $random
+     */
+    public function __construct(
+        Factory $factoryElement,
+        CollectionFactory $factoryCollection,
+        Escaper $escaper,
+        $data = [],
+        ?SecureHtmlRenderer $secureRenderer = null,
+        ?Random $random = null
+    ) {
+        $secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+        parent::__construct($factoryElement, $factoryCollection, $escaper, $data, $secureRenderer, $random);
+        $this->secureRenderer = $secureRenderer;
+    }
+
     /**
      * Returns js code that is used instead of default toggle code for "Use default config" checkbox
      *
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
index 642f383d4134f..6329c490d241c 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
@@ -16,6 +16,7 @@
 use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Json\Helper\Data;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 use Magento\Store\Model\Store;
 
 /**
@@ -74,6 +75,11 @@ class Option extends Widget
      */
     protected $_optionType;
 
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Config\Model\Config\Source\Yesno $configYesNo
@@ -82,6 +88,7 @@ class Option extends Widget
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Catalog\Model\ProductOptions\ConfigInterface $productOptionConfig
      * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -90,7 +97,8 @@ public function __construct(
         Product $product,
         \Magento\Framework\Registry $registry,
         \Magento\Catalog\Model\ProductOptions\ConfigInterface $productOptionConfig,
-        array $data = []
+        array $data = [],
+        ?SecureHtmlRenderer $secureRenderer = null
     ) {
         $this->_optionType = $optionType;
         $this->_configYesNo = $configYesNo;
@@ -99,6 +107,7 @@ public function __construct(
         $this->_coreRegistry = $registry;
         $data['jsonHelper'] = ObjectManager::getInstance()->get(Data::class);
         parent::__construct($context, $data);
+        $this->secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
     }
 
     /**
@@ -463,8 +472,12 @@ public function getCheckboxScopeHtml($id, $name, $checked = true, $select_id = '
             . ' name="' . $localName . '"' . 'id="' . $localId . '"'
             . ' value=""'
             . $checkedHtml
-            . ' onchange="toggleSeveralValueElements(this, [' . $containers . ']);" '
             . ' />'
+            . $this->secureRenderer->renderEventListenerAsTag(
+                'onchange',
+                "toggleSeveralValueElements(this, [' . $containers . ']);",
+                '#' . $localId
+            )
             . '<label for="' . $localId . '" class="use-default">'
             . '<span class="use-default-label">' . __('Use Default') . '</span></label></div>';
 
diff --git a/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/fieldset.phtml b/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/fieldset.phtml
index 1c3eedf43b264..e1229dc56cfbf 100644
--- a/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/fieldset.phtml
+++ b/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/fieldset.phtml
@@ -5,14 +5,16 @@
  */
 
 /**@var \Magento\Backend\Block\Widget\Form\Renderer\Fieldset $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?php $_element = $block->getElement() ?>
 <?php $_jsObjectName = $block->getFieldSetId() != null ? $block->getFieldSetId() : $_element->getHtmlId() ?>
 <div class="rule-tree">
-    <fieldset id="<?= $block->escapeHtmlAttr($_jsObjectName) ?>" <?= /* @noEscape */ $_element->serialize(['class']) ?> class="fieldset">
+<fieldset id="<?= $block->escapeHtmlAttr($_jsObjectName) ?>" <?= /* @noEscape */ $_element->serialize(['class']) ?>
+          class="fieldset">
         <legend class="legend"><span><?= $block->escapeHtml($_element->getLegend()) ?></span></legend>
         <br>
-    <?php if ($_element->getComment()) : ?>
+    <?php if ($_element->getComment()): ?>
         <div class="messages">
             <div class="message message-notice"><?= $block->escapeHtml($_element->getComment()) ?></div>
         </div>
@@ -22,16 +24,21 @@
     </div>
     </fieldset>
 </div>
-<script>
+
+<?php $scriptString = <<<script
+
 require([
-    "Magento_Rule/rules",
-    "prototype"
+    'Magento_Rule/rules',
+    'prototype'
 ], function(VarienRulesForm){
 
-window.<?= /* @noEscape */ $_jsObjectName ?> = new VarienRulesForm('<?= /* @noEscape */ $_jsObjectName ?>', '<?= /* @noEscape */ $block->getNewChildUrl() ?>');
-<?php if ($_element->getReadonly()) : ?>
-    <?= /* @noEscape */ $_element->getHtmlId() ?>.setReadonly(true);
-<?php endif; ?>
+script;
+$scriptString .= 'window.' . /* @noEscape */ $_jsObjectName . ' = new VarienRulesForm(\'' .
+    /* @noEscape */ $_jsObjectName . '\', \'' .  /* @noEscape */ $block->getNewChildUrl() . '\');';
+if ($_element->getReadonly()):
+    $scriptString .= /* @noEscape */ $_element->getHtmlId() . '.setReadonly(true);' . PHP_EOL;
+endif;
 
-});
-</script>
+$scriptString .= '});' . PHP_EOL;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/CatalogSearch/Block/Advanced/Form.php b/app/code/Magento/CatalogSearch/Block/Advanced/Form.php
index 681b7ecfb02dc..8bed5e8810a6a 100644
--- a/app/code/Magento/CatalogSearch/Block/Advanced/Form.php
+++ b/app/code/Magento/CatalogSearch/Block/Advanced/Form.php
@@ -9,11 +9,13 @@
 use Magento\CatalogSearch\Model\Advanced;
 use Magento\Directory\Model\CurrencyFactory;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Data\Collection\AbstractDb as DbCollection;
 use Magento\Framework\View\Element\AbstractBlock;
 use Magento\Framework\View\Element\BlockInterface;
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Element\Template\Context;
+use Magento\CatalogSearch\Helper\Data;
 
 /**
  * Advanced search form
@@ -51,6 +53,7 @@ public function __construct(
     ) {
         $this->_catalogSearchAdvanced = $catalogSearchAdvanced;
         $this->_currencyFactory = $currencyFactory;
+        $data['jsonHelper'] = ObjectManager::getInstance()->get(Data::class);
         parent::__construct($context, $data);
     }
 
@@ -185,7 +188,7 @@ public function getCurrency($attribute)
      * Retrieve attribute input type
      *
      * @param AbstractAttribute $attribute
-     * @return  string
+     * @return string
      */
     public function getAttributeInputType($attribute)
     {
diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
index 3712f221233ee..0f97d1cd9fa7e 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
@@ -4,20 +4,21 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-?>
-<?php
 /**
  * Catalog advanced search form
  *
  * @var $block \Magento\CatalogSearch\Block\Advanced\Form
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
-<?php $maxQueryLength = $this->helper(\Magento\CatalogSearch\Helper\Data::class)->getMaxQueryLength();?>
-<form class="form search advanced" action="<?= $block->escapeUrl($block->getSearchPostUrl()) ?>" method="get" id="form-validate">
+
+<?php $jsonHelper = $block->getData('jsonHelper'); ?>
+<?php $maxQueryLength = $jsonHelper->getMaxQueryLength();?>
+<form class="form search advanced" action="<?= $block->escapeUrl($block->getSearchPostUrl()) ?>" method="get"
+      id="form-validate">
 <fieldset class="fieldset">
     <legend class="legend"><span><?= $block->escapeHtml(__('Search Settings')) ?></span></legend><br />
-    <?php foreach ($block->getSearchableAttributes() as $_attribute) : ?>
+    <?php foreach ($block->getSearchableAttributes() as $_attribute): ?>
         <?php $_code = $_attribute->getAttributeCode() ?>
         <div class="field <?= $block->escapeHtmlAttr($_code) ?>">
             <label class="label" for="<?= $block->escapeHtmlAttr($_code) ?>">
@@ -25,7 +26,7 @@
             </label>
             <div class="control">
                 <?php
-                switch ($block->getAttributeInputType($_attribute)) :
+                switch ($block->getAttributeInputType($_attribute)):
                     case 'number':
                         ?>
                 <div class="range fields group group-2">
@@ -38,7 +39,8 @@
                                    title="<?= $block->escapeHtml($block->getAttributeLabel($_attribute)) ?>"
                                    class="input-text"
                                    maxlength="<?= $block->escapeHtmlAttr($maxQueryLength) ?>"
-                                   data-validate="{number:true, 'less-than-equals-to':'#<?= $block->escapeHtmlAttr($_code) ?>_to'}" />
+                                   data-validate="{number:true, 'less-than-equals-to':'#<?=
+                                    $block->escapeHtmlAttr($_code) ?>_to'}" />
                         </div>
                     </div>
                     <div class="field no-label">
@@ -50,7 +52,8 @@
                                    title="<?= $block->escapeHtml($block->getAttributeLabel($_attribute)) ?>"
                                    class="input-text"
                                    maxlength="<?= $block->escapeHtmlAttr($maxQueryLength) ?>"
-                                   data-validate="{number:true, 'greater-than-equals-to':'#<?= $block->escapeHtmlAttr($_code) ?>'}" />
+                                   data-validate="{number:true, 'greater-than-equals-to':'#<?=
+                                    $block->escapeHtmlAttr($_code) ?>'}" />
                         </div>
                     </div>
                 </div>
@@ -68,7 +71,8 @@
                                    class="input-text"
                                    type="text"
                                    maxlength="<?= $block->escapeHtmlAttr($maxQueryLength) ?>"
-                                   data-validate="{number:true, 'less-than-equals-to':'#<?= $block->escapeHtmlAttr($_code) ?>_to'}" />
+                                   data-validate="{number:true, 'less-than-equals-to':'#<?=
+                                    $block->escapeHtmlAttr($_code) ?>_to'}" />
                         </div>
                     </div>
                     <div class="field with-addon no-label">
@@ -81,7 +85,8 @@
                                        class="input-text"
                                        type="text"
                                        maxlength="<?= $block->escapeHtmlAttr($maxQueryLength) ?>"
-                                       data-validate="{number:true, 'greater-than-equals-to':'#<?= $block->escapeHtmlAttr($_code) ?>'}" />
+                                       data-validate="{number:true, 'greater-than-equals-to':'#<?=
+                                        $block->escapeHtmlAttr($_code) ?>'}" />
                                 <label class="addafter"
                                        for="<?= $block->escapeHtmlAttr($_code) ?>_to">
                                     <?= $block->escapeHtml($block->getCurrency($_attribute)) ?>
@@ -125,7 +130,7 @@
                        id="<?= $block->escapeHtmlAttr($_code) ?>"
                        value="<?= $block->escapeHtml($block->getAttributeValue($_attribute)) ?>"
                        title="<?= $block->escapeHtml($block->getAttributeLabel($_attribute)) ?>"
-                       class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass($_attribute)) ?>"
+                       class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass($_attribute))?>"
                        maxlength="<?= $block->escapeHtmlAttr($maxQueryLength) ?>" />
             <?php endswitch; ?>
             </div>
@@ -142,7 +147,7 @@
   </div>
 </div>
 </form>
-<script>
+<?php $scriptString = <<<script
 require([
     "jquery",
     "mage/mage",
@@ -158,9 +163,11 @@ require([
                 }
             },
             messages: {
-                'price[to]': {'greater-than-equals-to': '<?= $block->escapeJs(__('Please enter a valid price range.')) ?>'},
-                'price[from]': {'less-than-equals-to': '<?= $block->escapeJs(__('Please enter a valid price range.')) ?>'}
+                'price[to]': {'greater-than-equals-to': '{$block->escapeJs(__('Please enter a valid price range.'))}'},
+                'price[from]': {'less-than-equals-to': '{$block->escapeJs(__('Please enter a valid price range.'))}'}
             }
         });
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/CatalogWidget/view/adminhtml/templates/product/widget/conditions.phtml b/app/code/Magento/CatalogWidget/view/adminhtml/templates/product/widget/conditions.phtml
index 0e21f9e42c995..4b1750eba9f19 100644
--- a/app/code/Magento/CatalogWidget/view/adminhtml/templates/product/widget/conditions.phtml
+++ b/app/code/Magento/CatalogWidget/view/adminhtml/templates/product/widget/conditions.phtml
@@ -5,6 +5,7 @@
  */
 
 /** @var \Magento\CatalogWidget\Block\Product\Widget\Conditions $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 
 $element = $block->getElement();
 $fieldId = $element->getHtmlContainerId() ? ' id="' . $block->escapeHtmlAttr($element->getHtmlContainerId()) . '"' : '';
@@ -25,12 +26,14 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" '
     </div>
 </div>
 
-
-<script>
+<?php $scriptString = <<<script
     require([
         "Magento_Rule/rules",
         "prototype"
     ], function(VarienRulesForm){
-        window.<?= $block->escapeJs($block->getHtmlId()) ?> = new VarienRulesForm('<?= $block->escapeJs($block->getHtmlId()) ?>', '<?= $block->escapeUrl($block->getNewChildUrl()) ?>');
+        window.{$block->escapeJs($block->getHtmlId())} = new VarienRulesForm('{$block->escapeJs($block->getHtmlId())}',
+         '{$block->escapeUrl($block->getNewChildUrl())}');
     });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Checkout/Block/Total/DefaultTotal.php b/app/code/Magento/Checkout/Block/Total/DefaultTotal.php
index ef113ad73fcc1..7773b1c9c8674 100644
--- a/app/code/Magento/Checkout/Block/Total/DefaultTotal.php
+++ b/app/code/Magento/Checkout/Block/Total/DefaultTotal.php
@@ -5,6 +5,10 @@
  */
 namespace Magento\Checkout\Block\Total;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Sales\Model\ConfigInterface;
+use Magento\Checkout\Helper\Data;
+
 /**
  * Default Total Row Renderer
  */
@@ -21,11 +25,30 @@ class DefaultTotal extends \Magento\Checkout\Block\Cart\Totals
     protected $_store;
 
     /**
-     * @return void
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param \Magento\Customer\Model\Session $customerSession
+     * @param \Magento\Checkout\Model\Session $checkoutSession
+     * @param ConfigInterface $salesConfig
+     * @param array $layoutProcessors
+     * @param array $data
      */
-    protected function _construct()
-    {
-        parent::_construct();
+    public function __construct(
+        \Magento\Framework\View\Element\Template\Context $context,
+        \Magento\Customer\Model\Session $customerSession,
+        \Magento\Checkout\Model\Session $checkoutSession,
+        ConfigInterface $salesConfig,
+        array $layoutProcessors = [],
+        array $data = []
+    ) {
+        $data['jsonHelper'] = ObjectManager::getInstance()->get(Data::class);
+        parent::__construct(
+            $context,
+            $customerSession,
+            $checkoutSession,
+            $salesConfig,
+            $layoutProcessors,
+            $data
+        );
         $this->_store = $this->_storeManager->getStore();
     }
 
@@ -40,6 +63,8 @@ public function getStyle()
     }
 
     /**
+     * Set Total value.
+     *
      * @param float $total
      * @return $this
      */
@@ -53,6 +78,8 @@ public function setTotal($total)
     }
 
     /**
+     * Return store.
+     *
      * @return \Magento\Store\Model\Store
      */
     public function getStore()
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
index 39df3cb121ba5..10bc7b750af97 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
@@ -12,10 +12,10 @@
     <div id="checkout-loader" data-role="checkout-loader" class="loading-mask" data-mage-init='{"checkoutLoader": {}}'>
         <div class="loader">
             <img src="<?= $block->escapeUrl($block->getViewFileUrl('images/loader-1.gif')) ?>"
-                 alt="<?= $block->escapeHtmlAttr(__('Loading...')) ?>"
-                 style="position: absolute;">
+                 alt="<?= $block->escapeHtmlAttr(__('Loading...')) ?>">
         </div>
     </div>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("position: absolute;", "#checkout-loader") ?>
     <!-- ko template: getTemplate() --><!-- /ko -->
     <script type="text/x-magento-init">
         {
diff --git a/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml b/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml
index 0d9da171c11a8..b5edc3abf8912 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml
@@ -4,40 +4,41 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Templates.ThisInTemplate
-
 /** @var $block \Magento\Checkout\Block\Total\DefaultTotal */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <tr class="totals">
-    <th
-            colspan="<?= $block->escapeHtmlAttr($block->getColspan()) ?>"
-            style="<?= $block->escapeHtmlAttr($block->getTotal()->getStyle()) ?>"
-            class="mark" scope="row"
-    >
-        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()) :?>
+    <th colspan="<?= $block->escapeHtmlAttr($block->getColspan()) ?>"
+        class="mark" scope="row">
+        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()):?>
             <strong>
         <?php endif; ?>
         <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
-        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()) :?>
+        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()):?>
             </strong>
         <?php endif; ?>
     </th>
-    <td
-            style="<?= $block->escapeHtmlAttr($block->getTotal()->getStyle()) ?>"
-            class="amount"
-            data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>"
-    >
-        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()) :?>
+    <td class="amount"
+        data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
+        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()):?>
             <strong>
         <?php endif; ?>
             <span>
                 <?= $block->escapeHtml(
-                    $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotal()->getValue()),
+                    $block->getData('jsonHelper')->formatPrice($block->getTotal()->getValue()),
                     ['span']
                 ) ?>
             </span>
-        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()) :?>
+        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()):?>
             </strong>
         <?php endif; ?>
     </td>
 </tr>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    $block->escapeHtmlAttr($block->getTotal()->getStyle()),
+    'tr.totals th.mark'
+) ?>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    $block->escapeHtmlAttr($block->getTotal()->getStyle()),
+    'tr.totals td.amount'
+) ?>
diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml b/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml
index 5cb256090c196..d7b1565c95400 100644
--- a/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml
+++ b/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml
@@ -4,30 +4,37 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Files.LineLength
-
+use Magento\CheckoutAgreements\Model\AgreementModeOptions;
 ?>
 <?php
 /**
  * @var $block \Magento\CheckoutAgreements\Block\Agreements
  */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?php if (!$block->getAgreements()) {
     return;
 } ?>
 <ol id="checkout-agreements" class="agreements checkout items">
     <?php /** @var \Magento\CheckoutAgreements\Api\Data\AgreementInterface $agreement */ ?>
-    <?php foreach ($block->getAgreements() as $agreement) :?>
+    <?php foreach ($block->getAgreements() as $agreement):?>
         <li class="item">
-            <div class="checkout-agreement-item-content"<?= $block->escapeHtmlAttr($agreement->getContentHeight() ? ' style="height:' . $agreement->getContentHeight() . '"' : '') ?>>
-                <?php if ($agreement->getIsHtml()) :?>
+            <div class="checkout-agreement-item-content" id="<?= /* @noEscape */ $agreement->getAgreementId() ?>"
+                <?php if ($agreement->getIsHtml()):?>
                     <?= /* @noEscape */ $agreement->getContent() ?>
-                <?php else :?>
+                <?php else:?>
                     <?= $block->escapeHtml(nl2br($agreement->getContent())) ?>
                 <?php endif; ?>
             </div>
-            <form id="checkout-agreements-form-<?= (int) $agreement->getAgreementId() ?>" class="field choice agree required">
-                <?php if ($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_MANUAL) :?>
+            <?php if ($agreement->getContentHeight()): ?>
+                <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                    'height:' . $agreement->getContentHeight(),
+                    '#' . $agreement->getAgreementId()
+                ) ?>
+            <?php endif; ?>
+            <form id="checkout-agreements-form-<?= (int) $agreement->getAgreementId() ?>"
+                  class="field choice agree required">
+                <?php if ($agreement->getMode() == AgreementModeOptions::MODE_MANUAL):?>
                 <input type="checkbox"
                        id="agreement-<?= (int) $agreement->getAgreementId() ?>"
                        name="agreement[<?= (int) $agreement->getAgreementId() ?>]"
@@ -37,19 +44,19 @@
                        data-validate="{required:true}"/>
                 <label class="label" for="agreement-<?= (int) $agreement->getAgreementId() ?>">
                     <span>
-                        <?php if ($agreement->getIsHtml()) :?>
+                        <?php if ($agreement->getIsHtml()):?>
                             <?= /* @noEscape */ $agreement->getCheckboxText() ?>
-                        <?php else :?>
+                        <?php else:?>
                             <?= $block->escapeHtml($agreement->getCheckboxText()) ?>
                         <?php endif; ?>
                     </span>
                 </label>
-                <?php elseif ($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_AUTO) :?>
+                <?php elseif ($agreement->getMode() == AgreementModeOptions::MODE_AUTO):?>
                 <div id="checkout-agreements-form-<?= (int) $agreement->getAgreementId() ?>" class="field choice agree">
                     <span>
-                        <?php if ($agreement->getIsHtml()) :?>
+                        <?php if ($agreement->getIsHtml()):?>
                             <?= /* @noEscape */ $agreement->getCheckboxText() ?>
-                        <?php else :?>
+                        <?php else:?>
                             <?= $block->escapeHtml($agreement->getCheckboxText()) ?>
                         <?php endif; ?>
                     </span>
diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml b/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml
index fb2d5168d21de..bc714f21e4dfa 100644
--- a/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml
+++ b/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml
@@ -4,13 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-// @deprecated
-// phpcs:disable Magento2.Files.LineLength
-
+use Magento\CheckoutAgreements\Model\AgreementModeOptions;
 ?>
 <?php
 /**
  * @var $block \Magento\CheckoutAgreements\Block\Agreements
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
 <?php if (!$block->getAgreements()) {
@@ -18,17 +17,24 @@
 } ?>
 <ol id="checkout-agreements" class="agreements checkout items">
     <?php /** @var \Magento\CheckoutAgreements\Api\Data\AgreementInterface $agreement */ ?>
-    <?php foreach ($block->getAgreements() as $agreement) :?>
+    <?php foreach ($block->getAgreements() as $agreement):?>
         <li class="item">
-            <div class="checkout-agreement-item-content"<?= $block->escapeHtmlAttr($agreement->getContentHeight() ? ' style="height:' . $agreement->getContentHeight() . '"' : '') ?>>
-                <?php if ($agreement->getIsHtml()) :?>
+            <div class="checkout-agreement-item-content" id="<?= /* @noEscape */ $agreement->getAgreementId() ?>"
+                <?php if ($agreement->getIsHtml()):?>
                     <?= /* @noEscape */ $agreement->getContent() ?>
-                <?php else :?>
+                <?php else:?>
                     <?= $block->escapeHtml(nl2br($agreement->getContent())) ?>
                 <?php endif; ?>
             </div>
-            <?php if ($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_MANUAL) :?>
-            <div id="checkout-agreements-form-<?= (int) $agreement->getAgreementId() ?>" class="field choice agree required">
+                <?php if ($agreement->getContentHeight()): ?>
+                    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                        'height:' . $agreement->getContentHeight(),
+                        '#' . $agreement->getAgreementId()
+                    ) ?>
+                <?php endif; ?>
+            <?php if ($agreement->getMode() == AgreementModeOptions::MODE_MANUAL):?>
+            <div id="checkout-agreements-form-<?= (int) $agreement->getAgreementId() ?>"
+                 class="field choice agree required">
                 <input type="checkbox"
                        id="agreement-<?= (int) $agreement->getAgreementId() ?>"
                        name="agreement[<?= (int) $agreement->getAgreementId() ?>]"
@@ -38,20 +44,20 @@
                        data-validate="{required:true}"/>
                 <label class="label" for="agreement-<?= (int) $agreement->getAgreementId() ?>">
                     <span>
-                        <?php if ($agreement->getIsHtml()) :?>
+                        <?php if ($agreement->getIsHtml()):?>
                             <?= /* @noEscape */ $agreement->getCheckboxText() ?>
-                        <?php else :?>
+                        <?php else:?>
                             <?= $block->escapeHtml($agreement->getCheckboxText()) ?>
                         <?php endif; ?>
                     </span>
                 </label>
             </div>
-            <?php elseif ($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_AUTO) :?>
+            <?php elseif ($agreement->getMode() == AgreementModeOptions::MODE_AUTO):?>
             <div id="checkout-agreements-form-<?= (int) $agreement->getAgreementId() ?>" class="field choice agree">
                 <span>
-                    <?php if ($agreement->getIsHtml()) :?>
+                    <?php if ($agreement->getIsHtml()):?>
                         <?= /* @noEscape */ $agreement->getCheckboxText() ?>
-                    <?php else :?>
+                    <?php else:?>
                         <?= $block->escapeHtml($agreement->getCheckboxText()) ?>
                     <?php endif; ?>
                 </span>
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml
index ff3d5f24dd5a1..27706c8dd218b 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml
@@ -5,13 +5,14 @@
  */
 
 /** @var $block \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content\Files */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 
 $_width  = $block->getImagesWidth();
 $_height = $block->getImagesHeight();
 
 ?>
-<?php if ($block->getFilesCount() > 0) : ?>
-    <?php foreach ($block->getFiles() as $file) : ?>
+<?php if ($block->getFilesCount() > 0): ?>
+    <?php foreach ($block->getFiles() as $file): ?>
     <div
         data-row="file"
         class="filecnt"
@@ -19,17 +20,24 @@ $_height = $block->getImagesHeight();
         data-size="<?= $block->escapeHtmlAttr($file->getSize()) ?>"
         data-mime-type="<?= $block->escapeHtmlAttr($file->getMimeType()) ?>"
     >
-        <p class="nm" style="height:<?= $block->escapeHtmlAttr($_height) ?>px;">
-        <?php if ($block->getFileThumbUrl($file)) : ?>
-            <img src="<?= $block->escapeHtmlAttr($block->getFileThumbUrl($file)) ?>" alt="<?= $block->escapeHtmlAttr($block->getFileName($file)) ?>"/>
+        <p class="nm" id="<?= $block->escapeHtmlAttr($block->getFileId($file)) ?>_nm">
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+            'height:' . $block->escapeHtmlAttr($_height) . 'px;',
+            '#' . $block->escapeHtmlAttr($block->getFileId($file)) . '_nm'
+        ) ?>
+        <?php if ($block->getFileThumbUrl($file)): ?>
+            <img src="<?= $block->escapeHtmlAttr($block->getFileThumbUrl($file)) ?>"
+                 alt="<?= $block->escapeHtmlAttr($block->getFileName($file)) ?>"/>
         <?php endif; ?>
         </p>
-        <?php if ($block->getFileWidth($file)) : ?>
-            <small><?= $block->escapeHtml($block->getFileWidth($file)) ?>x<?= $block->escapeHtml($block->getFileHeight($file)) ?> <?= $block->escapeHtml(__('px.')) ?></small><br/>
+        <?php if ($block->getFileWidth($file)): ?>
+            <small><?= $block->escapeHtml($block->getFileWidth($file))
+            ?>x<?= $block->escapeHtml($block->getFileHeight($file)) ?> <?= $block->escapeHtml(__('px.')) ?>
+            </small><br/>
         <?php endif; ?>
         <small><?= $block->escapeHtml($block->getFileShortName($file)) ?></small>
     </div>
     <?php endforeach; ?>
-<?php else : ?>
+<?php else: ?>
     <div class="empty"><?= $block->escapeHtml(__('No files found')) ?></div>
 <?php endif; ?>
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 099efa0abdb88..d1c204c01ad1c 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
@@ -5,17 +5,21 @@
  */
 
 /** @var $block \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content\Uploader */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 
 $filters = $block->getConfig()->getFilters() ?? [];
 $allowedExtensions = [];
 $blockHtmlId = $block->getHtmlId();
 
+$listExtensions = [[]];
 foreach ($filters as $media_type) {
-    $allowedExtensions = array_merge($allowedExtensions, array_map(function ($fileExt) {
+    $listExtensions[] = array_map(function ($fileExt) {
         return ltrim($fileExt, '.*');
-    }, $media_type['files']));
+    }, $media_type['files']);
 }
 
+$allowedExtensions = array_merge(...$listExtensions);
+
 $resizeConfig = $block->getImageUploadConfigData()->getIsResizeEnabled()
     ? "{action: 'resize', maxWidth: "
         . $block->escapeHtml($block->getImageUploadMaxWidth())
@@ -28,7 +32,9 @@ $resizeConfig = $block->getImageUploadConfigData()->getIsResizeEnabled()
 <div id="<?= /* @noEscape */ $blockHtmlId ?>" class="uploader">
     <span class="fileinput-button form-buttons">
         <span><?= $block->escapeHtml(__('Upload Images')) ?></span>
-        <input class="fileupload" type="file" name="<?= $block->escapeHtmlAttr($block->getConfig()->getFileField()) ?>" data-url="<?= $block->escapeUrl($block->getConfig()->getUrl()) ?>" multiple>
+        <input class="fileupload" type="file"
+               name="<?= $block->escapeHtmlAttr($block->getConfig()->getFileField()) ?>"
+               data-url="<?= $block->escapeUrl($block->getConfig()->getUrl()) ?>" multiple>
     </span>
     <div class="clear"></div>
     <script type="text/x-magento-template" id="<?= /* @noEscape */ $blockHtmlId ?>-template">
@@ -40,7 +46,11 @@ $resizeConfig = $block->getImageUploadConfigData()->getIsResizeEnabled()
             <div class="clear"></div>
         </div>
     </script>
-    <script>
+    <?php $intMaxSize = $block->getFileSizeService()->getMaxFileSize();
+    $resizeConfig = /* @noEscape */ $resizeConfig;
+    $blockHtmlId = /* @noEscape */ $blockHtmlId;
+    $scriptString = <<<script
+
 require([
     'jquery',
     'mage/template',
@@ -50,10 +60,10 @@ require([
     'domReady!',
     'mage/translate'
 ], function ($, mageTemplate, validator, uiAlert) {
-    var maxFileSize = <?= $block->escapeJs($block->getFileSizeService()->getMaxFileSize()) ?>,
-        allowedExtensions = '<?= $block->escapeHtml(implode(' ', $allowedExtensions)) ?>';
+    var maxFileSize = {$block->escapeJs($block->getFileSizeService()->getMaxFileSize())},
+        allowedExtensions = '{$block->escapeJs(implode(' ', $allowedExtensions))}';
 
-    $('#<?= /* @noEscape */ $blockHtmlId ?> .fileupload').fileupload({
+    $('#{$blockHtmlId} .fileupload').fileupload({
         dataType: 'json',
         formData: {
             isAjax: 'true',
@@ -63,9 +73,9 @@ require([
         acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,
         allowedExtensions: allowedExtensions,
         maxFileSize: maxFileSize,
-        dropZone: $('#<?= /* @noEscape */ $blockHtmlId ?>').closest('[role="dialog"]'),
+        dropZone: $('#{$blockHtmlId}').closest('[role="dialog"]'),
         add: function (e, data) {
-            var progressTmpl = mageTemplate('#<?= /* @noEscape */ $blockHtmlId ?>-template'),
+            var progressTmpl = mageTemplate('#{$blockHtmlId}-template'),
                 fileSize,
                 tmpl,
                 validationResult;
@@ -109,7 +119,7 @@ require([
                     }
                 });
 
-                $(tmpl).data('image', data).appendTo('#<?= /* @noEscape */ $blockHtmlId ?>');
+                $(tmpl).data('image', data).appendTo('#{$blockHtmlId}');
 
                 return true;
             });
@@ -146,17 +156,20 @@ require([
         }
     });
 
-    $('#<?= /* @noEscape */ $blockHtmlId ?> .fileupload').fileupload('option', {
+    $('#{$blockHtmlId} .fileupload').fileupload('option', {
         process: [{
             action: 'load',
             fileTypes: /^image\/(gif|jpeg|png)$/,
-            maxFileSize: <?= (int) $block->getFileSizeService()->getMaxFileSize() ?> * 10
+            maxFileSize: {$intMaxSize} * 10
         },
-        <?= /* @noEscape */ $resizeConfig ?>,
+        {$resizeConfig},
         {
             action: 'save'
         }]
     });
 });
-</script>
+
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 </div>
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml
index 9603bb4f1a412..0c5922b16b39b 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml
@@ -4,16 +4,29 @@
  * See COPYING.txt for license details.
  */
 
- /** @var \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Tree $block */
+/** @var \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Tree $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <div class="tree-panel" >
     <div class="categories-side-col">
         <div class="tree-actions">
-            <a onclick="jQuery('[data-role=tree]').jstree('close_all');"><?= $block->escapeHtml(__('Collapse All')) ?></a>
+            <a id="collapseAll"><?= $block->escapeHtml(__('Collapse All')) ?></a>
+            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                'onclick',
+                "jQuery('[data-role=tree]').jstree('close_all');",
+                '#div.tree-actions a#collapseAll'
+            ) ?>
             <span class="separator">|</span>
-            <a onclick="jQuery('[data-role=tree]').jstree('open_all');"><?= $block->escapeHtml(__('Expand All')) ?></a>
+            <a id="expandAll"><?= $block->escapeHtml(__('Expand All')) ?></a>
+            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                'onclick',
+                "jQuery('[data-role=tree]').jstree('open_all');",
+                '#div.tree-actions a#expandAll'
+            ) ?>
         </div>
     </div>
-    <div data-role="tree" data-mage-init='<?= $block->escapeHtml($this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getTreeWidgetOptions())) ?>'>
+    <div data-role="tree" data-mage-init='<?= $block->escapeHtml(
+        $block->getData('jsonHelper')->jsonEncode($block->getTreeWidgetOptions())
+    ) ?>'>
     </div>
 </div>
diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field.php b/app/code/Magento/Config/Block/System/Config/Form/Field.php
index ac4a85b7d3bc6..026cdce679731 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Field.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Field.php
@@ -6,6 +6,10 @@
 
 namespace Magento\Config\Block\System\Config\Form;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Backend\Block\Template\Context;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 /**
  * Render field html element in Stores Configuration
  *
@@ -17,6 +21,25 @@
 class Field extends \Magento\Backend\Block\Template implements
     \Magento\Framework\Data\Form\Element\Renderer\RendererInterface
 {
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
+    /**
+     * @param Context $context
+     * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
+     */
+    public function __construct(
+        Context $context,
+        array $data = [],
+        ?SecureHtmlRenderer $secureRenderer = null
+    ) {
+        parent::__construct($context, $data);
+        $this->secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+    }
+
     /**
      * Retrieve element HTML markup
      *
@@ -108,7 +131,12 @@ protected function _renderInheritCheckbox(\Magento\Framework\Data\Form\Element\A
             '[inherit]" type="checkbox" value="1"' .
             ' class="checkbox config-inherit" ' .
             $checkedHtml . $disabled .
-            ' onclick="toggleValueElements(this, Element.previous(this.parentNode))" /> ';
+            ' />';
+        $html .= /* @noEscape */ $this->secureRenderer->renderEventListenerAsTag(
+            'onclick',
+            "toggleValueElements(this, Element.previous(this.parentNode))",
+            'input#' . $htmlId
+        );
         $html .= '<label for="' . $htmlId . '_inherit" class="inherit">' . $this->_getInheritCheckboxLabel(
             $element
         ) . '</label>';
@@ -174,7 +202,12 @@ protected function _renderHint(\Magento\Framework\Data\Form\Element\AbstractElem
     {
         $html = '<td class="">';
         if ($element->getHint()) {
-            $html .= '<div class="hint"><div style="display: none;">' . $element->getHint() . '</div></div>';
+            $html .= '<div class="hint"><div id="hint_' . $element->getHtmlId() . '">' .
+                $element->getHint() . '</div></div>';
+            $html .= /* @noEscape */ $this->secureRenderer->renderStyleAsTag(
+                "display: none;",
+                'div#hint_' . $element->getHtmlId()
+            );
         }
         $html .= '</td>';
         return $html;
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 05c98a3eba99d..d2681f6fa1836 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Fieldset.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Fieldset.php
@@ -9,7 +9,9 @@
  */
 namespace Magento\Config\Block\System\Config\Form;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
 /**
  * @api
@@ -35,21 +37,29 @@ class Fieldset extends \Magento\Backend\Block\AbstractBlock implements
      */
     protected $isCollapsedDefault = false;
 
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
     /**
      * @param \Magento\Backend\Block\Context $context
      * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param \Magento\Framework\View\Helper\Js $jsHelper
      * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
         \Magento\Backend\Model\Auth\Session $authSession,
         \Magento\Framework\View\Helper\Js $jsHelper,
-        array $data = []
+        array $data = [],
+        ?SecureHtmlRenderer $secureRenderer = null
     ) {
         $this->_jsHelper = $jsHelper;
         $this->_authSession = $authSession;
         parent::__construct($context, $data);
+        $this->secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
     }
 
     /**
@@ -71,6 +81,8 @@ public function render(AbstractElement $element)
     }
 
     /**
+     * Return children elements html.
+     *
      * @param AbstractElement $element
      * @return string
      * @since 100.1.0
@@ -160,12 +172,13 @@ protected function _getHeaderTitleHtml($element)
             $element->getHtmlId() .
             '-head" href="#' .
             $element->getHtmlId() .
-            '-link" onclick="Fieldset.toggleCollapse(\'' .
-            $element->getHtmlId() .
-            '\', \'' .
-            $this->getUrl(
-                '*/*/state'
-            ) . '\'); return false;">' . $element->getLegend() . '</a>';
+            '-link">' . $element->getLegend() . '</a>' .
+            /* @noEscape */ $this->secureRenderer->renderEventListenerAsTag(
+                'onclick',
+                "Fieldset.toggleCollapse(\'' . $element->getHtmlId() . '\', \'' .
+                 $this->_urlBuilder->getUrl('*/*/state') . '\'); return false;",
+                'a#' . $element->getHtmlId()
+            );
     }
 
     /**
@@ -194,6 +207,7 @@ protected function _getFieldsetCss()
 
     /**
      * Return footer html for fieldset
+     *
      * Add extra tooltip comments to elements
      *
      * @param AbstractElement $element
@@ -205,10 +219,14 @@ protected function _getFooterHtml($element)
         foreach ($element->getElements() as $field) {
             if ($field->getTooltip()) {
                 $html .= sprintf(
-                    '<div id="row_%s_comment" class="system-tooltip-box" style="display:none;">%s</div>',
+                    '<div id="row_%s_comment" class="system-tooltip-box">%s</div>',
                     $field->getId(),
                     $field->getTooltip()
                 );
+                $html .= $this->secureRenderer->renderStyleAsTag(
+                    'display:none;',
+                    'row_' . $field->getId() . '_comment'
+                );
             }
         }
         $html .= '</fieldset>' . $this->_getExtraJs($element);
@@ -233,6 +251,7 @@ protected function _getExtraJs($element)
     {
         $htmlId = $element->getHtmlId();
         $output = "require(['prototype'], function(){Fieldset.applyCollapse('{$htmlId}');});";
+
         return $this->_jsHelper->getScript($output);
     }
 
diff --git a/app/code/Magento/Config/view/adminhtml/templates/page/system/config/robots/reset.phtml b/app/code/Magento/Config/view/adminhtml/templates/page/system/config/robots/reset.phtml
index 49a75d36fd8a5..606d4ad2f9de0 100644
--- a/app/code/Magento/Config/view/adminhtml/templates/page/system/config/robots/reset.phtml
+++ b/app/code/Magento/Config/view/adminhtml/templates/page/system/config/robots/reset.phtml
@@ -8,20 +8,22 @@
  * @deprecated
  * @var $block \Magento\Backend\Block\Page\System\Config\Robots\Reset
  * @var $jsonHelper \Magento\Framework\Json\Helper\Data
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
-$jsonHelper = $this->helper(\Magento\Framework\Json\Helper\Data::class);
+$jsonHelper = $block->getData('jsonHelper');
 ?>
-
-<script>
+<?php
+$robotsDefault = /* @noEscape */ $jsonHelper->jsonEncode($block->getRobotsDefaultCustomInstructions());
+$scriptString = <<<script
     require([
         'jquery'
     ], function ($) {
         window.resetRobotsToDefault = function(){
-            $('#design_search_engine_robots_custom_instructions').val(<?=
-                /* @noEscape */ $jsonHelper->jsonEncode($block->getRobotsDefaultCustomInstructions())
-            ?>);
+            $('#design_search_engine_robots_custom_instructions').val({$robotsDefault});
         }
     });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 
 <?= $block->getButtonHtml() ?>
diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml
index cf188bfeb6868..24024f62c7d6d 100644
--- a/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml
+++ b/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
 <?php
@@ -15,7 +17,7 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
         <table class="admin__control-table" id="<?= $block->escapeHtmlAttr($block->getElement()->getId()) ?>">
             <thead>
             <tr>
-                <?php foreach ($block->getColumns() as $columnName => $column) : ?>
+                <?php foreach ($block->getColumns() as $columnName => $column): ?>
                     <th><?= $block->escapeHtml($column['label']) ?></th>
                 <?php endforeach; ?>
                 <th class="col-actions" colspan="<?= (int)$_colspan ?>"><?= $block->escapeHtml(__('Action')) ?></th>
@@ -24,7 +26,10 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
             <tfoot>
             <tr>
                 <td colspan="<?= count($block->getColumns())+$_colspan ?>" class="col-actions-add">
-                    <button id="addToEndBtn<?= $block->escapeHtmlAttr($_htmlId) ?>" class="action-add" title="<?= $block->escapeHtmlAttr(__('Add')) ?>" type="button">
+                    <button id="addToEndBtn<?= $block->escapeHtmlAttr($_htmlId) ?>"
+                            class="action-add"
+                            title="<?= $block->escapeHtmlAttr(__('Add')) ?>"
+                            type="button">
                         <span><?= $block->escapeHtml($block->getAddButtonLabel()) ?></span>
                     </button>
                 </td>
@@ -35,33 +40,38 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
     </div>
     <input type="hidden" name="<?= $block->escapeHtmlAttr($block->getElement()->getName()) ?>[__empty]" value="" />
 
-    <script>
+    <?php $scriptString = <<<script
         require([
             'mage/template',
             'prototype'
         ], function (mageTemplate) {
         // create row creator
-        window.arrayRow<?= $block->escapeJs($_htmlId) ?> = {
+        window.arrayRow{$block->escapeJs($_htmlId)} = {
 
             // define row prototypeJS template
             template: mageTemplate(
                     '<tr id="<%- _id %>">'
-                    <?php foreach ($block->getColumns() as $columnName => $column) : ?>
+script;
+    foreach ($block->getColumns() as $columnName => $column):
+        $scriptString .= <<<script
                         + '<td>'
-                        + '<?= $block->escapeJs($block->renderCellTemplate($columnName)) ?>'
+                        + '{$block->escapeJs($block->renderCellTemplate($columnName))}'
                         + '<\/td>'
-                    <?php endforeach; ?>
+script;
+    endforeach;
 
-                    <?php if ($block->isAddAfter()) : ?>
+    if ($block->isAddAfter()):
+        $scriptString .= <<<script
                         + '<td><button class="action-add" type="button" id="addAfterBtn<%- _id %>"><span>'
-                        + '<?= $block->escapeJs($block->escapeHtml(__('Add after'))) ?>'
+                        + '{$block->escapeJs(__('Add after'))}'
                         + '<\/span><\/button><\/td>'
-                    <?php endif; ?>
-
+script;
+    endif;
+    $scriptString .= <<<script
                     + '<td class="col-actions"><button '
-                    + 'onclick="arrayRow<?= $block->escapeJs($_htmlId) ?>.del(\'<%- _id %>\')" '
+                    + 'onclick="arrayRow{$block->escapeJs($_htmlId)}.del(\'<%- _id %>\')" '
                     + 'class="action-delete" type="button">'
-                    + '<span><?= $block->escapeJs($block->escapeHtml(__('Delete'))) ?><\/span><\/button><\/td>'
+                    + '<span>{$block->escapeJs(__('Delete'))}<\/span><\/button><\/td>'
                     + '<\/tr>'
             ),
 
@@ -75,10 +85,14 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
                 } else {
                     var d = new Date();
                     templateValues = {
-                        <?php foreach ($block->getColumns() as $columnName => $column) : ?>
-                            <?= $block->escapeJs($columnName) ?>: '',
+script;
+    foreach ($block->getColumns() as $columnName => $column):
+        $scriptString .= <<<script
+                            {$block->escapeJs($columnName)}: '',
                                 'option_extra_attrs': {},
-                        <?php endforeach; ?>
+script;
+    endforeach;
+    $scriptString .= <<<script
                         _id: '_' + d.getTime() + '_' + d.getMilliseconds()
                 };
             }
@@ -87,7 +101,7 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
             if (insertAfterId) {
                 Element.insert($(insertAfterId), {after: this.template(templateValues)});
             } else {
-                Element.insert($('addRow<?= $block->escapeJs($_htmlId) ?>'), {bottom: this.template(templateValues)});
+                Element.insert($('addRow{$block->escapeJs($_htmlId)}'), {bottom: this.template(templateValues)});
             }
 
             // Fill controls with data
@@ -101,9 +115,13 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
             }
 
             // Add event for {addAfterBtn} button
-            <?php if ($block->isAddAfter()) : ?>
+script;
+    if ($block->isAddAfter()):
+        $scriptString .= <<<script
             Event.observe('addAfterBtn' + templateValues._id, 'click', this.add.bind(this, false, templateValues._id));
-            <?php endif; ?>
+script;
+    endif;
+    $scriptString .= <<<script
             },
 
             del: function(rowId) {
@@ -112,24 +130,29 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
         }
 
         // bind add action to "Add" button in last row
-        Event.observe('addToEndBtn<?= $block->escapeJs($_htmlId) ?>',
+        Event.observe('addToEndBtn{$block->escapeJs($_htmlId)}',
             'click',
-            arrayRow<?= $block->escapeJs($_htmlId) ?>.add.bind(
-                arrayRow<?= $block->escapeJs($_htmlId) ?>, false, false
+            arrayRow{$block->escapeJs($_htmlId)}.add.bind(
+                arrayRow{$block->escapeJs($_htmlId)}, false, false
             )
         );
 
         // add existing rows
-        <?php
-        foreach ($block->getArrayRows() as $_rowId => $_row) {
-            echo /** @noEscape */ "arrayRow{$block->escapeJs($_htmlId)}.add(" . /** @noEscape */ $_row->toJson() . ");\n";
-        }
-        ?>
-
+script;
+    foreach ($block->getArrayRows() as $_rowId => $_row) {
+        echo /** @noEscape */ "arrayRow{$block->escapeJs($_htmlId)}.add(" . /** @noEscape */ $_row->toJson() . ");\n";
+    }
+    $scriptString .= <<<script
         // Toggle the grid availability, if element is disabled (depending on scope)
-        <?php if ($block->getElement()->getDisabled()) : ?>
-        toggleValueElements({checked: true}, $('grid<?= $block->escapeJs($_htmlId) ?>').parentNode);
-        <?php endif; ?>
+script;
+    if ($block->getElement()->getDisabled()):
+        $scriptString .= <<<script
+        toggleValueElements({checked: true}, $('grid{$block->escapeJs($_htmlId)}').parentNode);
+script;
+    endif;
+    $scriptString .= <<<script
         });
-    </script>
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 </div>
diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/switcher.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/switcher.phtml
index 0d07051e6667d..d956dd0bccd84 100644
--- a/app/code/Magento/Config/view/adminhtml/templates/system/config/switcher.phtml
+++ b/app/code/Magento/Config/view/adminhtml/templates/system/config/switcher.phtml
@@ -3,34 +3,46 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/* @var $block \Magento\Backend\Block\Template */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<?php /* @var $block \Magento\Backend\Block\Template */ ?>
 <div class="field field-store-switcher">
     <label class="label" for="store_switcher"><?= $block->escapeHtml(__('Current Configuration Scope:')) ?></label>
     <div class="control">
-        <select id="store_switcher" class="system-config-store-switcher"
-                onchange="location.href=this.options[this.selectedIndex].getAttribute('url')">
-        <?php foreach ($block->getStoreSelectOptions() as $_value => $_option) : ?>
-            <?php if (isset($_option['is_group'])) : ?>
-                <?php if ($_option['is_close']) : ?>
+        <select id="store_switcher" class="system-config-store-switcher">
+        <?php foreach ($block->getStoreSelectOptions() as $_value => $_option): ?>
+            <?php if (isset($_option['is_group'])): ?>
+                <?php if ($_option['is_close']): ?>
                     </optgroup>
-                <?php else : ?>
-                    <optgroup label="<?= $block->escapeHtmlAttr($_option['label']) ?>"
-                              style="<?= $block->escapeHtmlAttr($_option['style']) ?>">
+                <?php else: ?>
+                    <optgroup label="<?= $block->escapeHtmlAttr($_option['label']) ?>">
+                        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                            $block->escapeHtmlAttr($_option['style']),
+                            "optgroup[label='" . $block->escapeHtmlAttr($_option['label']) . "']"
+                        ) ?>
                 <?php endif; ?>
                 <?php continue ?>
             <?php endif; ?>
               <option value="<?= $block->escapeHtmlAttr($_value) ?>"
                       url="<?= $block->escapeUrl($_option['url']) ?>"
-                      <?= $_option['selected'] ? 'selected="selected"' : '' ?>
-                      style="<?= $block->escapeHtmlAttr($_option['style']) ?>">
+                      <?= $_option['selected'] ? 'selected="selected"' : '' ?>>
                   <?= $block->escapeHtml($_option['label']) ?>
               </option>
+              <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                  $block->escapeHtmlAttr($_option['style']),
+                  "optgroup[url='" . $block->escapeUrl($_option['url']) . "']"
+              ) ?>
         <?php endforeach ?>
         </select>
+        <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+            'onchange',
+            "location.href=this.options[this.selectedIndex].getAttribute('url')",
+            '#store_switcher'
+        ) ?>
     </div>
     <?= $block->getHintHtml() ?>
-    <?php if ($block->getAuthorization()->isAllowed('Magento_Backend::store')) : ?>
+    <?php if ($block->getAuthorization()->isAllowed('Magento_Backend::store')): ?>
         <div class="actions">
             <a href="<?= $block->escapeUrl($block->getUrl('*/system_store')) ?>">
                 <?= $block->escapeHtml(__('Stores')) ?>
diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Composite/Fieldset/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Composite/Fieldset/Configurable.php
index 11e75839ec33c..95290940b2ad4 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Composite/Fieldset/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Composite/Fieldset/Configurable.php
@@ -7,12 +7,68 @@
  */
 namespace Magento\ConfigurableProduct\Block\Adminhtml\Product\Composite\Fieldset;
 
+use Magento\Catalog\Helper\Product;
+use Magento\ConfigurableProduct\Model\ConfigurableAttributeData;
+use Magento\Customer\Helper\Session\CurrentCustomer;
+use Magento\Customer\Model\Session;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Json\Helper\Data;
+use Magento\Framework\Locale\Format;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+
 /**
  * @api
  * @since 100.0.2
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Configurable extends \Magento\ConfigurableProduct\Block\Product\View\Type\Configurable
 {
+    /**
+     * @param \Magento\Catalog\Block\Product\Context $context
+     * @param \Magento\Framework\Stdlib\ArrayUtils $arrayUtils
+     * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
+     * @param \Magento\ConfigurableProduct\Helper\Data $helper
+     * @param \Magento\Catalog\Helper\Product $catalogProduct
+     * @param CurrentCustomer $currentCustomer
+     * @param PriceCurrencyInterface $priceCurrency
+     * @param ConfigurableAttributeData $configurableAttributeData
+     * @param array $data
+     * @param Format|null $localeFormat
+     * @param Session|null $customerSession
+     * @param \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices|null $variationPrices
+     */
+    public function __construct(
+        \Magento\Catalog\Block\Product\Context $context,
+        \Magento\Framework\Stdlib\ArrayUtils $arrayUtils,
+        \Magento\Framework\Json\EncoderInterface $jsonEncoder,
+        \Magento\ConfigurableProduct\Helper\Data $helper,
+        \Magento\Catalog\Helper\Product $catalogProduct,
+        CurrentCustomer $currentCustomer,
+        PriceCurrencyInterface $priceCurrency,
+        ConfigurableAttributeData $configurableAttributeData,
+        array $data = [],
+        Format $localeFormat = null,
+        Session $customerSession = null,
+        \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices $variationPrices = null
+    ) {
+        $data['productHelper'] = ObjectManager::getInstance()->get(Product::class);
+        parent::__construct(
+            $context,
+            $arrayUtils,
+            $jsonEncoder,
+            $helper,
+            $catalogProduct,
+            $currentCustomer,
+            $priceCurrency,
+            $configurableAttributeData,
+            $data,
+            $localeFormat,
+            $customerSession,
+            $variationPrices
+        );
+    }
+
     /**
      * Retrieve product
      *
diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Steps/Bulk.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Steps/Bulk.php
index bb5c8d8b49ca2..4184f3ffedec2 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Steps/Bulk.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Steps/Bulk.php
@@ -11,7 +11,9 @@
 use Magento\Catalog\Model\Product\Type;
 use Magento\Catalog\Model\ProductFactory;
 use Magento\Eav\Model\Entity\Attribute;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\View\Element\Template\Context;
+use Magento\Framework\Json\Helper\Data;
 
 /**
  * Adminhtml block for fieldset of configurable product
@@ -41,21 +43,24 @@ class Bulk extends \Magento\Ui\Block\Component\StepsWizard\StepAbstract
      * @param Image $image
      * @param Config $catalogProductMediaConfig
      * @param ProductFactory $productFactory
+     * @param array $data
      */
     public function __construct(
         Context $context,
         Image $image,
         Config $catalogProductMediaConfig,
-        ProductFactory $productFactory
+        ProductFactory $productFactory,
+        array $data = []
     ) {
-        parent::__construct($context);
+        $data['jsonHelper'] = ObjectManager::getInstance()->get(Data::class);
+        parent::__construct($context, $data);
         $this->image = $image;
         $this->productFactory = $productFactory;
         $this->catalogProductMediaConfig = $catalogProductMediaConfig;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCaption()
     {
@@ -63,6 +68,8 @@ public function getCaption()
     }
 
     /**
+     * Return no image url.
+     *
      * @return string
      */
     public function getNoImageUrl()
@@ -92,6 +99,8 @@ public function getImageTypes()
     }
 
     /**
+     * Return media attributes.
+     *
      * @return array
      */
     public function getMediaAttributes()
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/new/created.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/new/created.phtml
index 9307da21e6659..4ad7a6419ca63 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/new/created.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/new/created.phtml
@@ -4,11 +4,13 @@
  * See COPYING.txt for license details.
  */
 /** @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Attribute\NewAttribute\Product\Created */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<script>
+<?php $attributes = /* @noEscape */ $block->getAttributesBlockJson();
+$scriptString = <<<script
 (function ($) {
 
-    var data = <?= /* @noEscape */ $block->getAttributesBlockJson() ?>;
+    var data = {$attributes};
     var set = data.set || {id: $('#attribute_set_id').val()};
     if (data.tab == 'variations') {
         $('[data-role=product-variations-matrix]').trigger('add', data.attribute);
@@ -18,4 +20,6 @@
     $('#create_new_attribute').modal('closeModal');
 
 })(window.parent.jQuery);
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml
index 844422b2a2d7a..b40121db96488 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml
@@ -3,26 +3,26 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-?>
 
-<?php /* @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Composite\Fieldset\Configurable */ ?>
+/* @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Composite\Fieldset\Configurable */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+?>
 <?php $_product = $block->getProduct(); ?>
 <?php $_attributes = $block->decorateArray($block->getAllowAttributes()); ?>
-<?php $_skipSaleableCheck = $this->helper(Magento\Catalog\Helper\Product::class)->getSkipSaleableCheck(); ?>
-<?php if (($_product->isSaleable() || $_skipSaleableCheck) && count($_attributes)) :?>
+<?php $_skipSaleableCheck = $block->getData('productHelper')->getSkipSaleableCheck(); ?>
+<?php if (($_product->isSaleable() || $_skipSaleableCheck) && count($_attributes)):?>
 <fieldset id="catalog_product_composite_configure_fields_configurable" class="fieldset admin__fieldset">
     <legend class="legend admin__legend">
         <span><?= $block->escapeHtml(__('Associated Products')) ?></span>
     </legend>
     <div class="product-options fieldset admin__fieldset">
-        <?php foreach ($_attributes as $_attribute) : ?>
+        <?php foreach ($_attributes as $_attribute): ?>
             <div class="field admin__field required">
                 <label class="label admin__field-label"><?=
                     $block->escapeHtml($_attribute->getProductAttribute()->getStoreLabel($_product->getStoreId()));
                 ?></label>
                 <div class="control admin__field-control <?php
-                if ($_attribute->getDecoratedIsLast()) :
+                if ($_attribute->getDecoratedIsLast()):
                     ?> last<?php
                     endif; ?>">
                     <select name="super_attribute[<?= $block->escapeHtmlAttr($_attribute->getAttributeId()) ?>]"
@@ -35,13 +35,14 @@
         <?php endforeach; ?>
     </div>
 </fieldset>
-<script>
+    <?php $config = /* @noEscape */ $block->getJsonConfig();
+    $scriptString = <<<script
 require([
     "Magento_ConfigurableProduct/js/configurable",
     "Magento_Catalog/catalog/product/composite/configure"
 ], function(){
 
-    var config = <?= /* @noEscape */ $block->getJsonConfig() ?>;
+    var config = {$config};
     if (window.productConfigure) {
         config.containerId = window.productConfigure.blockFormFields.id;
         if (window.productConfigure.restorePhase) {
@@ -52,5 +53,7 @@ require([
     ProductConfigure.spConfig = new Product.Config(config);
 
 });
-</script>
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <?php endif;?>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml
index a792a35da8051..b54e63c7eb7c5 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml
@@ -3,20 +3,25 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+
 /* @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Steps\Bulk */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
 <div data-bind="scope: '<?= /* @noEscape */  $block->getComponentName() ?>'" data-role="bulk-step">
     <h2 class="steps-wizard-title"><?= $block->escapeHtml(__('Step 3: Bulk Images, Price and Quantity')) ?></h2>
     <div class="steps-wizard-info">
-        <?= /* @noEscape */ __('Based on your selections %1 new products will be created. Use this step to customize images and price for your new products.', '<span class="new-products-count" data-bind="text:countVariations"></span>') ?>
+        <?= /* @noEscape */ __(
+            'Based on your selections %1 new products will be created. ' .
+            'Use this step to customize images and price for your new products.',
+            '<span class="new-products-count" data-bind="text:countVariations"></span>'
+        ) ?>
     </div>
 
     <div data-bind="with: sections().images" class="steps-wizard-section">
         <div data-role="section">
             <div class="steps-wizard-section-title">
-            <span><?= $block->escapeHtml(__('Images')); ?></span>
+                <span><?= $block->escapeHtml(__('Images')); ?></span>
             </div>
 
             <ul class="steps-wizard-section-list">
@@ -65,7 +70,9 @@
                 <div data-role="gallery"
                      class="gallery"
                      data-images="[]"
-                     data-types="<?= $block->escapeHtml($this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getImageTypes())) ?>">
+                     data-types="<?= $block->escapeHtml($block->getData('jsonHelper')->jsonEncode(
+                         $block->getImageTypes()
+                     )) ?>">
                     <div class="image image-placeholder">
                         <div data-role="uploader" class="uploader">
                             <div class="image-browse">
@@ -75,32 +82,39 @@
                                        name="image"
                                        class="admin__control-file"
                                        multiple="multiple"
-                                       data-url="<?= /* @noEscape */ $block->getUrl('catalog/product_gallery/upload') ?>" />
+                                       data-url="<?= /* @noEscape */ $block->getUrl('catalog/product_gallery/upload')
+                                        ?>" />
                             </div>
                         </div>
                         <div class="product-image-wrapper">
-                            <p class="image-placeholder-text"><?= $block->escapeHtml(__('Browse to find or drag image here')) ?></p>
+                            <p class="image-placeholder-text"><?= $block->escapeHtml(__(
+                                'Browse to find or drag image here'
+                            )) ?></p>
                         </div>
                     </div>
 
-                    <?php foreach ($block->getImageTypes() as $typeData) : ?>
+                    <?php foreach ($block->getImageTypes() as $typeData): ?>
                         <input name="<?= $block->escapeHtml($typeData['name']) ?>"
                                class="image-<?= $block->escapeHtml($typeData['code']) ?>"
                                type="hidden"
                                value="<?= $block->escapeHtml($typeData['value']) ?>"/>
-                        <?php endforeach; ?>
+                    <?php endforeach; ?>
 
                     <script data-template="uploader" type="text/x-magento-template">
                         <div id="<%- data.id %>" class="file-row">
                             <span class="file-info"><%- data.name %> (<%- data.size %>)</span>
                             <div class="progressbar-container">
-                                <div class="progressbar upload-progress" style="width: 0%;"></div>
+                                <div class="progressbar upload-progress"></div>
                             </div>
                             <div class="spinner">
                                 <span></span><span></span><span></span><span></span>
                                 <span></span><span></span><span></span><span></span>
                             </div>
                         </div>
+                        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                            "width: 0%;",
+                            "div.progressbar-container div.progressbar.upload-progress"
+                        ) ?>
                     </script>
 
                     <script data-template="gallery-content" type="text/x-magento-template">
@@ -124,7 +138,8 @@
                             <input type="hidden"
                                    name="product[media_gallery][images][<%- data.file_id %>][removed]"/>
                             <div class="product-image-wrapper">
-                                <img class="product-image" data-role="image-element" src="<%- data.url %>" alt="<%- data.label %>"/>
+                                <img class="product-image" data-role="image-element" src="<%- data.url %>"
+                                     alt="<%- data.label %>"/>
                                 <div class="actions">
                                     <button type="button"
                                             class="action-remove"
@@ -139,16 +154,18 @@
                             <div class="item-description">
                                 <div class="item-title" data-role="img-title"><%- data.label %></div>
                                 <div class="item-size">
-                                    <span data-role="image-dimens"></span>, <span data-role="image-size"><%- data.sizeLabel %></span>
+                                    <span data-role="image-dimens"></span>,
+                                    <span data-role="image-size"><%- data.sizeLabel %></span>
                                 </div>
                             </div>
                             <ul class="item-roles" data-role="roles-labels">
-                                <?php foreach ($block->getMediaAttributes() as $attribute) :?>
+                                <?php foreach ($block->getMediaAttributes() as $attribute):?>
                                     <li data-role-code="<?= $block->escapeHtml($attribute->getAttributeCode()) ?>"
-                                        class="item-role item-role-<?= $block->escapeHtml($attribute->getAttributeCode()) ?>">
+                                        class="item-role item-role-<?=
+                                        $block->escapeHtml($attribute->getAttributeCode()) ?>">
                                         <?= /* @noEscape */ $attribute->getFrontendLabel() ?>
                                     </li>
-                                    <?php endforeach; ?>
+                                <?php endforeach; ?>
                             </ul>
                         </div>
                     </script>
@@ -210,40 +227,44 @@
 
                                 <div class="admin__field field-image-role">
                                     <label class="admin__field-label">
-                                    <span><?= $block->escapeHtml(__('Role')); ?></span>
+                                        <span><?= $block->escapeHtml(__('Role')); ?></span>
                                     </label>
                                     <div class="admin__field-control">
                                         <ul class="multiselect-alt">
                                             <?php
-                                            foreach ($block->getMediaAttributes() as $attribute) :
+                                            foreach ($block->getMediaAttributes() as $attribute):
                                                 ?>
                                                 <li class="item">
                                                     <label>
                                                         <input class="image-type"
                                                                data-role="type-selector"
                                                                type="checkbox"
-                                                               value="<?= $block->escapeHtml($attribute->getAttributeCode()) ?>"
+                                                               value="<?=
+                                                                $block->escapeHtml($attribute->getAttributeCode()) ?>"
                                                         />
                                                         <?= $block->escapeHtml($attribute->getFrontendLabel()); ?>
                                                     </label>
                                                 </li>
-                                                <?php endforeach; ?>
+                                            <?php endforeach; ?>
                                         </ul>
                                     </div>
                                 </div>
 
                                 <div class="admin__field admin__field-inline field-image-size" data-role="size">
                                     <label class="admin__field-label">
-                                    <span><?= $block->escapeHtml(__('Image Size')); ?></span>
+                                        <span><?= $block->escapeHtml(__('Image Size')); ?></span>
                                     </label>
-                                    <div class="admin__field-value" data-message="<?= $block->escapeHtml(__('{size}'));?>"></div>
+                                    <div class="admin__field-value"
+                                         data-message="<?= $block->escapeHtml(__('{size}'));?>"></div>
                                 </div>
 
-                                <div class="admin__field admin__field-inline field-image-resolution" data-role="resolution">
+                                <div class="admin__field admin__field-inline field-image-resolution"
+                                     data-role="resolution">
                                     <label class="admin__field-label">
-                                    <span><?= $block->escapeHtml(__('Image Resolution')); ?></span>
+                                        <span><?= $block->escapeHtml(__('Image Resolution')); ?></span>
                                     </label>
-                                    <div class="admin__field-value" data-message="<?= $block->escapeHtml(__('{width}^{height} px'));?>"></div>
+                                    <div class="admin__field-value"
+                                         data-message="<?= $block->escapeHtml(__('{width}^{height} px'));?>"></div>
                                 </div>
 
                                 <div class="admin__field field-image-hide">
@@ -273,7 +294,7 @@
                 <fieldset class="admin__fieldset bulk-attribute-values">
                     <div class="admin__field _required">
                         <label class="admin__field-label" for="apply-images-attributes">
-                        <span><?= $block->escapeHtml(__('Select attribute')); ?></span>
+                            <span><?= $block->escapeHtml(__('Select attribute')); ?></span>
                         </label>
                         <div class="admin__field-control">
                             <select
@@ -300,17 +321,22 @@
                         <div data-role="gallery"
                              class="gallery"
                              data-images="[]"
-                             data-types="<?= $block->escapeHtml($this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getImageTypes())) ?>">
+                             data-types="<?= $block->escapeHtml(
+                                 $block->getData('jsonHelper')->jsonEncode($block->getImageTypes())
+                             ) ?>">
                             <div class="image image-placeholder">
                                 <div data-role="uploader" class="uploader">
                                     <div class="image-browse">
-                                    <span><?= $block->escapeHtml(__('Browse Files...')); ?></span>
+                                        <span><?= $block->escapeHtml(__('Browse Files...')); ?></span>
                                         <input type="file" name="image" multiple="multiple"
-                                               data-url="<?= /* @noEscape */ $block->getUrl('catalog/product_gallery/upload') ?>" />
+                                               data-url="<?=
+                                               /* @noEscape */ $block->getUrl('catalog/product_gallery/upload') ?>" />
                                     </div>
                                 </div>
                                 <div class="product-image-wrapper">
-                                    <p class="image-placeholder-text"><?= $block->escapeHtml(__('Browse to find or drag image here')); ?></p>
+                                    <p class="image-placeholder-text">
+                                        <?= $block->escapeHtml(__('Browse to find or drag image here')); ?>
+                                    </p>
                                 </div>
                                 <div class="spinner">
                                     <span></span><span></span><span></span><span></span>
@@ -318,24 +344,28 @@
                                 </div>
                             </div>
 
-                            <?php foreach ($block->getImageTypes() as $typeData) :?>
+                            <?php foreach ($block->getImageTypes() as $typeData): ?>
                                 <input name="<?= $block->escapeHtml($typeData['name']) ?>"
                                        class="image-<?= $block->escapeHtml($typeData['code']) ?>"
                                        type="hidden"
                                        value="<?= $block->escapeHtml($typeData['value']) ?>"/>
-                                <?php endforeach; ?>
+                            <?php endforeach; ?>
 
                             <script data-template="uploader" type="text/x-magento-template">
                                 <div id="<%- data.id %>" class="file-row">
                                     <span class="file-info"><%- data.name %> (<%- data.size %>)</span>
                                     <div class="progressbar-container">
-                                        <div class="progressbar upload-progress" style="width: 0%;"></div>
+                                        <div class="progressbar upload-progress"></div>
                                     </div>
                                     <div class="spinner">
                                         <span></span><span></span><span></span><span></span>
                                         <span></span><span></span><span></span><span></span>
                                     </div>
                                 </div>
+                                <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                                    "width: 0%;",
+                                    "div.progressbar-container div.progressbar.upload-progress"
+                                ) ?>
                             </script>
 
                             <script data-template="gallery-content" type="text/x-magento-template">
@@ -361,31 +391,36 @@
                                            value=""
                                            class="is-removed"/>
                                     <div class="product-image-wrapper">
-                                        <img class="product-image" data-role="image-element" src="<%- data.url %>" alt="<%- data.label %>"/>
+                                        <img class="product-image" data-role="image-element" src="<%- data.url %>"
+                                             alt="<%- data.label %>"/>
                                         <div class="actions">
                                             <button type="button"
                                                     class="action-remove"
                                                     data-role="delete-button"
                                                     title="<?= $block->escapeHtml(__('Remove image')) ?>">
-                                            <span><?= $block->escapeHtml(__('Remove image')); ?></span>
+                                                <span><?= $block->escapeHtml(__('Remove image')); ?></span>
                                             </button>
                                             <div class="draggable-handle"></div>
                                         </div>
-                                        <div class="image-fade"><span><?= $block->escapeHtml(__('Hidden')); ?></span></div>
+                                        <div class="image-fade"><span><?= $block->escapeHtml(__('Hidden')); ?></span>
+                                        </div>
                                     </div>
                                     <div class="item-description">
                                         <div class="item-title" data-role="img-title"><%- data.label %></div>
                                         <div class="item-size">
-                                            <span data-role="image-dimens"></span>, <span data-role="image-size"><%- data.sizeLabel %></span>
+                                            <span data-role="image-dimens"></span>,
+                                            <span data-role="image-size"><%- data.sizeLabel %></span>
                                         </div>
                                     </div>
                                     <ul class="item-roles" data-role="roles-labels">
-                                        <?php foreach ($block->getMediaAttributes() as $attribute) :?>
-                                            <li data-role-code="<?= $block->escapeHtml($attribute->getAttributeCode()) ?>"
-                                                class="item-role item-role-<?= $block->escapeHtml($attribute->getAttributeCode()) ?>">
+                                        <?php foreach ($block->getMediaAttributes() as $attribute):?>
+                                            <li data-role-code="<?= $block->escapeHtml($attribute->getAttributeCode())
+                                            ?>"
+                                                class="item-role item-role-<?=
+                                                $block->escapeHtml($attribute->getAttributeCode()) ?>">
                                                 <?= $block->escapeHtml($attribute->getFrontendLabel()) ?>
                                             </li>
-                                            <?php endforeach; ?>
+                                        <?php endforeach; ?>
                                     </ul>
                                 </div>
                             </script>
@@ -407,7 +442,8 @@
                                             </button>
                                             <div class="draggable-handle"></div>
                                         </div>
-                                        <div class="image-fade"><span><?= $block->escapeHtml(__('Hidden')) ?></span></div>
+                                        <div class="image-fade"><span><?= $block->escapeHtml(__('Hidden')) ?></span>
+                                        </div>
                                     </div>
                                     <!--<ul class="item-roles">
                                         <li class="item-role item-role-base">Base</li>
@@ -416,7 +452,8 @@
                             </script>
 
                             <script data-role="img-dialog-container-tmpl" type="text/x-magento-template">
-                                <div class="image-panel ui-tabs-panel ui-widget-content ui-corner-bottom" data-role="dialog">
+                                <div class="image-panel ui-tabs-panel ui-widget-content ui-corner-bottom"
+                                     data-role="dialog">
                                 </div>
                             </script>
 
@@ -430,7 +467,7 @@
                                     <fieldset class="admin__fieldset fieldset-image-panel">
                                         <div class="admin__field field-image-description">
                                             <label class="admin__field-label" for="image-description">
-                                            <span><?= $block->escapeHtml(__('Alt Text'));?></span>
+                                                <span><?= $block->escapeHtml(__('Alt Text'));?></span>
                                             </label>
 
                                             <div class="admin__field-control">
@@ -444,38 +481,43 @@
 
                                         <div class="admin__field field-image-role">
                                             <label class="admin__field-label">
-                                            <span><?= $block->escapeHtml(__('Role'));?></span>
+                                                <span><?= $block->escapeHtml(__('Role'));?></span>
                                             </label>
                                             <div class="admin__field-control">
                                                 <ul class="multiselect-alt">
-                                                    <?php foreach ($block->getMediaAttributes() as $attribute) :?>
+                                                    <?php foreach ($block->getMediaAttributes() as $attribute):?>
                                                         <li class="item">
                                                             <label>
                                                                 <input class="image-type"
                                                                        data-role="type-selector"
                                                                        type="checkbox"
-                                                                       value="<?= $block->escapeHtml($attribute->getAttributeCode()) ?>"
+                                                                // @codingStandardsIgnoreLine
+                                                                value="<?= $block->escapeHtml($attribute->getAttributeCode()) ?>"
                                                                 />
-                                                                <?= $block->escapeHtml($attribute->getFrontendLabel()) ?>
+                                                                <?= $block->escapeHtml($attribute->getFrontendLabel())?>
                                                             </label>
                                                         </li>
-                                                        <?php endforeach; ?>
+                                                    <?php endforeach; ?>
                                                 </ul>
                                             </div>
                                         </div>
 
                                         <div class="admin__field admin__field-inline field-image-size" data-role="size">
                                             <label class="admin__field-label">
-                                            <span><?= $block->escapeHtml(__('Image Size')); ?></span>
+                                                <span><?= $block->escapeHtml(__('Image Size')); ?></span>
                                             </label>
-                                            <div class="admin__field-value" data-message="<?= $block->escapeHtml(__('{size}')); ?>"></div>
+                                            <div class="admin__field-value"
+                                                 data-message="<?= $block->escapeHtml(__('{size}')); ?>"></div>
                                         </div>
 
-                                        <div class="admin__field admin__field-inline field-image-resolution" data-role="resolution">
+                                        <div class="admin__field admin__field-inline field-image-resolution"
+                                             data-role="resolution">
                                             <label class="admin__field-label">
-                                            <span><?= $block->escapeHtml(__('Image Resolution')); ?></span>
+                                                <span><?= $block->escapeHtml(__('Image Resolution')); ?></span>
                                             </label>
-                                            <div class="admin__field-value" data-message="<?= $block->escapeHtml(__('{width}^{height} px')); ?>"></div>
+                                            <div class="admin__field-value"
+                                                 data-message="<?= $block->escapeHtml(__('{width}^{height} px')); ?>">
+                                            </div>
                                         </div>
 
                                         <div class="admin__field field-image-hide">
@@ -486,7 +528,8 @@
                                                            data-role="visibility-trigger"
                                                            value="1"
                                                            class="admin__control-checkbox"
-                                                           name="product[media_gallery][images][<%- data.file_id %>][disabled]"
+                                                    // @codingStandardsIgnoreLine
+                                                    name="product[media_gallery][images][<%- data.file_id %>][disabled]"
                                                     <% if (data.disabled == 1) { %>checked="checked"<% } %> />
 
                                                     <label for="hide-from-product-page" class="admin__field-label">
@@ -556,7 +599,7 @@
                 <fieldset class="admin__fieldset bulk-attribute-values" data-bind="visible: type() == 'single'">
                     <div class="admin__field _required">
                         <label for="apply-single-price-input" class="admin__field-label">
-                        <span><?= $block->escapeHtml(__('Price')); ?></span>
+                            <span><?= $block->escapeHtml(__('Price')); ?></span>
                         </label>
                         <div class="admin__field-control">
                             <div class="currency-addon">
@@ -589,7 +632,8 @@
                     <fieldset class="admin__fieldset bulk-attribute-values" data-bind="if:attribute">
                         <!-- ko foreach: attribute().chosen -->
                         <div class="admin__field _required">
-                            <label data-bind="attr: {for: 'apply-single-price-input-' + $index()}" class="admin__field-label">
+                            <label data-bind="attr: {for: 'apply-single-price-input-' + $index()}"
+                                   class="admin__field-label">
                                 <span data-bind="text:label"></span>
                             </label>
                             <div class="admin__field-control">
@@ -717,7 +761,7 @@
                     "component": "Magento_ConfigurableProduct/js/variations/steps/bulk",
                     "appendTo": "<?= /* @noEscape */  $block->getParentComponentName() ?>",
                     "noImage": "<?= /* @noEscape */  $block->getNoImageUrl() ?>",
-                    "variationsComponent": "<?= /* @noEscape */ $block->getData('config/form') ?>.configurableVariations"
+                    "variationsComponent": "<?= /* @noEscape */ $block->getData('config/form')?>.configurableVariations"
                 }
             }
         }
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/select_attributes.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/select_attributes.phtml
index c3dc614232201..92fae99f6ec24 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/select_attributes.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/select_attributes.phtml
@@ -5,8 +5,10 @@
  */
 
 /* @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Steps\SelectAttributes */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<div class="select-attributes-block <?= /* @noEscape */ $block->getData('config/dataScope') ?>" data-role="select-attributes-step">
+<div class="select-attributes-block <?= /* @noEscape */ $block->getData('config/dataScope') ?>"
+     data-role="select-attributes-step">
     <div class="select-attributes-actions" data-type="skipKO">
         <?= /* @noEscape */  $block->getAddNewAttributeButton() ?>
     </div>
@@ -37,9 +39,12 @@
         }
     }
 </script>
-<script>
+<?php $dataScope = /* @noEscape */ $block->getData('config/dataScope');
+$scriptString = <<<script
     require(['jquery'], function ($) {
-        $('.<?= /* @noEscape */ $block->getData('config/dataScope') ?>[data-role=select-attributes-step]').applyBindings();
+        $('.{$dataScope}[data-role=select-attributes-step]').applyBindings();
         $('body').trigger('contentUpdated');
     })
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml
index 22ff1992c94a7..2dc1a6a11e2eb 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml
@@ -5,6 +5,7 @@
  */
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 /** @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Variations\Config\Matrix */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?php
 $productMatrix = $block->getProductMatrix();
@@ -26,15 +27,25 @@ $currencySymbol = $block->getCurrencySymbol();
                 <div data-role="configurable-attributes-container">
                     <!-- ko foreach: {data: attributes, as: 'attribute'} -->
                         <div data-role="attribute-info">
-                            <input name="attributes[]" data-bind="value: attribute.id, attr:{id: 'configurable_attribute_' + attribute.id}" type="hidden"/>
-                            <input data-bind="value: attribute.id, attr: {name: $parent.getAttributeRowName(attribute, 'attribute_id')}" type="hidden"/>
-                            <input data-bind="value: attribute.code, attr: {name: $parent.getAttributeRowName(attribute, 'code')}" type="hidden"/>
-                            <input data-bind="value: attribute.label, attr: {name: $parent.getAttributeRowName(attribute, 'label')}" type="hidden"/>
-                            <input data-bind="value: $index(), attr: {name: $parent.getAttributeRowName(attribute, 'position')}" type="hidden"/>
+                            <input name="attributes[]"
+                                   data-bind="value: attribute.id, attr:{id: 'configurable_attribute_' + attribute.id}"
+                                   type="hidden"/>
+                            <input data-bind="value: attribute.id,
+                             attr: {name: $parent.getAttributeRowName(attribute, 'attribute_id')}" type="hidden"/>
+                            <input data-bind="value: attribute.code,
+                             attr: {name: $parent.getAttributeRowName(attribute, 'code')}" type="hidden"/>
+                            <input data-bind="value: attribute.label,
+                             attr: {name: $parent.getAttributeRowName(attribute, 'label')}" type="hidden"/>
+                            <input data-bind="value: $index(),
+                             attr: {name: $parent.getAttributeRowName(attribute, 'position')}" type="hidden"/>
                             <!-- ko foreach: {data: attribute.chosen, as: 'option'} -->
                                 <div data-role="option-info">
-                                    <input value="1" data-bind="attr: {name: $parents[1].getOptionRowName(attribute, option, 'include')}" type="hidden"/>
-                                    <input data-bind="value: option.value, attr: {name: $parents[1].getOptionRowName(attribute, option, 'value_index')}" type="hidden"/>
+                                    <input value="1"
+                                           data-bind="attr: {name: $parents[1].getOptionRowName(attribute, option,
+                                            'include')}" type="hidden"/>
+                                    <input data-bind="value: option.value,
+                                    attr: {name: $parents[1].getOptionRowName(attribute, option, 'value_index')}"
+                                           type="hidden"/>
                                 </div>
                             <!-- /ko -->
                         </div>
@@ -104,7 +115,9 @@ $currencySymbol = $block->getCurrencySymbol();
                                         </button>
                                         <ul class="dropdown">
                                             <li>
-                                                <a class="item" data-action="no-image"><?= $block->escapeHtml(__('No Image')) ?></a>
+                                                <a class="item" data-action="no-image">
+                                                    <?= $block->escapeHtml(__('No Image')) ?>
+                                                </a>
                                             </li>
                                         </ul>
                                     </div>
@@ -167,7 +180,8 @@ $currencySymbol = $block->getCurrencySymbol();
                                         <input type="text"
                                                class="validate-zero-or-greater"
                                                data-bind="attr: {id: $parent.getRowId(variation, 'qty'),
-                                                name: $parent.getVariationRowName(variation, 'quantity_and_stock_status/qty'),
+                                                name: $parent.getVariationRowName(variation,
+                                                 'quantity_and_stock_status/qty'),
                                                 value: variation.quantity}"/>
                                     <!-- /ko -->
                                 </td>
@@ -187,17 +201,20 @@ $currencySymbol = $block->getCurrencySymbol();
                                 <td data-bind="text: label"></td>
                                 <!-- /ko -->
                                 <td class="data-grid-actions-cell">
-                                    <input type="hidden" name="associated_product_ids[]" data-bind="value: variation.productId" data-column="entity_id"/>
+                                    <input type="hidden" name="associated_product_ids[]"
+                                           data-bind="value: variation.productId" data-column="entity_id"/>
                                     <div class="action-select-wrap" data-bind="
                                             css : {
                                                 '_active' : $parent.opened() === $index()
                                             },
                                             outerClick: $parent.closeList.bind($parent, $index)"
                                     >
-                                        <button class="action-select" data-bind="click: $parent.toggleList.bind($parent, $index())">
+                                        <button class="action-select"
+                                                data-bind="click: $parent.toggleList.bind($parent, $index())">
                                             <span data-bind="i18n: 'Select'"></span>
                                         </button>
-                                        <ul class="action-menu _active" data-bind="css: {'_active': $parent.opened() === $index()}">
+                                        <ul class="action-menu _active"
+                                            data-bind="css: {'_active': $parent.opened() === $index()}">
                                             <li>
                                                 <a class="action-menu-item"
                                                    data-bind="
@@ -211,12 +228,14 @@ $currencySymbol = $block->getCurrencySymbol();
                                             </li>
                                             <li>
                                                 <a class="action-menu-item" data-bind="
-                                                    text: variation.status == 1 ? $t('Disable Product') : $t('Enable Product'),
+                                                    text: variation.status == 1 ? $t('Disable Product') :
+                                                     $t('Enable Product'),
                                                     click: $parent.toggleProduct.bind($parent, $index())">
                                                 </a>
                                             </li>
                                             <li>
-                                                <a class="action-menu-item" data-bind="click: $parent.removeProduct.bind($parent, $index())">
+                                                <a class="action-menu-item"
+                                                   data-bind="click: $parent.removeProduct.bind($parent, $index())">
                                                     <?= $block->escapeHtml(__('Remove Product')) ?>
                                                 </a>
                                             </li>
@@ -231,7 +250,8 @@ $currencySymbol = $block->getCurrencySymbol();
         <!-- /ko -->
     </div>
     <div data-role="step-wizard-dialog"
-         data-mage-init='{"Magento_Ui/js/modal/modal":{"type":"slide","title":"<?= $block->escapeJs(__('Create Product Configurations')) ?>",
+         data-mage-init='{"Magento_Ui/js/modal/modal":{"type":"slide","title":"<?=
+            $block->escapeJs(__('Create Product Configurations')) ?>",
          "buttons":[]}}'
          class="no-display">
         <?= /* @noEscape */ $block->getVariationWizard([
@@ -249,8 +269,8 @@ $currencySymbol = $block->getCurrencySymbol();
                 "components": {
                     "configurableVariations": {
                         "component": "Magento_ConfigurableProduct/js/variations/variations",
-                        "variations": <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($productMatrix) ?>,
-                        "productAttributes": <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($attributes) ?>,
+                        "variations": <?= /* @noEscape */ $block->getData('jsonHelper')->jsonEncode($productMatrix) ?>,
+                        "productAttributes":<?=/* @noEscape */ $block->getData('jsonHelper')->jsonEncode($attributes)?>,
                         "productUrl": "<?= /* @noEscape */ $block->getUrl('catalog/product/edit', ['id' => '%id%']) ?>",
                         "currencySymbol": "<?= /* @noEscape */ $currencySymbol ?>",
                         "configurableProductGrid": "configurableProductGrid"
@@ -260,9 +280,11 @@ $currencySymbol = $block->getCurrencySymbol();
         }
     }
 </script>
-<script>
+<?php $scriptString = <<<script
     require(['jquery'], function ($) {
         $('body').trigger('contentUpdated');
         $('[data-panel=product-variations]').applyBindings();
     })
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard-ajax.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard-ajax.phtml
index 7b85efdbb73aa..9d0e78d6ad14c 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard-ajax.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard-ajax.phtml
@@ -5,6 +5,7 @@
  */
 
 /** @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Variations\Config\Matrix */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 
 $productMatrix = $block->getProductMatrix();
 $attributes = $block->getProductAttributes();
@@ -15,13 +16,18 @@ $attributes = $block->getProductAttributes();
     'configurableModal' => $block->getForm() . '.' . $block->getModal()
 ]);
 ?>
-<script>
+
+<?php $dataScope = /* @noEscape */ $block->getData('config/dataScope');
+$nameStep = /* @noEscape */ $block->getData('config/nameStepWizard');
+$scriptString = <<<script
     require(['jquery', 'uiRegistry', 'underscore'], function ($, registry, _) {
         $('body').trigger('contentUpdated');
-        $('.<?= /* @noEscape */ $block->getData('config/dataScope') ?>[data-role=steps-wizard-main]').applyBindings();
+        $('.{$dataScope}[data-role=steps-wizard-main]').applyBindings();
 
-        registry.async('<?= /* @noEscape */ $block->getData('config/nameStepWizard') ?>')(function (component) {
+        registry.async('{$nameStep}')(function (component) {
             _.delay(component.open.bind(component), 500); // TODO: MAGETWO-50246
         })
     });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard.phtml
index f009962bb97ff..c1af2b79005a3 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard.phtml
@@ -3,18 +3,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+
 /** @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Variations\Config\Matrix */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?php
 $productMatrix = $block->getProductMatrix();
 $attributes = $block->getProductAttributes();
 $currencySymbol = $block->getCurrencySymbol();
 ?>
-<div class="<?= /* @noEscape */ $block->getData('config/dataScope') ?>" data-role="step-wizard-dialog" data-bind="scope: '<?= /* @noEscape */ $block->getForm() ?>.<?= /* @noEscape */ $block->getModal() ?>'">
+<div class="<?= /* @noEscape */ $block->getData('config/dataScope') ?>"
+     data-role="step-wizard-dialog"
+     data-bind="scope: '<?= /* @noEscape */ $block->getForm() ?>.<?= /* @noEscape */ $block->getModal() ?>'">
     <!-- ko template: getTemplate() --><!-- /ko -->
 </div>
-<div class="<?= /* @noEscape */ $block->getData('config/dataScope') ?>" id="product-variations-matrix" data-role="product-variations-matrix">
+<div class="<?= /* @noEscape */ $block->getData('config/dataScope') ?>"
+     id="product-variations-matrix" data-role="product-variations-matrix">
     <div data-bind="scope: 'configurableVariations'"></div>
 </div>
 <script type="text/x-magento-init">
@@ -24,13 +28,17 @@ $currencySymbol = $block->getCurrencySymbol();
                 "components": {
                     "<?= /* @noEscape */ $block->getData('config/form') ?>.<?= /* @noEscape */ $block->getModal() ?>": {
                         "component": "Magento_ConfigurableProduct/js/components/modal-configurable",
-                        "options": {"type": "slide", "title": "<?= $block->escapeHtml(__('Create Product Configurations')) ?>"},
+                        "options": {"type": "slide",
+                         "title": "<?= $block->escapeHtml(__('Create Product Configurations')) ?>"},
                         "formName": "<?= /* @noEscape */ $block->getForm() ?>",
                         "isTemplate": false,
                         "stepWizard": "<?= /* @noEscape */ $block->getData('config/nameStepWizard') ?>",
                         "children": {
                             "wizard": {
-                                "url": "<?= /* @noEscape */ $block->getUrl($block->getData('config/urlWizard'), ['id' => $block->getProduct()->getId()]) ?>",
+                                "url": "<?= /* @noEscape */ $block->getUrl(
+                                    $block->getData('config/urlWizard'),
+                                    ['id' => $block->getProduct()->getId()]
+                                ) ?>",
                                 "component": "Magento_Ui/js/form/components/html"
                             }
                         }
@@ -43,12 +51,14 @@ $currencySymbol = $block->getCurrencySymbol();
                         "dataScopeAttributeCodes": "data.attribute_codes",
                         "dataScopeAttributesData": "data.product.configurable_attributes_data",
                         "formName": "<?= /* @noEscape */ $block->getForm() ?>",
-                        "attributeSetHandler": "<?= /* @noEscape */ $block->getForm() ?>.configurable_attribute_set_handler_modal",
-                        "wizardModalButtonName": "<?= /* @noEscape */ $block->getForm() ?>.configurable.configurable_products_button_set.create_configurable_products_button",
+                        "attributeSetHandler": "<?= /* @noEscape */ $block->getForm()
+                        ?>.configurable_attribute_set_handler_modal",
+                        "wizardModalButtonName": "<?= /* @noEscape */ $block->getForm()
+                        ?>.configurable.configurable_products_button_set.create_configurable_products_button",
                         "wizardModalButtonTitle": "<?= $block->escapeHtml(__('Edit Configurations')) ?>",
-                        "productAttributes": <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($attributes) ?>,
+                        "productAttributes":<?=/* @noEscape */ $block->getData('jsonHelper')->jsonEncode($attributes)?>,
                         "productUrl": "<?= /* @noEscape */ $block->getUrl('catalog/product/edit', ['id' => '%id%']) ?>",
-                        "variations": <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($productMatrix) ?>,
+                        "variations": <?= /* @noEscape */ $block->getData('jsonHelper')->jsonEncode($productMatrix) ?>,
                         "currencySymbol": "<?= /* @noEscape */ $currencySymbol ?>",
                         "attributeSetCreationUrl": "<?= /* @noEscape */ $block->getUrl('*/product_set/save') ?>"
                     }
@@ -57,10 +67,13 @@ $currencySymbol = $block->getCurrencySymbol();
         }
     }
 </script>
-<script>
+<?php $dataScope = /* @noEscape */ $block->getData('config/dataScope');
+$scriptString = <<<script
     require(['jquery', 'mage/apply/main'], function ($, main) {
         main.apply();
-        $('.<?= /* @noEscape */ $block->getData('config/dataScope') ?>[data-role=step-wizard-dialog]').applyBindings();
-        $('.<?= /* @noEscape */ $block->getData('config/dataScope') ?>[data-role=product-variations-matrix]').applyBindings();
+        $('.{$dataScope}[data-role=step-wizard-dialog]').applyBindings();
+        $('.{$dataScope}[data-role=product-variations-matrix]').applyBindings();
     })
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/attribute-selector/js.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/attribute-selector/js.phtml
index e6cf1e9c6870d..ebd644a8c79a2 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/attribute-selector/js.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/attribute-selector/js.phtml
@@ -3,12 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+
 /** @var $block \Magento\ConfigurableProduct\Block\Product\Configurable\AttributeSelector */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<script>
+
+<?php $jsonHelper = $block->getData('jsonHelper');
+$suggestWidgetOptions = /* @noEscape */ $jsonHelper->jsonEncode($block->getSuggestWidgetOptions());
+$scriptString = <<<script
 require(["jquery","mage/mage","mage/backend/suggest"], function($){
-    var options = <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getSuggestWidgetOptions()) ?>;
+    var options = {$suggestWidgetOptions};
     $('#configurable-attribute-selector')
         .mage('suggest', options)
         .on('suggestselect', function (event, ui) {
@@ -29,4 +33,6 @@ require(["jquery","mage/mage","mage/backend/suggest"], function($){
             return false;
         })
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Cookie/Block/Html/Notices.php b/app/code/Magento/Cookie/Block/Html/Notices.php
index b4dda788a0292..b687338d382ea 100644
--- a/app/code/Magento/Cookie/Block/Html/Notices.php
+++ b/app/code/Magento/Cookie/Block/Html/Notices.php
@@ -9,12 +9,26 @@
  */
 namespace Magento\Cookie\Block\Html;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Element\Template;
+use Magento\Cookie\Helper\Cookie;
+
 /**
  * @api
  * @since 100.0.2
  */
 class Notices extends \Magento\Framework\View\Element\Template
 {
+    /**
+     * @param Template\Context $context
+     * @param array $data
+     */
+    public function __construct(Template\Context $context, array $data = [])
+    {
+        $data['cookieHelper'] = ObjectManager::getInstance()->get(Cookie::class);
+        parent::__construct($context, $data);
+    }
+
     /**
      * Get Link to cookie restriction privacy policy page
      *
diff --git a/app/code/Magento/Cookie/view/frontend/templates/html/notices.phtml b/app/code/Magento/Cookie/view/frontend/templates/html/notices.phtml
index 8712f31e71b36..52b3aa9ab1f5e 100644
--- a/app/code/Magento/Cookie/view/frontend/templates/html/notices.phtml
+++ b/app/code/Magento/Cookie/view/frontend/templates/html/notices.phtml
@@ -5,17 +5,21 @@
  */
 
 /** @var \Magento\Cookie\Block\Html\Notices $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<?php if ($this->helper(\Magento\Cookie\Helper\Cookie::class)->isCookieRestrictionModeEnabled()) : ?>
+<?php $cookieHelper = $block->getData('cookieHelper');
+if ($cookieHelper->isCookieRestrictionModeEnabled()): ?>
     <div role="alertdialog"
          tabindex="-1"
          class="message global cookie"
-         id="notice-cookie-block"
-         style="display: none;">
+         id="notice-cookie-block">
         <div role="document" class="content" tabindex="0">
             <p>
                 <strong><?= $block->escapeHtml(__('We use cookies to make your experience better.')) ?></strong>
-                <span><?= $block->escapeHtml(__('To comply with the new e-Privacy directive, we need to ask for your consent to set the cookies.')) ?></span>
+                <span><?= $block->escapeHtml(__(
+                    'To comply with the new e-Privacy directive, we need to ask for your consent to set the cookies.'
+                )) ?>
+                </span>
                 <?= $block->escapeHtml(__('<a href="%1">Learn more</a>.', $block->getPrivacyPolicyLink()), ['a']) ?>
             </p>
             <div class="actions">
@@ -25,15 +29,16 @@
             </div>
         </div>
     </div>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display: none;", 'div#notice-cookie-block') ?>
     <script type="text/x-magento-init">
         {
             "#notice-cookie-block": {
                 "cookieNotices": {
                     "cookieAllowButtonSelector": "#btn-cookie-allow",
                     "cookieName": "<?= /* @noEscape */ \Magento\Cookie\Helper\Cookie::IS_USER_ALLOWED_SAVE_COOKIE ?>",
-                    "cookieValue": <?= /* @noEscape */ $this->helper(\Magento\Cookie\Helper\Cookie::class)->getAcceptedSaveCookiesWebsiteIds() ?>,
-                    "cookieLifetime": <?= /* @noEscape */ $this->helper(\Magento\Cookie\Helper\Cookie::class)->getCookieRestrictionLifetime() ?>,
-                    "noCookiesUrl": "<?= $block->escapeJs($block->escapeUrl($block->getUrl('cookie/index/noCookies'))) ?>"
+                    "cookieValue": <?= /* @noEscape */ $cookieHelper->getAcceptedSaveCookiesWebsiteIds() ?>,
+                    "cookieLifetime": <?= /* @noEscape */ $cookieHelper->getCookieRestrictionLifetime() ?>,
+                    "noCookiesUrl": "<?= $block->escapeJs($block->getUrl('cookie/index/noCookies')) ?>"
                 }
             }
         }
diff --git a/app/code/Magento/GiftMessage/view/frontend/templates/cart/gift_options.phtml b/app/code/Magento/GiftMessage/view/frontend/templates/cart/gift_options.phtml
index 4d8a054e67fc5..3d814ac41302d 100644
--- a/app/code/Magento/GiftMessage/view/frontend/templates/cart/gift_options.phtml
+++ b/app/code/Magento/GiftMessage/view/frontend/templates/cart/gift_options.phtml
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <div id="gift-options-cart" data-bind="scope:'giftOptionsCart'">
     <!-- ko template: getTemplate() --><!-- /ko -->
@@ -13,7 +15,10 @@
             }
         }
     </script>
-    <script>
-        window.giftOptionsConfig = <?= /* @noEscape */ $block->getGiftOptionsConfigJson() ?>;
-    </script>
+<?= /* @noEscape */ $secureRenderer->renderTag(
+    'script',
+    [],
+    'window.giftOptionsConfig = '. /* @noEscape */ $block->getGiftOptionsConfigJson(),
+    false
+) ?>
 </div>
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Frontend/Region/Updater.php b/app/code/Magento/Tax/Block/Adminhtml/Frontend/Region/Updater.php
index 7b66c4fd964c6..ae5da9e15cf53 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Frontend/Region/Updater.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Frontend/Region/Updater.php
@@ -5,7 +5,9 @@
  */
 namespace Magento\Tax\Block\Adminhtml\Frontend\Region;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
 class Updater extends \Magento\Config\Block\System\Config\Form\Field
 {
@@ -14,21 +16,31 @@ class Updater extends \Magento\Config\Block\System\Config\Form\Field
      */
     protected $_directoryHelper;
 
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Directory\Helper\Data $directoryHelper
      * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Directory\Helper\Data $directoryHelper,
-        array $data = []
+        array $data = [],
+        ?SecureHtmlRenderer $secureRenderer = null
     ) {
         $this->_directoryHelper = $directoryHelper;
         parent::__construct($context, $data);
+        $this->secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
     }
 
     /**
+     * Return element html.
+     *
      * @param AbstractElement $element
      * @return string
      */
@@ -36,8 +48,7 @@ protected function _getElementHtml(AbstractElement $element)
     {
         $html = parent::_getElementHtml($element);
 
-        $js = '<script>
-              require(["prototype", "mage/adminhtml/form"], function(){
+        $js = 'require(["prototype", "mage/adminhtml/form"], function(){
                updater = new RegionUpdater("tax_defaults_country", "none", "tax_defaults_region", %s, "nullify");
                if(updater.lastCountryId) {
                    var tmpRegionId = $("tax_defaults_region").value;
@@ -49,10 +60,12 @@ protected function _getElementHtml(AbstractElement $element)
                } else {
                    updater.update();
                }
-                });
-               </script>';
+                });';
+
+        $scriptString = sprintf($js, $this->_directoryHelper->getRegionJson());
+
+        $html .= /* @noEscape */ $this->secureRenderer->renderTag('script', [], $scriptString, false);
 
-        $html .= sprintf($js, $this->_directoryHelper->getRegionJson());
         return $html;
     }
 }
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
index 1884b247e530a..05d0e63b4414a 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
@@ -13,6 +13,8 @@
 
 namespace Magento\Tax\Block\Adminhtml\Rate;
 
+use Magento\Directory\Helper\Data as DirectoryData;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Tax\Controller\RegistryConstants;
 
@@ -108,6 +110,7 @@ public function __construct(
         $this->_taxRateRepository = $taxRateRepository;
         $this->_taxRateCollection = $taxRateCollection;
         $this->_taxRateConverter = $taxRateConverter;
+        $data['directoryHelper'] = ObjectManager::getInstance()->get(DirectoryData::class);
         parent::__construct($context, $registry, $formFactory, $data);
     }
 
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml
index fec108d53948f..6956cd5990e96 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml
@@ -4,15 +4,19 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Templates.ThisInTemplate
+/** @var \Magento\Tax\Block\Adminhtml\Rate\Form $tmpBlock */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<script>
+
+<?php $jsonHelper = $tmpBlock->getData('directoryHelper');
+$regionJson = /* @noEscape */ $jsonHelper->getRegionJson();
+$scriptString = <<<script
 require([
     "jquery",
     "mage/adminhtml/form"
 ], function(jQuery){
 
-    var updater = new RegionUpdater('tax_country_id', 'tax_region', 'tax_region_id', <?= /* @noEscape */ $this->helper(\Magento\Directory\Helper\Data::class)->getRegionJson() ?>, 'disable');
+    var updater = new RegionUpdater('tax_country_id', 'tax_region', 'tax_region_id', {$regionJson}, 'disable');
     updater.disableRegionValidation();
 
     (function ($) {
@@ -54,4 +58,6 @@ require([
 
     window.updater = updater;
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
index 3558d359aa4d6..0b0c892e47edf 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
@@ -5,8 +5,12 @@
  */
 
 /** @var $block \Magento\Tax\Block\Adminhtml\Rule\Edit\Form */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<script>
+<?php $formElementId = /* @noEscape */ \Magento\Tax\Block\Adminhtml\Rate\Form::FORM_ELEMENT_ID;
+$jsId = /* @noEscape */ $block->getJsId();
+//phpcs:ignore Magento2.SQL.RawQuery
+$scriptString = <<<script
 require([
     'jquery',
     'Magento_Ui/js/modal/alert',
@@ -77,7 +81,7 @@ require([
             $.ajax({
                 type: "POST",
                 data: {id:id},
-                url: '<?= $block->escapeJs($block->escapeUrl($block->getTaxRateLoadUrl())) ?>',
+                url: '{$block->escapeJs($block->getTaxRateLoadUrl())}',
                 success: function(result, status) {
                     $('body').trigger('processStop');
                     if (result.success) {
@@ -94,14 +98,14 @@ require([
                             });
                         else
                             alert({
-                                content: '<?= $block->escapeJs($block->escapeHtml(__('An error occurred'))) ?>'
+                                content: '{$block->escapeJs($block->escapeHtml(__('An error occurred')))}'
                             });
                     }
                 },
                 error: function () {
                     $('body').trigger('processStop');
                     alert({
-                        content: '<?= $block->escapeJs($block->escapeHtml(__('An error occurred'))) ?>'
+                        content: '{$block->escapeJs($block->escapeHtml(__('An error occurred')))}'
                     });
                 },
                 dataType: "json"
@@ -112,9 +116,9 @@ require([
             var options = {
                 mselectContainer: '#tax_rate + section.mselect-list',
                 toggleAddButton:false,
-                addText: '<?= $block->escapeJs($block->escapeHtml(__('Add New Tax Rate'))) ?>',
+                addText: '{$block->escapeJs($block->escapeHtml(__('Add New Tax Rate')))}',
                 parse: null,
-                nextPageUrl: '<?= $block->escapeHtml($block->getTaxRatesPageUrl()) ?>',
+                nextPageUrl: '{$block->escapeHtml($block->getTaxRatesPageUrl())}',
                 selectedValues: this.settings.selected_values,
                 mselectInputSubmitCallback: function (value, options) {
                     var select = $('#tax_rate');
@@ -137,7 +141,7 @@ require([
             var taxRate = $('#tax_rate'),
                 taxRateField = taxRate.parent(),
                 taxRateForm = $('#tax-rate-form'),
-                taxRateFormElement = $('#<?= /* @noEscape */ \Magento\Tax\Block\Adminhtml\Rate\Form::FORM_ELEMENT_ID ?>');
+                taxRateFormElement = $('#{$formElementId}');
 
             if (!this.isEntityEditable) {
                 // Override default layout of editable multiselect
@@ -162,11 +166,14 @@ require([
                     .on('click.mselect-edit', '.mselect-edit', this.edit)
                     .on("click.mselect-delete", ".mselect-delete", function () {
                         var that = $(this),
-                            select = that.closest('.mselect-list').prev(),
+script;
+                            // phpcs:ignore Magento2.SQL.RawQuery
+                            $scriptString .= "select = that.closest('.mselect-list').prev()," . PHP_EOL;
+                            $scriptString .= <<<script
                             rateValue = that.parent().find('input[type="checkbox"]').val();
 
                         confirm({
-                            content: '<?= $block->escapeJs(__('Do you really want to delete this tax rate?')) ?>',
+                            content: '{$block->escapeJs(__('Do you really want to delete this tax rate?'))}',
                             actions: {
                                 /**
                                  * Confirm action.
@@ -180,7 +187,7 @@ require([
                                             form_key: $('input[name="form_key"]').val()
                                         },
                                         dataType: 'json',
-                                        url: '<?= $block->escapeJs($block->escapeUrl($block->getTaxRateDeleteUrl())) ?>',
+                                        url: '{$block->escapeJs($block->getTaxRateDeleteUrl())}',
                                         success: function(result, status) {
                                             $('body').trigger('processStop');
                                             if (result.success) {
@@ -198,14 +205,18 @@ require([
                                                     });
                                                 else
                                                     alert({
-                                                        content: '<?= $block->escapeJs($block->escapeHtml(__('An error occurred'))) ?>'
+                                                        content: '{$block->escapeJs($block->escapeHtml(
+                                                            __('An error occurred')
+                                                        ))}'
                                                     });
                                             }
                                         },
                                         error: function () {
                                             $('body').trigger('processStop');
                                             alert({
-                                                content: '<?= $block->escapeJs($block->escapeHtml(__('An error occurred'))) ?>'
+                                                content: '{$block->escapeJs($block->escapeHtml(
+                                                    __('An error occurred')
+                                                ))}'
                                             });
                                         }
                                     };
@@ -228,15 +239,15 @@ require([
             taxRateFormElement.mage('form').mage('validation');
 
             taxRateForm.dialogRates({
-                title: '<?= $block->escapeJs($block->escapeHtml(__('Tax Rate'))) ?>',
+                title: '{$block->escapeJs($block->escapeHtml(__('Tax Rate')))}',
                 type: 'slide',
-                id: '<?= /* @noEscape */ $block->getJsId() ?>',
+                id: '{$jsId}',
                 modalClass: 'tax-rate-popup',
                 closed: function () {
                     taxRateFormElement.data('validation').clearError();
                 },
                 buttons: [{
-                    text: '<?= $block->escapeJs($block->escapeHtml(__('Save'))) ?>',
+                    text: '{$block->escapeJs($block->escapeHtml(__('Save')))}',
                     'class': 'action-save action-primary',
                     click: function() {
                         this.updateItemRate();
@@ -244,7 +255,10 @@ require([
                             itemRateData = $.extend({}, itemRate);
 
                         if (itemRateData.itemElement) {
-                            delete itemRateData.itemElement;
+script;
+                            //phpcs:ignore Magento2.SQL.RawQuerys
+                            $scriptString .= ' delete itemRateData.itemElement;';
+$scriptString.= <<<script
                         }
 
                         if (!taxRateFormElement.validation().valid()) {
@@ -256,7 +270,7 @@ require([
                             type: 'POST',
                             data: itemRateData,
                             dataType: 'json',
-                            url: '<?= $block->escapeJs($block->escapeUrl($block->getTaxRateSaveUrl())) ?>',
+                            url: '{$block->escapeJs($block->getTaxRateSaveUrl())}',
                             success: function(result, status) {
                                 $('body').trigger('processStop');
                                 if (result.success) {
@@ -281,14 +295,14 @@ require([
                                         });
                                     else
                                         alert({
-                                            content: '<?= $block->escapeJs($block->escapeHtml(__('An error occurred'))) ?>'
+                                            content: '{$block->escapeJs($block->escapeHtml(__('An error occurred')))}'
                                         });
                                 }
                             },
                             error: function () {
                                 $('body').trigger('processStop');
                                 alert({
-                                    content: '<?= $block->escapeJs($block->escapeHtml(__('An error occurred'))) ?>'
+                                    content: '{$block->escapeJs($block->escapeHtml(__('An error occurred')))}'
                                 });
                             }
                         };
@@ -302,4 +316,6 @@ require([
 
     window.TaxRateEditableMultiselect = TaxRateEditableMultiselect;
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
index f09af05303f36..0d00fa397c9a3 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
@@ -4,13 +4,18 @@
  * See COPYING.txt for license details.
  */
 /* @var $block \Magento\Tax\Block\Adminhtml\Rate\Form */
+/* @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
 <div data-role="spinner" class="grid-loading-mask">
     <div class="grid-loader"></div>
 </div>
 
-<div class="form-inline" id="<?= $block->escapeHtmlAttr($block->getNameInLayout()) ?>" style="display:none">
+<div class="form-inline" id="<?= $block->escapeHtmlAttr($block->getNameInLayout()) ?>"
     <?= $block->getFormHtml() ?>
     <?= $block->getChildHtml('form_after') ?>
 </div>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    "display:none",
+    '#'. $block->escapeHtmlAttr($block->getNameInLayout())
+) ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/add.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/add.phtml
index d5017f83affe4..ba2ca499cfec1 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/add.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/add.phtml
@@ -4,9 +4,15 @@
  * See COPYING.txt for license details.
  */
 // @deprecated
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <div data-mage-init='{"floatingHeader": {}}' class="page-actions">
-    <button type="button" onclick="window.location.href='<?= $block->escapeUrl($createUrl) ?>'">
+    <button type="button" id="addNewClass">
         <?= $block->escapeHtml(__('Add New Class')) ?>
     </button>
+    <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+        'onclick',
+        "window.location.href='" . $block->escapeUrl($createUrl) . "'",
+        'button#addNewClass'
+    ) ?>
 </div>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/save.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/save.phtml
index fa9fcb8fbcfcd..91860c70fd086 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/save.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/save.phtml
@@ -4,19 +4,23 @@
  * See COPYING.txt for license details.
  */
 // @deprecated
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <div data-mage-init='{"floatingHeader": {}}' class="page-actions">
     <?= $block->getBackButtonHtml() ?>
     <?= $block->getResetButtonHtml() ?>
     <?= $block->getSaveButtonHtml() ?>
 </div>
-<?php if ($form) : ?>
+<?php if ($form): ?>
     <?= $form->toHtml() ?>
-    <script>
+    <?php $scriptString = <<<script
     require(['jquery', "mage/mage"], function(jQuery){
 
-        jQuery('#<?= $block->escapeJs($form->getForm()->getId()) ?>').mage('form').mage('validation');
+        jQuery('#{$block->escapeJs($form->getForm()->getId())}').mage('form').mage('validation');
 
     });
-    </script>
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/save.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/save.phtml
index 58c79bbfe9715..7053cd61e29ac 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/save.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/save.phtml
@@ -3,16 +3,19 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Tax\Block\Adminhtml\Rate\Form $form */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<?php if ($form) : ?>
+<?php if ($form): ?>
     <?= $form->toHtml() ?>
-    <script>
+    <?php $scriptString = <<<script
     require([
         "jquery",
         "mage/mage"
     ], function($){
 
-        $('#<?= $block->escapeJs($form->getForm()->getId()) ?>').mage('form').mage('validation');
+        $('#{$block->escapeJs($form->getForm()->getId())}').mage('form').mage('validation');
 
         $(document).ready(function () {
             'use strict';
@@ -42,5 +45,7 @@
         });
 
     });
-    </script>
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/add.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/add.phtml
index e21dbb099ff5d..149ea004243f9 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/add.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/add.phtml
@@ -4,9 +4,15 @@
  * See COPYING.txt for license details.
  */
 // @deprecated
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <div data-mage-init='{"floatingHeader": {}}' class="page-actions">
-    <button type="button" onclick="window.location.href='<?= $block->escapeUrl($createUrl) ?>'">
+    <button type="button" id="addNewTaxRule">
         <?= $block->escapeHtml(__('Add New Tax Rule')) ?>
     </button>
+    <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+        'onclick',
+        "window.location.href='" . $block->escapeUrl($createUrl) . "'",
+        'button#addNewClass'
+    ) ?>
 </div>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/save.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/save.phtml
index 10251e2805f2f..3830be23d80a6 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/save.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/save.phtml
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 // @deprecated
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <div data-mage-init='{"floatingHeader": {}}' class="page-actions">
     <?= $block->getBackButtonHtml() ?>
@@ -11,13 +13,15 @@
     <?= $block->getSaveButtonHtml() ?>
     <?= $block->getDeleteButtonHtml() ?>
 </div>
-<?php if ($form) : ?>
+<?php if ($form): ?>
     <?= $form->toHtml() ?>
-    <script>
+    <?php $scriptString = <<<script
     require(['jquery', "mage/mage"], function(jQuery){
 
-        jQuery('#<?= $block->escapeJs($form->getForm()->getId()) ?>').mage('form').mage('validation');
+        jQuery('#{$block->escapeJs($form->getForm()->getId())}').mage('form').mage('validation');
 
     });
-    </script>
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
index df177b6180511..d2098db4d9c43 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
@@ -4,41 +4,43 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Templates.ThisInTemplate
-
 /**
  * @var $block \Magento\Tax\Block\Checkout\Grandtotal
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
 <?php
 $style = $block->escapeHtmlAttr($block->getStyle());
 $colspan = (int) $block->getColspan();
+$jsonHelper = $block->getData('jsonHelper');
 ?>
-<?php if ($block->includeTax() && $block->getTotalExclTax() >= 0) : ?>
+<?php if ($block->includeTax() && $block->getTotalExclTax() >= 0): ?>
     <tr class="grand totals excl">
-        <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
+        <th class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
             <strong><?= $block->escapeHtml(__('Grand Total Excl. Tax')) ?></strong>
         </th>
-        <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr(__('Grand Total Excl. Tax')) ?>">
-            <strong><?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotalExclTax()) ?></strong>
+        <td class="amount" data-th="<?= $block->escapeHtmlAttr(__('Grand Total Excl. Tax')) ?>">
+            <strong><?= /* @noEscape */ $jsonHelper->formatPrice($block->getTotalExclTax()) ?></strong>
         </td>
     </tr>
     <?= /* @noEscape */ $block->renderTotals('taxes', $colspan) ?>
     <tr class="grand totals incl">
-        <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
+        <th class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
             <strong><?= $block->escapeHtml(__('Grand Total Incl. Tax')) ?></strong>
         </th>
-        <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr(__('Grand Total Incl. Tax')) ?>">
-            <strong><?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotal()->getValue()) ?></strong>
+        <td class="amount" data-th="<?= $block->escapeHtmlAttr(__('Grand Total Incl. Tax')) ?>">
+            <strong><?= /* @noEscape */ $jsonHelper->formatPrice($block->getTotal()->getValue()) ?></strong>
         </td>
     </tr>
-<?php else : ?>
+<?php else: ?>
     <tr class="grand totals">
-        <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
+        <th class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
             <strong><?= $block->escapeHtml($block->getTotal()->getTitle()) ?></strong>
         </th>
-        <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
-            <strong><?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotal()->getValue()) ?></strong>
+        <td class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
+            <strong><?= /* @noEscape */ $jsonHelper->formatPrice($block->getTotal()->getValue()) ?></strong>
         </td>
     </tr>
 <?php endif; ?>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(/* @noEscape */ $style, 'tr.totals.shipping th.mark') ?>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(/* @noEscape */ $style, 'tr.totals.shipping td.amount') ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
index 3f5a55e5fa325..09aa99e228713 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
@@ -9,47 +9,52 @@
 /**
  * @var $block \Magento\Tax\Block\Checkout\Shipping
  * @see \Magento\Tax\Block\Checkout\Shipping
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
-<?php if ($block->displayShipping()) : ?>
+<?php if ($block->displayShipping()): ?>
     <?php
         $style = $block->escapeHtmlAttr($block->getStyle());
         $colspan = (int) $block->getColspan();
+        $jsonHelper = $block->getData('jsonHelper');
     ?>
-    <?php if ($block->displayBoth()) : ?>
+    <?php if ($block->displayBoth()): ?>
     <tr class="totals shipping excl">
-        <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
+        <th class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
             <?= $block->escapeHtml($block->getExcludeTaxLabel()) ?>
         </th>
-        <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getExcludeTaxLabel()) ?>">
-            <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getShippingExcludeTax()) ?>
+
+        <td class="amount" data-th="<?= $block->escapeHtmlAttr($block->getExcludeTaxLabel()) ?>">
+            <?= /* @noEscape */ $jsonHelper->formatPrice($block->getShippingExcludeTax()) ?>
         </td>
     </tr>
     <tr class="totals shipping incl">
-        <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
+        <th class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
             <?= $block->escapeHtml($block->getIncludeTaxLabel()) ?>
         </th>
-        <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getIncludeTaxLabel()) ?>">
-            <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getShippingIncludeTax()) ?>
+        <td class="amount" data-th="<?= $block->escapeHtmlAttr($block->getIncludeTaxLabel()) ?>">
+            <?= /* @noEscape */ $jsonHelper->formatPrice($block->getShippingIncludeTax()) ?>
         </td>
     </tr>
-    <?php elseif ($block->displayIncludeTax()) : ?>
+    <?php elseif ($block->displayIncludeTax()): ?>
     <tr class="totals shipping incl">
-        <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
+        <th class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
             <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
         </th>
-        <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
-            <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getShippingIncludeTax()) ?>
+        <td class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
+            <?= /* @noEscape */ $jsonHelper->formatPrice($block->getShippingIncludeTax()) ?>
         </td>
     </tr>
-    <?php else : ?>
+    <?php else: ?>
     <tr class="totals shipping excl">
-        <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
+        <th class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
             <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
         </th>
-        <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
-            <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getShippingExcludeTax()) ?>
+        <td class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
+            <?= /* @noEscape */ $jsonHelper->formatPrice($block->getShippingExcludeTax()) ?>
         </td>
     </tr>
     <?php endif; ?>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(/* @noEscape */ $style, 'tr.totals.shipping th.mark') ?>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(/* @noEscape */ $style, 'tr.totals.shipping td.amount') ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
index 010a7b8dcfe4a..091303cbedb38 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
@@ -4,41 +4,44 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Templates.ThisInTemplate
-
 /**
  * @var $block \Magento\Tax\Block\Checkout\Subtotal
  * @see \Magento\Tax\Block\Checkout\Subtotal
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
 <?php
 $style = $block->escapeHtmlAttr($block->getStyle());
 $colspan = (int) $block->getColspan();
+$jsonHelper = $block->getData('jsonHelper');
 ?>
-<?php if ($block->displayBoth()) : ?>
+<?php if ($block->displayBoth()): ?>
 <tr class="totals sub excl">
-    <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
+    <th class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
         <?= $block->escapeHtml(__('Subtotal (Excl. Tax)')) ?>
     </th>
-    <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr(__('Subtotal (Excl. Tax)')) ?>">
-        <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotal()->getValueExclTax()) ?>
+    <tdclass="amount" data-th="<?= $block->escapeHtmlAttr(__('Subtotal (Excl. Tax)')) ?>">
+        <?= /* @noEscape */ $jsonHelper->formatPrice($block->getTotal()->getValueExclTax()) ?>
     </td>
 </tr>
 <tr class="totals sub incl">
-    <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
+    <th class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
         <?= $block->escapeHtml(__('Subtotal (Incl. Tax)')) ?>
     </th>
-    <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr(__('Subtotal (Incl. Tax)')) ?>">
-        <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotal()->getValueInclTax()) ?>
+    <td class="amount" data-th="<?= $block->escapeHtmlAttr(__('Subtotal (Incl. Tax)')) ?>">
+        <?= /* @noEscape */ $jsonHelper->formatPrice($block->getTotal()->getValueInclTax()) ?>
     </td>
 </tr>
-<?php else : ?>
+<?php else: ?>
 <tr class="totals sub">
-    <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
+    <th class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
         <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
     </th>
-    <td style="<?= /* @noEscape */ $style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
-        <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotal()->getValue()) ?>
+    <td class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
+        <?= /* @noEscape */ $jsonHelper->formatPrice($block->getTotal()->getValue()) ?>
     </td>
 </tr>
 <?php endif; ?>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(/* @noEscape */ $style, 'tr.totals.shipping th.mark') ?>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(/* @noEscape */ $style, 'tr.totals.shipping td.amount') ?>
+
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
index 0329db406fa16..d1b31bdf7861b 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
@@ -4,60 +4,65 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Templates.ThisInTemplate
-
 /**
  * @var $block \Magento\Tax\Block\Checkout\Tax
  * @see \Magento\Tax\Block\Checkout\Tax
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
 <?php
     $_value = $block->getTotal()->getValue();
     $_style = $block->escapeHtmlAttr($block->getTotal()->getStyle());
-
+    $jsonHelper = $block->getData('jsonHelper');
     $attributes = 'class="totals-tax"';
 
-if ($this->helper(\Magento\Tax\Helper\Data::class)->displayFullSummary() && $_value != 0) {
-    $attributes = 'class="totals-tax-summary" data-mage-init=\'{"toggleAdvanced": {"selectorsToggleClass": "shown", "baseToggleClass": "expanded", "toggleContainers": ".totals-tax-details"}}\'';
+if ($jsonHelper->displayFullSummary() && $_value != 0) {
+    $attributes = 'class="totals-tax-summary" data-mage-init=\'{"toggleAdvanced": {"selectorsToggleClass": "shown",
+     "baseToggleClass": "expanded", "toggleContainers": ".totals-tax-details"}}\'';
 }
 ?>
 
 <tr <?= /* @noEscape */ $attributes ?>>
-    <th style="<?= /* @noEscape */ $_style ?>" class="mark" colspan="<?= (int) $block->getColspan() ?>" scope="row">
-        <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayFullSummary()) : ?>
+    <th class="mark" colspan="<?= (int) $block->getColspan() ?>" scope="row">
+        <?php if ($jsonHelper->displayFullSummary()): ?>
             <span class="detailed"><?= $block->escapeHtml($block->getTotal()->getTitle()) ?></span>
-        <?php else : ?>
+        <?php else: ?>
             <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
         <?php endif; ?>
     </th>
-    <td style="<?= /* @noEscape */ $_style ?>" class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
-        <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($_value) ?>
+    <td class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
+        <?= /* @noEscape */ $jsonHelper->formatPrice($_value) ?>
     </td>
 </tr>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag($_style, 'tr.totals-tax th.mark') ?>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag($_style, 'tr.totals-tax td.amount') ?>
 
-<?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayFullSummary() && $_value != 0) : ?>
-    <?php foreach ($block->getTotal()->getFullInfo() as $info) : ?>
+<?php if ($jsonHelper->displayFullSummary() && $_value != 0): ?>
+    <?php foreach ($block->getTotal()->getFullInfo() as $info): ?>
         <?php if (isset($info['hidden']) && $info['hidden']) { continue; } ?>
         <?php $percent = $info['percent']; ?>
         <?php $amount = $info['amount']; ?>
         <?php $rates = $info['rates']; ?>
         <?php $isFirst = 1; ?>
 
-        <?php foreach ($rates as $rate) : ?>
+        <?php foreach ($rates as $rate): ?>
             <tr class="totals-tax-details">
-                <th class="mark" style="<?= /* @noEscape */ $_style ?>" colspan="<?= (int) $block->getColspan() ?>" scope="row">
+                <th class="mark" colspan="<?= (int) $block->getColspan() ?>" scope="row">
                     <?= $block->escapeHtml($rate['title']) ?>
-                    <?php if ($rate['percent'] !== null) : ?>
+                    <?php if ($rate['percent'] !== null): ?>
                         (<?= (float) $rate['percent'] ?>%)
                     <?php endif; ?>
                 </th>
-                <?php if ($isFirst) : ?>
-                    <td style="<?= /* @noEscape */ $_style ?>" class="amount" rowspan="<?= count($rates) ?>"
-                       data-th="<?= $block->escapeHtmlAttr($rate['title']) ?><?php if ($rate['percent'] !== null) : ?>(<?= (float) $rate['percent'] ?>%)<?php endif; ?>">
-                        <?= /* @noEscape */ $this->helper(\Magento\Checkout\Helper\Data::class)->formatPrice($amount) ?>
+                <?php if ($isFirst): ?>
+                    <td class="amount" rowspan="<?= count($rates) ?>"
+                       data-th="<?= $block->escapeHtmlAttr($rate['title']) ?>
+                        <?php if ($rate['percent'] !== null): ?>(<?= (float) $rate['percent'] ?>%)<?php endif; ?>">
+                        <?= /* @noEscape */ $jsonHelper->formatPrice($amount) ?>
                     </td>
                 <?php endif; ?>
             </tr>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($_style, 'tr.totals-tax-details th.mark') ?>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($_style, 'tr.totals-tax-details td.amount') ?>
             <?php $isFirst = 0; ?>
         <?php endforeach; ?>
     <?php endforeach; ?>

From fe00511295cbd814f4a852729fbdc89dcc7fb4a6 Mon Sep 17 00:00:00 2001
From: Mateusz Krzeszowiak <mateusz.krzeszowiak@creativestyle.pl>
Date: Sat, 18 Apr 2020 16:18:21 +0200
Subject: [PATCH 0170/1718] Fix static tests

---
 lib/web/mage/translate-inline.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/web/mage/translate-inline.js b/lib/web/mage/translate-inline.js
index a559426ed41d2..2407a64e5e0d1 100644
--- a/lib/web/mage/translate-inline.js
+++ b/lib/web/mage/translate-inline.js
@@ -143,8 +143,9 @@ define([
 
             this.formIsSubmitted = true;
 
-            $.post({
+            $.ajax({
                 url: this.options.ajaxUrl,
+                type: 'POST',
                 data: parameters,
                 loaderContext: this.element,
                 showLoader: true

From 19b636e90432066692b3ad9f9a27d2eca4879d45 Mon Sep 17 00:00:00 2001
From: oleksandrkravchuk <oleksandr.kravchuk@vaimo.com>
Date: Mon, 20 Apr 2020 15:39:44 +0300
Subject: [PATCH 0171/1718] PHPStan add support of magic methods of Data
 Object. Add support of magic mathods of Session Manager (which uses Data
 Object as a container). Increase PHPStan level to 1. Add tests to test
 DataObjectReflectionExtension.

---
 .../DataObjectClassReflectionExtension.php    |  87 ++++++
 .../Magento/DataObjectMethodReflection.php    | 254 ++++++++++++++++++
 .../CodingStandard/Tool/PhpStan.php           |   2 +-
 .../Formatters/FilteredErrorFormatterTest.php |   3 +-
 .../ClassWithCorrectUsageOfDataObject.php     |  41 +++
 .../ClassWithIncorrectUsageOfDataObject.php   |  46 ++++
 .../Fixtures/ClassWithSessionManagerUsage.php |  63 +++++
 .../DataObject/Fixtures/config.neon           |   4 +
 .../DataObject/MagicMethodsTest.php           | 109 ++++++++
 .../Test/Php/_files/phpstan/phpstan.neon      |  18 +-
 10 files changed, 618 insertions(+), 9 deletions(-)
 create mode 100644 dev/tests/static/framework/Magento/PhpStan/Reflection/Magento/DataObjectClassReflectionExtension.php
 create mode 100644 dev/tests/static/framework/Magento/PhpStan/Reflection/Magento/DataObjectMethodReflection.php
 create mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/Fixtures/ClassWithCorrectUsageOfDataObject.php
 create mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/Fixtures/ClassWithIncorrectUsageOfDataObject.php
 create mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/Fixtures/ClassWithSessionManagerUsage.php
 create mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/Fixtures/config.neon
 create mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/MagicMethodsTest.php

diff --git a/dev/tests/static/framework/Magento/PhpStan/Reflection/Magento/DataObjectClassReflectionExtension.php b/dev/tests/static/framework/Magento/PhpStan/Reflection/Magento/DataObjectClassReflectionExtension.php
new file mode 100644
index 0000000000000..b7a26208d986f
--- /dev/null
+++ b/dev/tests/static/framework/Magento/PhpStan/Reflection/Magento/DataObjectClassReflectionExtension.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\PhpStan\Reflection\Magento;
+
+use Magento\Framework\DataObject;
+use Magento\Framework\Session\SessionManager;
+use PHPStan\DependencyInjection\Container;
+use PHPStan\Reflection\Annotations\AnnotationsMethodsClassReflectionExtension;
+use PHPStan\Reflection\ClassReflection;
+use PHPStan\Reflection\MethodReflection;
+use PHPStan\Reflection\MethodsClassReflectionExtension;
+
+/**
+ * Extension to add support of magic methods (get/set/uns/has) based on @see DataObject
+ */
+class DataObjectClassReflectionExtension implements MethodsClassReflectionExtension
+{
+    private const MAGIC_METHODS_PREFIXES = ['get', 'set', 'uns', 'has'];
+    /**
+     * @var Container
+     */
+    private $container;
+
+    /**
+     * @var AnnotationsMethodsClassReflectionExtension
+     */
+    private $annotationsMethodsClassReflectionExtension;
+
+    /**
+     * @param Container $container
+     */
+    public function __construct(Container $container)
+    {
+        $this->container = $container;
+        $this->annotationsMethodsClassReflectionExtension = $this->container
+            ->getByType(AnnotationsMethodsClassReflectionExtension::class);
+    }
+
+    /**
+     * Check if class has relations with DataObject and requested method can be considered as a magic method.
+     *
+     * @param ClassReflection $classReflection
+     * @param string $methodName
+     *
+     * @return bool
+     */
+    public function hasMethod(ClassReflection $classReflection, string $methodName): bool
+    {
+        // Workaround due to annotation extension always loads last.
+        if ($this->annotationsMethodsClassReflectionExtension->hasMethod($classReflection, $methodName)) {
+            // In case when annotation already available for the method, we will not use 'magic methods' approach.
+            return false;
+        }
+
+        if ($classReflection->isSubclassOf(DataObject::class) || $classReflection->getName() == DataObject::class) {
+            return in_array(substr($methodName, 0, 3), self::MAGIC_METHODS_PREFIXES);
+        }
+
+        /** SessionManager redirects all calls to `__call` to container which extends DataObject */
+        if ($classReflection->isSubclassOf(SessionManager::class)
+            || $classReflection->getName() === SessionManager::class
+        ) {
+            /** @see \Magento\Framework\Session\SessionManager::__call */
+            return in_array(substr($methodName, 0, 3), self::MAGIC_METHODS_PREFIXES);
+        }
+
+        return false;
+    }
+
+    /**
+     * Get method reflection instance.
+     *
+     * @param ClassReflection $classReflection
+     * @param string $methodName
+     *
+     * @return MethodReflection
+     */
+    public function getMethod(ClassReflection $classReflection, string $methodName): MethodReflection
+    {
+        return new DataObjectMethodReflection($classReflection, $methodName);
+    }
+}
diff --git a/dev/tests/static/framework/Magento/PhpStan/Reflection/Magento/DataObjectMethodReflection.php b/dev/tests/static/framework/Magento/PhpStan/Reflection/Magento/DataObjectMethodReflection.php
new file mode 100644
index 0000000000000..c85a485350674
--- /dev/null
+++ b/dev/tests/static/framework/Magento/PhpStan/Reflection/Magento/DataObjectMethodReflection.php
@@ -0,0 +1,254 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\PhpStan\Reflection\Magento;
+
+use PHPStan\Reflection\ClassMemberReflection;
+use PHPStan\Reflection\ClassReflection;
+use PHPStan\Reflection\FunctionVariant;
+use PHPStan\Reflection\MethodReflection;
+use PHPStan\Reflection\ParameterReflection;
+use PHPStan\Reflection\ParametersAcceptor;
+use PHPStan\Reflection\Php\DummyParameter;
+use PHPStan\TrinaryLogic;
+use PHPStan\Type\BooleanType;
+use PHPStan\Type\Generic\TemplateTypeMap;
+use PHPStan\Type\IntegerType;
+use PHPStan\Type\MixedType;
+use PHPStan\Type\ObjectType;
+use PHPStan\Type\StringType;
+use PHPStan\Type\Type;
+use PHPStan\Type\UnionType;
+use PHPStan\Type\VoidType;
+
+class DataObjectMethodReflection implements MethodReflection
+{
+    /**
+     * @var ClassReflection
+     */
+    private $classReflection;
+
+    /**
+     * @var string
+     */
+    private $methodName;
+
+    /**
+     * @param ClassReflection $classReflection
+     * @param string $methodName
+     */
+    public function __construct(ClassReflection $classReflection, string $methodName)
+    {
+        $this->classReflection = $classReflection;
+        $this->methodName = $methodName;
+    }
+
+    /**
+     * Get methods class reflection.
+     *
+     * @return ClassReflection
+     */
+    public function getDeclaringClass(): ClassReflection
+    {
+        return $this->classReflection;
+    }
+
+    /**
+     * Get if method is static.
+     *
+     * @return bool
+     */
+    public function isStatic(): bool
+    {
+        return false;
+    }
+
+    /**
+     * Get if method is private.
+     *
+     * @return bool
+     */
+    public function isPrivate(): bool
+    {
+        return false;
+    }
+
+    /**
+     * Get if method is public.
+     *
+     * @return bool
+     */
+    public function isPublic(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Get Method PHP Doc comment message.
+     *
+     * @return string|null
+     */
+    public function getDocComment(): ?string
+    {
+        return null;
+    }
+
+    /**
+     * Get Method Name.
+     *
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->methodName;
+    }
+
+    /**
+     * Get Prototype.
+     *
+     * @return ClassMemberReflection
+     */
+    public function getPrototype(): ClassMemberReflection
+    {
+        return $this;
+    }
+
+    /**
+     * Get Magic Methods variant based on type (get/set/has/uns).
+     *
+     * @return ParametersAcceptor[]
+     */
+    public function getVariants(): array
+    {
+        return [
+            new FunctionVariant(
+                TemplateTypeMap::createEmpty(),
+                TemplateTypeMap::createEmpty(),
+                $this->getMethodParameters(),
+                false,
+                $this->getReturnType()
+            )
+        ];
+    }
+
+    /**
+     * Get Magic Methods parameters.
+     *
+     * @return ParameterReflection[]
+     */
+    private function getMethodParameters(): array
+    {
+        $params = [];
+        switch (substr($this->methodName, 0, 3)) {
+            case 'set':
+                $params[] = new DummyParameter(
+                    'value',
+                    new MixedType(),
+                    false,
+                    null,
+                    false,
+                    null
+                );
+                break;
+            case 'get':
+                $params[] = new DummyParameter(
+                    'index',
+                    new UnionType([new StringType(), new IntegerType()]),
+                    true,
+                    null,
+                    false,
+                    null
+                );
+                break;
+        }
+
+        return $params;
+    }
+
+    /**
+     * Get Magic Methods return type.
+     *
+     * @return Type
+     */
+    private function getReturnType(): Type
+    {
+        switch (substr($this->methodName, 0, 3)) {
+            case 'set':
+            case 'uns':
+                $returnType = new ObjectType($this->classReflection->getName());
+                break;
+            case 'has':
+                $returnType = new BooleanType();
+                break;
+            default:
+                $returnType = new MixedType();
+                break;
+        }
+
+        return $returnType;
+    }
+
+    /**
+     * Get if method is deprecated.
+     *
+     * @return TrinaryLogic
+     */
+    public function isDeprecated(): TrinaryLogic
+    {
+        return TrinaryLogic::createNo();
+    }
+
+    /**
+     * Get deprecated description.
+     *
+     * @return string|null
+     */
+    public function getDeprecatedDescription(): ?string
+    {
+        return null;
+    }
+
+    /**
+     * Get if method is final.
+     *
+     * @return TrinaryLogic
+     */
+    public function isFinal(): TrinaryLogic
+    {
+        return TrinaryLogic::createNo();
+    }
+
+    /**
+     * Get if method is internal.
+     *
+     * @return TrinaryLogic
+     */
+    public function isInternal(): TrinaryLogic
+    {
+        return TrinaryLogic::createNo();
+    }
+
+    /**
+     * Get method throw type.
+     *
+     * @return Type|null
+     */
+    public function getThrowType(): ?Type
+    {
+        return new VoidType();
+    }
+
+    /**
+     * Get if method has side effect.
+     *
+     * @return TrinaryLogic
+     */
+    public function hasSideEffects(): TrinaryLogic
+    {
+        return TrinaryLogic::createYes();
+    }
+}
diff --git a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/PhpStan.php b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/PhpStan.php
index 9048262722d48..43b3166e4b187 100644
--- a/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/PhpStan.php
+++ b/dev/tests/static/framework/Magento/TestFramework/CodingStandard/Tool/PhpStan.php
@@ -19,7 +19,7 @@ class PhpStan implements ToolInterface
      *
      * @see https://github.com/phpstan/phpstan#rule-levels
      */
-    private const RULE_LEVEL = 0;
+    private const RULE_LEVEL = 1;
 
     /**
      * Memory limit required by PHPStan for full Magento project scan.
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Formatters/FilteredErrorFormatterTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Formatters/FilteredErrorFormatterTest.php
index 8512f311f15a2..0c918779fd7ba 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Formatters/FilteredErrorFormatterTest.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Formatters/FilteredErrorFormatterTest.php
@@ -38,7 +38,7 @@ public function testFormatErrors(
         string $expected
     ): void {
         $formatter = new FilteredErrorFormatter(
-            new FuzzyRelativePathHelper(self::DIRECTORY_PATH, '/', []),
+            new FuzzyRelativePathHelper(self::DIRECTORY_PATH, [], '/'),
             false,
             false,
             false,
@@ -48,6 +48,7 @@ public function testFormatErrors(
         $analysisResult = new AnalysisResult(
             $fileErrors,
             [],
+            [],
             false,
             false,
             null
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/Fixtures/ClassWithCorrectUsageOfDataObject.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/Fixtures/ClassWithCorrectUsageOfDataObject.php
new file mode 100644
index 0000000000000..b9d5bf66c6018
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/Fixtures/ClassWithCorrectUsageOfDataObject.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\PhpStan\Reflection\DataObject\Fixtures;
+
+use Magento\Framework\DataObject;
+
+class ClassWithCorrectUsageOfDataObject
+{
+    /**
+     * @var DataObject
+     */
+    private $container;
+
+    public function __construct()
+    {
+        $this->container = new DataObject();
+    }
+
+    /**
+     * Process with amazing stuff.
+     *
+     * @return void
+     */
+    public function doStuff(): void
+    {
+        $a = $this->container->getSomething('1');
+
+        if ($this->container->hasSomething()) {
+            $this->container->setSomething2($a);
+        } else {
+            $this->container->unsetSomething();
+            $this->container->setSometing2($this->container->getStuff());
+        }
+    }
+}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/Fixtures/ClassWithIncorrectUsageOfDataObject.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/Fixtures/ClassWithIncorrectUsageOfDataObject.php
new file mode 100644
index 0000000000000..c7d930a2c5047
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/Fixtures/ClassWithIncorrectUsageOfDataObject.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\PhpStan\Reflection\DataObject\Fixtures;
+
+use Magento\Framework\DataObject;
+
+class ClassWithIncorrectUsageOfDataObject
+{
+    /**
+     * @var DataObject
+     */
+    private $container;
+
+    public function __construct()
+    {
+        $this->container = new DataObject();
+    }
+
+    /**
+     * Do Magic Stuff.
+     *
+     * 'get' - args: $index[optional] - string|int, return: mixed;
+     * 'set' - args: $value - mixed, return: self;
+     * 'uns' - args: -, return: self;
+     * 'has' - args: -, return: bool;
+     */
+    public function doStuff(): void
+    {
+        $this->container->getBaz(
+            $this->container->unsFoo(
+                $this->container->setBaz()
+            )
+        );
+        $this->container->hasFoo(
+            $this->container->setStuff()
+        );
+
+        $this->container->getSomething($this->container->hasFoo());
+    }
+}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/Fixtures/ClassWithSessionManagerUsage.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/Fixtures/ClassWithSessionManagerUsage.php
new file mode 100644
index 0000000000000..1a87363e20d9a
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/Fixtures/ClassWithSessionManagerUsage.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\PhpStan\Reflection\DataObject\Fixtures;
+
+use Magento\Framework\Session\SessionManager;
+
+class ClassWithSessionManagerUsage
+{
+    /**
+     * @var SessionManager
+     */
+    private $container;
+
+    public function __construct(SessionManager $sessionManager)
+    {
+        $this->container = $sessionManager;
+    }
+
+    /**
+     * Do Magic Stuff.
+     *
+     * 'get' - args: $index[optional] - string|int, return: mixed;
+     * 'set' - args: $value - mixed, return: self;
+     * 'uns' - args: -, return: self;
+     * 'has' - args: -, return: bool;
+     */
+    public function doStuff(): void
+    {
+        $this->container->getBaz(
+            $this->container->unsFoo(
+                $this->container->setBaz()
+            )
+        );
+        $this->container->hasFoo(
+            $this->container->setStuff()
+        );
+
+        $this->container->getSomething($this->container->hasFoo());
+    }
+
+    /**
+     * Correct usage.
+     *
+     * @return void
+     */
+    public function doCorrectStuff(): void
+    {
+        $a = $this->container->getSomething('1');
+
+        if ($this->container->hasSomething()) {
+            $this->container->setSomething2($a);
+        } else {
+            $this->container->unsetSomething();
+            $this->container->setSometing2($this->container->getStuff());
+        }
+    }
+}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/Fixtures/config.neon b/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/Fixtures/config.neon
new file mode 100644
index 0000000000000..24fa8d0a51e70
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/Fixtures/config.neon
@@ -0,0 +1,4 @@
+services:
+    -
+        class: Magento\PhpStan\Reflection\Magento\DataObjectClassReflectionExtension
+        tags: {phpstan.broker.methodsClassReflectionExtension: {priority: 100}}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/MagicMethodsTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/MagicMethodsTest.php
new file mode 100644
index 0000000000000..09cfd1100174d
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/MagicMethodsTest.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\PhpStan\Reflection\DataObject\Fixtures;
+
+use PHPStan\Rules\Methods\CallMethodsRule;
+use PHPStan\Rules\Rule;
+use PHPStan\Testing\RuleTestCase;
+
+class MagicMethodsTest extends RuleTestCase
+{
+    /**
+     * @inheritdoc
+     */
+    protected function getRule(): Rule
+    {
+        return $this->getContainer()->getByType(CallMethodsRule::class);
+    }
+
+    /**
+     * Return directory path of fixture directory.
+     *
+     * @return string
+     */
+    private static function getFixturesDir(): string
+    {
+        return __DIR__ . DIRECTORY_SEPARATOR . 'Fixtures' . DIRECTORY_SEPARATOR;
+    }
+
+    /**
+     * Add config files.
+     *
+     * @return string[]
+     */
+    public static function getAdditionalConfigFiles(): array
+    {
+        return [self::getFixturesDir() . 'config.neon'];
+    }
+
+    /**
+     * Test Data Object Reflection extension.
+     */
+    public function testExtension()
+    {
+        $this->analyse(
+            [
+                self::getFixturesDir() . 'ClassWithCorrectUsageOfDataObject.php',
+                self::getFixturesDir() . 'ClassWithIncorrectUsageOfDataObject.php',
+                self::getFixturesDir() . 'ClassWithSessionManagerUsage.php'
+            ],
+            [
+                // phpcs:disable Generic.Files.LineLength.TooLong
+                [
+                    'Parameter #1 $index of method Magento\Framework\DataObject::getBaz() expects int|string, Magento\Framework\DataObject given.',
+                    35
+                ],
+                [
+                    'Method Magento\Framework\DataObject::unsFoo() invoked with 1 parameter, 0 required.',
+                    36
+                ],
+                [
+                    'Method Magento\Framework\DataObject::setBaz() invoked with 0 parameters, 1 required.',
+                    37
+                ],
+                [
+                    'Method Magento\Framework\DataObject::hasFoo() invoked with 1 parameter, 0 required.',
+                    40
+                ],
+                [
+                    'Method Magento\Framework\DataObject::setStuff() invoked with 0 parameters, 1 required.',
+                    41
+                ],
+                [
+                    'Parameter #1 $index of method Magento\Framework\DataObject::getSomething() expects int|string, bool given.',
+                    44
+                ],
+                [
+                    'Parameter #1 $index of method Magento\Framework\Session\SessionManager::getBaz() expects int|string, Magento\Framework\Session\SessionManager given.',
+                    35
+                ],
+                [
+                    'Method Magento\Framework\Session\SessionManager::unsFoo() invoked with 1 parameter, 0 required.',
+                    36
+                ],
+                [
+                    'Method Magento\Framework\Session\SessionManager::setBaz() invoked with 0 parameters, 1 required.',
+                    37
+                ],
+                [
+                    'Method Magento\Framework\Session\SessionManager::hasFoo() invoked with 1 parameter, 0 required.',
+                    40
+                ],
+                [
+                    'Method Magento\Framework\Session\SessionManager::setStuff() invoked with 0 parameters, 1 required.',
+                    41
+                ],
+                [
+                    'Parameter #1 $index of method Magento\Framework\Session\SessionManager::getSomething() expects int|string, bool given.',
+                    44
+                ]
+                // phpcs:enable Generic.Files.LineLength.TooLong
+            ]
+        );
+    }
+}
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/phpstan.neon b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/phpstan.neon
index f4f6ff87f8175..be6bbb1913460 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/phpstan.neon
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/phpstan.neon
@@ -29,10 +29,14 @@ parameters:
 		- '#Method (?:.*?) should return (?:.*?)void(?:.*?) but return statement is missing.#'
 
 services:
-	errorFormatter.filtered:
-		class: Magento\PhpStan\Formatters\FilteredErrorFormatter
-		arguments:
-			showTipsOfTheDay: false
-			checkThisOnly: false
-			inferPrivatePropertyTypeFromConstructor: true
-			checkMissingTypehints: %checkMissingTypehints%
+    -
+        class: Magento\PhpStan\Reflection\Magento\DataObjectClassReflectionExtension
+        tags: {phpstan.broker.methodsClassReflectionExtension: {priority: 100}}
+
+    errorFormatter.filtered:
+        class: Magento\PhpStan\Formatters\FilteredErrorFormatter
+        arguments:
+            showTipsOfTheDay: false
+            checkThisOnly: false
+            inferPrivatePropertyTypeFromConstructor: true
+            checkMissingTypehints: %checkMissingTypehints%

From 8849d1e3ca2e3b2e7fe2ef7233f338e872d268af Mon Sep 17 00:00:00 2001
From: oleksandrkravchuk <oleksandr.kravchuk@vaimo.com>
Date: Mon, 20 Apr 2020 15:41:26 +0300
Subject: [PATCH 0172/1718] PHPStan add support of magic methods of Data
 Object. Add new line.

---
 .../Reflection/Magento/DataObjectClassReflectionExtension.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/static/framework/Magento/PhpStan/Reflection/Magento/DataObjectClassReflectionExtension.php b/dev/tests/static/framework/Magento/PhpStan/Reflection/Magento/DataObjectClassReflectionExtension.php
index b7a26208d986f..30036ff5de588 100644
--- a/dev/tests/static/framework/Magento/PhpStan/Reflection/Magento/DataObjectClassReflectionExtension.php
+++ b/dev/tests/static/framework/Magento/PhpStan/Reflection/Magento/DataObjectClassReflectionExtension.php
@@ -21,6 +21,7 @@
 class DataObjectClassReflectionExtension implements MethodsClassReflectionExtension
 {
     private const MAGIC_METHODS_PREFIXES = ['get', 'set', 'uns', 'has'];
+
     /**
      * @var Container
      */

From d8259124fbdeda9b3637b240e797f338d65f40c1 Mon Sep 17 00:00:00 2001
From: oleksandrkravchuk <oleksandr.kravchuk@vaimo.com>
Date: Mon, 20 Apr 2020 16:57:34 +0300
Subject: [PATCH 0173/1718] PHPStan add support of magic methods of Data
 Object. Fix static tests.

---
 .../DataObjectClassReflectionExtension.php    |  2 +-
 .../DataObjectMethodReflection.php            |  5 +++-
 .../ClassWithCorrectUsageOfDataObject.php     |  3 +++
 .../ClassWithIncorrectUsageOfDataObject.php   |  3 +++
 .../Fixtures/ClassWithSessionManagerUsage.php |  6 +++++
 .../DataObject/Fixtures/config.neon           |  2 +-
 .../DataObject/MagicMethodsTest.php           | 24 +++++++++----------
 .../Test/Php/_files/phpstan/phpstan.neon      |  2 +-
 8 files changed, 31 insertions(+), 16 deletions(-)
 rename dev/tests/static/framework/Magento/PhpStan/Reflection/{Magento => Php}/DataObjectClassReflectionExtension.php (98%)
 rename dev/tests/static/framework/Magento/PhpStan/Reflection/{Magento => Php}/DataObjectMethodReflection.php (98%)

diff --git a/dev/tests/static/framework/Magento/PhpStan/Reflection/Magento/DataObjectClassReflectionExtension.php b/dev/tests/static/framework/Magento/PhpStan/Reflection/Php/DataObjectClassReflectionExtension.php
similarity index 98%
rename from dev/tests/static/framework/Magento/PhpStan/Reflection/Magento/DataObjectClassReflectionExtension.php
rename to dev/tests/static/framework/Magento/PhpStan/Reflection/Php/DataObjectClassReflectionExtension.php
index 30036ff5de588..3b1e6aa7b59ac 100644
--- a/dev/tests/static/framework/Magento/PhpStan/Reflection/Magento/DataObjectClassReflectionExtension.php
+++ b/dev/tests/static/framework/Magento/PhpStan/Reflection/Php/DataObjectClassReflectionExtension.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\PhpStan\Reflection\Magento;
+namespace Magento\PhpStan\Reflection\Php;
 
 use Magento\Framework\DataObject;
 use Magento\Framework\Session\SessionManager;
diff --git a/dev/tests/static/framework/Magento/PhpStan/Reflection/Magento/DataObjectMethodReflection.php b/dev/tests/static/framework/Magento/PhpStan/Reflection/Php/DataObjectMethodReflection.php
similarity index 98%
rename from dev/tests/static/framework/Magento/PhpStan/Reflection/Magento/DataObjectMethodReflection.php
rename to dev/tests/static/framework/Magento/PhpStan/Reflection/Php/DataObjectMethodReflection.php
index c85a485350674..febf015014cf5 100644
--- a/dev/tests/static/framework/Magento/PhpStan/Reflection/Magento/DataObjectMethodReflection.php
+++ b/dev/tests/static/framework/Magento/PhpStan/Reflection/Php/DataObjectMethodReflection.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\PhpStan\Reflection\Magento;
+namespace Magento\PhpStan\Reflection\Php;
 
 use PHPStan\Reflection\ClassMemberReflection;
 use PHPStan\Reflection\ClassReflection;
@@ -25,6 +25,9 @@
 use PHPStan\Type\UnionType;
 use PHPStan\Type\VoidType;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class DataObjectMethodReflection implements MethodReflection
 {
     /**
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/Fixtures/ClassWithCorrectUsageOfDataObject.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/Fixtures/ClassWithCorrectUsageOfDataObject.php
index b9d5bf66c6018..72270fdf6c829 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/Fixtures/ClassWithCorrectUsageOfDataObject.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/Fixtures/ClassWithCorrectUsageOfDataObject.php
@@ -17,6 +17,9 @@ class ClassWithCorrectUsageOfDataObject
      */
     private $container;
 
+    /**
+     * ClassWithCorrectUsageOfDataObject constructor.
+     */
     public function __construct()
     {
         $this->container = new DataObject();
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/Fixtures/ClassWithIncorrectUsageOfDataObject.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/Fixtures/ClassWithIncorrectUsageOfDataObject.php
index c7d930a2c5047..c6539875daef7 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/Fixtures/ClassWithIncorrectUsageOfDataObject.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/Fixtures/ClassWithIncorrectUsageOfDataObject.php
@@ -17,6 +17,9 @@ class ClassWithIncorrectUsageOfDataObject
      */
     private $container;
 
+    /**
+     * ClassWithIncorrectUsageOfDataObject constructor.
+     */
     public function __construct()
     {
         $this->container = new DataObject();
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/Fixtures/ClassWithSessionManagerUsage.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/Fixtures/ClassWithSessionManagerUsage.php
index 1a87363e20d9a..508dbee8f4a40 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/Fixtures/ClassWithSessionManagerUsage.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/Fixtures/ClassWithSessionManagerUsage.php
@@ -10,6 +10,9 @@
 
 use Magento\Framework\Session\SessionManager;
 
+/**
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ */
 class ClassWithSessionManagerUsage
 {
     /**
@@ -17,6 +20,9 @@ class ClassWithSessionManagerUsage
      */
     private $container;
 
+    /**
+     * @param SessionManager $sessionManager
+     */
     public function __construct(SessionManager $sessionManager)
     {
         $this->container = $sessionManager;
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/Fixtures/config.neon b/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/Fixtures/config.neon
index 24fa8d0a51e70..dcbe472527097 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/Fixtures/config.neon
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/Fixtures/config.neon
@@ -1,4 +1,4 @@
 services:
     -
-        class: Magento\PhpStan\Reflection\Magento\DataObjectClassReflectionExtension
+        class: Magento\PhpStan\Reflection\Php\DataObjectClassReflectionExtension
         tags: {phpstan.broker.methodsClassReflectionExtension: {priority: 100}}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/MagicMethodsTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/MagicMethodsTest.php
index 09cfd1100174d..773f215f35696 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/MagicMethodsTest.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/MagicMethodsTest.php
@@ -56,51 +56,51 @@ public function testExtension()
                 // phpcs:disable Generic.Files.LineLength.TooLong
                 [
                     'Parameter #1 $index of method Magento\Framework\DataObject::getBaz() expects int|string, Magento\Framework\DataObject given.',
-                    35
+                    38
                 ],
                 [
                     'Method Magento\Framework\DataObject::unsFoo() invoked with 1 parameter, 0 required.',
-                    36
+                    39
                 ],
                 [
                     'Method Magento\Framework\DataObject::setBaz() invoked with 0 parameters, 1 required.',
-                    37
+                    40
                 ],
                 [
                     'Method Magento\Framework\DataObject::hasFoo() invoked with 1 parameter, 0 required.',
-                    40
+                    43
                 ],
                 [
                     'Method Magento\Framework\DataObject::setStuff() invoked with 0 parameters, 1 required.',
-                    41
+                    44
                 ],
                 [
                     'Parameter #1 $index of method Magento\Framework\DataObject::getSomething() expects int|string, bool given.',
-                    44
+                    47
                 ],
                 [
                     'Parameter #1 $index of method Magento\Framework\Session\SessionManager::getBaz() expects int|string, Magento\Framework\Session\SessionManager given.',
-                    35
+                    41
                 ],
                 [
                     'Method Magento\Framework\Session\SessionManager::unsFoo() invoked with 1 parameter, 0 required.',
-                    36
+                    42
                 ],
                 [
                     'Method Magento\Framework\Session\SessionManager::setBaz() invoked with 0 parameters, 1 required.',
-                    37
+                    43
                 ],
                 [
                     'Method Magento\Framework\Session\SessionManager::hasFoo() invoked with 1 parameter, 0 required.',
-                    40
+                    46
                 ],
                 [
                     'Method Magento\Framework\Session\SessionManager::setStuff() invoked with 0 parameters, 1 required.',
-                    41
+                    47
                 ],
                 [
                     'Parameter #1 $index of method Magento\Framework\Session\SessionManager::getSomething() expects int|string, bool given.',
-                    44
+                    50
                 ]
                 // phpcs:enable Generic.Files.LineLength.TooLong
             ]
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/phpstan.neon b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/phpstan.neon
index be6bbb1913460..7fa77cc50d62c 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/phpstan.neon
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/phpstan.neon
@@ -30,7 +30,7 @@ parameters:
 
 services:
     -
-        class: Magento\PhpStan\Reflection\Magento\DataObjectClassReflectionExtension
+        class: Magento\PhpStan\Reflection\Php\DataObjectClassReflectionExtension
         tags: {phpstan.broker.methodsClassReflectionExtension: {priority: 100}}
 
     errorFormatter.filtered:

From fc452ceb51b530be2702a3b630a2c9e9d6122c1b Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Mon, 20 Apr 2020 19:28:50 +0300
Subject: [PATCH 0174/1718] Added cron index before go to frontend

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

diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddingNewOptionsWithImagesAndPricesToConfigurableProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddingNewOptionsWithImagesAndPricesToConfigurableProductTest.xml
index aae100e55414b..c318b3e37cd0f 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddingNewOptionsWithImagesAndPricesToConfigurableProductTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddingNewOptionsWithImagesAndPricesToConfigurableProductTest.xml
@@ -108,6 +108,7 @@
 
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
 
+        <magentoCron stepKey="runCronIndex" groups="index"/>
         <!--Go to frontend and check image and price-->
         <amOnPage url="{{StorefrontProductPage.url($$createConfigProductCreateConfigurableProduct.custom_attributes[url_key]$$)}}" stepKey="goToProductPage"/>
 

From d64eaf403c059e306756b39f24a0645e3ef96cb4 Mon Sep 17 00:00:00 2001
From: Mateusz Krzeszowiak <mateusz.krzeszowiak@creativestyle.pl>
Date: Mon, 20 Apr 2020 18:39:05 +0200
Subject: [PATCH 0175/1718] Fix mage utils dependencies

---
 lib/web/mage/utils/objects.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/web/mage/utils/objects.js b/lib/web/mage/utils/objects.js
index 83711c43d2d1b..82866c0f2a6ad 100644
--- a/lib/web/mage/utils/objects.js
+++ b/lib/web/mage/utils/objects.js
@@ -5,8 +5,9 @@
 define([
     'ko',
     'jquery',
-    'underscore'
-], function (ko, $, _) {
+    'underscore',
+    'mage/utils/strings'
+], function (ko, $, _, stringUtils) {
     'use strict';
 
     var primitives = [
@@ -217,7 +218,7 @@ define([
             data = this.flatten(data);
 
             _.each(data, function (value, keys) {
-                keys = this.serializeName(keys);
+                keys = stringUtils.serializeName(keys);
                 value = _.isUndefined(value) ? '' : value;
 
                 result[keys] = value;

From 39a6e2b5033b67268e75bc1892f0e20e90f505de Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Wed, 22 Apr 2020 16:35:38 +0300
Subject: [PATCH 0176/1718] MC-29420: Remove event handlers from CE

---
 app/code/Magento/Backend/Block/Template.php   |   1 +
 .../Magento/Backend/etc/adminhtml/system.xml  |   4 +-
 app/code/Magento/Backend/i18n/en_US.csv       |   6 +-
 .../templates/widget/form/container.phtml     |  19 +-
 .../templates/widget/grid/extended.phtml      | 141 ++++---
 .../widget/grid/massaction_extended.phtml     |  55 ++-
 .../adminhtml/templates/widget/tabs.phtml     |   2 +-
 .../Catalog/Block/Adminhtml/Category/Tree.php |   6 +-
 .../etc/adminhtml/system.xml                  |   2 +-
 .../Magento/CatalogUrlRewrite/i18n/en_US.csv  |   2 +-
 .../Config/Block/System/Config/Form/Field.php |   2 +-
 .../Block/System/Config/Form/Fieldset.php     |   6 +-
 .../Magento/Cookie/etc/adminhtml/system.xml   |   2 +-
 .../view/adminhtml/templates/grid.phtml       |   9 +-
 .../system/currency/rate/matrix.phtml         |  64 ++-
 .../Block/Adminhtml/Edit/Renderer/Region.php  |  29 +-
 .../Sales/Order/Address/Form/Renderer/Vat.php |  20 +-
 .../Magento/Customer/Block/Form/Register.php  |   2 +
 .../view/adminhtml/templates/tab/cart.phtml   |  41 +-
 .../frontend/templates/address/edit.phtml     |   4 +-
 .../view/frontend/templates/form/edit.phtml   |  22 +-
 .../frontend/templates/form/register.phtml    |  58 +--
 .../TemplateEngine/Decorator/DebugHints.php   |  80 +++-
 .../adminhtml/templates/unitofmeasure.phtml   |  26 +-
 .../templates/js/optional_zip_countries.phtml |  16 +-
 .../Sales/Items/Column/Downloadable/Name.php  |   6 +
 .../column/downloadable/creditmemo/name.phtml |  45 ++-
 .../column/downloadable/invoice/name.phtml    |  47 ++-
 .../items/column/downloadable/name.phtml      |  46 ++-
 .../templates/customer/products/list.phtml    |  52 ++-
 .../Block/Adminhtml/Template/Edit/Form.php    |  30 +-
 .../templates/preview/iframeswitcher.phtml    |   9 +-
 .../adminhtml/templates/template/edit.phtml   |  63 +--
 .../view/adminhtml/templates/popup.phtml      |  26 +-
 .../sales/order/create/giftoptions.phtml      |  20 +-
 .../sales/order/view/giftoptions.phtml        |  14 +-
 .../view/frontend/templates/inline.phtml      | 364 ++++++++++++++----
 .../view/frontend/templates/code.phtml        |  33 +-
 .../Magento/Msrp/etc/adminhtml/system.xml     |   2 +-
 app/code/Magento/Msrp/i18n/en_US.csv          |   2 +-
 .../etc/adminhtml/system/express_checkout.xml |   2 +-
 app/code/Magento/Paypal/i18n/en_US.csv        |   4 +-
 .../Adminhtml/Order/Invoice/Create/Form.php   |  18 +
 .../order/creditmemo/create/items.phtml       |  29 +-
 .../create/totals/adjustments.phtml           |  14 +-
 .../templates/order/invoice/create/form.phtml |  52 ++-
 .../order/invoice/create/items.phtml          |  61 +--
 .../templates/order/view/history.phtml        |  47 ++-
 .../templates/order/view/tab/info.phtml       |  14 +-
 .../frontend/templates/reorder/sidebar.phtml  |  20 +-
 .../Magento/Theme/etc/adminhtml/system.xml    |   2 +-
 .../Magento/backend/web/css/styles.less       |   4 +
 52 files changed, 1137 insertions(+), 508 deletions(-)

diff --git a/app/code/Magento/Backend/Block/Template.php b/app/code/Magento/Backend/Block/Template.php
index 46777427ec70b..1c4cd4f9bcc33 100644
--- a/app/code/Magento/Backend/Block/Template.php
+++ b/app/code/Magento/Backend/Block/Template.php
@@ -73,6 +73,7 @@ public function __construct(\Magento\Backend\Block\Template\Context $context, ar
         $this->formKey = $context->getFormKey();
         $this->nameBuilder = $context->getNameBuilder();
         $data['jsonHelper'] = ObjectManager::getInstance()->get(Data::class);
+        $data['directoryHelper']= ObjectManager::getInstance()->get(\Magento\Directory\Helper\Data::class);
         parent::__construct($context, $data);
     }
 
diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml
index 1e8ec226d6b88..71cdd4881d5d7 100644
--- a/app/code/Magento/Backend/etc/adminhtml/system.xml
+++ b/app/code/Magento/Backend/etc/adminhtml/system.xml
@@ -146,7 +146,7 @@
                     <label>Allow Symlinks</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>
-                        <![CDATA[<strong style="color:red">Warning!</strong> Enabling this feature is not recommended on production environments because it represents a potential security risk.]]>
+                        <![CDATA[<strong class="colorRed">Warning!</strong> Enabling this feature is not recommended on production environments because it represents a potential security risk.]]>
                     </comment>
                 </field>
                 <field id="minify_html" translate="label comment" type="select" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
@@ -460,7 +460,7 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <backend_model>Magento\Config\Model\Config\Backend\Store</backend_model>
                     <comment>
-                        <![CDATA[<strong style="color:red">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third-party services (e.g. PayPal etc.).]]>
+                        <![CDATA[<strong class="colorRed">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third-party services (e.g. PayPal etc.).]]>
                     </comment>
                 </field>
                 <field id="redirect_to_base" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
diff --git a/app/code/Magento/Backend/i18n/en_US.csv b/app/code/Magento/Backend/i18n/en_US.csv
index 53f7fe90cbbe5..d148c1a3efb88 100644
--- a/app/code/Magento/Backend/i18n/en_US.csv
+++ b/app/code/Magento/Backend/i18n/en_US.csv
@@ -333,7 +333,7 @@ Debug,Debug
 "Add Block Names to Hints","Add Block Names to Hints"
 "Template Settings","Template Settings"
 "Allow Symlinks","Allow Symlinks"
-"<strong style=""color:red"">Warning!</strong> Enabling this feature is not recommended on production environments because it represents a potential security risk.","<strong style=""color:red"">Warning!</strong> Enabling this feature is not recommended on production environments because it represents a potential security risk."
+"<strong class=""colorRed">Warning!</strong> Enabling this feature is not recommended on production environments because it represents a potential security risk.","<strong class=""colorRed"">Warning!</strong> Enabling this feature is not recommended on production environments because it represents a potential security risk."
 "Minify Html","Minify Html"
 "Minification is not applied in developer mode.","Minification is not applied in developer mode."
 "Translate Inline","Translate Inline"
@@ -405,9 +405,9 @@ Web,Web
 "Url Options","Url Options"
 "Add Store Code to Urls","Add Store Code to Urls"
 "
-                        <strong style=""color:red"">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third-party services (e.g. PayPal etc.).
+                        <strong class=""colorRed">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third-party services (e.g. PayPal etc.).
                     ","
-                        <strong style=""color:red"">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third-party services (e.g. PayPal etc.).
+                        <strong class=""colorRed">Warning!</strong> When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third-party services (e.g. PayPal etc.).
                     "
 "Auto-redirect to Base URL","Auto-redirect to Base URL"
 "Search Engine Optimization","Search Engine Optimization"
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/container.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/container.phtml
index aa289dbf1eb0f..21843215758d5 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/container.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/container.phtml
@@ -5,12 +5,15 @@
  */
 
 /** @var $block \Magento\Backend\Block\Widget\Form\Container */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?= /* @noEscape */ $block->getFormInitScripts() ?>
-<?php if ($block->getButtonsHtml('header')) : ?>
-    <div class="page-form-actions" <?= /* @noEscape */ $block->getUiId('content-header') ?>><?= $block->getButtonsHtml('header') ?></div>
+<?php if ($block->getButtonsHtml('header')): ?>
+    <div class="page-form-actions" <?= /* @noEscape */ $block->getUiId('content-header') ?>>
+        <?= $block->getButtonsHtml('header') ?>
+    </div>
 <?php endif; ?>
-<?php if ($block->getButtonsHtml('toolbar')) : ?>
+<?php if ($block->getButtonsHtml('toolbar')): ?>
     <div class="page-main-actions">
         <div class="page-actions">
             <div class="page-actions-buttons">
@@ -20,12 +23,12 @@
     </div>
 <?php endif; ?>
 <?= $block->getFormHtml() ?>
-<?php if ($block->hasFooterButtons()) : ?>
+<?php if ($block->hasFooterButtons()): ?>
     <div class="content-footer">
         <p class="form-buttons"><?= $block->getButtonsHtml('footer') ?></p>
     </div>
 <?php endif; ?>
-<script>
+<?php $scriptString = <<<script
 require([
     'jquery',
     'mage/backend/form',
@@ -34,7 +37,7 @@ require([
 
     $('#edit_form').form()
         .validation({
-            validationUrl: '<?= $block->escapeJs($block->getValidationUrl()) ?>',
+            validationUrl: '{$block->escapeJs($block->getValidationUrl())}',
             highlight: function(element) {
                 var detailsElement = $(element).closest('details');
                 if (detailsElement.length && detailsElement.is('.details')) {
@@ -48,5 +51,7 @@ require([
         });
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <?= /* @noEscape */ $block->getFormScripts() ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
index 3044985ef65f2..4ea657b14e2dd 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
@@ -284,67 +284,114 @@ $numColumns = count($block->getColumns());
         </table>
 
     </div>
-    <?php if ($block->canDisplayContainer()): ?>
 </div>
-<script>
+    <?php $jsonHelper = $block->getData('jsonHelper');
+    if ($block->canDisplayContainer()):
+        $scriptString = <<<script
     var deps = [];
-
-        <?php if ($block->getDependencyJsObject()): ?>
+script;
+        if ($block->getDependencyJsObject()):
+            $scriptString .= <<<script
     deps.push('uiRegistry');
-        <?php endif; ?>
+script;
+        endif;
 
-        <?php if (strpos($block->getRowClickCallback(), 'order.') !== false): ?>
+        if (strpos($block->getRowClickCallback(), 'order.') !== false):
+            $scriptString .= <<<script
     deps.push('Magento_Sales/order/create/form')
-        <?php endif; ?>
+script;
+        endif;
+        $scriptString .= <<<script
 
     deps.push('mage/adminhtml/grid');
+script;
+        if (is_array($block->getRequireJsDependencies())):
+            foreach ($block->getRequireJsDependencies() as $dependency):
+                $scriptString .= <<<script
+            deps.push('{$block->escapeJs($dependency)}');
+script;
+            endforeach;
+        endif;
+        $dependencyJsObject = ($block->getDependencyJsObject() ? 'registry' : '');
+        $scriptString .= <<<script
 
-        <?php if (is_array($block->getRequireJsDependencies())): ?>
-            <?php foreach ($block->getRequireJsDependencies() as $dependency): ?>
-            deps.push('<?= $block->escapeJs($dependency) ?>');
-            <?php endforeach; ?>
-        <?php endif; ?>
-
-    require(deps, function(<?= ($block->getDependencyJsObject() ? 'registry' : '') ?>){
-        <?php //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed ?>
+    require(deps, function({$dependencyJsObject}){
+script;
+        //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed
+        $scriptString .= <<<script
 
         //<![CDATA[
-        <?php if ($block->getDependencyJsObject()): ?>
-        registry.get('<?= $block->escapeJs($block->getDependencyJsObject())
-        ?>', function (<?= $block->escapeJs($block->getDependencyJsObject()) ?>) {
-        <?php endif; ?>
-    <?php // phpcs:disable ?>
-    <?= $block->escapeJs($block->getJsObjectName()) ?> = new varienGrid(<?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getId()) ?>, '<?= $block->escapeJs($block->getGridUrl()) ?>', '<?= $block->escapeJs($block->getVarNamePage()) ?>', '<?= $block->escapeJs($block->getVarNameSort()) ?>', '<?= $block->escapeJs($block->getVarNameDir()) ?>', '<?= $block->escapeJs($block->getVarNameFilter()) ?>');
-    <?php //phpcs:enable ?>
-        <?= $block->escapeJs($block->getJsObjectName()) ?>.useAjax = '<?= $block->escapeJs($block->getUseAjax()) ?>';
-        <?php if ($block->getRowClickCallback()): ?>
-            <?= $block->escapeJs($block->getJsObjectName())
-            ?>.rowClickCallback = <?= /* @noEscape */ $block->getRowClickCallback() ?>;
-        <?php endif; ?>
-        <?php if ($block->getCheckboxCheckCallback()): ?>
-            <?= $block->escapeJs($block->getJsObjectName())
-            ?>.checkboxCheckCallback = <?= /* @noEscape */ $block->getCheckboxCheckCallback() ?>;
-        <?php endif; ?>
-        <?php if ($block->getFilterKeyPressCallback()): ?>
-            <?= $block->escapeJs($block->getJsObjectName())
-            ?>.filterKeyPressCallback = <?= /* @noEscape */ $block->getFilterKeyPressCallback() ?>;
-        <?php endif; ?>
-        <?php if ($block->getRowInitCallback()): ?>
-            <?= $block->escapeJs($block->getJsObjectName())
-            ?>.initRowCallback = <?= /* @noEscape */ $block->getRowInitCallback() ?>;
-            <?= $block->escapeJs($block->getJsObjectName()) ?>.initGridRows();
-        <?php endif; ?>
-        <?php if ($block->getMassactionBlock() && $block->getMassactionBlock()->isAvailable()): ?>
-            <?= /* @noEscape */ $block->getMassactionBlock()->getJavaScript() ?>
-        <?php endif ?>
-        <?= /* @noEscape */ $block->getAdditionalJavaScript() ?>
+script;
+        if ($block->getDependencyJsObject()):
+            $scriptString .= <<<script
+
+        registry.get('{$block->escapeJs($block->getDependencyJsObject())}',
+         function ({$block->escapeJs($block->getDependencyJsObject())}) {
+script;
+        endif;
+        $encodedId = /* @noEscape */ $jsonHelper->jsonEncode($block->getId());
+        $scriptString .= <<<script
+
+    {$block->escapeJs($block->getJsObjectName())} = new varienGrid(
+        {$encodedId},
+         '{$block->escapeJs($block->getGridUrl())}',
+         '{$block->escapeJs($block->getVarNamePage())}',
+         '{$block->escapeJs($block->getVarNameSort())}',
+         '{$block->escapeJs($block->getVarNameDir())}',
+         '{$block->escapeJs($block->getVarNameFilter())}'
+         );
+
+        {$block->escapeJs($block->getJsObjectName())}.useAjax = '{$block->escapeJs($block->getUseAjax())}';
+
+script;
+        if ($block->getRowClickCallback()):
+            $rowClickCallback = /* @noEscape */ $block->getRowClickCallback();
+            $scriptString .= <<<script
+
+            {$block->escapeJs($block->getJsObjectName())}.rowClickCallback = {$rowClickCallback};
+script;
+        endif;
+        if ($block->getCheckboxCheckCallback()):
+            $checkboxCheckCallback = /* @noEscape */ $block->getCheckboxCheckCallback();
+            $scriptString .= <<<script
+
+            {$block->escapeJs($block->getJsObjectName())}.checkboxCheckCallback = {$checkboxCheckCallback};
+script;
+        endif;
+        if ($block->getFilterKeyPressCallback()):
+            $filterKeyPressCallback = /* @noEscape */ $block->getFilterKeyPressCallback();
+            $scriptString .= <<<script
+
+            {$block->escapeJs($block->getJsObjectName())}.filterKeyPressCallback = {$filterKeyPressCallback};
+script;
+        endif;
+        if ($block->getRowInitCallback()):
+            $rowInitCallback = /* @noEscape */ $block->getRowInitCallback();
+            $scriptString .= <<<script
+
+            {$block->escapeJs($block->getJsObjectName())}.initRowCallback = {$rowInitCallback};
+            {$block->escapeJs($block->getJsObjectName())}.initGridRows();
+
+script;
+        endif;
+        if ($block->getMassactionBlock() && $block->getMassactionBlock()->isAvailable()):
+            $scriptString .= /* @noEscape */ $block->getMassactionBlock()->getJavaScript() . PHP_EOL;
+        endif;
+        $scriptString .= /* @noEscape */ $block->getAdditionalJavaScript() . PHP_EOL;
+
+        if ($block->getDependencyJsObject()):
+            $scriptString .= <<<script
 
-        <?php if ($block->getDependencyJsObject()): ?>
         });
-        <?php endif; ?>
+script;
+        endif;
+        $scriptString .= <<<script
+
     //]]>
 
 });
-</script>
+script;
+        ?>
+        <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <?php endif; ?>
 <?php endif ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction_extended.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction_extended.phtml
index c0f30fc282f38..495cb572fe125 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction_extended.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction_extended.phtml
@@ -3,10 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <div id="<?= $block->getHtmlId() ?>" class="admin__grid-massaction">
 
-    <?php if ($block->getHideFormElement() !== true) : ?>
+    <?php if ($block->getHideFormElement() !== true): ?>
     <form action="" id="<?= $block->getHtmlId() ?>-form" method="post">
     <?php endif ?>
         <div class="admin__grid-massaction-form">
@@ -14,20 +16,25 @@
             <select
                 id="<?= $block->getHtmlId() ?>-select"
                 class="required-entry local-validation admin__control-select">
-                <option class="admin__control-select-placeholder" value="" selected><?= $block->escapeHtml(__('Actions')) ?></option>
-                <?php foreach ($block->getItems() as $_item) : ?>
-                    <option value="<?= $block->escapeHtmlAttr($_item->getId()) ?>"<?= ($_item->getSelected() ? ' selected="selected"' : '') ?>><?= $block->escapeHtml($_item->getLabel()) ?></option>
+                <option class="admin__control-select-placeholder" value="" selected>
+                    <?= $block->escapeHtml(__('Actions')) ?>
+                </option>
+                <?php foreach ($block->getItems() as $_item): ?>
+                    <option value="<?= $block->escapeHtmlAttr($_item->getId()) ?>"
+                        <?= ($_item->getSelected() ? ' selected="selected"' : '') ?>>
+                        <?= $block->escapeHtml($_item->getLabel()) ?>
+                    </option>
                 <?php endforeach; ?>
             </select>
             <span class="outer-span" id="<?= $block->getHtmlId() ?>-form-hiddens"></span>
             <span class="outer-span" id="<?= $block->getHtmlId() ?>-form-additional"></span>
             <?= $block->getApplyButtonHtml() ?>
         </div>
-    <?php if ($block->getHideFormElement() !== true) : ?>
+    <?php if ($block->getHideFormElement() !== true): ?>
     </form>
     <?php endif ?>
     <div class="no-display">
-        <?php foreach ($block->getItems() as $_item) : ?>
+        <?php foreach ($block->getItems() as $_item): ?>
             <div id="<?= $block->getHtmlId() ?>-item-<?= /* @noEscape */ $_item->getId() ?>-block">
                 <?= $_item->getAdditionalActionBlockHtml() ?>
             </div>
@@ -40,7 +47,7 @@
             data-menu="grid-mass-select">
             <optgroup label="<?= $block->escapeHtml(__('Mass Actions')) ?>">
                 <option disabled selected></option>
-            <?php if ($block->getUseSelectAll()) : ?>
+            <?php if ($block->getUseSelectAll()): ?>
                 <option value="selectAll">
                     <?= $block->escapeHtml(__('Select All')) ?>
                 </option>
@@ -58,33 +65,41 @@
         </select>
         <label for="<?= $block->getHtmlId() ?>-mass-select"></label>
     </div>
-<script>
+    <?php $scriptString = <<<script
     require(['jquery'], function($){
         'use strict';
-        $('#<?= $block->getHtmlId() ?>-mass-select').change(function () {
+        $('#{$block->getHtmlId()}-mass-select').change(function () {
             var massAction = $('option:selected', this).val();
             switch (massAction) {
-                <?php if ($block->getUseSelectAll()) : ?>
+script;
+    if ($block->getUseSelectAll()):
+        $scriptString .= <<<script
                 case 'selectAll':
-                    return <?= $block->escapeJs($block->getJsObjectName()) ?>.selectAll();
+                    return {$block->escapeJs($block->getJsObjectName())}.selectAll();
                     break;
                 case 'unselectAll':
-                    return <?= $block->escapeJs($block->getJsObjectName()) ?>.unselectAll();
+                    return {$block->escapeJs($block->getJsObjectName())}.unselectAll();
                     break;
-                <?php endif; ?>
+script;
+endif;
+    $scriptString .= <<<script
                 case 'selectVisible':
-                    return <?= $block->escapeJs($block->getJsObjectName()) ?>.selectVisible();
+                    return {$block->escapeJs($block->getJsObjectName())}.selectVisible();
                     break;
                 case 'unselectVisible':
-                    return <?= $block->escapeJs($block->getJsObjectName()) ?>.unselectVisible();
+                    return {$block->escapeJs($block->getJsObjectName())}.unselectVisible();
                     break;
             }
             this.blur();
         });
     });
-
-    <?php if (!$block->getParentBlock()->canDisplayContainer()) : ?>
-        <?= $block->escapeJs($block->getJsObjectName()) ?>.setGridIds('<?= /* @noEscape */ $block->getGridIdsJson() ?>');
-    <?php endif; ?>
-</script>
+script;
+    if (!$block->getParentBlock()->canDisplayContainer()):
+        $gridIdsJson = /* @noEscape */ $block->getGridIdsJson();
+        $scriptString .= <<<script
+        {$block->escapeJs($block->getJsObjectName())}.setGridIds('{$gridIdsJson}');
+script;
+    endif;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 </div>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml
index 498b403508f2c..4ebf586fce533 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml
@@ -80,7 +80,7 @@
                 <?php endif; ?>
                 <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
                     'display:none',
-                    'div#' . $block->escapeHtmlAttr($block->getTabId($_tab))
+                    'div#' . $block->escapeHtmlAttr($block->getTabId($_tab)) . '_content'
                 ); ?>
             </li>
         <?php endforeach; ?>
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
index 7d6db21fd4cef..4433dc80a0fa3 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
@@ -85,10 +85,8 @@ public function __construct(
         $this->_resourceHelper = $resourceHelper;
         $this->_backendSession = $backendSession;
         parent::__construct($context, $categoryTree, $registry, $categoryFactory, $data);
-        $secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
-        $random = $random ?? ObjectManager::getInstance()->get(Random::class);
-        $this->secureRenderer = $secureRenderer;
-        $this->random = $random;
+        $this->secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+        $this->random = $random ?? ObjectManager::getInstance()->get(Random::class);
     }
 
     /**
diff --git a/app/code/Magento/CatalogUrlRewrite/etc/adminhtml/system.xml b/app/code/Magento/CatalogUrlRewrite/etc/adminhtml/system.xml
index 75d395473f969..ccd077e615221 100644
--- a/app/code/Magento/CatalogUrlRewrite/etc/adminhtml/system.xml
+++ b/app/code/Magento/CatalogUrlRewrite/etc/adminhtml/system.xml
@@ -32,7 +32,7 @@
                     <label>Generate "category/product" URL Rewrites</label>
                     <backend_model>Magento\CatalogUrlRewrite\Model\TableCleaner</backend_model>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <comment><![CDATA[<strong style="color:red">Warning!</strong> Turning this option off will result in permanent removal of category/product URL rewrites without an ability to restore them.]]></comment>
+                    <comment><![CDATA[<strong class="colorRed">Warning!</strong> Turning this option off will result in permanent removal of category/product URL rewrites without an ability to restore them.]]></comment>
                     <frontend_class>generate_category_product_rewrites</frontend_class>
                 </field>
             </group>
diff --git a/app/code/Magento/CatalogUrlRewrite/i18n/en_US.csv b/app/code/Magento/CatalogUrlRewrite/i18n/en_US.csv
index 7f1e1cd086408..0def4f6de32eb 100644
--- a/app/code/Magento/CatalogUrlRewrite/i18n/en_US.csv
+++ b/app/code/Magento/CatalogUrlRewrite/i18n/en_US.csv
@@ -9,4 +9,4 @@
 "URL key ""%1"" matches a reserved endpoint name (%2). Use another URL key.","URL key ""%1"" matches a reserved endpoint name (%2). Use another URL key."
 "Invalid URL key. The ""%1"" URL key can not be used to generate Latin URL key. Please use Latin letters and numbers to avoid generating URL key issues.","Invalid URL key. The ""%1"" URL key can not be used to generate Latin URL key. Please use Latin letters and numbers to avoid generating URL key issues."
 "Invalid URL key. The ""%1"" category name can not be used to generate Latin URL key. Please add URL key or change category name using Latin letters and numbers to avoid generating URL key issues.","Invalid URL key. The ""%1"" category name can not be used to generate Latin URL key. Please add URL key or change category name using Latin letters and numbers to avoid generating URL key issues."
-"<strong style=""color:red"">Warning!</strong> Turning this option off will result in permanent removal of category/product URL rewrites without an ability to restore them.","<strong style=""color:red"">Warning!</strong> Turning this option off will result in permanent removal of category/product URL rewrites without an ability to restore them."
+"<strong class=""colorRed"">Warning!</strong> Turning this option off will result in permanent removal of category/product URL rewrites without an ability to restore them.","<strong style=""color:red"">Warning!</strong> Turning this option off will result in permanent removal of category/product URL rewrites without an ability to restore them."
diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field.php b/app/code/Magento/Config/Block/System/Config/Form/Field.php
index 026cdce679731..9801467a4cf61 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Field.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Field.php
@@ -135,7 +135,7 @@ protected function _renderInheritCheckbox(\Magento\Framework\Data\Form\Element\A
         $html .= /* @noEscape */ $this->secureRenderer->renderEventListenerAsTag(
             'onclick',
             "toggleValueElements(this, Element.previous(this.parentNode))",
-            'input#' . $htmlId
+            'input#' . $htmlId . '_inherit'
         );
         $html .= '<label for="' . $htmlId . '_inherit" class="inherit">' . $this->_getInheritCheckboxLabel(
             $element
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 d2681f6fa1836..20b6408eebe82 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Fieldset.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Fieldset.php
@@ -175,9 +175,9 @@ protected function _getHeaderTitleHtml($element)
             '-link">' . $element->getLegend() . '</a>' .
             /* @noEscape */ $this->secureRenderer->renderEventListenerAsTag(
                 'onclick',
-                "Fieldset.toggleCollapse(\'' . $element->getHtmlId() . '\', \'' .
-                 $this->_urlBuilder->getUrl('*/*/state') . '\'); return false;",
-                'a#' . $element->getHtmlId()
+                "Fieldset.toggleCollapse('" . $element->getHtmlId() . "', '" .
+                 $this->_urlBuilder->getUrl('*/*/state') . "'); return false;",
+                'a#' . $element->getHtmlId() . '-head'
             );
     }
 
diff --git a/app/code/Magento/Cookie/etc/adminhtml/system.xml b/app/code/Magento/Cookie/etc/adminhtml/system.xml
index d1dcbf45ae5be..c12ba742f3f11 100644
--- a/app/code/Magento/Cookie/etc/adminhtml/system.xml
+++ b/app/code/Magento/Cookie/etc/adminhtml/system.xml
@@ -25,7 +25,7 @@
                 <field id="cookie_httponly" translate="label comment" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Use HTTP Only</label>
                     <comment>
-                        <![CDATA[<strong style="color:red">Warning</strong>:  Do not set to "No". User security could be compromised.]]>
+                        <![CDATA[<strong class="colorRed">Warning</strong>:  Do not set to "No". User security could be compromised.]]>
                     </comment>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml
index 55195698c5dc8..cde9ef3614c7f 100644
--- a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml
+++ b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml
@@ -6,6 +6,7 @@
 
 /**
  * @var $block \Magento\CurrencySymbol\Block\Adminhtml\System\Currencysymbol
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
 
@@ -31,9 +32,6 @@
                     ?>
                     <input id="custom_currency_symbol_inherit<?= $block->escapeHtmlAttr($code) ?>"
                            class="admin__control-checkbox" type="checkbox"
-                           <?php //@codingStandardsIgnoreStart ?>
-                           onclick="toggleUseDefault(<?= '\'' . $escapedCode . '\',\'' . $escapedSymbol . '\'' ?>)"
-                            <?php //@codingStandardsIgnoreEnd ?>
                             <?= $data['inherited'] ? ' checked="checked"' : '' ?>
                            value="1"
                            name="inherit_custom_currency_symbol[<?= $block->escapeHtmlAttr($code) ?>]">
@@ -43,6 +41,11 @@
                             <?= $block->escapeHtml($block->getInheritText()) ?>
                         </span>
                     </label>
+                    <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                        'onclick',
+                        "toggleUseDefault('" . $escapedCode . "','" . $escapedSymbol . "')",
+                        'custom_currency_symbol_inherit' . $block->escapeHtmlAttr($code)
+                    ) ?>
                 </div>
             </div>
         </div>
diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml
index 18b3c7eef746d..bbc2f95825127 100644
--- a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml
+++ b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml
@@ -6,15 +6,20 @@
 
 /**
  * @var $block \Magento\CurrencySymbol\Block\Adminhtml\System\Currency\Rate\Matrix
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 
 $_oldRates = $block->getOldRates();
 $_newRates = $block->getNewRates();
 $_rates = ($_newRates) ? $_newRates : $_oldRates;
 ?>
-<?php if (empty($_rates)) : ?>
-    <div class="message message-warning warning"><p><?= $block->escapeHtml(__('You must first configure currency options before being able to see currency rates.')) ?></p></div>
-<?php else : ?>
+<?php if (empty($_rates)): ?>
+    <div class="message message-warning warning"><p>
+            <?= $block->escapeHtml(
+                __('You must first configure currency options before being able to see currency rates.')
+            ) ?></p>
+    </div>
+<?php else: ?>
     <form name="rateForm" id="rate-form" method="post" action="<?= $block->escapeUrl($block->getRatesFormAction()) ?>">
         <?= $block->getBlockHtml('formkey') ?>
         <div class="admin__control-table-wrapper">
@@ -22,36 +27,53 @@ $_rates = ($_newRates) ? $_newRates : $_oldRates;
                 <thead>
                     <tr>
                         <th>&nbsp;</th>
-                        <?php $_i = 0; foreach ($block->getAllowedCurrencies() as $_currencyCode) : ?>
+                        <?php $_i = 0; foreach ($block->getAllowedCurrencies() as $_currencyCode): ?>
                             <th><span><?= $block->escapeHtml($_currencyCode) ?></span></th>
                         <?php endforeach; ?>
                     </tr>
                 </thead>
-                <?php $_j = 0; foreach ($block->getDefaultCurrencies() as $_currencyCode) : ?>
+                <?php $_j = 0; foreach ($block->getDefaultCurrencies() as $_currencyCode): ?>
                 <tr>
-                    <?php if (isset($_rates[$_currencyCode]) && is_array($_rates[$_currencyCode])) : ?>
-                        <?php foreach ($_rates[$_currencyCode] as $_rate => $_value) : ?>
-                            <?php if (++$_j == 1) : ?>
-                                <td><span class="admin__control-support-text"><?= $block->escapeHtml($_currencyCode) ?></span></td>
+                    <?php if (isset($_rates[$_currencyCode]) && is_array($_rates[$_currencyCode])): ?>
+                        <?php foreach ($_rates[$_currencyCode] as $_rate => $_value): ?>
+                            <?php if (++$_j == 1): ?>
+                                <td><span class="admin__control-support-text"><?= $block->escapeHtml($_currencyCode) ?>
+                                    </span></td>
                                 <td>
                                     <input type="text"
-                                           name="rate[<?= $block->escapeHtmlAttr($_currencyCode) ?>][<?= $block->escapeHtmlAttr($_rate) ?>]"
-                                           value="<?= ($_currencyCode == $_rate) ? '1.0000' : ($_value>0 ? $block->escapeHtmlAttr($_value) : (isset($_oldRates[$_currencyCode][$_rate]) ? $block->escapeHtmlAttr($_oldRates[$_currencyCode][$_rate]) : '')) ?>"
+                                           name="rate[<?= $block->escapeHtmlAttr($_currencyCode)
+                                            ?>][<?= $block->escapeHtmlAttr($_rate) ?>]"
+                                           value="<?= ($_currencyCode == $_rate) ? '1.0000' :
+                                               ($_value>0 ? $block->escapeHtmlAttr($_value) :
+                                                   (isset($_oldRates[$_currencyCode][$_rate]) ?
+                                                       $block->escapeHtmlAttr($_oldRates[$_currencyCode][$_rate]) : ''))
+                                                    ?>"
                                            class="admin__control-text"
                                             <?= ($_currencyCode == $_rate) ? ' disabled' : '' ?> />
-                                    <?php if (isset($_newRates) && $_currencyCode != $_rate && isset($_oldRates[$_currencyCode][$_rate])) : ?>
-                                    <div class="admin__field-note"><?= $block->escapeHtml(__('Old rate:')) ?> <strong><?= $block->escapeHtml($_oldRates[$_currencyCode][$_rate]) ?></strong></div>
+                                    <?php if (isset($_newRates) && $_currencyCode != $_rate &&
+                                        isset($_oldRates[$_currencyCode][$_rate])): ?>
+                                    <div class="admin__field-note"><?= $block->escapeHtml(__('Old rate:')) ?>
+                                        <strong><?= $block->escapeHtml($_oldRates[$_currencyCode][$_rate]) ?></strong>
+                                    </div>
                                     <?php endif; ?>
                                 </td>
-                            <?php else : ?>
+                            <?php else: ?>
                                 <td>
                                     <input type="text"
-                                           name="rate[<?= $block->escapeHtmlAttr($_currencyCode) ?>][<?= $block->escapeHtmlAttr($_rate) ?>]"
-                                           value="<?= ($_currencyCode == $_rate) ? '1.0000' : ($_value>0 ? $block->escapeHtmlAttr($_value) : (isset($_oldRates[$_currencyCode][$_rate]) ? $block->escapeHtmlAttr($_oldRates[$_currencyCode][$_rate]) : '')) ?>"
+                                           name="rate[<?= $block->escapeHtmlAttr($_currencyCode)
+                                            ?>][<?= $block->escapeHtmlAttr($_rate) ?>]"
+                                           value="<?= ($_currencyCode == $_rate) ? '1.0000' :
+                                               ($_value>0 ? $block->escapeHtmlAttr($_value) :
+                                                   (isset($_oldRates[$_currencyCode][$_rate]) ?
+                                                       $block->escapeHtmlAttr($_oldRates[$_currencyCode][$_rate]) : ''))
+                                                    ?>"
                                            class="admin__control-text"
                                            <?= ($_currencyCode == $_rate) ? ' disabled' : '' ?> />
-                                    <?php if (isset($_newRates) && $_currencyCode != $_rate && isset($_oldRates[$_currencyCode][$_rate])) : ?>
-                                    <div class="admin__field-note"><?= $block->escapeHtml(__('Old rate:')) ?> <strong><?= $block->escapeHtml($_oldRates[$_currencyCode][$_rate]) ?></strong></div>
+                                    <?php if (isset($_newRates) && $_currencyCode != $_rate &&
+                                        isset($_oldRates[$_currencyCode][$_rate])): ?>
+                                    <div class="admin__field-note"><?= $block->escapeHtml(__('Old rate:')) ?>
+                                        <strong><?= $block->escapeHtml($_oldRates[$_currencyCode][$_rate]) ?></strong>
+                                    </div>
                                     <?php endif; ?>
                                 </td>
                             <?php endif; ?>
@@ -64,10 +86,12 @@ $_rates = ($_newRates) ? $_newRates : $_oldRates;
         </div>
     </form>
 <?php endif; ?>
-<script>
+<?php $scriptString = <<<script
 require(['jquery', "mage/mage"], function(jQuery){
 
     jQuery('#rate-form').mage('form').mage('validation');
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Region.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Region.php
index 0aeed1562c51e..afe040ee28a95 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Region.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Region.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Customer\Block\Adminhtml\Edit\Renderer;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 /**
  * Customer address region field renderer
  */
@@ -16,18 +19,26 @@ class Region extends \Magento\Backend\Block\AbstractBlock implements
      */
     protected $_directoryHelper;
 
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
     /**
      * @param \Magento\Backend\Block\Context $context
      * @param \Magento\Directory\Helper\Data $directoryHelper
      * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
         \Magento\Directory\Helper\Data $directoryHelper,
-        array $data = []
+        array $data = [],
+        ?SecureHtmlRenderer $secureRenderer = null
     ) {
         $this->_directoryHelper = $directoryHelper;
         parent::__construct($context, $data);
+        $this->secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
     }
 
     /**
@@ -60,14 +71,15 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
             $selectId .
             '" name="' .
             $selectName .
-            '" class="select required-entry admin__control-select" style="display:none">';
+            '" class="select required-entry admin__control-select">';
         $html .= '<option value="">' . __('Please select') . '</option>';
         $html .= '</select>';
+        $html .= $this->secureRenderer->renderStyleAsTag("display:none", '#region');
 
-        $html .= '<script>' . "\n";
-        $html .= 'require(["prototype", "mage/adminhtml/form"], function(){';
-        $html .= '$("' . $selectId . '").setAttribute("defaultValue", "' . $regionId . '");' . "\n";
-        $html .= 'new regionUpdater("' .
+        $scriptString = "\n";
+        $scriptString .= 'require(["prototype", "mage/adminhtml/form"], function(){';
+        $scriptString .= '$("' . $selectId . '").setAttribute("defaultValue", "' . $regionId . '");' . "\n";
+        $scriptString .= 'new regionUpdater("' .
             $country->getHtmlId() .
             '", "' .
             $element->getHtmlId() .
@@ -78,8 +90,9 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
             ');' .
             "\n";
 
-        $html .= '});';
-        $html .= '</script>' . "\n";
+        $scriptString .= '});';
+        $scriptString .= "\n";
+        $html .= $this->secureRenderer->renderTag('script', [], $scriptString, false);
 
         $html .= '</div></div>' . "\n";
 
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php b/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php
index 9ee856f6e0af9..ebdf0090fe1c8 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php
@@ -5,7 +5,9 @@
  */
 namespace Magento\Customer\Block\Adminhtml\Sales\Order\Address\Form\Renderer;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
 /**
  * VAT ID element renderer
@@ -31,18 +33,26 @@ class Vat extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element
      */
     protected $_jsonEncoder;
 
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Framework\Json\EncoderInterface $jsonEncoder,
-        array $data = []
+        array $data = [],
+        ?SecureHtmlRenderer $secureRenderer = null
     ) {
         $this->_jsonEncoder = $jsonEncoder;
         parent::__construct($context, $data);
+        $this->secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
     }
 
     /**
@@ -95,11 +105,8 @@ public function getValidateButton()
             );
 
             $optionsVarName = $this->getJsVariablePrefix() . 'VatParameters';
-            $beforeHtml = '<script>var ' .
-                $optionsVarName .
-                ' = ' .
-                $vatValidateOptions .
-                ';</script>';
+            $scriptString = 'var ' . $optionsVarName . ' = ' . $vatValidateOptions . ';';
+            $beforeHtml = $this->secureRenderer->renderTag('script', [], $scriptString, false);
             $this->_validateButton = $this->getLayout()->createBlock(
                 \Magento\Backend\Block\Widget\Button::class
             )->setData(
@@ -110,6 +117,7 @@ public function getValidateButton()
                 ]
             );
         }
+
         return $this->_validateButton;
     }
 }
diff --git a/app/code/Magento/Customer/Block/Form/Register.php b/app/code/Magento/Customer/Block/Form/Register.php
index 46d1088e37d0f..b62537495f2c6 100644
--- a/app/code/Magento/Customer/Block/Form/Register.php
+++ b/app/code/Magento/Customer/Block/Form/Register.php
@@ -7,6 +7,7 @@
 
 use Magento\Customer\Model\AccountManagement;
 use Magento\Framework\App\ObjectManager;
+use Magento\Customer\Helper\Address as AddressHelper;
 use Magento\Newsletter\Model\Config;
 
 /**
@@ -72,6 +73,7 @@ public function __construct(
         $this->_moduleManager = $moduleManager;
         $this->_customerSession = $customerSession;
         $this->newsLetterConfig = $newsLetterConfig ?: ObjectManager::getInstance()->get(Config::class);
+        $data['addressHelper'] = ObjectManager::getInstance()->get(AddressHelper::class);
         parent::__construct(
             $context,
             $directoryHelper,
diff --git a/app/code/Magento/Customer/view/adminhtml/templates/tab/cart.phtml b/app/code/Magento/Customer/view/adminhtml/templates/tab/cart.phtml
index 434e5606cd032..81ad513351841 100644
--- a/app/code/Magento/Customer/view/adminhtml/templates/tab/cart.phtml
+++ b/app/code/Magento/Customer/view/adminhtml/templates/tab/cart.phtml
@@ -5,39 +5,41 @@
  */
 
 /* @var \Magento\Customer\Block\Adminhtml\Edit\Tab\Cart $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<?php if ($block->getCartHeader()) : ?>
+<?php if ($block->getCartHeader()): ?>
 <div class="content-header skip-header">
     <table>
         <tr>
-            <td style="width:50%;"><h4><?= $block->escapeHtml($block->getCartHeader()) ?></h4></td>
+            <td><h4><?= $block->escapeHtml($block->getCartHeader()) ?></h4></td>
         </tr>
     </table>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("width:50%;", 'div.content-header.skip-header table tr td') ?>
 </div>
 <?php endif ?>
 <?= $block->getGridParentHtml() ?>
-<?php if ($block->canDisplayContainer()) : ?>
+<?php if ($block->canDisplayContainer()): ?>
     <?php $listType = $block->getJsObjectName(); ?>
-    <script>
+    <?php $scriptString = <<<script
         require([
             "Magento_Ui/js/modal/alert",
             "Magento_Ui/js/modal/confirm",
             "Magento_Catalog/catalog/product/composite/configure"
         ], function(alert, confirm){
 
-        <?= $block->escapeJs($block->getJsObjectName()) ?>cartControl = {
+        {$block->escapeJs($block->getJsObjectName())}cartControl = {
             reload: function (params) {
             if (!params) {
                 params = {};
             }
-            <?= $block->escapeJs($block->getJsObjectName()) ?>.reloadParams = params;
-            <?= $block->escapeJs($block->getJsObjectName()) ?>.reload();
-            <?= $block->escapeJs($block->getJsObjectName()) ?>.reloadParams = {};
+            {$block->escapeJs($block->getJsObjectName())}.reloadParams = params;
+            {$block->escapeJs($block->getJsObjectName())}.reload();
+            {$block->escapeJs($block->getJsObjectName())}.reloadParams = {};
         },
 
         configureItem: function (itemId) {
-            productConfigure.setOnLoadIFrameCallback('<?= $block->escapeJs($listType) ?>', this.cbOnLoadIframe.bind(this));
-            productConfigure.showItemConfiguration('<?= $block->escapeJs($listType) ?>', itemId);
+            productConfigure.setOnLoadIFrameCallback('{$block->escapeJs($listType)}', this.cbOnLoadIframe.bind(this));
+            productConfigure.showItemConfiguration('{$block->escapeJs($listType)}', itemId);
             return false;
         },
 
@@ -53,14 +55,14 @@
 
             if (!itemId) {
                 alert({
-                    content: '<?= $block->escapeJs(__('No item specified.')) ?>'
+                    content: '{$block->escapeJs(__('No item specified.'))}'
                 });
 
                 return false;
             }
 
             confirm({
-                content: '<?= $block->escapeJs(__('Are you sure you want to remove this item?')) ?>',
+                content: '{$block->escapeJs(__('Are you sure you want to remove this item?'))}',
                 actions: {
                     confirm: function(){
                         self.reload({'delete':itemId});
@@ -70,21 +72,24 @@
         }
     };
 
-    <?php
+script;
+
     $params = [
         'customer_id' => $block->getCustomerId(),
         'website_id' => $block->getWebsiteId(),
     ];
-    ?>
+    $scriptString .= <<<script
     productConfigure.addListType(
-        '<?= $block->escapeJs($listType) ?>',
+        '{$block->escapeJs($listType)}',
         {
-            urlFetch: '<?= $block->escapeJs($block->escapeUrl($block->getUrl('customer/cart_product_composite_cart/configure', $params))) ?>',
-            urlConfirm: '<?= $block->escapeJs($block->escapeUrl($block->getUrl('customer/cart_product_composite_cart/update', $params))) ?>'
+            urlFetch: '{$block->escapeJs($block->getUrl('customer/cart_product_composite_cart/configure', $params))}',
+            urlConfirm: '{$block->escapeJs($block->getUrl('customer/cart_product_composite_cart/update', $params))}'
         }
     );
 
     });
-    </script>
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <?php endif ?>
 <br />
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 e7519c7c3320b..7f09361e4d505 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
@@ -7,6 +7,7 @@
 /** @var \Magento\Customer\Block\Address\Edit $block */
 /** @var \Magento\Customer\ViewModel\Address $viewModel */
 /** @var \Magento\Framework\Escaper $escaper */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 $viewModel = $block->getViewModel();
 ?>
 <?php $_company = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Company::class) ?>
@@ -152,9 +153,10 @@ $viewModel = $block->getViewModel();
                        id="zip"
                        class="input-text validate-zip-international
                         <?= $escaper->escapeHtmlAttr($_postcodeValidationClass) ?>">
-                <div role="alert" class="message warning" style="display:none">
+                <div role="alert" class="message warning">
                     <span></span>
                 </div>
+                <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display: none;", 'div.message.warning') ?>
             </div>
         </div>
 
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 89b86f8af8e55..5b877500aa0c8 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
@@ -7,6 +7,7 @@
 use Magento\Customer\Block\Widget\Name;
 
 /** @var \Magento\Customer\Block\Form\Edit $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <form class="form form-edit-account"
       action="<?= $block->escapeUrl($block->getUrl('customer/account/editPost')) ?>"
@@ -117,16 +118,19 @@ use Magento\Customer\Block\Widget\Name;
         </div>
     </div>
 </form>
-<script>
+<?php $ignore = /* @noEscape */ $_dob->isEnabled() ? '\'input[id$="full"]\'' : 'null';
+$scriptString = <<<script
     require([
         "jquery",
         "mage/mage"
     ], function($){
         var dataForm = $('#form-validate');
-        var ignore = <?= /* @noEscape */ $_dob->isEnabled() ? '\'input[id$="full"]\'' : 'null' ?>;
+        var ignore = {$ignore};
 
         dataForm.mage('validation', {
-        <?php if ($_dob->isEnabled()): ?>
+script;
+if ($_dob->isEnabled()):
+    $scriptString .= <<<script
             errorPlacement: function(error, element) {
                 if (element.prop('id').search('full') !== -1) {
                     var dobElement = $(element).parents('.customer-dob'),
@@ -140,13 +144,19 @@ use Magento\Customer\Block\Widget\Name;
                 }
             },
             ignore: ':hidden:not(' + ignore + ')'
-        <?php else: ?>
+script;
+else:
+    $scriptString .= <<<script
             ignore: ignore ? ':hidden:not(' + ignore + ')' : ':hidden'
-        <?php endif ?>
+script;
+endif;
+$scriptString .= <<<script
         });
 
     });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <?php $changeEmailAndPasswordTitle = $block->escapeHtml(__('Change Email and Password')) ?>
 <script type="text/x-magento-init">
     {
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 f7d10f6df1728..7ae8d963aafbb 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
@@ -3,13 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundHelper
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 
 use Magento\Customer\Helper\Address;
 
 /** @var \Magento\Customer\Block\Form\Register $block */
 /** @var \Magento\Framework\Escaper $escaper */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+
+$addressHelper = $block->getData('adressHelper');
 $formData = $block->getFormData();
 ?>
 <?php $displayAll = $block->getConfig('general/region/display_all'); ?>
@@ -65,9 +66,9 @@ $formData = $block->getFormData();
         <?php endif ?>
     </fieldset>
     <?php if ($block->getShowAddressFields()): ?>
-        <?php $cityValidationClass = $this->helper(Address::class)->getAttributeValidationClass('city'); ?>
-        <?php $postcodeValidationClass = $this->helper(Address::class)->getAttributeValidationClass('postcode'); ?>
-        <?php $regionValidationClass = $this->helper(Address::class)->getAttributeValidationClass('region'); ?>
+        <?php $cityValidationClass = $addressHelper->getAttributeValidationClass('city'); ?>
+        <?php $postcodeValidationClass = $addressHelper->getAttributeValidationClass('postcode'); ?>
+        <?php $regionValidationClass = $addressHelper->getAttributeValidationClass('region'); ?>
         <fieldset class="fieldset address">
             <legend class="legend"><span><?= $escaper->escapeHtml(__('Address Information')) ?></span></legend><br>
             <input type="hidden" name="create_address" value="1" />
@@ -88,8 +89,7 @@ $formData = $block->getFormData();
             <?php endif ?>
 
             <?php
-                $_streetValidationClass = $this->helper(Address::class)
-                    ->getAttributeValidationClass('street');
+                $_streetValidationClass = $addressHelper->getAttributeValidationClass('street');
             ?>
 
             <div class="field street required">
@@ -106,7 +106,7 @@ $formData = $block->getFormData();
                     <div class="nested">
                         <?php
                             $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass));
-                            $streetLines = $this->helper(Address::class)->getStreetLines();
+                            $streetLines = $addressHelper->getStreetLines();
                         ?>
                         <?php for ($_i = 2, $_n = $streetLines; $_i <= $_n; $_i++): ?>
                             <div class="field additional">
@@ -144,19 +144,19 @@ $formData = $block->getFormData();
                     <select id="region_id"
                             name="region_id"
                             title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>"
-                            class="validate-select region_id"
-                            style="display: none;">
+                            class="validate-select region_id">
                         <option value="">
                             <?= $escaper->escapeHtml(__('Please select a region, state or province.')) ?>
                         </option>
                     </select>
+                    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display: none;", 'select#region_id') ?>
                     <input type="text"
                            id="region"
                            name="region"
                            value="<?= $escaper->escapeHtml($block->getRegion()) ?>"
                            title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>"
-                           class="input-text <?= $escaper->escapeHtmlAttr($regionValidationClass) ?>"
-                           style="display:none;">
+                           class="input-text <?= $escaper->escapeHtmlAttr($regionValidationClass) ?>">
+                    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display: none;", 'input#region') ?>
                 </div>
             </div>
 
@@ -273,17 +273,20 @@ $formData = $block->getFormData();
         </div>
     </div>
 </form>
-<script>
+<?php $ignore = /* @noEscape */ $_dob->isEnabled() ? '\'input[id$="full"]\'' : 'null';
+$scriptString = <<<script
 require([
     'jquery',
     'mage/mage'
 ], function($){
 
     var dataForm = $('#form-validate');
-    var ignore = <?= /* @noEscape */ $_dob->isEnabled() ? '\'input[id$="full"]\'' : 'null' ?>;
+    var ignore = {$ignore};
 
     dataForm.mage('validation', {
-    <?php if ($_dob->isEnabled()): ?>
+script;
+if ($_dob->isEnabled()):
+    $scriptString .= <<<script
         errorPlacement: function(error, element) {
             if (element.prop('id').search('full') !== -1) {
                 var dobElement = $(element).parents('.customer-dob'),
@@ -297,9 +300,13 @@ require([
             }
         },
         ignore: ':hidden:not(' + ignore + ')'
-    <?php else: ?>
+script;
+else:
+    $scriptString .= <<<script
         ignore: ignore ? ':hidden:not(' + ignore + ')' : ':hidden'
-    <?php endif ?>
+script;
+endif;
+$scriptString .= <<<script
     }).find('input:text').attr('autocomplete', 'off');
     dataForm.submit(function () {
         $(this).find(':submit').attr('disabled', 'disabled');
@@ -309,8 +316,15 @@ require([
     });
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <?php if ($block->getShowAddressFields()): ?>
+    <?php
+    $regionJson = /* @noEscape */ $addressHelper->getRegionJson();
+    $regionId = (int) $formData->getRegionId();
+    $countriesWithOptionalZip = /* @noEscape */ $addressHelper->getCountriesWithOptionalZip(true);
+    ?>
 <script type="text/x-magento-init">
     {
         "#country": {
@@ -320,11 +334,9 @@ require([
                 "regionInputId": "#region",
                 "postcodeId": "#zip",
                 "form": "#form-validate",
-                "regionJson": <?= /* @noEscape */ $this->helper(\Magento\Directory\Helper\Data::class)
-                    ->getRegionJson() ?>,
-                "defaultRegion": "<?= (int) $formData->getRegionId() ?>",
-                "countriesWithOptionalZip": <?= /* @noEscape */ $this->helper(\Magento\Directory\Helper\Data::class)
-                    ->getCountriesWithOptionalZip(true) ?>
+                "regionJson": {$regionJson},
+                "defaultRegion": "{$regionId}",
+                "countriesWithOptionalZip": {$countriesWithOptionalZip}
             }
         }
     }
diff --git a/app/code/Magento/Developer/Model/TemplateEngine/Decorator/DebugHints.php b/app/code/Magento/Developer/Model/TemplateEngine/Decorator/DebugHints.php
index c689bc7aee80a..f331923f4b696 100644
--- a/app/code/Magento/Developer/Model/TemplateEngine/Decorator/DebugHints.php
+++ b/app/code/Magento/Developer/Model/TemplateEngine/Decorator/DebugHints.php
@@ -8,6 +8,10 @@
 
 namespace Magento\Developer\Model\TemplateEngine\Decorator;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Math\Random;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 /**
  * Decorates block with block and template hints
  *
@@ -26,20 +30,39 @@ class DebugHints implements \Magento\Framework\View\TemplateEngineInterface
      */
     private $_showBlockHints;
 
+    /**
+     * @var SecureHtmlRenderer
+     */
+    protected $secureRenderer;
+
+    /**
+     * @var Random
+     */
+    private $random;
+
     /**
      * @param \Magento\Framework\View\TemplateEngineInterface $subject
      * @param bool $showBlockHints Whether to include block into the debugging information or not
+     * @param SecureHtmlRenderer|null $secureRenderer
+     * @param Random|null $random
      */
-    public function __construct(\Magento\Framework\View\TemplateEngineInterface $subject, $showBlockHints)
-    {
+    public function __construct(
+        \Magento\Framework\View\TemplateEngineInterface $subject,
+        $showBlockHints,
+        ?SecureHtmlRenderer $secureRenderer = null,
+        ?Random $random = null
+    ) {
         $this->_subject = $subject;
         $this->_showBlockHints = $showBlockHints;
+        $this->random = $random ?? ObjectManager::getInstance()->get(Random::class);
+        $this->secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
     }
 
     /**
      * Insert debugging hints into the rendered block contents
      *
-     * {@inheritdoc}
+     * Insert debugging hints into the rendered block contents
+     * @inheritdoc
      */
     public function render(\Magento\Framework\View\Element\BlockInterface $block, $templateFile, array $dictionary = [])
     {
@@ -60,14 +83,33 @@ public function render(\Magento\Framework\View\Element\BlockInterface $block, $t
      */
     protected function _renderTemplateHints($blockHtml, $templateFile)
     {
-        // @codingStandardsIgnoreStart
-        return <<<HTML
-<div class="debugging-hints" style="position: relative; border: 1px dotted red; margin: 6px 2px; padding: 18px 2px 2px 2px;">
-<div class="debugging-hint-template-file" style="position: absolute; top: 0; padding: 2px 5px; font: normal 11px Arial; background: red; left: 0; color: white; white-space: nowrap;" onmouseover="this.style.zIndex = 999;" onmouseout="this.style.zIndex = 'auto';" title="{$templateFile}">{$templateFile}</div>
+        $hintsId = 'hintsId_' .$this->random->getRandomString(32);
+        $hintsTemplateFileId = 'hintsTemplateFileId_' .$this->random->getRandomString(32);
+
+        $scriptString = <<<HTML
+<div class="debugging-hints" id="{$hintsId}">
+<div class="debugging-hint-template-file" id="{$hintsTemplateFileId}" title="{$templateFile}">{$templateFile}</div>
 {$blockHtml}
 </div>
 HTML;
-        // @codingStandardsIgnoreEnd
+
+        return $scriptString .
+            $this->secureRenderer->renderStyleAsTag(
+                "position: relative; border: 1px dotted red; margin: 6px 2px; padding: 18px 2px 2px 2px;",
+                '#' . $hintsId
+            ) . $this->secureRenderer->renderStyleAsTag(
+                "position: absolute; top: 0; padding: 2px 5px; font: normal 11px Arial; background: red; left: 0;" .
+                " color: white; white-space: nowrap;",
+                '#' . $hintsTemplateFileId
+            ) . $this->secureRenderer->renderEventListenerAsTag(
+                'onmouseover',
+                "this.style.zIndex = 999;",
+                '#' . $hintsTemplateFileId
+            ) . $this->secureRenderer->renderEventListenerAsTag(
+                'onmouseout',
+                "this.style.zIndex = 'auto';",
+                '#' . $hintsTemplateFileId
+            );
     }
 
     /**
@@ -80,11 +122,25 @@ protected function _renderTemplateHints($blockHtml, $templateFile)
     protected function _renderBlockHints($blockHtml, \Magento\Framework\View\Element\BlockInterface $block)
     {
         $blockClass = get_class($block);
-        // @codingStandardsIgnoreStart
-        return <<<HTML
-<div class="debugging-hint-block-class" style="position: absolute; top: 0; padding: 2px 5px; font: normal 11px Arial; background: red; right: 0; color: blue; white-space: nowrap;" onmouseover="this.style.zIndex = 999;" onmouseout="this.style.zIndex = 'auto';" title="{$blockClass}">{$blockClass}</div>
+        $hintsId = 'hintsBlockId_' .$this->random->getRandomString(32);
+        $scriptString = <<<HTML
+<div class="debugging-hint-block-class" id="{$hintsId}" title="{$blockClass}">{$blockClass}</div>
 {$blockHtml}
 HTML;
-        // @codingStandardsIgnoreEnd
+
+        return $scriptString .
+            $this->secureRenderer->renderStyleAsTag(
+                "position: absolute; top: 0; padding: 2px 5px; font: normal 11px Arial; background: red; right: 0;" .
+                " color: blue; white-space: nowrap;",
+                '#' . $hintsId
+            ) . $this->secureRenderer->renderEventListenerAsTag(
+                'onmouseover',
+                "this.style.zIndex = 999;",
+                '#' . $hintsId
+            ) . $this->secureRenderer->renderEventListenerAsTag(
+                'onmouseout',
+                "this.style.zIndex = 'auto';",
+                '#' . $hintsId
+            );
     }
 }
diff --git a/app/code/Magento/Dhl/view/adminhtml/templates/unitofmeasure.phtml b/app/code/Magento/Dhl/view/adminhtml/templates/unitofmeasure.phtml
index 36ff8138f3955..5ad46f13af90a 100644
--- a/app/code/Magento/Dhl/view/adminhtml/templates/unitofmeasure.phtml
+++ b/app/code/Magento/Dhl/view/adminhtml/templates/unitofmeasure.phtml
@@ -5,24 +5,24 @@
  */
 /**
  * @var \Magento\Dhl\Block\Adminhtml\Unitofmeasure $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
-<script>
+
+<?php $scriptString = <<<script
     //<![CDATA[
     require(["prototype"], function(){
         function changeDimensions() {
-            var dimensionUnit = "(<?= $block->escapeHtml($block->getInch()) ?>)";
-            var dhlUnitOfMeasureNote = "<?= $block->escapeHtml($block->getDivideOrderWeightNoteLbp()) ?>";
+            var dimensionUnit = "({$block->escapeHtml($block->getInch())})";
+            var dhlUnitOfMeasureNote = "{$block->escapeHtml($block->getDivideOrderWeightNoteLbp())}";
             if ($("carriers_dhl_unit_of_measure").value == "K") {
-                dimensionUnit = "(<?= $block->escapeHtml($block->getCm()) ?>)";
-                dhlUnitOfMeasureNote = "<?= $block->escapeHtml($block->getDivideOrderWeightNoteKg()) ?>";
+                dimensionUnit = "({$block->escapeHtml($block->getCm())})";
+                dhlUnitOfMeasureNote = "{$block->escapeHtml($block->getDivideOrderWeightNoteKg())}";
             }
-            $$('[for="carriers_dhl_height"]')[0].innerHTML = "<?=
-                $block->escapeHtml($block->getHeight()); ?> " + dimensionUnit;
-            $$('[for="carriers_dhl_depth"]')[0].innerHTML = "<?=
-                $block->escapeHtml($block->getDepth()); ?> " + dimensionUnit;
-            $$('[for="carriers_dhl_width"]')[0].innerHTML = "<?=
-                $block->escapeHtml($block->getWidth()); ?> " + dimensionUnit;
+            $$('[for="carriers_dhl_height"]')[0].innerHTML = "{$block->escapeHtml($block->getHeight())} " +
+             dimensionUnit;
+            $$('[for="carriers_dhl_depth"]')[0].innerHTML = "{$block->escapeHtml($block->getDepth())} " + dimensionUnit;
+            $$('[for="carriers_dhl_width"]')[0].innerHTML = "{$block->escapeHtml($block->getWidth())} " + dimensionUnit;
 
             $("carriers_dhl_divide_order_weight").next().down().innerHTML = dhlUnitOfMeasureNote;
         }
@@ -33,4 +33,6 @@
         });
     });
     //]]>
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Directory/view/adminhtml/templates/js/optional_zip_countries.phtml b/app/code/Magento/Directory/view/adminhtml/templates/js/optional_zip_countries.phtml
index 524c86fbaf604..900a6a2775863 100644
--- a/app/code/Magento/Directory/view/adminhtml/templates/js/optional_zip_countries.phtml
+++ b/app/code/Magento/Directory/view/adminhtml/templates/js/optional_zip_countries.phtml
@@ -10,15 +10,23 @@
  * @see \Magento\Backend\Block\Template
  */
 
+/**
+ * @var \Magento\Backend\Block\Template $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
-<script>
+<?php
+$directoryHelper = $block->getData('directoryHelper');
+$countriesWithOptionalZip = /* @noEscape */ $directoryHelper->getCountriesWithOptionalZip(true);
+$scriptString = <<<script
+
 require([
     "prototype",
     "mage/adminhtml/events"
 ], function(){
 
 //<![CDATA[
-optionalZipCountries = <?= /* @noEscape */ $this->helper(\Magento\Directory\Helper\Data::class)->getCountriesWithOptionalZip(true) ?>;
+optionalZipCountries = {$countriesWithOptionalZip};
 
 function onAddressCountryChanged (countryElement) {
     var zipElementId = countryElement.id.replace(/country_id/, 'postcode');
@@ -55,4 +63,6 @@ window.optionalZipCountries = optionalZipCountries;
 //]]>
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php b/app/code/Magento/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php
index fced70593704c..e252c42b970b7 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php
@@ -8,6 +8,7 @@
 
 use Magento\Downloadable\Model\Link;
 use Magento\Downloadable\Model\Link\Purchased;
+use Magento\Framework\App\ObjectManager;
 use Magento\Store\Model\ScopeInterface;
 
 /**
@@ -55,10 +56,13 @@ public function __construct(
     ) {
         $this->_purchasedFactory = $purchasedFactory;
         $this->_itemsFactory = $itemsFactory;
+        $data['catalogHelper'] = ObjectManager::getInstance()->get(\Magento\Catalog\Helper\Data::class);
         parent::__construct($context, $stockRegistry, $stockConfiguration, $registry, $optionFactory, $data);
     }
 
     /**
+     * Return purchased links.
+     *
      * @return Purchased
      */
     public function getLinks()
@@ -73,6 +77,8 @@ public function getLinks()
     }
 
     /**
+     * Retunrn links title.
+     *
      * @return null|string
      */
     public function getLinksTitle()
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml
index 94c8405c718a8..422fda2ddc127 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml
@@ -3,42 +3,51 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+
+/**
+ * @var \Magento\Downloadable\Block\Adminhtml\Sales\Items\Column\Downloadable\Name $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
 
-<?php if ($_item = $block->getItem()) : ?>
+<?php $catalogHelper = $block->getData('catalogHelper');
+if ($_item = $block->getItem()): ?>
     <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
-    <div><strong><?= $block->escapeHtml(__('SKU')) ?>:</strong> <?= /* @noEscape */ implode('<br />', $this->helper(Magento\Catalog\Helper\Data::class)->splitSku($block->getSku())) ?></div>
-    <?php if ($block->getOrderOptions()) : ?>
+    <div><strong><?= $block->escapeHtml(__('SKU')) ?>:</strong>
+        <?= /* @noEscape */ implode('<br />', $catalogHelper->splitSku($block->getSku())) ?></div>
+    <?php if ($block->getOrderOptions()): ?>
         <dl class="item-options">
-        <?php foreach ($block->getOrderOptions() as $_option) : ?>
+        <?php foreach ($block->getOrderOptions() as $_option): ?>
             <dt><?= $block->escapeHtml($_option['label']) ?></dt>
             <dd>
-            <?php if (isset($_option['custom_view']) && $_option['custom_view']) : ?>
+            <?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
                 <?= $block->escapeHtml($_option['value']) ?>
-            <?php else : ?>
+            <?php else: ?>
                 <?= $block->escapeHtml($block->truncateString($_option['value'], 55, '', $_remainder)) ?>
-                <?php if ($_remainder) :?>
-                    ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
-                    <script>
+                <?php if ($_remainder):?>
+                    ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>">
+                        <?= $block->escapeHtml($_remainder) ?>
+                    </span>
+                    <?php $escapedId = /* @noEscape */ $block->escapeJs($_id);
+                    $scriptString = <<<script
                         require(['prototype'], function(){
-                            <?php $escapedId = $block->escapeJs($_id) ?>
-                            $('<?= /* @noEscape */ $escapedId ?>').hide();
-                            $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $escapedId ?>').show();});
-                            $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $escapedId ?>').hide();});
-
+                            $('{$escapedId}').hide();
+                            $('{$escapedId}').up().observe('mouseover', function(){ $('{$escapedId}').show();});
+                            $('{$escapedId}').up().observe('mouseout',  function(){ $('{$escapedId}').hide();});
                         });
-                    </script>
+script;
+                    ?>
+                    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
                 <?php endif;?>
             <?php endif;?>
             </dd>
         <?php endforeach; ?>
         </dl>
     <?php endif; ?>
-    <?php if ($block->getLinks()) : ?>
+    <?php if ($block->getLinks()): ?>
         <dl class="item-options">
             <dt><?= $block->escapeHtml($block->getLinksTitle()) ?></dt>
-            <?php foreach ($block->getLinks()->getPurchasedItems() as $_link) : ?>
+            <?php foreach ($block->getLinks()->getPurchasedItems() as $_link): ?>
                 <dd><?= $block->escapeHtml($_link->getLinkTitle()) ?></dd>
             <?php endforeach; ?>
         </dl>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml
index 9a45066f64d15..71cd03132c27c 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml
@@ -3,42 +3,53 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+
+/** @var \Magento\Downloadable\Block\Adminhtml\Sales\Items\Column\Downloadable\Name $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
-<?php if ($_item = $block->getItem()) : ?>
+<?php $catalogHelper = $block->getData('catalogHelper');
+if ($_item = $block->getItem()): ?>
     <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
-    <div><strong><?= $block->escapeHtml(__('SKU')) ?>:</strong> <?= /* @noEscape */ implode('<br />', $this->helper(Magento\Catalog\Helper\Data::class)->splitSku($block->getSku())) ?></div>
-    <?php if ($block->getOrderOptions()) : ?>
+    <div><strong><?= $block->escapeHtml(__('SKU')) ?>:</strong>
+        <?= /* @noEscape */ implode('<br />', $catalogHelper->splitSku($block->getSku())) ?></div>
+    <?php if ($block->getOrderOptions()): ?>
         <dl class="item-options">
-        <?php foreach ($block->getOrderOptions() as $_option) : ?>
+        <?php foreach ($block->getOrderOptions() as $_option): ?>
             <dt><?= $block->escapeHtml($_option['label']) ?></dt>
             <dd>
-            <?php if (isset($_option['custom_view']) && $_option['custom_view']) : ?>
+            <?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
                 <?= $block->escapeHtml($_option['value']) ?>
-            <?php else : ?>
+            <?php else: ?>
                 <?= $block->escapeHtml($block->truncateString($_option['value'], 55, '', $_remainder)) ?>
-                <?php if ($_remainder) :?>
-                    ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
-                    <script>
+                <?php if ($_remainder):?>
+                    ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>">
+                        <?= $block->escapeHtml($_remainder) ?>
+                    </span>
+                    <?php $escapedId = /* @noEscape */ $block->escapeJs($_id);
+                    $scriptString = <<<script
                         require(['prototype'], function(){
-                            <?php $escapedId = $block->escapeJs($_id) ?>
-                            $('<?= /* @noEscape */ $escapedId ?>').hide();
-                            $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $escapedId ?>').show();});
-                            $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $escapedId ?>').hide();});
+                            $('{$escapedId}').hide();
+                            $('{$escapedId}').up().observe('mouseover', function(){ $('{$escapedId}').show();});
+                            $('{$escapedId}').up().observe('mouseout',  function(){ $('{$escapedId}').hide();});
                         });
-                    </script>
+script;
+                    ?>
+                    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
                 <?php endif;?>
             <?php endif;?>
             </dd>
         <?php endforeach; ?>
         </dl>
     <?php endif; ?>
-    <?php if ($block->getLinks()) : ?>
+    <?php if ($block->getLinks()): ?>
         <dl class="item-options">
             <dt><?= $block->escapeHtml($block->getLinksTitle()) ?></dt>
-            <?php foreach ($block->getLinks()->getPurchasedItems() as $_link) : ?>
-                <dd><?= $block->escapeHtml($_link->getLinkTitle()) ?> (<?= $block->escapeHtml($_link->getNumberOfDownloadsBought() ? $_link->getNumberOfDownloadsBought() : __('Unlimited')) ?>)</dd>
+            <?php foreach ($block->getLinks()->getPurchasedItems() as $_link): ?>
+                <dd><?= $block->escapeHtml($_link->getLinkTitle()) ?>
+                    (<?= $block->escapeHtml($_link->getNumberOfDownloadsBought() ?
+                        $_link->getNumberOfDownloadsBought() : __('Unlimited')) ?>)
+                </dd>
             <?php endforeach; ?>
         </dl>
     <?php endif; ?>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml
index b5fe7b3385630..2244f1e1de108 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml
@@ -3,45 +3,55 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+
+/** @var \Magento\Downloadable\Block\Adminhtml\Sales\Items\Column\Downloadable\Name $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
-<?php if ($_item = $block->getItem()) : ?>
+<?php $catalogHelper = $block->getData('catalogHelper');
+if ($_item = $block->getItem()): ?>
     <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
     <div class="product-sku-block">
         <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
-        <?= /* @noEscape */ implode('<br />', $this->helper(Magento\Catalog\Helper\Data::class)->splitSku($block->getSku())) ?>
+        <?= /* @noEscape */ implode('<br />', $catalogHelper->splitSku($block->getSku())) ?>
     </div>
-    <?php if ($block->getOrderOptions()) : ?>
+    <?php if ($block->getOrderOptions()): ?>
         <dl class="item-options">
-        <?php foreach ($block->getOrderOptions() as $_option) : ?>
+        <?php foreach ($block->getOrderOptions() as $_option): ?>
             <dt><?= $block->escapeHtml($_option['label']) ?>:</dt>
             <dd>
-            <?php if (isset($_option['custom_view']) && $_option['custom_view']) : ?>
+            <?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
                 <?= $block->escapeHtml($_option['value']) ?>
-            <?php else : ?>
+            <?php else: ?>
                 <?= $block->escapeHtml($block->truncateString($_option['value'], 55, '', $_remainder)) ?>
-                <?php if ($_remainder) :?>
-                    ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>"><?= $block->escapeHtml($_remainder) ?></span>
-                    <script>
+                <?php if ($_remainder):?>
+                    ... <span id="<?= $block->escapeHtmlAttr($_id = 'id' . uniqid()) ?>">
+                        <?= $block->escapeHtml($_remainder) ?>
+                    </span>
+                    <?php $escapedId = /* @noEscape */ $block->escapeJs($_id);
+                    $scriptString = <<<script
                         require(['prototype'], function(){
-                            <?php $escapedId = $block->escapeJs($_id) ?>
-                            $('<?= /* @noEscape */ $escapedId ?>').hide();
-                            $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $escapedId ?>').show();});
-                            $('<?= /* @noEscape */ $escapedId ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $escapedId ?>').hide();});
+                            $('{$escapedId}').hide();
+                            $('{$escapedId}').up().observe('mouseover', function(){ $('{$escapedId}').show();});
+                            $('{$escapedId}').up().observe('mouseout',  function(){ $('{$escapedId}').hide();});
                         });
-                    </script>
+script;
+                    ?>
+                    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
                 <?php endif;?>
             <?php endif;?>
             </dd>
         <?php endforeach; ?>
         </dl>
     <?php endif; ?>
-    <?php if ($block->getLinks()) : ?>
+    <?php if ($block->getLinks()): ?>
         <dl class="item-options">
             <dt><?= $block->escapeHtml($block->getLinksTitle()) ?>:</dt>
-            <?php foreach ($block->getLinks()->getPurchasedItems() as $_link) : ?>
-                <dd><?= $block->escapeHtml($_link->getLinkTitle()) ?> (<?= $block->escapeHtml($_link->getNumberOfDownloadsUsed() . ' / ' . ($_link->getNumberOfDownloadsBought() ? $_link->getNumberOfDownloadsBought() : __('U'))) ?>)</dd>
+            <?php foreach ($block->getLinks()->getPurchasedItems() as $_link): ?>
+                <dd><?= $block->escapeHtml($_link->getLinkTitle()) ?>
+                    (<?= $block->escapeHtml($_link->getNumberOfDownloadsUsed() . ' / ' .
+                        ($_link->getNumberOfDownloadsBought() ? $_link->getNumberOfDownloadsBought() : __('U'))) ?>)
+                </dd>
             <?php endforeach; ?>
         </dl>
     <?php endif; ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/customer/products/list.phtml b/app/code/Magento/Downloadable/view/frontend/templates/customer/products/list.phtml
index eca72b3500924..4935743c2de7d 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/customer/products/list.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/customer/products/list.phtml
@@ -3,14 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-<?php
+
+use Magento\Downloadable\Model\Link\Purchased\Item;
+
 /**
  * @var $block \Magento\Downloadable\Block\Customer\Products\ListProducts
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
 <?php $_items = $block->getItems(); ?>
-<?php if (count($_items)) : ?>
+<?php if (count($_items)): ?>
     <div class="table-wrapper downloadable-products">
         <table id="my-downloadable-products-table" class="data table table-downloadable-products">
             <caption class="table-caption"><?= $block->escapeHtml(__('Downloadable Products')) ?></caption>
@@ -24,35 +26,57 @@
                 </tr>
             </thead>
             <tbody>
-            <?php foreach ($_items as $_item) : ?>
+            <?php foreach ($_items as $_item): ?>
                 <tr>
                     <td data-th="<?= $block->escapeHtmlAttr(__('Order #')) ?>" class="col id">
-                        <a href="<?= $block->escapeUrl($block->getOrderViewUrl($_item->getPurchased()->getOrderId())) ?>"
+                        <a href="<?= $block->escapeUrl($block->getOrderViewUrl($_item->getPurchased()->getOrderId()))?>"
                             title="<?= $block->escapeHtml(__('View Order')) ?>">
                             <?= $block->escapeHtml($_item->getPurchased()->getOrderIncrementId()) ?>
                         </a>
                     </td>
-                    <td data-th="<?= $block->escapeHtmlAttr(__('Date')) ?>" class="col date"><?= $block->escapeHtml($block->formatDate($_item->getPurchased()->getCreatedAt())) ?></td>
+                    <td data-th="<?= $block->escapeHtmlAttr(__('Date')) ?>" class="col date">
+                        <?= $block->escapeHtml($block->formatDate($_item->getPurchased()->getCreatedAt())) ?>
+                    </td>
                     <td data-th="<?= $block->escapeHtmlAttr(__('Title')) ?>" class="col title">
-                        <strong class="product-name"><?= $block->escapeHtml($_item->getPurchased()->getProductName()) ?></strong>
-                        <?php if ($_item->getStatus() == \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_AVAILABLE) : ?>
-                        <a href="<?= $block->escapeUrl($block->getDownloadUrl($_item)) ?>" title="<?= $block->escapeHtmlAttr(__('Start Download')) ?>" class="action download" <?= /* @noEscape */ $block->getIsOpenInNewWindow() ? 'onclick="this.target=\'_blank\'"' : '' ?>><?= $block->escapeHtml($_item->getLinkTitle()) ?></a>
+                        <strong class="product-name">
+                            <?= $block->escapeHtml($_item->getPurchased()->getProductName()) ?>
+                        </strong>
+                        <?php if ($_item->getStatus() == Item::LINK_STATUS_AVAILABLE): ?>
+                            <a href="<?= $block->escapeUrl($block->getDownloadUrl($_item)) ?>"
+                               id="download_<?= /* @noEscape */ $_item->getPurchased()->getProductId() ?>"
+                               title="<?= $block->escapeHtmlAttr(__('Start Download')) ?>"
+                               class="action download">
+                                <?= $block->escapeHtml($_item->getLinkTitle()) ?>
+                            </a>
+                            <?php if ($block->getIsOpenInNewWindow()): ?>
+                                <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                                    'onclick',
+                                    "this.target='_blank'",
+                                    'a#download_' . $_item->getPurchased()->getProductId()
+                                ) ?>
+                            <?php endif; ?>
                         <?php endif; ?>
                     </td>
-                    <td data-th="<?= $block->escapeHtmlAttr(__('Status')) ?>" class="col status"><?= $block->escapeHtml(__(ucfirst($_item->getStatus()))) ?></td>
-                    <td data-th="<?= $block->escapeHtmlAttr(__('Remaining Downloads')) ?>" class="col remaining"><?= $block->escapeHtml($block->getRemainingDownloads($_item)) ?></td>
+                    <td data-th="<?= $block->escapeHtmlAttr(__('Status')) ?>" class="col status">
+                        <?= $block->escapeHtml(__(ucfirst($_item->getStatus()))) ?>
+                    </td>
+                    <td data-th="<?= $block->escapeHtmlAttr(__('Remaining Downloads')) ?>" class="col remaining">
+                        <?= $block->escapeHtml($block->getRemainingDownloads($_item)) ?>
+                    </td>
                 </tr>
             <?php endforeach; ?>
             </tbody>
         </table>
     </div>
-    <?php if ($block->getChildHtml('pager')) : ?>
+    <?php if ($block->getChildHtml('pager')): ?>
         <div class="toolbar downloadable-products-toolbar bottom">
             <?= $block->getChildHtml('pager') ?>
         </div>
     <?php endif; ?>
-<?php else : ?>
-    <div class="message info empty"><span><?= $block->escapeHtml(__('You have not purchased any downloadable products yet.')) ?></span></div>
+<?php else: ?>
+    <div class="message info empty">
+        <span><?= $block->escapeHtml(__('You have not purchased any downloadable products yet.')) ?></span>
+    </div>
 <?php endif; ?>
 
 <div class="actions-toolbar">
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Edit/Form.php b/app/code/Magento/Email/Block/Adminhtml/Template/Edit/Form.php
index 2cd3ea42649c1..ec97d462c0f74 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template/Edit/Form.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template/Edit/Form.php
@@ -9,8 +9,13 @@
  */
 namespace Magento\Email\Block\Adminhtml\Template\Edit;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 /**
  * Adminhtml email template edit form block
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
@@ -29,6 +34,11 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      */
     private $serializer;
 
+    /**
+     * @var SecureHtmlRenderer
+     */
+    protected $secureRenderer;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -37,6 +47,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Variable\Model\Source\Variables $variables
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
+     * @param SecureHtmlRenderer|null $secureRenderer
      * @throws \RuntimeException
      */
     public function __construct(
@@ -46,12 +57,14 @@ public function __construct(
         \Magento\Variable\Model\VariableFactory $variableFactory,
         \Magento\Variable\Model\Source\Variables $variables,
         array $data = [],
-        \Magento\Framework\Serialize\Serializer\Json $serializer = null
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null,
+        ?SecureHtmlRenderer $secureRenderer = null
     ) {
         $this->_variableFactory = $variableFactory;
         $this->_variables = $variables;
         $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(\Magento\Framework\Serialize\Serializer\Json::class);
+        $this->secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
         parent::__construct($context, $registry, $formFactory, $data);
     }
 
@@ -93,11 +106,16 @@ protected function _prepareForm()
             [
                 'label' => __('Currently Used For'),
                 'container_id' => 'currently_used_for',
-                'after_element_html' => '<script>require(["prototype"], function () {' .
-                (!$this->getEmailTemplate()->getSystemConfigPathsWhereCurrentlyUsed() ? '$(\'' .
-                'currently_used_for' .
-                '\').hide(); ' : '') .
-                '});</script>'
+                'after_element_html' => $this->secureRenderer->renderTag(
+                    'script',
+                    [],
+                    'require(["prototype"], function () {' .
+                    (!$this->getEmailTemplate()->getSystemConfigPathsWhereCurrentlyUsed() ? '$(\'' .
+                    'currently_used_for' .
+                    '\').hide(); ' : '') .
+                    '});',
+                    false
+                ),
             ]
         );
 
diff --git a/app/code/Magento/Email/view/adminhtml/templates/preview/iframeswitcher.phtml b/app/code/Magento/Email/view/adminhtml/templates/preview/iframeswitcher.phtml
index 29ceb71a138e4..900c527dcff17 100644
--- a/app/code/Magento/Email/view/adminhtml/templates/preview/iframeswitcher.phtml
+++ b/app/code/Magento/Email/view/adminhtml/templates/preview/iframeswitcher.phtml
@@ -5,6 +5,7 @@
  */
 
 /** @var \Magento\Backend\Block\Page $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <div id="preview" class="cms-revision-preview">
     <iframe name="preview_iframe"
@@ -20,12 +21,12 @@
           target="preview_iframe"
     >
     <input type="hidden" name="form_key" value="<?= /* @noEscape */ $block->getFormKey() ?>" />
-    <?php foreach ($block->getPreviewFormViewModel()->getFormFields() as $name => $value) : ?>
+    <?php foreach ($block->getPreviewFormViewModel()->getFormFields() as $name => $value): ?>
         <input type="hidden" name="<?= $block->escapeHtmlAttr($name) ?>" value="<?= $block->escapeHtmlAttr($value) ?>"/>
     <?php endforeach; ?>
     </form>
 </div>
-<script>
+<?php $scriptString = <<<script
 require([
     'jquery'
 ], function($) {
@@ -37,4 +38,6 @@ require([
         $(this).height($(this).contents().height());
     });
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml b/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
index 7378fa4b2e47f..fef2da0ed33dd 100644
--- a/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
+++ b/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
@@ -7,24 +7,30 @@
 use Magento\Framework\App\TemplateTypesInterface;
 
 /** @var $block \Magento\Email\Block\Adminhtml\Template\Edit */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<?php if (!$block->getEditMode()) : ?>
+<?php if (!$block->getEditMode()): ?>
 <form action="<?= $block->escapeUrl($block->getLoadUrl()) ?>" method="post" id="email_template_load_form">
     <?= $block->getBlockHtml('formkey') ?>
     <fieldset class="admin__fieldset form-inline">
         <legend class="admin__legend"><span><?= $block->escapeHtml(__('Load Default Template')) ?></span></legend><br>
         <div class="admin__field required">
-            <label class="admin__field-label" for="template_select"><span><?= $block->escapeHtml(__('Template')) ?></span></label>
+            <label class="admin__field-label" for="template_select">
+                <span><?= $block->escapeHtml(__('Template')) ?></span>
+            </label>
             <div class="admin__field-control">
                 <select id="template_select" name="code" class="admin__control-select required-entry">
-                    <?php foreach ($block->getTemplateOptions() as $group => $options) : ?>
-                        <?php if ($group) : ?>
+                    <?php foreach ($block->getTemplateOptions() as $group => $options): ?>
+                        <?php if ($group): ?>
                             <optgroup label="<?= $block->escapeHtmlAttr($group) ?>">
                         <?php endif; ?>
-                        <?php foreach ($options as $option) : ?>
-                            <option value="<?= $block->escapeHtmlAttr($option['value']) ?>"<?= /* @noEscape */ $block->getOrigTemplateCode() == $option['value'] ? ' selected="selected"' : '' ?>><?= $block->escapeHtml($option['label']) ?></option>
+                        <?php foreach ($options as $option): ?>
+                            <option value="<?= $block->escapeHtmlAttr($option['value']) ?>"
+                                <?= /* @noEscape */ $block->getOrigTemplateCode() == $option['value'] ?
+                                    ' selected="selected"' : '' ?>><?= $block->escapeHtml($option['label']) ?>
+                            </option>
                         <?php endforeach; ?>
-                        <?php if ($group) : ?>
+                        <?php if ($group): ?>
                             </optgroup>
                         <?php endif; ?>
                     <?php endforeach; ?>
@@ -44,19 +50,26 @@ use Magento\Framework\App\TemplateTypesInterface;
 <form action="<?= $block->escapeUrl($block->getSaveUrl()) ?>" method="post" id="email_template_edit_form">
     <?= /* @noEscape */ $block->getBlockHtml('formkey') ?>
     <input type="hidden" id="change_flag_element" name="_change_type_flag" value="" />
-    <input type="hidden" id="orig_template_code" name="orig_template_code" value="<?= $block->escapeHtmlAttr($block->getOrigTemplateCode()) ?>" />
+    <input type="hidden" id="orig_template_code" name="orig_template_code"
+           value="<?= $block->escapeHtmlAttr($block->getOrigTemplateCode()) ?>" />
     <?= /* @noEscape */ $block->getFormHtml() ?>
 </form>
 
-<form action="<?= $block->escapeUrl($block->getPreviewUrl()) ?>" method="post" id="email_template_preview_form" target="_blank">
+<form action="<?= $block->escapeUrl($block->getPreviewUrl()) ?>" method="post" id="email_template_preview_form"
+      target="_blank">
     <?= /* @noEscape */ $block->getBlockHtml('formkey') ?>
     <div class="no-display">
-        <input type="hidden" id="preview_type" name="type" value="<?= /* @noEscape */ $block->isTextType() ? 1 : 2 ?>" />
+        <input type="hidden" id="preview_type" name="type" value="<?= /* @noEscape */ $block->isTextType() ? 1 : 2 ?>"/>
         <input type="hidden" id="preview_text" name="text" value="" />
         <input type="hidden" id="preview_styles" name="styles" value="" />
     </div>
 </form>
-<script>
+<?php
+$currentlyUsedForPaths = /* @noEscape */ $block->getCurrentlyUsedForPaths();
+$templateType = (int)$block->getTemplateType();
+$typeText = /* @noEscape */ TemplateTypesInterface::TYPE_TEXT;
+$scriptString = <<<script
+
 require([
     "jquery",
     "wysiwygAdapter",
@@ -92,7 +105,7 @@ require([
 
             this.bindEvents();
 
-            this.renderPaths(<?= /* @noEscape */ $block->getCurrentlyUsedForPaths() ?>, 'currently_used_for');
+            this.renderPaths({$currentlyUsedForPaths}, 'currently_used_for');
         },
 
         bindEvents: function(){
@@ -115,7 +128,7 @@ require([
 
         stripTags: function () {
             confirm({
-                content: "<?= $block->escapeJs($block->escapeHtml(__('Are you sure you want to strip tags?'))) ?>",
+                content: "{$block->escapeJs(__('Are you sure you want to strip tags?'))}",
                 actions: {
                     confirm: function () {
                         this.unconvertedText = $('template_text').value;
@@ -149,9 +162,9 @@ require([
         },
         preview: function() {
             if (this.typeChange) {
-                $('preview_type').value = <?= /* @noEscape */ TemplateTypesInterface::TYPE_TEXT ?>;
+                $('preview_type').value = {$typeText};
             } else {
-                $('preview_type').value = <?= (int) $block->getTemplateType() ?>;
+                $('preview_type').value = {$templateType};
             }
 
             if (typeof tinyMCE == 'undefined' || !tinyMCE.get('template_text')) {
@@ -171,10 +184,10 @@ require([
 
         deleteTemplate: function() {
             confirm({
-                content: "<?= $block->escapeJs($block->escapeHtml(__('Are you sure you want to delete this template?'))) ?>",
+                content: "{$block->escapeJs(__('Are you sure you want to delete this template?'))}",
                 actions: {
                     confirm: function () {
-                        window.location.href = '<?= $block->escapeJs($block->escapeUrl($block->getDeleteUrl())) ?>';
+                        window.location.href = '{$block->escapeJs($block->getDeleteUrl())}';
                     }
                 }
             });
@@ -193,7 +206,7 @@ require([
                area: $('email_template_load_form'),
                onComplete: function (transport) {
                    if (transport.responseText.isJSON()) {
-                       var fields = $H(transport.responseText.evalJSON());
+                       var fields = \$H(transport.responseText.evalJSON());
                        fields.each(function(pair) {
                           if ($(pair.key)) {
                               $(pair.key).value = pair.value.strip();
@@ -221,7 +234,9 @@ require([
                        }.bind(this));
                    } else {
                        alert({
-                           content: '<?= $block->escapeJs($block->escapeHtml(__('The template did not load. Please review the log for details.'))) ?>'
+                           content: '{$block->escapeJs(__(
+                               'The template did not load. Please review the log for details.'
+                            ))}'
                        });
                    }
                }.bind(this)
@@ -232,7 +247,8 @@ require([
         renderPaths: function(paths, fieldId) {
             var field = $(fieldId);
             if (field) {
-                field.down('div').down('div').update(this.parsePath(paths, '<span class="path-delimiter">&nbsp;-&gt;&nbsp;</span>', '<br />'));
+                field.down('div').down('div')
+                .update(this.parsePath(paths, '<span class="path-delimiter">&nbsp;-&gt;&nbsp;</span>', '<br />'));
             }
         },
 
@@ -246,7 +262,8 @@ require([
             }
 
             if(!Object.isString(value) && value.title) {
-                value = (value.url ? '<a href="' + value.url + '">' + value.title + '</a>' : value.title) + (value.scope ? '&nbsp;&nbsp;<span class="path-scope-label">(' + value.scope + ')</span>' : '');
+                value = (value.url ? '<a href="' + value.url + '">' + value.title + '</a>' : value.title) +
+                 (value.scope ? '&nbsp;&nbsp;<span class="path-scope-label">(' + value.scope + ')</span>' : '');
             }
 
             return value;
@@ -274,4 +291,6 @@ require([
 //]]>
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml
index 908d6c91bfb5f..397b4db4d811f 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml
@@ -3,26 +3,32 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
-<?php if ($block->getChildHtml()) :?>
-<div id="gift_options_configure_new" class="gift-options-popup product-configure-popup" style="display: none;">
+<?php if ($block->getChildHtml()):?>
+<div id="gift_options_configure_new" class="gift-options-popup product-configure-popup">
     <div id="gift_options_form_contents">
         <div class="content">
             <?= $block->getChildHtml() ?>
         </div>
         <div class="ui-dialog-buttonset">
-            <button type="button" class="action-close" id="gift_options_cancel_button"><span><?= $block->escapeHtml(__('Cancel')) ?></span></button>
-            <button type="button" class="action-primary" id="gift_options_ok_button"><span><?= $block->escapeHtml(__('OK')) ?></span></button>
+            <button type="button" class="action-close" id="gift_options_cancel_button">
+                <span><?= $block->escapeHtml(__('Cancel')) ?></span>
+            </button>
+            <button type="button" class="action-primary" id="gift_options_ok_button">
+                <span><?= $block->escapeHtml(__('OK')) ?></span>
+            </button>
         </div>
     </div>
 </div>
-
-<div id="giftoptions_tooltip_window" class="gift-options-tooltip" style="display: none;">
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display: none;", 'div#gift_options_configure_new') ?>
+<div id="giftoptions_tooltip_window" class="gift-options-tooltip">
     <div id="giftoptions_tooltip_window_content">&nbsp;</div>
 </div>
-
-<script>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display: none;", 'div#giftoptions_tooltip_window') ?>
+    <?php $scriptString = <<<script
 require([
     "Magento_Sales/order/create/giftmessage",
     "Magento_Sales/order/giftoptions_tooltip"
@@ -36,5 +42,7 @@ giftOptionsTooltip.setTooltipWindow('giftoptions_tooltip_window','giftoptions_to
 //]]>
 window.giftMessageSet = giftMessageSet;
 });
-</script>
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <?php endif;?>
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/giftoptions.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/giftoptions.phtml
index 1833ae0d2e339..41b77ad74d148 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/giftoptions.phtml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/giftoptions.phtml
@@ -3,24 +3,32 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
 <?php $_item = $block->getItem() ?>
-<?php if ($_item) : ?>
+<?php if ($_item): ?>
     <?php $_childHtml = trim($block->getChildHtml('', false));?>
-    <?php if ($_childHtml) : ?>
+    <?php if ($_childHtml): ?>
         <tr class="row-gift-options">
             <td colspan="7">
-                <a class="action-link" href="#" id="gift_options_link_<?= (int) $_item->getId() ?>"><?= $block->escapeHtml(__('Gift Options')) ?></a>
-                <script>
+                <a class="action-link" href="#" id="gift_options_link_<?= (int) $_item->getId() ?>">
+                    <?= $block->escapeHtml(__('Gift Options')) ?>
+                </a>
+                <?php $itemId = (int) ($_item->getId());
+                $scriptString = <<<script
+
 require([
     "Magento_Sales/order/giftoptions_tooltip"
 ], function(){
 
-    giftOptionsTooltip.addTargetLink('gift_options_link_<?= (int) $_item->getId() ?>', <?= (int) $_item->getId() ?>);
+    giftOptionsTooltip.addTargetLink('gift_options_link_{$itemId}', {$itemId});
 
 });
-</script>
+script;
+                ?>
+                <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
                 <div id="gift_options_data_<?= (int) $_item->getId() ?>">
                     <?= /* @noEscape */ $_childHtml ?>
                 </div>
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/giftoptions.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/giftoptions.phtml
index 60a6e1b222b17..1c2486d5471e4 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/giftoptions.phtml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/giftoptions.phtml
@@ -3,26 +3,30 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
 <?php $_childHtml = trim($block->getChildHtml('', false)); ?>
-<?php if ($_childHtml) : ?>
+<?php if ($_childHtml): ?>
     <?php $_item = $block->getItem() ?>
     <tr>
         <td colspan="10" class="last">
             <a class="action-link" href="#" id="gift_options_link_<?= (int) $_item->getId() ?>">
                 <?= $block->escapeHtml(__('Gift Options')) ?>
             </a>
-            <script>
+            <?php $itemId = (int) ($_item->getId());
+            $scriptString = <<<script
     require([
         "Magento_Sales/order/giftoptions_tooltip"
     ], function(){
         giftOptionsTooltip.addTargetLink(
-            'gift_options_link_<?= (int) ($_item->getId()) ?>',
-            <?= (int) $_item->getId() ?>
+            'gift_options_link_{$itemId}', {$itemId}
         );
     });
-    </script>
+script;
+            ?>
+            <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
             <div id="gift_options_data_<?= (int) $_item->getId() ?>">
                 <?= /* @noEscape */ $_childHtml ?>
             </div>
diff --git a/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml b/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
index cb462a630e3a6..45dc79aa99a13 100644
--- a/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
+++ b/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
@@ -3,73 +3,120 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-//phpcs:disable Squiz.ControlStructures.ControlSignature
-//phpcs:disable Squiz.WhiteSpace.ScopeClosingBrace
-//phpcs:disable PSR2.ControlStructures.SwitchDeclaration
-//phpcs:disable Magento2.Files.LineLength.MaxExceeded
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<?php $_giftMessage = false; ?>
-<?php switch ($block->getCheckoutType()) : case 'onepage_checkout': ?>
+<?php $_giftMessage = false;
+switch ($block->getCheckoutType()):
+    case 'onepage_checkout':
+        ?>
     <fieldset class="fieldset gift-message">
-        <legend class="legend"><span><?= $block->escapeHtml(__('Do you have any gift items in your order?')) ?></span></legend><br>
+        <legend class="legend">
+            <span><?= $block->escapeHtml(__('Do you have any gift items in your order?')) ?></span>
+        </legend><br>
 
         <div class="field choice" id="add-gift-options-<?= (int) $block->getEntity()->getId() ?>">
-            <input type="checkbox" name="allow_gift_options" id="allow_gift_options" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-container"}'<?php if ($block->getItemsHasMesssages() || $block->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-            <label for="allow_gift_options" class="label"><span><?= $block->escapeHtml(__('Add Gift Options')) ?></span></label>
+            <input type="checkbox" name="allow_gift_options" id="allow_gift_options" data-mage-init='{"giftOptions":{}}'
+                   value="1" data-selector='{"id":"#allow-gift-options-container"}'
+                <?php if ($block->getItemsHasMesssages() || $block->getEntityHasMessage()):?>
+                    checked="checked"<?php endif; ?> class="checkbox" />
+            <label for="allow_gift_options" class="label">
+                <span><?= $block->escapeHtml(__('Add Gift Options')) ?></span>
+            </label>
         </div>
 
         <dl class="options-items" id="allow-gift-options-container">
             <?php if ($block->isMessagesAvailable()): ?>
             <dt id="add-gift-options-for-order-<?= (int) $block->getEntity()->getId() ?>" class="order-title">
                 <div class="field choice">
-                    <input type="checkbox" name="allow_gift_messages_for_order" id="allow_gift_options_for_order" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-order-container"}'<?php if ($block->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-                    <label for="allow_gift_options_for_order" class="label"><span><?= $block->escapeHtml(__('Gift Options for the Entire Order')) ?></span></label>
+                    <input type="checkbox" name="allow_gift_messages_for_order" id="allow_gift_options_for_order"
+                           data-mage-init='{"giftOptions":{}}' value="1"
+                           data-selector='{"id":"#allow-gift-options-for-order-container"}'
+                        <?php if ($block->getEntityHasMessage()): ?> checked="checked"<?php endif; ?>
+                           class="checkbox" />
+                    <label for="allow_gift_options_for_order" class="label">
+                        <span><?= $block->escapeHtml(__('Gift Options for the Entire Order')) ?></span>
+                    </label>
                 </div>
             </dt>
 
             <dd id="allow-gift-options-for-order-container" class="order-options">
-                <div class="options-order-container" id="options-order-container-<?= (int) $block->getEntity()->getId() ?>"></div>
+                <div class="options-order-container"
+                     id="options-order-container-<?= (int) $block->getEntity()->getId() ?>"></div>
                     <button class="action action-gift"
-                            data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#allow-gift-messages-for-order-container"}}'>
+                            data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden",
+                             "toggleContainers":"#allow-gift-messages-for-order-container"}}'>
                         <span><?= $block->escapeHtml(__('Gift Message')) ?></span>
                     </button>
                     <div id="allow-gift-messages-for-order-container" class="gift-messages-order hidden">
                         <fieldset class="fieldset">
-                            <p><?= $block->escapeHtml(__('Leave this box blank if you don\'t want to leave a gift message for the entire order.')) ?></p>
+                            <p><?= $block->escapeHtml(__(
+                                'Leave this box blank if you don\'t want to leave a gift message for the entire order.'
+                            )) ?></p>
                             <div class="field from">
-                                <label for="gift-message-whole-from" class="label"><span><?= $block->escapeHtml(__('From')) ?></span></label>
+                                <label for="gift-message-whole-from" class="label">
+                                    <span><?= $block->escapeHtml(__('From')) ?></span></label>
                                 <div class="control">
-                                    <input type="text" name="giftmessage[quote][<?= (int) $block->getEntity()->getId() ?>][from]" id="gift-message-whole-from" title="<?= $block->escapeHtmlAttr(__('From')) ?>"  value="<?= /* @noEscape */ $block->getEscaped($block->getMessage()->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
+                                    <input type="text"
+                                           name="giftmessage[quote][<?= (int) $block->getEntity()->getId() ?>][from]"
+                                           id="gift-message-whole-from"
+                                           title="<?= $block->escapeHtmlAttr(__('From')) ?>"
+                                           value="<?= /* @noEscape */ $block
+                                               ->getEscaped($block->getMessage()->getSender(), $block->getDefaultFrom())
+                                            ?>"
+                                           class="input-text">
                                 </div>
                             </div>
                             <div class="field to">
-                                <label for="gift-message-whole-to" class="label"><span><?= $block->escapeHtml(__('To')) ?></span></label>
+                                <label for="gift-message-whole-to" class="label">
+                                    <span><?= $block->escapeHtml(__('To')) ?></span>
+                                </label>
                                 <div class="control">
-                                    <input type="text" name="giftmessage[quote][<?= (int) $block->getEntity()->getId() ?>][to]" id="gift-message-whole-to" title="<?= $block->escapeHtmlAttr(__('To')) ?>" value="<?= /* @noEscape */ $block->getEscaped($block->getMessage()->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
+                                    <input type="text"
+                                           name="giftmessage[quote][<?= (int) $block->getEntity()->getId() ?>][to]"
+                                           id="gift-message-whole-to" title="<?= $block->escapeHtmlAttr(__('To')) ?>"
+                                           value="<?= /* @noEscape */ $block
+                                              ->getEscaped($block->getMessage()->getRecipient(), $block->getDefaultTo())
+                                            ?>" class="input-text">
                                 </div>
                             </div>
                             <div class="field text">
-                                <label for="gift-message-whole-message" class="label"><span><?= $block->escapeHtml(__('Message')) ?></span></label>
+                                <label for="gift-message-whole-message" class="label">
+                                    <span><?= $block->escapeHtml(__('Message')) ?></span>
+                                </label>
                                 <div class="control">
-                                    <textarea id="gift-message-whole-message" class="input-text" name="giftmessage[quote][<?= (int) $block->getEntity()->getId() ?>][message]" title="<?= $block->escapeHtmlAttr(__('Message')) ?>" rows="5" cols="10"><?= /* @noEscape */ $block->getEscaped($block->getMessage()->getMessage()) ?></textarea>
+                                    <textarea id="gift-message-whole-message" class="input-text"
+                                              name="giftmessage[quote][<?=(int)$block->getEntity()->getId()?>][message]"
+                                              title="<?= $block->escapeHtmlAttr(__('Message')) ?>" rows="5" cols="10">
+                                        <?= /* @noEscape */ $block->getEscaped($block->getMessage()->getMessage()) ?>
+                                    </textarea>
                                 </div>
                             </div>
                         </fieldset>
-                        <script>
+                        <?php $entityId = (int) $block->getEntity()->getId();
+                        $scriptString = <<<script
                             require(['jquery'], function(jQuery){
-                                jQuery('#add-gift-options-<?= (int) $block->getEntity()->getId() ?>')
-                                    .add('#add-gift-options-for-order-<?= (int) $block->getEntity()->getId() ?>')
+                                jQuery('#add-gift-options-{$entityId}')
+                                    .add('#add-gift-options-for-order-{$entityId}')
                                     .removeClass('hidden');
                             });
-                        </script>
+script;
+                        ?>
+                        <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
                     </div>
             </dd>
             <?php endif ?>
             <?php if ($block->isItemsAvailable()): ?>
-            <dt id="add-gift-options-for-items-<?= (int) $block->getEntity()->getId() ?>" class="order-title individual">
+            <dt id="add-gift-options-for-items-<?= (int) $block->getEntity()->getId()?>" class="order-title individual">
                 <div class="field choice">
-                    <input type="checkbox" name="allow_gift_options_for_items" id="allow_gift_options_for_items" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-items-container"}'<?php if ($block->getItemsHasMesssages()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-                    <label for="allow_gift_options_for_items" class="label"><span><?= $block->escapeHtml(__('Gift Options for Individual Items')) ?></span></label>
+                    <input type="checkbox" name="allow_gift_options_for_items" id="allow_gift_options_for_items"
+                           data-mage-init='{"giftOptions":{}}' value="1"
+                           data-selector='{"id":"#allow-gift-options-for-items-container"}'
+                        <?php if ($block->getItemsHasMesssages()): ?> checked="checked"<?php endif; ?>
+                           class="checkbox" />
+                    <label for="allow_gift_options_for_items" class="label">
+                        <span><?= $block->escapeHtml(__('Gift Options for Individual Items')) ?></span>
+                    </label>
                 </div>
             </dt>
 
@@ -80,7 +127,11 @@
                     <li class="item">
                          <div class="product">
                              <div class="number">
-                                 <?= $block->escapeHtml(__('<span>Item %1</span> of %2', $_index+1, $block->countItems()), ['span']) ?>
+                                 <?= $block->escapeHtml(__(
+                                     '<span>Item %1</span> of %2',
+                                     $_index+1,
+                                     $block->countItems()
+                                 ), ['span']) ?>
                              </div>
                              <div class="img photo container">
                                  <?= $block->getImage($_product, 'gift_messages_checkout_thumbnail')->toHtml() ?>
@@ -88,31 +139,68 @@
                              <strong class="product name"><?= $block->escapeHtml($_product->getName()) ?></strong>
                          </div>
                          <div class="options">
-                             <div class="options-items-container" id="options-items-container-<?= (int) $block->getEntity()->getId() ?>-<?= (int) $_item->getId() ?>"></div>
+                             <div class="options-items-container"
+                                  id="options-items-container-<?= (int) $block->getEntity()->getId()
+                                    ?>-<?= (int) $_item->getId() ?>"></div>
                              <?php if ($block->isItemMessagesAvailable($_item)): ?>
                              <button class="action action-gift"
-                                     data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-item-container-<?= (int) $_item->getId() ?>"}}'>
+                                     data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden",
+                                      "toggleContainers":"#gift-messages-for-item-container-<?= (int) $_item->getId()
+                                        ?>"}}'>
                                  <span><?= $block->escapeHtml(__('Gift Message')) ?></span>
                              </button>
-                             <div id="gift-messages-for-item-container-<?= (int) $_item->getId() ?>" class="block message hidden">
+                             <div id="gift-messages-for-item-container-<?= (int) $_item->getId() ?>"
+                                  class="block message hidden">
                                  <fieldset class="fieldset">
-                                     <p><?= $block->escapeHtml(__('Leave a box blank if you don\'t want to add a gift message for that item.')) ?></p>
+                                     <p><?= $block->escapeHtml(__(
+                                         'Leave a box blank if you don\'t want to add a gift message for that item.'
+                                     )) ?></p>
                                      <div class="field from">
-                                         <label for="gift-message-<?= (int) $_item->getId() ?>-from" class="label"><span><?= $block->escapeHtml(__('From')) ?></span></label>
+                                         <label for="gift-message-<?= (int) $_item->getId() ?>-from" class="label">
+                                             <span><?= $block->escapeHtml(__('From')) ?></span>
+                                         </label>
                                          <div class="control">
-                                             <input type="text" name="giftmessage[quote_item][<?= (int) $_item->getId() ?>][from]" id="gift-message-<?= (int) $_item->getId() ?>-from" title="<?= $block->escapeHtmlAttr(__('From')) ?>" value="<?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
+                                             <input type="text"
+                                                    name="giftmessage[quote_item][<?= (int) $_item->getId() ?>][from]"
+                                                    id="gift-message-<?= (int) $_item->getId() ?>-from"
+                                                    title="<?= $block->escapeHtmlAttr(__('From')) ?>"
+                                                    value=
+                                                    "<?= /* @noEscape */
+                                                     $block->getEscaped(
+                                                         $block->getMessage($_item)->getSender(),
+                                                         $block->getDefaultFrom()
+                                                     ) ?>" class="input-text">
                                          </div>
                                      </div>
                                      <div class="field to">
-                                        <label for="gift-message-<?= (int) $_item->getId() ?>-to" class="label"><span><?= $block->escapeHtmlAttr(__('To')) ?></span></label>
+                                        <label for="gift-message-<?= (int) $_item->getId() ?>-to" class="label">
+                                            <span><?= $block->escapeHtmlAttr(__('To')) ?></span>
+                                        </label>
                                         <div class="control">
-                                            <input type="text" name="giftmessage[quote_item][<?= (int) $_item->getId() ?>][to]" id="gift-message-<?= (int) $_item->getId() ?>-to" title="<?= $block->escapeHtmlAttr(__('To')) ?>" value="<?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
+                                            <input type="text"
+                                                   name="giftmessage[quote_item][<?= (int) $_item->getId() ?>][to]"
+                                                   id="gift-message-<?= (int) $_item->getId() ?>-to"
+                                                   title="<?= $block->escapeHtmlAttr(__('To')) ?>"
+                                                   value="<?= /* @noEscape */ $block->getEscaped($block
+                                                       ->getMessage($_item)->getRecipient(), $block->getDefaultTo()) ?>"
+                                                   class="input-text">
                                         </div>
                                      </div>
                                      <div class="field text">
-                                         <label for="gift-message-<?= (int) $_item->getId() ?>-message" class="label"><span><?= $block->escapeHtml(__('Message')) ?></span></label>
+                                         <label for="gift-message-<?= (int) $_item->getId() ?>-message" class="label">
+                                             <span><?= $block->escapeHtml(__('Message')) ?></span>
+                                         </label>
                                          <div class="control">
-                                            <textarea id="gift-message-<?= (int) $_item->getId() ?>-message" class="input-text giftmessage-area" name="giftmessage[quote_item][<?= (int) $_item->getId() ?>][message]" title="<?= $block->escapeHtmlAttr(__('Message')) ?>" rows="5" cols="40"><?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getMessage()) ?></textarea>
+                                            <textarea id="gift-message-<?= (int) $_item->getId() ?>-message"
+                                                      class="input-text giftmessage-area"
+                                                      name="giftmessage[quote_item][<?= (int) $_item->getId()
+                                                        ?>][message]"
+                                                      title="<?= $block->escapeHtmlAttr(__('Message')) ?>"
+                                                      rows="5" cols="40">
+                                                <?= /* @noEscape */ $block->getEscaped(
+                                                    $block->getMessage($_item)->getMessage()
+                                                ) ?>
+                                            </textarea>
                                          </div>
                                      </div>
                                 </fieldset>
@@ -123,15 +211,20 @@
                     <?php endforeach; ?>
                 </ol>
             </dd>
-            <script>
+                <?php $entityId = (int) $block->getEntity()->getId();
+                $scriptString = <<<script
                 require(['jquery'], function(jQuery){
-                    jQuery('#add-gift-options-<?= (int) $block->getEntity()->getId() ?>')
-                        .add('#add-gift-options-for-items-<?= (int) $block->getEntity()->getId() ?>')
+                    jQuery('#add-gift-options-{$entityId}')
+                        .add('#add-gift-options-for-items-{$entityId}')
                         .removeClass('hidden');
                 });
-            </script>
+script;
+                ?>
+                <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
             <?php endif; ?>
-            <dt class="extra-options-container" id="extra-options-container-<?= (int) $block->getEntity()->getId() ?>"></dt>
+            <dt class="extra-options-container"
+                id="extra-options-container-<?= (int) $block->getEntity()->getId() ?>">
+            </dt>
         </dl>
     </fieldset>
     <script type="text/x-magento-init">
@@ -141,52 +234,97 @@
         }
     }
     </script>
-<?php break;
-case 'multishipping_address': ?>
+        <?php
+        break;
+    case 'multishipping_address':
+        ?>
     <fieldset id="add-gift-options-<?= (int) $block->getEntity()->getId() ?>" class="fieldset gift-message">
-        <legend class="legend"><span><?= $block->escapeHtml(__('Do you have any gift items in your order?')) ?></span></legend><br>
+        <legend class="legend">
+            <span><?= $block->escapeHtml(__('Do you have any gift items in your order?')) ?></span>
+        </legend><br>
 
         <div class="field choice" id="add-gift-options-<?= (int) $block->getEntity()->getId() ?>">
-            <input type="checkbox" name="allow_gift_options_<?= (int) $block->getEntity()->getId() ?>" id="allow_gift_options_<?= (int) $block->getEntity()->getId() ?>" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-container-<?= (int) $block->getEntity()->getId() ?>"}'<?php if ($block->getItemsHasMesssages() || $block->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-            <label for="allow_gift_options_<?= (int) $block->getEntity()->getId() ?>" class="label"><span><?= $block->escapeHtml(__('Add Gift Options')) ?></span></label>
+            <input type="checkbox" name="allow_gift_options_<?= (int) $block->getEntity()->getId() ?>"
+                   id="allow_gift_options_<?= (int) $block->getEntity()->getId() ?>" data-mage-init='{"giftOptions":{}}'
+                   value="1"
+                   data-selector='{"id":"#allow-gift-options-container-<?= (int) $block->getEntity()->getId() ?>"}'
+                <?php if ($block->getItemsHasMesssages() || $block->getEntityHasMessage()):?> checked="checked"
+                <?php endif; ?> class="checkbox" />
+            <label for="allow_gift_options_<?= (int) $block->getEntity()->getId() ?>" class="label">
+                <span><?= $block->escapeHtml(__('Add Gift Options')) ?></span>
+            </label>
         </div>
 
         <dl class="options-items" id="allow-gift-options-container-<?= (int) $block->getEntity()->getId() ?>">
             <?php if ($block->isMessagesOrderAvailable() || $block->isMessagesAvailable()): ?>
             <dt id="add-gift-options-for-order-<?= (int) $block->getEntity()->getId() ?>" class="order-title">
                 <div class="field choice">
-                    <input type="checkbox" name="allow_gift_options_for_order_<?= (int) $block->getEntity()->getId() ?>" id="allow_gift_options_for_order_<?= (int) $block->getEntity()->getId() ?>" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-order-container-<?= (int) $block->getEntity()->getId() ?>"}'<?php if ($block->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-                    <label for="allow_gift_options_for_order_<?= (int) $block->getEntity()->getId() ?>" class="label"><span><?= $block->escapeHtml(__('Add Gift Options for the Entire Order')) ?></span></label>
+                    <input type="checkbox" name="allow_gift_options_for_order_<?= (int) $block->getEntity()->getId() ?>"
+                           id="allow_gift_options_for_order_<?= (int) $block->getEntity()->getId() ?>"
+                           data-mage-init='{"giftOptions":{}}' value="1"
+                           data-selector='{"id":"#allow-gift-options-for-order-container-<?= (int) $block->getEntity()
+                               ->getId() ?>"}'
+                        <?php if ($block->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox"/>
+                    <label for="allow_gift_options_for_order_<?= (int) $block->getEntity()->getId() ?>" class="label">
+                        <span><?= $block->escapeHtml(__('Add Gift Options for the Entire Order')) ?></span>
+                    </label>
                 </div>
             </dt>
 
-            <dd id="allow-gift-options-for-order-container-<?= (int) $block->getEntity()->getId() ?>" class="order-options">
-                <div class="options-order-container" id="options-order-container-<?= (int) $block->getEntity()->getId() ?>"></div>
-                <?php if ($block->isMessagesAvailable()): ?>
-                    <?php $_giftMessage = true; ?>
+            <dd id="allow-gift-options-for-order-container-<?= (int) $block->getEntity()->getId() ?>"
+                class="order-options">
+                <div class="options-order-container"
+                     id="options-order-container-<?= (int) $block->getEntity()->getId() ?>"></div>
+                    <?php if ($block->isMessagesAvailable()): ?>
+                        <?php $_giftMessage = true; ?>
                     <button class="action action-gift"
-                            data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-order-container-<?= (int) $block->getEntity()->getId() ?>"}}'>
+                            data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden",
+                             "toggleContainers":"#gift-messages-for-order-container-<?= (int) $block->getEntity()
+                                ->getId() ?>"}}'>
                         <span><?= $block->escapeHtml(__('Gift Message')) ?></span>
                     </button>
-                    <div id="gift-messages-for-order-container-<?= (int) $block->getEntity()->getId() ?>" class="gift-messages-order hidden">
+                    <div id="gift-messages-for-order-container-<?= (int) $block->getEntity()->getId() ?>"
+                         class="gift-messages-order hidden">
                         <fieldset class="fieldset">
-                            <p><?= $block->escapeHtml(__('You can leave this box blank if you don\'t want to add a gift message for this address.')) ?></p>
+                            <p><?= $block->escapeHtml(__('You can leave this box blank if you don\'t want to add a ' .
+                                    'gift message for this address.')) ?></p>
                             <div class="field from">
-                                <label for="gift-message-<?= (int) $block->getEntity()->getId() ?>-from" class="label"><span><?= $block->escapeHtml(__('From')) ?></span></label>
+                                <label for="gift-message-<?= (int) $block->getEntity()->getId() ?>-from"
+                                       class="label"><span><?= $block->escapeHtml(__('From')) ?></span>
+                                </label>
                                 <div class="control">
-                                    <input type="text" name="giftmessage[quote_address][<?= (int) $block->getEntity()->getId() ?>][from]" id="gift-message-<?= (int) $block->getEntity()->getId() ?>-from" title="<?= $block->escapeHtmlAttr(__('From')) ?>" value="<?= /* @noEscape */ $block->getEscaped($block->getMessage()->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
+                                    <input type="text" name="giftmessage[quote_address][<?= (int) $block->getEntity()
+                                        ->getId() ?>][from]"
+                                           id="gift-message-<?= (int) $block->getEntity()->getId() ?>-from"
+                                           title="<?= $block->escapeHtmlAttr(__('From')) ?>"
+                                           value="<?= /* @noEscape */ $block->getEscaped($block->getMessage()
+                                               ->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
                                 </div>
                             </div>
                             <div class="field to">
-                                <label for="gift-message-<?= (int) $block->getEntity()->getId() ?>-to" class="label"><span><?= $block->escapeHtml(__('To')) ?></span></label>
+                                <label for="gift-message-<?= (int) $block->getEntity()->getId() ?>-to"
+                                       class="label"><span><?= $block->escapeHtml(__('To')) ?></span>
+                                </label>
                                 <div class="control">
-                                    <input type="text" name="giftmessage[quote_address][<?= (int) $block->getEntity()->getId() ?>][to]" id="gift-message-<?= (int) $block->getEntity()->getId() ?>-to" title="<?= $block->escapeHtmlAttr(__('To')) ?>" value="<?= /* @noEscape */ $block->getEscaped($block->getMessage()->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
+                                    <input type="text" name="giftmessage[quote_address][<?= (int) $block->getEntity()
+                                        ->getId() ?>][to]"
+                                           id="gift-message-<?= (int) $block->getEntity()->getId() ?>-to"
+                                           title="<?= $block->escapeHtmlAttr(__('To')) ?>"
+                                           value="<?= /* @noEscape */ $block->getEscaped($block->getMessage()
+                                               ->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
                                 </div>
                             </div>
                             <div class="field text">
-                                <label for="gift-message-<?= (int) $block->getEntity()->getId() ?>-message" class="label"><span><?= $block->escapeHtml(__('Message')) ?></span></label>
+                                <label for="gift-message-<?= (int) $block->getEntity()->getId() ?>-message"
+                                       class="label"><span><?= $block->escapeHtml(__('Message')) ?></span>
+                                </label>
                                 <div class="control">
-                                    <textarea id="gift-message-<?= (int) $block->getEntity()->getId() ?>-message" class="input-text" name="giftmessage[quote_address][<?= (int) $block->getEntity()->getId() ?>][message]" title="<?= $block->escapeHtmlAttr(__('Message')) ?>" rows="5" cols="40"><?= /* @noEscape */ $block->getEscaped($block->getMessage()->getMessage()) ?></textarea>
+                                    <textarea id="gift-message-<?= (int) $block->getEntity()->getId() ?>-message"
+                                              class="input-text" name="giftmessage[quote_address][<?= (int) $block
+                                                ->getEntity()->getId() ?>][message]"
+                                              title="<?= $block->escapeHtmlAttr(__('Message')) ?>" rows="5" cols="40">
+                                        <?= /* @noEscape */ $block->getEscaped($block->getMessage()->getMessage()) ?>
+                                    </textarea>
                                 </div>
                             </div>
                         </fieldset>
@@ -195,54 +333,106 @@ case 'multishipping_address': ?>
             </dd>
             <?php endif; ?>
             <?php if ($block->isItemsAvailable()): ?>
-            <dt id="add-gift-options-for-items-<?= (int) $block->getEntity()->getId() ?>" class="order-title individual">
+            <dt id="add-gift-options-for-items-<?= (int) $block->getEntity()->getId()?>" class="order-title individual">
                 <div class="field choice">
-                    <input type="checkbox" name="allow_gift_options_for_items_<?= (int) $block->getEntity()->getId() ?>" id="allow_gift_options_for_items_<?= (int) $block->getEntity()->getId() ?>" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-items-container-<?= (int) $block->getEntity()->getId() ?>"}'<?php if ($block->getItemsHasMesssages()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-                    <label for="allow_gift_options_for_items_<?= (int) $block->getEntity()->getId() ?>" class="label"><span><?= $block->escapeHtml(__('Add Gift Options for Individual Items')) ?></span></label>
+                    <input type="checkbox" name="allow_gift_options_for_items_<?= (int) $block->getEntity()->getId() ?>"
+                           id="allow_gift_options_for_items_<?= (int) $block->getEntity()->getId() ?>"
+                           data-mage-init='{"giftOptions":{}}' value="1"
+                           data-selector='{"id":"#allow-gift-options-for-items-container-<?= (int) $block->getEntity()
+                               ->getId() ?>"}'
+                        <?php if ($block->getItemsHasMesssages()): ?> checked="checked"<?php endif; ?>
+                           class="checkbox" />
+                    <label for="allow_gift_options_for_items_<?= (int) $block->getEntity()->getId() ?>" class="label">
+                        <span><?= $block->escapeHtml(__('Add Gift Options for Individual Items')) ?></span>
+                    </label>
                 </div>
             </dt>
 
-            <dd id="allow-gift-options-for-items-container-<?= (int) $block->getEntity()->getId() ?>" class="order-options individual">
+            <dd id="allow-gift-options-for-items-container-<?= (int) $block->getEntity()->getId() ?>"
+                class="order-options individual">
                 <ol class="items">
                 <?php foreach ($block->getItems() as $_index => $_item): ?>
                      <?php $_product = $_item->getProduct() ?>
                     <li class="item">
                         <div class="product">
-                            <div class="number"><?= $block->escapeHtml(__('<span>Item %1</span> of %2', $_index+1, $block->countItems()), ['span']) ?></div>
+                            <div class="number">
+                                <?= $block->escapeHtml(
+                                    __('<span>Item %1</span> of %2', $_index+1, $block->countItems()),
+                                    ['span']
+                                ) ?></div>
                             <div class="img photo container">
                              <?= $block->getImage($_product, 'gift_messages_checkout_thumbnail')->toHtml() ?>
                             </div>
                             <strong class="product-name"><?= $block->escapeHtml($_product->getName()) ?></strong>
                         </div>
                         <div class="options">
-                            <div class="options-items-container" id="options-items-container-<?= (int) $block->getEntity()->getId() ?>-<?= (int) $_item->getId() ?>"></div>
-                            <input type="hidden" name="giftoptions[quote_address_item][<?= (int) $_item->getId() ?>][address]" value="<?= (int) $block->getEntity()->getId() ?>" />
+                            <div class="options-items-container"
+                                 id="options-items-container-<?= (int) $block->getEntity()->getId()?>-<?= (int)$_item
+                                     ->getId() ?>">
+                            </div>
+                            <input type="hidden"
+                                   name="giftoptions[quote_address_item][<?= (int) $_item->getId() ?>][address]"
+                                   value="<?= (int) $block->getEntity()->getId() ?>" />
                             <?php if ($block->isItemMessagesAvailable($_item)): ?>
                                 <?php $_giftMessage = true; ?>
                                 <button class="action action-gift"
-                                     data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-item-container-<?= (int) $_item->getId() ?>"}}'>
+                                     data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden",
+                                      "toggleContainers":"#gift-messages-for-item-container-<?= (int) $_item->getId()
+                                        ?>"}}'>
                                     <span><?= $block->escapeHtml(__('Gift Message')) ?></span>
                                 </button>
-                                <div id="gift-messages-for-item-container-<?= (int) $_item->getId() ?>" class="block message hidden">
+                                <div id="gift-messages-for-item-container-<?= (int) $_item->getId() ?>"
+                                     class="block message hidden">
                                     <fieldset class="fieldset">
-                                        <p><?= $block->escapeHtml(__('You can leave this box blank if you don\'t want to add a gift message for the item.')) ?></p>
-                                        <input type="hidden" name="giftmessage[quote_address_item][<?= (int) $_item->getId() ?>][address]" value="<?= (int) $block->getEntity()->getId() ?>" />
+                                        <p><?= $block->escapeHtml(__(
+                                            'You can leave this box blank if you don\'t want to add a gift message ' .
+                                            'for the item.'
+                                        )) ?></p>
+                                        <input type="hidden" name="giftmessage[quote_address_item][<?= (int) $_item
+                                            ->getId() ?>][address]" value="<?= (int) $block->getEntity()->getId() ?>" />
                                         <div class="field from">
-                                            <label for="gift-message-<?= (int) $_item->getId() ?>-from" class="label"><span><?= $block->escapeHtml(__('From')) ?></span></label>
+                                            <label for="gift-message-<?= (int) $_item->getId() ?>-from" class="label">
+                                                <span><?= $block->escapeHtml(__('From')) ?></span>
+                                            </label>
                                             <div class="control">
-                                                <input type="text" name="giftmessage[quote_address_item][<?= (int) $_item->getId() ?>][from]" id="gift-message-<?= (int) $_item->getId() ?>-from" title="<?= $block->escapeHtmlAttr(__('From')) ?>"  value="<?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
+                                                <input type="text"
+                                                       name="giftmessage[quote_address_item][<?= (int) $_item->getId()
+                                                        ?>][from]" id="gift-message-<?= (int) $_item->getId() ?>-from"
+                                                       title="<?= $block->escapeHtmlAttr(__('From')) ?>"
+                                                       value="<?= /* @noEscape */ $block->getEscaped($block
+                                                           ->getMessage($_item)->getSender(), $block->getDefaultFrom())
+                                                                ?>" class="input-text">
                                             </div>
                                         </div>
                                         <div class="field to">
-                                            <label for="gift-message-<?= (int) $_item->getId() ?>-to" class="label"><span><?= $block->escapeHtml(__('To')) ?></span></label>
+                                            <label for="gift-message-<?= (int) $_item->getId() ?>-to" class="label">
+                                                <span><?= $block->escapeHtml(__('To')) ?></span>
+                                            </label>
                                             <div class="control">
-                                                <input type="text" name="giftmessage[quote_address_item][<?= (int) $_item->getId() ?>][to]" id="gift-message-<?= (int) $_item->getId() ?>-to" title="<?= $block->escapeHtmlAttr(__('To')) ?>" value="<?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
+                                                <input type="text"
+                                                       name="giftmessage[quote_address_item][<?= (int) $_item->getId()
+                                                        ?>][to]" id="gift-message-<?= (int) $_item->getId() ?>-to"
+                                                       title="<?= $block->escapeHtmlAttr(__('To')) ?>"
+                                                       value=
+                                                       "<?= /* @noEscape */ $block->getEscaped($block
+                                                           ->getMessage($_item)->getRecipient(), $block->getDefaultTo())
+                                                        ?>" class="input-text">
                                             </div>
                                         </div>
                                         <div class="field text">
-                                            <label for="gift-message-<?= (int) $_item->getId() ?>-message" class="label"><span><?= $block->escapeHtml(__('Message')) ?></span></label>
+                                            <label for="gift-message-<?= (int) $_item->getId()?>-message" class="label">
+                                                <span><?= $block->escapeHtml(__('Message')) ?></span>
+                                            </label>
                                             <div class="control">
-                                                <textarea id="gift-message-<?= (int) $_item->getId() ?>-message" class="input-text giftmessage-area" name="giftmessage[quote_address_item][<?= (int) $_item->getId() ?>][message]" title="<?= $block->escapeHtmlAttr(__('Message')) ?>" rows="5" cols="10"><?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getMessage()) ?></textarea>
+                                                <textarea id="gift-message-<?= (int) $_item->getId() ?>-message"
+                                                          class="input-text giftmessage-area"
+                                                          name="giftmessage[quote_address_item][<?= (int) $_item
+                                                              ->getId() ?>][message]"
+                                                          title="<?= $block->escapeHtmlAttr(__('Message')) ?>" rows="5"
+                                                          cols="10">
+                                                    <?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)
+                                                        ->getMessage()) ?>
+                                                </textarea>
                                             </div>
                                         </div>
                                  </fieldset>
@@ -254,19 +444,23 @@ case 'multishipping_address': ?>
                 </ol>
             </dd>
             <?php endif; ?>
-            <dt class="extra-options-container" id="extra-options-container-<?= (int) $block->getEntity()->getId() ?>"></dt>
+            <dt class="extra-options-container" id="extra-options-container-<?= (int) $block->getEntity()->getId() ?>">
+            </dt>
         </dl>
     </fieldset>
     <script type="text/x-magento-init">
         {
-            "#allow_gift_options_<?= (int) $block->getEntity()->getId() ?>, #allow_gift_options_for_order_<?= (int) $block->getEntity()->getId() ?>, #allow_gift_options_for_items_<?= (int) $block->getEntity()->getId() ?>": {
+            "#allow_gift_options_<?= (int) $block->getEntity()->getId() ?>,
+             #allow_gift_options_for_order_<?= (int) $block->getEntity()->getId() ?>,
+              #allow_gift_options_for_items_<?= (int) $block->getEntity()->getId() ?>": {
                 "giftOptions": {}
             }
         }
     </script>
-    <?php break; ?>
-<?php endswitch ?>
-<?php if ($_giftMessage): ?>
+        <?php
+        break;
+    endswitch;
+if ($_giftMessage): ?>
 <script type="text/x-magento-init">
     {
         "#shipping_method_form": {
diff --git a/app/code/Magento/GoogleAdwords/view/frontend/templates/code.phtml b/app/code/Magento/GoogleAdwords/view/frontend/templates/code.phtml
index e3c46bc27834c..45ffe733f5c5f 100644
--- a/app/code/Magento/GoogleAdwords/view/frontend/templates/code.phtml
+++ b/app/code/Magento/GoogleAdwords/view/frontend/templates/code.phtml
@@ -5,22 +5,31 @@
  */
 ?>
 <?php
-/** @var $block \Magento\GoogleAdwords\Block\Code */
+/**
+ * @var $block \Magento\GoogleAdwords\Block\Code
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
 <!-- Google Code for Sale Conversion Page -->
-<script>
+<?php $scriptString = <<<script
     /* <![CDATA[ */
-    var google_conversion_id = <?= $block->escapeJs($block->getHelper()->getConversionId()) ?>;
-    var google_conversion_language = "<?= $block->escapeJs($block->getHelper()->getConversionLanguage()) ?>";
-    var google_conversion_format = "<?= $block->escapeJs($block->getHelper()->getConversionFormat()) ?>";
-    var google_conversion_color = "<?= $block->escapeJs($block->getHelper()->getConversionColor()) ?>";
-    var google_conversion_label = "<?= $block->escapeJs($block->getHelper()->getConversionLabel()) ?>";
-    var google_conversion_value = <?= $block->escapeJs($block->getHelper()->getConversionValue()) ?>;
-    <?php if ($block->getHelper()->hasSendConversionValueCurrency() && $block->getHelper()->getConversionValueCurrency()) : ?>
-    var google_conversion_currency = "<?= $block->escapeJs($block->getHelper()->getConversionValueCurrency()) ?>";
-    <?php endif; ?>
+    var google_conversion_id = {$block->escapeJs($block->getHelper()->getConversionId())};
+    var google_conversion_language = "{$block->escapeJs($block->getHelper()->getConversionLanguage())}";
+    var google_conversion_format = "{$block->escapeJs($block->getHelper()->getConversionFormat())}";
+    var google_conversion_color = "{$block->escapeJs($block->getHelper()->getConversionColor())}";
+    var google_conversion_label = "{$block->escapeJs($block->getHelper()->getConversionLabel())}";
+    var google_conversion_value = {$block->escapeJs($block->getHelper()->getConversionValue())};
+script;
+if ($block->getHelper()->hasSendConversionValueCurrency() && $block->getHelper()->getConversionValueCurrency()):
+        $scriptString .= <<<script
+    var google_conversion_currency = "{$block->escapeJs($block->getHelper()->getConversionValueCurrency())}";
+script;
+endif;
+$scriptString .= <<<script
     /* ]]> */
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <script src="<?= $block->escapeHtmlAttr($block->getHelper()->getConversionJsSrc()) ?>"></script>
 <noscript>
     <div style="display:inline;">
diff --git a/app/code/Magento/Msrp/etc/adminhtml/system.xml b/app/code/Magento/Msrp/etc/adminhtml/system.xml
index 8f6c3750c3835..3b9d07be2f7c7 100644
--- a/app/code/Magento/Msrp/etc/adminhtml/system.xml
+++ b/app/code/Magento/Msrp/etc/adminhtml/system.xml
@@ -14,7 +14,7 @@
                     <label>Enable MAP</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>
-                        <![CDATA[<strong style="color:red">Warning!</strong> Enabling MAP by default will hide all product prices on Storefront.]]>
+                        <![CDATA[<strong class="colorRed">Warning!</strong> Enabling MAP by default will hide all product prices on Storefront.]]>
                     </comment>
                 </field>
                 <field id="display_price_type" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" canRestore="1">
diff --git a/app/code/Magento/Msrp/i18n/en_US.csv b/app/code/Magento/Msrp/i18n/en_US.csv
index d47d72b2bdc9a..9ed2d2fb86597 100644
--- a/app/code/Magento/Msrp/i18n/en_US.csv
+++ b/app/code/Magento/Msrp/i18n/en_US.csv
@@ -13,7 +13,7 @@ Price,Price
 "Add to Cart","Add to Cart"
 "Minimum Advertised Price","Minimum Advertised Price"
 "Enable MAP","Enable MAP"
-"<strong style=""color:red"">Warning!</strong> Enabling MAP by default will hide all product prices on Storefront.","<strong style=""color:red"">Warning!</strong> Enabling MAP by default will hide all product prices on Storefront."
+"<strong class=""colorRed"">Warning!</strong> Enabling MAP by default will hide all product prices on Storefront.","<strong class=""colorRed"">Warning!</strong> Enabling MAP by default will hide all product prices on Storefront."
 "Display Actual Price","Display Actual Price"
 "Default Popup Text Message","Default Popup Text Message"
 "Default ""What's This"" Text Message","Default ""What's This"" Text Message"
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
index 04d5fae435816..3f8b31d784452 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
@@ -623,7 +623,7 @@
                         <label>Header Image URL</label>
                         <config_path>paypal/style/paypal_hdrimg</config_path>
                         <tooltip>
-                            <![CDATA[The image at the top left of the checkout page. Max size is 750x90-pixel. <strong style="color:red">https</strong> is highly encouraged.]]>
+                            <![CDATA[The image at the top left of the checkout page. Max size is 750x90-pixel. <strong class="colorRed">https</strong> is highly encouraged.]]>
                         </tooltip>
                         <attribute type="shared">1</attribute>
                     </field>
diff --git a/app/code/Magento/Paypal/i18n/en_US.csv b/app/code/Magento/Paypal/i18n/en_US.csv
index 54dd611d49073..e85353dc1d98f 100644
--- a/app/code/Magento/Paypal/i18n/en_US.csv
+++ b/app/code/Magento/Paypal/i18n/en_US.csv
@@ -585,9 +585,9 @@ Schedule,Schedule
                         "
 "Header Image URL","Header Image URL"
 "
-                            The image at the top left of the checkout page. Max size is 750x90-pixel. <strong style=""color:red"">https</strong> is highly encouraged.
+                            The image at the top left of the checkout page. Max size is 750x90-pixel. <strong class=""colorRed"">https</strong> is highly encouraged.
                         ","
-                            The image at the top left of the checkout page. Max size is 750x90-pixel. <strong style=""color:red"">https</strong> is highly encouraged.
+                            The image at the top left of the checkout page. Max size is 750x90-pixel. <strong class=""colorRed"">https</strong> is highly encouraged.
                         "
 "Header Background Color","Header Background Color"
 "
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Form.php
index 3eb6cce37f567..d86954f0124ea 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Form.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Order\Invoice\Create;
 
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Adminhtml invoice create form
  *
@@ -14,6 +16,22 @@
  */
 class Form extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
 {
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Framework\Registry $registry
+     * @param \Magento\Sales\Helper\Admin $adminHelper
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Framework\Registry $registry,
+        \Magento\Sales\Helper\Admin $adminHelper,
+        array $data = []
+    ) {
+        $data['taxHelper'] = ObjectManager::getInstance()->get(\Magento\Tax\Helper\Data::class);
+        parent::__construct($context, $registry, $adminHelper, $data);
+    }
+
     /**
      * Retrieve invoice order
      *
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml
index 81dc778cff2df..d798f8e5359e3 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml
@@ -5,6 +5,7 @@
  */
 
 /* @var \Magento\Sales\Block\Adminhtml\Order\Creditmemo\Create\Items $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?php
 /** @var Magento\Sales\ViewModel\CreditMemo\Create\UpdateTotalsButton $viewModel */
@@ -17,7 +18,7 @@ $_items = $block->getCreditmemo()->getAllItems();
         <span class="title"><?= $block->escapeHtml(__('Items to Refund')) ?></span>
     </div>
 
-    <?php if (count($_items)) : ?>
+    <?php if (count($_items)): ?>
     <div class="admin__table-wrapper">
         <table class="data-table admin__table-primary order-creditmemo-tables">
             <thead>
@@ -25,7 +26,7 @@ $_items = $block->getCreditmemo()->getAllItems();
                     <th class="col-product"><span><?= $block->escapeHtml(__('Product')) ?></span></th>
                     <th class="col-price"><span><?= $block->escapeHtml(__('Price')) ?></span></th>
                     <th class="col-ordered-qty"><span><?= $block->escapeHtml(__('Qty')) ?></span></th>
-                    <?php if ($block->canReturnToStock()) : ?>
+                    <?php if ($block->canReturnToStock()): ?>
                     <th class="col-return-to-stock"><span><?= $block->escapeHtml(__('Return to Stock')) ?></span></th>
                     <?php endif; ?>
                     <th class="col-refund"><span><?= $block->escapeHtml(__('Qty to Refund')) ?></span></th>
@@ -35,7 +36,7 @@ $_items = $block->getCreditmemo()->getAllItems();
                     <th class="col-total last"><span><?= $block->escapeHtml(__('Row Total')) ?></span></th>
                 </tr>
             </thead>
-            <?php if ($block->canEditQty()) : ?>
+            <?php if ($block->canEditQty()): ?>
             <tfoot>
                 <tr>
                     <td colspan="4">&nbsp;</td>
@@ -46,10 +47,10 @@ $_items = $block->getCreditmemo()->getAllItems();
                 </tr>
             </tfoot>
             <?php endif; ?>
-            <?php $i = 0; foreach ($_items as $_item) : ?>
-                <?php if ($_item->getOrderItem()->getParentItem()) :
+            <?php $i = 0; foreach ($_items as $_item): ?>
+                <?php if ($_item->getOrderItem()->getParentItem()):
                     continue;
-                else :
+                else:
                     $i++;
                 endif; ?>
                 <tbody class="<?= /* @noEscape */ $i%2 ? 'even' : 'odd' ?>">
@@ -59,7 +60,7 @@ $_items = $block->getCreditmemo()->getAllItems();
             <?php endforeach; ?>
         </table>
     </div>
-    <?php else : ?>
+    <?php else: ?>
     <div class="no-items">
         <?= $block->escapeHtml(__('No Items To Refund')) ?>
     </div>
@@ -68,7 +69,7 @@ $_items = $block->getCreditmemo()->getAllItems();
 
 <?php $orderTotalBar = $block->getChildHtml('order_totalbar'); ?>
 
-<?php if (!empty($orderTotalBar)) : ?>
+<?php if (!empty($orderTotalBar)): ?>
 <section class="fieldset-wrapper">
     <?= /* @noEscape */ $orderTotalBar ?>
 </section>
@@ -94,7 +95,8 @@ $_items = $block->getCreditmemo()->getAllItems();
                                   class="admin__control-textarea"
                                   name="creditmemo[comment_text]"
                                   rows="3"
-                                  cols="5"><?= $block->escapeHtml($block->getCreditmemo()->getCommentText()) ?></textarea>
+                                  cols="5"><?= $block->escapeHtml($block->getCreditmemo()->getCommentText()) ?>
+                        </textarea>
                     </div>
                 </div>
             </div>
@@ -116,7 +118,7 @@ $_items = $block->getCreditmemo()->getAllItems();
                         <span><?= $block->escapeHtml(__('Append Comments')) ?></span>
                     </label>
                 </div>
-                <?php if ($block->canSendCreditmemoEmail()) :?>
+                <?php if ($block->canSendCreditmemoEmail()):?>
                 <div class="field choice admin__field admin__field-option field-email-copy">
                     <input id="send_email"
                            class="admin__control-checkbox"
@@ -139,7 +141,8 @@ $_items = $block->getCreditmemo()->getAllItems();
     </div>
 </section>
 
-<script>
+<?php $scriptString = <<<script
+
 require(['jquery'], function(jQuery){
 
 //<![CDATA[
@@ -217,4 +220,6 @@ window.checkButtonsRelation = checkButtonsRelation;
 //]]>
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/totals/adjustments.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/totals/adjustments.phtml
index f46b8c11cc240..b47ddc95ce363 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/totals/adjustments.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/totals/adjustments.phtml
@@ -3,9 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?php $_source  = $block->getSource() ?>
-<?php if ($_source) : ?>
+<?php if ($_source): ?>
     <tr>
         <td class="label"><?= $block->escapeHtml($block->getShippingLabel()) ?><div id="shipping_amount_adv"></div></td>
         <td>
@@ -17,7 +18,7 @@
         </td>
     </tr>
     <tr>
-        <td class="label"><?= $block->escapeHtml(__('Adjustment Refund')) ?><div id="adjustment_positive_adv"></div></td>
+        <td class="label"><?= $block->escapeHtml(__('Adjustment Refund'))?><div id="adjustment_positive_adv"></div></td>
         <td>
             <input type="text"
                    name="creditmemo[adjustment_positive]"
@@ -34,12 +35,13 @@
                    value="<?= $block->escapeHtmlAttr($_source->getBaseAdjustmentNegative()) ?>"
                    class="input-text admin__control-text not-negative-amount"
                    id="adjustment_negative"/>
-            <script>
+            <?php $scriptString = <<<script
                 require(['prototype'], function(){
 
                 //<![CDATA[
                 Validation.addAllThese([
-                    ['not-negative-amount', '<?= $block->escapeJs(__('Please enter a positive number in this field.')) ?>', function(v) {
+                    ['not-negative-amount', '{$block->escapeJs(__('Please enter a positive number in this field.'))}',
+                     function(v) {
                         if(v.length)
                             return /^\s*\d+([,.]\d+)*\s*%?\s*$/.test(v);
                         else
@@ -73,7 +75,9 @@
                 //]]>
 
                 });
-            </script>
+script;
+            ?>
+            <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
         </td>
     </tr>
 
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/form.phtml
index da9f0d273af24..02bbdae875962 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/form.phtml
@@ -7,10 +7,12 @@
 // phpcs:disable Magento2.Templates.ThisInTemplate
 
 /* @var \Magento\Sales\Block\Adminhtml\Order\Invoice\Create\Form $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <form id="edit_form" class="order-invoice-edit" method="post" action="<?= $block->escapeUrl($block->getSaveUrl()) ?>">
     <?= $block->getBlockHtml('formkey') ?>
     <?php $_order = $block->getInvoice()->getOrder() ?>
+    <?php $taxHelper = $block->getData('taxHelper') ?>
     <?= $block->getChildHtml('order_info') ?>
 
     <section class="admin__page-section">
@@ -18,17 +20,20 @@
             <span class="title"><?= $block->escapeHtml(__('Payment &amp; Shipping Method')) ?></span>
         </div>
         <div class="admin__page-section-content">
-            <div class="admin__page-section-item order-payment-method<?php if ($_order->getIsVirtual()) : ?> order-payment-method-virtual<?php endif; ?>">
+            <div class="admin__page-section-item order-payment-method
+            <?php if ($_order->getIsVirtual()): ?> order-payment-method-virtual<?php endif; ?>">
                 <div class="admin__page-section-item-title">
                     <span class="title"><?= $block->escapeHtml(__('Payment Information')) ?></span>
                 </div>
                 <div class="admin__page-section-item-content">
                     <div class="order-payment-method-title"><?= $block->getChildHtml('order_payment') ?></div>
-                    <div class="order-payment-currency"><?= $block->escapeHtml(__('The order was placed using %1.', $_order->getOrderCurrencyCode())) ?></div>
+                    <div class="order-payment-currency">
+                        <?= $block->escapeHtml(__('The order was placed using %1.', $_order->getOrderCurrencyCode())) ?>
+                    </div>
                     <div class="order-payment-additional"><?= $block->getChildHtml('order_payment_additional') ?></div>
                 </div>
             </div>
-            <?php if (!$_order->getIsVirtual()) : ?>
+            <?php if (!$_order->getIsVirtual()): ?>
                 <div class="admin__page-section-item order-shipping-address">
                     <?php /*Shipping Address */ ?>
                     <div class="admin__page-section-item-title">
@@ -36,35 +41,45 @@
                     </div>
                     <div class="admin__page-section-item-content">
                         <div class="shipping-description-wrapper">
-                            <div class="shipping-description-title"><?= $block->escapeHtml($_order->getShippingDescription()) ?></div>
+                            <div class="shipping-description-title">
+                                <?= $block->escapeHtml($_order->getShippingDescription()) ?></div>
                             <div class="shipping-description-content">
                                 <?= $block->escapeHtml(__('Total Shipping Charges')) ?>:
 
-                                <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayShippingPriceIncludingTax()) : ?>
+                                <?php if ($taxHelper->displayShippingPriceIncludingTax()): ?>
                                     <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
-                                <?php else : ?>
+                                <?php else: ?>
                                     <?php $_excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
                                 <?php endif; ?>
                                 <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
 
                                 <?= /* @noEscape */ $_excl ?>
-                                <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $_incl != $_excl) : ?>
+                                <?php if ($taxHelper->displayShippingBothPrices() && $_incl != $_excl): ?>
                                     (<?= $block->escapeHtml(__('Incl. Tax')) ?> <?= /* @noEscape */ $_incl ?>)
                                 <?php endif; ?>
                             </div>
                         </div>
-                        <?php if ($block->canCreateShipment() && $block->canShipPartiallyItem()) : ?>
+                        <?php if ($block->canCreateShipment() && $block->canShipPartiallyItem()): ?>
                             <div class="admin__field admin__field-option">
                                 <input type="checkbox" name="invoice[do_shipment]" id="invoice_do_shipment" value="1"
-                                       class="admin__control-checkbox" <?= $block->hasInvoiceShipmentTypeMismatch() ? ' disabled="disabled"' : '' ?> />
+                                       class="admin__control-checkbox"
+                                    <?= $block->hasInvoiceShipmentTypeMismatch() ? ' disabled="disabled"' : '' ?> />
                                 <label for="invoice_do_shipment"
-                                       class="admin__field-label"><span><?= $block->escapeHtml(__('Create Shipment')) ?></span></label>
+                                       class="admin__field-label">
+                                    <span><?= $block->escapeHtml(__('Create Shipment')) ?></span>
+                                </label>
                             </div>
-                            <?php if ($block->hasInvoiceShipmentTypeMismatch()) : ?>
-                                <small><?= $block->escapeHtml(__('Invoice and shipment types do not match for some items on this order. You can create a shipment only after creating the invoice.')) ?></small>
+                            <?php if ($block->hasInvoiceShipmentTypeMismatch()): ?>
+                                <small>
+                                    <?= $block->escapeHtml(__(
+                                        'Invoice and shipment types do not match for some items on this order. ' .
+                                        'You can create a shipment only after creating the invoice.'
+                                    )) ?>
+                                </small>
                             <?php endif; ?>
                         <?php endif; ?>
-                        <div id="tracking" style="display:none;"><?= $block->getChildHtml('tracking', false) ?></div>
+                        <div id="tracking"><?= $block->getChildHtml('tracking', false) ?></div>
+                        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display:none;", 'div#tracking') ?>
                     </div>
                 </div>
             <?php endif; ?>
@@ -75,7 +90,10 @@
         <?= $block->getChildHtml('order_items') ?>
     </section>
 </form>
-<script>
+
+<?php $forcedShipmentCreate = (int) $block->getForcedShipmentCreate();
+$scriptString = <<<script
+
 require(['prototype'], function(){
 
 //<![CDATA[
@@ -91,7 +109,7 @@ require(['prototype'], function(){
     }
 
     /*forced creating of shipment*/
-    var forcedShipmentCreate = <?= (int) $block->getForcedShipmentCreate() ?>;
+    var forcedShipmentCreate = {$forcedShipmentCreate};
     var shipmentElement = $('invoice_do_shipment');
     if (forcedShipmentCreate && shipmentElement) {
         shipmentElement.checked = true;
@@ -105,4 +123,6 @@ require(['prototype'], function(){
 //]]>
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
index 9837a6b3c209b..2d3c517e98daf 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
@@ -3,10 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Sales\Block\Adminhtml\Order\Invoice\Create\Items $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <?php $_itemsGridLabel = $block->getForcedShipmentCreate() ? 'Items to Invoice and Ship' : 'Items to Invoice'; ?>
+        <?php $_itemsGridLabel = $block->getForcedShipmentCreate() ? 'Items to Invoice and Ship' : 'Items to Invoice';?>
         <span class="title"><?= $block->escapeHtml(__('%1', $_itemsGridLabel)) ?></span>
     </div>
     <div class="admin__page-section-content grid">
@@ -24,7 +27,7 @@
                         <th class="col-total last"><span><?= $block->escapeHtml(__('Row Total')) ?></span></th>
                     </tr>
                 </thead>
-                <?php if ($block->canEditQty()) : ?>
+                <?php if ($block->canEditQty()): ?>
                     <tfoot>
                         <tr>
                             <td colspan="3">&nbsp;</td>
@@ -34,10 +37,10 @@
                     </tfoot>
                 <?php endif; ?>
                 <?php $_items = $block->getInvoice()->getAllItems() ?>
-                <?php $_i = 0; foreach ($_items as $_item) : ?>
-                    <?php if ($_item->getOrderItem()->getParentItem()) :
+                <?php $_i = 0; foreach ($_items as $_item): ?>
+                    <?php if ($_item->getOrderItem()->getParentItem()):
                         continue;
-                    else :
+                    else:
                         $_i++;
                     endif; ?>
                     <tbody class="<?= /* @noEscape */ $_i%2 ? 'even' : 'odd' ?>">
@@ -52,7 +55,7 @@
 
 <?php $orderTotalBar = $block->getChildHtml('order_totalbar'); ?>
 
-<?php if (!empty($orderTotalBar)) : ?>
+<?php if (!empty($orderTotalBar)): ?>
 <section class="admin__page-section">
     <?= /* @noEscape */ $orderTotalBar ?>
 </section>
@@ -74,7 +77,8 @@
                     </label>
                     <div class="admin__field-control">
                         <textarea id="invoice_comment_text" name="invoice[comment_text]" class="admin__control-textarea"
-                                  rows="3" cols="5"><?= $block->escapeHtml($block->getInvoice()->getCommentText()) ?></textarea>
+                                  rows="3" cols="5"><?= $block->escapeHtml($block->getInvoice()->getCommentText()) ?>
+                        </textarea>
                     </div>
                 </div>
             </div>
@@ -86,37 +90,41 @@
             </div>
             <div class="admin__page-section-item-content order-totals-actions">
                 <?= $block->getChildHtml('invoice_totals') ?>
-                <?php if ($block->isCaptureAllowed()) : ?>
-                    <?php if ($block->canCapture()) : ?>
+                <?php if ($block->isCaptureAllowed()): ?>
+                    <?php if ($block->canCapture()): ?>
                         <div class="admin__field">
-                            <?php
-                            /*
-                            <label for="invoice_do_capture" class="normal"><?= __('Capture Amount') ?></label>
-                            <input type="checkbox" name="invoice[do_capture]" id="invoice_do_capture" value="1" checked/>
-                            */
-                            ?>
-                          <label for="invoice_do_capture" class="admin__field-label"><?= $block->escapeHtml(__('Amount')) ?></label>
+                          <label for="invoice_do_capture" class="admin__field-label">
+                              <?= $block->escapeHtml(__('Amount')) ?>
+                          </label>
                           <select class="admin__control-select" name="invoice[capture_case]">
                               <option value="online"><?= $block->escapeHtml(__('Capture Online')) ?></option>
                               <option value="offline"><?= $block->escapeHtml(__('Capture Offline')) ?></option>
                               <option value="not_capture"><?= $block->escapeHtml(__('Not Capture')) ?></option>
                           </select>
                         </div>
-                    <?php elseif ($block->isGatewayUsed()) :?>
+                    <?php elseif ($block->isGatewayUsed()):?>
                         <input type="hidden" name="invoice[capture_case]" value="offline"/>
-                        <div><?= $block->escapeHtml(__('The invoice will be created offline without the payment gateway.')) ?></div>
+                        <div>
+                            <?= $block->escapeHtml(__(
+                                'The invoice will be created offline without the payment gateway.'
+                            )) ?>
+                        </div>
                     <?php endif; ?>
                 <?php endif; ?>
                 <div class="admin__field admin__field-option field-append">
                     <input id="notify_customer" name="invoice[comment_customer_notify]" value="1" type="checkbox"
                            class="admin__control-checkbox" />
-                    <label class="admin__field-label" for="notify_customer"><?= $block->escapeHtml(__('Append Comments')) ?></label>
+                    <label class="admin__field-label" for="notify_customer">
+                        <?= $block->escapeHtml(__('Append Comments')) ?>
+                    </label>
                 </div>
-                <?php if ($block->canSendInvoiceEmail()) : ?>
+                <?php if ($block->canSendInvoiceEmail()): ?>
                 <div class="admin__field admin__field-option field-email">
                     <input id="send_email" name="invoice[send_email]" value="1" type="checkbox"
                            class="admin__control-checkbox" />
-                    <label class="admin__field-label" for="send_email"><?= $block->escapeHtml(__('Email Copy of Invoice')) ?></label>
+                    <label class="admin__field-label" for="send_email">
+                        <?= $block->escapeHtml(__('Email Copy of Invoice')) ?>
+                    </label>
                 </div>
                 <?php endif; ?>
                 <?= $block->getChildHtml('submit_before') ?>
@@ -129,13 +137,16 @@
     </div>
 </section>
 
-<script>
+<?php
+$enableSubmitButton = (int) !$block->getDisableSubmitButton();
+$scriptString = <<<script
+
 require(['jquery'], function(jQuery){
 
 //<![CDATA[
 var submitButtons = jQuery('.submit-button');
 var updateButtons = jQuery('.update-button');
-var enableSubmitButtons = <?= (int) !$block->getDisableSubmitButton() ?>;
+var enableSubmitButtons = {$enableSubmitButton};
 var fields = jQuery('.qty-input');
 
 function enableButtons(buttons) {
@@ -193,4 +204,6 @@ window.checkButtonsRelation = checkButtonsRelation;
 //]]>
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml
index 16643a29a7fbe..a168a89ed5ef4 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml
@@ -5,17 +5,22 @@
  */
 
 /** @var \Magento\Sales\Block\Adminhtml\Order\View\History $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <div id="order_history_block" class="edit-order-comments">
-    <?php if ($block->canAddComment()) : ?>
+    <?php if ($block->canAddComment()): ?>
         <div class="order-history-block" id="history_form">
 
             <div class="admin__field">
                 <label for="history_status" class="admin__field-label"><?= $block->escapeHtml(__('Status')) ?></label>
                 <div class="admin__field-control">
                     <select name="history[status]" id="history_status" class="admin__control-select">
-                        <?php foreach ($block->getStatuses() as $_code => $_label) : ?>
-                            <option value="<?= $block->escapeHtmlAttr($_code) ?>"<?php if ($_code == $block->getOrder()->getStatus()) : ?> selected="selected"<?php endif; ?>><?= $block->escapeHtml($_label) ?></option>
+                        <?php foreach ($block->getStatuses() as $_code => $_label): ?>
+                            <option value="<?= $block->escapeHtmlAttr($_code) ?>"
+                                <?php if ($_code == $block->getOrder()->getStatus()): ?> selected="selected"
+                                <?php endif; ?>>
+                                <?= $block->escapeHtml($_label) ?>
+                            </option>
                         <?php endforeach; ?>
                     </select>
                 </div>
@@ -37,7 +42,7 @@
             <div class="admin__field">
                 <div class="order-history-comments-options">
                     <div class="admin__field admin__field-option">
-                        <?php if ($block->canSendCommentEmail()) : ?>
+                        <?php if ($block->canSendCommentEmail()): ?>
                             <input name="history[is_customer_notified]"
                                    type="checkbox"
                                    id="history_notify"
@@ -69,30 +74,40 @@
     <?php endif;?>
 
     <ul class="note-list">
-    <?php foreach ($block->getOrder()->getStatusHistoryCollection(true) as $_item) : ?>
+    <?php foreach ($block->getOrder()->getStatusHistoryCollection(true) as $_item): ?>
         <li class="note-list-item">
-            <span class="note-list-date"><?= /* @noEscape */ $block->formatDate($_item->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
-            <span class="note-list-time"><?= /* @noEscape */ $block->formatTime($_item->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
+            <span class="note-list-date">
+                <?= /* @noEscape */ $block->formatDate($_item->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?>
+            </span>
+            <span class="note-list-time">
+                <?= /* @noEscape */ $block->formatTime($_item->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?>
+            </span>
             <span class="note-list-status"><?= $block->escapeHtml($_item->getStatusLabel()) ?></span>
             <span class="note-list-customer">
                 <?= $block->escapeHtml(__('Customer')) ?>
-                <?php if ($block->isCustomerNotificationNotApplicable($_item)) : ?>
-                    <span class="note-list-customer-notapplicable"><?= $block->escapeHtml(__('Notification Not Applicable')) ?></span>
-                <?php elseif ($_item->getIsCustomerNotified()) : ?>
+                <?php if ($block->isCustomerNotificationNotApplicable($_item)): ?>
+                    <span class="note-list-customer-notapplicable">
+                        <?= $block->escapeHtml(__('Notification Not Applicable')) ?>
+                    </span>
+                <?php elseif ($_item->getIsCustomerNotified()): ?>
                     <span class="note-list-customer-notified"><?= $block->escapeHtml(__('Notified')) ?></span>
-                <?php else : ?>
+                <?php else: ?>
                     <span class="note-list-customer-not-notified"><?= $block->escapeHtml(__('Not Notified')) ?></span>
                 <?php endif; ?>
             </span>
-            <?php if ($_item->getComment()) : ?>
-                <div class="note-list-comment"><?= $block->escapeHtml($_item->getComment(), ['b', 'br', 'strong', 'i', 'u', 'a']) ?></div>
+            <?php if ($_item->getComment()): ?>
+                <div class="note-list-comment">
+                    <?= $block->escapeHtml($_item->getComment(), ['b', 'br', 'strong', 'i', 'u', 'a']) ?>
+                </div>
             <?php endif; ?>
         </li>
     <?php endforeach; ?>
     </ul>
-    <script>
+    <?php $scriptString = <<<script
         require(['prototype'], function(){
-            if($('order_status'))$('order_status').update('<?= $block->escapeJs($block->escapeHtml($block->getOrder()->getStatusLabel())) ?>');
+            if($('order_status'))$('order_status').update('{$block->escapeJs($block->getOrder()->getStatusLabel())}');
         });
-    </script>
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
index 390adb7d5cfce..590aca0acfc0d 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
@@ -5,6 +5,7 @@
  */
 
 /** @var $block \Magento\Sales\Block\Adminhtml\Order\View\Tab\Info */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?php $_order = $block->getOrder() ?>
 
@@ -20,14 +21,17 @@
         <span class="title"><?= $block->escapeHtml(__('Payment &amp; Shipping Method')) ?></span>
     </div>
     <div class="admin__page-section-content">
-        <div class="admin__page-section-item order-payment-method<?= ($_order->getIsVirtual() ? ' order-payment-method-virtual' : '') ?>">
+        <div class="admin__page-section-item order-payment-method<?= ($_order->getIsVirtual() ?
+            ' order-payment-method-virtual' : '') ?>">
             <?php /* Payment Method */ ?>
             <div class="admin__page-section-item-title">
                 <span class="title"><?= $block->escapeHtml(__('Payment Information')) ?></span>
             </div>
             <div class="admin__page-section-item-content">
                 <div class="order-payment-method-title"><?= $block->getPaymentHtml() ?></div>
-                <div class="order-payment-currency"><?= $block->escapeHtml(__('The order was placed using %1.', $_order->getOrderCurrencyCode())) ?></div>
+                <div class="order-payment-currency">
+                    <?= $block->escapeHtml(__('The order was placed using %1.', $_order->getOrderCurrencyCode())) ?>
+                </div>
                 <div class="order-payment-additional">
                     <?= $block->getChildHtml('order_payment_additional') ?>
                     <?= $block->getChildHtml('payment_additional_info') ?>
@@ -72,7 +76,7 @@
 
 <?= $block->getChildHtml('popup_window') ?>
 
-<script>
+<?php $scriptString = <<<script
 require([
     "prototype",
     "Magento_Sales/order/giftoptions_tooltip"
@@ -104,4 +108,6 @@ require([
 //]]>
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml b/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml
index ba1204fac8ec5..22664e8138925 100644
--- a/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml
@@ -8,12 +8,15 @@
  * Last ordered items sidebar
  *
  * @var $block \Magento\Sales\Block\Reorder\Sidebar
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
 <div class="block block-reorder" data-bind="scope: 'lastOrderedItems'">
     <div class="block-title no-display"
          data-bind="css: {'no-display': !lastOrderedItems().items || lastOrderedItems().items.length === 0}">
-        <strong id="block-reorder-heading" role="heading" aria-level="2"><?= $block->escapeHtml(__('Recently Ordered')) ?></strong>
+        <strong id="block-reorder-heading" role="heading" aria-level="2">
+            <?= $block->escapeHtml(__('Recently Ordered')) ?>
+        </strong>
     </div>
     <div class="block-content no-display"
          data-bind="css: {'no-display': !lastOrderedItems().items || lastOrderedItems().items.length === 0}"
@@ -33,7 +36,8 @@
                                    data-bind="attr: {
                                         id: 'reorder-item-' + id,
                                         value: id,
-                                        title: is_saleable ? '<?= $block->escapeHtml(__('Add to Cart')) ?>' : '<?= $block->escapeHtml(__('Product is not salable.')) ?>'
+                                        title: is_saleable ? '<?= $block->escapeHtml(__('Add to Cart')) ?>' : '
+                                        <?= $block->escapeHtml(__('Product is not salable.')) ?>'
                                    },
                                    disable: !is_saleable"
                                    class="checkbox" data-validate='{"validate-one-checkbox-required-by-name": true}'/>
@@ -50,19 +54,21 @@
             <div class="actions-toolbar">
                 <div class="primary"
                      data-bind="visible: isShowAddToCart">
-                    <button type="submit" title="<?= $block->escapeHtml(__('Add to Cart')) ?>" class="action tocart primary">
+                    <button type="submit" title="<?= $block->escapeHtml(__('Add to Cart')) ?>"
+                            class="action tocart primary">
                         <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
                     </button>
                 </div>
                 <div class="secondary">
-                    <a class="action view" href="<?= $block->escapeUrl($block->getUrl('customer/account')) ?>#my-orders-table">
+                    <a class="action view"
+                       href="<?= $block->escapeUrl($block->getUrl('customer/account')) ?>#my-orders-table">
                         <span><?= $block->escapeHtml(__('View All')) ?></span>
                     </a>
                 </div>
             </div>
         </form>
     </div>
-    <script>
+    <?php $scriptString = <<<script
     require(["jquery", "mage/mage"], function(jQuery){
         jQuery('#reorder-validate-detail').mage('validation', {
             errorPlacement: function(error, element) {
@@ -70,7 +76,9 @@
             }
         });
     });
-    </script>
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 </div>
 <script type="text/x-magento-init">
 {
diff --git a/app/code/Magento/Theme/etc/adminhtml/system.xml b/app/code/Magento/Theme/etc/adminhtml/system.xml
index 20500619354e0..7a0ea8fe6b2d9 100644
--- a/app/code/Magento/Theme/etc/adminhtml/system.xml
+++ b/app/code/Magento/Theme/etc/adminhtml/system.xml
@@ -19,7 +19,7 @@
                     <label>Use CSS critical path</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>
-                        <![CDATA[<strong style="color:red">Warning!</strong> Be sure that you have critical.css file for your theme. Other CSS files will be loaded asynchronously.]]>
+                        <![CDATA[<strong class="colorRed">Warning!</strong> Be sure that you have critical.css file for your theme. Other CSS files will be loaded asynchronously.]]>
                     </comment>
                 </field>
             </group>
diff --git a/app/design/adminhtml/Magento/backend/web/css/styles.less b/app/design/adminhtml/Magento/backend/web/css/styles.less
index 80d0923ced75a..02f8edc2b493b 100644
--- a/app/design/adminhtml/Magento/backend/web/css/styles.less
+++ b/app/design/adminhtml/Magento/backend/web/css/styles.less
@@ -53,6 +53,10 @@ td.col-date.col-date-min-width.col-created_at {
     min-width: 14rem;
 }
 
+.colorRed {
+    color:red;
+}
+
 //  ToDo UI: Temporary. Should be changed
 @import 'source/components/_calendar-temp.less';
 @import 'source/components/_rules-temp.less';

From 7986ed6d47106b3482f783a4ab3e6df3337c02a7 Mon Sep 17 00:00:00 2001
From: madhu-ranosys <madhu.rajawat@ranosys.com>
Date: Thu, 23 Apr 2020 10:57:32 +0530
Subject: [PATCH 0177/1718] Fixed static tests

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

diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
index 82dc888c10bb3..997b2571217b2 100644
--- a/app/code/Magento/Sales/Model/Order.php
+++ b/app/code/Magento/Sales/Model/Order.php
@@ -1822,7 +1822,8 @@ public function getTotalDue()
      *
      * @return float|null
      */
-    public function getTotalDueCancelLabel() {
+    public function getTotalDueCancelLabel()
+    {
         $itemCancel = true;
         foreach ($this->getAllItems() as $item) {
             if ($item->getQtyCanceled() > 0) {

From 1edf22403419c04d09ccff1c587ad2479b524d37 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Thu, 23 Apr 2020 09:10:46 +0300
Subject: [PATCH 0178/1718] MC-29420: Remove event handlers from CE

---
 .../templates/export/form/after.phtml         | 23 ++++++++----
 .../templates/export/form/before.phtml        | 36 +++++++++++--------
 .../templates/export/form/filter/after.phtml  | 10 ++++--
 .../templates/import/form/after.phtml         | 13 +++++--
 .../templates/import/form/before.phtml        | 32 +++++++++--------
 5 files changed, 73 insertions(+), 41 deletions(-)

diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/after.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/after.phtml
index 150f7dbeb1046..784e140041004 100644
--- a/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/after.phtml
+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/after.phtml
@@ -3,8 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\ImportExport\Block\Adminhtml\Form\After $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<fieldset class="admin__fieldset" id="export_filter_container" style="display:none;">
+<fieldset class="admin__fieldset" id="export_filter_container">
     <legend class="admin__legend">
         <span><?= $block->escapeHtml(__('Entity Attributes')) ?></span>
     </legend>
@@ -13,11 +16,17 @@
         <input name="form_key" type="hidden" value="<?= /* @noEscape */ $block->getFormKey() ?>" />
         <div id="export_filter_grid_container"><!-- --></div>
     </form>
-    <button class="action- scalable" type="button" onclick="getFile();"><span><?=
-        $block->escapeHtml(__('Continue'))
-    ?></span></button>
+    <button class="action- scalable" type="button">
+        <span><?= $block->escapeHtml(__('Continue')) ?></span>
+    </button>
 </fieldset>
-<script>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display:none;", 'fieldset#export_filter_container') ?>
+<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+    'onclick',
+    "getFile();",
+    'fieldset#export_filter_container button'
+) ?>
+<?php $scriptString = <<<script
 require(['prototype'], function(){
 
 //<![CDATA[
@@ -25,4 +34,6 @@ require(['prototype'], function(){
 //]]>
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/before.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/before.phtml
index 3e7a19a0c0d82..b569518d9d239 100644
--- a/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/before.phtml
+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/before.phtml
@@ -3,8 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Backend\Block\Template $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<script>
+
+<?php $scriptString = <<<script
 require([
     'Magento_Ui/js/modal/alert',
     'prototype'
@@ -26,14 +30,14 @@ require([
          *  Handle value change in entity type selector
          */
         modifyFilterGrid: function() {
-            if ($('entity') && $F('entity') && $F('entity') != 'catalog_product') {
-                    $$('col:first-child').each(function(el) {
+            if ($('entity') && \$F('entity') && \$F('entity') != 'catalog_product') {
+                    \$$('col:first-child').each(function(el) {
                         el.show();
                     });
-                    $$('th.no-link:first-child').each(function(el) {
+                    \$$('th.no-link:first-child').each(function(el) {
                         el.show();
                     });
-                    $$('td.a-center').each(function(el) {
+                    \$$('td.a-center').each(function(el) {
                         el.show();
                     });
             }
@@ -43,9 +47,9 @@ require([
          * Post form data and process response via AJAX
          */
         getFilter: function() {
-            if ($('entity') && $F('entity')) {
-                var url    = "<?= $block->escapeJs($block->escapeUrl($block->getUrl('*/*/getFilter'))) ?>";
-                var entity = $F('entity');
+            if ($('entity') && \$F('entity')) {
+                var url    = "{$block->escapeJs($block->getUrl('*/*/getFilter'))}";
+                var entity = \$F('entity');
                 if (entity != this.previousGridEntity) {
                     this.previousGridEntity = entity;
                     url += ((url.slice(-1) != '/') ? '/' : '') + 'entity/' + entity;
@@ -76,20 +80,20 @@ require([
      * return void
      */
     getFile = function() {
-        if ($('entity') && $F('entity')) {
+        if ($('entity') && \$F('entity')) {
             var form      = $('export_filter_form');
             var oldAction = form.action;
-            var url = oldAction + ((oldAction.slice(-1) != '/') ? '/' : '') + 'entity/' + $F('entity')
-                + '/file_format/' + $F('file_format');
-            if ($F('fields_enclosure')) {
-                url += '/fields_enclosure/' + $F('fields_enclosure');
+            var url = oldAction + ((oldAction.slice(-1) != '/') ? '/' : '') + 'entity/' + \$F('entity')
+                + '/file_format/' + \$F('file_format');
+            if (\$F('fields_enclosure')) {
+                url += '/fields_enclosure/' + \$F('fields_enclosure');
             }
             form.action = url;
             form.submit();
             form.action   = oldAction;
         } else {
             alert({
-                content: '<?= $block->escapeHtml(__('Invalid data')); ?>'
+                content: '{$block->escapeHtml(__('Invalid data'))}'
             });
         }
     };
@@ -98,4 +102,6 @@ require([
 //]]>
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/filter/after.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/filter/after.phtml
index 704b88b0c0f69..a34eaf09c0058 100644
--- a/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/filter/after.phtml
+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/filter/after.phtml
@@ -3,8 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Backend\Block\Template $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<script>
+
+<?php $scriptString = <<<script
 require([
     'mage/adminhtml/grid'
 ], function(){
@@ -17,4 +21,6 @@ require([
         };
     }
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/after.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/after.phtml
index f629e6c9e9f59..5a59ffca17cb5 100644
--- a/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/after.phtml
+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/after.phtml
@@ -3,19 +3,26 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\ImportExport\Block\Adminhtml\Form\After $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<div class="entry-edit fieldset" id="import_validation_container" style="display:none;">
+
+<div class="entry-edit fieldset" id="import_validation_container">
     <div class="entry-edit-head legend">
         <span class="icon-head head-edit-form fieldset-legend"
             id="import_validation_container_header"><?= $block->escapeHtml(__('Validation Results')) ?></span>
     </div><br>
     <div id="import_validation_messages" class="fieldset"><!-- --></div>
 </div>
-<script>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display:none;", 'div#import_validation_container') ?>
+<?php $scriptString = <<<script
 require(['jquery', 'Magento_Ui/js/modal/alert', 'prototype'], function(jQuery){
 //<![CDATA[
     varienImport.resetSelectIndex('entity'); // forced resetting entity selector after page refresh
 //]]>
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml
index bd88ec419d848..69779baba381d 100644
--- a/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml
+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml
@@ -6,8 +6,10 @@
 ?>
 <?php
 /** @var $block \Magento\ImportExport\Block\Adminhtml\Import\Edit\Before */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<script>
+
+<?php $scriptString = <<<script
 require([
     'jquery',
     'Magento_Ui/js/modal/alert',
@@ -27,27 +29,25 @@ require([
          * List of existing behavior sets
          * @type {Array}
          */
-        uniqueBehaviors: <?= /* @noEscape */ $block->getUniqueBehaviors() ?>,
+        uniqueBehaviors: {$block->getUniqueBehaviors()},
 
         /**
          * Behaviour codes for import entities
          * @type {Array}
          */
-        entityBehaviors: <?= /* @noEscape */ $block->getEntityBehaviors() ?>,
+        entityBehaviors: {$block->getEntityBehaviors()},
 
         /**
          * Behaviour notes for import entities
          * @type {Array}
          */
-        entityBehaviorsNotes: <?= /* @noEscape */ $block->getEntityBehaviorsNotes() ?>,
+        entityBehaviorsNotes: {$block->getEntityBehaviorsNotes()},
 
         /**
          * Base url
          * @type {string}
          */
-        sampleFilesBaseUrl: '<?= $block->escapeJs(
-            $block->escapeUrl($block->getUrl('*/*/download/', ['filename' => 'entity-name']))
-        ) ?>',
+        sampleFilesBaseUrl: '{$block->escapeJs($block->getUrl('*/*/download/', ['filename' => 'entity-name']))}',
 
         /**
          * Reset selected index
@@ -168,8 +168,8 @@ require([
          */
         postToFrame: function(newActionUrl) {
             if (!jQuery('[name="' + this.ifrElemName + '"]').length) {
-                jQuery('body').append('<iframe name="' + this.ifrElemName + '" id="' + this.ifrElemName
-                    + '" style="display:none;"/>');
+                jQuery('body').append('<iframe name="' + this.ifrElemName + '" id="' + this.ifrElemName + '"/>');
+                jQuery('iframe#' + this.ifrElemName).attr('display', 'none');
             }
             jQuery('body')
                 .loader({
@@ -209,17 +209,17 @@ require([
         postToFrameProcessResponse: function(response) {
             if ('object' != typeof(response)) {
                 alert({
-                    content: '<?= $block->escapeHtml(__('Invalid response')); ?>'
+                    content: '{$block->escapeHtml(__('Invalid response'))}'
                 });
 
                 return false;
             }
-            $H(response).each(function(pair) {
+            \$H(response).each(function(pair) {
                 switch (pair.key) {
                     case 'show':
                     case 'clear':
                     case 'hide':
-                        $H(pair.value).each(function(val) {
+                        \$H(pair.value).each(function(val) {
                             if ($(val.value)) {
                                 $(val.value)[pair.key]();
                             }
@@ -227,7 +227,7 @@ require([
                         break;
                     case 'innerHTML':
                     case 'value':
-                        $H(pair.value).each(function(val) {
+                        \$H(pair.value).each(function(val) {
                             var el = $(val.key);
                             if (el) {
                                 el[pair.key] = val.value;
@@ -238,7 +238,7 @@ require([
                         break;
                     case 'removeClassName':
                     case 'addClassName':
-                        $H(pair.value).each(function(val) {
+                        \$H(pair.value).each(function(val) {
                             if ($(val.key)) $(val.key)[pair.key](val.value);
                         });
                         break;
@@ -265,4 +265,6 @@ require([
 //]]>
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>

From 50d039e555ee094da23ee254d4bc1c2635296fe6 Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Thu, 23 Apr 2020 11:02:11 +0300
Subject: [PATCH 0179/1718] MC-29421: Remove event handlers

---
 app/code/Magento/Customer/Block/Address/Edit.php     |  7 ++++++-
 .../luma/Magento_Rma/web/css/source/_module.less     | 12 ++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/Block/Address/Edit.php b/app/code/Magento/Customer/Block/Address/Edit.php
index ef9937a0cde8b..9ac1870cd17d9 100644
--- a/app/code/Magento/Customer/Block/Address/Edit.php
+++ b/app/code/Magento/Customer/Block/Address/Edit.php
@@ -6,6 +6,7 @@
 namespace Magento\Customer\Block\Address;
 
 use Magento\Customer\Api\AddressMetadataInterface;
+use Magento\Customer\Helper\Address;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\NoSuchEntityException;
 
@@ -69,6 +70,7 @@ class Edit extends \Magento\Directory\Block\Data
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
      * @param array $data
      * @param AddressMetadataInterface|null $addressMetadata
+     * @param Address|null $addressHelper
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -85,7 +87,8 @@ public function __construct(
         \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer,
         \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
         array $data = [],
-        AddressMetadataInterface $addressMetadata = null
+        AddressMetadataInterface $addressMetadata = null,
+        Address $addressHelper = null
     ) {
         $this->_customerSession = $customerSession;
         $this->_addressRepository = $addressRepository;
@@ -93,6 +96,8 @@ public function __construct(
         $this->currentCustomer = $currentCustomer;
         $this->dataObjectHelper = $dataObjectHelper;
         $this->addressMetadata = $addressMetadata ?: ObjectManager::getInstance()->get(AddressMetadataInterface::class);
+        $data['addressHelper'] = $addressHelper ?: ObjectManager::getInstance()->get(Address::class);
+        $data['directoryHelper'] = $directoryHelper;
         parent::__construct(
             $context,
             $directoryHelper,
diff --git a/app/design/frontend/Magento/luma/Magento_Rma/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Rma/web/css/source/_module.less
index e8adcc2f0e4f3..dda1bad1e8366 100644
--- a/app/design/frontend/Magento/luma/Magento_Rma/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Rma/web/css/source/_module.less
@@ -194,3 +194,15 @@
         }
     }
 }
+
+#registrant-options {
+    .item {
+        .control {
+            table {
+                .col.qty {
+                    .input-qty {display: none;}
+                }
+            }
+        }
+    }
+}

From dcf6b0f0079023c6801d1ac8a0219235ad9545d7 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Thu, 23 Apr 2020 12:46:13 +0300
Subject: [PATCH 0180/1718] MC-33647: [2.4.0][MFTF] Test
 AdminConfigurableProductTypeSwitchingToVirtualProductTest fails on Jenkins
 because of bad design (MC-17952)

---
 .../Mftf/Section/AdminProductGridSection.xml  |  2 ++
 ...oductTypeSwitchingToVirtualProductTest.xml | 11 +++++-----
 ...TypeSwitchingToConfigurableProductTest.xml | 20 +++++++++----------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
index 1aff1a5031413..540db609f550b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml
@@ -9,6 +9,7 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminProductGridSection">
         <element name="productRowBySku" type="block" selector="//td[count(../../..//th[./*[.='SKU']]/preceding-sibling::th) + 1][./*[.='{{sku}}']]" parameterized="true" />
+        <element name="productRowByName" type="block" selector="//td[count(../../..//th[./*[.='Name']]/preceding-sibling::th) + 1][./*[.='{{sku}}']]" parameterized="true" />
         <element name="productRowCheckboxBySku" type="block" selector="//td[count(../../..//th[./*[.='SKU']]/preceding-sibling::th) + 1][./*[.='{{sku}}']]/../td//input[@data-action='select-row']" parameterized="true" />
         <element name="loadingMask" type="text" selector=".admin__data-grid-loading-mask[data-component*='product_listing']"/>
         <element name="columnHeader" type="button" selector="//div[@data-role='grid-wrapper']//table[contains(@class, 'data-grid')]/thead/tr/th[contains(@class, 'data-grid-th')]/span[text() = '{{label}}']" parameterized="true" timeout="30"/>
@@ -35,5 +36,6 @@
         <element name="productGridContentsOnRow" type="checkbox" selector="//*[@id='container']//tr[{{row}}]/td" parameterized="true"/>
         <element name="selectRowBasedOnName" type="input" selector="//td/div[text()='{{var1}}']" parameterized="true"/>
         <element name="changeStatus" type="button" selector="//div[contains(@class,'admin__data-grid-header-row') and contains(@class, 'row')]//div[contains(@class, 'action-menu-item')]//ul/li/span[text() = '{{status}}']" parameterized="true"/>
+        <element name="productRowByTypeAndName" type="block" selector="//div[@data-role='grid-wrapper']//table[contains(@class, 'data-grid')]//td[count(../../..//th[./*[.='Type']]/preceding-sibling::th) + 1][./*[.='{{type}}']]/../td[contains(.,'{{name}}')]" parameterized="true" />
     </section>
 </sections>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminConfigurableProductTypeSwitchingToVirtualProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminConfigurableProductTypeSwitchingToVirtualProductTest.xml
index 36450313f9f3a..dd176455a03ba 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminConfigurableProductTypeSwitchingToVirtualProductTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminConfigurableProductTypeSwitchingToVirtualProductTest.xml
@@ -13,7 +13,7 @@
             <stories value="Product type switching"/>
             <title value="Configurable product type switching on editing to virtual product"/>
             <description value="Configurable product type switching on editing to virtual product"/>
-            <testCaseId value="MC-17952"/>
+            <testCaseId value="MC-28742"/>
             <useCaseId value="MAGETWO-44170"/>
             <severity value="MAJOR"/>
             <group value="catalog"/>
@@ -21,7 +21,7 @@
         <!--Delete product configurations-->
         <comment userInput="Delete product configuration" stepKey="commentDeleteConfigs"/>
         <actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="gotToConfigProductPage">
-            <argument name="productId" value="$$createProduct.id$$"/>
+            <argument name="productId" value="$createProduct.id$"/>
         </actionGroup>
         <waitForPageLoad stepKey="waitForConfigurableProductPageLoad"/>
         <conditionalClick selector="{{ AdminProductFormConfigurationsSection.sectionHeader}}" dependentSelector="{{AdminProductFormConfigurationsSection.createConfigurations}}" visible="false" stepKey="openConfigurationSection"/>
@@ -38,13 +38,12 @@
         <comment userInput="Assert virtual product on Admin product page grid" stepKey="commentAssertVirtualProductOnAdmin"/>
         <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="goToCatalogProductPageForVirtual"/>
         <actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGridBySkuForVirtual">
-            <argument name="sku" value="$$createProduct.sku$$"/>
+            <argument name="sku" value="$createProduct.sku$"/>
         </actionGroup>
-        <see selector="{{AdminProductGridSection.productGridCell('1', 'Name')}}" userInput="$$createProduct.name$$" stepKey="seeVirtualProductNameInGrid"/>
-        <see selector="{{AdminProductGridSection.productGridCell('1', 'Type')}}" userInput="Virtual Product" stepKey="seeVirtualProductTypeInGrid"/>
+        <seeElement selector="{{AdminProductGridSection.productRowByTypeAndName('Virtual Product',$createProduct.name$)}}" stepKey="seeVirtualProductInGrid"/>
         <!--Assert virtual product on storefront-->
         <comment userInput="Assert virtual product on storefront" stepKey="commentAssertVirtualProductOnStorefront"/>
-        <amOnPage url="{{StorefrontProductPage.url($$createProduct.name$$)}}" stepKey="openVirtualProductPage"/>
+        <amOnPage url="{{StorefrontProductPage.url($createProduct.name$)}}" stepKey="openVirtualProductPage"/>
         <waitForPageLoad stepKey="waitForStorefrontVirtualProductPageLoad"/>
         <see userInput="IN STOCK" selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="assertVirtualProductInStock"/>
     </test>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminSimpleProductTypeSwitchingToConfigurableProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminSimpleProductTypeSwitchingToConfigurableProductTest.xml
index c5fdbfb36490a..14979f93ca423 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminSimpleProductTypeSwitchingToConfigurableProductTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminSimpleProductTypeSwitchingToConfigurableProductTest.xml
@@ -32,6 +32,8 @@
             <createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOptionTwo">
                 <requiredEntity createDataKey="createConfigProductAttribute"/>
             </createData>
+            <!-- Reindex invalidated indices after product attribute has been created/deleted -->
+            <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
         </before>
         <after>
             <!--Delete product-->
@@ -39,7 +41,7 @@
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
             <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteAttribute"/>
             <actionGroup ref="DeleteAllDuplicateProductUsingProductGridActionGroup" stepKey="deleteAllDuplicateProducts">
-                <argument name="product" value="$$createProduct$$"/>
+                <argument name="product" value="$createProduct$"/>
             </actionGroup>
             <actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearProductFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
@@ -50,27 +52,25 @@
         <!--Add configurations to product-->
         <comment userInput="Add configurations to product" stepKey="commentAddConfigs"/>
         <actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="gotToSimpleProductPage">
-            <argument name="productId" value="$$createProduct.id$$"/>
+            <argument name="productId" value="$createProduct.id$"/>
         </actionGroup>
         <waitForPageLoad stepKey="waitForSimpleProductPageLoad"/>
         <actionGroup ref="GenerateConfigurationsByAttributeCodeActionGroup" stepKey="setupConfigurations">
-            <argument name="attributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
+            <argument name="attributeCode" value="$createConfigProductAttribute.attribute_code$"/>
         </actionGroup>
         <actionGroup ref="SaveConfiguredProductActionGroup" stepKey="saveConfigProductForm"/>
         <!--Assert configurable product on Admin product page grid-->
         <comment userInput="Assert configurable product in Admin product page grid" stepKey="commentAssertConfigProductOnAdmin"/>
         <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="goToCatalogProductPage"/>
         <actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGridBySku">
-            <argument name="sku" value="$$createProduct.sku$$"/>
+            <argument name="sku" value="$createProduct.sku$"/>
         </actionGroup>
-        <see selector="{{AdminProductGridSection.productGridCell('1', 'Name')}}" userInput="$$createProduct.name$$" stepKey="seeProductNameInGrid"/>
-        <see selector="{{AdminProductGridSection.productGridCell('1', 'Type')}}" userInput="Configurable Product" stepKey="seeProductTypeInGrid"/>
-        <see selector="{{AdminProductGridSection.productGridCell('2', 'Name')}}" userInput="$$createProduct.name$$-option1" stepKey="seeProductNameInGrid1"/>
-        <see selector="{{AdminProductGridSection.productGridCell('3', 'Name')}}" userInput="$$createProduct.name$$-option2" stepKey="seeProductNameInGrid2"/>
-        <actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearProductFilters"/>
+        <seeElement selector="{{AdminProductGridSection.productRowByTypeAndName('Configurable Product',$createProduct.name$)}}" stepKey="seeConfigurableProductInGrid"/>
+        <seeElement selector="{{AdminProductGridSection.productRowByTypeAndName('Simple Product',$createProduct.name$-option1)}}" stepKey="seeSimpleProduct1NameInGrid"/>
+        <seeElement selector="{{AdminProductGridSection.productRowByTypeAndName('Simple Product',$createProduct.name$-option2)}}" stepKey="seeSimpleProduct2NameInGrid"/>
         <!--Assert configurable product on storefront-->
         <comment userInput="Assert configurable product on storefront" stepKey="commentAssertConfigProductOnStorefront"/>
-        <amOnPage url="{{StorefrontProductPage.url($$createProduct.name$$)}}" stepKey="openProductPage"/>
+        <amOnPage url="{{StorefrontProductPage.url($createProduct.name$)}}" stepKey="openProductPage"/>
         <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
         <see userInput="IN STOCK" selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="assertInStock"/>
         <click selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="clickAttributeDropDown"/>

From 116c1910520fe2081e09e91dca6b04716f25dbbb Mon Sep 17 00:00:00 2001
From: Matthew O'Loughlin <matthew.oloughlin@aligent.com.au>
Date: Thu, 23 Apr 2020 21:13:40 +0930
Subject: [PATCH 0181/1718] Variable name consistency, param and return type
 hinting on private methods.

---
 .../CacheInvalidate/Model/PurgeCache.php      | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
index 9868b2ffb9e1a..5b952e0e50429 100644
--- a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
+++ b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
@@ -6,6 +6,9 @@
 namespace Magento\CacheInvalidate\Model;
 
 use Magento\Framework\Cache\InvalidateLogger;
+use Magento\PageCache\Model\Cache\Server;
+use Laminas\Http\Client\Adapter\Socket;
+use Laminas\Uri\Uri;
 
 /**
  * Invalidate external HTTP cache(s) based on tag pattern
@@ -15,12 +18,12 @@ class PurgeCache
     const HEADER_X_MAGENTO_TAGS_PATTERN = 'X-Magento-Tags-Pattern';
 
     /**
-     * @var \Magento\PageCache\Model\Cache\Server
+     * @var Server
      */
     protected $cacheServer;
 
     /**
-     * @var \Magento\CacheInvalidate\Model\SocketFactory
+     * @var SocketFactory
      */
     protected $socketAdapterFactory;
 
@@ -39,26 +42,26 @@ class PurgeCache
      *
      * @var int
      */
-    private $requestSize;
+    private $maxHeaderSize;
 
     /**
      * Constructor
      *
-     * @param \Magento\PageCache\Model\Cache\Server $cacheServer
-     * @param \Magento\CacheInvalidate\Model\SocketFactory $socketAdapterFactory
+     * @param Server $cacheServer
+     * @param SocketFactory $socketAdapterFactory
      * @param InvalidateLogger $logger
      * @param int $maxHeaderSize
      */
     public function __construct(
-        \Magento\PageCache\Model\Cache\Server $cacheServer,
-        \Magento\CacheInvalidate\Model\SocketFactory $socketAdapterFactory,
+        Server $cacheServer,
+        SocketFactory $socketAdapterFactory,
         InvalidateLogger $logger,
         int $maxHeaderSize = 7680
     ) {
         $this->cacheServer = $cacheServer;
         $this->socketAdapterFactory = $socketAdapterFactory;
         $this->logger = $logger;
-        $this->requestSize = $maxHeaderSize;
+        $this->maxHeaderSize = $maxHeaderSize;
     }
 
     /**
@@ -94,13 +97,13 @@ public function sendPurgeRequest($tags)
      * @param array $tags
      * @return \Generator
      */
-    private function chunkTags($tags)
+    private function chunkTags(array $tags): \Generator
     {
         $currentBatchSize = 0;
         $formattedTagsChunk = [];
         foreach ($tags as $formattedTag) {
             // Check if (currentBatchSize + length of next tag + number of pipe delimiters) would exceed header size.
-            if ($currentBatchSize + strlen($formattedTag) + count($formattedTagsChunk) > $this->requestSize) {
+            if ($currentBatchSize + strlen($formattedTag) + count($formattedTagsChunk) > $this->maxHeaderSize) {
                 yield implode('|', $formattedTagsChunk);
                 $formattedTagsChunk = [];
                 $currentBatchSize = 0;
@@ -117,12 +120,12 @@ private function chunkTags($tags)
     /**
      * Send curl purge request to servers to invalidate cache by tags pattern
      *
-     * @param \Laminas\Http\Client\Adapter\Socket $socketAdapter
-     * @param \Laminas\Uri\Uri[] $servers
+     * @param Socket $socketAdapter
+     * @param Uri[] $servers
      * @param string $formattedTagsChunk
      * @return bool Return true if successful; otherwise return false
      */
-    private function sendPurgeRequestToServers($socketAdapter, $servers, $formattedTagsChunk)
+    private function sendPurgeRequestToServers(Socket $socketAdapter, array $servers, string $formattedTagsChunk): bool
     {
         $headers = [self::HEADER_X_MAGENTO_TAGS_PATTERN => $formattedTagsChunk];
         $unresponsiveServerError = [];

From 6386ac6394dd60c1891571202380d84a9f861ad9 Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Thu, 23 Apr 2020 17:07:44 +0300
Subject: [PATCH 0182/1718] MC-29421: Remove event handlers

---
 app/code/Magento/Customer/Block/Form/Register.php          | 7 ++++++-
 .../Magento_CatalogPermissions/web/css/source/_module.less | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/Block/Form/Register.php b/app/code/Magento/Customer/Block/Form/Register.php
index 46d1088e37d0f..d6d0d9c494c11 100644
--- a/app/code/Magento/Customer/Block/Form/Register.php
+++ b/app/code/Magento/Customer/Block/Form/Register.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Customer\Block\Form;
 
+use Magento\Customer\Helper\Address;
 use Magento\Customer\Model\AccountManagement;
 use Magento\Framework\App\ObjectManager;
 use Magento\Newsletter\Model\Config;
@@ -52,6 +53,7 @@ class Register extends \Magento\Directory\Block\Data
      * @param \Magento\Customer\Model\Url $customerUrl
      * @param array $data
      * @param Config $newsLetterConfig
+     * @param Address|null $addressHelper
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -66,8 +68,11 @@ public function __construct(
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Customer\Model\Url $customerUrl,
         array $data = [],
-        Config $newsLetterConfig = null
+        Config $newsLetterConfig = null,
+        Address $addressHelper = null
     ) {
+        $data['addressHelper'] = $addressHelper ?: ObjectManager::getInstance()->get(Address::class);
+        $data['directoryHelper'] = $directoryHelper;
         $this->_customerUrl = $customerUrl;
         $this->_moduleManager = $moduleManager;
         $this->_customerSession = $customerSession;
diff --git a/app/design/adminhtml/Magento/backend/Magento_CatalogPermissions/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_CatalogPermissions/web/css/source/_module.less
index 6ce041fc19ac8..1a673e881fb6a 100644
--- a/app/design/adminhtml/Magento/backend/Magento_CatalogPermissions/web/css/source/_module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_CatalogPermissions/web/css/source/_module.less
@@ -17,3 +17,7 @@
         }
     }
 }
+
+.warning-enable-permissions {
+    color: red;
+}

From a22254e64338327808afac10d9dff02c112598e5 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Thu, 23 Apr 2020 18:51:11 +0300
Subject: [PATCH 0183/1718] MC-29420: Remove event handlers from CE

---
 .../templates/notification/window.phtml       |   1 -
 .../templates/directpost/iframe.phtml         |   0
 .../adminhtml/templates/directpost/info.phtml |   0
 app/code/Magento/Backend/Block/Template.php   |  17 +-
 .../Block/Widget/Form/Element/Dependence.php  |  13 +-
 .../adminhtml/templates/dashboard/chart.phtml |   2 +-
 .../templates/dashboard/store/switcher.phtml  |   7 +-
 .../adminhtml/templates/store/switcher.phtml  |   2 +-
 .../templates/system/cache/edit.phtml         |   6 +-
 .../widget/form/element/gallery.phtml         |   4 +-
 .../templates/widget/grid/extended.phtml      |   8 +-
 .../adminhtml/templates/widget/tabs.phtml     |   4 +-
 .../templates/widget/tabshoriz.phtml          |   2 +-
 .../adminhtml/templates/backup/dialogs.phtml  |  14 +-
 .../view/adminhtml/templates/form/cc.phtml    |   7 +-
 .../templates/multishipping/form.phtml        |   4 +-
 .../templates/multishipping/form_paypal.phtml |   4 +-
 .../Product/Edit/Tab/Bundle/Option.php        |   6 +-
 .../Adminhtml/Sales/Order/Items/Renderer.php  |   6 +-
 .../product/edit/bundle/option.phtml          |  22 +--
 .../creditmemo/create/items/renderer.phtml    |   9 +-
 .../creditmemo/view/items/renderer.phtml      |   9 +-
 .../sales/invoice/create/items/renderer.phtml |   9 +-
 .../sales/invoice/view/items/renderer.phtml   |   9 +-
 .../sales/order/view/items/renderer.phtml     |   9 +-
 .../shipment/create/items/renderer.phtml      |   8 +-
 .../sales/shipment/view/items/renderer.phtml  |   9 +-
 .../view/adminhtml/templates/default.phtml    |   2 +-
 .../Catalog/Block/Adminhtml/Category/Tree.php |  11 +-
 .../Block/Adminhtml/Helper/Form/Wysiwyg.php   |  27 +--
 .../Catalog/Block/Adminhtml/Product/Edit.php  |   8 +-
 .../Adminhtml/Product/Edit/AttributeSet.php   |   8 +-
 .../Block/Adminhtml/Product/Edit/Js.php       |   8 +-
 .../Product/Edit/Tab/Attributes/Search.php    |   8 +-
 .../Product/Edit/Tab/Options/Option.php       |   6 +-
 .../Adminhtml/Product/Edit/Tab/Price/Tier.php |  10 +-
 .../Product/Helper/Form/Category.php          |  11 +-
 .../Adminhtml/Product/Helper/Form/Config.php  |   2 +-
 .../Product/Helper/Form/Gallery/Content.php   |   8 +-
 .../Adminhtml/Product/Helper/Form/Image.php   |   4 +
 .../Catalog/Block/Product/ListProduct.php     |   8 +-
 .../catalog/category/widget/tree.phtml        |   4 +-
 .../form/renderer/fieldset/element.phtml      |   4 +-
 .../catalog/product/attribute/js.phtml        |   6 +-
 .../fieldset/options/type/file.phtml          |   5 +-
 .../templates/catalog/product/edit.phtml      | 157 +++++++++---------
 .../catalog/product/edit/attribute_set.phtml  |  11 +-
 .../product/edit/category/new/form.phtml      |   2 +-
 .../catalog/product/edit/options/option.phtml |  10 +-
 .../catalog/product/edit/price/tier.phtml     |   3 +-
 .../catalog/product/helper/gallery.phtml      |   1 +
 .../templates/catalog/product/js.phtml        |   7 +-
 .../product/edit/attribute/search.phtml       |   1 +
 .../fieldset/options/view/checkable.phtml     |  12 +-
 .../product/image_with_borders.phtml          |   2 +-
 .../frontend/templates/product/list.phtml     |   3 +-
 .../CatalogSearch/Block/Advanced/Form.php     |   9 +-
 .../frontend/templates/advanced/form.phtml    |   6 +-
 .../Checkout/Block/Total/DefaultTotal.php     |   8 +-
 .../view/frontend/templates/onepage.phtml     |   2 +-
 .../frontend/templates/total/default.phtml    |  17 +-
 .../templates/browser/content/files.phtml     |   4 +-
 .../adminhtml/templates/browser/tree.phtml    |   7 +-
 .../page/system/config/robots/reset.phtml     |   3 +-
 .../templates/system/config/js.phtml          |   3 +-
 .../templates/system/config/switcher.phtml    |   8 +-
 .../Composite/Fieldset/Configurable.php       |   8 +-
 .../Block/Adminhtml/Product/Steps/Bulk.php    |   9 +-
 .../composite/fieldset/configurable.phtml     |   6 +-
 .../product/edit/attribute/steps/bulk.phtml   |  12 +-
 .../catalog/product/edit/super/matrix.phtml   |   9 +-
 .../catalog/product/edit/super/wizard.phtml   |   6 +-
 .../configurable/attribute-selector/js.phtml  |   4 +-
 .../Magento/Cookie/Block/Html/Notices.php     |  12 +-
 .../frontend/templates/html/notices.phtml     |   4 +-
 .../view/adminhtml/templates/grid.phtml       |   2 +-
 .../Magento/Customer/Block/Form/Register.php  |   6 +-
 .../templates/system/config/validatevat.phtml |  19 +--
 .../frontend/templates/form/register.phtml    |   1 +
 .../templates/js/optional_zip_countries.phtml |   1 +
 .../Sales/Items/Column/Downloadable/Name.php  |   7 +-
 .../column/downloadable/creditmemo/name.phtml |   4 +-
 .../column/downloadable/invoice/name.phtml    |   4 +-
 .../items/column/downloadable/name.phtml      |   4 +-
 .../view/frontend/templates/code.phtml        |  25 +--
 .../system/storage/media/synchronize.phtml    |  41 +++--
 .../templates/product/view/list.phtml         |   9 +-
 .../Adminhtml/Order/Invoice/Create/Form.php   |   7 +-
 .../templates/order/invoice/create/form.phtml |   5 +-
 .../Magento/Tax/Block/Adminhtml/Rate/Form.php |   8 +-
 .../view/adminhtml/templates/rate/js.phtml    |   3 +-
 .../adminhtml/templates/rule/rate/form.phtml  |   2 +-
 .../templates/toolbar/class/add.phtml         |   2 +-
 .../templates/toolbar/rule/add.phtml          |   2 +-
 .../templates/checkout/grandtotal.phtml       |   9 +-
 .../templates/checkout/shipping.phtml         |  13 +-
 .../templates/checkout/subtotal.phtml         |   9 +-
 .../frontend/templates/checkout/tax.phtml     |  13 +-
 .../Block/Backend/System/CarrierConfig.php    |   6 +-
 .../system/shipping/carrier_config.phtml      |   4 +-
 100 files changed, 498 insertions(+), 385 deletions(-)
 delete mode 100644 app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/iframe.phtml
 delete mode 100644 app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/info.phtml

diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml
index 980d8e89137ba..f2e8e96fa2585 100644
--- a/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml
+++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml
@@ -10,7 +10,6 @@
  */
 ?>
 <ul class="message-system-list"
-    style="display: none;"
     data-mage-init='{
         "Magento_Ui/js/modal/modal": {
             "autoOpen": true,
diff --git a/app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/iframe.phtml b/app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/iframe.phtml
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/info.phtml b/app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/info.phtml
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/app/code/Magento/Backend/Block/Template.php b/app/code/Magento/Backend/Block/Template.php
index 1c4cd4f9bcc33..b4c41645d7f65 100644
--- a/app/code/Magento/Backend/Block/Template.php
+++ b/app/code/Magento/Backend/Block/Template.php
@@ -9,7 +9,8 @@
 namespace Magento\Backend\Block;
 
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Json\Helper\Data;
+use Magento\Framework\Json\Helper\Data as JsonHelper;
+use Magento\Directory\Helper\Data as DirectoryHelper;
 
 /**
  * Standard admin block. Adds admin-specific behavior and event.
@@ -63,17 +64,23 @@ class Template extends \Magento\Framework\View\Element\Template
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param array $data
+     * @param JsonHelper|null $jsonHelper
+     * @param DirectoryHelper|null $directoryHelper
      */
-    public function __construct(\Magento\Backend\Block\Template\Context $context, array $data = [])
-    {
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        array $data = [],
+        ?JsonHelper $jsonHelper = null,
+        ?DirectoryHelper $directoryHelper = null
+    ) {
         $this->_localeDate = $context->getLocaleDate();
         $this->_authorization = $context->getAuthorization();
         $this->mathRandom = $context->getMathRandom();
         $this->_backendSession = $context->getBackendSession();
         $this->formKey = $context->getFormKey();
         $this->nameBuilder = $context->getNameBuilder();
-        $data['jsonHelper'] = ObjectManager::getInstance()->get(Data::class);
-        $data['directoryHelper']= ObjectManager::getInstance()->get(\Magento\Directory\Helper\Data::class);
+        $data['jsonHelper'] = $jsonHelper ?? ObjectManager::getInstance()->get(JsonHelper::class);
+        $data['directoryHelper']= $directoryHelper ?? ObjectManager::getInstance()->get(DirectoryHelper::class);
         parent::__construct($context, $data);
     }
 
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php b/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php
index 45024ad16b31f..5517cb8d4d617 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php
@@ -55,21 +55,29 @@ class Dependence extends \Magento\Backend\Block\AbstractBlock
      */
     protected $_jsonEncoder;
 
+    /**
+     * @var SecureHtmlRenderer
+     */
+    protected $secureRenderer;
+
     /**
      * @param \Magento\Backend\Block\Context $context
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param \Magento\Config\Model\Config\Structure\Element\Dependency\FieldFactory $fieldFactory
      * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
         \Magento\Framework\Json\EncoderInterface $jsonEncoder,
         \Magento\Config\Model\Config\Structure\Element\Dependency\FieldFactory $fieldFactory,
-        array $data = []
+        array $data = [],
+        ?SecureHtmlRenderer $secureRenderer = null
     ) {
         $this->_jsonEncoder = $jsonEncoder;
         $this->_fieldFactory = $fieldFactory;
         parent::__construct($context, $data);
+        $this->secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
     }
 
     /**
@@ -134,12 +142,11 @@ protected function _toHtml()
             $params .= ', ' .  $this->_jsonEncoder->encode($this->_configOptions);
         }
 
-        $secureHtmlRenderer = ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
         $scriptString = 'require([\'mage/adminhtml/form\'], function(){
     new FormElementDependenceController(' . $params . ');
 });';
 
-        return /* @noEscape */ $secureHtmlRenderer->renderTag('script', [], $scriptString, false);
+        return /* @noEscape */ $this->secureRenderer->renderTag('script', [], $scriptString, false);
     }
 
     /**
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/chart.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/chart.phtml
index df47f3f41be1b..56131fa622321 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/chart.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/chart.phtml
@@ -22,7 +22,7 @@ $viewModel = $block->getViewModel();
         <canvas id="chart_<?= $escaper->escapeHtmlAttr($block->getData('html_id')) ?>_period"/>
         <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
             'display:none',
-            '#chart_' . $escaper->escapeHtmlAttr($block->getData('html_id')) . '_period'
+            '#chart_' . $escaper->escapeJs($block->getData('html_id')) . '_period'
         ) ?>
         <div class="dashboard-diagram-nodata">
             <span><?= $escaper->escapeHtml(__('No Data Found')) ?></span>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml
index 870c1dbb7ef1e..b99051f33fe3a 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml
@@ -8,7 +8,7 @@
 ?>
 <p class="switcher"><label for="store_switcher"><?= $block->escapeHtml(__('View Statistics For:')) ?></label>
 <?= $block->getHintHtml() ?>
-<select name="store_switcher" id="store_switcher" class="left-col-block" onchange="return switchStore(this);">
+<select name="store_switcher" id="store_switcher" class="left-col-block">
     <option value=""><?= $block->escapeHtml(__('All Websites')) ?></option>
     <?php foreach ($block->getWebsiteCollection() as $_website): ?>
         <?php $showWebsite = false; ?>
@@ -40,6 +40,11 @@
         <?php endforeach; ?>
     <?php endforeach; ?>
 </select>
+<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+    'onchange',
+    "return switchStore($('select#store_switcher');",
+    'select#store_switcher'
+) ?>
 </p>
 <?php $scriptString = <<<script
     require([
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
index 2a6d7e39c5db2..e067a4dd27a77 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
@@ -17,7 +17,7 @@
                <?= /* @noEscape */ $block->getUiId() ?> />
         <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
             'onchange',
-            'switchScope(this);',
+            "switchScope($('#store_switcher'));",
             '#store_switcher'
         ) ?>
         <input type="hidden" name="store_group_switcher" id="store_group_switcher"
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml
index 36184816dc172..5255fe4de8737 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml
@@ -63,6 +63,9 @@ script;
                                     id="<?= $block->escapeHtmlAttr($_button['name']) ?>"
                                     type="button"
                                     class="scalable
+                                <?php if (isset($_button['disabled']) && $_button['disabled']):?>disabled<?php endif;?>"
+                                ><span><span><span><?= $block->escapeHtml($_button['action']) ?></span></span></span>
+                                </button>
                                 <?php if (!isset($_button['disabled']) || !$_button['disabled']):?>
                                     <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
                                         'onclick',
@@ -70,9 +73,6 @@ script;
                                         '#' . $block->escapeHtmlAttr($_button['name'])
                                     ) ?>
                                 <?php endif; ?>
-                                <?php if (isset($_button['disabled']) && $_button['disabled']):?>disabled<?php endif;?>"
-                                ><span><span><span><?= $block->escapeHtml($_button['action']) ?></span></span></span>
-                                </button>
                                 <?php if (isset($_button['comment'])): ?> <br />
                                     <small><?= $block->escapeHtml($_button['comment']) ?></small>
                                 <?php endif; ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml
index 4120348daec00..955fb4fd1183c 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml
@@ -90,7 +90,9 @@ script;
 
 </tbody></table>
 
-<?php $jsonHelper = $block->getData('jsonHelper');
+<?php
+/** @var \Magento\Framework\Json\Helper\Data $jsonHelper */
+$jsonHelper = $block->getData('jsonHelper');
 
 $scriptString = <<<script
 require([
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
index 4ea657b14e2dd..59fe83013b1a7 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
@@ -116,7 +116,7 @@ $numColumns = count($block->getColumns());
                                 'onclick',
                                 /* @noEscape */ $block->getJsObjectName() . '.setPage(\'' .
                                 /* @noEscape */ ($_curPage - 1) . '\');return false;',
-                                'button.action-previous'
+                                '. admin__data-grid-pager button.action-previous'
                             ) ?>
                         <?php else: ?>
                             <button type="button" class="action-previous disabled">
@@ -150,7 +150,7 @@ $numColumns = count($block->getColumns());
                                 'onclick',
                                 /* @noEscape */ $block->getJsObjectName() . '.setPage(\'' .
                                 /* @noEscape */ ($_curPage + 1) . '\');return false;',
-                                'button.action-next'
+                                '. admin__data-grid-pager button.action-next'
                             ) ?>
                         <?php else: ?>
                             <button type="button" class="action-next disabled">
@@ -285,7 +285,9 @@ $numColumns = count($block->getColumns());
 
     </div>
 </div>
-    <?php $jsonHelper = $block->getData('jsonHelper');
+    <?php
+    /** @var \Magento\Framework\Json\Helper\Data $jsonHelper */
+    $jsonHelper = $block->getData('jsonHelper');
     if ($block->canDisplayContainer()):
         $scriptString = <<<script
     var deps = [];
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml
index 4ebf586fce533..2346a619f4dc8 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml
@@ -75,12 +75,12 @@
                 <?php if ($block->getTabIsHidden($_tab)): ?>
                     <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
                         'display:none',
-                        'li.admin__page-nav-item#' . $block->escapeHtmlAttr($block->getTabId($_tab))
+                        'li.admin__page-nav-item#' . $block->escapeJs($block->getTabId($_tab))
                     ); ?>
                 <?php endif; ?>
                 <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
                     'display:none',
-                    'div#' . $block->escapeHtmlAttr($block->getTabId($_tab)) . '_content'
+                    'div#' . $block->escapeJs($block->getTabId($_tab)) . '_content'
                 ); ?>
             </li>
         <?php endforeach; ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml
index 3d77d12604930..75858f044e76b 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml
@@ -42,7 +42,7 @@
         </div>
         <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
             'display:none',
-            '#' . $block->escapeHtmlAttr($block->getTabId($_tab))
+            '#' . $block->escapeJs($block->getTabId($_tab))
         ); ?>
     </li>
     <?php endforeach; ?>
diff --git a/app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml b/app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml
index 5251feb8c6710..33313e71d8c6a 100644
--- a/app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml
+++ b/app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml
@@ -14,10 +14,9 @@
 <p><?= $block->escapeHtml(__('Are you sure you want to continue?')) ?></p>
 </script>
 <script type="text/x-magento-template" id="backup-options-template">
-    <div class="backup-messages">
+    <div class="backup-messages no-display">
         <div class="messages"></div>
     </div>
-    <?=/* @noEscape */ $secureRenderer->renderStyleAsTag('display:none', 'div.backup-messages') ?>
     <div class="messages">
         <div class="message message-warning">
             <?= $block->escapeHtml(__('This may take a few moments.')) ?>
@@ -61,7 +60,8 @@
                 </div>
             </div>
 
-            <div class="admin__field field maintenance-checkbox-container" id="exclude-media-checkbox-container">
+            <div class="admin__field field maintenance-checkbox-container no-display"
+                 id="exclude-media-checkbox-container">
                 <label for="exclude_media" class="admin__field-label">
                     <span><?= $block->escapeHtml(__('Exclude')) ?></span>
                 </label>
@@ -78,16 +78,14 @@
                     </div>
                 </div>
             </div>
-            <?=/* @noEscape */ $secureRenderer->renderStyleAsTag('display:none', '#exclude-media-checkbox-container') ?>
         </fieldset>
     </form>
 </script>
 
 <script type="text/x-magento-template" id="rollback-request-password-template">
-    <div class="backup-messages">
+    <div class="backup-messages no-display">
         <div class="messages"></div>
     </div>
-    <?=/* @noEscape */ $secureRenderer->renderStyleAsTag('display:none', 'div.backup-messages') ?>
     <div class="messages">
         <div class="message message-warning">
             <?= $block->escapeHtml(__('Please enter the password to confirm rollback.')) ?><br>
@@ -137,7 +135,7 @@
                 </div>
             </div>
         </fieldset>
-        <div class="entry-edit" id="ftp-credentials-container">
+        <div class="entry-edit no-display" id="ftp-credentials-container">
             <fieldset class="admin__fieldset">
                 <legend class="admin__legend legend">
                     <span><?= $block->escapeHtml(__('FTP credentials')) ?></span>
@@ -202,8 +200,6 @@ require([
 script;
 ?>
 <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
-<?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display:none', '#use-ftp-checkbox-row') ?>
-<?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display:none', '#ftp-credentials-container') ?>
 <?=/* @noEscape */ $secureRenderer->renderEventListenerAsTag(
     'onclick',
     'backup.toggleFtpCredentialsForm(event)',
diff --git a/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml b/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml
index 995db82618106..d90722caf4fe2 100644
--- a/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml
+++ b/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml
@@ -88,6 +88,9 @@ $ccType = $block->getInfoData('cc_type');
     <input type="hidden" id="<?= /* @noEscape */ $code ?>_payment_method_nonce"
            name="payment[payment_method_nonce]"/>
     <input type="submit" name="Submit">
-    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display;none', 'input[name=\'Submit\']') ?>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+        'display;none',
+        '#payment_form_' . /* @noEscape */ $code . ' input[name=\'Submit\']'
+    ) ?>
 </fieldset>
-<?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display;none', 'payment_form_' . /* @noEscape */ $code) ?>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display;none', '#payment_form_' . /* @noEscape */ $code) ?>
diff --git a/app/code/Magento/Braintree/view/frontend/templates/multishipping/form.phtml b/app/code/Magento/Braintree/view/frontend/templates/multishipping/form.phtml
index 3c0828cb3677d..af622fcfab9fb 100644
--- a/app/code/Magento/Braintree/view/frontend/templates/multishipping/form.phtml
+++ b/app/code/Magento/Braintree/view/frontend/templates/multishipping/form.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Csp\Api\InlineUtilInterface $csp */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?php $scriptString = <<<script
     require([
@@ -29,5 +29,5 @@
     })
 script;
 ?>
-<?= /* @noEscape */ $csp->renderTag('script', [], $scriptString) ?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString) ?>
 <!-- ko template: getTemplate() --><!-- /ko -->
diff --git a/app/code/Magento/Braintree/view/frontend/templates/multishipping/form_paypal.phtml b/app/code/Magento/Braintree/view/frontend/templates/multishipping/form_paypal.phtml
index abb99e5290442..b191d9621167c 100644
--- a/app/code/Magento/Braintree/view/frontend/templates/multishipping/form_paypal.phtml
+++ b/app/code/Magento/Braintree/view/frontend/templates/multishipping/form_paypal.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Csp\Api\InlineUtilInterface $csp */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?php $scriptString = <<<script
 
@@ -30,5 +30,5 @@
     })
 script;
 ?>
-<?= /* @noEscape */ $csp->renderTag('script', [], $scriptString) ?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <!-- ko template: getTemplate() --><!-- /ko -->
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
index 63542b381d34b..befa5794bfb69 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php
@@ -61,18 +61,20 @@ class Option extends \Magento\Backend\Block\Widget
      * @param \Magento\Bundle\Model\Source\Option\Type $optionTypes
      * @param \Magento\Framework\Registry $registry
      * @param array $data
+     * @param JsonHelper|null $jsonHelper
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Config\Model\Config\Source\Yesno $yesno,
         \Magento\Bundle\Model\Source\Option\Type $optionTypes,
         \Magento\Framework\Registry $registry,
-        array $data = []
+        array $data = [],
+        ?JsonHelper $jsonHelper = null
     ) {
         $this->_coreRegistry = $registry;
         $this->_optionTypes = $optionTypes;
         $this->_yesno = $yesno;
-        $data['jsonHelper'] = ObjectManager::getInstance()->get(JsonHelper::class);
+        $data['jsonHelper'] = $jsonHelper ?? ObjectManager::getInstance()->get(JsonHelper::class);
         parent::__construct($context, $data);
     }
 
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php b/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
index de1caac75e143..f1a09369df74c 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
@@ -32,6 +32,7 @@ class Renderer extends \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRend
      * @param \Magento\Framework\Registry $registry
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json $serializer
+     * @param JsonHelper|null $jsonHelper
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -39,10 +40,11 @@ public function __construct(
         \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration,
         \Magento\Framework\Registry $registry,
         array $data = [],
-        Json $serializer = null
+        Json $serializer = null,
+        ?JsonHelper $jsonHelper = null
     ) {
         $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
-        $data['jsonHelper'] = ObjectManager::getInstance()->get(JsonHelper::class);
+        $data['jsonHelper'] = $jsonHelper ?? ObjectManager::getInstance()->get(JsonHelper::class);
         parent::__construct($context, $stockRegistry, $stockConfiguration, $registry, $data);
     }
 
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml
index 4582de57a8b4a..d6637401cff9f 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml
@@ -134,7 +134,9 @@
 
 <?= $block->getSelectionHtml() ?>
 
-<?php $helper = $block->getData('jsonHelper');
+<?php
+/** @var \Magento\Framework\Json\Helper\Data $helper */
+$helper = $block->getData('jsonHelper');
 $scriptString = <<<script
 require([
     'jquery',
@@ -193,14 +195,14 @@ $scriptString .= <<<script
 
         //set selected type
         if (data.type) {
-            $A($(this.idLabel + '_'+data.index+'_type').options).each(function(option){
+            \$A($(this.idLabel + '_'+data.index+'_type').options).each(function(option){
                 if (option.value==data.type) option.selected = true;
             });
         }
 
         //set selected is_require
         if (data.required) {
-            $A($(this.idLabel + '_'+data.index+'_required').options).each(function(option){
+            \$A($(this.idLabel + '_'+data.index+'_required').options).each(function(option){
                 if (option.value==data.required) option.selected = true;
             });
         }
@@ -240,7 +242,7 @@ $scriptString .= <<<script
         parts = element.id.split('_');
         i = parts[2];
         if (element.value == 'multi' || element.value == 'checkbox') {
-            inputs = $A($$('#' + bSelection.idLabel + '_box_' + i + ' tr.selection input.default'));
+            inputs = \$A($$('#' + bSelection.idLabel + '_box_' + i + ' tr.selection input.default'));
             inputs.each(
                 function(elem){
                     //elem.type = "checkbox";
@@ -250,7 +252,7 @@ $scriptString .= <<<script
             /**
              * Hide not needed elements (user defined qty select box)
              */
-            inputs = $A($$('#' + bSelection.idLabel + '_box_' + i + ' .qty-box'));
+            inputs = \$A($$('#' + bSelection.idLabel + '_box_' + i + ' .qty-box'));
             inputs.each(
                 function(elem){
                     elem.hide();
@@ -258,7 +260,7 @@ $scriptString .= <<<script
             );
 
         } else {
-            inputs = $A($$('#' + bSelection.idLabel + '_box_' + i + ' tr.selection input.default'));
+            inputs = \$A($$('#' + bSelection.idLabel + '_box_' + i + ' tr.selection input.default'));
             have = false;
             for (j=0; j< inputs.length; j++) {
                 //inputs[j].type = "radio";
@@ -273,7 +275,7 @@ $scriptString .= <<<script
             /**
              * Show user defined select box
              */
-            inputs = $A($$('#' + bSelection.idLabel + '_box_' + i + ' .qty-box'));
+            inputs = \$A($$('#' + bSelection.idLabel + '_box_' + i + ' .qty-box'));
             inputs.each(
                 function(elem){
                     elem.show();
@@ -283,7 +285,7 @@ $scriptString .= <<<script
     },
 
     priceTypeFixed : function() {
-        inputs = $A($$('.price-type-box'));
+        inputs = \$A($$('.price-type-box'));
         inputs.each(
             function(elem){
                 elem.show();
@@ -292,7 +294,7 @@ $scriptString .= <<<script
     },
 
     priceTypeDynamic : function() {
-        inputs = $A($$('.price-type-box'));
+        inputs = \$A($$('.price-type-box'));
         inputs.each(
             function(elem){
                 elem.hide();
@@ -316,7 +318,7 @@ foreach ($block->getOptions() as $_option) {
         }
     }
 }
-?>
+
 $scriptString .= <<<script
 function togglePriceType() {
     bOption['priceType' + ($('price_type').value == '1' ? 'Fixed' : 'Dynamic')]();
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml
index f42e1eb070479..5fef2baf2ed65 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml
@@ -3,9 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-?>
-<?php
+
 /**
  * @see \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer
  */
@@ -17,7 +15,10 @@
 <?php $items = $block->getChildren($_item); ?>
 <?php $_count = count($items) ?>
 <?php $_index = 0 ?>
-<?php $helper = $block->getData('jsonHelper') ?>
+<?php
+/** @var \Magento\Framework\Json\Helper\Data $helper */
+$helper = $block->getData('jsonHelper');
+?>
 
 <?php $_prevOptionId = '' ?>
 
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml
index 49df0468ec992..f19767bf488ca 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml
@@ -3,9 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-?>
-<?php
+
 /**
  * @see \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer
  */
@@ -17,7 +15,10 @@
 <?php $items = $block->getChildren($_item); ?>
 <?php $_count = count($items) ?>
 <?php $_index = 0 ?>
-<?php $helper = $block->getData('jsonHelper') ?>
+<?php
+/** @var \Magento\Framework\Json\Helper\Data $helper */
+$helper = $block->getData('jsonHelper');
+?>
 
 <?php $_prevOptionId = '' ?>
 
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml
index 2bcede5899e56..caf2470f20f50 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml
@@ -3,9 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-?>
-<?php
+
 /**
  * @see \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer
  */
@@ -17,7 +15,10 @@
 <?php $items = $block->getChildren($_item); ?>
 <?php $_count = count($items) ?>
 <?php $_index = 0 ?>
-<?php $helper = $block->getData('jsonHelper') ?>
+<?php
+/** @var \Magento\Framework\Json\Helper\Data $helper */
+$helper = $block->getData('jsonHelper');
+?>
 
 <?php $_prevOptionId = '' ?>
 
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml
index b783003958b59..b7906fe5bf044 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml
@@ -3,9 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-?>
-<?php
+
 /**
  * @see \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer
  */
@@ -17,7 +15,10 @@
 <?php $items = $block->getChildren($_item); ?>
 <?php $_count = count($items) ?>
 <?php $_index = 0 ?>
-<?php $helper = $block->getData('jsonHelper') ?>
+<?php
+/** @var \Magento\Framework\Json\Helper\Data $helper */
+$helper = $block->getData('jsonHelper');
+?>
 
 <?php $_prevOptionId = '' ?>
 
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
index 3f0987f129f21..c8d3a9b1f091c 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
@@ -3,9 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-?>
-<?php
+
 /**
  * @see \Magento\Bundle\Block\Adminhtml\Sales\Order\View\Items\Renderer
  */
@@ -17,7 +15,10 @@
 <?php $items = array_merge([$_item], $_item->getChildrenItems()); ?>
 <?php $_count = count($items) ?>
 <?php $_index = 0 ?>
-<?php $helper = $block->getData('jsonHelper') ?>
+<?php
+/** @var \Magento\Framework\Json\Helper\Data $helper */
+$helper = $block->getData('jsonHelper');
+?>
 
 <?php $_prevOptionId = '' ?>
 
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml
index d40eaa83e76ba..0a5083ba0b569 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml
@@ -3,15 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-?>
 
-<?php
 /** @var $block \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
-<?php $helper = $block->getData('jsonHelper'); ?>
+<?php
+/** @var \Magento\Framework\Json\Helper\Data $helper */
+$helper = $block->getData('jsonHelper');
+?>
 <?php $_item = $block->getItem() ?>
 <?php $items = $block->getChildren($_item); ?>
 <?php $_count = count($items) ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml
index 6f4a2888b13f7..6510d1493f764 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml
@@ -3,9 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-?>
-<?php
+
 /** @var $block \Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
@@ -15,7 +13,10 @@
 <?php $shipItems = $block->getChildren($_item) ?>
 <?php $_count = count($items) ?>
 <?php $_index = 0 ?>
-<?php $helper = $block->getData('jsonHelper') ?>
+<?php
+/** @var \Magento\Framework\Json\Helper\Data $helper */
+$helper = $block->getData('jsonHelper');
+?>
 
 <?php $_prevOptionId = '' ?>
 
diff --git a/app/code/Magento/Captcha/view/adminhtml/templates/default.phtml b/app/code/Magento/Captcha/view/adminhtml/templates/default.phtml
index 490bd159f28bd..e73174d3768df 100644
--- a/app/code/Magento/Captcha/view/adminhtml/templates/default.phtml
+++ b/app/code/Magento/Captcha/view/adminhtml/templates/default.phtml
@@ -44,7 +44,7 @@ $captcha = $block->getCaptchaModel();
 </div>
 
 <?php
-$url = $block->escapeJs($block->escapeUrl($block->getRefreshUrl()));
+$url = $block->escapeJs($block->getRefreshUrl());
 $formId = $block->escapeJs($block->escapeHtml($block->getFormId()));
 $scriptString = <<<script
 
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
index 4433dc80a0fa3..a66dcece2bef0 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
@@ -12,7 +12,6 @@
 use Magento\Catalog\Model\ResourceModel\Category\Collection;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Data\Tree\Node;
-use Magento\Framework\Math\Random;
 use Magento\Framework\View\Helper\SecureHtmlRenderer;
 use Magento\Store\Model\Store;
 
@@ -52,11 +51,6 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
      */
     protected $secureRenderer;
 
-    /**
-     * @var Random
-     */
-    private $random;
-
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Catalog\Model\ResourceModel\Category\Tree $categoryTree
@@ -67,7 +61,6 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
      * @param \Magento\Backend\Model\Auth\Session $backendSession
      * @param array $data
      * @param SecureHtmlRenderer|null $secureRenderer
-     * @param Random|null $random
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -78,15 +71,13 @@ public function __construct(
         \Magento\Framework\DB\Helper $resourceHelper,
         \Magento\Backend\Model\Auth\Session $backendSession,
         array $data = [],
-        ?SecureHtmlRenderer $secureRenderer = null,
-        ?Random $random = null
+        ?SecureHtmlRenderer $secureRenderer = null
     ) {
         $this->_jsonEncoder = $jsonEncoder;
         $this->_resourceHelper = $resourceHelper;
         $this->_backendSession = $backendSession;
         parent::__construct($context, $categoryTree, $registry, $categoryFactory, $data);
         $this->secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
-        $this->random = $random ?? ObjectManager::getInstance()->get(Random::class);
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php b/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php
index 95b7397e385a6..48753bfd6efb4 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg.php
@@ -12,7 +12,6 @@
 namespace Magento\Catalog\Block\Adminhtml\Helper\Form;
 
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Math\Random;
 use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
 /**
@@ -51,11 +50,6 @@ class Wysiwyg extends \Magento\Framework\Data\Form\Element\Textarea
      */
     protected $secureRenderer;
 
-    /**
-     * @var Random
-     */
-    private $random;
-
     /**
      * @param \Magento\Framework\Data\Form\Element\Factory $factoryElement
      * @param \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection
@@ -66,7 +60,6 @@ class Wysiwyg extends \Magento\Framework\Data\Form\Element\Textarea
      * @param \Magento\Backend\Helper\Data $backendData
      * @param array $data
      * @param SecureHtmlRenderer|null $secureRenderer
-     * @param Random|null $random
      */
     public function __construct(
         \Magento\Framework\Data\Form\Element\Factory $factoryElement,
@@ -77,18 +70,14 @@ public function __construct(
         \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Backend\Helper\Data $backendData,
         array $data = [],
-        ?SecureHtmlRenderer $secureRenderer = null,
-        ?Random $random = null
+        ?SecureHtmlRenderer $secureRenderer = null
     ) {
         $this->_wysiwygConfig = $wysiwygConfig;
         $this->_layout = $layout;
         $this->_moduleManager = $moduleManager;
         $this->_backendData = $backendData;
         parent::__construct($factoryElement, $factoryCollection, $escaper, $data);
-        $secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
-        $random = $random ?? ObjectManager::getInstance()->get(Random::class);
-        $this->secureRenderer = $secureRenderer;
-        $this->random = $random;
+        $this->secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
     }
 
     /**
@@ -103,18 +92,19 @@ public function getAfterElementHtml()
 
         $html = parent::getAfterElementHtml();
         if ($this->getIsWysiwygEnabled()) {
-            $buttonId = 'wysiwyg_action_button_' . $this->random->getRandomString(32);
             $disabled = $this->getDisabled() || $this->getReadonly();
             $html .= $this->_layout->createBlock(
                 \Magento\Backend\Block\Widget\Button::class,
                 '',
                 [
                     'data' => [
-                        'id' => $buttonId,
                         'label' => __('WYSIWYG Editor'),
                         'type' => 'button',
                         'disabled' => $disabled,
                         'class' => 'action-wysiwyg',
+                        'onclick' => 'catalogWysiwygEditor.open(\'' . $this->_backendData->getUrl(
+                            'catalog/product/wysiwyg'
+                        ) . '\', \'' . $this->getHtmlId() . '\')',
                     ]
                 ]
             )->toHtml();
@@ -143,13 +133,6 @@ public function getAfterElementHtml()
 });
 HTML;
             $html .= /* @noEscape */ $this->secureRenderer->renderTag('script', [], $scriptString, false);
-            $html .= /* @noEscape */ $this->secureRenderer->renderEventListenerAsTag(
-                'onclick',
-                'catalogWysiwygEditor.open(\'' . $this->_backendData->getUrl(
-                    'catalog/product/wysiwyg'
-                ) . '\', \'' . $this->getHtmlId() . '\')',
-                $buttonId
-            );
         }
 
         return $html;
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
index 5be85db894c40..f4080104b40cd 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
@@ -14,7 +14,7 @@
 
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Escaper;
-use Magento\Framework\Json\Helper\Data;
+use Magento\Framework\Json\Helper\Data as JsonHelper;
 
 /**
  * Class for Product Edit.
@@ -61,6 +61,7 @@ class Edit extends \Magento\Backend\Block\Widget
      * @param \Magento\Catalog\Helper\Product $productHelper
      * @param Escaper $escaper
      * @param array $data
+     * @param JsonHelper|null $jsonHelper
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -69,14 +70,15 @@ public function __construct(
         \Magento\Framework\Registry $registry,
         \Magento\Catalog\Helper\Product $productHelper,
         Escaper $escaper,
-        array $data = []
+        array $data = [],
+        ?JsonHelper $jsonHelper = null
     ) {
         $this->_productHelper = $productHelper;
         $this->_attributeSetFactory = $attributeSetFactory;
         $this->_coreRegistry = $registry;
         $this->jsonEncoder = $jsonEncoder;
         $this->escaper = $escaper;
-        $data['helper'] = ObjectManager::getInstance()->get(Data::class);
+        $data['jsonHelper'] = $jsonHelper ?? ObjectManager::getInstance()->get(JsonHelper::class);
         parent::__construct($context, $data);
     }
 
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/AttributeSet.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/AttributeSet.php
index 01c82df6b2293..6419ae2d70588 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/AttributeSet.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/AttributeSet.php
@@ -12,7 +12,7 @@
 namespace Magento\Catalog\Block\Adminhtml\Product\Edit;
 
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Json\Helper\Data;
+use Magento\Framework\Json\Helper\Data as JsonHelper;
 
 /**
  * Admin AttributeSet block
@@ -30,14 +30,16 @@ class AttributeSet extends \Magento\Backend\Block\Widget\Form
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
+     * @param JsonHelper|null $jsonHelper
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Framework\Registry $registry,
-        array $data = []
+        array $data = [],
+        ?JsonHelper $jsonHelper = null
     ) {
         $this->_coreRegistry = $registry;
-        $data['jsonHelper'] = ObjectManager::getInstance()->get(Data::class);
+        $data['jsonHelper'] = $jsonHelper ?? ObjectManager::getInstance()->get(JsonHelper::class);
         parent::__construct($context, $data);
     }
 
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Js.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Js.php
index 4436099c215d9..2620fd345c667 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Js.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Js.php
@@ -10,7 +10,7 @@
 use Magento\Tax\Api\TaxCalculationInterface;
 use Magento\Tax\Model\TaxClass\Source\Product as ProductTaxClassSource;
 use Magento\Framework\App\ObjectManager;
-use Magento\Tax\Helper\Data;
+use Magento\Tax\Helper\Data as TaxHelper;
 
 class Js extends \Magento\Backend\Block\Template
 {
@@ -53,6 +53,7 @@ class Js extends \Magento\Backend\Block\Template
      * @param TaxCalculationInterface $calculationService
      * @param ProductTaxClassSource $productTaxClassSource
      * @param array $data
+     * @param TaxHelper|null $taxHelper
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -61,14 +62,15 @@ public function __construct(
         \Magento\Framework\Json\Helper\Data $jsonHelper,
         TaxCalculationInterface $calculationService,
         ProductTaxClassSource $productTaxClassSource,
-        array $data = []
+        array $data = [],
+        ?TaxHelper $taxHelper = null
     ) {
         $this->coreRegistry = $registry;
         $this->currentCustomer = $currentCustomer;
         $this->jsonHelper = $jsonHelper;
         $this->calculationService = $calculationService;
         $this->productTaxClassSource = $productTaxClassSource;
-        $data['helper'] = ObjectManager::getInstance()->get(Data::class);
+        $data['taxHelper'] = $taxHelper ?? ObjectManager::getInstance()->get(TaxHelper::class);
         parent::__construct($context, $data);
     }
 
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
index 7bef31e0839a3..702c77e3a5595 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php
@@ -12,7 +12,7 @@
 namespace Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes;
 
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Json\Helper\Data;
+use Magento\Framework\Json\Helper\Data as JsonHelper;
 
 /**
  * Admin product attribute search block
@@ -42,18 +42,20 @@ class Search extends \Magento\Backend\Block\Widget
      * @param \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $collectionFactory
      * @param \Magento\Framework\Registry $registry
      * @param array $data
+     * @param JsonHelper|null $jsonHelper
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Framework\DB\Helper $resourceHelper,
         \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $collectionFactory,
         \Magento\Framework\Registry $registry,
-        array $data = []
+        array $data = [],
+        ?JsonHelper $jsonHelper = null
     ) {
         $this->_resourceHelper = $resourceHelper;
         $this->_collectionFactory = $collectionFactory;
         $this->_coreRegistry = $registry;
-        $data['jsonHelper'] = ObjectManager::getInstance()->get(Data::class);
+        $data['jsonHelper'] = $jsonHelper ?? ObjectManager::getInstance()->get(JsonHelper::class);
         parent::__construct($context, $data);
     }
 
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
index 6329c490d241c..0a9434768737d 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
@@ -15,7 +15,7 @@
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Json\Helper\Data;
+use Magento\Framework\Json\Helper\Data as JsonHelper;
 use Magento\Framework\View\Helper\SecureHtmlRenderer;
 use Magento\Store\Model\Store;
 
@@ -88,6 +88,7 @@ class Option extends Widget
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Catalog\Model\ProductOptions\ConfigInterface $productOptionConfig
      * @param array $data
+     * @param JsonHelper|null $jsonHelper
      * @param SecureHtmlRenderer|null $secureRenderer
      */
     public function __construct(
@@ -98,6 +99,7 @@ public function __construct(
         \Magento\Framework\Registry $registry,
         \Magento\Catalog\Model\ProductOptions\ConfigInterface $productOptionConfig,
         array $data = [],
+        ?JsonHelper $jsonHelper = null,
         ?SecureHtmlRenderer $secureRenderer = null
     ) {
         $this->_optionType = $optionType;
@@ -105,7 +107,7 @@ public function __construct(
         $this->_product = $product;
         $this->_productOptionConfig = $productOptionConfig;
         $this->_coreRegistry = $registry;
-        $data['jsonHelper'] = ObjectManager::getInstance()->get(Data::class);
+        $data['jsonHelper'] = $jsonHelper ?? ObjectManager::getInstance()->get(JsonHelper::class);
         parent::__construct($context, $data);
         $this->secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
     }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php
index 993b256fb7317..00cd020e4f525 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php
@@ -8,10 +8,12 @@
 use Magento\Customer\Api\GroupManagementInterface;
 use Magento\Customer\Api\GroupRepositoryInterface;
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Json\Helper\Data;
+use Magento\Framework\Json\Helper\Data as JsonHelper;
 
 /**
  * Adminhtml tier price item renderer
+ *
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
  */
 class Tier extends Group\AbstractGroup
 {
@@ -30,6 +32,7 @@ class Tier extends Group\AbstractGroup
      * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
      * @param \Magento\Framework\Locale\CurrencyInterface $localeCurrency
      * @param array $data
+     * @param JsonHelper|null $jsonHelper
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -40,9 +43,10 @@ public function __construct(
         GroupManagementInterface $groupManagement,
         \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder,
         \Magento\Framework\Locale\CurrencyInterface $localeCurrency,
-        array $data = []
+        array $data = [],
+        ?JsonHelper $jsonHelper = null
     ) {
-        $data['jsonHelper'] = ObjectManager::getInstance()->get(Data::class);
+        $data['jsonHelper'] = $jsonHelper ?? ObjectManager::getInstance()->get(JsonHelper::class);
         parent::__construct(
             $context,
             $groupRepository,
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php
index f1d3483e9dbd0..698bb12022bc6 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php
@@ -141,6 +141,7 @@ public function getAfterElementHtml()
                 'id' => 'add_category_button',
                 'label' => $newCategoryCaption,
                 'title' => $newCategoryCaption,
+                'onclick' => 'jQuery("#new-category").modal("openModal")',
                 'disabled' => $this->getDisabled(),
             ]
         );
@@ -153,14 +154,8 @@ public function getAfterElementHtml()
         });
 script;
 
-        return $return .
-            /* @noEscape */ $this->secureRenderer->renderTag('script', [], $scriptString, false) .
-            $button->toHtml() .
-            /* @noEscape */ $this->secureRenderer->renderEventListenerAsTag(
-                'onclick',
-                'jQuery("#new-category").modal("openModal")',
-                '#add_category_button'
-            );
+        return $return . $button->toHtml() .
+            /* @noEscape */ $this->secureRenderer->renderTag('script', [], $scriptString, false);
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Config.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Config.php
index bec1a57320aa0..541d0f79f4da6 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Config.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Config.php
@@ -52,7 +52,7 @@ public function getElementHtml()
         $html .= /* @noEscape */ $this->secureRenderer->renderTag('script', [], $scriptString, false);
         $html .= /* @noEscape */ $this->secureRenderer->renderEventListenerAsTag(
             'onclick',
-            "toggleValueElements(this, this.parentNode);",
+            "toggleValueElements($('#' . $htmlId), $('#' . $htmlId).parentNode);",
             '#' . $htmlId
         );
 
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
index c5a7bf3ae5fd6..57cea59bee207 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
@@ -15,7 +15,7 @@
 
 use Magento\Framework\App\ObjectManager;
 use Magento\Backend\Block\Media\Uploader;
-use Magento\Framework\Json\Helper\Data;
+use Magento\Framework\Json\Helper\Data as JsonHelper;
 use Magento\Framework\View\Element\AbstractBlock;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\FileSystemException;
@@ -66,6 +66,7 @@ class Content extends \Magento\Backend\Block\Widget
      * @param array $data
      * @param ImageUploadConfigDataProvider $imageUploadConfigDataProvider
      * @param Database $fileStorageDatabase
+     * @param JsonHelper|null $jsonHelper
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -73,11 +74,12 @@ public function __construct(
         \Magento\Catalog\Model\Product\Media\Config $mediaConfig,
         array $data = [],
         ImageUploadConfigDataProvider $imageUploadConfigDataProvider = null,
-        Database $fileStorageDatabase = null
+        Database $fileStorageDatabase = null,
+        ?JsonHelper $jsonHelper = null
     ) {
         $this->_jsonEncoder = $jsonEncoder;
         $this->_mediaConfig = $mediaConfig;
-        $data['jsonHelper'] = ObjectManager::getInstance()->get(Data::class);
+        $data['jsonHelper'] = $jsonHelper ?? ObjectManager::getInstance()->get(JsonHelper::class);
         parent::__construct($context, $data);
         $this->imageUploadConfigDataProvider = $imageUploadConfigDataProvider
             ?: ObjectManager::getInstance()->get(ImageUploadConfigDataProvider::class);
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php
index 5fa07b2077053..a873d1465af21 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php
@@ -11,6 +11,10 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form;
 
+use Magento\Framework\Data\Form\Element\CollectionFactory;
+use Magento\Framework\Data\Form\Element\Factory;
+use Magento\Framework\Math\Random;
+use Magento\Framework\UrlInterface;
 use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
 class Image extends \Magento\Framework\Data\Form\Element\Image
diff --git a/app/code/Magento/Catalog/Block/Product/ListProduct.php b/app/code/Magento/Catalog/Block/Product/ListProduct.php
index 8ca815becfab1..3d1c3f504f91a 100644
--- a/app/code/Magento/Catalog/Block/Product/ListProduct.php
+++ b/app/code/Magento/Catalog/Block/Product/ListProduct.php
@@ -24,7 +24,7 @@
 use Magento\Framework\Pricing\Render;
 use Magento\Framework\Url\Helper\Data;
 use Magento\Framework\App\ObjectManager;
-use Magento\Catalog\Helper\Output;
+use Magento\Catalog\Helper\Output as OutputHelper;
 
 /**
  * Product list
@@ -77,6 +77,7 @@ class ListProduct extends AbstractProduct implements IdentityInterface
      * @param CategoryRepositoryInterface $categoryRepository
      * @param Data $urlHelper
      * @param array $data
+     * @param OutputHelper|null $outputHelper
      */
     public function __construct(
         Context $context,
@@ -84,13 +85,14 @@ public function __construct(
         Resolver $layerResolver,
         CategoryRepositoryInterface $categoryRepository,
         Data $urlHelper,
-        array $data = []
+        array $data = [],
+        ?OutputHelper $outputHelper = null
     ) {
         $this->_catalogLayer = $layerResolver->get();
         $this->_postDataHelper = $postDataHelper;
         $this->categoryRepository = $categoryRepository;
         $this->urlHelper = $urlHelper;
-        $data['jsonHelper'] = ObjectManager::getInstance()->get(Output::class);
+        $data['outputHelper'] = $outputHelper ?? ObjectManager::getInstance()->get(OutputHelper::class);
         parent::__construct(
             $context,
             $data
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml
index 3efdf1a82b40a..6c92ddcf36243 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Csp\Api\InlineUtilInterface $csp */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
 <?php $_divId = 'tree' . $block->getId() ?>
@@ -201,4 +201,4 @@ $scriptString .= <<<script
 });
 script;
 ?>
-<?= /* @noEscape */ $csp->renderTag('script', [], $scriptString); ?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/form/renderer/fieldset/element.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/form/renderer/fieldset/element.phtml
index e340e83e1f520..4e70bff5a4884 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/form/renderer/fieldset/element.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/form/renderer/fieldset/element.phtml
@@ -26,6 +26,8 @@ $fieldClass .= ($entity && $entity->getIsUserDefined()) ? ' user-defined type-'
 
 $fieldAttributes = $fieldId . ' class="' . $block->escapeHtmlAttr($fieldClass) . '" '
     . $block->getUiId('form-field', $block->escapeHtmlAttr($element->getId()));
+
+/** @var \Magento\Framework\Json\Helper\Data $jsonHelper */
 $jsonHelper = $block->getData('jsonHelper');
 ?>
 
@@ -65,7 +67,7 @@ $jsonHelper = $block->getData('jsonHelper');
                             value="<?= $block->escapeHtmlAttr($block->getAttributeCode()) ?>"/>
                     <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
                         'onclick',
-                        "toggleValueElements(this, this.parentNode);",
+                        $elementToggleCode,
                         "#" . $element->getHtmlId() . "_default"
                     ) ?>
                     <span class="use-default-label"><?= $block->escapeHtml(__('Use Default Value')) ?></span>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml
index 1290df418e5a6..8dde7013763dc 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml
@@ -9,7 +9,9 @@ use Magento\Catalog\Helper\Data;
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
-<?php $jsonHelper = $block->getData('jsonHelper');
+<?php
+/** @var \Magento\Framework\Json\Helper\Data $jsonHelper */
+$jsonHelper = $block->getData('jsonHelper');
 $scriptString = <<<script
 require([
     "jquery",
@@ -288,7 +290,7 @@ function setRowVisibility(id, isVisible)
 
 function updateRequriedOptions()
 {
-    if ($F('frontend_input')=='select' && $F('is_required')==1) {
+    if (\$F('frontend_input')=='select' && \$F('is_required')==1) {
         $('option-count-check').addClassName('required-options-count');
     } else {
         $('option-count-check').removeClassName('required-options-count');
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml
index cda4e363d3f1e..a181ed8d67120 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/file.phtml
@@ -76,12 +76,13 @@ script;
     <div class="admin__field-control control" id="<?= /* @noEscape */ $_fileName ?>">
         <?php if ($_fileExists):?>
             <span class="<?= /* @noEscape */ $_fileNamed ?>"><?= $block->escapeHtml($_fileInfo->getTitle()) ?></span>
-            <a href="javascript:void(0)" class="label">
+            <a href="#" class="label">
                 <?= $block->escapeHtml(__('Change')) ?>
             </a>&nbsp;
             <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
                 'onclick',
-                "opFile" . /* @noEscape */ $_rand . ".toggleFileChange($(this).next('.input-box'))",
+                "event.preventDefault(); opFile" . /* @noEscape */ $_rand .
+                ".toggleFileChange($(this).next('.input-box'))",
                 '#' . /* @noEscape */ $_fileName . ' a'
             ); ?>
             <?php if (!$_option->getIsRequire()):?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml
index 624e006bab9a1..eaaee91d7226c 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml
@@ -3,9 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-<?php
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 
 /**
  * @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit
@@ -61,9 +58,11 @@
 <?php if ($block->getUseContainer()):?>
 </form>
 <?php endif; ?>
-<?php $helper = $block->getData('helper');
-$jsonFieldsAutogenerationMasks  = /* @noEscape */ $helper->jsonEncode($block->getFieldsAutogenerationMasks());
-$jsonAttributesAllowedForAutogeneration = /* @noEscape */ $helper->jsonEncode(
+<?php
+/** @var \Magento\Framework\Json\Helper\Data $jsonHelper */
+$jsonHelper = $block->getData('jsonHelper');
+$jsonFieldsAutogenerationMasks  = /* @noEscape */ $jsonHelper->jsonEncode($block->getFieldsAutogenerationMasks());
+$jsonAttributesAllowedForAutogeneration = /* @noEscape */ $jsonHelper->jsonEncode(
     $block->getAttributesAllowedForAutogeneration()
 );
 $scriptString = <<<scriptStr
@@ -75,8 +74,8 @@ require([
     "mage/backend/tabs",
     "domReady!"
 ], function($, TypeSwitcher){
-    var $form = $('[data-form=edit-product]');
-    $form.data('typeSwitcher', TypeSwitcher.init());
+    var \$form = $('[data-form=edit-product]');
+    \$form.data('typeSwitcher', TypeSwitcher.init());
 
     var scriptTagManager = (function($) {
         var hiddenPrefix = 'hidden',
@@ -118,7 +117,7 @@ require([
             $(this).val($(this).val().substr(0, maxLength));
         }
     });
-    $form.mage('form', {
+    \$form.mage('form', {
         handlersData: {
             save: {},
             saveAndContinueEdit: {
@@ -138,7 +137,7 @@ require([
             }
         }
     });
-    $form.mage('validation', {validationUrl: '{$block->escapeJs($block->getValidationUrl())}'});
+    \$form.mage('validation', {validationUrl: '{$block->escapeJs($block->getValidationUrl())}'});
 
     var masks = {$jsonFieldsAutogenerationMasks};
     var availablePlaceholders = {$jsonAttributesAllowedForAutogeneration};
@@ -164,13 +163,13 @@ require([
                     'change init',
                     elementSelector,
                     $.proxy(function(event) {
-                        var $element = $(event.target);
-                        if (event.type == 'init' && $element.data('disablerInited')) {
+                        var \$element = $(event.target);
+                        if (event.type == 'init' && \$element.data('disablerInited')) {
                             return;
                         } else {
-                            $element.data('disablerInited', true);
+                            \$element.data('disablerInited', true);
                         }
-                        $element.data(this.data.disabled, $element.val().replace(/\s/g, '') != '');
+                        \$element.data(this.data.disabled, \$element.val().replace(/\s/g, '') != '');
                     }, this)
                 ).find(elementSelector).trigger('init');
             };
@@ -178,19 +177,19 @@ require([
             $("#product_info_tabs").on("tabscreate tabsactivate", $.proxy(disabler, this));
 
             $.each(this._masks, function(field, mask) {
-                var $field = $('#' + field);
-                if (!$field.val() && mask && mask.length > 0 && !self.varRegexp.test(mask)) {
-                    $field.val(mask);
+                var \$field = $('#' + field);
+                if (!\$field.val() && mask && mask.length > 0 && !self.varRegexp.test(mask)) {
+                    \$field.val(mask);
                 }
-                $field.trigger('change');
+                \$field.trigger('change');
             });
 
             $.each(self._fieldReverseIndex, function(field) {
-                var fields = this, $field = $('#' + field);
+                var fields = this, \$field = $('#' + field);
                 var filler = function(onlyText) {
                     $.each(fields, function() {
-                        var $el = $('#' + this);
-                        if ($el.data(self.data.disabled)) {
+                        var \$el = $('#' + this);
+                        if (\$el.data(self.data.disabled)) {
                             return;
                         }
                         if (onlyText === true && self.varRegexp.test(self._masks[this])) {
@@ -199,12 +198,12 @@ require([
                         var value = self._masks[this].replace(self.varsRegexp, function(maskfieldName) {
                             return $('#' + maskfieldName.slice(2, -2)).val();
                         });
-                        $el.val(value);
+                        \$el.val(value);
                     });
                 };
-                if ($field.length) {
+                if (\$field.length) {
                     self.form.on('keyup change blur click paste', '#' + field, filler);
-                    $field.trigger('change');
+                    \$field.trigger('change');
                 }
             });
         },
@@ -226,7 +225,7 @@ require([
         }
     });
 
-    $form.data('autogenerator', new Autogenerator(masks).bindAll());
+    \$form.data('autogenerator', new Autogenerator(masks).bindAll());
 
     $('.widget-button-save .item-default').parent().hide();
 
@@ -238,7 +237,7 @@ require([
         $('#status').val($(this).prop('checked') ? '1' : '2');
     });
 
-    $form.on('changeAttributeSet', function(event, data) {
+    \$form.on('changeAttributeSet', function(event, data) {
         if (data.label) {
             $('#product-template-suggest-container .action-toggle>span').text(data.label);
             $('[data-role=affected-attribute-set-selector] [data-role=name-container]').text(data.label);
@@ -249,13 +248,13 @@ require([
         uri += /\?/.test(uri) ? '&' : '?';
         uri += 'set=' + window.encodeURIComponent(data.id);
 
-        var $form = $('[data-form=edit-product]');
-        $form.attr('action', $form.attr('action').replace(/(\/|&|\?)?\bset(\/|=)\d+/g, ''));
-        $form.find('#attribute_set_id').attr('name', 'set').val(data.id);
+        var \$form = $('[data-form=edit-product]');
+        \$form.attr('action', \$form.attr('action').replace(/(\/|&|\?)?\bset(\/|=)\d+/g, ''));
+        \$form.find('#attribute_set_id').attr('name', 'set').val(data.id);
         $.ajax({
             url: uri.replace('/edit/', '/new/') + '&popup=1',
             type: 'post',
-            data: $form.serializeArray(),
+            data: \$form.serializeArray(),
             dataType: 'html',
             context: $('body'),
             showLoader: true
@@ -264,68 +263,68 @@ require([
             data = scriptTagManager.disableScripts(data);
             var removedElementClass = 'removed';
 
-            var $page = $('body');
-            var $newPage = $(data);
+            var \$page = $('body');
+            var \$newPage = $(data);
 
             var nameMapper = function() {
                 return $(this).attr('name');
             };
             var activeTabId = $('.ui-tabs-active>a').attr('id');
             //add new tab tabs or reorder
-            $page.find('#product_info_tabs .tabs').each(function(i, tabContainer) {
-                $newPage.find('#product_info_tabs .tabs').each(function(j, newTabContainer) {
+            \$page.find('#product_info_tabs .tabs').each(function(i, tabContainer) {
+                \$newPage.find('#product_info_tabs .tabs').each(function(j, newTabContainer) {
                     if (i != j) {
                         return;
                     }
-                    var $tabContainer = $(tabContainer);
+                    var \$tabContainer = $(tabContainer);
                     $(tabContainer).find('li').removeClass(removedElementClass);
-                    var $tabs = $(tabContainer)
+                    var \$tabs = $(tabContainer)
                         .find('li:not(.' + removedElementClass + ')  .tab-item-link.user-defined:not(.ajax)');
-                    var $newTabs = $(newTabContainer).find('.tab-item-link.user-defined:not(.ajax)'),
-                        tabsNames = $tabs.map(nameMapper).toArray();
+                    var \$newTabs = $(newTabContainer).find('.tab-item-link.user-defined:not(.ajax)'),
+                        tabsNames = \$tabs.map(nameMapper).toArray();
 
                     //hide not exists elements
                     $.each(
-                        _.difference(tabsNames, $newTabs.map(nameMapper).toArray()),
+                        _.difference(tabsNames, \$newTabs.map(nameMapper).toArray()),
                         function(index, tabName) {
-                            $tabContainer.find('[name=' + tabName + ']').closest('li')
+                            \$tabContainer.find('[name=' + tabName + ']').closest('li')
                                 .addClass(removedElementClass);
-                            $page.find('#' + tabName)
+                            \$page.find('#' + tabName)
                                 .addClass(removedElementClass)
                                 .addClass('ignore-validate');
                         }
                     );
 
                     $(newTabContainer).find('.tab-item-link.user-defined:not(.ajax)').each(function(index, tab) {
-                        var $tab = $(tab),
-                            tabName = nameMapper.apply($tab),
-                            $tabsContent = $tab.closest('li').clone();
-                        $tabsContent.find('.fieldset>.field').remove();
-                        if (nameMapper.apply($tabs.eq(index)) == tabName) {
+                        var \$tab = $(tab),
+                            tabName = nameMapper.apply(\$tab),
+                            \$tabsContent = \$tab.closest('li').clone();
+                        \$tabsContent.find('.fieldset>.field').remove();
+                        if (nameMapper.apply(\$tabs.eq(index)) == tabName) {
                             return true;
                         }
-                        var $tabToMove = $.inArray(tabName, tabsNames) !== -1
-                            ? $tabs.filter(function() {
+                        var \$tabToMove = $.inArray(tabName, tabsNames) !== -1
+                            ? \$tabs.filter(function() {
                             return nameMapper.apply(this) === tabName;
                         }).closest('li')
-                            : $tabsContent;
+                            : \$tabsContent;
                         if (index === 0) {
-                            $tabToMove.prependTo($tabContainer);
+                            \$tabToMove.prependTo(\$tabContainer);
                         } else {
-                            $tabToMove.insertAfter($tabs.eq(index - 1).closest('li'));
+                            \$tabToMove.insertAfter(\$tabs.eq(index - 1).closest('li'));
                         }
-                        $tabToMove.removeClass(removedElementClass).removeClass('ignore-validate');
-                        $tabs = $tabContainer
+                        \$tabToMove.removeClass(removedElementClass).removeClass('ignore-validate');
+                        \$tabs = \$tabContainer
                         .find('li:not(.' + removedElementClass + ')  .tab-item-link.user-defined:not(.ajax)');
                     });
                 });
             });
 
             //add new fieldsets or reorder
-            $newPage.find('#product_info_tabs .fieldset.user-defined').each(function(index, newFieldset) {
+            \$newPage.find('#product_info_tabs .fieldset.user-defined').each(function(index, newFieldset) {
                 var fieldsetContainer, newFieldsetContainer, sourceContainer, destinationContainer;
                 newFieldsetContainer = $(newFieldset).parents('[data-ui-id*=-tab-content-]').first();
-                if ($page.find('[data-ui-id=' + newFieldsetContainer.data('uiId') + ']').length === 0) {
+                if (\$page.find('[data-ui-id=' + newFieldsetContainer.data('uiId') + ']').length === 0) {
                     fieldsetContainer = newFieldsetContainer
                         .clone()
                         .removeClass(removedElementClass)
@@ -333,10 +332,10 @@ require([
                     //Enable hidden js scripts in node. These scripts will be performed after inserting into page
                     fieldsetContainer = scriptTagManager.enableScripts(fieldsetContainer);
                 } else {
-                    fieldsetContainer = $page.find('[data-ui-id=' + newFieldsetContainer.data('uiId') + ']').first();
+                    fieldsetContainer = \$page.find('[data-ui-id=' + newFieldsetContainer.data('uiId') + ']').first();
                 }
                 sourceContainer = newFieldsetContainer.parents('[data-ui-id*=-tab-content-]').first();
-                destinationContainer = $page.find('[data-ui-id=' + sourceContainer.data('uiId') + ']').first();
+                destinationContainer = \$page.find('[data-ui-id=' + sourceContainer.data('uiId') + ']').first();
                 fieldsetContainer.appendTo(destinationContainer);
             });
 
@@ -344,7 +343,7 @@ require([
                 return $(this).data('attributeCode');
             };
             //add new element elements or reorder
-            $page.find('[data-form=edit-product] [data-role=tabs] .fieldset, #product_info_tabs .fieldset')
+            \$page.find('[data-form=edit-product] [data-role=tabs] .fieldset, #product_info_tabs .fieldset')
                 .removeClass('ignore-validate')
                 .removeClass(removedElementClass)
                 .each(function(i, fieldSet) {
@@ -352,49 +351,49 @@ require([
                     if ($(fieldSet).attr('id') != $(newFieldSet).attr('id')) {
                         return
                     }
-                    var $elements = $(fieldSet).find('>.field:not(.' + removedElementClass + ')');
-                    var $newFieldSet = $(newFieldSet);
-                    var $newElements = $newFieldSet.find('>.field');
+                    var \$elements = $(fieldSet).find('>.field:not(.' + removedElementClass + ')');
+                    var \$newFieldSet = $(newFieldSet);
+                    var \$newElements = \$newFieldSet.find('>.field');
 
-                    $elements.removeClass(removedElementClass);
+                    \$elements.removeClass(removedElementClass);
 
-                    var elementNames = $elements.map(nameDataMapper).toArray();
+                    var elementNames = \$elements.map(nameDataMapper).toArray();
 
                     //hide not exists elements
                     $.each(
-                        _.difference(elementNames, $newElements.map(nameDataMapper).toArray()),
+                        _.difference(elementNames, \$newElements.map(nameDataMapper).toArray()),
                         function(index, elementId) {
-                            $page.find('#attribute-' + elementId + '-container')
+                            \$page.find('#attribute-' + elementId + '-container')
                                 .addClass(removedElementClass)
                                 .addClass('ignore-validate');
                         }
                     );
 
-                    $newElements.each(function(index, element) {
-                        var $element = $(element),
-                            elementId = nameDataMapper.apply($element);
-                        if (nameDataMapper.apply($elements.get(index)) == elementId) {
+                    \$newElements.each(function(index, element) {
+                        var \$element = $(element),
+                            elementId = nameDataMapper.apply(\$element);
+                        if (nameDataMapper.apply(\$elements.get(index)) == elementId) {
                             return true;
                         }
-                        var $elementToMove = $('.fieldset>.field[data-attribute-code="' + elementId + '"]');
-                        if ($elementToMove.length === 0) {
-                            $elementToMove = $element.clone();
+                        var \$elementToMove = $('.fieldset>.field[data-attribute-code="' + elementId + '"]');
+                        if (\$elementToMove.length === 0) {
+                            \$elementToMove = \$element.clone();
                         }
                         if (index === 0) {
-                            $elementToMove.prependTo(fieldSet);
+                            \$elementToMove.prependTo(fieldSet);
                         } else {
-                            $elementToMove.insertAfter($elements.get(index - 1))
+                            \$elementToMove.insertAfter(\$elements.get(index - 1))
                         }
-                        $elementToMove.trigger('contentUpdated');
-                        $elementToMove.removeClass(removedElementClass).removeClass('.ignore-validate');
-                        $elements = $(fieldSet).find('>.field:not(.' + removedElementClass + ')');
+                        \$elementToMove.trigger('contentUpdated');
+                        \$elementToMove.removeClass(removedElementClass).removeClass('.ignore-validate');
+                        \$elements = $(fieldSet).find('>.field:not(.' + removedElementClass + ')');
                     });
                 };
 
-                $newPage.find('#product_info_tabs .fieldset').each(updateFieldsetElements);
+                \$newPage.find('#product_info_tabs .fieldset').each(updateFieldsetElements);
 
                 fieldsetContainer = $(fieldSet).parents('[data-ui-id*=-tab-content-]').first();
-                var newFieldsetContainer = $newPage.find('[data-ui-id=' + $(fieldsetContainer).data('uiId') + ']');
+                var newFieldsetContainer = \$newPage.find('[data-ui-id=' + $(fieldsetContainer).data('uiId') + ']');
                 if (newFieldsetContainer.length == 0) {
                     $(fieldsetContainer).find('fieldset .field')
                         .addClass('ignore-validate')
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml
index 3a25ed1e135bd..261de795f7199 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/attribute_set.phtml
@@ -24,17 +24,18 @@
 </button>
 <% } %>
 </script>
-<?php $jsonHelper = $block->getData('jsonHelper');
+<?php /** @var \Magento\Framework\Json\Helper\Data $jsonHelper */
+$jsonHelper = $block->getData('jsonHelper');
 $selectorOptions = /* @noEscape */ $jsonHelper->jsonEncode($block->getSelectorOptions());
 $scriptString = <<<script
     require(["jquery","mage/mage","mage/backend/suggest"],function ($) {
-        var $suggest = $('#product-template-suggest');
-        $suggest.closest('.dropdown-menu').siblings('[data-toggle=dropdown]').on('click.toggleDropdown', function () {
+        var \$suggest = $('#product-template-suggest');
+        \$suggest.closest('.dropdown-menu').siblings('[data-toggle=dropdown]').on('click.toggleDropdown', function () {
             if ($(this).hasClass('active')) {
-                $suggest.click();
+                \$suggest.click();
             }
         });
-        $suggest
+        \$suggest
             .mage('suggest', {$selectorOptions})
             .on('suggestselect', function (e, ui) {
                 if (ui.item.id) {
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/category/new/form.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/category/new/form.phtml
index 85876946fda02..22dd5de45a073 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/category/new/form.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/category/new/form.phtml
@@ -12,5 +12,5 @@
 </div>
 <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
     'display:none',
-    $block->escapeHtmlAttr($block->getNameInLayout())
+    $block->escapeJs($block->getNameInLayout())
 ) ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml
index 1811217eeac11..ce7dac70010b1 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml
@@ -95,12 +95,14 @@
                             <label for="field-option-req">
                                 <?= $block->escapeHtml(__('Required')) ?>
                             </label>
-                            <span><?= $block->getRequireSelectHtml() ?></span>
+                            <span id="span_<?= /* @noEscape */ $block->getFieldId() ?>">
+                                <?= $block->getRequireSelectHtml() ?>
+                            </span>
                         </div>
                     </div>
                     <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
                         "display:none",
-                        "input#" . /* @noEscape */ $block->getFieldId() ."_<%- data.id %>_required"
+                        "span_#" . /* @noEscape */ $block->getFieldId()
                     ) ?>
                 </fieldset>
             </fieldset>
@@ -113,7 +115,9 @@
 <?php if (!$block->isReadonly()):?>
 <div><input type="hidden" name="affect_product_custom_options" value="1"/></div>
 <?php endif; ?>
-<?php $jsonHelper = $block->getData('jsonHelper');
+<?php
+/** @var \Magento\Framework\Json\Helper\Data $jsonHelper */
+$jsonHelper = $block->getData('jsonHelper');
 
 $customOptions = /* @noEscape */ $jsonHelper->jsonEncode(
     [
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml
index 34fcebba8854c..7e1c48d535dc1 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/tier.phtml
@@ -21,7 +21,8 @@ $element = $block->getElement();
 
 <?php $_showWebsite = $block->isShowWebsiteColumn(); ?>
 <?php $_showWebsite = $block->isMultiWebsites(); ?>
-<?php $jsonHelper = $block->getData('jsonHelper'); ?>
+<?php /** @var \Magento\Framework\Json\Helper\Data $jsonHelper */
+$jsonHelper = $block->getData('jsonHelper'); ?>
 <div class="field" id="attribute-<?= /* @noEscape */ $_htmlId ?>-container"
      data-attribute-code="<?= /* @noEscape */ $_htmlId ?>"
      data-apply-to="<?= $block->escapeHtml(
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml
index 7bbba8b752ced..94d71dbb5ab28 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml
@@ -8,6 +8,7 @@
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 $elementName = $block->getElement()->getName() . '[images]';
 $formName = $block->getFormName();
+/** @var \Magento\Framework\Json\Helper\Data $jsonHelper */
 $jsonHelper = $block->getData('jsonHelper');
 ?>
 <div id="<?= $block->getHtmlId() ?>"
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/js.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/js.phtml
index bdf985d0a3436..4a0a37147dd13 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/js.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/js.phtml
@@ -4,15 +4,14 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-
 /** @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Js $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
 <?php
-$helper = $block->getData('helper');
-$priceFormat = /* @noEscape */ $helper->getPriceFormat($block->getStore());
+/** @var TaxHelper $taxHelper */
+$taxHelper = $block->getData('taxHelper');
+$priceFormat = /* @noEscape */ $taxHelper->getPriceFormat($block->getStore());
 $allRatesByProductClassJson = /* @noEscape */ $block->getAllRatesByProductClassJson();
 $scriptString = <<<script
 require([
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml
index 77f64930071e7..f58e213b60772 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml
@@ -34,6 +34,7 @@
 </script>
 
 <?php
+/** @var \Magento\Framework\Json\Helper\Data $jsonHelper */
 $jsonHelper = $block->getData('jsonHelper');
 $selectorOptions = /* @noEscape */ $jsonHelper->jsonEncode($block->getSelectorOptions());
 $scriptString = <<<script
diff --git a/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml b/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml
index 79e1ce352a4c1..950eb16fb5019 100644
--- a/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml
+++ b/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml
@@ -30,11 +30,13 @@ if ($option): ?>
                value=""
                checked="checked"
         />
-        <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
-            'onclick',
-            $block->getSkipJsReloadPrice() ? '' : 'opConfig.reloadPrice()',
-            "options_" . $block->escapeHtmlAttr($option->getId())
-        ) ?>
+        <?php if (!$block->getSkipJsReloadPrice()): ?>
+            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                'onclick',
+                'opConfig.reloadPrice()',
+                "options_" . $block->escapeJs($option->getId())
+            ) ?>
+        <?php endif; ?>
         <label class="label admin__field-label" for="options_<?= $block->escapeHtmlAttr($option->getId()) ?>">
                         <span>
                             <?= $block->escapeHtml(__('None'))  ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
index bfc8adcc70107..9aaee9727b68f 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
@@ -23,7 +23,7 @@
             alt="<?= $escaper->escapeHtmlAttr($block->getLabel()) ?>"/></span>
 </span>
 <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-    'width:' . $escaper->escapeHtmlAttr($block->getWidth()) . 'px;',
+    'width:' . (int)$escaper->escapeHtmlAttr($block->getWidth()) . 'px;',
     'span.product-image-container'
 ) ?>
 <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
index f088be85262e3..e0bb6b62f0bf6 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
@@ -17,7 +17,8 @@ use Magento\Framework\App\Action\Action;
 ?>
 <?php
 $_productCollection = $block->getLoadedProductCollection();
-$_helper = $block->getData('jsonHelper');
+/** @var \Magento\Catalog\Helper\Output $_helper */
+$_helper = $block->getData('outputHelper');
 ?>
 <?php if (!$_productCollection->count()):?>
     <div class="message info empty">
diff --git a/app/code/Magento/CatalogSearch/Block/Advanced/Form.php b/app/code/Magento/CatalogSearch/Block/Advanced/Form.php
index 8bed5e8810a6a..f8c159f5d6d73 100644
--- a/app/code/Magento/CatalogSearch/Block/Advanced/Form.php
+++ b/app/code/Magento/CatalogSearch/Block/Advanced/Form.php
@@ -15,7 +15,7 @@
 use Magento\Framework\View\Element\BlockInterface;
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Element\Template\Context;
-use Magento\CatalogSearch\Helper\Data;
+use Magento\CatalogSearch\Helper\Data as CatalogSearchHelper;
 
 /**
  * Advanced search form
@@ -44,16 +44,19 @@ class Form extends Template
      * @param Advanced $catalogSearchAdvanced
      * @param CurrencyFactory $currencyFactory
      * @param array $data
+     * @param CatalogSearchHelper|null $catalogSearchHelper
      */
     public function __construct(
         Context $context,
         Advanced $catalogSearchAdvanced,
         CurrencyFactory $currencyFactory,
-        array $data = []
+        array $data = [],
+        ?CatalogSearchHelper $catalogSearchHelper = null
     ) {
         $this->_catalogSearchAdvanced = $catalogSearchAdvanced;
         $this->_currencyFactory = $currencyFactory;
-        $data['jsonHelper'] = ObjectManager::getInstance()->get(Data::class);
+        $data['catalogSearchHelper'] = $catalogSearchHelper ??
+            ObjectManager::getInstance()->get(CatalogSearchHelper::class);
         parent::__construct($context, $data);
     }
 
diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
index 0f97d1cd9fa7e..cebabdc0c422b 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
@@ -12,8 +12,10 @@
  */
 ?>
 
-<?php $jsonHelper = $block->getData('jsonHelper'); ?>
-<?php $maxQueryLength = $jsonHelper->getMaxQueryLength();?>
+<?php
+/** @var \Magento\CatalogSearch\Helper\Data $catalogSearchHelper */
+$catalogSearchHelper = $block->getData('catalogSearchHelper'); ?>
+<?php $maxQueryLength = $catalogSearchHelper->getMaxQueryLength();?>
 <form class="form search advanced" action="<?= $block->escapeUrl($block->getSearchPostUrl()) ?>" method="get"
       id="form-validate">
 <fieldset class="fieldset">
diff --git a/app/code/Magento/Checkout/Block/Total/DefaultTotal.php b/app/code/Magento/Checkout/Block/Total/DefaultTotal.php
index 7773b1c9c8674..a351d73005fe7 100644
--- a/app/code/Magento/Checkout/Block/Total/DefaultTotal.php
+++ b/app/code/Magento/Checkout/Block/Total/DefaultTotal.php
@@ -7,7 +7,7 @@
 
 use Magento\Framework\App\ObjectManager;
 use Magento\Sales\Model\ConfigInterface;
-use Magento\Checkout\Helper\Data;
+use Magento\Checkout\Helper\Data as CheckoutHelper;
 
 /**
  * Default Total Row Renderer
@@ -31,6 +31,7 @@ class DefaultTotal extends \Magento\Checkout\Block\Cart\Totals
      * @param ConfigInterface $salesConfig
      * @param array $layoutProcessors
      * @param array $data
+     * @param CheckoutHelper $checkoutHelper
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -38,9 +39,10 @@ public function __construct(
         \Magento\Checkout\Model\Session $checkoutSession,
         ConfigInterface $salesConfig,
         array $layoutProcessors = [],
-        array $data = []
+        array $data = [],
+        ?CheckoutHelper $checkoutHelper = null
     ) {
-        $data['jsonHelper'] = ObjectManager::getInstance()->get(Data::class);
+        $data['checkoutHelper'] = $checkoutHelper ?? ObjectManager::getInstance()->get(CheckoutHelper::class);
         parent::__construct(
             $context,
             $customerSession,
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
index 10bc7b750af97..f4cc667e4ce8a 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
@@ -15,7 +15,7 @@
                  alt="<?= $block->escapeHtmlAttr(__('Loading...')) ?>">
         </div>
     </div>
-    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("position: absolute;", "#checkout-loader") ?>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("position: absolute;", "#checkout-loader img") ?>
     <!-- ko template: getTemplate() --><!-- /ko -->
     <script type="text/x-magento-init">
         {
diff --git a/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml b/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml
index b5edc3abf8912..37e9ded4a3aa4 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml
@@ -7,6 +7,11 @@
 /** @var $block \Magento\Checkout\Block\Total\DefaultTotal */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
+
+<?php
+/** @var \Magento\Checkout\Helper\Data $checkoutHelper */
+$checkoutHelper = $block->getData('checkoutHelper');
+?>
 <tr class="totals">
     <th colspan="<?= $block->escapeHtmlAttr($block->getColspan()) ?>"
         class="mark" scope="row">
@@ -25,7 +30,7 @@
         <?php endif; ?>
             <span>
                 <?= $block->escapeHtml(
-                    $block->getData('jsonHelper')->formatPrice($block->getTotal()->getValue()),
+                    $checkoutHelper->formatPrice($block->getTotal()->getValue()),
                     ['span']
                 ) ?>
             </span>
@@ -34,11 +39,5 @@
         <?php endif; ?>
     </td>
 </tr>
-<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-    $block->escapeHtmlAttr($block->getTotal()->getStyle()),
-    'tr.totals th.mark'
-) ?>
-<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-    $block->escapeHtmlAttr($block->getTotal()->getStyle()),
-    'tr.totals td.amount'
-) ?>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag($block->getTotal()->getStyle(), 'tr.totals th.mark') ?>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag($block->getTotal()->getStyle(), 'tr.totals td.amount') ?>
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml
index 27706c8dd218b..eb63d9f051d42 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml
@@ -22,8 +22,8 @@ $_height = $block->getImagesHeight();
     >
         <p class="nm" id="<?= $block->escapeHtmlAttr($block->getFileId($file)) ?>_nm">
         <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-            'height:' . $block->escapeHtmlAttr($_height) . 'px;',
-            '#' . $block->escapeHtmlAttr($block->getFileId($file)) . '_nm'
+            'height:' . $block->escapeJs($_height) . 'px;',
+            '#' . $block->escapeJs($block->getFileId($file)) . '_nm'
         ) ?>
         <?php if ($block->getFileThumbUrl($file)): ?>
             <img src="<?= $block->escapeHtmlAttr($block->getFileThumbUrl($file)) ?>"
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml
index 0c5922b16b39b..738cf72f86592 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml
@@ -7,6 +7,11 @@
 /** @var \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Tree $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
+
+<?php
+/** Magento\Framework\Json\Helper\Data $jsonHelper */
+$jsonHelper = $block->getData('jsonHelper');
+?>
 <div class="tree-panel" >
     <div class="categories-side-col">
         <div class="tree-actions">
@@ -26,7 +31,7 @@
         </div>
     </div>
     <div data-role="tree" data-mage-init='<?= $block->escapeHtml(
-        $block->getData('jsonHelper')->jsonEncode($block->getTreeWidgetOptions())
+        $jsonHelper->jsonEncode($block->getTreeWidgetOptions())
     ) ?>'>
     </div>
 </div>
diff --git a/app/code/Magento/Config/view/adminhtml/templates/page/system/config/robots/reset.phtml b/app/code/Magento/Config/view/adminhtml/templates/page/system/config/robots/reset.phtml
index 606d4ad2f9de0..d8fb7cd412a7a 100644
--- a/app/code/Magento/Config/view/adminhtml/templates/page/system/config/robots/reset.phtml
+++ b/app/code/Magento/Config/view/adminhtml/templates/page/system/config/robots/reset.phtml
@@ -7,9 +7,10 @@
 /**
  * @deprecated
  * @var $block \Magento\Backend\Block\Page\System\Config\Robots\Reset
- * @var $jsonHelper \Magento\Framework\Json\Helper\Data
  * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
+
+/** @var \Magento\Framework\Json\Helper\Data $jsonHelper */
 $jsonHelper = $block->getData('jsonHelper');
 ?>
 <?php
diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/js.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/js.phtml
index de83471e5eff4..a0ada7814cee8 100644
--- a/app/code/Magento/Config/view/adminhtml/templates/system/config/js.phtml
+++ b/app/code/Magento/Config/view/adminhtml/templates/system/config/js.phtml
@@ -75,8 +75,7 @@ originModel.prototype = {
         this.loader = new varienLoader(true);
 script;
 
-$scriptString .= 'this.regionsUrl = "' .
-    $block->escapeJs($block->escapeUrl($block->getUrl('directory/json/countryRegion'))) . '";';
+$scriptString .= 'this.regionsUrl = "' . $block->escapeJs($block->getUrl('directory/json/countryRegion')) . '";';
 $scriptString .= <<<script
 
         this.bindCountryRegionRelation();
diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/switcher.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/switcher.phtml
index d956dd0bccd84..19f7a73739400 100644
--- a/app/code/Magento/Config/view/adminhtml/templates/system/config/switcher.phtml
+++ b/app/code/Magento/Config/view/adminhtml/templates/system/config/switcher.phtml
@@ -18,8 +18,8 @@
                 <?php else: ?>
                     <optgroup label="<?= $block->escapeHtmlAttr($_option['label']) ?>">
                         <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-                            $block->escapeHtmlAttr($_option['style']),
-                            "optgroup[label='" . $block->escapeHtmlAttr($_option['label']) . "']"
+                            $_option['style'],
+                            "optgroup[label='" . $block->escapeJs($_option['label']) . "']"
                         ) ?>
                 <?php endif; ?>
                 <?php continue ?>
@@ -30,8 +30,8 @@
                   <?= $block->escapeHtml($_option['label']) ?>
               </option>
               <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-                  $block->escapeHtmlAttr($_option['style']),
-                  "optgroup[url='" . $block->escapeUrl($_option['url']) . "']"
+                  $_option['style'],
+                  "optgroup[url='" . $block->escapeJs($_option['url']) . "']"
               ) ?>
         <?php endforeach ?>
         </select>
diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Composite/Fieldset/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Composite/Fieldset/Configurable.php
index 95290940b2ad4..34d4d22dd09bc 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Composite/Fieldset/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Composite/Fieldset/Configurable.php
@@ -7,7 +7,7 @@
  */
 namespace Magento\ConfigurableProduct\Block\Adminhtml\Product\Composite\Fieldset;
 
-use Magento\Catalog\Helper\Product;
+use Magento\Catalog\Helper\Product as ProductHelper;
 use Magento\ConfigurableProduct\Model\ConfigurableAttributeData;
 use Magento\Customer\Helper\Session\CurrentCustomer;
 use Magento\Customer\Model\Session;
@@ -37,6 +37,7 @@ class Configurable extends \Magento\ConfigurableProduct\Block\Product\View\Type\
      * @param Format|null $localeFormat
      * @param Session|null $customerSession
      * @param \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices|null $variationPrices
+     * @param ProductHelper|null $productHelper
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -50,9 +51,10 @@ public function __construct(
         array $data = [],
         Format $localeFormat = null,
         Session $customerSession = null,
-        \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices $variationPrices = null
+        \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices $variationPrices = null,
+        ?ProductHelper $productHelper = null
     ) {
-        $data['productHelper'] = ObjectManager::getInstance()->get(Product::class);
+        $data['productHelper'] = $productHelper ?? ObjectManager::getInstance()->get(ProductHelper::class);
         parent::__construct(
             $context,
             $arrayUtils,
diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Steps/Bulk.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Steps/Bulk.php
index 4184f3ffedec2..b400ef5f97efb 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Steps/Bulk.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Steps/Bulk.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\ConfigurableProduct\Block\Adminhtml\Product\Steps;
 
+use Magento\Backend\Helper\Js;
 use Magento\Catalog\Helper\Image;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Media\Config;
@@ -13,7 +14,7 @@
 use Magento\Eav\Model\Entity\Attribute;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\View\Element\Template\Context;
-use Magento\Framework\Json\Helper\Data;
+use Magento\Framework\Json\Helper\Data as JsonHelper;
 
 /**
  * Adminhtml block for fieldset of configurable product
@@ -44,15 +45,17 @@ class Bulk extends \Magento\Ui\Block\Component\StepsWizard\StepAbstract
      * @param Config $catalogProductMediaConfig
      * @param ProductFactory $productFactory
      * @param array $data
+     * @param JsonHelper|null $jsonHelper
      */
     public function __construct(
         Context $context,
         Image $image,
         Config $catalogProductMediaConfig,
         ProductFactory $productFactory,
-        array $data = []
+        array $data = [],
+        JsonHelper $jsonHelper = null
     ) {
-        $data['jsonHelper'] = ObjectManager::getInstance()->get(Data::class);
+        $data['jsonHelper'] = $jsonHelper ?? ObjectManager::getInstance()->get(JsonHelper::class);
         parent::__construct($context, $data);
         $this->image = $image;
         $this->productFactory = $productFactory;
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml
index b40121db96488..a46d50176369a 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml
@@ -9,7 +9,11 @@
 ?>
 <?php $_product = $block->getProduct(); ?>
 <?php $_attributes = $block->decorateArray($block->getAllowAttributes()); ?>
-<?php $_skipSaleableCheck = $block->getData('productHelper')->getSkipSaleableCheck(); ?>
+<?php
+/** @var \Magento\Catalog\Helper\Product $productHelper */
+$productHelper = $block->getData('productHelper');
+?>
+<?php $_skipSaleableCheck = $productHelper->getSkipSaleableCheck(); ?>
 <?php if (($_product->isSaleable() || $_skipSaleableCheck) && count($_attributes)):?>
 <fieldset id="catalog_product_composite_configure_fields_configurable" class="fieldset admin__fieldset">
     <legend class="legend admin__legend">
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml
index b54e63c7eb7c5..6cd930978c85f 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml
@@ -8,6 +8,10 @@
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
+<?php
+/** @var \Magento\Framework\Json\Helper\Data $jsonHelper */
+$jsonHelper = $block->getData('jsonHelper');
+?>
 <div data-bind="scope: '<?= /* @noEscape */  $block->getComponentName() ?>'" data-role="bulk-step">
     <h2 class="steps-wizard-title"><?= $block->escapeHtml(__('Step 3: Bulk Images, Price and Quantity')) ?></h2>
     <div class="steps-wizard-info">
@@ -70,7 +74,7 @@
                 <div data-role="gallery"
                      class="gallery"
                      data-images="[]"
-                     data-types="<?= $block->escapeHtml($block->getData('jsonHelper')->jsonEncode(
+                     data-types="<?= $block->escapeHtmlAttr($jsonHelper->jsonEncode(
                          $block->getImageTypes()
                      )) ?>">
                     <div class="image image-placeholder">
@@ -321,8 +325,8 @@
                         <div data-role="gallery"
                              class="gallery"
                              data-images="[]"
-                             data-types="<?= $block->escapeHtml(
-                                 $block->getData('jsonHelper')->jsonEncode($block->getImageTypes())
+                             data-types="<?= $block->escapeHtmlAttr(
+                                 $jsonHelper->jsonEncode($block->getImageTypes())
                              ) ?>">
                             <div class="image image-placeholder">
                                 <div data-role="uploader" class="uploader">
@@ -492,7 +496,7 @@
                                                                        data-role="type-selector"
                                                                        type="checkbox"
                                                                 // @codingStandardsIgnoreLine
-                                                                value="<?= $block->escapeHtml($attribute->getAttributeCode()) ?>"
+                                                                value="<?= $block->escapeHtmlAttr($attribute->getAttributeCode()) ?>"
                                                                 />
                                                                 <?= $block->escapeHtml($attribute->getFrontendLabel())?>
                                                             </label>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml
index 2dc1a6a11e2eb..73067fdee3b84 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml
@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+
 /** @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Variations\Config\Matrix */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
@@ -11,6 +11,9 @@
 $productMatrix = $block->getProductMatrix();
 $attributes = $block->getProductAttributes();
 $currencySymbol = $block->getCurrencySymbol();
+
+/** @var \Magento\Framework\Json\Helper\Data $jsonHelper */
+$jsonHelper = $block->getData('jsonHelper');
 ?>
 
 <div id="product-variations-matrix" data-role="product-variations-matrix">
@@ -269,8 +272,8 @@ $currencySymbol = $block->getCurrencySymbol();
                 "components": {
                     "configurableVariations": {
                         "component": "Magento_ConfigurableProduct/js/variations/variations",
-                        "variations": <?= /* @noEscape */ $block->getData('jsonHelper')->jsonEncode($productMatrix) ?>,
-                        "productAttributes":<?=/* @noEscape */ $block->getData('jsonHelper')->jsonEncode($attributes)?>,
+                        "variations": <?= /* @noEscape */ $jsonHelper->jsonEncode($productMatrix) ?>,
+                        "productAttributes":<?=/* @noEscape */ $jsonHelper->jsonEncode($attributes)?>,
                         "productUrl": "<?= /* @noEscape */ $block->getUrl('catalog/product/edit', ['id' => '%id%']) ?>",
                         "currencySymbol": "<?= /* @noEscape */ $currencySymbol ?>",
                         "configurableProductGrid": "configurableProductGrid"
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard.phtml
index c1af2b79005a3..2cd5a32ce5449 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard.phtml
@@ -8,6 +8,8 @@
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?php
+/** @var \Magento\Framework\Json\Helper\Data $jsonHelper */
+$jsonHelper = $block->getData('jsonHelper');
 $productMatrix = $block->getProductMatrix();
 $attributes = $block->getProductAttributes();
 $currencySymbol = $block->getCurrencySymbol();
@@ -56,9 +58,9 @@ $currencySymbol = $block->getCurrencySymbol();
                         "wizardModalButtonName": "<?= /* @noEscape */ $block->getForm()
                         ?>.configurable.configurable_products_button_set.create_configurable_products_button",
                         "wizardModalButtonTitle": "<?= $block->escapeHtml(__('Edit Configurations')) ?>",
-                        "productAttributes":<?=/* @noEscape */ $block->getData('jsonHelper')->jsonEncode($attributes)?>,
+                        "productAttributes":<?=/* @noEscape */ $jsonHelper->jsonEncode($attributes)?>,
                         "productUrl": "<?= /* @noEscape */ $block->getUrl('catalog/product/edit', ['id' => '%id%']) ?>",
-                        "variations": <?= /* @noEscape */ $block->getData('jsonHelper')->jsonEncode($productMatrix) ?>,
+                        "variations": <?= /* @noEscape */ $jsonHelper->jsonEncode($productMatrix) ?>,
                         "currencySymbol": "<?= /* @noEscape */ $currencySymbol ?>",
                         "attributeSetCreationUrl": "<?= /* @noEscape */ $block->getUrl('*/product_set/save') ?>"
                     }
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/attribute-selector/js.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/attribute-selector/js.phtml
index ebd644a8c79a2..59bfabe736c02 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/attribute-selector/js.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/attribute-selector/js.phtml
@@ -8,7 +8,9 @@
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
-<?php $jsonHelper = $block->getData('jsonHelper');
+<?php
+/** @var \Magento\Framework\Json\Helper\Data $jsonHelper */
+$jsonHelper = $block->getData('jsonHelper');
 $suggestWidgetOptions = /* @noEscape */ $jsonHelper->jsonEncode($block->getSuggestWidgetOptions());
 $scriptString = <<<script
 require(["jquery","mage/mage","mage/backend/suggest"], function($){
diff --git a/app/code/Magento/Cookie/Block/Html/Notices.php b/app/code/Magento/Cookie/Block/Html/Notices.php
index b687338d382ea..4bc7ffd7e7e16 100644
--- a/app/code/Magento/Cookie/Block/Html/Notices.php
+++ b/app/code/Magento/Cookie/Block/Html/Notices.php
@@ -11,7 +11,7 @@
 
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\View\Element\Template;
-use Magento\Cookie\Helper\Cookie;
+use Magento\Cookie\Helper\Cookie as CookieHelper;
 
 /**
  * @api
@@ -22,10 +22,14 @@ class Notices extends \Magento\Framework\View\Element\Template
     /**
      * @param Template\Context $context
      * @param array $data
+     * @param CookieHelper|null $cookieHelper
      */
-    public function __construct(Template\Context $context, array $data = [])
-    {
-        $data['cookieHelper'] = ObjectManager::getInstance()->get(Cookie::class);
+    public function __construct(
+        Template\Context $context,
+        array $data = [],
+        ?CookieHelper $cookieHelper = null
+    ) {
+        $data['cookieHelper'] = $cookieHelper ?? ObjectManager::getInstance()->get(CookieHelper::class);
         parent::__construct($context, $data);
     }
 
diff --git a/app/code/Magento/Cookie/view/frontend/templates/html/notices.phtml b/app/code/Magento/Cookie/view/frontend/templates/html/notices.phtml
index 52b3aa9ab1f5e..38f0d8655f2d6 100644
--- a/app/code/Magento/Cookie/view/frontend/templates/html/notices.phtml
+++ b/app/code/Magento/Cookie/view/frontend/templates/html/notices.phtml
@@ -7,7 +7,9 @@
 /** @var \Magento\Cookie\Block\Html\Notices $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<?php $cookieHelper = $block->getData('cookieHelper');
+<?php
+/** @var \Magento\Cookie\Helper\Cookie $cookieHelper */
+$cookieHelper = $block->getData('cookieHelper');
 if ($cookieHelper->isCookieRestrictionModeEnabled()): ?>
     <div role="alertdialog"
          tabindex="-1"
diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml
index cde9ef3614c7f..5cce76a791e2d 100644
--- a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml
+++ b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml
@@ -44,7 +44,7 @@
                     <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
                         'onclick',
                         "toggleUseDefault('" . $escapedCode . "','" . $escapedSymbol . "')",
-                        'custom_currency_symbol_inherit' . $block->escapeHtmlAttr($code)
+                        '#custom_currency_symbol_inherit' . $block->escapeJs($code)
                     ) ?>
                 </div>
             </div>
diff --git a/app/code/Magento/Customer/Block/Form/Register.php b/app/code/Magento/Customer/Block/Form/Register.php
index b62537495f2c6..4f030c38ac63c 100644
--- a/app/code/Magento/Customer/Block/Form/Register.php
+++ b/app/code/Magento/Customer/Block/Form/Register.php
@@ -53,6 +53,7 @@ class Register extends \Magento\Directory\Block\Data
      * @param \Magento\Customer\Model\Url $customerUrl
      * @param array $data
      * @param Config $newsLetterConfig
+     * @param AddressHelper|null $addressHelper
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -67,13 +68,14 @@ public function __construct(
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Customer\Model\Url $customerUrl,
         array $data = [],
-        Config $newsLetterConfig = null
+        Config $newsLetterConfig = null,
+        ?AddressHelper $addressHelper = null
     ) {
         $this->_customerUrl = $customerUrl;
         $this->_moduleManager = $moduleManager;
         $this->_customerSession = $customerSession;
         $this->newsLetterConfig = $newsLetterConfig ?: ObjectManager::getInstance()->get(Config::class);
-        $data['addressHelper'] = ObjectManager::getInstance()->get(AddressHelper::class);
+        $data['addressHelper'] = $addressHelper ?? ObjectManager::getInstance()->get(AddressHelper::class);
         parent::__construct(
             $context,
             $directoryHelper,
diff --git a/app/code/Magento/Customer/view/adminhtml/templates/system/config/validatevat.phtml b/app/code/Magento/Customer/view/adminhtml/templates/system/config/validatevat.phtml
index 60b351100eb33..3824a759dfb97 100644
--- a/app/code/Magento/Customer/view/adminhtml/templates/system/config/validatevat.phtml
+++ b/app/code/Magento/Customer/view/adminhtml/templates/system/config/validatevat.phtml
@@ -11,7 +11,7 @@
 <?php
  $merchantCountryField = $block->escapeJs($block->getMerchantCountryField());
  $merchantVatNumberField = $block->escapeJs($block->getMerchantVatNumberField());
- $ajaxUrl = $block->escapeJs($block->escapeUrl($block->getAjaxUrl()));
+ $ajaxUrl = $block->escapeJs($block->getAjaxUrl());
  $errorMessage = $block->escapeJs($block->escapeHtml(__('Error during VAT Number verification.')));
 
  $scriptString = <<<script
@@ -65,15 +65,8 @@ script;
     </button>
 </div>
 <?= /* @noEscape */ $secureRenderer->renderTag('style', [], '#validation_result {margin-bottom: 10px;}', false); ?>
-
-<?php
- $htmlId = /* @noEscape */ $block->getHtmlId();
- $scriptString =<<<script
-require(['jquery'], function($) {
-    $('#{$htmlId}').on('click', function() {
-        javascript:validateVat(); return false;
-        });
-    });
-script;
-?>
-<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
+<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+    'onclick',
+    'javascript:validateVat(); return false;',
+    '#' . $htmlId
+); ?>
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 7ae8d963aafbb..a9a28295be09a 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
@@ -10,6 +10,7 @@ use Magento\Customer\Helper\Address;
 /** @var \Magento\Framework\Escaper $escaper */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 
+/** @var Magento\Customer\Helper\Address $addressHelper */
 $addressHelper = $block->getData('adressHelper');
 $formData = $block->getFormData();
 ?>
diff --git a/app/code/Magento/Directory/view/adminhtml/templates/js/optional_zip_countries.phtml b/app/code/Magento/Directory/view/adminhtml/templates/js/optional_zip_countries.phtml
index 900a6a2775863..4037dc19bde33 100644
--- a/app/code/Magento/Directory/view/adminhtml/templates/js/optional_zip_countries.phtml
+++ b/app/code/Magento/Directory/view/adminhtml/templates/js/optional_zip_countries.phtml
@@ -16,6 +16,7 @@
  */
 ?>
 <?php
+/** @var \Magento\Directory\Helper\Data $directoryHelper */
 $directoryHelper = $block->getData('directoryHelper');
 $countriesWithOptionalZip = /* @noEscape */ $directoryHelper->getCountriesWithOptionalZip(true);
 $scriptString = <<<script
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php b/app/code/Magento/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php
index e252c42b970b7..40599efef4f05 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php
@@ -10,6 +10,7 @@
 use Magento\Downloadable\Model\Link\Purchased;
 use Magento\Framework\App\ObjectManager;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Catalog\Helper\Data as CatalogHelper;
 
 /**
  * Sales Order downloadable items name column renderer
@@ -43,6 +44,7 @@ class Name extends \Magento\Sales\Block\Adminhtml\Items\Column\Name
      * @param \Magento\Downloadable\Model\Link\PurchasedFactory $purchasedFactory
      * @param \Magento\Downloadable\Model\ResourceModel\Link\Purchased\Item\CollectionFactory $itemsFactory
      * @param array $data
+     * @param CatalogHelper|null $catalogHelper
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -52,11 +54,12 @@ public function __construct(
         \Magento\Catalog\Model\Product\OptionFactory $optionFactory,
         \Magento\Downloadable\Model\Link\PurchasedFactory $purchasedFactory,
         \Magento\Downloadable\Model\ResourceModel\Link\Purchased\Item\CollectionFactory $itemsFactory,
-        array $data = []
+        array $data = [],
+        ?CatalogHelper $catalogHelper = null
     ) {
         $this->_purchasedFactory = $purchasedFactory;
         $this->_itemsFactory = $itemsFactory;
-        $data['catalogHelper'] = ObjectManager::getInstance()->get(\Magento\Catalog\Helper\Data::class);
+        $data['catalogHelper'] = $catalogHelper ?? ObjectManager::getInstance()->get(CatalogHelper::class);
         parent::__construct($context, $stockRegistry, $stockConfiguration, $registry, $optionFactory, $data);
     }
 
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml
index 422fda2ddc127..91dd22bc3ce5c 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml
@@ -10,7 +10,9 @@
  */
 ?>
 
-<?php $catalogHelper = $block->getData('catalogHelper');
+<?php
+/** @var \Magento\Catalog\Helper\Data $catalogHelper */
+$catalogHelper = $block->getData('catalogHelper');
 if ($_item = $block->getItem()): ?>
     <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
     <div><strong><?= $block->escapeHtml(__('SKU')) ?>:</strong>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml
index 71cd03132c27c..a0b710bdb5d17 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml
@@ -8,7 +8,9 @@
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
-<?php $catalogHelper = $block->getData('catalogHelper');
+<?php
+/** @var \Magento\Catalog\Helper\Data  $catalogHelper */
+$catalogHelper = $block->getData('catalogHelper');
 if ($_item = $block->getItem()): ?>
     <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
     <div><strong><?= $block->escapeHtml(__('SKU')) ?>:</strong>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml
index 2244f1e1de108..7808a214dd76a 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml
@@ -8,7 +8,9 @@
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
-<?php $catalogHelper = $block->getData('catalogHelper');
+<?php
+/** @var \Magento\Catalog\Helper\Data  $catalogHelper */
+$catalogHelper = $block->getData('catalogHelper');
 if ($_item = $block->getItem()): ?>
     <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
     <div class="product-sku-block">
diff --git a/app/code/Magento/GoogleAdwords/view/frontend/templates/code.phtml b/app/code/Magento/GoogleAdwords/view/frontend/templates/code.phtml
index 45ffe733f5c5f..0de78ca8b62c2 100644
--- a/app/code/Magento/GoogleAdwords/view/frontend/templates/code.phtml
+++ b/app/code/Magento/GoogleAdwords/view/frontend/templates/code.phtml
@@ -11,18 +11,21 @@
  */
 ?>
 <!-- Google Code for Sale Conversion Page -->
-<?php $scriptString = <<<script
+<?php
+/** @var \Magento\GoogleAdwords\Helper\Data $helper */
+$helper = $block->getHelper();
+$scriptString = <<<script
     /* <![CDATA[ */
-    var google_conversion_id = {$block->escapeJs($block->getHelper()->getConversionId())};
-    var google_conversion_language = "{$block->escapeJs($block->getHelper()->getConversionLanguage())}";
-    var google_conversion_format = "{$block->escapeJs($block->getHelper()->getConversionFormat())}";
-    var google_conversion_color = "{$block->escapeJs($block->getHelper()->getConversionColor())}";
-    var google_conversion_label = "{$block->escapeJs($block->getHelper()->getConversionLabel())}";
-    var google_conversion_value = {$block->escapeJs($block->getHelper()->getConversionValue())};
+    var google_conversion_id = {$block->escapeJs($helper->getConversionId())};
+    var google_conversion_language = "{$block->escapeJs($helper->getConversionLanguage())}";
+    var google_conversion_format = "{$block->escapeJs($helper->getConversionFormat())}";
+    var google_conversion_color = "{$block->escapeJs($helper->getConversionColor())}";
+    var google_conversion_label = "{$block->escapeJs($helper->getConversionLabel())}";
+    var google_conversion_value = {$block->escapeJs($helper->getConversionValue())};
 script;
-if ($block->getHelper()->hasSendConversionValueCurrency() && $block->getHelper()->getConversionValueCurrency()):
+if ($helper->hasSendConversionValueCurrency() && $helper->getConversionValueCurrency()):
         $scriptString .= <<<script
-    var google_conversion_currency = "{$block->escapeJs($block->getHelper()->getConversionValueCurrency())}";
+    var google_conversion_currency = "{$block->escapeJs($helper->getConversionValueCurrency())}";
 script;
 endif;
 $scriptString .= <<<script
@@ -30,11 +33,11 @@ $scriptString .= <<<script
 script;
 ?>
 <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
-<script src="<?= $block->escapeHtmlAttr($block->getHelper()->getConversionJsSrc()) ?>"></script>
+<script src="<?= $block->escapeHtmlAttr($helper->getConversionJsSrc()) ?>"></script>
 <noscript>
     <div style="display:inline;">
         <img height="1" width="1" style="border-style:none;" alt=""
-             src="<?= $block->escapeHtmlAttr($block->getHelper()->getConversionImgSrc()) ?>"/>
+             src="<?= $block->escapeHtmlAttr($helper->getConversionImgSrc()) ?>"/>
     </div>
 </noscript>
 <!-- END Google Code for Sale Conversion Page -->
diff --git a/app/code/Magento/MediaStorage/view/adminhtml/templates/system/config/system/storage/media/synchronize.phtml b/app/code/Magento/MediaStorage/view/adminhtml/templates/system/config/system/storage/media/synchronize.phtml
index fd437161dfbb0..aaf03b33514c1 100644
--- a/app/code/Magento/MediaStorage/view/adminhtml/templates/system/config/system/storage/media/synchronize.phtml
+++ b/app/code/Magento/MediaStorage/view/adminhtml/templates/system/config/system/storage/media/synchronize.phtml
@@ -3,11 +3,19 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
 
-<?php /* @var $block \Magento\MediaStorage\Block\System\Config\System\Storage\Media\Synchronize */ ?>
+/**
+ * @var $block \Magento\MediaStorage\Block\System\Config\System\Storage\Media\Synchronize
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
+?>
 
-<script>
+<?php
+$syncStorageParams = $block->getSyncStorageParams();
+$stateRunning  = /* @noEscape */ (int)\Magento\MediaStorage\Model\File\Storage\Flag::STATE_RUNNING;
+$stateFinished = /* @noEscape */ (int)\Magento\MediaStorage\Model\File\Storage\Flag::STATE_FINISHED;
+$stateNotified = /* @noEscape */ (int)\Magento\MediaStorage\Model\File\Storage\Flag::STATE_NOTIFIED;
+$scriptString = <<<script
 require([
     'jquery',
     'prototype',
@@ -31,12 +39,14 @@ require([
         $('system_media_storage_configuration_media_database').value
     );
 
-    <?php $syncStorageParams = $block->getSyncStorageParams() ?>
-    addAllowedStorage(<?= $block->escapeJs($syncStorageParams['storage_type']) ?>, '<?= $block->escapeJs($syncStorageParams['connection_name']) ?>');
+    addAllowedStorage({$block->escapeJs($syncStorageParams['storage_type'])},
+     '{$block->escapeJs($syncStorageParams['connection_name'])}');
 
     defaultValues   = [];
-    defaultValues['system_media_storage_configuration_media_storage']   = $('system_media_storage_configuration_media_storage').value;
-    defaultValues['system_media_storage_configuration_media_database']  = $('system_media_storage_configuration_media_database').value;
+    defaultValues['system_media_storage_configuration_media_storage']   =
+     $('system_media_storage_configuration_media_storage').value;
+    defaultValues['system_media_storage_configuration_media_database']  =
+     $('system_media_storage_configuration_media_database').value;
 
 
     function addAllowedStorage(storageType, connection)
@@ -90,7 +100,7 @@ require([
     }
 
     var checkStatus = function() {
-        u = new Ajax.PeriodicalUpdater('', '<?= $block->escapeUrl($block->getAjaxStatusUpdateUrl()) ?>', {
+        u = new Ajax.PeriodicalUpdater('', '{$block->escapeJs($block->getAjaxStatusUpdateUrl())}', {
             method:     'get',
             frequency:  5,
             loaderArea: false,
@@ -100,7 +110,7 @@ require([
 
                 try {
                     response = JSON.parse(transport.responseText);
-                    if (response.state == '<?= /* @noEscape */ (int)\Magento\MediaStorage\Model\File\Storage\Flag::STATE_RUNNING ?>'
+                    if (response.state == '{$stateRunning}'
                         && response.message
                     ) {
                         if ($('sync_span').hasClassName('no-display')) {
@@ -112,12 +122,12 @@ require([
                         enableStorageSelection();
                         $('sync_span').addClassName('no-display');
 
-                        if (response.state == '<?= /* @noEscape */ (int)\Magento\MediaStorage\Model\File\Storage\Flag::STATE_FINISHED ?>') {
+                        if (response.state == '{$stateFinished}') {
                             addAllowedStorage(
                                 $('system_media_storage_configuration_media_storage').value,
                                 $('system_media_storage_configuration_media_database').value
                             );
-                        } else if (response.state == '<?= /* @noEscape */ (int)\Magento\MediaStorage\Model\File\Storage\Flag::STATE_NOTIFIED ?>') {
+                        } else if (response.state == '{$stateNotified}') {
                             if (response.has_errors) {
                                 enableSyncButton();
                             } else {
@@ -152,7 +162,7 @@ require([
             connection: $('system_media_storage_configuration_media_database').value
         };
 
-        new Ajax.Request('<?= $block->escapeUrl($block->getAjaxSyncUrl()) ?>', {
+        new Ajax.Request('{$block->escapeJs($block->getAjaxSyncUrl())}', {
             parameters:     params,
             loaderArea:     false,
             asynchronous:   true
@@ -172,11 +182,14 @@ require([
         return allowedStorages.include(storage);
     }, 'Synchronization is required.');
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 
 <?= $block->getButtonHtml() ?>
 <span class="sync-indicator no-display" id="sync_span">
-    <img alt="Synchronize" style="margin:0 5px" src="<?= $block->escapeUrl($block->getViewFileUrl('images/process_spinner.gif')) ?>"/>
+    <img alt="Synchronize" src="<?= $block->escapeUrl($block->getViewFileUrl('images/process_spinner.gif')) ?>"/>
     <span id="sync_message_span"></span>
 </span>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag("margin:0 5px", '#sync_span img') ?>
 <input type="hidden" id="synchronize-validation-input" class="required-synchronize no-display"/>
diff --git a/app/code/Magento/Review/view/frontend/templates/product/view/list.phtml b/app/code/Magento/Review/view/frontend/templates/product/view/list.phtml
index 93fb7b250c777..e631f5bc19580 100644
--- a/app/code/Magento/Review/view/frontend/templates/product/view/list.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/product/view/list.phtml
@@ -34,14 +34,19 @@ $format = $block->getDateFormat() ?: \IntlDateFormatter::SHORT;
                             <span><?= $block->escapeHtml($_vote->getRatingCode()) ?></span>
                         </span>
                         <div class="rating-result"
-                             id="rating-result_<?= 'a'?>"
+                             id="review_<?= /* @noEscape */ $_review->getReviewId()
+                                ?>_vote_<?= /* @noEscape */ $_vote->getVoteId() ?>"
                              title="<?= $block->escapeHtmlAttr($_vote->getPercent()) ?>%">
                             <meta itemprop="worstRating" content = "1"/>
                             <meta itemprop="bestRating" content = "100"/>
-                            <span style="width:<?= $block->escapeHtmlAttr($_vote->getPercent()) ?>%">
+                            <span>
                                 <span itemprop="ratingValue"><?= $block->escapeHtml($_vote->getPercent()) ?>%</span>
                             </span>
                         </div>
+                        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                            'width:' . $_vote->getPercent() . '%',
+                            'div#review_' . $_review->getReviewId() . '_vote_' . $_vote->getVoteId() . ' span'
+                        ) ?>
                     </div>
                     <?php endforeach; ?>
                     </div>
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Form.php
index d86954f0124ea..3f41eb5ba7d8e 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/Create/Form.php
@@ -6,6 +6,7 @@
 namespace Magento\Sales\Block\Adminhtml\Order\Invoice\Create;
 
 use Magento\Framework\App\ObjectManager;
+use Magento\Tax\Helper\Data as TaxHelper;
 
 /**
  * Adminhtml invoice create form
@@ -21,14 +22,16 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Sales\Helper\Admin $adminHelper
      * @param array $data
+     * @param TaxHelper|null $taxHelper
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Framework\Registry $registry,
         \Magento\Sales\Helper\Admin $adminHelper,
-        array $data = []
+        array $data = [],
+        ?TaxHelper $taxHelper = null
     ) {
-        $data['taxHelper'] = ObjectManager::getInstance()->get(\Magento\Tax\Helper\Data::class);
+        $data['taxHelper'] = $taxHelper ?? ObjectManager::getInstance()->get(TaxHelper::class);
         parent::__construct($context, $registry, $adminHelper, $data);
     }
 
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/form.phtml
index 02bbdae875962..6c04bc7ddd803 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/form.phtml
@@ -12,7 +12,10 @@
 <form id="edit_form" class="order-invoice-edit" method="post" action="<?= $block->escapeUrl($block->getSaveUrl()) ?>">
     <?= $block->getBlockHtml('formkey') ?>
     <?php $_order = $block->getInvoice()->getOrder() ?>
-    <?php $taxHelper = $block->getData('taxHelper') ?>
+    <?php
+    /** @var \Magento\Tax\Helper\Data $taxHelper */
+    $taxHelper = $block->getData('taxHelper');
+    ?>
     <?= $block->getChildHtml('order_info') ?>
 
     <section class="admin__page-section">
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
index 05d0e63b4414a..7ec16fd7f5373 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
@@ -13,7 +13,7 @@
 
 namespace Magento\Tax\Block\Adminhtml\Rate;
 
-use Magento\Directory\Helper\Data as DirectoryData;
+use Magento\Directory\Helper\Data as DirectoryHelper;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Tax\Controller\RegistryConstants;
@@ -88,6 +88,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Tax\Model\TaxRateCollection $taxRateCollection
      * @param \Magento\Tax\Model\Calculation\Rate\Converter $taxRateConverter
      * @param array $data
+     * @param DirectoryHelper|null $directoryHelper
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -101,7 +102,8 @@ public function __construct(
         \Magento\Tax\Api\TaxRateRepositoryInterface $taxRateRepository,
         \Magento\Tax\Model\TaxRateCollection $taxRateCollection,
         \Magento\Tax\Model\Calculation\Rate\Converter $taxRateConverter,
-        array $data = []
+        array $data = [],
+        ?DirectoryHelper $directoryHelper = null
     ) {
         $this->_regionFactory = $regionFactory;
         $this->_country = $country;
@@ -110,7 +112,7 @@ public function __construct(
         $this->_taxRateRepository = $taxRateRepository;
         $this->_taxRateCollection = $taxRateCollection;
         $this->_taxRateConverter = $taxRateConverter;
-        $data['directoryHelper'] = ObjectManager::getInstance()->get(DirectoryData::class);
+        $data['directoryHelper'] = $directoryHelper ?? ObjectManager::getInstance()->get(DirectoryHelper::class);
         parent::__construct($context, $registry, $formFactory, $data);
     }
 
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml
index 6956cd5990e96..d7b04f8e29f27 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml
@@ -8,7 +8,8 @@
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
-<?php $jsonHelper = $tmpBlock->getData('directoryHelper');
+<?php /** @var \Magento\Directory\Helper\Data $jsonHelper */
+$jsonHelper = $tmpBlock->getData('directoryHelper');
 $regionJson = /* @noEscape */ $jsonHelper->getRegionJson();
 $scriptString = <<<script
 require([
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
index 0d00fa397c9a3..23797977fe6a2 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
@@ -17,5 +17,5 @@
 </div>
 <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
     "display:none",
-    '#'. $block->escapeHtmlAttr($block->getNameInLayout())
+    '#'. $block->escapeJs($block->getNameInLayout())
 ) ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/add.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/add.phtml
index ba2ca499cfec1..8a4cfd9d6b574 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/add.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/add.phtml
@@ -12,7 +12,7 @@
     </button>
     <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
         'onclick',
-        "window.location.href='" . $block->escapeUrl($createUrl) . "'",
+        "window.location.href='" . $block->escapeJs($createUrl) . "'",
         'button#addNewClass'
     ) ?>
 </div>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/add.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/add.phtml
index 149ea004243f9..f7af88b8207dc 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/add.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/add.phtml
@@ -12,7 +12,7 @@
     </button>
     <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
         'onclick',
-        "window.location.href='" . $block->escapeUrl($createUrl) . "'",
+        "window.location.href='" . $block->escapeJs($createUrl) . "'",
         'button#addNewClass'
     ) ?>
 </div>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
index d2098db4d9c43..a85e5e9b76972 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
@@ -12,7 +12,8 @@
 <?php
 $style = $block->escapeHtmlAttr($block->getStyle());
 $colspan = (int) $block->getColspan();
-$jsonHelper = $block->getData('jsonHelper');
+/** @var \Magento\Checkout\Helper\Data $checkoutHelper */
+$checkoutHelper = $block->getData('checkoutHelper');
 ?>
 <?php if ($block->includeTax() && $block->getTotalExclTax() >= 0): ?>
     <tr class="grand totals excl">
@@ -20,7 +21,7 @@ $jsonHelper = $block->getData('jsonHelper');
             <strong><?= $block->escapeHtml(__('Grand Total Excl. Tax')) ?></strong>
         </th>
         <td class="amount" data-th="<?= $block->escapeHtmlAttr(__('Grand Total Excl. Tax')) ?>">
-            <strong><?= /* @noEscape */ $jsonHelper->formatPrice($block->getTotalExclTax()) ?></strong>
+            <strong><?= /* @noEscape */ $checkoutHelper->formatPrice($block->getTotalExclTax()) ?></strong>
         </td>
     </tr>
     <?= /* @noEscape */ $block->renderTotals('taxes', $colspan) ?>
@@ -29,7 +30,7 @@ $jsonHelper = $block->getData('jsonHelper');
             <strong><?= $block->escapeHtml(__('Grand Total Incl. Tax')) ?></strong>
         </th>
         <td class="amount" data-th="<?= $block->escapeHtmlAttr(__('Grand Total Incl. Tax')) ?>">
-            <strong><?= /* @noEscape */ $jsonHelper->formatPrice($block->getTotal()->getValue()) ?></strong>
+            <strong><?= /* @noEscape */ $checkoutHelper->formatPrice($block->getTotal()->getValue()) ?></strong>
         </td>
     </tr>
 <?php else: ?>
@@ -38,7 +39,7 @@ $jsonHelper = $block->getData('jsonHelper');
             <strong><?= $block->escapeHtml($block->getTotal()->getTitle()) ?></strong>
         </th>
         <td class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
-            <strong><?= /* @noEscape */ $jsonHelper->formatPrice($block->getTotal()->getValue()) ?></strong>
+            <strong><?= /* @noEscape */ $checkoutHelper->formatPrice($block->getTotal()->getValue()) ?></strong>
         </td>
     </tr>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
index 09aa99e228713..9f08c668952f1 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Templates.ThisInTemplate
-
 /**
  * @var $block \Magento\Tax\Block\Checkout\Shipping
  * @see \Magento\Tax\Block\Checkout\Shipping
@@ -16,7 +14,8 @@
     <?php
         $style = $block->escapeHtmlAttr($block->getStyle());
         $colspan = (int) $block->getColspan();
-        $jsonHelper = $block->getData('jsonHelper');
+        /** @var \Magento\Checkout\Helper\Data $checkoutHelper */
+        $checkoutHelper = $block->getData('checkoutHelper');
     ?>
     <?php if ($block->displayBoth()): ?>
     <tr class="totals shipping excl">
@@ -25,7 +24,7 @@
         </th>
 
         <td class="amount" data-th="<?= $block->escapeHtmlAttr($block->getExcludeTaxLabel()) ?>">
-            <?= /* @noEscape */ $jsonHelper->formatPrice($block->getShippingExcludeTax()) ?>
+            <?= /* @noEscape */ $checkoutHelper->formatPrice($block->getShippingExcludeTax()) ?>
         </td>
     </tr>
     <tr class="totals shipping incl">
@@ -33,7 +32,7 @@
             <?= $block->escapeHtml($block->getIncludeTaxLabel()) ?>
         </th>
         <td class="amount" data-th="<?= $block->escapeHtmlAttr($block->getIncludeTaxLabel()) ?>">
-            <?= /* @noEscape */ $jsonHelper->formatPrice($block->getShippingIncludeTax()) ?>
+            <?= /* @noEscape */ $checkoutHelper->formatPrice($block->getShippingIncludeTax()) ?>
         </td>
     </tr>
     <?php elseif ($block->displayIncludeTax()): ?>
@@ -42,7 +41,7 @@
             <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
         </th>
         <td class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
-            <?= /* @noEscape */ $jsonHelper->formatPrice($block->getShippingIncludeTax()) ?>
+            <?= /* @noEscape */ $checkoutHelper->formatPrice($block->getShippingIncludeTax()) ?>
         </td>
     </tr>
     <?php else: ?>
@@ -51,7 +50,7 @@
             <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
         </th>
         <td class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
-            <?= /* @noEscape */ $jsonHelper->formatPrice($block->getShippingExcludeTax()) ?>
+            <?= /* @noEscape */ $checkoutHelper->formatPrice($block->getShippingExcludeTax()) ?>
         </td>
     </tr>
     <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
index 091303cbedb38..88d4721b1aa47 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
@@ -13,7 +13,8 @@
 <?php
 $style = $block->escapeHtmlAttr($block->getStyle());
 $colspan = (int) $block->getColspan();
-$jsonHelper = $block->getData('jsonHelper');
+/** @var \Magento\Checkout\Helper\Data $checkoutHelper */
+$checkoutHelper = $block->getData('checkoutHelper');
 ?>
 <?php if ($block->displayBoth()): ?>
 <tr class="totals sub excl">
@@ -21,7 +22,7 @@ $jsonHelper = $block->getData('jsonHelper');
         <?= $block->escapeHtml(__('Subtotal (Excl. Tax)')) ?>
     </th>
     <tdclass="amount" data-th="<?= $block->escapeHtmlAttr(__('Subtotal (Excl. Tax)')) ?>">
-        <?= /* @noEscape */ $jsonHelper->formatPrice($block->getTotal()->getValueExclTax()) ?>
+        <?= /* @noEscape */ $checkoutHelper->formatPrice($block->getTotal()->getValueExclTax()) ?>
     </td>
 </tr>
 <tr class="totals sub incl">
@@ -29,7 +30,7 @@ $jsonHelper = $block->getData('jsonHelper');
         <?= $block->escapeHtml(__('Subtotal (Incl. Tax)')) ?>
     </th>
     <td class="amount" data-th="<?= $block->escapeHtmlAttr(__('Subtotal (Incl. Tax)')) ?>">
-        <?= /* @noEscape */ $jsonHelper->formatPrice($block->getTotal()->getValueInclTax()) ?>
+        <?= /* @noEscape */ $checkoutHelper->formatPrice($block->getTotal()->getValueInclTax()) ?>
     </td>
 </tr>
 <?php else: ?>
@@ -38,7 +39,7 @@ $jsonHelper = $block->getData('jsonHelper');
         <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
     </th>
     <td class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
-        <?= /* @noEscape */ $jsonHelper->formatPrice($block->getTotal()->getValue()) ?>
+        <?= /* @noEscape */ $checkoutHelper->formatPrice($block->getTotal()->getValue()) ?>
     </td>
 </tr>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
index d1b31bdf7861b..28767bb3d4cbb 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
@@ -13,10 +13,11 @@
 <?php
     $_value = $block->getTotal()->getValue();
     $_style = $block->escapeHtmlAttr($block->getTotal()->getStyle());
-    $jsonHelper = $block->getData('jsonHelper');
+    /** @var \Magento\Checkout\Helper\Data $checkoutHelper */
+    $checkoutHelper = $block->getData('checkoutHelper');
     $attributes = 'class="totals-tax"';
 
-if ($jsonHelper->displayFullSummary() && $_value != 0) {
+if ($checkoutHelper->displayFullSummary() && $_value != 0) {
     $attributes = 'class="totals-tax-summary" data-mage-init=\'{"toggleAdvanced": {"selectorsToggleClass": "shown",
      "baseToggleClass": "expanded", "toggleContainers": ".totals-tax-details"}}\'';
 }
@@ -24,20 +25,20 @@ if ($jsonHelper->displayFullSummary() && $_value != 0) {
 
 <tr <?= /* @noEscape */ $attributes ?>>
     <th class="mark" colspan="<?= (int) $block->getColspan() ?>" scope="row">
-        <?php if ($jsonHelper->displayFullSummary()): ?>
+        <?php if ($checkoutHelper->displayFullSummary()): ?>
             <span class="detailed"><?= $block->escapeHtml($block->getTotal()->getTitle()) ?></span>
         <?php else: ?>
             <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
         <?php endif; ?>
     </th>
     <td class="amount" data-th="<?= $block->escapeHtmlAttr($block->getTotal()->getTitle()) ?>">
-        <?= /* @noEscape */ $jsonHelper->formatPrice($_value) ?>
+        <?= /* @noEscape */ $checkoutHelper->formatPrice($_value) ?>
     </td>
 </tr>
 <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($_style, 'tr.totals-tax th.mark') ?>
 <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($_style, 'tr.totals-tax td.amount') ?>
 
-<?php if ($jsonHelper->displayFullSummary() && $_value != 0): ?>
+<?php if ($checkoutHelper->displayFullSummary() && $_value != 0): ?>
     <?php foreach ($block->getTotal()->getFullInfo() as $info): ?>
         <?php if (isset($info['hidden']) && $info['hidden']) { continue; } ?>
         <?php $percent = $info['percent']; ?>
@@ -57,7 +58,7 @@ if ($jsonHelper->displayFullSummary() && $_value != 0) {
                     <td class="amount" rowspan="<?= count($rates) ?>"
                        data-th="<?= $block->escapeHtmlAttr($rate['title']) ?>
                         <?php if ($rate['percent'] !== null): ?>(<?= (float) $rate['percent'] ?>%)<?php endif; ?>">
-                        <?= /* @noEscape */ $jsonHelper->formatPrice($amount) ?>
+                        <?= /* @noEscape */ $checkoutHelper->formatPrice($amount) ?>
                     </td>
                 <?php endif; ?>
             </tr>
diff --git a/app/code/Magento/Ups/Block/Backend/System/CarrierConfig.php b/app/code/Magento/Ups/Block/Backend/System/CarrierConfig.php
index 94540b13f13c6..77e8c2a4b10e2 100644
--- a/app/code/Magento/Ups/Block/Backend/System/CarrierConfig.php
+++ b/app/code/Magento/Ups/Block/Backend/System/CarrierConfig.php
@@ -37,16 +37,18 @@ class CarrierConfig extends Template
      * @param \Magento\Ups\Helper\Config $carrierConfig
      * @param \Magento\Store\Model\Website $websiteModel
      * @param array $data
+     * @param JsonHelper|null $jsonHelper
      */
     public function __construct(
         TemplateContext $context,
         ConfigHelper $carrierConfig,
         Website $websiteModel,
-        array $data = []
+        array $data = [],
+        ?JsonHelper $jsonHelper = null
     ) {
         $this->carrierConfig = $carrierConfig;
         $this->_websiteModel = $websiteModel;
-        $data['jsonHelper'] = ObjectManager::getInstance()->get(JsonHelper::class);
+        $data['jsonHelper'] = $jsonHelper ?? ObjectManager::getInstance()->get(JsonHelper::class);
         parent::__construct($context, $data);
     }
 
diff --git a/app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml b/app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml
index 8ebb1155c9f51..d0b6443994aa6 100644
--- a/app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml
+++ b/app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-
 /** @var $upsModel \Magento\Ups\Helper\Config */
 /** @var $block \Magento\Ups\Block\Backend\System\CarrierConfig */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
@@ -17,7 +15,7 @@ $defShipArr = $upsCarrierConfig->getCode('method');
 $sectionCode = $block->getRequest()->getParam('section');
 $websiteCode = $block->getRequest()->getParam('website');
 $storeCode = $block->getRequest()->getParam('store');
-
+/** @var \Magento\Framework\Json\Helper\Data $jsonHelper */
 $jsonHelper = $block->getData('jsonHelper');
 
 if (!$storeCode && $websiteCode) {

From 9465779f53fcea77ee7a38c6cd0f4447e2cbd79e Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Fri, 24 Apr 2020 13:28:55 +0300
Subject: [PATCH 0184/1718] MC-29421: Remove event handlers

---
 .../Magento_CatalogPermissions/web/css/source/_module.less    | 2 +-
 .../Magento/luma/Magento_Rma/web/css/source/_module.less      | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/Magento_CatalogPermissions/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_CatalogPermissions/web/css/source/_module.less
index 1a673e881fb6a..d78bfea5f1e6b 100644
--- a/app/design/adminhtml/Magento/backend/Magento_CatalogPermissions/web/css/source/_module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_CatalogPermissions/web/css/source/_module.less
@@ -19,5 +19,5 @@
 }
 
 .warning-enable-permissions {
-    color: red;
+    color: #ff0000;
 }
diff --git a/app/design/frontend/Magento/luma/Magento_Rma/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Rma/web/css/source/_module.less
index dda1bad1e8366..104dd6c4d5b92 100644
--- a/app/design/frontend/Magento/luma/Magento_Rma/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Rma/web/css/source/_module.less
@@ -200,7 +200,9 @@
         .control {
             table {
                 .col.qty {
-                    .input-qty {display: none;}
+                    .input-qty {
+                        display: none;
+                    }
                 }
             }
         }

From 0926f5c008d0c272fc7828fbe2cfed60d93ac8cc Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Fri, 24 Apr 2020 14:25:20 +0300
Subject: [PATCH 0185/1718] GH-26255: Refactor CacheInvalidate sendPurgeRequest
 to fix incorrect tag splitting

Fix static tests
---
 .../CacheInvalidate/Test/Unit/Model/PurgeCacheTest.php     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/CacheInvalidate/Test/Unit/Model/PurgeCacheTest.php b/app/code/Magento/CacheInvalidate/Test/Unit/Model/PurgeCacheTest.php
index 0d2831553bd09..b26f7b43c12b2 100644
--- a/app/code/Magento/CacheInvalidate/Test/Unit/Model/PurgeCacheTest.php
+++ b/app/code/Magento/CacheInvalidate/Test/Unit/Model/PurgeCacheTest.php
@@ -6,19 +6,20 @@
 namespace Magento\CacheInvalidate\Test\Unit\Model;
 
 use Laminas\Uri\UriFactory;
+use PHPUnit\Framework\MockObject\MockObject;
 
 class PurgeCacheTest extends \PHPUnit\Framework\TestCase
 {
     /** @var \Magento\CacheInvalidate\Model\PurgeCache */
     protected $model;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject | \Laminas\Http\Client\Adapter\Socket */
+    /** @var MockObject|\Laminas\Http\Client\Adapter\Socket */
     protected $socketAdapterMock;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Cache\InvalidateLogger */
+    /** @var MockObject|\Magento\Framework\Cache\InvalidateLogger */
     protected $loggerMock;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\PageCache\Model\Cache\Server */
+    /** @var MockObject|\Magento\PageCache\Model\Cache\Server */
     protected $cacheServer;
 
     protected function setUp()

From ffb1174bfcd19b9f3de04a59ad1ec10c0b4913d2 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Fri, 24 Apr 2020 14:26:35 +0300
Subject: [PATCH 0186/1718] GH-26255: Refactor CacheInvalidate sendPurgeRequest
 to fix incorrect tag splitting

Fix static tests
---
 .../Test/Unit/Observer/FlushAllCacheObserverTest.php   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/CacheInvalidate/Test/Unit/Observer/FlushAllCacheObserverTest.php b/app/code/Magento/CacheInvalidate/Test/Unit/Observer/FlushAllCacheObserverTest.php
index c37a3ecc9edc0..f2bee12dc87fa 100644
--- a/app/code/Magento/CacheInvalidate/Test/Unit/Observer/FlushAllCacheObserverTest.php
+++ b/app/code/Magento/CacheInvalidate/Test/Unit/Observer/FlushAllCacheObserverTest.php
@@ -5,18 +5,20 @@
  */
 namespace Magento\CacheInvalidate\Test\Unit\Observer;
 
+use PHPUnit\Framework\MockObject\MockObject;
+
 class FlushAllCacheObserverTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\CacheInvalidate\Observer\FlushAllCacheObserver */
+    /** @var MockObject|\Magento\CacheInvalidate\Observer\FlushAllCacheObserver */
     protected $model;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Event\Observer */
+    /** @var MockObject|\Magento\Framework\Event\Observer */
     protected $observerMock;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\PageCache\Model\Config */
+    /** @var MockObject|\Magento\PageCache\Model\Config */
     protected $configMock;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\CacheInvalidate\Model\PurgeCache */
+    /** @var MockObject|\Magento\CacheInvalidate\Model\PurgeCache */
     protected $purgeCache;
 
     /**

From 8f0859f2cc0a3d077240fe5b201466082f791217 Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Fri, 24 Apr 2020 15:15:20 +0300
Subject: [PATCH 0187/1718] MC-29421: Remove event handlers

---
 .../Magento_CatalogPermissions/web/css/source/_module.less      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/adminhtml/Magento/backend/Magento_CatalogPermissions/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_CatalogPermissions/web/css/source/_module.less
index d78bfea5f1e6b..f0c98c891b5ba 100644
--- a/app/design/adminhtml/Magento/backend/Magento_CatalogPermissions/web/css/source/_module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_CatalogPermissions/web/css/source/_module.less
@@ -19,5 +19,5 @@
 }
 
 .warning-enable-permissions {
-    color: #ff0000;
+    color: #f00;
 }

From c2bc25ace54bc931e407d892f6454008c17f4ab2 Mon Sep 17 00:00:00 2001
From: Ajith <ajithkumar.maragathavel@ziffity.com>
Date: Fri, 24 Apr 2020 20:42:20 +0530
Subject: [PATCH 0188/1718] Complex message added for add to cart success
 message

---
 .../Checkout/Controller/Cart/Addgroup.php     | 20 +++++++++++++++----
 .../Wishlist/Controller/Index/Cart.php        | 10 ++++++----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Checkout/Controller/Cart/Addgroup.php b/app/code/Magento/Checkout/Controller/Cart/Addgroup.php
index 7eb9362031258..66be0c483ed72 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Addgroup.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Addgroup.php
@@ -104,13 +104,25 @@ private function addOrderItem(Item $item)
             if ($orderCustomerId == $currentCustomerId) {
                 $this->cart->addOrderItem($item, 1);
                 if (!$this->cart->getQuote()->getHasError()) {
-                    $message = __(
-                        'You added %1 to your shopping cart.',
-                        $this->escaper->escapeHtml($item->getName())
+                    $this->messageManager->addComplexSuccessMessage(
+                        'addCartSuccessMessage',
+                        [
+                            'product_name' => $item->getName(),
+                            'cart_url' => $this->getCartUrl()
+                        ]
                     );
-                    $this->messageManager->addSuccessMessage($message);
                 }
             }
         }
     }
+
+    /**
+     * Returns cart url
+     *
+     * @return string
+     */
+    private function getCartUrl()
+    {
+        return $this->_url->getUrl('checkout/cart', ['_secure' => true]);
+    }
 }
diff --git a/app/code/Magento/Wishlist/Controller/Index/Cart.php b/app/code/Magento/Wishlist/Controller/Index/Cart.php
index 870c4231f97c9..24683c9eea690 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Cart.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Cart.php
@@ -182,11 +182,13 @@ public function execute()
             $wishlist->save();
 
             if (!$this->cart->getQuote()->getHasError()) {
-                $message = __(
-                    'You added %1 to your shopping cart.',
-                    $this->escaper->escapeHtml($item->getProduct()->getName())
+                $this->messageManager->addComplexSuccessMessage(
+                    'addCartSuccessMessage',
+                    [
+                        'product_name' => $item->getProduct()->getName(),
+                        'cart_url' => $this->cartHelper->getCartUrl()
+                    ]
                 );
-                $this->messageManager->addSuccessMessage($message);
             }
 
             if ($this->cartHelper->getShouldRedirectToCart()) {

From 896f0d66acc8cabdb6c3ed4f342456ba4dc084d7 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Mon, 27 Apr 2020 19:37:57 +0300
Subject: [PATCH 0189/1718] MC-29420: Remove event handlers from CE

---
 .../templates/dashboard/store/switcher.phtml  |   2 +-
 .../adminhtml/templates/store/switcher.phtml  |   4 +-
 .../templates/system/cache/edit.phtml         |   2 +-
 .../Adminhtml/Product/Helper/Form/Config.php  |  21 ++-
 .../Adminhtml/Product/Helper/Form/Image.php   |  23 +++-
 .../product/image_with_borders.phtml          |   2 +-
 .../Form/Field/Select/Allowspecific.php       |  41 +++++-
 .../system/config/form/field/array.phtml      |  29 ++++-
 .../templates/system/config/validatevat.phtml |   2 +-
 .../activate/permissions/tab/webapi.phtml     |  21 ++-
 .../integration/popup_container.phtml         |  38 +++---
 .../adminhtml/templates/resourcetree.phtml    |  11 +-
 .../base/templates/product/price/msrp.phtml   |  40 ++++--
 .../render/item/price_msrp_item.phtml         |  24 ++--
 .../Multishipping/Block/Checkout/Overview.php |   9 +-
 .../frontend/templates/checkout/billing.phtml |  70 +++++-----
 .../templates/checkout/overview.phtml         |  42 +++---
 .../templates/preview/iframeswitcher.phtml    |  29 +++--
 .../adminhtml/templates/preview/store.phtml   |  27 ++--
 .../adminhtml/templates/problem/list.phtml    |  16 ++-
 .../view/adminhtml/templates/queue/edit.phtml |  18 ++-
 .../adminhtml/templates/subscriber/list.phtml |  25 +++-
 .../adminhtml/templates/template/edit.phtml   |  33 +++--
 .../templates/form/banktransfer.phtml         |   9 +-
 .../templates/form/cashondelivery.phtml       |   9 +-
 .../adminhtml/templates/form/checkmo.phtml    |  14 +-
 .../templates/form/purchaseorder.phtml        |  14 +-
 .../templates/form/banktransfer.phtml         |  10 +-
 .../templates/form/cashondelivery.phtml       |  10 +-
 .../frontend/templates/form/checkmo.phtml     |  13 +-
 .../templates/form/purchaseorder.phtml        |  11 +-
 .../multishipping/checkmo_form.phtml          |   9 +-
 .../Payment/Block/Transparent/Iframe.php      |   8 +-
 .../view/adminhtml/templates/form/cc.phtml    |  26 ++--
 .../templates/transparent/form.phtml          |  44 ++++---
 .../templates/transparent/iframe.phtml        |  41 ++++--
 .../templates/transparent/info.phtml          |   7 +-
 .../view/frontend/templates/form/cc.phtml     |  30 +++--
 .../frontend/templates/transparent/form.phtml |  26 ++--
 .../templates/transparent/iframe.phtml        |  48 +++++--
 .../frontend/templates/transparent/info.phtml |   7 +-
 .../Adminhtml/System/Config/Field/Hidden.php  |  27 +++-
 .../System/Config/Fieldset/Payment.php        |  35 +++--
 .../Block/Express/InContext/Component.php     |  23 +++-
 .../templates/billing/agreement/form.phtml    |  13 +-
 .../payment/form/billing/agreement.phtml      |  14 +-
 .../templates/system/config/api_wizard.phtml  |  10 +-
 .../system/config/bml_api_wizard.phtml        |  19 ++-
 .../templates/transparent/form.phtml          |  50 +++++---
 .../express/in-context/component.phtml        |  17 ++-
 .../frontend/templates/express/review.phtml   |  34 +++--
 .../express/review/shipping/method.phtml      |  33 +++--
 .../view/frontend/templates/hss/form.phtml    |   7 +-
 .../view/frontend/templates/hss/info.phtml    |   8 +-
 .../frontend/templates/partner/logo.phtml     |  15 ++-
 .../templates/payflowadvanced/form.phtml      |   7 +-
 .../templates/payflowadvanced/info.phtml      |   7 +-
 .../frontend/templates/payflowlink/form.phtml |   7 +-
 .../frontend/templates/payflowlink/info.phtml |   8 +-
 .../templates/payflowlink/redirect.phtml      |  15 ++-
 .../payment/form/billing/agreement.phtml      |   6 +-
 .../frontend/templates/payment/mark.phtml     |  24 ++--
 .../frontend/templates/payment/redirect.phtml |  10 +-
 .../adminhtml/templates/helper/gallery.phtml  |  49 ++++---
 .../templates/product/edit/base_image.phtml   |  14 +-
 .../product/edit/slideout/form.phtml          |  11 +-
 .../Block/Adminhtml/Items/Column/Name.php     |  24 ++++
 .../Adminhtml/Order/Create/Giftmessage.php    |   1 +
 .../Adminhtml/Order/Create/Items/Grid.php     |   7 +-
 .../Order/Create/Shipping/Method/Form.php     |   1 +
 .../templates/items/column/name.phtml         |  57 ++++++---
 .../templates/order/comments/view.phtml       |  36 ++++--
 .../order/create/billing/method/form.phtml    |  39 ++++--
 .../templates/order/create/comment.phtml      |  15 ++-
 .../templates/order/create/coupons/form.phtml |  27 ++--
 .../templates/order/create/data.phtml         |  43 +++++--
 .../templates/order/create/form.phtml         |  23 +++-
 .../templates/order/create/form/account.phtml |  12 +-
 .../templates/order/create/form/address.phtml | 102 ++++++++++-----
 .../templates/order/create/giftmessage.phtml  |  30 +++--
 .../templates/order/create/items/grid.phtml   | 120 ++++++++++++------
 .../adminhtml/templates/order/create/js.phtml |  15 ++-
 .../order/create/shipping/method/form.phtml   | 111 +++++++++++-----
 .../templates/order/create/sidebar.phtml      |  25 ++--
 .../templates/order/create/totals.phtml       |  23 +++-
 85 files changed, 1433 insertions(+), 606 deletions(-)

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml
index b99051f33fe3a..7cc9b781f579e 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml
@@ -42,7 +42,7 @@
 </select>
 <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
     'onchange',
-    "return switchStore($('select#store_switcher');",
+    'return switchStore(this);',
     'select#store_switcher'
 ) ?>
 </p>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
index e067a4dd27a77..c6fcaff9cd877 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
@@ -17,7 +17,7 @@
                <?= /* @noEscape */ $block->getUiId() ?> />
         <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
             'onchange',
-            "switchScope($('#store_switcher'));",
+            'switchScope(this);',
             '#store_switcher'
         ) ?>
         <input type="hidden" name="store_group_switcher" id="store_group_switcher"
@@ -181,7 +181,7 @@ script;
                         reload();
                     },
                     cancel: function() {
-                        obj.value = \'' . $block->escapeHtml($block->getStoreId()) . '\';
+                        obj.value = \'' . $block->escapeJs($block->getStoreId()) . '\';
                     }
                 }
             });
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml
index 5255fe4de8737..753cc7ceee356 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml
@@ -70,7 +70,7 @@ script;
                                     <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
                                         'onclick',
                                         /* @noEscape */ $clickAction,
-                                        '#' . $block->escapeHtmlAttr($_button['name'])
+                                        '#' . $block->escapeJs($_button['name'])
                                     ) ?>
                                 <?php endif; ?>
                                 <?php if (isset($_button['comment'])): ?> <br />
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Config.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Config.php
index 541d0f79f4da6..16c00aee6beaa 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Config.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Config.php
@@ -11,10 +11,10 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Data\Form\Element\CollectionFactory;
 use Magento\Framework\Data\Form\Element\Factory;
 use Magento\Framework\Escaper;
-use Magento\Framework\Math\Random;
 use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
 class Config extends \Magento\Framework\Data\Form\Element\Select
@@ -24,6 +24,25 @@ class Config extends \Magento\Framework\Data\Form\Element\Select
      */
     private $secureRenderer;
 
+    /**
+     * @param Factory $factoryElement
+     * @param CollectionFactory $factoryCollection
+     * @param Escaper $escaper
+     * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
+     */
+    public function __construct(
+        Factory $factoryElement,
+        CollectionFactory $factoryCollection,
+        Escaper $escaper,
+        $data = [],
+        ?SecureHtmlRenderer $secureRenderer = null
+    ) {
+        $secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+        parent::__construct($factoryElement, $factoryCollection, $escaper, $data, $secureRenderer);
+        $this->secureRenderer = $secureRenderer;
+    }
+
     /**
      * Retrieve element html
      *
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php
index a873d1465af21..57e82581d83b2 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php
@@ -11,9 +11,9 @@
  */
 namespace Magento\Catalog\Block\Adminhtml\Product\Helper\Form;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Data\Form\Element\CollectionFactory;
 use Magento\Framework\Data\Form\Element\Factory;
-use Magento\Framework\Math\Random;
 use Magento\Framework\UrlInterface;
 use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
@@ -24,6 +24,27 @@ class Image extends \Magento\Framework\Data\Form\Element\Image
      */
     private $secureRenderer;
 
+    /**
+     * @param Factory $factoryElement
+     * @param CollectionFactory $factoryCollection
+     * @param \Magento\Framework\Escaper $escaper
+     * @param UrlInterface $urlBuilder
+     * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
+     */
+    public function __construct(
+        Factory $factoryElement,
+        CollectionFactory $factoryCollection,
+        \Magento\Framework\Escaper $escaper,
+        UrlInterface $urlBuilder,
+        $data = [],
+        ?SecureHtmlRenderer $secureRenderer = null
+    ) {
+        $secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+        parent::__construct($factoryElement, $factoryCollection, $escaper, $urlBuilder, $data, $secureRenderer);
+        $this->secureRenderer = $secureRenderer;
+    }
+
     /**
      * Return generated url.
      *
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
index 9aaee9727b68f..dce1a51a57c63 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
@@ -23,7 +23,7 @@
             alt="<?= $escaper->escapeHtmlAttr($block->getLabel()) ?>"/></span>
 </span>
 <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-    'width:' . (int)$escaper->escapeHtmlAttr($block->getWidth()) . 'px;',
+    'width:' . (int)$block->getWidth() . 'px;',
     'span.product-image-container'
 ) ?>
 <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field/Select/Allowspecific.php b/app/code/Magento/Config/Block/System/Config/Form/Field/Select/Allowspecific.php
index b62584537e2b3..9a0bc416d4d46 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Field/Select/Allowspecific.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Field/Select/Allowspecific.php
@@ -11,8 +11,40 @@
  */
 namespace Magento\Config\Block\System\Config\Form\Field\Select;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Data\Form\Element\CollectionFactory;
+use Magento\Framework\Data\Form\Element\Factory;
+use Magento\Framework\Escaper;
+use Magento\Framework\Math\Random;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 class Allowspecific extends \Magento\Framework\Data\Form\Element\Select
 {
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
+    /**
+     * Allowspecific constructor.
+     * @param Factory $factoryElement
+     * @param CollectionFactory $factoryCollection
+     * @param Escaper $escaper
+     * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
+     */
+    public function __construct(
+        Factory $factoryElement,
+        CollectionFactory $factoryCollection,
+        Escaper $escaper,
+        $data = [],
+        ?SecureHtmlRenderer $secureRenderer = null
+    ) {
+        $secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+        parent::__construct($factoryElement, $factoryCollection, $escaper, $data, $secureRenderer);
+        $this->secureRenderer = $secureRenderer;
+    }
+
     /**
      * Add additional Javascript code
      *
@@ -25,7 +57,6 @@ public function getAfterElementHtml()
         $useDefaultElementId = $countryListId . '_inherit';
 
         $elementJavaScript = <<<HTML
-<script type="text/javascript">
 //<![CDATA[
 document.getElementById('{$elementId}').addEventListener('change', function(event) {
     var isCountrySpecific = event.target.value == 1,
@@ -42,13 +73,15 @@ public function getAfterElementHtml()
     }
 });
 //]]>
-</script>
 HTML;
 
-        return $elementJavaScript . parent::getAfterElementHtml();
+        return $this->secureRenderer->renderTag('script', [], $elementJavaScript, false) .
+            parent::getAfterElementHtml();
     }
 
     /**
+     * Return generated html.
+     *
      * @return string
      */
     public function getHtml()
@@ -61,6 +94,8 @@ public function getHtml()
     }
 
     /**
+     * Return country specific element id.
+     *
      * @return string
      */
     protected function _getSpecificCountryElementId()
diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml
index 24024f62c7d6d..f08cc77249582 100644
--- a/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml
+++ b/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml
@@ -54,6 +54,7 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
 script;
     foreach ($block->getColumns() as $columnName => $column):
         $scriptString .= <<<script
+
                         + '<td>'
                         + '{$block->escapeJs($block->renderCellTemplate($columnName))}'
                         + '<\/td>'
@@ -62,17 +63,29 @@ script;
 
     if ($block->isAddAfter()):
         $scriptString .= <<<script
+
                         + '<td><button class="action-add" type="button" id="addAfterBtn<%- _id %>"><span>'
                         + '{$block->escapeJs(__('Add after'))}'
                         + '<\/span><\/button><\/td>'
 script;
     endif;
     $scriptString .= <<<script
+
                     + '<td class="col-actions"><button '
-                    + 'onclick="arrayRow{$block->escapeJs($_htmlId)}.del(\'<%- _id %>\')" '
                     + 'class="action-delete" type="button">'
                     + '<span>{$block->escapeJs(__('Delete'))}<\/span><\/button><\/td>'
                     + '<\/tr>'
+
+script;
+    $scriptString1 = /* $noEscape */ $secureRenderer->renderEventListenerAsTag(
+        'onclick',
+        "arrayRow" . $block->escapeJs($_htmlId) . ".del('<%- _id %>')",
+        "tr#<%- _id %> button.action-delete"
+    );
+
+    $scriptString .= " + '" . $block->escapeJs($scriptString1) . "'" . PHP_EOL;
+
+    $scriptString .= <<<script
             ),
 
             add: function(rowData, insertAfterId) {
@@ -88,11 +101,13 @@ script;
 script;
     foreach ($block->getColumns() as $columnName => $column):
         $scriptString .= <<<script
+
                             {$block->escapeJs($columnName)}: '',
                                 'option_extra_attrs': {},
 script;
     endforeach;
     $scriptString .= <<<script
+
                         _id: '_' + d.getTime() + '_' + d.getMilliseconds()
                 };
             }
@@ -115,13 +130,17 @@ script;
             }
 
             // Add event for {addAfterBtn} button
+
 script;
     if ($block->isAddAfter()):
         $scriptString .= <<<script
+
             Event.observe('addAfterBtn' + templateValues._id, 'click', this.add.bind(this, false, templateValues._id));
+
 script;
     endif;
     $scriptString .= <<<script
+
             },
 
             del: function(rowId) {
@@ -138,19 +157,25 @@ script;
         );
 
         // add existing rows
+
 script;
+
     foreach ($block->getArrayRows() as $_rowId => $_row) {
-        echo /** @noEscape */ "arrayRow{$block->escapeJs($_htmlId)}.add(" . /** @noEscape */ $_row->toJson() . ");\n";
+        $scriptString .= /** @noEscape */ " arrayRow" .$block->escapeJs($_htmlId) .
+            ".add(" . /** @noEscape */ $_row->toJson() . ");\n";
     }
     $scriptString .= <<<script
+
         // Toggle the grid availability, if element is disabled (depending on scope)
 script;
     if ($block->getElement()->getDisabled()):
         $scriptString .= <<<script
+
         toggleValueElements({checked: true}, $('grid{$block->escapeJs($_htmlId)}').parentNode);
 script;
     endif;
     $scriptString .= <<<script
+
         });
 script;
     ?>
diff --git a/app/code/Magento/Customer/view/adminhtml/templates/system/config/validatevat.phtml b/app/code/Magento/Customer/view/adminhtml/templates/system/config/validatevat.phtml
index 3824a759dfb97..222317559e246 100644
--- a/app/code/Magento/Customer/view/adminhtml/templates/system/config/validatevat.phtml
+++ b/app/code/Magento/Customer/view/adminhtml/templates/system/config/validatevat.phtml
@@ -68,5 +68,5 @@ script;
 <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
     'onclick',
     'javascript:validateVat(); return false;',
-    '#' . $htmlId
+    '#' . /* @noEscape */ $block->getHtmlId()
 ); ?>
diff --git a/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions/tab/webapi.phtml b/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions/tab/webapi.phtml
index 1730509a65910..6dd7d1b4a2421 100644
--- a/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions/tab/webapi.phtml
+++ b/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions/tab/webapi.phtml
@@ -7,11 +7,13 @@
  *
  * @var \Magento\Integration\Block\Adminhtml\Integration\Activate\Permissions\Tab\Webapi $block
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <fieldset class="admin__fieldset form-inline entry-edit">
-    <?php if ($block->isTreeEmpty()) : ?>
+    <?php if ($block->isTreeEmpty()): ?>
         <p class="empty"><?= $block->escapeHtml(__('No permissions requested')) ?></p>
-    <?php else : ?>
+    <?php else: ?>
         <div class="field" data-role="tree-resources-container">
             <div class="control">
                 <div id="resource-tree" class="tree x-tree" data-role="resource-tree"></div>
@@ -19,8 +21,11 @@
         </div>
     <?php endif ?>
 </fieldset>
-<?php if (!$block->isTreeEmpty()) : ?>
-    <script>
+<?php
+if (!$block->isTreeEmpty()):
+    $treeJson = /* @noEscape */ $block->getResourcesTreeJson();
+    $selectedJson = /* @noEscape */ $block->getSelectedResourcesJson();
+    $scriptString = <<<script
         require(["jquery", "Magento_User/js/roles-tree"], function($){
             $.widget('mage.rolesTree', $.mage.rolesTree, {
                 _checkNode: function(event) {},
@@ -32,9 +37,11 @@
             });
 
             $('[data-role="resource-tree"]').rolesTree({
-                'treeInitData': <?= /* @noEscape */ $block->getResourcesTreeJson() ?>,
-                'treeInitSelectedData': <?= /* @noEscape */ $block->getSelectedResourcesJson() ?>
+                'treeInitData': {$treeJson},
+                'treeInitSelectedData': {$selectedJson}
             });
         });
-    </script>
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <?php endif ?>
diff --git a/app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml b/app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml
index ef0a667d2de47..b56ad208071d8 100644
--- a/app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml
+++ b/app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml
@@ -7,8 +7,12 @@
  *
  * @var \Magento\Backend\Block\Template $block
  */
+
+/** @var \Magento\Backend\Block\Template $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<script>
+
+<?php $scriptString = <<<script
     require([
         "jquery",
         'Magento_Ui/js/modal/confirm',
@@ -18,34 +22,34 @@
     ], function ($, Confirm) {
 
         window.integration = new Integration(
-            '<?= $block->escapeUrl(
+            '{$block->escapeJs(
                 $block->getUrl(
                     '*/*/permissionsDialog',
                     ['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false]
                 )
-            ) ?>',
-            '<?= $block->escapeUrl(
+            )}',
+            '{$block->escapeJs(
                 $block->getUrl(
                     '*/*/tokensDialog',
                     ['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false]
                 )
-            ) ?>',
-            '<?= $block->escapeUrl(
+            )}',
+            '{$block->escapeJs(
                 $block->getUrl(
                     '*/*/tokensExchange',
                     ['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false]
                 )
-            ) ?>',
-            '<?= $block->escapeUrl(
+            )}',
+            '{$block->escapeJs(
                 $block->getUrl(
                     '*/*'
                 )
-            ) ?>',
-            '<?= $block->escapeUrl(
+            )}',
+            '{$block->escapeJs(
                 $block->getUrl(
                     '*/*/loginSuccessCallback'
                 )
-            ) ?>'
+            )}'
         );
 
         /**
@@ -55,8 +59,9 @@
             $('div#integrationGrid').on('click', 'button#delete', function (e) {
 
                 new Confirm({
-                    title: '<?= $block->escapeHtml(__('Are you sure?')) ?>',
-                    content: "<?= $block->escapeHtml(__("Are you sure you want to delete this integration? You can't undo this action.")) ?>",
+                    title: '{$block->escapeJs(__('Are you sure?'))}',
+                    content: "{$block->escapeJs(__("Are you sure you want to delete this integration? " .
+                                                     "You can't undo this action."))}",
                     actions: {
                         confirm: function () {
                             $.mage.dataPost().postData({action: $(e.target).data('url'), data: {}});
@@ -67,6 +72,9 @@
             });
         });
     });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 
-<div id="integration-popup-container" style="display: none;"></div>
+<div id="integration-popup-container"></div>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display: none;", '#integration-popup-container') ?>
diff --git a/app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml b/app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml
index 1737f66ce4a1b..25caf5060cb5f 100644
--- a/app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml
+++ b/app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml
@@ -5,6 +5,7 @@
  */
 
 /** @var $block \Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Webapi */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
 <?= $block->getChildHtml() ?>
@@ -18,8 +19,7 @@
         <label class="label" for="all_resources"><span><?= $block->escapeHtml(__('Resource Access')) ?></span></label>
 
         <div class="control">
-            <select id="all_resources" name="all_resources"
-                    onchange="jQuery('[data-role=tree-resources-container]').toggle()" class="select">
+            <select id="all_resources" name="all_resources" class="select">
                 <option value="0" <?= ($block->isEverythingAllowed() ? '' : 'selected="selected"') ?>>
                     <?= $block->escapeHtml(__('Custom')) ?>
                 </option>
@@ -27,11 +27,16 @@
                     <?= $block->escapeHtml(__('All')) ?>
                 </option>
             </select>
+            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                'onchange',
+                "jQuery('[data-role=tree-resources-container]').toggle()",
+                'select#all_resources'
+            ) ?>
         </div>
     </div>
 
     <div class="field
-        <?php if ($block->isEverythingAllowed()) :?>
+        <?php if ($block->isEverythingAllowed()):?>
             no-display
         <?php endif ?>"
          data-role="tree-resources-container">
diff --git a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
index b062e911876c3..4e011df66974c 100644
--- a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
+++ b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
@@ -8,6 +8,7 @@
  * Template for displaying product price at product view page, gift registry and wish-list
  *
  * @var $block \Magento\Msrp\Pricing\Render\PriceBox
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
 <?php
@@ -32,18 +33,20 @@ $msrpPrice = $block->renderAmount(
 $priceElementIdPrefix = $block->getPriceElementIdPrefix() ? $block->getPriceElementIdPrefix() : 'product-price-';
 ?>
 
-<?php if ($amount) : ?>
+<?php if ($amount): ?>
     <span class="old-price map-old-price"><?= /* @noEscape */ $msrpPrice ?></span>
     <span class="map-fallback-price normal-price"><?= /* @noEscape */ $msrpPrice ?></span>
 <?php endif; ?>
 
-<?php if ($priceType->isShowPriceOnGesture()) : ?>
+<?php if ($priceType->isShowPriceOnGesture()): ?>
     <?php
 
     $addToCartUrl = '';
     if ($product->isSaleable()) {
         /** @var Magento\Catalog\Block\Product\AbstractProduct $addToCartUrlGenerator */
-        $addToCartUrlGenerator = $block->getLayout()->getBlockSingleton(\Magento\Catalog\Block\Product\AbstractProduct::class);
+        $addToCartUrlGenerator = $block->getLayout()->getBlockSingleton(
+            \Magento\Catalog\Block\Product\AbstractProduct::class
+        );
         // phpcs:disable
         $addToCartUrl = $addToCartUrlGenerator->getAddToCartUrl(
             $product,
@@ -86,29 +89,40 @@ $priceElementIdPrefix = $block->getPriceElementIdPrefix() ? $block->getPriceElem
         );
     }
     ?>
-    <span id="<?= $block->escapeHtmlAttr($block->getPriceId() ? $block->getPriceId() : $priceElementId) ?>" style="display:none"></span>
-    <a href="javascript:void(0);"
+    <?php $priceId = $block->escapeHtmlAttr($block->getPriceId() ? $block->getPriceId() : $priceElementId); ?>
+    <span id="s_<?= /* @noEscape*/ $priceId ?>"></span>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display:none", 'span#s_' . $priceId) ?>
+    <a href="#"
        id="<?= /* @noEscape */ ($popupId) ?>"
        class="action map-show-info"
-       <?php //phpcs:disable ?>
-       data-mage-init='{"addToCart":<?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($data) ?>}'>
-        <?php //phpcs:enable ?>
+       data-mage-init='{"addToCart":<?= /* @noEscape */ $block->jsonEncode($data) ?>}'>
         <?= $block->escapeHtml(__('Click for price')) ?>
     </a>
-<?php else : ?>
+    <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+        'onclick',
+        'event.preventDefault()',
+        'a#' . /* @noEscape */ ($popupId)
+    ) ?>
+<?php else: ?>
     <span class="msrp-message">
      <?= $block->escapeHtml($priceType->getMsrpPriceMessage()) ?>
     </span>
 <?php endif; ?>
 
-<?php if ($block->getZone() == \Magento\Framework\Pricing\Render::ZONE_ITEM_VIEW) : ?>
+<?php if ($block->getZone() == \Magento\Framework\Pricing\Render::ZONE_ITEM_VIEW): ?>
     <?php $helpLinkId = 'msrp-help-' . $productId . $block->getRandomString(20); ?>
-    <a href="javascript:void(0);"
+    <a href="#"
        id="<?= /* @noEscape */ $helpLinkId ?>"
        class="action map-show-info"
        data-mage-init='{"addToCart":{"origin": "info",
                                      "helpLinkId": "#<?= /* @noEscape */ $helpLinkId ?>",
-                                     "productName": "<?= $block->escapeJs($block->escapeHtml($product->getName())) ?>",
-                                     "closeButtonId": "#map-popup-close"}}'><span><?= $block->escapeHtml(__("What's this?")) ?></span>
+                                     "productName": "<?= $block->escapeJs($product->getName()) ?>",
+                                     "closeButtonId": "#map-popup-close"}}'>
+        <span><?= $block->escapeHtml(__("What's this?")) ?></span>
     </a>
+    <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+        'onclick',
+        'event.preventDefault()',
+        'a#' . /* @noEscape */ $helpLinkId
+    ) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml b/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml
index dfb66e4cc47b2..63f3d6e995d5e 100644
--- a/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml
+++ b/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml
@@ -10,8 +10,10 @@
  * Template for displaying product price at product view page, gift registry and wishlist
  *
  * @var $block \Magento\Catalog\Block\Product\Price
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
+
 <?php
     //phpcs:disable
     /** @var $pricingHelper \Magento\Framework\Pricing\Helper\Data */
@@ -26,31 +28,37 @@
     $_msrpPrice = '';
 ?>
 <div class="price-box msrp">
-    <?php if ($_product->getMsrp()) : ?>
+    <?php if ($_product->getMsrp()): ?>
         <?php $_msrpPrice = $pricingHelper->currency($_product->getMsrp(), true, false) ?>
         <span class="old-price"><?= /* @noEscape */ $_msrpPrice ?></span>
     <?php endif; ?>
-    <?php if ($_catalogHelper->isShowPriceOnGesture($_product)) : ?>
+    <?php if ($_catalogHelper->isShowPriceOnGesture($_product)): ?>
         <?php $priceElementId = 'product-price-' . $_id . $block->getIdSuffix(); ?>
-        <span id="<?= /* @noEscape */ $priceElementId ?>" style="display: none"></span>
+        <span id="<?= /* @noEscape */ $priceElementId ?>"/>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display: none", '#'. $priceElementId) ?>
+
         <?php $popupId = 'msrp-popup-' . $_id . $block->getRandomString(20); ?>
-        <a href="javascript:void(0);"
+        <a href="#"
            id="<?= /* @noEscape */ ($popupId) ?>"
            data-mage-init='{"addToCart":{"popupId": "#<?= /* @noEscape */ ($popupId) ?>",
-                                         "productName": "<?= /* @noEscape */ $block->escapeJs($block->escapeHtml($_product->getName())) ?>",
+                                         "productName": "<?= /* @noEscape */ $block->escapeJs($_product->getName()) ?>",
                                          "realPrice": <?= /* @noEscape */ $block->getRealPriceJs($_product) ?>,
                                          "msrpPrice": "<?= /* @noEscape */ $_msrpPrice ?>",
                                          "priceElementId":"<?= /* @noEscape */ $priceElementId ?>",
                                          "popupCartButtonId": "#map-popup-button",
-                                         "cartForm": "#wishlist-view-form"}}'><?= $block->escapeHtml(__('Click for price')) ?>
+                                         "cartForm": "#wishlist-view-form"}}'>
+            <?= $block->escapeHtml(__('Click for price')) ?>
         </a>
-    <?php else : ?>
+    <?php else: ?>
         <span class="msrp-message">
             <?= $block->escapeHtml($_catalogHelper->getMsrpPriceMessage($_product)) ?>
         </span>
     <?php endif; ?>
     <?php $helpLinkId = 'msrp-help-' . $_id . $block->getRandomString(20); ?>
-    <a href="javascript:void(0);" id="<?= /* @noEscape */ ($helpLinkId) ?>" data-mage-init='{"addToCart":{"helpLinkId": "#<?= /* @noEscape */ ($helpLinkId) ?>", "productName": "<?= /* @noEscape */$block->escapeJs($block->escapeHtml($_product->getName())) ?>"}}' class="link tip">
+    <a href="#" id="<?= /* @noEscape */ ($helpLinkId) ?>"
+       data-mage-init='{"addToCart":{"helpLinkId": "#<?= /* @noEscape */ ($helpLinkId) ?>",
+                                     "productName": "<?= /* @noEscape */$block->escapeJs($_product->getName()) ?>"}}'
+       class="link tip">
         <?= $block->escapeHtml(__("What's this?")) ?>
     </a>
 </div>
diff --git a/app/code/Magento/Multishipping/Block/Checkout/Overview.php b/app/code/Magento/Multishipping/Block/Checkout/Overview.php
index d17da90c58bef..0251732a15732 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/Overview.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/Overview.php
@@ -8,6 +8,8 @@
 
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Quote\Model\Quote\Address;
+use Magento\Checkout\Helper\Data as CheckoutHelper;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Multishipping checkout overview information
@@ -15,6 +17,7 @@
  * @api
  * @author Magento Core Team <core@magentocommerce.com>
  * @since  100.0.2
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Overview extends \Magento\Sales\Block\Items\AbstractItems
 {
@@ -56,6 +59,7 @@ class Overview extends \Magento\Sales\Block\Items\AbstractItems
      * @param \Magento\Quote\Model\Quote\TotalsCollector               $totalsCollector
      * @param \Magento\Quote\Model\Quote\TotalsReader                  $totalsReader
      * @param array                                                    $data
+     * @param CheckoutHelper|null                                      $checkoutHelper
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -64,11 +68,14 @@ public function __construct(
         PriceCurrencyInterface $priceCurrency,
         \Magento\Quote\Model\Quote\TotalsCollector $totalsCollector,
         \Magento\Quote\Model\Quote\TotalsReader $totalsReader,
-        array $data = []
+        array $data = [],
+        ?CheckoutHelper $checkoutHelper = null
     ) {
         $this->_taxHelper = $taxHelper;
         $this->_multishipping = $multishipping;
         $this->priceCurrency = $priceCurrency;
+        $data['taxHelper'] = $this->_taxHelper;
+        $data['checkoutHelper'] = $checkoutHelper ?? ObjectManager::getInstance()->get(CheckoutHelper::class);
         parent::__construct($context, $data);
         $this->_isScopePrivate = true;
         $this->totalsCollector = $totalsCollector;
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
index 761c1f1a78423..6d35363529ddc 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
@@ -8,20 +8,24 @@
  * Multishipping checkout billing information
  *
  * @var $block \Magento\Multishipping\Block\Checkout\Billing
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
 <div id="checkout-loader" data-role="checkout-loader" class="loading-mask" data-mage-init='{"billingLoader": {}}'>
     <div class="loader">
         <img src="<?= $block->escapeUrl($block->getViewFileUrl('images/loader-1.gif')); ?>"
-             alt="<?= $block->escapeHtml(__('Loading...')); ?>"
-             style="position: absolute;">
+             alt="<?= $block->escapeHtml(__('Loading...')); ?>">
     </div>
 </div>
-<script>
-    window.checkoutConfig = <?= /* @noEscape */ $block->getCheckoutData()->getSerializedCheckoutConfigs(); ?>;
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag('position: absolute;', 'div#checkout-loader .loader image') ?>
+<?php $checkoutConfig = /* @noEscape */ $block->getCheckoutData()->getSerializedCheckoutConfigs();
+$scriptString = <<<script
+    window.checkoutConfig = {$checkoutConfig};
     window.isCustomerLoggedIn = window.checkoutConfig.isCustomerLoggedIn;
     window.customerData = window.checkoutConfig.customerData;
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <div id="checkout" data-bind="scope:'checkoutMessages'">
     <!-- ko template: getTemplate() --><!-- /ko -->
     <script type="text/x-magento-init">
@@ -72,7 +76,7 @@
                             $methodsCount = count($methods);
                             $methodsForms = $block->hasFormTemplates() ? $block->getFormTemplates(): [];
 
-                            foreach ($methods as $_method) :
+                            foreach ($methods as $_method):
                                     $code = $_method->getCode();
                                     $checked = $block->getSelectedMethodCode() === $code;
 
@@ -82,7 +86,7 @@
                                 ?>
                                 <div data-bind="scope: 'payment_method_<?= $block->escapeHtml($code);?>'">
                                     <dt class="item-title">
-                                        <?php if ($methodsCount > 1) : ?>
+                                        <?php if ($methodsCount > 1): ?>
                                             <input type="radio"
                                                    id="p_method_<?= $block->escapeHtml($code); ?>"
                                                    value="<?= $block->escapeHtml($code); ?>"
@@ -93,11 +97,11 @@
                                                        checked: isChecked,
                                                        click: selectPaymentMethod,
                                                        visible: isRadioButtonVisible()"
-                                                <?php if ($checked) : ?>
+                                                <?php if ($checked): ?>
                                                     checked="checked"
                                                 <?php endif; ?>
                                                    class="radio"/>
-                                        <?php else : ?>
+                                        <?php else: ?>
                                             <input type="radio"
                                                    id="p_method_<?= $block->escapeHtml($code); ?>"
                                                    value="<?= $block->escapeHtml($code); ?>"
@@ -112,7 +116,7 @@
                                             <?= $block->escapeHtml($_method->getTitle()) ?>
                                         </label>
                                     </dt>
-                                    <?php if ($html = $block->getChildHtml('payment.method.' . $code)) : ?>
+                                    <?php if ($html = $block->getChildHtml('payment.method.' . $code)): ?>
                                         <dd class="item-content <?= $checked ? '' : 'no-display'; ?>">
                                             <?= /* @noEscape */ $html; ?>
                                         </dd>
@@ -142,12 +146,13 @@
         </div>
     </div>
 </form>
-<script>
+<?php $quoteBaseGrandTotal = (float)$block->getQuoteBaseGrandTotal();
+$scriptString = <<<script
     require(['jquery', 'mage/mage'], function(jQuery) {
         var addtocartForm = jQuery('#multishipping-billing-form');
 
         addtocartForm.mage('payment', {
-            checkoutPrice: <?= (float)$block->getQuoteBaseGrandTotal() ?>
+            checkoutPrice: {$quoteBaseGrandTotal}
         });
 
         addtocartForm.mage('validation', {
@@ -160,9 +165,11 @@
             }
         });
     });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 
-<script>
+<?php $scriptString = <<<script
     //<![CDATA[
     require(
         [
@@ -171,21 +178,26 @@
             'domReady!'
         ], function(quote, $) {
             quote.billingAddress({
-                    city: '<?= /* @noEscape */ $block->getAddress()->getCity() ?>',
-                    company: '<?= /* @noEscape */ $block->getAddress()->getCompany(); ?>',
-                    countryId: '<?= /* @noEscape */ $block->getAddress()->getCountryId(); ?>',
-                    customerAddressId: '<?= /* @noEscape */ $block->getAddress()->getCustomerAddressId(); ?>',
-                    customerId: '<?= /* @noEscape */ $block->getAddress()->getCustomerId(); ?>',
-                    fax: '<?= /* @noEscape */ $block->getAddress()->getFax(); ?>',
-                    firstname: '<?= /* @noEscape */ $block->getAddress()->getFirstname(); ?>',
-                    lastname: '<?= /* @noEscape */ $block->getAddress()->getLastname(); ?>',
-                    postcode: '<?= /* @noEscape */ $block->getAddress()->getPostcode(); ?>',
-                    regionId: '<?= /* @noEscape */ $block->getAddress()->getRegionId(); ?>',
-                    regionCode: '<?= /* @noEscape */ $block->getAddress()->getRegionCode() ?>',
-                    region: '<?= /* @noEscape */ $block->getAddress()->getRegion(); ?>',
-                    street: <?= /* @noEscape */ json_encode($block->getAddress()->getStreet()); ?>,
-                    telephone: '<?= /* @noEscape */ $block->getAddress()->getTelephone(); ?>'
+
+script;
+$scriptString .= "city: '" . /* @noEscape */ $block->getAddress()->getCity() . "'," . PHP_EOL;
+$scriptString .= "company: '" . /* @noEscape */ $block->getAddress()->getCompany() . "'," . PHP_EOL;
+$scriptString .= "countryId: '" . /* @noEscape */ $block->getAddress()->getCountryId() . "'," . PHP_EOL;
+$scriptString .= "customerAddressId: '" . /* @noEscape */ $block->getAddress()->getCustomerAddressId() . "'," . PHP_EOL;
+$scriptString .= "customerId: '" . /* @noEscape */ $block->getAddress()->getCustomerId() . "'," . PHP_EOL;
+$scriptString .= "fax: '" . /* @noEscape */ $block->getAddress()->getFax() . "'," . PHP_EOL;
+$scriptString .= "firstname: '" . /* @noEscape */ $block->getAddress()->getFirstname() . "'," . PHP_EOL;
+$scriptString .= "lastname: '" . /* @noEscape */ $block->getAddress()->getLastname() . "'," . PHP_EOL;
+$scriptString .= "postcode: '" . /* @noEscape */ $block->getAddress()->getPostcode() . "'," . PHP_EOL;
+$scriptString .= "regionId: '" . /* @noEscape */ $block->getAddress()->getRegionId() . "'," . PHP_EOL;
+$scriptString .= "regionCode: '" . /* @noEscape */ $block->getAddress()->getRegionCode() . "'," . PHP_EOL;
+$scriptString .= "region: '" . /* @noEscape */ $block->getAddress()->getRegion() . "'," . PHP_EOL;
+$scriptString .= "street: " . /* @noEscape */ json_encode($block->getAddress()->getStreet()) . "," . PHP_EOL;
+$scriptString .= "telephone: '" . /* @noEscape */ $block->getAddress()->getTelephone() . "'" . PHP_EOL;
+$scriptString .= <<<script
             });
         });
     //]]>
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
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 5fff0d72e8000..3b72679bfc34e 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml
@@ -4,12 +4,18 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Templates.ThisInTemplate
-
 /** @var \Magento\Multishipping\Block\Checkout\Overview $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+?>
+
+<?php
+/** @var \Magento\Tax\Helper\Data $taxHelper */
+$taxHelper = $block->getData('taxHelper');
+/** @var \Magento\Checkout\Helper\Data $checkoutHelper */
+$checkoutHelper = $block->getData('checkoutHelper');
 ?>
 <?php $errors = $block->getCheckoutData()->getAddressErrors(); ?>
-<?php foreach ($errors as $addressId => $error) : ?>
+<?php foreach ($errors as $addressId => $error): ?>
     <div class="message message-error error">
         <?= $block->escapeHtml($error); ?>
         <?= $block->escapeHtml(__('Please see')); ?>
@@ -59,8 +65,8 @@
     </div>
     <div class="block block-shipping">
         <div class="block-title"><strong><?= $block->escapeHtml(__('Shipping Information')); ?></strong></div>
-        <?php $mergedCells = ($this->helper(Magento\Tax\Helper\Data::class)->displayCartBothPrices() ? 2 : 1); ?>
-        <?php foreach ($block->getShippingAddresses() as $index => $address) : ?>
+        <?php $mergedCells = ($taxHelper->displayCartBothPrices() ? 2 : 1); ?>
+        <?php foreach ($block->getShippingAddresses() as $index => $address): ?>
             <div class="block-content">
                 <a name="<?= $block->escapeHtml($block->getCheckoutData()
                     ->getAddressAnchorName($address->getId())); ?>"></a>
@@ -72,7 +78,7 @@
                         </span>
                     </strong>
                 </div>
-                <?php if ($error = $block->getCheckoutData()->getAddressError($address)) : ?>
+                <?php if ($error = $block->getCheckoutData()->getAddressError($address)): ?>
                     <div class="error-description"><?= $block->escapeHtml($error); ?></div>
                 <?php endif;?>
                 <div class="box box-shipping-address">
@@ -93,17 +99,16 @@
                         <a href="<?= $block->escapeUrl($block->getEditShippingUrl()); ?>"
                            class="action edit"><span><?= $block->escapeHtml(__('Change')); ?></span></a>
                     </strong>
-                    <?php if ($_rate = $block->getShippingAddressRate($address)) : ?>
+                    <?php if ($_rate = $block->getShippingAddressRate($address)): ?>
                         <div class="box-content">
                             <?= $block->escapeHtml($_rate->getCarrierTitle()) ?>
                             (<?= $block->escapeHtml($_rate->getMethodTitle()) ?>)
                             <?php
                             $exclTax = $block->getShippingPriceExclTax($address);
                             $inclTax = $block->getShippingPriceInclTax($address);
-                            $displayBothPrices = $this->helper(Magento\Tax\Helper\Data::class)
-                                ->displayShippingBothPrices() && $inclTax !== $exclTax;
+                            $displayBothPrices = $taxHelper->displayShippingBothPrices() && $inclTax !== $exclTax;
                             ?>
-                            <?php if ($displayBothPrices) : ?>
+                            <?php if ($displayBothPrices): ?>
                                 <span class="price-including-tax"
                                       data-label="<?= $block->escapeHtml(__('Incl. Tax')); ?>">
                                     <?= /* @noEscape */ $inclTax ?>
@@ -112,7 +117,7 @@
                                       data-label="<?= $block->escapeHtml(__('Excl. Tax')); ?>">
                                     <?= /* @noEscape */ $exclTax; ?>
                                 </span>
-                            <?php else : ?>
+                            <?php else: ?>
                                 <?= /* @noEscape */ $inclTax ?>
                             <?php  endif; ?>
                         </div>
@@ -138,7 +143,7 @@
                                 </tr>
                                 </thead>
                                 <tbody>
-                                <?php foreach ($block->getShippingAddressItems($address) as $item) : ?>
+                                <?php foreach ($block->getShippingAddressItems($address) as $item): ?>
                                     <?= /* @noEscape */ $block->getRowItemHtml($item) ?>
                                 <?php endforeach; ?>
                                 </tbody>
@@ -155,13 +160,13 @@
         <?php endforeach; ?>
     </div>
 
-    <?php if ($block->getQuote()->hasVirtualItems()) : ?>
+    <?php if ($block->getQuote()->hasVirtualItems()): ?>
     <div class="block block-other">
         <?php $billingAddress = $block->getQuote()->getBillingAddress(); ?>
         <a name="<?= $block->escapeHtml($block->getCheckoutData()
             ->getAddressAnchorName($billingAddress->getId())); ?>"></a>
         <div class="block-title"><strong><?= $block->escapeHtml(__('Other items in your order')); ?></strong></div>
-        <?php if ($error = $block->getCheckoutData()->getAddressError($billingAddress)) :?>
+        <?php if ($error = $block->getCheckoutData()->getAddressError($billingAddress)): ?>
                 <div class="error-description"><?= $block->escapeHtml($error); ?></div>
         <?php endif;?>
         <div class="block-content">
@@ -170,7 +175,7 @@
                 <a href="<?= $block->escapeUrl($block->getVirtualProductEditUrl()); ?>"
                    class="action edit"><span><?= $block->escapeHtml(__('Edit Items')); ?></span></a>
             </strong>
-            <?php $mergedCells = ($this->helper(Magento\Tax\Helper\Data::class)->displayCartBothPrices() ? 2 : 1); ?>
+            <?php $mergedCells = ($taxHelper->displayCartBothPrices() ? 2 : 1); ?>
             <div class="order-review-wrapper table-wrapper">
                 <table class="items data table table-order-review" id="virtual-overview-table">
                     <caption class="table-caption"><?= $block->escapeHtml(__('Items')); ?></caption>
@@ -183,7 +188,7 @@
                         </tr>
                     </thead>
                     <tbody>
-                        <?php foreach ($block->getVirtualItems() as $_item) : ?>
+                        <?php foreach ($block->getVirtualItems() as $_item): ?>
                             <?= /* @noEscape */ $block->getRowItemHtml($_item) ?>
                         <?php endforeach; ?>
                     </tbody>
@@ -203,8 +208,7 @@
         <div class="grand totals">
             <strong class="mark"><?= $block->escapeHtml(__('Grand Total:')); ?></strong>
             <strong class="amount">
-                <?= /* @noEscape */ $this->helper(Magento\Checkout\Helper\Data::class)
-                    ->formatPrice($block->getTotal()); ?>
+                <?= /* @noEscape */ $checkoutHelper->formatPrice($block->getTotal()); ?>
             </strong>
         </div>
         <div class="actions-toolbar" id="review-buttons-container">
@@ -221,10 +225,10 @@
             </div>
             <span id="review-please-wait"
                   class="please-wait load indicator"
-                  style="display: none;"
                   data-text="<?= $block->escapeHtml(__('Submitting order information...')); ?>">
                 <span><?= $block->escapeHtml(__('Submitting order information...')); ?></span>
             </span>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display: none;', 'span#review-please-wait') ?>
         </div>
     </div>
 </form>
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 20ff63a60a263..62b368b8911f8 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml
@@ -5,30 +5,31 @@
  */
 
 /** @var \Magento\Backend\Block\Page $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <div id="preview" class="cms-revision-preview">
     <div class="toolbar">
-        <?php if (!$block->isSingleStoreMode()) :?>
-        <div class="store-switcher">
-            <?= $block->getChildHtml('store_switcher') ?>
-        </div>
+        <?php if (!$block->isSingleStoreMode()):?>
+            <div class="store-switcher">
+                <?= $block->getChildHtml('store_switcher') ?>
+            </div>
         <?php endif;?>
     </div>
     <iframe
-            name="preview_iframe"
-            id="preview_iframe"
-            class="preview_iframe"
-            frameborder="0"
-            title="<?= $block->escapeHtmlAttr(__('Preview')) ?>"
-            width="100%"
-            sandbox="allow-forms allow-pointer-lock"
+        name="preview_iframe"
+        id="preview_iframe"
+        class="preview_iframe"
+        frameborder="0"
+        title="<?= $block->escapeHtmlAttr(__('Preview')) ?>"
+        width="100%"
+        sandbox="allow-forms allow-pointer-lock"
     >
 
     </iframe>
     <?= $block->getChildHtml('preview_form') ?>
 </div>
 
-<script>
+<?php $scriptString = <<<script
 require(['jquery', 'loadingPopup', 'prototype'], function(jQuery){
 
 //<![CDATA[
@@ -61,4 +62,6 @@ jQuery("#preview_iframe").load(function() {
 //]]>
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/preview/store.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/preview/store.phtml
index d5a24fad2ac91..896b8ce773c2d 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/preview/store.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/preview/store.phtml
@@ -3,9 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
-<?php if ($websites = $block->getWebsites()) : ?>
+<?php if ($websites = $block->getWebsites()): ?>
 <div class="field field-store-switcher">
     <label class="label" for="store_switcher"><?= $block->escapeHtml(__('Choose Store View:')) ?></label>
     <div class="control">
@@ -13,22 +15,25 @@
             id="store_switcher"
             class="admin__control-select"
             name="store_switcher">
-            <?php foreach ($websites as $website) : ?>
+            <?php foreach ($websites as $website): ?>
                 <?php $showWebsite = false; ?>
-                <?php foreach ($website->getGroups() as $group) : ?>
+                <?php foreach ($website->getGroups() as $group): ?>
                     <?php $showGroup = false; ?>
-                    <?php foreach ($block->getStores($group) as $store) : ?>
-                        <?php if ($showWebsite == false) : ?>
+                    <?php foreach ($block->getStores($group) as $store): ?>
+                        <?php if ($showWebsite == false): ?>
                             <?php $showWebsite = true; ?>
                             <optgroup label="<?= $block->escapeHtmlAttr($website->getName()) ?>"></optgroup>
                         <?php endif; ?>
-                        <?php if ($showGroup == false) : ?>
+                        <?php if ($showGroup == false): ?>
                             <?php $showGroup = true; ?>
                             <optgroup label="&nbsp;&nbsp;&nbsp;<?= $block->escapeHtmlAttr($group->getName()) ?>">
                         <?php endif; ?>
-                        <option value="<?= $block->escapeHtmlAttr($store->getId()) ?>"<?php if ($block->getStoreId() == $store->getId()) : ?> selected="selected"<?php endif; ?>>&nbsp;&nbsp;&nbsp;&nbsp;<?= $block->escapeHtml($store->getName()) ?></option>
+                        <option value="<?= $block->escapeHtmlAttr($store->getId()) ?>"
+                            <?php if ($block->getStoreId() == $store->getId()): ?> selected="selected"<?php endif; ?>>
+                            &nbsp;&nbsp;&nbsp;&nbsp;<?= $block->escapeHtml($store->getName()) ?>
+                        </option>
                     <?php endforeach; ?>
-                    <?php if ($showGroup) : ?>
+                    <?php if ($showGroup): ?>
                         </optgroup>
                     <?php endif; ?>
                 <?php endforeach; ?>
@@ -37,7 +42,7 @@
     </div>
     <?= $block->getHintHtml() ?>
 </div>
-<script>
+    <?php $scriptString= <<<script
 require(['prototype'], function(){
 
 //<![CDATA[
@@ -48,5 +53,7 @@ Event.observe($('store_switcher'), 'change', function(event) {
 //]]>
 
 });
-</script>
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/problem/list.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/problem/list.phtml
index b697be4cf753a..8148af3221922 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/problem/list.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/problem/list.phtml
@@ -3,21 +3,23 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?= $block->getChildHtml('grid') ?>
 
-<?php if ($block->getShowButtons()) : ?>
+<?php if ($block->getShowButtons()): ?>
 <div class="form-buttons">
     <?= $block->getUnsubscribeButtonHtml() ?>
     <?= $block->getDeleteButtonHtml() ?>
 </div>
 <?php endif ?>
-<script>
+<?php $scriptString = <<<script
 require(["prototype", "mage/adminhtml/events"], function(){
 
     problemController = {
         checkCheckboxes:function (controlCheckbox) {
-            var elements = $$('input.problemCheckbox');
+            var elements = \$$('input.problemCheckbox');
             if (elements && elements.length) {
                 elements.each(function (obj) {
                     obj.checked = controlCheckbox.checked;
@@ -35,7 +37,7 @@ require(["prototype", "mage/adminhtml/events"], function(){
         },
 
         unsubscribe:function () {
-            var elements = $$('input.problemCheckbox');
+            var elements = \$$('input.problemCheckbox');
             var serializedElements = Form.serializeElements(elements, true);
             serializedElements._unsubscribe = '1';
             serializedElements.form_key = FORM_KEY;
@@ -48,7 +50,7 @@ require(["prototype", "mage/adminhtml/events"], function(){
         },
 
         deleteSelected:function () {
-            var elements = $$('input.problemCheckbox');
+            var elements = \$$('input.problemCheckbox');
             var serializedElements = Form.serializeElements(elements, true);
             serializedElements._delete = '1';
             serializedElements.form_key = FORM_KEY;
@@ -65,4 +67,6 @@ require(["prototype", "mage/adminhtml/events"], function(){
     //-->
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/queue/edit.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/queue/edit.phtml
index 3d52cc0dee777..eb2e3f2b399f2 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/queue/edit.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/queue/edit.phtml
@@ -5,16 +5,16 @@
  */
 
 /* @var $block \Magento\Newsletter\Block\Adminhtml\Queue\Edit */
-
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <div data-mage-init='{"floatingHeader": {}}' class="page-actions">
     <?= $block->getBackButtonHtml() ?>
     <?= $block->getPreviewButtonHtml() ?>
-    <?php if (!$block->getIsPreview()) : ?>
+    <?php if (!$block->getIsPreview()): ?>
         <?= $block->getResetButtonHtml() ?>
         <?= $block->getSaveButtonHtml() ?>
     <?php endif ?>
-    <?php if ($block->getCanResume()) : ?>
+    <?php if ($block->getCanResume()): ?>
         <?= $block->getResumeButtonHtml() ?>
     <?php endif ?>
 </div>
@@ -23,16 +23,18 @@
     <?= $block->getBlockHtml('formkey') ?>
     <?= $block->getChildHtml('form') ?>
 </form>
-<form action="<?= $block->escapeUrl($block->getPreviewUrl()) ?>" method="post" id="newsletter_queue_preview_form" target="_blank">
+<form action="<?= $block->escapeUrl($block->getPreviewUrl()) ?>" method="post" id="newsletter_queue_preview_form"
+      target="_blank">
     <?= $block->getBlockHtml('formkey') ?>
     <div class="no-display">
-        <input type="hidden" id="preview_type" name="type" value="<?= /* @noEscape */ $block->getIsTextType() ? 1 : 2 ?>" />
+        <input type="hidden" id="preview_type" name="type"
+               value="<?= /* @noEscape */ $block->getIsTextType() ? 1 : 2 ?>" />
         <input type="hidden" id="preview_text" name="text" value="" />
         <input type="hidden" id="preview_styles" name="styles" value="" />
         <input type="hidden" id="preview_id" name="id" value="" />
     </div>
 </form>
-<script>
+<?php $scriptString= <<<script
 require([
     'jquery',
     'wysiwygAdapter',
@@ -71,4 +73,6 @@ queueControl = {
 //]]>
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/subscriber/list.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/subscriber/list.phtml
index 13bd5d5118be0..b69a89fc296dc 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/subscriber/list.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/subscriber/list.phtml
@@ -5,20 +5,29 @@
  */
 
 /** @var \Magento\Newsletter\Block\Adminhtml\Subscriber $block */
-
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?= $block->getChildHtml('grid') ?>
-<?php if (count($block->getQueueAsOptions())>0 && $block->getShowQueueAdd()) : ?>
+<?php if (count($block->getQueueAsOptions())>0 && $block->getShowQueueAdd()): ?>
 <div class="form-buttons">
     <select id="queueList" name="queue">
-    <?php foreach ($block->getQueueAsOptions() as $_queue) : ?>
-        <option value="<?= $block->escapeHtmlAttr($_queue['value']) ?>"><?= $block->escapeHtml($_queue['label']) ?> #<?= $block->escapeHtml($_queue['value']) ?></option>
+    <?php foreach ($block->getQueueAsOptions() as $_queue): ?>
+        <option value="<?= $block->escapeHtmlAttr($_queue['value']) ?>">
+            <?= $block->escapeHtml($_queue['label']) ?> #<?= $block->escapeHtml($_queue['value']) ?>
+        </option>
     <?php endforeach; ?>
     </select>
-    <button type="button" class="scalable" onclick="subscriberController.addToQueue();"><span><span><span><?= $block->escapeHtml(__('Add to Queue')) ?></span></span></span></button>
+    <button type="button" class="scalable" id="addToQueue">
+        <span><span><span><?= $block->escapeHtml(__('Add to Queue')) ?></span></span></span>
+    </button>
+    <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+        'onclick',
+        'subscriberController.addToQueue();',
+        'button#addToQueue'
+    ) ?>
 </div>
 <?php endif ?>
-<script>
+<?php $scriptString= <<<script
 require(["prototype", "mage/adminhtml/events"], function(){
     subscriberController = {
         checkCheckboxes: function(controlCheckbox) {
@@ -53,4 +62,6 @@ require(["prototype", "mage/adminhtml/events"], function(){
 
     varienGlobalEvents.attachEventHandler('gridRowClick', subscriberController.rowClick.bind(subscriberController));
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml
index abc56070b6892..29555130de1ae 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml
@@ -7,26 +7,29 @@
 use Magento\Framework\App\TemplateTypesInterface;
 
 /* @var $block \Magento\Newsletter\Block\Adminhtml\Template\Edit */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 
 ?>
 <form action="<?= $block->escapeUrl($block->getSaveUrl()) ?>" method="post" id="newsletter_template_edit_form">
     <?= $block->getBlockHtml('formkey') ?>
     <div class="no-display">
         <input type="hidden" id="change_flag_element" name="_change_type_flag" value="" />
-        <input type="hidden" id="save_as_flag" name="_save_as_flag" value="<?= $block->escapeHtmlAttr($block->getSaveAsFlag()) ?>" />
+        <input type="hidden" id="save_as_flag" name="_save_as_flag"
+               value="<?= $block->escapeHtmlAttr($block->getSaveAsFlag()) ?>" />
     </div>
     <?= /* @noEscape */ $block->getForm() ?>
 </form>
-<form action="<?= $block->escapeUrl($block->getPreviewUrl()) ?>" method="post" id="newsletter_template_preview_form" target="_blank">
+<form action="<?= $block->escapeUrl($block->getPreviewUrl()) ?>" method="post" id="newsletter_template_preview_form"
+      target="_blank">
     <div class="no-display">
-        <input type="hidden" id="preview_type" name="type" value="<?= /* @noEscape */ $block->isTextType() ? 1 : 2 ?>" />
+        <input type="hidden" id="preview_type" name="type" value="<?= /* @noEscape */ $block->isTextType() ? 1 : 2 ?>"/>
         <input type="hidden" id="preview_text" name="text" value="" />
         <input type="hidden" id="preview_styles" name="styles" value="" />
         <input type="hidden" id="preview_id" name="id" value="" />
         <input type="hidden" name="form_key" value="<?= $block->escapeHtmlAttr($block->getFormKey()) ?>" >
     </div>
 </form>
-<script>
+<?php $scriptString = <<<script
 require([
     'jquery',
     'wysiwygAdapter',
@@ -91,7 +94,7 @@ require([
             var self = this;
 
             confirm({
-                content: "<?= $block->escapeJs($block->escapeHtml(__('Are you sure that you want to strip all tags?'))) ?>",
+                content: "{$block->escapeJs(__('Are you sure that you want to strip all tags?'))}",
                 actions: {
                     confirm: function () {
                         if (wysiwyg.activeEditor()) {
@@ -140,10 +143,10 @@ require([
                 $('change_flag_element').value = '1';
             }
 
-            if ($F('code').blank() || $F('code') == templateControl.templateName) {
+            if (\$F('code').blank() || \$F('code') == templateControl.templateName) {
                 prompt({
-                    content: '<?= $block->escapeJs($block->escapeHtml(__('Please enter a new template name.'))) ?>',
-                    value: templateControl.templateName + '<?= $block->escapeJs(__(' Copy')) ?>',
+                    content: '{$block->escapeJs(__('Please enter a new template name.'))}',
+                    value: templateControl.templateName + '{$block->escapeJs(__(' Copy'))}',
                     actions: {
                         confirm: function (value) {
                             $('code').value = value;
@@ -174,9 +177,9 @@ require([
 
         preview: function () {
             if (this.typeChange) {
-                $('preview_type').value = <?= $block->escapeJs(TemplateTypesInterface::TYPE_TEXT) ?>;
+                $('preview_type').value = {$block->escapeJs(TemplateTypesInterface::TYPE_TEXT)};
             } else {
-                $('preview_type').value = <?= $block->escapeJs($block->getTemplateType()) ?>;
+                $('preview_type').value = {$block->escapeJs($block->getTemplateType())};
             }
 
             if (wysiwyg.activeEditor()) {
@@ -200,10 +203,10 @@ require([
 
         deleteTemplate: function () {
             confirm({
-                content: "<?= $block->escapeJs($block->escapeHtml(__('Are you sure you want to delete this template?'))) ?>",
+                content: "{$block->escapeJs(__('Are you sure you want to delete this template?'))}",
                 actions: {
                     confirm: function () {
-                        window.location.href = '<?= $block->escapeUrl($block->getDeleteUrl()) ?>';
+                        window.location.href = '{$block->escapeJs($block->getDeleteUrl())}';
                     }
                 }
             });
@@ -211,8 +214,10 @@ require([
     };
 
     templateControl.init();
-    templateControl.templateName = "<?= $block->escapeJs($block->getJsTemplateName()) ?>";
+    templateControl.templateName = "{$block->escapeJs($block->getJsTemplateName())}";
 //]]>
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/banktransfer.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/banktransfer.phtml
index a251c609ea324..01ed26d5e57a6 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/banktransfer.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/banktransfer.phtml
@@ -6,16 +6,21 @@
 
 /**
  * @var $block \Magento\OfflinePayments\Block\Form\Banktransfer
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 $instructions = $block->getInstructions();
 ?>
-<?php if ($instructions) : ?>
+<?php if ($instructions): ?>
     <?php $methodCode = $block->escapeHtml($block->getMethodCode());?>
-    <ul class="form-list checkout-agreements" id="payment_form_<?= /* @noEscape */ $methodCode ?>" style="display:none;">
+    <ul class="form-list checkout-agreements" id="payment_form_<?= /* @noEscape */ $methodCode ?>">
         <li>
             <div class="<?= /* @noEscape */ $methodCode ?>-instructions-content checkout-agreement-item-content">
                 <?= /* @noEscape */ nl2br($block->escapeHtml($instructions)) ?>
             </div>
         </li>
     </ul>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+        "display:none",
+        'ul#payment_form_' . /* @noEscape */ $methodCode
+    ) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/cashondelivery.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/cashondelivery.phtml
index 8e8730640a8a7..c1b07f08d4ce3 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/cashondelivery.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/cashondelivery.phtml
@@ -6,16 +6,21 @@
 
 /**
  * @var $block \Magento\OfflinePayments\Block\Form\Cashondelivery
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 $instructions = $block->getInstructions();
 ?>
-<?php if ($instructions) : ?>
+<?php if ($instructions): ?>
     <?php $methodCode = $block->escapeHtml($block->getMethodCode());?>
-    <ul class="form-list checkout-agreements" id="payment_form_<?= /* @noEscape */ $methodCode ?>" style="display:none;">
+    <ul class="form-list checkout-agreements" id="payment_form_<?= /* @noEscape */ $methodCode ?>">
         <li>
             <div class="<?= /* @noEscape */ $methodCode ?>-instructions-content checkout-agreement-item-content">
                 <?= /* @noEscape */ nl2br($block->escapeHtml($instructions)) ?>
             </div>
         </li>
     </ul>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+        "display:none",
+        'ul#payment_form_' . /* @noEscape */ $methodCode
+    ) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml
index db1d7c87ada0e..958406bb297e1 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml
@@ -6,13 +6,15 @@
 
 /**
  * @var $block \Magento\OfflinePayments\Block\Form\Checkmo
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
-<fieldset class="admin__fieldset payment-method" id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>" style="display:none">
-    <?php if ($block->getMethod()->getPayableTo()) : ?>
-        <label class="label"><span><?= $block->escapeHtml(__('Make Check payable to:')) ?></span></label> <?= $block->escapeHtml($block->getMethod()->getPayableTo()) ?>
+<fieldset class="admin__fieldset payment-method" id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>" >
+    <?php if ($block->getMethod()->getPayableTo()): ?>
+        <label class="label"><span><?= $block->escapeHtml(__('Make Check payable to:')) ?></span></label>
+        <?= $block->escapeHtml($block->getMethod()->getPayableTo()) ?>
     <?php endif; ?>
-    <?php if ($block->getMethod()->getMailingAddress()) : ?>
+    <?php if ($block->getMethod()->getMailingAddress()): ?>
         <div class="admin__field">
             <label class="admin__field-label"><span><?= $block->escapeHtml(__('Send Check to:')) ?></span></label>
             <div class="admin__field-control checkmo-mailing-address">
@@ -21,3 +23,7 @@
         </div>
     <?php endif; ?>
 </fieldset>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    "display:none",
+    'fieldset#payment_form_' . $block->escapeHtml($block->getMethodCode())
+) ?>
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml
index c115765697fc5..03dd859666f59 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml
@@ -6,15 +6,23 @@
 
 /**
  * @var $block \Magento\OfflinePayments\Block\Form\Purchaseorder
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
-<fieldset class="admin__fieldset payment-method" id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>" style="display: none">
+<fieldset class="admin__fieldset payment-method" id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>">
     <div class="admin__field _required">
-        <label for="po_number" class="admin__field-label"><span><?= $block->escapeHtml(__('Purchase Order Number')) ?></span></label>
+        <label for="po_number" class="admin__field-label">
+            <span><?= $block->escapeHtml(__('Purchase Order Number')) ?></span>
+        </label>
         <div class="admin__field-control">
             <input type="text" id="po_number" name="payment[po_number]"
-                   title="<?= $block->escapeHtml(__("Purchase Order Number")) ?>" class="required-entry admin__control-text"
+                   title="<?= $block->escapeHtml(__("Purchase Order Number")) ?>"
+                   class="required-entry admin__control-text"
                    value="<?= /* @noEscape */ $block->getInfoData('po_number') ?>"/>
         </div>
     </div>
 </fieldset>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    "display:none",
+    'fieldset#payment_form_' . $block->escapeHtml($block->getMethodCode())
+) ?>
diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/form/banktransfer.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/form/banktransfer.phtml
index 568ef7c3f69f2..97288194342ba 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/templates/form/banktransfer.phtml
+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/form/banktransfer.phtml
@@ -6,12 +6,18 @@
 
 /**
  * @var $block \Magento\OfflinePayments\Block\Form\Banktransfer
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 $instructions = $block->getInstructions();
 ?>
-<?php if ($instructions) : ?>
+<?php if ($instructions): ?>
     <?php $methodCode = $block->escapeHtml($block->getMethodCode());?>
-    <div class="items <?= /* @noEscape */ $methodCode ?> instructions agreement checkout-agreement-item-content" id="payment_form_<?= /* @noEscape */ $methodCode ?>" style="display: none;">
+    <div class="items <?= /* @noEscape */ $methodCode ?> instructions agreement checkout-agreement-item-content"
+         id="payment_form_<?= /* @noEscape */ $methodCode ?>">
         <?= /* @noEscape */ nl2br($block->escapeHtml($instructions)) ?>
     </div>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+        "display:none",
+        'div#payment_form_' . /* @noEscape */ $methodCode
+    ) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/form/cashondelivery.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/form/cashondelivery.phtml
index 2943f59be4ab3..160c1d27052f0 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/templates/form/cashondelivery.phtml
+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/form/cashondelivery.phtml
@@ -6,12 +6,18 @@
 
 /**
  * @var $block \Magento\OfflinePayments\Block\Form\Cashondelivery
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 $instructions = $block->getInstructions();
 ?>
-<?php if ($instructions) : ?>
+<?php if ($instructions): ?>
     <?php $methodCode = $block->escapeHtml($block->getMethodCode());?>
-    <div class="items <?= /* @noEscape */ $methodCode ?> instructions agreement" id="payment_form_<?= /* @noEscape */ $methodCode ?>" style="display: none;">
+    <div class="items <?= /* @noEscape */ $methodCode ?> instructions agreement"
+         id="payment_form_<?= /* @noEscape */ $methodCode ?>">
         <?= /* @noEscape */ nl2br($block->escapeHtml($instructions)) ?>
     </div>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+        "display:none",
+        'div#payment_form_' . /* @noEscape */ $methodCode
+    ) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/form/checkmo.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/form/checkmo.phtml
index 36f58fc155a18..5d584ff724618 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/templates/form/checkmo.phtml
+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/form/checkmo.phtml
@@ -6,15 +6,16 @@
 
 /**
  * @var $block \Magento\OfflinePayments\Block\Form\Checkmo
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
-<?php if ($block->getMethod()->getMailingAddress() || $block->getMethod()->getPayableTo()) : ?>
-    <dl class="items check payable" id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>" style="display:none;">
-        <?php if ($block->getMethod()->getPayableTo()) : ?>
+<?php if ($block->getMethod()->getMailingAddress() || $block->getMethod()->getPayableTo()): ?>
+    <dl class="items check payable" id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>">
+        <?php if ($block->getMethod()->getPayableTo()): ?>
             <dt class="title"><?= $block->escapeHtml(__('Make Check payable to:')) ?></dt>
             <dd class="content"><?= $block->escapeHtml($block->getMethod()->getPayableTo()) ?></dd>
         <?php endif; ?>
-        <?php if ($block->getMethod()->getMailingAddress()) : ?>
+        <?php if ($block->getMethod()->getMailingAddress()): ?>
             <dt class="title"><?= $block->escapeHtml(__('Send Check to:')) ?></dt>
             <dd class="content">
                 <address class="checkmo mailing address">
@@ -23,4 +24,8 @@
             </dd>
         <?php endif; ?>
     </dl>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+        "display:none",
+        'dl#payment_form_' . $block->escapeHtml($block->getMethodCode())
+    ) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/form/purchaseorder.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/form/purchaseorder.phtml
index 52b7df9fb9187..35ef5d9db8616 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/templates/form/purchaseorder.phtml
+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/form/purchaseorder.phtml
@@ -6,16 +6,23 @@
 
 /**
  * @var $block \Magento\OfflinePayments\Block\Form\Purchaseorder
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 $methodCode = $block->escapeHtml($block->getMethodCode());
 ?>
-<fieldset class="fieldset items <?= /* @noEscape */ $methodCode ?>" id="payment_form_<?= /* @noEscape */ $methodCode ?>" style="display: none">
+<fieldset class="fieldset items <?= /* @noEscape */ $methodCode ?>"
+          id="payment_form_<?= /* @noEscape */ $methodCode ?>">
     <div class="field number required">
         <label for="po_number" class="label"><span><?= $block->escapeHtml(__('Purchase Order Number')) ?></span></label>
         <div class="control">
-            <input type="text" id="po_number" name="payment[po_number]" title="<?= $block->escapeHtml(__('Purchase Order Number')) ?>"
+            <input type="text" id="po_number" name="payment[po_number]"
+                   title="<?= $block->escapeHtml(__('Purchase Order Number')) ?>"
                    class="input-text required-entry"
                    value="<?= $block->escapeHtml($block->getInfoData('po_number')) ?>" />
         </div>
     </div>
 </fieldset>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    "display:none",
+    'fieldset#payment_form_' . /* @noEscape */ $methodCode
+) ?>
diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/multishipping/checkmo_form.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/multishipping/checkmo_form.phtml
index b96918243a7a7..730976a15be5d 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/templates/multishipping/checkmo_form.phtml
+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/multishipping/checkmo_form.phtml
@@ -3,8 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<script>
+
+<?php $scriptString = <<<script
     require([
         'uiLayout',
         'jquery'
@@ -25,4 +28,6 @@
             $('body').trigger('contentUpdated');
         })
     })
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Payment/Block/Transparent/Iframe.php b/app/code/Magento/Payment/Block/Transparent/Iframe.php
index 672db1b065b74..6999a722dbeda 100644
--- a/app/code/Magento/Payment/Block/Transparent/Iframe.php
+++ b/app/code/Magento/Payment/Block/Transparent/Iframe.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Payment\Block\Transparent;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Json\Helper\Data as JsonHelper;
+
 /**
  * Iframe block for register specific params in layout
  *
@@ -28,13 +31,16 @@ class Iframe extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param array $data
+     * @param JsonHelper|null $jsonHelper
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
         \Magento\Framework\Registry $registry,
-        array $data = []
+        array $data = [],
+        ?JsonHelper $jsonHelper = null
     ) {
         $this->coreRegistry = $registry;
+        $data['jsonHelper'] = $jsonHelper ?? ObjectManager::getInstance()->get(JsonHelper::class);
         parent::__construct($context, $data);
     }
 
diff --git a/app/code/Magento/Payment/view/adminhtml/templates/form/cc.phtml b/app/code/Magento/Payment/view/adminhtml/templates/form/cc.phtml
index 678bde815d370..2ff4df6e4885a 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/form/cc.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/form/cc.phtml
@@ -6,14 +6,14 @@
 
 /**
  * @var \Magento\Payment\Block\Adminhtml\Transparent\Form $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 $code = $block->escapeHtml($block->getMethodCode());
 $ccType = $block->getInfoData('cc_type');
 $ccExpMonth = $block->getInfoData('cc_exp_month');
 $ccExpYear = $block->getInfoData('cc_exp_year');
 ?>
-<fieldset class="admin__fieldset payment-method" id="payment_form_<?= /* @noEscape */ $code ?>"
-          style="display:none">
+<fieldset class="admin__fieldset payment-method" id="payment_form_<?= /* @noEscape */ $code ?>">
     <div class="field-type admin__field _required">
         <label class="admin__field-label" for="<?= /* @noEscape */ $code ?>_cc_type">
             <span><?= $block->escapeHtml(__('Credit Card Type')) ?></span>
@@ -22,8 +22,9 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
             <select id="<?= /* @noEscape */ $code ?>_cc_type" name="payment[cc_type]"
                     class="required-entry validate-cc-type-select admin__control-select">
                 <option value=""></option>
-                <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName) : ?>
-                    <option value="<?= $block->escapeHtml($typeCode) ?>" <?php if ($typeCode == $ccType) : ?>selected="selected"<?php endif ?>>
+                <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName): ?>
+                    <option value="<?= $block->escapeHtml($typeCode) ?>"
+                            <?php if ($typeCode == $ccType): ?>selected="selected"<?php endif ?>>
                         <?= $block->escapeHtml($typeName) ?>
                     </option>
                 <?php endforeach ?>
@@ -36,7 +37,8 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
         </label>
         <div class="admin__field-control">
             <input type="text" id="<?= /* @noEscape */ $code ?>_cc_number" name="payment[cc_number]"
-                   title="<?= $block->escapeHtml(__('Credit Card Number')) ?>" class="admin__control-text validate-cc-number"
+                   title="<?= $block->escapeHtml(__('Credit Card Number')) ?>"
+                   class="admin__control-text validate-cc-number"
                    value="<?= /* @noEscape */ $block->getInfoData('cc_number') ?>"/>
         </div>
     </div>
@@ -47,18 +49,18 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
         <div class="admin__field-control">
             <select id="<?= /* @noEscape */ $code ?>_expiration" name="payment[cc_exp_month]"
                     class="admin__control-select admin__control-select-month validate-cc-exp required-entry">
-                <?php foreach ($block->getCcMonths() as $k => $v) : ?>
+                <?php foreach ($block->getCcMonths() as $k => $v): ?>
                     <option value="<?= $block->escapeHtml($k) ?>"
-                            <?php if ($k == $ccExpMonth) : ?>selected="selected"<?php endif ?>>
+                            <?php if ($k == $ccExpMonth): ?>selected="selected"<?php endif ?>>
                         <?= $block->escapeHtml($v) ?>
                     </option>
                 <?php endforeach; ?>
             </select>
             <select id="<?= /* @noEscape */ $code ?>_expiration_yr" name="payment[cc_exp_year]"
                     class="admin__control-select admin__control-select-year required-entry">
-                <?php foreach ($block->getCcYears() as $k => $v) : ?>
+                <?php foreach ($block->getCcYears() as $k => $v): ?>
                     <option value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
-                            <?php if ($k == $ccExpYear) : ?>selected="selected"<?php endif ?>>
+                            <?php if ($k == $ccExpYear): ?>selected="selected"<?php endif ?>>
                         <?= $block->escapeHtml($v) ?>
                     </option>
                 <?php endforeach ?>
@@ -66,7 +68,7 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
         </div>
     </div>
 
-    <?php if ($block->hasVerification()) : ?>
+    <?php if ($block->hasVerification()): ?>
         <div class="field-number required admin__field _required">
             <label class="admin__field-label" for="<?= /* @noEscape */ $code ?>_cc_cid">
                 <span><?= $block->escapeHtml(__('Card Verification Number')) ?></span>
@@ -80,3 +82,7 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
         </div>
     <?php endif; ?>
 </fieldset>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    "display:none",
+    'fieldset#payment_form_' . /* @noEscape */ $code
+) ?>
diff --git a/app/code/Magento/Payment/view/adminhtml/templates/transparent/form.phtml b/app/code/Magento/Payment/view/adminhtml/templates/transparent/form.phtml
index 36b8c978c339f..60fbeed2c542f 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/transparent/form.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/transparent/form.phtml
@@ -5,6 +5,8 @@
  */
 
 /** @var \Magento\Payment\Block\Transparent\Form $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+
 $code = $block->escapeHtml($block->getMethodCode());
 $ccType = $block->getInfoData('cc_type');
 $ccExpYear = $block->getInfoData('cc_exp_year');
@@ -17,8 +19,11 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
         allowtransparency="true"
         frameborder="0"
         name="iframeTransparent"
-        style="display: none; width: 100%; background-color: transparent;"
         src="<?= $block->escapeUrl($block->getViewFileUrl('blank.html')) ?>"></iframe>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    "display: none; width: 100%; background-color: transparent;",
+    'iframe#' . /* @noEscape */ $code . '-transparent-iframe'
+) ?>
 <fieldset
     id="payment_form_<?= /* @noEscape */ $code ?>"
     class="admin__fieldset"
@@ -31,9 +36,10 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
         "orderSaveUrl":"<?= $block->escapeUrl($block->getOrderUrl()) ?>",
         "cgiUrl":"<?= $block->escapeUrl($block->getCgiUrl()) ?>",
         "expireYearLength":"<?= $block->escapeHtml($block->getMethodConfigData('cc_year_length')) ?>",
-        "nativeAction":"<?= $block->escapeUrl($block->getUrl('*/*/save', ['_secure' => $block->getRequest()->isSecure()])) ?>"
-      }, "validation":[]}'
-    style="display: none;">
+        "nativeAction":"<?= $block->escapeUrl(
+            $block->getUrl('*/*/save', ['_secure' => $block->getRequest()->isSecure()])
+        ) ?>"
+      }, "validation":[]}'>
     <div class="admin__field _required">
         <label for="<?= /* @noEscape */ $code ?>_cc_type" class="admin__field-label">
             <span><?= $block->escapeHtml(__('Credit Card Type')) ?></span>
@@ -46,9 +52,10 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
                     data-validate='{required:true, "validate-cc-type-select":"#<?= /* @noEscape */ $code ?>_cc_number"}'
                     class="admin__control-select">
                 <option value=""><?= $block->escapeHtml(__('Please Select')) ?></option>
-                <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName) : ?>
+                <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName): ?>
                     <option
-                        value="<?= $block->escapeHtml($typeCode) ?>"<?php if ($typeCode == $ccType) : ?> selected="selected"<?php endif ?>>
+                        value="<?= $block->escapeHtml($typeCode) ?>"
+                        <?php if ($typeCode == $ccType): ?> selected="selected"<?php endif ?>>
                         <?= $block->escapeHtml($typeName) ?>
                     </option>
                 <?php endforeach ?>
@@ -86,10 +93,10 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
                     data-container="<?= /* @noEscape */ $code ?>-cc-month"
                     class="admin__control-select admin__control-select-month"
                     data-validate='{required:true, "validate-cc-exp":"#<?= /* @noEscape */ $code ?>_expiration_yr"}'>
-                <?php foreach ($block->getCcMonths() as $k => $v) : ?>
+                <?php foreach ($block->getCcMonths() as $k => $v): ?>
                     <option
                         value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
-                        <?php if ($k == $ccExpMonth) : ?> selected="selected"<?php endif; ?>>
+                        <?php if ($k == $ccExpMonth): ?> selected="selected"<?php endif; ?>>
                         <?= $block->escapeHtml($v) ?>
                     </option>
                 <?php endforeach ?>
@@ -98,17 +105,17 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
             <select id="<?= /* @noEscape */ $code ?>_expiration_yr" name="payment[cc_exp_year]"
                     class="admin__control-select admin__control-select-year"
                     data-container="<?= /* @noEscape */ $code ?>-cc-year" data-validate='{required:true}'>
-                <?php foreach ($block->getCcYears() as $k => $v) : ?>
+                <?php foreach ($block->getCcYears() as $k => $v): ?>
                     <option
                         value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
-                        <?php if ($k == $ccExpYear) : ?> selected="selected"<?php endif ?>>
+                        <?php if ($k == $ccExpYear): ?> selected="selected"<?php endif ?>>
                         <?= $block->escapeHtml($v) ?>
                     </option>
                 <?php endforeach ?>
             </select>
         </div>
     </div>
-    <?php if ($block->hasVerification()) : ?>
+    <?php if ($block->hasVerification()): ?>
         <div class="admin__field _required field-cvv" id="<?= /* @noEscape */ $code ?>_cc_type_cvv_div">
             <label for="<?= /* @noEscape */ $code ?>_cc_cid" class="admin__field-label">
                 <span><?= $block->escapeHtml(__('Card Verification Number')) ?></span>
@@ -120,19 +127,24 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
                        class="admin__control-text cvv"
                        id="<?= /* @noEscape */ $code ?>_cc_cid" name="payment[cc_cid]"
                        value=""
-                       data-validate='{"required-number":true, "validate-cc-cvn":"#<?= /* @noEscape */ $code ?>_cc_type"}'
+                       data-validate='{"required-number":true, "validate-cc-cvn":"#<?=/* @noEscape */ $code?>_cc_type"}'
                        autocomplete="off"/>
             </div>
         </div>
     <?php endif; ?>
     <?= $block->getChildHtml() ?>
 </fieldset>
-
-<script>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    "display:none",
+    'fieldset#payment_form_' . /* @noEscape */ $code
+) ?>
+<?php $scriptString = <<<script
     /**
      * Disable card server validation in admin
      */
     require(["Magento_Sales/order/create/form"], function () {
-        order.addExcludedPaymentMethod('<?= /* @noEscape */ $code ?>');
+        order.addExcludedPaymentMethod('{$code}');
     });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Payment/view/adminhtml/templates/transparent/iframe.phtml b/app/code/Magento/Payment/view/adminhtml/templates/transparent/iframe.phtml
index ece7106e91236..77d881257f10a 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/transparent/iframe.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/transparent/iframe.phtml
@@ -6,22 +6,39 @@
 
 /**
  * @var \Magento\Payment\Block\Transparent\Iframe $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 $params = $block->getParams();
 
+/** @var \Magento\Framework\Json\Helper\Data $jsonHelper */
+$jsonHelper = $block->getData('jsonHelper');
 ?>
 <html>
 <head>
-<script>
-<?php if (isset($params['redirect'])) : ?>
-    window.location="<?= $block->escapeUrl($params['redirect']) ?>";
-<?php elseif (isset($params['redirect_parent'])) : ?>
-    window.top.location="<?= $block->escapeUrl($params['redirect_parent']) ?>";
-<?php elseif (isset($params['error_msg'])) : ?>
-    window.top.alert(<?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($params['error_msg']) ?>);
-<?php elseif (isset($params['order_success'])) : ?>
-    window.top.location = "<?= $block->escapeUrl($params['order_success']) ?>";
-<?php else : ?>
+    <?php $scriptString = '' ?>
+<?php if (isset($params['redirect'])): ?>
+    <?php $scriptString .= <<<script
+    window.location="{$block->escapeJs($params['redirect'])}";
+script;
+    ?>
+<?php elseif (isset($params['redirect_parent'])): ?>
+    <?php $scriptString .= <<<script
+    window.top.location="{$block->escapeJs($params['redirect_parent'])}";
+script;
+    ?>
+<?php elseif (isset($params['error_msg'])): ?>
+    <?php $encodedErrorMsg = /* @noEscape */ $jsonHelper->jsonEncode($params['error_msg']);
+    $scriptString .= <<<script
+    window.top.alert({$encodedErrorMsg});
+script;
+    ?>
+<?php elseif (isset($params['order_success'])): ?>
+    <?php $scriptString .= <<<script
+    window.top.location = "{$block->escapeJs($params['order_success'])}";
+script;
+    ?>
+<?php else: ?>
+    <?php $scriptString .= <<<script
     var require = window.top.require;
     require(['jquery'], function($) {
         $('#edit_form').trigger('processStop');
@@ -34,8 +51,10 @@ $params = $block->getParams();
 
         $('#edit_form').trigger('realOrder');
     });
+script;
+    ?>
 <?php endif; ?>
-</script>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 </head>
 <body>
 </body>
diff --git a/app/code/Magento/Payment/view/adminhtml/templates/transparent/info.phtml b/app/code/Magento/Payment/view/adminhtml/templates/transparent/info.phtml
index fb06f1a4dbf33..5997648ed5582 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/transparent/info.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/transparent/info.phtml
@@ -6,9 +6,14 @@
 
 /**
  * @var \Magento\Payment\Block\Transparent\Info $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  * @see \Magento\Payment\Block\Transparent\Info
  */
 ?>
-<fieldset id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>" style="display:none" class="fieldset items redirect">
+<fieldset id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>" class="fieldset items redirect">
     <div><?= $block->escapeHtml(__('We\'ll ask for your payment details before you place an order.')) ?></div>
 </fieldset>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    "display:none",
+    'fieldset#payment_form_' . $block->escapeHtml($block->getMethodCode())
+) ?>
diff --git a/app/code/Magento/Payment/view/frontend/templates/form/cc.phtml b/app/code/Magento/Payment/view/frontend/templates/form/cc.phtml
index 5f61a3ee1d400..7ddc89aac4f6c 100644
--- a/app/code/Magento/Payment/view/frontend/templates/form/cc.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/form/cc.phtml
@@ -6,6 +6,7 @@
 
 /**
  * @var \Magento\Payment\Block\Transparent\Form $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 $code = $block->escapeHtml($block->getMethodCode());
 $ccType = $block->getInfoData('cc_type');
@@ -13,7 +14,7 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
 $ccExpYear = $block->getInfoData('cc_exp_year');
 ?>
 <fieldset class="fieldset payment items ccard <?= /* @noEscape */ $code ?>"
-          id="payment_form_<?= /* @noEscape */ $code ?>" style="display: none;">
+          id="payment_form_<?= /* @noEscape */ $code ?>">
     <div class="field type required">
         <label for="<?= /* @noEscape */ $code ?>_cc_type" class="label">
             <span><?= $block->escapeHtml(__('Credit Card Type')) ?></span>
@@ -29,9 +30,9 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
                     }'
                     class="select">
                 <option value=""><?= $block->escapeHtml(__('--Please Select--')) ?></option>
-            <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName) : ?>
+            <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName): ?>
                 <option value="<?= $block->escapeHtml($typeCode) ?>"
-                    <?php if ($typeCode == $ccType) : ?> selected="selected"<?php endif; ?>>
+                    <?php if ($typeCode == $ccType): ?> selected="selected"<?php endif; ?>>
                     <?= $block->escapeHtml($typeName) ?>
                 </option>
             <?php endforeach; ?>
@@ -60,11 +61,14 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
             <div class="fields group group-2">
                 <div class="field no-label month">
                     <div class="control">
-                        <select id="<?= /* @noEscape */ $code ?>_expiration" name="payment[cc_exp_month]" class="select month"
-                                data-validate='{required:true, "validate-cc-exp":"#<?= /* @noEscape */ $code ?>_expiration_yr"}'>
-                            <?php foreach ($block->getCcMonths() as $k => $v) : ?>
+                        <select id="<?= /* @noEscape */ $code ?>_expiration"
+                                name="payment[cc_exp_month]"
+                                class="select month"
+                                data-validate='{required:true, "validate-cc-exp":"#<?= /* @noEscape */ $code
+                                ?>_expiration_yr"}'>
+                            <?php foreach ($block->getCcMonths() as $k => $v): ?>
                                 <option value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
-                                    <?php if ($k == $ccExpMonth) : ?> selected="selected"<?php endif; ?>>
+                                    <?php if ($k == $ccExpMonth): ?> selected="selected"<?php endif; ?>>
                                     <?= $block->escapeHtml($v) ?>
                                 </option>
                             <?php endforeach; ?>
@@ -75,9 +79,9 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
                     <div class="control">
                         <select id="<?= /* @noEscape */ $code ?>_expiration_yr" name="payment[cc_exp_year]"
                                 class="select year" data-validate='{required:true}'>
-                            <?php foreach ($block->getCcYears() as $k => $v) : ?>
+                            <?php foreach ($block->getCcYears() as $k => $v): ?>
                                 <option value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>
-                                "<?php if ($k == $ccExpYear) : ?> selected="selected"<?php endif; ?>>
+                                "<?php if ($k == $ccExpYear): ?> selected="selected"<?php endif; ?>>
                                     <?= $block->escapeHtml($v) ?>
                                 </option>
                             <?php endforeach; ?>
@@ -87,7 +91,7 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
             </div>
         </div>
     </div>
-    <?php if ($block->hasVerification()) : ?>
+    <?php if ($block->hasVerification()): ?>
     <div class="field cvv required" id="<?= /* @noEscape */ $code ?>_cc_type_cvv_div">
         <label for="<?= /* @noEscape */ $code ?>_cc_cid" class="label">
             <span><?= $block->escapeHtml(__('Card Verification Number')) ?></span>
@@ -95,7 +99,7 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
         <div class="control">
             <input type="number" title="<?= $block->escapeHtml(__('Card Verification Number')) ?>"
                    class="input-text cvv" id="<?= /* @noEscape */ $code ?>_cc_cid" name="payment[cc_cid]" value=""
-                   data-validate='{"required-number":true, "validate-cc-cvn":"#<?= /* @noEscape */ $code ?>_cc_type"}' />
+                   data-validate='{"required-number":true, "validate-cc-cvn":"#<?= /* @noEscape */ $code ?>_cc_type"}'/>
             <?php $content = '<img src=\"' . $block->getViewFileUrl('Magento_Checkout::cvv.png') . '\" alt=\"' .
                 $block->escapeHtml(__('Card Verification Number Visual Reference')) .
                 '\" title=\"' . $block->escapeHtml(__('Card Verification Number Visual Reference')) . '\" />'; ?>
@@ -110,3 +114,7 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
     <?php endif; ?>
     <?= $block->getChildHtml() ?>
 </fieldset>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    "display:none",
+    'fieldset#payment_form_' . /* @noEscape */ $code
+) ?>
diff --git a/app/code/Magento/Payment/view/frontend/templates/transparent/form.phtml b/app/code/Magento/Payment/view/frontend/templates/transparent/form.phtml
index 290c8384537fb..b8c2c083a7e98 100644
--- a/app/code/Magento/Payment/view/frontend/templates/transparent/form.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/transparent/form.phtml
@@ -5,6 +5,8 @@
  */
 
 /** @var \Magento\Payment\Block\Transparent\Form $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+
 $code = $block->escapeHtml($block->getMethodCode());
 $ccExpMonth = $block->getInfoData('cc_exp_month');
 $ccExpYear = $block->getInfoData('cc_exp_year');
@@ -17,8 +19,12 @@ $content = '<img src=\"' . $block->escapeUrl($block->getViewFileUrl('Magento_Che
 <!-- IFRAME for request to Payment Gateway -->
 <iframe width="0" height="0" id="<?= /* @noEscape */ $code ?>-transparent-iframe"
         data-container="<?= /* @noEscape */ $code ?>-transparent-iframe" allowtransparency="true"
-        frameborder="0"  name="iframeTransparent" style="display:none;width:100%;background-color:transparent"
+        frameborder="0"  name="iframeTransparent"
         src="<?= $block->escapeUrl($block->getViewFileUrl('blank.html')) ?>"></iframe>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    "display: none; width: 100%; background-color: transparent;",
+    'iframe#' . /* @noEscape */ $code . '-transparent-iframe'
+) ?>
 <form class="form" id="co-transparent-form" action="#" method="post" data-mage-init='{
     "transparent":{
         "controller":"<?= $block->escapeHtml($block->getRequest()->getControllerName()) ?>",
@@ -27,7 +33,9 @@ $content = '<img src=\"' . $block->escapeUrl($block->getViewFileUrl('Magento_Che
         "cgiUrl":"<?= $block->escapeUrl($block->getCgiUrl()) ?>",
         "dateDelim":"<?= $block->escapeHtml($block->getDateDelim()) ?>",
         "cardFieldsMap":<?= $block->escapeHtml($block->getCardFieldsMap()) ?>,
-        "nativeAction":"<?= $block->escapeUrl($block->getUrl('checkout/onepage/saveOrder', ['_secure' => $block->getRequest()->isSecure()])) ?>"
+        "nativeAction":"<?= $block->escapeUrl(
+            $block->getUrl('checkout/onepage/saveOrder', ['_secure' => $block->getRequest()->isSecure()])
+        ) ?>"
     }, "validation":[]}'>
     <fieldset class="fieldset ccard <?= /* @noEscape */ $code ?>" id="payment_form_<?= /* @noEscape */ $code ?>">
         <legend class="legend">
@@ -45,9 +53,9 @@ $content = '<img src=\"' . $block->escapeUrl($block->getViewFileUrl('Magento_Che
                             "validate-cc-type-select":"#<?= /* @noEscape */ $code ?>_cc_number"
                         }'>
                     <option value=""><?= $block->escapeHtml(__('--Please Select--')) ?></option>
-                <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName) : ?>
+                <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName): ?>
                     <option value="<?= $block->escapeHtml($typeCode) ?>"
-                        <?php if ($typeCode == $ccType) : ?> selected="selected"<?php endif; ?>>
+                        <?php if ($typeCode == $ccType): ?> selected="selected"<?php endif; ?>>
                         <?= $block->escapeHtml($typeName) ?></option>
                 <?php endforeach ?>
                 </select>
@@ -83,9 +91,9 @@ $content = '<img src=\"' . $block->escapeUrl($block->getViewFileUrl('Magento_Che
                                         required:true,
                                         "validate-cc-exp":"#<?= /* @noEscape */ $code ?>_expiration_yr"
                                     }'>
-                            <?php foreach ($block->getCcMonths() as $k => $v) : ?>
+                            <?php foreach ($block->getCcMonths() as $k => $v): ?>
                                 <option value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
-                                    <?php if ($k == $ccExpMonth) : ?> selected="selected"<?php endif; ?>>
+                                    <?php if ($k == $ccExpMonth): ?> selected="selected"<?php endif; ?>>
                                     <?= $block->escapeHtml($v) ?>
                                 </option>
                             <?php endforeach ?>
@@ -97,9 +105,9 @@ $content = '<img src=\"' . $block->escapeUrl($block->getViewFileUrl('Magento_Che
                             <select id="<?= /* @noEscape */ $code ?>_expiration_yr" name="payment[cc_exp_year]"
                                     class="year" data-container="<?= /* @noEscape */ $code ?>-cc-year"
                                     data-validate='{required:true}'>
-                            <?php foreach ($block->getCcYears() as $k => $v) : ?>
+                            <?php foreach ($block->getCcYears() as $k => $v): ?>
                                 <option value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
-                                    <?php if ($k == $ccExpYear) : ?> selected="selected"<?php endif; ?>>
+                                    <?php if ($k == $ccExpYear): ?> selected="selected"<?php endif; ?>>
                                     <?= $block->escapeHtml($v) ?>
                                 </option>
                             <?php endforeach ?>
@@ -109,7 +117,7 @@ $content = '<img src=\"' . $block->escapeUrl($block->getViewFileUrl('Magento_Che
                 </div>
             </div>
         </div>
-        <?php if ($block->hasVerification()) : ?>
+        <?php if ($block->hasVerification()): ?>
         <div class="field required cvv" id="<?= /* @noEscape */ $code ?>_cc_type_cvv_div">
             <label for="<?= /* @noEscape */ $code ?>_cc_cid" class="label">
                 <span><?= $block->escapeHtml(__('Card Verification Number')) ?></span>
diff --git a/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml b/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml
index d45f014de08a6..233d932e5f642 100644
--- a/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml
@@ -5,14 +5,20 @@
  */
 
 /** @var \Magento\Payment\Block\Transparent\Iframe $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+
 $params = $block->getParams();
 ?>
 <html>
     <head>
-        <script>
-        <?php if (isset($params['redirect'])) : ?>
-            window.location="<?= $block->escapeUrl($params['redirect']) ?>";
-        <?php elseif (isset($params['redirect_parent'])) : ?>
+        <?php $scriptString = '' ?>
+        <?php if (isset($params['redirect'])): ?>
+            <?php $scriptString .= <<<script
+            window.location="{$block->escapeJs($params['redirect'])}";
+script;
+            ?>
+        <?php elseif (isset($params['redirect_parent'])): ?>
+            <?php $scriptString .= <<<script
             var require = window.parent.require;
             require(
                 [
@@ -21,10 +27,15 @@ $params = $block->getParams();
                 function($) {
                     var parent = window.parent;
                     $(parent).trigger('clearTimeout');
-                    parent.location="<?= $block->escapeUrl($params['redirect_parent']) ?>";
+                    parent.location="{$block->escapeJs($params['redirect_parent'])}";
                 }
             );
-        <?php elseif (isset($params['error_msg'])) : ?>
+script;
+            ?>
+        <?php elseif (isset($params['error_msg'])): ?>
+            <?php
+            $encodedMsg = /* @noEscape */ json_encode($params['error_msg']);
+            $scriptString .= <<<script
             var require = window.parent.require;
             require(
                 [
@@ -33,16 +44,19 @@ $params = $block->getParams();
                     'mage/translate',
                     'Magento_Checkout/js/model/full-screen-loader'
                 ],
-                function($, globalMessageList, $t, fullScreenLoader) {
+                function($, globalMessageList, \$t, fullScreenLoader) {
                     var parent = window.parent;
                     $(parent).trigger('clearTimeout');
                     fullScreenLoader.stopLoader();
                     globalMessageList.addErrorMessage({
-                        message: $t(<?= /* @noEscape */ json_encode($params['error_msg'])?>)
+                        message: \$t({$encodedMsg})
                     });
                 }
             );
-        <?php elseif (isset($params['multishipping'])) : ?>
+script;
+            ?>
+        <?php elseif (isset($params['multishipping'])): ?>
+            <?php $scriptString .= <<<script
             var require = window.parent.require;
             require(
                 [
@@ -54,9 +68,15 @@ $params = $block->getParams();
                     $(parent.document).find('#multishipping-billing-form').submit();
                 }
             );
-        <?php elseif (isset($params['order_success'])) : ?>
-            window.parent.location = "<?= $block->escapeUrl($params['order_success']) ?>";
-        <?php else : ?>
+script;
+            ?>
+        <?php elseif (isset($params['order_success'])): ?>
+            <?php $scriptString .= <<<script
+            window.parent.location = "{$block->escapeJs($params['order_success'])}";
+script;
+            ?>
+        <?php else: ?>
+            <?php $scriptString .= <<<script
             var require = window.parent.require;
             require(
                 [
@@ -85,8 +105,10 @@ $params = $block->getParams();
                     );
                 }
             );
+script;
+            ?>
         <?php endif; ?>
-        </script>
+        <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
     </head>
     <body></body>
 </html>
diff --git a/app/code/Magento/Payment/view/frontend/templates/transparent/info.phtml b/app/code/Magento/Payment/view/frontend/templates/transparent/info.phtml
index 084e1e0ebf329..49c35e844c39a 100644
--- a/app/code/Magento/Payment/view/frontend/templates/transparent/info.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/transparent/info.phtml
@@ -6,11 +6,16 @@
 
 /**
  * @var \Magento\Payment\Block\Transparent\Info $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  * @see \Magento\Payment\Block\Transparent\Info
  */
 ?>
-<fieldset id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>" style="display:none" class="fieldset items redirect">
+<fieldset id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>" class="fieldset items redirect">
     <div>
         <?= $block->escapeHtml(__('We\'ll ask for your payment details before you place an order.')) ?>
     </div>
 </fieldset>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    "display:none",
+    'fieldset#payment_form_' . $block->escapeHtml($block->getMethodCode())
+) ?>
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Hidden.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Hidden.php
index 656d9049b5a40..bf8c563d6ce1d 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Hidden.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Hidden.php
@@ -9,8 +9,29 @@
  */
 namespace Magento\Paypal\Block\Adminhtml\System\Config\Field;
 
+use Magento\Backend\Block\Template\Context;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 class Hidden extends \Magento\Config\Block\System\Config\Form\Field
 {
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
+    /**
+     * @param Context $context
+     * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
+     */
+    public function __construct(Context $context, array $data = [], ?SecureHtmlRenderer $secureRenderer = null)
+    {
+        $secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+        parent::__construct($context, $data, $secureRenderer);
+        $this->secureRenderer = $secureRenderer;
+    }
+
     /**
      * Decorate field row html to be invisible
      *
@@ -20,6 +41,10 @@ class Hidden extends \Magento\Config\Block\System\Config\Form\Field
      */
     protected function _decorateRowHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element, $html)
     {
-        return '<tr id="row_' . $element->getHtmlId() . '" style="display: none;">' . $html . '</tr>';
+        return '<tr id="row_' . $element->getHtmlId() . '" >' . $html . '</tr>' .
+            /* @noEscape */ $this->secureRenderer->renderStyleAsTag(
+                "display: none;",
+                'tr#row_' . $element->getHtmlId()
+            );
     }
 }
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php
index b3a575cc8ea9f..24d7db0058045 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Paypal\Block\Adminhtml\System\Config\Fieldset;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 /**
  * Fieldset renderer for PayPal solution
  */
@@ -15,22 +18,31 @@ class Payment extends \Magento\Config\Block\System\Config\Form\Fieldset
      */
     protected $_backendConfig;
 
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
     /**
      * @param \Magento\Backend\Block\Context $context
      * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param \Magento\Framework\View\Helper\Js $jsHelper
      * @param \Magento\Config\Model\Config $backendConfig
      * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
         \Magento\Backend\Model\Auth\Session $authSession,
         \Magento\Framework\View\Helper\Js $jsHelper,
         \Magento\Config\Model\Config $backendConfig,
-        array $data = []
+        array $data = [],
+        ?SecureHtmlRenderer $secureRenderer = null
     ) {
         $this->_backendConfig = $backendConfig;
-        parent::__construct($context, $authSession, $jsHelper, $data);
+        $secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+        parent::__construct($context, $authSession, $jsHelper, $data, $secureRenderer);
+        $this->secureRenderer = $secureRenderer;
     }
 
     /**
@@ -90,19 +102,20 @@ protected function _getHeaderTitleHtml($element)
             ' class="button action-configure' .
             (empty($groupConfig['paypal_ec_separate']) ? '' : ' paypal-ec-separate') .
             $disabledClassString .
-            '" id="' .
-            $htmlId .
-            '-head" onclick="paypalToggleSolution.call(this, \'' .
-            $htmlId .
-            "', '" .
-            $this->getUrl(
-                'adminhtml/*/state'
-            ) . '\'); return false;"><span class="state-closed">' . __(
+            '" id="' . $htmlId . '-head" >' .
+            '<span class="state-closed">' . __(
                 'Configure'
             ) . '</span><span class="state-opened">' . __(
                 'Close'
             ) . '</span></button>';
 
+        $html .= /* @noEscape */ $this->secureRenderer->renderEventListenerAsTag(
+            'onclick',
+            "paypalToggleSolution.call(this, '" . $htmlId . "', '" . $this->getUrl('adminhtml/*/state') .
+            "'); return false;",
+            'button#' . $htmlId . '-head'
+        );
+
         if (!empty($groupConfig['more_url'])) {
             $html .= '<a class="link-more" href="' . $groupConfig['more_url'] . '" target="_blank">' . __(
                 'Learn More'
@@ -151,6 +164,8 @@ protected function _isCollapseState($element)
     }
 
     /**
+     * Return extra Js.
+     *
      * @param \Magento\Framework\Data\Form\Element\AbstractElement $element
      * @return string
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
diff --git a/app/code/Magento/Paypal/Block/Express/InContext/Component.php b/app/code/Magento/Paypal/Block/Express/InContext/Component.php
index bb5c17a18fe95..d1adf058e3b4f 100644
--- a/app/code/Magento/Paypal/Block/Express/InContext/Component.php
+++ b/app/code/Magento/Paypal/Block/Express/InContext/Component.php
@@ -5,14 +5,16 @@
  */
 namespace Magento\Paypal\Block\Express\InContext;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Paypal\Model\Config;
 use Magento\Paypal\Model\ConfigFactory;
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\Locale\ResolverInterface;
 use Magento\Framework\View\Element\Template\Context;
+use Magento\Framework\Json\Helper\Data as JsonHelper;
 
 /**
- * Class Component
+ * Paypal Express InContext Component.
  *
  * @api
  * @since 100.1.0
@@ -32,15 +34,20 @@ class Component extends Template
     private $config;
 
     /**
-     * @inheritdoc
+     * @param Context $context
      * @param ResolverInterface $localeResolver
+     * @param ConfigFactory $configFactory
+     * @param array $data
+     * @param JsonHelper|null $jsonHelper
      */
     public function __construct(
         Context $context,
         ResolverInterface $localeResolver,
         ConfigFactory $configFactory,
-        array $data = []
+        array $data = [],
+        ?JsonHelper $jsonHelper = null
     ) {
+        $data['jsonHelper'] = $jsonHelper ?? ObjectManager::getInstance()->get(JsonHelper::class);
         parent::__construct($context, $data);
         $this->localeResolver = $localeResolver;
         $this->config = $configFactory->create();
@@ -62,6 +69,8 @@ protected function _toHtml()
     }
 
     /**
+     * Check if is in Context.
+     *
      * @return bool
      */
     private function isInContext()
@@ -70,6 +79,8 @@ private function isInContext()
     }
 
     /**
+     * Return environment.
+     *
      * @return string
      * @since 100.1.0
      */
@@ -79,6 +90,8 @@ public function getEnvironment()
     }
 
     /**
+     * Return locale.
+     *
      * @return string
      * @since 100.1.0
      */
@@ -88,6 +101,8 @@ public function getLocale()
     }
 
     /**
+     * Return merchant id.
+     *
      * @return string
      * @since 100.1.0
      */
@@ -97,6 +112,8 @@ public function getMerchantId()
     }
 
     /**
+     * Check if button is in context.
+     *
      * @return bool
      * @since 100.1.0
      */
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/billing/agreement/form.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/billing/agreement/form.phtml
index 19cebe863b7ef..7413c29fdd59e 100644
--- a/app/code/Magento/Paypal/view/adminhtml/templates/billing/agreement/form.phtml
+++ b/app/code/Magento/Paypal/view/adminhtml/templates/billing/agreement/form.phtml
@@ -4,10 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Paypal\Block\Adminhtml\Billing\Agreement\View\Form $block */
+/**
+ * @var \Magento\Paypal\Block\Adminhtml\Billing\Agreement\View\Form $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
 <?php $code = $block->escapeHtml($block->getMethodCode()) ?>
-<fieldset class="form-list" id="payment_form_<?= /* @noEscape */ $code ?>" style="display:none;">
+<fieldset class="form-list" id="payment_form_<?= /* @noEscape */ $code ?>">
     <div class="admin__field _required">
         <label for="<?= /* @noEscape */ $code ?>_ba_agreement_id" class="admin__field-label">
             <span><?= $block->escapeHtml(__('Billing Agreement')) ?></span>
@@ -17,7 +20,7 @@
                     name="payment[<?= $block->escapeHtml($block->getTransportBAId()) ?>]"
                     class="required-entry admin__control-select">
                 <option value=""><?= $block->escapeHtml(__('Please Select')) ?></option>
-                <?php foreach ($block->getBillingAgreements() as $id => $referenceId) : ?>
+                <?php foreach ($block->getBillingAgreements() as $id => $referenceId): ?>
                     <option value="<?= $block->escapeHtml($id) ?>">
                         <?= $block->escapeHtml($referenceId) ?>
                     </option>
@@ -26,3 +29,7 @@
         </div>
     </div>
 </fieldset>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    'display:none',
+    'fieldset#payment_form_' . /* @noEscape */ $code
+) ?>
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/payment/form/billing/agreement.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/payment/form/billing/agreement.phtml
index a4e7b6974c737..b37bd261ce1a5 100644
--- a/app/code/Magento/Paypal/view/adminhtml/templates/payment/form/billing/agreement.phtml
+++ b/app/code/Magento/Paypal/view/adminhtml/templates/payment/form/billing/agreement.phtml
@@ -4,11 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-/* @var $block \Magento\Paypal\Block\Payment\Form\Billing\Agreement */
+/**
+ * @var $block \Magento\Paypal\Block\Payment\Form\Billing\Agreement
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
 <?php $code = $block->escapeHtml($block->getMethodCode()) ?>
-<fieldset class="admin__fieldset payment-method form-list"
-          id="payment_form_<?= /* @noEscape */ $code ?>" style="display:none;">
+<fieldset class="admin__fieldset payment-method form-list" id="payment_form_<?= /* @noEscape */ $code ?>">
     <div class="admin__field _required">
         <label class="admin__field-label"
                for="<?= /* @noEscape */ $code ?>_ba_agreement_id">
@@ -19,7 +21,7 @@
                     name="payment[<?= $block->escapeHtml($block->getTransportName()) ?>]"
                     class="required-entry admin__control-select">
                 <option value=""><?= $block->escapeHtml(__('Please Select')) ?></option>
-                <?php foreach ($block->getBillingAgreements() as $id => $referenceId) : ?>
+                <?php foreach ($block->getBillingAgreements() as $id => $referenceId): ?>
                     <option value="<?= $block->escapeHtml($id) ?>"
                         <?= ($id == $block->getInfoData($block->getTransportName())) ?
                             ' selected="selected"' : '';
@@ -31,3 +33,7 @@
         </div>
     </div>
 </fieldset>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    'display:none',
+    'fieldset#payment_form_' . /* @noEscape */ $code
+) ?>
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/api_wizard.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/api_wizard.phtml
index f906a08425aa4..0268ab4f4c482 100644
--- a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/api_wizard.phtml
+++ b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/api_wizard.phtml
@@ -7,11 +7,12 @@
 /**
  * @see \Magento\Paypal\Block\Adminhtml\System\Config\ApiWizard
  * @var \Magento\Paypal\Block\Adminhtml\System\Config\ApiWizard $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
 <div class="pp-buttons-container">
-    <div dir="ltr" style="text-align: left;" trbidi="on">
-        <script>
+    <div id="paypal_api_config" dir="ltr" trbidi="on">
+        <?php $scriptString = <<<script
             (function(d, s, id){
                 var js, ref = d.getElementsByTagName(s)[0];
                 if (!d.getElementById(id)){
@@ -19,7 +20,9 @@
                     js.src = "https://www.paypal.com/webapps/merchantboarding/js/lib/lightbox/partner.js";
                     ref.parentNode.insertBefore(js, ref); }
             }(document, "script", "paypal-js"));
-        </script>
+script;
+        ?>
+        <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 
         <a class="action-default"
            data-paypal-button="true"
@@ -32,3 +35,4 @@
            target="PPFrame"><?= $block->escapeHtml($block->getSandboxButtonLabel()) ?></a>
     </div>
 </div>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag("text-align: left;", 'div#paypal_api_config') ?>
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/bml_api_wizard.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/bml_api_wizard.phtml
index 72b7ac86ee056..5b8d12ac20a67 100644
--- a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/bml_api_wizard.phtml
+++ b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/bml_api_wizard.phtml
@@ -7,16 +7,21 @@
 /**
  * @see \Magento\Paypal\Block\Adminhtml\System\Config\BmlApiWizard
  * @var \Magento\Paypal\Block\Adminhtml\System\Config\BmlApiWizard $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
 <div class="pp-buttons-container">
-    <button onclick="javascript:window.open(
-            '<?= $block->escapeUrl($block->getButtonUrl()) ?>',
-            'bmlapiwizard',
-            'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, ,' +
-            'left=100, top=100, width=550, height=550'
-        ); return false;"
-            class="scalable" type="button" id="<?= $block->escapeHtml($block->getHtmlId()) ?>">
+    <button class="scalable" type="button" id="<?= $block->escapeHtml($block->getHtmlId()) ?>">
         <span><span><span><?= $block->escapeHtml($block->getButtonLabel()) ?></span></span></span>
     </button>
 </div>
+<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+    'onclick',
+    "javascript:window.open(
+            '" . $block->escapeUrl($block->getButtonUrl()) . "',
+            'bmlapiwizard',
+            'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, ,' +
+            'left=100, top=100, width=550, height=550'
+        ); return false;",
+    'button#' . $block->escapeHtml($block->getHtmlId())
+) ?>
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/transparent/form.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/transparent/form.phtml
index f4318b40fef1c..98e59f3a066c3 100644
--- a/app/code/Magento/Paypal/view/adminhtml/templates/transparent/form.phtml
+++ b/app/code/Magento/Paypal/view/adminhtml/templates/transparent/form.phtml
@@ -4,7 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Paypal\Block\Adminhtml\Payflowpro\CcForm $block */
+/**
+ * @var \Magento\Paypal\Block\Adminhtml\Payflowpro\CcForm $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 $code = $block->escapeHtml($block->getMethodCode());
 $ccType = $block->getInfoData('cc_type');
 $ccExpYear = $block->getInfoData('cc_exp_year');
@@ -17,8 +20,11 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
         allowtransparency="true"
         frameborder="0"
         name="iframeTransparent"
-        style="display: none; width: 100%; background-color: transparent;"
         src="<?= $block->escapeUrl($block->getViewFileUrl('blank.html')) ?>"></iframe>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    "display: none; width: 100%; background-color: transparent;",
+    "iframe#" . /* @noEscape */ $code . "-transparent-iframe"
+) ?>
 <fieldset
     id="payment_form_<?= /* @noEscape */ $code ?>"
     class="admin__fieldset"
@@ -31,9 +37,10 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
         "orderSaveUrl":"<?= $block->escapeUrl($block->getOrderUrl()) ?>",
         "cgiUrl":"<?= $block->escapeUrl($block->getCgiUrl()) ?>",
         "expireYearLength":"<?= $block->escapeHtml($block->getMethodConfigData('cc_year_length')) ?>",
-        "nativeAction":"<?= $block->escapeUrl($block->getUrl('*/*/save', ['_secure' => $block->getRequest()->isSecure()])) ?>"
-      }, "validation":[]}'
-    style="display: none;">
+        "nativeAction":"<?= $block->escapeUrl(
+            $block->getUrl('*/*/save', ['_secure' => $block->getRequest()->isSecure()])
+        ) ?>"
+      }, "validation":[]}'>
     <div class="admin__field _required">
         <label for="<?= /* @noEscape */ $code ?>_cc_type" class="admin__field-label">
             <span><?= $block->escapeHtml(__('Credit Card Type')) ?></span>
@@ -46,9 +53,10 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
                     data-validate='{required:true, "validate-cc-type-select":"#<?= /* @noEscape */ $code ?>_cc_number"}'
                     class="admin__control-select">
                 <option value=""><?= $block->escapeHtml(__('Please Select')) ?></option>
-                <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName) : ?>
+                <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName): ?>
                     <option
-                        value="<?= $block->escapeHtml($typeCode) ?>"<?php if ($typeCode == $ccType) : ?> selected="selected"<?php endif ?>>
+                        value="<?= $block->escapeHtml($typeCode) ?>"
+                        <?php if ($typeCode == $ccType): ?> selected="selected"<?php endif ?>>
                         <?= $block->escapeHtml($typeName) ?>
                     </option>
                 <?php endforeach ?>
@@ -86,10 +94,10 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
                     data-container="<?= /* @noEscape */ $code ?>-cc-month"
                     class="admin__control-select admin__control-select-month"
                     data-validate='{required:true, "validate-cc-exp":"#<?= /* @noEscape */ $code ?>_expiration_yr"}'>
-                <?php foreach ($block->getCcMonths() as $k => $v) : ?>
+                <?php foreach ($block->getCcMonths() as $k => $v): ?>
                     <option
                         value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
-                        <?php if ($k == $ccExpMonth) : ?> selected="selected"<?php endif; ?>>
+                        <?php if ($k == $ccExpMonth): ?> selected="selected"<?php endif; ?>>
                         <?= $block->escapeHtml($v) ?>
                     </option>
                 <?php endforeach ?>
@@ -98,17 +106,17 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
             <select id="<?= /* @noEscape */ $code ?>_expiration_yr" name="payment[cc_exp_year]"
                     class="admin__control-select admin__control-select-year"
                     data-container="<?= /* @noEscape */ $code ?>-cc-year" data-validate='{required:true}'>
-                <?php foreach ($block->getCcYears() as $k => $v) : ?>
+                <?php foreach ($block->getCcYears() as $k => $v): ?>
                     <option
                         value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
-                        <?php if ($k == $ccExpYear) : ?> selected="selected"<?php endif ?>>
+                        <?php if ($k == $ccExpYear): ?> selected="selected"<?php endif ?>>
                         <?= $block->escapeHtml($v) ?>
                     </option>
                 <?php endforeach ?>
             </select>
         </div>
     </div>
-    <?php if ($block->hasVerification()) : ?>
+    <?php if ($block->hasVerification()): ?>
         <div class="admin__field _required field-cvv" id="<?= /* @noEscape */ $code ?>_cc_type_cvv_div">
             <label for="<?= /* @noEscape */ $code ?>_cc_cid" class="admin__field-label">
                 <span><?= $block->escapeHtml(__('Card Verification Number')) ?></span>
@@ -120,13 +128,13 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
                        class="admin__control-text cvv"
                        id="<?= /* @noEscape */ $code ?>_cc_cid" name="payment[cc_cid]"
                        value=""
-                       data-validate='{"required-number":true, "validate-cc-cvn":"#<?= /* @noEscape */ $code ?>_cc_type"}'
+                       data-validate='{"required-number":true, "validate-cc-cvn":"#<?=/* @noEscape */ $code?>_cc_type"}'
                        autocomplete="off"/>
             </div>
         </div>
     <?php endif; ?>
 
-    <?php if ($block->isVaultEnabled()) : ?>
+    <?php if ($block->isVaultEnabled()): ?>
         <div class="admin__field admin__field-option field-tooltip-content">
             <input type="checkbox"
                    id="<?= /* @noEscape */ $code ?>_vault"
@@ -142,12 +150,18 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
 
     <?= $block->getChildHtml() ?>
 </fieldset>
-
-<script>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    "display: none;",
+    "fieldset#payment_form_" . /* @noEscape */ $code
+) ?>
+<?php $codeNoEscaped = /* @noEscape */ $code;
+$scriptString = <<<script
     /**
      * Disable card server validation in admin
      */
     require(["Magento_Sales/order/create/form"], function () {
-        order.addExcludedPaymentMethod('<?= /* @noEscape */ $code ?>');
+        order.addExcludedPaymentMethod('{$codeNoEscaped}');
     });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/express/in-context/component.phtml b/app/code/Magento/Paypal/view/frontend/templates/express/in-context/component.phtml
index c102b21830de8..8a0412af40b8b 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/express/in-context/component.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/express/in-context/component.phtml
@@ -5,7 +5,10 @@
  */
 use Magento\Paypal\Block\Express\InContext\Minicart\SmartButton;
 
-/** @var \Magento\Paypal\Block\Express\InContext\Component $block */
+/**
+ * @var \Magento\Paypal\Block\Express\InContext\Component $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 
 $configuration = [
     'id' => SmartButton::PAYPAL_BUTTON_ID,
@@ -27,12 +30,20 @@ $configuration = [
 ];
 
 ?>
-<div style="display: none;" id="<?= /* @noEscape */ SmartButton::PAYPAL_BUTTON_ID ?>"></div>
+<div id="<?= /* @noEscape */ SmartButton::PAYPAL_BUTTON_ID ?>"></div>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    "display: none;",
+    'div#' . /* @noEscape */ SmartButton::PAYPAL_BUTTON_ID
+) ?>
+
+<?php /** @var \Magento\Framework\Json\Helper\Data $jsonHelper */
+$jsonHelper = $block->getData('jsonHelper');
+?>
 <script type="text/x-magento-init">
     {
         "*": {
             "Magento_Paypal/js/in-context/express-checkout":
-            <?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($configuration) ?>
+            <?= /* @noEscape */ $jsonHelper->jsonEncode($configuration) ?>
         }
     }
 </script>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/express/review.phtml b/app/code/Magento/Paypal/view/frontend/templates/express/review.phtml
index 8e222ca7eb04d..69c7c8179850a 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/express/review.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/express/review.phtml
@@ -6,12 +6,13 @@
 
 /**
  * @var \Magento\Paypal\Block\Express\Review $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
 <div class="paypal-review view">
     <div class="block block-order-details-view">
         <div class="block-content">
-            <?php if ($block->getShippingAddress()) : ?>
+            <?php if ($block->getShippingAddress()): ?>
                 <div class="box box-order-shipping-method">
                     <strong class="box-title">
                         <span><?= $block->escapeHtml(__('Shipping Method')) ?></span>
@@ -20,17 +21,20 @@
                         <form method="post" id="shipping-method-form"
                               action="<?= $block->escapeUrl($block->getShippingMethodSubmitUrl()) ?>"
                               class="form">
-                            <?php if ($block->canEditShippingMethod()) : ?>
-                                <?php if ($groups = $block->getShippingRateGroups()) : ?>
+                            <?php if ($block->canEditShippingMethod()): ?>
+                                <?php if ($groups = $block->getShippingRateGroups()): ?>
                                     <?php $currentRate = $block->getCurrentShippingRate(); ?>
                                     <div class="field shipping required">
                                         <select name="shipping_method" id="shipping-method" class="select">
-                                            <?php if (!$currentRate) : ?>
-                                                <option value=""><?= $block->escapeHtml(__('Please select a shipping method...')); ?></option>
+                                            <?php if (!$currentRate): ?>
+                                                <option value="">
+                                                    <?= $block->escapeHtml(__('Please select a shipping method...')); ?>
+                                                </option>
                                             <?php endif; ?>
-                                            <?php foreach ($groups as $code => $rates) : ?>
-                                                <optgroup label="<?= $block->escapeHtml($block->getCarrierName($code)); ?>">
-                                                    <?php foreach ($rates as $rate) : ?>
+                                            <?php foreach ($groups as $code => $rates): ?>
+                                                <optgroup label="<?= $block->escapeHtml($block->getCarrierName($code));
+                                                ?>">
+                                                    <?php foreach ($rates as $rate): ?>
                                                         <option value="<?=
                                                                         $block->escapeHtml(
                                                                             $block->renderShippingRateValue($rate)
@@ -39,7 +43,8 @@
                                                             <?= ($currentRate === $rate) ?
                                                                 ' selected="selected"' : '';
                                                             ?>>
-                                                            <?= /* @noEscape */ $block->renderShippingRateOption($rate); ?>
+                                                            <?= /* @noEscape */ $block->renderShippingRateOption($rate);
+                                                            ?>
                                                         </option>
                                                     <?php endforeach; ?>
                                                 </optgroup>
@@ -56,14 +61,14 @@
                                             </button>
                                         </div>
                                     </div>
-                                <?php else : ?>
+                                <?php else: ?>
                                     <p>
                                         <?= $block->escapeHtml(__(
                                             'Sorry, no quotes are available for this order right now.'
                                         )); ?>
                                     </p>
                                 <?php endif; ?>
-                            <?php else : ?>
+                            <?php else: ?>
                                 <p>
                                     <?= /* @noEscape */ $block->renderShippingRateOption(
                                         $block->getCurrentShippingRate()
@@ -85,7 +90,7 @@
                             );?>
                         </address>
                     </div>
-                    <?php if ($block->getCanEditShippingAddress()) : ?>
+                    <?php if ($block->getCanEditShippingAddress()): ?>
                         <div class="box-actions">
                             <a href="<?= $block->escapeUrl($block->getEditUrl()) ?>" class="action edit">
                                 <span><?= $block->escapeHtml(__('Edit')) ?></span>
@@ -102,7 +107,7 @@
                     <img src="https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png"
                          alt="<?= $block->escapeHtml(__('Buy now with PayPal')) ?>"/>
                 </div>
-            <?php if ($block->getEditUrl()) : ?>
+            <?php if ($block->getEditUrl()): ?>
                 <div class="box-actions">
                     <a href="<?= $block->escapeUrl($block->getEditUrl()) ?>" class="action edit">
                         <span><?= $block->escapeHtml(__('Edit Payment Information')) ?></span>
@@ -137,10 +142,11 @@
                         <span><?= $block->escapeHtml(__('Place Order')) ?></span>
                     </button>
                 </div>
-                <span class="please-wait load indicator" id="review-please-wait" style="display: none;"
+                <span class="please-wait load indicator" id="review-please-wait"
                       data-text="<?= $block->escapeHtml(__('Submitting order information...')) ?>">
                    <span><?= $block->escapeHtml(__('Submitting order information...')) ?></span>
                 </span>
+                <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display: none;", 'span#review-please-wait')?>
             </div>
         </form>
     </div>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/express/review/shipping/method.phtml b/app/code/Magento/Paypal/view/frontend/templates/express/review/shipping/method.phtml
index 839d278ed227c..826628c5cbc63 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/express/review/shipping/method.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/express/review/shipping/method.phtml
@@ -4,22 +4,25 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Paypal\Block\Express\Review */
+/**
+ * @var $block \Magento\Paypal\Block\Express\Review
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
 <div id="shipping-method-container">
-    <?php if ($block->getCanEditShippingMethod() || !$block->getCurrentShippingRate()) : ?>
-        <?php if ($groups = $block->getShippingRateGroups()) : ?>
+    <?php if ($block->getCanEditShippingMethod() || !$block->getCurrentShippingRate()): ?>
+        <?php if ($groups = $block->getShippingRateGroups()): ?>
             <?php $currentRate = $block->getCurrentShippingRate(); ?>
             <select name="shipping_method" id="shipping_method" class="required-entry">
-                <?php if (!$currentRate) : ?>
+                <?php if (!$currentRate): ?>
                     <option value="">
                         <?= $block->escapeHtml(__('Please select a shipping method...')) ?>
                     </option>
                 <?php endif; ?>
-                <?php foreach ($groups as $code => $rates) : ?>
-                    <optgroup label="<?= $block->escapeHtml($block->getCarrierName($code)) ?>"
-                              style="font-style:normal;">
-                        <?php foreach ($rates as $rate) : ?>
+                <?php foreach ($groups as $code => $rates): ?>
+                    <optgroup id="group_<?= /* @noEscape */ $code ?>"
+                              label="<?= $block->escapeHtml($block->getCarrierName($code)) ?>">
+                        <?php foreach ($rates as $rate): ?>
                             <option
                                 value="<?= $block->escapeHtml($block->renderShippingRateValue($rate)) ?>"
                                     <?= ($currentRate === $rate) ? ' selected="selected"' : '' ?>>
@@ -27,16 +30,20 @@
                             </option>
                         <?php endforeach; ?>
                     </optgroup>
+                    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                        'font-style:normal;',
+                        'optgroup#group_' . /* @noEscape */ $code
+                    ) ?>
                 <?php endforeach; ?>
             </select>
-        <?php else : ?>
+        <?php else: ?>
             <p>
                 <strong>
                     <?= $block->escapeHtml(__('Sorry, no quotes are available for this order right now.')) ?>
                 </strong>
             </p>
         <?php endif; ?>
-    <?php else : ?>
+    <?php else: ?>
         <p>
             <strong>
                 <?= /* @noEscape */ $block->renderShippingRateOption($block->getCurrentShippingRate()) ?>
@@ -44,6 +51,10 @@
         </p>
     <?php endif; ?>
 </div>
-<div style="display: none" id="shipping_method_update">
+<div id="shipping_method_update">
     <p><?= $block->escapeHtml(__('Please update order data to get shipping methods and rates')) ?></p>
 </div>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    'display:none',
+    'div#shipping_method_update'
+) ?>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/hss/form.phtml b/app/code/Magento/Paypal/view/frontend/templates/hss/form.phtml
index ec6f7b4ad985e..036ebb49d4eff 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/hss/form.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/hss/form.phtml
@@ -8,6 +8,7 @@
 
 /**
  * @var \Magento\Paypal\Block\Payflow\Link\Iframe $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  * @see \Magento\Paypal\Block\Payflow\Link\Iframe
  */
 ?>
@@ -20,8 +21,10 @@
     <input type="hidden" name="SECURETOKENID" value="<?= $block->escapeHtml($block->getSecureTokenId()) ?>"/>
     <input type="hidden" name="MODE" value="<?= /* @noEscape */ $block->isTestMode() ? 'TEST' : 'LIVE' ?>"/>
 </form>
-<script>
+<?php $scriptString = <<<script
     document.getElementById('token_form').submit();
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 </body>
 </html>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/hss/info.phtml b/app/code/Magento/Paypal/view/frontend/templates/hss/info.phtml
index c2339f85b7ca5..d8bdf9b183b68 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/hss/info.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/hss/info.phtml
@@ -6,11 +6,15 @@
 
 /**
  * @var \Magento\Paypal\Block\Payment\Info $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
-<div id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>"
-     style="display:none" class="hss items">
+<div id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>" class="hss items">
     <?= $block->escapeHtml(__(
         'You will be required to enter your payment details after you place an order.'
     )); ?>
 </div>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    'display:none',
+    'div#payment_form_' . $block->escapeHtml($block->getMethodCode())
+) ?>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/partner/logo.phtml b/app/code/Magento/Paypal/view/frontend/templates/partner/logo.phtml
index f0f672492270a..8502fb02deb8b 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/partner/logo.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/partner/logo.phtml
@@ -7,6 +7,7 @@
 
 /**
  * @var \Magento\Paypal\Block\Logo $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  * @see \Magento\Paypal\Block\Logo
  */
 ?>
@@ -14,11 +15,6 @@
 <div class="block paypal acceptance">
     <div class="block-content">
         <a href="#" title="<?= $block->escapeHtml(__('Additional Options')) ?>"
-           onclick="javascript:window.open(
-               '<?= $block->escapeUrl($block->getAboutPaypalPageUrl()) ?>',
-               'paypal',
-               'width=600,height=350,left=0,top=0,location=no,status=yes,scrollbars=yes,resizable=yes'
-               ); return false;"
            class="action paypal additional">
             <img src="<?= $block->escapeUrl($block->getLogoImageUrl()) ?>"
                  alt="<?= $block->escapeHtml(__('Additional Options')) ?>"
@@ -26,3 +22,12 @@
         </a>
     </div>
 </div>
+<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+    'onclick',
+    "javascript:window.open(
+               '" . $block->escapeUrl($block->getAboutPaypalPageUrl()) . "',
+               'paypal',
+               'width=600,height=350,left=0,top=0,location=no,status=yes,scrollbars=yes,resizable=yes'
+               ); return false;",
+    'div.block.paypal.acceptance div.block-content a.action.paypal.additional'
+) ?>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/payflowadvanced/form.phtml b/app/code/Magento/Paypal/view/frontend/templates/payflowadvanced/form.phtml
index e643acac297e9..4491b8c09603e 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/payflowadvanced/form.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/payflowadvanced/form.phtml
@@ -6,6 +6,7 @@
 
 /**
  * @var \Magento\Paypal\Block\Payflow\Advanced\Iframe $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
 <html>
@@ -17,8 +18,10 @@
     <input type="hidden" name="SECURETOKENID" value="<?= $block->escapeHtml($block->getSecureTokenId()) ?>"/>
     <input type="hidden" name="MODE" value="<?= /* @noEscape */ $block->isTestMode() ? 'TEST' : 'LIVE' ?>"/>
 </form>
-<script>
+<?php $scriptString = <<<script
     document.getElementById('token_form').submit();
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 </body>
 </html>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/payflowadvanced/info.phtml b/app/code/Magento/Paypal/view/frontend/templates/payflowadvanced/info.phtml
index d5944a6f22f5f..8e11186d43e6c 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/payflowadvanced/info.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/payflowadvanced/info.phtml
@@ -6,11 +6,16 @@
 
 /**
  * @var \Magento\Paypal\Block\Payflow\Advanced\Form $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
-<fieldset id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>" style="display:none"
+<fieldset id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>"
           class="fieldset payflowadvanced items redirect">
     <div>
         <?= $block->escapeHtml(__('You will be required to enter your payment details after you place an order.')) ?>
     </div>
 </fieldset>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    'display:none',
+    'fieldset#payment_form_' . $block->escapeHtml($block->getMethodCode())
+) ?>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/payflowlink/form.phtml b/app/code/Magento/Paypal/view/frontend/templates/payflowlink/form.phtml
index cef3e2f0565ba..839ded13ae680 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/payflowlink/form.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/payflowlink/form.phtml
@@ -8,6 +8,7 @@
 
 /**
  * @var \Magento\Paypal\Block\Payflow\Link\Iframe $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  * @see \Magento\Paypal\Block\Payflow\Link\Iframe
  */
 ?>
@@ -20,8 +21,10 @@
     <input type="hidden" name="SECURETOKENID" value="<?= $block->escapeHtml($block->getSecureTokenId()) ?>"/>
     <input type="hidden" name="MODE" value="<?= /* @noEscape */ $block->isTestMode() ? 'TEST' : 'LIVE' ?>"/>
 </form>
-<script>
+<?php $scriptString = <<<script
     document.getElementById('token_form').submit();
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 </body>
 </html>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/payflowlink/info.phtml b/app/code/Magento/Paypal/view/frontend/templates/payflowlink/info.phtml
index cbd4a8ba715e7..3d17b24f53e61 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/payflowlink/info.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/payflowlink/info.phtml
@@ -6,9 +6,13 @@
 
 /**
  * @var \Magento\Paypal\Block\Payflow\Link\Form $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
-<div class="payflowlink items" id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>"
-     style="display:none">
+<div class="payflowlink items" id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>">
     <?= $block->escapeHtml(__('You will be required to enter your payment details after you place an order.')) ?>
 </div>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    'display:none',
+    'div#payment_form_' . $block->escapeHtml($block->getMethodCode())
+) ?>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/payflowlink/redirect.phtml b/app/code/Magento/Paypal/view/frontend/templates/payflowlink/redirect.phtml
index 75cc2a09e9444..30eeb7ca082e3 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/payflowlink/redirect.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/payflowlink/redirect.phtml
@@ -8,13 +8,14 @@
 
 /**
  * @var \Magento\Paypal\Block\Payflow\Link\Iframe $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
 <html>
 <head>
 </head>
 <body>
-<script>
+<?php $scriptString= <<<script
     (function() {
         'use strict';
 
@@ -29,13 +30,13 @@
             }
         }
 
-        var cartUrl = '<?= $block->escapeUrl($block->getUrl('checkout/cart')) ?>',
-            successUrl = '<?= $block->escapeUrl($block->getUrl('checkout/onepage/success')) ?>',
-            goToSuccessPage = '<?= $block->escapeUrl($block->getGotoSuccessPage()) ?>',
+        var cartUrl = '{$block->escapeJs($block->getUrl('checkout/cart'))}',
+            successUrl = '{$block->escapeJs($block->getUrl('checkout/onepage/success'))}',
+            goToSuccessPage = '{$block->escapeUrl($block->getGotoSuccessPage())}',
             require = window.top.require,
             windowContext = window,
             errorMessage = {
-                message: '<?= $block->escapeHtml($block->getErrorMsg()) ?>'
+                message: '{$block->escapeJs($block->getErrorMsg())}'
             };
 
         if(typeof(require) == "undefined") {
@@ -51,6 +52,8 @@
 
 
     })();
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 </body>
 </html>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/payment/form/billing/agreement.phtml b/app/code/Magento/Paypal/view/frontend/templates/payment/form/billing/agreement.phtml
index 75ee08111bd7a..85f627ad5509b 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/payment/form/billing/agreement.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/payment/form/billing/agreement.phtml
@@ -6,10 +6,11 @@
 
 /**
  * @var \Magento\Paypal\Block\Payment\Form\Billing\Agreement $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 $code = $block->escapeHtml($block->getMethodCode());
 ?>
-<div class="field items required" id="payment_form_<?= /* @noEscape */ $code ?>" style="display:none;">
+<div class="field items required" id="payment_form_<?= /* @noEscape */ $code ?>">
     <label for="<?= /* @noEscape */ $code ?>_ba_agreement_id" class="label">
         <span><?= $block->escapeHtml(__('Billing Agreement')) ?></span>
     </label>
@@ -17,7 +18,7 @@ $code = $block->escapeHtml($block->getMethodCode());
         <select id="<?= /* @noEscape */ $code ?>_ba_agreement_id"
                 name="payment[<?= $block->escapeHtml($block->getTransportName()) ?>]" class="select">
             <option value=""><?= $block->escapeHtml(__('-- Please Select Billing Agreement--')) ?></option>
-            <?php foreach ($block->getBillingAgreements() as $id => $referenceId) : ?>
+            <?php foreach ($block->getBillingAgreements() as $id => $referenceId): ?>
                 <option value="<?= $block->escapeHtml($id) ?>">
                     <?= $block->escapeHtml($referenceId) ?>
                 </option>
@@ -25,3 +26,4 @@ $code = $block->escapeHtml($block->getMethodCode());
         </select>
     </div>
 </div>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display:none;", 'div#payment_form_' . /* @noEscape */ $code) ?>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/payment/mark.phtml b/app/code/Magento/Paypal/view/frontend/templates/payment/mark.phtml
index d9fb5fb43bcc7..5da5d7156baba 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/payment/mark.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/payment/mark.phtml
@@ -7,6 +7,7 @@
 /**
  * Note: This mark is a requirement of PayPal
  * @var \Magento\Paypal\Block\Express\Form $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  * @see \Magento\Paypal\Block\Express\Form
  */
 $url = $block->escapeUrl($block->getPaymentAcceptanceMarkHref());
@@ -14,18 +15,21 @@ $url = $block->escapeUrl($block->getPaymentAcceptanceMarkHref());
 <!-- PayPal Logo -->
 <img src="<?= $block->escapeUrl($block->getPaymentAcceptanceMarkSrc()) ?>"
      alt="<?= $block->escapeHtml(__('Acceptance Mark')) ?>" class="paypal icon"/>
-<a href="<?= /* @noEscape */ $url ?>"
-   onclick="javascript:window.open(
-           '<?= /* @noEscape */ $url ?>',
-           'olcwhatispaypal',
-           'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, ,' +
-           'left=0, top=0, width=400, height=350'
-       ); return false;"
-   class="action paypal about">
+<a href="<?= /* @noEscape */ $url ?>" class="action paypal about">
     <?php if ($block->getPaymentWhatIs()) {
         echo $block->escapeHtml(__($block->getPaymentWhatIs()));
-} else {
+    } else {
         echo $block->escapeHtml(__('What is PayPal?'));
-} ?>
+    } ?>
 </a>
+<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+    'onclick',
+    "javascript:window.open(
+           '" . /* @noEscape */ $url . "',
+           'olcwhatispaypal',
+           'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, ,' +
+           'left=0, top=0, width=400, height=350'
+       ); return false;",
+    'a.action.paypal.about'
+) ?>
 <!-- PayPal Logo -->
diff --git a/app/code/Magento/Paypal/view/frontend/templates/payment/redirect.phtml b/app/code/Magento/Paypal/view/frontend/templates/payment/redirect.phtml
index 683153b12db7a..a123f9b9ed7dc 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/payment/redirect.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/payment/redirect.phtml
@@ -6,15 +6,15 @@
 
 /**
  * @var \Magento\PayPal\Block\Express\Form $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  * @see \Magento\PayPal\Block\Express\Form
  */
 $code = $block->escapeHtml($block->getBillingAgreementCode());
 ?>
-<fieldset class="fieldset paypal items redirect" style="display:none;"
-          id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>">
+<fieldset class="fieldset paypal items redirect" id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>">
     <div><?= $block->escapeHtml($block->getRedirectMessage()) ?></div>
     <?php  ?>
-    <?php if ($code) : ?>
+    <?php if ($code): ?>
         <input type="checkbox" id="<?= /* @noEscape */ $code ?>" value="1" class="checkbox"
                name="payment[<?= /* @noEscape */ $code ?>]">
         <label for="<?= /* @noEscape */ $code ?>" class="label">
@@ -24,3 +24,7 @@ $code = $block->escapeHtml($block->getBillingAgreementCode());
         </label>
     <?php endif; ?>
 </fieldset>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    'display:none',
+    'fieldset#payment_form_' . $block->escapeHtml($block->getMethodCode())
+) ?>
diff --git a/app/code/Magento/ProductVideo/view/adminhtml/templates/helper/gallery.phtml b/app/code/Magento/ProductVideo/view/adminhtml/templates/helper/gallery.phtml
index 1548770d4032f..b729eadf122c5 100644
--- a/app/code/Magento/ProductVideo/view/adminhtml/templates/helper/gallery.phtml
+++ b/app/code/Magento/ProductVideo/view/adminhtml/templates/helper/gallery.phtml
@@ -4,12 +4,15 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Files.LineLength
-// phpcs:disable Magento2.Templates.ThisInTemplate
-
-/** @var $block \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery\Content */
+/**
+ * @var $block \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery\Content
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 $elementNameEscaped = $block->escapeHtmlAttr($block->getElement()->getName()) . '[images]';
 $formNameEscaped = $block->escapeHtmlAttr($block->getFormName());
+
+/** @var \Magento\Framework\Json\Helper\Data $jsonHelper */
+$jsonHelper = $block->getData('jsonHelper');
 ?>
 
 <div class="row">
@@ -28,16 +31,17 @@ $formNameEscaped = $block->escapeHtmlAttr($block->getFormName());
 <?php
 /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery\Content */
 $element = $block->getElement();
-$elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'toggleValueElements(this, this.parentNode.parentNode.parentNode)';
+$elementToggleCode = $element->getToggleCode() ? $element->getToggleCode():
+    'toggleValueElements(this, this.parentNode.parentNode.parentNode)';
 ?>
 <div id="<?= $block->escapeHtmlAttr($block->getHtmlId()) ?>"
      class="gallery"
      data-mage-init='{"openVideoModal":{}}'
      data-parent-component="<?= $block->escapeHtml($block->getData('config/parentComponent')) ?>"
      data-images="<?= $block->escapeHtmlAttr($block->getImagesJson()) ?>"
-     data-types='<?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getImageTypes()) ?>'
+     data-types='<?= /* @noEscape */ $jsonHelper->jsonEncode($block->getImageTypes()) ?>'
 >
-    <?php if (!$block->getElement()->getReadonly()) : ?>
+    <?php if (!$block->getElement()->getReadonly()): ?>
         <div class="image image-placeholder">
             <?= $block->getUploaderHtml(); ?>
             <div class="product-image-wrapper">
@@ -48,15 +52,17 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
         </div>
         <?= $block->getChildHtml('additional_buttons') ?>
     <?php endif; ?>
-    <?php foreach ($block->getImageTypes() as $typeData) : ?>
+    <?php foreach ($block->getImageTypes() as $typeData): ?>
         <input name="<?= $block->escapeHtmlAttr($typeData['name']) ?>"
                data-form-part="<?= /* @noEscape */ $formNameEscaped ?>"
                class="image-<?= $block->escapeHtmlAttr($typeData['code']) ?>"
                type="hidden"
                value="<?= $block->escapeHtmlAttr($typeData['value']) ?>"/>
     <?php endforeach; ?>
-    <script id="<?= $block->escapeHtmlAttr($block->getHtmlId()) ?>-template" data-template="image" type="text/x-magento-template">
-        <div class="image item <% if (data.disabled == 1) { %>hidden-for-front<% } %>  <% if (data.video_url) { %>video-item<% } %>"
+    <script id="<?= $block->escapeHtmlAttr($block->getHtmlId()) ?>-template" data-template="image"
+            type="text/x-magento-template">
+        <div class="image item <% if (data.disabled == 1) { %>hidden-for-front<% } %>
+                <% if (data.video_url) { %>video-item<% } %>"
              data-role="image">
             <input type="hidden"
                    name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][position]"
@@ -164,8 +170,9 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
             </div>
 
             <ul class="item-roles" data-role="roles-labels">
-                <?php foreach ($block->getImageTypes() as $typeData) : ?>
-                    <li data-role-code="<?= $block->escapeHtmlAttr($typeData['code']) ?>" class="item-role item-role-<?= $block->escapeHtmlAttr($typeData['code']) ?>">
+                <?php foreach ($block->getImageTypes() as $typeData): ?>
+                    <li data-role-code="<?= $block->escapeHtmlAttr($typeData['code']) ?>"
+                        class="item-role item-role-<?= $block->escapeHtmlAttr($typeData['code']) ?>">
                         <?= $block->escapeHtml($typeData['label']) ?>
                     </li>
                 <?php endforeach; ?>
@@ -195,7 +202,8 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
                             <textarea data-role="image-description"
                                       rows="3"
                                       class="admin__control-textarea"
-                                      name="<?= /* @noEscape */ $elementNameEscaped ?>[<%- data.file_id %>][label]"><%- data.label %></textarea>
+                                      name="<?= /* @noEscape */ $elementNameEscaped
+                                        ?>[<%- data.file_id %>][label]"><%- data.label %></textarea>
                     </div>
                 </div>
 
@@ -206,7 +214,7 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
                     <div class="admin__field-control">
                         <ul class="multiselect-alt">
                             <?php
-                            foreach ($block->getMediaAttributes() as $attribute) :
+                            foreach ($block->getMediaAttributes() as $attribute):
                                 ?>
                                 <li class="item">
                                     <label>
@@ -235,7 +243,8 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
                     <label class="admin__field-label">
                         <span><?= $block->escapeHtml(__('Image Resolution')) ?></span>
                     </label>
-                    <div class="admin__field-value" data-message="<?= $block->escapeHtmlAttr(__('{width}^{height} px')) ?>"></div>
+                    <div class="admin__field-value" data-message="<?= $block->escapeHtmlAttr(__('{width}^{height} px'))
+                    ?>"></div>
                 </div>
 
                 <div class="admin__field field-image-hide">
@@ -259,7 +268,7 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
             </fieldset>
         </div>
     </script>
-    <div id="<?= /* @noEscape */ $block->getNewVideoBlockName() ?>" style="display:none">
+    <div id="new_video_<?= /* @noEscape */ $block->getNewVideoBlockName() ?>">
         <?= $block->getFormHtml() ?>
         <div id="video-player-preview-location" class="video-player-sidebar">
             <div class="video-player-container"></div>
@@ -277,9 +286,11 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
             </div>
         </div>
     </div>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+        'display:none',
+        'div#new_video_' . /* @noEscape */ $block->getNewVideoBlockName()
+    ) ?>
 
     <?= $block->getChildHtml('new-video') ?>
 </div>
-<script>
-    jQuery('body').trigger('contentUpdated');
-</script>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], "jQuery('body').trigger('contentUpdated');", false) ?>
diff --git a/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/base_image.phtml b/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/base_image.phtml
index e1dcab9e8b2d4..8c40c174c9787 100644
--- a/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/base_image.phtml
+++ b/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/base_image.phtml
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <div class="row">
     <div class="add-video-button-container">
@@ -11,10 +13,14 @@
             title="<?= $block->escapeHtmlAttr($addVideoTitle) ?>"
             type="button"
             class="action-secondary"
-            onclick="jQuery('#new-video').modal('openModal'); jQuery('#new_video_form')[0].reset();"
             data-ui-id="widget-button-1">
             <span><?= $block->escapeHtml(__('Add Video')) ?></span>
         </button>
+        <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+            'onclick',
+            "jQuery('#new-video').modal('openModal'); jQuery('#new_video_form')[0].reset();",
+            'button#add_video_button'
+        ) ?>
     </div>
 </div>
 <div id="<?= $block->escapeHtmlAttr($htmlId) ?>-container"
@@ -62,7 +68,7 @@
 <span class="action-manage-images" data-activate-tab="image-management">
     <span><?= $block->escapeHtml($imageManagementText) ?></span>
 </span>
-<script>
+<?php $scriptString = <<<script
     require([
         'jquery'
     ],function($){
@@ -74,4 +80,6 @@
                 $('#product_info_tabs_image-management').trigger('click');
             });
     });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/slideout/form.phtml b/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/slideout/form.phtml
index 7de3042b56ab5..05b274d56402d 100644
--- a/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/slideout/form.phtml
+++ b/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/slideout/form.phtml
@@ -3,9 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-/* @var Magento\ProductVideo\Block\Adminhtml\Product\Edit\NewVideo $block */
+/**
+ * @var Magento\ProductVideo\Block\Adminhtml\Product\Edit\NewVideo $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
-<div id="<?= $block->escapeHtmlAttr($block->getNameInLayout()) ?>" style="display:none"
+<div id="video_name_<?= $block->escapeHtmlAttr($block->getNameInLayout()) ?>"
     data-modal-info='<?= /* @noEscape */ $block->getWidgetOptions() ?>'
 >
     <?= $block->getFormHtml() ?>
@@ -25,3 +28,7 @@
         </div>
     </div>
 </div>
+<?= /* @noEscape */ $secureRenderer->renderTag(
+    'display:none',
+    'div#video_name_' . $block->escapeHtmlAttr($block->getNameInLayout())
+) ?>
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Items/Column/Name.php b/app/code/Magento/Sales/Block/Adminhtml/Items/Column/Name.php
index 87c15e474d11f..10d58e1f312c4 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Items/Column/Name.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Items/Column/Name.php
@@ -5,7 +5,9 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Items\Column;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Filter\TruncateFilter\Result;
+use Magento\Catalog\Helper\Data as CatalogHelper;
 
 /**
  * Sales Order items name column renderer
@@ -15,6 +17,28 @@
  */
 class Name extends \Magento\Sales\Block\Adminhtml\Items\Column\DefaultColumn
 {
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
+     * @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
+     * @param \Magento\Framework\Registry $registry
+     * @param \Magento\Catalog\Model\Product\OptionFactory $optionFactory
+     * @param array $data
+     * @param CatalogHelper|null $catalogHelper
+     */
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry,
+        \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration,
+        \Magento\Framework\Registry $registry,
+        \Magento\Catalog\Model\Product\OptionFactory $optionFactory,
+        array $data = [],
+        ?CatalogHelper $catalogHelper = null
+    ) {
+        $data['catalogHelper'] = $catalogHelper ?? ObjectManager::getInstance()->get(CatalogHelper::class);
+        parent::__construct($context, $stockRegistry, $stockConfiguration, $registry, $optionFactory, $data);
+    }
+
     /**
      * @var Result
      */
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage.php
index b314ee24c3e27..6a1c16cd5d73a 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Giftmessage.php
@@ -50,6 +50,7 @@ public function __construct(
     ) {
         $this->_messageHelper = $messageHelper;
         $this->_giftMessageSave = $giftMessageSave;
+        $data['giftMessageHelper'] = $messageHelper;
         parent::__construct($context, $sessionQuote, $orderCreate, $priceCurrency, $data);
     }
 
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php
index 8a427a30a6c7a..9adfd0407a9ba 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php
@@ -8,9 +8,11 @@
 use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
 use Magento\CatalogInventory\Api\StockRegistryInterface;
 use Magento\CatalogInventory\Api\StockStateInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Quote\Model\Quote\Item;
+use Magento\Catalog\Helper\Data as CatalogHelper;
 
 /**
  * Adminhtml sales order create items grid block
@@ -85,6 +87,7 @@ class Grid extends \Magento\Sales\Block\Adminhtml\Order\Create\AbstractCreate
      * @param StockRegistryInterface $stockRegistry
      * @param StockStateInterface $stockState
      * @param array $data
+     * @param CatalogHelper|null $catalogHelper
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -99,7 +102,8 @@ public function __construct(
         \Magento\GiftMessage\Helper\Message $messageHelper,
         StockRegistryInterface $stockRegistry,
         StockStateInterface $stockState,
-        array $data = []
+        array $data = [],
+        ?CatalogHelper $catalogHelper = null
     ) {
         $this->_messageHelper = $messageHelper;
         $this->_wishlistFactory = $wishlistFactory;
@@ -108,6 +112,7 @@ public function __construct(
         $this->_taxData = $taxData;
         $this->stockRegistry = $stockRegistry;
         $this->stockState = $stockState;
+        $data['catalogHelper'] = $catalogHelper ?? ObjectManager::getInstance()->get(CatalogHelper::class);
         parent::__construct($context, $sessionQuote, $orderCreate, $priceCurrency, $data);
     }
 
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method/Form.php
index 1fd1c28c20727..0b926e8415e41 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method/Form.php
@@ -52,6 +52,7 @@ public function __construct(
         array $data = []
     ) {
         $this->_taxData = $taxData;
+        $data['taxHelper'] = $this->_taxData;
         parent::__construct($context, $sessionQuote, $orderCreate, $priceCurrency, $data);
     }
 
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml
index c9b2f7c8de254..a3904ac09c6b4 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml
@@ -4,41 +4,64 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Templates.ThisInTemplate
 ?>
 <?php
-/* @var $block \Magento\Sales\Block\Adminhtml\Items\Column\Name */
+/**
+ * @var $block \Magento\Sales\Block\Adminhtml\Items\Column\Name
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
+?>
+
+<?php
+/** @var \Magento\Catalog\Helper\Data $catalogHelper */
+$catalogHelper = $block->getData('catalogHelper');
 ?>
-<?php if ($_item = $block->getItem()) : ?>
+<?php if ($_item = $block->getItem()): ?>
     <div id="order_item_<?= (int) $_item->getId() ?>_title"
          class="product-title">
         <?= $block->escapeHtml($_item->getName()) ?>
     </div>
     <div class="product-sku-block">
-        <span><?= $block->escapeHtml(__('SKU'))?>:</span> <?= /* @noEscape */ implode('<br />', $this->helper(\Magento\Catalog\Helper\Data::class)->splitSku($block->escapeHtml($block->getSku()))) ?>
+        <span><?= $block->escapeHtml(__('SKU'))?>:</span>
+        <?= /* @noEscape */ implode('<br />', $catalogHelper->splitSku($block->escapeHtml($block->getSku()))) ?>
     </div>
 
-    <?php if ($block->getOrderOptions()) : ?>
+    <?php if ($block->getOrderOptions()): ?>
         <dl class="item-options">
-            <?php foreach ($block->getOrderOptions() as $_option) : ?>
+            <?php foreach ($block->getOrderOptions() as $_option): ?>
                 <dt><?= $block->escapeHtml($_option['label']) ?>:</dt>
                 <dd>
-                    <?php if (isset($_option['custom_view']) && $_option['custom_view']) : ?>
+                    <?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
                         <?= /* @noEscape */ $block->getCustomizedOptionValue($_option) ?>
-                    <?php else : ?>
+                    <?php else: ?>
                         <?php $_option = $block->getFormattedOption($_option['value']); ?>
                         <?php $dots = 'dots' . uniqid(); ?>
                         <?php $id = 'id' . uniqid(); ?>
-                        <?= $block->escapeHtml($_option['value'], ['a', 'br']) ?><?php if (isset($_option['remainder']) && $_option['remainder']) : ?><span id="<?= /* @noEscape */ $dots; ?>"> ...</span><span id="<?= /* @noEscape */ $id; ?>"><?= $block->escapeHtml($_option['remainder'], ['a']) ?></span>
-                            <script>
+                        <?= $block->escapeHtml($_option['value'], ['a', 'br']) ?>
+                        <?php if (isset($_option['remainder']) && $_option['remainder']): ?>
+                            <span id="<?= /* @noEscape */ $dots; ?>"> ...</span>
+                            <span id="<?= /* @noEscape */ $id; ?>">
+                                <?= $block->escapeHtml($_option['remainder'], ['a']) ?>
+                            </span>
+                            <?php $scriptString = <<<script
                                 require(['prototype'], function() {
-                                    $('<?= /* @noEscape */ $id; ?>').hide();
-                                    $('<?= /* @noEscape */ $id; ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $id; ?>').show();});
-                                    $('<?= /* @noEscape */ $id; ?>').up().observe('mouseover', function(){$('<?= /* @noEscape */ $dots; ?>').hide();});
-                                    $('<?= /* @noEscape */ $id; ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $id; ?>').hide();});
-                                    $('<?= /* @noEscape */ $id; ?>').up().observe('mouseout',  function(){$('<?= /* @noEscape */ $dots; ?>').show();});
-                                });
-                            </script>
+
+script;
+                            $scriptString .= "$('" . /* @noEscape */ $id . "').hide();" . PHP_EOL;
+                            $scriptString .= "$('" . /* @noEscape */ $id .
+                             "').up().observe('mouseover', function(){ $('" . /* @noEscape */ $id . "').show();});" .
+                              PHP_EOL;
+                            $scriptString .= "$('" . /* @noEscape */ $id .
+                                "').up().observe('mouseover', function(){ $('" . /* @noEscape */ $dots .
+                                 "').hide();});" . PHP_EOL;
+                            $scriptString .= "$('" . /* @noEscape */ $id .
+                                "').up().observe('mouseout',  function(){ $('" . /* @noEscape */ $id .
+                                 "').hide();});" . PHP_EOL;
+                            $scriptString .= "$('" . /* @noEscape */ $id .
+                                "').up().observe('mouseout',  function(){ $('" . /* @noEscape */ $dots .
+                                 "').show();});" . PHP_EOL . "});" . PHP_EOL;
+                            ?>
+                            <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
                         <?php endif; ?>
                     <?php endif; ?>
                 </dd>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml
index 05e753c78f4a3..c3a7321a3052f 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml
@@ -3,8 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<?php if ($_entity = $block->getEntity()) : ?>
+<?php if ($_entity = $block->getEntity()): ?>
 <div id="comments_block" class="edit-order-comments">
     <div class="order-history-block">
         <div class="admin__field field-row">
@@ -20,7 +22,7 @@
         </div>
         <div class="admin__field">
             <div class="order-history-comments-options">
-                <?php if ($block->canSendCommentEmail()) : ?>
+                <?php if ($block->canSendCommentEmail()): ?>
                     <div class="admin__field admin__field-option">
                         <input name="comment[is_customer_notified]"
                                type="checkbox"
@@ -48,31 +50,41 @@
     </div>
 
     <ul class="note-list">
-        <?php foreach ($_entity->getCommentsCollection(true) as $_comment) : ?>
+        <?php foreach ($_entity->getCommentsCollection(true) as $_comment): ?>
             <li>
-                <span class="note-list-date"><?= /* @noEscape */ $block->formatDate($_comment->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
-                <span class="note-list-time"><?= /* @noEscape */ $block->formatTime($_comment->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
+                <span class="note-list-date">
+                    <?= /* @noEscape */ $block->formatDate($_comment->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?>
+                </span>
+                <span class="note-list-time">
+                    <?= /* @noEscape */ $block->formatTime($_comment->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?>
+                </span>
                 <span class="note-list-customer">
                     <?= $block->escapeHtml(__('Customer')) ?>
-                    <?php if ($_comment->getIsCustomerNotified()) : ?>
+                    <?php if ($_comment->getIsCustomerNotified()): ?>
                         <span class="note-list-customer-notified"><?= $block->escapeHtml(__('Notified')) ?></span>
-                    <?php else : ?>
-                        <span class="note-list-customer-not-notified"><?= $block->escapeHtml(__('Not Notified')) ?></span>
+                    <?php else: ?>
+                        <span class="note-list-customer-not-notified">
+                            <?= $block->escapeHtml(__('Not Notified')) ?>
+                        </span>
                     <?php endif; ?>
                 </span>
-                <div class="note-list-comment"><?= $block->escapeHtml($_comment->getComment(), ['b', 'br', 'strong', 'i', 'u', 'a']) ?></div>
+                <div class="note-list-comment">
+                    <?= $block->escapeHtml($_comment->getComment(), ['b', 'br', 'strong', 'i', 'u', 'a']) ?>
+                </div>
             </li>
         <?php endforeach; ?>
     </ul>
 </div>
-<script>
+    <?php $scriptString = <<<script
 require(['prototype'], function(){
     submitComment = function() {
-        submitAndReloadArea($('comments_block').parentNode, '<?= $block->escapeUrl($block->getSubmitUrl()) ?>')
+        submitAndReloadArea($('comments_block').parentNode, '{$block->escapeJs($block->getSubmitUrl())}')
     };
     if ($('submit_comment_button')) {
         $('submit_comment_button').observe('click', submitComment);
     }
 });
-</script>
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
index e29c1d2db01ce..017cae0b95f93 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
@@ -3,8 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<?php if ($block->hasMethods()) : ?>
+<?php if ($block->hasMethods()): ?>
 <div id="order-billing_method_form">
     <dl class="admin__payment-methods control">
     <?php
@@ -13,23 +15,23 @@
         $_counter = 0;
         $currentSelectedMethod = $block->getSelectedMethodCode();
     ?>
-    <?php foreach ($_methods as $_method) :
+    <?php foreach ($_methods as $_method):
         $_code = $_method->getCode();
         $_counter++;
         ?>
         <dt class="admin__field-option">
-        <?php if ($_methodsCount > 1) : ?>
+        <?php if ($_methodsCount > 1): ?>
             <input id="p_method_<?= $block->escapeHtmlAttr($_code); ?>"
                    value="<?= $block->escapeHtmlAttr($_code); ?>"
                    type="radio" name="payment[method]"
                    title="<?= $block->escapeHtmlAttr($_method->getTitle()); ?>"
                    onclick="payment.switchMethod('<?= $block->escapeJs($_code); ?>')"
-                    <?php if ($currentSelectedMethod == $_code) : ?>
+                    <?php if ($currentSelectedMethod == $_code): ?>
                     checked="checked"
                     <?php endif; ?>
                    data-validate="{'validate-one-required-by-name':true}"
                    class="admin__control-radio"/>
-        <?php else :?>
+        <?php else:?>
             <span class="no-display">
                 <input id="p_method_<?= $block->escapeHtmlAttr($_code); ?>"
                        value="<?= $block->escapeHtmlAttr($_code); ?>"
@@ -49,19 +51,30 @@
     <?php endforeach; ?>
     </dl>
 </div>
-    <script>
+    <?php $scriptString = <<<script
         require([
             'mage/apply/main',
             'Magento_Sales/order/create/form'
         ], function(mage) {
             mage.apply();
-        <?php if ($_methodsCount !== 1) : ?>
-            order.setPaymentMethod('<?= $block->escapeJs($currentSelectedMethod); ?>');
-        <?php else : ?>
-            payment.switchMethod('<?= $block->escapeJs($currentSelectedMethod); ?>');
-        <?php endif; ?>
+
+script;
+    if ($_methodsCount !== 1):
+        $scriptString .= <<<script
+            order.setPaymentMethod('{$block->escapeJs($currentSelectedMethod)}');
+script;
+    else:
+        $scriptString .= <<<script
+            payment.switchMethod('{$block->escapeJs($currentSelectedMethod)}');
+script;
+    endif;
+    $scriptString .= <<<script
+
         });
-    </script>
-<?php else : ?>
+
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
+<?php else: ?>
     <div class="admin__message-empty"><?= $block->escapeHtml(__('No Payment Methods')); ?></div>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/comment.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/comment.phtml
index dfa6b5e6fff79..ae3d8831d276f 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/comment.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/comment.phtml
@@ -4,11 +4,16 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Sales\Block\Adminhtml\Order\Create\Comment $block */
+/**
+ * @var \Magento\Sales\Block\Adminhtml\Order\Create\Comment $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
 
 <div class="admin__field field-comment">
-    <label for="order-comment" class="admin__field-label"><span><?= $block->escapeHtml(__('Order Comments')) ?></span></label>
+    <label for="order-comment" class="admin__field-label">
+        <span><?= $block->escapeHtml(__('Order Comments')) ?></span>
+    </label>
     <div class="admin__field-control">
         <textarea
             id="order-comment"
@@ -16,8 +21,10 @@
             class="admin__control-textarea"><?= $block->escapeHtml($block->getCommentNote()) ?></textarea>
     </div>
 </div>
-<script>
+<?php $scriptString = <<<script
     require(["Magento_Sales/order/create/form"], function(){
         order.commentFieldsBind('order-comment')
     });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml
index 87ef29c7d42ed..156ee072c762d 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml
@@ -5,31 +5,40 @@
  */
 ?>
 <?php
-/* @var \Magento\Sales\Block\Adminhtml\Order\Create\Coupons $block */
+/**
+ * @var \Magento\Sales\Block\Adminhtml\Order\Create\Coupons $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
 <div class="admin__field field-apply-coupon-code">
     <label class="admin__field-label"><span><?= $block->escapeHtml(__('Apply Coupon Code')) ?></span></label>
     <div class="admin__field-control">
-        <?php if (!$block->getCouponCode()) : ?>
+        <?php if (!$block->getCouponCode()): ?>
         <input type="text" class="admin__control-text" id="coupons:code" value="" name="coupon_code" />
             <?= $block->getButtonHtml(__('Apply'), 'order.handleOnclickCoupon($F(\'coupons:code\'))') ?>
         <?php endif; ?>
-        <?php if ($block->getCouponCode()) : ?>
+        <?php if ($block->getCouponCode()): ?>
         <p class="added-coupon-code">
             <span><?= $block->escapeHtml($block->getCouponCode()) ?></span>
-            <a href="#" onclick="order.applyCoupon(''); return false;" title="<?= $block->escapeHtmlAttr(__('Remove Coupon Code')) ?>"
+            <a href="#" title="<?= $block->escapeHtmlAttr(__('Remove Coupon Code')) ?>"
                class="action-remove"><span><?= $block->escapeHtml(__('Remove')) ?></span></a>
         </p>
+            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                'onclick',
+                "order.applyCoupon(''); return false;",
+                'p.added-coupon-code a.action-remove'
+            ) ?>
         <?php endif; ?>
-        <script>
+        <?php $isVirtual = ($block->getQuote()->isVirtual() ? 'false' : 'true');
+        $scriptString = <<<script
             require([
                 "jquery",
                 'Magento_Ui/js/modal/alert',
                 'mage/translate',
                 "Magento_Sales/order/create/form"
             ], function($, alert) {
-                order.overlay('shipping-method-overlay', <?php if ($block->getQuote()->isVirtual()) : ?>false<?php else : ?>true<?php endif; ?>);
-                order.overlay('address-shipping-overlay', <?php if ($block->getQuote()->isVirtual()) : ?>false<?php else : ?>true<?php endif; ?>);
+                order.overlay('shipping-method-overlay', {$isVirtual});
+                order.overlay('address-shipping-overlay', {$isVirtual});
                 order.handleOnclickCoupon = function (code) {
                     if (!code) {
                         alert({
@@ -40,6 +49,8 @@
                     }
                 };
             });
-        </script>
+script;
+        ?>
+        <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
     </div>
 </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml
index f5edf0949374b..1ee83cdd62db9 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml
@@ -5,22 +5,33 @@
  */
 
 /** @var \Magento\Sales\Block\Adminhtml\Order\Create\Data $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <div class="page-create-order">
-    <script>
+    <?php $scriptString = <<<script
     require(["Magento_Sales/order/create/form"], function(){
-        order.setCurrencySymbol('<?= $block->escapeJs($block->getCurrencySymbol($block->getCurrentCurrencyCode())) ?>')
+        order.setCurrencySymbol('{$block->escapeJs($block->getCurrencySymbol($block->getCurrentCurrencyCode()))}')
     });
-</script>
-    <div class="order-details<?php if ($block->getCustomerId()) : ?> order-details-existing-customer<?php endif; ?>">
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
+    <div class="order-details<?php if ($block->getCustomerId()): ?> order-details-existing-customer<?php endif; ?>">
 
-        <div id="order-additional_area" style="display: none" class="admin__page-section order-additional-area">
+        <div id="order-additional_area" class="admin__page-section order-additional-area">
             <?= $block->getChildHtml('additional_area') ?>
         </div>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+            'display:none',
+            'div#order-additional_area'
+        ) ?>
 
-        <div id="order-search" style="display: none" class="admin__page-section order-search-items">
+        <div id="order-search" class="admin__page-section order-search-items">
             <?= $block->getChildHtml('search') ?>
         </div>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+            'display:none',
+            'div#order-search'
+        ) ?>
 
         <section id="order-items" class="admin__page-section order-items" data-mage-init='{"loader": {}}'>
             <?= $block->getChildHtml('items') ?>
@@ -60,7 +71,7 @@
             </div>
         </section>
 
-        <?php if ($block->getChildBlock('card_validation')) : ?>
+        <?php if ($block->getChildBlock('card_validation')): ?>
         <section id="order-card_validation" class="admin__page-section order-card-validation">
             <?= $block->getChildHtml('card_validation') ?>
         </section>
@@ -85,7 +96,7 @@
         </section>
     </div>
 
-    <?php if ($block->getCustomerId()) : ?>
+    <?php if ($block->getCustomerId()): ?>
         <div class="order-sidebar">
             <div class="store-switcher order-currency">
                 <label class="admin__field-label" for="currency_switcher">
@@ -93,14 +104,22 @@
                 </label>
                 <select id="currency_switcher"
                         class="admin__control-select"
-                        name="order[currency]"
-                        onchange="order.setCurrencyId(this.value); order.setCurrencySymbol(this.options[this.selectedIndex].getAttribute('symbol'));">
-                    <?php foreach ($block->getAvailableCurrencies() as $_code) : ?>
-                        <option value="<?= $block->escapeHtmlAttr($_code) ?>"<?php if ($_code == $block->getCurrentCurrencyCode()) : ?> selected="selected"<?php endif; ?> symbol="<?= $block->escapeHtmlAttr($block->getCurrencySymbol($_code)) ?>">
+                        name="order[currency]">
+                    <?php foreach ($block->getAvailableCurrencies() as $_code): ?>
+                        <option value="<?= $block->escapeHtmlAttr($_code) ?>"
+                            <?php if ($_code == $block->getCurrentCurrencyCode()): ?> selected="selected"<?php endif; ?>
+                                symbol="<?= $block->escapeHtmlAttr($block->getCurrencySymbol($_code)) ?>">
                             <?= $block->escapeHtml($block->getCurrencyName($_code)) ?>
                         </option>
                     <?php endforeach; ?>
                 </select>
+                <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                    'onchange',
+                    "order.setCurrencyId(this.value);
+                     order.setCurrencySymbol(this.options[this.selectedIndex].getAttribute('symbol'));",
+                    'select#currency_switcher'
+                ) ?>
+
             </div>
             <div class="customer-current-activity" id="order-sidebar">
                 <?= $block->getChildHtml('sidebar') ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form.phtml
index c38acb9b79e47..4f1ee1f93c02c 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form.phtml
@@ -5,19 +5,34 @@
  */
 
 /** @var \Magento\Sales\Block\Adminhtml\Order\Create\Form $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<form id="edit_form" data-order-config='<?= $block->escapeHtml($block->getOrderDataJson()) ?>' data-load-base-url="<?= $block->escapeUrl($block->getLoadBlockUrl()) ?>" action="<?= $block->escapeUrl($block->getSaveUrl()) ?>" method="post" enctype="multipart/form-data">
+<form id="edit_form" data-order-config='<?= $block->escapeHtml($block->getOrderDataJson()) ?>'
+      data-load-base-url="<?= $block->escapeUrl($block->getLoadBlockUrl()) ?>"
+      action="<?= $block->escapeUrl($block->getSaveUrl()) ?>" method="post" enctype="multipart/form-data">
     <?= $block->getBlockHtml('formkey') ?>
     <div id="order-message">
         <?= $block->getChildHtml('message') ?>
     </div>
-    <div id="order-customer-selector" class="fieldset-wrapper order-customer-selector" style="display:<?= /* @noEscape */ $block->getCustomerSelectorDisplay() ?>">
+    <div id="order-customer-selector" class="fieldset-wrapper order-customer-selector">
         <?= $block->getChildHtml('customer.grid.container') ?>
     </div>
-    <div id="order-store-selector" class="fieldset-wrapper" style="display:<?= /* @noEscape */ $block->getStoreSelectorDisplay() ?>">
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+        'display:' . /* @noEscape */ $block->getCustomerSelectorDisplay(),
+        'div#order-customer-selector'
+    ) ?>
+    <div id="order-store-selector" class="fieldset-wrapper">
         <?= $block->getChildHtml('store') ?>
     </div>
-    <div id="order-data" style="display:<?= /* @noEscape */ $block->getDataSelectorDisplay() ?>">
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+        'display:' . /* @noEscape */ $block->getStoreSelectorDisplay(),
+        'div#order-store-selector'
+    ) ?>
+    <div id="order-data">
         <?= $block->getChildHtml('data') ?>
     </div>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+        'display:' . /* @noEscape */ $block->getDataSelectorDisplay(),
+        'div#order-data'
+    ) ?>
 </form>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml
index 85ca9c8159bcc..39303568f8899 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml
@@ -4,7 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Form\Account */
+/**
+ * @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Form\Account
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
 
 <div class="admin__page-section-title <?= $block->escapeHtmlAttr($block->getHeaderCssClass()) ?>">
@@ -14,9 +17,10 @@
 <div id="customer_account_fields" class="admin__page-section-content">
     <?= $block->getForm()->getHtml() ?>
 </div>
-
-<script>
+<?php $scriptString = <<<script
     require(["prototype", "Magento_Sales/order/create/form"], function(){
         order.accountFieldsBind($('customer_account_fields'));
     });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
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 5ce001474f5f5..936c8ec41337d 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
@@ -4,7 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address $block */
+/**
+ * @var \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 
 /**
  * @var \Magento\Customer\Model\ResourceModel\Address\Collection $addressCollection
@@ -12,7 +15,7 @@
 $addressCollection = $block->getData('customerAddressCollection');
 
 $addressArray = [];
-if ($block->getCustomerId()) :
+if ($block->getCustomerId()):
     $addressArray = $addressCollection->setCustomerFilter([$block->getCustomerId()])->toArray();
 endif;
 
@@ -22,28 +25,34 @@ endif;
 $customerAddressFormatter = $block->getData('customerAddressFormatter');
 
 /**
- * @var \Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address|\Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address $block
+ * @var \Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address|
+ * \Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address $block
  */
-if ($block->getIsShipping()) :
+if ($block->getIsShipping()):
     $_fieldsContainerId = 'order-shipping_address_fields';
     $_addressChoiceContainerId = 'order-shipping_address_choice';
-    ?>
-    <script>
+
+    $addressCollectionJson = /* @noEscape  */ $block->getAddressCollectionJson();
+    $scriptString= <<<script
     require(["Magento_Sales/order/create/form"], function(){
-        order.shippingAddressContainer = '<?= $block->escapeJs($_fieldsContainerId) ?>';
-        order.setAddresses(<?= /* @noEscape  */ $block->getAddressCollectionJson() ?>);
+        order.shippingAddressContainer = '{$block->escapeJs($_fieldsContainerId)}';
+        order.setAddresses({$addressCollectionJson});
     });
-    </script>
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
     <?php
-else :
+else:
     $_fieldsContainerId = 'order-billing_address_fields';
     $_addressChoiceContainerId = 'order-billing_address_choice';
     ?>
-    <script>
+    <?php $scriptString = <<<script
         require(["Magento_Sales/order/create/form"], function(){
-            order.billingAddressContainer = '<?= $block->escapeJs($_fieldsContainerId) ?>';
+            order.billingAddressContainer = '{$block->escapeJs($_fieldsContainerId)}';
         });
-    </script>
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
     <?php
 endif; ?>
 
@@ -52,33 +61,47 @@ endif; ?>
         <span><?= $block->escapeHtml($block->getHeaderText()) ?></span>
     </legend><br>
 
-    <fieldset id="<?= $block->escapeHtmlAttr($_addressChoiceContainerId) ?>" class="admin__fieldset order-choose-address">
-    <?php if ($block->getIsShipping()) : ?>
+    <fieldset id="<?= $block->escapeHtmlAttr($_addressChoiceContainerId) ?>"
+              class="admin__fieldset order-choose-address">
+    <?php if ($block->getIsShipping()): ?>
         <div class="admin__field admin__field-option admin__field-shipping-same-as-billing">
             <input type="checkbox" id="order-shipping_same_as_billing" name="shipping_same_as_billing"
-                   onclick="order.setShippingAsBilling(this.checked)" class="admin__control-checkbox"
-                   <?php if ($block->getIsAsBilling()) : ?>checked<?php endif; ?> />
+                   class="admin__control-checkbox"
+                   <?php if ($block->getIsAsBilling()): ?>checked<?php endif; ?> />
+            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                'onclick',
+                "order.setShippingAsBilling(this.checked)",
+                'input#order-shipping_same_as_billing'
+            ) ?>
             <label for="order-shipping_same_as_billing" class="admin__field-label">
                 <?= $block->escapeHtml(__('Same As Billing Address')) ?>
             </label>
         </div>
     <?php endif; ?>
         <div class="admin__field admin__field-select-from-existing-address">
-            <label class="admin__field-label"><?= $block->escapeHtml(__('Select from existing customer addresses:')) ?></label>
+            <label class="admin__field-label">
+                <?= $block->escapeHtml(__('Select from existing customer addresses:')) ?>
+            </label>
             <?php $_id = $block->getForm()->getHtmlIdPrefix() . 'customer_address_id' ?>
             <div class="admin__field-control">
                 <select id="<?= $block->escapeHtmlAttr($_id) ?>"
-                        name="<?= $block->escapeHtmlAttr($block->getForm()->getHtmlNamePrefix()) ?>[customer_address_id]"
-                        onchange="order.selectAddress(this, '<?= $block->escapeJs($_fieldsContainerId) ?>')"
+                        name="<?= $block->escapeHtmlAttr($block->getForm()->getHtmlNamePrefix())
+                        ?>[customer_address_id]"
                         class="admin__control-select">
                     <option value=""><?= $block->escapeHtml(__('Add New Address')) ?></option>
-                    <?php foreach ($addressArray as $addressId => $address) : ?>
+                    <?php foreach ($addressArray as $addressId => $address): ?>
                         <option
-                            value="<?= $block->escapeHtmlAttr($addressId) ?>"<?php if ($addressId == $block->getAddressId()) : ?> selected="selected"<?php endif; ?>>
+                            value="<?= $block->escapeHtmlAttr($addressId) ?>"
+                            <?php if ($addressId == $block->getAddressId()): ?> selected="selected"<?php endif; ?>>
                             <?= $block->escapeHtml($customerAddressFormatter->getAddressAsString($address)) ?>
                         </option>
                     <?php endforeach; ?>
                 </select>
+                <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                    'onchange',
+                    "order.selectAddress(this, '" . $block->escapeJs($_fieldsContainerId) . "')",
+                    'select#' . $block->escapeHtmlAttr($_id)
+                ) ?>
             </div>
         </div>
     </fieldset>
@@ -87,23 +110,40 @@ endif; ?>
         <?= $block->getForm()->toHtml() ?>
 
         <div class="admin__field admin__field-option order-save-in-address-book">
-            <input name="<?= $block->escapeHtmlAttr($block->getForm()->getHtmlNamePrefix()) ?>[save_in_address_book]" type="checkbox" id="<?= $block->escapeHtmlAttr($block->getForm()->getHtmlIdPrefix()) ?>save_in_address_book" value="1"<?php if (!$block->getDontSaveInAddressBook()) : ?> checked="checked"<?php endif; ?> class="admin__control-checkbox"/>
+            <input name="<?= $block->escapeHtmlAttr($block->getForm()->getHtmlNamePrefix()) ?>[save_in_address_book]"
+                   type="checkbox"
+                   id="<?= $block->escapeHtmlAttr($block->getForm()->getHtmlIdPrefix()) ?>save_in_address_book"
+                   value="1"
+                <?php if (!$block->getDontSaveInAddressBook()): ?> 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>
         </div>
     </div>
     <?php $hideElement = 'address-' . ($block->getIsShipping() ? 'shipping' : 'billing') . '-overlay'; ?>
-    <div style="display: none;" id="<?= /* @noEscape */ $hideElement ?>" class="order-methods-overlay">
+    <div id="<?= /* @noEscape */ $hideElement ?>" class="order-methods-overlay">
         <span><?= $block->escapeHtml(__('You don\'t need to select a shipping address.')) ?></span>
     </div>
-
-    <script>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+        "display: none;",
+        'div#' . /* @noEscape */ $hideElement
+    ) ?>
+    <?php $scriptString = <<<script
         require(["Magento_Sales/order/create/form"], function(){
-            order.bindAddressFields('<?= $block->escapeJs($_fieldsContainerId) ?>');
-            order.bindAddressFields('<?= $block->escapeJs($_addressChoiceContainerId) ?>');
-            <?php if ($block->getIsShipping() && $block->getIsAsBilling()) : ?>
+            order.bindAddressFields('{$block->escapeJs($_fieldsContainerId)}');
+            order.bindAddressFields('{$block->escapeJs($_addressChoiceContainerId)}');
+
+script;
+    if ($block->getIsShipping() && $block->getIsAsBilling()):
+                $scriptString .= <<<script
             order.disableShippingAddress(true);
-            <?php endif; ?>
+
+script;
+            endif;
+            $scriptString .= <<<script
         });
-    </script>
+
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 </fieldset>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/giftmessage.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/giftmessage.phtml
index d27782fd20b15..baf283e673e40 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/giftmessage.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/giftmessage.phtml
@@ -4,25 +4,37 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Templates.ThisInTemplate
-
-/** @var \Magento\Sales\Block\Adminhtml\Order\Create\Giftmessage $block */
+/**
+ * @var \Magento\Sales\Block\Adminhtml\Order\Create\Giftmessage $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
+?>
+<?php /** @var \Magento\GiftMessage\Helper\Message $giftMessageHelper */
+$giftMessageHelper = $block->getData('giftMessageHelper');
 ?>
-<?php if ($this->helper(\Magento\GiftMessage\Helper\Message::class)->isMessagesAllowed('main', $block->getQuote(), $block->getStoreId())) : ?>
+<?php if ($giftMessageHelper->isMessagesAllowed('main', $block->getQuote(), $block->getStoreId())): ?>
     <?php $_items = $block->getItems(); ?>
     <div id="order-giftmessage" class="giftmessage-order-create">
         <fieldset class="admin__fieldset">
-            <legend class="admin__legend"><span><?= $block->escapeHtml(__('Gift Message for the Entire Order')) ?></span></legend>
+            <legend class="admin__legend">
+                <span><?= $block->escapeHtml(__('Gift Message for the Entire Order')) ?></span>
+            </legend>
             <br>
-            <?php if ($this->helper(\Magento\GiftMessage\Helper\Message::class)->isMessagesAllowed('main', $block->getQuote(), $block->getStoreId())) : ?>
-                <p><?= $block->escapeHtml(__('Leave this box blank if you don\'t want to leave a gift message for the entire order.')) ?></p>
+            <?php if ($giftMessageHelper->isMessagesAllowed('main', $block->getQuote(), $block->getStoreId())): ?>
+                <p>
+                    <?= $block->escapeHtml(
+                        __('Leave this box blank if you don\'t want to leave a gift message for the entire order.')
+                    ) ?>
+                </p>
                 <?= $block->getFormHtml($block->getQuote(), 'main') ?>
             <?php endif; ?>
         </fieldset>
-        <script>
+        <?php $scriptString = <<<script
         require(['Magento_Sales/order/create/form'], function(){
             order.giftmessageFieldsBind('order-giftmessage');
         });
-        </script>
+script;
+        ?>
+        <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
     </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
index eee167dde50d6..c942d9dd96fe1 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
@@ -4,16 +4,19 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Templates.ThisInTemplate
 ?>
 <?php
 /**
  * @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Items\Grid
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
+
+/** @var \Magento\Catalog\Helper\Data $catalogHelper */
+$catalogHelper =$block->getData('catalogHelper');
 ?>
 
 <?php $_items = $block->getItems() ?>
-<?php if (empty($_items)) : ?>
+<?php if (empty($_items)): ?>
     <div id="order-items_grid">
         <div class="admin__table-wrapper">
             <table class="data-table admin__table-primary order-tables">
@@ -36,9 +39,9 @@
             </table>
         </div>
     </div>
-<?php else : ?>
+<?php else: ?>
     <div class="admin__table-wrapper" id="order-items_grid">
-    <?php if (count($_items) > 10) : ?>
+    <?php if (count($_items) > 10): ?>
         <div class="actions update actions-update">
             <?= $block->getButtonHtml(__('Update Items and Quantities'), 'order.itemsUpdate()', 'action-secondary') ?>
         </div>
@@ -59,21 +62,32 @@
                 <tr>
                     <td class="col-total"><?= $block->escapeHtml(__('Total %1 product(s)', count($_items))) ?></td>
                     <td colspan="2" class="col-subtotal"><?= $block->escapeHtml(__('Subtotal:')) ?></td>
-                    <td class="col-price"><strong><?= /* @noEscape */ $block->formatPrice($block->getSubtotal()) ?></strong></td>
-                    <td class="col-price"><strong><?= /* @noEscape */ $block->formatPrice($block->getDiscountAmount()) ?></strong></td>
-                    <td class="col-price"><strong><?= /* @noEscape */ $block->formatPrice($block->getSubtotalWithDiscount()); ?></strong></td>
+                    <td class="col-price">
+                        <strong><?= /* @noEscape */ $block->formatPrice($block->getSubtotal()) ?></strong>
+                    </td>
+                    <td class="col-price">
+                        <strong><?= /* @noEscape */ $block->formatPrice($block->getDiscountAmount()) ?></strong>
+                    </td>
+                    <td class="col-price">
+                        <strong><?= /* @noEscape */ $block->formatPrice($block->getSubtotalWithDiscount()); ?></strong>
+                    </td>
                     <td colspan="2">&nbsp;</td>
                 </tr>
             </tfoot>
                 <?php $i = 0 ?>
-                <?php foreach ($_items as $_item) : $i++ ?>
+                <?php foreach ($_items as $_item): $i++ ?>
                 <tbody class="<?= /* @noEscape */ ($i%2) ? 'even' : 'odd' ?>">
                     <tr>
                         <td class="col-product">
-                            <span id="order_item_<?= (int) $_item->getId() ?>_title"><?= $block->escapeHtml($_item->getName()) ?></span>
+                            <span id="order_item_<?= (int) $_item->getId() ?>_title">
+                                <?= $block->escapeHtml($_item->getName()) ?>
+                            </span>
                             <div class="product-sku-block">
                                 <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
-                                <?= /* @noEscape */ implode('<br />', $this->helper(\Magento\Catalog\Helper\Data::class)->splitSku($block->escapeHtml($_item->getSku()))) ?>
+                                <?= /* @noEscape */ implode(
+                                    '<br />',
+                                    $catalogHelper->splitSku($block->escapeHtml($_item->getSku()))
+                                ) ?>
                             </div>
                             <div class="product-configure-block">
                                 <?= $block->getConfigureButtonHtml($_item) ?>
@@ -84,19 +98,39 @@
                             <?= $block->getItemUnitPriceHtml($_item) ?>
 
                             <?php $_isCustomPrice = $block->usedCustomPriceForItem($_item) ?>
-                            <?php if ($_tier = $block->getTierHtml($_item)) : ?>
-                            <div id="item_tier_block_<?= (int) $_item->getId() ?>"<?php if ($_isCustomPrice) : ?> style="display:none"<?php endif; ?>>
-                                <a href="#" onclick="$('item_tier_<?= (int) $_item->getId() ?>').toggle();return false;"><?= $block->escapeHtml(__('Tier Pricing')) ?></a>
-                                <div style="display:none" id="item_tier_<?= (int) $_item->getId() ?>"><?= /* @noEscape */ $_tier ?></div>
+                            <?php if ($_tier = $block->getTierHtml($_item)): ?>
+                            <div id="item_tier_block_<?= (int) $_item->getId() ?>">
+                                <a href="#"><?= $block->escapeHtml(__('Tier Pricing')) ?></a>
+                                <div id="item_tier_<?= (int) $_item->getId() ?>"><?= /* @noEscape */ $_tier ?></div>
+                                <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                                    "display:none",
+                                    'div#item_tier_' . (int) $_item->getId()
+                                ) ?>
                             </div>
+                                <?php if ($_isCustomPrice): ?>
+                                    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                                        "display:none",
+                                        'div#item_tier_block_' . (int) $_item->getId()
+                                    ) ?>
+                                <?php endif; ?>
+                                <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                                    'onclick',
+                                    "$('item_tier_<?= (int) $_item->getId() ?>').toggle();return false;",
+                                    'div#item_tier_block_' . (int) $_item->getId() . ' a'
+                                ) ?>
                             <?php endif; ?>
-                            <?php if ($block->canApplyCustomPrice($_item)) : ?>
+                            <?php if ($block->canApplyCustomPrice($_item)): ?>
                                 <div class="custom-price-block">
                                     <input type="checkbox"
                                            class="admin__control-checkbox"
                                            id="item_use_custom_price_<?= (int) $_item->getId() ?>"
-                                           <?php if ($_isCustomPrice) : ?> checked="checked"<?php endif; ?>
-                                           onclick="order.toggleCustomPrice(this, 'item_custom_price_<?= (int) $_item->getId() ?>', 'item_tier_block_<?= (int) $_item->getId() ?>');"/>
+                                           <?php if ($_isCustomPrice): ?> checked="checked"<?php endif; ?> />
+                                    <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                                        'onclick',
+                                        "order.toggleCustomPrice(this, 'item_custom_price_" . (int) $_item->getId() .
+                                        "', 'item_tier_block_" . (int) $_item->getId() . "');",
+                                        'input#item_use_custom_price_' . (int) $_item->getId()
+                                    ) ?>
                                     <label
                                         class="normal admin__field-label"
                                         for="item_use_custom_price_<?= (int) $_item->getId() ?>">
@@ -106,11 +140,14 @@
                             <input id="item_custom_price_<?= (int) $_item->getId() ?>"
                                 name="item[<?= (int) $_item->getId() ?>][custom_price]"
                                 value="<?= /* @noEscape */ sprintf("%.2f", $block->getOriginalEditablePrice($_item)) ?>"
-                                <?php if (!$_isCustomPrice) : ?>
-                                style="display:none"
+                                <?php if (!$_isCustomPrice): ?>
                                 disabled="disabled"
                                 <?php endif; ?>
                                 class="input-text item-price admin__control-text"/>
+                            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                                "display:none",
+                                'input#item_custom_price_' . (int) $_item->getId()
+                            ) ?>
                         </td>
                         <td class="col-qty">
                             <input name="item[<?= (int) $_item->getId() ?>][qty]"
@@ -127,7 +164,7 @@
                                 <input id="item_use_discount_<?= (int) $_item->getId() ?>"
                                        class="admin__control-checkbox"
                                        name="item[<?= (int) $_item->getId() ?>][use_discount]"
-                                       <?php if (!$_item->getNoDiscount()) : ?>checked="checked"<?php endif; ?>
+                                       <?php if (!$_item->getNoDiscount()): ?>checked="checked"<?php endif; ?>
                                        value="1"
                                        type="checkbox" />
                                 <label
@@ -144,16 +181,19 @@
                             <select class="admin__control-select" name="item[<?= (int) $_item->getId() ?>][action]">
                                 <option value=""><?= $block->escapeHtml(__('Please select')) ?></option>
                                 <option value="remove"><?= $block->escapeHtml(__('Remove')) ?></option>
-                                <?php if ($block->getCustomerId() && $block->getMoveToCustomerStorage()) : ?>
+                                <?php if ($block->getCustomerId() && $block->getMoveToCustomerStorage()): ?>
                                     <option value="cart"><?= $block->escapeHtml(__('Move to Shopping Cart')) ?></option>
-                                    <?php if ($block->isMoveToWishlistAllowed($_item)) : ?>
+                                    <?php if ($block->isMoveToWishlistAllowed($_item)): ?>
                                         <?php $wishlists = $block->getCustomerWishlists();?>
-                                        <?php if (count($wishlists) <= 1) : ?>
-                                            <option value="wishlist"><?= $block->escapeHtml(__('Move to Wish List')) ?></option>
-                                        <?php else : ?>
+                                        <?php if (count($wishlists) <= 1): ?>
+                                            <option value="wishlist"><?= $block->escapeHtml(__('Move to Wish List')) ?>
+                                            </option>
+                                        <?php else: ?>
                                             <optgroup label="<?= $block->escapeHtml(__('Move to Wish List')) ?>">
-                                                <?php foreach ($wishlists as $wishlist) :?>
-                                                    <option value="wishlist_<?= (int) $wishlist->getId() ?>"><?= $block->escapeHtml($wishlist->getName()) ?></option>
+                                                <?php foreach ($wishlists as $wishlist):?>
+                                                    <option value="wishlist_<?= (int) $wishlist->getId() ?>">
+                                                        <?= $block->escapeHtml($wishlist->getName()) ?>
+                                                    </option>
                                                 <?php endforeach;?>
                                             </optgroup>
                                         <?php endif; ?>
@@ -164,21 +204,22 @@
                     </tr>
 
                     <?php $hasMessageError = false; ?>
-                    <?php foreach ($_item->getMessage(false) as $messageError) : ?>
-                        <?php if (!empty($messageError)) :
+                    <?php foreach ($_item->getMessage(false) as $messageError): ?>
+                        <?php if (!empty($messageError)):
                             $hasMessageError = true;
                         endif; ?>
                     <?php endforeach; ?>
 
-                    <?php if ($hasMessageError) : ?>
+                    <?php if ($hasMessageError): ?>
                         <tr class="row-messages-error">
                             <td colspan="100"> <!-- ToDo UI: remove the 100 -->
-                                <?php foreach ($_item->getMessage(false) as $message) :
+                                <?php foreach ($_item->getMessage(false) as $message):
                                     if (empty($message)) {
                                         continue;
                                     }
                                     ?>
-                                    <div class="message <?php if ($_item->getHasError()) : ?>message-error<?php else : ?>message-notice<?php endif; ?>">
+                                    <div class="message <?php if ($_item->getHasError()): ?>message-error<?php else:
+                                        ?>message-notice<?php endif; ?>">
                                         <?= $block->escapeHtml($message) ?>
                                     </div>
                                 <?php endforeach; ?>
@@ -198,15 +239,17 @@
         <div id="order-coupons" class="order-coupons"><?= $block->getChildHtml() ?></div>
     </div>
 
-    <script>
+    <?php $scriptString = <<<script
         require([
             'Magento_Sales/order/create/form'
         ], function(){
             order.itemsOnchangeBind()
         });
-    </script>
-    <?php if ($block->isGiftMessagesAvailable()) : ?>
-        <script>
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
+    <?php if ($block->isGiftMessagesAvailable()): ?>
+        <?php $scriptString = <<<script
         require([
             "prototype",
             "Magento_Sales/order/giftoptions_tooltip"
@@ -241,6 +284,9 @@
         //]]>
 
         });
-        </script>
+
+script;
+        ?>
+        <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
     <?php endif; ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/js.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/js.phtml
index eb39f71265cd6..0eb3caac12318 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/js.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/js.phtml
@@ -3,8 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<script>
+
+<?php $scriptString = <<<script
+
 require([
     "prototype",
     "Magento_Sales/order/create/form",
@@ -14,11 +18,14 @@ require([
     order.sidebarHide();
     if (window.productConfigure) {
         productConfigure.addListType('product_to_add', {
-            urlFetch: '<?= $block->escapeJs($block->escapeUrl($block->getUrl('sales/order_create/configureProductToAdd'))) ?>'
+            urlFetch: '{$block->escapeJs($block->getUrl('sales/order_create/configureProductToAdd'))}'
         });
         productConfigure.addListType('quote_items', {
-            urlFetch: '<?= $block->escapeJs($block->escapeUrl($block->getUrl('sales/order_create/configureQuoteItems'))) ?>'
+            urlFetch: '{$block->escapeJs($block->getUrl('sales/order_create/configureQuoteItems'))}'
         });
     }
 });
-</script>
+
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml
index baaf4c078f2c7..d55b75103c7e3 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml
@@ -4,40 +4,57 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Templates.ThisInTemplate
+/**
+ * @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Method\Form
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
+?>
+<?php
+/** @var \Magento\Tax\Helper\Data $taxHelper */
+$taxHelper = $block->getData('taxHelper');
 ?>
-<?php /** @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Method\Form */ ?>
 <?php $_shippingRateGroups = $block->getShippingRates(); ?>
-<?php if ($_shippingRateGroups) : ?>
-    <div id="order-shipping-method-choose" class="control" style="display:none">
+<?php if ($_shippingRateGroups): ?>
+    <div id="order-shipping-method-choose" class="control">
         <dl class="admin__order-shipment-methods">
-        <?php foreach ($_shippingRateGroups as $code => $_rates) : ?>
-            <dt class="admin__order-shipment-methods-title"><?= $block->escapeHtml($block->getCarrierName($code)) ?></dt>
+        <?php foreach ($_shippingRateGroups as $code => $_rates): ?>
+            <dt class="admin__order-shipment-methods-title"><?= $block->escapeHtml($block->getCarrierName($code)) ?>
+            </dt>
             <dd class="admin__order-shipment-methods-options">
                 <ul class="admin__order-shipment-methods-options-list">
-                <?php foreach ($_rates as $_rate) : ?>
-                    <?php $_radioProperty = 'name="order[shipping_method]" type="radio" onclick="order.setShippingMethod(this.value)"' ?>
+                <?php foreach ($_rates as $_rate): ?>
+                    <?php $_radioProperty = 'name="order[shipping_method]" type="radio"' ?>
                     <?php $_code = $_rate->getCode() ?>
                     <li class="admin__field-option">
-                        <?php if ($_rate->getErrorMessage()) : ?>
+                        <?php if ($_rate->getErrorMessage()): ?>
                             <div class="messages">
                                <div class="message message-error error">
                                    <div><?= $block->escapeHtml($_rate->getErrorMessage()) ?></div>
                                </div>
                             </div>
-                        <?php else : ?>
+                        <?php else: ?>
                             <?php $_checked = $block->isMethodActive($_code) ? 'checked="checked"' : '' ?>
-                            <input <?= /* @noEscape */ $_radioProperty ?> value="<?= $block->escapeHtmlAttr($_code) ?>"
-                                                                 id="s_method_<?= $block->escapeHtmlAttr($_code) ?>" <?= /* @noEscape */ $_checked ?>
-                                                                 class="admin__control-radio required-entry"/>
+                            <input <?= /* @noEscape */ $_radioProperty ?>
+                                value="<?= $block->escapeHtmlAttr($_code) ?>"
+                                id="s_method_<?= $block->escapeHtmlAttr($_code) ?>" <?= /* @noEscape */ $_checked ?>
+                                class="admin__control-radio required-entry"/>
+                            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                                'onclick',
+                                "order.setShippingMethod(this.value)",
+                                'input#s_method_' . $block->escapeHtmlAttr($_code)
+                            ) ?>
                             <label class="admin__field-label" for="s_method_<?= $block->escapeHtmlAttr($_code) ?>">
-                                <?= $block->escapeHtml($_rate->getMethodTitle() ? $_rate->getMethodTitle() : $_rate->getMethodDescription()) ?> -
+                                <?= $block->escapeHtml($_rate->getMethodTitle() ?
+                                    $_rate->getMethodTitle() : $_rate->getMethodDescription()) ?> -
                                 <strong>
-                                    <?php $_excl = $block->getShippingPrice($_rate->getPrice(), $this->helper(\Magento\Tax\Helper\Data::class)->displayShippingPriceIncludingTax()); ?>
+                                    <?php $_excl = $block->getShippingPrice(
+                                        $_rate->getPrice(),
+                                        $taxHelper->displayShippingPriceIncludingTax()
+                                    ); ?>
                                     <?php $_incl = $block->getShippingPrice($_rate->getPrice(), true); ?>
 
                                     <?= /* @noEscape */ $_excl ?>
-                                    <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $_incl != $_excl) : ?>
+                                    <?php if ($taxHelper->displayShippingBothPrices() && $_incl != $_excl): ?>
                                         (<?= $block->escapeHtml(__('Incl. Tax')) ?> <?= /* @noEscape */ $_incl ?>)
                                     <?php endif; ?>
                                 </strong>
@@ -50,57 +67,83 @@
         <?php endforeach; ?>
         </dl>
     </div>
-    <?php if ($_rate = $block->getActiveMethodRate()) : ?>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display:none", 'div#order-shipping-method-choose') ?>
+    <?php if ($_rate = $block->getActiveMethodRate()): ?>
         <div id="order-shipping-method-info" class="order-shipping-method-info">
             <dl class="admin__order-shipment-methods">
                 <dt class="admin__order-shipment-methods-title">
                     <?= $block->escapeHtml($block->getCarrierName($_rate->getCarrier())) ?>
                 </dt>
                 <dd class="admin__order-shipment-methods-options">
-                    <?= $block->escapeHtml($_rate->getMethodTitle() ? $_rate->getMethodTitle() : $_rate->getMethodDescription()) ?> -
+                    <?= $block->escapeHtml($_rate->getMethodTitle() ?
+                        $_rate->getMethodTitle() : $_rate->getMethodDescription()) ?> -
                     <strong>
-                        <?php $_excl = $block->getShippingPrice($_rate->getPrice(), $this->helper(\Magento\Tax\Helper\Data::class)->displayShippingPriceIncludingTax()); ?>
+                        <?php $_excl = $block->getShippingPrice(
+                            $_rate->getPrice(),
+                            $taxHelper->displayShippingPriceIncludingTax()
+                        ); ?>
                         <?php $_incl = $block->getShippingPrice($_rate->getPrice(), true); ?>
 
                         <?= /* @noEscape */ $_excl ?>
-                        <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $_incl != $_excl) : ?>
+                        <?php if ($taxHelper->displayShippingBothPrices() && $_incl != $_excl): ?>
                             (<?= $block->escapeHtml(__('Incl. Tax')) ?> <?= /* @noEscape */ $_incl ?>)
                         <?php endif; ?>
                     </strong>
                 </dd>
             </dl>
             <a href="#"
-               onclick="$('order-shipping-method-info').hide();$('order-shipping-method-choose').show();return false"
                class="action-default">
                 <span><?= $block->escapeHtml(__('Click to change shipping method')) ?></span>
             </a>
         </div>
-    <?php else : ?>
-        <script>
+        <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+            'onclick',
+            "$('order-shipping-method-info').hide();$('order-shipping-method-choose').show();return false",
+            'div#order-shipping-method-info a.action-default'
+        ) ?>
+    <?php else: ?>
+        <?php $scriptString = <<<script
 require(['prototype'], function(){
     $('order-shipping-method-choose').show();
 });
-</script>
+script;
+        ?>
+        <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
     <?php endif; ?>
-<?php elseif ($block->getIsRateRequest()) : ?>
+<?php elseif ($block->getIsRateRequest()): ?>
     <div class="order-shipping-method-summary">
-        <strong class="order-shipping-method-not-available"><?= $block->escapeHtml(__('Sorry, no quotes are available for this order.')) ?></strong>
+        <strong class="order-shipping-method-not-available">
+            <?= $block->escapeHtml(__('Sorry, no quotes are available for this order.')) ?>
+        </strong>
     </div>
-<?php else : ?>
+<?php else: ?>
     <div id="order-shipping-method-summary" class="order-shipping-method-summary">
-        <a href="#" onclick="order.loadShippingRates();return false" class="action-default">
+        <a href="#" class="action-default">
             <span><?= $block->escapeHtml(__('Get shipping methods and rates')) ?></span>
         </a>
         <input type="hidden" name="order[has_shipping]" value="" class="required-entry" />
     </div>
+    <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+        'onclick',
+        "order.loadShippingRates();return false",
+        'div#order-shipping-method-summary a.action-default'
+    ) ?>
 <?php endif; ?>
-<div style="display: none;" id="shipping-method-overlay" class="order-methods-overlay">
+<div id="shipping-method-overlay" class="order-methods-overlay">
     <span><?= $block->escapeHtml(__('You don\'t need to select a shipping method.')) ?></span>
 </div>
-<script>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display: none;", 'div#shipping-method-overlay') ?>
+<?php $scriptString = <<<script
     require(["Magento_Sales/order/create/form"], function(){
-        order.overlay('shipping-method-overlay', <?php if ($block->getQuote()->isVirtual()) : ?>false<?php else : ?>true<?php endif; ?>);
-        order.overlay('address-shipping-overlay', <?php if ($block->getQuote()->isVirtual()) : ?>false<?php else : ?>true<?php endif; ?>);
-        order.isOnlyVirtualProduct = <?= /* @noEscape */ $block->getQuote()->isVirtual() ? 'true' : 'false'; ?>;
+
+script;
+$scriptString .= "order.overlay('shipping-method-overlay', " . ($block->getQuote()->isVirtual() ? 'false' : 'true') .
+    ');' . PHP_EOL;
+$scriptString .= "order.overlay('address-shipping-overlay', " . ($block->getQuote()->isVirtual() ? 'false' : 'true') .
+ ');' . PHP_EOL;
+$scriptString .= "order.isOnlyVirtualProduct = " . ($block->getQuote()->isVirtual() ? 'true' : 'false') . ';' . PHP_EOL;
+$scriptString .= <<<script
     });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar.phtml
index d4dea4eb85a57..fe8910dc3e956 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar.phtml
@@ -4,15 +4,18 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar $block */
+/**
+ * @var \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
 <div class="customer-current-activity-inner">
     <h4 class="customer-activity-title"><?= $block->escapeHtml(__('Customer\'s Activities')) ?></h4>
     <div class="create-order-sidebar-container">
     <?= $block->getChildHtml('top_button') ?>
-    <?php foreach ($block->getLayout()->getChildBlocks($block->getNameInLayout()) as $_alias => $_child) : ?>
-        <?php if ($_alias != 'top_button' && $_alias != 'bottom_button') : ?>
-            <?php if ($block->canDisplay($_child)) : ?>
+    <?php foreach ($block->getLayout()->getChildBlocks($block->getNameInLayout()) as $_alias => $_child): ?>
+        <?php if ($_alias != 'top_button' && $_alias != 'bottom_button'): ?>
+            <?php if ($block->canDisplay($_child)): ?>
                 <div class="order-sidebar-block" id="order-sidebar_<?= $block->escapeHtmlAttr($_alias) ?>">
                     <?= $block->getChildHtml($_alias) ?>
                 </div>
@@ -22,7 +25,7 @@
     <?= $block->getChildHtml('bottom_button') ?>
     </div>
 </div>
-<script>
+<?php $scriptString = <<<script
 require([
     "prototype",
     "Magento_Catalog/catalog/product/composite/configure"
@@ -30,12 +33,12 @@ require([
 
     function addSidebarCompositeListType() {
         productConfigure.addListType('sidebar', {
-            urlFetch: '<?= $block->escapeJs($block->escapeUrl($block->getUrl('sales/order_create/configureProductToAdd'))) ?>',
-            urlConfirm: '<?= $block->escapeJs($block->escapeUrl($block->getUrl('sales/order_create/addConfigured'))) ?>'
+            urlFetch: '{$block->escapeJs($block->getUrl('sales/order_create/configureProductToAdd'))}',
+            urlConfirm: '{$block->escapeJs($block->getUrl('sales/order_create/addConfigured'))}'
         });
         productConfigure.addListType('sidebar_wishlist', {
-            urlFetch: '<?= $block->escapeJs($block->escapeUrl($block->getUrl('customer/wishlist_product_composite_wishlist/configure'))) ?>',
-            urlConfirm: '<?= $block->escapeJs($block->escapeUrl($block->getUrl('sales/order_create/addConfigured'))) ?>'
+            urlFetch: '{$block->escapeJs($block->getUrl('customer/wishlist_product_composite_wishlist/configure'))}',
+            urlConfirm: '{$block->escapeJs($block->getUrl('sales/order_create/addConfigured'))}'
         });
     }
 
@@ -55,4 +58,6 @@ require([
 
     window.addSidebarCompositeListType = addSidebarCompositeListType;
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals.phtml
index 9a901d99ae8f8..73f53c2eba03e 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals.phtml
@@ -4,7 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Sales\Block\Adminhtml\Order\Create\Totals $block */
+/**
+ * @var \Magento\Sales\Block\Adminhtml\Order\Create\Totals $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
 <legend class="admin__legend"><span><?= $block->escapeHtml(__('Order Totals')) ?></span></legend>
 <br>
@@ -19,15 +22,19 @@
 <div class="order-totals-actions">
     <div class="admin__field admin__field-option field-append-comments">
         <input type="checkbox" id="notify_customer" name="order[comment][customer_note_notify]"
-               value="1"<?php if ($block->getNoteNotify()) : ?> checked="checked"<?php endif; ?>
+               value="1"<?php if ($block->getNoteNotify()): ?> checked="checked"<?php endif; ?>
                class="admin__control-checkbox"/>
-        <label for="notify_customer" class="admin__field-label"><?= $block->escapeHtml(__('Append Comments')) ?></label>
+        <label for="notify_customer" class="admin__field-label">
+            <?= $block->escapeHtml(__('Append Comments')) ?>
+        </label>
     </div>
-    <?php if ($block->canSendNewOrderConfirmationEmail()) : ?>
+    <?php if ($block->canSendNewOrderConfirmationEmail()): ?>
     <div class="admin__field admin__field-option field-email-order-confirmation">
         <input type="checkbox" id="send_confirmation" name="order[send_confirmation]" value="1" checked="checked"
                class="admin__control-checkbox"/>
-        <label for="send_confirmation" class="admin__field-label"><?= $block->escapeHtml(__('Email Order Confirmation')) ?></label>
+        <label for="send_confirmation" class="admin__field-label">
+            <?= $block->escapeHtml(__('Email Order Confirmation')) ?>
+        </label>
     </div>
     <?php endif; ?>
     <div class="actions">
@@ -35,7 +42,7 @@
     </div>
 </div>
 
-<script>
+<?php $scriptString = <<<script
 require(['prototype'], function(){
 
 //<![CDATA[
@@ -58,4 +65,6 @@ window.notifyCustomerUpdate = notifyCustomerUpdate;
 window.sendEmailCheckbox = sendEmailCheckbox;
 
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>

From d946b9e3aa077028fcf186430d2aef7a92928a67 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Thu, 9 Apr 2020 16:08:39 +0300
Subject: [PATCH 0190/1718] magento2-login-as-customer/issues/35: "Verify that
 UI elements are not shown if 'Login as customer' functionality is disabled"
 test added.

---
 ...merAbsentOnCustomerGirdPageActionGroup.xml | 16 +++++
 ...ustomerAbsentOnCustomerPageActionGroup.xml | 19 ++++++
 ...stomerAbsentOnOrderGridPageActionGroup.xml | 16 +++++
 ...AsCustomerAbsentOnOrderPageActionGroup.xml | 19 ++++++
 .../Mftf/Data/LoginAsCustomerConfigData.xml   | 24 ++++++++
 .../LoginAsCustomer/Test/Mftf/LICENSE.txt     | 48 +++++++++++++++
 .../LoginAsCustomer/Test/Mftf/LICENSE_AFL.txt | 48 +++++++++++++++
 .../LoginAsCustomer/Test/Mftf/README.md       |  3 +
 ...INotShownIfLoginAsCustomerDisabledTest.xml | 59 +++++++++++++++++++
 9 files changed, 252 insertions(+)
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerGirdPageActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerPageActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderGridPageActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderPageActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Data/LoginAsCustomerConfigData.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/LICENSE.txt
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/LICENSE_AFL.txt
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/README.md
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUINotShownIfLoginAsCustomerDisabledTest.xml

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerGirdPageActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerGirdPageActionGroup.xml
new file mode 100644
index 0000000000000..5645395c61f49
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerGirdPageActionGroup.xml
@@ -0,0 +1,16 @@
+<?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">
+    <!-- Verify Login As Customer Login action is absent on Customer grid page -->
+    <actionGroup name="AdminLoginAsCustomerAbsentOnCustomerGridPageActionGroup">
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="gotoCustomerGridPage"/>
+        <dontSee userInput="Login As Customer" stepKey="dontSeeLoginAsCustomer"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerPageActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerPageActionGroup.xml
new file mode 100644
index 0000000000000..a0a7eaeb970af
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerPageActionGroup.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">
+    <!-- Verify Login As Customer Login action is absent on Customer page -->
+    <actionGroup name="AdminLoginAsCustomerAbsentOnCustomerPageActionGroup">
+        <arguments>
+            <argument name="customerId"/>
+        </arguments>
+        <amOnPage url="{{AdminEditCustomerPage.url(customerId)}}" stepKey="gotoCustomerPage"/>
+        <dontSee userInput="Login As Customer" stepKey="dontSeeLoginAsCustomer"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderGridPageActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderGridPageActionGroup.xml
new file mode 100644
index 0000000000000..9c7fb4f3b7f82
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderGridPageActionGroup.xml
@@ -0,0 +1,16 @@
+<?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">
+    <!-- Verify Login As Customer Login action is absent on Order grid page -->
+    <actionGroup name="AdminLoginAsCustomerAbsentOnOrderGridPageActionGroup">
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="gotoOrderGridPage"/>
+        <dontSee userInput="Login As Customer" stepKey="dontSeeLoginAsCustomer"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderPageActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderPageActionGroup.xml
new file mode 100644
index 0000000000000..10fc34c7697bf
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderPageActionGroup.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">
+    <!-- Verify Login As Customer Login action is absent on Order page -->
+    <actionGroup name="AdminLoginAsCustomerAbsentOnOrderPageActionGroup">
+        <arguments>
+            <argument name="orderId"/>
+        </arguments>
+        <amOnPage url="{{AdminOrderPage.url(orderId)}}" stepKey="gotoOrderPage"/>
+        <dontSee userInput="Login As Customer" stepKey="dontSeeLoginAsCustomer"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/LoginAsCustomerConfigData.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/LoginAsCustomerConfigData.xml
new file mode 100644
index 0000000000000..4bee8de4fb3ec
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/LoginAsCustomerConfigData.xml
@@ -0,0 +1,24 @@
+<?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="LoginAsCustomerConfigDataEnabled">
+        <data key="path">mfloginascustomer/general/enabled</data>
+    </entity>
+    <entity name="disablePageCache">
+        <data key="path">mfloginascustomer/general/disable_page_cache</data>
+    </entity>
+    <!-- Should be removed after https://github.com/magento/magento2-login-as-customer/issues/34 -->
+    <entity name="extensionsKeepGuestCart">
+        <data key="path">mfloginascustomer/general/keep_guest_cart</data>
+    </entity>
+    <entity name="storeViewLogin">
+        <data key="path">mfloginascustomer/general/store_view_login</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/LICENSE.txt b/app/code/Magento/LoginAsCustomer/Test/Mftf/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/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/LoginAsCustomer/Test/Mftf/LICENSE_AFL.txt b/app/code/Magento/LoginAsCustomer/Test/Mftf/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/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/LoginAsCustomer/Test/Mftf/README.md b/app/code/Magento/LoginAsCustomer/Test/Mftf/README.md
new file mode 100644
index 0000000000000..5069a2cb278f6
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/README.md
@@ -0,0 +1,3 @@
+# Integration Functional Tests
+
+The Functional Test Module for **Magento Login As Customer** module.
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUINotShownIfLoginAsCustomerDisabledTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUINotShownIfLoginAsCustomerDisabledTest.xml
new file mode 100644
index 0000000000000..533854d12bd61
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUINotShownIfLoginAsCustomerDisabledTest.xml
@@ -0,0 +1,59 @@
+<?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="AdminUINotShownIfLoginAsCustomerDisabledTest">
+        <annotations>
+            <features value="Login As Customer"/>
+            <stories value="Availability of UI elements if module enable/disable"/>
+            <title value="UI elements are not shown if 'Login as customer' functionality is disabled"/>
+            <description value="Verify that UI elements are not shown if 'Login as customer' functionality is disabled"/>
+            <severity value="CRITICAL"/>
+            <group value="login_as_customer"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0" stepKey="disableLoginAsCustomer"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+        <!-- Verify Login As Customer Login action is absent in Customer grid page -->
+        <actionGroup ref="AdminLoginAsCustomerAbsentOnCustomerGridPageActionGroup" stepKey="verifyLoginAsCustomerAbsentOnCustomerGridPage"/>
+
+        <!-- Verify Login As Customer Login action is absent on Customer page -->
+        <actionGroup ref="AdminLoginAsCustomerAbsentOnCustomerPageActionGroup" stepKey="verifyLoginAsCustomerAbsentOnCustomerPage">
+            <argument name="customerId" value="$createCustomer.id$"/>
+        </actionGroup>
+
+        <!-- Create order -->
+        <actionGroup ref="CreateOrderActionGroup" stepKey="createOrder">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <grabTextFrom selector="{{AdminOrderDetailsInformationSection.orderId}}" stepKey="grabOrderId"/>
+
+        <!-- Verify Login As Customer Login action is absent on Order grid page -->
+        <actionGroup ref="AdminLoginAsCustomerAbsentOnOrderGridPageActionGroup" stepKey="verifyLoginAsCustomerAbsentOnOrderGridPage"/>
+
+        <!-- Verify Login As Customer Login action is absent on Order page -->
+        <actionGroup ref="AdminLoginAsCustomerAbsentOnOrderPageActionGroup" stepKey="verifyLoginAsCustomerAbsentOnOrderPage">
+            <argument name="orderId" value="{$grabOrderId}"/>
+        </actionGroup>
+    </test>
+</tests>

From 4f0a51466828da81accc75860a54e54be80564f5 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Fri, 10 Apr 2020 11:38:18 +0300
Subject: [PATCH 0191/1718] magento2-login-as-customer/issues/35: "Verify that
 'Login As Customer Log' not shown if 'Login as customer' functionality is
 disabled" test added.

---
 ...inAsCustomerLogAbsentInMenuActionGroup.xml | 16 +++++++++
 ...CustomerLogPageNotAvailableActionGroup.xml | 16 +++++++++
 .../Test/Mftf/Data/AdminMenuData.xml          | 16 +++++++++
 .../Mftf/Page/AdminLoginAsCustomerLogPage.xml | 12 +++++++
 ...gNotShownIfLoginAsCustomerDisabledTest.xml | 34 +++++++++++++++++++
 5 files changed, 94 insertions(+)
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogAbsentInMenuActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogPageNotAvailableActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Data/AdminMenuData.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Page/AdminLoginAsCustomerLogPage.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLogNotShownIfLoginAsCustomerDisabledTest.xml

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogAbsentInMenuActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogAbsentInMenuActionGroup.xml
new file mode 100644
index 0000000000000..0049d3dcc2196
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogAbsentInMenuActionGroup.xml
@@ -0,0 +1,16 @@
+<?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">
+    <!-- Verify Login As Customer is absent in admin menu -->
+    <actionGroup name="AdminLoginAsCustomerLogAbsentInMenuActionGroup">
+        <click selector="{{AdminMenuSection.menuItem(AdminMenuCustomers.dataUiId)}}" stepKey="clickOnCustomersMenuItem"/>
+        <dontSeeElement selector="{{AdminMenuSection.menuItem(AdminMenuLoginAsCustomer.dataUiId)}}" stepKey="dontSeeLoginAsCustomerLog"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogPageNotAvailableActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogPageNotAvailableActionGroup.xml
new file mode 100644
index 0000000000000..8b8386470a582
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogPageNotAvailableActionGroup.xml
@@ -0,0 +1,16 @@
+<?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">
+    <!-- Verify Login As Customer is not available by direct url -->
+    <actionGroup name="AdminLoginAsCustomerLogPageNotAvailableActionGroup">
+        <amOnPage url="{{AdminLoginAsCustomerLogPage.url}}" stepKey="openAdminLoginAsCustomerLogPage"/>
+        <see selector="{{AdminHeaderSection.pageHeading}}" userInput="404 Error" stepKey="see404PageHeading"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/AdminMenuData.xml
new file mode 100644
index 0000000000000..e326fa1e1d225
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/AdminMenuData.xml
@@ -0,0 +1,16 @@
+<?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="AdminMenuLoginAsCustomer">
+        <data key="pageTitle">Login As Customer Log</data>
+        <data key="title">Login As Customer Log</data>
+        <data key="dataUiId">magento-loginascustomer-login-log</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Page/AdminLoginAsCustomerLogPage.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Page/AdminLoginAsCustomerLogPage.xml
new file mode 100644
index 0000000000000..2eef65e390309
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Page/AdminLoginAsCustomerLogPage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:/Page/etc/PageObject.xsd">
+    <page name="AdminLoginAsCustomerLogPage" url="admin/loginascustomer/login/" area="admin" module="Magento_LoginAsCustomer"/>
+</pages>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLogNotShownIfLoginAsCustomerDisabledTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLogNotShownIfLoginAsCustomerDisabledTest.xml
new file mode 100644
index 0000000000000..d01bd27c00ca0
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLogNotShownIfLoginAsCustomerDisabledTest.xml
@@ -0,0 +1,34 @@
+<?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="AdminLoginAsCustomerLogNotShownIfLoginAsCustomerDisabledTest">
+        <annotations>
+            <features value="Login As Customer"/>
+            <stories value="Availability of UI elements if module enable/disable"/>
+            <title value="'Login As Customer Log' not shown if 'Login as customer' functionality is disabled"/>
+            <description value="Verify that 'Login As Customer Log' not shown if 'Login as customer' functionality is disabled"/>
+            <severity value="CRITICAL"/>
+            <group value="login_as_customer"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0" stepKey="disableLoginAsCustomer"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+        <!-- Verify Login As Customer Log is absent in admin menu -->
+        <actionGroup ref="AdminLoginAsCustomerLogAbsentInMenuActionGroup" stepKey="verifyLoginAsCustomerLogAbsentInMenu"/>
+
+        <!-- Verify Login As Customer Log is not available by direct url -->
+        <actionGroup ref="AdminLoginAsCustomerLogPageNotAvailableActionGroup" stepKey="verifyLoginAsCustomerLogNotAvailable"/>
+    </test>
+</tests>

From 70cab94833abf19859f8eb0e3f06334825dd10ee Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Fri, 10 Apr 2020 15:45:22 +0300
Subject: [PATCH 0192/1718] magento2-login-as-customer/issues/35: "Verify that
 UI elements are present and links are working if 'Login as customer'
 functionality enabled" test added.

---
 ...merAbsentOnCustomerGirdPageActionGroup.xml |   1 +
 ...ustomerAbsentOnCustomerPageActionGroup.xml |   3 +-
 ...stomerAbsentOnOrderGridPageActionGroup.xml |   1 +
 ...AsCustomerAbsentOnOrderPageActionGroup.xml |   3 +-
 ...CustomerLogPageNotAvailableActionGroup.xml |   1 +
 ...erLoginFromCustomerGirdPageActionGroup.xml |  22 ++++
 ...stomerLoginFromCustomerPageActionGroup.xml |  22 ++++
 ...tomerLoginFromOrderGridPageActionGroup.xml |  22 ++++
 ...sCustomerLoginFromOrderPageActionGroup.xml |  22 ++++
 ...sertLoginAsCustomerLoggedInActionGroup.xml |  29 +++++
 ...torefrontSignOutAndCloseTabActionGroup.xml |  19 ++++
 ...refrontLoginAsCustomerLoginProceedPage.xml |  12 +++
 .../Mftf/Section/AdminCustomerGridSection.xml |  15 +++
 .../AdminCustomerMainActionsSection.xml       |  14 +++
 .../AdminOrderDetailsMainActionsSection.xml   |  14 +++
 .../Mftf/Section/AdminOrdersGridSection.xml   |  14 +++
 ...minUIShownIfLoginAsCustomerEnabledTest.xml | 101 ++++++++++++++++++
 17 files changed, 313 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerGirdPageActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderGridPageActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerLoggedInActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontSignOutAndCloseTabActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Page/StorefrontLoginAsCustomerLoginProceedPage.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminCustomerGridSection.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminCustomerMainActionsSection.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminOrderDetailsMainActionsSection.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminOrdersGridSection.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerGirdPageActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerGirdPageActionGroup.xml
index 5645395c61f49..3ea8d4f6f0e02 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerGirdPageActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerGirdPageActionGroup.xml
@@ -11,6 +11,7 @@
     <!-- Verify Login As Customer Login action is absent on Customer grid page -->
     <actionGroup name="AdminLoginAsCustomerAbsentOnCustomerGridPageActionGroup">
         <amOnPage url="{{AdminCustomerPage.url}}" stepKey="gotoCustomerGridPage"/>
+        <waitForPageLoad stepKey="waitForCustomerGridPageLoad"/>
         <dontSee userInput="Login As Customer" stepKey="dontSeeLoginAsCustomer"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerPageActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerPageActionGroup.xml
index a0a7eaeb970af..bae87ca9000c5 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerPageActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerPageActionGroup.xml
@@ -11,9 +11,10 @@
     <!-- Verify Login As Customer Login action is absent on Customer page -->
     <actionGroup name="AdminLoginAsCustomerAbsentOnCustomerPageActionGroup">
         <arguments>
-            <argument name="customerId"/>
+            <argument name="customerId" type="string"/>
         </arguments>
         <amOnPage url="{{AdminEditCustomerPage.url(customerId)}}" stepKey="gotoCustomerPage"/>
+        <waitForPageLoad stepKey="waitForCustomerPageLoad"/>
         <dontSee userInput="Login As Customer" stepKey="dontSeeLoginAsCustomer"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderGridPageActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderGridPageActionGroup.xml
index 9c7fb4f3b7f82..77f64c332639f 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderGridPageActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderGridPageActionGroup.xml
@@ -11,6 +11,7 @@
     <!-- Verify Login As Customer Login action is absent on Order grid page -->
     <actionGroup name="AdminLoginAsCustomerAbsentOnOrderGridPageActionGroup">
         <amOnPage url="{{AdminOrdersPage.url}}" stepKey="gotoOrderGridPage"/>
+        <waitForPageLoad stepKey="waitForOrderGridPageLoad"/>
         <dontSee userInput="Login As Customer" stepKey="dontSeeLoginAsCustomer"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderPageActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderPageActionGroup.xml
index 10fc34c7697bf..fb55156d021d4 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderPageActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderPageActionGroup.xml
@@ -11,9 +11,10 @@
     <!-- Verify Login As Customer Login action is absent on Order page -->
     <actionGroup name="AdminLoginAsCustomerAbsentOnOrderPageActionGroup">
         <arguments>
-            <argument name="orderId"/>
+            <argument name="orderId" type="string"/>
         </arguments>
         <amOnPage url="{{AdminOrderPage.url(orderId)}}" stepKey="gotoOrderPage"/>
+        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
         <dontSee userInput="Login As Customer" stepKey="dontSeeLoginAsCustomer"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogPageNotAvailableActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogPageNotAvailableActionGroup.xml
index 8b8386470a582..850604b990de9 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogPageNotAvailableActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogPageNotAvailableActionGroup.xml
@@ -11,6 +11,7 @@
     <!-- Verify Login As Customer is not available by direct url -->
     <actionGroup name="AdminLoginAsCustomerLogPageNotAvailableActionGroup">
         <amOnPage url="{{AdminLoginAsCustomerLogPage.url}}" stepKey="openAdminLoginAsCustomerLogPage"/>
+        <waitForPageLoad stepKey="waitForLoginAsCustomerLogPageLoad"/>
         <see selector="{{AdminHeaderSection.pageHeading}}" userInput="404 Error" stepKey="see404PageHeading"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerGirdPageActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerGirdPageActionGroup.xml
new file mode 100644
index 0000000000000..0a35564875e18
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerGirdPageActionGroup.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">
+    <!-- Verify Login As Customer Login action is works properly from Customer grid page -->
+    <actionGroup name="AdminLoginAsCustomerLoginFromCustomerGirdPageActionGroup">
+        <arguments>
+            <argument name="customerEmail" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="gotoCustomerGridPage"/>
+        <waitForPageLoad stepKey="waitForCustomerGridPageLoad"/>
+        <click selector="{{AdminCustomerGridSection.customerLoginAsCustomerLinkByEmail(customerEmail)}}" stepKey="clickLoginAsCustomerLink"/>
+        <switchToNextTab stepKey="switchToNewTab"/>
+        <waitForElementVisible selector="{{StorefrontCMSPageSection.mainTitle}}" stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageActionGroup.xml
new file mode 100644
index 0000000000000..41db38169ac05
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageActionGroup.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">
+    <!-- Verify Login As Customer Login action is works properly from Customer page -->
+    <actionGroup name="AdminLoginAsCustomerLoginFromCustomerPageActionGroup">
+        <arguments>
+            <argument name="customerId" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminEditCustomerPage.url(customerId)}}" stepKey="gotoCustomerPage"/>
+        <waitForPageLoad stepKey="waitForCustomerPageLoad"/>
+        <click selector="{{AdminCustomerMainActionsSection.loginAsCustomer}}" stepKey="clickLoginAsCustomerLink"/>
+        <switchToNextTab stepKey="switchToNewTab"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderGridPageActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderGridPageActionGroup.xml
new file mode 100644
index 0000000000000..aba61a86249cd
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderGridPageActionGroup.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">
+    <!-- Verify Login As Customer Login action is works properly from Order grid page -->
+    <actionGroup name="AdminLoginAsCustomerLoginFromOrderGridPageActionGroup">
+        <arguments>
+            <argument name="orderId" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="gotoOrderGridPage"/>
+        <waitForPageLoad stepKey="waitForOrderGridPageLoad"/>
+        <click selector="{{AdminOrdersGridSection.loginAsCustomerLink(orderId)}}" stepKey="clickLoginAsCustomerLink"/>
+        <switchToNextTab stepKey="switchToNewTab"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageActionGroup.xml
new file mode 100644
index 0000000000000..3b6f363a2d651
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageActionGroup.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">
+    <!-- Verify Login As Customer Login action is works properly from Order grid page -->
+    <actionGroup name="AdminLoginAsCustomerLoginFromOrderPageActionGroup">
+        <arguments>
+            <argument name="orderId" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminOrderPage.url(orderId)}}" stepKey="gotoOrderPage"/>
+        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
+        <click selector="{{AdminOrderDetailsMainActionsSection.loginAsCustomer}}" stepKey="clickLoginAsCustomerLink"/>
+        <switchToNextTab stepKey="switchToNewTab"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerLoggedInActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerLoggedInActionGroup.xml
new file mode 100644
index 0000000000000..5a37ff8e43e7f
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerLoggedInActionGroup.xml
@@ -0,0 +1,29 @@
+<?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">
+    <!-- Verify Admin successfully logged in as Customer -->
+    <actionGroup name="StorefrontAssertLoginAsCustomerLoggedInActionGroup">
+        <arguments>
+            <argument name="customerFullName" type="string"/>
+            <argument name="customerEmail" type="string"/>
+        </arguments>
+        <seeInCurrentUrl url="{{StorefrontLoginAsCustomerLoginProceedPage.url}}" stepKey="assertOnProceedPage"/>
+        <!-- TODO: uncomment after fix -->
+        <!-- <seeInTitle userInput="You are logged in." stepKey="assertYouAreLoggedInInTitle"/>-->
+        <see selector="{{StorefrontCMSPageSection.mainTitle}}" userInput="You are logged in."
+             stepKey="assertYouAreLoggedInOnPage"/>
+        <!-- TODO: uncomment after fix -->
+        <!-- <see selector="{{LoggedInCustomerHeaderLinksSection.customerDropdownMenu}}" userInput="Welcome, {{customerFullName}}!" stepKey="assertCorrectWelcomeMessage"/>-->
+        <amOnPage url="{{StorefrontCustomerDashboardPage.url}}" stepKey="gotoCustomerAccountPage"/>
+        <waitForPageLoad stepKey="waitForCustomerAccountPageLoad"/>
+        <see selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}"
+             userInput="{{customerEmail}}" stepKey="assertCustomerEmailInContactInformation"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontSignOutAndCloseTabActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontSignOutAndCloseTabActionGroup.xml
new file mode 100644
index 0000000000000..523c2cd06f6f2
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontSignOutAndCloseTabActionGroup.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">
+    <!-- Customer sing out and close tab -->
+    <actionGroup name="StorefrontSignOutAndCloseTabActionGroup">
+        <click selector="{{StoreFrontSignOutSection.customerAccount}}" stepKey="clickCustomerButton"/>
+        <click selector="{{StoreFrontSignOutSection.signOut}}" stepKey="clickToSignOut"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see userInput="You are signed out" stepKey="signOut"/>
+        <closeTab stepKey="closeTab"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Page/StorefrontLoginAsCustomerLoginProceedPage.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Page/StorefrontLoginAsCustomerLoginProceedPage.xml
new file mode 100644
index 0000000000000..05af5f506112e
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Page/StorefrontLoginAsCustomerLoginProceedPage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:/Page/etc/PageObject.xsd">
+    <page name="StorefrontLoginAsCustomerLoginProceedPage" url="loginascustomer/login/proceed" area="storefront" module="Magento_LoginAsCustomer"/>
+</pages>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminCustomerGridSection.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminCustomerGridSection.xml
new file mode 100644
index 0000000000000..e7b38bf9f9c94
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminCustomerGridSection.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="AdminCustomerGridSection">
+        <element name="customerLoginAsCustomerLinkByEmail" type="text" selector="//tr[contains(@class, 'data-row') and td/div[text()='{{customerEmail}}']]//a[@class='action-menu-item'][text() = 'Login As Customer']" parameterized="true" timeout="30"/>
+    </section>
+</sections>
+
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminCustomerMainActionsSection.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminCustomerMainActionsSection.xml
new file mode 100644
index 0000000000000..b7e35ba113795
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminCustomerMainActionsSection.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="AdminCustomerMainActionsSection">
+        <element name="loginAsCustomer" type="button" selector="#login_as_customer" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminOrderDetailsMainActionsSection.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminOrderDetailsMainActionsSection.xml
new file mode 100644
index 0000000000000..629ec253d2778
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminOrderDetailsMainActionsSection.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="AdminOrderDetailsMainActionsSection">
+        <element name="loginAsCustomer" type="button" selector="#guest_to_customer" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminOrdersGridSection.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminOrdersGridSection.xml
new file mode 100644
index 0000000000000..ac2dc8ef8c421
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminOrdersGridSection.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="AdminOrdersGridSection">
+        <element name="loginAsCustomerLink" type="text" selector="//td/div[contains(.,'{{orderId}}')]/../..//a[@class='action-menu-item'][text() = 'Login As Customer']" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml
new file mode 100644
index 0000000000000..fd7828f570a85
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.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="AdminUIShownIfLoginAsCustomerEnabledTest">
+        <annotations>
+            <features value="Login As Customer"/>
+            <stories value="Availability of UI elements if module enable/disable"/>
+            <title value="UI elements are shown if 'Login as customer' functionality is disabled"/>
+            <description
+                value="Verify that UI elements are present and links are working if 'Login as customer' functionality enabled"/>
+            <severity value="BLOCKER"/>
+            <group value="login_as_customer"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
+                        stepKey="enableLoginAsCustomer"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0"
+                        stepKey="disableLoginAsCustomer"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
+        </after>
+
+        <!-- Verify Login As Customer Login action works correctly from Customer grid page -->
+        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerGirdPageActionGroup"
+                     stepKey="verifyLoginAsCustomerWorksOnCustomerGridPage">
+            <argument name="customerEmail" value="$$createCustomer.email$$"/>
+        </actionGroup>
+
+        <actionGroup ref="StorefrontAssertLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromCustomerGird">
+            <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
+            <argument name="customerEmail" value="$$createCustomer.email$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontSignOutAndCloseTabActionGroup" stepKey="signOutAfterLoggedInFromCustomerGird"/>
+
+        <!-- Verify Login As Customer Login action works correctly from Customer page -->
+        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup"
+                     stepKey="verifyLoginAsCustomerWorksOnCustomerPage">
+            <argument name="customerId" value="$$createCustomer.id$$"/>
+        </actionGroup>
+
+        <actionGroup ref="StorefrontAssertLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromCustomerPage">
+            <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
+            <argument name="customerEmail" value="$$createCustomer.email$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontSignOutAndCloseTabActionGroup" stepKey="signOutAfterLoggedInFromCustomerPage"/>
+
+        <!-- Create order -->
+        <actionGroup ref="CreateOrderActionGroup" stepKey="createOrder">
+            <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>
+
+        <!-- Verify Login As Customer Login action works correctly from Order grid page -->
+        <actionGroup ref="AdminLoginAsCustomerLoginFromOrderGridPageActionGroup"
+                     stepKey="verifyLoginAsCustomerWorksOnOrderGridPage">
+            <argument name="orderId" value="$grabOrderId"/>
+        </actionGroup>
+
+        <actionGroup ref="StorefrontAssertLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromOrderGridPage">
+            <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
+            <argument name="customerEmail" value="$$createCustomer.email$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontSignOutAndCloseTabActionGroup" stepKey="signOutAfterLoggedInFromOrderGridPage"/>
+
+        <!-- Verify Login As Customer Login action works correctly from Order page -->
+        <actionGroup ref="AdminLoginAsCustomerLoginFromOrderPageActionGroup"
+                     stepKey="verifyLoginAsCustomerWorksOnOrderPage">
+            <argument name="orderId" value="$grabOrderId"/>
+        </actionGroup>
+
+        <actionGroup ref="StorefrontAssertLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromOrderPage">
+            <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
+            <argument name="customerEmail" value="$$createCustomer.email$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontSignOutAndCloseTabActionGroup" stepKey="signOutAfterLoggedInFromOrderPage"/>
+    </test>
+</tests>

From 5489b0ddc16719c824849b7b7b62358beeff8f1b Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Mon, 13 Apr 2020 15:20:27 +0300
Subject: [PATCH 0193/1718] magento2-login-as-customer/issues/41: "Admin user
 login as customer and place order" test added.

---
 ...sMessageOrderCreatedByAdminActionGroup.xml | 21 ++++++
 ...sMessageOrderCreatedByAdminActionGroup.xml | 20 ++++++
 .../AdminLoginAsCustomerPlaceOrderTest.xml    | 71 +++++++++++++++++++
 3 files changed, 112 insertions(+)
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertContainsMessageOrderCreatedByAdminActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertContainsMessageOrderCreatedByAdminActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertContainsMessageOrderCreatedByAdminActionGroup.xml
new file mode 100644
index 0000000000000..8e92a115f4595
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertContainsMessageOrderCreatedByAdminActionGroup.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">
+    <!-- Assert Admin Order page contains message about Order created by a Store Administrator -->
+    <actionGroup name="AdminAssertContainsMessageOrderCreatedByAdminActionGroup">
+        <arguments>
+            <argument name="orderId" type="string"/>
+            <argument name="adminUserFullName" defaultValue="Magento User" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminOrderPage.url(orderId)}}" stepKey="gotoOrderPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see userInput="Order Placed by {{adminUserFullName}} using Login as Customer" stepKey="seeMessageOrderCreatedByAdmin"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup.xml
new file mode 100644
index 0000000000000..508ada3295a8e
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup.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">
+    <!-- Assert Storefront Order page contains message about Order created by a Store Administrator -->
+    <actionGroup name="StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup">
+        <arguments>
+            <argument name="orderId" type="string"/>
+        </arguments>
+        <amOnPage url="{{StorefrontCustomerOrderViewPage.url(orderId)}}" stepKey="gotoOrderPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see userInput="Order Placed by Store Administrator" stepKey="seeMessageOrderCreatedByAdmin"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml
new file mode 100644
index 0000000000000..c65ecb4f95206
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml
@@ -0,0 +1,71 @@
+<?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="AdminLoginAsCustomerPlaceOrderTest">
+        <annotations>
+            <features value="Login As Customer"/>
+            <stories value="Place order and reorder"/>
+            <title value="Admin user login as customer and place order"/>
+            <description
+                value="Verify that admin user can place order using 'Login as customer' functionality"/>
+            <severity value="BLOCKER"/>
+            <group value="login_as_customer"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
+                        stepKey="enableLoginAsCustomer"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0"
+                        stepKey="disableLoginAsCustomer"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
+        </after>
+
+        <!-- Login As Customer from Customer grid page -->
+        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerGirdPageActionGroup"
+                     stepKey="loginAsCustomer">
+            <argument name="customerEmail" value="$$createCustomer.email$$"/>
+        </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="StorefrontOpenCartPageActionGroup" stepKey="openCart"/>
+        <actionGroup ref="PlaceOrderWithLoggedUserActionGroup" stepKey="placeOrder"/>
+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderId"/>
+
+        <!-- Assert Storefront Order page contains message about Order created by a Store Administrator -->
+        <actionGroup ref="StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyStorefrontMessageOrderCreatedByAdmin">
+            <argument name="orderId" value="{$grabOrderId}"/>
+        </actionGroup>
+
+        <!-- Assert Admin Order page contains message about Order created by a Store Administrator -->
+        <actionGroup ref="AdminAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageOrderCreatedByAdmin">
+            <argument name="orderId" value="{$grabOrderId}"/>
+        </actionGroup>
+    </test>
+</tests>

From db39be78feec1df4f93aab5b03dbba12453d789b Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Mon, 13 Apr 2020 15:59:40 +0300
Subject: [PATCH 0194/1718] magento2-login-as-customer/issues/41: "Admin user
 login as customer and reorder existing order" test added.

---
 .../AdminLoginAsCustomerPlaceOrderTest.xml    |  1 -
 .../Test/AdminLoginAsCustomerReorderTest.xml  | 86 +++++++++++++++++++
 2 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerReorderTest.xml

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml
index c65ecb4f95206..54c364eb10cee 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml
@@ -33,7 +33,6 @@
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0"
                         stepKey="disableLoginAsCustomer"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerReorderTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerReorderTest.xml
new file mode 100644
index 0000000000000..d89da1e53d0b0
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerReorderTest.xml
@@ -0,0 +1,86 @@
+<?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="AdminLoginAsCustomerReorderTest">
+        <annotations>
+            <features value="Login As Customer"/>
+            <stories value="Place order and reorder"/>
+            <title value="Admin user login as customer and reorder existing order"/>
+            <description
+                value="Verify that admin user can reorder using 'Login as customer' functionality"/>
+            <severity value="MAJOR"/>
+            <group value="login_as_customer"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
+                        stepKey="enableLoginAsCustomer"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0"
+                        stepKey="disableLoginAsCustomer"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
+        </after>
+
+        <!-- Login to storefront as Customer -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </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="StorefrontOpenCartPageActionGroup" stepKey="openCart"/>
+        <actionGroup ref="PlaceOrderWithLoggedUserActionGroup" stepKey="placeOrder"/>
+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderId"/>
+
+        <!-- Log out from storefront as Customer -->
+        <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogOut"/>
+
+        <!-- Login As Customer from Customer grid page -->
+        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerGirdPageActionGroup"
+                     stepKey="loginAsCustomer">
+            <argument name="customerEmail" value="$$createCustomer.email$$"/>
+        </actionGroup>
+
+        <!-- Make reorder -->
+        <actionGroup ref="StorefrontCustomerReorderActionGroup" stepKey="makeReorder">
+            <argument name="orderNumber" value="{$grabOrderId}"/>
+        </actionGroup>
+        <actionGroup ref="PlaceOrderWithLoggedUserActionGroup" stepKey="placeReorder"/>
+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabReorderId"/>
+
+        <!-- Assert Storefront Order page contains message about Order created by a Store Administrator -->
+        <actionGroup ref="StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyStorefrontMessageOrderCreatedByAdmin">
+            <argument name="orderId" value="{grabReorderId}"/>
+        </actionGroup>
+
+        <!-- Assert Admin Order page contains message about Order created by a Store Administrator -->
+        <actionGroup ref="AdminAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageOrderCreatedByAdmin">
+            <argument name="orderId" value="{grabReorderId}"/>
+        </actionGroup>
+
+    </test>
+</tests>

From d27139a3fead24759bf4ffe1b3a20aaf6f1b79b9 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Tue, 14 Apr 2020 15:28:32 +0300
Subject: [PATCH 0195/1718] magento2-login-as-customer/issues/41: "Verify that
 'Login as customer Log' record information about using 'Login as Customer'
 functionality properly" test added.

---
 ...ertLoginAsCustomerLogRecordActionGroup.xml |  22 ++++
 ...minFilterLoginAsCustomerLogActionGroup.xml |  25 ++++
 ...AdminOpenLoginAsCustomerLogActionGroup.xml |  17 +++
 ...torefrontSignOutAndCloseTabActionGroup.xml |   2 +-
 .../Mftf/Page/AdminLoginAsCustomerLogPage.xml |   6 +-
 .../AdminLoginAsCustomerLogFiltersSection.xml |  21 ++++
 .../AdminLoginAsCustomerLogGridSection.xml    |  20 ++++
 .../AdminLoginAsCustomerLogToolbarSection.xml |  16 +++
 .../Test/AdminLoginAsCustomerLoggingTest.xml  | 109 ++++++++++++++++++
 9 files changed, 236 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerLogRecordActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminFilterLoginAsCustomerLogActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminOpenLoginAsCustomerLogActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerLogFiltersSection.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerLogGridSection.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerLogToolbarSection.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingTest.xml

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerLogRecordActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerLogRecordActionGroup.xml
new file mode 100644
index 0000000000000..270ce7d3719a2
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerLogRecordActionGroup.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">
+    <!-- Assert Login As Customer Log record is correct -->
+    <actionGroup name="AdminAssertLoginAsCustomerLogRecordActionGroup">
+        <arguments>
+            <argument name="rowNumber" type="string"/>
+            <argument name="adminId" type="string"/>
+            <argument name="customerId" type="string"/>
+        </arguments>
+        <seeInCurrentUrl url="{{AdminLoginAsCustomerLogPage.url}}" stepKey="checkUrl"/>
+        <see selector="{{AdminLoginAsCustomerLogGridSection.adminIdInRow(rowNumber)}}" userInput="{{adminId}}" stepKey="seeCorrectAdminId"/>
+        <see selector="{{AdminLoginAsCustomerLogGridSection.customerIdInRow(rowNumber)}}" userInput="{{customerId}}" stepKey="seeCorrectCustomerId"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminFilterLoginAsCustomerLogActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminFilterLoginAsCustomerLogActionGroup.xml
new file mode 100644
index 0000000000000..cab68918745a6
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminFilterLoginAsCustomerLogActionGroup.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">
+    <!-- Filter Login As Customer Log records -->
+    <actionGroup name="AdminFilterLoginAsCustomerLogActionGroup">
+        <arguments>
+            <argument name="adminId" type="string"/>
+            <argument name="customerId" type="string"/>
+        </arguments>
+        <seeInCurrentUrl url="{{AdminLoginAsCustomerLogPage.url}}" stepKey="checkUrl"/>
+        <click selector="{{AdminLoginAsCustomerLogToolbarSection.resetFilter}}" stepKey="resetFilters"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForResetFilter"/>
+        <fillField selector="{{AdminLoginAsCustomerLogFiltersSection.adminId}}" userInput="{{adminId}}" stepKey="fillAdminId"/>
+        <fillField selector="{{AdminLoginAsCustomerLogFiltersSection.customerId}}" userInput="{{customerId}}" stepKey="fillCustomerId"/>
+        <click selector="{{AdminLoginAsCustomerLogToolbarSection.search}}" stepKey="applyFilters"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForApplyFilter"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminOpenLoginAsCustomerLogActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminOpenLoginAsCustomerLogActionGroup.xml
new file mode 100644
index 0000000000000..508b13abbc43e
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminOpenLoginAsCustomerLogActionGroup.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">
+    <!-- Navigate to Login As Customer Log page -->
+    <actionGroup name="AdminOpenLoginAsCustomerLogActionGroup">
+        <amOnPage url="{{AdminLoginAsCustomerLogPage.url}}" stepKey="gotoLoginAsCustomerLogPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see userInput="Login As Customer Log" stepKey="titleIsVisible"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontSignOutAndCloseTabActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontSignOutAndCloseTabActionGroup.xml
index 523c2cd06f6f2..9eaed420ba9da 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontSignOutAndCloseTabActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontSignOutAndCloseTabActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <!-- Customer sing out and close tab -->
+    <!-- Customer sign out and close tab -->
     <actionGroup name="StorefrontSignOutAndCloseTabActionGroup">
         <click selector="{{StoreFrontSignOutSection.customerAccount}}" stepKey="clickCustomerButton"/>
         <click selector="{{StoreFrontSignOutSection.signOut}}" stepKey="clickToSignOut"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Page/AdminLoginAsCustomerLogPage.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Page/AdminLoginAsCustomerLogPage.xml
index 2eef65e390309..0a26dd74d1ee9 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Page/AdminLoginAsCustomerLogPage.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Page/AdminLoginAsCustomerLogPage.xml
@@ -8,5 +8,9 @@
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:/Page/etc/PageObject.xsd">
-    <page name="AdminLoginAsCustomerLogPage" url="admin/loginascustomer/login/" area="admin" module="Magento_LoginAsCustomer"/>
+    <page name="AdminLoginAsCustomerLogPage" url="loginascustomer/login/" area="admin" module="Magento_LoginAsCustomer">
+        <section name="AdminLoginAsCustomerLogToolbarSection"/>
+        <section name="AdminLoginAsCustomerLogFiltersSection"/>
+        <section name="AdminLoginAsCustomerLogGridSection"/>
+    </page>
 </pages>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerLogFiltersSection.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerLogFiltersSection.xml
new file mode 100644
index 0000000000000..dce2204f86f82
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerLogFiltersSection.xml
@@ -0,0 +1,21 @@
+<?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="AdminLoginAsCustomerLogFiltersSection">
+        <element name="loginId" type="input" selector="//input[@id='subscriberGrid_filter_login_id']"/>
+        <element name="customerId" type="input" selector="//input[@id='subscriberGrid_filter_customer_id']"/>
+        <element name="customerEmail" type="input" selector="//input[@id='subscriberGrid_filter_email']"/>
+        <element name="adminId" type="input" selector="//input[@id='subscriberGrid_filter_admin_id']"/>
+        <element name="adminName" type="input" selector="//input[@id='subscriberGrid_filter_username']"/>
+        <element name="from" type="input" selector="//input[@name='created_at[from]']"/>
+        <element name="to" type="input" selector="//input[@name='created_at[to]']"/>
+    </section>
+</sections>
+
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerLogGridSection.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerLogGridSection.xml
new file mode 100644
index 0000000000000..d2f37fae04d13
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerLogGridSection.xml
@@ -0,0 +1,20 @@
+<?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="AdminLoginAsCustomerLogGridSection">
+        <element name="loginIdInRow" type="text" selector="//table[@class='data-grid']/tbody/tr[{{row}}]/td[@data-column='login_id']" parameterized="true"/>
+        <element name="customerIdInRow" type="text" selector="//table[@class='data-grid']/tbody/tr[{{row}}]/td[@data-column='customer_id']" parameterized="true"/>
+        <element name="customerEmailInRow" type="text" selector="//table[@class='data-grid']/tbody/tr[{{row}}]/td[@data-column='email']" parameterized="true"/>
+        <element name="adminIdInRow" type="text" selector="//table[@class='data-grid']/tbody/tr[{{row}}]/td[@data-column='admin_id']" parameterized="true"/>
+        <element name="adminNameInRow" type="text" selector="//table[@class='data-grid']/tbody/tr[{{row}}]/td[@data-column='username']" parameterized="true"/>
+        <element name="createdAtInRow" type="text" selector="//table[@class='data-grid']/tbody/tr[{{row}}]/td[@data-column='created_at']" parameterized="true"/>
+    </section>
+</sections>
+
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerLogToolbarSection.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerLogToolbarSection.xml
new file mode 100644
index 0000000000000..a403367ee0d02
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerLogToolbarSection.xml
@@ -0,0 +1,16 @@
+<?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="AdminLoginAsCustomerLogToolbarSection">
+        <element name="search"  type="button" selector="button[data-action='grid-filter-apply']"/>
+        <element name="resetFilter" type="button" selector="button[data-action='grid-filter-reset']"/>
+    </section>
+</sections>
+
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingTest.xml
new file mode 100644
index 0000000000000..c66a1519d9c63
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingTest.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="AdminLoginAsCustomerLoggingTest">
+        <annotations>
+            <features value="Login As Customer"/>
+            <!-- TODO: change "stories" value -->
+            <stories value="Place order and reorder"/>
+            <title value="Using 'Login As Customer' is logged properly"/>
+            <description
+                value="Verify that 'Login as customer Log' record information about using 'Login as Customer' functionality properly"/>
+            <severity value="MAJOR"/>
+            <group value="login_as_customer"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
+                        stepKey="enableLoginAsCustomer"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
+            <createData entity="NewAdminUser" stepKey="createNewAdmin"/>
+            <createData entity="Simple_US_Customer" stepKey="createFirstCustomer"/>
+            <createData entity="Simple_US_CA_Customer" stepKey="createSecondCustomer"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDefaultUser"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createFirstCustomer" stepKey="deleteFirstCustomer"/>
+            <deleteData createDataKey="createSecondCustomer" stepKey="deleteSecondCustomer"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginToDeleteNewAdmin"/>
+            <actionGroup ref="AdminDeleteUserViaCurlActionGroup" stepKey="deleteNewAdmin">
+                <argument name="user" value="NewAdminUser"/>
+            </actionGroup>
+            <actionGroup ref="logout" stepKey="logoutAfter"/>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0"
+                        stepKey="disableLoginAsCustomer"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
+        </after>
+
+        <!-- Login into First Customer account -->
+        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerGirdPageActionGroup"
+                     stepKey="loginAsFirstCustomerByDefaultAdmin">
+            <argument name="customerEmail" value="$$createFirstCustomer.email$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontSignOutAndCloseTabActionGroup" stepKey="signOutFirstCustomerDefaultAdmin"/>
+
+        <!-- Login into Second Customer account -->
+        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerGirdPageActionGroup"
+                     stepKey="loginAsSecondCustomerByDefaultAdmin">
+            <argument name="customerEmail" value="$$createSecondCustomer.email$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontSignOutAndCloseTabActionGroup" stepKey="signOutSecondCustomerDefaultAdmin"/>
+
+        <!-- Log out as Default Admin User -->
+        <actionGroup ref="logout" stepKey="logoutAsDefaultAdmin"/>
+
+        <!-- Login as New Admin User -->
+        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsNewUser">
+            <argument name="username" value="$$createNewAdmin.username$$"/>
+            <argument name="password" value="$$createNewAdmin.password$$"/>
+        </actionGroup>
+
+        <!-- Login into First Customer account -->
+        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerGirdPageActionGroup"
+                     stepKey="loginAsFirstCustomerByNewAdmin">
+            <argument name="customerEmail" value="$$createFirstCustomer.email$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontSignOutAndCloseTabActionGroup" stepKey="signOutFirstCustomerNewAdmin"/>
+
+        <!-- Login into Second Customer account -->
+        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerGirdPageActionGroup"
+                     stepKey="loginAsSecondCustomerByNewAdmin">
+            <argument name="customerEmail" value="$$createSecondCustomer.email$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontSignOutAndCloseTabActionGroup" stepKey="signOutSecondCustomerNewAdmin"/>
+
+        <!-- Navigate to Login As Customer Log page -->
+        <actionGroup ref="AdminOpenLoginAsCustomerLogActionGroup" stepKey="gotoLoginAsCustomerLog"/>
+
+        <!-- Perform assertions -->
+        <actionGroup ref="AdminAssertLoginAsCustomerLogRecordActionGroup" stepKey="verifyDefaultAdminFirstCustomerLogRecord">
+            <argument name="rowNumber" value="4"/>
+            <argument name="adminId" value="1"/>
+            <argument name="customerId" value="$$createFirstCustomer.id$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertLoginAsCustomerLogRecordActionGroup" stepKey="verifyDefaultAdminSecondCustomerLogRecord">
+            <argument name="rowNumber" value="3"/>
+            <argument name="adminId" value="1"/>
+            <argument name="customerId" value="$$createSecondCustomer.id$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertLoginAsCustomerLogRecordActionGroup" stepKey="verifyNewAdminFirstCustomerLogRecord">
+            <argument name="rowNumber" value="2"/>
+            <argument name="adminId" value="$$createNewAdmin.id$$"/>
+            <argument name="customerId" value="$$createFirstCustomer.id$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertLoginAsCustomerLogRecordActionGroup" stepKey="verifyNewAdminSecondCustomerLogRecord">
+            <argument name="rowNumber" value="1"/>
+            <argument name="adminId" value="$$createNewAdmin.id$$"/>
+            <argument name="customerId" value="$$createSecondCustomer.id$$"/>
+        </actionGroup>
+
+        <!-- Log out as New Admin User -->
+        <actionGroup ref="logout" stepKey="logoutAsNewAdmin"/>
+    </test>
+</tests>

From e7ab82efb1fff67678f0043284449c17f80aca3a Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Wed, 15 Apr 2020 13:57:21 +0300
Subject: [PATCH 0196/1718] magento2-login-as-customer/issues/42: "Admin user
 login as customer and edit customer's address" test added.

---
 ...oginAsCustomerEditCustomersAddressTest.xml | 75 +++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerEditCustomersAddressTest.xml

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerEditCustomersAddressTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerEditCustomersAddressTest.xml
new file mode 100644
index 0000000000000..88f65b167efc9
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerEditCustomersAddressTest.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="AdminLoginAsCustomerEditCustomersAddressTest">
+        <annotations>
+            <features value="Login As Customer"/>
+            <stories value="Edit Customer addresses"/>
+            <title value="Admin user login as customer and edit customer's address"/>
+            <description
+                value="Verify Admin can access customer's personal cabinet and change his default shipping and billing addresses using Login As Customer functionality"/>
+            <severity value="CRITICAL"/>
+            <group value="login_as_customer"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
+                        stepKey="enableLoginAsCustomer"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logoutAdmin"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0"
+                        stepKey="disableLoginAsCustomer"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
+        </after>
+
+        <!-- Login As Customer Login from Customer page -->
+        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup"
+                     stepKey="loginAsCustomerFromCustomerPage">
+            <argument name="customerId" value="$$createCustomer.id$$"/>
+        </actionGroup>
+
+        <!-- Add new default address -->
+        <actionGroup ref="StorefrontAddCustomerDefaultAddressActionGroup" stepKey="addNewDefaultAddress">
+            <argument name="Address" value="US_Address_CA"/>
+        </actionGroup>
+
+        <!-- Open Customer edit page -->
+        <actionGroup ref="StorefrontSignOutAndCloseTabActionGroup" stepKey="signOutAfterLoggedInAsCustomer"/>
+        <actionGroup ref="AdminOpenCustomerEditPageActionGroup" stepKey="openCustomerEditPage">
+            <argument name="customerId" value="$createCustomer.id$"/>
+        </actionGroup>
+
+        <!-- Assert Customer Default Billing Address -->
+        <actionGroup stepKey="checkDefaultBilling" ref="AdminAssertCustomerDefaultBillingAddress">
+            <argument name="firstName" value="$$createCustomer.firstname$$"/>
+            <argument name="lastName" value="$$createCustomer.lastname$$"/>
+            <argument name="street1" value="{{US_Address_CA.street[0]}}"/>
+            <argument name="state" value="{{US_Address_CA.state}}"/>
+            <argument name="postcode" value="{{US_Address_CA.postcode}}"/>
+            <argument name="country" value="{{US_Address_CA.country}}"/>
+            <argument name="telephone" value="{{US_Address_CA.telephone}}"/>
+        </actionGroup>
+
+        <!-- Assert Customer Default Shipping Address -->
+        <actionGroup stepKey="checkDefaultShipping" ref="AdminAssertCustomerDefaultShippingAddress">
+            <argument name="firstName" value="$$createCustomer.firstname$$"/>
+            <argument name="lastName" value="$$createCustomer.lastname$$"/>
+            <argument name="street1" value="{{US_Address_CA.street[0]}}"/>
+            <argument name="state" value="{{US_Address_CA.state}}"/>
+            <argument name="postcode" value="{{US_Address_CA.postcode}}"/>
+            <argument name="country" value="{{US_Address_CA.country}}"/>
+            <argument name="telephone" value="{{US_Address_CA.telephone}}"/>
+        </actionGroup>
+    </test>
+</tests>

From f09dbd2e923ff7ee81c7e014caab6076a98ed90b Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Wed, 15 Apr 2020 15:28:34 +0300
Subject: [PATCH 0197/1718] magento2-login-as-customer/issues/43: Admin user
 login as customer and add products to customer's wish-list" test added.

---
 ...oginAsCustomerAddProductToWishlistTest.xml | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAddProductToWishlistTest.xml

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAddProductToWishlistTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAddProductToWishlistTest.xml
new file mode 100644
index 0000000000000..1327bc1b74ecc
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAddProductToWishlistTest.xml
@@ -0,0 +1,62 @@
+<?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="AdminLoginAsCustomerAddProductToWishlistTest">
+        <annotations>
+            <features value="Login As Customer"/>
+            <stories value="Added product to wish-list"/>
+            <title value="Admin user login as customer and add products to customer's wish-list"/>
+            <description
+                value="Verify that Admin can add products to customer's wish-list using Login As Customer functionality"/>
+            <severity value="AVERAGE"/>
+            <group value="login_as_customer"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
+                        stepKey="enableLoginAsCustomer"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0"
+                        stepKey="disableLoginAsCustomer"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
+        </after>
+
+        <!-- Admin Login As Customer from Customer page -->
+        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup"
+                     stepKey="lLoginAsCustomerFromCustomerPage">
+            <argument name="customerId" value="$$createCustomer.id$$"/>
+        </actionGroup>
+
+        <!-- Navigate to Product page and add it to Wishlist -->
+        <actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="openProductPage">
+            <argument name="productUrlKey" value="$$createSimpleProduct.custom_attributes[url_key]$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCustomerAddProductToWishlistActionGroup" stepKey="addProductToWishlist">
+            <argument name="productVar" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+
+        <!-- Open Customer Wishlist and verify Product present there -->
+        <actionGroup ref="AssertProductIsPresentInWishListActionGroup" stepKey="assertProductInWishlist">
+            <argument name="productName" value="$$createSimpleProduct.name$$"/>
+            <argument name="productPrice" value="$$createSimpleProduct.price$$"/>
+        </actionGroup>
+    </test>
+</tests>

From affcbe95b03984ca17b4dd0e59840517e84ae3e9 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Wed, 15 Apr 2020 16:27:24 +0300
Subject: [PATCH 0198/1718] magento2-login-as-customer/issues/44: "Admin user
 login as customer and make subscription to newsletter" test added.

---
 ...ginAsCustomerSubscribeToNewsletterTest.xml | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSubscribeToNewsletterTest.xml

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSubscribeToNewsletterTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSubscribeToNewsletterTest.xml
new file mode 100644
index 0000000000000..477fb82408903
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSubscribeToNewsletterTest.xml
@@ -0,0 +1,55 @@
+<?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="AdminLoginAsCustomerSubscribeToNewsletterTest">
+        <annotations>
+            <features value="Login As Customer"/>
+            <stories value="Subscribe to newsletter"/>
+            <title value="Admin user login as customer and make subscription to newsletter"/>
+            <description
+                value="Verify that Admin can subscribe to newsletter using Login As Customer functionality"/>
+            <severity value="AVERAGE"/>
+            <group value="login_as_customer"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
+                        stepKey="enableLoginAsCustomer"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0"
+                        stepKey="disableLoginAsCustomer"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
+        </after>
+
+        <!-- Admin Login As Customer from Customer page -->
+        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup"
+                     stepKey="lLoginAsCustomerFromCustomerPage">
+            <argument name="customerId" value="$$createCustomer.id$$"/>
+        </actionGroup>
+
+        <!-- Subscribe for newsletter -->
+        <amOnPage url="{{StorefrontNewsletterManagePage.url}}" stepKey="goToNewsletterManage"/>
+        <click selector="{{StorefrontNewsletterManageSection.subscriptionCheckbox}}"
+               stepKey="checkSubscribedNewsletter"/>
+        <click selector="{{StorefrontNewsletterManageSection.saveButton}}"
+               stepKey="saveSubscription"/>
+        <waitForPageLoad stepKey="waitForSubscriptionSaved"/>
+        <actionGroup ref="StorefrontSignOutAndCloseTabActionGroup" stepKey="signOutAfterLoggedInAsCustomer"/>
+
+        <!-- Verify subscription successful -->
+        <amOnPage url="{{AdminNewsletterSubscriberPage.url}}" stepKey="goToNewsletterSubscriberGrid"/>
+        <see selector="{{AdminNewsletterSubscriberGridSection.email('1')}}" userInput="$$createCustomer.email$$" stepKey="seeCustomerEmailInSubscriberGrid"/>
+        <see selector="{{AdminNewsletterSubscriberGridSection.type('1')}}" userInput="Customer" stepKey="seeCustomerTypeInSubscriberGrid"/>
+    </test>
+</tests>

From 3b313a58fc33fa9fd7d74ab62b8959b311787e02 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Thu, 16 Apr 2020 15:13:46 +0300
Subject: [PATCH 0199/1718] magento2-login-as-customer/issues/40: "Login into
 Magento Admin panel as user that does not have access to 'Login as customer'
 button" test added.

---
 ...minNoAccessToLoginAsCustomerButtonTest.xml | 101 ++++++++++++++++++
 1 file changed, 101 insertions(+)
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerButtonTest.xml

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerButtonTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerButtonTest.xml
new file mode 100644
index 0000000000000..5edbc0c5bbbf5
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerButtonTest.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="AdminNoAccessToLoginAsCustomerButtonTest">
+        <annotations>
+            <features value="Login As Customer"/>
+            <stories value="Permissions and ACl"/>
+            <title value="User does not have access to 'Login as customer' button"/>
+            <description value="Login into Magento Admin panel as user that does not have access to 'Login as customer' button"/>
+            <severity value="CRITICAL"/>
+            <group value="login_as_customer"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1" stepKey="enableLoginAsCustomer"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsDefaultAdminUserBefore"/>
+
+            <!--Create New User-->
+            <actionGroup ref="AdminOpenNewUserPageActionGroup" stepKey="goToNewUserPage"/>
+            <actionGroup ref="AdminFillNewUserFormRequiredFieldsActionGroup" stepKey="fillNewUserForm">
+                <argument name="user" value="NewAdminUser"/>
+            </actionGroup>
+            <actionGroup ref="AdminClickSaveButtonOnUserFormActionGroup" stepKey="saveNewUser"/>
+
+            <!--Create New Role-->
+            <actionGroup ref="AdminOpenCreateRolePageActionGroup" stepKey="goToNewRolePage"/>
+            <actionGroup ref="AdminFillUserRoleFormActionGroup" stepKey="fillNewRoleForm">
+                <argument name="role" value="roleSales"/>
+            </actionGroup>
+            <actionGroup ref="AdminClickSaveButtonOnUserRoleFormActionGroup" stepKey="saveNewRole"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+
+            <!--Delete new User-->
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAsSaleRoleUser"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsDefaultAdminUserAfter"/>
+            <actionGroup ref="AdminDeleteCustomUserActionGroup" stepKey="deleteNewUser">
+                <argument name="user" value="AdminUserWithUpdatedUserRoleToSales"/>
+            </actionGroup>
+
+            <!--Delete new Role-->
+            <actionGroup ref="AdminDeleteUserRoleActionGroup" stepKey="deleteCustomRole">
+                <argument name="roleName" value="{{roleSales.rolename}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logOut"/>
+
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0" stepKey="disableLoginAsCustomer"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
+        </after>
+
+        <!--Assign new role-->
+        <actionGroup ref="AdminOpenUserEditPageActionGroup" stepKey="openUserEditPage">
+            <argument name="user" value="NewAdminUser"/>
+        </actionGroup>
+        <actionGroup ref="AdminFillNewUserFormRequiredFieldsActionGroup" stepKey="fillUserForm">
+            <argument name="user" value="AdminUserWithUpdatedUserRoleToSales"/>
+        </actionGroup>
+        <actionGroup ref="AdminClickSaveButtonOnUserFormActionGroup" stepKey="saveUser"/>
+        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSuccessMessage">
+            <argument name="message" value="You saved the user."/>
+        </actionGroup>
+
+        <!-- Login as new User -->
+        <actionGroup ref="AdminLogoutActionGroup" stepKey="logOutFromAdminPanel"/>
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsSaleRoleUser">
+            <argument name="adminUser" value="AdminUserWithUpdatedUserRoleToSales"/>
+        </actionGroup>
+
+        <!-- Verify Login As Customer Login action is absent on Customer page -->
+        <actionGroup ref="AdminLoginAsCustomerAbsentOnCustomerPageActionGroup" stepKey="verifyLoginAsCustomerAbsentOnCustomerPage">
+            <argument name="customerId" value="$createCustomer.id$"/>
+        </actionGroup>
+
+        <!-- Create order -->
+        <actionGroup ref="CreateOrderActionGroup" stepKey="createOrder">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <grabTextFrom selector="{{AdminOrderDetailsInformationSection.orderId}}" stepKey="grabOrderId"/>
+
+        <!-- Verify Login As Customer Login action is absent on Order page -->
+        <actionGroup ref="AdminLoginAsCustomerAbsentOnOrderPageActionGroup" stepKey="verifyLoginAsCustomerAbsentOnOrderPage">
+            <argument name="orderId" value="{$grabOrderId}"/>
+        </actionGroup>
+    </test>
+</tests>

From 73c429c6bbb17fd71d28abeee82e8b7d9b237b44 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Fri, 17 Apr 2020 10:27:35 +0300
Subject: [PATCH 0200/1718] magento2-login-as-customer/issues/40: "Login into
 Magento Admin panel as user that does not have access to 'Login as customer'
 section in System Configuration" test added.

---
 .../AdminRevokeRoleResourceActionGroup.xml    | 23 +++++
 ...rConfigNotAvailableDirectlyActionGroup.xml | 18 ++++
 ...nAsCustomerConfigNotVisibleActionGroup.xml | 16 ++++
 .../Test/Mftf/Data/UserRoleData.xml           | 35 ++++++++
 .../Mftf/Page/AdminCustomerConfigPage.xml     | 11 +++
 ...cessToLoginAsCustomerConfigurationTest.xml | 90 +++++++++++++++++++
 6 files changed, 193 insertions(+)
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminRevokeRoleResourceActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerConfigNotAvailableDirectlyActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerConfigNotVisibleActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Data/UserRoleData.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Page/AdminCustomerConfigPage.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerConfigurationTest.xml

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminRevokeRoleResourceActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminRevokeRoleResourceActionGroup.xml
new file mode 100644
index 0000000000000..49c404a92f0de
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminRevokeRoleResourceActionGroup.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">
+    <!-- Revoke access to resource from edit role page -->
+    <actionGroup name="AdminRevokeRoleResourceActionGroup">
+        <arguments>
+            <argument name="resourceName" type="string"/>
+        </arguments>
+        <selectOption selector="{{AdminEditRoleResourcesSection.resourceAccess}}" userInput="0"
+                      stepKey="selectResourceAccessCustom"/>
+        <waitForElementVisible selector="{{AdminEditRoleInfoSection.blockName(resourceName)}}"
+                               stepKey="waitForElementVisible"/>
+        <scrollTo selector="{{AdminEditRoleInfoSection.blockName(resourceName)}}" x="0" y="-80" stepKey="scrollToContentBlock"/>
+        <click selector="{{AdminEditRoleInfoSection.blockName(resourceName)}}" stepKey="clickContentBlockCheckbox"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerConfigNotAvailableDirectlyActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerConfigNotAvailableDirectlyActionGroup.xml
new file mode 100644
index 0000000000000..94e3631a5cc51
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerConfigNotAvailableDirectlyActionGroup.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">
+    <!-- Verify Login As Customer config section is not available by direct url -->
+    <actionGroup name="AssertAdminLoginAsCustomerConfigNotAvailableDirectlyActionGroup">
+        <amOnPage url="{{AdminLoginAsCustomerConfigPage.url}}" stepKey="navigateToLoginAsCustomerConfigSection"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <seeInCurrentUrl url="admin/system_config/index" stepKey="seeRedirectToConfigIndexPage"/>
+        <dontSee userInput="Login As Customer" stepKey="dontSeeLoginAsCustomer"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerConfigNotVisibleActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerConfigNotVisibleActionGroup.xml
new file mode 100644
index 0000000000000..f093d57cb171f
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerConfigNotVisibleActionGroup.xml
@@ -0,0 +1,16 @@
+<?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">
+    <!-- Verify no Login As Customer config section available -->
+    <actionGroup name="AssertAdminLoginAsCustomerConfigNotVisibleActionGroup">
+        <!-- TODO: update -->
+        <dontSee userInput="Login As Customer" stepKey="dontSeeLoginAsCustomerItem"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/UserRoleData.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/UserRoleData.xml
new file mode 100644
index 0000000000000..2f3d10dcd4daa
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/UserRoleData.xml
@@ -0,0 +1,35 @@
+<?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">
+    <!--This Role has access for all resources individually -->
+    <entity name="customRoleAllResources" type="user_role">
+        <data key="name" unique="suffix">allAccessRole</data>
+        <data key="rolename">allAccessRole</data>
+        <data key="current_password">{{_ENV.MAGENTO_ADMIN_PASSWORD}}</data>
+        <data key="resourceAccess">Custom</data>
+        <data key="resource">
+            [
+            'Magento_Backend::dashboard',
+            'Magento_Analytics::analytics',
+            'Magento_Sales::sales',
+            'Magento_Catalog::catalog',
+            'Magento_Customer::customer',
+            'Magento_Cart::cart',
+            'Magento_Backend::myaccount',
+            'Magento_Backend::marketing',
+            'Magento_Backend::content',
+            'Magento_Reports::report',
+            'Magento_Backend::stores',
+            'Magento_Backend::system',
+            'Magento_Backend::global_search',
+            ]
+        </data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Page/AdminCustomerConfigPage.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Page/AdminCustomerConfigPage.xml
new file mode 100644
index 0000000000000..cfeead829e8ae
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Page/AdminCustomerConfigPage.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminLoginAsCustomerConfigPage" url="admin/system_config/edit/section/mfloginascustomer" area="admin" module="Magento_LoginAsCustomer">
+    </page>
+</pages>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerConfigurationTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerConfigurationTest.xml
new file mode 100644
index 0000000000000..eab2f2c6dfd6e
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerConfigurationTest.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="AdminNoAccessToLoginAsCustomerConfigurationTest">
+        <annotations>
+            <features value="Login As Customer"/>
+            <stories value="Permissions and ACl"/>
+            <title value="User does not have access to 'Login as customer' section in System Configuration"/>
+            <description
+                value="Login into Magento Admin panel as user that does not have access to 'Login as customer' section in System Configuration"/>
+            <severity value="CRITICAL"/>
+            <group value="login_as_customer"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
+                        stepKey="enableLoginAsCustomer"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsDefaultAdminUserBefore"/>
+
+            <!--Create New Role-->
+            <actionGroup ref="AdminOpenCreateRolePageActionGroup" stepKey="goToNewRolePage"/>
+            <actionGroup ref="AdminFillUserRoleFormActionGroup" stepKey="fillNewRoleForm">
+                <argument name="role" value="customRoleAllResources"/>
+            </actionGroup>
+            <actionGroup ref="AdminRevokeRoleResourceActionGroup" stepKey="revokeLoginAsCustomerAccess">
+                <argument name="resourceName" value="Login As Customer Section"/>
+            </actionGroup>
+            <actionGroup ref="AdminClickSaveButtonOnUserRoleFormActionGroup" stepKey="saveNewRole"/>
+
+            <!--Create New User-->
+            <actionGroup ref="AdminCreateUserWithApiRoleActionGroup" stepKey="adminCreateUser">
+                <argument name="user" value="NewAdminUser"/>
+                <argument name="role" value="customRoleAllResources"/>
+            </actionGroup>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+
+            <!--Delete new User-->
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAsSaleRoleUser"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsDefaultAdminUserAfter"/>
+            <actionGroup ref="AdminDeleteCustomUserActionGroup" stepKey="deleteNewUser">
+                <argument name="user" value="NewAdminUser"/>
+            </actionGroup>
+
+            <!--Delete new Role-->
+            <actionGroup ref="AdminDeleteUserRoleActionGroup" stepKey="deleteCustomRoleAllResources">
+                <argument name="roleName" value="{{customRoleAllResources.rolename}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logOut"/>
+
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0"
+                        stepKey="disableLoginAsCustomer"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
+        </after>
+
+        <!-- Login as new User -->
+        <actionGroup ref="AdminLogoutActionGroup" stepKey="logOutFromAdminPanel"/>
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsSaleRoleUser">
+            <argument name="adminUser" value="NewAdminUser"/>
+        </actionGroup>
+
+        <!-- Navigate to Configuration page and open Customers tab -->
+        <actionGroup ref="AdminOpenStoreConfigPageActionGroup" stepKey="openStoreConfig"/>
+        <actionGroup ref="AdminExpandConfigTabActionGroup" stepKey="expandCustomersTab">
+            <argument name="tabName" value="Customers"/>
+        </actionGroup>
+
+        <!-- Assert no Login As Customer config section visible -->
+        <actionGroup ref="AssertAdminLoginAsCustomerConfigNotVisibleActionGroup" stepKey="assertConfigNotVisible"/>
+
+        <!-- Assert Login As Customer config section is not available by direct url -->
+        <actionGroup ref="AssertAdminLoginAsCustomerConfigNotAvailableDirectlyActionGroup"
+                     stepKey="assertConfigNotAvailableDirectly"/>
+    </test>
+</tests>

From 3c3f7de02158afbb7b69944d3f40db8c53be84ea Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Tue, 21 Apr 2020 12:33:46 +0300
Subject: [PATCH 0201/1718] magento2-login-as-customer/issues/40: "Change admin
 user's access to 'Login as Customer Log'" test added.

---
 .../AdminEditUserRoleActionGroup.xml          | 28 ++++++
 ...nLoginAsCustomerLogFromMenuActionGroup.xml | 21 +++++
 .../Test/Mftf/Page/AdminRoleEditPage.xml      | 12 +++
 ...hangUserAccessToLoginAsCustomerLogTest.xml | 91 +++++++++++++++++++
 4 files changed, 152 insertions(+)
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminEditUserRoleActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminOpenLoginAsCustomerLogFromMenuActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Page/AdminRoleEditPage.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerLogTest.xml

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminEditUserRoleActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminEditUserRoleActionGroup.xml
new file mode 100644
index 0000000000000..6237b50923899
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminEditUserRoleActionGroup.xml
@@ -0,0 +1,28 @@
+<?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">
+    <!--  Open User Role resources for edit -->
+    <actionGroup name="AdminEditUserRoleActionGroup">
+        <arguments>
+            <argument name="roleName" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminRolesPage.url}}" stepKey="navigateToUserRolesGrid"/>
+        <fillField selector="{{AdminRoleGridSection.roleNameFilterTextField}}" userInput="{{roleName}}"
+                   stepKey="enterRoleName"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickSearch"/>
+        <see selector="{{AdminDataGridTableSection.row('1')}}" userInput="{{roleName}}" stepKey="seeUserRole"/>
+        <click selector="{{AdminDataGridTableSection.row('1')}}" stepKey="openRoleEditPage"/>
+        <waitForPageLoad stepKey="waitForRoleEditPageLoad"/>
+        <fillField selector="{{AdminEditRoleInfoSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="enterThePassword" />
+        <click selector="{{AdminCreateRoleSection.roleResources}}" stepKey="clickToOpenRoleResources"/>
+        <waitForPageLoad stepKey="waitForRoleResourceTab"/>
+        <selectOption userInput="Custom" selector="{{AdminCreateRoleSection.resourceAccess}}"
+                      stepKey="selectResourceAccess"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminOpenLoginAsCustomerLogFromMenuActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminOpenLoginAsCustomerLogFromMenuActionGroup.xml
new file mode 100644
index 0000000000000..584e1d22fbc96
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminOpenLoginAsCustomerLogFromMenuActionGroup.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">
+    <!-- Navigate to Login As Customer Log from Menu -->
+    <actionGroup name="AdminOpenLoginAsCustomerLogFromMenuActionGroup">
+        <click selector="{{AdminMenuSection.menuItem(AdminMenuCustomers.dataUiId)}}"
+               stepKey="clickOnCustomersMenuItem"/>
+        <click selector="{{AdminMenuSection.menuItem(AdminMenuLoginAsCustomer.dataUiId)}}"
+               stepKey="openLoginAsCustomerLog"/>
+        <waitForPageLoad stepKey="waitForLoginAsCustomerLog"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Login As Customer Log"
+             stepKey="seeForLoginAsCustomerLog"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Page/AdminRoleEditPage.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Page/AdminRoleEditPage.xml
new file mode 100644
index 0000000000000..12eba90aea723
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Page/AdminRoleEditPage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminRoleEditPage" url="admin/user_role/editrole/rid/{{roleId}}/" module="Magento_User" area="admin" parameterized="true">
+        <section name="AdminRoleGridSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerLogTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerLogTest.xml
new file mode 100644
index 0000000000000..1b8720eec9fc8
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerLogTest.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="AdminChangUserAccessToLoginAsCustomerLogTest">
+        <annotations>
+            <features value="Login As Customer"/>
+            <stories value="Permissions and ACl"/>
+            <title value="Change admin user's access to 'Login as Customer Log'"/>
+            <description
+                value="Verify admin user's access to 'Login as Customer Log' can be changed"/>
+            <severity value="CRITICAL"/>
+            <group value="login_as_customer"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
+                        stepKey="enableLoginAsCustomer"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsDefaultAdminUserBefore"/>
+
+            <!--Create New Role-->
+            <actionGroup ref="AdminOpenCreateRolePageActionGroup" stepKey="goToNewRolePage"/>
+            <actionGroup ref="AdminFillUserRoleFormActionGroup" stepKey="fillNewRoleForm">
+                <argument name="role" value="customRoleAllResources"/>
+            </actionGroup>
+            <actionGroup ref="AdminClickSaveButtonOnUserRoleFormActionGroup" stepKey="saveNewRole"/>
+
+            <!--Create New User-->
+            <actionGroup ref="AdminCreateUserWithApiRoleActionGroup" stepKey="adminCreateUser">
+                <argument name="user" value="NewAdminUser"/>
+                <argument name="role" value="customRoleAllResources"/>
+            </actionGroup>
+        </before>
+        <after>
+            <!--Delete new User-->
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutNewUserAfter"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsDefaultAdminUserAfter"/>
+            <actionGroup ref="AdminDeleteCustomUserActionGroup" stepKey="deleteNewUser">
+                <argument name="user" value="NewAdminUser"/>
+            </actionGroup>
+
+            <!--Delete new Role-->
+            <actionGroup ref="AdminDeleteUserRoleActionGroup" stepKey="deleteCustomRoleAllResources">
+                <argument name="roleName" value="{{customRoleAllResources.rolename}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logOut"/>
+
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0"
+                        stepKey="disableLoginAsCustomer"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
+        </after>
+
+        <!-- Login as new User -->
+        <actionGroup ref="AdminLogoutActionGroup" stepKey="logOutFromAdminPanel"/>
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsNewUser">
+            <argument name="adminUser" value="NewAdminUser"/>
+        </actionGroup>
+
+        <!-- Verify new User has access to 'Login as Customer Log' -->
+        <actionGroup ref="AdminOpenLoginAsCustomerLogFromMenuActionGroup" stepKey="openLoginAsCustomerLog"/>
+
+        <!-- Revoke 'Login as Customer Log' access for new User -->
+        <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutNewUser"/>
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsDefaultAdminUser"/>
+
+        <actionGroup ref="AdminEditUserRoleActionGroup" stepKey="openEditUserRole">
+            <argument name="roleName" value="{{customRoleAllResources.rolename}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminRevokeRoleResourceActionGroup" stepKey="revokeLoginAsCustomerAccess">
+            <argument name="resourceName" value="Login As Customer Log"/>
+        </actionGroup>
+        <actionGroup ref="AdminClickSaveButtonOnUserRoleFormActionGroup" stepKey="saveEditedRole"/>
+
+        <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutDefaultAdminUserAfterRevoke"/>
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsNewUserAfterRevoke">
+            <argument name="adminUser" value="NewAdminUser"/>
+        </actionGroup>
+
+        <!-- Verify new User no longer has access to 'Login as Customer Log' menu item -->
+        <actionGroup ref="AdminLoginAsCustomerLogAbsentInMenuActionGroup" stepKey="verifyLoginAsCustomerLogAbsentInMenu"/>
+
+        <!-- Verify new User no longer has access to 'Login as Customer Log' -->
+        <actionGroup ref="AdminLoginAsCustomerLogPageNotAvailableActionGroup" stepKey="verifyLoginAsCustomerLogPageNotAvailable"/>
+    </test>
+</tests>

From be25d54e6efd0e852179683b86627531545beaa0 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Tue, 21 Apr 2020 14:20:45 +0300
Subject: [PATCH 0202/1718] magento2-login-as-customer/issues/40: "Change Admin
 user's access to 'Login as Customer' button" test added.

---
 ...gUserAccessToLoginAsCustomerButtonTest.xml | 98 +++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerButtonTest.xml

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerButtonTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerButtonTest.xml
new file mode 100644
index 0000000000000..e346e4ba8a587
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerButtonTest.xml
@@ -0,0 +1,98 @@
+<?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="AdminChangUserAccessToLoginAsCustomerButtonTest">
+        <annotations>
+            <features value="Login As Customer"/>
+            <stories value="Permissions and ACl"/>
+            <title value="Change admin user's access to 'Login as Customer Button'"/>
+            <description
+                value="Verify admin user's access to 'Login as Customer Button' can be changed"/>
+            <severity value="CRITICAL"/>
+            <group value="login_as_customer"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
+                        stepKey="enableLoginAsCustomer"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDefaultAdminUserBefore"/>
+
+            <!--Create New Role-->
+            <actionGroup ref="AdminOpenCreateRolePageActionGroup" stepKey="goToNewRolePage"/>
+            <actionGroup ref="AdminFillUserRoleFormActionGroup" stepKey="fillNewRoleForm">
+                <argument name="role" value="customRoleAllResources"/>
+            </actionGroup>
+            <actionGroup ref="AdminClickSaveButtonOnUserRoleFormActionGroup" stepKey="saveNewRole"/>
+
+            <!--Create New User-->
+            <actionGroup ref="AdminCreateUserWithApiRoleActionGroup" stepKey="adminCreateUser">
+                <argument name="user" value="NewAdminUser"/>
+                <argument name="role" value="customRoleAllResources"/>
+            </actionGroup>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+
+            <!--Delete new User-->
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutNewUserAfter"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDefaultAdminUserAfter"/>
+            <actionGroup ref="AdminDeleteCustomUserActionGroup" stepKey="deleteNewUser">
+                <argument name="user" value="NewAdminUser"/>
+            </actionGroup>
+
+            <!--Delete new Role-->
+            <actionGroup ref="AdminDeleteUserRoleActionGroup" stepKey="deleteCustomRoleAllResources">
+                <argument name="roleName" value="{{customRoleAllResources.rolename}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logOut"/>
+
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0"
+                        stepKey="disableLoginAsCustomer"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
+        </after>
+
+        <!-- Login as new User -->
+        <actionGroup ref="AdminLogoutActionGroup" stepKey="logOutFromAdminPanel"/>
+        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsNewUser">
+            <argument name="username" value="{{NewAdminUser.username}}"/>
+            <argument name="password" value="{{NewAdminUser.password}}"/>
+        </actionGroup>
+
+        <!-- Verify new User has access to 'Login as Customer Button' -->
+        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup"
+                     stepKey="verifyLoginAsCustomerWorksOnCustomerPage">
+            <argument name="customerId" value="$$createCustomer.id$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontSignOutAndCloseTabActionGroup" stepKey="customerSignOutAndCloseTab"/>
+
+        <!-- Revoke 'Login as Customer Button' access for new User -->
+        <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutNewUser"/>
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsDefaultAdminUser"/>
+
+        <actionGroup ref="AdminEditUserRoleActionGroup" stepKey="openEditUserRole">
+            <argument name="roleName" value="{{customRoleAllResources.rolename}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminRevokeRoleResourceActionGroup" stepKey="revokeLoginAsCustomerAccess">
+            <argument name="resourceName" value="Login As Customer Button"/>
+        </actionGroup>
+        <actionGroup ref="AdminClickSaveButtonOnUserRoleFormActionGroup" stepKey="saveEditedRole"/>
+
+        <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutDefaultAdminUserAfterRevoke"/>
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsNewUserAfterRevoke">
+            <argument name="adminUser" value="NewAdminUser"/>
+        </actionGroup>
+
+        <!-- Verify new User no longer has access to 'Login as Customer Button' -->
+        <actionGroup ref="AdminLoginAsCustomerAbsentOnCustomerPageActionGroup" stepKey="verifyLoginAsCustomerAbsentOnCustomerPage">
+            <argument name="customerId" value="$createCustomer.id$"/>
+        </actionGroup>
+    </test>
+</tests>

From 994623525bcf009c1993f916348a9f3458b50dfa Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Tue, 21 Apr 2020 16:56:55 +0300
Subject: [PATCH 0203/1718] magento2-login-as-customer/issues/39: "Admin user
 directly login into customer account on custom website" test added.

---
 .../Mftf/Data/LoginAsCustomerConfigData.xml   |  8 +-
 ...nAsCustomerDirectlyToCustomWebsiteTest.xml | 85 +++++++++++++++++++
 2 files changed, 87 insertions(+), 6 deletions(-)
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerDirectlyToCustomWebsiteTest.xml

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/LoginAsCustomerConfigData.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/LoginAsCustomerConfigData.xml
index 4bee8de4fb3ec..4fe414d1d895e 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/LoginAsCustomerConfigData.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/LoginAsCustomerConfigData.xml
@@ -11,14 +11,10 @@
     <entity name="LoginAsCustomerConfigDataEnabled">
         <data key="path">mfloginascustomer/general/enabled</data>
     </entity>
-    <entity name="disablePageCache">
+    <entity name="LoginAsCustomerDisablePageCache">
         <data key="path">mfloginascustomer/general/disable_page_cache</data>
     </entity>
-    <!-- Should be removed after https://github.com/magento/magento2-login-as-customer/issues/34 -->
-    <entity name="extensionsKeepGuestCart">
-        <data key="path">mfloginascustomer/general/keep_guest_cart</data>
-    </entity>
-    <entity name="storeViewLogin">
+    <entity name="LoginAsCustomerStoreViewLogin">
         <data key="path">mfloginascustomer/general/store_view_login</data>
     </entity>
 </entities>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerDirectlyToCustomWebsiteTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerDirectlyToCustomWebsiteTest.xml
new file mode 100644
index 0000000000000..a931aefc6edb5
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerDirectlyToCustomWebsiteTest.xml
@@ -0,0 +1,85 @@
+<?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="AdminLoginAsCustomerDirectlyToCustomWebsiteTest">
+        <annotations>
+            <features value="Login As Customer"/>
+            <stories value="Login As Customer into additional website"/>
+            <title value="Admin user directly login into customer account on custom website"/>
+            <description
+                value="Verify admin user can directly login into customer account on custom website using 'Login as customer' functionality"/>
+            <severity value="BLOCKER"/>
+            <group value="login_as_customer"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
+                        stepKey="enableLoginAsCustomer"/>
+            <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0"
+                        stepKey="enableLoginAsCustomerAutoDetection"/>
+            <magentoCLI
+                command="config:set {{StorefrontEnableAddStoreCodeToUrls.path}} {{StorefrontEnableAddStoreCodeToUrls.value}}"
+                stepKey="enableAddStoreCodeToUrls"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createCustomWebsite">
+                <argument name="newWebsiteName" value="{{customWebsite.name}}"/>
+                <argument name="websiteCode" value="{{customWebsite.code}}"/>
+            </actionGroup>
+            <actionGroup ref="CreateCustomStoreActionGroup" stepKey="createCustomStore">
+                <argument name="website" value="{{customWebsite.name}}"/>
+                <argument name="store" value="{{customStoreGroup.name}}"/>
+                <argument name="rootCategory" value="Default Category"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView">
+                <argument name="StoreGroup" value="customStoreGroup"/>
+                <argument name="customStore" value="customStoreEN"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateCustomerWithWebSiteAndGroupActionGroup" stepKey="createCustomer">
+                <argument name="customerData" value="Simple_US_Customer"/>
+                <argument name="website" value="{{customWebsite.name}}"/>
+                <argument name="storeView" value="{{customStoreEN.name}}"/>
+            </actionGroup>
+        </before>
+        <after>
+            <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomer">
+                <argument name="customerEmail" value="Simple_US_Customer.email"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
+                <argument name="websiteName" value="{{customWebsite.name}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0"
+                        stepKey="disableLoginAsCustomer"/>
+            <magentoCLI
+                command="config:set {{StorefrontDisableAddStoreCodeToUrls.path}} {{StorefrontDisableAddStoreCodeToUrls.value}}"
+                stepKey="disableAddStoreCodeToUrls"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
+        </after>
+
+        <!-- Login As Customer from Customer page -->
+        <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="OpenEditCustomerFrom">
+            <argument name="customer" value="Simple_US_Customer"/>
+        </actionGroup>
+        <grabFromCurrentUrl regex="~id/(\d+)/~"  stepKey="customerId" />
+        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup"
+                     stepKey="loginAsCustomerFromCustomerPage">
+            <argument name="customerId" value="${customerId}"/>
+        </actionGroup>
+
+        <!-- Assert Customer logged on Custom Website -->
+        <actionGroup ref="StorefrontClickOnHeaderLogoActionGroup" stepKey="clickOnStorefrontHeaderLogo"/>
+        <actionGroup ref="AssertStorefrontStoreCodeInUrlActionGroup" stepKey="seeStoreCodeInUrl">
+            <argument name="storeCode" value="{{customStoreEN.code}}"/>
+        </actionGroup>
+
+        <!-- Log out Customer and close tab -->
+        <actionGroup ref="StorefrontSignOutAndCloseTabActionGroup" stepKey="signOutAndCloseTab"/>
+    </test>
+</tests>

From a8ed99acd4b79ff7d18b7847f3f675f732f526c1 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Wed, 22 Apr 2020 17:42:54 +0300
Subject: [PATCH 0204/1718] magento2-login-as-customer/issues/38: "Admin user
 directly login into customer account on frontend to Default store view when
 Store View To Login In = Auto detection" test added.

---
 .../AdminLoginAsCustomerAutoDetectionTest.xml | 66 +++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml
new file mode 100644
index 0000000000000..38115f63c8d81
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.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="AdminLoginAsCustomerAutoDetectionTest">
+        <annotations>
+            <features value="Login As Customer"/>
+            <stories value="Select Store View 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
+                value="Verify admin user can directly login into customer account to Default store view when Store View To Login In = Auto detection"/>
+            <severity value="BLOCKER"/>
+            <group value="login_as_customer"/>
+        </annotations>
+        <before>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
+                        stepKey="enableLoginAsCustomer"/>
+            <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0"
+                        stepKey="enableLoginAsCustomerAutoDetection"/>
+            <magentoCLI
+                command="config:set {{StorefrontEnableAddStoreCodeToUrls.path}} {{StorefrontEnableAddStoreCodeToUrls.value}}"
+                stepKey="enableAddStoreCodeToUrls"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteCustomStoreView">
+                <argument name="customStore" value="customStore"/>
+            </actionGroup>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0"
+                        stepKey="disableLoginAsCustomer"/>
+            <magentoCLI
+                command="config:set {{StorefrontDisableAddStoreCodeToUrls.path}} {{StorefrontDisableAddStoreCodeToUrls.value}}"
+                stepKey="disableAddStoreCodeToUrls"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
+        </after>
+
+        <!-- Login As Customer from Customer page -->
+        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup"
+                     stepKey="loginAsCustomerFromCustomerPage">
+            <argument name="customerId" value="$$createCustomer.id$$"/>
+        </actionGroup>
+
+        <!-- Assert Customer logged on on default store view -->
+        <actionGroup ref="StorefrontAssertLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromCustomerGird">
+            <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
+            <argument name="customerEmail" value="$$createCustomer.email$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontClickOnHeaderLogoActionGroup" stepKey="clickOnStorefrontHeaderLogo"/>
+        <actionGroup ref="AssertStorefrontStoreCodeInUrlActionGroup" stepKey="seeDefaultStoreCodeInUrl"/>
+
+        <!-- Log out Customer and close tab -->
+        <actionGroup ref="StorefrontSignOutAndCloseTabActionGroup" stepKey="signOutAndCloseTab"/>
+    </test>
+</tests>

From c0a4ac28de3e0c556264ee5424a978aaca478e34 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Thu, 23 Apr 2020 11:47:14 +0300
Subject: [PATCH 0205/1718] magento2-login-as-customer/issues/38: "Admin user
 prompted to select Store View when 'Store View To Login In' = Manual Choose"
 test added.

---
 ...inAsCustomerChooseStoreViewActionGroup.xml | 20 +++++
 .../AdminLoginAsCustomerLoginManualPage.xml   | 16 ++++
 ...ginAsCustomerLoginManualActionsSection.xml | 14 ++++
 ...ginAsCustomerLoginManualContentSection.xml | 14 ++++
 .../AdminLoginAsCustomerManualChooseTest.xml  | 75 +++++++++++++++++++
 5 files changed, 139 insertions(+)
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerChooseStoreViewActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Page/AdminLoginAsCustomerLoginManualPage.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerLoginManualActionsSection.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerLoginManualContentSection.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerChooseStoreViewActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerChooseStoreViewActionGroup.xml
new file mode 100644
index 0000000000000..c4b5067eaa857
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerChooseStoreViewActionGroup.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">
+    <!-- Manually choose store view for LoginAsCustomer functionality -->
+    <actionGroup name="AdminLoginAsCustomerChooseStoreViewActionGroup">
+        <arguments>
+            <argument name="storeViewName" type="string"/>
+        </arguments>
+        <selectOption selector="{{AdminLoginAsCustomerLoginManualContentSection.storeView}}" userInput="{{storeViewName}}" stepKey="selectStoreView"/>
+        <click selector="{{AdminLoginAsCustomerLoginManualActionsSection.loginAsCustomer}}" stepKey="clickLoginAsCustomer"/>
+        <waitForElementVisible selector="{{StorefrontHeaderSection.logoLink}}" stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Page/AdminLoginAsCustomerLoginManualPage.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Page/AdminLoginAsCustomerLoginManualPage.xml
new file mode 100644
index 0000000000000..ddb87ba83bc3a
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Page/AdminLoginAsCustomerLoginManualPage.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:/Page/etc/PageObject.xsd">
+    <page name="AdminLoginAsCustomerLoginManualPage" url="loginascustomer/login/manual/entity_id/{{id}}/"
+          area="storefront" module="Magento_LoginAsCustomer" parameterized="true">
+        <section name="AdminLoginAsCustomerLoginManualActionsSection"/>
+        <section name="AdminLoginAsCustomerLoginManualContentSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerLoginManualActionsSection.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerLoginManualActionsSection.xml
new file mode 100644
index 0000000000000..a2d373d4d7ab3
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerLoginManualActionsSection.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="AdminLoginAsCustomerLoginManualActionsSection">
+        <element name="loginAsCustomer" type="button" selector="#save" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerLoginManualContentSection.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerLoginManualContentSection.xml
new file mode 100644
index 0000000000000..944bd2679e703
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerLoginManualContentSection.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="AdminLoginAsCustomerLoginManualContentSection">
+        <element name="storeView" type="select" selector="//select[@name='store_id']" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
new file mode 100644
index 0000000000000..ae4a10e7fd568
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.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="AdminLoginAsCustomerManualChooseTest">
+        <annotations>
+            <features value="Login As Customer"/>
+            <stories value="Select Store View 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
+                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"/>
+        </annotations>
+        <before>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
+                        stepKey="enableLoginAsCustomer"/>
+            <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 1"
+                        stepKey="enableLoginAsCustomerManualChoose"/>
+            <magentoCLI
+                command="config:set {{StorefrontEnableAddStoreCodeToUrls.path}} {{StorefrontEnableAddStoreCodeToUrls.value}}"
+                stepKey="enableAddStoreCodeToUrls"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteCustomStoreView">
+                <argument name="customStore" value="customStore"/>
+            </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="config:set {{StorefrontDisableAddStoreCodeToUrls.path}} {{StorefrontDisableAddStoreCodeToUrls.value}}"
+                stepKey="disableAddStoreCodeToUrls"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
+        </after>
+
+        <!-- Login As Customer from Customer page -->
+        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup"
+                     stepKey="loginAsCustomerFromCustomerPage">
+            <argument name="customerId" value="$$createCustomer.id$$"/>
+        </actionGroup>
+
+        <!-- Choose custom store view -->
+        <actionGroup ref="AdminLoginAsCustomerChooseStoreViewActionGroup" stepKey="chooseCustomStoreView">
+            <argument name="storeViewName" value="{{customStore.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="StorefrontClickOnHeaderLogoActionGroup" stepKey="clickOnStorefrontHeaderLogo"/>
+        <actionGroup ref="AssertStorefrontStoreCodeInUrlActionGroup" stepKey="seeCustomStoreCodeInUrl">
+            <argument name="storeCode" value="{{customStore.code}}"/>
+        </actionGroup>
+
+        <!-- Log out Customer and close tab -->
+        <actionGroup ref="StorefrontSignOutAndCloseTabActionGroup" stepKey="signOutAndCloseTab"/>
+    </test>
+</tests>

From 605cc5244ad18067ec0b94cb822bd46788ce4355 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Fri, 24 Apr 2020 15:35:11 +0300
Subject: [PATCH 0206/1718] MFTF tests updates.

---
 ...sMessageOrderCreatedByAdminActionGroup.xml | 11 ++--
 ...ConfigNotAvailableDirectlyActionGroup.xml} |  7 ++-
 ...AsCustomerConfigNotVisibleActionGroup.xml} |  7 ++-
 ...ertLoginAsCustomerLogRecordActionGroup.xml | 11 ++--
 .../AdminEditUserRoleActionGroup.xml          |  5 +-
 ...minFilterLoginAsCustomerLogActionGroup.xml | 11 ++--
 ...merAbsentOnCustomerGirdPageActionGroup.xml |  5 +-
 ...ustomerAbsentOnCustomerPageActionGroup.xml |  5 +-
 ...stomerAbsentOnOrderGridPageActionGroup.xml |  5 +-
 ...AsCustomerAbsentOnOrderPageActionGroup.xml |  5 +-
 ...inAsCustomerChooseStoreViewActionGroup.xml | 11 ++--
 ...inAsCustomerLogAbsentInMenuActionGroup.xml | 11 ++--
 ...CustomerLogPageNotAvailableActionGroup.xml |  8 ++-
 ...erLoginFromCustomerGirdPageActionGroup.xml | 22 --------
 ...stomerLoginFromCustomerPageActionGroup.xml |  5 +-
 ...tomerLoginFromOrderGridPageActionGroup.xml | 22 --------
 ...sCustomerLoginFromOrderPageActionGroup.xml |  5 +-
 ...AdminOpenLoginAsCustomerLogActionGroup.xml |  5 +-
 ...nLoginAsCustomerLogFromMenuActionGroup.xml |  5 +-
 .../AdminRevokeRoleResourceActionGroup.xml    |  8 ++-
 ...sMessageOrderCreatedByAdminActionGroup.xml |  6 ++-
 ...sertLoginAsCustomerLoggedInActionGroup.xml | 13 ++---
 ...sCustomerNotificationBannerActionGroup.xml | 27 ++++++++++
 ...torefrontSignOutAndCloseTabActionGroup.xml |  6 ++-
 ...tificationBannerAndCloseTabActionGroup.xml | 22 ++++++++
 .../Test/Mftf/Data/UserRoleData.xml           |  2 +-
 ...rontLoginAsCustomerNotificationSection.xml | 16 ++++++
 ...gUserAccessToLoginAsCustomerButtonTest.xml | 22 +++++---
 ...hangUserAccessToLoginAsCustomerLogTest.xml | 31 ++++++-----
 ...oginAsCustomerAddProductToWishlistTest.xml |  4 +-
 ...oginAsCustomerEditCustomersAddressTest.xml |  4 +-
 ...gNotShownIfLoginAsCustomerDisabledTest.xml |  2 +-
 .../Test/AdminLoginAsCustomerLoggingTest.xml  | 24 +++++----
 .../AdminLoginAsCustomerPlaceOrderTest.xml    | 36 ++++++++++---
 .../Test/AdminLoginAsCustomerReorderTest.xml  | 40 ++++++++++----
 ...ginAsCustomerSubscribeToNewsletterTest.xml | 22 ++++----
 ...minNoAccessToLoginAsCustomerButtonTest.xml | 50 ++++++++----------
 ...cessToLoginAsCustomerConfigurationTest.xml | 32 +++++++-----
 ...INotShownIfLoginAsCustomerDisabledTest.xml |  2 +-
 ...minUIShownIfLoginAsCustomerEnabledTest.xml | 30 ++---------
 ...tLoginAsCustomerNotificationBannerTest.xml | 52 +++++++++++++++++++
 41 files changed, 404 insertions(+), 213 deletions(-)
 rename app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/{AssertAdminLoginAsCustomerConfigNotAvailableDirectlyActionGroup.xml => AdminAssertLoginAsCustomerConfigNotAvailableDirectlyActionGroup.xml} (76%)
 rename app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/{AssertAdminLoginAsCustomerConfigNotVisibleActionGroup.xml => AdminAssertLoginAsCustomerConfigNotVisibleActionGroup.xml} (70%)
 delete mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerGirdPageActionGroup.xml
 delete mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderGridPageActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerNotificationBannerActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontSignOutNotificationBannerAndCloseTabActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Section/StorefrontLoginAsCustomerNotificationSection.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerNotificationBannerTest.xml

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertContainsMessageOrderCreatedByAdminActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertContainsMessageOrderCreatedByAdminActionGroup.xml
index 8e92a115f4595..bcf6fc96aa131 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertContainsMessageOrderCreatedByAdminActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertContainsMessageOrderCreatedByAdminActionGroup.xml
@@ -8,14 +8,19 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <!-- Assert Admin Order page contains message about Order created by a Store Administrator -->
     <actionGroup name="AdminAssertContainsMessageOrderCreatedByAdminActionGroup">
+        <annotations>
+            <description>Assert Admin Order page contains message about Order created by a Store Administrator.
+            </description>
+        </annotations>
         <arguments>
             <argument name="orderId" type="string"/>
-            <argument name="adminUserFullName" defaultValue="Magento User" type="string"/>
+            <argument name="adminUserFullName" type="string"/>
         </arguments>
+
         <amOnPage url="{{AdminOrderPage.url(orderId)}}" stepKey="gotoOrderPage"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see userInput="Order Placed by {{adminUserFullName}} using Login as Customer" stepKey="seeMessageOrderCreatedByAdmin"/>
+        <see userInput="Order Placed by {{adminUserFullName}} using Login as Customer"
+             stepKey="seeMessageOrderCreatedByAdmin"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerConfigNotAvailableDirectlyActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigNotAvailableDirectlyActionGroup.xml
similarity index 76%
rename from app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerConfigNotAvailableDirectlyActionGroup.xml
rename to app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigNotAvailableDirectlyActionGroup.xml
index 94e3631a5cc51..be66dceb8f161 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerConfigNotAvailableDirectlyActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigNotAvailableDirectlyActionGroup.xml
@@ -8,8 +8,11 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <!-- Verify Login As Customer config section is not available by direct url -->
-    <actionGroup name="AssertAdminLoginAsCustomerConfigNotAvailableDirectlyActionGroup">
+    <actionGroup name="AdminAssertLoginAsCustomerConfigNotAvailableDirectlyActionGroup">
+        <annotations>
+            <description>Verify Login As Customer config section is not available by direct url.</description>
+        </annotations>
+
         <amOnPage url="{{AdminLoginAsCustomerConfigPage.url}}" stepKey="navigateToLoginAsCustomerConfigSection"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <seeInCurrentUrl url="admin/system_config/index" stepKey="seeRedirectToConfigIndexPage"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerConfigNotVisibleActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigNotVisibleActionGroup.xml
similarity index 70%
rename from app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerConfigNotVisibleActionGroup.xml
rename to app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigNotVisibleActionGroup.xml
index f093d57cb171f..94fdea4b11b16 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerConfigNotVisibleActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigNotVisibleActionGroup.xml
@@ -8,8 +8,11 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <!-- Verify no Login As Customer config section available -->
-    <actionGroup name="AssertAdminLoginAsCustomerConfigNotVisibleActionGroup">
+    <actionGroup name="AdminAssertLoginAsCustomerConfigNotVisibleActionGroup">
+        <annotations>
+            <description>Verify no Login As Customer config section available.</description>
+        </annotations>
+
         <!-- TODO: update -->
         <dontSee userInput="Login As Customer" stepKey="dontSeeLoginAsCustomerItem"/>
     </actionGroup>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerLogRecordActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerLogRecordActionGroup.xml
index 270ce7d3719a2..ced0b51466bd5 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerLogRecordActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerLogRecordActionGroup.xml
@@ -8,15 +8,20 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <!-- Assert Login As Customer Log record is correct -->
     <actionGroup name="AdminAssertLoginAsCustomerLogRecordActionGroup">
+        <annotations>
+            <description>Assert Login As Customer Log record is correct.</description>
+        </annotations>
         <arguments>
             <argument name="rowNumber" type="string"/>
             <argument name="adminId" type="string"/>
             <argument name="customerId" type="string"/>
         </arguments>
+
         <seeInCurrentUrl url="{{AdminLoginAsCustomerLogPage.url}}" stepKey="checkUrl"/>
-        <see selector="{{AdminLoginAsCustomerLogGridSection.adminIdInRow(rowNumber)}}" userInput="{{adminId}}" stepKey="seeCorrectAdminId"/>
-        <see selector="{{AdminLoginAsCustomerLogGridSection.customerIdInRow(rowNumber)}}" userInput="{{customerId}}" stepKey="seeCorrectCustomerId"/>
+        <see selector="{{AdminLoginAsCustomerLogGridSection.adminIdInRow(rowNumber)}}" userInput="{{adminId}}"
+             stepKey="seeCorrectAdminId"/>
+        <see selector="{{AdminLoginAsCustomerLogGridSection.customerIdInRow(rowNumber)}}" userInput="{{customerId}}"
+             stepKey="seeCorrectCustomerId"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminEditUserRoleActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminEditUserRoleActionGroup.xml
index 6237b50923899..52f5b190c3cb8 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminEditUserRoleActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminEditUserRoleActionGroup.xml
@@ -7,11 +7,14 @@
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <!--  Open User Role resources for edit -->
     <actionGroup name="AdminEditUserRoleActionGroup">
+        <annotations>
+            <description>Open User Role resources for edit.</description>
+        </annotations>
         <arguments>
             <argument name="roleName" type="string"/>
         </arguments>
+
         <amOnPage url="{{AdminRolesPage.url}}" stepKey="navigateToUserRolesGrid"/>
         <fillField selector="{{AdminRoleGridSection.roleNameFilterTextField}}" userInput="{{roleName}}"
                    stepKey="enterRoleName"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminFilterLoginAsCustomerLogActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminFilterLoginAsCustomerLogActionGroup.xml
index cab68918745a6..18bfe790d29a5 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminFilterLoginAsCustomerLogActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminFilterLoginAsCustomerLogActionGroup.xml
@@ -8,17 +8,22 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <!-- Filter Login As Customer Log records -->
     <actionGroup name="AdminFilterLoginAsCustomerLogActionGroup">
+        <annotations>
+            <description>Filter Login As Customer Log records.</description>
+        </annotations>
         <arguments>
             <argument name="adminId" type="string"/>
             <argument name="customerId" type="string"/>
         </arguments>
+
         <seeInCurrentUrl url="{{AdminLoginAsCustomerLogPage.url}}" stepKey="checkUrl"/>
         <click selector="{{AdminLoginAsCustomerLogToolbarSection.resetFilter}}" stepKey="resetFilters"/>
         <waitForLoadingMaskToDisappear stepKey="waitForResetFilter"/>
-        <fillField selector="{{AdminLoginAsCustomerLogFiltersSection.adminId}}" userInput="{{adminId}}" stepKey="fillAdminId"/>
-        <fillField selector="{{AdminLoginAsCustomerLogFiltersSection.customerId}}" userInput="{{customerId}}" stepKey="fillCustomerId"/>
+        <fillField selector="{{AdminLoginAsCustomerLogFiltersSection.adminId}}" userInput="{{adminId}}"
+                   stepKey="fillAdminId"/>
+        <fillField selector="{{AdminLoginAsCustomerLogFiltersSection.customerId}}" userInput="{{customerId}}"
+                   stepKey="fillCustomerId"/>
         <click selector="{{AdminLoginAsCustomerLogToolbarSection.search}}" stepKey="applyFilters"/>
         <waitForLoadingMaskToDisappear stepKey="waitForApplyFilter"/>
     </actionGroup>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerGirdPageActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerGirdPageActionGroup.xml
index 3ea8d4f6f0e02..071b4ed0e3c15 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerGirdPageActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerGirdPageActionGroup.xml
@@ -8,8 +8,11 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <!-- Verify Login As Customer Login action is absent on Customer grid page -->
     <actionGroup name="AdminLoginAsCustomerAbsentOnCustomerGridPageActionGroup">
+        <annotations>
+            <description>Verify Login As Customer Login action is absent on Customer grid page.</description>
+        </annotations>
+
         <amOnPage url="{{AdminCustomerPage.url}}" stepKey="gotoCustomerGridPage"/>
         <waitForPageLoad stepKey="waitForCustomerGridPageLoad"/>
         <dontSee userInput="Login As Customer" stepKey="dontSeeLoginAsCustomer"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerPageActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerPageActionGroup.xml
index bae87ca9000c5..28a8b483f094f 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerPageActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerPageActionGroup.xml
@@ -8,11 +8,14 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <!-- Verify Login As Customer Login action is absent on Customer page -->
     <actionGroup name="AdminLoginAsCustomerAbsentOnCustomerPageActionGroup">
+        <annotations>
+            <description>Verify Login As Customer Login action is absent on Customer page.</description>
+        </annotations>
         <arguments>
             <argument name="customerId" type="string"/>
         </arguments>
+
         <amOnPage url="{{AdminEditCustomerPage.url(customerId)}}" stepKey="gotoCustomerPage"/>
         <waitForPageLoad stepKey="waitForCustomerPageLoad"/>
         <dontSee userInput="Login As Customer" stepKey="dontSeeLoginAsCustomer"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderGridPageActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderGridPageActionGroup.xml
index 77f64c332639f..cde0c8c484fbc 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderGridPageActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderGridPageActionGroup.xml
@@ -8,8 +8,11 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <!-- Verify Login As Customer Login action is absent on Order grid page -->
     <actionGroup name="AdminLoginAsCustomerAbsentOnOrderGridPageActionGroup">
+        <annotations>
+            <description>Verify Login As Customer Login action is absent on Order grid page.</description>
+        </annotations>
+
         <amOnPage url="{{AdminOrdersPage.url}}" stepKey="gotoOrderGridPage"/>
         <waitForPageLoad stepKey="waitForOrderGridPageLoad"/>
         <dontSee userInput="Login As Customer" stepKey="dontSeeLoginAsCustomer"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderPageActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderPageActionGroup.xml
index fb55156d021d4..746580546fbf3 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderPageActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderPageActionGroup.xml
@@ -8,11 +8,14 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <!-- Verify Login As Customer Login action is absent on Order page -->
     <actionGroup name="AdminLoginAsCustomerAbsentOnOrderPageActionGroup">
+        <annotations>
+            <description>Verify Login As Customer Login action is absent on Order page.</description>
+        </annotations>
         <arguments>
             <argument name="orderId" type="string"/>
         </arguments>
+
         <amOnPage url="{{AdminOrderPage.url(orderId)}}" stepKey="gotoOrderPage"/>
         <waitForPageLoad stepKey="waitForOrderPageLoad"/>
         <dontSee userInput="Login As Customer" stepKey="dontSeeLoginAsCustomer"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerChooseStoreViewActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerChooseStoreViewActionGroup.xml
index c4b5067eaa857..7a751cb0f31b2 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerChooseStoreViewActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerChooseStoreViewActionGroup.xml
@@ -8,13 +8,18 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <!-- Manually choose store view for LoginAsCustomer functionality -->
     <actionGroup name="AdminLoginAsCustomerChooseStoreViewActionGroup">
+        <annotations>
+            <description>Manually choose store view for LoginAsCustomer functionality.</description>
+        </annotations>
         <arguments>
             <argument name="storeViewName" type="string"/>
         </arguments>
-        <selectOption selector="{{AdminLoginAsCustomerLoginManualContentSection.storeView}}" userInput="{{storeViewName}}" stepKey="selectStoreView"/>
-        <click selector="{{AdminLoginAsCustomerLoginManualActionsSection.loginAsCustomer}}" stepKey="clickLoginAsCustomer"/>
+
+        <selectOption selector="{{AdminLoginAsCustomerLoginManualContentSection.storeView}}"
+                      userInput="{{storeViewName}}" stepKey="selectStoreView"/>
+        <click selector="{{AdminLoginAsCustomerLoginManualActionsSection.loginAsCustomer}}"
+               stepKey="clickLoginAsCustomer"/>
         <waitForElementVisible selector="{{StorefrontHeaderSection.logoLink}}" stepKey="waitForPageLoad"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogAbsentInMenuActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogAbsentInMenuActionGroup.xml
index 0049d3dcc2196..4f475c9793624 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogAbsentInMenuActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogAbsentInMenuActionGroup.xml
@@ -8,9 +8,14 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <!-- Verify Login As Customer is absent in admin menu -->
     <actionGroup name="AdminLoginAsCustomerLogAbsentInMenuActionGroup">
-        <click selector="{{AdminMenuSection.menuItem(AdminMenuCustomers.dataUiId)}}" stepKey="clickOnCustomersMenuItem"/>
-        <dontSeeElement selector="{{AdminMenuSection.menuItem(AdminMenuLoginAsCustomer.dataUiId)}}" stepKey="dontSeeLoginAsCustomerLog"/>
+        <annotations>
+            <description>Verify Login As Customer is absent in admin menu.</description>
+        </annotations>
+
+        <click selector="{{AdminMenuSection.menuItem(AdminMenuCustomers.dataUiId)}}"
+               stepKey="clickOnCustomersMenuItem"/>
+        <dontSeeElement selector="{{AdminMenuSection.menuItem(AdminMenuLoginAsCustomer.dataUiId)}}"
+                        stepKey="dontSeeLoginAsCustomerLog"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogPageNotAvailableActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogPageNotAvailableActionGroup.xml
index 850604b990de9..9f23a69ab3aff 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogPageNotAvailableActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogPageNotAvailableActionGroup.xml
@@ -8,10 +8,14 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <!-- Verify Login As Customer is not available by direct url -->
     <actionGroup name="AdminLoginAsCustomerLogPageNotAvailableActionGroup">
+        <annotations>
+            <description>Verify Login As Customer is not available by direct url.</description>
+        </annotations>
+
         <amOnPage url="{{AdminLoginAsCustomerLogPage.url}}" stepKey="openAdminLoginAsCustomerLogPage"/>
         <waitForPageLoad stepKey="waitForLoginAsCustomerLogPageLoad"/>
-        <see selector="{{AdminHeaderSection.pageHeading}}" userInput="404 Error" stepKey="see404PageHeading"/>
+        <see userInput="Sorry, you need permissions to view this content."
+             selector="{{AdminMessagesSection.accessDenied}}" stepKey="seeAccessDenied"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerGirdPageActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerGirdPageActionGroup.xml
deleted file mode 100644
index 0a35564875e18..0000000000000
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerGirdPageActionGroup.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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">
-    <!-- Verify Login As Customer Login action is works properly from Customer grid page -->
-    <actionGroup name="AdminLoginAsCustomerLoginFromCustomerGirdPageActionGroup">
-        <arguments>
-            <argument name="customerEmail" type="string"/>
-        </arguments>
-        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="gotoCustomerGridPage"/>
-        <waitForPageLoad stepKey="waitForCustomerGridPageLoad"/>
-        <click selector="{{AdminCustomerGridSection.customerLoginAsCustomerLinkByEmail(customerEmail)}}" stepKey="clickLoginAsCustomerLink"/>
-        <switchToNextTab stepKey="switchToNewTab"/>
-        <waitForElementVisible selector="{{StorefrontCMSPageSection.mainTitle}}" stepKey="waitForPageLoad"/>
-    </actionGroup>
-</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageActionGroup.xml
index 41db38169ac05..c58ace5bbebc8 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageActionGroup.xml
@@ -8,11 +8,14 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <!-- Verify Login As Customer Login action is works properly from Customer page -->
     <actionGroup name="AdminLoginAsCustomerLoginFromCustomerPageActionGroup">
+        <annotations>
+            <description>Verify Login As Customer Login action is works properly from Customer page.</description>
+        </annotations>
         <arguments>
             <argument name="customerId" type="string"/>
         </arguments>
+
         <amOnPage url="{{AdminEditCustomerPage.url(customerId)}}" stepKey="gotoCustomerPage"/>
         <waitForPageLoad stepKey="waitForCustomerPageLoad"/>
         <click selector="{{AdminCustomerMainActionsSection.loginAsCustomer}}" stepKey="clickLoginAsCustomerLink"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderGridPageActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderGridPageActionGroup.xml
deleted file mode 100644
index aba61a86249cd..0000000000000
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderGridPageActionGroup.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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">
-    <!-- Verify Login As Customer Login action is works properly from Order grid page -->
-    <actionGroup name="AdminLoginAsCustomerLoginFromOrderGridPageActionGroup">
-        <arguments>
-            <argument name="orderId" type="string"/>
-        </arguments>
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="gotoOrderGridPage"/>
-        <waitForPageLoad stepKey="waitForOrderGridPageLoad"/>
-        <click selector="{{AdminOrdersGridSection.loginAsCustomerLink(orderId)}}" stepKey="clickLoginAsCustomerLink"/>
-        <switchToNextTab stepKey="switchToNewTab"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-    </actionGroup>
-</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageActionGroup.xml
index 3b6f363a2d651..88c1cef7ea0cc 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageActionGroup.xml
@@ -8,11 +8,14 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <!-- Verify Login As Customer Login action is works properly from Order grid page -->
     <actionGroup name="AdminLoginAsCustomerLoginFromOrderPageActionGroup">
+        <annotations>
+            <description>Verify Login As Customer Login action is works properly from Order grid page.</description>
+        </annotations>
         <arguments>
             <argument name="orderId" type="string"/>
         </arguments>
+
         <amOnPage url="{{AdminOrderPage.url(orderId)}}" stepKey="gotoOrderPage"/>
         <waitForPageLoad stepKey="waitForOrderPageLoad"/>
         <click selector="{{AdminOrderDetailsMainActionsSection.loginAsCustomer}}" stepKey="clickLoginAsCustomerLink"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminOpenLoginAsCustomerLogActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminOpenLoginAsCustomerLogActionGroup.xml
index 508b13abbc43e..6cd47e474439a 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminOpenLoginAsCustomerLogActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminOpenLoginAsCustomerLogActionGroup.xml
@@ -8,8 +8,11 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <!-- Navigate to Login As Customer Log page -->
     <actionGroup name="AdminOpenLoginAsCustomerLogActionGroup">
+        <annotations>
+            <description>Navigate to Login As Customer Log page.</description>
+        </annotations>
+
         <amOnPage url="{{AdminLoginAsCustomerLogPage.url}}" stepKey="gotoLoginAsCustomerLogPage"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <see userInput="Login As Customer Log" stepKey="titleIsVisible"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminOpenLoginAsCustomerLogFromMenuActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminOpenLoginAsCustomerLogFromMenuActionGroup.xml
index 584e1d22fbc96..0cc6722a1bbc1 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminOpenLoginAsCustomerLogFromMenuActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminOpenLoginAsCustomerLogFromMenuActionGroup.xml
@@ -8,8 +8,11 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <!-- Navigate to Login As Customer Log from Menu -->
     <actionGroup name="AdminOpenLoginAsCustomerLogFromMenuActionGroup">
+        <annotations>
+            <description>Navigate to Login As Customer Log from Menu.</description>
+        </annotations>
+
         <click selector="{{AdminMenuSection.menuItem(AdminMenuCustomers.dataUiId)}}"
                stepKey="clickOnCustomersMenuItem"/>
         <click selector="{{AdminMenuSection.menuItem(AdminMenuLoginAsCustomer.dataUiId)}}"
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminRevokeRoleResourceActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminRevokeRoleResourceActionGroup.xml
index 49c404a92f0de..030b53408951e 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminRevokeRoleResourceActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminRevokeRoleResourceActionGroup.xml
@@ -8,16 +8,20 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <!-- Revoke access to resource from edit role page -->
     <actionGroup name="AdminRevokeRoleResourceActionGroup">
+        <annotations>
+            <description>Revoke access to resource from edit role page.</description>
+        </annotations>
         <arguments>
             <argument name="resourceName" type="string"/>
         </arguments>
+
         <selectOption selector="{{AdminEditRoleResourcesSection.resourceAccess}}" userInput="0"
                       stepKey="selectResourceAccessCustom"/>
         <waitForElementVisible selector="{{AdminEditRoleInfoSection.blockName(resourceName)}}"
                                stepKey="waitForElementVisible"/>
-        <scrollTo selector="{{AdminEditRoleInfoSection.blockName(resourceName)}}" x="0" y="-80" stepKey="scrollToContentBlock"/>
+        <scrollTo selector="{{AdminEditRoleInfoSection.blockName(resourceName)}}" x="0" y="-80"
+                  stepKey="scrollToContentBlock"/>
         <click selector="{{AdminEditRoleInfoSection.blockName(resourceName)}}" stepKey="clickContentBlockCheckbox"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup.xml
index 508ada3295a8e..f40ea7f93c7a1 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup.xml
@@ -8,11 +8,15 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <!-- Assert Storefront Order page contains message about Order created by a Store Administrator -->
     <actionGroup name="StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup">
+        <annotations>
+            <description>Verify Storefront Order page contains message about Order created by a Store Administrator.
+            </description>
+        </annotations>
         <arguments>
             <argument name="orderId" type="string"/>
         </arguments>
+
         <amOnPage url="{{StorefrontCustomerOrderViewPage.url(orderId)}}" stepKey="gotoOrderPage"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <see userInput="Order Placed by Store Administrator" stepKey="seeMessageOrderCreatedByAdmin"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerLoggedInActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerLoggedInActionGroup.xml
index 5a37ff8e43e7f..28d29b856a538 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerLoggedInActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerLoggedInActionGroup.xml
@@ -8,21 +8,18 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <!-- Verify Admin successfully logged in as Customer -->
     <actionGroup name="StorefrontAssertLoginAsCustomerLoggedInActionGroup">
+        <annotations>
+            <description>Verify Admin successfully logged in as Customer.</description>
+        </annotations>
         <arguments>
             <argument name="customerFullName" type="string"/>
             <argument name="customerEmail" type="string"/>
         </arguments>
-        <seeInCurrentUrl url="{{StorefrontLoginAsCustomerLoginProceedPage.url}}" stepKey="assertOnProceedPage"/>
-        <!-- TODO: uncomment after fix -->
-        <!-- <seeInTitle userInput="You are logged in." stepKey="assertYouAreLoggedInInTitle"/>-->
-        <see selector="{{StorefrontCMSPageSection.mainTitle}}" userInput="You are logged in."
-             stepKey="assertYouAreLoggedInOnPage"/>
-        <!-- TODO: uncomment after fix -->
-        <!-- <see selector="{{LoggedInCustomerHeaderLinksSection.customerDropdownMenu}}" userInput="Welcome, {{customerFullName}}!" stepKey="assertCorrectWelcomeMessage"/>-->
+
         <amOnPage url="{{StorefrontCustomerDashboardPage.url}}" stepKey="gotoCustomerAccountPage"/>
         <waitForPageLoad stepKey="waitForCustomerAccountPageLoad"/>
+        <see selector="{{StorefrontPanelHeaderSection.welcomeMessage}}" userInput="Welcome, {{customerFullName}}!" stepKey="assertCorrectWelcomeMessage"/>
         <see selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}"
              userInput="{{customerEmail}}" stepKey="assertCustomerEmailInContactInformation"/>
     </actionGroup>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerNotificationBannerActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerNotificationBannerActionGroup.xml
new file mode 100644
index 0000000000000..ce2e261f10040
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerNotificationBannerActionGroup.xml
@@ -0,0 +1,27 @@
+<?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="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup">
+        <annotations>
+            <description>Verify Login as Customer notification banner present on page.</description>
+        </annotations>
+        <arguments>
+            <argument name="customerFullName" type="string"/>
+            <argument name="websiteName" type="string" defaultValue="Main Website"/>
+        </arguments>
+
+        <waitForElementVisible selector="{{StorefrontLoginAsCustomerNotificationSection.notificationText}}" stepKey="waitForNotificationBanner"/>
+        <see selector="{{StorefrontLoginAsCustomerNotificationSection.notificationText}}"
+             userInput="You are connected as {{customerFullName}} on {{websiteName}}"
+             stepKey="assertCorrectNotificationBannerMessage"/>
+        <seeElement selector="{{StorefrontLoginAsCustomerNotificationSection.closeLink}}"
+             stepKey="assertCloseNotificationBannerPresent"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontSignOutAndCloseTabActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontSignOutAndCloseTabActionGroup.xml
index 9eaed420ba9da..87e5b264a6ed6 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontSignOutAndCloseTabActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontSignOutAndCloseTabActionGroup.xml
@@ -8,9 +8,13 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <!-- Customer sign out and close tab -->
     <actionGroup name="StorefrontSignOutAndCloseTabActionGroup">
+        <annotations>
+            <description>Customer sign out and close tab.</description>
+        </annotations>
+
         <click selector="{{StoreFrontSignOutSection.customerAccount}}" stepKey="clickCustomerButton"/>
+        <waitForElementVisible selector="{{StoreFrontSignOutSection.signOut}}" stepKey="waitForSignOut"/>
         <click selector="{{StoreFrontSignOutSection.signOut}}" stepKey="clickToSignOut"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <see userInput="You are signed out" stepKey="signOut"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontSignOutNotificationBannerAndCloseTabActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontSignOutNotificationBannerAndCloseTabActionGroup.xml
new file mode 100644
index 0000000000000..e0e6973509eb3
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontSignOutNotificationBannerAndCloseTabActionGroup.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="StorefrontSignOutNotificationBannerAndCloseTabActionGroup">
+        <annotations>
+            <description>Customer sign out by Notification Banner and close tab.</description>
+        </annotations>
+
+        <waitForElementVisible selector="{{StorefrontLoginAsCustomerNotificationSection.notificationText}}" stepKey="waitForNotificationBanner"/>
+        <click selector="{{StorefrontLoginAsCustomerNotificationSection.closeLink}}" stepKey="clickToSignOut"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see userInput="You are signed out" stepKey="signOut"/>
+        <closeTab stepKey="closeTab"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/UserRoleData.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/UserRoleData.xml
index 2f3d10dcd4daa..720ae7eb2147e 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/UserRoleData.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/UserRoleData.xml
@@ -9,7 +9,7 @@
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <!--This Role has access for all resources individually -->
-    <entity name="customRoleAllResources" type="user_role">
+    <entity name="CustomRoleAllResources" type="user_role">
         <data key="name" unique="suffix">allAccessRole</data>
         <data key="rolename">allAccessRole</data>
         <data key="current_password">{{_ENV.MAGENTO_ADMIN_PASSWORD}}</data>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/StorefrontLoginAsCustomerNotificationSection.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/StorefrontLoginAsCustomerNotificationSection.xml
new file mode 100644
index 0000000000000..cee7609632e87
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/StorefrontLoginAsCustomerNotificationSection.xml
@@ -0,0 +1,16 @@
+<?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="StorefrontLoginAsCustomerNotificationSection">
+        <element name="notificationText" type="text" selector="//div[contains(@class, 'lac-notification')]//div[contains(@class, 'lac-notification-text')]/span" timeout="30"/>
+        <element name="closeLink" type="button" selector="//div[contains(@class, 'lac-notification')]//div[contains(@class, 'lac-notification-links')]/a[contains(@class, 'lac-notification-close-link')]" timeout="30"/>
+    </section>
+</sections>
+
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerButtonTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerButtonTest.xml
index e346e4ba8a587..e2079d85f6267 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerButtonTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerButtonTest.xml
@@ -17,10 +17,15 @@
                 value="Verify admin user's access to 'Login as Customer Button' can be changed"/>
             <severity value="CRITICAL"/>
             <group value="login_as_customer"/>
+            <skip>
+                <issueId value="MQE-1964"/>
+            </skip>
         </annotations>
         <before>
             <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
                         stepKey="enableLoginAsCustomer"/>
+            <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0"
+                        stepKey="enableLoginAsCustomerAutoDetection"/>
             <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDefaultAdminUserBefore"/>
@@ -28,14 +33,14 @@
             <!--Create New Role-->
             <actionGroup ref="AdminOpenCreateRolePageActionGroup" stepKey="goToNewRolePage"/>
             <actionGroup ref="AdminFillUserRoleFormActionGroup" stepKey="fillNewRoleForm">
-                <argument name="role" value="customRoleAllResources"/>
+                <argument name="role" value="CustomRoleAllResources"/>
             </actionGroup>
             <actionGroup ref="AdminClickSaveButtonOnUserRoleFormActionGroup" stepKey="saveNewRole"/>
 
             <!--Create New User-->
             <actionGroup ref="AdminCreateUserWithApiRoleActionGroup" stepKey="adminCreateUser">
                 <argument name="user" value="NewAdminUser"/>
-                <argument name="role" value="customRoleAllResources"/>
+                <argument name="role" value="CustomRoleAllResources"/>
             </actionGroup>
         </before>
         <after>
@@ -50,7 +55,7 @@
 
             <!--Delete new Role-->
             <actionGroup ref="AdminDeleteUserRoleActionGroup" stepKey="deleteCustomRoleAllResources">
-                <argument name="roleName" value="{{customRoleAllResources.rolename}}"/>
+                <argument name="roleName" value="{{CustomRoleAllResources.rolename}}"/>
             </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logOut"/>
 
@@ -75,19 +80,20 @@
 
         <!-- Revoke 'Login as Customer Button' access for new User -->
         <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutNewUser"/>
-        <actionGroup ref="LoginAsAdmin" stepKey="loginAsDefaultAdminUser"/>
+        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDefaultAdminUser"/>
 
         <actionGroup ref="AdminEditUserRoleActionGroup" stepKey="openEditUserRole">
-            <argument name="roleName" value="{{customRoleAllResources.rolename}}"/>
+            <argument name="roleName" value="{{CustomRoleAllResources.rolename}}"/>
         </actionGroup>
         <actionGroup ref="AdminRevokeRoleResourceActionGroup" stepKey="revokeLoginAsCustomerAccess">
-            <argument name="resourceName" value="Login As Customer Button"/>
+            <argument name="resourceName" value="Allow Login as Customer Button"/>
         </actionGroup>
         <actionGroup ref="AdminClickSaveButtonOnUserRoleFormActionGroup" stepKey="saveEditedRole"/>
 
         <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutDefaultAdminUserAfterRevoke"/>
-        <actionGroup ref="LoginAsAdmin" stepKey="loginAsNewUserAfterRevoke">
-            <argument name="adminUser" value="NewAdminUser"/>
+        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsNewUserAfterRevoke">
+            <argument name="username" value="{{NewAdminUser.username}}"/>
+            <argument name="password" value="{{NewAdminUser.password}}"/>
         </actionGroup>
 
         <!-- Verify new User no longer has access to 'Login as Customer Button' -->
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerLogTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerLogTest.xml
index 1b8720eec9fc8..255c6978d6e55 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerLogTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerLogTest.xml
@@ -17,37 +17,42 @@
                 value="Verify admin user's access to 'Login as Customer Log' can be changed"/>
             <severity value="CRITICAL"/>
             <group value="login_as_customer"/>
+            <skip>
+                <issueId value="MQE-1964"/>
+            </skip>
         </annotations>
         <before>
             <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
                         stepKey="enableLoginAsCustomer"/>
+            <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0"
+                        stepKey="enableLoginAsCustomerAutoDetection"/>
             <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsDefaultAdminUserBefore"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDefaultAdminUserBefore"/>
 
             <!--Create New Role-->
             <actionGroup ref="AdminOpenCreateRolePageActionGroup" stepKey="goToNewRolePage"/>
             <actionGroup ref="AdminFillUserRoleFormActionGroup" stepKey="fillNewRoleForm">
-                <argument name="role" value="customRoleAllResources"/>
+                <argument name="role" value="CustomRoleAllResources"/>
             </actionGroup>
             <actionGroup ref="AdminClickSaveButtonOnUserRoleFormActionGroup" stepKey="saveNewRole"/>
 
             <!--Create New User-->
             <actionGroup ref="AdminCreateUserWithApiRoleActionGroup" stepKey="adminCreateUser">
                 <argument name="user" value="NewAdminUser"/>
-                <argument name="role" value="customRoleAllResources"/>
+                <argument name="role" value="CustomRoleAllResources"/>
             </actionGroup>
         </before>
         <after>
             <!--Delete new User-->
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutNewUserAfter"/>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsDefaultAdminUserAfter"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDefaultAdminUserAfter"/>
             <actionGroup ref="AdminDeleteCustomUserActionGroup" stepKey="deleteNewUser">
                 <argument name="user" value="NewAdminUser"/>
             </actionGroup>
 
             <!--Delete new Role-->
             <actionGroup ref="AdminDeleteUserRoleActionGroup" stepKey="deleteCustomRoleAllResources">
-                <argument name="roleName" value="{{customRoleAllResources.rolename}}"/>
+                <argument name="roleName" value="{{CustomRoleAllResources.rolename}}"/>
             </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logOut"/>
 
@@ -58,8 +63,9 @@
 
         <!-- Login as new User -->
         <actionGroup ref="AdminLogoutActionGroup" stepKey="logOutFromAdminPanel"/>
-        <actionGroup ref="LoginAsAdmin" stepKey="loginAsNewUser">
-            <argument name="adminUser" value="NewAdminUser"/>
+        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsNewUser">
+            <argument name="username" value="{{NewAdminUser.username}}"/>
+            <argument name="password" value="{{NewAdminUser.password}}"/>
         </actionGroup>
 
         <!-- Verify new User has access to 'Login as Customer Log' -->
@@ -67,19 +73,20 @@
 
         <!-- Revoke 'Login as Customer Log' access for new User -->
         <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutNewUser"/>
-        <actionGroup ref="LoginAsAdmin" stepKey="loginAsDefaultAdminUser"/>
+        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDefaultAdminUser"/>
 
         <actionGroup ref="AdminEditUserRoleActionGroup" stepKey="openEditUserRole">
-            <argument name="roleName" value="{{customRoleAllResources.rolename}}"/>
+            <argument name="roleName" value="{{CustomRoleAllResources.rolename}}"/>
         </actionGroup>
         <actionGroup ref="AdminRevokeRoleResourceActionGroup" stepKey="revokeLoginAsCustomerAccess">
-            <argument name="resourceName" value="Login As Customer Log"/>
+            <argument name="resourceName" value="View Login as Customer Log"/>
         </actionGroup>
         <actionGroup ref="AdminClickSaveButtonOnUserRoleFormActionGroup" stepKey="saveEditedRole"/>
 
         <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutDefaultAdminUserAfterRevoke"/>
-        <actionGroup ref="LoginAsAdmin" stepKey="loginAsNewUserAfterRevoke">
-            <argument name="adminUser" value="NewAdminUser"/>
+        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsNewUserAfterRevoke">
+            <argument name="username" value="{{NewAdminUser.username}}"/>
+            <argument name="password" value="{{NewAdminUser.password}}"/>
         </actionGroup>
 
         <!-- Verify new User no longer has access to 'Login as Customer Log' menu item -->
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAddProductToWishlistTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAddProductToWishlistTest.xml
index 1327bc1b74ecc..633aed7d0317d 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAddProductToWishlistTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAddProductToWishlistTest.xml
@@ -21,13 +21,15 @@
         <before>
             <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
                         stepKey="enableLoginAsCustomer"/>
+            <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0"
+                        stepKey="enableLoginAsCustomerAutoDetection"/>
             <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
             <createData entity="_defaultCategory" stepKey="createCategory"/>
             <createData entity="SimpleProduct" stepKey="createSimpleProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>
         <after>
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerEditCustomersAddressTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerEditCustomersAddressTest.xml
index 88f65b167efc9..35373d78f194b 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerEditCustomersAddressTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerEditCustomersAddressTest.xml
@@ -21,12 +21,14 @@
         <before>
             <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
                         stepKey="enableLoginAsCustomer"/>
+            <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0"
+                        stepKey="enableLoginAsCustomerAutoDetection"/>
             <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAdmin"/>
         </before>
         <after>
-            <actionGroup ref="logout" stepKey="logoutAdmin"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAdmin"/>
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
             <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0"
                         stepKey="disableLoginAsCustomer"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLogNotShownIfLoginAsCustomerDisabledTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLogNotShownIfLoginAsCustomerDisabledTest.xml
index d01bd27c00ca0..bcd824707a1cd 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLogNotShownIfLoginAsCustomerDisabledTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLogNotShownIfLoginAsCustomerDisabledTest.xml
@@ -20,7 +20,7 @@
         <before>
             <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0" stepKey="disableLoginAsCustomer"/>
             <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
-            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>
         <after>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingTest.xml
index c66a1519d9c63..6d6dcc1377434 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingTest.xml
@@ -22,6 +22,8 @@
         <before>
             <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
                         stepKey="enableLoginAsCustomer"/>
+            <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0"
+                        stepKey="enableLoginAsCustomerAutoDetection"/>
             <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
             <createData entity="NewAdminUser" stepKey="createNewAdmin"/>
             <createData entity="Simple_US_Customer" stepKey="createFirstCustomer"/>
@@ -35,28 +37,28 @@
             <actionGroup ref="AdminDeleteUserViaCurlActionGroup" stepKey="deleteNewAdmin">
                 <argument name="user" value="NewAdminUser"/>
             </actionGroup>
-            <actionGroup ref="logout" stepKey="logoutAfter"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAfter"/>
             <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0"
                         stepKey="disableLoginAsCustomer"/>
             <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
         </after>
 
         <!-- Login into First Customer account -->
-        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerGirdPageActionGroup"
+        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup"
                      stepKey="loginAsFirstCustomerByDefaultAdmin">
-            <argument name="customerEmail" value="$$createFirstCustomer.email$$"/>
+            <argument name="customerId" value="$$createFirstCustomer.id$$"/>
         </actionGroup>
         <actionGroup ref="StorefrontSignOutAndCloseTabActionGroup" stepKey="signOutFirstCustomerDefaultAdmin"/>
 
         <!-- Login into Second Customer account -->
-        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerGirdPageActionGroup"
+        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup"
                      stepKey="loginAsSecondCustomerByDefaultAdmin">
-            <argument name="customerEmail" value="$$createSecondCustomer.email$$"/>
+            <argument name="customerId" value="$$createSecondCustomer.id$$"/>
         </actionGroup>
         <actionGroup ref="StorefrontSignOutAndCloseTabActionGroup" stepKey="signOutSecondCustomerDefaultAdmin"/>
 
         <!-- Log out as Default Admin User -->
-        <actionGroup ref="logout" stepKey="logoutAsDefaultAdmin"/>
+        <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAsDefaultAdmin"/>
 
         <!-- Login as New Admin User -->
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsNewUser">
@@ -65,16 +67,16 @@
         </actionGroup>
 
         <!-- Login into First Customer account -->
-        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerGirdPageActionGroup"
+        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup"
                      stepKey="loginAsFirstCustomerByNewAdmin">
-            <argument name="customerEmail" value="$$createFirstCustomer.email$$"/>
+            <argument name="customerId" value="$$createFirstCustomer.id$$"/>
         </actionGroup>
         <actionGroup ref="StorefrontSignOutAndCloseTabActionGroup" stepKey="signOutFirstCustomerNewAdmin"/>
 
         <!-- Login into Second Customer account -->
-        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerGirdPageActionGroup"
+        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup"
                      stepKey="loginAsSecondCustomerByNewAdmin">
-            <argument name="customerEmail" value="$$createSecondCustomer.email$$"/>
+            <argument name="customerId" value="$$createSecondCustomer.id$$"/>
         </actionGroup>
         <actionGroup ref="StorefrontSignOutAndCloseTabActionGroup" stepKey="signOutSecondCustomerNewAdmin"/>
 
@@ -104,6 +106,6 @@
         </actionGroup>
 
         <!-- Log out as New Admin User -->
-        <actionGroup ref="logout" stepKey="logoutAsNewAdmin"/>
+        <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAsNewAdmin"/>
     </test>
 </tests>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml
index 54c364eb10cee..b5c8817141438 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml
@@ -21,28 +21,51 @@
         <before>
             <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
                         stepKey="enableLoginAsCustomer"/>
+            <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0"
+                        stepKey="enableLoginAsCustomerAutoDetection"/>
             <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
             <createData entity="_defaultCategory" stepKey="createCategory"/>
             <createData entity="SimpleProduct" stepKey="createProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+
+            <!-- Create new User -->
+            <actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
+            <actionGroup ref="AdminCreateUserWithRoleActionGroup" stepKey="createAdminUser">
+                <argument name="user" value="activeAdmin"/>
+                <argument name="role" value="roleDefaultAdministrator"/>
+            </actionGroup>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutMasterAdmin"/>
+
+            <!-- Login as new User -->
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginToNewAdmin">
+                <argument name="username" value="{{activeAdmin.username}}"/>
+                <argument name="password" value="{{activeAdmin.password}}"/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+
+            <!-- Delete new User -->
+            <actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
+            <actionGroup ref="AdminDeleteUserActionGroup" stepKey="deleteUser">
+                <argument name="user" value="activeAdmin"/>
+            </actionGroup>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
+
             <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0"
                         stepKey="disableLoginAsCustomer"/>
             <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
         </after>
 
-        <!-- Login As Customer from Customer grid page -->
-        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerGirdPageActionGroup"
-                     stepKey="loginAsCustomer">
-            <argument name="customerEmail" value="$$createCustomer.email$$"/>
+        <!-- Login As Customer from Customer page -->
+        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup"
+                     stepKey="loginAsCustomerFromCustomerPage">
+            <argument name="customerId" value="$$createCustomer.id$$"/>
         </actionGroup>
 
         <!-- Place Order as Customer -->
@@ -53,7 +76,7 @@
             <argument name="product" value="$$createProduct$$"/>
             <argument name="productCount" value="1"/>
         </actionGroup>
-        <actionGroup ref="StorefrontOpenCartPageActionGroup" stepKey="openCart"/>
+        <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="openCart"/>
         <actionGroup ref="PlaceOrderWithLoggedUserActionGroup" stepKey="placeOrder"/>
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderId"/>
 
@@ -65,6 +88,7 @@
         <!-- Assert Admin Order page contains message about Order created by a Store Administrator -->
         <actionGroup ref="AdminAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageOrderCreatedByAdmin">
             <argument name="orderId" value="{$grabOrderId}"/>
+            <argument name="adminUserFullName" value="{{activeAdmin.firstname}} {{activeAdmin.lastname}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerReorderTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerReorderTest.xml
index d89da1e53d0b0..13c052df8209e 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerReorderTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerReorderTest.xml
@@ -21,19 +21,42 @@
         <before>
             <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
                         stepKey="enableLoginAsCustomer"/>
+            <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0"
+                        stepKey="enableLoginAsCustomerAutoDetection"/>
             <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
             <createData entity="_defaultCategory" stepKey="createCategory"/>
             <createData entity="SimpleProduct" stepKey="createProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+
+            <!-- Create new User -->
+            <actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
+            <actionGroup ref="AdminCreateUserWithRoleActionGroup" stepKey="createAdminUser">
+                <argument name="user" value="activeAdmin"/>
+                <argument name="role" value="roleDefaultAdministrator"/>
+            </actionGroup>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutMasterAdmin"/>
+
+            <!-- Login as new User -->
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginToNewAdmin">
+                <argument name="username" value="{{activeAdmin.username}}"/>
+                <argument name="password" value="{{activeAdmin.password}}"/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+
+            <!-- Delete new User -->
+            <actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
+            <actionGroup ref="AdminDeleteUserActionGroup" stepKey="deleteUser">
+                <argument name="user" value="activeAdmin"/>
+            </actionGroup>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
+
             <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0"
                         stepKey="disableLoginAsCustomer"/>
             <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
@@ -52,17 +75,16 @@
             <argument name="product" value="$$createProduct$$"/>
             <argument name="productCount" value="1"/>
         </actionGroup>
-        <actionGroup ref="StorefrontOpenCartPageActionGroup" stepKey="openCart"/>
+        <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="openCart"/>
         <actionGroup ref="PlaceOrderWithLoggedUserActionGroup" stepKey="placeOrder"/>
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderId"/>
 
         <!-- Log out from storefront as Customer -->
         <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogOut"/>
 
-        <!-- Login As Customer from Customer grid page -->
-        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerGirdPageActionGroup"
-                     stepKey="loginAsCustomer">
-            <argument name="customerEmail" value="$$createCustomer.email$$"/>
+        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup"
+                     stepKey="loginAsCustomerFromCustomerPage">
+            <argument name="customerId" value="$$createCustomer.id$$"/>
         </actionGroup>
 
         <!-- Make reorder -->
@@ -74,13 +96,13 @@
 
         <!-- Assert Storefront Order page contains message about Order created by a Store Administrator -->
         <actionGroup ref="StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyStorefrontMessageOrderCreatedByAdmin">
-            <argument name="orderId" value="{grabReorderId}"/>
+            <argument name="orderId" value="${grabReorderId}"/>
         </actionGroup>
 
         <!-- Assert Admin Order page contains message about Order created by a Store Administrator -->
         <actionGroup ref="AdminAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageOrderCreatedByAdmin">
-            <argument name="orderId" value="{grabReorderId}"/>
+            <argument name="orderId" value="${grabReorderId}"/>
+            <argument name="adminUserFullName" value="{{activeAdmin.firstname}} {{activeAdmin.lastname}}"/>
         </actionGroup>
-
     </test>
 </tests>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSubscribeToNewsletterTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSubscribeToNewsletterTest.xml
index 477fb82408903..60a6fe7963043 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSubscribeToNewsletterTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSubscribeToNewsletterTest.xml
@@ -21,9 +21,11 @@
         <before>
             <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
                         stepKey="enableLoginAsCustomer"/>
+            <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0"
+                        stepKey="enableLoginAsCustomerAutoDetection"/>
             <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>
         <after>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
@@ -39,17 +41,17 @@
         </actionGroup>
 
         <!-- Subscribe for newsletter -->
-        <amOnPage url="{{StorefrontNewsletterManagePage.url}}" stepKey="goToNewsletterManage"/>
-        <click selector="{{StorefrontNewsletterManageSection.subscriptionCheckbox}}"
-               stepKey="checkSubscribedNewsletter"/>
-        <click selector="{{StorefrontNewsletterManageSection.saveButton}}"
-               stepKey="saveSubscription"/>
-        <waitForPageLoad stepKey="waitForSubscriptionSaved"/>
+        <actionGroup ref="StorefrontCustomerNavigateToNewsletterPageActionGroup" stepKey="navigateToNewsletterPage"/>
+        <actionGroup ref="StorefrontCustomerUpdateGeneralSubscriptionActionGroup" stepKey="subscribeToNewsletter"/>
+        <actionGroup ref="AssertStorefrontCustomerMessagesActionGroup" stepKey="assertMessage">
+            <argument name="message" value="We have saved your subscription."/>
+        </actionGroup>
         <actionGroup ref="StorefrontSignOutAndCloseTabActionGroup" stepKey="signOutAfterLoggedInAsCustomer"/>
 
         <!-- Verify subscription successful -->
-        <amOnPage url="{{AdminNewsletterSubscriberPage.url}}" stepKey="goToNewsletterSubscriberGrid"/>
-        <see selector="{{AdminNewsletterSubscriberGridSection.email('1')}}" userInput="$$createCustomer.email$$" stepKey="seeCustomerEmailInSubscriberGrid"/>
-        <see selector="{{AdminNewsletterSubscriberGridSection.type('1')}}" userInput="Customer" stepKey="seeCustomerTypeInSubscriberGrid"/>
+        <actionGroup ref="AdminOpenCustomerEditPageActionGroup" stepKey="openCustomerEditPage">
+            <argument name="customerId" value="$$createCustomer.id$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertCustomerIsSubscribedToNewsletters" stepKey="assertSubscribedToNewsletter"/>
     </test>
 </tests>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerButtonTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerButtonTest.xml
index 5edbc0c5bbbf5..5bacca897b66a 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerButtonTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerButtonTest.xml
@@ -16,30 +16,37 @@
             <description value="Login into Magento Admin panel as user that does not have access to 'Login as customer' button"/>
             <severity value="CRITICAL"/>
             <group value="login_as_customer"/>
+            <skip>
+                <issueId value="MQE-1964"/>
+            </skip>
         </annotations>
         <before>
             <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1" stepKey="enableLoginAsCustomer"/>
+            <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0"
+                        stepKey="enableLoginAsCustomerAutoDetection"/>
             <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
             <createData entity="_defaultCategory" stepKey="createCategory"/>
             <createData entity="SimpleProduct" stepKey="createSimpleProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsDefaultAdminUserBefore"/>
-
-            <!--Create New User-->
-            <actionGroup ref="AdminOpenNewUserPageActionGroup" stepKey="goToNewUserPage"/>
-            <actionGroup ref="AdminFillNewUserFormRequiredFieldsActionGroup" stepKey="fillNewUserForm">
-                <argument name="user" value="NewAdminUser"/>
-            </actionGroup>
-            <actionGroup ref="AdminClickSaveButtonOnUserFormActionGroup" stepKey="saveNewUser"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDefaultAdminUserBefore"/>
 
             <!--Create New Role-->
             <actionGroup ref="AdminOpenCreateRolePageActionGroup" stepKey="goToNewRolePage"/>
             <actionGroup ref="AdminFillUserRoleFormActionGroup" stepKey="fillNewRoleForm">
-                <argument name="role" value="roleSales"/>
+                <argument name="role" value="CustomRoleAllResources"/>
+            </actionGroup>
+            <actionGroup ref="AdminRevokeRoleResourceActionGroup" stepKey="revokeLoginAsCustomerAccess">
+                <argument name="resourceName" value="Allow Login as Customer Button"/>
             </actionGroup>
             <actionGroup ref="AdminClickSaveButtonOnUserRoleFormActionGroup" stepKey="saveNewRole"/>
+
+            <!--Create New User-->
+            <actionGroup ref="AdminCreateUserWithApiRoleActionGroup" stepKey="adminCreateUser">
+                <argument name="user" value="NewAdminUser"/>
+                <argument name="role" value="CustomRoleAllResources"/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
@@ -48,14 +55,14 @@
 
             <!--Delete new User-->
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAsSaleRoleUser"/>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsDefaultAdminUserAfter"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDefaultAdminUserAfter"/>
             <actionGroup ref="AdminDeleteCustomUserActionGroup" stepKey="deleteNewUser">
-                <argument name="user" value="AdminUserWithUpdatedUserRoleToSales"/>
+                <argument name="user" value="NewAdminUser"/>
             </actionGroup>
 
             <!--Delete new Role-->
-            <actionGroup ref="AdminDeleteUserRoleActionGroup" stepKey="deleteCustomRole">
-                <argument name="roleName" value="{{roleSales.rolename}}"/>
+            <actionGroup ref="AdminDeleteUserRoleActionGroup" stepKey="deleteCustomRoleAllResources">
+                <argument name="roleName" value="{{CustomRoleAllResources.rolename}}"/>
             </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logOut"/>
 
@@ -63,22 +70,11 @@
             <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
         </after>
 
-        <!--Assign new role-->
-        <actionGroup ref="AdminOpenUserEditPageActionGroup" stepKey="openUserEditPage">
-            <argument name="user" value="NewAdminUser"/>
-        </actionGroup>
-        <actionGroup ref="AdminFillNewUserFormRequiredFieldsActionGroup" stepKey="fillUserForm">
-            <argument name="user" value="AdminUserWithUpdatedUserRoleToSales"/>
-        </actionGroup>
-        <actionGroup ref="AdminClickSaveButtonOnUserFormActionGroup" stepKey="saveUser"/>
-        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSuccessMessage">
-            <argument name="message" value="You saved the user."/>
-        </actionGroup>
-
         <!-- Login as new User -->
         <actionGroup ref="AdminLogoutActionGroup" stepKey="logOutFromAdminPanel"/>
-        <actionGroup ref="LoginAsAdmin" stepKey="loginAsSaleRoleUser">
-            <argument name="adminUser" value="AdminUserWithUpdatedUserRoleToSales"/>
+        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsNewUser">
+            <argument name="username" value="{{NewAdminUser.username}}"/>
+            <argument name="password" value="{{NewAdminUser.password}}"/>
         </actionGroup>
 
         <!-- Verify Login As Customer Login action is absent on Customer page -->
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerConfigurationTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerConfigurationTest.xml
index eab2f2c6dfd6e..c7f42de741862 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerConfigurationTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerConfigurationTest.xml
@@ -10,39 +10,44 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminNoAccessToLoginAsCustomerConfigurationTest">
         <annotations>
-            <features value="Login As Customer"/>
+            <features value="Login as Customer"/>
             <stories value="Permissions and ACl"/>
             <title value="User does not have access to 'Login as customer' section in System Configuration"/>
             <description
                 value="Login into Magento Admin panel as user that does not have access to 'Login as customer' section in System Configuration"/>
             <severity value="CRITICAL"/>
             <group value="login_as_customer"/>
+            <skip>
+                <issueId value="MQE-1964"/>
+            </skip>
         </annotations>
         <before>
             <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
                         stepKey="enableLoginAsCustomer"/>
+            <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0"
+                        stepKey="enableLoginAsCustomerAutoDetection"/>
             <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
             <createData entity="_defaultCategory" stepKey="createCategory"/>
             <createData entity="SimpleProduct" stepKey="createSimpleProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsDefaultAdminUserBefore"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDefaultAdminUserBefore"/>
 
             <!--Create New Role-->
             <actionGroup ref="AdminOpenCreateRolePageActionGroup" stepKey="goToNewRolePage"/>
             <actionGroup ref="AdminFillUserRoleFormActionGroup" stepKey="fillNewRoleForm">
-                <argument name="role" value="customRoleAllResources"/>
+                <argument name="role" value="CustomRoleAllResources"/>
             </actionGroup>
             <actionGroup ref="AdminRevokeRoleResourceActionGroup" stepKey="revokeLoginAsCustomerAccess">
-                <argument name="resourceName" value="Login As Customer Section"/>
+                <argument name="resourceName" value="Login as Customer Section"/>
             </actionGroup>
             <actionGroup ref="AdminClickSaveButtonOnUserRoleFormActionGroup" stepKey="saveNewRole"/>
 
             <!--Create New User-->
             <actionGroup ref="AdminCreateUserWithApiRoleActionGroup" stepKey="adminCreateUser">
                 <argument name="user" value="NewAdminUser"/>
-                <argument name="role" value="customRoleAllResources"/>
+                <argument name="role" value="CustomRoleAllResources"/>
             </actionGroup>
         </before>
         <after>
@@ -52,14 +57,14 @@
 
             <!--Delete new User-->
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAsSaleRoleUser"/>
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsDefaultAdminUserAfter"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDefaultAdminUserAfter"/>
             <actionGroup ref="AdminDeleteCustomUserActionGroup" stepKey="deleteNewUser">
                 <argument name="user" value="NewAdminUser"/>
             </actionGroup>
 
             <!--Delete new Role-->
             <actionGroup ref="AdminDeleteUserRoleActionGroup" stepKey="deleteCustomRoleAllResources">
-                <argument name="roleName" value="{{customRoleAllResources.rolename}}"/>
+                <argument name="roleName" value="{{CustomRoleAllResources.rolename}}"/>
             </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logOut"/>
 
@@ -70,8 +75,9 @@
 
         <!-- Login as new User -->
         <actionGroup ref="AdminLogoutActionGroup" stepKey="logOutFromAdminPanel"/>
-        <actionGroup ref="LoginAsAdmin" stepKey="loginAsSaleRoleUser">
-            <argument name="adminUser" value="NewAdminUser"/>
+        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsNewUser">
+            <argument name="username" value="{{NewAdminUser.username}}"/>
+            <argument name="password" value="{{NewAdminUser.password}}"/>
         </actionGroup>
 
         <!-- Navigate to Configuration page and open Customers tab -->
@@ -80,11 +86,11 @@
             <argument name="tabName" value="Customers"/>
         </actionGroup>
 
-        <!-- Assert no Login As Customer config section visible -->
-        <actionGroup ref="AssertAdminLoginAsCustomerConfigNotVisibleActionGroup" stepKey="assertConfigNotVisible"/>
+        <!-- Assert no Login as Customer config section visible -->
+        <actionGroup ref="AdminAssertLoginAsCustomerConfigNotVisibleActionGroup" stepKey="assertConfigNotVisible"/>
 
-        <!-- Assert Login As Customer config section is not available by direct url -->
-        <actionGroup ref="AssertAdminLoginAsCustomerConfigNotAvailableDirectlyActionGroup"
+        <!-- Assert Login as Customer config section is not available by direct url -->
+        <actionGroup ref="AdminAssertLoginAsCustomerConfigNotAvailableDirectlyActionGroup"
                      stepKey="assertConfigNotAvailableDirectly"/>
     </test>
 </tests>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUINotShownIfLoginAsCustomerDisabledTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUINotShownIfLoginAsCustomerDisabledTest.xml
index 533854d12bd61..595b47cb56216 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUINotShownIfLoginAsCustomerDisabledTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUINotShownIfLoginAsCustomerDisabledTest.xml
@@ -25,7 +25,7 @@
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>
         <after>
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml
index fd7828f570a85..8170051dd2c32 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml
@@ -12,7 +12,7 @@
         <annotations>
             <features value="Login As Customer"/>
             <stories value="Availability of UI elements if module enable/disable"/>
-            <title value="UI elements are shown if 'Login as customer' functionality is disabled"/>
+            <title value="UI elements are shown if 'Login as customer' functionality is enabled"/>
             <description
                 value="Verify that UI elements are present and links are working if 'Login as customer' functionality enabled"/>
             <severity value="BLOCKER"/>
@@ -21,13 +21,15 @@
         <before>
             <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
                         stepKey="enableLoginAsCustomer"/>
+            <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0"
+                        stepKey="enableLoginAsCustomerAutoDetection"/>
             <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
             <createData entity="_defaultCategory" stepKey="createCategory"/>
             <createData entity="SimpleProduct" stepKey="createSimpleProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>
         <after>
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
@@ -40,18 +42,6 @@
             <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
         </after>
 
-        <!-- Verify Login As Customer Login action works correctly from Customer grid page -->
-        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerGirdPageActionGroup"
-                     stepKey="verifyLoginAsCustomerWorksOnCustomerGridPage">
-            <argument name="customerEmail" value="$$createCustomer.email$$"/>
-        </actionGroup>
-
-        <actionGroup ref="StorefrontAssertLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromCustomerGird">
-            <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
-            <argument name="customerEmail" value="$$createCustomer.email$$"/>
-        </actionGroup>
-        <actionGroup ref="StorefrontSignOutAndCloseTabActionGroup" stepKey="signOutAfterLoggedInFromCustomerGird"/>
-
         <!-- Verify Login As Customer Login action works correctly from Customer page -->
         <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup"
                      stepKey="verifyLoginAsCustomerWorksOnCustomerPage">
@@ -74,18 +64,6 @@
             <argument name="orderId" value="$grabOrderId"/>
         </actionGroup>
 
-        <!-- Verify Login As Customer Login action works correctly from Order grid page -->
-        <actionGroup ref="AdminLoginAsCustomerLoginFromOrderGridPageActionGroup"
-                     stepKey="verifyLoginAsCustomerWorksOnOrderGridPage">
-            <argument name="orderId" value="$grabOrderId"/>
-        </actionGroup>
-
-        <actionGroup ref="StorefrontAssertLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromOrderGridPage">
-            <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
-            <argument name="customerEmail" value="$$createCustomer.email$$"/>
-        </actionGroup>
-        <actionGroup ref="StorefrontSignOutAndCloseTabActionGroup" stepKey="signOutAfterLoggedInFromOrderGridPage"/>
-
         <!-- Verify Login As Customer Login action works correctly from Order page -->
         <actionGroup ref="AdminLoginAsCustomerLoginFromOrderPageActionGroup"
                      stepKey="verifyLoginAsCustomerWorksOnOrderPage">
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerNotificationBannerTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerNotificationBannerTest.xml
new file mode 100644
index 0000000000000..ec47c2127a94d
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerNotificationBannerTest.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="StorefrontLoginAsCustomerNotificationBannerTest">
+        <annotations>
+            <features value="Login As Customer"/>
+            <stories value="Availability of UI elements if module enable/disable"/>
+            <title value="Notification Banner is present on Storefront page"/>
+            <description
+                value="Verify that Notification Banner is present on page if 'Login as customer' functionality used"/>
+            <severity value="MAJOR"/>
+            <group value="login_as_customer"/>
+        </annotations>
+        <before>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
+                        stepKey="enableLoginAsCustomer"/>
+            <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0"
+                        stepKey="enableLoginAsCustomerAutoDetection"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0"
+                        stepKey="disableLoginAsCustomer"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
+        </after>
+
+        <!-- Login As Customer from Customer page -->
+        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup"
+                     stepKey="loginAsCustomerFromCustomerPage">
+            <argument name="customerId" value="$$createCustomer.id$$"/>
+        </actionGroup>
+
+        <!-- Assert Notification Banner is present on page -->
+        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBanner">
+            <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
+        </actionGroup>
+
+        <!-- Log out Customer by Notification Banner and close tab -->
+        <actionGroup ref="StorefrontSignOutNotificationBannerAndCloseTabActionGroup" stepKey="signOutAndCloseTab"/>
+    </test>
+</tests>

From b2846ed473b2ad833b673a9c35e6f0e12ac7309a Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Tue, 28 Apr 2020 12:45:29 +0300
Subject: [PATCH 0207/1718] MFTF tests updates: skip failing tests.

---
 .../Test/AdminLoginAsCustomerDirectlyToCustomWebsiteTest.xml   | 3 +++
 ...LoginAsCustomerLogNotShownIfLoginAsCustomerDisabledTest.xml | 3 +++
 .../Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml    | 3 +++
 .../Mftf/Test/AdminUINotShownIfLoginAsCustomerDisabledTest.xml | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerDirectlyToCustomWebsiteTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerDirectlyToCustomWebsiteTest.xml
index a931aefc6edb5..d88f860b6078b 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerDirectlyToCustomWebsiteTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerDirectlyToCustomWebsiteTest.xml
@@ -17,6 +17,9 @@
                 value="Verify admin user can directly login into customer account on custom website using 'Login as customer' functionality"/>
             <severity value="BLOCKER"/>
             <group value="login_as_customer"/>
+            <skip>
+                <issueId value="https://github.com/magento/magento2-login-as-customer/issues/102"/>
+            </skip>
         </annotations>
         <before>
             <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLogNotShownIfLoginAsCustomerDisabledTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLogNotShownIfLoginAsCustomerDisabledTest.xml
index bcd824707a1cd..6fce0d7c69988 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLogNotShownIfLoginAsCustomerDisabledTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLogNotShownIfLoginAsCustomerDisabledTest.xml
@@ -16,6 +16,9 @@
             <description value="Verify that 'Login As Customer Log' not shown if 'Login as customer' functionality is disabled"/>
             <severity value="CRITICAL"/>
             <group value="login_as_customer"/>
+            <skip>
+                <issueId value="https://github.com/magento/magento2-login-as-customer/issues/71"/>
+            </skip>
         </annotations>
         <before>
             <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0" stepKey="disableLoginAsCustomer"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
index ae4a10e7fd568..036ab307527b0 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
@@ -18,6 +18,9 @@
                 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/102"/>
+            </skip>
         </annotations>
         <before>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUINotShownIfLoginAsCustomerDisabledTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUINotShownIfLoginAsCustomerDisabledTest.xml
index 595b47cb56216..74fed6598085d 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUINotShownIfLoginAsCustomerDisabledTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUINotShownIfLoginAsCustomerDisabledTest.xml
@@ -16,6 +16,9 @@
             <description value="Verify that UI elements are not shown if 'Login as customer' functionality is disabled"/>
             <severity value="CRITICAL"/>
             <group value="login_as_customer"/>
+            <skip>
+                <issueId value="https://github.com/magento/magento2-login-as-customer/issues/71"/>
+            </skip>
         </annotations>
         <before>
             <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0" stepKey="disableLoginAsCustomer"/>

From 35381a20d985d57cd53559fd1320676e1ef8c378 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Tue, 28 Apr 2020 18:14:52 +0300
Subject: [PATCH 0208/1718] MFTF update.

---
 .../Test/Mftf/Data/LoginAsCustomerConfigData.xml            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/LoginAsCustomerConfigData.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/LoginAsCustomerConfigData.xml
index 4fe414d1d895e..316a810ce13e4 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/LoginAsCustomerConfigData.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/LoginAsCustomerConfigData.xml
@@ -9,12 +9,12 @@
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="LoginAsCustomerConfigDataEnabled">
-        <data key="path">mfloginascustomer/general/enabled</data>
+        <data key="path">login_as_customer/general/enabled</data>
     </entity>
     <entity name="LoginAsCustomerDisablePageCache">
-        <data key="path">mfloginascustomer/general/disable_page_cache</data>
+        <data key="path">login_as_customer/general/disable_page_cache</data>
     </entity>
     <entity name="LoginAsCustomerStoreViewLogin">
-        <data key="path">mfloginascustomer/general/store_view_login</data>
+        <data key="path">login_as_customer/general/store_view_manual_choice_enabled</data>
     </entity>
 </entities>

From bc1c08857ba84d025239ead5205460f97d454d2d Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Wed, 29 Apr 2020 13:17:16 +0300
Subject: [PATCH 0209/1718] MC-33719: [2.4.0][Integration] Test
 Magento.CatalogImportExport.Model.ProductStagingTest.testImportExport with
 data set "simple-product-related" fails on Jenkins

---
 .../Model/AbstractProductExportImportTestCase.php    | 12 ++++++++++++
 .../_files/product_configurable.php                  |  2 +-
 .../_files/product_configurable_12345.php            |  4 ++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php
index eecdcdf038cf8..4d4861b4e4eaf 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php
@@ -68,6 +68,11 @@ abstract class AbstractProductExportImportTestCase extends \PHPUnit\Framework\Te
      */
     private $writer;
 
+    /**
+     * @var string
+     */
+    private $csvFile;
+
     /**
      * @inheritdoc
      */
@@ -87,6 +92,11 @@ protected function setUp()
     protected function tearDown()
     {
         $this->executeFixtures($this->fixtures, true);
+
+        if ($this->csvFile !== null) {
+            $directoryWrite = $this->fileSystem->getDirectoryWrite(DirectoryList::VAR_DIR);
+            $directoryWrite->delete($this->csvFile);
+        }
     }
 
     /**
@@ -104,6 +114,7 @@ protected function tearDown()
      */
     public function testImportExport(array $fixtures, array $skus, array $skippedAttributes = []): void
     {
+        $this->csvFile = null;
         $this->fixtures = $fixtures;
         $this->executeFixtures($fixtures);
         $this->modifyData($skus);
@@ -378,6 +389,7 @@ protected function executeImportReplaceTest(
     private function exportProducts(\Magento\CatalogImportExport\Model\Export\Product $exportProduct = null)
     {
         $csvfile = uniqid('importexport_') . '.csv';
+        $this->csvFile = $csvfile;
 
         $exportProduct = $exportProduct ?: $this->objectManager->create(
             \Magento\CatalogImportExport\Model\Export\Product::class
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable.php
index 07ecfb5469eb7..4726734712289 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable.php
@@ -21,7 +21,7 @@
 
 /** @var ProductRepositoryInterface $productRepository */
 $productRepository = Bootstrap::getObjectManager()
-    ->create(ProductRepositoryInterface::class);
+    ->get(ProductRepositoryInterface::class);
 
 /** @var $installer CategorySetup */
 $installer = Bootstrap::getObjectManager()->create(CategorySetup::class);
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_12345.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_12345.php
index 70aa7c07ed536..b16a312488131 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_12345.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_12345.php
@@ -21,7 +21,7 @@
 
 /** @var ProductRepositoryInterface $productRepository */
 $productRepository = Bootstrap::getObjectManager()
-    ->create(ProductRepositoryInterface::class);
+    ->get(ProductRepositoryInterface::class);
 
 /** @var $installer CategorySetup */
 $installer = Bootstrap::getObjectManager()->create(CategorySetup::class);
@@ -105,7 +105,7 @@
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 try {
-    $productToDelete = $productRepository->getById(11);
+    $productToDelete = $productRepository->getById(111);
     $productRepository->delete($productToDelete);
 
     /** @var \Magento\Quote\Model\ResourceModel\Quote\Item $itemResource */

From 70ede03e5c2dc9e2c3bb23d0fc5c29cb03cbe7dd Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Thu, 30 Apr 2020 18:50:30 +0300
Subject: [PATCH 0210/1718] MC-29420: Remove event handlers from CE

---
 .../Backend/Block/Widget/Form/Container.php   |  41 ++++-
 .../templates/widget/form/container.phtml     |   2 +
 .../adminhtml/templates/widget/grid.phtml     |   5 +-
 .../templates/widget/grid/extended.phtml      |   6 +-
 .../render/item/price_msrp_item.phtml         |  10 ++
 .../frontend/templates/checkout/billing.phtml |   6 +-
 .../adminhtml/templates/form/checkmo.phtml    |   2 +-
 .../templates/form/purchaseorder.phtml        |   2 +-
 .../frontend/templates/form/checkmo.phtml     |   2 +-
 .../frontend/templates/partner/logo.phtml     |   2 +-
 .../templates/payflowlink/redirect.phtml      |   5 +-
 .../frontend/templates/payment/mark.phtml     |   2 +-
 .../product/edit/slideout/form.phtml          |   6 +-
 .../view/adminhtml/templates/grid.phtml       | 113 ++++++++----
 .../templates/report/grid/container.phtml     |  12 +-
 .../Review/Block/Customer/ListCustomer.php    |   8 +-
 .../Review/view/adminhtml/templates/add.phtml |  10 +-
 .../adminhtml/templates/rating/detailed.phtml |  32 +++-
 .../templates/rating/stars/summary.phtml      |  16 +-
 .../frontend/templates/customer/list.phtml    |  41 +++--
 .../frontend/templates/customer/recent.phtml  |  29 ++-
 .../frontend/templates/customer/view.phtml    |  36 ++--
 .../view/frontend/templates/detailed.phtml    |  17 +-
 .../frontend/templates/helper/summary.phtml   |  31 +++-
 .../Review/view/frontend/templates/view.phtml |  33 ++--
 .../Block/Adminhtml/Order/AbstractOrder.php   |  11 +-
 .../Adminhtml/Order/Create/Totals/Tax.php     |  28 +++
 .../Sales/Block/Adminhtml/Order/Details.php   |  21 ++-
 .../Block/Adminhtml/Order/Totals/Tax.php      |   1 +
 .../order/create/billing/method/form.phtml    |   6 +-
 .../templates/order/create/form/address.phtml |   2 +-
 .../order/create/newsletter/form.phtml        |   9 +-
 .../order/create/sidebar/items.phtml          |  77 +++++---
 .../templates/order/create/store/select.phtml |  34 ++--
 .../order/create/totals/default.phtml         |  26 ++-
 .../order/create/totals/grandtotal.phtml      |  53 ++++--
 .../order/create/totals/shipping.phtml        |  71 ++++++--
 .../order/create/totals/subtotal.phtml        |  53 ++++--
 .../templates/order/create/totals/tax.phtml   |  75 +++++---
 .../adminhtml/templates/order/details.phtml   | 166 +++++++++++++-----
 .../templates/order/invoice/create/form.phtml |   2 -
 .../templates/order/totals/due.phtml          |  13 +-
 .../templates/order/totals/grand.phtml        |  20 ++-
 .../templates/order/totals/tax.phtml          |  71 +++++---
 .../view/frontend/templates/guest/form.phtml  |  12 +-
 .../templates/widget/guest/form.phtml         |  24 ++-
 .../Search/view/frontend/templates/term.phtml |  20 ++-
 .../view/frontend/templates/send.phtml        |  31 ++--
 .../Shipping/Block/Adminhtml/Create/Form.php  |  29 +++
 .../Block/Adminhtml/Order/Tracking/View.php   |   8 +-
 .../Shipping/Block/Adminhtml/View/Form.php    |  12 +-
 .../adminhtml/templates/create/form.phtml     |  30 +++-
 .../adminhtml/templates/create/items.phtml    |  34 ++--
 .../templates/order/packaging/grid.phtml      |  44 +++--
 .../templates/order/packaging/packed.phtml    |  80 +++++----
 .../templates/order/packaging/popup.phtml     |  35 ++--
 .../order/packaging/popup_content.phtml       | 157 ++++++++++++-----
 .../adminhtml/templates/order/tracking.phtml  |  26 ++-
 .../templates/order/tracking/view.phtml       |  69 +++++---
 .../adminhtml/templates/order/view/info.phtml |  39 ++--
 .../view/adminhtml/templates/view/form.phtml  |  47 +++--
 .../frontend/templates/tracking/popup.phtml   |  57 +++---
 .../adminhtml/templates/importExport.phtml    |  26 ++-
 .../templates/browser/content/uploader.phtml  |  20 ++-
 .../view/adminhtml/templates/tabs/css.phtml   |  15 +-
 .../templates/tabs/fieldset/js.phtml          |  26 ++-
 .../view/adminhtml/templates/tabs/js.phtml    |  15 +-
 .../templates/html/main_css_preloader.phtml   |   9 +-
 .../frontend/templates/html/notices.phtml     |  32 +++-
 .../view/frontend/templates/html/print.phtml  |  11 +-
 .../templates/js/css_rel_preload.phtml        |  24 ++-
 .../templates/translate_inline.phtml          |  28 ++-
 .../view/adminhtml/templates/selector.phtml   |  18 +-
 .../view/adminhtml/templates/role/edit.phtml  |  15 +-
 .../view/adminhtml/templates/role/info.phtml  |  10 +-
 .../templates/role/users_grid_js.phtml        |  51 ++++--
 .../templates/user/roles_grid_js.phtml        |  44 +++--
 .../templates/system/variable/js.phtml        |  11 +-
 .../view/adminhtml/templates/form/vault.phtml |  14 +-
 .../Weee/Block/Item/Price/Renderer.php        |   1 +
 .../adminhtml/templates/renderer/tax.phtml    |  51 ++++--
 .../review/item/price/row_excl_tax.phtml      |  36 ++--
 .../review/item/price/row_incl_tax.phtml      |  37 ++--
 .../review/item/price/unit_excl_tax.phtml     |  36 ++--
 .../review/item/price/unit_incl_tax.phtml     |  37 ++--
 .../frontend/templates/item/price/row.phtml   |  53 +++---
 .../frontend/templates/item/price/unit.phtml  |  48 +++--
 87 files changed, 1882 insertions(+), 748 deletions(-)

diff --git a/app/code/Magento/Backend/Block/Widget/Form/Container.php b/app/code/Magento/Backend/Block/Widget/Form/Container.php
index febaae3861688..6d92d2bfb0396 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Container.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Container.php
@@ -5,6 +5,10 @@
  */
 namespace Magento\Backend\Block\Widget\Form;
 
+use Magento\Backend\Block\Widget\Context;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 /**
  * Backend form container block
  *
@@ -39,7 +43,7 @@ class Container extends \Magento\Backend\Block\Widget\Container
      * @var string
      */
     protected $_blockGroup = 'Magento_Backend';
-    
+
     /**
      *  @var string
      */
@@ -55,6 +59,25 @@ class Container extends \Magento\Backend\Block\Widget\Container
      */
     protected $_template = 'Magento_Backend::widget/form/container.phtml';
 
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
+    /**
+     * @param Context $context
+     * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
+     */
+    public function __construct(
+        Context $context,
+        array $data = [],
+        ?SecureHtmlRenderer $secureRenderer = null
+    ) {
+        $this->secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+        parent::__construct($context, $data);
+    }
+
     /**
      * Initialize form.
      *
@@ -205,8 +228,14 @@ public function getFormHtml()
     public function getFormInitScripts()
     {
         if (!empty($this->_formInitScripts) && is_array($this->_formInitScripts)) {
-            return '<script>' . implode("\n", $this->_formInitScripts) . '</script>';
+            return $this->secureRenderer->renderTag(
+                'script',
+                [],
+                implode("\n", $this->_formInitScripts),
+                false
+            );
         }
+
         return '';
     }
 
@@ -218,8 +247,14 @@ public function getFormInitScripts()
     public function getFormScripts()
     {
         if (!empty($this->_formScripts) && is_array($this->_formScripts)) {
-            return '<script>' . implode("\n", $this->_formScripts) . '</script>';
+            return $this->secureRenderer->renderTag(
+                'script',
+                [],
+                implode("\n", $this->_formScripts),
+                false
+            );
         }
+
         return '';
     }
 
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/container.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/container.phtml
index 21843215758d5..08ec331e37b7d 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/container.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/container.phtml
@@ -29,6 +29,7 @@
     </div>
 <?php endif; ?>
 <?php $scriptString = <<<script
+
 require([
     'jquery',
     'mage/backend/form',
@@ -51,6 +52,7 @@ require([
         });
 
 });
+
 script;
 ?>
 <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
index 79c9ce1f4cefd..abbe74ece1fe5 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 ?>
 <?php
 /**
@@ -230,10 +231,10 @@ require(deps, function('. ($block->getDependencyJsObject() ? 'registry' : '') .'
 
         if ($block->getChildBlock('grid.massaction') &&
             $block->getChildBlock('grid.massaction')->isAvailable()) {
-            $scriptString .= /* @noEscape */ $block->getChildBlock('grid.massaction')->getJavaScript();
+            $scriptString .= /* @noEscape */ $block->getChildBlock('grid.massaction')->getJavaScript() . PHP_EOL;
         }
 
-        $scriptString .= /* @noEscape */ $block->getAdditionalJavaScript();
+        $scriptString .= /* @noEscape */ $block->getAdditionalJavaScript() . PHP_EOL;
 
         if ($block->getDependencyJsObject()) {
             $scriptString .=  '});' . PHP_EOL;
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
index 59fe83013b1a7..7730dd4c339cb 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
@@ -150,7 +150,7 @@ $numColumns = count($block->getColumns());
                                 'onclick',
                                 /* @noEscape */ $block->getJsObjectName() . '.setPage(\'' .
                                 /* @noEscape */ ($_curPage + 1) . '\');return false;',
-                                '. admin__data-grid-pager button.action-next'
+                                '.admin__data-grid-pager button.action-next'
                             ) ?>
                         <?php else: ?>
                             <button type="button" class="action-next disabled">
@@ -290,16 +290,19 @@ $numColumns = count($block->getColumns());
     $jsonHelper = $block->getData('jsonHelper');
     if ($block->canDisplayContainer()):
         $scriptString = <<<script
+
     var deps = [];
 script;
         if ($block->getDependencyJsObject()):
             $scriptString .= <<<script
+
     deps.push('uiRegistry');
 script;
         endif;
 
         if (strpos($block->getRowClickCallback(), 'order.') !== false):
             $scriptString .= <<<script
+
     deps.push('Magento_Sales/order/create/form')
 script;
         endif;
@@ -310,6 +313,7 @@ script;
         if (is_array($block->getRequireJsDependencies())):
             foreach ($block->getRequireJsDependencies() as $dependency):
                 $scriptString .= <<<script
+
             deps.push('{$block->escapeJs($dependency)}');
 script;
             endforeach;
diff --git a/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml b/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml
index 63f3d6e995d5e..fd0f2a45e1771 100644
--- a/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml
+++ b/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml
@@ -49,6 +49,11 @@
                                          "cartForm": "#wishlist-view-form"}}'>
             <?= $block->escapeHtml(__('Click for price')) ?>
         </a>
+        <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+            'onclick',
+            'e.preventDefault()',
+            'a#' . /* @noEscape */ ($popupId)
+        ) ?>
     <?php else: ?>
         <span class="msrp-message">
             <?= $block->escapeHtml($_catalogHelper->getMsrpPriceMessage($_product)) ?>
@@ -61,4 +66,9 @@
        class="link tip">
         <?= $block->escapeHtml(__("What's this?")) ?>
     </a>
+    <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+        'onclick',
+        'e.preventDefault()',
+        'a#' . /* @noEscape */ ($helpLinkId)
+    ) ?>
 </div>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
index 6d35363529ddc..c9ee0a8b12ce3 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
@@ -17,7 +17,7 @@
              alt="<?= $block->escapeHtml(__('Loading...')); ?>">
     </div>
 </div>
-<?= /* @noEscape */ $secureRenderer->renderStyleAsTag('position: absolute;', 'div#checkout-loader .loader image') ?>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag('position: absolute;', 'div#checkout-loader .loader img') ?>
 <?php $checkoutConfig = /* @noEscape */ $block->getCheckoutData()->getSerializedCheckoutConfigs();
 $scriptString = <<<script
     window.checkoutConfig = {$checkoutConfig};
@@ -148,6 +148,7 @@ script;
 </form>
 <?php $quoteBaseGrandTotal = (float)$block->getQuoteBaseGrandTotal();
 $scriptString = <<<script
+
     require(['jquery', 'mage/mage'], function(jQuery) {
         var addtocartForm = jQuery('#multishipping-billing-form');
 
@@ -165,11 +166,13 @@ $scriptString = <<<script
             }
         });
     });
+
 script;
 ?>
 <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 
 <?php $scriptString = <<<script
+
     //<![CDATA[
     require(
         [
@@ -198,6 +201,7 @@ $scriptString .= <<<script
             });
         });
     //]]>
+
 script;
 ?>
 <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml
index 958406bb297e1..789a3921b2c21 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml
@@ -25,5 +25,5 @@
 </fieldset>
 <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
     "display:none",
-    'fieldset#payment_form_' . $block->escapeHtml($block->getMethodCode())
+    'fieldset#payment_form_' . $block->escapeJs($block->getMethodCode())
 ) ?>
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml
index 03dd859666f59..a1e3da2713811 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml
@@ -24,5 +24,5 @@
 </fieldset>
 <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
     "display:none",
-    'fieldset#payment_form_' . $block->escapeHtml($block->getMethodCode())
+    'fieldset#payment_form_' . $block->escapeJs($block->getMethodCode())
 ) ?>
diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/form/checkmo.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/form/checkmo.phtml
index 5d584ff724618..3b381bbf72f4f 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/templates/form/checkmo.phtml
+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/form/checkmo.phtml
@@ -26,6 +26,6 @@
     </dl>
     <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
         "display:none",
-        'dl#payment_form_' . $block->escapeHtml($block->getMethodCode())
+        'dl#payment_form_' . $block->escapeJs($block->getMethodCode())
     ) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/partner/logo.phtml b/app/code/Magento/Paypal/view/frontend/templates/partner/logo.phtml
index 8502fb02deb8b..a26d00cc2e9b2 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/partner/logo.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/partner/logo.phtml
@@ -25,7 +25,7 @@
 <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
     'onclick',
     "javascript:window.open(
-               '" . $block->escapeUrl($block->getAboutPaypalPageUrl()) . "',
+               '" . $block->escapeJs($block->getAboutPaypalPageUrl()) . "',
                'paypal',
                'width=600,height=350,left=0,top=0,location=no,status=yes,scrollbars=yes,resizable=yes'
                ); return false;",
diff --git a/app/code/Magento/Paypal/view/frontend/templates/payflowlink/redirect.phtml b/app/code/Magento/Paypal/view/frontend/templates/payflowlink/redirect.phtml
index 30eeb7ca082e3..35b678a8853b1 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/payflowlink/redirect.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/payflowlink/redirect.phtml
@@ -16,6 +16,7 @@
 </head>
 <body>
 <?php $scriptString= <<<script
+
     (function() {
         'use strict';
 
@@ -32,7 +33,7 @@
 
         var cartUrl = '{$block->escapeJs($block->getUrl('checkout/cart'))}',
             successUrl = '{$block->escapeJs($block->getUrl('checkout/onepage/success'))}',
-            goToSuccessPage = '{$block->escapeUrl($block->getGotoSuccessPage())}',
+            goToSuccessPage = '{$block->escapeJs($block->getGotoSuccessPage())}',
             require = window.top.require,
             windowContext = window,
             errorMessage = {
@@ -50,8 +51,8 @@
             })
         }
 
-
     })();
+
 script;
 ?>
 <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/payment/mark.phtml b/app/code/Magento/Paypal/view/frontend/templates/payment/mark.phtml
index 5da5d7156baba..dae8cb94cb110 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/payment/mark.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/payment/mark.phtml
@@ -25,7 +25,7 @@ $url = $block->escapeUrl($block->getPaymentAcceptanceMarkHref());
 <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
     'onclick',
     "javascript:window.open(
-           '" . /* @noEscape */ $url . "',
+           '" . /* @noEscape */ $block->escapeJs($block->getPaymentAcceptanceMarkHref()) . "',
            'olcwhatispaypal',
            'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, ,' +
            'left=0, top=0, width=400, height=350'
diff --git a/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/slideout/form.phtml b/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/slideout/form.phtml
index 05b274d56402d..bf46bd1411e84 100644
--- a/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/slideout/form.phtml
+++ b/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/slideout/form.phtml
@@ -8,7 +8,7 @@
  * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
-<div id="video_name_<?= $block->escapeHtmlAttr($block->getNameInLayout()) ?>"
+<div id="<?= $block->escapeHtmlAttr($block->getNameInLayout()) ?>"
     data-modal-info='<?= /* @noEscape */ $block->getWidgetOptions() ?>'
 >
     <?= $block->getFormHtml() ?>
@@ -28,7 +28,7 @@
         </div>
     </div>
 </div>
-<?= /* @noEscape */ $secureRenderer->renderTag(
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
     'display:none',
-    'div#video_name_' . $block->escapeHtmlAttr($block->getNameInLayout())
+    'div#' . $block->escapeJs($block->getNameInLayout())
 ) ?>
diff --git a/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml b/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
index 81453a5a17ad2..53473cb671e7c 100644
--- a/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
@@ -5,19 +5,23 @@
  */
 ?>
 <?php
-/** @var $block \Magento\Reports\Block\Adminhtml\Grid */
+/**
+ * @var $block \Magento\Reports\Block\Adminhtml\Grid
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
-<?php if ($block->getCollection()) : ?>
-    <?php if ($block->canDisplayContainer()) : ?>
+<?php if ($block->getCollection()): ?>
+    <?php if ($block->canDisplayContainer()): ?>
     <div id="<?= $block->escapeHtmlAttr($block->getId()) ?>">
-        <?php else : ?>
+        <?php else: ?>
             <?= $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
         <?php endif; ?>
-        <?php if ($block->getStoreSwitcherVisibility() || $block->getDateFilterVisibility()) : ?>
+        <?php if ($block->getStoreSwitcherVisibility() || $block->getDateFilterVisibility()): ?>
             <div class="admin__data-grid-header admin__data-grid-toolbar">
                 <div class="admin__data-grid-header-row">
-                    <?php if ($block->getDateFilterVisibility()) : ?>
-                        <div class="admin__filter-actions" data-role="filter-form" id="<?= $block->escapeHtmlAttr($block->getSuffixId('period_date_range')) ?>">
+                    <?php if ($block->getDateFilterVisibility()): ?>
+                        <div class="admin__filter-actions" data-role="filter-form"
+                             id="<?= $block->escapeHtmlAttr($block->getSuffixId('period_date_range')) ?>">
                             <span class="field-row">
                                 <label for="<?= $block->escapeHtmlAttr($block->getSuffixId('period_date_from')) ?>"
                                        class="admin__control-support-text">
@@ -28,7 +32,8 @@
                                        id="<?= $block->escapeHtmlAttr($block->getSuffixId('period_date_from')) ?>"
                                        name="report_from"
                                        value="<?= $block->escapeHtmlAttr($block->getFilter('report_from')) ?>">
-                                <span id="<?= $block->escapeHtmlAttr($block->getSuffixId('period_date_from_advice')) ?>"></span>
+                                <span id="<?= $block->escapeHtmlAttr($block->getSuffixId('period_date_from_advice'))?>">
+                                </span>
                             </span>
 
                             <span class="field-row">
@@ -41,7 +46,8 @@
                                        id="<?= $block->escapeHtmlAttr($block->getSuffixId('period_date_to')) ?>"
                                        name="report_to"
                                        value="<?= $block->escapeHtmlAttr($block->getFilter('report_to')) ?>"/>
-                                <span id="<?= $block->escapeHtmlAttr($block->getSuffixId('period_date_to_advice')) ?>"></span>
+                                <span id="<?= $block->escapeHtmlAttr($block->getSuffixId('period_date_to_advice')) ?>">
+                                </span>
                             </span>
 
                             <span class="field-row admin__control-filter">
@@ -49,34 +55,43 @@
                                         class="admin__control-support-text">
                                      <span><?= $block->escapeHtml(__('Show By')) ?>:</span>
                                  </label>
-                                <select name="report_period" id="<?= $block->escapeHtmlAttr($block->getSuffixId('report_period')) ?>" class="admin__control-select">
-                                    <?php foreach ($block->getPeriods() as $_value => $_label) : ?>
-                                        <option value="<?= $block->escapeHtmlAttr($_value) ?>" <?php if ($block->getFilter('report_period') == $_value) : ?> selected<?php endif; ?>><?= $block->escapeHtml($_label) ?></option>
+                                <select name="report_period"
+                                        id="<?= $block->escapeHtmlAttr($block->getSuffixId('report_period')) ?>"
+                                        class="admin__control-select">
+                                    <?php foreach ($block->getPeriods() as $_value => $_label): ?>
+                                        <option value="<?= $block->escapeHtmlAttr($_value) ?>"
+                                            <?php if ($block->getFilter('report_period') == $_value):
+                                                ?> selected<?php endif; ?>><?= $block->escapeHtml($_label) ?>
+                                        </option>
                                     <?php endforeach; ?>
                                 </select>
                                 <?= $block->getRefreshButtonHtml() ?>
                             </span>
-                            <script>
+                            <?php $scriptString = <<<script
+
                                 require([
                                     "jquery",
                                     "mage/calendar"
                                 ], function($){
 
-                                    $("#<?= $block->escapeJs($block->escapeHtml($block->getSuffixId('period_date_range'))) ?>").dateRange({
-                                        dateFormat:"<?= $block->escapeJs($block->escapeHtml($block->getDateFormat())) ?>",
-                                        buttonText:"<?= $block->escapeJs($block->escapeHtml(__('Select Date'))) ?>",
+                                    $("#{$block->escapeJs($block->getSuffixId('period_date_range'))}").dateRange({
+                                        dateFormat:"{$block->escapeJs($block->getDateFormat())}",
+                                        buttonText:"{$block->escapeJs(__('Select Date'))}",
                                         from:{
-                                            id:"<?= $block->escapeJs($block->escapeHtml($block->getSuffixId('period_date_from'))) ?>"
+                                            id:"{$block->escapeJs($block->getSuffixId('period_date_from'))}"
                                         },
                                         to:{
-                                            id:"<?= $block->escapeJs($block->escapeHtml($block->getSuffixId('period_date_to'))) ?>"
+                                            id:"{$block->escapeJs($block->getSuffixId('period_date_to'))}"
                                         }
                                     });
                                 });
-                            </script>
+
+script;
+                            ?>
+                            <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
                         </div>
                     <?php endif; ?>
-                    <?php if ($block->getChildBlock('grid.export')) : ?>
+                    <?php if ($block->getChildBlock('grid.export')): ?>
                         <?= $block->getChildHtml('grid.export') ?>
                     <?php endif; ?>
                 </div>
@@ -88,8 +103,9 @@
             </table>
         </div>
     </div>
-    <?php if ($block->canDisplayContainer()) : ?>
-        <script>
+    <?php if ($block->canDisplayContainer()): ?>
+        <?php $scriptString = <<<script
+
             require([
                 "jquery",
                 "validation",
@@ -98,16 +114,25 @@
             ], function(jQuery){
 
                 //<![CDATA[
-                <?= $block->escapeJs($block->escapeHtml($block->getJsObjectName())) ?> = new varienGrid('<?= $block->escapeJs($block->escapeHtml($block->getId())) ?>', '<?= $block->escapeJs($block->escapeUrl($block->getGridUrl())) ?>', '<?= $block->escapeJs($block->escapeHtml($block->getVarNamePage())) ?>', '<?= $block->escapeJs($block->escapeHtml($block->getVarNameSort())) ?>', '<?= $block->escapeJs($block->escapeHtml($block->getVarNameDir())) ?>', '<?= $block->escapeJs($block->escapeHtml($block->getVarNameFilter())) ?>');
-                <?= $block->escapeJs($block->escapeHtml($block->getJsObjectName())) ?>.useAjax = '<?php if ($block->getUseAjax()) :
-                        echo $block->escapeJs($block->escapeHtml($block->getUseAjax()));
-                    endif; ?>';
-                <?php if ($block->getDateFilterVisibility()) : ?>
-                    <?= $block->escapeJs($block->escapeHtml($block->getJsObjectName())) ?>.doFilterCallback = validateFilterDate;
-                    var period_date_from = $('<?= $block->escapeJs($block->escapeHtml($block->getSuffixId('period_date_from'))) ?>');
-                    var period_date_to = $('<?= $block->escapeJs($block->escapeHtml($block->getSuffixId('period_date_to'))) ?>');
-                    period_date_from.adviceContainer = $('<?= $block->escapeJs($block->escapeHtml($block->getSuffixId('period_date_from_advice'))) ?>');
-                    period_date_to.adviceContainer = $('<?= $block->escapeJs($block->escapeHtml($block->getSuffixId('period_date_to_advice'))) ?>');
+                {$block->escapeJs($block->getJsObjectName())} = new varienGrid('{$block->escapeJs($block->getId())}',
+                 '{$block->escapeJs($block->getGridUrl())}', '{$block->escapeJs($block->getVarNamePage())}',
+                 '{$block->escapeJs($block->getVarNameSort())}', '{$block->escapeJs($block->getVarNameDir())}',
+                 '{$block->escapeJs($block->getVarNameFilter())}');
+                {$block->escapeJs($block->getJsObjectName())}.useAjax =
+                 '{($block->getUseAjax() ? 'true' : 'false')}';
+
+script;
+        ?>
+                <?php if ($block->getDateFilterVisibility()): ?>
+                    <?php $scriptString .= <<<script
+
+                    {$block->escapeJs($block->getJsObjectName())}.doFilterCallback = validateFilterDate;
+                    var period_date_from = $('{$block->escapeJs($block->getSuffixId('period_date_from'))}');
+                    var period_date_to = $('{$block->escapeJs($block->getSuffixId('period_date_to'))}');
+                    period_date_from.adviceContainer =
+                     $('{$block->escapeJs($block->getSuffixId('period_date_from_advice'))}');
+                    period_date_to.adviceContainer =
+                     $('{$block->escapeJs($block->getSuffixId('period_date_to_advice'))}');
 
                     var validateFilterDate = function() {
                         if (period_date_from && period_date_to) {
@@ -121,8 +146,13 @@
                             return true;
                         }
                     }
+
+script;
+                    ?>
                 <?php endif;?>
-                <?php if ($block->getStoreSwitcherVisibility()) : ?>
+                <?php if ($block->getStoreSwitcherVisibility()): ?>
+                    <?php $scriptString .= <<<script
+
                 /* Overwrite function from switcher.phtml widget*/
                 switchStore = function(obj) {
                     if (obj.options[obj.selectedIndex].getAttribute('website') == 'true') {
@@ -136,9 +166,12 @@
                     if (obj.switchParams) {
                         storeParam += obj.switchParams;
                     }
-                    var formParam = new Array('<?= $block->escapeJs($block->escapeHtml($block->getSuffixId('period_date_from'))) ?>', '<?= $block->escapeJs($block->escapeHtml($block->getSuffixId('period_date_to'))) ?>', '<?= $block->escapeJs($block->escapeHtml($block->getSuffixId('report_period'))) ?>');
+                    var formParam = new Array('{$block->escapeJs($block->getSuffixId('period_date_from'))}',
+                     '{$block->escapeJs($block->getSuffixId('period_date_to'))}',
+                     '{$block->escapeJs($block->getSuffixId('report_period'))}');
                     var paramURL = '';
-                    var switchURL = '<?= $block->escapeUrl($block->getAbsoluteGridUrl(['_current' => false])) ?>'.replace(/(store|group|website)\/\d+\//, '');
+                    var switchURL = '{$block->escapeJs($block->getAbsoluteGridUrl(['_current' => false]))}'
+                    .replace(/(store|group|website)\/\d+\//, '');
 
                     for (var i = 0; i < formParam.length; i++) {
                         if ($(formParam[i]).value && $(formParam[i]).name) {
@@ -147,10 +180,18 @@
                     }
                     setLocation(switchURL + storeParam + '?' + paramURL);
                 }
+
+script;
+                    ?>
                 <?php endif; ?>
+        <?php $scriptString .= <<<script
+
                 //]]>
 
             });
-        </script>
+
+script;
+        ?>
+        <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
     <?php endif; ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Reports/view/adminhtml/templates/report/grid/container.phtml b/app/code/Magento/Reports/view/adminhtml/templates/report/grid/container.phtml
index 85145454428e2..2ff540486d3c5 100644
--- a/app/code/Magento/Reports/view/adminhtml/templates/report/grid/container.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/templates/report/grid/container.phtml
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
 <div class="reports-content">
@@ -11,7 +13,8 @@
 
 <?= $block->getGridHtml() ?>
 
-<script>
+<?php $scriptString = <<<script
+
 require([
     'jquery',
     'mage/backend/validation',
@@ -31,7 +34,7 @@ require([
         }
 
         if (jQuery('#filter_form').valid()) {
-            setLocation('<?= $block->escapeJs($block->escapeUrl($block->getFilterUrl())) ?>filter/'+
+            setLocation('{$block->escapeJs($block->getFilterUrl())}filter/'+
                 Base64.encode(Form.serializeElements(elements))+'/'
             );
         }
@@ -39,4 +42,7 @@ require([
 //]]>
     window.filterFormSubmit = filterFormSubmit;
 });
-</script>
+
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Review/Block/Customer/ListCustomer.php b/app/code/Magento/Review/Block/Customer/ListCustomer.php
index eb67af5780ddb..282421401b674 100644
--- a/app/code/Magento/Review/Block/Customer/ListCustomer.php
+++ b/app/code/Magento/Review/Block/Customer/ListCustomer.php
@@ -7,12 +7,15 @@
 
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Review\Helper\Data as ReviewHelper;
 
 /**
  * Customer Reviews list block
  *
  * @api
  * @since 100.0.2
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ListCustomer extends \Magento\Customer\Block\Account\Dashboard
 {
@@ -44,6 +47,7 @@ class ListCustomer extends \Magento\Customer\Block\Account\Dashboard
      * @param \Magento\Review\Model\ResourceModel\Review\Product\CollectionFactory $collectionFactory
      * @param \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer
      * @param array $data
+     * @param ReviewHelper|null $reviewHelper
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -53,9 +57,11 @@ public function __construct(
         AccountManagementInterface $customerAccountManagement,
         \Magento\Review\Model\ResourceModel\Review\Product\CollectionFactory $collectionFactory,
         \Magento\Customer\Helper\Session\CurrentCustomer $currentCustomer,
-        array $data = []
+        array $data = [],
+        ?ReviewHelper $reviewHelper = null
     ) {
         $this->_collectionFactory = $collectionFactory;
+        $data['reviewHelper'] = $reviewHelper ?? ObjectManager::getInstance()->get(ReviewHelper::class);
         parent::__construct(
             $context,
             $customerSession,
diff --git a/app/code/Magento/Review/view/adminhtml/templates/add.phtml b/app/code/Magento/Review/view/adminhtml/templates/add.phtml
index 83017eec57013..ec017fa36a33c 100644
--- a/app/code/Magento/Review/view/adminhtml/templates/add.phtml
+++ b/app/code/Magento/Review/view/adminhtml/templates/add.phtml
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <div data-mage-init='{"floatingHeader": {}}' class="page-actions">
     <?= $block->getBackButtonHtml() ?>
@@ -14,7 +16,8 @@
 <div class="hidden" id="formContainer">
     <?= $block->getFormHtml() ?>
 </div>
-<script>
+<?php $scriptString = <<<script
+
 require([
     "jquery",
     "mage/mage",
@@ -25,4 +28,7 @@ require([
    $('#edit_form').mage('form').mage('validation');
 
 });
-</script>
+
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Review/view/adminhtml/templates/rating/detailed.phtml b/app/code/Magento/Review/view/adminhtml/templates/rating/detailed.phtml
index bf0cab4c621f5..8bacccef869e2 100644
--- a/app/code/Magento/Review/view/adminhtml/templates/rating/detailed.phtml
+++ b/app/code/Magento/Review/view/adminhtml/templates/rating/detailed.phtml
@@ -4,26 +4,37 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Review\Block\Adminhtml\Rating\Detailed $block */
+/**
+ * @var \Magento\Review\Block\Adminhtml\Rating\Detailed $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 
 ?>
-<?php if ($block->getRating() && $block->getRating()->getSize()) : ?>
-    <?php foreach ($block->getRating() as $_rating) : ?>
+<?php if ($block->getRating() && $block->getRating()->getSize()): ?>
+    <?php foreach ($block->getRating() as $_rating): ?>
     <div class="admin__field admin__field-rating">
         <label class="admin__field-label"><span><?= $block->escapeHtml($_rating->getRatingCode()) ?></span></label>
         <?php $_iterator = 1; ?>
         <?php $_options = ($_rating->getRatingOptions()) ? $_rating->getRatingOptions() : $_rating->getOptions() ?>
         <div class="admin__field-control" data-widget="ratingControl">
-        <?php foreach (array_reverse($_options) as $_option) : ?>
-            <input type="radio" name="ratings[<?= $block->escapeHtmlAttr($_rating->getVoteId() ? $_rating->getVoteId() : $_rating->getId()) ?>]" id="<?= $block->escapeHtmlAttr($_rating->getRatingCode()) ?>_<?= $block->escapeHtmlAttr($_option->getValue()) ?>" value="<?= $block->escapeHtmlAttr($_option->getId()) ?>" <?php if ($block->isSelected($_option, $_rating)) : ?>checked="checked"<?php endif; ?> />
-            <label for="<?= $block->escapeHtmlAttr($_rating->getRatingCode()) ?>_<?= $block->escapeHtmlAttr($_option->getValue()) ?>">&#9733;</label>
+        <?php foreach (array_reverse($_options) as $_option): ?>
+            <input type="radio"
+                   name="ratings[<?= $block->escapeHtmlAttr($_rating->getVoteId() ? $_rating->getVoteId() :
+                       $_rating->getId()) ?>]"
+                   id="<?= $block->escapeHtmlAttr($_rating->getRatingCode())
+                    ?>_<?= $block->escapeHtmlAttr($_option->getValue()) ?>"
+                   value="<?= $block->escapeHtmlAttr($_option->getId()) ?>"
+                   <?php if ($block->isSelected($_option, $_rating)): ?>checked="checked"<?php endif; ?> />
+            <label for="<?= $block->escapeHtmlAttr($_rating->getRatingCode())
+            ?>_<?= $block->escapeHtmlAttr($_option->getValue()) ?>">&#9733;</label>
             <?php $_iterator++ ?>
         <?php endforeach; ?>
         </div>
     </div>
     <?php endforeach; ?>
     <input type="hidden" name="validate_rating" class="validate-rating" value="" />
-<script>
+    <?php $scriptString = <<<script
+
 require([
     "jquery",
     "mage/mage",
@@ -33,7 +44,10 @@ require([
 
     $('[data-widget=ratingControl]').ratingControl();
 });
-</script>
-<?php else : ?>
+
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
+<?php else: ?>
     <?= $block->escapeHtml(__("Rating isn't Available")) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Review/view/adminhtml/templates/rating/stars/summary.phtml b/app/code/Magento/Review/view/adminhtml/templates/rating/stars/summary.phtml
index 1f27db795f8c9..cc33ab639191f 100644
--- a/app/code/Magento/Review/view/adminhtml/templates/rating/stars/summary.phtml
+++ b/app/code/Magento/Review/view/adminhtml/templates/rating/stars/summary.phtml
@@ -4,12 +4,20 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Review\Block\Adminhtml\Rating\Summary $block */
+/**
+ * @var \Magento\Review\Block\Adminhtml\Rating\Summary $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
-<?php if ($block->getRatingSummary()->getCount()) : ?>
+<?php if ($block->getRatingSummary()->getCount()): ?>
     <div class="rating-box">
-        <div class="rating" style="width:<?= /* @noEscape */ ceil($block->getRatingSummary()->getSum() / ($block->getRatingSummary()->getCount())) ?>%;"></div>
+        <div class="rating"/>
     </div>
-<?php else : ?>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+        "width:" . /* @noEscape */ ceil($block->getRatingSummary()->getSum() /
+            ($block->getRatingSummary()->getCount())) . "%;",
+        'div.rating-box div.rating'
+    ) ?>
+<?php else: ?>
     <?= $block->escapeHtml(__("Rating isn't Available")) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Review/view/frontend/templates/customer/list.phtml b/app/code/Magento/Review/view/frontend/templates/customer/list.phtml
index 11ea987b74cec..0e9a717a5f53c 100644
--- a/app/code/Magento/Review/view/frontend/templates/customer/list.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/customer/list.phtml
@@ -4,9 +4,15 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Review\Block\Customer\ListCustomer $block */
+/**
+ * @var \Magento\Review\Block\Customer\ListCustomer $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
+
+/** @var \Magento\Review\Helper\Data $reviewHelper */
+$reviewHelper = $block->getData('reviewHelper');
 ?>
-<?php if ($block->getReviews() && count($block->getReviews())) : ?>
+<?php if ($block->getReviews() && count($block->getReviews())): ?>
     <div class="table-wrapper reviews">
         <table class="data table table-reviews" id="my-reviews-table">
             <caption class="table-caption"><?= $block->escapeHtml(__('Product Reviews')) ?></caption>
@@ -20,26 +26,39 @@
                 </tr>
             </thead>
             <tbody>
-                <?php foreach ($block->getReviews() as $review) : ?>
+                <?php foreach ($block->getReviews() as $review): ?>
                 <tr>
-                    <td data-th="<?= $block->escapeHtml(__('Created')) ?>" class="col date"><?= $block->escapeHtml($block->dateFormat($review->getReviewCreatedAt())) ?></td>
+                    <td data-th="<?= $block->escapeHtml(__('Created')) ?>"
+                        class="col date"><?= $block->escapeHtml($block->dateFormat($review->getReviewCreatedAt())) ?>
+                    </td>
                     <td data-th="<?= $block->escapeHtml(__('Product Name')) ?>" class="col item">
                         <strong class="product-name">
-                            <a href="<?= $block->escapeUrl($block->getProductUrl($review)) ?>"><?= $block->escapeHtml($review->getName()) ?></a>
+                            <a href="<?= $block->escapeUrl($block->getProductUrl($review)) ?>">
+                                <?= $block->escapeHtml($review->getName()) ?>
+                            </a>
                         </strong>
                     </td>
                     <td data-th="<?= $block->escapeHtml(__('Rating')) ?>" class="col summary">
-                    <?php if ($review->getSum()) : ?>
+                    <?php if ($review->getSum()): ?>
                         <div class="rating-summary">
                             <span class="label"><span><?= $block->escapeHtml(__('Rating')) ?>:</span></span>
-                            <div class="rating-result" title="<?= /* @noEscape */ ((int)$review->getSum() / (int)$review->getCount()) ?>%">
-                                <span style="width:<?= /* @noEscape */ ((int)$review->getSum() / (int)$review->getCount()) ?>%;"><span><?= /* @noEscape */ ((int)$review->getSum() / (int)$review->getCount()) ?>%</span></span>
+                            <div class="rating-result"
+                                 title="<?= /* @noEscape */ ((int)$review->getSum() / (int)$review->getCount()) ?>%">
+                                <span>
+                                    <span>
+                                        <?= /* @noEscape */ ((int)$review->getSum() / (int)$review->getCount()) ?>%
+                                    </span>
+                                </span>
                             </div>
                         </div>
+                        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                            "width:" . /* @noEscape */ ((int)$review->getSum() / (int)$review->getCount()) . "%;",
+                            'div.rating-summary div.rating-result span'
+                        ) ?>
                     <?php endif; ?>
                     </td>
                     <td data-th="<?= $block->escapeHtmlAttr(__('Review')) ?>" class="col description">
-                        <?= $this->helper(\Magento\Review\Helper\Data::class)->getDetailHtml($review->getDetail()) ?>
+                        <?= $reviewHelper->getDetailHtml($review->getDetail()) ?>
                     </td>
                     <td data-th="<?= $block->escapeHtmlAttr(__('Actions')) ?>" class="col actions">
                         <a href="<?= $block->escapeUrl($block->getReviewUrl($review)) ?>" class="action more">
@@ -51,12 +70,12 @@
             </tbody>
         </table>
     </div>
-    <?php if ($block->getToolbarHtml()) : ?>
+    <?php if ($block->getToolbarHtml()): ?>
         <div class="toolbar products-reviews-toolbar bottom">
             <?= $block->getToolbarHtml() ?>
         </div>
     <?php endif; ?>
-<?php else : ?>
+<?php else: ?>
     <div class="message info empty"><span><?= $block->escapeHtml(__('You have submitted no reviews.')) ?></span></div>
 <?php endif; ?>
 <div class="actions-toolbar">
diff --git a/app/code/Magento/Review/view/frontend/templates/customer/recent.phtml b/app/code/Magento/Review/view/frontend/templates/customer/recent.phtml
index 5cd81a2f17cbc..4900d48d0829c 100644
--- a/app/code/Magento/Review/view/frontend/templates/customer/recent.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/customer/recent.phtml
@@ -4,26 +4,41 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Review\Block\Customer\Recent $block */
+/**
+ * @var \Magento\Review\Block\Customer\Recent $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
-<?php if ($block->getReviews() && count($block->getReviews())) : ?>
+<?php if ($block->getReviews() && count($block->getReviews())): ?>
 <div class="block block-reviews-dashboard">
     <div class="block-title">
         <strong><?= $block->escapeHtml(__('My Recent Reviews')) ?></strong>
-        <a class="action view" href="<?= $block->escapeUrl($block->getAllReviewsUrl()) ?>"><span><?= $block->escapeHtml(__('View All')) ?></span></a>
+        <a class="action view" href="<?= $block->escapeUrl($block->getAllReviewsUrl()) ?>">
+            <span><?= $block->escapeHtml(__('View All')) ?></span>
+        </a>
     </div>
     <div class="block-content">
         <ol class="items">
-        <?php foreach ($block->getReviews() as $_review) : ?>
+        <?php foreach ($block->getReviews() as $_review): ?>
             <li class="item">
-                <strong class="product-name"><a href="<?= $block->escapeUrl($block->getReviewUrl($_review->getReviewId())) ?>"><?= $block->escapeHtml($_review->getName()) ?></a></strong>
-                <?php if ($_review->getSum()) : ?>
+                <strong class="product-name">
+                    <a href="<?= $block->escapeUrl($block->getReviewUrl($_review->getReviewId())) ?>">
+                        <?= $block->escapeHtml($_review->getName()) ?>
+                    </a>
+                </strong>
+                <?php if ($_review->getSum()): ?>
                     <?php $rating = $_review->getSum() / $_review->getCount() ?>
                     <div class="rating-summary">
                          <span class="label"><span><?= $block->escapeHtml(__('Rating')) ?>:</span></span>
                          <div class="rating-result" title="<?= $block->escapeHtmlAttr($rating) ?>%">
-                             <span style="width:<?= $block->escapeHtmlAttr($rating) ?>%"><span><?= $block->escapeHtml($rating) ?>%</span></span>
+                             <span>
+                                 <span><?= $block->escapeHtml($rating) ?>%</span>
+                             </span>
                          </div>
+                        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                            "width:". $block->escapeHtmlAttr($rating) . "%",
+                            'div.rating-result span'
+                        ) ?>
                      </div>
                 <?php endif; ?>
             </li>
diff --git a/app/code/Magento/Review/view/frontend/templates/customer/view.phtml b/app/code/Magento/Review/view/frontend/templates/customer/view.phtml
index f92282848b1b7..415645eb8e73e 100644
--- a/app/code/Magento/Review/view/frontend/templates/customer/view.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/customer/view.phtml
@@ -4,11 +4,14 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Review\Block\Customer\View $block */
+/**
+ * @var \Magento\Review\Block\Customer\View $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 
 $product = $block->getProductData();
 ?>
-<?php if ($product->getId()) : ?>
+<?php if ($product->getId()): ?>
 <div class="customer-review view">
     <div class="product-details">
         <div class="product-media">
@@ -19,7 +22,7 @@ $product = $block->getProductData();
         </div>
         <div class="product-info">
             <h2 class="product-name"><?= $block->escapeHtml($product->getName()) ?></h2>
-            <?php if ($block->getRating() && $block->getRating()->getSize()) : ?>
+            <?php if ($block->getRating() && $block->getRating()->getSize()): ?>
                 <span class="rating-average-label"><?= $block->escapeHtml(__('Average Customer Rating:')) ?></span>
                 <?= $block->getReviewsSummaryHtml($product) ?>
             <?php endif; ?>
@@ -27,21 +30,27 @@ $product = $block->getProductData();
     </div>
 
     <div class="review-details">
-        <?php if ($block->getRating() && $block->getRating()->getSize()) : ?>
+        <?php if ($block->getRating() && $block->getRating()->getSize()): ?>
             <div class="title">
                 <strong><?= $block->escapeHtml(__('Your Review')) ?></strong>
             </div>
             <div class="customer-review-rating">
-                <?php foreach ($block->getRating() as $_rating) : ?>
-                    <?php if ($_rating->getPercent()) : ?>
+                <?php foreach ($block->getRating() as $_rating): ?>
+                    <?php if ($_rating->getPercent()): ?>
                         <?php $rating = ceil($_rating->getPercent()) ?>
                         <div class="rating-summary item">
-                            <span class="rating-label"><span><?= $block->escapeHtml($_rating->getRatingCode()) ?></span></span>
+                            <span class="rating-label">
+                                <span><?= $block->escapeHtml($_rating->getRatingCode()) ?></span>
+                            </span>
                             <div class="rating-result" title="<?= /* @noEscape */ $rating ?>%">
-                                <span style="width:<?= /* @noEscape */ $rating ?>%">
+                                <span>
                                     <span><?= /* @noEscape */ $rating ?>%</span>
                                 </span>
                             </div>
+                            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                                "width:" . /* @noEscape */ $rating . "%",
+                                'div.rating-result span'
+                            ) ?>
                         </div>
                     <?php endif; ?>
                 <?php endforeach; ?>
@@ -49,15 +58,20 @@ $product = $block->getProductData();
         <?php endif; ?>
 
         <div class="review-title"><?= $block->escapeHtml($block->getReviewData()->getTitle()) ?></div>
-        <div class="review-content"><?= /* @noEscape */ nl2br($block->escapeHtml($block->getReviewData()->getDetail())) ?></div>
+        <div class="review-content">
+            <?= /* @noEscape */ nl2br($block->escapeHtml($block->getReviewData()->getDetail())) ?>
+        </div>
         <div class="review-date">
-            <?= $block->escapeHtml(__('Submitted on %1', '<time class="date">' . $block->dateFormat($block->getReviewData()->getCreatedAt()) . '</time>'), ['time']) ?>
+            <?= $block->escapeHtml(__('Submitted on %1', '<time class="date">' .
+                $block->dateFormat($block->getReviewData()->getCreatedAt()) . '</time>'), ['time']) ?>
         </div>
     </div>
 </div>
 <div class="actions-toolbar">
     <div class="secondary">
-        <a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>"><span><?= $block->escapeHtml(__('Back to My Reviews')) ?></span></a>
+        <a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>">
+            <span><?= $block->escapeHtml(__('Back to My Reviews')) ?></span>
+        </a>
     </div>
 </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Review/view/frontend/templates/detailed.phtml b/app/code/Magento/Review/view/frontend/templates/detailed.phtml
index 7b3b0e2dd6d02..1bd8138f9cdac 100644
--- a/app/code/Magento/Review/view/frontend/templates/detailed.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/detailed.phtml
@@ -4,21 +4,28 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Review\Block\Rating\Entity\Detailed $block */
+/**
+ * @var \Magento\Review\Block\Rating\Entity\Detailed $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
-<?php if (!empty($collection) && $collection->getSize()) : ?>
+<?php if (!empty($collection) && $collection->getSize()): ?>
     <div class="table-wrapper">
         <table class="data table ratings review summary">
             <caption class="table-caption"><?= $block->escapeHtml(__('Ratings Review Summary')) ?></caption>
             <tbody>
-            <?php foreach ($collection as $_rating) : ?>
-                <?php if ($_rating->getSummary()) : ?>
+            <?php foreach ($collection as $_rating): ?>
+                <?php if ($_rating->getSummary()): ?>
                     <tr>
                         <th class="label" scope="row"><?= $block->escapeHtml(__($_rating->getRatingCode())) ?></th>
                         <td class="value">
                             <div class="rating box">
-                                <div class="rating" style="width:<?= /* @noEscape */ ceil($_rating->getSummary()) ?>%;"></div>
+                                <div class="rating"/>
                             </div>
+                            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                                "width:" . /* @noEscape */ ceil($_rating->getSummary()) . "%;",
+                                'div.rating.box div.rating'
+                            ) ?>
                         </td>
                     </tr>
                 <?php endif; ?>
diff --git a/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml b/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml
index b042b5e92cbac..b906456f16dc8 100644
--- a/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml
@@ -4,36 +4,49 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Review\Block\Product\ReviewRenderer $block */
+/**
+ * @var \Magento\Review\Block\Product\ReviewRenderer $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 
 $url = $block->getReviewsUrl() . '#reviews';
 $urlForm = $block->getReviewsUrl() . '#review-form';
 ?>
-<?php if ($block->isReviewEnabled() && $block->getReviewsCount()) : ?>
+<?php if ($block->isReviewEnabled() && $block->getReviewsCount()): ?>
     <?php $rating = $block->getRatingSummary(); ?>
-    <div class="product-reviews-summary<?= !$rating ? ' no-rating' : '' ?>" itemprop="aggregateRating" itemscope itemtype="http://schema.org/AggregateRating">
-        <?php if ($rating) :?>
+    <div class="product-reviews-summary<?= !$rating ? ' no-rating' : '' ?>" itemprop="aggregateRating" itemscope
+         itemtype="http://schema.org/AggregateRating">
+        <?php if ($rating):?>
         <div class="rating-summary">
              <span class="label"><span><?= $block->escapeHtml(__('Rating')) ?>:</span></span>
              <div class="rating-result" title="<?= $block->escapeHtmlAttr($rating); ?>%">
-                 <span style="width:<?= $block->escapeHtmlAttr($rating); ?>%">
+                 <span>
                      <span>
-                         <span itemprop="ratingValue"><?= $block->escapeHtml($rating); ?></span>% of <span itemprop="bestRating">100</span>
+                         <span itemprop="ratingValue"><?= $block->escapeHtml($rating); ?>
+                         </span>% of <span itemprop="bestRating">100</span>
                      </span>
                  </span>
              </div>
          </div>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                "width:" . $block->escapeHtmlAttr($rating) . "%",
+                'div.rating-summary div.rating-result span'
+            ) ?>
         <?php endif;?>
         <div class="reviews-actions">
             <a class="action view"
                href="<?= $block->escapeUrl($url) ?>">
                 <span itemprop="reviewCount"><?= $block->escapeHtml($block->getReviewsCount()) ?></span>&nbsp;
-                <span><?= ($block->getReviewsCount() == 1) ? $block->escapeHtml(__('Review')) : $block->escapeHtml(__('Reviews')) ?></span>
+                <span><?= ($block->getReviewsCount() == 1) ? $block->escapeHtml(__('Review')) :
+                        $block->escapeHtml(__('Reviews')) ?>
+                </span>
+            </a>
+            <a class="action add" href="<?= $block->escapeUrl($urlForm) ?>">
+                <?= $block->escapeHtml(__('Add Your Review')) ?>
             </a>
-            <a class="action add" href="<?= $block->escapeUrl($urlForm) ?>"><?= $block->escapeHtml(__('Add Your Review')) ?></a>
         </div>
     </div>
-<?php elseif ($block->isReviewEnabled() && $block->getDisplayIfEmpty()) : ?>
+<?php elseif ($block->isReviewEnabled() && $block->getDisplayIfEmpty()): ?>
     <div class="product-reviews-summary empty">
         <div class="reviews-actions">
             <a class="action add" href="<?= $block->escapeUrl($urlForm) ?>">
diff --git a/app/code/Magento/Review/view/frontend/templates/view.phtml b/app/code/Magento/Review/view/frontend/templates/view.phtml
index 1c3d1942dd2e7..b51353b7df685 100644
--- a/app/code/Magento/Review/view/frontend/templates/view.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/view.phtml
@@ -4,44 +4,57 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Review\Block\View $block */
+/**
+ * @var \Magento\Review\Block\View $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
-<?php if ($block->getProductData()->getId()) : ?>
+<?php if ($block->getProductData()->getId()): ?>
 <div class="product-review">
     <div class="page-title-wrapper">
         <h1><?= $block->escapeHtml(__('Review Details')) ?></h1>
     </div>
     <div class="product-img-box">
         <a href="<?= $block->escapeUrl($block->getProductData()->getProductUrl()) ?>">
-            <?= $block->getImage($block->getProductData(), 'product_base_image', ['class' => 'product-image'])->toHtml() ?>
+            <?= $block->getImage($block->getProductData(), 'product_base_image', ['class' => 'product-image'])->toHtml()
+            ?>
         </a>
-        <?php if ($block->getRating() && $block->getRating()->getSize()) : ?>
+        <?php if ($block->getRating() && $block->getRating()->getSize()): ?>
             <p><?= $block->escapeHtml(__('Average Customer Rating')) ?>:</p>
             <?= $block->getReviewsSummaryHtml($block->getProductData()) ?>
         <?php endif; ?>
     </div>
     <div class="details">
         <h3 class="product-name"><?= $block->escapeHtml($block->getProductData()->getName()) ?></h3>
-        <?php if ($block->getRating() && $block->getRating()->getSize()) : ?>
+        <?php if ($block->getRating() && $block->getRating()->getSize()): ?>
             <h4><?= $block->escapeHtml(__('Product Rating:')) ?></h4>
             <div class="table-wrapper">
                 <table class="data-table review-summary-table">
                     <caption class="table-caption"><?= $block->escapeHtml(__('Product Rating')) ?></caption>
-                    <?php foreach ($block->getRating() as $_rating) : ?>
-                        <?php if ($_rating->getPercent()) : ?>
+                    <?php foreach ($block->getRating() as $_rating): ?>
+                        <?php if ($_rating->getPercent()): ?>
                             <tr>
                                 <td class="label"><?= $block->escapeHtml(__($_rating->getRatingCode())) ?></td>
                                 <td class="value">
                                     <div class="rating-box">
-                                        <div class="rating" style="width:<?= /* @noEscape */ ceil($_rating->getPercent()) ?>%;"></div>
-                                    </div></td>
+                                        <div class="rating"/>
+                                    </div>
+                                    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                                        "width:" . /* @noEscape */ ceil($_rating->getPercent()) . "%;",
+                                        'div.rating-box div.rating'
+                                    ) ?>
+                                </td>
                             </tr>
                         <?php endif; ?>
                     <?php endforeach; ?>
                 </table>
             </div>
         <?php endif; ?>
-        <p class="date"><?= $block->escapeHtml(__('Product Review (submitted on %1):', $block->dateFormat($block->getReviewData()->getCreatedAt()))) ?></p>
+        <p class="date">
+            <?= $block->escapeHtml(
+                __('Product Review (submitted on %1):', $block->dateFormat($block->getReviewData()->getCreatedAt()))
+            ) ?>
+        </p>
         <p><?= /* @noEscape */ nl2br($block->escapeHtml($block->getReviewData()->getDetail())) ?></p>
     </div>
     <div class="actions">
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/AbstractOrder.php b/app/code/Magento/Sales/Block/Adminhtml/Order/AbstractOrder.php
index b9aff07cc96fd..e45405714956f 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/AbstractOrder.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/AbstractOrder.php
@@ -6,6 +6,9 @@
 namespace Magento\Sales\Block\Adminhtml\Order;
 
 use Magento\Sales\Model\Order;
+use Magento\Framework\App\ObjectManager;
+use Magento\Shipping\Helper\Data as ShippingHelper;
+use Magento\Tax\Helper\Data as TaxHelper;
 
 /**
  * Adminhtml order abstract block
@@ -35,15 +38,21 @@ class AbstractOrder extends \Magento\Backend\Block\Widget
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Sales\Helper\Admin $adminHelper
      * @param array $data
+     * @param ShippingHelper|null $shippingHelper
+     * @param TaxHelper|null $taxHelper
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Framework\Registry $registry,
         \Magento\Sales\Helper\Admin $adminHelper,
-        array $data = []
+        array $data = [],
+        ?ShippingHelper $shippingHelper = null,
+        ?TaxHelper $taxHelper = null
     ) {
         $this->_adminHelper = $adminHelper;
         $this->_coreRegistry = $registry;
+        $data['shippingHelper'] = $shippingHelper ?? ObjectManager::getInstance()->get(ShippingHelper::class);
+        $data['taxHelper'] = $taxHelper ?? ObjectManager::getInstance()->get(TaxHelper::class);
         parent::__construct($context, $data);
     }
 
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php
index 207a4eca60213..165875955baa2 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Tax.php
@@ -5,6 +5,10 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Order\Create\Totals;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Tax\Helper\Data as TaxHelper;
+
 /**
  * Tax Total Row Renderer
  *
@@ -13,6 +17,30 @@
  */
 class Tax extends \Magento\Sales\Block\Adminhtml\Order\Create\Totals\DefaultTotals
 {
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Backend\Model\Session\Quote $sessionQuote
+     * @param \Magento\Sales\Model\AdminOrder\Create $orderCreate
+     * @param PriceCurrencyInterface $priceCurrency
+     * @param \Magento\Sales\Helper\Data $salesData
+     * @param \Magento\Sales\Model\Config $salesConfig
+     * @param array $data
+     * @param TaxHelper|null $taxHelper
+     */
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Backend\Model\Session\Quote $sessionQuote,
+        \Magento\Sales\Model\AdminOrder\Create $orderCreate,
+        PriceCurrencyInterface $priceCurrency,
+        \Magento\Sales\Helper\Data $salesData,
+        \Magento\Sales\Model\Config $salesConfig,
+        array $data = [],
+        ?TaxHelper $taxHelper = null
+    ) {
+        $data['taxHelper'] = $taxHelper ?? ObjectManager::getInstance()->get(TaxHelper::class);
+        parent::__construct($context, $sessionQuote, $orderCreate, $priceCurrency, $salesData, $salesConfig, $data);
+    }
+
     /**
      * Template
      *
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Details.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Details.php
index 261f4b0cfd12a..51d2bfc6326ed 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Details.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Details.php
@@ -5,12 +5,29 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Order;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Element\Template;
+use Magento\GiftMessage\Helper\Message as GiftMessageHelper;
+
 /**
- * Class Details
- * @package Magento\Sales\Block\Adminhtml\Order
+ * Order Details
  */
 class Details extends \Magento\Framework\View\Element\Template
 {
+    /**
+     * @param Template\Context $context
+     * @param array $data
+     * @param Message|null $giftMessageHelper
+     */
+    public function __construct(
+        Template\Context $context,
+        array $data = [],
+        ?GiftMessageHelper $giftMessageHelper = null
+    ) {
+        $data['giftMessageHelper'] = $giftMessageHelper ?? ObjectManager::getInstance()->get(GiftMessageHelper::class);
+        parent::__construct($context, $data);
+    }
+
     /**
      * @var string
      */
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Tax.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Tax.php
index 4b0969598fdcd..f145ef3625054 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Tax.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Tax.php
@@ -64,6 +64,7 @@ public function __construct(
         $this->_taxCalculation = $taxCalculation;
         $this->_taxOrderFactory = $taxOrderFactory;
         $this->_salesAdminHelper = $salesAdminHelper;
+        $data['taxHelper'] = $this->_taxHelper;
         parent::__construct($context, $taxConfig, $data);
     }
 
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
index 017cae0b95f93..f1c8b249fe68a 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
@@ -25,12 +25,16 @@
                    value="<?= $block->escapeHtmlAttr($_code); ?>"
                    type="radio" name="payment[method]"
                    title="<?= $block->escapeHtmlAttr($_method->getTitle()); ?>"
-                   onclick="payment.switchMethod('<?= $block->escapeJs($_code); ?>')"
                     <?php if ($currentSelectedMethod == $_code): ?>
                     checked="checked"
                     <?php endif; ?>
                    data-validate="{'validate-one-required-by-name':true}"
                    class="admin__control-radio"/>
+            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                'onclick',
+                "payment.switchMethod('" . $block->escapeJs($_code) . "')",
+                'input#p_method_' . $block->escapeJs($_code)
+            ) ?>
         <?php else:?>
             <span class="no-display">
                 <input id="p_method_<?= $block->escapeHtmlAttr($_code); ?>"
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 936c8ec41337d..dc007e4801b41 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
@@ -100,7 +100,7 @@ endif; ?>
                 <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
                     'onchange',
                     "order.selectAddress(this, '" . $block->escapeJs($_fieldsContainerId) . "')",
-                    'select#' . $block->escapeHtmlAttr($_id)
+                    'select#' . $block->escapeJs($_id)
                 ) ?>
             </div>
         </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/newsletter/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/newsletter/form.phtml
index 1dcf57d879543..34f4bae1947e1 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/newsletter/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/newsletter/form.phtml
@@ -3,5 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<input type="checkbox" name="newsletter:subscribe"> <label for="newsletter:subscribe" style="width: 90%; float: none;"><?= $block->escapeHtml(__('Subscribe to Newsletter')) ?></label><br/>
+<input type="checkbox" name="newsletter:subscribe">
+<label for="newsletter:subscribe">
+    <?= $block->escapeHtml(__('Subscribe to Newsletter')) ?>
+</label>
+<?=/* @noEscape */ $secureRenderer->renderStyleAsTag("width: 90%; float: none;", "label[for='newsletter:subscribe']") ?>
+<br/>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
index afb58a626ada8..aba788f6d5220 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
@@ -3,13 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/* @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<?php /* @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar */ ?>
 <div class="create-order-sidebar-block" id="sidebar_data_<?= $block->escapeHtmlAttr($block->getDataId()) ?>">
     <div class="head sidebar-title-block">
-        <a href="#" class="action-refresh"
-           title="<?= $block->escapeHtml(__('Refresh')) ?>"
-           onclick="order.loadArea('sidebar_<?= $block->escapeJs($block->getDataId()) ?>', 'sidebar_data_<?= $block->escapeJs($block->getDataId()) ?>');return false;">
+        <a href="#" class="action-refresh" title="<?= $block->escapeHtml(__('Refresh')) ?>">
             <span><?= $block->escapeHtml(__('Refresh')) ?></span>
         </a>
         <h5 class="create-order-sidebar-label">
@@ -17,23 +17,29 @@
             <span class="normal">(<?= $block->escapeHtml($block->getItemCount()) ?>)</span>
         </h5>
     </div>
+    <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+        'onclick',
+        "event.preventDefault(); order.loadArea('sidebar_" . $block->escapeJs($block->getDataId()) .
+        "', 'sidebar_data_" . $block->escapeJs($block->getDataId()) . "');return false;",
+        'div.head.sidebar-title-block'
+    ) ?>
     <div class="content">
         <div class="auto-scroll">
-        <?php if ($block->getItemCount()) : ?>
+        <?php if ($block->getItemCount()): ?>
         <table class="admin__table-primary">
             <thead>
                 <tr>
                     <th class="col-item"><?= $block->escapeHtml(__('Item')) ?></th>
 
-                    <?php if ($block->canDisplayItemQty()) : ?>
+                    <?php if ($block->canDisplayItemQty()): ?>
                         <th class="col-qty"><?= $block->escapeHtml(__('Qty')) ?></th>
                     <?php endif; ?>
 
-                    <?php if ($block->canDisplayPrice()) : ?>
+                    <?php if ($block->canDisplayPrice()): ?>
                         <th class="col-price"><?= $block->escapeHtml(__('Price')) ?></th>
                     <?php endif; ?>
 
-                    <?php if ($block->canRemoveItems()) : ?>
+                    <?php if ($block->canRemoveItems()): ?>
                         <th class="col-remove">
                             <span title="<?= $block->escapeHtml(__('Remove')) ?>"
                                   class="icon icon-remove">
@@ -52,33 +58,37 @@
             </thead>
 
             <tbody>
-                <?php foreach ($block->getItems() as $_item) : ?>
+                <?php foreach ($block->getItems() as $_item): ?>
                     <tr>
                         <td class="col-item"><?= $block->escapeHtml($_item->getName()) ?></td>
 
-                        <?php if ($block->canDisplayItemQty()) : ?>
+                        <?php if ($block->canDisplayItemQty()): ?>
                             <td class="col-qty">
                                 <?= (float) $block->getItemQty($_item) ?>
                             </td>
                         <?php endif; ?>
 
-                        <?php if ($block->canDisplayPrice()) : ?>
+                        <?php if ($block->canDisplayPrice()): ?>
                             <td class="col-price">
                                 <?= /* @noEscape */ $block->getItemPrice($block->getProduct($_item)) ?>
                             </td>
                         <?php endif; ?>
 
-                        <?php if ($block->canRemoveItems()) : ?>
+                        <?php if ($block->canRemoveItems()): ?>
                             <td class="col-remove">
                                 <div class="admin__field-option">
-                                    <input id="sidebar-remove-<?= $block->escapeHtmlAttr($block->getSidebarStorageAction()) ?>-<?= (int) $block->getItemId($_item) ?>"
+                                    <input id="sidebar-remove-<?=
+                                    $block->escapeHtmlAttr($block->getSidebarStorageAction())
+                                    ?>-<?= (int) $block->getItemId($_item) ?>"
                                            type="checkbox"
                                            class="admin__control-checkbox"
                                            name="sidebar[remove][<?= (int) $block->getItemId($_item) ?>]"
                                            value="<?= $block->escapeHtmlAttr($block->getDataId()) ?>"
                                            title="<?= $block->escapeHtml(__('Remove')) ?>" />
                                     <label class="admin__field-label"
-                                           for="sidebar-remove-<?= $block->escapeHtmlAttr($block->getSidebarStorageAction()) ?>-<?= (int) $block->getItemId($_item) ?>">
+                                           for="sidebar-remove-<?=
+                                            $block->escapeHtmlAttr($block->getSidebarStorageAction())
+                                            ?>-<?= (int) $block->getItemId($_item) ?>">
                                     </label>
                                 </div>
                             </td>
@@ -86,29 +96,44 @@
 
                         <td class="col-add">
                             <div class="admin__field-option">
-                                <?php if ($block->isConfigurationRequired($_item->getTypeId()) && $block->getDataId() == 'wishlist') : ?>
+                                <?php if ($block->isConfigurationRequired($_item->getTypeId()) &&
+                                    $block->getDataId() == 'wishlist'): ?>
                                     <a href="#"
                                        class="icon icon-configure"
-                                       title="<?= $block->escapeHtml(__('Configure and Add to Order')) ?>"
-                                       onclick="order.sidebarConfigureProduct('sidebar_wishlist', <?= (int) $block->getProductId($_item) ?>, <?= (int) $block->getItemId($_item) ?>); return false;">
+                                       title="<?= $block->escapeHtml(__('Configure and Add to Order')) ?>">
                                         <span><?= $block->escapeHtml(__('Configure and Add to Order')) ?></span>
                                     </a>
-                                <?php elseif ($block->isConfigurationRequired($_item->getTypeId())) : ?>
+                                    <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                                        'onclick',
+                                        "event.preventDefault(); order.sidebarConfigureProduct('sidebar_wishlist', " .
+                                        (int) $block->getProductId($_item) . ", " . (int) $block->getItemId($_item) .
+                                        "); return false;",
+                                        'a.icon.icon-configure'
+                                    ) ?>
+                                <?php elseif ($block->isConfigurationRequired($_item->getTypeId())): ?>
                                     <a href="#"
                                        class="icon icon-configure"
-                                       title="<?= $block->escapeHtml(__('Configure and Add to Order')) ?>"
-                                       onclick="order.sidebarConfigureProduct('sidebar', <?= (int) $block->getProductId($_item) ?>); return false;">
+                                       title="<?= $block->escapeHtml(__('Configure and Add to Order')) ?>">
                                         <span><?= $block->escapeHtml(__('Configure and Add to Order')) ?></span>
                                     </a>
-                                <?php else : ?>
-                                    <input id="sidebar-<?= $block->escapeHtmlAttr($block->getSidebarStorageAction()) ?>-<?= (int) $block->getIdentifierId($_item) ?>"
+                                    <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                                        'onclick',
+                                        "event.preventDefault(); order.sidebarConfigureProduct('sidebar', " .
+                                        (int) $block->getProductId($_item) . "); return false;",
+                                        'a.icon.icon-configure'
+                                    ) ?>
+                                <?php else: ?>
+                                    <input id="sidebar-<?= $block->escapeHtmlAttr($block->getSidebarStorageAction())
+                                    ?>-<?= (int) $block->getIdentifierId($_item) ?>"
                                            type="checkbox"
                                            class="admin__control-checkbox"
-                                           name="sidebar[<?= $block->escapeHtmlAttr($block->getSidebarStorageAction()) ?>][<?= (int) $block->getIdentifierId($_item) ?>]"
+                                           name="sidebar[<?= $block->escapeHtmlAttr($block->getSidebarStorageAction())
+                                            ?>][<?= (int) $block->getIdentifierId($_item) ?>]"
                                            value="<?= $block->canDisplayItemQty() ? (float) $_item->getQty() : 1 ?>"
                                            title="<?= $block->escapeHtml(__('Add To Order')) ?>"/>
                                     <label class="admin__field-label"
-                                           for="sidebar-<?= $block->escapeHtmlAttr($block->getSidebarStorageAction()) ?>-<?= (int) $block->getIdentifierId($_item) ?>">
+                                           for="sidebar-<?= $block->escapeHtmlAttr($block->getSidebarStorageAction())
+                                            ?>-<?= (int) $block->getIdentifierId($_item) ?>">
                                     </label>
                                 <?php endif; ?>
                             </div>
@@ -117,11 +142,11 @@
                 <?php endforeach; ?>
             </tbody>
         </table>
-        <?php else : ?>
+        <?php else: ?>
             <span class="no-items"><?= $block->escapeHtml(__('No items')) ?></span>
         <?php endif ?>
         </div>
-        <?php if ($block->getItemCount() && $block->canRemoveItems()) : ?>
+        <?php if ($block->getItemCount() && $block->canRemoveItems()): ?>
             <?= $block->getChildHtml('empty_customer_cart_button') ?>
         <?php endif; ?>
     </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml
index 407bd0272e9fd..180486870446d 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml
@@ -3,17 +3,19 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/* @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Store\Select */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<?php /* @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Store\Select */ ?>
 <div class="store-scope form-inline">
     <div class="admin__fieldset tree-store-scope">
         <?php $showHelpHint = 0; ?>
-        <?php foreach ($block->getWebsiteCollection() as $_website) : ?>
+        <?php foreach ($block->getWebsiteCollection() as $_website): ?>
             <?php $showWebsite = false; ?>
-            <?php foreach ($block->getGroupCollection($_website) as $_group) : ?>
+            <?php foreach ($block->getGroupCollection($_website) as $_group): ?>
                 <?php $showGroup = false; ?>
-                <?php foreach ($block->getStoreCollection($_group) as $_store) : ?>
-                    <?php if ($showWebsite == false) : ?>
+                <?php foreach ($block->getStoreCollection($_group) as $_store): ?>
+                    <?php if ($showWebsite == false): ?>
                         <?php $showWebsite = true; ?>
                         <div class="admin__field field-website_label">
                             <label class="admin__field-label" for="">
@@ -21,7 +23,7 @@
                             </label>
                             <div class="admin__field-control">
                                 <div class="admin__field admin__field-option">
-                                    <?php if ($showHelpHint == 0) :
+                                    <?php if ($showHelpHint == 0):
                                         echo $block->getHintHtml();
                                         $showHelpHint = 1;
                                     endif; ?>
@@ -30,20 +32,30 @@
                         </div>
                     <?php endif; ?>
 
-                    <?php if ($showGroup == false) : ?>
+                    <?php if ($showGroup == false): ?>
                         <?php $showGroup = true; ?>
                         <div class="admin__field field-group_label">
-                            <label class="admin__field-label" for=""><span><?= $block->escapeHtml($_group->getName()) ?></span></label>
+                            <label class="admin__field-label" for="">
+                                <span><?= $block->escapeHtml($_group->getName()) ?></span>
+                            </label>
                             <div class="admin__field-control"></div>
                         </div>
                     <?php endif; ?>
 
                     <div class="admin__field field-store_label">
-                        <label class="admin__field-label" for=""><span><?= $block->escapeHtml($_group->getName()) ?></span></label>
+                        <label class="admin__field-label" for="">
+                            <span><?= $block->escapeHtml($_group->getName()) ?></span>
+                        </label>
                         <div class="admin__field-control">
                             <div class="nested">
                                 <div class="admin__field admin__field-option">
-                                    <input type="radio" id="store_<?= (int) $_store->getId() ?>" class="admin__control-radio" onclick="order.setStoreId('<?= (int) $_store->getId() ?>')"/>
+                                    <input type="radio"
+                                           id="store_<?= (int) $_store->getId() ?>" class="admin__control-radio"/>
+                                    <?= /* @noEscape*/ $secureRenderer->renderEventListenerAsTag(
+                                        'onclick',
+                                        "order.setStoreId('" .  (int)$_store->getId() . "')",
+                                        'input#store_' . (int)$_store->getId()
+                                    ) ?>
                                     <label class="admin__field-label" for="store_<?= (int) $_store->getId() ?>">
                                         <?= $block->escapeHtml($_store->getName()) ?>
                                     </label>
@@ -52,7 +64,7 @@
                         </div>
                     </div>
                 <?php endforeach; ?>
-                <?php if ($showGroup) : ?>
+                <?php if ($showGroup): ?>
                 <?php endif; ?>
             <?php endforeach; ?>
         <?php endforeach; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/default.phtml
index 4a55eb609924f..7462e8ac1f87d 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/default.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/default.phtml
@@ -3,16 +3,28 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<tr class="<?= $block->escapeHtmlAttr($block->getTotal()->getCode()) ?> row-totals">
-    <td style="<?= $block->escapeHtmlAttr($block->getTotal()->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
-        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()) : ?><strong><?php endif; ?>
+<tr id="totals-default" class="<?= $block->escapeHtmlAttr($block->getTotal()->getCode()) ?> row-totals">
+    <td class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
+        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?><strong><?php endif; ?>
             <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
-        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()) : ?></strong><?php endif; ?>
+        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?></strong><?php endif; ?>
     </td>
-    <td style="<?= $block->escapeHtmlAttr($block->getTotal()->getStyle()) ?>" class="admin__total-amount">
-        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()) : ?><strong><?php endif; ?>
+    <td class="admin__total-amount">
+        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?><strong><?php endif; ?>
             <?= /* @noEscape */ $block->formatPrice($block->getTotal()->getValue()) ?>
-        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()) : ?></strong><?php endif; ?>
+        <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?></strong><?php endif; ?>
     </td>
 </tr>
+<?php if ($block->escapeHtmlAttr($block->getTotal()->getStyle())): ?>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+        $block->escapeHtmlAttr($block->getTotal()->getStyle()),
+        'tr#totals-default td.admin__total-mark'
+    ) ?>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+        $block->escapeHtmlAttr($block->getTotal()->getStyle()),
+        'tr#totals-default td.admin__total-amount'
+    ) ?>
+<?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/grandtotal.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/grandtotal.phtml
index 4c4f94b5b3bb1..1ff1c68baaa52 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/grandtotal.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/grandtotal.phtml
@@ -6,34 +6,65 @@
 
 /**
  * @var $block \Magento\Tax\Block\Checkout\Grandtotal
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  * @see \Magento\Tax\Block\Checkout\Grandtotal
  */
 ?>
-<?php if ($block->includeTax() && $block->getTotalExclTax() >= 0) : ?>
-    <tr class="row-totals">
-        <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
+<?php if ($block->includeTax() && $block->getTotalExclTax() >= 0): ?>
+    <tr id="grand-total-exclude-tax" class="row-totals">
+        <td class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
             <strong><?= $block->escapeHtml(__('Grand Total Excl. Tax')) ?></strong>
         </td>
-        <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-amount">
+        <td class="admin__total-amount">
             <strong><?= /* @noEscape */ $block->formatPrice($block->getTotalExclTax()) ?></strong>
         </td>
     </tr>
+    <?php if ($block->escapeHtmlAttr($block->getStyle())): ?>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+            $block->escapeHtmlAttr($block->getStyle()),
+            'tr#grand-total-exclude-tax td.admin__total-mark'
+        ) ?>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+            $block->escapeHtmlAttr($block->getStyle()),
+            'tr#grand-total-exclude-tax td.admin__total-amount'
+        ) ?>
+    <?php endif; ?>
     <?= /* @noEscape */ $block->renderTotals('taxes', $block->getColspan()) ?>
-    <tr class="row-totals">
-        <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
+    <tr id="grand-total-include-tax" class="row-totals">
+        <td class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
             <strong><?= $block->escapeHtml(__('Grand Total Incl. Tax')) ?></strong>
         </td>
-        <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-amount">
+        <td class="admin__total-amount">
             <strong><?= /* @noEscape */ $block->formatPrice($block->getTotal()->getValue()) ?></strong>
         </td>
     </tr>
-    <?php else : ?>
-    <tr class="row-totals">
-        <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
+    <?php if ($block->escapeHtmlAttr($block->getStyle())): ?>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+            $block->escapeHtmlAttr($block->getStyle()),
+            'tr#grand-total-include-tax td.admin__total-mark'
+        ) ?>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+            $block->escapeHtmlAttr($block->getStyle()),
+            'tr#grand-total-include-tax td.admin__total-amount'
+        ) ?>
+    <?php endif; ?>
+    <?php else: ?>
+    <tr id="grand-total" class="row-totals">
+        <td class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
             <strong><?= $block->escapeHtml($block->getTotal()->getTitle()) ?></strong>
         </td>
-        <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-amount">
+        <td class="admin__total-amount">
             <strong><?= /* @noEscape */ $block->formatPrice($block->getTotal()->getValue()) ?></strong>
         </td>
     </tr>
+        <?php if ($block->escapeHtmlAttr($block->getStyle())): ?>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                $block->escapeHtmlAttr($block->getStyle()),
+                'tr#grand-total-include-tax td.admin__total-mark'
+            ) ?>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                $block->escapeHtmlAttr($block->getStyle()),
+                'tr#grand-total-include-tax td.admin__total-amount'
+            ) ?>
+    <?php endif; ?>
 <?php endif;?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/shipping.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/shipping.phtml
index db204a46f1f94..c842901f7c16a 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/shipping.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/shipping.phtml
@@ -6,42 +6,83 @@
 
 /**
  * @var $block \Magento\Tax\Block\Checkout\Shipping
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  * @see \Magento\Tax\Block\Checkout\Shipping
  */
 ?>
-<?php if ($block->displayBoth()) :?>
-<tr class="row-totals">
-    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
+<?php if ($block->displayBoth()):?>
+<tr id="shipping-exclude-tax" class="row-totals">
+    <td class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
         <?= $block->escapeHtml($block->getExcludeTaxLabel()) ?>
     </td>
-    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-amount">
+    <td class="admin__total-amount">
         <?= /* @noEscape */ $block->formatPrice($block->getShippingExcludeTax()) ?>
     </td>
 </tr>
-<tr class="row-totals">
-    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
+    <?php if ($block->escapeHtmlAttr($block->getStyle())): ?>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+            $block->escapeHtmlAttr($block->getStyle()),
+            'tr#shipping-exclude-tax td.admin__total-mark'
+        ) ?>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+            $block->escapeHtmlAttr($block->getStyle()),
+            'tr#shipping-exclude-tax td.admin__total-amount'
+        ) ?>
+    <?php endif; ?>
+<tr id="shipping-include-tax" class="row-totals">
+    <td class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
         <?= $block->escapeHtml($block->getIncludeTaxLabel()) ?>
     </td>
-    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-amount">
+    <td class="admin__total-amount">
         <?= /* @noEscape */ $block->formatPrice($block->getShippingIncludeTax()) ?>
     </td>
 </tr>
-<?php elseif ($block->displayIncludeTax()) : ?>
-<tr>
-    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
+    <?php if ($block->escapeHtmlAttr($block->getStyle())): ?>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+            $block->escapeHtmlAttr($block->getStyle()),
+            'tr#shipping-include-tax td.admin__total-mark'
+        ) ?>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+            $block->escapeHtmlAttr($block->getStyle()),
+            'tr#shipping-include-tax td.admin__total-amount'
+        ) ?>
+    <?php endif; ?>
+<?php elseif ($block->displayIncludeTax()): ?>
+<tr id="shipping-include-tax">
+    <td class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
         <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
     </td>
-    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-amount">
+    <td class="admin__total-amount">
         <?= /* @noEscape */ $block->formatPrice($block->getShippingIncludeTax()) ?>
     </td>
 </tr>
-<?php else : ?>
-<tr class="row-totals">
-    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
+    <?php if ($block->escapeHtmlAttr($block->getStyle())): ?>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+            $block->escapeHtmlAttr($block->getStyle()),
+            'tr#shipping-include-tax td.admin__total-mark'
+        ) ?>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+            $block->escapeHtmlAttr($block->getStyle()),
+            'tr#shipping-include-tax td.admin__total-amount'
+        ) ?>
+    <?php endif; ?>
+<?php else: ?>
+<tr id="shipping-exclude-tax" class="row-totals">
+    <td class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
         <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
     </td>
-    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-amount">
+    <td class="admin__total-amount">
         <?= /* @noEscape */ $block->formatPrice($block->getShippingExcludeTax()) ?>
     </td>
 </tr>
+    <?php if ($block->escapeHtmlAttr($block->getStyle())): ?>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+            $block->escapeHtmlAttr($block->getStyle()),
+            'tr#shipping-exclude-tax td.admin__total-mark'
+        ) ?>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+            $block->escapeHtmlAttr($block->getStyle()),
+            'tr#shipping-exclude-tax td.admin__total-amount'
+        ) ?>
+    <?php endif; ?>
 <?php endif;?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/subtotal.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/subtotal.phtml
index a63458491baea..91ba11f90ba9a 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/subtotal.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/subtotal.phtml
@@ -6,33 +6,64 @@
 
 /**
  * @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Subtotal
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  * @see \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Subtotal
  */
 ?>
-<?php if ($block->displayBoth()) : ?>
-<tr class="row-totals">
-    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
+<?php if ($block->displayBoth()): ?>
+<tr id="subtotal-exclude-tax" class="row-totals">
+    <td class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
         <?= $block->escapeHtml(__('Subtotal (Excl. Tax)')) ?>
     </td>
-    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-amount">
+    <td class="admin__total-amount">
         <?= /* @noEscape */ $block->formatPrice($block->getTotal()->getValueExclTax()) ?>
     </td>
 </tr>
-<tr class="row-totals">
-    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
+    <?php if ($block->escapeHtmlAttr($block->getStyle())): ?>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+            $block->escapeHtmlAttr($block->getStyle()),
+            'tr#subtotal-exclude-tax td.admin__total-mark'
+        ) ?>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+            $block->escapeHtmlAttr($block->getStyle()),
+            'tr#subtotal-exclude-tax td.admin__total-amount'
+        ) ?>
+    <?php endif; ?>
+<tr id="subtotal-include-tax" class="row-totals">
+    <td class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
         <?= $block->escapeHtml(__('Subtotal (Incl. Tax)')) ?>
     </td>
-    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-amount">
+    <td class="admin__total-amount">
         <?= /* @noEscape */ $block->formatPrice($block->getTotal()->getValueInclTax()) ?>
     </td>
 </tr>
-<?php else : ?>
-<tr class="row-totals">
-    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
+    <?php if ($block->escapeHtmlAttr($block->getStyle())): ?>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+            $block->escapeHtmlAttr($block->getStyle()),
+            'tr#subtotal-include-tax td.admin__total-mark'
+        ) ?>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+            $block->escapeHtmlAttr($block->getStyle()),
+            'tr#subtotal-include-tax td.admin__total-amount'
+        ) ?>
+    <?php endif; ?>
+<?php else: ?>
+<tr id="subtotal-total" class="row-totals">
+    <td class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
         <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
     </td>
-    <td style="<?= $block->escapeHtmlAttr($block->getStyle()) ?>" class="admin__total-amount">
+    <td class="admin__total-amount">
         <?= /* @noEscape */ $block->formatPrice($block->getTotal()->getValue()) ?>
     </td>
 </tr>
+    <?php if ($block->escapeHtmlAttr($block->getStyle())): ?>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+            $block->escapeHtmlAttr($block->getStyle()),
+            'tr#subtotal-total td.admin__total-mark'
+        ) ?>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+            $block->escapeHtmlAttr($block->getStyle()),
+            'tr#subtotal-total td.admin__total-amount'
+        ) ?>
+    <?php endif; ?>
 <?php endif;?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/tax.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/tax.phtml
index 042b2f5113cac..5c39449d79840 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/tax.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/tax.phtml
@@ -4,56 +4,91 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Templates.ThisInTemplate
 // phpcs:disable Squiz.PHP.GlobalKeyword.NotAllowed
+/**
+ * @var \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Tax $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 
-/** @var \Magento\Sales\Block\Adminhtml\Order\Create\Totals\Tax $block */
-
+/** @var \Magento\Tax\Helper\Data $taxHelper */
+$taxHelper = $block->getData('taxHelper');
 $taxAmount = $block->getTotal()->getValue();
 ?>
-<?php if (($taxAmount == 0 && $this->helper(\Magento\Tax\Helper\Data::class)->displayZeroTax()) || ($taxAmount > 0)) :
+<?php if (($taxAmount == 0 && $taxHelper->displayZeroTax()) || ($taxAmount > 0)):
     global $taxIter;
     $taxIter++;
     ?>
-    <?php $class = $block->escapeHtmlAttr("{$block->getTotal()->getCode()} " . ($this->helper(\Magento\Tax\Helper\Data::class)->displayFullSummary() ? 'summary-total' : '')); ?>
-    <tr<?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayFullSummary()) : ?>
-        onclick="expandDetails(this, '.summary-details-<?= $block->escapeJs($taxIter) ?>')"
-    <?php endif; ?>
+    <?php $class = $block->escapeHtmlAttr("{$block->getTotal()->getCode()} " . ($taxHelper->displayFullSummary() ?
+        'summary-total' : '')); ?>
+    <tr id="tax-summary-<?= $block->escapeHtmlAttr($taxIter) ?>"
         class="<?= /* @noEscape */ $class ?> row-totals">
-        <td style="<?= $block->escapeHtmlAttr($block->getTotal()->getStyle()) ?>" class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
-            <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayFullSummary()) : ?>
+        <td class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
+            <?php if ($taxHelper->displayFullSummary()): ?>
                 <div class="summary-collapse"><?= $block->escapeHtml($block->getTotal()->getTitle()) ?></div>
-            <?php else : ?>
+            <?php else: ?>
                 <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
             <?php endif;?>
         </td>
-        <td style="<?= $block->escapeHtmlAttr($block->getTotal()->getStyle()) ?>" class="admin__total-amount">
+        <td class="admin__total-amount">
             <?= /* @noEscape */ $block->formatPrice($block->getTotal()->getValue()) ?>
         </td>
     </tr>
-    <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayFullSummary()) : ?>
+    <?php if ($taxHelper->displayFullSummary()): ?>
+        <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+            'onclick',
+            "expandDetails(this, '.summary-details-" . $block->escapeJs($taxIter) ."')",
+            'tr#tax-summary-' . $block->escapeHtmlAttr($taxIter)
+        ) ?>
+    <?php endif; ?>
+    <?php if ($block->escapeHtmlAttr($block->getTotal()->getStyle())): ?>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+            $block->escapeHtmlAttr($block->getTotal()->getStyle()),
+            'tr#tax-summary td.admin__total-mark'
+        ) ?>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+            $block->escapeHtmlAttr($block->getTotal()->getStyle()),
+            'tr#tax-summary td.admin__total-amount'
+        ) ?>
+    <?php endif; ?>
+    <?php if ($taxHelper->displayFullSummary()): ?>
         <?php $isTop = 1; ?>
-        <?php foreach ($block->getTotal()->getFullInfo() as $info) : ?>
-            <?php if (isset($info['hidden']) && $info['hidden']) :
+        <?php foreach ($block->getTotal()->getFullInfo() as $info): ?>
+            <?php if (isset($info['hidden']) && $info['hidden']):
                 continue;
             endif; ?>
             <?php $percent = $info['percent']; ?>
             <?php $amount = $info['amount']; ?>
             <?php $rates = $info['rates']; ?>
 
-            <?php foreach ($rates as $rate) : ?>
-                <tr class="summary-details-<?= $block->escapeHtmlAttr($taxIter) ?> summary-details<?= ($isTop ? ' summary-details-first' : '') ?>" style="display:none;">
-                    <td class="admin__total-mark" style="<?= $block->escapeHtmlAttr($block->getTotal()->getStyle()) ?>" colspan="<?= (int) $block->getColspan() ?>">
+            <?php foreach ($rates as $rate): ?>
+                <tr id="tax-summary-details-<?= $block->escapeHtmlAttr($taxIter) ?>"
+                    class="summary-details-<?= $block->escapeHtmlAttr($taxIter) ?>
+                     summary-details<?= ($isTop ? ' summary-details-first' : '') ?>">
+                    <td class="admin__total-mark" colspan="<?= (int) $block->getColspan() ?>">
                         <?= $block->escapeHtml($rate['title']) ?>
-                        <?php if ($rate['percent'] !== null) : ?>
+                        <?php if ($rate['percent'] !== null): ?>
                             (<?= (float) $rate['percent'] ?>%)
                         <?php endif; ?>
                         <br />
                     </td>
-                    <td style="<?= $block->escapeHtmlAttr($block->getTotal()->getStyle()) ?>" class="admin__total-amount">
+                    <td class="admin__total-amount">
                         <?= /* @noEscape */ $block->formatPrice(($amount*(float)$rate['percent'])/$percent) ?>
                     </td>
                 </tr>
+                <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                    "display:none;",
+                    'tr#tax-summary-details-' . $block->escapeHtmlAttr($taxIter)
+                ) ?>
+                <?php if ($block->escapeHtmlAttr($block->getTotal()->getStyle())): ?>
+                    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                        $block->escapeHtmlAttr($block->getTotal()->getStyle()),
+                        'tr#tax-summary-details-' . $block->escapeHtmlAttr($taxIter) . ' td.admin__total-mark'
+                    ) ?>
+                    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                        $block->escapeHtmlAttr($block->getTotal()->getStyle()),
+                        'tr#tax-summary-details-' . $block->escapeHtmlAttr($taxIter) . ' td.admin__total-amount'
+                    ) ?>
+                <?php endif; ?>
                 <?php $isTop = 0; ?>
             <?php endforeach; ?>
         <?php endforeach; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml
index 70373f177d8be..10c44cf99471b 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml
@@ -4,85 +4,165 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Templates.ThisInTemplate
-
-/*
-store view name = $_order->getStore()->getName()
-web site name = $_order->getStore()->getWebsite()->getName()
-store name = $_order->getStore()->getGroup()->getName()
-*/
-
 /* @var \Magento\Sales\Block\Adminhtml\Order\Details $block */
-?>
-<?php
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+
 /* @var \Magento\Sales\Model\Order $_order */
-$_order = $block->getOrder() ?>
+$_order = $block->getOrder();
+/** @var \Magento\GiftMessage\Helper\Message $giftMessageHelper */
+$giftMessageHelper = $block->getData('giftMessageHelper');
+?>
 <div>
-<?= $block->escapeHtml(__('Customer Name: %1', $_order->getCustomerFirstname() ? $_order->getCustomerName() : $_order->getBillingAddress()->getName())) ?><br />
+<?= $block->escapeHtml(__('Customer Name: %1', $_order->getCustomerFirstname() ? $_order->getCustomerName() :
+    $_order->getBillingAddress()->getName())) ?><br />
 <?= $block->escapeHtml(__('Purchased From: %1', $_order->getStore()->getGroup()->getName())) ?><br />
 </div>
-<table cellpadding="0" border="0" width="100%" style="border:1px solid #bebcb7; background:#f8f7f5;">
+<table id="order-details" cellpadding="0" border="0" width="100%">
     <thead>
         <tr>
-            <th align="left" bgcolor="#d9e5ee" style="padding:3px 9px">Item</th>
-            <th align="center" bgcolor="#d9e5ee" style="padding:3px 9px">Qty</th>
-            <th align="right" bgcolor="#d9e5ee" width="10%" style="padding:3px 9px">Subtotal</th>
+            <th align="left" bgcolor="#d9e5ee">Item</th>
+            <th align="center" bgcolor="#d9e5ee">Qty</th>
+            <th align="right" bgcolor="#d9e5ee" width="10%">Subtotal</th>
         </tr>
     </thead>
 
     <tbody>
-<?php $i = 0; foreach ($_order->getAllItems() as $_item) : $i++ ?>
-        <tr <?= $i%2 ? 'bgcolor="#eeeded"' : '' ?>>
-            <td align="left" valign="top" style="padding:3px 9px"><strong><?= $block->escapeHtml($_item->getName()) ?></strong>
-            <?php if ($_item->getGiftMessageId() && $_giftMessage = $this->helper(\Magento\GiftMessage\Helper\Message::class)->getGiftMessage($_item->getGiftMessageId())) : ?>
+<?php $i = 0; foreach ($_order->getAllItems() as $_item): $i++ ?>
+        <tr id="item-<?= /* @noEscape */ $i ?>" <?= $i%2 ? 'bgcolor="#eeeded"' : '' ?>>
+            <td align="left" valign="top"><strong><?= $block->escapeHtml($_item->getName()) ?></strong>
+            <?php if ($_item->getGiftMessageId() &&
+                $_giftMessage = $giftMessageHelper->getGiftMessage($_item->getGiftMessageId())): ?>
             <br /><strong><?= $block->escapeHtml(__('Gift Message')) ?></strong>
             <br /><?= $block->escapeHtml(__('From:')) ?> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
             <br /><?= $block->escapeHtml(__('To:')) ?> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
             <br /><?= $block->escapeHtml(__('Message:')) ?><br /> <?= $block->escapeHtml($_giftMessage->getMessage()) ?>
             <?php endif; ?>
             </td>
-            <td align="center" valign="top" style="padding:3px 9px"><?= (float) $_item->getQtyOrdered() ?></td>
-            <td align="right" valign="top" style="padding:3px 9px"><?= /* @noEscape */ $_order->formatPrice($_item->getRowTotal()) ?></td>
+            <td align="center" valign="top"><?= (float) $_item->getQtyOrdered() ?></td>
+            <td align="right" valign="top"><?= /* @noEscape */ $_order->formatPrice($_item->getRowTotal()) ?></td>
         </tr>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+        'padding:3px 9px',
+        'tr#item-' . $i
+    ) ?>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+        'padding:3px 9px',
+        'tr#item-' . $i . ' td:nth-child(1)'
+    ) ?>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+        'padding:3px 9px',
+        'tr#item-' . $i . ' td:nth-child(2)'
+    ) ?>
 <?php endforeach; ?>
     </tbody>
 
     <tfoot>
-    <?php if ($_order->getGiftMessageId() && $_giftMessage = $this->helper(\Magento\GiftMessage\Helper\Message::class)->getGiftMessage($_order->getGiftMessageId())) : ?>
-        <tr>
-            <td colspan="3" align="left" style="padding:3px 9px">
+    <?php if ($_order->getGiftMessageId() &&
+        $_giftMessage = $giftMessageHelper->getGiftMessage($_order->getGiftMessageId())): ?>
+        <tr id="gift-message">
+            <td colspan="3" align="left">
             <strong><?= $block->escapeHtml(__('Gift Message')) ?></strong>
             <br /><?= $block->escapeHtml(__('From:')) ?> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
             <br /><?= $block->escapeHtml(__('To:')) ?> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
             <br /><?= $block->escapeHtml(__('Message:')) ?><br /> <?= $block->escapeHtml($_giftMessage->getMessage()) ?>
             </td>
         </tr>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+            'padding:3px 9px',
+            'table#order-details tr#gift-message td'
+        ) ?>
     <?php endif; ?>
-        <tr>
-            <td colspan="2" align="right" style="padding:3px 9px"><?= $block->escapeHtml(__('Subtotal')) ?></td>
-            <td align="right" style="padding:3px 9px"><?= /* @noEscape */ $_order->formatPrice($_order->getSubtotal()) ?></td>
+        <tr id="subtotal">
+            <td colspan="2" align="right"><?= $block->escapeHtml(__('Subtotal')) ?></td>
+            <td align="right"><?= /* @noEscape */ $_order->formatPrice($_order->getSubtotal()) ?></td>
         </tr>
-        <?php if ($_order->getDiscountAmount() > 0) : ?>
-            <tr>
-                <td colspan="2" align="right" style="padding:3px 9px"><?= $block->escapeHtml((($_order->getCouponCode()) ? __('Discount (%1)', $_order->getCouponCode()) : __('Discount'))) ?></td>
-                <td align="right" style="padding:3px 9px"><?= /* @noEscape */ $_order->formatPrice(0.00 - $_order->getDiscountAmount()) ?></td>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+        'padding:3px 9px',
+        'table#order-details tr#subtotal td:nth-child(0)'
+    ) ?>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+        'padding:3px 9px',
+        'table#order-details tr#subtotal td:nth-child(1)'
+    ) ?>
+
+        <?php if ($_order->getDiscountAmount() > 0): ?>
+            <tr id="discount">
+                <td colspan="2" align="right"><?= $block->escapeHtml((($_order->getCouponCode()) ?
+                        __('Discount (%1)', $_order->getCouponCode()) : __('Discount'))) ?></td>
+                <td align="right"><?= /* @noEscape */ $_order->formatPrice(0.00 - $_order->getDiscountAmount()) ?></td>
             </tr>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                'padding:3px 9px',
+                'table#order-details tr#discount td:nth-child(0)'
+            ) ?>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                'padding:3px 9px',
+                'table#order-details tr#discount td:nth-child(1)'
+            ) ?>
         <?php endif; ?>
-        <?php if ($_order->getShippingAmount() || $_order->getShippingDescription()) : ?>
-            <tr>
-                <td colspan="2" align="right" style="padding:3px 9px"><?= $block->escapeHtml(__('Shipping &amp; Handling')) ?></td>
-                <td align="right" style="padding:3px 9px"><?= /* @noEscape */ $_order->formatPrice($_order->getShippingAmount()) ?></td>
+        <?php if ($_order->getShippingAmount() || $_order->getShippingDescription()): ?>
+            <tr id="shipping">
+                <td colspan="2" align="right"><?= $block->escapeHtml(__('Shipping &amp; Handling')) ?></td>
+                <td align="right"><?= /* @noEscape */ $_order->formatPrice($_order->getShippingAmount()) ?></td>
             </tr>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                'padding:3px 9px',
+                'table#order-details tr#shipping td:nth-child(0)'
+            ) ?>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                'padding:3px 9px',
+                'table#order-details tr#shipping td:nth-child(1)'
+            ) ?>
         <?php endif; ?>
-        <?php if ($_order->getTaxAmount() > 0) : ?>
-            <tr>
-                <td colspan="2" align="right" style="padding:3px 9px"><?= $block->escapeHtml(__('Tax')) ?></td>
-                <td align="right" style="padding:3px 9px"><?= /* @noEscape */ $_order->formatPrice($_order->getTaxAmount()) ?></td>
+        <?php if ($_order->getTaxAmount() > 0): ?>
+            <tr id="tax">
+                <td colspan="2" align="right"><?= $block->escapeHtml(__('Tax')) ?></td>
+                <td align="right"><?= /* @noEscape */ $_order->formatPrice($_order->getTaxAmount()) ?></td>
             </tr>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                'padding:3px 9px',
+                'table#order-details tr#tax td:nth-child(0)'
+            ) ?>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                'padding:3px 9px',
+                'table#order-details tr#tax td:nth-child(1)'
+            ) ?>
         <?php endif; ?>
-        <tr bgcolor="#DEE5E8">
-            <td colspan="2" align="right" style="padding:3px 9px"><strong style="font-size: larger"><?= $block->escapeHtml(__('Grand Total')) ?></strong></td>
-            <td align="right" style="padding:6px 9px"><strong style="font-size: larger"><?= /* @noEscape */ $_order->formatPrice($_order->getGrandTotal()) ?></strong></td>
+        <tr id="grand-total" bgcolor="#DEE5E8">
+            <td colspan="2" align="right"><strong><?= $block->escapeHtml(__('Grand Total')) ?></strong></td>
+            <td align="right"><strong><?= /* @noEscape */ $_order->formatPrice($_order->getGrandTotal())?></strong></td>
         </tr>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+        'padding:3px 9px',
+        'table#order-details tr#grand-total td:nth-child(0)'
+    ) ?>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+        'font-size: larger',
+        'table#order-details tr#grand-total td:nth-child(0) strong'
+    ) ?>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+        'padding:3px 9px',
+        'table#order-details tr#grand-total td:nth-child(1)'
+    ) ?>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+        'font-size: larger',
+        'table#order-details tr#grand-total td:nth-child(1) strong'
+    ) ?>
     </tfoot>
 </table>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    "border:1px solid #bebcb7; background:#f8f7f5;",
+    'table#order-details'
+) ?>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    'padding:3px 9px',
+    'table#order-details thead tr th:nth-child(0)'
+) ?>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    'padding:3px 9px',
+    'table#order-details thead tr th:nth-child(1)'
+) ?>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    'padding:3px 9px',
+    'table#order-details thead tr th:nth-child(2)'
+) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/form.phtml
index 6c04bc7ddd803..cf2311de5dbb0 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/form.phtml
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Templates.ThisInTemplate
-
 /* @var \Magento\Sales\Block\Adminhtml\Order\Invoice\Create\Form $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/due.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/due.phtml
index f8e914a2c9b2f..7dc009a9bc662 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/due.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/due.phtml
@@ -3,10 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<?php if ($block->getCanDisplayTotalDue()) : ?>
-<tr>
-    <td class="label"><strong style="font-size: larger"><?= $block->escapeHtml(__('Total Due')) ?></strong></td>
-    <td class="emph" style="font-size: larger"><?= /* @noEscape */ $block->displayPriceAttribute('total_due', true) ?></td>
+<?php if ($block->getCanDisplayTotalDue()): ?>
+<tr id="total-due">
+    <td class="label"><strong><?= $block->escapeHtml(__('Total Due')) ?></strong></td>
+
+    <td class="emph"><?= /* @noEscape */ $block->displayPriceAttribute('total_due', true) ?></td>
 </tr>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('font-size: larger', 'tr.total-due td.label strong') ?>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('font-size: larger', 'tr.total-due td.emph') ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/grand.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/grand.phtml
index af5d58d47fce1..d501069f1d979 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/grand.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/grand.phtml
@@ -3,19 +3,29 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?php $_source  = $block->getSource() ?>
 <?php $block->setPriceDataObject($_source) ?>
 
-<tr>
+<tr id="grand-totals">
     <td class="label">
-        <strong style="font-size: larger">
-        <?php if ($block->getGrandTotalTitle()) : ?>
+        <strong>
+        <?php if ($block->getGrandTotalTitle()): ?>
             <?= $block->escapeHtml($block->getGrandTotalTitle()) ?>
-        <?php else : ?>
+        <?php else: ?>
             <?= $block->escapeHtml(__('Grand Total')) ?>
         <?php endif; ?>
         </strong>
     </td>
-    <td class="emph" style="font-size: larger"><?= /* @noEscape */ $block->displayPriceAttribute('grand_total', true) ?></td>
+    <td class="emph"><?= /* @noEscape */ $block->displayPriceAttribute('grand_total', true) ?></td>
 </tr>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    "font-size: larger",
+    'tr#grand-totals td.label strong'
+) ?>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    "font-size: larger",
+    'tr#grand-totals td.emph'
+) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
index a68fb09fd2058..4f1b18f3fcda8 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
@@ -4,26 +4,30 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Templates.ThisInTemplate
-
-/** @var $block \Magento\Sales\Block\Adminhtml\Order\Totals\Tax */
+/**
+ * @var $block \Magento\Sales\Block\Adminhtml\Order\Totals\Tax
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 
 /** @var $_source \Magento\Sales\Model\Order\Invoice */
 $_source    = $block->getSource();
 $_order     = $block->getOrder();
 $_fullInfo  = $block->getFullTaxInfo();
+
+/** @var \Magento\Tax\Helper\Data $taxHelper */
+$taxHelper = $block->getData('taxHelper');
 ?>
 
-<?php if ($block->displayFullSummary() && $_fullInfo) : ?>
-<tr class="summary-total" onclick="expandDetails(this, '.summary-details')">
-<?php else : ?>
+<?php if ($block->displayFullSummary() && $_fullInfo): ?>
+<tr class="summary-total">
+<?php else: ?>
 <tr>
-    <?php endif; ?>
+<?php endif; ?>
     <td class="label">
         <div class="summary-collapse" tabindex="0">
-            <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayFullSummary()) : ?>
+            <?php if ($taxHelper->displayFullSummary()): ?>
                 <?= $block->escapeHtml(__('Total Tax')) ?>
-            <?php else : ?>
+            <?php else: ?>
                 <?= $block->escapeHtml(__('Tax')) ?>
             <?php endif;?>
         </div>
@@ -32,11 +36,16 @@ $_fullInfo  = $block->getFullTaxInfo();
         <?= /* @noEscape */ $block->displayAmount($_source->getTaxAmount(), $_source->getBaseTaxAmount()) ?>
     </td>
 </tr>
-<?php if ($block->displayFullSummary()) : ?>
+<?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+    'onclick',
+    "expandDetails(this, '.summary-details')",
+    'tr.summary-total'
+) ?>
+<?php if ($block->displayFullSummary()): ?>
     <?php $isTop = 1; ?>
-    <?php if (isset($_fullInfo[0]['rates'])) : ?>
-        <?php foreach ($_fullInfo as $info) : ?>
-            <?php if (isset($info['hidden']) && $info['hidden']) :
+    <?php if (isset($_fullInfo[0]['rates'])): ?>
+        <?php foreach ($_fullInfo as $info): ?>
+            <?php if (isset($info['hidden']) && $info['hidden']):
                 continue;
             endif; ?>
             <?php
@@ -47,39 +56,49 @@ $_fullInfo  = $block->getFullTaxInfo();
             $isFirst    = 1;
             ?>
 
-            <?php foreach ($rates as $rate) : ?>
-                <tr class="summary-details<?= ($isTop ? ' summary-details-first' : '') ?>" style="display:none;">
-                    <?php if ($rate['percent'] !== null) : ?>
-                        <td class="admin__total-mark"><?= $block->escapeHtml($rate['title']) ?> (<?= (float)$rate['percent'] ?>%)<br /></td>
-                    <?php else : ?>
+            <?php foreach ($rates as $rate): ?>
+                <tr id="rate-<?= /* @noEscape */ $rate->getId() ?>"
+                    class="summary-details<?= ($isTop ? ' summary-details-first' : '') ?>">
+                    <?php if ($rate['percent'] !== null): ?>
+                        <td class="admin__total-mark">
+                            <?= $block->escapeHtml($rate['title']) ?> (<?= (float)$rate['percent'] ?>%)<br />
+                        </td>
+                    <?php else: ?>
                         <td class="admin__total-mark"><?= $block->escapeHtml($rate['title']) ?><br /></td>
                     <?php endif; ?>
-                    <?php if ($isFirst) : ?>
-                        <td rowspan="<?= count($rates) ?>"><?= /* @noEscape */ $block->displayAmount($amount, $baseAmount) ?></td>
+                    <?php if ($isFirst): ?>
+                        <td rowspan="<?= count($rates) ?>">
+                            <?= /* @noEscape */ $block->displayAmount($amount, $baseAmount) ?>
+                        </td>
                     <?php endif; ?>
                 </tr>
+                <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display:none;", 'tr#rate-' . $rate->getId()) ?>
                 <?php
                 $isFirst = 0;
                 $isTop = 0;
                 ?>
             <?php endforeach; ?>
         <?php endforeach; ?>
-    <?php else : ?>
-        <?php foreach ($_fullInfo as $info) : ?>
+    <?php else: ?>
+        <?php foreach ($_fullInfo as $info): ?>
             <?php
             $percent    = $info['percent'];
             $amount     = $info['tax_amount'];
             $baseAmount = $info['base_tax_amount'];
             $isFirst    = 1;
             ?>
-            <tr class="summary-details<?= ($isTop ? ' summary-details-first' : '') ?>" style="display:none;">
-                <?php if ($info['percent'] !== null) : ?>
-                    <td class="admin__total-mark"><?= $block->escapeHtml($info['title']) ?> (<?= (float)$info['percent'] ?>%)<br /></td>
-                <?php else : ?>
+            <tr id="info-<?= /* @noEscape */ $info->getCode() ?>"
+                class="summary-details<?= ($isTop ? ' summary-details-first' : '') ?>">
+                <?php if ($info['percent'] !== null): ?>
+                    <td class="admin__total-mark">
+                        <?= $block->escapeHtml($info['title']) ?> (<?= (float)$info['percent'] ?>%)<br />
+                    </td>
+                <?php else: ?>
                     <td class="admin__total-mark"><?= $block->escapeHtml($info['title']) ?><br /></td>
                 <?php endif; ?>
                     <td><?= /* @noEscape */ $block->displayAmount($amount, $baseAmount) ?></td>
             </tr>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display:none;", 'tr#info-' . $info->getCode()) ?>
             <?php
             $isFirst = 0;
             $isTop = 0;
diff --git a/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml b/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml
index 0dff0710dd63a..39d6dafe57244 100644
--- a/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml
@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <form class="form form-orders-search"
       id="oar-widget-orders-and-returns-form"
@@ -23,7 +24,9 @@
             </div>
         </div>
         <div class="field lastname required">
-            <label class="label" for="oar-billing-lastname"><span><?= $block->escapeHtml(__('Billing Last Name')) ?></span></label>
+            <label class="label" for="oar-billing-lastname">
+                <span><?= $block->escapeHtml(__('Billing Last Name')) ?></span>
+            </label>
 
             <div class="control">
                 <input type="text" class="input-text" id="oar-billing-lastname" name="oar_billing_lastname"
@@ -31,7 +34,9 @@
             </div>
         </div>
         <div class="field find required">
-            <label class="label" for="quick-search-type-id"><span><?= $block->escapeHtml(__('Find Order By')) ?></span></label>
+            <label class="label" for="quick-search-type-id">
+                <span><?= $block->escapeHtml(__('Find Order By')) ?></span>
+            </label>
 
             <div class="control">
                 <select name="oar_type" id="quick-search-type-id" class="select">
@@ -48,13 +53,14 @@
                        data-validate="{required:true, 'validate-email':true}"/>
             </div>
         </div>
-        <div id="oar-zip" style="display: none;" class="field zip required">
+        <div id="oar-zip" class="field zip required">
             <label class="label" for="oar_zip"><span><?= $block->escapeHtml(__('Billing ZIP Code')) ?></span></label>
 
             <div class="control">
                 <input type="text" class="input-text" id="oar_zip" name="oar_zip" data-validate="{required:true}"/>
             </div>
         </div>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display: none;', 'div#oar-zip') ?>
     </fieldset>
     <div class="actions-toolbar">
         <div class="primary">
diff --git a/app/code/Magento/Sales/view/frontend/templates/widget/guest/form.phtml b/app/code/Magento/Sales/view/frontend/templates/widget/guest/form.phtml
index 25926688c6f47..7772e7b9680fd 100644
--- a/app/code/Magento/Sales/view/frontend/templates/widget/guest/form.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/widget/guest/form.phtml
@@ -4,15 +4,19 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Sales\Block\Widget\Guest\Form */
+/**
+ * @var $block \Magento\Sales\Block\Widget\Guest\Form
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
-<?php if ($block->isEnable()) : ?>
+<?php if ($block->isEnable()): ?>
     <div class="widget block block-orders-returns">
         <div class="block-title">
             <strong role="heading" aria-level="2"><?= $block->escapeHtml(__('Orders and Returns')) ?></strong>
         </div>
         <div class="block-content">
-            <form id="oar-widget-orders-and-returns-form" data-mage-init='{"ordersReturns":{},"validation":{}}' action="<?= $block->escapeUrl($block->getActionUrl()) ?>" method="post"
+            <form id="oar-widget-orders-and-returns-form" data-mage-init='{"ordersReturns":{},"validation":{}}'
+                  action="<?= $block->escapeUrl($block->getActionUrl()) ?>" method="post"
                   class="form form-orders-search" name="guest_post">
                 <fieldset class="fieldset">
                     <div class="field find required">
@@ -26,10 +30,13 @@
                         </div>
                     </div>
                     <div class="field id required">
-                        <label for="oar-order-id" class="label"><span><?= $block->escapeHtml(__('Order ID')) ?></span></label>
+                        <label for="oar-order-id" class="label">
+                            <span><?= $block->escapeHtml(__('Order ID')) ?></span>
+                        </label>
 
                         <div class="control">
-                            <input type="text" class="input-text" id="oar-order-id" name="oar_order_id" autocomplete="off"
+                            <input type="text" class="input-text" id="oar-order-id" name="oar_order_id"
+                                   autocomplete="off"
                                    data-validate="{required:true}">
                         </div>
                     </div>
@@ -50,14 +57,17 @@
                                    data-validate="{required:true, 'validate-email':true}">
                         </div>
                     </div>
-                    <div id="oar-zip" style="display: none;" class="field zip required">
-                        <label for="oar_zip" class="label"><span><?= $block->escapeHtml(__('Billing ZIP Code')) ?></span></label>
+                    <div id="oar-zip" class="field zip required">
+                        <label for="oar_zip" class="label">
+                            <span><?= $block->escapeHtml(__('Billing ZIP Code')) ?></span>
+                        </label>
 
                         <div class="control">
                             <input type="text" class="input-text" id="oar_zip" name="oar_zip"
                                    data-validate="{required:true}"/>
                         </div>
                     </div>
+                    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display: none;", 'div#oar-zip') ?>
                 </fieldset>
                 <div class="actions-toolbar">
                     <div class="primary">
diff --git a/app/code/Magento/Search/view/frontend/templates/term.phtml b/app/code/Magento/Search/view/frontend/templates/term.phtml
index b06ebcfe66966..51f40e8247ccf 100644
--- a/app/code/Magento/Search/view/frontend/templates/term.phtml
+++ b/app/code/Magento/Search/view/frontend/templates/term.phtml
@@ -3,19 +3,27 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/**
+ * @var \Magento\Search\Block\Term $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
-<?php if (count($block->getTerms()) > 0) : ?>
+<?php if (count($block->getTerms()) > 0): ?>
     <ul class="search-terms">
-        <?php foreach ($block->getTerms() as $_term) : ?>
-            <li class="item">
-                <a href="<?= $block->escapeUrl($block->getSearchUrl($_term)) ?>"
-                   style="font-size:<?= /* @noEscape */ $_term->getRatio()*70+75 ?>%;">
+        <?php foreach ($block->getTerms() as $_term): ?>
+            <li id="term-<?= /* @noEscape */ $_term->getId() ?>" class="item">
+                <a href="<?= $block->escapeUrl($block->getSearchUrl($_term)) ?>">
                     <?= $block->escapeHtml($_term->getQueryText()) ?>
                 </a>
             </li>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                "font-size:" . ($_term->getRatio()*70+75) . "%;",
+                'li#term-' . $_term->getId()
+            ) ?>
         <?php endforeach; ?>
     </ul>
-<?php else : ?>
+<?php else: ?>
     <div class="message notice">
         <div><?= $block->escapeHtml(__('There are no search terms available.')) ?></div>
     </div>
diff --git a/app/code/Magento/SendFriend/view/frontend/templates/send.phtml b/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
index eb9318271c1d8..b1e3da8612f78 100644
--- a/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
+++ b/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
@@ -7,7 +7,10 @@
 /**
  * Send to friend form
  */
-/** @var \Magento\SendFriend\Block\Send $block */
+/**
+ * @var \Magento\SendFriend\Block\Send $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 
 ?>
 <script id="add-recipient-tmpl" type="text/x-magento-template">
@@ -21,15 +24,20 @@
     </div>
     <fieldset class="fieldset">
         <div class="field name required">
-            <label for="recipients-name<%- data._index_ %>" class="label"><span><?= $block->escapeHtml(__('Name')) ?></span></label>
+            <label for="recipients-name<%- data._index_ %>" class="label">
+                <span><?= $block->escapeHtml(__('Name')) ?></span>
+            </label>
             <div class="control">
-                <input name="recipients[name][<%- data._index_ %>]" type="text" title="<?= $block->escapeHtmlAttr(__('Name')) ?>" class="input-text"
+                <input name="recipients[name][<%- data._index_ %>]" type="text"
+                       title="<?= $block->escapeHtmlAttr(__('Name')) ?>" class="input-text"
                        id="recipients-name<%- data._index_ %>" data-validate="{required:true}"/>
             </div>
         </div>
 
         <div class="field email required">
-            <label for="recipients-email<%- data._index_ %>" class="label"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
+            <label for="recipients-email<%- data._index_ %>" class="label">
+                <span><?= $block->escapeHtml(__('Email')) ?></span>
+            </label>
             <div class="control">
                 <input name="recipients[email][<%- data._index_ %>]" title="<?= $block->escapeHtmlAttr(__('Email')) ?>"
                        id="recipients-email<%- data._index_ %>" type="email" class="input-text"
@@ -71,7 +79,8 @@
             <label for="sender-email" class="label"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
             <div class="control">
                 <input name="sender[email]" value="<?= $block->escapeHtmlAttr($block->getEmail()) ?>"
-                       title="<?= $block->escapeHtmlAttr(__('Email')) ?>" id="sender-email" type="email" class="input-text"
+                       title="<?= $block->escapeHtmlAttr(__('Email')) ?>" id="sender-email" type="email"
+                       class="input-text"
                        data-mage-init='{"mage/trim-input":{}}'
                        data-validate="{required:true, 'validate-email':true}"/>
             </div>
@@ -91,14 +100,16 @@
         <legend class="legend"><span><?= $block->escapeHtml(__('Invitee')) ?></span></legend>
         <br />
         <div id="recipients-options"></div>
-        <?php if ($block->getMaxRecipients()) : ?>
-            <div id="max-recipient-message" style="display: none;" class="message notice limit" role="alert">
-                <span><?= $block->escapeHtml(__('Maximum %1 email addresses allowed.', $block->getMaxRecipients())) ?></span>
+        <?php if ($block->getMaxRecipients()): ?>
+            <div id="max-recipient-message" class="message notice limit" role="alert">
+                <span><?= $block->escapeHtml(__('Maximum %1 email addresses allowed.', $block->getMaxRecipients())) ?>
+                </span>
             </div>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display: none;", 'div#max-recipient-message') ?>
         <?php endif; ?>
         <div class="actions-toolbar">
             <div class="secondary">
-            <?php if (1 < $block->getMaxRecipients()) : ?>
+            <?php if (1 < $block->getMaxRecipients()): ?>
                 <button type="button" id="add-recipient-button" class="action add">
                     <span><?= $block->escapeHtml(__('Add Invitee')) ?></span></button>
             <?php endif; ?>
@@ -110,7 +121,7 @@
     <div class="actions-toolbar">
         <div class="primary">
             <button type="submit"
-                    class="action submit primary"<?php if (!$block->canSend()) : ?> disabled="disabled"<?php endif ?>>
+                    class="action submit primary"<?php if (!$block->canSend()): ?> disabled="disabled"<?php endif ?>>
                 <span><?= $block->escapeHtml(__('Send Email')) ?></span></button>
         </div>
         <div class="secondary">
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/Create/Form.php b/app/code/Magento/Shipping/Block/Adminhtml/Create/Form.php
index 17efc11856364..4869a685f3064 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/Create/Form.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/Create/Form.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Shipping\Block\Adminhtml\Create;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Tax\Helper\Data as TaxHelper;
+
 /**
  * Adminhtml shipment create form
  *
@@ -13,6 +16,24 @@
  */
 class Form extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
 {
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Framework\Registry $registry
+     * @param \Magento\Sales\Helper\Admin $adminHelper
+     * @param array $data
+     * @param TaxHelper|null $taxHelper
+     */
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Framework\Registry $registry,
+        \Magento\Sales\Helper\Admin $adminHelper,
+        array $data = [],
+        ?TaxHelper $taxHelper = null
+    ) {
+        $data['taxHelper'] = $taxHelper ?? ObjectManager::getInstance()->get(TaxHelper::class);
+        parent::__construct($context, $registry, $adminHelper, $data);
+    }
+
     /**
      * Retrieve invoice order
      *
@@ -44,6 +65,8 @@ public function getShipment()
     }
 
     /**
+     * Prepare layout.
+     *
      * @return \Magento\Framework\View\Element\AbstractBlock
      */
     protected function _prepareLayout()
@@ -53,6 +76,8 @@ protected function _prepareLayout()
     }
 
     /**
+     * Return payment html.
+     *
      * @return string
      */
     public function getPaymentHtml()
@@ -61,6 +86,8 @@ public function getPaymentHtml()
     }
 
     /**
+     * Return items html.
+     *
      * @return string
      */
     public function getItemsHtml()
@@ -69,6 +96,8 @@ public function getItemsHtml()
     }
 
     /**
+     * Generate save url.
+     *
      * @return string
      */
     public function getSaveUrl()
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking/View.php b/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking/View.php
index 55eecfa00d6da..5830160b60791 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking/View.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking/View.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Shipping\Block\Adminhtml\Order\Tracking;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Shipping\Helper\Data as ShippingHelper;
+
 /**
  * Shipment tracking control form
  *
@@ -24,14 +27,17 @@ class View extends \Magento\Shipping\Block\Adminhtml\Order\Tracking
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Shipping\Model\CarrierFactory $carrierFactory
      * @param array $data
+     * @param ShippingHelper|null $shippingHelper
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Shipping\Model\Config $shippingConfig,
         \Magento\Framework\Registry $registry,
         \Magento\Shipping\Model\CarrierFactory $carrierFactory,
-        array $data = []
+        array $data = [],
+        ?ShippingHelper $shippingHelper = null
     ) {
+        $data['shippingHelper'] = $shippingHelper ?? ObjectManager::getInstance()->get(ShippingHelper::class);
         parent::__construct($context, $shippingConfig, $registry, $data);
         $this->_carrierFactory = $carrierFactory;
     }
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/View/Form.php b/app/code/Magento/Shipping/Block/Adminhtml/View/Form.php
index 409797780bcf6..8467a34ed0368 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/View/Form.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/View/Form.php
@@ -11,6 +11,10 @@
  */
 namespace Magento\Shipping\Block\Adminhtml\View;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Shipping\Helper\Data as ShippingHelper;
+use Magento\Tax\Helper\Data as TaxHelper;
+
 /**
  * @api
  * @since 100.0.2
@@ -28,15 +32,21 @@ class Form extends \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
      * @param \Magento\Sales\Helper\Admin $adminHelper
      * @param \Magento\Shipping\Model\CarrierFactory $carrierFactory
      * @param array $data
+     * @param ShippingHelper|null $shippingHelper
+     * @param TaxHelper|null $taxHelper
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Framework\Registry $registry,
         \Magento\Sales\Helper\Admin $adminHelper,
         \Magento\Shipping\Model\CarrierFactory $carrierFactory,
-        array $data = []
+        array $data = [],
+        ?ShippingHelper $shippingHelper = null,
+        ?TaxHelper $taxHelper = null
     ) {
         $this->_carrierFactory = $carrierFactory;
+        $data['shippingHelper'] = $shippingHelper ?? ObjectManager::getInstance()->get(ShippingHelper::class);
+        $data['taxHelper'] = $taxHelper ?? ObjectManager::getInstance()->get(TaxHelper::class);
         parent::__construct($context, $registry, $adminHelper, $data);
     }
 
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml
index d539a44f58a63..7de40943878cf 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml
@@ -3,8 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-//phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-//phpcs:disable Magento2.Files.LineLength.MaxExceeded
+
+/**
+ * @var \Magento\Shipping\Block\Adminhtml\Create\Form $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
+
+/** @var \Magento\Tax\Helper\Data $taxHelper */
+$taxHelper = $block->getData('taxHelper');
 ?>
 <form id="edit_form" method="post" action="<?= $block->escapeUrl($block->getSaveUrl()) ?>">
     <?= $block->getBlockHtml('formkey') ?>
@@ -22,7 +28,9 @@
                 </div>
                 <div class="admin__page-section-item-content">
                     <div><?= $block->getPaymentHtml() ?></div>
-                    <div class="order-payment-currency"><?= $block->escapeHtml(__('The order was placed using %1.', $_order->getOrderCurrencyCode())) ?></div>
+                    <div class="order-payment-currency">
+                        <?= $block->escapeHtml(__('The order was placed using %1.', $_order->getOrderCurrencyCode())) ?>
+                    </div>
                 </div>
             </div>
             <div class="admin__page-section-item order-shipping-address">
@@ -37,15 +45,15 @@
                     <div class="shipping-description-content">
                         <?= $block->escapeHtml(__('Total Shipping Charges')) ?>:
 
-                        <?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayShippingPriceIncludingTax()) : ?>
+                        <?php if ($taxHelper->displayShippingPriceIncludingTax()): ?>
                             <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
-                        <?php else : ?>
+                        <?php else: ?>
                             <?php $_excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
                         <?php endif; ?>
                         <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
                         <?= /** @noEscape */ $_excl ?>
-                        <?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayShippingBothPrices()
-                            && $_incl != $_excl) : ?>
+                        <?php if ($taxHelper->displayShippingBothPrices()
+                            && $_incl != $_excl): ?>
                         (<?= $block->escapeHtml(__('Incl. Tax')) ?> <?= /** @noEscape */ $_incl ?>)
                         <?php endif; ?>
                     </div>
@@ -59,7 +67,8 @@
         <?= $block->getItemsHtml() ?>
     </div>
 </form>
-<script>
+<?php $scriptString = <<<script
+
 require([
     "jquery",
     "mage/mage",
@@ -68,5 +77,8 @@ require([
     jQuery('#edit_form').mage('form').mage('validation');
 
 });
-</script>
+
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <?= $block->getChildHtml('shipment_packaging');
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml
index ddb5dde5dfac7..54d7aaec21f9b 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml
@@ -3,8 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-//phpcs:disable Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace
-//phpcs:disable Squiz.WhiteSpace.ScopeClosingBrace.ContentBefore
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
 <section class="admin__page-section">
@@ -17,17 +17,17 @@
                 <tr class="headings">
                     <th class="col-product"><span><?= $block->escapeHtml(__('Product')) ?></span></th>
                     <th class="col-ordered-qty"><span><?= $block->escapeHtml(__('Qty')) ?></span></th>
-                    <th class="col-qty<?php if ($block->isShipmentRegular()) : ?> last<?php endif; ?>">
+                    <th class="col-qty<?php if ($block->isShipmentRegular()): ?> last<?php endif; ?>">
                         <span><?= $block->escapeHtml(__('Qty to Ship')) ?></span>
                     </th>
-                    <?php if (!$block->canShipPartiallyItem()) : ?>
+                    <?php if (!$block->canShipPartiallyItem()): ?>
                     <th class="col-ship last"><span><?= $block->escapeHtml(__('Ship')) ?></span></th>
                     <?php endif; ?>
                 </tr>
             </thead>
             <?php $_items = $block->getShipment()->getAllItems() ?>
-            <?php $_i = 0; foreach ($_items as $_item) :
-                if ($_item->getOrderItem()->getParentItem()) :
+            <?php $_i = 0; foreach ($_items as $_item):
+                if ($_item->getOrderItem()->getParentItem()):
                     continue;
                 endif;
                 $_i++ ?>
@@ -70,14 +70,18 @@
             <span class="title"><?= $block->escapeHtml(__('Shipment Options')) ?></span>
         </div>
         <div class="admin__page-section-item-content">
-            <?php if ($block->canCreateShippingLabel()) : ?>
+            <?php if ($block->canCreateShippingLabel()): ?>
                 <div class="field choice admin__field admin__field-option field-create">
                     <input id="create_shipping_label"
                            class="admin__control-checkbox"
                            name="shipment[create_shipping_label]"
                            value="1"
-                           type="checkbox"
-                           onclick="toggleCreateLabelCheckbox();"/>
+                           type="checkbox"/>
+                    <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                        'onclick',
+                        'toggleCreateLabelCheckbox();',
+                        'input#create_shipping_label'
+                    ) ?>
                     <label class="admin__field-label"
                            for="create_shipping_label">
                         <span><?= $block->escapeHtml(__('Create Shipping Label')) ?></span></label>
@@ -95,7 +99,7 @@
                     <span><?=$block->escapeHtml(__('Append Comments')) ?></span></label>
             </div>
 
-            <?php if ($block->canSendShipmentEmail()) : ?>
+            <?php if ($block->canSendShipmentEmail()): ?>
                 <div class="field choice admin__field admin__field-option field-email">
                     <input id="send_email"
                            class="admin__control-checkbox"
@@ -115,7 +119,8 @@
         </div>
     </div>
 </section>
-<script>
+<?php $scriptString = <<<script
+
 require([
     "jquery",
     "Magento_Ui/js/modal/alert",
@@ -150,7 +155,7 @@ window.toggleCreateLabelCheckbox = function() {
 window.submitShipment = function(btn) {
     if (!validQtyItems()) {
         alert({
-            content: '<?= $block->escapeJs($block->escapeHtml(__('Invalid value(s) for Qty to Ship'))) ?>'
+            content: '{$block->escapeJs(__('Invalid value(s) for Qty to Ship'))}'
         });
         return;
     }
@@ -186,4 +191,7 @@ window.sendEmailCheckbox = sendEmailCheckbox;
 //]]>
 
 });
-</script>
+
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
index 22d546f4fb474..4ed817ddd7e0f 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
@@ -3,10 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-//phpcs:disable Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace
-//phpcs:disable Squiz.WhiteSpace.ScopeClosingBrace.ContentBefore
-//phpcs:disable Squiz.Operators.IncrementDecrementUsage.NotAllowed
 //phpcs:disable Squiz.PHP.NonExecutableCode.Unreachable
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <div class="grid">
     <?php $randomId = rand(); ?>
@@ -18,24 +16,31 @@
                         <label class="data-grid-checkbox-cell-inner">
                             <input type="checkbox"
                                    id="select-items-<?= /* @noEscape */ $randomId ?>"
-                                   onchange="packaging.checkAllItems(this);"
                                    class="checkbox admin__control-checkbox"
                                    title="<?= $block->escapeHtmlAttr(__('Select All')) ?>">
+                            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                                'onchange',
+                                'packaging.checkAllItems(this);',
+                                'input#select-items-' . /* @noEscape */ $randomId
+                            ) ?>
                             <label for="select-items-<?= /* @noEscape */ $randomId ?>"></label>
                         </label>
                     </th>
                     <th class="data-grid-th"><?= $block->escapeHtml(__('Product Name')) ?></th>
                     <th class="data-grid-th"><?= $block->escapeHtml(__('Weight')) ?></th>
-                    <th class="data-grid-th" <?= $block->displayCustomsValue() ? '' : 'style="display: none;"' ?>>
+                    <th class="data-grid-th custom-value">
                         <?= $block->escapeHtml(__('Customs Value')) ?>
                     </th>
+                    <?php if (!$block->displayCustomsValue()): ?>
+                        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display: none;', 'th.custom-value') ?>
+                    <?php endif ?>
                     <th class="data-grid-th"><?= $block->escapeHtml(__('Qty Ordered')) ?></th>
                     <th class="data-grid-th"><?= $block->escapeHtml(__('Qty')) ?></th>
                 </tr>
             </thead>
             <tbody>
             <?php $i=0; ?>
-            <?php foreach ($block->getCollection() as $item) : ?>
+            <?php foreach ($block->getCollection() as $item): ?>
                 <?php
                     $_order = $block->getShipment()->getOrder();
                     $_orderItem = $_order->getItemById($item->getOrderItemId());
@@ -44,7 +49,7 @@
                     || ($_orderItem->isShipSeparately()
                         && !($_orderItem->getParentItemId() || $_orderItem->getParentItem()))
                     || (!$_orderItem->isShipSeparately()
-                        && ($_orderItem->getParentItemId() || $_orderItem->getParentItem()))) : ?>
+                        && ($_orderItem->getParentItemId() || $_orderItem->getParentItem()))): ?>
                     <?php continue; ?>
                 <?php endif; ?>
                 <tr class="data-grid-controls-row data-row <?= ($i++ % 2 != 0) ? '_odd-row' : '' ?>">
@@ -67,22 +72,25 @@
                     </td>
                     <?php
                     if ($block->displayCustomsValue()) {
-                        $customsValueDisplay = '';
                         $customsValueValidation = ' validate-zero-or-greater ';
                     } else {
-                        $customsValueDisplay = ' style="display: none;" ';
                         $customsValueValidation = '';
                     }
 
                     ?>
-                    <td <?= /* @noEscape */ $customsValueDisplay ?>>
+                    <td class="custom-value">
                         <input type="text"
                                name="customs_value"
                                class="input-text admin__control-text <?= /* @noEscape */ $customsValueValidation ?>"
                                value="<?= $block->escapeHtmlAttr($block->formatPrice($item->getPrice())) ?>"
-                               size="10"
-                               onblur="packaging.recalcContainerWeightAndCustomsValue(this);">
+                               size="10">
                     </td>
+                    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display: none;', 'td.custom-value') ?>
+                    <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                        'onblur',
+                        'packaging.recalcContainerWeightAndCustomsValue(this);',
+                        'td.custom-value'
+                    ) ?>
                     <td>
                         <?= /* @noEscape */ $item->getOrderItem()->getQtyOrdered()*1 ?>
                     </td>
@@ -92,16 +100,20 @@
                                name="qty"
                                value="<?= /* @noEscape */ $item->getQty()*1 ?>"
                                class="input-text admin__control-text qty
-                            <?php if ($item->getOrderItem()->getIsQtyDecimal()) : ?>
+                            <?php if ($item->getOrderItem()->getIsQtyDecimal()): ?>
                                qty-decimal
                             <?php endif ?>">&nbsp;
                         <button type="button"
                                 class="action-delete"
-                                data-action="package-delete-item"
-                                onclick="packaging.deleteItem(this);"
-                                style="display:none;">
+                                data-action="package-delete-item">
                             <span><?= $block->escapeHtml(__('Delete')) ?></span>
                         </button>
+                        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display:none', 'button.action-delete') ?>
+                        <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                            'onclick',
+                            'packaging.deleteItem(this);',
+                            'button.action-delete'
+                        ) ?>
                     </td>
                 </tr>
             <?php endforeach; ?>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/packed.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/packed.phtml
index 8d47f533449a7..90ecfa3862000 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/packed.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/packed.phtml
@@ -3,12 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-//phpcs:disable Magento2.Files.LineLength.MaxExceeded
-//phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+
+/** @var \Magento\Shipping\Helper\Carrier $carrierHelper */
+$carrierHelper = $block->getData('carrierHelper');
 ?>
 
 <div id="packed_window">
-<?php foreach ($block->getPackages() as $packageId => $package) : ?>
+<?php foreach ($block->getPackages() as $packageId => $package): ?>
     <?php $package = new \Magento\Framework\DataObject($package) ?>
     <?php $params = new \Magento\Framework\DataObject($package->getParams()) ?>
     <section class="admin__page-section">
@@ -27,15 +30,18 @@
                                 </td>
                             </tr>
                             <tr>
-                            <?php if ($block->displayCustomsValue()) : ?>
+                            <?php if ($block->displayCustomsValue()): ?>
                                 <th><?= $block->escapeHtml(__('Customs Value')) ?></th>
-                                <td><?= $block->escapeHtml($block->displayCustomsPrice($params->getCustomsValue())) ?></td>
-                            <?php else : ?>
+                                <td><?= $block->escapeHtml($block->displayCustomsPrice($params->getCustomsValue())) ?>
+                                </td>
+                            <?php else: ?>
                                 <th><?= $block->escapeHtml(__('Total Weight')) ?></th>
-                                <td><?= $block->escapeHtml($params->getWeight() . ' ' . $this->helper(Magento\Shipping\Helper\Carrier::class)->getMeasureWeightName($params->getWeightUnits())) ?></td>
+                                <td><?= $block->escapeHtml($params->getWeight() . ' ' .
+                                        $carrierHelper->getMeasureWeightName($params->getWeightUnits())) ?>
+                                </td>
                             <?php endif; ?>
                             </tr>
-                        <?php if ($params->getSize()) : ?>
+                        <?php if ($params->getSize()): ?>
                             <tr>
                                 <th><?= $block->escapeHtml(__('Size')) ?></th>
                                 <td><?= $block->escapeHtml(ucfirst(strtolower($params->getSize()))) ?></td>
@@ -50,9 +56,10 @@
                             <tr>
                                 <th><?= $block->escapeHtml(__('Length')) ?></th>
                                 <td>
-                                <?php if ($params->getLength() != null) : ?>
-                                    <?= $block->escapeHtml($params->getLength() . ' ' . $this->helper(Magento\Shipping\Helper\Carrier::class)->getMeasureDimensionName($params->getDimensionUnits())) ?>
-                                <?php else : ?>
+                                <?php if ($params->getLength() != null): ?>
+                                    <?= $block->escapeHtml($params->getLength() . ' ' .
+                                        $carrierHelper->getMeasureDimensionName($params->getDimensionUnits())) ?>
+                                <?php else: ?>
                                     --
                                 <?php endif; ?>
                                 </td>
@@ -60,9 +67,10 @@
                             <tr>
                                 <th><?= $block->escapeHtml(__('Width')) ?></th>
                                 <td>
-                                <?php if ($params->getWidth() != null) : ?>
-                                    <?= $block->escapeHtml($params->getWidth() . ' ' . $this->helper(Magento\Shipping\Helper\Carrier::class)->getMeasureDimensionName($params->getDimensionUnits())) ?>
-                                <?php else : ?>
+                                <?php if ($params->getWidth() != null): ?>
+                                    <?= $block->escapeHtml($params->getWidth() . ' ' .
+                                        $carrierHelper->getMeasureDimensionName($params->getDimensionUnits())) ?>
+                                <?php else: ?>
                                     --
                                 <?php endif; ?>
                                 </td>
@@ -70,9 +78,10 @@
                             <tr>
                                 <th><?= $block->escapeHtml(__('Height')) ?></th>
                                 <td>
-                                <?php if ($params->getHeight() != null) : ?>
-                                    <?= $block->escapeHtml($params->getHeight() . ' ' . $this->helper(Magento\Shipping\Helper\Carrier::class)->getMeasureDimensionName($params->getDimensionUnits())) ?>
-                                <?php else : ?>
+                                <?php if ($params->getHeight() != null): ?>
+                                    <?= $block->escapeHtml($params->getHeight() . ' ' .
+                                        $carrierHelper->getMeasureDimensionName($params->getDimensionUnits())) ?>
+                                <?php else: ?>
                                     --
                                 <?php endif; ?>
                                 </td>
@@ -83,26 +92,33 @@
                 <div class="col-m-4">
                     <table class="admin__table-secondary">
                         <tbody>
-                        <?php if ($params->getDeliveryConfirmation() != null) : ?>
+                        <?php if ($params->getDeliveryConfirmation() != null): ?>
                             <tr>
                                 <th><?= $block->escapeHtml(__('Signature Confirmation')) ?></th>
-                                <td><?= $block->escapeHtml($block->getDeliveryConfirmationTypeByCode($params->getDeliveryConfirmation())) ?></td>
+                                <td>
+                                    <?= $block->escapeHtml(
+                                        $block->getDeliveryConfirmationTypeByCode($params->getDeliveryConfirmation())
+                                    ) ?></td>
                             </tr>
                         <?php endif; ?>
-                        <?php if ($params->getContentType() != null) : ?>
+                        <?php if ($params->getContentType() != null): ?>
                             <tr>
                                 <th><?= $block->escapeHtml(__('Contents')) ?></th>
-                                <?php if ($params->getContentType() == 'OTHER') : ?>
+                                <?php if ($params->getContentType() == 'OTHER'): ?>
                                     <td><?= $block->escapeHtml($params->getContentTypeOther()) ?></td>
-                                <?php else : ?>
-                                    <td><?= $block->escapeHtml($block->getContentTypeByCode($params->getContentType())) ?></td>
+                                <?php else: ?>
+                                    <td>
+                                        <?= $block->escapeHtml($block->getContentTypeByCode($params->getContentType()))
+                                        ?></td>
                                 <?php endif; ?>
                             </tr>
                         <?php endif; ?>
-                        <?php if ($params->getGirth()) : ?>
+                        <?php if ($params->getGirth()): ?>
                             <tr>
                                 <th><?= $block->escapeHtml(__('Girth')) ?></th>
-                                <td><?= $block->escapeHtml($params->getGirth() . ' ' . $this->helper(Magento\Shipping\Helper\Carrier::class)->getMeasureDimensionName($params->getGirthDimensionUnits())) ?></td>
+                                <td><?= $block->escapeHtml($params->getGirth() . ' ' .
+                                        $carrierHelper->getMeasureDimensionName($params->getGirthDimensionUnits())) ?>
+                                </td>
                             </tr>
                         <?php endif; ?>
                         </tbody>
@@ -119,7 +135,7 @@
                 <tr class="headings">
                     <th class="col-product"><span><?= $block->escapeHtml(__('Product')) ?></span></th>
                     <th class="col-weight"><span><?= $block->escapeHtml(__('Weight')) ?></span></th>
-                    <?php if ($block->displayCustomsValue()) : ?>
+                    <?php if ($block->displayCustomsValue()): ?>
                         <th class="col-custom"><span><?= $block->escapeHtml(__('Customs Value')) ?></span></th>
                     <?php endif; ?>
                     <th class="col-qty"><span><?= $block->escapeHtml(__('Qty Ordered')) ?></span></th>
@@ -127,7 +143,7 @@
                 </tr>
                 </thead>
                 <tbody id="">
-                <?php foreach ($package->getItems() as $itemId => $item) : ?>
+                <?php foreach ($package->getItems() as $itemId => $item): ?>
                     <?php $item = new \Magento\Framework\DataObject($item) ?>
                     <tr title="#" id="">
                         <td class="col-product">
@@ -136,7 +152,7 @@
                         <td class="col-weight">
                             <?= $block->escapeHtml($item->getWeight()) ?>
                         </td>
-                        <?php if ($block->displayCustomsValue()) : ?>
+                        <?php if ($block->displayCustomsValue()): ?>
                             <td class="col-custom">
                                 <?= $block->escapeHtml($block->displayCustomsPrice($item->getCustomsValue())) ?>
                             </td>
@@ -155,11 +171,15 @@
     </section>
 <?php endforeach; ?>
 </div>
-<script>
+<?php $scriptString = <<<script
+
     function showPackedWindow() {
         jQuery('#packed_window').modal('openModal');
     }
-</script>
+
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 
 <script type="text/x-magento-init">
     {
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..206deb0f5c795 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
@@ -5,14 +5,20 @@
  */
 //phpcs:disable PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket
 //phpcs:disable Magento2.Security.IncludeFile.FoundIncludeFile
+
+/**
+ * @var $block \Magento\Shipping\Block\Adminhtml\Order\Packaging
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
-<?php /** @var $block \Magento\Shipping\Block\Adminhtml\Order\Packaging */ ?>
 <?php
 $shippingMethod = $block->getShipment()->getOrder()->getShippingMethod();
 $sizeSource = $block->getSourceSizeModel()->toOptionArray();
 $girthEnabled = $block->isDisplayGirthValue() && $block->isGirthAllowed() ? 1 : 0;
 ?>
-<script>
+
+<?php $scriptString = <<<script
+
     require([
         "jquery",
         "prototype",
@@ -20,21 +26,21 @@ $girthEnabled = $block->isDisplayGirthValue() && $block->isGirthAllowed() ? 1 :
         "Magento_Ui/js/modal/modal"
     ], function(jQuery){
 
-        window.packaging = new Packaging(<?= /* @noEscape */ $block->getConfigDataJson() ?>);
+        window.packaging = new Packaging({$block->getConfigDataJson()});
         packaging.changeContainerType($$('select[name=package_container]')[0]);
         packaging.checkSizeAndGirthParameter(
-            $$('select[name=package_container]')[0],
-            <?= /* @noEscape */ $girthEnabled ?>
+            \$$('select[name=package_container]')[0],
+            {$girthEnabled}
         );
         packaging.setConfirmPackagingCallback(function(){
             packaging.setParamsCreateLabelRequest($('edit_form').serialize(true));
             packaging.sendCreateLabelRequest();
         });
         packaging.setLabelCreatedCallback(function(response){
-            setLocation("<?= $block->escapeJs($block->escapeUrl($block->getUrl(
+            setLocation("{$block->escapeJs($block->getUrl(
                 'sales/order/view',
                 ['order_id' => $block->getShipment()->getOrderId()]
-            ))); ?>");
+            ))}");
         });
         packaging.setCancelCallback(function() {
             if ($('create_shipping_label')) {
@@ -51,23 +57,23 @@ $girthEnabled = $block->isDisplayGirthValue() && $block->isGirthAllowed() ? 1 :
         });
         jQuery('#packaging_window').modal({
             type: 'slide',
-            title: '<?= $block->escapeJs($block->escapeHtml(__('Create Packages'))) ?>',
+            title: '{$block->escapeJs(__('Create Packages'))}',
             buttons: [{
-                text: '<?= $block->escapeJs($block->escapeHtml(__('Cancel'))) ?>',
+                text: '{$block->escapeJs(__('Cancel'))}',
                 'class': 'action-secondary',
                 click: function () {
                     packaging.cancelPackaging();
                     this.closeModal();
                     }
                 }, {
-                text: '<?= $block->escapeJs($block->escapeHtml(__('Save'))) ?>',
+                text: '{$block->escapeJs(__('Save'))}',
                 'attr': {'disabled':'disabled', 'data-action':'save-packages'},
                 'class': 'action-primary _disabled',
                 click: function () {
                     packaging.confirmPackaging();
                     }
                 }, {
-                    text: '<?= $block->escapeJs($block->escapeHtml(__('Add Package'))) ?>',
+                    text: '{$block->escapeJs(__('Add Package'))}',
                     'attr': {'data-action':'add-packages'},
                     'class': 'action-secondary',
                     click: function () {
@@ -78,5 +84,8 @@ $girthEnabled = $block->isDisplayGirthValue() && $block->isGirthAllowed() ? 1 :
         jQuery(document).trigger('packaging:inited');
         jQuery(document).data('packagingInited', true);
     });
-</script>
-<?php include ($block->getTemplateFile('Magento_Shipping::order/packaging/popup_content.phtml')) ?>
+
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
+<?php include($block->getTemplateFile('Magento_Shipping::order/packaging/popup_content.phtml')) ?>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup_content.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup_content.phtml
index f91741f439d46..0093c46d211fe 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup_content.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup_content.phtml
@@ -3,12 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-//phpcs:disable Magento2.Files.LineLength.MaxExceeded
+
+/**
+ * @var $block \Magento\Shipping\Block\Adminhtml\Order\Packaging
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
-<?php /** @var $block \Magento\Shipping\Block\Adminhtml\Order\Packaging */ ?>
 <div id="packaging_window">
-    <div class="message message-warning" style="display: none"></div>
-    <section class="admin__page-section" id="package_template" style="display:none;">
+    <div class="message message-warning"></div>
+    <section class="admin__page-section" id="package_template">
         <div class="admin__page-section-title">
             <span class="title">
                 <?= $block->escapeHtml(__('Package')) ?> <span data-role="package-number"></span>
@@ -16,16 +19,24 @@
             <div class="actions _primary">
                 <button type="button"
                         class="action-secondary"
-                        data-action="package-save-items"
-                        onclick="packaging.packItems(this);">
+                        data-action="package-save-items">
                     <span><?= $block->escapeHtml(__('Add Selected Product(s) to Package')) ?></span>
                 </button>
+                <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                    'onclick',
+                    'packaging.packItems(this);',
+                    "button[data-action='package-save-items']"
+                ) ?>
                 <button type="button"
                         class="action-secondary"
-                        data-action="package-add-items"
-                        onclick="packaging.getItemsForPack(this);">
+                        data-action="package-add-items">
                     <span><?= $block->escapeHtml(__('Add Products to Package')) ?></span>
                 </button>
+                <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                    'onclick',
+                    'packaging.getItemsForPack(this);',
+                    "button[data-action='package-add-items']"
+                ) ?>
             </div>
         </div>
         <div class="admin__control-table-wrapper admin__page-subsection">
@@ -33,56 +44,70 @@
                 <thead>
                     <tr>
                         <th class="col-type"><?= $block->escapeHtml(__('Type')) ?></th>
-                        <?php if ($girthEnabled == 1) : ?>
+                        <?php if ($girthEnabled == 1): ?>
                         <th class="col-size"><?= $block->escapeHtml(__('Size')) ?></th>
                         <th class="col-girth"><?= $block->escapeHtml(__('Girth')) ?></th>
                         <th>&nbsp;</th>
                         <?php endif; ?>
-                        <th class="col-custom" <?= $block->displayCustomsValue() ? '' : 'style="display: none;"' ?>>
+                        <th class="col-custom">
                             <?= $block->escapeHtml(__('Customs Value')) ?>
                         </th>
+                        <?php if (!$block->displayCustomsValue()): ?>
+                            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display: none', 'th.col-custom') ?>
+                        <?php endif ?>
                         <th class="col-total-weight"><?= $block->escapeHtml(__('Total Weight')) ?></th>
                         <th class="col-length"><?= $block->escapeHtml(__('Length')) ?></th>
                         <th class="col-width"><?= $block->escapeHtml(__('Width')) ?></th>
                         <th class="col-height"><?= $block->escapeHtml(__('Height')) ?></th>
                         <th>&nbsp;</th>
-                        <?php if ($block->getDeliveryConfirmationTypes()) : ?>
+                        <?php if ($block->getDeliveryConfirmationTypes()): ?>
                         <th class="col-signature"><?= $block->escapeHtml(__('Signature Confirmation')) ?></th>
                         <?php endif; ?>
                         <th class="col-actions">&nbsp;</th>
                     </tr>
                 </thead>
+
                 <tbody>
                     <tr>
                         <td class="col-type">
                             <?php $containers = $block->getContainers(); ?>
                             <select name="package_container"
-                                    onchange="packaging.changeContainerType(this);packaging.checkSizeAndGirthParameter(this, <?= $block->escapeJs($girthEnabled) ?>);"
-                                    <?php if (empty($containers)) : ?>
-                                        title="<?= $block->escapeHtmlAttr(__('USPS domestic shipments don\'t use package types.')) ?>"
+                                    <?php if (empty($containers)): ?>
+                                        title="<?= $block->escapeHtmlAttr(__(
+                                            'USPS domestic shipments don\'t use package types.'
+                                        )) ?>"
                                         disabled=""
                                         class="admin__control-select disabled"
-                                    <?php else : ?>
+                                    <?php else: ?>
                                         class="admin__control-select"
                                     <?php endif; ?>>
-                                <?php foreach ($containers as $key => $value) : ?>
+                                <?php foreach ($containers as $key => $value): ?>
                                     <option value="<?= $block->escapeHtmlAttr($key) ?>" >
                                         <?= $block->escapeHtml($value) ?>
                                     </option>
                                 <?php endforeach; ?>
                             </select>
+                            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                                'onchange',
+                                "packaging.changeContainerType(this);
+                                packaging.checkSizeAndGirthParameter(this, {$block->escapeJs($girthEnabled)});",
+                                "select[name='package_container']"
+                            ) ?>
                         </td>
-                        <?php if ($girthEnabled == 1 && !empty($sizeSource)) : ?>
+                        <?php if ($girthEnabled == 1 && !empty($sizeSource)): ?>
                         <td>
-                            <select name="package_size"
-                                    class="admin__control-select"
-                                    onchange="packaging.checkSizeAndGirthParameter(this, <?= $block->escapeJs($girthEnabled) ?>);">
-                                <?php foreach ($sizeSource as $key => $value) : ?>
+                            <select name="package_size" class="admin__control-select">
+                                <?php foreach ($sizeSource as $key => $value): ?>
                                 <option value="<?= $block->escapeHtmlAttr($sizeSource[$key]['value']) ?>">
                                     <?= $block->escapeHtml($sizeSource[$key]['label']) ?>
                                 </option>
                                 <?php endforeach; ?>
                             </select>
+                            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                                'onchange',
+                                "packaging.checkSizeAndGirthParameter(this, {$block->escapeJs($girthEnabled)});",
+                                "select[name='package_size']"
+                            ) ?>
                         </td>
                         <td>
                             <input type="text"
@@ -91,26 +116,33 @@
                         </td>
                         <td>
                             <select name="container_girth_dimension_units"
-                                    class="options-units-dimensions measures admin__control-select"
-                                    onchange="packaging.changeMeasures(this);">
-                                <option value="<?= /* @noEscape */ Zend_Measure_Length::INCH ?>" selected="selected" ><?= $block->escapeHtml(__('in')) ?></option>
-                                <option value="<?= /* @noEscape */ Zend_Measure_Length::CENTIMETER ?>" ><?= $block->escapeHtml(__('cm')) ?></option>
+                                    class="options-units-dimensions measures admin__control-select">
+                                <option value="<?= /* @noEscape */ Zend_Measure_Length::INCH ?>" selected="selected" >
+                                    <?= $block->escapeHtml(__('in')) ?>
+                                </option>
+                                <option value="<?= /* @noEscape */ Zend_Measure_Length::CENTIMETER ?>" >
+                                    <?= $block->escapeHtml(__('cm')) ?>
+                                </option>
                             </select>
+                            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                                'onchange',
+                                "packaging.changeMeasures(this);",
+                                "select[name='container_girth_dimension_units']"
+                            ) ?>
                         </td>
                         <?php endif; ?>
                         <?php
                         if ($block->displayCustomsValue()) {
-                            $customsValueDisplay = '';
                             $customsValueValidation = ' validate-zero-or-greater ';
                         } else {
-                            $customsValueDisplay = ' style="display: none;" ';
                             $customsValueValidation = '';
                         }
                         ?>
-                        <td class="col-custom" <?= /* @noEscape */ $customsValueDisplay ?>>
+                        <td class="col-custom">
                             <div class="admin__control-addon">
                                 <input type="text"
-                                       class="customs-value input-text admin__control-text <?= /* @noEscape */ $customsValueValidation ?>"
+                                       class="customs-value input-text admin__control-text <?=
+                                       /* @noEscape */ $customsValueValidation ?>"
                                        name="package_customs_value" />
                                 <span class="admin__addon-suffix">
                                     <span class="customs-value-currency">
@@ -119,17 +151,29 @@
                                 </span>
                             </div>
                         </td>
+                        <?php if (!$block->displayCustomsValue()): ?>
+                            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display: none', 'td.col-custom') ?>
+                        <?php endif ?>
                         <td class="col-total-weight">
                             <div class="admin__control-addon">
                             <input type="text"
-                                   class="options-weight input-text admin__control-text required-entry validate-greater-than-zero"
+                                   class="options-weight input-text admin__control-text required-entry
+                                    validate-greater-than-zero"
                                    name="container_weight" />
                                     <select name="container_weight_units"
-                                            class="options-units-weight measures admin__control-select"
-                                            onchange="packaging.changeMeasures(this);">
-                                        <option value="<?= /* @noEscape */ Zend_Measure_Weight::POUND ?>" selected="selected"  ><?= $block->escapeHtml(__('lb')) ?></option>
-                                        <option value="<?= /* @noEscape */ Zend_Measure_Weight::KILOGRAM ?>" ><?= $block->escapeHtml(__('kg')) ?></option>
+                                            class="options-units-weight measures admin__control-select">
+                                        <option value="<?= /* @noEscape */ Zend_Measure_Weight::POUND
+                                        ?>" selected="selected"  ><?= $block->escapeHtml(__('lb')) ?>
+                                        </option>
+                                        <option value="<?= /* @noEscape */ Zend_Measure_Weight::KILOGRAM ?>" >
+                                            <?= $block->escapeHtml(__('kg')) ?>
+                                        </option>
                                     </select>
+                                    <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                                        'onchange',
+                                        "packaging.changeMeasures(this);",
+                                        "select[name='container_weight_units']"
+                                    ) ?>
                                 <span class="admin__addon-prefix"></span>
                             </div>
                         </td>
@@ -150,16 +194,24 @@
                         </td>
                         <td class="col-measure">
                             <select name="container_dimension_units"
-                                    class="options-units-dimensions measures admin__control-select"
-                                    onchange="packaging.changeMeasures(this);">
-                                <option value="<?= /* @noEscape */ Zend_Measure_Length::INCH ?>" selected="selected" ><?= $block->escapeHtml(__('in')) ?></option>
-                                <option value="<?= /* @noEscape */ Zend_Measure_Length::CENTIMETER ?>" ><?= $block->escapeHtml(__('cm')) ?></option>
+                                    class="options-units-dimensions measures admin__control-select">
+                                <option value="<?= /* @noEscape */ Zend_Measure_Length::INCH ?>" selected="selected" >
+                                    <?= $block->escapeHtml(__('in')) ?>
+                                </option>
+                                <option value="<?= /* @noEscape */ Zend_Measure_Length::CENTIMETER ?>" >
+                                    <?= $block->escapeHtml(__('cm')) ?>
+                                </option>
                             </select>
+                            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                                'onchange',
+                                "packaging.changeMeasures(this);",
+                                "select[name='container_dimension_units']"
+                            ) ?>
                         </td>
-                        <?php if ($block->getDeliveryConfirmationTypes()) : ?>
+                        <?php if ($block->getDeliveryConfirmationTypes()): ?>
                         <td>
                             <select name="delivery_confirmation_types" class="admin__control-select">
-                                <?php foreach ($block->getDeliveryConfirmationTypes() as $key => $value) : ?>
+                                <?php foreach ($block->getDeliveryConfirmationTypes() as $key => $value): ?>
                                 <option value="<?= $block->escapeHtmlAttr($key) ?>" >
                                     <?= $block->escapeHtml($value) ?>
                                 </option>
@@ -169,15 +221,19 @@
                         <?php endif; ?>
                         <td class="col-actions">
                             <button type="button"
-                                    class="action-delete DeletePackageBtn"
-                                    onclick="packaging.deletePackage(this);">
+                                    class="action-delete DeletePackageBtn">
                                 <span><?= $block->escapeHtml(__('Delete Package')) ?></span>
                             </button>
+                            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                                'onclick',
+                                'packaging.deletePackage(this);',
+                                "button.action-delete.DeletePackageBtn"
+                            ) ?>
                         </td>
                     </tr>
                 </tbody>
             </table>
-            <?php if ($block->getContentTypes()) : ?>
+            <?php if ($block->getContentTypes()): ?>
                 <table class="data-table admin__control-table" cellspacing="0">
                     <thead>
                         <tr>
@@ -189,14 +245,18 @@
                     <tr>
                         <td>
                             <select name="content_type"
-                                    class="admin__control-select"
-                                    onchange="packaging.changeContentTypes(this);">
-                                <?php foreach ($block->getContentTypes() as $key => $value) : ?>
+                                    class="admin__control-select">
+                                <?php foreach ($block->getContentTypes() as $key => $value): ?>
                                     <option value="<?= $block->escapeHtmlAttr($key) ?>" >
                                         <?= $block->escapeHtml($value) ?>
                                     </option>
                                 <?php endforeach; ?>
                             </select>
+                            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                                'onchange',
+                                "packaging.changeContentTypes(this);",
+                                "select[name='content_type']"
+                            ) ?>
                         </td>
                         <td>
                             <input name="content_type_other"
@@ -213,5 +273,10 @@
             <div class="grid_prepare admin__page-subsection"></div>
         </div>
     </section>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display:none;", 'div#package_template') ?>
     <div id="packages_content"></div>
 </div>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    "display:none;",
+    'div#packaging_window div.message message-warning'
+) ?>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking.phtml
index d65fa819eaeed..1dcc7439532b6 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking.phtml
@@ -4,8 +4,14 @@
  * See COPYING.txt for license details.
  */
 ?>
-<?php /** @var $block Magento\Shipping\Block\Adminhtml\Order\Tracking */?>
-<script>
+<?php
+/**
+ * @var $block Magento\Shipping\Block\Adminhtml\Order\Tracking
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
+?>
+<?php $scriptString = <<<script
+
 require(['prototype'], function(){
 
     //<![CDATA[
@@ -57,7 +63,11 @@ require(['prototype'], function(){
     //]]>
 
 });
-</script>
+
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
+
 <script id="track_row_template" type="text/x-magento-template">
     <tr>
         <td class="col-carrier">
@@ -65,7 +75,7 @@ require(['prototype'], function(){
                     id="trackingC<%- data.index %>"
                     class="select admin__control-select carrier"
                     disabled="disabled">
-                <?php foreach ($block->getCarriers() as $_code => $_name) : ?>
+                <?php foreach ($block->getCarriers() as $_code => $_name): ?>
                     <option value="<?= $block->escapeHtmlAttr($_code) ?>"><?= $block->escapeHtml($_name) ?></option>
                 <?php endforeach; ?>
             </select>
@@ -116,7 +126,8 @@ require(['prototype'], function(){
         </tbody>
     </table>
 </div>
-<script>
+<?php $scriptString = <<<script
+
 require([
     'mage/template',
     'prototype'
@@ -127,4 +138,7 @@ require([
     //]]>
 
 });
-</script>
+
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking/view.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking/view.phtml
index a013abfd65f87..d2eb927fd8278 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking/view.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking/view.phtml
@@ -3,11 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-//phpcs:disable Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace
-//phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-//phpcs:disable Magento2.Files.LineLength.MaxExceeded
+
+/**
+ * @var $block Magento\Shipping\Block\Adminhtml\Order\Tracking\View
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
+
+/** @var \Magento\Shipping\Helper\Data $shippingHelper */
+$shippingHelper = $block->getData('shippingHelper');
 ?>
-<?php /** @var $block Magento\Shipping\Block\Adminhtml\Order\Tracking\View */ ?>
 <div class="admin__control-table-wrapper">
     <form id="tracking-shipping-form" data-mage-init='{"validation": {}}'>
         <table class="data-table admin__control-table" id="shipment_tracking_info">
@@ -22,13 +26,17 @@
             <tfoot>
                 <tr>
                     <td class="col-carrier">
-                        <select name="carrier"
-                                class="select admin__control-select"
-                                onchange="selectCarrier(this)">
-                            <?php foreach ($block->getCarriers() as $_code => $_name) : ?>
-                            <option value="<?= $block->escapeHtmlAttr($_code) ?>"><?= $block->escapeHtml($_name) ?></option>
+                        <select name="carrier" class="select admin__control-select">
+                            <?php foreach ($block->getCarriers() as $_code => $_name): ?>
+                            <option value="<?= $block->escapeHtmlAttr($_code) ?>">
+                                <?= $block->escapeHtml($_name) ?></option>
                             <?php endforeach; ?>
                         </select>
+                        <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                            'onchange',
+                            'selectCarrier(this)',
+                            "select[name='carrier']"
+                        ) ?>
                     </td>
                     <td class="col-title">
                         <input class="input-text admin__control-text"
@@ -47,23 +55,41 @@
                     <td class="col-delete last"><?= $block->getSaveButtonHtml() ?></td>
                 </tr>
             </tfoot>
-        <?php if ($_tracks = $block->getShipment()->getAllTracks()) : ?>
+        <?php if ($_tracks = $block->getShipment()->getAllTracks()): ?>
             <tbody>
-            <?php $i = 0; foreach ($_tracks as $_track) :$i++ ?>
+            <?php $i = 0; foreach ($_tracks as $_track): $i++ ?>
                 <tr class="<?= /* @noEscape */ ($i%2 == 0) ? 'even' : 'odd' ?>">
                     <td class="col-carrier">
                         <?= $block->escapeHtml($block->getCarrierTitle($_track->getCarrierCode())) ?>
                     </td>
                     <td class="col-title"><?= $block->escapeHtml($_track->getTitle()) ?></td>
                     <td class="col-number">
-                        <?php if ($_track->isCustom()) : ?>
+                        <?php if ($_track->isCustom()): ?>
                             <?= $block->escapeHtml($_track->getNumber()) ?>
-                        <?php else : ?>
-                        <a href="#" onclick="popWin('<?= $block->escapeJs($block->escapeUrl($this->helper(Magento\Shipping\Helper\Data::class)->getTrackingPopupUrlBySalesModel($_track))) ?>','trackorder','width=800,height=600,resizable=yes,scrollbars=yes')"><?= $block->escapeHtml($_track->getNumber()) ?></a>
+                        <?php else: ?>
+                        <a id="col-track-<?= (int) $_track->getId() ?>" href="#">
+                            <?= $block->escapeHtml($_track->getNumber()) ?>
+                         </a>
+                            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                                'onclick',
+                                "event.preventDefault();
+                                popWin('{$block->escapeJs($shippingHelper->getTrackingPopupUrlBySalesModel($_track))}',
+                                'trackorder','width=800,height=600,resizable=yes,scrollbars=yes')",
+                                'a#col-track-' .  (int) $_track->getId()
+                            ) ?>
                         <div id="shipment_tracking_info_response_<?= (int) $_track->getId() ?>"></div>
                         <?php endif; ?>
                     </td>
-                    <td class="col-delete last"><button class="action-delete" type="button" onclick="deleteTrackingNumber('<?= $block->escapeJs($block->escapeUrl($block->getRemoveUrl($_track))) ?>'); return false;"><span><?= $block->escapeHtml(__('Delete')) ?></span></button></td>
+                    <td class="col-delete last">
+                        <button class="action-delete" type="button" id="del-track-<?= (int) $_track->getId() ?>">
+                            <span><?= $block->escapeHtml(__('Delete')) ?></span>
+                        </button>
+                    </td>
+                    <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                        'onclick',
+                        "deleteTrackingNumber('{$block->escapeJs($block->getRemoveUrl($_track))}'); return false;",
+                        '#del-track-' . (int) $_track->getId()
+                    ) ?>
                 </tr>
             <?php endforeach; ?>
             </tbody>
@@ -71,9 +97,9 @@
         </table>
     </form>
 </div>
+<?php $scriptString = <<<script
 
-<script>
-require(['prototype', 'jquery', 'Magento_Ui/js/modal/confirm'], function(prototype, $j, confirm) {
+require(['prototype', 'jquery', 'Magento_Ui/js/modal/confirm'], function(prototype, \$j, confirm) {
 //<![CDATA[
 function selectCarrier(elem) {
     var option = elem.options[elem.selectedIndex];
@@ -81,7 +107,7 @@ function selectCarrier(elem) {
 }
 
 function saveTrackingInfo(node, url) {
-    var form = $j('#tracking-shipping-form');
+    var form = \$j('#tracking-shipping-form');
 
     if (form.validation() && form.validation('isValid')) {
         submitAndReloadArea(node, url);
@@ -90,7 +116,7 @@ function saveTrackingInfo(node, url) {
 
 function deleteTrackingNumber(url) {
     confirm({
-        content: '<?= $block->escapeJs($block->escapeHtml(__('Are you sure?'))) ?>',
+        content: '{$block->escapeJs(__('Are you sure?'))}',
         actions: {
             /**
              * Confirm action.
@@ -108,4 +134,7 @@ window.saveTrackingInfo = saveTrackingInfo;
 //]]>
 
 });
-</script>
+
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/view/info.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/view/info.phtml
index 720b34983551d..002a960f3b38a 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/view/info.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/view/info.phtml
@@ -3,11 +3,19 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-//phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+
+/**
+ * @var $block \Magento\Sales\Block\Adminhtml\Order\AbstractOrder
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
+
+/** @var \Magento\Shipping\Helper\Data $shippingHelper */
+$shippingHelper = $block->getData('shippingHelper');
+/** @var \Magento\Tax\Helper\Data $taxHelper */
+$taxHelper = $block->getData('taxHelper');
 ?>
-<?php /** @var $block \Magento\Shipping\Block\Adminhtml\View */ ?>
 <?php $order = $block->getOrder() ?>
-<?php if ($order->getIsVirtual()) :
+<?php if ($order->getIsVirtual()):
     return '';
 endif; ?>
 
@@ -17,25 +25,34 @@ endif; ?>
         <span class="title"><?= $block->escapeHtml(__('Shipping &amp; Handling Information')) ?></span>
     </div>
     <div class="admin__page-section-item-content">
-        <?php  if ($order->getTracksCollection()->count()) : ?>
-            <p><a href="#" id="linkId" onclick="popWin('<?= $block->escapeJs($block->escapeUrl($this->helper(Magento\Shipping\Helper\Data::class)->getTrackingPopupUrlBySalesModel($order))) ?>','trackorder','width=800,height=600,resizable=yes,scrollbars=yes')" title="<?= $block->escapeHtmlAttr(__('Track Order')) ?>"><?= $block->escapeHtml(__('Track Order')) ?></a></p>
+        <?php  if ($order->getTracksCollection()->count()): ?>
+            <p>
+                <a href="#" id="linkId" title="<?= $block->escapeHtmlAttr(__('Track Order')) ?>">
+                    <?= $block->escapeHtml(__('Track Order')) ?>
+                </a>
+            </p>
+            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                'onclick',
+                "popWin('" . $block->escapeJs($shippingHelper->getTrackingPopupUrlBySalesModel($order)) .
+                "','trackorder','width=800,height=600,resizable=yes,scrollbars=yes')",
+                'a#linkId'
+            ) ?>
         <?php endif; ?>
-        <?php if ($order->getShippingDescription()) : ?>
+        <?php if ($order->getShippingDescription()): ?>
             <strong><?= $block->escapeHtml($order->getShippingDescription()) ?></strong>
 
-            <?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayShippingPriceIncludingTax()) : ?>
+            <?php if ($taxHelper->displayShippingPriceIncludingTax()): ?>
                 <?php $_excl = $block->displayShippingPriceInclTax($order); ?>
-            <?php else : ?>
+            <?php else: ?>
                 <?php $_excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
             <?php endif; ?>
             <?php $_incl = $block->displayShippingPriceInclTax($order); ?>
 
             <?= /** @noEscape */ $_excl ?>
-            <?php if ($this->helper(Magento\Tax\Helper\Data::class)->displayShippingBothPrices()
-                && $_incl != $_excl) : ?>
+            <?php if ($taxHelper->displayShippingBothPrices() && $_incl != $_excl): ?>
                 (<?= $block->escapeHtml(__('Incl. Tax')) ?> <?= /** @noEscape */ $_incl ?>)
             <?php endif; ?>
-        <?php else : ?>
+        <?php else: ?>
             <?= $block->escapeHtml(__('No shipping information available')) ?>
         <?php endif; ?>
     </div>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml
index 44fe4b9ccd353..d023f614f55aa 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml
@@ -5,9 +5,14 @@
  */
 /**
  * @var \Magento\Shipping\Block\Adminhtml\View\Form $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
-//phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-//phpcs:disable Magento2.Files.LineLength.MaxExceeded
+
+/** @var \Magento\Shipping\Helper\Data $shippingHelper */
+$shippingHelper = $block->getData('shippingHelper');
+/** @var \Magento\Tax\Helper\Data $taxHelper */
+$taxHelper = $block->getData('taxHelper');
+/** @var \Magento\Sales\Model\Order $order */
 $order = $block->getShipment()->getOrder();
 ?>
 <?= $block->getChildHtml('order_info'); ?>
@@ -34,12 +39,19 @@ $order = $block->getShipment()->getOrder();
             </div>
             <div class="admin__page-section-item-content">
                 <div class="shipping-description-wrapper">
-                    <?php if ($block->getShipment()->getTracksCollection()->count()) : ?>
+                    <?php if ($block->getShipment()->getTracksCollection()->count()): ?>
                         <p>
-                            <a href="#" id="linkId" onclick="popWin('<?= $block->escapeUrl($this->helper(\Magento\Shipping\Helper\Data::class)->getTrackingPopupUrlBySalesModel($block->getShipment())); ?>','trackshipment','width=800,height=600,resizable=yes,scrollbars=yes')"
-                               title="<?= $block->escapeHtml(__('Track this shipment')); ?>">
+                            <a href="#" id="linkId" title="<?= $block->escapeHtml(__('Track this shipment')); ?>">
                                 <?= $block->escapeHtml(__('Track this shipment')); ?>
                             </a>
+                            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                                'onclick',
+                                'event.preventDefault();' .
+                                "popWin('{$block->escapeJs($shippingHelper->getTrackingPopupUrlBySalesModel(
+                                    $block->getShipment()
+                                    ))}','trackshipment','width=800,height=600,resizable=yes,scrollbars=yes')",
+                                'a#linkId'
+                            ) ?>
                         </p>
                     <?php endif; ?>
                     <div class="shipping-description-title">
@@ -48,34 +60,35 @@ $order = $block->getShipment()->getOrder();
 
                     <?= $block->escapeHtml(__('Total Shipping Charges')); ?>:
 
-                    <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayShippingPriceIncludingTax()) : ?>
+                    <?php if ($taxHelper->displayShippingPriceIncludingTax()): ?>
                         <?php $excl = $block->displayShippingPriceInclTax($order); ?>
-                    <?php else : ?>
+                    <?php else: ?>
                         <?php $excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
                     <?php endif; ?>
                     <?php $incl = $block->displayShippingPriceInclTax($order); ?>
 
                     <?= /* @noEscape */ $excl; ?>
-                    <?php if ($this->helper(\Magento\Tax\Helper\Data::class)->displayShippingBothPrices() && $incl != $excl) : ?>
+                    <?php if ($taxHelper->displayShippingBothPrices() && $incl != $excl): ?>
                         (<?= $block->escapeHtml(__('Incl. Tax')); ?> <?= /* @noEscape */ $incl; ?>)
                     <?php endif; ?>
                 </div>
 
                 <p>
-                    <?php if ($block->canCreateShippingLabel()) : ?>
+                    <?php if ($block->canCreateShippingLabel()): ?>
                         <?= /* @noEscape */ $block->getCreateLabelButton(); ?>
                     <?php endif ?>
-                    <?php if ($block->getShipment()->getShippingLabel()) : ?>
+                    <?php if ($block->getShipment()->getShippingLabel()): ?>
                         <?= /* @noEscape */ $block->getPrintLabelButton(); ?>
                     <?php endif ?>
-                    <?php if ($block->getShipment()->getPackages()) : ?>
+                    <?php if ($block->getShipment()->getPackages()): ?>
                         <?= /* @noEscape */ $block->getShowPackagesButton(); ?>
                     <?php endif ?>
                 </p>
                 <?= $block->getChildHtml('shipment_tracking'); ?>
 
                 <?= $block->getChildHtml('shipment_packaging'); ?>
-                <script>
+                <?php $scriptString = <<<script
+
                     require([
                         'jquery',
                         'prototype'
@@ -85,7 +98,10 @@ $order = $block->getShipment()->getOrder();
                                 window.packaging.sendCreateLabelRequest();
                             });
                             window.packaging.setLabelCreatedCallback(function () {
-                                setLocation("<?= $block->escapeUrl($block->getUrl('adminhtml/order_shipment/view', ['shipment_id' => $block->getShipment()->getId()])); ?>");
+                                setLocation("{$block->escapeJs($block->getUrl(
+                                        'adminhtml/order_shipment/view',
+                                        ['shipment_id' => $block->getShipment()->getId()]
+                                    ))}");
                             });
                         };
 
@@ -95,7 +111,10 @@ $order = $block->getShipment()->getOrder();
                             jQuery(document).on('packaging:inited', setCallbacks);
                         }
                     });
-                </script>
+
+script;
+                ?>
+                <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
             </div>
         </div>
     </div>
diff --git a/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml b/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml
index 1e8760b3afd6d..925dbd03db8e0 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml
@@ -6,19 +6,23 @@
 
 use Magento\Framework\View\Element\Template;
 
-/** @var $block \Magento\Shipping\Block\Tracking\Popup */
-//phpcs:disable Magento2.Files.LineLength.MaxExceeded
+/**
+ * @var $block \Magento\Shipping\Block\Tracking\Popup
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 
 $results = $block->getTrackingInfo();
 ?>
 <div class="page tracking">
-    <?php if (!empty($results)) : ?>
-        <?php foreach ($results as $shipId => $result) : ?>
-            <?php if ($shipId) : ?>
-                <div class="order subtitle caption"><?= /* @noEscape */ $block->escapeHtml(__('Shipment #')) . $shipId ?></div>
+    <?php if (!empty($results)): ?>
+        <?php foreach ($results as $shipId => $result): ?>
+            <?php if ($shipId): ?>
+                <div class="order subtitle caption">
+                    <?= /* @noEscape */ $block->escapeHtml(__('Shipment #')) . $shipId ?>
+                </div>
             <?php endif; ?>
-            <?php if (!empty($result)) : ?>
-                <?php foreach ($result as $counter => $track) : ?>
+            <?php if (!empty($result)): ?>
+                <?php foreach ($result as $counter => $track): ?>
                     <div class="table-wrapper">
                         <?php
                             $shipmentBlockIdentifier = $shipId . '.' . $counter;
@@ -28,25 +32,28 @@ $results = $block->getTrackingInfo();
                                 'storeSupportEmail' => $block->getStoreSupportEmail()
                             ]);
                         ?>
-                        <?= /* @noEscape */ $block->getChildHtml('shipping.tracking.details.' . $shipmentBlockIdentifier) ?>
+                        <?= /* @noEscape */ $block->getChildHtml('shipping.tracking.details.' .
+                            $shipmentBlockIdentifier) ?>
                     </div>
-                    <?php if (is_object($track) && !empty($track->getProgressdetail())) : ?>
+                    <?php if (is_object($track) && !empty($track->getProgressdetail())): ?>
                         <?php
-                            $block->addChild('shipping.tracking.progress.' . $shipmentBlockIdentifier, Template::class, [
-                                'track' => $track,
-                                'template' => 'Magento_Shipping::tracking/progress.phtml'
-                            ]);
+                            $block->addChild(
+                                'shipping.tracking.progress.' . $shipmentBlockIdentifier,
+                                Template::class,
+                                ['track' => $track, 'template' => 'Magento_Shipping::tracking/progress.phtml']
+                            );
                         ?>
-                        <?= /* @noEscape */ $block->getChildHtml('shipping.tracking.progress.' . $shipmentBlockIdentifier) ?>
+                        <?= /* @noEscape */ $block->getChildHtml('shipping.tracking.progress.' .
+                            $shipmentBlockIdentifier) ?>
                     <?php endif; ?>
                 <?php endforeach; ?>
-            <?php else : ?>
+            <?php else: ?>
                 <div class="message info empty">
                     <div><?= $block->escapeHtml(__('There is no tracking available for this shipment.')) ?></div>
                 </div>
             <?php endif; ?>
         <?php endforeach; ?>
-    <?php else : ?>
+    <?php else: ?>
         <div class="message info empty">
             <div><?= $block->escapeHtml(__('There is no tracking available.')) ?></div>
         </div>
@@ -54,13 +61,18 @@ $results = $block->getTrackingInfo();
     <div class="actions">
         <button type="button"
                 title="<?= $block->escapeHtml(__('Close Window')) ?>"
-                class="action close"
-                onclick="window.close(); window.opener.focus();">
+                class="action close">
             <span><?= $block->escapeHtml(__('Close Window')) ?></span>
         </button>
+        <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+            'onclick',
+            "window.close(); window.opener.focus();",
+            'button.action.close'
+        ) ?>
     </div>
 </div>
-<script>
+<?php $scriptString = <<<script
+
     require([
         'jquery'
     ], function (jQuery) {
@@ -69,4 +81,7 @@ $results = $block->getTrackingInfo();
             jQuery('.actions button.close').hide();
         }
     });
-</script>
\ No newline at end of file
+
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml b/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml
index 1c6b267cd9289..79d833771768d 100644
--- a/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml
+++ b/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml
@@ -5,11 +5,12 @@
  */
 
 /** @var $block \Magento\TaxImportExport\Block\Adminhtml\Rate\ImportExport */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <div class="import-export-tax-rates">
-    <?php if (!$block->getIsReadonly()) :?>
+    <?php if (!$block->getIsReadonly()):?>
     <div class="import-tax-rates">
-        <?php if ($block->getUseContainer()) :?>
+        <?php if ($block->getUseContainer()):?>
         <form id="import-form"
               class="admin__fieldset"
               action="<?= $block->escapeUrl($block->getUrl('tax/rate/importPost')) ?>"
@@ -18,7 +19,9 @@
         <?php endif; ?>
             <?= $block->getBlockHtml('formkey') ?>
             <div class="fieldset admin__field">
-                <label for="import_rates_file" class="admin__field-label"><span><?= $block->escapeHtml(__('Import Tax Rates')) ?></span></label>
+                <label for="import_rates_file" class="admin__field-label">
+                    <span><?= $block->escapeHtml(__('Import Tax Rates')) ?></span>
+                </label>
                 <div class="admin__field-control">
                     <input type="file"
                            id="import_rates_file"
@@ -27,11 +30,13 @@
                     <?= $block->getButtonHtml(__('Import Tax Rates'), '', 'import-submit') ?>
                 </div>
             </div>
-        <?php if ($block->getUseContainer()) :?>
+        <?php if ($block->getUseContainer()):?>
         </form>
         <?php endif; ?>
-        <script>
-require(['jquery', 'Magento_Ui/js/modal/alert', "mage/mage", "loadingPopup", 'mage/translate'], function(jQuery, uiAlert){
+        <?php $scriptString = <<<script
+
+    require(['jquery', 'Magento_Ui/js/modal/alert', "mage/mage", "loadingPopup", 'mage/translate'],
+        function(jQuery, uiAlert){
 
     jQuery('#import-form').mage('form').mage('validation');
     (function ($) {
@@ -51,11 +56,14 @@ require(['jquery', 'Magento_Ui/js/modal/alert', "mage/mage", "loadingPopup", 'ma
     })(jQuery);
 
 });
-</script>
+
+script;
+        ?>
+        <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
     </div>
     <?php endif; ?>
     <div class="export-tax-rates <?= ($block->getIsReadonly()) ? 'box-left' : 'box-right' ?>">
-        <?php if ($block->getUseContainer()) :?>
+        <?php if ($block->getUseContainer()):?>
         <form id="export_form"
               class="admin__fieldset"
               action="<?= $block->escapeUrl($block->getUrl('tax/rate/exportPost')) ?>"
@@ -69,7 +77,7 @@ require(['jquery', 'Magento_Ui/js/modal/alert', "mage/mage", "loadingPopup", 'ma
                     <?= $block->getButtonHtml(__('Export Tax Rates'), "this.form.submit()") ?>
                 </div>
             </div>
-        <?php if ($block->getUseContainer()) :?>
+        <?php if ($block->getUseContainer()):?>
         </form>
         <?php endif; ?>
     </div>
diff --git a/app/code/Magento/Theme/view/adminhtml/templates/browser/content/uploader.phtml b/app/code/Magento/Theme/view/adminhtml/templates/browser/content/uploader.phtml
index 67c9084b2756e..66456ae403818 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/browser/content/uploader.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/browser/content/uploader.phtml
@@ -5,6 +5,7 @@
  */
 
 /** @var $block \Magento\Theme\Block\Adminhtml\Wysiwyg\Files\Content\Uploader */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
 <div id="<?= $block->getHtmlId() ?>" class="uploader">
@@ -18,14 +19,18 @@
         <div id="<%- data.id %>" class="file-row">
             <span class="file-info"><%- data.name %> (<%- data.size %>)</span>
             <div class="progressbar-container">
-                <div class="progressbar upload-progress" style="width: 0%;"></div>
+                <div class="progressbar upload-progress"></div>
             </div>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                "width: 0%;",
+                "div.progressbar-container div.progressbar.upload-progress"
+            ) ?>
             <div class="clear"></div>
         </div>
     </script>
 </div>
+<?php $scriptString= <<<script
 
-<script>
 require([
     'jquery',
     'mage/template',
@@ -41,9 +46,9 @@ require([
             form_key: FORM_KEY
         },
         sequentialUploads: true,
-        maxFileSize: <?= $block->escapeJs($block->getFileSizeService()->getMaxFileSize()) ?> ,
+        maxFileSize: {$block->escapeJs($block->getFileSizeService()->getMaxFileSize())} ,
         add: function (e, data) {
-            var progressTmpl = mageTemplate('#<?= $block->getHtmlId() ?>-template'),
+            var progressTmpl = mageTemplate('#{$block->getHtmlId()}-template'),
                 fileSize,
                 tmpl;
 
@@ -62,7 +67,7 @@ require([
                     }
                 });
 
-                $(tmpl).appendTo('#<?= $block->getHtmlId() ?>');
+                $(tmpl).appendTo('#{$block->getHtmlId()}');
             });
 
             $(this).fileupload('process', data).done(function () {
@@ -91,4 +96,7 @@ require([
     });
 
 });
-</script>
+
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Theme/view/adminhtml/templates/tabs/css.phtml b/app/code/Magento/Theme/view/adminhtml/templates/tabs/css.phtml
index 902daf98182f0..53228243ffd19 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/tabs/css.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/tabs/css.phtml
@@ -3,12 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-/** @var $block \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab\Css */
+/**
+ * @var $block \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab\Css
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
 
 <?= $block->getFormHtml() ?>
 
-<script>
+<?php $scriptString = <<<script
+
 require([
     "jquery",
     "Magento_Ui/js/modal/alert",
@@ -19,7 +23,7 @@ require([
     $( '#css_file_uploader' ).fileupload({
         dataType: 'json',
         replaceFileInput: false,
-        url : '<?= $block->escapeJs($block->escapeUrl($block->getUrl('*/system_design_theme/uploadcss'))) ?>',
+        url : '{$block->escapeJs($block->getUrl('*/system_design_theme/uploadcss'))}',
         acceptFileTypes: /(.|\/)(css)$/i,
 
         /**
@@ -76,4 +80,7 @@ require([
     });
 
 });
-</script>
+
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Theme/view/adminhtml/templates/tabs/fieldset/js.phtml b/app/code/Magento/Theme/view/adminhtml/templates/tabs/fieldset/js.phtml
index b50f68cd9353b..e15ac4a088e03 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/tabs/fieldset/js.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/tabs/fieldset/js.phtml
@@ -4,18 +4,27 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-/** @var $block \Magento\Backend\Block\Widget\Form\Renderer\Fieldset */
+/**
+ * @var $block \Magento\Backend\Block\Widget\Form\Renderer\Fieldset
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
+
+/** @var \Magento\Framework\Json\Helper\Data $jsonHelper */
+$jsonHelper = $block->getData('jsonHelper');
 ?>
 
 <div id="js-file-uploader" class="uploader">
 </div>
-<script id="js-file-uploader-template" type="text/x-magento-template"> 
+<script id="js-file-uploader-template" type="text/x-magento-template">
     <div id="<%- data.id %>" class="file-row">
         <span class="file-info"><%- data.name %> (<%- data.size %>)</span>
         <div class="progressbar-container">
-            <div class="progressbar upload-progress" style="width: 0%;"></div>
+            <div class="progressbar upload-progress""></div>
         </div>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+            "width: 0%;",
+            "div.progressbar-container div.progressbar.upload-progress"
+        ) ?>
         <div class="clear"></div>
     </div>
 </script>
@@ -40,8 +49,8 @@
 </script>
 
 <ul id="js-files-container" class="js-files-container ui-sortable" ></ul>
+<?php $scriptString = <<<script
 
-<script>
 require([
     "jquery",
     "jquery/ui",
@@ -61,10 +70,13 @@ jQuery(function($) {
     $('body').trigger(
         'refreshJsList',
         {
-            jsList: <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getJsFiles()) ?>
+            jsList: {$jsonHelper->jsonEncode($block->getJsFiles())}
         }
     );
 });
 
 });
-</script>
+
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Theme/view/adminhtml/templates/tabs/js.phtml b/app/code/Magento/Theme/view/adminhtml/templates/tabs/js.phtml
index 1b4633d0965f3..4edc895c559e2 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/tabs/js.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/tabs/js.phtml
@@ -4,11 +4,15 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab\Js */
+/**
+ * @var $block \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab\Js
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
 <?= $block->getFormHtml() ?>
 
-<script>
+<?php $scriptString = <<<script
+
 require([
     "jquery",
     "mage/template",
@@ -22,7 +26,7 @@ require([
         dataType: 'json',
         replaceFileInput: false,
         sequentialUploads: true,
-        url: '<?= $block->escapeJs($block->escapeUrl($block->getJsUploadUrl())) ?>',
+        url: '{$block->escapeJs($block->getJsUploadUrl())}',
 
         /**
          * Add data
@@ -125,4 +129,7 @@ require([
 
 
 });
-</script>
+
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/main_css_preloader.phtml b/app/code/Magento/Theme/view/frontend/templates/html/main_css_preloader.phtml
index 2c1c7db75b111..6c2f17b6ffb08 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/main_css_preloader.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/main_css_preloader.phtml
@@ -3,11 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <div data-role="main-css-loader" class="loading-mask">
     <div class="loader">
         <img src="<?= $block->escapeUrl($block->getViewFileUrl('images/loader-1.gif')); ?>"
-             alt="<?= $block->escapeHtml(__('Loading...')); ?>"
-             style="position: absolute;">
+             alt="<?= $block->escapeHtml(__('Loading...')); ?>">
     </div>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+        "position: absolute;",
+        "div.loader img"
+    ) ?>
 </div>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml b/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml
index 1414c21c6e9bc..bb9d5cb2fd2e0 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml
@@ -6,30 +6,41 @@
 
 /**
  * @var $block \Magento\Theme\Block\Html\Notices
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
-<?php if ($block->displayNoscriptNotice()) : ?>
+<?php if ($block->displayNoscriptNotice()): ?>
     <noscript>
         <div class="message global noscript">
             <div class="content">
                 <p>
                     <strong><?= $block->escapeHtml(__('JavaScript seems to be disabled in your browser.')) ?></strong>
-                    <span><?= $block->escapeHtml(__('For the best experience on our site, be sure to turn on Javascript in your browser.')) ?></span>
+                    <span>
+                        <?= $block->escapeHtml(
+                            __('For the best experience on our site, be sure to turn on Javascript in your browser.')
+                        ) ?>
+                    </span>
                 </p>
             </div>
         </div>
     </noscript>
 <?php endif; ?>
-<?php if ($block->displayNoLocalStorageNotice()) : ?>
-    <div class="notice global site local_storage" style="display: none;">
+<?php if ($block->displayNoLocalStorageNotice()): ?>
+    <div class="notice global site local_storage">
         <div class="content">
             <p>
-                <strong><?= $block->escapeHtml(__('Local Storage seems to be disabled in your browser.')) ?></strong><br />
-                <?= $block->escapeHtml(__('For the best experience on our site, be sure to turn on Local Storage in your browser.')) ?>
+                <strong><?= $block->escapeHtml(__('Local Storage seems to be disabled in your browser.')) ?></strong>
+                <br />
+                <?= $block->escapeHtml(
+                    __('For the best experience on our site, be sure to turn on Local Storage in your browser.')
+                ) ?>
             </p>
         </div>
     </div>
-    <script>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display: none;', 'div.notice.global.site.local_storage') ?>
+
+    <?php $scriptString = <<<script
+
 require(['jquery'], function(jQuery){
 
         // <![CDATA[
@@ -45,9 +56,12 @@ require(['jquery'], function(jQuery){
         // ]]>
 
 });
-</script>
+
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <?php endif; ?>
-<?php if ($block->displayDemoNotice()) : ?>
+<?php if ($block->displayDemoNotice()): ?>
     <div class="message global demo">
         <div class="content">
             <p><?= $block->escapeHtml(__('This is a demo store. No orders will be fulfilled.')) ?></p>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/print.phtml b/app/code/Magento/Theme/view/frontend/templates/html/print.phtml
index d05faac66ffd1..e939ad40aafb6 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/print.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/print.phtml
@@ -3,8 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<script>
+
+<?php $scriptString = <<<script
+
     require(
         [
             'jquery'
@@ -15,4 +19,7 @@
             });
         }
     );
-</script>
+
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Theme/view/frontend/templates/js/css_rel_preload.phtml b/app/code/Magento/Theme/view/frontend/templates/js/css_rel_preload.phtml
index d90d528ffc6f8..11a388a0fec20 100644
--- a/app/code/Magento/Theme/view/frontend/templates/js/css_rel_preload.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/js/css_rel_preload.phtml
@@ -3,8 +3,26 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<script>
+
+<?php $scriptString = <<<script
+
     /*! loadCSS rel=preload polyfill. [c]2017 Filament Group, Inc. MIT License */
-    !function(t){"use strict";t.loadCSS||(t.loadCSS=function(){});var e=loadCSS.relpreload={};if(e.support=function(){var e;try{e=t.document.createElement("link").relList.supports("preload")}catch(t){e=!1}return function(){return e}}(),e.bindMediaToggle=function(t){var e=t.media||"all";function a(){t.media=e}t.addEventListener?t.addEventListener("load",a):t.attachEvent&&t.attachEvent("onload",a),setTimeout(function(){t.rel="stylesheet",t.media="only x"}),setTimeout(a,3e3)},e.poly=function(){if(!e.support())for(var a=t.document.getElementsByTagName("link"),n=0;n<a.length;n++){var o=a[n];"preload"!==o.rel||"style"!==o.getAttribute("as")||o.getAttribute("data-loadcss")||(o.setAttribute("data-loadcss",!0),e.bindMediaToggle(o))}},!e.support()){e.poly();var a=t.setInterval(e.poly,500);t.addEventListener?t.addEventListener("load",function(){e.poly(),t.clearInterval(a)}):t.attachEvent&&t.attachEvent("onload",function(){e.poly(),t.clearInterval(a)})}"undefined"!=typeof exports?exports.loadCSS=loadCSS:t.loadCSS=loadCSS}("undefined"!=typeof global?global:this);
-</script>
+    !function(t){"use strict";t.loadCSS||(t.loadCSS=function(){});var e=loadCSS.relpreload={};
+    if(e.support=function(){var e;try{e=t.document.createElement("link").relList.supports("preload")}
+    catch(t){e=!1}return function(){return e}}(),e.bindMediaToggle=function(t){var e=t.media||"all";
+    function a(){t.media=e}t.addEventListener?t.addEventListener("load",a):t.attachEvent&&t.attachEvent("onload",a),
+    setTimeout(function(){t.rel="stylesheet",t.media="only x"}),setTimeout(a,3e3)},e.poly=function(){if(!e.support())
+    for(var a=t.document.getElementsByTagName("link"),n=0;n<a.length;n++){var o=a[n];"preload"!==o.rel||
+    "style"!==o.getAttribute("as")||o.getAttribute("data-loadcss")||
+    (o.setAttribute("data-loadcss",!0),e.bindMediaToggle(o))}},!e.support()){e.poly();var a=t.setInterval(e.poly,500);
+    t.addEventListener?t.addEventListener("load",
+    function(){e.poly(),t.clearInterval(a)}):t.attachEvent&&t.attachEvent("onload",
+    function(){e.poly(),t.clearInterval(a)})}"undefined"!=typeof exports?exports.loadCSS=loadCSS:t.loadCSS=loadCSS}
+    ("undefined"!=typeof global?global:this);
+
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Translation/view/adminhtml/templates/translate_inline.phtml b/app/code/Magento/Translation/view/adminhtml/templates/translate_inline.phtml
index 6b6327a5679ea..67dd55d3d6372 100644
--- a/app/code/Magento/Translation/view/adminhtml/templates/translate_inline.phtml
+++ b/app/code/Magento/Translation/view/adminhtml/templates/translate_inline.phtml
@@ -4,10 +4,15 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Framework\View\Element\Template $block */
+/**
+ * @var \Magento\Framework\View\Element\Template $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
-<link rel="stylesheet" type="text/css" href="<?= $block->escapeUrl($block->getViewFileUrl('prototype/windows/themes/default.css')) ?>"/>
-<link rel="stylesheet" type="text/css" href="<?= $block->escapeUrl($block->getViewFileUrl('mage/translate-inline.css')) ?>"/>
+<link rel="stylesheet" type="text/css"
+      href="<?= $block->escapeUrl($block->getViewFileUrl('prototype/windows/themes/default.css')) ?>"/>
+<link rel="stylesheet" type="text/css"
+      href="<?= $block->escapeUrl($block->getViewFileUrl('mage/translate-inline.css')) ?>"/>
 
 <script id="translate-inline-icon" type="text/x-magento-template">
     <img src="<%- data.img %>" height="16" width="16" class="translate-edit-icon">
@@ -51,8 +56,12 @@
     <% } %>
 </script>
 
-<div data-role="translate-dialog" data-mage-init='{"translateInline":{"ajaxUrl":"<?= $block->escapeJs($block->escapeUrl($block->getAjaxUrl())) ?>"},"loader":{}}'></div>
-<script>
+<div data-role="translate-dialog"
+     data-mage-init='{"translateInline":{"ajaxUrl":"<?= $block->escapeJs($block->escapeUrl($block->getAjaxUrl())) ?>"},
+     "loader":{}}'>
+</div>
+<?php $scriptString = <<<script
+
 require([
     "jquery",
     "mage/edit-trigger",
@@ -60,12 +69,15 @@ require([
 ], function($){
         $('body').editTrigger(
             {
-                img: '<?= $block->escapeJs($block->escapeUrl($block->getViewFileUrl('Magento_Theme::fam_book_open.png'))) ?>',
+                img: '{$block->escapeJs($block->getViewFileUrl('Magento_Theme::fam_book_open.png'))}',
                 alwaysShown: true,
                 singleElement: false
             }
         );
-        
+
         $('body').addClass('trnslate-inline-area');
 });
-</script>
+
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/UrlRewrite/view/adminhtml/templates/selector.phtml b/app/code/Magento/UrlRewrite/view/adminhtml/templates/selector.phtml
index 84abf64af9757..837c528d6cfda 100644
--- a/app/code/Magento/UrlRewrite/view/adminhtml/templates/selector.phtml
+++ b/app/code/Magento/UrlRewrite/view/adminhtml/templates/selector.phtml
@@ -4,7 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\UrlRewrite\Block\Selector $block */
+/**
+ * @var \Magento\UrlRewrite\Block\Selector $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
 <div class="form-inline">
     <fieldset class="admin__fieldset fieldset" data-container-for="entity-type-selector">
@@ -13,11 +16,18 @@
                 <span><?= $block->escapeHtml($block->getSelectorLabel()) ?></span>
             </label>
             <div class="admin__field-control control">
-                <select data-role="entity-type-selector" class="admin__control-select select" onchange="window.location = this.value;" id="entity-type-selector">
-                <?php foreach ($block->getModes() as $mode => $label) : ?>
-                    <option <?= /* @noEscape */ $block->isMode($mode) ? 'selected="selected" ' : '' ?>value="<?= $block->escapeUrl($block->getModeUrl($mode)) ?>"><?= $block->escapeHtml($label) ?></option>
+                <select data-role="entity-type-selector" class="admin__control-select select" id="entity-type-selector">
+                <?php foreach ($block->getModes() as $mode => $label): ?>
+                    <option <?= /* @noEscape */ $block->isMode($mode) ? 'selected="selected" ' : '' ?>
+                        value="<?= $block->escapeUrl($block->getModeUrl($mode)) ?>"><?= $block->escapeHtml($label) ?>
+                    </option>
                 <?php endforeach; ?>
                 </select>
+                <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                    'onchange',
+                    'window.location = this.value;',
+                    'select#entity-type-selector'
+                ) ?>
             </div>
         </div>
     </fieldset>
diff --git a/app/code/Magento/User/view/adminhtml/templates/role/edit.phtml b/app/code/Magento/User/view/adminhtml/templates/role/edit.phtml
index 97308204be854..84567a81660f2 100644
--- a/app/code/Magento/User/view/adminhtml/templates/role/edit.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/role/edit.phtml
@@ -4,7 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\User\Block\Role\Tab\Edit */
+/**
+ * @var $block \Magento\User\Block\Role\Tab\Edit
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
 
 <?= $block->getChildHtml() ?>
@@ -18,8 +21,7 @@
         <label class="label" for="all"><span><?= $block->escapeHtml(__('Resource Access')) ?></span></label>
 
         <div class="control">
-            <select id="all" name="all"
-                    onchange="jQuery('[data-role=tree-resources-container]').toggle()" class="select">
+            <select id="all" name="all" class="select">
                 <option value="0" <?= ($block->isEverythingAllowed() ? '' : 'selected="selected"') ?>>
                     <?= $block->escapeHtml(__('Custom')) ?>
                 </option>
@@ -27,11 +29,16 @@
                     <?= $block->escapeHtml(__('All')) ?>
                 </option>
             </select>
+            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                'onchange',
+                "jQuery('[data-role=tree-resources-container]').toggle()",
+                'select#all'
+            ) ?>
         </div>
     </div>
 
     <div class="field
-        <?php if ($block->isEverythingAllowed()) :?>
+        <?php if ($block->isEverythingAllowed()):?>
             no-display
         <?php endif ?>"
          data-role="tree-resources-container">
diff --git a/app/code/Magento/User/view/adminhtml/templates/role/info.phtml b/app/code/Magento/User/view/adminhtml/templates/role/info.phtml
index 6cf1bb373541d..f6375b17086f9 100644
--- a/app/code/Magento/User/view/adminhtml/templates/role/info.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/role/info.phtml
@@ -3,11 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <form action="<?= $block->escapeUrl($block->getUrl('*/*/saverole')) ?>" method="post" id="role-edit-form">
     <?= $block->getBlockHtml('formkey') ?>
 </form>
-<script>
+<?php $scriptString = <<<script
+
 require([
     "jquery",
     "mage/mage"
@@ -18,4 +21,7 @@ require([
     });
 
 });
-</script>
+
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml b/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml
index a3b5dc68050ac..2042479832898 100644
--- a/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml
@@ -3,8 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<script>
+<?php $scriptString = <<<script
+
 require([
     'jquery',
     'Magento_Ui/js/modal/confirm',
@@ -12,9 +15,14 @@ require([
     'mage/adminhtml/grid',
     'prototype'
 ], function(jQuery, confirm, _){
-<?php $myBlock = $block->getLayout()->getBlock('roleUsersGrid'); ?>
-<?php if (is_object($myBlock) && $myBlock->getJsObjectName()) : ?>
-    var checkBoxes = $H(<?= /* @noEscape */ $myBlock->getUsers(true) ?>);
+
+script;
+
+$myBlock = $block->getLayout()->getBlock('roleUsersGrid');
+if (is_object($myBlock) && $myBlock->getJsObjectName()):
+    $scriptString .= <<<script
+
+    var checkBoxes = \$H({$myBlock->getUsers(true)});
     var warning = false;
     if (checkBoxes.size() > 0) {
         warning = true;
@@ -43,7 +51,8 @@ require([
 
                 if (checked) {
                     confirm({
-                        content: "<?= $myBlock->escapeHtml(__('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?')) ?>",
+                        content: "{$myBlock->escapeJs(__('Warning!\r\nThis action will remove this user from already ' .
+                                                         'assigned role\r\nAre you sure?'))}",
                         actions: {
                             confirm: function () {
                                 checkbox[0].checked = false;
@@ -92,7 +101,9 @@ require([
         if (!allCheckbox.checked && _.size(checkBoxes._object) > 0) {
             allCheckbox.checked = true;
             confirm({
-                content: "<?= $myBlock->escapeHtml(__('Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?')) ?>",
+                content: "{$myBlock->escapeJs(
+                    __('Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?')
+                    )}",
                 actions: {
                     confirm: function () {
                         allCheckbox.checked = false;
@@ -105,25 +116,25 @@ require([
         }
     }
     function markCheckboxes(value) {
-        <?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.rows.each(function(row)
+        {$myBlock->escapeJs($myBlock->getJsObjectName())}.rows.each(function(row)
         {
             $(row).getElementsByClassName('checkbox')[0].checked = value;
-            roleUsersRowInit(<?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>, row);
+            roleUsersRowInit({$myBlock->escapeJs($myBlock->getJsObjectName())}, row);
         });
     }
     function onLoad() {
-        if (typeof <?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?> !== 'undefined') {
-            <?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.
+        if (typeof {$myBlock->escapeJs($myBlock->getJsObjectName())} !== 'undefined') {
+            {$myBlock->escapeJs($myBlock->getJsObjectName())}.
             rowClickCallback = roleUsersRowClick;
-            <?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.
+            {$myBlock->escapeJs($myBlock->getJsObjectName())}.
             initRowCallback = roleUsersRowInit;
-            <?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.
+            {$myBlock->escapeJs($myBlock->getJsObjectName())}.
             checkboxCheckCallback = registerUserRole;
-            <?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.
+            {$myBlock->escapeJs($myBlock->getJsObjectName())}.
             checkCheckboxes = massSelectUsers;
-            <?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.
+            {$myBlock->escapeJs($myBlock->getJsObjectName())}.
             rows.each(function (row) {
-                roleUsersRowInit(<?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>, row)
+                roleUsersRowInit({$myBlock->escapeJs($myBlock->getJsObjectName())}, row)
             });
             $('in_role_user_old').value = $('in_role_user').value;
         } else {
@@ -131,7 +142,13 @@ require([
         }
     }
     onLoad();
-<?php endif; ?>
+
+script;
+endif;
+$scriptString .= <<<script
 
 });
-</script>
+
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml b/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml
index 92a97e825ea67..71a866f945693 100644
--- a/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml
@@ -3,18 +3,25 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<script>
+<?php $scriptString = <<<script
+
 require([
     "mage/adminhtml/grid",
     "prototype"
 ], function(){
 
-<?php $myBlock = $block->getLayout()->getBlock('user.roles.grid'); ?>
-<?php if (is_object($myBlock) && $myBlock->getJsObjectName()) : ?>
-    var radioBoxes = $H({});
+script;
+
+$myBlock = $block->getLayout()->getBlock('user.roles.grid');
+if (is_object($myBlock) && $myBlock->getJsObjectName()):
+    $scriptString .= <<<script
+
+    var radioBoxes = \$H({});
     var warning = false;
-    var userRoles = $H(<?= /* @noEscape */ $myBlock->getSelectedRoles(true) ?>);
+    var userRoles = \$H({$myBlock->getSelectedRoles(true)});
     if (userRoles.size() > 0) warning = true;
     $('user_user_roles').value = userRoles.toQueryString();
 
@@ -37,7 +44,9 @@ require([
             if(checkbox[0] && !checkbox[0].checked){
                 var checked = isInput ? checkbox[0].checked : !checkbox[0].checked;
                 if (checked && warning && radioBoxes.size() > 0) {
-                    if ( !confirm("<?= $myBlock->escapeHtml(__('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?')) ?>") ) {
+                    if ( !confirm("{$myBlock->escapeJs(
+                        __('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?')
+                        )}") ) {
                         checkbox[0].checked = false;
                         for(i in radioBoxes) {
                             if( radioBoxes[i].status == 1) {
@@ -48,7 +57,7 @@ require([
                     }
                     warning = false;
                 }
-                <?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.setCheckboxChecked(checkbox[0], checked);
+                {$myBlock->escapeJs($myBlock->getJsObjectName())}.setCheckboxChecked(checkbox[0], checked);
             }
         }
     }
@@ -60,19 +69,24 @@ require([
         }
     }
 
-    <?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.rowClickCallback = roleRowClick;
-    <?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.initRowCallback = rolesRowInit;
-    <?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.checkboxCheckCallback = registerUserRole;
-    <?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>.rows.each(function(row){
-        rolesRowInit(<?= $myBlock->escapeJs($myBlock->getJsObjectName()) ?>, row)
+    {$myBlock->escapeJs($myBlock->getJsObjectName())}.rowClickCallback = roleRowClick;
+    {$myBlock->escapeJs($myBlock->getJsObjectName())}.initRowCallback = rolesRowInit;
+    {$myBlock->escapeJs($myBlock->getJsObjectName())}.checkboxCheckCallback = registerUserRole;
+    {$myBlock->escapeJs($myBlock->getJsObjectName())}.rows.each(function(row){
+        rolesRowInit({$myBlock->escapeJs($myBlock->getJsObjectName())}, row)
     });
-<?php endif; ?>
+
+script;
+endif;
+$scriptString .= <<<script
 
 });
-</script>
 
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <?php $editBlock = $block->getLayout()->getBlock('adminhtml.user.edit'); ?>
-<?php if (is_object($editBlock)) : ?>
+<?php if (is_object($editBlock)): ?>
     <script type="text/x-magento-init">
         {
             "[data-role=delete-user]" : {
diff --git a/app/code/Magento/Variable/view/adminhtml/templates/system/variable/js.phtml b/app/code/Magento/Variable/view/adminhtml/templates/system/variable/js.phtml
index a569b8e71a055..28f66d4c913e2 100644
--- a/app/code/Magento/Variable/view/adminhtml/templates/system/variable/js.phtml
+++ b/app/code/Magento/Variable/view/adminhtml/templates/system/variable/js.phtml
@@ -3,8 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<script>
+
+<?php $scriptString = <<<script
+
 require([
     'prototype'
 ], function () {
@@ -27,4 +31,7 @@ window.toggleValueElement = function(element) {
 }
 
 });
-</script>
+
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Vault/view/adminhtml/templates/form/vault.phtml b/app/code/Magento/Vault/view/adminhtml/templates/form/vault.phtml
index fb0666cde976f..8311ff374c3d1 100644
--- a/app/code/Magento/Vault/view/adminhtml/templates/form/vault.phtml
+++ b/app/code/Magento/Vault/view/adminhtml/templates/form/vault.phtml
@@ -4,7 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-/** @var Magento\Vault\Block\Form $block */
+/**
+ * @var Magento\Vault\Block\Form $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 $code = $block->escapeHtml($block->getMethodCode());
 ?>
 <fieldset data-mage-init='{
@@ -12,10 +15,11 @@ $code = $block->escapeHtml($block->getMethodCode());
             "code": "<?= /* @noEscape */ $code ?>",
             "fieldset": "payment_form_<?= /* @noEscape */ $code ?>"
         }
-    }' class="admin__fieldset payment-method"
-          id="payment_form_<?= /* @noEscape */ $code ?>"
-          style="display:none"
-              >
+    }' class="admin__fieldset payment-method" id="payment_form_<?= /* @noEscape */ $code ?>">
     <input type="hidden" name="payment[public_hash]" id="<?= /* @noEscape */ $code ?>_public_hash" value="" />
     <?= $block->getChildHtml() ?>
 </fieldset>
+<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+    'display:none',
+    'fieldset#payment_form_' . /* @noEscape */ $code
+) ?>
diff --git a/app/code/Magento/Weee/Block/Item/Price/Renderer.php b/app/code/Magento/Weee/Block/Item/Price/Renderer.php
index 721df2c83f460..e29dd9d58f0b4 100644
--- a/app/code/Magento/Weee/Block/Item/Price/Renderer.php
+++ b/app/code/Magento/Weee/Block/Item/Price/Renderer.php
@@ -40,6 +40,7 @@ public function __construct(
         array $data = []
     ) {
         $this->weeeHelper = $weeeHelper;
+        $data['weeeHelper'] = $this->weeeHelper;
         parent::__construct($context, $taxHelper, $priceCurrency, $data);
         $this->_isScopePrivate = true;
     }
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml b/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml
index 1b77231640868..1eff06bb4b985 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml
@@ -4,28 +4,37 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Templates.ThisInTemplate
 ?>
 <?php
-/** @var $block \Magento\Weee\Block\Renderer\Weee\Tax */
+/**
+ * @var $block \Magento\Weee\Block\Renderer\Weee\Tax
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
+
+/** @var \Magento\Framework\Json\Helper\Data $jsonHelper */
+$jsonHelper = $block->getData('jsonHelper');
+/** @var \Magento\Directory\Helper\Data $directoryHelper */
+$directoryHelper = $block->getData('directoryHelper');
+
 $data = ['fptAttribute' => [
-    'region' => $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonDecode(
-        $this->helper(\Magento\Directory\Helper\Data::class)->getRegionJson()
-    ),
+    'region' => $jsonHelper->jsonDecode($directoryHelper->getRegionJson()),
     'itemsData' => $block->getValues(),
     'bundlePriceType' => '#price_type',
 ]];
 ?>
 <div id="attribute-<?= /* @noEscape */ $block->getElement()->getHtmlId() ?>-container" class="field"
      data-attribute-code="<?= /* @noEscape */ $block->getElement()->getHtmlId() ?>"
-     data-mage-init="<?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($data) ?>">
+     data-mage-init="<?= /* @noEscape */ $jsonHelper->jsonEncode($data) ?>">
     <label class="label"><span><?= $block->escapeHtml($block->getElement()->getLabel()) ?></span></label>
 
     <div class="control">
         <table class="data-table">
             <thead>
                 <tr>
-                    <th class="col-website" <?php if (!$block->isMultiWebsites()) : ?>style="display: none;"<?php endif; ?>><?= $block->escapeHtml(__('Website')) ?></th>
+                    <th class="col-website"><?= $block->escapeHtml(__('Website')) ?></th>
+                    <?php if (!$block->isMultiWebsites()): ?>
+                        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display: none;', 'th.col-website') ?>
+                    <?php endif; ?>
                     <th class="col-country required"><?= $block->escapeHtml(__('Country/State')) ?></th>
                     <th class="col-tax required"><?= $block->escapeHtml(__('Tax')) ?></th>
                     <th class="col-action"><?= $block->escapeHtml(__('Action')) ?></th>
@@ -43,7 +52,8 @@ $data = ['fptAttribute' => [
             Hidden field below with attribute code id is necessary for jQuery validation plugin.
             Validation message will be displayed after this field.
         -->
-        <input type="hidden" name="<?= /* @noEscape */ $block->getElement()->getHtmlId() ?>" id="<?= /* @noEscape */ $block->getElement()->getHtmlId() ?>" disabled="disabled">
+        <input type="hidden" name="<?= /* @noEscape */ $block->getElement()->getHtmlId() ?>"
+               id="<?= /* @noEscape */ $block->getElement()->getHtmlId() ?>" disabled="disabled">
     </div>
 
     <script data-role="row-template" type="text/x-magento-template">
@@ -51,22 +61,32 @@ $data = ['fptAttribute' => [
             $elementName = $block->escapeHtmlAttr($block->getElement()->getName());
             $elementClass = $block->escapeHtmlAttr($block->getElement()->getClass());
         ?>
-        <tr id="<?= /* @noEscape */ $block->getElement()->getHtmlId() ?>_weee_tax_row_<%- data.index %>" data-role="fpt-item-row">
-            <td class="col-website" <?php if (!$block->isMultiWebsites()) : ?>style="display: none"<?php endif; ?>>
+        <tr id="<?= /* @noEscape */ $block->getElement()->getHtmlId() ?>_weee_tax_row_<%- data.index %>"
+            data-role="fpt-item-row">
+            <td class="col-website">
                 <select id="<?= /* @noEscape */ $elementName ?>_weee_tax_row_<%- data.index %>_website"
                         name="<?= /* @noEscape */ $elementName ?>[<%- data.index %>][website_id]"
                         class="<?= /* @noEscape */ $elementClass ?> website required-entry" data-role="select-website">
-                    <?php foreach ($block->getWebsites() as $_websiteId => $_info) : ?>
-                    <option value="<?= /* @noEscape */ $_websiteId ?>"><?= $block->escapeHtml($_info['name']) ?><?php if (!empty($_info['currency'])) : ?>[<?= /* @noEscape */ $_info['currency'] ?>]<?php endif; ?></option>
+                    <?php foreach ($block->getWebsites() as $_websiteId => $_info): ?>
+                    <option value="<?= /* @noEscape */ $_websiteId ?>"><?= $block->escapeHtml($_info['name']) ?>
+                        <?php if (!empty($_info['currency'])): ?>
+                            [<?= /* @noEscape */ $_info['currency'] ?>]
+                        <?php endif; ?>
+                    </option>
                     <?php endforeach ?>
                 </select>
             </td>
+            <?php if (!$block->isMultiWebsites()): ?>
+                <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display: none;', 'td.col-website') ?>
+            <?php endif; ?>
             <td class="col-country">
                 <select id="<?= /* @noEscape */ $elementName ?>_weee_tax_row_<%- data.index %>_country"
                         name="<?= /* @noEscape */ $elementName ?>[<%- data.index %>][country]"
                         class="<?= /* @noEscape */ $elementClass ?> country required-entry" data-role="select-country">
-                    <?php foreach ($block->getCountries() as $_country) : ?>
-                    <option value="<?= $block->escapeHtmlAttr($_country['value']) ?>"><?= $block->escapeHtml($_country['label']) ?></option>
+                    <?php foreach ($block->getCountries() as $_country): ?>
+                    <option value="<?= $block->escapeHtmlAttr($_country['value']) ?>">
+                        <?= $block->escapeHtml($_country['label']) ?>
+                    </option>
                     <?php endforeach ?>
                 </select>
                 <select id="<?= /* @noEscape */ $elementName ?>_weee_tax_row_<%- data.index %>_state"
@@ -81,7 +101,8 @@ $data = ['fptAttribute' => [
                        type="text" value="<%- data.value %>"/>
             </td>
             <td class="col-action">
-                <input name="<?= /* @noEscape */ $elementName ?>[<%- data.index %>][delete]" class="delete" type="hidden" value="" data-role="delete-fpt-item"/>
+                <input name="<?= /* @noEscape */ $elementName ?>[<%- data.index %>][delete]" class="delete"
+                       type="hidden" value="" data-role="delete-fpt-item"/>
                 <?= $block->getChildHtml('delete_button') ?>
             </td>
         </tr>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
index 15abae5c889fe..3a2dd0557ef2b 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
@@ -4,31 +4,43 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Templates.ThisInTemplate
+/**
+ * @var $block \Magento\Weee\Block\Item\Price\Renderer
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 
-/** @var $block \Magento\Weee\Block\Item\Price\Renderer */
+/** @var \Magento\Weee\Helper\Data $weeeHelper */
+$weeeHelper = $block->getData('weeeHelper');
 
 $_item = $block->getItem();
 ?>
-<?php if ($block->displayPriceWithWeeeDetails()) : ?>
-    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int) $_item->getId() ?>"}}'>
-<?php else : ?>
+<?php if ($block->displayPriceWithWeeeDetails()): ?>
+    <span class="cart-tax-total"
+          data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int) $_item->getId() ?>"}}'>
+<?php else: ?>
     <span class="cart-price">
 <?php endif; ?>
 <?= /* @noEscape */ $block->formatPrice($block->getRowDisplayPriceExclTax()) ?>
     </span>
 
-<?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
-    <span class="cart-tax-info" id="esubtotal-item-tax-details<?= (int) $_item->getId() ?>" style="display: none;">
-    <?php if ($block->displayPriceWithWeeeDetails()) : ?>
-        <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
-            <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['row_amount'], true, true) ?></span>
+<?php if ($weeeHelper->getApplied($_item)): ?>
+    <span class="cart-tax-info" id="esubtotal-item-tax-details<?= (int) $_item->getId() ?>">
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+            'display: none',
+            'div#esubtotal-item-tax-details' . (int) $item->getId()
+        ) ?>
+    <?php if ($block->displayPriceWithWeeeDetails()): ?>
+        <?php foreach ($weeeHelper->getApplied($_item) as $tax): ?>
+            <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
+                <?= /* @noEscape */ $block->formatPrice($tax['row_amount'], true, true) ?>
+            </span>
         <?php endforeach; ?>
     <?php endif; ?>
     </span>
 
-    <?php if ($block->displayFinalPrice()) : ?>
-        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int) $_item->getId() ?>"}}'>
+    <?php if ($block->displayFinalPrice()): ?>
+        <span class="cart-tax-total"
+              data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int) $_item->getId() ?>"}}'>
             <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total')) ?>">
                 <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?>
             </span>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
index b848698b8b829..546b2ec7c04b3 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
@@ -4,34 +4,43 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Templates.ThisInTemplate
-
-/** @var $block \Magento\Weee\Block\Item\Price\Renderer */
+/**
+ * @var $block \Magento\Weee\Block\Item\Price\Renderer
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 
 $_item = $block->getItem();
 /** @var $_weeeHelper \Magento\Weee\Helper\Data */
-$_weeeHelper = $this->helper(\Magento\Weee\Helper\Data::class);
+$_weeeHelper = $block->getData('weeeHelper');
 ?>
 <?php $_incl = $_item->getRowTotalInclTax(); ?>
-<?php if ($block->displayPriceWithWeeeDetails()) : ?>
-    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int) $_item->getId() ?>"}}'>
-<?php else : ?>
+<?php if ($block->displayPriceWithWeeeDetails()): ?>
+    <span class="cart-tax-total"
+          data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int) $_item->getId() ?>"}}'>
+<?php else: ?>
     <span class="cart-price">
 <?php endif; ?>
 <?= /* @noEscape */ $block->formatPrice($block->getRowDisplayPriceInclTax()) ?>
     </span>
 
-<?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
-    <span class="cart-tax-info" id="subtotal-item-tax-details<?= (int) $_item->getId() ?>" style="display: none;">
-        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
-            <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
-                <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span>
+<?php if ($_weeeHelper->getApplied($_item)): ?>
+    <span class="cart-tax-info" id="subtotal-item-tax-details<?= (int) $_item->getId() ?>">
+        <?php if ($block->displayPriceWithWeeeDetails()): ?>
+            <?php foreach ($_weeeHelper->getApplied($_item) as $tax): ?>
+                <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
+                    <?= /* @noEscape */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?>
+                </span>
             <?php endforeach; ?>
         <?php endif; ?>
     </span>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+        'display: none',
+        'div#subtotal-item-tax-details' . (int) $item->getId()
+    ) ?>
 
-    <?php if ($block->displayFinalPrice()) : ?>
-        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int) $_item->getId() ?>"}}'>
+    <?php if ($block->displayFinalPrice()): ?>
+        <span class="cart-tax-total"
+              data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int) $_item->getId() ?>"}}'>
             <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total Incl. Tax')) ?>">
                 <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?>
             </span>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
index a485de90c871d..b9b43c8c5eac3 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
@@ -4,31 +4,43 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Templates.ThisInTemplate
+/**
+ * @var $block \Magento\Weee\Block\Item\Price\Renderer
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 
-/** @var $block \Magento\Weee\Block\Item\Price\Renderer */
+/** @var \Magento\Weee\Helper\Data $weeeHelper */
+$weeeHelper = $block->getData('weeeHelper');
 
 $_item = $block->getItem();
 ?>
-<?php if ($block->displayPriceWithWeeeDetails()) : ?>
-    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int) $_item->getId() ?>"}}'>
-<?php else : ?>
+<?php if ($block->displayPriceWithWeeeDetails()): ?>
+    <span class="cart-tax-total"
+          data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int) $_item->getId() ?>"}}'>
+<?php else: ?>
     <span class="cart-price">
 <?php endif; ?>
 
 <?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
     </span>
-<?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
-    <span class="cart-tax-info" id="eunit-item-tax-details<?= (int) $_item->getId() ?>" style="display:none;">
-    <?php if ($block->displayPriceWithWeeeDetails()) : ?>
-        <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
-            <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['amount'], true, true) ?></span>
+<?php if ($weeeHelper->getApplied($_item)): ?>
+    <span class="cart-tax-info" id="eunit-item-tax-details<?= (int) $_item->getId() ?>">
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+            'display: none',
+            'span#eunit-item-tax-details' . (int) $item->getId()
+        ) ?>
+    <?php if ($block->displayPriceWithWeeeDetails()): ?>
+        <?php foreach ($weeeHelper->getApplied($_item) as $tax): ?>
+            <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
+                <?= /* @noEscape */ $block->formatPrice($tax['amount'], true, true) ?>
+            </span>
         <?php endforeach; ?>
     <?php endif; ?>
     </span>
 
-    <?php if ($block->displayFinalPrice()) : ?>
-        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int) $_item->getId() ?>"}}'>
+    <?php if ($block->displayFinalPrice()): ?>
+        <span class="cart-tax-total"
+              data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int) $_item->getId() ?>"}}'>
             <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total')) ?>">
                 <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
             </span>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
index 0dada610e181e..24023c0088e3e 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
@@ -4,35 +4,44 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Templates.ThisInTemplate
-
-/** @var $block \Magento\Weee\Block\Item\Price\Renderer */
+/**
+ * @var $block \Magento\Weee\Block\Item\Price\Renderer
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 
 $_item = $block->getItem();
 /** @var $_weeeHelper \Magento\Weee\Helper\Data */
-$_weeeHelper = $this->helper(\Magento\Weee\Helper\Data::class);
+$_weeeHelper = $block->getData('weeeHelper');
 ?>
 <?php $_incl = $_item->getPriceInclTax(); ?>
-<?php if ($block->displayPriceWithWeeeDetails()) : ?>
-    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int) $_item->getId() ?>"}}'>
-<?php else : ?>
+<?php if ($block->displayPriceWithWeeeDetails()): ?>
+    <span class="cart-tax-total"
+          data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int) $_item->getId() ?>"}}'>
+<?php else: ?>
     <span class="cart-price">
 <?php endif; ?>
 
 <?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
     </span>
 
-<?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item)) : ?>
-    <span class="cart-tax-info" id="unit-item-tax-details<?= (int) $_item->getId() ?>" style="display: none;">
-        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
-            <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($_item) as $tax) : ?>
-                <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>"><?= /* @noEscape */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?></span>
+<?php if ($_weeeHelper->getApplied($_item)): ?>
+    <span class="cart-tax-info" id="unit-item-tax-details<?= (int) $_item->getId() ?>">
+        <?php if ($block->displayPriceWithWeeeDetails()): ?>
+            <?php foreach ($_weeeHelper->getApplied($_item) as $tax): ?>
+                <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
+                    <?= /* @noEscape */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?>
+                </span>
             <?php endforeach; ?>
         <?php endif; ?>
     </span>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+        'display: none',
+        'span#unit-item-tax-details' . (int) $item->getId()
+    ) ?>
 
-    <?php if ($block->displayFinalPrice()) : ?>
-        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int) $_item->getId() ?>"}}'>
+    <?php if ($block->displayFinalPrice()): ?>
+        <span class="cart-tax-total"
+              data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int) $_item->getId() ?>"}}'>
             <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total Incl. Tax')) ?>">
                 <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
             </span>
diff --git a/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml b/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
index 37aa852871408..05ff81be25c99 100644
--- a/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
@@ -4,35 +4,44 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Templates.ThisInTemplate
+/**
+ * @var $block \Magento\Weee\Block\Item\Price\Renderer
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 
-/** @var $block \Magento\Weee\Block\Item\Price\Renderer */
+/** @var \Magento\Weee\Helper\Data $weeeHelper */
+$weeeHelper = $block->getData('weeeHelper');
 
 $item = $block->getItem();
 ?>
-<?php if (($block->displayPriceInclTax() || $block->displayBothPrices()) && !$item->getNoSubtotal()) : ?>
+<?php if (($block->displayPriceInclTax() || $block->displayBothPrices()) && !$item->getNoSubtotal()): ?>
     <span class="price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
-        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
+        <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <span class="cart-tax-total"
                 data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int) $item->getId() ?>"}}'>
-        <?php else : ?>
+        <?php else: ?>
             <span class="cart-price">
         <?php endif; ?>
             <?= /* @noEscape */ $block->formatPrice($block->getRowDisplayPriceInclTax()) ?>
             </span>
 
-        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item)) : ?>
-            <div class="cart-tax-info" id="subtotal-item-tax-details<?= (int) $item->getId() ?>" style="display: none;">
-                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item) as $tax) : ?>
+        <?php if ($weeeHelper->getApplied($item)): ?>
+            <div class="cart-tax-info" id="subtotal-item-tax-details<?= (int) $item->getId() ?>">
+                <?php foreach ($weeeHelper->getApplied($item) as $tax): ?>
                     <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
                         <?= /* @noEscape */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?>
                     </span>
                 <?php endforeach; ?>
             </div>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                'display: none',
+                'div#subtotal-item-tax-details' . (int) $item->getId()
+            ) ?>
 
-            <?php if ($block->displayFinalPrice()) : ?>
+            <?php if ($block->displayFinalPrice()): ?>
                 <span class="cart-tax-total"
-                    data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int) $item->getId() ?>"}}'>
+                    data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= (int) $item->getId()
+                    ?>"}}'>
                     <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total Incl. Tax')) ?>">
                         <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?>
                     </span>
@@ -42,30 +51,34 @@ $item = $block->getItem();
     </span>
 <?php endif; ?>
 
-<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
     <span class="price-excluding-tax" data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>">
-        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
+        <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <span class="cart-tax-total"
-                data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int) $item->getId() ?>"}}'>
-        <?php else : ?>
+                data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int) $item->getId()?>"}}'>
+        <?php else: ?>
             <span class="cart-price">
         <?php endif; ?>
                 <?= /* @noEscape */ $block->formatPrice($block->getRowDisplayPriceExclTax()) ?>
             </span>
 
-        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item)) : ?>
-            <span class="cart-tax-info" id="esubtotal-item-tax-details<?= (int) $item->getId() ?>"
-                style="display: none;">
-                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item) as $tax) : ?>
+        <?php if ($weeeHelper->getApplied($item)): ?>
+            <span class="cart-tax-info" id="esubtotal-item-tax-details<?= (int) $item->getId() ?>">
+                <?php foreach ($weeeHelper->getApplied($item) as $tax): ?>
                     <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
                         <?= /* @noEscape */ $block->formatPrice($tax['row_amount'], true, true) ?>
                     </span>
                 <?php endforeach; ?>
             </span>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                'display: none',
+                'div#esubtotal-item-tax-details' . (int) $item->getId()
+            ) ?>
 
-            <?php if ($block->displayFinalPrice()) : ?>
+            <?php if ($block->displayFinalPrice()): ?>
                 <span class="cart-tax-total"
-                      data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int) $item->getId() ?>"}}'>
+                      data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= (int)$item->getId()
+                        ?>"}}'>
                     <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total')) ?>">
                         <?= /* @noEscape */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?>
                     </span>
diff --git a/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml b/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
index 4e62409ad00f4..980f94b3ba80d 100644
--- a/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
@@ -4,33 +4,41 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Templates.ThisInTemplate
+/**
+ * @var $block \Magento\Weee\Block\Item\Price\Renderer
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 
-/** @var $block \Magento\Weee\Block\Item\Price\Renderer */
+/** @var \Magento\Weee\Helper\Data $weeeHelper */
+$weeeHelper = $block->getData('weeeHelper');
 
 $item = $block->getItem();
 ?>
-<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()) : ?>
+<?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
     <span class="price-including-tax" data-label="<?= $block->escapeHtmlAttr(__('Incl. Tax')) ?>">
-        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
+        <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <span class="cart-tax-total"
                 data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int) $item->getId() ?>"}}'>
-        <?php else : ?>
+        <?php else: ?>
             <span class="cart-price">
         <?php endif; ?>
             <?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
             </span>
 
-        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item)) : ?>
-            <span class="cart-tax-info" id="unit-item-tax-details<?= (int) $item->getId() ?>" style="display: none;">
-                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item) as $tax) : ?>
+        <?php if ($weeeHelper->getApplied($item)): ?>
+            <span class="cart-tax-info" id="unit-item-tax-details<?= (int) $item->getId() ?>">
+                <?php foreach ($weeeHelper->getApplied($item) as $tax): ?>
                     <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
                         <?= /* @noEscape */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?>
                     </span>
                 <?php endforeach; ?>
             </span>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                'display: none',
+                'span#unit-item-tax-details' . (int) $item->getId()
+            ) ?>
 
-            <?php if ($block->displayFinalPrice()) : ?>
+            <?php if ($block->displayFinalPrice()): ?>
                 <span class="cart-tax-total"
                     data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= (int) $item->getId() ?>"}}'>
                     <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total Incl. Tax')) ?>">
@@ -42,30 +50,32 @@ $item = $block->getItem();
     </span>
 <?php endif; ?>
 
-<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()) : ?>
+<?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
     <span class="price-excluding-tax" data-label="<?= $block->escapeHtmlAttr(__('Excl. Tax')) ?>">
-        <?php if ($block->displayPriceWithWeeeDetails()) : ?>
+        <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <span class="cart-tax-total"
                 data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int) $item->getId() ?>"}}'>
-        <?php else : ?>
+        <?php else: ?>
             <span class="cart-price">
         <?php endif; ?>
                 <?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
             </span>
 
-        <?php if ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item)) : ?>
-            <span class="cart-tax-info" id="eunit-item-tax-details<?= (int) $item->getId() ?>"
-                style="display: none;">
-                <?php foreach ($this->helper(\Magento\Weee\Helper\Data::class)->getApplied($item) as $tax) : ?>
+        <?php if ($weeeHelper->getApplied($item)): ?>
+            <span class="cart-tax-info" id="eunit-item-tax-details<?= (int) $item->getId() ?>">
+                <?php foreach ($weeeHelper->getApplied($item) as $tax): ?>
                     <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
                         <?= /* @noEscape */ $block->formatPrice($tax['amount'], true, true) ?>
                     </span>
                 <?php endforeach; ?>
             </span>
-
-            <?php if ($block->displayFinalPrice()) : ?>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                'display: none',
+                'span#eunit-item-tax-details' . (int) $item->getId()
+            ) ?>
+            <?php if ($block->displayFinalPrice()): ?>
                 <span class="cart-tax-total"
-                      data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= (int) $item->getId() ?>"}}'>
+                      data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?=(int)$item->getId()?>"}}'>
                     <span class="weee" data-label="<?= $block->escapeHtmlAttr(__('Total')) ?>">
                         <?= /* @noEscape */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
                     </span>

From 69c8b58023a809c03f91c3e7148302370cdd213f Mon Sep 17 00:00:00 2001
From: Dmytro Voskoboinikov <voskoboi@adobe.com>
Date: Thu, 30 Apr 2020 12:10:17 -0500
Subject: [PATCH 0211/1718] MC-29566: [2.4.x] Deprecate SID query
 parameter-related methods

---
 .../testsuite/Magento/Framework/Session/SessionManagerTest.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php
index 6ce5f0cf39c29..13b897b0012d6 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php
@@ -111,7 +111,7 @@ class SessionManagerTest extends \PHPUnit\Framework\TestCase
         private $request;
 
         /**
-         * @var State|\PHPUnit_Framework_MockObject_MockObject
+         * @var State|\PHPUnit\Framework\MockObject\MockObject
          */
         private $appState;
 

From c7a02e0a4113b48ce63dfda965b1d2e52da77de9 Mon Sep 17 00:00:00 2001
From: oleksandrkravchuk <oleksandr.kravchuk@vaimo.com>
Date: Sat, 2 May 2020 09:30:07 +0200
Subject: [PATCH 0212/1718] PHPStan add support of magic methods of Data
 Object. Expand blacklist, add exceptions, fix integrity tests.

---
 .../Reflection/DataObject/MagicMethodsTest.php        |  2 +-
 .../Test/Php/_files/phpstan/blacklist/common.txt      |  1 +
 .../Magento/Test/Php/_files/phpstan/phpstan.neon      | 11 +++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/MagicMethodsTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/MagicMethodsTest.php
index 773f215f35696..fd82995d0e9d4 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/MagicMethodsTest.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/PhpStan/Reflection/DataObject/MagicMethodsTest.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\PhpStan\Reflection\DataObject\Fixtures;
+namespace Magento\PhpStan\Reflection\DataObject;
 
 use PHPStan\Rules\Methods\CallMethodsRule;
 use PHPStan\Rules\Rule;
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/blacklist/common.txt
index d153593a5ed4f..35c6e3d624ce0 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/blacklist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/blacklist/common.txt
@@ -15,3 +15,4 @@ dev/tests/api-functional/testsuite/Magento/Customer/Api/AddressRepositoryTest.ph
 dev/tests/api-functional/testsuite/Magento/Framework/Model/Entity/HydratorTest.php
 dev/tests/api-functional/testsuite/Magento/Integration/Model/AdminTokenServiceTest.php
 dev/tests/api-functional/testsuite/Magento/Integration/Model/CustomerTokenServiceTest.php
+dev/tools/UpgradeScripts/pre_composer_update_2.3.php
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/phpstan.neon b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/phpstan.neon
index 7fa77cc50d62c..38e23ac6b657b 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/phpstan.neon
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/phpstan.neon
@@ -27,6 +27,17 @@ parameters:
 		- '#Function setCustomErrorHandler not found#'
 		# Ignore 'return statement is missing' error when 'void' is present in return type list
 		- '#Method (?:.*?) should return (?:.*?)void(?:.*?) but return statement is missing.#'
+		# Ignore constants, defined dynamically.
+		- '#Constant TESTS_WEB_API_ADAPTER not found.#'
+		- '#Constant TESTS_BASE_URL not found.#'
+		- '#Constant TESTS_XDEBUG_ENABLED not found.#'
+		- '#Constant TESTS_XDEBUG_SESSION not found.#'
+		- '#Constant INTEGRATION_TESTS_DIR not found.#'
+		- '#Constant MAGENTO_MODULES_PATH not found.#'
+		- '#Constant TESTS_MODULES_PATH not found.#'
+		- '#Constant TESTS_INSTALLATION_DB_CONFIG_FILE not found.#'
+		- '#Constant T_[A-Z_]+ not found.#'
+
 
 services:
     -

From 859307b2cf3cd1898cf9d38860408a9eebdade2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Paw=C5=82owski?= <m.pawlowski@nowaera.pl>
Date: Fri, 13 Dec 2019 19:05:28 +0100
Subject: [PATCH 0213/1718] prevent pointless session start in webapi scope

---
 app/code/Magento/Customer/etc/webapi_rest/di.xml | 2 +-
 app/code/Magento/PageCache/etc/di.xml            | 3 ---
 app/code/Magento/PageCache/etc/frontend/di.xml   | 1 +
 app/code/Magento/User/etc/webapi_rest/di.xml     | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Customer/etc/webapi_rest/di.xml b/app/code/Magento/Customer/etc/webapi_rest/di.xml
index f2457963a5f3d..5f3ca2fdb7453 100644
--- a/app/code/Magento/Customer/etc/webapi_rest/di.xml
+++ b/app/code/Magento/Customer/etc/webapi_rest/di.xml
@@ -13,7 +13,7 @@
         <arguments>
             <argument name="userContexts" xsi:type="array">
                 <item name="customerSessionUserContext" xsi:type="array">
-                    <item name="type" xsi:type="object">Magento\Customer\Model\Authorization\CustomerSessionUserContext</item>
+                    <item name="type" xsi:type="object">Magento\Customer\Model\Authorization\CustomerSessionUserContext\Proxy</item>
                     <item name="sortOrder" xsi:type="string">20</item>
                 </item>
             </argument>
diff --git a/app/code/Magento/PageCache/etc/di.xml b/app/code/Magento/PageCache/etc/di.xml
index adf9526fc1108..2a9abbb860805 100644
--- a/app/code/Magento/PageCache/etc/di.xml
+++ b/app/code/Magento/PageCache/etc/di.xml
@@ -37,9 +37,6 @@
             <argument name="layoutCacheKey" xsi:type="object">Magento\Framework\View\Layout\LayoutCacheKeyInterface</argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\App\FrontControllerInterface">
-        <plugin name="page_cache_from_key_from_cookie" type="Magento\PageCache\Plugin\RegisterFormKeyFromCookie" />
-    </type>
     <preference for="Magento\PageCache\Model\VclGeneratorInterface" type="Magento\PageCache\Model\Varnish\VclGenerator"/>
     <preference for="Magento\PageCache\Model\VclTemplateLocatorInterface" type="Magento\PageCache\Model\Varnish\VclTemplateLocator"/>
 </config>
diff --git a/app/code/Magento/PageCache/etc/frontend/di.xml b/app/code/Magento/PageCache/etc/frontend/di.xml
index a396a46ae7346..5eaa650a0fc77 100644
--- a/app/code/Magento/PageCache/etc/frontend/di.xml
+++ b/app/code/Magento/PageCache/etc/frontend/di.xml
@@ -9,6 +9,7 @@
     <type name="Magento\Framework\App\FrontControllerInterface">
         <plugin name="front-controller-builtin-cache" type="Magento\PageCache\Model\App\FrontController\BuiltinPlugin"/>
         <plugin name="front-controller-varnish-cache" type="Magento\PageCache\Model\App\FrontController\VarnishPlugin"/>
+        <plugin name="page_cache_from_key_from_cookie" type="Magento\PageCache\Plugin\RegisterFormKeyFromCookie" />
     </type>
     <type name="Magento\Framework\Controller\ResultInterface">
         <plugin name="result-builtin-cache" type="Magento\PageCache\Model\Controller\Result\BuiltinPlugin"/>
diff --git a/app/code/Magento/User/etc/webapi_rest/di.xml b/app/code/Magento/User/etc/webapi_rest/di.xml
index 7c6cccb454df7..930e505648d9c 100644
--- a/app/code/Magento/User/etc/webapi_rest/di.xml
+++ b/app/code/Magento/User/etc/webapi_rest/di.xml
@@ -10,7 +10,7 @@
         <arguments>
             <argument name="userContexts" xsi:type="array">
                 <item name="adminSessionUserContext" xsi:type="array">
-                    <item name="type" xsi:type="object">Magento\User\Model\Authorization\AdminSessionUserContext</item>
+                    <item name="type" xsi:type="object">Magento\User\Model\Authorization\AdminSessionUserContext\Proxy</item>
                     <item name="sortOrder" xsi:type="string">30</item>
                 </item>
             </argument>

From 8aed39fd69115f93282e933fdbdf7d8584daa082 Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Tue, 31 Mar 2020 13:44:53 +0300
Subject: [PATCH 0214/1718] magento2/pull/26032: Fix api-functional tests

---
 .../Catalog/ProductInMultipleStoresTest.php   | 19 +++++++------
 .../ProductInMultipleStoresCacheTest.php      | 28 +++++++++----------
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductInMultipleStoresTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductInMultipleStoresTest.php
index d17b434f39d9f..d26afd4287819 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductInMultipleStoresTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductInMultipleStoresTest.php
@@ -8,10 +8,13 @@
 namespace Magento\GraphQl\Catalog;
 
 use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQl\ResponseContainsErrorsException;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 /**
- * Class ProductInMultipleStoresTest
+ * Class for ProductInMultipleStoresTest
+ *
+ * @magentoAppIsolation enabled
  */
 class ProductInMultipleStoresTest extends GraphQlAbstract
 {
@@ -74,6 +77,13 @@ public function testProductFromSpecificAndDefaultStore()
             'Product name in fixture store is invalid.'
         );
 
+        // use case for invalid storeCode
+        $nonExistingStoreCode = "non_existent_store";
+        $headerMapInvalidStoreCode = ['Store' => $nonExistingStoreCode];
+        $this->expectException(ResponseContainsErrorsException::class);
+        $this->expectExceptionMessage('Requested store is not found');
+        $this->graphQlQuery($query, [], '', $headerMapInvalidStoreCode);
+
         //use case for default storeCode
         $nameInDefaultStore = 'Simple Product';
         $headerMapDefault = ['Store' => 'default'];
@@ -92,12 +102,5 @@ public function testProductFromSpecificAndDefaultStore()
             $response['products']['items'][0]['name'],
             'Product in the default store should be returned'
         );
-
-        // use case for invalid storeCode
-        $nonExistingStoreCode = "non_existent_store";
-        $headerMapInvalidStoreCode = ['Store' => $nonExistingStoreCode];
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('Requested store is not found');
-        $this->graphQlQuery($query, [], '', $headerMapInvalidStoreCode);
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/ProductInMultipleStoresCacheTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/ProductInMultipleStoresCacheTest.php
index cf4cebdfe8e44..3bc1096db87c0 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/ProductInMultipleStoresCacheTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/ProductInMultipleStoresCacheTest.php
@@ -271,7 +271,7 @@ public function testProductFromSpecificAndDefaultStoreWithMultiCurrency()
         );
 
         // test non cached store + currency header in USD not cached
-        $headerMap = ['Store' => 'default', 'Content-Currency' => 'USD'];
+        $headerMap = ['Store' => 'default', 'Content-Currency' => 'EUR'];
         $response = $this->graphQlQuery($query, [], '', $headerMap);
         $this->assertEquals(
             'Simple Product',
@@ -279,13 +279,20 @@ public function testProductFromSpecificAndDefaultStoreWithMultiCurrency()
             'Product name in fixture store is invalid.'
         );
         $this->assertEquals(
-            'USD',
+            'EUR',
             $response['products']['items'][0]['price']['minimalPrice']['amount']['currency'],
-            'Currency code USD in fixture store default is unexpected'
+            'Currency code EUR in fixture store default is unexpected'
         );
 
+        // test cached response store + currency header with non existing currency, and no valid response, no cache
+        $headerMap = ['Store' => $storeCodeFromFixture, 'Content-Currency' => 'SOMECURRENCY'];
+        $this->expectExceptionMessage(
+            'GraphQL response contains errors: Please correct the target currency'
+        );
+        $this->graphQlQuery($query, [], '', $headerMap);
+
         // test non cached store + currency header in USD not cached
-        $headerMap = ['Store' => 'default', 'Content-Currency' => 'EUR'];
+        $headerMap = ['Store' => 'default', 'Content-Currency' => 'USD'];
         $response = $this->graphQlQuery($query, [], '', $headerMap);
         $this->assertEquals(
             'Simple Product',
@@ -293,12 +300,12 @@ public function testProductFromSpecificAndDefaultStoreWithMultiCurrency()
             'Product name in fixture store is invalid.'
         );
         $this->assertEquals(
-            'EUR',
+            'USD',
             $response['products']['items'][0]['price']['minimalPrice']['amount']['currency'],
-            'Currency code EUR in fixture store default is unexpected'
+            'Currency code USD in fixture store default is unexpected'
         );
 
-        // test non cached store + currency header in USD  cached
+        // test non cached store + currency header in USD cached
         $headerMap = ['Store' => 'default'];
         $response = $this->graphQlQuery($query, [], '', $headerMap);
         $this->assertEquals(
@@ -311,12 +318,5 @@ public function testProductFromSpecificAndDefaultStoreWithMultiCurrency()
             $response['products']['items'][0]['price']['minimalPrice']['amount']['currency'],
             'Currency code USD in fixture store default is unexpected'
         );
-
-        // test cached response store + currency header with non existing currency, and no valid response, no cache
-        $headerMap = ['Store' => $storeCodeFromFixture, 'Content-Currency' => 'SOMECURRENCY'];
-        $this->expectExceptionMessage(
-            'GraphQL response contains errors: Please correct the target currency'
-        );
-        $this->graphQlQuery($query, [], '', $headerMap);
     }
 }

From 4a05e7864ae1621dff12469cc8395ebace13699e Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Fri, 3 Apr 2020 22:29:15 +0300
Subject: [PATCH 0215/1718] #7213 prevent pointless session start in webapi
 scope

---
 app/code/Magento/PageCache/etc/frontend/di.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/PageCache/etc/frontend/di.xml b/app/code/Magento/PageCache/etc/frontend/di.xml
index 5eaa650a0fc77..1aaa331da7025 100644
--- a/app/code/Magento/PageCache/etc/frontend/di.xml
+++ b/app/code/Magento/PageCache/etc/frontend/di.xml
@@ -9,7 +9,7 @@
     <type name="Magento\Framework\App\FrontControllerInterface">
         <plugin name="front-controller-builtin-cache" type="Magento\PageCache\Model\App\FrontController\BuiltinPlugin"/>
         <plugin name="front-controller-varnish-cache" type="Magento\PageCache\Model\App\FrontController\VarnishPlugin"/>
-        <plugin name="page_cache_from_key_from_cookie" type="Magento\PageCache\Plugin\RegisterFormKeyFromCookie" />
+        <plugin name="page_cache_form_key_from_cookie" type="Magento\PageCache\Plugin\RegisterFormKeyFromCookie" />
     </type>
     <type name="Magento\Framework\Controller\ResultInterface">
         <plugin name="result-builtin-cache" type="Magento\PageCache\Model\Controller\Result\BuiltinPlugin"/>

From cfa889ef339d9ab826eff143d25a6a4b8ec39b20 Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Tue, 7 Apr 2020 11:41:54 +0300
Subject: [PATCH 0216/1718] Fixed tests.

---
 .../Catalog/ProductInMultipleStoresTest.php   | 27 ++++++++---
 .../ProductInMultipleStoresCacheTest.php      | 47 ++++++++++++++-----
 2 files changed, 54 insertions(+), 20 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductInMultipleStoresTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductInMultipleStoresTest.php
index d26afd4287819..2c07ca4ee096b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductInMultipleStoresTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductInMultipleStoresTest.php
@@ -7,8 +7,8 @@
 
 namespace Magento\GraphQl\Catalog;
 
+use Magento\PageCache\Model\Cache\Type as PageCache;
 use Magento\TestFramework\ObjectManager;
-use Magento\TestFramework\TestCase\GraphQl\ResponseContainsErrorsException;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 /**
@@ -77,12 +77,7 @@ public function testProductFromSpecificAndDefaultStore()
             'Product name in fixture store is invalid.'
         );
 
-        // use case for invalid storeCode
-        $nonExistingStoreCode = "non_existent_store";
-        $headerMapInvalidStoreCode = ['Store' => $nonExistingStoreCode];
-        $this->expectException(ResponseContainsErrorsException::class);
-        $this->expectExceptionMessage('Requested store is not found');
-        $this->graphQlQuery($query, [], '', $headerMapInvalidStoreCode);
+        $this->flushPageCache();
 
         //use case for default storeCode
         $nameInDefaultStore = 'Simple Product';
@@ -94,6 +89,8 @@ public function testProductFromSpecificAndDefaultStore()
             'Product name in default store is invalid.'
         );
 
+        $this->flushPageCache();
+
         //use case for empty storeCode
         $headerMapEmpty = ['Store' => ''];
         $response = $this->graphQlQuery($query, [], '', $headerMapEmpty);
@@ -102,5 +99,21 @@ public function testProductFromSpecificAndDefaultStore()
             $response['products']['items'][0]['name'],
             'Product in the default store should be returned'
         );
+
+        $this->flushPageCache();
+
+        // use case for invalid storeCode
+        $nonExistingStoreCode = "non_existent_store";
+        $headerMapInvalidStoreCode = ['Store' => $nonExistingStoreCode];
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Requested store is not found');
+        $this->graphQlQuery($query, [], '', $headerMapInvalidStoreCode);
+    }
+
+    protected function flushPageCache(): void
+    {
+        /** @var PageCache $fullPageCache */
+        $fullPageCache = ObjectManager::getInstance()->get(PageCache::class);
+        $fullPageCache->clean();
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/ProductInMultipleStoresCacheTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/ProductInMultipleStoresCacheTest.php
index 3bc1096db87c0..6736b34ae3a99 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/ProductInMultipleStoresCacheTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/ProductInMultipleStoresCacheTest.php
@@ -7,6 +7,7 @@
 
 namespace Magento\GraphQl\PageCache;
 
+use Magento\PageCache\Model\Cache\Type as PageCache;
 use Magento\TestFramework\ObjectManager;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -242,6 +243,8 @@ public function testProductFromSpecificAndDefaultStoreWithMultiCurrency()
             'Currency code EUR in fixture ' . $storeCodeFromFixture . ' is unexpected'
         );
 
+        $this->flushPageCache();
+
         // test cached store + currency header in Euros
         $headerMap = ['Store' => $storeCodeFromFixture, 'Content-Currency' => 'EUR'];
         $response = $this->graphQlQuery($query, [], '', $headerMap);
@@ -256,6 +259,8 @@ public function testProductFromSpecificAndDefaultStoreWithMultiCurrency()
             'Currency code EUR in fixture ' . $storeCodeFromFixture . ' is unexpected'
         );
 
+        $this->flushPageCache();
+
         // test non cached store + currency header in USD
         $headerMap = ['Store' => $storeCodeFromFixture, 'Content-Currency' => 'USD'];
         $response = $this->graphQlQuery($query, [], '', $headerMap);
@@ -270,8 +275,10 @@ public function testProductFromSpecificAndDefaultStoreWithMultiCurrency()
             'Currency code USD in fixture ' . $storeCodeFromFixture . ' is unexpected'
         );
 
+        $this->flushPageCache();
+
         // test non cached store + currency header in USD not cached
-        $headerMap = ['Store' => 'default', 'Content-Currency' => 'EUR'];
+        $headerMap = ['Store' => 'default', 'Content-Currency' => 'USD'];
         $response = $this->graphQlQuery($query, [], '', $headerMap);
         $this->assertEquals(
             'Simple Product',
@@ -279,20 +286,15 @@ public function testProductFromSpecificAndDefaultStoreWithMultiCurrency()
             'Product name in fixture store is invalid.'
         );
         $this->assertEquals(
-            'EUR',
+            'USD',
             $response['products']['items'][0]['price']['minimalPrice']['amount']['currency'],
-            'Currency code EUR in fixture store default is unexpected'
+            'Currency code USD in fixture store default is unexpected'
         );
 
-        // test cached response store + currency header with non existing currency, and no valid response, no cache
-        $headerMap = ['Store' => $storeCodeFromFixture, 'Content-Currency' => 'SOMECURRENCY'];
-        $this->expectExceptionMessage(
-            'GraphQL response contains errors: Please correct the target currency'
-        );
-        $this->graphQlQuery($query, [], '', $headerMap);
+        $this->flushPageCache();
 
         // test non cached store + currency header in USD not cached
-        $headerMap = ['Store' => 'default', 'Content-Currency' => 'USD'];
+        $headerMap = ['Store' => 'default', 'Content-Currency' => 'EUR'];
         $response = $this->graphQlQuery($query, [], '', $headerMap);
         $this->assertEquals(
             'Simple Product',
@@ -300,12 +302,14 @@ public function testProductFromSpecificAndDefaultStoreWithMultiCurrency()
             'Product name in fixture store is invalid.'
         );
         $this->assertEquals(
-            'USD',
+            'EUR',
             $response['products']['items'][0]['price']['minimalPrice']['amount']['currency'],
-            'Currency code USD in fixture store default is unexpected'
+            'Currency code EUR in fixture store default is unexpected'
         );
 
-        // test non cached store + currency header in USD cached
+        $this->flushPageCache();
+
+        // test non cached store + currency header in USD  cached
         $headerMap = ['Store' => 'default'];
         $response = $this->graphQlQuery($query, [], '', $headerMap);
         $this->assertEquals(
@@ -318,5 +322,22 @@ public function testProductFromSpecificAndDefaultStoreWithMultiCurrency()
             $response['products']['items'][0]['price']['minimalPrice']['amount']['currency'],
             'Currency code USD in fixture store default is unexpected'
         );
+
+        $this->flushPageCache();
+
+        // test cached response store + currency header with non existing currency, and no valid response, no cache
+        $headerMap = ['Store' => $storeCodeFromFixture, 'Content-Currency' => 'SOMECURRENCY'];
+        $this->expectExceptionMessage(
+            'GraphQL response contains errors: Please correct the target currency'
+        );
+
+        $this->graphQlQuery($query, [], '', $headerMap);
+    }
+
+    protected function flushPageCache(): void
+    {
+        /** @var PageCache $fullPageCache */
+        $fullPageCache = ObjectManager::getInstance()->get(PageCache::class);
+        $fullPageCache->clean();
     }
 }

From b219c4e8a260bd6742a0d19954aa157791ac6727 Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Tue, 14 Apr 2020 15:53:08 +0300
Subject: [PATCH 0217/1718] Added test for API functional. Check for non exist
 cookie PHPSESSID, for non exist session of REST call.

---
 .../Magento/Webapi/RestSessionCookieTest.php  | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/Webapi/RestSessionCookieTest.php

diff --git a/dev/tests/api-functional/testsuite/Magento/Webapi/RestSessionCookieTest.php b/dev/tests/api-functional/testsuite/Magento/Webapi/RestSessionCookieTest.php
new file mode 100644
index 0000000000000..9f297c5da252f
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/Webapi/RestSessionCookieTest.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Webapi;
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Class for RestSessionCookieTest
+ */
+class RestSessionCookieTest extends \Magento\TestFramework\TestCase\WebapiAbstract
+{
+
+    /**
+     * Check for non exist cookie PHPSESSID
+     */
+    public function testRestNoAcceptHeader()
+    {
+        $this->_markTestAsRestOnly();
+        /** @var $curlClient CurlClientWithCookies */
+
+        $curlClient = Bootstrap::getObjectManager()
+            ->get(\Magento\TestFramework\TestCase\HttpClient\CurlClientWithCookies::class);
+        $phpSessionCookieName =
+            [
+                'cookie_name' => 'PHPSESSID',
+            ];
+
+        $response = $curlClient->get('/rest/V1/directory/countries', []);
+
+        $cookie = $this->findCookie($phpSessionCookieName['cookie_name'], $response['cookies']);
+        $this->assertNull($cookie);
+    }
+
+    /**
+     * Find cookie with given name in the list of cookies
+     *
+     * @param string $cookieName
+     * @param array $cookies
+     * @return $cookie|null
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     */
+    private function findCookie($cookieName, $cookies)
+    {
+        foreach ($cookies as $cookieIndex => $cookie) {
+            if ($cookie['name'] === $cookieName) {
+                return $cookie;
+            }
+        }
+        return null;
+    }
+}

From c5ad40b08a573abe2a860ad9878c89d56addb3a0 Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Wed, 15 Apr 2020 12:39:56 +0300
Subject: [PATCH 0218/1718] Rename for test

---
 .../testsuite/Magento/Webapi/RestSessionCookieTest.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/Webapi/RestSessionCookieTest.php b/dev/tests/api-functional/testsuite/Magento/Webapi/RestSessionCookieTest.php
index 9f297c5da252f..e2c220164470f 100644
--- a/dev/tests/api-functional/testsuite/Magento/Webapi/RestSessionCookieTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Webapi/RestSessionCookieTest.php
@@ -17,7 +17,7 @@ class RestSessionCookieTest extends \Magento\TestFramework\TestCase\WebapiAbstra
     /**
      * Check for non exist cookie PHPSESSID
      */
-    public function testRestNoAcceptHeader()
+    public function testRestSessionNoCookie()
     {
         $this->_markTestAsRestOnly();
         /** @var $curlClient CurlClientWithCookies */

From da04422fc81933c90a2769ecc47cf8cfb0a6d231 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Paw=C5=82owski?= <m.pawlowski@nowaera.pl>
Date: Fri, 24 Jan 2020 23:56:09 +0100
Subject: [PATCH 0219/1718] set scoped identity at product alert email

---
 app/code/Magento/ProductAlert/Model/Email.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/ProductAlert/Model/Email.php b/app/code/Magento/ProductAlert/Model/Email.php
index 3351166aa6a12..1648c6726c27d 100644
--- a/app/code/Magento/ProductAlert/Model/Email.php
+++ b/app/code/Magento/ProductAlert/Model/Email.php
@@ -378,12 +378,13 @@ public function send()
                 'customerName' => $customerName,
                 'alertGrid' => $alertGrid,
             ]
-        )->setFrom(
+        )->setFromByScope(
             $this->_scopeConfig->getValue(
                 self::XML_PATH_EMAIL_IDENTITY,
                 ScopeInterface::SCOPE_STORE,
                 $storeId
-            )
+            ),
+            $storeId
         )->addTo(
             $this->_customer->getEmail(),
             $customerName

From 04146b63bd7d0d5c6f149941889f5c7b88c40167 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Mon, 4 May 2020 11:26:11 +0300
Subject: [PATCH 0220/1718] create new action group

---
 ...sertAdminIntegrationNameInFormActionGroup.xml | 16 ++++++++++++++++
 ...teIntegrationEntityWithDuplicatedNameTest.xml |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/Integration/Test/Mftf/ActionGroup/AssertAdminIntegrationNameInFormActionGroup.xml

diff --git a/app/code/Magento/Integration/Test/Mftf/ActionGroup/AssertAdminIntegrationNameInFormActionGroup.xml b/app/code/Magento/Integration/Test/Mftf/ActionGroup/AssertAdminIntegrationNameInFormActionGroup.xml
new file mode 100644
index 0000000000000..70903d524a4c1
--- /dev/null
+++ b/app/code/Magento/Integration/Test/Mftf/ActionGroup/AssertAdminIntegrationNameInFormActionGroup.xml
@@ -0,0 +1,16 @@
+<?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="AssertAdminIntegrationNameInFormActionGroup">
+        <arguments>
+            <argument name="name" type="string"/>
+        </arguments>
+        <seeInField userInput="{{name}}" selector="{{AdminNewIntegrationSection.name}}" stepKey="checkEnteredValueIsPreserved"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Integration/Test/Mftf/Test/AdminCreateIntegrationEntityWithDuplicatedNameTest.xml b/app/code/Magento/Integration/Test/Mftf/Test/AdminCreateIntegrationEntityWithDuplicatedNameTest.xml
index 769e8e4f75a21..92133d617f626 100644
--- a/app/code/Magento/Integration/Test/Mftf/Test/AdminCreateIntegrationEntityWithDuplicatedNameTest.xml
+++ b/app/code/Magento/Integration/Test/Mftf/Test/AdminCreateIntegrationEntityWithDuplicatedNameTest.xml
@@ -54,8 +54,8 @@
             <argument name="message" value="The integration with name &quot;{{defaultIntegrationData.name}}&quot; exists."/>
             <argument value="error" name="messageType"/>
         </actionGroup>
-        <actionGroup ref="AssertAdminIntegrationNameInFormActionGroup" stepKey="submitTheFormWithDuplicatedName">
-            <seeInField stepKey="checkEnteredValueIsPreserved" selector="{{AdminNewIntegrationSection.name}}" userInput="Integration1"/>
+        <actionGroup ref="AssertAdminIntegrationNameInFormActionGroup" stepKey="checkEnteredValueIsPreserved">
+            <argument name="name" value="{{defaultIntegrationData.name}}"/>
         </actionGroup>
     </test>
 </tests>

From 4758b4366c3881ce23272e39ea5f5d5a4417a1d7 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Mon, 4 May 2020 18:24:30 +0300
Subject: [PATCH 0221/1718] MC-29420: Remove event handlers from CE

---
 .../Fieldset/Options/Type/CheckboxTest.php    |  15 +-
 .../Fieldset/Options/Type/MultiTest.php       |  17 +-
 .../Fieldset/Options/Type/RadioTest.php       |  17 +-
 .../Fieldset/Options/Type/SelectTest.php      |  17 +-
 .../Form/Field/Select/AllowspecificTest.php   |  11 +-
 .../Block/System/Config/Form/FieldTest.php    |  23 +-
 .../Fieldset/Modules/DisableOutputTest.php    |  11 +
 .../Block/System/Config/Form/FieldsetTest.php |  14 +-
 .../Decorator/DebugHintsTest.php              |  35 ++-
 .../render/item/price_msrp_item.phtml         |   4 +-
 .../System/Config/Field/CountryTest.php       |  22 +-
 .../System/Config/Fieldset/GroupTest.php      |  18 +-
 .../frontend/templates/partner/logo.phtml     |   4 +-
 .../frontend/templates/payment/mark.phtml     |   4 +-
 .../frontend/templates/customer/list.phtml    |   2 +-
 .../frontend/templates/customer/recent.phtml  |   2 +-
 .../frontend/templates/customer/view.phtml    |   2 +-
 .../frontend/templates/helper/summary.phtml   |   2 +-
 .../templates/order/packaging/grid.phtml      |   3 +-
 .../templates/order/tracking/view.phtml       |   3 +-
 .../templates/product/layered/renderer.phtml  |  64 ++++--
 .../Widget/Block/Adminhtml/Widget/Chooser.php |  54 +++--
 .../catalog/category/widget/tree.phtml        |  67 ++++--
 .../templates/instance/edit/layout.phtml      | 211 +++++++++++++-----
 .../adminhtml/templates/instance/js.phtml     |  10 +-
 app/code/Magento/Wishlist/Block/Rss/Link.php  |   5 +
 .../customer/edit/tab/wishlist.phtml          |  22 +-
 .../view/frontend/templates/rss/email.phtml   |  14 +-
 .../view/frontend/templates/shared.phtml      |  35 ++-
 29 files changed, 545 insertions(+), 163 deletions(-)

diff --git a/app/code/Magento/Bundle/Test/Unit/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/CheckboxTest.php b/app/code/Magento/Bundle/Test/Unit/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/CheckboxTest.php
index 58c0436b5bf7c..5e901420bc3ba 100644
--- a/app/code/Magento/Bundle/Test/Unit/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/CheckboxTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/CheckboxTest.php
@@ -5,7 +5,9 @@
  */
 namespace Magento\Bundle\Test\Unit\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type;
 
+use Magento\Framework\DataObject;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
 class CheckboxTest extends \PHPUnit\Framework\TestCase
 {
@@ -16,9 +18,20 @@ class CheckboxTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
+        $secureRendererMock = $this->createMock(SecureHtmlRenderer::class);
+        $secureRendererMock->method('renderTag')
+            ->willReturnCallback(
+                function (string $tag, array $attributes, string $content): string {
+                    $attributes = new DataObject($attributes);
+
+                    return "<$tag {$attributes->serialize()}>$content</$tag>";
+                }
+            );
+
         $this->block = (new ObjectManager($this))
             ->getObject(
-                \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Checkbox::class
+                \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Checkbox::class,
+                ['htmlRenderer' => $secureRendererMock]
             );
     }
 
diff --git a/app/code/Magento/Bundle/Test/Unit/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/MultiTest.php b/app/code/Magento/Bundle/Test/Unit/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/MultiTest.php
index 69a1901d89b06..8bef65fed94f3 100644
--- a/app/code/Magento/Bundle/Test/Unit/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/MultiTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/MultiTest.php
@@ -5,7 +5,9 @@
  */
 namespace Magento\Bundle\Test\Unit\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type;
 
+use Magento\Framework\DataObject;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
 class MultiTest extends \PHPUnit\Framework\TestCase
 {
@@ -16,8 +18,21 @@ class MultiTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
+        $secureRendererMock = $this->createMock(SecureHtmlRenderer::class);
+        $secureRendererMock->method('renderTag')
+            ->willReturnCallback(
+                function (string $tag, array $attributes, string $content): string {
+                    $attributes = new DataObject($attributes);
+
+                    return "<$tag {$attributes->serialize()}>$content</$tag>";
+                }
+            );
+
         $this->block = (new ObjectManager($this))
-            ->getObject(\Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Multi::class);
+            ->getObject(
+                \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Multi::class,
+                ['htmlRenderer' => $secureRendererMock]
+            );
     }
 
     public function testSetValidationContainer()
diff --git a/app/code/Magento/Bundle/Test/Unit/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/RadioTest.php b/app/code/Magento/Bundle/Test/Unit/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/RadioTest.php
index 81b8a6a3161a1..10e35058d558b 100644
--- a/app/code/Magento/Bundle/Test/Unit/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/RadioTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/RadioTest.php
@@ -5,7 +5,9 @@
  */
 namespace Magento\Bundle\Test\Unit\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type;
 
+use Magento\Framework\DataObject;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
 class RadioTest extends \PHPUnit\Framework\TestCase
 {
@@ -16,8 +18,21 @@ class RadioTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
+        $secureRendererMock = $this->createMock(SecureHtmlRenderer::class);
+        $secureRendererMock->method('renderTag')
+            ->willReturnCallback(
+                function (string $tag, array $attributes, string $content): string {
+                    $attributes = new DataObject($attributes);
+
+                    return "<$tag {$attributes->serialize()}>$content</$tag>";
+                }
+            );
+
         $this->block = (new ObjectManager($this))
-            ->getObject(\Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Radio::class);
+            ->getObject(
+                \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Radio::class,
+                ['htmlRenderer' => $secureRendererMock]
+            );
     }
 
     public function testSetValidationContainer()
diff --git a/app/code/Magento/Bundle/Test/Unit/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/SelectTest.php b/app/code/Magento/Bundle/Test/Unit/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/SelectTest.php
index 1eba793b6f592..4902f459fe1b7 100644
--- a/app/code/Magento/Bundle/Test/Unit/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/SelectTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/SelectTest.php
@@ -5,7 +5,9 @@
  */
 namespace Magento\Bundle\Test\Unit\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type;
 
+use Magento\Framework\DataObject;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
 class SelectTest extends \PHPUnit\Framework\TestCase
 {
@@ -16,8 +18,21 @@ class SelectTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
+        $secureRendererMock = $this->createMock(SecureHtmlRenderer::class);
+        $secureRendererMock->method('renderTag')
+            ->willReturnCallback(
+                function (string $tag, array $attributes, string $content): string {
+                    $attributes = new DataObject($attributes);
+
+                    return "<$tag {$attributes->serialize()}>$content</$tag>";
+                }
+            );
+
         $this->block = (new ObjectManager($this))
-            ->getObject(\Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Select::class);
+            ->getObject(
+                \Magento\Bundle\Block\Adminhtml\Catalog\Product\Composite\Fieldset\Options\Type\Select::class,
+                ['htmlRenderer' => $secureRendererMock]
+            );
     }
 
     public function testSetValidationContainer()
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php
index 75c46c1168843..0652d92b05ac3 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\Math\Random;
 use Magento\Framework\View\Helper\SecureHtmlRenderer;
+use Magento\Framework\DataObject;
 
 class AllowspecificTest extends \PHPUnit\Framework\TestCase
 {
@@ -32,6 +33,14 @@ function (string $event, string $listener, string $selector): string {
                     return "<script>document.querySelector('{$selector}').{$event} = () => { {$listener} };</script>";
                 }
             );
+        $secureRendererMock->method('renderTag')
+            ->willReturnCallback(
+                function (string $tag, array $attributes, string $content): string {
+                    $attributes = new DataObject($attributes);
+
+                    return "<$tag {$attributes->serialize()}>$content</$tag>";
+                }
+            );
         $this->_object = $testHelper->getObject(
             \Magento\Config\Block\System\Config\Form\Field\Select\Allowspecific::class,
             [
@@ -71,7 +80,7 @@ public function testGetAfterElementHtml()
         $actual = $this->_object->getAfterElementHtml();
 
         $this->assertStringEndsWith('</script>' . $afterHtmlCode, $actual);
-        $this->assertStringStartsWith('<script type="text/javascript">', trim($actual));
+        $this->assertStringStartsWith('<script >', trim($actual));
         $this->assertContains('test_prefix_spec_element_test_suffix', $actual);
     }
 
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldTest.php
index d942af9352e6c..7485175639a1a 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Config\Test\Unit\Block\System\Config\Form;
 
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 /**
  * Test how class render field html element in Stores Configuration
  */
@@ -38,10 +40,24 @@ class FieldTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $this->_storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManager::class);
+        $secureRendererMock = $this->createMock(SecureHtmlRenderer::class);
+        $secureRendererMock->method('renderEventListenerAsTag')
+            ->willReturnCallback(
+                function (string $event, string $js, string $selector): string {
+                    return "<script>document.querySelector('$selector').$event = function () { $js };</script>";
+                }
+            );
+        $secureRendererMock->method('renderStyleAsTag')
+            ->willReturnCallback(
+                function (string $style, string $selector): string {
+                    return "<style>$selector { $style }</style>";
+                }
+            );
 
         $data = [
             'storeManager' => $this->_storeManagerMock,
             'urlBuilder' => $this->createMock(\Magento\Backend\Model\Url::class),
+            'secureRenderer' => $secureRendererMock,
         ];
         $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->_object = $helper->getObject(\Magento\Config\Block\System\Config\Form\Field::class, $data);
@@ -150,7 +166,7 @@ public function testRenderHint()
     {
         $testHint = 'test_hint';
         $this->_elementMock->expects($this->any())->method('getHint')->will($this->returnValue($testHint));
-        $expected = '<td class=""><div class="hint"><div style="display: none;">' . $testHint . '</div></div>';
+        $expected = '<td class=""><div class="hint"><div id="hint_test_field_id">' . $testHint . '</div></div>';
         $actual = $this->_object->render($this->_elementMock);
         $this->assertContains($expected, $actual);
     }
@@ -187,8 +203,9 @@ public function testRenderInheritCheckbox()
             '_inherit" name="' .
             $this->_testData['name'] .
             '[inherit]" type="checkbox" value="1"' .
-            ' class="checkbox config-inherit" checked="checked"' . ' disabled="disabled"' . ' readonly="1"' .
-            ' onclick="toggleValueElements(this, Element.previous(this.parentNode))" /> ';
+            ' class="checkbox config-inherit" checked="checked"' . ' disabled="disabled"' . ' readonly="1" />' .
+            '<script>document.querySelector(\'input#test_field_id_inherit\').onclick = function () '.
+            '{ toggleValueElements(this, Element.previous(this.parentNode)) };</script>';
 
         $expected .= '<label for="' . $this->_testData['htmlId'] . '_inherit" class="inherit">Use Website</label>';
         $actual = $this->_object->render($this->_elementMock);
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Fieldset/Modules/DisableOutputTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Fieldset/Modules/DisableOutputTest.php
index bb109bcb25f06..fa3eb66a39d71 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Fieldset/Modules/DisableOutputTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Fieldset/Modules/DisableOutputTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Config\Test\Unit\Block\System\Config\Form\Fieldset\Modules;
 
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -141,6 +143,14 @@ protected function setUp()
             ]
         );
 
+        $secureRendererMock = $this->createMock(SecureHtmlRenderer::class);
+        $secureRendererMock->method('renderEventListenerAsTag')
+            ->willReturnCallback(
+                function (string $event, string $js, string $selector): string {
+                    return "<script>document.querySelector('$selector').$event = function () { $js };</script>";
+                }
+            );
+
         $data = [
             'context'     => $context,
             'authSession' => $this->authSessionMock,
@@ -150,6 +160,7 @@ protected function setUp()
                 'group'          => $groupMock,
                 'form'           => $formMock,
             ],
+            'secureRenderer' => $secureRendererMock
         ];
 
         $this->object = $this->objectManager->getObject(
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldsetTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldsetTest.php
index 66bbf407c06a5..0dc030f343338 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldsetTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldsetTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Config\Test\Unit\Block\System\Config\Form;
 
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -100,6 +102,13 @@ protected function setUp()
         $groupMock->expects($this->any())->method('getFieldsetCss')->will($this->returnValue('test_fieldset_css'));
 
         $this->_helperMock = $this->createMock(\Magento\Framework\View\Helper\Js::class);
+        $secureRendererMock = $this->createMock(SecureHtmlRenderer::class);
+        $secureRendererMock->method('renderStyleAsTag')
+            ->willReturnCallback(
+                function (string $style, string $selector): string {
+                    return "<style>$selector { $style }</style>";
+                }
+            );
 
         $data = [
             'request' => $this->_requestMock,
@@ -108,6 +117,7 @@ protected function setUp()
             'layout' => $this->_layoutMock,
             'jsHelper' => $this->_helperMock,
             'data' => ['group' => $groupMock],
+            'secureRenderer' => $secureRendererMock
         ];
         $this->_testHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->_object = $this->_testHelper->getObject(\Magento\Config\Block\System\Config\Form\Fieldset::class, $data);
@@ -222,8 +232,8 @@ public function testRenderWithStoredElements($expanded, $nested, $extra)
 
         $this->assertContains('test_field_toHTML', $actual);
 
-        $expected = '<div id="row_test_field_id_comment" class="system-tooltip-box"' .
-            ' style="display:none;">test_field_tootip</div>';
+        $expected = '<div id="row_test_field_id_comment" class="system-tooltip-box">test_field_tootip</div>' .
+        '<style>row_test_field_id_comment { display:none; }</style>';
         $this->assertContains($expected, $actual);
         if ($nested) {
             $this->assertContains('nested', $actual);
diff --git a/app/code/Magento/Developer/Test/Unit/Model/TemplateEngine/Decorator/DebugHintsTest.php b/app/code/Magento/Developer/Test/Unit/Model/TemplateEngine/Decorator/DebugHintsTest.php
index fd2475320261a..d9e28b48c1666 100644
--- a/app/code/Magento/Developer/Test/Unit/Model/TemplateEngine/Decorator/DebugHintsTest.php
+++ b/app/code/Magento/Developer/Test/Unit/Model/TemplateEngine/Decorator/DebugHintsTest.php
@@ -5,6 +5,10 @@
  */
 namespace Magento\Developer\Test\Unit\Model\TemplateEngine\Decorator;
 
+use Magento\Framework\DataObject;
+use Magento\Framework\Math\Random;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 class DebugHintsTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -28,7 +32,36 @@ public function testRender($showBlockHints)
         )->will(
             $this->returnValue('<div id="fixture"/>')
         );
-        $model = new \Magento\Developer\Model\TemplateEngine\Decorator\DebugHints($subject, $showBlockHints);
+        $randomMock = $this->createMock(Random::class);
+        $randomMock->method('getRandomString')->willReturn('random');
+        $secureRendererMock = $this->createMock(SecureHtmlRenderer::class);
+        $secureRendererMock->method('renderTag')
+            ->willReturnCallback(
+                function (string $tag, array $attributes, string $content): string {
+                    $attributes = new DataObject($attributes);
+
+                    return "<$tag {$attributes->serialize()}>$content</$tag>";
+                }
+            );
+        $secureRendererMock->method('renderEventListenerAsTag')
+            ->willReturnCallback(
+                function (string $event, string $js, string $selector): string {
+                    return "<script>document.querySelector('$selector').$event = function () { $js };</script>";
+                }
+            );
+        $secureRendererMock->method('renderStyleAsTag')
+            ->willReturnCallback(
+                function (string $style, string $selector): string {
+                    return "<style>$selector { $style }</style>";
+                }
+            );
+
+        $model = new \Magento\Developer\Model\TemplateEngine\Decorator\DebugHints(
+            $subject,
+            $showBlockHints,
+            $secureRendererMock,
+            $randomMock
+        );
         $actualResult = $model->render($block, 'template.phtml', ['var' => 'val']);
         $this->assertNotNull($actualResult);
     }
diff --git a/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml b/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml
index fd0f2a45e1771..d2a0982586eed 100644
--- a/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml
+++ b/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml
@@ -51,7 +51,7 @@
         </a>
         <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
             'onclick',
-            'e.preventDefault()',
+            'event.preventDefault()',
             'a#' . /* @noEscape */ ($popupId)
         ) ?>
     <?php else: ?>
@@ -68,7 +68,7 @@
     </a>
     <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
         'onclick',
-        'e.preventDefault()',
+        'event.preventDefault()',
         'a#' . /* @noEscape */ ($helpLinkId)
     ) ?>
 </div>
diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/CountryTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/CountryTest.php
index d8487e63c6eca..b3f9e41b302e6 100644
--- a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/CountryTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/CountryTest.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Paypal\Test\Unit\Block\Adminhtml\System\Config\Field;
 
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 use Magento\Paypal\Block\Adminhtml\System\Config\Field\Country;
 
 class CountryTest extends \PHPUnit\Framework\TestCase
@@ -58,9 +59,28 @@ protected function setUp()
         $this->_request = $this->getMockForAbstractClass(\Magento\Framework\App\RequestInterface::class);
         $this->_jsHelper = $this->createMock(\Magento\Framework\View\Helper\Js::class);
         $this->_url = $this->createMock(\Magento\Backend\Model\Url::class);
+        $secureRendererMock = $this->createMock(SecureHtmlRenderer::class);
+        $secureRendererMock->method('renderEventListenerAsTag')
+            ->willReturnCallback(
+                function (string $event, string $js, string $selector): string {
+                    return "<script>document.querySelector('$selector').$event = function () { $js };</script>";
+                }
+            );
+        $secureRendererMock->method('renderStyleAsTag')
+            ->willReturnCallback(
+                function (string $style, string $selector): string {
+                    return "<style>$selector { $style }</style>";
+                }
+            );
+
         $this->_model = $helper->getObject(
             \Magento\Paypal\Block\Adminhtml\System\Config\Field\Country::class,
-            ['request' => $this->_request, 'jsHelper' => $this->_jsHelper, 'url' => $this->_url]
+            [
+                'request' => $this->_request,
+                'jsHelper' => $this->_jsHelper,
+                'url' => $this->_url,
+                'secureRenderer' => $secureRendererMock,
+            ]
         );
     }
 
diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/GroupTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/GroupTest.php
index 1bea6b11b966b..133d792cda097 100644
--- a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/GroupTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/GroupTest.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Paypal\Test\Unit\Block\Adminhtml\System\Config\Fieldset;
 
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 class GroupTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -70,9 +72,23 @@ protected function setUp()
             ->method('__call')
             ->with('getUser')
             ->will($this->returnValue($this->_user));
+        $secureRendererMock = $this->createMock(SecureHtmlRenderer::class);
+        $secureRendererMock->method('renderEventListenerAsTag')
+            ->willReturnCallback(
+                function (string $event, string $js, string $selector): string {
+                    return "<script>document.querySelector('$selector').$event = function () { $js };</script>";
+                }
+            );
+        $secureRendererMock->method('renderStyleAsTag')
+            ->willReturnCallback(
+                function (string $style, string $selector): string {
+                    return "<style>$selector { $style }</style>";
+                }
+            );
+
         $this->_model = $helper->getObject(
             \Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Group::class,
-            ['authSession' => $this->_authSession]
+            ['authSession' => $this->_authSession, 'secureRenderer' => $secureRendererMock]
         );
         $this->_model->setGroup($this->_group);
     }
diff --git a/app/code/Magento/Paypal/view/frontend/templates/partner/logo.phtml b/app/code/Magento/Paypal/view/frontend/templates/partner/logo.phtml
index a26d00cc2e9b2..63249f9a52455 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/partner/logo.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/partner/logo.phtml
@@ -24,10 +24,10 @@
 </div>
 <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
     'onclick',
-    "javascript:window.open(
+    "window.open(
                '" . $block->escapeJs($block->getAboutPaypalPageUrl()) . "',
                'paypal',
                'width=600,height=350,left=0,top=0,location=no,status=yes,scrollbars=yes,resizable=yes'
-               ); return false;",
+               ); event.preventDefault();",
     'div.block.paypal.acceptance div.block-content a.action.paypal.additional'
 ) ?>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/payment/mark.phtml b/app/code/Magento/Paypal/view/frontend/templates/payment/mark.phtml
index dae8cb94cb110..0b95e3788f91c 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/payment/mark.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/payment/mark.phtml
@@ -24,12 +24,12 @@ $url = $block->escapeUrl($block->getPaymentAcceptanceMarkHref());
 </a>
 <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
     'onclick',
-    "javascript:window.open(
+    "window.open(
            '" . /* @noEscape */ $block->escapeJs($block->getPaymentAcceptanceMarkHref()) . "',
            'olcwhatispaypal',
            'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, ,' +
            'left=0, top=0, width=400, height=350'
-       ); return false;",
+       ); event.preventDefault();",
     'a.action.paypal.about'
 ) ?>
 <!-- PayPal Logo -->
diff --git a/app/code/Magento/Review/view/frontend/templates/customer/list.phtml b/app/code/Magento/Review/view/frontend/templates/customer/list.phtml
index 0e9a717a5f53c..6dd7aa575e9df 100644
--- a/app/code/Magento/Review/view/frontend/templates/customer/list.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/customer/list.phtml
@@ -53,7 +53,7 @@ $reviewHelper = $block->getData('reviewHelper');
                         </div>
                         <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
                             "width:" . /* @noEscape */ ((int)$review->getSum() / (int)$review->getCount()) . "%;",
-                            'div.rating-summary div.rating-result span'
+                            'div.rating-summary div.rating-result>span:first-child'
                         ) ?>
                     <?php endif; ?>
                     </td>
diff --git a/app/code/Magento/Review/view/frontend/templates/customer/recent.phtml b/app/code/Magento/Review/view/frontend/templates/customer/recent.phtml
index 4900d48d0829c..cf7d53e818c36 100644
--- a/app/code/Magento/Review/view/frontend/templates/customer/recent.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/customer/recent.phtml
@@ -37,7 +37,7 @@
                          </div>
                         <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
                             "width:". $block->escapeHtmlAttr($rating) . "%",
-                            'div.rating-result span'
+                            'div.rating-result>span:first-child'
                         ) ?>
                      </div>
                 <?php endif; ?>
diff --git a/app/code/Magento/Review/view/frontend/templates/customer/view.phtml b/app/code/Magento/Review/view/frontend/templates/customer/view.phtml
index 415645eb8e73e..862a9a466414f 100644
--- a/app/code/Magento/Review/view/frontend/templates/customer/view.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/customer/view.phtml
@@ -49,7 +49,7 @@ $product = $block->getProductData();
                             </div>
                             <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
                                 "width:" . /* @noEscape */ $rating . "%",
-                                'div.rating-result span'
+                                'div.rating-result>span:first-child'
                             ) ?>
                         </div>
                     <?php endif; ?>
diff --git a/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml b/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml
index b906456f16dc8..93afe4a815f61 100644
--- a/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml
@@ -30,7 +30,7 @@ $urlForm = $block->getReviewsUrl() . '#review-form';
          </div>
             <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
                 "width:" . $block->escapeHtmlAttr($rating) . "%",
-                'div.rating-summary div.rating-result span'
+                'div.rating-summary div.rating-result>span:first-child'
             ) ?>
         <?php endif;?>
         <div class="reviews-actions">
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
index 4ed817ddd7e0f..4a3cad2066d32 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
@@ -104,6 +104,7 @@
                                qty-decimal
                             <?php endif ?>">&nbsp;
                         <button type="button"
+                                id="packaging-delete-item-<?= /* @noEscape */ $item->getId() ?>"
                                 class="action-delete"
                                 data-action="package-delete-item">
                             <span><?= $block->escapeHtml(__('Delete')) ?></span>
@@ -112,7 +113,7 @@
                         <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
                             'onclick',
                             'packaging.deleteItem(this);',
-                            'button.action-delete'
+                            'button#packaging-delete-item-' . $item->getId()
                         ) ?>
                     </td>
                 </tr>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking/view.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking/view.phtml
index d2eb927fd8278..df303b777188c 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking/view.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking/view.phtml
@@ -87,7 +87,8 @@ $shippingHelper = $block->getData('shippingHelper');
                     </td>
                     <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
                         'onclick',
-                        "deleteTrackingNumber('{$block->escapeJs($block->getRemoveUrl($_track))}'); return false;",
+                        "deleteTrackingNumber('{$block->escapeJs($block->getRemoveUrl($_track))}');
+                         event.preventDefault();",
                         '#del-track-' . (int) $_track->getId()
                     ) ?>
                 </tr>
diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
index 70eb51651f663..8ae7668ca145d 100644
--- a/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
+++ b/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
@@ -8,6 +8,7 @@
 // phpcs:disable Generic.WhiteSpace.ScopeIndent
 
 /** @var $block \Magento\Swatches\Block\LayeredNavigation\RenderLayered */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?php $swatchData = $block->getSwatchData(); ?>
 <div class="swatch-attribute swatch-layered <?= $block->escapeHtmlAttr($swatchData['attribute_code']) ?>"
@@ -22,7 +23,7 @@
                     <?php switch ($swatchData['swatches'][$option]['type']) {
                         case '3':
                             ?>
-                            <div class="swatch-option <?= $block->escapeHtmlAttr($label['custom_style']) ?>"
+                            <div class="swatch-option"
                                  tabindex="-1"
                                  data-option-type="3"
                                  data-option-id="<?= $block->escapeHtmlAttr($option) ?>"
@@ -30,6 +31,13 @@
                                  data-option-tooltip-thumb=""
                                  data-option-tooltip-value=""
                                 ></div>
+                            <?php if ($block->escapeHtmlAttr($label['custom_style'])): ?>
+                            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                                $block->escapeHtmlAttr($label['custom_style']),
+                                "div[data-option-id='" . $block->escapeHtmlAttr($option) . "']"
+                            ) ?>
+                            <?php endif; ?>
+
                             <?php break;
                         case '2':
                             ?>
@@ -43,21 +51,29 @@
                             );
                             $escapedUrl = $block->escapeUrl($swatchImagePath);
                             ?>
-                            <div class="swatch-option image <?= $block->escapeHtmlAttr($label['custom_style']) ?>"
+                            <div class="swatch-option image"
                                  tabindex="-1"
                                  data-option-type="2"
                                  data-option-id="<?= $block->escapeHtmlAttr($option) ?>"
                                  data-option-label="<?= $block->escapeHtmlAttr($label['label']) ?>"
                                  data-option-tooltip-thumb="<?= $block->escapeUrl($swatchThumbPath) ?>"
-                                 data-option-tooltip-value=""
-                                 style="background: url(<?=
-                                 /*  @noEscape */ $escapedUrl
-                                                        ?>) no-repeat center; background-size: initial;">
+                                 data-option-tooltip-value="">
                             </div>
+                            <?php if ($block->escapeHtmlAttr($label['custom_style'])): ?>
+                            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                                $block->escapeHtmlAttr($label['custom_style']),
+                                "div[data-option-id='" . $block->escapeHtmlAttr($option) . "']"
+                            ) ?>
+                            <?php endif; ?>
+                            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                                "background: url(" . /*  @noEscape */ $escapedUrl .
+                                ") no-repeat center; background-size: initial;",
+                                "div[data-option-id='" . $block->escapeHtmlAttr($option) . "']"
+                            ) ?>
                             <?php break;
                         case '1':
                             ?>
-                            <div class="swatch-option color <?= $block->escapeHtmlAttr($label['custom_style']) ?>"
+                            <div class="swatch-option color"
                                  tabindex="-1"
                                  data-option-type="1"
                                  data-option-id="<?= $block->escapeHtmlAttr($option) ?>"
@@ -65,16 +81,25 @@
                                  data-option-tooltip-thumb=""
                                  data-option-tooltip-value="<?= $block->escapeHtmlAttr(
                                      $swatchData['swatches'][$option]['value']
-                                 ) ?>"
-                                 style="background: <?= $block->escapeHtmlAttr(
-                                     $swatchData['swatches'][$option]['value']
-                                 ) ?> no-repeat center; background-size: initial;">
+                                 ) ?>">
                             </div>
+                            <?php if ($block->escapeHtmlAttr($label['custom_style'])): ?>
+                            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                                $block->escapeHtmlAttr($label['custom_style']),
+                                "div[data-option-id='" . $block->escapeHtmlAttr($option) . "']"
+                            ) ?>
+                            <?php endif; ?>
+                            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                                "background: " . $block->escapeHtmlAttr(
+                                    $swatchData['swatches'][$option]['value']
+                                ) . " no-repeat center; background-size: initial;",
+                                "div[data-option-id='" . $block->escapeHtmlAttr($option) . "']"
+                            ) ?>
                             <?php break;
                         case '0':
                         default:
                             ?>
-                            <div class="swatch-option text <?= $block->escapeHtmlAttr($label['custom_style']) ?>"
+                            <div class="swatch-option text"
                                  tabindex="-1"
                                  data-option-type="0"
                                  data-option-id="<?= $block->escapeHtmlAttr($option) ?>"
@@ -82,6 +107,12 @@
                                  data-option-tooltip-thumb=""
                                  data-option-tooltip-value=""
                                 ><?= $block->escapeHtml($swatchData['swatches'][$option]['value']) ?></div>
+                            <?php if ($block->escapeHtmlAttr($label['custom_style'])): ?>
+                            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                                $block->escapeHtmlAttr($label['custom_style']),
+                                "div[data-option-id='" . $block->escapeHtmlAttr($option) . "']"
+                            ) ?>
+                            <?php endif; ?>
                         <?php break;
                     } ?>
                 <?php endif; ?>
@@ -89,11 +120,14 @@
         <?php endforeach; ?>
     </div>
 </div>
+<?php $scriptString = <<<script
 
-<script>
     require(["jquery", "Magento_Swatches/js/swatch-renderer"], function ($) {
-        $('.swatch-layered.<?= $block->escapeJs($swatchData['attribute_code']) ?>')
+        $('.swatch-layered.{$block->escapeJs($swatchData['attribute_code'])}')
             .find('[data-option-type="1"], [data-option-type="2"], [data-option-type="0"], [data-option-type="3"]')
             .SwatchRendererTooltip();
     });
-</script>
+
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Chooser.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Chooser.php
index 45b3056eac68d..f10a821c510e1 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Chooser.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Chooser.php
@@ -11,6 +11,9 @@
  */
 namespace Magento\Widget\Block\Adminhtml\Widget;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 /**
  * Chooser widget block.
  */
@@ -26,20 +29,28 @@ class Chooser extends \Magento\Backend\Block\Template
      */
     protected $_jsonEncoder;
 
+    /**
+     * @var SecureHtmlRenderer
+     */
+    private $secureRenderer;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param \Magento\Framework\Data\Form\Element\Factory $elementFactory
      * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Framework\Json\EncoderInterface $jsonEncoder,
         \Magento\Framework\Data\Form\Element\Factory $elementFactory,
-        array $data = []
+        array $data = [],
+        ?SecureHtmlRenderer $secureRenderer = null
     ) {
         $this->_jsonEncoder = $jsonEncoder;
         $this->_elementFactory = $elementFactory;
+        $this->secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
         parent::__construct($context, $data);
     }
 
@@ -189,33 +200,35 @@ protected function _toHtml()
             '</label>
             <div id="' .
             $chooserId .
-            'advice-container" class="hidden"></div>
-            <script>
-            require(["prototype", "mage/adminhtml/wysiwyg/widget"], function(){
+            'advice-container" class="hidden"></div>' .
+            $this->secureRenderer->renderTag(
+                'script',
+                [],
+                'require(["prototype", "mage/adminhtml/wysiwyg/widget"], function(){
             //<![CDATA[
                 (function() {
                     var instantiateChooser = function() {
                         window.' .
-            $chooserId .
-            ' = new WysiwygWidget.chooser(
+                $chooserId .
+                ' = new WysiwygWidget.chooser(
                             "' .
-            $chooserId .
-            '",
+                $chooserId .
+                '",
                             "' .
-            $this->getSourceUrl() .
-            '",
+                $this->getSourceUrl() .
+                '",
                             ' .
-            $configJson .
-            '
+                $configJson .
+                '
                         );
                         if ($("' .
-            $chooserId .
-            'value")) {
+                $chooserId .
+                'value")) {
                             $("' .
-            $chooserId .
-            'value").advaiceContainer = "' .
-            $chooserId .
-            'advice-container";
+                $chooserId .
+                'value").advaiceContainer = "' .
+                $chooserId .
+                'advice-container";
                         }
                     }
 
@@ -223,7 +236,8 @@ protected function _toHtml()
                 })();
             //]]>
             });
-            </script>
-        ';
+            ',
+                false
+            );
     }
 }
diff --git a/app/code/Magento/Widget/view/adminhtml/templates/catalog/category/widget/tree.phtml b/app/code/Magento/Widget/view/adminhtml/templates/catalog/category/widget/tree.phtml
index 72de9550654d3..5bb6756bf4ebe 100644
--- a/app/code/Magento/Widget/view/adminhtml/templates/catalog/category/widget/tree.phtml
+++ b/app/code/Magento/Widget/view/adminhtml/templates/catalog/category/widget/tree.phtml
@@ -5,19 +5,31 @@
  */
 
 /** @var \Magento\Catalog\Block\Adminhtml\Category\Widget\Chooser $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
 <?php $_divId = 'tree' . $block->getId() ?>
 <div id="<?= $block->escapeHtmlAttr($_divId) ?>" class="tree"></div>
 <script id="ie-deferred-loader" defer="defer" src="//:"></script>
-<script>
+<?php
+$useMassaction = /* @noEscape */ $block->getUseMassaction() ? 1 : 0;
+$isAnchorOnly = /* @noEscape */ $block->getIsAnchorOnly() ? 1 : 0;
+$nodeClickListener = /* @noEscape */ $block->getNodeClickListener();
+$withEmpltyNode = /* @noEscape */ ($block->getWithEmptyNode() ? 'false' : 'true');
+$isVisible = (bool) $block->getRoot()->getIsVisible();
+$categoryId = (int) $block->getCategoryId();
+$rootId = (int) $block->getRoot()->getId();
+$isWasExpanded = (int) $block->getIsWasExpanded();
+$treeJson = /* @noEscape */ $block->getTreeJson();
+$scriptString = <<<script
+
 require(['jquery', "prototype", "extjs/ext-tree-checkbox"], function(jQuery){
 
-var tree<?= $block->escapeJs($block->getId()) ?>;
+var tree{$block->escapeJs($block->getId())};
 
-var useMassaction = <?= /* @noEscape */ $block->getUseMassaction() ? 1 : 0 ?>;
+var useMassaction = {$useMassaction};
 
-var isAnchorOnly = <?= /* @noEscape */ $block->getIsAnchorOnly() ? 1 : 0 ?>;
+var isAnchorOnly = {$isAnchorOnly};
 
 Ext.tree.TreePanel.Enhanced = function(el, config)
 {
@@ -41,9 +53,17 @@ Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {
         this.setRootNode(root);
 
         if (firstLoad) {
-            <?php if ($block->getNodeClickListener()) : ?>
-                this.addListener('click', <?= /* @noEscape */ $block->getNodeClickListener() ?>.createDelegate(this));
-            <?php endif; ?>
+
+script;
+if ($block->getNodeClickListener()):
+    $scriptString .= <<<script
+
+                this.addListener('click', {$nodeClickListener}.createDelegate(this));
+
+script;
+endif;
+$scriptString .= <<<script
+
         }
 
         this.loader.buildCategoryTree(root, data);
@@ -55,10 +75,10 @@ Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {
 
 jQuery(function()
 {
-    var emptyNodeAdded = <?= /* @noEscape */ ($block->getWithEmptyNode() ? 'false' : 'true') ?>;
+    var emptyNodeAdded = {$withEmpltyNode};
 
     var categoryLoader = new Ext.tree.TreeLoader({
-        dataUrl: '<?= $block->escapeUrl($block->getLoadTreeUrl()) ?>'
+        dataUrl: '{$block->escapeJs($block->getLoadTreeUrl())}'
     });
 
     categoryLoader.buildCategoryTree = function(parent, config)
@@ -77,7 +97,7 @@ jQuery(function()
                 // Add empty node to reset category filter
                 if(!emptyNodeAdded) {
                     var empty = Object.clone(_node);
-                    empty.text = '<?= $block->escapeJs($block->escapeHtml(__('None'))) ?>';
+                    empty.text = '{$block->escapeJs($block->escapeHtml(__('None')))}';
                     empty.children = [];
                     empty.id = 'none';
                     empty.path = '1/none';
@@ -148,39 +168,42 @@ jQuery(function()
     };
 
     categoryLoader.on("beforeload", function(treeLoader, node) {
-        $('<?= $block->escapeJs($_divId) ?>').fire('category:beforeLoad', {treeLoader:treeLoader});
+        $('{$block->escapeJs($_divId)}').fire('category:beforeLoad', {treeLoader:treeLoader});
         treeLoader.baseParams.id = node.attributes.id;
     });
 
-    tree<?= $block->escapeJs($block->getId()) ?> = new Ext.tree.TreePanel.Enhanced('<?= $block->escapeJs($_divId) ?>', {
+    tree{$block->escapeJs($block->getId())} = new Ext.tree.TreePanel.Enhanced('{$block->escapeJs($_divId)}', {
         animate:          false,
         loader:           categoryLoader,
         enableDD:         false,
         containerScroll:  true,
-        rootVisible:      '<?= (bool) $block->getRoot()->getIsVisible() ?>',
+        rootVisible:      '{$isVisible}',
         useAjax:          true,
-        currentNodeId:    <?= (int) $block->getCategoryId() ?>,
+        currentNodeId:    {$categoryId},
         addNodeTo:        false
     });
 
     if (useMassaction) {
-        tree<?= $block->escapeJs($block->getId()) ?>.on('check', function(node) {
-            $('<?= $block->escapeJs($_divId) ?>').fire('node:changed', {node:node});
-        }, tree<?= $block->escapeJs($block->getId()) ?>);
+        tree{$block->escapeJs($block->getId())}.on('check', function(node) {
+            $('{$block->escapeJs($_divId)}').fire('node:changed', {node:node});
+        }, tree{$block->escapeJs($block->getId())});
     }
 
     // set the root node
     var parameters = {
         text:        'Psw',
         draggable:   false,
-        id:          <?= (int) $block->getRoot()->getId() ?>,
-        expanded:    <?= (int) $block->getIsWasExpanded() ?>,
-        category_id: <?= (int) $block->getCategoryId() ?>
+        id:          {$rootId},
+        expanded:    {$isWasExpanded},
+        category_id: {$categoryId}
     };
 
-    tree<?= $block->escapeJs($block->getId()) ?>.loadTree({parameters:parameters, data:<?= /* @noEscape */ $block->getTreeJson() ?>},true);
+    tree{$block->escapeJs($block->getId())}.loadTree({parameters:parameters, data:{$treeJson}},true);
 
 });
 
 });
-</script>
+
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml b/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml
index c45ef65f4f242..6dab476115cee 100644
--- a/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml
+++ b/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml
@@ -5,6 +5,7 @@
  */
 
 /** @var \Magento\Widget\Block\Adminhtml\Widget\Instance\Edit\Tab\Main\Layout $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 
 ?>
 <fieldset class="fieldset">
@@ -16,7 +17,11 @@
     </div>
 </fieldset>
 <script id="ie-deferred-loader" defer="defer" src="//:"></script>
-<script>
+<?php
+/** @var \Magento\Framework\Json\Helper\Data $jsonHelper */
+$jsonHelper = $block->getData('jsonHelper');
+$scriptString = <<<script
+
 require([
     'jquery',
     'mage/template',
@@ -30,33 +35,68 @@ require([
 var pageGroupTemplate = '<div class="fieldset-wrapper page_group_container" id="page_group_container_<%- data.id %>">'+
     '<div class="fieldset-wrapper-title">'+
         '<label for="widget_instance[<%- data.id %>][page_group]">Display on <span class="required">*</span></label>'+
-        '<?= $block->getDisplayOnSelectHtml() ?>'+
+        '{$block->getDisplayOnSelectHtml()}'+
         '<div class="actions">'+
-        <?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getRemoveLayoutButtonHtml()) ?> +
+        {$jsonHelper->jsonEncode($block->getRemoveLayoutButtonHtml())} +
         '</div>'+
     '</div>'+
     '<div class="fieldset-wrapper-content">'+
-<?php foreach ($block->getDisplayOnContainers() as $container) : ?>
-    '<div class="no-display <?= $block->escapeJs($container['code']) ?> group_container" id="<?= $block->escapeJs($container['name']) ?>_<%- data.id %>">'+
-        '<input disabled="disabled" type="hidden" class="container_name" name="__[container_name]" value="widget_instance[<%- data.id %>][<?= $block->escapeJs($container['name']) ?>]" />'+
-        '<input disabled="disabled" type="hidden" name="widget_instance[<%- data.id %>][<?= $block->escapeJs($container['name']) ?>][page_id]" value="<%- data.page_id %>" />'+
-        '<input disabled="disabled" type="hidden" class="layout_handle_pattern" name="widget_instance[<%- data.id %>][<?= $block->escapeJs($container['name']) ?>][layout_handle]" value="<?= $block->escapeJs($container['layout_handle']) ?>" />'+
+
+script;
+foreach ($block->getDisplayOnContainers() as $container):
+    $scriptString .= <<<script
+    '<div class="no-display {$block->escapeJs($container['code'])} group_container" '+
+        'id="{$block->escapeJs($container['name'])}_<%- data.id %>">'+
+        '<input disabled="disabled" type="hidden" class="container_name" name="__[container_name]" '+
+        'value="widget_instance[<%- data.id %>][{$block->escapeJs($container['name'])}]" />'+
+        '<input disabled="disabled" type="hidden" '+
+        'name="widget_instance[<%- data.id %>][{$block->escapeJs($container['name'])}][page_id]" '+
+        'value="<%- data.page_id %>" />'+
+        '<input disabled="disabled" type="hidden" class="layout_handle_pattern" '+
+        'name="widget_instance[<%- data.id %>][{$block->escapeJs($container['name'])}][layout_handle]" '+
+        'value="{$block->escapeJs($container['layout_handle'])}" />'+
         '<table class="data-table">'+
             '<col width="200" />'+
             '<thead>'+
                 '<tr>'+
-                    '<th><label><?= $block->escapeJs(__('%1', $container['label'])) ?></label></th>'+
-                    '<th><label><?= $block->escapeJs(__('Container')) ?> <span class="required">*</span></label></th>'+
-                    '<th><label><?= $block->escapeJs(__('Template')) ?></label></th>'+
+                    '<th><label>{$block->escapeJs(__('%1', $container['label']))}</label></th>'+
+                    '<th><label>{$block->escapeJs(__('Container'))} <span class="required">*</span></label></th>'+
+                    '<th><label>{$block->escapeJs(__('Template'))}</label></th>'+
                 '</tr>'+
             '</thead>'+
             '<tbody>'+
                 '<tr>'+
                     '<td>'+
-                        '<input disabled="disabled" type="radio" class="radio for_all" id="all_<?= $block->escapeJs($container['name']) ?>_<%- data.id %>" name="widget_instance[<%- data.id %>][<?= $block->escapeJs($container['name']) ?>][for]" value="all" onclick="WidgetInstance.togglePageGroupChooser(this)" checked="checked" />&nbsp;'+
-                        '<label for="all_<?= $block->escapeJs($container['name']) ?>_<%- data.id %>"><?= $block->escapeJs(__('All')) ?></label><br />'+
-                        '<input disabled="disabled" type="radio" class="radio for_specific" id="specific_<?= $block->escapeJs($container['name']) ?>_<%- data.id %>" name="widget_instance[<%- data.id %>][<?= $block->escapeJs($container['name']) ?>][for]" value="specific" onclick="WidgetInstance.togglePageGroupChooser(this)" />&nbsp;'+
-                        '<label for="specific_<?= $block->escapeJs($container['name']) ?>_<%- data.id %>"><?= $block->escapeJs(__('Specific %1', $container['label'])) ?></label>'+
+                        '<input disabled="disabled" type="radio" class="radio for_all" '+
+                        'id="all_{$block->escapeJs($container['name'])}_<%- data.id %>" '+
+                        'name="widget_instance[<%- data.id %>][{$block->escapeJs($container['name'])}][for]" '+
+                        'value="all" checked="checked" />&nbsp;'+
+                        '<label for="all_{$block->escapeJs($container['name'])}_<%- data.id %>">'+
+                        '{$block->escapeJs(__('All'))}</label><br />'+
+                        '<input disabled="disabled" type="radio" class="radio for_specific" '+
+                        'id="specific_{$block->escapeJs($container['name'])}_<%- data.id %>" '+
+                        'name="widget_instance[<%- data.id %>][{$block->escapeJs($container['name'])}][for]" '+
+                        'value="specific" />&nbsp;'+
+                        '<label for="specific_{$block->escapeJs($container['name'])}_<%- data.id %>">'+
+                        '{$block->escapeJs(__('Specific %1', $container['label']))}</label>'+
+
+script;
+
+    $scriptString1 = $secureRenderer->renderEventListenerAsTag(
+        "onclick",
+        "WidgetInstance.togglePageGroupChooser(this)",
+        "all_" . $block->escapeJs($container['name']) . "_<%- data.id %>"
+    );
+    $scriptString .= "'" . $block->escapeJs($scriptString1) . "'+" . PHP_EOL;
+
+    $scriptString1 = $secureRenderer->renderEventListenerAsTag(
+        "onclick",
+        "WidgetInstance.togglePageGroupChooser(this)",
+        "specific_" . $block->escapeJs($container['name']) . "_<%- data.id %>"
+    );
+    $scriptString .= "'" . $block->escapeJs($scriptString1) . "'+" . PHP_EOL;
+
+    $scriptString .= <<<script
                     '</td>'+
                     '<td>'+
                         '<div class="block_reference_container">'+
@@ -71,33 +111,72 @@ var pageGroupTemplate = '<div class="fieldset-wrapper page_group_container" id="
                 '</tr>'+
             '</tbody>'+
         '</table>'+
-        '<div class="no-display chooser_container" id="<?= $block->escapeJs($container['name']) ?>_ids_<%- data.id %>">'+
-            '<input disabled="disabled" type="hidden" class="is_anchor_only" name="widget_instance[<%- data.id %>][<?= $block->escapeJs($container['name']) ?>][is_anchor_only]" value="<?= $block->escapeJs($container['is_anchor_only']) ?>" />'+
-            '<input disabled="disabled" type="hidden" class="product_type_id" name="widget_instance[<%- data.id %>][<?= $block->escapeJs($container['name']) ?>][product_type_id]" value="<?= $block->escapeJs($container['product_type_id']) ?>" />'+
+        '<div class="no-display chooser_container" id="{$block->escapeJs($container['name'])}_ids_<%- data.id %>">'+
+            '<input disabled="disabled" type="hidden" class="is_anchor_only" '+
+            'name="widget_instance[<%- data.id %>][{$block->escapeJs($container['name'])}][is_anchor_only]" '+
+            'value="{$block->escapeJs($container['is_anchor_only'])}" />'+
+            '<input disabled="disabled" type="hidden" class="product_type_id" '+
+            'name="widget_instance[<%- data.id %>][{$block->escapeJs($container['name'])}][product_type_id]" '+
+            'value="{$block->escapeJs($container['product_type_id'])}" />'+
             '<p>' +
-                '<input disabled="disabled" type="text" class="input-text entities" name="widget_instance[<%- data.id %>][<?= $block->escapeJs($container['name']) ?>][entities]" value="<%- data.<?= $block->escapeJs($container['name']) ?>_entities %>" readonly="readonly" />&nbsp;' +
-                '<a class="widget-option-chooser" href="javascript:void(0)" onclick="WidgetInstance.displayEntityChooser(\'<?= $block->escapeJs($container['code']) ?>\', \'<?= $block->escapeJs($container['name']) ?>_ids_<%- data.id %>\')"  title="<?= $block->escapeJs(__('Open Chooser')) ?>">' +
-                    '<img src="<?= $block->escapeUrl($block->getViewFileUrl('images/rule_chooser_trigger.gif')) ?>" alt="<?= $block->escapeJs(__('Open Chooser')) ?>" />' +
+                '<input disabled="disabled" type="text" class="input-text entities" '+
+                'name="widget_instance[<%- data.id %>][{$block->escapeJs($container['name'])}][entities]" '+
+                'value="<%- data.{$block->escapeJs($container['name'])}_entities %>" readonly="readonly" />&nbsp;' +
+                '<a class="widget-option-chooser" href="#" '+
+                'title="{$block->escapeJs(__('Open Chooser'))}">' +
+                    '<img src="{$block->escapeJs($block->getViewFileUrl('images/rule_chooser_trigger.gif'))}" '+
+                    'alt="{$block->escapeJs(__('Open Chooser'))}" />' +
                 '</a>&nbsp;' +
-                '<a href="javascript:void(0)" onclick="WidgetInstance.hideEntityChooser(\'<?= $block->escapeJs($container['name']) ?>_ids_<%- data.id %>\')" title="<?= $block->escapeJs(__('Apply')) ?>">' +
-                    '<img src="<?= $block->escapeUrl($block->getViewFileUrl('images/rule_component_apply.gif')) ?>" alt="<?= $block->escapeJs(__('Apply')) ?>" />' +
+                '<a id="widget-apply-<%- data.id %>" href="#" '+
+                'title="{$block->escapeJs(__('Apply'))}">' +
+                    '<img src="{$block->escapeJs($block->getViewFileUrl('images/rule_component_apply.gif'))}" '+
+                    'alt="{$block->escapeJs(__('Apply'))}" />' +
                 '</a>' +
             '</p>'+
             '<div class="chooser"></div>'+
         '</div>'+
+
+script;
+
+    $scriptString1 = $secureRenderer->renderEventListenerAsTag(
+        "onclick",
+        "event.preventDefault();
+        WidgetInstance.displayEntityChooser('" .$block->escapeJs($container['code']) .
+        "', '" . $block->escapeJs($container['name']) . "_ids_<%- data.id %>')",
+        "div#" . $block->escapeJs($container['name']) . "_ids_<%- data.id %> a.widget-option-chooser"
+    );
+    $scriptString .= "'" . $block->escapeJs($scriptString1) . "'+" . PHP_EOL;
+
+    $scriptString1 = $secureRenderer->renderEventListenerAsTag(
+        'onclick',
+        "event.preventDefault();
+        WidgetInstance.hideEntityChooser('" . $block->escapeJs($container['name']) . "_ids_<%- data.id %>')",
+        "a#widget-apply-<%- data.id %>"
+    );
+    $scriptString .= "'" . $block->escapeJs($scriptString1) . "'+" . PHP_EOL;
+    $scriptString .= <<<script
+
     '</div>'+
-<?php endforeach; ?>
+
+script;
+endforeach;
+$scriptString .= <<<script
+
 '<div class="no-display all_pages group_container" id="all_pages_<%- data.id %>">'+
-    '<input disabled="disabled" type="hidden" class="container_name" name="__[container_name]" value="widget_instance[<%- data.id %>][all_pages]" />'+
-    '<input disabled="disabled" type="hidden" name="widget_instance[<%- data.id %>][all_pages][page_id]" value="<%- data.page_id %>" />'+
-    '<input disabled="disabled" type="hidden" class="layout_handle_pattern" name="widget_instance[<%- data.id %>][all_pages][layout_handle]" value="default" />'+
-    '<input disabled="disabled" type="hidden" class="for_all" name="widget_instance[<%- data.id %>][all_pages][for]" value="all" />'+
+    '<input disabled="disabled" type="hidden" class="container_name" name="__[container_name]" '+
+    'value="widget_instance[<%- data.id %>][all_pages]" />'+
+    '<input disabled="disabled" type="hidden" name="widget_instance[<%- data.id %>][all_pages][page_id]" '+
+    'value="<%- data.page_id %>" />'+
+    '<input disabled="disabled" type="hidden" class="layout_handle_pattern" '+
+    'name="widget_instance[<%- data.id %>][all_pages][layout_handle]" value="default" />'+
+    '<input disabled="disabled" type="hidden" class="for_all" name="widget_instance[<%- data.id %>][all_pages][for]" '+
+    'value="all" />'+
     '<table class="data-table">'+
         '<col width="200" />'+
         '<thead>'+
             '<tr>'+
-                '<th><label><?= $block->escapeJs(__('Container')) ?> <span class="required">*</span></label></th>'+
-                '<th><label><?= $block->escapeJs(__('Template')) ?></label></th>'+
+                '<th><label>{$block->escapeJs(__('Container'))} <span class="required">*</span></label></th>'+
+                '<th><label>{$block->escapeJs(__('Template'))}</label></th>'+
                 '<th>&nbsp;</th>'+
             '</tr>'+
         '</thead>'+
@@ -119,21 +198,24 @@ var pageGroupTemplate = '<div class="fieldset-wrapper page_group_container" id="
     '</table>'+
 '</div>'+
 '<div class="no-display ignore-validate pages group_container" id="pages_<%- data.id %>">'+
-    '<input disabled="disabled" type="hidden" class="container_name" name="__[container_name]" value="widget_instance[<%- data.id %>][pages]" />'+
-    '<input disabled="disabled" type="hidden" name="widget_instance[<%- data.id %>][pages][page_id]" value="<%- data.page_id %>" />'+
-    '<input disabled="disabled" type="hidden" class="for_all" name="widget_instance[<%- data.id %>][pages][for]" value="all" />'+
+    '<input disabled="disabled" type="hidden" class="container_name" name="__[container_name]" '+
+    'value="widget_instance[<%- data.id %>][pages]" />'+
+    '<input disabled="disabled" type="hidden" name="widget_instance[<%- data.id %>][pages][page_id]" '+
+    'value="<%- data.page_id %>" />'+
+    '<input disabled="disabled" type="hidden" class="for_all" name="widget_instance[<%- data.id %>][pages][for]" '+
+    'value="all" />'+
     '<table class="data-table">'+
         '<col width="200" />'+
         '<thead>'+
             '<tr>'+
-                '<th><label><?= $block->escapeJs(__('Page')) ?> <span class="required">*</span></label></th>'+
-                '<th><label><?= $block->escapeJs(__('Container')) ?> <span class="required">*</span></label></th>'+
-                '<th><label><?= $block->escapeJs(__('Template')) ?></label></th>'+
+                '<th><label>{$block->escapeJs(__('Page'))} <span class="required">*</span></label></th>'+
+                '<th><label>{$block->escapeJs(__('Container'))} <span class="required">*</span></label></th>'+
+                '<th><label>{$block->escapeJs(__('Template'))}</label></th>'+
             '</tr>'+
         '</thead>'+
         '<tbody>'+
             '<tr>'+
-                '<td><?= /* @noEscape */ $block->getLayoutsChooser() ?></td>'+
+                '<td>{$block->getLayoutsChooser()}</td>'+
                 '<td>'+
                     '<div class="block_reference_container">'+
                         '<div class="block_reference"></div>'+
@@ -150,21 +232,24 @@ var pageGroupTemplate = '<div class="fieldset-wrapper page_group_container" id="
     '</table>'+
 '</div>'+
 '<div class="no-display ignore-validate pages group_container" id="page_layouts_<%- data.id %>">'+
-    '<input disabled="disabled" type="hidden" class="container_name" name="__[container_name]" value="widget_instance[<%- data.id %>][page_layouts]" />'+
-    '<input disabled="disabled" type="hidden" name="widget_instance[<%- data.id %>][page_layouts][page_id]" value="<%- data.page_id %>" />'+
-    '<input disabled="disabled" type="hidden" class="for_all" name="widget_instance[<%- data.id %>][page_layouts][for]" value="all" />'+
+    '<input disabled="disabled" type="hidden" class="container_name" name="__[container_name]" '+
+    'value="widget_instance[<%- data.id %>][page_layouts]" />'+
+    '<input disabled="disabled" type="hidden" name="widget_instance[<%- data.id %>][page_layouts][page_id]" '+
+    'value="<%- data.page_id %>" />'+
+    '<input disabled="disabled" type="hidden" class="for_all" '+
+    'name="widget_instance[<%- data.id %>][page_layouts][for]" value="all" />'+
     '<table class="data-table">'+
         '<col width="200" />'+
         '<thead>'+
             '<tr>'+
-                '<th><label><?= $block->escapeJs(__('Page')) ?> <span class="required">*</span></label></th>'+
-                '<th><label><?= $block->escapeJs(__('Container')) ?> <span class="required">*</span></label></th>'+
-                '<th><label><?= $block->escapeJs(__('Template')) ?></label></th>'+
+                '<th><label>{$block->escapeJs(__('Page'))} <span class="required">*</span></label></th>'+
+                '<th><label>{$block->escapeJs(__('Container'))} <span class="required">*</span></label></th>'+
+                '<th><label>{$block->escapeJs(__('Template'))}</label></th>'+
             '</tr>'+
         '</thead>'+
         '<tbody>'+
             '<tr>'+
-                '<td><?= /* @noEscape */ $block->getPageLayoutsPageChooser() ?></td>'+
+                '<td>{$block->getPageLayoutsPageChooser()}</td>'+
                 '<td>'+
                     '<div class="block_reference_container">'+
                         '<div class="block_reference"></div>'+
@@ -189,7 +274,7 @@ var WidgetInstance = {
     pageGroupTemplate    : pageGroupTemplate,
     pageGroupContainerId : 'page_group_container',
     count : 0,
-    activePageGroups : $H({}),
+    activePageGroups : \$H({}),
     selectedItems : {},
 
     addPageGroup : function(data) {
@@ -266,7 +351,7 @@ var WidgetInstance = {
     },
     addProductItemToSelection: function(groupId, item) {
         if (undefined == this.selectedItems[groupId]) {
-            this.selectedItems[groupId] = $H({});
+            this.selectedItems[groupId] = \$H({});
         }
         if (!isNaN(parseInt(item))) {
             this.selectedItems[groupId].set(item, 1);
@@ -327,11 +412,11 @@ var WidgetInstance = {
             additional = {};
         }
         if (type == 'categories') {
-            additional.url = '<?= $block->escapeUrl($block->getCategoriesChooserUrl()) ?>';
-            additional.post_parameters = $H({'is_anchor_only':$(chooser).down('input.is_anchor_only').value});
+            additional.url = '{$block->escapeJs($block->getCategoriesChooserUrl())}';
+            additional.post_parameters = \$H({'is_anchor_only':$(chooser).down('input.is_anchor_only').value});
         } else if (type == 'products') {
-            additional.url = '<?= $block->escapeUrl($block->getProductsChooserUrl()) ?>';
-            additional.post_parameters = $H({'product_type_id':$(chooser).down('input.product_type_id').value});
+            additional.url = '{$block->escapeUrl($block->getProductsChooserUrl())}';
+            additional.post_parameters = \$H({'product_type_id':$(chooser).down('input.product_type_id').value});
         }
         if (chooser && additional) {
             this.displayChooser(chooser, additional);
@@ -347,7 +432,7 @@ var WidgetInstance = {
     displayChooser : function(chooser, additional) {
         chooser = $(chooser).down('div.chooser');
         entities = chooser.up('div.chooser_container').down('input[type="text"].entities').value;
-        postParameters = $H({selected:entities});
+        postParameters = \$H({selected:entities});
         url = '';
         if (additional) {
             if (additional.url) url = additional.url;
@@ -436,13 +521,13 @@ var WidgetInstance = {
             selected = '';
             parameters = {};
             if (type == 'block_reference') {
-                url = '<?= $block->escapeUrl($block->getBlockChooserUrl()) ?>';
+                url = '{$block->escapeJs($block->getBlockChooserUrl())}';
                 if (additional.selectedBlock) {
                     selected = additional.selectedBlock;
                 }
                 parameters.layout = value;
             } else if (type == 'block_template') {
-                url = '<?= $block->escapeUrl($block->getTemplateChooserUrl()) ?>';
+                url = '{$block->escapeJs($block->getTemplateChooserUrl())}';
                 if (additional.selectedTemplate) {
                     selected = additional.selectedTemplate;
                 }
@@ -479,9 +564,18 @@ var WidgetInstance = {
 window.WidgetInstance = WidgetInstance;
 
 jQuery(function(){
-    <?php foreach ($block->getPageGroups() as $pageGroup) : ?>
-        WidgetInstance.addPageGroup(<?= /* @noEscape */ $pageGroup ?>);
-    <?php endforeach; ?>
+
+script;
+foreach ($block->getPageGroups() as $pageGroup):
+    $scriptString .= <<<script
+
+        WidgetInstance.addPageGroup({$pageGroup});
+
+script;
+endforeach;
+
+$scriptString .= <<<script
+
     Event.observe(document, 'product:changed', function(event){
         WidgetInstance.checkProduct(event);
     });
@@ -497,4 +591,7 @@ jQuery(function(){
 //]]>
 
 });
-</script>
+
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Widget/view/adminhtml/templates/instance/js.phtml b/app/code/Magento/Widget/view/adminhtml/templates/instance/js.phtml
index 90aee2baeb4f3..cb82c1dbca75a 100644
--- a/app/code/Magento/Widget/view/adminhtml/templates/instance/js.phtml
+++ b/app/code/Magento/Widget/view/adminhtml/templates/instance/js.phtml
@@ -3,8 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<script>
+<?php $scriptString = <<<script
+
 require([
     'jquery',
     'mage/template',
@@ -27,4 +30,7 @@ setSettings = function(urlTemplate, codeElement, themeElement) {
     setLocation(url);
 };
 });
-</script>
+
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Wishlist/Block/Rss/Link.php b/app/code/Magento/Wishlist/Block/Rss/Link.php
index 3e716c863862b..28affa8d3372d 100644
--- a/app/code/Magento/Wishlist/Block/Rss/Link.php
+++ b/app/code/Magento/Wishlist/Block/Rss/Link.php
@@ -44,6 +44,7 @@ public function __construct(
         \Magento\Framework\Url\EncoderInterface $urlEncoder,
         array $data = []
     ) {
+        $data['wishlistHelper'] = $this->wishlistHelper;
         parent::__construct($context, $data);
         $this->wishlistHelper = $wishlistHelper;
         $this->rssUrlBuilder = $rssUrlBuilder;
@@ -51,6 +52,8 @@ public function __construct(
     }
 
     /**
+     * Return link.
+     *
      * @return string
      */
     public function getLink()
@@ -72,6 +75,8 @@ public function isRssAllowed()
     }
 
     /**
+     * Return link params.
+     *
      * @return array
      */
     protected function getLinkParams()
diff --git a/app/code/Magento/Wishlist/view/adminhtml/templates/customer/edit/tab/wishlist.phtml b/app/code/Magento/Wishlist/view/adminhtml/templates/customer/edit/tab/wishlist.phtml
index e6c0608f4b450..7ee04bf192f29 100644
--- a/app/code/Magento/Wishlist/view/adminhtml/templates/customer/edit/tab/wishlist.phtml
+++ b/app/code/Magento/Wishlist/view/adminhtml/templates/customer/edit/tab/wishlist.phtml
@@ -5,8 +5,10 @@
  */
 
 /** @var \Magento\Framework\View\Element\Template $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<script>
+<?php $scriptString = <<<script
+
     require([
             "Magento_Ui/js/modal/confirm",
             "prototype",
@@ -19,13 +21,14 @@
                     if (!urlParams) {
                         urlParams = '';
                     }
-                    var url = <?= $block->escapeJs($block->escapeUrl($block->getJsObjectName())) ?>.url + '?ajax=true' + urlParams;
+                    var url = {$block->escapeJs($block->getJsObjectName())}.url + '?ajax=true' + urlParams;
                     new Ajax.Updater(
-                        <?= $block->escapeJs($block->escapeHtml($block->getJsObjectName())) ?>.containerId,
+                        {$block->escapeJs($block->getJsObjectName())}.containerId,
                         url,
                         {
                             parameters: {form_key: FORM_KEY},
-                            onComplete: <?= $block->escapeJs($block->escapeHtml($block->getJsObjectName())) ?>.initGrid.bind(<?= $block->escapeJs($block->escapeHtml($block->getJsObjectName())) ?>),
+                            onComplete: {$block->escapeJs($block->getJsObjectName())}.initGrid
+                            .bind({$block->escapeJs($block->getJsObjectName())}),
                         evalScripts:true
                 }
             );
@@ -48,7 +51,7 @@
         var self = this;
 
         confirm({
-            content: '<?= $block->escapeJs($block->escapeHtml(__('Are you sure you want to remove this item?'))) ?>',
+            content: '{$block->escapeJs(__('Are you sure you want to remove this item?'))}',
             actions: {
                 confirm: function () {
                     self.reload('&delete=' + itemId);
@@ -61,11 +64,14 @@
     productConfigure.addListType(
         'wishlist',
         {
-            urlFetch: '<?= $block->escapeJs($block->escapeUrl($block->getUrl('customer/wishlist_product_composite_wishlist/configure'))) ?>',
-            urlConfirm: '<?= $block->escapeJs($block->escapeUrl($block->getUrl('customer/wishlist_product_composite_wishlist/update'))) ?>'
+            urlFetch: '{$block->escapeJs($block->getUrl('customer/wishlist_product_composite_wishlist/configure'))}',
+            urlConfirm: '{$block->escapeJs($block->getUrl('customer/wishlist_product_composite_wishlist/update'))}'
         }
     );
     //-->
 
     });
-</script>
+
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/rss/email.phtml b/app/code/Magento/Wishlist/view/frontend/templates/rss/email.phtml
index 4a97173fde318..f221e50608ca4 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/rss/email.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/rss/email.phtml
@@ -5,11 +5,19 @@
  */
 
 /* @var \Magento\Wishlist\Block\Rss\EmailLink $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+
+/** @var \Magento\Wishlist\Helper\Data $wishlistHelper */
+$wishlistHelper = $block->getData('wishlistHelper');
 ?>
-<?php if ($block->getLink()) : ?>
-<p style="font-size:12px; line-height:16px; margin:0 0 16px;">
-    <?= $block->escapeHtml(__("RSS link to %1's wishlist", $this->helper(\Magento\Wishlist\Helper\Data::class)->getCustomerName())) ?>
+<?php if ($block->getLink()): ?>
+<p id="wishlist-rss-email-link">
+    <?= $block->escapeHtml(__("RSS link to %1's wishlist", $wishlistHelper->getCustomerName())) ?>
     <br />
     <a href="<?= $block->escapeUrl($block->getLink()) ?>"><?= $block->escapeUrl($block->getLink()) ?></a>
 </p>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+        "font-size:12px; line-height:16px; margin:0 0 16px;",
+        'p#wishlist-rss-email-link'
+    ) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/shared.phtml b/app/code/Magento/Wishlist/view/frontend/templates/shared.phtml
index 0fcaa6c853ff0..0d3158abb0532 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/shared.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/shared.phtml
@@ -5,10 +5,12 @@
  */
 
 /** @var \Magento\Wishlist\Block\Share\Wishlist $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
-<?php if ($block->hasWishlistItems()) : ?>
-    <form class="form shared wishlist" action="<?= $block->escapeUrl($block->getUrl('wishlist/index/update')) ?>" method="post">
+<?php if ($block->hasWishlistItems()): ?>
+    <form class="form shared wishlist" action="<?= $block->escapeUrl($block->getUrl('wishlist/index/update')) ?>"
+          method="post">
         <div class="wishlist table-wrapper">
             <table class="table data wishlist" id="wishlist-table">
                 <caption class="table-caption"><?= $block->escapeHtml(__('Wish List')) ?></caption>
@@ -20,14 +22,15 @@
                 </tr>
                 </thead>
                 <tbody>
-                <?php foreach ($block->getWishlistItems() as $item) : ?>
+                <?php foreach ($block->getWishlistItems() as $item): ?>
                     <?php
                     $product = $item->getProduct();
                     $isVisibleProduct = $product->isVisibleInSiteVisibility();
                     ?>
                     <tr>
                         <td data-th="<?= $block->escapeHtmlAttr(__('Product')) ?>" class="col product">
-                            <a class="product photo" href="<?= $block->escapeUrl($block->getProductUrl($item)) ?>" title="<?= $block->escapeHtmlAttr($product->getName()) ?>">
+                            <a class="product photo" href="<?= $block->escapeUrl($block->getProductUrl($item)) ?>"
+                               title="<?= $block->escapeHtmlAttr($product->getName()) ?>">
                                 <?= $block->getImage($product, 'customer_shared_wishlist')->toHtml() ?>
                             </a>
                             <strong class="product name">
@@ -45,10 +48,13 @@
                             ?>
                             <?= $block->getDetailsHtml($item) ?>
                         </td>
-                        <td data-th="<?= $block->escapeHtmlAttr(__('Comment')) ?>" class="col comment"><?= /* @noEscape */ $block->getEscapedDescription($item) ?></td>
-                        <td data-th="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>" class="col actions" data-role="add-to-links">
-                            <?php if ($product->isSaleable()) : ?>
-                                <?php if ($isVisibleProduct) : ?>
+                        <td data-th="<?= $block->escapeHtmlAttr(__('Comment')) ?>"
+                            class="col comment"><?= /* @noEscape */ $block->getEscapedDescription($item) ?>
+                        </td>
+                        <td data-th="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>" class="col actions"
+                            data-role="add-to-links">
+                            <?php if ($product->isSaleable()): ?>
+                                <?php if ($isVisibleProduct): ?>
                                     <button type="button"
                                             title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>"
                                             data-post='<?= /* @noEscape */ $block->getSharedItemAddToCartUrl($item) ?>'
@@ -57,9 +63,16 @@
                                     </button>
                                 <?php endif ?>
                             <?php endif; ?>
-                            <a href="#" data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($item) ?>'  onclick="location.assign(this.href); return false;" class="action towishlist" data-action="add-to-wishlist">
+                            <a href="#" data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($item) ?>'
+                               id="wishlist-shared-item-<?= /* @noEscape */ $item->getId() ?>"
+                               class="action towishlist" data-action="add-to-wishlist">
                                 <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
                             </a>
+                            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                                'onclick',
+                                "location.assign(this.href); event.preventDefault();",
+                                'a#wishlist-shared-item-' . $item->getId()
+                            ) ?>
                         </td>
                     </tr>
                 <?php endforeach ?>
@@ -68,7 +81,7 @@
         </div>
 
         <div class="actions-toolbar">
-            <?php if ($block->isSaleable()) : ?>
+            <?php if ($block->isSaleable()): ?>
                 <div class="primary">
                     <button type="button"
                             title="<?= $block->escapeHtmlAttr(__('Add All to Cart')) ?>"
@@ -85,6 +98,6 @@
             </div>
         </div>
     </form>
-<?php else : ?>
+<?php else: ?>
     <div class="message info empty"><div><?= $block->escapeHtml(__('Wish List is empty now.')) ?></div></div>
 <?php endif ?>

From a55759c41b13a46a69413cead5e8704eb616f2a6 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Mon, 4 May 2020 11:42:02 +0300
Subject: [PATCH 0222/1718] MFTF update.

---
 ...inAsCustomerChooseStoreViewActionGroup.xml | 25 ---------------
 ...stomerLoginFromCustomerPageActionGroup.xml |  5 +++
 ...romCustomerPageManualChooseActionGroup.xml | 31 +++++++++++++++++++
 ...sCustomerLoginFromOrderPageActionGroup.xml |  5 +++
 .../Mftf/Page/AdminLoginAsCustomerLogPage.xml |  2 +-
 ...oginAsCustomerConfirmationModalSection.xml | 14 +++++++++
 .../AdminLoginAsCustomerLogGridSection.xml    | 12 +++----
 ...oginAsCustomerAddProductToWishlistTest.xml |  2 +-
 ...gNotShownIfLoginAsCustomerDisabledTest.xml |  2 +-
 .../AdminLoginAsCustomerManualChooseTest.xml  |  6 +---
 ...INotShownIfLoginAsCustomerDisabledTest.xml |  3 --
 11 files changed, 65 insertions(+), 42 deletions(-)
 delete mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerChooseStoreViewActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerConfirmationModalSection.xml

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerChooseStoreViewActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerChooseStoreViewActionGroup.xml
deleted file mode 100644
index 7a751cb0f31b2..0000000000000
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerChooseStoreViewActionGroup.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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="AdminLoginAsCustomerChooseStoreViewActionGroup">
-        <annotations>
-            <description>Manually choose store view for LoginAsCustomer functionality.</description>
-        </annotations>
-        <arguments>
-            <argument name="storeViewName" type="string"/>
-        </arguments>
-
-        <selectOption selector="{{AdminLoginAsCustomerLoginManualContentSection.storeView}}"
-                      userInput="{{storeViewName}}" stepKey="selectStoreView"/>
-        <click selector="{{AdminLoginAsCustomerLoginManualActionsSection.loginAsCustomer}}"
-               stepKey="clickLoginAsCustomer"/>
-        <waitForElementVisible selector="{{StorefrontHeaderSection.logoLink}}" stepKey="waitForPageLoad"/>
-    </actionGroup>
-</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageActionGroup.xml
index c58ace5bbebc8..b10bad9fa2900 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageActionGroup.xml
@@ -19,6 +19,11 @@
         <amOnPage url="{{AdminEditCustomerPage.url(customerId)}}" stepKey="gotoCustomerPage"/>
         <waitForPageLoad stepKey="waitForCustomerPageLoad"/>
         <click selector="{{AdminCustomerMainActionsSection.loginAsCustomer}}" stepKey="clickLoginAsCustomerLink"/>
+        <see selector="{{AdminConfirmationModalSection.title}}" userInput="You are about to Login as Customer"
+             stepKey="seeModal"/>
+        <!-- TODO: Unskip after https://github.com/magento/magento2-login-as-customer/issues/137 is fixed-->
+        <!-- <see selector="{{AdminConfirmationModalSection.message}}" userInput="Actions taken while in "Login as Customer" will affect actual customer data." stepKey="seeModalMessage"/>-->
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="clickLogin"/>
         <switchToNextTab stepKey="switchToNewTab"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
     </actionGroup>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup.xml
new file mode 100644
index 0000000000000..6fda137c3f6a4
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup.xml
@@ -0,0 +1,31 @@
+<?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="AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup">
+        <annotations>
+            <description>Verify Login As Customer Login action is works properly from Customer page with manual Store View choose.</description>
+        </annotations>
+        <arguments>
+            <argument name="customerId" type="string"/>
+            <argument name="storeViewName" 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 View" stepKey="seeModal"/>
+        <!-- TODO: Unskip after https://github.com/magento/magento2-login-as-customer/issues/137 is fixed-->
+        <!-- <see selector="{{AdminConfirmationModalSection.message}}" userInput="Actions taken while in "Login as Customer" will affect actual customer data." stepKey="seeModalMessage"/>-->
+        <selectOption selector="{{AdminLoginAsCustomerConfirmationModalSection.storeView}}" userInput="{{storeViewName}}" stepKey="selectStoreView"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="clickLogin"/>
+        <switchToNextTab stepKey="switchToNewTab"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageActionGroup.xml
index 88c1cef7ea0cc..1aab6aa58c9e6 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageActionGroup.xml
@@ -19,6 +19,11 @@
         <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"/>
+        <!-- TODO: Unskip after https://github.com/magento/magento2-login-as-customer/issues/137 is fixed-->
+        <!-- <see selector="{{AdminConfirmationModalSection.message}}" userInput="Actions taken while in "Login as Customer" will affect actual customer data." stepKey="seeModalMessage"/>-->
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="clickLogin"/>
         <switchToNextTab stepKey="switchToNewTab"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
     </actionGroup>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Page/AdminLoginAsCustomerLogPage.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Page/AdminLoginAsCustomerLogPage.xml
index 0a26dd74d1ee9..a917ab6acb182 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Page/AdminLoginAsCustomerLogPage.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Page/AdminLoginAsCustomerLogPage.xml
@@ -8,7 +8,7 @@
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:/Page/etc/PageObject.xsd">
-    <page name="AdminLoginAsCustomerLogPage" url="loginascustomer/login/" area="admin" module="Magento_LoginAsCustomer">
+    <page name="AdminLoginAsCustomerLogPage" url="loginascustomer_log/log/index/" area="admin" module="Magento_LoginAsCustomer">
         <section name="AdminLoginAsCustomerLogToolbarSection"/>
         <section name="AdminLoginAsCustomerLogFiltersSection"/>
         <section name="AdminLoginAsCustomerLogGridSection"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerConfirmationModalSection.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerConfirmationModalSection.xml
new file mode 100644
index 0000000000000..f400ba02a5392
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerConfirmationModalSection.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="AdminLoginAsCustomerConfirmationModalSection">
+        <element name="storeView" type="select" selector="//select[@id='lac-confirmation-popup-store-id']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerLogGridSection.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerLogGridSection.xml
index d2f37fae04d13..032281a2277f4 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerLogGridSection.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerLogGridSection.xml
@@ -9,12 +9,12 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminLoginAsCustomerLogGridSection">
-        <element name="loginIdInRow" type="text" selector="//table[@class='data-grid']/tbody/tr[{{row}}]/td[@data-column='login_id']" parameterized="true"/>
-        <element name="customerIdInRow" type="text" selector="//table[@class='data-grid']/tbody/tr[{{row}}]/td[@data-column='customer_id']" parameterized="true"/>
-        <element name="customerEmailInRow" type="text" selector="//table[@class='data-grid']/tbody/tr[{{row}}]/td[@data-column='email']" parameterized="true"/>
-        <element name="adminIdInRow" type="text" selector="//table[@class='data-grid']/tbody/tr[{{row}}]/td[@data-column='admin_id']" parameterized="true"/>
-        <element name="adminNameInRow" type="text" selector="//table[@class='data-grid']/tbody/tr[{{row}}]/td[@data-column='username']" parameterized="true"/>
-        <element name="createdAtInRow" type="text" selector="//table[@class='data-grid']/tbody/tr[{{row}}]/td[@data-column='created_at']" parameterized="true"/>
+        <element name="loginIdInRow" type="text" selector="//table[@data-role='grid']/tbody/tr[{{row}}]/td[1]" parameterized="true"/>
+        <element name="customerIdInRow" type="text" selector="//table[@data-role='grid']/tbody/tr[{{row}}]/td[2]" parameterized="true"/>
+        <element name="customerEmailInRow" type="text" selector="//table[@data-role='grid']/tbody/tr[{{row}}]/td[3]" parameterized="true"/>
+        <element name="adminIdInRow" type="text" selector="//table[@data-role='grid']/tbody/tr[{{row}}]/td[4]" parameterized="true"/>
+        <element name="adminNameInRow" type="text" selector="//table[@data-role='grid']/tbody/tr[{{row}}]/td[5]" parameterized="true"/>
+        <element name="createdAtInRow" type="text" selector="//table[@data-role='grid']/tbody/tr[{{row}}]/td[6]" parameterized="true"/>
     </section>
 </sections>
 
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAddProductToWishlistTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAddProductToWishlistTest.xml
index 633aed7d0317d..17480d0f84c7b 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAddProductToWishlistTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAddProductToWishlistTest.xml
@@ -43,7 +43,7 @@
 
         <!-- Admin Login As Customer from Customer page -->
         <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup"
-                     stepKey="lLoginAsCustomerFromCustomerPage">
+                     stepKey="loginAsCustomerFromCustomerPage">
             <argument name="customerId" value="$$createCustomer.id$$"/>
         </actionGroup>
 
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLogNotShownIfLoginAsCustomerDisabledTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLogNotShownIfLoginAsCustomerDisabledTest.xml
index 6fce0d7c69988..3047843b0c758 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLogNotShownIfLoginAsCustomerDisabledTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLogNotShownIfLoginAsCustomerDisabledTest.xml
@@ -17,7 +17,7 @@
             <severity value="CRITICAL"/>
             <group value="login_as_customer"/>
             <skip>
-                <issueId value="https://github.com/magento/magento2-login-as-customer/issues/71"/>
+                <issueId value="https://github.com/magento/magento2-login-as-customer/issues/136"/>
             </skip>
         </annotations>
         <before>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
index 036ab307527b0..a4e605864a976 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
@@ -52,13 +52,9 @@
         </after>
 
         <!-- Login As Customer from Customer page -->
-        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup"
+        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup"
                      stepKey="loginAsCustomerFromCustomerPage">
             <argument name="customerId" value="$$createCustomer.id$$"/>
-        </actionGroup>
-
-        <!-- Choose custom store view -->
-        <actionGroup ref="AdminLoginAsCustomerChooseStoreViewActionGroup" stepKey="chooseCustomStoreView">
             <argument name="storeViewName" value="{{customStore.name}}"/>
         </actionGroup>
 
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUINotShownIfLoginAsCustomerDisabledTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUINotShownIfLoginAsCustomerDisabledTest.xml
index 74fed6598085d..595b47cb56216 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUINotShownIfLoginAsCustomerDisabledTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUINotShownIfLoginAsCustomerDisabledTest.xml
@@ -16,9 +16,6 @@
             <description value="Verify that UI elements are not shown if 'Login as customer' functionality is disabled"/>
             <severity value="CRITICAL"/>
             <group value="login_as_customer"/>
-            <skip>
-                <issueId value="https://github.com/magento/magento2-login-as-customer/issues/71"/>
-            </skip>
         </annotations>
         <before>
             <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0" stepKey="disableLoginAsCustomer"/>

From 3eddcb5ba4cd31906f65bb422c02de189ccea095 Mon Sep 17 00:00:00 2001
From: Dmytro Voskoboinikov <voskoboi@adobe.com>
Date: Mon, 4 May 2020 14:01:45 -0500
Subject: [PATCH 0223/1718] MC-29566: [2.4.x] Deprecate SID query
 parameter-related methods

---
 .../Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml     | 3 +++
 .../Test/StorefrontPaypalSmartButtonInMiniCartPageTest.xml     | 3 +++
 .../Mftf/Test/StorefrontPaypalSmartButtonInProductPageTest.xml | 3 +++
 .../Test/StorefrontPaypalSmartButtonInShoppingCartPageTest.xml | 3 +++
 .../Test/StorefrontPaypalSmartButtonWithAUDCurrencyTest.xml    | 3 +++
 .../Test/StorefrontPaypalSmartButtonWithCADCurrencyTest.xml    | 3 +++
 .../Test/StorefrontPaypalSmartButtonWithEuroCurrencyTest.xml   | 3 +++
 ...torefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml | 3 +++
 .../Test/StorefrontPaypalSmartButtonWithNZDCurrencyTest.xml    | 3 +++
 .../Test/StorefrontPaypalSmartButtonWithYENCurrencyTest.xml    | 3 +++
 10 files changed, 30 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..2cc94caf4c1b1 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml
@@ -17,6 +17,9 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-13690"/>
             <group value="paypalExpress"/>
+            <skip>
+                <issueId value="MC-33951"/>
+            </skip>
         </annotations>
         <before>
             <!-- Login -->
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInMiniCartPageTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInMiniCartPageTest.xml
index f50d2fc9ad9a4..c19cb3ee4a646 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInMiniCartPageTest.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInMiniCartPageTest.xml
@@ -17,6 +17,9 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-27604"/>
             <group value="paypalExpress"/>
+            <skip>
+                <issueId value="MC-33951"/>
+            </skip>
         </annotations>
         <before>
             <!-- Login -->
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInProductPageTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInProductPageTest.xml
index 3e4f5c8b4da30..41578eed67625 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInProductPageTest.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInProductPageTest.xml
@@ -17,6 +17,9 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-26167"/>
             <group value="paypalExpress"/>
+            <skip>
+                <issueId value="MC-33951"/>
+            </skip>
         </annotations>
         <before>
             <!-- Login -->
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInShoppingCartPageTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInShoppingCartPageTest.xml
index 62ebeea2d65be..4aed4b3d7e414 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInShoppingCartPageTest.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInShoppingCartPageTest.xml
@@ -16,6 +16,9 @@
             <description value="Users are able to perform PayPal Express Checkout method using PayPal Smart Button on Shopping Cart, payment action is Sale, make sure checkout as guest is not available"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MC-27605"/>
+            <skip>
+                <issueId value="MC-33951"/>
+            </skip>
         </annotations>
         <before>
             <!-- Login -->
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithAUDCurrencyTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithAUDCurrencyTest.xml
index 4d4f4e8b89957..69ec26a8ea806 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithAUDCurrencyTest.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithAUDCurrencyTest.xml
@@ -17,6 +17,9 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-33274"/>
             <group value="paypalExpress"/>
+            <skip>
+                <issueId value="MC-33951"/>
+            </skip>
         </annotations>
         <before>
 
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithCADCurrencyTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithCADCurrencyTest.xml
index aa35f36268270..ea6df54bc27e1 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithCADCurrencyTest.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithCADCurrencyTest.xml
@@ -17,6 +17,9 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-33274"/>
             <group value="paypalExpress"/>
+            <skip>
+                <issueId value="MC-33951"/>
+            </skip>
         </annotations>
         <before>
             <!--Enable Advanced Setting-->
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithEuroCurrencyTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithEuroCurrencyTest.xml
index 1adfe3b5d3a70..5077544ea0b39 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithEuroCurrencyTest.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithEuroCurrencyTest.xml
@@ -17,6 +17,9 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-33274"/>
             <group value="paypalExpress"/>
+            <skip>
+                <issueId value="MC-33951"/>
+            </skip>
         </annotations>
         <before>
             <!--Set merchant country-->
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml
index 0efb3f33739fa..22997b7005f91 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml
@@ -17,6 +17,9 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-33274"/>
             <group value="paypalExpress"/>
+            <skip>
+                <issueId value="MC-33951"/>
+            </skip>
         </annotations>
         <before>
             <!--Set merchant country-->
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithNZDCurrencyTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithNZDCurrencyTest.xml
index 4cddf674c9bfe..4040b788b3bd7 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithNZDCurrencyTest.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithNZDCurrencyTest.xml
@@ -17,6 +17,9 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-33274"/>
             <group value="paypalExpress"/>
+            <skip>
+                <issueId value="MC-33951"/>
+            </skip>
         </annotations>
         <before>
             <!--Enable Advanced Setting-->
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithYENCurrencyTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithYENCurrencyTest.xml
index b5b42b2a6bcbd..086a6159ccb90 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithYENCurrencyTest.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithYENCurrencyTest.xml
@@ -17,6 +17,9 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-33274"/>
             <group value="paypalExpress"/>
+            <skip>
+                <issueId value="MC-33951"/>
+            </skip>
         </annotations>
         <before>
             <magentoCLI command="config:set {{StorefrontPaypalEnableSkipOrderReviewStepConfigData.path}} {{StorefrontPaypalEnableSkipOrderReviewStepConfigData.value}}" stepKey="enableSkipOrderReview"/>

From 7d5e1435b858f42c11e692dee3c23b62ca7319d7 Mon Sep 17 00:00:00 2001
From: Serhii Voloshkov <serhii.voloshkov@transoftgroup.com>
Date: Tue, 5 May 2020 11:17:19 +0300
Subject: [PATCH 0224/1718] MC-33404: Incorrect display of file name in import
 history

---
 .../Block/Adminhtml/Grid/Column/Renderer/Download.php          | 2 +-
 .../Block/Adminhtml/Grid/Column/Renderer/Error.php             | 2 +-
 .../Unit/Block/Adminhtml/Grid/Column/Renderer/DownloadTest.php | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Download.php b/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Download.php
index 110503a505752..5a9e3a2a8504a 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Download.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Download.php
@@ -21,7 +21,7 @@ class Download extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text
     public function _getValue(\Magento\Framework\DataObject $row)
     {
         return '<p> ' . $this->escapeHtml($row->getData('imported_file')) .  '</p><a href="'
-        . $this->escapeUrl($this->getUrl('*/*/download', ['filename' => $row->getData('imported_file')])) . '">'
+        . $this->getUrl('*/*/download', ['filename' => $row->getData('imported_file')]) . '">'
         . $this->escapeHtml(__('Download'))
         . '</a>';
     }
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Error.php b/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Error.php
index 5760d26de68b1..d493fc3fd9531 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Error.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Grid/Column/Renderer/Error.php
@@ -23,7 +23,7 @@ public function _getValue(\Magento\Framework\DataObject $row)
         $result = '';
         if ($row->getData('error_file') != '') {
             $result = '<p> ' . $this->escapeHtml($row->getData('error_file')) .  '</p><a href="'
-                . $this->escapeUrl($this->getUrl('*/*/download', ['filename' => $row->getData('error_file')])) . '">'
+                . $this->getUrl('*/*/download', ['filename' => $row->getData('error_file')]) . '">'
                 . $this->escapeHtml(__('Download'))
                 . '</a>';
         }
diff --git a/app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Grid/Column/Renderer/DownloadTest.php b/app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Grid/Column/Renderer/DownloadTest.php
index a4ede993098b3..abc9c9147303e 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Grid/Column/Renderer/DownloadTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Grid/Column/Renderer/DownloadTest.php
@@ -71,8 +71,7 @@ public function testGetValue()
             ->method('escapeHtml')
             ->with('file.csv')
             ->willReturn('file.csv');
-        $this->escaperMock->expects($this->once())->method('escapeUrl')->willReturn('url');
-        $this->escaperMock->expects($this->at(2))
+        $this->escaperMock->expects($this->at(1))
             ->method('escapeHtml')
             ->with('Download')
             ->willReturn('Download');

From d11b19b36be90f950ee6b2d489d4fcf0cec88982 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Wed, 6 May 2020 14:01:11 +0300
Subject: [PATCH 0225/1718] MC-29420: Remove event handlers from CE

---
 .../view/adminhtml/templates/tracking.phtml   | 13 +++++--
 .../templates/widget/accordion.phtml          | 15 +++++---
 .../templates/widget/form/element.phtml       | 18 +++++++---
 .../adminhtml/templates/widget/grid.phtml     |  4 +--
 .../templates/widget/grid/extended.phtml      |  7 ++--
 .../templates/widget/grid/serializer.phtml    | 34 ++++++++++++-------
 .../templates/catalog/category/tree.phtml     |  4 +--
 .../catalog/product/edit/websites.phtml       |  2 +-
 .../catalog/product/tab/inventory.phtml       |  2 +-
 .../templates/product/price/tier_prices.phtml | 11 ++++--
 .../product/view/options/type/file.phtml      |  7 +++-
 .../templates/system/config/validatevat.phtml |  2 +-
 .../adminhtml/templates/unitofmeasure.phtml   |  8 +++--
 .../templates/import/frame/result.phtml       | 12 +++++--
 .../templates/transparent/iframe.phtml        | 32 ++++++++++-------
 .../templates/report/grid/container.phtml     |  2 +-
 .../Create/Search/Grid/Renderer/Product.php   | 26 +++++++++++++-
 .../templates/order/create/data.phtml         | 14 +++++---
 .../order/create/shipping/method/form.phtml   |  2 +-
 .../templates/order/view/tab/info.phtml       |  2 +-
 .../adminhtml/web/order/create/scripts.js     |  2 +-
 .../templates/promo/salesrulejs.phtml         | 22 +++++++-----
 .../templates/page/js/require_js.phtml        |  4 +--
 23 files changed, 171 insertions(+), 74 deletions(-)

diff --git a/app/code/Magento/AdminAnalytics/view/adminhtml/templates/tracking.phtml b/app/code/Magento/AdminAnalytics/view/adminhtml/templates/tracking.phtml
index 7e01f84b8322c..35d0f9ec89986 100644
--- a/app/code/Magento/AdminAnalytics/view/adminhtml/templates/tracking.phtml
+++ b/app/code/Magento/AdminAnalytics/view/adminhtml/templates/tracking.phtml
@@ -9,13 +9,22 @@
  */
 ?>
 
-<script src="<?= $block->escapeUrl($block->getTrackingUrl()) ?>" async></script>
+<?= /* @noEscape */ $secureRenderer->renderTag(
+    'script',
+    [
+        'src' => '"' . $block->escapeJs($block->getTrackingUrl()) .'"',
+        'async' => true,
+    ],
+    '',
+    false
+) ?>
 
 <?php $scriptString = '
     var adminAnalyticsMetadata = {
         "version": "' . $block->escapeJs($block->getMetadata()->getMagentoVersion()) . '",
         "user": "' . $block->escapeJs($block->getMetadata()->getCurrentUser()) . '",
         "mode": "' . $block->escapeJs($block->getMetadata()->getMode()) . '"
-    };';
+    };
+';
 ?>
 <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/accordion.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/accordion.phtml
index fecf5365544e0..dfee490379dd1 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/accordion.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/accordion.phtml
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 <?php
 /**
@@ -10,17 +12,20 @@
  */
 $items = $block->getItems();
 ?>
-<?php if (!empty($items)) : ?>
+<?php if (!empty($items)): ?>
     <dl id="tab_content_<?= $block->getHtmlId() ?>" name="tab_content_<?= $block->getHtmlId() ?>" class="accordion">
-    <?php foreach ($items as $_item) : ?>
+    <?php foreach ($items as $_item): ?>
         <?= $block->getChildHtml($_item->getId()) ?>
     <?php endforeach ?>
     </dl>
-    <script>
+    <?php $scriptString = <<<script
         require([
             'mage/adminhtml/accordion'
         ], function(){
-            tab_content_<?= $block->getHtmlId() ?>AccordionJs = new varienAccordion('tab_content_<?= $block->getHtmlId() ?>', '<?= $block->escapeJs($block->getShowOnlyOne()) ?>');
+            tab_content_{$block->getHtmlId()}AccordionJs = new varienAccordion('tab_content_{$block->getHtmlId()}',
+             '{$block->escapeJs($block->getShowOnlyOne())}');
         });
-    </script>
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml
index fce4d094ee0b1..075cd12c90d05 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml
@@ -84,7 +84,7 @@ $htmlId = $element->getHtmlId();
 <?php elseif ($type === 'wysiwyg'): ?>
     <span class="form_row">
       <label for="<?= /* @noEscape */ $htmlId ?>"><?= $block->escapeHtml($element->getLabel()) ?>:</label>
-        <script>
+        <?php $scriptString = <<<script
         require([
             "wysiwygAdapter"
         ], function(tinyMCE){
@@ -92,7 +92,7 @@ $htmlId = $element->getHtmlId();
             tinyMCE.init({
                 mode : "exact",
                 theme : "advanced",
-                elements : "<?= $block->escapeJs($element->getName()) ?>",
+                elements : "{$block->escapeJs($element->getName())}",
                 plugins : "inlinepopups,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,"
                     + "insertdatetime,preview,zoom,media,searchreplace,print,contextmenu,paste,directionality,"
                     + "fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras",
@@ -121,7 +121,9 @@ $htmlId = $element->getHtmlId();
                     + ' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'
             });
         });
-</script>
+script;
+        ?>
+        <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
       <textarea name="<?= $block->escapeHtmlAttr($element->getName()) ?>"
                 title="<?=  $block->escapeHtmlAttr($element->getTitle()) ?>"
                 id="<?= /* @noEscape */ $htmlId ?>"
@@ -144,7 +146,13 @@ $htmlId = $element->getHtmlId();
             </span>
 <?php endif; ?>
 <?php if ($element->getScript()): ?>
-<script>
+    <script>
+        <?= /* @noEscape */ $element->getScript() ?>
+    </script>
+
+    <?php $scriptString = <<<script
     <?= /* @noEscape */ $element->getScript() ?>
-</script>
+script;
+    ?>
+    <?php /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
index abbe74ece1fe5..f4ef4db022a8e 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
@@ -100,7 +100,7 @@ $numColumns = $block->getColumns() !== null ? count($block->getColumns()): 0;
                                 <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
                                     'onclick',
                                     /* @noEscape */ $block->getJsObjectName() . '.setPage(\'' .
-                                        /* @noEscape */ ($_curPage - 1) . '\');return false;',
+                                        /* @noEscape */ ($_curPage - 1) . '\');event.preventDefault();',
                                     'button.action-previous'
                                 ) ?>
                             <?php else: ?>
@@ -136,7 +136,7 @@ $numColumns = $block->getColumns() !== null ? count($block->getColumns()): 0;
                                 <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
                                     'onclick',
                                     /* @noEscape */ $block->getJsObjectName() . '.setPage(\'' .
-                                    /* @noEscape */ ($_curPage + 1) . '\');return false;',
+                                    /* @noEscape */ ($_curPage + 1) . '\');event.preventDefault();',
                                     'button.action-next'
                                 ) ?>
                             <?php else: ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
index 7730dd4c339cb..c43b6397232c5 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
@@ -115,7 +115,7 @@ $numColumns = count($block->getColumns());
                             <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
                                 'onclick',
                                 /* @noEscape */ $block->getJsObjectName() . '.setPage(\'' .
-                                /* @noEscape */ ($_curPage - 1) . '\');return false;',
+                                /* @noEscape */ ($_curPage - 1) . '\');event.preventDefault();',
                                 '. admin__data-grid-pager button.action-previous'
                             ) ?>
                         <?php else: ?>
@@ -149,7 +149,7 @@ $numColumns = count($block->getColumns());
                             <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
                                 'onclick',
                                 /* @noEscape */ $block->getJsObjectName() . '.setPage(\'' .
-                                /* @noEscape */ ($_curPage + 1) . '\');return false;',
+                                /* @noEscape */ ($_curPage + 1) . '\');event.preventDefault();',
                                 '.admin__data-grid-pager button.action-next'
                             ) ?>
                         <?php else: ?>
@@ -322,11 +322,13 @@ script;
         $scriptString .= <<<script
 
     require(deps, function({$dependencyJsObject}){
+
 script;
         //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed
         $scriptString .= <<<script
 
         //<![CDATA[
+
 script;
         if ($block->getDependencyJsObject()):
             $scriptString .= <<<script
@@ -389,6 +391,7 @@ script;
             $scriptString .= <<<script
 
         });
+
 script;
         endif;
         $scriptString .= <<<script
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/serializer.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/serializer.phtml
index 2208a00929592..9ddf3ea5df3c8 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/serializer.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/serializer.phtml
@@ -7,6 +7,7 @@
 <?php
 /**
  * @var $block \Magento\Backend\Block\Widget\Grid\Serializer
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
 <?php
@@ -14,8 +15,8 @@
 $_id = 'id_' . md5(microtime());
 ?>
 <?php $formId = $block->getFormId()?>
-<?php if (!empty($formId)) : ?>
-<script>
+<?php if (!empty($formId)): ?>
+    <?php $scriptString = <<<script
     require([
         'prototype',
         'mage/adminhtml/grid'
@@ -23,24 +24,33 @@ $_id = 'id_' . md5(microtime());
         Event.observe(window, "load", function(){
             var serializeInput  = document.createElement('input');
             serializeInput.type = 'hidden';
-            serializeInput.name = '<?= $block->escapeJs($block->getInputElementName()) ?>';
-            serializeInput.id   = '<?= /* @noEscape */ $_id ?>';
+            serializeInput.name = '{$block->escapeJs($block->getInputElementName())}';
+            serializeInput.id   = '{$_id}';
             try {
-                document.getElementById('<?= $block->escapeJs($formId) ?>').appendChild(serializeInput);
-                new serializerController('<?= /* @noEscape */ $_id ?>', <?= /* @noEscape */ $block->getDataAsJSON() ?>, <?= /* @noEscape */ $block->getColumnInputNames(true) ?>, <?= $block->escapeJs($block->getGridBlock()->getJsObjectName()) ?>, '<?= $block->escapeJs($block->getReloadParamName()) ?>');
+                document.getElementById('{$block->escapeJs($formId)}').appendChild(serializeInput);
+                new serializerController('{$_id}', {$block->getDataAsJSON()}, {$block->getColumnInputNames(true)},
+                 {$block->escapeJs($block->getGridBlock()->getJsObjectName())},
+                 '{$block->escapeJs($block->getReloadParamName())}');
             } catch(e) {
                 //Error add serializer
             }
         });
     });
-</script>
-<?php else :?>
-<input type="hidden" name="<?= $block->escapeHtmlAttr($block->getInputElementName()) ?>"  value="" id="<?= /* @noEscape */ $_id ?>" />
-<script>
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
+<?php else:?>
+<input type="hidden" name="<?= $block->escapeHtmlAttr($block->getInputElementName()) ?>"  value=""
+       id="<?= /* @noEscape */ $_id ?>" />
+    <?php $scriptString = <<<script
     require([
         'mage/adminhtml/grid'
     ], function(){
-        new serializerController('<?= /* @noEscape */ $_id ?>', <?= /* @noEscape */ $block->getDataAsJSON() ?>, <?= /* @noEscape */ $block->getColumnInputNames(true) ?>, <?= $block->escapeJs($block->getGridBlock()->getJsObjectName()) ?>, '<?= $block->escapeJs($block->getReloadParamName()) ?>');
+        new serializerController('{$_id}', {$block->getDataAsJSON()}, {$block->getColumnInputNames(true)},
+         {$block->escapeJs($block->getGridBlock()->getJsObjectName())},
+         '{$block->escapeJs($block->getReloadParamName())}');
     });
-</script>
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <?php endif;?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml
index ff5d203076987..3312bd377686d 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml
@@ -19,14 +19,14 @@
             <a id="colapseAll" href="#"><?= $block->escapeHtml(__('Collapse All')) ?></a>
             <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
                 'onclick',
-                'tree.collapseTree(); return false;',
+                'tree.collapseTree(); event.preventDefault();',
                 '#colapseAll'
             ) ?>
             <span class="separator">|</span>
             <a id="expandAll" href="#"><?= $block->escapeHtml(__('Expand All')) ?></a>
             <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
                 'onclick',
-                'tree.expandTree(); return false;',
+                'tree.expandTree();event.preventDefault();',
                 '#expandAll'
             ) ?>
         <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/websites.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/websites.phtml
index f24293971ee07..59b5eb7f523c1 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/websites.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/websites.phtml
@@ -75,7 +75,7 @@
 require(["prototype"], function(){
 
     //<![CDATA[
-    var productWebsiteCheckboxes = $$('.website-checkbox');
+    var productWebsiteCheckboxes = \$$('.website-checkbox');
 
     for (var i = 0; i < productWebsiteCheckboxes.length; i++) {
         Event.observe(productWebsiteCheckboxes[i], 'click', toggleStoreFromChoosers);
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml
index 4311e52c7c122..2cf5a78a8138a 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/tab/inventory.phtml
@@ -486,7 +486,7 @@ script;
                 inventory_qty_increments: true
             };
 
-            $$('#table_cataloginventory > div').each(function(el) {
+            \$$('#table_cataloginventory > div').each(function(el) {
                 if (el == $('inventory_manage_stock').up(1)) {
                     return;
                 }
diff --git a/app/code/Magento/Catalog/view/base/templates/product/price/tier_prices.phtml b/app/code/Magento/Catalog/view/base/templates/product/price/tier_prices.phtml
index af50446c93a95..9e740e693fbf2 100644
--- a/app/code/Magento/Catalog/view/base/templates/product/price/tier_prices.phtml
+++ b/app/code/Magento/Catalog/view/base/templates/product/price/tier_prices.phtml
@@ -10,6 +10,7 @@
 // phpcs:disable Generic.WhiteSpace.ScopeIndent
 
 /** @var \Magento\Catalog\Pricing\Render\PriceBox $block */
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 
 /** @var \Magento\Catalog\Pricing\Price\TierPrice $tierPriceModel */
 $tierPriceModel = $block->getPrice();
@@ -56,10 +57,16 @@ $product = $block->getSaleableItem();
                     }
                     ?>
                     <?= $block->escapeHtml(__('Buy %1 for: ', $price['price_qty'])) ?>
-                    <a href="javascript:void(0);"
+                    <a href="#"
                        id="<?= $block->escapeHtmlAttr($popupId) ?>"
                        data-tier-price="<?= $block->escapeHtml($block->jsonEncode($tierPriceData)) ?>">
-                        <?= $block->escapeHtml(__('Click for price')) ?></a>
+                        <?= $block->escapeHtml(__('Click for price')) ?>
+                    </a>
+                    <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                        'onclick',
+                        'event.preventDefault()',
+                        'a#' . $block->escapeHtmlAttr($popupId)
+                    ) ?>
                 <?php else:
                     $priceAmountBlock = $block->renderAmount(
                         $price['price'],
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml
index 0dce2d978eb38..58933e9b867f7 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml
@@ -24,9 +24,14 @@
     <?php if ($_fileExists):?>
     <div class="control">
         <span class="<?= /* @noEscape */ $_fileNamed ?>"><?= $block->escapeHtml($_fileInfo->getTitle()) ?></span>
-        <a href="javascript:void(0)" class="label" id="change-<?= /* @noEscape */ $_fileName ?>" >
+        <a href="#" class="label" id="change-<?= /* @noEscape */ $_fileName ?>" >
             <?= $block->escapeHtml(__('Change')) ?>
         </a>
+        <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+            'onclick',
+            'event.preventDefault()',
+            'a#change-' ./* @noEscape */ $_fileName
+        ) ?>
         <?php if (!$_option->getIsRequire()):?>
             <input type="checkbox" id="delete-<?= /* @noEscape */ $_fileName ?>" />
             <span class="label"><?= $block->escapeHtml(__('Delete')) ?></span>
diff --git a/app/code/Magento/Customer/view/adminhtml/templates/system/config/validatevat.phtml b/app/code/Magento/Customer/view/adminhtml/templates/system/config/validatevat.phtml
index 222317559e246..f4a3d2db6b687 100644
--- a/app/code/Magento/Customer/view/adminhtml/templates/system/config/validatevat.phtml
+++ b/app/code/Magento/Customer/view/adminhtml/templates/system/config/validatevat.phtml
@@ -67,6 +67,6 @@ script;
 <?= /* @noEscape */ $secureRenderer->renderTag('style', [], '#validation_result {margin-bottom: 10px;}', false); ?>
 <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
     'onclick',
-    'javascript:validateVat(); return false;',
+    'validateVat();event.preventDefault();',
     '#' . /* @noEscape */ $block->getHtmlId()
 ); ?>
diff --git a/app/code/Magento/Dhl/view/adminhtml/templates/unitofmeasure.phtml b/app/code/Magento/Dhl/view/adminhtml/templates/unitofmeasure.phtml
index 5ad46f13af90a..2d9c8c91e1b76 100644
--- a/app/code/Magento/Dhl/view/adminhtml/templates/unitofmeasure.phtml
+++ b/app/code/Magento/Dhl/view/adminhtml/templates/unitofmeasure.phtml
@@ -19,10 +19,12 @@
                 dimensionUnit = "({$block->escapeHtml($block->getCm())})";
                 dhlUnitOfMeasureNote = "{$block->escapeHtml($block->getDivideOrderWeightNoteKg())}";
             }
-            $$('[for="carriers_dhl_height"]')[0].innerHTML = "{$block->escapeHtml($block->getHeight())} " +
+            \$$('[for="carriers_dhl_height"]')[0].innerHTML = "{$block->escapeHtml($block->getHeight())} " +
+             dimensionUnit;
+            \$$('[for="carriers_dhl_depth"]')[0].innerHTML = "{$block->escapeHtml($block->getDepth())} " +
+             dimensionUnit;
+            \$$('[for="carriers_dhl_width"]')[0].innerHTML = "{$block->escapeHtml($block->getWidth())} " +
              dimensionUnit;
-            $$('[for="carriers_dhl_depth"]')[0].innerHTML = "{$block->escapeHtml($block->getDepth())} " + dimensionUnit;
-            $$('[for="carriers_dhl_width"]')[0].innerHTML = "{$block->escapeHtml($block->getWidth())} " + dimensionUnit;
 
             $("carriers_dhl_divide_order_weight").next().down().innerHTML = dhlUnitOfMeasureNote;
         }
diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/import/frame/result.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/import/frame/result.phtml
index 57f521fba946f..08b8b0414e81e 100644
--- a/app/code/Magento/ImportExport/view/adminhtml/templates/import/frame/result.phtml
+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/import/frame/result.phtml
@@ -3,9 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<script type='text/javascript'>
+<?php $scriptString = <<<script
+
 //<![CDATA[
-    top.varienImport.postToFrameComplete(<?= /* @noEscape */ $block->getResponseJson() ?>);
+    top.varienImport.postToFrameComplete({$block->getResponseJson()});
 //]]>
-</script>
+
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/transparent/iframe.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/transparent/iframe.phtml
index 4edb109d6a4b9..8808bd08985f5 100644
--- a/app/code/Magento/Paypal/view/adminhtml/templates/transparent/iframe.phtml
+++ b/app/code/Magento/Paypal/view/adminhtml/templates/transparent/iframe.phtml
@@ -6,22 +6,28 @@
 
 /**
  * @var \Magento\Payment\Block\Transparent\Iframe $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 $params = $block->getParams();
 
+/** @var \Magento\Framework\Json\Helper\Data $jsonHelper */
+$jsonHelper = $block->getData('jsonHelper');
 ?>
 <html>
 <head>
-<script>
-<?php if (isset($params['redirect'])) : ?>
-    window.location="<?= $block->escapeUrl($params['redirect']) ?>";
-<?php elseif (isset($params['redirect_parent'])) : ?>
-    window.top.location="<?= $block->escapeUrl($params['redirect_parent']) ?>";
-<?php elseif (isset($params['error_msg'])) : ?>
-    window.top.alert(<?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($params['error_msg']) ?>);
-<?php elseif (isset($params['order_success'])) : ?>
-    window.top.location = "<?= $block->escapeUrl($params['order_success']) ?>";
-<?php else : ?>
+<?php
+$scriptString = '';
+if (isset($params['redirect'])):
+    $scriptString .= 'window.location="' . $block->escapeJs($params['redirect']) . '";' . PHP_EOL;
+elseif (isset($params['redirect_parent'])):
+    $scriptString .= 'window.top.location="' . $block->escapeJs($params['redirect_parent']) . '";' . PHP_EOL;
+elseif (isset($params['error_msg'])):
+    $scriptString .= 'window.top.alert(' . /* @noEscape */ $jsonHelper->jsonEncode($params['error_msg']) . ');' .
+        PHP_EOL;
+elseif (isset($params['order_success'])):
+    $scriptString .= 'window.top.location = "' . $block->escapeJs($params['order_success']) . '";' . PHP_EOL;
+else:
+    $scriptString .= <<<script
     var require = window.top.require;
     require(['jquery'], function($) {
         var cc_number = $("input[name='payment[cc_number]']").val();
@@ -33,8 +39,10 @@ $params = $block->getParams();
 
         $('#edit_form').trigger('realOrder');
     });
-<?php endif; ?>
-</script>
+script;
+endif;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 </head>
 <body>
 </body>
diff --git a/app/code/Magento/Reports/view/adminhtml/templates/report/grid/container.phtml b/app/code/Magento/Reports/view/adminhtml/templates/report/grid/container.phtml
index 2ff540486d3c5..1d3471a877387 100644
--- a/app/code/Magento/Reports/view/adminhtml/templates/report/grid/container.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/templates/report/grid/container.phtml
@@ -24,7 +24,7 @@ require([
 //<![CDATA[
     jQuery('#filter_form').mage('validation', {errorClass: 'mage-error'});
     function filterFormSubmit() {
-        var filters = $$('#filter_form input', '#filter_form select'),
+        var filters = \$$('#filter_form input', '#filter_form select'),
             elements = [];
 
         for (var i in filters) {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Product.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Product.php
index 271b5b7afa1c9..c72d27c45cfc5 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Product.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Product.php
@@ -5,6 +5,10 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Order\Create\Search\Grid\Renderer;
 
+use Magento\Backend\Block\Context;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 /**
  * Adminhtml sales create order product search grid product name column renderer
  *
@@ -12,6 +16,22 @@
  */
 class Product extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text
 {
+    /**
+     * @var SecureHtmlRenderer
+     */
+    protected $secureRenderer;
+
+    /**
+     * @param Context $context
+     * @param array $data
+     * @param SecureHtmlRenderer|null $secureRenderer
+     */
+    public function __construct(Context $context, array $data = [], ?SecureHtmlRenderer $secureRenderer = null)
+    {
+        parent::__construct($context, $data);
+        $this->secureRenderer = $secureRenderer ?? ObjectManager::getInstance()->get(SecureHtmlRenderer::class);
+    }
+
     /**
      * Render product name to add Configure link
      *
@@ -28,10 +48,14 @@ public function render(\Magento\Framework\DataObject $row)
             $row->getId()
         ) : 'disabled="disabled"';
         return sprintf(
-            '<a href="javascript:void(0)" class="action-configure %s" %s>%s</a>',
+            '<a href="#" id="search-grid-product-' . $row->getId() . '" class="action-configure %s" %s>%s</a>',
             $style,
             $prodAttributes,
             __('Configure')
+        ) . $this->secureRenderer->renderEventListenerAsTag(
+            'onclick',
+            'event.preventDefault()',
+            'a#search-grid-product-' . $row->getId()
         ) . $rendered;
     }
 }
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml
index 1ee83cdd62db9..afa08c32773ed 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml
@@ -25,12 +25,18 @@ script;
             'div#order-additional_area'
         ) ?>
 
-        <div id="order-search" class="admin__page-section order-search-items">
+        <div id="order-search" class="admin__page-section order-search-items no-display">
             <?= $block->getChildHtml('search') ?>
         </div>
-        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-            'display:none',
-            'div#order-search'
+        <?= /* @noEscape */ $secureRenderer->renderTag(
+            'script',
+            [],
+            "let elemOrderSearch = document.querySelector('div#order-search');
+            if (elemOrderSearch) {
+                elemOrderSearch.style.display = 'none';
+                elemOrderSearch.classList.remove('no-display');
+            }",
+            false
         ) ?>
 
         <section id="order-items" class="admin__page-section order-items" data-mage-init='{"loader": {}}'>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml
index d55b75103c7e3..744276213077c 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml
@@ -98,7 +98,7 @@ $taxHelper = $block->getData('taxHelper');
         </div>
         <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
             'onclick',
-            "$('order-shipping-method-info').hide();$('order-shipping-method-choose').show();return false",
+            "$('order-shipping-method-info').hide();$('order-shipping-method-choose').show();event.preventDefault()",
             'div#order-shipping-method-info a.action-default'
         ) ?>
     <?php else: ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
index 590aca0acfc0d..06f0603a21215 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
@@ -91,7 +91,7 @@ require([
         var headerLine = null;
         var contentLine = null;
 
-        $$('#gift_options_data_' + itemId + ' .gift-options-tooltip-content').each(function (element) {
+        \$$('#gift_options_data_' + itemId + ' .gift-options-tooltip-content').each(function (element) {
             if (element.down(0)) {
                 headerLine = element.down(0).innerHTML;
                 contentLine = element.down(0).next().innerHTML;
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 e138112ac3f5a..102b7072dc6d1 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
@@ -93,7 +93,7 @@ define([
 
                     this.itemsArea.onLoad = this.itemsArea.onLoad.wrap(function (proceed) {
                         proceed();
-                        if ($(searchAreaId) && !$(searchAreaId).visible() && !$(searchButtonId)) {
+                        if ($(searchAreaId) && !jQuery('#' + searchAreaId).is(':visible') && !$(searchButtonId)) {
                             this.addControlButton(searchButton);
                         }
                     });
diff --git a/app/code/Magento/SalesRule/view/adminhtml/templates/promo/salesrulejs.phtml b/app/code/Magento/SalesRule/view/adminhtml/templates/promo/salesrulejs.phtml
index 64918c24cdc61..5a81d2fd94e14 100644
--- a/app/code/Magento/SalesRule/view/adminhtml/templates/promo/salesrulejs.phtml
+++ b/app/code/Magento/SalesRule/view/adminhtml/templates/promo/salesrulejs.phtml
@@ -3,8 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<script>
+<?php $scriptString = <<<script
 require([
     'jquery',
     "uiRegistry",
@@ -41,15 +43,15 @@ function generateCouponCodes(idPrefix, generateUrl, grid) {
     var elements = $(idPrefix + 'information_fieldset').select('input', 'select', 'textarea');
 
     elements = elements.concat(
-        $$('#rule_uses_per_coupon'),
-        $$('#rule_uses_per_customer'),
-        $$('#rule_to_date')
+        \$$('#rule_uses_per_coupon'),
+        \$$('#rule_uses_per_customer'),
+        \$$('#rule_to_date')
     );
 
     var params = Form.serializeElements(elements, true);
     params.form_key = FORM_KEY;
-    if ($$('#'+idPrefix + 'information_fieldset .messages')) {
-        $$('#'+idPrefix + 'information_fieldset .messages')[0].update();
+    if (\$$('#'+idPrefix + 'information_fieldset .messages')) {
+        \$$('#'+idPrefix + 'information_fieldset .messages')[0].update();
     }
     if ($('messages')) {
         $('messages').update();
@@ -71,8 +73,8 @@ function generateCouponCodes(idPrefix, generateUrl, grid) {
                 couponCodesGrid.reload();
             }
             if (response && response.messages) {
-                if ($$('#'+idPrefix + 'information_fieldset .messages')) {
-                    $$('#'+idPrefix + 'information_fieldset .messages')[0].update(response.messages);
+                if (\$$('#'+idPrefix + 'information_fieldset .messages')) {
+                    \$$('#'+idPrefix + 'information_fieldset .messages')[0].update(response.messages);
                 } else if ($('messages')) {
                     $('messages').update(response.messages);
                 }
@@ -94,4 +96,6 @@ window.validateCouponGenerate = validateCouponGenerate;
 window.generateCouponCodes = generateCouponCodes;
 window.refreshCouponCodesGrid = refreshCouponCodesGrid;
 });
-</script>
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/app/code/Magento/Theme/view/frontend/templates/page/js/require_js.phtml b/app/code/Magento/Theme/view/frontend/templates/page/js/require_js.phtml
index b56468ba07f9d..a83d510ee0926 100644
--- a/app/code/Magento/Theme/view/frontend/templates/page/js/require_js.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/page/js/require_js.phtml
@@ -7,9 +7,9 @@
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 
 $scriptString = '
-    var BASE_URL = \'' . /* @noEscape */ $block->escapeUrl($block->getBaseUrl()) .'\';
+    var BASE_URL = \'' . /* @noEscape */ $block->escapeJs($block->getBaseUrl()) .'\';
     var require = {
-        \'baseUrl\': \'' . /* @noEscape */ $block->escapeUrl($block->getViewFileUrl('/')) . '\'
+        \'baseUrl\': \'' . /* @noEscape */ $block->escapeJs($block->getViewFileUrl('/')) . '\'
     };';
 
 echo /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false);

From 9365b57c0591e14f5945a856acfb740c1921f69f Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Fri, 17 Apr 2020 14:55:42 +0300
Subject: [PATCH 0226/1718] Adding Product and Customer Reviews GraphQl support

---
 .../AddRatingVotesToCustomerReviews.php       |  55 ++++
 .../Service/GetReviewAverageRatingService.php |  32 ++
 .../ReviewGraphQl/Mapper/ReviewDataMapper.php |  36 +++
 .../AggregatedReviewsDataProvider.php         |  75 +++++
 .../CustomerReviewsDataProvider.php           |  62 ++++
 .../ProductReviewsDataProvider.php            |  60 ++++
 .../ReviewRatingsDataProvider.php             |  35 +++
 .../Model/Resolver/CreateProductReview.php    | 105 +++++++
 .../Model/Resolver/Customer/Reviews.php       |  90 ++++++
 .../Model/Resolver/Product/RatingSummary.php  |  79 +++++
 .../Resolver/Product/Review/AverageRating.php |  69 +++++
 .../Product/Review/RatingBreakdown.php        |  69 +++++
 .../Model/Resolver/Product/ReviewCount.php    |  68 +++++
 .../Model/Resolver/Product/Reviews.php        |  91 ++++++
 .../ProductReviewRatingValueMetadata.php      |  56 ++++
 .../Resolver/ProductReviewRatingsMetadata.php |  80 +++++
 .../Model/Review/AddReviewToProduct.php       | 159 ++++++++++
 app/code/Magento/ReviewGraphQl/README.md      |   3 +
 app/code/Magento/ReviewGraphQl/composer.json  |  29 ++
 app/code/Magento/ReviewGraphQl/etc/module.xml |  17 ++
 .../Magento/ReviewGraphQl/etc/schema.graphqls |  78 +++++
 .../Magento/ReviewGraphQl/registration.php    |   9 +
 composer.json                                 |   1 +
 .../Review/CreateProductReviewsTest.php       | 209 +++++++++++++
 .../GraphQl/Review/GetProductReviewsTest.php  | 284 ++++++++++++++++++
 ..._position_and_add_store_to_all_ratings.php |  31 ++
 ..._and_add_store_to_all_ratings_rollback.php |  29 ++
 27 files changed, 1911 insertions(+)
 create mode 100644 app/code/Magento/Review/Model/Review/AddRatingVotesToCustomerReviews.php
 create mode 100644 app/code/Magento/Review/Service/GetReviewAverageRatingService.php
 create mode 100644 app/code/Magento/ReviewGraphQl/Mapper/ReviewDataMapper.php
 create mode 100644 app/code/Magento/ReviewGraphQl/Model/DataProvider/AggregatedReviewsDataProvider.php
 create mode 100644 app/code/Magento/ReviewGraphQl/Model/DataProvider/CustomerReviewsDataProvider.php
 create mode 100644 app/code/Magento/ReviewGraphQl/Model/DataProvider/ProductReviewsDataProvider.php
 create mode 100644 app/code/Magento/ReviewGraphQl/Model/DataProvider/ReviewRatingsDataProvider.php
 create mode 100644 app/code/Magento/ReviewGraphQl/Model/Resolver/CreateProductReview.php
 create mode 100644 app/code/Magento/ReviewGraphQl/Model/Resolver/Customer/Reviews.php
 create mode 100644 app/code/Magento/ReviewGraphQl/Model/Resolver/Product/RatingSummary.php
 create mode 100644 app/code/Magento/ReviewGraphQl/Model/Resolver/Product/Review/AverageRating.php
 create mode 100644 app/code/Magento/ReviewGraphQl/Model/Resolver/Product/Review/RatingBreakdown.php
 create mode 100644 app/code/Magento/ReviewGraphQl/Model/Resolver/Product/ReviewCount.php
 create mode 100644 app/code/Magento/ReviewGraphQl/Model/Resolver/Product/Reviews.php
 create mode 100644 app/code/Magento/ReviewGraphQl/Model/Resolver/ProductReviewRatingValueMetadata.php
 create mode 100644 app/code/Magento/ReviewGraphQl/Model/Resolver/ProductReviewRatingsMetadata.php
 create mode 100644 app/code/Magento/ReviewGraphQl/Model/Review/AddReviewToProduct.php
 create mode 100644 app/code/Magento/ReviewGraphQl/README.md
 create mode 100644 app/code/Magento/ReviewGraphQl/composer.json
 create mode 100644 app/code/Magento/ReviewGraphQl/etc/module.xml
 create mode 100644 app/code/Magento/ReviewGraphQl/etc/schema.graphqls
 create mode 100644 app/code/Magento/ReviewGraphQl/registration.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Review/CreateProductReviewsTest.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Review/GetProductReviewsTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Review/_files/set_position_and_add_store_to_all_ratings.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Review/_files/set_position_and_add_store_to_all_ratings_rollback.php

diff --git a/app/code/Magento/Review/Model/Review/AddRatingVotesToCustomerReviews.php b/app/code/Magento/Review/Model/Review/AddRatingVotesToCustomerReviews.php
new file mode 100644
index 0000000000000..c50790405a880
--- /dev/null
+++ b/app/code/Magento/Review/Model/Review/AddRatingVotesToCustomerReviews.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Review\Model\Review;
+
+use Magento\Review\Model\ResourceModel\Rating\Option\Vote\Collection as OptionVoteCollection;
+use Magento\Review\Model\ResourceModel\Rating\Option\Vote\CollectionFactory as OptionVoteCollectionFactory;
+use Magento\Review\Model\ResourceModel\Review\Product\Collection;
+
+/**
+ * The model that adds the rating votes to reviews
+ */
+class AddRatingVotesToCustomerReviews
+{
+    /**
+     * @var RatingOptionCollectionFactory
+     */
+    private $ratingOptionCollectionFactory;
+
+    /**
+     * @param OptionVoteCollectionFactory $ratingOptionCollectionFactory
+     */
+    public function __construct(OptionVoteCollectionFactory $ratingOptionCollectionFactory)
+    {
+        $this->ratingOptionCollectionFactory = $ratingOptionCollectionFactory;
+    }
+
+    /**
+     * Add rating votes to customer reviews
+     *
+     * @param Collection $collection
+     */
+    public function execute(Collection $collection): void
+    {
+        $connection = $collection->getConnection();
+
+        foreach ($collection->getItems() as &$item) {
+            /** @var OptionVoteCollection $votesCollection */
+            $votesCollection = $this->ratingOptionCollectionFactory->create();
+
+            $votesCollection->addFieldToFilter('main_table.review_id', $item->getData('review_id'));
+            $votesCollection->getSelect()
+                ->join(
+                    ['rating' => $connection->getTableName('rating')],
+                    'rating.rating_id = main_table.rating_id',
+                    ['rating_code']
+                );
+            $item->setRatingVotes($votesCollection);
+        }
+    }
+}
diff --git a/app/code/Magento/Review/Service/GetReviewAverageRatingService.php b/app/code/Magento/Review/Service/GetReviewAverageRatingService.php
new file mode 100644
index 0000000000000..92175b717bcc8
--- /dev/null
+++ b/app/code/Magento/Review/Service/GetReviewAverageRatingService.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Review\Service;
+
+/**
+ * Get review average rating
+ */
+class GetReviewAverageRatingService
+{
+    /**
+     * Get average rating per review
+     *
+     * @param array $ratingVotes
+     *
+     * @return float
+     */
+    public function execute(array $ratingVotes): float
+    {
+        $averageRating = 0;
+
+        foreach ($ratingVotes as $ratingVote) {
+            $averageRating += (int) $ratingVote->getData('value');
+        }
+
+        return $averageRating > 0 ? (float) number_format($averageRating / count($ratingVotes), 2) : 0;
+    }
+}
diff --git a/app/code/Magento/ReviewGraphQl/Mapper/ReviewDataMapper.php b/app/code/Magento/ReviewGraphQl/Mapper/ReviewDataMapper.php
new file mode 100644
index 0000000000000..324775f61fa66
--- /dev/null
+++ b/app/code/Magento/ReviewGraphQl/Mapper/ReviewDataMapper.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReviewGraphQl\Mapper;
+
+use Magento\Catalog\Model\Product;
+use Magento\Review\Model\Review;
+
+/**
+ * Converts the review data from review object to an associative array
+ */
+class ReviewDataMapper
+{
+    /**
+     * Mapping the review data
+     *
+     * @param Review|Product $review
+     *
+     * @return array
+     */
+    public function map($review): array
+    {
+        return [
+            'summary' => $review->getData('title'),
+            'text' => $review->getData('detail'),
+            'nickname' => $review->getData('nickname'),
+            'created_at' => $review->getData('created_at'),
+            'rating_votes' => $review->getData('rating_votes'),
+            'sku' => $review->getSku()
+        ];
+    }
+}
diff --git a/app/code/Magento/ReviewGraphQl/Model/DataProvider/AggregatedReviewsDataProvider.php b/app/code/Magento/ReviewGraphQl/Model/DataProvider/AggregatedReviewsDataProvider.php
new file mode 100644
index 0000000000000..5412c670b4800
--- /dev/null
+++ b/app/code/Magento/ReviewGraphQl/Model/DataProvider/AggregatedReviewsDataProvider.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReviewGraphQl\Model\DataProvider;
+
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Review\Model\ResourceModel\Review\Collection as ReviewCollection;
+use Magento\Review\Model\ResourceModel\Review\Product\Collection as ProductCollection;
+use Magento\ReviewGraphQl\Mapper\ReviewDataMapper;
+
+/**
+ * Provides aggregated reviews result
+ *
+ * The following class prepares the GraphQl endpoints' result for Customer and Product reviews
+ */
+class AggregatedReviewsDataProvider
+{
+    /**
+     * @var ReviewDataMapper
+     */
+    private $reviewDataMapper;
+
+    /**
+     * @param ReviewDataMapper $reviewDataMapper
+     */
+    public function __construct(ReviewDataMapper $reviewDataMapper)
+    {
+        $this->reviewDataMapper = $reviewDataMapper;
+    }
+
+    /**
+     * Get reviews result
+     *
+     * @param ProductCollection|ReviewCollection $reviewsCollection
+     *
+     * @return array
+     */
+    public function getData($reviewsCollection): array
+    {
+        if ($reviewsCollection->getPageSize()) {
+            $maxPages = ceil($reviewsCollection->getSize() / $reviewsCollection->getPageSize());
+        } else {
+            $maxPages = 0;
+        }
+
+        $currentPage = $reviewsCollection->getCurPage();
+        if ($reviewsCollection->getCurPage() > $maxPages && $reviewsCollection->getSize() > 0) {
+            $currentPage = new GraphQlInputException(
+                __(
+                    'currentPage value %1 specified is greater than the number of pages available.',
+                    [$maxPages]
+                )
+            );
+        }
+
+        $items = [];
+        foreach ($reviewsCollection->getItems() as $item) {
+            $items[] = $this->reviewDataMapper->map($item);
+        }
+
+        return [
+            'total_count' => $reviewsCollection->getSize(),
+            'items' => $items,
+            'page_info' => [
+                'page_size' => $reviewsCollection->getPageSize(),
+                'current_page' => $currentPage,
+                'total_pages' => $maxPages
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/ReviewGraphQl/Model/DataProvider/CustomerReviewsDataProvider.php b/app/code/Magento/ReviewGraphQl/Model/DataProvider/CustomerReviewsDataProvider.php
new file mode 100644
index 0000000000000..643ab5954641b
--- /dev/null
+++ b/app/code/Magento/ReviewGraphQl/Model/DataProvider/CustomerReviewsDataProvider.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReviewGraphQl\Model\DataProvider;
+
+use Magento\Review\Model\ResourceModel\Review\Product\Collection as ProductReviewsCollection;
+use Magento\Review\Model\ResourceModel\Review\Product\CollectionFactory;
+use Magento\Review\Model\Review\AddRatingVotesToCustomerReviews;
+
+/**
+ * Provides customer reviews
+ */
+class CustomerReviewsDataProvider
+{
+    /**
+     * @var CollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @var AddRatingVotesToCustomerReviews
+     */
+    private $addRatingVotesToCustomerReviews;
+
+    /**
+     * @param CollectionFactory $collectionFactory
+     * @param AddRatingVotesToCustomerReviews $addRatingVotesToCustomerReviews
+     */
+    public function __construct(
+        CollectionFactory $collectionFactory,
+        AddRatingVotesToCustomerReviews $addRatingVotesToCustomerReviews
+    ) {
+        $this->collectionFactory = $collectionFactory;
+        $this->addRatingVotesToCustomerReviews = $addRatingVotesToCustomerReviews;
+    }
+
+    /**
+     * Get customer reviews
+     *
+     * @param int $customerId
+     * @param int $currentPage
+     * @param int $pageSize
+     *
+     * @return ProductReviewsCollection
+     */
+    public function getData(int $customerId, int $currentPage, int $pageSize): ProductReviewsCollection
+    {
+        /** @var ProductReviewsCollection $reviewsCollection */
+        $reviewsCollection = $this->collectionFactory->create();
+        $reviewsCollection->addCustomerFilter($customerId)
+            ->setPageSize($pageSize)
+            ->setCurPage($currentPage)
+            ->setDateOrder();
+        $this->addRatingVotesToCustomerReviews->execute($reviewsCollection);
+
+        return $reviewsCollection;
+    }
+}
diff --git a/app/code/Magento/ReviewGraphQl/Model/DataProvider/ProductReviewsDataProvider.php b/app/code/Magento/ReviewGraphQl/Model/DataProvider/ProductReviewsDataProvider.php
new file mode 100644
index 0000000000000..635605f9091ed
--- /dev/null
+++ b/app/code/Magento/ReviewGraphQl/Model/DataProvider/ProductReviewsDataProvider.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReviewGraphQl\Model\DataProvider;
+
+use Magento\Review\Model\ResourceModel\Review\Collection;
+use Magento\Review\Model\ResourceModel\Review\CollectionFactory;
+use Magento\Review\Model\Review;
+
+/**
+ * Provides product reviews
+ */
+class ProductReviewsDataProvider
+{
+    /**
+     * @var CollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @param CollectionFactory $collectionFactory
+     */
+    public function __construct(
+        CollectionFactory $collectionFactory
+    ) {
+        $this->collectionFactory = $collectionFactory;
+    }
+
+    /**
+     * Get product reviews
+     *
+     * @param int $productId
+     * @param int $currentPage
+     * @param int $pageSize
+     *
+     * @return Collection
+     */
+    public function getData(int $productId, int $currentPage, int $pageSize): Collection
+    {
+        /** @var Collection $reviewsCollection */
+        $reviewsCollection = $this->collectionFactory->create()
+            ->addStatusFilter(Review::STATUS_APPROVED)
+            ->addEntityFilter(Review::ENTITY_PRODUCT_CODE, $productId)
+            ->setPageSize($pageSize)
+            ->setCurPage($currentPage)
+            ->setDateOrder();
+        $reviewsCollection->getSelect()->join(
+            ['cpe' => $reviewsCollection->getTable('catalog_product_entity')],
+            'cpe.entity_id = main_table.entity_pk_value',
+            ['sku']
+        );
+        $reviewsCollection->addRateVotes();
+
+        return $reviewsCollection;
+    }
+}
diff --git a/app/code/Magento/ReviewGraphQl/Model/DataProvider/ReviewRatingsDataProvider.php b/app/code/Magento/ReviewGraphQl/Model/DataProvider/ReviewRatingsDataProvider.php
new file mode 100644
index 0000000000000..a327f51c3e696
--- /dev/null
+++ b/app/code/Magento/ReviewGraphQl/Model/DataProvider/ReviewRatingsDataProvider.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReviewGraphQl\Model\DataProvider;
+
+/**
+ * Provides rating votes
+ */
+class ReviewRatingsDataProvider
+{
+    /**
+     * Providing rating votes
+     *
+     * @param array $ratingVotes
+     *
+     * @return array
+     */
+    public function getData(array $ratingVotes): array
+    {
+        $data = [];
+
+        foreach ($ratingVotes as $ratingVote) {
+            $data[] = [
+                'name' => $ratingVote->getData('rating_code'),
+                'value' => $ratingVote->getData('value')
+            ];
+        }
+
+        return $data;
+    }
+}
diff --git a/app/code/Magento/ReviewGraphQl/Model/Resolver/CreateProductReview.php b/app/code/Magento/ReviewGraphQl/Model/Resolver/CreateProductReview.php
new file mode 100644
index 0000000000000..6db31f3a50f33
--- /dev/null
+++ b/app/code/Magento/ReviewGraphQl/Model/Resolver/CreateProductReview.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReviewGraphQl\Model\Resolver;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Framework\GraphQl\Query\Resolver\Value;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Review\Helper\Data as ReviewHelper;
+use Magento\ReviewGraphQl\Mapper\ReviewDataMapper;
+use Magento\ReviewGraphQl\Model\Review\AddReviewToProduct;
+use Magento\Store\Api\Data\StoreInterface;
+
+/**
+ * Create product review resolver
+ */
+class CreateProductReview implements ResolverInterface
+{
+    /**
+     * @var ReviewHelper
+     */
+    private $reviewHelper;
+
+    /**
+     * @var AddReviewToProduct
+     */
+    private $addReviewToProduct;
+
+    /**
+     * @var ReviewDataMapper
+     */
+    private $reviewDataMapper;
+
+    /**
+     * @param AddReviewToProduct $addReviewToProduct
+     * @param ReviewDataMapper $reviewDataMapper
+     * @param ReviewHelper $reviewHelper
+     */
+    public function __construct(
+        AddReviewToProduct $addReviewToProduct,
+        ReviewDataMapper $reviewDataMapper,
+        ReviewHelper $reviewHelper
+    ) {
+
+        $this->addReviewToProduct = $addReviewToProduct;
+        $this->reviewDataMapper = $reviewDataMapper;
+        $this->reviewHelper = $reviewHelper;
+    }
+
+    /**
+     * Resolve product review ratings
+     *
+     * @param Field $field
+     * @param ContextInterface $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     *
+     * @return array[]|Value|mixed
+     *
+     * @throws GraphQlAuthorizationException
+     * @throws GraphQlNoSuchEntityException
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        $input = $args['input'];
+        $customerId = null;
+
+        if (false !== $context->getExtensionAttributes()->getIsCustomer()) {
+            $customerId = (int) $context->getUserId();
+        }
+
+        if (!$customerId && !$this->reviewHelper->getIsGuestAllowToWrite()) {
+            throw new GraphQlAuthorizationException(__('Guest customers aren\'t allowed to add product reviews.'));
+        }
+
+        $sku = $input['sku'];
+        $ratings = $input['ratings'];
+        $data = [
+            'nickname' => $input['nickname'],
+            'title' => $input['summary'],
+            'detail' => $input['text'],
+        ];
+        /** @var StoreInterface $store */
+        $store = $context->getExtensionAttributes()->getStore();
+        $review = $this->addReviewToProduct->execute($data, $ratings, $sku, $customerId, (int) $store->getId());
+
+        return ['review' => $this->reviewDataMapper->map($review)];
+    }
+}
diff --git a/app/code/Magento/ReviewGraphQl/Model/Resolver/Customer/Reviews.php b/app/code/Magento/ReviewGraphQl/Model/Resolver/Customer/Reviews.php
new file mode 100644
index 0000000000000..8c0bca63f8efc
--- /dev/null
+++ b/app/code/Magento/ReviewGraphQl/Model/Resolver/Customer/Reviews.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReviewGraphQl\Model\Resolver\Customer;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Framework\GraphQl\Query\Resolver\Value;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\ReviewGraphQl\Model\DataProvider\AggregatedReviewsDataProvider;
+use Magento\ReviewGraphQl\Model\DataProvider\CustomerReviewsDataProvider;
+
+/**
+ * Customer reviews resolver, used by GraphQL endpoints to retrieve customer's reviews
+ */
+class Reviews implements ResolverInterface
+{
+    /**
+     * @var CustomerReviewsDataProvider
+     */
+    private $customerReviewsDataProvider;
+
+    /**
+     * @var AggregatedReviewsDataProvider
+     */
+    private $aggregatedReviewsDataProvider;
+
+    /**
+     * @param CustomerReviewsDataProvider $customerReviewsDataProvider
+     * @param AggregatedReviewsDataProvider $aggregatedReviewsDataProvider
+     */
+    public function __construct(
+        CustomerReviewsDataProvider $customerReviewsDataProvider,
+        AggregatedReviewsDataProvider $aggregatedReviewsDataProvider
+    ) {
+        $this->customerReviewsDataProvider = $customerReviewsDataProvider;
+        $this->aggregatedReviewsDataProvider = $aggregatedReviewsDataProvider;
+    }
+
+    /**
+     * Resolves the customer reviews
+     *
+     * @param Field $field
+     * @param ContextInterface $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     *
+     * @return array|Value|mixed
+     *
+     * @throws GraphQlInputException
+     * @throws GraphQlAuthorizationException
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (false === $context->getExtensionAttributes()->getIsCustomer()) {
+            throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
+        }
+
+        if ($args['currentPage'] < 1) {
+            throw new GraphQlInputException(__('currentPage value must be greater than 0.'));
+        }
+
+        if ($args['pageSize'] < 1) {
+            throw new GraphQlInputException(__('pageSize value must be greater than 0.'));
+        }
+
+        $reviewsCollection = $this->customerReviewsDataProvider->getData(
+            (int) $context->getUserId(),
+            $args['currentPage'],
+            $args['pageSize']
+        );
+
+        return $this->aggregatedReviewsDataProvider->getData($reviewsCollection);
+    }
+}
diff --git a/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/RatingSummary.php b/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/RatingSummary.php
new file mode 100644
index 0000000000000..56c7e7b5912f2
--- /dev/null
+++ b/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/RatingSummary.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReviewGraphQl\Model\Resolver\Product;
+
+use Exception;
+use Magento\Catalog\Model\Product;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Review\Model\Review\SummaryFactory;
+use Magento\Store\Api\Data\StoreInterface;
+
+/**
+ * Average rating for the product
+ */
+class RatingSummary implements ResolverInterface
+{
+    /**
+     * @var SummaryFactory
+     */
+    private $summaryFactory;
+
+    /**
+     * @param SummaryFactory $summaryFactory
+     */
+    public function __construct(
+        SummaryFactory $summaryFactory
+    ) {
+        $this->summaryFactory = $summaryFactory;
+    }
+
+    /**
+     * Resolves the product rating summary
+     *
+     * @param Field $field
+     * @param ContextInterface $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     *
+     * @return float
+     *
+     * @throws GraphQlInputException
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ): float {
+        if (!isset($value['model'])) {
+            throw new GraphQlInputException(__('Value must contain "model" property.'));
+        }
+
+        /** @var StoreInterface $store */
+        $store = $context->getExtensionAttributes()->getStore();
+
+        /** @var Product $product */
+        $product = $value['model'];
+
+        try {
+            $summary = $this->summaryFactory->create()->setStoreId($store->getId())->load($product->getId());
+
+            return floatval($summary->getData('rating_summary'));
+        } catch (Exception $e) {
+            throw new GraphQlInputException(__('Couldn\'t get the product rating summary.'));
+        }
+    }
+}
diff --git a/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/Review/AverageRating.php b/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/Review/AverageRating.php
new file mode 100644
index 0000000000000..eb84856ba47d6
--- /dev/null
+++ b/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/Review/AverageRating.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReviewGraphQl\Model\Resolver\Product\Review;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Framework\GraphQl\Query\Resolver\Value;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Review\Model\ResourceModel\Rating\Option\Vote\Collection as VoteCollection;
+use Magento\Review\Service\GetReviewAverageRatingService;
+
+/**
+ * Review average rating resolver
+ */
+class AverageRating implements ResolverInterface
+{
+    /**
+     * @var GetReviewAverageRatingService
+     */
+    private $getReviewAverageRatingService;
+
+    /**
+     * @param GetReviewAverageRatingService $getReviewAverageRatingService
+     */
+    public function __construct(
+        GetReviewAverageRatingService $getReviewAverageRatingService
+    ) {
+        $this->getReviewAverageRatingService = $getReviewAverageRatingService;
+    }
+
+    /**
+     * Resolves review average rating
+     *
+     * @param Field $field
+     * @param ContextInterface $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     *
+     * @return float|Value|mixed
+     *
+     * @throws GraphQlInputException
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['rating_votes'])) {
+            throw new GraphQlInputException(__('Value must contain "rating_votes" property.'));
+        }
+
+        /** @var VoteCollection $ratingVotes */
+        $ratingVotes = $value['rating_votes'];
+
+        return $this->getReviewAverageRatingService->execute($ratingVotes->getItems());
+    }
+}
diff --git a/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/Review/RatingBreakdown.php b/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/Review/RatingBreakdown.php
new file mode 100644
index 0000000000000..050afed45dbfb
--- /dev/null
+++ b/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/Review/RatingBreakdown.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReviewGraphQl\Model\Resolver\Product\Review;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Framework\GraphQl\Query\Resolver\Value;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Review\Model\ResourceModel\Rating\Option\Vote\Collection as VoteCollection;
+use Magento\ReviewGraphQl\Model\DataProvider\ReviewRatingsDataProvider;
+
+/**
+ * Review rating resolver
+ */
+class RatingBreakdown implements ResolverInterface
+{
+    /**
+     * @var ReviewRatingsDataProvider
+     */
+    private $reviewRatingsDataProvider;
+
+    /**
+     * @param ReviewRatingsDataProvider $reviewRatingsDataProvider
+     */
+    public function __construct(
+        ReviewRatingsDataProvider $reviewRatingsDataProvider
+    ) {
+        $this->reviewRatingsDataProvider = $reviewRatingsDataProvider;
+    }
+
+    /**
+     * Resolves the rating breakdown
+     *
+     * @param Field $field
+     * @param ContextInterface $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     *
+     * @return array|Value|mixed
+     *
+     * @throws GraphQlInputException
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['rating_votes'])) {
+            throw new GraphQlInputException(__('Value must contain "rating_votes" property.'));
+        }
+
+        /** @var VoteCollection $ratingVotes */
+        $ratingVotes = $value['rating_votes'];
+
+        return $this->reviewRatingsDataProvider->getData($ratingVotes->getItems());
+    }
+}
diff --git a/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/ReviewCount.php b/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/ReviewCount.php
new file mode 100644
index 0000000000000..5e9fa490fcd8f
--- /dev/null
+++ b/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/ReviewCount.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReviewGraphQl\Model\Resolver\Product;
+
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Framework\GraphQl\Query\Resolver\Value;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Catalog\Model\Product;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Review\Model\Review;
+
+/**
+ * Product total review count
+ */
+class ReviewCount implements ResolverInterface
+{
+    /**
+     * @var Review
+     */
+    private $review;
+
+    /**
+     * @param Review $review
+     */
+    public function __construct(Review $review)
+    {
+        $this->review = $review;
+    }
+
+    /**
+     * Resolves the product total reviews
+     *
+     * @param Field $field
+     * @param ContextInterface $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     *
+     * @return int|Value|mixed
+     *
+     * @throws GraphQlInputException
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['model'])) {
+            throw new GraphQlInputException(__('Value must contain "model" property.'));
+        }
+
+        /** @var Product $product */
+        $product = $value['model'];
+
+        return (int) $this->review->getTotalReviews($product->getId(), true);
+    }
+}
diff --git a/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/Reviews.php b/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/Reviews.php
new file mode 100644
index 0000000000000..f414e189d8b1f
--- /dev/null
+++ b/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/Reviews.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReviewGraphQl\Model\Resolver\Product;
+
+use Magento\Catalog\Model\Product;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Framework\GraphQl\Query\Resolver\Value;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\ReviewGraphQl\Model\DataProvider\AggregatedReviewsDataProvider;
+use Magento\ReviewGraphQl\Model\DataProvider\ProductReviewsDataProvider;
+
+/**
+ * Product reviews resolver, used by GraphQL endpoints to retrieve product's reviews
+ */
+class Reviews implements ResolverInterface
+{
+    /**
+     * @var ProductReviewsDataProvider
+     */
+    private $productReviewsDataProvider;
+
+    /**
+     * @var AggregatedReviewsDataProvider
+     */
+    private $aggregatedReviewsDataProvider;
+
+    /**
+     * @param ProductReviewsDataProvider $productReviewsDataProvider
+     * @param AggregatedReviewsDataProvider $aggregatedReviewsDataProvider
+     */
+    public function __construct(
+        ProductReviewsDataProvider $productReviewsDataProvider,
+        AggregatedReviewsDataProvider $aggregatedReviewsDataProvider
+    ) {
+        $this->productReviewsDataProvider = $productReviewsDataProvider;
+        $this->aggregatedReviewsDataProvider = $aggregatedReviewsDataProvider;
+    }
+
+    /**
+     * Resolves the product reviews
+     *
+     * @param Field $field
+     * @param ContextInterface $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     *
+     * @return array|Value|mixed
+     *
+     * @throws GraphQlInputException
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['model'])) {
+            throw new GraphQlInputException(__('Value must contain "model" property.'));
+        }
+
+        if ($args['currentPage'] < 1) {
+            throw new GraphQlInputException(__('currentPage value must be greater than 0.'));
+        }
+
+        if ($args['pageSize'] < 1) {
+            throw new GraphQlInputException(__('pageSize value must be greater than 0.'));
+        }
+
+        /** @var Product $product */
+        $product = $value['model'];
+        $reviewsCollection = $this->productReviewsDataProvider->getData(
+            (int) $product->getId(),
+            $args['currentPage'],
+            $args['pageSize']
+        );
+
+        return $this->aggregatedReviewsDataProvider->getData($reviewsCollection);
+    }
+}
diff --git a/app/code/Magento/ReviewGraphQl/Model/Resolver/ProductReviewRatingValueMetadata.php b/app/code/Magento/ReviewGraphQl/Model/Resolver/ProductReviewRatingValueMetadata.php
new file mode 100644
index 0000000000000..e7e6574e7e7ae
--- /dev/null
+++ b/app/code/Magento/ReviewGraphQl/Model/Resolver/ProductReviewRatingValueMetadata.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReviewGraphQl\Model\Resolver;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Framework\GraphQl\Query\Resolver\Value;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+/**
+ * Product rating value resolver
+ */
+class ProductReviewRatingValueMetadata implements ResolverInterface
+{
+    /**
+     * Resolve product review rating values
+     *
+     * @param Field $field
+     * @param ContextInterface $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     * @return array|Value|mixed
+     *
+     * @throws GraphQlInputException
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['values'])) {
+            throw new GraphQlInputException(__('Value must contain "values" property.'));
+        }
+
+        $ratingOptions = $value['values'];
+        $data = [];
+
+        foreach ($ratingOptions as $item) {
+            $data[] = ['value' => $item->getData('value'), 'value_id' => base64_encode($item->getData('option_id'))];
+        }
+
+        return $data;
+    }
+}
diff --git a/app/code/Magento/ReviewGraphQl/Model/Resolver/ProductReviewRatingsMetadata.php b/app/code/Magento/ReviewGraphQl/Model/Resolver/ProductReviewRatingsMetadata.php
new file mode 100644
index 0000000000000..075666ef9a0ad
--- /dev/null
+++ b/app/code/Magento/ReviewGraphQl/Model/Resolver/ProductReviewRatingsMetadata.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReviewGraphQl\Model\Resolver;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Framework\GraphQl\Query\Resolver\Value;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Review\Model\ResourceModel\Rating\Collection as RatingCollection;
+use Magento\Review\Model\ResourceModel\Rating\CollectionFactory;
+use Magento\Review\Model\Review;
+use Magento\Store\Api\Data\StoreInterface;
+
+/**
+ * Resolve data review rating metadata
+ */
+class ProductReviewRatingsMetadata implements ResolverInterface
+{
+    /**
+     * @var CollectionFactory
+     */
+    private $ratingCollectionFactory;
+
+    /**
+     * @param CollectionFactory $ratingCollectionFactory
+     */
+    public function __construct(CollectionFactory $ratingCollectionFactory)
+    {
+        $this->ratingCollectionFactory = $ratingCollectionFactory;
+    }
+
+    /**
+     * Resolve product review ratings
+     *
+     * @param Field $field
+     * @param ContextInterface $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     *
+     * @return array[]|Value|mixed
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        $items = [];
+        /** @var StoreInterface $store */
+        $store = $context->getExtensionAttributes()->getStore();
+
+        /** @var RatingCollection $ratingCollection */
+        $ratingCollection = $this->ratingCollectionFactory->create();
+        $ratingCollection->addEntityFilter(Review::ENTITY_PRODUCT_CODE)
+            ->setStoreFilter($store->getId())
+            ->setActiveFilter(true)
+            ->setPositionOrder()
+            ->addOptionToItems();
+
+        foreach ($ratingCollection->getItems() as $item) {
+            $items[] = [
+                'id' => base64_encode($item->getData('rating_id')),
+                'name' => $item->getData('rating_code'),
+                'values' => $item->getData('options')
+            ];
+        }
+
+        return ['items' => $items];
+    }
+}
diff --git a/app/code/Magento/ReviewGraphQl/Model/Review/AddReviewToProduct.php b/app/code/Magento/ReviewGraphQl/Model/Review/AddReviewToProduct.php
new file mode 100644
index 0000000000000..1b744e717a782
--- /dev/null
+++ b/app/code/Magento/ReviewGraphQl/Model/Review/AddReviewToProduct.php
@@ -0,0 +1,159 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReviewGraphQl\Model\Review;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Review\Model\Rating;
+use Magento\Review\Model\RatingFactory;
+use Magento\Review\Model\ResourceModel\Rating\Option\Vote\Collection as OptionVoteCollection;
+use Magento\Review\Model\ResourceModel\Rating\Option\Vote\CollectionFactory as OptionVoteCollectionFactory;
+use Magento\Review\Model\Review;
+use Magento\Review\Model\ReviewFactory;
+
+/**
+ * Adding a review to specific product
+ */
+class AddReviewToProduct
+{
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var RatingFactory
+     */
+    private $ratingFactory;
+
+    /**
+     * @var ReviewFactory
+     */
+    private $reviewFactory;
+
+    /**
+     * @var OptionVoteCollectionFactory
+     */
+    private $ratingOptionCollectionFactory;
+
+    /**
+     * @param ProductRepositoryInterface $productRepository
+     * @param ReviewFactory $reviewFactory
+     * @param RatingFactory $ratingFactory
+     * @param OptionVoteCollectionFactory $ratingOptionCollectionFactory
+     */
+    public function __construct(
+        ProductRepositoryInterface $productRepository,
+        ReviewFactory $reviewFactory,
+        RatingFactory $ratingFactory,
+        OptionVoteCollectionFactory $ratingOptionCollectionFactory
+    ) {
+        $this->productRepository = $productRepository;
+        $this->reviewFactory = $reviewFactory;
+        $this->ratingFactory = $ratingFactory;
+        $this->ratingOptionCollectionFactory = $ratingOptionCollectionFactory;
+    }
+
+    /**
+     * Add review to product
+     *
+     * @param array $data
+     * @param array $ratings
+     * @param string $sku
+     * @param int|null $customerId
+     * @param int $storeId
+     *
+     * @return Review
+     *
+     * @throws GraphQlNoSuchEntityException
+     */
+    public function execute(array $data, array $ratings, string $sku, ?int $customerId, int $storeId): Review
+    {
+        $review = $this->reviewFactory->create()->setData($data);
+        $review->unsetData('review_id');
+        $productId = $this->getProductIdBySku($sku);
+        $review->setEntityId($review->getEntityIdByCode(Review::ENTITY_PRODUCT_CODE))
+            ->setEntityPkValue($productId)
+            ->setStatusId(Review::STATUS_PENDING)
+            ->setCustomerId($customerId)
+            ->setStoreId($storeId)
+            ->setStores([$storeId])
+            ->save();
+        $this->addReviewRatingVotes($ratings, (int) $review->getId(), $customerId, $productId);
+        $review->aggregate();
+        $votesCollection = $this->getReviewRatingVotes((int) $review->getId(), $storeId);
+        $review->setData('rating_votes', $votesCollection);
+        $review->setData('sku', $sku);
+
+        return $review;
+    }
+
+    /**
+     * Get Product ID
+     *
+     * @param string $sku
+     *
+     * @return int|null
+     *
+     * @throws GraphQlNoSuchEntityException
+     */
+    private function getProductIdBySku(string $sku): ?int
+    {
+        try {
+            $product = $this->productRepository->get($sku, false, null, true);
+
+            return (int) $product->getId();
+        } catch (NoSuchEntityException $e) {
+            throw new GraphQlNoSuchEntityException(__('Could not find a product with SKU "%sku"', ['sku' => $sku]));
+        }
+    }
+
+    /**
+     * Add review rating votes
+     *
+     * @param array $ratings
+     * @param int $reviewId
+     * @param int|null $customerId
+     * @param int $productId
+     *
+     * @return void
+     *
+     * @phpcs:disable Magento2.Functions.DiscouragedFunction
+     */
+    private function addReviewRatingVotes(array $ratings, int $reviewId, ?int $customerId, int $productId): void
+    {
+        foreach ($ratings as $option) {
+            $ratingId = $option['id'];
+            $optionId = $option['value_id'];
+            /** @var Rating $ratingModel */
+            $ratingModel = $this->ratingFactory->create();
+            $ratingModel->setRatingId(base64_decode($ratingId))
+                ->setReviewId($reviewId)
+                ->setCustomerId($customerId)
+                ->addOptionVote(base64_decode($optionId), $productId);
+        }
+    }
+
+    /**
+     * Get review rating votes
+     *
+     * @param int $reviewId
+     * @param int $storeId
+     *
+     * @return OptionVoteCollection
+     */
+    private function getReviewRatingVotes(int $reviewId, int $storeId): OptionVoteCollection
+    {
+        /** @var OptionVoteCollection $votesCollection */
+        $votesCollection = $this->ratingOptionCollectionFactory->create();
+        $votesCollection->setReviewFilter($reviewId)->setStoreFilter($storeId)->addRatingInfo($storeId);
+
+        return $votesCollection;
+    }
+}
diff --git a/app/code/Magento/ReviewGraphQl/README.md b/app/code/Magento/ReviewGraphQl/README.md
new file mode 100644
index 0000000000000..bf9563b87c9b2
--- /dev/null
+++ b/app/code/Magento/ReviewGraphQl/README.md
@@ -0,0 +1,3 @@
+# ReviewGraphQl
+
+**ReviewGraphQl** provides endpoints for getting and creating the Product reviews by guest and logged in customers.
diff --git a/app/code/Magento/ReviewGraphQl/composer.json b/app/code/Magento/ReviewGraphQl/composer.json
new file mode 100644
index 0000000000000..6e8b6f0472e45
--- /dev/null
+++ b/app/code/Magento/ReviewGraphQl/composer.json
@@ -0,0 +1,29 @@
+{
+    "name": "magento/module-review-graph-ql",
+    "description": "N/A",
+    "type": "magento2-module",
+    "require": {
+        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "magento/module-catalog": "*",
+        "magento/module-review": "*",
+        "magento/framework": "*",
+        "magento/module-store": "*",
+        "magento/module-graph-ql": "*"
+    },
+    "suggest": {
+        "magento/module-graph-ql-cache": "*",
+        "magento/module-store-graph-ql": "*"
+    },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\ReviewGraphQl\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/ReviewGraphQl/etc/module.xml b/app/code/Magento/ReviewGraphQl/etc/module.xml
new file mode 100644
index 0000000000000..c098ee5094760
--- /dev/null
+++ b/app/code/Magento/ReviewGraphQl/etc/module.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:Module/etc/module.xsd">
+    <module name="Magento_ReviewGraphQl" >
+        <sequence>
+            <module name="Magento_GraphQl"/>
+            <module name="Magento_Review"/>
+            <module name="Magento_Store"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/ReviewGraphQl/etc/schema.graphqls b/app/code/Magento/ReviewGraphQl/etc/schema.graphqls
new file mode 100644
index 0000000000000..e9b99a48bb99a
--- /dev/null
+++ b/app/code/Magento/ReviewGraphQl/etc/schema.graphqls
@@ -0,0 +1,78 @@
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+interface ProductInterface {
+    rating_summary: Float! @doc(description: "The average of all the ratings given to the product.") @resolver(class: "Magento\\ReviewGraphQl\\Model\\Resolver\\Product\\RatingSummary")
+    review_count: Int! @doc(description: "The total count of all the reviews given to the product.") @resolver(class: "Magento\\ReviewGraphQl\\Model\\Resolver\\Product\\ReviewCount")
+    reviews(
+        pageSize: Int = 20 @doc(description: "Specifies the maximum number of results to return at once."),
+        currentPage: Int = 1 @doc(description: "Specifies which page of results to return."),
+    ): ProductReviews! @doc(description: "The list of products reviews.") @resolver(class: "Magento\\ReviewGraphQl\\Model\\Resolver\\Product\\Reviews")
+}
+
+type ProductReviews {
+    items: [ProductReview]! @doc(description: "An array of product reviews.")
+    page_info: SearchResultPageInfo! @doc(description: "Metadata for pagination rendering.")
+}
+
+type ProductReview @doc(description: "Details of a product review") {
+    product: ProductInterface! @doc(description: "Contains details about the reviewed product") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product")
+    summary: String! @doc(description: "The review summary (a.k.a title")
+    text: String! @doc(description: "The review text.")
+    nickname: String! @doc(description: "The customer's nickname. Defaults to customer name if logged in.")
+    created_at: String! @doc(description: "Date indicating when the review was created.")
+    average_rating: Float! @doc(description: "The average rating for product review.") @resolver(class: "Magento\\ReviewGraphQl\\Model\\Resolver\\Product\\Review\\AverageRating")
+    ratings_breakdown: [ProductReviewRating!]! @doc(description: "An array of ratings by rating category. For example quality, price.") @resolver(class: "Magento\\ReviewGraphQl\\Model\\Resolver\\Product\\Review\\RatingBreakdown")
+}
+
+type ProductReviewRating {
+    name: String! @doc(description: "The review rating name for example quality, price.")
+    value: String! @doc(description: "The rating value given by customer. Possible values by default: 1 to 5.")
+}
+
+type Query {
+    productReviewRatingsMetadata: ProductReviewRatingsMetadata! @doc(description: "Metadata required by clients to render ratings & reviews section.") @resolver(class: "Magento\\ReviewGraphQl\\Model\\Resolver\\ProductReviewRatingsMetadata")
+}
+
+type ProductReviewRatingsMetadata {
+    items: [ProductReviewRatingMetadata!]! @doc(description: "List of product reviews sorted based on position")
+}
+
+type ProductReviewRatingMetadata {
+    id: String! @doc(description: "Base 64 encoded rating id.")
+    name: String! @doc(description: "The review rating name for example quality, price")
+    values: [ProductReviewRatingValueMetadata!]! @doc(description: "List of product review ratings sorted based on position.") @resolver(class: "Magento\\ReviewGraphQl\\Model\\Resolver\\ProductReviewRatingValueMetadata")
+}
+
+type ProductReviewRatingValueMetadata {
+    value_id: String! @doc(description: "Base 64 encoded rating value id.")
+    value: String! @doc(description: "e.g Good, Perfect, 3, 4, 5")
+}
+
+type Customer {
+    reviews(
+        pageSize: Int = 20 @doc(description: "Specifies the maximum number of results to return at once."),
+        currentPage: Int = 1 @doc(description: "Specifies which page of results to return."),
+    ): ProductReviews! @resolver(class: "Magento\\ReviewGraphQl\\Model\\Resolver\\Customer\\Reviews")
+}
+
+type Mutation {
+    createProductReview(input: CreateProductReviewInput!): CreateProductReviewOutput! @resolver(class: "Magento\\ReviewGraphQl\\Model\\Resolver\\CreateProductReview")
+}
+
+type CreateProductReviewOutput {
+    review: ProductReview!
+}
+
+input CreateProductReviewInput {
+    sku: String! @doc(description: "The SKU of the product that the review is assigned")
+    nickname: String! @doc(description: "The customer's nickname. Defaults to customer name if logged in.")
+    summary: String! @doc(description: "The review summary (a.k.a title")
+    text: String! @doc(description: "The review text.")
+    ratings: [ProductReviewRatingInput!]! @doc(description: "Ratings details by category. e.g price: 5, quality: 4 etc")
+}
+
+input ProductReviewRatingInput {
+    id: String! @doc(description: "Base 64 encoded rating id.")
+    value_id: String! @doc(description: "Base 64 encoded rating value id.")
+}
diff --git a/app/code/Magento/ReviewGraphQl/registration.php b/app/code/Magento/ReviewGraphQl/registration.php
new file mode 100644
index 0000000000000..8fb6535902edf
--- /dev/null
+++ b/app/code/Magento/ReviewGraphQl/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_ReviewGraphQl', __DIR__);
diff --git a/composer.json b/composer.json
index 5223fa2a0aca4..5f1dd1d9b338c 100644
--- a/composer.json
+++ b/composer.json
@@ -222,6 +222,7 @@
         "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": "*",
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Review/CreateProductReviewsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Review/CreateProductReviewsTest.php
new file mode 100644
index 0000000000000..0e4560b6af77a
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Review/CreateProductReviewsTest.php
@@ -0,0 +1,209 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Review;
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\Exception\AuthenticationException;
+use Magento\Framework\Registry;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\Review\Model\ResourceModel\Review\Collection;
+use Magento\Review\Model\ResourceModel\Review\CollectionFactory as ReviewCollectionFactory;
+use Magento\Review\Model\Review;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test coverage for adding product reviews mutation
+ */
+class CreateProductReviewsTest extends GraphQlAbstract
+{
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @var ReviewCollectionFactory
+     */
+    private $reviewCollectionFactory;
+
+    /**
+     * @var Registry
+     */
+    private $registry;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+        $this->customerRepository = $objectManager->get(CustomerRepositoryInterface::class);
+        $this->reviewCollectionFactory = $objectManager->get(ReviewCollectionFactory::class);
+        $this->registry = $objectManager->get(Registry::class);
+    }
+
+    /**
+     * Test adding a product review as guest and logged in customer
+     *
+     * @param string $customerName
+     * @param bool $isGuest
+     *
+     * @magentoApiDataFixture Magento/Review/_files/set_position_and_add_store_to_all_ratings.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     *
+     * @dataProvider customerDataProvider
+     */
+    public function testCustomerAddProductReviews(string $customerName, bool $isGuest)
+    {
+        $productSku = 'simple_product';
+        $query = $this->getQuery($productSku, $customerName);
+        $headers = [];
+
+        if (!$isGuest) {
+            $headers = $this->getHeaderMap();
+        }
+
+        $response = $this->graphQlMutation($query, [], '', $headers);
+
+        $expectedResult = [
+            'nickname' => $customerName,
+            'summary' => 'Summary Test',
+            'text' => 'Text Test',
+            'average_rating' => 3.33,
+            'ratings_breakdown' => [
+                [
+                    'name' => 'Price',
+                    'value' => 3
+                ], [
+                    'name' => 'Quality',
+                    'value' => 2
+                ], [
+                    'name' => 'Value',
+                    'value' => 5
+                ]
+            ]
+        ];
+        self::assertArrayHasKey('createProductReview', $response);
+        self::assertArrayHasKey('review', $response['createProductReview']);
+        self::assertEquals($expectedResult, $response['createProductReview']['review']);
+    }
+
+    /**
+     * @magentoConfigFixture default_store catalog/review/allow_guest 0
+     */
+    public function testAddProductReviewGuestIsNotAllowed()
+    {
+        $productSku = 'simple_product';
+        $customerName = 'John Doe';
+        $query = $this->getQuery($productSku, $customerName);
+        self::expectExceptionMessage('Guest customers aren\'t allowed to add product reviews.');
+        $this->graphQlMutation($query);
+    }
+
+    /**
+     * Removing the recently added product reviews
+     */
+    public function tearDown(): void
+    {
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', true);
+        $productId = 1;
+        /** @var Collection $reviewsCollection */
+        $reviewsCollection = $this->reviewCollectionFactory->create();
+        $reviewsCollection->addEntityFilter(Review::ENTITY_PRODUCT_CODE, $productId);
+        /** @var Review $review */
+        foreach ($reviewsCollection as $review) {
+            $review->delete();
+        }
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', false);
+
+        parent::tearDown();
+    }
+
+    /**
+     * @return array
+     */
+    public function customerDataProvider(): array
+    {
+        return [
+            'Guest Customer' => ['John Doe', true],
+            'Logged In Customer' => ['John', false],
+        ];
+    }
+
+    /**
+     * @param string $username
+     * @param string $password
+     *
+     * @return array
+     *
+     * @throws AuthenticationException
+     */
+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
+
+        return ['Authorization' => 'Bearer ' . $customerToken];
+    }
+
+    /**
+     * Get mutation query
+     *
+     * @param string $sku
+     * @param string $customerName
+     *
+     * @return string
+     */
+    private function getQuery(string $sku, string $customerName): string
+    {
+        return <<<QUERY
+mutation {
+  createProductReview(
+    input: {
+      sku: "$sku",
+      nickname: "$customerName",
+      summary: "Summary Test",
+      text: "Text Test",
+      ratings: [
+        {
+          id: "Mw==",
+          value_id: "MTM="
+        }, {
+          id: "MQ==",
+          value_id: "Mg=="
+        }, {
+          id: "Mg==",
+          value_id: "MTA="
+        }
+      ]
+    }
+) {
+    review {
+      nickname
+      summary
+      text
+      average_rating
+      ratings_breakdown {
+        name
+        value
+      }
+    }
+  }
+}
+QUERY;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Review/GetProductReviewsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Review/GetProductReviewsTest.php
new file mode 100644
index 0000000000000..8d0b462a4d5a5
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Review/GetProductReviewsTest.php
@@ -0,0 +1,284 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Review;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\AuthenticationException;
+use Magento\Framework\Registry;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\Review\Model\ResourceModel\Review\Collection;
+use Magento\Review\Model\ResourceModel\Review\CollectionFactory as ReviewCollectionFactory;
+use Magento\Review\Model\Review;
+use Magento\Review\Model\Review\SummaryFactory;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test coverage for product reviews queries
+ */
+class GetProductReviewsTest extends GraphQlAbstract
+{
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var ReviewCollectionFactory
+     */
+    private $reviewCollectionFactory;
+
+    /**
+     * @var Registry
+     */
+    private $registry;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
+        $this->reviewCollectionFactory = $objectManager->get(ReviewCollectionFactory::class);
+        $this->registry = $objectManager->get(Registry::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Review/_files/set_position_and_add_store_to_all_ratings.php
+     */
+    public function testProductReviewRatingsMetadata()
+    {
+        $query
+            = <<<QUERY
+{
+  productReviewRatingsMetadata {
+    items {
+      id
+      name
+      values {
+        value_id
+        value
+      }
+    }
+  }
+}
+QUERY;
+        $expectedRatingItems = [
+            [
+                'id' => 'Mw==',
+                'name' => 'Price',
+                'values' => [
+                    [
+                        'value_id' => 'MTE=',
+                        'value' => "1"
+                    ],[
+                        'value_id' => 'MTI=',
+                        'value' => "2"
+                    ],[
+                        'value_id' => 'MTM=',
+                        'value' => "3"
+                    ],[
+                        'value_id' => 'MTQ=',
+                        'value' => "4"
+                    ],[
+                        'value_id' => 'MTU=',
+                        'value' => "5"
+                    ]
+                ]
+            ], [
+                'id' => 'MQ==',
+                'name' => 'Quality',
+                'values' => [
+                    [
+                        'value_id' => 'MQ==',
+                        'value' => "1"
+                    ],[
+                        'value_id' => 'Mg==',
+                        'value' => "2"
+                    ],[
+                        'value_id' => 'Mw==',
+                        'value' => "3"
+                    ],[
+                        'value_id' => 'NA==',
+                        'value' => "4"
+                    ],[
+                        'value_id' => 'NQ==',
+                        'value' => "5"
+                    ]
+                ]
+            ], [
+                'id' => 'Mg==',
+                'name' => 'Value',
+                'values' => [
+                    [
+                        'value_id' => 'Ng==',
+                        'value' => "1"
+                    ],[
+                        'value_id' => 'Nw==',
+                        'value' => "2"
+                    ],[
+                        'value_id' => 'OA==',
+                        'value' => "3"
+                    ],[
+                        'value_id' => 'OQ==',
+                        'value' => "4"
+                    ],[
+                        'value_id' => 'MTA=',
+                        'value' => "5"
+                    ]
+                ]
+            ]
+        ];
+        $response = $this->graphQlQuery($query);
+        self::assertArrayHasKey('productReviewRatingsMetadata', $response);
+        self::assertArrayHasKey('items', $response['productReviewRatingsMetadata']);
+        self::assertNotEmpty($response['productReviewRatingsMetadata']['items']);
+        self::assertEquals($expectedRatingItems, $response['productReviewRatingsMetadata']['items']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Review/_files/different_reviews.php
+     */
+    public function testProductReviewRatings()
+    {
+        $productSku = 'simple';
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
+        $product = $productRepository->get($productSku, false, null, true);
+        $summaryFactory = ObjectManager::getInstance()->get(SummaryFactory::class);
+        $storeId = ObjectManager::getInstance()->get(StoreManagerInterface::class)->getStore()->getId();
+        $summary = $summaryFactory->create()->setStoreId($storeId)->load($product->getId());
+        $query
+            = <<<QUERY
+{
+  products(filter: {
+      sku: {
+          eq: "$productSku"
+      }
+  }) {
+    items {
+      rating_summary
+      review_count
+      reviews {
+        items {
+          nickname
+          summary
+          text
+          average_rating
+          product {
+            sku
+            name
+          }
+          ratings_breakdown {
+            name
+            value
+          }
+        }
+      }
+    }
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+        self::assertArrayHasKey('products', $response);
+        self::assertArrayHasKey('items', $response['products']);
+        self::assertNotEmpty($response['products']['items']);
+
+        $items = $response['products']['items'];
+        self::assertEquals($summary->getData('rating_summary'), $items[0]['rating_summary']);
+        self::assertEquals($summary->getData('reviews_count'), $items[0]['review_count']);
+        self::assertArrayHasKey('items', $items[0]['reviews']);
+        self::assertNotEmpty($items[0]['reviews']['items']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Review/_files/customer_review_with_rating.php
+     */
+    public function testCustomerReviewsAddedToProduct()
+    {
+        $query = <<<QUERY
+{
+  customer {
+    reviews {
+      items {
+        nickname
+        summary
+        text
+        average_rating
+        ratings_breakdown {
+          name
+          value
+        }
+      }
+    }
+  }
+}
+QUERY;
+        $expectedFirstItem = [
+            'nickname' => 'Nickname',
+            'summary' => 'Review Summary',
+            'text' => 'Review text',
+            'average_rating' => 2,
+            'ratings_breakdown' => [
+                [
+                    'name' => 'Quality',
+                    'value' => 2
+                ],[
+                    'name' => 'Value',
+                    'value' => 2
+                ]
+            ]
+        ];
+        $response = $this->graphQlQuery($query, [], '', $this->getHeaderMap());
+
+        self::assertArrayHasKey('customer', $response);
+        self::assertArrayHasKey('reviews', $response['customer']);
+        self::assertArrayHasKey('items', $response['customer']['reviews']);
+        self::assertNotEmpty($response['customer']['reviews']['items']);
+        self::assertEquals($expectedFirstItem, $response['customer']['reviews']['items'][0]);
+    }
+
+    /**
+     * Removing the recently added product reviews
+     */
+    public function tearDown(): void
+    {
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', true);
+        $productId = 1;
+        /** @var Collection $reviewsCollection */
+        $reviewsCollection = $this->reviewCollectionFactory->create();
+        $reviewsCollection->addEntityFilter(Review::ENTITY_PRODUCT_CODE, $productId);
+        /** @var Review $review */
+        foreach ($reviewsCollection as $review) {
+            $review->delete();
+        }
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', false);
+
+        parent::tearDown();
+    }
+
+    /**
+     * @param string $username
+     * @param string $password
+     *
+     * @return array
+     *
+     * @throws AuthenticationException
+     */
+    private function getHeaderMap(string $username = 'customer@example.com', string $password = 'password'): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($username, $password);
+
+        return ['Authorization' => 'Bearer ' . $customerToken];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Review/_files/set_position_and_add_store_to_all_ratings.php b/dev/tests/integration/testsuite/Magento/Review/_files/set_position_and_add_store_to_all_ratings.php
new file mode 100644
index 0000000000000..0c097f62101f8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Review/_files/set_position_and_add_store_to_all_ratings.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+use Magento\Backend\App\Area\FrontNameResolver;
+use Magento\Review\Model\ResourceModel\Rating\Collection as RatingCollection;
+use Magento\Review\Model\ResourceModel\Rating as RatingResourceModel;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+Bootstrap::getInstance()->loadArea(FrontNameResolver::AREA_CODE);
+
+$objectManager = Bootstrap::getObjectManager();
+
+$storeId = $objectManager->get(StoreManagerInterface::class)->getStore()->getId();
+
+/** @var RatingResourceModel $ratingResourceModel */
+$ratingResourceModel = $objectManager->create(RatingResourceModel::class);
+
+/** @var RatingCollection $ratingCollection */
+$ratingCollection = $objectManager->create(RatingCollection::class)->setOrder('rating_code', 'ASC');
+$position = 0;
+
+foreach ($ratingCollection as $rating) {
+    $rating->setStores([$storeId])->setPosition($position++);
+    $ratingResourceModel->save($rating);
+}
diff --git a/dev/tests/integration/testsuite/Magento/Review/_files/set_position_and_add_store_to_all_ratings_rollback.php b/dev/tests/integration/testsuite/Magento/Review/_files/set_position_and_add_store_to_all_ratings_rollback.php
new file mode 100644
index 0000000000000..3a96a1be17a8b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Review/_files/set_position_and_add_store_to_all_ratings_rollback.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+use Magento\Backend\App\Area\FrontNameResolver;
+use Magento\Review\Model\ResourceModel\Rating\Collection as RatingCollection;
+use Magento\Review\Model\ResourceModel\Rating as RatingResourceModel;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+Bootstrap::getInstance()->loadArea(FrontNameResolver::AREA_CODE);
+$objectManager = Bootstrap::getObjectManager();
+
+$storeId = Bootstrap::getObjectManager()->get(StoreManagerInterface::class)->getStore()->getId();
+
+/** @var RatingResourceModel $ratingResourceModel */
+$ratingResourceModel = $objectManager->create(RatingResourceModel::class);
+
+/** @var RatingCollection $ratingCollection */
+$ratingCollection = Bootstrap::getObjectManager()->create(RatingCollection::class);
+
+foreach ($ratingCollection as $rating) {
+    $rating->setStores([])->setPosition(0);
+    $ratingResourceModel->save($rating);
+}

From 660bc97d72da4e81a2633065dc8d575801dd3805 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Wed, 6 May 2020 14:55:50 +0300
Subject: [PATCH 0227/1718] MC-29420: Remove event handlers from CE

---
 .../templates/widget/form/element/gallery.phtml      |  2 +-
 .../catalog/product/composite/configure.phtml        |  6 +++---
 .../templates/system/config/bml_api_wizard.phtml     |  4 ++--
 .../templates/order/create/coupons/form.phtml        |  2 +-
 .../templates/order/create/items/grid.phtml          |  2 +-
 .../order/create/shipping/method/form.phtml          |  2 +-
 .../templates/order/create/sidebar/items.phtml       | 12 ++++++------
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml
index 955fb4fd1183c..c2abd6069dd5d 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml
@@ -47,7 +47,7 @@
             </a><br/>
                 <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
                     'onclick',
-                    "imagePreview('<?= $imgId ?>');return false;",
+                    "imagePreview('<?= $imgId ?>');event.preventDefault()",
                     '#a_' . $imgId
                 ) ?>
             <input type="file"
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
index cad35ece5603e..1c27fbb31c620 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
@@ -11,11 +11,11 @@
     <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
         'onload',
         "window.productConfigure && productConfigure.onLoadIFrame()",
-        '#product_composite_configure_form'
+        '#product_composite_configure_iframe'
     ) ?>
     <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
         "width:0; height:0; border:0px solid #fff; position:absolute; top:-1000px; left:-1000px",
-        '#product_composite_configure_confirmed'
+        '#product_composite_configure_iframe'
     ) ?>
 
     <form action="" method="post" id="product_composite_configure_form" enctype="multipart/form-data"
@@ -45,7 +45,7 @@
     </form>
     <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
         'onsubmit',
-        "productConfigure.onConfirmBtn(); return false;",
+        "productConfigure.onConfirmBtn();event.preventDefault()",
         '#product_composite_configure_form'
     ) ?>
 
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/bml_api_wizard.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/bml_api_wizard.phtml
index 5b8d12ac20a67..040be8e3f4fa6 100644
--- a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/bml_api_wizard.phtml
+++ b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/bml_api_wizard.phtml
@@ -17,11 +17,11 @@
 </div>
 <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
     'onclick',
-    "javascript:window.open(
+    "window.open(
             '" . $block->escapeUrl($block->getButtonUrl()) . "',
             'bmlapiwizard',
             'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, ,' +
             'left=100, top=100, width=550, height=550'
-        ); return false;",
+        );event.preventDefault()",
     'button#' . $block->escapeHtml($block->getHtmlId())
 ) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml
index 156ee072c762d..469155a80891a 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml
@@ -25,7 +25,7 @@
         </p>
             <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
                 'onclick',
-                "order.applyCoupon(''); return false;",
+                "order.applyCoupon('');event.preventDefault();",
                 'p.added-coupon-code a.action-remove'
             ) ?>
         <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
index c942d9dd96fe1..330d68a07e44d 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
@@ -115,7 +115,7 @@ $catalogHelper =$block->getData('catalogHelper');
                                 <?php endif; ?>
                                 <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
                                     'onclick',
-                                    "$('item_tier_<?= (int) $_item->getId() ?>').toggle();return false;",
+                                    "$('item_tier_<?= (int) $_item->getId() ?>').toggle();event.preventDefault();",
                                     'div#item_tier_block_' . (int) $_item->getId() . ' a'
                                 ) ?>
                             <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml
index 744276213077c..fd5b7a55b4960 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml
@@ -125,7 +125,7 @@ script;
     </div>
     <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
         'onclick',
-        "order.loadShippingRates();return false",
+        "order.loadShippingRates();event.preventDefault();",
         'div#order-shipping-method-summary a.action-default'
     ) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
index aba788f6d5220..5af76eef829b1 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
@@ -19,8 +19,8 @@
     </div>
     <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
         'onclick',
-        "event.preventDefault(); order.loadArea('sidebar_" . $block->escapeJs($block->getDataId()) .
-        "', 'sidebar_data_" . $block->escapeJs($block->getDataId()) . "');return false;",
+        "order.loadArea('sidebar_" . $block->escapeJs($block->getDataId()) .
+        "', 'sidebar_data_" . $block->escapeJs($block->getDataId()) . "');event.preventDefault();",
         'div.head.sidebar-title-block'
     ) ?>
     <div class="content">
@@ -105,9 +105,9 @@
                                     </a>
                                     <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
                                         'onclick',
-                                        "event.preventDefault(); order.sidebarConfigureProduct('sidebar_wishlist', " .
+                                        "order.sidebarConfigureProduct('sidebar_wishlist', " .
                                         (int) $block->getProductId($_item) . ", " . (int) $block->getItemId($_item) .
-                                        "); return false;",
+                                        ");event.preventDefault();",
                                         'a.icon.icon-configure'
                                     ) ?>
                                 <?php elseif ($block->isConfigurationRequired($_item->getTypeId())): ?>
@@ -118,8 +118,8 @@
                                     </a>
                                     <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
                                         'onclick',
-                                        "event.preventDefault(); order.sidebarConfigureProduct('sidebar', " .
-                                        (int) $block->getProductId($_item) . "); return false;",
+                                        "order.sidebarConfigureProduct('sidebar', " .
+                                        (int) $block->getProductId($_item) . ");event.preventDefault();",
                                         'a.icon.icon-configure'
                                     ) ?>
                                 <?php else: ?>

From 3e06664d3b621448b2ab83f9bcec2fd9906d6daf Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Wed, 6 May 2020 17:37:48 +0300
Subject: [PATCH 0228/1718] MFTF update.

---
 ...ntAssertCustomerOnStoreViewActionGroup.xml | 21 +++++++++++
 ...sertLoginAsCustomerLoggedInActionGroup.xml |  3 +-
 .../AdminLoginAsCustomerAutoDetectionTest.xml |  3 ++
 ...CustomerManualChooseStoreCodeInUrlTest.xml | 36 +++++++++++++++++++
 .../AdminLoginAsCustomerManualChooseTest.xml  | 13 ++-----
 5 files changed, 64 insertions(+), 12 deletions(-)
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertCustomerOnStoreViewActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseStoreCodeInUrlTest.xml

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertCustomerOnStoreViewActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertCustomerOnStoreViewActionGroup.xml
new file mode 100644
index 0000000000000..f63cda2303526
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertCustomerOnStoreViewActionGroup.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="StorefrontAssertCustomerOnStoreViewActionGroup">
+        <annotations>
+            <description>Assert Customer is on the provided Store View.</description>
+        </annotations>
+        <arguments>
+            <argument name="storeViewName" type="string" defaultValue="Default Store View"/>
+        </arguments>
+
+        <see selector="{{StorefrontHeaderSection.storeViewSwitcher}}" userInput="{{storeViewName}}" stepKey="clickStoreViewSwitcher"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerLoggedInActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerLoggedInActionGroup.xml
index 28d29b856a538..bb7e938bdfb59 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerLoggedInActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerLoggedInActionGroup.xml
@@ -17,8 +17,7 @@
             <argument name="customerEmail" type="string"/>
         </arguments>
 
-        <amOnPage url="{{StorefrontCustomerDashboardPage.url}}" stepKey="gotoCustomerAccountPage"/>
-        <waitForPageLoad stepKey="waitForCustomerAccountPageLoad"/>
+        <seeInCurrentUrl url="{{StorefrontCustomerDashboardPage.url}}" stepKey="assertOnCustomerAccountPage"/>
         <see selector="{{StorefrontPanelHeaderSection.welcomeMessage}}" userInput="Welcome, {{customerFullName}}!" stepKey="assertCorrectWelcomeMessage"/>
         <see selector="{{StorefrontCustomerDashboardAccountInformationSection.ContactInformation}}"
              userInput="{{customerEmail}}" stepKey="assertCustomerEmailInContactInformation"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml
index 38115f63c8d81..bbb6e342cca10 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml
@@ -18,6 +18,9 @@
                 value="Verify admin user can directly login into customer account to Default store view when Store View To Login In = Auto detection"/>
             <severity value="BLOCKER"/>
             <group value="login_as_customer"/>
+            <skip>
+                <issueId value="https://github.com/magento/magento2-login-as-customer/pull/135"/>
+            </skip>
         </annotations>
         <before>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseStoreCodeInUrlTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseStoreCodeInUrlTest.xml
new file mode 100644
index 0000000000000..3b78459301398
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseStoreCodeInUrlTest.xml
@@ -0,0 +1,36 @@
+<?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="AdminLoginAsCustomerManualChooseStoreCodeInUrlTest" extends="AdminLoginAsCustomerManualChooseTest">
+        <annotations>
+            <features value="Login As Customer"/>
+            <stories value="Select Store View 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
+                value="Verify admin user can directly login into customer account to Custom store view when Store View To Login In = Manual Choose when store code is added to url"/>
+            <severity value="CRITICAL"/>
+            <group value="login_as_customer"/>
+        </annotations>
+        <before>
+            <magentoCLI
+                command="config:set {{StorefrontEnableAddStoreCodeToUrls.path}} {{StorefrontEnableAddStoreCodeToUrls.value}}"
+                stepKey="enableAddStoreCodeToUrls" after="enableLoginAsCustomerManualChoose"/>
+        </before>
+        <after>
+            <magentoCLI
+                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>
+    </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 a4e605864a976..beda69e8d256c 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
@@ -28,15 +28,11 @@
                         stepKey="enableLoginAsCustomer"/>
             <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 1"
                         stepKey="enableLoginAsCustomerManualChoose"/>
-            <magentoCLI
-                command="config:set {{StorefrontEnableAddStoreCodeToUrls.path}} {{StorefrontEnableAddStoreCodeToUrls.value}}"
-                stepKey="enableAddStoreCodeToUrls"/>
             <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
             <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView"/>
         </before>
         <after>
-            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
             <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteCustomStoreView">
                 <argument name="customStore" value="customStore"/>
             </actionGroup>
@@ -45,10 +41,8 @@
                         stepKey="disableLoginAsCustomer"/>
             <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0"
                         stepKey="enableLoginAsCustomerAutoDetection"/>
-            <magentoCLI
-                command="config:set {{StorefrontDisableAddStoreCodeToUrls.path}} {{StorefrontDisableAddStoreCodeToUrls.value}}"
-                stepKey="disableAddStoreCodeToUrls"/>
             <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
         </after>
 
         <!-- Login As Customer from Customer page -->
@@ -63,9 +57,8 @@
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
             <argument name="customerEmail" value="$$createCustomer.email$$"/>
         </actionGroup>
-        <actionGroup ref="StorefrontClickOnHeaderLogoActionGroup" stepKey="clickOnStorefrontHeaderLogo"/>
-        <actionGroup ref="AssertStorefrontStoreCodeInUrlActionGroup" stepKey="seeCustomStoreCodeInUrl">
-            <argument name="storeCode" value="{{customStore.code}}"/>
+        <actionGroup ref="StorefrontAssertCustomerOnStoreViewActionGroup" stepKey="assertCustomStoreView">
+            <argument name="storeViewName" value="{{customStore.name}}"/>
         </actionGroup>
 
         <!-- Log out Customer and close tab -->

From 9fed2365ddee9c6b0c39113ba151b6d40a832f65 Mon Sep 17 00:00:00 2001
From: oleksandrkravchuk <oleksandr.kravchuk@vaimo.com>
Date: Thu, 7 May 2020 09:18:04 +0300
Subject: [PATCH 0229/1718] PHPStan add support of magic methods of Data
 Object. Get rid of magic numbers.

---
 .../DataObjectClassReflectionExtension.php    | 27 +++++++++++++++----
 .../Php/DataObjectMethodReflection.php        | 16 +++++++++--
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/dev/tests/static/framework/Magento/PhpStan/Reflection/Php/DataObjectClassReflectionExtension.php b/dev/tests/static/framework/Magento/PhpStan/Reflection/Php/DataObjectClassReflectionExtension.php
index 3b1e6aa7b59ac..f5a05a4f5ed2e 100644
--- a/dev/tests/static/framework/Magento/PhpStan/Reflection/Php/DataObjectClassReflectionExtension.php
+++ b/dev/tests/static/framework/Magento/PhpStan/Reflection/Php/DataObjectClassReflectionExtension.php
@@ -20,7 +20,14 @@
  */
 class DataObjectClassReflectionExtension implements MethodsClassReflectionExtension
 {
-    private const MAGIC_METHODS_PREFIXES = ['get', 'set', 'uns', 'has'];
+    private const MAGIC_METHODS_PREFIXES = [
+        'get',
+        'set',
+        'uns',
+        'has'
+    ];
+
+    private const PREFIX_LENGTH = 3;
 
     /**
      * @var Container
@@ -57,22 +64,32 @@ public function hasMethod(ClassReflection $classReflection, string $methodName):
             // In case when annotation already available for the method, we will not use 'magic methods' approach.
             return false;
         }
-
         if ($classReflection->isSubclassOf(DataObject::class) || $classReflection->getName() == DataObject::class) {
-            return in_array(substr($methodName, 0, 3), self::MAGIC_METHODS_PREFIXES);
+            return in_array($this->getPrefix($methodName), self::MAGIC_METHODS_PREFIXES);
         }
-
         /** SessionManager redirects all calls to `__call` to container which extends DataObject */
         if ($classReflection->isSubclassOf(SessionManager::class)
             || $classReflection->getName() === SessionManager::class
         ) {
             /** @see \Magento\Framework\Session\SessionManager::__call */
-            return in_array(substr($methodName, 0, 3), self::MAGIC_METHODS_PREFIXES);
+            return in_array($this->getPrefix($methodName), self::MAGIC_METHODS_PREFIXES);
         }
 
         return false;
     }
 
+    /**
+     * Get prefix from method name.
+     *
+     * @param string $methodName
+     *
+     * @return string
+     */
+    private function getPrefix(string $methodName): string
+    {
+        return (string)substr($methodName, 0, self::PREFIX_LENGTH);
+    }
+
     /**
      * Get method reflection instance.
      *
diff --git a/dev/tests/static/framework/Magento/PhpStan/Reflection/Php/DataObjectMethodReflection.php b/dev/tests/static/framework/Magento/PhpStan/Reflection/Php/DataObjectMethodReflection.php
index febf015014cf5..f4f6c2c1bed44 100644
--- a/dev/tests/static/framework/Magento/PhpStan/Reflection/Php/DataObjectMethodReflection.php
+++ b/dev/tests/static/framework/Magento/PhpStan/Reflection/Php/DataObjectMethodReflection.php
@@ -30,6 +30,8 @@
  */
 class DataObjectMethodReflection implements MethodReflection
 {
+    private const PREFIX_LENGTH = 3;
+
     /**
      * @var ClassReflection
      */
@@ -138,6 +140,16 @@ public function getVariants(): array
         ];
     }
 
+    /**
+     * Get prefix from method name.
+     *
+     * @return string
+     */
+    private function getMethodNamePrefix(): string
+    {
+        return (string)substr($this->methodName, 0, self::PREFIX_LENGTH);
+    }
+
     /**
      * Get Magic Methods parameters.
      *
@@ -146,7 +158,7 @@ public function getVariants(): array
     private function getMethodParameters(): array
     {
         $params = [];
-        switch (substr($this->methodName, 0, 3)) {
+        switch ($this->getMethodNamePrefix()) {
             case 'set':
                 $params[] = new DummyParameter(
                     'value',
@@ -179,7 +191,7 @@ private function getMethodParameters(): array
      */
     private function getReturnType(): Type
     {
-        switch (substr($this->methodName, 0, 3)) {
+        switch ($this->getMethodNamePrefix()) {
             case 'set':
             case 'uns':
                 $returnType = new ObjectType($this->classReflection->getName());

From f6619d52a2dfb86d021740954be9afa1f66b9013 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Thu, 7 May 2020 14:29:05 +0300
Subject: [PATCH 0230/1718] MC-29420: Remove event handlers from CE

---
 .../Config/SubscriptionStatusLabelTest.php    |  8 ++--
 .../Adminhtml/System/Config/VerticalTest.php  |  6 +--
 .../templates/widget/form/element.phtml       | 10 +----
 .../templates/catalog/category/tree.phtml     | 20 +++++-----
 .../adminhtml/templates/browser/tree.phtml    | 20 +++++-----
 .../System/Config/Form/Field/ImageTest.php    |  2 +-
 .../Form/Field/Select/AllowspecificTest.php   |  2 +-
 .../Block/System/Config/Form/FieldTest.php    |  6 +--
 .../Fieldset/Modules/DisableOutputTest.php    | 12 +++---
 .../Block/System/Config/Form/FieldsetTest.php | 14 +++----
 .../Grid/Column/Renderer/ButtonTest.php       |  4 +-
 .../Block/Adminhtml/Form/Field/ImportTest.php |  2 +-
 .../System/Config/Field/CountryTest.php       |  6 +--
 .../Field/Enable/AbstractEnableTest.php       |  2 +-
 .../System/Config/Fieldset/GroupTest.php      |  6 +--
 .../System/Config/Fieldset/PaymentTest.php    |  4 +-
 .../frontend/templates/reorder/sidebar.phtml  |  4 +-
 .../templates/product/layered/renderer.phtml  | 38 ++++---------------
 .../view/adminhtml/templates/rule/edit.phtml  | 28 +++++++-------
 .../adminhtml/templates/rule/rate/form.phtml  |  7 +---
 .../layout/customer_index_wishlist.xml        |  1 -
 .../View/Test/Unit/Helper/JsTest.php          | 16 +++++++-
 22 files changed, 97 insertions(+), 121 deletions(-)

diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/SubscriptionStatusLabelTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/SubscriptionStatusLabelTest.php
index 34a1a0129362e..b1189ac4c01ea 100644
--- a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/SubscriptionStatusLabelTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/SubscriptionStatusLabelTest.php
@@ -20,22 +20,22 @@ class SubscriptionStatusLabelTest extends \PHPUnit\Framework\TestCase
     private $subscriptionStatusLabel;
 
     /**
-     * @var AbstractElement|\PHPUnit_Framework_MockObject_MockObject
+     * @var AbstractElement|\PHPUnit\Framework\MockObject\MockObject
      */
     private $abstractElementMock;
 
     /**
-     * @var SubscriptionStatusProvider|\PHPUnit_Framework_MockObject_MockObject
+     * @var SubscriptionStatusProvider|\PHPUnit\Framework\MockObject\MockObject
      */
     private $subscriptionStatusProviderMock;
 
     /**
-     * @var Context|\PHPUnit_Framework_MockObject_MockObject
+     * @var Context|\PHPUnit\Framework\MockObject\MockObject
      */
     private $contextMock;
 
     /**
-     * @var Form|\PHPUnit_Framework_MockObject_MockObject
+     * @var Form|\PHPUnit\Framework\MockObject\MockObject
      */
     private $formMock;
 
diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/VerticalTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/VerticalTest.php
index f462fbe62d8e7..3ddc852f516c7 100644
--- a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/VerticalTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/VerticalTest.php
@@ -19,17 +19,17 @@ class VerticalTest extends \PHPUnit\Framework\TestCase
     private $vertical;
 
     /**
-     * @var AbstractElement|\PHPUnit_Framework_MockObject_MockObject
+     * @var AbstractElement|\PHPUnit\Framework\MockObject\MockObject
      */
     private $abstractElementMock;
 
     /**
-     * @var Context|\PHPUnit_Framework_MockObject_MockObject
+     * @var Context|\PHPUnit\Framework\MockObject\MockObject
      */
     private $contextMock;
 
     /**
-     * @var Form|\PHPUnit_Framework_MockObject_MockObject
+     * @var Form|\PHPUnit\Framework\MockObject\MockObject
      */
     private $formMock;
 
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml
index 075cd12c90d05..299f53dc9e3ef 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml
@@ -146,13 +146,5 @@ script;
             </span>
 <?php endif; ?>
 <?php if ($element->getScript()): ?>
-    <script>
-        <?= /* @noEscape */ $element->getScript() ?>
-    </script>
-
-    <?php $scriptString = <<<script
-    <?= /* @noEscape */ $element->getScript() ?>
-script;
-    ?>
-    <?php /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
+    <?php /* @noEscape */ $secureRenderer->renderTag('script', [], $element->getScript(), false) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml
index 3312bd377686d..0cd00e88f4350 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml
@@ -17,21 +17,21 @@
     <div class="tree-actions">
         <?php if ($block->getRoot()):?>
             <a id="colapseAll" href="#"><?= $block->escapeHtml(__('Collapse All')) ?></a>
-            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
-                'onclick',
-                'tree.collapseTree(); event.preventDefault();',
-                '#colapseAll'
-            ) ?>
             <span class="separator">|</span>
             <a id="expandAll" href="#"><?= $block->escapeHtml(__('Expand All')) ?></a>
-            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
-                'onclick',
-                'tree.expandTree();event.preventDefault();',
-                '#expandAll'
-            ) ?>
         <?php endif; ?>
     </div>
     <?php if ($block->getRoot()):?>
+        <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+            'onclick',
+            'tree.collapseTree(); event.preventDefault();',
+            '#colapseAll'
+        ) ?>
+        <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+            'onclick',
+            'tree.expandTree();event.preventDefault();',
+            '#expandAll'
+        ) ?>
     <div class="tree-holder">
         <div id="tree-div" class="tree-wrapper"></div>
     </div>
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml
index 738cf72f86592..4c8d1ca7157e9 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml
@@ -16,19 +16,19 @@ $jsonHelper = $block->getData('jsonHelper');
     <div class="categories-side-col">
         <div class="tree-actions">
             <a id="collapseAll"><?= $block->escapeHtml(__('Collapse All')) ?></a>
-            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
-                'onclick',
-                "jQuery('[data-role=tree]').jstree('close_all');",
-                '#div.tree-actions a#collapseAll'
-            ) ?>
             <span class="separator">|</span>
             <a id="expandAll"><?= $block->escapeHtml(__('Expand All')) ?></a>
-            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
-                'onclick',
-                "jQuery('[data-role=tree]').jstree('open_all');",
-                '#div.tree-actions a#expandAll'
-            ) ?>
         </div>
+        <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+            'onclick',
+            "jQuery('[data-role=tree]').jstree('close_all');",
+            '#div.tree-actions a#collapseAll'
+        ) ?>
+        <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+            'onclick',
+            "jQuery('[data-role=tree]').jstree('open_all');",
+            '#div.tree-actions a#expandAll'
+        ) ?>
     </div>
     <div data-role="tree" data-mage-init='<?= $block->escapeHtml(
         $jsonHelper->jsonEncode($block->getTreeWidgetOptions())
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php
index 0d73fd51debbf..6f3b1bfa22cc9 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php
@@ -15,7 +15,7 @@
 class ImageTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Framework\Url|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Url|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $urlBuilderMock;
 
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php
index 0652d92b05ac3..6f7c8e1dc6412 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php
@@ -17,7 +17,7 @@ class AllowspecificTest extends \PHPUnit\Framework\TestCase
     protected $_object;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit\Framework\MockObject\MockObject
      */
     protected $_formMock;
 
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldTest.php
index 7485175639a1a..735f9115cdab1 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldTest.php
@@ -18,7 +18,7 @@ class FieldTest extends \PHPUnit\Framework\TestCase
     protected $_object;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit\Framework\MockObject\MockObject
      */
     protected $_elementMock;
 
@@ -28,12 +28,12 @@ class FieldTest extends \PHPUnit\Framework\TestCase
     protected $_testData;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit\Framework\MockObject\MockObject
      */
     protected $_storeManagerMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit\Framework\MockObject\MockObject
      */
     protected $_layoutMock;
 
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Fieldset/Modules/DisableOutputTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Fieldset/Modules/DisableOutputTest.php
index fa3eb66a39d71..2c32a94468147 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Fieldset/Modules/DisableOutputTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Fieldset/Modules/DisableOutputTest.php
@@ -18,7 +18,7 @@ class DisableOutputTest extends \PHPUnit\Framework\TestCase
     protected $object;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit\Framework\MockObject\MockObject
      */
     protected $elementMock;
 
@@ -36,7 +36,7 @@ class DisableOutputTest extends \PHPUnit\Framework\TestCase
     ];
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit\Framework\MockObject\MockObject
      */
     protected $layoutMock;
 
@@ -46,22 +46,22 @@ class DisableOutputTest extends \PHPUnit\Framework\TestCase
     protected $objectManager;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit\Framework\MockObject\MockObject
      */
     protected $moduleListMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit\Framework\MockObject\MockObject
      */
     protected $authSessionMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit\Framework\MockObject\MockObject
      */
     protected $userMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit\Framework\MockObject\MockObject
      */
     protected $jsHelperMock;
 
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldsetTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldsetTest.php
index 0dc030f343338..d2b621c2886a3 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldsetTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldsetTest.php
@@ -18,17 +18,17 @@ class FieldsetTest extends \PHPUnit\Framework\TestCase
     protected $_object;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit\Framework\MockObject\MockObject
      */
     protected $_elementMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit\Framework\MockObject\MockObject
      */
     protected $_requestMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit\Framework\MockObject\MockObject
      */
     protected $_urlModelMock;
 
@@ -46,7 +46,7 @@ class FieldsetTest extends \PHPUnit\Framework\TestCase
     ];
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit\Framework\MockObject\MockObject
      */
     protected $_layoutMock;
 
@@ -56,17 +56,17 @@ class FieldsetTest extends \PHPUnit\Framework\TestCase
     protected $_testHelper;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit\Framework\MockObject\MockObject
      */
     protected $_helperMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit\Framework\MockObject\MockObject
      */
     protected $authSessionMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit\Framework\MockObject\MockObject
      */
     protected $userMock;
 
diff --git a/app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Widget/Grid/Column/Renderer/ButtonTest.php b/app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Widget/Grid/Column/Renderer/ButtonTest.php
index b3227a4068899..514ce7a7cc0cb 100644
--- a/app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Widget/Grid/Column/Renderer/ButtonTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Widget/Grid/Column/Renderer/ButtonTest.php
@@ -13,12 +13,12 @@
 class ButtonTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Backend\Block\Context|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Backend\Block\Context|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $contextMock;
 
     /**
-     * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Escaper|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $escaperMock;
 
diff --git a/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php b/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php
index 8a8e06f8194aa..65f47d214b7b7 100644
--- a/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php
+++ b/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php
@@ -21,7 +21,7 @@ class ImportTest extends \PHPUnit\Framework\TestCase
     protected $_object;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit\Framework\MockObject\MockObject
      */
     protected $_formMock;
 
diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/CountryTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/CountryTest.php
index b3f9e41b302e6..73422c062eca9 100644
--- a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/CountryTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/CountryTest.php
@@ -21,17 +21,17 @@ class CountryTest extends \PHPUnit\Framework\TestCase
     protected $_element;
 
     /**
-     * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\App\RequestInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $_request;
 
     /**
-     * @var \Magento\Framework\View\Helper\Js|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\View\Helper\Js|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $_jsHelper;
 
     /**
-     * @var \Magento\Backend\Model\Url|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Backend\Model\Url|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $_url;
 
diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/Enable/AbstractEnableTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/Enable/AbstractEnableTest.php
index e4253291cac57..13357fbcccbef 100644
--- a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/Enable/AbstractEnableTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/Enable/AbstractEnableTest.php
@@ -27,7 +27,7 @@ class AbstractEnableTest extends \PHPUnit\Framework\TestCase
     protected $abstractEnable;
 
     /**
-     * @var \Magento\Framework\Data\Form\Element\AbstractElement|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Data\Form\Element\AbstractElement|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $elementMock;
 
diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/GroupTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/GroupTest.php
index 133d792cda097..ad6aa5e25674b 100644
--- a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/GroupTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/GroupTest.php
@@ -21,17 +21,17 @@ class GroupTest extends \PHPUnit\Framework\TestCase
     private $_element;
 
     /**
-     * @var \Magento\Backend\Model\Auth\Session|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Backend\Model\Auth\Session|\PHPUnit\Framework\MockObject\MockObject
      */
     private $_authSession;
 
     /**
-     * @var \Magento\User\Model\User|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\User\Model\User|\PHPUnit\Framework\MockObject\MockObject
      */
     private $_user;
 
     /**
-     * @var \Magento\Config\Model\Config\Structure\Element\Group|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Config\Model\Config\Structure\Element\Group|\PHPUnit\Framework\MockObject\MockObject
      */
     private $_group;
 
diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/PaymentTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/PaymentTest.php
index df9638ef47135..a8d741deec933 100644
--- a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/PaymentTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Fieldset/PaymentTest.php
@@ -25,12 +25,12 @@ class PaymentTest extends \PHPUnit\Framework\TestCase
     protected $_element;
 
     /**
-     * @var \Magento\Config\Model\Config\Structure\Element\Group|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Config\Model\Config\Structure\Element\Group|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $_group;
 
     /**
-     * @var \Magento\Config\Model\Config|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Config\Model\Config|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $_backendConfig;
 
diff --git a/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml b/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml
index 22664e8138925..6bdac443f657d 100644
--- a/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml
@@ -36,8 +36,8 @@
                                    data-bind="attr: {
                                         id: 'reorder-item-' + id,
                                         value: id,
-                                        title: is_saleable ? '<?= $block->escapeHtml(__('Add to Cart')) ?>' : '
-                                        <?= $block->escapeHtml(__('Product is not salable.')) ?>'
+                                        title: is_saleable ? '<?= $block->escapeHtml(__('Add to Cart')) ?>' :
+                                         '<?= $block->escapeHtml(__('Product is not salable.')) ?>'
                                    },
                                    disable: !is_saleable"
                                    class="checkbox" data-validate='{"validate-one-checkbox-required-by-name": true}'/>
diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
index 8ae7668ca145d..55fd7af1ed4e5 100644
--- a/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
+++ b/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
@@ -23,7 +23,7 @@
                     <?php switch ($swatchData['swatches'][$option]['type']) {
                         case '3':
                             ?>
-                            <div class="swatch-option"
+                            <div class="swatch-option <?= $block->escapeHtmlAttr($label['custom_style']) ?>"
                                  tabindex="-1"
                                  data-option-type="3"
                                  data-option-id="<?= $block->escapeHtmlAttr($option) ?>"
@@ -31,13 +31,6 @@
                                  data-option-tooltip-thumb=""
                                  data-option-tooltip-value=""
                                 ></div>
-                            <?php if ($block->escapeHtmlAttr($label['custom_style'])): ?>
-                            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-                                $block->escapeHtmlAttr($label['custom_style']),
-                                "div[data-option-id='" . $block->escapeHtmlAttr($option) . "']"
-                            ) ?>
-                            <?php endif; ?>
-
                             <?php break;
                         case '2':
                             ?>
@@ -51,20 +44,17 @@
                             );
                             $escapedUrl = $block->escapeUrl($swatchImagePath);
                             ?>
-                            <div class="swatch-option image"
+                            <div class="swatch-option image <?= $block->escapeHtmlAttr($label['custom_style']) ?>"
                                  tabindex="-1"
                                  data-option-type="2"
                                  data-option-id="<?= $block->escapeHtmlAttr($option) ?>"
                                  data-option-label="<?= $block->escapeHtmlAttr($label['label']) ?>"
                                  data-option-tooltip-thumb="<?= $block->escapeUrl($swatchThumbPath) ?>"
-                                 data-option-tooltip-value="">
+                                 data-option-tooltip-value=""
+                                 style="background: url(<?=
+                                 /*  @noEscape */ $escapedUrl
+                                                        ?>) no-repeat center; background-size: initial;">
                             </div>
-                            <?php if ($block->escapeHtmlAttr($label['custom_style'])): ?>
-                            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-                                $block->escapeHtmlAttr($label['custom_style']),
-                                "div[data-option-id='" . $block->escapeHtmlAttr($option) . "']"
-                            ) ?>
-                            <?php endif; ?>
                             <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
                                 "background: url(" . /*  @noEscape */ $escapedUrl .
                                 ") no-repeat center; background-size: initial;",
@@ -73,7 +63,7 @@
                             <?php break;
                         case '1':
                             ?>
-                            <div class="swatch-option color"
+                            <div class="swatch-option color <?= $block->escapeHtmlAttr($label['custom_style']) ?>"
                                  tabindex="-1"
                                  data-option-type="1"
                                  data-option-id="<?= $block->escapeHtmlAttr($option) ?>"
@@ -83,12 +73,6 @@
                                      $swatchData['swatches'][$option]['value']
                                  ) ?>">
                             </div>
-                            <?php if ($block->escapeHtmlAttr($label['custom_style'])): ?>
-                            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-                                $block->escapeHtmlAttr($label['custom_style']),
-                                "div[data-option-id='" . $block->escapeHtmlAttr($option) . "']"
-                            ) ?>
-                            <?php endif; ?>
                             <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
                                 "background: " . $block->escapeHtmlAttr(
                                     $swatchData['swatches'][$option]['value']
@@ -99,7 +83,7 @@
                         case '0':
                         default:
                             ?>
-                            <div class="swatch-option text"
+                            <div class="swatch-option text <?= $block->escapeHtmlAttr($label['custom_style']) ?>"
                                  tabindex="-1"
                                  data-option-type="0"
                                  data-option-id="<?= $block->escapeHtmlAttr($option) ?>"
@@ -107,12 +91,6 @@
                                  data-option-tooltip-thumb=""
                                  data-option-tooltip-value=""
                                 ><?= $block->escapeHtml($swatchData['swatches'][$option]['value']) ?></div>
-                            <?php if ($block->escapeHtmlAttr($label['custom_style'])): ?>
-                            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-                                $block->escapeHtmlAttr($label['custom_style']),
-                                "div[data-option-id='" . $block->escapeHtmlAttr($option) . "']"
-                            ) ?>
-                            <?php endif; ?>
                         <?php break;
                     } ?>
                 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
index 0b0c892e47edf..0141101ef5a78 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
@@ -98,14 +98,14 @@ require([
                             });
                         else
                             alert({
-                                content: '{$block->escapeJs($block->escapeHtml(__('An error occurred')))}'
+                                content: '{$block->escapeJs(__('An error occurred'))}'
                             });
                     }
                 },
                 error: function () {
                     $('body').trigger('processStop');
                     alert({
-                        content: '{$block->escapeJs($block->escapeHtml(__('An error occurred')))}'
+                        content: '{$block->escapeJs(__('An error occurred'))}'
                     });
                 },
                 dataType: "json"
@@ -116,9 +116,9 @@ require([
             var options = {
                 mselectContainer: '#tax_rate + section.mselect-list',
                 toggleAddButton:false,
-                addText: '{$block->escapeJs($block->escapeHtml(__('Add New Tax Rate')))}',
+                addText: '{$block->escapeJs(__('Add New Tax Rate'))}',
                 parse: null,
-                nextPageUrl: '{$block->escapeHtml($block->getTaxRatesPageUrl())}',
+                nextPageUrl: '{$block->escapeJs($block->getTaxRatesPageUrl())}',
                 selectedValues: this.settings.selected_values,
                 mselectInputSubmitCallback: function (value, options) {
                     var select = $('#tax_rate');
@@ -166,10 +166,12 @@ require([
                     .on('click.mselect-edit', '.mselect-edit', this.edit)
                     .on("click.mselect-delete", ".mselect-delete", function () {
                         var that = $(this),
+
 script;
                             // phpcs:ignore Magento2.SQL.RawQuery
                             $scriptString .= "select = that.closest('.mselect-list').prev()," . PHP_EOL;
                             $scriptString .= <<<script
+
                             rateValue = that.parent().find('input[type="checkbox"]').val();
 
                         confirm({
@@ -205,18 +207,14 @@ script;
                                                     });
                                                 else
                                                     alert({
-                                                        content: '{$block->escapeJs($block->escapeHtml(
-                                                            __('An error occurred')
-                                                        ))}'
+                                                        content: '{$block->escapeJs(__('An error occurred'))}'
                                                     });
                                             }
                                         },
                                         error: function () {
                                             $('body').trigger('processStop');
                                             alert({
-                                                content: '{$block->escapeJs($block->escapeHtml(
-                                                    __('An error occurred')
-                                                ))}'
+                                                content: '{$block->escapeJs(__('An error occurred'))}'
                                             });
                                         }
                                     };
@@ -239,7 +237,7 @@ script;
             taxRateFormElement.mage('form').mage('validation');
 
             taxRateForm.dialogRates({
-                title: '{$block->escapeJs($block->escapeHtml(__('Tax Rate')))}',
+                title: '{$block->escapeJs(__('Tax Rate'))}',
                 type: 'slide',
                 id: '{$jsId}',
                 modalClass: 'tax-rate-popup',
@@ -247,7 +245,7 @@ script;
                     taxRateFormElement.data('validation').clearError();
                 },
                 buttons: [{
-                    text: '{$block->escapeJs($block->escapeHtml(__('Save')))}',
+                    text: '{$block->escapeJs(__('Save'))}',
                     'class': 'action-save action-primary',
                     click: function() {
                         this.updateItemRate();
@@ -255,10 +253,12 @@ script;
                             itemRateData = $.extend({}, itemRate);
 
                         if (itemRateData.itemElement) {
+
 script;
                             //phpcs:ignore Magento2.SQL.RawQuerys
                             $scriptString .= ' delete itemRateData.itemElement;';
 $scriptString.= <<<script
+
                         }
 
                         if (!taxRateFormElement.validation().valid()) {
@@ -295,14 +295,14 @@ $scriptString.= <<<script
                                         });
                                     else
                                         alert({
-                                            content: '{$block->escapeJs($block->escapeHtml(__('An error occurred')))}'
+                                            content: '{$block->escapeJs(__('An error occurred'))}'
                                         });
                                 }
                             },
                             error: function () {
                                 $('body').trigger('processStop');
                                 alert({
-                                    content: '{$block->escapeJs($block->escapeHtml(__('An error occurred')))}'
+                                    content: '{$block->escapeJs(__('An error occurred'))}'
                                 });
                             }
                         };
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
index 23797977fe6a2..e6b7282cf4d27 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
@@ -4,18 +4,13 @@
  * See COPYING.txt for license details.
  */
 /* @var $block \Magento\Tax\Block\Adminhtml\Rate\Form */
-/* @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
 
 <div data-role="spinner" class="grid-loading-mask">
     <div class="grid-loader"></div>
 </div>
 
-<div class="form-inline" id="<?= $block->escapeHtmlAttr($block->getNameInLayout()) ?>"
+<div class="form-inline no-display" id="<?= $block->escapeHtmlAttr($block->getNameInLayout()) ?>">
     <?= $block->getFormHtml() ?>
     <?= $block->getChildHtml('form_after') ?>
 </div>
-<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-    "display:none",
-    '#'. $block->escapeJs($block->getNameInLayout())
-) ?>
diff --git a/app/code/Magento/Wishlist/view/adminhtml/layout/customer_index_wishlist.xml b/app/code/Magento/Wishlist/view/adminhtml/layout/customer_index_wishlist.xml
index 0ee4233029105..cc5ef6b3ab554 100644
--- a/app/code/Magento/Wishlist/view/adminhtml/layout/customer_index_wishlist.xml
+++ b/app/code/Magento/Wishlist/view/adminhtml/layout/customer_index_wishlist.xml
@@ -112,6 +112,5 @@
                 </arguments>
             </block>
         </block>
-        <block class="Magento\Catalog\Block\Adminhtml\Product\Composite\Configure" template="Magento_Catalog::catalog/product/composite/configure.phtml" name="configure.popup"/>
     </container>
 </layout>
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Helper/JsTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Helper/JsTest.php
index 4e7df3fd1b4fa..b0790285ae75c 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Helper/JsTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Helper/JsTest.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Framework\View\Test\Unit\Helper;
 
+use Magento\Framework\DataObject;
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
+
 class JsTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -12,9 +15,18 @@ class JsTest extends \PHPUnit\Framework\TestCase
      */
     public function testGetScript()
     {
-        $helper = new \Magento\Framework\View\Helper\Js();
+        $secureRendererMock = $this->createMock(SecureHtmlRenderer::class);
+        $secureRendererMock->method('renderTag')
+            ->willReturnCallback(
+                function (string $tag, array $attributes, string $content): string {
+                    $attributes = new DataObject($attributes);
+
+                    return "<$tag {$attributes->serialize()}>$content</$tag>";
+                }
+            );
+        $helper = new \Magento\Framework\View\Helper\Js($secureRendererMock);
         $this->assertEquals(
-            "<script type=\"text/javascript\">//<![CDATA[\ntest\n//]]></script>",
+            "<script >//<![CDATA[\ntest\n//]]></script>",
             $helper->getScript('test')
         );
     }

From 5d11fdc55dd2d6563a97896042ebbaa459b9ffef Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Thu, 7 May 2020 14:57:13 +0300
Subject: [PATCH 0231/1718] Cover Unit test

---
 .../GetCustomerByTokenTest.php                | 145 ++++++++++++++++++
 1 file changed, 145 insertions(+)
 create mode 100644 app/code/Magento/Customer/Test/Unit/Model/ForgotPasswordToken/GetCustomerByTokenTest.php

diff --git a/app/code/Magento/Customer/Test/Unit/Model/ForgotPasswordToken/GetCustomerByTokenTest.php b/app/code/Magento/Customer/Test/Unit/Model/ForgotPasswordToken/GetCustomerByTokenTest.php
new file mode 100644
index 0000000000000..219058eebf8f8
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/Model/ForgotPasswordToken/GetCustomerByTokenTest.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Test\Unit\Model\ForgotPasswordToken;
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Api\Data\CustomerSearchResultsInterface;
+use Magento\Customer\Model\ForgotPasswordToken\GetCustomerByToken;
+use Magento\Framework\Api\SearchCriteria;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\State\ExpiredException;
+use Magento\Framework\Phrase;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test GetCustomerByToken class
+ */
+class GetCustomerByTokenTest extends TestCase
+{
+    protected const RESET_PASSWORD = 'resetPassword';
+
+    /**
+     * @var SearchCriteriaBuilder|MockObject
+     */
+    protected $searchCriteriaBuilderMock;
+
+    /**
+     * @var SearchCriteria|MockObject
+     */
+    protected $searchCriteriaMock;
+
+    /**
+     * @var CustomerRepositoryInterface|MockObject
+     */
+    protected $customerRepositoryMock;
+
+    /**
+     * @var CustomerSearchResultsInterface|MockObject
+     */
+    protected $searchResultMock;
+
+    /**
+     * @var CustomerInterface|MockObject
+     */
+    protected $customerMock;
+
+    /**
+     * @var GetCustomerByToken;
+     */
+    protected $model;
+
+    /**
+     * @inheritDoc
+     */
+    public function setUp()
+    {
+        $this->searchCriteriaBuilderMock = $this->createMock(SearchCriteriaBuilder::class);
+        $this->searchCriteriaMock = $this->createMock(SearchCriteria::class);
+        $this->searchResultMock = $this->createMock(CustomerSearchResultsInterface::class);
+        $this->customerRepositoryMock = $this->createMock(CustomerRepositoryInterface::class);
+        $this->customerMock = $this->getMockForAbstractClass(CustomerInterface::class);
+
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $objectManagerHelper->getObject(
+            GetCustomerByToken::class,
+            [
+                'searchCriteriaBuilder' => $this->searchCriteriaBuilderMock,
+                'customerRepository' => $this->customerRepositoryMock
+            ]
+        );
+
+        $this->searchCriteriaBuilderMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->searchCriteriaMock);
+        $this->customerRepositoryMock->expects($this->once())
+            ->method('getList')
+            ->with($this->searchCriteriaMock)
+            ->willReturn($this->searchResultMock);
+    }
+
+    /**
+     * @return void
+     */
+    public function testExecute(): void
+    {
+        $totalCount = 1;
+        $this->searchResultMock->expects($this->any())
+            ->method('getTotalCount')
+            ->willReturn($totalCount);
+        $this->searchResultMock->expects($this->once())
+            ->method('getItems')
+            ->willReturn([$this->customerMock]);
+
+        $this->assertInstanceOf(
+            CustomerInterface::class,
+            $this->model->execute(self::RESET_PASSWORD)
+        );
+    }
+
+    /**
+     * @return void
+     */
+    public function testExecuteWithNoSuchEntityException(): void
+    {
+        $totalCount = 0;
+        $this->searchResultMock->expects($this->any())
+            ->method('getTotalCount')
+            ->willReturn($totalCount);
+        $this->expectExceptionObject(new NoSuchEntityException(
+            new Phrase(
+                'No such entity with rp_token = %value',
+                ['value' => self::RESET_PASSWORD]
+            )
+        ));
+
+        $this->model->execute(self::RESET_PASSWORD);
+    }
+
+    /**
+     * @return void
+     */
+    public function testExecuteWithExpireException(): void
+    {
+        $totalCount = 2;
+        $this->searchResultMock->expects($this->any())
+            ->method('getTotalCount')
+            ->willReturn($totalCount);
+
+        $this->expectExceptionObject(new ExpiredException(
+            new Phrase(
+                'Reset password token expired.'
+            )
+        ));
+
+        $this->model->execute(self::RESET_PASSWORD);
+    }
+}

From d30e5e211962dd7b0d25bb6c289736ea128ecf0d Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Thu, 7 May 2020 16:14:40 +0300
Subject: [PATCH 0232/1718] refactor unit test

---
 .../GetCustomerByTokenTest.php                | 45 +++++--------------
 1 file changed, 12 insertions(+), 33 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Unit/Model/ForgotPasswordToken/GetCustomerByTokenTest.php b/app/code/Magento/Customer/Test/Unit/Model/ForgotPasswordToken/GetCustomerByTokenTest.php
index 219058eebf8f8..0de1912ee4f7e 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/ForgotPasswordToken/GetCustomerByTokenTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/ForgotPasswordToken/GetCustomerByTokenTest.php
@@ -20,47 +20,41 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
-/**
- * Test GetCustomerByToken class
- */
 class GetCustomerByTokenTest extends TestCase
 {
-    protected const RESET_PASSWORD = 'resetPassword';
+    private const RESET_PASSWORD = 'resetPassword';
 
     /**
      * @var SearchCriteriaBuilder|MockObject
      */
-    protected $searchCriteriaBuilderMock;
+    private $searchCriteriaBuilderMock;
 
     /**
      * @var SearchCriteria|MockObject
      */
-    protected $searchCriteriaMock;
+    private $searchCriteriaMock;
 
     /**
      * @var CustomerRepositoryInterface|MockObject
      */
-    protected $customerRepositoryMock;
+    private $customerRepositoryMock;
 
     /**
      * @var CustomerSearchResultsInterface|MockObject
      */
-    protected $searchResultMock;
+    private $searchResultMock;
 
     /**
      * @var CustomerInterface|MockObject
      */
-    protected $customerMock;
+    private $customerMock;
 
     /**
      * @var GetCustomerByToken;
      */
-    protected $model;
+    private $model;
 
-    /**
-     * @inheritDoc
-     */
-    public function setUp()
+    protected function setUp()
     {
         $this->searchCriteriaBuilderMock = $this->createMock(SearchCriteriaBuilder::class);
         $this->searchCriteriaMock = $this->createMock(SearchCriteria::class);
@@ -86,15 +80,10 @@ public function setUp()
             ->willReturn($this->searchResultMock);
     }
 
-    /**
-     * @return void
-     */
-    public function testExecute(): void
+    public function testExecuteReturnWhenOneItemAvailable(): void
     {
         $totalCount = 1;
-        $this->searchResultMock->expects($this->any())
-            ->method('getTotalCount')
-            ->willReturn($totalCount);
+        $this->searchResultMock->method('getTotalCount')->willReturn($totalCount);
         $this->searchResultMock->expects($this->once())
             ->method('getItems')
             ->willReturn([$this->customerMock]);
@@ -105,15 +94,10 @@ public function testExecute(): void
         );
     }
 
-    /**
-     * @return void
-     */
     public function testExecuteWithNoSuchEntityException(): void
     {
         $totalCount = 0;
-        $this->searchResultMock->expects($this->any())
-            ->method('getTotalCount')
-            ->willReturn($totalCount);
+        $this->searchResultMock->method('getTotalCount')->willReturn($totalCount);
         $this->expectExceptionObject(new NoSuchEntityException(
             new Phrase(
                 'No such entity with rp_token = %value',
@@ -124,15 +108,10 @@ public function testExecuteWithNoSuchEntityException(): void
         $this->model->execute(self::RESET_PASSWORD);
     }
 
-    /**
-     * @return void
-     */
     public function testExecuteWithExpireException(): void
     {
         $totalCount = 2;
-        $this->searchResultMock->expects($this->any())
-            ->method('getTotalCount')
-            ->willReturn($totalCount);
+        $this->searchResultMock->method('getTotalCount')->willReturn($totalCount);
 
         $this->expectExceptionObject(new ExpiredException(
             new Phrase(

From cef2ac324f19db10e79a17e02c60b15f3f3a26ef Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <svizev.igor@gmail.com>
Date: Thu, 7 May 2020 17:52:37 +0300
Subject: [PATCH 0233/1718] magento/magento2#24353 Fix Varnish 6 Too many
 restarts issue

---
 app/code/Magento/PageCache/etc/varnish6.vcl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/code/Magento/PageCache/etc/varnish6.vcl b/app/code/Magento/PageCache/etc/varnish6.vcl
index eef5e99862538..b23bec4c45fb8 100644
--- a/app/code/Magento/PageCache/etc/varnish6.vcl
+++ b/app/code/Magento/PageCache/etc/varnish6.vcl
@@ -23,6 +23,10 @@ acl purge {
 }
 
 sub vcl_recv {
+    if (req.restarts > 0) {
+        set req.hash_always_miss = true;
+    }
+
     if (req.method == "PURGE") {
         if (client.ip !~ purge) {
             return (synth(405, "Method not allowed"));

From b9e28fd3dc2b32a03984f4f62fc5cf612842932f Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Mon, 13 Apr 2020 17:11:29 +0200
Subject: [PATCH 0234/1718] Single mutation for adding items to the shopping
 cart

---
 .../Quote/Model/Cart/AddProductsToCart.php    | 214 ++++
 .../Model/Cart/AddProductsToCartInterface.php |  28 +
 .../Cart/BuyRequest/BuyRequestBuilder.php     |  61 ++
 .../BuyRequestDataProviderInterface.php       |  24 +
 .../CustomizableOptionDataProvider.php        | 103 ++
 .../Cart/Data/AddProductsToCartOutput.php     |  56 +
 .../Quote/Model/Cart/Data/CartItem.php        | 110 ++
 .../Quote/Model/Cart/Data/CartItemFactory.php |  74 ++
 .../Quote/Model/Cart/Data/EnteredOption.php   |  51 +
 .../Magento/Quote/Model/Cart/Data/Error.php   |  71 ++
 .../Quote/Model/Cart/Data/SelectedOption.php  |  34 +
 app/code/Magento/Quote/etc/graphql/di.xml     |  16 +
 .../Cart/BuyRequest/BundleDataProvider.php    |  76 ++
 app/code/Magento/QuoteBundleOptions/README.md |   3 +
 .../Magento/QuoteBundleOptions/composer.json  |  22 +
 .../QuoteBundleOptions/etc/graphql/di.xml     |  16 +
 .../Magento/QuoteBundleOptions/etc/module.xml |  10 +
 .../QuoteBundleOptions/registration.php       |  10 +
 .../BuyRequest/SuperAttributeDataProvider.php |  74 ++
 .../QuoteConfigurableOptions/README.md        |   3 +
 .../QuoteConfigurableOptions/composer.json    |  22 +
 .../etc/graphql/di.xml                        |  16 +
 .../QuoteConfigurableOptions/etc/module.xml   |  10 +
 .../QuoteConfigurableOptions/registration.php |  10 +
 .../DownloadableLinkDataProvider.php          |  75 ++
 .../Magento/QuoteDownloadableLinks/README.md  |   3 +
 .../QuoteDownloadableLinks/composer.json      |  22 +
 .../QuoteDownloadableLinks/etc/graphql/di.xml |  16 +
 .../QuoteDownloadableLinks/etc/module.xml     |  10 +
 .../QuoteDownloadableLinks/registration.php   |  10 +
 .../Model/Resolver/AddProductsToCart.php      |  93 ++
 .../Magento/QuoteGraphQl/etc/schema.graphqls  |  28 +
 .../Magento/SalesGraphQl/etc/schema.graphqls  |  10 -
 composer.json                                 |   3 +
 composer.lock                                 | 958 ++++++++++++------
 ...dBundleProductToCartSingleMutationTest.php | 225 ++++
 ...gurableProductToCartSingleMutationTest.php | 292 ++++++
 ...oadableProductToCartSingleMutationTest.php | 211 ++++
 .../GetCustomOptionsWithIDV2ForQueryBySku.php |  94 ++
 vendor/.htaccess                              |   7 -
 40 files changed, 2830 insertions(+), 341 deletions(-)
 create mode 100644 app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
 create mode 100644 app/code/Magento/Quote/Model/Cart/AddProductsToCartInterface.php
 create mode 100644 app/code/Magento/Quote/Model/Cart/BuyRequest/BuyRequestBuilder.php
 create mode 100644 app/code/Magento/Quote/Model/Cart/BuyRequest/BuyRequestDataProviderInterface.php
 create mode 100644 app/code/Magento/Quote/Model/Cart/BuyRequest/CustomizableOptionDataProvider.php
 create mode 100644 app/code/Magento/Quote/Model/Cart/Data/AddProductsToCartOutput.php
 create mode 100644 app/code/Magento/Quote/Model/Cart/Data/CartItem.php
 create mode 100644 app/code/Magento/Quote/Model/Cart/Data/CartItemFactory.php
 create mode 100644 app/code/Magento/Quote/Model/Cart/Data/EnteredOption.php
 create mode 100644 app/code/Magento/Quote/Model/Cart/Data/Error.php
 create mode 100644 app/code/Magento/Quote/Model/Cart/Data/SelectedOption.php
 create mode 100644 app/code/Magento/Quote/etc/graphql/di.xml
 create mode 100644 app/code/Magento/QuoteBundleOptions/Model/Cart/BuyRequest/BundleDataProvider.php
 create mode 100644 app/code/Magento/QuoteBundleOptions/README.md
 create mode 100644 app/code/Magento/QuoteBundleOptions/composer.json
 create mode 100644 app/code/Magento/QuoteBundleOptions/etc/graphql/di.xml
 create mode 100644 app/code/Magento/QuoteBundleOptions/etc/module.xml
 create mode 100644 app/code/Magento/QuoteBundleOptions/registration.php
 create mode 100644 app/code/Magento/QuoteConfigurableOptions/Model/Cart/BuyRequest/SuperAttributeDataProvider.php
 create mode 100644 app/code/Magento/QuoteConfigurableOptions/README.md
 create mode 100644 app/code/Magento/QuoteConfigurableOptions/composer.json
 create mode 100644 app/code/Magento/QuoteConfigurableOptions/etc/graphql/di.xml
 create mode 100644 app/code/Magento/QuoteConfigurableOptions/etc/module.xml
 create mode 100644 app/code/Magento/QuoteConfigurableOptions/registration.php
 create mode 100644 app/code/Magento/QuoteDownloadableLinks/Model/Cart/BuyRequest/DownloadableLinkDataProvider.php
 create mode 100644 app/code/Magento/QuoteDownloadableLinks/README.md
 create mode 100644 app/code/Magento/QuoteDownloadableLinks/composer.json
 create mode 100644 app/code/Magento/QuoteDownloadableLinks/etc/graphql/di.xml
 create mode 100644 app/code/Magento/QuoteDownloadableLinks/etc/module.xml
 create mode 100644 app/code/Magento/QuoteDownloadableLinks/registration.php
 create mode 100644 app/code/Magento/QuoteGraphQl/Model/Resolver/AddProductsToCart.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartSingleMutationTest.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartSingleMutationTest.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddDownloadableProductToCartSingleMutationTest.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCustomOptionsWithIDV2ForQueryBySku.php
 delete mode 100644 vendor/.htaccess

diff --git a/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php b/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
new file mode 100644
index 0000000000000..5d7eb053dc892
--- /dev/null
+++ b/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
@@ -0,0 +1,214 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model\Cart;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\Quote\Model\Cart\BuyRequest\BuyRequestBuilder;
+use Magento\Quote\Model\Cart\Data\AddProductsToCartOutput;
+use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Framework\Message\MessageInterface;
+
+/**
+ * @inheritdoc
+ */
+class AddProductsToCart implements AddProductsToCartInterface
+{
+    /**#@+
+     * Error message codes
+     */
+    private const ERROR_PRODUCT_NOT_FOUND = 'PRODUCT_NOT_FOUND';
+    private const ERROR_INSUFFICIENT_STOCK = 'INSUFFICIENT_STOCK';
+    private const ERROR_NOT_SALABLE = 'NOT_SALABLE';
+    private const ERROR_UNDEFINED = 'UNDEFINED';
+    /**#@-*/
+
+    /**
+     * List of error messages and codes.
+     */
+    private const MESSAGE_CODES = [
+        'The required options you selected are not available' => self::ERROR_NOT_SALABLE,
+        'Product that you are trying to add is not available' => self::ERROR_NOT_SALABLE,
+        'This product is out of stock' => self::ERROR_NOT_SALABLE,
+        'There are no source items' => self::ERROR_NOT_SALABLE,
+        'The fewest you may purchase is' => self::ERROR_INSUFFICIENT_STOCK,
+        'The most you may purchase is' => self::ERROR_INSUFFICIENT_STOCK,
+        'The requested qty is not available' => self::ERROR_INSUFFICIENT_STOCK,
+    ];
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var array
+     */
+    private $errors = [];
+
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $cartRepository;
+
+    /**
+     * @var MaskedQuoteIdToQuoteIdInterface
+     */
+    private $maskedQuoteIdToQuoteId;
+
+    /**
+     * @var BuyRequestBuilder
+     */
+    private $requestBuilder;
+
+    /**
+     * @param ProductRepositoryInterface $productRepository
+     * @param CartRepositoryInterface $cartRepository
+     * @param MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId
+     * @param BuyRequestBuilder $requestBuilder
+     */
+    public function __construct(
+        ProductRepositoryInterface $productRepository,
+        CartRepositoryInterface $cartRepository,
+        MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId,
+        BuyRequestBuilder $requestBuilder
+    ) {
+        $this->productRepository = $productRepository;
+        $this->cartRepository = $cartRepository;
+        $this->maskedQuoteIdToQuoteId = $maskedQuoteIdToQuoteId;
+        $this->requestBuilder = $requestBuilder;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(string $maskedCartId, array $cartItems): AddProductsToCartOutput
+    {
+        $cartId = $this->maskedQuoteIdToQuoteId->execute($maskedCartId);
+        $cart = $this->cartRepository->get($cartId);
+
+        foreach ($cartItems as $n => $cartItem) {
+            $this->addItemToCart($cart, $cartItem, $n);
+        }
+        if ($cart->getData('has_error')) {
+            $errors = $cart->getErrors();
+
+            /** @var MessageInterface $error */
+            foreach ($errors as $error) {
+                $this->addError($error->getText());
+            }
+        }
+        $this->cartRepository->save($cart);
+
+        return $this->prepareErrorOutput($cart);
+    }
+
+    /**
+     * Adds a particular item to the shopping cart
+     *
+     * @param CartInterface|Quote $cart
+     * @param Data\CartItem $cartItem
+     * @param int $cartItemPosition
+     */
+    private function addItemToCart(CartInterface $cart, Data\CartItem $cartItem, int $cartItemPosition): void
+    {
+        $sku = $cartItem->getSku();
+
+        try {
+            $product = $this->productRepository->get($sku, false, null, true);
+        } catch (NoSuchEntityException $e) {
+            $this->addError(
+                __('Could not find a product with SKU "%sku"', ['sku' => $sku])->render(),
+                $cartItemPosition,
+                self::ERROR_PRODUCT_NOT_FOUND
+            );
+
+            return;
+        }
+
+        try {
+            $result = $cart->addProduct($product, $this->requestBuilder->build($cartItem));
+        } catch (\Throwable $e) {
+            $this->addError(
+                __(
+                    'Could not add the product with SKU %sku to the shopping cart: %message',
+                    ['sku' => $sku, 'message' => $e->getMessage()]
+                )->render(),
+                $cartItemPosition
+            );
+            return;
+        }
+
+        if (is_string($result)) {
+            $errors = array_unique(explode("\n", $result));
+            foreach ($errors as $error) {
+                $this->addError(__($error)->render(), $cartItemPosition);
+            }
+        }
+    }
+
+    /**
+     * Add order line item error
+     *
+     * @param string $message
+     * @param int $cartItemPosition
+     * @param string|null $code
+     * @return void
+     */
+    private function addError(string $message, int $cartItemPosition = 0, string $code = ''): void
+    {
+        $this->errors[] = new Data\Error(
+            $message,
+            $code ?? $this->getErrorCode($message),
+            $cartItemPosition
+        );
+    }
+
+    /**
+     * Get message error code.
+     *
+     * @param string $message
+     * @return string
+     */
+    private function getErrorCode(string $message): string
+    {
+        $code = self::ERROR_UNDEFINED;
+
+        $matchedCodes = array_filter(
+            self::MESSAGE_CODES,
+            function ($key) use ($message) {
+                return false !== strpos($message, $key);
+            },
+            ARRAY_FILTER_USE_KEY
+        );
+
+        if (!empty($matchedCodes)) {
+            $code = current($matchedCodes);
+        }
+
+        return $code;
+    }
+
+    /**
+     * Creates a new output from existing errors
+     *
+     * @param CartInterface $cart
+     * @return AddProductsToCartOutput
+     */
+    private function prepareErrorOutput(CartInterface $cart): AddProductsToCartOutput
+    {
+        $output = new AddProductsToCartOutput($cart, $this->errors);
+        $this->errors = [];
+        $cart->setHasError(false);
+
+        return $output;
+    }
+}
diff --git a/app/code/Magento/Quote/Model/Cart/AddProductsToCartInterface.php b/app/code/Magento/Quote/Model/Cart/AddProductsToCartInterface.php
new file mode 100644
index 0000000000000..98e69af2a0179
--- /dev/null
+++ b/app/code/Magento/Quote/Model/Cart/AddProductsToCartInterface.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model\Cart;
+
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Quote\Model\Cart\Data\AddProductsToCartOutput;
+
+/**
+ * Unified approach to add products to the Shopping Cart.
+ * Client code must validate, that customer is eligible to call service with provided {cartId} and {cartItems}
+ */
+interface AddProductsToCartInterface
+{
+    /**
+     * Add cart items to the cart
+     *
+     * @param string $cartId
+     * @param Data\CartItem[] $cartItems
+     * @return AddProductsToCartOutput
+     * @throws NoSuchEntityException Could not find a Cart with provided $maskedCartId
+     */
+    public function execute(string $cartId, array $cartItems): AddProductsToCartOutput;
+}
diff --git a/app/code/Magento/Quote/Model/Cart/BuyRequest/BuyRequestBuilder.php b/app/code/Magento/Quote/Model/Cart/BuyRequest/BuyRequestBuilder.php
new file mode 100644
index 0000000000000..13b19e4f79c9a
--- /dev/null
+++ b/app/code/Magento/Quote/Model/Cart/BuyRequest/BuyRequestBuilder.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model\Cart\BuyRequest;
+
+use Magento\Framework\DataObject;
+use Magento\Framework\DataObjectFactory;
+use Magento\Quote\Model\Cart\Data\CartItem;
+
+/**
+ * Build buy request for adding products to cart
+ */
+class BuyRequestBuilder
+{
+    /**
+     * @var BuyRequestDataProviderInterface[]
+     */
+    private $providers;
+
+    /**
+     * @var DataObjectFactory
+     */
+    private $dataObjectFactory;
+
+    /**
+     * @param DataObjectFactory $dataObjectFactory
+     * @param array $providers
+     */
+    public function __construct(
+        DataObjectFactory $dataObjectFactory,
+        array $providers = []
+    ) {
+        $this->dataObjectFactory = $dataObjectFactory;
+        $this->providers = $providers;
+    }
+
+    /**
+     * Build buy request for adding product to cart
+     *
+     * @see \Magento\Quote\Model\Quote::addProduct
+     * @param CartItem $cartItem
+     * @return DataObject
+     */
+    public function build(CartItem $cartItem): DataObject
+    {
+        $requestData = [
+            ['qty' => $cartItem->getQuantity()]
+        ];
+
+        /** @var BuyRequestDataProviderInterface $provider */
+        foreach ($this->providers as $provider) {
+            $requestData[] = $provider->execute($cartItem);
+        }
+
+        return $this->dataObjectFactory->create(['data' => array_merge(...$requestData)]);
+    }
+}
diff --git a/app/code/Magento/Quote/Model/Cart/BuyRequest/BuyRequestDataProviderInterface.php b/app/code/Magento/Quote/Model/Cart/BuyRequest/BuyRequestDataProviderInterface.php
new file mode 100644
index 0000000000000..b9c41b18ee163
--- /dev/null
+++ b/app/code/Magento/Quote/Model/Cart/BuyRequest/BuyRequestDataProviderInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model\Cart\BuyRequest;
+
+use Magento\Quote\Model\Cart\Data\CartItem;
+
+/**
+ * Provides data for buy request for different types of products
+ */
+interface BuyRequestDataProviderInterface
+{
+    /**
+     * Provide buy request data from add to cart item request
+     *
+     * @param CartItem $cartItem
+     * @return array
+     */
+    public function execute(CartItem $cartItem): array;
+}
diff --git a/app/code/Magento/Quote/Model/Cart/BuyRequest/CustomizableOptionDataProvider.php b/app/code/Magento/Quote/Model/Cart/BuyRequest/CustomizableOptionDataProvider.php
new file mode 100644
index 0000000000000..07fc9a41855a5
--- /dev/null
+++ b/app/code/Magento/Quote/Model/Cart/BuyRequest/CustomizableOptionDataProvider.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model\Cart\BuyRequest;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Quote\Model\Cart\Data\CartItem;
+
+/**
+ * Extract buy request elements require for custom options
+ */
+class CustomizableOptionDataProvider implements BuyRequestDataProviderInterface
+{
+    private const OPTION_TYPE = 'custom-option';
+
+    /**
+     * @inheritdoc
+     *
+     * @throws LocalizedException
+     */
+    public function execute(CartItem $cartItem): array
+    {
+        $customizableOptionsData = [];
+
+        foreach ($cartItem->getSelectedOptions() as $optionData) {
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
+            $optionData = \explode('/', base64_decode($optionData->getId()));
+
+            if ($this->isProviderApplicable($optionData) === false) {
+                continue;
+            }
+            $this->validateInput($optionData);
+
+            [, $optionId, $optionValue] = $optionData;
+            $customizableOptionsData[$optionId][] = $optionValue;
+        }
+
+        foreach ($cartItem->getEnteredOptions() as $option) {
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
+            $optionData = \explode('/', base64_decode($option->getId()));
+
+            if ($this->isProviderApplicable($optionData) === false) {
+                continue;
+            }
+
+            [, $optionId] = $optionData;
+            $customizableOptionsData[$optionId][] = $option->getValue();
+        }
+
+        return ['options' => $this->flattenOptionValues($customizableOptionsData)];
+    }
+
+    /**
+     * Flatten option values for non-multiselect customizable options
+     *
+     * @param array $customizableOptionsData
+     * @return array
+     */
+    private function flattenOptionValues(array $customizableOptionsData): array
+    {
+        foreach ($customizableOptionsData as $optionId => $optionValue) {
+            if (count($optionValue) === 1) {
+                $customizableOptionsData[$optionId] = $optionValue[0];
+            }
+        }
+
+        return $customizableOptionsData;
+    }
+
+    /**
+     * Checks whether this provider is applicable for the current option
+     *
+     * @param array $optionData
+     * @return bool
+     */
+    private function isProviderApplicable(array $optionData): bool
+    {
+        if ($optionData[0] !== self::OPTION_TYPE) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Validates the provided options structure
+     *
+     * @param array $optionData
+     * @throws LocalizedException
+     */
+    private function validateInput(array $optionData): void
+    {
+        if (count($optionData) !== 3) {
+            throw new LocalizedException(
+                __('Wrong format of the entered option data. Must be "custom-option/option_id/option_value_id"')
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/Quote/Model/Cart/Data/AddProductsToCartOutput.php b/app/code/Magento/Quote/Model/Cart/Data/AddProductsToCartOutput.php
new file mode 100644
index 0000000000000..6088b12a36e7c
--- /dev/null
+++ b/app/code/Magento/Quote/Model/Cart/Data/AddProductsToCartOutput.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model\Cart\Data;
+
+use Magento\Quote\Api\Data\CartInterface;
+
+/**
+ * DTO represents output for \Magento\Quote\Model\Cart\AddProductsToCart
+ */
+class AddProductsToCartOutput
+{
+    /**
+     * @var CartInterface
+     */
+    private $cart;
+
+    /**
+     * @var Error[]
+     */
+    private $errors;
+
+    /**
+     * @param CartInterface $cart
+     * @param Error[] $errors
+     */
+    public function __construct(CartInterface $cart, array $errors)
+    {
+        $this->cart = $cart;
+        $this->errors = $errors;
+    }
+
+    /**
+     * Get Shopping Cart
+     *
+     * @return CartInterface
+     */
+    public function getCart(): CartInterface
+    {
+        return $this->cart;
+    }
+
+    /**
+     * Get errors happened during reorder
+     *
+     * @return Error[]
+     */
+    public function getErrors(): array
+    {
+        return $this->errors;
+    }
+}
diff --git a/app/code/Magento/Quote/Model/Cart/Data/CartItem.php b/app/code/Magento/Quote/Model/Cart/Data/CartItem.php
new file mode 100644
index 0000000000000..9836247c56694
--- /dev/null
+++ b/app/code/Magento/Quote/Model/Cart/Data/CartItem.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model\Cart\Data;
+
+/**
+ * DTO represents Cart Item data
+ */
+class CartItem
+{
+    /**
+     * @var string
+     */
+    private $sku;
+
+    /**
+     * @var float
+     */
+    private $quantity;
+
+    /**
+     * @var string
+     */
+    private $parentSku;
+
+    /**
+     * @var SelectedOption[]
+     */
+    private $selectedOptions;
+
+    /**
+     * @var EnteredOption[]
+     */
+    private $enteredOptions;
+
+    /**
+     * @param string $sku
+     * @param float $quantity
+     * @param string|null $parentSku
+     * @param array|null $selectedOptions
+     * @param array|null $enteredOptions
+     */
+    public function __construct(
+        string $sku,
+        float $quantity,
+        string $parentSku = null,
+        array $selectedOptions = null,
+        array $enteredOptions = null
+    ) {
+        $this->sku = $sku;
+        $this->quantity = $quantity;
+        $this->parentSku = $parentSku;
+        $this->selectedOptions = $selectedOptions;
+        $this->enteredOptions = $enteredOptions;
+    }
+
+    /**
+     * Returns cart item SKU
+     *
+     * @return string
+     */
+    public function getSku(): string
+    {
+        return $this->sku;
+    }
+
+    /**
+     * Returns cart item quantity
+     *
+     * @return float
+     */
+    public function getQuantity(): float
+    {
+        return $this->quantity;
+    }
+
+    /**
+     * Returns parent SKU
+     *
+     * @return string|null
+     */
+    public function getParentSku(): ?string
+    {
+        return $this->parentSku;
+    }
+
+    /**
+     * Returns selected options
+     *
+     * @return SelectedOption[]|null
+     */
+    public function getSelectedOptions(): ?array
+    {
+        return $this->selectedOptions;
+    }
+
+    /**
+     * Returns entered options
+     *
+     * @return EnteredOption[]|null
+     */
+    public function getEnteredOptions(): ?array
+    {
+        return $this->enteredOptions;
+    }
+}
diff --git a/app/code/Magento/Quote/Model/Cart/Data/CartItemFactory.php b/app/code/Magento/Quote/Model/Cart/Data/CartItemFactory.php
new file mode 100644
index 0000000000000..468d5950bd2dd
--- /dev/null
+++ b/app/code/Magento/Quote/Model/Cart/Data/CartItemFactory.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model\Cart\Data;
+
+use Magento\Framework\Exception\InputException;
+
+/**
+ * Creates CartItem DTO
+ */
+class CartItemFactory
+{
+    /**
+     * Creates CartItem DTO
+     *
+     * @param array $data
+     * @return CartItem
+     * @throws InputException
+     */
+    public function create(array $data): CartItem
+    {
+        if (!isset($data['sku'], $data['quantity'])) {
+            throw new InputException(__('Required fields are not present: sku, quantity'));
+        }
+        return new CartItem(
+            $data['sku'],
+            $data['quantity'],
+            $data['parent_sku'] ?? null,
+            isset($data['selected_options']) ? $this->createSelectedOptions($data['selected_options']) : [],
+            isset($data['entered_options']) ? $this->createEnteredOptions($data['entered_options']) : []
+        );
+    }
+
+    /**
+     * Creates array of Entered Options
+     *
+     * @param array $options
+     * @return EnteredOption[]
+     */
+    private function createEnteredOptions(array $options): array
+    {
+        return \array_map(
+            function (array $option) {
+                if (!isset($option['id'], $option['value'])) {
+                    throw new InputException(
+                        __('Required fields are not present EnteredOption.id, EnteredOption.value')
+                    );
+                }
+                return new EnteredOption($option['id'], $option['value']);
+            },
+            $options
+        );
+    }
+
+    /**
+     * Creates array of Selected Options
+     *
+     * @param string[] $options
+     * @return SelectedOption[]
+     */
+    private function createSelectedOptions(array $options): array
+    {
+        return \array_map(
+            function ($option) {
+                return new SelectedOption($option);
+            },
+            $options
+        );
+    }
+}
diff --git a/app/code/Magento/Quote/Model/Cart/Data/EnteredOption.php b/app/code/Magento/Quote/Model/Cart/Data/EnteredOption.php
new file mode 100644
index 0000000000000..f11aa49d6b4c3
--- /dev/null
+++ b/app/code/Magento/Quote/Model/Cart/Data/EnteredOption.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model\Cart\Data;
+
+class EnteredOption
+{
+    /**
+     * @var string
+     */
+    private $id;
+
+    /**
+     * @var string
+     */
+    private $value;
+
+    /**
+     * @param string $id
+     * @param string $value
+     */
+    public function __construct(string $id, string $value)
+    {
+        $this->id = $id;
+        $this->value = $value;
+    }
+
+    /**
+     * Returns entered option ID
+     *
+     * @return string
+     */
+    public function getId(): string
+    {
+        return $this->id;
+    }
+
+    /**
+     * Returns entered option value
+     *
+     * @return string
+     */
+    public function getValue(): string
+    {
+        return $this->value;
+    }
+}
diff --git a/app/code/Magento/Quote/Model/Cart/Data/Error.php b/app/code/Magento/Quote/Model/Cart/Data/Error.php
new file mode 100644
index 0000000000000..42b14b06d94aa
--- /dev/null
+++ b/app/code/Magento/Quote/Model/Cart/Data/Error.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model\Cart\Data;
+
+/**
+ * DTO represents error item
+ */
+class Error
+{
+    /**
+     * @var string
+     */
+    private $message;
+
+    /**
+     * @var string
+     */
+    private $code;
+
+    /**
+     * @var int
+     */
+    private $cartItemPosition;
+
+    /**
+     * @param string $message
+     * @param string $code
+     * @param int $cartItemPosition
+     */
+    public function __construct(string $message, string $code, int $cartItemPosition)
+    {
+        $this->message = $message;
+        $this->code = $code;
+        $this->cartItemPosition = $cartItemPosition;
+    }
+
+    /**
+     * Get error message
+     *
+     * @return string
+     */
+    public function getMessage(): string
+    {
+        return $this->message;
+    }
+
+    /**
+     * Get error code
+     *
+     * @return string
+     */
+    public function getCode(): string
+    {
+        return $this->code;
+    }
+
+    /**
+     * Get cart item position
+     *
+     * @return int
+     */
+    public function getCartItemPosition(): int
+    {
+        return $this->cartItemPosition;
+    }
+}
diff --git a/app/code/Magento/Quote/Model/Cart/Data/SelectedOption.php b/app/code/Magento/Quote/Model/Cart/Data/SelectedOption.php
new file mode 100644
index 0000000000000..8a15fb3e0dcb4
--- /dev/null
+++ b/app/code/Magento/Quote/Model/Cart/Data/SelectedOption.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model\Cart\Data;
+
+class SelectedOption
+{
+    /**
+     * @var string
+     */
+    private $id;
+
+    /**
+     * @param string $id
+     */
+    public function __construct(string $id)
+    {
+        $this->id = $id;
+    }
+
+    /**
+     * Get selected option ID
+     *
+     * @return string
+     */
+    public function getId(): string
+    {
+        return $this->id;
+    }
+}
diff --git a/app/code/Magento/Quote/etc/graphql/di.xml b/app/code/Magento/Quote/etc/graphql/di.xml
new file mode 100644
index 0000000000000..0e688d42ecb32
--- /dev/null
+++ b/app/code/Magento/Quote/etc/graphql/di.xml
@@ -0,0 +1,16 @@
+<?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\Quote\Model\Cart\BuyRequest\BuyRequestBuilder">
+        <arguments>
+            <argument name="providers" xsi:type="array">
+                <item name="customizable_option" xsi:type="object">Magento\Quote\Model\Cart\BuyRequest\CustomizableOptionDataProvider</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/QuoteBundleOptions/Model/Cart/BuyRequest/BundleDataProvider.php b/app/code/Magento/QuoteBundleOptions/Model/Cart/BuyRequest/BundleDataProvider.php
new file mode 100644
index 0000000000000..946e30ce3e276
--- /dev/null
+++ b/app/code/Magento/QuoteBundleOptions/Model/Cart/BuyRequest/BundleDataProvider.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteBundleOptions\Model\Cart\BuyRequest;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Quote\Model\Cart\BuyRequest\BuyRequestDataProviderInterface;
+use Magento\Quote\Model\Cart\Data\CartItem;
+
+/**
+ * Data provider for bundle product buy requests
+ */
+class BundleDataProvider implements BuyRequestDataProviderInterface
+{
+    private const OPTION_TYPE = 'bundle';
+
+    /**
+     * @inheritdoc
+     *
+     * @throws LocalizedException
+     */
+    public function execute(CartItem $cartItem): array
+    {
+        $bundleOptionsData = [];
+
+        foreach ($cartItem->getSelectedOptions() as $optionData) {
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
+            $optionData = \explode('/', base64_decode($optionData->getId()));
+
+            if ($this->isProviderApplicable($optionData) === false) {
+                continue;
+            }
+            $this->validateInput($optionData);
+
+            [, $optionId, $optionValueId, $optionQuantity] = $optionData;
+            $bundleOptionsData['bundle_option'][$optionId] = $optionValueId;
+            $bundleOptionsData['bundle_option_qty'][$optionId] = $optionQuantity;
+        }
+
+        return $bundleOptionsData;
+    }
+
+    /**
+     * Checks whether this provider is applicable for the current option
+     *
+     * @param array $optionData
+     * @return bool
+     */
+    private function isProviderApplicable(array $optionData): bool
+    {
+        if ($optionData[0] !== self::OPTION_TYPE) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Validates the provided options structure
+     *
+     * @param array $optionData
+     * @throws LocalizedException
+     */
+    private function validateInput(array $optionData): void
+    {
+        if (count($optionData) !== 4) {
+            $errorMessage = __('Wrong format of the entered option data. ' .
+                'Must be "bundle/option_id/option_value_id/option_quantity"');
+            throw new LocalizedException($errorMessage);
+        }
+    }
+}
diff --git a/app/code/Magento/QuoteBundleOptions/README.md b/app/code/Magento/QuoteBundleOptions/README.md
new file mode 100644
index 0000000000000..3207eeaf2b683
--- /dev/null
+++ b/app/code/Magento/QuoteBundleOptions/README.md
@@ -0,0 +1,3 @@
+# QuoteBundleOptions
+
+**QuoteBundleOptions** provides data provider for creating buy request for bundle products.
diff --git a/app/code/Magento/QuoteBundleOptions/composer.json b/app/code/Magento/QuoteBundleOptions/composer.json
new file mode 100644
index 0000000000000..a26502c5a5d6c
--- /dev/null
+++ b/app/code/Magento/QuoteBundleOptions/composer.json
@@ -0,0 +1,22 @@
+{
+    "name": "magento/module-quote-bundle-options",
+    "description": "N/A",
+    "type": "magento2-module",
+    "require": {
+        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "magento/framework": "*",
+        "magento/module-quote": "*"
+    },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\QuoteBundleOptions\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/QuoteBundleOptions/etc/graphql/di.xml b/app/code/Magento/QuoteBundleOptions/etc/graphql/di.xml
new file mode 100644
index 0000000000000..e15493e092e3b
--- /dev/null
+++ b/app/code/Magento/QuoteBundleOptions/etc/graphql/di.xml
@@ -0,0 +1,16 @@
+<?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\Quote\Model\Cart\BuyRequest\BuyRequestBuilder">
+        <arguments>
+            <argument name="providers" xsi:type="array">
+                <item name="bundle" xsi:type="object">Magento\QuoteBundleOptions\Model\Cart\BuyRequest\BundleDataProvider</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/QuoteBundleOptions/etc/module.xml b/app/code/Magento/QuoteBundleOptions/etc/module.xml
new file mode 100644
index 0000000000000..4dc531b561115
--- /dev/null
+++ b/app/code/Magento/QuoteBundleOptions/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_QuoteBundleOptions"/>
+</config>
diff --git a/app/code/Magento/QuoteBundleOptions/registration.php b/app/code/Magento/QuoteBundleOptions/registration.php
new file mode 100644
index 0000000000000..cf4c92fd929d9
--- /dev/null
+++ b/app/code/Magento/QuoteBundleOptions/registration.php
@@ -0,0 +1,10 @@
+<?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_QuoteBundleOptions', __DIR__);
diff --git a/app/code/Magento/QuoteConfigurableOptions/Model/Cart/BuyRequest/SuperAttributeDataProvider.php b/app/code/Magento/QuoteConfigurableOptions/Model/Cart/BuyRequest/SuperAttributeDataProvider.php
new file mode 100644
index 0000000000000..13c822d7233e2
--- /dev/null
+++ b/app/code/Magento/QuoteConfigurableOptions/Model/Cart/BuyRequest/SuperAttributeDataProvider.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteConfigurableOptions\Model\Cart\BuyRequest;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Quote\Model\Cart\BuyRequest\BuyRequestDataProviderInterface;
+use Magento\Quote\Model\Cart\Data\CartItem;
+
+/**
+ * DataProvider for building super attribute options in buy requests
+ */
+class SuperAttributeDataProvider implements BuyRequestDataProviderInterface
+{
+    private const OPTION_TYPE = 'configurable';
+
+    /**
+     * @inheritdoc
+     *
+     * @throws LocalizedException
+     */
+    public function execute(CartItem $cartItem): array
+    {
+        $configurableProductData = [];
+        foreach ($cartItem->getSelectedOptions() as $optionData) {
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
+            $optionData = \explode('/', base64_decode($optionData->getId()));
+
+            if ($this->isProviderApplicable($optionData) === false) {
+                continue;
+            }
+            $this->validateInput($optionData);
+
+            [, $attributeId, $valueIndex] = $optionData;
+            $configurableProductData[$attributeId] = $valueIndex;
+        }
+
+        return ['super_attribute' => $configurableProductData];
+    }
+
+    /**
+     * Checks whether this provider is applicable for the current option
+     *
+     * @param array $optionData
+     * @return bool
+     */
+    private function isProviderApplicable(array $optionData): bool
+    {
+        if ($optionData[0] !== self::OPTION_TYPE) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Validates the provided options structure
+     *
+     * @param array $optionData
+     * @throws LocalizedException
+     */
+    private function validateInput(array $optionData): void
+    {
+        if (count($optionData) !== 3) {
+            throw new LocalizedException(
+                __('Wrong format of the entered option data. Must be "configurable/attribute_id/value_index"')
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/QuoteConfigurableOptions/README.md b/app/code/Magento/QuoteConfigurableOptions/README.md
new file mode 100644
index 0000000000000..db47e2c37c3ff
--- /dev/null
+++ b/app/code/Magento/QuoteConfigurableOptions/README.md
@@ -0,0 +1,3 @@
+# QuoteConfigurableOptions
+
+**QuoteConfigurableOptions** provides data provider for creating buy request for configurable products.
diff --git a/app/code/Magento/QuoteConfigurableOptions/composer.json b/app/code/Magento/QuoteConfigurableOptions/composer.json
new file mode 100644
index 0000000000000..1221068c3061e
--- /dev/null
+++ b/app/code/Magento/QuoteConfigurableOptions/composer.json
@@ -0,0 +1,22 @@
+{
+    "name": "magento/module-quote-configurable-options",
+    "description": "N/A",
+    "type": "magento2-module",
+    "require": {
+        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "magento/framework": "*",
+        "magento/module-quote": "*"
+    },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\QuoteConfigurableOptions\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/QuoteConfigurableOptions/etc/graphql/di.xml b/app/code/Magento/QuoteConfigurableOptions/etc/graphql/di.xml
new file mode 100644
index 0000000000000..c4fe6357a5689
--- /dev/null
+++ b/app/code/Magento/QuoteConfigurableOptions/etc/graphql/di.xml
@@ -0,0 +1,16 @@
+<?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\Quote\Model\Cart\BuyRequest\BuyRequestBuilder">
+        <arguments>
+            <argument name="providers" xsi:type="array">
+                <item name="super_attribute" xsi:type="object">Magento\QuoteConfigurableOptions\Model\Cart\BuyRequest\SuperAttributeDataProvider</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/QuoteConfigurableOptions/etc/module.xml b/app/code/Magento/QuoteConfigurableOptions/etc/module.xml
new file mode 100644
index 0000000000000..e32489c1b2109
--- /dev/null
+++ b/app/code/Magento/QuoteConfigurableOptions/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_QuoteConfigurableOptions"/>
+</config>
diff --git a/app/code/Magento/QuoteConfigurableOptions/registration.php b/app/code/Magento/QuoteConfigurableOptions/registration.php
new file mode 100644
index 0000000000000..0b55a18a81fce
--- /dev/null
+++ b/app/code/Magento/QuoteConfigurableOptions/registration.php
@@ -0,0 +1,10 @@
+<?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_QuoteConfigurableOptions', __DIR__);
diff --git a/app/code/Magento/QuoteDownloadableLinks/Model/Cart/BuyRequest/DownloadableLinkDataProvider.php b/app/code/Magento/QuoteDownloadableLinks/Model/Cart/BuyRequest/DownloadableLinkDataProvider.php
new file mode 100644
index 0000000000000..85bb62179eeb2
--- /dev/null
+++ b/app/code/Magento/QuoteDownloadableLinks/Model/Cart/BuyRequest/DownloadableLinkDataProvider.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteDownloadableLinks\Model\Cart\BuyRequest;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Quote\Model\Cart\BuyRequest\BuyRequestDataProviderInterface;
+use Magento\Quote\Model\Cart\Data\CartItem;
+
+/**
+ * DataProvider for building downloadable product links in buy requests
+ */
+class DownloadableLinkDataProvider implements BuyRequestDataProviderInterface
+{
+    private const OPTION_TYPE = 'downloadable';
+
+    /**
+     * @inheritdoc
+     *
+     * @throws LocalizedException
+     */
+    public function execute(CartItem $cartItem): array
+    {
+        $linksData = [];
+
+        foreach ($cartItem->getSelectedOptions() as $optionData) {
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
+            $optionData = \explode('/', base64_decode($optionData->getId()));
+
+            if ($this->isProviderApplicable($optionData) === false) {
+                continue;
+            }
+            $this->validateInput($optionData);
+
+            [, $linkId] = $optionData;
+            $linksData[] = $linkId;
+        }
+
+        return ['links' => $linksData];
+    }
+
+    /**
+     * Checks whether this provider is applicable for the current option
+     *
+     * @param array $optionData
+     * @return bool
+     */
+    private function isProviderApplicable(array $optionData): bool
+    {
+        if ($optionData[0] !== self::OPTION_TYPE) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Validates the provided options structure
+     *
+     * @param array $optionData
+     * @throws LocalizedException
+     */
+    private function validateInput(array $optionData): void
+    {
+        if (count($optionData) !== 2) {
+            throw new LocalizedException(
+                __('Wrong format of the entered option data. Must be "downloadable/link_id"')
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/QuoteDownloadableLinks/README.md b/app/code/Magento/QuoteDownloadableLinks/README.md
new file mode 100644
index 0000000000000..68efffcea6fb8
--- /dev/null
+++ b/app/code/Magento/QuoteDownloadableLinks/README.md
@@ -0,0 +1,3 @@
+# QuoteDownloadableLinks
+
+**QuoteDownloadableLinks** provides data provider for creating buy request for links of downloadable products.
diff --git a/app/code/Magento/QuoteDownloadableLinks/composer.json b/app/code/Magento/QuoteDownloadableLinks/composer.json
new file mode 100644
index 0000000000000..dd840efb65c45
--- /dev/null
+++ b/app/code/Magento/QuoteDownloadableLinks/composer.json
@@ -0,0 +1,22 @@
+{
+    "name": "magento/module-quote-downloadable-links",
+    "description": "N/A",
+    "type": "magento2-module",
+    "require": {
+        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "magento/framework": "*",
+        "magento/module-quote": "*"
+    },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\QuoteDownloadableLinks\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/QuoteDownloadableLinks/etc/graphql/di.xml b/app/code/Magento/QuoteDownloadableLinks/etc/graphql/di.xml
new file mode 100644
index 0000000000000..a932d199983a3
--- /dev/null
+++ b/app/code/Magento/QuoteDownloadableLinks/etc/graphql/di.xml
@@ -0,0 +1,16 @@
+<?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\Quote\Model\Cart\BuyRequest\BuyRequestBuilder">
+        <arguments>
+            <argument name="providers" xsi:type="array">
+                <item name="downloadable" xsi:type="object">Magento\QuoteDownloadableLinks\Model\Cart\BuyRequest\DownloadableLinkDataProvider</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/QuoteDownloadableLinks/etc/module.xml b/app/code/Magento/QuoteDownloadableLinks/etc/module.xml
new file mode 100644
index 0000000000000..a0cc652ab9188
--- /dev/null
+++ b/app/code/Magento/QuoteDownloadableLinks/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_QuoteDownloadableLinks"/>
+</config>
diff --git a/app/code/Magento/QuoteDownloadableLinks/registration.php b/app/code/Magento/QuoteDownloadableLinks/registration.php
new file mode 100644
index 0000000000000..8b766e7fde06c
--- /dev/null
+++ b/app/code/Magento/QuoteDownloadableLinks/registration.php
@@ -0,0 +1,10 @@
+<?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_QuoteDownloadableLinks', __DIR__);
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/AddProductsToCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/AddProductsToCart.php
new file mode 100644
index 0000000000000..ccb6897e358d0
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/AddProductsToCart.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Resolver;
+
+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\Quote\Model\Cart\AddProductsToCart as AddProductsToCartService;
+use Magento\Quote\Model\Cart\Data\AddProductsToCartOutput;
+use Magento\Quote\Model\Cart\Data\CartItemFactory;
+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
+use Magento\Quote\Model\Cart\Data\Error;
+
+/**
+ * Resolver for addProductsToCart mutation
+ *
+ * @inheritdoc
+ */
+class AddProductsToCart implements ResolverInterface
+{
+    /**
+     * @var GetCartForUser
+     */
+    private $getCartForUser;
+
+    /**
+     * @var AddProductsToCartService
+     */
+    private $addProductsToCartService;
+
+    /**
+     * @param GetCartForUser $getCartForUser
+     * @param AddProductsToCartService $addProductsToCart
+     */
+    public function __construct(
+        GetCartForUser $getCartForUser,
+        AddProductsToCartService $addProductsToCart
+    ) {
+        $this->getCartForUser = $getCartForUser;
+        $this->addProductsToCartService = $addProductsToCart;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (empty($args['cart_id'])) {
+            throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
+        }
+        if (empty($args['cart_items']) || !is_array($args['cart_items'])
+        ) {
+            throw new GraphQlInputException(__('Required parameter "cart_items" is missing'));
+        }
+
+        $maskedCartId = $args['cart_id'];
+        $cartItemsData = $args['cart_items'];
+        $storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
+
+        // Shopping Cart validation
+        $this->getCartForUser->execute($maskedCartId, $context->getUserId(), $storeId);
+
+        $cartItems = [];
+        foreach ($cartItemsData as $cartItemData) {
+            $cartItems[] = (new CartItemFactory())->create($cartItemData);
+        }
+
+        /** @var AddProductsToCartOutput $addProductsToCartOutput */
+        $addProductsToCartOutput = $this->addProductsToCartService->execute($maskedCartId, $cartItems);
+
+        return [
+            'cart' => [
+                'model' => $addProductsToCartOutput->getCart(),
+            ],
+            'userInputErrors' => \array_map(
+                function (Error $error) {
+                    return [
+                        'code' => $error->getCode(),
+                        'message' => $error->getMessage(),
+                        'path' => $error->getCartItemPosition()
+                    ];
+                },
+                $addProductsToCartOutput->getErrors()
+            )
+        ];
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
index 1ca00d5ef7bdc..dc0bf89abb9d8 100644
--- a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -22,6 +22,7 @@ type Mutation {
     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")
     placeOrder(input: PlaceOrderInput): PlaceOrderOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\PlaceOrder")
+    addProductsToCart(cart_id: String!, cart_items: [CartItemInput!]!): AddProductsToCartOutput @doc(description:"Add products to the cart. Provide single interface for all product types ") @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\AddProductsToCart")
 }
 
 input createEmptyCartInput {
@@ -51,6 +52,9 @@ input VirtualProductCartItemInput {
 input CartItemInput {
     sku: String!
     quantity: Float!
+    parent_sku: String,
+    selected_options: [String!]
+    entered_options: [EnteredOptionInput!]
 }
 
 input CustomizableOptionInput {
@@ -313,6 +317,11 @@ type SetGuestEmailOnCartOutput {
     cart: Cart!
 }
 
+input EnteredOptionInput {
+    id: String! @doc(description: "base64 encoded option ID")
+    value: String!
+}
+
 type SimpleCartItem implements CartItemInterface @doc(description: "Simple Cart Item") {
     customizable_options: [SelectedCustomizableOption] @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\CustomizableOptions")
 }
@@ -366,3 +375,22 @@ type Order {
     order_number: String!
     order_id: String @deprecated(reason: "The order_id field is deprecated, use order_number instead.")
 }
+
+type CheckoutUserInputError @doc(description:"An error encountered while adding an item the the cart.") {
+    message: String! @doc(description: "Localized error message")
+    path: [String]! @doc(description: "Path to the input field that caused an error. See the GraphQL specification about path errors for details: http://spec.graphql.org/draft/#sec-Errors")
+    code: CheckoutUserInputErrorCodes! @doc(description: "Checkout-specific error code")
+}
+
+type AddProductsToCartOutput {
+    cart: Cart!
+    userInputErrors:[CheckoutUserInputError]!
+}
+
+enum CheckoutUserInputErrorCodes {
+    PRODUCT_NOT_FOUND
+    NOT_SALABLE
+    INSUFFICIENT_STOCK
+    UNDEFINED
+}
+
diff --git a/app/code/Magento/SalesGraphQl/etc/schema.graphqls b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
index f823c25cf2d9f..4350c3889ef09 100644
--- a/app/code/Magento/SalesGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
@@ -27,16 +27,6 @@ type ReorderItemsOutput {
     userInputErrors:[CheckoutUserInputError]! @doc(description:"An array of reordering errors.")
 }
 
-type CheckoutUserInputError @doc(description:"An error encountered while adding an item the the cart."){
-    message: String! @doc(description: "Localized error message")
-    path: [String]! @doc(description: "Path to the input field that caused an error. See the GraphQL specification about path errors for details: http://spec.graphql.org/draft/#sec-Errors")
-    code: CheckoutUserInputErrorCodes! @doc(description: "Checkout-specific error code")
-}
-
 enum CheckoutUserInputErrorCodes {
     REORDER_NOT_AVAILABLE
-    PRODUCT_NOT_FOUND
-    NOT_SALABLE
-    INSUFFICIENT_STOCK
-    UNDEFINED
 }
diff --git a/composer.json b/composer.json
index 5223fa2a0aca4..0cd398c9999e2 100644
--- a/composer.json
+++ b/composer.json
@@ -216,6 +216,9 @@
         "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": "*",
diff --git a/composer.lock b/composer.lock
index 37849c7c21a29..e9373ea2fb62e 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": "1f11bed01d000a3d3eeda8b462e29f75",
+    "content-hash": "6863a98c354991b95809545739e59c8f",
     "packages": [
         {
             "name": "braintree/braintree_php",
@@ -201,16 +201,16 @@
         },
         {
             "name": "composer/ca-bundle",
-            "version": "1.2.6",
+            "version": "1.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/ca-bundle.git",
-                "reference": "47fe531de31fca4a1b997f87308e7d7804348f7e"
+                "reference": "95c63ab2117a72f48f5a55da9740a3273d45b7fd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/47fe531de31fca4a1b997f87308e7d7804348f7e",
-                "reference": "47fe531de31fca4a1b997f87308e7d7804348f7e",
+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/95c63ab2117a72f48f5a55da9740a3273d45b7fd",
+                "reference": "95c63ab2117a72f48f5a55da9740a3273d45b7fd",
                 "shasum": ""
             },
             "require": {
@@ -253,20 +253,30 @@
                 "ssl",
                 "tls"
             ],
-            "time": "2020-01-13T10:02:55+00:00"
+            "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"
         },
         {
             "name": "composer/composer",
-            "version": "1.10.1",
+            "version": "1.10.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/composer.git",
-                "reference": "b912a45da3e2b22f5cb5a23e441b697a295ba011"
+                "reference": "be81b9c4735362c26876bdbfd3b5bc7e7f711c88"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/b912a45da3e2b22f5cb5a23e441b697a295ba011",
-                "reference": "b912a45da3e2b22f5cb5a23e441b697a295ba011",
+                "url": "https://api.github.com/repos/composer/composer/zipball/be81b9c4735362c26876bdbfd3b5bc7e7f711c88",
+                "reference": "be81b9c4735362c26876bdbfd3b5bc7e7f711c88",
                 "shasum": ""
             },
             "require": {
@@ -285,7 +295,8 @@
                 "symfony/process": "^2.7 || ^3.0 || ^4.0 || ^5.0"
             },
             "conflict": {
-                "symfony/console": "2.8.38"
+                "symfony/console": "2.8.38",
+                "symfony/phpunit-bridge": "3.4.40"
             },
             "require-dev": {
                 "phpspec/prophecy": "^1.10",
@@ -333,7 +344,17 @@
                 "dependency",
                 "package"
             ],
-            "time": "2020-03-13T19:34:27+00:00"
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-05-06T08:28:10+00:00"
         },
         {
             "name": "composer/semver",
@@ -698,23 +719,24 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "6.5.2",
+            "version": "6.5.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "43ece0e75098b7ecd8d13918293029e555a50f82"
+                "reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/43ece0e75098b7ecd8d13918293029e555a50f82",
-                "reference": "43ece0e75098b7ecd8d13918293029e555a50f82",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/aab4ebd862aa7d04f01a4b51849d657db56d882e",
+                "reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "guzzlehttp/promises": "^1.0",
                 "guzzlehttp/psr7": "^1.6.1",
-                "php": ">=5.5"
+                "php": ">=5.5",
+                "symfony/polyfill-intl-idn": "^1.11"
             },
             "require-dev": {
                 "ext-curl": "*",
@@ -722,7 +744,6 @@
                 "psr/log": "^1.1"
             },
             "suggest": {
-                "ext-intl": "Required for Internationalized Domain Name (IDN) support",
                 "psr/log": "Required for using the Log middleware"
             },
             "type": "library",
@@ -761,7 +782,7 @@
                 "rest",
                 "web service"
             ],
-            "time": "2019-12-23T11:57:10+00:00"
+            "time": "2020-04-18T10:38:46+00:00"
         },
         {
             "name": "guzzlehttp/promises",
@@ -1243,16 +1264,16 @@
         },
         {
             "name": "laminas/laminas-db",
-            "version": "2.11.2",
+            "version": "2.11.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-db.git",
-                "reference": "76f9527da996c2fef32ef1f3a939e18ca5e9d962"
+                "reference": "6c4238918b9204db1eb8cafae2c1940d40f4c007"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-db/zipball/76f9527da996c2fef32ef1f3a939e18ca5e9d962",
-                "reference": "76f9527da996c2fef32ef1f3a939e18ca5e9d962",
+                "url": "https://api.github.com/repos/laminas/laminas-db/zipball/6c4238918b9204db1eb8cafae2c1940d40f4c007",
+                "reference": "6c4238918b9204db1eb8cafae2c1940d40f4c007",
                 "shasum": ""
             },
             "require": {
@@ -1261,7 +1282,7 @@
                 "php": "^5.6 || ^7.0"
             },
             "replace": {
-                "zendframework/zend-db": "self.version"
+                "zendframework/zend-db": "^2.11.0"
             },
             "require-dev": {
                 "laminas/laminas-coding-standard": "~1.0.0",
@@ -1301,7 +1322,7 @@
                 "db",
                 "laminas"
             ],
-            "time": "2020-01-14T13:07:26+00:00"
+            "time": "2020-03-29T12:08:51+00:00"
         },
         {
             "name": "laminas/laminas-dependency-plugin",
@@ -1402,16 +1423,16 @@
         },
         {
             "name": "laminas/laminas-diactoros",
-            "version": "1.8.7p1",
+            "version": "1.8.7p2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-diactoros.git",
-                "reference": "56a9aca1f89231763d24d2ae13531b97fa5f4029"
+                "reference": "6991c1af7c8d2c8efee81b22ba97024781824aaa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/56a9aca1f89231763d24d2ae13531b97fa5f4029",
-                "reference": "56a9aca1f89231763d24d2ae13531b97fa5f4029",
+                "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/6991c1af7c8d2c8efee81b22ba97024781824aaa",
+                "reference": "6991c1af7c8d2c8efee81b22ba97024781824aaa",
                 "shasum": ""
             },
             "require": {
@@ -1423,7 +1444,7 @@
                 "psr/http-message-implementation": "1.0"
             },
             "replace": {
-                "zendframework/zend-diactoros": "self.version"
+                "zendframework/zend-diactoros": "~1.8.7.0"
             },
             "require-dev": {
                 "ext-dom": "*",
@@ -1473,7 +1494,7 @@
                 "psr",
                 "psr-7"
             ],
-            "time": "2020-01-07T19:25:17+00:00"
+            "time": "2020-03-23T15:28:28+00:00"
         },
         {
             "name": "laminas/laminas-escaper",
@@ -1584,16 +1605,16 @@
         },
         {
             "name": "laminas/laminas-feed",
-            "version": "2.12.1",
+            "version": "2.12.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-feed.git",
-                "reference": "c9356994eb80d0f6b46d7e12ba048d450bf0cd72"
+                "reference": "8a193ac96ebcb3e16b6ee754ac2a889eefacb654"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-feed/zipball/c9356994eb80d0f6b46d7e12ba048d450bf0cd72",
-                "reference": "c9356994eb80d0f6b46d7e12ba048d450bf0cd72",
+                "url": "https://api.github.com/repos/laminas/laminas-feed/zipball/8a193ac96ebcb3e16b6ee754ac2a889eefacb654",
+                "reference": "8a193ac96ebcb3e16b6ee754ac2a889eefacb654",
                 "shasum": ""
             },
             "require": {
@@ -1605,7 +1626,7 @@
                 "php": "^5.6 || ^7.0"
             },
             "replace": {
-                "zendframework/zend-feed": "self.version"
+                "zendframework/zend-feed": "^2.12.0"
             },
             "require-dev": {
                 "laminas/laminas-cache": "^2.7.2",
@@ -1647,20 +1668,20 @@
                 "feed",
                 "laminas"
             ],
-            "time": "2020-03-23T10:40:31+00:00"
+            "time": "2020-03-29T12:36:29+00:00"
         },
         {
             "name": "laminas/laminas-filter",
-            "version": "2.9.3",
+            "version": "2.9.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-filter.git",
-                "reference": "52b5cdbef8902280996e687e7352a648a8e22f31"
+                "reference": "3c4476e772a062cef7531c6793377ae585d89c82"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/52b5cdbef8902280996e687e7352a648a8e22f31",
-                "reference": "52b5cdbef8902280996e687e7352a648a8e22f31",
+                "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/3c4476e772a062cef7531c6793377ae585d89c82",
+                "reference": "3c4476e772a062cef7531c6793377ae585d89c82",
                 "shasum": ""
             },
             "require": {
@@ -1672,7 +1693,7 @@
                 "laminas/laminas-validator": "<2.10.1"
             },
             "replace": {
-                "zendframework/zend-filter": "self.version"
+                "zendframework/zend-filter": "^2.9.2"
             },
             "require-dev": {
                 "laminas/laminas-coding-standard": "~1.0.0",
@@ -1716,20 +1737,20 @@
                 "filter",
                 "laminas"
             ],
-            "time": "2020-01-07T20:43:53+00:00"
+            "time": "2020-03-29T12:41:29+00:00"
         },
         {
             "name": "laminas/laminas-form",
-            "version": "2.14.4",
+            "version": "2.14.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-form.git",
-                "reference": "8b985f74bfe32910edb4ba9503877c4310228cd2"
+                "reference": "3e22e09751cf6ae031be87a44e092e7925ce5b7b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-form/zipball/8b985f74bfe32910edb4ba9503877c4310228cd2",
-                "reference": "8b985f74bfe32910edb4ba9503877c4310228cd2",
+                "url": "https://api.github.com/repos/laminas/laminas-form/zipball/3e22e09751cf6ae031be87a44e092e7925ce5b7b",
+                "reference": "3e22e09751cf6ae031be87a44e092e7925ce5b7b",
                 "shasum": ""
             },
             "require": {
@@ -1740,7 +1761,7 @@
                 "php": "^5.6 || ^7.0"
             },
             "replace": {
-                "zendframework/zend-form": "self.version"
+                "zendframework/zend-form": "^2.14.3"
             },
             "require-dev": {
                 "doctrine/annotations": "~1.0",
@@ -1798,7 +1819,7 @@
                 "form",
                 "laminas"
             ],
-            "time": "2020-03-18T22:38:54+00:00"
+            "time": "2020-03-29T12:46:16+00:00"
         },
         {
             "name": "laminas/laminas-http",
@@ -1924,16 +1945,16 @@
         },
         {
             "name": "laminas/laminas-i18n",
-            "version": "2.10.2",
+            "version": "2.10.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-i18n.git",
-                "reference": "9699c98d97d2f519def3da8d4128dfe6e6ad11bf"
+                "reference": "94ff957a1366f5be94f3d3a9b89b50386649e3ae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-i18n/zipball/9699c98d97d2f519def3da8d4128dfe6e6ad11bf",
-                "reference": "9699c98d97d2f519def3da8d4128dfe6e6ad11bf",
+                "url": "https://api.github.com/repos/laminas/laminas-i18n/zipball/94ff957a1366f5be94f3d3a9b89b50386649e3ae",
+                "reference": "94ff957a1366f5be94f3d3a9b89b50386649e3ae",
                 "shasum": ""
             },
             "require": {
@@ -1946,7 +1967,7 @@
                 "phpspec/prophecy": "<1.9.0"
             },
             "replace": {
-                "zendframework/zend-i18n": "self.version"
+                "zendframework/zend-i18n": "^2.10.1"
             },
             "require-dev": {
                 "laminas/laminas-cache": "^2.6.1",
@@ -1995,7 +2016,7 @@
                 "i18n",
                 "laminas"
             ],
-            "time": "2020-03-20T11:57:14+00:00"
+            "time": "2020-03-29T12:51:08+00:00"
         },
         {
             "name": "laminas/laminas-inputfilter",
@@ -2242,16 +2263,16 @@
         },
         {
             "name": "laminas/laminas-mail",
-            "version": "2.10.0",
+            "version": "2.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-mail.git",
-                "reference": "019fb670c1dff6be7fc91d3b88942bd0a5f68792"
+                "reference": "cfe0711446c8d9c392e9fc664c9ccc180fa89005"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-mail/zipball/019fb670c1dff6be7fc91d3b88942bd0a5f68792",
-                "reference": "019fb670c1dff6be7fc91d3b88942bd0a5f68792",
+                "url": "https://api.github.com/repos/laminas/laminas-mail/zipball/cfe0711446c8d9c392e9fc664c9ccc180fa89005",
+                "reference": "cfe0711446c8d9c392e9fc664c9ccc180fa89005",
                 "shasum": ""
             },
             "require": {
@@ -2265,7 +2286,7 @@
                 "true/punycode": "^2.1"
             },
             "replace": {
-                "zendframework/zend-mail": "self.version"
+                "zendframework/zend-mail": "^2.10.0"
             },
             "require-dev": {
                 "laminas/laminas-coding-standard": "~1.0.0",
@@ -2304,7 +2325,13 @@
                 "laminas",
                 "mail"
             ],
-            "time": "2019-12-31T17:21:22+00:00"
+            "funding": [
+                {
+                    "url": "https://funding.communitybridge.org/projects/laminas-project",
+                    "type": "community_bridge"
+                }
+            ],
+            "time": "2020-04-21T16:42:19+00:00"
         },
         {
             "name": "laminas/laminas-math",
@@ -2362,16 +2389,16 @@
         },
         {
             "name": "laminas/laminas-mime",
-            "version": "2.7.3",
+            "version": "2.7.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-mime.git",
-                "reference": "e844abb02e868fae154207929190292ad25057cc"
+                "reference": "e45a7d856bf7b4a7b5bd00d6371f9961dc233add"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-mime/zipball/e844abb02e868fae154207929190292ad25057cc",
-                "reference": "e844abb02e868fae154207929190292ad25057cc",
+                "url": "https://api.github.com/repos/laminas/laminas-mime/zipball/e45a7d856bf7b4a7b5bd00d6371f9961dc233add",
+                "reference": "e45a7d856bf7b4a7b5bd00d6371f9961dc233add",
                 "shasum": ""
             },
             "require": {
@@ -2380,7 +2407,7 @@
                 "php": "^5.6 || ^7.0"
             },
             "replace": {
-                "zendframework/zend-mime": "self.version"
+                "zendframework/zend-mime": "^2.7.2"
             },
             "require-dev": {
                 "laminas/laminas-coding-standard": "~1.0.0",
@@ -2412,7 +2439,7 @@
                 "laminas",
                 "mime"
             ],
-            "time": "2020-03-06T08:38:03+00:00"
+            "time": "2020-03-29T13:12:07+00:00"
         },
         {
             "name": "laminas/laminas-modulemanager",
@@ -2797,16 +2824,16 @@
         },
         {
             "name": "laminas/laminas-session",
-            "version": "2.9.2",
+            "version": "2.9.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-session.git",
-                "reference": "fdba34c1b257235dba2fff6ed4df1844390f85f6"
+                "reference": "519e8966146536cd97c1cc3d59a21b095fb814d7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-session/zipball/fdba34c1b257235dba2fff6ed4df1844390f85f6",
-                "reference": "fdba34c1b257235dba2fff6ed4df1844390f85f6",
+                "url": "https://api.github.com/repos/laminas/laminas-session/zipball/519e8966146536cd97c1cc3d59a21b095fb814d7",
+                "reference": "519e8966146536cd97c1cc3d59a21b095fb814d7",
                 "shasum": ""
             },
             "require": {
@@ -2816,7 +2843,7 @@
                 "php": "^5.6 || ^7.0"
             },
             "replace": {
-                "zendframework/zend-session": "self.version"
+                "zendframework/zend-session": "^2.9.1"
             },
             "require-dev": {
                 "container-interop/container-interop": "^1.1",
@@ -2864,7 +2891,7 @@
                 "laminas",
                 "session"
             ],
-            "time": "2020-03-06T09:44:45+00:00"
+            "time": "2020-03-29T13:26:04+00:00"
         },
         {
             "name": "laminas/laminas-soap",
@@ -3078,16 +3105,16 @@
         },
         {
             "name": "laminas/laminas-validator",
-            "version": "2.13.2",
+            "version": "2.13.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-validator.git",
-                "reference": "e7bf6a2eedc0508ebde0ebc66662efeb0abbcb2c"
+                "reference": "93593684e70b8ed1e870cacd34ca32b0c0ace185"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/e7bf6a2eedc0508ebde0ebc66662efeb0abbcb2c",
-                "reference": "e7bf6a2eedc0508ebde0ebc66662efeb0abbcb2c",
+                "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/93593684e70b8ed1e870cacd34ca32b0c0ace185",
+                "reference": "93593684e70b8ed1e870cacd34ca32b0c0ace185",
                 "shasum": ""
             },
             "require": {
@@ -3097,7 +3124,7 @@
                 "php": "^7.1"
             },
             "replace": {
-                "zendframework/zend-validator": "self.version"
+                "zendframework/zend-validator": "^2.13.0"
             },
             "require-dev": {
                 "laminas/laminas-cache": "^2.6.1",
@@ -3153,7 +3180,7 @@
                 "laminas",
                 "validator"
             ],
-            "time": "2020-03-16T11:38:27+00:00"
+            "time": "2020-03-31T18:57:01+00:00"
         },
         {
             "name": "laminas/laminas-view",
@@ -3248,16 +3275,16 @@
         },
         {
             "name": "laminas/laminas-zendframework-bridge",
-            "version": "1.0.2",
+            "version": "1.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-zendframework-bridge.git",
-                "reference": "faf68f6109ceeff24241226033ab59640c7eb63b"
+                "reference": "bfbbdb6c998d50dbf69d2187cb78a5f1fa36e1e9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/faf68f6109ceeff24241226033ab59640c7eb63b",
-                "reference": "faf68f6109ceeff24241226033ab59640c7eb63b",
+                "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/bfbbdb6c998d50dbf69d2187cb78a5f1fa36e1e9",
+                "reference": "bfbbdb6c998d50dbf69d2187cb78a5f1fa36e1e9",
                 "shasum": ""
             },
             "require": {
@@ -3296,7 +3323,13 @@
                 "laminas",
                 "zf"
             ],
-            "time": "2020-03-26T16:07:12+00:00"
+            "funding": [
+                {
+                    "url": "https://funding.communitybridge.org/projects/laminas-project",
+                    "type": "community_bridge"
+                }
+            ],
+            "time": "2020-04-03T16:01:00+00:00"
         },
         {
             "name": "magento/composer",
@@ -3863,16 +3896,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "2.0.26",
+            "version": "2.0.27",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "09655fcc1f8bab65727be036b28f6f20311c126c"
+                "reference": "34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/09655fcc1f8bab65727be036b28f6f20311c126c",
-                "reference": "09655fcc1f8bab65727be036b28f6f20311c126c",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc",
+                "reference": "34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc",
                 "shasum": ""
             },
             "require": {
@@ -3951,7 +3984,21 @@
                 "x.509",
                 "x509"
             ],
-            "time": "2020-03-13T04:15:39+00:00"
+            "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"
         },
         {
             "name": "psr/container",
@@ -4269,20 +4316,20 @@
         },
         {
             "name": "seld/jsonlint",
-            "version": "1.7.2",
+            "version": "1.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/jsonlint.git",
-                "reference": "e2e5d290e4d2a4f0eb449f510071392e00e10d19"
+                "reference": "ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/e2e5d290e4d2a4f0eb449f510071392e00e10d19",
-                "reference": "e2e5d290e4d2a4f0eb449f510071392e00e10d19",
+                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1",
+                "reference": "ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3 || ^7.0"
+                "php": "^5.3 || ^7.0 || ^8.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
@@ -4314,7 +4361,17 @@
                 "parser",
                 "validator"
             ],
-            "time": "2019-10-24T14:27:39+00:00"
+            "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"
         },
         {
             "name": "seld/phar-utils",
@@ -4362,16 +4419,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v4.4.5",
+            "version": "v4.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "4fa15ae7be74e53f6ec8c83ed403b97e23b665e9"
+                "reference": "10bb3ee3c97308869d53b3e3d03f6ac23ff985f7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/4fa15ae7be74e53f6ec8c83ed403b97e23b665e9",
-                "reference": "4fa15ae7be74e53f6ec8c83ed403b97e23b665e9",
+                "url": "https://api.github.com/repos/symfony/console/zipball/10bb3ee3c97308869d53b3e3d03f6ac23ff985f7",
+                "reference": "10bb3ee3c97308869d53b3e3d03f6ac23ff985f7",
                 "shasum": ""
             },
             "require": {
@@ -4434,20 +4491,34 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2020-02-24T13:10:00+00:00"
+            "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-03-30T11:41:10+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v4.4.5",
+            "version": "v4.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "d0a6dd288fa8848dcc3d1f58b94de6a7cc5d2d22"
+                "reference": "afc26133a6fbdd4f8842e38893e0ee4685c7c94b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/d0a6dd288fa8848dcc3d1f58b94de6a7cc5d2d22",
-                "reference": "d0a6dd288fa8848dcc3d1f58b94de6a7cc5d2d22",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/afc26133a6fbdd4f8842e38893e0ee4685c7c94b",
+                "reference": "afc26133a6fbdd4f8842e38893e0ee4685c7c94b",
                 "shasum": ""
             },
             "require": {
@@ -4487,20 +4558,34 @@
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",
-            "time": "2020-02-04T09:01:01+00:00"
+            "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-03-27T16:54:36+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v4.4.5",
+            "version": "v4.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "4ad8e149799d3128621a3a1f70e92b9897a8930d"
+                "reference": "abc8e3618bfdb55e44c8c6a00abd333f831bbfed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/4ad8e149799d3128621a3a1f70e92b9897a8930d",
-                "reference": "4ad8e149799d3128621a3a1f70e92b9897a8930d",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/abc8e3618bfdb55e44c8c6a00abd333f831bbfed",
+                "reference": "abc8e3618bfdb55e44c8c6a00abd333f831bbfed",
                 "shasum": ""
             },
             "require": {
@@ -4557,7 +4642,21 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2020-02-04T09:32:40+00:00"
+            "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-03-27T16:54:36+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -4619,16 +4718,16 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v4.4.5",
+            "version": "v4.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "266c9540b475f26122b61ef8b23dd9198f5d1cfd"
+                "reference": "a3ebf3bfd8a98a147c010a568add5a8aa4edea0f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/266c9540b475f26122b61ef8b23dd9198f5d1cfd",
-                "reference": "266c9540b475f26122b61ef8b23dd9198f5d1cfd",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/a3ebf3bfd8a98a147c010a568add5a8aa4edea0f",
+                "reference": "a3ebf3bfd8a98a147c010a568add5a8aa4edea0f",
                 "shasum": ""
             },
             "require": {
@@ -4665,20 +4764,34 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "time": "2020-01-21T08:20:44+00:00"
+            "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-04-12T14:39:55+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v4.4.5",
+            "version": "v4.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "ea69c129aed9fdeca781d4b77eb20b62cf5d5357"
+                "reference": "5729f943f9854c5781984ed4907bbb817735776b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/ea69c129aed9fdeca781d4b77eb20b62cf5d5357",
-                "reference": "ea69c129aed9fdeca781d4b77eb20b62cf5d5357",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/5729f943f9854c5781984ed4907bbb817735776b",
+                "reference": "5729f943f9854c5781984ed4907bbb817735776b",
                 "shasum": ""
             },
             "require": {
@@ -4714,7 +4827,21 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2020-02-14T07:42:58+00:00"
+            "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-03-27T16:54:36+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -4774,6 +4901,68 @@
             ],
             "time": "2020-02-27T09:26:54+00:00"
         },
+        {
+            "name": "symfony/polyfill-intl-idn",
+            "version": "v1.15.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-idn.git",
+                "reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf",
+                "reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "symfony/polyfill-mbstring": "^1.3",
+                "symfony/polyfill-php72": "^1.10"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.15-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Idn\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Laurent Bassin",
+                    "email": "laurent@bassin.info"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "idn",
+                "intl",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2020-03-09T19:04:49+00:00"
+        },
         {
             "name": "symfony/polyfill-mbstring",
             "version": "v1.15.0",
@@ -4833,6 +5022,61 @@
             ],
             "time": "2020-03-09T19:04:49+00:00"
         },
+        {
+            "name": "symfony/polyfill-php72",
+            "version": "v1.15.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php72.git",
+                "reference": "37b0976c78b94856543260ce09b460a7bc852747"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/37b0976c78b94856543260ce09b460a7bc852747",
+                "reference": "37b0976c78b94856543260ce09b460a7bc852747",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.15-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php72\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2020-02-27T09:26:54+00:00"
+        },
         {
             "name": "symfony/polyfill-php73",
             "version": "v1.15.0",
@@ -4893,16 +5137,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v4.4.5",
+            "version": "v4.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "bf9166bac906c9e69fb7a11d94875e7ced97bcd7"
+                "reference": "4b6a9a4013baa65d409153cbb5a895bf093dc7f4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/bf9166bac906c9e69fb7a11d94875e7ced97bcd7",
-                "reference": "bf9166bac906c9e69fb7a11d94875e7ced97bcd7",
+                "url": "https://api.github.com/repos/symfony/process/zipball/4b6a9a4013baa65d409153cbb5a895bf093dc7f4",
+                "reference": "4b6a9a4013baa65d409153cbb5a895bf093dc7f4",
                 "shasum": ""
             },
             "require": {
@@ -4938,7 +5182,21 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2020-02-07T20:06:44+00:00"
+            "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-04-15T15:56:18+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -5414,16 +5672,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.133.45",
+            "version": "3.137.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "928a23e2ee7e195a66f93d0758895e26958c3b7d"
+                "reference": "0bed146e6336ca1260e937fce2f4931681ceb3ce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/928a23e2ee7e195a66f93d0758895e26958c3b7d",
-                "reference": "928a23e2ee7e195a66f93d0758895e26958c3b7d",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0bed146e6336ca1260e937fce2f4931681ceb3ce",
+                "reference": "0bed146e6336ca1260e937fce2f4931681ceb3ce",
                 "shasum": ""
             },
             "require": {
@@ -5494,7 +5752,7 @@
                 "s3",
                 "sdk"
             ],
-            "time": "2020-03-26T18:12:15+00:00"
+            "time": "2020-05-06T18:19:09+00:00"
         },
         {
             "name": "behat/gherkin",
@@ -5969,20 +6227,21 @@
         },
         {
             "name": "doctrine/annotations",
-            "version": "v1.8.0",
+            "version": "1.10.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/annotations.git",
-                "reference": "904dca4eb10715b92569fbcd79e201d5c349b6bc"
+                "reference": "b9d758e831c70751155c698c2f7df4665314a1cb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/904dca4eb10715b92569fbcd79e201d5c349b6bc",
-                "reference": "904dca4eb10715b92569fbcd79e201d5c349b6bc",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/b9d758e831c70751155c698c2f7df4665314a1cb",
+                "reference": "b9d758e831c70751155c698c2f7df4665314a1cb",
                 "shasum": ""
             },
             "require": {
                 "doctrine/lexer": "1.*",
+                "ext-tokenizer": "*",
                 "php": "^7.1"
             },
             "require-dev": {
@@ -5992,7 +6251,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.7.x-dev"
+                    "dev-master": "1.9.x-dev"
                 }
             },
             "autoload": {
@@ -6033,7 +6292,7 @@
                 "docblock",
                 "parser"
             ],
-            "time": "2019-10-01T18:55:10+00:00"
+            "time": "2020-04-20T09:18:32+00:00"
         },
         {
             "name": "doctrine/cache",
@@ -6567,16 +6826,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "1.0.66",
+            "version": "1.0.67",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "021569195e15f8209b1c4bebb78bd66aa4f08c21"
+                "reference": "5b1f36c75c4bdde981294c2a0ebdb437ee6f275e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/021569195e15f8209b1c4bebb78bd66aa4f08c21",
-                "reference": "021569195e15f8209b1c4bebb78bd66aa4f08c21",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/5b1f36c75c4bdde981294c2a0ebdb437ee6f275e",
+                "reference": "5b1f36c75c4bdde981294c2a0ebdb437ee6f275e",
                 "shasum": ""
             },
             "require": {
@@ -6647,7 +6906,13 @@
                 "sftp",
                 "storage"
             ],
-            "time": "2020-03-17T18:58:12+00:00"
+            "funding": [
+                {
+                    "url": "https://offset.earth/frankdejonge",
+                    "type": "other"
+                }
+            ],
+            "time": "2020-04-16T13:21:26+00:00"
         },
         {
             "name": "lusitanian/oauth",
@@ -7404,24 +7669,21 @@
         },
         {
             "name": "phpdocumentor/reflection-common",
-            "version": "2.0.0",
+            "version": "2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a"
+                "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/63a995caa1ca9e5590304cd845c15ad6d482a62a",
-                "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/6568f4687e5b41b054365f9ae03fcb1ed5f2069b",
+                "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1"
             },
-            "require-dev": {
-                "phpunit/phpunit": "~6"
-            },
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -7452,7 +7714,7 @@
                 "reflection",
                 "static analysis"
             ],
-            "time": "2018-08-07T13:53:10+00:00"
+            "time": "2020-04-27T09:25:28+00:00"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
@@ -7741,21 +8003,24 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "0.12.18",
+            "version": "0.12.23",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "1ce27fe29c8660a27926127d350d53d80c4d4286"
+                "reference": "71e529efced79e055fa8318b692e7f7d03ea4e75"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/1ce27fe29c8660a27926127d350d53d80c4d4286",
-                "reference": "1ce27fe29c8660a27926127d350d53d80c4d4286",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/71e529efced79e055fa8318b692e7f7d03ea4e75",
+                "reference": "71e529efced79e055fa8318b692e7f7d03ea4e75",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1"
             },
+            "conflict": {
+                "phpstan/phpstan-shim": "*"
+            },
             "bin": [
                 "phpstan",
                 "phpstan.phar"
@@ -7776,7 +8041,21 @@
                 "MIT"
             ],
             "description": "PHPStan - PHP Static Analysis Tool",
-            "time": "2020-03-22T16:51:47+00:00"
+            "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"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -8970,16 +9249,16 @@
         },
         {
             "name": "symfony/browser-kit",
-            "version": "v4.4.5",
+            "version": "v4.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "090ce406505149d6852a7c03b0346dec3b8cf612"
+                "reference": "e4b0dc1b100bf75b5717c5b451397f230a618a42"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/090ce406505149d6852a7c03b0346dec3b8cf612",
-                "reference": "090ce406505149d6852a7c03b0346dec3b8cf612",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/e4b0dc1b100bf75b5717c5b451397f230a618a42",
+                "reference": "e4b0dc1b100bf75b5717c5b451397f230a618a42",
                 "shasum": ""
             },
             "require": {
@@ -9025,20 +9304,34 @@
             ],
             "description": "Symfony BrowserKit Component",
             "homepage": "https://symfony.com",
-            "time": "2020-02-23T10:00:59+00:00"
+            "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-03-28T10:15:50+00:00"
         },
         {
             "name": "symfony/config",
-            "version": "v4.4.5",
+            "version": "v4.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "cbfef5ae91ccd3b06621c18d58cd355c68c87ae9"
+                "reference": "8ba41fe053683e1e6e3f6fa21f07ea5c4dd9e4c0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/cbfef5ae91ccd3b06621c18d58cd355c68c87ae9",
-                "reference": "cbfef5ae91ccd3b06621c18d58cd355c68c87ae9",
+                "url": "https://api.github.com/repos/symfony/config/zipball/8ba41fe053683e1e6e3f6fa21f07ea5c4dd9e4c0",
+                "reference": "8ba41fe053683e1e6e3f6fa21f07ea5c4dd9e4c0",
                 "shasum": ""
             },
             "require": {
@@ -9089,20 +9382,34 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
-            "time": "2020-02-04T09:32:40+00:00"
+            "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-04-15T15:56:18+00:00"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v4.4.5",
+            "version": "v4.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "ebb2e882e8c9e2eb990aa61ddcd389848466e342"
+                "reference": "9d0c2807962f7f12264ab459f48fb541dbd386bd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/ebb2e882e8c9e2eb990aa61ddcd389848466e342",
-                "reference": "ebb2e882e8c9e2eb990aa61ddcd389848466e342",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/9d0c2807962f7f12264ab459f48fb541dbd386bd",
+                "reference": "9d0c2807962f7f12264ab459f48fb541dbd386bd",
                 "shasum": ""
             },
             "require": {
@@ -9162,20 +9469,34 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
-            "time": "2020-02-29T09:50:10+00:00"
+            "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-04-16T16:36:56+00:00"
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v4.4.5",
+            "version": "v4.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "11dcf08f12f29981bf770f097a5d64d65bce5929"
+                "reference": "4d0fb3374324071ecdd94898367a3fa4b5563162"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/11dcf08f12f29981bf770f097a5d64d65bce5929",
-                "reference": "11dcf08f12f29981bf770f097a5d64d65bce5929",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/4d0fb3374324071ecdd94898367a3fa4b5563162",
+                "reference": "4d0fb3374324071ecdd94898367a3fa4b5563162",
                 "shasum": ""
             },
             "require": {
@@ -9223,20 +9544,34 @@
             ],
             "description": "Symfony DomCrawler Component",
             "homepage": "https://symfony.com",
-            "time": "2020-02-29T10:05:28+00:00"
+            "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-03-29T19:12:22+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v5.0.5",
+            "version": "v5.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "6f9c2ba72f4295d7ce6cf9f79dbb18036291d335"
+                "reference": "e47fdf8b24edc12022ba52923150ec6484d7f57d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/6f9c2ba72f4295d7ce6cf9f79dbb18036291d335",
-                "reference": "6f9c2ba72f4295d7ce6cf9f79dbb18036291d335",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e47fdf8b24edc12022ba52923150ec6484d7f57d",
+                "reference": "e47fdf8b24edc12022ba52923150ec6484d7f57d",
                 "shasum": ""
             },
             "require": {
@@ -9278,20 +9613,34 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2020-02-14T07:43:07+00:00"
+            "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-04-18T20:50:06+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v5.0.5",
+            "version": "v5.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "9b3e5b5e58c56bbd76628c952d2b78556d305f3c"
+                "reference": "5d6c81c39225a750f3f43bee15f03093fb9aaa0b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/9b3e5b5e58c56bbd76628c952d2b78556d305f3c",
-                "reference": "9b3e5b5e58c56bbd76628c952d2b78556d305f3c",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/5d6c81c39225a750f3f43bee15f03093fb9aaa0b",
+                "reference": "5d6c81c39225a750f3f43bee15f03093fb9aaa0b",
                 "shasum": ""
             },
             "require": {
@@ -9340,20 +9689,34 @@
                 "mime",
                 "mime-type"
             ],
-            "time": "2020-02-04T09:41:09+00:00"
+            "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-04-17T03:29:44+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v4.4.5",
+            "version": "v4.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "9a02d6662660fe7bfadad63b5f0b0718d4c8b6b0"
+                "reference": "ade3d89dd3b875b83c8cff2980c9bb0daf6ef297"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/9a02d6662660fe7bfadad63b5f0b0718d4c8b6b0",
-                "reference": "9a02d6662660fe7bfadad63b5f0b0718d4c8b6b0",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/ade3d89dd3b875b83c8cff2980c9bb0daf6ef297",
+                "reference": "ade3d89dd3b875b83c8cff2980c9bb0daf6ef297",
                 "shasum": ""
             },
             "require": {
@@ -9394,69 +9757,21 @@
                 "configuration",
                 "options"
             ],
-            "time": "2020-01-04T13:00:46+00:00"
-        },
-        {
-            "name": "symfony/polyfill-intl-idn",
-            "version": "v1.15.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf",
-                "reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "symfony/polyfill-mbstring": "^1.3",
-                "symfony/polyfill-php72": "^1.10"
-            },
-            "suggest": {
-                "ext-intl": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.15-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Idn\\": ""
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
                 },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
                 {
-                    "name": "Laurent Bassin",
-                    "email": "laurent@bassin.info"
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
                 },
                 {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
                 }
             ],
-            "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "idn",
-                "intl",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2020-03-09T19:04:49+00:00"
+            "time": "2020-04-06T10:16:26+00:00"
         },
         {
             "name": "symfony/polyfill-php70",
@@ -9517,73 +9832,18 @@
             ],
             "time": "2020-02-27T09:26:54+00:00"
         },
-        {
-            "name": "symfony/polyfill-php72",
-            "version": "v1.15.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "37b0976c78b94856543260ce09b460a7bc852747"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/37b0976c78b94856543260ce09b460a7bc852747",
-                "reference": "37b0976c78b94856543260ce09b460a7bc852747",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.15-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php72\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2020-02-27T09:26:54+00:00"
-        },
         {
             "name": "symfony/stopwatch",
-            "version": "v4.4.5",
+            "version": "v4.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "abc08d7c48987829bac301347faa10f7e8bbf4fb"
+                "reference": "e0324d3560e4128270e3f08617480d9233d81cfc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/abc08d7c48987829bac301347faa10f7e8bbf4fb",
-                "reference": "abc08d7c48987829bac301347faa10f7e8bbf4fb",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/e0324d3560e4128270e3f08617480d9233d81cfc",
+                "reference": "e0324d3560e4128270e3f08617480d9233d81cfc",
                 "shasum": ""
             },
             "require": {
@@ -9620,20 +9880,34 @@
             ],
             "description": "Symfony Stopwatch Component",
             "homepage": "https://symfony.com",
-            "time": "2020-01-04T13:00:46+00:00"
+            "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-03-27T16:54:36+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v4.4.5",
+            "version": "v4.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "94d005c176db2080e98825d98e01e8b311a97a88"
+                "reference": "b385dce1c0e9f839b384af90188638819433e252"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/94d005c176db2080e98825d98e01e8b311a97a88",
-                "reference": "94d005c176db2080e98825d98e01e8b311a97a88",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/b385dce1c0e9f839b384af90188638819433e252",
+                "reference": "b385dce1c0e9f839b384af90188638819433e252",
                 "shasum": ""
             },
             "require": {
@@ -9679,7 +9953,21 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2020-02-03T10:46:43+00:00"
+            "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-04-28T17:55:16+00:00"
         },
         {
             "name": "theseer/fdomdocument",
@@ -9763,25 +10051,31 @@
         },
         {
             "name": "vlucas/phpdotenv",
-            "version": "v2.6.1",
+            "version": "v2.6.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "2a7dcf7e3e02dc5e701004e51a6f304b713107d5"
+                "reference": "67d472b1794c986381a8950e4958e1adb779d561"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2a7dcf7e3e02dc5e701004e51a6f304b713107d5",
-                "reference": "2a7dcf7e3e02dc5e701004e51a6f304b713107d5",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/67d472b1794c986381a8950e4958e1adb779d561",
+                "reference": "67d472b1794c986381a8950e4958e1adb779d561",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.9",
+                "php": "^5.3.9 || ^7.0 || ^8.0",
                 "symfony/polyfill-ctype": "^1.9"
             },
             "require-dev": {
+                "ext-filter": "*",
+                "ext-pcre": "*",
                 "phpunit/phpunit": "^4.8.35 || ^5.0"
             },
+            "suggest": {
+                "ext-filter": "Required to use the boolean validator.",
+                "ext-pcre": "Required to use most of the library."
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -9798,10 +10092,15 @@
                 "BSD-3-Clause"
             ],
             "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "graham@alt-three.com",
+                    "homepage": "https://gjcampbell.co.uk/"
+                },
                 {
                     "name": "Vance Lucas",
                     "email": "vance@vancelucas.com",
-                    "homepage": "http://www.vancelucas.com"
+                    "homepage": "https://vancelucas.com/"
                 }
             ],
             "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
@@ -9810,20 +10109,30 @@
                 "env",
                 "environment"
             ],
-            "time": "2019-01-29T11:11:52+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-05-02T13:38:00+00:00"
         },
         {
             "name": "webmozart/assert",
-            "version": "1.7.0",
+            "version": "1.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozart/assert.git",
-                "reference": "aed98a490f9a8f78468232db345ab9cf606cf598"
+                "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/aed98a490f9a8f78468232db345ab9cf606cf598",
-                "reference": "aed98a490f9a8f78468232db345ab9cf606cf598",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/ab2cb0b3b559010b75981b1bdce728da3ee90ad6",
+                "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6",
                 "shasum": ""
             },
             "require": {
@@ -9831,7 +10140,7 @@
                 "symfony/polyfill-ctype": "^1.8"
             },
             "conflict": {
-                "vimeo/psalm": "<3.6.0"
+                "vimeo/psalm": "<3.9.1"
             },
             "require-dev": {
                 "phpunit/phpunit": "^4.8.36 || ^7.5.13"
@@ -9858,7 +10167,7 @@
                 "check",
                 "validate"
             ],
-            "time": "2020-02-14T12:15:55+00:00"
+            "time": "2020-04-18T12:12:48+00:00"
         },
         {
             "name": "weew/helpers-array",
@@ -9926,5 +10235,6 @@
         "ext-zip": "*",
         "lib-libxml": "*"
     },
-    "platform-dev": []
+    "platform-dev": [],
+    "plugin-api-version": "1.1.0"
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartSingleMutationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartSingleMutationTest.php
new file mode 100644
index 0000000000000..4a7b181295d92
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartSingleMutationTest.php
@@ -0,0 +1,225 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Bundle;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test adding bundled products to cart using the unified mutation mutation
+ */
+class AddBundleProductToCartSingleMutationTest extends GraphQlAbstract
+{
+    /**
+     * @var QuoteResource
+     */
+    private $quoteResource;
+
+    /**
+     * @var Quote
+     */
+    private $quote;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedId;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->quoteResource = $objectManager->get(QuoteResource::class);
+        $this->quote = $objectManager->create(Quote::class);
+        $this->quoteIdToMaskedId = $objectManager->get(QuoteIdToMaskedQuoteIdInterface::class);
+        $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Bundle/_files/product_1.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     */
+    public function testAddBundleProductToCart()
+    {
+        $sku = 'bundle-product';
+
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_1',
+            'reserved_order_id'
+        );
+
+        $product = $this->productRepository->get($sku);
+
+        /** @var $typeInstance \Magento\Bundle\Model\Product\Type */
+        $typeInstance = $product->getTypeInstance();
+        $typeInstance->setStoreFilter($product->getStoreId(), $product);
+        /** @var $option \Magento\Bundle\Model\Option */
+        $option = $typeInstance->getOptionsCollection($product)->getFirstItem();
+        /** @var \Magento\Catalog\Model\Product $selection */
+        $selection = $typeInstance->getSelectionsCollection([$option->getId()], $product)->getFirstItem();
+        $optionId = $option->getId();
+        $selectionId = $selection->getSelectionId();
+
+        $bundleOptionIdV2 = $this->generateBundleOptionIdV2((int) $optionId, (int) $selectionId, 1);
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        $query = <<<QUERY
+mutation {
+    addProductsToCart(
+        cart_id: "{$maskedQuoteId}",
+        cart_items: [
+            {
+                sku: "{$sku}"
+                quantity: 1
+                selected_options: [
+                    "{$bundleOptionIdV2}"
+                ]
+            }
+        ]
+    ) {
+        cart {
+            items {
+                id
+                quantity
+                product {
+                sku
+            }
+            ... on BundleCartItem {
+                bundle_options {
+                    id
+                    label
+                    type
+                    values {
+                        id
+                        label
+                        price
+                        quantity
+                    }
+                }
+            }
+          }
+        }
+    }
+}
+QUERY;
+
+        $response = $this->graphQlMutation($query);
+
+        self::assertArrayHasKey('addProductsToCart', $response);
+        self::assertArrayHasKey('cart', $response['addProductsToCart']);
+        $cart = $response['addProductsToCart']['cart'];
+        $bundleItem = current($cart['items']);
+        self::assertEquals($sku, $bundleItem['product']['sku']);
+        $bundleItemOption = current($bundleItem['bundle_options']);
+        self::assertEquals($optionId, $bundleItemOption['id']);
+        self::assertEquals($option->getTitle(), $bundleItemOption['label']);
+        self::assertEquals($option->getType(), $bundleItemOption['type']);
+        $value = current($bundleItemOption['values']);
+        self::assertEquals($selection->getSelectionId(), $value['id']);
+        self::assertEquals((float) $selection->getSelectionPriceValue(), $value['price']);
+        self::assertEquals(1, $value['quantity']);
+    }
+
+    /**
+     * @param int $optionId
+     * @param int $selectionId
+     * @param int $quantity
+     * @return string
+     */
+    private function generateBundleOptionIdV2(int $optionId, int $selectionId, int $quantity): string
+    {
+        return base64_encode("bundle/$optionId/$selectionId/$quantity");
+    }
+
+    public function dataProviderTestUpdateBundleItemQuantity(): array
+    {
+        return [
+            [2],
+            [0],
+        ];
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Bundle/_files/product_1.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     * @expectedExceptionMessage Please select all required options
+     */
+    public function testAddBundleToCartWithWrongBundleOptions()
+    {
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_1',
+            'reserved_order_id'
+        );
+
+        $bundleOptionIdV2 = $this->generateBundleOptionIdV2((int) 1, (int) 1, 1);
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        $query = <<<QUERY
+mutation {
+      addProductsToCart(
+            cart_id: "{$maskedQuoteId}",
+            cart_items: [
+                {
+                    sku: "bundle-product"
+                    quantity: 1
+                    selected_options: [
+                        "{$bundleOptionIdV2}"
+                    ]
+                }
+            ]
+       ) {
+    cart {
+        items {
+            id
+            quantity
+            product {
+                sku
+            }
+            ... on BundleCartItem {
+                bundle_options {
+                    id
+                    label
+                    type
+                    values {
+                        id
+                        label
+                        price
+                        quantity
+                    }
+                }
+            }
+        }
+    }
+    userInputErrors {
+        message
+    }
+  }
+}
+QUERY;
+
+        $response = $this->graphQlMutation($query);
+
+        self::assertEquals(
+            "Please select all required options.",
+            $response['addProductsToCart']['userInputErrors'][0]['message']
+        );
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartSingleMutationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartSingleMutationTest.php
new file mode 100644
index 0000000000000..a56d55528b59b
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartSingleMutationTest.php
@@ -0,0 +1,292 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\ConfigurableProduct;
+
+use Exception;
+use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Add configurable product to cart testcases
+ */
+class AddConfigurableProductToCartSingleMutationTest extends GraphQlAbstract
+{
+    /**
+     * @var GetMaskedQuoteIdByReservedOrderId
+     */
+    private $getMaskedQuoteIdByReservedOrderId;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     */
+    public function testAddConfigurableProductToCart()
+    {
+        $product = $this->getConfigurableProductInfo();
+        $quantity = 2;
+        $parentSku = $product['sku'];
+        $attributeId = (int) $product['configurable_options'][0]['attribute_id'];
+        $valueIndex = $product['configurable_options'][0]['values'][1]['value_index'];
+
+        $selectedConfigurableOptionsQuery = $this->generateSuperAttributesIdV2Query($attributeId, $valueIndex);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
+
+        $query = $this->getQuery(
+            $maskedQuoteId,
+            $product['sku'],
+            2,
+            $selectedConfigurableOptionsQuery
+        );
+
+        $response = $this->graphQlMutation($query);
+
+        $cartItem = current($response['addProductsToCart']['cart']['items']);
+        self::assertEquals($quantity, $cartItem['quantity']);
+        self::assertEquals($parentSku, $cartItem['product']['sku']);
+        self::assertArrayHasKey('configurable_options', $cartItem);
+
+        $option = current($cartItem['configurable_options']);
+        self::assertEquals($attributeId, $option['id']);
+        self::assertEquals($valueIndex, $option['value_id']);
+        self::assertArrayHasKey('option_label', $option);
+        self::assertArrayHasKey('value_label', $option);
+    }
+
+    /**
+     * Generates Id_v2 for super configurable product super attributes
+     *
+     * @param int $attributeId
+     * @param int $valueIndex
+     * @return string
+     */
+    private function generateSuperAttributesIdV2Query(int $attributeId, int $valueIndex): string
+    {
+        return 'selected_options: ["' . base64_encode("configurable/$attributeId/$valueIndex") . '"]';
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/configurable_products_with_custom_attribute_layered_navigation.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     */
+    public function testAddConfigurableProductWithWrongSuperAttributes()
+    {
+        $product = $this->getConfigurableProductInfo();
+        $quantity = 2;
+        $parentSku = $product['sku'];
+
+        $selectedConfigurableOptionsQuery = $this->generateSuperAttributesIdV2Query(0, 0);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
+
+        $query = $this->getQuery(
+            $maskedQuoteId,
+            $parentSku,
+            $quantity,
+            $selectedConfigurableOptionsQuery
+        );
+
+        $response =  $this->graphQlMutation($query);
+
+        self::assertEquals(
+            'You need to choose options for your item.',
+            $response['addProductsToCart']['userInputErrors'][0]['message']
+        );
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/product_configurable_sku.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     */
+    public function testAddProductIfQuantityIsNotAvailable()
+    {
+        $product = $this->getConfigurableProductInfo();
+        $parentSku = $product['sku'];
+        $attributeId = (int) $product['configurable_options'][0]['attribute_id'];
+        $valueIndex = $product['configurable_options'][0]['values'][1]['value_index'];
+
+        $selectedConfigurableOptionsQuery = $this->generateSuperAttributesIdV2Query($attributeId, $valueIndex);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
+
+        $query = $this->getQuery(
+            $maskedQuoteId,
+            $parentSku,
+            2000,
+            $selectedConfigurableOptionsQuery
+        );
+
+        $response = $this->graphQlMutation($query);
+
+        self::assertEquals(
+            'Could not add the product with SKU configurable to the shopping cart: The requested qty is not available',
+            $response['addProductsToCart']['userInputErrors'][0]['message']
+        );
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/product_configurable_sku.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     */
+    public function testAddNonExistentConfigurableProductParentToCart()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
+        $parentSku = 'configurable_no_exist';
+
+        $query = $this->getQuery(
+            $maskedQuoteId,
+            $parentSku,
+            1,
+            ''
+        );
+
+        $response = $this->graphQlMutation($query);
+
+        self::assertEquals(
+            'Could not find a product with SKU "configurable_no_exist"',
+            $response['addProductsToCart']['userInputErrors'][0]['message']
+        );
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/product_configurable_zero_qty_first_child.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     */
+    public function testOutOfStockVariationToCart()
+    {
+        $product = $this->getConfigurableProductInfo();
+        $attributeId = (int) $product['configurable_options'][0]['attribute_id'];
+        $valueIndex = $product['configurable_options'][0]['values'][0]['value_index'];
+        $parentSku = $product['sku'];
+
+        $configurableOptionsQuery = $this->generateSuperAttributesIdV2Query($attributeId, $valueIndex);
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
+
+        $query = $this->getQuery(
+            $maskedQuoteId,
+            $parentSku,
+            1,
+            $configurableOptionsQuery
+        );
+
+        $response = $this->graphQlMutation($query);
+
+        $expectedErrorMessage = 'Could not add the product with SKU configurable to the shopping cart: ' .
+            'There are no source items with the in stock status';
+        self::assertEquals($expectedErrorMessage, $response['addProductsToCart']['userInputErrors'][0]['message']);
+    }
+
+    /**
+     * @param string $maskedQuoteId
+     * @param string $parentSku
+     * @param int $quantity
+     * @param string $selectedOptionsQuery
+     * @return string
+     */
+    private function getQuery(
+        string $maskedQuoteId,
+        string $parentSku,
+        int $quantity,
+        string $selectedOptionsQuery
+    ): string {
+        return <<<QUERY
+mutation {
+    addProductsToCart(
+        cart_id:"{$maskedQuoteId}"
+        cart_items: [
+            {
+                sku: "{$parentSku}"
+                quantity: $quantity
+                {$selectedOptionsQuery}
+            }
+        ]
+    ) {
+        cart {
+            items {
+                id
+                quantity
+                product {
+                    sku
+                }
+                ... on ConfigurableCartItem {
+                    configurable_options {
+                        id
+                        option_label
+                        value_id
+                        value_label
+                    }
+                }
+            }
+        },
+        userInputErrors {
+            message
+        }
+    }
+}
+QUERY;
+    }
+
+    /**
+     * Returns information about testable configurable product retrieved from GraphQl query
+     *
+     * @return array
+     * @throws Exception
+     */
+    private function getConfigurableProductInfo(): array
+    {
+        $searchResponse = $this->graphQlQuery($this->getFetchProductQuery('configurable'));
+        return current($searchResponse['products']['items']);
+    }
+
+    /**
+     * Returns GraphQl query for fetching configurable product information
+     *
+     * @param string $term
+     * @return string
+     */
+    private function getFetchProductQuery(string $term): string
+    {
+        return <<<QUERY
+{
+  products(
+    search:"{$term}"
+    pageSize:1
+  ) {
+    items {
+      sku
+      ... on ConfigurableProduct {
+        configurable_options {
+          attribute_id
+          attribute_code
+          id
+          label
+          position
+          product_id
+          use_default
+          values {
+            default_label
+            label
+            store_label
+            use_default_value
+            value_index
+          }
+        }
+      }
+    }
+  }
+}
+QUERY;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddDownloadableProductToCartSingleMutationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddDownloadableProductToCartSingleMutationTest.php
new file mode 100644
index 0000000000000..50a17aa22c040
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddDownloadableProductToCartSingleMutationTest.php
@@ -0,0 +1,211 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\ObjectManager\ObjectManager;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test cases for adding downloadable product with custom options to cart using the single add to cart mutation.
+ */
+class AddDownloadableProductToCartSingleMutationTest extends GraphQlAbstract
+{
+    /**
+     * @var GetMaskedQuoteIdByReservedOrderId
+     */
+    private $getMaskedQuoteIdByReservedOrderId;
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var GetCustomOptionsWithIDV2ForQueryBySku
+     */
+    private $getCustomOptionsWithIDV2ForQueryBySku;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->getMaskedQuoteIdByReservedOrderId = $this->objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+        $this->getCustomOptionsWithIDV2ForQueryBySku =
+            $this->objectManager->get(GetCustomOptionsWithIDV2ForQueryBySku::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Downloadable/_files/product_downloadable_with_custom_options.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     */
+    public function testAddDownloadableProductWithOptions()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
+
+        $sku = 'downloadable-product-with-purchased-separately-links';
+        $qty = 1;
+        $links = $this->getProductsLinks($sku);
+        $linkId = key($links);
+
+        $itemOptions = $this->getCustomOptionsWithIDV2ForQueryBySku->execute($sku);
+        $decodedItemOptions = $this->decodeCustomOptions($itemOptions);
+
+        /* Add downloadable product link data to the "selected_options" */
+        $itemOptions['selected_options'][] = $this->generateProductLinkSelectedOptions($linkId);
+
+        $productOptionsQuery = preg_replace(
+            '/"([^"]+)"\s*:\s*/',
+            '$1:',
+            json_encode($itemOptions)
+        );
+
+        $query = $this->getQuery($maskedQuoteId, $qty, $sku, trim($productOptionsQuery, '{}'));
+        $response = $this->graphQlMutation($query);
+
+        self::assertArrayHasKey('items', $response['addProductsToCart']['cart']);
+        self::assertCount($qty, $response['addProductsToCart']['cart']);
+        self::assertEquals($linkId, $response['addProductsToCart']['cart']['items'][0]['links'][0]['id']);
+
+        $customizableOptionsOutput =
+            $response['addProductsToCart']['cart']['items'][0]['customizable_options'];
+
+        foreach ($customizableOptionsOutput as $customizableOptionOutput) {
+            $customizableOptionOutputValues = [];
+            foreach ($customizableOptionOutput['values'] as $customizableOptionOutputValue) {
+                $customizableOptionOutputValues[] =  $customizableOptionOutputValue['value'];
+            }
+            if (count($customizableOptionOutputValues) === 1) {
+                $customizableOptionOutputValues = $customizableOptionOutputValues[0];
+            }
+
+            self::assertEquals(
+                $decodedItemOptions[$customizableOptionOutput['id']],
+                $customizableOptionOutputValues
+            );
+        }
+    }
+
+    /**
+     * Function returns array of all product's links
+     *
+     * @param string $sku
+     * @return array
+     */
+    private function getProductsLinks(string $sku) : array
+    {
+        $result = [];
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+
+        $product = $productRepository->get($sku, false, null, true);
+
+        foreach ($product->getDownloadableLinks() as $linkObject) {
+            $result[$linkObject->getLinkId()] = [
+                'title' => $linkObject->getTitle(),
+                'link_type' => null, //deprecated field
+                'price' => $linkObject->getPrice(),
+            ];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Generates Id_v2 for downloadable links
+     *
+     * @param int $linkId
+     * @return string
+     */
+    private function generateProductLinkSelectedOptions(int $linkId): string
+    {
+        return base64_encode("downloadable/$linkId");
+    }
+
+    /**
+     * Decodes ID_v2 for customizable options and returns [ID] = value pairs
+     *
+     * @param array $encodedCustomOptions
+     * @return array
+     */
+    private function decodeCustomOptions(array $encodedCustomOptions): array
+    {
+        $customOptions = [];
+
+        foreach ($encodedCustomOptions['selected_options'] as $selectedOption) {
+            [,$optionId, $optionValueId] = explode('/', base64_decode($selectedOption));
+            if (isset($customOptions[$optionId])) {
+                $customOptions[$optionId] = [$customOptions[$optionId], $optionValueId];
+            } else {
+                $customOptions[$optionId] = $optionValueId;
+            }
+
+        }
+
+        foreach ($encodedCustomOptions['entered_options'] as $enteredOption) {
+            [,$optionId] = explode('/', base64_decode($enteredOption['id']));
+            $customOptions[$optionId] = $enteredOption['value'];
+        }
+
+        return $customOptions;
+    }
+
+    /**
+     * Returns GraphQl query string
+     *
+     * @param string $maskedQuoteId
+     * @param int $qty
+     * @param string $sku
+     * @param string $customizableOptions
+     * @return string
+     */
+    private function getQuery(
+        string $maskedQuoteId,
+        int $qty,
+        string $sku,
+        string $customizableOptions
+    ): string {
+        return <<<MUTATION
+mutation {
+    addProductsToCart(
+        cart_id: "{$maskedQuoteId}",
+        cart_items: [
+            {
+                sku: "{$sku}"
+                quantity: {$qty}
+                {$customizableOptions}
+            }
+        ]
+    ) {
+        cart {
+            items {
+                quantity
+                ... on DownloadableCartItem {
+                    links {
+                        id
+                    }
+                    customizable_options {
+                        label
+                        id
+                          values {
+                            value
+                        }
+                    }
+                }
+            }
+        },
+        userInputErrors {
+            message
+        }
+    }
+}
+MUTATION;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCustomOptionsWithIDV2ForQueryBySku.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCustomOptionsWithIDV2ForQueryBySku.php
new file mode 100644
index 0000000000000..1d0bae2d72e3d
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCustomOptionsWithIDV2ForQueryBySku.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote;
+
+use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface;
+
+/**
+ * Generate an array with test values for customizable options with encoded id_v2 value
+ */
+class GetCustomOptionsWithIDV2ForQueryBySku
+{
+    /**
+     * @var ProductCustomOptionRepositoryInterface
+     */
+    private $productCustomOptionRepository;
+
+    /**
+     * @param ProductCustomOptionRepositoryInterface $productCustomOptionRepository
+     */
+    public function __construct(ProductCustomOptionRepositoryInterface $productCustomOptionRepository)
+    {
+        $this->productCustomOptionRepository = $productCustomOptionRepository;
+    }
+
+    /**
+     * Returns array of custom options for the product
+     *
+     * @param string $sku
+     * @return array
+     */
+    public function execute(string $sku): array
+    {
+        $customOptions = $this->productCustomOptionRepository->getList($sku);
+        $selectedOptions = [];
+        $enteredOptions = [];
+
+        foreach ($customOptions as $customOption) {
+            $optionType = $customOption->getType();
+
+            if ($optionType === 'field' || $optionType === 'area' || $optionType === 'date') {
+                $enteredOptions[] = [
+                    'id' => $this->encodeEnteredOption((int) $customOption->getOptionId()),
+                    'value' => '2012-12-12'
+                ];
+            } elseif ($optionType === 'drop_down') {
+                $optionSelectValues = $customOption->getValues();
+                $selectedOptions[] = $this->encodeSelectedOption(
+                    (int) $customOption->getOptionId(),
+                    (int) reset($optionSelectValues)->getOptionTypeId()
+                );
+            } elseif ($optionType === 'multiple') {
+                foreach ($customOption->getValues() as $optionValue) {
+                    $selectedOptions[] = $this->encodeSelectedOption(
+                        (int) $customOption->getOptionId(),
+                        (int) $optionValue->getOptionTypeId()
+                    );
+                }
+            }
+        }
+
+        return [
+            'selected_options' => $selectedOptions,
+            'entered_options' => $enteredOptions
+        ];
+    }
+
+    /**
+     * Returns id_v2 of the selected custom option
+     *
+     * @param int $optionId
+     * @param int $optionValueId
+     * @return string
+     */
+    private function encodeSelectedOption(int $optionId, int $optionValueId): string
+    {
+        return base64_encode("custom-option/$optionId/$optionValueId");
+    }
+
+    /**
+     * Returns id_v2 of the entered custom option
+     *
+     * @param int $optionId
+     * @return string
+     */
+    private function encodeEnteredOption(int $optionId): string
+    {
+        return base64_encode("custom-option/$optionId");
+    }
+}
diff --git a/vendor/.htaccess b/vendor/.htaccess
deleted file mode 100644
index b97408bad3f2e..0000000000000
--- a/vendor/.htaccess
+++ /dev/null
@@ -1,7 +0,0 @@
-<IfVersion < 2.4>
-    order allow,deny
-    deny from all
-</IfVersion>
-<IfVersion >= 2.4>
-    Require all denied
-</IfVersion>

From 2c0636b9f4333c4b1ff58c6c56b4bdd3dc6facfb Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Thu, 7 May 2020 19:56:26 +0300
Subject: [PATCH 0235/1718] MC-29420: Remove event handlers from CE

---
 .../adminhtml/templates/payment/script.phtml  | 24 +++++++++++
 .../Composite/Fieldset/Options/Type/Radio.php |  2 +-
 .../Fieldset/Options/Type/Select.php          |  2 +-
 .../Sales/Order/View/Items/Renderer.php       | 24 +++++++++--
 .../sales/order/view/items/renderer.phtml     |  6 +--
 .../Composite/Fieldset/Configurable.php       |  6 +--
 .../System/Config/Fieldset/Payment.php        |  4 +-
 .../templates/product/layered/renderer.phtml  |  5 +--
 app/code/Magento/Tax/Block/Checkout/Tax.php   | 40 +++++++++++++++++++
 .../templates/checkout/grandtotal.phtml       | 14 ++++++-
 .../templates/checkout/shipping.phtml         | 18 ++++++++-
 .../templates/checkout/subtotal.phtml         | 15 +++++--
 .../frontend/templates/checkout/tax.phtml     | 20 ++++++----
 13 files changed, 147 insertions(+), 33 deletions(-)

diff --git a/app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/templates/payment/script.phtml b/app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/templates/payment/script.phtml
index e69de29bb2d1d..6be6008dba507 100644
--- a/app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/templates/payment/script.phtml
+++ b/app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/templates/payment/script.phtml
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var Magento\AuthorizenetAcceptjs\Block\Payment $block */
+?>
+<script>
+    //<![CDATA[
+    require(
+        [
+            'Magento_AuthorizenetAcceptjs/js/authorizenet',
+            'jquery',
+            'domReady!'
+        ], function(AuthorizenetAcceptjs, $) {
+            var config = <?= /* @noEscape */ $block->getPaymentConfig() ?>,
+                form = $('#payment_form_<?= /* @noEscape */ $block->escapeJs($block->escapeHtml($block->getMethodCode())) ?>');
+
+            config.active = form.length > 0 && !form.is(':hidden');
+            new AuthorizenetAcceptjs(config);
+        });
+    //]]>
+</script>
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php
index e5d2e3e830379..a9b8f7880cac3 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php
@@ -81,6 +81,6 @@ public function setValidationContainer($elementId, $containerId)
             $containerId .
             '\';';
 
-        return /* @noEscape */ $this->secureRenderer->renderTag('script', [], $scriptString, false);
+        return $this->secureRenderer->renderTag('script', [], $scriptString, false);
     }
 }
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php
index 0f0f4a62eb7fc..948d0c4a84c92 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php
@@ -80,6 +80,6 @@ public function setValidationContainer($elementId, $containerId)
             $containerId .
             '\';';
 
-        return /* @noEscape */ $this->secureRenderer->renderTag('script', [], $scriptString, false);
+        return $this->secureRenderer->renderTag('script', [], $scriptString, false);
     }
 }
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php b/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php
index 9fe8891254a5a..dee924ae3cf5e 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php
@@ -6,7 +6,9 @@
 namespace Magento\Bundle\Block\Adminhtml\Sales\Order\View\Items;
 
 use Magento\Catalog\Model\Product\Type\AbstractType;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Catalog\Helper\Data as CatalogHelper;
 
 /**
  * Adminhtml sales order item renderer
@@ -32,6 +34,7 @@ class Renderer extends \Magento\Sales\Block\Adminhtml\Order\View\Items\Renderer\
      * @param \Magento\Checkout\Helper\Data $checkoutHelper
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json $serializer
+     * @param CatalogHelper|null $catalogHelper
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -41,10 +44,11 @@ public function __construct(
         \Magento\GiftMessage\Helper\Message $messageHelper,
         \Magento\Checkout\Helper\Data $checkoutHelper,
         array $data = [],
-        Json $serializer = null
+        Json $serializer = null,
+        ?CatalogHelper $catalogHelper = null
     ) {
-        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(Json::class);
+        $this->serializer = $serializer ?? ObjectManager::getInstance()->get(Json::class);
+        $data['catalogHelper'] = $catalogHelper ?? ObjectManager::getInstance()->get(CatalogHelper::class);
 
         parent::__construct(
             $context,
@@ -63,7 +67,7 @@ public function __construct(
      * @param string $value
      * @param int $length
      * @param string $etc
-     * @param string &$remainder
+     * @param string $remainder
      * @param bool $breakWords
      * @return string
      */
@@ -76,6 +80,8 @@ public function truncateString($value, $length = 80, $etc = '...', &$remainder =
     }
 
     /**
+     * Get is shipment separately.
+     *
      * @param null|object $item
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
@@ -109,6 +115,8 @@ public function isShipmentSeparately($item = null)
     }
 
     /**
+     * Get is child calculated.
+     *
      * @param null|object $item
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
@@ -144,6 +152,8 @@ public function isChildCalculated($item = null)
     }
 
     /**
+     * Return selection attributes.
+     *
      * @param mixed $item
      * @return mixed
      */
@@ -161,6 +171,8 @@ public function getSelectionAttributes($item)
     }
 
     /**
+     * Return order options.
+     *
      * @return array
      */
     public function getOrderOptions()
@@ -182,6 +194,8 @@ public function getOrderOptions()
     }
 
     /**
+     * Return value html.
+     *
      * @param object $item
      * @return string
      */
@@ -204,6 +218,8 @@ public function getValueHtml($item)
     }
 
     /**
+     * Return can show price.
+     *
      * @param object $item
      * @return bool
      */
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
index c8d3a9b1f091c..9620f648ae3b8 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
@@ -16,8 +16,8 @@
 <?php $_count = count($items) ?>
 <?php $_index = 0 ?>
 <?php
-/** @var \Magento\Framework\Json\Helper\Data $helper */
-$helper = $block->getData('jsonHelper');
+/** @var \Magento\Catalog\Helper\Data $catalogHelper */
+$catalogHelper = $block->getData('catalogHelper');
 ?>
 
 <?php $_prevOptionId = '' ?>
@@ -58,7 +58,7 @@ $helper = $block->getData('jsonHelper');
             </div>
             <div class="product-sku-block">
                 <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
-                <?= /* @noEscape */ implode('<br />', $helper->splitSku($_item->getSku())) ?>
+                <?= /* @noEscape */ implode('<br />', $catalogHelper->splitSku($_item->getSku())) ?>
             </div>
         </td>
         <?php else: ?>
diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Composite/Fieldset/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Composite/Fieldset/Configurable.php
index 34d4d22dd09bc..1718a460d7544 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Composite/Fieldset/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Composite/Fieldset/Configurable.php
@@ -37,7 +37,6 @@ class Configurable extends \Magento\ConfigurableProduct\Block\Product\View\Type\
      * @param Format|null $localeFormat
      * @param Session|null $customerSession
      * @param \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices|null $variationPrices
-     * @param ProductHelper|null $productHelper
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -51,10 +50,9 @@ public function __construct(
         array $data = [],
         Format $localeFormat = null,
         Session $customerSession = null,
-        \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices $variationPrices = null,
-        ?ProductHelper $productHelper = null
+        \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices $variationPrices = null
     ) {
-        $data['productHelper'] = $productHelper ?? ObjectManager::getInstance()->get(ProductHelper::class);
+        $data['productHelper'] = $catalogProduct;
         parent::__construct(
             $context,
             $arrayUtils,
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php
index 24d7db0058045..d34646a4138eb 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Payment.php
@@ -112,7 +112,7 @@ protected function _getHeaderTitleHtml($element)
         $html .= /* @noEscape */ $this->secureRenderer->renderEventListenerAsTag(
             'onclick',
             "paypalToggleSolution.call(this, '" . $htmlId . "', '" . $this->getUrl('adminhtml/*/state') .
-            "'); return false;",
+            "');event.preventDefault();",
             'button#' . $htmlId . '-head'
         );
 
@@ -177,7 +177,7 @@ protected function _getExtraJs($element)
                 var doScroll = false;
                 Fieldset.toggleCollapse(id, url);
                 if ($(this).hasClassName(\"open\")) {
-                    $$(\".with-button button.button\").each(function(anotherButton) {
+                    \$$(\".with-button button.button\").each(function(anotherButton) {
                         if (anotherButton != this && $(anotherButton).hasClassName(\"open\")) {
                             $(anotherButton).click();
                             doScroll = true;
diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
index 55fd7af1ed4e5..971dddfd40e68 100644
--- a/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
+++ b/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
@@ -50,10 +50,7 @@
                                  data-option-id="<?= $block->escapeHtmlAttr($option) ?>"
                                  data-option-label="<?= $block->escapeHtmlAttr($label['label']) ?>"
                                  data-option-tooltip-thumb="<?= $block->escapeUrl($swatchThumbPath) ?>"
-                                 data-option-tooltip-value=""
-                                 style="background: url(<?=
-                                 /*  @noEscape */ $escapedUrl
-                                                        ?>) no-repeat center; background-size: initial;">
+                                 data-option-tooltip-value="">
                             </div>
                             <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
                                 "background: url(" . /*  @noEscape */ $escapedUrl .
diff --git a/app/code/Magento/Tax/Block/Checkout/Tax.php b/app/code/Magento/Tax/Block/Checkout/Tax.php
index 0a86c0312ab1c..a53db42be2ad6 100644
--- a/app/code/Magento/Tax/Block/Checkout/Tax.php
+++ b/app/code/Magento/Tax/Block/Checkout/Tax.php
@@ -9,8 +9,48 @@
  */
 namespace Magento\Tax\Block\Checkout;
 
+use Magento\Checkout\Helper\Data as CheckoutHelper;
+use Magento\Framework\App\ObjectManager;
+use Magento\Tax\Helper\Data as TaxHelper;
+use Magento\Sales\Model\ConfigInterface;
+
+/**
+ * Class for manage tax amount.
+ */
 class Tax extends \Magento\Checkout\Block\Total\DefaultTotal
 {
+    /**
+     * @param \Magento\Framework\View\Element\Template\Context $context
+     * @param \Magento\Customer\Model\Session $customerSession
+     * @param \Magento\Checkout\Model\Session $checkoutSession
+     * @param ConfigInterface $salesConfig
+     * @param array $layoutProcessors
+     * @param array $data
+     * @param CheckoutHelper|null $checkoutHelper
+     * @param TaxHelper|null $taxHelper
+     */
+    public function __construct(
+        \Magento\Framework\View\Element\Template\Context $context,
+        \Magento\Customer\Model\Session $customerSession,
+        \Magento\Checkout\Model\Session $checkoutSession,
+        ConfigInterface $salesConfig,
+        array $layoutProcessors = [],
+        array $data = [],
+        ?CheckoutHelper $checkoutHelper = null,
+        ?TaxHelper $taxHelper = null
+    ) {
+        $data['taxHelper'] = $taxHelper ?? ObjectManager::getInstance()->get(TaxHelper::class);
+        parent::__construct(
+            $context,
+            $customerSession,
+            $checkoutSession,
+            $salesConfig,
+            $layoutProcessors,
+            $data,
+            $checkoutHelper
+        );
+    }
+
     /**
      * @var string
      */
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
index a85e5e9b76972..e9a92120f8cf1 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
@@ -24,6 +24,10 @@ $checkoutHelper = $block->getData('checkoutHelper');
             <strong><?= /* @noEscape */ $checkoutHelper->formatPrice($block->getTotalExclTax()) ?></strong>
         </td>
     </tr>
+    <?php if ($style): ?>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($style, 'tr.grand.totals.excl th.mark') ?>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($style, 'tr.grand.totals.excl td.amount') ?>
+    <?php endif; ?>
     <?= /* @noEscape */ $block->renderTotals('taxes', $colspan) ?>
     <tr class="grand totals incl">
         <th class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
@@ -33,6 +37,10 @@ $checkoutHelper = $block->getData('checkoutHelper');
             <strong><?= /* @noEscape */ $checkoutHelper->formatPrice($block->getTotal()->getValue()) ?></strong>
         </td>
     </tr>
+    <?php if ($style): ?>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($style, 'tr.grand.totals.incl th.mark') ?>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($style, 'tr.grand.totals.incl td.amount') ?>
+    <?php endif; ?>
 <?php else: ?>
     <tr class="grand totals">
         <th class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
@@ -42,6 +50,8 @@ $checkoutHelper = $block->getData('checkoutHelper');
             <strong><?= /* @noEscape */ $checkoutHelper->formatPrice($block->getTotal()->getValue()) ?></strong>
         </td>
     </tr>
+    <?php if ($style): ?>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($style, 'tr.grand.totals th.mark') ?>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($style, 'tr.grand.totals td.amount') ?>
+    <?php endif; ?>
 <?php endif; ?>
-<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(/* @noEscape */ $style, 'tr.totals.shipping th.mark') ?>
-<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(/* @noEscape */ $style, 'tr.totals.shipping td.amount') ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
index 9f08c668952f1..e2989d8313283 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
@@ -27,6 +27,10 @@
             <?= /* @noEscape */ $checkoutHelper->formatPrice($block->getShippingExcludeTax()) ?>
         </td>
     </tr>
+        <?php if ($style): ?>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($style, 'tr.totals.shipping.excl th.mark') ?>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($style, 'tr.totals.shipping.excl td.amount') ?>
+        <?php endif; ?>
     <tr class="totals shipping incl">
         <th class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
             <?= $block->escapeHtml($block->getIncludeTaxLabel()) ?>
@@ -35,6 +39,10 @@
             <?= /* @noEscape */ $checkoutHelper->formatPrice($block->getShippingIncludeTax()) ?>
         </td>
     </tr>
+        <?php if ($style): ?>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($style, 'tr.totals.shipping.incl th.mark') ?>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($style, 'tr.totals.shipping.incl td.amount') ?>
+        <?php endif; ?>
     <?php elseif ($block->displayIncludeTax()): ?>
     <tr class="totals shipping incl">
         <th class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
@@ -44,6 +52,10 @@
             <?= /* @noEscape */ $checkoutHelper->formatPrice($block->getShippingIncludeTax()) ?>
         </td>
     </tr>
+        <?php if ($style): ?>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($style, 'tr.totals.shipping.incl th.mark') ?>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($style, 'tr.totals.shipping.incl td.amount') ?>
+        <?php endif; ?>
     <?php else: ?>
     <tr class="totals shipping excl">
         <th class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
@@ -53,7 +65,9 @@
             <?= /* @noEscape */ $checkoutHelper->formatPrice($block->getShippingExcludeTax()) ?>
         </td>
     </tr>
+        <?php if ($style): ?>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($style, 'tr.totals.shipping.excl th.mark') ?>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($style, 'tr.totals.shipping.excl td.amount') ?>
+        <?php endif; ?>
     <?php endif; ?>
-    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(/* @noEscape */ $style, 'tr.totals.shipping th.mark') ?>
-    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(/* @noEscape */ $style, 'tr.totals.shipping td.amount') ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
index 88d4721b1aa47..dc9034fc9f694 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
@@ -25,6 +25,10 @@ $checkoutHelper = $block->getData('checkoutHelper');
         <?= /* @noEscape */ $checkoutHelper->formatPrice($block->getTotal()->getValueExclTax()) ?>
     </td>
 </tr>
+    <?php if ($style): ?>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($style, 'tr.totals.sub.excl th.mark') ?>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($style, 'tr.totals.sub.excl td.amount') ?>
+    <?php endif; ?>
 <tr class="totals sub incl">
     <th class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
         <?= $block->escapeHtml(__('Subtotal (Incl. Tax)')) ?>
@@ -33,6 +37,10 @@ $checkoutHelper = $block->getData('checkoutHelper');
         <?= /* @noEscape */ $checkoutHelper->formatPrice($block->getTotal()->getValueInclTax()) ?>
     </td>
 </tr>
+    <?php if ($style): ?>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($style, 'tr.totals.sub.incl th.mark') ?>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($style, 'tr.totals.sub.incl td.amount') ?>
+    <?php endif; ?>
 <?php else: ?>
 <tr class="totals sub">
     <th class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
@@ -42,7 +50,8 @@ $checkoutHelper = $block->getData('checkoutHelper');
         <?= /* @noEscape */ $checkoutHelper->formatPrice($block->getTotal()->getValue()) ?>
     </td>
 </tr>
+    <?php if ($style): ?>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($style, 'tr.totals.sub th.mark') ?>
+        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($style, 'tr.totals.sub td.amount') ?>
+    <?php endif; ?>
 <?php endif; ?>
-<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(/* @noEscape */ $style, 'tr.totals.shipping th.mark') ?>
-<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(/* @noEscape */ $style, 'tr.totals.shipping td.amount') ?>
-
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
index 28767bb3d4cbb..e265c029578a6 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
@@ -13,11 +13,13 @@
 <?php
     $_value = $block->getTotal()->getValue();
     $_style = $block->escapeHtmlAttr($block->getTotal()->getStyle());
+    /** @var \Magento\Tax\Helper\Data $taxHelper */
+    $taxHelper = $block->getData('taxHelper');
     /** @var \Magento\Checkout\Helper\Data $checkoutHelper */
     $checkoutHelper = $block->getData('checkoutHelper');
     $attributes = 'class="totals-tax"';
 
-if ($checkoutHelper->displayFullSummary() && $_value != 0) {
+if ($taxHelper->displayFullSummary() && $_value != 0) {
     $attributes = 'class="totals-tax-summary" data-mage-init=\'{"toggleAdvanced": {"selectorsToggleClass": "shown",
      "baseToggleClass": "expanded", "toggleContainers": ".totals-tax-details"}}\'';
 }
@@ -25,7 +27,7 @@ if ($checkoutHelper->displayFullSummary() && $_value != 0) {
 
 <tr <?= /* @noEscape */ $attributes ?>>
     <th class="mark" colspan="<?= (int) $block->getColspan() ?>" scope="row">
-        <?php if ($checkoutHelper->displayFullSummary()): ?>
+        <?php if ($taxHelper->displayFullSummary()): ?>
             <span class="detailed"><?= $block->escapeHtml($block->getTotal()->getTitle()) ?></span>
         <?php else: ?>
             <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
@@ -35,10 +37,12 @@ if ($checkoutHelper->displayFullSummary() && $_value != 0) {
         <?= /* @noEscape */ $checkoutHelper->formatPrice($_value) ?>
     </td>
 </tr>
-<?= /* @noEscape */ $secureRenderer->renderStyleAsTag($_style, 'tr.totals-tax th.mark') ?>
-<?= /* @noEscape */ $secureRenderer->renderStyleAsTag($_style, 'tr.totals-tax td.amount') ?>
+<?php if ($_style): ?>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($_style, 'tr.totals-tax th.mark') ?>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($_style, 'tr.totals-tax td.amount') ?>
+<?php endif; ?>
 
-<?php if ($checkoutHelper->displayFullSummary() && $_value != 0): ?>
+<?php if ($taxHelper->displayFullSummary() && $_value != 0): ?>
     <?php foreach ($block->getTotal()->getFullInfo() as $info): ?>
         <?php if (isset($info['hidden']) && $info['hidden']) { continue; } ?>
         <?php $percent = $info['percent']; ?>
@@ -62,8 +66,10 @@ if ($checkoutHelper->displayFullSummary() && $_value != 0) {
                     </td>
                 <?php endif; ?>
             </tr>
-            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($_style, 'tr.totals-tax-details th.mark') ?>
-            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($_style, 'tr.totals-tax-details td.amount') ?>
+            <?php if ($_style): ?>
+                <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($_style, 'tr.totals-tax-details th.mark') ?>
+                <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($_style, 'tr.totals-tax-details td.amount') ?>
+            <?php endif; ?>
             <?php $isFirst = 0; ?>
         <?php endforeach; ?>
     <?php endforeach; ?>

From 000c822b5f027db3bb8ba83414b1f6ffd7664269 Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Fri, 8 May 2020 12:20:12 +0300
Subject: [PATCH 0236/1718] add integration test

---
 .../GetCustomerByTokenTest.php                | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/Customer/Model/ForgotPasswordToken/GetCustomerByTokenTest.php

diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/ForgotPasswordToken/GetCustomerByTokenTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/ForgotPasswordToken/GetCustomerByTokenTest.php
new file mode 100644
index 0000000000000..10a30f10e96a7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/ForgotPasswordToken/GetCustomerByTokenTest.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Model\ForgotPasswordToken;
+
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+class GetCustomerByTokenTest extends TestCase
+{
+    private const RESET_PASSWORD = '8ed8677e6c79e68b94e61658bd756ea5';
+
+    /** @var ObjectManagerInterface */
+    private $objectManager;
+
+    /**
+     * @var GetCustomerByToken
+     */
+    private $customerByToken;
+
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->customerByToken = $this->objectManager->get(GetCustomerByToken::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testExecuteWithNoSuchEntityException(): void
+    {
+        $this->expectExceptionMessage('No such entity with rp_token = ' . self::RESET_PASSWORD);
+        $this->customerByToken->execute(self::RESET_PASSWORD);
+    }
+}

From 611616954d11e22ba6d8fd98596f76ebc5b0c978 Mon Sep 17 00:00:00 2001
From: Paul <psparrow@comwrap.com>
Date: Tue, 14 Apr 2020 10:32:58 +0300
Subject: [PATCH 0237/1718] Extended message queue consumer configuration with
 parameters "maxIdleTime", "sleep" and "onlySpawnWhenMessageAvailable".
 Created logic for checking/handling these parameters during firing/executing
 queue consumers. Updated unit tests.

---
 .../Model/MassConsumer.php                    |  10 +-
 .../Model/CheckIsAvailableMessagesInQueue.php |  50 +++++++
 .../Model/Cron/ConsumersRunner.php            |  31 ++++-
 .../Unit/Model/Cron/ConsumersRunnerTest.php   | 110 +++++++++++++++-
 .../MessageQueue/CallbackInvoker.php          |  21 ++-
 .../MessageQueue/CallbackInvokerInterface.php |  12 +-
 .../Config/Consumer/ConfigReaderPlugin.php    |   5 +-
 .../Framework/MessageQueue/Consumer.php       |  11 +-
 .../Consumer/Config/ConsumerConfigItem.php    |  58 ++++++++-
 .../Config/ConsumerConfigItemInterface.php    |  21 +++
 .../Consumer/Config/Validator/FieldsTypes.php |  29 ++++-
 .../Config/Validator/RequiredFields.php       |  14 +-
 .../Consumer/Config/Xml/Converter.php         |  13 +-
 .../MessageQueue/ConsumerConfiguration.php    |  45 +++++--
 .../ConsumerConfigurationInterface.php        |  28 ++++
 .../MessageQueue/ConsumerFactory.php          |   4 +
 .../Consumer/ConfigReaderPluginTest.php       |  14 +-
 .../Config/Validator/ConsumerInstanceTest.php |   9 ++
 .../Config/Validator/FieldsTypesTest.php      | 122 ++++++++++++++++++
 .../Config/Validator/HandlersTest.php         |  23 +++-
 .../Config/Validator/RequiredFieldsTest.php   |  68 ++++++++++
 .../Test/Unit/Consumer/Config/XsdTest.php     |  46 ++++++-
 .../MessageQueue/Test/Unit/ConsumerTest.php   |  40 ++++--
 .../Test/Unit/_files/queue_consumer/valid.php |  77 ++++++++++-
 .../Test/Unit/_files/queue_consumer/valid.xml |  13 +-
 .../Framework/MessageQueue/etc/consumer.xsd   |   3 +
 26 files changed, 802 insertions(+), 75 deletions(-)
 create mode 100644 app/code/Magento/MessageQueue/Model/CheckIsAvailableMessagesInQueue.php

diff --git a/app/code/Magento/AsynchronousOperations/Model/MassConsumer.php b/app/code/Magento/AsynchronousOperations/Model/MassConsumer.php
index e2f756a9e8fcd..4d83c03507f9c 100644
--- a/app/code/Magento/AsynchronousOperations/Model/MassConsumer.php
+++ b/app/code/Magento/AsynchronousOperations/Model/MassConsumer.php
@@ -69,11 +69,19 @@ public function process($maxNumberOfMessages = null)
         $this->registry->register('isSecureArea', true, true);
 
         $queue = $this->configuration->getQueue();
+        $maxIdleTime = $this->configuration->getMaxIdleTime();
+        $sleep = $this->configuration->getSleep();
 
         if (!isset($maxNumberOfMessages)) {
             $queue->subscribe($this->getTransactionCallback($queue));
         } else {
-            $this->invoker->invoke($queue, $maxNumberOfMessages, $this->getTransactionCallback($queue));
+            $this->invoker->invoke(
+                $queue,
+                $maxNumberOfMessages,
+                $this->getTransactionCallback($queue),
+                $maxIdleTime,
+                $sleep
+            );
         }
 
         $this->registry->unregister('isSecureArea');
diff --git a/app/code/Magento/MessageQueue/Model/CheckIsAvailableMessagesInQueue.php b/app/code/Magento/MessageQueue/Model/CheckIsAvailableMessagesInQueue.php
new file mode 100644
index 0000000000000..c097f461e621b
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Model/CheckIsAvailableMessagesInQueue.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MessageQueue\Model;
+
+use Magento\Framework\MessageQueue\QueueRepository;
+
+/**
+ * Class CheckIsAvailableMessagesInQueue for checking messages available in queue
+ */
+class CheckIsAvailableMessagesInQueue
+{
+    /**
+     * @var QueueRepository
+     */
+    private $queueRepository;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param QueueRepository $queueRepository
+     */
+    public function __construct(QueueRepository $queueRepository)
+    {
+        $this->queueRepository = $queueRepository;
+    }
+
+    /**
+     * Checks if there is available messages in the queue
+     *
+     * @param string $connectionName connection name
+     * @param string $queueName queue name
+     * @return bool
+     * @throws \LogicException if queue is not available
+     */
+    public function execute($connectionName, $queueName)
+    {
+        $queue = $this->queueRepository->get($connectionName, $queueName);
+        $message = $queue->dequeue();
+        if ($message) {
+            $queue->reject($message);
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner.php b/app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner.php
index 056cf4fc57a2e..d907eee15de14 100644
--- a/app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner.php
+++ b/app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner.php
@@ -14,6 +14,7 @@
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Process\PhpExecutableFinder;
 use Magento\Framework\Lock\LockManagerInterface;
+use Magento\MessageQueue\Model\CheckIsAvailableMessagesInQueue;
 
 /**
  * Class for running consumers processes by cron
@@ -65,6 +66,11 @@ class ConsumersRunner
      */
     private $lockManager;
 
+    /**
+     * @var CheckIsAvailableMessagesInQueue
+     */
+    private $checkIsAvailableMessages;
+
     /**
      * @param PhpExecutableFinder $phpExecutableFinder The executable finder specifically designed
      *        for the PHP executable
@@ -74,6 +80,7 @@ class ConsumersRunner
      * @param LockManagerInterface $lockManager The lock manager
      * @param ConnectionTypeResolver $mqConnectionTypeResolver Consumer connection resolver
      * @param LoggerInterface $logger Logger
+     * @param CheckIsAvailableMessagesInQueue $checkIsAvailableMessages
      */
     public function __construct(
         PhpExecutableFinder $phpExecutableFinder,
@@ -82,7 +89,8 @@ public function __construct(
         ShellInterface $shellBackground,
         LockManagerInterface $lockManager,
         ConnectionTypeResolver $mqConnectionTypeResolver = null,
-        LoggerInterface $logger = null
+        LoggerInterface $logger = null,
+        CheckIsAvailableMessagesInQueue $checkIsAvailableMessages = null
     ) {
         $this->phpExecutableFinder = $phpExecutableFinder;
         $this->consumerConfig = $consumerConfig;
@@ -93,6 +101,8 @@ public function __construct(
             ?: ObjectManager::getInstance()->get(ConnectionTypeResolver::class);
         $this->logger = $logger
             ?: ObjectManager::getInstance()->get(LoggerInterface::class);
+        $this->checkIsAvailableMessages = $checkIsAvailableMessages
+            ?: ObjectManager::getInstance()->get(CheckIsAvailableMessagesInQueue::class);
     }
 
     /**
@@ -166,6 +176,25 @@ private function canBeRun(ConsumerConfigItemInterface $consumerConfig, array $al
             return false;
         }
 
+        if ($consumerConfig->getOnlySpawnWhenMessageAvailable()) {
+            try {
+                return $this->checkIsAvailableMessages->execute(
+                    $connectionName,
+                    $consumerConfig->getQueue()
+                );
+            } catch (\LogicException $e) {
+                $this->logger->info(
+                    sprintf(
+                        'Consumer "%s" skipped as its related queue "%s" is not available. %s',
+                        $consumerName,
+                        $consumerConfig->getQueue(),
+                        $e->getMessage()
+                    )
+                );
+                return false;
+            }
+        }
+
         return true;
     }
 }
diff --git a/app/code/Magento/MessageQueue/Test/Unit/Model/Cron/ConsumersRunnerTest.php b/app/code/Magento/MessageQueue/Test/Unit/Model/Cron/ConsumersRunnerTest.php
index e19467f798a1f..de1112cbe9bea 100644
--- a/app/code/Magento/MessageQueue/Test/Unit/Model/Cron/ConsumersRunnerTest.php
+++ b/app/code/Magento/MessageQueue/Test/Unit/Model/Cron/ConsumersRunnerTest.php
@@ -6,12 +6,13 @@
 namespace Magento\MessageQueue\Test\Unit\Model\Cron;
 
 use Magento\Framework\MessageQueue\ConnectionTypeResolver;
-use \PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit\Framework\MockObject\MockObject as MockObject;
 use Magento\Framework\ShellInterface;
 use Magento\Framework\MessageQueue\Consumer\ConfigInterface as ConsumerConfigInterface;
 use Magento\Framework\MessageQueue\Consumer\Config\ConsumerConfigItemInterface;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\MessageQueue\Model\Cron\ConsumersRunner;
+use Magento\MessageQueue\Model\CheckIsAvailableMessagesInQueue;
 use Symfony\Component\Process\PhpExecutableFinder;
 use Magento\Framework\Lock\LockManagerInterface;
 
@@ -45,10 +46,15 @@ class ConsumersRunnerTest extends \PHPUnit\Framework\TestCase
      */
     private $phpExecutableFinderMock;
 
+    /**
+     * @var CheckIsAvailableMessagesInQueue|MockObject
+     */
+    private $checkIsAvailableMessagesMock;
+
     /**
      * @var ConnectionTypeResolver
      */
-    private $connectionTypeResover;
+    private $connectionTypeResolver;
 
     /**
      * @var ConsumersRunner
@@ -74,10 +80,11 @@ protected function setUp()
         $this->deploymentConfigMock = $this->getMockBuilder(DeploymentConfig::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->connectionTypeResover = $this->getMockBuilder(ConnectionTypeResolver::class)
+        $this->checkIsAvailableMessagesMock = $this->createMock(CheckIsAvailableMessagesInQueue::class);
+        $this->connectionTypeResolver = $this->getMockBuilder(ConnectionTypeResolver::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->connectionTypeResover->method('getConnectionType')->willReturn('something');
+        $this->connectionTypeResolver->method('getConnectionType')->willReturn('something');
 
         $this->consumersRunner = new ConsumersRunner(
             $this->phpExecutableFinderMock,
@@ -85,7 +92,9 @@ protected function setUp()
             $this->deploymentConfigMock,
             $this->shellBackgroundMock,
             $this->lockManagerMock,
-            $this->connectionTypeResover
+            $this->connectionTypeResolver,
+            null,
+            $this->checkIsAvailableMessagesMock
         );
     }
 
@@ -259,4 +268,95 @@ public function runDataProvider()
             ],
         ];
     }
+
+    /**
+     * @param boolean $onlySpawnWhenMessageAvailable
+     * @param boolean $isMassagesAvailableInTheQueue
+     * @param int $shellBackgroundExpects
+     * @dataProvider runBasedOnOnlySpawnWhenMessageAvailableConsumerConfigurationDataProvider
+     */
+    public function testRunBasedOnOnlySpawnWhenMessageAvailableConsumerConfiguration(
+        $onlySpawnWhenMessageAvailable,
+        $isMassagesAvailableInTheQueue,
+        $shellBackgroundExpects
+    ) {
+        $consumerName = 'consumerName';
+        $connectionName = 'connectionName';
+        $queueName = 'queueName';
+        $this->deploymentConfigMock->expects($this->exactly(3))
+            ->method('get')
+            ->willReturnMap(
+                [
+                    ['cron_consumers_runner/cron_run', true, true],
+                    ['cron_consumers_runner/max_messages', 10000, 1000],
+                    ['cron_consumers_runner/consumers', [], []],
+                ]
+            );
+
+        /** @var ConsumerConfigInterface|MockObject $firstCunsumer */
+        $consumer = $this->getMockBuilder(ConsumerConfigItemInterface::class)
+            ->getMockForAbstractClass();
+        $consumer->expects($this->any())
+            ->method('getName')
+            ->willReturn($consumerName);
+        $consumer->expects($this->once())
+            ->method('getConnection')
+            ->willReturn($connectionName);
+        $consumer->expects($this->any())
+            ->method('getQueue')
+            ->willReturn($queueName);
+        $consumer->expects($this->once())
+            ->method('getOnlySpawnWhenMessageAvailable')
+            ->willReturn($onlySpawnWhenMessageAvailable);
+        $this->consumerConfigMock->expects($this->once())
+            ->method('getConsumers')
+            ->willReturn([$consumer]);
+
+        $this->phpExecutableFinderMock->expects($this->once())
+            ->method('find')
+            ->willReturn('');
+
+        $this->lockManagerMock->expects($this->once())
+            ->method('isLocked')
+            ->willReturn(false);
+
+        $this->checkIsAvailableMessagesMock->expects($this->exactly((int)$onlySpawnWhenMessageAvailable))
+            ->method('execute')
+            ->willReturn($isMassagesAvailableInTheQueue);
+
+        $this->shellBackgroundMock->expects($this->exactly($shellBackgroundExpects))
+            ->method('execute');
+
+        $this->consumersRunner->run();
+    }
+
+    /**
+     * @return array
+     */
+    public function runBasedOnOnlySpawnWhenMessageAvailableConsumerConfigurationDataProvider()
+    {
+        return [
+            [
+                'onlySpawnWhenMessageAvailable' => true,
+                'isMassagesAvailableInTheQueue' => true,
+                'shellBackgroundExpects' => 1
+            ],
+            [
+                'onlySpawnWhenMessageAvailable' => true,
+                'isMassagesAvailableInTheQueue' => false,
+                'shellBackgroundExpects' => 0
+            ],
+            [
+                'onlySpawnWhenMessageAvailable' => false,
+                'isMassagesAvailableInTheQueue' => true,
+                'shellBackgroundExpects' => 1
+            ],
+            [
+                'onlySpawnWhenMessageAvailable' => false,
+                'isMassagesAvailableInTheQueue' => false,
+                'shellBackgroundExpects' => 1
+            ],
+
+        ];
+    }
 }
diff --git a/lib/internal/Magento/Framework/MessageQueue/CallbackInvoker.php b/lib/internal/Magento/Framework/MessageQueue/CallbackInvoker.php
index 559959b55fc61..609a8f9727720 100644
--- a/lib/internal/Magento/Framework/MessageQueue/CallbackInvoker.php
+++ b/lib/internal/Magento/Framework/MessageQueue/CallbackInvoker.php
@@ -56,16 +56,31 @@ public function __construct(
      * @param QueueInterface $queue
      * @param int $maxNumberOfMessages
      * @param \Closure $callback
+     * @param int|null $maxIdleTime
+     * @param int|null $sleep
      * @return void
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    public function invoke(QueueInterface $queue, $maxNumberOfMessages, $callback)
-    {
+    public function invoke(
+        QueueInterface $queue,
+        $maxNumberOfMessages,
+        $callback,
+        $maxIdleTime = null,
+        $sleep = null
+    ) {
         $this->poisonPillVersion = $this->poisonPillRead->getLatestVersion();
+        $sleep = (int) $sleep ?? 1;
+        $maxIdleTime = $maxIdleTime ? (int) $maxIdleTime : PHP_INT_MAX;
         for ($i = $maxNumberOfMessages; $i > 0; $i--) {
+            $idleStartTime = microtime(true);
             do {
                 $message = $queue->dequeue();
+                if (!$message && microtime(true) - $idleStartTime > $maxIdleTime) {
+                    break 2;
+                }
                 // phpcs:ignore Magento2.Functions.DiscouragedFunction
-            } while ($message === null && $this->isWaitingNextMessage() && (sleep(1) === 0));
+            } while ($message === null && $this->isWaitingNextMessage() && (sleep($sleep) === 0));
 
             if ($message === null) {
                 break;
diff --git a/lib/internal/Magento/Framework/MessageQueue/CallbackInvokerInterface.php b/lib/internal/Magento/Framework/MessageQueue/CallbackInvokerInterface.php
index 36658f2e4eebe..63d4b4003c74f 100644
--- a/lib/internal/Magento/Framework/MessageQueue/CallbackInvokerInterface.php
+++ b/lib/internal/Magento/Framework/MessageQueue/CallbackInvokerInterface.php
@@ -8,7 +8,7 @@
 namespace Magento\Framework\MessageQueue;
 
 /**
- * Callback invoker interface
+ * Callback invoker interface. Invoke callbacks for consumer classes.
  */
 interface CallbackInvokerInterface
 {
@@ -18,7 +18,15 @@ interface CallbackInvokerInterface
      * @param QueueInterface $queue
      * @param int $maxNumberOfMessages
      * @param \Closure $callback
+     * @param int|null $maxIdleTime
+     * @param int|null $sleep
      * @return void
      */
-    public function invoke(QueueInterface $queue, $maxNumberOfMessages, $callback);
+    public function invoke(
+        QueueInterface $queue,
+        $maxNumberOfMessages,
+        $callback,
+        $maxIdleTime = null,
+        $sleep = null
+    );
 }
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Consumer/ConfigReaderPlugin.php b/lib/internal/Magento/Framework/MessageQueue/Config/Consumer/ConfigReaderPlugin.php
index c791baf4deb66..3b20fc3bc4ab8 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Config/Consumer/ConfigReaderPlugin.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Consumer/ConfigReaderPlugin.php
@@ -68,7 +68,10 @@ private function getConsumerConfigDataFromQueueConfig()
                 'consumerInstance' => $consumerData['instance_type'],
                 'handlers' => $handlers,
                 'connection' => $consumerData['connection'],
-                'maxMessages' => $consumerData['max_messages']
+                'maxMessages' => $consumerData['max_messages'],
+                'maxIdleTime' => null,
+                'sleep' => null,
+                'onlySpawnWhenMessageAvailable' => false
             ];
         }
 
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer.php b/lib/internal/Magento/Framework/MessageQueue/Consumer.php
index 8f65a2d8c5ed2..99f18c6a80cda 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Consumer.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer.php
@@ -108,11 +108,18 @@ public function __construct(
     public function process($maxNumberOfMessages = null)
     {
         $queue = $this->configuration->getQueue();
-
+        $maxIdleTime = $this->configuration->getMaxIdleTime();
+        $sleep = $this->configuration->getSleep();
         if (!isset($maxNumberOfMessages)) {
             $queue->subscribe($this->getTransactionCallback($queue));
         } else {
-            $this->invoker->invoke($queue, $maxNumberOfMessages, $this->getTransactionCallback($queue));
+            $this->invoker->invoke(
+                $queue,
+                $maxNumberOfMessages,
+                $this->getTransactionCallback($queue),
+                $maxIdleTime,
+                $sleep
+            );
         }
     }
 
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem.php
index 92242698a5ba5..4103e9cc42777 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItem.php
@@ -43,6 +43,21 @@ class ConsumerConfigItem implements ConsumerConfigItemInterface
      */
     private $maxMessages;
 
+    /**
+     * @var int|null
+     */
+    private $maxIdleTime;
+
+    /**
+     * @var int|null
+     */
+    private $sleep;
+
+    /**
+     * @var boolean|null
+     */
+    private $onlySpawnWhenMessageAvailable;
+
     /**
      * Initialize dependencies.
      *
@@ -54,7 +69,7 @@ public function __construct(HandlerIteratorFactory $handlerIteratorFactory)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getName()
     {
@@ -62,7 +77,7 @@ public function getName()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getConnection()
     {
@@ -70,7 +85,7 @@ public function getConnection()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getQueue()
     {
@@ -78,7 +93,7 @@ public function getQueue()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getConsumerInstance()
     {
@@ -86,7 +101,7 @@ public function getConsumerInstance()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getHandlers()
     {
@@ -94,7 +109,7 @@ public function getHandlers()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getMaxMessages()
     {
@@ -102,7 +117,33 @@ public function getMaxMessages()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     */
+    public function getMaxIdleTime()
+    {
+        return $this->maxIdleTime;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSleep()
+    {
+        return $this->sleep;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getOnlySpawnWhenMessageAvailable()
+    {
+        return $this->onlySpawnWhenMessageAvailable;
+    }
+
+    /**
+     * Populate current instance properties with data
+     *
+     * @param array $data consumer configuration data
      */
     public function setData(array $data)
     {
@@ -112,5 +153,8 @@ public function setData(array $data)
         $this->consumerInstance = $data['consumerInstance'];
         $this->maxMessages = $data['maxMessages'];
         $this->handlers->setData($data['handlers']);
+        $this->maxIdleTime = $data['maxIdleTime'];
+        $this->sleep = $data['sleep'];
+        $this->onlySpawnWhenMessageAvailable = $data['onlySpawnWhenMessageAvailable'];
     }
 }
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItemInterface.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItemInterface.php
index 0896b7789e1f1..4eeceef5b3cc1 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItemInterface.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/ConsumerConfigItemInterface.php
@@ -53,4 +53,25 @@ public function getHandlers();
      * @return int
      */
     public function getMaxMessages();
+
+    /**
+     * Get maximal time (in seconds) for waiting new messages from queue before terminating consumer.
+     *
+     * @return int|null
+     */
+    public function getMaxIdleTime();
+
+    /**
+     * Get time to sleep (in seconds) before checking if a new message is available in the queue.
+     *
+     * @return int|null
+     */
+    public function getSleep();
+
+    /**
+     * Get is consumer have to be spawned only if there are messages in the queue.
+     *
+     * @return boolean|null
+     */
+    public function getOnlySpawnWhenMessageAvailable();
 }
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Validator/FieldsTypes.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Validator/FieldsTypes.php
index d1409dec026de..d033fa5ecebf8 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Validator/FieldsTypes.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Validator/FieldsTypes.php
@@ -13,7 +13,7 @@
 class FieldsTypes implements ValidatorInterface
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function validate($configData)
     {
@@ -54,14 +54,31 @@ private function validateConsumerFieldsTypes($consumerName, $consumerConfig)
                 );
             }
         }
-        if (null !== $consumerConfig['maxMessages'] && !is_numeric($consumerConfig['maxMessages'])) {
+        $additionalNumericFields = ['maxMessages', 'maxIdleTime', 'sleep'];
+        foreach ($additionalNumericFields as $fieldName) {
+            if (null !== $consumerConfig[$fieldName] && !is_numeric($consumerConfig[$fieldName])) {
+                throw new \LogicException(
+                    sprintf(
+                        "Type of '%s' field specified in configuration of '%s' consumer is invalid. "
+                        . "Given '%s', '%s' was expected.",
+                        $fieldName,
+                        $consumerName,
+                        gettype($consumerConfig[$fieldName]),
+                        'int|null'
+                    )
+                );
+            }
+        }
+        if (null !== $consumerConfig['onlySpawnWhenMessageAvailable']
+            && !is_bool($consumerConfig['onlySpawnWhenMessageAvailable'])
+        ) {
             throw new \LogicException(
                 sprintf(
-                    "Type of 'maxMessages' field specified in configuration of '%s' consumer is invalid. "
-                    . "Given '%s', '%s' was expected.",
+                    "Type of 'onlySpawnWhenMessageAvailable' field specified in configuration of '%s' "
+                    . "consumer is invalid. Given '%s', '%s' was expected.",
                     $consumerName,
-                    gettype($consumerConfig['maxMessages']),
-                    'int|null'
+                    gettype($consumerConfig['onlySpawnWhenMessageAvailable']),
+                    'boolean|null'
                 )
             );
         }
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Validator/RequiredFields.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Validator/RequiredFields.php
index 87de2233381e2..17118a43a1912 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Validator/RequiredFields.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Validator/RequiredFields.php
@@ -13,12 +13,22 @@
 class RequiredFields implements ValidatorInterface
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function validate($configData)
     {
         foreach ($configData as $consumerName => $consumerConfig) {
-            $requiredFields = ['name', 'queue', 'handlers', 'consumerInstance', 'connection', 'maxMessages'];
+            $requiredFields = [
+                'name',
+                'queue',
+                'handlers',
+                'consumerInstance',
+                'connection',
+                'maxMessages',
+                'maxIdleTime',
+                'sleep',
+                'onlySpawnWhenMessageAvailable'
+            ];
             foreach ($requiredFields as $fieldName) {
                 if (!array_key_exists($fieldName, $consumerConfig)) {
                     throw new \LogicException(
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Xml/Converter.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Xml/Converter.php
index 352bc53e94e90..28e31d6735c4a 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Xml/Converter.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Xml/Converter.php
@@ -45,7 +45,7 @@ public function __construct(ConfigParser $configParser, DefaultValueProvider $de
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritdoc
      */
     public function convert($source)
     {
@@ -54,6 +54,11 @@ public function convert($source)
         foreach ($source->getElementsByTagName('consumer') as $consumerNode) {
             $consumerName = $this->getAttributeValue($consumerNode, 'name');
             $handler = $this->getAttributeValue($consumerNode, 'handler');
+            $onlySpawnWhenMessageAvailable =  $this->getAttributeValue(
+                $consumerNode,
+                'onlySpawnWhenMessageAvailable'
+            );
+
             $result[$consumerName] = [
                 'name' => $consumerName,
                 'queue' => $this->getAttributeValue($consumerNode, 'queue'),
@@ -68,7 +73,11 @@ public function convert($source)
                     'connection',
                     $this->defaultValueProvider->getConnection()
                 ),
-                'maxMessages' => $this->getAttributeValue($consumerNode, 'maxMessages')
+                'maxMessages' => $this->getAttributeValue($consumerNode, 'maxMessages'),
+                'maxIdleTime' => $this->getAttributeValue($consumerNode, 'maxIdleTime'),
+                'sleep' => $this->getAttributeValue($consumerNode, 'sleep'),
+                'onlySpawnWhenMessageAvailable' =>
+                    $onlySpawnWhenMessageAvailable === 'false' ? false : boolval($onlySpawnWhenMessageAvailable)
             ];
         }
         return $result;
diff --git a/lib/internal/Magento/Framework/MessageQueue/ConsumerConfiguration.php b/lib/internal/Magento/Framework/MessageQueue/ConsumerConfiguration.php
index 09cd5dcb8d909..7c0d63d4c2fe4 100644
--- a/lib/internal/Magento/Framework/MessageQueue/ConsumerConfiguration.php
+++ b/lib/internal/Magento/Framework/MessageQueue/ConsumerConfiguration.php
@@ -15,13 +15,13 @@
 class ConsumerConfiguration implements ConsumerConfigurationInterface
 {
     /**
-     * @deprecated
+     * @deprecated Should be used constant from ConsumerConfigurationInterface
      * @see ConsumerConfigurationInterface::TOPIC_TYPE
      */
     const CONSUMER_TYPE = "consumer_type";
 
     /**
-     * @deprecated
+     * @deprecated Should be used constant from ConsumerConfigurationInterface
      * @see ConsumerConfigurationInterface::TOPIC_HANDLERS
      */
     const HANDLERS = 'handlers';
@@ -62,7 +62,7 @@ public function __construct(QueueRepository $queueRepository, MessageQueueConfig
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getConsumerName()
     {
@@ -70,7 +70,7 @@ public function getConsumerName()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getMaxMessages()
     {
@@ -78,7 +78,7 @@ public function getMaxMessages()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getQueueName()
     {
@@ -86,7 +86,7 @@ public function getQueueName()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getType()
     {
@@ -108,7 +108,7 @@ public function getType()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getHandlers($topicName)
     {
@@ -116,7 +116,7 @@ public function getHandlers($topicName)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getTopicNames()
     {
@@ -125,7 +125,31 @@ public function getTopicNames()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     */
+    public function getMaxIdleTime()
+    {
+        return $this->getData(self::MAX_IDLE_TIME);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSleep()
+    {
+        return $this->getData(self::SLEEP);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getOnlySpawnWhenMessageAvailable()
+    {
+        return $this->getData(self::ONLY_SPAWN_WHEN_MESSAGE_AVAILABLE);
+    }
+
+    /**
+     * @inheritdoc
      */
     public function getQueue()
     {
@@ -134,7 +158,7 @@ public function getQueue()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getMessageSchemaType($topicName)
     {
@@ -143,6 +167,7 @@ public function getMessageSchemaType($topicName)
 
     /**
      * Get topic configuration for current consumer.
+     *
      * @param string $topicName
      * @return array
      * @throws \LogicException
diff --git a/lib/internal/Magento/Framework/MessageQueue/ConsumerConfigurationInterface.php b/lib/internal/Magento/Framework/MessageQueue/ConsumerConfigurationInterface.php
index b825949ddb019..30bd866ace5e7 100644
--- a/lib/internal/Magento/Framework/MessageQueue/ConsumerConfigurationInterface.php
+++ b/lib/internal/Magento/Framework/MessageQueue/ConsumerConfigurationInterface.php
@@ -18,6 +18,9 @@ interface ConsumerConfigurationInterface
     const TOPICS = 'topics';
     const TOPIC_TYPE = 'consumer_type';
     const TOPIC_HANDLERS = 'handlers';
+    const MAX_IDLE_TIME = 'max_idle_time';
+    const SLEEP = 'sleep';
+    const ONLY_SPAWN_WHEN_MESSAGE_AVAILABLE = 'only_spawn_when_message_available';
 
     const TYPE_SYNC = 'sync';
     const TYPE_ASYNC = 'async';
@@ -72,13 +75,38 @@ public function getHandlers($topicName);
     public function getTopicNames();
 
     /**
+     * Get message schema type.
+     *
      * @param string $topicName
      * @return string
      */
     public function getMessageSchemaType($topicName);
 
     /**
+     * Get message queue instance.
+     *
      * @return QueueInterface
      */
     public function getQueue();
+
+    /**
+     * Get maximal time (in seconds) for waiting new messages from queue before terminating consumer.
+     *
+     * @return int|null
+     */
+    public function getMaxIdleTime();
+
+    /**
+     * Get time to sleep (in seconds) before checking if a new message is available in the queue.
+     *
+     * @return int|null
+     */
+    public function getSleep();
+
+    /**
+     * Get is consumer have to be spawned only if there are messages in the queue.
+     *
+     * @return boolean|null
+     */
+    public function getOnlySpawnWhenMessageAvailable();
 }
diff --git a/lib/internal/Magento/Framework/MessageQueue/ConsumerFactory.php b/lib/internal/Magento/Framework/MessageQueue/ConsumerFactory.php
index 7d9f210b4a698..554d7de499b67 100644
--- a/lib/internal/Magento/Framework/MessageQueue/ConsumerFactory.php
+++ b/lib/internal/Magento/Framework/MessageQueue/ConsumerFactory.php
@@ -109,6 +109,10 @@ private function createConsumerConfiguration($consumerConfigItem)
             ConsumerConfigurationInterface::QUEUE_NAME => $consumerConfigItem->getQueue(),
             ConsumerConfigurationInterface::TOPICS => $topics,
             ConsumerConfigurationInterface::MAX_MESSAGES => $consumerConfigItem->getMaxMessages(),
+            ConsumerConfigurationInterface::MAX_IDLE_TIME => $consumerConfigItem->getMaxIdleTime(),
+            ConsumerConfigurationInterface::SLEEP => $consumerConfigItem->getSleep(),
+            ConsumerConfigurationInterface::ONLY_SPAWN_WHEN_MESSAGE_AVAILABLE =>
+                $consumerConfigItem->getOnlySpawnWhenMessageAvailable()
         ];
 
         return $this->objectManager->create(
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Consumer/ConfigReaderPluginTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Consumer/ConfigReaderPluginTest.php
index 0eaddf35004e7..a1c4c56fc3dfe 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Consumer/ConfigReaderPluginTest.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Consumer/ConfigReaderPluginTest.php
@@ -23,12 +23,12 @@ class ConfigReaderPluginTest extends \PHPUnit\Framework\TestCase
     private $objectManagerHelper;
 
     /**
-     * @var ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ConfigInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     private $configMock;
 
     /**
-     * @var ConsumerConfigCompositeReader|\PHPUnit_Framework_MockObject_MockObject
+     * @var ConsumerConfigCompositeReader|\PHPUnit\Framework\MockObject\MockObject
      */
     private $subjectMock;
 
@@ -78,7 +78,10 @@ public function testAfterRead()
                 'consumerInstance' => 'type1',
                 'handlers' => ['handlerConfig1_1_1', 'handlerConfig1_1_2', 'handlerConfig1_2_1'],
                 'connection' => 'connection1',
-                'maxMessages' => 100
+                'maxMessages' => 100,
+                'maxIdleTime' => null,
+                'sleep' => null,
+                'onlySpawnWhenMessageAvailable' => false
             ],
             'consumer2' => [
                 'name' => 'consumer2',
@@ -86,7 +89,10 @@ public function testAfterRead()
                 'consumerInstance' => 'type2',
                 'handlers' => [],
                 'connection' => 'connection2',
-                'maxMessages' => 2
+                'maxMessages' => 2,
+                'maxIdleTime' => null,
+                'sleep' => null,
+                'onlySpawnWhenMessageAvailable' => false
             ],
             'consumer0' => []
         ];
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/ConsumerInstanceTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/ConsumerInstanceTest.php
index 903cf2ce9fd2d..fabb60eedc290 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/ConsumerInstanceTest.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/ConsumerInstanceTest.php
@@ -50,6 +50,9 @@ public function validConfigDataProvider()
                         ],
                         'connection' => 'connection1',
                         'maxMessages' => '100',
+                        'maxIdleTime' => '500',
+                        'sleep' => '10',
+                        'onlySpawnWhenMessageAvailable' => false
                     ]
                 ]
             ]
@@ -83,6 +86,9 @@ public function invalidConfigDataProvider()
                         'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
                         'connection' => 'connection1',
                         'maxMessages' => '100',
+                        'maxIdleTime' => '500',
+                        'sleep' => '10',
+                        'onlySpawnWhenMessageAvailable' => true
                     ]
                 ],
                 // @codingStandardsIgnoreStart
@@ -102,6 +108,9 @@ public function invalidConfigDataProvider()
                         ],
                         'connection' => 'connection1',
                         'maxMessages' => '100',
+                        'maxIdleTime' => '500',
+                        'sleep' => '10',
+                        'onlySpawnWhenMessageAvailable' => true
                     ]
                 ],
                 "'consumerClass1' does not exist and thus cannot be used as 'consumerInstance'"
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/FieldsTypesTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/FieldsTypesTest.php
index 7a636fedd3fff..968f86d1779b4 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/FieldsTypesTest.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/FieldsTypesTest.php
@@ -47,6 +47,9 @@ public function validConfigDataProvider()
                         'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
                         'connection' => 'connection1',
                         'maxMessages' => '100',
+                        'maxIdleTime' => '500',
+                        'sleep' => '10',
+                        'onlySpawnWhenMessageAvailable' => true
                     ]
                 ]
             ],
@@ -59,6 +62,54 @@ public function validConfigDataProvider()
                         'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
                         'connection' => 'connection1',
                         'maxMessages' => null,
+                        'maxIdleTime' => '500',
+                        'sleep' => '10',
+                        'onlySpawnWhenMessageAvailable' => true
+                    ]
+                ]
+            ],
+            'valid, maxIdleTime == null' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                        'maxIdleTime' => null,
+                        'sleep' => '10',
+                        'onlySpawnWhenMessageAvailable' => true
+                    ]
+                ]
+            ],
+            'valid, sleep == null' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                        'maxIdleTime' => '500',
+                        'sleep' => null,
+                        'onlySpawnWhenMessageAvailable' => true
+                    ]
+                ]
+            ],
+            'valid, onlySpawnWhenMessageAvailable == null' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                        'maxIdleTime' => '500',
+                        'sleep' => '10',
+                        'onlySpawnWhenMessageAvailable' => null
                     ]
                 ]
             ],
@@ -79,6 +130,8 @@ public function testValidateInvalid($configData, $expectedExceptionMessage)
 
     /**
      * @return array
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function invalidConfigDataProvider()
     {
@@ -92,6 +145,9 @@ public function invalidConfigDataProvider()
                         'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
                         'connection' => 'connection1',
                         'maxMessages' => '100',
+                        'maxIdleTime' => '500',
+                        'sleep' => '10',
+                        'onlySpawnWhenMessageAvailable' => true
                     ]
                 ],
                 "Type of 'name' field specified in configuration of 'consumer1' consumer is invalid."
@@ -106,6 +162,9 @@ public function invalidConfigDataProvider()
                         'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
                         'connection' => 'connection1',
                         'maxMessages' => '100',
+                        'maxIdleTime' => '500',
+                        'sleep' => '10',
+                        'onlySpawnWhenMessageAvailable' => true
                     ]
                 ],
                 "Type of 'queue' field specified in configuration of 'consumer1' consumer is invalid."
@@ -120,6 +179,9 @@ public function invalidConfigDataProvider()
                         'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
                         'connection' => 'connection1',
                         'maxMessages' => '100',
+                        'maxIdleTime' => '500',
+                        'sleep' => '10',
+                        'onlySpawnWhenMessageAvailable' => true
                     ]
                 ],
                 "Type of 'consumerInstance' field specified in configuration of 'consumer1' consumer is invalid."
@@ -134,6 +196,9 @@ public function invalidConfigDataProvider()
                         'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
                         'connection' => [],
                         'maxMessages' => '100',
+                        'maxIdleTime' => '500',
+                        'sleep' => '10',
+                        'onlySpawnWhenMessageAvailable' => true
                     ]
                 ],
                 "Type of 'connection' field specified in configuration of 'consumer1' consumer is invalid."
@@ -148,6 +213,9 @@ public function invalidConfigDataProvider()
                         'handlers' => '',
                         'connection' => 'connection1',
                         'maxMessages' => '100',
+                        'maxIdleTime' => '500',
+                        'sleep' => '10',
+                        'onlySpawnWhenMessageAvailable' => true
                     ]
                 ],
                 "Type of 'handlers' field specified in configuration of 'consumer1' consumer is invalid."
@@ -162,11 +230,65 @@ public function invalidConfigDataProvider()
                         'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
                         'connection' => 'connection1',
                         'maxMessages' => 'abc',
+                        'maxIdleTime' => '500',
+                        'sleep' => '10',
+                        'onlySpawnWhenMessageAvailable' => true
                     ]
                 ],
                 "Type of 'maxMessages' field specified in configuration of 'consumer1' consumer is invalid."
                 . " Given 'string', 'int|null' was expected."
             ],
+            'invalid maxIdleTime' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                        'maxIdleTime' => 'abc',
+                        'sleep' => '10',
+                        'onlySpawnWhenMessageAvailable' => true
+                    ]
+                ],
+                "Type of 'maxIdleTime' field specified in configuration of 'consumer1' consumer is invalid."
+                . " Given 'string', 'int|null' was expected."
+            ],
+            'invalid sleep' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                        'maxIdleTime' => '500',
+                        'sleep' => 'abc',
+                        'onlySpawnWhenMessageAvailable' => true
+                    ]
+                ],
+                "Type of 'sleep' field specified in configuration of 'consumer1' consumer is invalid."
+                . " Given 'string', 'int|null' was expected."
+            ],
+            'onlySpawnWhenMessageAvailable' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                        'maxIdleTime' => '500',
+                        'sleep' => '10',
+                        'onlySpawnWhenMessageAvailable' => 'yes'
+                    ]
+                ],
+                "Type of 'onlySpawnWhenMessageAvailable' field specified in configuration of 'consumer1' consumer "
+                . "is invalid. Given 'string', 'boolean|null' was expected."
+            ]
         ];
     }
 }
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/HandlersTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/HandlersTest.php
index 5013e1dca135b..a7ba9ab0195d2 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/HandlersTest.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/HandlersTest.php
@@ -11,7 +11,7 @@
 class HandlersTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var MethodsMap|\PHPUnit_Framework_MockObject_MockObject
+     * @var MethodsMap|\PHPUnit\Framework\MockObject\MockObject
      */
     private $methodsMap;
 
@@ -57,6 +57,9 @@ public function validConfigDataProvider()
                         ],
                         'connection' => 'connection1',
                         'maxMessages' => '100',
+                        'maxIdleTime' => '500',
+                        'sleep' => '10',
+                        'onlySpawnWhenMessageAvailable' => true
                     ]
                 ]
             ],
@@ -69,6 +72,9 @@ public function validConfigDataProvider()
                         'handlers' => [],
                         'connection' => 'connection1',
                         'maxMessages' => null,
+                        'maxIdleTime' => '500',
+                        'sleep' => null,
+                        'onlySpawnWhenMessageAvailable' => true
                     ]
                 ]
             ],
@@ -102,6 +108,9 @@ public function invalidConfigDataProvider()
                         'handlers' => ['handlerClassOne::handlerMethodOne'],
                         'connection' => 'connection1',
                         'maxMessages' => '100',
+                        'maxIdleTime' => '500',
+                        'sleep' => '10',
+                        'onlySpawnWhenMessageAvailable' => false
                     ]
                 ],
                 "'consumer1' consumer declaration is invalid. Every handler element must be an array."
@@ -118,6 +127,9 @@ public function invalidConfigDataProvider()
                         ],
                         'connection' => 'connection1',
                         'maxMessages' => '100',
+                        'maxIdleTime' => '500',
+                        'sleep' => '10',
+                        'onlySpawnWhenMessageAvailable' => true
                     ]
                 ],
                 "'consumer1' consumer declaration is invalid. Every handler element must be an array."
@@ -134,6 +146,9 @@ public function invalidConfigDataProvider()
                         ],
                         'connection' => 'connection1',
                         'maxMessages' => '100',
+                        'maxIdleTime' => '500',
+                        'sleep' => '10',
+                        'onlySpawnWhenMessageAvailable' => true
                     ]
                 ],
                 "'consumer1' consumer declaration is invalid. Every handler element must be an array."
@@ -150,6 +165,9 @@ public function invalidConfigDataProvider()
                         ],
                         'connection' => 'connection1',
                         'maxMessages' => '100',
+                        'maxIdleTime' => '500',
+                        'sleep' => '10',
+                        'onlySpawnWhenMessageAvailable' => true
                     ]
                 ],
                 "'consumer1' consumer declaration is invalid. Every handler element must be an array."
@@ -170,6 +188,9 @@ public function testValidateUndeclaredService()
                 ],
                 'connection' => 'connection1',
                 'maxMessages' => '100',
+                'maxIdleTime' => '500',
+                'sleep' => '10',
+                'onlySpawnWhenMessageAvailable' => true
             ]
         ];
         $expectedExceptionMessage = 'Service method specified as handler for of consumer "consumer1" is not available.'
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/RequiredFieldsTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/RequiredFieldsTest.php
index 3df7045124480..ed36595c63e30 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/RequiredFieldsTest.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/Validator/RequiredFieldsTest.php
@@ -47,6 +47,9 @@ public function validConfigDataProvider()
                         'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
                         'connection' => 'connection1',
                         'maxMessages' => '100',
+                        'maxIdleTime' => '500',
+                        'sleep' => '10',
+                        'onlySpawnWhenMessageAvailable' => true
                     ]
                 ]
             ]
@@ -67,6 +70,8 @@ public function testValidateInvalid($configData, $expectedExceptionMessage)
 
     /**
      * @return array
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function invalidConfigDataProvider()
     {
@@ -79,6 +84,9 @@ public function invalidConfigDataProvider()
                         'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
                         'connection' => 'connection1',
                         'maxMessages' => '100',
+                        'maxIdleTime' => '500',
+                        'sleep' => '10',
+                        'onlySpawnWhenMessageAvailable' => true
                     ]
                 ],
                 "'name' field must be specified for consumer 'consumer1'"
@@ -91,6 +99,9 @@ public function invalidConfigDataProvider()
                         'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
                         'connection' => 'connection1',
                         'maxMessages' => '100',
+                        'maxIdleTime' => '500',
+                        'sleep' => '10',
+                        'onlySpawnWhenMessageAvailable' => true
                     ]
                 ],
                 "'queue' field must be specified for consumer 'consumer1'"
@@ -103,6 +114,9 @@ public function invalidConfigDataProvider()
                         'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
                         'connection' => 'connection1',
                         'maxMessages' => '100',
+                        'maxIdleTime' => '500',
+                        'sleep' => '10',
+                        'onlySpawnWhenMessageAvailable' => true
                     ]
                 ],
                 "'consumerInstance' field must be specified for consumer 'consumer1'"
@@ -115,6 +129,9 @@ public function invalidConfigDataProvider()
                         'consumerInstance' => 'consumerClass1',
                         'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
                         'maxMessages' => '100',
+                        'maxIdleTime' => '500',
+                        'sleep' => '10',
+                        'onlySpawnWhenMessageAvailable' => true
                     ]
                 ],
                 "'connection' field must be specified for consumer 'consumer1'"
@@ -127,6 +144,9 @@ public function invalidConfigDataProvider()
                         'consumerInstance' => 'consumerClass1',
                         'connection' => 'connection1',
                         'maxMessages' => '100',
+                        'maxIdleTime' => '500',
+                        'sleep' => '10',
+                        'onlySpawnWhenMessageAvailable' => true
                     ]
                 ],
                 "'handlers' field must be specified for consumer 'consumer1'"
@@ -139,10 +159,58 @@ public function invalidConfigDataProvider()
                         'consumerInstance' => 'consumerClass1',
                         'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
                         'connection' => 'connection1',
+                        'maxIdleTime' => '500',
+                        'sleep' => '10',
+                        'onlySpawnWhenMessageAvailable' => true
                     ]
                 ],
                 "'maxMessages' field must be specified for consumer 'consumer1'"
             ],
+            'missing maxIdleTime' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                        'sleep' => '10',
+                        'onlySpawnWhenMessageAvailable' => true
+                    ]
+                ],
+                "'maxIdleTime' field must be specified for consumer 'consumer1'"
+            ],
+            'missing sleep' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                        'maxIdleTime' => '500',
+                        'onlySpawnWhenMessageAvailable' => true
+                    ]
+                ],
+                "'sleep' field must be specified for consumer 'consumer1'"
+            ],
+            'missing onlySpawnWhenMessageAvailable' => [
+                [
+                    'consumer1' => [
+                        'name' => 'consumer1',
+                        'queue' => 'queue1',
+                        'consumerInstance' => 'consumerClass1',
+                        'handlers' => [['type' => 'handlerClassOne', 'method' => 'handlerMethodOne']],
+                        'connection' => 'connection1',
+                        'maxMessages' => '100',
+                        'maxIdleTime' => '500',
+                        'sleep' => '10',
+                    ]
+                ],
+                "'onlySpawnWhenMessageAvailable' field must be specified for consumer 'consumer1'"
+            ],
         ];
     }
 }
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/XsdTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/XsdTest.php
index 1eecf94558960..68d9edc320af3 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/XsdTest.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/XsdTest.php
@@ -62,7 +62,7 @@ public function exemplarXmlDataProvider()
             /** Valid configurations */
             'valid' => [
                 '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
-                    <consumer name="consumer1" queue="queue1" handler="handlerClassOne::handlerMethodOne" consumerInstance="consumerClass1" connection="amqp" maxMessages="100"/>
+                    <consumer name="consumer1" queue="queue1" handler="handlerClassOne::handlerMethodOne" consumerInstance="consumerClass1" connection="amqp" maxMessages="100" maxIdleTime="500" sleep="5" onlySpawnWhenMessageAvailable="true"/>
                     <consumer name="consumer2" queue="queue2" handler="handlerClassTwo::handlerMethodTwo" consumerInstance="consumerClass2" connection="db"/>
                     <consumer name="consumer3" queue="queue3" handler="handlerClassThree::handlerMethodThree" consumerInstance="consumerClass3"/>
                     <consumer name="consumer4" queue="queue4" handler="handlerClassFour::handlerMethodFour"/>
@@ -72,7 +72,7 @@ public function exemplarXmlDataProvider()
             ],
             'non unique consumer name' => [
                 '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
-                    <consumer name="consumer1" queue="queue1" handler="handlerClassOne::handlerMethodOne" consumerInstance="consumerClass1" connection="amqp" maxMessages="100"/>
+                    <consumer name="consumer1" queue="queue1" handler="handlerClassOne::handlerMethodOne" consumerInstance="consumerClass1" connection="amqp" maxMessages="100" maxIdleTime="500" sleep="2" onlySpawnWhenMessageAvailable="false"/>
                     <consumer name="consumer1" queue="queue2" handler="handlerClassTwo::handlerMethodTwo" consumerInstance="consumerClass2" connection="db"/>
                     <consumer name="consumer3" queue="queue3" handler="handlerClassThree::handlerMethodThree" consumerInstance="consumerClass3"/>
                     <consumer name="consumer4" queue="queue4" handler="handlerClassFour::handlerMethodFour"/>
@@ -84,7 +84,7 @@ public function exemplarXmlDataProvider()
             ],
             'invalid handler format' => [
                 '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
-                    <consumer name="consumer1" queue="queue1" handler="handlerClass_One1::handlerMethod1" consumerInstance="consumerClass1" connection="amqp" maxMessages="100"/>
+                    <consumer name="consumer1" queue="queue1" handler="handlerClass_One1::handlerMethod1" consumerInstance="consumerClass1" connection="amqp" maxMessages="100" maxIdleTime="500" sleep="2" onlySpawnWhenMessageAvailable="true"/>
                     <consumer name="consumer2" queue="queue2" handler="handlerClassOne2::handler_Method2" consumerInstance="consumerClass2" connection="db"/>
                     <consumer name="consumer3" queue="queue3" handler="handlerClassThree::handlerMethodThree" consumerInstance="consumerClass3"/>
                     <consumer name="consumer4" queue="queue4" handler="handlerClassFour::handlerMethodFour"/>
@@ -99,7 +99,7 @@ public function exemplarXmlDataProvider()
             ],
             'invalid maxMessages format' => [
                 '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
-                    <consumer name="consumer1" queue="queue1" handler="handlerClassOne::handlerMethodOne" consumerInstance="consumerClass1" connection="amqp" maxMessages="ABC"/>
+                    <consumer name="consumer1" queue="queue1" handler="handlerClassOne::handlerMethodOne" consumerInstance="consumerClass1" connection="amqp" maxMessages="ABC" maxIdleTime="500" sleep="2" onlySpawnWhenMessageAvailable="true"/>
                     <consumer name="consumer2" queue="queue2" handler="handlerClassTwo::handlerMethodTwo" consumerInstance="consumerClass2" connection="db"/>
                     <consumer name="consumer3" queue="queue3" handler="handlerClassThree::handlerMethodThree" consumerInstance="consumerClass3"/>
                     <consumer name="consumer4" queue="queue4" handler="handlerClassFour::handlerMethodFour"/>
@@ -109,6 +109,42 @@ public function exemplarXmlDataProvider()
                     "Element 'consumer', attribute 'maxMessages': 'ABC' is not a valid value of the atomic type 'xs:integer'.",
                 ],
             ],
+            'invalid maxIdleTime format' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
+                    <consumer name="consumer1" queue="queue1" handler="handlerClassOne::handlerMethodOne" consumerInstance="consumerClass1" connection="amqp" maxMessages="100" maxIdleTime="ABC" sleep="5" onlySpawnWhenMessageAvailable="false"/>
+                    <consumer name="consumer2" queue="queue2" handler="handlerClassTwo::handlerMethodTwo" consumerInstance="consumerClass2" connection="db"/>
+                    <consumer name="consumer3" queue="queue3" handler="handlerClassThree::handlerMethodThree" consumerInstance="consumerClass3"/>
+                    <consumer name="consumer4" queue="queue4" handler="handlerClassFour::handlerMethodFour"/>
+                    <consumer name="consumer5" queue="queue4"/>
+                </config>',
+                [
+                    "Element 'consumer', attribute 'maxIdleTime': 'ABC' is not a valid value of the atomic type 'xs:integer'.",
+                ],
+            ],
+            'invalid sleep format' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
+                    <consumer name="consumer1" queue="queue1" handler="handlerClassOne::handlerMethodOne" consumerInstance="consumerClass1" connection="amqp" maxMessages="100" maxIdleTime="500" sleep="ABC" onlySpawnWhenMessageAvailable="false"/>
+                    <consumer name="consumer2" queue="queue2" handler="handlerClassTwo::handlerMethodTwo" consumerInstance="consumerClass2" connection="db"/>
+                    <consumer name="consumer3" queue="queue3" handler="handlerClassThree::handlerMethodThree" consumerInstance="consumerClass3"/>
+                    <consumer name="consumer4" queue="queue4" handler="handlerClassFour::handlerMethodFour"/>
+                    <consumer name="consumer5" queue="queue4"/>
+                </config>',
+                [
+                    "Element 'consumer', attribute 'sleep': 'ABC' is not a valid value of the atomic type 'xs:integer'.",
+                ],
+            ],
+            'invalid onlySpawnWhenMessageAvailable format' => [
+                '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
+                    <consumer name="consumer1" queue="queue1" handler="handlerClassOne::handlerMethodOne" consumerInstance="consumerClass1" connection="amqp" maxMessages="100" maxIdleTime="500" sleep="5" onlySpawnWhenMessageAvailable="text"/>
+                    <consumer name="consumer2" queue="queue2" handler="handlerClassTwo::handlerMethodTwo" consumerInstance="consumerClass2" connection="db"/>
+                    <consumer name="consumer3" queue="queue3" handler="handlerClassThree::handlerMethodThree" consumerInstance="consumerClass3"/>
+                    <consumer name="consumer4" queue="queue4" handler="handlerClassFour::handlerMethodFour"/>
+                    <consumer name="consumer5" queue="queue4"/>
+                </config>',
+                [
+                    "Element 'consumer', attribute 'onlySpawnWhenMessageAvailable': 'text' is not a valid value of the atomic type 'xs:boolean'.",
+                ],
+            ],
             'unexpected element' => [
                 '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
                     <consumer name="consumer1" queue="queue1" handler="handlerClassOne::handlerMethodOne" consumerInstance="consumerClass1" connection="amqp" maxMessages="100"/>
@@ -123,7 +159,7 @@ public function exemplarXmlDataProvider()
             ],
             'unexpected attribute' => [
                 '<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
-                    <consumer name="consumer1" queue="queue1" handler="handlerClassOne::handlerMethodOne" consumerInstance="consumerClass1" connection="amqp" maxMessages="100"/>
+                    <consumer name="consumer1" queue="queue1" handler="handlerClassOne::handlerMethodOne" consumerInstance="consumerClass1" connection="amqp" maxMessages="100" maxIdleTime="500" sleep="2" onlySpawnWhenMessageAvailable="true"/>
                     <consumer name="consumer2" queue="queue2" handler="handlerClassTwo::handlerMethodTwo" consumerInstance="consumerClass2" connection="db"/>
                     <consumer name="consumer3" queue="queue3" handler="handlerClassThree::handlerMethodThree" consumerInstance="consumerClass3"/>
                     <consumer name="consumer4" queue="queue4" handler="handlerClassFour::handlerMethodFour"/>
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/ConsumerTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/ConsumerTest.php
index e7ee0e19a1d43..469b29162b96c 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/ConsumerTest.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/ConsumerTest.php
@@ -18,17 +18,17 @@
 class ConsumerTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Framework\MessageQueue\ConsumerConfigurationInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\MessageQueue\ConsumerConfigurationInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     private $configuration;
 
     /**
-     * @var \Magento\Framework\MessageQueue\MessageEncoder|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\MessageQueue\MessageEncoder|\PHPUnit\Framework\MockObject\MockObject
      */
     private $messageEncoder;
 
     /**
-     * @var \Magento\Framework\MessageQueue\QueueRepository|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\MessageQueue\QueueRepository|\PHPUnit\Framework\MockObject\MockObject
      */
     private $queueRepository;
 
@@ -38,27 +38,27 @@ class ConsumerTest extends \PHPUnit\Framework\TestCase
     private $callbackInvoker;
 
     /**
-     * @var \Magento\Framework\MessageQueue\Consumer\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\MessageQueue\Consumer\ConfigInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     private $consumerConfig;
 
     /**
-     * @var \Magento\Framework\MessageQueue\MessageController|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\MessageQueue\MessageController|\PHPUnit\Framework\MockObject\MockObject
      */
     private $messageController;
 
     /**
-     * @var \Magento\Framework\App\ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\App\ResourceConnection|\PHPUnit\Framework\MockObject\MockObject
      */
     private $resource;
 
     /**
-     * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Psr\Log\LoggerInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     private $logger;
 
     /**
-     * @var \Magento\Framework\Communication\ConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Communication\ConfigInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     private $communicationConfig;
 
@@ -68,17 +68,17 @@ class ConsumerTest extends \PHPUnit\Framework\TestCase
     private $consumer;
 
     /**
-     * @var PoisonPillReadInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var PoisonPillReadInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     private $poisonPillRead;
 
     /**
-     * @var PoisonPillCompareInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var PoisonPillCompareInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     private $poisonPillCompare;
 
     /**
-     * @var \Magento\Framework\App\DeploymentConfig|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\App\DeploymentConfig|\PHPUnit\Framework\MockObject\MockObject
      */
     private $deploymentConfig;
 
@@ -183,4 +183,22 @@ public function testProcessWithNotFoundException()
 
         $this->consumer->process($numberOfMessages);
     }
+
+    /**
+     * Test for process method with 'getMaxIdleTime' and 'getSleep' consumer configurations
+     *
+     * @return void
+     */
+    public function testProcessWithGetMaxIdleTimeAndGetSleepConsumerConfigurations()
+    {
+        $numberOfMessages = 1;
+        $this->poisonPillRead->expects($this->atLeastOnce())->method('getLatestVersion');
+        $queue = $this->getMockBuilder(\Magento\Framework\MessageQueue\QueueInterface::class)
+            ->disableOriginalConstructor()->getMock();
+        $this->configuration->expects($this->once())->method('getQueue')->willReturn($queue);
+        $queue->expects($this->atMost(2))->method('dequeue')->willReturn(null);
+        $this->configuration->expects($this->once())->method('getMaxIdleTime')->willReturn('2');
+        $this->configuration->expects($this->once())->method('getSleep')->willReturn('2');
+        $this->consumer->process($numberOfMessages);
+    }
 }
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_consumer/valid.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_consumer/valid.php
index 5d22103b4c531..32d760d311e16 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_consumer/valid.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_consumer/valid.php
@@ -16,7 +16,10 @@
             ],
         ],
         'connection' => 'connection1',
-        'maxMessages' => '100',
+        'maxMessages' => '200',
+        'maxIdleTime' => '500',
+        'sleep' => '5',
+        'onlySpawnWhenMessageAvailable' => true
     ],
     'consumer2' => [
         'name' => 'consumer2',
@@ -29,7 +32,10 @@
             ],
         ],
         'connection' => 'connection2',
-        'maxMessages' => null,
+        'maxMessages' => '100',
+        'maxIdleTime' => '1000',
+        'sleep' => '2',
+        'onlySpawnWhenMessageAvailable' => false
     ],
     'consumer3' => [
         'name' => 'consumer3',
@@ -41,28 +47,85 @@
                 'method' => 'handlerMethodThree'
             ],
         ],
-        'connection' => 'amqp',
-        'maxMessages' => null,
+        'connection' => 'connection3',
+        'maxMessages' => '50',
+        'maxIdleTime' => '100',
+        'sleep' => null,
+        'onlySpawnWhenMessageAvailable' => false
     ],
     'consumer4' => [
         'name' => 'consumer4',
         'queue' => 'queue4',
-        'consumerInstance' => \Magento\Framework\MessageQueue\ConsumerInterface::class,
+        'consumerInstance' => 'consumerClass4',
         'handlers' => [
             0 => [
                 'type' => 'handlerClassFour',
                 'method' => 'handlerMethodFour'
             ],
         ],
-        'connection' => 'amqp',
-        'maxMessages' => null,
+        'connection' => 'connection4',
+        'maxMessages' => '10',
+        'maxIdleTime' => null,
+        'sleep' => null,
+        'onlySpawnWhenMessageAvailable' => false
     ],
     'consumer5' => [
         'name' => 'consumer5',
         'queue' => 'queue5',
+        'consumerInstance' => 'consumerClass5',
+        'handlers' => [
+            0 => [
+                'type' => 'handlerClassFive',
+                'method' => 'handlerMethodFive'
+            ],
+        ],
+        'connection' => 'connection5',
+        'maxMessages' => null,
+        'maxIdleTime' => null,
+        'sleep' => null,
+        'onlySpawnWhenMessageAvailable' => false
+    ],
+    'consumer6' => [
+        'name' => 'consumer6',
+        'queue' => 'queue6',
+        'consumerInstance' => 'consumerClass6',
+        'handlers' => [
+            0 => [
+                'type' => 'handlerClassSix',
+                'method' => 'handlerMethodSix'
+            ],
+        ],
+        'connection' => 'amqp',
+        'maxMessages' => null,
+        'maxIdleTime' => null,
+        'sleep' => null,
+        'onlySpawnWhenMessageAvailable' => false
+    ],
+    'consumer7' => [
+        'name' => 'consumer7',
+        'queue' => 'queue7',
+        'consumerInstance' => \Magento\Framework\MessageQueue\ConsumerInterface::class,
+        'handlers' => [
+            0 => [
+                'type' => 'handlerClassSeven',
+                'method' => 'handlerMethodSeven'
+            ],
+        ],
+        'connection' => 'amqp',
+        'maxMessages' => null,
+        'maxIdleTime' => null,
+        'sleep' => null,
+        'onlySpawnWhenMessageAvailable' => false
+    ],
+    'consumer8' => [
+        'name' => 'consumer8',
+        'queue' => 'queue8',
         'consumerInstance' => \Magento\Framework\MessageQueue\ConsumerInterface::class,
         'handlers' => [],
         'connection' => 'amqp',
         'maxMessages' => null,
+        'maxIdleTime' => null,
+        'sleep' => null,
+        'onlySpawnWhenMessageAvailable' => false
     ],
 ];
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_consumer/valid.xml b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_consumer/valid.xml
index f020c64a06965..14bbb75d27939 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_consumer/valid.xml
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/_files/queue_consumer/valid.xml
@@ -6,9 +6,12 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
-    <consumer name="consumer1" queue="queue1" handler="handlerClassOne::handlerMethodOne" consumerInstance="consumerClass1" connection="connection1" maxMessages="100"/>
-    <consumer name="consumer2" queue="queue2" handler="handlerClassTwo::handlerMethodTwo" consumerInstance="consumerClass2" connection="connection2"/>
-    <consumer name="consumer3" queue="queue3" handler="handlerClassThree::handlerMethodThree" consumerInstance="consumerClass3"/>
-    <consumer name="consumer4" queue="queue4" handler="handlerClassFour::handlerMethodFour"/>
-    <consumer name="consumer5" queue="queue5"/>
+    <consumer name="consumer1" queue="queue1" handler="handlerClassOne::handlerMethodOne" consumerInstance="consumerClass1" connection="connection1" maxMessages="200" maxIdleTime="500" sleep="5" onlySpawnWhenMessageAvailable="true"/>
+    <consumer name="consumer2" queue="queue2" handler="handlerClassTwo::handlerMethodTwo" consumerInstance="consumerClass2" connection="connection2" maxMessages="100" maxIdleTime="1000" sleep="2"/>
+    <consumer name="consumer3" queue="queue3" handler="handlerClassThree::handlerMethodThree" consumerInstance="consumerClass3" connection="connection3" maxMessages="50" maxIdleTime="100"/>
+    <consumer name="consumer4" queue="queue4" handler="handlerClassFour::handlerMethodFour" consumerInstance="consumerClass4" connection="connection4" maxMessages="10"/>
+    <consumer name="consumer5" queue="queue5" handler="handlerClassFive::handlerMethodFive" consumerInstance="consumerClass5" connection="connection5"/>
+    <consumer name="consumer6" queue="queue6" handler="handlerClassSix::handlerMethodSix" consumerInstance="consumerClass6"/>
+    <consumer name="consumer7" queue="queue7" handler="handlerClassSeven::handlerMethodSeven"/>
+    <consumer name="consumer8" queue="queue8"/>
 </config>
diff --git a/lib/internal/Magento/Framework/MessageQueue/etc/consumer.xsd b/lib/internal/Magento/Framework/MessageQueue/etc/consumer.xsd
index 7e3d501aaa46e..e7595bb10d3b9 100644
--- a/lib/internal/Magento/Framework/MessageQueue/etc/consumer.xsd
+++ b/lib/internal/Magento/Framework/MessageQueue/etc/consumer.xsd
@@ -24,6 +24,9 @@
         <xs:attribute type="xs:string" name="consumerInstance" use="optional"/>
         <xs:attribute name="connection" use="optional" type="xs:string" />
         <xs:attribute type="xs:integer" name="maxMessages" use="optional"/>
+        <xs:attribute type="xs:integer" name="maxIdleTime" use="optional"/>
+        <xs:attribute type="xs:integer" name="sleep" use="optional"/>
+        <xs:attribute type="xs:boolean" name="onlySpawnWhenMessageAvailable" use="optional"/>
     </xs:complexType>
     <xs:simpleType name="handlerType">
         <xs:annotation>

From 85b6d054008a84a7b7a3439f66ee6d6aec925c17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Szubert?= <bartlomiejszubert@gmail.com>
Date: Fri, 8 May 2020 15:06:36 +0200
Subject: [PATCH 0238/1718] Fix #13401 - Multi-Store: "Store View" sort order
 values are not reflected in front-end store-switcher

---
 app/code/Magento/Store/Block/Switcher.php     |   5 +
 .../Store/Test/Unit/Block/SwitcherTest.php    | 163 +++++++++++++-----
 2 files changed, 126 insertions(+), 42 deletions(-)

diff --git a/app/code/Magento/Store/Block/Switcher.php b/app/code/Magento/Store/Block/Switcher.php
index f15349f11066d..df8eaa1cf85da 100644
--- a/app/code/Magento/Store/Block/Switcher.php
+++ b/app/code/Magento/Store/Block/Switcher.php
@@ -193,7 +193,12 @@ public function getStores()
                 $stores = [];
             } else {
                 $stores = $rawStores[$groupId];
+
+                uasort($stores, static function ($itemA, $itemB) {
+                    return (int)$itemA->getSortOrder() <=> (int)$itemB->getSortOrder();
+                });
             }
+
             $this->setData('stores', $stores);
         }
         return $this->getData('stores');
diff --git a/app/code/Magento/Store/Test/Unit/Block/SwitcherTest.php b/app/code/Magento/Store/Test/Unit/Block/SwitcherTest.php
index aca3525a4400e..60c69834f6aa6 100644
--- a/app/code/Magento/Store/Test/Unit/Block/SwitcherTest.php
+++ b/app/code/Magento/Store/Test/Unit/Block/SwitcherTest.php
@@ -3,84 +3,163 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Store\Test\Unit\Block;
 
+use Magento\Directory\Helper\Data;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Data\Helper\PostHelper;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\UrlInterface;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Block\Switcher;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\Website;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
-class SwitcherTest extends \PHPUnit\Framework\TestCase
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class SwitcherTest extends TestCase
 {
-    /** @var \Magento\Store\Block\Switcher */
-    protected $switcher;
-
-    /** @var \Magento\Framework\View\Element\Template\Context|\PHPUnit_Framework_MockObject_MockObject */
-    protected $context;
+    /**
+     * @var Switcher
+     */
+    private $switcher;
 
-    /** @var \Magento\Framework\Data\Helper\PostHelper|\PHPUnit_Framework_MockObject_MockObject */
-    protected $corePostDataHelper;
+    /**
+     * @var PostHelper|MockObject
+     */
+    private $corePostDataHelperMock;
 
-    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $storeManager;
+    /**
+     * @var StoreManagerInterface|MockObject
+     */
+    private $storeManagerMock;
 
-    /** @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
-    protected $urlBuilder;
+    /**
+     * @var UrlInterface|MockObject
+     */
+    private $urlBuilderMock;
 
-    /** @var \Magento\Store\Api\Data\StoreInterface|\PHPUnit_Framework_MockObject_MockObject */
-    private $store;
+    /**
+     * @var ScopeConfigInterface|MockObject
+     */
+    private $scopeConfigMock;
 
     /**
      * @return void
      */
-    protected function setUp()
+    protected function setUp(): void
     {
-        $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)->getMock();
-        $this->urlBuilder = $this->createMock(\Magento\Framework\UrlInterface::class);
-        $this->context = $this->createMock(\Magento\Framework\View\Element\Template\Context::class);
-        $this->context->expects($this->any())->method('getStoreManager')->will($this->returnValue($this->storeManager));
-        $this->context->expects($this->any())->method('getUrlBuilder')->will($this->returnValue($this->urlBuilder));
-        $this->corePostDataHelper = $this->createMock(\Magento\Framework\Data\Helper\PostHelper::class);
-        $this->store = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+        $this->storeManagerMock = $this->getMockBuilder(StoreManagerInterface::class)->getMock();
+        $this->urlBuilderMock = $this->createMock(UrlInterface::class);
+        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
+        $contextMock = $this->createMock(Context::class);
+        $contextMock->method('getStoreManager')->willReturn($this->storeManagerMock);
+        $contextMock->method('getUrlBuilder')->willReturn($this->urlBuilderMock);
+        $contextMock->method('getScopeConfig')->willReturn($this->scopeConfigMock);
+        $this->corePostDataHelperMock = $this->createMock(PostHelper::class);
         $this->switcher = (new ObjectManager($this))->getObject(
-            \Magento\Store\Block\Switcher::class,
+            Switcher::class,
             [
-                'context' => $this->context,
-                'postDataHelper' => $this->corePostDataHelper,
+                'context' => $contextMock,
+                'postDataHelper' => $this->corePostDataHelperMock,
             ]
         );
     }
 
+    public function testGetStoresSortOrder()
+    {
+        $groupId = 1;
+        $storesSortOrder = [
+            1 => 2,
+            2 => 4,
+            3 => 1,
+            4 => 3
+        ];
+
+        $currentStoreMock = $this->getMockBuilder(Store::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $currentStoreMock->method('getGroupId')->willReturn($groupId);
+        $currentStoreMock->method('isUseStoreInUrl')->willReturn(false);
+        $this->storeManagerMock->method('getStore')
+            ->willReturn($currentStoreMock);
+
+        $currentWebsiteMock = $this->getMockBuilder(Website::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->storeManagerMock->method('getWebsite')
+            ->willReturn($currentWebsiteMock);
+
+        $stores = [];
+        foreach ($storesSortOrder as $storeId => $sortOrder) {
+            $storeMock = $this->getMockBuilder(Store::class)
+                ->disableOriginalConstructor()
+                ->setMethods(['getId', 'getGroupId', 'getSortOrder', 'isActive', 'getUrl'])
+                ->getMock();
+            $storeMock->method('getId')->willReturn($storeId);
+            $storeMock->method('getGroupId')->willReturn($groupId);
+            $storeMock->method('getSortOrder')->willReturn($sortOrder);
+            $storeMock->method('isActive')->willReturn(true);
+            $storeMock->method('getUrl')->willReturn('https://example.org');
+            $stores[] = $storeMock;
+        }
+
+        $scopeConfigMap = array_map(static function ($item) {
+            return [
+                Data::XML_PATH_DEFAULT_LOCALE,
+                ScopeInterface::SCOPE_STORE,
+                $item,
+                'en_US'
+            ];
+        }, $stores);
+        $this->scopeConfigMock->method('getValue')
+            ->willReturnMap($scopeConfigMap);
+
+        $currentWebsiteMock->method('getStores')
+            ->willReturn($stores);
+
+        $this->assertEquals([3, 1, 4, 2], array_keys($this->switcher->getStores()));
+    }
+
     /**
      * @return void
      */
     public function testGetTargetStorePostData()
     {
-        $store = $this->getMockBuilder(\Magento\Store\Model\Store::class)
+        $storeMock = $this->getMockBuilder(Store::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $store->expects($this->any())
-            ->method('getCode')
+        $oldStoreMock = $this->getMockBuilder(StoreInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $storeMock->method('getCode')
             ->willReturn('new-store');
         $storeSwitchUrl = 'http://domain.com/stores/store/redirect';
-        $store->expects($this->atLeastOnce())
+        $storeMock->expects($this->atLeastOnce())
             ->method('getCurrentUrl')
             ->with(false)
             ->willReturn($storeSwitchUrl);
-        $this->storeManager->expects($this->once())
+        $this->storeManagerMock->expects($this->once())
             ->method('getStore')
-            ->willReturn($this->store);
-        $this->store->expects($this->once())
+            ->willReturn($oldStoreMock);
+        $oldStoreMock->expects($this->once())
             ->method('getCode')
             ->willReturn('old-store');
-        $this->urlBuilder->expects($this->once())
+        $this->urlBuilderMock->expects($this->once())
             ->method('getUrl')
             ->willReturn($storeSwitchUrl);
-        $this->corePostDataHelper->expects($this->any())
-            ->method('getPostData')
+        $this->corePostDataHelperMock->method('getPostData')
             ->with($storeSwitchUrl, ['___store' => 'new-store', 'uenc' => null, '___from_store' => 'old-store']);
 
-        $this->switcher->getTargetStorePostData($store);
+        $this->switcher->getTargetStorePostData($storeMock);
     }
 
     /**
@@ -89,11 +168,11 @@ public function testGetTargetStorePostData()
      */
     public function testIsStoreInUrl($isUseStoreInUrl)
     {
-        $storeMock = $this->createMock(\Magento\Store\Model\Store::class);
+        $storeMock = $this->createMock(Store::class);
 
-        $storeMock->expects($this->once())->method('isUseStoreInUrl')->will($this->returnValue($isUseStoreInUrl));
+        $storeMock->expects($this->once())->method('isUseStoreInUrl')->willReturn($isUseStoreInUrl);
 
-        $this->storeManager->expects($this->any())->method('getStore')->will($this->returnValue($storeMock));
+        $this->storeManagerMock->method('getStore')->willReturn($storeMock);
         $this->assertEquals($this->switcher->isStoreInUrl(), $isUseStoreInUrl);
         // check value is cached
         $this->assertEquals($this->switcher->isStoreInUrl(), $isUseStoreInUrl);
@@ -103,7 +182,7 @@ public function testIsStoreInUrl($isUseStoreInUrl)
      * @see self::testIsStoreInUrlDataProvider()
      * @return array
      */
-    public function isStoreInUrlDataProvider()
+    public function isStoreInUrlDataProvider(): array
     {
         return [[true], [false]];
     }

From ae82dc4af811115b8abffc5691320dae5e99f0cb Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Fri, 8 May 2020 16:50:56 +0300
Subject: [PATCH 0239/1718] MC-29420: Remove event handlers from CE

---
 .../templates/widget/tabshoriz.phtml          | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml
index 75858f044e76b..c51b357091bda 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml
@@ -42,22 +42,23 @@
         </div>
         <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
             'display:none',
-            '#' . $block->escapeJs($block->getTabId($_tab))
+            '#' . $block->escapeJs($block->getTabId($_tab)) . '_content'
         ); ?>
     </li>
     <?php endforeach; ?>
 </ul>
 </div>
-    <?php $scriptString = '
-require([\'jquery\',\'mage/backend/tabs\'], function($){
+    <?php $scriptString = <<<script
+require(["jquery","mage/backend/tabs"], function($){
     $(function() {
-        $(\'#' . /* @noEscape */ $block->getId() . '\').tabs({
-            active: \'' . /* @noEscape */ $block->getActiveTabId() . '\',
-            destination: \'#' . /* @noEscape */ $block->getDestElementId() . '\',
-            shadowTabs: ' . /* @noEscape */ $block->getAllShadowTabs() . '
+        $('#{$block->getId()}').tabs({
+            active: '{$block->getActiveTabId()}',
+            destination: '#{$block->getDestElementId()}',
+            shadowTabs: {$block->getAllShadowTabs()}
         });
     });
-});';
+});
+script;
     ?>
-    <?= $secureRenderer->renderTag('script', [], /* @noEscape */ $scriptString, false); ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <?php endif; ?>

From d88c8d8748b28b8cd4a4435435795be93a907ef6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Paw=C5=82owski?= <m.pawlowski@nowaera.pl>
Date: Sun, 10 May 2020 09:32:34 +0200
Subject: [PATCH 0240/1718] integration test for scoped message identity

---
 .../Magento/ProductAlert/Model/EmailTest.php  | 34 ++++++++++++++++-
 .../second_store_with_second_identity.php     | 38 +++++++++++++++++++
 ...nd_store_with_second_identity_rollback.php | 30 +++++++++++++++
 3 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Store/_files/second_store_with_second_identity.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Store/_files/second_store_with_second_identity_rollback.php

diff --git a/dev/tests/integration/testsuite/Magento/ProductAlert/Model/EmailTest.php b/dev/tests/integration/testsuite/Magento/ProductAlert/Model/EmailTest.php
index 7e604de42f35c..58031db1b4f6e 100644
--- a/dev/tests/integration/testsuite/Magento/ProductAlert/Model/EmailTest.php
+++ b/dev/tests/integration/testsuite/Magento/ProductAlert/Model/EmailTest.php
@@ -8,7 +8,7 @@
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\ProductAlert\Model\Email;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Model\Website;
 use Magento\TestFramework\Mail\Template\TransportBuilderMock;
 
@@ -156,4 +156,36 @@ public function testEmailForDifferentCustomers(): void
             );
         }
     }
+
+    /**
+     * @magentoAppArea frontend
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDataFixture Magento/Store/_files/second_store_with_second_identity.php
+     */
+    public function testScopedMessageIdentity()
+    {
+        /** @var Website $website */
+        $website = $this->_objectManager->create(Website::class);
+        $website->load(1);
+        $this->_emailModel->setWebsite($website);
+
+        /** @var StoreManagerInterface $storeManager */
+        $storeManager = $this->_objectManager->create(StoreManagerInterface::class);
+        $store = $storeManager->getStore('fixture_second_store');
+        $this->_emailModel->setStoreId($store->getId());
+
+        $customer = $this->customerRepository->getById(1);
+        $this->_emailModel->setCustomerData($customer);
+
+        /** @var \Magento\Catalog\Model\Product $product */
+        $product = $this->productRepository->getById(1);
+
+        $this->_emailModel->addPriceProduct($product);
+        $this->_emailModel->send();
+
+        $from = $this->transportBuilder->getSentMessage()->getFrom()[0];
+        $this->assertEquals('Fixture Store Owner', $from->getName());
+        $this->assertEquals('fixture.store.owner@example.com', $from->getEmail());
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/second_store_with_second_identity.php b/dev/tests/integration/testsuite/Magento/Store/_files/second_store_with_second_identity.php
new file mode 100644
index 0000000000000..a6390cfc30bd3
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/second_store_with_second_identity.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Create fixture store with second identity
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require_once __DIR__ . '/second_store.php';
+
+use Magento\Config\Model\ResourceModel\Config;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\Store;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+$store = $objectManager->create(Store::class);
+if ($storeId = $store->load('fixture_second_store', 'code')->getId()) {
+    /** @var Config $configResource */
+    $configResource = $objectManager->get(Config::class);
+    $configResource->saveConfig(
+        'trans_email/ident_general/name',
+        'Fixture Store Owner',
+        ScopeInterface::SCOPE_STORES,
+        $storeId
+
+    );
+    $configResource->saveConfig(
+        'trans_email/ident_general/email',
+        'fixture.store.owner@example.com',
+        ScopeInterface::SCOPE_STORES,
+        $storeId
+    );
+    $scopeConfig = $objectManager->get(ScopeConfigInterface::class);
+    $scopeConfig->clean();
+}
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/second_store_with_second_identity_rollback.php b/dev/tests/integration/testsuite/Magento/Store/_files/second_store_with_second_identity_rollback.php
new file mode 100644
index 0000000000000..5926f3af0573e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/second_store_with_second_identity_rollback.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Store\Model\ScopeInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+$store = $objectManager->create(\Magento\Store\Model\Store::class);
+$storeId = $store->load('fixture_second_store', 'code')->getId();
+
+if ($storeId) {
+    $configResource = $objectManager->get(\Magento\Config\Model\ResourceModel\Config::class);
+    $configResource->deleteConfig(
+        'trans_email/ident_general/name',
+        ScopeInterface::SCOPE_STORES,
+        $storeId
+    );
+    $configResource->deleteConfig(
+        'trans_email/ident_general/email',
+        ScopeInterface::SCOPE_STORES,
+        $storeId
+    );
+}
+
+require_once __DIR__ . '/second_store_rollback.php';

From feb9f333e93f1cbbaeee6a154251f6d940d6d295 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Sun, 10 May 2020 11:42:07 +0300
Subject: [PATCH 0241/1718] MC-33404: Incorrect display of file name in import
 history

---
 .../Adminhtml/Grid/Column/Renderer/DownloadTest.php      | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Grid/Column/Renderer/DownloadTest.php b/app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Grid/Column/Renderer/DownloadTest.php
index cc0609015a840..d9a00c16cb0af 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Grid/Column/Renderer/DownloadTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Grid/Column/Renderer/DownloadTest.php
@@ -13,6 +13,7 @@
 use Magento\Framework\Escaper;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\ImportExport\Block\Adminhtml\Grid\Column\Renderer\Download;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -21,7 +22,7 @@
 class DownloadTest extends TestCase
 {
     /**
-     * @var Context
+     * @var Context|MockObject
      */
     protected $context;
 
@@ -36,7 +37,7 @@ class DownloadTest extends TestCase
     protected $download;
 
     /**
-     * @var Escaper|\PHPUnit_Framework_MockObject_MockObjecti
+     * @var Escaper|MockObject
      */
     private $escaperMock;
 
@@ -48,7 +49,7 @@ protected function setUp(): void
         $this->escaperMock = $this->createMock(Escaper::class);
         $urlModel = $this->createPartialMock(Url::class, ['getUrl']);
         $urlModel->expects($this->any())->method('getUrl')->willReturn('url');
-        $this->context = $this->createPartialMock(Context::class, ['getUrlBuilder']);
+        $this->context = $this->createPartialMock(Context::class, ['getUrlBuilder', 'getEscaper']);
         $this->context->expects($this->any())->method('getUrlBuilder')->willReturn($urlModel);
         $this->context->expects($this->any())->method('getEscaper')->willReturn($this->escaperMock);
         $data = [];
@@ -58,7 +59,7 @@ protected function setUp(): void
             Download::class,
             [
                 'context' => $this->context,
-                'data' => $data
+                'data' => $data,
             ]
         );
     }

From 87dde6132e4bd5defa174d6ff8da0d6b53961953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Paw=C5=82owski?= <m.pawlowski@nowaera.pl>
Date: Sun, 10 May 2020 14:17:27 +0200
Subject: [PATCH 0242/1718] static analysis fix

---
 app/code/Magento/ProductAlert/Model/Email.php                   | 2 +-
 .../Magento/Store/_files/second_store_with_second_identity.php  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/code/Magento/ProductAlert/Model/Email.php b/app/code/Magento/ProductAlert/Model/Email.php
index 1648c6726c27d..673f2c06b6e07 100644
--- a/app/code/Magento/ProductAlert/Model/Email.php
+++ b/app/code/Magento/ProductAlert/Model/Email.php
@@ -40,7 +40,7 @@
  * @api
  * @since 100.0.2
  * @method int getStoreId()
- * @method $this setStoreId()
+ * @method $this setStoreId(int $storeId)
  */
 class Email extends AbstractModel
 {
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/second_store_with_second_identity.php b/dev/tests/integration/testsuite/Magento/Store/_files/second_store_with_second_identity.php
index a6390cfc30bd3..3a4195a037f4d 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/second_store_with_second_identity.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/second_store_with_second_identity.php
@@ -25,7 +25,6 @@
         'Fixture Store Owner',
         ScopeInterface::SCOPE_STORES,
         $storeId
-
     );
     $configResource->saveConfig(
         'trans_email/ident_general/email',

From 9c79208fd4b4c6348f4c53f4002f1062f0304088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Paw=C5=82owski?= <m.pawlowski@nowaera.pl>
Date: Sun, 10 May 2020 21:33:59 +0200
Subject: [PATCH 0243/1718] suppress coupling in test

---
 .../testsuite/Magento/ProductAlert/Model/EmailTest.php           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/integration/testsuite/Magento/ProductAlert/Model/EmailTest.php b/dev/tests/integration/testsuite/Magento/ProductAlert/Model/EmailTest.php
index 30498aad3a0fe..8466cf700b5d4 100644
--- a/dev/tests/integration/testsuite/Magento/ProductAlert/Model/EmailTest.php
+++ b/dev/tests/integration/testsuite/Magento/ProductAlert/Model/EmailTest.php
@@ -20,6 +20,7 @@
  * Test for Magento\ProductAlert\Model\Email class.
  *
  * @magentoAppIsolation enabled
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class EmailTest extends \PHPUnit\Framework\TestCase
 {

From e099ad1956bf9274000335da43a7f31a27d3d982 Mon Sep 17 00:00:00 2001
From: Andrii Kasian <akasian@magento.com>
Date: Sun, 10 May 2020 19:51:27 -0500
Subject: [PATCH 0244/1718] Improve code quality

---
 .../Model/ResourceModel/Index.php             |  20 +--
 .../Indexer/Category/Flat/AbstractAction.php  |  82 +++++++-----
 .../Indexer/Category/Flat/Action/Rows.php     |  34 ++---
 .../Category/Product/AbstractAction.php       |   2 +-
 .../Indexer/Category/Product/Action/Full.php  |   2 +-
 .../Indexer/Product/Flat/FlatTableBuilder.php |  61 +++++----
 .../Indexer/Product/Flat/Table/Builder.php    |   2 +-
 .../Indexer/Product/Price/AbstractAction.php  | 126 ++++++++++--------
 .../Product/Attribute/AttributeSetFinder.php  |   2 +-
 .../Model/Product/Price/PricePersistence.php  |  48 ++++---
 .../Catalog/Model/ResourceModel/Category.php  |   1 -
 .../Product/Link/Product/Collection.php       | 114 +++++++++-------
 .../Model/ResourceModel/Stock/Status.php      |  60 ++++++---
 .../Model/ConfigurableProductsProvider.php    |   4 +-
 .../Type/Configurable/Product/Collection.php  |   2 +-
 .../Entity/Attribute/Collection.php           |  58 ++++----
 16 files changed, 365 insertions(+), 253 deletions(-)

diff --git a/app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php b/app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php
index be2e68cf30e1e..bf6a62f36e440 100644
--- a/app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php
+++ b/app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php
@@ -5,18 +5,19 @@
  */
 namespace Magento\AdvancedSearch\Model\ResourceModel;
 
-use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
-use Magento\Framework\Search\Request\IndexScopeResolverInterface;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\Model\ResourceModel\Db\Context;
-use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
+use Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+use Magento\Framework\Model\ResourceModel\Db\Context;
 use Magento\Framework\Search\Request\Dimension;
-use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
+use Magento\Framework\Search\Request\IndexScopeResolverInterface;
 use Magento\Framework\Search\Request\IndexScopeResolverInterface as TableResolver;
-use Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory;
 use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * @api
@@ -55,6 +56,7 @@ class Index extends AbstractDb
 
     /**
      * Index constructor.
+     *
      * @param Context $context
      * @param StoreManagerInterface $storeManager
      * @param MetadataPool $metadataPool
@@ -80,7 +82,9 @@ public function __construct(
 
     /**
      * Implementation of abstract construct
+     *
      * @return void
+     * @SuppressWarnings(PHPMD)
      * @since 100.1.0
      */
     protected function _construct()
@@ -159,7 +163,7 @@ public function getCategoryProductIndexData($storeId = null, $productIds = null)
     {
         $connection = $this->getConnection();
 
-        $catalogCategoryProductDimension = new Dimension(\Magento\Store\Model\Store::ENTITY, $storeId);
+        $catalogCategoryProductDimension = new Dimension(Store::ENTITY, $storeId);
 
         $catalogCategoryProductTableName = $this->tableResolver->resolve(
             AbstractAction::MAIN_INDEX_TABLE,
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
index 50e8df10d57ff..f2148a721d764 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
@@ -6,10 +6,21 @@
 
 namespace Magento\Catalog\Model\Indexer\Category\Flat;
 
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\ResourceModel\Helper;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Ddl\Table;
+use Magento\Framework\EntityManager\EntityMetadata;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Abstract action class for category flat indexers.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class AbstractAction
 {
@@ -31,14 +42,14 @@ class AbstractAction
     protected $resource;
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     protected $storeManager;
 
     /**
      * Catalog resource helper
      *
-     * @var \Magento\Catalog\Model\ResourceModel\Helper
+     * @var Helper
      */
     protected $resourceHelper;
 
@@ -50,12 +61,12 @@ class AbstractAction
     protected $columns = [];
 
     /**
-     * @var \Magento\Framework\DB\Adapter\AdapterInterface
+     * @var AdapterInterface
      */
     protected $connection;
 
     /**
-     * @var \Magento\Framework\EntityManager\EntityMetadata
+     * @var EntityMetadata
      */
     protected $categoryMetadata;
 
@@ -68,13 +79,13 @@ class AbstractAction
 
     /**
      * @param ResourceConnection $resource
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
+     * @param StoreManagerInterface $storeManager
+     * @param Helper $resourceHelper
      */
     public function __construct(
         ResourceConnection $resource,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
+        StoreManagerInterface $storeManager,
+        Helper $resourceHelper
     ) {
         $this->resource = $resource;
         $this->connection = $resource->getConnection();
@@ -110,23 +121,22 @@ public function getColumns()
      * @param integer $storeId
      * @return string
      */
-    public function getMainStoreTable($storeId = \Magento\Store\Model\Store::DEFAULT_STORE_ID)
+    public function getMainStoreTable($storeId = Store::DEFAULT_STORE_ID)
     {
         if (is_string($storeId)) {
             $storeId = (int) $storeId;
         }
 
         $suffix = sprintf('store_%d', $storeId);
-        $table = $this->connection->getTableName($this->getTableName('catalog_category_flat_' . $suffix));
-
-        return $table;
+        return $this->connection->getTableName($this->getTableName('catalog_category_flat_' . $suffix));
     }
 
     /**
      * Return structure for flat catalog table
      *
      * @param string $tableName
-     * @return \Magento\Framework\DB\Ddl\Table
+     * @return Table
+     * @throws \Zend_Db_Exception
      */
     protected function getFlatTableStructure($tableName)
     {
@@ -139,10 +149,10 @@ protected function getFlatTableStructure($tableName)
         //Adding columns
         foreach ($this->getColumns() as $fieldName => $fieldProp) {
             $default = $fieldProp['default'];
-            if ($fieldProp['type'][0] == \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP
+            if ($fieldProp['type'][0] == Table::TYPE_TIMESTAMP
                 && $default == 'CURRENT_TIMESTAMP'
             ) {
-                $default = \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT;
+                $default = Table::TIMESTAMP_INIT;
             }
             $table->addColumn(
                 $fieldName,
@@ -205,9 +215,9 @@ protected function getStaticColumns()
             $ddlType = $this->resourceHelper->getDdlTypeByColumnType($column['DATA_TYPE']);
             $column['DEFAULT'] = trim($column['DEFAULT'], "' ");
             switch ($ddlType) {
-                case \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT:
-                case \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER:
-                case \Magento\Framework\DB\Ddl\Table::TYPE_BIGINT:
+                case Table::TYPE_SMALLINT:
+                case Table::TYPE_INTEGER:
+                case Table::TYPE_BIGINT:
                     $isUnsigned = (bool)$column['UNSIGNED'];
                     if ($column['DEFAULT'] === '') {
                         $column['DEFAULT'] = null;
@@ -215,27 +225,27 @@ protected function getStaticColumns()
 
                     $options = null;
                     if ($column['SCALE'] > 0) {
-                        $ddlType = \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL;
+                        $ddlType = Table::TYPE_DECIMAL;
                     } else {
                         break;
                     }
                     // fall-through intentional
-                case \Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL:
+                case Table::TYPE_DECIMAL:
                     $options = $column['PRECISION'] . ',' . $column['SCALE'];
                     $isUnsigned = null;
                     if ($column['DEFAULT'] === '') {
                         $column['DEFAULT'] = null;
                     }
                     break;
-                case \Magento\Framework\DB\Ddl\Table::TYPE_TEXT:
+                case Table::TYPE_TEXT:
                     $options = $column['LENGTH'];
                     $isUnsigned = null;
                     break;
-                case \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP:
+                case Table::TYPE_TIMESTAMP:
                     $options = null;
                     $isUnsigned = null;
                     break;
-                case \Magento\Framework\DB\Ddl\Table::TYPE_DATETIME:
+                case Table::TYPE_DATETIME:
                     $isUnsigned = null;
                     break;
             }
@@ -248,7 +258,7 @@ protected function getStaticColumns()
             ];
         }
         $columns['store_id'] = [
-            'type' => [\Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT, 5],
+            'type' => [Table::TYPE_SMALLINT, 5],
             'unsigned' => true,
             'nullable' => false,
             'default' => '0',
@@ -274,7 +284,7 @@ protected function getEavColumns()
             switch ($attribute['backend_type']) {
                 case 'varchar':
                     $columns[$attribute['attribute_code']] = [
-                        'type' => [\Magento\Framework\DB\Ddl\Table::TYPE_TEXT, 255],
+                        'type' => [Table::TYPE_TEXT, 255],
                         'unsigned' => null,
                         'nullable' => true,
                         'default' => null,
@@ -283,7 +293,7 @@ protected function getEavColumns()
                     break;
                 case 'int':
                     $columns[$attribute['attribute_code']] = [
-                        'type' => [\Magento\Framework\DB\Ddl\Table::TYPE_INTEGER, null],
+                        'type' => [Table::TYPE_INTEGER, null],
                         'unsigned' => null,
                         'nullable' => true,
                         'default' => null,
@@ -292,7 +302,7 @@ protected function getEavColumns()
                     break;
                 case 'text':
                     $columns[$attribute['attribute_code']] = [
-                        'type' => [\Magento\Framework\DB\Ddl\Table::TYPE_TEXT, '64k'],
+                        'type' => [Table::TYPE_TEXT, '64k'],
                         'unsigned' => null,
                         'nullable' => true,
                         'default' => null,
@@ -301,7 +311,7 @@ protected function getEavColumns()
                     break;
                 case 'datetime':
                     $columns[$attribute['attribute_code']] = [
-                        'type' => [\Magento\Framework\DB\Ddl\Table::TYPE_DATETIME, null],
+                        'type' => [Table::TYPE_DATETIME, null],
                         'unsigned' => null,
                         'nullable' => true,
                         'default' => null,
@@ -310,7 +320,7 @@ protected function getEavColumns()
                     break;
                 case 'decimal':
                     $columns[$attribute['attribute_code']] = [
-                        'type' => [\Magento\Framework\DB\Ddl\Table::TYPE_DECIMAL, '12,4'],
+                        'type' => [Table::TYPE_DECIMAL, '12,4'],
                         'unsigned' => null,
                         'nullable' => true,
                         'default' => null,
@@ -346,7 +356,7 @@ protected function getAttributes()
                 $this->connection->getTableName(
                     $this->getTableName('eav_entity_type')
                 ) . '.entity_type_code = ?',
-                \Magento\Catalog\Model\Category::ENTITY
+                Category::ENTITY
             );
             $this->attributeCodes = [];
             foreach ($this->connection->fetchAll($select) as $attribute) {
@@ -464,7 +474,7 @@ protected function getAttributeTypeValues($type, $entityIds, $storeId)
             \Zend_Db::BIGINT_TYPE
         )->where(
             'def.store_id IN (?)',
-            [\Magento\Store\Model\Store::DEFAULT_STORE_ID, $storeId],
+            [Store::DEFAULT_STORE_ID, $storeId],
             \Zend_Db::BIGINT_TYPE
         );
 
@@ -504,14 +514,14 @@ protected function getTableName($name)
     /**
      * Get category metadata instance.
      *
-     * @return \Magento\Framework\EntityManager\EntityMetadata
+     * @return EntityMetadata
      */
     private function getCategoryMetadata()
     {
         if (null === $this->categoryMetadata) {
-            $metadataPool = \Magento\Framework\App\ObjectManager::getInstance()
+            $metadataPool = ObjectManager::getInstance()
                 ->get(\Magento\Framework\EntityManager\MetadataPool::class);
-            $this->categoryMetadata = $metadataPool->getMetadata(\Magento\Catalog\Api\Data\CategoryInterface::class);
+            $this->categoryMetadata = $metadataPool->getMetadata(CategoryInterface::class);
         }
         return $this->categoryMetadata;
     }
@@ -524,8 +534,8 @@ private function getCategoryMetadata()
     private function getSkipStaticColumns()
     {
         if (null === $this->skipStaticColumns) {
-            $provider = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Catalog\Model\Indexer\Category\Flat\SkipStaticColumnsProvider::class);
+            $provider = ObjectManager::getInstance()
+                ->get(SkipStaticColumnsProvider::class);
             $this->skipStaticColumns = $provider->get();
         }
         return $this->skipStaticColumns;
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Rows.php
index 00499232c8c33..c5751d580607b 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Rows.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Rows.php
@@ -171,27 +171,30 @@ private function buildIndexData(Store $store, $categoriesIdsChunk, $attributesDa
         foreach ($categoriesIdsChunk as $categoryId) {
             try {
                 $category = $this->categoryRepository->get($categoryId);
-                $categoryData = $category->getData();
-                $linkId = $categoryData[$linkField];
-
-                $categoryAttributesData = [];
-                if (isset($attributesData[$linkId]) && is_array($attributesData[$linkId])) {
-                    $categoryAttributesData = $attributesData[$linkId];
-                }
-                $categoryIndexData = $this->buildCategoryIndexData(
-                    $store,
-                    $categoryData,
-                    $categoryAttributesData
-                );
-                $data[] = $categoryIndexData;
             } catch (NoSuchEntityException $e) {
-                // ignore
+                continue;
             }
+
+            $categoryData = $category->getData();
+            $linkId = $categoryData[$linkField];
+
+            $categoryAttributesData = [];
+            if (isset($attributesData[$linkId]) && is_array($attributesData[$linkId])) {
+                $categoryAttributesData = $attributesData[$linkId];
+            }
+            $categoryIndexData = $this->buildCategoryIndexData(
+                $store,
+                $categoryData,
+                $categoryAttributesData
+            );
+            $data[] = $categoryIndexData;
         }
         return $data;
     }
 
     /**
+     * Prepare Category data
+     *
      * @param Store $store
      * @param array $categoryData
      * @param array $categoryAttributesData
@@ -214,7 +217,8 @@ private function buildCategoryIndexData(Store $store, array $categoryData, array
      * Insert or update index data
      *
      * @param string $tableName
-     * @param $data
+     * @param array $data
+     * @return void
      */
     private function updateIndexData($tableName, $data)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
index b9433fda47235..42e9e4309a08b 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
@@ -42,7 +42,7 @@ abstract class AbstractAction
 
     /**
      * Suffix for table to show it is temporary
-     * @deprecated
+     * @deprecated see getIndexTable
      */
     const TEMPORARY_TABLE_SUFFIX = '_tmp';
 
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
index 71bbc45d77532..f758fd1759309 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
@@ -174,7 +174,7 @@ protected function reindex(): void
         foreach ($this->storeManager->getStores() as $store) {
             if ($this->getPathFromCategoryId($store->getRootCategoryId())) {
                 $userFunctions[$store->getId()] = function () use ($store) {
-                    return $this->reindexStore($store);
+                    $this->reindexStore($store);
                 };
             }
         }
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 0d62f780c9aa2..e92778226aadd 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
@@ -6,8 +6,18 @@
 namespace Magento\Catalog\Model\Indexer\Product\Flat;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Helper\Product\Flat\Indexer;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Eav\Model\Entity\Attribute;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Ddl\Table;
+use Magento\Framework\DB\Select;
 use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class for building flat index
@@ -27,22 +37,22 @@ class FlatTableBuilder
     const XML_NODE_MAX_INDEX_COUNT = 'catalog/product/flat/max_index_count';
 
     /**
-     * @var \Magento\Catalog\Helper\Product\Flat\Indexer
+     * @var Indexer
      */
     protected $_productIndexerHelper;
 
     /**
-     * @var \Magento\Framework\DB\Adapter\AdapterInterface
+     * @var AdapterInterface
      */
     protected $_connection;
 
     /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface $config
+     * @var ScopeConfigInterface $config
      */
     protected $_config;
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -52,23 +62,23 @@ class FlatTableBuilder
     protected $_tableData;
 
     /**
-     * @var \Magento\Framework\App\ResourceConnection
+     * @var ResourceConnection
      */
     protected $resource;
 
     /**
-     * @param \Magento\Catalog\Helper\Product\Flat\Indexer $productIndexerHelper
+     * @param Indexer $productIndexerHelper
      * @param ResourceConnection $resource
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param ScopeConfigInterface $config
+     * @param StoreManagerInterface $storeManager
      * @param TableDataInterface $tableData
      */
     public function __construct(
-        \Magento\Catalog\Helper\Product\Flat\Indexer $productIndexerHelper,
-        \Magento\Framework\App\ResourceConnection $resource,
-        \Magento\Framework\App\Config\ScopeConfigInterface $config,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Catalog\Model\Indexer\Product\Flat\TableDataInterface $tableData
+        Indexer $productIndexerHelper,
+        ResourceConnection $resource,
+        ScopeConfigInterface $config,
+        StoreManagerInterface $storeManager,
+        TableDataInterface $tableData
     ) {
         $this->_productIndexerHelper = $productIndexerHelper;
         $this->resource = $resource;
@@ -114,7 +124,8 @@ public function build($storeId, $changedIds, $valueFieldSuffix, $tableDropSuffix
      *
      * @param int|string $storeId
      * @return void
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
+     * @throws \Zend_Db_Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -128,7 +139,7 @@ protected function _createTemporaryFlatTable($storeId)
             self::XML_NODE_MAX_INDEX_COUNT
         );
         if ($maxIndex && count($indexesNeed) > $maxIndex) {
-            throw new \Magento\Framework\Exception\LocalizedException(
+            throw new LocalizedException(
                 __(
                     'The Flat Catalog module has a limit of %2$d filterable and/or sortable attributes.'
                     . 'Currently there are %1$d of them.'
@@ -141,7 +152,7 @@ protected function _createTemporaryFlatTable($storeId)
 
         $indexKeys = [];
         $indexProps = array_values($indexesNeed);
-        $upperPrimaryKey = strtoupper(\Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_PRIMARY);
+        $upperPrimaryKey = strtoupper(AdapterInterface::INDEX_TYPE_PRIMARY);
         foreach ($indexProps as $i => $indexProp) {
             $indexName = $this->_connection->getIndexName(
                 $this->_getTemporaryTableName($this->_productIndexerHelper->getFlatTableName($storeId)),
@@ -164,7 +175,7 @@ protected function _createTemporaryFlatTable($storeId)
         }
         $indexesNeed = array_combine($indexKeys, $indexProps);
 
-        /** @var $table \Magento\Framework\DB\Ddl\Table */
+        /** @var $table Table */
         $table = $this->_connection->newTable(
             $this->_getTemporaryTableName($this->_productIndexerHelper->getFlatTableName($storeId))
         );
@@ -211,6 +222,8 @@ protected function _createTemporaryFlatTable($storeId)
      * @param int|string $storeId
      * @param string $valueFieldSuffix
      * @return void
+     * @throws LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     protected function _fillTemporaryFlatTable(array $tables, $storeId, $valueFieldSuffix)
     {
@@ -233,7 +246,7 @@ protected function _fillTemporaryFlatTable(array $tables, $storeId, $valueFieldS
             )
         );
 
-        /* @var $status \Magento\Eav\Model\Entity\Attribute */
+        /* @var $status Attribute */
         $status = $this->_productIndexerHelper->getAttribute('status');
         $statusTable = $this->_getTemporaryTableName($status->getBackendTable());
         $statusConditions = [
@@ -262,7 +275,7 @@ protected function _fillTemporaryFlatTable(array $tables, $storeId, $valueFieldS
             implode(' AND ', $statusConditions),
             []
         )->where(
-            $statusExpression . ' = ' . \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
+            $statusExpression . ' = ' . Status::STATUS_ENABLED
         );
 
         foreach ($tables as $tableName => $columns) {
@@ -319,7 +332,7 @@ protected function _updateTemporaryTableByStoreValues(
         $linkField = $this->getMetadataPool()->getMetadata(ProductInterface::class)->getLinkField();
         foreach ($tables as $tableName => $columns) {
             foreach ($columns as $attribute) {
-                /* @var $attribute \Magento\Eav\Model\Entity\Attribute */
+                /* @var $attribute Attribute */
                 $attributeCode = $attribute->getAttributeCode();
                 if ($attribute->getBackend()->getType() != 'static') {
                     $joinCondition = sprintf('t.%s = e.%s', $linkField, $linkField) .
@@ -328,7 +341,7 @@ protected function _updateTemporaryTableByStoreValues(
                         ' AND t.store_id = ' .
                         $storeId .
                         ' AND t.value IS NOT NULL';
-                    /** @var $select \Magento\Framework\DB\Select */
+                    /** @var $select Select */
                     $select = $this->_connection->select()
                         ->joinInner(
                             ['e' => $this->resource->getTableName('catalog_product_entity')],
@@ -390,13 +403,13 @@ protected function _getTemporaryTableName($tableName)
     /**
      * Get 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/Indexer/Product/Flat/Table/Builder.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Table/Builder.php
index fb9c8aace8d7d..23eaf7d7b2010 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Table/Builder.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Table/Builder.php
@@ -6,7 +6,7 @@
 namespace Magento\Catalog\Model\Indexer\Product\Flat\Table;
 
 /**
- * Class Builder
+ * Build table structure based on provided columns
  */
 class Builder implements BuilderInterface
 {
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 1b4d61c899428..d32bd86d750ee 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
@@ -3,13 +3,31 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Model\Indexer\Product\Price;
 
+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\PriceInterface;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\TierPrice;
 use Magento\Customer\Model\Indexer\CustomerGroupDimensionProvider;
+use Magento\Directory\Model\Currency;
+use Magento\Directory\Model\CurrencyFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Indexer\DimensionalIndexerInterface;
+use Magento\Framework\Search\Request\Dimension;
+use Magento\Framework\Stdlib\DateTime;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\Website;
 
 /**
  * Abstract action reindex class
@@ -26,48 +44,48 @@ abstract class AbstractAction
     protected $_defaultIndexerResource;
 
     /**
-     * @var \Magento\Framework\DB\Adapter\AdapterInterface
+     * @var AdapterInterface
      */
     protected $_connection;
 
     /**
      * Core config model
      *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     * @var ScopeConfigInterface
      */
     protected $_config;
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
      * Currency factory
      *
-     * @var \Magento\Directory\Model\CurrencyFactory
+     * @var CurrencyFactory
      */
     protected $_currencyFactory;
 
     /**
-     * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
+     * @var TimezoneInterface
      */
     protected $_localeDate;
 
     /**
-     * @var \Magento\Framework\Stdlib\DateTime
+     * @var DateTime
      */
     protected $_dateTime;
 
     /**
-     * @var \Magento\Catalog\Model\Product\Type
+     * @var Type
      */
     protected $_catalogProductType;
 
     /**
      * Indexer price factory
      *
-     * @var \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Factory
+     * @var Factory
      */
     protected $_indexerPriceFactory;
 
@@ -77,12 +95,12 @@ abstract class AbstractAction
     protected $_indexers;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\TierPrice
+     * @var TierPrice
      */
     private $tierPriceIndexResource;
 
     /**
-     * @var \Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory
+     * @var DimensionCollectionFactory
      */
     private $dimensionCollectionFactory;
 
@@ -92,15 +110,15 @@ abstract class AbstractAction
     private $tableMaintainer;
 
     /**
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
-     * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
-     * @param \Magento\Framework\Stdlib\DateTime $dateTime
-     * @param \Magento\Catalog\Model\Product\Type $catalogProductType
-     * @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Factory $indexerPriceFactory
+     * @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 \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\TierPrice|null $tierPriceIndexResource
+     * @param TierPrice|null $tierPriceIndexResource
      * @param DimensionCollectionFactory|null $dimensionCollectionFactory
      * @param TableMaintainer|null $tableMaintainer
      * @SuppressWarnings(PHPMD.NPathComplexity)
@@ -108,17 +126,17 @@ abstract class AbstractAction
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
-        \Magento\Framework\App\Config\ScopeConfigInterface $config,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Directory\Model\CurrencyFactory $currencyFactory,
-        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
-        \Magento\Framework\Stdlib\DateTime $dateTime,
-        \Magento\Catalog\Model\Product\Type $catalogProductType,
-        \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Factory $indexerPriceFactory,
+        ScopeConfigInterface $config,
+        StoreManagerInterface $storeManager,
+        CurrencyFactory $currencyFactory,
+        TimezoneInterface $localeDate,
+        DateTime $dateTime,
+        Type $catalogProductType,
+        Factory $indexerPriceFactory,
         DefaultPrice $defaultIndexerResource,
-        \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\TierPrice $tierPriceIndexResource = null,
-        \Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory $dimensionCollectionFactory = null,
-        \Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer $tableMaintainer = null
+        TierPrice $tierPriceIndexResource = null,
+        DimensionCollectionFactory $dimensionCollectionFactory = null,
+        TableMaintainer $tableMaintainer = null
     ) {
         $this->_config = $config;
         $this->_storeManager = $storeManager;
@@ -130,13 +148,13 @@ public function __construct(
         $this->_defaultIndexerResource = $defaultIndexerResource;
         $this->_connection = $this->_defaultIndexerResource->getConnection();
         $this->tierPriceIndexResource = $tierPriceIndexResource ?? ObjectManager::getInstance()->get(
-            \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\TierPrice::class
+            TierPrice::class
         );
         $this->dimensionCollectionFactory = $dimensionCollectionFactory ?? ObjectManager::getInstance()->get(
-            \Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory::class
+            DimensionCollectionFactory::class
         );
         $this->tableMaintainer = $tableMaintainer ?? ObjectManager::getInstance()->get(
-            \Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer::class
+            TableMaintainer::class
         );
     }
 
@@ -152,7 +170,7 @@ abstract public function execute($ids);
      * Synchronize data between index storage and original storage
      *
      * @param array $processIds
-     * @return \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
+     * @return AbstractAction
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @deprecated Used only for backward compatibility for indexer, which not support indexation by dimensions
      */
@@ -182,14 +200,14 @@ protected function _syncData(array $processIds = [])
     /**
      * Prepare website current dates table
      *
-     * @return \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
+     * @return AbstractAction
      *
-     * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      */
     protected function _prepareWebsiteDateTable()
     {
-        $baseCurrency = $this->_config->getValue(\Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE);
+        $baseCurrency = $this->_config->getValue(Currency::XML_PATH_CURRENCY_BASE);
 
         $select = $this->getConnection()->select()->from(
             ['cw' => $this->_defaultIndexerResource->getTable('store_website')],
@@ -204,7 +222,7 @@ protected function _prepareWebsiteDateTable()
 
         $data = [];
         foreach ($this->getConnection()->fetchAll($select) as $item) {
-            /** @var $website \Magento\Store\Model\Website */
+            /** @var $website Website */
             $website = $this->_storeManager->getWebsite($item['website_id']);
 
             if ($website->getBaseCurrencyCode() != $baseCurrency) {
@@ -220,7 +238,7 @@ protected function _prepareWebsiteDateTable()
                 $rate = 1;
             }
 
-            /** @var $store \Magento\Store\Model\Store */
+            /** @var $store Store */
             $store = $this->_storeManager->getStore($item['store_id']);
             if ($store) {
                 $timestamp = $this->_localeDate->scopeTimeStamp($store);
@@ -248,11 +266,11 @@ protected function _prepareWebsiteDateTable()
      * Prepare tier price index table
      *
      * @param int|array $entityIds the entity ids limitation
-     * @return \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
+     * @return AbstractAction
      */
     protected function _prepareTierPriceIndex($entityIds = null)
     {
-        $this->tierPriceIndexResource->reindexEntity((array) $entityIds);
+        $this->tierPriceIndexResource->reindexEntity((array)$entityIds);
 
         return $this;
     }
@@ -262,9 +280,9 @@ protected function _prepareTierPriceIndex($entityIds = null)
      *
      * @param bool $fullReindexAction
      *
-     * @return \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\PriceInterface[]
+     * @return PriceInterface[]
      *
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function getTypeIndexers($fullReindexAction = false)
     {
@@ -301,16 +319,16 @@ public function getTypeIndexers($fullReindexAction = false)
      * Retrieve Price indexer by Product Type
      *
      * @param string $productTypeId
-     * @return \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\PriceInterface
+     * @return PriceInterface
      *
-     * @throws \Magento\Framework\Exception\InputException
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws InputException
+     * @throws LocalizedException
      */
     protected function _getIndexer($productTypeId)
     {
         $this->getTypeIndexers();
         if (!isset($this->_indexers[$productTypeId])) {
-            throw new \Magento\Framework\Exception\InputException(__('Unsupported product type "%1".', $productTypeId));
+            throw new InputException(__('Unsupported product type "%1".', $productTypeId));
         }
         return $this->_indexers[$productTypeId];
     }
@@ -335,7 +353,7 @@ protected function _insertFromTable($sourceTable, $destTable, $where = null)
             $select,
             $destTable,
             $targetColumns,
-            \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_ON_DUPLICATE
+            AdapterInterface::INSERT_ON_DUPLICATE
         );
         $this->getConnection()->query($query);
     }
@@ -357,9 +375,9 @@ protected function _emptyTable($table)
      * @param array $changedIds
      * @return array Affected ids
      *
-     * @throws \Magento\Framework\Exception\InputException
-     * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws InputException
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      */
     protected function _reindexRows($changedIds = [])
     {
@@ -401,6 +419,8 @@ protected function _reindexRows($changedIds = [])
     }
 
     /**
+     * Cleanup index for list of entities
+     *
      * @param array $entityIds
      * @return void
      */
@@ -421,7 +441,7 @@ private function deleteIndexData(array $entityIds)
      *
      * @param null|array $parentIds
      * @param array $excludeIds
-     * @return \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
+     * @return AbstractAction
      * @deprecated Used only for backward compatibility for do not broke custom indexer implementation
      * which do not work by dimensions.
      * For indexers, which support dimensions all composite products read data directly from main price indexer table
@@ -468,7 +488,7 @@ protected function _copyRelationIndexData($parentIds, $excludeIds = null)
      *
      * This method is used during both partial and full reindex to identify the table.
      *
-     * @param \Magento\Framework\Search\Request\Dimension[] $dimensions
+     * @param Dimension[] $dimensions
      *
      * @return string
      */
@@ -564,7 +584,7 @@ private function getParentProductsTypes(array $productsIds)
     /**
      * Get connection
      *
-     * @return \Magento\Framework\DB\Adapter\AdapterInterface
+     * @return AdapterInterface
      */
     private function getConnection()
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/AttributeSetFinder.php b/app/code/Magento/Catalog/Model/Product/Attribute/AttributeSetFinder.php
index 5211f7470afc2..de9d60b77033a 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/AttributeSetFinder.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/AttributeSetFinder.php
@@ -27,7 +27,7 @@ public function __construct(CollectionFactory $productCollectionFactory)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function findAttributeSetIdsByProductIds(array $productIds)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Price/PricePersistence.php b/app/code/Magento/Catalog/Model/Product/Price/PricePersistence.php
index 0b8baa56243b3..41833a1894683 100644
--- a/app/code/Magento/Catalog/Model/Product/Price/PricePersistence.php
+++ b/app/code/Magento/Catalog/Model/Product/Price/PricePersistence.php
@@ -6,8 +6,16 @@
 
 namespace Magento\Catalog\Model\Product\Price;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Catalog\Model\ProductIdLocatorInterface;
+use Magento\Catalog\Model\ResourceModel\Attribute;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Exception\CouldNotDeleteException;
+use Magento\Framework\Exception\CouldNotSaveException;
+
 /**
- * Price persistence.
+ * Class responsibly for persistence of prices.
  */
 class PricePersistence
 {
@@ -19,24 +27,24 @@ class PricePersistence
     private $table = 'catalog_product_entity_decimal';
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Attribute
+     * @var Attribute
      */
     private $attributeResource;
 
     /**
-     * @var \Magento\Catalog\Api\ProductAttributeRepositoryInterface
+     * @var ProductAttributeRepositoryInterface
      */
     private $attributeRepository;
 
     /**
-     * @var \Magento\Catalog\Model\ProductIdLocatorInterface
+     * @var ProductIdLocatorInterface
      */
     private $productIdLocator;
 
     /**
      * Metadata pool.
      *
-     * @var \Magento\Framework\EntityManager\MetadataPool
+     * @var MetadataPool
      */
     private $metadataPool;
 
@@ -64,17 +72,17 @@ class PricePersistence
     /**
      * PricePersistence constructor.
      *
-     * @param \Magento\Catalog\Model\ResourceModel\Attribute $attributeResource
-     * @param \Magento\Catalog\Api\ProductAttributeRepositoryInterface $attributeRepository
-     * @param \Magento\Catalog\Model\ProductIdLocatorInterface $productIdLocator
-     * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
+     * @param Attribute $attributeResource
+     * @param ProductAttributeRepositoryInterface $attributeRepository
+     * @param ProductIdLocatorInterface $productIdLocator
+     * @param MetadataPool $metadataPool
      * @param string $attributeCode
      */
     public function __construct(
-        \Magento\Catalog\Model\ResourceModel\Attribute $attributeResource,
-        \Magento\Catalog\Api\ProductAttributeRepositoryInterface $attributeRepository,
-        \Magento\Catalog\Model\ProductIdLocatorInterface $productIdLocator,
-        \Magento\Framework\EntityManager\MetadataPool $metadataPool,
+        Attribute $attributeResource,
+        ProductAttributeRepositoryInterface $attributeRepository,
+        ProductIdLocatorInterface $productIdLocator,
+        MetadataPool $metadataPool,
         $attributeCode = ''
     ) {
         $this->attributeResource = $attributeResource;
@@ -107,7 +115,7 @@ public function get(array $skus)
      *
      * @param array $prices
      * @return void
-     * @throws \Magento\Framework\Exception\CouldNotSaveException
+     * @throws CouldNotSaveException
      */
     public function update(array $prices)
     {
@@ -127,7 +135,7 @@ public function update(array $prices)
             $connection->commit();
         } catch (\Exception $e) {
             $connection->rollBack();
-            throw new \Magento\Framework\Exception\CouldNotSaveException(
+            throw new CouldNotSaveException(
                 __('Could not save Prices.'),
                 $e
             );
@@ -139,7 +147,7 @@ public function update(array $prices)
      *
      * @param array $skus
      * @return void
-     * @throws \Magento\Framework\Exception\CouldNotDeleteException
+     * @throws CouldNotDeleteException
      */
     public function delete(array $skus)
     {
@@ -159,7 +167,7 @@ public function delete(array $skus)
             $connection->commit();
         } catch (\Exception $e) {
             $connection->rollBack();
-            throw new \Magento\Framework\Exception\CouldNotDeleteException(
+            throw new CouldNotDeleteException(
                 __('Could not delete Prices'),
                 $e
             );
@@ -209,10 +217,10 @@ private function retrieveAffectedIds(array $skus)
         $affectedIds = [];
 
         foreach ($this->productIdLocator->retrieveProductIdsBySkus($skus) as $productIds) {
-            $affectedIds = array_merge($affectedIds, array_keys($productIds));
+            $affectedIds[] = array_keys($productIds);
         }
 
-        return array_unique($affectedIds);
+        return array_unique(array_merge(...$affectedIds));
     }
 
     /**
@@ -222,7 +230,7 @@ private function retrieveAffectedIds(array $skus)
      */
     public function getEntityLinkField()
     {
-        return $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class)
+        return $this->metadataPool->getMetadata(ProductInterface::class)
             ->getLinkField();
     }
 }
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category.php b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
index 86868a7b28ff6..e6b822df04727 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
@@ -1079,7 +1079,6 @@ public function countVisible()
      */
     public function load($object, $entityId, $attributes = [])
     {
-        $this->_attributes = [];
         $select = $this->_getLoadRowSelect($object, $entityId);
         $row = $this->getConnection()->fetchRow($select);
 
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php
index 7d702eb76e555..82cd3b54841a7 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php
@@ -6,12 +6,32 @@
 namespace Magento\Catalog\Model\ResourceModel\Product\Link\Product;
 
 use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
+use Magento\Catalog\Model\Indexer\Product\Flat\State;
 use Magento\Catalog\Model\Indexer\Product\Price\PriceTableResolver;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Link;
+use Magento\Catalog\Model\Product\OptionFactory;
 use Magento\Catalog\Model\ResourceModel\Category;
+use Magento\Catalog\Model\ResourceModel\Helper;
 use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
+use Magento\Catalog\Model\ResourceModel\Url;
 use Magento\Customer\Api\GroupManagementInterface;
+use Magento\Customer\Model\Session;
+use Magento\Eav\Model\Config;
+use Magento\Eav\Model\EntityFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
+use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\Indexer\DimensionFactory;
+use Magento\Framework\Module\Manager;
+use Magento\Framework\Stdlib\DateTime;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Framework\Validator\UniversalFactory;
+use Magento\Store\Model\StoreManagerInterface;
+use Psr\Log\LoggerInterface;
 
 /**
  * Catalog product linked products collection
@@ -26,14 +46,14 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
     /**
      * Store product model
      *
-     * @var \Magento\Catalog\Model\Product
+     * @var Product
      */
     protected $_product;
 
     /**
      * Store product link model
      *
-     * @var \Magento\Catalog\Model\Product\Link
+     * @var Link
      */
     protected $_linkModel;
 
@@ -71,25 +91,25 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
     /**
      * Collection constructor.
      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
-     * @param \Psr\Log\LoggerInterface $logger
-     * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
-     * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @param \Magento\Eav\Model\Config $eavConfig
-     * @param \Magento\Framework\App\ResourceConnection $resource
-     * @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
-     * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
-     * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\Module\Manager $moduleManager
-     * @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory
-     * @param \Magento\Catalog\Model\ResourceModel\Url $catalogUrl
-     * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
-     * @param \Magento\Customer\Model\Session $customerSession
-     * @param \Magento\Framework\Stdlib\DateTime $dateTime
+     * @param LoggerInterface $logger
+     * @param FetchStrategyInterface $fetchStrategy
+     * @param ManagerInterface $eventManager
+     * @param Config $eavConfig
+     * @param ResourceConnection $resource
+     * @param EntityFactory $eavEntityFactory
+     * @param Helper $resourceHelper
+     * @param UniversalFactory $universalFactory
+     * @param StoreManagerInterface $storeManager
+     * @param Manager $moduleManager
+     * @param State $catalogProductFlatState
+     * @param ScopeConfigInterface $scopeConfig
+     * @param OptionFactory $productOptionFactory
+     * @param Url $catalogUrl
+     * @param TimezoneInterface $localeDate
+     * @param Session $customerSession
+     * @param DateTime $dateTime
      * @param GroupManagementInterface $groupManagement
-     * @param \Magento\Framework\DB\Adapter\AdapterInterface|null $connection
+     * @param AdapterInterface|null $connection
      * @param ProductLimitationFactory|null $productLimitationFactory
      * @param MetadataPool|null $metadataPool
      * @param TableMaintainer|null $tableMaintainer
@@ -101,25 +121,25 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
-        \Psr\Log\LoggerInterface $logger,
-        \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
-        \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\Eav\Model\Config $eavConfig,
-        \Magento\Framework\App\ResourceConnection $resource,
-        \Magento\Eav\Model\EntityFactory $eavEntityFactory,
-        \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper,
-        \Magento\Framework\Validator\UniversalFactory $universalFactory,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\Module\Manager $moduleManager,
-        \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory,
-        \Magento\Catalog\Model\ResourceModel\Url $catalogUrl,
-        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
-        \Magento\Customer\Model\Session $customerSession,
-        \Magento\Framework\Stdlib\DateTime $dateTime,
+        LoggerInterface $logger,
+        FetchStrategyInterface $fetchStrategy,
+        ManagerInterface $eventManager,
+        Config $eavConfig,
+        ResourceConnection $resource,
+        EntityFactory $eavEntityFactory,
+        Helper $resourceHelper,
+        UniversalFactory $universalFactory,
+        StoreManagerInterface $storeManager,
+        Manager $moduleManager,
+        State $catalogProductFlatState,
+        ScopeConfigInterface $scopeConfig,
+        OptionFactory $productOptionFactory,
+        Url $catalogUrl,
+        TimezoneInterface $localeDate,
+        Session $customerSession,
+        DateTime $dateTime,
         GroupManagementInterface $groupManagement,
-        \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
+        AdapterInterface $connection = null,
         ProductLimitationFactory $productLimitationFactory = null,
         MetadataPool $metadataPool = null,
         TableMaintainer $tableMaintainer = null,
@@ -166,10 +186,10 @@ public function __construct(
     /**
      * Declare link model and initialize type attributes join
      *
-     * @param \Magento\Catalog\Model\Product\Link $linkModel
+     * @param Link $linkModel
      * @return $this
      */
-    public function setLinkModel(\Magento\Catalog\Model\Product\Link $linkModel)
+    public function setLinkModel(Link $linkModel)
     {
         $this->_linkModel = $linkModel;
         if ($linkModel->getLinkTypeId()) {
@@ -192,7 +212,7 @@ public function setIsStrongMode()
     /**
      * Retrieve collection link model
      *
-     * @return \Magento\Catalog\Model\Product\Link
+     * @return Link
      */
     public function getLinkModel()
     {
@@ -202,10 +222,10 @@ public function getLinkModel()
     /**
      * Initialize collection parent product and add limitation join
      *
-     * @param \Magento\Catalog\Model\Product $product
+     * @param Product $product
      * @return $this
      */
-    public function setProduct(\Magento\Catalog\Model\Product $product)
+    public function setProduct(Product $product)
     {
         $this->_product = $product;
         if ($product && $product->getId()) {
@@ -219,7 +239,7 @@ public function setProduct(\Magento\Catalog\Model\Product $product)
     /**
      * Retrieve collection base product object
      *
-     * @return \Magento\Catalog\Model\Product
+     * @return Product
      */
     public function getProduct()
     {
@@ -257,7 +277,11 @@ public function addProductFilter($products)
                 $products = [$products];
             }
             $identifierField = $this->getLinkField();
-            $this->getSelect()->where("product_entity_table.$identifierField IN (?)", $products, \Zend_Db::BIGINT_TYPE);
+            $this->getSelect()->where(
+                "product_entity_table.$identifierField IN (?)",
+                $products,
+                \Zend_Db::BIGINT_TYPE
+            );
             $this->_hasLinkFilter = true;
         }
 
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php
index 6ffa6f4a1169b..65b568fc39777 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php
@@ -5,9 +5,18 @@
  */
 namespace Magento\CatalogInventory\Model\ResourceModel\Stock;
 
+use Magento\Catalog\Model\Product;
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
 use Magento\CatalogInventory\Model\Stock;
+use Magento\Eav\Model\Config;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DB\Select;
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+use Magento\Framework\Model\ResourceModel\Db\Context;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\Website;
+use Magento\Store\Model\WebsiteFactory;
 
 /**
  * CatalogInventory Stock Status per website Resource Model
@@ -18,12 +27,12 @@
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
-class Status extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
+class Status extends AbstractDb
 {
     /**
      * Store model manager
      *
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var StoreManagerInterface
      * @deprecated 100.1.0
      */
     protected $_storeManager;
@@ -31,12 +40,12 @@ class Status extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
     /**
      * Website model factory
      *
-     * @var \Magento\Store\Model\WebsiteFactory
+     * @var WebsiteFactory
      */
     protected $_websiteFactory;
 
     /**
-     * @var \Magento\Eav\Model\Config
+     * @var Config
      */
     protected $eavConfig;
 
@@ -46,18 +55,18 @@ class Status extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
     private $stockConfiguration;
 
     /**
-     * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Store\Model\WebsiteFactory $websiteFactory
-     * @param \Magento\Eav\Model\Config $eavConfig
+     * @param Context $context
+     * @param StoreManagerInterface $storeManager
+     * @param WebsiteFactory $websiteFactory
+     * @param Config $eavConfig
      * @param string $connectionName
-     * @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
+     * @param StockConfigurationInterface $stockConfiguration
      */
     public function __construct(
-        \Magento\Framework\Model\ResourceModel\Db\Context $context,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Store\Model\WebsiteFactory $websiteFactory,
-        \Magento\Eav\Model\Config $eavConfig,
+        Context $context,
+        StoreManagerInterface $storeManager,
+        WebsiteFactory $websiteFactory,
+        Config $eavConfig,
         $connectionName = null,
         $stockConfiguration = null
     ) {
@@ -127,6 +136,7 @@ public function saveProductStatus(
 
     /**
      * Retrieve product status
+     *
      * Return array as key product id, value - stock status
      *
      * @param int[] $productIds
@@ -150,13 +160,14 @@ public function getProductsStockStatuses($productIds, $websiteId, $stockId = Sto
 
     /**
      * Retrieve websites and default stores
+     *
      * Return array as key website_id, value store_id
      *
      * @return array
      */
     public function getWebsiteStores()
     {
-        /** @var \Magento\Store\Model\Website $website */
+        /** @var Website $website */
         $website = $this->_websiteFactory->create();
         return $this->getConnection()->fetchPairs($website->getDefaultStoresSelect(false));
     }
@@ -185,6 +196,7 @@ public function getProductsType($productIds)
 
     /**
      * Retrieve Product part Collection array
+     *
      * Return array as key product id, value product type
      *
      * @param int $lastEntityId
@@ -206,12 +218,12 @@ public function getProductCollection($lastEntityId = 0, $limit = 1000)
     /**
      * Add stock status to prepare index select
      *
-     * @param \Magento\Framework\DB\Select $select
-     * @param \Magento\Store\Model\Website $website
+     * @param Select $select
+     * @param Website $website
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @return Status
      */
-    public function addStockStatusToSelect(\Magento\Framework\DB\Select $select, \Magento\Store\Model\Website $website)
+    public function addStockStatusToSelect(Select $select, Website $website)
     {
         $websiteId = $this->getWebsiteId($website->getId());
         $select->joinLeft(
@@ -224,6 +236,8 @@ public function addStockStatusToSelect(\Magento\Framework\DB\Select $select, \Ma
     }
 
     /**
+     * Add Stock information to Product Collection
+     *
      * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
      * @param bool $isFilterInStock
      * @return \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
@@ -287,7 +301,9 @@ public function addIsInStockFilterToCollection($collection)
     }
 
     /**
-     * @param \Magento\Store\Model\Website $websiteId
+     * Get website with fallback to default
+     *
+     * @param Website $websiteId
      * @return int
      */
     private function getWebsiteId($websiteId = null)
@@ -313,17 +329,17 @@ public function getProductStatus($productIds, $storeId = null)
             $productIds = [$productIds];
         }
 
-        $attribute = $this->eavConfig->getAttribute(\Magento\Catalog\Model\Product::ENTITY, 'status');
+        $attribute = $this->eavConfig->getAttribute(Product::ENTITY, 'status');
         $attributeTable = $attribute->getBackend()->getTable();
         $linkField = $attribute->getEntity()->getLinkField();
 
         $connection = $this->getConnection();
 
-        if ($storeId === null || $storeId == \Magento\Store\Model\Store::DEFAULT_STORE_ID) {
+        if ($storeId === null || $storeId == Store::DEFAULT_STORE_ID) {
             $select = $connection->select()->from($attributeTable, [$linkField, 'value'])
                 ->where("{$linkField} IN (?)", $productIds, \Zend_Db::BIGINT_TYPE)
                 ->where('attribute_id = ?', $attribute->getAttributeId())
-                ->where('store_id = ?', \Magento\Store\Model\Store::DEFAULT_STORE_ID);
+                ->where('store_id = ?', Store::DEFAULT_STORE_ID);
 
             $rows = $connection->fetchPairs($select);
         } else {
@@ -335,7 +351,7 @@ public function getProductStatus($productIds, $storeId = null)
                 "t1.{$linkField} = t2.{$linkField} AND t1.attribute_id = t2.attribute_id AND t2.store_id = {$storeId}"
             )->where(
                 't1.store_id = ?',
-                \Magento\Store\Model\Store::DEFAULT_STORE_ID
+                Store::DEFAULT_STORE_ID
             )->where(
                 't1.attribute_id = ?',
                 $attribute->getAttributeId()
diff --git a/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/ConfigurableProductsProvider.php b/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/ConfigurableProductsProvider.php
index d6e8033987ee8..2233c6e60ae08 100644
--- a/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/ConfigurableProductsProvider.php
+++ b/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/ConfigurableProductsProvider.php
@@ -27,12 +27,14 @@ public function __construct(\Magento\Framework\App\ResourceConnection $resource)
     }
 
     /**
+     * Return list of ID for product variation
+     *
      * @param array $ids
      * @return array
      */
     public function getIds(array $ids)
     {
-        $key =  md5(json_encode($ids));
+        $key = md5(json_encode($ids)); //phpcs:ignore
         if (!isset($this->productIds[$key])) {
             $connection = $this->resource->getConnection();
             $this->productIds[$key] = $connection->fetchCol(
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php
index c8e761fb5ed22..7b58ab96f765e 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php
@@ -8,7 +8,7 @@
 namespace Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product;
 
 /**
- * Class Collection
+ * Collection of configurable product variation
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php
index e54f888b0ffab..c7b0225576d1b 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php
@@ -6,7 +6,17 @@
 
 namespace Magento\Eav\Model\ResourceModel\Entity\Attribute;
 
+use Magento\Eav\Model\Config;
 use Magento\Eav\Model\Entity\Type;
+use Magento\Eav\Model\ResourceModel\Entity\Attribute;
+use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
+use Magento\Framework\Data\Collection\EntityFactoryInterface;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+use Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection;
+use Psr\Log\LoggerInterface;
 
 /**
  * EAV attribute resource collection
@@ -14,8 +24,9 @@
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
+class Collection extends AbstractCollection
 {
     /**
      * Add attribute set info flag
@@ -25,28 +36,28 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
     protected $_addSetInfoFlag = false;
 
     /**
-     * @var \Magento\Eav\Model\Config
+     * @var Config
      */
     protected $eavConfig;
 
     /**
-     * @param \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory
-     * @param \Psr\Log\LoggerInterface $logger
-     * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
-     * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @param \Magento\Eav\Model\Config $eavConfig
-     * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
-     * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
+     * @param EntityFactoryInterface $entityFactory
+     * @param LoggerInterface $logger
+     * @param FetchStrategyInterface $fetchStrategy
+     * @param ManagerInterface $eventManager
+     * @param Config $eavConfig
+     * @param AdapterInterface $connection
+     * @param AbstractDb $resource
      * @codeCoverageIgnore
      */
     public function __construct(
-        \Magento\Framework\Data\Collection\EntityFactoryInterface $entityFactory,
-        \Psr\Log\LoggerInterface $logger,
-        \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
-        \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\Eav\Model\Config $eavConfig,
-        \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
-        \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null
+        EntityFactoryInterface $entityFactory,
+        LoggerInterface $logger,
+        FetchStrategyInterface $fetchStrategy,
+        ManagerInterface $eventManager,
+        Config $eavConfig,
+        AdapterInterface $connection = null,
+        AbstractDb $resource = null
     ) {
         $this->eavConfig = $eavConfig;
         parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $connection, $resource);
@@ -62,7 +73,7 @@ protected function _construct()
     {
         $this->_init(
             \Magento\Eav\Model\Entity\Attribute::class,
-            \Magento\Eav\Model\ResourceModel\Entity\Attribute::class
+            Attribute::class
         );
     }
 
@@ -94,7 +105,7 @@ protected function _getLoadDataFields()
      */
     public function useLoadDataFields()
     {
-        $this->getSelect()->reset(\Magento\Framework\DB\Select::COLUMNS);
+        $this->getSelect()->reset(Select::COLUMNS);
         $this->getSelect()->columns($this->_getLoadDataFields());
 
         return $this;
@@ -161,11 +172,11 @@ public function setAttributeSetFilter($setId)
      *
      * @param string $attributeSetName
      * @param string $entityTypeCode
-     * @return void
+     * @return Collection
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function setAttributeSetFilterBySetName($attributeSetName, $entityTypeCode)
     {
-        //@codeCoverageIgnoreStart
         $entityTypeId = $this->eavConfig->getEntityType($entityTypeCode)->getId();
         $this->join(
             ['entity_attribute' => $this->getTable('eav_entity_attribute')],
@@ -179,7 +190,8 @@ public function setAttributeSetFilterBySetName($attributeSetName, $entityTypeCod
         $this->addFieldToFilter('attribute_set.entity_type_id', $entityTypeId);
         $this->addFieldToFilter('attribute_set.attribute_set_name', $attributeSetName);
         $this->setOrder('entity_attribute.sort_order', self::SORT_ORDER_ASC);
-        //@codeCoverageIgnoreEnd
+
+        return $this;
     }
 
     /**
@@ -428,7 +440,7 @@ protected function _addSetInfo()
     /**
      * Ad information about attribute sets to collection result data
      *
-     * @return \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
+     * @return AbstractCollection
      */
     protected function _afterLoadData()
     {
@@ -483,7 +495,7 @@ public function addStoreLabel($storeId)
     public function getSelectCountSql()
     {
         $countSelect = parent::getSelectCountSql();
-        $countSelect->reset(\Magento\Framework\DB\Select::COLUMNS);
+        $countSelect->reset(Select::COLUMNS);
         $countSelect->columns('COUNT(DISTINCT main_table.attribute_id)');
         return $countSelect;
     }

From 00f13770e230b5ec4366fa429a2cc77a099f26f7 Mon Sep 17 00:00:00 2001
From: Andrii Kasian <akasian@magento.com>
Date: Sun, 10 May 2020 21:15:52 -0500
Subject: [PATCH 0245/1718] Improve code quality.  Return part of changes

---
 .../Model/ResourceModel/Index.php             | 24 +++++-----
 .../Indexer/Product/Flat/FlatTableBuilder.php | 45 +++++++------------
 .../Indexer/Product/Flat/TableBuilder.php     |  4 +-
 .../Product/Link/Product/Collection.php       | 18 +++++---
 .../Model/ResourceModel/Stock/Status.php      |  1 +
 .../Entity/Attribute/Collection.php           |  9 ++--
 .../Magento/TestFramework/Helper/Memory.php   |  8 ++++
 7 files changed, 52 insertions(+), 57 deletions(-)

diff --git a/app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php b/app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php
index bf6a62f36e440..b20872da2f8e7 100644
--- a/app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php
+++ b/app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php
@@ -5,19 +5,18 @@
  */
 namespace Magento\AdvancedSearch\Model\ResourceModel;
 
-use Magento\Catalog\Api\Data\CategoryInterface;
-use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
-use Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+use Magento\Framework\Search\Request\IndexScopeResolverInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\Model\ResourceModel\Db\Context;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Search\Request\Dimension;
-use Magento\Framework\Search\Request\IndexScopeResolverInterface;
+use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
 use Magento\Framework\Search\Request\IndexScopeResolverInterface as TableResolver;
+use Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory;
 use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
-use Magento\Store\Model\Store;
-use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * @api
@@ -56,7 +55,6 @@ class Index extends AbstractDb
 
     /**
      * Index constructor.
-     *
      * @param Context $context
      * @param StoreManagerInterface $storeManager
      * @param MetadataPool $metadataPool
@@ -82,9 +80,7 @@ public function __construct(
 
     /**
      * Implementation of abstract construct
-     *
      * @return void
-     * @SuppressWarnings(PHPMD)
      * @since 100.1.0
      */
     protected function _construct()
@@ -112,7 +108,7 @@ protected function _getCatalogProductPriceData($productIds = null)
                     ['entity_id', 'customer_group_id', 'website_id', 'min_price']
                 );
                 if ($productIds) {
-                    $select->where('entity_id IN (?)', $productIds, \Zend_Db::BIGINT_TYPE);
+                    $select->where('entity_id IN (?)', $productIds);
                 }
                 $catalogProductIndexPriceSelect[] = $select;
             }
@@ -163,7 +159,7 @@ public function getCategoryProductIndexData($storeId = null, $productIds = null)
     {
         $connection = $this->getConnection();
 
-        $catalogCategoryProductDimension = new Dimension(Store::ENTITY, $storeId);
+        $catalogCategoryProductDimension = new Dimension(\Magento\Store\Model\Store::ENTITY, $storeId);
 
         $catalogCategoryProductTableName = $this->tableResolver->resolve(
             AbstractAction::MAIN_INDEX_TABLE,
@@ -181,7 +177,7 @@ public function getCategoryProductIndexData($storeId = null, $productIds = null)
         );
 
         if ($productIds) {
-            $select->where('product_id IN (?)', $productIds, \Zend_Db::BIGINT_TYPE);
+            $select->where('product_id IN (?)', $productIds);
         }
 
         $result = [];
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 e92778226aadd..d6decee249c04 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
@@ -6,18 +6,8 @@
 namespace Magento\Catalog\Model\Indexer\Product\Flat;
 
 use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Catalog\Helper\Product\Flat\Indexer;
-use Magento\Catalog\Model\Product\Attribute\Source\Status;
-use Magento\Eav\Model\Entity\Attribute;
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Framework\DB\Ddl\Table;
-use Magento\Framework\DB\Select;
 use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class for building flat index
@@ -37,22 +27,22 @@ class FlatTableBuilder
     const XML_NODE_MAX_INDEX_COUNT = 'catalog/product/flat/max_index_count';
 
     /**
-     * @var Indexer
+     * @var \Magento\Catalog\Helper\Product\Flat\Indexer
      */
     protected $_productIndexerHelper;
 
     /**
-     * @var AdapterInterface
+     * @var \Magento\Framework\DB\Adapter\AdapterInterface
      */
     protected $_connection;
 
     /**
-     * @var ScopeConfigInterface $config
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface $config
      */
     protected $_config;
 
     /**
-     * @var StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -62,23 +52,23 @@ class FlatTableBuilder
     protected $_tableData;
 
     /**
-     * @var ResourceConnection
+     * @var \Magento\Framework\App\ResourceConnection
      */
     protected $resource;
 
     /**
-     * @param Indexer $productIndexerHelper
+     * @param \Magento\Catalog\Helper\Product\Flat\Indexer $productIndexerHelper
      * @param ResourceConnection $resource
-     * @param ScopeConfigInterface $config
-     * @param StoreManagerInterface $storeManager
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param TableDataInterface $tableData
      */
     public function __construct(
-        Indexer $productIndexerHelper,
-        ResourceConnection $resource,
-        ScopeConfigInterface $config,
-        StoreManagerInterface $storeManager,
-        TableDataInterface $tableData
+        \Magento\Catalog\Helper\Product\Flat\Indexer $productIndexerHelper,
+        \Magento\Framework\App\ResourceConnection $resource,
+        \Magento\Framework\App\Config\ScopeConfigInterface $config,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Catalog\Model\Indexer\Product\Flat\TableDataInterface $tableData
     ) {
         $this->_productIndexerHelper = $productIndexerHelper;
         $this->resource = $resource;
@@ -124,8 +114,7 @@ public function build($storeId, $changedIds, $valueFieldSuffix, $tableDropSuffix
      *
      * @param int|string $storeId
      * @return void
-     * @throws LocalizedException
-     * @throws \Zend_Db_Exception
+     * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -139,7 +128,7 @@ protected function _createTemporaryFlatTable($storeId)
             self::XML_NODE_MAX_INDEX_COUNT
         );
         if ($maxIndex && count($indexesNeed) > $maxIndex) {
-            throw new LocalizedException(
+            throw new \Magento\Framework\Exception\LocalizedException(
                 __(
                     'The Flat Catalog module has a limit of %2$d filterable and/or sortable attributes.'
                     . 'Currently there are %1$d of them.'
@@ -152,7 +141,7 @@ protected function _createTemporaryFlatTable($storeId)
 
         $indexKeys = [];
         $indexProps = array_values($indexesNeed);
-        $upperPrimaryKey = strtoupper(AdapterInterface::INDEX_TYPE_PRIMARY);
+        $upperPrimaryKey = strtoupper(\Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_PRIMARY);
         foreach ($indexProps as $i => $indexProp) {
             $indexName = $this->_connection->getIndexName(
                 $this->_getTemporaryTableName($this->_productIndexerHelper->getFlatTableName($storeId)),
@@ -175,7 +164,7 @@ protected function _createTemporaryFlatTable($storeId)
         }
         $indexesNeed = array_combine($indexKeys, $indexProps);
 
-        /** @var $table Table */
+        /** @var $table \Magento\Framework\DB\Ddl\Table */
         $table = $this->_connection->newTable(
             $this->_getTemporaryTableName($this->_productIndexerHelper->getFlatTableName($storeId))
         );
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
index c0632c6c246ce..376884cd88db5 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
@@ -233,9 +233,7 @@ protected function _fillTemporaryEntityTable($tableName, array $columns, array $
             $select->from(['e' => $tableName], $columns);
             $onDuplicate = false;
             if (!empty($changedIds)) {
-                $select->where(
-                    $this->_connection->quoteInto('e.entity_id IN (?)', $changedIds, \Zend_Db::BIGINT_TYPE)
-                );
+                $select->where($this->_connection->quoteInto('e.entity_id IN (?)', $changedIds));
                 $onDuplicate = true;
             }
             $sql = $select->insertFromSelect($temporaryEntityTable, $columns, $onDuplicate);
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php
index 82cd3b54841a7..5a7ad23173f9f 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php
@@ -9,7 +9,7 @@
 use Magento\Catalog\Model\Indexer\Product\Flat\State;
 use Magento\Catalog\Model\Indexer\Product\Price\PriceTableResolver;
 use Magento\Catalog\Model\Product;
-use Magento\Catalog\Model\Product\Link;
+use Magento\Catalog\Model\Product\Link as LinkModel;
 use Magento\Catalog\Model\Product\OptionFactory;
 use Magento\Catalog\Model\ResourceModel\Category;
 use Magento\Catalog\Model\ResourceModel\Helper;
@@ -53,7 +53,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
     /**
      * Store product link model
      *
-     * @var Link
+     * @var LinkModel
      */
     protected $_linkModel;
 
@@ -186,10 +186,10 @@ public function __construct(
     /**
      * Declare link model and initialize type attributes join
      *
-     * @param Link $linkModel
+     * @param LinkModel $linkModel
      * @return $this
      */
-    public function setLinkModel(Link $linkModel)
+    public function setLinkModel(LinkModel $linkModel)
     {
         $this->_linkModel = $linkModel;
         if ($linkModel->getLinkTypeId()) {
@@ -212,7 +212,7 @@ public function setIsStrongMode()
     /**
      * Retrieve collection link model
      *
-     * @return Link
+     * @return LinkModel
      */
     public function getLinkModel()
     {
@@ -239,7 +239,7 @@ public function setProduct(Product $product)
     /**
      * Retrieve collection base product object
      *
-     * @return Product
+     * @return \Magento\Catalog\Model\Product
      */
     public function getProduct()
     {
@@ -259,7 +259,11 @@ public function addExcludeProductFilter($products)
                 $products = [$products];
             }
             $this->_hasLinkFilter = true;
-            $this->getSelect()->where('links.linked_product_id NOT IN (?)', $products, \Zend_Db::BIGINT_TYPE);
+            $this->getSelect()->where(
+                'links.linked_product_id NOT IN (?)',
+                $products,
+                \Zend_Db::BIGINT_TYPE
+            );
         }
         return $this;
     }
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php
index 65b568fc39777..fcfc197f9036d 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php
@@ -317,6 +317,7 @@ private function getWebsiteId($websiteId = null)
 
     /**
      * Retrieve Product(s) status for store
+     *
      * Return array where key is a product_id, value - status
      *
      * @param int[] $productIds
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php
index c7b0225576d1b..b354d8682e2d1 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php
@@ -172,11 +172,11 @@ public function setAttributeSetFilter($setId)
      *
      * @param string $attributeSetName
      * @param string $entityTypeCode
-     * @return Collection
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @return void
      */
     public function setAttributeSetFilterBySetName($attributeSetName, $entityTypeCode)
     {
+        //@codeCoverageIgnoreStart
         $entityTypeId = $this->eavConfig->getEntityType($entityTypeCode)->getId();
         $this->join(
             ['entity_attribute' => $this->getTable('eav_entity_attribute')],
@@ -190,8 +190,7 @@ public function setAttributeSetFilterBySetName($attributeSetName, $entityTypeCod
         $this->addFieldToFilter('attribute_set.entity_type_id', $entityTypeId);
         $this->addFieldToFilter('attribute_set.attribute_set_name', $attributeSetName);
         $this->setOrder('entity_attribute.sort_order', self::SORT_ORDER_ASC);
-
-        return $this;
+        //@codeCoverageIgnoreEnd
     }
 
     /**
@@ -440,7 +439,7 @@ protected function _addSetInfo()
     /**
      * Ad information about attribute sets to collection result data
      *
-     * @return AbstractCollection
+     * @return $this
      */
     protected function _afterLoadData()
     {
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Helper/Memory.php b/dev/tests/integration/framework/Magento/TestFramework/Helper/Memory.php
index 933d86fe6a4f5..6c8ff4640b0ba 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Helper/Memory.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Helper/Memory.php
@@ -53,6 +53,7 @@ public function getRealMemoryUsage()
             // fall back to the Unix command line
             $result = $this->_getUnixProcessMemoryUsage($pid);
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
+            echo  $e;
             // try to use the Windows command line
             // some ports of Unix commands on Windows, such as MinGW, have limited capabilities and cannot be used
             $result = $this->_getWinProcessMemoryUsage($pid);
@@ -69,6 +70,13 @@ public function getRealMemoryUsage()
      */
     protected function _getUnixProcessMemoryUsage($pid)
     {
+        if (!$this->isMacOS()
+            && ($content = @file_get_contents('/proc/' . (int) $pid . '/status'))
+            && \preg_match('/VmRSS:\s*(\d* \w)/mi', $content, $m)
+            && !empty($m[1])
+        ) {
+            return self::convertToBytes($m[1]);
+        }
         // RSS - resident set size, the non-swapped physical memory
         $command = 'ps --pid %s --format rss --no-headers';
         if ($this->isMacOS()) {

From 6587c575648d63c372aa725be93bc3c2fa9bc49b Mon Sep 17 00:00:00 2001
From: Andrii Kasian <akasian@magento.com>
Date: Sun, 10 May 2020 23:09:01 -0500
Subject: [PATCH 0246/1718] Improve code quality

---
 .../Indexer/Product/Flat/FlatTableBuilder.php | 65 ++++++++++++-------
 .../Indexer/Product/Flat/TableBuilder.php     |  2 +-
 .../Indexer/Product/Price/AbstractAction.php  |  3 +
 .../Product/Link/Product/Collection.php       | 12 +++-
 .../Magento/TestFramework/Helper/Memory.php   |  7 --
 5 files changed, 54 insertions(+), 35 deletions(-)

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 d6decee249c04..8415c9f61199d 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
@@ -6,8 +6,19 @@
 namespace Magento\Catalog\Model\Indexer\Product\Flat;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Helper\Product\Flat\Indexer;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Ddl\Table;
 use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Framework\App\ObjectManager;
+use Magento\Eav\Model\Entity\Attribute;
+use Magento\Framework\DB\Select;
 
 /**
  * Class for building flat index
@@ -27,22 +38,22 @@ class FlatTableBuilder
     const XML_NODE_MAX_INDEX_COUNT = 'catalog/product/flat/max_index_count';
 
     /**
-     * @var \Magento\Catalog\Helper\Product\Flat\Indexer
+     * @var Indexer
      */
     protected $_productIndexerHelper;
 
     /**
-     * @var \Magento\Framework\DB\Adapter\AdapterInterface
+     * @var AdapterInterface
      */
     protected $_connection;
 
     /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface $config
+     * @var ScopeConfigInterface $config
      */
     protected $_config;
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -52,23 +63,23 @@ class FlatTableBuilder
     protected $_tableData;
 
     /**
-     * @var \Magento\Framework\App\ResourceConnection
+     * @var ResourceConnection
      */
     protected $resource;
 
     /**
-     * @param \Magento\Catalog\Helper\Product\Flat\Indexer $productIndexerHelper
+     * @param Indexer $productIndexerHelper
      * @param ResourceConnection $resource
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param ScopeConfigInterface $config
+     * @param StoreManagerInterface $storeManager
      * @param TableDataInterface $tableData
      */
     public function __construct(
-        \Magento\Catalog\Helper\Product\Flat\Indexer $productIndexerHelper,
-        \Magento\Framework\App\ResourceConnection $resource,
-        \Magento\Framework\App\Config\ScopeConfigInterface $config,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Catalog\Model\Indexer\Product\Flat\TableDataInterface $tableData
+        Indexer $productIndexerHelper,
+        ResourceConnection $resource,
+        ScopeConfigInterface $config,
+        StoreManagerInterface $storeManager,
+        TableDataInterface $tableData
     ) {
         $this->_productIndexerHelper = $productIndexerHelper;
         $this->resource = $resource;
@@ -114,7 +125,7 @@ public function build($storeId, $changedIds, $valueFieldSuffix, $tableDropSuffix
      *
      * @param int|string $storeId
      * @return void
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -128,7 +139,7 @@ protected function _createTemporaryFlatTable($storeId)
             self::XML_NODE_MAX_INDEX_COUNT
         );
         if ($maxIndex && count($indexesNeed) > $maxIndex) {
-            throw new \Magento\Framework\Exception\LocalizedException(
+            throw new LocalizedException(
                 __(
                     'The Flat Catalog module has a limit of %2$d filterable and/or sortable attributes.'
                     . 'Currently there are %1$d of them.'
@@ -141,7 +152,7 @@ protected function _createTemporaryFlatTable($storeId)
 
         $indexKeys = [];
         $indexProps = array_values($indexesNeed);
-        $upperPrimaryKey = strtoupper(\Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_PRIMARY);
+        $upperPrimaryKey = strtoupper(AdapterInterface::INDEX_TYPE_PRIMARY);
         foreach ($indexProps as $i => $indexProp) {
             $indexName = $this->_connection->getIndexName(
                 $this->_getTemporaryTableName($this->_productIndexerHelper->getFlatTableName($storeId)),
@@ -164,7 +175,7 @@ protected function _createTemporaryFlatTable($storeId)
         }
         $indexesNeed = array_combine($indexKeys, $indexProps);
 
-        /** @var $table \Magento\Framework\DB\Ddl\Table */
+        /** @var $table Table */
         $table = $this->_connection->newTable(
             $this->_getTemporaryTableName($this->_productIndexerHelper->getFlatTableName($storeId))
         );
@@ -212,7 +223,7 @@ protected function _createTemporaryFlatTable($storeId)
      * @param string $valueFieldSuffix
      * @return void
      * @throws LocalizedException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws NoSuchEntityException
      */
     protected function _fillTemporaryFlatTable(array $tables, $storeId, $valueFieldSuffix)
     {
@@ -228,8 +239,8 @@ protected function _fillTemporaryFlatTable(array $tables, $storeId, $valueFieldS
         $websiteId = (int)$this->_storeManager->getStore($storeId)->getWebsiteId();
 
         unset($tables[$entityTableName]);
-
-        $allColumns = array_values(
+        $allColumns = [];
+        $allColumns[] = array_values(
             array_unique(
                 array_merge(['entity_id', $linkField, 'type_id', 'attribute_set_id'], $columnsList)
             )
@@ -278,7 +289,7 @@ protected function _fillTemporaryFlatTable(array $tables, $storeId, $valueFieldS
                 sprintf('e.%1$s = %2$s.%1$s', $linkField, $temporaryTableName),
                 $columnsNames
             );
-            $allColumns = array_merge($allColumns, $columnsNames);
+            $allColumns[] = $columnsNames;
 
             foreach ($columnsNames as $name) {
                 $columnValueName = $name . $valueFieldSuffix;
@@ -292,10 +303,10 @@ protected function _fillTemporaryFlatTable(array $tables, $storeId, $valueFieldS
                     sprintf('e.%1$s = %2$s.%1$s', $linkField, $temporaryValueTableName),
                     $columnValueNames
                 );
-                $allColumns = array_merge($allColumns, $columnValueNames);
+                $allColumns[] = $columnValueNames;
             }
         }
-        $sql = $select->insertFromSelect($temporaryFlatTableName, $allColumns, false);
+        $sql = $select->insertFromSelect($temporaryFlatTableName, array_merge(...$allColumns), false);
         $this->_connection->query($sql);
     }
 
@@ -368,8 +379,12 @@ protected function _updateTemporaryTableByStoreValues(
                     )->where($columnValue . ' IS NOT NULL');
                     if (!empty($changedIds)) {
                         $select->where(
-                            $this->_connection->quoteInto('et.entity_id IN (?)', $changedIds, \Zend_Db::BIGINT_TYPE))
-                        ;
+                            $this->_connection->quoteInto(
+                                'et.entity_id IN (?)',
+                                $changedIds,
+                                \Zend_Db::BIGINT_TYPE
+                            )
+                        );
                     }
                     $sql = $select->crossUpdateFromSelect(['et' => $temporaryFlatTableName]);
                     $this->_connection->query($sql);
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
index 376884cd88db5..199d5b73a8634 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
@@ -9,7 +9,7 @@
 use Magento\Store\Model\Store;
 
 /**
- * Class TableBuilder
+ * Prepare temporary tables structure for product flat indexer
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
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 d32bd86d750ee..9ccca56a9cb1a 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
@@ -517,6 +517,8 @@ protected function getIndexTargetTable()
     }
 
     /**
+     * Return Product ID field name
+     *
      * @return string
      */
     protected function getProductIdFieldName()
@@ -553,6 +555,7 @@ private function getProductsTypes(array $changedIds = [])
 
     /**
      * Get parent products types
+     *
      * Used for add composite products to reindex if we have only simple products in changed ids set
      *
      * @param array $productsIds
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php
index 5a7ad23173f9f..81569fb581273 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php
@@ -347,10 +347,18 @@ protected function _joinLinks()
         $linkField = $this->getLinkField();
         if ($this->productIds) {
             if ($this->_isStrongMode) {
-                $this->getSelect()->where('links.product_id in (?)', $this->productIds, \Zend_Db::BIGINT_TYPE);
+                $this->getSelect()->where(
+                    'links.product_id in (?)',
+                    $this->productIds,
+                    \Zend_Db::BIGINT_TYPE
+                );
             } else {
                 $joinType = 'joinLeft';
-                $joinCondition[] = $connection->quoteInto('links.product_id in (?)', $this->productIds, \Zend_Db::BIGINT_TYPE);
+                $joinCondition[] = $connection->quoteInto(
+                    'links.product_id in (?)',
+                    $this->productIds,
+                    \Zend_Db::BIGINT_TYPE
+                );
             }
             if (count($this->productIds) === 1) {
                 $this->addFieldToFilter(
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Helper/Memory.php b/dev/tests/integration/framework/Magento/TestFramework/Helper/Memory.php
index 6c8ff4640b0ba..04be27d1c20e2 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Helper/Memory.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Helper/Memory.php
@@ -70,13 +70,6 @@ public function getRealMemoryUsage()
      */
     protected function _getUnixProcessMemoryUsage($pid)
     {
-        if (!$this->isMacOS()
-            && ($content = @file_get_contents('/proc/' . (int) $pid . '/status'))
-            && \preg_match('/VmRSS:\s*(\d* \w)/mi', $content, $m)
-            && !empty($m[1])
-        ) {
-            return self::convertToBytes($m[1]);
-        }
         // RSS - resident set size, the non-swapped physical memory
         $command = 'ps --pid %s --format rss --no-headers';
         if ($this->isMacOS()) {

From fd21e1f16ffd25a56225628d4edfa228d9aacb61 Mon Sep 17 00:00:00 2001
From: Andrii Kasian <akasian@magento.com>
Date: Mon, 11 May 2020 12:25:44 -0500
Subject: [PATCH 0247/1718] Improve code quality

---
 .../Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 8415c9f61199d..584eea02241db 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],
-            $allColumns
+            array_merge(...$allColumns)
         )->joinInner(
             ['e' => $this->resource->getTableName('catalog_product_entity')],
             'e.entity_id = et.entity_id',

From 8d952c3c21ef10e6865b926fb01503584bcd4135 Mon Sep 17 00:00:00 2001
From: madhu-ranosys <madhu.rajawat@ranosys.com>
Date: Tue, 12 May 2020 00:52:08 +0530
Subject: [PATCH 0248/1718] label changes on Totals.php block

---
 .../Sales/Block/Adminhtml/Order/Totals.php    | 18 ++++++++++----
 app/code/Magento/Sales/Model/Order.php        | 24 -------------------
 2 files changed, 14 insertions(+), 28 deletions(-)
 mode change 100755 => 100644 app/code/Magento/Sales/Block/Adminhtml/Order/Totals.php

diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Totals.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Totals.php
old mode 100755
new mode 100644
index e1e6b0b4ada28..6cd2c53f894f8
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Totals.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Totals.php
@@ -42,13 +42,23 @@ protected function _initTotals()
                 'area' => 'footer',
             ]
         );
-        $this->_totals['due'] = new \Magento\Framework\DataObject(
+        $code = 'due';
+        $label = 'Total Due';
+        $value = $this->getSource()->getTotalDue();
+        $baseValue = $this->getSource()->getBaseTotalDue();
+        if ($this->getSource()->getTotalCanceled() > 0 && $this->getSource()->getBaseTotalCanceled() > 0) {
+            $code = 'canceled';
+            $label = 'Total Canceled';
+            $value = $this->getSource()->getTotalCanceled();
+            $baseValue = $this->getSource()->getBaseTotalCanceled();
+        }
+        $this->_totals[$code] = new \Magento\Framework\DataObject(
             [
                 'code' => 'due',
                 'strong' => true,
-                'value' => $this->getSource()->getTotalDue(),
-                'base_value' => $this->getSource()->getBaseTotalDue(),
-                'label' => $this->getSource()->getTotalDueCancelLabel(),
+                'value' => $value,
+                'base_value' => $baseValue,
+                'label' => __($label),
                 'area' => 'footer',
             ]
         );
diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
index 6ffa942451bf6..8f0db3ebdbd89 100644
--- a/app/code/Magento/Sales/Model/Order.php
+++ b/app/code/Magento/Sales/Model/Order.php
@@ -1817,30 +1817,6 @@ public function getTotalDue()
         return max($total, 0);
     }
     
-    /**
-     * Retrieve order total due or cancel label
-     *
-     * @return float|null
-     */
-    public function getTotalDueCancelLabel()
-    {
-        $itemCancel = true;
-        foreach ($this->getAllItems() as $item) {
-            if ($item->getQtyCanceled() > 0) {
-                $itemCancel = false;
-                break;
-            }
-        }
-        if ($this->isCanceled() || $itemCancel == false) {
-
-            $label = __('Total Canceled');
-        } else {
-
-            $label = __('Total Due');
-        }
-        return $label;
-    }
-
     /**
      * Retrieve order total due value
      *

From 20037ecbe50a12d49a43d07237e16fa1be34bbcf Mon Sep 17 00:00:00 2001
From: Dmytro Voskoboinikov <voskoboi@adobe.com>
Date: Mon, 11 May 2020 16:53:58 -0500
Subject: [PATCH 0249/1718] MC-29566: [2.4.x] Deprecate SID query
 parameter-related methods

---
 .../Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php
index 38d0c8dc75754..77f9c5e1fe552 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php
@@ -36,7 +36,7 @@ class ImageTest extends \PHPUnit\Framework\TestCase
     /**
      * @inheritdoc
      */
-    public function setUp()
+    public function setUp(): void
     {
         $context = $this->getMockObject(Context::class);
         $registry = $this->getMockObject(Registry::class);

From e17a4b65f1daae3f17902c1d280f98909d5e20b0 Mon Sep 17 00:00:00 2001
From: Andrii Kasian <akasian@magento.com>
Date: Mon, 11 May 2020 21:51:33 -0500
Subject: [PATCH 0250/1718] Improve code quality

---
 .../Magento/Catalog/Model/Product/Price/PricePersistence.php    | 2 +-
 .../framework/Magento/TestFramework/Helper/Memory.php           | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Product/Price/PricePersistence.php b/app/code/Magento/Catalog/Model/Product/Price/PricePersistence.php
index 41833a1894683..99c66bd9f5be1 100644
--- a/app/code/Magento/Catalog/Model/Product/Price/PricePersistence.php
+++ b/app/code/Magento/Catalog/Model/Product/Price/PricePersistence.php
@@ -214,7 +214,7 @@ private function getAttributeId()
      */
     private function retrieveAffectedIds(array $skus)
     {
-        $affectedIds = [];
+        $affectedIds = [[]];
 
         foreach ($this->productIdLocator->retrieveProductIdsBySkus($skus) as $productIds) {
             $affectedIds[] = array_keys($productIds);
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Helper/Memory.php b/dev/tests/integration/framework/Magento/TestFramework/Helper/Memory.php
index 04be27d1c20e2..933d86fe6a4f5 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Helper/Memory.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Helper/Memory.php
@@ -53,7 +53,6 @@ public function getRealMemoryUsage()
             // fall back to the Unix command line
             $result = $this->_getUnixProcessMemoryUsage($pid);
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            echo  $e;
             // try to use the Windows command line
             // some ports of Unix commands on Windows, such as MinGW, have limited capabilities and cannot be used
             $result = $this->_getWinProcessMemoryUsage($pid);

From 755ab93dcf25d7e8ba610bb2b7cf1af247e467a3 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Tue, 12 May 2020 10:45:33 +0300
Subject: [PATCH 0251/1718] MC-29420: Remove event handlers from CE

---
 .../AdminAnalytics/view/adminhtml/templates/tracking.phtml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/AdminAnalytics/view/adminhtml/templates/tracking.phtml b/app/code/Magento/AdminAnalytics/view/adminhtml/templates/tracking.phtml
index 35d0f9ec89986..07983e08b97ad 100644
--- a/app/code/Magento/AdminAnalytics/view/adminhtml/templates/tracking.phtml
+++ b/app/code/Magento/AdminAnalytics/view/adminhtml/templates/tracking.phtml
@@ -15,7 +15,7 @@
         'src' => '"' . $block->escapeJs($block->getTrackingUrl()) .'"',
         'async' => true,
     ],
-    '',
+    '&nbsp;',
     false
 ) ?>
 

From 69b5f48eac56e92d99fddb54fc44a5c1d0d6bd74 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Tue, 12 May 2020 15:12:12 +0300
Subject: [PATCH 0252/1718] MC-29420: Remove event handlers from CE

---
 .../view/adminhtml/templates/widget/grid/extended.phtml   | 3 +--
 .../templates/product/view/options/type/file.phtml        | 8 ++++----
 app/code/Magento/Customer/Block/Form/Register.php         | 1 +
 .../Customer/view/frontend/templates/form/register.phtml  | 8 +++++---
 .../Magento/Reports/view/adminhtml/templates/grid.phtml   | 5 +++--
 .../adminhtml/templates/order/create/items/grid.phtml     | 2 +-
 .../Magento/Payment/Block/Transparent/IframeTest.php      | 5 ++---
 7 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
index c43b6397232c5..6f7e37bc94094 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
@@ -340,8 +340,7 @@ script;
         $encodedId = /* @noEscape */ $jsonHelper->jsonEncode($block->getId());
         $scriptString .= <<<script
 
-    {$block->escapeJs($block->getJsObjectName())} = new varienGrid(
-        {$encodedId},
+    {$block->escapeJs($block->getJsObjectName())} = new varienGrid({$encodedId},
          '{$block->escapeJs($block->getGridUrl())}',
          '{$block->escapeJs($block->getVarNamePage())}',
          '{$block->escapeJs($block->getVarNameSort())}',
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml
index 58933e9b867f7..a11f5db1f4842 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml
@@ -61,14 +61,14 @@
         <?php endif; ?>
         <?php if ($_option->getImageSizeX() > 0):?>
             <p class="note">
-                <?= $block->escapeHtml(__('Maximum image width')) ?>:
-                <strong><?= (int)$_option->getImageSizeX() ?> <?= $block->escapeHtml(__('px.')) ?></strong>
+                <?= $block->escapeHtml(__('Maximum image width')) ?>: <strong><?= (int)$_option->getImageSizeX()
+                ?> <?= $block->escapeHtml(__('px.')) ?></strong>
             </p>
         <?php endif; ?>
         <?php if ($_option->getImageSizeY() > 0):?>
             <p class="note">
-                <?= $block->escapeHtml(__('Maximum image height')) ?>:
-                <strong><?= (int)$_option->getImageSizeY() ?> <?= $block->escapeHtml(__('px.')) ?></strong>
+                <?= $block->escapeHtml(__('Maximum image height')) ?>: <strong><?= (int)$_option->getImageSizeY()
+                ?> <?= $block->escapeHtml(__('px.')) ?></strong>
             </p>
         <?php endif; ?>
     </div>
diff --git a/app/code/Magento/Customer/Block/Form/Register.php b/app/code/Magento/Customer/Block/Form/Register.php
index 4f030c38ac63c..6cf1fcdb31506 100644
--- a/app/code/Magento/Customer/Block/Form/Register.php
+++ b/app/code/Magento/Customer/Block/Form/Register.php
@@ -76,6 +76,7 @@ public function __construct(
         $this->_customerSession = $customerSession;
         $this->newsLetterConfig = $newsLetterConfig ?: ObjectManager::getInstance()->get(Config::class);
         $data['addressHelper'] = $addressHelper ?? ObjectManager::getInstance()->get(AddressHelper::class);
+        $data['directoryHelper'] = $directoryHelper;
         parent::__construct(
             $context,
             $directoryHelper,
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 a9a28295be09a..1b50b8de34280 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
@@ -11,7 +11,9 @@ use Magento\Customer\Helper\Address;
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 
 /** @var Magento\Customer\Helper\Address $addressHelper */
-$addressHelper = $block->getData('adressHelper');
+$addressHelper = $block->getData('addressHelper');
+/** @var \Magento\Directory\Helper\Data $directoryHelper */
+$directoryHelper = $block->getData('directoryHelper');
 $formData = $block->getFormData();
 ?>
 <?php $displayAll = $block->getConfig('general/region/display_all'); ?>
@@ -322,9 +324,9 @@ script;
 <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 <?php if ($block->getShowAddressFields()): ?>
     <?php
-    $regionJson = /* @noEscape */ $addressHelper->getRegionJson();
+    $regionJson = /* @noEscape */ $directoryHelper->getRegionJson();
     $regionId = (int) $formData->getRegionId();
-    $countriesWithOptionalZip = /* @noEscape */ $addressHelper->getCountriesWithOptionalZip(true);
+    $countriesWithOptionalZip = /* @noEscape */ $directoryHelper->getCountriesWithOptionalZip(true);
     ?>
 <script type="text/x-magento-init">
     {
diff --git a/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml b/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
index 53473cb671e7c..f615c705b356d 100644
--- a/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
@@ -104,7 +104,8 @@ script;
         </div>
     </div>
     <?php if ($block->canDisplayContainer()): ?>
-        <?php $scriptString = <<<script
+        <?php $useAjax = $block->getUseAjax() ? 'true' : 'false';
+        $scriptString = <<<script
 
             require([
                 "jquery",
@@ -119,7 +120,7 @@ script;
                  '{$block->escapeJs($block->getVarNameSort())}', '{$block->escapeJs($block->getVarNameDir())}',
                  '{$block->escapeJs($block->getVarNameFilter())}');
                 {$block->escapeJs($block->getJsObjectName())}.useAjax =
-                 '{($block->getUseAjax() ? 'true' : 'false')}';
+                 '{$useAjax}';
 
 script;
         ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
index 330d68a07e44d..410318a358429 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
@@ -115,7 +115,7 @@ $catalogHelper =$block->getData('catalogHelper');
                                 <?php endif; ?>
                                 <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
                                     'onclick',
-                                    "$('item_tier_<?= (int) $_item->getId() ?>').toggle();event.preventDefault();",
+                                    "$('item_tier_" . (int) $_item->getId() ."').toggle();event.preventDefault();",
                                     'div#item_tier_block_' . (int) $_item->getId() . ' a'
                                 ) ?>
                             <?php endif; ?>
diff --git a/dev/tests/integration/testsuite/Magento/Payment/Block/Transparent/IframeTest.php b/dev/tests/integration/testsuite/Magento/Payment/Block/Transparent/IframeTest.php
index 0b92956eebf11..0cb20792b7578 100644
--- a/dev/tests/integration/testsuite/Magento/Payment/Block/Transparent/IframeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Payment/Block/Transparent/IframeTest.php
@@ -6,8 +6,7 @@
 namespace Magento\Payment\Block\Transparent;
 
 /**
- * Class IframeTest
- * @package Magento\Payment\Block\Transparent
+ * Class for testing Iframe
  */
 class IframeTest extends \PHPUnit\Framework\TestCase
 {
@@ -38,7 +37,7 @@ public function testToHtml($xssString)
         $content = $block->toHtml();
 
         $this->assertNotContains($xssString, $content, 'Params must be escaped');
-        $this->assertContains($block->escapeXssInUrl($xssString), $content, 'Content must be present');
+        $this->assertContains($block->escapeJs($xssString), $content, 'Content must be present');
     }
 
     /**

From ae27a7207d2fe4f5e5bea8136c3dd2530248503b Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Tue, 12 May 2020 15:31:08 +0300
Subject: [PATCH 0253/1718] MC-34231: 2.4.0-develop-pr33 PR stabilization

---
 .../Theme/Test/Unit/Model/Design/Backend/ImageTest.php | 10 +++++-----
 .../Catalog/Model/ResourceModel/Eav/AttributeTest.php  |  7 ++++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php
index 38d0c8dc75754..4596655c0d6e0 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php
@@ -36,7 +36,7 @@ class ImageTest extends \PHPUnit\Framework\TestCase
     /**
      * @inheritdoc
      */
-    public function setUp()
+    public function setUp() : void
     {
         $context = $this->getMockObject(Context::class);
         $registry = $this->getMockObject(Registry::class);
@@ -70,7 +70,7 @@ public function setUp()
     /**
      * @inheritdoc
      */
-    public function tearDown()
+    public function tearDown() : void
     {
         unset($this->imageBackend);
     }
@@ -92,12 +92,12 @@ private function getMockObject(string $class, array $methods = []): \PHPUnit\Fra
 
     /**
      * Test for beforeSave method with invalid file extension.
-     *
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Something is wrong with the file upload settings.
      */
     public function testBeforeSaveWithInvalidExtensionFile()
     {
+        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectExceptionMessage('Something is wrong with the file upload settings.');
+
         $invalidFileName = 'fileName.invalidExtension';
         $this->imageBackend->setData(
             [
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Eav/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Eav/AttributeTest.php
index 9432f8bc55020..56e8023ccc691 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Eav/AttributeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Eav/AttributeTest.php
@@ -8,6 +8,7 @@
 use Magento\Eav\Api\AttributeRepositoryInterface;
 use Magento\Eav\Api\Data\AttributeInterface;
 use Magento\Eav\Model\Config;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 
@@ -67,13 +68,13 @@ public function testCRUD()
     /**
      * @magentoDataFixture Magento/Catalog/_files/product_attribute.php
      *
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Do not change entity type.
-     *
      * @return void
      */
     public function testAttributeSaveWithChangedEntityType(): void
     {
+        $this->expectException(LocalizedException::class);
+        $this->expectExceptionMessage('Do not change entity type.');
+
         $attribute = $this->attributeRepository->get($this->catalogProductEntityType, 'test_attribute_code_333');
         $attribute->setEntityTypeId(1);
         $attribute->save();

From 8f08535e5817773b62dd450c4e13a4e47c3185be Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Tue, 12 May 2020 19:47:35 +0300
Subject: [PATCH 0254/1718] MC-29420: Remove event handlers from CE

---
 .../adminhtml/templates/widget/grid/extended.phtml  |  5 ++---
 .../Block/Adminhtml/Sales/Order/Items/Renderer.php  |  8 ++++----
 .../sales/creditmemo/create/items/renderer.phtml    |  6 +++---
 .../sales/creditmemo/view/items/renderer.phtml      |  6 +++---
 .../sales/invoice/create/items/renderer.phtml       |  6 +++---
 .../sales/invoice/view/items/renderer.phtml         |  6 +++---
 .../sales/shipment/create/items/renderer.phtml      |  6 +++---
 .../sales/shipment/view/items/renderer.phtml        |  6 +++---
 .../templates/order/create/items/grid.phtml         | 13 ++++++-------
 9 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
index 6f7e37bc94094..1a4f038c2abf3 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
@@ -275,9 +275,8 @@ $numColumns = count($block->getColumns());
             <?php elseif ($block->getEmptyText()): ?>
                 <tr class="data-grid-tr-no-data">
                     <td class="<?= $block->escapeHtmlAttr($block->getEmptyTextClass()) ?>"
-                        colspan="<?= $block->escapeHtmlAttr($numColumns) ?>">
-                        <?= $block->escapeHtml($block->getEmptyText()) ?>
-                    </td>
+                        colspan="<?= $block->escapeHtmlAttr($numColumns) ?>"><?=
+                        $block->escapeHtml($block->getEmptyText()) ?></td>
                 </tr>
             <?php endif; ?>
             </tbody>
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php b/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
index f1a09369df74c..3cf8a5840f334 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
@@ -8,7 +8,7 @@
 use Magento\Catalog\Model\Product\Type\AbstractType;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Json\Helper\Data as JsonHelper;
+use Magento\Catalog\Helper\Data as CatalogHelper;
 
 /**
  * Adminhtml sales order item renderer
@@ -32,7 +32,7 @@ class Renderer extends \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRend
      * @param \Magento\Framework\Registry $registry
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json $serializer
-     * @param JsonHelper|null $jsonHelper
+     * @param CatalogHelper|null $catalogHelper
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -41,10 +41,10 @@ public function __construct(
         \Magento\Framework\Registry $registry,
         array $data = [],
         Json $serializer = null,
-        ?JsonHelper $jsonHelper = null
+        ?CatalogHelper $catalogHelper = null
     ) {
         $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
-        $data['jsonHelper'] = $jsonHelper ?? ObjectManager::getInstance()->get(JsonHelper::class);
+        $data['catalogHelper'] = $catalogHelper ?? ObjectManager::getInstance()->get(CatalogHelper::class);
         parent::__construct($context, $stockRegistry, $stockConfiguration, $registry, $data);
     }
 
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml
index 5fef2baf2ed65..f32fa87c0ac11 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml
@@ -16,8 +16,8 @@
 <?php $_count = count($items) ?>
 <?php $_index = 0 ?>
 <?php
-/** @var \Magento\Framework\Json\Helper\Data $helper */
-$helper = $block->getData('jsonHelper');
+/** @var \Magento\Catalog\Helper\Data $catalogHelper */
+$catalogHelper = $block->getData('catalogHelper');
 ?>
 
 <?php $_prevOptionId = '' ?>
@@ -55,7 +55,7 @@ $helper = $block->getData('jsonHelper');
             <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
             <div class="product-sku-block">
                 <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
-                <?= /* @noEscape */ implode('<br />', $helper->splitSku($_item->getSku())) ?>
+                <?= /* @noEscape */ implode('<br />', $catalogHelper->splitSku($_item->getSku())) ?>
             </div>
         </td>
         <?php else: ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml
index f19767bf488ca..12a27be743875 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml
@@ -16,8 +16,8 @@
 <?php $_count = count($items) ?>
 <?php $_index = 0 ?>
 <?php
-/** @var \Magento\Framework\Json\Helper\Data $helper */
-$helper = $block->getData('jsonHelper');
+/** @var \Magento\Catalog\Helper\Data $catalogHelper */
+$catalogHelper = $block->getData('catalogHelper');
 ?>
 
 <?php $_prevOptionId = '' ?>
@@ -53,7 +53,7 @@ $helper = $block->getData('jsonHelper');
             <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
             <div class="product-sku-block">
                 <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
-                <?= /* @noEscape */ implode('<br />', $helper->splitSku($_item->getSku())) ?>
+                <?= /* @noEscape */ implode('<br />', $catalogHelper->splitSku($_item->getSku())) ?>
             </div>
         </td>
         <?php else: ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml
index caf2470f20f50..23e7ef27fa78d 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml
@@ -16,8 +16,8 @@
 <?php $_count = count($items) ?>
 <?php $_index = 0 ?>
 <?php
-/** @var \Magento\Framework\Json\Helper\Data $helper */
-$helper = $block->getData('jsonHelper');
+/** @var \Magento\Catalog\Helper\Data $catalogHelper */
+$catalogHelper = $block->getData('catalogHelper');
 ?>
 
 <?php $_prevOptionId = '' ?>
@@ -63,7 +63,7 @@ $helper = $block->getData('jsonHelper');
             <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
             <div class="product-sku-block">
                 <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
-                <?= /* @noEscape */ implode('<br />', $helper->splitSku($_item->getSku())) ?>
+                <?= /* @noEscape */ implode('<br />', $catalogHelper->splitSku($_item->getSku())) ?>
             </div>
         </td>
         <?php else: ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml
index b7906fe5bf044..004c484bb9ba5 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml
@@ -16,8 +16,8 @@
 <?php $_count = count($items) ?>
 <?php $_index = 0 ?>
 <?php
-/** @var \Magento\Framework\Json\Helper\Data $helper */
-$helper = $block->getData('jsonHelper');
+/** @var \Magento\Catalog\Helper\Data $catalogHelper */
+$catalogHelper = $block->getData('catalogHelper');
 ?>
 
 <?php $_prevOptionId = '' ?>
@@ -53,7 +53,7 @@ $helper = $block->getData('jsonHelper');
             <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
             <div class="product-sku-block">
                 <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
-                <?= /* @noEscape */ implode('<br />', $helper->splitSku($_item->getSku())) ?>
+                <?= /* @noEscape */ implode('<br />', $catalogHelper->splitSku($_item->getSku())) ?>
             </div>
         <?php else: ?>
         <td class="col-product">
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml
index 0a5083ba0b569..9c3cdcd97bf52 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml
@@ -9,8 +9,8 @@
 ?>
 
 <?php
-/** @var \Magento\Framework\Json\Helper\Data $helper */
-$helper = $block->getData('jsonHelper');
+/** @var \Magento\Catalog\Helper\Data $catalogHelper */
+$catalogHelper = $block->getData('catalogHelper');
 ?>
 <?php $_item = $block->getItem() ?>
 <?php $items = $block->getChildren($_item); ?>
@@ -46,7 +46,7 @@ $helper = $block->getData('jsonHelper');
             <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
             <div class="product-sku-block">
                 <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
-                <?= /* @noEscape */ implode('<br />', $helper->splitSku($_item->getSku())) ?>
+                <?= /* @noEscape */ implode('<br />', $catalogHelper->splitSku($_item->getSku())) ?>
             </div>
         </td>
         <?php else: ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml
index 6510d1493f764..73efa4bddcc1c 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml
@@ -14,8 +14,8 @@
 <?php $_count = count($items) ?>
 <?php $_index = 0 ?>
 <?php
-/** @var \Magento\Framework\Json\Helper\Data $helper */
-$helper = $block->getData('jsonHelper');
+/** @var \Magento\Catalog\Helper\Data $catalogHelper */
+$catalogHelper = $block->getData('catalogHelper');
 ?>
 
 <?php $_prevOptionId = '' ?>
@@ -46,7 +46,7 @@ $helper = $block->getData('jsonHelper');
             <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
             <div class="product-sku-block">
                 <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
-                <?= /* @noEscape */ implode('<br />', $helper->splitSku($_item->getSku())) ?>
+                <?= /* @noEscape */ implode('<br />', $catalogHelper->splitSku($_item->getSku())) ?>
             </div>
         </td>
         <?php else: ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
index 410318a358429..ada5cb36cdbb0 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
@@ -79,9 +79,8 @@ $catalogHelper =$block->getData('catalogHelper');
                 <tbody class="<?= /* @noEscape */ ($i%2) ? 'even' : 'odd' ?>">
                     <tr>
                         <td class="col-product">
-                            <span id="order_item_<?= (int) $_item->getId() ?>_title">
-                                <?= $block->escapeHtml($_item->getName()) ?>
-                            </span>
+                            <span id="order_item_<?= (int) $_item->getId() ?>_title"><?=
+                                $block->escapeHtml($_item->getName()) ?></span>
                             <div class="product-sku-block">
                                 <span><?= $block->escapeHtml(__('SKU')) ?>:</span>
                                 <?= /* @noEscape */ implode(
@@ -125,16 +124,16 @@ $catalogHelper =$block->getData('catalogHelper');
                                            class="admin__control-checkbox"
                                            id="item_use_custom_price_<?= (int) $_item->getId() ?>"
                                            <?php if ($_isCustomPrice): ?> checked="checked"<?php endif; ?> />
+                                    <label
+                                        class="normal admin__field-label"
+                                        for="item_use_custom_price_<?= (int) $_item->getId() ?>">
+                                        <span><?= $block->escapeHtml(__('Custom Price')) ?>*</span></label>
                                     <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
                                         'onclick',
                                         "order.toggleCustomPrice(this, 'item_custom_price_" . (int) $_item->getId() .
                                         "', 'item_tier_block_" . (int) $_item->getId() . "');",
                                         'input#item_use_custom_price_' . (int) $_item->getId()
                                     ) ?>
-                                    <label
-                                        class="normal admin__field-label"
-                                        for="item_use_custom_price_<?= (int) $_item->getId() ?>">
-                                        <span><?= $block->escapeHtml(__('Custom Price')) ?>*</span></label>
                                 </div>
                             <?php endif; ?>
                             <input id="item_custom_price_<?= (int) $_item->getId() ?>"

From 51b5080b953dda0a9ded0bf12c981aa71dc9221e Mon Sep 17 00:00:00 2001
From: Dmytro Voskoboinikov <voskoboi@adobe.com>
Date: Tue, 12 May 2020 12:02:29 -0500
Subject: [PATCH 0255/1718] MC-29566: [2.4.x] Deprecate SID query
 parameter-related methods

---
 .../Theme/Test/Unit/Model/Design/Backend/ImageTest.php    | 2 +-
 .../Catalog/Model/ResourceModel/Eav/AttributeTest.php     | 8 +++++---
 .../testsuite/Magento/Customer/Model/AttributeTest.php    | 2 +-
 .../Magento/Customer/Model/Metadata/Form/ImageTest.php    | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php
index 77f9c5e1fe552..ec34637b915eb 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php
@@ -70,7 +70,7 @@ public function setUp(): void
     /**
      * @inheritdoc
      */
-    public function tearDown()
+    public function tearDown(): void
     {
         unset($this->imageBackend);
     }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Eav/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Eav/AttributeTest.php
index 9432f8bc55020..263a1c41ac8df 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Eav/AttributeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Eav/AttributeTest.php
@@ -67,13 +67,15 @@ public function testCRUD()
     /**
      * @magentoDataFixture Magento/Catalog/_files/product_attribute.php
      *
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Do not change entity type.
-     *
      * @return void
      */
     public function testAttributeSaveWithChangedEntityType(): void
     {
+        $this->expectException(
+            \Magento\Framework\Exception\LocalizedException::class
+        );
+        $this->expectExceptionMessage('Do not change entity type.');
+
         $attribute = $this->attributeRepository->get($this->catalogProductEntityType, 'test_attribute_code_333');
         $attribute->setEntityTypeId(1);
         $attribute->save();
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/AttributeTest.php
index dde20a8049437..d55046bc04f49 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/AttributeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/AttributeTest.php
@@ -41,7 +41,7 @@ class AttributeTest extends \PHPUnit\Framework\TestCase
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
         $this->model = $this->objectManager->get(Attribute::class);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/Metadata/Form/ImageTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/Metadata/Form/ImageTest.php
index 5d00feec17407..c8cee6a53f682 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/Metadata/Form/ImageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/Metadata/Form/ImageTest.php
@@ -55,7 +55,7 @@ class ImageTest extends \PHPUnit\Framework\TestCase
     /**
      * @inheritDoc
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
         $this->filesystem = $this->objectManager->get(Filesystem::class);
@@ -199,7 +199,7 @@ public function testProcessCustomerInvalidValue()
      * @inheritdoc
      * @throws FileSystemException
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
         parent::tearDownAfterClass();
         $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(

From 1ac621711126a8c13e41ad5faa6b3f8ad91d7ef5 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Tue, 12 May 2020 12:17:44 -0500
Subject: [PATCH 0256/1718] MC-33823: Merge CE, EE and B2B changes

---
 app/code/Magento/Csp/Model/BlockCache.php     | 134 ++++++++++++++++++
 app/code/Magento/Csp/etc/di.xml               |  11 ++
 .../view/frontend/templates/secure.phtml      |   9 ++
 .../testsuite/Magento/Csp/CachedBlockTest.php |  82 +++++++++++
 4 files changed, 236 insertions(+)
 create mode 100644 app/code/Magento/Csp/Model/BlockCache.php
 create mode 100644 dev/tests/integration/_files/Magento/TestModuleCspUtil/view/frontend/templates/secure.phtml
 create mode 100644 dev/tests/integration/testsuite/Magento/Csp/CachedBlockTest.php

diff --git a/app/code/Magento/Csp/Model/BlockCache.php b/app/code/Magento/Csp/Model/BlockCache.php
new file mode 100644
index 0000000000000..59cb62584f6bc
--- /dev/null
+++ b/app/code/Magento/Csp/Model/BlockCache.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Model;
+
+use Magento\Csp\Model\Collector\DynamicCollector;
+use Magento\Csp\Model\Policy\FetchPolicy;
+use Magento\Framework\App\CacheInterface;
+use Magento\Framework\Serialize\SerializerInterface;
+
+/**
+ * CSP aware block cache.
+ */
+class BlockCache implements CacheInterface
+{
+    /**
+     * @var CacheInterface
+     */
+    private $cache;
+
+    /**
+     * @var DynamicCollector
+     */
+    private $dynamicCollector;
+
+    /**
+     * @var SerializerInterface
+     */
+    private $serializer;
+
+    /**
+     * @param CacheInterface $cache
+     * @param DynamicCollector $dynamicCollector
+     * @param SerializerInterface $serializer
+     */
+    public function __construct(
+        CacheInterface $cache,
+        DynamicCollector $dynamicCollector,
+        SerializerInterface $serializer
+    ) {
+        $this->cache = $cache;
+        $this->dynamicCollector = $dynamicCollector;
+        $this->serializer = $serializer;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFrontend()
+    {
+        return $this->cache->getFrontend();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function load($identifier)
+    {
+        /** @var array|null $data */
+        $data = null;
+        $loaded = $this->cache->load($identifier);
+        try {
+            $data = $this->serializer->unserialize($loaded);
+            if (!is_array($data) || !array_key_exists('policies', $data) || !array_key_exists('html', $data)) {
+                $data = null;
+            }
+        } catch (\Throwable $exception) {
+            //Most likely block HTML was cached without policy data.
+        }
+        if ($data) {
+            foreach ($data['policies'] as $policyData) {
+                $this->dynamicCollector->add(
+                    new FetchPolicy(
+                        $policyData['id'],
+                        false,
+                        $policyData['hosts'],
+                        [],
+                        false,
+                        false,
+                        false,
+                        [],
+                        $policyData['hashes']
+                    )
+                );
+            }
+            $loaded = $data['html'];
+        }
+
+        return $loaded;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function save($data, $identifier, $tags = [], $lifeTime = null)
+    {
+        $collected = $this->dynamicCollector->collect();
+        if ($collected) {
+            $policiesData = [];
+            foreach ($collected as $policy) {
+                if ($policy instanceof FetchPolicy) {
+                    $policiesData[] = [
+                        'id' => $policy->getId(),
+                        'hosts' => $policy->getHostSources(),
+                        'hashes' => $policy->getHashes()
+                    ];
+                }
+            }
+            $data = $this->serializer->serialize(['policies' => $policiesData, 'html' => $data]);
+        }
+
+        return $this->cache->save($data, $identifier, $tags, $lifeTime);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function remove($identifier)
+    {
+        return $this->cache->remove($identifier);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function clean($tags = [])
+    {
+        return $this->cache->clean($tags);
+    }
+}
diff --git a/app/code/Magento/Csp/etc/di.xml b/app/code/Magento/Csp/etc/di.xml
index ac2d73fd01add..7b1129a0e1a41 100644
--- a/app/code/Magento/Csp/etc/di.xml
+++ b/app/code/Magento/Csp/etc/di.xml
@@ -89,4 +89,15 @@
             <argument name="cspRenderer" xsi:type="object">Magento\Csp\Api\CspRendererInterface</argument>
         </arguments>
     </type>
+
+    <type name="Magento\Csp\Model\BlockCache">
+        <arguments>
+            <argument name="cache" xsi:type="object">configured_block_cache</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\View\Element\Context">
+        <arguments>
+            <argument name="cache" xsi:type="object">Magento\Csp\Model\BlockCache</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/dev/tests/integration/_files/Magento/TestModuleCspUtil/view/frontend/templates/secure.phtml b/dev/tests/integration/_files/Magento/TestModuleCspUtil/view/frontend/templates/secure.phtml
new file mode 100644
index 0000000000000..f3ed9365d18b4
--- /dev/null
+++ b/dev/tests/integration/_files/Magento/TestModuleCspUtil/view/frontend/templates/secure.phtml
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+?>
+<?= /* @NoEscape */ $secureRenderer->renderTag('script', ['type' => 'text/javascript'], 'let var = 1; console.log("var = " + var);', false) ?>
diff --git a/dev/tests/integration/testsuite/Magento/Csp/CachedBlockTest.php b/dev/tests/integration/testsuite/Magento/Csp/CachedBlockTest.php
new file mode 100644
index 0000000000000..1b5325a07bdd1
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Csp/CachedBlockTest.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp;
+
+use Magento\Csp\Model\Collector\DynamicCollector;
+use Magento\Csp\Model\Collector\DynamicCollectorMock;
+use Magento\Framework\Math\Random;
+use Magento\Framework\View\LayoutInterface;
+use PHPUnit\Framework\TestCase;
+use Magento\Framework\View\Element\Template;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Test that inline util works fine with cached blocks.
+ */
+class CachedBlockTest extends TestCase
+{
+    /**
+     * @var LayoutInterface
+     */
+    private $layout;
+
+    /**
+     * @var DynamicCollectorMock
+     */
+    private $dynamicCollected;
+
+    /**
+     * @var Random
+     */
+    private $random;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        Bootstrap::getObjectManager()->configure([
+            'preferences' => [
+                DynamicCollector::class => DynamicCollectorMock::class
+            ]
+        ]);
+        $this->layout = Bootstrap::getObjectManager()->get(LayoutInterface::class);
+        $this->dynamicCollected = Bootstrap::getObjectManager()->get(DynamicCollector::class);
+        $this->random = Bootstrap::getObjectManager()->get(Random::class);
+    }
+
+    /**
+     * Validate policies preserved when reading block from cache.
+     *
+     * @return void
+     *
+     * @magentoAppArea frontend
+     * @magentoCache block_html enabled
+     */
+    public function testCachedPolicies(): void
+    {
+        /** @var Template $block */
+        $block = $this->layout->createBlock(
+            Template::class,
+            'test-block',
+            ['data' => ['cache_lifetime' => 3600, 'cache_key' => $this->random->getRandomString(32)]]
+        );
+        $block->setTemplate('Magento_TestModuleCspUtil::secure.phtml');
+        //Clearing previously added just in case.
+        $this->dynamicCollected->consumeAdded();
+
+        $block->toHtml();
+        $dynamic = $this->dynamicCollected->consumeAdded();
+        $this->assertNotEmpty($dynamic);
+
+        //From cache
+        $block->toHtml();
+        $cached = $this->dynamicCollected->consumeAdded();
+        $this->assertEquals($dynamic, $cached);
+    }
+}

From dcfe1c210b7629edb1ec8e606428cf9ef9eaf401 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Tue, 12 May 2020 14:33:49 -0500
Subject: [PATCH 0257/1718] MC-33823: Merge CE, EE and B2B changes

---
 app/code/Magento/Csp/etc/config.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Csp/etc/config.xml b/app/code/Magento/Csp/etc/config.xml
index c13cd37ca0340..88b4c305b62e6 100644
--- a/app/code/Magento/Csp/etc/config.xml
+++ b/app/code/Magento/Csp/etc/config.xml
@@ -70,14 +70,14 @@
                     <styles>
                         <policy_id>style-src</policy_id>
                         <self>1</self>
-                        <inline>1</inline>
+                        <inline>0</inline>
                         <eval>0</eval>
                         <dynamic>0</dynamic>
                     </styles>
                     <scripts>
                         <policy_id>script-src</policy_id>
                         <self>1</self>
-                        <inline>1</inline>
+                        <inline>0</inline>
                         <eval>1</eval>
                         <dynamic>0</dynamic>
                     </scripts>
@@ -170,14 +170,14 @@
                     <styles>
                         <policy_id>style-src</policy_id>
                         <self>1</self>
-                        <inline>1</inline>
+                        <inline>0</inline>
                         <eval>0</eval>
                         <dynamic>0</dynamic>
                     </styles>
                     <scripts>
                         <policy_id>script-src</policy_id>
                         <self>1</self>
-                        <inline>1</inline>
+                        <inline>0</inline>
                         <eval>1</eval>
                         <dynamic>0</dynamic>
                     </scripts>

From 16497a0ac8f439f47d89954ca3ac1ff5e9256fe6 Mon Sep 17 00:00:00 2001
From: Dmytro Voskoboinikov <voskoboi@adobe.com>
Date: Tue, 12 May 2020 17:10:35 -0500
Subject: [PATCH 0258/1718] MC-29566: [2.4.x] Deprecate SID query
 parameter-related methods

---
 .../Test/Unit/Model/Template/FilterTest.php   |  3 +-
 .../Unit/Model/Metadata/Form/ImageTest.php    | 32 +++++++++++++++++++
 .../Test/Unit/Model/Template/FilterTest.php   |  5 ++-
 .../Block/Adminhtml/Queue/PreviewTest.php     | 16 +++++-----
 .../Unit/Model/Design/Backend/ImageTest.php   | 10 ++++--
 .../Image/Test/Unit/Adapter/Gd2Test.php       |  5 +--
 .../Test/Unit/Adapter/ImageMagickTest.php     |  4 ++-
 7 files changed, 59 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/Cms/Test/Unit/Model/Template/FilterTest.php b/app/code/Magento/Cms/Test/Unit/Model/Template/FilterTest.php
index 76b5e6624225b..502b7aa63a1a2 100644
--- a/app/code/Magento/Cms/Test/Unit/Model/Template/FilterTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Model/Template/FilterTest.php
@@ -119,10 +119,11 @@ public function testMediaDirectiveRelativePath()
      * Test using media directive with a URL path including schema.
      *
      * @covers \Magento\Cms\Model\Template\Filter::mediaDirective
-     * @expectedException \InvalidArgumentException
      */
     public function testMediaDirectiveURL()
     {
+        $this->expectException(\InvalidArgumentException::class);
+
         $baseMediaDir = 'pub/media';
         $construction = [
             '{{media url="http://wysiwyg/images/image.jpg"}}',
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php
index 75a5b017a7505..8fd122c967c5f 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php
@@ -230,6 +230,14 @@ public function testValidate()
             'name' => 'logo.gif',
         ];
 
+        $this->ioFileSystemMock->expects($this->any())
+            ->method('getPathInfo')
+            ->with($value['name'])
+            ->willReturn([
+                'filename' => 'logo',
+                'extension' => 'gif'
+            ]);
+
         $this->attributeMetadataMock->expects($this->once())
             ->method('getStoreLabel')
             ->willReturn('File Input Field Label');
@@ -272,6 +280,14 @@ public function testValidateMaxFileSize()
             ->method('getValue')
             ->willReturn($maxFileSize);
 
+        $this->ioFileSystemMock->expects($this->any())
+            ->method('getPathInfo')
+            ->with($value['name'])
+            ->willReturn([
+                'filename' => 'logo',
+                'extension' => 'gif'
+            ]);
+
         $this->attributeMetadataMock->expects($this->once())
             ->method('getStoreLabel')
             ->willReturn('File Input Field Label');
@@ -316,6 +332,14 @@ public function testValidateMaxImageWidth()
             ->method('getValue')
             ->willReturn($maxImageWidth);
 
+        $this->ioFileSystemMock->expects($this->any())
+            ->method('getPathInfo')
+            ->with($value['name'])
+            ->willReturn([
+                'filename' => 'logo',
+                'extension' => 'gif'
+            ]);
+
         $this->attributeMetadataMock->expects($this->once())
             ->method('getStoreLabel')
             ->willReturn('File Input Field Label');
@@ -360,6 +384,14 @@ public function testValidateMaxImageHeight()
             ->method('getValue')
             ->willReturn($maxImageHeight);
 
+        $this->ioFileSystemMock->expects($this->any())
+            ->method('getPathInfo')
+            ->with($value['name'])
+            ->willReturn([
+                'filename' => 'logo',
+                'extension' => 'gif'
+            ]);
+
         $this->attributeMetadataMock->expects($this->once())
             ->method('getStoreLabel')
             ->willReturn('File Input Field Label');
diff --git a/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php b/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
index 81262a9071f6c..ac890dd3d4a73 100644
--- a/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
+++ b/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
@@ -475,11 +475,14 @@ public function testProtocolDirectiveWithValidSchema()
     }
 
     /**
-     * @expectedException \Magento\Framework\Exception\MailException
      * @throws NoSuchEntityException
      */
     public function testProtocolDirectiveWithInvalidSchema()
     {
+        $this->expectException(
+            \Magento\Framework\Exception\MailException::class
+        );
+
         $model = $this->getModel();
         $storeMock = $this->createMock(\Magento\Store\Model\Store::class);
         $storeMock->expects($this->once())->method('isCurrentlySecure')->willReturn(true);
diff --git a/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Queue/PreviewTest.php b/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Queue/PreviewTest.php
index d64410c210837..9b5855a06be26 100644
--- a/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Queue/PreviewTest.php
+++ b/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Queue/PreviewTest.php
@@ -178,17 +178,17 @@ public function testToHtmlWithId()
         );
         $this->queueMock->expects($this->once())
             ->method('load')->willReturnSelf();
-        $this->queue->expects($this->once())->method('getTemplateId')->willReturn($templateId);
-        $this->queue->expects($this->once())->method('getNewsletterType')->willReturn($newsletterType);
-        $this->queue->expects($this->once())->method('getNewsletterText')->willReturn($newsletterText);
-        $this->queue->expects($this->once())->method('getNewsletterStyles')->willReturn($newsletterStyle);
+        $this->queueMock->expects($this->once())->method('getTemplateId')->willReturn($templateId);
+        $this->queueMock->expects($this->once())->method('getNewsletterType')->willReturn($newsletterType);
+        $this->queueMock->expects($this->once())->method('getNewsletterText')->willReturn($newsletterText);
+        $this->queueMock->expects($this->once())->method('getNewsletterStyles')->willReturn($newsletterStyle);
         $this->templateMock->expects($this->any())
             ->method('isPlain')
             ->willReturn(true);
-        $this->template->expects($this->once())->method('setId')->willReturn($templateId);
-        $this->template->expects($this->once())->method('setTemplateType')->willReturn($newsletterType);
-        $this->template->expects($this->once())->method('setTemplateText')->willReturn($newsletterText);
-        $this->template->expects($this->once())->method('setTemplateStyles')->willReturn($newsletterStyle);
+        $this->templateMock->expects($this->once())->method('setId')->willReturn($templateId);
+        $this->templateMock->expects($this->once())->method('setTemplateType')->willReturn($newsletterType);
+        $this->templateMock->expects($this->once())->method('setTemplateText')->willReturn($newsletterText);
+        $this->templateMock->expects($this->once())->method('setTemplateStyles')->willReturn($newsletterStyle);
         /** @var Store $store */
         $this->storeManagerMock->expects($this->once())
             ->method('getDefaultStoreView')
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php
index ec34637b915eb..f1c2b1d755971 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/ImageTest.php
@@ -92,12 +92,16 @@ private function getMockObject(string $class, array $methods = []): \PHPUnit\Fra
 
     /**
      * Test for beforeSave method with invalid file extension.
-     *
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Something is wrong with the file upload settings.
      */
     public function testBeforeSaveWithInvalidExtensionFile()
     {
+        $this->expectException(
+            \Magento\Framework\Exception\LocalizedException::class
+        );
+        $this->expectExceptionMessage(
+            'Something is wrong with the file upload settings.'
+        );
+
         $invalidFileName = 'fileName.invalidExtension';
         $this->imageBackend->setData(
             [
diff --git a/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/Gd2Test.php b/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/Gd2Test.php
index a1e6e374afd56..70b55ab6e4a33 100644
--- a/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/Gd2Test.php
+++ b/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/Gd2Test.php
@@ -122,7 +122,6 @@ public function filesProvider()
 
     /**
      * Test if open() method resets cached fileType
-     *
      */
     public function testOpenDifferentTypes()
     {
@@ -156,10 +155,12 @@ public function testOpenDifferentTypes()
     }
 
     /**
-     * @expectedException \InvalidArgumentException
+     * Test open() with invalid URL.
      */
     public function testOpenInvalidURL()
     {
+        $this->expectException(\InvalidArgumentException::class);
+
         $this->adapter->open('bar://foo.bar');
     }
 }
diff --git a/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/ImageMagickTest.php b/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/ImageMagickTest.php
index 9f50fd5b7445d..2a27d25dac82e 100644
--- a/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/ImageMagickTest.php
+++ b/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/ImageMagickTest.php
@@ -101,10 +101,12 @@ public function testSaveWithException()
     }
 
     /**
-     * @expectedException \InvalidArgumentException
+     * Test open() with invalid URL.
      */
     public function testOpenInvalidUrl()
     {
+        $this->expectException(\InvalidArgumentException::class);
+
         $this->imageMagic->open('bar://foo.bar');
     }
 }

From 4f9be0e64a89e2d6ed092f193813497bc631c660 Mon Sep 17 00:00:00 2001
From: Dmytro Voskoboinikov <voskoboi@adobe.com>
Date: Tue, 12 May 2020 17:19:08 -0500
Subject: [PATCH 0259/1718] MC-29566: [2.4.x] Deprecate SID query
 parameter-related methods

---
 .../testsuite/Magento/Customer/Model/AttributeTest.php    | 8 +++++---
 .../Magento/Customer/Model/Metadata/Form/ImageTest.php    | 6 +++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/AttributeTest.php
index d55046bc04f49..f433324efcfa6 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/AttributeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/AttributeTest.php
@@ -69,13 +69,15 @@ public function testCRUD(): void
     /**
      * @magentoDataFixture Magento/Customer/_files/attribute_user_defined_customer.php
      *
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Do not change entity type.
-     *
      * @return void
      */
     public function testAttributeSaveWithChangedEntityType(): void
     {
+        $this->expectException(
+            \Magento\Framework\Exception\LocalizedException::class
+        );
+        $this->expectExceptionMessage('Do not change entity type.');
+
         $attribute = $this->attributeRepository->get($this->customerEntityType, 'user_attribute');
         $attribute->setEntityTypeId(5);
         $attribute->save();
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/Metadata/Form/ImageTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/Metadata/Form/ImageTest.php
index c8cee6a53f682..48e45126d124b 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/Metadata/Form/ImageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/Metadata/Form/ImageTest.php
@@ -157,12 +157,16 @@ public function testProcessCustomerValue()
      * Test for processCustomerValue method with invalid value
      *
      * @magentoAppIsolation enabled
-     * @expectedException \Magento\Framework\Exception\ValidatorException
+     *
      * @throws FileSystemException
      * @throws \ReflectionException
      */
     public function testProcessCustomerInvalidValue()
     {
+        $this->expectException(
+            \Magento\Framework\Exception\ValidatorException::class
+        );
+
         $this->mediaDirectory->delete('customer');
         $this->mediaDirectory->create($this->mediaDirectory->getRelativePath('customer/tmp/'));
         $tmpFilePath = $this->mediaDirectory->getAbsolutePath('customer/tmp/' . $this->fileName);

From 9e1b438cf0d89cdfdf3360168853fdbe43d97a47 Mon Sep 17 00:00:00 2001
From: Andrii Kasian <akasian@magento.com>
Date: Tue, 12 May 2020 18:25:07 -0500
Subject: [PATCH 0260/1718] Improve code quality

---
 .../Catalog/Model/Indexer/Category/Product/AbstractAction.php  | 1 +
 app/code/Magento/Catalog/Model/ResourceModel/Product.php       | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
index 42e9e4309a08b..f80206bf8a7b6 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
@@ -15,6 +15,7 @@
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Store\Model\Store;
 
+// phpcs:disable Magento2.Classes.AbstractApi
 /**
  * Class AbstractAction
  *
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product.php b/app/code/Magento/Catalog/Model/ResourceModel/Product.php
index 747893875d23b..58fb7d09af674 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product.php
@@ -227,6 +227,9 @@ public function getWebsiteIds($product)
      */
     public function getWebsiteIdsByProductIds($productIds)
     {
+        if (!is_array($productIds) || empty($productIds)) {
+            return [];
+        }
         $select = $this->getConnection()->select()->from(
             $this->getProductWebsiteTable(),
             ['product_id', 'website_id']

From 7173fa4358fbf72aafb8d8b20a54b7aca14b7911 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Wed, 13 May 2020 15:01:39 +0300
Subject: [PATCH 0261/1718] MC-34231: 2.4.0-develop-pr33 PR stabilization

---
 .../Test/Unit/Model/Template/FilterTest.php   |  2 +-
 .../Unit/Model/Metadata/Form/ImageTest.php    | 20 ++++++
 .../Test/Unit/Model/Template/FilterTest.php   |  2 +-
 .../Block/Adminhtml/Queue/PreviewTest.php     | 71 +++++++++++--------
 .../Image/Test/Unit/Adapter/Gd2Test.php       |  3 +-
 .../Test/Unit/Adapter/ImageMagickTest.php     |  3 +-
 6 files changed, 68 insertions(+), 33 deletions(-)

diff --git a/app/code/Magento/Cms/Test/Unit/Model/Template/FilterTest.php b/app/code/Magento/Cms/Test/Unit/Model/Template/FilterTest.php
index 76b5e6624225b..96aec148fe50b 100644
--- a/app/code/Magento/Cms/Test/Unit/Model/Template/FilterTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Model/Template/FilterTest.php
@@ -119,10 +119,10 @@ public function testMediaDirectiveRelativePath()
      * Test using media directive with a URL path including schema.
      *
      * @covers \Magento\Cms\Model\Template\Filter::mediaDirective
-     * @expectedException \InvalidArgumentException
      */
     public function testMediaDirectiveURL()
     {
+        $this->expectException(\InvalidArgumentException::class);
         $baseMediaDir = 'pub/media';
         $construction = [
             '{{media url="http://wysiwyg/images/image.jpg"}}',
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php
index 75a5b017a7505..2989e3268e7a0 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/ImageTest.php
@@ -239,6 +239,11 @@ public function testValidate()
             ->with(FileProcessor::TMP_DIR . '/' . $value['name'])
             ->willReturn(true);
 
+        $this->ioFileSystemMock->expects($this->once())
+            ->method('getPathInfo')
+            ->with($value['name'])
+            ->willReturn(['extension' => 'gif']);
+
         $model = $this->initialize([
             'value' => $value,
             'isAjax' => false,
@@ -284,6 +289,11 @@ public function testValidateMaxFileSize()
             ->with(FileProcessor::TMP_DIR . '/' . $value['name'])
             ->willReturn(true);
 
+        $this->ioFileSystemMock->expects($this->once())
+            ->method('getPathInfo')
+            ->with($value['name'])
+            ->willReturn(['extension' => 'gif']);
+
         $model = $this->initialize([
             'value' => $value,
             'isAjax' => false,
@@ -328,6 +338,11 @@ public function testValidateMaxImageWidth()
             ->with(FileProcessor::TMP_DIR . '/' . $value['name'])
             ->willReturn(true);
 
+        $this->ioFileSystemMock->expects($this->once())
+            ->method('getPathInfo')
+            ->with($value['name'])
+            ->willReturn(['extension' => 'gif']);
+
         $model = $this->initialize([
             'value' => $value,
             'isAjax' => false,
@@ -372,6 +387,11 @@ public function testValidateMaxImageHeight()
             ->with(FileProcessor::TMP_DIR . '/' . $value['name'])
             ->willReturn(true);
 
+        $this->ioFileSystemMock->expects($this->once())
+            ->method('getPathInfo')
+            ->with($value['name'])
+            ->willReturn(['extension' => 'gif']);
+
         $model = $this->initialize([
             'value' => $value,
             'isAjax' => false,
diff --git a/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php b/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
index 81262a9071f6c..17ee299140464 100644
--- a/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
+++ b/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
@@ -475,11 +475,11 @@ public function testProtocolDirectiveWithValidSchema()
     }
 
     /**
-     * @expectedException \Magento\Framework\Exception\MailException
      * @throws NoSuchEntityException
      */
     public function testProtocolDirectiveWithInvalidSchema()
     {
+        $this->expectException(\Magento\Framework\Exception\MailException::class);
         $model = $this->getModel();
         $storeMock = $this->createMock(\Magento\Store\Model\Store::class);
         $storeMock->expects($this->once())->method('isCurrentlySecure')->willReturn(true);
diff --git a/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Queue/PreviewTest.php b/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Queue/PreviewTest.php
index d64410c210837..d3b6495df680f 100644
--- a/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Queue/PreviewTest.php
+++ b/app/code/Magento/Newsletter/Test/Unit/Block/Adminhtml/Queue/PreviewTest.php
@@ -100,16 +100,23 @@ protected function setUp(): void
             ->willReturn($backendSession);
 
         $templateFactory = $this->createPartialMock(TemplateFactory::class, ['create']);
-        $this->templateMock = $this->createPartialMock(
-            Template::class,
-            [
-                'isPlain',
-                'setId',
-                'setTemplateType',
-                'setTemplateText',
-                'setTemplateStyles',
-            ]
-        );
+        $this->templateMock = $this->getMockBuilder(Template::class)
+            ->disableOriginalConstructor()
+            ->setMethods(
+                [
+                    'isPlain',
+                    'setId',
+                ]
+            )
+            ->addMethods(
+                [
+                    'setTemplateType',
+                    'setTemplateText',
+                    'setTemplateStyles',
+                ]
+            )
+            ->getMock();
+
         $templateFactory->expects($this->once())
             ->method('create')
             ->willReturn($this->templateMock);
@@ -121,16 +128,22 @@ protected function setUp(): void
             ->willReturn($this->subscriberMock);
 
         $queueFactory = $this->createPartialMock(QueueFactory::class, ['create']);
-        $this->queueMock = $this->createPartialMock(
-            Queue::class,
-            [
-                'load',
-                'getTemplateId',
-                'getNewsletterType',
-                'getNewsletterText',
-                'getNewsletterStyles',
-            ]
-        );
+        $this->queueMock = $this->getMockBuilder(Queue::class)
+            ->disableOriginalConstructor()
+            ->setMethods(
+                [
+                    'load',
+                ]
+            )
+            ->addMethods(
+                [
+                    'getTemplateId',
+                    'getNewsletterType',
+                    'getNewsletterText',
+                    'getNewsletterStyles',
+                ]
+            )
+            ->getMock();
         $queueFactory->expects($this->any())
             ->method('create')
             ->willReturn($this->queueMock);
@@ -148,7 +161,7 @@ protected function setUp(): void
                 'context' => $context,
                 'templateFactory' => $templateFactory,
                 'subscriberFactory' => $subscriberFactory,
-                'queueFactory' => $queueFactory
+                'queueFactory' => $queueFactory,
             ]
         );
     }
@@ -178,17 +191,17 @@ public function testToHtmlWithId()
         );
         $this->queueMock->expects($this->once())
             ->method('load')->willReturnSelf();
-        $this->queue->expects($this->once())->method('getTemplateId')->willReturn($templateId);
-        $this->queue->expects($this->once())->method('getNewsletterType')->willReturn($newsletterType);
-        $this->queue->expects($this->once())->method('getNewsletterText')->willReturn($newsletterText);
-        $this->queue->expects($this->once())->method('getNewsletterStyles')->willReturn($newsletterStyle);
+        $this->queueMock->expects($this->once())->method('getTemplateId')->willReturn($templateId);
+        $this->queueMock->expects($this->once())->method('getNewsletterType')->willReturn($newsletterType);
+        $this->queueMock->expects($this->once())->method('getNewsletterText')->willReturn($newsletterText);
+        $this->queueMock->expects($this->once())->method('getNewsletterStyles')->willReturn($newsletterStyle);
         $this->templateMock->expects($this->any())
             ->method('isPlain')
             ->willReturn(true);
-        $this->template->expects($this->once())->method('setId')->willReturn($templateId);
-        $this->template->expects($this->once())->method('setTemplateType')->willReturn($newsletterType);
-        $this->template->expects($this->once())->method('setTemplateText')->willReturn($newsletterText);
-        $this->template->expects($this->once())->method('setTemplateStyles')->willReturn($newsletterStyle);
+        $this->templateMock->expects($this->once())->method('setId')->willReturn($templateId);
+        $this->templateMock->expects($this->once())->method('setTemplateType')->willReturn($newsletterType);
+        $this->templateMock->expects($this->once())->method('setTemplateText')->willReturn($newsletterText);
+        $this->templateMock->expects($this->once())->method('setTemplateStyles')->willReturn($newsletterStyle);
         /** @var Store $store */
         $this->storeManagerMock->expects($this->once())
             ->method('getDefaultStoreView')
diff --git a/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/Gd2Test.php b/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/Gd2Test.php
index a1e6e374afd56..2383f15dbf3ee 100644
--- a/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/Gd2Test.php
+++ b/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/Gd2Test.php
@@ -156,10 +156,11 @@ public function testOpenDifferentTypes()
     }
 
     /**
-     * @expectedException \InvalidArgumentException
+     * Check case with invalid URL
      */
     public function testOpenInvalidURL()
     {
+        $this->expectException(\InvalidArgumentException::class);
         $this->adapter->open('bar://foo.bar');
     }
 }
diff --git a/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/ImageMagickTest.php b/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/ImageMagickTest.php
index 9f50fd5b7445d..c8c1faf23c7dc 100644
--- a/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/ImageMagickTest.php
+++ b/lib/internal/Magento/Framework/Image/Test/Unit/Adapter/ImageMagickTest.php
@@ -101,10 +101,11 @@ public function testSaveWithException()
     }
 
     /**
-     * @expectedException \InvalidArgumentException
+     * Check case with invalid URL
      */
     public function testOpenInvalidUrl()
     {
+        $this->expectException(\InvalidArgumentException::class);
         $this->imageMagic->open('bar://foo.bar');
     }
 }

From 3ac458b2e4442d4b0fc3e7de672d7562c1c85607 Mon Sep 17 00:00:00 2001
From: Rudolf Vince <rudolf@mediotype.com>
Date: Wed, 13 May 2020 15:06:54 +0200
Subject: [PATCH 0262/1718] Static test fixes

---
 .../Magento/Wishlist/Controller/Shared/Allcart.php    |  8 +++++++-
 app/code/Magento/Wishlist/Controller/Shared/Cart.php  | 11 +++++++++++
 .../Wishlist/Test/Unit/Controller/Shared/CartTest.php |  1 +
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Wishlist/Controller/Shared/Allcart.php b/app/code/Magento/Wishlist/Controller/Shared/Allcart.php
index 89c1b88d9568e..b6e93d7047c76 100644
--- a/app/code/Magento/Wishlist/Controller/Shared/Allcart.php
+++ b/app/code/Magento/Wishlist/Controller/Shared/Allcart.php
@@ -37,6 +37,12 @@ class Allcart implements HttpGetActionInterface
      */
     private $resultFactory;
 
+    /**
+     * @param ItemCarrier $itemCarrier
+     * @param RequestInterface $request
+     * @param ResultFactory $resultFactory
+     * @param WishlistProvider $wishlistProvider
+     */
     public function __construct(
         ItemCarrier $itemCarrier,
         RequestInterface $request,
@@ -52,7 +58,7 @@ public function __construct(
     /**
      * Add all items from wishlist to shopping cart
      *
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public function execute()
     {
diff --git a/app/code/Magento/Wishlist/Controller/Shared/Cart.php b/app/code/Magento/Wishlist/Controller/Shared/Cart.php
index 77dc52e05f077..df023ffc01ddf 100644
--- a/app/code/Magento/Wishlist/Controller/Shared/Cart.php
+++ b/app/code/Magento/Wishlist/Controller/Shared/Cart.php
@@ -76,6 +76,17 @@ class Cart implements HttpGetActionInterface
      */
     private $resultFactory;
 
+    /**
+     * @param CustomerCart $cart
+     * @param OptionFactory $optionFactory
+     * @param ItemFactory $itemFactory
+     * @param CartHelper $cartHelper
+     * @param Escaper $escaper
+     * @param RequestInterface $request
+     * @param RedirectInterface $redirect
+     * @param MessageManagerInterface $messageManager
+     * @param ResultFactory $resultFactory
+     */
     public function __construct(
         CustomerCart $cart,
         OptionFactory $optionFactory,
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php
index c495ea6651342..43f82c1722bde 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php
@@ -85,6 +85,7 @@ class CartTest extends TestCase
     /** @var  Product|MockObject */
     protected $product;
 
+    // phpcs:ignore Generic.Files.LineLength.TooLong
     protected function setUp()
     {
         $this->request = $this->getMockBuilder(RequestInterface::class)

From 767c882a187567d09a08e854ca202d0ff1dff8c5 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Wed, 13 May 2020 16:23:33 +0300
Subject: [PATCH 0263/1718] MC-29420: Remove event handlers from CE

---
 .../frontend/templates/product/image_with_borders.phtml   | 7 +++----
 .../Magento/Reports/view/adminhtml/templates/grid.phtml   | 8 +++++---
 .../adminhtml/templates/order/create/sidebar/items.phtml  | 6 +++---
 .../frontend/templates/product/layered/renderer.phtml     | 4 ++--
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
index dce1a51a57c63..25c74541014ef 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
@@ -9,8 +9,7 @@
 /** @var $escaper \Magento\Framework\Escaper */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-
-<span class="product-image-container">
+<span class="product-image-container" id="product-image-container-<?= /* @noEscape */ $block->getProductId() ?>">
     <span class="product-image-wrapper">
         <img class="<?= $escaper->escapeHtmlAttr($block->getClass()) ?>"
             <?php foreach ($block->getCustomAttributes() as $name => $value): ?>
@@ -24,9 +23,9 @@
 </span>
 <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
     'width:' . (int)$block->getWidth() . 'px;',
-    'span.product-image-container'
+    '#product-image-container-' . $block->getProductId()
 ) ?>
 <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
     'padding-bottom: '. ($block->getRatio() * 100) . '%;',
-    'span.product-image-wrapper'
+    '#product-image-container-' . $block->getProductId() . ' span.product-image-wrapper'
 ) ?>
diff --git a/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml b/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
index f615c705b356d..4f6e3c4a9a02b 100644
--- a/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
@@ -104,7 +104,10 @@ script;
         </div>
     </div>
     <?php if ($block->canDisplayContainer()): ?>
-        <?php $useAjax = $block->getUseAjax() ? 'true' : 'false';
+        <?php $useAjax = '';
+        if ($block->getUseAjax()):
+            $useAjax = $block->escapeJs($block->getUseAjax());
+        endif;
         $scriptString = <<<script
 
             require([
@@ -119,8 +122,7 @@ script;
                  '{$block->escapeJs($block->getGridUrl())}', '{$block->escapeJs($block->getVarNamePage())}',
                  '{$block->escapeJs($block->getVarNameSort())}', '{$block->escapeJs($block->getVarNameDir())}',
                  '{$block->escapeJs($block->getVarNameFilter())}');
-                {$block->escapeJs($block->getJsObjectName())}.useAjax =
-                 '{$useAjax}';
+                {$block->escapeJs($block->getJsObjectName())}.useAjax = '{$useAjax}';
 
 script;
         ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
index 5af76eef829b1..dd5a2e4771a7e 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
@@ -59,7 +59,7 @@
 
             <tbody>
                 <?php foreach ($block->getItems() as $_item): ?>
-                    <tr>
+                    <tr id="product-id-<?= (int) $block->getProductId($_item) ?>">
                         <td class="col-item"><?= $block->escapeHtml($_item->getName()) ?></td>
 
                         <?php if ($block->canDisplayItemQty()): ?>
@@ -108,7 +108,7 @@
                                         "order.sidebarConfigureProduct('sidebar_wishlist', " .
                                         (int) $block->getProductId($_item) . ", " . (int) $block->getItemId($_item) .
                                         ");event.preventDefault();",
-                                        'a.icon.icon-configure'
+                                        'tr#product-id-' . (int) $block->getProductId($_item) .' a.icon.icon-configure'
                                     ) ?>
                                 <?php elseif ($block->isConfigurationRequired($_item->getTypeId())): ?>
                                     <a href="#"
@@ -120,7 +120,7 @@
                                         'onclick',
                                         "order.sidebarConfigureProduct('sidebar', " .
                                         (int) $block->getProductId($_item) . ");event.preventDefault();",
-                                        'a.icon.icon-configure'
+                                        'tr#product-id-' . (int) $block->getProductId($_item) . ' a.icon.icon-configure'
                                     ) ?>
                                 <?php else: ?>
                                     <input id="sidebar-<?= $block->escapeHtmlAttr($block->getSidebarStorageAction())
diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
index 971dddfd40e68..d8353553dcd81 100644
--- a/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
+++ b/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
@@ -55,7 +55,7 @@
                             <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
                                 "background: url(" . /*  @noEscape */ $escapedUrl .
                                 ") no-repeat center; background-size: initial;",
-                                "div[data-option-id='" . $block->escapeHtmlAttr($option) . "']"
+                                'div[data-option-id="' . $block->escapeHtmlAttr($option) . '"]'
                             ) ?>
                             <?php break;
                         case '1':
@@ -74,7 +74,7 @@
                                 "background: " . $block->escapeHtmlAttr(
                                     $swatchData['swatches'][$option]['value']
                                 ) . " no-repeat center; background-size: initial;",
-                                "div[data-option-id='" . $block->escapeHtmlAttr($option) . "']"
+                                'div[data-option-id="' . $block->escapeHtmlAttr($option) . '"]'
                             ) ?>
                             <?php break;
                         case '0':

From 13d09423fc882bb8dd6207f1645d1756322b82d6 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Wed, 13 May 2020 15:59:27 +0200
Subject: [PATCH 0264/1718] Review issues fixes

---
 app/code/Magento/Quote/Model/Cart/AddProductsToCart.php        | 2 ++
 .../Model/Cart/BuyRequest/CustomizableOptionDataProvider.php   | 2 +-
 .../Magento/Quote/Model/Cart/Data/AddProductsToCartOutput.php  | 2 +-
 app/code/Magento/Quote/Model/Cart/Data/EnteredOption.php       | 3 +++
 .../Model/Cart/BuyRequest/BundleDataProvider.php               | 3 +--
 .../Model/Cart/BuyRequest/SuperAttributeDataProvider.php       | 2 +-
 .../Model/Cart/BuyRequest/DownloadableLinkDataProvider.php     | 2 +-
 7 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php b/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
index 5d7eb053dc892..79a11e9eba039 100644
--- a/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
+++ b/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
@@ -175,6 +175,8 @@ private function addError(string $message, int $cartItemPosition = 0, string $co
     /**
      * Get message error code.
      *
+     * TODO: introduce a separate class for getting error code from a message
+     *
      * @param string $message
      * @return string
      */
diff --git a/app/code/Magento/Quote/Model/Cart/BuyRequest/CustomizableOptionDataProvider.php b/app/code/Magento/Quote/Model/Cart/BuyRequest/CustomizableOptionDataProvider.php
index 07fc9a41855a5..173f0bb403f62 100644
--- a/app/code/Magento/Quote/Model/Cart/BuyRequest/CustomizableOptionDataProvider.php
+++ b/app/code/Magento/Quote/Model/Cart/BuyRequest/CustomizableOptionDataProvider.php
@@ -96,7 +96,7 @@ private function validateInput(array $optionData): void
     {
         if (count($optionData) !== 3) {
             throw new LocalizedException(
-                __('Wrong format of the entered option data. Must be "custom-option/option_id/option_value_id"')
+                __('Wrong format of the entered option data')
             );
         }
     }
diff --git a/app/code/Magento/Quote/Model/Cart/Data/AddProductsToCartOutput.php b/app/code/Magento/Quote/Model/Cart/Data/AddProductsToCartOutput.php
index 6088b12a36e7c..c12c02c0449f6 100644
--- a/app/code/Magento/Quote/Model/Cart/Data/AddProductsToCartOutput.php
+++ b/app/code/Magento/Quote/Model/Cart/Data/AddProductsToCartOutput.php
@@ -45,7 +45,7 @@ public function getCart(): CartInterface
     }
 
     /**
-     * Get errors happened during reorder
+     * Get errors happened during adding item to the cart
      *
      * @return Error[]
      */
diff --git a/app/code/Magento/Quote/Model/Cart/Data/EnteredOption.php b/app/code/Magento/Quote/Model/Cart/Data/EnteredOption.php
index f11aa49d6b4c3..b60c349a8e99a 100644
--- a/app/code/Magento/Quote/Model/Cart/Data/EnteredOption.php
+++ b/app/code/Magento/Quote/Model/Cart/Data/EnteredOption.php
@@ -7,6 +7,9 @@
 
 namespace Magento\Quote\Model\Cart\Data;
 
+/**
+ * DTO for quote item entered option
+ */
 class EnteredOption
 {
     /**
diff --git a/app/code/Magento/QuoteBundleOptions/Model/Cart/BuyRequest/BundleDataProvider.php b/app/code/Magento/QuoteBundleOptions/Model/Cart/BuyRequest/BundleDataProvider.php
index 946e30ce3e276..6e8c9844b1503 100644
--- a/app/code/Magento/QuoteBundleOptions/Model/Cart/BuyRequest/BundleDataProvider.php
+++ b/app/code/Magento/QuoteBundleOptions/Model/Cart/BuyRequest/BundleDataProvider.php
@@ -68,8 +68,7 @@ private function isProviderApplicable(array $optionData): bool
     private function validateInput(array $optionData): void
     {
         if (count($optionData) !== 4) {
-            $errorMessage = __('Wrong format of the entered option data. ' .
-                'Must be "bundle/option_id/option_value_id/option_quantity"');
+            $errorMessage = __('Wrong format of the entered option data');
             throw new LocalizedException($errorMessage);
         }
     }
diff --git a/app/code/Magento/QuoteConfigurableOptions/Model/Cart/BuyRequest/SuperAttributeDataProvider.php b/app/code/Magento/QuoteConfigurableOptions/Model/Cart/BuyRequest/SuperAttributeDataProvider.php
index 13c822d7233e2..e7d5820be8a59 100644
--- a/app/code/Magento/QuoteConfigurableOptions/Model/Cart/BuyRequest/SuperAttributeDataProvider.php
+++ b/app/code/Magento/QuoteConfigurableOptions/Model/Cart/BuyRequest/SuperAttributeDataProvider.php
@@ -67,7 +67,7 @@ private function validateInput(array $optionData): void
     {
         if (count($optionData) !== 3) {
             throw new LocalizedException(
-                __('Wrong format of the entered option data. Must be "configurable/attribute_id/value_index"')
+                __('Wrong format of the entered option data')
             );
         }
     }
diff --git a/app/code/Magento/QuoteDownloadableLinks/Model/Cart/BuyRequest/DownloadableLinkDataProvider.php b/app/code/Magento/QuoteDownloadableLinks/Model/Cart/BuyRequest/DownloadableLinkDataProvider.php
index 85bb62179eeb2..cf381a19e2ddd 100644
--- a/app/code/Magento/QuoteDownloadableLinks/Model/Cart/BuyRequest/DownloadableLinkDataProvider.php
+++ b/app/code/Magento/QuoteDownloadableLinks/Model/Cart/BuyRequest/DownloadableLinkDataProvider.php
@@ -68,7 +68,7 @@ private function validateInput(array $optionData): void
     {
         if (count($optionData) !== 2) {
             throw new LocalizedException(
-                __('Wrong format of the entered option data. Must be "downloadable/link_id"')
+                __('Wrong format of the entered option data')
             );
         }
     }

From aa5bd2bebb24274f7a7e3dd8fa514a983b4dc1f6 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Wed, 13 May 2020 16:06:56 +0200
Subject: [PATCH 0265/1718] Updated composer.lock

---
 composer.lock | 541 ++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 476 insertions(+), 65 deletions(-)

diff --git a/composer.lock b/composer.lock
index 350a2f9c5a2ed..d4bd427a36d61 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": "087f8432a6f317056b40a0b8a160a2cf",
+    "content-hash": "186bf474b3518bdf285be837602257ca",
     "packages": [
         {
             "name": "braintree/braintree_php",
@@ -253,6 +253,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"
         },
         {
@@ -334,6 +344,16 @@
                 "dependency",
                 "package"
             ],
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-05-06T08:28:10+00:00"
         },
         {
@@ -2309,6 +2329,12 @@
                 "laminas",
                 "mail"
             ],
+            "funding": [
+                {
+                    "url": "https://funding.communitybridge.org/projects/laminas-project",
+                    "type": "community_bridge"
+                }
+            ],
             "time": "2020-04-21T16:42:19+00:00"
         },
         {
@@ -3301,6 +3327,12 @@
                 "laminas",
                 "zf"
             ],
+            "funding": [
+                {
+                    "url": "https://funding.communitybridge.org/projects/laminas-project",
+                    "type": "community_bridge"
+                }
+            ],
             "time": "2020-04-03T16:01:00+00:00"
         },
         {
@@ -3956,6 +3988,20 @@
                 "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"
         },
         {
@@ -4228,23 +4274,23 @@
         },
         {
             "name": "react/promise",
-            "version": "v2.7.1",
+            "version": "v2.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/reactphp/promise.git",
-                "reference": "31ffa96f8d2ed0341a57848cbb84d88b89dd664d"
+                "reference": "f3cff96a19736714524ca0dd1d4130de73dbbbc4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/promise/zipball/31ffa96f8d2ed0341a57848cbb84d88b89dd664d",
-                "reference": "31ffa96f8d2ed0341a57848cbb84d88b89dd664d",
+                "url": "https://api.github.com/repos/reactphp/promise/zipball/f3cff96a19736714524ca0dd1d4130de73dbbbc4",
+                "reference": "f3cff96a19736714524ca0dd1d4130de73dbbbc4",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.8"
+                "phpunit/phpunit": "^7.0 || ^6.5 || ^5.7 || ^4.8.36"
             },
             "type": "library",
             "autoload": {
@@ -4270,7 +4316,7 @@
                 "promise",
                 "promises"
             ],
-            "time": "2019-01-07T21:25:54+00:00"
+            "time": "2020-05-12T15:16:56+00:00"
         },
         {
             "name": "seld/jsonlint",
@@ -4319,6 +4365,16 @@
                 "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"
         },
         {
@@ -4439,6 +4495,20 @@
             ],
             "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-03-30T11:41:10+00:00"
         },
         {
@@ -4492,6 +4562,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-03-27T16:56:45+00:00"
         },
         {
@@ -4562,6 +4646,20 @@
             ],
             "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-03-27T16:54:36+00:00"
         },
         {
@@ -4670,6 +4768,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-04-12T14:40:17+00:00"
         },
         {
@@ -4719,20 +4831,34 @@
             ],
             "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-03-27T16:56:45+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.15.0",
+            "version": "v1.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14"
+                "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/4719fa9c18b0464d399f1a63bf624b42b6fa8d14",
-                "reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
+                "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
                 "shasum": ""
             },
             "require": {
@@ -4744,7 +4870,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.15-dev"
+                    "dev-master": "1.17-dev"
                 }
             },
             "autoload": {
@@ -4777,20 +4903,34 @@
                 "polyfill",
                 "portable"
             ],
-            "time": "2020-02-27T09:26:54+00:00"
+            "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:14:59+00:00"
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.15.0",
+            "version": "v1.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf"
+                "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf",
-                "reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3bff59ea7047e925be6b7f2059d60af31bb46d6a",
+                "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a",
                 "shasum": ""
             },
             "require": {
@@ -4804,7 +4944,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.15-dev"
+                    "dev-master": "1.17-dev"
                 }
             },
             "autoload": {
@@ -4839,20 +4979,34 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-03-09T19:04:49+00:00"
+            "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"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.15.0",
+            "version": "v1.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac"
+                "reference": "fa79b11539418b02fc5e1897267673ba2c19419c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/81ffd3a9c6d707be22e3012b827de1c9775fc5ac",
-                "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fa79b11539418b02fc5e1897267673ba2c19419c",
+                "reference": "fa79b11539418b02fc5e1897267673ba2c19419c",
                 "shasum": ""
             },
             "require": {
@@ -4864,7 +5018,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.15-dev"
+                    "dev-master": "1.17-dev"
                 }
             },
             "autoload": {
@@ -4898,20 +5052,34 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-03-09T19:04:49+00:00"
+            "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"
         },
         {
             "name": "symfony/polyfill-php72",
-            "version": "v1.15.0",
+            "version": "v1.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "37b0976c78b94856543260ce09b460a7bc852747"
+                "reference": "f048e612a3905f34931127360bdd2def19a5e582"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/37b0976c78b94856543260ce09b460a7bc852747",
-                "reference": "37b0976c78b94856543260ce09b460a7bc852747",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/f048e612a3905f34931127360bdd2def19a5e582",
+                "reference": "f048e612a3905f34931127360bdd2def19a5e582",
                 "shasum": ""
             },
             "require": {
@@ -4920,7 +5088,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.15-dev"
+                    "dev-master": "1.17-dev"
                 }
             },
             "autoload": {
@@ -4953,20 +5121,34 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-02-27T09:26:54+00:00"
+            "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"
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.15.0",
+            "version": "v1.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7"
+                "reference": "a760d8964ff79ab9bf057613a5808284ec852ccc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7",
-                "reference": "0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a760d8964ff79ab9bf057613a5808284ec852ccc",
+                "reference": "a760d8964ff79ab9bf057613a5808284ec852ccc",
                 "shasum": ""
             },
             "require": {
@@ -4975,7 +5157,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.15-dev"
+                    "dev-master": "1.17-dev"
                 }
             },
             "autoload": {
@@ -5011,7 +5193,21 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-02-27T09:26:54+00:00"
+            "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"
         },
         {
             "name": "symfony/process",
@@ -5060,6 +5256,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-04-15T15:56:18+00:00"
         },
         {
@@ -5536,16 +5746,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.137.5",
+            "version": "3.137.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "b3309075ec2a2c695c33d8e21c07b3d5c10cdb9a"
+                "reference": "0116efff39048d9bc163d3c287a85cce30b9aa20"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/b3309075ec2a2c695c33d8e21c07b3d5c10cdb9a",
-                "reference": "b3309075ec2a2c695c33d8e21c07b3d5c10cdb9a",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0116efff39048d9bc163d3c287a85cce30b9aa20",
+                "reference": "0116efff39048d9bc163d3c287a85cce30b9aa20",
                 "shasum": ""
             },
             "require": {
@@ -5616,7 +5826,7 @@
                 "s3",
                 "sdk"
             ],
-            "time": "2020-05-07T18:16:43+00:00"
+            "time": "2020-05-12T18:14:22+00:00"
         },
         {
             "name": "behat/gherkin",
@@ -5853,6 +6063,12 @@
                 "functional testing",
                 "unit testing"
             ],
+            "funding": [
+                {
+                    "url": "https://opencollective.com/codeception",
+                    "type": "open_collective"
+                }
+            ],
             "time": "2020-03-23T17:07:20+00:00"
         },
         {
@@ -6701,6 +6917,12 @@
                 }
             ],
             "description": "A tool to automatically fix PHP code style",
+            "funding": [
+                {
+                    "url": "https://github.com/keradus",
+                    "type": "github"
+                }
+            ],
             "time": "2020-04-15T18:51:10+00:00"
         },
         {
@@ -6879,16 +7101,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "1.0.67",
+            "version": "1.0.68",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "5b1f36c75c4bdde981294c2a0ebdb437ee6f275e"
+                "reference": "3e4198372276ec99ac3409a21d7c9d1ced9026e4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/5b1f36c75c4bdde981294c2a0ebdb437ee6f275e",
-                "reference": "5b1f36c75c4bdde981294c2a0ebdb437ee6f275e",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/3e4198372276ec99ac3409a21d7c9d1ced9026e4",
+                "reference": "3e4198372276ec99ac3409a21d7c9d1ced9026e4",
                 "shasum": ""
             },
             "require": {
@@ -6959,7 +7181,13 @@
                 "sftp",
                 "storage"
             ],
-            "time": "2020-04-16T13:21:26+00:00"
+            "funding": [
+                {
+                    "url": "https://offset.earth/frankdejonge",
+                    "type": "other"
+                }
+            ],
+            "time": "2020-05-12T20:33:44+00:00"
         },
         {
             "name": "lusitanian/oauth",
@@ -8060,16 +8288,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "0.12.23",
+            "version": "0.12.25",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "71e529efced79e055fa8318b692e7f7d03ea4e75"
+                "reference": "9619551d68b2d4c0d681a8df73f3c847c798ee64"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/71e529efced79e055fa8318b692e7f7d03ea4e75",
-                "reference": "71e529efced79e055fa8318b692e7f7d03ea4e75",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/9619551d68b2d4c0d681a8df73f3c847c798ee64",
+                "reference": "9619551d68b2d4c0d681a8df73f3c847c798ee64",
                 "shasum": ""
             },
             "require": {
@@ -8098,7 +8326,21 @@
                 "MIT"
             ],
             "description": "PHPStan - PHP Static Analysis Tool",
-            "time": "2020-05-05T12:55:44+00:00"
+            "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-10T20:36:16+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -8212,6 +8454,12 @@
                 "filesystem",
                 "iterator"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-04-18T05:02:12+00:00"
         },
         {
@@ -8360,6 +8608,12 @@
             "keywords": [
                 "timer"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-04-20T06:00:37+00:00"
         },
         {
@@ -8409,6 +8663,12 @@
             "keywords": [
                 "tokenizer"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-05-06T09:56:31+00:00"
         },
         {
@@ -8497,6 +8757,16 @@
                 "testing",
                 "xunit"
             ],
+            "funding": [
+                {
+                    "url": "https://phpunit.de/donate.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-04-30T06:32:53+00:00"
         },
         {
@@ -8637,6 +8907,12 @@
             ],
             "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-04-30T05:58:10+00:00"
         },
         {
@@ -8750,16 +9026,16 @@
         },
         {
             "name": "sebastian/diff",
-            "version": "4.0.0",
+            "version": "4.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "c0c26c9188b538bfa985ae10c9f05d278f12060d"
+                "reference": "3e523c576f29dacecff309f35e4cc5a5c168e78a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/c0c26c9188b538bfa985ae10c9f05d278f12060d",
-                "reference": "c0c26c9188b538bfa985ae10c9f05d278f12060d",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3e523c576f29dacecff309f35e4cc5a5c168e78a",
+                "reference": "3e523c576f29dacecff309f35e4cc5a5c168e78a",
                 "shasum": ""
             },
             "require": {
@@ -8767,7 +9043,7 @@
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.0",
-                "symfony/process": "^4 || ^5"
+                "symfony/process": "^4.2 || ^5"
             },
             "type": "library",
             "extra": {
@@ -8802,7 +9078,13 @@
                 "unidiff",
                 "unified diff"
             ],
-            "time": "2020-02-07T06:09:38+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-05-08T05:01:12+00:00"
         },
         {
             "name": "sebastian/environment",
@@ -8855,6 +9137,12 @@
                 "environment",
                 "hhvm"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-04-14T13:36:52+00:00"
         },
         {
@@ -9467,6 +9755,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-04-15T15:59:10+00:00"
         },
         {
@@ -9540,6 +9842,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-04-28T17:58:55+00:00"
         },
         {
@@ -9595,6 +9911,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-04-18T20:50:06+00:00"
         },
         {
@@ -9657,6 +9987,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-04-17T03:29:44+00:00"
         },
         {
@@ -9711,20 +10055,34 @@
                 "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-04-06T10:40:56+00:00"
         },
         {
             "name": "symfony/polyfill-php70",
-            "version": "v1.15.0",
+            "version": "v1.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php70.git",
-                "reference": "2a18e37a489803559284416df58c71ccebe50bf0"
+                "reference": "82225c2d7d23d7e70515496d249c0152679b468e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/2a18e37a489803559284416df58c71ccebe50bf0",
-                "reference": "2a18e37a489803559284416df58c71ccebe50bf0",
+                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/82225c2d7d23d7e70515496d249c0152679b468e",
+                "reference": "82225c2d7d23d7e70515496d249c0152679b468e",
                 "shasum": ""
             },
             "require": {
@@ -9734,7 +10092,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.15-dev"
+                    "dev-master": "1.17-dev"
                 }
             },
             "autoload": {
@@ -9770,7 +10128,21 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-02-27T09:26:54+00:00"
+            "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"
         },
         {
             "name": "symfony/stopwatch",
@@ -9820,6 +10192,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-03-27T16:56:45+00:00"
         },
         {
@@ -9879,6 +10265,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-04-28T17:58:55+00:00"
         },
         {
@@ -10021,6 +10421,16 @@
                 "env",
                 "environment"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-05-02T13:38:00+00:00"
         },
         {
@@ -10136,5 +10546,6 @@
         "ext-zip": "*",
         "lib-libxml": "*"
     },
-    "platform-dev": []
+    "platform-dev": [],
+    "plugin-api-version": "1.1.0"
 }

From f4744395fa245230386c65d00405dfba665dc868 Mon Sep 17 00:00:00 2001
From: Rudolf Vince <rudolf@mediotype.com>
Date: Wed, 13 May 2020 16:14:53 +0200
Subject: [PATCH 0266/1718] suppress ExcessiveMethodLength notice

---
 .../Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php
index 76ac73d837f77..0c284d1c917b9 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php
@@ -86,7 +86,9 @@ class CartTest extends TestCase
     /** @var  Product|MockObject */
     protected $product;
 
-    // phpcs:ignore Generic.Files.LineLength.TooLong
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
     protected function setUp(): void
     {
         $this->request = $this->getMockBuilder(RequestInterface::class)

From 3140823a34602ada88b0a51d0b58067cbdae6edb Mon Sep 17 00:00:00 2001
From: "m.mezhensky" <m.mezhensky@atwix.com>
Date: Wed, 13 May 2020 17:41:23 +0300
Subject: [PATCH 0267/1718] #257: create new id_v2 option

---
 .../Product/CustomizableOptionValueIdV2.php   | 65 +++++++++++++++
 .../CatalogGraphQl/etc/schema.graphqls        |  8 ++
 .../Attributes/ConfigurableAttributeIdV2.php  | 83 +++++++++++++++++++
 .../etc/schema.graphqls                       |  1 +
 4 files changed, 157 insertions(+)
 create mode 100644 app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableOptionValueIdV2.php
 create mode 100644 app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Attributes/ConfigurableAttributeIdV2.php

diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableOptionValueIdV2.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableOptionValueIdV2.php
new file mode 100644
index 0000000000000..67ca953702716
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableOptionValueIdV2.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Product;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Framework\GraphQl\Query\Resolver\Value;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+/**
+ * @inheritdoc
+ *
+ * Format new option id_v2 in base64 encode for custom options
+ */
+class CustomizableOptionValueIdV2 implements ResolverInterface
+{
+    private const OPTION_TYPE = 'custom-option';
+
+    /**
+     * @inheritdoc
+     *
+     * Create new option id_v2 that encodes details for each option and in most cases can be presented
+     * as base64("<option-type>/<option-id>/<option-value-id>")
+     *
+     * @param Field $field
+     * @param ContextInterface $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     * @return Value|mixed|void
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        $optionDetails = [
+            self::OPTION_TYPE,
+            $value['option_id'],
+            $value['option_type_id']
+        ];
+
+        if (!isset($value['option_id']) || empty($value['option_id'])) {
+            throw new LocalizedException(__('Wrong format option data: option_id should not be empty.'));
+        }
+
+        if (!isset($value['option_type_id']) || empty($value['option_type_id'])) {
+            throw new LocalizedException(__('Wrong format option data: option_type_id should not be empty.'));
+        }
+
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        $content = \implode('/', $optionDetails);
+
+        return base64_encode($content);
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
index f77b301d61e28..51fedcbfb6c49 100644
--- a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
@@ -132,6 +132,7 @@ type CustomizableAreaValue @doc(description: "CustomizableAreaValue defines the
     price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC.")
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     max_characters: Int @doc(description: "The maximum number of characters that can be entered for this customizable option.")
+    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableOptionValueIdV2")
 }
 
 type CategoryTree implements CategoryInterface @doc(description: "Category Tree implementation.") {
@@ -153,6 +154,7 @@ type CustomizableDateValue @doc(description: "CustomizableDateValue defines the
     price: Float @doc(description: "The price assigned to this option.")
     price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC.")
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
+    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableOptionValueIdV2")
 }
 
 type CustomizableDropDownOption implements CustomizableOptionInterface @doc(description: "CustomizableDropDownOption contains information about a drop down menu that is defined as part of a customizable option.") {
@@ -166,6 +168,7 @@ type CustomizableDropDownValue @doc(description: "CustomizableDropDownValue defi
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     title: String @doc(description: "The display name for this option.")
     sort_order: Int @doc(description: "The order in which the option is displayed.")
+    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableOptionValueIdV2")
 }
 
 type CustomizableMultipleOption implements CustomizableOptionInterface @doc(description: "CustomizableMultipleOption contains information about a multiselect that is defined as part of a customizable option.") {
@@ -179,6 +182,7 @@ type CustomizableMultipleValue @doc(description: "CustomizableMultipleValue defi
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     title: String @doc(description: "The display name for this option.")
     sort_order: Int @doc(description: "The order in which the option is displayed.")
+    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableOptionValueIdV2")
 }
 
 type CustomizableFieldOption implements CustomizableOptionInterface @doc(description: "CustomizableFieldOption contains information about a text field that is defined as part of a customizable option.") {
@@ -191,6 +195,7 @@ type CustomizableFieldValue @doc(description: "CustomizableFieldValue defines th
     price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC.")
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     max_characters: Int @doc(description: "The maximum number of characters that can be entered for this customizable option.")
+    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableOptionValueIdV2")
 }
 
 type CustomizableFileOption implements CustomizableOptionInterface @doc(description: "CustomizableFileOption contains information about a file picker that is defined as part of a customizable option.") {
@@ -205,6 +210,7 @@ type CustomizableFileValue @doc(description: "CustomizableFileValue defines the
     file_extension: String @doc(description: "The file extension to accept.")
     image_size_x: Int @doc(description: "The maximum width of an image.")
     image_size_y: Int @doc(description: "The maximum height of an image.")
+    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableOptionValueIdV2")
 }
 
 interface MediaGalleryInterface @doc(description: "Contains basic information about a product image or video.") @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\MediaGalleryTypeResolver") {
@@ -274,6 +280,7 @@ type CustomizableRadioValue @doc(description: "CustomizableRadioValue defines th
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     title: String @doc(description: "The display name for this option.")
     sort_order: Int @doc(description: "The order in which the radio button is displayed.")
+    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableOptionValueIdV2")
 }
 
 type CustomizableCheckboxOption implements CustomizableOptionInterface @doc(description: "CustomizableCheckbbixOption contains information about a set of checkbox values that are defined as part of a customizable option.") {
@@ -287,6 +294,7 @@ type CustomizableCheckboxValue @doc(description: "CustomizableCheckboxValue defi
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     title: String @doc(description: "The display name for this option.")
     sort_order: Int @doc(description: "The order in which the checkbox value is displayed.")
+    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableOptionValueIdV2")
 }
 
 type VirtualProduct implements ProductInterface, CustomizableProductInterface @doc(description: "A virtual product is non-tangible product that does not require shipping and is not kept in inventory.") {
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Attributes/ConfigurableAttributeIdV2.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Attributes/ConfigurableAttributeIdV2.php
new file mode 100644
index 0000000000000..75cd1ade5b548
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Attributes/ConfigurableAttributeIdV2.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProductGraphQl\Model\Resolver\Variant\Attributes;
+
+use Magento\Eav\Model\ResourceModel\Entity\Attribute;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Framework\GraphQl\Query\Resolver\Value;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+/**
+ * @inheritdoc
+ *
+ * Format new option id_v2 in base64 encode for super attribute options
+ */
+class ConfigurableAttributeIdV2 implements ResolverInterface
+{
+    private const OPTION_TYPE = 'configurable';
+
+    /**
+     * @var Attribute
+     */
+    private $eavAttribute;
+
+    /**
+     * ConfigurableAttributeIdV2 constructor.
+     *
+     * @param Attribute $eavAttribute
+     */
+    public function __construct(Attribute $eavAttribute)
+    {
+        $this->eavAttribute = $eavAttribute;
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * Create new option id_v2 that encodes details for each option and in most cases can be presented
+     * as base64("<option-type>/<attribute-id>/<value-index>")
+     *
+     * @param Field $field
+     * @param ContextInterface $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     * @return Value|mixed|string
+     * @throws LocalizedException
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        $attribute_id = $this->eavAttribute->getIdByCode('catalog_product', $value['code']);
+        $optionDetails = [
+            self::OPTION_TYPE,
+            $attribute_id,
+            $value['value_index']
+        ];
+
+        if (empty($attribute_id)) {
+            throw new LocalizedException(__('Wrong format option data: attribute_id should not be empty.'));
+        }
+
+        if (!isset($value['value_index']) || empty($value['value_index'])) {
+            throw new LocalizedException(__('Wrong format option data: value_index should not be empty.'));
+        }
+
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        $content = \implode('/', $optionDetails);
+
+        return base64_encode($content);
+    }
+}
diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
index 5053ed848b4e5..537987d6153bc 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
@@ -18,6 +18,7 @@ type ConfigurableAttributeOption @doc(description: "ConfigurableAttributeOption
     label: String @doc(description: "A string that describes the configurable attribute option")
     code: String @doc(description: "The ID assigned to the attribute")
     value_index: Int @doc(description: "A unique index number assigned to the configurable product option")
+    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\ConfigurableProductGraphQl\\Model\\Resolver\\Variant\\Attributes\\ConfigurableAttributeIdV2")
 }
 
 type ConfigurableProductOptions @doc(description: "ConfigurableProductOptions defines configurable attributes for the specified product") {

From 3be360f76239c0f9295f6794a1d8d6cdbb13b340 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Wed, 13 May 2020 17:50:59 +0300
Subject: [PATCH 0268/1718] MC-29420: Remove event handlers from CE

---
 .../frontend/templates/product/layered/renderer.phtml     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
index d8353553dcd81..2f113230e28cf 100644
--- a/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
+++ b/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
@@ -53,8 +53,8 @@
                                  data-option-tooltip-value="">
                             </div>
                             <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-                                "background: url(" . /*  @noEscape */ $escapedUrl .
-                                ") no-repeat center; background-size: initial;",
+                                'background: url(' . /*  @noEscape */ $escapedUrl .
+                                ') no-repeat center; background-size: initial;',
                                 'div[data-option-id="' . $block->escapeHtmlAttr($option) . '"]'
                             ) ?>
                             <?php break;
@@ -71,9 +71,9 @@
                                  ) ?>">
                             </div>
                             <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-                                "background: " . $block->escapeHtmlAttr(
+                                'background: ' . $block->escapeHtml(
                                     $swatchData['swatches'][$option]['value']
-                                ) . " no-repeat center; background-size: initial;",
+                                ) . ' no-repeat center; background-size: initial;',
                                 'div[data-option-id="' . $block->escapeHtmlAttr($option) . '"]'
                             ) ?>
                             <?php break;

From 52a3eb1e6b8ec9388df841068ed0602cfc8e26bf Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Wed, 13 May 2020 20:21:45 +0300
Subject: [PATCH 0269/1718] MC-34231: 2.4.0-develop-pr33 PR stabilization

---
 .../testsuite/Magento/Customer/Model/AttributeTest.php     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/AttributeTest.php
index dde20a8049437..fdf92a5b3137c 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/AttributeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/AttributeTest.php
@@ -41,7 +41,7 @@ class AttributeTest extends \PHPUnit\Framework\TestCase
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->objectManager = Bootstrap::getObjectManager();
         $this->model = $this->objectManager->get(Attribute::class);
@@ -69,13 +69,12 @@ public function testCRUD(): void
     /**
      * @magentoDataFixture Magento/Customer/_files/attribute_user_defined_customer.php
      *
-     * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @expectedExceptionMessage Do not change entity type.
-     *
      * @return void
      */
     public function testAttributeSaveWithChangedEntityType(): void
     {
+        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectExceptionMessage('Do not change entity type.');
         $attribute = $this->attributeRepository->get($this->customerEntityType, 'user_attribute');
         $attribute->setEntityTypeId(5);
         $attribute->save();

From 45026811aeb4cf6dcdc47b6958f7c2345c5710ba Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Wed, 13 May 2020 20:34:22 +0300
Subject: [PATCH 0270/1718] MC-34231: 2.4.0-develop-pr33 PR stabilization

---
 .../Magento/Customer/Model/Metadata/Form/ImageTest.php     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/Metadata/Form/ImageTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/Metadata/Form/ImageTest.php
index 5d00feec17407..ef05e60bad251 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/Metadata/Form/ImageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/Metadata/Form/ImageTest.php
@@ -55,7 +55,7 @@ class ImageTest extends \PHPUnit\Framework\TestCase
     /**
      * @inheritDoc
      */
-    public function setUp()
+    public function setUp() : void
     {
         $this->objectManager = Bootstrap::getObjectManager();
         $this->filesystem = $this->objectManager->get(Filesystem::class);
@@ -157,12 +157,12 @@ public function testProcessCustomerValue()
      * Test for processCustomerValue method with invalid value
      *
      * @magentoAppIsolation enabled
-     * @expectedException \Magento\Framework\Exception\ValidatorException
      * @throws FileSystemException
      * @throws \ReflectionException
      */
     public function testProcessCustomerInvalidValue()
     {
+        $this->expectException(\Magento\Framework\Exception\ValidatorException::class);
         $this->mediaDirectory->delete('customer');
         $this->mediaDirectory->create($this->mediaDirectory->getRelativePath('customer/tmp/'));
         $tmpFilePath = $this->mediaDirectory->getAbsolutePath('customer/tmp/' . $this->fileName);
@@ -197,9 +197,10 @@ public function testProcessCustomerInvalidValue()
 
     /**
      * @inheritdoc
+     *
      * @throws FileSystemException
      */
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass() : void
     {
         parent::tearDownAfterClass();
         $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(

From 64247aa68aa99e3327de81ec0efe5a335151cd92 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Wed, 13 May 2020 14:23:38 -0500
Subject: [PATCH 0271/1718] MC-33823: Merge CE, EE and B2B changes

---
 nginx.conf.sample | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nginx.conf.sample b/nginx.conf.sample
index 9219400f6aacd..ca24015481387 100644
--- a/nginx.conf.sample
+++ b/nginx.conf.sample
@@ -3,13 +3,13 @@
 #    # use tcp connection
 #    # server  127.0.0.1:9000;
 #    # or socket
-#    server   unix:/var/run/php/php7.0-fpm.sock;
+#    server   unix:/var/run/php/php7.4-fpm.sock;
 # }
 # server {
 #    listen 80;
 #    server_name mage.dev;
 #    set $MAGE_ROOT /var/www/magento2;
-#    set $MAGE_DEBUG_SHOW_ARGS 1;
+#    set $MAGE_DEBUG_SHOW_ARGS 0;
 #    include /vagrant/magento2/nginx.conf.sample;
 # }
 #
@@ -177,6 +177,7 @@ location ~ ^/(index|get|static|errors/report|errors/404|errors/503|health_check)
     try_files $uri =404;
     fastcgi_pass   fastcgi_backend;
     fastcgi_buffers 1024 4k;
+    fastcgi_buffer_size 32k;
 
     fastcgi_param  PHP_FLAG  "session.auto_start=off \n suhosin.session.cryptua=off";
     fastcgi_param  PHP_VALUE "memory_limit=756M \n max_execution_time=18000";

From 3d41baed777550632d7e0fcce7d659a43ce02b74 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Wed, 13 May 2020 19:44:16 -0500
Subject: [PATCH 0272/1718] MC-33823: Merge CE, EE and B2B changes

---
 .../view/adminhtml/templates/widget/grid/extended.phtml   | 2 +-
 .../Adminhtml/Catalog/Product/Edit/Tab/Attributes.php     | 4 +---
 .../Mftf/Section/StorefrontProductInfoMainSection.xml     | 4 ++--
 .../System/Config/Form/Field/Select/AllowspecificTest.php | 2 +-
 app/code/Magento/Csp/Model/BlockCache.php                 | 1 +
 app/code/Magento/Email/composer.json                      | 3 ++-
 .../Adminhtml/Widget/Grid/Column/Renderer/ButtonTest.php  | 1 +
 app/code/Magento/Integration/composer.json                | 3 ++-
 app/code/Magento/Newsletter/composer.json                 | 3 ++-
 .../Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php   | 2 +-
 app/code/Magento/Payment/composer.json                    | 3 ++-
 .../Block/Adminhtml/System/Config/Field/CountryTest.php   | 2 +-
 app/code/Magento/Tax/composer.json                        | 3 ++-
 app/code/Magento/TaxImportExport/composer.json            | 3 ++-
 app/code/Magento/User/composer.json                       | 3 ++-
 app/code/Magento/Widget/composer.json                     | 3 ++-
 .../testsuite/Magento/Csp/CspAwareActionTest.php          | 2 +-
 dev/tests/integration/testsuite/Magento/Csp/CspTest.php   | 4 ----
 .../integration/testsuite/Magento/Csp/CspUtilTest.php     | 8 ++++----
 19 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
index 1a4f038c2abf3..9cf4e18b8af1f 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
@@ -116,7 +116,7 @@ $numColumns = count($block->getColumns());
                                 'onclick',
                                 /* @noEscape */ $block->getJsObjectName() . '.setPage(\'' .
                                 /* @noEscape */ ($_curPage - 1) . '\');event.preventDefault();',
-                                '. admin__data-grid-pager button.action-previous'
+                                '.admin__data-grid-pager button.action-previous'
                             ) ?>
                         <?php else: ?>
                             <button type="button" class="action-previous disabled">
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php
index f2f62c0914b4a..cc28fab403fa4 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php
@@ -127,9 +127,7 @@ function changeTaxClassId() {
                 });
                 ";
 
-            $tax->setAfterElementHtml(
-                /* @noEscape */ $this->secureRenderer->renderTag('script', [], $scriptString, false)
-            );
+            $tax->setAfterElementHtml($this->secureRenderer->renderTag('script', [], $scriptString, false));
         }
 
         $weight = $this->getForm()->getElement('weight');
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
index 29a1b72947c06..3f3d9faf3f17d 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -9,7 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontProductInfoMainSection">
-        <element name="AddToCart" type="button" selector="#product-addtocart-button"/>
-        <element name="updateCart" type="button" selector="#product-updatecart-button" timeout="30"/>
+        <element name="AddToCart" type="button" selector="button#product-addtocart-button"/>
+        <element name="updateCart" type="button" selector="button#product-updatecart-button" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php
index b70876000aa3d..129dfc902963f 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php
@@ -92,7 +92,7 @@ public function testGetAfterElementHtml()
 
         $this->assertStringEndsWith('</script>' . $afterHtmlCode, $actual);
         $this->assertStringStartsWith('<script >', trim($actual));
-        $this->assertContains('test_prefix_spec_element_test_suffix', $actual);
+        $this->assertStringContainsString('test_prefix_spec_element_test_suffix', $actual);
     }
 
     /**
diff --git a/app/code/Magento/Csp/Model/BlockCache.php b/app/code/Magento/Csp/Model/BlockCache.php
index 59cb62584f6bc..f0469c3251379 100644
--- a/app/code/Magento/Csp/Model/BlockCache.php
+++ b/app/code/Magento/Csp/Model/BlockCache.php
@@ -70,6 +70,7 @@ public function load($identifier)
             }
         } catch (\Throwable $exception) {
             //Most likely block HTML was cached without policy data.
+            $data = null;
         }
         if ($data) {
             foreach ($data['policies'] as $policyData) {
diff --git a/app/code/Magento/Email/composer.json b/app/code/Magento/Email/composer.json
index a85c6177c8a48..334bbcf9d4617 100644
--- a/app/code/Magento/Email/composer.json
+++ b/app/code/Magento/Email/composer.json
@@ -14,7 +14,8 @@
         "magento/module-theme": "*",
         "magento/module-require-js": "*",
         "magento/module-media-storage": "*",
-        "magento/module-variable": "*"
+        "magento/module-variable": "*",
+        "magento/module-ui": "*"
     },
     "suggest": {
         "magento/module-theme": "*"
diff --git a/app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Widget/Grid/Column/Renderer/ButtonTest.php b/app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Widget/Grid/Column/Renderer/ButtonTest.php
index 06bb0ee33e02e..3813682eed004 100644
--- a/app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Widget/Grid/Column/Renderer/ButtonTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Block/Adminhtml/Widget/Grid/Column/Renderer/ButtonTest.php
@@ -44,6 +44,7 @@ protected function setUp(): void
     {
         $this->escaperMock = $this->createMock(Escaper::class);
         $this->escaperMock->expects($this->any())->method('escapeHtml')->willReturnArgument(0);
+        $this->escaperMock->expects($this->any())->method('escapeHtmlAttr')->willReturnArgument(0);
         $this->contextMock = $this->createPartialMock(Context::class, ['getEscaper']);
         $this->contextMock->expects($this->any())->method('getEscaper')->willReturn($this->escaperMock);
         $randomMock = $this->createMock(Random::class);
diff --git a/app/code/Magento/Integration/composer.json b/app/code/Magento/Integration/composer.json
index 0b9752c743213..c85e84284b43f 100644
--- a/app/code/Magento/Integration/composer.json
+++ b/app/code/Magento/Integration/composer.json
@@ -12,7 +12,8 @@
         "magento/module-customer": "*",
         "magento/module-security": "*",
         "magento/module-store": "*",
-        "magento/module-user": "*"
+        "magento/module-user": "*",
+        "magento/module-ui": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/Newsletter/composer.json b/app/code/Magento/Newsletter/composer.json
index cc0d717a1958d..790370c328644 100644
--- a/app/code/Magento/Newsletter/composer.json
+++ b/app/code/Magento/Newsletter/composer.json
@@ -14,7 +14,8 @@
         "magento/module-email": "*",
         "magento/module-require-js": "*",
         "magento/module-store": "*",
-        "magento/module-widget": "*"
+        "magento/module-widget": "*",
+        "magento/module-ui": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php b/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php
index 096b54f0a7425..062e428ef68b1 100644
--- a/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php
+++ b/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php
@@ -91,7 +91,7 @@ public function testGetElementHtml()
             '<input id="time_condition" type="hidden" name="test_name" value="',
             $testString
         );
-        $this->assertStringEndsWith(
+        $this->assertStringContainsString(
             '<input id="test_name_prefixtest_html_idtest_name_suffix" ' .
             'name="test_name"  data-ui-id="form-element-test_name" value="" type="file"',
             $testString
diff --git a/app/code/Magento/Payment/composer.json b/app/code/Magento/Payment/composer.json
index 6ee0baec247f3..72246c5698f80 100644
--- a/app/code/Magento/Payment/composer.json
+++ b/app/code/Magento/Payment/composer.json
@@ -12,7 +12,8 @@
         "magento/module-directory": "*",
         "magento/module-quote": "*",
         "magento/module-sales": "*",
-        "magento/module-store": "*"
+        "magento/module-store": "*",
+        "magento/module-ui": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/CountryTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/CountryTest.php
index 4fe4c26bb38d9..e8c46080e862e 100644
--- a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/CountryTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/CountryTest.php
@@ -130,7 +130,7 @@ public function testRender($requestCountry, $requestDefaultCountry, $canUseDefau
         }
         $this->_jsHelper->expects($this->once())
             ->method('getScript')
-            ->with(new LogicalAnd($constraints));
+            ->with(self::logicalAnd($constraints));
         $this->_url->expects($this->once())
             ->method('getUrl')
             ->with(
diff --git a/app/code/Magento/Tax/composer.json b/app/code/Magento/Tax/composer.json
index 65c668553cd14..2fe0597c85a63 100644
--- a/app/code/Magento/Tax/composer.json
+++ b/app/code/Magento/Tax/composer.json
@@ -19,7 +19,8 @@
         "magento/module-reports": "*",
         "magento/module-sales": "*",
         "magento/module-shipping": "*",
-        "magento/module-store": "*"
+        "magento/module-store": "*",
+        "magento/module-ui": "*"
     },
     "suggest": {
         "magento/module-tax-sample-data": "*"
diff --git a/app/code/Magento/TaxImportExport/composer.json b/app/code/Magento/TaxImportExport/composer.json
index ee24deb9d3246..01c069b4299c1 100644
--- a/app/code/Magento/TaxImportExport/composer.json
+++ b/app/code/Magento/TaxImportExport/composer.json
@@ -10,7 +10,8 @@
         "magento/module-backend": "*",
         "magento/module-directory": "*",
         "magento/module-store": "*",
-        "magento/module-tax": "*"
+        "magento/module-tax": "*",
+        "magento/module-ui": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/User/composer.json b/app/code/Magento/User/composer.json
index 8ac1677bdfe81..6ba4be749cc7c 100644
--- a/app/code/Magento/User/composer.json
+++ b/app/code/Magento/User/composer.json
@@ -12,7 +12,8 @@
         "magento/module-email": "*",
         "magento/module-integration": "*",
         "magento/module-security": "*",
-        "magento/module-store": "*"
+        "magento/module-store": "*",
+        "magento/module-ui": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/Widget/composer.json b/app/code/Magento/Widget/composer.json
index 3f0f7fb212d4a..2cf8429095ce7 100644
--- a/app/code/Magento/Widget/composer.json
+++ b/app/code/Magento/Widget/composer.json
@@ -12,7 +12,8 @@
         "magento/module-cms": "*",
         "magento/module-store": "*",
         "magento/module-theme": "*",
-        "magento/module-variable": "*"
+        "magento/module-variable": "*",
+        "magento/module-ui": "*"
     },
     "suggest": {
         "magento/module-widget-sample-data": "*"
diff --git a/dev/tests/integration/testsuite/Magento/Csp/CspAwareActionTest.php b/dev/tests/integration/testsuite/Magento/Csp/CspAwareActionTest.php
index 7e1e2c236eed9..883851c77a46f 100644
--- a/dev/tests/integration/testsuite/Magento/Csp/CspAwareActionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Csp/CspAwareActionTest.php
@@ -34,7 +34,7 @@ public function testAwareAction(): void
         $header = $this->getResponse()->getHeader('Content-Security-Policy');
         $this->assertNotEmpty($header);
 
-        $this->assertContains(
+        $this->assertStringContainsString(
             'script-src https://controller.magento.com'
                 .' \'self\' \'sha256-H4RRnauTM2X2Xg/z9zkno1crqhsaY3uKKu97uwmnXXE=\'',
             $header->getFieldValue()
diff --git a/dev/tests/integration/testsuite/Magento/Csp/CspTest.php b/dev/tests/integration/testsuite/Magento/Csp/CspTest.php
index eeb96d8943ced..8905c953a00e3 100644
--- a/dev/tests/integration/testsuite/Magento/Csp/CspTest.php
+++ b/dev/tests/integration/testsuite/Magento/Csp/CspTest.php
@@ -23,10 +23,6 @@ class CspTest extends AbstractController
      */
     private function searchInResponse($response, string $search): bool
     {
-        if (mb_stripos(mb_strtolower($response->getBody()), mb_strtolower($search)) !== false) {
-            return true;
-        }
-
         foreach ($response->getHeaders() as $header) {
             if (mb_stripos(mb_strtolower($header->toString()), mb_strtolower($search)) !== false) {
                 return true;
diff --git a/dev/tests/integration/testsuite/Magento/Csp/CspUtilTest.php b/dev/tests/integration/testsuite/Magento/Csp/CspUtilTest.php
index 6af97bf83b4d0..93d019f572e63 100644
--- a/dev/tests/integration/testsuite/Magento/Csp/CspUtilTest.php
+++ b/dev/tests/integration/testsuite/Magento/Csp/CspUtilTest.php
@@ -29,14 +29,14 @@ public function testPhtmlHelper(): void
         $this->dispatch('csputil/csp/helper');
         $content = $this->getResponse()->getContent();
 
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<script src="http&#x3A;&#x2F;&#x2F;my.magento.com&#x2F;static&#x2F;script.js"/>',
             $content
         );
-        $this->assertContains("<script>\n    let myVar = 1;\n</script>", $content);
+        $this->assertStringContainsString("<script>\n    let myVar = 1;\n</script>", $content);
         $header = $this->getResponse()->getHeader('Content-Security-Policy');
         $this->assertNotEmpty($header);
-        $this->assertContains('http://my.magento.com', $header->getFieldValue());
-        $this->assertContains('\'sha256-H4RRnauTM2X2Xg/z9zkno1crqhsaY3uKKu97uwmnXXE=\'', $header->getFieldValue());
+        $this->assertStringContainsString('http://my.magento.com', $header->getFieldValue());
+        $this->assertStringContainsString('\'sha256-H4RRnauTM2X2Xg/z9zkno1crqhsaY3uKKu97uwmnXXE=\'', $header->getFieldValue());
     }
 }

From 3e149f6c2f8956ca69a2e5748c0afc7c650de359 Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Thu, 14 May 2020 12:51:38 +0300
Subject: [PATCH 0273/1718] MC-33922: Improve email templates

---
 .../VariableResolver/LegacyResolver.php       | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Filter/VariableResolver/LegacyResolver.php b/lib/internal/Magento/Framework/Filter/VariableResolver/LegacyResolver.php
index a46dc64ed0b5b..25bff73dacec2 100644
--- a/lib/internal/Magento/Framework/Filter/VariableResolver/LegacyResolver.php
+++ b/lib/internal/Magento/Framework/Filter/VariableResolver/LegacyResolver.php
@@ -160,12 +160,32 @@ private function handleObjectMethod(Template $filter, array $templateVariables,
     {
         $object = $stackArgs[$i - 1]['variable'];
         $method = $stackArgs[$i]['name'];
-        if (method_exists($object, $method) && substr($method, 0, 3) !== 'set') {
+        if ($this->isMethodCallable($object, $method)) {
             $args = $this->getStackArgs($stackArgs[$i]['args'], $filter, $templateVariables);
             $stackArgs[$i]['variable'] = call_user_func_array([$object, $method], $args);
         }
     }
 
+    /**
+     * Check if object method can be called.
+     *
+     * @param mixed $object
+     * @param string $method
+     * @return bool
+     */
+    private function isMethodCallable($object, string $method): bool
+    {
+        if (
+            method_exists($object, $method)
+            && substr($method, 0, 3) !== 'set'
+            && $method !== '___callParent'
+        ) {
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Return if the given index should be processed for data access
      *

From 51e2fbc741d8f6892432f8e9b83eec2c1737874b Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Sat, 9 May 2020 09:19:48 +0300
Subject: [PATCH 0274/1718] Small refactoring to re-implement the customer
 reviews

---
 .../AddRatingVotesToCustomerReviews.php       | 55 -------------------
 .../Service/GetReviewAverageRatingService.php | 32 -----------
 .../ReviewGraphQl/Mapper/ReviewDataMapper.php |  7 ++-
 .../CustomerReviewsDataProvider.php           | 37 ++++++-------
 .../ReviewRatingsDataProvider.php             | 27 ++++++++-
 .../Resolver/Product/Review/AverageRating.php | 30 ++++++----
 .../Product/Review/RatingBreakdown.php        | 12 ++--
 7 files changed, 69 insertions(+), 131 deletions(-)
 delete mode 100644 app/code/Magento/Review/Model/Review/AddRatingVotesToCustomerReviews.php
 delete mode 100644 app/code/Magento/Review/Service/GetReviewAverageRatingService.php

diff --git a/app/code/Magento/Review/Model/Review/AddRatingVotesToCustomerReviews.php b/app/code/Magento/Review/Model/Review/AddRatingVotesToCustomerReviews.php
deleted file mode 100644
index c50790405a880..0000000000000
--- a/app/code/Magento/Review/Model/Review/AddRatingVotesToCustomerReviews.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Review\Model\Review;
-
-use Magento\Review\Model\ResourceModel\Rating\Option\Vote\Collection as OptionVoteCollection;
-use Magento\Review\Model\ResourceModel\Rating\Option\Vote\CollectionFactory as OptionVoteCollectionFactory;
-use Magento\Review\Model\ResourceModel\Review\Product\Collection;
-
-/**
- * The model that adds the rating votes to reviews
- */
-class AddRatingVotesToCustomerReviews
-{
-    /**
-     * @var RatingOptionCollectionFactory
-     */
-    private $ratingOptionCollectionFactory;
-
-    /**
-     * @param OptionVoteCollectionFactory $ratingOptionCollectionFactory
-     */
-    public function __construct(OptionVoteCollectionFactory $ratingOptionCollectionFactory)
-    {
-        $this->ratingOptionCollectionFactory = $ratingOptionCollectionFactory;
-    }
-
-    /**
-     * Add rating votes to customer reviews
-     *
-     * @param Collection $collection
-     */
-    public function execute(Collection $collection): void
-    {
-        $connection = $collection->getConnection();
-
-        foreach ($collection->getItems() as &$item) {
-            /** @var OptionVoteCollection $votesCollection */
-            $votesCollection = $this->ratingOptionCollectionFactory->create();
-
-            $votesCollection->addFieldToFilter('main_table.review_id', $item->getData('review_id'));
-            $votesCollection->getSelect()
-                ->join(
-                    ['rating' => $connection->getTableName('rating')],
-                    'rating.rating_id = main_table.rating_id',
-                    ['rating_code']
-                );
-            $item->setRatingVotes($votesCollection);
-        }
-    }
-}
diff --git a/app/code/Magento/Review/Service/GetReviewAverageRatingService.php b/app/code/Magento/Review/Service/GetReviewAverageRatingService.php
deleted file mode 100644
index 92175b717bcc8..0000000000000
--- a/app/code/Magento/Review/Service/GetReviewAverageRatingService.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Review\Service;
-
-/**
- * Get review average rating
- */
-class GetReviewAverageRatingService
-{
-    /**
-     * Get average rating per review
-     *
-     * @param array $ratingVotes
-     *
-     * @return float
-     */
-    public function execute(array $ratingVotes): float
-    {
-        $averageRating = 0;
-
-        foreach ($ratingVotes as $ratingVote) {
-            $averageRating += (int) $ratingVote->getData('value');
-        }
-
-        return $averageRating > 0 ? (float) number_format($averageRating / count($ratingVotes), 2) : 0;
-    }
-}
diff --git a/app/code/Magento/ReviewGraphQl/Mapper/ReviewDataMapper.php b/app/code/Magento/ReviewGraphQl/Mapper/ReviewDataMapper.php
index 324775f61fa66..e5a05712e3018 100644
--- a/app/code/Magento/ReviewGraphQl/Mapper/ReviewDataMapper.php
+++ b/app/code/Magento/ReviewGraphQl/Mapper/ReviewDataMapper.php
@@ -18,11 +18,11 @@ class ReviewDataMapper
     /**
      * Mapping the review data
      *
-     * @param Review|Product $review
+     * @param Review $review
      *
      * @return array
      */
-    public function map($review): array
+    public function map(Review $review): array
     {
         return [
             'summary' => $review->getData('title'),
@@ -30,7 +30,8 @@ public function map($review): array
             'nickname' => $review->getData('nickname'),
             'created_at' => $review->getData('created_at'),
             'rating_votes' => $review->getData('rating_votes'),
-            'sku' => $review->getSku()
+            'sku' => $review->getSku(),
+            'model' => $review
         ];
     }
 }
diff --git a/app/code/Magento/ReviewGraphQl/Model/DataProvider/CustomerReviewsDataProvider.php b/app/code/Magento/ReviewGraphQl/Model/DataProvider/CustomerReviewsDataProvider.php
index 643ab5954641b..f8dc5b1faead4 100644
--- a/app/code/Magento/ReviewGraphQl/Model/DataProvider/CustomerReviewsDataProvider.php
+++ b/app/code/Magento/ReviewGraphQl/Model/DataProvider/CustomerReviewsDataProvider.php
@@ -7,35 +7,26 @@
 
 namespace Magento\ReviewGraphQl\Model\DataProvider;
 
-use Magento\Review\Model\ResourceModel\Review\Product\Collection as ProductReviewsCollection;
-use Magento\Review\Model\ResourceModel\Review\Product\CollectionFactory;
-use Magento\Review\Model\Review\AddRatingVotesToCustomerReviews;
-
+use Magento\Review\Model\ResourceModel\Review\Collection as ReviewsCollection;
+use Magento\Review\Model\ResourceModel\Review\CollectionFactory as ReviewsCollectionFactory;
+use Magento\Review\Model\Review;
 /**
  * Provides customer reviews
  */
 class CustomerReviewsDataProvider
 {
     /**
-     * @var CollectionFactory
+     * @var ReviewsCollectionFactory
      */
     private $collectionFactory;
 
     /**
-     * @var AddRatingVotesToCustomerReviews
-     */
-    private $addRatingVotesToCustomerReviews;
-
-    /**
-     * @param CollectionFactory $collectionFactory
-     * @param AddRatingVotesToCustomerReviews $addRatingVotesToCustomerReviews
+     * @param ReviewsCollectionFactory $collectionFactory
      */
     public function __construct(
-        CollectionFactory $collectionFactory,
-        AddRatingVotesToCustomerReviews $addRatingVotesToCustomerReviews
+        ReviewsCollectionFactory $collectionFactory
     ) {
         $this->collectionFactory = $collectionFactory;
-        $this->addRatingVotesToCustomerReviews = $addRatingVotesToCustomerReviews;
     }
 
     /**
@@ -45,17 +36,23 @@ public function __construct(
      * @param int $currentPage
      * @param int $pageSize
      *
-     * @return ProductReviewsCollection
+     * @return ReviewsCollection
      */
-    public function getData(int $customerId, int $currentPage, int $pageSize): ProductReviewsCollection
+    public function getData(int $customerId, int $currentPage, int $pageSize): ReviewsCollection
     {
-        /** @var ProductReviewsCollection $reviewsCollection */
+        /** @var ReviewsCollection $reviewsCollection */
         $reviewsCollection = $this->collectionFactory->create();
-        $reviewsCollection->addCustomerFilter($customerId)
+        $reviewsCollection->addStatusFilter(Review::STATUS_APPROVED)
+            ->addCustomerFilter($customerId)
             ->setPageSize($pageSize)
             ->setCurPage($currentPage)
             ->setDateOrder();
-        $this->addRatingVotesToCustomerReviews->execute($reviewsCollection);
+        $reviewsCollection->getSelect()->join(
+            ['cpe' => $reviewsCollection->getTable('catalog_product_entity')],
+            'cpe.entity_id = main_table.entity_pk_value',
+            ['sku']
+        );
+        $reviewsCollection->addRateVotes();
 
         return $reviewsCollection;
     }
diff --git a/app/code/Magento/ReviewGraphQl/Model/DataProvider/ReviewRatingsDataProvider.php b/app/code/Magento/ReviewGraphQl/Model/DataProvider/ReviewRatingsDataProvider.php
index a327f51c3e696..82e0f73b1c774 100644
--- a/app/code/Magento/ReviewGraphQl/Model/DataProvider/ReviewRatingsDataProvider.php
+++ b/app/code/Magento/ReviewGraphQl/Model/DataProvider/ReviewRatingsDataProvider.php
@@ -7,23 +7,44 @@
 
 namespace Magento\ReviewGraphQl\Model\DataProvider;
 
+use Magento\Review\Model\ResourceModel\Rating\Option\Vote\Collection as VoteCollection;
+use Magento\Review\Model\ResourceModel\Rating\Option\Vote\CollectionFactory as VoteCollectionFactory;
+
 /**
  * Provides rating votes
  */
 class ReviewRatingsDataProvider
 {
+    /**
+     * @var VoteCollectionFactory
+     */
+    private $voteCollectionFactory;
+
+    /**
+     * @param VoteCollectionFactory $voteCollectionFactory
+     */
+    public function __construct(VoteCollectionFactory $voteCollectionFactory)
+    {
+        $this->voteCollectionFactory = $voteCollectionFactory;
+    }
+
     /**
      * Providing rating votes
      *
-     * @param array $ratingVotes
+     * @param int $reviewId
      *
      * @return array
      */
-    public function getData(array $ratingVotes): array
+    public function getData(int $reviewId): array
     {
+        /** @var VoteCollection $ratingVotes */
+        $ratingVotes = $this->voteCollectionFactory->create();
+        $ratingVotes->setReviewFilter($reviewId);
+        $ratingVotes->addRatingInfo();
+
         $data = [];
 
-        foreach ($ratingVotes as $ratingVote) {
+        foreach ($ratingVotes->getItems() as $ratingVote) {
             $data[] = [
                 'name' => $ratingVote->getData('rating_code'),
                 'value' => $ratingVote->getData('value')
diff --git a/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/Review/AverageRating.php b/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/Review/AverageRating.php
index eb84856ba47d6..b33ea592425af 100644
--- a/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/Review/AverageRating.php
+++ b/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/Review/AverageRating.php
@@ -13,8 +13,8 @@
 use Magento\Framework\GraphQl\Query\Resolver\Value;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Review\Model\ResourceModel\Rating\Option\Vote\Collection as VoteCollection;
-use Magento\Review\Service\GetReviewAverageRatingService;
+use Magento\Review\Model\RatingFactory;
+use Magento\Review\Model\Review;
 
 /**
  * Review average rating resolver
@@ -22,17 +22,17 @@
 class AverageRating implements ResolverInterface
 {
     /**
-     * @var GetReviewAverageRatingService
+     * @var RatingFactory
      */
-    private $getReviewAverageRatingService;
+    private $ratingFactory;
 
     /**
-     * @param GetReviewAverageRatingService $getReviewAverageRatingService
+     * @param RatingFactory $ratingFactory
      */
     public function __construct(
-        GetReviewAverageRatingService $getReviewAverageRatingService
+        RatingFactory $ratingFactory
     ) {
-        $this->getReviewAverageRatingService = $getReviewAverageRatingService;
+        $this->ratingFactory = $ratingFactory;
     }
 
     /**
@@ -57,13 +57,19 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        if (!isset($value['rating_votes'])) {
-            throw new GraphQlInputException(__('Value must contain "rating_votes" property.'));
+        if (!isset($value['model'])) {
+            throw new GraphQlInputException(__('Value must contain "model" property.'));
         }
 
-        /** @var VoteCollection $ratingVotes */
-        $ratingVotes = $value['rating_votes'];
+        /** @var Review $review */
+        $review = $value['model'];
+        $summary = $this->ratingFactory->create()->getReviewSummary($review->getId());
+        $averageRating = $summary->getSum();
 
-        return $this->getReviewAverageRatingService->execute($ratingVotes->getItems());
+        if ($summary->getSum() > 0) {
+            $averageRating = (float) number_format($summary->getSum() / $summary->getCount() / 20, 2);
+        }
+
+        return $averageRating;
     }
 }
diff --git a/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/Review/RatingBreakdown.php b/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/Review/RatingBreakdown.php
index 050afed45dbfb..a51bd0420dda9 100644
--- a/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/Review/RatingBreakdown.php
+++ b/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/Review/RatingBreakdown.php
@@ -13,7 +13,7 @@
 use Magento\Framework\GraphQl\Query\Resolver\Value;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Review\Model\ResourceModel\Rating\Option\Vote\Collection as VoteCollection;
+use Magento\Review\Model\Review;
 use Magento\ReviewGraphQl\Model\DataProvider\ReviewRatingsDataProvider;
 
 /**
@@ -57,13 +57,13 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        if (!isset($value['rating_votes'])) {
-            throw new GraphQlInputException(__('Value must contain "rating_votes" property.'));
+        if (!isset($value['model'])) {
+            throw new GraphQlInputException(__('Value must contain "model" property.'));
         }
 
-        /** @var VoteCollection $ratingVotes */
-        $ratingVotes = $value['rating_votes'];
+        /** @var Review $review */
+        $review = $value['model'];
 
-        return $this->reviewRatingsDataProvider->getData($ratingVotes->getItems());
+        return $this->reviewRatingsDataProvider->getData((int) $review->getId());
     }
 }

From cda18d35cdfa606dfd765db83482c211d39e833e Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Thu, 14 May 2020 14:32:35 +0300
Subject: [PATCH 0275/1718] MC-33922: Improve email templates

---
 .../Framework/Filter/VariableResolver/LegacyResolver.php       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/Filter/VariableResolver/LegacyResolver.php b/lib/internal/Magento/Framework/Filter/VariableResolver/LegacyResolver.php
index 25bff73dacec2..2cc0657e1bdb5 100644
--- a/lib/internal/Magento/Framework/Filter/VariableResolver/LegacyResolver.php
+++ b/lib/internal/Magento/Framework/Filter/VariableResolver/LegacyResolver.php
@@ -175,8 +175,7 @@ private function handleObjectMethod(Template $filter, array $templateVariables,
      */
     private function isMethodCallable($object, string $method): bool
     {
-        if (
-            method_exists($object, $method)
+        if (method_exists($object, $method)
             && substr($method, 0, 3) !== 'set'
             && $method !== '___callParent'
         ) {

From 499d43d3b52b896aa2840a9872aface1ad74bb0a Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Thu, 14 May 2020 12:16:05 -0500
Subject: [PATCH 0276/1718] MC-33823: Merge CE, EE and B2B changes

---
 .../catalog/product/composite/configure.phtml | 33 ++++++++-------
 .../Adminhtml/System/Config/Field/Country.php |  9 ++--
 .../System/Config/Field/CountryTest.php       | 42 ++++++++++++++-----
 .../layout/customer_index_wishlist.xml        |  1 +
 4 files changed, 55 insertions(+), 30 deletions(-)

diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
index 1c27fbb31c620..af677202a6250 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
@@ -11,33 +11,34 @@
     <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
         'onload',
         "window.productConfigure && productConfigure.onLoadIFrame()",
-        '#product_composite_configure_iframe'
+        'iframe[name=\'product_composite_configure_iframe\']:last-of-type'
     ) ?>
     <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
         "width:0; height:0; border:0px solid #fff; position:absolute; top:-1000px; left:-1000px",
-        '#product_composite_configure_iframe'
+        'iframe[name=\'product_composite_configure_iframe\']:last-of-type'
     ) ?>
 
     <form action="" method="post" id="product_composite_configure_form" enctype="multipart/form-data"
-          target="product_composite_configure_iframe">
+          target="product_composite_configure_iframe" class="product_composite_configure_form">
         <div class="entry-edit">
-            <div id="product_composite_configure_messages">
+            <div id="product_composite_configure_messages" class="product_composite_configure_messages">
                 <div class="messages"><div class="message message-error error"><div></div></div></div>
             </div>
             <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
                 'display:none;',
-                '#product_composite_configure_messages'
+                '.product_composite_configure_messages:last-of-type'
             ) ?>
             <div id="product_composite_configure_form_fields" class="content product-composite-configure-inner"></div>
-            <div id="product_composite_configure_form_additional"></div>
+            <div id="product_composite_configure_form_additional" class="product_composite_configure_form_additional">
+            </div>
             <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
                 'display:none;',
-                '#product_composite_configure_form_additional'
+                '.product_composite_configure_form_additional:last-of-type'
             ) ?>
-            <div id="product_composite_configure_form_confirmed"></div>
+            <div id="product_composite_configure_form_confirmed" class="product_composite_configure_form_confirmed"></div>
             <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
                 'display:none;',
-                '#product_composite_configure_form_confirmed'
+                '.product_composite_configure_form_confirmed:last-of-type'
             ) ?>
         </div>
         <input type="hidden" name="as_js_varname" value="iFrameResponse" />
@@ -46,13 +47,13 @@
     <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
         'onsubmit',
         "productConfigure.onConfirmBtn();event.preventDefault()",
-        '#product_composite_configure_form'
+        '.product_composite_configure_form:last-of-type'
     ) ?>
 
-    <div id="product_composite_configure_confirmed"></div>
+    <div id="product_composite_configure_confirmed" class="product_composite_configure_confirmed"></div>
     <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
         'display:none;',
-        '#product_composite_configure_confirmed'
+        '.product_composite_configure_confirmed:last-of-type'
     ) ?>
 
     <?php $scriptString = <<<script
@@ -60,9 +61,9 @@
             "jquery",
             "mage/mage"
         ], function(jQuery){
-
-            jQuery('#product_composite_configure_form').mage('form').mage('validation');
-
+            jQuery('.product_composite_configure_form').each(function () {
+                Jquery(this).mage('form').mage('validation');
+            });
         });
 script;
     ?>
@@ -70,6 +71,6 @@ script;
 </div>
 <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
     'display:none',
-    '#product_composite_configure'
+    '.product-configure-popup:last-of-type'
 ) ?>
 
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Country.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Country.php
index 340c34fc2635c..6f29e607df58d 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Country.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Country.php
@@ -9,6 +9,7 @@
  */
 namespace Magento\Paypal\Block\Adminhtml\System\Config\Field;
 
+use Magento\Framework\View\Helper\SecureHtmlRenderer;
 use Magento\Paypal\Model\Config\StructurePlugin;
 
 class Country extends \Magento\Config\Block\System\Config\Form\Field
@@ -51,15 +52,17 @@ class Country extends \Magento\Config\Block\System\Config\Form\Field
      * @param \Magento\Framework\View\Helper\Js $jsHelper
      * @param \Magento\Directory\Helper\Data $directoryHelper
      * @param array $data
+     * @param SecureHtmlRenderer|null $secureHtmlRenderer
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Backend\Model\Url $url,
         \Magento\Framework\View\Helper\Js $jsHelper,
         \Magento\Directory\Helper\Data $directoryHelper,
-        array $data = []
+        array $data = [],
+        ?SecureHtmlRenderer $secureHtmlRenderer = null
     ) {
-        parent::__construct($context, $data);
+        parent::__construct($context, $data, $secureHtmlRenderer);
         $this->_url = $url;
         $this->_jsHelper = $jsHelper;
         $this->directoryHelper = $directoryHelper;
@@ -132,7 +135,7 @@ protected function _getElementHtml(\Magento\Framework\Data\Form\Element\Abstract
         }
 
         return parent::_getElementHtml($element) . $this->_jsHelper->getScript(
-            'require([\'prototype\'], function(){document.observe("dom:loaded", function() {' . $jsString . '});});'
+            'require([\'prototype\'], function() { document.observe("dom:loaded", function() {' . $jsString . '}); });'
         );
     }
 }
diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/CountryTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/CountryTest.php
index e8c46080e862e..c06bb6d847225 100644
--- a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/CountryTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/CountryTest.php
@@ -15,10 +15,10 @@
 use Magento\Framework\View\Helper\SecureHtmlRenderer;
 use Magento\Paypal\Block\Adminhtml\System\Config\Field\Country;
 use Magento\Paypal\Model\Config\StructurePlugin;
-use PHPUnit\Framework\Constraint\LogicalAnd;
 use PHPUnit\Framework\Constraint\StringContains;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Magento\Directory\Helper\Data as DirectoryHelper;
 
 class CountryTest extends TestCase
 {
@@ -47,6 +47,11 @@ class CountryTest extends TestCase
      */
     protected $_url;
 
+    /**
+     * @var DirectoryHelper
+     */
+    private $helper;
+
     protected function setUp(): void
     {
         $helper = new ObjectManager($this);
@@ -71,6 +76,7 @@ protected function setUp(): void
         $this->_request = $this->getMockForAbstractClass(RequestInterface::class);
         $this->_jsHelper = $this->createMock(Js::class);
         $this->_url = $this->createMock(Url::class);
+        $this->helper = $this->createMock(DirectoryHelper::class);
         $secureRendererMock = $this->createMock(SecureHtmlRenderer::class);
         $secureRendererMock->method('renderEventListenerAsTag')
             ->willReturnCallback(
@@ -90,7 +96,8 @@ function (string $style, string $selector): string {
                 'request' => $this->_request,
                 'jsHelper' => $this->_jsHelper,
                 'url' => $this->_url,
-                'secureRenderer' => $secureRendererMock
+                'directoryHelper' => $this->helper,
+                'secureHtmlRenderer' => $secureRendererMock
             ]
         );
     }
@@ -123,15 +130,7 @@ public function testRender($requestCountry, $requestDefaultCountry, $canUseDefau
                 '$("' . $this->_element->getHtmlId() . '").observe("change", function () {'
             ),
         ];
-        if ($canUseDefault && ($requestCountry == 'US') && $requestDefaultCountry) {
-            $constraints[] = new StringContains(
-                '$("' . $this->_element->getHtmlId() . '_inherit").observe("click", function () {'
-            );
-        }
-        $this->_jsHelper->expects($this->once())
-            ->method('getScript')
-            ->with(self::logicalAnd($constraints));
-        $this->_url->expects($this->once())
+        $this->_url->expects($this->at(0))
             ->method('getUrl')
             ->with(
                 '*/*/*',
@@ -142,6 +141,27 @@ public function testRender($requestCountry, $requestDefaultCountry, $canUseDefau
                     StructurePlugin::REQUEST_PARAM_COUNTRY => '__country__'
                 ]
             );
+        if ($canUseDefault && ($requestCountry == 'US') && $requestDefaultCountry) {
+            $this->helper->method('getDefaultCountry')->willReturn($requestDefaultCountry);
+            $constraints[] = new StringContains(
+                '$("' . $this->_element->getHtmlId() . '_inherit").observe("click", function () {'
+            );
+            $this->_url->expects($this->at(1))
+                ->method('getUrl')
+                ->with(
+                    '*/*/*',
+                    [
+                        'section' => 'section',
+                        'website' => 'website',
+                        'store' => 'store',
+                        StructurePlugin::REQUEST_PARAM_COUNTRY => '__country__',
+                        Country::REQUEST_PARAM_DEFAULT_COUNTRY => '__default__'
+                    ]
+                );
+        }
+        $this->_jsHelper->expects($this->once())
+            ->method('getScript')
+            ->with(self::logicalAnd(...$constraints));
         $this->_model->render($this->_element);
     }
 
diff --git a/app/code/Magento/Wishlist/view/adminhtml/layout/customer_index_wishlist.xml b/app/code/Magento/Wishlist/view/adminhtml/layout/customer_index_wishlist.xml
index cc5ef6b3ab554..0ee4233029105 100644
--- a/app/code/Magento/Wishlist/view/adminhtml/layout/customer_index_wishlist.xml
+++ b/app/code/Magento/Wishlist/view/adminhtml/layout/customer_index_wishlist.xml
@@ -112,5 +112,6 @@
                 </arguments>
             </block>
         </block>
+        <block class="Magento\Catalog\Block\Adminhtml\Product\Composite\Configure" template="Magento_Catalog::catalog/product/composite/configure.phtml" name="configure.popup"/>
     </container>
 </layout>

From 212c208bb3d8416ffaeaea950a66a3874f60c9e9 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Thu, 14 May 2020 14:56:17 -0500
Subject: [PATCH 0277/1718] MC-33823: Merge CE, EE and B2B changes

---
 .../templates/catalog/product/composite/configure.phtml       | 2 +-
 .../Magento/Backend/Block/Widget/Button/SplitButtonTest.php   | 2 +-
 .../testsuite/Magento/Backend/Block/Widget/ButtonTest.php     | 2 +-
 .../integration/testsuite/Magento/Cms/Controller/PageTest.php | 2 +-
 .../testsuite/Magento/Csp/Helper/InlineUtilTest.php           | 4 ++--
 .../Magento/Csp/Model/Collector/ControllerCollectorTest.php   | 2 +-
 .../Magento/Framework/View/Helper/SecureHtmlRendererTest.php  | 2 +-
 .../Magento/Framework/View/LayoutTestWithExceptions.php       | 2 +-
 .../testsuite/Magento/Ui/Component/Control/ButtonTest.php     | 2 +-
 .../Magento/Ui/Component/Control/SplitButtonTest.php          | 2 +-
 .../Magento/Framework/TestFramework/Unit/Block/Adminhtml.php  | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
index af677202a6250..cc940a87bc051 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
@@ -62,7 +62,7 @@
             "mage/mage"
         ], function(jQuery){
             jQuery('.product_composite_configure_form').each(function () {
-                Jquery(this).mage('form').mage('validation');
+                jQuery(this).mage('form').mage('validation');
             });
         });
 script;
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Button/SplitButtonTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Button/SplitButtonTest.php
index d35b0802eb2f1..d8758b68a2995 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Button/SplitButtonTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Button/SplitButtonTest.php
@@ -28,7 +28,7 @@ class SplitButtonTest extends TestCase
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->layout = $objectManager->get(LayoutInterface::class);
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/ButtonTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/ButtonTest.php
index d0df81e8b2309..2e8ea31ce9369 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/ButtonTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/ButtonTest.php
@@ -27,7 +27,7 @@ class ButtonTest extends TestCase
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->layout = $objectManager->get(LayoutInterface::class);
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/PageTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/PageTest.php
index f1cd475d202c1..d58aa4e049b78 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Controller/PageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Controller/PageTest.php
@@ -18,7 +18,7 @@ class PageTest extends \Magento\TestFramework\TestCase\AbstractController
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         Bootstrap::getObjectManager()->configure([
             'preferences' => [
diff --git a/dev/tests/integration/testsuite/Magento/Csp/Helper/InlineUtilTest.php b/dev/tests/integration/testsuite/Magento/Csp/Helper/InlineUtilTest.php
index e1b666bc351e6..0f31f0beccda9 100644
--- a/dev/tests/integration/testsuite/Magento/Csp/Helper/InlineUtilTest.php
+++ b/dev/tests/integration/testsuite/Magento/Csp/Helper/InlineUtilTest.php
@@ -38,7 +38,7 @@ class InlineUtilTest extends TestCase
     /**
      * @inheritDoc
      */
-    public function setUp()
+    public function setUp(): void
     {
         Bootstrap::getObjectManager()->configure([
             'preferences' => [
@@ -53,7 +53,7 @@ public function setUp()
     /**
      * @inheritDoc
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->util = null;
         $this->secureHtmlRenderer = null;
diff --git a/dev/tests/integration/testsuite/Magento/Csp/Model/Collector/ControllerCollectorTest.php b/dev/tests/integration/testsuite/Magento/Csp/Model/Collector/ControllerCollectorTest.php
index 87a307933a035..c3a5e58e7f9be 100644
--- a/dev/tests/integration/testsuite/Magento/Csp/Model/Collector/ControllerCollectorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Csp/Model/Collector/ControllerCollectorTest.php
@@ -27,7 +27,7 @@ class ControllerCollectorTest extends TestCase
     /**
      * @inheritDoc
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->collector = Bootstrap::getObjectManager()->create(ControllerCollector::class);
     }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTest.php
index a4ec5f0170e52..d06ced3dc0283 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTest.php
@@ -25,7 +25,7 @@ class SecureHtmlRendererTest extends TestCase
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
         //Clearing the processors list to ensure stable results.
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/LayoutTestWithExceptions.php b/dev/tests/integration/testsuite/Magento/Framework/View/LayoutTestWithExceptions.php
index 7bb71a3d8b6b3..40f7853535068 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/LayoutTestWithExceptions.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/LayoutTestWithExceptions.php
@@ -14,7 +14,7 @@ class LayoutTestWithExceptions extends \PHPUnit\Framework\TestCase
      */
     protected $layout;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         $layoutFactory = $objectManager->get(\Magento\Framework\View\LayoutFactory::class);
diff --git a/dev/tests/integration/testsuite/Magento/Ui/Component/Control/ButtonTest.php b/dev/tests/integration/testsuite/Magento/Ui/Component/Control/ButtonTest.php
index 988d9a387add3..7c10adf147772 100644
--- a/dev/tests/integration/testsuite/Magento/Ui/Component/Control/ButtonTest.php
+++ b/dev/tests/integration/testsuite/Magento/Ui/Component/Control/ButtonTest.php
@@ -27,7 +27,7 @@ class ButtonTest extends TestCase
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->layout = $objectManager->get(LayoutInterface::class);
diff --git a/dev/tests/integration/testsuite/Magento/Ui/Component/Control/SplitButtonTest.php b/dev/tests/integration/testsuite/Magento/Ui/Component/Control/SplitButtonTest.php
index e4a2d2809cf08..d9c92e12975c0 100644
--- a/dev/tests/integration/testsuite/Magento/Ui/Component/Control/SplitButtonTest.php
+++ b/dev/tests/integration/testsuite/Magento/Ui/Component/Control/SplitButtonTest.php
@@ -28,7 +28,7 @@ class SplitButtonTest extends TestCase
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->layout = $objectManager->get(LayoutInterface::class);
diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Block/Adminhtml.php b/lib/internal/Magento/Framework/TestFramework/Unit/Block/Adminhtml.php
index 0ad3916156231..f8bb912ea6c85 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/Block/Adminhtml.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Block/Adminhtml.php
@@ -109,7 +109,7 @@ class Adminhtml extends \PHPUnit\Framework\TestCase
 
     /**
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         // These mocks are accessed via context
         $this->_designMock          = $this->_makeMock(\Magento\Framework\View\DesignInterface::class);

From 37982f64734fe4fe6a81c1c40d23e7412bc327a9 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Thu, 14 May 2020 17:23:51 -0500
Subject: [PATCH 0278/1718] MC-33823: Merge CE, EE and B2B changes

---
 .../view/frontend/templates/inline.phtml       |  5 ++---
 .../Section/AdminCartPriceRulesFormSection.xml |  2 +-
 .../Block/Widget/Button/SplitButtonTest.php    | 14 +++++++-------
 .../Backend/Block/Widget/ButtonTest.php        | 14 +++++++-------
 .../Model/Collector/ConfigCollectorTest.php    |  2 +-
 .../Helper/SecureHtmlRendererTemplateTest.php  |  8 ++++----
 .../View/Helper/SecureHtmlRendererTest.php     | 18 +++++++++---------
 .../Ui/Component/Control/ButtonTest.php        | 14 +++++++-------
 .../Ui/Component/Control/SplitButtonTest.php   | 14 +++++++-------
 .../View/Test/Unit/Element/Html/LinkTest.php   |  5 -----
 10 files changed, 45 insertions(+), 51 deletions(-)

diff --git a/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml b/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
index 45dc79aa99a13..b5d5377171413 100644
--- a/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
+++ b/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
@@ -448,11 +448,10 @@ script;
             </dt>
         </dl>
     </fieldset>
+    <?php $entityId = (int) $block->getEntity()->getId(); ?>
     <script type="text/x-magento-init">
         {
-            "#allow_gift_options_<?= (int) $block->getEntity()->getId() ?>,
-             #allow_gift_options_for_order_<?= (int) $block->getEntity()->getId() ?>,
-              #allow_gift_options_for_items_<?= (int) $block->getEntity()->getId() ?>": {
+            "#allow_gift_options_<?= /* @noEscape */ $entityId ?>, #allow_gift_options_for_order_<?= /* @noEscape */ $entityId ?>, #allow_gift_options_for_items_<?= /* @noEscape */ $entityId ?>": {
                 "giftOptions": {}
             }
         }
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
index b164cdde33248..1d27039ac4cba 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
@@ -10,7 +10,7 @@
     <section name="AdminCartPriceRulesFormSection">
         <element name="save" type="button" selector="#save" timeout="30"/>
         <element name="saveAndContinue" type="button" selector="#save_and_continue" timeout="30"/>
-        <element name="delete" type="button" selector="#delete" timeout="30"/>
+        <element name="delete" type="button" selector="button#delete" timeout="30"/>
         <element name="modalAcceptButton" type="button" selector="button.action-accept" timeout="30"/>
 
         <!-- Rule Information (the main form on the page) -->
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Button/SplitButtonTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Button/SplitButtonTest.php
index d8758b68a2995..473caf1d6737e 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Button/SplitButtonTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Button/SplitButtonTest.php
@@ -79,12 +79,12 @@ public function testToHtml(): void
         );
 
         $html = $block->toHtml();
-        $this->assertContains('<button ', $html);
-        $this->assertContains('<span>A button</span>', $html);
-        $this->assertNotContains('onclick=', $html);
-        $this->assertNotContains('style=', $html);
-        $this->assertRegExp('/\<script.*?\>.*?' . preg_quote($onclick) . '.*?\<\/script\>/ims', $html);
-        $this->assertContains('width', $html);
-        $this->assertContains('100px', $html);
+        $this->assertStringContainsString('<button ', $html);
+        $this->assertStringContainsString('<span>A button</span>', $html);
+        $this->assertStringNotContainsString('onclick=', $html);
+        $this->assertStringNotContainsString('style=', $html);
+        $this->assertMatchesRegularExpression('/\<script.*?\>.*?' . preg_quote($onclick) . '.*?\<\/script\>/ims', $html);
+        $this->assertStringContainsString('width', $html);
+        $this->assertStringContainsString('100px', $html);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/ButtonTest.php b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/ButtonTest.php
index 2e8ea31ce9369..e48a6bae2ff80 100644
--- a/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/ButtonTest.php
+++ b/dev/tests/integration/testsuite/Magento/Backend/Block/Widget/ButtonTest.php
@@ -72,12 +72,12 @@ public function testToHtml(): void
         );
 
         $html = $block->toHtml();
-        $this->assertContains('<button ', $html);
-        $this->assertContains('<span>A button</span>', $html);
-        $this->assertNotContains('onclick=', $html);
-        $this->assertNotContains('style=', $html);
-        $this->assertRegExp('/\<script.*?\>.*?' .preg_quote($block->getOnClick()) .'.*?\<\/script\>/ims', $html);
-        $this->assertContains('height', $html);
-        $this->assertContains('200px', $html);
+        $this->assertStringContainsString('<button ', $html);
+        $this->assertStringContainsString('<span>A button</span>', $html);
+        $this->assertStringNotContainsString('onclick=', $html);
+        $this->assertStringNotContainsString('style=', $html);
+        $this->assertMatchesRegularExpression('/\<script.*?\>.*?' .preg_quote($block->getOnClick()) .'.*?\<\/script\>/ims', $html);
+        $this->assertStringContainsString('height', $html);
+        $this->assertStringContainsString('200px', $html);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Csp/Model/Collector/ConfigCollectorTest.php b/dev/tests/integration/testsuite/Magento/Csp/Model/Collector/ConfigCollectorTest.php
index 46156f0b83907..2d8cbbeedeab9 100644
--- a/dev/tests/integration/testsuite/Magento/Csp/Model/Collector/ConfigCollectorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Csp/Model/Collector/ConfigCollectorTest.php
@@ -45,7 +45,7 @@ private function getExpectedPolicies(): array
                 'child-src',
                 false,
                 ['http://magento.com', 'http://devdocs.magento.com'],
-                ['http'],
+                ['http', 'https', 'blob'],
                 true,
                 true,
                 false,
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTemplateTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTemplateTest.php
index 154c6832b045d..0d2b85b4ae20d 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTemplateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTemplateTest.php
@@ -28,19 +28,19 @@ public function testTemplateUsage(): void
         $this->dispatch('securehtml/secure/helper');
         $content = $this->getResponse()->getContent();
 
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<h1 onclick="alert&#x28;&#x29;">Hello there!</h1>',
             $content
         );
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<script src="http&#x3A;&#x2F;&#x2F;my.magento.com&#x2F;static&#x2F;script.js"/>',
             $content
         );
-        $this->assertContains(
+        $this->assertStringContainsString(
             "<script>\n    let myVar = 1;\n</script>",
             $content
         );
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<div>I am just &lt;a&gt; text</div>',
             $content
         );
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTest.php
index d06ced3dc0283..501bb9fddbac4 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTest.php
@@ -97,9 +97,9 @@ public function testRenderEventHandler(): void
     public function testRenderEventListenerAsTag(): void
     {
         $html = $this->helper->renderEventListenerAsTag('onclick', 'alert(1)', '#id');
-        $this->assertContains('alert(1)', $html);
-        $this->assertContains('#id', $html);
-        $this->assertContains('click', $html);
+        $this->assertStringContainsString('alert(1)', $html);
+        $this->assertStringContainsString('#id', $html);
+        $this->assertStringContainsString('click', $html);
     }
 
     /**
@@ -121,21 +121,21 @@ public function testInvalidEventListener(): void
     public function testRenderStyleAsTag(): void
     {
         $html = $this->helper->renderStyleAsTag('display: none; font-size: 3em;  ', '#id');
-        $this->assertContains('#id', $html);
-        $this->assertContains('display', $html);
-        $this->assertContains('none', $html);
-        $this->assertContains('fontSize', $html);
-        $this->assertContains('3em', $html);
+        $this->assertStringContainsString('#id', $html);
+        $this->assertStringContainsString('display', $html);
+        $this->assertStringContainsString('none', $html);
+        $this->assertStringContainsString('fontSize', $html);
+        $this->assertStringContainsString('3em', $html);
     }
 
     /**
      * Check style validation
      *
      * @return void
-     * @expectedException \InvalidArgumentException
      */
     public function testInvalidStyle(): void
     {
+        $this->expectException(\InvalidArgumentException::class);
         $this->helper->renderStyleAsTag('display;', '');
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Ui/Component/Control/ButtonTest.php b/dev/tests/integration/testsuite/Magento/Ui/Component/Control/ButtonTest.php
index 7c10adf147772..d5bfda2afcd48 100644
--- a/dev/tests/integration/testsuite/Magento/Ui/Component/Control/ButtonTest.php
+++ b/dev/tests/integration/testsuite/Magento/Ui/Component/Control/ButtonTest.php
@@ -72,12 +72,12 @@ public function testToHtml(): void
         );
 
         $html = $block->toHtml();
-        $this->assertContains('<button ', $html);
-        $this->assertContains('<span>A button control</span>', $html);
-        $this->assertNotContains('onclick=', $html);
-        $this->assertNotContains('style=', $html);
-        $this->assertRegExp('/\<script.*?\>.*?' .preg_quote($onclick) .'.*?\<\/script\>/ims', $html);
-        $this->assertContains('height', $html);
-        $this->assertContains('200px', $html);
+        $this->assertStringContainsString('<button ', $html);
+        $this->assertStringContainsString('<span>A button control</span>', $html);
+        $this->assertStringNotContainsString('onclick=', $html);
+        $this->assertStringNotContainsString('style=', $html);
+        $this->assertMatchesRegularExpression('/\<script.*?\>.*?' .preg_quote($onclick) .'.*?\<\/script\>/ims', $html);
+        $this->assertStringContainsString('height', $html);
+        $this->assertStringContainsString('200px', $html);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Ui/Component/Control/SplitButtonTest.php b/dev/tests/integration/testsuite/Magento/Ui/Component/Control/SplitButtonTest.php
index d9c92e12975c0..48caf7ed8b859 100644
--- a/dev/tests/integration/testsuite/Magento/Ui/Component/Control/SplitButtonTest.php
+++ b/dev/tests/integration/testsuite/Magento/Ui/Component/Control/SplitButtonTest.php
@@ -81,12 +81,12 @@ public function testToHtml(): void
         );
 
         $html = $block->toHtml();
-        $this->assertContains('<button ', $html);
-        $this->assertContains('<span>Split button control</span>', $html);
-        $this->assertNotContains('onclick=', $html);
-        $this->assertNotContains('style=', $html);
-        $this->assertRegExp('/\<script.*?\>.*?' . preg_quote($onclick) . '.*?\<\/script\>/ims', $html);
-        $this->assertContains('width', $html);
-        $this->assertContains('100px', $html);
+        $this->assertStringContainsString('<button ', $html);
+        $this->assertStringContainsString('<span>Split button control</span>', $html);
+        $this->assertStringNotContainsString('onclick=', $html);
+        $this->assertStringNotContainsString('style=', $html);
+        $this->assertMatchesRegularExpression('/\<script.*?\>.*?' . preg_quote($onclick) . '.*?\<\/script\>/ims', $html);
+        $this->assertStringContainsString('width', $html);
+        $this->assertStringContainsString('100px', $html);
     }
 }
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php
index 892bda25d4e20..ac158be6f6fd7 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/LinkTest.php
@@ -33,11 +33,6 @@ class LinkTest extends TestCase
      */
     private $objectManager;
 
-    protected function setUp(): void
-    {
-        $this->objectManager = new ObjectManager($this);
-    }
-
     /**
      * @var array
      */

From 7aa9a9c35990d4f7115661a03a1cce39733a21c9 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Fri, 15 May 2020 11:05:02 +0300
Subject: [PATCH 0279/1718] fix

---
 app/code/Magento/Customer/Model/Options.php   |   6 +-
 .../Magento/Customer/Model/OptionsTest.php    | 165 ++++++++++++++++++
 2 files changed, 169 insertions(+), 2 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Customer/Model/OptionsTest.php

diff --git a/app/code/Magento/Customer/Model/Options.php b/app/code/Magento/Customer/Model/Options.php
index 71e70f8e14208..bc093502fb4fc 100644
--- a/app/code/Magento/Customer/Model/Options.php
+++ b/app/code/Magento/Customer/Model/Options.php
@@ -97,12 +97,14 @@ private function prepareNamePrefixSuffixOptions($options, $isOptional = false)
         if (empty($options)) {
             return false;
         }
+
         $result = [];
-        $options = array_filter(explode(';', $options));
+        $options = explode(';', $options);
         foreach ($options as $value) {
-            $value = $this->escaper->escapeHtml(trim($value));
+            $value = $this->escaper->escapeHtml(trim($value)) ?: ' ';
             $result[$value] = $value;
         }
+
         if ($isOptional && trim(current($options))) {
             $result = array_merge([' ' => ' '], $result);
         }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/OptionsTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/OptionsTest.php
new file mode 100644
index 0000000000000..f77852f230b65
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/OptionsTest.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Customer\Model;
+
+use Magento\Config\Model\Config\Source\Nooptreq;
+use Magento\Customer\Helper\Address;
+use Magento\Framework\App\Config\MutableScopeConfigInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for \Magento\Customer\Model\Options.
+ * @magentoDbIsolation enabled
+ */
+class OptionsTest extends TestCase
+{
+    private const XML_PATH_SUFFIX_SHOW = 'customer/address/suffix_show';
+    private const XML_PATH_SUFFIX_OPTIONS = 'customer/address/suffix_options';
+    private const XML_PATH_PREFIX_SHOW = 'customer/address/prefix_show';
+    private const XML_PATH_PREFIX_OPTIONS = 'customer/address/prefix_options';
+
+    private const STUB_OPTION_PREFIX_NAME = 'prefix';
+    private const STUB_OPTION_SUFFIX_NAME = 'suffix';
+    private const STUB_CONFIG_VALUES = 'v1;v2';
+    private const STUB_CONFIG_VALUES_WITH_BLANK_OPTION = ';v1;v2';
+    private const STUB_EXPECTED_VALUES_WITH_BLANK_OPTION = [' ' => ' ', 'v1' => 'v1', 'v2' => 'v2'];
+    private const STUB_EXPECTED_VALUES = ['v1' => 'v1', 'v2' => 'v2'];
+
+    /**
+     * @var Options
+     */
+    private $model;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->model = $this->objectManager->create(Options::class);
+    }
+
+    /**
+     * Test suffix and prefix options
+     *
+     * @dataProvider optionsDataProvider
+     *
+     * @param string $optionType
+     * @param array $showOptionConfig
+     * @param array $optionValuesConfig
+     * @param array $expectedOptions
+     * @param int $expectedCount
+     * @return void
+     */
+    public function testOptions(
+        string $optionType,
+        array $showOptionConfig,
+        array $optionValuesConfig,
+        array $expectedOptions,
+        int $expectedCount
+    ): void {
+        $this->setConfig($showOptionConfig);
+        $this->setConfig($optionValuesConfig);
+
+        /** @var array $options */
+        $options = $optionType === self::STUB_OPTION_PREFIX_NAME
+            ? $this->model->getNamePrefixOptions()
+            : $this->model->getNameSuffixOptions();
+
+        $this->assertCount($expectedCount, $options);
+        $this->assertEquals($expectedOptions, $options);
+    }
+
+    /**
+     * Set config param
+     *
+     * @param array $data
+     * @param string|null $scopeType
+     * @param string|null $scopeCode
+     * @return void
+     */
+    private function setConfig(
+        array $data,
+        ?string $scopeType = ScopeInterface::SCOPE_STORE,
+        ?string $scopeCode = 'default'
+    ): void {
+        $path = array_key_first($data);
+        $this->objectManager->get(MutableScopeConfigInterface::class)
+            ->setValue($path, $data[$path], $scopeType, $scopeCode);
+    }
+
+    /**
+     * DataProvider for testOptions()
+     *
+     * @return array
+     */
+    public function optionsDataProvider(): array
+    {
+        return [
+            'prefix_required_with_blank_option' => [
+                self::STUB_OPTION_PREFIX_NAME,
+                [self::XML_PATH_PREFIX_SHOW => Nooptreq::VALUE_REQUIRED],
+                [self::XML_PATH_PREFIX_OPTIONS => self::STUB_CONFIG_VALUES_WITH_BLANK_OPTION],
+                self::STUB_EXPECTED_VALUES_WITH_BLANK_OPTION,
+                3,
+            ],
+            'prefix_required' => [
+                self::STUB_OPTION_PREFIX_NAME,
+                [self::XML_PATH_PREFIX_SHOW => Nooptreq::VALUE_REQUIRED],
+                [self::XML_PATH_PREFIX_OPTIONS => self::STUB_CONFIG_VALUES],
+                self::STUB_EXPECTED_VALUES,
+                2,
+            ],
+            'prefix_optional' => [
+                self::STUB_OPTION_PREFIX_NAME,
+                [self::XML_PATH_PREFIX_SHOW => Nooptreq::VALUE_OPTIONAL],
+                [self::XML_PATH_PREFIX_OPTIONS => self::STUB_CONFIG_VALUES],
+                self::STUB_EXPECTED_VALUES_WITH_BLANK_OPTION,
+                3,
+            ],
+            'suffix_optional' => [
+                self::STUB_OPTION_SUFFIX_NAME,
+                [self::XML_PATH_SUFFIX_SHOW => Nooptreq::VALUE_OPTIONAL],
+                [self::XML_PATH_SUFFIX_OPTIONS => self::STUB_CONFIG_VALUES],
+                self::STUB_EXPECTED_VALUES_WITH_BLANK_OPTION,
+                3,
+            ],
+            'suffix_optional_with_blank_option' => [
+                self::STUB_OPTION_SUFFIX_NAME,
+                [self::XML_PATH_SUFFIX_SHOW => Nooptreq::VALUE_OPTIONAL],
+                [self::XML_PATH_SUFFIX_OPTIONS => self::STUB_CONFIG_VALUES_WITH_BLANK_OPTION],
+                self::STUB_EXPECTED_VALUES_WITH_BLANK_OPTION,
+                3,
+            ],
+            'suffix_required_with_blank_option' => [
+                self::STUB_OPTION_SUFFIX_NAME,
+                [self::XML_PATH_SUFFIX_SHOW => Nooptreq::VALUE_OPTIONAL],
+                [self::XML_PATH_SUFFIX_OPTIONS => self::STUB_CONFIG_VALUES_WITH_BLANK_OPTION],
+                self::STUB_EXPECTED_VALUES_WITH_BLANK_OPTION,
+                3,
+            ],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown(): void
+    {
+        $this->objectManager->removeSharedInstance(Address::class);
+    }
+}

From cd58d3d601fa7e3817e9e1176c89317723d3ae42 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Fri, 15 May 2020 11:34:04 -0500
Subject: [PATCH 0280/1718] MC-33823: Merge CE, EE and B2B changes

---
 .../view/frontend/templates/inline.phtml      | 19 ++++---------------
 .../View/Helper/SecureHtmlRendererTest.php    |  2 +-
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml b/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
index b5d5377171413..f89657d3c5d90 100644
--- a/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
+++ b/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
@@ -87,9 +87,7 @@ switch ($block->getCheckoutType()):
                                 <div class="control">
                                     <textarea id="gift-message-whole-message" class="input-text"
                                               name="giftmessage[quote][<?=(int)$block->getEntity()->getId()?>][message]"
-                                              title="<?= $block->escapeHtmlAttr(__('Message')) ?>" rows="5" cols="10">
-                                        <?= /* @noEscape */ $block->getEscaped($block->getMessage()->getMessage()) ?>
-                                    </textarea>
+                                              title="<?= $block->escapeHtmlAttr(__('Message')) ?>" rows="5" cols="10"><?= /* @noEscape */ $block->getEscaped($block->getMessage()->getMessage()) ?></textarea>
                                 </div>
                             </div>
                         </fieldset>
@@ -196,11 +194,7 @@ script;
                                                       name="giftmessage[quote_item][<?= (int) $_item->getId()
                                                         ?>][message]"
                                                       title="<?= $block->escapeHtmlAttr(__('Message')) ?>"
-                                                      rows="5" cols="40">
-                                                <?= /* @noEscape */ $block->getEscaped(
-                                                    $block->getMessage($_item)->getMessage()
-                                                ) ?>
-                                            </textarea>
+                                                      rows="5" cols="40"><?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getMessage()) ?></textarea>
                                          </div>
                                      </div>
                                 </fieldset>
@@ -322,9 +316,7 @@ script;
                                     <textarea id="gift-message-<?= (int) $block->getEntity()->getId() ?>-message"
                                               class="input-text" name="giftmessage[quote_address][<?= (int) $block
                                                 ->getEntity()->getId() ?>][message]"
-                                              title="<?= $block->escapeHtmlAttr(__('Message')) ?>" rows="5" cols="40">
-                                        <?= /* @noEscape */ $block->getEscaped($block->getMessage()->getMessage()) ?>
-                                    </textarea>
+                                              title="<?= $block->escapeHtmlAttr(__('Message')) ?>" rows="5" cols="40"><?= /* @noEscape */ $block->getEscaped($block->getMessage()->getMessage()) ?></textarea>
                                 </div>
                             </div>
                         </fieldset>
@@ -429,10 +421,7 @@ script;
                                                           name="giftmessage[quote_address_item][<?= (int) $_item
                                                               ->getId() ?>][message]"
                                                           title="<?= $block->escapeHtmlAttr(__('Message')) ?>" rows="5"
-                                                          cols="10">
-                                                    <?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)
-                                                        ->getMessage()) ?>
-                                                </textarea>
+                                                          cols="10"><?= /* @noEscape */ $block->getEscaped($block->getMessage($_item)->getMessage()) ?></textarea>
                                             </div>
                                         </div>
                                  </fieldset>
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTest.php
index 501bb9fddbac4..8fcb464aec734 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTest.php
@@ -106,10 +106,10 @@ public function testRenderEventListenerAsTag(): void
      * Check handler validation
      *
      * @return void
-     * @expectedException \InvalidArgumentException
      */
     public function testInvalidEventListener(): void
     {
+        $this->expectException(\InvalidArgumentException::class);
         $this->helper->renderEventListenerAsTag('nonevent', '', '');
     }
 

From 6bd63e3d348abc096cd8a8f3024fe0b9c5274cb5 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Fri, 15 May 2020 12:19:05 -0500
Subject: [PATCH 0281/1718] MC-33823: Merge CE, EE and B2B changes

---
 .../onepage/review/item/price/row_excl_tax.phtml     |  6 +-----
 .../onepage/review/item/price/row_incl_tax.phtml     |  6 +-----
 .../onepage/review/item/price/unit_excl_tax.phtml    |  6 +-----
 .../onepage/review/item/price/unit_incl_tax.phtml    |  6 +-----
 .../view/frontend/templates/item/price/row.phtml     | 12 ++----------
 .../view/frontend/templates/item/price/unit.phtml    | 12 ++----------
 6 files changed, 8 insertions(+), 40 deletions(-)

diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
index 3a2dd0557ef2b..b9b5a00d0a157 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
@@ -24,11 +24,7 @@ $_item = $block->getItem();
     </span>
 
 <?php if ($weeeHelper->getApplied($_item)): ?>
-    <span class="cart-tax-info" id="esubtotal-item-tax-details<?= (int) $_item->getId() ?>">
-        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-            'display: none',
-            'div#esubtotal-item-tax-details' . (int) $item->getId()
-        ) ?>
+    <span class="cart-tax-info no-display" id="esubtotal-item-tax-details<?= (int) $_item->getId() ?>">
     <?php if ($block->displayPriceWithWeeeDetails()): ?>
         <?php foreach ($weeeHelper->getApplied($_item) as $tax): ?>
             <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
index 546b2ec7c04b3..38f2c528b15c9 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
@@ -24,7 +24,7 @@ $_weeeHelper = $block->getData('weeeHelper');
     </span>
 
 <?php if ($_weeeHelper->getApplied($_item)): ?>
-    <span class="cart-tax-info" id="subtotal-item-tax-details<?= (int) $_item->getId() ?>">
+    <span class="cart-tax-info no-display" id="subtotal-item-tax-details<?= (int) $_item->getId() ?>">
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <?php foreach ($_weeeHelper->getApplied($_item) as $tax): ?>
                 <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
@@ -33,10 +33,6 @@ $_weeeHelper = $block->getData('weeeHelper');
             <?php endforeach; ?>
         <?php endif; ?>
     </span>
-    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-        'display: none',
-        'div#subtotal-item-tax-details' . (int) $item->getId()
-    ) ?>
 
     <?php if ($block->displayFinalPrice()): ?>
         <span class="cart-tax-total"
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
index b9b43c8c5eac3..8bb331c109119 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
@@ -24,11 +24,7 @@ $_item = $block->getItem();
 <?= /* @noEscape */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
     </span>
 <?php if ($weeeHelper->getApplied($_item)): ?>
-    <span class="cart-tax-info" id="eunit-item-tax-details<?= (int) $_item->getId() ?>">
-        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-            'display: none',
-            'span#eunit-item-tax-details' . (int) $item->getId()
-        ) ?>
+    <span class="cart-tax-info no-display" id="eunit-item-tax-details<?= (int) $_item->getId() ?>">
     <?php if ($block->displayPriceWithWeeeDetails()): ?>
         <?php foreach ($weeeHelper->getApplied($_item) as $tax): ?>
             <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
index 24023c0088e3e..e667796825327 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
@@ -25,7 +25,7 @@ $_weeeHelper = $block->getData('weeeHelper');
     </span>
 
 <?php if ($_weeeHelper->getApplied($_item)): ?>
-    <span class="cart-tax-info" id="unit-item-tax-details<?= (int) $_item->getId() ?>">
+    <span class="cart-tax-info no-display" id="unit-item-tax-details<?= (int) $_item->getId() ?>">
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <?php foreach ($_weeeHelper->getApplied($_item) as $tax): ?>
                 <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
@@ -34,10 +34,6 @@ $_weeeHelper = $block->getData('weeeHelper');
             <?php endforeach; ?>
         <?php endif; ?>
     </span>
-    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-        'display: none',
-        'span#unit-item-tax-details' . (int) $item->getId()
-    ) ?>
 
     <?php if ($block->displayFinalPrice()): ?>
         <span class="cart-tax-total"
diff --git a/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml b/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
index 05ff81be25c99..5bd2a2f81acbc 100644
--- a/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
@@ -26,17 +26,13 @@ $item = $block->getItem();
             </span>
 
         <?php if ($weeeHelper->getApplied($item)): ?>
-            <div class="cart-tax-info" id="subtotal-item-tax-details<?= (int) $item->getId() ?>">
+            <div class="cart-tax-info no-display" id="subtotal-item-tax-details<?= (int) $item->getId() ?>">
                 <?php foreach ($weeeHelper->getApplied($item) as $tax): ?>
                     <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
                         <?= /* @noEscape */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?>
                     </span>
                 <?php endforeach; ?>
             </div>
-            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-                'display: none',
-                'div#subtotal-item-tax-details' . (int) $item->getId()
-            ) ?>
 
             <?php if ($block->displayFinalPrice()): ?>
                 <span class="cart-tax-total"
@@ -63,17 +59,13 @@ $item = $block->getItem();
             </span>
 
         <?php if ($weeeHelper->getApplied($item)): ?>
-            <span class="cart-tax-info" id="esubtotal-item-tax-details<?= (int) $item->getId() ?>">
+            <span class="cart-tax-info no-display" id="esubtotal-item-tax-details<?= (int) $item->getId() ?>">
                 <?php foreach ($weeeHelper->getApplied($item) as $tax): ?>
                     <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
                         <?= /* @noEscape */ $block->formatPrice($tax['row_amount'], true, true) ?>
                     </span>
                 <?php endforeach; ?>
             </span>
-            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-                'display: none',
-                'div#esubtotal-item-tax-details' . (int) $item->getId()
-            ) ?>
 
             <?php if ($block->displayFinalPrice()): ?>
                 <span class="cart-tax-total"
diff --git a/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml b/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
index 980f94b3ba80d..39d0bc59653d4 100644
--- a/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
@@ -26,17 +26,13 @@ $item = $block->getItem();
             </span>
 
         <?php if ($weeeHelper->getApplied($item)): ?>
-            <span class="cart-tax-info" id="unit-item-tax-details<?= (int) $item->getId() ?>">
+            <span class="cart-tax-info no-display" id="unit-item-tax-details<?= (int) $item->getId() ?>">
                 <?php foreach ($weeeHelper->getApplied($item) as $tax): ?>
                     <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
                         <?= /* @noEscape */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?>
                     </span>
                 <?php endforeach; ?>
             </span>
-            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-                'display: none',
-                'span#unit-item-tax-details' . (int) $item->getId()
-            ) ?>
 
             <?php if ($block->displayFinalPrice()): ?>
                 <span class="cart-tax-total"
@@ -62,17 +58,13 @@ $item = $block->getItem();
             </span>
 
         <?php if ($weeeHelper->getApplied($item)): ?>
-            <span class="cart-tax-info" id="eunit-item-tax-details<?= (int) $item->getId() ?>">
+            <span class="cart-tax-info no-display" id="eunit-item-tax-details<?= (int) $item->getId() ?>">
                 <?php foreach ($weeeHelper->getApplied($item) as $tax): ?>
                     <span class="weee" data-label="<?= $block->escapeHtmlAttr($tax['title']) ?>">
                         <?= /* @noEscape */ $block->formatPrice($tax['amount'], true, true) ?>
                     </span>
                 <?php endforeach; ?>
             </span>
-            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-                'display: none',
-                'span#eunit-item-tax-details' . (int) $item->getId()
-            ) ?>
             <?php if ($block->displayFinalPrice()): ?>
                 <span class="cart-tax-total"
                       data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?=(int)$item->getId()?>"}}'>

From 3da33f5c242be2ee9bc56390769e2e9c6949511e Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Sat, 16 May 2020 11:00:42 +0200
Subject: [PATCH 0282/1718] Updated composer.json files of the modules

---
 app/code/Magento/QuoteBundleOptions/composer.json       | 6 +++---
 app/code/Magento/QuoteConfigurableOptions/composer.json | 6 +++---
 app/code/Magento/QuoteDownloadableLinks/composer.json   | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/QuoteBundleOptions/composer.json b/app/code/Magento/QuoteBundleOptions/composer.json
index a26502c5a5d6c..a2651272018a8 100644
--- a/app/code/Magento/QuoteBundleOptions/composer.json
+++ b/app/code/Magento/QuoteBundleOptions/composer.json
@@ -1,12 +1,12 @@
 {
     "name": "magento/module-quote-bundle-options",
-    "description": "N/A",
-    "type": "magento2-module",
+    "description": "Magento module provides data provider for creating buy request for bundle products",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-quote": "*"
     },
+    "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/QuoteConfigurableOptions/composer.json b/app/code/Magento/QuoteConfigurableOptions/composer.json
index 1221068c3061e..51d6933d5c6d6 100644
--- a/app/code/Magento/QuoteConfigurableOptions/composer.json
+++ b/app/code/Magento/QuoteConfigurableOptions/composer.json
@@ -1,12 +1,12 @@
 {
     "name": "magento/module-quote-configurable-options",
-    "description": "N/A",
-    "type": "magento2-module",
+    "description": "Magento module provides data provider for creating buy request for configurable products",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-quote": "*"
     },
+    "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/app/code/Magento/QuoteDownloadableLinks/composer.json b/app/code/Magento/QuoteDownloadableLinks/composer.json
index dd840efb65c45..ad120dea96263 100644
--- a/app/code/Magento/QuoteDownloadableLinks/composer.json
+++ b/app/code/Magento/QuoteDownloadableLinks/composer.json
@@ -1,12 +1,12 @@
 {
     "name": "magento/module-quote-downloadable-links",
-    "description": "N/A",
-    "type": "magento2-module",
+    "description": "Magento module provides data provider for creating buy request for links of downloadable products",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-quote": "*"
     },
+    "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

From e87199eac6a845ec198d3209ca7fc6ecde0e199e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Szubert?= <bartlomiejszubert@gmail.com>
Date: Sat, 16 May 2020 23:59:41 +0200
Subject: [PATCH 0283/1718] Fix #13401 - Set sort order for stores same as for
 store views

---
 app/code/Magento/Store/Block/Switcher.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/code/Magento/Store/Block/Switcher.php b/app/code/Magento/Store/Block/Switcher.php
index df8eaa1cf85da..a924805fcba90 100644
--- a/app/code/Magento/Store/Block/Switcher.php
+++ b/app/code/Magento/Store/Block/Switcher.php
@@ -170,9 +170,15 @@ public function getGroups()
 
                 if ($store) {
                     $group->setHomeUrl($store->getHomeUrl());
+                    $group->setSortOrder($store->getSortOrder());
                     $groups[] = $group;
                 }
             }
+
+            usort($groups, static function ($itemA, $itemB) {
+                return (int)$itemA->getSortOrder() <=> (int)$itemB->getSortOrder();
+            });
+
             $this->setData('groups', $groups);
         }
         return $this->getData('groups');

From 058e2a8f8db5237d800395605fb72f7d946fd79a Mon Sep 17 00:00:00 2001
From: Chandru Rajendran <chandru.rajendran@ziffity.com>
Date: Mon, 18 May 2020 10:21:48 +0530
Subject: [PATCH 0284/1718] Multiple arguments in module:status command

---
 .../Console/Command/ModuleStatusCommand.php      | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php b/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php
index 65fc265a64ec8..f29fc979c5783 100644
--- a/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php
@@ -46,7 +46,7 @@ protected function configure()
     {
         $this->setName('module:status')
             ->setDescription('Displays status of modules')
-            ->addArgument('module', InputArgument::OPTIONAL, 'Optional module name')
+            ->addArgument('module', InputArgument::OPTIONAL | InputArgument::IS_ARRAY , 'Optional module name')
             ->addOption('enabled', null, null, 'Print only enabled modules')
             ->addOption('disabled', null, null, 'Print only disabled modules');
         parent::configure();
@@ -57,9 +57,11 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $moduleName = (string)$input->getArgument('module');
-        if ($moduleName) {
-            return $this->showSpecificModule($moduleName, $output);
+        $moduleNames = $input->getArgument('module');
+        if (!empty($moduleNames)) {
+            foreach($moduleNames as $moduleName)
+                $this->showSpecificModule($moduleName, $output);
+            return;
         }
 
         $onlyEnabled = $input->getOption('enabled');
@@ -89,17 +91,17 @@ private function showSpecificModule(string $moduleName, OutputInterface $output)
     {
         $allModules = $this->getAllModules();
         if (!in_array($moduleName, $allModules->getNames())) {
-            $output->writeln('<error>Module does not exist</error>');
+            $output->writeln($moduleName.' : <error>Module does not exist</error>');
             return Cli::RETURN_FAILURE;
         }
 
         $enabledModules = $this->getEnabledModules();
         if (in_array($moduleName, $enabledModules->getNames())) {
-            $output->writeln('<info>Module is enabled</info>');
+            $output->writeln($moduleName.' : <info>Module is enabled</info>');
             return Cli::RETURN_FAILURE;
         }
 
-        $output->writeln('<info>Module is disabled</info>');
+        $output->writeln($moduleName.' : <info> Module is disabled</info>');
         return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
 

From 2946c78819aa81558b25bc5c984cd784c8ed936c Mon Sep 17 00:00:00 2001
From: Chandru Rajendran <chandru.rajendran@ziffity.com>
Date: Mon, 18 May 2020 10:47:23 +0530
Subject: [PATCH 0285/1718] changes

---
 setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php b/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php
index f29fc979c5783..d067788a8bf6c 100644
--- a/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php
@@ -46,7 +46,7 @@ protected function configure()
     {
         $this->setName('module:status')
             ->setDescription('Displays status of modules')
-            ->addArgument('module', InputArgument::OPTIONAL | InputArgument::IS_ARRAY , 'Optional module name')
+            ->addArgument('module-names', InputArgument::OPTIONAL | InputArgument::IS_ARRAY , 'Optional module name')
             ->addOption('enabled', null, null, 'Print only enabled modules')
             ->addOption('disabled', null, null, 'Print only disabled modules');
         parent::configure();

From f53bc0f84186695c0cb38c4c8fbaa16b25fb73c7 Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Mon, 18 May 2020 10:14:34 +0300
Subject: [PATCH 0286/1718] MC-33922: Improve email templates

---
 .../Framework/Filter/VariableResolver/LegacyResolverTest.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Filter/VariableResolver/LegacyResolverTest.php b/dev/tests/integration/testsuite/Magento/Framework/Filter/VariableResolver/LegacyResolverTest.php
index 6cd211be6f14d..e663b8ccedceb 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Filter/VariableResolver/LegacyResolverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Filter/VariableResolver/LegacyResolverTest.php
@@ -117,6 +117,7 @@ public function getThing()
                 ['foo' => $dataClassStub, 'g' => ['h' => ['i' => 'abc']]],
                 'abca=123,b=321,'
             ],
+            'disallow __callParent method' => ['foo.___callParent()',['foo' => $classStub], null],
         ];
     }
 }

From daecbb410a7481d8ea0e80e8c57479e02beb93b4 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Mon, 18 May 2020 17:06:28 +0300
Subject: [PATCH 0287/1718] improve test

---
 .../Magento/Customer/Model/OptionsTest.php    | 63 ++++++++-----------
 1 file changed, 27 insertions(+), 36 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/OptionsTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/OptionsTest.php
index f77852f230b65..5deda0803fff0 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/OptionsTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/OptionsTest.php
@@ -27,13 +27,6 @@ class OptionsTest extends TestCase
     private const XML_PATH_PREFIX_SHOW = 'customer/address/prefix_show';
     private const XML_PATH_PREFIX_OPTIONS = 'customer/address/prefix_options';
 
-    private const STUB_OPTION_PREFIX_NAME = 'prefix';
-    private const STUB_OPTION_SUFFIX_NAME = 'suffix';
-    private const STUB_CONFIG_VALUES = 'v1;v2';
-    private const STUB_CONFIG_VALUES_WITH_BLANK_OPTION = ';v1;v2';
-    private const STUB_EXPECTED_VALUES_WITH_BLANK_OPTION = [' ' => ' ', 'v1' => 'v1', 'v2' => 'v2'];
-    private const STUB_EXPECTED_VALUES = ['v1' => 'v1', 'v2' => 'v2'];
-
     /**
      * @var Options
      */
@@ -62,25 +55,22 @@ protected function setUp(): void
      * @param array $showOptionConfig
      * @param array $optionValuesConfig
      * @param array $expectedOptions
-     * @param int $expectedCount
      * @return void
      */
     public function testOptions(
         string $optionType,
         array $showOptionConfig,
         array $optionValuesConfig,
-        array $expectedOptions,
-        int $expectedCount
+        array $expectedOptions
     ): void {
         $this->setConfig($showOptionConfig);
         $this->setConfig($optionValuesConfig);
 
         /** @var array $options */
-        $options = $optionType === self::STUB_OPTION_PREFIX_NAME
+        $options = $optionType === 'prefix'
             ? $this->model->getNamePrefixOptions()
             : $this->model->getNameSuffixOptions();
 
-        $this->assertCount($expectedCount, $options);
         $this->assertEquals($expectedOptions, $options);
     }
 
@@ -109,48 +99,49 @@ private function setConfig(
      */
     public function optionsDataProvider(): array
     {
+        $optionPrefixName = 'prefix';
+        $optionSuffixName = 'suffix';
+        $optionValues = 'v1;v2';
+        $optionValuesWithBlank = ';v1;v2';
+        $expectedValuesWithBlank = [' ' => ' ', 'v1' => 'v1', 'v2' => 'v2'];
+        $expectedValues = ['v1' => 'v1', 'v2' => 'v2'];
+
         return [
             'prefix_required_with_blank_option' => [
-                self::STUB_OPTION_PREFIX_NAME,
+                $optionPrefixName,
                 [self::XML_PATH_PREFIX_SHOW => Nooptreq::VALUE_REQUIRED],
-                [self::XML_PATH_PREFIX_OPTIONS => self::STUB_CONFIG_VALUES_WITH_BLANK_OPTION],
-                self::STUB_EXPECTED_VALUES_WITH_BLANK_OPTION,
-                3,
+                [self::XML_PATH_PREFIX_OPTIONS => $optionValuesWithBlank],
+                $expectedValuesWithBlank,
             ],
             'prefix_required' => [
-                self::STUB_OPTION_PREFIX_NAME,
+                $optionPrefixName,
                 [self::XML_PATH_PREFIX_SHOW => Nooptreq::VALUE_REQUIRED],
-                [self::XML_PATH_PREFIX_OPTIONS => self::STUB_CONFIG_VALUES],
-                self::STUB_EXPECTED_VALUES,
-                2,
+                [self::XML_PATH_PREFIX_OPTIONS => $optionValues],
+                $expectedValues,
             ],
             'prefix_optional' => [
-                self::STUB_OPTION_PREFIX_NAME,
+                $optionPrefixName,
                 [self::XML_PATH_PREFIX_SHOW => Nooptreq::VALUE_OPTIONAL],
-                [self::XML_PATH_PREFIX_OPTIONS => self::STUB_CONFIG_VALUES],
-                self::STUB_EXPECTED_VALUES_WITH_BLANK_OPTION,
-                3,
+                [self::XML_PATH_PREFIX_OPTIONS => $optionValues],
+                $expectedValuesWithBlank,
             ],
             'suffix_optional' => [
-                self::STUB_OPTION_SUFFIX_NAME,
+                $optionSuffixName,
                 [self::XML_PATH_SUFFIX_SHOW => Nooptreq::VALUE_OPTIONAL],
-                [self::XML_PATH_SUFFIX_OPTIONS => self::STUB_CONFIG_VALUES],
-                self::STUB_EXPECTED_VALUES_WITH_BLANK_OPTION,
-                3,
+                [self::XML_PATH_SUFFIX_OPTIONS => $optionValues],
+                $expectedValuesWithBlank,
             ],
             'suffix_optional_with_blank_option' => [
-                self::STUB_OPTION_SUFFIX_NAME,
+                $optionSuffixName,
                 [self::XML_PATH_SUFFIX_SHOW => Nooptreq::VALUE_OPTIONAL],
-                [self::XML_PATH_SUFFIX_OPTIONS => self::STUB_CONFIG_VALUES_WITH_BLANK_OPTION],
-                self::STUB_EXPECTED_VALUES_WITH_BLANK_OPTION,
-                3,
+                [self::XML_PATH_SUFFIX_OPTIONS => $optionValuesWithBlank],
+                $expectedValuesWithBlank,
             ],
             'suffix_required_with_blank_option' => [
-                self::STUB_OPTION_SUFFIX_NAME,
+                $optionSuffixName,
                 [self::XML_PATH_SUFFIX_SHOW => Nooptreq::VALUE_OPTIONAL],
-                [self::XML_PATH_SUFFIX_OPTIONS => self::STUB_CONFIG_VALUES_WITH_BLANK_OPTION],
-                self::STUB_EXPECTED_VALUES_WITH_BLANK_OPTION,
-                3,
+                [self::XML_PATH_SUFFIX_OPTIONS => $optionValuesWithBlank],
+                $expectedValuesWithBlank,
             ],
         ];
     }

From 39e26a2dd6b0420a30417f5e78bea369d9fad5f4 Mon Sep 17 00:00:00 2001
From: Chandru Rajendran <chandru.rajendran@ziffity.com>
Date: Tue, 19 May 2020 11:25:06 +0530
Subject: [PATCH 0288/1718] small fix

---
 setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php b/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php
index d067788a8bf6c..b4504efdc3423 100644
--- a/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php
@@ -57,7 +57,7 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $moduleNames = $input->getArgument('module');
+        $moduleNames = $input->getArgument('module-names');
         if (!empty($moduleNames)) {
             foreach($moduleNames as $moduleName)
                 $this->showSpecificModule($moduleName, $output);

From 87407faf05799285b2ac80e8c3e70362a0e708ce Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Tue, 19 May 2020 17:45:09 +0200
Subject: [PATCH 0289/1718] Added PHPDoc description for the class

---
 app/code/Magento/Quote/Model/Cart/Data/SelectedOption.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Quote/Model/Cart/Data/SelectedOption.php b/app/code/Magento/Quote/Model/Cart/Data/SelectedOption.php
index 8a15fb3e0dcb4..70edd93cd8ef8 100644
--- a/app/code/Magento/Quote/Model/Cart/Data/SelectedOption.php
+++ b/app/code/Magento/Quote/Model/Cart/Data/SelectedOption.php
@@ -7,6 +7,9 @@
 
 namespace Magento\Quote\Model\Cart\Data;
 
+/**
+ * DTO for quote item selected option
+ */
 class SelectedOption
 {
     /**

From 1d75c53591e415a36c30b7155eae61c9be2a5661 Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Thu, 14 May 2020 13:50:18 +0300
Subject: [PATCH 0290/1718] Small improvements

---
 .../Model/DataProvider/CustomerReviewsDataProvider.php   | 1 +
 app/code/Magento/ReviewGraphQl/composer.json             | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/ReviewGraphQl/Model/DataProvider/CustomerReviewsDataProvider.php b/app/code/Magento/ReviewGraphQl/Model/DataProvider/CustomerReviewsDataProvider.php
index f8dc5b1faead4..a1d7b4bb7d7cc 100644
--- a/app/code/Magento/ReviewGraphQl/Model/DataProvider/CustomerReviewsDataProvider.php
+++ b/app/code/Magento/ReviewGraphQl/Model/DataProvider/CustomerReviewsDataProvider.php
@@ -10,6 +10,7 @@
 use Magento\Review\Model\ResourceModel\Review\Collection as ReviewsCollection;
 use Magento\Review\Model\ResourceModel\Review\CollectionFactory as ReviewsCollectionFactory;
 use Magento\Review\Model\Review;
+
 /**
  * Provides customer reviews
  */
diff --git a/app/code/Magento/ReviewGraphQl/composer.json b/app/code/Magento/ReviewGraphQl/composer.json
index 6e8b6f0472e45..819ddefd76213 100644
--- a/app/code/Magento/ReviewGraphQl/composer.json
+++ b/app/code/Magento/ReviewGraphQl/composer.json
@@ -3,16 +3,15 @@
     "description": "N/A",
     "type": "magento2-module",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/module-catalog": "*",
         "magento/module-review": "*",
-        "magento/framework": "*",
         "magento/module-store": "*",
-        "magento/module-graph-ql": "*"
+        "magento/framework": "*"
     },
     "suggest": {
-        "magento/module-graph-ql-cache": "*",
-        "magento/module-store-graph-ql": "*"
+        "magento/module-graph-ql": "*",
+        "magento/module-graph-ql-cache": "*"
     },
     "license": [
         "OSL-3.0",

From a7fa47b4a30dbb86c90d615474e566c5535c800d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Szubert?= <bartlomiejszubert@gmail.com>
Date: Tue, 19 May 2020 23:18:06 +0200
Subject: [PATCH 0291/1718] Fix #26427 - Admin config section not expanded when
 fields are required.

---
 ...ConfigCollapseStorefrontTabActionGroup.xml | 14 ++++++
 ...inConfigExpandStorefrontTabActionGroup.xml | 14 ++++++
 .../AdminConfigFillInputFieldActionGroup.xml  | 18 ++++++++
 ...nOpenStoreConfigCatalogPageActionGroup.xml | 19 ++++++++
 .../Section/CatalogSection/CatalogSection.xml |  2 +
 ...nConfigCollapsedFieldsetValidationTest.xml | 43 +++++++++++++++++++
 .../templates/system/config/edit.phtml        | 12 ++++++
 7 files changed, 122 insertions(+)
 create mode 100644 app/code/Magento/Config/Test/Mftf/ActionGroup/AdminConfigCollapseStorefrontTabActionGroup.xml
 create mode 100644 app/code/Magento/Config/Test/Mftf/ActionGroup/AdminConfigExpandStorefrontTabActionGroup.xml
 create mode 100644 app/code/Magento/Config/Test/Mftf/ActionGroup/AdminConfigFillInputFieldActionGroup.xml
 create mode 100644 app/code/Magento/Config/Test/Mftf/ActionGroup/AdminOpenStoreConfigCatalogPageActionGroup.xml
 create mode 100644 app/code/Magento/Config/Test/Mftf/Test/AdminConfigCollapsedFieldsetValidationTest.xml

diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminConfigCollapseStorefrontTabActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminConfigCollapseStorefrontTabActionGroup.xml
new file mode 100644
index 0000000000000..1b6148f64ce4c
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminConfigCollapseStorefrontTabActionGroup.xml
@@ -0,0 +1,14 @@
+<?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="AdminConfigCollapseStorefrontTabActionGroup">
+        <conditionalClick selector="{{CatalogSection.storefront}}" dependentSelector="{{CatalogSection.CheckIfTabIsExpanded}}" visible="true" stepKey="collapseStorefrontTab"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminConfigExpandStorefrontTabActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminConfigExpandStorefrontTabActionGroup.xml
new file mode 100644
index 0000000000000..e2afb3b56cd8d
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminConfigExpandStorefrontTabActionGroup.xml
@@ -0,0 +1,14 @@
+<?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="AdminConfigExpandStorefrontTabActionGroup">
+        <conditionalClick selector="{{CatalogSection.storefront}}" dependentSelector="{{CatalogSection.CheckIfTabExpand}}" visible="true" stepKey="expandStorefrontTab"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminConfigFillInputFieldActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminConfigFillInputFieldActionGroup.xml
new file mode 100644
index 0000000000000..cce439185089a
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminConfigFillInputFieldActionGroup.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="AdminConfigFillInputFilterFieldActionGroup">
+        <arguments>
+            <argument name="selector"/>
+            <argument name="value" type="string"/>
+        </arguments>
+        <fillField selector="{{selector}}" userInput="{{value}}" stepKey="fillInputField"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminOpenStoreConfigCatalogPageActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminOpenStoreConfigCatalogPageActionGroup.xml
new file mode 100644
index 0000000000000..fe1eb1baff4c8
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/AdminOpenStoreConfigCatalogPageActionGroup.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="AdminOpenStoreConfigCatalogPageActionGroup">
+        <annotations>
+            <description>Go to admin store configuration catalog page.</description>
+        </annotations>
+
+        <amOnPage url="{{CatalogConfigPage.url}}" stepKey="openAdminStoreConfigPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Config/Test/Mftf/Section/CatalogSection/CatalogSection.xml b/app/code/Magento/Config/Test/Mftf/Section/CatalogSection/CatalogSection.xml
index 851157c5d03c0..72675414576cf 100644
--- a/app/code/Magento/Config/Test/Mftf/Section/CatalogSection/CatalogSection.xml
+++ b/app/code/Magento/Config/Test/Mftf/Section/CatalogSection/CatalogSection.xml
@@ -10,6 +10,7 @@
     <section name="CatalogSection">
         <element name="storefront" type="select" selector="#catalog_frontend-head"/>
         <element name="CheckIfTabExpand" type="button" selector="#catalog_frontend-head:not(.open)"/>
+        <element name="CheckIfTabIsExpanded" type="button" selector="#catalog_frontend-head.open"/>
         <element name="price" type="button" selector="#catalog_price-head"/>
         <element name="checkIfPriceExpand" type="button" selector="//a[@id='catalog_price-head' and @class='open']"/>
         <element name="catalogPriceScope" type="select" selector="#catalog_price_scope"/>
@@ -23,5 +24,6 @@
         <element name="CheckIfSeoTabExpand" type="button" selector="#catalog_seo-head:not(.open)"/>
         <element name="GenerateUrlRewrites" type="select" selector="#catalog_seo_generate_category_product_rewrites"/>
         <element name="successMessage" type="text" selector="#messages"/>
+        <element name="productsPerPageOnGridAllowedValues" type="input" selector="//input[@id='catalog_frontend_grid_per_page_values']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Config/Test/Mftf/Test/AdminConfigCollapsedFieldsetValidationTest.xml b/app/code/Magento/Config/Test/Mftf/Test/AdminConfigCollapsedFieldsetValidationTest.xml
new file mode 100644
index 0000000000000..bf7c8c082971a
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Test/AdminConfigCollapsedFieldsetValidationTest.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="AdminConfigCollapsedFieldsetValidationTest">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Configuration Form Validation"/>
+            <title value="Verify that form validation triggered on element inside hidden fieldset opens the fieldset in case of error"/>
+            <description value="Verify that form validation triggered on element inside hidden fieldset opens the fieldset in case of error"/>
+            <severity value="AVERAGE"/>
+            <group value="configuration"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+
+        <actionGroup ref="AdminOpenStoreConfigCatalogPageActionGroup" stepKey="navigateToConfigurationPage"/>
+        <actionGroup ref="AdminConfigExpandStorefrontTabActionGroup" stepKey="expandStorefrontTab"/>
+        <actionGroup ref="AdminUncheckUseSystemValueActionGroup" stepKey="uncheckUseSystemValue">
+            <argument name="rowId" value="row_catalog_frontend_grid_per_page_values"/>
+        </actionGroup>
+        <actionGroup ref="AdminConfigFillInputFilterFieldActionGroup" stepKey="fillInputField">
+            <argument name="selector" value="CatalogSection.productsPerPageOnGridAllowedValues"/>
+            <argument name="value" value=""/>
+        </actionGroup>
+        <actionGroup ref="AdminConfigCollapseStorefrontTabActionGroup" stepKey="collapseStorefrontTab"/>
+        <click selector="{{CatalogSection.save}}" stepKey="clickSaveConfigBtn"/>
+
+        <actionGroup ref="AssertAdminValidationErrorActionGroup" stepKey="assertValidationError">
+            <argument name="inputId" value="catalog_frontend_grid_per_page_values"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml
index 7e7a540e88b2e..ddd2fc2b2d625 100644
--- a/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml
+++ b/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml
@@ -255,6 +255,18 @@ require([
         }
     });
 
+    window.configForm.on('invalid-form.validate', function (event, validation) {
+        var firstActive = jQuery(validation.errorList[0].element || []);
+
+        if (firstActive.length) {
+            jQuery(firstActive.parents('.section-config')).each(function () {
+                if (!jQuery(this).hasClass('active')) {
+                    Fieldset.toggleCollapse(jQuery(this).children('.config.admin__collapsible-block').attr('id'));
+                }
+            })
+        }
+    })
+
     $$('.shared').each(function(element){
         Event.observe(element, 'change', adminSystemConfig.onchangeSharedElement);
 

From f999b269c3935101a23c45cf035e14ffbf32a032 Mon Sep 17 00:00:00 2001
From: Dmytro Voskoboinikov <voskoboi@adobe.com>
Date: Thu, 21 May 2020 18:30:03 -0500
Subject: [PATCH 0292/1718] MC-31733: Media gallery breaks in some filesystems

---
 .../Magento/Theme/Test/Unit/Model/Wysiwyg/StorageTest.php    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Theme/Test/Unit/Model/Wysiwyg/StorageTest.php b/app/code/Magento/Theme/Test/Unit/Model/Wysiwyg/StorageTest.php
index 691675ee82f28..8f421ac3121fb 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Wysiwyg/StorageTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Wysiwyg/StorageTest.php
@@ -588,10 +588,13 @@ public function testDeleteRootDirectory()
 
     /**
      * cover \Magento\Theme\Model\Wysiwyg\Storage::deleteDirectory
-     * @expectedException \Magento\Framework\Exception\LocalizedException
      */
     public function testDeleteRootDirectoryRelative()
     {
+        $this->expectException(
+            \Magento\Framework\Exception\LocalizedException::class
+        );
+
         $directoryPath = $this->_storageRoot;
         $fakePath = 'fake/relative/path';
 

From ac0dea54914ecab82eb17a1584d4ee38c686ce9c Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Fri, 22 May 2020 16:59:45 +0300
Subject: [PATCH 0293/1718] Corrects for Test.

---
 .../Magento/Webapi/RestSessionCookieTest.php   | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/Webapi/RestSessionCookieTest.php b/dev/tests/api-functional/testsuite/Magento/Webapi/RestSessionCookieTest.php
index e2c220164470f..36dc7a9afeba0 100644
--- a/dev/tests/api-functional/testsuite/Magento/Webapi/RestSessionCookieTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Webapi/RestSessionCookieTest.php
@@ -6,6 +6,7 @@
 
 namespace Magento\Webapi;
 
+use Magento\Framework\Module\Manager;
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
@@ -14,6 +15,21 @@
 class RestSessionCookieTest extends \Magento\TestFramework\TestCase\WebapiAbstract
 {
 
+    private $moduleManager;
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->moduleManager = $this->objectManager->get(Manager::class);
+        if ($this->moduleManager->isEnabled('Magento_B2b')) {
+            $this->markTestSkipped('Skipped, because this logic is rewritten on B2B.');
+        }
+    }
+
     /**
      * Check for non exist cookie PHPSESSID
      */
@@ -22,7 +38,7 @@ public function testRestSessionNoCookie()
         $this->_markTestAsRestOnly();
         /** @var $curlClient CurlClientWithCookies */
 
-        $curlClient = Bootstrap::getObjectManager()
+        $curlClient = $this->objectManager
             ->get(\Magento\TestFramework\TestCase\HttpClient\CurlClientWithCookies::class);
         $phpSessionCookieName =
             [

From b0de7b94712468e2adee1a013bc7fe1cf5cede63 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Fri, 22 May 2020 14:35:40 -0500
Subject: [PATCH 0294/1718] MC-33823: Merge CE, EE and B2B changes

---
 .../etc/csp_whitelist.xml                     | 18 --------------
 .../adminhtml/templates/payment/script.phtml  | 24 -------------------
 2 files changed, 42 deletions(-)
 delete mode 100644 app/code/Magento/AuthorizenetAcceptjs/etc/csp_whitelist.xml
 delete mode 100644 app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/templates/payment/script.phtml

diff --git a/app/code/Magento/AuthorizenetAcceptjs/etc/csp_whitelist.xml b/app/code/Magento/AuthorizenetAcceptjs/etc/csp_whitelist.xml
deleted file mode 100644
index df6d02387d3d7..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/etc/csp_whitelist.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp:etc/csp_whitelist.xsd">
-    <policies>
-        <policy id="script-src">
-            <values>
-                <value id="authorize_net_js" type="host">js.authorize.net</value>
-                <value id="authorize_net_jstest" type="host">jstest.authorize.net</value>
-            </values>
-        </policy>
-    </policies>
-</csp_whitelist>
diff --git a/app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/templates/payment/script.phtml b/app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/templates/payment/script.phtml
deleted file mode 100644
index 6be6008dba507..0000000000000
--- a/app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/templates/payment/script.phtml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-/** @var Magento\AuthorizenetAcceptjs\Block\Payment $block */
-?>
-<script>
-    //<![CDATA[
-    require(
-        [
-            'Magento_AuthorizenetAcceptjs/js/authorizenet',
-            'jquery',
-            'domReady!'
-        ], function(AuthorizenetAcceptjs, $) {
-            var config = <?= /* @noEscape */ $block->getPaymentConfig() ?>,
-                form = $('#payment_form_<?= /* @noEscape */ $block->escapeJs($block->escapeHtml($block->getMethodCode())) ?>');
-
-            config.active = form.length > 0 && !form.is(':hidden');
-            new AuthorizenetAcceptjs(config);
-        });
-    //]]>
-</script>

From 7ad6cdf896125193d4397614c21a1b884286181a Mon Sep 17 00:00:00 2001
From: Denys Babenko <denys.babenko@gmail.com>
Date: Fri, 22 May 2020 22:52:56 +0200
Subject: [PATCH 0295/1718] Added missing aclResource attribute to Backend
 Header AdminNotification Toolbar Block

---
 .../AdminNotification/view/adminhtml/layout/default.xml     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml b/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml
index eed6b53f34315..b71fbd40cadb7 100644
--- a/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml
+++ b/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml
@@ -20,7 +20,11 @@
                    template="Magento_AdminNotification::notification/window.phtml"/>
         </referenceContainer>
         <referenceContainer name="header">
-            <block class="Magento\AdminNotification\Block\ToolbarEntry" name="notification.messages" before="user" template="Magento_AdminNotification::toolbar_entry.phtml"/>
+            <block class="Magento\AdminNotification\Block\ToolbarEntry"
+                   name="notification.messages"
+                   before="user"
+                   aclResource="Magento_AdminNotification::show_toolbar"
+                   template="Magento_AdminNotification::toolbar_entry.phtml"/>
         </referenceContainer>
     </body>
 </page>

From 293c7d93fa755d7085bddb804f4f181483ab1f39 Mon Sep 17 00:00:00 2001
From: vinoth kumar <vinoth.kumar@ziffity.com>
Date: Sat, 23 May 2020 21:21:52 +0530
Subject: [PATCH 0296/1718] Replaced deprecated function addError

---
 .../Customer/Observer/AfterAddressSaveObserver.php |  4 ++--
 .../Unit/Observer/AfterAddressSaveObserverTest.php |  4 ++--
 .../Adminhtml/Downloadable/Product/Edit/Link.php   |  2 +-
 .../Adminhtml/Downloadable/Product/Edit/Sample.php |  2 +-
 .../Downloadable/Controller/Download/Link.php      |  4 ++--
 .../Controller/Download/LinkSample.php             |  2 +-
 .../Downloadable/Controller/Download/Sample.php    |  2 +-
 .../Unit/Controller/Download/LinkSampleTest.php    |  4 ++--
 .../Test/Unit/Controller/Download/LinkTest.php     |  4 ++--
 .../Test/Unit/Controller/Download/SampleTest.php   |  4 ++--
 .../Controller/Adminhtml/Export/Export.php         |  4 ++--
 .../Controller/Adminhtml/Export/GetFilter.php      |  4 ++--
 .../Controller/Adminhtml/Import/Download.php       |  2 +-
 .../Controller/Adminhtml/Import/Validate.php       |  2 +-
 .../Controller/Adminhtml/Import/ValidateTest.php   |  2 +-
 .../Controller/Adminhtml/Indexer/MassChangelog.php |  4 ++--
 .../Adminhtml/Indexer/MassInvalidate.php           |  4 ++--
 .../Controller/Adminhtml/Indexer/MassOnTheFly.php  |  4 ++--
 .../Adminhtml/Indexer/MassChangelogTest.php        |  6 +++---
 .../Adminhtml/Indexer/MassInvalidateTest.php       |  6 +++---
 .../Adminhtml/Indexer/MassOnTheFlyTest.php         |  6 +++---
 .../Controller/Adminhtml/Integration/Delete.php    |  8 ++++----
 .../Controller/Adminhtml/Integration/Edit.php      |  6 +++---
 .../Adminhtml/Integration/PermissionsDialog.php    |  6 +++---
 .../Controller/Adminhtml/Integration/Save.php      | 14 +++++++-------
 .../Adminhtml/Integration/TokensDialog.php         |  4 ++--
 .../Adminhtml/Integration/TokensExchange.php       |  4 ++--
 .../Adminhtml/Integration/DeleteTest.php           |  8 ++++----
 .../Controller/Adminhtml/Integration/EditTest.php  |  6 +++---
 .../Controller/Adminhtml/Integration/SaveTest.php  | 10 +++++-----
 .../Magento/Multishipping/Controller/Checkout.php  |  4 ++--
 .../Controller/Checkout/AddressesPost.php          |  2 +-
 .../Multishipping/Controller/Checkout/Overview.php |  2 +-
 .../Controller/Checkout/OverviewPost.php           | 10 +++++-----
 .../Controller/Checkout/ShippingPost.php           |  2 +-
 .../Model/Observer/CheckConfig.php                 |  2 +-
 .../Test/Unit/Model/Observer/CheckConfigTest.php   |  2 +-
 .../Newsletter/Controller/Adminhtml/Queue/Save.php |  2 +-
 .../Controller/Adminhtml/Subscriber/MassDelete.php |  4 ++--
 .../Adminhtml/Subscriber/MassUnsubscribe.php       |  4 ++--
 .../Controller/Adminhtml/Template/Delete.php       |  2 +-
 .../Controller/Adminhtml/Template/Save.php         |  2 +-
 .../Magento/Newsletter/Controller/Manage/Save.php  |  4 ++--
 .../Test/Unit/Controller/Manage/SaveTest.php       |  6 +++---
 44 files changed, 95 insertions(+), 95 deletions(-)

diff --git a/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php b/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php
index 41311abee5da8..dfcfb8c7008f8 100644
--- a/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php
+++ b/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php
@@ -280,7 +280,7 @@ protected function addInvalidMessage($customerAddress)
             $message[] = (string)__('You will be charged tax.');
         }
 
-        $this->messageManager->addError(implode(' ', $message));
+        $this->messageManager->addErrorMessage(implode(' ', $message));
 
         return $this;
     }
@@ -307,7 +307,7 @@ protected function addErrorMessage($customerAddress)
         $email = $this->scopeConfig->getValue('trans_email/ident_support/email', ScopeInterface::SCOPE_STORE);
         $message[] = (string)__('If you believe this is an error, please contact us at %1', $email);
 
-        $this->messageManager->addError(implode(' ', $message));
+        $this->messageManager->addErrorMessage(implode(' ', $message));
 
         return $this;
     }
diff --git a/app/code/Magento/Customer/Test/Unit/Observer/AfterAddressSaveObserverTest.php b/app/code/Magento/Customer/Test/Unit/Observer/AfterAddressSaveObserverTest.php
index 7232317af8ade..e804dfb485491 100644
--- a/app/code/Magento/Customer/Test/Unit/Observer/AfterAddressSaveObserverTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Observer/AfterAddressSaveObserverTest.php
@@ -595,7 +595,7 @@ public function testAfterAddressSaveNewGroup(
                 ->with($vatId)
                 ->willReturn($vatId);
             $this->messageManager->expects($this->once())
-                ->method('addError')
+                ->method('addErrorMessage')
                 ->with($resultInvalidMessage)
                 ->willReturnSelf();
         }
@@ -605,7 +605,7 @@ public function testAfterAddressSaveNewGroup(
                 ->with('trans_email/ident_support/email', ScopeInterface::SCOPE_STORE)
                 ->willReturn('admin@example.com');
             $this->messageManager->expects($this->once())
-                ->method('addError')
+                ->method('addErrorMessage')
                 ->with($resultErrorMessage)
                 ->willReturnSelf();
         }
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Link.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Link.php
index 8d5f64e02be47..b30bea1fc77b4 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Link.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Link.php
@@ -125,7 +125,7 @@ public function execute()
             try {
                 $this->_processDownload($resource, $resourceType);
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError(__('Something went wrong while getting the requested content.'));
+                $this->messageManager->addErrorMessage(__('Something went wrong while getting the requested content.'));
             }
         }
     }
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Sample.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Sample.php
index 2e115e1ce18d3..2bd5d3981a749 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Sample.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Sample.php
@@ -54,7 +54,7 @@ public function execute()
             try {
                 $this->_processDownload($resource, $resourceType);
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError(__('Something went wrong while getting the requested content.'));
+                $this->messageManager->addErrorMessage(__('Something went wrong while getting the requested content.'));
             }
         }
     }
diff --git a/app/code/Magento/Downloadable/Controller/Download/Link.php b/app/code/Magento/Downloadable/Controller/Download/Link.php
index 4766f1699afb6..2b131806fa022 100644
--- a/app/code/Magento/Downloadable/Controller/Download/Link.php
+++ b/app/code/Magento/Downloadable/Controller/Download/Link.php
@@ -125,7 +125,7 @@ public function execute()
                 // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
                 exit(0);
             } catch (\Exception $e) {
-                $this->messageManager->addError(__('Something went wrong while getting the requested content.'));
+                $this->messageManager->addErrorMessage(__('Something went wrong while getting the requested content.'));
             }
         } elseif ($status == PurchasedLink::LINK_STATUS_EXPIRED) {
             $this->messageManager->addNotice(__('The link has expired.'));
@@ -133,7 +133,7 @@ public function execute()
         ) {
             $this->messageManager->addNotice(__('The link is not available.'));
         } else {
-            $this->messageManager->addError(__('Something went wrong while getting the requested content.'));
+            $this->messageManager->addErrorMessage(__('Something went wrong while getting the requested content.'));
         }
         return $this->_redirect('*/customer/products');
     }
diff --git a/app/code/Magento/Downloadable/Controller/Download/LinkSample.php b/app/code/Magento/Downloadable/Controller/Download/LinkSample.php
index c0bc825a8285b..3519525e3f8b4 100644
--- a/app/code/Magento/Downloadable/Controller/Download/LinkSample.php
+++ b/app/code/Magento/Downloadable/Controller/Download/LinkSample.php
@@ -66,7 +66,7 @@ public function execute()
                 // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
                 exit(0);
             } catch (\Exception $e) {
-                $this->messageManager->addError(
+                $this->messageManager->addErrorMessage(
                     __('Sorry, there was an error getting requested content. Please contact the store owner.')
                 );
             }
diff --git a/app/code/Magento/Downloadable/Controller/Download/Sample.php b/app/code/Magento/Downloadable/Controller/Download/Sample.php
index b95ec510fdd9b..360a7db03e6f9 100644
--- a/app/code/Magento/Downloadable/Controller/Download/Sample.php
+++ b/app/code/Magento/Downloadable/Controller/Download/Sample.php
@@ -63,7 +63,7 @@ public function execute()
                 // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
                 exit(0);
             } catch (\Exception $e) {
-                $this->messageManager->addError(
+                $this->messageManager->addErrorMessage(
                     __('Sorry, there was an error getting requested content. Please contact the store owner.')
                 );
             }
diff --git a/app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkSampleTest.php b/app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkSampleTest.php
index 725c06004f117..91cb692d854d6 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkSampleTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkSampleTest.php
@@ -173,7 +173,7 @@ public function testExecuteLinkTypeUrl()
         $this->response->expects($this->any())->method('setHeader')->willReturnSelf();
         $this->downloadHelper->expects($this->once())->method('output')->willThrowException(new \Exception());
         $this->messageManager->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('Sorry, there was an error getting requested content. Please contact the store owner.')
             ->willReturnSelf();
         $this->redirect->expects($this->once())->method('getRedirectUrl')->willReturn('redirect_url');
@@ -226,7 +226,7 @@ public function testExecuteLinkTypeFile()
         $this->response->expects($this->any())->method('setHeader')->willReturnSelf();
         $this->downloadHelper->expects($this->once())->method('output')->willThrowException(new \Exception());
         $this->messageManager->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('Sorry, there was an error getting requested content. Please contact the store owner.')
             ->willReturnSelf();
         $this->redirect->expects($this->once())->method('getRedirectUrl')->willReturn('redirect_url');
diff --git a/app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkTest.php b/app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkTest.php
index b7483f3658d69..f9e464a3948f1 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Controller/Download/LinkTest.php
@@ -327,7 +327,7 @@ public function testExceptionInUpdateLinkStatus($mimeType, $disposition)
         $this->linkPurchasedItem->expects($this->any())->method('setStatus')->with('expired')->willReturnSelf();
         $this->linkPurchasedItem->expects($this->any())->method('save')->willThrowException(new \Exception());
         $this->messageManager->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('Something went wrong while getting the requested content.')
             ->willReturnSelf();
         $this->redirect->expects($this->once())->method('redirect')->with($this->response, '*/customer/products', []);
@@ -494,7 +494,7 @@ public function linkNotAvailableDataProvider()
             ['addNotice', 'expired', 'The link has expired.'],
             ['addNotice', 'pending', 'The link is not available.'],
             ['addNotice', 'payment_review', 'The link is not available.'],
-            ['addError', 'wrong_status', 'Something went wrong while getting the requested content.']
+            ['addErrorMessage', 'wrong_status', 'Something went wrong while getting the requested content.']
         ];
     }
 
diff --git a/app/code/Magento/Downloadable/Test/Unit/Controller/Download/SampleTest.php b/app/code/Magento/Downloadable/Test/Unit/Controller/Download/SampleTest.php
index 6dcd09a91dd2e..4cd37819d6263 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Controller/Download/SampleTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Controller/Download/SampleTest.php
@@ -172,7 +172,7 @@ public function testExecuteSampleWithUrlType()
         $this->response->expects($this->any())->method('setHeader')->willReturnSelf();
         $this->downloadHelper->expects($this->once())->method('output')->willThrowException(new \Exception());
         $this->messageManager->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('Sorry, there was an error getting requested content. Please contact the store owner.')
             ->willReturnSelf();
         $this->redirect->expects($this->once())->method('getRedirectUrl')->willReturn('redirect_url');
@@ -221,7 +221,7 @@ public function testExecuteSampleWithFileType()
         $this->response->expects($this->any())->method('setHeader')->willReturnSelf();
         $this->downloadHelper->expects($this->once())->method('output')->willThrowException(new \Exception());
         $this->messageManager->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('Sorry, there was an error getting requested content. Please contact the store owner.')
             ->willReturnSelf();
         $this->redirect->expects($this->once())->method('getRedirectUrl')->willReturn('redirect_url');
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php
index dff6560ebf768..43cc467ad390b 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php
@@ -99,10 +99,10 @@ public function execute()
                 );
             } catch (\Exception $e) {
                 $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
-                $this->messageManager->addError(__('Please correct the data sent value.'));
+                $this->messageManager->addErrorMessage(__('Please correct the data sent value.'));
             }
         } else {
-            $this->messageManager->addError(__('Please correct the data sent value.'));
+            $this->messageManager->addErrorMessage(__('Please correct the data sent value.'));
         }
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php
index 722d32c9eb21a..789df5dbc466f 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Export/GetFilter.php
@@ -35,10 +35,10 @@ public function execute()
                 );
                 return $resultLayout;
             } catch (\Exception $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             }
         } else {
-            $this->messageManager->addError(__('Please correct the data sent value.'));
+            $this->messageManager->addErrorMessage(__('Please correct the data sent value.'));
         }
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php
index 7c119e1dd683d..241c377860d75 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php
@@ -89,7 +89,7 @@ public function execute()
         try {
             $fileContents = $this->sampleFileProvider->getFileContents($entityName);
         } catch (NoSuchEntityException $e) {
-            $this->messageManager->addError(__('There is no sample file for this entity.'));
+            $this->messageManager->addErrorMessage(__('There is no sample file for this entity.'));
 
             return $this->getResultRedirect();
         }
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php
index c18e666260898..c27a5599a0a62 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php
@@ -59,7 +59,7 @@ public function execute()
             $resultBlock->addError(__('The file was not uploaded.'));
             return $resultLayout;
         }
-        $this->messageManager->addError(__('Sorry, but the data is invalid or the file is not uploaded.'));
+        $this->messageManager->addErrorMessage(__('Sorry, but the data is invalid or the file is not uploaded.'));
         /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         $resultRedirect->setPath('adminhtml/*/index');
diff --git a/app/code/Magento/ImportExport/Test/Unit/Controller/Adminhtml/Import/ValidateTest.php b/app/code/Magento/ImportExport/Test/Unit/Controller/Adminhtml/Import/ValidateTest.php
index 06c89a3e9e543..e54b1e470b54d 100644
--- a/app/code/Magento/ImportExport/Test/Unit/Controller/Adminhtml/Import/ValidateTest.php
+++ b/app/code/Magento/ImportExport/Test/Unit/Controller/Adminhtml/Import/ValidateTest.php
@@ -164,7 +164,7 @@ public function testNoDataWasPosted()
             ]);
 
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with(__('Sorry, but the data is invalid or the file is not uploaded.'));
 
         $this->assertEquals($resultRedirectMock, $this->validate->execute());
diff --git a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php
index 6934284c8e65e..8909fa999528a 100644
--- a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php
+++ b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassChangelog.php
@@ -22,7 +22,7 @@ public function execute()
     {
         $indexerIds = $this->getRequest()->getParam('indexer_ids');
         if (!is_array($indexerIds)) {
-            $this->messageManager->addError(__('Please select indexers.'));
+            $this->messageManager->addErrorMessage(__('Please select indexers.'));
         } else {
             try {
                 foreach ($indexerIds as $indexerId) {
@@ -36,7 +36,7 @@ public function execute()
                     __('%1 indexer(s) are in "Update by Schedule" mode.', count($indexerIds))
                 );
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
                 $this->messageManager->addException(
                     $e,
diff --git a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassInvalidate.php b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassInvalidate.php
index 0cc203a547b3a..2fec3aac698b6 100644
--- a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassInvalidate.php
+++ b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassInvalidate.php
@@ -40,7 +40,7 @@ public function execute()
     {
         $indexerIds = $this->getRequest()->getParam('indexer_ids');
         if (!is_array($indexerIds)) {
-            $this->messageManager->addError(__('Please select indexers.'));
+            $this->messageManager->addErrorMessage(__('Please select indexers.'));
         } else {
             try {
                 foreach ($indexerIds as $indexerId) {
@@ -52,7 +52,7 @@ public function execute()
                     __('%1 indexer(s) were invalidated.', count($indexerIds))
                 );
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
                 $this->messageManager->addException(
                     $e,
diff --git a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php
index 21fa7a61c621f..f8c3c58f5413b 100644
--- a/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php
+++ b/app/code/Magento/Indexer/Controller/Adminhtml/Indexer/MassOnTheFly.php
@@ -22,7 +22,7 @@ public function execute()
     {
         $indexerIds = $this->getRequest()->getParam('indexer_ids');
         if (!is_array($indexerIds)) {
-            $this->messageManager->addError(__('Please select indexers.'));
+            $this->messageManager->addErrorMessage(__('Please select indexers.'));
         } else {
             try {
                 foreach ($indexerIds as $indexerId) {
@@ -36,7 +36,7 @@ public function execute()
                     __('%1 indexer(s) are in "Update on Save" mode.', count($indexerIds))
                 );
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
                 $this->messageManager->addException(
                     $e,
diff --git a/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassChangelogTest.php b/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassChangelogTest.php
index 329e392ea1a8d..a5fc5e7bf68d1 100644
--- a/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassChangelogTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassChangelogTest.php
@@ -171,7 +171,7 @@ protected function setUp(): void
         $this->title = $this->createMock(Title::class);
         $this->messageManager = $this->getMockForAbstractClass(
             ManagerInterface::class,
-            ['addError', 'addSuccess'],
+            ['addErrorMessage', 'addSuccess'],
             '',
             false
         );
@@ -206,7 +206,7 @@ public function testExecute($indexerIds, $exception, $expectsExceptionValues)
 
         if (!is_array($indexerIds)) {
             $this->messageManager->expects($this->once())
-                ->method('addError')->with(__('Please select indexers.'))
+                ->method('addErrorMessage')->with(__('Please select indexers.'))
                 ->willReturn(1);
         } else {
             $this->objectManager->expects($this->any())
@@ -235,7 +235,7 @@ public function testExecute($indexerIds, $exception, $expectsExceptionValues)
             if ($exception !== null) {
                 $this->messageManager
                     ->expects($this->exactly($expectsExceptionValues[2]))
-                    ->method('addError')
+                    ->method('addErrorMessage')
                     ->with($exception->getMessage());
                 $this->messageManager->expects($this->exactly($expectsExceptionValues[1]))
                     ->method('addException')
diff --git a/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassInvalidateTest.php b/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassInvalidateTest.php
index 9c43b8a84d1ba..a49b128681bbc 100644
--- a/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassInvalidateTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassInvalidateTest.php
@@ -196,7 +196,7 @@ protected function setUp(): void
         $this->title = $this->createMock(Title::class);
         $this->messageManager = $this->getMockForAbstractClass(
             ManagerInterface::class,
-            ['addError', 'addSuccess'],
+            ['addErrorMessage', 'addSuccess'],
             '',
             false
         );
@@ -233,7 +233,7 @@ public function testExecute($indexerIds, $exception)
 
         if (!is_array($indexerIds)) {
             $this->messageManager->expects($this->once())
-                ->method('addError')->with(__('Please select indexers.'))
+                ->method('addErrorMessage')->with(__('Please select indexers.'))
                 ->willReturn(1);
         } else {
             $indexerInterface = $this->getMockForAbstractClass(
@@ -261,7 +261,7 @@ public function testExecute($indexerIds, $exception)
 
                 if ($exception instanceof LocalizedException) {
                     $this->messageManager->expects($this->once())
-                        ->method('addError')
+                        ->method('addErrorMessage')
                         ->with($exception->getMessage());
                 } else {
                     $this->messageManager->expects($this->once())
diff --git a/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassOnTheFlyTest.php b/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassOnTheFlyTest.php
index 727f5965f9fe4..649db0282d12d 100644
--- a/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassOnTheFlyTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Controller/Adminhtml/Indexer/MassOnTheFlyTest.php
@@ -171,7 +171,7 @@ protected function setUp(): void
         $this->title = $this->createMock(Title::class);
         $this->messageManager = $this->getMockForAbstractClass(
             ManagerInterface::class,
-            ['addError', 'addSuccess'],
+            ['addErrorMessage', 'addSuccess'],
             '',
             false
         );
@@ -206,7 +206,7 @@ public function testExecute($indexerIds, $exception, $expectsExceptionValues)
 
         if (!is_array($indexerIds)) {
             $this->messageManager->expects($this->once())
-                ->method('addError')->with(__('Please select indexers.'))
+                ->method('addErrorMessage')->with(__('Please select indexers.'))
                 ->willReturn(1);
         } else {
             $this->objectManager->expects($this->any())
@@ -234,7 +234,7 @@ public function testExecute($indexerIds, $exception, $expectsExceptionValues)
 
             if ($exception !== null) {
                 $this->messageManager->expects($this->exactly($expectsExceptionValues[2]))
-                    ->method('addError')
+                    ->method('addErrorMessage')
                     ->with($exception->getMessage());
                 $this->messageManager->expects($this->exactly($expectsExceptionValues[1]))
                     ->method('addException')
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php
index 4ce462bb44c89..1e4f58d0b1250 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Delete.php
@@ -27,7 +27,7 @@ public function execute()
             if ($integrationId) {
                 $integrationData = $this->_integrationService->get($integrationId);
                 if ($this->_integrationData->isConfigType($integrationData)) {
-                    $this->messageManager->addError(
+                    $this->messageManager->addErrorMessage(
                         __(
                             "Uninstall the extension to remove integration '%1'.",
                             $this->escaper->escapeHtml($integrationData[Info::DATA_NAME])
@@ -37,7 +37,7 @@ public function execute()
                 }
                 $integrationData = $this->_integrationService->delete($integrationId);
                 if (!$integrationData[Info::DATA_ID]) {
-                    $this->messageManager->addError(__('This integration no longer exists.'));
+                    $this->messageManager->addErrorMessage(__('This integration no longer exists.'));
                 } else {
                     //Integration deleted successfully, now safe to delete the associated consumer data
                     if (isset($integrationData[Info::DATA_CONSUMER_ID])) {
@@ -52,10 +52,10 @@ public function execute()
                     );
                 }
             } else {
-                $this->messageManager->addError(__('Integration ID is not specified or is invalid.'));
+                $this->messageManager->addErrorMessage(__('Integration ID is not specified or is invalid.'));
             }
         } catch (IntegrationException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
             $this->_logger->critical($e);
         }
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php
index 599b6017059e1..25b23065f308e 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Edit.php
@@ -27,12 +27,12 @@ public function execute()
                 $integrationData = $this->_integrationService->get($integrationId)->getData();
                 $originalName = $this->escaper->escapeHtml($integrationData[Info::DATA_NAME]);
             } catch (IntegrationException $e) {
-                $this->messageManager->addError($this->escaper->escapeHtml($e->getMessage()));
+                $this->messageManager->addErrorMessage($this->escaper->escapeHtml($e->getMessage()));
                 $this->_redirect('*/*/');
                 return;
             } catch (\Exception $e) {
                 $this->_logger->critical($e);
-                $this->messageManager->addError(__('Internal error. Check exception log for details.'));
+                $this->messageManager->addErrorMessage(__('Internal error. Check exception log for details.'));
                 $this->_redirect('*/*');
                 return;
             }
@@ -41,7 +41,7 @@ public function execute()
                 $integrationData = array_merge($integrationData, $restoredIntegration);
             }
         } else {
-            $this->messageManager->addError(__('Integration ID is not specified or is invalid.'));
+            $this->messageManager->addErrorMessage(__('Integration ID is not specified or is invalid.'));
             $this->_redirect('*/*/');
             return;
         }
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialog.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialog.php
index 8b2a94da01d70..e418fa9de1d97 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialog.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/PermissionsDialog.php
@@ -24,17 +24,17 @@ public function execute()
                 $integrationData = $this->_integrationService->get($integrationId)->getData();
                 $this->_registry->register(self::REGISTRY_KEY_CURRENT_INTEGRATION, $integrationData);
             } catch (IntegrationException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
                 $this->_redirect('*/*/');
                 return;
             } catch (\Exception $e) {
                 $this->_logger->critical($e);
-                $this->messageManager->addError(__('Internal error. Check exception log for details.'));
+                $this->messageManager->addErrorMessage(__('Internal error. Check exception log for details.'));
                 $this->_redirect('*/*');
                 return;
             }
         } else {
-            $this->messageManager->addError(__('Integration ID is not specified or is invalid.'));
+            $this->messageManager->addErrorMessage(__('Integration ID is not specified or is invalid.'));
             $this->_redirect('*/*/');
             return;
         }
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php
index 8bcbb45653494..f34924f92d4e7 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/Save.php
@@ -69,19 +69,19 @@ public function execute()
             );
             $this->_redirect('*');
         } catch (\Magento\Framework\Exception\AuthenticationException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
             $this->_getSession()->setIntegrationData($this->getRequest()->getPostValue());
             $this->_redirectOnSaveError();
         } catch (IntegrationException $e) {
-            $this->messageManager->addError($this->escaper->escapeHtml($e->getMessage()));
+            $this->messageManager->addErrorMessage($this->escaper->escapeHtml($e->getMessage()));
             $this->_getSession()->setIntegrationData($integrationData);
             $this->_redirectOnSaveError();
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($this->escaper->escapeHtml($e->getMessage()));
+            $this->messageManager->addErrorMessage($this->escaper->escapeHtml($e->getMessage()));
             $this->_redirectOnSaveError();
         } catch (\Exception $e) {
             $this->_logger->critical($e);
-            $this->messageManager->addError($this->escaper->escapeHtml($e->getMessage()));
+            $this->messageManager->addErrorMessage($this->escaper->escapeHtml($e->getMessage()));
             $this->_redirectOnSaveError();
         }
     }
@@ -115,12 +115,12 @@ protected function getIntegration($integrationId)
         try {
             $integrationData = $this->_integrationService->get($integrationId)->getData();
         } catch (IntegrationException $e) {
-            $this->messageManager->addError($this->escaper->escapeHtml($e->getMessage()));
+            $this->messageManager->addErrorMessage($this->escaper->escapeHtml($e->getMessage()));
             $this->_redirect('*/*/');
             return null;
         } catch (\Exception $e) {
             $this->_logger->critical($e);
-            $this->messageManager->addError(__('Internal error. Check exception log for details.'));
+            $this->messageManager->addErrorMessage(__('Internal error. Check exception log for details.'));
             $this->_redirect('*/*');
             return null;
         }
@@ -180,7 +180,7 @@ private function processData($integrationData)
                 );
             }
         } else {
-            $this->messageManager->addError(__('The integration was not saved.'));
+            $this->messageManager->addErrorMessage(__('The integration was not saved.'));
         }
     }
 }
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensDialog.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensDialog.php
index 4c99dafb1d997..f4ebad4954946 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensDialog.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensDialog.php
@@ -51,12 +51,12 @@ public function execute()
                 $this->_integrationService->get($integrationId)->getData()
             );
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
             $this->_redirect('*/*');
             return;
         } catch (\Exception $e) {
             $this->_logger->critical($e);
-            $this->messageManager->addError(__('Internal error. Check exception log for details.'));
+            $this->messageManager->addErrorMessage(__('Internal error. Check exception log for details.'));
             $this->_redirect('*/*');
             return;
         }
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensExchange.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensExchange.php
index a49561dd95ade..c17fac07cfc3e 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensExchange.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensExchange.php
@@ -72,12 +72,12 @@ public function execute()
             ];
             $this->getResponse()->representJson($this->jsonHelper->jsonEncode($result));
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
             $this->_redirect('*/*');
             return;
         } catch (\Exception $e) {
             $this->_logger->critical($e);
-            $this->messageManager->addError(__('Internal error. Check exception log for details.'));
+            $this->messageManager->addErrorMessage(__('Internal error. Check exception log for details.'));
             $this->_redirect('*/*');
             return;
         }
diff --git a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/DeleteTest.php b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/DeleteTest.php
index aa1393be6534c..074c6ff2c2ae2 100644
--- a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/DeleteTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/DeleteTest.php
@@ -120,7 +120,7 @@ public function testDeleteActionConfigSetUp()
             ->willReturn(true);
         // verify error message
         $this->_messageManager->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with(__('Uninstall the extension to remove integration \'%1\'.', $intData[Info::DATA_NAME]));
         $this->_integrationSvcMock->expects($this->never())->method('delete');
         // Use real translate model
@@ -143,7 +143,7 @@ public function testDeleteActionMissingId()
         $this->_translateModelMock = null;
         // verify error message
         $this->_messageManager->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with(__('Integration ID is not specified or is invalid.'));
 
         $this->integrationController->execute();
@@ -166,7 +166,7 @@ public function testDeleteActionForServiceIntegrationException()
         $this->_integrationSvcMock->expects($this->once())
             ->method('delete')
             ->willThrowException($invalidIdException);
-        $this->_messageManager->expects($this->once())->method('addError');
+        $this->_messageManager->expects($this->once())->method('addErrorMessage');
 
         $this->integrationController->execute();
     }
@@ -188,7 +188,7 @@ public function testDeleteActionForServiceGenericException()
         $this->_integrationSvcMock->expects($this->once())
             ->method('delete')
             ->willThrowException($invalidIdException);
-        $this->_messageManager->expects($this->never())->method('addError');
+        $this->_messageManager->expects($this->never())->method('addErrorMessage');
 
         $this->integrationController->execute();
     }
diff --git a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/EditTest.php b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/EditTest.php
index 5cfa8b290b6b9..a9dc8ec616674 100644
--- a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/EditTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/EditTest.php
@@ -62,7 +62,7 @@ public function testEditActionNonExistentIntegration()
     {
         $exceptionMessage = 'This integration no longer exists.';
         // verify the error
-        $this->_messageManager->expects($this->once())->method('addError')->with($exceptionMessage);
+        $this->_messageManager->expects($this->once())->method('addErrorMessage')->with($exceptionMessage);
         $this->_requestMock->expects($this->any())->method('getParam')->willReturn(self::INTEGRATION_ID);
         // put data in session, the magic function getFormData is called so, must match __call method name
         $this->_backendSessionMock->expects(
@@ -93,7 +93,7 @@ public function testEditActionNoDataAdd()
     {
         $exceptionMessage = 'Integration ID is not specified or is invalid.';
         // verify the error
-        $this->_messageManager->expects($this->once())->method('addError')->with($exceptionMessage);
+        $this->_messageManager->expects($this->once())->method('addErrorMessage')->with($exceptionMessage);
         $this->_verifyLoadAndRenderLayout();
         $integrationContr = $this->_createIntegrationController('Edit');
         $integrationContr->execute();
@@ -103,7 +103,7 @@ public function testEditException()
     {
         $exceptionMessage = 'Integration ID is not specified or is invalid.';
         // verify the error
-        $this->_messageManager->expects($this->once())->method('addError')->with($exceptionMessage);
+        $this->_messageManager->expects($this->once())->method('addErrorMessage')->with($exceptionMessage);
         $this->_controller = $this->_createIntegrationController('Edit');
         $this->_controller->execute();
     }
diff --git a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/SaveTest.php b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/SaveTest.php
index 8de8b45833043..7ccf240287b79 100644
--- a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/SaveTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/SaveTest.php
@@ -62,7 +62,7 @@ public function testSaveActionException()
             ->with(self::INTEGRATION_ID)
             ->willThrowException(new LocalizedException(__($exceptionMessage)));
         // Verify error
-        $this->_messageManager->expects($this->once())->method('addError')->with($exceptionMessage);
+        $this->_messageManager->expects($this->once())->method('addErrorMessage')->with($exceptionMessage);
         $integrationContr = $this->_createIntegrationController('Save');
         $integrationContr->execute();
     }
@@ -87,7 +87,7 @@ public function testSaveActionIntegrationException()
             ->method('escapeHtml')
             ->willReturnArgument(0);
         // Verify error
-        $this->_messageManager->expects($this->once())->method('addError')->with($exceptionMessage);
+        $this->_messageManager->expects($this->once())->method('addErrorMessage')->with($exceptionMessage);
         $integrationContr = $this->_createIntegrationController('Save');
         $integrationContr->execute();
     }
@@ -180,7 +180,7 @@ public function testSaveActionExceptionDuringServiceCreation()
         // Use real translate model
         $this->_translateModelMock = null;
         // Verify success message
-        $this->_messageManager->expects($this->once())->method('addError')->with($exceptionMessage);
+        $this->_messageManager->expects($this->once())->method('addErrorMessage')->with($exceptionMessage);
         $integrationController = $this->_createIntegrationController('Save');
         $integrationController->execute();
     }
@@ -211,7 +211,7 @@ public function testSaveActionExceptionOnIntegrationsCreatedFromConfigFile()
             ->willReturnArgument(0);
 
         // Verify error
-        $this->_messageManager->expects($this->once())->method('addError')->with($exceptionMessage);
+        $this->_messageManager->expects($this->once())->method('addErrorMessage')->with($exceptionMessage);
         $integrationContr = $this->_createIntegrationController('Save');
         $integrationContr->execute();
     }
@@ -283,7 +283,7 @@ public function testSaveActionAuthenticationException()
             ->willThrowException(new AuthenticationException(__($exceptionMessage)));
 
         // Verify error
-        $this->_messageManager->expects($this->once())->method('addError')->with($exceptionMessage);
+        $this->_messageManager->expects($this->once())->method('addErrorMessage')->with($exceptionMessage);
         $integrationContr = $this->_createIntegrationController('Save');
         $integrationContr->execute();
     }
diff --git a/app/code/Magento/Multishipping/Controller/Checkout.php b/app/code/Magento/Multishipping/Controller/Checkout.php
index 92417c7cb3a18..985a7963ecb4e 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout.php
@@ -125,7 +125,7 @@ public function dispatch(RequestInterface $request)
                 \Magento\Multishipping\Helper\Data::class
             )->isMultishippingCheckoutAvailable()) {
                 $error = $this->_getCheckout()->getMinimumAmountError();
-                $this->messageManager->addError($error);
+                $this->messageManager->addErrorMessage($error);
                 $this->getResponse()->setRedirect($this->_getHelper()->getCartUrl());
                 $this->_actionFlag->set('', self::FLAG_NO_DISPATCH, true);
                 return parent::dispatch($request);
@@ -180,7 +180,7 @@ protected function _validateMinimumAmount()
     {
         if (!$this->_getCheckout()->validateMinimumAmount()) {
             $error = $this->_getCheckout()->getMinimumAmountError();
-            $this->messageManager->addError($error);
+            $this->messageManager->addErrorMessage($error);
             $this->_forward('backToAddresses');
             return false;
         }
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/AddressesPost.php b/app/code/Magento/Multishipping/Controller/Checkout/AddressesPost.php
index 060a1bdd5ac4e..785f20150e7d8 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/AddressesPost.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/AddressesPost.php
@@ -36,7 +36,7 @@ public function execute()
                 $this->_getCheckout()->setShippingItemsInformation($shipToInfo);
             }
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
             $this->_redirect('*/*/addresses');
         } catch (\Exception $e) {
             $this->messageManager->addException($e, __('Data saving problem'));
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Overview.php b/app/code/Magento/Multishipping/Controller/Checkout/Overview.php
index d97226a393c25..1f2c5bdfaee20 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Overview.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Overview.php
@@ -42,7 +42,7 @@ public function execute()
             $this->_view->loadLayout();
             $this->_view->renderLayout();
         } catch (LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
             $this->_redirect('*/*/billing');
         } catch (\Exception $e) {
             $this->_objectManager->get(LoggerInterface::class)->critical($e);
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php b/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
index f05a7f43b8118..6dc196d966861 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
@@ -89,7 +89,7 @@ public function execute()
 
         try {
             if (!$this->agreementsValidator->isValid(array_keys($this->getRequest()->getPost('agreement', [])))) {
-                $this->messageManager->addError(
+                $this->messageManager->addErrorMessage(
                     __('Please agree to all Terms and Conditions before placing the order.')
                 );
                 $this->_redirect('*/*/billing');
@@ -119,7 +119,7 @@ public function execute()
         } catch (PaymentException $e) {
             $message = $e->getMessage();
             if (!empty($message)) {
-                $this->messageManager->addError($message);
+                $this->messageManager->addErrorMessage($message);
             }
             $this->_redirect('*/*/billing');
         } catch (\Magento\Checkout\Exception $e) {
@@ -131,7 +131,7 @@ public function execute()
                 'multi-shipping'
             );
             $this->_getCheckout()->getCheckoutSession()->clearQuote();
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
             $this->_redirect('*/cart');
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             $this->_objectManager->get(
@@ -141,7 +141,7 @@ public function execute()
                 $e->getMessage(),
                 'multi-shipping'
             );
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
             $this->_redirect('*/*/billing');
         } catch (\Exception $e) {
             $this->logger->critical($e);
@@ -156,7 +156,7 @@ public function execute()
             } catch (\Exception $e) {
                 $this->logger->error($e->getMessage());
             }
-            $this->messageManager->addError(__('Order place error'));
+            $this->messageManager->addErrorMessage(__('Order place error'));
             $this->_redirect('*/*/billing');
         }
     }
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/ShippingPost.php b/app/code/Magento/Multishipping/Controller/Checkout/ShippingPost.php
index 1e1d3dbace623..037df75bcf3ad 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/ShippingPost.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/ShippingPost.php
@@ -26,7 +26,7 @@ public function execute()
             $this->_getState()->setCompleteStep(State::STEP_SHIPPING);
             $this->_redirect('*/*/billing');
         } catch (\Exception $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
             $this->_redirect('*/*/shipping');
         }
     }
diff --git a/app/code/Magento/NewRelicReporting/Model/Observer/CheckConfig.php b/app/code/Magento/NewRelicReporting/Model/Observer/CheckConfig.php
index f7eb658f40784..17ae9cafd4c37 100644
--- a/app/code/Magento/NewRelicReporting/Model/Observer/CheckConfig.php
+++ b/app/code/Magento/NewRelicReporting/Model/Observer/CheckConfig.php
@@ -58,7 +58,7 @@ public function execute(Observer $observer)
         if ($this->config->isNewRelicEnabled()) {
             if (!$this->newRelicWrapper->isExtensionInstalled()) {
                 $this->config->disableModule();
-                $this->messageManager->addError(
+                $this->messageManager->addErrorMessage(
                     __(
                         'The New Relic integration requires the newrelic-php5 agent, which is not installed. More 
                         information on installing the agent is available <a target="_blank" href="%1">here</a>.',
diff --git a/app/code/Magento/NewRelicReporting/Test/Unit/Model/Observer/CheckConfigTest.php b/app/code/Magento/NewRelicReporting/Test/Unit/Model/Observer/CheckConfigTest.php
index 6bb1ee7214609..f64acdc71d2a8 100644
--- a/app/code/Magento/NewRelicReporting/Test/Unit/Model/Observer/CheckConfigTest.php
+++ b/app/code/Magento/NewRelicReporting/Test/Unit/Model/Observer/CheckConfigTest.php
@@ -125,7 +125,7 @@ public function testCheckConfig()
         $this->config->expects($this->once())
             ->method('disableModule');
         $this->messageManager->expects($this->once())
-            ->method('addError');
+            ->method('addErrorMessage');
 
         $this->model->execute($eventObserver);
     }
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php
index 2dbe10bf1bdc9..4f93e3e4f73a3 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Queue/Save.php
@@ -88,7 +88,7 @@ public function execute()
 
             $this->_redirect('*/*');
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
             $id = $this->getRequest()->getParam('id');
             if ($id) {
                 $this->_redirect('*/*/edit', ['id' => $id]);
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php
index cdef44b2da757..e8ec57f7a153e 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassDelete.php
@@ -46,7 +46,7 @@ public function execute()
     {
         $subscribersIds = $this->getRequest()->getParam('subscriber');
         if (!is_array($subscribersIds)) {
-            $this->messageManager->addError(__('Please select one or more subscribers.'));
+            $this->messageManager->addErrorMessage(__('Please select one or more subscribers.'));
         } else {
             try {
                 foreach ($subscribersIds as $subscriberId) {
@@ -57,7 +57,7 @@ public function execute()
                 }
                 $this->messageManager->addSuccess(__('Total of %1 record(s) were deleted.', count($subscribersIds)));
             } catch (\Exception $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             }
         }
 
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php
index b61494f795905..c15e773e30edd 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php
@@ -42,7 +42,7 @@ public function execute()
     {
         $subscribersIds = $this->getRequest()->getParam('subscriber');
         if (!is_array($subscribersIds)) {
-            $this->messageManager->addError(__('Please select one or more subscribers.'));
+            $this->messageManager->addErrorMessage(__('Please select one or more subscribers.'));
         } else {
             try {
                 foreach ($subscribersIds as $subscriberId) {
@@ -53,7 +53,7 @@ public function execute()
                 }
                 $this->messageManager->addSuccess(__('A total of %1 record(s) were updated.', count($subscribersIds)));
             } catch (\Exception $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             }
         }
 
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Delete.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Delete.php
index d327d44feceb8..b0f7247bcd2b5 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Delete.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Delete.php
@@ -26,7 +26,7 @@ public function execute()
                 $this->messageManager->addSuccess(__('The newsletter template has been deleted.'));
                 $this->_getSession()->setFormData(false);
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
                 $this->messageManager->addException($e, __('We can\'t delete this template right now.'));
             }
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php
index 8fc729ea34078..bc443f88a4ae3 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Save.php
@@ -69,7 +69,7 @@ public function execute()
             $this->_redirect('*/template');
             return;
         } catch (LocalizedException $e) {
-            $this->messageManager->addError(nl2br($e->getMessage()));
+            $this->messageManager->addErrorMessage(nl2br($e->getMessage()));
             $this->_getSession()->setData('newsletter_template_form_data', $this->getRequest()->getParams());
         } catch (\Exception $e) {
             $this->messageManager->addException($e, __('Something went wrong while saving this template.'));
diff --git a/app/code/Magento/Newsletter/Controller/Manage/Save.php b/app/code/Magento/Newsletter/Controller/Manage/Save.php
index 01012e39a992a..b70c84a6d1099 100644
--- a/app/code/Magento/Newsletter/Controller/Manage/Save.php
+++ b/app/code/Magento/Newsletter/Controller/Manage/Save.php
@@ -77,7 +77,7 @@ public function execute()
 
         $customerId = $this->_customerSession->getCustomerId();
         if ($customerId === null) {
-            $this->messageManager->addError(__('Something went wrong while saving your subscription.'));
+            $this->messageManager->addErrorMessage(__('Something went wrong while saving your subscription.'));
         } else {
             try {
                 $customer = $this->customerRepository->getById($customerId);
@@ -105,7 +105,7 @@ public function execute()
                     $this->messageManager->addSuccess(__('We have updated your subscription.'));
                 }
             } catch (\Exception $e) {
-                $this->messageManager->addError(__('Something went wrong while saving your subscription.'));
+                $this->messageManager->addErrorMessage(__('Something went wrong while saving your subscription.'));
             }
         }
         return $this->_redirect('customer/account/');
diff --git a/app/code/Magento/Newsletter/Test/Unit/Controller/Manage/SaveTest.php b/app/code/Magento/Newsletter/Test/Unit/Controller/Manage/SaveTest.php
index f333467732e30..e5b09c2e89852 100644
--- a/app/code/Magento/Newsletter/Test/Unit/Controller/Manage/SaveTest.php
+++ b/app/code/Magento/Newsletter/Test/Unit/Controller/Manage/SaveTest.php
@@ -122,7 +122,7 @@ public function testSaveActionInvalidFormKey()
         $this->messageManagerMock->expects($this->never())
             ->method('addSuccess');
         $this->messageManagerMock->expects($this->never())
-            ->method('addError');
+            ->method('addErrorMessage');
         $this->action->execute();
     }
 
@@ -140,7 +140,7 @@ public function testSaveActionNoCustomerInSession()
         $this->messageManagerMock->expects($this->never())
             ->method('addSuccess');
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('Something went wrong while saving your subscription.');
         $this->action->execute();
     }
@@ -169,7 +169,7 @@ public function testSaveActionWithException()
         $this->messageManagerMock->expects($this->never())
             ->method('addSuccess');
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->with('Something went wrong while saving your subscription.');
         $this->action->execute();
     }

From 52432e5dff93fd23383ab1a8aa6409113b8e2d41 Mon Sep 17 00:00:00 2001
From: Mateusz Krzeszowiak <mateusz.krzeszowiak@creativestyle.pl>
Date: Sun, 24 May 2020 10:26:53 +0200
Subject: [PATCH 0297/1718] Fix incorrect MFTF selector

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

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml
index c35e775152ac9..49e0d3eb4e0d7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml
@@ -12,7 +12,7 @@
         <element name="collapseAll" type="button" selector=".tree-actions a:first-child"/>
         <element name="expandAll" type="button" selector=".tree-actions a:last-child"/>
         <element name="categoryHighlighted" type="text" selector="//div[@id='store.menu']//span[contains(text(),'{{name}}')]/ancestor::li" parameterized="true" timeout="30"/>
-        <element name="categoryNotHighlighted" type="text" selector="ul[id=\'ui-id-2\'] li[class~=\'active\']" timeout="30"/>
+        <element name="categoryNotHighlighted" type="text" selector="#store\.menu ul li.active" timeout="30"/>
         <element name="categoryTreeRoot" type="text" selector="div.x-tree-root-node>li.x-tree-node:first-of-type>div.x-tree-node-el:first-of-type" timeout="30"/>
         <element name="categoryInTree" type="text" selector="//a/span[contains(text(), '{{name}}')]" parameterized="true" timeout="30"/>
         <element name="categoryInTreeUnderRoot" type="text" selector="//li/ul/li[@class='x-tree-node']/div/a/span[contains(text(), '{{name}}')]" parameterized="true"/>

From f4e2665cb24337d8ee4da412d0506e7f5a95d5ff Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Tue, 26 May 2020 16:46:17 +0300
Subject: [PATCH 0298/1718] Implementing the ID_V2 for entered options, bundle
 and downloadable products

---
 .../Options/BundleEnteredOptionValueIdV2.php  | 68 +++++++++++++++++++
 .../Magento/BundleGraphQl/etc/schema.graphqls |  1 +
 .../CustomizableEnteredOptionValueIdV2.php    | 62 +++++++++++++++++
 ...> CustomizableSelectedOptionValueIdV2.php} | 42 ++++++------
 .../CatalogGraphQl/etc/schema.graphqls        | 16 ++---
 .../Product/DownloadableLinksValueIdV2.php    | 46 +++++++++++++
 .../DownloadableGraphQl/etc/schema.graphqls   |  1 +
 7 files changed, 208 insertions(+), 28 deletions(-)
 create mode 100644 app/code/Magento/BundleGraphQl/Model/Resolver/Options/BundleEnteredOptionValueIdV2.php
 create mode 100644 app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableEnteredOptionValueIdV2.php
 rename app/code/Magento/CatalogGraphQl/Model/Resolver/Product/{CustomizableOptionValueIdV2.php => CustomizableSelectedOptionValueIdV2.php} (62%)
 create mode 100644 app/code/Magento/DownloadableGraphQl/Resolver/Product/DownloadableLinksValueIdV2.php

diff --git a/app/code/Magento/BundleGraphQl/Model/Resolver/Options/BundleEnteredOptionValueIdV2.php b/app/code/Magento/BundleGraphQl/Model/Resolver/Options/BundleEnteredOptionValueIdV2.php
new file mode 100644
index 0000000000000..c1a55d9db794a
--- /dev/null
+++ b/app/code/Magento/BundleGraphQl/Model/Resolver/Options/BundleEnteredOptionValueIdV2.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\BundleGraphQl\Model\Resolver\Options;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+/**
+ * Format new option id_v2 in base64 encode for entered bundle options
+ */
+class BundleEnteredOptionValueIdV2 implements ResolverInterface
+{
+    /**
+     * Option type name
+     */
+    private const OPTION_TYPE = 'bundle';
+
+    /**
+     * Create a option id_v2 for entered option in "<option-type>/<option-id>/<option-value-id>/<quantity>" format
+     *
+     * @param Field $field
+     * @param ContextInterface $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     *
+     * @return string
+     *
+     * @throws GraphQlInputException
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['option_id']) || empty($value['option_id'])) {
+            throw new GraphQlInputException(__('Wrong format option data: option_id should not be empty.'));
+        }
+
+        if (!isset($value['selection_id']) || empty($value['selection_id'])) {
+            throw new GraphQlInputException(__('Wrong format option data: selection_id should not be empty.'));
+        }
+
+        $optionDetails = [
+            self::OPTION_TYPE,
+            $value['option_id'],
+            $value['selection_id'],
+            (int) $value['selection_qty']
+        ];
+
+        $content = implode('/', $optionDetails);
+
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        return base64_encode($content);
+    }
+}
diff --git a/app/code/Magento/BundleGraphQl/etc/schema.graphqls b/app/code/Magento/BundleGraphQl/etc/schema.graphqls
index 0eff0e086180e..bab1a256f7f59 100644
--- a/app/code/Magento/BundleGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/BundleGraphQl/etc/schema.graphqls
@@ -66,6 +66,7 @@ type BundleItemOption @doc(description: "BundleItemOption defines characteristic
     price_type: PriceTypeEnum @doc(description: "One of FIXED, PERCENT, or DYNAMIC.")
     can_change_quantity: Boolean @doc(description: "Indicates whether the customer can change the number of items for this option.")
     product: ProductInterface @doc(description: "Contains details about this product option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product")
+    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Options\\BundleEnteredOptionValueIdV2")
 }
 
 type BundleProduct implements ProductInterface, PhysicalProductInterface, CustomizableProductInterface @doc(description: "BundleProduct defines basic features of a bundle product and contains multiple BundleItems.") {
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableEnteredOptionValueIdV2.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableEnteredOptionValueIdV2.php
new file mode 100644
index 0000000000000..efc15d5d92ca3
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableEnteredOptionValueIdV2.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Product;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+/**
+ * Format new option id_v2 in base64 encode for entered custom options
+ */
+class CustomizableEnteredOptionValueIdV2 implements ResolverInterface
+{
+    /**
+     * Option type name
+     */
+    private const OPTION_TYPE = 'custom-option';
+
+    /**
+     * Create a option id_v2 for entered option in "<option-type>/<option-id>" format
+     *
+     * @param Field $field
+     * @param ContextInterface $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     *
+     * @return string
+     *
+     * @throws GraphQlInputException
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['option_id']) || empty($value['option_id'])) {
+            throw new GraphQlInputException(__('Wrong format option data: option_id should not be empty.'));
+        }
+
+        $optionDetails = [
+            self::OPTION_TYPE,
+            $value['option_id']
+        ];
+
+        $content = implode('/', $optionDetails);
+
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        return base64_encode($content);
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableOptionValueIdV2.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableSelectedOptionValueIdV2.php
similarity index 62%
rename from app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableOptionValueIdV2.php
rename to app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableSelectedOptionValueIdV2.php
index 67ca953702716..f1dff2680ba93 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableOptionValueIdV2.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableSelectedOptionValueIdV2.php
@@ -7,34 +7,36 @@
 
 namespace Magento\CatalogGraphQl\Model\Resolver\Product;
 
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
-use Magento\Framework\GraphQl\Query\Resolver\Value;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 
 /**
- * @inheritdoc
- *
- * Format new option id_v2 in base64 encode for custom options
+ * Format new option id_v2 in base64 encode for selected custom options
  */
-class CustomizableOptionValueIdV2 implements ResolverInterface
+class CustomizableSelectedOptionValueIdV2 implements ResolverInterface
 {
+    /**
+     * Option type name
+     */
     private const OPTION_TYPE = 'custom-option';
 
     /**
-     * @inheritdoc
-     *
-     * Create new option id_v2 that encodes details for each option and in most cases can be presented
-     * as base64("<option-type>/<option-id>/<option-value-id>")
+     * Create a option id_v2 for selected option in "<option-type>/<option-id>/<option-value-id>" format
      *
      * @param Field $field
      * @param ContextInterface $context
      * @param ResolveInfo $info
      * @param array|null $value
      * @param array|null $args
-     * @return Value|mixed|void
+     *
+     * @return string
+     *
+     * @throws GraphQlInputException
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function resolve(
         Field $field,
@@ -43,23 +45,23 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
+        if (!isset($value['option_id']) || empty($value['option_id'])) {
+            throw new GraphQlInputException(__('Wrong format option data: option_id should not be empty.'));
+        }
+
+        if (!isset($value['option_type_id']) || empty($value['option_type_id'])) {
+            throw new GraphQlInputException(__('Wrong format option data: option_type_id should not be empty.'));
+        }
+
         $optionDetails = [
             self::OPTION_TYPE,
             $value['option_id'],
             $value['option_type_id']
         ];
 
-        if (!isset($value['option_id']) || empty($value['option_id'])) {
-            throw new LocalizedException(__('Wrong format option data: option_id should not be empty.'));
-        }
-
-        if (!isset($value['option_type_id']) || empty($value['option_type_id'])) {
-            throw new LocalizedException(__('Wrong format option data: option_type_id should not be empty.'));
-        }
+        $content = implode('/', $optionDetails);
 
         // phpcs:ignore Magento2.Functions.DiscouragedFunction
-        $content = \implode('/', $optionDetails);
-
         return base64_encode($content);
     }
 }
diff --git a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
index 51fedcbfb6c49..008ed729350cd 100644
--- a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
@@ -132,7 +132,7 @@ type CustomizableAreaValue @doc(description: "CustomizableAreaValue defines the
     price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC.")
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     max_characters: Int @doc(description: "The maximum number of characters that can be entered for this customizable option.")
-    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableOptionValueIdV2")
+    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueIdV2")
 }
 
 type CategoryTree implements CategoryInterface @doc(description: "Category Tree implementation.") {
@@ -154,7 +154,7 @@ type CustomizableDateValue @doc(description: "CustomizableDateValue defines the
     price: Float @doc(description: "The price assigned to this option.")
     price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC.")
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
-    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableOptionValueIdV2")
+    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueIdV2")
 }
 
 type CustomizableDropDownOption implements CustomizableOptionInterface @doc(description: "CustomizableDropDownOption contains information about a drop down menu that is defined as part of a customizable option.") {
@@ -168,7 +168,7 @@ type CustomizableDropDownValue @doc(description: "CustomizableDropDownValue defi
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     title: String @doc(description: "The display name for this option.")
     sort_order: Int @doc(description: "The order in which the option is displayed.")
-    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableOptionValueIdV2")
+    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueIdV2")
 }
 
 type CustomizableMultipleOption implements CustomizableOptionInterface @doc(description: "CustomizableMultipleOption contains information about a multiselect that is defined as part of a customizable option.") {
@@ -182,7 +182,7 @@ type CustomizableMultipleValue @doc(description: "CustomizableMultipleValue defi
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     title: String @doc(description: "The display name for this option.")
     sort_order: Int @doc(description: "The order in which the option is displayed.")
-    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableOptionValueIdV2")
+    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueIdV2")
 }
 
 type CustomizableFieldOption implements CustomizableOptionInterface @doc(description: "CustomizableFieldOption contains information about a text field that is defined as part of a customizable option.") {
@@ -195,7 +195,7 @@ type CustomizableFieldValue @doc(description: "CustomizableFieldValue defines th
     price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC.")
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     max_characters: Int @doc(description: "The maximum number of characters that can be entered for this customizable option.")
-    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableOptionValueIdV2")
+    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueIdV2")
 }
 
 type CustomizableFileOption implements CustomizableOptionInterface @doc(description: "CustomizableFileOption contains information about a file picker that is defined as part of a customizable option.") {
@@ -210,7 +210,7 @@ type CustomizableFileValue @doc(description: "CustomizableFileValue defines the
     file_extension: String @doc(description: "The file extension to accept.")
     image_size_x: Int @doc(description: "The maximum width of an image.")
     image_size_y: Int @doc(description: "The maximum height of an image.")
-    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableOptionValueIdV2")
+    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueIdV2")
 }
 
 interface MediaGalleryInterface @doc(description: "Contains basic information about a product image or video.") @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\MediaGalleryTypeResolver") {
@@ -280,7 +280,7 @@ type CustomizableRadioValue @doc(description: "CustomizableRadioValue defines th
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     title: String @doc(description: "The display name for this option.")
     sort_order: Int @doc(description: "The order in which the radio button is displayed.")
-    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableOptionValueIdV2")
+    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueIdV2")
 }
 
 type CustomizableCheckboxOption implements CustomizableOptionInterface @doc(description: "CustomizableCheckbbixOption contains information about a set of checkbox values that are defined as part of a customizable option.") {
@@ -294,7 +294,7 @@ type CustomizableCheckboxValue @doc(description: "CustomizableCheckboxValue defi
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     title: String @doc(description: "The display name for this option.")
     sort_order: Int @doc(description: "The order in which the checkbox value is displayed.")
-    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableOptionValueIdV2")
+    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueIdV2")
 }
 
 type VirtualProduct implements ProductInterface, CustomizableProductInterface @doc(description: "A virtual product is non-tangible product that does not require shipping and is not kept in inventory.") {
diff --git a/app/code/Magento/DownloadableGraphQl/Resolver/Product/DownloadableLinksValueIdV2.php b/app/code/Magento/DownloadableGraphQl/Resolver/Product/DownloadableLinksValueIdV2.php
new file mode 100644
index 0000000000000..62da0ba8530fc
--- /dev/null
+++ b/app/code/Magento/DownloadableGraphQl/Resolver/Product/DownloadableLinksValueIdV2.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\DownloadableGraphQl\Resolver\Product;
+
+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;
+
+/**
+ * Formatting the id_v2 for downloadable link
+ */
+class DownloadableLinksValueIdV2 implements ResolverInterface
+{
+    private const OPTION_TYPE = 'downloadable';
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['id']) || empty($value['id'])) {
+            throw new GraphQlInputException(__('Wrong format option data: `id` should not be empty.'));
+        }
+
+        $optionDetails = [
+            self::OPTION_TYPE,
+            $value['id']
+        ];
+
+        $content = implode('/', $optionDetails);
+
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        return base64_encode($content);
+    }
+}
diff --git a/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls b/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
index 2226f1acd8501..82249bf7701da 100644
--- a/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
@@ -53,6 +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")
+    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\DownloadableGraphQl\\Resolver\\Product\\DownloadableLinksValueIdV2")
 }
 
 type DownloadableProductSamples @doc(description: "DownloadableProductSamples defines characteristics of a downloadable product") {

From 8bfc104948ce65e0f98e78f34aeffacdc2f8f276 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 25 May 2020 21:05:01 +0300
Subject: [PATCH 0299/1718] Initialize observable for image first, load images
 then apply styles

---
 .../Ui/view/base/web/js/grid/masonry.js       | 43 +++++++++++--------
 .../Magento/Ui/base/js/grid/masonry.test.js   | 39 +++++++++++++++++
 2 files changed, 65 insertions(+), 17 deletions(-)
 create mode 100644 dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/masonry.test.js

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/masonry.js b/app/code/Magento/Ui/view/base/web/js/grid/masonry.js
index e4c72ee950c26..f199b3eaf7f37 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/masonry.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/masonry.js
@@ -98,10 +98,17 @@ define([
             if (!rows.length) {
                 return;
             }
+
+            //initialize row observables
+            this.rows().forEach(function (image, index) {
+                image.styles = ko.observable({});
+                image.css = ko.observable({});
+            });
+
             this.imageMargin = parseInt(this.imageMargin, 10);
             this.container = $('[data-id="' + this.containerId + '"]')[0];
 
-            this.setLayoutStyles();
+            this.setLayoutStylesWhenLoaded();
             this.setEventListener();
 
             return this;
@@ -181,25 +188,33 @@ define([
         },
 
         /**
-         * Wait for container to initialize
+         * Call method when condition is true
          */
-        waitForContainer: function (callback) {
-            if (typeof this.container === 'undefined') {
+        conditionCallback: function (condition, callback) {
+            if (condition()) {
                 setTimeout(function () {
-                    this.waitForContainer(callback);
-                }.bind(this), 500);
+                    this.conditionCallback(condition, callback);
+                }.bind(this), 100);
             } else {
-                setTimeout(callback, 0);
+                callback();
             }
         },
 
         /**
-         * Set layout styles when container element is loaded.
+         * Set layout styles when last image in grid is loaded.
          */
         setLayoutStylesWhenLoaded: function () {
-            this.waitForContainer(function () {
-                this.setLayoutStyles();
-            }.bind(this));
+            var images = '[data-id="' + this.containerId + '"] img';
+
+            this.conditionCallback(
+                function () {
+                    return $(images).length === 0;
+                }.bind(this),
+                function () {
+                    $(images).last().load(function () {
+                        this.setLayoutStyles();
+                    }.bind(this));
+                }.bind(this));
         },
 
         /**
@@ -210,9 +225,6 @@ define([
          * @param {Number} height
          */
         setImageStyles: function (img, width, height) {
-            if (!img.styles) {
-                img.styles = ko.observable();
-            }
             img.styles({
                 width: parseInt(width, 10) + 'px',
                 height: parseInt(height, 10) + 'px'
@@ -226,9 +238,6 @@ define([
          * @param {Object} classes
          */
         setImageClass: function (image, classes) {
-            if (!image.css) {
-                image.css = ko.observable(classes);
-            }
             image.css(classes);
         },
 
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/masonry.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/masonry.test.js
new file mode 100644
index 0000000000000..7d955feac269f
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/masonry.test.js
@@ -0,0 +1,39 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_Ui/js/grid/masonry',
+    'jquery'
+], function (Masonry, $) {
+    'use strict';
+
+    describe('Magento_Ui/js/grid/masonry', function () {
+        var model;
+
+        beforeEach(function () {
+            $(document.body).append(
+                $('<div id="masonry_grid"><div class="masonry-image-column"></div></div>')
+            );
+            model = new Masonry({
+                defaults: {
+                    containerId: '#masonry_grid'
+                }
+            });
+        });
+
+        afterEach(function () {
+            $('#masonry_grid').remove();
+        });
+
+        describe('check initComponent', function () {
+            it('verify setLayoutstyles called and grid iniztilized', function () {
+
+            });
+            it('verify events triggered', function () {
+
+            });
+        });
+    });
+});

From a5a13fb40f7656dfa79cecec9c0b921d30cdd52f Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 26 May 2020 22:39:18 +0300
Subject: [PATCH 0300/1718] Add case with cached images

---
 app/code/Magento/Ui/view/base/web/js/grid/masonry.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/masonry.js b/app/code/Magento/Ui/view/base/web/js/grid/masonry.js
index f199b3eaf7f37..3142c2e35a66a 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/masonry.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/masonry.js
@@ -213,7 +213,11 @@ define([
                 function () {
                     $(images).last().load(function () {
                         this.setLayoutStyles();
-                    }.bind(this));
+                    }.bind(this)).each(function () {
+                        if (this.complete) {
+                            $(this).load();
+                        }
+                    });;
                 }.bind(this));
         },
 

From e5e5c788ffcb83bf5426deb6832c93e355a8f1bc Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Tue, 26 May 2020 16:18:52 -0500
Subject: [PATCH 0301/1718] MC-33823: Merge CE, EE and B2B changes

---
 .../Adminhtml/Order/Create/Search/Grid/Renderer/Product.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Product.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Product.php
index c72d27c45cfc5..8c1ef5f56dac2 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Product.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search/Grid/Renderer/Product.php
@@ -19,7 +19,7 @@ class Product extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Text
     /**
      * @var SecureHtmlRenderer
      */
-    protected $secureRenderer;
+    private $secureRenderer;
 
     /**
      * @param Context $context

From 5a7e865d2d693cee84427d9906c85c0a2ec05ac7 Mon Sep 17 00:00:00 2001
From: Maksym Aposov <maposov@magento.com>
Date: Tue, 26 May 2020 17:06:03 -0500
Subject: [PATCH 0302/1718] MC-34427: Cleanup travis configuration

---
 .github/CONTRIBUTING.md                       |   2 +-
 .htaccess                                     |   9 -
 .htaccess.sample                              |   9 -
 .../etc/install-config-mysql.travis.php.dist  |  23 ---
 .../testFromCreateProject/composer.lock       |   8 -
 .../_files/testSkeleton/composer.lock         |   8 -
 .../testsuite/Magento/MemoryUsageTest.php     |   2 +-
 .../Magento/Phpserver/PhpserverTest.php       |  58 +++---
 .../Model/_files/testSkeleton/composer.lock   |   4 -
 dev/travis/before_install.sh                  |  63 -------
 dev/travis/before_script.sh                   | 168 ------------------
 dev/travis/config/apache_virtual_host         |  20 ---
 dev/travis/config/www.conf                    |  14 --
 13 files changed, 32 insertions(+), 356 deletions(-)
 delete mode 100644 dev/tests/integration/etc/install-config-mysql.travis.php.dist
 delete mode 100755 dev/travis/before_install.sh
 delete mode 100755 dev/travis/before_script.sh
 delete mode 100644 dev/travis/config/apache_virtual_host
 delete mode 100644 dev/travis/config/www.conf

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 37b7bc2ca8c3a..397a106a4574b 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -23,7 +23,7 @@ For more detailed information on contribution please read our [beginners guide](
 * Unit/integration test coverage
 * Proposed [documentation](https://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs).
 4. For larger features or changes, please [open an issue](https://github.com/magento/magento2/issues) to discuss the proposed changes prior to development. This may prevent duplicate or unnecessary effort and allow other contributors to provide input.
-5. All automated tests must pass (all builds on [Travis CI](https://travis-ci.org/magento/magento2) must be green).
+5. All automated tests must pass.
 
 ## Contribution process
 
diff --git a/.htaccess b/.htaccess
index e07a564bc0ab6..c5f3bf034d2fb 100644
--- a/.htaccess
+++ b/.htaccess
@@ -238,15 +238,6 @@
             Require all denied
         </IfVersion>
     </Files>
-    <Files .travis.yml>
-        <IfVersion < 2.4>
-            order allow,deny
-            deny from all
-        </IfVersion>
-        <IfVersion >= 2.4>
-            Require all denied
-        </IfVersion>
-    </Files>
     <Files CHANGELOG.md>
         <IfVersion < 2.4>
             order allow,deny
diff --git a/.htaccess.sample b/.htaccess.sample
index c9e83a53cc8bd..776f9046cf11d 100644
--- a/.htaccess.sample
+++ b/.htaccess.sample
@@ -238,15 +238,6 @@
             Require all denied
         </IfVersion>
     </Files>
-    <Files .travis.yml>
-        <IfVersion < 2.4>
-            order allow,deny
-            deny from all
-        </IfVersion>
-        <IfVersion >= 2.4>
-            Require all denied
-        </IfVersion>
-    </Files>
     <Files CHANGELOG.md>
         <IfVersion < 2.4>
             order allow,deny
diff --git a/dev/tests/integration/etc/install-config-mysql.travis.php.dist b/dev/tests/integration/etc/install-config-mysql.travis.php.dist
deleted file mode 100644
index 8c41b0a0f2626..0000000000000
--- a/dev/tests/integration/etc/install-config-mysql.travis.php.dist
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-return [
-    'db-host' => '127.0.0.1',
-    'db-user' => 'root',
-    'db-password' => '',
-    'db-name' => 'magento_integration_tests',
-    'db-prefix' => 'trv_',
-    'backend-frontname' => 'backend',
-    'admin-user' => \Magento\TestFramework\Bootstrap::ADMIN_NAME,
-    'admin-password' => \Magento\TestFramework\Bootstrap::ADMIN_PASSWORD,
-    'admin-email' => \Magento\TestFramework\Bootstrap::ADMIN_EMAIL,
-    'admin-firstname' => \Magento\TestFramework\Bootstrap::ADMIN_FIRSTNAME,
-    'admin-lastname' => \Magento\TestFramework\Bootstrap::ADMIN_LASTNAME,
-    'amqp-host' => 'localhost',
-    'amqp-port' => '5672',
-    'amqp-user' => 'guest',
-    'amqp-password' => 'guest',
-];
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/composer.lock b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/composer.lock
index fbcaf8d1600fb..2e363a5ce3a8b 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/composer.lock
+++ b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/composer.lock
@@ -2400,10 +2400,6 @@
                         ".php_cs.dist",
                         ".php_cs.dist"
                     ],
-                    [
-                        ".travis.yml",
-                        ".travis.yml"
-                    ],
                     [
                         ".user.ini",
                         ".user.ini"
@@ -2652,10 +2648,6 @@
                         "dev/tools",
                         "dev/tools"
                     ],
-                    [
-                        "dev/travis",
-                        "dev/travis"
-                    ],
                     [
                         "generated",
                         "generated"
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/composer.lock b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/composer.lock
index 6c51c6a2072e9..75eb51fd62112 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/composer.lock
+++ b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/composer.lock
@@ -2400,10 +2400,6 @@
                         ".php_cs.dist",
                         ".php_cs.dist"
                     ],
-                    [
-                        ".travis.yml",
-                        ".travis.yml"
-                    ],
                     [
                         ".user.ini",
                         ".user.ini"
@@ -2652,10 +2648,6 @@
                         "dev/tools",
                         "dev/tools"
                     ],
-                    [
-                        "dev/travis",
-                        "dev/travis"
-                    ],
                     [
                         "generated",
                         "generated"
diff --git a/dev/tests/integration/testsuite/Magento/MemoryUsageTest.php b/dev/tests/integration/testsuite/Magento/MemoryUsageTest.php
index 1cefa80d8f611..cff3bae8bc2e1 100644
--- a/dev/tests/integration/testsuite/Magento/MemoryUsageTest.php
+++ b/dev/tests/integration/testsuite/Magento/MemoryUsageTest.php
@@ -32,7 +32,7 @@ protected function setUp(): void
      */
     public function testAppReinitializationNoMemoryLeak()
     {
-        $this->markTestSkipped('Test fails at Travis. Skipped until MAGETWO-47111');
+        $this->markTestSkipped('Skipped until MAGETWO-47111');
 
         $this->_deallocateUnusedMemory();
         $actualMemoryUsage = $this->_helper->getRealMemoryUsage();
diff --git a/dev/tests/integration/testsuite/Magento/Phpserver/PhpserverTest.php b/dev/tests/integration/testsuite/Magento/Phpserver/PhpserverTest.php
index e7a1de90fc933..4ae8c51c45a97 100644
--- a/dev/tests/integration/testsuite/Magento/Phpserver/PhpserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Phpserver/PhpserverTest.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Phpserver;
 
+use Symfony\Component\Process\PhpExecutableFinder;
+use Symfony\Component\Process\Process;
+
 /**
  * @magentoAppIsolation enabled
  *
@@ -19,33 +22,15 @@ class PhpserverTest extends \PHPUnit\Framework\TestCase
 {
     const BASE_URL = '127.0.0.1:8082';
 
-    private static $serverPid;
-
     /**
-     * @var \Laminas\Http\Client
+     * @var Process
      */
-    private $httpClient;
+    private $serverProcess;
 
     /**
-     * Instantiate phpserver in the pub folder
+     * @var \Laminas\Http\Client
      */
-    public static function setUpBeforeClass(): void
-    {
-        if (!(defined('TRAVIS') && TRAVIS === true)) {
-            self::markTestSkipped('Travis environment test');
-        }
-        $return = [];
-
-        $baseDir = __DIR__ . '/../../../../../../';
-        $command = sprintf(
-            'cd %s && php -S %s -t ./pub/ ./phpserver/router.php >/dev/null 2>&1 & echo $!',
-            $baseDir,
-            static::BASE_URL
-        );
-        // phpcs:ignore
-        exec($command, $return);
-        static::$serverPid = (int) $return[0];
-    }
+    private $httpClient;
 
     private function getUrl($url)
     {
@@ -55,11 +40,33 @@ private function getUrl($url)
     protected function setUp(): void
     {
         $this->httpClient = new \Laminas\Http\Client(null, ['timeout' => 10]);
+
+        /** @var Process $process */
+        $phpBinaryFinder = new PhpExecutableFinder();
+        $phpBinaryPath = $phpBinaryFinder->find();
+        $command = sprintf(
+            "%s -S %s -t ./pub ./phpserver/router.php",
+            $phpBinaryPath,
+            self::BASE_URL
+        );
+        $this->serverProcess = Process::fromShellCommandline(
+            $command,
+            realpath(__DIR__ . '/../../../../../../')
+        );
+        $this->serverProcess->start();
+        $this->serverProcess->waitUntil(function ($type, $output) {
+            return strpos($output, "Development Server") !== false;
+        });
+    }
+
+    protected function tearDown(): void
+    {
+        $this->serverProcess->stop();
     }
 
     public function testServerHasPid()
     {
-        $this->assertTrue(static::$serverPid > 0);
+        $this->assertTrue($this->serverProcess->getPid() > 0);
     }
 
     public function testServerResponds()
@@ -86,9 +93,4 @@ public function testStaticImageFile()
         $this->assertFalse($response->isClientError());
         $this->assertStringStartsWith('image/gif', $response->getHeaders()->get('Content-Type')->getMediaType());
     }
-
-    public static function tearDownAfterClass(): void
-    {
-        posix_kill(static::$serverPid, SIGKILL);
-    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Model/_files/testSkeleton/composer.lock b/dev/tests/integration/testsuite/Magento/Setup/Model/_files/testSkeleton/composer.lock
index 4027a0f2c41c3..b22e038559e85 100644
--- a/dev/tests/integration/testsuite/Magento/Setup/Model/_files/testSkeleton/composer.lock
+++ b/dev/tests/integration/testsuite/Magento/Setup/Model/_files/testSkeleton/composer.lock
@@ -871,10 +871,6 @@
                         "LICENSE.txt",
                         "LICENSE.txt"
                     ],
-                    [
-                        ".travis.yml",
-                        ".travis.yml"
-                    ],
                     [
                         "app/bootstrap.php",
                         "app/bootstrap.php"
diff --git a/dev/travis/before_install.sh b/dev/travis/before_install.sh
deleted file mode 100755
index 845d70e4e79fd..0000000000000
--- a/dev/travis/before_install.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright © Magento, Inc. All rights reserved.
-# See COPYING.txt for license details.
-
-set -e
-trap '>&2 echo Error: Command \`$BASH_COMMAND\` on line $LINENO failed with exit code $?' ERR
-
-# mock mail
-sudo service postfix stop
-echo # print a newline
-smtp-sink -d "%d.%H.%M.%S" localhost:2500 1000 &
-echo 'sendmail_path = "/usr/sbin/sendmail -t -i "' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/sendmail.ini
-
-# disable xdebug and adjust memory limit
-echo > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
-echo 'memory_limit = -1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
-phpenv rehash;
-
-# If env var is present, configure support for 3rd party builds which include private dependencies
-test -n "$GITHUB_TOKEN" && composer config github-oauth.github.com "$GITHUB_TOKEN" || true
-
-# Node.js setup via NVM
-if [ $TEST_SUITE == "js" ]; then
-    curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.1/install.sh | bash
-    export NVM_DIR="$HOME/.nvm"
-    [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm
-
-    nvm install $NODE_JS_VERSION
-    nvm use $NODE_JS_VERSION
-    node --version
-
-    npm install -g yarn
-    yarn global add grunt-cli
-fi
-
-if [ $TEST_SUITE = "functional" ] || [ $TEST_SUITE = "graphql-api-functional" ]; then
-    # Install apache
-    sudo apt-get update
-    sudo apt-get install apache2 libapache2-mod-fastcgi
-    if [ ${TRAVIS_PHP_VERSION:0:1} == "7" ]; then
-        sudo cp ${TRAVIS_BUILD_DIR}/dev/travis/config/www.conf ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/
-    fi
-
-    # Enable php-fpm
-    sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf
-    sudo a2enmod rewrite actions fastcgi alias
-    echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-    ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm
-
-    # Configure apache virtual hosts
-    sudo cp -f ${TRAVIS_BUILD_DIR}/dev/travis/config/apache_virtual_host /etc/apache2/sites-available/000-default.conf
-    sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/000-default.conf
-    sudo sed -e "s?%MAGENTO_HOST_NAME%?${MAGENTO_HOST_NAME}?g" --in-place /etc/apache2/sites-available/000-default.conf
-
-    sudo usermod -a -G www-data travis
-    sudo usermod -a -G travis www-data
-
-    phpenv config-rm xdebug.ini
-    sudo service apache2 restart
-
-    /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :1 -screen 0 1280x1024x24
-fi
diff --git a/dev/travis/before_script.sh b/dev/travis/before_script.sh
deleted file mode 100755
index 5d091efbb30a3..0000000000000
--- a/dev/travis/before_script.sh
+++ /dev/null
@@ -1,168 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright © Magento, Inc. All rights reserved.
-# See COPYING.txt for license details.
-
-set -e
-trap '>&2 echo Error: Command \`$BASH_COMMAND\` on line $LINENO failed with exit code $?' ERR
-
-# prepare for test suite
-case $TEST_SUITE in
-    integration)
-        cd dev/tests/integration
-
-        test_set_list=$(find testsuite/* -maxdepth 1 -mindepth 1 -type d | sort)
-        test_set_count=$(printf "$test_set_list" | wc -l)
-        test_set_size[1]=$(printf "%.0f" $(echo "$test_set_count*0.13" | bc))  #13%
-        test_set_size[2]=$(printf "%.0f" $(echo "$test_set_count*0.30" | bc))  #30%
-        test_set_size[3]=$((test_set_count-test_set_size[1]-test_set_size[2])) #55%
-        echo "Total = ${test_set_count}; Batch #1 = ${test_set_size[1]}; Batch #2 = ${test_set_size[2]}; Batch #3 = ${test_set_size[3]};";
-
-        echo "==> preparing integration testsuite on index $INTEGRATION_INDEX with set size of ${test_set_size[$INTEGRATION_INDEX]}"
-        cp phpunit.xml.dist phpunit.xml
-
-        # remove memory usage tests if from any set other than the first
-        if [[ $INTEGRATION_INDEX > 1 ]]; then
-            echo "  - removing testsuite/Magento/MemoryUsageTest.php"
-            perl -pi -0e 's#^\s+<!-- Memory(.*?)</testsuite>\n##ims' phpunit.xml
-        fi
-
-        # divide test sets up by indexed testsuites
-        i=0; j=1; dirIndex=1; testIndex=1;
-        for test_set in $test_set_list; do
-            test_xml[j]+="            <directory suffix=\"Test.php\">$test_set</directory>\n"
-
-            if [[ $j -eq $INTEGRATION_INDEX ]]; then
-                echo "$dirIndex: Batch #$j($testIndex of ${test_set_size[$j]}): + including $test_set"
-            else
-                echo "$dirIndex: Batch #$j($testIndex of ${test_set_size[$j]}): + excluding $test_set"
-            fi
-
-            testIndex=$((testIndex+1))
-            dirIndex=$((dirIndex+1))
-            i=$((i+1))
-            if [ $i -eq ${test_set_size[$j]} ] && [ $j -lt $INTEGRATION_SETS ]; then
-                j=$((j+1))
-                i=0
-                testIndex=1
-            fi
-        done
-
-        # replace test sets for current index into testsuite
-        perl -pi -e "s#\s+<directory.*>testsuite</directory>#${test_xml[INTEGRATION_INDEX]}#g" phpunit.xml
-
-        echo "==> testsuite preparation complete"
-
-        # create database and move db config into place
-        mysql -uroot -e '
-            SET @@global.sql_mode = NO_ENGINE_SUBSTITUTION;
-            CREATE DATABASE magento_integration_tests;
-        '
-        mv etc/install-config-mysql.travis.php.dist etc/install-config-mysql.php
-
-        cd ../../..
-        ;;
-    static)
-        cd dev/tests/static
-
-        echo "==> preparing changed files list"
-        changed_files_ce="$TRAVIS_BUILD_DIR/dev/tests/static/testsuite/Magento/Test/_files/changed_files_ce.txt"
-        php get_github_changes.php \
-            --output-file="$changed_files_ce" \
-            --base-path="$TRAVIS_BUILD_DIR" \
-            --repo='https://github.com/magento/magento2.git' \
-            --branch="$TRAVIS_BRANCH"
-        sed 's/^/  + including /' "$changed_files_ce"
-
-        cd ../../..
-        ;;
-    js)
-        cp package.json.sample package.json
-        cp Gruntfile.js.sample Gruntfile.js
-        yarn
-
-        if [[ $GRUNT_COMMAND != "static" ]]; then
-            echo "Installing Magento"
-            mysql -uroot -e 'CREATE DATABASE magento2;'
-            php bin/magento setup:install -q \
-                --admin-user="admin" \
-                --admin-password="123123q" \
-                --admin-email="admin@example.com" \
-                --admin-firstname="John" \
-                --admin-lastname="Doe"
-
-            echo "Deploying Static Content"
-            php bin/magento setup:static-content:deploy -f -q -j=2 \
-                --no-css --no-less --no-images --no-fonts --no-misc --no-html-minify
-        fi
-        ;;
-    functional)
-        echo "Installing Magento"
-        mysql -uroot -e 'CREATE DATABASE magento2;'
-        php bin/magento setup:install -q \
-            --language="en_US" \
-            --timezone="UTC" \
-            --currency="USD" \
-            --base-url="http://${MAGENTO_HOST_NAME}/" \
-            --admin-firstname="John" \
-            --admin-lastname="Doe" \
-            --backend-frontname="backend" \
-            --admin-email="admin@example.com" \
-            --admin-user="admin" \
-            --use-rewrites=1 \
-            --admin-use-security-key=0 \
-            --admin-password="123123q"
-
-        echo "Enabling production mode"
-        php bin/magento deploy:mode:set production
-
-        echo "Prepare functional tests for running"
-        cd dev/tests/functional
-
-        composer install && composer require se/selenium-server-standalone:2.53.1
-        export DISPLAY=:1.0
-        sh ./vendor/se/selenium-server-standalone/bin/selenium-server-standalone -port 4444 -host 127.0.0.1 \
-            -Dwebdriver.firefox.bin=$(which firefox) -trustAllSSLCertificate &> ~/selenium.log &
-
-        cp ./phpunit.xml.dist ./phpunit.xml
-        sed -e "s?127.0.0.1?${MAGENTO_HOST_NAME}?g" --in-place ./phpunit.xml
-        sed -e "s?basic?travis_acceptance?g" --in-place ./phpunit.xml
-        cp ./.htaccess.sample ./.htaccess
-        cd ./utils
-        php -f generate/moduleSequence.php
-        php -f mtf troubleshooting:check-all
-
-        cd ../../..
-        ;;
-
-    graphql-api-functional)
-        echo "Installing Magento"
-        mysql -uroot -e 'CREATE DATABASE magento2;'
-        php bin/magento setup:install -q \
-            --language="en_US" \
-            --timezone="UTC" \
-            --currency="USD" \
-            --base-url="http://${MAGENTO_HOST_NAME}/" \
-            --admin-firstname="John" \
-            --admin-lastname="Doe" \
-            --backend-frontname="backend" \
-            --admin-email="admin@example.com" \
-            --admin-user="admin" \
-            --use-rewrites=1 \
-            --admin-use-security-key=0 \
-            --admin-password="123123q"
-
-        echo "Prepare api-functional tests for running"
-        cd dev/tests/api-functional
-        cp -r _files/Magento/TestModuleGraphQl* ../../../app/code/Magento # Deploy and enable test modules before running tests
-
-        cp ./phpunit_graphql.xml.dist ./phpunit.xml
-        sed -e "s?magento.url?${MAGENTO_HOST_NAME}?g" --in-place ./phpunit.xml
-
-        cd ../../..
-        php bin/magento setup:upgrade
-
-        echo "Enabling production mode"
-        php bin/magento deploy:mode:set production
-        ;;
-esac
diff --git a/dev/travis/config/apache_virtual_host b/dev/travis/config/apache_virtual_host
deleted file mode 100644
index 63f238bce2520..0000000000000
--- a/dev/travis/config/apache_virtual_host
+++ /dev/null
@@ -1,20 +0,0 @@
-<VirtualHost *:80>
-    DocumentRoot %TRAVIS_BUILD_DIR%
-    ServerName %MAGENTO_HOST_NAME%
-
-    <Directory "%TRAVIS_BUILD_DIR%">
-        Options FollowSymLinks MultiViews ExecCGI
-        AllowOverride All
-        Require all granted
-    </Directory>
-
-    <IfModule mod_fastcgi.c>
-        AddHandler php7-fcgi .php
-        Action php7-fcgi /php7-fcgi
-        Alias /php7-fcgi /usr/lib/cgi-bin/php7-fcgi
-        FastCgiExternalServer /usr/lib/cgi-bin/php7-fcgi -host 127.0.0.1:9000 -pass-header Authorization
-        <Directory /usr/lib/cgi-bin>
-            Require all granted
-        </Directory>
-    </IfModule>
-</VirtualHost>
diff --git a/dev/travis/config/www.conf b/dev/travis/config/www.conf
deleted file mode 100644
index c6d15b6799d91..0000000000000
--- a/dev/travis/config/www.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[www]
-
-user = www-data
-group = www-data
-
-listen = 127.0.0.1:9000
-
-pm = dynamic
-pm.max_children = 10
-pm.start_servers = 4
-pm.min_spare_servers = 2
-pm.max_spare_servers = 6
-
-chdir = /

From a867d70f9809e95c75e3d4aa6dc0d2808620605f Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 27 May 2020 11:29:26 +0300
Subject: [PATCH 0303/1718] Static test fixes

---
 app/code/Magento/Ui/view/base/web/js/grid/masonry.js        | 6 +++---
 .../tests/app/code/Magento/Ui/base/js/grid/masonry.test.js  | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/masonry.js b/app/code/Magento/Ui/view/base/web/js/grid/masonry.js
index 3142c2e35a66a..7c4ba053f9b66 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/masonry.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/masonry.js
@@ -100,7 +100,7 @@ define([
             }
 
             //initialize row observables
-            this.rows().forEach(function (image, index) {
+            this.rows().forEach(function (image) {
                 image.styles = ko.observable({});
                 image.css = ko.observable({});
             });
@@ -209,7 +209,7 @@ define([
             this.conditionCallback(
                 function () {
                     return $(images).length === 0;
-                }.bind(this),
+                },
                 function () {
                     $(images).last().load(function () {
                         this.setLayoutStyles();
@@ -217,7 +217,7 @@ define([
                         if (this.complete) {
                             $(this).load();
                         }
-                    });;
+                    });
                 }.bind(this));
         },
 
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/masonry.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/masonry.test.js
index 7d955feac269f..38ebd57234ea9 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/masonry.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/masonry.test.js
@@ -3,6 +3,7 @@
  * See COPYING.txt for license details.
  */
 
+/*eslint max-nested-callbacks: 0*/
 define([
     'Magento_Ui/js/grid/masonry',
     'jquery'
@@ -29,10 +30,10 @@ define([
 
         describe('check initComponent', function () {
             it('verify setLayoutstyles called and grid iniztilized', function () {
-
+                expect(model).toBeDefined();
             });
             it('verify events triggered', function () {
-
+                expect(model).toBeDefined();
             });
         });
     });

From bf198bd17aab8570ac775436edf62d23ec397bf0 Mon Sep 17 00:00:00 2001
From: ameysar <andrii.meysar@transoftgroup.com>
Date: Wed, 27 May 2020 12:57:55 +0300
Subject: [PATCH 0304/1718] MC-34482: MFTF tests causing high load on Jenkins
 agents in MTSv1 platform

---
 ...portGroupedProductWithSpecialPriceTest.xml |  4 ++--
 ...inStartMessageQueueConsumerActionGroup.xml | 24 +++++++++++++++++++
 .../Test/Mftf/Data/QueueConsumerData.xml      | 15 ++++++++++++
 3 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/AdminStartMessageQueueConsumerActionGroup.xml
 create mode 100644 app/code/Magento/MessageQueue/Test/Mftf/Data/QueueConsumerData.xml

diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml
index 5078fa5c571db..c5152356632e3 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml
@@ -48,7 +48,6 @@
                 <requiredEntity createDataKey="createSecondSimpleProduct"/>
             </updateData>
 
-            <magentoCron stepKey="runCron"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
@@ -68,7 +67,8 @@
         <!-- Export created below products -->
         <actionGroup ref="ExportAllProductsActionGroup" stepKey="exportCreatedProducts"/>
 
-        <magentoCron stepKey="runCronIndex" groups="index"/>
+        <!-- Start message queue for export consumer -->
+        <actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
 
         <grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
 
diff --git a/app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/AdminStartMessageQueueConsumerActionGroup.xml b/app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/AdminStartMessageQueueConsumerActionGroup.xml
new file mode 100644
index 0000000000000..5154c917390d8
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/AdminStartMessageQueueConsumerActionGroup.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="AdminStartMessageQueueConsumerActionGroup">
+        <annotations>
+            <description>Starts message queue for specific consumer.</description>
+        </annotations>
+        <arguments>
+            <argument name="consumer" defaultValue="AdminExportMessageConsumerData"/>
+        </arguments>
+
+        <magentoCLI command="queue:consumers:start {{consumer.consumer_name}} --max-messages={{consumer.message_limit}} --single-thread" stepKey="startMessageQueue"/>
+        <wait time="30" stepKey="waitForQueueStarting"/>
+        <reloadPage stepKey="refreshPage"/>
+        <waitForPageLoad stepKey="waitForPageLoaded"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MessageQueue/Test/Mftf/Data/QueueConsumerData.xml b/app/code/Magento/MessageQueue/Test/Mftf/Data/QueueConsumerData.xml
new file mode 100644
index 0000000000000..513e2ec3fc131
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Test/Mftf/Data/QueueConsumerData.xml
@@ -0,0 +1,15 @@
+<?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="AdminExportMessageConsumerData">
+        <data key="consumer_name">exportProcessor</data>
+        <data key="message_limit">1</data>
+    </entity>
+</entities>

From 3e5d058d36a1ed6376f85a6eaacddabd13ab2407 Mon Sep 17 00:00:00 2001
From: ameysar <andrii.meysar@transoftgroup.com>
Date: Wed, 27 May 2020 14:31:48 +0300
Subject: [PATCH 0305/1718] MC-34482: MFTF tests causing high load on Jenkins
 agents in MTSv1 platform

---
 ...ebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml | 3 ++-
 .../ActionGroup/AdminStartMessageQueueConsumerActionGroup.xml  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml
index 09f37a10fb14d..bb2bd44dec442 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml
@@ -97,7 +97,8 @@
         <!-- Export created below products -->
         <actionGroup ref="ExportAllProductsActionGroup" stepKey="exportCreatedProducts"/>
 
-        <magentoCron stepKey="runCron"/>
+        <!-- Start message queue for export consumer -->
+        <actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
 
         <grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
 
diff --git a/app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/AdminStartMessageQueueConsumerActionGroup.xml b/app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/AdminStartMessageQueueConsumerActionGroup.xml
index 5154c917390d8..31391d38c5807 100644
--- a/app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/AdminStartMessageQueueConsumerActionGroup.xml
+++ b/app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/AdminStartMessageQueueConsumerActionGroup.xml
@@ -16,7 +16,7 @@
             <argument name="consumer" defaultValue="AdminExportMessageConsumerData"/>
         </arguments>
 
-        <magentoCLI command="queue:consumers:start {{consumer.consumer_name}} --max-messages={{consumer.message_limit}} --single-thread" stepKey="startMessageQueue"/>
+        <magentoCLI command="queue:consumers:start {{consumer.consumer_name}} --max-messages={{consumer.message_limit}}" stepKey="startMessageQueue"/>
         <wait time="30" stepKey="waitForQueueStarting"/>
         <reloadPage stepKey="refreshPage"/>
         <waitForPageLoad stepKey="waitForPageLoaded"/>

From d06fd27fbdaa2633c81e9f5babff6aa28b56ffed Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 27 May 2020 14:32:28 +0300
Subject: [PATCH 0306/1718] Get width including scroll bar

---
 .../Ui/view/base/web/js/grid/masonry.js       | 49 +++++++------------
 1 file changed, 18 insertions(+), 31 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/masonry.js b/app/code/Magento/Ui/view/base/web/js/grid/masonry.js
index 7c4ba053f9b66..02025dc951ba8 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/masonry.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/masonry.js
@@ -98,17 +98,10 @@ define([
             if (!rows.length) {
                 return;
             }
-
-            //initialize row observables
-            this.rows().forEach(function (image) {
-                image.styles = ko.observable({});
-                image.css = ko.observable({});
-            });
-
             this.imageMargin = parseInt(this.imageMargin, 10);
             this.container = $('[data-id="' + this.containerId + '"]')[0];
 
-            this.setLayoutStylesWhenLoaded();
+            this.setLayoutStyles();
             this.setEventListener();
 
             return this;
@@ -130,7 +123,7 @@ define([
          * Set layout styles inside the container
          */
         setLayoutStyles: function () {
-            var containerWidth = parseInt(this.container.clientWidth, 10),
+            var containerWidth = parseInt(this.container.clientWidth, 10) - 15,
                 rowImages = [],
                 ratio = 0,
                 rowHeight = 0,
@@ -188,37 +181,25 @@ define([
         },
 
         /**
-         * Call method when condition is true
+         * Wait for container to initialize
          */
-        conditionCallback: function (condition, callback) {
-            if (condition()) {
+        waitForContainer: function (callback) {
+            if (typeof this.container === 'undefined') {
                 setTimeout(function () {
-                    this.conditionCallback(condition, callback);
-                }.bind(this), 100);
+                    this.waitForContainer(callback);
+                }.bind(this), 500);
             } else {
-                callback();
+                setTimeout(callback, 0);
             }
         },
 
         /**
-         * Set layout styles when last image in grid is loaded.
+         * Set layout styles when container element is loaded.
          */
         setLayoutStylesWhenLoaded: function () {
-            var images = '[data-id="' + this.containerId + '"] img';
-
-            this.conditionCallback(
-                function () {
-                    return $(images).length === 0;
-                },
-                function () {
-                    $(images).last().load(function () {
-                        this.setLayoutStyles();
-                    }.bind(this)).each(function () {
-                        if (this.complete) {
-                            $(this).load();
-                        }
-                    });
-                }.bind(this));
+            this.waitForContainer(function () {
+                this.setLayoutStyles();
+            }.bind(this));
         },
 
         /**
@@ -229,6 +210,9 @@ define([
          * @param {Number} height
          */
         setImageStyles: function (img, width, height) {
+            if (!img.styles) {
+                img.styles = ko.observable();
+            }
             img.styles({
                 width: parseInt(width, 10) + 'px',
                 height: parseInt(height, 10) + 'px'
@@ -242,6 +226,9 @@ define([
          * @param {Object} classes
          */
         setImageClass: function (image, classes) {
+            if (!image.css) {
+                image.css = ko.observable(classes);
+            }
             image.css(classes);
         },
 

From e15ff8fb57f14c70f1d7eb57f3f5242ad9892447 Mon Sep 17 00:00:00 2001
From: Serhii Voloshkov <serhii.voloshkov@transoftgroup.com>
Date: Wed, 27 May 2020 14:39:07 +0300
Subject: [PATCH 0307/1718] MC-34482: MFTF tests causing high load

---
 ...AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml | 4 ++--
 .../Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml    | 4 ++--
 .../Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
index 1c12b048e96d0..f8346f5a9dd5c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
@@ -38,8 +38,8 @@
             <!--Open Index Management Page and Select Index mode "Update by Schedule" -->
             <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
             <!-- Run cron twice -->
-            <magentoCLI command="cron:run" stepKey="runCron1"/>
-            <magentoCLI command="cron:run" stepKey="runCron2"/>
+            <magentoCLI command="cron:run" arguments="--group=index" stepKey="runCron1"/>
+            <magentoCLI command="cron:run" arguments="--group=index" stepKey="runCron2"/>
         </before>
         <after>
             <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml
index ff30c46a51c3a..0aa89bdfd45b6 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml
@@ -38,8 +38,8 @@
             <!--Open Index Management Page and Select Index mode "Update by Schedule" -->
             <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
             <!-- Run cron twice -->
-            <magentoCLI command="cron:run" stepKey="runCron1"/>
-            <magentoCLI command="cron:run" stepKey="runCron2"/>
+            <magentoCLI command="cron:run" arguments="--group=index" stepKey="runCron1"/>
+            <magentoCLI command="cron:run" arguments="--group=index" stepKey="runCron2"/>
         </before>
         <after>
             <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml
index 2b4437aed1bb2..171d15fe6ed4f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml
@@ -38,8 +38,8 @@
             <!--Open Index Management Page and Select Index mode "Update by Schedule" -->
             <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
             <!-- Run cron twice -->
-            <magentoCLI command="cron:run" stepKey="runCron1"/>
-            <magentoCLI command="cron:run" stepKey="runCron2"/>
+            <magentoCLI command="cron:run" arguments="--group=index" stepKey="runCron1"/>
+            <magentoCLI command="cron:run" arguments="--group=index" stepKey="runCron2"/>
         </before>
         <after>
             <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>

From 01d2c5cde824715a21ac093c903bc0c5a1af49ea Mon Sep 17 00:00:00 2001
From: ameysar <andrii.meysar@transoftgroup.com>
Date: Wed, 27 May 2020 15:46:28 +0300
Subject: [PATCH 0308/1718] MC-34482: MFTF tests causing high load on Jenkins
 agents in MTSv1 platform

---
 ...nUpdateFlatCategoryIncludeInNavigationTest.xml | 15 ++++++---------
 ...ConfigurableProductsWithAssignedImagesTest.xml |  5 +++--
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml
index 6ee1fd6a58e42..2abd7aecf4342 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml
@@ -29,21 +29,15 @@
             <actionGroup ref="CreateStoreViewActionGroup" stepKey="createCustomStoreViewFr">
                 <argument name="storeView" value="customStoreFR"/>
             </actionGroup>
-            <!--Run full reindex and clear caches -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
             <!--Enable Flat Catalog Category -->
             <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1"/>
             <!--Open Index Management Page and Select Index mode "Update by Schedule" -->
             <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
-            <!-- Run cron twice -->
-            <magentoCLI command="cron:run" stepKey="runCron1"/>
-            <magentoCLI command="cron:run" stepKey="runCron2"/>
+            <!-- Reindex invalidated indices and clear caches -->
+            <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
         </before>
         <after>
-            <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
-            <magentoCLI stepKey="setIndexersMode" command="indexer:set-mode" arguments="realtime" />
-            <magentoCLI stepKey="indexerReindex" command="indexer:reindex" />
             <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
             <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
                 <argument name="customStore" value="customStoreEN"/>
@@ -52,6 +46,9 @@
                 <argument name="customStore" value="customStoreFR"/>
             </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+            <magentoCLI command="config:set catalog/frontend/flat_catalog_category 0 " stepKey="setFlatCatalogCategory"/>
+            <magentoCLI command="indexer:set-mode" arguments="realtime" stepKey="setIndexersMode"/>
+            <magentoCron groups="index" stepKey="reindexInvalidatedIndicesAgain"/>
         </after>
         <!--Verify Category is not listed in navigation menu-->
         <amOnPage url="/{{CatNotIncludeInMenu.name_lwr}}.html"  stepKey="openCategoryPage"/>
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml
index 744e51bfe8896..e9751ef0e982e 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml
@@ -89,7 +89,7 @@
                 <requiredEntity createDataKey="createConfigProduct"/>
             </createData>
 
-            <magentoCron stepKey="runCronIndex" groups="index"/>
+            <magentoCron groups="index" stepKey="runCronIndex"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
@@ -113,7 +113,8 @@
             <argument name="attributeData" value="$$createConfigProduct.sku$$"/>
         </actionGroup>
 
-        <magentoCron stepKey="runCron"/>
+        <!-- Start message queue for export consumer -->
+        <actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
 
         <grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
 

From 5cf1f41889751b5c7adddb97b47ebdc43d8983b8 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Wed, 27 May 2020 09:03:15 -0500
Subject: [PATCH 0309/1718] MC-34518: Address SVC failures for 2.4.0 vs 2.3.5

---
 app/code/Magento/Downloadable/Model/Sample/Builder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Downloadable/Model/Sample/Builder.php b/app/code/Magento/Downloadable/Model/Sample/Builder.php
index 368d190319766..ca1fab224f86f 100644
--- a/app/code/Magento/Downloadable/Model/Sample/Builder.php
+++ b/app/code/Magento/Downloadable/Model/Sample/Builder.php
@@ -76,7 +76,7 @@ public function __construct(
      * Init data for builder
      *
      * @param array $data
-     * @return $this;
+     * @return $this
      * @since 100.1.0
      */
     public function setData(array $data)

From f953f3545453fecfc5d47e2b23411a13aa39b6be Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 27 May 2020 17:30:37 +0300
Subject: [PATCH 0310/1718] Cover changes with jasmine tests

---
 .../Magento/Ui/base/js/grid/masonry.test.js   | 92 ++++++++++++++-----
 1 file changed, 68 insertions(+), 24 deletions(-)

diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/masonry.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/masonry.test.js
index 38ebd57234ea9..f430787b395db 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/masonry.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/masonry.test.js
@@ -5,36 +5,80 @@
 
 /*eslint max-nested-callbacks: 0*/
 define([
-    'Magento_Ui/js/grid/masonry',
-    'jquery'
-], function (Masonry, $) {
+    'jquery',
+    'ko',
+    'Magento_Ui/js/grid/masonry'
+], function ($, ko, Masonry) {
     'use strict';
 
-    describe('Magento_Ui/js/grid/masonry', function () {
-        var model;
-
-        beforeEach(function () {
-            $(document.body).append(
-                $('<div id="masonry_grid"><div class="masonry-image-column"></div></div>')
-            );
-            model = new Masonry({
-                defaults: {
-                    containerId: '#masonry_grid'
-                }
-            });
-        });
+    var Component,
+        rows,
+        params;
+
+    beforeEach(function () {
+        rows = [
+            {
+                _rowIndex: 0,
+                category: {},
+                'category_id': 695,
+                'category_name': 'People',
+                'comp_url': 'https://stock.adobe.com/Rest/Libraries/Watermarked/Download/327515738/2',
+                'content_type': 'image/jpeg',
+                'country_name': 'Malaysia',
+                'creation_date': '2020-03-02 10:41:51',
+                'creator_id': 208217780,
+                'creator_name': 'NajmiArif',
+                height: 3264,
+                id: 327515738,
+                'id_field_name': 'id',
+                'is_downloaded': 0,
+                'is_licensed_locally': 0,
+                keywords: [],
+                'media_type_id': 1,
+                overlay: '',
+                path: '',
+                'premium_level_id': 0,
+                'thumbnail_240_url': 'https://t4.ftcdn.net/jpg/03/27/51/57/240_F_327515738_nA3ke9EPgwmuH60oZrqZV4Fe5r9M6ndj.jpg',
+                'thumbnail_500_ur': 'https://as2.ftcdn.net/jpg/03/27/51/57/500_F_327515738_nA3ke9EPgwmuH60oZrqZV4Fe5r9M6ndj.jpg',
+                title: 'Neon effect picture of man wearing medical mask for viral or pandemic disease',
+                width: 4896
+            }
+
+        ];
 
-        afterEach(function () {
-            $('#masonry_grid').remove();
+        $('<div data-id="masonry_grid" id="masonry_grid"><div class="masonry-image-column"></div></div>').appendTo('body');
+
+        Component = new Masonry({
+            defaults: {
+                rows: ko.observable()
+            }
         });
 
-        describe('check initComponent', function () {
-            it('verify setLayoutstyles called and grid iniztilized', function () {
-                expect(model).toBeDefined();
-            });
-            it('verify events triggered', function () {
-                expect(model).toBeDefined();
+    });
+
+    afterEach(function () {
+        $('#masonry_grid').remove();
+    });
+
+    describe('check initComponent', function () {
+        it('verify setLayoutstyles called and grid iniztilized', function () {
+            var setlayoutStyles = spyOn(Component, 'setLayoutStyles');
+
+            expect(Component).toBeDefined();
+            Component.containerId = 'masonry_grid';
+            Component.initComponent(rows);
+            Component.rows().forEach(function (image) {
+                expect(image.styles).toBeDefined();
+                expect(image.css).toBeDefined();
             });
+            expect(setlayoutStyles).toHaveBeenCalled();
+        });
+        it('verify events triggered', function () {
+            var setLayoutStyles = spyOn(Component, 'setLayoutStyles');
+
+            Component.initComponent(rows);
+            window.dispatchEvent(new Event('resize'));
+            expect(setLayoutStyles).toHaveBeenCalled();
         });
     });
 });

From a0ed711a5235f06cb6d36a308293f0257b93c256 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 27 May 2020 17:42:27 +0300
Subject: [PATCH 0311/1718] Fix static tests

---
 .../app/code/Magento/Ui/base/js/grid/masonry.test.js      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/masonry.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/masonry.test.js
index f430787b395db..2c2cdab2d46da 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/masonry.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/masonry.test.js
@@ -13,7 +13,7 @@ define([
 
     var Component,
         rows,
-        params;
+        container = '<div data-id="masonry_grid" id="masonry_grid"><div class="masonry-image-column"></div></div>';
 
     beforeEach(function () {
         rows = [
@@ -38,15 +38,15 @@ define([
                 overlay: '',
                 path: '',
                 'premium_level_id': 0,
-                'thumbnail_240_url': 'https://t4.ftcdn.net/jpg/03/27/51/57/240_F_327515738_nA3ke9EPgwmuH60oZrqZV4Fe5r9M6ndj.jpg',
-                'thumbnail_500_ur': 'https://as2.ftcdn.net/jpg/03/27/51/57/500_F_327515738_nA3ke9EPgwmuH60oZrqZV4Fe5r9M6ndj.jpg',
+                'thumbnail_240_url': 'https://t4.ftcdn.net/jpg/03/27/51/57/240_F_327515738_n.jpg',
+                'thumbnail_500_ur': 'https://as2.ftcdn.net/jpg/03/27/51/57/500_F_327515738_n.jpg',
                 title: 'Neon effect picture of man wearing medical mask for viral or pandemic disease',
                 width: 4896
             }
 
         ];
 
-        $('<div data-id="masonry_grid" id="masonry_grid"><div class="masonry-image-column"></div></div>').appendTo('body');
+        $(container).appendTo('body');
 
         Component = new Masonry({
             defaults: {

From d2883edd660d86437dfb4f6b177ec9b57f9e33bb Mon Sep 17 00:00:00 2001
From: Mateusz Krzeszowiak <mateusz.krzeszowiak@creativestyle.pl>
Date: Wed, 27 May 2020 16:50:02 +0200
Subject: [PATCH 0312/1718] Properly escape dot in CSS selector for test

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

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml
index 49e0d3eb4e0d7..5c7bae5392403 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml
@@ -12,7 +12,7 @@
         <element name="collapseAll" type="button" selector=".tree-actions a:first-child"/>
         <element name="expandAll" type="button" selector=".tree-actions a:last-child"/>
         <element name="categoryHighlighted" type="text" selector="//div[@id='store.menu']//span[contains(text(),'{{name}}')]/ancestor::li" parameterized="true" timeout="30"/>
-        <element name="categoryNotHighlighted" type="text" selector="#store\.menu ul li.active" timeout="30"/>
+        <element name="categoryNotHighlighted" type="text" selector="#store\\.menu ul li.active" timeout="30"/>
         <element name="categoryTreeRoot" type="text" selector="div.x-tree-root-node>li.x-tree-node:first-of-type>div.x-tree-node-el:first-of-type" timeout="30"/>
         <element name="categoryInTree" type="text" selector="//a/span[contains(text(), '{{name}}')]" parameterized="true" timeout="30"/>
         <element name="categoryInTreeUnderRoot" type="text" selector="//li/ul/li[@class='x-tree-node']/div/a/span[contains(text(), '{{name}}')]" parameterized="true"/>

From a63e68113f978ce0c24b1a2221a314b0fdbcbebe Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 27 May 2020 23:15:49 +0300
Subject: [PATCH 0313/1718] Trigger styles update on last loaded image event

---
 .../Ui/view/base/web/js/grid/columns/image.js | 10 ++++++++++
 .../Ui/view/base/web/js/grid/masonry.js       | 19 +++++++++++++------
 .../web/templates/grid/columns/image.html     |  2 +-
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/columns/image.js b/app/code/Magento/Ui/view/base/web/js/grid/columns/image.js
index e8e1cf3246c76..611a14ce778de 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/columns/image.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/columns/image.js
@@ -11,6 +11,7 @@ define([
         defaults: {
             bodyTmpl: 'ui/grid/columns/image',
             modules: {
+                masonry: '${ $.parentName }',
                 previewComponent: '${ $.parentName }.preview'
             },
             previewRowId: null,
@@ -35,6 +36,15 @@ define([
             return this;
         },
 
+        /**
+         * Updates styles when image loaded.
+         *
+         * @param {Object} record
+         */
+        updateStyles: function (record) {
+            !record.lastInRow || this.masonry().updateStyles();
+        },
+
         /**
          * Returns url to given record.
          *
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/masonry.js b/app/code/Magento/Ui/view/base/web/js/grid/masonry.js
index 02025dc951ba8..cddde1ba23785 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/masonry.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/masonry.js
@@ -101,8 +101,8 @@ define([
             this.imageMargin = parseInt(this.imageMargin, 10);
             this.container = $('[data-id="' + this.containerId + '"]')[0];
 
-            this.setLayoutStyles();
             this.setEventListener();
+            this.setLayoutStyles();
 
             return this;
         },
@@ -112,18 +112,25 @@ define([
          */
         setEventListener: function () {
             window.addEventListener('resize', function () {
-                raf(function () {
-                    this.containerWidth = window.innerWidth;
-                    this.setLayoutStyles();
-                }.bind(this), this.refreshFPS);
+                this.updateStyles();
             }.bind(this));
         },
 
+        /**
+         * Updates styles for component.
+         */
+        updateStyles: function () {
+            raf(function () {
+                this.containerWidth = window.innerWidth;
+                this.setLayoutStyles();
+            }.bind(this), this.refreshFPS);
+        },
+
         /**
          * Set layout styles inside the container
          */
         setLayoutStyles: function () {
-            var containerWidth = parseInt(this.container.clientWidth, 10) - 15,
+            var containerWidth = parseInt(this.container.clientWidth, 10),
                 rowImages = [],
                 ratio = 0,
                 rowHeight = 0,
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/columns/image.html b/app/code/Magento/Ui/view/base/web/templates/grid/columns/image.html
index fa0074ad72283..e9834ac449cce 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/columns/image.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/columns/image.html
@@ -5,5 +5,5 @@
  */
 -->
 <div class="masonry-image-block" ko-style="$col.getStyles($row())" css="{'active': $col.getIsActive($row())}" attr="'data-id': $col.getId($row())">
-    <img attr="src: $col.getUrl($row())" css="$col.getClasses($row())" click="function(){ expandPreview($row()) }" data-role="thumbnail"/>
+    <img data-bind="event: { load: updateStyles($row()) }" attr="src: $col.getUrl($row())" css="$col.getClasses($row())" click="function(){ expandPreview($row()) }" data-role="thumbnail"/>
 </div>

From 2133abce671bb6b09a835eec80e265568f9b3960 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 27 May 2020 23:20:08 +0300
Subject: [PATCH 0314/1718] fix identation

---
 app/code/Magento/Ui/view/base/web/js/grid/masonry.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/masonry.js b/app/code/Magento/Ui/view/base/web/js/grid/masonry.js
index cddde1ba23785..ac17c7fb565e1 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/masonry.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/masonry.js
@@ -101,8 +101,8 @@ define([
             this.imageMargin = parseInt(this.imageMargin, 10);
             this.container = $('[data-id="' + this.containerId + '"]')[0];
 
-            this.setEventListener();
             this.setLayoutStyles();
+            this.setEventListener();
 
             return this;
         },

From c3650ca5589db42b515e89b1b239d34ca70a8ca9 Mon Sep 17 00:00:00 2001
From: Maksym Aposov <maposov@magento.com>
Date: Wed, 27 May 2020 16:30:55 -0500
Subject: [PATCH 0315/1718] MC-34427: Cleanup travis configuration

---
 .../integration/testsuite/Magento/Phpserver/PhpserverTest.php  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev/tests/integration/testsuite/Magento/Phpserver/PhpserverTest.php b/dev/tests/integration/testsuite/Magento/Phpserver/PhpserverTest.php
index 4ae8c51c45a97..53ed800dbdb31 100644
--- a/dev/tests/integration/testsuite/Magento/Phpserver/PhpserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Phpserver/PhpserverTest.php
@@ -37,6 +37,9 @@ private function getUrl($url)
         return sprintf('http://%s/%s', self::BASE_URL, ltrim($url, '/'));
     }
 
+    /**
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     */
     protected function setUp(): void
     {
         $this->httpClient = new \Laminas\Http\Client(null, ['timeout' => 10]);

From 3ba7d03e2df215c59d2a99a2b4def21f19226326 Mon Sep 17 00:00:00 2001
From: ameysar <andrii.meysar@transoftgroup.com>
Date: Thu, 28 May 2020 10:29:34 +0300
Subject: [PATCH 0316/1718] MC-34482: MFTF tests causing high load on Jenkins
 agents in MTSv1 platform

---
 ...UpdateProductAttributesGlobalScopeTest.xml | 24 ++++++++++---------
 .../Test/Mftf/Data/QueueConsumerData.xml      |  6 ++++-
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
index 31b5961edaaaa..089ce35b32f78 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
@@ -30,6 +30,7 @@
             <createData entity="ApiSimpleProduct" stepKey="createProductTwo">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
+            <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
         </before>
         <after>
             <deleteData createDataKey="createProductOne" stepKey="deleteProductOne"/>
@@ -39,6 +40,7 @@
             <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
             <actionGroup ref="ClearProductsFilterActionGroup" stepKey="clearProductFilter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
+            <magentoCron groups="index" stepKey="reindexInvalidatedIndicesAfterDelete"/>
         </after>
 
         <!-- Search and select products -->
@@ -59,22 +61,22 @@
         <actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="AdminSwitchStoreViewActionGroup"/>
         <!-- Update attribute -->
         <checkOption selector="{{AdminEditProductAttributesSection.ChangeAttributePriceToggle}}" stepKey="toggleToChangePrice"/>
-        <fillField selector="{{AdminEditProductAttributesSection.AttributePrice}}" userInput="$$createProductOne.price$$0" stepKey="fillAttributeNameField"/>
+        <fillField selector="{{AdminEditProductAttributesSection.AttributePrice}}" userInput="$createProductOne.price$0" stepKey="fillAttributeNameField"/>
         <click selector="{{AdminEditProductAttributesSection.Save}}" stepKey="save"/>
         <waitForElementVisible selector="{{AdminMessagesSection.success}}" time="60" stepKey="waitForSuccessMessage"/>
         <see selector="{{AdminMessagesSection.success}}" userInput="Message is added to queue" stepKey="seeAttributeUpdateSuccessMsg"/>
 
-        <!-- Run cron twice -->
-        <magentoCLI command="cron:run" arguments="--group=consumers" stepKey="runCron1"/>
-        <magentoCLI command="cron:run" arguments="--group=consumers" stepKey="runCron2"/>
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <!-- Start message queue for product attribute consumer -->
+        <actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue">
+            <argument name="consumer" value="AdminProductAttributeUpdateMessageConsumerData"/>
+        </actionGroup>
 
         <!-- Assert on storefront default view -->
         <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupDefault"/>
         <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndPriceActionGroup" stepKey="searchByNameDefault">
-            <argument name="name" value="&quot;$$createProductOne.name$$&quot;"/>
-            <argument name="priceFrom" value="$$createProductOne.price$$0"/>
-            <argument name="priceTo" value="$$createProductOne.price$$0"/>
+            <argument name="name" value="&quot;$createProductOne.name$&quot;"/>
+            <argument name="priceFrom" value="$createProductOne.price$0"/>
+            <argument name="priceTo" value="$createProductOne.price$0"/>
         </actionGroup>
         <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResultDefault"/>
         <waitForElementVisible selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="waitForSearchResultInDefaultView"/>
@@ -84,9 +86,9 @@
         <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupCustom"/>
         <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="StorefrontSwitchStoreViewActionGroup"/>
         <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndPriceActionGroup" stepKey="searchByNameCustom">
-            <argument name="name" value="&quot;$$createProductOne.name$$&quot;"/>
-            <argument name="priceFrom" value="$$createProductOne.price$$0"/>
-            <argument name="priceTo" value="$$createProductOne.price$$0"/>
+            <argument name="name" value="&quot;$createProductOne.name$&quot;"/>
+            <argument name="priceFrom" value="$createProductOne.price$0"/>
+            <argument name="priceTo" value="$createProductOne.price$0"/>
         </actionGroup>
         <actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResultCustom"/>
         <waitForElementVisible selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="waitForSearchResultInCustomView"/>
diff --git a/app/code/Magento/MessageQueue/Test/Mftf/Data/QueueConsumerData.xml b/app/code/Magento/MessageQueue/Test/Mftf/Data/QueueConsumerData.xml
index 513e2ec3fc131..2fca33979bc3c 100644
--- a/app/code/Magento/MessageQueue/Test/Mftf/Data/QueueConsumerData.xml
+++ b/app/code/Magento/MessageQueue/Test/Mftf/Data/QueueConsumerData.xml
@@ -10,6 +10,10 @@
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="AdminExportMessageConsumerData">
         <data key="consumer_name">exportProcessor</data>
-        <data key="message_limit">1</data>
+        <data key="message_limit">100</data>
+    </entity>
+    <entity name="AdminProductAttributeUpdateMessageConsumerData">
+        <data key="consumer_name">product_action_attribute.update</data>
+        <data key="message_limit">100</data>
     </entity>
 </entities>

From 217e993560cb2db16a76bf29797e649ca6d2d678 Mon Sep 17 00:00:00 2001
From: Mateusz Krzeszowiak <mateusz.krzeszowiak@creativestyle.pl>
Date: Thu, 28 May 2020 09:42:57 +0200
Subject: [PATCH 0317/1718] Fix selector once again

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

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml
index 5c7bae5392403..498321b9f3d81 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml
@@ -12,7 +12,7 @@
         <element name="collapseAll" type="button" selector=".tree-actions a:first-child"/>
         <element name="expandAll" type="button" selector=".tree-actions a:last-child"/>
         <element name="categoryHighlighted" type="text" selector="//div[@id='store.menu']//span[contains(text(),'{{name}}')]/ancestor::li" parameterized="true" timeout="30"/>
-        <element name="categoryNotHighlighted" type="text" selector="#store\\.menu ul li.active" timeout="30"/>
+        <element name="categoryNotHighlighted" type="text" selector="[id='store.menu'] ul li.active" timeout="30"/>
         <element name="categoryTreeRoot" type="text" selector="div.x-tree-root-node>li.x-tree-node:first-of-type>div.x-tree-node-el:first-of-type" timeout="30"/>
         <element name="categoryInTree" type="text" selector="//a/span[contains(text(), '{{name}}')]" parameterized="true" timeout="30"/>
         <element name="categoryInTreeUnderRoot" type="text" selector="//li/ul/li[@class='x-tree-node']/div/a/span[contains(text(), '{{name}}')]" parameterized="true"/>

From 4a6b4a488aba2c441ce24dc5f4f220afa5568d4d Mon Sep 17 00:00:00 2001
From: ameysar <andrii.meysar@transoftgroup.com>
Date: Thu, 28 May 2020 14:04:18 +0300
Subject: [PATCH 0318/1718] MC-34482: MFTF tests causing high load on Jenkins
 agents in MTSv1 platform

---
 .../Test/AdminExportGroupedProductWithSpecialPriceTest.xml | 2 ++
 .../AdminExportImportConfigurableProductWithImagesTest.xml | 7 ++++---
 ...tSimpleAndConfigurableProductsWithCustomOptionsTest.xml | 5 ++++-
 ...roductAndConfigurableProductsWithAssignedImagesTest.xml | 2 ++
 ...teAndConfigurableProductAssignedToCustomWebsiteTest.xml | 2 ++
 .../AdminStartMessageQueueConsumerActionGroup.xml          | 2 --
 6 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml
index c5152356632e3..e84700d39199b 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml
@@ -69,6 +69,8 @@
 
         <!-- Start message queue for export consumer -->
         <actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
+        <reloadPage stepKey="refreshPage"/>
+        <waitForPageLoad stepKey="waitForPageLoaded"/>
 
         <grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
 
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportImportConfigurableProductWithImagesTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportImportConfigurableProductWithImagesTest.xml
index 8eba6a39f6199..a26a5d9d7c5b0 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportImportConfigurableProductWithImagesTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportImportConfigurableProductWithImagesTest.xml
@@ -164,9 +164,10 @@
             <argument name="attributeData" value="$$createExportImportConfigurableProduct.sku$$"/>
         </actionGroup>
 
-        <!-- Run cron twice -->
-        <magentoCLI command="cron:run" stepKey="runCronFirstTime"/>
-        <magentoCLI command="cron:run" stepKey="runCronSecondTime"/>
+        <!-- Start message queue for export consumer -->
+        <actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
+        <reloadPage stepKey="refreshPage"/>
+        <waitForPageLoad stepKey="waitForPageLoaded"/>
 
         <grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
 
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml
index 44f7b91324025..a7ce332d7318b 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml
@@ -98,7 +98,10 @@
             <argument name="attributeData" value="$$createConfigProduct.sku$$"/>
         </actionGroup>
 
-        <magentoCron stepKey="runCron"/>
+        <!-- Start message queue for export consumer -->
+        <actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
+        <reloadPage stepKey="refreshPage"/>
+        <waitForPageLoad stepKey="waitForPageLoaded"/>
 
         <grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
 
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml
index e9751ef0e982e..1048684a9dd44 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml
@@ -115,6 +115,8 @@
 
         <!-- Start message queue for export consumer -->
         <actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
+        <reloadPage stepKey="refreshPage"/>
+        <waitForPageLoad stepKey="waitForPageLoaded"/>
 
         <grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
 
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml
index bb2bd44dec442..56c9f5e3e6390 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml
@@ -99,6 +99,8 @@
 
         <!-- Start message queue for export consumer -->
         <actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
+        <reloadPage stepKey="refreshPage"/>
+        <waitForPageLoad stepKey="waitForPageLoaded"/>
 
         <grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
 
diff --git a/app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/AdminStartMessageQueueConsumerActionGroup.xml b/app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/AdminStartMessageQueueConsumerActionGroup.xml
index 31391d38c5807..4c423844b17fd 100644
--- a/app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/AdminStartMessageQueueConsumerActionGroup.xml
+++ b/app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/AdminStartMessageQueueConsumerActionGroup.xml
@@ -18,7 +18,5 @@
 
         <magentoCLI command="queue:consumers:start {{consumer.consumer_name}} --max-messages={{consumer.message_limit}}" stepKey="startMessageQueue"/>
         <wait time="30" stepKey="waitForQueueStarting"/>
-        <reloadPage stepKey="refreshPage"/>
-        <waitForPageLoad stepKey="waitForPageLoaded"/>
     </actionGroup>
 </actionGroups>

From 523c773e80dd9a911c46b6f9ddfe496bdf9bb33a Mon Sep 17 00:00:00 2001
From: Stas Kozar <stas.kozar@transoftgroup.com>
Date: Thu, 28 May 2020 14:52:54 +0300
Subject: [PATCH 0319/1718] MC-34482: MFTF tests causing high load on Jenkins
 agents in MTSv1 platform

---
 ...sUpdateAttributesForBundleProductsTest.xml |  9 ++++----
 ...dateFlatCategoryNameAndDescriptionTest.xml |  9 +++-----
 .../Test/AdminExportBundleProductTest.xml     |  7 ++++--
 ...inStartMessageQueueConsumerActionGroup.xml | 22 ++++++++++++++++++
 .../Test/Mftf/Data/QueueConsumerData.xml      | 23 +++++++++++++++++++
 .../StorefrontAutoGeneratedCouponCodeTest.xml |  7 +++---
 6 files changed, 62 insertions(+), 15 deletions(-)
 create mode 100644 app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/AdminStartMessageQueueConsumerActionGroup.xml
 create mode 100644 app/code/Magento/MessageQueue/Test/Mftf/Data/QueueConsumerData.xml

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminShouldBeAbleToMassUpdateAttributesForBundleProductsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminShouldBeAbleToMassUpdateAttributesForBundleProductsTest.xml
index caf500762883c..2338b44b186ab 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminShouldBeAbleToMassUpdateAttributesForBundleProductsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminShouldBeAbleToMassUpdateAttributesForBundleProductsTest.xml
@@ -34,7 +34,7 @@
                 <requiredEntity createDataKey="createBundleOption"/>
                 <requiredEntity createDataKey="createSimpleProduct"/>
             </createData>
-            <magentoCron stepKey="runCronIndex" groups="index"/>
+            <magentoCLI stepKey="runCronIndex" command="cron:run --group=index"/>
         </before>
         <after>
             <!-- Delete Simple Product -->
@@ -56,9 +56,10 @@
         <actionGroup ref="AdminUpdateProductNameAndDescriptionAttributes" stepKey="updateProductAttribute">
             <argument name="product" value="UpdateAttributeNameAndDescription"/>
         </actionGroup>
-        <!--Run cron twice-->
-        <magentoCLI command="cron:run" stepKey="cronRun"/>
-        <magentoCLI command="cron:run" stepKey="cronRunTwice"/>
+        <!-- Start message queue for product attribute consumer -->
+        <actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue">
+            <argument name="consumer" value="AdminProductAttributeUpdateMessageConsumerData"/>
+        </actionGroup>
         <!-- Search for a product with a new name and Open Product -->
         <actionGroup ref="FilterProductGridByNameActionGroup" stepKey="searchWithNewProductName">
             <argument name="product" value="UpdateAttributeNameAndDescription"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml
index dd79dd6824bbb..1aea42e0f7f63 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml
@@ -30,16 +30,13 @@
             <actionGroup ref="CreateStoreViewActionGroup" stepKey="createCustomStoreViewFr">
                 <argument name="storeView" value="customStoreFR"/>
             </actionGroup>
-            <!--Run full reindex and clear caches -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
             <!--Enable Flat Catalog Category -->
             <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1"/>
             <!--Open Index Management Page and Select Index mode "Update by Schedule" -->
             <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
-            <!-- Run cron twice -->
-            <magentoCLI command="cron:run" stepKey="runCron1"/>
-            <magentoCLI command="cron:run" stepKey="runCron2"/>
+            <!--Run full reindex and clear caches -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
         </before>
         <after>
             <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml
index 97eac1ff723a0..3a6561e80c110 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml
@@ -80,7 +80,10 @@
                 <requiredEntity createDataKey="secondSimpleProductForFixedWithAttribute"/>
             </createData>
 
-            <magentoCron stepKey="runCron"/>
+            <!-- Start message queue for export consumer -->
+            <actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
+            <reloadPage stepKey="refreshPage"/>
+            <waitForPageLoad stepKey="waitForPageLoaded"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
@@ -96,7 +99,7 @@
             <deleteData createDataKey="createProductAttribute" stepKey="deleteProductAttribute"/>
 
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
-            <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
+            <magentoCLI command="cron:run --group=index" stepKey="reindexInvalidatedIndices"/>
         </after>
 
         <!-- Go to export page -->
diff --git a/app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/AdminStartMessageQueueConsumerActionGroup.xml b/app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/AdminStartMessageQueueConsumerActionGroup.xml
new file mode 100644
index 0000000000000..032ef4549f943
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/AdminStartMessageQueueConsumerActionGroup.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="AdminStartMessageQueueConsumerActionGroup">
+        <annotations>
+            <description>Starts message queue for specific consumer.</description>
+        </annotations>
+        <arguments>
+            <argument name="consumer" defaultValue="AdminExportMessageConsumerData"/>
+        </arguments>
+
+        <magentoCLI command="queue:consumers:start {{consumer.consumer_name}} --max-messages={{consumer.message_limit}} --single-thread" stepKey="startMessageQueue"/>
+        <wait time="30" stepKey="waitForQueueStarting"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MessageQueue/Test/Mftf/Data/QueueConsumerData.xml b/app/code/Magento/MessageQueue/Test/Mftf/Data/QueueConsumerData.xml
new file mode 100644
index 0000000000000..b5da26f6ae5b1
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Test/Mftf/Data/QueueConsumerData.xml
@@ -0,0 +1,23 @@
+<?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="AdminExportMessageConsumerData">
+        <data key="consumer_name">exportProcessor</data>
+        <data key="message_limit">100</data>
+    </entity>
+    <entity name="AdminProductAttributeUpdateMessageConsumerData">
+        <data key="consumer_name">product_action_attribute.update</data>
+        <data key="message_limit">100</data>
+    </entity>
+    <entity name="AdminCodeGeneratorMessageConsumerData">
+        <data key="consumer_name">codegeneratorProcessor</data>
+        <data key="message_limit">100</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontAutoGeneratedCouponCodeTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontAutoGeneratedCouponCodeTest.xml
index 09b45cd554056..bdf4b49b67621 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontAutoGeneratedCouponCodeTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontAutoGeneratedCouponCodeTest.xml
@@ -59,9 +59,10 @@
         <see selector="{{AdminCartPriceRulesFormSection.successMessage}}" userInput="Message is added to queue, wait to get your coupons soon"
              stepKey="seeSuccessMessage"/>
 
-        <!-- Run cron twice -->
-        <magentoCLI command="cron:run" stepKey="runCron1"/>
-        <magentoCLI command="cron:run" stepKey="runCron2"/>
+        <!-- Start message queue for export consumer -->
+        <actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue">
+            <argument name="consumer" value="AdminCodeGeneratorMessageConsumerData"/>
+        </actionGroup>
         <reloadPage stepKey="refreshPage"/>
         <waitForPageLoad stepKey="waitFormToReload1"/>
         <conditionalClick selector="{{AdminCartPriceRulesFormSection.manageCouponCodesHeader}}"

From 18966220b9cc9cfccea4acf2b01697776d3eb1d4 Mon Sep 17 00:00:00 2001
From: Serhii Voloshkov <serhii.voloshkov@transoftgroup.com>
Date: Thu, 28 May 2020 15:41:52 +0300
Subject: [PATCH 0320/1718] MC-34482: MFTF tests causing high load

---
 .../AdminConfigurableProductBulkUpdateTest.xml            | 8 ++++----
 .../AdminCreateCartPriceRuleForGeneratedCouponTest.xml    | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest/AdminConfigurableProductBulkUpdateTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest/AdminConfigurableProductBulkUpdateTest.xml
index bd409d0e4bfde..02e2520c04672 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest/AdminConfigurableProductBulkUpdateTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest/AdminConfigurableProductBulkUpdateTest.xml
@@ -65,10 +65,10 @@
         <waitForElementVisible selector="{{AdminProductMessagesSection.successMessage}}" time="60" stepKey="waitForSuccessMessage"/>
         <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeAttributeUpdateSuccessMsg"/>
 
-        <!-- Run cron twice -->
-        <magentoCLI command="cron:run" arguments="--group=consumers" stepKey="runCron1"/>
-        <magentoCLI command="cron:run" arguments="--group=consumers" stepKey="runCron2"/>
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <!-- Apply changes -->
+        <actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue">
+            <argument name="consumer" value="AdminProductAttributeUpdateMessageConsumerData"/>
+        </actionGroup>
 
         <!-- Check storefront for description -->
         <amOnPage url="{{StorefrontProductPage.url($$createProduct1.custom_attributes[url_key]$$)}}" stepKey="goToFirstProductPageOnStorefront"/>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml
index 24c3a7cd44bc8..7b74e14c72f97 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml
@@ -55,9 +55,10 @@
         <click selector="{{AdminCartPriceRulesFormSection.generateCouponsButton}}" stepKey="clickGenerate"/>
         <see selector="{{AdminCartPriceRulesFormSection.successMessage}}" userInput="Message is added to queue, wait to get your coupons soon" stepKey="seeGenerationSuccess"/>
 
-        <!-- Run cron twice -->
-        <magentoCLI command="cron:run" stepKey="runCron1"/>
-        <magentoCLI command="cron:run" stepKey="runCron2"/>
+        <!-- Apply changes -->
+        <actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue">
+            <argument name="consumer" value="AdminCodeGeneratorMessageConsumerData"/>
+        </actionGroup>
         <reloadPage stepKey="refreshPage"/>
         <waitForPageLoad stepKey="waitFormToReload1"/>
         <click selector="{{AdminCartPriceRulesFormSection.manageCouponCodesHeader}}" stepKey="expandCouponSection2"/>

From caecffe4f848707788c1a4f6bebf1a2bbe2168d9 Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Thu, 28 May 2020 15:51:39 +0300
Subject: [PATCH 0321/1718] MC-34482: MFTF tests causing high load

---
 ...rtSimpleProductWithCustomAttributeTest.xml |  9 +++++---
 ...inStartMessageQueueConsumerActionGroup.xml | 22 +++++++++++++++++++
 .../Test/Mftf/Data/QueueConsumerData.xml      | 13 +++++++++++
 3 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/AdminStartMessageQueueConsumerActionGroup.xml
 create mode 100644 app/code/Magento/MessageQueue/Test/Mftf/Data/QueueConsumerData.xml

diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml
index 8cea7985aa6d7..daa24362ebeae 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml
@@ -28,7 +28,8 @@
                 <requiredEntity createDataKey="createAttributeSet"/>
             </createData>
 
-            <magentoCron stepKey="runCron"/>
+            <magentoCLI command="cron:run" arguments="--group index" stepKey="cronRun"/>
+            <magentoCLI command="cron:run" arguments="--group index" stepKey="cronRunToStartReindex"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
@@ -48,8 +49,10 @@
         <!-- Export created below products -->
         <actionGroup ref="ExportAllProductsActionGroup" stepKey="exportCreatedProducts"/>
 
-        <magentoCron stepKey="runCronIndex" groups="index"/>
-
+        <!-- Start message queue for export consumer -->
+        <actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
+        <reloadPage stepKey="pageReload" />
+        <waitForPageLoad stepKey="waitForPageLoaded" />
         <grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
 
         <!-- Download product -->
diff --git a/app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/AdminStartMessageQueueConsumerActionGroup.xml b/app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/AdminStartMessageQueueConsumerActionGroup.xml
new file mode 100644
index 0000000000000..4c423844b17fd
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/AdminStartMessageQueueConsumerActionGroup.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="AdminStartMessageQueueConsumerActionGroup">
+        <annotations>
+            <description>Starts message queue for specific consumer.</description>
+        </annotations>
+        <arguments>
+            <argument name="consumer" defaultValue="AdminExportMessageConsumerData"/>
+        </arguments>
+
+        <magentoCLI command="queue:consumers:start {{consumer.consumer_name}} --max-messages={{consumer.message_limit}}" stepKey="startMessageQueue"/>
+        <wait time="30" stepKey="waitForQueueStarting"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MessageQueue/Test/Mftf/Data/QueueConsumerData.xml b/app/code/Magento/MessageQueue/Test/Mftf/Data/QueueConsumerData.xml
new file mode 100644
index 0000000000000..2cc8e9c420016
--- /dev/null
+++ b/app/code/Magento/MessageQueue/Test/Mftf/Data/QueueConsumerData.xml
@@ -0,0 +1,13 @@
+<?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="AdminExportMessageConsumerData">
+        <data key="consumer_name">exportProcessor</data>
+        <data key="message_limit">100</data>
+    </entity>
+</entities>

From a6f460dbe499df42c69af40b0fd51e05d0d6aa39 Mon Sep 17 00:00:00 2001
From: "v.prokopov" <v.prokopov@atwix.com>
Date: Thu, 28 May 2020 16:29:40 +0300
Subject: [PATCH 0322/1718] fixed refund issue for downloadable items

---
 .../Observer/SetLinkStatusObserver.php            | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/app/code/Magento/Downloadable/Observer/SetLinkStatusObserver.php b/app/code/Magento/Downloadable/Observer/SetLinkStatusObserver.php
index 971feafb857a9..a450651952a7e 100644
--- a/app/code/Magento/Downloadable/Observer/SetLinkStatusObserver.php
+++ b/app/code/Magento/Downloadable/Observer/SetLinkStatusObserver.php
@@ -61,6 +61,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             'payment_pending' => \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_PENDING_PAYMENT,
             'payment_review' => \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_PAYMENT_REVIEW,
         ];
+        $expiredOrderItemIds = [];
 
         $downloadableItemsStatuses = [];
         $orderItemStatusToEnable = $this->_scopeConfig->getValue(
@@ -114,6 +115,10 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                     if (in_array($item->getStatusId(), $availableStatuses)) {
                         $downloadableItemsStatuses[$item->getId()] = $linkStatuses['avail'];
                     }
+
+                    if ($item->getQtyOrdered() - $item->getQtyRefunded() == 0) {
+                        $expiredOrderItemIds[] = $item->getId();
+                    }
                 }
             }
         }
@@ -141,6 +146,16 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             }
         }
 
+        if ($expiredOrderItemIds) {
+            $linkPurchased = $this->_createItemsCollection()->addFieldToFilter(
+                'order_item_id',
+                ['in' => $expiredOrderItemIds]
+            );
+            foreach ($linkPurchased as $link) {
+                $link->setStatus(\Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_EXPIRED)->save();
+            }
+        }
+
         return $this;
     }
 

From f20861208ad917fe57b93ed6c1b0706e2e091191 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <svitja@ukr.net>
Date: Thu, 28 May 2020 16:42:04 +0300
Subject: [PATCH 0323/1718] MC-34482: MFTF tests causing high load on Jenkins
 agents in MTSv1 platform

---
 .../Test/Mftf/Data/QueueConsumerData.xml      | 19 +++++++++++++++++++
 .../Test/AdminMassProductPriceUpdateTest.xml  | 11 ++++++-----
 .../AdminMoveProductBetweenCategoriesTest.xml |  4 ++--
 ...tributeIsUndefinedCatalogPriceRuleTest.xml |  6 ++----
 ...minUrlForProductRewrittenCorrectlyTest.xml | 11 ++++++-----
 5 files changed, 35 insertions(+), 16 deletions(-)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Data/QueueConsumerData.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/QueueConsumerData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/QueueConsumerData.xml
new file mode 100644
index 0000000000000..2c01b2a573f1e
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/QueueConsumerData.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="AdminProductAttributeUpdateConsumerData">
+        <data key="consumer_name">product_action_attribute.update</data>
+        <data key="message_limit">100</data>
+    </entity>
+    <entity name="AdminProductAttributeWebsiteUpdateConsumerData">
+        <data key="consumer_name">product_action_attribute.website.update</data>
+        <data key="message_limit">100</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml
index e8e0d449aee4e..ebf8d9acb851f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml
@@ -56,11 +56,12 @@
         <waitForPageLoad stepKey="waitForUpdatedProductToSave" />
         <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeAttributeUpateSuccessMsg"/>
 
-        <!-- Run cron twice -->
-        <magentoCLI command="cron:run" stepKey="runCron1"/>
-        <magentoCLI command="cron:run" stepKey="runCron2"/>
-        <reloadPage stepKey="refreshPage"/>
-        <waitForPageLoad stepKey="waitFormToReload1"/>
+        <!-- Start message queue -->
+        <actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueueConsumer">
+            <argument name="consumer" value="AdminProductAttributeUpdateConsumerData"/>
+        </actionGroup>
+        <!-- Run cron -->
+        <magentoCLI command="cron:run --group=index" stepKey="runCron"/>
 
         <!--Verify product name, sku and updated price-->
         <click stepKey="openFirstProduct" selector="{{AdminProductGridSection.productRowBySku($$simpleProduct1.sku$$)}}"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml
index fe31456aca334..055f4e23cd9e7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml
@@ -116,7 +116,7 @@
         <see userInput="You saved the product." selector="{{CatalogProductsSection.messageSuccessSavedProduct}}" stepKey="seeSuccessMessage"/>
 
         <!-- Run cron -->
-        <magentoCLI command="cron:run" stepKey="runCron"/>
+        <magentoCLI command="cron:run --group=index" stepKey="runCron"/>
 
         <!-- Clear invalidated cache on System>Tools>Cache Management page  -->
         <amOnPage url="{{AdminCacheManagementPage.url}}" stepKey="onCachePage"/>
@@ -188,7 +188,7 @@
         <see userInput="You saved the product." selector="{{CatalogProductsSection.messageSuccessSavedProduct}}" stepKey="seeSaveMessage"/>
 
         <!-- Run cron -->
-        <magentoCLI command="cron:run" stepKey="runCron2"/>
+        <magentoCLI command="cron:run --group=index" stepKey="runCron2"/>
 
         <!-- Open frontend -->
         <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="onFrontendPage"/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml
index 6c436fee808a7..9d7607d7521c9 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml
@@ -44,7 +44,7 @@
             <createData entity="productDropDownAttribute" stepKey="createSecondProductAttribute">
                 <field key="scope">website</field>
             </createData>
-            <magentoCron stepKey="runCronIndex" groups="index"/>
+            <magentoCLI command="cron:run --group=index" stepKey="runCron"/>
         </before>
         <after>
 
@@ -64,7 +64,7 @@
             <deleteData createDataKey="createSecondProductAttribute" stepKey="deleteSecondProductAttribute"/>
 
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
-            <magentoCron stepKey="runCronIndex" groups="index"/>
+            <magentoCLI command="cron:run --group=index" stepKey="runCron"/>
         </after>
 
         <!--Create catalog price rule-->
@@ -80,7 +80,6 @@
             <argument name="targetSelectValue" value="is undefined"/>
         </actionGroup>
         <click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="clickSaveAndApplyRules"/>
-        <wait time="60" stepKey="waitMinute"/>
         <magentoCLI command="indexer:reindex" stepKey="reindex"/>
         <magentoCLI command="cache:flush" stepKey="flushCache"/>
         <magentoCLI command="cache:flush" stepKey="flushCache3"/>
@@ -129,7 +128,6 @@
             <argument name="targetSelectValue" value="is undefined"/>
         </actionGroup>
         <click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="clickSaveAndApplyRules1"/>
-        <wait time="60" stepKey="waitForMinute"/>
         <magentoCLI command="indexer:reindex" stepKey="reindex1"/>
         <magentoCLI command="cache:flush" stepKey="flushCache1"/>
         <magentoCLI command="cache:flush" stepKey="flushCache2"/>
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml
index 75ae9d821c356..5190e007b668f 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml
@@ -72,11 +72,12 @@
         <click selector="{{AdminUpdateAttributesSection.saveButton}}" stepKey="clickSave"/>
         <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeSaveSuccess"/>
 
-        <!-- Run cron twice -->
-        <magentoCLI command="cron:run" stepKey="runCron1"/>
-        <magentoCLI command="cron:run" stepKey="runCron2"/>
-        <reloadPage stepKey="refreshPage"/>
-        <waitForPageLoad stepKey="waitFormToReload1"/>
+        <!-- Start message queue -->
+        <actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueueConsumer">
+            <argument name="consumer" value="AdminProductAttributeWebsiteUpdateConsumerData"/>
+        </actionGroup>
+        <!-- Run cron -->
+        <magentoCLI command="cron:run --group=index" stepKey="runCron"/>
 
         <!--Got to Store front product page and check url-->
         <amOnPage url="{{StorefrontProductPage.url($$createProduct.sku$$-new)}}" stepKey="navigateToSimpleProductPage"/>

From 47aa5dac02871f80aad05512adac945f9daaa1e0 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Thu, 28 May 2020 17:29:06 +0300
Subject: [PATCH 0324/1718] reverted changes from conflict files

---
 .../Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml   | 3 ++-
 ...MassUpdateProductAttributesStoreViewScopeMysqlTest.xml | 3 ++-
 ...dminMassUpdateProductStatusStoreViewScopeMysqlTest.xml | 8 +++++---
 .../Test/AdminRemoveDefaultVideoSimpleProductTest.xml     | 3 ++-
 .../StorefrontElasticsearch6SearchInvalidValueTest.xml    | 3 ++-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml
index a7f4ccd1c5e84..61d197d34a31d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultVideoSimpleProductTest.xml
@@ -30,7 +30,8 @@
         </after>
 
         <!-- Create product -->
-        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="adminProductIndexPageAdd"/>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="adminProductIndexPageAdd"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
         <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGridColumnsInitial"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProductPage">
             <argument name="product" value="ApiSimpleProduct"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest/AdminMassUpdateProductAttributesStoreViewScopeMysqlTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest/AdminMassUpdateProductAttributesStoreViewScopeMysqlTest.xml
index d692bd8969d3e..7cdfd6dabed47 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest/AdminMassUpdateProductAttributesStoreViewScopeMysqlTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest/AdminMassUpdateProductAttributesStoreViewScopeMysqlTest.xml
@@ -33,7 +33,8 @@
         </after>
 
         <!-- Search and select products -->
-        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
         <actionGroup ref="SearchProductGridByKeyword2ActionGroup" stepKey="searchByKeyword">
             <argument name="keyword" value="api-simple-product"/>
         </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest/AdminMassUpdateProductStatusStoreViewScopeMysqlTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest/AdminMassUpdateProductStatusStoreViewScopeMysqlTest.xml
index e43e01e6777f6..63e22fc5a12d9 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest/AdminMassUpdateProductStatusStoreViewScopeMysqlTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest/AdminMassUpdateProductStatusStoreViewScopeMysqlTest.xml
@@ -70,7 +70,7 @@
             <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteSecondWebsite">
                 <argument name="websiteName" value="Second Website"/>
             </actionGroup>
-            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
+            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
 
             <!--Delete Products -->
             <actionGroup ref="DeleteProductActionGroup" stepKey="deleteProduct1">
@@ -83,7 +83,8 @@
         </after>
 
         <!-- Search and select products -->
-        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
         <actionGroup ref="SearchProductGridByKeyword2ActionGroup" stepKey="searchByKeyword">
             <argument name="keyword" value="{{simpleProductForMassUpdate.keyword}}"/>
         </actionGroup>
@@ -126,7 +127,8 @@
         <see userInput="2 items" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="seeInDefault"/>
 
         <!-- Enable the product in Default store view -->
-        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex2"/>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex2"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad2"/>
         <click selector="{{AdminProductGridSection.productGridCheckboxOnRow('1')}}" stepKey="clickCheckboxDefaultStoreView"/>
         <click selector="{{AdminProductGridSection.productGridCheckboxOnRow('2')}}" stepKey="clickCheckboxDefaultStoreView2"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoSimpleProductTest.xml
index 27c657fce301e..60c32004e3ca8 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoSimpleProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultVideoSimpleProductTest.xml
@@ -30,7 +30,8 @@
         </after>
 
         <!-- Create product -->
-        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="adminProductIndexPageAdd"/>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="adminProductIndexPageAdd"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageLoad"/>
         <actionGroup ref="EnableAdminAccountSharingActionGroup" stepKey="enableAdminAccountSharing"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProductPage">
             <argument name="product" value="ApiSimpleProduct"/>
diff --git a/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticsearch6SearchInvalidValueTest.xml b/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticsearch6SearchInvalidValueTest.xml
index d1fd3018055c5..237562f256692 100644
--- a/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticsearch6SearchInvalidValueTest.xml
+++ b/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticsearch6SearchInvalidValueTest.xml
@@ -66,7 +66,8 @@
         </actionGroup>
         <actionGroup ref="SaveAttributeSetActionGroup" stepKey="saveAttributeSet"/>
         <!--Create product and fill new attribute field-->
-        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+        <waitForPageLoad stepKey="waitForProductIndexPage"/>
         <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProduct">
             <argument name="product" value="SimpleProduct"/>
         </actionGroup>

From 92fab51402ade1ffe078254b44adddd45452f3a2 Mon Sep 17 00:00:00 2001
From: Lyzun Oleksandr <alex.nuzil@gmail.com>
Date: Thu, 28 May 2020 18:12:15 +0200
Subject: [PATCH 0325/1718] Implement Asynchronous Operation status change
 based on a lookup key

---
 .../Model/BulkManagement.php                  |  14 ++-
 .../Model/MassSchedule.php                    |   2 -
 .../Model/OperationManagement.php             |  42 ++++---
 .../Model/OperationProcessor.php              |   1 +
 .../Model/ResourceModel/Operation.php         |   4 +-
 .../Operation/OperationRepository.php         |  17 ++-
 .../Test/Unit/Model/BulkManagementTest.php    |  33 +++--
 .../Unit/Model/OperationManagementTest.php    | 118 ++++++++++++------
 .../AsynchronousOperations/etc/db_schema.xml  |  16 +--
 .../etc/db_schema_whitelist.json              |   6 +-
 .../WebapiAsync/Model/OperationRepository.php |   9 +-
 .../Model/BulkManagementTest.php              |   3 -
 .../Model/OperationManagementTest.php         |  50 +++++---
 .../AsynchronousOperations/_files/bulk.php    |   9 +-
 .../_files/operation_searchable.php           |  10 +-
 .../Framework/Bulk/OperationInterface.php     |   2 +-
 .../Bulk/OperationManagementInterface.php     |   5 +-
 17 files changed, 215 insertions(+), 126 deletions(-)

diff --git a/app/code/Magento/AsynchronousOperations/Model/BulkManagement.php b/app/code/Magento/AsynchronousOperations/Model/BulkManagement.php
index b47bb26985df0..6cf0611eb28ec 100644
--- a/app/code/Magento/AsynchronousOperations/Model/BulkManagement.php
+++ b/app/code/Magento/AsynchronousOperations/Model/BulkManagement.php
@@ -140,8 +140,8 @@ public function scheduleBulk($bulkUuid, array $operations, $description, $userId
     public function retryBulk($bulkUuid, array $errorCodes)
     {
         $metadata = $this->metadataPool->getMetadata(BulkSummaryInterface::class);
-        $connection = $this->resourceConnection->getConnectionByName($metadata->getEntityConnectionName());
 
+        $connection = $this->resourceConnection->getConnectionByName($metadata->getEntityConnectionName());
         /** @var \Magento\AsynchronousOperations\Model\ResourceModel\Operation[] $retriablyFailedOperations */
         $retriablyFailedOperations = $this->operationCollectionFactory->create()
             ->addFieldToFilter('error_code', ['in' => $errorCodes])
@@ -157,23 +157,27 @@ public function retryBulk($bulkUuid, array $errorCodes)
             /** @var OperationInterface $operation */
             foreach ($retriablyFailedOperations as $operation) {
                 if ($currentBatchSize === $maxBatchSize) {
+                    $whereCondition = $connection->quoteInto('operation_key IN (?)', $operationIds)
+                        . " AND "
+                        . $connection->quoteInto('bulk_uuid = ?', $bulkUuid);
                     $connection->delete(
                         $this->resourceConnection->getTableName('magento_operation'),
-                        $connection->quoteInto('id IN (?)', $operationIds)
+                        $whereCondition
                     );
                     $operationIds = [];
                     $currentBatchSize = 0;
                 }
                 $currentBatchSize++;
                 $operationIds[] = $operation->getId();
-                // Rescheduled operations must be put in queue in 'open' state (i.e. without ID)
-                $operation->setId(null);
             }
             // remove operations from the last batch
             if (!empty($operationIds)) {
+                $whereCondition = $connection->quoteInto('operation_key IN (?)', $operationIds)
+                    . " AND "
+                    . $connection->quoteInto('bulk_uuid = ?', $bulkUuid);
                 $connection->delete(
                     $this->resourceConnection->getTableName('magento_operation'),
-                    $connection->quoteInto('id IN (?)', $operationIds)
+                    $whereCondition
                 );
             }
 
diff --git a/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php b/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php
index 4dcaf7279a570..d8efed5562131 100644
--- a/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php
+++ b/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php
@@ -11,7 +11,6 @@
 use Magento\AsynchronousOperations\Api\Data\AsyncResponseInterfaceFactory;
 use Magento\AsynchronousOperations\Api\Data\ItemStatusInterface;
 use Magento\AsynchronousOperations\Api\Data\ItemStatusInterfaceFactory;
-use Magento\AsynchronousOperations\Model\ResourceModel\Operation\OperationRepository;
 use Magento\Authorization\Model\UserContextInterface;
 use Magento\Framework\Bulk\BulkManagementInterface;
 use Magento\Framework\DataObject\IdentityGeneratorInterface;
@@ -144,7 +143,6 @@ public function publishMass($topicName, array $entitiesArray, $groupId = null, $
         foreach ($entitiesArray as $key => $entityParams) {
             /** @var \Magento\AsynchronousOperations\Api\Data\ItemStatusInterface $requestItem */
             $requestItem = $this->itemStatusInterfaceFactory->create();
-
             try {
                 $operation = $this->operationRepository->create($topicName, $entityParams, $groupId, $key);
                 $operations[] = $operation;
diff --git a/app/code/Magento/AsynchronousOperations/Model/OperationManagement.php b/app/code/Magento/AsynchronousOperations/Model/OperationManagement.php
index 74740cba9a6d8..7575257555fae 100644
--- a/app/code/Magento/AsynchronousOperations/Model/OperationManagement.php
+++ b/app/code/Magento/AsynchronousOperations/Model/OperationManagement.php
@@ -7,17 +7,19 @@
 namespace Magento\AsynchronousOperations\Model;
 
 use Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory;
-use Magento\Framework\EntityManager\EntityManager;
+use Magento\Framework\App\ResourceConnection;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\Bulk\OperationManagementInterface;
 
 /**
  * Class for managing Bulk Operations
  */
-class OperationManagement implements \Magento\Framework\Bulk\OperationManagementInterface
+class OperationManagement implements OperationManagementInterface
 {
     /**
-     * @var EntityManager
+     * @var ResourceConnection
      */
-    private $entityManager;
+    private $connection;
 
     /**
      * @var OperationInterfaceFactory
@@ -32,25 +34,26 @@ class OperationManagement implements \Magento\Framework\Bulk\OperationManagement
     /**
      * OperationManagement constructor.
      *
-     * @param EntityManager $entityManager
      * @param OperationInterfaceFactory $operationFactory
-     * @param \Psr\Log\LoggerInterface $logger
+     * @param LoggerInterface $logger
+     * @param ResourceConnection $connection
      */
     public function __construct(
-        EntityManager $entityManager,
         OperationInterfaceFactory $operationFactory,
-        \Psr\Log\LoggerInterface $logger
+        LoggerInterface $logger,
+        ResourceConnection $connection
     ) {
-        $this->entityManager = $entityManager;
         $this->operationFactory = $operationFactory;
         $this->logger = $logger;
+        $this->connection = $connection;
     }
 
     /**
      * @inheritDoc
      */
     public function changeOperationStatus(
-        $operationId,
+        $bulkUuid,
+        $operationKey,
         $status,
         $errorCode = null,
         $message = null,
@@ -58,14 +61,17 @@ public function changeOperationStatus(
         $resultData = null
     ) {
         try {
-            $operationEntity = $this->operationFactory->create();
-            $this->entityManager->load($operationEntity, $operationId);
-            $operationEntity->setErrorCode($errorCode);
-            $operationEntity->setStatus($status);
-            $operationEntity->setResultMessage($message);
-            $operationEntity->setSerializedData($data);
-            $operationEntity->setResultSerializedData($resultData);
-            $this->entityManager->save($operationEntity);
+            $connection = $this->connection->getConnection();
+            $table = $this->connection->getTableName('magento_operation');
+            $bind = [
+                'error_code' => $errorCode,
+                'status' => $status,
+                'result_message' => $message,
+                'serialized_data' => $data,
+                'result_serialized_data' => $resultData
+            ];
+            $where = ['bulk_uuid = ?' => $bulkUuid, 'operation_key = ?' => $operationKey];
+            $connection->update($table, $bind, $where);
         } catch (\Exception $exception) {
             $this->logger->critical($exception->getMessage());
             return false;
diff --git a/app/code/Magento/AsynchronousOperations/Model/OperationProcessor.php b/app/code/Magento/AsynchronousOperations/Model/OperationProcessor.php
index 453f786bdf47b..5c5619a4b41d1 100644
--- a/app/code/Magento/AsynchronousOperations/Model/OperationProcessor.php
+++ b/app/code/Magento/AsynchronousOperations/Model/OperationProcessor.php
@@ -163,6 +163,7 @@ public function process(string $encodedMessage)
 
         $serializedData = (isset($errorCode)) ? $operation->getSerializedData() : null;
         $this->operationManagement->changeOperationStatus(
+            $operation->getBulkUuid(),
             $operation->getId(),
             $status,
             $errorCode,
diff --git a/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation.php b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation.php
index 0eaa5315af614..b5c33af1470f3 100644
--- a/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation.php
+++ b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation.php
@@ -6,10 +6,12 @@
 
 namespace Magento\AsynchronousOperations\Model\ResourceModel;
 
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+
 /**
  * Resource class for Bulk Operations
  */
-class Operation extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
+class Operation extends AbstractDb
 {
 
     public const TABLE_NAME = "magento_operation";
diff --git a/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/OperationRepository.php b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/OperationRepository.php
index b189d81d31636..bbf8bde36e11d 100644
--- a/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/OperationRepository.php
+++ b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/OperationRepository.php
@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\AsynchronousOperations\Model\ResourceModel\Operation;
@@ -11,6 +10,7 @@
 use Magento\AsynchronousOperations\Api\Data\OperationInterface;
 use Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory;
 use Magento\AsynchronousOperations\Model\OperationRepositoryInterface;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\MessageQueue\MessageValidator;
 use Magento\Framework\MessageQueue\MessageEncoder;
 use Magento\Framework\Serialize\Serializer\Json;
@@ -73,11 +73,13 @@ public function __construct(
      * @param string $topicName
      * @param array $entityParams
      * @param string $groupId
+     * @param string $operationId
      * @return OperationInterface
+     * @throws LocalizedException
      * @deprecated No longer used.
      * @see create()
      */
-    public function createByTopic($topicName, $entityParams, $groupId)
+    public function createByTopic($topicName, $entityParams, $groupId, $operationId)
     {
         $this->messageValidator->validate($topicName, $entityParams);
         $encodedMessage = $this->messageEncoder->encode($topicName, $entityParams);
@@ -89,10 +91,11 @@ public function createByTopic($topicName, $entityParams, $groupId)
         ];
         $data = [
             'data' => [
-                OperationInterface::BULK_ID         => $groupId,
-                OperationInterface::TOPIC_NAME      => $topicName,
+                OperationInterface::ID => $operationId,
+                OperationInterface::BULK_ID => $groupId,
+                OperationInterface::TOPIC_NAME => $topicName,
                 OperationInterface::SERIALIZED_DATA => $this->jsonSerializer->serialize($serializedData),
-                OperationInterface::STATUS          => OperationInterface::STATUS_TYPE_OPEN,
+                OperationInterface::STATUS => OperationInterface::STATUS_TYPE_OPEN,
             ],
         ];
 
@@ -103,9 +106,11 @@ public function createByTopic($topicName, $entityParams, $groupId)
 
     /**
      * @inheritDoc
+     *
+     * @throws LocalizedException
      */
     public function create($topicName, $entityParams, $groupId, $operationId): OperationInterface
     {
-        return $this->createByTopic($topicName, $entityParams, $groupId);
+        return $this->createByTopic($topicName, $entityParams, $groupId, $operationId);
     }
 }
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/BulkManagementTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/BulkManagementTest.php
index 724871f216472..14abb41c77fc4 100644
--- a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/BulkManagementTest.php
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/BulkManagementTest.php
@@ -196,7 +196,7 @@ public function testRetryBulk()
         $bulkUuid = 'bulk-001';
         $errorCodes = ['errorCode'];
         $connectionName = 'default';
-        $operationId = 1;
+        $operationId = 0;
         $operationTable = 'magento_operation';
         $topicName = 'topic.name';
         $metadata = $this->getMockForAbstractClass(EntityMetadataInterface::class);
@@ -216,13 +216,20 @@ public function testRetryBulk()
         $operationCollection->expects($this->once())->method('getItems')->willReturn([$operation]);
         $connection->expects($this->once())->method('beginTransaction')->willReturnSelf();
         $operation->expects($this->once())->method('getId')->willReturn($operationId);
-        $operation->expects($this->once())->method('setId')->with(null)->willReturnSelf();
         $this->resourceConnection->expects($this->once())
             ->method('getTableName')->with($operationTable)->willReturn($operationTable);
+        $connection->expects($this->at(1))
+            ->method('quoteInto')
+            ->with('operation_key IN (?)', [$operationId])
+            ->willReturn('operation_key IN (' . $operationId . ')');
+        $connection->expects($this->at(2))
+            ->method('quoteInto')
+            ->with('bulk_uuid = ?', $bulkUuid)
+            ->willReturn("bulk_uuid = '$bulkUuid'");
         $connection->expects($this->once())
-            ->method('quoteInto')->with('id IN (?)', [$operationId])->willReturn('id IN (' . $operationId . ')');
-        $connection->expects($this->once())
-            ->method('delete')->with($operationTable, 'id IN (' . $operationId . ')')->willReturn(1);
+            ->method('delete')
+            ->with($operationTable, 'operation_key IN (' . $operationId . ') AND bulk_uuid = \'' . $bulkUuid . '\'')
+            ->willReturn(1);
         $connection->expects($this->once())->method('commit')->willReturnSelf();
         $operation->expects($this->once())->method('getTopicName')->willReturn($topicName);
         $this->publisher->expects($this->once())->method('publish')->with($topicName, [$operation])->willReturn(null);
@@ -239,7 +246,7 @@ public function testRetryBulkWithException()
         $bulkUuid = 'bulk-001';
         $errorCodes = ['errorCode'];
         $connectionName = 'default';
-        $operationId = 1;
+        $operationId = 0;
         $operationTable = 'magento_operation';
         $exceptionMessage = 'Exception message';
         $metadata = $this->getMockForAbstractClass(EntityMetadataInterface::class);
@@ -259,13 +266,19 @@ public function testRetryBulkWithException()
         $operationCollection->expects($this->once())->method('getItems')->willReturn([$operation]);
         $connection->expects($this->once())->method('beginTransaction')->willReturnSelf();
         $operation->expects($this->once())->method('getId')->willReturn($operationId);
-        $operation->expects($this->once())->method('setId')->with(null)->willReturnSelf();
         $this->resourceConnection->expects($this->once())
             ->method('getTableName')->with($operationTable)->willReturn($operationTable);
+        $connection->expects($this->at(1))
+            ->method('quoteInto')
+            ->with('operation_key IN (?)', [$operationId])
+            ->willReturn('operation_key IN (' . $operationId . ')');
+        $connection->expects($this->at(2))
+            ->method('quoteInto')
+            ->with('bulk_uuid = ?', $bulkUuid)
+            ->willReturn("bulk_uuid = '$bulkUuid'");
         $connection->expects($this->once())
-            ->method('quoteInto')->with('id IN (?)', [$operationId])->willReturn('id IN (' . $operationId . ')');
-        $connection->expects($this->once())
-            ->method('delete')->with($operationTable, 'id IN (' . $operationId . ')')
+            ->method('delete')
+            ->with($operationTable, 'operation_key IN (' . $operationId . ') AND bulk_uuid = \'' . $bulkUuid . '\'')
             ->willThrowException(new \Exception($exceptionMessage));
         $connection->expects($this->once())->method('rollBack')->willReturnSelf();
         $this->logger->expects($this->once())->method('critical')->with($exceptionMessage);
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/OperationManagementTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/OperationManagementTest.php
index 476bad2d0ee04..0f437cefd3fca 100644
--- a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/OperationManagementTest.php
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/OperationManagementTest.php
@@ -7,11 +7,10 @@
 
 namespace Magento\AsynchronousOperations\Test\Unit\Model;
 
-use Magento\AsynchronousOperations\Api\Data\OperationInterface;
 use Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory;
 use Magento\AsynchronousOperations\Model\OperationManagement;
-use Magento\Framework\EntityManager\EntityManager;
-use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
@@ -24,79 +23,116 @@ class OperationManagementTest extends TestCase
     private $model;
 
     /**
-     * @var MockObject
-     */
-    private $entityManagerMock;
-
-    /**
-     * @var MockObject
+     * @var OperationInterfaceFactory|MockObject
      */
     private $operationFactoryMock;
 
     /**
-     * @var MockObject
-     */
-    private $operationMock;
-
-    /**
-     * @var MockObject
+     * @var LoggerInterface|MockObject
      */
     private $loggerMock;
+
     /**
-     * @var MetadataPool|MockObject
+     * @var ResourceConnection|MockObject
      */
-    private $metadataPoolMock;
+    private $resourceConnectionMock;
 
     protected function setUp(): void
     {
-        $this->entityManagerMock = $this->createMock(EntityManager::class);
-        $this->metadataPoolMock = $this->createMock(MetadataPool::class);
         $this->operationFactoryMock = $this->createPartialMock(
             OperationInterfaceFactory::class,
             ['create']
         );
-        $this->operationMock =
-            $this->getMockForAbstractClass(OperationInterface::class);
         $this->loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
+        $this->resourceConnectionMock = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getConnection', 'getTableName'])
+            ->getMock();
+
         $this->model = new OperationManagement(
-            $this->entityManagerMock,
             $this->operationFactoryMock,
-            $this->loggerMock
+            $this->loggerMock,
+            $this->resourceConnectionMock
         );
     }
 
+    /**
+     * Test change operation status.
+     */
     public function testChangeOperationStatus()
     {
-        $operationId = 1;
+        $operationKey = 1;
         $status = 1;
         $message = 'Message';
         $data = 'data';
         $errorCode = 101;
-        $this->operationFactoryMock->expects($this->once())->method('create')->willReturn($this->operationMock);
-        $this->entityManagerMock->expects($this->once())->method('load')->with($this->operationMock, $operationId);
-        $this->operationMock->expects($this->once())->method('setStatus')->with($status)->willReturnSelf();
-        $this->operationMock->expects($this->once())->method('setResultMessage')->with($message)->willReturnSelf();
-        $this->operationMock->expects($this->once())->method('setSerializedData')->with($data)->willReturnSelf();
-        $this->operationMock->expects($this->once())->method('setErrorCode')->with($errorCode)->willReturnSelf();
-        $this->entityManagerMock->expects($this->once())->method('save')->with($this->operationMock);
-        $this->assertTrue($this->model->changeOperationStatus($operationId, $status, $errorCode, $message, $data));
+        $bulkUuid = '13f85e88-be1d-4ce7-8570-88637a589930';
+
+        $tableName = 'magento_operation';
+
+        $bind = [
+            'error_code' => $errorCode,
+            'status' => $status,
+            'result_message' => $message,
+            'serialized_data' => $data,
+            'result_serialized_data' => ''
+        ];
+        $where = ['bulk_uuid = ?' => $bulkUuid, 'operation_key = ?' => $operationKey];
+
+        $connection = $this->getMockBuilder(AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->resourceConnectionMock->expects($this->atLeastOnce())
+            ->method('getConnection')->with('default')
+            ->willReturn($connection);
+        $this->resourceConnectionMock->expects($this->once())->method('getTableName')->with($tableName)
+            ->willReturn($tableName);
+
+        $connection->expects($this->once())->method('update')->with($tableName, $bind, $where)
+            ->willReturn(1);
+        $this->assertTrue(
+            $this->model->changeOperationStatus($bulkUuid, $operationKey, $status, $errorCode, $message, $data)
+        );
     }
 
+    /**
+     * Test generic exception throw case.
+     */
     public function testChangeOperationStatusIfExceptionWasThrown()
     {
-        $operationId = 1;
+        $operationKey = 1;
         $status = 1;
         $message = 'Message';
         $data = 'data';
         $errorCode = 101;
-        $this->operationFactoryMock->expects($this->once())->method('create')->willReturn($this->operationMock);
-        $this->entityManagerMock->expects($this->once())->method('load')->with($this->operationMock, $operationId);
-        $this->operationMock->expects($this->once())->method('setStatus')->with($status)->willReturnSelf();
-        $this->operationMock->expects($this->once())->method('setResultMessage')->with($message)->willReturnSelf();
-        $this->operationMock->expects($this->once())->method('setSerializedData')->with($data)->willReturnSelf();
-        $this->operationMock->expects($this->once())->method('setErrorCode')->with($errorCode)->willReturnSelf();
-        $this->entityManagerMock->expects($this->once())->method('save')->willThrowException(new \Exception());
+        $bulkUuid = '13f85e88-be1d-4ce7-8570-88637a589930';
+
+        $tableName = 'magento_operation';
+
+        $bind = [
+            'error_code' => $errorCode,
+            'status' => $status,
+            'result_message' => $message,
+            'serialized_data' => $data,
+            'result_serialized_data' => ''
+        ];
+        $where = ['bulk_uuid = ?' => $bulkUuid, 'operation_key = ?' => $operationKey];
+
+        $connection = $this->getMockBuilder(AdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->resourceConnectionMock->expects($this->atLeastOnce())
+            ->method('getConnection')->with('default')
+            ->willReturn($connection);
+        $this->resourceConnectionMock->expects($this->once())
+            ->method('getTableName')->with($tableName)
+            ->willReturn($tableName);
+
+        $connection->expects($this->once())->method('update')->with($tableName, $bind, $where)
+            ->willThrowException(new \Exception());
         $this->loggerMock->expects($this->once())->method('critical');
-        $this->assertFalse($this->model->changeOperationStatus($operationId, $status, $errorCode, $message, $data));
+        $this->assertFalse(
+            $this->model->changeOperationStatus($bulkUuid, $operationKey, $status, $errorCode, $message, $data)
+        );
     }
 }
diff --git a/app/code/Magento/AsynchronousOperations/etc/db_schema.xml b/app/code/Magento/AsynchronousOperations/etc/db_schema.xml
index f287a368c72fb..5d49d71ee46b0 100644
--- a/app/code/Magento/AsynchronousOperations/etc/db_schema.xml
+++ b/app/code/Magento/AsynchronousOperations/etc/db_schema.xml
@@ -9,15 +9,15 @@
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="magento_bulk" resource="default" engine="innodb"
            comment="Bulk entity that represents set of related asynchronous operations">
-        <column xsi:type="int" name="id" unsigned="true" nullable="false" identity="true"
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Bulk Internal ID (must not be exposed)"/>
         <column xsi:type="varbinary" name="uuid" nullable="true" length="39"
                 comment="Bulk UUID (can be exposed to reference bulk entity)"/>
-        <column xsi:type="int" name="user_id" unsigned="true" nullable="true" identity="false"
+        <column xsi:type="int" name="user_id" padding="10" unsigned="true" nullable="true" identity="false"
                 comment="ID of the WebAPI user that performed an action"/>
         <column xsi:type="int" name="user_type" nullable="true" comment="Which type of user"/>
         <column xsi:type="varchar" name="description" nullable="true" length="255" comment="Bulk Description"/>
-        <column xsi:type="int" name="operation_count" unsigned="true" nullable="false" identity="false"
+        <column xsi:type="int" name="operation_count" padding="10" unsigned="true" nullable="false" identity="false"
                 comment="Total number of operations scheduled within this bulk"/>
         <column xsi:type="timestamp" name="start_time" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
                 comment="Bulk start time"/>
@@ -32,8 +32,10 @@
         </index>
     </table>
     <table name="magento_operation" resource="default" engine="innodb" comment="Operation entity">
-        <column xsi:type="int" name="id" unsigned="true" nullable="false" identity="true"
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Operation ID"/>
+        <column xsi:type="int" name="operation_key" padding="10" unsigned="true" nullable="false"
+                comment="Operation Key"/>
         <column xsi:type="varbinary" name="bulk_uuid" nullable="true" length="39" comment="Related Bulk UUID"/>
         <column xsi:type="varchar" name="topic_name" nullable="true" length="255"
                 comment="Name of the related message queue topic"/>
@@ -41,9 +43,9 @@
                 comment="Data (serialized) required to perform an operation"/>
         <column xsi:type="blob" name="result_serialized_data" nullable="true"
                 comment="Result data (serialized) after perform an operation"/>
-        <column xsi:type="smallint" name="status" unsigned="false" nullable="true" identity="false"
+        <column xsi:type="smallint" name="status" padding="6" unsigned="false" nullable="true" identity="false"
                 default="0" comment="Operation status (OPEN | COMPLETE | RETRIABLY_FAILED | NOT_RETRIABLY_FAILED)"/>
-        <column xsi:type="smallint" name="error_code" unsigned="false" nullable="true" identity="false"
+        <column xsi:type="smallint" name="error_code" padding="6" unsigned="false" nullable="true" identity="false"
                 comment="Code of the error that appeared during operation execution (used to aggregate related failed operations)"/>
         <column xsi:type="varchar" name="result_message" nullable="true" length="255"
                 comment="Operation result message"/>
@@ -59,7 +61,7 @@
     </table>
     <table name="magento_acknowledged_bulk" resource="default" engine="innodb"
            comment="Bulk that was viewed by user from notification area">
-        <column xsi:type="int" name="id" unsigned="true" nullable="false" identity="true"
+        <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Internal ID"/>
         <column xsi:type="varbinary" name="bulk_uuid" nullable="true" length="39" comment="Related Bulk UUID"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
diff --git a/app/code/Magento/AsynchronousOperations/etc/db_schema_whitelist.json b/app/code/Magento/AsynchronousOperations/etc/db_schema_whitelist.json
index 9b6c0709e1916..6cbb3c664a50f 100644
--- a/app/code/Magento/AsynchronousOperations/etc/db_schema_whitelist.json
+++ b/app/code/Magento/AsynchronousOperations/etc/db_schema_whitelist.json
@@ -22,6 +22,7 @@
     "magento_operation": {
         "column": {
             "id": true,
+            "operation_key": true,
             "bulk_uuid": true,
             "topic_name": true,
             "serialized_data": true,
@@ -35,7 +36,8 @@
         },
         "constraint": {
             "PRIMARY": true,
-            "MAGENTO_OPERATION_BULK_UUID_MAGENTO_BULK_UUID": true
+            "MAGENTO_OPERATION_BULK_UUID_MAGENTO_BULK_UUID": true,
+            "UUID": true
         }
     },
     "magento_acknowledged_bulk": {
@@ -49,4 +51,4 @@
             "MAGENTO_ACKNOWLEDGED_BULK_BULK_UUID": true
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/code/Magento/WebapiAsync/Model/OperationRepository.php b/app/code/Magento/WebapiAsync/Model/OperationRepository.php
index 7af8ff877ebbc..87db3dfb59e2c 100644
--- a/app/code/Magento/WebapiAsync/Model/OperationRepository.php
+++ b/app/code/Magento/WebapiAsync/Model/OperationRepository.php
@@ -72,6 +72,7 @@ public function __construct(
      */
     public function create($topicName, $entityParams, $groupId, $operationId): OperationInterface
     {
+
         $this->messageValidator->validate($topicName, $entityParams);
         $requestData = $this->inputParamsResolver->getInputData();
         if ($operationId === null || !isset($requestData[$operationId])) {
@@ -88,13 +89,13 @@ public function create($topicName, $entityParams, $groupId, $operationId): Opera
         ];
         $data = [
             'data' => [
-                OperationInterface::BULK_ID         => $groupId,
-                OperationInterface::TOPIC_NAME      => $topicName,
+                OperationInterface::ID => $operationId,
+                OperationInterface::BULK_ID => $groupId,
+                OperationInterface::TOPIC_NAME => $topicName,
                 OperationInterface::SERIALIZED_DATA => $this->jsonSerializer->serialize($serializedData),
-                OperationInterface::STATUS          => OperationInterface::STATUS_TYPE_OPEN,
+                OperationInterface::STATUS => OperationInterface::STATUS_TYPE_OPEN,
             ],
         ];
-
         /** @var OperationInterface $operation */
         $operation = $this->operationFactory->create($data);
         return $operation;
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/BulkManagementTest.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/BulkManagementTest.php
index 8c72977f6d8c8..3014fe37acb78 100644
--- a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/BulkManagementTest.php
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/BulkManagementTest.php
@@ -94,9 +94,6 @@ public function testRetryBulk()
             ->create()
             ->addFieldToFilter('bulk_uuid', ['eq' => $bulkUuid])
             ->getItems();
-        foreach ($operations as $operation) {
-            $operation->setId(null);
-        }
         $this->publisherMock->expects($this->once())
             ->method('publish')
             ->with($topicName, array_values($operations));
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/OperationManagementTest.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/OperationManagementTest.php
index 7633a161253cd..4be795dd654cd 100644
--- a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/OperationManagementTest.php
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/OperationManagementTest.php
@@ -8,7 +8,11 @@
 
 use Magento\AsynchronousOperations\Api\Data\OperationInterface;
 use Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory;
+use Magento\AsynchronousOperations\Model\BulkStatus;
+use Magento\AsynchronousOperations\Model\OperationManagement;
 use Magento\Framework\EntityManager\EntityManager;
+use Magento\Framework\App\ResourceConnection;
+use Magento\TestFramework\Helper\Bootstrap;
 
 class OperationManagementTest extends \PHPUnit\Framework\TestCase
 {
@@ -32,21 +36,18 @@ class OperationManagementTest extends \PHPUnit\Framework\TestCase
      */
     private $entityManager;
 
+    /**
+     * @var ResourceConnection
+     */
+    private $connection;
+
     protected function setUp(): void
     {
-        $this->model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\AsynchronousOperations\Model\OperationManagement::class
-        );
-        $this->bulkStatusManagement = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\AsynchronousOperations\Model\BulkStatus::class
-        );
-
-        $this->operationFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            OperationInterfaceFactory::class
-        );
-        $this->entityManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            EntityManager::class
-        );
+        $this->connection = Bootstrap::getObjectManager()->get(ResourceConnection::class);
+        $this->model = Bootstrap::getObjectManager()->get(OperationManagement::class);
+        $this->bulkStatusManagement = Bootstrap::getObjectManager()->get(BulkStatus::class);
+        $this->operationFactory = Bootstrap::getObjectManager()->get(OperationInterfaceFactory::class);
+        $this->entityManager = Bootstrap::getObjectManager()->get(EntityManager::class);
     }
 
     /**
@@ -62,13 +63,22 @@ public function testGetBulkStatus()
         $operation = array_shift($operations);
         $operationId = $operation->getId();
 
-        $this->assertTrue($this->model->changeOperationStatus($operationId, OperationInterface::STATUS_TYPE_OPEN));
+        $this->assertTrue($this->model->changeOperationStatus(
+            'bulk-uuid-5',
+            $operationId,
+            OperationInterface::STATUS_TYPE_OPEN
+        ));
+
+        $table = $this->connection->getTableName('magento_operation');
+        $connection = $this->connection->getConnection();
+        $select = $connection->select()
+            ->from($table)
+            ->where("bulk_uuid = ?", 'bulk-uuid-5')
+            ->where("operation_key = ?", $operationId);
+        $updatedOperation = $connection->fetchRow($select);
 
-        /** @var OperationInterface $updatedOperation */
-        $updatedOperation = $this->operationFactory->create();
-        $this->entityManager->load($updatedOperation, $operationId);
-        $this->assertEquals(OperationInterface::STATUS_TYPE_OPEN, $updatedOperation->getStatus());
-        $this->assertNull($updatedOperation->getResultMessage());
-        $this->assertNull($updatedOperation->getSerializedData());
+        $this->assertEquals(OperationInterface::STATUS_TYPE_OPEN, $updatedOperation['status']);
+        $this->assertNull($updatedOperation['result_message']);
+        $this->assertNull($updatedOperation['serialized_data']);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/bulk.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/bulk.php
index 9e215667903d3..576927184ba8a 100644
--- a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/bulk.php
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/bulk.php
@@ -60,6 +60,7 @@
         'status' => OperationInterface::STATUS_TYPE_COMPLETE,
         'error_code' => null,
         'result_message' => null,
+        'operation_key' => 0
     ],
     [
         'bulk_uuid' => 'bulk-uuid-3',
@@ -68,6 +69,7 @@
         'status' => OperationInterface::STATUS_TYPE_RETRIABLY_FAILED,
         'error_code' => 1111,
         'result_message' => 'Something went wrong during your request',
+        'operation_key' => 0
     ],
     [
         'bulk_uuid' => 'bulk-uuid-4',
@@ -76,6 +78,7 @@
         'status' => OperationInterface::STATUS_TYPE_COMPLETE,
         'error_code' => null,
         'result_message' => null,
+        'operation_key' => 0
     ],
     [
         'bulk_uuid' => 'bulk-uuid-5',
@@ -84,6 +87,7 @@
         'status' => OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED,
         'error_code' => 1111,
         'result_message' => 'Something went wrong during your request',
+        'operation_key' => 0
     ],
     [
         'bulk_uuid' => 'bulk-uuid-5',
@@ -92,6 +96,7 @@
         'status' => OperationInterface::STATUS_TYPE_RETRIABLY_FAILED,
         'error_code' => 2222,
         'result_message' => 'Entity with ID=4 does not exist',
+        'operation_key' => 1
     ],
 ];
 
@@ -102,8 +107,8 @@
 }
 
 $operationQuery = "INSERT INTO {$operationTable}"
-    . " (`bulk_uuid`, `topic_name`, `serialized_data`, `status`, `error_code`, `result_message`)"
-    . " VALUES (:bulk_uuid, :topic_name, :serialized_data, :status, :error_code, :result_message);";
+    . " (`bulk_uuid`, `topic_name`, `serialized_data`, `status`, `error_code`, `result_message`, `operation_key`)"
+    . " VALUES (:bulk_uuid, :topic_name, :serialized_data, :status, :error_code, :result_message, :operation_key);";
 foreach ($operations as $operation) {
     $connection->query($operationQuery, $operation);
 }
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/operation_searchable.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/operation_searchable.php
index a3547566c4245..1e27df71d5709 100644
--- a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/operation_searchable.php
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/_files/operation_searchable.php
@@ -42,6 +42,7 @@
         'status' => OperationInterface::STATUS_TYPE_COMPLETE,
         'error_code' => null,
         'result_message' => null,
+        'operation_key' => 0
     ],
     [
         'bulk_uuid' => 'bulk-uuid-searchable-6',
@@ -50,6 +51,7 @@
         'status' => OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED,
         'error_code' => 1111,
         'result_message' => 'Something went wrong during your request',
+        'operation_key' => 1
     ],
     [
         'bulk_uuid' => 'bulk-uuid-searchable-6',
@@ -58,6 +60,7 @@
         'status' => OperationInterface::STATUS_TYPE_RETRIABLY_FAILED,
         'error_code' => 2222,
         'result_message' => 'Entity with ID=4 does not exist',
+        'operation_key' => 2
     ],
     [
         'bulk_uuid' => 'bulk-uuid-searchable-6',
@@ -66,6 +69,7 @@
         'status' => OperationInterface::STATUS_TYPE_OPEN,
         'error_code' => null,
         'result_message' => '',
+        'operation_key' => 3
     ],
     [
         'bulk_uuid' => 'bulk-uuid-searchable-6',
@@ -74,6 +78,7 @@
         'status' => OperationInterface::STATUS_TYPE_OPEN,
         'error_code' => null,
         'result_message' => '',
+        'operation_key' => 4
     ],
     [
         'bulk_uuid' => 'bulk-uuid-searchable-6',
@@ -82,6 +87,7 @@
         'status' => OperationInterface::STATUS_TYPE_REJECTED,
         'error_code' => null,
         'result_message' => '',
+        'operation_key' => 5
     ],
 ];
 
@@ -92,8 +98,8 @@
 }
 
 $operationQuery = "INSERT INTO {$operationTable}"
-    . " (`bulk_uuid`, `topic_name`, `serialized_data`, `status`, `error_code`, `result_message`)"
-    . " VALUES (:bulk_uuid, :topic_name, :serialized_data, :status, :error_code, :result_message);";
+    . " (`bulk_uuid`, `topic_name`, `serialized_data`, `status`, `error_code`, `result_message`, `operation_key`)"
+    . " VALUES (:bulk_uuid, :topic_name, :serialized_data, :status, :error_code, :result_message, :operation_key);";
 foreach ($operations as $operation) {
     $connection->query($operationQuery, $operation);
 }
diff --git a/lib/internal/Magento/Framework/Bulk/OperationInterface.php b/lib/internal/Magento/Framework/Bulk/OperationInterface.php
index c1cac9f171430..c9672a031c2dd 100644
--- a/lib/internal/Magento/Framework/Bulk/OperationInterface.php
+++ b/lib/internal/Magento/Framework/Bulk/OperationInterface.php
@@ -15,7 +15,7 @@ interface OperationInterface extends \Magento\Framework\Api\ExtensibleDataInterf
     /**#@+
      * Constants for keys of data array. Identical to the name of the getter in snake case
      */
-    const ID = 'id';
+    const ID = 'operation_key';
     const BULK_ID = 'bulk_uuid';
     const TOPIC_NAME = 'topic_name';
     const SERIALIZED_DATA = 'serialized_data';
diff --git a/lib/internal/Magento/Framework/Bulk/OperationManagementInterface.php b/lib/internal/Magento/Framework/Bulk/OperationManagementInterface.php
index e86d3ca8c1624..886bd45aeaed0 100644
--- a/lib/internal/Magento/Framework/Bulk/OperationManagementInterface.php
+++ b/lib/internal/Magento/Framework/Bulk/OperationManagementInterface.php
@@ -16,7 +16,8 @@ interface OperationManagementInterface
     /**
      * Used by consumer to change status after processing operation
      *
-     * @param int $operationId
+     * @param string $bulkUuid
+     * @param int $operationKey
      * @param int $status
      * @param int|null $errorCode
      * @param string|null $message property to update Result Message
@@ -24,5 +25,5 @@ interface OperationManagementInterface
      * @return boolean
      * @since 100.2.0
      */
-    public function changeOperationStatus($operationId, $status, $errorCode = null, $message = null, $data = null);
+    public function changeOperationStatus($bulkUuid, $operationKey, $status, $errorCode = null, $message = null, $data = null); // @codingStandardsIgnoreLine
 }

From b29b43d3b074bb79e34451855faad50dc1e65eb4 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Thu, 28 May 2020 11:26:35 -0500
Subject: [PATCH 0326/1718] MC-33823: Merge CE, EE and B2B changes

---
 .../Magento/Framework/View/Helper/SecureHtmlRenderer.php    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php b/lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php
index 22e53c5751f86..dc7085ab2e360 100644
--- a/lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php
+++ b/lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php
@@ -103,8 +103,10 @@ public function renderEventListenerAsTag(
         if (!$eventName || !$attributeJavascript || !$elementSelector || mb_strpos($eventName, 'on') !== 0) {
             throw new \InvalidArgumentException('Invalid JS event handler data provided');
         }
-        $listenerFunction = 'eventListener' .$this->random->getRandomString(32);
-        $elementName = 'listenedElement' .$this->random->getRandomString(32);
+
+        $random = $this->random->getRandomString(32);
+        $listenerFunction = 'eventListener' .$random;
+        $elementName = 'listenedElement' .$random;
         $script = <<<script
             function {$listenerFunction} () {
                 {$attributeJavascript};

From 9a83830b52446566d64531b267e0132800ae1ac4 Mon Sep 17 00:00:00 2001
From: "v.prokopov" <v.prokopov@atwix.com>
Date: Thu, 28 May 2020 20:44:46 +0300
Subject: [PATCH 0327/1718] added unit test

---
 .../Observer/SetLinkStatusObserverTest.php    | 148 +++++++++++++++++-
 1 file changed, 141 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Downloadable/Test/Unit/Observer/SetLinkStatusObserverTest.php b/app/code/Magento/Downloadable/Test/Unit/Observer/SetLinkStatusObserverTest.php
index 46a3ef6717582..b5be0309bb5be 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Observer/SetLinkStatusObserverTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Observer/SetLinkStatusObserverTest.php
@@ -189,7 +189,7 @@ public function testSetLinkStatusPending($orderState, array $orderStateMapping)
                 ]
             );
 
-        $this->itemsFactory->expects($this->once())
+        $this->itemsFactory->expects($this->any())
             ->method('create')
             ->willReturn(
                 $this->createLinkItemCollection(
@@ -243,7 +243,7 @@ public function testSetLinkStatusClosed()
                 ]
             );
 
-        $this->itemsFactory->expects($this->once())
+        $this->itemsFactory->expects($this->any())
             ->method('create')
             ->willReturn(
                 $this->createLinkItemCollection(
@@ -308,7 +308,7 @@ public function testSetLinkStatusInvoiced()
                 ]
             );
 
-        $this->itemsFactory->expects($this->once())
+        $this->itemsFactory->expects($this->any())
             ->method('create')
             ->willReturn(
                 $this->createLinkItemCollection(
@@ -344,6 +344,137 @@ public function testSetLinkStatusEmptyOrder()
         $this->assertInstanceOf(SetLinkStatusObserver::class, $result);
     }
 
+    public function testSetLinkStatusExpired()
+    {
+        $this->scopeConfig->expects($this->once())
+            ->method('getValue')
+            ->with(
+                \Magento\Downloadable\Model\Link\Purchased\Item::XML_PATH_ORDER_ITEM_STATUS,
+                ScopeInterface::SCOPE_STORE,
+                1
+            )
+            ->willReturn(Item::STATUS_PENDING);
+
+        $this->observerMock->expects($this->once())
+            ->method('getEvent')
+            ->willReturn($this->eventMock);
+
+        $this->eventMock->expects($this->once())
+            ->method('getOrder')
+            ->willReturn($this->orderMock);
+
+        $this->orderMock->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
+
+        $this->orderMock->expects($this->once())
+            ->method('getStoreId')
+            ->willReturn(1);
+
+        $this->orderMock->expects($this->atLeastOnce())
+            ->method('getState')
+            ->willReturn(Order::STATE_PROCESSING);
+
+        $this->orderMock->expects($this->any())
+            ->method('getAllItems')
+            ->willReturn(
+                [
+                    $this->createRefundOrderItem(2, 2, 2),
+                    $this->createRefundOrderItem(3, 2, 1),
+                    $this->createRefundOrderItem(4, 3, 3),
+                ]
+            );
+
+        $this->itemsFactory->expects($this->any())
+            ->method('create')
+            ->willReturn(
+                $this->createLinkItemToExpireCollection(
+                    [2, 4],
+                    [
+                        $this->createLinkItem(
+                            'available',
+                            2,
+                            true,
+                            \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_EXPIRED
+                        ),
+                        $this->createLinkItem(
+                            'pending_payment',
+                            4,
+                            true,
+                            \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_EXPIRED
+                        ),
+                    ]
+                )
+            );
+
+        $result = $this->setLinkStatusObserver->execute($this->observerMock);
+        $this->assertInstanceOf(SetLinkStatusObserver::class, $result);
+    }
+
+    /**
+     * @param $id
+     * @param int $qtyOrdered
+     * @param int $qtyRefunded
+     * @param string $productType
+     * @param string $realProductType
+     * @return \Magento\Sales\Model\Order\Item|MockObject
+     */
+    private function createRefundOrderItem(
+        $id,
+        $qtyOrdered,
+        $qtyRefunded,
+        $productType = DownloadableProductType::TYPE_DOWNLOADABLE,
+        $realProductType = DownloadableProductType::TYPE_DOWNLOADABLE
+    ) {
+        $item = $this->getMockBuilder(Item::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'getId',
+                'getQtyOrdered',
+                'getQtyRefunded',
+                'getProductType',
+                'getRealProductType'
+            ])->getMock();
+        $item->expects($this->any())
+            ->method('getId')
+            ->willReturn($id);
+        $item->expects($this->any())
+            ->method('getQtyOrdered')
+            ->willReturn($qtyOrdered);
+        $item->expects($this->any())
+            ->method('getQtyRefunded')
+            ->willReturn($qtyRefunded);
+        $item->expects($this->any())
+            ->method('getProductType')
+            ->willReturn($productType);
+        $item->expects($this->any())
+            ->method('getRealProductType')
+            ->willReturn($realProductType);
+
+        return $item;
+    }
+
+    /**
+     * @param array $expectedOrderItemIds
+     * @param array $items
+     * @return LinkItemCollection|MockObject
+     */
+    private function createLinkItemToExpireCollection(array $expectedOrderItemIds, array $items)
+    {
+        $linkItemCollection = $this->getMockBuilder(
+            \Magento\Downloadable\Model\ResourceModel\Link\Purchased\Item\Collection::class
+        )
+            ->disableOriginalConstructor()
+            ->setMethods(['addFieldToFilter'])
+            ->getMock();
+        $linkItemCollection->expects($this->any())
+            ->method('addFieldToFilter')
+            ->with('order_item_id', ['in' => $expectedOrderItemIds])
+            ->willReturn($items);
+
+        return $linkItemCollection;
+    }
+
     /**
      * @param $id
      * @param int $statusId
@@ -359,7 +490,7 @@ private function createOrderItem(
     ) {
         $item = $this->getMockBuilder(Item::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getId', 'getProductType', 'getRealProductType', 'getStatusId'])
+            ->setMethods(['getId', 'getProductType', 'getRealProductType', 'getStatusId', 'getQtyOrdered'])
             ->getMock();
         $item->expects($this->any())
             ->method('getId')
@@ -373,6 +504,9 @@ private function createOrderItem(
         $item->expects($this->any())
             ->method('getStatusId')
             ->willReturn($statusId);
+        $item->expects($this->any())
+            ->method('getQtyOrdered')
+            ->willReturn(1);
 
         return $item;
     }
@@ -390,7 +524,7 @@ private function createLinkItemCollection(array $expectedOrderItemIds, array $it
             ->disableOriginalConstructor()
             ->setMethods(['addFieldToFilter'])
             ->getMock();
-        $linkItemCollection->expects($this->once())
+        $linkItemCollection->expects($this->any())
             ->method('addFieldToFilter')
             ->with('order_item_id', ['in' => $expectedOrderItemIds])
             ->willReturn($items);
@@ -415,11 +549,11 @@ private function createLinkItem($status, $orderItemId, $isSaved = false, $expect
             ->method('getStatus')
             ->willReturn($status);
         if ($isSaved) {
-            $linkItem->expects($this->once())
+            $linkItem->expects($this->any())
                 ->method('setStatus')
                 ->with($expectedStatus)
                 ->willReturnSelf();
-            $linkItem->expects($this->once())
+            $linkItem->expects($this->any())
                 ->method('save')
                 ->willReturnSelf();
         }

From dd91179b6606bc542f178770cd07b2a6ff0c535f Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Tue, 19 May 2020 13:01:29 -0500
Subject: [PATCH 0328/1718] MC-34360: [Paypal Express Checkout] Can't place an
 order if the currency is euro

- add currency to skd url
---
 app/code/Magento/Paypal/Model/SmartButtonConfig.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Paypal/Model/SmartButtonConfig.php b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
index 88d68511ae5fe..b1bc05a8167c3 100644
--- a/app/code/Magento/Paypal/Model/SmartButtonConfig.php
+++ b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
@@ -11,7 +11,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Locale\ResolverInterface;
 use Magento\Store\Model\ScopeInterface;
-use Magento\Paypal\Model\Config as PayPalConfig;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Provides configuration values for PayPal in-context checkout
@@ -50,6 +50,11 @@ class SmartButtonConfig
      */
     private $unsupportedPaymentMethods;
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * Base url for Paypal SDK
      */
@@ -59,6 +64,7 @@ class SmartButtonConfig
      * @param ResolverInterface $localeResolver
      * @param ConfigFactory $configFactory
      * @param ScopeConfigInterface $scopeConfig
+     * @param StoreManagerInterface $storeManager
      * @param array $defaultStyles
      * @param array $disallowedFundingMap
      * @param array $unsupportedPaymentMethods
@@ -67,6 +73,7 @@ public function __construct(
         ResolverInterface $localeResolver,
         ConfigFactory $configFactory,
         ScopeConfigInterface $scopeConfig,
+        StoreManagerInterface $storeManager,
         $defaultStyles = [],
         $disallowedFundingMap = [],
         $unsupportedPaymentMethods = []
@@ -75,6 +82,7 @@ public function __construct(
         $this->config = $configFactory->create();
         $this->config->setMethod(Config::METHOD_EXPRESS);
         $this->scopeConfig = $scopeConfig;
+        $this->storeManager = $storeManager;
         $this->defaultStyles = $defaultStyles;
         $this->disallowedFundingMap = $disallowedFundingMap;
         $this->unsupportedPaymentMethods = $unsupportedPaymentMethods;
@@ -123,6 +131,7 @@ private function generatePaypalSdkUrl(string $page): string
                 'merchant-id' => $this->config->getValue('merchant_id'),
                 'locale' => $this->localeResolver->getLocale(),
                 'intent' => $this->getIntent(),
+                'currency' => $this->storeManager->getStore()->getCurrentCurrencyCode(),
             ];
         if ($disallowedFunding) {
             $params['disable-funding'] = $disallowedFunding;

From 0605d535a36ced5050f9c6b14c9aed0be56f0896 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Tue, 19 May 2020 15:17:59 -0500
Subject: [PATCH 0329/1718] MC-34360: [Paypal Express Checkout] Can't place an
 order if the currency is euro

- fix SmartButtonConfigTest
---
 .../Test/Unit/Model/SmartButtonConfigTest.php      | 14 ++++++++++++++
 .../Test/Unit/Model/_files/expected_config.php     |  5 +++++
 2 files changed, 19 insertions(+)

diff --git a/app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php b/app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php
index fe7619e4166ba..a19b27d0ec97b 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php
@@ -12,6 +12,8 @@
 use Magento\Paypal\Model\Config;
 use Magento\Paypal\Model\ConfigFactory;
 use Magento\Paypal\Model\SmartButtonConfig;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -56,10 +58,22 @@ protected function setUp(): void
             ->setMethods(['create'])
             ->getMock();
         $configFactoryMock->expects($this->once())->method('create')->willReturn($this->configMock);
+
+        /** @var Store|MockObject $storeMock */
+        $storeMock = $this->createMock(Store::class);
+        $storeMock->method('getCurrentCurrencyCode')
+            ->willReturn('USD');
+
+        /** @var StoreManagerInterface|MockObject $storeManagerMock */
+        $storeManagerMock = $this->getMockForAbstractClass(StoreManagerInterface::class);
+        $storeManagerMock->method('getStore')
+            ->willReturn($storeMock);
+
         $this->model = new SmartButtonConfig(
             $this->localeResolverMock,
             $configFactoryMock,
             $scopeConfigMock,
+            $storeManagerMock,
             $this->getDefaultStyles(),
             $this->getDisallowedFundingMap(),
             $this->getUnsupportedPaymentMethods()
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_config.php b/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_config.php
index 6089b8b20b1ac..a7bd43e53085f 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_config.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/_files/expected_config.php
@@ -46,6 +46,7 @@ function generateExpectedPaypalSdkUrl(array $params) : String
                     'merchant-id' => 'merchant',
                     'locale' => 'es_MX',
                     'intent' => 'authorize',
+                    'currency' => 'USD',
                     'disable-funding' => implode(
                         ',',
                         ['credit', 'venmo', 'bancontact', 'eps', 'giropay', 'ideal', 'mybank', 'p24', 'sofort']
@@ -84,6 +85,7 @@ function generateExpectedPaypalSdkUrl(array $params) : String
                     'merchant-id' => 'merchant',
                     'locale' => 'en_BR',
                     'intent' => 'authorize',
+                    'currency' => 'USD',
                     'disable-funding' => implode(
                         ',',
                         ['venmo', 'bancontact', 'eps', 'giropay', 'ideal', 'mybank', 'p24', 'sofort']
@@ -121,6 +123,7 @@ function generateExpectedPaypalSdkUrl(array $params) : String
                     'merchant-id' => 'merchant',
                     'locale' => 'en_US',
                     'intent' => 'authorize',
+                    'currency' => 'USD',
                     'disable-funding' => implode(
                         ',',
                         ['venmo', 'bancontact', 'eps', 'giropay', 'ideal', 'mybank', 'p24', 'sofort']
@@ -158,6 +161,7 @@ function generateExpectedPaypalSdkUrl(array $params) : String
                     'merchant-id' => 'merchant',
                     'locale' => 'en_US',
                     'intent' => 'authorize',
+                    'currency' => 'USD',
                     'disable-funding' => implode(
                         ',',
                         ['credit','venmo', 'bancontact', 'eps', 'giropay', 'ideal', 'mybank', 'p24', 'sofort']
@@ -196,6 +200,7 @@ function generateExpectedPaypalSdkUrl(array $params) : String
                     'merchant-id' => 'merchant',
                     'locale' => 'en_BR',
                     'intent' => 'authorize',
+                    'currency' => 'USD',
                     'disable-funding' => implode(
                         ',',
                         ['card','venmo', 'bancontact', 'eps', 'giropay', 'ideal', 'mybank', 'p24', 'sofort']

From c446aa3224440a0d7d1c1c6376b683f01d6e446b Mon Sep 17 00:00:00 2001
From: kphan <kphan@adobe.com>
Date: Tue, 19 May 2020 16:43:07 -0500
Subject: [PATCH 0330/1718] MC-34360: [Paypal Express Checkout] Can't place an
 order if the currency is euro

- Modified tests to have test coverage on global scope
---
 .../Paypal/Test/Mftf/Suite/InContextPaypalSuite.xml   |  1 -
 ...StorefrontPaypalSmartButtonWithAUDCurrencyTest.xml | 11 ++++++-----
 ...torefrontPaypalSmartButtonWithEuroCurrencyTest.xml |  6 ++++++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Paypal/Test/Mftf/Suite/InContextPaypalSuite.xml b/app/code/Magento/Paypal/Test/Mftf/Suite/InContextPaypalSuite.xml
index b52fc05ca5a11..31d388e5a64e4 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Suite/InContextPaypalSuite.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Suite/InContextPaypalSuite.xml
@@ -12,7 +12,6 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
             <!--Config PayPal Express Checkout-->
             <actionGroup ref="ConfigPayPalExpressCheckoutActionGroup" stepKey="ConfigPayPalExpressCheckout"/>
-            <!-- Configure PayPal Express Checkout -->
             <magentoCLI command="cache:clean" arguments="config full_page" stepKey="cleanFullPageCache"/>
         </before>
         <after>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithAUDCurrencyTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithAUDCurrencyTest.xml
index 69ec26a8ea806..f949235e98025 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithAUDCurrencyTest.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithAUDCurrencyTest.xml
@@ -22,7 +22,12 @@
             </skip>
         </annotations>
         <before>
-
+            <!--Set price scope global-->
+            <magentoCLI command="config:set {{CatalogPriceScopeGlobalConfigData.path}} {{CatalogPriceScopeGlobalConfigData.value}}" stepKey="setCatalogPriceScopeWebsite"/>
+            <!--Remove Currency options for Website-->
+            <remove keyForRemoval="setCurrencyBaseEURWebsites"/>
+            <remove keyForRemoval="setAllowedCurrencyWebsitesForEURandUSD"/>
+            <remove keyForRemoval="setCurrencyDefaultEURWebsites"/>
             <!--Enable Advanced Setting-->
             <magentoCLI command="config:set {{StorefrontPaypalEnableSkipOrderReviewStepConfigData.path}} {{StorefrontPaypalEnableSkipOrderReviewStepConfigData.value}}" stepKey="enableSkipOrderReview"/>
             <!--Set merchant country-->
@@ -31,10 +36,6 @@
             <magentoCLI command="config:set {{SetCurrencyAUDBaseConfig.path}} {{SetCurrencyAUDBaseConfig.value}}" stepKey="setCurrencyBaseEUR"/>
             <magentoCLI command="config:set {{SetAllowedCurrenciesConfigForUSD.path}} {{SetAllowedCurrenciesConfigForUSD.value}},{{SetAllowedCurrenciesConfigForAUD.value}}" stepKey="setAllowedCurrencyEURandUSD"/>
             <magentoCLI command="config:set {{SetDefaultCurrencyAUDConfig.path}} {{SetDefaultCurrencyAUDConfig.value}}" stepKey="setCurrencyDefaultEUR"/>
-            <!--Set Currency options for Website-->
-            <magentoCLI command="config:set --scope={{SetCurrencyUSDBaseConfig.scope}} --scope-code={{SetCurrencyUSDBaseConfig.scope_code}} {{SetCurrencyUSDBaseConfig.path}} {{SetCurrencyUSDBaseConfig.value}}" stepKey="setCurrencyBaseEURWebsites"/>
-            <magentoCLI command="config:set --scope={{SetAllowedCurrenciesConfigForUSD.scope}} --scope-code={{SetAllowedCurrenciesConfigForUSD.scope_code}} {{SetAllowedCurrenciesConfigForUSD.path}} {{SetAllowedCurrenciesConfigForUSD.value}},{{SetAllowedCurrenciesConfigForAUD.value}}" stepKey="setAllowedCurrencyWebsitesForEURandUSD"/>
-            <magentoCLI command="config:set --scope={{SetDefaultCurrencyAUDConfig.scope}} --scope-code={{SetDefaultCurrencyAUDConfig.scope_code}} {{SetDefaultCurrencyAUDConfig.path}} {{SetDefaultCurrencyAUDConfig.value}}" stepKey="setCurrencyDefaultEURWebsites"/>
         </before>
         <after>
             <magentoCLI command="config:set {{StorefrontPaypalDisableSkipOrderReviewStepConfigData.path}} {{StorefrontPaypalDisableSkipOrderReviewStepConfigData.value}}" stepKey="disableSkipOrderReview"/>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithEuroCurrencyTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithEuroCurrencyTest.xml
index 5077544ea0b39..bd756e4df176d 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithEuroCurrencyTest.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithEuroCurrencyTest.xml
@@ -22,6 +22,12 @@
             </skip>
         </annotations>
         <before>
+            <!--Set price scope global-->
+            <magentoCLI command="config:set {{CatalogPriceScopeGlobalConfigData.path}} {{CatalogPriceScopeGlobalConfigData.value}}" stepKey="setCatalogPriceScopeWebsite"/>
+            <!--Remove Currency options for Website-->
+            <remove keyForRemoval="setCurrencyBaseEURWebsites"/>
+            <remove keyForRemoval="setAllowedCurrencyWebsitesForEURandUSD"/>
+            <remove keyForRemoval="setCurrencyDefaultEURWebsites"/>
             <!--Set merchant country-->
             <magentoCLI command="config:set {{MerchantUnitedKingdom.path}} {{MerchantUnitedKingdom.value}}" stepKey="setMerchantCountryUK"/>
             <!--Enable Advanced Setting-->

From 12ce929735fa0f3df0bcae1e49863cd84686c5d7 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Fri, 22 May 2020 14:06:27 -0500
Subject: [PATCH 0331/1718] MC-34360: [Paypal Express Checkout] Can't place an
 order if the currency is euro

- use base currency code
---
 app/code/Magento/Paypal/Model/SmartButtonConfig.php             | 2 +-
 .../Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Paypal/Model/SmartButtonConfig.php b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
index b1bc05a8167c3..8adff75df205b 100644
--- a/app/code/Magento/Paypal/Model/SmartButtonConfig.php
+++ b/app/code/Magento/Paypal/Model/SmartButtonConfig.php
@@ -131,7 +131,7 @@ private function generatePaypalSdkUrl(string $page): string
                 'merchant-id' => $this->config->getValue('merchant_id'),
                 'locale' => $this->localeResolver->getLocale(),
                 'intent' => $this->getIntent(),
-                'currency' => $this->storeManager->getStore()->getCurrentCurrencyCode(),
+                'currency' => $this->storeManager->getStore()->getBaseCurrencyCode(),
             ];
         if ($disallowedFunding) {
             $params['disable-funding'] = $disallowedFunding;
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php b/app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php
index a19b27d0ec97b..f7ee15efa3ab9 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/SmartButtonConfigTest.php
@@ -61,7 +61,7 @@ protected function setUp(): void
 
         /** @var Store|MockObject $storeMock */
         $storeMock = $this->createMock(Store::class);
-        $storeMock->method('getCurrentCurrencyCode')
+        $storeMock->method('getBaseCurrencyCode')
             ->willReturn('USD');
 
         /** @var StoreManagerInterface|MockObject $storeManagerMock */

From 1e11a165ef2cde233042c8445e1722e39c50a44e Mon Sep 17 00:00:00 2001
From: kphan <kphan@adobe.com>
Date: Fri, 22 May 2020 17:47:07 -0500
Subject: [PATCH 0332/1718] MC-34360: [Paypal Express Checkout] Can't place an
 order if the currency is euro

- Update test to switch to different currency on Storefront
---
 .../StorefrontPaypalSmartButtonInCheckoutPageTest.xml |  3 ---
 ...PaypalSmartButtonWithFranceMerchantCountryTest.xml | 11 ++++++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml
index 2cc94caf4c1b1..d27ac4c4a92f5 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml
@@ -17,9 +17,6 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-13690"/>
             <group value="paypalExpress"/>
-            <skip>
-                <issueId value="MC-33951"/>
-            </skip>
         </annotations>
         <before>
             <!-- Login -->
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml
index 22997b7005f91..99bd9721becc0 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml
@@ -17,16 +17,16 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-33274"/>
             <group value="paypalExpress"/>
-            <skip>
-                <issueId value="MC-33951"/>
-            </skip>
         </annotations>
         <before>
+            <!--Set price scope global-->
+            <magentoCLI command="config:set {{CatalogPriceScopeGlobalConfigData.path}} {{CatalogPriceScopeGlobalConfigData.value}}" stepKey="setCatalogPriceScopeWebsite"/>
             <!--Set merchant country-->
             <magentoCLI command="config:set {{MerchantFrance.path}} {{MerchantFrance.value}}" stepKey="setMerchantCountryUK"/>
             <!--Enable Advanced Setting-->
             <magentoCLI command="config:set {{StorefrontPaypalEnableSkipOrderReviewStepConfigData.path}} {{StorefrontPaypalEnableSkipOrderReviewStepConfigData.value}}" stepKey="enableSkipOrderReview"/>
             <createData entity="FreeShippinMethodConfig" stepKey="enableFreeShipping"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
         </before>
         <after>
             <magentoCLI command="config:set {{StorefrontPaypalDisableSkipOrderReviewStepConfigData.path}} {{StorefrontPaypalDisableSkipOrderReviewStepConfigData.value}}" stepKey="disableSkipOrderReview"/>
@@ -34,6 +34,11 @@
             <magentoCLI command="config:set {{MerchantUnitedStates.path}} {{MerchantUnitedStates.value}}" stepKey="setMerchantCountryDefault"/>
             <createData entity="FreeShippinMethodDefault" stepKey="disableFreeShippingMethod"/>
         </after>
+        <!-- Switch to USD-US Dollar-->
+        <actionGroup ref="StorefrontSwitchCurrencyActionGroup" after="waitForProductPagePageLoad" stepKey="switchCurrency">
+            <argument name="currency" value="USD"/>
+        </actionGroup>
+
         <!-- click on PayPal payment radio button -->
         <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" after="guestCheckoutFillingShippingSection" stepKey="waitForPlaceOrderButton"/>
         <click selector="{{CheckoutPaymentSection.PayPalPaymentRadio}}" stepKey="guestSelectCheckMoneyOrderPayment"/>

From 2be5602e0ffe4a3b4d83a66e7dccd5ccc102d8c0 Mon Sep 17 00:00:00 2001
From: kphan <kphan@adobe.com>
Date: Wed, 27 May 2020 12:34:01 -0500
Subject: [PATCH 0333/1718] MC-34360: [Paypal Express Checkout] Can't place an
 order if the currency is euro

- Added step to overwrite assertion rate
---
 ...refrontPaypalSmartButtonWithFranceMerchantCountryTest.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml
index 99bd9721becc0..3fd5f44d5a4b6 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml
@@ -57,5 +57,10 @@
         <actionGroup ref="StorefrontPaypalSwitchBackToMagentoFromCheckoutPageActionGroup" after="LoginToPayPal" stepKey="submitPayment"/>
 
         <waitForElement after="submitPayment" selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="waitForOrderNumber"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderInformationTable}}" userInput="USD / EUR rate" stepKey="seeEURandUSDRate"/>
+        <assertEquals stepKey="assertSelectedCategories">
+            <actualResult type="variable">grabRate</actualResult>
+            <expectedResult type="array">[USD / EUR rate:]</expectedResult>
+        </assertEquals>
     </test>
 </tests>

From 59cf9f7d321fdc4278478e9e656f64584e95b80c Mon Sep 17 00:00:00 2001
From: "v.prokopov" <v.prokopov@atwix.com>
Date: Fri, 29 May 2020 08:54:14 +0300
Subject: [PATCH 0334/1718] added short description

---
 .../Magento/Downloadable/Observer/SetLinkStatusObserver.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Downloadable/Observer/SetLinkStatusObserver.php b/app/code/Magento/Downloadable/Observer/SetLinkStatusObserver.php
index a450651952a7e..2a07a3a49639f 100644
--- a/app/code/Magento/Downloadable/Observer/SetLinkStatusObserver.php
+++ b/app/code/Magento/Downloadable/Observer/SetLinkStatusObserver.php
@@ -160,6 +160,8 @@ public function execute(\Magento\Framework\Event\Observer $observer)
     }
 
     /**
+     * Returns purchased item collection
+     *
      * @return \Magento\Downloadable\Model\ResourceModel\Link\Purchased\Item\Collection
      */
     protected function _createItemsCollection()

From 703add17b4fd31607fc6aa0ad3b0c41c72ec43b9 Mon Sep 17 00:00:00 2001
From: Mateusz Krzeszowiak <mateusz.krzeszowiak@creativestyle.pl>
Date: Fri, 29 May 2020 09:17:42 +0200
Subject: [PATCH 0335/1718] Fix syntax error in test selector

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

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml
index 498321b9f3d81..c94bca1ca5c13 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml
@@ -12,7 +12,7 @@
         <element name="collapseAll" type="button" selector=".tree-actions a:first-child"/>
         <element name="expandAll" type="button" selector=".tree-actions a:last-child"/>
         <element name="categoryHighlighted" type="text" selector="//div[@id='store.menu']//span[contains(text(),'{{name}}')]/ancestor::li" parameterized="true" timeout="30"/>
-        <element name="categoryNotHighlighted" type="text" selector="[id='store.menu'] ul li.active" timeout="30"/>
+        <element name="categoryNotHighlighted" type="text" selector="[id=\'store.menu\'] ul li.active" timeout="30"/>
         <element name="categoryTreeRoot" type="text" selector="div.x-tree-root-node>li.x-tree-node:first-of-type>div.x-tree-node-el:first-of-type" timeout="30"/>
         <element name="categoryInTree" type="text" selector="//a/span[contains(text(), '{{name}}')]" parameterized="true" timeout="30"/>
         <element name="categoryInTreeUnderRoot" type="text" selector="//li/ul/li[@class='x-tree-node']/div/a/span[contains(text(), '{{name}}')]" parameterized="true"/>

From 660af8f2bd2a7eeefd1327a55cce05cd5fbd2bba Mon Sep 17 00:00:00 2001
From: Dan Mooney <dmooney@adobe.com>
Date: Thu, 28 May 2020 15:02:42 -0500
Subject: [PATCH 0336/1718] MC-34738: MFTF tests generation is failed on
 2.4.0-develop

---
 .../Test/Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml
index ba0f7aedabcd6..46ad2e228c6c1 100644
--- a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml
@@ -12,6 +12,9 @@
         <annotations>
             <description>Deletes a User Role.</description>
         </annotations>
+        <arguments>
+            <argument name="role" defaultValue=""/>
+        </arguments>
 
         <click stepKey="clickResetFilterButtonBefore" selector="{{AdminRoleGridSection.resetButton}}"/>
         <waitForPageLoad stepKey="waitForRolesGridFilterResetBefore" time="10"/>
@@ -35,4 +38,4 @@
         <click stepKey="clickResetFilterButtonAfter" selector="{{AdminRoleGridSection.resetButton}}"/>
         <waitForPageLoad stepKey="waitForRolesGridFilterResetAfter" time="10"/>
     </actionGroup>
-</actionGroups>
\ No newline at end of file
+</actionGroups>

From 4d17348aa5886ab14c28ca8ab1574cc293b4180a Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Fri, 29 May 2020 12:52:10 -0500
Subject: [PATCH 0337/1718] MC-34416: Error in the CLI during upgrade

---
 setup/src/Magento/Setup/Model/SearchConfig.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/setup/src/Magento/Setup/Model/SearchConfig.php b/setup/src/Magento/Setup/Model/SearchConfig.php
index 5aac234bb6089..2b660077d1f5b 100644
--- a/setup/src/Magento/Setup/Model/SearchConfig.php
+++ b/setup/src/Magento/Setup/Model/SearchConfig.php
@@ -7,6 +7,7 @@
 
 namespace Magento\Setup\Model;
 
+use Magento\Framework\App\Config;
 use Magento\Framework\Setup\Option\AbstractConfigOption;
 use Magento\Framework\Validation\ValidationException;
 use Magento\Search\Model\SearchEngine\Validator;
@@ -33,19 +34,27 @@ class SearchConfig
      */
     private $installConfig;
 
+    /**
+     * @var Config
+     */
+    private $appConfig;
+
     /**
      * @param SearchConfigOptionsList $searchConfigOptionsList
      * @param Validator $searchValidator
      * @param CompositeInstallConfig $installConfig
+     * @param Config $appConfig
      */
     public function __construct(
         SearchConfigOptionsList $searchConfigOptionsList,
         Validator $searchValidator,
-        CompositeInstallConfig $installConfig
+        CompositeInstallConfig $installConfig,
+        Config $appConfig
     ) {
         $this->searchConfigOptionsList = $searchConfigOptionsList;
         $this->searchValidator = $searchValidator;
         $this->installConfig = $installConfig;
+        $this->appConfig = $appConfig;
     }
 
     /**
@@ -76,6 +85,9 @@ public function saveConfiguration(array $inputOptions)
      */
     public function validateSearchEngine()
     {
+        //Clean config cache prior to validation
+        $this->appConfig->clean();
+
         $validationErrors = $this->searchValidator->validate();
         if (!empty($validationErrors)) {
             throw new ValidationException(__(implode(PHP_EOL, $validationErrors)));

From 68b30eeba459cf013fc9c9a14768b51433fa031d Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@magento.com>
Date: Fri, 29 May 2020 17:38:12 -0500
Subject: [PATCH 0338/1718] MC-31618: Move static config to files - PLUGIN_LIST

---
 app/etc/di.xml                                |  10 +
 .../Interception/PluginList/PluginList.php    |  36 +-
 .../Console/Command/DiCompileCommand.php      |   1 +
 .../Task/Operation/PluginListGenerator.php    | 403 ++++++++++++++++++
 .../Module/Di/App/Task/OperationFactory.php   |   6 +
 5 files changed, 444 insertions(+), 12 deletions(-)
 create mode 100644 setup/src/Magento/Setup/Module/Di/App/Task/Operation/PluginListGenerator.php

diff --git a/app/etc/di.xml b/app/etc/di.xml
index 7b91941fe05d6..920265193f152 100644
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -430,6 +430,16 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Setup\Module\Di\App\Task\Operation\PluginListGenerator">
+        <arguments>
+            <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
+            <argument name="reader" xsi:type="object">Magento\Framework\ObjectManager\Config\Reader\Dom\Proxy</argument>
+            <argument name="cacheId" xsi:type="string">plugin-list</argument>
+            <argument name="scopePriorityScheme" xsi:type="array">
+                <item name="first" xsi:type="string">global</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Framework\App\ResourceConnection">
         <arguments>
             <argument name="connectionFactory" xsi:type="object">Magento\Framework\App\ResourceConnection\ConnectionFactory</argument>
diff --git a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
index bf1372dc007a1..6661bdc3c8aa2 100644
--- a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
+++ b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Framework\Interception\PluginList;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Config\CacheInterface;
 use Magento\Framework\Config\Data\Scoped;
 use Magento\Framework\Config\ReaderInterface;
@@ -285,23 +286,34 @@ protected function _loadScopedData()
                 $this->_scopePriorityScheme[] = $scope;
             }
             $cacheId = implode('|', $this->_scopePriorityScheme) . "|" . $this->_cacheId;
-            $data = $this->_cache->load($cacheId);
-            if ($data) {
-                list($this->_data, $this->_inherited, $this->_processed) = $this->serializer->unserialize($data);
+            $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+            $directoryList = $objectManager->get(DirectoryList::class);
+            $file = $directoryList->getPath(DirectoryList::GENERATED_METADATA) . '/' . $cacheId . '.' . 'php';
+            if (file_exists($file)) {
+                $data = include $file;
+                list($this->_data, $this->_inherited, $this->_processed) = $data;
                 foreach ($this->_scopePriorityScheme as $scopeCode) {
                     $this->_loadedScopes[$scopeCode] = true;
                 }
             } else {
-                foreach ($this->_loadScopedVirtualTypes() as $class) {
-                    $this->_inheritPlugins($class);
-                }
-                foreach ($this->getClassDefinitions() as $class) {
-                    $this->_inheritPlugins($class);
+                $data = $this->_cache->load($cacheId);
+                if ($data) {
+                    list($this->_data, $this->_inherited, $this->_processed) = $this->serializer->unserialize($data);
+                    foreach ($this->_scopePriorityScheme as $scopeCode) {
+                        $this->_loadedScopes[$scopeCode] = true;
+                    }
+                } else {
+                    foreach ($this->_loadScopedVirtualTypes() as $class) {
+                        $this->_inheritPlugins($class);
+                    }
+                    foreach ($this->getClassDefinitions() as $class) {
+                        $this->_inheritPlugins($class);
+                    }
+                    $this->_cache->save(
+                        $this->serializer->serialize([$this->_data, $this->_inherited, $this->_processed]),
+                        $cacheId
+                    );
                 }
-                $this->_cache->save(
-                    $this->serializer->serialize([$this->_data, $this->_inherited, $this->_processed]),
-                    $cacheId
-                );
             }
             $this->_pluginInstances = [];
         }
diff --git a/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php b/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php
index 56a4a85b17d99..cfd5da0d6b7ef 100644
--- a/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php
@@ -400,6 +400,7 @@ private function getOperationsConfiguration(
                 $compiledPathsList['generated_helpers'],
             ],
             OperationFactory::APPLICATION_ACTION_LIST_GENERATOR => [],
+            OperationFactory::PLUGIN_LIST_GENERATOR => [],
         ];
 
         return $operations;
diff --git a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/PluginListGenerator.php b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/PluginListGenerator.php
new file mode 100644
index 0000000000000..fa0443cf72c64
--- /dev/null
+++ b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/PluginListGenerator.php
@@ -0,0 +1,403 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Setup\Module\Di\App\Task\Operation;
+
+use Magento\Framework\App\ObjectManager\ConfigWriterInterface;
+use Magento\Framework\Config\ReaderInterface;
+use Magento\Framework\Config\ScopeInterface;
+use Magento\Framework\Interception\DefinitionInterface;
+use Magento\Framework\Interception\ObjectManager\ConfigInterface;
+use Magento\Framework\ObjectManager\DefinitionInterface as ClassDefinitions;
+use Magento\Framework\ObjectManager\RelationsInterface;
+use Magento\Setup\Module\Di\App\Task\OperationInterface;
+use Magento\Framework\Config\CacheInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Generates plugins for Magento per scope
+ */
+class PluginListGenerator implements OperationInterface
+{
+    /**
+     * @var ScopeInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * Configuration reader
+     *
+     * @var ReaderInterface
+     */
+    private $reader;
+
+    /**
+     * Configuration cache
+     *
+     * @var CacheInterface
+     */
+    protected $cache;
+
+    /**
+     * Cache tag
+     *
+     * @var string
+     */
+    protected $_cacheId = 'plugin-list';
+
+    /**
+     * Scope priority loading scheme
+     *
+     * @var string[]
+     */
+    protected $_scopePriorityScheme = [];
+
+    /**
+     * Loaded scopes
+     *
+     * @var array
+     */
+    protected $_loadedScopes = [];
+
+    /**
+     * Type config
+     *
+     * @var ConfigInterface
+     */
+    private $omConfig;
+
+    /**
+     * Class relations information provider
+     *
+     * @var RelationsInterface
+     */
+    private $relations;
+
+    /**
+     * List of interception methods per plugin
+     *
+     * @var DefinitionInterface
+     */
+    private $definitions;
+
+    /**
+     * List of interceptable application classes
+     *
+     * @var ClassDefinitions
+     */
+    private $classDefinitions;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var ConfigWriterInterface
+     */
+    private $configWriter;
+
+    /**
+     * @var array
+     */
+    private $_data;
+
+    /**
+     * @var array
+     */
+    private $_inherited = [];
+
+    /**
+     * @var array
+     */
+    private $_processed;
+
+    /**
+     * @var array
+     */
+    protected $_pluginInstances = [];
+
+    /**
+     * @param ReaderInterface $reader
+     * @param ScopeInterface $scopeConfig
+     * @param ConfigInterface $omConfig
+     * @param RelationsInterface $relations
+     * @param DefinitionInterface $definitions
+     * @param ClassDefinitions $classDefinitions
+     * @param LoggerInterface $logger
+     * @param CacheInterface $cache
+     * @param ConfigWriterInterface $configWriter
+     * @param array $scopePriorityScheme
+     */
+    public function __construct(
+        ReaderInterface $reader,
+        ScopeInterface $scopeConfig,
+        ConfigInterface $omConfig,
+        RelationsInterface $relations,
+        DefinitionInterface $definitions,
+        ClassDefinitions $classDefinitions,
+        LoggerInterface $logger,
+        CacheInterface $cache,
+        ConfigWriterInterface $configWriter,
+        array $scopePriorityScheme = ['global']
+    ) {
+        $this->reader = $reader;
+        $this->scopeConfig = $scopeConfig;
+        $this->omConfig = $omConfig;
+        $this->relations = $relations;
+        $this->definitions = $definitions;
+        $this->classDefinitions = $classDefinitions;
+        $this->logger = $logger;
+        $this->cache = $cache;
+        $this->_scopePriorityScheme = $scopePriorityScheme;
+        $this->configWriter = $configWriter;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function doOperation()
+    {
+        $scopes = $this->scopeConfig->getAllScopes();
+        array_shift($scopes);
+
+        foreach ($scopes as $scope) {
+            $this->scopeConfig->setCurrentScope($scope);
+            if (false === isset($this->_loadedScopes[$scope])) {
+                if (false === in_array($scope, $this->_scopePriorityScheme)) {
+                    $this->_scopePriorityScheme[] = $scope;
+                }
+                $cacheId = implode('|', $this->_scopePriorityScheme) . "|" . $this->_cacheId;
+
+                foreach ($this->_loadScopedVirtualTypes() as $class) {
+                    $this->_inheritPlugins($class);
+                }
+                foreach ($this->_data as $className => $value) {
+                    $this->_inheritPlugins($className);
+                }
+                foreach ($this->getClassDefinitions() as $class) {
+                    $this->_inheritPlugins($class);
+                }
+                $this->configWriter->write(
+                    $cacheId,
+                    [$this->_data, $this->_inherited, $this->_processed]
+                );
+
+                if (count($this->_scopePriorityScheme) > 1 ) {
+                    array_pop($this->_scopePriorityScheme);
+                    $this->_data = null;
+                }
+                $this->_pluginInstances = [];
+            }
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getName()
+    {
+        return 'Plugin list generation';
+    }
+
+    /**
+     * Load virtual types for current scope
+     *
+     * @return array
+     */
+    private function _loadScopedVirtualTypes()
+    {
+        $virtualTypes = [];
+        foreach ($this->_scopePriorityScheme as $scopeCode) {
+            if (!isset($this->_loadedScopes[$scopeCode])) {
+                $data = $this->reader->read($scopeCode) ?: [];
+                unset($data['preferences']);
+                if (count($data) > 0) {
+                    $this->_inherited = [];
+                    $this->_processed = [];
+                    $this->merge($data);
+                    foreach ($data as $class => $config) {
+                        if (isset($config['type'])) {
+                            $virtualTypes[] = $class;
+                        }
+                    }
+                }
+                $this->_loadedScopes[$scopeCode] = true;
+            }
+            if ($this->isCurrentScope($scopeCode)) {
+                break;
+            }
+        }
+        return $virtualTypes;
+    }
+
+    /**
+     * Returns class definitions
+     *
+     * @return array
+     */
+    private function getClassDefinitions()
+    {
+        return $this->classDefinitions->getClasses();
+    }
+
+    /**
+     * Whether scope code is current scope code
+     *
+     * @param string $scopeCode
+     * @return bool
+     */
+    private function isCurrentScope($scopeCode)
+    {
+        return $this->scopeConfig->getCurrentScope() === $scopeCode;
+    }
+
+    /**
+     * Collect parent types configuration for requested type
+     *
+     * @param string $type
+     * @return array
+     * @throws \InvalidArgumentException
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     */
+    private function _inheritPlugins($type)
+    {
+        $type = ltrim($type, '\\');
+        if (!isset($this->_inherited[$type])) {
+            $realType = $this->omConfig->getOriginalInstanceType($type);
+
+            if ($realType !== $type) {
+                $plugins = $this->_inheritPlugins($realType);
+            } elseif ($this->relations->has($type)) {
+                $relations = $this->relations->getParents($type);
+                $plugins = [];
+                foreach ($relations as $relation) {
+                    if ($relation) {
+                        $relationPlugins = $this->_inheritPlugins($relation);
+                        if ($relationPlugins) {
+                            $plugins = array_replace_recursive($plugins, $relationPlugins);
+                        }
+                    }
+                }
+            } else {
+                $plugins = [];
+            }
+            if (isset($this->_data[$type])) {
+                if (!$plugins) {
+                    $plugins = $this->_data[$type];
+                } else {
+                    $plugins = array_replace_recursive($plugins, $this->_data[$type]);
+                }
+            }
+            $this->_inherited[$type] = null;
+            if (is_array($plugins) && count($plugins)) {
+                $this->filterPlugins($plugins);
+                uasort($plugins, [$this, '_sort']);
+                $this->trimInstanceStartingBackslash($plugins);
+                $this->_inherited[$type] = $plugins;
+                $lastPerMethod = [];
+                foreach ($plugins as $key => $plugin) {
+                    // skip disabled plugins
+                    if (isset($plugin['disabled']) && $plugin['disabled']) {
+                        unset($plugins[$key]);
+                        continue;
+                    }
+                    $pluginType = $this->omConfig->getOriginalInstanceType($plugin['instance']);
+                    if (!class_exists($pluginType)) {
+                        throw new \InvalidArgumentException('Plugin class ' . $pluginType . ' doesn\'t exist');
+                    }
+                    foreach ($this->definitions->getMethodList($pluginType) as $pluginMethod => $methodTypes) {
+                        $current = isset($lastPerMethod[$pluginMethod]) ? $lastPerMethod[$pluginMethod] : '__self';
+                        $currentKey = $type . '_' . $pluginMethod . '_' . $current;
+                        if ($methodTypes & DefinitionInterface::LISTENER_AROUND) {
+                            $this->_processed[$currentKey][DefinitionInterface::LISTENER_AROUND] = $key;
+                            $lastPerMethod[$pluginMethod] = $key;
+                        }
+                        if ($methodTypes & DefinitionInterface::LISTENER_BEFORE) {
+                            $this->_processed[$currentKey][DefinitionInterface::LISTENER_BEFORE][] = $key;
+                        }
+                        if ($methodTypes & DefinitionInterface::LISTENER_AFTER) {
+                            $this->_processed[$currentKey][DefinitionInterface::LISTENER_AFTER][] = $key;
+                        }
+                    }
+                }
+            }
+            return $plugins;
+        }
+        return $this->_inherited[$type];
+    }
+
+    /**
+     * Trims starting backslash from plugin instance name
+     *
+     * @param array $plugins
+     * @return void
+     */
+    private function trimInstanceStartingBackslash(&$plugins)
+    {
+        foreach ($plugins as &$plugin) {
+            $plugin['instance'] = ltrim($plugin['instance'], '\\');
+        }
+    }
+
+    /**
+     * Remove from list not existing plugins
+     *
+     * @param array $plugins
+     * @return void
+     */
+    private function filterPlugins(array &$plugins)
+    {
+        foreach ($plugins as $name => $plugin) {
+            if (empty($plugin['instance'])) {
+                unset($plugins[$name]);
+                $this->logger->info("Reference to undeclared plugin with name '{$name}'.");
+            }
+        }
+    }
+
+    /**
+     * Merge configuration
+     *
+     * @param array $config
+     * @return void
+     */
+    private function merge(array $config)
+    {
+        foreach ($config as $type => $typeConfig) {
+            if (isset($typeConfig['plugins'])) {
+                $type = ltrim($type, '\\');
+                if (isset($this->_data[$type])) {
+                    $this->_data[$type] = array_replace_recursive($this->_data[$type], $typeConfig['plugins']);
+                } else {
+                    $this->_data[$type] = $typeConfig['plugins'];
+                }
+            }
+        }
+    }
+
+    /**
+     * Sort items
+     *
+     * @param array $itemA
+     * @param array $itemB
+     * @return int
+     */
+    private function _sort($itemA, $itemB)
+    {
+        if (isset($itemA['sortOrder'])) {
+            if (isset($itemB['sortOrder'])) {
+                return $itemA['sortOrder'] - $itemB['sortOrder'];
+            }
+            return $itemA['sortOrder'];
+        } elseif (isset($itemB['sortOrder'])) {
+            return (0 - (int)$itemB['sortOrder']);
+        } else {
+            return 0;
+        }
+    }
+
+}
diff --git a/setup/src/Magento/Setup/Module/Di/App/Task/OperationFactory.php b/setup/src/Magento/Setup/Module/Di/App/Task/OperationFactory.php
index 607790e41421c..cd6bf213f8027 100644
--- a/setup/src/Magento/Setup/Module/Di/App/Task/OperationFactory.php
+++ b/setup/src/Magento/Setup/Module/Di/App/Task/OperationFactory.php
@@ -58,6 +58,11 @@ class OperationFactory
      */
     const APPLICATION_ACTION_LIST_GENERATOR = 'application_action_list_generator';
 
+    /**
+     * Plugin list generator
+     */
+    const PLUGIN_LIST_GENERATOR = 'plugin_list_generator';
+
     /**
      * Operations definitions
      *
@@ -73,6 +78,7 @@ class OperationFactory
         self::REPOSITORY_GENERATOR => \Magento\Setup\Module\Di\App\Task\Operation\RepositoryGenerator::class,
         self::PROXY_GENERATOR => \Magento\Setup\Module\Di\App\Task\Operation\ProxyGenerator::class,
         self::APPLICATION_ACTION_LIST_GENERATOR => AppActionListGenerator::class,
+        self::PLUGIN_LIST_GENERATOR => PluginListGenerator::class,
     ];
 
     /**

From 637e868535d31fdffc8a4dab266aa9c680c9eede Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Sun, 31 May 2020 21:16:44 +0300
Subject: [PATCH 0339/1718] MC-34711: [MFTF]
 AdminDisplayingCartAndCatalogPriceRulesGridsTest failed on Jenkins because of
 bad design (MC-17843)

---
 ...sUpdateProductStatusStoreViewScopeTest.xml | 57 +++++---------
 ...inMultipleWebsitesUseDefaultValuesTest.xml | 56 ++++++-------
 .../AdminRemoveImageAffectsAllScopesTest.xml  | 40 +++++-----
 ...ductWithCustomOptionsSecondWebsiteTest.xml | 43 ++++------
 ...inCatalogPriceRuleDeleteAllActionGroup.xml |  2 +-
 .../AdminDeleteCMSPageByUrlKeyActionGroup.xml | 33 ++++++++
 .../Section/CmsPagesPageActionsSection.xml    |  4 +-
 .../Test/Mftf/Test/CheckStaticBlocksTest.xml  | 34 ++++----
 ...bleProductPriceAdditionalStoreViewTest.xml | 78 ++++++++-----------
 ...wAccountNewsletterUncheckedActionGroup.xml |  3 +-
 ...erifySubscribedNewsletterDisplayedTest.xml | 28 +++----
 .../Rule/Test/Mftf/Helper/RuleHelper.php      | 62 +++++++++++++++
 ...AdminCartPriceRuleDeleteAllActionGroup.xml | 29 +++++++
 ...minCartPriceRuleFillActionsActionGroup.xml | 28 +++++++
 ...inCartPriceRuleFillMainInfoActionGroup.xml | 35 +++++++++
 .../AdminCartPriceRuleSaveActionGroup.xml     | 21 +++++
 .../AdminCartPriceRulesFormSection.xml        |  4 +
 17 files changed, 365 insertions(+), 192 deletions(-)
 create mode 100644 app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminDeleteCMSPageByUrlKeyActionGroup.xml
 create mode 100644 app/code/Magento/Rule/Test/Mftf/Helper/RuleHelper.php
 create mode 100644 app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleDeleteAllActionGroup.xml
 create mode 100644 app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleFillActionsActionGroup.xml
 create mode 100644 app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleFillMainInfoActionGroup.xml
 create mode 100644 app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleSaveActionGroup.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest/AdminMassUpdateProductStatusStoreViewScopeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest/AdminMassUpdateProductStatusStoreViewScopeTest.xml
index 54921d3fc2dda..bd2647c9c3a61 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest/AdminMassUpdateProductStatusStoreViewScopeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest/AdminMassUpdateProductStatusStoreViewScopeTest.xml
@@ -14,7 +14,7 @@
             <title value="Admin should be able to mass update product statuses in store view scope"/>
             <description value="Admin should be able to mass update product statuses in store view scope"/>
             <severity value="AVERAGE"/>
-            <testCaseId value="MAGETWO-59361"/>
+            <testCaseId value="MC-28538"/>
             <group value="Catalog"/>
             <group value="Product Attributes"/>
             <group value="SearchEngineElasticsearch"/>
@@ -22,64 +22,47 @@
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
 
-            <!--Create Website -->
             <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createAdditionalWebsite">
-                <argument name="newWebsiteName" value="Second Website"/>
-                <argument name="websiteCode" value="second_website"/>
+                <argument name="newWebsiteName" value="{{customWebsite.name}}"/>
+                <argument name="websiteCode" value="{{customWebsite.code}}"/>
             </actionGroup>
-
-            <!--Create Store -->
             <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewStore">
-                <argument name="website" value="Second Website"/>
-                <argument name="storeGroupName" value="Second Store"/>
-                <argument name="storeGroupCode" value="second_store"/>
+                <argument name="website" value="{{customWebsite.name}}"/>
+                <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
+                <argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createNewStoreView">
+                <argument name="StoreGroup" value="customStoreGroup"/>
+                <argument name="customStore" value="customStore"/>
             </actionGroup>
-
-            <!--Create Store view -->
-            <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-            <waitForPageLoad stepKey="waitForSystemStorePage"/>
-            <click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="createStoreViewButton"/>
-            <waitForPageLoad stepKey="waitForProductPageLoad"/>
-            <waitForElementVisible selector="//legend[contains(., 'Store View Information')]" stepKey="waitForNewStorePageToOpen"/>
-            <selectOption userInput="Second Store" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreGroup"/>
-            <fillField userInput="Second Store View" selector="{{AdminNewStoreSection.storeNameTextField}}" stepKey="fillStoreViewName"/>
-            <fillField userInput="second_store_view" selector="{{AdminNewStoreSection.storeCodeTextField}}" stepKey="fillStoreViewCode"/>
-            <selectOption selector="{{AdminNewStoreSection.statusDropdown}}" userInput="1" stepKey="enableStoreViewStatus"/>
-            <click selector="{{AdminNewStoreViewActionsSection.saveButton}}" stepKey="clickSaveStoreView"/>
-            <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModal"/>
-            <see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarning"/>
-            <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="dismissModal"/>
-            <waitForPageLoad stepKey="waitForPageLoad2" time="180"/>
-            <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" time="150" stepKey="waitForPageReolad"/>
-            <see userInput="You saved the store view." stepKey="seeSavedMessage"/>
 
             <!--Create a Simple Product 1 -->
             <actionGroup ref="CreateSimpleProductAndAddToWebsiteActionGroup" stepKey="createSimpleProduct1">
                 <argument name="product" value="simpleProductForMassUpdate"/>
-                <argument name="website" value="Second Website"/>
+                <argument name="website" value="{{customWebsite.name}}"/>
             </actionGroup>
 
             <!--Create a Simple Product 2 -->
             <actionGroup ref="CreateSimpleProductAndAddToWebsiteActionGroup" stepKey="createSimpleProduct2">
                 <argument name="product" value="simpleProductForMassUpdate2"/>
-                <argument name="website" value="Second Website"/>
+                <argument name="website" value="{{customWebsite.name}}"/>
             </actionGroup>
         </before>
         <after>
             <!--Delete website -->
             <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteSecondWebsite">
-                <argument name="websiteName" value="Second Website"/>
+                <argument name="websiteName" value="{{customWebsite.name}}"/>
             </actionGroup>
-            <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
+            <actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearFilters"/>
 
             <!--Delete Products -->
-            <actionGroup ref="DeleteProductActionGroup" stepKey="deleteProduct1">
-                <argument name="productName" value="simpleProductForMassUpdate.name"/>
+            <actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteProduct1">
+                <argument name="sku" value="{{simpleProductForMassUpdate.sku}}"/>
             </actionGroup>
-            <actionGroup ref="DeleteProductActionGroup" stepKey="deleteProduct2">
-                <argument name="productName" value="simpleProductForMassUpdate2.name"/>
+            <actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteProduct2">
+                <argument name="sku" value="{{simpleProductForMassUpdate2.sku}}"/>
             </actionGroup>
-            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
         </after>
 
         <!-- Search and select products -->
@@ -92,7 +75,7 @@
 
         <!-- Filter to Second Store View -->
         <actionGroup ref="AdminFilterStoreViewActionGroup" stepKey="filterStoreView">
-            <argument name="customStore" value="'Second Store View'"/>
+            <argument name="customStore" value="customStore.name"/>
         </actionGroup>
 
         <!-- Select Product 2 -->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml
index c1cfcf7ebe10f..20c81f8244f3d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml
@@ -15,41 +15,35 @@
             <title value="Use Default Value checkboxes should be checked for new website scope"/>
             <description value="Use Default Value checkboxes for product attribute should be checked for new website scope"/>
             <severity value="BLOCKER"/>
-            <testCaseId value="MAGETWO-92454"/>
+            <testCaseId value="MC-25783"/>
             <group value="Catalog"/>
         </annotations>
+
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+
+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createAdditionalWebsite">
+                <argument name="newWebsiteName" value="{{customWebsite.name}}"/>
+                <argument name="websiteCode" value="{{customWebsite.code}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewStore">
+                <argument name="website" value="{{customWebsite.name}}"/>
+                <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
+                <argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createNewStoreView">
+                <argument name="StoreGroup" value="customStoreGroup"/>
+                <argument name="customStore" value="customStore"/>
+            </actionGroup>
+        </before>
+
         <after>
             <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteSecondWebsite">
-                <argument name="websiteName" value="Second Website"/>
+                <argument name="websiteName" value="{{customWebsite.name}}"/>
             </actionGroup>
+            <actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
         </after>
-        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-        <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createAdditionalWebsite">
-            <argument name="newWebsiteName" value="Second Website"/>
-            <argument name="websiteCode" value="second_website"/>
-        </actionGroup>
-        <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewStore">
-            <argument name="website" value="Second Website"/>
-            <argument name="storeGroupName" value="Second Store"/>
-            <argument name="storeGroupCode" value="second_store"/>
-        </actionGroup>
-
-        <!--Create Store view -->
-        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-        <waitForPageLoad stepKey="waitForSystemStorePage"/>
-        <click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="createStoreViewButton"/>
-        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-        <waitForElementVisible selector="//legend[contains(., 'Store View Information')]" stepKey="waitForNewStorePageToOpen"/>
-        <selectOption userInput="Second Store" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreGroup"/>
-        <fillField userInput="Second Store View" selector="{{AdminNewStoreSection.storeNameTextField}}" stepKey="fillStoreViewName"/>
-        <fillField userInput="second_store_view" selector="{{AdminNewStoreSection.storeCodeTextField}}" stepKey="fillStoreViewCode"/>
-        <selectOption selector="{{AdminNewStoreSection.statusDropdown}}" userInput="1" stepKey="enableStoreViewStatus"/>
-        <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickStoreViewSaveButton"/>
-        <waitForElementVisible selector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" stepKey="waitForAcceptNewStoreViewCreationModal" />
-        <conditionalClick selector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" dependentSelector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" visible="true" stepKey="AcceptNewStoreViewCreation"/>
-        <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReload"/>
-        <see userInput="You saved the store view." stepKey="seeSaveMessage"/>
 
         <!--Create a Simple Product -->
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToCatalogProductGrid"/>
@@ -63,17 +57,17 @@
 
         <!-- Add product to second website and save the product -->
         <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="openProductInWebsites"/>
-        <click selector="{{ProductInWebsitesSection.website('Second Website')}}" stepKey="selectSecondWebsite"/>
+        <click selector="{{ProductInWebsitesSection.website(customWebsite.name)}}" stepKey="selectSecondWebsite"/>
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
         <waitForLoadingMaskToDisappear stepKey="waitForProductPageSave"/>
         <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessage"/>
 
         <!-- switch to the second store view -->
         <click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreviewSwitcher"/>
-        <click selector="{{AdminProductFormActionSection.selectStoreView('Second Store View')}}" stepKey="chooseStoreView"/>
+        <click selector="{{AdminProductFormActionSection.selectStoreView(customStore.name)}}" stepKey="chooseStoreView"/>
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptStoreSwitchingMessage"/>
         <waitForPageLoad time="30" stepKey="waitForPageLoad9"/>
-        <see userInput="Second Store View" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewStoreViewName"/>
+        <see userInput="{{customStore.name}}" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewStoreViewName"/>
 
         <!-- Check if Use Default Value checkboxes are checked -->
         <seeCheckboxIsChecked selector="{{AdminProductFormSection.productStatusUseDefault}}" stepKey="seeProductStatusCheckboxChecked"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml
index 6cd76c4cc06b8..b4738fd7adeec 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml
@@ -26,42 +26,42 @@
                 <requiredEntity createDataKey="category"/>
             </createData>
             <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createWebsite">
-                <argument name="newWebsiteName" value="FirstWebSite"/>
-                <argument name="websiteCode" value="FirstWebSiteCode"/>
+                <argument name="newWebsiteName" value="{{customWebsite.name}}"/>
+                <argument name="websiteCode" value="{{customWebsite.code}}"/>
             </actionGroup>
             <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewStore" after="createWebsite">
-                <argument name="website" value="FirstWebSite"/>
-                <argument name="storeGroupName" value="NewStore"/>
-                <argument name="storeGroupCode" value="Base1"/>
+                <argument name="website" value="{{customWebsite.name}}"/>
+                <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
+                <argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
             </actionGroup>
             <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView" after="createNewStore">
-                <argument name="StoreGroup" value="staticFirstStoreGroup"/>
-                <argument name="customStore" value="staticStore"/>
+                <argument name="StoreGroup" value="customStoreGroup"/>
+                <argument name="customStore" value="customStore"/>
             </actionGroup>
 
             <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createSecondWebsite" after="createCustomStoreView">
-                <argument name="newWebsiteName" value="SecondWebSite"/>
-                <argument name="websiteCode" value="SecondWebSiteCode"/>
+                <argument name="newWebsiteName" value="{{secondCustomWebsite.name}}"/>
+                <argument name="websiteCode" value="{{secondCustomWebsite.code}}"/>
             </actionGroup>
             <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createSecondStore" after="createSecondWebsite">
-                <argument name="website" value="SecondWebSite"/>
-                <argument name="storeGroupName" value="SecondStore"/>
-                <argument name="storeGroupCode" value="Base2"/>
+                <argument name="website" value="{{secondCustomWebsite.name}}"/>
+                <argument name="storeGroupName" value="{{SecondStoreGroupUnique.name}}"/>
+                <argument name="storeGroupCode" value="{{SecondStoreGroupUnique.code}}"/>
             </actionGroup>
             <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView2"  after="createSecondStore">
-                <argument name="StoreGroup" value="staticStoreGroup"/>
-                <argument name="customStore" value="staticSecondStore"/>
+                <argument name="StoreGroup" value="SecondStoreGroupUnique"/>
+                <argument name="customStore" value="SecondStoreUnique"/>
             </actionGroup>
         </before>
 
         <after>
             <actionGroup ref="ResetWebUrlOptionsActionGroup" stepKey="resetUrlOption"/>
             <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
-                <argument name="websiteName" value="FirstWebSite"/>
+                <argument name="websiteName" value="{{customWebsite.name}}"/>
             </actionGroup>
 
             <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteSecondWebsite">
-                <argument name="websiteName" value="SecondWebSite"/>
+                <argument name="websiteName" value="{{secondCustomWebsite.name}}"/>
             </actionGroup>
             <deleteData createDataKey="category" stepKey="deletePreReqCategory"/>
             <deleteData createDataKey="product" stepKey="deleteFirstProduct"/>
@@ -90,10 +90,10 @@
         </actionGroup>
         <!--"Product in Websites": select both Websites-->
         <actionGroup ref="ProductSetWebsiteActionGroup" stepKey="ProductSetWebsite1">
-            <argument name="website" value="FirstWebSite"/>
+            <argument name="website" value="{{customWebsite.name}}"/>
         </actionGroup>
         <actionGroup ref="ProductSetWebsiteActionGroup" stepKey="ProductSetWebsite2">
-            <argument name="website" value="SecondWebSite"/>
+            <argument name="website" value="{{secondCustomWebsite.name}}"/>
         </actionGroup>
 
         <!--Go to "Catalog" -> "Products". Open created product-->
@@ -110,7 +110,7 @@
 
         <!--Switch to "Store view 1"-->
         <actionGroup ref="SwitchToTheNewStoreViewActionGroup" stepKey="selectStoreView">
-            <argument name="storeViewName" value="Store View"/>
+            <argument name="storeViewName" value="{{customStore.name}}"/>
         </actionGroup>
 
         <!-- Assert product first image not in admin product form -->
@@ -120,7 +120,7 @@
 
         <!--Switch to "Store view 2"-->
         <actionGroup ref="SwitchToTheNewStoreViewActionGroup" stepKey="selectSecondStoreView">
-            <argument name="storeViewName" value="Second Store View"/>
+            <argument name="storeViewName" value="{{SecondStoreUnique.name}}"/>
         </actionGroup>
 
         <!-- Verify that Image 1 is deleted from the Second Store View list -->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
index b206a33ebde88..15c1a5630626a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
@@ -15,48 +15,38 @@
             <title value="You should be able to save a product with custom options assigned to a different website"/>
             <description value="Custom Options should not be split when saving the product after assigning to a different website"/>
             <severity value="BLOCKER"/>
-            <testCaseId value="MAGETWO-91436"/>
+            <testCaseId value="MC-25687"/>
             <group value="product"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-            <!--Create new website -->
+
             <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createAdditionalWebsite">
-                <argument name="newWebsiteName" value="Second Website"/>
-                <argument name="websiteCode" value="second_website"/>
+                <argument name="newWebsiteName" value="{{customWebsite.name}}"/>
+                <argument name="websiteCode" value="{{customWebsite.code}}"/>
             </actionGroup>
-
-            <!--Create new Store Group -->
             <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewStore">
-                <argument name="website" value="Second Website"/>
-                <argument name="storeGroupName" value="Second Store"/>
-                <argument name="storeGroupCode" value="second_store"/>
+                <argument name="website" value="{{customWebsite.name}}"/>
+                <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
+                <argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createNewStoreView">
+                <argument name="StoreGroup" value="customStoreGroup"/>
+                <argument name="customStore" value="customStore"/>
             </actionGroup>
 
-            <!--Create Store view -->
-            <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-            <waitForPageLoad stepKey="waitForAdminSystemStorePage"/>
-            <click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="createStoreViewButton"/>
-            <waitForPageLoad stepKey="waitForProductPageLoad"/>
-            <selectOption userInput="Second Store" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreGroup"/>
-            <fillField userInput="Second Store View" selector="{{AdminNewStoreSection.storeNameTextField}}" stepKey="fillStoreViewName"/>
-            <fillField userInput="second_store_view" selector="{{AdminNewStoreSection.storeCodeTextField}}" stepKey="fillStoreViewCode"/>
-            <selectOption userInput="1" selector="{{AdminNewStoreSection.statusDropdown}}" stepKey="enableStoreViewStatus"/>
-            <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickStoreViewSaveButton"/>
-            <waitForElementVisible selector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" stepKey="waitForAcceptNewStoreViewCreationModal" />
-            <conditionalClick selector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" dependentSelector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" visible="true" stepKey="AcceptNewStoreViewCreation"/>
-            <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReolad"/>
-            <see userInput="You saved the store view." stepKey="seeSaveMessage" />
+            <actionGroup ref="EnableWebUrlOptionsActionGroup" stepKey="addStoreCodeToUrls"/>
         </before>
+
         <after>
             <actionGroup ref="ResetWebUrlOptionsActionGroup" stepKey="resetUrlOption"/>
             <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteTestWebsite">
-                <argument name="websiteName" value="Second Website"/>
+                <argument name="websiteName" value="{{customWebsite.name}}"/>
             </actionGroup>
+            <actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
         </after>
 
-        <actionGroup ref="EnableWebUrlOptionsActionGroup" stepKey="addStoreCodeToUrls"/>
         <!--Create a Simple Product with Custom Options -->
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToCatalogProductGrid"/>
         <waitForPageLoad stepKey="waitForCatalogProductGrid"/>
@@ -94,13 +84,12 @@
 
         <!-- Add this product to second website -->
         <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="openProductInWebsitesSection1"/>
-        <click selector="{{ProductInWebsitesSection.website('Second Website')}}" stepKey="selectSecondWebsite"/>
+        <click selector="{{ProductInWebsitesSection.website(customWebsite.name)}}" stepKey="selectSecondWebsite"/>
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
         <waitForLoadingMaskToDisappear stepKey="waitForProductPagetoSaveAgain"/>
         <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessageAgain"/>
 
         <click selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" stepKey="openCustomOptionsSection2"/>
         <seeNumberOfElements selector=".admin__dynamic-rows[data-index='values'] tr.data-row" userInput="3" stepKey="see4RowsOfOptions"/>
-
     </test>
 </tests>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCatalogPriceRuleDeleteAllActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCatalogPriceRuleDeleteAllActionGroup.xml
index 1170b08b1add9..27edab962033e 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCatalogPriceRuleDeleteAllActionGroup.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCatalogPriceRuleDeleteAllActionGroup.xml
@@ -16,7 +16,7 @@
         <!-- 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\CatalogRule\Test\Mftf\Helper\CatalogPriceRuleHelper" method="deleteAllCatalogPriceRules" stepKey="deleteAllCatalogPriceRulesOneByOne">
+        <helper class="\Magento\Rule\Test\Mftf\Helper\RuleHelper" method="deleteAllRulesOneByOne" stepKey="deleteAllRulesOneByOne">
             <argument name="firstNotEmptyRow">{{AdminDataGridTableSection.firstNotEmptyRow}}</argument>
             <argument name="modalAcceptButton">{{AdminConfirmationModalSection.ok}}</argument>
             <argument name="deleteButton">{{AdminMainActionsSection.delete}}</argument>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminDeleteCMSPageByUrlKeyActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminDeleteCMSPageByUrlKeyActionGroup.xml
new file mode 100644
index 0000000000000..01e430807d7bd
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminDeleteCMSPageByUrlKeyActionGroup.xml
@@ -0,0 +1,33 @@
+<?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="AdminDeleteCMSPageByUrlKeyActionGroup">
+        <annotations>
+            <description>Goes to the Admin CMS Pages page. Filters the grid based on the provided Page url key. Deletes the Page via the grid.</description>
+        </annotations>
+        <arguments>
+            <argument name="pageUrlKey" type="string" defaultValue="cms_page"/>
+        </arguments>
+
+        <amOnPage url="{{CmsPagesPage.url}}" stepKey="navigateToCMSPagesGrid"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <conditionalClick selector="{{CmsPagesPageActionsSection.clearAllButton}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" visible="true" stepKey="clickToResetFilter"/>
+        <waitForPageLoad stepKey="waitForPageLoadAfterClearFilters"/>
+        <click selector="{{CmsPagesPageActionsSection.filterButton}}" stepKey="clickFilterButton"/>
+        <fillField selector="{{CmsPagesPageActionsSection.URLKey}}" userInput="{{pageUrlKey}}" stepKey="fillPageUrlKeyFilter"/>
+        <click selector="{{CmsPagesPageActionsSection.ApplyFiltersBtn}}" stepKey="applyFilter"/>
+        <waitForElementVisible selector="{{CmsPagesPageActionsSection.select(pageUrlKey)}}" stepKey="waitItemAppears"/>
+        <click selector="{{CmsPagesPageActionsSection.select(pageUrlKey)}}" stepKey="clickSelect"/>
+        <click selector="{{CmsPagesPageActionsSection.delete(pageUrlKey)}}" stepKey="clickDelete"/>
+        <waitForElementVisible selector="{{CmsPagesPageActionsSection.deleteConfirm}}" stepKey="waitForOkButtonToBeVisible"/>
+        <click selector="{{CmsPagesPageActionsSection.deleteConfirm}}" stepKey="clickOkButton"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitSuccessMessageAppeared"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="The page has been deleted." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml
index 494c98ca44e7f..2389e8b5c5ca0 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml
@@ -11,14 +11,14 @@
     <section name="CmsPagesPageActionsSection">
         <element name="filterButton" type="input" selector="//button[text()='Filters']"/>
         <element name="URLKey" type="input" selector="//div[@class='admin__form-field-control']/input[@name='identifier']"/>
-        <element name="ApplyFiltersBtn" type="button" selector="//span[text()='Apply Filters']"/>
+        <element name="ApplyFiltersBtn" type="button" selector="//span[text()='Apply Filters']" timeout="60"/>
         <element name="searchInput" type="input" selector="//*[@id='fulltext']"/>
         <element name="searchButton" type="button" selector="//*[@id='fulltext']/parent::*/button"/>
         <element name="addNewPageButton" type="button" selector="#add" timeout="30"/>
         <element name="select" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//button[text()='Select']" parameterized="true"/>
         <element name="edit" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='Edit']" parameterized="true"/>
         <element name="preview" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='View']" parameterized="true"/>
-        <element name="clearAllButton" type="button" selector="//div[@class='admin__data-grid-header']//button[contains(text(), 'Clear all')]"/>
+        <element name="clearAllButton" type="button" selector="//div[@class='admin__data-grid-header']//button[contains(text(), 'Clear all')]" timeout="60"/>
         <element name="activeFilters" type="button" selector="//div[@class='admin__data-grid-header']//span[contains(text(), 'Active filters:')]" />
         <element name="spinner" type="input" selector='//div[@data-component="cms_page_listing.cms_page_listing.cms_page_columns"]'/>
         <element name="firstItemSelectButton" type="button" selector=".data-grid .action-select-wrap button.action-select"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
index fe3e69880fc5c..eba7812e29a0c 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
@@ -15,27 +15,37 @@
             <title value="Check static blocks: ID should be unique per Store View"/>
             <description value="Check static blocks: ID should be unique per Store View"/>
             <severity value="BLOCKER"/>
-            <testCaseId value="MAGETWO-94229"/>
+            <testCaseId value="MC-25828"/>
             <group value="Cms"/>
+            <group value="WYSIWYGDisabled"/>
         </annotations>
+
         <before>
-            <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
-            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="AdminCreateWebsite">
-                <argument name="newWebsiteName" value="secondWebsite"/>
-                <argument name="websiteCode" value="second_website"/>
+
+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createAdditionalWebsite">
+                <argument name="newWebsiteName" value="{{customWebsite.name}}"/>
+                <argument name="websiteCode" value="{{customWebsite.code}}"/>
             </actionGroup>
-            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="AdminCreateStore">
-                <argument name="website" value="secondWebsite"/>
+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewStore">
+                <argument name="website" value="{{customWebsite.name}}"/>
                 <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
                 <argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
             </actionGroup>
-            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="AdminCreateStoreView">
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createNewStoreView">
                 <argument name="StoreGroup" value="customStoreGroup"/>
                 <argument name="customStore" value="customStore"/>
             </actionGroup>
         </before>
 
+        <after>
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="DeleteWebsite">
+                <argument name="websiteName" value="{{customWebsite.name}}"/>
+            </actionGroup>
+            <actionGroup ref="DeleteCMSBlockActionGroup" stepKey="DeleteCMSBlockActionGroup"/>
+            <actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearFilters"/>
+        </after>
+
         <!--Go to Cms blocks page-->
         <amOnPage url="{{CmsBlocksPage.url}}" stepKey="navigateToCMSPagesGrid"/>
         <waitForPageLoad stepKey="waitForPageLoad1"/>
@@ -73,13 +83,5 @@
         <click selector="{{BlockNewPagePageActionsSection.saveBlock}}" stepKey="ClickToSaveBlock2"/>
         <waitForPageLoad stepKey="waitForPageLoad9"/>
         <see userInput="You saved the block." stepKey="VerifyBlockIsSaved2"/>
-
-        <after>
-            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="DeleteWebsite">
-                <argument name="websiteName" value="secondWebsite"/>
-            </actionGroup>
-            <actionGroup ref="DeleteCMSBlockActionGroup" stepKey="DeleteCMSBlockActionGroup"/>
-            <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
-        </after>
     </test>
 </tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml
index a34dfd06ce844..5ecc0c33ad7a2 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml
@@ -15,11 +15,10 @@
             <title value="Configurable product prices should not disappear on storefront for additional store"/>
             <description value="Configurable product price should not disappear for additional stores on frontEnd if disabled for default store"/>
             <severity value="CRITICAL"/>
-            <testCaseId value="MAGETWO-92247"/>
+            <testCaseId value="MC-25761"/>
             <group value="ConfigurableProduct"/>
         </annotations>
         <before>
-
             <createData entity="ApiCategory" stepKey="createCategory"/>
             <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
                 <requiredEntity createDataKey="createCategory"/>
@@ -65,6 +64,22 @@
                 <requiredEntity createDataKey="createConfigChildProduct2"/>
             </createData>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
+
+            <actionGroup ref="EnableWebUrlOptionsActionGroup" stepKey="addStoreCodeToUrls"/>
+
+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createAdditionalWebsite">
+                <argument name="newWebsiteName" value="{{customWebsite.name}}"/>
+                <argument name="websiteCode" value="{{customWebsite.code}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewStore">
+                <argument name="website" value="{{customWebsite.name}}"/>
+                <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
+                <argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createNewStoreView">
+                <argument name="StoreGroup" value="customStoreGroup"/>
+                <argument name="customStore" value="customStore"/>
+            </actionGroup>
         </before>
 
         <after>
@@ -75,46 +90,21 @@
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <actionGroup ref="ResetWebUrlOptionsActionGroup" stepKey="resetUrlOption"/>
             <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteSecondWebsite">
-                <argument name="websiteName" value="Second Website"/>
+                <argument name="websiteName" value="{{customWebsite.name}}"/>
             </actionGroup>
+            <actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
             <!-- Reindex invalidated indices after product attribute has been created/deleted -->
             <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
         </after>
 
-        <actionGroup ref="EnableWebUrlOptionsActionGroup" stepKey="addStoreCodeToUrls"/>
-        <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="addNewWebsite">
-            <argument name="newWebsiteName" value="Second Website"/>
-            <argument name="websiteCode" value="second_website"/>
-        </actionGroup>
-        <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="addNewStoreGroup">
-            <argument name="website" value="Second Website"/>
-            <argument name="storeGroupName" value="Second Store"/>
-            <argument name="storeGroupCode" value="second_store"/>
-        </actionGroup>
-
-        <!--Create Store view -->
-        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-        <click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="createStoreViewButton"/>
-        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-        <selectOption userInput="Second Store" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreGroup"/>
-        <fillField userInput="Second Store View" selector="{{AdminNewStoreSection.storeNameTextField}}" stepKey="fillStoreViewName"/>
-        <fillField userInput="second_store_view" selector="{{AdminNewStoreSection.storeCodeTextField}}" stepKey="fillStoreViewCode"/>
-        <selectOption userInput="1" selector="{{AdminNewStoreSection.statusDropdown}}" stepKey="enableStoreViewStatus"/>
-        <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickStoreViewSaveButton"/>
-        <waitForElementVisible selector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" stepKey="waitForAcceptNewStoreViewCreationModal" />
-        <conditionalClick selector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" dependentSelector="{{AdminNewStoreSection.acceptNewStoreViewCreation}}" visible="true" stepKey="AcceptNewStoreViewCreation"/>
-        <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReolad"/>
-        <see userInput="You saved the store view." stepKey="seeSaveMessage" />
-
         <!--go to admin and open product edit page to disable product all store view -->
         <actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="goToProductEditPage">
-            <argument name="productId" value="$$createConfigProduct.id$$"/>
+            <argument name="productId" value="$createConfigProduct.id$"/>
         </actionGroup>
         <waitForPageLoad stepKey="waitEditPage"/>
         <click selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="disableProductForAllStoreView"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton2"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForProductPageSave1" />
+        <actionGroup ref="SaveProductFormActionGroup" stepKey="saveWithThreeOptions"/>
         <dontSeeCheckboxIsChecked selector="{{AdminProductFormSection.productStatus}}" stepKey="dontSeeCheckboxEnableProductIsChecked"/>
 
         <!-- Disable each of the child products for All Store views -->
@@ -126,17 +116,17 @@
 
         <!-- Add product to second website -->
         <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="openProductInWebsitesSection1"/>
-        <click selector="{{ProductInWebsitesSection.website('Second Website')}}" stepKey="selectSecondWebsite"/>
+        <click selector="{{ProductInWebsitesSection.website(customWebsite.name)}}" stepKey="selectSecondWebsite"/>
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
         <waitForLoadingMaskToDisappear stepKey="waitForProductPageSave"/>
         <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessage"/>
 
         <!-- switch to the second store view -->
         <click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreviewSwitcher"/>
-        <click selector="{{AdminProductFormActionSection.selectStoreView('Second Store View')}}" stepKey="chooseStoreView"/>
+        <click selector="{{AdminProductFormActionSection.selectStoreView(customStore.name)}}" stepKey="chooseStoreView"/>
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptStoreSwitchingMessage"/>
         <waitForPageLoad time="30" stepKey="waitForPageLoad9"/>
-        <see userInput="Second Store View" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewStoreViewName"/>
+        <see userInput="{{customStore.name}}" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewStoreViewName"/>
 
         <!-- enable the config product for the second store -->
        <waitForElementVisible selector="{{AdminProductFormSection.productStatusUseDefault}}" stepKey="waitForDefaultValueCheckBox"/>
@@ -152,10 +142,10 @@
         </actionGroup>
         <waitForPageLoad stepKey="waitEditPage2"/>
        <click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreviewSwitcher1"/>
-        <click selector="{{AdminProductFormActionSection.selectStoreView('Second Store View')}}" stepKey="chooseStoreView1"/>
+        <click selector="{{AdminProductFormActionSection.selectStoreView(customStore.name)}}" stepKey="chooseStoreView1"/>
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptStoreSwitchingMessage1"/>
         <waitForPageLoad time="30" stepKey="waitForPageLoad8"/>
-        <see userInput="Second Store View" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewStoreViewName1"/>
+        <see userInput="{{customStore.name}}" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewStoreViewName1"/>
         <click selector="{{AdminProductFormConfigurationsSection.actionsBtn('1')}}" stepKey="clickToExpandActionsForFirstVariation2"/>
         <click selector="{{AdminProductFormConfigurationsSection.enableProductBtn}}" stepKey="clickEnableChildProduct1"/>
         <click selector="{{AdminProductFormConfigurationsSection.actionsBtn('2')}}" stepKey="clickToExpandActionsForSecondVariation2"/>
@@ -163,7 +153,7 @@
         <actionGroup ref="AdminFormSaveAndCloseActionGroup" stepKey="saveAll"/>
 
         <!-- assert second store view storefront category list page -->
-        <amOnPage url="/second_store_view/" stepKey="amOnsecondStoreFront1"/>
+        <amOnPage url="/{{customStore.code}}/" stepKey="amOnsecondStoreFront1"/>
         <waitForPageLoad stepKey="waitForPageLoad31"/>
         <click userInput="$$createCategory.name$$" stepKey="clickOnCategoryName1"/>
         <waitForPageLoad stepKey="waitForPageLoad41"/>
@@ -175,7 +165,7 @@
         </actionGroup>
         <waitForPageLoad stepKey="waitChild1EditPageToLoad"/>
         <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="openProduct1InWebsitesSection"/>
-        <click selector="{{ProductInWebsitesSection.website('Second Website')}}" stepKey="selectSecondWebsite1"/>
+        <click selector="{{ProductInWebsitesSection.website(customWebsite.name)}}" stepKey="selectSecondWebsite1"/>
         <actionGroup ref="AdminFormSaveAndCloseActionGroup" stepKey="saveUpdatedChild1Again"/>
 
         <!--go to admin again and open child product1 and enable for second store view-->
@@ -184,10 +174,10 @@
         </actionGroup>
         <waitForPageLoad stepKey="waitChild1EditPageToLoad1"/>
         <click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreviewSwitcherP1"/>
-        <click selector="{{AdminProductFormActionSection.selectStoreView('Second Store View')}}" stepKey="chooseStoreView2P1"/>
+        <click selector="{{AdminProductFormActionSection.selectStoreView(customStore.name)}}" stepKey="chooseStoreView2P1"/>
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptStoreSwitchingMessageP1"/>
         <waitForPageLoad time="30" stepKey="waitForStoreViewSwitchedP1"/>
-        <see userInput="Second Store View" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewStoreViewNameP1"/>
+        <see userInput="{{customStore.name}}" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewStoreViewNameP1"/>
         <waitForElementVisible selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="waitForProductEnableSliderP1"/>
         <seeCheckboxIsChecked selector="{{AdminProductFormSection.productStatus}}" stepKey="seeThatProduct1IsEnabled"/>
         <actionGroup ref="AdminFormSaveAndCloseActionGroup" stepKey="save2UpdatedChild1"/>
@@ -198,7 +188,7 @@
         </actionGroup>
         <waitForPageLoad stepKey="waitChild2EditPageToLoad"/>
         <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="openProduct2InWebsitesSection"/>
-        <click selector="{{ProductInWebsitesSection.website('Second Website')}}" stepKey="selectSecondWebsite2"/>
+        <click selector="{{ProductInWebsitesSection.website(customWebsite.name)}}" stepKey="selectSecondWebsite2"/>
         <actionGroup ref="AdminFormSaveAndCloseActionGroup" stepKey="saveUpdatedChild2"/>
 
         <!--go to admin again and open child product2 and enable for second store view-->
@@ -207,16 +197,16 @@
         </actionGroup>
         <waitForPageLoad stepKey="waitChild2EditPageToLoad1"/>
         <click selector="{{AdminProductFormActionSection.changeStoreButton}}" stepKey="clickStoreviewSwitcherP2"/>
-        <click selector="{{AdminProductFormActionSection.selectStoreView('Second Store View')}}" stepKey="chooseStoreView2P2"/>
+        <click selector="{{AdminProductFormActionSection.selectStoreView(customStore.name)}}" stepKey="chooseStoreView2P2"/>
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptStoreSwitchingMessageP2"/>
         <waitForPageLoad time="30" stepKey="waitForStoreViewSwitchedP2"/>
-        <see userInput="Second Store View" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewStoreViewNameP2"/>
+        <see userInput="{{customStore.name}}" selector="{{AdminMainActionsSection.storeSwitcher}}" stepKey="seeNewStoreViewNameP2"/>
         <waitForElementVisible selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="waitForProductEnableSliderP2"/>
         <seeCheckboxIsChecked selector="{{AdminProductFormSection.productStatus}}" stepKey="seeThatProduct2IsEnabled"/>
         <actionGroup ref="AdminFormSaveAndCloseActionGroup" stepKey="save2UpdatedChild2"/>
 
         <!-- assert storefront category list page -->
-        <amOnPage url="/second_store_view/" stepKey="amOnsecondStoreFront"/>
+        <amOnPage url="/{{customStore.code}}/" stepKey="amOnsecondStoreFront"/>
         <waitForPageLoad stepKey="waitForPageLoad3"/>
         <click userInput="$$createCategory.name$$" stepKey="clickOnCategoryName"/>
         <waitForPageLoad stepKey="waitForPageLoad4"/>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/StorefrontCreateNewAccountNewsletterUncheckedActionGroup.xml b/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/StorefrontCreateNewAccountNewsletterUncheckedActionGroup.xml
index d6b0adff53a86..8037baa6b199c 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/StorefrontCreateNewAccountNewsletterUncheckedActionGroup.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/StorefrontCreateNewAccountNewsletterUncheckedActionGroup.xml
@@ -15,10 +15,11 @@
         <arguments>
             <argument name="Customer"/>
             <argument name="Store"/>
+            <argument name="StoreGroup"/>
         </arguments>
 
         <amOnPage stepKey="amOnStorefrontPage" url="{{Store.code}}"/>
         <see stepKey="seeDescriptionNewsletter" userInput="You aren't subscribed to our newsletter." selector="{{CustomerMyAccountPage.DescriptionNewsletter}}"/>
-        <see stepKey="seeThankYouMessage" userInput="Thank you for registering with NewStore."/>
+        <see stepKey="seeThankYouMessage" userInput="Thank you for registering with {{StoreGroup.name}}."/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml
index a568fb1799ac2..d60034b8925d3 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml
@@ -16,37 +16,38 @@
             <title value="Newsletter subscription when user is registered on 2 stores"/>
             <description value="Newsletter subscription when user is registered on 2 stores"/>
             <severity value="MAJOR"/>
-            <testCaseId value="MAGETWO-93836"/>
+            <testCaseId value="MC-25840"/>
         </annotations>
 
         <before>
             <!--Log in to Magento as admin.-->
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+
             <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createWebsite">
-                <argument name="newWebsiteName" value="Second"/>
-                <argument name="websiteCode" value="Base2"/>
+                <argument name="newWebsiteName" value="{{customWebsite.name}}"/>
+                <argument name="websiteCode" value="{{customWebsite.code}}"/>
             </actionGroup>
-
             <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewStore">
-                <argument name="website" value="Second"/>
-                <argument name="storeGroupName" value="NewStore"/>
-                <argument name="storeGroupCode" value="Base12"/>
+                <argument name="website" value="{{customWebsite.name}}"/>
+                <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
+                <argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
             </actionGroup>
-
             <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView">
-                <argument name="StoreGroup" value="staticStoreGroup"/>
-                <argument name="customStore" value="staticStore"/>
+                <argument name="StoreGroup" value="customStoreGroup"/>
+                <argument name="customStore" value="customStore"/>
             </actionGroup>
+
             <actionGroup ref="EnableWebUrlOptionsActionGroup" stepKey="addStoreCodeToUrls"/>
             <magentoCLI command="cache:flush" stepKey="flushCache"/>
-
         </before>
+
         <after>
             <!--Delete created data and set Default Configuration-->
             <actionGroup ref="ResetWebUrlOptionsActionGroup" stepKey="resetUrlOption"/>
             <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
-                <argument name="websiteName" value="Second"/>
+                <argument name="websiteName" value="{{customWebsite.name}}"/>
             </actionGroup>
+            <actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearFilters"/>
             <magentoCLI command="indexer:reindex" stepKey="reindex"/>
             <magentoCLI command="cache:flush" stepKey="flushCache"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
@@ -62,7 +63,8 @@
         <!--Create new Account with the same email address. (unchecked Sign Up for Newsletter checkbox)-->
         <actionGroup ref="StorefrontCreateNewAccountNewsletterUncheckedActionGroup" stepKey="createNewAccountNewsletterUnchecked">
             <argument name="Customer" value="CustomerEntityOne"/>
-            <argument name="Store" value="staticStore"/>
+            <argument name="Store" value="customStore"/>
+            <argument name="StoreGroup" value="customStoreGroup"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Rule/Test/Mftf/Helper/RuleHelper.php b/app/code/Magento/Rule/Test/Mftf/Helper/RuleHelper.php
new file mode 100644
index 0000000000000..a8a9f78df7f28
--- /dev/null
+++ b/app/code/Magento/Rule/Test/Mftf/Helper/RuleHelper.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Rule\Test\Mftf\Helper;
+
+use Facebook\WebDriver\Remote\RemoteWebDriver as FacebookWebDriver;
+use Facebook\WebDriver\WebDriverBy;
+use Magento\FunctionalTestingFramework\Helper\Helper;
+use Magento\FunctionalTestingFramework\Module\MagentoWebDriver;
+
+/**
+ * Class for MFTF helpers for CatalogRule module.
+ */
+class RuleHelper extends Helper
+{
+    /**
+     * Delete all Catalog Price Rules obe by one.
+     *
+     * @param string $emptyRow
+     * @param string $modalAceptButton
+     * @param string $deleteButton
+     * @param string $successMessageContainer
+     * @param string $successMessage
+     *
+     * @return void
+     */
+    public function deleteAllRulesOneByOne(
+        string $firstNotEmptyRow,
+        string $modalAcceptButton,
+        string $deleteButton,
+        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($firstNotEmptyRow));
+            while (!empty($rows)) {
+                $rows[0]->click();
+                $magentoWebDriver->waitForPageLoad(30);
+                $magentoWebDriver->click($deleteButton);
+                $magentoWebDriver->waitForPageLoad(30);
+                $magentoWebDriver->waitForElementVisible($modalAcceptButton, 10);
+                $magentoWebDriver->waitForPageLoad(60);
+                $magentoWebDriver->click($modalAcceptButton);
+                $magentoWebDriver->waitForPageLoad(60);
+                $magentoWebDriver->waitForLoadingMaskToDisappear();
+                $magentoWebDriver->waitForElementVisible($successMessageContainer, 10);
+                $magentoWebDriver->see($successMessage, $successMessageContainer);
+                $rows = $webDriver->findElements(WebDriverBy::cssSelector($firstNotEmptyRow));
+            }
+        } catch (\Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+}
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleDeleteAllActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleDeleteAllActionGroup.xml
new file mode 100644
index 0000000000000..85437650efc35
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleDeleteAllActionGroup.xml
@@ -0,0 +1,29 @@
+<?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="AdminCartPriceRuleDeleteAllActionGroup">
+        <annotations>
+            <description>Open Cart Price Rule grid and delete all rules one by one. Need to avoid interference with other tests that test cart price rules.</description>
+        </annotations>
+
+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="goToAdminCartPriceRuleGridPage"/>
+        <!-- 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\Rule\Test\Mftf\Helper\RuleHelper" method="deleteAllRulesOneByOne" stepKey="deleteAllRulesOneByOne">
+            <argument name="firstNotEmptyRow">{{AdminDataGridTableSection.firstNotEmptyRow}}</argument>
+            <argument name="modalAcceptButton">{{AdminConfirmationModalSection.ok}}</argument>
+            <argument name="deleteButton">{{AdminMainActionsSection.delete}}</argument>
+            <argument name="successMessageContainer">{{AdminMessagesSection.success}}</argument>
+            <argument name="successMessage">You deleted the rule.</argument>
+        </helper>
+        <waitForElementVisible selector="{{AdminDataGridTableSection.dataGridEmpty}}" stepKey="waitDataGridEmptyMessageAppears"/>
+        <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleFillActionsActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleFillActionsActionGroup.xml
new file mode 100644
index 0000000000000..391a11cd7f1dc
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleFillActionsActionGroup.xml
@@ -0,0 +1,28 @@
+<?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="AdminCartPriceRuleFillActionsActionGroup">
+        <annotations>
+            <description>Fill Cart Price Rule actions fields: Apply, Discount Amount, Discard subsequent rules.</description>
+        </annotations>
+        <arguments>
+            <argument name="apply" type="string" defaultValue="{{ApiSalesRule.simple_action}}"/>
+            <argument name="discountAmount" type="string" defaultValue="{{ApiSalesRule.discount_amount}}"/>
+            <argument name="discardSubsequentRules" type="string" defaultValue="1"/>
+        </arguments>
+
+        <conditionalClick selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" dependentSelector="{{AdminCartPriceRulesFormSection.actionsHeaderOpen}}" visible="false" stepKey="clickToExpandActions"/>
+        <scrollTo selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="scrollToActionsFieldset"/>
+        <waitForElementVisible selector="{{AdminCartPriceRulesFormSection.apply}}" stepKey="waitActionsFieldsetFullyOpened"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.apply}}" userInput="{{apply}}" stepKey="fillDiscountType"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="{{discountAmount}}" stepKey="fillDiscountAmount"/>
+        <pressKey selector="{{AdminCartPriceRulesFormSection.discountAmount}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::TAB]" stepKey="pressTab"/>
+        <conditionalClick selector="{{AdminCartPriceRulesFormSection.discardSubsequentRulesLabel}}" dependentSelector="{{AdminCartPriceRulesFormSection.discardSubsequentRulesByStatus(discardSubsequentRules)}}" visible="false" stepKey="fillDiscardSubsequentRules"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleFillMainInfoActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleFillMainInfoActionGroup.xml
new file mode 100644
index 0000000000000..4624278d7f3f4
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleFillMainInfoActionGroup.xml
@@ -0,0 +1,35 @@
+<?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="AdminCartPriceRuleFillMainInfoActionGroup">
+        <annotations>
+            <description>Fill Cart Price Rule main info fields: Name, Description, Active (1/0), Priority.</description>
+        </annotations>
+        <arguments>
+            <argument name="name" type="string" defaultValue="{{ApiSalesRule.name}}"/>
+            <argument name="description" type="string" defaultValue="{{ApiSalesRule.description}}"/>
+            <argument name="active" type="string" defaultValue="1"/>
+            <argument name="websites" type="string" defaultValue="'Main Website'"/>
+            <argument name="groups" type="string" defaultValue="'NOT LOGGED IN','General','Wholesale','Retailer'"/>
+            <argument name="fromDate" type="string" defaultValue=""/>
+            <argument name="toDate" type="string" defaultValue=""/>
+            <argument name="priority" type="string" defaultValue=""/>
+        </arguments>
+
+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{name}}" stepKey="fillName"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.description}}" userInput="{{description}}" stepKey="fillDescription"/>
+        <conditionalClick selector="{{AdminCartPriceRulesFormSection.isActive}}" dependentSelector="{{AdminCartPriceRulesFormSection.activeByStatus(active)}}" visible="false" stepKey="fillActive"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" parameterArray="[{{websites}}]" stepKey="selectSpecifiedWebsites"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" parameterArray="[{{groups}}]" stepKey="selectSpecifiedCustomerGroups"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.fromDate}}" userInput="{{fromDate}}" stepKey="fillFromDate"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.toDate}}" userInput="{{toDate}}" stepKey="fillToDate"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.priority}}" userInput="{{priority}}" stepKey="fillPriority"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleSaveActionGroup.xml b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleSaveActionGroup.xml
new file mode 100644
index 0000000000000..a94d5b4cf4889
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/ActionGroup/AdminCartPriceRuleSaveActionGroup.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="AdminCartPriceRuleSaveActionGroup">
+        <annotations>
+            <description>Clicks Save and Apply on a Admin Cart Price Rule creation/edit page. Validates that the Success Message is present.</description>
+        </annotations>
+
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+        <waitForElementVisible selector="{{AdminMainActionsSection.save}}" stepKey="waitForSaveButton"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="saveRule"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessageAppears"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the rule." stepKey="checkSuccessSaveMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
index b164cdde33248..02fcb26c635da 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
@@ -18,6 +18,8 @@
         <element name="ruleName" type="input" selector="input[name='name']"/>
         <element name="description" type="textarea" selector="//div[@class='admin__field-control']/textarea[@name='description']"/>
         <element name="active" type="checkbox" selector="//div[@class='admin__actions-switch']/input[@name='is_active']/../label"/>
+        <element name="isActive" type="text" selector="input[name='is_active']+label"/>
+        <element name="activeByStatus" type="text" selector="div.admin__actions-switch input[name='is_active'][value='{{value}}']+label" parameterized="true"/>
         <element name="websites" type="multiselect" selector="select[name='website_ids']"/>
         <element name="websitesOptions" type="select" selector="[name='website_ids'] option"/>
         <element name="customerGroups" type="multiselect" selector="select[name='customer_group_ids']"/>
@@ -84,6 +86,8 @@
         <element name="discountStep" type="input" selector="input[name='discount_step']"/>
         <element name="applyToShippingAmount" type="checkbox" selector="//div[@class='admin__actions-switch']/input[@name='apply_to_shipping']/../label"/>
         <element name="discardSubsequentRules" type="checkbox" selector="//div[@class='admin__actions-switch']/input[@name='stop_rules_processing']/../label"/>
+        <element name="discardSubsequentRulesLabel" type="text" selector="div.admin__actions-switch input[name='stop_rules_processing']+label"/>
+        <element name="discardSubsequentRulesByStatus" type="text" selector="div.admin__actions-switch input[name='stop_rules_processing'][value='{{value}}']+label" parameterized="true"/>
         <element name="addRewardPoints" type="input" selector="input[name='extension_attributes[reward_points_delta]']"/>
         <element name="freeShipping" type="select" selector="//select[@name='simple_free_shipping']"/>
 

From 117fed74107485b35d320bfed2c423b6bcff90c1 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Sun, 31 May 2020 22:49:09 +0300
Subject: [PATCH 0340/1718] MC-34482: MFTF tests causing high load on Jenkins
 agents in MTSv1 platfor

---
 .../ActionGroup/AdminStartMessageQueueConsumerActionGroup.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/AdminStartMessageQueueConsumerActionGroup.xml b/app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/AdminStartMessageQueueConsumerActionGroup.xml
index 032ef4549f943..4c423844b17fd 100644
--- a/app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/AdminStartMessageQueueConsumerActionGroup.xml
+++ b/app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/AdminStartMessageQueueConsumerActionGroup.xml
@@ -16,7 +16,7 @@
             <argument name="consumer" defaultValue="AdminExportMessageConsumerData"/>
         </arguments>
 
-        <magentoCLI command="queue:consumers:start {{consumer.consumer_name}} --max-messages={{consumer.message_limit}} --single-thread" stepKey="startMessageQueue"/>
+        <magentoCLI command="queue:consumers:start {{consumer.consumer_name}} --max-messages={{consumer.message_limit}}" stepKey="startMessageQueue"/>
         <wait time="30" stepKey="waitForQueueStarting"/>
     </actionGroup>
 </actionGroups>

From 7da7b7bf11bc0d6703f453eca0fc70d87ea4ac67 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Mon, 1 Jun 2020 12:18:33 +0300
Subject: [PATCH 0341/1718] MC-34482: MFTF tests causing high load on Jenkins
 agents in MTSv1 platfor

---
 .../ActionGroup/CliCacheCleanActionGroup.xml  | 21 +++++++++++++++++++
 .../ActionGroup/CliCacheFlushActionGroup.xml  | 21 +++++++++++++++++++
 ...sUpdateAttributesForBundleProductsTest.xml |  5 +++--
 .../Test/Mftf/Data/QueueConsumerData.xml      |  8 +++----
 .../Test/AdminMassProductPriceUpdateTest.xml  |  5 +++--
 ...UpdateProductAttributesGlobalScopeTest.xml |  5 +++--
 .../Test/AdminExportBundleProductTest.xml     |  2 +-
 ...portGroupedProductWithSpecialPriceTest.xml |  2 +-
 ...mportConfigurableProductWithImagesTest.xml |  2 +-
 ...figurableProductsWithCustomOptionsTest.xml |  2 +-
 ...igurableProductsWithAssignedImagesTest.xml |  2 +-
 ...ableProductAssignedToCustomWebsiteTest.xml |  2 +-
 ...rtSimpleProductWithCustomAttributeTest.xml |  2 +-
 ...minUrlForProductRewrittenCorrectlyTest.xml |  5 +++--
 ...AdminConfigurableProductBulkUpdateTest.xml |  5 +++--
 .../ActionGroup/CliReindexActionGroup.xml     | 20 ++++++++++++++++++
 ...iStartMessageQueueConsumerActionGroup.xml} | 10 ++++-----
 .../Test/Mftf/Data/QueueConsumerData.xml      | 12 +++++------
 ...ateCartPriceRuleForGeneratedCouponTest.xml |  5 +++--
 .../StorefrontAutoGeneratedCouponCodeTest.xml |  5 +++--
 20 files changed, 105 insertions(+), 36 deletions(-)
 create mode 100644 app/code/Magento/Backend/Test/Mftf/ActionGroup/CliCacheCleanActionGroup.xml
 create mode 100644 app/code/Magento/Backend/Test/Mftf/ActionGroup/CliCacheFlushActionGroup.xml
 create mode 100644 app/code/Magento/Indexer/Test/Mftf/ActionGroup/CliReindexActionGroup.xml
 rename app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/{AdminStartMessageQueueConsumerActionGroup.xml => CliStartMessageQueueConsumerActionGroup.xml} (52%)

diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/CliCacheCleanActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/CliCacheCleanActionGroup.xml
new file mode 100644
index 0000000000000..5b1366e56361f
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/CliCacheCleanActionGroup.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="CliCacheCleanActionGroup">
+        <annotations>
+            <description>Run cache:clean by CLI with specified cache tags (space separated).</description>
+        </annotations>
+        <arguments>
+            <argument name="tags" type="string" defaultValue="full_page"/>
+        </arguments>
+
+        <magentoCLI command="cache:clean" arguments="{{tags}}" stepKey="cleanSpecifiedCache"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/CliCacheFlushActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/CliCacheFlushActionGroup.xml
new file mode 100644
index 0000000000000..3653e717cf123
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/CliCacheFlushActionGroup.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="CliCacheFlushActionGroup">
+        <annotations>
+            <description>Run cache:flush by CLI with specified cache tags (space separated).</description>
+        </annotations>
+        <arguments>
+            <argument name="tags" type="string" defaultValue="full_page"/>
+        </arguments>
+
+        <magentoCLI command="cache:flush" arguments="{{tags}}" stepKey="flushSpecifiedCache"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminShouldBeAbleToMassUpdateAttributesForBundleProductsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminShouldBeAbleToMassUpdateAttributesForBundleProductsTest.xml
index 2338b44b186ab..daa3351073e9b 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminShouldBeAbleToMassUpdateAttributesForBundleProductsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminShouldBeAbleToMassUpdateAttributesForBundleProductsTest.xml
@@ -57,8 +57,9 @@
             <argument name="product" value="UpdateAttributeNameAndDescription"/>
         </actionGroup>
         <!-- Start message queue for product attribute consumer -->
-        <actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue">
-            <argument name="consumer" value="AdminProductAttributeUpdateMessageConsumerData"/>
+        <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue">
+            <argument name="consumerName" value="{{AdminProductAttributeUpdateMessageConsumerData.consumerName}}"/>
+            <argument name="maxMessages" value="{{AdminProductAttributeUpdateMessageConsumerData.messageLimit}}"/>
         </actionGroup>
         <!-- Search for a product with a new name and Open Product -->
         <actionGroup ref="FilterProductGridByNameActionGroup" stepKey="searchWithNewProductName">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/QueueConsumerData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/QueueConsumerData.xml
index 2c01b2a573f1e..cd53fede3ab58 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/QueueConsumerData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/QueueConsumerData.xml
@@ -9,11 +9,11 @@
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="AdminProductAttributeUpdateConsumerData">
-        <data key="consumer_name">product_action_attribute.update</data>
-        <data key="message_limit">100</data>
+        <data key="consumerName">product_action_attribute.update</data>
+        <data key="messageLimit">100</data>
     </entity>
     <entity name="AdminProductAttributeWebsiteUpdateConsumerData">
-        <data key="consumer_name">product_action_attribute.website.update</data>
-        <data key="message_limit">100</data>
+        <data key="consumerName">product_action_attribute.website.update</data>
+        <data key="messageLimit">100</data>
     </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml
index ebf8d9acb851f..845ce340451d1 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassProductPriceUpdateTest.xml
@@ -57,8 +57,9 @@
         <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeAttributeUpateSuccessMsg"/>
 
         <!-- Start message queue -->
-        <actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueueConsumer">
-            <argument name="consumer" value="AdminProductAttributeUpdateConsumerData"/>
+        <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueueConsumer">
+            <argument name="consumerName" value="{{AdminProductAttributeUpdateConsumerData.consumerName}}"/>
+            <argument name="maxMessages" value="{{AdminProductAttributeUpdateConsumerData.messageLimit}}"/>
         </actionGroup>
         <!-- Run cron -->
         <magentoCLI command="cron:run --group=index" stepKey="runCron"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
index 089ce35b32f78..cd34741b6a68c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml
@@ -67,8 +67,9 @@
         <see selector="{{AdminMessagesSection.success}}" userInput="Message is added to queue" stepKey="seeAttributeUpdateSuccessMsg"/>
 
         <!-- Start message queue for product attribute consumer -->
-        <actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue">
-            <argument name="consumer" value="AdminProductAttributeUpdateMessageConsumerData"/>
+        <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue">
+            <argument name="consumerName" value="{{AdminProductAttributeUpdateMessageConsumerData.consumerName}}"/>
+            <argument name="maxMessages" value="{{AdminProductAttributeUpdateMessageConsumerData.messageLimit}}"/>
         </actionGroup>
 
         <!-- Assert on storefront default view -->
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml
index e94567f174f4f..6624bf4b1e8f8 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml
@@ -81,7 +81,7 @@
             </createData>
 
             <!-- Start message queue for export consumer -->
-            <actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
+            <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue"/>
             <reloadPage stepKey="refreshPage"/>
             <waitForPageLoad stepKey="waitForPageLoaded"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml
index e84700d39199b..0e419329d5a8a 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml
@@ -68,7 +68,7 @@
         <actionGroup ref="ExportAllProductsActionGroup" stepKey="exportCreatedProducts"/>
 
         <!-- Start message queue for export consumer -->
-        <actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
+        <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue"/>
         <reloadPage stepKey="refreshPage"/>
         <waitForPageLoad stepKey="waitForPageLoaded"/>
 
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportImportConfigurableProductWithImagesTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportImportConfigurableProductWithImagesTest.xml
index a26a5d9d7c5b0..a9688147dfbcd 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportImportConfigurableProductWithImagesTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportImportConfigurableProductWithImagesTest.xml
@@ -165,7 +165,7 @@
         </actionGroup>
 
         <!-- Start message queue for export consumer -->
-        <actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
+        <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue"/>
         <reloadPage stepKey="refreshPage"/>
         <waitForPageLoad stepKey="waitForPageLoaded"/>
 
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml
index a7ce332d7318b..9f1ca707e0e9f 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml
@@ -99,7 +99,7 @@
         </actionGroup>
 
         <!-- Start message queue for export consumer -->
-        <actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
+        <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue"/>
         <reloadPage stepKey="refreshPage"/>
         <waitForPageLoad stepKey="waitForPageLoaded"/>
 
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml
index 1048684a9dd44..08ece12df3721 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml
@@ -114,7 +114,7 @@
         </actionGroup>
 
         <!-- Start message queue for export consumer -->
-        <actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
+        <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue"/>
         <reloadPage stepKey="refreshPage"/>
         <waitForPageLoad stepKey="waitForPageLoaded"/>
 
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml
index 56c9f5e3e6390..26a88c15a125d 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml
@@ -98,7 +98,7 @@
         <actionGroup ref="ExportAllProductsActionGroup" stepKey="exportCreatedProducts"/>
 
         <!-- Start message queue for export consumer -->
-        <actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
+        <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue"/>
         <reloadPage stepKey="refreshPage"/>
         <waitForPageLoad stepKey="waitForPageLoaded"/>
 
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml
index daa24362ebeae..514135f70f434 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml
@@ -50,7 +50,7 @@
         <actionGroup ref="ExportAllProductsActionGroup" stepKey="exportCreatedProducts"/>
 
         <!-- Start message queue for export consumer -->
-        <actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
+        <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue"/>
         <reloadPage stepKey="pageReload" />
         <waitForPageLoad stepKey="waitForPageLoaded" />
         <grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml
index 5190e007b668f..329f5e8cae3f6 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml
@@ -73,8 +73,9 @@
         <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeSaveSuccess"/>
 
         <!-- Start message queue -->
-        <actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueueConsumer">
-            <argument name="consumer" value="AdminProductAttributeWebsiteUpdateConsumerData"/>
+        <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueueConsumer">
+            <argument name="consumerName" value="{{AdminProductAttributeWebsiteUpdateConsumerData.consumerName}}"/>
+            <argument name="maxMessages" value="{{AdminProductAttributeWebsiteUpdateConsumerData.messageLimit}}"/>
         </actionGroup>
         <!-- Run cron -->
         <magentoCLI command="cron:run --group=index" stepKey="runCron"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest/AdminConfigurableProductBulkUpdateTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest/AdminConfigurableProductBulkUpdateTest.xml
index 02e2520c04672..186799bf4626b 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest/AdminConfigurableProductBulkUpdateTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest/AdminConfigurableProductBulkUpdateTest.xml
@@ -66,8 +66,9 @@
         <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeAttributeUpdateSuccessMsg"/>
 
         <!-- Apply changes -->
-        <actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue">
-            <argument name="consumer" value="AdminProductAttributeUpdateMessageConsumerData"/>
+        <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue">
+            <argument name="consumerName" value="{{AdminProductAttributeUpdateMessageConsumerData.consumerName}}"/>
+            <argument name="maxMessages" value="{{AdminProductAttributeUpdateMessageConsumerData.messageLimit}}"/>
         </actionGroup>
 
         <!-- Check storefront for description -->
diff --git a/app/code/Magento/Indexer/Test/Mftf/ActionGroup/CliReindexActionGroup.xml b/app/code/Magento/Indexer/Test/Mftf/ActionGroup/CliReindexActionGroup.xml
new file mode 100644
index 0000000000000..b6f9d7b5c0cf3
--- /dev/null
+++ b/app/code/Magento/Indexer/Test/Mftf/ActionGroup/CliReindexActionGroup.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="CliReindexActionGroup">
+        <annotations>
+            <description>Run reindex by CLI with specified indexers (space separated).</description>
+        </annotations>
+        <arguments>
+            <argument name="indices" type="string" defaultValue="catalogsearch_fulltext"/>
+        </arguments>
+
+        <magentoCLI command="indexer:reindex" arguments="{{indices}}" stepKey="reindexSpecifiedIndexers"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/AdminStartMessageQueueConsumerActionGroup.xml b/app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/CliStartMessageQueueConsumerActionGroup.xml
similarity index 52%
rename from app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/AdminStartMessageQueueConsumerActionGroup.xml
rename to app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/CliStartMessageQueueConsumerActionGroup.xml
index 4c423844b17fd..e719c1f224949 100644
--- a/app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/AdminStartMessageQueueConsumerActionGroup.xml
+++ b/app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/CliStartMessageQueueConsumerActionGroup.xml
@@ -8,15 +8,15 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AdminStartMessageQueueConsumerActionGroup">
+    <actionGroup name="CliConsumerStartActionGroup">
         <annotations>
-            <description>Starts message queue for specific consumer.</description>
+            <description>Starts message queue for specific consumer by CLI.</description>
         </annotations>
         <arguments>
-            <argument name="consumer" defaultValue="AdminExportMessageConsumerData"/>
+            <argument name="consumerName" type="string" defaultValue="{{AdminExportMessageConsumerData.consumerName}}"/>
+            <argument name="maxMessages" type="string" defaultValue="{{AdminExportMessageConsumerData.messageLimit}}"/>
         </arguments>
 
-        <magentoCLI command="queue:consumers:start {{consumer.consumer_name}} --max-messages={{consumer.message_limit}}" stepKey="startMessageQueue"/>
-        <wait time="30" stepKey="waitForQueueStarting"/>
+        <magentoCLI command="queue:consumers:start {{consumerName}} --max-messages={{maxMessages}}" stepKey="startMessageQueue"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/MessageQueue/Test/Mftf/Data/QueueConsumerData.xml b/app/code/Magento/MessageQueue/Test/Mftf/Data/QueueConsumerData.xml
index b5da26f6ae5b1..ef989808eea60 100644
--- a/app/code/Magento/MessageQueue/Test/Mftf/Data/QueueConsumerData.xml
+++ b/app/code/Magento/MessageQueue/Test/Mftf/Data/QueueConsumerData.xml
@@ -9,15 +9,15 @@
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="AdminExportMessageConsumerData">
-        <data key="consumer_name">exportProcessor</data>
-        <data key="message_limit">100</data>
+        <data key="consumerName">exportProcessor</data>
+        <data key="messageLimit">100</data>
     </entity>
     <entity name="AdminProductAttributeUpdateMessageConsumerData">
-        <data key="consumer_name">product_action_attribute.update</data>
-        <data key="message_limit">100</data>
+        <data key="consumerName">product_action_attribute.update</data>
+        <data key="messageLimit">100</data>
     </entity>
     <entity name="AdminCodeGeneratorMessageConsumerData">
-        <data key="consumer_name">codegeneratorProcessor</data>
-        <data key="message_limit">100</data>
+        <data key="consumerName">codegeneratorProcessor</data>
+        <data key="messageLimit">100</data>
     </entity>
 </entities>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml
index 7b74e14c72f97..9f4168575595a 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml
@@ -56,8 +56,9 @@
         <see selector="{{AdminCartPriceRulesFormSection.successMessage}}" userInput="Message is added to queue, wait to get your coupons soon" stepKey="seeGenerationSuccess"/>
 
         <!-- Apply changes -->
-        <actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue">
-            <argument name="consumer" value="AdminCodeGeneratorMessageConsumerData"/>
+        <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue">
+            <argument name="consumerName" value="{{AdminCodeGeneratorMessageConsumerData.consumerName}}"/>
+            <argument name="maxMessages" value="{{AdminCodeGeneratorMessageConsumerData.messageLimit}}"/>
         </actionGroup>
         <reloadPage stepKey="refreshPage"/>
         <waitForPageLoad stepKey="waitFormToReload1"/>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontAutoGeneratedCouponCodeTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontAutoGeneratedCouponCodeTest.xml
index bdf4b49b67621..b77cfaf02d232 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontAutoGeneratedCouponCodeTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontAutoGeneratedCouponCodeTest.xml
@@ -60,8 +60,9 @@
              stepKey="seeSuccessMessage"/>
 
         <!-- Start message queue for export consumer -->
-        <actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue">
-            <argument name="consumer" value="AdminCodeGeneratorMessageConsumerData"/>
+        <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue">
+            <argument name="consumerName" value="{{AdminCodeGeneratorMessageConsumerData.consumerName}}"/>
+            <argument name="maxMessages" value="{{AdminCodeGeneratorMessageConsumerData.messageLimit}}"/>
         </actionGroup>
         <reloadPage stepKey="refreshPage"/>
         <waitForPageLoad stepKey="waitFormToReload1"/>

From 51d645f86c7fc9c91d6d7c5eae1165f4d74750ea Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Mon, 1 Jun 2020 12:20:42 +0300
Subject: [PATCH 0342/1718] MC-34482: MFTF tests causing high load on Jenkins
 agents in MTSv1 platfor

---
 ...eueConsumerActionGroup.xml => CliConsumerStartActionGroup.xml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/{CliStartMessageQueueConsumerActionGroup.xml => CliConsumerStartActionGroup.xml} (100%)

diff --git a/app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/CliStartMessageQueueConsumerActionGroup.xml b/app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/CliConsumerStartActionGroup.xml
similarity index 100%
rename from app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/CliStartMessageQueueConsumerActionGroup.xml
rename to app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/CliConsumerStartActionGroup.xml

From 0ee9280fdb8996689e2b2de53afe8f9cf26d4aac Mon Sep 17 00:00:00 2001
From: Paul <psparrow@comwrap.com>
Date: Tue, 21 Apr 2020 13:05:33 +0300
Subject: [PATCH 0343/1718] Created config used for showing/hiding clear cart
 button on the shopping cart view page. Modified styles in the luma theme
 which hide clear cart buton. Created functional test for testing
 showing/hiding clear cart button on the cart page.

---
 app/code/Magento/Checkout/Block/Cart.php      | 42 ++++++++++-
 ...minCheckoutClearCartEnabledActionGroup.xml | 24 ++++++
 ...OpenSalesCheckoutConfigPageActionGroup.xml | 18 +++++
 .../Checkout/Test/Mftf/Data/ConfigData.xml    | 11 +++
 .../Mftf/Page/AdminCheckoutConfigPage.xml     | 12 +++
 .../Section/AdminCheckoutConfigSection.xml    | 13 ++++
 .../Section/CheckoutCartProductSection.xml    |  1 +
 ...CartPageBasedOnStoresConfigurationTest.xml | 73 +++++++++++++++++++
 .../Magento/Checkout/etc/adminhtml/system.xml |  4 +
 app/code/Magento/Checkout/etc/config.xml      |  1 +
 .../view/frontend/templates/cart/form.phtml   | 26 ++++---
 .../Magento/luma/web/css/source/_extends.less |  3 +-
 12 files changed, 212 insertions(+), 16 deletions(-)
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminCheckoutClearCartEnabledActionGroup.xml
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminOpenSalesCheckoutConfigPageActionGroup.xml
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/Page/AdminCheckoutConfigPage.xml
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/Section/AdminCheckoutConfigSection.xml
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckRenderingClearCartButtonOnTheCartPageBasedOnStoresConfigurationTest.xml

diff --git a/app/code/Magento/Checkout/Block/Cart.php b/app/code/Magento/Checkout/Block/Cart.php
index 7940c37917624..80c342803d154 100644
--- a/app/code/Magento/Checkout/Block/Cart.php
+++ b/app/code/Magento/Checkout/Block/Cart.php
@@ -6,6 +6,7 @@
 namespace Magento\Checkout\Block;
 
 use Magento\Customer\Model\Context;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Shopping cart block
@@ -14,6 +15,11 @@
  */
 class Cart extends \Magento\Checkout\Block\Cart\AbstractCart
 {
+    /**
+     * Config settings path to determine is clear cart action enabled
+     */
+    public const XML_CONFIG_CLEAR_CART_ENABLED = 'checkout/cart/clear_cart_enabled';
+
     /**
      * @var \Magento\Catalog\Model\ResourceModel\Url
      */
@@ -68,7 +74,7 @@ protected function _construct()
     }
 
     /**
-     * prepare cart items URLs
+     * Prepare cart items URLs
      *
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
@@ -110,6 +116,8 @@ public function prepareItemUrls()
     }
 
     /**
+     * Checks is quote has error
+     *
      * @codeCoverageIgnore
      * @return bool
      */
@@ -119,6 +127,8 @@ public function hasError()
     }
 
     /**
+     * Returns quote items summary qty
+     *
      * @codeCoverageIgnore
      * @return int
      */
@@ -128,6 +138,8 @@ public function getItemsSummaryQty()
     }
 
     /**
+     * Checks is wishlist is active
+     *
      * @codeCoverageIgnore
      * @return bool
      */
@@ -137,7 +149,7 @@ public function isWishlistActive()
         if ($isActive === null) {
             $isActive = $this->_scopeConfig->getValue(
                 'wishlist/general/active',
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+                ScopeInterface::SCOPE_STORE
             ) && $this->httpContext->getValue(
                 Context::CONTEXT_AUTH
             );
@@ -147,6 +159,8 @@ public function isWishlistActive()
     }
 
     /**
+     * Returns checkout url
+     *
      * @codeCoverageIgnore
      * @return string
      */
@@ -156,6 +170,8 @@ public function getCheckoutUrl()
     }
 
     /**
+     * Returns continue shopping url
+     *
      * @return string
      */
     public function getContinueShoppingUrl()
@@ -172,6 +188,8 @@ public function getContinueShoppingUrl()
     }
 
     /**
+     * Checks is quote is virtual
+     *
      * @return bool
      * @codeCoverageIgnore
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
@@ -227,6 +245,8 @@ public function getItems()
     }
 
     /**
+     * Returns quote items count
+     *
      * @codeCoverageIgnore
      * @return int
      */
@@ -245,4 +265,22 @@ public function getPagerHtml()
     {
         return $this->getChildHtml('pager');
     }
+
+    /**
+     * Checks is clear cart action enabled
+     *
+     * @codeCoverageIgnore
+     * @return boolean
+     */
+    public function isClearCartEnabled()
+    {
+        $isEnabled = $this->_getData('clear_cart_enabled');
+        if ($isEnabled === null) {
+            $isEnabled = $this->_scopeConfig->getValue(
+                self::XML_CONFIG_CLEAR_CART_ENABLED,
+                ScopeInterface::SCOPE_STORE
+            );
+        }
+        return $isEnabled;
+    }
 }
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminCheckoutClearCartEnabledActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminCheckoutClearCartEnabledActionGroup.xml
new file mode 100644
index 0000000000000..81e021a180563
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminCheckoutClearCartEnabledActionGroup.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="AdminCheckoutClearCartEnabledActionGroup">
+        <annotations>
+            <description>Enable/disable showing clear shopping cart button on the cart page via checkout cart configuration.</description>
+        </annotations>
+        <arguments>
+            <argument name="value" type="string" defaultValue="Yes"/>
+        </arguments>
+        <scrollTo selector="{{AdminCheckoutConfigSection.clearCartEnabled}}" x="0" y="-100" stepKey="scrollToClearCartEnabled"/>
+        <uncheckOption selector="{{AdminCheckoutConfigSection.clearCartEnabledInherit}}" stepKey="uncheckUseSystem"/>
+        <selectOption selector="{{AdminCheckoutConfigSection.clearCartEnabled}}" userInput="{{value}}" stepKey="fillClearCartEnabled"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSave"/>
+        <seeElement selector="{{AdminMessagesSection.success}}" stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminOpenSalesCheckoutConfigPageActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminOpenSalesCheckoutConfigPageActionGroup.xml
new file mode 100644
index 0000000000000..cf1e2c51fb980
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminOpenSalesCheckoutConfigPageActionGroup.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="AdminOpenSalesCheckoutConfigPageActionGroup">
+        <arguments>
+            <argument name="tabGroupAnchor" type="string" defaultValue=""/>
+        </arguments>
+        <amOnPage url="{{AdminCheckoutConfigPage.url(tabGroupAnchor)}}" stepKey="openCheckoutConfigPage"/>
+        <waitForPageLoad stepKey="waitForCheckoutConfigPageLoad"/>
+    </actionGroup>
+</actionGroups>
+
diff --git a/app/code/Magento/Checkout/Test/Mftf/Data/ConfigData.xml b/app/code/Magento/Checkout/Test/Mftf/Data/ConfigData.xml
index bb47a2fcc3070..7f06b188c4414 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Data/ConfigData.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Data/ConfigData.xml
@@ -100,4 +100,15 @@
         <data key="label">Display number of items in cart</data>
         <data key="value">0</data>
     </entity>
+
+    <entity name="EnableClearCartButtonOnTheCartPage">
+        <data key="path">checkout/cart/clear_cart_enabled</data>
+        <data key="label">Display clear cart button on the cart page</data>
+        <data key="value">1</data>
+    </entity>
+    <entity name="DisableClearCartButtonOnTheCartPage">
+        <data key="path">checkout/cart/clear_cart_enabled</data>
+        <data key="label">Do not display clear cart button on the cart page</data>
+        <data key="value">0</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Page/AdminCheckoutConfigPage.xml b/app/code/Magento/Checkout/Test/Mftf/Page/AdminCheckoutConfigPage.xml
new file mode 100644
index 0000000000000..21d69a1ad93c7
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Page/AdminCheckoutConfigPage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminCheckoutConfigPage" url="admin/system_config/edit/section/checkout/{{tabLink}}" area="admin" parameterized="true" module="Magento_Checkout">
+        <section name="AdminCheckoutConfigSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/AdminCheckoutConfigSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/AdminCheckoutConfigSection.xml
new file mode 100644
index 0000000000000..ea17672706fa2
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/AdminCheckoutConfigSection.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="AdminCheckoutConfigSection">
+        <element name="clearCartEnabled" type="select" selector="#checkout_cart_clear_cart_enabled"/>
+        <element name="clearCartEnabledInherit" type="select" selector="#checkout_cart_clear_cart_enabled_inherit"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
index af9d81249e8ac..a531f85c81304 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
@@ -48,6 +48,7 @@
         <element name="checkoutCartProductPrice" type="text" selector="//td[@class='col price']//span[@class='price']"/>
         <element name="checkoutCartSubtotal" type="text" selector="//td[@class='col subtotal']//span[@class='price']"/>
         <element name="emptyCart" selector=".cart-empty" type="text"/>
+        <element name="emptyCartButton" selector="#empty_cart_button" type="button"/>
         <!-- Required attention section -->
         <element name="removeProductBySku" type="button" selector="//div[contains(., '{{sku}}')]/ancestor::tbody//button" parameterized="true" timeout="30"/>
         <element name="failedItemBySku" type="block" selector="//div[contains(.,'{{sku}}')]/ancestor::tbody" parameterized="true" timeout="30"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckRenderingClearCartButtonOnTheCartPageBasedOnStoresConfigurationTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckRenderingClearCartButtonOnTheCartPageBasedOnStoresConfigurationTest.xml
new file mode 100644
index 0000000000000..794477eec39a4
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckRenderingClearCartButtonOnTheCartPageBasedOnStoresConfigurationTest.xml
@@ -0,0 +1,73 @@
+<?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="StorefrontCheckRenderingClearCartButtonOnTheCartPageBasedOnStoresConfigurationTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Shopping Cart"/>
+            <title value="Check rendering/not rendering clear cart button on the cart page based on checkout cart stores configuration"/>
+            <description value="Check rendering/not rendering clear cart button on the cart page based on checkout cart stores configuration"/>
+            <severity value="MAJOR"/>
+            <group value="shoppingCart"/>
+        </annotations>
+
+        <before>
+            <!-- Create simple product -->
+            <createData entity="SimpleProduct2" stepKey="createProduct"/>
+        </before>
+        <after>
+            <!-- Delete simple product -->
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+
+            <!-- Disable rendering clear cart button on the cart page -->
+            <magentoCLI command="config:set {{DisableClearCartButtonOnTheCartPage.path}} {{DisableClearCartButtonOnTheCartPage.value}}" stepKey="disableClearCart"/>
+
+            <!-- Log out -->
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+        <!-- Add product to cart -->
+        <actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="openProductPage">
+            <argument name="productUrlKey" value="$$createProduct.custom_attributes[url_key]$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
+            <argument name="product" value="$$createProduct$$"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+
+        <!-- Navigate to cart page -->
+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openShoppingCart"/>
+        <waitForPageLoad stepKey="waitForShoppingCartLoad" />
+
+        <!-- Assert that empty cart button is not rendered on the cart page -->
+        <dontSeeElement selector="{{CheckoutCartProductSection.emptyCartButton}}" stepKey="dontSeeClearCartButton"/>
+
+        <!-- Open new browser's window and login as Admin -->
+        <openNewTab stepKey="openNewTab"/>
+        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+
+        <!-- Navigate to checkout cart configuration --> 
+        <actionGroup ref="AdminOpenSalesCheckoutConfigPageActionGroup" stepKey="openCheckoutCartConfig">
+            <argument name="tabGroupAnchor" value="#checkout_cart-link"/>
+        </actionGroup>
+
+        <!-- Enable clear cart button -->
+        <actionGroup ref="AdminCheckoutClearCartEnabledActionGroup" stepKey="enableClearCartButton"/>
+
+        <!-- Flush cache -->
+        <magentoCLI command="cache:flush" stepKey="cacheFlush"/>
+
+        <!-- Back to the Cart page and refresh the page -->
+        <switchToPreviousTab stepKey="switchToPreviousTab"/>
+        <reloadPage stepKey="refreshPage"/>
+        <waitForPageLoad stepKey="waitPageReload"/>
+
+        <!-- Assert that empty cart button is rendered on the cart page -->
+        <seeElement selector="{{CheckoutCartProductSection.emptyCartButton}}" stepKey="SeeClearCartButton"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/etc/adminhtml/system.xml b/app/code/Magento/Checkout/etc/adminhtml/system.xml
index 7454c2b6524f3..a45f9c3fbb0d3 100644
--- a/app/code/Magento/Checkout/etc/adminhtml/system.xml
+++ b/app/code/Magento/Checkout/etc/adminhtml/system.xml
@@ -48,6 +48,10 @@
                     <label>Show Cross-sell Items in the Shopping Cart</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
+                <field id="clear_cart_enabled" translate="label" type="select" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Show "Clear Shopping Cart" button on the cart page</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
             </group>
             <group id="cart_link" translate="label" sortOrder="3" showInDefault="1" showInWebsite="1">
                 <label>My Cart Link</label>
diff --git a/app/code/Magento/Checkout/etc/config.xml b/app/code/Magento/Checkout/etc/config.xml
index c8408f6d902fa..45691b6c54d97 100644
--- a/app/code/Magento/Checkout/etc/config.xml
+++ b/app/code/Magento/Checkout/etc/config.xml
@@ -19,6 +19,7 @@
                 <redirect_to_cart>0</redirect_to_cart>
                 <number_items_to_display_pager>20</number_items_to_display_pager>
                 <crosssell_enabled>1</crosssell_enabled>
+                <clear_cart_enabled>0</clear_cart_enabled>
             </cart>
             <cart_link>
                 <use_qty>1</use_qty>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
index 370d70c44d886..7025867ee8f68 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
@@ -20,7 +20,7 @@
           class="form form-cart">
     <?= $block->getBlockHtml('formkey') ?>
     <div class="cart table-wrapper<?= $mergedCells == 2 ? ' detailed' : '' ?>">
-        <?php if ($block->getPagerHtml()) :?>
+        <?php if ($block->getPagerHtml()):?>
             <div class="cart-products-toolbar cart-products-toolbar-top toolbar"
                  data-attribute="cart-products-toolbar-top"><?= $block->getPagerHtml() ?>
             </div>
@@ -38,32 +38,34 @@
                     <th class="col subtotal" scope="col"><span><?= $block->escapeHtml(__('Subtotal')) ?></span></th>
                 </tr>
             </thead>
-            <?php foreach ($block->getItems() as $_item) :?>
+            <?php foreach ($block->getItems() as $_item):?>
                 <?= $block->getItemHtml($_item) ?>
             <?php endforeach ?>
         </table>
-        <?php if ($block->getPagerHtml()) :?>
+        <?php if ($block->getPagerHtml()):?>
             <div class="cart-products-toolbar cart-products-toolbar-bottom toolbar"
                  data-attribute="cart-products-toolbar-bottom"><?= $block->getPagerHtml() ?>
             </div>
         <?php endif ?>
     </div>
     <div class="cart main actions">
-        <?php if ($block->getContinueShoppingUrl()) :?>
+        <?php if ($block->getContinueShoppingUrl()):?>
             <a class="action continue"
                href="<?= $block->escapeUrl($block->getContinueShoppingUrl()) ?>"
                title="<?= $block->escapeHtml(__('Continue Shopping')) ?>">
                 <span><?= $block->escapeHtml(__('Continue Shopping')) ?></span>
             </a>
         <?php endif; ?>
-        <button type="button"
-                name="update_cart_action"
-                data-cart-empty=""
-                value="empty_cart"
-                title="<?= $block->escapeHtml(__('Clear Shopping Cart')) ?>"
-                class="action clear" id="empty_cart_button">
-            <span><?= $block->escapeHtml(__('Clear Shopping Cart')) ?></span>
-        </button>
+        <?php if ($block->isClearCartEnabled()): ?>
+            <button type="button"
+                    name="update_cart_action"
+                    data-cart-empty=""
+                    value="empty_cart"
+                    title="<?= $block->escapeHtml(__('Clear Shopping Cart')) ?>"
+                    class="action clear" id="empty_cart_button">
+                <span><?= $block->escapeHtml(__('Clear Shopping Cart')) ?></span>
+            </button>
+        <?php endif; ?>
         <button type="submit"
                 name="update_cart_action"
                 data-cart-item-update=""
diff --git a/app/design/frontend/Magento/luma/web/css/source/_extends.less b/app/design/frontend/Magento/luma/web/css/source/_extends.less
index ce86b690f6252..e50726f2fce45 100644
--- a/app/design/frontend/Magento/luma/web/css/source/_extends.less
+++ b/app/design/frontend/Magento/luma/web/css/source/_extends.less
@@ -1570,8 +1570,7 @@
         margin-bottom: @indent__base;
 
         .actions.main {
-            .continue,
-            .clear {
+            .continue {
                 display: none;
             }
         }

From 077a2a51f213e0875daaad47a65852d94d945aee Mon Sep 17 00:00:00 2001
From: Paul <psparrow@comwrap.com>
Date: Mon, 1 Jun 2020 18:33:35 +0300
Subject: [PATCH 0344/1718] config-clear-cart-action: Added translation for
 clear shopping cart backend configuration label.

---
 app/code/Magento/Checkout/i18n/en_US.csv | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/i18n/en_US.csv b/app/code/Magento/Checkout/i18n/en_US.csv
index 251985faf6cc4..d244da55b28de 100644
--- a/app/code/Magento/Checkout/i18n/en_US.csv
+++ b/app/code/Magento/Checkout/i18n/en_US.csv
@@ -182,4 +182,5 @@ Payment,Payment
 "Items in Cart","Items in Cart"
 "Close","Close"
 "Show Cross-sell Items in the Shopping Cart","Show Cross-sell Items in the Shopping Cart"
-"You added %1 to your <a href=""%2"">shopping cart</a>.","You added %1 to your <a href=""%2"">shopping cart</a>."
\ No newline at end of file
+"You added %1 to your <a href=""%2"">shopping cart</a>.","You added %1 to your <a href=""%2"">shopping cart</a>."
+"Show ""Clear Shopping Cart"" button on the cart page","Show ""Clear Shopping Cart"" button on the cart page"
\ No newline at end of file

From 3a7f19410672123492897227bc6d13105837db34 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Mon, 1 Jun 2020 19:49:04 +0300
Subject: [PATCH 0345/1718] MC-34482: MFTF tests causing high load on Jenkins
 agents in MTSv1 platfor

---
 .../Test/Mftf/ActionGroup/CliCacheCleanActionGroup.xml    | 2 +-
 .../Test/Mftf/ActionGroup/CliCacheFlushActionGroup.xml    | 2 +-
 .../AdminUpdateFlatCategoryIncludeInNavigationTest.xml    | 4 +++-
 .../AdminUpdateFlatCategoryNameAndDescriptionTest.xml     | 8 ++++++--
 .../Test/Mftf/Test/AdminExportBundleProductTest.xml       | 5 ++++-
 .../AdminExportGroupedProductWithSpecialPriceTest.xml     | 5 ++++-
 ...AdminExportImportConfigurableProductWithImagesTest.xml | 5 ++++-
 ...SimpleAndConfigurableProductsWithCustomOptionsTest.xml | 5 ++++-
 ...oductAndConfigurableProductsWithAssignedImagesTest.xml | 5 ++++-
 ...eAndConfigurableProductAssignedToCustomWebsiteTest.xml | 5 ++++-
 .../AdminExportSimpleProductWithCustomAttributeTest.xml   | 5 ++++-
 ...exActionGroup.xml => CliIndexerReindexActionGroup.xml} | 4 ++--
 .../Test/Mftf/ActionGroup/CliConsumerStartActionGroup.xml | 4 ++--
 13 files changed, 43 insertions(+), 16 deletions(-)
 rename app/code/Magento/Indexer/Test/Mftf/ActionGroup/{CliReindexActionGroup.xml => CliIndexerReindexActionGroup.xml} (82%)

diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/CliCacheCleanActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/CliCacheCleanActionGroup.xml
index 5b1366e56361f..c6305531e1c5d 100644
--- a/app/code/Magento/Backend/Test/Mftf/ActionGroup/CliCacheCleanActionGroup.xml
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/CliCacheCleanActionGroup.xml
@@ -13,7 +13,7 @@
             <description>Run cache:clean by CLI with specified cache tags (space separated).</description>
         </annotations>
         <arguments>
-            <argument name="tags" type="string" defaultValue="full_page"/>
+            <argument name="tags" type="string"/>
         </arguments>
 
         <magentoCLI command="cache:clean" arguments="{{tags}}" stepKey="cleanSpecifiedCache"/>
diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/CliCacheFlushActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/CliCacheFlushActionGroup.xml
index 3653e717cf123..4dc18d1215139 100644
--- a/app/code/Magento/Backend/Test/Mftf/ActionGroup/CliCacheFlushActionGroup.xml
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/CliCacheFlushActionGroup.xml
@@ -13,7 +13,7 @@
             <description>Run cache:flush by CLI with specified cache tags (space separated).</description>
         </annotations>
         <arguments>
-            <argument name="tags" type="string" defaultValue="full_page"/>
+            <argument name="tags" type="string"/>
         </arguments>
 
         <magentoCLI command="cache:flush" arguments="{{tags}}" stepKey="flushSpecifiedCache"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml
index 2abd7aecf4342..1214ba879f211 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml
@@ -35,7 +35,9 @@
             <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
             <!-- Reindex invalidated indices and clear caches -->
             <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml
index 1aea42e0f7f63..490f8dbdc4f81 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml
@@ -35,8 +35,12 @@
             <!--Open Index Management Page and Select Index mode "Update by Schedule" -->
             <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
             <!--Run full reindex and clear caches -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml
index 6624bf4b1e8f8..bdb562ab0205d 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml
@@ -81,7 +81,10 @@
             </createData>
 
             <!-- Start message queue for export consumer -->
-            <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue"/>
+            <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue">
+                <argument name="consumerName" value="{{AdminExportMessageConsumerData.consumerName}}"/>
+                <argument name="maxMessages" value="{{AdminExportMessageConsumerData.messageLimit}}"/>
+            </actionGroup>
             <reloadPage stepKey="refreshPage"/>
             <waitForPageLoad stepKey="waitForPageLoaded"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml
index 0e419329d5a8a..5ae94f050eb30 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml
@@ -68,7 +68,10 @@
         <actionGroup ref="ExportAllProductsActionGroup" stepKey="exportCreatedProducts"/>
 
         <!-- Start message queue for export consumer -->
-        <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue"/>
+        <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue">
+            <argument name="consumerName" value="{{AdminExportMessageConsumerData.consumerName}}"/>
+            <argument name="maxMessages" value="{{AdminExportMessageConsumerData.messageLimit}}"/>
+        </actionGroup>
         <reloadPage stepKey="refreshPage"/>
         <waitForPageLoad stepKey="waitForPageLoaded"/>
 
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportImportConfigurableProductWithImagesTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportImportConfigurableProductWithImagesTest.xml
index a9688147dfbcd..e0dfb8250c738 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportImportConfigurableProductWithImagesTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportImportConfigurableProductWithImagesTest.xml
@@ -165,7 +165,10 @@
         </actionGroup>
 
         <!-- Start message queue for export consumer -->
-        <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue"/>
+        <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue">
+            <argument name="consumerName" value="{{AdminExportMessageConsumerData.consumerName}}"/>
+            <argument name="maxMessages" value="{{AdminExportMessageConsumerData.messageLimit}}"/>
+        </actionGroup>
         <reloadPage stepKey="refreshPage"/>
         <waitForPageLoad stepKey="waitForPageLoaded"/>
 
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml
index 9f1ca707e0e9f..c82451eb9dbb5 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml
@@ -99,7 +99,10 @@
         </actionGroup>
 
         <!-- Start message queue for export consumer -->
-        <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue"/>
+        <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue">
+            <argument name="consumerName" value="{{AdminExportMessageConsumerData.consumerName}}"/>
+            <argument name="maxMessages" value="{{AdminExportMessageConsumerData.messageLimit}}"/>
+        </actionGroup>
         <reloadPage stepKey="refreshPage"/>
         <waitForPageLoad stepKey="waitForPageLoaded"/>
 
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml
index 08ece12df3721..dc556a6d0a899 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml
@@ -114,7 +114,10 @@
         </actionGroup>
 
         <!-- Start message queue for export consumer -->
-        <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue"/>
+        <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue">
+            <argument name="consumerName" value="{{AdminExportMessageConsumerData.consumerName}}"/>
+            <argument name="maxMessages" value="{{AdminExportMessageConsumerData.messageLimit}}"/>
+        </actionGroup>
         <reloadPage stepKey="refreshPage"/>
         <waitForPageLoad stepKey="waitForPageLoaded"/>
 
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml
index 26a88c15a125d..65f9ff80f7e39 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml
@@ -98,7 +98,10 @@
         <actionGroup ref="ExportAllProductsActionGroup" stepKey="exportCreatedProducts"/>
 
         <!-- Start message queue for export consumer -->
-        <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue"/>
+        <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue">
+            <argument name="consumerName" value="{{AdminExportMessageConsumerData.consumerName}}"/>
+            <argument name="maxMessages" value="{{AdminExportMessageConsumerData.messageLimit}}"/>
+        </actionGroup>
         <reloadPage stepKey="refreshPage"/>
         <waitForPageLoad stepKey="waitForPageLoaded"/>
 
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml
index 514135f70f434..e684f80d8bd05 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml
@@ -50,7 +50,10 @@
         <actionGroup ref="ExportAllProductsActionGroup" stepKey="exportCreatedProducts"/>
 
         <!-- Start message queue for export consumer -->
-        <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue"/>
+        <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue">
+            <argument name="consumerName" value="{{AdminExportMessageConsumerData.consumerName}}"/>
+            <argument name="maxMessages" value="{{AdminExportMessageConsumerData.messageLimit}}"/>
+        </actionGroup>
         <reloadPage stepKey="pageReload" />
         <waitForPageLoad stepKey="waitForPageLoaded" />
         <grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
diff --git a/app/code/Magento/Indexer/Test/Mftf/ActionGroup/CliReindexActionGroup.xml b/app/code/Magento/Indexer/Test/Mftf/ActionGroup/CliIndexerReindexActionGroup.xml
similarity index 82%
rename from app/code/Magento/Indexer/Test/Mftf/ActionGroup/CliReindexActionGroup.xml
rename to app/code/Magento/Indexer/Test/Mftf/ActionGroup/CliIndexerReindexActionGroup.xml
index b6f9d7b5c0cf3..5556707a4d494 100644
--- a/app/code/Magento/Indexer/Test/Mftf/ActionGroup/CliReindexActionGroup.xml
+++ b/app/code/Magento/Indexer/Test/Mftf/ActionGroup/CliIndexerReindexActionGroup.xml
@@ -7,12 +7,12 @@
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="CliReindexActionGroup">
+    <actionGroup name="CliIndexerReindexActionGroup">
         <annotations>
             <description>Run reindex by CLI with specified indexers (space separated).</description>
         </annotations>
         <arguments>
-            <argument name="indices" type="string" defaultValue="catalogsearch_fulltext"/>
+            <argument name="indices" type="string"/>
         </arguments>
 
         <magentoCLI command="indexer:reindex" arguments="{{indices}}" stepKey="reindexSpecifiedIndexers"/>
diff --git a/app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/CliConsumerStartActionGroup.xml b/app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/CliConsumerStartActionGroup.xml
index e719c1f224949..204691f1ad5e5 100644
--- a/app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/CliConsumerStartActionGroup.xml
+++ b/app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/CliConsumerStartActionGroup.xml
@@ -13,8 +13,8 @@
             <description>Starts message queue for specific consumer by CLI.</description>
         </annotations>
         <arguments>
-            <argument name="consumerName" type="string" defaultValue="{{AdminExportMessageConsumerData.consumerName}}"/>
-            <argument name="maxMessages" type="string" defaultValue="{{AdminExportMessageConsumerData.messageLimit}}"/>
+            <argument name="consumerName" type="string"/>
+            <argument name="maxMessages" type="string"/>
         </arguments>
 
         <magentoCLI command="queue:consumers:start {{consumerName}} --max-messages={{maxMessages}}" stepKey="startMessageQueue"/>

From 86640641cc4ce1038ed736ecc0f4315331b95f97 Mon Sep 17 00:00:00 2001
From: Volodymyr Zaets <vzaets@magento.com>
Date: Mon, 1 Jun 2020 12:23:46 -0500
Subject: [PATCH 0346/1718] Revert for public PR:22917

---
 .../Product/View/Options/AbstractOptions.php  |  30 +-
 .../Magento/Catalog/Model/Product/Option.php  |  32 +--
 .../Model/Product/Option/Type/DefaultType.php |  41 +--
 .../Model/Product/Option/Type/Select.php      |  31 +-
 .../Catalog/Model/Product/Option/Value.php    |  58 +---
 .../CalculateCustomOptionCatalogRule.php      | 119 --------
 .../Unit/Model/Product/Option/ValueTest.php   |  16 +-
 .../CalculateCustomOptionCatalogRuleTest.php  | 266 ------------------
 app/code/Magento/CatalogRule/Model/Rule.php   |  15 +-
 .../view/frontend/templates/form.phtml        |  13 +-
 .../Product/Option/DataProvider/Type/File.php | 120 ++++----
 .../Model/Product/BundlePriceAbstract.php     |  21 +-
 .../Block/Product/View/OptionsTest.php        |  62 +---
 13 files changed, 107 insertions(+), 717 deletions(-)
 delete mode 100644 app/code/Magento/Catalog/Pricing/Price/CalculateCustomOptionCatalogRule.php
 delete mode 100644 app/code/Magento/Catalog/Test/Unit/Pricing/Price/CalculateCustomOptionCatalogRuleTest.php

diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
index 0bfdcc678e9f7..030b6e1d2204c 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
@@ -3,14 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-declare(strict_types=1);
+
+/**
+ * Product options abstract type block
+ *
+ * @author     Magento Core Team <core@magentocommerce.com>
+ */
 
 namespace Magento\Catalog\Block\Product\View\Options;
 
-use Magento\Catalog\Pricing\Price\BasePrice;
-use Magento\Catalog\Pricing\Price\CalculateCustomOptionCatalogRule;
 use Magento\Catalog\Pricing\Price\CustomOptionPriceInterface;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Product options section abstract block.
@@ -45,29 +47,20 @@ abstract class AbstractOptions extends \Magento\Framework\View\Element\Template
      */
     protected $_catalogHelper;
 
-    /**
-     * @var CalculateCustomOptionCatalogRule
-     */
-    private $calculateCustomOptionCatalogRule;
-
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
      * @param \Magento\Catalog\Helper\Data $catalogData
      * @param array $data
-     * @param CalculateCustomOptionCatalogRule $calculateCustomOptionCatalogRule
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
         \Magento\Framework\Pricing\Helper\Data $pricingHelper,
         \Magento\Catalog\Helper\Data $catalogData,
-        array $data = [],
-        CalculateCustomOptionCatalogRule $calculateCustomOptionCatalogRule = null
+        array $data = []
     ) {
         $this->pricingHelper = $pricingHelper;
         $this->_catalogHelper = $catalogData;
-        $this->calculateCustomOptionCatalogRule = $calculateCustomOptionCatalogRule
-            ?? ObjectManager::getInstance()->get(CalculateCustomOptionCatalogRule::class);
         parent::__construct($context, $data);
     }
 
@@ -168,15 +161,6 @@ protected function _formatPrice($value, $flag = true)
         $priceStr = $sign;
 
         $customOptionPrice = $this->getProduct()->getPriceInfo()->getPrice('custom_option_price');
-
-        if (!$value['is_percent']) {
-            $value['pricing_value'] = $this->calculateCustomOptionCatalogRule->execute(
-                $this->getProduct(),
-                (float)$value['pricing_value'],
-                (bool)$value['is_percent']
-            );
-        }
-
         $context = [CustomOptionPriceInterface::CONFIGURATION_OPTION_FLAG => true];
         $optionAmount = $customOptionPrice->getCustomAmount($value['pricing_value'], null, $context);
         $priceStr .= $this->getLayout()->getBlock('product.price.render.default')->renderAmount(
diff --git a/app/code/Magento/Catalog/Model/Product/Option.php b/app/code/Magento/Catalog/Model/Product/Option.php
index 128f420e033c2..3a0920fb1c530 100644
--- a/app/code/Magento/Catalog/Model/Product/Option.php
+++ b/app/code/Magento/Catalog/Model/Product/Option.php
@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-declare(strict_types=1);
 
 namespace Magento\Catalog\Model\Product;
 
@@ -17,10 +16,8 @@
 use Magento\Catalog\Model\Product\Option\Type\File;
 use Magento\Catalog\Model\Product\Option\Type\Select;
 use Magento\Catalog\Model\Product\Option\Type\Text;
-use Magento\Catalog\Model\Product\Option\Value;
 use Magento\Catalog\Model\ResourceModel\Product\Option\Value\Collection;
-use Magento\Catalog\Pricing\Price\CalculateCustomOptionCatalogRule;
-use Magento\Framework\App\ObjectManager;
+use Magento\Catalog\Pricing\Price\BasePrice;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Model\AbstractExtensibleModel;
@@ -126,11 +123,6 @@ class Option extends AbstractExtensibleModel implements ProductCustomOptionInter
      */
     private $customOptionValuesFactory;
 
-    /**
-     * @var CalculateCustomOptionCatalogRule
-     */
-    private $calculateCustomOptionCatalogRule;
-
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -146,7 +138,6 @@ class Option extends AbstractExtensibleModel implements ProductCustomOptionInter
      * @param ProductCustomOptionValuesInterfaceFactory|null $customOptionValuesFactory
      * @param array $optionGroups
      * @param array $optionTypesToGroups
-     * @param CalculateCustomOptionCatalogRule $calculateCustomOptionCatalogRule
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -163,17 +154,14 @@ public function __construct(
         array $data = [],
         ProductCustomOptionValuesInterfaceFactory $customOptionValuesFactory = null,
         array $optionGroups = [],
-        array $optionTypesToGroups = [],
-        CalculateCustomOptionCatalogRule $calculateCustomOptionCatalogRule = null
+        array $optionTypesToGroups = []
     ) {
         $this->productOptionValue = $productOptionValue;
         $this->optionTypeFactory = $optionFactory;
         $this->string = $string;
         $this->validatorPool = $validatorPool;
         $this->customOptionValuesFactory = $customOptionValuesFactory ?:
-            ObjectManager::getInstance()->get(ProductCustomOptionValuesInterfaceFactory::class);
-        $this->calculateCustomOptionCatalogRule = $calculateCustomOptionCatalogRule ??
-            ObjectManager::getInstance()->get(CalculateCustomOptionCatalogRule::class);
+            \Magento\Framework\App\ObjectManager::getInstance()->get(ProductCustomOptionValuesInterfaceFactory::class);
         $this->optionGroups = $optionGroups ?: [
             self::OPTION_GROUP_DATE => Date::class,
             self::OPTION_GROUP_FILE => File::class,
@@ -474,12 +462,10 @@ public function afterSave()
      */
     public function getPrice($flag = false)
     {
-        if ($flag) {
-            return $this->calculateCustomOptionCatalogRule->execute(
-                $this->getProduct(),
-                (float)$this->getData(self::KEY_PRICE),
-                $this->getPriceType() === Value::TYPE_PERCENT
-            );
+        if ($flag && $this->getPriceType() == self::$typePercent) {
+            $basePrice = $this->getProduct()->getPriceInfo()->getPrice(BasePrice::PRICE_CODE)->getValue();
+            $price = $basePrice * ($this->_getData(self::KEY_PRICE) / 100);
+            return $price;
         }
         return $this->_getData(self::KEY_PRICE);
     }
@@ -966,7 +952,7 @@ public function setExtensionAttributes(
     private function getOptionRepository()
     {
         if (null === $this->optionRepository) {
-            $this->optionRepository = ObjectManager::getInstance()
+            $this->optionRepository = \Magento\Framework\App\ObjectManager::getInstance()
                 ->get(\Magento\Catalog\Model\Product\Option\Repository::class);
         }
         return $this->optionRepository;
@@ -980,7 +966,7 @@ private function getOptionRepository()
     private function getMetadataPool()
     {
         if (null === $this->metadataPool) {
-            $this->metadataPool = ObjectManager::getInstance()
+            $this->metadataPool = \Magento\Framework\App\ObjectManager::getInstance()
                 ->get(\Magento\Framework\EntityManager\MetadataPool::class);
         }
         return $this->metadataPool;
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
index be7f1921afccf..c998a015f3780 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
@@ -3,19 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-declare(strict_types=1);
 
 namespace Magento\Catalog\Model\Product\Option\Type;
 
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
+use Magento\Catalog\Model\Product\Option;
 use Magento\Catalog\Model\Product;
-use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
 use Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface;
-use Magento\Catalog\Model\Product\Option;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
 use Magento\Catalog\Model\Product\Option\Value;
-use Magento\Catalog\Pricing\Price\CalculateCustomOptionCatalogRule;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Exception\LocalizedException;
 
 /**
  * Catalog product option default type
@@ -63,30 +60,21 @@ class DefaultType extends \Magento\Framework\DataObject
      */
     protected $_checkoutSession;
 
-    /**
-     * @var CalculateCustomOptionCatalogRule
-     */
-    private $calculateCustomOptionCatalogRule;
-
     /**
      * Construct
      *
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param array $data
-     * @param CalculateCustomOptionCatalogRule $calculateCustomOptionCatalogRule
      */
     public function __construct(
         \Magento\Checkout\Model\Session $checkoutSession,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        array $data = [],
-        CalculateCustomOptionCatalogRule $calculateCustomOptionCatalogRule = null
+        array $data = []
     ) {
         $this->_checkoutSession = $checkoutSession;
         parent::__construct($data);
         $this->_scopeConfig = $scopeConfig;
-        $this->calculateCustomOptionCatalogRule = $calculateCustomOptionCatalogRule ?? ObjectManager::getInstance()
-                ->get(CalculateCustomOptionCatalogRule::class);
     }
 
     /**
@@ -104,12 +92,12 @@ public function setOption($option)
     /**
      * Option Instance getter
      *
-     * @return Option
      * @throws \Magento\Framework\Exception\LocalizedException
+     * @return Option
      */
     public function getOption()
     {
-        if ($this->_option instanceof Option) {
+        if ($this->_option instanceof \Magento\Catalog\Model\Product\Option) {
             return $this->_option;
         }
         throw new LocalizedException(__('The option instance type in options group is incorrect.'));
@@ -130,8 +118,8 @@ public function setProduct($product)
     /**
      * Product Instance getter
      *
-     * @return Product
      * @throws \Magento\Framework\Exception\LocalizedException
+     * @return Product
      */
     public function getProduct()
     {
@@ -169,8 +157,7 @@ public function getConfigurationItemOption()
      */
     public function getConfigurationItem()
     {
-        if ($this->_getData('configuration_item') instanceof ItemInterface
-        ) {
+        if ($this->_getData('configuration_item') instanceof ItemInterface) {
             return $this->_getData('configuration_item');
         }
 
@@ -354,11 +341,7 @@ public function getOptionPrice($optionValue, $basePrice)
     {
         $option = $this->getOption();
 
-        return $this->calculateCustomOptionCatalogRule->execute(
-            $option->getProduct(),
-            (float)$option->getPrice(),
-            $option->getPriceType() === Value::TYPE_PERCENT
-        );
+        return $this->_getChargeableOptionPrice($option->getPrice(), $option->getPriceType() == 'percent', $basePrice);
     }
 
     /**
@@ -412,14 +395,12 @@ public function getProductOptions()
     }
 
     /**
-     * Return final chargeable price for option
-     *
      * @param float $price Price of option
      * @param boolean $isPercent Price type - percent or fixed
      * @param float $basePrice For percent price type
      * @return float
      * @deprecated 102.0.4 typo in method name
-     * @see CalculateCustomOptionCatalogRule::execute
+     * @see _getChargeableOptionPrice
      */
     protected function _getChargableOptionPrice($price, $isPercent, $basePrice)
     {
@@ -433,8 +414,6 @@ protected function _getChargableOptionPrice($price, $isPercent, $basePrice)
      * @param boolean $isPercent Price type - percent or fixed
      * @param float $basePrice For percent price type
      * @return float
-     * @deprecated
-     * @see CalculateCustomOptionCatalogRule::execute
      */
     protected function _getChargeableOptionPrice($price, $isPercent, $basePrice)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php b/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
index 8eebd3e91c2ee..d2766b1bbb054 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
@@ -3,13 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-declare(strict_types=1);
 
 namespace Magento\Catalog\Model\Product\Option\Type;
 
-use Magento\Catalog\Model\Product\Option\Value;
-use Magento\Catalog\Pricing\Price\CalculateCustomOptionCatalogRule;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
 
 /**
@@ -41,11 +37,6 @@ class Select extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
      */
     private $singleSelectionTypes;
 
-    /**
-     * @var CalculateCustomOptionCatalogRule
-     */
-    private $calculateCustomOptionCatalogRule;
-
     /**
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -53,7 +44,6 @@ class Select extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
      * @param \Magento\Framework\Escaper $escaper
      * @param array $data
      * @param array $singleSelectionTypes
-     * @param CalculateCustomOptionCatalogRule $calculateCustomOptionCatalogRule
      */
     public function __construct(
         \Magento\Checkout\Model\Session $checkoutSession,
@@ -61,8 +51,7 @@ public function __construct(
         \Magento\Framework\Stdlib\StringUtils $string,
         \Magento\Framework\Escaper $escaper,
         array $data = [],
-        array $singleSelectionTypes = [],
-        CalculateCustomOptionCatalogRule $calculateCustomOptionCatalogRule = null
+        array $singleSelectionTypes = []
     ) {
         $this->string = $string;
         $this->_escaper = $escaper;
@@ -72,8 +61,6 @@ public function __construct(
             'drop_down' => \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DROP_DOWN,
             'radio' => \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_RADIO,
         ];
-        $this->calculateCustomOptionCatalogRule = $calculateCustomOptionCatalogRule ?? ObjectManager::getInstance()
-                ->get(CalculateCustomOptionCatalogRule::class);
     }
 
     /**
@@ -261,10 +248,10 @@ public function getOptionPrice($optionValue, $basePrice)
             foreach (explode(',', $optionValue) as $value) {
                 $_result = $option->getValueById($value);
                 if ($_result) {
-                    $result += $this->calculateCustomOptionCatalogRule->execute(
-                        $option->getProduct(),
-                        (float)$_result->getPrice(),
-                        $_result->getPriceType() === Value::TYPE_PERCENT
+                    $result += $this->_getChargeableOptionPrice(
+                        $_result->getPrice(),
+                        $_result->getPriceType() == 'percent',
+                        $basePrice
                     );
                 } else {
                     if ($this->getListener()) {
@@ -276,10 +263,10 @@ public function getOptionPrice($optionValue, $basePrice)
         } elseif ($this->_isSingleSelection()) {
             $_result = $option->getValueById($optionValue);
             if ($_result) {
-                $result = $this->calculateCustomOptionCatalogRule->execute(
-                    $option->getProduct(),
-                    (float)$_result->getPrice(),
-                    $_result->getPriceType() === Value::TYPE_PERCENT
+                $result = $this->_getChargeableOptionPrice(
+                    $_result->getPrice(),
+                    $_result->getPriceType() == 'percent',
+                    $basePrice
                 );
             } else {
                 if ($this->getListener()) {
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Value.php b/app/code/Magento/Catalog/Model/Product/Option/Value.php
index 783bda4699792..25e12e2fad865 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Value.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Value.php
@@ -3,16 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-declare(strict_types=1);
 
 namespace Magento\Catalog\Model\Product\Option;
 
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Option;
-use Magento\Catalog\Pricing\Price\BasePrice;
-use Magento\Catalog\Pricing\Price\CalculateCustomOptionCatalogRule;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Model\AbstractModel;
+use Magento\Catalog\Pricing\Price\BasePrice;
 use Magento\Catalog\Pricing\Price\CustomOptionPriceCalculator;
 use Magento\Catalog\Pricing\Price\RegularPrice;
 
@@ -72,11 +69,6 @@ class Value extends AbstractModel implements \Magento\Catalog\Api\Data\ProductCu
      */
     private $customOptionPriceCalculator;
 
-    /**
-     * @var CalculateCustomOptionCatalogRule
-     */
-    private $calculateCustomOptionCatalogRule;
-
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -85,7 +77,6 @@ class Value extends AbstractModel implements \Magento\Catalog\Api\Data\ProductCu
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
      * @param CustomOptionPriceCalculator|null $customOptionPriceCalculator
-     * @param CalculateCustomOptionCatalogRule|null $CalculateCustomOptionCatalogRule
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -94,14 +85,11 @@ public function __construct(
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = [],
-        CustomOptionPriceCalculator $customOptionPriceCalculator = null,
-        CalculateCustomOptionCatalogRule $CalculateCustomOptionCatalogRule = null
+        CustomOptionPriceCalculator $customOptionPriceCalculator = null
     ) {
         $this->_valueCollectionFactory = $valueCollectionFactory;
         $this->customOptionPriceCalculator = $customOptionPriceCalculator
-            ?? ObjectManager::getInstance()->get(CustomOptionPriceCalculator::class);
-        $this->calculateCustomOptionCatalogRule = $CalculateCustomOptionCatalogRule
-            ?? ObjectManager::getInstance()->get(CalculateCustomOptionCatalogRule::class);
+            ?? \Magento\Framework\App\ObjectManager::getInstance()->get(CustomOptionPriceCalculator::class);
 
         parent::__construct(
             $context,
@@ -123,8 +111,6 @@ protected function _construct()
     }
 
     /**
-     * Add value.
-     *
      * @codeCoverageIgnoreStart
      * @param mixed $value
      * @return $this
@@ -136,8 +122,6 @@ public function addValue($value)
     }
 
     /**
-     * Get values.
-     *
      * @return array
      */
     public function getValues()
@@ -146,8 +130,6 @@ public function getValues()
     }
 
     /**
-     * Set values.
-     *
      * @param array $values
      * @return $this
      */
@@ -158,8 +140,6 @@ public function setValues($values)
     }
 
     /**
-     * Unset values.
-     *
      * @return $this
      */
     public function unsetValues()
@@ -169,8 +149,6 @@ public function unsetValues()
     }
 
     /**
-     * Set option.
-     *
      * @param Option $option
      * @return $this
      */
@@ -181,8 +159,6 @@ public function setOption(Option $option)
     }
 
     /**
-     * Unset option.
-     *
      * @return $this
      */
     public function unsetOption()
@@ -192,7 +168,7 @@ public function unsetOption()
     }
 
     /**
-     * Get option.
+     * Enter description here...
      *
      * @return Option
      */
@@ -202,8 +178,6 @@ public function getOption()
     }
 
     /**
-     * Set product.
-     *
      * @param Product $product
      * @return $this
      */
@@ -216,8 +190,6 @@ public function setProduct($product)
     //@codeCoverageIgnoreEnd
 
     /**
-     * Get product.
-     *
      * @return Product
      */
     public function getProduct()
@@ -229,10 +201,7 @@ public function getProduct()
     }
 
     /**
-     * Save values.
-     *
      * @return $this
-     * @throws \Exception
      */
     public function saveValues()
     {
@@ -258,9 +227,8 @@ public function saveValues()
     }
 
     /**
-     * Return price.
-     *
-     * If $flag is true and price is percent return converted percent to price
+     * Return price. If $flag is true and price is percent
+     *  return converted percent to price
      *
      * @param bool $flag
      * @return float|int
@@ -268,11 +236,7 @@ public function saveValues()
     public function getPrice($flag = false)
     {
         if ($flag) {
-            return $this->calculateCustomOptionCatalogRule->execute(
-                $this->getProduct(),
-                (float)$this->getData(self::KEY_PRICE),
-                $this->getPriceType() === self::TYPE_PERCENT
-            );
+            return $this->customOptionPriceCalculator->getOptionPriceByPriceCode($this, BasePrice::PRICE_CODE);
         }
         return $this->_getData(self::KEY_PRICE);
     }
@@ -288,7 +252,7 @@ public function getRegularPrice()
     }
 
     /**
-     * Get values collection.
+     * Enter description here...
      *
      * @param Option $option
      * @return \Magento\Catalog\Model\ResourceModel\Product\Option\Value\Collection
@@ -306,8 +270,6 @@ public function getValuesCollection(Option $option)
     }
 
     /**
-     * Get values by option.
-     *
      * @param array $optionIds
      * @param int $option_id
      * @param int $store_id
@@ -327,8 +289,6 @@ public function getValuesByOption($optionIds, $option_id, $store_id)
     }
 
     /**
-     * Delete value.
-     *
      * @param int $option_id
      * @return $this
      */
@@ -339,8 +299,6 @@ public function deleteValue($option_id)
     }
 
     /**
-     * Delete values.
-     *
      * @param int $option_type_id
      * @return $this
      */
diff --git a/app/code/Magento/Catalog/Pricing/Price/CalculateCustomOptionCatalogRule.php b/app/code/Magento/Catalog/Pricing/Price/CalculateCustomOptionCatalogRule.php
deleted file mode 100644
index b3f3ac7bf68ef..0000000000000
--- a/app/code/Magento/Catalog/Pricing/Price/CalculateCustomOptionCatalogRule.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Catalog\Pricing\Price;
-
-use Magento\Catalog\Model\Product;
-use Magento\Catalog\Model\Product\PriceModifierInterface;
-use Magento\CatalogRule\Pricing\Price\CatalogRulePrice;
-use Magento\Framework\Pricing\Price\BasePriceProviderInterface;
-use Magento\Framework\Pricing\PriceCurrencyInterface;
-
-/**
- * Calculates prices of custom options of the product with catalog rules applied.
- */
-class CalculateCustomOptionCatalogRule
-{
-    /**
-     * @var PriceCurrencyInterface
-     */
-    private $priceCurrency;
-
-    /**
-     * @var PriceModifierInterface
-     */
-    private $priceModifier;
-
-    /**
-     * @param PriceCurrencyInterface $priceCurrency
-     * @param PriceModifierInterface $priceModifier
-     */
-    public function __construct(
-        PriceCurrencyInterface $priceCurrency,
-        PriceModifierInterface $priceModifier
-    ) {
-        $this->priceModifier = $priceModifier;
-        $this->priceCurrency = $priceCurrency;
-    }
-
-    /**
-     * Calculate prices of custom options of the product with catalog rules applied.
-     *
-     * @param Product $product
-     * @param float $optionPriceValue
-     * @param bool $isPercent
-     * @return float
-     */
-    public function execute(
-        Product $product,
-        float $optionPriceValue,
-        bool $isPercent
-    ): float {
-        $regularPrice = (float)$product->getPriceInfo()
-            ->getPrice(RegularPrice::PRICE_CODE)
-            ->getValue();
-        $catalogRulePrice = $this->priceModifier->modifyPrice(
-            $regularPrice,
-            $product
-        );
-        $basePriceWithOutCatalogRules = (float)$this->getGetBasePriceWithOutCatalogRules($product);
-        // Apply catalog price rules to product options only if catalog price rules are applied to product.
-        if ($catalogRulePrice < $basePriceWithOutCatalogRules) {
-            $optionPrice = $this->getOptionPriceWithoutPriceRule($optionPriceValue, $isPercent, $regularPrice);
-            $totalCatalogRulePrice = $this->priceModifier->modifyPrice(
-                $regularPrice + $optionPrice,
-                $product
-            );
-            $finalOptionPrice = $totalCatalogRulePrice - $catalogRulePrice;
-        } else {
-            $finalOptionPrice = $this->getOptionPriceWithoutPriceRule(
-                $optionPriceValue,
-                $isPercent,
-                $this->getGetBasePriceWithOutCatalogRules($product)
-            );
-        }
-
-        return $this->priceCurrency->convertAndRound($finalOptionPrice);
-    }
-
-    /**
-     * Get product base price without catalog rules applied.
-     *
-     * @param Product $product
-     * @return float
-     */
-    private function getGetBasePriceWithOutCatalogRules(Product $product): float
-    {
-        $basePrice = null;
-        foreach ($product->getPriceInfo()->getPrices() as $price) {
-            if ($price instanceof BasePriceProviderInterface
-                && $price->getPriceCode() !== CatalogRulePrice::PRICE_CODE
-                && $price->getValue() !== false
-            ) {
-                $basePrice = min(
-                    $price->getValue(),
-                    $basePrice ?? $price->getValue()
-                );
-            }
-        }
-
-        return $basePrice ?? $product->getPrice();
-    }
-
-    /**
-     * Calculate option price without catalog price rule discount.
-     *
-     * @param float $optionPriceValue
-     * @param bool $isPercent
-     * @param float $basePrice
-     * @return float
-     */
-    private function getOptionPriceWithoutPriceRule(float $optionPriceValue, bool $isPercent, float $basePrice): float
-    {
-        return $isPercent ? $basePrice * $optionPriceValue / 100 : $optionPriceValue;
-    }
-}
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/ValueTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/ValueTest.php
index e03ea8c79cc8a..e46884d1637da 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/ValueTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/ValueTest.php
@@ -12,13 +12,11 @@
 use Magento\Catalog\Model\Product\Option\Value;
 use Magento\Catalog\Model\ResourceModel\Product\Option\Value\Collection;
 use Magento\Catalog\Model\ResourceModel\Product\Option\Value\CollectionFactory;
-use Magento\Catalog\Pricing\Price\CalculateCustomOptionCatalogRule;
 use Magento\Catalog\Pricing\Price\CustomOptionPriceCalculator;
 
 use Magento\Framework\Pricing\Price\PriceInterface;
 use Magento\Framework\Pricing\PriceInfoInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -36,11 +34,6 @@ class ValueTest extends TestCase
      */
     private $customOptionPriceCalculatorMock;
 
-    /**
-     * @var CalculateCustomOptionCatalogRule|MockObject
-     */
-    private $CalculateCustomOptionCatalogRule;
-
     protected function setUp(): void
     {
         $mockedResource = $this->getMockedResource();
@@ -50,10 +43,6 @@ protected function setUp(): void
             CustomOptionPriceCalculator::class
         );
 
-        $this->CalculateCustomOptionCatalogRule = $this->createMock(
-            CalculateCustomOptionCatalogRule::class
-        );
-
         $helper = new ObjectManager($this);
         $this->model = $helper->getObject(
             Value::class,
@@ -61,7 +50,6 @@ protected function setUp(): void
                 'resource' => $mockedResource,
                 'valueCollectionFactory' => $mockedCollectionFactory,
                 'customOptionPriceCalculator' => $this->customOptionPriceCalculatorMock,
-                'CalculateCustomOptionCatalogRule' => $this->CalculateCustomOptionCatalogRule
             ]
         );
         $this->model->setOption($this->getMockedOption());
@@ -89,8 +77,8 @@ public function testGetPrice()
         $this->assertEquals($price, $this->model->getPrice(false));
 
         $percentPrice = 100.0;
-        $this->CalculateCustomOptionCatalogRule->expects($this->atLeastOnce())
-            ->method('execute')
+        $this->customOptionPriceCalculatorMock->expects($this->atLeastOnce())
+            ->method('getOptionPriceByPriceCode')
             ->willReturn($percentPrice);
         $this->assertEquals($percentPrice, $this->model->getPrice(true));
     }
diff --git a/app/code/Magento/Catalog/Test/Unit/Pricing/Price/CalculateCustomOptionCatalogRuleTest.php b/app/code/Magento/Catalog/Test/Unit/Pricing/Price/CalculateCustomOptionCatalogRuleTest.php
deleted file mode 100644
index 894408048b536..0000000000000
--- a/app/code/Magento/Catalog/Test/Unit/Pricing/Price/CalculateCustomOptionCatalogRuleTest.php
+++ /dev/null
@@ -1,266 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Catalog\Test\Unit\Pricing\Price;
-
-use Magento\Catalog\Model\Product;
-use Magento\Catalog\Model\Product\PriceModifier\Composite as PriceModifier;
-use Magento\Catalog\Pricing\Price\CalculateCustomOptionCatalogRule;
-use Magento\Catalog\Pricing\Price\RegularPrice;
-use Magento\Catalog\Pricing\Price\SpecialPrice;
-use Magento\CatalogRule\Pricing\Price\CatalogRulePrice;
-use Magento\Directory\Model\PriceCurrency;
-use Magento\Framework\Pricing\PriceInfo\Base;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use PHPUnit\Framework\MockObject\MockObject;
-use PHPUnit\Framework\TestCase;
-
-/**
- * Test for CalculateCustomOptionCatalogRule class.
- */
-class CalculateCustomOptionCatalogRuleTest extends TestCase
-{
-    /**
-     * @var Product|MockObject
-     */
-    private $saleableItemMock;
-
-    /**
-     * @var RegularPrice|MockObject
-     */
-    private $regularPriceMock;
-
-    /**
-     * @var SpecialPrice|MockObject
-     */
-    private $specialPriceMock;
-
-    /**
-     * @var CatalogRulePrice|MockObject
-     */
-    private $catalogRulePriceMock;
-
-    /**
-     * @var PriceModifier|MockObject
-     */
-    private $priceModifierMock;
-
-    /**
-     * @var CalculateCustomOptionCatalogRule
-     */
-    private $calculateCustomOptionCatalogRule;
-
-    /**
-     * @inheritdoc
-     */
-    protected function setUp(): void
-    {
-        $objectManager = new ObjectManager($this);
-        $this->saleableItemMock = $this->createMock(Product::class);
-        $this->regularPriceMock = $this->createMock(RegularPrice::class);
-        $this->specialPriceMock = $this->createMock(SpecialPrice::class);
-        $this->catalogRulePriceMock = $this->createMock(CatalogRulePrice::class);
-        $priceInfoMock = $this->createMock(Base::class);
-        $this->saleableItemMock->expects($this->any())
-            ->method('getPriceInfo')
-            ->willReturn($priceInfoMock);
-        $this->regularPriceMock->expects($this->any())
-            ->method('getPriceCode')
-            ->willReturn(RegularPrice::PRICE_CODE);
-        $this->specialPriceMock->expects($this->any())
-            ->method('getPriceCode')
-            ->willReturn(SpecialPrice::PRICE_CODE);
-        $this->catalogRulePriceMock->expects($this->any())
-            ->method('getPriceCode')
-            ->willReturn(CatalogRulePrice::PRICE_CODE);
-        $priceInfoMock->expects($this->any())
-            ->method('getPrices')
-            ->willReturn(
-                [
-                    'regular_price' => $this->regularPriceMock,
-                    'special_price' => $this->specialPriceMock,
-                    'catalog_rule_price' => $this->catalogRulePriceMock
-                ]
-            );
-        $priceInfoMock->expects($this->any())
-            ->method('getPrice')
-            ->willReturnMap(
-                [
-                    ['regular_price', $this->regularPriceMock],
-                    ['special_price', $this->specialPriceMock],
-                    ['catalog_rule_price', $this->catalogRulePriceMock],
-                ]
-            );
-        $priceCurrencyMock = $this->createMock(PriceCurrency::class);
-        $priceCurrencyMock->expects($this->any())
-            ->method('convertAndRound')
-            ->willReturnArgument(0);
-        $this->priceModifierMock = $this->createMock(PriceModifier::class);
-
-        $this->calculateCustomOptionCatalogRule = $objectManager->getObject(
-            CalculateCustomOptionCatalogRule::class,
-            [
-                'priceCurrency' => $priceCurrencyMock,
-                'priceModifier' => $this->priceModifierMock,
-            ]
-        );
-    }
-
-    /**
-     * Tests correct option price calculation with different catalog rules and special prices combination.
-     *
-     * @dataProvider executeDataProvider
-     * @param array $prices
-     * @param float $catalogRulePriceModifier
-     * @param float $optionPriceValue
-     * @param bool $isPercent
-     * @param float $expectedResult
-     */
-    public function testExecute(
-        array $prices,
-        float $catalogRulePriceModifier,
-        float $optionPriceValue,
-        bool $isPercent,
-        float $expectedResult
-    ) {
-        $this->regularPriceMock->expects($this->any())
-            ->method('getValue')
-            ->willReturn($prices['regularPriceValue']);
-        $this->specialPriceMock->expects($this->any())
-            ->method('getValue')
-            ->willReturn($prices['specialPriceValue']);
-        $this->priceModifierMock->expects($this->any())
-            ->method('modifyPrice')
-            ->willReturnCallback(
-                function ($price) use ($catalogRulePriceModifier) {
-                    return $price * $catalogRulePriceModifier;
-                }
-            );
-
-        $finalPrice = $this->calculateCustomOptionCatalogRule->execute(
-            $this->saleableItemMock,
-            $optionPriceValue,
-            $isPercent
-        );
-
-        $this->assertSame($expectedResult, $finalPrice);
-    }
-
-    /**
-     * Data provider for testExecute.
-     *
-     * "Active" means this price type has biggest discount, so other prices doesn't count.
-     *
-     * @return array
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function executeDataProvider(): array
-    {
-        return [
-            'No special price, no catalog price rules, fixed option price' => [
-                'prices' => [
-                    'regularPriceValue' => 1000,
-                    'specialPriceValue' => 1000,
-                ],
-                'catalogRulePriceModifier' => 1.0,
-                'optionPriceValue' => 100.0,
-                'isPercent' => false,
-                'expectedResult' => 100.0
-            ],
-            'No special price, no catalog price rules, percent option price' => [
-                'prices' => [
-                    'regularPriceValue' => 1000,
-                    'specialPriceValue' => 1000,
-                ],
-                'catalogRulePriceModifier' => 1.0,
-                'optionPriceValue' => 100.0,
-                'isPercent' => true,
-                'expectedResult' => 1000.0
-            ],
-            'No special price, catalog price rule set, fixed option price' => [
-                'prices' => [
-                    'regularPriceValue' => 1000,
-                    'specialPriceValue' => 1000,
-                ],
-                'catalogRulePriceModifier' => 0.9,
-                'optionPriceValue' => 100.0,
-                'isPercent' => false,
-                'expectedResult' => 90.0
-            ],
-            'No special price, catalog price rule set, percent option price' => [
-                'prices' => [
-                    'regularPriceValue' => 1000,
-                    'specialPriceValue' => 1000,
-                ],
-                'catalogRulePriceModifier' => 0.9,
-                'optionPriceValue' => 100.0,
-                'isPercent' => true,
-                'expectedResult' => 900.0
-            ],
-            'Special price set, no catalog price rule, fixed option price' => [
-                'prices' => [
-                    'regularPriceValue' => 1000,
-                    'specialPriceValue' => 900,
-                ],
-                'catalogRulePriceModifier' => 1.0,
-                'optionPriceValue' => 100.0,
-                'isPercent' => false,
-                'expectedResult' => 100.0
-            ],
-            'Special price set, no catalog price rule, percent option price' => [
-                'prices' => [
-                    'regularPriceValue' => 1000,
-                    'specialPriceValue' => 900,
-                ],
-                'catalogRulePriceModifier' => 1.0,
-                'optionPriceValue' => 100.0,
-                'isPercent' => true,
-                'expectedResult' => 900.0
-            ],
-            'Special price set and active, catalog price rule set, fixed option price' => [
-                'prices' => [
-                    'regularPriceValue' => 1000,
-                    'specialPriceValue' => 800,
-                ],
-                'catalogRulePriceModifier' => 0.9,
-                'optionPriceValue' => 100.0,
-                'isPercent' => false,
-                'expectedResult' => 100.0
-            ],
-            'Special price set and active, catalog price rule set, percent option price' => [
-                'prices' => [
-                    'regularPriceValue' => 1000,
-                    'specialPriceValue' => 800,
-                ],
-                'catalogRulePriceModifier' => 0.9,
-                'optionPriceValue' => 100.0,
-                'isPercent' => true,
-                'expectedResult' => 800.0
-            ],
-            'Special price set, catalog price rule set and active, fixed option price' => [
-                'prices' => [
-                    'regularPriceValue' => 1000,
-                    'specialPriceValue' => 950,
-                ],
-                'catalogRulePriceModifier' => 0.9,
-                'optionPriceValue' => 100.0,
-                'isPercent' => false,
-                'expectedResult' => 90.0
-            ],
-            'Special price set, catalog price rule set and active, percent option price' => [
-                'prices' => [
-                    'regularPriceValue' => 1000,
-                    'specialPriceValue' => 950,
-                ],
-                'catalogRulePriceModifier' => 0.9,
-                'optionPriceValue' => 100.0,
-                'isPercent' => true,
-                'expectedResult' => 900.0
-            ],
-        ];
-    }
-}
diff --git a/app/code/Magento/CatalogRule/Model/Rule.php b/app/code/Magento/CatalogRule/Model/Rule.php
index cd24201963f25..f2e8e54d34665 100644
--- a/app/code/Magento/CatalogRule/Model/Rule.php
+++ b/app/code/Magento/CatalogRule/Model/Rule.php
@@ -3,8 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-declare(strict_types=1);
-
 namespace Magento\CatalogRule\Model;
 
 use Magento\Catalog\Model\Product;
@@ -15,7 +13,6 @@
 use Magento\CatalogRule\Helper\Data;
 use Magento\CatalogRule\Model\Data\Condition\Converter;
 use Magento\CatalogRule\Model\Indexer\Rule\RuleProductProcessor;
-use Magento\CatalogRule\Model\ResourceModel\Product\ConditionsToCollectionApplier;
 use Magento\CatalogRule\Model\ResourceModel\Rule as RuleResourceModel;
 use Magento\CatalogRule\Model\Rule\Action\CollectionFactory as RuleCollectionFactory;
 use Magento\CatalogRule\Model\Rule\Condition\CombineFactory;
@@ -36,6 +33,7 @@
 use Magento\Framework\Stdlib\DateTime;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\CatalogRule\Model\ResourceModel\Product\ConditionsToCollectionApplier;
 
 /**
  * Catalog Rule data model
@@ -501,8 +499,7 @@ public function calcProductPriceRule(Product $product, $price)
         } else {
             $customerGroupId = $this->_customerSession->getCustomerGroupId();
         }
-        $currentDateTime = new \DateTime();
-        $dateTs = $currentDateTime->getTimestamp();
+        $dateTs = $this->_localeDate->scopeTimeStamp($storeId);
         $cacheKey = date('Y-m-d', $dateTs) . "|{$websiteId}|{$customerGroupId}|{$productId}|{$price}";
 
         if (!array_key_exists($cacheKey, self::$_priceRulesData)) {
@@ -898,12 +895,4 @@ public function getIdentities()
     {
         return ['price'];
     }
-
-    /**
-     * Clear price rules cache.
-     */
-    public function clearPriceRulesData(): void
-    {
-        self::$_priceRulesData = [];
-    }
 }
diff --git a/app/code/Magento/Contact/view/frontend/templates/form.phtml b/app/code/Magento/Contact/view/frontend/templates/form.phtml
index d218e650657ac..f3a1884b02831 100644
--- a/app/code/Magento/Contact/view/frontend/templates/form.phtml
+++ b/app/code/Magento/Contact/view/frontend/templates/form.phtml
@@ -61,13 +61,12 @@ $viewModel = $block->getViewModel();
             </label>
             <div class="control">
                 <textarea name="comment" 
-                          id="comment" 
-                          title="<?= $block->escapeHtmlAttr(__('What’s on your mind?')) ?>" 
-                          class="input-text" 
-                          cols="5" 
-                          rows="3" 
-                          data-validate="{required:true}"><?= $block->escapeHtml($viewModel->getUserComment()) ?>
-                </textarea>
+                     id="comment"
+                     title="<?= $block->escapeHtmlAttr(__('What’s on your mind?')) ?>"
+                     class="input-text"
+                     cols="5"
+                     rows="3"
+                     data-validate="{required:true}"><?= $block->escapeHtml($viewModel->getUserComment()) ?></textarea>
             </div>
         </div>
         <?= $block->getChildHtml('form.additional.info') ?>
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/File.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/File.php
index d2aa20a005ec4..35f449a404410 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/File.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/DataProvider/Type/File.php
@@ -8,7 +8,7 @@
 namespace Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type;
 
 use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
-use Magento\Catalog\Model\Product\Option;
+use Magento\TestFramework\Catalog\Model\Product\Option\DataProvider\Type\AbstractBase;
 
 /**
  * Data provider for options from file group with type "file".
@@ -20,44 +20,41 @@ class File extends AbstractBase
      */
     public function getDataForCreateOptions(): array
     {
-        return $this->injectFileExtension(
-            array_merge_recursive(
-                parent::getDataForCreateOptions(),
-                [
-                    "type_{$this->getType()}_option_file_extension" => [
-                        [
-                            'record_id' => 0,
-                            'sort_order' => 1,
-                            'is_require' => 1,
-                            'sku' => 'test-option-title-1',
-                            'max_characters' => 30,
-                            'title' => 'Test option title 1',
-                            'type' => $this->getType(),
-                            'price' => 10,
-                            'price_type' => 'fixed',
-                            'file_extension' => 'gif',
-                            'image_size_x' => 10,
-                            'image_size_y' => 20,
-                        ],
+        return array_merge_recursive(
+            parent::getDataForCreateOptions(),
+            [
+                "type_{$this->getType()}_option_file_extension" => [
+                    [
+                        'record_id' => 0,
+                        'sort_order' => 1,
+                        'is_require' => 1,
+                        'sku' => 'test-option-title-1',
+                        'max_characters' => 30,
+                        'title' => 'Test option title 1',
+                        'type' => $this->getType(),
+                        'price' => 10,
+                        'price_type' => 'fixed',
+                        'file_extension' => 'gif',
+                        'image_size_x' => 10,
+                        'image_size_y' => 20,
                     ],
-                    "type_{$this->getType()}_option_maximum_file_size" => [
-                        [
-                            'record_id' => 0,
-                            'sort_order' => 1,
-                            'is_require' => 1,
-                            'sku' => 'test-option-title-1',
-                            'title' => 'Test option title 1',
-                            'type' => $this->getType(),
-                            'price' => 10,
-                            'price_type' => 'fixed',
-                            'file_extension' => 'gif',
-                            'image_size_x' => 10,
-                            'image_size_y' => 20,
-                        ],
+                ],
+                "type_{$this->getType()}_option_maximum_file_size" => [
+                    [
+                        'record_id' => 0,
+                        'sort_order' => 1,
+                        'is_require' => 1,
+                        'sku' => 'test-option-title-1',
+                        'title' => 'Test option title 1',
+                        'type' => $this->getType(),
+                        'price' => 10,
+                        'price_type' => 'fixed',
+                        'file_extension' => 'gif',
+                        'image_size_x' => 10,
+                        'image_size_y' => 20,
                     ],
-                ]
-            ),
-            'png'
+                ],
+            ]
         );
     }
 
@@ -66,24 +63,21 @@ public function getDataForCreateOptions(): array
      */
     public function getDataForUpdateOptions(): array
     {
-        return $this->injectFileExtension(
-            array_merge_recursive(
-                parent::getDataForUpdateOptions(),
-                [
-                    "type_{$this->getType()}_option_file_extension" => [
-                        [
-                            'file_extension' => 'jpg',
-                        ],
+        return array_merge_recursive(
+            parent::getDataForUpdateOptions(),
+            [
+                "type_{$this->getType()}_option_file_extension" => [
+                    [
+                        'file_extension' => 'jpg',
                     ],
-                    "type_{$this->getType()}_option_maximum_file_size" => [
-                        [
-                            'image_size_x' => 300,
-                            'image_size_y' => 815,
-                        ],
+                ],
+                "type_{$this->getType()}_option_maximum_file_size" => [
+                    [
+                        'image_size_x' => 300,
+                        'image_size_y' => 815,
                     ],
-                ]
-            ),
-            ''
+                ],
+            ]
         );
     }
 
@@ -94,24 +88,4 @@ protected function getType(): string
     {
         return ProductCustomOptionInterface::OPTION_TYPE_FILE;
     }
-
-    /**
-     * Add 'file_extension' value to each option.
-     *
-     * @param array $data
-     * @param string $extension
-     * @return array
-     */
-    private function injectFileExtension(array $data, string $extension): array
-    {
-        foreach ($data as &$caseData) {
-            foreach ($caseData as &$option) {
-                if (!isset($option[Option::KEY_FILE_EXTENSION])) {
-                    $option[Option::KEY_FILE_EXTENSION] = $extension;
-                }
-            }
-        }
-
-        return $data;
-    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/BundlePriceAbstract.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/BundlePriceAbstract.php
index 572a526da07da..3ce2711a25d37 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/BundlePriceAbstract.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/BundlePriceAbstract.php
@@ -3,13 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-declare(strict_types=1);
 
 namespace Magento\Bundle\Model\Product;
 
 /**
  * Abstract class for testing bundle prices
- *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 abstract class BundlePriceAbstract extends \PHPUnit\Framework\TestCase
@@ -31,14 +29,6 @@ abstract class BundlePriceAbstract extends \PHPUnit\Framework\TestCase
      */
     protected $productCollectionFactory;
 
-    /**
-     * @var \Magento\CatalogRule\Model\RuleFactory
-     */
-    private $ruleFactory;
-
-    /**
-     * @inheritdoc
-     */
     protected function setUp(): void
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -52,19 +42,15 @@ protected function setUp(): void
             true,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
-        $this->ruleFactory = $this->objectManager->get(\Magento\CatalogRule\Model\RuleFactory::class);
     }
 
     /**
-     * Get test cases.
-     *
+     * Get test cases
      * @return array
      */
     abstract public function getTestCases();
 
     /**
-     * Prepare fixture.
-     *
      * @param array $strategyModifiers
      * @param string $productSku
      * @return void
@@ -75,14 +61,11 @@ abstract public function getTestCases();
      */
     protected function prepareFixture($strategyModifiers, $productSku)
     {
-        $this->ruleFactory->create()->clearPriceRulesData();
-
         $bundleProduct = $this->productRepository->get($productSku);
 
         foreach ($strategyModifiers as $modifier) {
             if (method_exists($this, $modifier['modifierName'])) {
                 array_unshift($modifier['data'], $bundleProduct);
-                // phpcs:ignore Magento2.Functions.DiscouragedFunction
                 $bundleProduct = call_user_func_array([$this, $modifier['modifierName']], $modifier['data']);
             } else {
                 throw new \Magento\Framework\Exception\InputException(
@@ -130,8 +113,6 @@ protected function addSimpleProduct(\Magento\Catalog\Model\Product $bundleProduc
     }
 
     /**
-     * Add custom option.
-     *
      * @param \Magento\Catalog\Model\Product $bundleProduct
      * @param array $optionsData
      * @return \Magento\Catalog\Model\Product
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/View/OptionsTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/View/OptionsTest.php
index 28357919ed566..57782fc17c9f5 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/View/OptionsTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/View/OptionsTest.php
@@ -3,12 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-declare(strict_types=1);
-
 namespace Magento\Catalog\Block\Product\View;
 
-use Magento\CatalogRule\Model\Indexer\IndexBuilder;
-
 /**
  * Test class for \Magento\Catalog\Block\Product\View\Options.
  */
@@ -34,19 +30,12 @@ class OptionsTest extends \PHPUnit\Framework\TestCase
      */
     protected $productRepository;
 
-    /**
-     * @var IndexBuilder
-     */
-    private $indexBuilder;
-
     protected function setUp(): void
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
         $this->productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
 
-        $this->indexBuilder = $this->objectManager->create(IndexBuilder::class);
-
         try {
             $this->product = $this->productRepository->get('simple');
         } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
@@ -124,7 +113,9 @@ private function getExpectedJsonConfig()
     {
         return [
             0 => [
-                'prices' => ['oldPrice' => ['amount' => 10, 'adjustments' => []],
+                'prices' =>
+                    ['oldPrice' =>
+                        ['amount' => 10, 'adjustments' => []],
                         'basePrice' => ['amount' => 10],
                         'finalPrice' => ['amount' => 10]
                     ],
@@ -132,7 +123,9 @@ private function getExpectedJsonConfig()
                 'name' => 'drop_down option 1',
             ],
             1 => [
-                'prices' => ['oldPrice' => ['amount' => 40, 'adjustments' => []],
+                'prices' =>
+                    ['oldPrice' =>
+                        ['amount' => 40, 'adjustments' => []],
                         'basePrice' => ['amount' => 40],
                         'finalPrice' => ['amount' => 40],
                     ],
@@ -141,47 +134,4 @@ private function getExpectedJsonConfig()
             ],
         ];
     }
-
-    /**
-     * Test option prices with catalog price rules applied.
-     *
-     * @magentoDbIsolation disabled
-     * @magentoDataFixture Magento/CatalogRule/_files/two_rules.php
-     * @magentoDataFixture Magento/Catalog/_files/product_with_dropdown_option.php
-     */
-    public function testGetJsonConfigWithCatalogRules()
-    {
-        $this->indexBuilder->reindexFull();
-        sleep(1);
-        $config = json_decode($this->block->getJsonConfig(), true);
-        $configValues = array_values($config);
-        $this->assertEquals($this->getExpectedJsonConfigWithCatalogRules(), array_values($configValues[0]));
-    }
-
-    /**
-     * Expected data for testGetJsonConfigWithCatalogRules
-     *
-     * @return array
-     */
-    private function getExpectedJsonConfigWithCatalogRules()
-    {
-        return [
-            0 => [
-                'prices' => ['oldPrice' => ['amount' => 10, 'adjustments' => []],
-                        'basePrice' => ['amount' => 9.5],
-                        'finalPrice' => ['amount' => 9.5],
-                    ],
-                'type' => 'fixed',
-                'name' => 'drop_down option 1',
-            ],
-            1 => [
-                'prices' => ['oldPrice' => ['amount' => 40, 'adjustments' => []],
-                        'basePrice' => ['amount' => 38],
-                        'finalPrice' => ['amount' => 38],
-                    ],
-                'type' => 'percent',
-                'name' => 'drop_down option 2',
-            ],
-        ];
-    }
 }

From 75f531d02c9f098ea7762a67aa4e4976e262f7fb Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Mon, 1 Jun 2020 19:49:05 +0200
Subject: [PATCH 0347/1718] Unnecessary interface has been removed

---
 .../Quote/Model/Cart/AddProductsToCart.php    | 12 ++++++--
 .../Model/Cart/AddProductsToCartInterface.php | 28 -------------------
 2 files changed, 9 insertions(+), 31 deletions(-)
 delete mode 100644 app/code/Magento/Quote/Model/Cart/AddProductsToCartInterface.php

diff --git a/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php b/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
index 79a11e9eba039..4e1cf53aeec69 100644
--- a/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
+++ b/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
@@ -18,9 +18,10 @@
 use Magento\Framework\Message\MessageInterface;
 
 /**
- * @inheritdoc
+ * Unified approach to add products to the Shopping Cart.
+ * Client code must validate, that customer is eligible to call service with provided {cartId} and {cartItems}
  */
-class AddProductsToCart implements AddProductsToCartInterface
+class AddProductsToCart
 {
     /**#@+
      * Error message codes
@@ -88,7 +89,12 @@ public function __construct(
     }
 
     /**
-     * @inheritdoc
+     * Add cart items to the cart
+     *
+     * @param string $maskedCartId
+     * @param Data\CartItem[] $cartItems
+     * @return AddProductsToCartOutput
+     * @throws NoSuchEntityException Could not find a Cart with provided $maskedCartId
      */
     public function execute(string $maskedCartId, array $cartItems): AddProductsToCartOutput
     {
diff --git a/app/code/Magento/Quote/Model/Cart/AddProductsToCartInterface.php b/app/code/Magento/Quote/Model/Cart/AddProductsToCartInterface.php
deleted file mode 100644
index 98e69af2a0179..0000000000000
--- a/app/code/Magento/Quote/Model/Cart/AddProductsToCartInterface.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Quote\Model\Cart;
-
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Quote\Model\Cart\Data\AddProductsToCartOutput;
-
-/**
- * Unified approach to add products to the Shopping Cart.
- * Client code must validate, that customer is eligible to call service with provided {cartId} and {cartItems}
- */
-interface AddProductsToCartInterface
-{
-    /**
-     * Add cart items to the cart
-     *
-     * @param string $cartId
-     * @param Data\CartItem[] $cartItems
-     * @return AddProductsToCartOutput
-     * @throws NoSuchEntityException Could not find a Cart with provided $maskedCartId
-     */
-    public function execute(string $cartId, array $cartItems): AddProductsToCartOutput;
-}

From 89f7d95a608790ff7ef8f664d9ed857affa4f778 Mon Sep 17 00:00:00 2001
From: Volodymyr Zaets <vzaets@magento.com>
Date: Mon, 1 Jun 2020 14:41:14 -0500
Subject: [PATCH 0348/1718] Revert for public PR:22917

---
 .../Model/Product/Option/Type/DefaultType.php |  2 ++
 .../Catalog/Model/Product/Option/Value.php    | 24 +++++++++++++++++++
 .../Model/Product/BundlePriceAbstract.php     |  2 ++
 3 files changed, 28 insertions(+)

diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
index c998a015f3780..7f9181e9181b6 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
@@ -395,6 +395,8 @@ public function getProductOptions()
     }
 
     /**
+     * Return final chargeable price for option
+     *
      * @param float $price Price of option
      * @param boolean $isPercent Price type - percent or fixed
      * @param float $basePrice For percent price type
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Value.php b/app/code/Magento/Catalog/Model/Product/Option/Value.php
index 25e12e2fad865..e9630adc3497c 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Value.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Value.php
@@ -111,6 +111,8 @@ protected function _construct()
     }
 
     /**
+     * Add value to values array
+     *
      * @codeCoverageIgnoreStart
      * @param mixed $value
      * @return $this
@@ -122,6 +124,8 @@ public function addValue($value)
     }
 
     /**
+     * Returns array of values
+     *
      * @return array
      */
     public function getValues()
@@ -130,6 +134,8 @@ public function getValues()
     }
 
     /**
+     * Set values array
+     *
      * @param array $values
      * @return $this
      */
@@ -140,6 +146,8 @@ public function setValues($values)
     }
 
     /**
+     * Unset all from values array
+     *
      * @return $this
      */
     public function unsetValues()
@@ -149,6 +157,8 @@ public function unsetValues()
     }
 
     /**
+     * Set option
+     *
      * @param Option $option
      * @return $this
      */
@@ -159,6 +169,8 @@ public function setOption(Option $option)
     }
 
     /**
+     * Unset option
+     *
      * @return $this
      */
     public function unsetOption()
@@ -178,6 +190,8 @@ public function getOption()
     }
 
     /**
+     * Set product
+     *
      * @param Product $product
      * @return $this
      */
@@ -190,6 +204,8 @@ public function setProduct($product)
     //@codeCoverageIgnoreEnd
 
     /**
+     * Get product
+     *
      * @return Product
      */
     public function getProduct()
@@ -201,6 +217,8 @@ public function getProduct()
     }
 
     /**
+     * Save array of values
+     *
      * @return $this
      */
     public function saveValues()
@@ -270,6 +288,8 @@ public function getValuesCollection(Option $option)
     }
 
     /**
+     * Returns values by option
+     *
      * @param array $optionIds
      * @param int $option_id
      * @param int $store_id
@@ -289,6 +309,8 @@ public function getValuesByOption($optionIds, $option_id, $store_id)
     }
 
     /**
+     * Delete value by option
+     *
      * @param int $option_id
      * @return $this
      */
@@ -299,6 +321,8 @@ public function deleteValue($option_id)
     }
 
     /**
+     * Delete values by option
+     *
      * @param int $option_type_id
      * @return $this
      */
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/BundlePriceAbstract.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/BundlePriceAbstract.php
index 3ce2711a25d37..bf369ed28167b 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/BundlePriceAbstract.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/BundlePriceAbstract.php
@@ -8,6 +8,7 @@
 
 /**
  * Abstract class for testing bundle prices
+ * @codingStandardsIgnoreStart
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 abstract class BundlePriceAbstract extends \PHPUnit\Framework\TestCase
@@ -142,3 +143,4 @@ protected function addCustomOption(\Magento\Catalog\Model\Product $bundleProduct
         return $bundleProduct;
     }
 }
+// @codingStandardsIgnoreEnd

From 34f6307ffc7b4b8029a93e76e8cdcebc705b5076 Mon Sep 17 00:00:00 2001
From: Serhii Balko <serhii.balko@transoftgroup.com>
Date: Tue, 2 Jun 2020 16:26:20 +0300
Subject: [PATCH 0349/1718] MC-32996: Product Attribute Option Label update
 Magento 2.3.4 REST API

---
 ...ductAttributeOptionManagementInterface.php |  13 +
 .../Product/Attribute/OptionManagement.php    |  30 +-
 app/code/Magento/Catalog/etc/webapi.xml       |   6 +
 .../AttributeOptionManagementInterface.php    |  16 +-
 .../Entity/Attribute/OptionManagement.php     | 213 +++++++----
 .../Entity/Attribute/OptionManagementTest.php | 360 ++++++++++--------
 .../Entity/Attribute/OptionManagement.php     |  95 ++++-
 ...AttributeOptionManagementInterfaceTest.php | 281 +++++++++++---
 8 files changed, 710 insertions(+), 304 deletions(-)

diff --git a/app/code/Magento/Catalog/Api/ProductAttributeOptionManagementInterface.php b/app/code/Magento/Catalog/Api/ProductAttributeOptionManagementInterface.php
index 3f255d93f96b0..7e826f4707a55 100644
--- a/app/code/Magento/Catalog/Api/ProductAttributeOptionManagementInterface.php
+++ b/app/code/Magento/Catalog/Api/ProductAttributeOptionManagementInterface.php
@@ -33,6 +33,19 @@ public function getItems($attributeCode);
      */
     public function add($attributeCode, $option);
 
+    /**
+     * Update attribute option
+     *
+     * @param string $attributeCode
+     * @param int $optionId
+     * @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
+     * @return bool
+     * @throws \Magento\Framework\Exception\StateException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \Magento\Framework\Exception\InputException
+     */
+    public function update($attributeCode, $optionId, $option);
+
     /**
      * Delete option from attribute
      *
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php b/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php
index b797308c30fb0..ef982e157a11f 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php
@@ -6,23 +6,26 @@
  */
 namespace Magento\Catalog\Model\Product\Attribute;
 
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Api\ProductAttributeOptionManagementInterface;
+use Magento\Eav\Api\AttributeOptionManagementInterface;
 use Magento\Framework\Exception\InputException;
 
 /**
  * Option management model for product attribute.
  */
-class OptionManagement implements \Magento\Catalog\Api\ProductAttributeOptionManagementInterface
+class OptionManagement implements ProductAttributeOptionManagementInterface
 {
     /**
-     * @var \Magento\Eav\Api\AttributeOptionManagementInterface
+     * @var AttributeOptionManagementInterface
      */
     protected $eavOptionManagement;
 
     /**
-     * @param \Magento\Eav\Api\AttributeOptionManagementInterface $eavOptionManagement
+     * @param AttributeOptionManagementInterface $eavOptionManagement
      */
     public function __construct(
-        \Magento\Eav\Api\AttributeOptionManagementInterface $eavOptionManagement
+        AttributeOptionManagementInterface $eavOptionManagement
     ) {
         $this->eavOptionManagement = $eavOptionManagement;
     }
@@ -33,7 +36,7 @@ public function __construct(
     public function getItems($attributeCode)
     {
         return $this->eavOptionManagement->getItems(
-            \Magento\Catalog\Api\Data\ProductAttributeInterface::ENTITY_TYPE_CODE,
+            ProductAttributeInterface::ENTITY_TYPE_CODE,
             $attributeCode
         );
     }
@@ -44,12 +47,25 @@ public function getItems($attributeCode)
     public function add($attributeCode, $option)
     {
         return $this->eavOptionManagement->add(
-            \Magento\Catalog\Api\Data\ProductAttributeInterface::ENTITY_TYPE_CODE,
+            ProductAttributeInterface::ENTITY_TYPE_CODE,
             $attributeCode,
             $option
         );
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function update($attributeCode, $optionId, $option)
+    {
+        return $this->eavOptionManagement->update(
+            ProductAttributeInterface::ENTITY_TYPE_CODE,
+            $attributeCode,
+            $optionId,
+            $option
+        );
+    }
+
     /**
      * @inheritdoc
      */
@@ -60,7 +76,7 @@ public function delete($attributeCode, $optionId)
         }
 
         return $this->eavOptionManagement->delete(
-            \Magento\Catalog\Api\Data\ProductAttributeInterface::ENTITY_TYPE_CODE,
+            ProductAttributeInterface::ENTITY_TYPE_CODE,
             $attributeCode,
             $optionId
         );
diff --git a/app/code/Magento/Catalog/etc/webapi.xml b/app/code/Magento/Catalog/etc/webapi.xml
index 3f82175ab02eb..7c9582980081f 100644
--- a/app/code/Magento/Catalog/etc/webapi.xml
+++ b/app/code/Magento/Catalog/etc/webapi.xml
@@ -183,6 +183,12 @@
             <resource ref="Magento_Catalog::attributes_attributes" />
         </resources>
     </route>
+    <route url="/V1/products/attributes/:attributeCode/options/:optionId" method="PUT">
+        <service class="Magento\Catalog\Api\ProductAttributeOptionManagementInterface" method="update" />
+        <resources>
+            <resource ref="Magento_Catalog::attributes_attributes" />
+        </resources>
+    </route>
     <route url="/V1/products/attributes/:attributeCode/options/:optionId" method="DELETE">
         <service class="Magento\Catalog\Api\ProductAttributeOptionManagementInterface" method="delete" />
         <resources>
diff --git a/app/code/Magento/Eav/Api/AttributeOptionManagementInterface.php b/app/code/Magento/Eav/Api/AttributeOptionManagementInterface.php
index 84aefa700a52a..68aff1235bc1c 100644
--- a/app/code/Magento/Eav/Api/AttributeOptionManagementInterface.php
+++ b/app/code/Magento/Eav/Api/AttributeOptionManagementInterface.php
@@ -15,8 +15,8 @@ interface AttributeOptionManagementInterface
     /**
      * Add option to attribute
      *
-     * @param string $attributeCode
      * @param int $entityType
+     * @param string $attributeCode
      * @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
      * @throws \Magento\Framework\Exception\StateException
      * @throws \Magento\Framework\Exception\InputException
@@ -24,6 +24,20 @@ interface AttributeOptionManagementInterface
      */
     public function add($entityType, $attributeCode, $option);
 
+    /**
+     * Update attribute option
+     *
+     * @param string $entityType
+     * @param string $attributeCode
+     * @param int $optionId
+     * @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
+     * @return bool
+     * @throws \Magento\Framework\Exception\StateException
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function update($entityType, $attributeCode, $optionId, $option);
+
     /**
      * Delete option from attribute
      *
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php b/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php
index 0ea4c324fe5c9..b65738adafea5 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php
@@ -7,7 +7,11 @@
 
 namespace Magento\Eav\Model\Entity\Attribute;
 
+use Magento\Eav\Api\AttributeOptionManagementInterface;
 use Magento\Eav\Api\Data\AttributeInterface as EavAttributeInterface;
+use Magento\Eav\Api\Data\AttributeOptionInterface;
+use Magento\Eav\Model\AttributeRepository;
+use Magento\Eav\Model\ResourceModel\Entity\Attribute;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\StateException;
@@ -15,26 +19,26 @@
 /**
  * Eav Option Management
  */
-class OptionManagement implements \Magento\Eav\Api\AttributeOptionManagementInterface
+class OptionManagement implements AttributeOptionManagementInterface
 {
     /**
-     * @var \Magento\Eav\Model\AttributeRepository
+     * @var AttributeRepository
      */
     protected $attributeRepository;
 
     /**
-     * @var \Magento\Eav\Model\ResourceModel\Entity\Attribute
+     * @var Attribute
      */
     protected $resourceModel;
 
     /**
-     * @param \Magento\Eav\Model\AttributeRepository $attributeRepository
-     * @param \Magento\Eav\Model\ResourceModel\Entity\Attribute $resourceModel
+     * @param AttributeRepository $attributeRepository
+     * @param Attribute $resourceModel
      * @codeCoverageIgnore
      */
     public function __construct(
-        \Magento\Eav\Model\AttributeRepository $attributeRepository,
-        \Magento\Eav\Model\ResourceModel\Entity\Attribute $resourceModel
+        AttributeRepository $attributeRepository,
+        Attribute $resourceModel
     ) {
         $this->attributeRepository = $attributeRepository;
         $this->resourceModel = $resourceModel;
@@ -45,45 +49,96 @@ public function __construct(
      *
      * @param int $entityType
      * @param string $attributeCode
-     * @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
+     * @param AttributeOptionInterface $option
      * @return string
      * @throws InputException
      * @throws NoSuchEntityException
      * @throws StateException
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function add($entityType, $attributeCode, $option)
     {
-        if (empty($attributeCode)) {
-            throw new InputException(__('The attribute code is empty. Enter the code and try again.'));
+        $attribute = $this->loadAttribute($entityType, (string)$attributeCode);
+
+        $label = trim($option->getLabel() ?: '');
+        if (empty($label)) {
+            throw new InputException(__('The attribute option label is empty. Enter the value and try again.'));
         }
 
-        $attribute = $this->attributeRepository->get($entityType, $attributeCode);
-        if (!$attribute->usesSource()) {
-            throw new StateException(__('The "%1" attribute doesn\'t work with options.', $attributeCode));
+        if ($attribute->getSource()->getOptionId($label) !== null) {
+            throw new InputException(
+                __(
+                    'Admin store attribute option label "%1" is already exists.',
+                    $option->getLabel()
+                )
+            );
         }
 
-        $optionLabel = $option->getLabel();
-        $optionId = $this->getOptionId($option);
-        $options = [];
-        $options['value'][$optionId][0] = $optionLabel;
-        $options['order'][$optionId] = $option->getSortOrder();
+        $optionId = $this->getNewOptionId($option);
+        $this->saveOption($attribute, $option, $optionId);
 
-        if (is_array($option->getStoreLabels())) {
-            foreach ($option->getStoreLabels() as $label) {
-                $options['value'][$optionId][$label->getStoreId()] = $label->getLabel();
-            }
-        }
+        return $this->retrieveOptionId($attribute, $option);
+    }
 
-        if (!$this->isAttributeOptionLabelExists($attribute, (string) $options['value'][$optionId][0])) {
+    /**
+     * @inheritdoc
+     */
+    public function update($entityType, $attributeCode, $optionId, $option)
+    {
+        $attribute = $this->loadAttribute($entityType, (string)$attributeCode);
+        if (empty($optionId)) {
+            throw new InputException(__('The option id is empty. Enter the value and try again.'));
+        }
+        $label = trim($option->getLabel() ?: '');
+        if (empty($label)) {
+            throw new InputException(__('The attribute option label is empty. Enter the value and try again.'));
+        }
+        if ($attribute->getSource()->getOptionText($optionId) === false) {
             throw new InputException(
                 __(
-                    'Admin store attribute option label "%1" is already exists.',
-                    $options['value'][$optionId][0]
+                    'The \'%1\' attribute doesn\'t include an option id \'%2\'.',
+                    $attribute->getAttributeCode(),
+                    $optionId
+                )
+            );
+        }
+        $optionIdByLabel = $attribute->getSource()->getOptionId($label);
+        if (!empty($optionIdByLabel) && (int)$optionIdByLabel !== (int)$optionId) {
+            throw new InputException(
+                __(
+                    'Admin store attribute option label \'%1\' is already exists.',
+                    $option->getLabel()
                 )
             );
         }
 
+        $this->saveOption($attribute, $option, $optionId);
+
+        return true;
+    }
+
+    /**
+     * Save attribute option
+     *
+     * @param EavAttributeInterface $attribute
+     * @param AttributeOptionInterface $option
+     * @param int|string $optionId
+     * @return AttributeOptionInterface
+     * @throws StateException
+     */
+    private function saveOption(
+        EavAttributeInterface $attribute,
+        AttributeOptionInterface $option,
+        $optionId
+    ): AttributeOptionInterface {
+        $optionLabel = trim($option->getLabel());
+        $options = [];
+        $options['value'][$optionId][0] = $optionLabel;
+        $options['order'][$optionId] = $option->getSortOrder();
+        if (is_array($option->getStoreLabels())) {
+            foreach ($option->getStoreLabels() as $label) {
+                $options['value'][$optionId][$label->getStoreId()] = $label->getLabel();
+            }
+        }
         if ($option->getIsDefault()) {
             $attribute->setDefault([$optionId]);
         }
@@ -91,29 +146,35 @@ public function add($entityType, $attributeCode, $option)
         $attribute->setOption($options);
         try {
             $this->resourceModel->save($attribute);
-            if ($optionLabel && $attribute->getAttributeCode()) {
-                $this->setOptionValue($option, $attribute, $optionLabel);
-            }
         } catch (\Exception $e) {
-            throw new StateException(__('The "%1" attribute can\'t be saved.', $attributeCode));
+            throw new StateException(__('The "%1" attribute can\'t be saved.', $attribute->getAttributeCode()));
         }
 
-        return $this->getOptionId($option);
+        return $option;
     }
 
     /**
-     * @inheritdoc
+     * Get option id to create new option
+     *
+     * @param AttributeOptionInterface $option
+     * @return string
      */
-    public function delete($entityType, $attributeCode, $optionId)
+    private function getNewOptionId(AttributeOptionInterface $option): string
     {
-        if (empty($attributeCode)) {
-            throw new InputException(__('The attribute code is empty. Enter the code and try again.'));
+        $optionId = trim($option->getValue() ?: '');
+        if (empty($optionId)) {
+            $optionId = 'new_option';
         }
 
-        $attribute = $this->attributeRepository->get($entityType, $attributeCode);
-        if (!$attribute->usesSource()) {
-            throw new StateException(__('The "%1" attribute has no option.', $attributeCode));
-        }
+        return 'id_' . $optionId;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function delete($entityType, $attributeCode, $optionId)
+    {
+        $attribute = $this->loadAttribute($entityType, $attributeCode);
         $this->validateOption($attribute, $optionId);
 
         $removalMarker = [
@@ -173,63 +234,55 @@ protected function validateOption($attribute, $optionId)
     }
 
     /**
-     * Returns option id
+     * Load attribute
      *
-     * @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
-     * @return string
+     * @param string|int $entityType
+     * @param string $attributeCode
+     * @return EavAttributeInterface
+     * @throws InputException
+     * @throws NoSuchEntityException
+     * @throws StateException
      */
-    private function getOptionId(\Magento\Eav\Api\Data\AttributeOptionInterface $option) : string
+    private function loadAttribute($entityType, string $attributeCode): EavAttributeInterface
     {
-        return 'id_' . ($option->getValue() ?: 'new_option');
+        if (empty($attributeCode)) {
+            throw new InputException(__('The attribute code is empty. Enter the code and try again.'));
+        }
+
+        $attribute = $this->attributeRepository->get($entityType, $attributeCode);
+        if (!$attribute->usesSource()) {
+            throw new StateException(__('The "%1" attribute doesn\'t work with options.', $attributeCode));
+        }
+
+        $attribute->setStoreId(0);
+
+        return $attribute;
     }
 
     /**
-     * Set option value
+     * Retrieve option id
      *
-     * @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
      * @param EavAttributeInterface $attribute
-     * @param string $optionLabel
-     * @return void
+     * @param AttributeOptionInterface $option
+     * @return string
      */
-    private function setOptionValue(
-        \Magento\Eav\Api\Data\AttributeOptionInterface $option,
+    private function retrieveOptionId(
         EavAttributeInterface $attribute,
-        string $optionLabel
-    ) {
-        $optionId = $attribute->getSource()->getOptionId($optionLabel);
+        AttributeOptionInterface $option
+    ) : string {
+        $label = trim($option->getLabel());
+        $optionId = $attribute->getSource()->getOptionId($label);
         if ($optionId) {
-            $option->setValue($attribute->getSource()->getOptionId($optionId));
+            $option->setValue($optionId);
         } elseif (is_array($option->getStoreLabels())) {
             foreach ($option->getStoreLabels() as $label) {
-                if ($optionId = $attribute->getSource()->getOptionId($label->getLabel())) {
-                    $option->setValue($attribute->getSource()->getOptionId($optionId));
+                $optionId = $attribute->getSource()->getOptionId($label->getLabel());
+                if ($optionId) {
                     break;
                 }
             }
         }
-    }
-
-    /**
-     * Checks if the incoming attribute option label for admin store is already exists.
-     *
-     * @param EavAttributeInterface $attribute
-     * @param string $adminStoreLabel
-     * @param int $storeId
-     * @return bool
-     */
-    private function isAttributeOptionLabelExists(
-        EavAttributeInterface $attribute,
-        string $adminStoreLabel,
-        int $storeId = 0
-    ) :bool {
-        $attribute->setStoreId($storeId);
-
-        foreach ($attribute->getSource()->toOptionArray() as $existingAttributeOption) {
-            if ($existingAttributeOption['label'] === $adminStoreLabel) {
-                return false;
-            }
-        }
 
-        return true;
+        return (string) $optionId;
     }
 }
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/OptionManagementTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/OptionManagementTest.php
index 2084db08a1afb..b96b1e26696cd 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/OptionManagementTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/OptionManagementTest.php
@@ -15,10 +15,17 @@
 use Magento\Eav\Model\Entity\Attribute\Source\SourceInterface;
 use Magento\Eav\Model\Entity\Attribute\Source\Table as EavAttributeSource;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute;
-use Magento\Framework\Model\AbstractModel;
-use PHPUnit\Framework\MockObject\MockObject;
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\StateException;
+use PHPUnit\Framework\MockObject\MockObject as MockObject;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * Tests for Eav Option Management functionality
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class OptionManagementTest extends TestCase
 {
     /**
@@ -27,15 +34,18 @@ class OptionManagementTest extends TestCase
     protected $model;
 
     /**
-     * @var \PHPUnit\Framework\MockObject\MockObject
+     * @var MockObject|AttributeRepository
      */
     protected $attributeRepositoryMock;
 
     /**
-     * @var \PHPUnit\Framework\MockObject\MockObject
+     * @var MockObject|Attribute
      */
     protected $resourceModelMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp(): void
     {
         $this->attributeRepositoryMock = $this->createMock(AttributeRepository::class);
@@ -47,124 +57,189 @@ protected function setUp(): void
         );
     }
 
+    /**
+     * Test to add attribute option
+     */
     public function testAdd()
     {
         $entityType = 42;
+        $storeId = 4;
         $attributeCode = 'atrCde';
-        $attributeMock = $this->getAttribute();
-        $optionMock = $this->getAttributeOption();
-        $labelMock = $this->getAttributeOptionLabel();
-        $option =
-            ['value' => [
+        $label = 'optionLabel';
+        $storeLabel = 'labelLabel';
+        $sortOder = 'optionSortOrder';
+        $option = [
+            'value' => [
                 'id_new_option' => [
-                    0 => 'optionLabel',
-                    42 => 'labelLabel',
+                    0 => $label,
+                    $storeId => $storeLabel,
                 ],
             ],
-                'order' => [
-                    'id_new_option' => 'optionSortOrder',
-                ],
-            ];
+            'order' => [
+                'id_new_option' => $sortOder,
+            ]
+        ];
+        $newOptionId = 10;
 
-        $this->attributeRepositoryMock->expects($this->once())->method('get')->with($entityType, $attributeCode)
-            ->willReturn($attributeMock);
-        $attributeMock->expects($this->once())->method('usesSource')->willReturn(true);
-        $optionMock->expects($this->once())->method('getLabel')->willReturn('optionLabel');
-        $optionMock->expects($this->once())->method('getSortOrder')->willReturn('optionSortOrder');
-        $optionMock->expects($this->exactly(2))->method('getStoreLabels')->willReturn([$labelMock]);
-        $labelMock->expects($this->once())->method('getStoreId')->willReturn(42);
-        $labelMock->expects($this->once())->method('getLabel')->willReturn('labelLabel');
-        $optionMock->expects($this->once())->method('getIsDefault')->willReturn(true);
+        $optionMock = $this->getAttributeOption();
+        $labelMock = $this->getAttributeOptionLabel();
+        /** @var SourceInterface|MockObject $sourceMock */
+        $sourceMock = $this->createMock(EavAttributeSource::class);
+        $sourceMock->method('getOptionId')
+            ->willReturnMap(
+                [
+                    [$label, null],
+                    [$storeLabel, $newOptionId],
+                    [$newOptionId, $newOptionId],
+                ]
+            );
+
+        /** @var EavAbstractAttribute|MockObject $attributeMock */
+        $attributeMock = $this->getMockBuilder(EavAbstractAttribute::class)
+            ->disableOriginalConstructor()
+            ->addMethods(['setDefault', 'setOption'])
+            ->onlyMethods(['usesSource', 'getSource'])
+            ->getMock();
+        $attributeMock->method('usesSource')->willReturn(true);
         $attributeMock->expects($this->once())->method('setDefault')->with(['id_new_option']);
         $attributeMock->expects($this->once())->method('setOption')->with($option);
+        $attributeMock->method('getSource')->willReturn($sourceMock);
+        $this->attributeRepositoryMock->expects($this->once())
+            ->method('get')
+            ->with($entityType, $attributeCode)
+            ->willReturn($attributeMock);
+        $optionMock->method('getLabel')->willReturn($label);
+        $optionMock->method('getSortOrder')->willReturn($sortOder);
+        $optionMock->method('getIsDefault')->willReturn(true);
+        $optionMock->method('getStoreLabels')->willReturn([$labelMock]);
+        $labelMock->method('getStoreId')->willReturn($storeId);
+        $labelMock->method('getLabel')->willReturn($storeLabel);
         $this->resourceModelMock->expects($this->once())->method('save')->with($attributeMock);
-        $this->assertEquals('id_new_option', $this->model->add($entityType, $attributeCode, $optionMock));
+        $this->assertEquals(
+            $newOptionId,
+            $this->model->add($entityType, $attributeCode, $optionMock)
+        );
     }
 
+    /**
+     * Test to add attribute option with empty attribute code
+     */
     public function testAddWithEmptyAttributeCode()
     {
-        $this->expectException('Magento\Framework\Exception\InputException');
-        $this->expectExceptionMessage('The attribute code is empty. Enter the code and try again.');
+        $this->expectExceptionMessage("The attribute code is empty. Enter the code and try again.");
+        $this->expectException(InputException::class);
         $entityType = 42;
         $attributeCode = '';
         $optionMock = $this->getAttributeOption();
         $this->resourceModelMock->expects($this->never())->method('save');
         $this->model->add($entityType, $attributeCode, $optionMock);
     }
-
+    /**
+     * Test to add attribute option without use source
+     */
     public function testAddWithWrongOptions()
     {
-        $this->expectException('Magento\Framework\Exception\StateException');
         $this->expectExceptionMessage('The "testAttribute" attribute doesn\'t work with options.');
+        $this->expectException(StateException::class);
         $entityType = 42;
         $attributeCode = 'testAttribute';
-        $attributeMock = $this->getAttribute();
+        /** @var EavAbstractAttribute|MockObject $attributeMock */
+        $attributeMock = $this->getMockBuilder(EavAbstractAttribute::class)
+            ->disableOriginalConstructor()
+            ->addMethods(['setDefault', 'setOption', 'setStoreId'])
+            ->onlyMethods(['usesSource', 'getSource'])
+            ->getMock();
         $optionMock = $this->getAttributeOption();
-        $this->attributeRepositoryMock->expects($this->once())->method('get')->with($entityType, $attributeCode)
+        $this->attributeRepositoryMock->expects($this->once())
+            ->method('get')
+            ->with($entityType, $attributeCode)
             ->willReturn($attributeMock);
         $attributeMock->expects($this->once())->method('usesSource')->willReturn(false);
         $this->resourceModelMock->expects($this->never())->method('save');
         $this->model->add($entityType, $attributeCode, $optionMock);
     }
 
+    /**
+     * Test to add attribute option wit save exception
+     */
     public function testAddWithCannotSaveException()
     {
-        $this->expectException('Magento\Framework\Exception\StateException');
+        $this->expectException(StateException::class);
         $this->expectExceptionMessage('The "atrCde" attribute can\'t be saved.');
+
         $entityType = 42;
+        $storeId = 4;
         $attributeCode = 'atrCde';
-        $optionMock = $this->getAttributeOption();
-        $attributeMock = $this->getAttribute();
-        $labelMock = $this->getAttributeOptionLabel();
-        $option =
-            ['value' => [
+        $label = 'optionLabel';
+        $storeLabel = 'labelLabel';
+        $sortOder = 'optionSortOrder';
+        $option = [
+            'value' => [
                 'id_new_option' => [
-                    0 => 'optionLabel',
-                    42 => 'labelLabel',
+                    0 => $label,
+                    $storeId => $storeLabel,
                 ],
             ],
-                'order' => [
-                    'id_new_option' => 'optionSortOrder',
-                ],
-            ];
+            'order' => [
+                'id_new_option' => $sortOder,
+            ]
+        ];
 
-        $this->attributeRepositoryMock->expects($this->once())->method('get')->with($entityType, $attributeCode)
-            ->willReturn($attributeMock);
-        $attributeMock->expects($this->once())->method('usesSource')->willReturn(true);
-        $optionMock->expects($this->once())->method('getLabel')->willReturn('optionLabel');
-        $optionMock->expects($this->once())->method('getSortOrder')->willReturn('optionSortOrder');
-        $optionMock->expects($this->exactly(2))->method('getStoreLabels')->willReturn([$labelMock]);
-        $labelMock->expects($this->once())->method('getStoreId')->willReturn(42);
-        $labelMock->expects($this->once())->method('getLabel')->willReturn('labelLabel');
-        $optionMock->expects($this->once())->method('getIsDefault')->willReturn(true);
+        $optionMock = $this->getAttributeOption();
+        $labelMock = $this->getAttributeOptionLabel();
+        /** @var SourceInterface|MockObject $sourceMock */
+        $sourceMock = $this->createMock(EavAttributeSource::class);
+        /** @var EavAbstractAttribute|MockObject $attributeMock */
+        $attributeMock = $this->getMockBuilder(EavAbstractAttribute::class)
+            ->disableOriginalConstructor()
+            ->addMethods(['setDefault', 'setOption', 'setStoreId'])
+            ->onlyMethods(['usesSource', 'getSource', 'getAttributeCode'])
+            ->getMock();
+        $attributeMock->method('usesSource')->willReturn(true);
         $attributeMock->expects($this->once())->method('setDefault')->with(['id_new_option']);
         $attributeMock->expects($this->once())->method('setOption')->with($option);
+        $attributeMock->method('getSource')->willReturn($sourceMock);
+        $attributeMock->method('getAttributeCode')->willReturn($attributeCode);
+        $this->attributeRepositoryMock->expects($this->once())
+            ->method('get')
+            ->with($entityType, $attributeCode)
+            ->willReturn($attributeMock);
+        $optionMock->method('getLabel')->willReturn($label);
+        $optionMock->method('getSortOrder')->willReturn($sortOder);
+        $optionMock->method('getIsDefault')->willReturn(true);
+        $optionMock->method('getStoreLabels')->willReturn([$labelMock]);
+        $labelMock->method('getStoreId')->willReturn($storeId);
+        $labelMock->method('getLabel')->willReturn($storeLabel);
+
         $this->resourceModelMock->expects($this->once())->method('save')->with($attributeMock)
             ->willThrowException(new \Exception());
         $this->model->add($entityType, $attributeCode, $optionMock);
     }
 
+    /**
+     * Test to delete attribute option
+     */
     public function testDelete()
     {
         $entityType = 42;
         $attributeCode = 'atrCode';
         $optionId = 'option';
-        $attributeMock = $this->getMockForAbstractClass(
-            AbstractModel::class,
-            [],
-            '',
-            false,
-            false,
-            true,
-            ['usesSource', 'getSource', 'getId', 'getOptionText', 'addData']
-        );
+
+        /** @var EavAbstractAttribute|MockObject $attributeMock */
+        $attributeMock = $this->getMockBuilder(EavAbstractAttribute::class)
+            ->disableOriginalConstructor()
+            ->addMethods(['getOptionText'])
+            ->onlyMethods(['usesSource', 'getSource', 'getId', 'addData'])
+            ->getMock();
         $removalMarker = [
             'option' => [
                 'value' => [$optionId => []],
                 'delete' => [$optionId => '1'],
             ],
         ];
-        $this->attributeRepositoryMock->expects($this->once())->method('get')->with($entityType, $attributeCode)
+        $this->attributeRepositoryMock->expects($this->once())
+            ->method('get')
+            ->with($entityType, $attributeCode)
             ->willReturn($attributeMock);
         $attributeMock->expects($this->once())->method('usesSource')->willReturn(true);
         $attributeMock->expects($this->once())->method('getSource')->willReturnSelf();
@@ -175,22 +250,23 @@ public function testDelete()
         $this->assertTrue($this->model->delete($entityType, $attributeCode, $optionId));
     }
 
+    /**
+     * Test to delete attribute option with save exception
+     */
     public function testDeleteWithCannotSaveException()
     {
-        $this->expectException('Magento\Framework\Exception\StateException');
         $this->expectExceptionMessage('The "atrCode" attribute can\'t be saved.');
+        $this->expectException(StateException::class);
+
         $entityType = 42;
         $attributeCode = 'atrCode';
         $optionId = 'option';
-        $attributeMock = $this->getMockForAbstractClass(
-            AbstractModel::class,
-            [],
-            '',
-            false,
-            false,
-            true,
-            ['usesSource', 'getSource', 'getId', 'getOptionText', 'addData']
-        );
+        /** @var EavAbstractAttribute|MockObject $attributeMock */
+        $attributeMock = $this->getMockBuilder(EavAbstractAttribute::class)
+            ->disableOriginalConstructor()
+            ->addMethods(['getOptionText'])
+            ->onlyMethods(['usesSource', 'getSource', 'getId', 'addData'])
+            ->getMock();
         $removalMarker = [
             'option' => [
                 'value' => [$optionId => []],
@@ -204,28 +280,29 @@ public function testDeleteWithCannotSaveException()
         $attributeMock->expects($this->once())->method('getOptionText')->willReturn('optionText');
         $attributeMock->expects($this->never())->method('getId');
         $attributeMock->expects($this->once())->method('addData')->with($removalMarker);
-        $this->resourceModelMock->expects($this->once())->method('save')->with($attributeMock)
+        $this->resourceModelMock->expects($this->once())
+            ->method('save')
+            ->with($attributeMock)
             ->willThrowException(new \Exception());
         $this->model->delete($entityType, $attributeCode, $optionId);
     }
 
+    /**
+     * Test to delete with wrong option
+     */
     public function testDeleteWithWrongOption()
     {
-        $this->expectException('Magento\Framework\Exception\NoSuchEntityException');
         $this->expectExceptionMessage('The "atrCode" attribute doesn\'t include an option with "option" ID.');
+        $this->expectException(NoSuchEntityException::class);
+
         $entityType = 42;
         $attributeCode = 'atrCode';
         $optionId = 'option';
-        $attributeMock = $this->getMockForAbstractClass(
-            AbstractModel::class,
-            [],
-            '',
-            false,
-            false,
-            true,
-            ['usesSource', 'getSource', 'getAttributeCode']
-        );
-        $this->attributeRepositoryMock->expects($this->once())->method('get')->with($entityType, $attributeCode)
+        /** @var EavAbstractAttribute|MockObject $attributeMock */
+        $attributeMock = $this->createMock(EavAbstractAttribute::class);
+        $this->attributeRepositoryMock->expects($this->once())
+            ->method('get')
+            ->with($entityType, $attributeCode)
             ->willReturn($attributeMock);
         $sourceMock = $this->getMockForAbstractClass(SourceInterface::class);
         $sourceMock->expects($this->once())->method('getOptionText')->willReturn(false);
@@ -236,33 +313,40 @@ public function testDeleteWithWrongOption()
         $this->model->delete($entityType, $attributeCode, $optionId);
     }
 
+    /**
+     * Test to delete with absent option
+     */
     public function testDeleteWithAbsentOption()
     {
-        $this->expectException('Magento\Framework\Exception\StateException');
-        $this->expectExceptionMessage('The "atrCode" attribute has no option.');
+        $this->expectExceptionMessage('The "atrCode" attribute doesn\'t work with options.');
+        $this->expectException(StateException::class);
+
         $entityType = 42;
         $attributeCode = 'atrCode';
         $optionId = 'option';
-        $attributeMock = $this->getMockForAbstractClass(
-            AbstractModel::class,
-            [],
-            '',
-            false,
-            false,
-            true,
-            ['usesSource', 'getSource', 'getId', 'getOptionText', 'addData']
-        );
-        $this->attributeRepositoryMock->expects($this->once())->method('get')->with($entityType, $attributeCode)
+        /** @var EavAbstractAttribute|MockObject $attributeMock */
+        $attributeMock = $this->getMockBuilder(EavAbstractAttribute::class)
+            ->disableOriginalConstructor()
+            ->addMethods(['getOptionText'])
+            ->onlyMethods(['usesSource', 'getSource', 'getId', 'addData'])
+            ->getMock();
+        $this->attributeRepositoryMock->expects($this->once())
+            ->method('get')
+            ->with($entityType, $attributeCode)
             ->willReturn($attributeMock);
         $attributeMock->expects($this->once())->method('usesSource')->willReturn(false);
         $this->resourceModelMock->expects($this->never())->method('save');
         $this->model->delete($entityType, $attributeCode, $optionId);
     }
 
+    /**
+     * Test to delete with empty attribute code
+     */
     public function testDeleteWithEmptyAttributeCode()
     {
-        $this->expectException('Magento\Framework\Exception\InputException');
-        $this->expectExceptionMessage('The attribute code is empty. Enter the code and try again.');
+        $this->expectExceptionMessage("The attribute code is empty. Enter the code and try again.");
+        $this->expectException(InputException::class);
+
         $entityType = 42;
         $attributeCode = '';
         $optionId = 'option';
@@ -270,86 +354,56 @@ public function testDeleteWithEmptyAttributeCode()
         $this->model->delete($entityType, $attributeCode, $optionId);
     }
 
+    /**
+     * Test to get items
+     */
     public function testGetItems()
     {
         $entityType = 42;
         $attributeCode = 'atrCode';
-        $attributeMock = $this->getMockForAbstractClass(
-            AbstractModel::class,
-            [],
-            '',
-            false,
-            false,
-            true,
-            ['getOptions']
-        );
-        $optionsMock = [$this->getMockForAbstractClass(EavAttributeOptionInterface::class)];
-        $this->attributeRepositoryMock->expects($this->once())->method('get')->with($entityType, $attributeCode)
+        $attributeMock = $this->createMock(EavAbstractAttribute::class);
+        $optionsMock = [$this->createMock(EavAttributeOptionInterface::class)];
+        $this->attributeRepositoryMock->expects($this->once())
+            ->method('get')
+            ->with($entityType, $attributeCode)
             ->willReturn($attributeMock);
         $attributeMock->expects($this->once())->method('getOptions')->willReturn($optionsMock);
         $this->assertEquals($optionsMock, $this->model->getItems($entityType, $attributeCode));
     }
 
+    /**
+     * Test to get items with load exception
+     */
     public function testGetItemsWithCannotLoadException()
     {
-        $this->expectException('Magento\Framework\Exception\StateException');
         $this->expectExceptionMessage('The options for "atrCode" attribute can\'t be loaded.');
+        $this->expectException(StateException::class);
         $entityType = 42;
         $attributeCode = 'atrCode';
-        $attributeMock = $this->getMockForAbstractClass(
-            AbstractModel::class,
-            [],
-            '',
-            false,
-            false,
-            true,
-            ['getOptions']
-        );
-        $this->attributeRepositoryMock->expects($this->once())->method('get')->with($entityType, $attributeCode)
+        $attributeMock = $this->createMock(EavAbstractAttribute::class);
+        $this->attributeRepositoryMock->expects($this->once())
+            ->method('get')
+            ->with($entityType, $attributeCode)
             ->willReturn($attributeMock);
-        $attributeMock->expects($this->once())->method('getOptions')->willThrowException(new \Exception());
+        $attributeMock->expects($this->once())
+            ->method('getOptions')
+            ->willThrowException(new \Exception());
         $this->model->getItems($entityType, $attributeCode);
     }
 
+    /**
+     * Test to get items with empty attribute code
+     */
     public function testGetItemsWithEmptyAttributeCode()
     {
-        $this->expectException('Magento\Framework\Exception\InputException');
-        $this->expectExceptionMessage('The attribute code is empty. Enter the code and try again.');
+        $this->expectExceptionMessage("The attribute code is empty. Enter the code and try again.");
+        $this->expectException(InputException::class);
+
         $entityType = 42;
         $attributeCode = '';
         $this->model->getItems($entityType, $attributeCode);
     }
 
-    /**
-     * Returns attribute entity mock.
-     *
-     * @param array $attributeOptions attribute options for return
-     * @return MockObject|EavAbstractAttribute
-     */
-    private function getAttribute(array $attributeOptions = [])
-    {
-        $attribute = $this->getMockBuilder(EavAbstractAttribute::class)
-            ->disableOriginalConstructor()
-            ->setMethods(
-                [
-                    'usesSource',
-                    'setDefault',
-                    'setOption',
-                    'setStoreId',
-                    'getSource',
-                ]
-            )
-            ->getMock();
-        $source = $this->getMockBuilder(EavAttributeSource::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $attribute->method('getSource')->willReturn($source);
-        $source->method('toOptionArray')->willReturn($attributeOptions);
-
-        return $attribute;
-    }
-
     /**
      * Return attribute option entity mock.
      *
diff --git a/app/code/Magento/Swatches/Plugin/Eav/Model/Entity/Attribute/OptionManagement.php b/app/code/Magento/Swatches/Plugin/Eav/Model/Entity/Attribute/OptionManagement.php
index 795c48f12ebcc..43a44534aa942 100644
--- a/app/code/Magento/Swatches/Plugin/Eav/Model/Entity/Attribute/OptionManagement.php
+++ b/app/code/Magento/Swatches/Plugin/Eav/Model/Entity/Attribute/OptionManagement.php
@@ -8,6 +8,9 @@
 namespace Magento\Swatches\Plugin\Eav\Model\Entity\Attribute;
 
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Model\Product\Attribute\OptionManagement as CatalogOptionManagement;
+use Magento\Eav\Api\Data\AttributeInterface;
+use Magento\Eav\Api\Data\AttributeOptionInterface;
 use Magento\Eav\Model\AttributeRepository;
 use Magento\Store\Model\Store;
 use Magento\Swatches\Helper\Data;
@@ -41,28 +44,61 @@ public function __construct(
     /**
      * Add swatch value to the attribute option
      *
-     * @param \Magento\Catalog\Model\Product\Attribute\OptionManagement $subject
+     * @param CatalogOptionManagement $subject
      * @param string $attributeCode
-     * @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
+     * @param AttributeOptionInterface $option
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function beforeAdd(
-        \Magento\Catalog\Model\Product\Attribute\OptionManagement $subject,
+        CatalogOptionManagement $subject,
         ?string $attributeCode,
-        \Magento\Eav\Api\Data\AttributeOptionInterface $option
+        AttributeOptionInterface $option
     ) {
-        if (empty($attributeCode)) {
+        $attribute = $this->initAttribute($attributeCode);
+        if (!$attribute) {
             return;
         }
-        $attribute = $this->attributeRepository->get(
-            ProductAttributeInterface::ENTITY_TYPE_CODE,
-            $attributeCode
-        );
-        if (!$attribute || !$this->swatchHelper->isSwatchAttribute($attribute)) {
+
+        $optionId = $this->getNewOptionId($option);
+        $this->setSwatchAttributeOption($attribute, $option, $optionId);
+    }
+
+    /**
+     * Update swatch value of attribute option
+     *
+     * @param CatalogOptionManagement $subject
+     * @param string $attributeCode
+     * @param int $optionId
+     * @param AttributeOptionInterface $option
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeUpdate(
+        CatalogOptionManagement $subject,
+        $attributeCode,
+        $optionId,
+        AttributeOptionInterface $option
+    ) {
+        $attribute = $this->initAttribute($attributeCode);
+        if (!$attribute) {
             return;
         }
-        $optionId = $this->getOptionId($option);
-        $optionsValue = $option->getValue();
+
+        $this->setSwatchAttributeOption($attribute, $option, (string)$optionId);
+    }
+
+    /**
+     * Set attribute swatch option
+     *
+     * @param AttributeInterface $attribute
+     * @param AttributeOptionInterface $option
+     * @param string $optionId
+     */
+    private function setSwatchAttributeOption(
+        AttributeInterface $attribute,
+        AttributeOptionInterface $option,
+        string $optionId
+    ): void {
+        $optionsValue = trim($option->getValue() ?: '');
         if ($this->swatchHelper->isVisualSwatch($attribute)) {
             $attribute->setData('swatchvisual', ['value' => [$optionId => $optionsValue]]);
         } else {
@@ -80,13 +116,40 @@ public function beforeAdd(
     }
 
     /**
-     * Returns option id
+     * Init swatch attribute
      *
-     * @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
+     * @param string $attributeCode
+     * @return bool|AttributeInterface
+     */
+    private function initAttribute($attributeCode)
+    {
+        if (empty($attributeCode)) {
+            return false;
+        }
+        $attribute = $this->attributeRepository->get(
+            ProductAttributeInterface::ENTITY_TYPE_CODE,
+            $attributeCode
+        );
+        if (!$attribute || !$this->swatchHelper->isSwatchAttribute($attribute)) {
+            return false;
+        }
+
+        return $attribute;
+    }
+
+    /**
+     * Get option id to create new option
+     *
+     * @param AttributeOptionInterface $option
      * @return string
      */
-    private function getOptionId(\Magento\Eav\Api\Data\AttributeOptionInterface $option) : string
+    private function getNewOptionId(AttributeOptionInterface $option): string
     {
-        return 'id_' . ($option->getValue() ?: 'new_option');
+        $optionId = trim($option->getValue() ?: '');
+        if (empty($optionId)) {
+            $optionId = 'new_option';
+        }
+
+        return 'id_' . $optionId;
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeOptionManagementInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeOptionManagementInterfaceTest.php
index 64f51b93cde50..b13e873902609 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeOptionManagementInterfaceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeOptionManagementInterfaceTest.php
@@ -7,14 +7,21 @@
 
 use Magento\Eav\Api\Data\AttributeOptionInterface;
 use Magento\Eav\Api\Data\AttributeOptionLabelInterface;
+use Magento\Framework\Webapi\Rest\Request;
 use Magento\TestFramework\TestCase\WebapiAbstract;
 
+/**
+ * Class to test Eav Option Management functionality
+ */
 class ProductAttributeOptionManagementInterfaceTest extends WebapiAbstract
 {
     const SERVICE_NAME = 'catalogProductAttributeOptionManagementV1';
     const SERVICE_VERSION = 'V1';
     const RESOURCE_PATH = '/V1/products/attributes';
 
+    /**
+     * Test to get attribute options
+     */
     public function testGetItems()
     {
         $testAttributeCode = 'quantity_and_stock_status';
@@ -32,7 +39,7 @@ public function testGetItems()
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => self::RESOURCE_PATH . '/' . $testAttributeCode . '/options',
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
+                'httpMethod' => Request::HTTP_METHOD_GET,
             ],
             'soap' => [
                 'service' => self::SERVICE_NAME,
@@ -48,45 +55,44 @@ public function testGetItems()
     }
 
     /**
+     * Test to add attribute option
+     *
+     * @param array $optionData
      * @magentoApiDataFixture Magento/Catalog/Model/Product/Attribute/_files/select_attribute.php
      * @dataProvider addDataProvider
      */
-    public function testAdd($optionData)
+    public function testAdd(array $optionData)
     {
         $testAttributeCode = 'select_attribute';
-        $serviceInfo = [
-            'rest' => [
-                'resourcePath' => self::RESOURCE_PATH . '/' . $testAttributeCode . '/options',
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
-            ],
-            'soap' => [
-                'service' => self::SERVICE_NAME,
-                'serviceVersion' => self::SERVICE_VERSION,
-                'operation' => self::SERVICE_NAME . 'add',
-            ],
-        ];
-
-        $response = $this->_webApiCall(
-            $serviceInfo,
+        $response = $this->webApiCallAttributeOptions(
+            $testAttributeCode,
+            Request::HTTP_METHOD_POST,
+            'add',
             [
                 'attributeCode' => $testAttributeCode,
                 'option' => $optionData,
             ]
         );
 
-        $this->assertNotNull($response);
-        $updatedData = $this->getAttributeOptions($testAttributeCode);
-        $lastOption = array_pop($updatedData);
-        $this->assertEquals(
-            $optionData[AttributeOptionInterface::STORE_LABELS][0][AttributeOptionLabelInterface::LABEL],
-            $lastOption['label']
-        );
+        $this->assertTrue(is_numeric($response));
+        /* Check new option labels by stores */
+        $expectedStoreLabels = [
+            'all' => $optionData[AttributeOptionLabelInterface::LABEL],
+            'default' => $optionData[AttributeOptionInterface::STORE_LABELS][0][AttributeOptionLabelInterface::LABEL],
+        ];
+        foreach ($expectedStoreLabels as $store => $label) {
+            $option = $this->getAttributeOption($testAttributeCode, $label, $store);
+            $this->assertNotNull($option);
+            $this->assertEquals($response, $option['value']);
+        }
     }
 
     /**
+     * Data provider for adding attribute option
+     *
      * @return array
      */
-    public function addDataProvider()
+    public function addDataProvider(): array
     {
         $optionPayload = [
             AttributeOptionInterface::LABEL => 'new color',
@@ -114,62 +120,243 @@ public function addDataProvider()
             'option_with_value_node_that_is_a_number' => [
                 array_merge($optionPayload, [AttributeOptionInterface::VALUE => '123'])
             ],
+        ];
+    }
+
+    /**
+     * Test to update attribute option
+     *
+     * @magentoApiDataFixture Magento/Catalog/Model/Product/Attribute/_files/select_attribute.php
+     */
+    public function testUpdate()
+    {
+        $testAttributeCode = 'select_attribute';
+        $optionData = [
+            AttributeOptionInterface::LABEL => 'Fixture Option Changed',
+            AttributeOptionInterface::VALUE => 'option_value',
+            AttributeOptionInterface::STORE_LABELS => [
+                [
+                    AttributeOptionLabelInterface::LABEL => 'Store Label Changed',
+                    AttributeOptionLabelInterface::STORE_ID => 1,
+                ],
+            ],
+        ];
+
+        $existOptionLabel = 'Fixture Option';
+        $existAttributeOption = $this->getAttributeOption($testAttributeCode, $existOptionLabel, 'all');
+        $optionId = $existAttributeOption['value'];
+
+        $response = $this->webApiCallAttributeOptions(
+            $testAttributeCode,
+            Request::HTTP_METHOD_PUT,
+            'update',
+            [
+                'attributeCode' => $testAttributeCode,
+                'optionId' => $optionId,
+                'option' => $optionData,
+            ],
+            $optionId
+        );
+
+        $this->assertTrue($response);
+
+        /* Check update option labels by stores */
+        $expectedStoreLabels = [
+            'all' => $optionData[AttributeOptionLabelInterface::LABEL],
+            'default' => $optionData[AttributeOptionInterface::STORE_LABELS][0][AttributeOptionLabelInterface::LABEL],
+        ];
+        foreach ($expectedStoreLabels as $store => $label) {
+            $this->assertNotNull($this->getAttributeOption($testAttributeCode, $label, $store));
+        }
+    }
+
+    /**
+     * Test to update option with already exist exception
+     *
+     * Test to except case when the two options has a same label
+     *
+     * @magentoApiDataFixture Magento/Catalog/Model/Product/Attribute/_files/select_attribute.php
+     */
+    public function testUpdateWithAlreadyExistsException()
+    {
+        $this->expectExceptionMessage("Admin store attribute option label '%1' is already exists.");
+        $testAttributeCode = 'select_attribute';
+
+        $newOptionData = [
+            AttributeOptionInterface::LABEL => 'New Option',
+            AttributeOptionInterface::VALUE => 'new_option_value',
+        ];
+        $newOptionId = $this->webApiCallAttributeOptions(
+            $testAttributeCode,
+            Request::HTTP_METHOD_POST,
+            'add',
+            [
+                'attributeCode' => $testAttributeCode,
+                'option' => $newOptionData,
+            ]
+        );
+
+        $editOptionData = [
+            AttributeOptionInterface::LABEL => 'Fixture Option',
+            AttributeOptionInterface::VALUE => $newOptionId,
+        ];
+        $this->webApiCallAttributeOptions(
+            $testAttributeCode,
+            Request::HTTP_METHOD_PUT,
+            'update',
+            [
+                'attributeCode' => $testAttributeCode,
+                'optionId' => $newOptionId,
+                'option' => $editOptionData,
+            ],
+            $newOptionId
+        );
+    }
+
+    /**
+     * Test to update option with not exist exception
+     *
+     * @magentoApiDataFixture Magento/Catalog/Model/Product/Attribute/_files/select_attribute.php
+     */
+    public function testUpdateWithNotExistsException()
+    {
+        $this->expectExceptionMessage("The '%1' attribute doesn't include an option id '%2'.");
+        $testAttributeCode = 'select_attribute';
 
+        $newOptionData = [
+            AttributeOptionInterface::LABEL => 'New Option',
+            AttributeOptionInterface::VALUE => 'new_option_value'
         ];
+        $newOptionId = (int)$this->webApiCallAttributeOptions(
+            $testAttributeCode,
+            Request::HTTP_METHOD_POST,
+            'add',
+            [
+                'attributeCode' => $testAttributeCode,
+                'option' => $newOptionData,
+            ]
+        );
+
+        $newOptionId++;
+        $editOptionData = [
+            AttributeOptionInterface::LABEL => 'New Option Changed',
+            AttributeOptionInterface::VALUE => $newOptionId
+        ];
+        $this->webApiCallAttributeOptions(
+            $testAttributeCode,
+            Request::HTTP_METHOD_PUT,
+            'update',
+            [
+                'attributeCode' => $testAttributeCode,
+                'optionId' => $newOptionId,
+                'option' => $editOptionData,
+            ],
+            $newOptionId
+        );
     }
 
     /**
+     * Test to delete attribute option
+     *
      * @magentoApiDataFixture Magento/Catalog/Model/Product/Attribute/_files/select_attribute.php
      */
     public function testDelete()
     {
         $attributeCode = 'select_attribute';
-        //get option Id
         $optionList = $this->getAttributeOptions($attributeCode);
         $this->assertGreaterThan(0, count($optionList));
         $lastOption = array_pop($optionList);
         $this->assertNotEmpty($lastOption['value']);
         $optionId = $lastOption['value'];
 
-        $serviceInfo = [
-            'rest' => [
-                'resourcePath' => self::RESOURCE_PATH . '/' . $attributeCode . '/options/' . $optionId,
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_DELETE,
-            ],
-            'soap' => [
-                'service' => self::SERVICE_NAME,
-                'serviceVersion' => self::SERVICE_VERSION,
-                'operation' => self::SERVICE_NAME . 'delete',
-            ],
-        ];
-        $this->assertTrue($this->_webApiCall(
-            $serviceInfo,
+        $response = $this->webApiCallAttributeOptions(
+            $attributeCode,
+            Request::HTTP_METHOD_DELETE,
+            'delete',
             [
                 'attributeCode' => $attributeCode,
                 'optionId' => $optionId,
-            ]
-        ));
+            ],
+            $optionId
+        );
+        $this->assertTrue($response);
         $updatedOptions = $this->getAttributeOptions($attributeCode);
         $this->assertEquals($optionList, $updatedOptions);
     }
 
     /**
-     * @param $testAttributeCode
+     * Perform Web API call to the system under test
+     *
+     * @param string $attributeCode
+     * @param string $httpMethod
+     * @param string $soapMethod
+     * @param array $arguments
+     * @param null $storeCode
+     * @param null $optionId
      * @return array|bool|float|int|string
      */
-    private function getAttributeOptions($testAttributeCode)
-    {
+    private function webApiCallAttributeOptions(
+        string $attributeCode,
+        string $httpMethod,
+        string $soapMethod,
+        array $arguments = [],
+        $optionId = null,
+        $storeCode = null
+    ) {
         $serviceInfo = [
             'rest' => [
-                'resourcePath' => self::RESOURCE_PATH . '/' . $testAttributeCode . '/options',
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
+                'resourcePath' => self::RESOURCE_PATH . '/' . $attributeCode . '/options'
+                    . ($optionId ? '/' .$optionId : ''),
+                'httpMethod' => $httpMethod,
             ],
             'soap' => [
                 'service' => self::SERVICE_NAME,
                 'serviceVersion' => self::SERVICE_VERSION,
-                'operation' => self::SERVICE_NAME . 'getItems',
+                'operation' => self::SERVICE_NAME . $soapMethod,
             ],
         ];
-        return $this->_webApiCall($serviceInfo, ['attributeCode' => $testAttributeCode]);
+
+        return $this->_webApiCall($serviceInfo, $arguments, null, $storeCode);
+    }
+
+    /**
+     * @param string $testAttributeCode
+     * @param string|null $storeCode
+     * @return array|bool|float|int|string
+     */
+    private function getAttributeOptions(string $testAttributeCode, ?string $storeCode = null)
+    {
+        return $this->webApiCallAttributeOptions(
+            $testAttributeCode,
+            Request::HTTP_METHOD_GET,
+            'getItems',
+            ['attributeCode' => $testAttributeCode],
+            null,
+            $storeCode
+        );
+    }
+
+    /**
+     * @param string $attributeCode
+     * @param string $optionLabel
+     * @param string|null $storeCode
+     * @return array|null
+     */
+    private function getAttributeOption(
+        string $attributeCode,
+        string $optionLabel,
+        ?string $storeCode = null
+    ): ?array {
+        $attributeOptions = $this->getAttributeOptions($attributeCode, $storeCode);
+        $option = null;
+        /** @var array $attributeOption */
+        foreach ($attributeOptions as $attributeOption) {
+            if ($attributeOption['label'] === $optionLabel) {
+                $option = $attributeOption;
+                break;
+            }
+        }
+
+        return $option;
     }
 }

From 99b14a21ddfabe96b76683985e3454a2a3c635c3 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Tue, 2 Jun 2020 08:39:11 -0500
Subject: [PATCH 0350/1718] MC-34416: Error in the CLI during upgrade

---
 setup/src/Magento/Setup/Model/SearchConfig.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/setup/src/Magento/Setup/Model/SearchConfig.php b/setup/src/Magento/Setup/Model/SearchConfig.php
index 2b660077d1f5b..0f26736fb686e 100644
--- a/setup/src/Magento/Setup/Model/SearchConfig.php
+++ b/setup/src/Magento/Setup/Model/SearchConfig.php
@@ -7,7 +7,7 @@
 
 namespace Magento\Setup\Model;
 
-use Magento\Framework\App\Config;
+use Magento\Framework\Config\CacheInterface;
 use Magento\Framework\Setup\Option\AbstractConfigOption;
 use Magento\Framework\Validation\ValidationException;
 use Magento\Search\Model\SearchEngine\Validator;
@@ -35,26 +35,26 @@ class SearchConfig
     private $installConfig;
 
     /**
-     * @var Config
+     * @var CacheInterface
      */
-    private $appConfig;
+    private $cache;
 
     /**
      * @param SearchConfigOptionsList $searchConfigOptionsList
      * @param Validator $searchValidator
      * @param CompositeInstallConfig $installConfig
-     * @param Config $appConfig
+     * @param CacheInterface $cache
      */
     public function __construct(
         SearchConfigOptionsList $searchConfigOptionsList,
         Validator $searchValidator,
         CompositeInstallConfig $installConfig,
-        Config $appConfig
+        CacheInterface $cache
     ) {
         $this->searchConfigOptionsList = $searchConfigOptionsList;
         $this->searchValidator = $searchValidator;
         $this->installConfig = $installConfig;
-        $this->appConfig = $appConfig;
+        $this->cache = $cache;
     }
 
     /**
@@ -85,8 +85,8 @@ public function saveConfiguration(array $inputOptions)
      */
     public function validateSearchEngine()
     {
-        //Clean config cache prior to validation
-        $this->appConfig->clean();
+        // Clean config cache prior to validation
+        $this->cache->clean();
 
         $validationErrors = $this->searchValidator->validate();
         if (!empty($validationErrors)) {

From a63aaa342bcb71ef0b5c61b19d63897d08ddca5a Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Tue, 2 Jun 2020 10:43:32 -0500
Subject: [PATCH 0351/1718] MC-34764: Fix performance degradation cause by CSP

---
 .../Magento/Backend/Block/Widget/Button.php   |  2 +-
 .../Block/Widget/Button/SplitButton.php       |  2 +-
 .../Widget/Grid/Column/Renderer/Action.php    |  2 +-
 .../Widget/Grid/Column/Renderer/Checkbox.php  |  2 +-
 .../catalog/product/composite/configure.phtml | 38 +++++++------------
 .../product/image_with_borders.phtml          | 17 +++++----
 .../Block/Adminhtml/Edit/Renderer/Region.php  |  3 +-
 .../Adminhtml/Grid/Renderer/Multiaction.php   |  2 +-
 .../account/authentication-popup.phtml        |  3 +-
 .../Widget/Grid/Column/Renderer/Button.php    |  2 +-
 .../templates/product/layered/renderer.phtml  | 35 +++++++++++------
 .../frontend/templates/js/cookie_status.phtml |  5 ++-
 .../Magento/Ui/Component/Control/Button.php   |  2 +-
 .../Ui/Component/Control/SplitButton.php      |  2 +-
 .../Data/Form/Element/AbstractElement.php     |  2 +-
 .../Data/Form/Element/Editablemultiselect.php |  2 +-
 .../Framework/Data/Form/Element/Editor.php    |  2 +-
 .../Framework/Data/Form/Element/Gallery.php   |  2 +-
 .../Framework/Data/Form/Element/Image.php     |  2 +-
 .../Data/Form/Element/Multiselect.php         |  7 ++--
 .../Framework/Data/Form/Element/Select.php    |  2 +-
 .../Framework/View/Element/Html/Link.php      |  2 +-
 .../View/Helper/SecureHtmlRenderer.php        | 17 ++++-----
 23 files changed, 79 insertions(+), 76 deletions(-)

diff --git a/app/code/Magento/Backend/Block/Widget/Button.php b/app/code/Magento/Backend/Block/Widget/Button.php
index 6dba39bdee7e8..3b5eca6a61779 100644
--- a/app/code/Magento/Backend/Block/Widget/Button.php
+++ b/app/code/Magento/Backend/Block/Widget/Button.php
@@ -162,7 +162,7 @@ protected function _beforeToHtml()
     {
         parent::_beforeToHtml();
 
-        $buttonId = 'buttonId' .$this->random->getRandomString(32);
+        $buttonId = 'buttonId' .$this->random->getRandomString(10);
         $this->setData('backend_button_widget_hook_id', $buttonId);
 
         $afterHtml = $this->getAfterHtml();
diff --git a/app/code/Magento/Backend/Block/Widget/Button/SplitButton.php b/app/code/Magento/Backend/Block/Widget/Button/SplitButton.php
index 0e3d51dfe3721..8075139368ab1 100644
--- a/app/code/Magento/Backend/Block/Widget/Button/SplitButton.php
+++ b/app/code/Magento/Backend/Block/Widget/Button/SplitButton.php
@@ -243,7 +243,7 @@ private function identifyOption(array $option): string
             ? $this->getId() .'-' .$option['id']
             : (isset($option['id_attribute']) ?
                 $option['id_attribute']
-                : $this->getId() .'-optId' .$this->random->getRandomString(32));
+                : $this->getId() .'-optId' .$this->random->getRandomString(10));
     }
 
     /**
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php
index c12b0c0e11b7b..0da7e4db9b983 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php
@@ -132,7 +132,7 @@ protected function _toLinkHtml($action, \Magento\Framework\DataObject $row)
         }
 
         if (empty($action['id'])) {
-            $action['id'] = 'id' .$this->random->getRandomString(32);
+            $action['id'] = 'id' .$this->random->getRandomString(10);
         }
         $actionAttributes->setData($action);
         $onclick = $actionAttributes->getData('onclick');
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php
index 6609e03baeed3..013c3b7e105f5 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php
@@ -176,7 +176,7 @@ public function renderHeader()
         if ($this->getColumn()->getDisabled()) {
             $disabled = ' disabled="disabled"';
         }
-        $id = 'id' .$this->random->getRandomString(32);
+        $id = 'id' .$this->random->getRandomString(10);
         $html = '<th class="data-grid-th data-grid-actions-cell"><input type="checkbox" ';
         $html .= 'id="' .$id .'" ';
         $html .= 'name="' . $this->getColumn()->getFieldName() . '" ';
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
index cc940a87bc051..24aa060e3259a 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
@@ -13,10 +13,6 @@
         "window.productConfigure && productConfigure.onLoadIFrame()",
         'iframe[name=\'product_composite_configure_iframe\']:last-of-type'
     ) ?>
-    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-        "width:0; height:0; border:0px solid #fff; position:absolute; top:-1000px; left:-1000px",
-        'iframe[name=\'product_composite_configure_iframe\']:last-of-type'
-    ) ?>
 
     <form action="" method="post" id="product_composite_configure_form" enctype="multipart/form-data"
           target="product_composite_configure_iframe" class="product_composite_configure_form">
@@ -24,22 +20,10 @@
             <div id="product_composite_configure_messages" class="product_composite_configure_messages">
                 <div class="messages"><div class="message message-error error"><div></div></div></div>
             </div>
-            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-                'display:none;',
-                '.product_composite_configure_messages:last-of-type'
-            ) ?>
             <div id="product_composite_configure_form_fields" class="content product-composite-configure-inner"></div>
             <div id="product_composite_configure_form_additional" class="product_composite_configure_form_additional">
             </div>
-            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-                'display:none;',
-                '.product_composite_configure_form_additional:last-of-type'
-            ) ?>
             <div id="product_composite_configure_form_confirmed" class="product_composite_configure_form_confirmed"></div>
-            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-                'display:none;',
-                '.product_composite_configure_form_confirmed:last-of-type'
-            ) ?>
         </div>
         <input type="hidden" name="as_js_varname" value="iFrameResponse" />
         <input type="hidden" name="form_key" value="<?= $block->escapeHtmlAttr($block->getFormKey()) ?>" />
@@ -51,12 +35,21 @@
     ) ?>
 
     <div id="product_composite_configure_confirmed" class="product_composite_configure_confirmed"></div>
-    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-        'display:none;',
-        '.product_composite_configure_confirmed:last-of-type'
-    ) ?>
 
     <?php $scriptString = <<<script
+        prodCompConfIframe = document.querySelector("iframe[name='product_composite_configure_iframe']:last-of-type");
+        prodCompConfIframe.style.width = 0;
+        prodCompConfIframe.style.height = 0;
+        prodCompConfIframe.style.border = "0px solid #fff";
+        prodCompConfIframe.style.position = "absolute";
+        prodCompConfIframe.style.top = "-1000px";
+        prodCompConfIframe.style.left = "-1000px";
+        document.querySelector(".product_composite_configure_messages:last-of-type").style.display = "none";
+        document.querySelector(".product_composite_configure_form_additional:last-of-type").style.display = "none";
+        document.querySelector(".product_composite_configure_form_confirmed:last-of-type").style.display = "none";
+        document.querySelector(".product_composite_configure_confirmed:last-of-type").style.display = "none";
+        document.querySelector(".product-configure-popup:last-of-type").style.display = "none";
+
         require([
             "jquery",
             "mage/mage"
@@ -69,8 +62,3 @@ script;
     ?>
     <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
 </div>
-<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-    'display:none',
-    '.product-configure-popup:last-of-type'
-) ?>
-
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
index ce21a2473f7a5..ead23a150629b 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
@@ -18,6 +18,8 @@ $enableLazyLoadingWithoutBorders = (bool)$block->getVar(
     'enable_lazy_loading_for_images_without_borders',
     'Magento_Catalog'
 );
+$width = (int)$block->getWidth();
+$padding = $block->getRatio() * 100;
 ?>
 <span class="product-image-container" id="product-image-container-<?= /* @noEscape */ $block->getProductId() ?>">
     <span class="product-image-wrapper">
@@ -36,11 +38,10 @@ $enableLazyLoadingWithoutBorders = (bool)$block->getVar(
             <?php endif; ?>
             alt="<?= $escaper->escapeHtmlAttr($block->getLabel()) ?>"/></span>
 </span>
-<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-    'width:' . (int)$block->getWidth() . 'px;',
-    '#product-image-container-' . $block->getProductId()
-) ?>
-<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-    'padding-bottom: '. ($block->getRatio() * 100) . '%;',
-    '#product-image-container-' . $block->getProductId() . ' span.product-image-wrapper'
-) ?>
+<?php
+$script = <<<SCRIPT
+document.querySelector('#product-image-container-{$block->getProductId()}').style.width = '{$width}px';
+document.querySelector('#product-image-container-{$block->getProductId()} span.product-image-wrapper').style.paddingBottom = '{$padding}%'
+SCRIPT;
+echo /* @noEscape */$secureRenderer->renderTag('script', ['type' => 'text/javascript'], $script, false);
+?>
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Region.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Region.php
index afe040ee28a95..ad1e7989239f3 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Region.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Region.php
@@ -74,9 +74,8 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
             '" class="select required-entry admin__control-select">';
         $html .= '<option value="">' . __('Please select') . '</option>';
         $html .= '</select>';
-        $html .= $this->secureRenderer->renderStyleAsTag("display:none", '#region');
 
-        $scriptString = "\n";
+        $scriptString = "\ndocument.querySelector('#$selectId').style.display = 'none';\n";
         $scriptString .= 'require(["prototype", "mage/adminhtml/form"], function(){';
         $scriptString .= '$("' . $selectId . '").setAttribute("defaultValue", "' . $regionId . '");' . "\n";
         $scriptString .= 'new regionUpdater("' .
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Grid/Renderer/Multiaction.php b/app/code/Magento/Customer/Block/Adminhtml/Grid/Renderer/Multiaction.php
index 5de36c60f0212..726daf69dc587 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Grid/Renderer/Multiaction.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Grid/Renderer/Multiaction.php
@@ -85,7 +85,7 @@ protected function _toLinkHtml($action, \Magento\Framework\DataObject $row)
 
         if (isset($action['process']) && $action['process'] == 'configurable') {
             if ($product->canConfigure()) {
-                $id = 'id' .$this->random->getRandomString(32);
+                $id = 'id' .$this->random->getRandomString(10);
                 $onClick = sprintf('return %s.configureItem(%s)', $action['control_object'], $row->getId());
                 return sprintf(
                     '<a href="%s" id="%s" class="configure-item-link">%s</a>%s',
diff --git a/app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml b/app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml
index 55ff54a519afd..edeaf5667b9cf 100644
--- a/app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml
@@ -7,7 +7,7 @@
 /** @var \Magento\Customer\Block\Account\AuthenticationPopup $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<div id="authenticationPopup" data-bind="scope:'authenticationPopup'">
+<div id="authenticationPopup" data-bind="scope:'authenticationPopup', style: {display: 'none'}">
     <?php $scriptString = 'window.authenticationPopup = ' . /* @noEscape */ $block->getSerializedConfig(); ?>
     <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>;
     <!-- ko template: getTemplate() --><!-- /ko -->
@@ -24,4 +24,3 @@
         }
     </script>
 </div>
-<?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display:none', '#authenticationPopup'); ?>
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button.php b/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button.php
index e5f5870c0154a..b34858d098494 100644
--- a/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button.php
+++ b/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Button.php
@@ -53,7 +53,7 @@ public function __construct(
     public function render(DataObject $row)
     {
         $attributes = $this->extractAttributes($row);
-        $attributes['button-renderer-hook-id'] = 'hook' .$this->random->getRandomString(32);
+        $attributes['button-renderer-hook-id'] = 'hook' .$this->random->getRandomString(10);
 
         return sprintf('<button %s>%s</button>', $this->renderAttributes($attributes), $this->_getValue($row))
             .$this->renderSpecialAttributes($attributes);
diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
index 2f113230e28cf..f72f914233134 100644
--- a/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
+++ b/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
@@ -9,6 +9,7 @@
 
 /** @var $block \Magento\Swatches\Block\LayeredNavigation\RenderLayered */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/** @var \Magento\Framework\Escaper $escaper */
 ?>
 <?php $swatchData = $block->getSwatchData(); ?>
 <div class="swatch-attribute swatch-layered <?= $block->escapeHtmlAttr($swatchData['attribute_code']) ?>"
@@ -52,11 +53,16 @@
                                  data-option-tooltip-thumb="<?= $block->escapeUrl($swatchThumbPath) ?>"
                                  data-option-tooltip-value="">
                             </div>
-                            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-                                'background: url(' . /*  @noEscape */ $escapedUrl .
-                                ') no-repeat center; background-size: initial;',
-                                'div[data-option-id="' . $block->escapeHtmlAttr($option) . '"]'
-                            ) ?>
+                            <?php
+                            $element = 'swatchImageOption' .$escaper->escapeJs($option);
+                            $script = 'let ' .$element
+                                .' = document.querySelector(\'div[data-option-id="' .$escaper->escapeJs($option)
+                                .'"]\');' .PHP_EOL;
+                            $script .= $element .'.style.background = "background: url(\''
+                                .$escapedUrl .'\') no-repeat center";' .PHP_EOL;
+                            $script .= $element .'.style.backgroundSize = "initial";';
+                            echo /* @noEscape*/ $secureRenderer->renderTag('script', [], $script, false);
+                            ?>
                             <?php break;
                         case '1':
                             ?>
@@ -70,12 +76,19 @@
                                      $swatchData['swatches'][$option]['value']
                                  ) ?>">
                             </div>
-                            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-                                'background: ' . $block->escapeHtml(
-                                    $swatchData['swatches'][$option]['value']
-                                ) . ' no-repeat center; background-size: initial;',
-                                'div[data-option-id="' . $block->escapeHtmlAttr($option) . '"]'
-                            ) ?>
+                            <?php
+                            $element = 'swatchImageOption' .$escaper->escapeJs($option);
+                            $backgroundValue = $escaper->escapeJs(
+                                str_replace('\'', '\\\'', $swatchData['swatches'][$option]['value'])
+                            );
+                            $script = 'let ' .$element
+                                .' = document.querySelector(\'div[data-option-id="' .$escaper->escapeJs($option)
+                                .'"]\');' .PHP_EOL;
+                            $script .= $element .'.style.background = "background: ' .$backgroundValue
+                                .' no-repeat center";' .PHP_EOL;
+                            $script .= $element .'.style.backgroundSize = "initial";';
+                            echo /* @noEscape*/ $secureRenderer->renderTag('script', [], $script, false);
+                            ?>
                             <?php break;
                         case '0':
                         default:
diff --git a/app/code/Magento/Theme/view/frontend/templates/js/cookie_status.phtml b/app/code/Magento/Theme/view/frontend/templates/js/cookie_status.phtml
index ad6c88fc2108d..084b2b54c7188 100644
--- a/app/code/Magento/Theme/view/frontend/templates/js/cookie_status.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/js/cookie_status.phtml
@@ -10,7 +10,10 @@
 <div id="cookie-status">
     <?= $block->escapeHtml(__('The store will not work correctly in the case when cookies are disabled.')); ?>
 </div>
-<?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display:none', '#cookie-status'); ?>
+<?php
+$script = 'document.querySelector("#cookie-status").style.display = "none";';
+echo /* @noEscape */ $secureRenderer->renderTag('script', ['type' => 'text/javascript'], $script, false);
+?>
 
 <script type="text/x-magento-init">
     {
diff --git a/app/code/Magento/Ui/Component/Control/Button.php b/app/code/Magento/Ui/Component/Control/Button.php
index 0944b9d17a7e5..fbbf0e1f0fa61 100644
--- a/app/code/Magento/Ui/Component/Control/Button.php
+++ b/app/code/Magento/Ui/Component/Control/Button.php
@@ -129,7 +129,7 @@ protected function _beforeToHtml()
     {
         parent::_beforeToHtml();
 
-        $this->setData('ui_button_widget_hook_id', 'buttonId' .$this->random->getRandomString(32));
+        $this->setData('ui_button_widget_hook_id', 'buttonId' .$this->random->getRandomString(10));
 
         return $this;
     }
diff --git a/app/code/Magento/Ui/Component/Control/SplitButton.php b/app/code/Magento/Ui/Component/Control/SplitButton.php
index 38ff5e4473b54..64ca6cf3dfee6 100644
--- a/app/code/Magento/Ui/Component/Control/SplitButton.php
+++ b/app/code/Magento/Ui/Component/Control/SplitButton.php
@@ -211,7 +211,7 @@ private function identifyOption(array $option): string
             ? $this->getId() .'-' .$option['id']
             : (isset($option['id_attribute']) ?
                 $option['id_attribute']
-                : $this->getId() .'-optId' .$this->random->getRandomString(32));
+                : $this->getId() .'-optId' .$this->random->getRandomString(10));
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
index 08c94a9c310d0..fc1f2dd890cab 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
@@ -108,7 +108,7 @@ public function __construct(
     private function generateElementId(): string
     {
         if (!$this->hasData('formelementhookid')) {
-            $this->setData('formelementhookid', 'elemId' .$this->random->getRandomString(32));
+            $this->setData('formelementhookid', 'elemId' .$this->random->getRandomString(10));
         }
 
         return $this->getData('formelementhookid');
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Editablemultiselect.php b/lib/internal/Magento/Framework/Data/Form/Element/Editablemultiselect.php
index a5a8ac8b7c52d..5847ab6eedd0b 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Editablemultiselect.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Editablemultiselect.php
@@ -146,7 +146,7 @@ function check( tries, delay ){
      */
     protected function _optionToHtml($option, $selected)
     {
-        $optionId = 'optId' .$this->random->getRandomString(32);
+        $optionId = 'optId' .$this->random->getRandomString(8);
         $html = '<option value="' . $this->_escape($option['value']) . '" id="' . $optionId . '" ';
         $html .= isset($option['title']) ? 'title="' . $this->_escape($option['title']) . '"' : '';
         if (in_array((string)$option['value'], $selected)) {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
index e461d0e3bfb78..7eaf7f0f4af37 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
@@ -420,7 +420,7 @@ protected function _prepareOptions($options)
      */
     protected function _getButtonHtml($data)
     {
-        $id = empty($data['id']) ? 'buttonId' .$this->random->getRandomString(32) : $data['id'];
+        $id = empty($data['id']) ? 'buttonId' .$this->random->getRandomString(10) : $data['id'];
 
         $html = '<button type="button"';
         $html .= ' class="scalable ' . (isset($data['class']) ? $data['class'] : '') . '"';
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php b/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php
index aaa48611b02c5..4d62a3f667dfe 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Gallery.php
@@ -96,7 +96,7 @@ public function getElementHtml()
                 $i++;
                 $html .= '<tr class="gallery">';
                 foreach ($this->getValue()->getAttributeBackend()->getImageTypes() as $type) {
-                    $linkId = 'linkId' .$this->random->getRandomString(32);
+                    $linkId = 'linkId' .$this->random->getRandomString(8);
                     $url = $image->setType($type)->getSourceUrl();
                     $html .= '<td class="gallery vertical-gallery-cell" align="center">';
                     $html .= '<a previewlinkid="' .$linkId .'" href="' .
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Image.php b/lib/internal/Magento/Framework/Data/Form/Element/Image.php
index 65c8424a75051..5a0cab45d44d6 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Image.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Image.php
@@ -76,7 +76,7 @@ public function getElementHtml()
                 $url = $this->_urlBuilder->getBaseUrl(['_type' => UrlInterface::URL_TYPE_MEDIA]) . $url;
             }
 
-            $linkId = 'linkId' .$this->random->getRandomString(32);
+            $linkId = 'linkId' .$this->random->getRandomString(8);
             $html = '<a previewlinkid="' .$linkId .'" href="' .
                 $url .
                 '" ' .
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php b/lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php
index f8984de7a647a..794be28f4bbec 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php
@@ -153,8 +153,9 @@ public function getDefaultHtml()
         $result .= $this->getElementHtml();
 
         if ($this->getSelectAll() && $this->getDeselectAll()) {
-            $selectAllId = 'selId' .$this->random->getRandomString(32);
-            $deselectAllId = 'deselId' .$this->random->getRandomString(32);
+            $random = $this->random->getRandomString(4);
+            $selectAllId = 'selId' .$random;
+            $deselectAllId = 'deselId' .$random;
             $result .= '<a href="#" id="' .$selectAllId .'">' .$this->getSelectAll()
                 .'</a> <span class="separator">&nbsp;|&nbsp;</span>';
             $result .= '<a href="#" id="' .$deselectAllId .'">' .$this->getDeselectAll() .'</a>';
@@ -218,7 +219,7 @@ public function getJsObjectName()
      */
     protected function _optionToHtml($option, $selected)
     {
-        $optionId = 'optId' .$this->random->getRandomString(32);
+        $optionId = 'optId' .$this->random->getRandomString(8);
         $html = '<option value="' . $this->_escape($option['value']) . '" id="' . $optionId . '" ';
         $html .= isset($option['title']) ? 'title="' . $this->_escape($option['title']) . '"' : '';
         if (in_array((string)$option['value'], $selected)) {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Select.php b/lib/internal/Magento/Framework/Data/Form/Element/Select.php
index e50db9271d5a9..c9529af80124f 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Select.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Select.php
@@ -125,7 +125,7 @@ protected function _optionToHtml($option, $selected)
             }
             $html .= '</optgroup>' . "\n";
         } else {
-            $optionId = 'optId' .$this->random->getRandomString(32);
+            $optionId = 'optId' .$this->random->getRandomString(8);
             $html = '<option value="' . $this->_escape($option['value']) . '" id="' .$optionId .'" ';
             $html .= isset($option['title']) ? 'title="' . $this->_escape($option['title']) . '"' : '';
             if (in_array($option['value'], $selected)) {
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Link.php b/lib/internal/Magento/Framework/View/Element/Html/Link.php
index f92c35ddedd6d..ab0d44b16fe42 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Link.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Link.php
@@ -140,7 +140,7 @@ protected function _toHtml()
         }
 
         if (!$this->getDataUsingMethod('id')) {
-            $this->setDataUsingMethod('id', 'id' .$this->random->getRandomString(32));
+            $this->setDataUsingMethod('id', 'id' .$this->random->getRandomString(8));
         }
 
         return '<li><a ' . $this->getLinkAttributes() . ' >' . $this->escapeHtml($this->getLabel()) . '</a></li>'
diff --git a/lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php b/lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php
index dc7085ab2e360..4c9bdaa5a68d4 100644
--- a/lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php
+++ b/lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php
@@ -104,7 +104,7 @@ public function renderEventListenerAsTag(
             throw new \InvalidArgumentException('Invalid JS event handler data provided');
         }
 
-        $random = $this->random->getRandomString(32);
+        $random = $this->random->getRandomString(10);
         $listenerFunction = 'eventListener' .$random;
         $elementName = 'listenedElement' .$random;
         $script = <<<script
@@ -140,30 +140,29 @@ public function renderStyleAsTag(string $style, string $selector): string
             throw new \InvalidArgumentException('Invalid style data given');
         }
 
-        $elementVariable = 'elem' .$this->random->getRandomString(32);
+        $elementVariable = 'elem' .$this->random->getRandomString(8);
         /** @var string[] $styles */
-        $stylesAssignments = [];
+        $stylesAssignments = '';
         foreach ($stylePairs as $stylePair) {
             $exploded = array_map('trim', explode(':', $stylePair));
             if (count($exploded) < 2) {
                 throw new \InvalidArgumentException('Invalid CSS given');
             }
-            $styleAttribute = SimpleDataObjectConverter::snakeCaseToCamelCase(
-                str_replace('-', '_', trim($exploded[0]))
-            );
+            //Converting to camelCase
+            $styleAttribute = lcfirst(str_replace(' ', '', ucwords(str_replace('-', ' ', $exploded[0]))));
             if (count($exploded) > 2) {
                 //For cases when ":" is encountered in the style's value.
                 $exploded[1] = join('', array_slice($exploded, 1));
             }
-            $styleValue = trim($exploded[1]);
-            $stylesAssignments[] = "$elementVariable.style.$styleAttribute = '$styleValue';";
+            $styleValue = str_replace('\'', '\\\'', trim($exploded[1]));
+            $stylesAssignments .= "$elementVariable.style.$styleAttribute = '$styleValue';\n";
         }
 
         return $this->renderTag(
             'script',
             ['type' => 'text/javascript'],
             "let $elementVariable = document.querySelector('$selector');\n"
-            ."if ($elementVariable) {\n" .join("\n", $stylesAssignments) ." }",
+            ."if ($elementVariable) {\n{$stylesAssignments}}",
             false
         );
     }

From 0f4c707e26b259a986fe2a97898f4cc9dbe0623f Mon Sep 17 00:00:00 2001
From: Volodymyr Zaets <vzaets@magento.com>
Date: Tue, 2 Jun 2020 10:53:37 -0500
Subject: [PATCH 0352/1718] Revert for public PR:22917 - fix static

---
 app/code/Magento/Catalog/Model/Product/Option/Value.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Product/Option/Value.php b/app/code/Magento/Catalog/Model/Product/Option/Value.php
index e9630adc3497c..313513a9151dc 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Value.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Value.php
@@ -245,8 +245,7 @@ public function saveValues()
     }
 
     /**
-     * Return price. If $flag is true and price is percent
-     *  return converted percent to price
+     * Return price. If $flag is true and price is percent return converted percent to price
      *
      * @param bool $flag
      * @return float|int

From 7ba05f065cf767077449a6a68f4f49913ec3af50 Mon Sep 17 00:00:00 2001
From: ruslankostiv <rkostiv@adobe.com>
Date: Tue, 2 Jun 2020 11:22:08 -0500
Subject: [PATCH 0353/1718] MC-34379: Guest can't do reorder

---
 .../Model/GuestCart/GuestCartResolver.php     | 82 +++++++++++++++++++
 .../Controller/AbstractController/Reorder.php | 15 +++-
 .../Magento/Sales/Model/Reorder/Reorder.php   | 24 +++---
 .../StorefrontGuestOrderViewSection.xml       |  1 +
 .../Test/StorefrontReorderAsGuestTest.xml     | 82 +++++++++++++++++++
 5 files changed, 192 insertions(+), 12 deletions(-)
 create mode 100644 app/code/Magento/Quote/Model/GuestCart/GuestCartResolver.php
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Test/StorefrontReorderAsGuestTest.xml

diff --git a/app/code/Magento/Quote/Model/GuestCart/GuestCartResolver.php b/app/code/Magento/Quote/Model/GuestCart/GuestCartResolver.php
new file mode 100644
index 0000000000000..45d2e60d103c1
--- /dev/null
+++ b/app/code/Magento/Quote/Model/GuestCart/GuestCartResolver.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model\GuestCart;
+
+use Magento\Quote\Api\GuestCartManagementInterface;
+use Magento\Quote\Model\QuoteIdMaskFactory;
+use Magento\Quote\Model\ResourceModel\Quote\QuoteIdMask as QuoteIdMaskResourceModel;
+use Magento\Quote\Model\Quote;
+
+/**
+ * Return empty cart for guest
+ */
+class GuestCartResolver
+{
+    /**
+     * @var GuestCartManagementInterface
+     */
+    private $guestCartManagement;
+
+    /**
+     * @var QuoteIdMaskFactory
+     */
+    private $quoteIdMaskFactory;
+
+    /**
+     * @var QuoteIdMaskResourceModel
+     */
+    private $quoteIdMaskResourceModel;
+
+    /**
+     * @var \Magento\Quote\Api\GuestCartRepositoryInterface
+     */
+    private $guestCartRepository;
+
+    /**
+     * @param GuestCartManagementInterface $guestCartManagement
+     * @param QuoteIdMaskFactory $quoteIdMaskFactory
+     * @param QuoteIdMaskResourceModel $quoteIdMaskResourceModel
+     * @param \Magento\Quote\Api\GuestCartRepositoryInterface $guestCartRepository
+     */
+    public function __construct(
+        GuestCartManagementInterface $guestCartManagement,
+        QuoteIdMaskFactory $quoteIdMaskFactory,
+        QuoteIdMaskResourceModel $quoteIdMaskResourceModel,
+        \Magento\Quote\Api\GuestCartRepositoryInterface $guestCartRepository
+    ) {
+        $this->guestCartManagement = $guestCartManagement;
+        $this->quoteIdMaskFactory = $quoteIdMaskFactory;
+        $this->quoteIdMaskResourceModel = $quoteIdMaskResourceModel;
+        $this->guestCartRepository = $guestCartRepository;
+    }
+
+    /**
+     * Create empty cart for guest
+     *
+     * @param string|null $predefinedMaskedQuoteId
+     * @return Quote
+     * @throws \Magento\Framework\Exception\AlreadyExistsException
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function resolve(string $predefinedMaskedQuoteId = null): Quote
+    {
+        $maskedQuoteId = $this->guestCartManagement->createEmptyCart();
+
+        if ($predefinedMaskedQuoteId !== null) {
+            $quoteIdMask = $this->quoteIdMaskFactory->create();
+            $this->quoteIdMaskResourceModel->load($quoteIdMask, $maskedQuoteId, 'masked_id');
+
+            $quoteIdMask->setMaskedId($predefinedMaskedQuoteId);
+            $this->quoteIdMaskResourceModel->save($quoteIdMask);
+            $maskedQuoteId = $predefinedMaskedQuoteId;
+        }
+
+        return $this->guestCartRepository->get($maskedQuoteId);
+    }
+}
diff --git a/app/code/Magento/Sales/Controller/AbstractController/Reorder.php b/app/code/Magento/Sales/Controller/AbstractController/Reorder.php
index 062ad78e5001d..5eb485e262193 100644
--- a/app/code/Magento/Sales/Controller/AbstractController/Reorder.php
+++ b/app/code/Magento/Sales/Controller/AbstractController/Reorder.php
@@ -8,6 +8,7 @@
 
 namespace Magento\Sales\Controller\AbstractController;
 
+use Magento\Checkout\Model\Session as CheckoutSession;
 use Magento\Framework\App\Action;
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\App\ObjectManager;
@@ -35,6 +36,11 @@ abstract class Reorder extends Action\Action implements HttpPostActionInterface
      */
     private $reorder;
 
+    /**
+     * @var CheckoutSession
+     */
+    private $checkoutSession;
+
     /**
      * Constructor
      *
@@ -43,6 +49,7 @@ abstract class Reorder extends Action\Action implements HttpPostActionInterface
      * @param Registry $registry
      * @param ReorderHelper|null $reorderHelper
      * @param \Magento\Sales\Model\Reorder\Reorder|null $reorder
+     * @param CheckoutSession|null $checkoutSession
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
@@ -50,12 +57,14 @@ public function __construct(
         OrderLoaderInterface $orderLoader,
         Registry $registry,
         ReorderHelper $reorderHelper = null,
-        \Magento\Sales\Model\Reorder\Reorder $reorder = null
+        \Magento\Sales\Model\Reorder\Reorder $reorder = null,
+        CheckoutSession $checkoutSession = null
     ) {
         $this->orderLoader = $orderLoader;
         $this->_coreRegistry = $registry;
         parent::__construct($context);
         $this->reorder = $reorder ?: ObjectManager::getInstance()->get(\Magento\Sales\Model\Reorder\Reorder::class);
+        $this->checkoutSession = $checkoutSession ?: ObjectManager::getInstance()->get(CheckoutSession::class);
     }
 
     /**
@@ -81,6 +90,10 @@ public function execute()
             return $resultRedirect->setPath('checkout/cart');
         }
 
+        // Set quote id for guest session: \Magento\Quote\Api\CartRepositoryInterface::save doesn't set quote id
+        // to session for guest customer, as it does \Magento\Checkout\Model\Cart::save which is deprecated.
+        $this->checkoutSession->setQuoteId($reorderOutput->getCart()->getId());
+
         $errors = $reorderOutput->getErrors();
         if (!empty($errors)) {
             $useNotice = $this->_objectManager->get(\Magento\Checkout\Model\Session::class)->getUseNotice(true);
diff --git a/app/code/Magento/Sales/Model/Reorder/Reorder.php b/app/code/Magento/Sales/Model/Reorder/Reorder.php
index a1a8d6e8c9928..0baef79daee28 100644
--- a/app/code/Magento/Sales/Model/Reorder/Reorder.php
+++ b/app/code/Magento/Sales/Model/Reorder/Reorder.php
@@ -7,7 +7,6 @@
 namespace Magento\Sales\Model\Reorder;
 
 use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Framework\Exception\InputException;
@@ -15,7 +14,8 @@
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Api\Data\CartInterface;
 use Magento\Quote\Model\Cart\CustomerCartResolver;
-use Magento\Quote\Model\Quote as Quote;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\GuestCart\GuestCartResolver;
 use Magento\Sales\Api\Data\OrderItemInterface;
 use Magento\Sales\Helper\Reorder as ReorderHelper;
 use Magento\Sales\Model\Order\Item;
@@ -72,11 +72,6 @@ class Reorder
      */
     private $cartRepository;
 
-    /**
-     * @var ProductRepositoryInterface
-     */
-    private $productRepository;
-
     /**
      * @var Data\Error[]
      */
@@ -92,11 +87,16 @@ class Reorder
      */
     private $productCollectionFactory;
 
+    /**
+     * @var GuestCartResolver
+     */
+    private $guestCartResolver;
+
     /**
      * @param OrderFactory $orderFactory
      * @param CustomerCartResolver $customerCartProvider
+     * @param GuestCartResolver $guestCartResolver
      * @param CartRepositoryInterface $cartRepository
-     * @param ProductRepositoryInterface $productRepository
      * @param ReorderHelper $reorderHelper
      * @param \Psr\Log\LoggerInterface $logger
      * @param ProductCollectionFactory $productCollectionFactory
@@ -104,18 +104,18 @@ class Reorder
     public function __construct(
         OrderFactory $orderFactory,
         CustomerCartResolver $customerCartProvider,
+        GuestCartResolver $guestCartResolver,
         CartRepositoryInterface $cartRepository,
-        ProductRepositoryInterface $productRepository,
         ReorderHelper $reorderHelper,
         \Psr\Log\LoggerInterface $logger,
         ProductCollectionFactory $productCollectionFactory
     ) {
         $this->orderFactory = $orderFactory;
         $this->cartRepository = $cartRepository;
-        $this->productRepository = $productRepository;
         $this->reorderHelper = $reorderHelper;
         $this->logger = $logger;
         $this->customerCartProvider = $customerCartProvider;
+        $this->guestCartResolver = $guestCartResolver;
         $this->productCollectionFactory = $productCollectionFactory;
     }
 
@@ -141,7 +141,9 @@ public function execute(string $orderNumber, string $storeId): Data\ReorderOutpu
         $customerId = (int)$order->getCustomerId();
         $this->errors = [];
 
-        $cart = $this->customerCartProvider->resolve($customerId);
+        $cart = $customerId === 0
+            ? $this->guestCartResolver->resolve()
+            : $this->customerCartProvider->resolve($customerId);
         if (!$this->reorderHelper->isAllowed($order->getStore())) {
             $this->addError((string)__('Reorders are not allowed.'), self::ERROR_REORDER_NOT_AVAILABLE);
             return $this->prepareOutput($cart);
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/StorefrontGuestOrderViewSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontGuestOrderViewSection.xml
index 70f37352fb183..085eea12e2243 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/StorefrontGuestOrderViewSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontGuestOrderViewSection.xml
@@ -11,5 +11,6 @@
     <section name="StorefrontGuestOrderViewSection">
         <element name="orderInformationTab" type="text" selector="//*[@class='nav item current']/strong[contains(text(), 'Order Information')]"/>
         <element name="printOrder" type="button" selector=".order-actions-toolbar .actions .print" timeout="30"/>
+        <element name="reorder" type="button" selector=".order-actions-toolbar .actions .order" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontReorderAsGuestTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontReorderAsGuestTest.xml
new file mode 100644
index 0000000000000..0718783534925
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontReorderAsGuestTest.xml
@@ -0,0 +1,82 @@
+<?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="StorefrontReorderAsGuestTest">
+        <annotations>
+            <stories value="Reorder"/>
+            <title value="Make reorder as guest on Frontend"/>
+            <description value="Make reorder as guest on Frontend"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-34465"/>
+            <group value="sales"/>
+        </annotations>
+        <before>
+            <!--Create simple product.-->
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <!-- Create Customer Account -->
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <!-- Reindex and flush cache -->
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCreateCustomer"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+            <!-- Reindex invalidated indices after product attribute has been created/deleted -->
+            <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
+        </after>
+
+        <!-- Order a product -->
+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToPDP"/>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="cartAddSimpleProductToCart">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="navigateToCheckout"/>
+        <waitForPageLoad stepKey="waitFroPaymentSelectionPageLoad"/>
+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="fillAddress">
+            <argument name="customerVar" value="$$createCustomer$$"/>
+            <argument name="customerAddressVar" value="US_Address_TX"/>
+        </actionGroup>
+        <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30"
+                        stepKey="waitForPlaceOrderButtonVisible"/>
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="placeOrder"/>
+        <waitForPageLoad stepKey="waitUntilOrderPlaced"/>
+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="getOrderId"/>
+        <assertNotEmpty stepKey="assertOrderIdIsNotEmpty" after="getOrderId">
+            <actualResult type="const">$getOrderId</actualResult>
+        </assertNotEmpty>
+
+        <!-- Find the Order on frontend > Navigate to: Orders and Returns -->
+        <amOnPage url="{{StorefrontGuestOrderSearchPage.url}}" stepKey="amOnOrdersAndReturns"/>
+        <waitForPageLoad stepKey="waiForStorefrontPage"/>
+
+        <!-- Fill the form with correspondent Order data -->
+        <actionGroup ref="StorefrontFillOrdersAndReturnsFormActionGroup" stepKey="fillOrder">
+            <argument name="orderNumber" value="{$getOrderId}"/>
+            <argument name="customer" value="$$createCustomer$$"/>
+        </actionGroup>
+
+        <!-- Click on the "Continue" button -->
+        <click selector="{{StorefrontGuestOrderSearchSection.continue}}" stepKey="clickContinue"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+
+        <!-- Click 'Reorder' link -->
+        <click selector="{{StorefrontGuestOrderViewSection.reorder}}" stepKey="clickReturnLink"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+
+        <!--Check that product from order is visible in cart after reorder -->
+        <seeElement selector="{{CheckoutCartProductSection.ProductLinkByName($$createSimpleProduct.name$$)}}" stepKey="seeProductInCart"/>
+    </test>
+</tests>

From 0dc68f0f4624ac2466bc16de009dd30532fdf796 Mon Sep 17 00:00:00 2001
From: Viktor Petryk <victor.petryk@transoftgroup.com>
Date: Tue, 2 Jun 2020 22:52:07 +0300
Subject: [PATCH 0354/1718] MC-34810: [2.4.0][MFTF] fix export tests consumer
 run

---
 .../Mftf/Test/AdminExportBundleProductTest.xml | 18 +++++++-----------
 ...xportGroupedProductWithSpecialPriceTest.xml |  5 ++---
 ...ImportConfigurableProductWithImagesTest.xml |  5 ++---
 ...nfigurableProductsWithCustomOptionsTest.xml |  6 ++----
 ...figurableProductsWithAssignedImagesTest.xml |  6 ++----
 ...rableProductAssignedToCustomWebsiteTest.xml |  6 ++----
 ...ortSimpleProductWithCustomAttributeTest.xml |  4 ++--
 7 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml
index bdb562ab0205d..785d19c000af0 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportBundleProductTest.xml
@@ -79,14 +79,6 @@
                 <requiredEntity createDataKey="createBundleOptionWithAttribute"/>
                 <requiredEntity createDataKey="secondSimpleProductForFixedWithAttribute"/>
             </createData>
-
-            <!-- Start message queue for export consumer -->
-            <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue">
-                <argument name="consumerName" value="{{AdminExportMessageConsumerData.consumerName}}"/>
-                <argument name="maxMessages" value="{{AdminExportMessageConsumerData.messageLimit}}"/>
-            </actionGroup>
-            <reloadPage stepKey="refreshPage"/>
-            <waitForPageLoad stepKey="waitForPageLoaded"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
@@ -100,9 +92,8 @@
             <deleteData createDataKey="firstSimpleProductForFixedWithAttribute" stepKey="deleteFirstSimpleProductForFixedWithAttribute"/>
             <deleteData createDataKey="secondSimpleProductForFixedWithAttribute" stepKey="deleteSecondSimpleProductForFixedWithAttribute"/>
             <deleteData createDataKey="createProductAttribute" stepKey="deleteProductAttribute"/>
-
+            <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
-            <magentoCLI command="cron:run --group=index" stepKey="reindexInvalidatedIndices"/>
         </after>
 
         <!-- Go to export page -->
@@ -111,7 +102,12 @@
         <!-- Export created below products -->
         <actionGroup ref="ExportAllProductsActionGroup" stepKey="exportCreatedProducts"/>
 
-        <magentoCron stepKey="runCronIndex" groups="index"/>
+        <!-- Start message queue for export consumer -->
+        <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue">
+            <argument name="consumerName" value="{{AdminExportMessageConsumerData.consumerName}}"/>
+            <argument name="maxMessages" value="{{AdminExportMessageConsumerData.messageLimit}}"/>
+        </actionGroup>
+        <reloadPage stepKey="refreshPage"/>
         <waitForElementVisible selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="waitForFileName"/>
         <grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
 
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml
index 5ae94f050eb30..9f8d65968d741 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml
@@ -55,7 +55,7 @@
             <deleteData createDataKey="createSecondSimpleProduct" stepKey="deleteSecondSimpleProduct"/>
             <deleteData createDataKey="createGroupedProduct" stepKey="deleteGroupedProduct"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-
+            <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
             <!-- Log out -->
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
@@ -73,8 +73,7 @@
             <argument name="maxMessages" value="{{AdminExportMessageConsumerData.messageLimit}}"/>
         </actionGroup>
         <reloadPage stepKey="refreshPage"/>
-        <waitForPageLoad stepKey="waitForPageLoaded"/>
-
+        <waitForElementVisible selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="waitForFileName"/>
         <grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
 
         <!-- Download product -->
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportImportConfigurableProductWithImagesTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportImportConfigurableProductWithImagesTest.xml
index e0dfb8250c738..d2517fa28cdd1 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportImportConfigurableProductWithImagesTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportImportConfigurableProductWithImagesTest.xml
@@ -150,9 +150,9 @@
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
             <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGridColumnsInitial"/>
+            <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
             <!-- Admin logout-->
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
-            <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
         </after>
 
         <!-- Go to System > Export -->
@@ -170,8 +170,7 @@
             <argument name="maxMessages" value="{{AdminExportMessageConsumerData.messageLimit}}"/>
         </actionGroup>
         <reloadPage stepKey="refreshPage"/>
-        <waitForPageLoad stepKey="waitForPageLoaded"/>
-
+        <waitForElementVisible selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="waitForFileName"/>
         <grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
 
         <!-- Save exported file: file successfully downloaded -->
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml
index c82451eb9dbb5..94478e63aa92a 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml
@@ -83,9 +83,8 @@
             <deleteData createDataKey="createConfigSecondChildProduct" stepKey="deleteConfigSecondChildProduct"/>
             <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-
-            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
         <!-- Go to export page -->
@@ -104,8 +103,7 @@
             <argument name="maxMessages" value="{{AdminExportMessageConsumerData.messageLimit}}"/>
         </actionGroup>
         <reloadPage stepKey="refreshPage"/>
-        <waitForPageLoad stepKey="waitForPageLoaded"/>
-
+        <waitForElementVisible selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="waitForFileName"/>
         <grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
 
         <!-- Download product -->
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml
index dc556a6d0a899..95cfe2c87bffb 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml
@@ -99,9 +99,8 @@
             <deleteData createDataKey="createConfigSecondChildProduct" stepKey="deleteConfigSecondChildProduct"/>
             <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-
-            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
         <!-- Go to export page -->
@@ -119,8 +118,7 @@
             <argument name="maxMessages" value="{{AdminExportMessageConsumerData.messageLimit}}"/>
         </actionGroup>
         <reloadPage stepKey="refreshPage"/>
-        <waitForPageLoad stepKey="waitForPageLoaded"/>
-
+        <waitForElementVisible selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="waitForFileName"/>
         <grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
 
         <!-- Download product -->
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml
index 65f9ff80f7e39..2f57d94113d38 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml
@@ -85,9 +85,8 @@
             <deleteData createDataKey="createConfigSecondChildProduct" stepKey="deleteConfigSecondChildProduct"/>
             <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-
-            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
         <!-- Go to export page -->
@@ -103,8 +102,7 @@
             <argument name="maxMessages" value="{{AdminExportMessageConsumerData.messageLimit}}"/>
         </actionGroup>
         <reloadPage stepKey="refreshPage"/>
-        <waitForPageLoad stepKey="waitForPageLoaded"/>
-
+        <waitForElementVisible selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="waitForFileName"/>
         <grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
 
         <!-- Download product -->
diff --git a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml
index e684f80d8bd05..dac97a61a967b 100644
--- a/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml
+++ b/app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductWithCustomAttributeTest.xml
@@ -37,7 +37,7 @@
             <deleteData createDataKey="createSimpleProductWithCustomAttributeSet" stepKey="deleteSimpleProductWithCustomAttributeSet"/>
             <deleteData createDataKey="createAttributeSet" stepKey="deleteAttributeSet"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-
+            <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
             <!-- Log out -->
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
@@ -55,7 +55,7 @@
             <argument name="maxMessages" value="{{AdminExportMessageConsumerData.messageLimit}}"/>
         </actionGroup>
         <reloadPage stepKey="pageReload" />
-        <waitForPageLoad stepKey="waitForPageLoaded" />
+        <waitForElementVisible selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="waitForFileName"/>
         <grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
 
         <!-- Download product -->

From e44d2eeddc5aab2801a42089eb95d48b82d1fb08 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Tue, 2 Jun 2020 17:37:17 -0500
Subject: [PATCH 0355/1718] MC-33823: Merge CE, EE and B2B changes

---
 .../Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml  | 1 +
 nginx.conf.sample                                               | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml
index a6e3dfd7eaad4..339349541c115 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml
@@ -25,6 +25,7 @@
         <see userInput="{{MinMaxQueryLength.Hint}}" selector="{{AdminCatalogSearchConfigurationSection.maxQueryLengthHint}}" stepKey="seeHint2"/>
         <uncheckOption selector="{{AdminCatalogSearchConfigurationSection.minQueryLengthInherit}}" stepKey="uncheckSystemValue"/>
         <fillField selector="{{AdminCatalogSearchConfigurationSection.minQueryLength}}" userInput="{{minLength}}" stepKey="setMinQueryLength"/>
+        <scrollTo selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" stepKey="scrollToCollapseTab"/>
         <click selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" stepKey="collapseTab"/>
         <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig"/>
         <waitForPageLoad stepKey="waitForConfigSaved"/>
diff --git a/nginx.conf.sample b/nginx.conf.sample
index 25f1a4ef37625..ead80ccb22ece 100644
--- a/nginx.conf.sample
+++ b/nginx.conf.sample
@@ -181,7 +181,7 @@ location /errors/ {
 location ~ ^/(index|get|static|errors/report|errors/404|errors/503|health_check)\.php$ {
     try_files $uri =404;
     fastcgi_pass   fastcgi_backend;
-    fastcgi_buffers 1024 4k;
+    fastcgi_buffers 16 16k;
     fastcgi_buffer_size 32k;
 
     fastcgi_param  PHP_FLAG  "session.auto_start=off \n suhosin.session.cryptua=off";

From 822d48d6d586c867e963a82ca9f158cb567e0d57 Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@magento.com>
Date: Tue, 2 Jun 2020 21:51:57 -0500
Subject: [PATCH 0356/1718] MC-31618: Move static config to files - PLUGIN_LIST

- Merge global plugins data to other scopes by default;
---
 .../Di/App/Task/Operation/PluginListGenerator.php    | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/PluginListGenerator.php b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/PluginListGenerator.php
index fa0443cf72c64..4d334aa06bcaa 100644
--- a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/PluginListGenerator.php
+++ b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/PluginListGenerator.php
@@ -104,6 +104,11 @@ class PluginListGenerator implements OperationInterface
      */
     private $_data;
 
+    /**
+     * @var array
+     */
+    private $globalScopePluginData = [];
+
     /**
      * @var array
      */
@@ -180,14 +185,17 @@ public function doOperation()
                 foreach ($this->getClassDefinitions() as $class) {
                     $this->_inheritPlugins($class);
                 }
+                if ($scope === 'global') {
+                    $this->globalScopePluginData = $this->_data;
+                }
                 $this->configWriter->write(
                     $cacheId,
                     [$this->_data, $this->_inherited, $this->_processed]
                 );
-
                 if (count($this->_scopePriorityScheme) > 1 ) {
                     array_pop($this->_scopePriorityScheme);
-                    $this->_data = null;
+                    // merge global scope plugin data to other scopes by default
+                    $this->_data = $this->globalScopePluginData;
                 }
                 $this->_pluginInstances = [];
             }

From 938a68ccf07338227f3d11db228a355b8f9462aa Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Wed, 3 Jun 2020 09:46:13 +0300
Subject: [PATCH 0357/1718] magento/magento2#23972 fixed disabled guest
 checkout issue

Fix unit test
---
 .../Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php b/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
index fbdef6b2c2023..cfe25ceb9ad80 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
@@ -224,7 +224,7 @@ public function testIsAllowedGuestCheckoutConfigSetToFalse(): void
             ->with(
                 'catalog/downloadable/disable_guest_checkout',
                 ScopeInterface::SCOPE_STORE,
-                $storeCode
+                $this->storeMock
             )
             ->willReturn(false);
 

From 08e3875f213e183b32b30744a52b948770ecfe35 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Wed, 3 Jun 2020 09:48:47 +0300
Subject: [PATCH 0358/1718] magento/magento2#23972  fixed disabled guest
 checkout issue

Fix unit tests
---
 .../Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php b/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
index cfe25ceb9ad80..5b113cf3ba03d 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
@@ -149,7 +149,7 @@ public function testIsAllowedGuestCheckoutConfigSetToTrue($productType, $isAllow
         $this->scopeConfigMock->expects($this->any())
             ->method('isSetFlag')
             ->with(
-                'catalog/downloadable/disable_guest_checkout',
+                IsAllowedGuestCheckoutObserver::XML_PATH_DISABLE_GUEST_CHECKOUT,
                 ScopeInterface::SCOPE_STORE,
                 $this->storeMock
             )
@@ -222,7 +222,7 @@ public function testIsAllowedGuestCheckoutConfigSetToFalse(): void
         $this->scopeConfigMock->expects($this->once())
             ->method('isSetFlag')
             ->with(
-                'catalog/downloadable/disable_guest_checkout',
+                IsAllowedGuestCheckoutObserver::XML_PATH_DISABLE_GUEST_CHECKOUT,
                 ScopeInterface::SCOPE_STORE,
                 $this->storeMock
             )

From 4c50949baf6a9480e61ada602d142ff6c0b9109c Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Wed, 3 Jun 2020 11:19:24 +0300
Subject: [PATCH 0359/1718] magento/magento2#23972 fixed disabled guest
 checkout issue

Fix unit tests
---
 .../Unit/Observer/IsAllowedGuestCheckoutObserverTest.php    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php b/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
index 5b113cf3ba03d..943388ca8f87b 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
@@ -26,6 +26,8 @@
  */
 class IsAllowedGuestCheckoutObserverTest extends TestCase
 {
+    private const XML_PATH_DISABLE_GUEST_CHECKOUT = 'catalog/downloadable/disable_guest_checkout';
+    
     /** @var IsAllowedGuestCheckoutObserver */
     private $isAllowedGuestCheckoutObserver;
 
@@ -149,7 +151,7 @@ public function testIsAllowedGuestCheckoutConfigSetToTrue($productType, $isAllow
         $this->scopeConfigMock->expects($this->any())
             ->method('isSetFlag')
             ->with(
-                IsAllowedGuestCheckoutObserver::XML_PATH_DISABLE_GUEST_CHECKOUT,
+                self::XML_PATH_DISABLE_GUEST_CHECKOUT,
                 ScopeInterface::SCOPE_STORE,
                 $this->storeMock
             )
@@ -222,7 +224,7 @@ public function testIsAllowedGuestCheckoutConfigSetToFalse(): void
         $this->scopeConfigMock->expects($this->once())
             ->method('isSetFlag')
             ->with(
-                IsAllowedGuestCheckoutObserver::XML_PATH_DISABLE_GUEST_CHECKOUT,
+                self::XML_PATH_DISABLE_GUEST_CHECKOUT,
                 ScopeInterface::SCOPE_STORE,
                 $this->storeMock
             )

From af4b7406127dcb3dc7ec1430698b23b77c90dfec Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Wed, 3 Jun 2020 11:59:22 +0300
Subject: [PATCH 0360/1718] magento/magento2#23972 fix disabled guest checkout
 issue

---
 .../Observer/IsAllowedGuestCheckoutObserver.php      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php b/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
index 6319c1b9d45c6..f792e1c404422 100644
--- a/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
+++ b/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
@@ -56,7 +56,7 @@ public function __construct(
      */
     public function execute(Observer $observer)
     {
-        $store = $observer->getEvent()->getStore();
+        $storeId = (int)$observer->getEvent()->getStore()->getId();
         $result = $observer->getEvent()->getResult();
 
         /* @var $quote Quote */
@@ -69,9 +69,9 @@ public function execute(Observer $observer)
                 if ($this->scopeConfig->isSetFlag(
                     self::XML_PATH_DISABLE_GUEST_CHECKOUT,
                     ScopeInterface::SCOPE_STORE,
-                    $store
+                    $storeId
                 )
-                    || !$this->checkForShareableLinks($item, $store)) {
+                    || !$this->checkForShareableLinks($item, $storeId)) {
                     $result->setIsAllowed(false);
                     break;
                 }
@@ -85,10 +85,10 @@ public function execute(Observer $observer)
      * Check for shareable link
      *
      * @param CartItemInterface $item
-     * @param int $store
+     * @param int $storeId
      * @return boolean
      */
-    private function checkForShareableLinks(CartItemInterface $item, int $store): bool
+    private function checkForShareableLinks(CartItemInterface $item, int $storeId): bool
     {
         $isSharable = true;
         $option = $item->getOptionByCode('downloadable_link_ids');
@@ -101,7 +101,7 @@ private function checkForShareableLinks(CartItemInterface $item, int $store): bo
                         $link->getIsShareable() == 2 && !$this->scopeConfig->isSetFlag(
                             self::XML_PATH_DOWNLOADABLE_SHAREABLE,
                             ScopeInterface::SCOPE_STORE,
-                            $store
+                            $storeId
                         )
                     )
                 ) {

From 592915dc507b8fa96e32bb6698ed9c182baf9932 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Wed, 3 Jun 2020 12:03:06 +0300
Subject: [PATCH 0361/1718] magento/magento2#23972 fix disabled guest checkout
 issue

---
 .../IsAllowedGuestCheckoutObserverTest.php       | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php b/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
index 943388ca8f87b..eba1242d53916 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
@@ -103,6 +103,8 @@ protected function setUp(): void
      */
     public function testIsAllowedGuestCheckoutConfigSetToTrue($productType, $isAllowed): void
     {
+        $storeId = 1;
+
         if ($isAllowed) {
             $this->resultMock->expects($this->at(0))
                 ->method('setIsAllowed')
@@ -140,6 +142,10 @@ public function testIsAllowedGuestCheckoutConfigSetToTrue($productType, $isAllow
             ->method('getStore')
             ->willReturn($this->storeMock);
 
+        $this->storeMock->expects($this->any())
+            ->method('getId')
+            ->willReturn($storeId);
+
         $this->eventMock->expects($this->once())
             ->method('getResult')
             ->willReturn($this->resultMock);
@@ -153,7 +159,7 @@ public function testIsAllowedGuestCheckoutConfigSetToTrue($productType, $isAllow
             ->with(
                 self::XML_PATH_DISABLE_GUEST_CHECKOUT,
                 ScopeInterface::SCOPE_STORE,
-                $this->storeMock
+                $storeId
             )
             ->willReturn(true);
 
@@ -180,7 +186,7 @@ public function dataProviderForTestisAllowedGuestCheckoutConfigSetToTrue(): arra
 
     public function testIsAllowedGuestCheckoutConfigSetToFalse(): void
     {
-        $storeCode = 1;
+        $storeId = 1;
 
         $product = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
@@ -212,6 +218,10 @@ public function testIsAllowedGuestCheckoutConfigSetToFalse(): void
         $this->eventMock->expects($this->once())
             ->method('getStore')
             ->willReturn($this->storeMock);
+        
+        $this->storeMock->expects($this->any())
+            ->method('getId')
+            ->willReturn($storeId);
 
         $this->eventMock->expects($this->once())
             ->method('getResult')
@@ -226,7 +236,7 @@ public function testIsAllowedGuestCheckoutConfigSetToFalse(): void
             ->with(
                 self::XML_PATH_DISABLE_GUEST_CHECKOUT,
                 ScopeInterface::SCOPE_STORE,
-                $this->storeMock
+                $storeId
             )
             ->willReturn(false);
 

From c84d2e0c8eb790fee24f56d035ef1df1ed2f955f Mon Sep 17 00:00:00 2001
From: Viktor Petryk <victor.petryk@transoftgroup.com>
Date: Wed, 3 Jun 2020 12:32:16 +0300
Subject: [PATCH 0362/1718] MC-34247: After upgrade Magento with 2.3.4 to
 2.4.0-alph2 Simple Product missing in mini-cart

---
 .../view/frontend/web/template/minicart/item/default.html     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html b/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
index 5489089452d85..131745d840528 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
@@ -112,7 +112,7 @@
             </div>
         </div>
     </div>
-    <div class="message notice" if="message">
-        <div data-bind="text: message"></div>
+    <div class="message notice" if="$data.message">
+        <div data-bind="text: $data.message"></div>
     </div>
 </li>

From b74db3dec5c07c075f7efc186da184974657994d Mon Sep 17 00:00:00 2001
From: Viktor Sevch <viktor.sevch@transoftgroup.com>
Date: Wed, 3 Jun 2020 13:06:13 +0300
Subject: [PATCH 0363/1718] MC-34457: [2.4][Integration Tests Failed]:
 Magento.Elasticsearch6.Controller.QuickSearchTest.testQuickSearchWithImprovedPriceRangeCalculation

---
 .../Magento/Elasticsearch6/Controller/QuickSearchTest.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch6/Controller/QuickSearchTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch6/Controller/QuickSearchTest.php
index 200360b7340bd..1d640e62dc5d4 100644
--- a/dev/tests/integration/testsuite/Magento/Elasticsearch6/Controller/QuickSearchTest.php
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch6/Controller/QuickSearchTest.php
@@ -64,6 +64,6 @@ public function testQuickSearchWithImprovedPriceRangeCalculation()
             $this->storeManager->setCurrentStore($defaultStore);
         }
 
-        $this->assertContains('search product 1', $responseBody);
+        $this->assertStringContainsString('search product 1', $responseBody);
     }
 }

From 0a5488a76b908be6b0d7a0ec583f9acd2179f7e8 Mon Sep 17 00:00:00 2001
From: Viktor Petryk <victor.petryk@transoftgroup.com>
Date: Wed, 3 Jun 2020 17:22:27 +0300
Subject: [PATCH 0364/1718] MC-33593: The style of cart icon is broken

---
 .../Ui/view/base/web/js/block-loader.js       | 20 +++--
 .../Ui/base/templates/block-loader.html       |  5 ++
 .../Magento/Ui/base/js/block-loader.test.js   | 80 +++++++++++++++++++
 3 files changed, 97 insertions(+), 8 deletions(-)
 create mode 100644 dev/tests/js/jasmine/assets/app/code/Magento/Ui/base/templates/block-loader.html
 create mode 100644 dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/block-loader.test.js

diff --git a/app/code/Magento/Ui/view/base/web/js/block-loader.js b/app/code/Magento/Ui/view/base/web/js/block-loader.js
index 531591b41b0d8..e509f7dc23fea 100644
--- a/app/code/Magento/Ui/view/base/web/js/block-loader.js
+++ b/app/code/Magento/Ui/view/base/web/js/block-loader.js
@@ -15,14 +15,18 @@ define([
         blockContentLoadingClass = '_block-content-loading',
         blockLoader,
         blockLoaderClass,
-        loaderImageHref;
+        blockLoaderElement = $.Deferred(),
+        loaderImageHref = $.Deferred();
 
     templateLoader.loadTemplate(blockLoaderTemplatePath).done(function (blockLoaderTemplate) {
-        blockLoader = template($.trim(blockLoaderTemplate), {
-            loaderImageHref: loaderImageHref
+        loaderImageHref.done(function (loaderHref) {
+            blockLoader = template($.trim(blockLoaderTemplate), {
+                loaderImageHref: loaderHref
+            });
+            blockLoader = $(blockLoader);
+            blockLoaderClass = '.' + blockLoader.attr('class');
+            blockLoaderElement.resolve();
         });
-        blockLoader = $(blockLoader);
-        blockLoaderClass = '.' + blockLoader.attr('class');
     });
 
     /**
@@ -70,7 +74,7 @@ define([
     }
 
     return function (loaderHref) {
-        loaderImageHref = loaderHref;
+        loaderImageHref.resolve(loaderHref);
         ko.bindingHandlers.blockLoader = {
             /**
              * Process loader for block
@@ -81,9 +85,9 @@ define([
                 element = $(element);
 
                 if (ko.unwrap(displayBlockLoader())) {
-                    addBlockLoader(element);
+                    blockLoaderElement.done(addBlockLoader(element));
                 } else {
-                    removeBlockLoader(element);
+                    blockLoaderElement.done(removeBlockLoader(element));
                 }
             }
         };
diff --git a/dev/tests/js/jasmine/assets/app/code/Magento/Ui/base/templates/block-loader.html b/dev/tests/js/jasmine/assets/app/code/Magento/Ui/base/templates/block-loader.html
new file mode 100644
index 0000000000000..778c8894ec61e
--- /dev/null
+++ b/dev/tests/js/jasmine/assets/app/code/Magento/Ui/base/templates/block-loader.html
@@ -0,0 +1,5 @@
+<div data-role="loader" class="loading-mask" style="position: absolute;">
+    <div class="loader">
+        <img src="<%= loaderImageHref %>" alt="Loading..." title="Loading..." style="position: absolute;">
+    </div>
+</div>
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/block-loader.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/block-loader.test.js
new file mode 100644
index 0000000000000..f8130fbd44143
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/block-loader.test.js
@@ -0,0 +1,80 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'squire',
+    'jquery',
+    'text!tests/assets/app/code/Magento/Ui/base/templates/block-loader.html'
+], function (Squire, $, blockLoaderTmpl) {
+    'use strict';
+
+    var injector = new Squire(),
+        mocks = {
+            'Magento_Ui/js/lib/knockout/template/loader': {
+                /** Method stub. */
+                loadTemplate: function () {
+                    var defer = $.Deferred();
+
+                    defer.resolve(blockLoaderTmpl);
+
+                    return defer;
+                }
+            }
+        },
+        obj,
+        ko;
+
+    beforeEach(function (done) {
+        injector.mock(mocks);
+        injector.require(['Magento_Ui/js/block-loader', 'ko'], function (blockLoader, knockout) {
+            obj = blockLoader;
+            ko = knockout;
+            done();
+        });
+    });
+
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) {
+        }
+    });
+
+    describe('Magento_Ui/js/block-loader', function () {
+        var blockContentLoadingClass = '_block-content-loading',
+            loaderImageUrl = 'https://static.magento.com/loader.gif',
+            element = $('<span data-bind="blockLoader: isLoading"/>'),
+            isLoading,
+            context;
+
+        beforeEach(function () {
+            isLoading = ko.observable();
+            context = ko.bindingContext.prototype.createChildContext({
+                isLoading: isLoading
+            });
+            obj(loaderImageUrl);
+            $('body').append(element);
+            ko.applyBindings(context, element[0]);
+        });
+
+        afterEach(function () {
+            element.remove();
+        });
+
+        it('Check adding loader block to element', function () {
+            isLoading(true);
+            expect(element.hasClass(blockContentLoadingClass)).toBeTruthy();
+            expect(element.children().attr('class')).toEqual('loading-mask');
+            expect(element.find('img').attr('src')).toEqual(loaderImageUrl);
+        });
+
+        it('Check removing loader block from element', function () {
+            isLoading(false);
+            expect(element.hasClass(blockContentLoadingClass)).toBeFalsy();
+            expect(element.children().length).toEqual(0);
+        });
+    });
+});

From 2d324a8460f81924de302446fd673d23a279b805 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Wed, 3 Jun 2020 09:39:33 -0500
Subject: [PATCH 0365/1718] MC-33823: Merge CE, EE and B2B changes

---
 .../ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml     | 3 ++-
 .../Test/Mftf/Section/CatalogSearchAdminConfigSection.xml     | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml
index 339349541c115..43fa9108633da 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml
@@ -25,7 +25,8 @@
         <see userInput="{{MinMaxQueryLength.Hint}}" selector="{{AdminCatalogSearchConfigurationSection.maxQueryLengthHint}}" stepKey="seeHint2"/>
         <uncheckOption selector="{{AdminCatalogSearchConfigurationSection.minQueryLengthInherit}}" stepKey="uncheckSystemValue"/>
         <fillField selector="{{AdminCatalogSearchConfigurationSection.minQueryLength}}" userInput="{{minLength}}" stepKey="setMinQueryLength"/>
-        <scrollTo selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" stepKey="scrollToCollapseTab"/>
+        <scrollTo selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" y="-50" stepKey="scrollToCollapseTab"/>
+        <waitForElementVisible selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" stepKey="seeCollapseTab" />
         <click selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" stepKey="collapseTab"/>
         <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig"/>
         <waitForPageLoad stepKey="waitForConfigSaved"/>
diff --git a/app/code/Magento/Config/Test/Mftf/Section/CatalogSearchAdminConfigSection.xml b/app/code/Magento/Config/Test/Mftf/Section/CatalogSearchAdminConfigSection.xml
index e82ad4670f9b3..9b54697e2d6ba 100644
--- a/app/code/Magento/Config/Test/Mftf/Section/CatalogSearchAdminConfigSection.xml
+++ b/app/code/Magento/Config/Test/Mftf/Section/CatalogSearchAdminConfigSection.xml
@@ -7,9 +7,9 @@
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCatalogSearchConfigurationSection">
-        <element name="catalogSearchTab" type="button" selector="#catalog_search-head"/>
+        <element name="catalogSearchTab" type="button" selector="a#catalog_search-head"/>
         <element name="checkIfCatalogSearchTabExpand" type="button" selector="#catalog_search-head:not(.open)"/>
         <element name="searchEngineDefaultSystemValue" type="checkbox" selector="#catalog_search_engine_inherit"/>
         <element name="searchEngine" type="select" selector="#catalog_search_engine"/>
     </section>
-</sections>
\ No newline at end of file
+</sections>

From ace26a1dbbdee56fc9cb3898cdb254e31cbd9a6f Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Wed, 3 Jun 2020 13:10:26 -0500
Subject: [PATCH 0366/1718] MC-33823: Merge CE, EE and B2B changes

---
 .../Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml
index 43fa9108633da..1dc57cd083435 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml
@@ -25,9 +25,6 @@
         <see userInput="{{MinMaxQueryLength.Hint}}" selector="{{AdminCatalogSearchConfigurationSection.maxQueryLengthHint}}" stepKey="seeHint2"/>
         <uncheckOption selector="{{AdminCatalogSearchConfigurationSection.minQueryLengthInherit}}" stepKey="uncheckSystemValue"/>
         <fillField selector="{{AdminCatalogSearchConfigurationSection.minQueryLength}}" userInput="{{minLength}}" stepKey="setMinQueryLength"/>
-        <scrollTo selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" y="-50" stepKey="scrollToCollapseTab"/>
-        <waitForElementVisible selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" stepKey="seeCollapseTab" />
-        <click selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" stepKey="collapseTab"/>
         <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig"/>
         <waitForPageLoad stepKey="waitForConfigSaved"/>
         <see userInput="You saved the configuration." stepKey="seeSuccessMessage"/>

From 1982e0c0dc71982e33e249374ef5883b5e35bc79 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Wed, 3 Jun 2020 13:33:30 -0500
Subject: [PATCH 0367/1718] MC-34416: Error in the CLI during upgrade

---
 .../Setup/Console/Command/UpgradeCommand.php       | 12 +++++++++++-
 setup/src/Magento/Setup/Model/SearchConfig.php     | 14 +-------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php b/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
index 4a0cd3bc9a69a..4a4e0dcd972c7 100644
--- a/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
@@ -9,6 +9,7 @@
 use Magento\Framework\App\State as AppState;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Config\CacheInterface;
 use Magento\Framework\Setup\ConsoleLogger;
 use Magento\Framework\Setup\Declaration\Schema\DryRunLogger;
 use Magento\Framework\Setup\Declaration\Schema\OperationsExecutor;
@@ -52,22 +53,30 @@ class UpgradeCommand extends AbstractSetupCommand
      */
     private $searchConfigFactory;
 
+    /*
+     * @var CacheInterface
+     */
+    private $cache;
+
     /**
      * @param InstallerFactory $installerFactory
      * @param SearchConfigFactory $searchConfigFactory
      * @param DeploymentConfig $deploymentConfig
      * @param AppState|null $appState
+     * @param CacheInterface|null $cache
      */
     public function __construct(
         InstallerFactory $installerFactory,
         SearchConfigFactory $searchConfigFactory,
         DeploymentConfig $deploymentConfig = null,
-        AppState $appState = null
+        AppState $appState = null,
+        CacheInterface $cache = null
     ) {
         $this->installerFactory = $installerFactory;
         $this->searchConfigFactory = $searchConfigFactory;
         $this->deploymentConfig = $deploymentConfig ?: ObjectManager::getInstance()->get(DeploymentConfig::class);
         $this->appState = $appState ?: ObjectManager::getInstance()->get(AppState::class);
+        $this->cache = $cache ?: ObjectManager::getInstance()->get(CacheInterface::class);
         parent::__construct();
     }
 
@@ -129,6 +138,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $installer = $this->installerFactory->create(new ConsoleLogger($output));
             $installer->updateModulesSequence($keepGenerated);
             $searchConfig = $this->searchConfigFactory->create();
+            $this->cache->clean();
             $searchConfig->validateSearchEngine();
             $installer->installSchema($request);
             $installer->installDataFixtures($request);
diff --git a/setup/src/Magento/Setup/Model/SearchConfig.php b/setup/src/Magento/Setup/Model/SearchConfig.php
index 0f26736fb686e..5aac234bb6089 100644
--- a/setup/src/Magento/Setup/Model/SearchConfig.php
+++ b/setup/src/Magento/Setup/Model/SearchConfig.php
@@ -7,7 +7,6 @@
 
 namespace Magento\Setup\Model;
 
-use Magento\Framework\Config\CacheInterface;
 use Magento\Framework\Setup\Option\AbstractConfigOption;
 use Magento\Framework\Validation\ValidationException;
 use Magento\Search\Model\SearchEngine\Validator;
@@ -34,27 +33,19 @@ class SearchConfig
      */
     private $installConfig;
 
-    /**
-     * @var CacheInterface
-     */
-    private $cache;
-
     /**
      * @param SearchConfigOptionsList $searchConfigOptionsList
      * @param Validator $searchValidator
      * @param CompositeInstallConfig $installConfig
-     * @param CacheInterface $cache
      */
     public function __construct(
         SearchConfigOptionsList $searchConfigOptionsList,
         Validator $searchValidator,
-        CompositeInstallConfig $installConfig,
-        CacheInterface $cache
+        CompositeInstallConfig $installConfig
     ) {
         $this->searchConfigOptionsList = $searchConfigOptionsList;
         $this->searchValidator = $searchValidator;
         $this->installConfig = $installConfig;
-        $this->cache = $cache;
     }
 
     /**
@@ -85,9 +76,6 @@ public function saveConfiguration(array $inputOptions)
      */
     public function validateSearchEngine()
     {
-        // Clean config cache prior to validation
-        $this->cache->clean();
-
         $validationErrors = $this->searchValidator->validate();
         if (!empty($validationErrors)) {
             throw new ValidationException(__(implode(PHP_EOL, $validationErrors)));

From 759286fe1ec5bbe8aa6691b177e227d3d6da8960 Mon Sep 17 00:00:00 2001
From: Viktor Petryk <victor.petryk@transoftgroup.com>
Date: Wed, 3 Jun 2020 22:04:41 +0300
Subject: [PATCH 0368/1718] MC-33593: The style of cart icon is broken

---
 .../tests/app/code/Magento/Ui/base/js/block-loader.test.js       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/block-loader.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/block-loader.test.js
index f8130fbd44143..02f62bca70a4e 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/block-loader.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/block-loader.test.js
@@ -61,6 +61,7 @@ define([
         });
 
         afterEach(function () {
+            ko.cleanNode(element[0]);
             element.remove();
         });
 

From e5e50e7767e7d87f145e3f4fc06dacef95906354 Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Wed, 3 Jun 2020 13:44:37 +0300
Subject: [PATCH 0369/1718] magento/magento2#28481: GraphQl. updateCustomer
 allows to set any INT value in gender argument

---
 .../Model/Customer/ValidateCustomerData.php   | 70 +++++++++++++++++--
 .../GraphQl/Customer/UpdateCustomerTest.php   | 48 ++++++++++---
 2 files changed, 105 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/ValidateCustomerData.php b/app/code/Magento/CustomerGraphQl/Model/Customer/ValidateCustomerData.php
index 3861ce324ea7d..5d60df5cba4d3 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/ValidateCustomerData.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/ValidateCustomerData.php
@@ -7,6 +7,10 @@
 
 namespace Magento\CustomerGraphQl\Model\Customer;
 
+use Magento\Customer\Api\CustomerMetadataInterface;
+use Magento\Customer\Model\Data\AttributeMetadata;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\Validator\EmailAddress as EmailAddressValidator;
 
@@ -15,6 +19,11 @@
  */
 class ValidateCustomerData
 {
+    /**
+     * @var CustomerMetadataInterface
+     */
+    private $customerMetadata;
+
     /**
      * Get allowed/required customer attributes
      *
@@ -32,25 +41,40 @@ class ValidateCustomerData
      *
      * @param GetAllowedCustomerAttributes $getAllowedCustomerAttributes
      * @param EmailAddressValidator $emailAddressValidator
+     * @param CustomerMetadataInterface $customerMetadata
      */
     public function __construct(
         GetAllowedCustomerAttributes $getAllowedCustomerAttributes,
-        EmailAddressValidator $emailAddressValidator
+        EmailAddressValidator $emailAddressValidator,
+        CustomerMetadataInterface $customerMetadata
     ) {
         $this->getAllowedCustomerAttributes = $getAllowedCustomerAttributes;
         $this->emailAddressValidator = $emailAddressValidator;
+        $this->customerMetadata = $customerMetadata;
     }
 
     /**
      * Validate customer data
      *
      * @param array $customerData
-     *
-     * @return void
-     *
      * @throws GraphQlInputException
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      */
     public function execute(array $customerData): void
+    {
+        $this->validateRequiredArguments($customerData);
+        $this->validateEmail($customerData);
+        $this->validateGender($customerData);
+    }
+
+    /**
+     * Validate required attributes
+     *
+     * @param array $customerData
+     * @throws GraphQlInputException
+     */
+    private function validateRequiredArguments(array $customerData): void
     {
         $attributes = $this->getAllowedCustomerAttributes->execute(array_keys($customerData));
         $errorInput = [];
@@ -69,11 +93,49 @@ public function execute(array $customerData): void
                 __('Required parameters are missing: %1', [implode(', ', $errorInput)])
             );
         }
+    }
 
+    /**
+     * Validate an email
+     *
+     * @param array $customerData
+     * @throws GraphQlInputException
+     */
+    private function validateEmail(array $customerData): void
+    {
         if (isset($customerData['email']) && !$this->emailAddressValidator->isValid($customerData['email'])) {
             throw new GraphQlInputException(
                 __('"%1" is not a valid email address.', $customerData['email'])
             );
         }
     }
+
+    /**
+     * Validate gender value
+     *
+     * @param array $customerData
+     * @throws GraphQlInputException
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     */
+    private function validateGender(array $customerData): void
+    {
+        if (isset($customerData['gender']) && $customerData['gender']) {
+            /** @var AttributeMetadata $genderData */
+            $options = $this->customerMetadata->getAttributeMetadata('gender')->getOptions();
+
+            $isValid = false;
+            foreach ($options as $optionData) {
+                if ($optionData->getValue() && $optionData->getValue() == $customerData['gender']) {
+                    $isValid = true;
+                }
+            }
+
+            if (!$isValid) {
+                throw new GraphQlInputException(
+                    __('"%1" is not a valid gender value.', $customerData['gender'])
+                );
+            }
+        }
+    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php
index 6e90e85782bb2..49595562a6c56 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerTest.php
@@ -7,8 +7,9 @@
 
 namespace Magento\GraphQl\Customer;
 
+use Exception;
 use Magento\Customer\Model\CustomerAuthUpdate;
-use Magento\Customer\Model\CustomerRegistry;
+use Magento\Framework\Exception\AuthenticationException;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -113,7 +114,7 @@ public function testUpdateCustomer()
      */
     public function testUpdateCustomerIfInputDataIsEmpty()
     {
-        $this->expectException(\Exception::class);
+        $this->expectException(Exception::class);
         $this->expectExceptionMessage('"input" value should be specified');
 
         $currentEmail = 'customer@example.com';
@@ -139,7 +140,7 @@ public function testUpdateCustomerIfInputDataIsEmpty()
      */
     public function testUpdateCustomerIfUserIsNotAuthorized()
     {
-        $this->expectException(\Exception::class);
+        $this->expectException(Exception::class);
         $this->expectExceptionMessage('The current customer isn\'t authorized.');
 
         $newFirstname = 'Richard';
@@ -165,7 +166,7 @@ public function testUpdateCustomerIfUserIsNotAuthorized()
      */
     public function testUpdateCustomerIfAccountIsLocked()
     {
-        $this->expectException(\Exception::class);
+        $this->expectException(Exception::class);
         $this->expectExceptionMessage('The account is locked.');
 
         $this->lockCustomer->execute(1);
@@ -195,7 +196,7 @@ public function testUpdateCustomerIfAccountIsLocked()
      */
     public function testUpdateEmailIfPasswordIsMissed()
     {
-        $this->expectException(\Exception::class);
+        $this->expectException(Exception::class);
         $this->expectExceptionMessage('Provide the current "password" to change "email".');
 
         $currentEmail = 'customer@example.com';
@@ -223,7 +224,7 @@ public function testUpdateEmailIfPasswordIsMissed()
      */
     public function testUpdateEmailIfPasswordIsInvalid()
     {
-        $this->expectException(\Exception::class);
+        $this->expectException(Exception::class);
         $this->expectExceptionMessage('Invalid login or password.');
 
         $currentEmail = 'customer@example.com';
@@ -253,8 +254,10 @@ public function testUpdateEmailIfPasswordIsInvalid()
      */
     public function testUpdateEmailIfEmailAlreadyExists()
     {
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('A customer with the same email address already exists in an associated website.');
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage(
+            'A customer with the same email address already exists in an associated website.'
+        );
 
         $currentEmail = 'customer@example.com';
         $currentPassword = 'password';
@@ -286,7 +289,7 @@ public function testUpdateEmailIfEmailAlreadyExists()
      */
     public function testEmptyCustomerName()
     {
-        $this->expectException(\Exception::class);
+        $this->expectException(Exception::class);
         $this->expectExceptionMessage('Required parameters are missing: First Name');
 
         $currentEmail = 'customer@example.com';
@@ -310,10 +313,37 @@ public function testEmptyCustomerName()
         $this->graphQlMutation($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testUpdateCustomerWithIncorrectGender()
+    {
+        $gender = 5;
+
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage('"' . $gender . '" is not a valid gender value.');
+
+        $query = <<<QUERY
+mutation {
+    updateCustomer(
+        input: {
+            gender: {$gender}
+        }
+    ) {
+        customer {
+            gender
+        }
+    }
+}
+QUERY;
+        $this->graphQlMutation($query, [], '', $this->getCustomerAuthHeaders('customer@example.com', 'password'));
+    }
+
     /**
      * @param string $email
      * @param string $password
      * @return array
+     * @throws AuthenticationException
      */
     private function getCustomerAuthHeaders(string $email, string $password): array
     {

From c3846e2a5151e59897bba35801d7edaec4cc7139 Mon Sep 17 00:00:00 2001
From: Viktor Petryk <victor.petryk@transoftgroup.com>
Date: Thu, 4 Jun 2020 00:13:21 +0300
Subject: [PATCH 0370/1718] MC-33593: The style of cart icon is broken

---
 .../app/code/Magento/Ui/base/templates/block-loader.html    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dev/tests/js/jasmine/assets/app/code/Magento/Ui/base/templates/block-loader.html b/dev/tests/js/jasmine/assets/app/code/Magento/Ui/base/templates/block-loader.html
index 778c8894ec61e..cb28b09e4da83 100644
--- a/dev/tests/js/jasmine/assets/app/code/Magento/Ui/base/templates/block-loader.html
+++ b/dev/tests/js/jasmine/assets/app/code/Magento/Ui/base/templates/block-loader.html
@@ -1,3 +1,9 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
 <div data-role="loader" class="loading-mask" style="position: absolute;">
     <div class="loader">
         <img src="<%= loaderImageHref %>" alt="Loading..." title="Loading..." style="position: absolute;">

From 7911d9b3224c9cc50941f685d411bc9ab596c8fd Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Wed, 3 Jun 2020 19:08:06 -0500
Subject: [PATCH 0371/1718] MC-33823: Merge CE, EE and B2B changes

---
 .../AdminCatalogPriceRuleDeleteAllActionGroup.xml        | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCatalogPriceRuleDeleteAllActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCatalogPriceRuleDeleteAllActionGroup.xml
index 27edab962033e..609efc2afe9d0 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCatalogPriceRuleDeleteAllActionGroup.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCatalogPriceRuleDeleteAllActionGroup.xml
@@ -25,5 +25,14 @@
         </helper>
         <waitForElementVisible selector="{{AdminDataGridTableSection.dataGridEmpty}}" stepKey="waitDataGridEmptyMessageAppears"/>
         <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage"/>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <amOnPage url="{{AdminCatalogPriceRuleGridPage.url}}" stepKey="goToAdminCatalogPriceRuleGridPage2"/>
+        <!-- It sometimes is loading too long for default 10s -->
+        <waitForPageLoad time="60" stepKey="waitForPageFullyLoaded2"/>
     </actionGroup>
 </actionGroups>

From a498f14fab8c7d02851987c6d7f9ab9d549e43eb Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@magento.com>
Date: Wed, 3 Jun 2020 23:16:51 -0500
Subject: [PATCH 0372/1718] MC-31618: Move static config to files - PLUGIN_LIST

- Remove redundant variables;
---
 app/etc/di.xml                                |   2 -
 .../Interception/PluginList/PluginList.php    |  10 +-
 .../Task/Operation/PluginListGenerator.php    | 111 ++++++++----------
 3 files changed, 52 insertions(+), 71 deletions(-)

diff --git a/app/etc/di.xml b/app/etc/di.xml
index 920265193f152..14b87b5c2b0b0 100644
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -432,9 +432,7 @@
     </type>
     <type name="Magento\Setup\Module\Di\App\Task\Operation\PluginListGenerator">
         <arguments>
-            <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
             <argument name="reader" xsi:type="object">Magento\Framework\ObjectManager\Config\Reader\Dom\Proxy</argument>
-            <argument name="cacheId" xsi:type="string">plugin-list</argument>
             <argument name="scopePriorityScheme" xsi:type="array">
                 <item name="first" xsi:type="string">global</item>
             </argument>
diff --git a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
index 6661bdc3c8aa2..3446a9b33f4f2 100644
--- a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
+++ b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
@@ -281,8 +281,8 @@ public function getNext($type, $method, $code = '__self')
     protected function _loadScopedData()
     {
         $scope = $this->_configScope->getCurrentScope();
-        if (false == isset($this->_loadedScopes[$scope])) {
-            if (false == in_array($scope, $this->_scopePriorityScheme)) {
+        if (false === isset($this->_loadedScopes[$scope])) {
+            if (false === in_array($scope, $this->_scopePriorityScheme, true)) {
                 $this->_scopePriorityScheme[] = $scope;
             }
             $cacheId = implode('|', $this->_scopePriorityScheme) . "|" . $this->_cacheId;
@@ -291,14 +291,14 @@ protected function _loadScopedData()
             $file = $directoryList->getPath(DirectoryList::GENERATED_METADATA) . '/' . $cacheId . '.' . 'php';
             if (file_exists($file)) {
                 $data = include $file;
-                list($this->_data, $this->_inherited, $this->_processed) = $data;
+                [$this->_data, $this->_inherited, $this->_processed] = $data;
                 foreach ($this->_scopePriorityScheme as $scopeCode) {
                     $this->_loadedScopes[$scopeCode] = true;
                 }
             } else {
                 $data = $this->_cache->load($cacheId);
                 if ($data) {
-                    list($this->_data, $this->_inherited, $this->_processed) = $this->serializer->unserialize($data);
+                    [$this->_data, $this->_inherited, $this->_processed] = $this->serializer->unserialize($data);
                     foreach ($this->_scopePriorityScheme as $scopeCode) {
                         $this->_loadedScopes[$scopeCode] = true;
                     }
@@ -358,7 +358,7 @@ private function _loadScopedVirtualTypes()
      */
     protected function isCurrentScope($scopeCode)
     {
-        return $this->_configScope->getCurrentScope() == $scopeCode;
+        return $this->_configScope->getCurrentScope() === $scopeCode;
     }
 
     /**
diff --git a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/PluginListGenerator.php b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/PluginListGenerator.php
index 4d334aa06bcaa..10023cd107102 100644
--- a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/PluginListGenerator.php
+++ b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/PluginListGenerator.php
@@ -13,7 +13,6 @@
 use Magento\Framework\ObjectManager\DefinitionInterface as ClassDefinitions;
 use Magento\Framework\ObjectManager\RelationsInterface;
 use Magento\Setup\Module\Di\App\Task\OperationInterface;
-use Magento\Framework\Config\CacheInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -33,33 +32,26 @@ class PluginListGenerator implements OperationInterface
      */
     private $reader;
 
-    /**
-     * Configuration cache
-     *
-     * @var CacheInterface
-     */
-    protected $cache;
-
     /**
      * Cache tag
      *
      * @var string
      */
-    protected $_cacheId = 'plugin-list';
+    private $cacheId = 'plugin-list';
 
     /**
      * Scope priority loading scheme
      *
      * @var string[]
      */
-    protected $_scopePriorityScheme = [];
+    private $scopePriorityScheme;
 
     /**
      * Loaded scopes
      *
      * @var array
      */
-    protected $_loadedScopes = [];
+    private $loadedScopes = [];
 
     /**
      * Type config
@@ -102,7 +94,7 @@ class PluginListGenerator implements OperationInterface
     /**
      * @var array
      */
-    private $_data;
+    private $pluginData;
 
     /**
      * @var array
@@ -112,17 +104,12 @@ class PluginListGenerator implements OperationInterface
     /**
      * @var array
      */
-    private $_inherited = [];
+    private $inherited = [];
 
     /**
      * @var array
      */
-    private $_processed;
-
-    /**
-     * @var array
-     */
-    protected $_pluginInstances = [];
+    private $processed;
 
     /**
      * @param ReaderInterface $reader
@@ -132,7 +119,6 @@ class PluginListGenerator implements OperationInterface
      * @param DefinitionInterface $definitions
      * @param ClassDefinitions $classDefinitions
      * @param LoggerInterface $logger
-     * @param CacheInterface $cache
      * @param ConfigWriterInterface $configWriter
      * @param array $scopePriorityScheme
      */
@@ -144,7 +130,6 @@ public function __construct(
         DefinitionInterface $definitions,
         ClassDefinitions $classDefinitions,
         LoggerInterface $logger,
-        CacheInterface $cache,
         ConfigWriterInterface $configWriter,
         array $scopePriorityScheme = ['global']
     ) {
@@ -155,8 +140,7 @@ public function __construct(
         $this->definitions = $definitions;
         $this->classDefinitions = $classDefinitions;
         $this->logger = $logger;
-        $this->cache = $cache;
-        $this->_scopePriorityScheme = $scopePriorityScheme;
+        $this->scopePriorityScheme = $scopePriorityScheme;
         $this->configWriter = $configWriter;
     }
 
@@ -166,38 +150,38 @@ public function __construct(
     public function doOperation()
     {
         $scopes = $this->scopeConfig->getAllScopes();
+        // remove primary scope for production mode
         array_shift($scopes);
 
         foreach ($scopes as $scope) {
             $this->scopeConfig->setCurrentScope($scope);
-            if (false === isset($this->_loadedScopes[$scope])) {
-                if (false === in_array($scope, $this->_scopePriorityScheme)) {
-                    $this->_scopePriorityScheme[] = $scope;
+            if (false === isset($this->loadedScopes[$scope])) {
+                if (false === in_array($scope, $this->scopePriorityScheme, true)) {
+                    $this->scopePriorityScheme[] = $scope;
                 }
-                $cacheId = implode('|', $this->_scopePriorityScheme) . "|" . $this->_cacheId;
+                $cacheId = implode('|', $this->scopePriorityScheme) . "|" . $this->cacheId;
 
-                foreach ($this->_loadScopedVirtualTypes() as $class) {
-                    $this->_inheritPlugins($class);
+                foreach ($this->loadScopedVirtualTypes() as $class) {
+                    $this->inheritPlugins($class);
                 }
-                foreach ($this->_data as $className => $value) {
-                    $this->_inheritPlugins($className);
+                foreach ($this->pluginData as $className => $value) {
+                    $this->inheritPlugins($className);
                 }
                 foreach ($this->getClassDefinitions() as $class) {
-                    $this->_inheritPlugins($class);
+                    $this->inheritPlugins($class);
                 }
                 if ($scope === 'global') {
-                    $this->globalScopePluginData = $this->_data;
+                    $this->globalScopePluginData = $this->pluginData;
                 }
                 $this->configWriter->write(
                     $cacheId,
-                    [$this->_data, $this->_inherited, $this->_processed]
+                    [$this->pluginData, $this->inherited, $this->processed]
                 );
-                if (count($this->_scopePriorityScheme) > 1 ) {
-                    array_pop($this->_scopePriorityScheme);
+                if (count($this->scopePriorityScheme) > 1) {
+                    array_pop($this->scopePriorityScheme);
                     // merge global scope plugin data to other scopes by default
-                    $this->_data = $this->globalScopePluginData;
+                    $this->pluginData = $this->globalScopePluginData;
                 }
-                $this->_pluginInstances = [];
             }
         }
     }
@@ -215,16 +199,16 @@ public function getName()
      *
      * @return array
      */
-    private function _loadScopedVirtualTypes()
+    private function loadScopedVirtualTypes()
     {
         $virtualTypes = [];
-        foreach ($this->_scopePriorityScheme as $scopeCode) {
-            if (!isset($this->_loadedScopes[$scopeCode])) {
+        foreach ($this->scopePriorityScheme as $scopeCode) {
+            if (!isset($this->loadedScopes[$scopeCode])) {
                 $data = $this->reader->read($scopeCode) ?: [];
                 unset($data['preferences']);
                 if (count($data) > 0) {
-                    $this->_inherited = [];
-                    $this->_processed = [];
+                    $this->inherited = [];
+                    $this->processed = [];
                     $this->merge($data);
                     foreach ($data as $class => $config) {
                         if (isset($config['type'])) {
@@ -232,7 +216,7 @@ private function _loadScopedVirtualTypes()
                         }
                     }
                 }
-                $this->_loadedScopes[$scopeCode] = true;
+                $this->loadedScopes[$scopeCode] = true;
             }
             if ($this->isCurrentScope($scopeCode)) {
                 break;
@@ -271,20 +255,20 @@ private function isCurrentScope($scopeCode)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    private function _inheritPlugins($type)
+    private function inheritPlugins($type)
     {
         $type = ltrim($type, '\\');
-        if (!isset($this->_inherited[$type])) {
+        if (!isset($this->inherited[$type])) {
             $realType = $this->omConfig->getOriginalInstanceType($type);
 
             if ($realType !== $type) {
-                $plugins = $this->_inheritPlugins($realType);
+                $plugins = $this->inheritPlugins($realType);
             } elseif ($this->relations->has($type)) {
                 $relations = $this->relations->getParents($type);
                 $plugins = [];
                 foreach ($relations as $relation) {
                     if ($relation) {
-                        $relationPlugins = $this->_inheritPlugins($relation);
+                        $relationPlugins = $this->inheritPlugins($relation);
                         if ($relationPlugins) {
                             $plugins = array_replace_recursive($plugins, $relationPlugins);
                         }
@@ -293,19 +277,19 @@ private function _inheritPlugins($type)
             } else {
                 $plugins = [];
             }
-            if (isset($this->_data[$type])) {
+            if (isset($this->pluginData[$type])) {
                 if (!$plugins) {
-                    $plugins = $this->_data[$type];
+                    $plugins = $this->pluginData[$type];
                 } else {
-                    $plugins = array_replace_recursive($plugins, $this->_data[$type]);
+                    $plugins = array_replace_recursive($plugins, $this->pluginData[$type]);
                 }
             }
-            $this->_inherited[$type] = null;
+            $this->inherited[$type] = null;
             if (is_array($plugins) && count($plugins)) {
                 $this->filterPlugins($plugins);
-                uasort($plugins, [$this, '_sort']);
+                uasort($plugins, [$this, 'sort']);
                 $this->trimInstanceStartingBackslash($plugins);
-                $this->_inherited[$type] = $plugins;
+                $this->inherited[$type] = $plugins;
                 $lastPerMethod = [];
                 foreach ($plugins as $key => $plugin) {
                     // skip disabled plugins
@@ -318,24 +302,24 @@ private function _inheritPlugins($type)
                         throw new \InvalidArgumentException('Plugin class ' . $pluginType . ' doesn\'t exist');
                     }
                     foreach ($this->definitions->getMethodList($pluginType) as $pluginMethod => $methodTypes) {
-                        $current = isset($lastPerMethod[$pluginMethod]) ? $lastPerMethod[$pluginMethod] : '__self';
+                        $current = $lastPerMethod[$pluginMethod] ?? '__self';
                         $currentKey = $type . '_' . $pluginMethod . '_' . $current;
                         if ($methodTypes & DefinitionInterface::LISTENER_AROUND) {
-                            $this->_processed[$currentKey][DefinitionInterface::LISTENER_AROUND] = $key;
+                            $this->processed[$currentKey][DefinitionInterface::LISTENER_AROUND] = $key;
                             $lastPerMethod[$pluginMethod] = $key;
                         }
                         if ($methodTypes & DefinitionInterface::LISTENER_BEFORE) {
-                            $this->_processed[$currentKey][DefinitionInterface::LISTENER_BEFORE][] = $key;
+                            $this->processed[$currentKey][DefinitionInterface::LISTENER_BEFORE][] = $key;
                         }
                         if ($methodTypes & DefinitionInterface::LISTENER_AFTER) {
-                            $this->_processed[$currentKey][DefinitionInterface::LISTENER_AFTER][] = $key;
+                            $this->processed[$currentKey][DefinitionInterface::LISTENER_AFTER][] = $key;
                         }
                     }
                 }
             }
             return $plugins;
         }
-        return $this->_inherited[$type];
+        return $this->inherited[$type];
     }
 
     /**
@@ -378,10 +362,10 @@ private function merge(array $config)
         foreach ($config as $type => $typeConfig) {
             if (isset($typeConfig['plugins'])) {
                 $type = ltrim($type, '\\');
-                if (isset($this->_data[$type])) {
-                    $this->_data[$type] = array_replace_recursive($this->_data[$type], $typeConfig['plugins']);
+                if (isset($this->pluginData[$type])) {
+                    $this->pluginData[$type] = array_replace_recursive($this->pluginData[$type], $typeConfig['plugins']);
                 } else {
-                    $this->_data[$type] = $typeConfig['plugins'];
+                    $this->pluginData[$type] = $typeConfig['plugins'];
                 }
             }
         }
@@ -394,7 +378,7 @@ private function merge(array $config)
      * @param array $itemB
      * @return int
      */
-    private function _sort($itemA, $itemB)
+    private function sort($itemA, $itemB)
     {
         if (isset($itemA['sortOrder'])) {
             if (isset($itemB['sortOrder'])) {
@@ -407,5 +391,4 @@ private function _sort($itemA, $itemB)
             return 0;
         }
     }
-
 }

From 0f5bc54920070210d30d58c259b1456dbba00547 Mon Sep 17 00:00:00 2001
From: Viktor Petryk <victor.petryk@transoftgroup.com>
Date: Thu, 4 Jun 2020 12:53:19 +0300
Subject: [PATCH 0373/1718] MC-33593: The style of cart icon is broken

---
 .../code/Magento/Ui/base/templates/block-loader.html | 11 -----------
 .../app/code/Magento/Ui/base/js/block-loader.test.js | 12 ++++++++----
 2 files changed, 8 insertions(+), 15 deletions(-)
 delete mode 100644 dev/tests/js/jasmine/assets/app/code/Magento/Ui/base/templates/block-loader.html

diff --git a/dev/tests/js/jasmine/assets/app/code/Magento/Ui/base/templates/block-loader.html b/dev/tests/js/jasmine/assets/app/code/Magento/Ui/base/templates/block-loader.html
deleted file mode 100644
index cb28b09e4da83..0000000000000
--- a/dev/tests/js/jasmine/assets/app/code/Magento/Ui/base/templates/block-loader.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<div data-role="loader" class="loading-mask" style="position: absolute;">
-    <div class="loader">
-        <img src="<%= loaderImageHref %>" alt="Loading..." title="Loading..." style="position: absolute;">
-    </div>
-</div>
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/block-loader.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/block-loader.test.js
index 02f62bca70a4e..03ac8322e8560 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/block-loader.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/block-loader.test.js
@@ -5,12 +5,16 @@
 
 define([
     'squire',
-    'jquery',
-    'text!tests/assets/app/code/Magento/Ui/base/templates/block-loader.html'
-], function (Squire, $, blockLoaderTmpl) {
+    'jquery'
+], function (Squire, $) {
     'use strict';
 
-    var injector = new Squire(),
+    var blockLoaderTmpl = '<div data-role="loader" class="loading-mask" style="position: absolute;">\n' +
+        '    <div class="loader">\n' +
+        '        <img src="<%= loaderImageHref %>" alt="Loading..." title="Loading..." style="position: absolute;">\n' +
+        '    </div>\n' +
+        '</div>',
+        injector = new Squire(),
         mocks = {
             'Magento_Ui/js/lib/knockout/template/loader': {
                 /** Method stub. */

From 247c1be09f3c4cb8e68c0d24fd036a486ff7b7dd Mon Sep 17 00:00:00 2001
From: Kate Kyzyma <kate@atwix.com>
Date: Thu, 4 Jun 2020 13:12:58 +0300
Subject: [PATCH 0374/1718] refactoring the test

---
 ...rtCategoryNameIsShownInMenuActionGroup.xml | 22 +++++++++
 .../StorefrontSwitchStoreActionGroup.xml      | 21 ++++++++
 ...nUpdateCategoryUrlKeyWithStoreViewTest.xml | 49 +++++++++++++------
 3 files changed, 76 insertions(+), 16 deletions(-)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertCategoryNameIsShownInMenuActionGroup.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontSwitchStoreActionGroup.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertCategoryNameIsShownInMenuActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertCategoryNameIsShownInMenuActionGroup.xml
new file mode 100644
index 0000000000000..c56a18b4895a4
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertCategoryNameIsShownInMenuActionGroup.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="StorefrontAssertCategoryNameIsShownInMenuActionGroup">
+        <annotations>
+            <description>Validate that the Category is present in menu on Frontend.</description>
+        </annotations>
+        <arguments>
+            <argument name="categoryName" type="string"/>
+        </arguments>
+
+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(categoryName)}}"
+                    stepKey="seeCatergoryInStoreFront"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontSwitchStoreActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontSwitchStoreActionGroup.xml
new file mode 100644
index 0000000000000..4a403364a91e3
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontSwitchStoreActionGroup.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="StorefrontSwitchStoreActionGroup">
+        <annotations>
+            <description>Switch the Storefront to the provided Store.</description>
+        </annotations>
+        <arguments>
+            <argument name="storeName" type="string"/>
+        </arguments>
+        <click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="clickOnSwitchStoreButton"/>
+        <click selector="{{StorefrontFooterSection.storeLink(storeName)}}" stepKey="selectStoreToSwitchOn"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryUrlKeyWithStoreViewTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryUrlKeyWithStoreViewTest.xml
index 6a12b991bd225..6b968237d2727 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryUrlKeyWithStoreViewTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryUrlKeyWithStoreViewTest.xml
@@ -32,16 +32,22 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
-        <!--Open Store Page -->
-        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-        <waitForPageLoad stepKey="waitForSystemStorePage"/>
+        <!--&lt;!&ndash;Open Store Page &ndash;&gt;-->
+        <!--<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>-->
+        <!--<waitForPageLoad stepKey="waitForSystemStorePage"/>-->
 
-        <!--Create Custom Store -->
-        <click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>
-        <fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" stepKey="fillStoreName"/>
-        <fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" stepKey="fillStoreCode"/>
-        <selectOption userInput="{{NewRootCategory.name}}" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectStoreStatus"/>
-        <click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreButton"/>
+        <!--&lt;!&ndash;Create Custom Store &ndash;&gt;-->
+        <!--<click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>-->
+        <!--<fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" stepKey="fillStoreName"/>-->
+        <!--<fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" stepKey="fillStoreCode"/>-->
+        <!--<selectOption userInput="{{NewRootCategory.name}}" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectStoreStatus"/>-->
+        <!--<click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreButton"/>-->
+
+        <actionGroup ref="CreateCustomStoreActionGroup" stepKey="createCustomStore">
+            <argument name="website" value="{{_defaultWebsite.name}}"/>
+            <argument name="store" value="{{customStore.name}}"/>
+            <argument name="rootCategory" value="$$rootCategory.name$$"/>
+        </actionGroup>
 
         <!--Create Store View-->
         <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView">
@@ -50,13 +56,24 @@
         </actionGroup>
 
         <!--Verify Category in Store View-->
-        <amOnPage url="/{{NewRootCategory.name}}/{{SimpleRootSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFront"/>
-        <waitForPageLoad stepKey="waitForSystemStorePage1"/>
-        <click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="ClickSwitchStoreButtonOnDefaultStore"/>
-        <click selector="{{StorefrontFooterSection.storeLink(customStore.name)}}" stepKey="SelectSecondStoreToSwitchOn"/>
-        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="seeCatergoryInStoreFront"/>
-        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="selectCategory"/>
-        <waitForPageLoad stepKey="waitForProductToLoad"/>
+        <!--<amOnPage url="/{{NewRootCategory.name}}/{{SimpleRootSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFront"/>-->
+        <!--<waitForPageLoad stepKey="waitForSystemStorePage1"/>-->
+        <!--<click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="ClickSwitchStoreButtonOnDefaultStore"/>-->
+        <!--<click selector="{{StorefrontFooterSection.storeLink(customStore.name)}}" stepKey="SelectSecondStoreToSwitchOn"/>-->
+        <!--<seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="seeCatergoryInStoreFront"/>-->
+        <!--<click selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="selectCategory"/>-->
+        <!--<waitForPageLoad stepKey="waitForProductToLoad"/>-->
+
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToHomepage"/>
+        <actionGroup ref="StorefrontSwitchStoreActionGroup" stepKey="switchCustomStore">
+            <argument name="storeName" value="{{customStore.name}}"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAssertCategoryNameIsShownInMenuActionGroup" stepKey="seeCatergoryInStoreFront">
+            <argument name="categoryName" value="{{SimpleRootSubCategory.name}}"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="selectCategory">
+            <argument name="categoryName" value="$$category.name$$"/>
+        </actionGroup>
 
         <!--Update URL Key-->
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>

From 204d0c3528fabf95c0554731dc37351bbeb26cc9 Mon Sep 17 00:00:00 2001
From: Ynhockey <ynhockey@gmail.com>
Date: Thu, 4 Jun 2020 16:41:27 +0300
Subject: [PATCH 0375/1718] Grammar fixes in Registry.php

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

diff --git a/lib/internal/Magento/Framework/Registry.php b/lib/internal/Magento/Framework/Registry.php
index d1bc227437d5f..b642ffd1f957f 100644
--- a/lib/internal/Magento/Framework/Registry.php
+++ b/lib/internal/Magento/Framework/Registry.php
@@ -9,7 +9,7 @@
  * Registry model. Used to manage values in registry
  *
  * Registry usage as a shared service introduces temporal, hard to detect coupling into system.
- * It's usage should be avoid. Use service classes or data providers instead.
+ * Its usage should be avoided. Use service classes or data providers instead.
  *
  * @api
  * @deprecated

From 77ba2af0ea9f21f5924955f304ced64eadf33913 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Thu, 4 Jun 2020 10:41:10 -0500
Subject: [PATCH 0376/1718] MC-33823: Merge CE, EE and B2B changes

---
 .../AdminCatalogPriceRuleDeleteAllActionGroup.xml      |  9 ---------
 .../AdminReorderWithCatalogPriceRuleDiscountTest.xml   | 10 ++++++++++
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCatalogPriceRuleDeleteAllActionGroup.xml b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCatalogPriceRuleDeleteAllActionGroup.xml
index 609efc2afe9d0..27edab962033e 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCatalogPriceRuleDeleteAllActionGroup.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/ActionGroup/AdminCatalogPriceRuleDeleteAllActionGroup.xml
@@ -25,14 +25,5 @@
         </helper>
         <waitForElementVisible selector="{{AdminDataGridTableSection.dataGridEmpty}}" stepKey="waitDataGridEmptyMessageAppears"/>
         <see selector="{{AdminDataGridTableSection.dataGridEmpty}}" userInput="We couldn't find any records." stepKey="assertDataGridEmptyMessage"/>
-        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
-            <argument name="tags" value=""/>
-        </actionGroup>
-        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
-            <argument name="indices" value=""/>
-        </actionGroup>
-        <amOnPage url="{{AdminCatalogPriceRuleGridPage.url}}" stepKey="goToAdminCatalogPriceRuleGridPage2"/>
-        <!-- It sometimes is loading too long for default 10s -->
-        <waitForPageLoad time="60" stepKey="waitForPageFullyLoaded2"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderWithCatalogPriceRuleDiscountTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderWithCatalogPriceRuleDiscountTest.xml
index 0ff5080bd8df2..4799984b76745 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderWithCatalogPriceRuleDiscountTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderWithCatalogPriceRuleDiscountTest.xml
@@ -25,6 +25,16 @@
             <createData entity="SimpleProduct2" stepKey="createSimpleProductApi"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <actionGroup ref="AdminCatalogPriceRuleDeleteAllActionGroup" stepKey="deleteAllCatalogPriceRule"/>
+            <!-- Clearing cache just in case -->
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <amOnPage url="{{AdminCatalogPriceRuleGridPage.url}}" stepKey="goToAdminCatalogPriceRuleGridPage2"/>
+            <!-- It sometimes is loading too long for default 10s -->
+            <waitForPageLoad time="60" stepKey="waitForPageFullyLoaded2"/>
             <!--Create the catalog price rule -->
             <createData entity="CatalogRuleToPercent" stepKey="createCatalogRule"/>
             <!--Create order via API-->

From 4e852b068eb4c3f0b8abe5fc7192a962b6d2b673 Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Thu, 4 Jun 2020 15:35:01 -0500
Subject: [PATCH 0377/1718] MC-20638: MyAccount :: Order Details :: Shipping
 Details by Order Number

---
 .../Model/Resolver/CustomerOrders/Carrier.php | 76 +++++++++++++++++++
 .../Resolver/OrderShipment/ShipmentItems.php  | 56 ++++++++++++++
 .../OrderShipment/ShipmentTracking.php        | 45 +++++++++++
 .../Model/Resolver/OrderShipments.php         | 73 ++++++++++++++++++
 .../Magento/SalesGraphQl/etc/schema.graphqls  |  4 +-
 5 files changed, 252 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders/Carrier.php
 create mode 100644 app/code/Magento/SalesGraphQl/Model/Resolver/OrderShipment/ShipmentItems.php
 create mode 100644 app/code/Magento/SalesGraphQl/Model/Resolver/OrderShipment/ShipmentTracking.php
 create mode 100644 app/code/Magento/SalesGraphQl/Model/Resolver/OrderShipments.php

diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders/Carrier.php b/app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders/Carrier.php
new file mode 100644
index 0000000000000..c1890cfbe6670
--- /dev/null
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders/Carrier.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesGraphQl\Model\Resolver\CustomerOrders;
+
+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;
+use Magento\Shipping\Model\Config\Source\Allmethods;
+
+/**
+ * Resolve shipping carrier for order
+ */
+class Carrier implements ResolverInterface
+{
+    /**
+     * @var Allmethods
+     */
+    private $carrierMethods;
+
+    /**
+     * @param Allmethods $carrierMethods
+     */
+    public function __construct(Allmethods $carrierMethods)
+    {
+        $this->carrierMethods = $carrierMethods;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (!isset($value['model']) && !($value['model'] instanceof Order)) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+        /** @var Order $order */
+        $order = $value['model'];
+        $methodCode = $order->getShippingMethod();
+        if (null === $methodCode) {
+            return null;
+        }
+
+        return $this->findCarrierByMethodCode($methodCode);
+    }
+
+    /**
+     * Find carrier name by shipping method code
+     *
+     * @param string $methodCode
+     * @return string
+     */
+    private function findCarrierByMethodCode(string $methodCode): ?string
+    {
+        $allCarrierMethods = $this->carrierMethods->toOptionArray();
+
+        foreach ($allCarrierMethods as $carrierCode => $carrierMethods) {
+            $carrierLabel = $carrierMethods['label'];
+            $carrierMethodOptions = $carrierMethods['value'];
+            if (is_array($carrierMethodOptions)) {
+                foreach ($carrierMethodOptions as $option) {
+                    if ($option['value'] === $methodCode) {
+                        return $carrierLabel;
+                    }
+                }
+            }
+        }
+        return null;
+    }
+}
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderShipment/ShipmentItems.php b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderShipment/ShipmentItems.php
new file mode 100644
index 0000000000000..92e165729d768
--- /dev/null
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderShipment/ShipmentItems.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesGraphQl\Model\Resolver\OrderShipment;
+
+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\Api\Data\OrderInterface;
+use Magento\Sales\Api\Data\ShipmentInterface;
+use Magento\SalesGraphQl\Model\SalesItem\SalesItemFactory;
+use function base64_encode;
+
+/**
+ * Resolve items included in shipment
+ */
+class ShipmentItems implements ResolverInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (!isset($value['model']) && !($value['model'] instanceof ShipmentInterface)) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+        if (!isset($value['order']) && !($value['order'] instanceof OrderInterface)) {
+            throw new LocalizedException(__('"order" value should be specified'));
+        }
+        /** @var ShipmentInterface $shipment */
+        $shipment = $value['model'];
+        $order = $value['order'];
+
+        $shipmentItems = [];
+        foreach ($shipment->getItems() as $item) {
+            $shipmentItems[] = [
+                'id' => base64_encode($item->getEntityId()),
+                'product_name' => $item->getName(),
+                'product_sku' => $item->getSku(),
+                'product_sale_price' => [
+                    'value' => $item->getPrice(),
+                    'currency' => $order->getOrderCurrencyCode()
+                ],
+                'quantity_shipped' => $item->getQty(),
+                'model' => $item
+            ];
+        }
+
+        return $shipmentItems;
+    }
+}
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderShipment/ShipmentTracking.php b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderShipment/ShipmentTracking.php
new file mode 100644
index 0000000000000..0f77dd2fd2567
--- /dev/null
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderShipment/ShipmentTracking.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesGraphQl\Model\Resolver\OrderShipment;
+
+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\Api\Data\ShipmentInterface;
+
+/**
+ * Resolve shipment tracking information
+ */
+class ShipmentTracking implements ResolverInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (!isset($value['model']) && !($value['model'] instanceof ShipmentInterface)) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+        /** @var ShipmentInterface $shipment */
+        $shipment = $value['model'];
+        $tracks = $shipment->getTracks();
+
+        $shipmentTracking = [];
+        foreach ($tracks as $tracking) {
+            $shipmentTracking[] = [
+                'title' => $tracking->getTitle(),
+                'carrier' => $tracking->getCarrierCode(),
+                'number' => $tracking->getTrackNumber(),
+                'model' => $tracking
+            ];
+        }
+
+        return $shipmentTracking;
+    }
+}
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderShipments.php b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderShipments.php
new file mode 100644
index 0000000000000..1fb2cd084da44
--- /dev/null
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderShipments.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesGraphQl\Model\Resolver;
+
+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\Api\Data\ShipmentInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Shipment;
+
+/**
+ * Resolve shipment information for order
+ */
+class OrderShipments implements ResolverInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (!isset($value['model']) && !($value['model'] instanceof Order)) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+        /** @var Order $order */
+        $order = $value['model'];
+        $shipments = $order->getShipmentsCollection()->getItems();
+
+        if (empty($shipments)) {
+            //Order does not have any shipments
+            return [];
+        }
+
+        $orderShipments = [];
+        foreach ($shipments as $shipment) {
+            $orderShipments[] =
+                [
+                    'id' => base64_encode($shipment->getIncrementId()),
+                    'number' => $shipment->getIncrementId(),
+                    'comments' => $this->getShipmentComments($shipment),
+                    'model' => $shipment,
+                    'order' => $order
+                ];
+        }
+        return $orderShipments;
+    }
+
+    /**
+     * Get comments shipments in proper format
+     *
+     * @param ShipmentInterface $shipment
+     * @return array
+     */
+    private function getShipmentComments(ShipmentInterface $shipment): array
+    {
+        $comments = [];
+        foreach ($shipment->getComments() as $comment) {
+            if ($comment->getIsVisibleOnFront()) {
+                $comments[] = [
+                    'timestamp' => $comment->getCreatedAt(),
+                    'message' => $comment->getComment()
+                ];
+            }
+        }
+        return $comments;
+    }
+}
diff --git a/app/code/Magento/SalesGraphQl/etc/schema.graphqls b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
index aa70a9366023d..d4d2bec3ff896 100644
--- a/app/code/Magento/SalesGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
@@ -50,7 +50,7 @@ type CustomerOrder @doc(description: "Contains details about each of the custome
     payment_methods: [PaymentMethod] @doc(description: "payment details for the order")
     shipping_address: CustomerAddress @doc(description: "shipping address for the order")
     billing_address: CustomerAddress @doc(description: "billing address for the order")
-    carrier: String @doc(description: "shipping carrier for the order delivery")
+    carrier: String @doc(description: "shipping carrier for the order delivery") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\CustomerOrders\\Carrier")
     shipping_method: String @doc(description: "shipping method for the order")
     comments: [CommentItem] @doc(description: "comments on the order")
     increment_id: String @deprecated(reason: "Use the id attribute instead")
@@ -163,7 +163,7 @@ type CommentItem @doc(description: "Comment item details") {
 
 type ShipmentItem @doc(description: "Order shipment item details") {
     id: ID! @doc(description: "Shipment item unique identifier")
-    order_item: OrderItemInterface @doc(description: "Associated order item")
+    order_item: OrderItemInterface @doc(description: "Associated order item") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\OrderItem")
     product_name: String @doc(description: "Name of the base product")
     product_sku: String! @doc(description: "SKU of the base product")
     product_sale_price: Money! @doc(description: "Sale price for the base product")

From 0d356ac334ef4aa8b891b8467954d8717be988f8 Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Wed, 3 Jun 2020 17:13:49 +0300
Subject: [PATCH 0378/1718] magento/magento2#: GraphQl.
 setShippingAddressesOnCart. Test coverage for `The shipping address must
 contain either "customer_address_id" or "address".` error.

---
 .../Model/Cart/SetShippingAddressesOnCart.php |  5 +-
 .../Customer/SetShippingAddressOnCartTest.php | 51 +++++++++++++++++++
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
index f73daa715c1df..e959c19a7cbe4 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
@@ -51,7 +51,10 @@ public function execute(ContextInterface $context, CartInterface $cart, array $s
         $shippingAddressInput = current($shippingAddressesInput) ?? [];
         $customerAddressId = $shippingAddressInput['customer_address_id'] ?? null;
 
-        if (!$customerAddressId && !isset($shippingAddressInput['address']['save_in_address_book'])) {
+        if (!$customerAddressId
+            && isset($shippingAddressInput['address'])
+            && !isset($shippingAddressInput['address']['save_in_address_book'])
+        ) {
             $shippingAddressInput['address']['save_in_address_book'] = true;
         }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
index 3e06b89c77fb7..900a2877e8c7b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
@@ -1745,6 +1745,57 @@ public function testSetNewShippingAddressWithDefaultValueOfSaveInAddressBookAndP
         }
     }
 
+    /**
+     * @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 testSetShippingAddressOnCartWithNullCustomerAddressId()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$maskedQuoteId"
+      shipping_addresses: [
+        {
+          customer_address_id: null
+        }
+      ]
+    }
+  ) {
+    cart {
+      shipping_addresses {
+        firstname
+        lastname
+        company
+        street
+        city
+        postcode
+        telephone
+        country {
+          label
+          code
+        }
+        region {
+            code
+            label
+        }
+        __typename
+      }
+    }
+  }
+}
+QUERY;
+        $this->expectExceptionMessage(
+            'The shipping address must contain either "customer_address_id" or "address".'
+        );
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+    }
+
     /**
      * Verify the all the whitelisted fields for a New Address Object
      *

From 4cf999c879083d69f5fb623b85f1cbc034a928aa Mon Sep 17 00:00:00 2001
From: John Carlo Octabio <johncarlo@abovethefray.io>
Date: Fri, 5 Jun 2020 13:47:13 +0800
Subject: [PATCH 0379/1718] magento/partners-magento2b2b#108: Clear Shopping
 Cart - Added admin configuration for display of clear shopping cart button

---
 app/code/Magento/Checkout/Block/Cart/Grid.php |    18 +
 .../Magento/Checkout/etc/adminhtml/system.xml |     4 +
 app/code/Magento/Checkout/etc/config.xml      |     1 +
 app/code/Magento/Checkout/i18n/en_US.csv      |     1 +
 .../view/frontend/templates/cart/form.phtml   |    18 +-
 .../Magento/luma/web/css/source/_extends.less |    10 +-
 composer.lock                                 | 10854 ----------------
 7 files changed, 42 insertions(+), 10864 deletions(-)
 delete mode 100644 composer.lock

diff --git a/app/code/Magento/Checkout/Block/Cart/Grid.php b/app/code/Magento/Checkout/Block/Cart/Grid.php
index bfe4b6ceed9d0..a92efb2c07837 100644
--- a/app/code/Magento/Checkout/Block/Cart/Grid.php
+++ b/app/code/Magento/Checkout/Block/Cart/Grid.php
@@ -22,6 +22,11 @@ class Grid extends \Magento\Checkout\Block\Cart
      */
     const XPATH_CONFIG_NUMBER_ITEMS_TO_DISPLAY_PAGER = 'checkout/cart/number_items_to_display_pager';
 
+    /**
+     * Default display setting for clear shopping cart button
+     */
+    const XPATH_CONFIG_ENABLE_CLEAR_SHOPPING_CART = 'checkout/cart/enable_clear_shopping_cart';
+
     /**
      * @var \Magento\Quote\Model\ResourceModel\Quote\Item\Collection
      */
@@ -174,4 +179,17 @@ private function isPagerDisplayedOnPage()
         }
         return $this->isPagerDisplayed;
     }
+
+    /**
+     * Check if clear shopping cart button is enabled
+     *
+     * @return bool
+     */
+    public function isClearShoppingCartEnabled()
+    {
+        return (bool) $this->_scopeConfig->getValue(
+            self::XPATH_CONFIG_ENABLE_CLEAR_SHOPPING_CART,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+    }
 }
diff --git a/app/code/Magento/Checkout/etc/adminhtml/system.xml b/app/code/Magento/Checkout/etc/adminhtml/system.xml
index 7454c2b6524f3..7cb1d09417e30 100644
--- a/app/code/Magento/Checkout/etc/adminhtml/system.xml
+++ b/app/code/Magento/Checkout/etc/adminhtml/system.xml
@@ -48,6 +48,10 @@
                     <label>Show Cross-sell Items in the Shopping Cart</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
+                <field id="enable_clear_shopping_cart" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Enable Clear Shopping Cart</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
             </group>
             <group id="cart_link" translate="label" sortOrder="3" showInDefault="1" showInWebsite="1">
                 <label>My Cart Link</label>
diff --git a/app/code/Magento/Checkout/etc/config.xml b/app/code/Magento/Checkout/etc/config.xml
index c8408f6d902fa..4db5f5bdc01c9 100644
--- a/app/code/Magento/Checkout/etc/config.xml
+++ b/app/code/Magento/Checkout/etc/config.xml
@@ -19,6 +19,7 @@
                 <redirect_to_cart>0</redirect_to_cart>
                 <number_items_to_display_pager>20</number_items_to_display_pager>
                 <crosssell_enabled>1</crosssell_enabled>
+                <enable_clear_shopping_cart>0</enable_clear_shopping_cart>
             </cart>
             <cart_link>
                 <use_qty>1</use_qty>
diff --git a/app/code/Magento/Checkout/i18n/en_US.csv b/app/code/Magento/Checkout/i18n/en_US.csv
index 251985faf6cc4..b8ff5b17d4c46 100644
--- a/app/code/Magento/Checkout/i18n/en_US.csv
+++ b/app/code/Magento/Checkout/i18n/en_US.csv
@@ -153,6 +153,7 @@ Shipping,Shipping
 "Maximum Number of Items to Display in Order Summary","Maximum Number of Items to Display in Order Summary"
 "Quote Lifetime (days)","Quote Lifetime (days)"
 "After Adding a Product Redirect to Shopping Cart","After Adding a Product Redirect to Shopping Cart"
+"Enable Clear Shopping Cart","Enable Clear Shopping Cart"
 "Number of Items to Display Pager","Number of Items to Display Pager"
 "My Cart Link","My Cart Link"
 "Display Cart Summary","Display Cart Summary"
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
index 370d70c44d886..9e8b32bb2c2cb 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
@@ -56,14 +56,16 @@
                 <span><?= $block->escapeHtml(__('Continue Shopping')) ?></span>
             </a>
         <?php endif; ?>
-        <button type="button"
-                name="update_cart_action"
-                data-cart-empty=""
-                value="empty_cart"
-                title="<?= $block->escapeHtml(__('Clear Shopping Cart')) ?>"
-                class="action clear" id="empty_cart_button">
-            <span><?= $block->escapeHtml(__('Clear Shopping Cart')) ?></span>
-        </button>
+        <?php if ($block->isClearShoppingCartEnabled()) :?>
+            <button type="button"
+                    name="update_cart_action"
+                    data-cart-empty=""
+                    value="empty_cart"
+                    title="<?= $block->escapeHtml(__('Clear Shopping Cart')) ?>"
+                    class="action clear" id="empty_cart_button">
+                <span><?= $block->escapeHtml(__('Clear Shopping Cart')) ?></span>
+            </button>
+        <?php endif ?>
         <button type="submit"
                 name="update_cart_action"
                 data-cart-item-update=""
diff --git a/app/design/frontend/Magento/luma/web/css/source/_extends.less b/app/design/frontend/Magento/luma/web/css/source/_extends.less
index ce86b690f6252..8ae1776daf239 100644
--- a/app/design/frontend/Magento/luma/web/css/source/_extends.less
+++ b/app/design/frontend/Magento/luma/web/css/source/_extends.less
@@ -1570,10 +1570,16 @@
         margin-bottom: @indent__base;
 
         .actions.main {
-            .continue,
-            .clear {
+            .continue {
                 display: none;
             }
+
+            .clear {
+                .lib-button-as-link(
+                    @_margin: 0 @indent__base 0 0
+                );
+                font-weight: @font-weight__regular;
+            }
         }
     }
 }
diff --git a/composer.lock b/composer.lock
deleted file mode 100644
index 6a47e7e44ab69..0000000000000
--- a/composer.lock
+++ /dev/null
@@ -1,10854 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "e86af25d9a4a1942c437cca58f9f1efb",
-    "packages": [
-        {
-            "name": "colinmollenhour/cache-backend-file",
-            "version": "v1.4.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/colinmollenhour/Cm_Cache_Backend_File.git",
-                "reference": "03c7d4c0f43b2de1b559a3527d18ff697d306544"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_File/zipball/03c7d4c0f43b2de1b559a3527d18ff697d306544",
-                "reference": "03c7d4c0f43b2de1b559a3527d18ff697d306544",
-                "shasum": ""
-            },
-            "type": "magento-module",
-            "autoload": {
-                "classmap": [
-                    "File.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Colin Mollenhour"
-                }
-            ],
-            "description": "The stock Zend_Cache_Backend_File backend has extremely poor performance for cleaning by tags making it become unusable as the number of cached items increases. This backend makes many changes resulting in a huge performance boost, especially for tag cleaning.",
-            "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_File",
-            "time": "2019-04-18T21:54:31+00:00"
-        },
-        {
-            "name": "colinmollenhour/cache-backend-redis",
-            "version": "1.11.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis.git",
-                "reference": "389fb68de15660e39b055d149d31f3708b5d6cbc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_Redis/zipball/389fb68de15660e39b055d149d31f3708b5d6cbc",
-                "reference": "389fb68de15660e39b055d149d31f3708b5d6cbc",
-                "shasum": ""
-            },
-            "require": {
-                "magento-hackathon/magento-composer-installer": "*"
-            },
-            "type": "magento-module",
-            "autoload": {
-                "classmap": [
-                    "Cm/Cache/Backend/Redis.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Colin Mollenhour"
-                }
-            ],
-            "description": "Zend_Cache backend using Redis with full support for tags.",
-            "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis",
-            "time": "2019-03-03T04:04:49+00:00"
-        },
-        {
-            "name": "colinmollenhour/credis",
-            "version": "1.11.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/colinmollenhour/credis.git",
-                "reference": "bd1da4698ab1918477f9e71e5ff0062b9a345008"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/colinmollenhour/credis/zipball/bd1da4698ab1918477f9e71e5ff0062b9a345008",
-                "reference": "bd1da4698ab1918477f9e71e5ff0062b9a345008",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4.0"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "Client.php",
-                    "Cluster.php",
-                    "Sentinel.php",
-                    "Module.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Colin Mollenhour",
-                    "email": "colin@mollenhour.com"
-                }
-            ],
-            "description": "Credis is a lightweight interface to the Redis key-value store which wraps the phpredis library when available for better performance.",
-            "homepage": "https://github.com/colinmollenhour/credis",
-            "time": "2019-11-26T18:09:45+00:00"
-        },
-        {
-            "name": "colinmollenhour/php-redis-session-abstract",
-            "version": "v1.4.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/colinmollenhour/php-redis-session-abstract.git",
-                "reference": "669521218794f125c7b668252f4f576eda65e1e4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/colinmollenhour/php-redis-session-abstract/zipball/669521218794f125c7b668252f4f576eda65e1e4",
-                "reference": "669521218794f125c7b668252f4f576eda65e1e4",
-                "shasum": ""
-            },
-            "require": {
-                "colinmollenhour/credis": "~1.6",
-                "php": "^5.5 || ^7.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Cm\\RedisSession\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Colin Mollenhour"
-                }
-            ],
-            "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"
-        },
-        {
-            "name": "composer/ca-bundle",
-            "version": "1.2.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/composer/ca-bundle.git",
-                "reference": "95c63ab2117a72f48f5a55da9740a3273d45b7fd"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/95c63ab2117a72f48f5a55da9740a3273d45b7fd",
-                "reference": "95c63ab2117a72f48f5a55da9740a3273d45b7fd",
-                "shasum": ""
-            },
-            "require": {
-                "ext-openssl": "*",
-                "ext-pcre": "*",
-                "php": "^5.3.2 || ^7.0 || ^8.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8",
-                "psr/log": "^1.0",
-                "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Composer\\CaBundle\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "http://seld.be"
-                }
-            ],
-            "description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.",
-            "keywords": [
-                "cabundle",
-                "cacert",
-                "certificate",
-                "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"
-        },
-        {
-            "name": "composer/composer",
-            "version": "1.10.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/composer/composer.git",
-                "reference": "be81b9c4735362c26876bdbfd3b5bc7e7f711c88"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/be81b9c4735362c26876bdbfd3b5bc7e7f711c88",
-                "reference": "be81b9c4735362c26876bdbfd3b5bc7e7f711c88",
-                "shasum": ""
-            },
-            "require": {
-                "composer/ca-bundle": "^1.0",
-                "composer/semver": "^1.0",
-                "composer/spdx-licenses": "^1.2",
-                "composer/xdebug-handler": "^1.1",
-                "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
-                "php": "^5.3.2 || ^7.0",
-                "psr/log": "^1.0",
-                "seld/jsonlint": "^1.4",
-                "seld/phar-utils": "^1.0",
-                "symfony/console": "^2.7 || ^3.0 || ^4.0 || ^5.0",
-                "symfony/filesystem": "^2.7 || ^3.0 || ^4.0 || ^5.0",
-                "symfony/finder": "^2.7 || ^3.0 || ^4.0 || ^5.0",
-                "symfony/process": "^2.7 || ^3.0 || ^4.0 || ^5.0"
-            },
-            "conflict": {
-                "symfony/console": "2.8.38",
-                "symfony/phpunit-bridge": "3.4.40"
-            },
-            "require-dev": {
-                "phpspec/prophecy": "^1.10",
-                "symfony/phpunit-bridge": "^3.4"
-            },
-            "suggest": {
-                "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
-                "ext-zip": "Enabling the zip extension allows you to unzip archives",
-                "ext-zlib": "Allow gzip compression of HTTP requests"
-            },
-            "bin": [
-                "bin/composer"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.10-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Composer\\": "src/Composer"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nils Adermann",
-                    "email": "naderman@naderman.de",
-                    "homepage": "http://www.naderman.de"
-                },
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "http://seld.be"
-                }
-            ],
-            "description": "Composer helps you declare, manage and install dependencies of PHP projects. It ensures you have the right stack everywhere.",
-            "homepage": "https://getcomposer.org/",
-            "keywords": [
-                "autoload",
-                "dependency",
-                "package"
-            ],
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-05-06T08:28:10+00:00"
-        },
-        {
-            "name": "composer/semver",
-            "version": "1.5.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/composer/semver.git",
-                "reference": "c6bea70230ef4dd483e6bbcab6005f682ed3a8de"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/c6bea70230ef4dd483e6bbcab6005f682ed3a8de",
-                "reference": "c6bea70230ef4dd483e6bbcab6005f682ed3a8de",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.2 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.5 || ^5.0.5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Composer\\Semver\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nils Adermann",
-                    "email": "naderman@naderman.de",
-                    "homepage": "http://www.naderman.de"
-                },
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "http://seld.be"
-                },
-                {
-                    "name": "Rob Bast",
-                    "email": "rob.bast@gmail.com",
-                    "homepage": "http://robbast.nl"
-                }
-            ],
-            "description": "Semver library that offers utilities, version constraint parsing and validation.",
-            "keywords": [
-                "semantic",
-                "semver",
-                "validation",
-                "versioning"
-            ],
-            "time": "2020-01-13T12:06:48+00:00"
-        },
-        {
-            "name": "composer/spdx-licenses",
-            "version": "1.5.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/composer/spdx-licenses.git",
-                "reference": "0c3e51e1880ca149682332770e25977c70cf9dae"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/0c3e51e1880ca149682332770e25977c70cf9dae",
-                "reference": "0c3e51e1880ca149682332770e25977c70cf9dae",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.2 || ^7.0 || ^8.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Composer\\Spdx\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nils Adermann",
-                    "email": "naderman@naderman.de",
-                    "homepage": "http://www.naderman.de"
-                },
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "http://seld.be"
-                },
-                {
-                    "name": "Rob Bast",
-                    "email": "rob.bast@gmail.com",
-                    "homepage": "http://robbast.nl"
-                }
-            ],
-            "description": "SPDX licenses list and validation library.",
-            "keywords": [
-                "license",
-                "spdx",
-                "validator"
-            ],
-            "time": "2020-02-14T07:44:31+00:00"
-        },
-        {
-            "name": "composer/xdebug-handler",
-            "version": "1.4.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "1ab9842d69e64fb3a01be6b656501032d1b78cb7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/1ab9842d69e64fb3a01be6b656501032d1b78cb7",
-                "reference": "1ab9842d69e64fb3a01be6b656501032d1b78cb7",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.2 || ^7.0 || ^8.0",
-                "psr/log": "^1.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Composer\\XdebugHandler\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "John Stevenson",
-                    "email": "john-stevenson@blueyonder.co.uk"
-                }
-            ],
-            "description": "Restarts a process without Xdebug.",
-            "keywords": [
-                "Xdebug",
-                "performance"
-            ],
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                }
-            ],
-            "time": "2020-03-01T12:26:26+00:00"
-        },
-        {
-            "name": "container-interop/container-interop",
-            "version": "1.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/container-interop/container-interop.git",
-                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8",
-                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8",
-                "shasum": ""
-            },
-            "require": {
-                "psr/container": "^1.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Interop\\Container\\": "src/Interop/Container/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
-            "homepage": "https://github.com/container-interop/container-interop",
-            "abandoned": "psr/container",
-            "time": "2017-02-14T19:40:03+00:00"
-        },
-        {
-            "name": "elasticsearch/elasticsearch",
-            "version": "v7.7.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/elastic/elasticsearch-php.git",
-                "reference": "1d90a7ff4fb1936dc4376f09d723af75714f6f05"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/1d90a7ff4fb1936dc4376f09d723af75714f6f05",
-                "reference": "1d90a7ff4fb1936dc4376f09d723af75714f6f05",
-                "shasum": ""
-            },
-            "require": {
-                "ext-json": ">=1.3.7",
-                "ezimuel/ringphp": "^1.1.2",
-                "php": "^7.1",
-                "psr/log": "~1.0"
-            },
-            "require-dev": {
-                "cpliakas/git-wrapper": "~2.0",
-                "doctrine/inflector": "^1.3",
-                "mockery/mockery": "^1.2",
-                "phpstan/phpstan": "^0.12",
-                "phpunit/phpunit": "^7.5",
-                "squizlabs/php_codesniffer": "^3.4",
-                "symfony/finder": "~4.0",
-                "symfony/yaml": "~4.0"
-            },
-            "suggest": {
-                "ext-curl": "*",
-                "monolog/monolog": "Allows for client-level logging and tracing"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "src/autoload.php"
-                ],
-                "psr-4": {
-                    "Elasticsearch\\": "src/Elasticsearch/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "Zachary Tong"
-                },
-                {
-                    "name": "Enrico Zimuel"
-                }
-            ],
-            "description": "PHP Client for Elasticsearch",
-            "keywords": [
-                "client",
-                "elasticsearch",
-                "search"
-            ],
-            "time": "2020-05-13T15:19:26+00:00"
-        },
-        {
-            "name": "ezimuel/guzzlestreams",
-            "version": "3.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/ezimuel/guzzlestreams.git",
-                "reference": "abe3791d231167f14eb80d413420d1eab91163a8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/ezimuel/guzzlestreams/zipball/abe3791d231167f14eb80d413420d1eab91163a8",
-                "reference": "abe3791d231167f14eb80d413420d1eab91163a8",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Stream\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                }
-            ],
-            "description": "Fork of guzzle/streams (abandoned) to be used with elasticsearch-php",
-            "homepage": "http://guzzlephp.org/",
-            "keywords": [
-                "Guzzle",
-                "stream"
-            ],
-            "time": "2020-02-14T23:11:50+00:00"
-        },
-        {
-            "name": "ezimuel/ringphp",
-            "version": "1.1.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/ezimuel/ringphp.git",
-                "reference": "0b78f89d8e0bb9e380046c31adfa40347e9f663b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/ezimuel/ringphp/zipball/0b78f89d8e0bb9e380046c31adfa40347e9f663b",
-                "reference": "0b78f89d8e0bb9e380046c31adfa40347e9f663b",
-                "shasum": ""
-            },
-            "require": {
-                "ezimuel/guzzlestreams": "^3.0.1",
-                "php": ">=5.4.0",
-                "react/promise": "~2.0"
-            },
-            "require-dev": {
-                "ext-curl": "*",
-                "phpunit/phpunit": "~4.0"
-            },
-            "suggest": {
-                "ext-curl": "Guzzle will use specific adapters if cURL is present"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Ring\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                }
-            ],
-            "description": "Fork of guzzle/RingPHP (abandoned) to be used with elasticsearch-php",
-            "time": "2020-02-14T23:51:21+00:00"
-        },
-        {
-            "name": "guzzlehttp/guzzle",
-            "version": "6.5.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/aab4ebd862aa7d04f01a4b51849d657db56d882e",
-                "reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e",
-                "shasum": ""
-            },
-            "require": {
-                "ext-json": "*",
-                "guzzlehttp/promises": "^1.0",
-                "guzzlehttp/psr7": "^1.6.1",
-                "php": ">=5.5",
-                "symfony/polyfill-intl-idn": "^1.11"
-            },
-            "require-dev": {
-                "ext-curl": "*",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
-                "psr/log": "^1.1"
-            },
-            "suggest": {
-                "psr/log": "Required for using the Log middleware"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "6.5-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\": "src/"
-                },
-                "files": [
-                    "src/functions_include.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                }
-            ],
-            "description": "Guzzle is a PHP HTTP client library",
-            "homepage": "http://guzzlephp.org/",
-            "keywords": [
-                "client",
-                "curl",
-                "framework",
-                "http",
-                "http client",
-                "rest",
-                "web service"
-            ],
-            "time": "2020-04-18T10:38:46+00:00"
-        },
-        {
-            "name": "guzzlehttp/promises",
-            "version": "v1.3.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/promises.git",
-                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
-                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Promise\\": "src/"
-                },
-                "files": [
-                    "src/functions_include.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                }
-            ],
-            "description": "Guzzle promises library",
-            "keywords": [
-                "promise"
-            ],
-            "time": "2016-12-20T10:07:11+00:00"
-        },
-        {
-            "name": "guzzlehttp/psr7",
-            "version": "1.6.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/psr7.git",
-                "reference": "239400de7a173fe9901b9ac7c06497751f00727a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a",
-                "reference": "239400de7a173fe9901b9ac7c06497751f00727a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4.0",
-                "psr/http-message": "~1.0",
-                "ralouphie/getallheaders": "^2.0.5 || ^3.0.0"
-            },
-            "provide": {
-                "psr/http-message-implementation": "1.0"
-            },
-            "require-dev": {
-                "ext-zlib": "*",
-                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
-            },
-            "suggest": {
-                "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.6-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Psr7\\": "src/"
-                },
-                "files": [
-                    "src/functions_include.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                },
-                {
-                    "name": "Tobias Schultze",
-                    "homepage": "https://github.com/Tobion"
-                }
-            ],
-            "description": "PSR-7 message implementation that also provides common utility methods",
-            "keywords": [
-                "http",
-                "message",
-                "psr-7",
-                "request",
-                "response",
-                "stream",
-                "uri",
-                "url"
-            ],
-            "time": "2019-07-01T23:21:34+00:00"
-        },
-        {
-            "name": "justinrainbow/json-schema",
-            "version": "5.2.9",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/justinrainbow/json-schema.git",
-                "reference": "44c6787311242a979fa15c704327c20e7221a0e4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/44c6787311242a979fa15c704327c20e7221a0e4",
-                "reference": "44c6787311242a979fa15c704327c20e7221a0e4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1",
-                "json-schema/json-schema-test-suite": "1.2.0",
-                "phpunit/phpunit": "^4.8.35"
-            },
-            "bin": [
-                "bin/validate-json"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "JsonSchema\\": "src/JsonSchema/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bruno Prieto Reis",
-                    "email": "bruno.p.reis@gmail.com"
-                },
-                {
-                    "name": "Justin Rainbow",
-                    "email": "justin.rainbow@gmail.com"
-                },
-                {
-                    "name": "Igor Wiedler",
-                    "email": "igor@wiedler.ch"
-                },
-                {
-                    "name": "Robert Schönthal",
-                    "email": "seroscho@googlemail.com"
-                }
-            ],
-            "description": "A library to validate a json schema.",
-            "homepage": "https://github.com/justinrainbow/json-schema",
-            "keywords": [
-                "json",
-                "schema"
-            ],
-            "time": "2019-09-25T14:49:45+00:00"
-        },
-        {
-            "name": "laminas/laminas-captcha",
-            "version": "2.9.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-captcha.git",
-                "reference": "b88f650f3adf2d902ef56f6377cceb5cd87b9876"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-captcha/zipball/b88f650f3adf2d902ef56f6377cceb5cd87b9876",
-                "reference": "b88f650f3adf2d902ef56f6377cceb5cd87b9876",
-                "shasum": ""
-            },
-            "require": {
-                "laminas/laminas-math": "^2.7 || ^3.0",
-                "laminas/laminas-stdlib": "^3.2.1",
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0"
-            },
-            "replace": {
-                "zendframework/zend-captcha": "self.version"
-            },
-            "require-dev": {
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "laminas/laminas-recaptcha": "^3.0",
-                "laminas/laminas-session": "^2.8",
-                "laminas/laminas-text": "^2.6",
-                "laminas/laminas-validator": "^2.10.1",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
-            },
-            "suggest": {
-                "laminas/laminas-i18n-resources": "Translations of captcha messages",
-                "laminas/laminas-recaptcha": "Laminas\\ReCaptcha component",
-                "laminas/laminas-session": "Laminas\\Session component",
-                "laminas/laminas-text": "Laminas\\Text component",
-                "laminas/laminas-validator": "Laminas\\Validator component"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.9.x-dev",
-                    "dev-develop": "2.10.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Captcha\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Generate and validate CAPTCHAs using Figlets, images, ReCaptcha, and more",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "captcha",
-                "laminas"
-            ],
-            "time": "2019-12-31T16:24:14+00:00"
-        },
-        {
-            "name": "laminas/laminas-code",
-            "version": "3.4.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-code.git",
-                "reference": "1cb8f203389ab1482bf89c0e70a04849bacd7766"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-code/zipball/1cb8f203389ab1482bf89c0e70a04849bacd7766",
-                "reference": "1cb8f203389ab1482bf89c0e70a04849bacd7766",
-                "shasum": ""
-            },
-            "require": {
-                "laminas/laminas-eventmanager": "^2.6 || ^3.0",
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^7.1"
-            },
-            "conflict": {
-                "phpspec/prophecy": "<1.9.0"
-            },
-            "replace": {
-                "zendframework/zend-code": "self.version"
-            },
-            "require-dev": {
-                "doctrine/annotations": "^1.7",
-                "ext-phar": "*",
-                "laminas/laminas-coding-standard": "^1.0",
-                "laminas/laminas-stdlib": "^2.7 || ^3.0",
-                "phpunit/phpunit": "^7.5.16 || ^8.4"
-            },
-            "suggest": {
-                "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features",
-                "laminas/laminas-stdlib": "Laminas\\Stdlib component"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.4.x-dev",
-                    "dev-develop": "3.5.x-dev",
-                    "dev-dev-4.0": "4.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Code\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Extensions to the PHP Reflection API, static code scanning, and code generation",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "code",
-                "laminas"
-            ],
-            "time": "2019-12-31T16:28:24+00:00"
-        },
-        {
-            "name": "laminas/laminas-config",
-            "version": "2.6.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-config.git",
-                "reference": "71ba6d5dd703196ce66b25abc4d772edb094dae1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-config/zipball/71ba6d5dd703196ce66b25abc4d772edb094dae1",
-                "reference": "71ba6d5dd703196ce66b25abc4d772edb094dae1",
-                "shasum": ""
-            },
-            "require": {
-                "laminas/laminas-stdlib": "^2.7 || ^3.0",
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.5 || ^7.0"
-            },
-            "replace": {
-                "zendframework/zend-config": "self.version"
-            },
-            "require-dev": {
-                "fabpot/php-cs-fixer": "1.7.*",
-                "laminas/laminas-filter": "^2.6",
-                "laminas/laminas-i18n": "^2.5",
-                "laminas/laminas-json": "^2.6.1",
-                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
-                "phpunit/phpunit": "~4.0"
-            },
-            "suggest": {
-                "laminas/laminas-filter": "Laminas\\Filter component",
-                "laminas/laminas-i18n": "Laminas\\I18n component",
-                "laminas/laminas-json": "Laminas\\Json to use the Json reader or writer classes",
-                "laminas/laminas-servicemanager": "Laminas\\ServiceManager for use with the Config Factory to retrieve reader and writer instances"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.6-dev",
-                    "dev-develop": "2.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Config\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "provides a nested object property based user interface for accessing this configuration data within application code",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "config",
-                "laminas"
-            ],
-            "time": "2019-12-31T16:30:04+00:00"
-        },
-        {
-            "name": "laminas/laminas-console",
-            "version": "2.8.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-console.git",
-                "reference": "478a6ceac3e31fb38d6314088abda8b239ee23a5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-console/zipball/478a6ceac3e31fb38d6314088abda8b239ee23a5",
-                "reference": "478a6ceac3e31fb38d6314088abda8b239ee23a5",
-                "shasum": ""
-            },
-            "require": {
-                "laminas/laminas-stdlib": "^3.2.1",
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0"
-            },
-            "replace": {
-                "zendframework/zend-console": "self.version"
-            },
-            "require-dev": {
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "laminas/laminas-filter": "^2.7.2",
-                "laminas/laminas-json": "^2.6 || ^3.0",
-                "laminas/laminas-validator": "^2.10.1",
-                "phpunit/phpunit": "^5.7.23 || ^6.4.3"
-            },
-            "suggest": {
-                "laminas/laminas-filter": "To support DefaultRouteMatcher usage",
-                "laminas/laminas-validator": "To support DefaultRouteMatcher usage"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8.x-dev",
-                    "dev-develop": "2.9.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Console\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Build console applications using getopt syntax or routing, complete with prompts",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "console",
-                "laminas"
-            ],
-            "time": "2019-12-31T16:31:45+00:00"
-        },
-        {
-            "name": "laminas/laminas-crypt",
-            "version": "2.6.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-crypt.git",
-                "reference": "6f291fe90c84c74d737c9dc9b8f0ad2b55dc0567"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-crypt/zipball/6f291fe90c84c74d737c9dc9b8f0ad2b55dc0567",
-                "reference": "6f291fe90c84c74d737c9dc9b8f0ad2b55dc0567",
-                "shasum": ""
-            },
-            "require": {
-                "container-interop/container-interop": "~1.0",
-                "laminas/laminas-math": "^2.6",
-                "laminas/laminas-stdlib": "^2.7 || ^3.0",
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.5 || ^7.0"
-            },
-            "replace": {
-                "zendframework/zend-crypt": "self.version"
-            },
-            "require-dev": {
-                "fabpot/php-cs-fixer": "1.7.*",
-                "phpunit/phpunit": "~4.0"
-            },
-            "suggest": {
-                "ext-mcrypt": "Required for most features of Laminas\\Crypt"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.6-dev",
-                    "dev-develop": "2.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Crypt\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "crypt",
-                "laminas"
-            ],
-            "time": "2019-12-31T16:33:11+00:00"
-        },
-        {
-            "name": "laminas/laminas-db",
-            "version": "2.11.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-db.git",
-                "reference": "6c4238918b9204db1eb8cafae2c1940d40f4c007"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-db/zipball/6c4238918b9204db1eb8cafae2c1940d40f4c007",
-                "reference": "6c4238918b9204db1eb8cafae2c1940d40f4c007",
-                "shasum": ""
-            },
-            "require": {
-                "laminas/laminas-stdlib": "^2.7 || ^3.0",
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0"
-            },
-            "replace": {
-                "zendframework/zend-db": "^2.11.0"
-            },
-            "require-dev": {
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
-                "laminas/laminas-hydrator": "^1.1 || ^2.1 || ^3.0",
-                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.14"
-            },
-            "suggest": {
-                "laminas/laminas-eventmanager": "Laminas\\EventManager component",
-                "laminas/laminas-hydrator": "Laminas\\Hydrator component for using HydratingResultSets",
-                "laminas/laminas-servicemanager": "Laminas\\ServiceManager component"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.11.x-dev",
-                    "dev-develop": "2.12.x-dev"
-                },
-                "laminas": {
-                    "component": "Laminas\\Db",
-                    "config-provider": "Laminas\\Db\\ConfigProvider"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Db\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Database abstraction layer, SQL abstraction, result set abstraction, and RowDataGateway and TableDataGateway implementations",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "db",
-                "laminas"
-            ],
-            "time": "2020-03-29T12:08:51+00:00"
-        },
-        {
-            "name": "laminas/laminas-dependency-plugin",
-            "version": "1.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-dependency-plugin.git",
-                "reference": "38bf91861f5b4d49f9a1c530327c997f7a7fb2db"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-dependency-plugin/zipball/38bf91861f5b4d49f9a1c530327c997f7a7fb2db",
-                "reference": "38bf91861f5b4d49f9a1c530327c997f7a7fb2db",
-                "shasum": ""
-            },
-            "require": {
-                "composer-plugin-api": "^1.1",
-                "php": "^5.6 || ^7.0"
-            },
-            "require-dev": {
-                "composer/composer": "^1.9",
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
-                "phpcompatibility/php-compatibility": "^9.3",
-                "phpunit/phpunit": "^8.4",
-                "roave/security-advisories": "dev-master",
-                "webimpress/coding-standard": "^1.0"
-            },
-            "type": "composer-plugin",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev",
-                    "dev-develop": "1.1.x-dev"
-                },
-                "class": "Laminas\\DependencyPlugin\\DependencyRewriterPlugin"
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\DependencyPlugin\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "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"
-        },
-        {
-            "name": "laminas/laminas-di",
-            "version": "2.6.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-di.git",
-                "reference": "239b22408a1f8eacda6fc2b838b5065c4cf1d88e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-di/zipball/239b22408a1f8eacda6fc2b838b5065c4cf1d88e",
-                "reference": "239b22408a1f8eacda6fc2b838b5065c4cf1d88e",
-                "shasum": ""
-            },
-            "require": {
-                "container-interop/container-interop": "^1.1",
-                "laminas/laminas-code": "^2.6 || ^3.0",
-                "laminas/laminas-stdlib": "^2.7 || ^3.0",
-                "laminas/laminas-zendframework-bridge": "^0.4.5 || ^1.0",
-                "php": "^5.5 || ^7.0"
-            },
-            "replace": {
-                "zendframework/zend-di": "self.version"
-            },
-            "require-dev": {
-                "fabpot/php-cs-fixer": "1.7.*",
-                "phpunit/phpunit": "~4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.6-dev",
-                    "dev-develop": "2.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Di\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "di",
-                "laminas"
-            ],
-            "time": "2019-12-31T15:17:33+00:00"
-        },
-        {
-            "name": "laminas/laminas-diactoros",
-            "version": "1.8.7p2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-diactoros.git",
-                "reference": "6991c1af7c8d2c8efee81b22ba97024781824aaa"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/6991c1af7c8d2c8efee81b22ba97024781824aaa",
-                "reference": "6991c1af7c8d2c8efee81b22ba97024781824aaa",
-                "shasum": ""
-            },
-            "require": {
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0",
-                "psr/http-message": "^1.0"
-            },
-            "provide": {
-                "psr/http-message-implementation": "1.0"
-            },
-            "replace": {
-                "zendframework/zend-diactoros": "~1.8.7.0"
-            },
-            "require-dev": {
-                "ext-dom": "*",
-                "ext-libxml": "*",
-                "laminas/laminas-coding-standard": "~1.0",
-                "php-http/psr7-integration-tests": "dev-master",
-                "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-release-1.8": "1.8.x-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/functions/create_uploaded_file.php",
-                    "src/functions/marshal_headers_from_sapi.php",
-                    "src/functions/marshal_method_from_sapi.php",
-                    "src/functions/marshal_protocol_version_from_sapi.php",
-                    "src/functions/marshal_uri_from_sapi.php",
-                    "src/functions/normalize_server.php",
-                    "src/functions/normalize_uploaded_files.php",
-                    "src/functions/parse_cookie_header.php",
-                    "src/functions/create_uploaded_file.legacy.php",
-                    "src/functions/marshal_headers_from_sapi.legacy.php",
-                    "src/functions/marshal_method_from_sapi.legacy.php",
-                    "src/functions/marshal_protocol_version_from_sapi.legacy.php",
-                    "src/functions/marshal_uri_from_sapi.legacy.php",
-                    "src/functions/normalize_server.legacy.php",
-                    "src/functions/normalize_uploaded_files.legacy.php",
-                    "src/functions/parse_cookie_header.legacy.php"
-                ],
-                "psr-4": {
-                    "Laminas\\Diactoros\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "PSR HTTP Message implementations",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "http",
-                "laminas",
-                "psr",
-                "psr-7"
-            ],
-            "time": "2020-03-23T15:28:28+00:00"
-        },
-        {
-            "name": "laminas/laminas-escaper",
-            "version": "2.6.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-escaper.git",
-                "reference": "25f2a053eadfa92ddacb609dcbbc39362610da70"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/25f2a053eadfa92ddacb609dcbbc39362610da70",
-                "reference": "25f2a053eadfa92ddacb609dcbbc39362610da70",
-                "shasum": ""
-            },
-            "require": {
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0"
-            },
-            "replace": {
-                "zendframework/zend-escaper": "self.version"
-            },
-            "require-dev": {
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.6.x-dev",
-                    "dev-develop": "2.7.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Escaper\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "escaper",
-                "laminas"
-            ],
-            "time": "2019-12-31T16:43:30+00:00"
-        },
-        {
-            "name": "laminas/laminas-eventmanager",
-            "version": "3.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-eventmanager.git",
-                "reference": "ce4dc0bdf3b14b7f9815775af9dfee80a63b4748"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-eventmanager/zipball/ce4dc0bdf3b14b7f9815775af9dfee80a63b4748",
-                "reference": "ce4dc0bdf3b14b7f9815775af9dfee80a63b4748",
-                "shasum": ""
-            },
-            "require": {
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0"
-            },
-            "replace": {
-                "zendframework/zend-eventmanager": "self.version"
-            },
-            "require-dev": {
-                "athletic/athletic": "^0.1",
-                "container-interop/container-interop": "^1.1.0",
-                "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"
-            },
-            "suggest": {
-                "container-interop/container-interop": "^1.1.0, 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"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\EventManager\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Trigger and listen to events within a PHP application",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "event",
-                "eventmanager",
-                "events",
-                "laminas"
-            ],
-            "time": "2019-12-31T16:44:52+00:00"
-        },
-        {
-            "name": "laminas/laminas-feed",
-            "version": "2.12.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-feed.git",
-                "reference": "8a193ac96ebcb3e16b6ee754ac2a889eefacb654"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-feed/zipball/8a193ac96ebcb3e16b6ee754ac2a889eefacb654",
-                "reference": "8a193ac96ebcb3e16b6ee754ac2a889eefacb654",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-libxml": "*",
-                "laminas/laminas-escaper": "^2.5.2",
-                "laminas/laminas-stdlib": "^3.2.1",
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0"
-            },
-            "replace": {
-                "zendframework/zend-feed": "^2.12.0"
-            },
-            "require-dev": {
-                "laminas/laminas-cache": "^2.7.2",
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "laminas/laminas-db": "^2.8.2",
-                "laminas/laminas-http": "^2.7",
-                "laminas/laminas-servicemanager": "^2.7.8 || ^3.3",
-                "laminas/laminas-validator": "^2.10.1",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20",
-                "psr/http-message": "^1.0.1"
-            },
-            "suggest": {
-                "laminas/laminas-cache": "Laminas\\Cache component, for optionally caching feeds between requests",
-                "laminas/laminas-db": "Laminas\\Db component, for use with PubSubHubbub",
-                "laminas/laminas-http": "Laminas\\Http for PubSubHubbub, and optionally for use with Laminas\\Feed\\Reader",
-                "laminas/laminas-servicemanager": "Laminas\\ServiceManager component, for easily extending ExtensionManager implementations",
-                "laminas/laminas-validator": "Laminas\\Validator component, for validating email addresses used in Atom feeds and entries when using the Writer subcomponent",
-                "psr/http-message": "PSR-7 ^1.0.1, if you wish to use Laminas\\Feed\\Reader\\Http\\Psr7ResponseDecorator"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.12.x-dev",
-                    "dev-develop": "2.13.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Feed\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "provides functionality for consuming RSS and Atom feeds",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "feed",
-                "laminas"
-            ],
-            "time": "2020-03-29T12:36:29+00:00"
-        },
-        {
-            "name": "laminas/laminas-filter",
-            "version": "2.9.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-filter.git",
-                "reference": "3c4476e772a062cef7531c6793377ae585d89c82"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/3c4476e772a062cef7531c6793377ae585d89c82",
-                "reference": "3c4476e772a062cef7531c6793377ae585d89c82",
-                "shasum": ""
-            },
-            "require": {
-                "laminas/laminas-stdlib": "^2.7.7 || ^3.1",
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0"
-            },
-            "conflict": {
-                "laminas/laminas-validator": "<2.10.1"
-            },
-            "replace": {
-                "zendframework/zend-filter": "^2.9.2"
-            },
-            "require-dev": {
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "laminas/laminas-crypt": "^3.2.1",
-                "laminas/laminas-servicemanager": "^2.7.8 || ^3.3",
-                "laminas/laminas-uri": "^2.6",
-                "pear/archive_tar": "^1.4.3",
-                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
-                "psr/http-factory": "^1.0"
-            },
-            "suggest": {
-                "laminas/laminas-crypt": "Laminas\\Crypt component, for encryption filters",
-                "laminas/laminas-i18n": "Laminas\\I18n component for filters depending on i18n functionality",
-                "laminas/laminas-servicemanager": "Laminas\\ServiceManager component, for using the filter chain functionality",
-                "laminas/laminas-uri": "Laminas\\Uri component, for the UriNormalize filter",
-                "psr/http-factory-implementation": "psr/http-factory-implementation, for creating file upload instances when consuming PSR-7 in file upload filters"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.9.x-dev",
-                    "dev-develop": "2.10.x-dev"
-                },
-                "laminas": {
-                    "component": "Laminas\\Filter",
-                    "config-provider": "Laminas\\Filter\\ConfigProvider"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Filter\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Programmatically filter and normalize data and files",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "filter",
-                "laminas"
-            ],
-            "time": "2020-03-29T12:41:29+00:00"
-        },
-        {
-            "name": "laminas/laminas-form",
-            "version": "2.14.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-form.git",
-                "reference": "3e22e09751cf6ae031be87a44e092e7925ce5b7b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-form/zipball/3e22e09751cf6ae031be87a44e092e7925ce5b7b",
-                "reference": "3e22e09751cf6ae031be87a44e092e7925ce5b7b",
-                "shasum": ""
-            },
-            "require": {
-                "laminas/laminas-hydrator": "^1.1 || ^2.1 || ^3.0",
-                "laminas/laminas-inputfilter": "^2.8",
-                "laminas/laminas-stdlib": "^3.2.1",
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0"
-            },
-            "replace": {
-                "zendframework/zend-form": "^2.14.3"
-            },
-            "require-dev": {
-                "doctrine/annotations": "~1.0",
-                "laminas/laminas-cache": "^2.6.1",
-                "laminas/laminas-captcha": "^2.7.1",
-                "laminas/laminas-code": "^2.6 || ^3.0",
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "laminas/laminas-escaper": "^2.5",
-                "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
-                "laminas/laminas-filter": "^2.6",
-                "laminas/laminas-i18n": "^2.6",
-                "laminas/laminas-recaptcha": "^3.0.0",
-                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
-                "laminas/laminas-session": "^2.8.1",
-                "laminas/laminas-text": "^2.6",
-                "laminas/laminas-validator": "^2.6",
-                "laminas/laminas-view": "^2.6.2",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20"
-            },
-            "suggest": {
-                "laminas/laminas-captcha": "^2.7.1, required for using CAPTCHA form elements",
-                "laminas/laminas-code": "^2.6 || ^3.0, required to use laminas-form annotations support",
-                "laminas/laminas-eventmanager": "^2.6.2 || ^3.0, reuired for laminas-form annotations support",
-                "laminas/laminas-i18n": "^2.6, required when using laminas-form view helpers",
-                "laminas/laminas-recaptcha": "in order to use the ReCaptcha form element",
-                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3, required to use the form factories or provide services",
-                "laminas/laminas-view": "^2.6.2, required for using the laminas-form view helpers"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.14.x-dev",
-                    "dev-develop": "2.15.x-dev"
-                },
-                "laminas": {
-                    "component": "Laminas\\Form",
-                    "config-provider": "Laminas\\Form\\ConfigProvider"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Form\\": "src/"
-                },
-                "files": [
-                    "autoload/formElementManagerPolyfill.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Validate and display simple and complex forms, casting forms to business objects and vice versa",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "form",
-                "laminas"
-            ],
-            "time": "2020-03-29T12:46:16+00:00"
-        },
-        {
-            "name": "laminas/laminas-http",
-            "version": "2.11.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-http.git",
-                "reference": "8c66963b933c80da59433da56a44dfa979f3ec88"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-http/zipball/8c66963b933c80da59433da56a44dfa979f3ec88",
-                "reference": "8c66963b933c80da59433da56a44dfa979f3ec88",
-                "shasum": ""
-            },
-            "require": {
-                "laminas/laminas-loader": "^2.5.1",
-                "laminas/laminas-stdlib": "^3.2.1",
-                "laminas/laminas-uri": "^2.5.2",
-                "laminas/laminas-validator": "^2.10.1",
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0"
-            },
-            "replace": {
-                "zendframework/zend-http": "self.version"
-            },
-            "require-dev": {
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "laminas/laminas-config": "^3.1 || ^2.6",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.3"
-            },
-            "suggest": {
-                "paragonie/certainty": "For automated management of cacert.pem"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.11.x-dev",
-                    "dev-develop": "2.12.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Http\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "http",
-                "http client",
-                "laminas"
-            ],
-            "time": "2019-12-31T17:02:36+00:00"
-        },
-        {
-            "name": "laminas/laminas-hydrator",
-            "version": "2.4.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-hydrator.git",
-                "reference": "4a0e81cf05f32edcace817f1f48cb4055f689d85"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-hydrator/zipball/4a0e81cf05f32edcace817f1f48cb4055f689d85",
-                "reference": "4a0e81cf05f32edcace817f1f48cb4055f689d85",
-                "shasum": ""
-            },
-            "require": {
-                "laminas/laminas-stdlib": "^3.0",
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0"
-            },
-            "replace": {
-                "zendframework/zend-hydrator": "self.version"
-            },
-            "require-dev": {
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
-                "laminas/laminas-filter": "^2.6",
-                "laminas/laminas-inputfilter": "^2.6",
-                "laminas/laminas-serializer": "^2.6.1",
-                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
-            },
-            "suggest": {
-                "laminas/laminas-eventmanager": "^2.6.2 || ^3.0, to support aggregate hydrator usage",
-                "laminas/laminas-filter": "^2.6, to support naming strategy hydrator usage",
-                "laminas/laminas-serializer": "^2.6.1, to use the SerializableStrategy",
-                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3, to support hydrator plugin manager usage"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-release-2.4": "2.4.x-dev"
-                },
-                "laminas": {
-                    "component": "Laminas\\Hydrator",
-                    "config-provider": "Laminas\\Hydrator\\ConfigProvider"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Hydrator\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Serialize objects to arrays, and vice versa",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "hydrator",
-                "laminas"
-            ],
-            "time": "2019-12-31T17:06:38+00:00"
-        },
-        {
-            "name": "laminas/laminas-i18n",
-            "version": "2.10.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-i18n.git",
-                "reference": "94ff957a1366f5be94f3d3a9b89b50386649e3ae"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-i18n/zipball/94ff957a1366f5be94f3d3a9b89b50386649e3ae",
-                "reference": "94ff957a1366f5be94f3d3a9b89b50386649e3ae",
-                "shasum": ""
-            },
-            "require": {
-                "ext-intl": "*",
-                "laminas/laminas-stdlib": "^2.7 || ^3.0",
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0"
-            },
-            "conflict": {
-                "phpspec/prophecy": "<1.9.0"
-            },
-            "replace": {
-                "zendframework/zend-i18n": "^2.10.1"
-            },
-            "require-dev": {
-                "laminas/laminas-cache": "^2.6.1",
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "laminas/laminas-config": "^2.6",
-                "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
-                "laminas/laminas-filter": "^2.6.1",
-                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
-                "laminas/laminas-validator": "^2.6",
-                "laminas/laminas-view": "^2.6.3",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.16"
-            },
-            "suggest": {
-                "laminas/laminas-cache": "Laminas\\Cache component",
-                "laminas/laminas-config": "Laminas\\Config component",
-                "laminas/laminas-eventmanager": "You should install this package to use the events in the translator",
-                "laminas/laminas-filter": "You should install this package to use the provided filters",
-                "laminas/laminas-i18n-resources": "Translation resources",
-                "laminas/laminas-servicemanager": "Laminas\\ServiceManager component",
-                "laminas/laminas-validator": "You should install this package to use the provided validators",
-                "laminas/laminas-view": "You should install this package to use the provided view helpers"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.10.x-dev",
-                    "dev-develop": "2.11.x-dev"
-                },
-                "laminas": {
-                    "component": "Laminas\\I18n",
-                    "config-provider": "Laminas\\I18n\\ConfigProvider"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\I18n\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Provide translations for your application, and filter and validate internationalized values",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "i18n",
-                "laminas"
-            ],
-            "time": "2020-03-29T12:51:08+00:00"
-        },
-        {
-            "name": "laminas/laminas-inputfilter",
-            "version": "2.10.1",
-            "source": {
-                "type": "git",
-                "url": "git@github.com:laminas/laminas-inputfilter.git",
-                "reference": "b29ce8f512c966468eee37ea4873ae5fb545d00a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-inputfilter/zipball/b29ce8f512c966468eee37ea4873ae5fb545d00a",
-                "reference": "b29ce8f512c966468eee37ea4873ae5fb545d00a",
-                "shasum": ""
-            },
-            "require": {
-                "laminas/laminas-filter": "^2.9.1",
-                "laminas/laminas-servicemanager": "^2.7.10 || ^3.3.1",
-                "laminas/laminas-stdlib": "^2.7 || ^3.0",
-                "laminas/laminas-validator": "^2.11",
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0"
-            },
-            "replace": {
-                "zendframework/zend-inputfilter": "self.version"
-            },
-            "require-dev": {
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.15",
-                "psr/http-message": "^1.0"
-            },
-            "suggest": {
-                "psr/http-message-implementation": "PSR-7 is required if you wish to validate PSR-7 UploadedFileInterface payloads"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.10.x-dev",
-                    "dev-develop": "2.11.x-dev"
-                },
-                "laminas": {
-                    "component": "Laminas\\InputFilter",
-                    "config-provider": "Laminas\\InputFilter\\ConfigProvider"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\InputFilter\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Normalize and validate input sets from the web, APIs, the CLI, and more, including files",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "inputfilter",
-                "laminas"
-            ],
-            "time": "2019-12-31T17:11:54+00:00"
-        },
-        {
-            "name": "laminas/laminas-json",
-            "version": "2.6.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-json.git",
-                "reference": "db58425b7f0eba44a7539450cc926af80915951a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-json/zipball/db58425b7f0eba44a7539450cc926af80915951a",
-                "reference": "db58425b7f0eba44a7539450cc926af80915951a",
-                "shasum": ""
-            },
-            "require": {
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.5 || ^7.0"
-            },
-            "replace": {
-                "zendframework/zend-json": "self.version"
-            },
-            "require-dev": {
-                "fabpot/php-cs-fixer": "1.7.*",
-                "laminas/laminas-http": "^2.5.4",
-                "laminas/laminas-server": "^2.6.1",
-                "laminas/laminas-stdlib": "^2.5 || ^3.0",
-                "laminas/laminas-xml": "^1.0.2",
-                "phpunit/phpunit": "~4.0"
-            },
-            "suggest": {
-                "laminas/laminas-http": "Laminas\\Http component, required to use Laminas\\Json\\Server",
-                "laminas/laminas-server": "Laminas\\Server component, required to use Laminas\\Json\\Server",
-                "laminas/laminas-stdlib": "Laminas\\Stdlib component, for use with caching Laminas\\Json\\Server responses",
-                "laminas/laminas-xml": "To support Laminas\\Json\\Json::fromXml() usage"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.6-dev",
-                    "dev-develop": "2.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Json\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "json",
-                "laminas"
-            ],
-            "time": "2019-12-31T17:15:00+00:00"
-        },
-        {
-            "name": "laminas/laminas-loader",
-            "version": "2.6.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-loader.git",
-                "reference": "5d01c2c237ae9e68bec262f339947e2ea18979bc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-loader/zipball/5d01c2c237ae9e68bec262f339947e2ea18979bc",
-                "reference": "5d01c2c237ae9e68bec262f339947e2ea18979bc",
-                "shasum": ""
-            },
-            "require": {
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0"
-            },
-            "replace": {
-                "zendframework/zend-loader": "self.version"
-            },
-            "require-dev": {
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.6.x-dev",
-                    "dev-develop": "2.7.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Loader\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Autoloading and plugin loading strategies",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "laminas",
-                "loader"
-            ],
-            "time": "2019-12-31T17:18:27+00:00"
-        },
-        {
-            "name": "laminas/laminas-log",
-            "version": "2.12.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-log.git",
-                "reference": "4e92d841b48868714a070b10866e94be80fc92ff"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-log/zipball/4e92d841b48868714a070b10866e94be80fc92ff",
-                "reference": "4e92d841b48868714a070b10866e94be80fc92ff",
-                "shasum": ""
-            },
-            "require": {
-                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
-                "laminas/laminas-stdlib": "^2.7 || ^3.0",
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0",
-                "psr/log": "^1.1.2"
-            },
-            "provide": {
-                "psr/log-implementation": "1.0.0"
-            },
-            "replace": {
-                "zendframework/zend-log": "self.version"
-            },
-            "require-dev": {
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "laminas/laminas-db": "^2.6",
-                "laminas/laminas-escaper": "^2.5",
-                "laminas/laminas-filter": "^2.5",
-                "laminas/laminas-mail": "^2.6.1",
-                "laminas/laminas-validator": "^2.10.1",
-                "mikey179/vfsstream": "^1.6.7",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.15"
-            },
-            "suggest": {
-                "ext-mongo": "mongo extension to use Mongo writer",
-                "ext-mongodb": "mongodb extension to use MongoDB writer",
-                "laminas/laminas-db": "Laminas\\Db component to use the database log writer",
-                "laminas/laminas-escaper": "Laminas\\Escaper component, for use in the XML log formatter",
-                "laminas/laminas-mail": "Laminas\\Mail component to use the email log writer",
-                "laminas/laminas-validator": "Laminas\\Validator component to block invalid log messages"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.12.x-dev",
-                    "dev-develop": "2.13.x-dev"
-                },
-                "laminas": {
-                    "component": "Laminas\\Log",
-                    "config-provider": "Laminas\\Log\\ConfigProvider"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Log\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Robust, composite logger with filtering, formatting, and PSR-3 support",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "laminas",
-                "log",
-                "logging"
-            ],
-            "time": "2019-12-31T17:18:59+00:00"
-        },
-        {
-            "name": "laminas/laminas-mail",
-            "version": "2.10.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-mail.git",
-                "reference": "cfe0711446c8d9c392e9fc664c9ccc180fa89005"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-mail/zipball/cfe0711446c8d9c392e9fc664c9ccc180fa89005",
-                "reference": "cfe0711446c8d9c392e9fc664c9ccc180fa89005",
-                "shasum": ""
-            },
-            "require": {
-                "ext-iconv": "*",
-                "laminas/laminas-loader": "^2.5",
-                "laminas/laminas-mime": "^2.5",
-                "laminas/laminas-stdlib": "^2.7 || ^3.0",
-                "laminas/laminas-validator": "^2.10.2",
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0",
-                "true/punycode": "^2.1"
-            },
-            "replace": {
-                "zendframework/zend-mail": "^2.10.0"
-            },
-            "require-dev": {
-                "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"
-            },
-            "suggest": {
-                "laminas/laminas-crypt": "Crammd5 support in SMTP Auth",
-                "laminas/laminas-servicemanager": "^2.7.10 || ^3.3.1 when using SMTP to deliver messages"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.10.x-dev",
-                    "dev-develop": "2.11.x-dev"
-                },
-                "laminas": {
-                    "component": "Laminas\\Mail",
-                    "config-provider": "Laminas\\Mail\\ConfigProvider"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Mail\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Provides generalized functionality to compose and send both text and MIME-compliant multipart e-mail messages",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "laminas",
-                "mail"
-            ],
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
-            "time": "2020-04-21T16:42:19+00:00"
-        },
-        {
-            "name": "laminas/laminas-math",
-            "version": "2.7.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-math.git",
-                "reference": "8027b37e00accc43f28605c7d8fd081baed1f475"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-math/zipball/8027b37e00accc43f28605c7d8fd081baed1f475",
-                "reference": "8027b37e00accc43f28605c7d8fd081baed1f475",
-                "shasum": ""
-            },
-            "require": {
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.5 || ^7.0"
-            },
-            "replace": {
-                "zendframework/zend-math": "self.version"
-            },
-            "require-dev": {
-                "fabpot/php-cs-fixer": "1.7.*",
-                "ircmaxell/random-lib": "~1.1",
-                "phpunit/phpunit": "~4.0"
-            },
-            "suggest": {
-                "ext-bcmath": "If using the bcmath functionality",
-                "ext-gmp": "If using the gmp functionality",
-                "ircmaxell/random-lib": "Fallback random byte generator for Laminas\\Math\\Rand if Mcrypt extensions is unavailable"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.7-dev",
-                    "dev-develop": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Math\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "laminas",
-                "math"
-            ],
-            "time": "2019-12-31T17:24:15+00:00"
-        },
-        {
-            "name": "laminas/laminas-mime",
-            "version": "2.7.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-mime.git",
-                "reference": "e45a7d856bf7b4a7b5bd00d6371f9961dc233add"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-mime/zipball/e45a7d856bf7b4a7b5bd00d6371f9961dc233add",
-                "reference": "e45a7d856bf7b4a7b5bd00d6371f9961dc233add",
-                "shasum": ""
-            },
-            "require": {
-                "laminas/laminas-stdlib": "^2.7 || ^3.0",
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0"
-            },
-            "replace": {
-                "zendframework/zend-mime": "^2.7.2"
-            },
-            "require-dev": {
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "laminas/laminas-mail": "^2.6",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20"
-            },
-            "suggest": {
-                "laminas/laminas-mail": "Laminas\\Mail component"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.7.x-dev",
-                    "dev-develop": "2.8.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Mime\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Create and parse MIME messages and parts",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "laminas",
-                "mime"
-            ],
-            "time": "2020-03-29T13:12:07+00:00"
-        },
-        {
-            "name": "laminas/laminas-modulemanager",
-            "version": "2.8.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-modulemanager.git",
-                "reference": "92b1cde1aab5aef687b863face6dd5d9c6751c78"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-modulemanager/zipball/92b1cde1aab5aef687b863face6dd5d9c6751c78",
-                "reference": "92b1cde1aab5aef687b863face6dd5d9c6751c78",
-                "shasum": ""
-            },
-            "require": {
-                "laminas/laminas-config": "^3.1 || ^2.6",
-                "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"
-            },
-            "replace": {
-                "zendframework/zend-modulemanager": "self.version"
-            },
-            "require-dev": {
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "laminas/laminas-console": "^2.6",
-                "laminas/laminas-di": "^2.6",
-                "laminas/laminas-loader": "^2.5",
-                "laminas/laminas-mvc": "^3.0 || ^2.7",
-                "laminas/laminas-servicemanager": "^3.0.3 || ^2.7.5",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.16"
-            },
-            "suggest": {
-                "laminas/laminas-console": "Laminas\\Console component",
-                "laminas/laminas-loader": "Laminas\\Loader component if you are not using Composer autoloading for your modules",
-                "laminas/laminas-mvc": "Laminas\\Mvc component",
-                "laminas/laminas-servicemanager": "Laminas\\ServiceManager component"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8.x-dev",
-                    "dev-develop": "2.9.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\ModuleManager\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Modular application system for laminas-mvc applications",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "laminas",
-                "modulemanager"
-            ],
-            "time": "2019-12-31T17:26:56+00:00"
-        },
-        {
-            "name": "laminas/laminas-mvc",
-            "version": "2.7.15",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-mvc.git",
-                "reference": "7e7198b03556a57fb5fd3ed919d9e1cf71500642"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-mvc/zipball/7e7198b03556a57fb5fd3ed919d9e1cf71500642",
-                "reference": "7e7198b03556a57fb5fd3ed919d9e1cf71500642",
-                "shasum": ""
-            },
-            "require": {
-                "container-interop/container-interop": "^1.1",
-                "laminas/laminas-console": "^2.7",
-                "laminas/laminas-eventmanager": "^2.6.4 || ^3.0",
-                "laminas/laminas-form": "^2.11",
-                "laminas/laminas-hydrator": "^1.1 || ^2.4",
-                "laminas/laminas-psr7bridge": "^0.2",
-                "laminas/laminas-servicemanager": "^2.7.10 || ^3.0.3",
-                "laminas/laminas-stdlib": "^2.7.5 || ^3.0",
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.5 || ^7.0"
-            },
-            "replace": {
-                "zendframework/zend-mvc": "self.version"
-            },
-            "require-dev": {
-                "friendsofphp/php-cs-fixer": "1.7.*",
-                "laminas/laminas-authentication": "^2.6",
-                "laminas/laminas-cache": "^2.8",
-                "laminas/laminas-di": "^2.6",
-                "laminas/laminas-filter": "^2.8",
-                "laminas/laminas-http": "^2.8",
-                "laminas/laminas-i18n": "^2.8",
-                "laminas/laminas-inputfilter": "^2.8",
-                "laminas/laminas-json": "^2.6.1",
-                "laminas/laminas-log": "^2.9.3",
-                "laminas/laminas-modulemanager": "^2.8",
-                "laminas/laminas-serializer": "^2.8",
-                "laminas/laminas-session": "^2.8.1",
-                "laminas/laminas-text": "^2.7",
-                "laminas/laminas-uri": "^2.6",
-                "laminas/laminas-validator": "^2.10",
-                "laminas/laminas-view": "^2.9",
-                "phpunit/phpunit": "^4.8.36",
-                "sebastian/comparator": "^1.2.4",
-                "sebastian/version": "^1.0.4"
-            },
-            "suggest": {
-                "laminas/laminas-authentication": "Laminas\\Authentication component for Identity plugin",
-                "laminas/laminas-config": "Laminas\\Config component",
-                "laminas/laminas-di": "Laminas\\Di component",
-                "laminas/laminas-filter": "Laminas\\Filter component",
-                "laminas/laminas-http": "Laminas\\Http component",
-                "laminas/laminas-i18n": "Laminas\\I18n component for translatable segments",
-                "laminas/laminas-inputfilter": "Laminas\\Inputfilter component",
-                "laminas/laminas-json": "Laminas\\Json component",
-                "laminas/laminas-log": "Laminas\\Log component",
-                "laminas/laminas-modulemanager": "Laminas\\ModuleManager component",
-                "laminas/laminas-serializer": "Laminas\\Serializer component",
-                "laminas/laminas-servicemanager-di": "^1.0.1, if using laminas-servicemanager v3 and requiring the laminas-di integration",
-                "laminas/laminas-session": "Laminas\\Session component for FlashMessenger, PRG, and FPRG plugins",
-                "laminas/laminas-text": "Laminas\\Text component",
-                "laminas/laminas-uri": "Laminas\\Uri component",
-                "laminas/laminas-validator": "Laminas\\Validator component",
-                "laminas/laminas-view": "Laminas\\View component"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.7-dev",
-                    "dev-develop": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/autoload.php"
-                ],
-                "psr-4": {
-                    "Laminas\\Mvc\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "laminas",
-                "mvc"
-            ],
-            "time": "2019-12-31T17:32:15+00:00"
-        },
-        {
-            "name": "laminas/laminas-psr7bridge",
-            "version": "0.2.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-psr7bridge.git",
-                "reference": "14780ef1d40effd59d77ab29c6d439b2af42cdfa"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-psr7bridge/zipball/14780ef1d40effd59d77ab29c6d439b2af42cdfa",
-                "reference": "14780ef1d40effd59d77ab29c6d439b2af42cdfa",
-                "shasum": ""
-            },
-            "require": {
-                "laminas/laminas-diactoros": "^1.1",
-                "laminas/laminas-http": "^2.5",
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": ">=5.5",
-                "psr/http-message": "^1.0"
-            },
-            "replace": {
-                "zendframework/zend-psr7bridge": "self.version"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.7",
-                "squizlabs/php_codesniffer": "^2.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev",
-                    "dev-develop": "1.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Psr7Bridge\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "PSR-7 <-> Laminas\\Http bridge",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "http",
-                "laminas",
-                "psr",
-                "psr-7"
-            ],
-            "time": "2019-12-31T17:38:47+00:00"
-        },
-        {
-            "name": "laminas/laminas-serializer",
-            "version": "2.9.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-serializer.git",
-                "reference": "c1c9361f114271b0736db74e0083a919081af5e0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-serializer/zipball/c1c9361f114271b0736db74e0083a919081af5e0",
-                "reference": "c1c9361f114271b0736db74e0083a919081af5e0",
-                "shasum": ""
-            },
-            "require": {
-                "laminas/laminas-json": "^2.5 || ^3.0",
-                "laminas/laminas-stdlib": "^2.7 || ^3.0",
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0"
-            },
-            "replace": {
-                "zendframework/zend-serializer": "self.version"
-            },
-            "require-dev": {
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "laminas/laminas-math": "^2.6 || ^3.0",
-                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.16"
-            },
-            "suggest": {
-                "laminas/laminas-math": "(^2.6 || ^3.0) To support Python Pickle serialization",
-                "laminas/laminas-servicemanager": "(^2.7.5 || ^3.0.3) To support plugin manager support"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.9.x-dev",
-                    "dev-develop": "2.10.x-dev"
-                },
-                "laminas": {
-                    "component": "Laminas\\Serializer",
-                    "config-provider": "Laminas\\Serializer\\ConfigProvider"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Serializer\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Serialize and deserialize PHP structures to a variety of representations",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "laminas",
-                "serializer"
-            ],
-            "time": "2019-12-31T17:42:11+00:00"
-        },
-        {
-            "name": "laminas/laminas-server",
-            "version": "2.8.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-server.git",
-                "reference": "4aaca9174c40a2fab2e2aa77999da99f71bdd88e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-server/zipball/4aaca9174c40a2fab2e2aa77999da99f71bdd88e",
-                "reference": "4aaca9174c40a2fab2e2aa77999da99f71bdd88e",
-                "shasum": ""
-            },
-            "require": {
-                "laminas/laminas-code": "^2.5 || ^3.0",
-                "laminas/laminas-stdlib": "^2.5 || ^3.0",
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0"
-            },
-            "replace": {
-                "zendframework/zend-server": "self.version"
-            },
-            "require-dev": {
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8.x-dev",
-                    "dev-develop": "2.9.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Server\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Create Reflection-based RPC servers",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "laminas",
-                "server"
-            ],
-            "time": "2019-12-31T17:43:03+00:00"
-        },
-        {
-            "name": "laminas/laminas-servicemanager",
-            "version": "2.7.11",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-servicemanager.git",
-                "reference": "841abb656c6018afebeec1f355be438426d6a3dd"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/841abb656c6018afebeec1f355be438426d6a3dd",
-                "reference": "841abb656c6018afebeec1f355be438426d6a3dd",
-                "shasum": ""
-            },
-            "require": {
-                "container-interop/container-interop": "~1.0",
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.5 || ^7.0"
-            },
-            "replace": {
-                "zendframework/zend-servicemanager": "self.version"
-            },
-            "require-dev": {
-                "athletic/athletic": "dev-master",
-                "fabpot/php-cs-fixer": "1.7.*",
-                "laminas/laminas-di": "~2.5",
-                "laminas/laminas-mvc": "~2.5",
-                "phpunit/phpunit": "~4.0"
-            },
-            "suggest": {
-                "laminas/laminas-di": "Laminas\\Di component",
-                "ocramius/proxy-manager": "ProxyManager 0.5.* to handle lazy initialization of services"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.7-dev",
-                    "dev-develop": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\ServiceManager\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "laminas",
-                "servicemanager"
-            ],
-            "time": "2019-12-31T17:44:16+00:00"
-        },
-        {
-            "name": "laminas/laminas-session",
-            "version": "2.9.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-session.git",
-                "reference": "519e8966146536cd97c1cc3d59a21b095fb814d7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-session/zipball/519e8966146536cd97c1cc3d59a21b095fb814d7",
-                "reference": "519e8966146536cd97c1cc3d59a21b095fb814d7",
-                "shasum": ""
-            },
-            "require": {
-                "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
-                "laminas/laminas-stdlib": "^3.2.1",
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0"
-            },
-            "replace": {
-                "zendframework/zend-session": "^2.9.1"
-            },
-            "require-dev": {
-                "container-interop/container-interop": "^1.1",
-                "laminas/laminas-cache": "^2.6.1",
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "laminas/laminas-db": "^2.7",
-                "laminas/laminas-http": "^2.5.4",
-                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
-                "laminas/laminas-validator": "^2.6",
-                "mongodb/mongodb": "^1.0.1",
-                "php-mock/php-mock-phpunit": "^1.1.2 || ^2.0",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20"
-            },
-            "suggest": {
-                "laminas/laminas-cache": "Laminas\\Cache component",
-                "laminas/laminas-db": "Laminas\\Db component",
-                "laminas/laminas-http": "Laminas\\Http component",
-                "laminas/laminas-servicemanager": "Laminas\\ServiceManager component",
-                "laminas/laminas-validator": "Laminas\\Validator component",
-                "mongodb/mongodb": "If you want to use the MongoDB session save handler"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.9.x-dev",
-                    "dev-develop": "2.10.x-dev"
-                },
-                "laminas": {
-                    "component": "Laminas\\Session",
-                    "config-provider": "Laminas\\Session\\ConfigProvider"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Session\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Object-oriented interface to PHP sessions and storage",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "laminas",
-                "session"
-            ],
-            "time": "2020-03-29T13:26:04+00:00"
-        },
-        {
-            "name": "laminas/laminas-soap",
-            "version": "2.8.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-soap.git",
-                "reference": "34f91d5c4c0a78bc5689cca2d1eaf829b27edd72"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-soap/zipball/34f91d5c4c0a78bc5689cca2d1eaf829b27edd72",
-                "reference": "34f91d5c4c0a78bc5689cca2d1eaf829b27edd72",
-                "shasum": ""
-            },
-            "require": {
-                "ext-soap": "*",
-                "laminas/laminas-server": "^2.6.1",
-                "laminas/laminas-stdlib": "^2.7 || ^3.0",
-                "laminas/laminas-uri": "^2.5.2",
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0"
-            },
-            "replace": {
-                "zendframework/zend-soap": "self.version"
-            },
-            "require-dev": {
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "laminas/laminas-config": "^2.6",
-                "laminas/laminas-http": "^2.5.4",
-                "phpunit/phpunit": "^5.7.21 || ^6.3"
-            },
-            "suggest": {
-                "laminas/laminas-http": "Laminas\\Http component"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.7.x-dev",
-                    "dev-develop": "2.8.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Soap\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "laminas",
-                "soap"
-            ],
-            "time": "2019-12-31T17:48:49+00:00"
-        },
-        {
-            "name": "laminas/laminas-stdlib",
-            "version": "3.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-stdlib.git",
-                "reference": "2b18347625a2f06a1a485acfbc870f699dbe51c6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/2b18347625a2f06a1a485acfbc870f699dbe51c6",
-                "reference": "2b18347625a2f06a1a485acfbc870f699dbe51c6",
-                "shasum": ""
-            },
-            "require": {
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0"
-            },
-            "replace": {
-                "zendframework/zend-stdlib": "self.version"
-            },
-            "require-dev": {
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "phpbench/phpbench": "^0.13",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2.x-dev",
-                    "dev-develop": "3.3.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Stdlib\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "SPL extensions, array utilities, error handlers, and more",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "laminas",
-                "stdlib"
-            ],
-            "time": "2019-12-31T17:51:15+00:00"
-        },
-        {
-            "name": "laminas/laminas-text",
-            "version": "2.7.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-text.git",
-                "reference": "3601b5eacb06ed0a12f658df860cc0f9613cf4db"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-text/zipball/3601b5eacb06ed0a12f658df860cc0f9613cf4db",
-                "reference": "3601b5eacb06ed0a12f658df860cc0f9613cf4db",
-                "shasum": ""
-            },
-            "require": {
-                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
-                "laminas/laminas-stdlib": "^2.7 || ^3.0",
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0"
-            },
-            "replace": {
-                "zendframework/zend-text": "self.version"
-            },
-            "require-dev": {
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "laminas/laminas-config": "^2.6",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.7.x-dev",
-                    "dev-develop": "2.8.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Text\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Create FIGlets and text-based tables",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "laminas",
-                "text"
-            ],
-            "time": "2019-12-31T17:54:52+00:00"
-        },
-        {
-            "name": "laminas/laminas-uri",
-            "version": "2.7.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-uri.git",
-                "reference": "6be8ce19622f359b048ce4faebf1aa1bca73a7ff"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-uri/zipball/6be8ce19622f359b048ce4faebf1aa1bca73a7ff",
-                "reference": "6be8ce19622f359b048ce4faebf1aa1bca73a7ff",
-                "shasum": ""
-            },
-            "require": {
-                "laminas/laminas-escaper": "^2.5",
-                "laminas/laminas-validator": "^2.10",
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0"
-            },
-            "replace": {
-                "zendframework/zend-uri": "self.version"
-            },
-            "require-dev": {
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.7.x-dev",
-                    "dev-develop": "2.8.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Uri\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "A component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "laminas",
-                "uri"
-            ],
-            "time": "2019-12-31T17:56:00+00:00"
-        },
-        {
-            "name": "laminas/laminas-validator",
-            "version": "2.13.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-validator.git",
-                "reference": "93593684e70b8ed1e870cacd34ca32b0c0ace185"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/93593684e70b8ed1e870cacd34ca32b0c0ace185",
-                "reference": "93593684e70b8ed1e870cacd34ca32b0c0ace185",
-                "shasum": ""
-            },
-            "require": {
-                "container-interop/container-interop": "^1.1",
-                "laminas/laminas-stdlib": "^3.2.1",
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^7.1"
-            },
-            "replace": {
-                "zendframework/zend-validator": "^2.13.0"
-            },
-            "require-dev": {
-                "laminas/laminas-cache": "^2.6.1",
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "laminas/laminas-config": "^2.6",
-                "laminas/laminas-db": "^2.7",
-                "laminas/laminas-filter": "^2.6",
-                "laminas/laminas-http": "^2.5.4",
-                "laminas/laminas-i18n": "^2.6",
-                "laminas/laminas-math": "^2.6",
-                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
-                "laminas/laminas-session": "^2.8",
-                "laminas/laminas-uri": "^2.5",
-                "phpunit/phpunit": "^7.5.20 || ^8.5.2",
-                "psr/http-client": "^1.0",
-                "psr/http-factory": "^1.0",
-                "psr/http-message": "^1.0"
-            },
-            "suggest": {
-                "laminas/laminas-db": "Laminas\\Db component, required by the (No)RecordExists validator",
-                "laminas/laminas-filter": "Laminas\\Filter component, required by the Digits validator",
-                "laminas/laminas-i18n": "Laminas\\I18n component to allow translation of validation error messages",
-                "laminas/laminas-i18n-resources": "Translations of validator messages",
-                "laminas/laminas-math": "Laminas\\Math component, required by the Csrf validator",
-                "laminas/laminas-servicemanager": "Laminas\\ServiceManager component to allow using the ValidatorPluginManager and validator chains",
-                "laminas/laminas-session": "Laminas\\Session component, ^2.8; required by the Csrf validator",
-                "laminas/laminas-uri": "Laminas\\Uri component, required by the Uri and Sitemap\\Loc validators",
-                "psr/http-message": "psr/http-message, required when validating PSR-7 UploadedFileInterface instances via the Upload and UploadFile validators"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.13.x-dev",
-                    "dev-develop": "2.14.x-dev"
-                },
-                "laminas": {
-                    "component": "Laminas\\Validator",
-                    "config-provider": "Laminas\\Validator\\ConfigProvider"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Validator\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Validation classes for a wide range of domains, and the ability to chain validators to create complex validation criteria",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "laminas",
-                "validator"
-            ],
-            "time": "2020-03-31T18:57:01+00:00"
-        },
-        {
-            "name": "laminas/laminas-view",
-            "version": "2.11.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-view.git",
-                "reference": "3bbb2e94287383604c898284a18d2d06cf17301e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-view/zipball/3bbb2e94287383604c898284a18d2d06cf17301e",
-                "reference": "3bbb2e94287383604c898284a18d2d06cf17301e",
-                "shasum": ""
-            },
-            "require": {
-                "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
-                "laminas/laminas-json": "^2.6.1 || ^3.0",
-                "laminas/laminas-loader": "^2.5",
-                "laminas/laminas-stdlib": "^2.7 || ^3.0",
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0"
-            },
-            "replace": {
-                "zendframework/zend-view": "self.version"
-            },
-            "require-dev": {
-                "laminas/laminas-authentication": "^2.5",
-                "laminas/laminas-cache": "^2.6.1",
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "laminas/laminas-config": "^2.6",
-                "laminas/laminas-console": "^2.6",
-                "laminas/laminas-escaper": "^2.5",
-                "laminas/laminas-feed": "^2.7",
-                "laminas/laminas-filter": "^2.6.1",
-                "laminas/laminas-http": "^2.5.4",
-                "laminas/laminas-i18n": "^2.6",
-                "laminas/laminas-log": "^2.7",
-                "laminas/laminas-modulemanager": "^2.7.1",
-                "laminas/laminas-mvc": "^2.7.14 || ^3.0",
-                "laminas/laminas-navigation": "^2.5",
-                "laminas/laminas-paginator": "^2.5",
-                "laminas/laminas-permissions-acl": "^2.6",
-                "laminas/laminas-router": "^3.0.1",
-                "laminas/laminas-serializer": "^2.6.1",
-                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
-                "laminas/laminas-session": "^2.8.1",
-                "laminas/laminas-uri": "^2.5",
-                "phpunit/phpunit": "^5.7.15 || ^6.0.8"
-            },
-            "suggest": {
-                "laminas/laminas-authentication": "Laminas\\Authentication component",
-                "laminas/laminas-escaper": "Laminas\\Escaper component",
-                "laminas/laminas-feed": "Laminas\\Feed component",
-                "laminas/laminas-filter": "Laminas\\Filter component",
-                "laminas/laminas-http": "Laminas\\Http component",
-                "laminas/laminas-i18n": "Laminas\\I18n component",
-                "laminas/laminas-mvc": "Laminas\\Mvc component",
-                "laminas/laminas-mvc-plugin-flashmessenger": "laminas-mvc-plugin-flashmessenger component, if you want to use the FlashMessenger view helper with laminas-mvc versions 3 and up",
-                "laminas/laminas-navigation": "Laminas\\Navigation component",
-                "laminas/laminas-paginator": "Laminas\\Paginator component",
-                "laminas/laminas-permissions-acl": "Laminas\\Permissions\\Acl component",
-                "laminas/laminas-servicemanager": "Laminas\\ServiceManager component",
-                "laminas/laminas-uri": "Laminas\\Uri component"
-            },
-            "bin": [
-                "bin/templatemap_generator.php"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.11.x-dev",
-                    "dev-develop": "2.12.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\View\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Flexible view layer supporting and providing multiple view layers, helpers, and more",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "laminas",
-                "view"
-            ],
-            "time": "2019-12-31T18:03:30+00:00"
-        },
-        {
-            "name": "laminas/laminas-zendframework-bridge",
-            "version": "1.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-zendframework-bridge.git",
-                "reference": "fcd87520e4943d968557803919523772475e8ea3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/fcd87520e4943d968557803919523772475e8ea3",
-                "reference": "fcd87520e4943d968557803919523772475e8ea3",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1",
-                "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"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/autoload.php"
-                ],
-                "psr-4": {
-                    "Laminas\\ZendFrameworkBridge\\": "src//"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Alias legacy ZF class names to Laminas Project equivalents.",
-            "keywords": [
-                "ZendFramework",
-                "autoloading",
-                "laminas",
-                "zf"
-            ],
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
-            "time": "2020-05-20T16:45:56+00:00"
-        },
-        {
-            "name": "magento/composer",
-            "version": "1.6.x-dev",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/magento/composer.git",
-                "reference": "f3e4bec8fc73a97a6cbc391b1b93d4c32566763d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/magento/composer/zipball/f3e4bec8fc73a97a6cbc391b1b93d4c32566763d",
-                "reference": "f3e4bec8fc73a97a6cbc391b1b93d4c32566763d",
-                "shasum": ""
-            },
-            "require": {
-                "composer/composer": "^1.9",
-                "php": "~7.3.0||~7.4.0",
-                "symfony/console": "~4.4.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Magento\\Composer\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "OSL-3.0",
-                "AFL-3.0"
-            ],
-            "description": "Magento composer library helps to instantiate Composer application and run composer commands.",
-            "time": "2020-05-08T01:07:09+00:00"
-        },
-        {
-            "name": "magento/magento-composer-installer",
-            "version": "0.1.13",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/magento/magento-composer-installer.git",
-                "reference": "8b6c32f53b4944a5d6656e86344cd0f9784709a1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/magento/magento-composer-installer/zipball/8b6c32f53b4944a5d6656e86344cd0f9784709a1",
-                "reference": "8b6c32f53b4944a5d6656e86344cd0f9784709a1",
-                "shasum": ""
-            },
-            "require": {
-                "composer-plugin-api": "^1.0"
-            },
-            "replace": {
-                "magento-hackathon/magento-composer-installer": "*"
-            },
-            "require-dev": {
-                "composer/composer": "*@dev",
-                "firegento/phpcs": "dev-patch-1",
-                "mikey179/vfsstream": "*",
-                "phpunit/phpunit": "*",
-                "phpunit/phpunit-mock-objects": "dev-master",
-                "squizlabs/php_codesniffer": "1.4.7",
-                "symfony/process": "*"
-            },
-            "type": "composer-plugin",
-            "extra": {
-                "composer-command-registry": [
-                    "MagentoHackathon\\Composer\\Magento\\Command\\DeployCommand"
-                ],
-                "class": "MagentoHackathon\\Composer\\Magento\\Plugin"
-            },
-            "autoload": {
-                "psr-0": {
-                    "MagentoHackathon\\Composer\\Magento": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "OSL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "Vinai Kopp",
-                    "email": "vinai@netzarbeiter.com"
-                },
-                {
-                    "name": "Daniel Fahlke aka Flyingmana",
-                    "email": "flyingmana@googlemail.com"
-                },
-                {
-                    "name": "Jörg Weller",
-                    "email": "weller@flagbit.de"
-                },
-                {
-                    "name": "Karl Spies",
-                    "email": "karl.spies@gmx.net"
-                },
-                {
-                    "name": "Tobias Vogt",
-                    "email": "tobi@webguys.de"
-                },
-                {
-                    "name": "David Fuhr",
-                    "email": "fuhr@flagbit.de"
-                }
-            ],
-            "description": "Composer installer for Magento modules",
-            "homepage": "https://github.com/magento/magento-composer-installer",
-            "keywords": [
-                "composer-installer",
-                "magento"
-            ],
-            "time": "2017-12-29T16:45:24+00:00"
-        },
-        {
-            "name": "magento/zendframework1",
-            "version": "1.14.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/magento/zf1.git",
-                "reference": "250f35c0e80b5e6fa1a1598c144cba2fff36b565"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/magento/zf1/zipball/250f35c0e80b5e6fa1a1598c144cba2fff36b565",
-                "reference": "250f35c0e80b5e6fa1a1598c144cba2fff36b565",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.2.11"
-            },
-            "require-dev": {
-                "phpunit/dbunit": "1.3.*",
-                "phpunit/phpunit": "3.7.*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.12.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Zend_": "library/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                "library/"
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Magento Zend Framework 1",
-            "homepage": "http://framework.zend.com/",
-            "keywords": [
-                "ZF1",
-                "framework"
-            ],
-            "time": "2020-05-19T23:25:07+00:00"
-        },
-        {
-            "name": "monolog/monolog",
-            "version": "1.25.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "3022efff205e2448b560c833c6fbbf91c3139168"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/3022efff205e2448b560c833c6fbbf91c3139168",
-                "reference": "3022efff205e2448b560c833c6fbbf91c3139168",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0",
-                "psr/log": "~1.0"
-            },
-            "provide": {
-                "psr/log-implementation": "1.0.0"
-            },
-            "require-dev": {
-                "aws/aws-sdk-php": "^2.4.9 || ^3.0",
-                "doctrine/couchdb": "~1.0@dev",
-                "graylog2/gelf-php": "~1.0",
-                "php-amqplib/php-amqplib": "~2.4",
-                "php-console/php-console": "^3.1.3",
-                "php-parallel-lint/php-parallel-lint": "^1.0",
-                "phpunit/phpunit": "~4.5",
-                "ruflin/elastica": ">=0.90 <3.0",
-                "sentry/sentry": "^0.13",
-                "swiftmailer/swiftmailer": "^5.3|^6.0"
-            },
-            "suggest": {
-                "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
-                "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
-                "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
-                "ext-mongo": "Allow sending log messages to a MongoDB server",
-                "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
-                "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver",
-                "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
-                "php-console/php-console": "Allow sending log messages to Google Chrome",
-                "rollbar/rollbar": "Allow sending log messages to Rollbar",
-                "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
-                "sentry/sentry": "Allow sending log messages to a Sentry server"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Monolog\\": "src/Monolog"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "http://seld.be"
-                }
-            ],
-            "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
-            "homepage": "http://github.com/Seldaek/monolog",
-            "keywords": [
-                "log",
-                "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"
-        },
-        {
-            "name": "paragonie/random_compat",
-            "version": "v9.99.99",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
-                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "4.*|5.*",
-                "vimeo/psalm": "^1"
-            },
-            "suggest": {
-                "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
-            },
-            "type": "library",
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Paragon Initiative Enterprises",
-                    "email": "security@paragonie.com",
-                    "homepage": "https://paragonie.com"
-                }
-            ],
-            "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
-            "keywords": [
-                "csprng",
-                "polyfill",
-                "pseudorandom",
-                "random"
-            ],
-            "time": "2018-07-02T15:55:56+00:00"
-        },
-        {
-            "name": "paragonie/sodium_compat",
-            "version": "v1.13.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/paragonie/sodium_compat.git",
-                "reference": "bbade402cbe84c69b718120911506a3aa2bae653"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/bbade402cbe84c69b718120911506a3aa2bae653",
-                "reference": "bbade402cbe84c69b718120911506a3aa2bae653",
-                "shasum": ""
-            },
-            "require": {
-                "paragonie/random_compat": ">=1",
-                "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7|^8"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^3|^4|^5|^6|^7"
-            },
-            "suggest": {
-                "ext-libsodium": "PHP < 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security.",
-                "ext-sodium": "PHP >= 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "autoload.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "ISC"
-            ],
-            "authors": [
-                {
-                    "name": "Paragon Initiative Enterprises",
-                    "email": "security@paragonie.com"
-                },
-                {
-                    "name": "Frank Denis",
-                    "email": "jedisct1@pureftpd.org"
-                }
-            ],
-            "description": "Pure PHP implementation of libsodium; uses the PHP extension if it exists",
-            "keywords": [
-                "Authentication",
-                "BLAKE2b",
-                "ChaCha20",
-                "ChaCha20-Poly1305",
-                "Chapoly",
-                "Curve25519",
-                "Ed25519",
-                "EdDSA",
-                "Edwards-curve Digital Signature Algorithm",
-                "Elliptic Curve Diffie-Hellman",
-                "Poly1305",
-                "Pure-PHP cryptography",
-                "RFC 7748",
-                "RFC 8032",
-                "Salpoly",
-                "Salsa20",
-                "X25519",
-                "XChaCha20-Poly1305",
-                "XSalsa20-Poly1305",
-                "Xchacha20",
-                "Xsalsa20",
-                "aead",
-                "cryptography",
-                "ecdh",
-                "elliptic curve",
-                "elliptic curve cryptography",
-                "encryption",
-                "libsodium",
-                "php",
-                "public-key cryptography",
-                "secret-key cryptography",
-                "side-channel resistant"
-            ],
-            "time": "2020-03-20T21:48:09+00:00"
-        },
-        {
-            "name": "pelago/emogrifier",
-            "version": "v3.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/MyIntervals/emogrifier.git",
-                "reference": "f6a5c7d44612d86c3901c93f1592f5440e6b2cd8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/f6a5c7d44612d86c3901c93f1592f5440e6b2cd8",
-                "reference": "f6a5c7d44612d86c3901c93f1592f5440e6b2cd8",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-libxml": "*",
-                "php": "^5.6 || ~7.0 || ~7.1 || ~7.2 || ~7.3 || ~7.4",
-                "symfony/css-selector": "^2.8 || ^3.0 || ^4.0 || ^5.0"
-            },
-            "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.15.3",
-                "phpmd/phpmd": "^2.7.0",
-                "phpunit/phpunit": "^5.7.27",
-                "squizlabs/php_codesniffer": "^3.5.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Pelago\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Oliver Klee",
-                    "email": "github@oliverklee.de"
-                },
-                {
-                    "name": "Zoli Szabó",
-                    "email": "zoli.szabo+github@gmail.com"
-                },
-                {
-                    "name": "John Reeve",
-                    "email": "jreeve@pelagodesign.com"
-                },
-                {
-                    "name": "Jake Hotson",
-                    "email": "jake@qzdesign.co.uk"
-                },
-                {
-                    "name": "Cameron Brooks"
-                },
-                {
-                    "name": "Jaime Prado"
-                }
-            ],
-            "description": "Converts CSS styles into inline style attributes in your HTML code",
-            "homepage": "https://www.myintervals.com/emogrifier.php",
-            "keywords": [
-                "css",
-                "email",
-                "pre-processing"
-            ],
-            "time": "2019-12-26T19:37:31+00:00"
-        },
-        {
-            "name": "php-amqplib/php-amqplib",
-            "version": "v2.10.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-amqplib/php-amqplib.git",
-                "reference": "6e2b2501e021e994fb64429e5a78118f83b5c200"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-amqplib/php-amqplib/zipball/6e2b2501e021e994fb64429e5a78118f83b5c200",
-                "reference": "6e2b2501e021e994fb64429e5a78118f83b5c200",
-                "shasum": ""
-            },
-            "require": {
-                "ext-bcmath": "*",
-                "ext-sockets": "*",
-                "php": ">=5.6"
-            },
-            "replace": {
-                "videlalvaro/php-amqplib": "self.version"
-            },
-            "require-dev": {
-                "ext-curl": "*",
-                "nategood/httpful": "^0.2.20",
-                "phpunit/phpunit": "^5.7|^6.5|^7.0",
-                "squizlabs/php_codesniffer": "^2.5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.10-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "PhpAmqpLib\\": "PhpAmqpLib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "LGPL-2.1-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "Alvaro Videla",
-                    "role": "Original Maintainer"
-                },
-                {
-                    "name": "John Kelly",
-                    "email": "johnmkelly86@gmail.com",
-                    "role": "Maintainer"
-                },
-                {
-                    "name": "Raúl Araya",
-                    "email": "nubeiro@gmail.com",
-                    "role": "Maintainer"
-                },
-                {
-                    "name": "Luke Bakken",
-                    "email": "luke@bakken.io",
-                    "role": "Maintainer"
-                }
-            ],
-            "description": "Formerly videlalvaro/php-amqplib.  This library is a pure PHP implementation of the AMQP protocol. It's been tested against RabbitMQ.",
-            "homepage": "https://github.com/php-amqplib/php-amqplib/",
-            "keywords": [
-                "message",
-                "queue",
-                "rabbitmq"
-            ],
-            "time": "2019-10-10T13:23:40+00:00"
-        },
-        {
-            "name": "phpseclib/mcrypt_compat",
-            "version": "1.0.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpseclib/mcrypt_compat.git",
-                "reference": "f74c7b1897b62f08f268184b8bb98d9d9ab723b0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/mcrypt_compat/zipball/f74c7b1897b62f08f268184b8bb98d9d9ab723b0",
-                "reference": "f74c7b1897b62f08f268184b8bb98d9d9ab723b0",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "phpseclib/phpseclib": ">=2.0.11 <3.0.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.35|^5.7|^6.0"
-            },
-            "suggest": {
-                "ext-openssl": "Will enable faster cryptographic operations"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "lib/mcrypt.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jim Wigginton",
-                    "email": "terrafrost@php.net",
-                    "homepage": "http://phpseclib.sourceforge.net"
-                }
-            ],
-            "description": "PHP 7.1 polyfill for the mcrypt extension from PHP <= 7.0",
-            "keywords": [
-                "cryptograpy",
-                "encryption",
-                "mcrypt"
-            ],
-            "time": "2018-08-22T03:11:43+00:00"
-        },
-        {
-            "name": "phpseclib/phpseclib",
-            "version": "2.0.27",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc",
-                "reference": "34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "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": {
-                "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
-                "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
-                "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
-                "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations."
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "phpseclib/bootstrap.php"
-                ],
-                "psr-4": {
-                    "phpseclib\\": "phpseclib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jim Wigginton",
-                    "email": "terrafrost@php.net",
-                    "role": "Lead Developer"
-                },
-                {
-                    "name": "Patrick Monnerat",
-                    "email": "pm@datasphere.ch",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Andreas Fischer",
-                    "email": "bantu@phpbb.com",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Hans-Jürgen Petrich",
-                    "email": "petrich@tronic-media.com",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Graham Campbell",
-                    "email": "graham@alt-three.com",
-                    "role": "Developer"
-                }
-            ],
-            "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.",
-            "homepage": "http://phpseclib.sourceforge.net",
-            "keywords": [
-                "BigInteger",
-                "aes",
-                "asn.1",
-                "asn1",
-                "blowfish",
-                "crypto",
-                "cryptography",
-                "encryption",
-                "rsa",
-                "security",
-                "sftp",
-                "signature",
-                "signing",
-                "ssh",
-                "twofish",
-                "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"
-        },
-        {
-            "name": "psr/container",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/container.git",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Container\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common Container Interface (PHP FIG PSR-11)",
-            "homepage": "https://github.com/php-fig/container",
-            "keywords": [
-                "PSR-11",
-                "container",
-                "container-interface",
-                "container-interop",
-                "psr"
-            ],
-            "time": "2017-02-14T16:28:37+00:00"
-        },
-        {
-            "name": "psr/http-message",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/http-message.git",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Http\\Message\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for HTTP messages",
-            "homepage": "https://github.com/php-fig/http-message",
-            "keywords": [
-                "http",
-                "http-message",
-                "psr",
-                "psr-7",
-                "request",
-                "response"
-            ],
-            "time": "2016-08-06T14:39:51+00:00"
-        },
-        {
-            "name": "psr/log",
-            "version": "1.1.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/log.git",
-                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
-                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Log\\": "Psr/Log/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for logging libraries",
-            "homepage": "https://github.com/php-fig/log",
-            "keywords": [
-                "log",
-                "psr",
-                "psr-3"
-            ],
-            "time": "2020-03-23T09:12:05+00:00"
-        },
-        {
-            "name": "ralouphie/getallheaders",
-            "version": "3.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/ralouphie/getallheaders.git",
-                "reference": "120b605dfeb996808c31b6477290a714d356e822"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
-                "reference": "120b605dfeb996808c31b6477290a714d356e822",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6"
-            },
-            "require-dev": {
-                "php-coveralls/php-coveralls": "^2.1",
-                "phpunit/phpunit": "^5 || ^6.5"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "src/getallheaders.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Ralph Khattar",
-                    "email": "ralph.khattar@gmail.com"
-                }
-            ],
-            "description": "A polyfill for getallheaders.",
-            "time": "2019-03-08T08:55:37+00:00"
-        },
-        {
-            "name": "ramsey/uuid",
-            "version": "3.8.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/ramsey/uuid.git",
-                "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/d09ea80159c1929d75b3f9c60504d613aeb4a1e3",
-                "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3",
-                "shasum": ""
-            },
-            "require": {
-                "paragonie/random_compat": "^1.0|^2.0|9.99.99",
-                "php": "^5.4 || ^7.0",
-                "symfony/polyfill-ctype": "^1.8"
-            },
-            "replace": {
-                "rhumsaa/uuid": "self.version"
-            },
-            "require-dev": {
-                "codeception/aspect-mock": "^1.0 | ~2.0.0",
-                "doctrine/annotations": "~1.2.0",
-                "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ~2.1.0",
-                "ircmaxell/random-lib": "^1.1",
-                "jakub-onderka/php-parallel-lint": "^0.9.0",
-                "mockery/mockery": "^0.9.9",
-                "moontoast/math": "^1.1",
-                "php-mock/php-mock-phpunit": "^0.3|^1.1",
-                "phpunit/phpunit": "^4.7|^5.0|^6.5",
-                "squizlabs/php_codesniffer": "^2.3"
-            },
-            "suggest": {
-                "ext-ctype": "Provides support for PHP Ctype functions",
-                "ext-libsodium": "Provides the PECL libsodium extension for use with the SodiumRandomGenerator",
-                "ext-uuid": "Provides the PECL UUID extension for use with the PeclUuidTimeGenerator and PeclUuidRandomGenerator",
-                "ircmaxell/random-lib": "Provides RandomLib for use with the RandomLibAdapter",
-                "moontoast/math": "Provides support for converting UUID to 128-bit integer (in string form).",
-                "ramsey/uuid-console": "A console application for generating UUIDs with ramsey/uuid",
-                "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type."
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Ramsey\\Uuid\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Ben Ramsey",
-                    "email": "ben@benramsey.com",
-                    "homepage": "https://benramsey.com"
-                },
-                {
-                    "name": "Marijn Huizendveld",
-                    "email": "marijn.huizendveld@gmail.com"
-                },
-                {
-                    "name": "Thibaud Fabre",
-                    "email": "thibaud@aztech.io"
-                }
-            ],
-            "description": "Formerly rhumsaa/uuid. A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).",
-            "homepage": "https://github.com/ramsey/uuid",
-            "keywords": [
-                "guid",
-                "identifier",
-                "uuid"
-            ],
-            "time": "2018-07-19T23:38:55+00:00"
-        },
-        {
-            "name": "react/promise",
-            "version": "v2.8.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/reactphp/promise.git",
-                "reference": "f3cff96a19736714524ca0dd1d4130de73dbbbc4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/promise/zipball/f3cff96a19736714524ca0dd1d4130de73dbbbc4",
-                "reference": "f3cff96a19736714524ca0dd1d4130de73dbbbc4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7.0 || ^6.5 || ^5.7 || ^4.8.36"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "React\\Promise\\": "src/"
-                },
-                "files": [
-                    "src/functions_include.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jan Sorgalla",
-                    "email": "jsorgalla@gmail.com"
-                }
-            ],
-            "description": "A lightweight implementation of CommonJS Promises/A for PHP",
-            "keywords": [
-                "promise",
-                "promises"
-            ],
-            "time": "2020-05-12T15:16:56+00:00"
-        },
-        {
-            "name": "seld/jsonlint",
-            "version": "1.8.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Seldaek/jsonlint.git",
-                "reference": "ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1",
-                "reference": "ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3 || ^7.0 || ^8.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
-            },
-            "bin": [
-                "bin/jsonlint"
-            ],
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Seld\\JsonLint\\": "src/Seld/JsonLint/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "http://seld.be"
-                }
-            ],
-            "description": "JSON Linter",
-            "keywords": [
-                "json",
-                "linter",
-                "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"
-        },
-        {
-            "name": "seld/phar-utils",
-            "version": "1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Seldaek/phar-utils.git",
-                "reference": "8800503d56b9867d43d9c303b9cbcc26016e82f0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/8800503d56b9867d43d9c303b9cbcc26016e82f0",
-                "reference": "8800503d56b9867d43d9c303b9cbcc26016e82f0",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Seld\\PharUtils\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be"
-                }
-            ],
-            "description": "PHAR file format utilities, for when PHP phars you up",
-            "keywords": [
-                "phar"
-            ],
-            "time": "2020-02-14T15:25:33+00:00"
-        },
-        {
-            "name": "symfony/console",
-            "version": "v4.4.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/console.git",
-                "reference": "10bb3ee3c97308869d53b3e3d03f6ac23ff985f7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/10bb3ee3c97308869d53b3e3d03f6ac23ff985f7",
-                "reference": "10bb3ee3c97308869d53b3e3d03f6ac23ff985f7",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1.3",
-                "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php73": "^1.8",
-                "symfony/service-contracts": "^1.1|^2"
-            },
-            "conflict": {
-                "symfony/dependency-injection": "<3.4",
-                "symfony/event-dispatcher": "<4.3|>=5",
-                "symfony/lock": "<4.4",
-                "symfony/process": "<3.3"
-            },
-            "provide": {
-                "psr/log-implementation": "1.0"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "^3.4|^4.0|^5.0",
-                "symfony/dependency-injection": "^3.4|^4.0|^5.0",
-                "symfony/event-dispatcher": "^4.3",
-                "symfony/lock": "^4.4|^5.0",
-                "symfony/process": "^3.4|^4.0|^5.0",
-                "symfony/var-dumper": "^4.3|^5.0"
-            },
-            "suggest": {
-                "psr/log": "For using the console logger",
-                "symfony/event-dispatcher": "",
-                "symfony/lock": "",
-                "symfony/process": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Console\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "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-03-30T11:41:10+00:00"
-        },
-        {
-            "name": "symfony/css-selector",
-            "version": "v5.0.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/css-selector.git",
-                "reference": "5f8d5271303dad260692ba73dfa21777d38e124e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/5f8d5271303dad260692ba73dfa21777d38e124e",
-                "reference": "5f8d5271303dad260692ba73dfa21777d38e124e",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2.5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\CssSelector\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Jean-François Simon",
-                    "email": "jeanfrancois.simon@sensiolabs.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "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-03-27T16:56:45+00:00"
-        },
-        {
-            "name": "symfony/event-dispatcher",
-            "version": "v4.4.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "abc8e3618bfdb55e44c8c6a00abd333f831bbfed"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/abc8e3618bfdb55e44c8c6a00abd333f831bbfed",
-                "reference": "abc8e3618bfdb55e44c8c6a00abd333f831bbfed",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1.3",
-                "symfony/event-dispatcher-contracts": "^1.1"
-            },
-            "conflict": {
-                "symfony/dependency-injection": "<3.4"
-            },
-            "provide": {
-                "psr/event-dispatcher-implementation": "1.0",
-                "symfony/event-dispatcher-implementation": "1.1"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "^3.4|^4.0|^5.0",
-                "symfony/dependency-injection": "^3.4|^4.0|^5.0",
-                "symfony/expression-language": "^3.4|^4.0|^5.0",
-                "symfony/http-foundation": "^3.4|^4.0|^5.0",
-                "symfony/service-contracts": "^1.1|^2",
-                "symfony/stopwatch": "^3.4|^4.0|^5.0"
-            },
-            "suggest": {
-                "symfony/dependency-injection": "",
-                "symfony/http-kernel": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\EventDispatcher\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "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-03-27T16:54:36+00:00"
-        },
-        {
-            "name": "symfony/event-dispatcher-contracts",
-            "version": "v1.1.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c43ab685673fb6c8d84220c77897b1d6cdbe1d18",
-                "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1.3"
-            },
-            "suggest": {
-                "psr/event-dispatcher": "",
-                "symfony/event-dispatcher-implementation": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Contracts\\EventDispatcher\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Generic abstractions related to dispatching event",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "abstractions",
-                "contracts",
-                "decoupling",
-                "interfaces",
-                "interoperability",
-                "standards"
-            ],
-            "time": "2019-09-17T09:54:03+00:00"
-        },
-        {
-            "name": "symfony/filesystem",
-            "version": "v5.0.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/filesystem.git",
-                "reference": "7cd0dafc4353a0f62e307df90b48466379c8cc91"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/7cd0dafc4353a0f62e307df90b48466379c8cc91",
-                "reference": "7cd0dafc4353a0f62e307df90b48466379c8cc91",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2.5",
-                "symfony/polyfill-ctype": "~1.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Filesystem\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "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-04-12T14:40:17+00:00"
-        },
-        {
-            "name": "symfony/finder",
-            "version": "v5.0.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/finder.git",
-                "reference": "600a52c29afc0d1caa74acbec8d3095ca7e9910d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/600a52c29afc0d1caa74acbec8d3095ca7e9910d",
-                "reference": "600a52c29afc0d1caa74acbec8d3095ca7e9910d",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2.5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Finder\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "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-03-27T16:56:45+00:00"
-        },
-        {
-            "name": "symfony/polyfill-ctype",
-            "version": "v1.17.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
-                "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "suggest": {
-                "ext-ctype": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.17-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Gert de Pagter",
-                    "email": "BackEndTea@gmail.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for ctype functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "ctype",
-                "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-05-12T16:14:59+00:00"
-        },
-        {
-            "name": "symfony/polyfill-intl-idn",
-            "version": "v1.17.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3bff59ea7047e925be6b7f2059d60af31bb46d6a",
-                "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "symfony/polyfill-mbstring": "^1.3",
-                "symfony/polyfill-php72": "^1.10"
-            },
-            "suggest": {
-                "ext-intl": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.17-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Idn\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Laurent Bassin",
-                    "email": "laurent@bassin.info"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "idn",
-                "intl",
-                "polyfill",
-                "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"
-        },
-        {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.17.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "fa79b11539418b02fc5e1897267673ba2c19419c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fa79b11539418b02fc5e1897267673ba2c19419c",
-                "reference": "fa79b11539418b02fc5e1897267673ba2c19419c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "suggest": {
-                "ext-mbstring": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.17-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for the Mbstring extension",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "mbstring",
-                "polyfill",
-                "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"
-        },
-        {
-            "name": "symfony/polyfill-php72",
-            "version": "v1.17.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "f048e612a3905f34931127360bdd2def19a5e582"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/f048e612a3905f34931127360bdd2def19a5e582",
-                "reference": "f048e612a3905f34931127360bdd2def19a5e582",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.17-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php72\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "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"
-        },
-        {
-            "name": "symfony/polyfill-php73",
-            "version": "v1.17.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "a760d8964ff79ab9bf057613a5808284ec852ccc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a760d8964ff79ab9bf057613a5808284ec852ccc",
-                "reference": "a760d8964ff79ab9bf057613a5808284ec852ccc",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.17-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php73\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ],
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "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"
-        },
-        {
-            "name": "symfony/process",
-            "version": "v4.4.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/process.git",
-                "reference": "4b6a9a4013baa65d409153cbb5a895bf093dc7f4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/4b6a9a4013baa65d409153cbb5a895bf093dc7f4",
-                "reference": "4b6a9a4013baa65d409153cbb5a895bf093dc7f4",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Process\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "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-04-15T15:56:18+00:00"
-        },
-        {
-            "name": "symfony/service-contracts",
-            "version": "v2.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "144c5e51266b281231e947b51223ba14acf1a749"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/144c5e51266b281231e947b51223ba14acf1a749",
-                "reference": "144c5e51266b281231e947b51223ba14acf1a749",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2.5",
-                "psr/container": "^1.0"
-            },
-            "suggest": {
-                "symfony/service-implementation": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Contracts\\Service\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Generic abstractions related to writing services",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "abstractions",
-                "contracts",
-                "decoupling",
-                "interfaces",
-                "interoperability",
-                "standards"
-            ],
-            "time": "2019-11-18T17:27:11+00:00"
-        },
-        {
-            "name": "tedivm/jshrink",
-            "version": "v1.3.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/tedious/JShrink.git",
-                "reference": "566e0c731ba4e372be2de429ef7d54f4faf4477a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/tedious/JShrink/zipball/566e0c731ba4e372be2de429ef7d54f4faf4477a",
-                "reference": "566e0c731ba4e372be2de429ef7d54f4faf4477a",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6|^7.0"
-            },
-            "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.8",
-                "php-coveralls/php-coveralls": "^1.1.0",
-                "phpunit/phpunit": "^6"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "JShrink": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Robert Hafner",
-                    "email": "tedivm@tedivm.com"
-                }
-            ],
-            "description": "Javascript Minifier built in PHP",
-            "homepage": "http://github.com/tedious/JShrink",
-            "keywords": [
-                "javascript",
-                "minifier"
-            ],
-            "time": "2019-06-28T18:11:46+00:00"
-        },
-        {
-            "name": "true/punycode",
-            "version": "v2.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/true/php-punycode.git",
-                "reference": "a4d0c11a36dd7f4e7cd7096076cab6d3378a071e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/true/php-punycode/zipball/a4d0c11a36dd7f4e7cd7096076cab6d3378a071e",
-                "reference": "a4d0c11a36dd7f4e7cd7096076cab6d3378a071e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0",
-                "symfony/polyfill-mbstring": "^1.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.7",
-                "squizlabs/php_codesniffer": "~2.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "TrueBV\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Renan Gonçalves",
-                    "email": "renan.saddam@gmail.com"
-                }
-            ],
-            "description": "A Bootstring encoding of Unicode for Internationalized Domain Names in Applications (IDNA)",
-            "homepage": "https://github.com/true/php-punycode",
-            "keywords": [
-                "idna",
-                "punycode"
-            ],
-            "time": "2016-11-16T10:37:54+00:00"
-        },
-        {
-            "name": "tubalmartin/cssmin",
-            "version": "v4.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port.git",
-                "reference": "3cbf557f4079d83a06f9c3ff9b957c022d7805cf"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/tubalmartin/YUI-CSS-compressor-PHP-port/zipball/3cbf557f4079d83a06f9c3ff9b957c022d7805cf",
-                "reference": "3cbf557f4079d83a06f9c3ff9b957c022d7805cf",
-                "shasum": ""
-            },
-            "require": {
-                "ext-pcre": "*",
-                "php": ">=5.3.2"
-            },
-            "require-dev": {
-                "cogpowered/finediff": "0.3.*",
-                "phpunit/phpunit": "4.8.*"
-            },
-            "bin": [
-                "cssmin"
-            ],
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "tubalmartin\\CssMin\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Túbal Martín",
-                    "homepage": "http://tubalmartin.me/"
-                }
-            ],
-            "description": "A PHP port of the YUI CSS compressor",
-            "homepage": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port",
-            "keywords": [
-                "compress",
-                "compressor",
-                "css",
-                "cssmin",
-                "minify",
-                "yui"
-            ],
-            "time": "2018-01-15T15:26:51+00:00"
-        },
-        {
-            "name": "webonyx/graphql-php",
-            "version": "v0.13.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webonyx/graphql-php.git",
-                "reference": "6829ae58f4c59121df1f86915fb9917a2ec595e8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/6829ae58f4c59121df1f86915fb9917a2ec595e8",
-                "reference": "6829ae58f4c59121df1f86915fb9917a2ec595e8",
-                "shasum": ""
-            },
-            "require": {
-                "ext-json": "*",
-                "ext-mbstring": "*",
-                "php": "^7.1||^8.0"
-            },
-            "require-dev": {
-                "doctrine/coding-standard": "^6.0",
-                "phpbench/phpbench": "^0.14.0",
-                "phpstan/phpstan": "^0.11.4",
-                "phpstan/phpstan-phpunit": "^0.11.0",
-                "phpstan/phpstan-strict-rules": "^0.11.0",
-                "phpunit/phpcov": "^5.0",
-                "phpunit/phpunit": "^7.2",
-                "psr/http-message": "^1.0",
-                "react/promise": "2.*"
-            },
-            "suggest": {
-                "psr/http-message": "To use standard GraphQL server",
-                "react/promise": "To leverage async resolving on React PHP platform"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "GraphQL\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "A PHP port of GraphQL reference implementation",
-            "homepage": "https://github.com/webonyx/graphql-php",
-            "keywords": [
-                "api",
-                "graphql"
-            ],
-            "time": "2019-08-25T10:32:47+00:00"
-        },
-        {
-            "name": "wikimedia/less.php",
-            "version": "1.8.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/wikimedia/less.php.git",
-                "reference": "e238ad228d74b6ffd38209c799b34e9826909266"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/wikimedia/less.php/zipball/e238ad228d74b6ffd38209c799b34e9826909266",
-                "reference": "e238ad228d74b6ffd38209c799b34e9826909266",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2.9"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "7.5.14"
-            },
-            "bin": [
-                "bin/lessc"
-            ],
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Less": "lib/"
-                },
-                "classmap": [
-                    "lessc.inc.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "Josh Schmidt",
-                    "homepage": "https://github.com/oyejorge"
-                },
-                {
-                    "name": "Matt Agar",
-                    "homepage": "https://github.com/agar"
-                },
-                {
-                    "name": "Martin Jantošovič",
-                    "homepage": "https://github.com/Mordred"
-                }
-            ],
-            "description": "PHP port of the Javascript version of LESS http://lesscss.org (Originally maintained by Josh Schmidt)",
-            "keywords": [
-                "css",
-                "less",
-                "less.js",
-                "lesscss",
-                "php",
-                "stylesheet"
-            ],
-            "time": "2019-11-06T18:30:11+00:00"
-        }
-    ],
-    "packages-dev": [
-        {
-            "name": "allure-framework/allure-codeception",
-            "version": "1.4.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/allure-framework/allure-codeception.git",
-                "reference": "9e0e25f8960fa5ac17c65c932ea8153ce6700713"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/allure-framework/allure-codeception/zipball/9e0e25f8960fa5ac17c65c932ea8153ce6700713",
-                "reference": "9e0e25f8960fa5ac17c65c932ea8153ce6700713",
-                "shasum": ""
-            },
-            "require": {
-                "allure-framework/allure-php-api": "~1.1.8",
-                "codeception/codeception": "^2.3|^3.0|^4.0",
-                "php": ">=5.6",
-                "symfony/filesystem": ">=2.6",
-                "symfony/finder": ">=2.6"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Yandex": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "Ivan Krutov",
-                    "email": "vania-pooh@yandex-team.ru",
-                    "role": "Developer"
-                }
-            ],
-            "description": "A Codeception adapter for Allure report.",
-            "homepage": "http://allure.qatools.ru/",
-            "keywords": [
-                "allure",
-                "attachments",
-                "cases",
-                "codeception",
-                "report",
-                "steps",
-                "testing"
-            ],
-            "time": "2020-03-13T11:07:13+00:00"
-        },
-        {
-            "name": "allure-framework/allure-php-api",
-            "version": "1.1.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/allure-framework/allure-php-commons.git",
-                "reference": "5ae2deac1c7e1b992cfa572167370de45bdd346d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/allure-framework/allure-php-commons/zipball/5ae2deac1c7e1b992cfa572167370de45bdd346d",
-                "reference": "5ae2deac1c7e1b992cfa572167370de45bdd346d",
-                "shasum": ""
-            },
-            "require": {
-                "jms/serializer": "^0.16 || ^1.0",
-                "php": ">=5.4.0",
-                "ramsey/uuid": "^3.0",
-                "symfony/http-foundation": "^2.0 || ^3.0 || ^4.0 || ^5.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.0.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Yandex": [
-                        "src/",
-                        "test/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "Ivan Krutov",
-                    "email": "vania-pooh@yandex-team.ru",
-                    "role": "Developer"
-                }
-            ],
-            "description": "PHP API for Allure adapter",
-            "homepage": "http://allure.qatools.ru/",
-            "keywords": [
-                "allure",
-                "api",
-                "php",
-                "report"
-            ],
-            "time": "2020-03-13T10:47:35+00:00"
-        },
-        {
-            "name": "allure-framework/allure-phpunit",
-            "version": "1.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/allure-framework/allure-phpunit.git",
-                "reference": "9399629c6eed79da4be18fd22adf83ef36c2d2e0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/allure-framework/allure-phpunit/zipball/9399629c6eed79da4be18fd22adf83ef36c2d2e0",
-                "reference": "9399629c6eed79da4be18fd22adf83ef36c2d2e0",
-                "shasum": ""
-            },
-            "require": {
-                "allure-framework/allure-php-api": "~1.1.0",
-                "mikey179/vfsstream": "1.*",
-                "php": ">=7.1.0",
-                "phpunit/phpunit": ">=7.0.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Yandex": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "Ivan Krutov",
-                    "email": "vania-pooh@yandex-team.ru",
-                    "role": "Developer"
-                }
-            ],
-            "description": "A PHPUnit adapter for Allure report.",
-            "homepage": "http://allure.qatools.ru/",
-            "keywords": [
-                "allure",
-                "attachments",
-                "cases",
-                "phpunit",
-                "report",
-                "steps",
-                "testing"
-            ],
-            "time": "2018-10-25T12:03:54+00:00"
-        },
-        {
-            "name": "aws/aws-sdk-php",
-            "version": "3.138.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "6b9f3fcea4dfa6092c628c790ca6d369a75453b7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/6b9f3fcea4dfa6092c628c790ca6d369a75453b7",
-                "reference": "6b9f3fcea4dfa6092c628c790ca6d369a75453b7",
-                "shasum": ""
-            },
-            "require": {
-                "ext-json": "*",
-                "ext-pcre": "*",
-                "ext-simplexml": "*",
-                "guzzlehttp/guzzle": "^5.3.3|^6.2.1|^7.0",
-                "guzzlehttp/promises": "^1.0",
-                "guzzlehttp/psr7": "^1.4.1",
-                "mtdowling/jmespath.php": "^2.5",
-                "php": ">=5.5"
-            },
-            "require-dev": {
-                "andrewsville/php-token-reflection": "^1.4",
-                "aws/aws-php-sns-message-validator": "~1.0",
-                "behat/behat": "~3.0",
-                "doctrine/cache": "~1.4",
-                "ext-dom": "*",
-                "ext-openssl": "*",
-                "ext-pcntl": "*",
-                "ext-sockets": "*",
-                "nette/neon": "^2.3",
-                "phpunit/phpunit": "^4.8.35|^5.4.3",
-                "psr/cache": "^1.0",
-                "psr/simple-cache": "^1.0",
-                "sebastian/comparator": "^1.2.3"
-            },
-            "suggest": {
-                "aws/aws-php-sns-message-validator": "To validate incoming SNS notifications",
-                "doctrine/cache": "To use the DoctrineCacheAdapter",
-                "ext-curl": "To send requests using cURL",
-                "ext-openssl": "Allows working with CloudFront private distributions and verifying received SNS messages",
-                "ext-sockets": "To use client-side monitoring"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Aws\\": "src/"
-                },
-                "files": [
-                    "src/functions.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "Amazon Web Services",
-                    "homepage": "http://aws.amazon.com"
-                }
-            ],
-            "description": "AWS SDK for PHP - Use Amazon Web Services in your PHP project",
-            "homepage": "http://aws.amazon.com/sdkforphp",
-            "keywords": [
-                "amazon",
-                "aws",
-                "cloud",
-                "dynamodb",
-                "ec2",
-                "glacier",
-                "s3",
-                "sdk"
-            ],
-            "time": "2020-05-22T18:11:09+00:00"
-        },
-        {
-            "name": "beberlei/assert",
-            "version": "v3.2.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/beberlei/assert.git",
-                "reference": "d63a6943fc4fd1a2aedb65994e3548715105abcf"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/beberlei/assert/zipball/d63a6943fc4fd1a2aedb65994e3548715105abcf",
-                "reference": "d63a6943fc4fd1a2aedb65994e3548715105abcf",
-                "shasum": ""
-            },
-            "require": {
-                "ext-ctype": "*",
-                "ext-json": "*",
-                "ext-mbstring": "*",
-                "ext-simplexml": "*",
-                "php": "^7"
-            },
-            "require-dev": {
-                "friendsofphp/php-cs-fixer": "*",
-                "phpstan/phpstan-shim": "*",
-                "phpunit/phpunit": ">=6.0.0 <8"
-            },
-            "suggest": {
-                "ext-intl": "Needed to allow Assertion::count(), Assertion::isCountable(), Assertion::minCount(), and Assertion::maxCount() to operate on ResourceBundles"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Assert\\": "lib/Assert"
-                },
-                "files": [
-                    "lib/Assert/functions.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-2-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de",
-                    "role": "Lead Developer"
-                },
-                {
-                    "name": "Richard Quadling",
-                    "email": "rquadling@gmail.com",
-                    "role": "Collaborator"
-                }
-            ],
-            "description": "Thin assertion library for input validation in business models.",
-            "keywords": [
-                "assert",
-                "assertion",
-                "validation"
-            ],
-            "time": "2019-12-19T17:51:41+00:00"
-        },
-        {
-            "name": "behat/gherkin",
-            "version": "v4.6.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Behat/Gherkin.git",
-                "reference": "51ac4500c4dc30cbaaabcd2f25694299df666a31"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/51ac4500c4dc30cbaaabcd2f25694299df666a31",
-                "reference": "51ac4500c4dc30cbaaabcd2f25694299df666a31",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.5|~5",
-                "symfony/phpunit-bridge": "~2.7|~3|~4",
-                "symfony/yaml": "~2.3|~3|~4"
-            },
-            "suggest": {
-                "symfony/yaml": "If you want to parse features, represented in YAML files"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Behat\\Gherkin": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                }
-            ],
-            "description": "Gherkin DSL parser for PHP 5.3",
-            "homepage": "http://behat.org/",
-            "keywords": [
-                "BDD",
-                "Behat",
-                "Cucumber",
-                "DSL",
-                "gherkin",
-                "parser"
-            ],
-            "time": "2020-03-17T14:03:26+00:00"
-        },
-        {
-            "name": "cache/cache",
-            "version": "0.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-cache/cache.git",
-                "reference": "902b2e5b54ea57e3a801437748652228c4c58604"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-cache/cache/zipball/902b2e5b54ea57e3a801437748652228c4c58604",
-                "reference": "902b2e5b54ea57e3a801437748652228c4c58604",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/cache": "^1.3",
-                "league/flysystem": "^1.0",
-                "php": "^5.6 || ^7.0",
-                "psr/cache": "^1.0",
-                "psr/log": "^1.0",
-                "psr/simple-cache": "^1.0"
-            },
-            "conflict": {
-                "cache/adapter-common": "*",
-                "cache/apc-adapter": "*",
-                "cache/apcu-adapter": "*",
-                "cache/array-adapter": "*",
-                "cache/chain-adapter": "*",
-                "cache/doctrine-adapter": "*",
-                "cache/filesystem-adapter": "*",
-                "cache/hierarchical-cache": "*",
-                "cache/illuminate-adapter": "*",
-                "cache/memcache-adapter": "*",
-                "cache/memcached-adapter": "*",
-                "cache/mongodb-adapter": "*",
-                "cache/predis-adapter": "*",
-                "cache/psr-6-doctrine-bridge": "*",
-                "cache/redis-adapter": "*",
-                "cache/session-handler": "*",
-                "cache/taggable-cache": "*",
-                "cache/void-adapter": "*"
-            },
-            "require-dev": {
-                "cache/integration-tests": "^0.16",
-                "defuse/php-encryption": "^2.0",
-                "illuminate/cache": "^5.4",
-                "mockery/mockery": "^0.9",
-                "phpunit/phpunit": "^4.0 || ^5.1",
-                "predis/predis": "^1.0",
-                "symfony/cache": "dev-master"
-            },
-            "suggest": {
-                "ext-apc": "APC extension is required to use the APC Adapter",
-                "ext-apcu": "APCu extension is required to use the APCu Adapter",
-                "ext-memcache": "Memcache extension is required to use the Memcache Adapter",
-                "ext-memcached": "Memcached extension is required to use the Memcached Adapter",
-                "ext-mongodb": "Mongodb extension required to use the Mongodb adapter",
-                "ext-redis": "Redis extension is required to use the Redis adapter",
-                "mongodb/mongodb": "Mongodb lib required to use the Mongodb adapter"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Cache\\": "src/"
-                },
-                "exclude-from-classmap": [
-                    "**/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Aaron Scherer",
-                    "email": "aequasi@gmail.com",
-                    "homepage": "https://github.com/aequasi"
-                },
-                {
-                    "name": "Tobias Nyholm",
-                    "email": "tobias.nyholm@gmail.com",
-                    "homepage": "https://github.com/Nyholm"
-                }
-            ],
-            "description": "Library of all the php-cache adapters",
-            "homepage": "http://www.php-cache.com/en/latest/",
-            "keywords": [
-                "cache",
-                "psr6"
-            ],
-            "time": "2017-03-28T16:08:48+00:00"
-        },
-        {
-            "name": "codeception/codeception",
-            "version": "4.1.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Codeception/Codeception.git",
-                "reference": "55d8d1d882fa0777e47de17b04c29b3c50fe29e7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/55d8d1d882fa0777e47de17b04c29b3c50fe29e7",
-                "reference": "55d8d1d882fa0777e47de17b04c29b3c50fe29e7",
-                "shasum": ""
-            },
-            "require": {
-                "behat/gherkin": "^4.4.0",
-                "codeception/lib-asserts": "^1.0",
-                "codeception/phpunit-wrapper": ">6.0.15 <6.1.0 | ^6.6.1 | ^7.7.1 | ^8.1.1 | ^9.0",
-                "codeception/stub": "^2.0 | ^3.0",
-                "ext-curl": "*",
-                "ext-json": "*",
-                "ext-mbstring": "*",
-                "guzzlehttp/psr7": "~1.4",
-                "php": ">=5.6.0 <8.0",
-                "symfony/console": ">=2.7 <6.0",
-                "symfony/css-selector": ">=2.7 <6.0",
-                "symfony/event-dispatcher": ">=2.7 <6.0",
-                "symfony/finder": ">=2.7 <6.0",
-                "symfony/yaml": ">=2.7 <6.0"
-            },
-            "require-dev": {
-                "codeception/module-asserts": "*@dev",
-                "codeception/module-cli": "*@dev",
-                "codeception/module-db": "*@dev",
-                "codeception/module-filesystem": "*@dev",
-                "codeception/module-phpbrowser": "*@dev",
-                "codeception/specify": "~0.3",
-                "codeception/util-universalframework": "*@dev",
-                "monolog/monolog": "~1.8",
-                "squizlabs/php_codesniffer": "~2.0",
-                "symfony/process": ">=2.7 <6.0",
-                "vlucas/phpdotenv": "^2.0 | ^3.0 | ^4.0"
-            },
-            "suggest": {
-                "codeception/specify": "BDD-style code blocks",
-                "codeception/verify": "BDD-style assertions",
-                "hoa/console": "For interactive console functionality",
-                "stecman/symfony-console-completion": "For BASH autocompletion",
-                "symfony/phpunit-bridge": "For phpunit-bridge support"
-            },
-            "bin": [
-                "codecept"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": []
-            },
-            "autoload": {
-                "psr-4": {
-                    "Codeception\\": "src/Codeception",
-                    "Codeception\\Extension\\": "ext"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Bodnarchuk",
-                    "email": "davert@mail.ua",
-                    "homepage": "http://codegyre.com"
-                }
-            ],
-            "description": "BDD-style testing framework",
-            "homepage": "http://codeception.com/",
-            "keywords": [
-                "BDD",
-                "TDD",
-                "acceptance testing",
-                "functional testing",
-                "unit testing"
-            ],
-            "funding": [
-                {
-                    "url": "https://opencollective.com/codeception",
-                    "type": "open_collective"
-                }
-            ],
-            "time": "2020-03-23T17:07:20+00:00"
-        },
-        {
-            "name": "codeception/lib-asserts",
-            "version": "1.12.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Codeception/lib-asserts.git",
-                "reference": "acd0dc8b394595a74b58dcc889f72569ff7d8e71"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/lib-asserts/zipball/acd0dc8b394595a74b58dcc889f72569ff7d8e71",
-                "reference": "acd0dc8b394595a74b58dcc889f72569ff7d8e71",
-                "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"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Bodnarchuk",
-                    "email": "davert@mail.ua",
-                    "homepage": "http://codegyre.com"
-                },
-                {
-                    "name": "Gintautas Miselis"
-                }
-            ],
-            "description": "Assertion methods used by Codeception core and Asserts module",
-            "homepage": "http://codeception.com/",
-            "keywords": [
-                "codeception"
-            ],
-            "time": "2020-04-17T18:20:46+00:00"
-        },
-        {
-            "name": "codeception/module-asserts",
-            "version": "1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Codeception/module-asserts.git",
-                "reference": "79f13d05b63f2fceba4d0e78044bab668c9b2a6b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/module-asserts/zipball/79f13d05b63f2fceba4d0e78044bab668c9b2a6b",
-                "reference": "79f13d05b63f2fceba4d0e78044bab668c9b2a6b",
-                "shasum": ""
-            },
-            "require": {
-                "codeception/codeception": "*@dev",
-                "codeception/lib-asserts": "^1.12.0",
-                "php": ">=5.6.0 <8.0"
-            },
-            "conflict": {
-                "codeception/codeception": "<4.0"
-            },
-            "require-dev": {
-                "codeception/util-robohelpers": "dev-master"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Bodnarchuk"
-                },
-                {
-                    "name": "Gintautas Miselis"
-                }
-            ],
-            "description": "Codeception module containing various assertions",
-            "homepage": "http://codeception.com/",
-            "keywords": [
-                "assertions",
-                "asserts",
-                "codeception"
-            ],
-            "time": "2020-04-20T07:26:11+00:00"
-        },
-        {
-            "name": "codeception/module-sequence",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Codeception/module-sequence.git",
-                "reference": "70563527b768194d6ab22e1ff943a5e69741c5dd"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/module-sequence/zipball/70563527b768194d6ab22e1ff943a5e69741c5dd",
-                "reference": "70563527b768194d6ab22e1ff943a5e69741c5dd",
-                "shasum": ""
-            },
-            "require": {
-                "codeception/codeception": "4.0.x-dev | ^4.0",
-                "php": ">=5.6.0 <8.0"
-            },
-            "require-dev": {
-                "codeception/util-robohelpers": "dev-master"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Bodnarchuk"
-                }
-            ],
-            "description": "Sequence module for Codeception",
-            "homepage": "http://codeception.com/",
-            "keywords": [
-                "codeception"
-            ],
-            "time": "2019-10-10T12:08:50+00:00"
-        },
-        {
-            "name": "codeception/module-webdriver",
-            "version": "1.0.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Codeception/module-webdriver.git",
-                "reference": "da55466876d9e73c09917f495b923395b1cdf92a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/module-webdriver/zipball/da55466876d9e73c09917f495b923395b1cdf92a",
-                "reference": "da55466876d9e73c09917f495b923395b1cdf92a",
-                "shasum": ""
-            },
-            "require": {
-                "codeception/codeception": "^4.0",
-                "php": ">=5.6.0 <8.0",
-                "php-webdriver/webdriver": "^1.6.0"
-            },
-            "require-dev": {
-                "codeception/util-robohelpers": "dev-master"
-            },
-            "suggest": {
-                "codeception/phpbuiltinserver": "Start and stop PHP built-in web server for your tests"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Bodnarchuk"
-                },
-                {
-                    "name": "Gintautas Miselis"
-                },
-                {
-                    "name": "Zaahid Bateson"
-                }
-            ],
-            "description": "WebDriver module for Codeception",
-            "homepage": "http://codeception.com/",
-            "keywords": [
-                "acceptance-testing",
-                "browser-testing",
-                "codeception"
-            ],
-            "time": "2020-04-29T13:45:52+00:00"
-        },
-        {
-            "name": "codeception/phpunit-wrapper",
-            "version": "9.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Codeception/phpunit-wrapper.git",
-                "reference": "eb27243d8edde68593bf8d9ef5e9074734777931"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/eb27243d8edde68593bf8d9ef5e9074734777931",
-                "reference": "eb27243d8edde68593bf8d9ef5e9074734777931",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2",
-                "phpunit/phpunit": "^9.0"
-            },
-            "require-dev": {
-                "codeception/specify": "*",
-                "vlucas/phpdotenv": "^3.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Codeception\\PHPUnit\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Davert",
-                    "email": "davert.php@resend.cc"
-                },
-                {
-                    "name": "Naktibalda"
-                }
-            ],
-            "description": "PHPUnit classes used by Codeception",
-            "time": "2020-04-17T18:16:31+00:00"
-        },
-        {
-            "name": "codeception/stub",
-            "version": "3.6.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Codeception/Stub.git",
-                "reference": "a3ba01414cbee76a1bced9f9b6b169cc8d203880"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Stub/zipball/a3ba01414cbee76a1bced9f9b6b169cc8d203880",
-                "reference": "a3ba01414cbee76a1bced9f9b6b169cc8d203880",
-                "shasum": ""
-            },
-            "require": {
-                "phpunit/phpunit": "^8.4 | ^9.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Codeception\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Flexible Stub wrapper for PHPUnit's Mock Builder",
-            "time": "2020-02-07T18:42:28+00:00"
-        },
-        {
-            "name": "csharpru/vault-php",
-            "version": "3.5.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/CSharpRU/vault-php.git",
-                "reference": "04be9776310fe7d1afb97795645f95c21e6b4fcf"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/CSharpRU/vault-php/zipball/04be9776310fe7d1afb97795645f95c21e6b4fcf",
-                "reference": "04be9776310fe7d1afb97795645f95c21e6b4fcf",
-                "shasum": ""
-            },
-            "require": {
-                "cache/cache": "^0.4.0",
-                "doctrine/inflector": "~1.1.0",
-                "guzzlehttp/promises": "^1.3",
-                "guzzlehttp/psr7": "^1.4",
-                "psr/cache": "^1.0",
-                "psr/log": "^1.0",
-                "weew/helpers-array": "^1.3"
-            },
-            "require-dev": {
-                "codacy/coverage": "^1.1",
-                "codeception/codeception": "^2.2",
-                "csharpru/vault-php-guzzle6-transport": "~2.0",
-                "php-vcr/php-vcr": "^1.3"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Vault\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Yaroslav Lukyanov",
-                    "email": "c_sharp@mail.ru"
-                }
-            ],
-            "description": "Best Vault client for PHP that you can find",
-            "time": "2018-04-28T04:52:17+00:00"
-        },
-        {
-            "name": "csharpru/vault-php-guzzle6-transport",
-            "version": "2.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/CSharpRU/vault-php-guzzle6-transport.git",
-                "reference": "33c392120ac9f253b62b034e0e8ffbbdb3513bd8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/CSharpRU/vault-php-guzzle6-transport/zipball/33c392120ac9f253b62b034e0e8ffbbdb3513bd8",
-                "reference": "33c392120ac9f253b62b034e0e8ffbbdb3513bd8",
-                "shasum": ""
-            },
-            "require": {
-                "guzzlehttp/guzzle": "~6.2",
-                "guzzlehttp/promises": "^1.3",
-                "guzzlehttp/psr7": "^1.4"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "VaultTransports\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Yaroslav Lukyanov",
-                    "email": "c_sharp@mail.ru"
-                }
-            ],
-            "description": "Guzzle6 transport for Vault PHP client",
-            "time": "2019-03-10T06:17:37+00:00"
-        },
-        {
-            "name": "dealerdirect/phpcodesniffer-composer-installer",
-            "version": "v0.5.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Dealerdirect/phpcodesniffer-composer-installer.git",
-                "reference": "e749410375ff6fb7a040a68878c656c2e610b132"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/e749410375ff6fb7a040a68878c656c2e610b132",
-                "reference": "e749410375ff6fb7a040a68878c656c2e610b132",
-                "shasum": ""
-            },
-            "require": {
-                "composer-plugin-api": "^1.0",
-                "php": "^5.3|^7",
-                "squizlabs/php_codesniffer": "^2|^3"
-            },
-            "require-dev": {
-                "composer/composer": "*",
-                "phpcompatibility/php-compatibility": "^9.0",
-                "sensiolabs/security-checker": "^4.1.0"
-            },
-            "type": "composer-plugin",
-            "extra": {
-                "class": "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin"
-            },
-            "autoload": {
-                "psr-4": {
-                    "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Franck Nijhof",
-                    "email": "franck.nijhof@dealerdirect.com",
-                    "homepage": "http://www.frenck.nl",
-                    "role": "Developer / IT Manager"
-                }
-            ],
-            "description": "PHP_CodeSniffer Standards Composer Installer Plugin",
-            "homepage": "http://www.dealerdirect.com",
-            "keywords": [
-                "PHPCodeSniffer",
-                "PHP_CodeSniffer",
-                "code quality",
-                "codesniffer",
-                "composer",
-                "installer",
-                "phpcs",
-                "plugin",
-                "qa",
-                "quality",
-                "standard",
-                "standards",
-                "style guide",
-                "stylecheck",
-                "tests"
-            ],
-            "time": "2018-10-26T13:21:45+00:00"
-        },
-        {
-            "name": "doctrine/annotations",
-            "version": "1.10.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/annotations.git",
-                "reference": "b9d758e831c70751155c698c2f7df4665314a1cb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/b9d758e831c70751155c698c2f7df4665314a1cb",
-                "reference": "b9d758e831c70751155c698c2f7df4665314a1cb",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/lexer": "1.*",
-                "ext-tokenizer": "*",
-                "php": "^7.1"
-            },
-            "require-dev": {
-                "doctrine/cache": "1.*",
-                "phpunit/phpunit": "^7.5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.9.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "Docblock Annotations Parser",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "annotations",
-                "docblock",
-                "parser"
-            ],
-            "time": "2020-04-20T09:18:32+00:00"
-        },
-        {
-            "name": "doctrine/cache",
-            "version": "1.10.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/cache.git",
-                "reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/cache/zipball/382e7f4db9a12dc6c19431743a2b096041bcdd62",
-                "reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62",
-                "shasum": ""
-            },
-            "require": {
-                "php": "~7.1"
-            },
-            "conflict": {
-                "doctrine/common": ">2.2,<2.4"
-            },
-            "require-dev": {
-                "alcaeus/mongo-php-adapter": "^1.1",
-                "doctrine/coding-standard": "^6.0",
-                "mongodb/mongodb": "^1.1",
-                "phpunit/phpunit": "^7.0",
-                "predis/predis": "~1.0"
-            },
-            "suggest": {
-                "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.9.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "PHP Doctrine Cache library is a popular cache implementation that supports many different drivers such as redis, memcache, apc, mongodb and others.",
-            "homepage": "https://www.doctrine-project.org/projects/cache.html",
-            "keywords": [
-                "abstraction",
-                "apcu",
-                "cache",
-                "caching",
-                "couchdb",
-                "memcached",
-                "php",
-                "redis",
-                "xcache"
-            ],
-            "time": "2019-11-29T15:36:20+00:00"
-        },
-        {
-            "name": "doctrine/inflector",
-            "version": "v1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/inflector.git",
-                "reference": "90b2128806bfde671b6952ab8bea493942c1fdae"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/inflector/zipball/90b2128806bfde671b6952ab8bea493942c1fdae",
-                "reference": "90b2128806bfde671b6952ab8bea493942c1fdae",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "4.*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Doctrine\\Common\\Inflector\\": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "Common String Manipulations with regard to casing and singular/plural rules.",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "inflection",
-                "pluralize",
-                "singularize",
-                "string"
-            ],
-            "time": "2015-11-06T14:35:42+00:00"
-        },
-        {
-            "name": "doctrine/instantiator",
-            "version": "1.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "ae466f726242e637cebdd526a7d991b9433bacf1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/ae466f726242e637cebdd526a7d991b9433bacf1",
-                "reference": "ae466f726242e637cebdd526a7d991b9433bacf1",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1"
-            },
-            "require-dev": {
-                "doctrine/coding-standard": "^6.0",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpbench/phpbench": "^0.13",
-                "phpstan/phpstan-phpunit": "^0.11",
-                "phpstan/phpstan-shim": "^0.11",
-                "phpunit/phpunit": "^7.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
-                }
-            ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
-            "keywords": [
-                "constructor",
-                "instantiate"
-            ],
-            "time": "2019-10-21T16:45:58+00:00"
-        },
-        {
-            "name": "doctrine/lexer",
-            "version": "1.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/lexer.git",
-                "reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6",
-                "reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2"
-            },
-            "require-dev": {
-                "doctrine/coding-standard": "^6.0",
-                "phpstan/phpstan": "^0.11.8",
-                "phpunit/phpunit": "^8.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.",
-            "homepage": "https://www.doctrine-project.org/projects/lexer.html",
-            "keywords": [
-                "annotations",
-                "docblock",
-                "lexer",
-                "parser",
-                "php"
-            ],
-            "time": "2019-10-30T14:39:59+00:00"
-        },
-        {
-            "name": "friendsofphp/php-cs-fixer",
-            "version": "v2.16.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-                "reference": "83baf823a33a1cbd5416c8626935cf3f843c10b0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/83baf823a33a1cbd5416c8626935cf3f843c10b0",
-                "reference": "83baf823a33a1cbd5416c8626935cf3f843c10b0",
-                "shasum": ""
-            },
-            "require": {
-                "composer/semver": "^1.4",
-                "composer/xdebug-handler": "^1.2",
-                "doctrine/annotations": "^1.2",
-                "ext-json": "*",
-                "ext-tokenizer": "*",
-                "php": "^5.6 || ^7.0",
-                "php-cs-fixer/diff": "^1.3",
-                "symfony/console": "^3.4.17 || ^4.1.6 || ^5.0",
-                "symfony/event-dispatcher": "^3.0 || ^4.0 || ^5.0",
-                "symfony/filesystem": "^3.0 || ^4.0 || ^5.0",
-                "symfony/finder": "^3.0 || ^4.0 || ^5.0",
-                "symfony/options-resolver": "^3.0 || ^4.0 || ^5.0",
-                "symfony/polyfill-php70": "^1.0",
-                "symfony/polyfill-php72": "^1.4",
-                "symfony/process": "^3.0 || ^4.0 || ^5.0",
-                "symfony/stopwatch": "^3.0 || ^4.0 || ^5.0"
-            },
-            "require-dev": {
-                "johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0",
-                "justinrainbow/json-schema": "^5.0",
-                "keradus/cli-executor": "^1.2",
-                "mikey179/vfsstream": "^1.6",
-                "php-coveralls/php-coveralls": "^2.1",
-                "php-cs-fixer/accessible-object": "^1.0",
-                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.1",
-                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.1",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.1",
-                "phpunitgoodpractices/traits": "^1.8",
-                "symfony/phpunit-bridge": "^4.3 || ^5.0",
-                "symfony/yaml": "^3.0 || ^4.0 || ^5.0"
-            },
-            "suggest": {
-                "ext-dom": "For handling output formats in XML",
-                "ext-mbstring": "For handling non-UTF8 characters in cache signature.",
-                "php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.",
-                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.",
-                "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible."
-            },
-            "bin": [
-                "php-cs-fixer"
-            ],
-            "type": "application",
-            "autoload": {
-                "psr-4": {
-                    "PhpCsFixer\\": "src/"
-                },
-                "classmap": [
-                    "tests/Test/AbstractFixerTestCase.php",
-                    "tests/Test/AbstractIntegrationCaseFactory.php",
-                    "tests/Test/AbstractIntegrationTestCase.php",
-                    "tests/Test/Assert/AssertTokensTrait.php",
-                    "tests/Test/IntegrationCase.php",
-                    "tests/Test/IntegrationCaseFactory.php",
-                    "tests/Test/IntegrationCaseFactoryInterface.php",
-                    "tests/Test/InternalIntegrationCaseFactory.php",
-                    "tests/Test/IsIdenticalConstraint.php",
-                    "tests/TestCase.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Dariusz Rumiński",
-                    "email": "dariusz.ruminski@gmail.com"
-                }
-            ],
-            "description": "A tool to automatically fix PHP code style",
-            "funding": [
-                {
-                    "url": "https://github.com/keradus",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-04-15T18:51:10+00:00"
-        },
-        {
-            "name": "jms/metadata",
-            "version": "1.7.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/schmittjoh/metadata.git",
-                "reference": "e5854ab1aa643623dc64adde718a8eec32b957a8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/e5854ab1aa643623dc64adde718a8eec32b957a8",
-                "reference": "e5854ab1aa643623dc64adde718a8eec32b957a8",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "require-dev": {
-                "doctrine/cache": "~1.0",
-                "symfony/cache": "~3.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.5.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Metadata\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Asmir Mustafic",
-                    "email": "goetas@gmail.com"
-                },
-                {
-                    "name": "Johannes M. Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "Class/method/property metadata management in PHP",
-            "keywords": [
-                "annotations",
-                "metadata",
-                "xml",
-                "yaml"
-            ],
-            "time": "2018-10-26T12:40:10+00:00"
-        },
-        {
-            "name": "jms/parser-lib",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/schmittjoh/parser-lib.git",
-                "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/parser-lib/zipball/c509473bc1b4866415627af0e1c6cc8ac97fa51d",
-                "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d",
-                "shasum": ""
-            },
-            "require": {
-                "phpoption/phpoption": ">=0.9,<2.0-dev"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "JMS\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache2"
-            ],
-            "description": "A library for easily creating recursive-descent parsers.",
-            "time": "2012-11-18T18:08:43+00:00"
-        },
-        {
-            "name": "jms/serializer",
-            "version": "1.14.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/schmittjoh/serializer.git",
-                "reference": "ba908d278fff27ec01fb4349f372634ffcd697c0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/ba908d278fff27ec01fb4349f372634ffcd697c0",
-                "reference": "ba908d278fff27ec01fb4349f372634ffcd697c0",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/annotations": "^1.0",
-                "doctrine/instantiator": "^1.0.3",
-                "jms/metadata": "^1.3",
-                "jms/parser-lib": "1.*",
-                "php": "^5.5|^7.0",
-                "phpcollection/phpcollection": "~0.1",
-                "phpoption/phpoption": "^1.1"
-            },
-            "conflict": {
-                "twig/twig": "<1.12"
-            },
-            "require-dev": {
-                "doctrine/orm": "~2.1",
-                "doctrine/phpcr-odm": "^1.3|^2.0",
-                "ext-pdo_sqlite": "*",
-                "jackalope/jackalope-doctrine-dbal": "^1.1.5",
-                "phpunit/phpunit": "^4.8|^5.0",
-                "propel/propel1": "~1.7",
-                "psr/container": "^1.0",
-                "symfony/dependency-injection": "^2.7|^3.3|^4.0",
-                "symfony/expression-language": "^2.6|^3.0",
-                "symfony/filesystem": "^2.1",
-                "symfony/form": "~2.1|^3.0",
-                "symfony/translation": "^2.1|^3.0",
-                "symfony/validator": "^2.2|^3.0",
-                "symfony/yaml": "^2.1|^3.0",
-                "twig/twig": "~1.12|~2.0"
-            },
-            "suggest": {
-                "doctrine/cache": "Required if you like to use cache functionality.",
-                "doctrine/collections": "Required if you like to use doctrine collection types as ArrayCollection.",
-                "symfony/yaml": "Required if you'd like to serialize data to YAML format."
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-1.x": "1.14-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "JMS\\Serializer": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Johannes M. Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                },
-                {
-                    "name": "Asmir Mustafic",
-                    "email": "goetas@gmail.com"
-                }
-            ],
-            "description": "Library for (de-)serializing data of any complexity; supports XML, JSON, and YAML.",
-            "homepage": "http://jmsyst.com/libs/serializer",
-            "keywords": [
-                "deserialization",
-                "jaxb",
-                "json",
-                "serialization",
-                "xml"
-            ],
-            "time": "2020-02-22T20:59:37+00:00"
-        },
-        {
-            "name": "league/flysystem",
-            "version": "1.0.69",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "7106f78428a344bc4f643c233a94e48795f10967"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/7106f78428a344bc4f643c233a94e48795f10967",
-                "reference": "7106f78428a344bc4f643c233a94e48795f10967",
-                "shasum": ""
-            },
-            "require": {
-                "ext-fileinfo": "*",
-                "php": ">=5.5.9"
-            },
-            "conflict": {
-                "league/flysystem-sftp": "<1.0.6"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "^3.4",
-                "phpunit/phpunit": "^5.7.26"
-            },
-            "suggest": {
-                "ext-fileinfo": "Required for MimeType",
-                "ext-ftp": "Allows you to use FTP server storage",
-                "ext-openssl": "Allows you to use FTPS server storage",
-                "league/flysystem-aws-s3-v2": "Allows you to use S3 storage with AWS SDK v2",
-                "league/flysystem-aws-s3-v3": "Allows you to use S3 storage with AWS SDK v3",
-                "league/flysystem-azure": "Allows you to use Windows Azure Blob storage",
-                "league/flysystem-cached-adapter": "Flysystem adapter decorator for metadata caching",
-                "league/flysystem-eventable-filesystem": "Allows you to use EventableFilesystem",
-                "league/flysystem-rackspace": "Allows you to use Rackspace Cloud Files",
-                "league/flysystem-sftp": "Allows you to use SFTP server storage via phpseclib",
-                "league/flysystem-webdav": "Allows you to use WebDAV storage",
-                "league/flysystem-ziparchive": "Allows you to use ZipArchive adapter",
-                "spatie/flysystem-dropbox": "Allows you to use Dropbox storage",
-                "srmklive/flysystem-dropbox-v2": "Allows you to use Dropbox storage for PHP 5 applications"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "League\\Flysystem\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Frank de Jonge",
-                    "email": "info@frenky.net"
-                }
-            ],
-            "description": "Filesystem abstraction: Many filesystems, one API.",
-            "keywords": [
-                "Cloud Files",
-                "WebDAV",
-                "abstraction",
-                "aws",
-                "cloud",
-                "copy.com",
-                "dropbox",
-                "file systems",
-                "files",
-                "filesystem",
-                "filesystems",
-                "ftp",
-                "rackspace",
-                "remote",
-                "s3",
-                "sftp",
-                "storage"
-            ],
-            "funding": [
-                {
-                    "url": "https://offset.earth/frankdejonge",
-                    "type": "other"
-                }
-            ],
-            "time": "2020-05-18T15:13:39+00:00"
-        },
-        {
-            "name": "lusitanian/oauth",
-            "version": "v0.8.11",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Lusitanian/PHPoAuthLib.git",
-                "reference": "fc11a53db4b66da555a6a11fce294f574a8374f9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Lusitanian/PHPoAuthLib/zipball/fc11a53db4b66da555a6a11fce294f574a8374f9",
-                "reference": "fc11a53db4b66da555a6a11fce294f574a8374f9",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "3.7.*",
-                "predis/predis": "0.8.*@dev",
-                "squizlabs/php_codesniffer": "2.*",
-                "symfony/http-foundation": "~2.1"
-            },
-            "suggest": {
-                "ext-openssl": "Allows for usage of secure connections with the stream-based HTTP client.",
-                "predis/predis": "Allows using the Redis storage backend.",
-                "symfony/http-foundation": "Allows using the Symfony Session storage backend."
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "0.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "OAuth": "src",
-                    "OAuth\\Unit": "tests"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "David Desberg",
-                    "email": "david@daviddesberg.com"
-                },
-                {
-                    "name": "Elliot Chance",
-                    "email": "elliotchance@gmail.com"
-                },
-                {
-                    "name": "Pieter Hordijk",
-                    "email": "info@pieterhordijk.com"
-                }
-            ],
-            "description": "PHP 5.3+ oAuth 1/2 Library",
-            "keywords": [
-                "Authentication",
-                "authorization",
-                "oauth",
-                "security"
-            ],
-            "time": "2018-02-14T22:37:14+00:00"
-        },
-        {
-            "name": "magento/magento-coding-standard",
-            "version": "5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/magento/magento-coding-standard.git",
-                "reference": "da46c5d57a43c950dfa364edc7f1f0436d5353a5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/magento/magento-coding-standard/zipball/da46c5d57a43c950dfa364edc7f1f0436d5353a5",
-                "reference": "da46c5d57a43c950dfa364edc7f1f0436d5353a5",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6.0",
-                "squizlabs/php_codesniffer": "^3.4",
-                "webonyx/graphql-php": ">=0.12.6 <1.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
-            },
-            "type": "phpcodesniffer-standard",
-            "autoload": {
-                "classmap": [
-                    "PHP_CodeSniffer/Tokenizers/"
-                ],
-                "psr-4": {
-                    "Magento2\\": "Magento2/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "OSL-3.0",
-                "AFL-3.0"
-            ],
-            "description": "A set of Magento specific PHP CodeSniffer rules.",
-            "time": "2019-11-04T22:08:27+00:00"
-        },
-        {
-            "name": "magento/magento2-functional-testing-framework",
-            "version": "dev-3.0.0-RC3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/magento/magento2-functional-testing-framework.git",
-                "reference": "aea30ae1df2fe6618478ba8813864c204561fde3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/aea30ae1df2fe6618478ba8813864c204561fde3",
-                "reference": "aea30ae1df2fe6618478ba8813864c204561fde3",
-                "shasum": ""
-            },
-            "require": {
-                "allure-framework/allure-codeception": "~1.4.0",
-                "aws/aws-sdk-php": "^3.132",
-                "codeception/codeception": "~4.1.4",
-                "codeception/module-asserts": "^1.1",
-                "codeception/module-sequence": "^1.0",
-                "codeception/module-webdriver": "^1.0",
-                "composer/composer": "^1.9",
-                "csharpru/vault-php": "~3.5.3",
-                "csharpru/vault-php-guzzle6-transport": "^2.0",
-                "ext-curl": "*",
-                "ext-dom": "*",
-                "ext-intl": "*",
-                "ext-json": "*",
-                "ext-openssl": "*",
-                "monolog/monolog": "^1.17",
-                "mustache/mustache": "~2.5",
-                "php": "^7.3",
-                "php-webdriver/webdriver": "^1.8.0",
-                "spomky-labs/otphp": "^10.0",
-                "symfony/console": "^4.4",
-                "symfony/finder": "^5.0",
-                "symfony/mime": "^5.0",
-                "symfony/process": "^4.4",
-                "vlucas/phpdotenv": "^2.4"
-            },
-            "replace": {
-                "facebook/webdriver": "^1.7.1"
-            },
-            "require-dev": {
-                "brainmaestro/composer-git-hooks": "^2.3.1",
-                "codacy/coverage": "^1.4",
-                "codeception/aspect-mock": "^3.0",
-                "doctrine/cache": "<1.7.0",
-                "goaop/framework": "~2.3.4",
-                "php-coveralls/php-coveralls": "^1.0",
-                "phpmd/phpmd": "^2.8.0",
-                "phpunit/phpunit": "^9.0",
-                "rregeer/phpunit-coverage-check": "^0.1.4",
-                "sebastian/phpcpd": "~5.0.0",
-                "squizlabs/php_codesniffer": "~3.5.4",
-                "symfony/stopwatch": "~3.4.6"
-            },
-            "bin": [
-                "bin/mftf"
-            ],
-            "type": "library",
-            "extra": {
-                "hooks": {
-                    "pre-push": "bin/all-checks"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/Magento/FunctionalTestingFramework/_bootstrap.php"
-                ],
-                "psr-4": {
-                    "Magento\\FunctionalTestingFramework\\": "src/Magento/FunctionalTestingFramework",
-                    "MFTF\\": "dev/tests/functional/tests/MFTF"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "AGPL-3.0"
-            ],
-            "description": "Magento2 Functional Testing Framework",
-            "keywords": [
-                "automation",
-                "functional",
-                "magento",
-                "testing"
-            ],
-            "time": "2020-05-22T19:17:05+00:00"
-        },
-        {
-            "name": "mikey179/vfsstream",
-            "version": "v1.6.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/bovigo/vfsStream.git",
-                "reference": "231c73783ebb7dd9ec77916c10037eff5a2b6efe"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/231c73783ebb7dd9ec77916c10037eff5a2b6efe",
-                "reference": "231c73783ebb7dd9ec77916c10037eff5a2b6efe",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.5|^5.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.6.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "org\\bovigo\\vfs\\": "src/main/php"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Frank Kleine",
-                    "homepage": "http://frankkleine.de/",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Virtual file system to mock the real file system in unit tests.",
-            "homepage": "http://vfs.bovigo.org/",
-            "time": "2019-10-30T15:31:00+00:00"
-        },
-        {
-            "name": "mtdowling/jmespath.php",
-            "version": "2.5.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/jmespath/jmespath.php.git",
-                "reference": "52168cb9472de06979613d365c7f1ab8798be895"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/52168cb9472de06979613d365c7f1ab8798be895",
-                "reference": "52168cb9472de06979613d365c7f1ab8798be895",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4.0",
-                "symfony/polyfill-mbstring": "^1.4"
-            },
-            "require-dev": {
-                "composer/xdebug-handler": "^1.2",
-                "phpunit/phpunit": "^4.8.36|^7.5.15"
-            },
-            "bin": [
-                "bin/jp.php"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.5-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "JmesPath\\": "src/"
-                },
-                "files": [
-                    "src/JmesPath.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                }
-            ],
-            "description": "Declaratively specify how to extract elements from a JSON document",
-            "keywords": [
-                "json",
-                "jsonpath"
-            ],
-            "time": "2019-12-30T18:03:34+00:00"
-        },
-        {
-            "name": "mustache/mustache",
-            "version": "v2.13.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/bobthecow/mustache.php.git",
-                "reference": "e95c5a008c23d3151d59ea72484d4f72049ab7f4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/mustache.php/zipball/e95c5a008c23d3151d59ea72484d4f72049ab7f4",
-                "reference": "e95c5a008c23d3151d59ea72484d4f72049ab7f4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.2.4"
-            },
-            "require-dev": {
-                "friendsofphp/php-cs-fixer": "~1.11",
-                "phpunit/phpunit": "~3.7|~4.0|~5.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Mustache": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Justin Hileman",
-                    "email": "justin@justinhileman.info",
-                    "homepage": "http://justinhileman.com"
-                }
-            ],
-            "description": "A Mustache implementation in PHP.",
-            "homepage": "https://github.com/bobthecow/mustache.php",
-            "keywords": [
-                "mustache",
-                "templating"
-            ],
-            "time": "2019-11-23T21:40:31+00:00"
-        },
-        {
-            "name": "myclabs/deep-copy",
-            "version": "1.9.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/b2c28789e80a97badd14145fda39b545d83ca3ef",
-                "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1"
-            },
-            "replace": {
-                "myclabs/deep-copy": "self.version"
-            },
-            "require-dev": {
-                "doctrine/collections": "^1.0",
-                "doctrine/common": "^2.6",
-                "phpunit/phpunit": "^7.1"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "DeepCopy\\": "src/DeepCopy/"
-                },
-                "files": [
-                    "src/DeepCopy/deep_copy.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Create deep copies (clones) of your objects",
-            "keywords": [
-                "clone",
-                "copy",
-                "duplicate",
-                "object",
-                "object graph"
-            ],
-            "time": "2020-01-17T21:11:47+00:00"
-        },
-        {
-            "name": "paragonie/constant_time_encoding",
-            "version": "v2.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/paragonie/constant_time_encoding.git",
-                "reference": "47a1cedd2e4d52688eb8c96469c05ebc8fd28fa2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/47a1cedd2e4d52688eb8c96469c05ebc8fd28fa2",
-                "reference": "47a1cedd2e4d52688eb8c96469c05ebc8fd28fa2",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7|^8"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6|^7",
-                "vimeo/psalm": "^1|^2|^3"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "ParagonIE\\ConstantTime\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Paragon Initiative Enterprises",
-                    "email": "security@paragonie.com",
-                    "homepage": "https://paragonie.com",
-                    "role": "Maintainer"
-                },
-                {
-                    "name": "Steve 'Sc00bz' Thomas",
-                    "email": "steve@tobtu.com",
-                    "homepage": "https://www.tobtu.com",
-                    "role": "Original Developer"
-                }
-            ],
-            "description": "Constant-time Implementations of RFC 4648 Encoding (Base-64, Base-32, Base-16)",
-            "keywords": [
-                "base16",
-                "base32",
-                "base32_decode",
-                "base32_encode",
-                "base64",
-                "base64_decode",
-                "base64_encode",
-                "bin2hex",
-                "encoding",
-                "hex",
-                "hex2bin",
-                "rfc4648"
-            ],
-            "time": "2019-11-06T19:20:29+00:00"
-        },
-        {
-            "name": "pdepend/pdepend",
-            "version": "2.7.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/pdepend/pdepend.git",
-                "reference": "daba1cf0a6edaf172fa02a17807ae29f4c1c7471"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/daba1cf0a6edaf172fa02a17807ae29f4c1c7471",
-                "reference": "daba1cf0a6edaf172fa02a17807ae29f4c1c7471",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.7",
-                "symfony/config": "^2.3.0|^3|^4|^5",
-                "symfony/dependency-injection": "^2.3.0|^3|^4|^5",
-                "symfony/filesystem": "^2.3.0|^3|^4|^5"
-            },
-            "require-dev": {
-                "easy-doc/easy-doc": "0.0.0 || ^1.2.3",
-                "gregwar/rst": "^1.0",
-                "phpunit/phpunit": "^4.8.35|^5.7",
-                "squizlabs/php_codesniffer": "^2.0.0"
-            },
-            "bin": [
-                "src/bin/pdepend"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "PDepend\\": "src/main/php/PDepend"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Official version of pdepend to be handled with Composer",
-            "time": "2020-02-08T12:06:13+00:00"
-        },
-        {
-            "name": "phar-io/manifest",
-            "version": "1.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phar-io/manifest.git",
-                "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
-                "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-phar": "*",
-                "phar-io/version": "^2.0",
-                "php": "^5.6 || ^7.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Arne Blankerts",
-                    "email": "arne@blankerts.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Sebastian Heuer",
-                    "email": "sebastian@phpeople.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
-            "time": "2018-07-08T19:23:20+00:00"
-        },
-        {
-            "name": "phar-io/version",
-            "version": "2.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phar-io/version.git",
-                "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6",
-                "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6 || ^7.0"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Arne Blankerts",
-                    "email": "arne@blankerts.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Sebastian Heuer",
-                    "email": "sebastian@phpeople.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Library for handling version information and constraints",
-            "time": "2018-07-08T19:19:57+00:00"
-        },
-        {
-            "name": "php-cs-fixer/diff",
-            "version": "v1.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/PHP-CS-Fixer/diff.git",
-                "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/78bb099e9c16361126c86ce82ec4405ebab8e756",
-                "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
-                "symfony/process": "^3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "SpacePossum"
-                }
-            ],
-            "description": "sebastian/diff v2 backport support for PHP5.6",
-            "homepage": "https://github.com/PHP-CS-Fixer",
-            "keywords": [
-                "diff"
-            ],
-            "time": "2018-02-15T16:58:55+00:00"
-        },
-        {
-            "name": "php-webdriver/webdriver",
-            "version": "1.8.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-webdriver/php-webdriver.git",
-                "reference": "3308a70be084d6d7fd1ee5787b4c2e6eb4b70aab"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/3308a70be084d6d7fd1ee5787b4c2e6eb4b70aab",
-                "reference": "3308a70be084d6d7fd1ee5787b4c2e6eb4b70aab",
-                "shasum": ""
-            },
-            "require": {
-                "ext-curl": "*",
-                "ext-json": "*",
-                "ext-zip": "*",
-                "php": "^5.6 || ~7.0",
-                "symfony/polyfill-mbstring": "^1.12",
-                "symfony/process": "^2.8 || ^3.1 || ^4.0 || ^5.0"
-            },
-            "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.0",
-                "jakub-onderka/php-parallel-lint": "^1.0",
-                "php-coveralls/php-coveralls": "^2.0",
-                "php-mock/php-mock-phpunit": "^1.1",
-                "phpunit/phpunit": "^5.7",
-                "sebastian/environment": "^1.3.4 || ^2.0 || ^3.0",
-                "sminnee/phpunit-mock-objects": "^3.4",
-                "squizlabs/php_codesniffer": "^3.5",
-                "symfony/var-dumper": "^3.3 || ^4.0 || ^5.0"
-            },
-            "suggest": {
-                "ext-SimpleXML": "For Firefox profile creation"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.8.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Facebook\\WebDriver\\": "lib/"
-                },
-                "files": [
-                    "lib/Exception/TimeoutException.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "A PHP client for Selenium WebDriver. Previously facebook/webdriver.",
-            "homepage": "https://github.com/php-webdriver/php-webdriver",
-            "keywords": [
-                "Chromedriver",
-                "geckodriver",
-                "php",
-                "selenium",
-                "webdriver"
-            ],
-            "time": "2020-03-04T14:40:12+00:00"
-        },
-        {
-            "name": "phpcollection/phpcollection",
-            "version": "0.5.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/schmittjoh/php-collection.git",
-                "reference": "f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6",
-                "reference": "f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6",
-                "shasum": ""
-            },
-            "require": {
-                "phpoption/phpoption": "1.*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "0.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "PhpCollection": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache2"
-            ],
-            "authors": [
-                {
-                    "name": "Johannes M. Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "General-Purpose Collection Library for PHP",
-            "keywords": [
-                "collection",
-                "list",
-                "map",
-                "sequence",
-                "set"
-            ],
-            "time": "2015-05-17T12:39:23+00:00"
-        },
-        {
-            "name": "phpcompatibility/php-compatibility",
-            "version": "9.3.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/PHPCompatibility/PHPCompatibility.git",
-                "reference": "9fb324479acf6f39452e0655d2429cc0d3914243"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/9fb324479acf6f39452e0655d2429cc0d3914243",
-                "reference": "9fb324479acf6f39452e0655d2429cc0d3914243",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3",
-                "squizlabs/php_codesniffer": "^2.3 || ^3.0.2"
-            },
-            "conflict": {
-                "squizlabs/php_codesniffer": "2.6.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.5 || ^5.0 || ^6.0 || ^7.0"
-            },
-            "suggest": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.5 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically.",
-                "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues."
-            },
-            "type": "phpcodesniffer-standard",
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "LGPL-3.0-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "Wim Godden",
-                    "homepage": "https://github.com/wimg",
-                    "role": "lead"
-                },
-                {
-                    "name": "Juliette Reinders Folmer",
-                    "homepage": "https://github.com/jrfnl",
-                    "role": "lead"
-                },
-                {
-                    "name": "Contributors",
-                    "homepage": "https://github.com/PHPCompatibility/PHPCompatibility/graphs/contributors"
-                }
-            ],
-            "description": "A set of sniffs for PHP_CodeSniffer that checks for PHP cross-version compatibility.",
-            "homepage": "http://techblog.wimgodden.be/tag/codesniffer/",
-            "keywords": [
-                "compatibility",
-                "phpcs",
-                "standards"
-            ],
-            "time": "2019-12-27T09:44:58+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-common",
-            "version": "2.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/6568f4687e5b41b054365f9ae03fcb1ed5f2069b",
-                "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "opensource@ijaap.nl"
-                }
-            ],
-            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-            "homepage": "http://www.phpdoc.org",
-            "keywords": [
-                "FQSEN",
-                "phpDocumentor",
-                "phpdoc",
-                "reflection",
-                "static analysis"
-            ],
-            "time": "2020-04-27T09:25:28+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "5.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e",
-                "reference": "cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e",
-                "shasum": ""
-            },
-            "require": {
-                "ext-filter": "^7.1",
-                "php": "^7.2",
-                "phpdocumentor/reflection-common": "^2.0",
-                "phpdocumentor/type-resolver": "^1.0",
-                "webmozart/assert": "^1"
-            },
-            "require-dev": {
-                "doctrine/instantiator": "^1",
-                "mockery/mockery": "^1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                },
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "account@ijaap.nl"
-                }
-            ],
-            "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-02-22T12:28:44+00:00"
-        },
-        {
-            "name": "phpdocumentor/type-resolver",
-            "version": "1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "7462d5f123dfc080dfdf26897032a6513644fc95"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/7462d5f123dfc080dfdf26897032a6513644fc95",
-                "reference": "7462d5f123dfc080dfdf26897032a6513644fc95",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2",
-                "phpdocumentor/reflection-common": "^2.0"
-            },
-            "require-dev": {
-                "ext-tokenizer": "^7.2",
-                "mockery/mockery": "~1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
-            "time": "2020-02-18T18:59:58+00:00"
-        },
-        {
-            "name": "phpmd/phpmd",
-            "version": "2.8.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpmd/phpmd.git",
-                "reference": "714629ed782537f638fe23c4346637659b779a77"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/714629ed782537f638fe23c4346637659b779a77",
-                "reference": "714629ed782537f638fe23c4346637659b779a77",
-                "shasum": ""
-            },
-            "require": {
-                "composer/xdebug-handler": "^1.0",
-                "ext-xml": "*",
-                "pdepend/pdepend": "^2.7.1",
-                "php": ">=5.3.9"
-            },
-            "require-dev": {
-                "easy-doc/easy-doc": "0.0.0 || ^1.3.2",
-                "gregwar/rst": "^1.0",
-                "mikey179/vfsstream": "^1.6.4",
-                "phpunit/phpunit": "^4.8.36 || ^5.7.27",
-                "squizlabs/php_codesniffer": "^2.0"
-            },
-            "bin": [
-                "src/bin/phpmd"
-            ],
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "PHPMD\\": "src/main/php"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Manuel Pichler",
-                    "email": "github@manuel-pichler.de",
-                    "homepage": "https://github.com/manuelpichler",
-                    "role": "Project Founder"
-                },
-                {
-                    "name": "Marc Würth",
-                    "email": "ravage@bluewin.ch",
-                    "homepage": "https://github.com/ravage84",
-                    "role": "Project Maintainer"
-                },
-                {
-                    "name": "Other contributors",
-                    "homepage": "https://github.com/phpmd/phpmd/graphs/contributors",
-                    "role": "Contributors"
-                }
-            ],
-            "description": "PHPMD is a spin-off project of PHP Depend and aims to be a PHP equivalent of the well known Java tool PMD.",
-            "homepage": "https://phpmd.org/",
-            "keywords": [
-                "mess detection",
-                "mess detector",
-                "pdepend",
-                "phpmd",
-                "pmd"
-            ],
-            "time": "2020-02-16T20:15:50+00:00"
-        },
-        {
-            "name": "phpoption/phpoption",
-            "version": "1.7.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/schmittjoh/php-option.git",
-                "reference": "4acfd6a4b33a509d8c88f50e5222f734b6aeebae"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/4acfd6a4b33a509d8c88f50e5222f734b6aeebae",
-                "reference": "4acfd6a4b33a509d8c88f50e5222f734b6aeebae",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9 || ^7.0 || ^8.0"
-            },
-            "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.3",
-                "phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0 || ^7.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "PhpOption\\": "src/PhpOption/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Apache-2.0"
-            ],
-            "authors": [
-                {
-                    "name": "Johannes M. Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                },
-                {
-                    "name": "Graham Campbell",
-                    "email": "graham@alt-three.com"
-                }
-            ],
-            "description": "Option Type for PHP",
-            "keywords": [
-                "language",
-                "option",
-                "php",
-                "type"
-            ],
-            "time": "2020-03-21T18:07:53+00:00"
-        },
-        {
-            "name": "phpspec/prophecy",
-            "version": "v1.10.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "451c3cd1418cf640de218914901e51b064abb093"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/451c3cd1418cf640de218914901e51b064abb093",
-                "reference": "451c3cd1418cf640de218914901e51b064abb093",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0",
-                "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0",
-                "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "^2.5 || ^3.2",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.10.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Prophecy\\": "src/Prophecy"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "time": "2020-03-05T15:02:03+00:00"
-        },
-        {
-            "name": "phpstan/phpstan",
-            "version": "0.12.23",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "71e529efced79e055fa8318b692e7f7d03ea4e75"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/71e529efced79e055fa8318b692e7f7d03ea4e75",
-                "reference": "71e529efced79e055fa8318b692e7f7d03ea4e75",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1"
-            },
-            "conflict": {
-                "phpstan/phpstan-shim": "*"
-            },
-            "bin": [
-                "phpstan",
-                "phpstan.phar"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "0.12-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "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"
-        },
-        {
-            "name": "phpunit/php-code-coverage",
-            "version": "8.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "31e94ccc084025d6abee0585df533eb3a792b96a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/31e94ccc084025d6abee0585df533eb3a792b96a",
-                "reference": "31e94ccc084025d6abee0585df533eb3a792b96a",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-xmlwriter": "*",
-                "php": "^7.3",
-                "phpunit/php-file-iterator": "^3.0",
-                "phpunit/php-text-template": "^2.0",
-                "phpunit/php-token-stream": "^4.0",
-                "sebastian/code-unit-reverse-lookup": "^2.0",
-                "sebastian/environment": "^5.0",
-                "sebastian/version": "^3.0",
-                "theseer/tokenizer": "^1.1.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.0"
-            },
-            "suggest": {
-                "ext-pcov": "*",
-                "ext-xdebug": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "8.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-            "keywords": [
-                "coverage",
-                "testing",
-                "xunit"
-            ],
-            "time": "2020-02-19T13:41:19+00:00"
-        },
-        {
-            "name": "phpunit/php-file-iterator",
-            "version": "3.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "4ac5b3e13df14829daa60a2eb4fdd2f2b7d33cf4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/4ac5b3e13df14829daa60a2eb4fdd2f2b7d33cf4",
-                "reference": "4ac5b3e13df14829daa60a2eb4fdd2f2b7d33cf4",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
-            "keywords": [
-                "filesystem",
-                "iterator"
-            ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-04-18T05:02:12+00:00"
-        },
-        {
-            "name": "phpunit/php-invoker",
-            "version": "3.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-invoker.git",
-                "reference": "7579d5a1ba7f3ac11c80004d205877911315ae7a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/7579d5a1ba7f3ac11c80004d205877911315ae7a",
-                "reference": "7579d5a1ba7f3ac11c80004d205877911315ae7a",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.3"
-            },
-            "require-dev": {
-                "ext-pcntl": "*",
-                "phpunit/phpunit": "^9.0"
-            },
-            "suggest": {
-                "ext-pcntl": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Invoke callables with a timeout",
-            "homepage": "https://github.com/sebastianbergmann/php-invoker/",
-            "keywords": [
-                "process"
-            ],
-            "time": "2020-02-07T06:06:11+00:00"
-        },
-        {
-            "name": "phpunit/php-text-template",
-            "version": "2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "526dc996cc0ebdfa428cd2dfccd79b7b53fee346"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/526dc996cc0ebdfa428cd2dfccd79b7b53fee346",
-                "reference": "526dc996cc0ebdfa428cd2dfccd79b7b53fee346",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
-            "keywords": [
-                "template"
-            ],
-            "time": "2020-02-01T07:43:44+00:00"
-        },
-        {
-            "name": "phpunit/php-timer",
-            "version": "3.1.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "dc9368fae6ef2ffa57eba80a7410bcef81df6258"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/dc9368fae6ef2ffa57eba80a7410bcef81df6258",
-                "reference": "dc9368fae6ef2ffa57eba80a7410bcef81df6258",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.1-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
-            "keywords": [
-                "timer"
-            ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-04-20T06:00:37+00:00"
-        },
-        {
-            "name": "phpunit/php-token-stream",
-            "version": "4.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "cdc0db5aed8fbfaf475fbd95bfd7bab83c7a779c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/cdc0db5aed8fbfaf475fbd95bfd7bab83c7a779c",
-                "reference": "cdc0db5aed8fbfaf475fbd95bfd7bab83c7a779c",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": "^7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-            "keywords": [
-                "tokenizer"
-            ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-05-06T09:56:31+00:00"
-        },
-        {
-            "name": "phpunit/phpunit",
-            "version": "9.1.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "1b570cd7edbe136055bf5f651857dc8af6b829d2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1b570cd7edbe136055bf5f651857dc8af6b829d2",
-                "reference": "1b570cd7edbe136055bf5f651857dc8af6b829d2",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.2.0",
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-libxml": "*",
-                "ext-mbstring": "*",
-                "ext-xml": "*",
-                "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.9.1",
-                "phar-io/manifest": "^1.0.3",
-                "phar-io/version": "^2.0.1",
-                "php": "^7.3",
-                "phpspec/prophecy": "^1.8.1",
-                "phpunit/php-code-coverage": "^8.0.1",
-                "phpunit/php-file-iterator": "^3.0",
-                "phpunit/php-invoker": "^3.0",
-                "phpunit/php-text-template": "^2.0",
-                "phpunit/php-timer": "^3.1.4",
-                "sebastian/code-unit": "^1.0.2",
-                "sebastian/comparator": "^4.0",
-                "sebastian/diff": "^4.0",
-                "sebastian/environment": "^5.0.1",
-                "sebastian/exporter": "^4.0",
-                "sebastian/global-state": "^4.0",
-                "sebastian/object-enumerator": "^4.0",
-                "sebastian/resource-operations": "^3.0",
-                "sebastian/type": "^2.0",
-                "sebastian/version": "^3.0"
-            },
-            "require-dev": {
-                "ext-pdo": "*",
-                "phpspec/prophecy-phpunit": "^2.0"
-            },
-            "suggest": {
-                "ext-soap": "*",
-                "ext-xdebug": "*"
-            },
-            "bin": [
-                "phpunit"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "9.1-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ],
-                "files": [
-                    "src/Framework/Assert/Functions.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "The PHP Unit Testing framework.",
-            "homepage": "https://phpunit.de/",
-            "keywords": [
-                "phpunit",
-                "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"
-        },
-        {
-            "name": "psr/cache",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/cache.git",
-                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8",
-                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Cache\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for caching libraries",
-            "keywords": [
-                "cache",
-                "psr",
-                "psr-6"
-            ],
-            "time": "2016-08-06T20:24:11+00:00"
-        },
-        {
-            "name": "psr/simple-cache",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/simple-cache.git",
-                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
-                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\SimpleCache\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interfaces for simple caching",
-            "keywords": [
-                "cache",
-                "caching",
-                "psr",
-                "psr-16",
-                "simple-cache"
-            ],
-            "time": "2017-10-23T01:57:42+00:00"
-        },
-        {
-            "name": "sebastian/code-unit",
-            "version": "1.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/code-unit.git",
-                "reference": "ac958085bc19fcd1d36425c781ef4cbb5b06e2a5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/ac958085bc19fcd1d36425c781ef4cbb5b06e2a5",
-                "reference": "ac958085bc19fcd1d36425c781ef4cbb5b06e2a5",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "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-04-30T05:58:10+00:00"
-        },
-        {
-            "name": "sebastian/code-unit-reverse-lookup",
-            "version": "2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "5b5dbe0044085ac41df47e79d34911a15b96d82e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/5b5dbe0044085ac41df47e79d34911a15b96d82e",
-                "reference": "5b5dbe0044085ac41df47e79d34911a15b96d82e",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Looks up which function or method a line of code belongs to",
-            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "time": "2020-02-07T06:20:13+00:00"
-        },
-        {
-            "name": "sebastian/comparator",
-            "version": "4.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "85b3435da967696ed618ff745f32be3ff4a2b8e8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/85b3435da967696ed618ff745f32be3ff4a2b8e8",
-                "reference": "85b3435da967696ed618ff745f32be3ff4a2b8e8",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.3",
-                "sebastian/diff": "^4.0",
-                "sebastian/exporter": "^4.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                }
-            ],
-            "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "https://github.com/sebastianbergmann/comparator",
-            "keywords": [
-                "comparator",
-                "compare",
-                "equality"
-            ],
-            "time": "2020-02-07T06:08:51+00:00"
-        },
-        {
-            "name": "sebastian/diff",
-            "version": "4.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "3e523c576f29dacecff309f35e4cc5a5c168e78a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3e523c576f29dacecff309f35e4cc5a5c168e78a",
-                "reference": "3e523c576f29dacecff309f35e4cc5a5c168e78a",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.0",
-                "symfony/process": "^4.2 || ^5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                }
-            ],
-            "description": "Diff implementation",
-            "homepage": "https://github.com/sebastianbergmann/diff",
-            "keywords": [
-                "diff",
-                "udiff",
-                "unidiff",
-                "unified diff"
-            ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-05-08T05:01:12+00:00"
-        },
-        {
-            "name": "sebastian/environment",
-            "version": "5.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "c753f04d68cd489b6973cf9b4e505e191af3b05c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/c753f04d68cd489b6973cf9b4e505e191af3b05c",
-                "reference": "c753f04d68cd489b6973cf9b4e505e191af3b05c",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.0"
-            },
-            "suggest": {
-                "ext-posix": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
-            "keywords": [
-                "Xdebug",
-                "environment",
-                "hhvm"
-            ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-04-14T13:36:52+00:00"
-        },
-        {
-            "name": "sebastian/exporter",
-            "version": "4.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "80c26562e964016538f832f305b2286e1ec29566"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/80c26562e964016538f832f305b2286e1ec29566",
-                "reference": "80c26562e964016538f832f305b2286e1ec29566",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.3",
-                "sebastian/recursion-context": "^4.0"
-            },
-            "require-dev": {
-                "ext-mbstring": "*",
-                "phpunit/phpunit": "^9.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
-            "keywords": [
-                "export",
-                "exporter"
-            ],
-            "time": "2020-02-07T06:10:52+00:00"
-        },
-        {
-            "name": "sebastian/finder-facade",
-            "version": "2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/finder-facade.git",
-                "reference": "9d3e74b845a2ce50e19b25b5f0c2718e153bee6c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/finder-facade/zipball/9d3e74b845a2ce50e19b25b5f0c2718e153bee6c",
-                "reference": "9d3e74b845a2ce50e19b25b5f0c2718e153bee6c",
-                "shasum": ""
-            },
-            "require": {
-                "ext-ctype": "*",
-                "php": "^7.3",
-                "symfony/finder": "^4.1|^5.0",
-                "theseer/fdomdocument": "^1.6"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "FinderFacade is a convenience wrapper for Symfony's Finder component.",
-            "homepage": "https://github.com/sebastianbergmann/finder-facade",
-            "time": "2020-02-08T06:07:58+00:00"
-        },
-        {
-            "name": "sebastian/global-state",
-            "version": "4.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "bdb1e7c79e592b8c82cb1699be3c8743119b8a72"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bdb1e7c79e592b8c82cb1699be3c8743119b8a72",
-                "reference": "bdb1e7c79e592b8c82cb1699be3c8743119b8a72",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.3",
-                "sebastian/object-reflector": "^2.0",
-                "sebastian/recursion-context": "^4.0"
-            },
-            "require-dev": {
-                "ext-dom": "*",
-                "phpunit/phpunit": "^9.0"
-            },
-            "suggest": {
-                "ext-uopz": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
-            "keywords": [
-                "global state"
-            ],
-            "time": "2020-02-07T06:11:37+00:00"
-        },
-        {
-            "name": "sebastian/object-enumerator",
-            "version": "4.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "e67516b175550abad905dc952f43285957ef4363"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67516b175550abad905dc952f43285957ef4363",
-                "reference": "e67516b175550abad905dc952f43285957ef4363",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.3",
-                "sebastian/object-reflector": "^2.0",
-                "sebastian/recursion-context": "^4.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
-            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-            "time": "2020-02-07T06:12:23+00:00"
-        },
-        {
-            "name": "sebastian/object-reflector",
-            "version": "2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/object-reflector.git",
-                "reference": "f4fd0835cabb0d4a6546d9fe291e5740037aa1e7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/f4fd0835cabb0d4a6546d9fe291e5740037aa1e7",
-                "reference": "f4fd0835cabb0d4a6546d9fe291e5740037aa1e7",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Allows reflection of object attributes, including inherited and non-public ones",
-            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
-            "time": "2020-02-07T06:19:40+00:00"
-        },
-        {
-            "name": "sebastian/phpcpd",
-            "version": "5.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpcpd.git",
-                "reference": "8724382966b1861df4e12db915eaed2165e10bf3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/8724382966b1861df4e12db915eaed2165e10bf3",
-                "reference": "8724382966b1861df4e12db915eaed2165e10bf3",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "php": "^7.3",
-                "phpunit/php-timer": "^3.0",
-                "sebastian/finder-facade": "^2.0",
-                "sebastian/version": "^3.0",
-                "symfony/console": "^4.0|^5.0"
-            },
-            "bin": [
-                "phpcpd"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Copy/Paste Detector (CPD) for PHP code.",
-            "homepage": "https://github.com/sebastianbergmann/phpcpd",
-            "time": "2020-02-22T06:03:17+00:00"
-        },
-        {
-            "name": "sebastian/recursion-context",
-            "version": "4.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "cdd86616411fc3062368b720b0425de10bd3d579"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cdd86616411fc3062368b720b0425de10bd3d579",
-                "reference": "cdd86616411fc3062368b720b0425de10bd3d579",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2020-02-07T06:18:20+00:00"
-        },
-        {
-            "name": "sebastian/resource-operations",
-            "version": "3.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "8c98bf0dfa1f9256d0468b9803a1e1df31b6fa98"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/8c98bf0dfa1f9256d0468b9803a1e1df31b6fa98",
-                "reference": "8c98bf0dfa1f9256d0468b9803a1e1df31b6fa98",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides a list of PHP built-in functions that operate on resources",
-            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "time": "2020-02-07T06:13:02+00:00"
-        },
-        {
-            "name": "sebastian/type",
-            "version": "2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "9e8f42f740afdea51f5f4e8cec2035580e797ee1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/9e8f42f740afdea51f5f4e8cec2035580e797ee1",
-                "reference": "9e8f42f740afdea51f5f4e8cec2035580e797ee1",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Collection of value objects that represent the types of the PHP type system",
-            "homepage": "https://github.com/sebastianbergmann/type",
-            "time": "2020-02-07T06:13:43+00:00"
-        },
-        {
-            "name": "sebastian/version",
-            "version": "3.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "0411bde656dce64202b39c2f4473993a9081d39e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/0411bde656dce64202b39c2f4473993a9081d39e",
-                "reference": "0411bde656dce64202b39c2f4473993a9081d39e",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-            "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2020-01-21T06:36:37+00:00"
-        },
-        {
-            "name": "spomky-labs/otphp",
-            "version": "v10.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Spomky-Labs/otphp.git",
-                "reference": "f44cce5a9db4b8da410215d992110482c931232f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Spomky-Labs/otphp/zipball/f44cce5a9db4b8da410215d992110482c931232f",
-                "reference": "f44cce5a9db4b8da410215d992110482c931232f",
-                "shasum": ""
-            },
-            "require": {
-                "beberlei/assert": "^3.0",
-                "ext-mbstring": "*",
-                "paragonie/constant_time_encoding": "^2.0",
-                "php": "^7.2|^8.0",
-                "thecodingmachine/safe": "^0.1.14|^1.0"
-            },
-            "require-dev": {
-                "php-coveralls/php-coveralls": "^2.0",
-                "phpstan/phpstan": "^0.12",
-                "phpstan/phpstan-beberlei-assert": "^0.12",
-                "phpstan/phpstan-deprecation-rules": "^0.12",
-                "phpstan/phpstan-phpunit": "^0.12",
-                "phpstan/phpstan-strict-rules": "^0.12",
-                "phpunit/phpunit": "^8.0",
-                "thecodingmachine/phpstan-safe-rule": "^1.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "v10.0": "10.0.x-dev",
-                    "v9.0": "9.0.x-dev",
-                    "v8.3": "8.3.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "OTPHP\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Florent Morselli",
-                    "homepage": "https://github.com/Spomky"
-                },
-                {
-                    "name": "All contributors",
-                    "homepage": "https://github.com/Spomky-Labs/otphp/contributors"
-                }
-            ],
-            "description": "A PHP library for generating one time passwords according to RFC 4226 (HOTP Algorithm) and the RFC 6238 (TOTP Algorithm) and compatible with Google Authenticator",
-            "homepage": "https://github.com/Spomky-Labs/otphp",
-            "keywords": [
-                "FreeOTP",
-                "RFC 4226",
-                "RFC 6238",
-                "google authenticator",
-                "hotp",
-                "otp",
-                "totp"
-            ],
-            "time": "2020-01-28T09:24:19+00:00"
-        },
-        {
-            "name": "squizlabs/php_codesniffer",
-            "version": "3.5.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/73e2e7f57d958e7228fce50dc0c61f58f017f9f6",
-                "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6",
-                "shasum": ""
-            },
-            "require": {
-                "ext-simplexml": "*",
-                "ext-tokenizer": "*",
-                "ext-xmlwriter": "*",
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
-            },
-            "bin": [
-                "bin/phpcs",
-                "bin/phpcbf"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.x-dev"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Greg Sherwood",
-                    "role": "lead"
-                }
-            ],
-            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
-            "homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
-            "keywords": [
-                "phpcs",
-                "standards"
-            ],
-            "time": "2020-04-17T01:09:41+00:00"
-        },
-        {
-            "name": "symfony/config",
-            "version": "v5.0.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/config.git",
-                "reference": "db1674e1a261148429f123871f30d211992294e7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/db1674e1a261148429f123871f30d211992294e7",
-                "reference": "db1674e1a261148429f123871f30d211992294e7",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2.5",
-                "symfony/filesystem": "^4.4|^5.0",
-                "symfony/polyfill-ctype": "~1.8"
-            },
-            "conflict": {
-                "symfony/finder": "<4.4"
-            },
-            "require-dev": {
-                "symfony/event-dispatcher": "^4.4|^5.0",
-                "symfony/finder": "^4.4|^5.0",
-                "symfony/messenger": "^4.4|^5.0",
-                "symfony/service-contracts": "^1.1|^2",
-                "symfony/yaml": "^4.4|^5.0"
-            },
-            "suggest": {
-                "symfony/yaml": "To use the yaml reference dumper"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Config\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "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-04-15T15:59:10+00:00"
-        },
-        {
-            "name": "symfony/dependency-injection",
-            "version": "v5.0.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "92d8b3bd896a87cdd8aba0a3dd041bc072e8cfba"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/92d8b3bd896a87cdd8aba0a3dd041bc072e8cfba",
-                "reference": "92d8b3bd896a87cdd8aba0a3dd041bc072e8cfba",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2.5",
-                "psr/container": "^1.0",
-                "symfony/service-contracts": "^1.1.6|^2"
-            },
-            "conflict": {
-                "symfony/config": "<5.0",
-                "symfony/finder": "<4.4",
-                "symfony/proxy-manager-bridge": "<4.4",
-                "symfony/yaml": "<4.4"
-            },
-            "provide": {
-                "psr/container-implementation": "1.0",
-                "symfony/service-implementation": "1.0"
-            },
-            "require-dev": {
-                "symfony/config": "^5.0",
-                "symfony/expression-language": "^4.4|^5.0",
-                "symfony/yaml": "^4.4|^5.0"
-            },
-            "suggest": {
-                "symfony/config": "",
-                "symfony/expression-language": "For using expressions in service container configuration",
-                "symfony/finder": "For using double-star glob patterns or when GLOB_BRACE portability is required",
-                "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
-                "symfony/yaml": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\DependencyInjection\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "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-04-28T17:58:55+00:00"
-        },
-        {
-            "name": "symfony/http-foundation",
-            "version": "v5.0.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "e47fdf8b24edc12022ba52923150ec6484d7f57d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e47fdf8b24edc12022ba52923150ec6484d7f57d",
-                "reference": "e47fdf8b24edc12022ba52923150ec6484d7f57d",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2.5",
-                "symfony/mime": "^4.4|^5.0",
-                "symfony/polyfill-mbstring": "~1.1"
-            },
-            "require-dev": {
-                "predis/predis": "~1.0",
-                "symfony/expression-language": "^4.4|^5.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\HttpFoundation\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "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-04-18T20:50:06+00:00"
-        },
-        {
-            "name": "symfony/mime",
-            "version": "v5.0.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/mime.git",
-                "reference": "5d6c81c39225a750f3f43bee15f03093fb9aaa0b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/5d6c81c39225a750f3f43bee15f03093fb9aaa0b",
-                "reference": "5d6c81c39225a750f3f43bee15f03093fb9aaa0b",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2.5",
-                "symfony/polyfill-intl-idn": "^1.10",
-                "symfony/polyfill-mbstring": "^1.0"
-            },
-            "conflict": {
-                "symfony/mailer": "<4.4"
-            },
-            "require-dev": {
-                "egulias/email-validator": "^2.1.10",
-                "symfony/dependency-injection": "^4.4|^5.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Mime\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "A library to manipulate MIME messages",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "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-04-17T03:29:44+00:00"
-        },
-        {
-            "name": "symfony/options-resolver",
-            "version": "v5.0.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "3707e3caeff2b797c0bfaadd5eba723dd44e6bf1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/3707e3caeff2b797c0bfaadd5eba723dd44e6bf1",
-                "reference": "3707e3caeff2b797c0bfaadd5eba723dd44e6bf1",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2.5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\OptionsResolver\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony OptionsResolver Component",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "config",
-                "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-04-06T10:40:56+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php70",
-            "version": "v1.17.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php70.git",
-                "reference": "82225c2d7d23d7e70515496d249c0152679b468e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/82225c2d7d23d7e70515496d249c0152679b468e",
-                "reference": "82225c2d7d23d7e70515496d249c0152679b468e",
-                "shasum": ""
-            },
-            "require": {
-                "paragonie/random_compat": "~1.0|~2.0|~9.99",
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.17-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php70\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ],
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "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"
-        },
-        {
-            "name": "symfony/stopwatch",
-            "version": "v5.0.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "a1d86d30d4522423afc998f32404efa34fcf5a73"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/a1d86d30d4522423afc998f32404efa34fcf5a73",
-                "reference": "a1d86d30d4522423afc998f32404efa34fcf5a73",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2.5",
-                "symfony/service-contracts": "^1.0|^2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Stopwatch\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "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-03-27T16:56:45+00:00"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "v5.0.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/yaml.git",
-                "reference": "482fb4e710e5af3e0e78015f19aa716ad953392f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/482fb4e710e5af3e0e78015f19aa716ad953392f",
-                "reference": "482fb4e710e5af3e0e78015f19aa716ad953392f",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2.5",
-                "symfony/polyfill-ctype": "~1.8"
-            },
-            "conflict": {
-                "symfony/console": "<4.4"
-            },
-            "require-dev": {
-                "symfony/console": "^4.4|^5.0"
-            },
-            "suggest": {
-                "symfony/console": "For validating YAML files using the lint command"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "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-04-28T17:58:55+00:00"
-        },
-        {
-            "name": "thecodingmachine/safe",
-            "version": "v1.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/thecodingmachine/safe.git",
-                "reference": "04f9ffae372a9816d4472dfb7bcf6126b623a9df"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/thecodingmachine/safe/zipball/04f9ffae372a9816d4472dfb7bcf6126b623a9df",
-                "reference": "04f9ffae372a9816d4472dfb7bcf6126b623a9df",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2"
-            },
-            "require-dev": {
-                "phpstan/phpstan": "^0.12",
-                "squizlabs/php_codesniffer": "^3.2",
-                "thecodingmachine/phpstan-strict-rules": "^0.12"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "0.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Safe\\": [
-                        "lib/",
-                        "generated/"
-                    ]
-                },
-                "files": [
-                    "generated/apache.php",
-                    "generated/apc.php",
-                    "generated/apcu.php",
-                    "generated/array.php",
-                    "generated/bzip2.php",
-                    "generated/classobj.php",
-                    "generated/com.php",
-                    "generated/cubrid.php",
-                    "generated/curl.php",
-                    "generated/datetime.php",
-                    "generated/dir.php",
-                    "generated/eio.php",
-                    "generated/errorfunc.php",
-                    "generated/exec.php",
-                    "generated/fileinfo.php",
-                    "generated/filesystem.php",
-                    "generated/filter.php",
-                    "generated/fpm.php",
-                    "generated/ftp.php",
-                    "generated/funchand.php",
-                    "generated/gmp.php",
-                    "generated/gnupg.php",
-                    "generated/hash.php",
-                    "generated/ibase.php",
-                    "generated/ibmDb2.php",
-                    "generated/iconv.php",
-                    "generated/image.php",
-                    "generated/imap.php",
-                    "generated/info.php",
-                    "generated/ingres-ii.php",
-                    "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",
-                    "generated/mysqlndQc.php",
-                    "generated/network.php",
-                    "generated/oci8.php",
-                    "generated/opcache.php",
-                    "generated/openssl.php",
-                    "generated/outcontrol.php",
-                    "generated/password.php",
-                    "generated/pcntl.php",
-                    "generated/pcre.php",
-                    "generated/pdf.php",
-                    "generated/pgsql.php",
-                    "generated/posix.php",
-                    "generated/ps.php",
-                    "generated/pspell.php",
-                    "generated/readline.php",
-                    "generated/rpminfo.php",
-                    "generated/rrd.php",
-                    "generated/sem.php",
-                    "generated/session.php",
-                    "generated/shmop.php",
-                    "generated/simplexml.php",
-                    "generated/sockets.php",
-                    "generated/sodium.php",
-                    "generated/solr.php",
-                    "generated/spl.php",
-                    "generated/sqlsrv.php",
-                    "generated/ssdeep.php",
-                    "generated/ssh2.php",
-                    "generated/stats.php",
-                    "generated/stream.php",
-                    "generated/strings.php",
-                    "generated/swoole.php",
-                    "generated/uodbc.php",
-                    "generated/uopz.php",
-                    "generated/url.php",
-                    "generated/var.php",
-                    "generated/xdiff.php",
-                    "generated/xml.php",
-                    "generated/xmlrpc.php",
-                    "generated/yaml.php",
-                    "generated/yaz.php",
-                    "generated/zip.php",
-                    "generated/zlib.php",
-                    "lib/special_cases.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "PHP core functions that throw exceptions instead of returning FALSE on error",
-            "time": "2020-05-04T15:25:36+00:00"
-        },
-        {
-            "name": "theseer/fdomdocument",
-            "version": "1.6.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/theseer/fDOMDocument.git",
-                "reference": "6e8203e40a32a9c770bcb62fe37e68b948da6dca"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/theseer/fDOMDocument/zipball/6e8203e40a32a9c770bcb62fe37e68b948da6dca",
-                "reference": "6e8203e40a32a9c770bcb62fe37e68b948da6dca",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "lib-libxml": "*",
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Arne Blankerts",
-                    "email": "arne@blankerts.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.",
-            "homepage": "https://github.com/theseer/fDOMDocument",
-            "time": "2017-06-30T11:53:12+00:00"
-        },
-        {
-            "name": "theseer/tokenizer",
-            "version": "1.1.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
-                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-tokenizer": "*",
-                "ext-xmlwriter": "*",
-                "php": "^7.0"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Arne Blankerts",
-                    "email": "arne@blankerts.de",
-                    "role": "Developer"
-                }
-            ],
-            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
-            "time": "2019-06-13T22:48:21+00:00"
-        },
-        {
-            "name": "vlucas/phpdotenv",
-            "version": "v2.6.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "67d472b1794c986381a8950e4958e1adb779d561"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/67d472b1794c986381a8950e4958e1adb779d561",
-                "reference": "67d472b1794c986381a8950e4958e1adb779d561",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.9 || ^7.0 || ^8.0",
-                "symfony/polyfill-ctype": "^1.9"
-            },
-            "require-dev": {
-                "ext-filter": "*",
-                "ext-pcre": "*",
-                "phpunit/phpunit": "^4.8.35 || ^5.0"
-            },
-            "suggest": {
-                "ext-filter": "Required to use the boolean validator.",
-                "ext-pcre": "Required to use most of the library."
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.6-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Dotenv\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Graham Campbell",
-                    "email": "graham@alt-three.com",
-                    "homepage": "https://gjcampbell.co.uk/"
-                },
-                {
-                    "name": "Vance Lucas",
-                    "email": "vance@vancelucas.com",
-                    "homepage": "https://vancelucas.com/"
-                }
-            ],
-            "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
-            "keywords": [
-                "dotenv",
-                "env",
-                "environment"
-            ],
-            "funding": [
-                {
-                    "url": "https://github.com/GrahamCampbell",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-05-02T13:38:00+00:00"
-        },
-        {
-            "name": "webmozart/assert",
-            "version": "1.8.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozart/assert.git",
-                "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/ab2cb0b3b559010b75981b1bdce728da3ee90ad6",
-                "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0",
-                "symfony/polyfill-ctype": "^1.8"
-            },
-            "conflict": {
-                "vimeo/psalm": "<3.9.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.36 || ^7.5.13"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\Assert\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "Assertions to validate method input/output with nice error messages.",
-            "keywords": [
-                "assert",
-                "check",
-                "validate"
-            ],
-            "time": "2020-04-18T12:12:48+00:00"
-        },
-        {
-            "name": "weew/helpers-array",
-            "version": "v1.3.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/weew/helpers-array.git",
-                "reference": "9bff63111f9765b4277750db8d276d92b3e16ed0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/weew/helpers-array/zipball/9bff63111f9765b4277750db8d276d92b3e16ed0",
-                "reference": "9bff63111f9765b4277750db8d276d92b3e16ed0",
-                "shasum": ""
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.7",
-                "satooshi/php-coveralls": "^0.6.1"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "src/array.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Maxim Kott",
-                    "email": "maximkott@gmail.com"
-                }
-            ],
-            "description": "Useful collection of php array helpers.",
-            "time": "2016-07-21T11:18:01+00:00"
-        }
-    ],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": {
-        "magento/composer": 20,
-        "magento/magento2-functional-testing-framework": 20
-    },
-    "prefer-stable": true,
-    "prefer-lowest": false,
-    "platform": {
-        "php": "~7.3.0||~7.4.0",
-        "ext-bcmath": "*",
-        "ext-ctype": "*",
-        "ext-curl": "*",
-        "ext-dom": "*",
-        "ext-gd": "*",
-        "ext-hash": "*",
-        "ext-iconv": "*",
-        "ext-intl": "*",
-        "ext-mbstring": "*",
-        "ext-openssl": "*",
-        "ext-pdo_mysql": "*",
-        "ext-simplexml": "*",
-        "ext-soap": "*",
-        "ext-xsl": "*",
-        "ext-zip": "*",
-        "lib-libxml": "*"
-    },
-    "platform-dev": [],
-    "plugin-api-version": "1.1.0"
-}

From 4db017271f0c65f9f10f76a71ecfcc0c715f432c Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Fri, 5 Jun 2020 12:03:05 +0300
Subject: [PATCH 0380/1718] magento/magento2#23972 fix disabled guest checkout
 issue

Small improvements
---
 .../IsAllowedGuestCheckoutObserver.php        | 41 ++++++++++---------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php b/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
index f792e1c404422..7a4ab24135883 100644
--- a/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
+++ b/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
@@ -40,10 +40,7 @@ class IsAllowedGuestCheckoutObserver implements ObserverInterface
      * @param ScopeConfigInterface $scopeConfig
      * @param CollectionFactory $linksFactory
      */
-    public function __construct(
-        ScopeConfigInterface $scopeConfig,
-        CollectionFactory $linksFactory
-    ) {
+    public function __construct(ScopeConfigInterface $scopeConfig, CollectionFactory $linksFactory) {
         $this->scopeConfig = $scopeConfig;
         $this->linksFactory = $linksFactory;
     }
@@ -61,17 +58,17 @@ public function execute(Observer $observer)
 
         /* @var $quote Quote */
         $quote = $observer->getEvent()->getQuote();
+        $isGuestCheckoutDisabled = $this->scopeConfig->isSetFlag(
+            self::XML_PATH_DISABLE_GUEST_CHECKOUT,
+            ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
 
         foreach ($quote->getAllItems() as $item) {
-            if (($product = $item->getProduct())
-                && $product->getTypeId() == Type::TYPE_DOWNLOADABLE
-            ) {
-                if ($this->scopeConfig->isSetFlag(
-                    self::XML_PATH_DISABLE_GUEST_CHECKOUT,
-                    ScopeInterface::SCOPE_STORE,
-                    $storeId
-                )
-                    || !$this->checkForShareableLinks($item, $storeId)) {
+            $product = $item->getProduct();
+            
+            if ((string)$product->getTypeId() === Type::TYPE_DOWNLOADABLE) {
+                if ($isGuestCheckoutDisabled || !$this->checkForShareableLinks($item, $storeId)) {
                     $result->setIsAllowed(false);
                     break;
                 }
@@ -92,20 +89,24 @@ private function checkForShareableLinks(CartItemInterface $item, int $storeId):
     {
         $isSharable = true;
         $option = $item->getOptionByCode('downloadable_link_ids');
+
         if (!empty($option)) {
             $downloadableLinkIds = explode(',', $option->getValue());
             $links = $this->linksFactory->create()->addFieldToFilter("link_id", ["in" => $downloadableLinkIds]);
+            
+            $configDownloadableSharable = $this->scopeConfig->isSetFlag(
+                self::XML_PATH_DOWNLOADABLE_SHAREABLE,
+                ScopeInterface::SCOPE_STORE,
+                $storeId
+            );
+            
             foreach ($links as $link) {
                 if (!$link->getIsShareable() ||
-                    (
-                        $link->getIsShareable() == 2 && !$this->scopeConfig->isSetFlag(
-                            self::XML_PATH_DOWNLOADABLE_SHAREABLE,
-                            ScopeInterface::SCOPE_STORE,
-                            $storeId
-                        )
-                    )
+                    //Use config default value and it's disabled in config
+                    ((int)$link->getIsShareable() === 2 && !$configDownloadableSharable)
                 ) {
                     $isSharable = false;
+                    break;
                 }
             }
         }

From f1e11eabd7bfd68e8a9bf0f8b5159ea0d706dbc4 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Fri, 5 Jun 2020 12:25:14 +0300
Subject: [PATCH 0381/1718] magento/magento2#23972 fix disabled guest checkout
 issue

Optimize code
---
 .../IsAllowedGuestCheckoutObserver.php        | 60 +++++++++++--------
 1 file changed, 36 insertions(+), 24 deletions(-)

diff --git a/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php b/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
index 7a4ab24135883..b24cddd845c9c 100644
--- a/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
+++ b/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
@@ -6,8 +6,9 @@
 
 namespace Magento\Downloadable\Observer;
 
+use Magento\Downloadable\Model\Link;
 use Magento\Downloadable\Model\Product\Type;
-use Magento\Downloadable\Model\ResourceModel\Link\CollectionFactory;
+use Magento\Downloadable\Model\ResourceModel\Link\CollectionFactory as LinkCollectionFactory;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
@@ -32,17 +33,17 @@ class IsAllowedGuestCheckoutObserver implements ObserverInterface
     /**
      * Downloadable link collection factory
      *
-     * @var CollectionFactory
+     * @var LinkCollectionFactory
      */
-    private $linksFactory;
+    private $linkCollectionFactory;
 
     /**
      * @param ScopeConfigInterface $scopeConfig
-     * @param CollectionFactory $linksFactory
+     * @param LinkCollectionFactory $linkCollectionFactory
      */
-    public function __construct(ScopeConfigInterface $scopeConfig, CollectionFactory $linksFactory) {
+    public function __construct(ScopeConfigInterface $scopeConfig, LinkCollectionFactory $linkCollectionFactory) {
         $this->scopeConfig = $scopeConfig;
-        $this->linksFactory = $linksFactory;
+        $this->linkCollectionFactory = $linkCollectionFactory;
     }
 
     /**
@@ -66,7 +67,7 @@ public function execute(Observer $observer)
 
         foreach ($quote->getAllItems() as $item) {
             $product = $item->getProduct();
-            
+
             if ((string)$product->getTypeId() === Type::TYPE_DOWNLOADABLE) {
                 if ($isGuestCheckoutDisabled || !$this->checkForShareableLinks($item, $storeId)) {
                     $result->setIsAllowed(false);
@@ -92,25 +93,36 @@ private function checkForShareableLinks(CartItemInterface $item, int $storeId):
 
         if (!empty($option)) {
             $downloadableLinkIds = explode(',', $option->getValue());
-            $links = $this->linksFactory->create()->addFieldToFilter("link_id", ["in" => $downloadableLinkIds]);
-            
-            $configDownloadableSharable = $this->scopeConfig->isSetFlag(
-                self::XML_PATH_DOWNLOADABLE_SHAREABLE,
-                ScopeInterface::SCOPE_STORE,
-                $storeId
-            );
-            
-            foreach ($links as $link) {
-                if (!$link->getIsShareable() ||
-                    //Use config default value and it's disabled in config
-                    ((int)$link->getIsShareable() === 2 && !$configDownloadableSharable)
-                ) {
-                    $isSharable = false;
-                    break;
-                }
-            }
+
+            $linkCollection = $this->linkCollectionFactory->create();
+            $linkCollection->addFieldToFilter('link_id', ['in' => $downloadableLinkIds]);
+            $linkCollection->addFieldToFilter('is_shareable', ['in' => $this->getNotSharableValues($storeId)]);
+
+            // We don't have not sharable links
+            $isSharable = $linkCollection->getSize() === 0;
         }
 
         return $isSharable;
     }
+
+    /**
+     * @param int $storeId
+     * @return array
+     */
+    private function getNotSharableValues(int $storeId): array
+    {
+        $configIsSharable = $this->scopeConfig->isSetFlag(
+            self::XML_PATH_DOWNLOADABLE_SHAREABLE,
+            ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
+
+        $notShareableValues = [Link::LINK_SHAREABLE_NO];
+
+        if (!$configIsSharable) {
+            $notShareableValues[] = Link::LINK_SHAREABLE_CONFIG;
+        }
+
+        return $notShareableValues;
+    }
 }

From eface05ef1d45660670c2b1bab2cb791235cd91c Mon Sep 17 00:00:00 2001
From: Sascha <SHeilmeier@gmail.com>
Date: Fri, 5 Jun 2020 11:48:30 +0200
Subject: [PATCH 0382/1718] Use Variable for border-radius

The border-radius was hard coded, so i changed it to: @button__border-radius
---
 app/design/frontend/Magento/blank/web/css/source/_extends.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/frontend/Magento/blank/web/css/source/_extends.less b/app/design/frontend/Magento/blank/web/css/source/_extends.less
index 5bdaa4c3c35a3..690b89f42b419 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_extends.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_extends.less
@@ -1110,7 +1110,7 @@
     .abs-shopping-cart-items {
         .action {
             &.continue {
-                border-radius: 3px;
+                border-radius: @button__border-radius;
                 font-weight: @font-weight__bold;
                 .lib-link-as-button();
                 .lib-button(

From 3bff44623ad2694a203a0ae11018680bd7598a1f Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Fri, 5 Jun 2020 14:12:02 +0300
Subject: [PATCH 0383/1718] fix

---
 .../App/Config/Source/RuntimeConfigSource.php |   3 +-
 .../Console/Command/ConfigShowCommand.php     |   4 +-
 .../Config/Source/RuntimeConfigSourceTest.php | 189 +++++++++++++-----
 3 files changed, 145 insertions(+), 51 deletions(-)

diff --git a/app/code/Magento/Config/App/Config/Source/RuntimeConfigSource.php b/app/code/Magento/Config/App/Config/Source/RuntimeConfigSource.php
index 7926708772a9f..641db6d035ca5 100644
--- a/app/code/Magento/Config/App/Config/Source/RuntimeConfigSource.php
+++ b/app/code/Magento/Config/App/Config/Source/RuntimeConfigSource.php
@@ -70,7 +70,8 @@ public function __construct(
     public function get($path = '')
     {
         $data = new DataObject($this->deploymentConfig->isDbAvailable() ? $this->loadConfig() : []);
-        return $data->getData($path) ?: [];
+
+        return $data->getData($path) !== null ? $data->getData($path) : null;
     }
 
     /**
diff --git a/app/code/Magento/Config/Console/Command/ConfigShowCommand.php b/app/code/Magento/Config/Console/Command/ConfigShowCommand.php
index 2d3dabdb24e67..cae5a7dafd589 100644
--- a/app/code/Magento/Config/Console/Command/ConfigShowCommand.php
+++ b/app/code/Magento/Config/Console/Command/ConfigShowCommand.php
@@ -136,7 +136,7 @@ protected function configure()
      * Shows error message if configuration for given path doesn't exist
      * or scope/scope-code doesn't pass validation.
      *
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 100.2.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
@@ -150,7 +150,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $configPath = $this->pathResolver->resolve($this->inputPath, $this->scope, $this->scopeCode);
             $configValue = $this->configSource->get($configPath);
 
-            if (empty($configValue)) {
+            if ($configValue === null) {
                 $output->writeln(sprintf(
                     '<error>%s</error>',
                     __('Configuration for path: "%1" doesn\'t exist', $this->inputPath)->render()
diff --git a/app/code/Magento/Config/Test/Unit/App/Config/Source/RuntimeConfigSourceTest.php b/app/code/Magento/Config/Test/Unit/App/Config/Source/RuntimeConfigSourceTest.php
index 4ab882a33f9af..d246ebd6bbaa4 100644
--- a/app/code/Magento/Config/Test/Unit/App/Config/Source/RuntimeConfigSourceTest.php
+++ b/app/code/Magento/Config/Test/Unit/App/Config/Source/RuntimeConfigSourceTest.php
@@ -17,118 +17,140 @@
 use Magento\Framework\App\Config\Value;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\DB\Adapter\TableNotFoundException;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 /**
  * Test Class for retrieving runtime configuration from database.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class RuntimeConfigSourceTest extends TestCase
 {
+    /**
+     * @var RuntimeConfigSource
+     */
+    private $model;
+
     /**
      * @var CollectionFactory|MockObject
      */
-    private $collectionFactory;
+    private $collectionFactoryMock;
 
     /**
      * @var ScopeCodeResolver|MockObject
      */
-    private $scopeCodeResolver;
+    private $scopeCodeResolverMock;
 
     /**
      * @var Converter|MockObject
      */
-    private $converter;
+    private $converterMock;
 
     /**
      * @var Value|MockObject
      */
-    private $configItem;
+    private $configItemMock;
 
     /**
      * @var Value|MockObject
      */
-    private $configItemTwo;
+    private $configItemMockTwo;
 
-    /**
-     * @var RuntimeConfigSource
-     */
-    private $configSource;
     /**
      * @var DeploymentConfig|MockObject
      */
-    private $deploymentConfig;
+    private $deploymentConfigMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp(): void
     {
-        $this->collectionFactory = $this->getMockBuilder(CollectionFactory::class)
+        $objectManager = new ObjectManager($this);
+
+        $this->collectionFactoryMock = $this->getMockBuilder(CollectionFactory::class)
             ->disableOriginalConstructor()
-            ->setMethods(['create'])
             ->getMock();
-        $this->scopeCodeResolver = $this->getMockBuilder(ScopeCodeResolver::class)
+        $this->scopeCodeResolverMock = $this->getMockBuilder(ScopeCodeResolver::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->converter = $this->getMockBuilder(Converter::class)
+        $this->converterMock = $this->getMockBuilder(Converter::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->configItem = $this->getMockBuilder(Value::class)
+        $this->configItemMock = $this->getMockBuilder(Value::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getScope', 'getPath', 'getValue'])
+            ->addMethods(['getScope', 'getPath', 'getValue'])
             ->getMock();
-        $this->configItemTwo = $this->getMockBuilder(Value::class)
+        $this->configItemMockTwo = $this->getMockBuilder(Value::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getScope', 'getPath', 'getValue', 'getScopeId'])
+            ->addMethods(['getScope', 'getPath', 'getValue', 'getScopeId'])
             ->getMock();
-        $this->deploymentConfig = $this->createPartialMock(DeploymentConfig::class, ['isDbAvailable']);
-        $this->configSource = new RuntimeConfigSource(
-            $this->collectionFactory,
-            $this->scopeCodeResolver,
-            $this->converter,
-            $this->deploymentConfig
+        $this->deploymentConfigMock = $this->createPartialMock(
+            DeploymentConfig::class,
+            ['isDbAvailable']
+        );
+        $this->model = $objectManager->getObject(
+            RuntimeConfigSource::class,
+            [
+                'collectionFactory' => $this->collectionFactoryMock,
+                'scopeCodeResolver' => $this->scopeCodeResolverMock,
+                'converter' => $this->converterMock,
+                'deploymentConfig' => $this->deploymentConfigMock,
+            ]
         );
     }
 
-    public function testGet()
+    /**
+     * Test get initial data.
+     *
+     * @return void
+     */
+    public function testGet(): void
     {
-        $this->deploymentConfig->method('isDbAvailable')
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('isDbAvailable')
             ->willReturn(true);
         $collection = $this->createPartialMock(Collection::class, ['load', 'getIterator']);
-        $collection->method('load')
+        $collection->expects($this->once())
+            ->method('load')
             ->willReturn($collection);
-        $collection->method('getIterator')
-            ->willReturn(new ArrayIterator([$this->configItem, $this->configItemTwo]));
+        $collection->expects($this->once())
+            ->method('getIterator')
+            ->willReturn(new ArrayIterator([$this->configItemMock, $this->configItemMockTwo]));
         $scope = 'websites';
         $scopeCode = 'myWebsites';
-        $this->collectionFactory->expects($this->once())
+        $this->collectionFactoryMock->expects($this->once())
             ->method('create')
             ->willReturn($collection);
-        $this->configItem->expects($this->exactly(2))
+        $this->configItemMock->expects($this->exactly(2))
             ->method('getScope')
             ->willReturn(ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
-        $this->configItem->expects($this->once())
+        $this->configItemMock->expects($this->once())
             ->method('getPath')
             ->willReturn('dev/test/setting');
-        $this->configItem->expects($this->once())
+        $this->configItemMock->expects($this->once())
             ->method('getValue')
             ->willReturn(true);
 
-        $this->configItemTwo->expects($this->exactly(3))
+        $this->configItemMockTwo->expects($this->exactly(3))
             ->method('getScope')
             ->willReturn($scope);
-        $this->configItemTwo->expects($this->once())
+        $this->configItemMockTwo->expects($this->once())
             ->method('getScopeId')
             ->willReturn($scopeCode);
-        $this->configItemTwo->expects($this->once())
+        $this->configItemMockTwo->expects($this->once())
             ->method('getPath')
             ->willReturn('dev/test/setting2');
-        $this->configItemTwo->expects($this->once())
+        $this->configItemMockTwo->expects($this->once())
             ->method('getValue')
             ->willReturn(false);
-        $this->scopeCodeResolver->expects($this->once())
+        $this->scopeCodeResolverMock->expects($this->once())
             ->method('resolve')
             ->with($scope, $scopeCode)
             ->willReturnArgument(1);
-        $this->converter->expects($this->exactly(2))
+        $this->converterMock->expects($this->exactly(2))
             ->method('convert')
             ->withConsecutive(
                 [['dev/test/setting' => true]],
@@ -150,25 +172,96 @@ public function testGet()
                     ]
                 ]
             ],
-            $this->configSource->get()
+            $this->model->get()
         );
     }
 
-    public function testGetWhenDbIsNotAvailable()
+    /**
+     * Test get with not available db
+     *
+     * @return void
+     */
+    public function testGetWhenDbIsNotAvailable(): void
     {
-        $this->deploymentConfig->method('isDbAvailable')->willReturn(false);
-        $this->assertEquals([], $this->configSource->get());
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('isDbAvailable')
+            ->willReturn(false);
+        $this->assertEquals([], $this->model->get());
     }
 
-    public function testGetWhenDbIsEmpty()
+    /**
+     * Test get with empty db
+     *
+     * @return void
+     */
+    public function testGetWhenDbIsEmpty(): void
     {
-        $this->deploymentConfig->method('isDbAvailable')
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('isDbAvailable')
             ->willReturn(true);
         $collection = $this->createPartialMock(Collection::class, ['load']);
-        $collection->method('load')
+        $collection->expects($this->once())
+            ->method('load')
             ->willThrowException($this->createMock(TableNotFoundException::class));
-        $this->collectionFactory->method('create')
+        $this->collectionFactoryMock->expects($this->once())
+            ->method('create')
             ->willReturn($collection);
-        $this->assertEquals([], $this->configSource->get());
+
+        $this->assertEquals([], $this->model->get());
+    }
+
+    /**
+     * Test get value for specified config
+     *
+     * @dataProvider configDataProvider
+     *
+     * @param string $path
+     * @param array $configData
+     * @param string $expectedResult
+     * @return void
+     */
+    public function testGetConfigValue(string $path, array $configData, string $expectedResult): void
+    {
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('isDbAvailable')
+            ->willReturn(true);
+
+        $collection = $this->createPartialMock(Collection::class, ['load', 'getIterator']);
+        $collection->expects($this->once())
+            ->method('load')
+            ->willReturn($collection);
+        $collection->expects($this->once())
+            ->method('getIterator')
+            ->willReturn(new ArrayIterator([$this->configItemMock]));
+
+        $this->collectionFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($collection);
+
+        $this->configItemMock->expects($this->exactly(2))
+            ->method('getScope')
+            ->willReturn(ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
+        $this->configItemMock->expects($this->once())
+            ->method('getPath')
+            ->willReturn($path);
+
+        $this->converterMock->expects($this->once())
+            ->method('convert')
+            ->willReturn($configData);
+
+        $this->assertEquals($expectedResult, $this->model->get($path));
+    }
+
+    /**
+     * DataProvider for testGetConfigValue
+     *
+     * @return array
+     */
+    public function configDataProvider(): array
+    {
+        return [
+            'config value 0' => ['default/test/option', ['test' => ['option' => 0]], '0'],
+            'config value blank' => ['default/test/option', ['test' => ['option' => '']], ''],
+        ];
     }
 }

From 004ab248dc68eed637526f47e82f98ab3d74ecaf Mon Sep 17 00:00:00 2001
From: Viktor Petryk <victor.petryk@transoftgroup.com>
Date: Fri, 5 Jun 2020 17:44:28 +0300
Subject: [PATCH 0384/1718] MC-34941: [MFTF] Replace magentoCli calls with
 appropriate AG calls

---
 .../AdminLoginAfterChangeCookieDomainTest.xml |  8 +++++--
 .../AdminLoginAfterJSMinificationTest.xml     |  4 +++-
 .../AdminMenuNavigationWithSecretKeysTest.xml |  8 +++++--
 ...dminPersistentShoppingCartSettingsTest.xml |  8 +++++--
 ...inAssociateBundleProductToWebsitesTest.xml |  4 +++-
 .../MassEnableDisableBundleProductsTest.xml   |  8 +++++--
 ...ProductWithZeroPriceToShoppingCartTest.xml |  4 +++-
 ...omerSearchBundleProductsByKeywordsTest.xml |  4 +++-
 ...torefrontSortBundleProductsByPriceTest.xml |  4 +++-
 ...ontSpecialPriceBundleProductInCartTest.xml |  4 +++-
 ...oductPricesForCombinationOfOptionsTest.xml |  4 +++-
 .../Test/UpdateBundleProductViaImportTest.xml | 16 +++++++++----
 .../Mftf/Test/AdminLoginWithCaptchaTest.xml   |  8 +++++--
 ...StorefrontCaptchaEditCustomerEmailTest.xml |  8 +++++--
 .../Test/StorefrontCaptchaOnContactUsTest.xml |  8 +++++--
 .../StorefrontCaptchaOnCustomerLoginTest.xml  |  8 +++++--
 ...orefrontCaptchaRegisterNewCustomerTest.xml |  8 +++++--
 .../AddOutOfStockProductToCompareListTest.xml | 16 +++++++++----
 .../AdminAddInStockProductToTheCartTest.xml   |  8 +++++--
 ...inBackorderAllowedAddProductToCartTest.xml |  4 +++-
 ...tomAttributeValuesAfterProductSaveTest.xml |  4 +++-
 ...tOfStockProductIsVisibleInCategoryTest.xml |  4 +++-
 ...AdminCreateCategoryWithAnchorFieldTest.xml |  8 +++++--
 ...ibleInStorefrontAdvancedSearchFormTest.xml |  4 +++-
 ...iveFlatCategoryAndUpdateAsInactiveTest.xml | 20 ++++++++++++----
 .../AdminCreateInactiveFlatCategoryTest.xml   | 20 ++++++++++++----
 ...inCreateInactiveInMenuFlatCategoryTest.xml | 20 ++++++++++++----
 ...ibleInStorefrontAdvancedSearchFormTest.xml |  4 +++-
 ...ateProductAttributeFromProductPageTest.xml |  4 +++-
 ...SimpleProductWithDatetimeAttributeTest.xml |  4 +++-
 ...dminCreateSimpleProductWithUnicodeTest.xml |  8 +++++--
 ...CustomOptionsSuiteAndImportOptionsTest.xml |  8 +++++--
 ...nCreateVirtualProductWithTierPriceTest.xml |  8 +++++--
 ...roductsImageInCaseOfMultipleStoresTest.xml | 16 +++++++++----
 ...CustomizableOptionToProductWithSKUTest.xml |  8 +++++--
 ...eAnchoredCategoryToDefaultCategoryTest.xml |  8 +++++--
 ...minMoveCategoryAndCheckUrlRewritesTest.xml |  8 +++++--
 ...CategoryFromParentAnchoredCategoryTest.xml |  4 +++-
 ...ignedToCategoryWithoutCustomURLKeyTest.xml |  8 +++++--
 .../AdminRemoveImageAffectsAllScopesTest.xml  |  8 +++++--
 .../AdminSimpleProductImagesTest.xml          |  8 +++++--
 .../Mftf/Test/AdminSortingByWebsitesTest.xml  | 12 +++++++---
 .../AdminUpdateCategoryWithProductsTest.xml   |  8 +++++--
 ...inUpdateFlatCategoryAndAddProductsTest.xml | 24 ++++++++++++++-----
 ...ateFlatCategoryIncludeInNavigationTest.xml |  8 +++++--
 ...dateFlatCategoryNameAndDescriptionTest.xml | 12 +++++++---
 ...dminUpdateSimpleProductTieredPriceTest.xml |  8 +++++--
 ...ceInStockVisibleInCatalogAndSearchTest.xml |  4 +++-
 ...arPriceInStockVisibleInCatalogOnlyTest.xml |  4 +++-
 .../Test/CheckTierPricingOfProductsTest.xml   | 12 +++++++---
 .../Test/Mftf/Test/DeleteCategoriesTest.xml   |  4 +++-
 ...cheAfterChangingCategoryPageLayoutTest.xml |  8 +++++--
 .../EndToEndB2CGuestUserTest.xml              |  4 +++-
 ...vailableAfterEnablingSubCategoriesTest.xml |  4 +++-
 ...tProductsDisplayUsingElasticSearchTest.xml |  8 +++++--
 ...oreFrontRecentlyViewedAtStoreLevelTest.xml | 12 +++++++---
 ...rontRecentlyViewedAtStoreViewLevelTest.xml | 12 +++++++---
 ...rontCategoryPageWithCategoryFilterTest.xml |  4 +++-
 ...tCategoryPageWithoutCategoryFilterTest.xml |  4 +++-
 ...heckDefaultNumberProductsToDisplayTest.xml |  8 +++++--
 ...orefrontProductNameWithDoubleQuoteTest.xml |  4 +++-
 ...refrontProductNameWithHTMLEntitiesTest.xml |  4 +++-
 ...orefrontRememberCategoryPaginationTest.xml |  4 +++-
 ...ctAndProductCategoryPartialReindexTest.xml |  4 +++-
 .../AdminApplyCatalogRuleByCategoryTest.xml   |  8 +++++--
 ...nfigurableProductWithSpecialPricesTest.xml |  8 +++++--
 ...minCreateCatalogPriceRuleByPercentTest.xml |  8 +++++--
 ...teCatalogPriceRuleForCustomerGroupTest.xml |  8 +++++--
 ...eRuleEntityFromConfigurableProductTest.xml | 16 +++++++++----
 ...ogPriceRuleEntityFromSimpleProductTest.xml |  8 +++++--
 .../Test/AdminDeleteCatalogPriceRuleTest.xml  |  8 +++++--
 ...tributeIsUndefinedCatalogPriceRuleTest.xml | 18 +++++++++-----
 ...CatalogPriceRuleByProductAttributeTest.xml |  4 +++-
 ...uleForSimpleAndConfigurableProductTest.xml |  8 +++++--
 ...RuleForSimpleProductAndFixedMethodTest.xml |  8 +++++--
 ...orSimpleProductForNewCustomerGroupTest.xml |  4 +++-
 ...eForSimpleProductWithCustomOptionsTest.xml |  8 +++++--
 ...hipArePersistedUnderLongTermCookieTest.xml |  4 +++-
 .../StorefrontInactiveCatalogRuleTest.xml     |  4 +++-
 ...ogSearchSimpleProductByDescriptionTest.xml |  8 +++++--
 ...ceCatalogSearchSimpleProductByNameTest.xml |  8 +++++--
 ...eCatalogSearchSimpleProductByPriceTest.xml |  8 +++++--
 ...rchSimpleProductByShortDescriptionTest.xml |  8 +++++--
 ...nceCatalogSearchSimpleProductBySkuTest.xml |  8 +++++--
 ...ickSearchAndAddToCartBundleDynamicTest.xml |  8 +++++--
 ...QuickSearchAndAddToCartBundleFixedTest.xml |  8 +++++--
 ...uickSearchAndAddToCartConfigurableTest.xml |  8 +++++--
 ...uickSearchAndAddToCartDownloadableTest.xml |  8 +++++--
 .../QuickSearchAndAddToCartGroupedTest.xml    |  8 +++++--
 .../QuickSearchAndAddToCartTest.xml           |  8 +++++--
 .../QuickSearchAndAddToCartVirtualTest.xml    |  8 +++++--
 .../QuickSearchEmptyResultsTest.xml           |  8 +++++--
 .../QuickSearchProductBySkuTest.xml           |  8 +++++--
 ...tAdvancedSearchEntitySimpleProductTest.xml |  8 +++++--
 ...ontQuickSearchConfigurableChildrenTest.xml |  4 +++-
 .../StorefrontUpdateSearchTermEntityTest.xml  |  8 +++++--
 .../AdminRewriteProductWithTwoStoreTest.xml   |  8 +++++--
 ...CategoryAccessibleWhenSuffixIsNullTest.xml |  8 +++++--
 ...ldShouldNotAcceptJustIntegerValuesTest.xml |  8 +++++--
 ...sNotAffectedStartedCheckoutProcessTest.xml |  4 +++-
 ...ndleDynamicProductFromShoppingCartTest.xml |  4 +++-
 ...BundleFixedProductFromShoppingCartTest.xml |  4 +++-
 ...EditShippingAddressOnePageCheckoutTest.xml |  8 +++++--
 ...koutForProductsDeletedFromMiniCartTest.xml |  8 +++++--
 ...OnePageCheckoutWithAllProductTypesTest.xml |  4 +++-
 ...CartAndMiniShoppingCartPerCustomerTest.xml |  4 +++-
 ...oppingCartWithoutAnySelectedOptionTest.xml |  4 +++-
 ...ontCheckCustomerInfoCreatedByGuestTest.xml |  4 +++-
 ...gRecalculationAfterCouponCodeAddedTest.xml |  9 +++++--
 ...BundleDynamicProductToShoppingCartTest.xml |  8 +++++--
 ...pingCartWithDisableMiniCartSidebarTest.xml | 12 +++++++---
 ...dConfigurableProductToShoppingCartTest.xml |  8 +++++--
 ...dDownloadableProductToShoppingCartTest.xml |  8 +++++--
 ...ontAddGroupedProductToShoppingCartTest.xml |  4 +++-
 ...MultiSelectOptionToTheShoppingCartTest.xml |  8 +++++--
 ...pesOfCustomOptionToTheShoppingCartTest.xml |  4 +++-
 ...ultiSelectOptionsToTheShoppingCartTest.xml |  8 +++++--
 ...isplayWithDefaultDisplayLimitationTest.xml |  4 +++-
 ...edToTheCartThanDefaultDisplayLimitTest.xml |  8 +++++--
 ...isplayLimitAndDefaultTotalQuantityTest.xml |  4 +++-
 ...rtItemDisplayWithDefaultLimitationTest.xml |  4 +++-
 ...playWithCustomDisplayConfigurationTest.xml |  4 +++-
 ...frontCheckoutDisabledBundleProductTest.xml |  8 +++++--
 ...ingAddressAndProductWithTierPricesTest.xml |  4 +++-
 ...ntCheckoutWithSpecialPriceProductsTest.xml |  8 +++++--
 .../StorefrontCustomerCheckoutTest.xml        |  4 +++-
 ...stWithMultipleAddressesAndTaxRatesTest.xml |  8 +++++--
 ...tWithRestrictedCountriesForPaymentTest.xml |  8 +++++--
 ...eBundleProductFromMiniShoppingCartTest.xml |  4 +++-
 ...gurableProductFromMiniShoppingCartTest.xml |  8 +++++--
 ...oadableProductFromMiniShoppingCartTest.xml |  8 +++++--
 .../StorefrontGuestCheckoutTest.xml           |  8 +++++--
 ...tWithRestrictedCountriesForPaymentTest.xml |  8 +++++--
 ...tCheckoutUsingFreeShippingAndTaxesTest.xml |  8 +++++--
 ...riceInShoppingCartAfterProductSaveTest.xml |  4 +++-
 ...ontVerifySecureURLRedirectCheckoutTest.xml |  8 +++++--
 ...untryDropDownWithOneAllowedCountryTest.xml |  8 +++++--
 .../AdminConfigurableProductLongSkuTest.xml   |  4 +++-
 ...ctWithCreatingCategoryAndAttributeTest.xml |  4 +++-
 ...roductWithDisabledChildrenProductsTest.xml |  4 +++-
 ...reateConfigurableProductWithImagesTest.xml |  4 +++-
 ...eeProductDisplayOutOfStockProductsTest.xml |  4 +++-
 ...oductDontDisplayOutOfStockProductsTest.xml |  4 +++-
 ...ctWithTwoOptionsAssignedToCategoryTest.xml |  4 +++-
 ...woOptionsWithoutAssignedToCategoryTest.xml |  4 +++-
 .../Mftf/Test/EndToEndB2CLoggedInUserTest.xml |  8 +++++--
 ...rontConfigurableProductChildSearchTest.xml |  8 +++++--
 ...refrontConfigurableProductGridViewTest.xml |  8 +++++--
 ...uctChildAssignedToSeparateCategoryTest.xml |  4 +++-
 ...ConfigurableWithCatalogRuleAppliedTest.xml |  8 +++++--
 ...nfigurableProductLayeredNavigationTest.xml |  4 +++-
 ...efrontVisibilityOfDuplicateProductTest.xml |  8 +++++--
 ...rontVerifySecureURLRedirectContactTest.xml |  8 +++++--
 ...nCurrencyConverterAPIConfigurationTest.xml |  8 +++++--
 ...ultValueDisableAutoGroupChangeIsNoTest.xml |  4 +++-
 ...ltValueDisableAutoGroupChangeIsYesTest.xml |  8 +++++--
 .../Mftf/Test/AdminCreateCustomerTest.xml     |  8 +++++--
 ...AdminCreateCustomerWithCustomGroupTest.xml |  4 +++-
 ...DeleteCustomerAddressesFromTheGridTest.xml |  4 +++-
 ...AddressesFromTheGridViaMassActionsTest.xml |  4 +++-
 ...eleteDefaultBillingCustomerAddressTest.xml |  4 +++-
 .../Test/AdminResetCustomerPasswordTest.xml   |  8 +++++--
 ...dminSearchCustomerAddressByKeywordTest.xml |  4 +++-
 .../AdminDeleteCustomerAddressTest.xml        |  4 +++-
 ...ustomerInfoFromDefaultToNonDefaultTest.xml |  4 +++-
 ...CountriesRestrictionApplyOnBackendTest.xml | 12 +++++++---
 .../StorefrontClearAllCompareProductsTest.xml |  8 +++++--
 ...frontCreateCustomerWithDateOfBirthTest.xml |  4 +++-
 ...ontVerifySecureURLRedirectCustomerTest.xml |  8 +++++--
 ...loadableProductWithDefaultSetLinksTest.xml | 16 +++++++++----
 ...erifySecureURLRedirectDownloadableTest.xml |  8 +++++--
 .../Suite/SearchEngineElasticsearchSuite.xml  |  8 +++++--
 ...CheckAdvancedSearchOnElasticSearchTest.xml |  4 +++-
 ...DecimalAttributeUsingElasticSearchTest.xml | 16 +++++++++----
 ...frontElasticSearchForChineseLocaleTest.xml |  4 +++-
 ...ontElasticsearchSearchInvalidValueTest.xml | 24 ++++++++++++++-----
 ...oductQuickSearchUsingElasticSearchTest.xml |  4 +++-
 .../Test/AdminCreatingShippingLabelTest.xml   | 16 +++++++++----
 ...nAssociateGroupedProductToWebsitesTest.xml |  4 +++-
 ...gSearchGroupedProductByDescriptionTest.xml |  8 +++++--
 ...eCatalogSearchGroupedProductByNameTest.xml |  8 +++++--
 ...CatalogSearchGroupedProductByPriceTest.xml |  8 +++++--
 ...chGroupedProductByShortDescriptionTest.xml |  8 +++++--
 ...ceCatalogSearchGroupedProductBySkuTest.xml |  8 +++++--
 ...earchGroupedProductBySkuWithHyphenTest.xml |  8 +++++--
 ...inSystemIndexManagementGridChangesTest.xml | 16 +++++++++----
 .../Mftf/Test/ShopByButtonInMobileTest.xml    |  8 +++++--
 ...hMapAssignedConfigProductIsCorrectTest.xml |  4 +++-
 ...rifySecureURLRedirectMultishippingTest.xml |  8 +++++--
 ...tVerifySecureURLRedirectNewsletterTest.xml |  8 +++++--
 ...erifySubscribedNewsletterDisplayedTest.xml | 12 +++++++---
 ...dAreaSessionMustNotAffectAdminAreaTest.xml |  4 +++-
 .../Test/Mftf/Suite/InContextPaypalSuite.xml  |  8 +++++--
 ...uttonWithPayPalLabelOnCheckoutPageTest.xml |  4 +++-
 ...frontVerifySecureURLRedirectPaypalTest.xml |  8 +++++--
 ...efrontGuestCheckoutDisabledProductTest.xml |  4 +++-
 ...frontVerifySecureURLRedirectReviewTest.xml |  8 +++++--
 ...vailabilityCreditMemoWithNoPaymentTest.xml |  8 +++++--
 ...erWithCheckMoneyOrderPaymentMethodTest.xml |  8 +++++--
 ...rderWithPurchaseOrderPaymentMethodTest.xml |  8 +++++--
 ...ectnessInvoicedItemInBundleProductTest.xml |  4 +++-
 ...reateOrderWithCustomerWithoutEmailTest.xml |  8 +++++--
 ...nimumOrderAmountNotMatchOrderTotalTest.xml |  8 +++++--
 .../CreateOrderFromEditCustomerPageTest.xml   |  8 +++++--
 ...iewedBundleFixedProductOnOrderPageTest.xml |  4 +++-
 .../StorefrontOrderPagerDisplayedTest.xml     |  8 +++++--
 .../Test/StorefrontPrintOrderGuestTest.xml    |  8 +++++--
 ...efrontVerifySecureURLRedirectSalesTest.xml |  8 +++++--
 ...ValueWithFullDiscountUsingCartRuleTest.xml |  8 +++++--
 ...ngElasticSearchWithWeightAttributeTest.xml |  4 +++-
 ...archSuggestionByProductDescriptionTest.xml |  8 +++++--
 ...erifySearchSuggestionByProductNameTest.xml |  8 +++++--
 ...uggestionByProductShortDescriptionTest.xml |  8 +++++--
 ...VerifySearchSuggestionByProductSkuTest.xml |  8 +++++--
 ...ustomStoreShippingMethodTableRatesTest.xml |  4 +++-
 .../AdminCreatePartialShipmentEntityTest.xml  |  4 +++-
 .../Test/AdminCreateShipmentEntityTest.xml    |  4 +++-
 .../Test/AdminDisablingSwatchTooltipsTest.xml |  8 +++++--
 ...ntDisplayAllCharactersOnTextSwatchTest.xml |  4 +++-
 .../StorefrontFilterByImageSwatchTest.xml     |  4 +++-
 .../Test/StorefrontFilterByTextSwatchTest.xml |  4 +++-
 .../StorefrontFilterByVisualSwatchTest.xml    |  4 +++-
 ...tImageColorWhenFilterByColorFilterTest.xml |  8 +++++--
 ...refrontInlineTranslationOnCheckoutTest.xml |  8 +++++--
 ...wsProductImportWithConfigTurnedOffTest.xml | 12 +++++++---
 ...lKeyForStoreViewAndMovingCategory2Test.xml |  4 +++-
 ...tesForProductInCategoriesSwitchOffTest.xml | 12 +++++++---
 ...CreateUrlRewriteForCustomStoreViewTest.xml |  4 +++-
 ...riesTestWithConfigurationTurnedOffTest.xml | 12 +++++++---
 ...ProductsWithConfigurationTurnedOffTest.xml | 12 +++++++---
 .../Test/AdminLockAdminUserEntityTest.xml     |  8 +++++--
 ...efrontVerifySecureURLRedirectVaultTest.xml |  8 +++++--
 ...FixedTaxValSavedForSpecificWebsiteTest.xml | 16 +++++++++----
 ...uctsToCartFromWishlistUsingSidebarTest.xml | 16 +++++++++----
 ...leteBundleFixedProductFromWishlistTest.xml |  8 +++++--
 ...eteConfigurableProductFromWishlistTest.xml |  8 +++++--
 ...eProductFromShoppingCartToWishlistTest.xml |  8 +++++--
 ...veProductsFromWishlistUsingSidebarTest.xml |  8 +++++--
 .../Test/StorefrontUpdateWishlistTest.xml     |  8 +++++--
 ...ontVerifySecureURLRedirectWishlistTest.xml |  8 +++++--
 240 files changed, 1333 insertions(+), 446 deletions(-)

diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginAfterChangeCookieDomainTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginAfterChangeCookieDomainTest.xml
index be734205e1f5b..c5b4e8c34bfec 100644
--- a/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginAfterChangeCookieDomainTest.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginAfterChangeCookieDomainTest.xml
@@ -21,11 +21,15 @@
         </annotations>
         <before>
             <magentoCLI command="config:set {{ChangedCookieDomainForMainWebsiteConfigData.path}} --scope={{ChangedCookieDomainForMainWebsiteConfigData.scope}} --scope-code={{ChangedCookieDomainForMainWebsiteConfigData.scope_code}} {{ChangedCookieDomainForMainWebsiteConfigData.value}}" stepKey="changeDomainForMainWebsiteBeforeTestRun"/>
-            <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheBeforeTestRun">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set {{EmptyCookieDomainForMainWebsiteConfigData.path}} --scope={{EmptyCookieDomainForMainWebsiteConfigData.scope}} --scope-code={{EmptyCookieDomainForMainWebsiteConfigData.scope_code}} {{EmptyCookieDomainForMainWebsiteConfigData.value}}" stepKey="changeDomainForMainWebsiteAfterTestComplete"/>
-            <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestComplete"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfterTestComplete">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </after>
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         <actionGroup ref="AssertAdminDashboardPageIsVisibleActionGroup" stepKey="seeDashboardPage"/>
diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginAfterJSMinificationTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginAfterJSMinificationTest.xml
index d2c628ed13701..fb58b59b0ccaa 100644
--- a/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginAfterJSMinificationTest.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginAfterJSMinificationTest.xml
@@ -21,7 +21,9 @@
         </annotations>
         <before>
             <magentoCLI command="config:set {{MinifyJavaScriptFilesEnableConfigData.path}} {{MinifyJavaScriptFilesEnableConfigData.value}}" stepKey="enableJsMinification"/>
-            <magentoCLI command="cache:clean config" stepKey="cleanCache"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminMenuNavigationWithSecretKeysTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminMenuNavigationWithSecretKeysTest.xml
index 812158948d85f..aa246cb5f9d22 100644
--- a/app/code/Magento/Backend/Test/Mftf/Test/AdminMenuNavigationWithSecretKeysTest.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminMenuNavigationWithSecretKeysTest.xml
@@ -20,12 +20,16 @@
         </annotations>
         <before>
             <magentoCLI command="config:set admin/security/use_form_key 1" stepKey="enableUrlSecretKeys"/>
-            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches1"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches1">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
             <magentoCLI command="config:set admin/security/use_form_key 0" stepKey="disableUrlSecretKeys"/>
-            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches2"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches2">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminPersistentShoppingCartSettingsTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminPersistentShoppingCartSettingsTest.xml
index 387e81cb71546..bb69aa218e77a 100644
--- a/app/code/Magento/Backend/Test/Mftf/Test/AdminPersistentShoppingCartSettingsTest.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminPersistentShoppingCartSettingsTest.xml
@@ -21,11 +21,15 @@
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <magentoCLI stepKey="enablePersistentShoppingCart" command="config:set persistent/options/enabled 1"/>
-            <magentoCLI stepKey="cacheClean" command="cache:clean config"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI stepKey="disablePersistentShoppingCart" command="config:set persistent/options/enabled 0"/>
-            <magentoCLI stepKey="cacheClean" command="cache:clean config"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAssociateBundleProductToWebsitesTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAssociateBundleProductToWebsitesTest.xml
index 30922839a191d..f73941c375a41 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAssociateBundleProductToWebsitesTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAssociateBundleProductToWebsitesTest.xml
@@ -43,7 +43,9 @@
             </createData>
 
             <!-- Reindex -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
 
             <!-- Login as admin -->
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
index fd94ca93b1600..8b598b61ccee7 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
@@ -138,8 +138,12 @@
         <click selector="{{AdminProductFiltersSection.enable}}" stepKey="ClickOnEnable"/>
 
         <!--Clear Cache - reindex - resets products according to enabled/disabled view-->
-        <magentoCLI command="indexer:reindex" stepKey="reindex2"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache2"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!--Confirm bundle products have been enabled-->
         <amOnPage url="{{BundleProduct.urlKey2}}.html" stepKey="GoToProductPageEnabled"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleProductWithZeroPriceToShoppingCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleProductWithZeroPriceToShoppingCartTest.xml
index b3c542af7bbc9..93fac3171e9fb 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleProductWithZeroPriceToShoppingCartTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleProductWithZeroPriceToShoppingCartTest.xml
@@ -40,7 +40,9 @@
                 <requiredEntity createDataKey="bundleOption"/>
                 <requiredEntity createDataKey="apiSimple"/>
             </createData>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
         </before>
         <after>
             <createData entity="FreeShippinMethodDefault" stepKey="disableFreeShipping"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSearchBundleProductsByKeywordsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSearchBundleProductsByKeywordsTest.xml
index de6718dfd9f31..5997cdc14ade8 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSearchBundleProductsByKeywordsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSearchBundleProductsByKeywordsTest.xml
@@ -39,7 +39,9 @@
                 <requiredEntity createDataKey="fixedBundleOption"/>
                 <requiredEntity createDataKey="createSimpleProductTwo"/>
             </createData>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="createDynamicBundle" stepKey="deleteDynamicBundleProduct"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontSortBundleProductsByPriceTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontSortBundleProductsByPriceTest.xml
index 1c7cb39d7746f..7049299987dff 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontSortBundleProductsByPriceTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontSortBundleProductsByPriceTest.xml
@@ -95,7 +95,9 @@
             </createData>
 
             <!-- Perform CLI reindex -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
         </before>
         <after>
             <!-- Delete all created data -->
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontSpecialPriceBundleProductInCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontSpecialPriceBundleProductInCartTest.xml
index 32662321a611e..58fae75a6fc6b 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontSpecialPriceBundleProductInCartTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontSpecialPriceBundleProductInCartTest.xml
@@ -36,7 +36,9 @@
                     <requiredEntity createDataKey="simpleProduct"/>
                 </createData>
                 <!-- Run reindex stock status -->
-                <magentoCLI command="indexer:reindex" arguments="cataloginventory_stock" stepKey="reindex"/>
+                <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                    <argument name="indices" value="cataloginventory_stock"/>
+                </actionGroup>
             </before>
             <after>
                 <deleteData createDataKey="bundleProduct" stepKey="deleteBundleProduct"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontVerifyDynamicBundleProductPricesForCombinationOfOptionsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontVerifyDynamicBundleProductPricesForCombinationOfOptionsTest.xml
index ac2ab4806fd44..faea327a07d12 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontVerifyDynamicBundleProductPricesForCombinationOfOptionsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontVerifyDynamicBundleProductPricesForCombinationOfOptionsTest.xml
@@ -167,7 +167,9 @@
             <waitForPageLoad stepKey="waitForTaxSaved"/>
             <see userInput="You saved the configuration." selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccess"/>
 
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
         </before>
         <after>
             <!-- navigate to the tax configuration page -->
diff --git a/app/code/Magento/BundleImportExport/Test/Mftf/Test/UpdateBundleProductViaImportTest.xml b/app/code/Magento/BundleImportExport/Test/Mftf/Test/UpdateBundleProductViaImportTest.xml
index 9bd9c784b39f2..515c2bc56f067 100644
--- a/app/code/Magento/BundleImportExport/Test/Mftf/Test/UpdateBundleProductViaImportTest.xml
+++ b/app/code/Magento/BundleImportExport/Test/Mftf/Test/UpdateBundleProductViaImportTest.xml
@@ -38,8 +38,12 @@
             <argument name="importFile" value="catalog_product_import_bundle.csv"/>
             <argument name="importNoticeMessage" value="Created: 2, Updated: 0, Deleted: 0"/>
         </actionGroup>
-        <magentoCLI command="cache:flush" arguments="full_page" stepKey="flushCacheAfterCreate"/>
-        <magentoCLI command="indexer:reindex" stepKey="indexerReindexAfterCreate"/>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfterCreate">
+            <argument name="tags" value="full_page"/>
+        </actionGroup>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="indexerReindexAfterCreate">
+            <argument name="indices" value=""/>
+        </actionGroup>
 
         <!-- Check Bundle product is visible on the storefront-->
         <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openCategoryPageAfterCreation">
@@ -56,8 +60,12 @@
             <argument name="importFile" value="catalog_product_import_bundle.csv"/>
             <argument name="importNoticeMessage" value="Created: 0, Updated: 2, Deleted: 0"/>
         </actionGroup>
-        <magentoCLI command="cache:flush" arguments="full_page" stepKey="flushCacheAfterUpdate"/>
-        <magentoCLI command="indexer:reindex" stepKey="indexerReindexAfterUpdate"/>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfterUpdate">
+            <argument name="tags" value="full_page"/>
+        </actionGroup>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="indexerReindexAfterUpdate">
+            <argument name="indices" value=""/>
+        </actionGroup>
 
         <!-- Check Bundle product is still visible on the storefront-->
         <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openCategoryPageAfterUpdate">
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/AdminLoginWithCaptchaTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/AdminLoginWithCaptchaTest.xml
index 28253fb3c00ef..58cfd7aacd631 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Test/AdminLoginWithCaptchaTest.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/AdminLoginWithCaptchaTest.xml
@@ -23,12 +23,16 @@
         <before>
             <magentoCLI command="config:set {{AdminCaptchaLength3ConfigData.path}} {{AdminCaptchaLength3ConfigData.value}}" stepKey="setCaptchaLength" />
             <magentoCLI command="config:set {{AdminCaptchaSymbols1ConfigData.path}} {{AdminCaptchaSymbols1ConfigData.value}}" stepKey="setCaptchaSymbols" />
-            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set {{AdminCaptchaDefaultLengthConfigData.path}} {{AdminCaptchaDefaultLengthConfigData.value}}" stepKey="setDefaultCaptchaLength" />
             <magentoCLI command="config:set {{AdminCaptchaDefaultSymbolsConfigData.path}} {{AdminCaptchaDefaultSymbolsConfigData.value}}" stepKey="setDefaultCaptchaSymbols" />
-            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
         </after>
 
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdminWithWrongCredentialsFirstAttempt">
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaEditCustomerEmailTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaEditCustomerEmailTest.xml
index 54237087227d8..2736888154483 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaEditCustomerEmailTest.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaEditCustomerEmailTest.xml
@@ -24,7 +24,9 @@
             <magentoCLI command="config:set {{StorefrontCaptchaOnCustomerChangePasswordConfigData.path}} {{StorefrontCaptchaOnCustomerChangePasswordConfigData.value}}" stepKey="enableUserEditCaptcha"/>
             <magentoCLI command="config:set {{StorefrontCustomerCaptchaLength3ConfigData.path}} {{StorefrontCustomerCaptchaLength3ConfigData.value}}" stepKey="setCaptchaLength" />
             <magentoCLI command="config:set {{StorefrontCustomerCaptchaSymbols1ConfigData.path}} {{StorefrontCustomerCaptchaSymbols1ConfigData.value}}" stepKey="setCaptchaSymbols" />
-            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
 
             <createData entity="Simple_US_Customer" stepKey="customer"/>
             <!-- Sign in as customer -->
@@ -37,7 +39,9 @@
             <magentoCLI command="config:set {{StorefrontCaptchaOnCustomerLoginConfigData.path}} {{StorefrontCaptchaOnCustomerLoginConfigData.value}},{{StorefrontCaptchaOnCustomerForgotPasswordConfigData.value}}" stepKey="enableCaptchaOnDefaultForms" />
             <magentoCLI command="config:set {{StorefrontCustomerCaptchaDefaultLengthConfigData.path}} {{StorefrontCustomerCaptchaDefaultLengthConfigData.value}}" stepKey="setDefaultCaptchaLength" />
             <magentoCLI command="config:set {{StorefrontCustomerCaptchaDefaultSymbolsConfigData.path}} {{StorefrontCustomerCaptchaDefaultSymbolsConfigData.value}}" stepKey="setDefaultCaptchaSymbols" />
-            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
 
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
         </after>
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnContactUsTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnContactUsTest.xml
index 0c6a3f31c1df2..22f1ed1af3e28 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnContactUsTest.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnContactUsTest.xml
@@ -23,13 +23,17 @@
             <magentoCLI command="config:set {{StorefrontCustomerCaptchaLength3ConfigData.path}} {{StorefrontCustomerCaptchaLength3ConfigData.value}}" stepKey="setCaptchaLength" />
             <magentoCLI command="config:set {{StorefrontCustomerCaptchaSymbols1ConfigData.path}} {{StorefrontCustomerCaptchaSymbols1ConfigData.value}}" stepKey="setCaptchaSymbols" />
             <magentoCLI command="config:set {{StorefrontCaptchaOnContactUsFormConfigData.path}} {{StorefrontCaptchaOnContactUsFormConfigData.value}}" stepKey="enableUserEditCaptcha"/>
-            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set {{StorefrontCustomerCaptchaDefaultLengthConfigData.path}} {{StorefrontCustomerCaptchaDefaultLengthConfigData.value}}" stepKey="setDefaultCaptchaLength" />
             <magentoCLI command="config:set {{StorefrontCustomerCaptchaDefaultSymbolsConfigData.path}} {{StorefrontCustomerCaptchaDefaultSymbolsConfigData.value}}" stepKey="setDefaultCaptchaSymbols" />
             <magentoCLI command="config:set {{StorefrontCaptchaOnCustomerLoginConfigData.path}} {{StorefrontCaptchaOnCustomerLoginConfigData.value}},{{StorefrontCaptchaOnCustomerForgotPasswordConfigData.value}}" stepKey="enableCaptchaOnDefaultForms" />
-            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
         </after>
 
         <!-- Open storefront contact us form -->
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnCustomerLoginTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnCustomerLoginTest.xml
index 5a1be68d3f251..332d7eb6067b5 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnCustomerLoginTest.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaOnCustomerLoginTest.xml
@@ -22,13 +22,17 @@
         <before>
             <magentoCLI command="config:set {{StorefrontCustomerCaptchaLength3ConfigData.path}} {{StorefrontCustomerCaptchaLength3ConfigData.value}}" stepKey="setCaptchaLength" />
             <magentoCLI command="config:set {{StorefrontCustomerCaptchaSymbols1ConfigData.path}} {{StorefrontCustomerCaptchaSymbols1ConfigData.value}}" stepKey="setCaptchaSymbols" />
-            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
             <createData entity="Simple_US_Customer" stepKey="customer"/>
         </before>
         <after>
             <magentoCLI command="config:set {{StorefrontCustomerCaptchaDefaultLengthConfigData.path}} {{StorefrontCustomerCaptchaDefaultLengthConfigData.value}}" stepKey="setDefaultCaptchaLength" />
             <magentoCLI command="config:set {{StorefrontCustomerCaptchaDefaultSymbolsConfigData.path}} {{StorefrontCustomerCaptchaDefaultSymbolsConfigData.value}}" stepKey="setDefaultCaptchaSymbols" />
-            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
         </after>
 
diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaRegisterNewCustomerTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaRegisterNewCustomerTest.xml
index 2c331f958e467..b7d5b60ddc632 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaRegisterNewCustomerTest.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/StorefrontCaptchaRegisterNewCustomerTest.xml
@@ -25,7 +25,9 @@
             <magentoCLI command="config:set {{StorefrontCustomerCaptchaModeAlwaysConfigData.path}} {{StorefrontCustomerCaptchaModeAlwaysConfigData.value}}" stepKey="alwaysEnableCaptcha" />
             <magentoCLI command="config:set {{StorefrontCustomerCaptchaLength3ConfigData.path}} {{StorefrontCustomerCaptchaLength3ConfigData.value}}" stepKey="setCaptchaLength" />
             <magentoCLI command="config:set {{StorefrontCustomerCaptchaSymbols1ConfigData.path}} {{StorefrontCustomerCaptchaSymbols1ConfigData.value}}" stepKey="setCaptchaSymbols" />
-            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
         </before>
         <after>
             <!-- Set default configuration. -->
@@ -33,7 +35,9 @@
             <magentoCLI command="config:set {{StorefrontCustomerCaptchaModeAfterFailConfigData.path}} {{StorefrontCustomerCaptchaModeAfterFailConfigData.value}}" stepKey="defaultCaptchaMode" />
             <magentoCLI command="config:set {{StorefrontCustomerCaptchaDefaultLengthConfigData.path}} {{StorefrontCustomerCaptchaDefaultLengthConfigData.value}}" stepKey="setDefaultCaptchaLength" />
             <magentoCLI command="config:set {{StorefrontCustomerCaptchaDefaultSymbolsConfigData.path}} {{StorefrontCustomerCaptchaDefaultSymbolsConfigData.value}}" stepKey="setDefaultCaptchaSymbols" />
-            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
         </after>
 
         <!-- Open Customer registration page -->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
index e42dd8b8ab12e..92be79fdfe720 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AddOutOfStockProductToCompareListTest.xml
@@ -22,7 +22,9 @@
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <magentoCLI command="config:set {{CatalogInventoryOptionsShowOutOfStockDisable.path}} {{CatalogInventoryOptionsShowOutOfStockDisable.value}}" stepKey="setConfigShowOutOfStockFalse"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <createData entity="SimpleSubCategory" stepKey="category"/>
             <createData entity="SimpleProduct4" stepKey="product">
                 <requiredEntity createDataKey="category"/>
@@ -30,7 +32,9 @@
         </before>
         <after>
             <magentoCLI command="config:set {{CatalogInventoryOptionsShowOutOfStockDisable.path}} {{CatalogInventoryOptionsShowOutOfStockDisable.value}}" stepKey="setConfigShowOutOfStockFalse"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <deleteData createDataKey="product" stepKey="deleteProduct"/>
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
@@ -47,8 +51,12 @@
         <magentoCLI command="config:set {{CatalogInventoryOptionsShowOutOfStockEnable.path}} {{CatalogInventoryOptionsShowOutOfStockEnable.value}}" stepKey="setConfigShowOutOfStockTrue"/>
         <!--Clear cache and reindex-->
         <comment userInput="Clear cache and reindex" stepKey="cleanCache"/>
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+    <argument name="indices" value=""/>
+</actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+    <argument name="tags" value=""/>
+</actionGroup>
         <!--Open product page-->
         <comment userInput="Open product page" stepKey="openProductPage"/>
         <amOnPage url="{{StorefrontProductPage.url($$product.custom_attributes[url_key]$$)}}" stepKey="goToSimpleProductPage2"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml
index 52da8c70a3bc8..9dbec6bbaf51c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml
@@ -61,8 +61,12 @@
         <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
         <!--Clear cache and reindex-->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
         <!--Verify product is visible in category front page -->
         <amOnPage url="$$createCategory.name$$.html" stepKey="openCategoryStoreFrontPage"/>
         <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminBackorderAllowedAddProductToCartTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminBackorderAllowedAddProductToCartTest.xml
index 96d0c209aba34..077765bd5c15a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminBackorderAllowedAddProductToCartTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminBackorderAllowedAddProductToCartTest.xml
@@ -31,7 +31,9 @@
             <!-- Set Magento back to default configuration -->
             <magentoCLI command="config:set {{CatalogInventoryOptionsShowOutOfStockDisable.path}} {{CatalogInventoryOptionsShowOutOfStockDisable.value}}" stepKey="setConfigShowOutOfStockFalse"/>
             <magentoCLI command="config:set {{CatalogInventoryItemOptionsBackordersDisable.path}} {{CatalogInventoryItemOptionsBackordersDisable.value}}" stepKey="setConfigAllowBackordersFalse"/>
-            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCache"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
         </after>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckCustomAttributeValuesAfterProductSaveTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckCustomAttributeValuesAfterProductSaveTest.xml
index b3f7f0e6eb42a..0bdf19c9b8950 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckCustomAttributeValuesAfterProductSaveTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckCustomAttributeValuesAfterProductSaveTest.xml
@@ -33,7 +33,9 @@
             </createData>
             <!-- Create simple product -->
             <createData entity="SimpleProduct2" stepKey="createSimpleProduct"/>
-            <magentoCLI command="indexer:reindex" arguments="catalogsearch_fulltext" stepKey="reindexCatalogSearch"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexCatalogSearch">
+                <argument name="indices" value="catalogsearch_fulltext"/>
+            </actionGroup>
             <!-- Login to Admin page -->
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckOutOfStockProductIsVisibleInCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckOutOfStockProductIsVisibleInCategoryTest.xml
index e64707a895fd4..c3b54dbbba141 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckOutOfStockProductIsVisibleInCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckOutOfStockProductIsVisibleInCategoryTest.xml
@@ -65,7 +65,9 @@
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
 
         <!--Run re-index task -->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
 
         <!--Verify product is visible in category front page -->
         <amOnPage url="$$createCategory.name$$.html" stepKey="openCategoryStoreFrontPage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithAnchorFieldTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithAnchorFieldTest.xml
index 4c1993eb803b3..a640b5a02790c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithAnchorFieldTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithAnchorFieldTest.xml
@@ -72,8 +72,12 @@
         </actionGroup>
 
         <!--Clear cache and reindex-->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
         <!--Verify Product in store front page-->
         <amOnPage url="{{StorefrontCategoryPage.url(_defaultCategory.name_lwr)}}"  stepKey="amOnCategoryPage"/>
         <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDropdownProductAttributeVisibleInStorefrontAdvancedSearchFormTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDropdownProductAttributeVisibleInStorefrontAdvancedSearchFormTest.xml
index fef69edde23e8..93a8633c51854 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDropdownProductAttributeVisibleInStorefrontAdvancedSearchFormTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDropdownProductAttributeVisibleInStorefrontAdvancedSearchFormTest.xml
@@ -83,7 +83,9 @@
         <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSuccessMessage"/>
 
         <!-- Flash cache -->
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!-- Go to store's advanced catalog search page -->
         <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
index f8346f5a9dd5c..6b0c8f418db9c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
@@ -31,8 +31,12 @@
                 <argument name="storeView" value="customStoreFR"/>
             </actionGroup>
             <!--Run full reindex and clear caches -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <!--Enable Flat Catalog Category -->
             <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1"/>
             <!--Open Index Management Page and Select Index mode "Update by Schedule" -->
@@ -44,7 +48,9 @@
         <after>
             <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
             <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="realtime" />
-            <magentoCLI stepKey="indexerReindex" command="indexer:reindex" />
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="indexerReindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
             <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
             <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
                 <argument name="customStore" value="customStoreEN"/>
@@ -65,8 +71,12 @@
         <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{CatNotActive.name}}" stepKey="seeUpdatedCategoryTitle"/>
         <dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}"  stepKey="verifyInactiveCategory"/>
         <!--Run full reindex and clear caches -->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
         <!--Open Index Management Page -->
         <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
         <waitForPageLoad stepKey="waitForIndexPageToBeLoaded"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml
index 0aa89bdfd45b6..6ae7f2ad5a308 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml
@@ -31,8 +31,12 @@
                 <argument name="storeView" value="customStoreFR"/>
             </actionGroup>
             <!--Run full reindex and clear caches -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <!--Enable Flat Catalog Category -->
             <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1"/>
             <!--Open Index Management Page and Select Index mode "Update by Schedule" -->
@@ -44,7 +48,9 @@
         <after>
             <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
             <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="realtime" />
-            <magentoCLI stepKey="indexerReindex" command="indexer:reindex" />
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="indexerReindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
             <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
             <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
                 <argument name="customStore" value="customStoreEN"/>
@@ -66,8 +72,12 @@
         <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{SimpleSubCategory.name}}" stepKey="seeUpdatedCategoryTitle"/>
         <dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}"  stepKey="verifyInactiveIncludeInMenu"/>
         <!--Run full reindex and clear caches -->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
         <!--Open Index Management Page -->
         <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
         <waitForPageLoad stepKey="waitForIndexPageToBeLoaded"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml
index 171d15fe6ed4f..6cce3586fd443 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml
@@ -31,8 +31,12 @@
                 <argument name="storeView" value="customStoreFR"/>
             </actionGroup>
             <!--Run full reindex and clear caches -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <!--Enable Flat Catalog Category -->
             <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1"/>
             <!--Open Index Management Page and Select Index mode "Update by Schedule" -->
@@ -44,7 +48,9 @@
         <after>
             <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
             <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="realtime" />
-            <magentoCLI stepKey="indexerReindex" command="indexer:reindex" />
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="indexerReindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
             <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
                 <argument name="customStore" value="customStoreEN"/>
             </actionGroup>
@@ -67,8 +73,12 @@
         <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{SimpleSubCategory.name}}" stepKey="seeUpdatedCategoryTitle"/>
         <dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.includeInMenuLabel}}"  stepKey="verifyInactiveIncludeInMenu"/>
         <!--Run full reindex and clear caches -->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
         <!--Open Index Management Page -->
         <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
         <waitForPageLoad stepKey="waitForIndexPageToBeLoaded"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateMultipleSelectProductAttributeVisibleInStorefrontAdvancedSearchFormTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateMultipleSelectProductAttributeVisibleInStorefrontAdvancedSearchFormTest.xml
index caacfde89d1cb..ebd98e85ac89b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateMultipleSelectProductAttributeVisibleInStorefrontAdvancedSearchFormTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateMultipleSelectProductAttributeVisibleInStorefrontAdvancedSearchFormTest.xml
@@ -87,7 +87,9 @@
         <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSuccessMessage"/>
 
         <!-- Flash cache -->
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!-- Go to store's advanced catalog search page -->
         <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml
index 7fdab11d0a050..b27988a81b63e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml
@@ -91,7 +91,9 @@
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
 
         <!--Run Re-Index task -->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
 
         <!--Verify product attribute added in product form -->
         <scrollTo selector="{{AdminProductFormSection.contentTab}}" stepKey="scrollToContentTab"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithDatetimeAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithDatetimeAttributeTest.xml
index 2141f44113057..079e81535e16f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithDatetimeAttributeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithDatetimeAttributeTest.xml
@@ -49,7 +49,9 @@
         <!-- Save the product -->
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
         <!-- Flush config cache to reset product attributes in attribute set -->
-        <magentoCLI command="cache:flush" arguments="config" stepKey="flushConfigCache"/>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushConfigCache">
+            <argument name="tags" value="config"/>
+        </actionGroup>
         <reloadPage stepKey="reloadProductEditPage"/>
         <!-- Check default value -->
         <waitForElementVisible selector="{{AdminProductAttributesSection.sectionHeader}}" stepKey="waitAttributesSectionAppears"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithUnicodeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithUnicodeTest.xml
index 8de84867241a8..54c3a05651c44 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithUnicodeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithUnicodeTest.xml
@@ -31,8 +31,12 @@
             <argument name="category" value="$$createPreReqCategory$$"/>
             <argument name="simpleProduct" value="ProductWithUnicode"/>
         </actionGroup>
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
         <actionGroup ref="AssertProductInStorefrontCategoryPage" stepKey="assertProductInStorefront1">
             <argument name="category" value="$$createPreReqCategory$$"/>
             <argument name="product" value="ProductWithUnicode"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
index 8bb3391b5240b..200f6d6849fdc 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
@@ -117,8 +117,12 @@
 
         <!-- Verify we see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!-- Verify customer see created virtual product with custom options suite and import options(from above step) on storefront page and is searchable by sku -->
         <amOnPage url="{{StorefrontProductPage.url(virtualProductCustomImportOptions.urlKey)}}" stepKey="goToProductPage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
index faae6a371db24..259f1312f6cb4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
@@ -98,8 +98,12 @@
         <see selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{virtualProductBigQty.name}}" stepKey="seeVirtualProductNameOnCategoryPage"/>
 
         <!--Run full reindex and clear caches -->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!-- Verify customer see created virtual product with tier price(from above step) on storefront page and is searchable by sku -->
         <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToHomePage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductsImageInCaseOfMultipleStoresTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductsImageInCaseOfMultipleStoresTest.xml
index e0375728f316f..79cb0fc0cd2f1 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductsImageInCaseOfMultipleStoresTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductsImageInCaseOfMultipleStoresTest.xml
@@ -65,8 +65,12 @@
             <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
                 <argument name="websiteName" value="{{NewWebSiteData.name}}"/>
             </actionGroup>
-            <magentoCLI stepKey="reindex" command="indexer:reindex"/>
-            <magentoCLI stepKey="flushCache" command="cache:flush"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <deleteData createDataKey="createSubCategory" stepKey="deleteSubCategory"/>
             <deleteData createDataKey="createRootCategory" stepKey="deleteRootCategory"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
@@ -94,8 +98,12 @@
         </actionGroup>
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct2"/>
         <!--Reindex and flush cache-->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
         <!--Switch to 'Default Store View' scope and open product page-->
         <actionGroup ref="SwitchToTheNewStoreViewActionGroup" stepKey="SwitchDefaultStoreView">
             <argument name="storeViewName" value="'Default Store View'"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml
index c319116bf075c..af31b7c1d5c07 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminImportCustomizableOptionToProductWithSKUTest.xml
@@ -32,8 +32,12 @@
             </createData>
 
             <!-- TODO: REMOVE AFTER FIX MC-21717 -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <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>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml
index bf5fde3b85bba..c078606a1cfe7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml
@@ -69,8 +69,12 @@
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage2"/>
 
         <!-- TODO: REMOVE AFTER FIX MC-21717 -->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!--Open Category in store front page-->
         <amOnPage url="/$$createDefaultCategory.name$$/{{FirstLevelSubCat.name}}/{{SimpleSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml
index 4dbbdc8f4399e..08e2b58e8381f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml
@@ -23,8 +23,12 @@
                 <field key="is_active">true</field>
             </createData>
             <!-- Perform reindex and flush cache -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="createDefaultCategory" stepKey="deleteCategory"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml
index 116df566f2bd0..ff2a3ff8bcc22 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml
@@ -59,7 +59,9 @@
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
 
         <!--Run re-index task -->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
 
         <!--Verify category displayed in store front page-->
         <amOnPage url="/$$createDefaultCategory.name$$/{{SimpleSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCustomURLKeyPreservedWhenAssignedToCategoryWithoutCustomURLKeyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCustomURLKeyPreservedWhenAssignedToCategoryWithoutCustomURLKeyTest.xml
index 1c536df7c2efb..8e728fc6e1f27 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCustomURLKeyPreservedWhenAssignedToCategoryWithoutCustomURLKeyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCustomURLKeyPreservedWhenAssignedToCategoryWithoutCustomURLKeyTest.xml
@@ -35,8 +35,12 @@
             </actionGroup>
 
             <!--Run full reindex and clear caches -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" arguments="full_page" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value="full_page"/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="createSimpleProductFirst" stepKey="deleteFirstSimpleProduct"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml
index b4738fd7adeec..cfd1ad6f607a8 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveImageAffectsAllScopesTest.xml
@@ -65,8 +65,12 @@
             </actionGroup>
             <deleteData createDataKey="category" stepKey="deletePreReqCategory"/>
             <deleteData createDataKey="product" stepKey="deleteFirstProduct"/>
-            <magentoCLI stepKey="reindex" command="indexer:reindex"/>
-            <magentoCLI stepKey="flushCache" command="cache:flush"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductImagesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductImagesTest.xml
index 9819890ed3751..9c0264a15a45d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductImagesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductImagesTest.xml
@@ -143,8 +143,12 @@
 
         <!-- Save the second product -->
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct2"/>
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!-- Go to the admin grid and see the uploaded image -->
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex3"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml
index 71e827a64ae2d..8daf9133e3244 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml
@@ -31,7 +31,9 @@
                 <argument name="websiteCode" value="{{customWebsite.code}}"/>
             </actionGroup>
             <actionGroup ref="EnableWebUrlOptionsActionGroup" stepKey="addStoreCodeToUrls"/>
-            <magentoCLI command="cache:flush" stepKey="flushCacheAfterEnableWebUrlOptions"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfterEnableWebUrlOptions">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
@@ -43,8 +45,12 @@
             <actionGroup ref="GoToProductCatalogPageActionGroup" stepKey="goToProductCatalogPage"/>
             <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGridColumnsInitial"/>
             <actionGroup ref="ResetWebUrlOptionsActionGroup" stepKey="resetUrlOption"/>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml
index 9b827550a6817..683ca19d1226d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml
@@ -64,8 +64,12 @@
         <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seePageTitle" />
 
         <!-- Perform reindex and flush cache -->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!--Verify Category in store front page-->
         <amOnPage url="{{StorefrontCategoryPage.url(_defaultCategory.name)}}" stepKey="seeDefaultProductPage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
index 1950b385c4a68..8d3e2b56431ac 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
@@ -32,8 +32,12 @@
                 <argument name="storeView" value="customStoreFR"/>
             </actionGroup>
             <!--Run full reindex and clear caches -->
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
             <!--Enable Flat Catalog Category -->
             <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1"/>
             <!--Open Index Management Page and Select Index mode "Update by Schedule" -->
@@ -45,7 +49,9 @@
         <after>
             <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
             <magentoCLI stepKey="setIndexersMode" command="indexer:set-mode" arguments="realtime" />
-            <magentoCLI stepKey="indexerReindex" command="indexer:reindex" />
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="indexerReindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
             <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
                 <argument name="customStore" value="customStoreEN"/>
             </actionGroup>
@@ -57,7 +63,9 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Select Created Category-->
-        <magentoCLI command="indexer:reindex" stepKey="reindexBeforeFlow"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexBeforeFlow">
+            <argument name="indices" value=""/>
+        </actionGroup>
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
         <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" stepKey="selectCreatedCategory"/>
@@ -77,8 +85,12 @@
         <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
         <!--Open Index Management Page and verify flat categoryIndex status-->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
         <!--Open Index Management Page -->
         <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
         <waitForPageLoad stepKey="waitForIndexPageToLoad"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml
index 1214ba879f211..658440f22b50d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml
@@ -66,8 +66,12 @@
         <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
         <!--Run full reindex and clear caches -->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
         <!--Open Index Management Page -->
         <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
         <waitForPageLoad stepKey="waitForIndexPageToBeLoaded"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml
index 490f8dbdc4f81..e9b61d4f4d5eb 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml
@@ -45,7 +45,9 @@
         <after>
             <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
             <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="realtime" />
-            <magentoCLI stepKey="indexerReindex" command="indexer:reindex" />
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="indexerReindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
             <deleteData stepKey="deleteCategory" createDataKey="createCategory" />
             <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
                 <argument name="customStore" value="customStoreEN"/>
@@ -69,8 +71,12 @@
         <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
         <!--Run full reindex and clear caches -->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
         <!--Open Index Management Page -->
         <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
         <waitForPageLoad stepKey="waitForIndexPageToLoad"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml
index f5b0fb8054dc1..fb162033f830e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml
@@ -27,8 +27,12 @@
             <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
 
             <!--TODO: REMOVE AFTER FIX MC-21717 -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush full_page" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value="full_page"/>
+            </actionGroup>
         </before>
         <after>
             <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml
index 58db163bed720..42e1949e78327 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml
@@ -95,7 +95,9 @@
         <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductRegularPrice245InStock.urlKey}}" stepKey="seeUrlKey"/>
 
         <!--Run re-index task -->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
 
         <!--Verify customer see updated simple product link on category page -->
         <amOnPage url="{{StorefrontCategoryPage.url($$categoryEntity.name$$)}}" stepKey="openCategoryPage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml
index 5e9a48f659d6b..ea5a2df3733d7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml
@@ -95,7 +95,9 @@
         <seeInField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductRegularPrice32501InStock.urlKey}}" stepKey="seeUrlKey"/>
 
         <!--Run re-index task -->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
 
         <!--Verify customer see updated simple product link on category page -->
         <amOnPage url="{{StorefrontCategoryPage.url($$categoryEntity.name$$)}}" stepKey="openCategoryPage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml
index 3eaae60d789f5..55d697e35deba 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml
@@ -110,7 +110,9 @@
         <actionGroup ref="ClearProductsFilterActionGroup" stepKey="ClearProductsFilterActionGroup"/>
 
         <!--Flush cache-->
-        <magentoCLI command="cache:flush" stepKey="cleanCache"/>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
 
         <!--Edit customer info-->
@@ -333,8 +335,12 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
 
             <!--Do reindex and flush cache-->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </after>
     </test>
 </tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/DeleteCategoriesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/DeleteCategoriesTest.xml
index ce9ff3af18607..1b93f1db19a57 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/DeleteCategoriesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/DeleteCategoriesTest.xml
@@ -75,7 +75,9 @@
 
         <!-- @TODO: Uncomment commented below code after MQE-903 is fixed -->
         <!-- Perform cli reindex. -->
-        <!--<magentoCLI command="indexer:reindex" stepKey="magentoCli"/>-->
+        <!--<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">-->
+        <!--    <argument name="indices" value=""/>-->
+        <!--</actionGroup>-->
 
         <!-- Delete Default Root Category. -->
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="navigateToCategoryPageAfterCLIReindexCommand"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/DisplayRefreshCacheAfterChangingCategoryPageLayoutTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/DisplayRefreshCacheAfterChangingCategoryPageLayoutTest.xml
index f6ede46578f33..e679402740398 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/DisplayRefreshCacheAfterChangingCategoryPageLayoutTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/DisplayRefreshCacheAfterChangingCategoryPageLayoutTest.xml
@@ -24,14 +24,18 @@
             <comment userInput="Create category, flush cache and log in" stepKey="createCategoryAndLogIn"/>
             <createData entity="SimpleSubCategory" stepKey="simpleCategory"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="logInAsAdmin"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <!-- Delete category and log out -->
             <comment userInput="Delete category and log out" stepKey="deleteCategoryAndLogOut"/>
             <deleteData createDataKey="simpleCategory" stepKey="deleteCategory"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logOutFromAdmin"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </after>
         <!-- Navigate to category details page -->
         <comment userInput="Navigate to category details page" stepKey="navigateToAdminCategoryPage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CGuestUserTest/EndToEndB2CGuestUserTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CGuestUserTest/EndToEndB2CGuestUserTest.xml
index 441c9cd5eab8b..ff68bba78cae8 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CGuestUserTest/EndToEndB2CGuestUserTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CGuestUserTest/EndToEndB2CGuestUserTest.xml
@@ -57,7 +57,9 @@
         </after>
 
         <!--Re-index-->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
 
         <!-- Step 1: User browses catalog -->
         <comment userInput="Start of browsing catalog" stepKey="startOfBrowsingCatalog"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/ProductAvailableAfterEnablingSubCategoriesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/ProductAvailableAfterEnablingSubCategoriesTest.xml
index 9b5fa25085e1a..95f263ad8e1cb 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/ProductAvailableAfterEnablingSubCategoriesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/ProductAvailableAfterEnablingSubCategoriesTest.xml
@@ -50,7 +50,9 @@
         <actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="seeSuccessMessage"/>
 
         <!--Run re-index task-->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
 
         <amOnPage url="$$createCategory.name$$.html" stepKey="goToCategoryStorefront"/>
         <waitForPageLoad stepKey="waitForCategoryStorefrontPage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontProductsDisplayUsingElasticSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontProductsDisplayUsingElasticSearchTest.xml
index e109dcb0deea5..cde7b14614f8e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontProductsDisplayUsingElasticSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontProductsDisplayUsingElasticSearchTest.xml
@@ -114,8 +114,12 @@
             </createData>
 
             <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
-            <magentoCLI command="indexer:reindex" arguments="catalogsearch_fulltext" stepKey="performReindex"/>
-            <magentoCLI command="cache:clean" arguments="full_page" stepKey="cleanFullPageCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="performReindex">
+                <argument name="indices" value="catalogsearch_fulltext"/>
+            </actionGroup>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanFullPageCache">
+                <argument name="tags" value="full_page"/>
+            </actionGroup>
         </before>
 
         <after>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyViewedAtStoreLevelTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyViewedAtStoreLevelTest.xml
index 489be97a9927a..e1b5aca6382e9 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyViewedAtStoreLevelTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyViewedAtStoreLevelTest.xml
@@ -74,8 +74,12 @@
             </actionGroup>
             <!-- Logout Admin -->
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCacheAfterDeletion"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfterDeletion">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </after>
         <!--Create widget for recently viewed products-->
         <actionGroup ref="AdminEditCMSPageContentActionGroup" stepKey="clearRecentlyViewedWidgetsFromCMSContentBefore">
@@ -95,7 +99,9 @@
             <argument name="buttonToShowSection2" value="3"/>
         </actionGroup>
         <!-- Warm up cache -->
-        <magentoCLI command="cache:flush" stepKey="flushCacheAfterWidgetCreated"/>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfterWidgetCreated">
+            <argument name="tags" value=""/>
+        </actionGroup>
         <!-- Navigate to product 3 on store front -->
         <amOnPage url="{{StorefrontProductPage.url($createSimpleProduct2.name$)}}" stepKey="goToStoreOneProductPageTwo"/>
         <amOnPage url="{{StorefrontProductPage.url($createSimpleProduct3.name$)}}" stepKey="goToStoreOneProductPageThree"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyViewedAtStoreViewLevelTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyViewedAtStoreViewLevelTest.xml
index bc93b3e6e3c45..0117493906de1 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyViewedAtStoreViewLevelTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyViewedAtStoreViewLevelTest.xml
@@ -66,8 +66,12 @@
 
             <!-- Logout Admin -->
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCacheAfterDeletion"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfterDeletion">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </after>
 
         <!--Create widget for recently viewed products-->
@@ -88,7 +92,9 @@
             <argument name="buttonToShowSection2" value="3"/>
         </actionGroup>
 
-        <magentoCLI command="cache:flush" stepKey="flushCacheAfterWidgetCreated"/>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfterWidgetCreated">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!-- Navigate to product 3 on store front -->
         <amOnPage url="{{StorefrontProductPage.url($createSimpleProduct2.name$)}}" stepKey="goToStore1ProductPage2"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCategoryPageWithCategoryFilterTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCategoryPageWithCategoryFilterTest.xml
index 8955f43e1b335..3ff477070cc30 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCategoryPageWithCategoryFilterTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCategoryPageWithCategoryFilterTest.xml
@@ -44,7 +44,9 @@
             <!-- Set the category filter to be present on the category page layered navigation -->
             <magentoCLI command="config:set {{EnableCategoryFilterOnCategoryPageConfigData.path}} {{EnableCategoryFilterOnCategoryPageConfigData.value}}" stepKey="setCategoryFilterVisibleOnStorefront"/>
 
-            <magentoCLI command="cache:flush" stepKey="clearCache1"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
 
         <after>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCategoryPageWithoutCategoryFilterTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCategoryPageWithoutCategoryFilterTest.xml
index 7900a712e0664..a2316efb3a743 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCategoryPageWithoutCategoryFilterTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCategoryPageWithoutCategoryFilterTest.xml
@@ -44,7 +44,9 @@
             <!-- Set the category filter to NOT be present on the category page layered navigation -->
             <magentoCLI command="config:set {{DisableCategoryFilterOnCategoryPageConfigData.path}} {{DisableCategoryFilterOnCategoryPageConfigData.value}}" stepKey="hideCategoryFilterOnStorefront"/>
 
-            <magentoCLI command="cache:flush" stepKey="clearCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
 
         <after>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCheckDefaultNumberProductsToDisplayTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCheckDefaultNumberProductsToDisplayTest.xml
index b13c3827c6727..a73bd5a533ad0 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCheckDefaultNumberProductsToDisplayTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCheckDefaultNumberProductsToDisplayTest.xml
@@ -188,8 +188,12 @@
         <seeInField selector="{{AdminCatalogStorefrontConfigSection.productsPerPageDefaultValue}}" userInput="12" stepKey="seeDefaultValueProductPerPage"/>
 
         <!-- Perform reindex and flush cache -->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!-- Open storefront on the category page -->
         <comment userInput="Open storefront on the category page" stepKey="commentOpenStorefront"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest/StorefrontProductNameWithDoubleQuoteTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest/StorefrontProductNameWithDoubleQuoteTest.xml
index bcd5d7b851db3..c43efe9d9e442 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest/StorefrontProductNameWithDoubleQuoteTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest/StorefrontProductNameWithDoubleQuoteTest.xml
@@ -41,7 +41,9 @@
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
 
         <!--Run re-index task-->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
 
         <!--Check product in category listing-->
         <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="goToCategoryPage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest/StorefrontProductNameWithHTMLEntitiesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest/StorefrontProductNameWithHTMLEntitiesTest.xml
index bd2c22c90318a..e280bd7f1889a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest/StorefrontProductNameWithHTMLEntitiesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest/StorefrontProductNameWithHTMLEntitiesTest.xml
@@ -33,7 +33,9 @@
         </after>
 
         <!--Run re-index task-->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
 
         <!--Check product in category listing-->
         <amOnPage url="{{StorefrontCategoryPage.url($$createCategoryOne.name$$)}}" stepKey="navigateToCategoryPage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontRememberCategoryPaginationTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontRememberCategoryPaginationTest.xml
index c8872425552be..78fbed1aef3a9 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontRememberCategoryPaginationTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontRememberCategoryPaginationTest.xml
@@ -61,7 +61,9 @@
             <deleteData createDataKey="simpleProduct2" stepKey="deleteProduct2"/>
             <deleteData createDataKey="defaultCategory2" stepKey="deleteCategory2"/>
 
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
 
         </after>
     </test>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyCategoryProductAndProductCategoryPartialReindexTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyCategoryProductAndProductCategoryPartialReindexTest.xml
index b4514c9b53736..b7ae6559b8dfb 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyCategoryProductAndProductCategoryPartialReindexTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyCategoryProductAndProductCategoryPartialReindexTest.xml
@@ -62,7 +62,9 @@
         <after>
             <!-- Change "Category Products" and "Product Categories" indexers to "Update on Save" mode -->
             <magentoCLI command="indexer:set-mode" arguments="realtime" stepKey="setRealtimeMode"/>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
 
             <!-- Delete data -->
             <deleteData createDataKey="productA" stepKey="deleteProductA"/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml
index d1f9ebd4c99a4..fa71ffaca26e1 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml
@@ -78,8 +78,12 @@
 
         <!-- 3. Save and apply the new catalog price rule -->
         <click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="saveAndApply"/>
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!-- 4. Verify the storefront -->
         <amOnPage url="$$createCategoryOne.name$$.html" stepKey="goToCategoryOne"/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleForConfigurableProductWithSpecialPricesTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleForConfigurableProductWithSpecialPricesTest.xml
index 882a92a2ee433..1de036d1026dd 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleForConfigurableProductWithSpecialPricesTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleForConfigurableProductWithSpecialPricesTest.xml
@@ -127,8 +127,12 @@
         <actionGroup ref="SaveAndApplyCatalogPriceRuleActionGroup" stepKey="saveAndApplyCatalogPriceRule"/>
 
         <!-- Reindex and flash cache -->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!-- Open Storefront product page and assert created configurable product -->
         <actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="openProductPage">
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleByPercentTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleByPercentTest.xml
index fcae0065f1b53..0290feffc54af 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleByPercentTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleByPercentTest.xml
@@ -25,8 +25,12 @@
             </createData>
 
             <!-- Perform reindex and flush cache -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
 
             <!-- log in and create the price rule -->
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleForCustomerGroupTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleForCustomerGroupTest.xml
index b9318f72bee9e..162c94e262e4a 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleForCustomerGroupTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleForCustomerGroupTest.xml
@@ -47,8 +47,12 @@
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the rule." stepKey="assertSuccess"/>
 
         <!-- Perform reindex and flush cache -->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!-- As a NOT LOGGED IN user, go to the storefront category page and should see the discount -->
         <amOnPage url="$$createCategory.name$$.html" stepKey="goToCategory1"/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest/AdminDeleteCatalogPriceRuleEntityFromConfigurableProductTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest/AdminDeleteCatalogPriceRuleEntityFromConfigurableProductTest.xml
index 6b34fd1e67e9b..f6428bcc0d529 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest/AdminDeleteCatalogPriceRuleEntityFromConfigurableProductTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest/AdminDeleteCatalogPriceRuleEntityFromConfigurableProductTest.xml
@@ -72,8 +72,12 @@
             </createData>
 
             <!-- Perform reindex and flush cache -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
 
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
 
@@ -115,8 +119,12 @@
         <see selector="{{AdminMessagesSection.success}}" userInput="You deleted the rule." stepKey="seeDeletedRuleMessage1"/>
 
         <!-- Reindex -->
-        <magentoCLI command="cache:flush" stepKey="flushCache1"/>
-        <magentoCLI command="indexer:reindex" stepKey="reindex1"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!-- Assert that the rule isn't present on the Category page -->
         <amOnPage url="$$createCategory1.name$$.html" stepKey="goToStorefrontCategoryPage1"/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest/AdminDeleteCatalogPriceRuleEntityFromSimpleProductTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest/AdminDeleteCatalogPriceRuleEntityFromSimpleProductTest.xml
index 59fa4fde1c88a..db8a6e2c75644 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest/AdminDeleteCatalogPriceRuleEntityFromSimpleProductTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest/AdminDeleteCatalogPriceRuleEntityFromSimpleProductTest.xml
@@ -61,8 +61,12 @@
         <see selector="{{AdminMessagesSection.success}}" userInput="You deleted the rule." stepKey="seeDeletedRuleMessage1"/>
 
         <!-- Reindex -->
-        <magentoCLI command="cache:flush" stepKey="flushCache1"/>
-        <magentoCLI command="indexer:reindex" stepKey="reindex1"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!-- Assert that the rule isn't present on the Category page -->
         <amOnPage url="$$createCategory1.name$$.html" stepKey="goToStorefrontCategoryPage1"/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml
index 69508490774dd..bdb633be94738 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml
@@ -79,8 +79,12 @@
 
         <!-- Apply and flush the cache -->
         <click selector="{{AdminCatalogPriceRuleGrid.applyRules}}" stepKey="clickApplyRules"/>
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!-- Verify that category page shows the original prices -->
         <amOnPage url="$$createCategory.name$$.html" stepKey="goToCategoryPage2"/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml
index 9d7607d7521c9..10c5a2798d7ba 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml
@@ -80,9 +80,12 @@
             <argument name="targetSelectValue" value="is undefined"/>
         </actionGroup>
         <click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="clickSaveAndApplyRules"/>
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache3"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!--Check Catalog Price Rule for first product-->
         <amOnPage url="{{StorefrontProductPage.url($$createFirstProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToFirstProductPage"/>
@@ -128,9 +131,12 @@
             <argument name="targetSelectValue" value="is undefined"/>
         </actionGroup>
         <click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="clickSaveAndApplyRules1"/>
-        <magentoCLI command="indexer:reindex" stepKey="reindex1"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache1"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache2"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexSecondTime">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheSecondTime">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!--Check Catalog Price Rule for third product-->
         <amOnPage url="{{StorefrontProductPage.url($$createThirdProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToThirdProductPage"/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogPriceRuleByProductAttributeTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogPriceRuleByProductAttributeTest.xml
index 1919f7d5cc544..0afdc906f7918 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogPriceRuleByProductAttributeTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogPriceRuleByProductAttributeTest.xml
@@ -235,7 +235,9 @@
         <!-- Run cron twice -->
         <magentoCLI command="cron:run" stepKey="runCron1"/>
         <magentoCLI command="cron:run" stepKey="runCron2"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!-- Go to Frontend and open the simple product -->
         <amOnPage url="{{StorefrontProductPage.url($$createFirstProduct.sku$$)}}" stepKey="amOnSimpleProductPage"/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleAndConfigurableProductTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleAndConfigurableProductTest.xml
index 23fc7e1a9ffba..948a15c71eb18 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleAndConfigurableProductTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleAndConfigurableProductTest.xml
@@ -112,8 +112,12 @@
         <!-- Save and apply the new catalog price rule -->
         <actionGroup ref="SaveAndApplyCatalogPriceRuleActionGroup" stepKey="saveAndApplyCatalogPriceRule"/>
 
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!-- Navigate to category on store front -->
         <amOnPage url="{{StorefrontProductPage.url($createCategory.name$)}}" stepKey="goToCategoryPage"/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductAndFixedMethodTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductAndFixedMethodTest.xml
index dfd34181108b8..061eea568d9a0 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductAndFixedMethodTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductAndFixedMethodTest.xml
@@ -61,8 +61,12 @@
 
         <!-- Save and apply the new catalog price rule -->
         <actionGroup ref="SaveAndApplyCatalogPriceRuleActionGroup" stepKey="saveAndApplyCatalogPriceRule"/>
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!-- Navigate to category on store front -->
         <amOnPage url="{{StorefrontProductPage.url($createCategory.name$)}}" stepKey="goToCategoryPage"/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductForNewCustomerGroupTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductForNewCustomerGroupTest.xml
index 25351ca650db9..63f48b0a70156 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductForNewCustomerGroupTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductForNewCustomerGroupTest.xml
@@ -69,7 +69,9 @@
         <!-- Save and apply the new catalog price rule -->
         <actionGroup ref="SaveAndApplyCatalogPriceRuleActionGroup" stepKey="saveAndApplyCatalogPriceRule"/>
 
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
 
         <!-- Navigate to category on store front -->
         <amOnPage url="{{StorefrontProductPage.url($createCategory.name$)}}" stepKey="goToCategoryPage"/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductWithCustomOptionsTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductWithCustomOptionsTest.xml
index 59976fbac1724..7056cacfb70c6 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductWithCustomOptionsTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductWithCustomOptionsTest.xml
@@ -68,8 +68,12 @@
 
         <!-- Save and apply the new catalog price rule -->
         <actionGroup ref="SaveAndApplyCatalogPriceRuleActionGroup" stepKey="saveAndApplyCatalogPriceRule"/>
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!-- Navigate to category on store front -->
         <amOnPage url="{{StorefrontProductPage.url($createCategory.name$)}}" stepKey="goToCategoryPage"/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/CatalogPriceRuleAndCustomerGroupMembershipArePersistedUnderLongTermCookieTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/CatalogPriceRuleAndCustomerGroupMembershipArePersistedUnderLongTermCookieTest.xml
index 6ac9f713e2844..b678e379a603d 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/CatalogPriceRuleAndCustomerGroupMembershipArePersistedUnderLongTermCookieTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/CatalogPriceRuleAndCustomerGroupMembershipArePersistedUnderLongTermCookieTest.xml
@@ -41,7 +41,9 @@
             <actionGroup ref="AdminCatalogPriceRuleSaveAndApplyActionGroup" stepKey="clickSaveAndApplyRule"/>
 
             <!-- Perform reindex -->
-            <magentoCLI command="indexer:reindex" arguments="catalogrule_rule" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value="catalogrule_rule"/>
+            </actionGroup>
         </before>
         <after>
             <createData entity="PersistentConfigDefault" stepKey="setDefaultPersistentState"/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/StorefrontInactiveCatalogRuleTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/StorefrontInactiveCatalogRuleTest.xml
index 2df891b24223b..264c55ba43390 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/StorefrontInactiveCatalogRuleTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/StorefrontInactiveCatalogRuleTest.xml
@@ -34,7 +34,9 @@
             <actionGroup ref="AdminCatalogPriceRuleFillActionsActionGroup" stepKey="fillActionsForThirdPriceRule"/>
             <actionGroup ref="AdminCatalogPriceRuleSaveAndApplyActionGroup" stepKey="saveAndApplyFirstPriceRule"/>
             <!-- Perform reindex -->
-            <magentoCLI command="indexer:reindex" arguments="catalogrule_rule" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value="catalogrule_rule"/>
+            </actionGroup>
         </before>
 
         <after>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByDescriptionTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByDescriptionTest.xml
index d23663d43dcd0..c02ef4957ad3d 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByDescriptionTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByDescriptionTest.xml
@@ -13,8 +13,12 @@
             <group value="CatalogSearch"/>
         </annotations>
         <!-- Perform reindex and flush cache -->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/>
         <actionGroup ref="StorefrontAdvancedCatalogSearchByDescriptionActionGroup" stepKey="search">
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByNameTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByNameTest.xml
index 0b3fb2fa42532..0c8e192f9366e 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByNameTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByNameTest.xml
@@ -14,8 +14,12 @@
         </annotations>
 
         <!-- Perform reindex and flush cache -->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/>
         <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameActionGroup" stepKey="search">
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByPriceTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByPriceTest.xml
index 517e200f8ce11..99c09b5ba93a5 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByPriceTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByPriceTest.xml
@@ -14,8 +14,12 @@
         </annotations>
 
         <!-- Perform reindex and flush cache -->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/>
         <actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndPriceActionGroup" stepKey="search">
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByShortDescriptionTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByShortDescriptionTest.xml
index 0bd08d31e8ffa..1e18c5ea4d0a9 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByShortDescriptionTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByShortDescriptionTest.xml
@@ -14,8 +14,12 @@
         </annotations>
 
         <!-- Perform reindex and flush cache -->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/>
         <actionGroup ref="StorefrontAdvancedCatalogSearchByShortDescriptionActionGroup" stepKey="search">
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductBySkuTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductBySkuTest.xml
index d273f9828dc95..34e0a73e91fe0 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductBySkuTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductBySkuTest.xml
@@ -14,8 +14,12 @@
         </annotations>
 
         <!-- Perform reindex and flush cache -->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/>
         <actionGroup ref="StorefrontAdvancedCatalogSearchByProductSkuActionGroup" stepKey="search">
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartBundleDynamicTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartBundleDynamicTest.xml
index 49fce41fddf05..1b4fc69b0fa6f 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartBundleDynamicTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartBundleDynamicTest.xml
@@ -44,8 +44,12 @@
             <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
 
             <!-- Perform reindex and flush cache -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData stepKey="deleteBundleProduct" createDataKey="createBundleProduct"/>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartBundleFixedTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartBundleFixedTest.xml
index 4b0a5c84ac360..8cca19d870586 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartBundleFixedTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartBundleFixedTest.xml
@@ -55,8 +55,12 @@
             <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
 
             <!-- Perform reindex and flush cache -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData stepKey="deleteBundleProduct" createDataKey="createBundleProduct"/>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartConfigurableTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartConfigurableTest.xml
index 35db90363b1ae..9a0466e2f0963 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartConfigurableTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartConfigurableTest.xml
@@ -26,8 +26,12 @@
             </actionGroup>
 
             <!-- Perform reindex and flush cache -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartDownloadableTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartDownloadableTest.xml
index 79a2fc8646c04..77cb58183b076 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartDownloadableTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartDownloadableTest.xml
@@ -28,8 +28,12 @@
             </createData>
 
             <!-- Perform reindex and flush cache -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove example.com static.magento.com"/>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartGroupedTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartGroupedTest.xml
index cf30e4d06e8e7..2001064518dc5 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartGroupedTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartGroupedTest.xml
@@ -28,8 +28,12 @@
             </createData>
 
             <!-- Perform reindex and flush cache -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData stepKey="deleteGroupedProduct" createDataKey="createProduct"/>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartTest.xml
index ba6fa813367c3..fd2d60022e19e 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartTest.xml
@@ -24,8 +24,12 @@
             </createData>
 
             <!-- Perform reindex and flush cache -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData stepKey="deleteProduct" createDataKey="createSimpleProduct"/>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartVirtualTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartVirtualTest.xml
index b71388f5f409b..fc7f15229cd36 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartVirtualTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartVirtualTest.xml
@@ -24,8 +24,12 @@
             </createData>
 
             <!-- Perform reindex and flush cache -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData stepKey="deleteProduct" createDataKey="createVirtualProduct"/>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchEmptyResultsTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchEmptyResultsTest.xml
index 566b4d204751d..61985aea6ddb2 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchEmptyResultsTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchEmptyResultsTest.xml
@@ -25,8 +25,12 @@
             </createData>
 
             <!-- Perform reindex and flush cache -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchProductBySkuTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchProductBySkuTest.xml
index 814e27182799f..a0522df443e95 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchProductBySkuTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchProductBySkuTest.xml
@@ -24,8 +24,12 @@
             </createData>
 
             <!-- Perform reindex and flush cache -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData stepKey="deleteProduct" createDataKey="createSimpleProduct"/>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchEntitySimpleProductTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchEntitySimpleProductTest.xml
index 968435747bdbb..14ae988e6ce79 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchEntitySimpleProductTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchEntitySimpleProductTest.xml
@@ -32,8 +32,12 @@
         </after>
 
         <!-- Perform reindex and flush cache -->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!-- 1. Navigate to Frontend -->
         <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStorefront"/>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontQuickSearchConfigurableChildrenTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontQuickSearchConfigurableChildrenTest.xml
index 6f510fa315d7d..cc267adcbeb54 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontQuickSearchConfigurableChildrenTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontQuickSearchConfigurableChildrenTest.xml
@@ -73,7 +73,9 @@
             </createData>
 
             <!-- Perform reindex -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="createConfigurableProduct" stepKey="deleteConfigurableProduct"/>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontUpdateSearchTermEntityTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontUpdateSearchTermEntityTest.xml
index 8a0d91ae05b34..b42313fc14773 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontUpdateSearchTermEntityTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontUpdateSearchTermEntityTest.xml
@@ -26,8 +26,12 @@
             </createData>
 
             <!-- Perform reindex and flush cache -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="amOnStorefrontPage1"/>
         </before>
         <after>
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminRewriteProductWithTwoStoreTest.xml b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminRewriteProductWithTwoStoreTest.xml
index 9e4689bd8aa4f..0e4ee26a462e6 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminRewriteProductWithTwoStoreTest.xml
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminRewriteProductWithTwoStoreTest.xml
@@ -17,7 +17,9 @@
 
         <before>
             <magentoCLI command="config:set {{EnableCategoriesPathProductUrls.path}} {{EnableCategoriesPathProductUrls.value}}" stepKey="enableUseCategoriesPath"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
 
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView" />
@@ -36,7 +38,9 @@
             <deleteData createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/>
             <deleteData createDataKey="defaultCategory" stepKey="deleteNewRootCategory"/>
             <magentoCLI command="config:set {{DisableCategoriesPathProductUrls.path}} {{DisableCategoriesPathProductUrls.value}}" stepKey="disableUseCategoriesPath"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </after>
 
         <actionGroup ref="NavigateToCreatedCategoryActionGroup" stepKey="navigateToCreatedDefaultCategory">
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/StorefrontCategoryAccessibleWhenSuffixIsNullTest.xml b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/StorefrontCategoryAccessibleWhenSuffixIsNullTest.xml
index 99037a5c89af1..4880d438373f4 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/StorefrontCategoryAccessibleWhenSuffixIsNullTest.xml
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/StorefrontCategoryAccessibleWhenSuffixIsNullTest.xml
@@ -21,7 +21,9 @@
             <magentoCLI command="config:set catalog/seo/category_url_suffix ''" stepKey="setCategoryUrlSuffix"/>
             <magentoCLI command="config:set catalog/seo/generate_category_product_rewrites 0"
                         stepKey="setCategoryProductRewrites"/>
-            <magentoCLI command="cache:flush" stepKey="flushCacheBefore"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheBefore">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <createData entity="_defaultCategory" stepKey="createCategory"/>
         </before>
         <after>
@@ -30,7 +32,9 @@
                         stepKey="restoreCategoryUrlSuffix"/>
             <magentoCLI command="config:set catalog/seo/generate_category_product_rewrites 1"
                         stepKey="restoreCategoryProductRewrites"/>
-            <magentoCLI command="cache:flush" stepKey="flushCacheAfter"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfter">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </after>
 
         <amOnPage url="/$$createCategory.name$$" stepKey="onCategoryPage"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldShouldNotAcceptJustIntegerValuesTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldShouldNotAcceptJustIntegerValuesTest.xml
index dd454d7aca10b..12e1a6e9872d3 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldShouldNotAcceptJustIntegerValuesTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldShouldNotAcceptJustIntegerValuesTest.xml
@@ -23,8 +23,12 @@
             <createData entity="ApiSimpleProduct" stepKey="createProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/AdminCheckConfigsChangesIsNotAffectedStartedCheckoutProcessTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/AdminCheckConfigsChangesIsNotAffectedStartedCheckoutProcessTest.xml
index ab0453e1faa18..a1065daedd4f8 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/AdminCheckConfigsChangesIsNotAffectedStartedCheckoutProcessTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/AdminCheckConfigsChangesIsNotAffectedStartedCheckoutProcessTest.xml
@@ -84,7 +84,9 @@
         <actionGroup ref="AdminChangeFlatRateShippingMethodStatusActionGroup" stepKey="enableFlatRateShippingStatus"/>
 
         <!-- Flush cache -->
-        <magentoCLI command="cache:flush" stepKey="cacheFlush"/>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!-- Back to the Checkout and refresh the page -->
         <switchToPreviousTab stepKey="switchToPreviousTab"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/DeleteBundleDynamicProductFromShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/DeleteBundleDynamicProductFromShoppingCartTest.xml
index 5fd201290655a..96a236336993f 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/DeleteBundleDynamicProductFromShoppingCartTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/DeleteBundleDynamicProductFromShoppingCartTest.xml
@@ -38,7 +38,9 @@
                 <requiredEntity createDataKey="bundleOption"/>
                 <requiredEntity createDataKey="createSimpleProduct"/>
             </createData>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
         </before>
         <after>
             <!-- Delete category -->
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/DeleteBundleFixedProductFromShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/DeleteBundleFixedProductFromShoppingCartTest.xml
index 603ee1ecea4df..b64b59ef6109c 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/DeleteBundleFixedProductFromShoppingCartTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/DeleteBundleFixedProductFromShoppingCartTest.xml
@@ -33,7 +33,9 @@
                 <requiredEntity createDataKey="createBundleOption"/>
                 <requiredEntity createDataKey="createSimpleProduct"/>
             </createData>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
         </before>
         <after>
             <!-- Delete bundle product data -->
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/EditShippingAddressOnePageCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/EditShippingAddressOnePageCheckoutTest.xml
index c61545e51d535..f34becdd35af1 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/EditShippingAddressOnePageCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/EditShippingAddressOnePageCheckoutTest.xml
@@ -26,8 +26,12 @@
             </createData>
             <createData entity="Simple_US_Customer_NY" stepKey="createCustomer"/>
             <!--Clear cache and reindex-->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml
index ceaf72fff83bb..313f5997e0af0 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml
@@ -26,8 +26,12 @@
                 <field key="price">100.00</field>
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutWithAllProductTypesTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutWithAllProductTypesTest.xml
index e678bb0d2a87b..a64ed22315b42 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutWithAllProductTypesTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutWithAllProductTypesTest.xml
@@ -88,7 +88,9 @@
             <!-- Create customer -->
             <createData entity="Simple_Customer_Without_Address" stepKey="createCustomer"/>
 
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove static.magento.com"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/ShoppingCartAndMiniShoppingCartPerCustomerTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/ShoppingCartAndMiniShoppingCartPerCustomerTest.xml
index 571aa24209389..70faa3721efe9 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/ShoppingCartAndMiniShoppingCartPerCustomerTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/ShoppingCartAndMiniShoppingCartPerCustomerTest.xml
@@ -20,7 +20,9 @@
         </annotations>
         <before>
             <!-- Flush cache -->
-            <magentoCLI command="cache:flush" stepKey="clearCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
 
             <!-- Create two customers -->
             <createData entity="Simple_US_Customer" stepKey="createFirstCustomer"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontAddProductWithAllTypesOfCustomOptionToTheShoppingCartWithoutAnySelectedOptionTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontAddProductWithAllTypesOfCustomOptionToTheShoppingCartWithoutAnySelectedOptionTest.xml
index a5c8eb0da6530..b65cfe0eb574f 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontAddProductWithAllTypesOfCustomOptionToTheShoppingCartWithoutAnySelectedOptionTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontAddProductWithAllTypesOfCustomOptionToTheShoppingCartWithoutAnySelectedOptionTest.xml
@@ -23,7 +23,9 @@
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
             <updateData createDataKey="createProduct" entity="productWithOptions" stepKey="updateProductWithCustomOptions"/>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData  createDataKey="createCategory" stepKey="deleteCategory"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
index bd81a1cfab604..ec02c999d6703 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
@@ -25,7 +25,9 @@
             <createData entity="_defaultProduct" stepKey="product">
                 <requiredEntity createDataKey="category"/>
             </createData>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
 
         <after>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontFreeShippingRecalculationAfterCouponCodeAddedTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontFreeShippingRecalculationAfterCouponCodeAddedTest.xml
index af3a2e6870cd7..8d508f381c765 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontFreeShippingRecalculationAfterCouponCodeAddedTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontFreeShippingRecalculationAfterCouponCodeAddedTest.xml
@@ -33,7 +33,9 @@
             <createData entity="FlatRateShippingMethodConfig" stepKey="enableFlatRate"/>
             <createData entity="FreeShippingMethodsSettingConfig" stepKey="freeShippingMethodsSettingConfig"/>
             <createData entity="MinimumOrderAmount90" stepKey="minimumOrderAmount90"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache1"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <actionGroup ref="AdminCreateCartPriceRuleWithCouponCodeActionGroup" stepKey="createCartPriceRule">
                 <argument name="ruleName" value="CatPriceRule"/>
                 <argument name="couponCode" value="CatPriceRule.coupon_code"/>
@@ -50,7 +52,10 @@
             <createData entity="DefaultShippingMethodsConfig" stepKey="defaultShippingMethodsConfig"/>
             <createData entity="DefaultMinimumOrderAmount" stepKey="defaultMinimumOrderAmount"/>
             <deleteData createDataKey="createSimpleUsCustomer" stepKey="deleteCustomer"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache2"/>
+
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <actionGroup ref="DeleteCartPriceRuleByName" stepKey="deleteCartPriceRule">
                 <argument name="ruleName" value="{{CatPriceRule.name}}"/>
             </actionGroup>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddBundleDynamicProductToShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddBundleDynamicProductToShoppingCartTest.xml
index e82f3c0588835..38597d690ad37 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddBundleDynamicProductToShoppingCartTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddBundleDynamicProductToShoppingCartTest.xml
@@ -46,8 +46,12 @@
                 <requiredEntity createDataKey="createBundleOption1_1"/>
                 <requiredEntity createDataKey="simpleProduct2"/>
             </createData>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddBundleDynamicProductToShoppingCartWithDisableMiniCartSidebarTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddBundleDynamicProductToShoppingCartWithDisableMiniCartSidebarTest.xml
index 5d5e2b3a91f49..edb6f8ba97b27 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddBundleDynamicProductToShoppingCartWithDisableMiniCartSidebarTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddBundleDynamicProductToShoppingCartWithDisableMiniCartSidebarTest.xml
@@ -49,8 +49,12 @@
                 <requiredEntity createDataKey="createBundleOption1_1"/>
                 <requiredEntity createDataKey="simpleProduct2"/>
             </createData>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
@@ -111,7 +115,9 @@
 
         <!--Enabled Mini Cart -->
         <magentoCLI stepKey="enableShoppingCartSidebar" command="config:set checkout/sidebar/display 1"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
         <reloadPage stepKey="reloadThePage"/>
 
         <!--Click on mini cart-->
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddConfigurableProductToShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddConfigurableProductToShoppingCartTest.xml
index 21e785de6cab3..146ecde047016 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddConfigurableProductToShoppingCartTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddConfigurableProductToShoppingCartTest.xml
@@ -110,8 +110,12 @@
                 <requiredEntity createDataKey="createConfigProduct"/>
                 <requiredEntity createDataKey="createConfigChildProduct3"/>
             </createData>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteSimpleProduct1"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddDownloadableProductToShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddDownloadableProductToShoppingCartTest.xml
index bbc0a29000a77..4f54363bd8dc4 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddDownloadableProductToShoppingCartTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddDownloadableProductToShoppingCartTest.xml
@@ -28,8 +28,12 @@
             <createData entity="downloadableLink2" stepKey="addDownloadableLink2">
                 <requiredEntity createDataKey="createDownloadableProduct"/>
             </createData>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove example.com static.magento.com"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddGroupedProductToShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddGroupedProductToShoppingCartTest.xml
index 3e2f32a4ab055..13a179fe52444 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddGroupedProductToShoppingCartTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddGroupedProductToShoppingCartTest.xml
@@ -43,7 +43,9 @@
                 <requiredEntity createDataKey="product"/>
                 <requiredEntity createDataKey="simple3"/>
             </updateData>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="simple1" stepKey="deleteProduct1"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddOneBundleMultiSelectOptionToTheShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddOneBundleMultiSelectOptionToTheShoppingCartTest.xml
index af12aecb6345a..eff18f9081b67 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddOneBundleMultiSelectOptionToTheShoppingCartTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddOneBundleMultiSelectOptionToTheShoppingCartTest.xml
@@ -46,8 +46,12 @@
                 <requiredEntity createDataKey="createBundleOption1_1"/>
                 <requiredEntity createDataKey="simpleProduct2"/>
             </createData>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddProductWithAllTypesOfCustomOptionToTheShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddProductWithAllTypesOfCustomOptionToTheShoppingCartTest.xml
index e8a72b6e88109..6cf5a390a964d 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddProductWithAllTypesOfCustomOptionToTheShoppingCartTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddProductWithAllTypesOfCustomOptionToTheShoppingCartTest.xml
@@ -23,7 +23,9 @@
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
             <updateData createDataKey="createProduct" entity="productWithOptions" stepKey="updateProductWithCustomOptions"/>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData  createDataKey="createCategory" stepKey="deleteCategory"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddTwoBundleMultiSelectOptionsToTheShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddTwoBundleMultiSelectOptionsToTheShoppingCartTest.xml
index 265f9a7cbbc98..cd1c0542c5c5b 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddTwoBundleMultiSelectOptionsToTheShoppingCartTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddTwoBundleMultiSelectOptionsToTheShoppingCartTest.xml
@@ -46,8 +46,12 @@
                 <requiredEntity createDataKey="createBundleOption1_1"/>
                 <requiredEntity createDataKey="simpleProduct2"/>
             </createData>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCartAndSummaryBlockItemDisplayWithDefaultDisplayLimitationTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCartAndSummaryBlockItemDisplayWithDefaultDisplayLimitationTest.xml
index 0b52caa7165af..4c0484f88d549 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCartAndSummaryBlockItemDisplayWithDefaultDisplayLimitationTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCartAndSummaryBlockItemDisplayWithDefaultDisplayLimitationTest.xml
@@ -51,7 +51,9 @@
             <createData entity="SimpleProduct2" stepKey="simpleProduct10">
                 <field key="price">100.00</field>
             </createData>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCartItemDisplayWhenMoreItemsAddedToTheCartThanDefaultDisplayLimitTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCartItemDisplayWhenMoreItemsAddedToTheCartThanDefaultDisplayLimitTest.xml
index a496ff68c0cd0..b399d76e86e2f 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCartItemDisplayWhenMoreItemsAddedToTheCartThanDefaultDisplayLimitTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCartItemDisplayWhenMoreItemsAddedToTheCartThanDefaultDisplayLimitTest.xml
@@ -54,8 +54,12 @@
             <createData entity="SimpleProduct2" stepKey="simpleProduct11">
                 <field key="price">110.00</field>
             </createData>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCartItemDisplayWithDefaultDisplayLimitAndDefaultTotalQuantityTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCartItemDisplayWithDefaultDisplayLimitAndDefaultTotalQuantityTest.xml
index 8e84deafea9f2..e0aeb2f93d30c 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCartItemDisplayWithDefaultDisplayLimitAndDefaultTotalQuantityTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCartItemDisplayWithDefaultDisplayLimitAndDefaultTotalQuantityTest.xml
@@ -49,7 +49,9 @@
             <createData entity="SimpleProduct2" stepKey="simpleProduct10">
                 <field key="price">100.00</field>
             </createData>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckSimpleProductCartItemDisplayWithDefaultLimitationTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckSimpleProductCartItemDisplayWithDefaultLimitationTest.xml
index 79e46d093c2f6..ce6d465408382 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckSimpleProductCartItemDisplayWithDefaultLimitationTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckSimpleProductCartItemDisplayWithDefaultLimitationTest.xml
@@ -54,7 +54,9 @@
             <createData entity="SimpleProduct2" stepKey="simpleProduct11">
                 <field key="price">110.00</field>
             </createData>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckVirtualProductCountDisplayWithCustomDisplayConfigurationTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckVirtualProductCountDisplayWithCustomDisplayConfigurationTest.xml
index 9f3eacbf5f455..c1dc0b7e62ba7 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckVirtualProductCountDisplayWithCustomDisplayConfigurationTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckVirtualProductCountDisplayWithCustomDisplayConfigurationTest.xml
@@ -34,7 +34,9 @@
             <createData entity="VirtualProduct" stepKey="virtualProduct4">
                 <field key="price">40.00</field>
             </createData>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="virtualProduct1" stepKey="deleteProduct1"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutDisabledBundleProductTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutDisabledBundleProductTest.xml
index 27d4e4c207ae7..e25fec16e0ca5 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutDisabledBundleProductTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutDisabledBundleProductTest.xml
@@ -36,8 +36,12 @@
                 <requiredEntity createDataKey="bundleOption"/>
                 <requiredEntity createDataKey="createSimpleProduct"/>
             </createData>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="cacheFlush"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <!-- Delete category -->
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithDifferentShippingAndBillingAddressAndProductWithTierPricesTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithDifferentShippingAndBillingAddressAndProductWithTierPricesTest.xml
index 38efc9d7eca24..2cfb4ad3d1989 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithDifferentShippingAndBillingAddressAndProductWithTierPricesTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithDifferentShippingAndBillingAddressAndProductWithTierPricesTest.xml
@@ -33,7 +33,9 @@
                 <argument name="price" value="Fixed"/>
                 <argument name="amount" value="24.00"/>
             </actionGroup>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set {{DisablePaymentBankTransferConfigData.path}} {{DisablePaymentBankTransferConfigData.value}}" stepKey="enableGuestCheckout"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithSpecialPriceProductsTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithSpecialPriceProductsTest.xml
index 0042c73b13826..e97f17ab5f917 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithSpecialPriceProductsTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithSpecialPriceProductsTest.xml
@@ -90,8 +90,12 @@
             <click selector="{{AdminProductFormAdvancedPricingSection.save}}" stepKey="clickSaveProduct1"/>
             <waitForPageLoad time='60' stepKey="waitForSpecialPriceProductSaved"/>
             <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSaveSuccessMessage1"/>
-            <magentoCLI command="indexer:reindex"  stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTest.xml
index b5f573aba7561..e97f7f0d3e8e4 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTest.xml
@@ -23,7 +23,9 @@
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithMultipleAddressesAndTaxRatesTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithMultipleAddressesAndTaxRatesTest.xml
index 4c3c1561a2445..03ca968c9a000 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithMultipleAddressesAndTaxRatesTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithMultipleAddressesAndTaxRatesTest.xml
@@ -44,8 +44,12 @@
             <click stepKey="clickSave" selector="{{AdminStoresMainActionsSection.saveButton}}"/>
 
             <!--TODO: REMOVE AFTER FIX MC-21717 -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush full_page" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value="full_page"/>
+            </actionGroup>
         </before>
         <after>
             <!-- Go to the tax rule page and delete the row we created-->
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithRestrictedCountriesForPaymentTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithRestrictedCountriesForPaymentTest.xml
index d042a15e3c958..5e5c37cc9e486 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithRestrictedCountriesForPaymentTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithRestrictedCountriesForPaymentTest.xml
@@ -28,8 +28,12 @@
             <createData entity="Simple_US_Customer" stepKey="simpleuscustomer"/>
 
             <!-- Perform reindex and flush cache -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteBundleProductFromMiniShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteBundleProductFromMiniShoppingCartTest.xml
index d116d0049c9df..6e304ff9cfb50 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteBundleProductFromMiniShoppingCartTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteBundleProductFromMiniShoppingCartTest.xml
@@ -40,7 +40,9 @@
                 <requiredEntity createDataKey="createBundleOption1_1"/>
                 <requiredEntity createDataKey="simpleProduct1"/>
             </createData>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteConfigurableProductFromMiniShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteConfigurableProductFromMiniShoppingCartTest.xml
index eb8b047b57288..d012d44d84052 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteConfigurableProductFromMiniShoppingCartTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteConfigurableProductFromMiniShoppingCartTest.xml
@@ -63,8 +63,12 @@
                 <requiredEntity createDataKey="createConfigProduct"/>
                 <requiredEntity createDataKey="createConfigChildProduct1"/>
             </createData>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData  createDataKey="createConfigChildProduct1" stepKey="deleteSimpleProduct1"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteDownloadableProductFromMiniShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteDownloadableProductFromMiniShoppingCartTest.xml
index 8a52fa7740b95..d2bcaedb74fd1 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteDownloadableProductFromMiniShoppingCartTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteDownloadableProductFromMiniShoppingCartTest.xml
@@ -27,8 +27,12 @@
             <createData entity="downloadableLink1" stepKey="addDownloadableLink1">
                 <requiredEntity createDataKey="createDownloadableProduct"/>
             </createData>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove example.com static.magento.com"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest/StorefrontGuestCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest/StorefrontGuestCheckoutTest.xml
index 0d69306a4b1ba..be5cf143f13dc 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest/StorefrontGuestCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest/StorefrontGuestCheckoutTest.xml
@@ -24,8 +24,12 @@
             </createData>
 
             <!-- Perform reindex and flush cache -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest/StorefrontGuestCheckoutTestWithRestrictedCountriesForPaymentTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest/StorefrontGuestCheckoutTestWithRestrictedCountriesForPaymentTest.xml
index 0520accdd4b84..7660df18407d5 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest/StorefrontGuestCheckoutTestWithRestrictedCountriesForPaymentTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest/StorefrontGuestCheckoutTestWithRestrictedCountriesForPaymentTest.xml
@@ -24,8 +24,12 @@
             </createData>
             <magentoCLI stepKey="allowSpecificValue" command="config:set payment/checkmo/allowspecific 1"/>
             <magentoCLI stepKey="specificCountryValue" command="config:set payment/checkmo/specificcountry GB"/>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml
index dbb695fb4fb00..53155a34336a6 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml
@@ -90,8 +90,12 @@
                 <requiredEntity createDataKey="createBundleOption1_1"/>
                 <requiredEntity createDataKey="simpleProduct2"/>
             </createData>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <actionGroup ref="AdminDeleteTaxRule" stepKey="deleteTaxRule">
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdatePriceInShoppingCartAfterProductSaveTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdatePriceInShoppingCartAfterProductSaveTest.xml
index 12e2820821c87..a7a0917532dcb 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdatePriceInShoppingCartAfterProductSaveTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUpdatePriceInShoppingCartAfterProductSaveTest.xml
@@ -30,7 +30,9 @@
         <after>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
             <actionGroup ref="SetCustomerDataLifetimeActionGroup" stepKey="setDefaultCustomerDataLifetime"/>
-            <magentoCLI command="indexer:reindex customer_grid" stepKey="reindexCustomerGrid"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexCustomerGrid">
+                <argument name="indices" value="customer_grid"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!--Go to product page-->
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontVerifySecureURLRedirectCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontVerifySecureURLRedirectCheckoutTest.xml
index 778967c187f65..b7c1d7b83e9b7 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontVerifySecureURLRedirectCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontVerifySecureURLRedirectCheckoutTest.xml
@@ -36,11 +36,15 @@
             <executeJS function="return window.location.host" stepKey="hostname"/>
             <magentoCLI command="config:set web/secure/base_url https://{$hostname}/" stepKey="setSecureBaseURL"/>
             <magentoCLI command="config:set web/secure/use_in_frontend 1" stepKey="useSecureURLsOnStorefront"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set web/secure/use_in_frontend 0" stepKey="dontUseSecureURLsOnStorefront"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <deleteData createDataKey="product" stepKey="deleteProduct"/>
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
         </after>
diff --git a/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml b/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml
index 5327979154389..d0edd4cf1cb64 100644
--- a/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml
+++ b/app/code/Magento/Config/Test/Mftf/Test/CheckingCountryDropDownWithOneAllowedCountryTest.xml
@@ -22,7 +22,9 @@
             <createData entity="EnableAdminAccountAllowCountry" stepKey="setAllowedCountries"/>
         </before>
         <after>
-            <magentoCLI stepKey="flushCache" command="cache:flush"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <createData entity="DisableAdminAccountAllowCountry" stepKey="setDefaultValueForAllowCountries"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomer">
@@ -33,7 +35,9 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
          <!--Flush Magento Cache-->
-        <magentoCLI stepKey="flushCache" command="cache:flush"/>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
          <!--Create a customer account from Storefront-->
         <actionGroup ref="StorefrontOpenCustomerAccountCreatePageActionGroup" stepKey="openCreateAccountPage"/>
         <actionGroup ref="StorefrontFillCustomerAccountCreationFormActionGroup" stepKey="fillCreateAccountForm">
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductLongSkuTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductLongSkuTest.xml
index 10cdcea2855d6..8362fcd980d65 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductLongSkuTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductLongSkuTest.xml
@@ -91,7 +91,9 @@
         <see selector="{{AdminProductFormConfigurationsSection.currentVariationsPriceCells}}" userInput="{{ProductWithLongNameSku.price}}" stepKey="seeConfigurationsPrice"/>
 
         <!--Run re-index task-->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
 
          <!--Assert storefront category list page-->
         <amOnPage url="/" stepKey="amOnStorefront"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithCreatingCategoryAndAttributeTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithCreatingCategoryAndAttributeTest.xml
index 32117fdfe4366..f53465b6536d7 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithCreatingCategoryAndAttributeTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithCreatingCategoryAndAttributeTest.xml
@@ -102,7 +102,9 @@
         </actionGroup>
 
         <!-- Flash cache -->
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!--Assert configurable product in category -->
         <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithDisabledChildrenProductsTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithDisabledChildrenProductsTest.xml
index 3bf5666d5a997..2d6692c22310a 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithDisabledChildrenProductsTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithDisabledChildrenProductsTest.xml
@@ -111,7 +111,9 @@
         <actionGroup ref="DisplayOutOfStockProductActionGroup" stepKey="displayOutOfStockProduct"/>
 
         <!-- Flash cache -->
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!-- Assert configurable product is not present in category -->
         <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithImagesTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithImagesTest.xml
index fa8866fa7d91c..f2d419d4789fa 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithImagesTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithImagesTest.xml
@@ -133,7 +133,9 @@
         <actionGroup ref="SaveConfigurableProductAddToCurrentAttributeSetActionGroup" stepKey="saveProduct"/>
 
         <!--Run re-index task-->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
 
         <!-- Assert configurable product in category -->
         <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithThreeProductDisplayOutOfStockProductsTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithThreeProductDisplayOutOfStockProductsTest.xml
index e76d14f3a6aae..6c23478bde44a 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithThreeProductDisplayOutOfStockProductsTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithThreeProductDisplayOutOfStockProductsTest.xml
@@ -125,7 +125,9 @@
         <actionGroup ref="DisplayOutOfStockProductActionGroup" stepKey="displayOutOfStockProduct"/>
 
         <!-- Flash cache -->
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!--Assert configurable product in category -->
         <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithThreeProductDontDisplayOutOfStockProductsTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithThreeProductDontDisplayOutOfStockProductsTest.xml
index 9516216d4a62e..7edf2575e55d6 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithThreeProductDontDisplayOutOfStockProductsTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithThreeProductDontDisplayOutOfStockProductsTest.xml
@@ -121,7 +121,9 @@
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveConfigurableProduct"/>
 
         <!-- Flash cache -->
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!--Assert configurable product in category -->
         <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsAssignedToCategoryTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsAssignedToCategoryTest.xml
index f2a8e78523758..245c93e865323 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsAssignedToCategoryTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsAssignedToCategoryTest.xml
@@ -106,7 +106,9 @@
         <click selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="clickClearFiltersAfter"/>
 
         <!-- Flash cache -->
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!--Assert configurable product in category -->
         <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsWithoutAssignedToCategoryTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsWithoutAssignedToCategoryTest.xml
index 273e37089973b..e9f0ac9a2e88b 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsWithoutAssignedToCategoryTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsWithoutAssignedToCategoryTest.xml
@@ -96,7 +96,9 @@
         <click selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="clickClearFiltersAfter"/>
 
         <!-- Flash cache -->
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!-- Assert configurable product on product page -->
         <amOnPage url="{{ApiConfigurableProduct.urlKey}}.html" stepKey="amOnProductPage"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
index 13c4cad312188..e34bf7c22f06b 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml
@@ -78,8 +78,12 @@
 
             <!-- Reindex invalidated indices after product attribute has been created/deleted -->
             <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
-            <magentoCLI command="indexer:reindex" stepKey="reindexAll"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexAll">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </after>
 
         <!-- Verify Configurable Product in checkout cart items -->
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml
index fbf23597a3927..0a781069b2f8c 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml
@@ -145,8 +145,12 @@
             <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
         </after>
 
-        <magentoCLI command="indexer:reindex" stepKey="reindexAll"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexAll">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!-- Quick search the storefront for the first attribute option -->
         <amOnPage stepKey="goToStoreFront" url="{{StorefrontHomePage.url}}"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductViewTest/StorefrontConfigurableProductGridViewTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductViewTest/StorefrontConfigurableProductGridViewTest.xml
index ca0426f1b97d5..e20a6dcfa09b8 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductViewTest/StorefrontConfigurableProductGridViewTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductViewTest/StorefrontConfigurableProductGridViewTest.xml
@@ -27,8 +27,12 @@
                 <argument name="category" value="$$createCategory$$"/>
             </actionGroup>
             <!-- TODO: REMOVE AFTER FIX MC-21717 -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush eav" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value="eav"/>
+            </actionGroup>
         </before>
 
         <after>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontShouldSeeOnlyConfigurableProductChildAssignedToSeparateCategoryTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontShouldSeeOnlyConfigurableProductChildAssignedToSeparateCategoryTest.xml
index 7662779a6955f..3519503c1e287 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontShouldSeeOnlyConfigurableProductChildAssignedToSeparateCategoryTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontShouldSeeOnlyConfigurableProductChildAssignedToSeparateCategoryTest.xml
@@ -112,7 +112,9 @@
             <argument name="categoryName" value="$$secondCategory.name$$"/>
         </actionGroup>
 
-        <magentoCLI command="indexer:reindex" arguments="catalogsearch_fulltext" stepKey="reindexSearchIndex"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexSearchIndex">
+            <argument name="indices" value="catalogsearch_fulltext"/>
+        </actionGroup>
 
         <!-- Go to storefront to view child product -->
         <actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="goToSecondCategoryStorefront">
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml
index ef9f71da0ebca..363a8ea4d4fd6 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml
@@ -153,8 +153,12 @@
             <argument name="discountAmount" value="{{CatalogRuleByPercentWith96Amount.discount_amount}}"/>
         </actionGroup>
         <actionGroup ref="AdminCatalogPriceRuleSaveAndApplyActionGroup" stepKey="saveAndApplyCatalogPriceRule"/>
-        <magentoCLI command="indexer:reindex" arguments="catalogsearch_fulltext catalog_category_product catalog_product_price catalogrule_rule" stepKey="reindexIndices"/>
-        <magentoCLI command="cache:clean" arguments="full_page" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexIndices">
+            <argument name="indices" value="catalogsearch_fulltext catalog_category_product catalog_product_price catalogrule_rule"/>
+        </actionGroup>
+        <actionGroup ref="CliCacheCleanActionGroup" stepKey="fullCache">
+            <argument name="tags" value="full_page"/>
+        </actionGroup>
 
         <!--Reopen category with products and Sort by price desc-->
         <actionGroup ref="GoToStorefrontCategoryPageByParametersActionGroup" stepKey="goToStorefrontCategoryPage2">
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVerifyConfigurableProductLayeredNavigationTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVerifyConfigurableProductLayeredNavigationTest.xml
index 7acece767760d..9777722b6faf5 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVerifyConfigurableProductLayeredNavigationTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVerifyConfigurableProductLayeredNavigationTest.xml
@@ -139,7 +139,9 @@
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
 
         <!--Run re-index task-->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
 
         <!--Open Category in Store Front and select product attribute option from sidebar -->
         <actionGroup ref="SelectStorefrontSideBarAttributeOption" stepKey="selectStorefrontProductAttributeOption">
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVisibilityOfDuplicateProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVisibilityOfDuplicateProductTest.xml
index 801dfdb8540e8..976be77122547 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVisibilityOfDuplicateProductTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVisibilityOfDuplicateProductTest.xml
@@ -190,8 +190,12 @@
         <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="generateConfigsForDuplicatedProduct"/>
         <waitForPageLoad stepKey="waitForDuplicatedProductPageLoad"/>
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveDuplicatedProduct"/>
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
         <!--Assert configurable product in category-->
         <comment userInput="Assert configurable product in category" stepKey="commentAssertProductInCategoryPage"/>
         <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onStorefrontCategoryPage"/>
diff --git a/app/code/Magento/Contact/Test/Mftf/Test/StorefrontVerifySecureURLRedirectContactTest.xml b/app/code/Magento/Contact/Test/Mftf/Test/StorefrontVerifySecureURLRedirectContactTest.xml
index 0c46ed4729d66..2300740f23c7d 100644
--- a/app/code/Magento/Contact/Test/Mftf/Test/StorefrontVerifySecureURLRedirectContactTest.xml
+++ b/app/code/Magento/Contact/Test/Mftf/Test/StorefrontVerifySecureURLRedirectContactTest.xml
@@ -25,11 +25,15 @@
             <executeJS function="return window.location.host" stepKey="hostname"/>
             <magentoCLI command="config:set web/secure/base_url https://{$hostname}/" stepKey="setSecureBaseURL"/>
             <magentoCLI command="config:set web/secure/use_in_frontend 1" stepKey="useSecureURLsOnStorefront"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set web/secure/use_in_frontend 0" stepKey="dontUseSecureURLsOnStorefront"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </after>
         <executeJS function="return window.location.host" stepKey="hostname"/>
         <amOnUrl url="http://{$hostname}/contact" stepKey="goToUnsecureContactURL"/>
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminCurrencyConverterAPIConfigurationTest.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminCurrencyConverterAPIConfigurationTest.xml
index f7e6e05347345..5cfb4b8f0bb2e 100644
--- a/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminCurrencyConverterAPIConfigurationTest.xml
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminCurrencyConverterAPIConfigurationTest.xml
@@ -26,7 +26,9 @@
             <!--Set currency allow config-->
             <magentoCLI command="config:set currency/options/allow RHD,CHW,CHE,AMD,EUR,USD" stepKey="setCurrencyAllow"/>
             <!--TODO: Add Api key-->
-            <magentoCLI command="cache:flush" stepKey="clearCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <!--Create product-->
             <createData entity="SimpleSubCategory" stepKey="createCategory"/>
             <createData entity="SimpleProduct" stepKey="createProduct">
@@ -68,7 +70,9 @@
         <see selector="{{StorefrontCategoryMainSection.productPrice}}" userInput="€" stepKey="seeEURInPrice"/>
         <!--Set allowed currencies greater then 10-->
         <magentoCLI command="config:set currency/options/allow RHD,CHW,YER,ZMK,CHE,EUR,USD,AMD,RUB,DZD,ARS,AWG" stepKey="setCurrencyAllow"/>
-        <magentoCLI command="cache:flush" stepKey="clearCache"/>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
         <!--Import rates from Currency Converter API with currencies greater then 10-->
         <amOnPage url="{{AdminCurrencyRatesPage.url}}" stepKey="onCurrencyRatePageSecondTime"/>
         <actionGroup ref="AdminImportCurrencyRatesActionGroup" stepKey="importCurrencyRatesGreaterThen10">
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCheckDefaultValueDisableAutoGroupChangeIsNoTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCheckDefaultValueDisableAutoGroupChangeIsNoTest.xml
index ab5e332aeed64..6aec5440193a2 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCheckDefaultValueDisableAutoGroupChangeIsNoTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCheckDefaultValueDisableAutoGroupChangeIsNoTest.xml
@@ -20,7 +20,9 @@
         </annotations>
         <before>
             <magentoCLI command="config:set customer/create_account/viv_disable_auto_group_assign_default 0" stepKey="setConfigDefaultIsNo"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
         </before>
         <after>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCheckDefaultValueDisableAutoGroupChangeIsYesTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCheckDefaultValueDisableAutoGroupChangeIsYesTest.xml
index 0bf221d49ab74..d48fb90b24ec2 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCheckDefaultValueDisableAutoGroupChangeIsYesTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCheckDefaultValueDisableAutoGroupChangeIsYesTest.xml
@@ -20,12 +20,16 @@
         </annotations>
         <before>
             <magentoCLI command="config:set customer/create_account/viv_disable_auto_group_assign_default 1" stepKey="setConfigDefaultIsYes"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
         </before>
         <after>
             <magentoCLI command="config:set customer/create_account/viv_disable_auto_group_assign_default 0" stepKey="setConfigDefaultIsNo"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
         </after>
 
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml
index 64e8520323184..cb003ed837294 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml
@@ -20,7 +20,9 @@
             <group value="create"/>
         </annotations>
         <before>
-            <magentoCLI command="indexer:reindex customer_grid" stepKey="reindexCustomerGrid"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexCustomerGrid">
+                <argument name="indices" value="customer_grid"/>
+            </actionGroup>
         </before>
         <after>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
@@ -35,7 +37,9 @@
         <fillField userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerAccountInformationSection.email}}" stepKey="fillEmail"/>
         <click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="saveCustomer"/>
         <seeElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="assertSuccessMessage"/>
-        <magentoCLI stepKey="reindex" command="indexer:reindex"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
         <reloadPage stepKey="reloadPage"/>
         <waitForPageLoad stepKey="waitForLoad2"/>
         <click selector="{{AdminCustomerFiltersSection.filtersButton}}" stepKey="openFilter"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCustomGroupTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCustomGroupTest.xml
index 52a2483096aaf..61d82ab010afa 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCustomGroupTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCustomGroupTest.xml
@@ -39,7 +39,9 @@
         <fillField userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerAccountInformationSection.email}}" stepKey="fillEmail"/>
         <click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="saveCustomer"/>
         <seeElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="assertSuccessMessage"/>
-        <magentoCLI stepKey="flushMagentoCache" command="cache:flush" />
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
         <reloadPage stepKey="reloadPage"/>
 
         <!--Verify Customer in grid -->
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridTest.xml
index 8494a94f0c122..615a6ebcf24cc 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridTest.xml
@@ -20,7 +20,9 @@
 
         <before>
             <createData entity="Simple_US_Customer_Multiple_Addresses" stepKey="createCustomer"/>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>
         <after>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridViaMassActionsTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridViaMassActionsTest.xml
index 340295df04da2..57446a1ee0c72 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridViaMassActionsTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridViaMassActionsTest.xml
@@ -20,7 +20,9 @@
 
         <before>
             <createData entity="Simple_US_Customer_Multiple_Addresses" stepKey="createCustomer"/>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>
         <after>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteDefaultBillingCustomerAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteDefaultBillingCustomerAddressTest.xml
index 1630743da4922..f08ea83a70da6 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteDefaultBillingCustomerAddressTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteDefaultBillingCustomerAddressTest.xml
@@ -20,7 +20,9 @@
 
         <before>
             <createData entity="Simple_US_Customer_Multiple_Addresses" stepKey="createCustomer"/>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>
         <after>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminResetCustomerPasswordTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminResetCustomerPasswordTest.xml
index 5721c46d5e4b9..257d4c9b2e3c2 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminResetCustomerPasswordTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminResetCustomerPasswordTest.xml
@@ -25,8 +25,12 @@
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
         <!--Edit customer info-->
         <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="OpenEditCustomerFrom">
             <argument name="customer" value="$$customer$$"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminSearchCustomerAddressByKeywordTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminSearchCustomerAddressByKeywordTest.xml
index 10da9284d45dc..b13a06b9ef858 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminSearchCustomerAddressByKeywordTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminSearchCustomerAddressByKeywordTest.xml
@@ -20,7 +20,9 @@
 
         <before>
             <createData entity="Simple_US_Customer_Multiple_Addresses" stepKey="createCustomer"/>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>
         <after>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminUpdateCustomerTest/AdminDeleteCustomerAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminUpdateCustomerTest/AdminDeleteCustomerAddressTest.xml
index c9805ebcc90ed..3f95e55c56132 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminUpdateCustomerTest/AdminDeleteCustomerAddressTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminUpdateCustomerTest/AdminDeleteCustomerAddressTest.xml
@@ -20,7 +20,9 @@
         </annotations>
         <before>
             <createData stepKey="customer" entity="Simple_US_Customer_Multiple_Addresses"/>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>
         <after>
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 0d550416167aa..8af07bc2c2d53 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminUpdateCustomerTest/AdminUpdateCustomerInfoFromDefaultToNonDefaultTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminUpdateCustomerTest/AdminUpdateCustomerInfoFromDefaultToNonDefaultTest.xml
@@ -20,7 +20,9 @@
         </annotations>
         <before>
             <createData stepKey="customer" entity="Simple_Customer_Without_Address"/>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>
         <after>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml
index 60caaf64f05b7..9b26391d0b162 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml
@@ -42,7 +42,9 @@
             <!--Set account sharing option - Default value is 'Per Website'-->
             <comment userInput="Set account sharing option - Default value is 'Per Website'" stepKey="setAccountSharingOption"/>
             <createData entity="CustomerAccountSharingDefault" stepKey="setToAccountSharingToDefault"/>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
         </before>
         <after>
             <!--delete all created data and set main website country options to default-->
@@ -60,8 +62,12 @@
             <actionGroup ref="SetWebsiteCountryOptionsToDefaultActionGroup" stepKey="setCountryOptionsToDefault"/>
             <createData entity="CustomerAccountSharingSystemValue" stepKey="setAccountSharingToSystemValue"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </after>
         <!--Check that all countries are allowed initially and get amount-->
         <comment userInput="Check that all countries are allowed initially and get amount" stepKey="checkAllCountriesAreAllowed"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontClearAllCompareProductsTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontClearAllCompareProductsTest.xml
index 317f2c2825ca7..81208da18373c 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontClearAllCompareProductsTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontClearAllCompareProductsTest.xml
@@ -102,8 +102,12 @@
                 <requiredEntity createDataKey="createDownloadableProduct1"/>
             </createData>
 
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
 
             <!-- Login -->
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerWithDateOfBirthTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerWithDateOfBirthTest.xml
index 8cd35f4147636..47b61b332f571 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerWithDateOfBirthTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerWithDateOfBirthTest.xml
@@ -35,7 +35,9 @@
             <argument name="Customer" value="CustomerEntityOne"/>
             <argument name="dob" value="{{EN_US_DATE.short4DigitYear}}"/>
         </actionGroup>
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
         <actionGroup ref="DeleteCustomerByEmailActionGroup" stepKey="deleteNewUser">
             <argument name="email" value="{{CustomerEntityOne.email}}"/>
         </actionGroup>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontVerifySecureURLRedirectCustomerTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontVerifySecureURLRedirectCustomerTest.xml
index f504af2334e10..410070234b9c0 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontVerifySecureURLRedirectCustomerTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontVerifySecureURLRedirectCustomerTest.xml
@@ -25,11 +25,15 @@
             <executeJS function="return window.location.host" stepKey="hostname"/>
             <magentoCLI command="config:set web/secure/base_url https://{$hostname}/" stepKey="setSecureBaseURL"/>
             <magentoCLI command="config:set web/secure/use_in_frontend 1" stepKey="useSecureURLsOnStorefront"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set web/secure/use_in_frontend 0" stepKey="dontUseSecureURLsOnStorefront"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </after>
         <executeJS function="return window.location.host" stepKey="hostname"/>
         <amOnUrl url="http://{$hostname}/customer" stepKey="goToUnsecureCustomerURL"/>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithDefaultSetLinksTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithDefaultSetLinksTest.xml
index 850a73cd354a5..2c9cf38ab50ae 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithDefaultSetLinksTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithDefaultSetLinksTest.xml
@@ -24,8 +24,12 @@
             <!-- Create category -->
             <createData entity="SimpleSubCategory" stepKey="createCategory"/>
             <!-- Reindex and clear page cache -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" arguments="full_page" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value="full_page"/>
+            </actionGroup>
             <!-- Login as admin -->
             <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
         </before>
@@ -76,8 +80,12 @@
 
         <!-- Save product -->
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!-- Find downloadable product in grid -->
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontVerifySecureURLRedirectDownloadableTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontVerifySecureURLRedirectDownloadableTest.xml
index d7e0ce3b2ca22..5f89db581a7c1 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontVerifySecureURLRedirectDownloadableTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontVerifySecureURLRedirectDownloadableTest.xml
@@ -28,11 +28,15 @@
             <executeJS function="return window.location.host" stepKey="hostname"/>
             <magentoCLI command="config:set web/secure/base_url https://{$hostname}/" stepKey="setSecureBaseURL"/>
             <magentoCLI command="config:set web/secure/use_in_frontend 1" stepKey="useSecureURLsOnStorefront"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set web/secure/use_in_frontend 0" stepKey="dontUseSecureURLsOnStorefront"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
         </after>
         <executeJS function="return window.location.host" stepKey="hostname"/>
diff --git a/app/code/Magento/Elasticsearch/Test/Mftf/Suite/SearchEngineElasticsearchSuite.xml b/app/code/Magento/Elasticsearch/Test/Mftf/Suite/SearchEngineElasticsearchSuite.xml
index d612f5bd17a2f..c2c8644a6fcf5 100644
--- a/app/code/Magento/Elasticsearch/Test/Mftf/Suite/SearchEngineElasticsearchSuite.xml
+++ b/app/code/Magento/Elasticsearch/Test/Mftf/Suite/SearchEngineElasticsearchSuite.xml
@@ -9,8 +9,12 @@
     <suite name="SearchEngineElasticsearchSuite">
         <before>
             <magentoCLI stepKey="setSearchEngineToElasticsearch" command="config:set {{SearchEngineElasticsearchConfigData.path}} {{SearchEngineElasticsearchConfigData.value}}"/>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after></after>
         <include>
diff --git a/app/code/Magento/Elasticsearch/Test/Mftf/Test/StorefrontCheckAdvancedSearchOnElasticSearchTest.xml b/app/code/Magento/Elasticsearch/Test/Mftf/Test/StorefrontCheckAdvancedSearchOnElasticSearchTest.xml
index a94a6a2e3d133..1e067f1560404 100644
--- a/app/code/Magento/Elasticsearch/Test/Mftf/Test/StorefrontCheckAdvancedSearchOnElasticSearchTest.xml
+++ b/app/code/Magento/Elasticsearch/Test/Mftf/Test/StorefrontCheckAdvancedSearchOnElasticSearchTest.xml
@@ -36,7 +36,9 @@
 
             <!-- Reindex invalidated indices after product attribute has been created/deleted -->
             <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
-            <magentoCLI command="cache:flush" arguments="full_page" stepKey="flushFullPageCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushFullPageCache">
+                <argument name="tags" value="full_page"/>
+            </actionGroup>
         </before>
 
         <after>
diff --git a/app/code/Magento/Elasticsearch/Test/Mftf/Test/StorefrontProductQuickSearchWithDecimalAttributeUsingElasticSearchTest.xml b/app/code/Magento/Elasticsearch/Test/Mftf/Test/StorefrontProductQuickSearchWithDecimalAttributeUsingElasticSearchTest.xml
index d9988577009bc..1c4d53b273661 100644
--- a/app/code/Magento/Elasticsearch/Test/Mftf/Test/StorefrontProductQuickSearchWithDecimalAttributeUsingElasticSearchTest.xml
+++ b/app/code/Magento/Elasticsearch/Test/Mftf/Test/StorefrontProductQuickSearchWithDecimalAttributeUsingElasticSearchTest.xml
@@ -55,8 +55,12 @@
             <!--Delete attribute-->
             <deleteData createDataKey="customAttribute" stepKey="deleteCustomAttribute"/>
             <!--Reindex and clear cache-->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:clean" stepKey="cleanCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
         <!--Navigate to backend and update value for custom attribute -->
@@ -77,8 +81,12 @@
         </actionGroup>
 
         <!--Reindex and clear cache-->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:clean" stepKey="cleanCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
         <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToHomePage"/>
 
         <!-- Navigate to Storefront and search -->
diff --git a/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticSearchForChineseLocaleTest.xml b/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticSearchForChineseLocaleTest.xml
index a15c8f5e30e86..75e355126ff2b 100644
--- a/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticSearchForChineseLocaleTest.xml
+++ b/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticSearchForChineseLocaleTest.xml
@@ -26,7 +26,9 @@
             <magentoCLI command="config:set --scope={{GeneralLocalCodeConfigsForChina.scope}} --scope-code={{GeneralLocalCodeConfigsForChina.scope_code}} {{GeneralLocalCodeConfigsForChina.path}} {{GeneralLocalCodeConfigsForChina.value}}" stepKey="setLocaleToChina"/>
             <comment userInput="Moved to appropriate test suite" stepKey="enableElasticsearch6"/>
             <comment userInput="Moved to appropriate test suite" stepKey="checkConnection"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <createData entity="ApiCategory" stepKey="createCategory"/>
             <createData entity="ApiSimpleProduct" stepKey="createProduct">
                 <requiredEntity createDataKey="createCategory"/>
diff --git a/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticsearchSearchInvalidValueTest.xml b/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticsearchSearchInvalidValueTest.xml
index e173090bfa318..fa05908b29639 100644
--- a/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticsearchSearchInvalidValueTest.xml
+++ b/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticsearchSearchInvalidValueTest.xml
@@ -26,8 +26,12 @@
             <!--Set Minimal Query Length-->
             <magentoCLI command="config:set {{SetMinQueryLength2Config.path}} {{SetMinQueryLength2Config.value}}" stepKey="setMinQueryLength"/>
             <!--Reindex indexes and clear cache-->
-            <magentoCLI command="indexer:reindex catalogsearch_fulltext" stepKey="reindex"/>
-            <magentoCLI command="cache:flush config" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value="catalogsearch_fulltext"/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </before>
         <after>
             <!--Set configs to default-->
@@ -48,8 +52,12 @@
             <waitForPageLoad stepKey="waitForProductIndexPage"/>
             <actionGroup ref="DeleteProductsIfTheyExistActionGroup" stepKey="deleteProduct"/>
             <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetFiltersIfExist"/>
-            <magentoCLI command="indexer:reindex catalogsearch_fulltext" stepKey="reindex"/>
-            <magentoCLI command="cache:flush config" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value="catalogsearch_fulltext"/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!--Create new searchable product attribute-->
@@ -80,8 +88,12 @@
         <fillField selector="{{AdminProductFormSection.attributeRequiredInput(textProductAttribute.attribute_code)}}" userInput="searchable" stepKey="fillTheAttributeRequiredInputField"/>
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
         <!-- TODO: REMOVE AFTER FIX MC-21717 -->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush eav" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value="eav"/>
+        </actionGroup>
         <!--Assert search results on storefront-->
         <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStorefrontPage"/>
         <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchForFirstSearchTerm">
diff --git a/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontProductQuickSearchUsingElasticSearchTest.xml b/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontProductQuickSearchUsingElasticSearchTest.xml
index 9a025a6d04b14..653c460733976 100644
--- a/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontProductQuickSearchUsingElasticSearchTest.xml
+++ b/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontProductQuickSearchUsingElasticSearchTest.xml
@@ -31,7 +31,9 @@
             </createData>
             <magentoCLI command="config:set {{CustomGridPerPageValuesConfigData.path}} {{CustomGridPerPageValuesConfigData.value}}" stepKey="setCustomGridPerPageValues"/>
             <magentoCLI command="config:set {{CustomGridPerPageDefaultConfigData.path}} {{CustomGridPerPageDefaultConfigData.value}}" stepKey="setCustomGridPerPageDefaults"/>
-            <magentoCLI stepKey="flushConfigCache" command="cache:flush config"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushConfigCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
             <magentoCron groups="index" stepKey="runCronIndex"/>
         </before>
 
diff --git a/app/code/Magento/Fedex/Test/Mftf/Test/AdminCreatingShippingLabelTest.xml b/app/code/Magento/Fedex/Test/Mftf/Test/AdminCreatingShippingLabelTest.xml
index 1c61bd290f005..aea5fcf683ce2 100644
--- a/app/code/Magento/Fedex/Test/Mftf/Test/AdminCreatingShippingLabelTest.xml
+++ b/app/code/Magento/Fedex/Test/Mftf/Test/AdminCreatingShippingLabelTest.xml
@@ -50,8 +50,12 @@
             <magentoCLI command="config:set {{AdminShippingSettingsOriginZipCodeConfigData.path}} {{DE_Address_Berlin_Not_Default_Address.postcode}}" stepKey="setOriginZipCode"/>
             <magentoCLI command="config:set {{AdminShippingSettingsOriginStreetAddressConfigData.path}} '{{DE_Address_Berlin_Not_Default_Address.street[0]}}'" stepKey="setOriginStreetAddress"/>
             <magentoCLI command="config:set {{AdminShippingSettingsOriginStreetAddress2ConfigData.path}} '{{US_Address_California.street[0]}}'" stepKey="setOriginStreetAddress2"/>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <!--Reset configs-->
@@ -70,8 +74,12 @@
             <magentoCLI command="config:set {{AdminShippingSettingsOriginZipCodeConfigData.path}} ''" stepKey="setOriginZipCode"/>
             <magentoCLI command="config:set {{AdminShippingSettingsOriginStreetAddressConfigData.path}} ''" stepKey="setOriginStreetAddress"/>
             <magentoCLI command="config:set {{AdminShippingSettingsOriginStreetAddress2ConfigData.path}} ''" stepKey="setOriginStreetAddress2"/>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <!--Delete created data-->
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAssociateGroupedProductToWebsitesTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAssociateGroupedProductToWebsitesTest.xml
index bd6785eb5e41b..a909582c32b3d 100644
--- a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAssociateGroupedProductToWebsitesTest.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAssociateGroupedProductToWebsitesTest.xml
@@ -53,7 +53,9 @@
             </actionGroup>
 
             <!-- Reindex -->
-            <magentoCLI command="indexer:reindex" stepKey="reindexAllIndexes"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexAllIndexes">
+                <argument name="indices" value=""/>
+            </actionGroup>
         </before>
 
         <after>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest/AdvanceCatalogSearchGroupedProductByDescriptionTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest/AdvanceCatalogSearchGroupedProductByDescriptionTest.xml
index 599736e7e817e..4aa4e99e79489 100644
--- a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest/AdvanceCatalogSearchGroupedProductByDescriptionTest.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest/AdvanceCatalogSearchGroupedProductByDescriptionTest.xml
@@ -30,8 +30,12 @@
                 <requiredEntity createDataKey="product"/>
                 <requiredEntity createDataKey="simple2"/>
             </updateData>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest/AdvanceCatalogSearchGroupedProductByNameTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest/AdvanceCatalogSearchGroupedProductByNameTest.xml
index 853304c557c8f..06dde74de20f9 100644
--- a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest/AdvanceCatalogSearchGroupedProductByNameTest.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest/AdvanceCatalogSearchGroupedProductByNameTest.xml
@@ -30,8 +30,12 @@
                 <requiredEntity createDataKey="product"/>
                 <requiredEntity createDataKey="simple2"/>
             </updateData>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest/AdvanceCatalogSearchGroupedProductByPriceTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest/AdvanceCatalogSearchGroupedProductByPriceTest.xml
index 4e67f2bd50439..66e1b60331e97 100644
--- a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest/AdvanceCatalogSearchGroupedProductByPriceTest.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest/AdvanceCatalogSearchGroupedProductByPriceTest.xml
@@ -39,8 +39,12 @@
             <getData entity="GetProduct" stepKey="arg3">
                 <requiredEntity createDataKey="simple2"/>
             </getData>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest/AdvanceCatalogSearchGroupedProductByShortDescriptionTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest/AdvanceCatalogSearchGroupedProductByShortDescriptionTest.xml
index 4b86a2c085003..79b465abe2ac6 100644
--- a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest/AdvanceCatalogSearchGroupedProductByShortDescriptionTest.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest/AdvanceCatalogSearchGroupedProductByShortDescriptionTest.xml
@@ -30,8 +30,12 @@
                 <requiredEntity createDataKey="product"/>
                 <requiredEntity createDataKey="simple2"/>
             </updateData>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest/AdvanceCatalogSearchGroupedProductBySkuTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest/AdvanceCatalogSearchGroupedProductBySkuTest.xml
index 6e67e41fa447b..c196abbce99ed 100644
--- a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest/AdvanceCatalogSearchGroupedProductBySkuTest.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest/AdvanceCatalogSearchGroupedProductBySkuTest.xml
@@ -29,8 +29,12 @@
                 <requiredEntity createDataKey="product"/>
                 <requiredEntity createDataKey="simple2"/>
             </updateData>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/StorefrontAdvanceCatalogSearchGroupedProductBySkuWithHyphenTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/StorefrontAdvanceCatalogSearchGroupedProductBySkuWithHyphenTest.xml
index aaa9cf5b2f925..35f6d625b8ab3 100644
--- a/app/code/Magento/GroupedProduct/Test/Mftf/Test/StorefrontAdvanceCatalogSearchGroupedProductBySkuWithHyphenTest.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/StorefrontAdvanceCatalogSearchGroupedProductBySkuWithHyphenTest.xml
@@ -35,8 +35,12 @@
                 <requiredEntity createDataKey="product"/>
                 <requiredEntity createDataKey="simple2"/>
             </updateData>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
diff --git a/app/code/Magento/Indexer/Test/Mftf/Test/AdminSystemIndexManagementGridChangesTest.xml b/app/code/Magento/Indexer/Test/Mftf/Test/AdminSystemIndexManagementGridChangesTest.xml
index 84619a5213128..51cf4aa26a1b1 100644
--- a/app/code/Magento/Indexer/Test/Mftf/Test/AdminSystemIndexManagementGridChangesTest.xml
+++ b/app/code/Magento/Indexer/Test/Mftf/Test/AdminSystemIndexManagementGridChangesTest.xml
@@ -23,15 +23,23 @@
 
             <!--Open Index Management Page and Select Index mode "Update by Schedule" -->
             <magentoCLI command="indexer:set-mode" arguments="schedule" stepKey="setIndexerModeSchedule"/>
-            <magentoCLI command="indexer:reindex" stepKey="indexerReindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="indexerReindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/></before>
         <after>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <magentoCLI command="indexer:set-mode" arguments="realtime" stepKey="setIndexerModeRealTime"/>
-            <magentoCLI command="indexer:reindex" stepKey="indexerReindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="indexerReindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/Test/ShopByButtonInMobileTest.xml b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/ShopByButtonInMobileTest.xml
index cdd692763d399..49f2294b978ee 100644
--- a/app/code/Magento/LayeredNavigation/Test/Mftf/Test/ShopByButtonInMobileTest.xml
+++ b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/ShopByButtonInMobileTest.xml
@@ -50,8 +50,12 @@
         </actionGroup>
         <selectOption selector="{{AdminProductFormSection.customSelectField($$attribute.attribute[attribute_code]$$)}}" userInput="option1" stepKey="selectAttribute"/>
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveSimpleProduct"/>
-        <magentoCLI command="indexer:reindex" stepKey="reindexAll"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexAll">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
         <!-- Check storefront mobile view for shop by button is functioning as expected -->
         <comment userInput="Check storefront mobile view for shop by button is functioning as expected" stepKey="commentCheckShopByButton" />
         <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToHomePage"/>
diff --git a/app/code/Magento/Msrp/Test/Mftf/Test/StorefrontProductWithMapAssignedConfigProductIsCorrectTest.xml b/app/code/Magento/Msrp/Test/Mftf/Test/StorefrontProductWithMapAssignedConfigProductIsCorrectTest.xml
index 2bfb1239cba60..1a27bf5aa56a2 100644
--- a/app/code/Magento/Msrp/Test/Mftf/Test/StorefrontProductWithMapAssignedConfigProductIsCorrectTest.xml
+++ b/app/code/Magento/Msrp/Test/Mftf/Test/StorefrontProductWithMapAssignedConfigProductIsCorrectTest.xml
@@ -132,7 +132,9 @@
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
 
         <!--Clear cache-->
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!--Go to store front and check msrp for products-->
         <amOnPage url="{{StorefrontProductPage.url($$createConfigProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToConfigProductPage"/>
diff --git a/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontVerifySecureURLRedirectMultishippingTest.xml b/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontVerifySecureURLRedirectMultishippingTest.xml
index e65747f4d63d0..494259e0ead9d 100644
--- a/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontVerifySecureURLRedirectMultishippingTest.xml
+++ b/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontVerifySecureURLRedirectMultishippingTest.xml
@@ -41,11 +41,15 @@
             <executeJS function="return window.location.host" stepKey="hostname"/>
             <magentoCLI command="config:set web/secure/base_url https://{$hostname}/" stepKey="setSecureBaseURL"/>
             <magentoCLI command="config:set web/secure/use_in_frontend 1" stepKey="useSecureURLsOnStorefront"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set web/secure/use_in_frontend 0" stepKey="dontUseSecureURLsOnStorefront"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
             <deleteData createDataKey="product" stepKey="deleteProduct"/>
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/StorefrontVerifySecureURLRedirectNewsletterTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/StorefrontVerifySecureURLRedirectNewsletterTest.xml
index c38725f263525..8ae592a17d620 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/Test/StorefrontVerifySecureURLRedirectNewsletterTest.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/StorefrontVerifySecureURLRedirectNewsletterTest.xml
@@ -28,11 +28,15 @@
             <executeJS function="return window.location.host" stepKey="hostname"/>
             <magentoCLI command="config:set web/secure/base_url https://{$hostname}/" stepKey="setSecureBaseURL"/>
             <magentoCLI command="config:set web/secure/use_in_frontend 1" stepKey="useSecureURLsOnStorefront"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set web/secure/use_in_frontend 0" stepKey="dontUseSecureURLsOnStorefront"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
         </after>
         <executeJS function="return window.location.host" stepKey="hostname"/>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml
index d60034b8925d3..63b2741e7bd15 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/VerifySubscribedNewsletterDisplayedTest.xml
@@ -38,7 +38,9 @@
             </actionGroup>
 
             <actionGroup ref="EnableWebUrlOptionsActionGroup" stepKey="addStoreCodeToUrls"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
 
         <after>
@@ -48,8 +50,12 @@
                 <argument name="websiteName" value="{{customWebsite.name}}"/>
             </actionGroup>
             <actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearFilters"/>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
         </after>
 
diff --git a/app/code/Magento/PageCache/Test/Mftf/Test/AdminFrontendAreaSessionMustNotAffectAdminAreaTest.xml b/app/code/Magento/PageCache/Test/Mftf/Test/AdminFrontendAreaSessionMustNotAffectAdminAreaTest.xml
index d2c738398aae1..2d714e9ce5372 100644
--- a/app/code/Magento/PageCache/Test/Mftf/Test/AdminFrontendAreaSessionMustNotAffectAdminAreaTest.xml
+++ b/app/code/Magento/PageCache/Test/Mftf/Test/AdminFrontendAreaSessionMustNotAffectAdminAreaTest.xml
@@ -39,7 +39,9 @@
                 <requiredEntity createDataKey="createCategoryA"/>
             </createData>
 
-            <magentoCLI command="cache:clean" arguments="full_page" stepKey="clearCache"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+                <argument name="tags" value="full_page"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
             <resetCookie userInput="PHPSESSID" stepKey="resetSessionCookie"/>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Suite/InContextPaypalSuite.xml b/app/code/Magento/Paypal/Test/Mftf/Suite/InContextPaypalSuite.xml
index b52fc05ca5a11..44ec500722e58 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Suite/InContextPaypalSuite.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Suite/InContextPaypalSuite.xml
@@ -13,7 +13,9 @@
             <!--Config PayPal Express Checkout-->
             <actionGroup ref="ConfigPayPalExpressCheckoutActionGroup" stepKey="ConfigPayPalExpressCheckout"/>
             <!-- Configure PayPal Express Checkout -->
-            <magentoCLI command="cache:clean" arguments="config full_page" stepKey="cleanFullPageCache"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanFullPageCache">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
         </before>
         <after>
             <!-- Cleanup Paypal configurations -->
@@ -21,7 +23,9 @@
             <magentoCLI command="config:set {{StorefrontPaypalDisableInContextCheckoutConfigData.path}} {{StorefrontPaypalDisableInContextCheckoutConfigData.value}}" stepKey="disableInContextPayPal"/>
             <magentoCLI command="config:set {{StorefrontPaypalDisableConfigData.path}} {{StorefrontPaypalDisableConfigData.value}}" stepKey="disablePaypal"/>
             <createData entity="SamplePaypalConfig" stepKey="setDefaultPaypalConfig"/>
-            <magentoCLI command="cache:clean" arguments="config full_page" stepKey="cleanFullPageCache"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanFullPageCache">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
         </after>
         <include>
             <group name="paypalExpress"/>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontCheckPayPalSmartButtonWithPayPalLabelOnCheckoutPageTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontCheckPayPalSmartButtonWithPayPalLabelOnCheckoutPageTest.xml
index cae67f411200c..e21655763e7a3 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontCheckPayPalSmartButtonWithPayPalLabelOnCheckoutPageTest.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontCheckPayPalSmartButtonWithPayPalLabelOnCheckoutPageTest.xml
@@ -36,7 +36,9 @@
             <magentoCLI command="config:set {{StorefrontPaypalCheckoutPageButtonVerticalLayoutConfigData.path}} {{StorefrontPaypalCheckoutPageButtonVerticalLayoutConfigData.value}}" stepKey="setLayoutForPayPalSmartButton"/>
             <magentoCLI command="config:set {{StorefrontPaypalCheckoutPageButtonPillShapeConfigData.path}} {{StorefrontPaypalCheckoutPageButtonPillShapeConfigData.value}}" stepKey="setShapeForPayPalSmartButton"/>
             <magentoCLI command="config:set {{StorefrontPaypalCheckoutPageButtonBlueColorConfigData.path}} {{StorefrontPaypalCheckoutPageButtonBlueColorConfigData.value}}" stepKey="setColorForPayPalSmartButton"/>
-            <magentoCLI command="cache:clean" arguments="full_page" stepKey="cleanFullPageCache"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanFullPageCache">
+                <argument name="tags" value="full_page"/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set {{StorefrontPaypalCheckoutPageDisableCustomizeButtonConfigData.path}} {{StorefrontPaypalCheckoutPageDisableCustomizeButtonConfigData.value}}" stepKey="disableCustomizeButton"/>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontVerifySecureURLRedirectPaypalTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontVerifySecureURLRedirectPaypalTest.xml
index cf0e4b3d0b370..f17fa203af9f5 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontVerifySecureURLRedirectPaypalTest.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontVerifySecureURLRedirectPaypalTest.xml
@@ -28,11 +28,15 @@
             <executeJS function="return window.location.host" stepKey="hostname"/>
             <magentoCLI command="config:set web/secure/base_url https://{$hostname}/" stepKey="setSecureBaseURL"/>
             <magentoCLI command="config:set web/secure/use_in_frontend 1" stepKey="useSecureURLsOnStorefront"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set web/secure/use_in_frontend 0" stepKey="dontUseSecureURLsOnStorefront"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
         </after>
         <executeJS function="return window.location.host" stepKey="hostname"/>
diff --git a/app/code/Magento/Quote/Test/Mftf/Test/StorefrontGuestCheckoutDisabledProductTest.xml b/app/code/Magento/Quote/Test/Mftf/Test/StorefrontGuestCheckoutDisabledProductTest.xml
index 904a07d72035f..8fd0ed7f17a4d 100644
--- a/app/code/Magento/Quote/Test/Mftf/Test/StorefrontGuestCheckoutDisabledProductTest.xml
+++ b/app/code/Magento/Quote/Test/Mftf/Test/StorefrontGuestCheckoutDisabledProductTest.xml
@@ -75,7 +75,9 @@
             </createData>
             <magentoCLI command="config:set customer/online_customers/section_data_lifetime 1"
                         stepKey="setConfigForCartLifetime"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache" />
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
diff --git a/app/code/Magento/Review/Test/Mftf/Test/StorefrontVerifySecureURLRedirectReviewTest.xml b/app/code/Magento/Review/Test/Mftf/Test/StorefrontVerifySecureURLRedirectReviewTest.xml
index 8a2f441e5c4e8..4fc316b000c17 100644
--- a/app/code/Magento/Review/Test/Mftf/Test/StorefrontVerifySecureURLRedirectReviewTest.xml
+++ b/app/code/Magento/Review/Test/Mftf/Test/StorefrontVerifySecureURLRedirectReviewTest.xml
@@ -28,11 +28,15 @@
             <executeJS function="return window.location.host" stepKey="hostname"/>
             <magentoCLI command="config:set web/secure/base_url https://{$hostname}/" stepKey="setSecureBaseURL"/>
             <magentoCLI command="config:set web/secure/use_in_frontend 1" stepKey="useSecureURLsOnStorefront"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set web/secure/use_in_frontend 0" stepKey="dontUseSecureURLsOnStorefront"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
         </after>
         <executeJS function="return window.location.host" stepKey="hostname"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml
index 11a9957fe0041..0eb8d71223276 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml
@@ -25,7 +25,9 @@
             </createData>
             <!-- Enable *Free Shipping* -->
             <createData entity="FreeShippingMethodsSettingConfig" stepKey="freeShippingMethodsSettingConfig"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
@@ -37,7 +39,9 @@
             <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomer">
                 <argument name="customerEmail" value="Simple_US_Customer.email"/>
             </actionGroup>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+    <argument name="tags" value=""/>
+</actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logOut"/>
         </after>
 
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCheckMoneyOrderPaymentMethodTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCheckMoneyOrderPaymentMethodTest.xml
index c0ebbe450119e..a92befe95077d 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCheckMoneyOrderPaymentMethodTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCheckMoneyOrderPaymentMethodTest.xml
@@ -94,8 +94,12 @@
                 <requiredEntity createDataKey="createConfigProduct"/>
                 <requiredEntity createDataKey="createConfigChildProduct1"/>
             </createData>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="simpleCustomer" stepKey="deleteSimpleCustomer"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithPurchaseOrderPaymentMethodTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithPurchaseOrderPaymentMethodTest.xml
index 477676085cf2e..0b873de34e279 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithPurchaseOrderPaymentMethodTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithPurchaseOrderPaymentMethodTest.xml
@@ -35,8 +35,12 @@
             <createData entity="SimpleProduct2" stepKey="simpleProduct">
                 <field key="price">10.00</field>
             </createData>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set {{DisablePurchaseOrderConfigData.path}} {{DisablePurchaseOrderConfigData.value}}" stepKey="disablePurchaseOrderPayment"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml
index b8612f7f795fb..1b61ccf7fb7f0 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml
@@ -58,7 +58,9 @@
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
 
         <!--Run re-index task-->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
 
         <!--Go to bundle product page-->
         <amOnPage url="{{StorefrontProductPage.url($$createCategory.name$$)}}" stepKey="navigateToBundleProductPage"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithCustomerWithoutEmailTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithCustomerWithoutEmailTest.xml
index 0be7e20be5aea..68a8e9d347ddd 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithCustomerWithoutEmailTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithCustomerWithoutEmailTest.xml
@@ -24,7 +24,9 @@
                 <requiredEntity createDataKey="category"/>
             </createData>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <!--Clean up created test data.-->
@@ -33,7 +35,9 @@
             <!--Enable required 'email' field on create order page.-->
             <magentoCLI command="config:set {{EnableEmailRequiredForOrder.path}} {{EnableEmailRequiredForOrder.value}}" stepKey="enableRequiredFieldEmailForAdminOrderCreation"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </after>
 
         <!--Create order.-->
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminFreeShippingNotAvailableIfMinimumOrderAmountNotMatchOrderTotalTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminFreeShippingNotAvailableIfMinimumOrderAmountNotMatchOrderTotalTest.xml
index 1c59f6f936cef..f6196c3a911ef 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminFreeShippingNotAvailableIfMinimumOrderAmountNotMatchOrderTotalTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminFreeShippingNotAvailableIfMinimumOrderAmountNotMatchOrderTotalTest.xml
@@ -28,7 +28,9 @@
             <createData entity="FreeShippinMethodConfig" stepKey="enableFreeShippingMethod"/>
             <createData entity="setFreeShippingSubtotal" stepKey="setFreeShippingSubtotal"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
@@ -38,7 +40,9 @@
             <createData entity="FreeShippinMethodDefault" stepKey="disableFreeShippingMethod"/>
             <createData entity="setFreeShippingSubtotalToDefault" stepKey="setFreeShippingSubtotalToDefault"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache2"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </after>
         <!--Create new order with existing customer-->
         <actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="goToCreateOrderPage">
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml
index 776d84ac230b8..842faeb32cc33 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml
@@ -75,8 +75,12 @@
                 <requiredEntity createDataKey="createConfigProduct"/>
                 <requiredEntity createDataKey="createConfigChildProduct1"/>
             </createData>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <createData entity="DisableFreeShippingConfig" stepKey="disableFreeShippingConfig"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml
index f374741c247d4..c3fc7a4952143 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml
@@ -57,7 +57,9 @@
             <!-- Change configuration -->
             <magentoCLI command="config:set reports/options/enabled 1" stepKey="enableReportModule"/>
 
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
         </before>
         <after>
             <!-- Admin logout -->
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontOrderPagerDisplayedTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontOrderPagerDisplayedTest.xml
index 5cc4fae330d05..7b3de80782cf7 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontOrderPagerDisplayedTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontOrderPagerDisplayedTest.xml
@@ -90,8 +90,12 @@
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
 
             <!-- Reindex and flush the cache to display products on the category page -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <!-- Delete category and products -->
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontPrintOrderGuestTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontPrintOrderGuestTest.xml
index 00117c56de439..4445a865f17b5 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontPrintOrderGuestTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontPrintOrderGuestTest.xml
@@ -164,8 +164,12 @@
             <!-- Create Customer Account -->
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
 
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
 
             <!-- Place order with options according to dataset -->
             <actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="newOrder">
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontVerifySecureURLRedirectSalesTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontVerifySecureURLRedirectSalesTest.xml
index d49ea4cfcbec7..ecf71e2bc80b3 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontVerifySecureURLRedirectSalesTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontVerifySecureURLRedirectSalesTest.xml
@@ -28,11 +28,15 @@
             <executeJS function="return window.location.host" stepKey="hostname"/>
             <magentoCLI command="config:set web/secure/base_url https://{$hostname}/" stepKey="setSecureBaseURL"/>
             <magentoCLI command="config:set web/secure/use_in_frontend 1" stepKey="useSecureURLsOnStorefront"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set web/secure/use_in_frontend 0" stepKey="dontUseSecureURLsOnStorefront"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
         </after>
         <executeJS function="return window.location.host" stepKey="hostname"/>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartTotalValueWithFullDiscountUsingCartRuleTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartTotalValueWithFullDiscountUsingCartRuleTest.xml
index 9b5f8fbb2912d..73d444a778d7e 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartTotalValueWithFullDiscountUsingCartRuleTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartTotalValueWithFullDiscountUsingCartRuleTest.xml
@@ -57,8 +57,12 @@
             <createData entity="SimpleProduct2" stepKey="createSimpleProductThird">
                 <field key="price">5.50</field>
             </createData>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <!-- Removed created Data -->
diff --git a/app/code/Magento/Search/Test/Mftf/Test/StorefrontUsingElasticSearchWithWeightAttributeTest.xml b/app/code/Magento/Search/Test/Mftf/Test/StorefrontUsingElasticSearchWithWeightAttributeTest.xml
index 18f623288621d..b082014c7b120 100644
--- a/app/code/Magento/Search/Test/Mftf/Test/StorefrontUsingElasticSearchWithWeightAttributeTest.xml
+++ b/app/code/Magento/Search/Test/Mftf/Test/StorefrontUsingElasticSearchWithWeightAttributeTest.xml
@@ -49,7 +49,9 @@
         <!-- Step 3 -->
         <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
         <!-- Step 4 -->
-        <magentoCLI command="cache:clean" arguments="full_page" stepKey="clearFPC"/>
+        <actionGroup ref="CliCacheCleanActionGroup" stepKey="clearFPC">
+            <argument name="tags" value="full_page"/>
+        </actionGroup>
         <!-- Step 5 -->
         <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStorefront"/>
         <!-- Step 6 -->
diff --git a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductDescriptionTest.xml b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductDescriptionTest.xml
index 3bfa777ac27d8..22fcbfc2920ff 100644
--- a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductDescriptionTest.xml
+++ b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductDescriptionTest.xml
@@ -24,8 +24,12 @@
             <createData entity="SimpleProductWithDescription" stepKey="simpleProduct"/>
 
             <!-- Perform reindex and flush cache -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <!-- Delete created product -->
diff --git a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductNameTest.xml b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductNameTest.xml
index 93a3c8ca8e4a2..0b02b49433dda 100644
--- a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductNameTest.xml
+++ b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductNameTest.xml
@@ -26,8 +26,12 @@
             <createData entity="defaultSimpleProduct" stepKey="simpleProduct"/>
 
             <!-- Perform reindex and flush cache -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <!-- Delete create product -->
diff --git a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductShortDescriptionTest.xml b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductShortDescriptionTest.xml
index ebe3b6c129721..d88bb023c60b2 100644
--- a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductShortDescriptionTest.xml
+++ b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductShortDescriptionTest.xml
@@ -26,8 +26,12 @@
             <createData entity="ApiProductWithDescription" stepKey="product"/>
 
             <!-- Perform reindex and flush cache -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
 
diff --git a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductSkuTest.xml b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductSkuTest.xml
index e72f614593cfe..4c586d18fd3cf 100644
--- a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductSkuTest.xml
+++ b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductSkuTest.xml
@@ -26,8 +26,12 @@
             <createData entity="defaultSimpleProduct" stepKey="simpleProduct"/>
 
             <!-- Perform reindex and flush cache -->
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
 
diff --git a/app/code/Magento/Shipping/Test/Mftf/Test/AdminCreateOrderCustomStoreShippingMethodTableRatesTest.xml b/app/code/Magento/Shipping/Test/Mftf/Test/AdminCreateOrderCustomStoreShippingMethodTableRatesTest.xml
index 0e69dba36d41c..fe2a1bf86a8ce 100644
--- a/app/code/Magento/Shipping/Test/Mftf/Test/AdminCreateOrderCustomStoreShippingMethodTableRatesTest.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Test/AdminCreateOrderCustomStoreShippingMethodTableRatesTest.xml
@@ -64,7 +64,9 @@
                 <argument name="file" value="usa_tablerates.csv"/>
             </actionGroup>
             <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfig"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <!--Delete created data-->
diff --git a/app/code/Magento/Shipping/Test/Mftf/Test/AdminCreatePartialShipmentEntityTest.xml b/app/code/Magento/Shipping/Test/Mftf/Test/AdminCreatePartialShipmentEntityTest.xml
index 5e57224bfee48..9d501e4b34ef7 100644
--- a/app/code/Magento/Shipping/Test/Mftf/Test/AdminCreatePartialShipmentEntityTest.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Test/AdminCreatePartialShipmentEntityTest.xml
@@ -28,7 +28,9 @@
             <!-- Enable payment method one of "Check/Money Order" and  shipping method one of "Free Shipping" -->
             <magentoCLI command="config:set {{enabledCheckMoneyOrder.label}} {{enabledCheckMoneyOrder.value}}" stepKey="enableCheckMoneyOrder"/>
             <createData entity="FreeShippinMethodConfig" stepKey="enableFreeShipping"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </before>
         <after>
             <!-- Delete data -->
diff --git a/app/code/Magento/Shipping/Test/Mftf/Test/AdminCreateShipmentEntityTest.xml b/app/code/Magento/Shipping/Test/Mftf/Test/AdminCreateShipmentEntityTest.xml
index 6b388ae31e45e..a900a73fc36bc 100644
--- a/app/code/Magento/Shipping/Test/Mftf/Test/AdminCreateShipmentEntityTest.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Test/AdminCreateShipmentEntityTest.xml
@@ -28,7 +28,9 @@
             <!-- Enable payment method one of "Check/Money Order" and  shipping method one of "Free Shipping" -->
             <magentoCLI command="config:set {{enabledCheckMoneyOrder.label}} {{enabledCheckMoneyOrder.value}}" stepKey="enableCheckMoneyOrder"/>
             <createData entity="FreeShippinMethodConfig" stepKey="enableFreeShipping"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </before>
         <after>
             <!-- Delete data -->
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/AdminDisablingSwatchTooltipsTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/AdminDisablingSwatchTooltipsTest.xml
index 8fd21acbd51d9..3e6e984b11462 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/AdminDisablingSwatchTooltipsTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/AdminDisablingSwatchTooltipsTest.xml
@@ -44,7 +44,9 @@
 
             <!-- Enable swatch tooltips -->
             <magentoCLI command="config:set catalog/frontend/show_swatch_tooltip 1" stepKey="disableTooltips"/>
-            <magentoCLI command="cache:flush" stepKey="flushCacheAfterEnabling"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfterEnabling">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </after>
 
         <!-- Go to the edit page for the "color" attribute -->
@@ -149,7 +151,9 @@
 
         <!-- Disable swatch tooltips -->
         <magentoCLI command="config:set catalog/frontend/show_swatch_tooltip 0" stepKey="disableTooltips"/>
-        <magentoCLI command="cache:flush" stepKey="flushCacheAfterDisabling"/>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfterDisabling">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!-- Verify swatch tooltips are not visible -->
         <reloadPage stepKey="refreshPage"/>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontDisplayAllCharactersOnTextSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontDisplayAllCharactersOnTextSwatchTest.xml
index 0999b43c48820..b661ecb338bde 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontDisplayAllCharactersOnTextSwatchTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontDisplayAllCharactersOnTextSwatchTest.xml
@@ -30,7 +30,9 @@
         <fillField selector="{{AdminManageSwatchSection.swatchAdminDescriptionByIndex('3')}}" userInput="123456789012345678901BrownD" stepKey="fillDescription3" after="fillSwatch3"/>
 
         <!--Run re-index task-->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
 
         <see selector="{{StorefrontCategorySidebarSection.attributeNthOption(ProductAttributeFrontendLabel.label, '3')}}" userInput="123456789012345678901" stepKey="seeGreen" after="seeBlue"/>
         <see selector="{{StorefrontCategorySidebarSection.attributeNthOption(ProductAttributeFrontendLabel.label, '4')}}" userInput="123456789012345678901" stepKey="seeBrown" after="seeGreen"/>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByImageSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByImageSwatchTest.xml
index 2ca26d84d45c7..a832273ff9fcb 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByImageSwatchTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByImageSwatchTest.xml
@@ -105,7 +105,9 @@
         </actionGroup>
 
         <!-- Run re-index task-->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
 
         <!-- Go to the category page -->
         <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByTextSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByTextSwatchTest.xml
index 82dbff950d62f..38c7b51dcc708 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByTextSwatchTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByTextSwatchTest.xml
@@ -83,7 +83,9 @@
         </actionGroup>
 
         <!--Run re-index task-->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
 
         <!-- Go to the category page -->
         <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByVisualSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByVisualSwatchTest.xml
index bf820863cf9b6..0a91e72ce6249 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByVisualSwatchTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByVisualSwatchTest.xml
@@ -95,7 +95,9 @@
         </actionGroup>
 
         <!-- Run re-index task-->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
 
         <!-- Go to the category page -->
         <amOnPage url="$$createCategory.name$$.html" stepKey="amOnCategoryPage"/>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontImageColorWhenFilterByColorFilterTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontImageColorWhenFilterByColorFilterTest.xml
index 551a91f47c165..734294ba977ba 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontImageColorWhenFilterByColorFilterTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontImageColorWhenFilterByColorFilterTest.xml
@@ -71,8 +71,12 @@
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProductForm"/>
 
         <!-- Perform reindex and flush cache -->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!--Select any option in the Layered navigation and verify product image-->
         <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="navigateToCategoryPage"/>
diff --git a/app/code/Magento/Translation/Test/Mftf/Test/StorefrontInlineTranslationOnCheckoutTest.xml b/app/code/Magento/Translation/Test/Mftf/Test/StorefrontInlineTranslationOnCheckoutTest.xml
index 9255923213839..e30ab98982b78 100644
--- a/app/code/Magento/Translation/Test/Mftf/Test/StorefrontInlineTranslationOnCheckoutTest.xml
+++ b/app/code/Magento/Translation/Test/Mftf/Test/StorefrontInlineTranslationOnCheckoutTest.xml
@@ -115,7 +115,9 @@
         <magentoCLI command="config:set {{EnableTranslateInlineForStorefront.path}} {{EnableTranslateInlineForStorefront.value}}" stepKey="enableTranslateInlineForStorefront"/>
 
         <!-- 2. Refresh magento cache -->
-        <magentoCLI command="cache:flush" stepKey="flushCacheAfterTranslateEnabled"/>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfterTranslateEnabled">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!-- 3. Go to storefront and click on cart button on the top -->
         <reloadPage stepKey="reloadPage"/>
@@ -476,7 +478,9 @@
         <!-- 7. Set *Enabled for Storefront* option to *No* and save configuration -->
         <magentoCLI command="config:set {{DisableTranslateInlineForStorefront.path}} {{DisableTranslateInlineForStorefront.value}}" stepKey="disableTranslateInlineForStorefront"/>
         <!-- 8. Clear magento cache -->
-        <magentoCLI command="cache:flush" stepKey="flushCacheAfterTranslateDisabled"/>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfterTranslateDisabled">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <magentoCLI command="setup:static-content:deploy -f" stepKey="deployStaticContent"/>
 
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest/AdminUrlRewriteMultipleStoreviewsProductImportWithConfigTurnedOffTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest/AdminUrlRewriteMultipleStoreviewsProductImportWithConfigTurnedOffTest.xml
index 1d604ef7648dc..7e0dbf89881a6 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest/AdminUrlRewriteMultipleStoreviewsProductImportWithConfigTurnedOffTest.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest/AdminUrlRewriteMultipleStoreviewsProductImportWithConfigTurnedOffTest.xml
@@ -22,7 +22,9 @@
             <comment userInput="Enable SEO configuration setting to generate category/product URL Rewrites" stepKey="commentEnableUrlRewriteConfig"/>
             <magentoCLI command="config:set catalog/seo/generate_category_product_rewrites 1" stepKey="enableGenerateUrlRewrite"/>
             <!--Flush cache-->
-            <magentoCLI command="cache:flush" stepKey="cleanCache1"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfterEnableConfig">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <createData entity="ApiCategory" stepKey="createCategory">
                 <field key="name">category-admin</field>
             </createData>
@@ -39,7 +41,9 @@
             <comment userInput="Disable SEO configuration setting to generate category/product URL Rewrites" stepKey="commentDisableUrlRewriteConfig"/>
             <magentoCLI command="config:set catalog/seo/generate_category_product_rewrites 0" stepKey="disableGenerateUrlRewrite"/>
             <!--Flush cache-->
-            <magentoCLI command="cache:flush" stepKey="cleanCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfterDisableConfig">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
@@ -58,7 +62,9 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <magentoCLI command="config:set catalog/seo/generate_category_product_rewrites 1" stepKey="resetConfigurationSetting"/>
             <!--Flush cache-->
-            <magentoCLI command="cache:flush" stepKey="cleanCache2"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </after>
         <actionGroup ref="SwitchCategoryStoreViewActionGroup" stepKey="switchToStoreViewEn">
             <argument name="Store" value="customStoreENNotUnique.name"/>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesInCatalogCategoriesAfterChangingUrlKeyForStoreViewAndMovingCategory2Test.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesInCatalogCategoriesAfterChangingUrlKeyForStoreViewAndMovingCategory2Test.xml
index 20e6392091998..fee13adcb433c 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesInCatalogCategoriesAfterChangingUrlKeyForStoreViewAndMovingCategory2Test.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesInCatalogCategoriesAfterChangingUrlKeyForStoreViewAndMovingCategory2Test.xml
@@ -35,7 +35,9 @@
 
             <!--Create additional Store View in Main Website Store -->
             <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView"/>
-            <magentoCLI command="indexer:reindex" stepKey="reindexAll"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexAll">
+                <argument name="indices" value=""/>
+            </actionGroup>
         </before>
 
         <after>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminGenerateUrlRewritesForProductInCategoriesSwitchOffTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminGenerateUrlRewritesForProductInCategoriesSwitchOffTest.xml
index 9d6b267055f70..b34bd672cdffc 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminGenerateUrlRewritesForProductInCategoriesSwitchOffTest.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminGenerateUrlRewritesForProductInCategoriesSwitchOffTest.xml
@@ -22,7 +22,9 @@
             <comment userInput="Enable config to generate category/product URL Rewrites" stepKey="commentEnableConfig" />
             <magentoCLI command="config:set catalog/seo/generate_category_product_rewrites 1" stepKey="enableGenerateUrlRewrite"/>
             <!--Flush cache-->
-            <magentoCLI command="cache:flush" stepKey="cleanCache1"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
 
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
             <createData entity="SimpleSubCategory" stepKey="createCategory"/>
@@ -38,7 +40,9 @@
             <comment userInput="Enable config to generate category/product URL Rewrites" stepKey="commentEnableConfig" />
             <magentoCLI command="config:set catalog/seo/generate_category_product_rewrites 1" stepKey="enableGenerateUrlRewrite"/>
             <!--Flush cache-->
-            <magentoCLI command="cache:flush" stepKey="cleanCache1"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
 
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
@@ -63,7 +67,9 @@
         <waitForPageLoad stepKey="waitForSavingSystemConfiguration"/>
 
         <!-- 3. Flush cache-->
-        <magentoCLI command="cache:flush" stepKey="cleanCache"/>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!-- 4. Open Marketing - SEO & Search - URL Rewrites -->
         <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="amOnUrlRewriteIndexPage2"/>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminProductCreateUrlRewriteForCustomStoreViewTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminProductCreateUrlRewriteForCustomStoreViewTest.xml
index f03d9ae1bad67..d102286bd9e6d 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminProductCreateUrlRewriteForCustomStoreViewTest.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminProductCreateUrlRewriteForCustomStoreViewTest.xml
@@ -31,7 +31,9 @@
             <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView">
                 <argument name="customStore" value="customStore"/>
             </actionGroup>
-            <magentoCLI command="indexer:reindex" stepKey="runReindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="runReindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="createProduct"  stepKey="deleteProduct" />
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUrlRewritesForProductInAnchorCategoriesTest/AdminUrlRewritesForProductInAnchorCategoriesTestWithConfigurationTurnedOffTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUrlRewritesForProductInAnchorCategoriesTest/AdminUrlRewritesForProductInAnchorCategoriesTestWithConfigurationTurnedOffTest.xml
index 639cd2c57f7d1..7e3b6ec28d5a9 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUrlRewritesForProductInAnchorCategoriesTest/AdminUrlRewritesForProductInAnchorCategoriesTestWithConfigurationTurnedOffTest.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUrlRewritesForProductInAnchorCategoriesTest/AdminUrlRewritesForProductInAnchorCategoriesTestWithConfigurationTurnedOffTest.xml
@@ -25,7 +25,9 @@
             <comment userInput="Enable SEO configuration setting to generate category/product URL Rewrites" stepKey="commentEnableUrlRewriteConfig"/>
             <magentoCLI command="config:set catalog/seo/generate_category_product_rewrites 1" stepKey="enableGenerateUrlRewrite"/>
             <!--Flush cache-->
-            <magentoCLI command="cache:flush" stepKey="cleanCache1"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfterEnableConfig">
+                <argument name="tags" value=""/>
+            </actionGroup>
 
             <createData entity="SimpleSubCategory" stepKey="simpleSubCategory1"/>
             <createData entity="SubCategoryWithParent" stepKey="simpleSubCategory2">
@@ -42,7 +44,9 @@
             <comment userInput="Disable SEO configuration setting to generate category/product URL Rewrites" stepKey="commentDisableUrlRewriteConfig"/>
             <magentoCLI command="config:set catalog/seo/generate_category_product_rewrites 0" stepKey="disableGenerateUrlRewrite"/>
             <!--Flush cache-->
-            <magentoCLI command="cache:flush" stepKey="cleanCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
@@ -50,7 +54,9 @@
             <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
             <magentoCLI command="config:set catalog/seo/generate_category_product_rewrites 1" stepKey="resetConfigurationSetting"/>
             <!--Flush cache-->
-            <magentoCLI command="cache:flush" stepKey="cleanCache2"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfterDisableConfig">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </after>
         <!-- Steps -->
         <!-- 1. Log in to Admin -->
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUrlRewritesForProductInAnchorCategoriesTest/AdminUrlRewritesForProductsWithConfigurationTurnedOffTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUrlRewritesForProductInAnchorCategoriesTest/AdminUrlRewritesForProductsWithConfigurationTurnedOffTest.xml
index 1d460b9b668a0..3713b3bc41261 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUrlRewritesForProductInAnchorCategoriesTest/AdminUrlRewritesForProductsWithConfigurationTurnedOffTest.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUrlRewritesForProductInAnchorCategoriesTest/AdminUrlRewritesForProductsWithConfigurationTurnedOffTest.xml
@@ -22,7 +22,9 @@
             <comment userInput="Enable SEO configuration setting to generate category/product URL Rewrites" stepKey="commentEnableUrlRewriteConfig"/>
             <magentoCLI command="config:set catalog/seo/generate_category_product_rewrites 1" stepKey="enableGenerateUrlRewrite"/>
             <!--Flush cache-->
-            <magentoCLI command="cache:flush" stepKey="cleanCache1"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfterEnableConfig">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <createData entity="SimpleSubCategory" stepKey="simpleSubCategory1"/>
             <!-- Create Simple product 1 and assign it to Category 1 -->
             <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct">
@@ -32,14 +34,18 @@
             <comment userInput="Disable SEO configuration setting to generate category/product URL Rewrites" stepKey="commentDisableUrlRewriteConfig"/>
             <magentoCLI command="config:set catalog/seo/generate_category_product_rewrites 0" stepKey="disableGenerateUrlRewrite"/>
             <!--Flush cache-->
-            <magentoCLI command="cache:flush" stepKey="cleanCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfterDisableConfig">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
             <deleteData createDataKey="simpleSubCategory1" stepKey="deletesimpleSubCategory1"/>
             <magentoCLI command="config:set catalog/seo/generate_category_product_rewrites 1" stepKey="resetConfigurationSetting"/>
             <!--Flush cache-->
-            <magentoCLI command="cache:flush" stepKey="cleanCache2"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </after>
         <!-- 1. Log in to Admin -->
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/User/Test/Mftf/Test/AdminLockAdminUserEntityTest.xml b/app/code/Magento/User/Test/Mftf/Test/AdminLockAdminUserEntityTest.xml
index 850fa04549e84..6750f21311d3a 100644
--- a/app/code/Magento/User/Test/Mftf/Test/AdminLockAdminUserEntityTest.xml
+++ b/app/code/Magento/User/Test/Mftf/Test/AdminLockAdminUserEntityTest.xml
@@ -22,13 +22,17 @@
         <before>
             <magentoCLI command="config:set admin/captcha/enable 0" stepKey="disableAdminCaptcha"/>
             <magentoCLI command="config:set admin/security/lockout_failures 2" stepKey="setDefaultMaximumLoginFailures"/>
-            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches1"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches1">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
             <actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
         </before>
         <after>
             <magentoCLI command="config:set admin/captcha/enable 1" stepKey="enableAdminCaptcha"/>
             <magentoCLI command="config:set admin/security/lockout_failures 6" stepKey="setDefaultMaximumLoginFailures"/>
-            <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
         </after>
 
diff --git a/app/code/Magento/Vault/Test/Mftf/Test/StorefrontVerifySecureURLRedirectVaultTest.xml b/app/code/Magento/Vault/Test/Mftf/Test/StorefrontVerifySecureURLRedirectVaultTest.xml
index f496e500a4d9b..a43d6578925b2 100644
--- a/app/code/Magento/Vault/Test/Mftf/Test/StorefrontVerifySecureURLRedirectVaultTest.xml
+++ b/app/code/Magento/Vault/Test/Mftf/Test/StorefrontVerifySecureURLRedirectVaultTest.xml
@@ -28,11 +28,15 @@
             <executeJS function="return window.location.host" stepKey="hostname"/>
             <magentoCLI command="config:set web/secure/base_url https://{$hostname}/" stepKey="setSecureBaseURL"/>
             <magentoCLI command="config:set web/secure/use_in_frontend 1" stepKey="useSecureURLsOnStorefront"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set web/secure/use_in_frontend 0" stepKey="dontUseSecureURLsOnStorefront"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
         </after>
         <executeJS function="return window.location.host" stepKey="hostname"/>
diff --git a/app/code/Magento/Weee/Test/Mftf/Test/AdminFixedTaxValSavedForSpecificWebsiteTest.xml b/app/code/Magento/Weee/Test/Mftf/Test/AdminFixedTaxValSavedForSpecificWebsiteTest.xml
index 77a8e6e6fd20c..0f4a7f9a55d26 100644
--- a/app/code/Magento/Weee/Test/Mftf/Test/AdminFixedTaxValSavedForSpecificWebsiteTest.xml
+++ b/app/code/Magento/Weee/Test/Mftf/Test/AdminFixedTaxValSavedForSpecificWebsiteTest.xml
@@ -51,8 +51,12 @@
             <!--Set catalog price scope to Global-->
             <comment userInput="Set catalog price scope to Global" stepKey="commentSetPriceScope"/>
             <magentoCLI command="config:set catalog/price/scope 0" stepKey="setPriceScopeGlobal"/>
-            <magentoCLI command="indexer:reindex catalog_product_price" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value="catalog_product_price"/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <!--Set catalog price scope to Global-->
@@ -97,8 +101,12 @@
         <!--Set catalog price scope to Website-->
         <comment userInput="Set catalog price scope to Website" stepKey="commentSetPriceScope"/>
         <magentoCLI command="config:set catalog/price/scope 1" stepKey="setPriceScopeWebsite"/>
-        <magentoCLI command="indexer:reindex catalog_product_price" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value="catalog_product_price"/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
         <!--See available websites only 'All Websites'-->
         <comment userInput="See available websites 'All Websites', 'Main Website' and Second website" stepKey="commentCheckWebsitesInProductPage"/>
         <actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="goToProductPageSecondTime">
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddProductsToCartFromWishlistUsingSidebarTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddProductsToCartFromWishlistUsingSidebarTest.xml
index a6cab4b9f9715..c279adbfe876c 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddProductsToCartFromWishlistUsingSidebarTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddProductsToCartFromWishlistUsingSidebarTest.xml
@@ -26,16 +26,24 @@
                 <requiredEntity createDataKey="categorySecond"/>
             </createData>
             <createData entity="Simple_US_Customer" stepKey="customer"/>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
             <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
             <deleteData createDataKey="categoryFirst" stepKey="deleteCategoryFirst"/>
             <deleteData createDataKey="categorySecond" stepKey="deleteCategorySecond"/>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
         </after>
         <!-- Sign in as customer -->
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeleteBundleFixedProductFromWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeleteBundleFixedProductFromWishlistTest.xml
index a23788d2c508f..31bc9f6a31de7 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeleteBundleFixedProductFromWishlistTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeleteBundleFixedProductFromWishlistTest.xml
@@ -45,8 +45,12 @@
                 <requiredEntity createDataKey="createBundleOption1_1"/>
                 <requiredEntity createDataKey="simpleProduct2"/>
             </createData>
-            <magentoCLI stepKey="reindex" command="indexer:reindex"/>
-            <magentoCLI stepKey="flushCache" command="cache:flush"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <!-- Delete data -->
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeleteConfigurableProductFromWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeleteConfigurableProductFromWishlistTest.xml
index 4ad87095ecd30..da2cec8284c46 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeleteConfigurableProductFromWishlistTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDeleteConfigurableProductFromWishlistTest.xml
@@ -105,8 +105,12 @@
                 <requiredEntity createDataKey="createConfigProduct"/>
                 <requiredEntity createDataKey="createConfigChildProduct3"/>
             </createData>
-            <magentoCLI stepKey="reindex" command="indexer:reindex"/>
-            <magentoCLI stepKey="flushCache" command="cache:flush"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <!-- Delete data -->
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveConfigurableProductFromShoppingCartToWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveConfigurableProductFromShoppingCartToWishlistTest.xml
index a5081ca2ad338..05a42314ddb71 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveConfigurableProductFromShoppingCartToWishlistTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontMoveConfigurableProductFromShoppingCartToWishlistTest.xml
@@ -107,8 +107,12 @@
                 <requiredEntity createDataKey="createConfigChildProduct3"/>
             </createData>
 
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <!-- Delete data -->
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontRemoveProductsFromWishlistUsingSidebarTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontRemoveProductsFromWishlistUsingSidebarTest.xml
index 97551a596e978..b2364b72f7db8 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontRemoveProductsFromWishlistUsingSidebarTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontRemoveProductsFromWishlistUsingSidebarTest.xml
@@ -36,8 +36,12 @@
         </after>
 
         <!-- Perform reindex and flush cache -->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <!-- Sign in as customer -->
         <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontUpdateWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontUpdateWishlistTest.xml
index 08698658588ae..86d09783e0f55 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontUpdateWishlistTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontUpdateWishlistTest.xml
@@ -27,8 +27,12 @@
         </before>
 
         <!-- Perform reindex and flush cache -->
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
 
         <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
             <argument name="Customer" value="$$customer$$"/>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontVerifySecureURLRedirectWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontVerifySecureURLRedirectWishlistTest.xml
index 72f5bab1e6af5..f5958f5efd414 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontVerifySecureURLRedirectWishlistTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontVerifySecureURLRedirectWishlistTest.xml
@@ -28,11 +28,15 @@
             <executeJS function="return window.location.host" stepKey="hostname"/>
             <magentoCLI command="config:set web/secure/base_url https://{$hostname}/" stepKey="setSecureBaseURL"/>
             <magentoCLI command="config:set web/secure/use_in_frontend 1" stepKey="useSecureURLsOnStorefront"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set web/secure/use_in_frontend 0" stepKey="dontUseSecureURLsOnStorefront"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
         </after>
         <executeJS function="return window.location.host" stepKey="hostname"/>

From 930be6eb25c69eadba4e21c8bd12ea088c4bb6dd Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Fri, 5 Jun 2020 10:57:20 -0500
Subject: [PATCH 0385/1718] MTS-1023: Enable PageBuilder extension by default
 in PR flow

---
 ...ithCartPriceRuleMatchingSubtotalForMultiShipmentTest.xml | 6 ------
 .../Test/StorefrontCheckoutWithMultipleAddressesTest.xml    | 2 --
 .../Test/Mftf/Test/StorefrontOrderWithMultishippingTest.xml | 2 --
 ...shippingCheckoutWhenCartPageIsOpenedInAnotherTabTest.xml | 2 --
 4 files changed, 12 deletions(-)

diff --git a/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontCheckingWithCartPriceRuleMatchingSubtotalForMultiShipmentTest.xml b/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontCheckingWithCartPriceRuleMatchingSubtotalForMultiShipmentTest.xml
index 02187658a8781..815d406c68bfa 100644
--- a/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontCheckingWithCartPriceRuleMatchingSubtotalForMultiShipmentTest.xml
+++ b/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontCheckingWithCartPriceRuleMatchingSubtotalForMultiShipmentTest.xml
@@ -19,12 +19,6 @@
             <group value="Multishipment"/>
             <group value="SalesRule"/>
         </annotations>
-        <before>
-            <magentoCLI command="config:set multishipping/options/checkout_multiple 1" stepKey="allowShippingToMultipleAddresses"/>
-        </before>
-        <after>
-            <magentoCLI command="config:set multishipping/options/checkout_multiple 0" stepKey="disableShippingToMultipleAddresses"/>
-        </after>
         <actionGroup ref="AdminCreateCartPriceRuleActionsWithSubtotalActionGroup" before="goToProduct1" stepKey="createSubtotalCartPriceRuleActionsSection">
             <argument name="ruleName" value="CartPriceRuleConditionForSubtotalForMultiShipping"/>
          </actionGroup>
diff --git a/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontCheckoutWithMultipleAddressesTest.xml b/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontCheckoutWithMultipleAddressesTest.xml
index a49a37e475409..8205ab962b9fe 100644
--- a/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontCheckoutWithMultipleAddressesTest.xml
+++ b/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontCheckoutWithMultipleAddressesTest.xml
@@ -22,8 +22,6 @@
         <before>
             <!-- Login as Admin -->
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
-            <!-- Set configurations -->
-            <magentoCLI command="config:set multishipping/options/checkout_multiple 1" stepKey="allowShippingToMultipleAddresses"/>
             <!-- Create simple products -->
             <createData entity="SimpleSubCategory" stepKey="createCategory"/>
             <createData entity="SimpleProduct" stepKey="firstProduct">
diff --git a/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontOrderWithMultishippingTest.xml b/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontOrderWithMultishippingTest.xml
index 80407a219a841..2e5c0acc32053 100644
--- a/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontOrderWithMultishippingTest.xml
+++ b/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontOrderWithMultishippingTest.xml
@@ -27,7 +27,6 @@
             <createData entity="SimpleProduct2" stepKey="createProduct2"/>
             <createData entity="Simple_US_Customer_Two_Addresses" stepKey="createCustomer"/>
             <!-- Set configurations -->
-            <magentoCLI command="config:set {{EnableMultiShippingCheckoutMultiple.path}} {{EnableMultiShippingCheckoutMultiple.value}}" stepKey="allowShippingToMultipleAddresses"/>
             <magentoCLI command="config:set {{EnableFreeShippingMethod.path}} {{EnableFreeShippingMethod.value}}" stepKey="enableFreeShipping"/>
             <magentoCLI command="config:set {{EnableFlatRateShippingMethod.path}} {{EnableFlatRateShippingMethod.value}}" stepKey="enableFlatRateShipping"/>
             <magentoCLI command="config:set {{EnableCheckMoneyOrderPaymentMethod.path}} {{EnableCheckMoneyOrderPaymentMethod.value}}" stepKey="enableCheckMoneyOrderPaymentMethod"/>
@@ -43,7 +42,6 @@
             <!-- Need logout before customer delete. Fatal error appears otherwise -->
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-            <magentoCLI command="config:set {{DisableMultiShippingCheckoutMultiple.path}} {{DisableMultiShippingCheckoutMultiple.value}}" stepKey="withdrawShippingToMultipleAddresses"/>
             <magentoCLI command="config:set {{DisableFreeShippingMethod.path}} {{DisableFreeShippingMethod.value}}" stepKey="disableFreeShipping"/>
             <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearAllOrdersGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
diff --git a/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontProcessMultishippingCheckoutWhenCartPageIsOpenedInAnotherTabTest.xml b/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontProcessMultishippingCheckoutWhenCartPageIsOpenedInAnotherTabTest.xml
index caf0ce3a51bae..7bb26525b173f 100644
--- a/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontProcessMultishippingCheckoutWhenCartPageIsOpenedInAnotherTabTest.xml
+++ b/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontProcessMultishippingCheckoutWhenCartPageIsOpenedInAnotherTabTest.xml
@@ -22,8 +22,6 @@
         <before>
             <!-- Login as Admin -->
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
-            <!-- Set configurations -->
-            <magentoCLI command="config:set multishipping/options/checkout_multiple 1" stepKey="allowShippingToMultipleAddresses"/>
             <!-- Create two simple products -->
             <createData entity="ApiCategory" stepKey="createCategory"/>
             <createData entity="_defaultProduct" stepKey="createFirstProduct">

From 53a22bef629fea8ed3fd04ca8e8226fc0a203976 Mon Sep 17 00:00:00 2001
From: John Carlo Octabio <johncarlo@abovethefray.io>
Date: Sat, 6 Jun 2020 07:01:02 +0800
Subject: [PATCH 0386/1718] magento/magento2#108: Clear Shopping Cart -
 Implemented Clear Shopping Cart button display configuration with modal
 confirm widget

---
 app/code/Magento/Checkout/Block/Cart/Grid.php | 18 +++++++++++++
 .../Magento/Checkout/etc/adminhtml/system.xml |  4 +++
 app/code/Magento/Checkout/etc/config.xml      |  1 +
 app/code/Magento/Checkout/i18n/en_US.csv      |  2 ++
 .../view/frontend/templates/cart/form.phtml   | 21 +++++++++------
 .../view/frontend/web/js/shopping-cart.js     | 27 ++++++++++++-------
 .../Magento/luma/web/css/source/_extends.less | 10 +++++--
 7 files changed, 64 insertions(+), 19 deletions(-)

diff --git a/app/code/Magento/Checkout/Block/Cart/Grid.php b/app/code/Magento/Checkout/Block/Cart/Grid.php
index bfe4b6ceed9d0..a92efb2c07837 100644
--- a/app/code/Magento/Checkout/Block/Cart/Grid.php
+++ b/app/code/Magento/Checkout/Block/Cart/Grid.php
@@ -22,6 +22,11 @@ class Grid extends \Magento\Checkout\Block\Cart
      */
     const XPATH_CONFIG_NUMBER_ITEMS_TO_DISPLAY_PAGER = 'checkout/cart/number_items_to_display_pager';
 
+    /**
+     * Default display setting for clear shopping cart button
+     */
+    const XPATH_CONFIG_ENABLE_CLEAR_SHOPPING_CART = 'checkout/cart/enable_clear_shopping_cart';
+
     /**
      * @var \Magento\Quote\Model\ResourceModel\Quote\Item\Collection
      */
@@ -174,4 +179,17 @@ private function isPagerDisplayedOnPage()
         }
         return $this->isPagerDisplayed;
     }
+
+    /**
+     * Check if clear shopping cart button is enabled
+     *
+     * @return bool
+     */
+    public function isClearShoppingCartEnabled()
+    {
+        return (bool) $this->_scopeConfig->getValue(
+            self::XPATH_CONFIG_ENABLE_CLEAR_SHOPPING_CART,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+    }
 }
diff --git a/app/code/Magento/Checkout/etc/adminhtml/system.xml b/app/code/Magento/Checkout/etc/adminhtml/system.xml
index 7454c2b6524f3..7cb1d09417e30 100644
--- a/app/code/Magento/Checkout/etc/adminhtml/system.xml
+++ b/app/code/Magento/Checkout/etc/adminhtml/system.xml
@@ -48,6 +48,10 @@
                     <label>Show Cross-sell Items in the Shopping Cart</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
+                <field id="enable_clear_shopping_cart" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Enable Clear Shopping Cart</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
             </group>
             <group id="cart_link" translate="label" sortOrder="3" showInDefault="1" showInWebsite="1">
                 <label>My Cart Link</label>
diff --git a/app/code/Magento/Checkout/etc/config.xml b/app/code/Magento/Checkout/etc/config.xml
index c8408f6d902fa..4db5f5bdc01c9 100644
--- a/app/code/Magento/Checkout/etc/config.xml
+++ b/app/code/Magento/Checkout/etc/config.xml
@@ -19,6 +19,7 @@
                 <redirect_to_cart>0</redirect_to_cart>
                 <number_items_to_display_pager>20</number_items_to_display_pager>
                 <crosssell_enabled>1</crosssell_enabled>
+                <enable_clear_shopping_cart>0</enable_clear_shopping_cart>
             </cart>
             <cart_link>
                 <use_qty>1</use_qty>
diff --git a/app/code/Magento/Checkout/i18n/en_US.csv b/app/code/Magento/Checkout/i18n/en_US.csv
index 251985faf6cc4..0c10d5a66e9ee 100644
--- a/app/code/Magento/Checkout/i18n/en_US.csv
+++ b/app/code/Magento/Checkout/i18n/en_US.csv
@@ -153,6 +153,8 @@ Shipping,Shipping
 "Maximum Number of Items to Display in Order Summary","Maximum Number of Items to Display in Order Summary"
 "Quote Lifetime (days)","Quote Lifetime (days)"
 "After Adding a Product Redirect to Shopping Cart","After Adding a Product Redirect to Shopping Cart"
+"Enable Clear Shopping Cart","Enable Clear Shopping Cart"
+"Are you sure you want to remove all items from your Shopping Cart?","Are you sure you want to remove all items from your Shopping Cart?"
 "Number of Items to Display Pager","Number of Items to Display Pager"
 "My Cart Link","My Cart Link"
 "Display Cart Summary","Display Cart Summary"
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
index 370d70c44d886..a33fa7d12f48d 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
@@ -56,14 +56,16 @@
                 <span><?= $block->escapeHtml(__('Continue Shopping')) ?></span>
             </a>
         <?php endif; ?>
-        <button type="button"
-                name="update_cart_action"
-                data-cart-empty=""
-                value="empty_cart"
-                title="<?= $block->escapeHtml(__('Clear Shopping Cart')) ?>"
-                class="action clear" id="empty_cart_button">
-            <span><?= $block->escapeHtml(__('Clear Shopping Cart')) ?></span>
-        </button>
+        <?php if ($block->isClearShoppingCartEnabled()) :?>
+            <button type="button"
+                    name="update_cart_action"
+                    data-cart-empty=""
+                    value="empty_cart"
+                    title="<?= $block->escapeHtml(__('Clear Shopping Cart')) ?>"
+                    class="action clear" id="empty_cart_button">
+                <span><?= $block->escapeHtml(__('Clear Shopping Cart')) ?></span>
+            </button>
+        <?php endif ?>
         <button type="submit"
                 name="update_cart_action"
                 data-cart-item-update=""
@@ -78,3 +80,6 @@
 <?= $block->getChildHtml('checkout.cart.order.actions') ?>
 <?= $block->getChildHtml('shopping.cart.table.after') ?>
 
+<script>
+
+</script>
\ No newline at end of file
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js b/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
index b15599673095f..87271514d8a4c 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
@@ -5,23 +5,32 @@
 
 define([
     'jquery',
-    'jquery-ui-modules/widget'
-], function ($) {
+    'Magento_Ui/js/modal/confirm',
+    'jquery-ui-modules/widget',
+    'mage/translate'
+], function ($, confirm) {
     'use strict';
 
     $.widget('mage.shoppingCart', {
         /** @inheritdoc */
         _create: function () {
-            var items, i, reload;
+            var items, i, reload, self = this;
 
             $(this.options.emptyCartButton).on('click', $.proxy(function () {
-                $(this.options.emptyCartButton).attr('name', 'update_cart_action_temp');
-                $(this.options.updateCartActionContainer)
-                    .attr('name', 'update_cart_action').attr('value', 'empty_cart');
+                confirm({
+                    content: $.mage.__('Are you sure you want to remove all items from your Shopping Cart?'),
+                    actions: {
+                        confirm: function () {
+                            $(self.options.emptyCartButton).attr('name', 'update_cart_action_temp');
+                            $(self.options.updateCartActionContainer)
+                                .attr('name', 'update_cart_action').attr('value', 'empty_cart');
 
-                if ($(this.options.emptyCartButton).parents('form').length > 0) {
-                    $(this.options.emptyCartButton).parents('form').submit();
-                }
+                            if ($(self.options.emptyCartButton).parents('form').length > 0) {
+                                $(self.options.emptyCartButton).parents('form').submit();
+                            }
+                        }
+                    }
+                });
             }, this));
             items = $.find('[data-role="cart-item-qty"]');
 
diff --git a/app/design/frontend/Magento/luma/web/css/source/_extends.less b/app/design/frontend/Magento/luma/web/css/source/_extends.less
index ce86b690f6252..8ae1776daf239 100644
--- a/app/design/frontend/Magento/luma/web/css/source/_extends.less
+++ b/app/design/frontend/Magento/luma/web/css/source/_extends.less
@@ -1570,10 +1570,16 @@
         margin-bottom: @indent__base;
 
         .actions.main {
-            .continue,
-            .clear {
+            .continue {
                 display: none;
             }
+
+            .clear {
+                .lib-button-as-link(
+                    @_margin: 0 @indent__base 0 0
+                );
+                font-weight: @font-weight__regular;
+            }
         }
     }
 }

From 70e3c15ae366beee1c0c0d4dd8506fd72685929c Mon Sep 17 00:00:00 2001
From: John Carlo Octabio <johncarlo@abovethefray.io>
Date: Sat, 6 Jun 2020 07:10:30 +0800
Subject: [PATCH 0387/1718] magento/magento2#108: Clear Shopping Cart -
 Refactor doc for enable_clear_shopping_cart constant

---
 app/code/Magento/Checkout/Block/Cart/Grid.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/Block/Cart/Grid.php b/app/code/Magento/Checkout/Block/Cart/Grid.php
index a92efb2c07837..d03e7642ce8a4 100644
--- a/app/code/Magento/Checkout/Block/Cart/Grid.php
+++ b/app/code/Magento/Checkout/Block/Cart/Grid.php
@@ -23,7 +23,7 @@ class Grid extends \Magento\Checkout\Block\Cart
     const XPATH_CONFIG_NUMBER_ITEMS_TO_DISPLAY_PAGER = 'checkout/cart/number_items_to_display_pager';
 
     /**
-     * Default display setting for clear shopping cart button
+     * Config settings path to enable clear shopping cart button
      */
     const XPATH_CONFIG_ENABLE_CLEAR_SHOPPING_CART = 'checkout/cart/enable_clear_shopping_cart';
 

From 05470d042512d6ef6bd386597e3478b4e53d11a5 Mon Sep 17 00:00:00 2001
From: John Carlo Octabio <johncarlo@abovethefray.io>
Date: Sat, 6 Jun 2020 07:12:18 +0800
Subject: [PATCH 0388/1718] magento/magento2#108: Clear Shopping Cart - Remove
 unnecessary empty script tag in form.phtml

---
 .../Magento/Checkout/view/frontend/templates/cart/form.phtml  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
index a33fa7d12f48d..dc272d404f862 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
@@ -79,7 +79,3 @@
 </form>
 <?= $block->getChildHtml('checkout.cart.order.actions') ?>
 <?= $block->getChildHtml('shopping.cart.table.after') ?>
-
-<script>
-
-</script>
\ No newline at end of file

From 86a4900f8a76cd90908b910e590e80e3c2960faa Mon Sep 17 00:00:00 2001
From: Ji Lu <jilu1@adobe.com>
Date: Fri, 5 Jun 2020 19:26:14 -0500
Subject: [PATCH 0389/1718] MQE-2153: bump MFTF version to 3.0.0-RC4

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

diff --git a/composer.json b/composer.json
index d487ad5975040..4cd8a3989f188 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": "dev-3.0.0-RC3",
+        "magento/magento2-functional-testing-framework": "dev-3.0.0-RC4",
         "pdepend/pdepend": "~2.7.1",
         "phpcompatibility/php-compatibility": "^9.3",
         "phpmd/phpmd": "^2.8.0",
diff --git a/composer.lock b/composer.lock
index 6a47e7e44ab69..d8f088f450af2 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": "e86af25d9a4a1942c437cca58f9f1efb",
+    "content-hash": "e25a6a8d64ffec2bd0b839679158f286",
     "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"
         },
         {
@@ -297,16 +287,6 @@
                 "dependency",
                 "package"
             ],
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-05-06T08:28:10+00:00"
         },
         {
@@ -472,12 +452,6 @@
                 "Xdebug",
                 "performance"
             ],
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                }
-            ],
             "time": "2020-03-01T12:26:26+00:00"
         },
         {
@@ -1331,12 +1305,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"
         },
         {
@@ -2294,12 +2262,6 @@
                 "laminas",
                 "mail"
             ],
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
             "time": "2020-04-21T16:42:19+00:00"
         },
         {
@@ -3292,12 +3254,6 @@
                 "laminas",
                 "zf"
             ],
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
             "time": "2020-05-20T16:45:56+00:00"
         },
         {
@@ -3537,16 +3493,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"
         },
         {
@@ -3962,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"
         },
         {
@@ -4339,16 +4271,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"
         },
         {
@@ -4469,43 +4391,29 @@
             ],
             "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-03-30T11:41:10+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v5.0.8",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "5f8d5271303dad260692ba73dfa21777d38e124e"
+                "reference": "e544e24472d4c97b2d11ade7caacd446727c6bf9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/5f8d5271303dad260692ba73dfa21777d38e124e",
-                "reference": "5f8d5271303dad260692ba73dfa21777d38e124e",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/e544e24472d4c97b2d11ade7caacd446727c6bf9",
+                "reference": "e544e24472d4c97b2d11ade7caacd446727c6bf9",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5"
+                "php": ">=7.2.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -4536,21 +4444,7 @@
             ],
             "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-03-27T16:56:45+00:00"
+            "time": "2020-05-20T17:43:50+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -4620,20 +4514,6 @@
             ],
             "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-03-27T16:54:36+00:00"
         },
         {
@@ -4696,26 +4576,26 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v5.0.8",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "7cd0dafc4353a0f62e307df90b48466379c8cc91"
+                "reference": "6e4320f06d5f2cce0d96530162491f4465179157"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/7cd0dafc4353a0f62e307df90b48466379c8cc91",
-                "reference": "7cd0dafc4353a0f62e307df90b48466379c8cc91",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/6e4320f06d5f2cce0d96530162491f4465179157",
+                "reference": "6e4320f06d5f2cce0d96530162491f4465179157",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
+                "php": ">=7.2.5",
                 "symfony/polyfill-ctype": "~1.8"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -4742,43 +4622,29 @@
             ],
             "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-04-12T14:40:17+00:00"
+            "time": "2020-05-30T20:35:19+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v5.0.8",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "600a52c29afc0d1caa74acbec8d3095ca7e9910d"
+                "reference": "4298870062bfc667cb78d2b379be4bf5dec5f187"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/600a52c29afc0d1caa74acbec8d3095ca7e9910d",
-                "reference": "600a52c29afc0d1caa74acbec8d3095ca7e9910d",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/4298870062bfc667cb78d2b379be4bf5dec5f187",
+                "reference": "4298870062bfc667cb78d2b379be4bf5dec5f187",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5"
+                "php": ">=7.2.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -4805,21 +4671,7 @@
             ],
             "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-03-27T16:56:45+00:00"
+            "time": "2020-05-20T17:43:50+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -4877,20 +4729,6 @@
                 "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-05-12T16:14:59+00:00"
         },
         {
@@ -4953,20 +4791,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"
         },
         {
@@ -5026,20 +4850,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"
         },
         {
@@ -5095,20 +4905,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"
         },
         {
@@ -5167,20 +4963,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"
         },
         {
@@ -5230,20 +5012,6 @@
             ],
             "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-04-15T15:56:18+00:00"
         },
         {
@@ -5720,16 +5488,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.138.7",
+            "version": "3.140.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "6b9f3fcea4dfa6092c628c790ca6d369a75453b7"
+                "reference": "7e37960c1103ee211932be51b2282b41c948a5f0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/6b9f3fcea4dfa6092c628c790ca6d369a75453b7",
-                "reference": "6b9f3fcea4dfa6092c628c790ca6d369a75453b7",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/7e37960c1103ee211932be51b2282b41c948a5f0",
+                "reference": "7e37960c1103ee211932be51b2282b41c948a5f0",
                 "shasum": ""
             },
             "require": {
@@ -5800,7 +5568,7 @@
                 "s3",
                 "sdk"
             ],
-            "time": "2020-05-22T18:11:09+00:00"
+            "time": "2020-06-05T18:12:25+00:00"
         },
         {
             "name": "beberlei/assert",
@@ -6018,16 +5786,16 @@
         },
         {
             "name": "codeception/codeception",
-            "version": "4.1.4",
+            "version": "4.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/Codeception.git",
-                "reference": "55d8d1d882fa0777e47de17b04c29b3c50fe29e7"
+                "reference": "24f2345329b1059f1208f65581fc632a4a6e5a55"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/55d8d1d882fa0777e47de17b04c29b3c50fe29e7",
-                "reference": "55d8d1d882fa0777e47de17b04c29b3c50fe29e7",
+                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/24f2345329b1059f1208f65581fc632a4a6e5a55",
+                "reference": "24f2345329b1059f1208f65581fc632a4a6e5a55",
                 "shasum": ""
             },
             "require": {
@@ -6099,13 +5867,7 @@
                 "functional testing",
                 "unit testing"
             ],
-            "funding": [
-                {
-                    "url": "https://opencollective.com/codeception",
-                    "type": "open_collective"
-                }
-            ],
-            "time": "2020-03-23T17:07:20+00:00"
+            "time": "2020-05-24T13:58:47+00:00"
         },
         {
             "name": "codeception/lib-asserts",
@@ -6249,16 +6011,16 @@
         },
         {
             "name": "codeception/module-webdriver",
-            "version": "1.0.8",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/module-webdriver.git",
-                "reference": "da55466876d9e73c09917f495b923395b1cdf92a"
+                "reference": "09c167817393090ce3dbce96027d94656b1963ce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/module-webdriver/zipball/da55466876d9e73c09917f495b923395b1cdf92a",
-                "reference": "da55466876d9e73c09917f495b923395b1cdf92a",
+                "url": "https://api.github.com/repos/Codeception/module-webdriver/zipball/09c167817393090ce3dbce96027d94656b1963ce",
+                "reference": "09c167817393090ce3dbce96027d94656b1963ce",
                 "shasum": ""
             },
             "require": {
@@ -6300,7 +6062,7 @@
                 "browser-testing",
                 "codeception"
             ],
-            "time": "2020-04-29T13:45:52+00:00"
+            "time": "2020-05-31T08:47:24+00:00"
         },
         {
             "name": "codeception/phpunit-wrapper",
@@ -6530,22 +6292,22 @@
         },
         {
             "name": "doctrine/annotations",
-            "version": "1.10.2",
+            "version": "1.10.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/annotations.git",
-                "reference": "b9d758e831c70751155c698c2f7df4665314a1cb"
+                "reference": "5db60a4969eba0e0c197a19c077780aadbc43c5d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/b9d758e831c70751155c698c2f7df4665314a1cb",
-                "reference": "b9d758e831c70751155c698c2f7df4665314a1cb",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/5db60a4969eba0e0c197a19c077780aadbc43c5d",
+                "reference": "5db60a4969eba0e0c197a19c077780aadbc43c5d",
                 "shasum": ""
             },
             "require": {
                 "doctrine/lexer": "1.*",
                 "ext-tokenizer": "*",
-                "php": "^7.1"
+                "php": "^7.1 || ^8.0"
             },
             "require-dev": {
                 "doctrine/cache": "1.*",
@@ -6595,24 +6357,24 @@
                 "docblock",
                 "parser"
             ],
-            "time": "2020-04-20T09:18:32+00:00"
+            "time": "2020-05-25T17:24:27+00:00"
         },
         {
             "name": "doctrine/cache",
-            "version": "1.10.0",
+            "version": "1.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/cache.git",
-                "reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62"
+                "reference": "35a4a70cd94e09e2259dfae7488afc6b474ecbd3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/cache/zipball/382e7f4db9a12dc6c19431743a2b096041bcdd62",
-                "reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62",
+                "url": "https://api.github.com/repos/doctrine/cache/zipball/35a4a70cd94e09e2259dfae7488afc6b474ecbd3",
+                "reference": "35a4a70cd94e09e2259dfae7488afc6b474ecbd3",
                 "shasum": ""
             },
             "require": {
-                "php": "~7.1"
+                "php": "~7.1 || ^8.0"
             },
             "conflict": {
                 "doctrine/common": ">2.2,<2.4"
@@ -6677,7 +6439,7 @@
                 "redis",
                 "xcache"
             ],
-            "time": "2019-11-29T15:36:20+00:00"
+            "time": "2020-05-27T16:24:54+00:00"
         },
         {
             "name": "doctrine/inflector",
@@ -6748,20 +6510,20 @@
         },
         {
             "name": "doctrine/instantiator",
-            "version": "1.3.0",
+            "version": "1.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "ae466f726242e637cebdd526a7d991b9433bacf1"
+                "reference": "f350df0268e904597e3bd9c4685c53e0e333feea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/ae466f726242e637cebdd526a7d991b9433bacf1",
-                "reference": "ae466f726242e637cebdd526a7d991b9433bacf1",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f350df0268e904597e3bd9c4685c53e0e333feea",
+                "reference": "f350df0268e904597e3bd9c4685c53e0e333feea",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": "^7.1 || ^8.0"
             },
             "require-dev": {
                 "doctrine/coding-standard": "^6.0",
@@ -6800,24 +6562,24 @@
                 "constructor",
                 "instantiate"
             ],
-            "time": "2019-10-21T16:45:58+00:00"
+            "time": "2020-05-29T17:27:14+00:00"
         },
         {
             "name": "doctrine/lexer",
-            "version": "1.2.0",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/lexer.git",
-                "reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6"
+                "reference": "e864bbf5904cb8f5bb334f99209b48018522f042"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6",
-                "reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042",
+                "reference": "e864bbf5904cb8f5bb334f99209b48018522f042",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2"
+                "php": "^7.2 || ^8.0"
             },
             "require-dev": {
                 "doctrine/coding-standard": "^6.0",
@@ -6862,7 +6624,7 @@
                 "parser",
                 "php"
             ],
-            "time": "2019-10-30T14:39:59+00:00"
+            "time": "2020-05-25T17:44:05+00:00"
         },
         {
             "name": "friendsofphp/php-cs-fixer",
@@ -6953,12 +6715,6 @@
                 }
             ],
             "description": "A tool to automatically fix PHP code style",
-            "funding": [
-                {
-                    "url": "https://github.com/keradus",
-                    "type": "github"
-                }
-            ],
             "time": "2020-04-15T18:51:10+00:00"
         },
         {
@@ -7217,12 +6973,6 @@
                 "sftp",
                 "storage"
             ],
-            "funding": [
-                {
-                    "url": "https://offset.earth/frankdejonge",
-                    "type": "other"
-                }
-            ],
             "time": "2020-05-18T15:13:39+00:00"
         },
         {
@@ -7333,16 +7083,16 @@
         },
         {
             "name": "magento/magento2-functional-testing-framework",
-            "version": "dev-3.0.0-RC3",
+            "version": "dev-3.0.0-RC4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/magento/magento2-functional-testing-framework.git",
-                "reference": "aea30ae1df2fe6618478ba8813864c204561fde3"
+                "reference": "e36fc50f8a73a9d22239895fb819cc16767a5179"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/aea30ae1df2fe6618478ba8813864c204561fde3",
-                "reference": "aea30ae1df2fe6618478ba8813864c204561fde3",
+                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/e36fc50f8a73a9d22239895fb819cc16767a5179",
+                "reference": "e36fc50f8a73a9d22239895fb819cc16767a5179",
                 "shasum": ""
             },
             "require": {
@@ -7369,7 +7119,8 @@
                 "symfony/finder": "^5.0",
                 "symfony/mime": "^5.0",
                 "symfony/process": "^4.4",
-                "vlucas/phpdotenv": "^2.4"
+                "vlucas/phpdotenv": "^2.4",
+                "weew/helpers-array": "^1.3"
             },
             "replace": {
                 "facebook/webdriver": "^1.7.1"
@@ -7417,7 +7168,7 @@
                 "magento",
                 "testing"
             ],
-            "time": "2020-05-22T19:17:05+00:00"
+            "time": "2020-06-05T22:31:19+00:00"
         },
         {
             "name": "mikey179/vfsstream",
@@ -8425,20 +8176,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"
         },
         {
@@ -8553,12 +8290,6 @@
                 "filesystem",
                 "iterator"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-04-18T05:02:12+00:00"
         },
         {
@@ -8707,12 +8438,6 @@
             "keywords": [
                 "timer"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-04-20T06:00:37+00:00"
         },
         {
@@ -8762,12 +8487,6 @@
             "keywords": [
                 "tokenizer"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-05-06T09:56:31+00:00"
         },
         {
@@ -8856,16 +8575,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"
         },
         {
@@ -9006,12 +8715,6 @@
             ],
             "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-04-30T05:58:10+00:00"
         },
         {
@@ -9177,12 +8880,6 @@
                 "unidiff",
                 "unified diff"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-05-08T05:01:12+00:00"
         },
         {
@@ -9236,12 +8933,6 @@
                 "environment",
                 "hhvm"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-04-14T13:36:52+00:00"
         },
         {
@@ -9925,20 +9616,6 @@
             ],
             "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-04-15T15:59:10+00:00"
         },
         {
@@ -10012,49 +9689,87 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
+            "time": "2020-04-28T17:58:55+00:00"
+        },
+        {
+            "name": "symfony/deprecation-contracts",
+            "version": "v2.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/deprecation-contracts.git",
+                "reference": "dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337",
+                "reference": "dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.1-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "function.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
                 {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
                 },
                 {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "time": "2020-04-28T17:58:55+00:00"
+            "description": "A generic function and convention to trigger deprecation notices",
+            "homepage": "https://symfony.com",
+            "time": "2020-05-27T08:34:37+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v5.0.8",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "e47fdf8b24edc12022ba52923150ec6484d7f57d"
+                "reference": "e0d853bddc2b2cfb0d67b0b4496c03fffe1d37fa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e47fdf8b24edc12022ba52923150ec6484d7f57d",
-                "reference": "e47fdf8b24edc12022ba52923150ec6484d7f57d",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e0d853bddc2b2cfb0d67b0b4496c03fffe1d37fa",
+                "reference": "e0d853bddc2b2cfb0d67b0b4496c03fffe1d37fa",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
-                "symfony/mime": "^4.4|^5.0",
-                "symfony/polyfill-mbstring": "~1.1"
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1",
+                "symfony/polyfill-mbstring": "~1.1",
+                "symfony/polyfill-php80": "^1.15"
             },
             "require-dev": {
                 "predis/predis": "~1.0",
-                "symfony/expression-language": "^4.4|^5.0"
+                "symfony/cache": "^4.4|^5.0",
+                "symfony/expression-language": "^4.4|^5.0",
+                "symfony/mime": "^4.4|^5.0"
+            },
+            "suggest": {
+                "symfony/mime": "To use the file extension guesser"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -10081,40 +9796,27 @@
             ],
             "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-04-18T20:50:06+00:00"
+            "time": "2020-05-24T12:18:07+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v5.0.8",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "5d6c81c39225a750f3f43bee15f03093fb9aaa0b"
+                "reference": "56261f89385f9d13cf843a5101ac72131190bc91"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/5d6c81c39225a750f3f43bee15f03093fb9aaa0b",
-                "reference": "5d6c81c39225a750f3f43bee15f03093fb9aaa0b",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/56261f89385f9d13cf843a5101ac72131190bc91",
+                "reference": "56261f89385f9d13cf843a5101ac72131190bc91",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
+                "php": ">=7.2.5",
                 "symfony/polyfill-intl-idn": "^1.10",
-                "symfony/polyfill-mbstring": "^1.0"
+                "symfony/polyfill-mbstring": "^1.0",
+                "symfony/polyfill-php80": "^1.15"
             },
             "conflict": {
                 "symfony/mailer": "<4.4"
@@ -10126,7 +9828,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -10157,21 +9859,7 @@
                 "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-04-17T03:29:44+00:00"
+            "time": "2020-05-25T12:33:44+00:00"
         },
         {
             "name": "symfony/options-resolver",
@@ -10225,20 +9913,6 @@
                 "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-04-06T10:40:56+00:00"
         },
         {
@@ -10298,20 +9972,68 @@
                 "portable",
                 "shim"
             ],
-            "funding": [
+            "time": "2020-05-12T16:47:27+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php80",
+            "version": "v1.17.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php80.git",
+                "reference": "5e30b2799bc1ad68f7feb62b60a73743589438dd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/5e30b2799bc1ad68f7feb62b60a73743589438dd",
+                "reference": "5e30b2799bc1ad68f7feb62b60a73743589438dd",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0.8"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.17-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ],
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
                 {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
+                    "name": "Ion Bazan",
+                    "email": "ion.bazan@gmail.com"
                 },
                 {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
                 },
                 {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
+            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
             "time": "2020-05-12T16:47:27+00:00"
         },
         {
@@ -10362,38 +10084,25 @@
             ],
             "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-03-27T16:56:45+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v5.0.8",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "482fb4e710e5af3e0e78015f19aa716ad953392f"
+                "reference": "ea342353a3ef4f453809acc4ebc55382231d4d23"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/482fb4e710e5af3e0e78015f19aa716ad953392f",
-                "reference": "482fb4e710e5af3e0e78015f19aa716ad953392f",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/ea342353a3ef4f453809acc4ebc55382231d4d23",
+                "reference": "ea342353a3ef4f453809acc4ebc55382231d4d23",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1",
                 "symfony/polyfill-ctype": "~1.8"
             },
             "conflict": {
@@ -10405,10 +10114,13 @@
             "suggest": {
                 "symfony/console": "For validating YAML files using the lint command"
             },
+            "bin": [
+                "Resources/bin/yaml-lint"
+            ],
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -10435,21 +10147,7 @@
             ],
             "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-04-28T17:58:55+00:00"
+            "time": "2020-05-20T17:43:50+00:00"
         },
         {
             "name": "thecodingmachine/safe",
@@ -10724,16 +10422,6 @@
                 "env",
                 "environment"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/GrahamCampbell",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-05-02T13:38:00+00:00"
         },
         {
@@ -10849,6 +10537,5 @@
         "ext-zip": "*",
         "lib-libxml": "*"
     },
-    "platform-dev": [],
-    "plugin-api-version": "1.1.0"
+    "platform-dev": []
 }

From 15372562b622adf6c88749086dc419b9cb950d57 Mon Sep 17 00:00:00 2001
From: Ji Lu <jilu1@adobe.com>
Date: Tue, 2 Jun 2020 18:43:06 -0500
Subject: [PATCH 0390/1718] MQE-2150: group value "skip" no longer causes test
 to be skipped

---
 .../AdminLockAdminUserWhenCreatingNewIntegrationTest.xml     | 2 --
 .../Mftf/Test/AdminLockAdminUserWhenCreatingNewRoleTest.xml  | 4 +---
 app/code/Magento/User/Test/Mftf/Test/AdminUpdateUserTest.xml | 5 +++--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Security/Test/Mftf/Test/AdminLockAdminUserWhenCreatingNewIntegrationTest.xml b/app/code/Magento/Security/Test/Mftf/Test/AdminLockAdminUserWhenCreatingNewIntegrationTest.xml
index a75f65dffeca3..83e3479c753e4 100644
--- a/app/code/Magento/Security/Test/Mftf/Test/AdminLockAdminUserWhenCreatingNewIntegrationTest.xml
+++ b/app/code/Magento/Security/Test/Mftf/Test/AdminLockAdminUserWhenCreatingNewIntegrationTest.xml
@@ -18,8 +18,6 @@
             <testCaseId value="MC-14382" />
             <group value="security"/>
             <group value="mtf_migrated"/>
-            <!-- skip due to MQE-1964 -->
-            <group value="skip"/>
         </annotations>
         <before>
             <!-- Log in to Admin Panel -->
diff --git a/app/code/Magento/Security/Test/Mftf/Test/AdminLockAdminUserWhenCreatingNewRoleTest.xml b/app/code/Magento/Security/Test/Mftf/Test/AdminLockAdminUserWhenCreatingNewRoleTest.xml
index 3d04f3eed4daf..3fffbcd480761 100644
--- a/app/code/Magento/Security/Test/Mftf/Test/AdminLockAdminUserWhenCreatingNewRoleTest.xml
+++ b/app/code/Magento/Security/Test/Mftf/Test/AdminLockAdminUserWhenCreatingNewRoleTest.xml
@@ -18,8 +18,6 @@
             <testCaseId value="MC-14384" />
             <group value="security"/>
             <group value="mtf_migrated"/>
-            <!-- skip due to MQE-1964 -->
-            <group value="skip"/>
         </annotations>
         <before>
             <!-- Log in to Admin Panel -->
@@ -41,7 +39,7 @@
             <argument name="message" value="The password entered for the current user is invalid. Verify the password and try again." />
             <argument name="messageType" value="error" />
         </actionGroup>
-        
+
         <actionGroup ref="AdminFillUserRoleFormActionGroup" stepKey="fillFieldSecondAttempt">
             <argument name="role" value="roleAdministrator" />
             <argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID" />
diff --git a/app/code/Magento/User/Test/Mftf/Test/AdminUpdateUserTest.xml b/app/code/Magento/User/Test/Mftf/Test/AdminUpdateUserTest.xml
index 501e9520c6367..0943b33e8a711 100644
--- a/app/code/Magento/User/Test/Mftf/Test/AdminUpdateUserTest.xml
+++ b/app/code/Magento/User/Test/Mftf/Test/AdminUpdateUserTest.xml
@@ -18,8 +18,9 @@
             <description value="Change full access role for admin user to custom one with restricted permission (Sales)"/>
             <group value="user"/>
             <group value="mtf_migrated"/>
-            <!-- skip due to MQE-1964 -->
-            <group value="skip"/>
+            <skip>
+                <issueId value="MQE-1964"/>
+            </skip>
         </annotations>
 
         <before>

From 516f9928bd02b51f24264c8716ad0f606f989087 Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Wed, 3 Jun 2020 23:58:27 +0300
Subject: [PATCH 0391/1718] magento/magento2#: GraphQl.
 setPaymentMethodAndPlaceOrder. Remove redundant logic.

---
 .../Resolver/SetPaymentAndPlaceOrder.php      |  7 +--
 .../SetPaymentMethodAndPlaceOrderTest.php     | 44 +++++++++++++++++++
 .../SetPaymentMethodAndPlaceOrderTest.php     | 44 +++++++++++++++++++
 3 files changed, 92 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentAndPlaceOrder.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentAndPlaceOrder.php
index dd4ce8fe7f7a6..c2e4bfa44c9bb 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentAndPlaceOrder.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentAndPlaceOrder.php
@@ -71,14 +71,15 @@ public function __construct(
      */
     public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
     {
-        if (!isset($args['input']['cart_id']) || empty($args['input']['cart_id'])) {
+        if (empty($args['input']['cart_id'])) {
             throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
         }
-        $maskedCartId = $args['input']['cart_id'];
 
-        if (!isset($args['input']['payment_method']['code']) || empty($args['input']['payment_method']['code'])) {
+        if (empty($args['input']['payment_method']['code'])) {
             throw new GraphQlInputException(__('Required parameter "code" for "payment_method" is missing.'));
         }
+
+        $maskedCartId = $args['input']['cart_id'];
         $paymentData = $args['input']['payment_method'];
 
         $storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodAndPlaceOrderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodAndPlaceOrderTest.php
index 21a8d6ae94312..ff8d4f4280c10 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodAndPlaceOrderTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPaymentMethodAndPlaceOrderTest.php
@@ -281,6 +281,50 @@ public function testSetDisabledPaymentOnCart()
         $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @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
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+     */
+    public function testPlaceOrderWitMissingCartId()
+    {
+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
+        $maskedQuoteId = "";
+
+        $query = $this->getQuery($maskedQuoteId, $methodCode);
+
+        $this->expectExceptionMessage(
+            "Required parameter \"cart_id\" is missing"
+        );
+        $this->graphQlMutation($query);
+    }
+
+    /**
+     * @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
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+     */
+    public function testPlaceOrderWithMissingPaymentMethod()
+    {
+        $methodCode = "";
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+        $query = $this->getQuery($maskedQuoteId, $methodCode);
+
+        $this->expectExceptionMessage(
+            "Required parameter \"code\" for \"payment_method\" is missing."
+        );
+        $this->graphQlMutation($query);
+    }
+
     /**
      * @param string $maskedQuoteId
      * @param string $methodCode
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodAndPlaceOrderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodAndPlaceOrderTest.php
index dbc10700794fa..78691d8cbd889 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodAndPlaceOrderTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPaymentMethodAndPlaceOrderTest.php
@@ -218,6 +218,50 @@ public function testSetDisabledPaymentOnCart()
         $this->graphQlMutation($query);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @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
+     */
+    public function testPlaceOrderWitMissingCartId()
+    {
+        $methodCode = Checkmo::PAYMENT_METHOD_CHECKMO_CODE;
+        $maskedQuoteId = "";
+
+        $query = $this->getQuery($maskedQuoteId, $methodCode);
+
+        $this->expectExceptionMessage(
+            "Required parameter \"cart_id\" is missing"
+        );
+        $this->graphQlMutation($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @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
+     */
+    public function testPlaceOrderWithMissingPaymentMethod()
+    {
+        $methodCode = "";
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
+
+        $query = $this->getQuery($maskedQuoteId, $methodCode);
+
+        $this->expectExceptionMessage(
+            "Required parameter \"code\" for \"payment_method\" is missing."
+        );
+        $this->graphQlMutation($query);
+    }
+
     /**
      * @param string $maskedQuoteId
      * @param string $methodCode

From 415291bab1401e0154a4bc20337f38affc004542 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Sun, 7 Jun 2020 17:08:36 +0200
Subject: [PATCH 0392/1718] Upgrade PHPUnit and fix failing / warnings in tests

---
 .../Test/Unit/Model/Export/ProductTest.php    |  15 +-
 .../Command/XmlCatalogGenerateCommandTest.php |   4 +-
 .../Media/ExternalVideoEntryConverterTest.php |  86 ++-
 .../Quote/Address/Total/SubtotalTest.php      |  63 ++-
 .../Model/Order/CreditmemoFactoryTest.php     |  19 +-
 composer.lock                                 | 509 +++++++++++++-----
 6 files changed, 457 insertions(+), 239 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Export/ProductTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Export/ProductTest.php
index bf1d3772b92a0..1ad82497119ba 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Export/ProductTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Export/ProductTest.php
@@ -8,12 +8,14 @@
 namespace Magento\CatalogImportExport\Test\Unit\Model\Export;
 
 use Magento\Catalog\Model\Product\LinkTypeProvider;
+use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
 use Magento\CatalogImportExport\Model\Export\Product;
 use Magento\CatalogImportExport\Model\Export\Product\Type\Factory;
 use Magento\CatalogImportExport\Model\Export\RowCustomizer\Composite;
 use Magento\Eav\Model\Config;
 use Magento\Eav\Model\Entity\Collection\AbstractCollection;
 use Magento\Eav\Model\Entity\Type;
+use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory as AttributeSetCollectionFactory;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Logger\Monolog;
@@ -83,7 +85,7 @@ class ProductTest extends TestCase
     protected $attrSetColFactory;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory|MockObject
+     * @var CategoryCollectionFactory|MockObject
      */
     protected $categoryColFactory;
 
@@ -174,15 +176,14 @@ protected function setUp(): void
             ->onlyMethods(['create'])
             ->getMock();
 
-        $this->attrSetColFactory = $this->getMockBuilder(
-            \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory::class
-        )->addMethods(['setEntityTypeFilter'])
+        $this->attrSetColFactory = $this->getMockBuilder(AttributeSetCollectionFactory::class)
+            ->disableOriginalConstructor()
+            ->addMethods(['setEntityTypeFilter'])
             ->onlyMethods(['create'])
             ->getMock();
 
-        $this->categoryColFactory = $this->getMockBuilder(
-            \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory::class
-        )->addMethods(['addNameToResult'])
+        $this->categoryColFactory = $this->getMockBuilder(CategoryCollectionFactory::class)
+            ->disableOriginalConstructor()->addMethods(['addNameToResult'])
             ->onlyMethods(['create'])
             ->getMock();
 
diff --git a/app/code/Magento/Developer/Test/Unit/Console/Command/XmlCatalogGenerateCommandTest.php b/app/code/Magento/Developer/Test/Unit/Console/Command/XmlCatalogGenerateCommandTest.php
index 919ee0e060468..152bdfef376fb 100644
--- a/app/code/Magento/Developer/Test/Unit/Console/Command/XmlCatalogGenerateCommandTest.php
+++ b/app/code/Magento/Developer/Test/Unit/Console/Command/XmlCatalogGenerateCommandTest.php
@@ -46,7 +46,7 @@ public function testExecuteBadType()
             ->with(
                 $this->equalTo(['urn:magento:framework:Module/etc/module.xsd' => $fixtureXmlFile]),
                 $this->equalTo('test')
-            )->willReturn(null);
+            );
 
         $formats = ['phpstorm' => $phpstormFormatMock];
         $readFactory = $this->createMock(ReadFactory::class);
@@ -97,7 +97,7 @@ public function testExecuteVsCodeFormat()
             ->with(
                 $this->equalTo(['urn:magento:framework:Module/etc/module.xsd' => $fixtureXmlFile]),
                 $this->equalTo('test')
-            )->willReturn(null);
+            );
 
         $formats = ['vscode' => $vscodeFormatMock];
         $readFactory = $this->createMock(ReadFactory::class);
diff --git a/app/code/Magento/ProductVideo/Test/Unit/Model/Product/Attribute/Media/ExternalVideoEntryConverterTest.php b/app/code/Magento/ProductVideo/Test/Unit/Model/Product/Attribute/Media/ExternalVideoEntryConverterTest.php
index 3ca043e205e87..a921bff76c8d6 100644
--- a/app/code/Magento/ProductVideo/Test/Unit/Model/Product/Attribute/Media/ExternalVideoEntryConverterTest.php
+++ b/app/code/Magento/ProductVideo/Test/Unit/Model/Product/Attribute/Media/ExternalVideoEntryConverterTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
@@ -26,34 +27,26 @@
  */
 class ExternalVideoEntryConverterTest extends TestCase
 {
-    /**
-     * @var MockObject|ProductAttributeMediaGalleryEntryInterfaceFactory
-     */
-    protected $mediaGalleryEntryFactoryMock;
+    /** @var MockObject|ProductAttributeMediaGalleryEntryInterfaceFactory */
+    private $mediaGalleryEntryFactoryMock;
 
-    /**
-     * @var MockObject|ProductAttributeMediaGalleryEntryInterface
-     */
-    protected $mediaGalleryEntryMock;
+    /** @var MockObject|ProductAttributeMediaGalleryEntryInterface */
+    private $mediaGalleryEntryMock;
 
     /** @var MockObject|DataObjectHelper */
-    protected $dataObjectHelperMock;
+    private $dataObjectHelperMock;
 
     /** @var MockObject|VideoContentInterfaceFactory */
-    protected $videoEntryFactoryMock;
+    private $videoEntryFactoryMock;
 
     /** @var MockObject|VideoContentInterface */
-    protected $videoEntryMock;
+    private $videoEntryMock;
 
-    /**
-     * @var MockObject|ProductAttributeMediaGalleryEntryExtensionFactory
-     */
-    protected $mediaGalleryEntryExtensionFactoryMock;
+    /** @var MockObject|ProductAttributeMediaGalleryEntryExtensionFactory */
+    private $mediaGalleryEntryExtensionFactoryMock;
 
-    /**
-     * @var MockObject|ProductAttributeMediaGalleryEntryExtensionFactory
-     */
-    protected $mediaGalleryEntryExtensionMock;
+    /** @var MockObject|ProductAttributeMediaGalleryEntryExtension */
+    private $mediaGalleryEntryExtensionMock;
 
     /**
      * @var ObjectManager|ExternalVideoEntryConverter
@@ -62,33 +55,35 @@ class ExternalVideoEntryConverterTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->mediaGalleryEntryFactoryMock =
-            $this->createPartialMock(
-                ProductAttributeMediaGalleryEntryInterfaceFactory::class,
-                ['create']
-            );
+        $this->mediaGalleryEntryFactoryMock = $this->createPartialMock(
+            ProductAttributeMediaGalleryEntryInterfaceFactory::class,
+            ['create']
+        );
 
         $this->mediaGalleryEntryMock =
-            $this->createPartialMock(ProductAttributeMediaGalleryEntryInterface::class, [
-                'getId',
-                'setId',
-                'getMediaType',
-                'setMediaType',
-                'getLabel',
-                'setLabel',
-                'getPosition',
-                'setPosition',
-                'isDisabled',
-                'setDisabled',
-                'getTypes',
-                'setTypes',
-                'getFile',
-                'setFile',
-                'getContent',
-                'setContent',
-                'getExtensionAttributes',
-                'setExtensionAttributes'
-            ]);
+            $this->createPartialMock(
+                ProductAttributeMediaGalleryEntryInterface::class,
+                [
+                    'getId',
+                    'setId',
+                    'getMediaType',
+                    'setMediaType',
+                    'getLabel',
+                    'setLabel',
+                    'getPosition',
+                    'setPosition',
+                    'isDisabled',
+                    'setDisabled',
+                    'getTypes',
+                    'setTypes',
+                    'getFile',
+                    'setFile',
+                    'getContent',
+                    'setContent',
+                    'getExtensionAttributes',
+                    'setExtensionAttributes'
+                ]
+            );
 
         $this->mediaGalleryEntryFactoryMock->expects($this->any())->method('create')->willReturn(
             $this->mediaGalleryEntryMock
@@ -110,7 +105,8 @@ protected function setUp(): void
             );
 
         $this->mediaGalleryEntryExtensionMock = $this->getMockBuilder(ProductAttributeMediaGalleryEntryExtension::class)
-             ->addMethods(['getVideoProvider', 'setVideoContent', 'getVideoContent'])
+            ->addMethods(['getVideoProvider'])
+            ->onlyMethods(['setVideoContent', 'getVideoContent'])
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/SubtotalTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/SubtotalTest.php
index 2f8a5a344503c..17444c4bcda71 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/SubtotalTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/SubtotalTest.php
@@ -32,22 +32,16 @@
  */
 class SubtotalTest extends TestCase
 {
-    /**
-     * @var ObjectManager
-     */
+    /** @var ObjectManager */
     protected $objectManager;
 
-    /**
-     * @var Subtotal
-     */
+    /**  @var Subtotal */
     protected $subtotalModel;
 
     /** @var MockObject */
     protected $stockItemMock;
 
-    /**
-     * @var MockObject
-     */
+    /** @var MockObject */
     protected $stockRegistry;
 
     protected function setUp(): void
@@ -57,14 +51,15 @@ protected function setUp(): void
             Subtotal::class
         );
 
-        $this->stockRegistry = $this->createPartialMock(
-            StockRegistry::class,
-            ['getStockItem', '__wakeup']
-        );
-        $this->stockItemMock = $this->createPartialMock(
-            \Magento\CatalogInventory\Model\Stock\Item::class,
-            ['getIsInStock', '__wakeup']
-        );
+        $this->stockRegistry = $this->getMockBuilder(StockRegistry::class)
+            ->disableOriginalConstructor()
+            ->addMethods(['__wakeup'])
+            ->onlyMethods(['getStockItem'])
+            ->getMock();
+        $this->stockItemMock = $this->getMockBuilder(\Magento\CatalogInventory\Model\Stock\Item::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['getIsInStock', '__wakeup'])
+            ->getMock();
     }
 
     /**
@@ -110,10 +105,11 @@ public function testCollect($price, $originalPrice, $itemHasParent, $expectedPri
             ]
         );
         /** @var Address|MockObject $address */
-        $address = $this->createPartialMock(
-            Address::class,
-            ['setTotalQty', 'getTotalQty', 'removeItem', 'getQuote']
-        );
+        $address = $this->getMockBuilder(Address::class)
+            ->addMethods(['setTotalQty', 'getTotalQty'])
+            ->onlyMethods(['removeItem', 'getQuote'])
+            ->disableOriginalConstructor()
+            ->getMock();
 
         /** @var Product|MockObject $product */
         $product = $this->createMock(Product::class);
@@ -161,10 +157,10 @@ public function testCollect($price, $originalPrice, $itemHasParent, $expectedPri
         $shippingAssignmentMock->expects($this->exactly(2))->method('getShipping')->willReturn($shipping);
         $shippingAssignmentMock->expects($this->once())->method('getItems')->willReturn([$quoteItem]);
 
-        $total = $this->createPartialMock(
-            Total::class,
-            ['setBaseVirtualAmount', 'setVirtualAmount']
-        );
+        $total = $this->getMockBuilder(Total::class)
+            ->addMethods(['setBaseVirtualAmount', 'setVirtualAmount'])
+            ->getMock();
+
         $total->expects($this->once())->method('setBaseVirtualAmount')->willReturnSelf();
         $total->expects($this->once())->method('setVirtualAmount')->willReturnSelf();
 
@@ -185,7 +181,10 @@ public function testFetch()
         ];
 
         $quoteMock = $this->createMock(Quote::class);
-        $totalMock = $this->createPartialMock(Total::class, ['getSubtotal']);
+        $totalMock = $this->getMockBuilder(Total::class)
+            ->addMethods(['getSubtotal'])
+            ->disableOriginalConstructor()
+            ->getMock();
         $totalMock->expects($this->once())->method('getSubtotal')->willReturn(100);
 
         $this->assertEquals($expectedResult, $this->subtotalModel->fetch($quoteMock, $totalMock));
@@ -229,13 +228,11 @@ public function testCollectWithInvalidItems()
         $address->expects($this->once())
             ->method('removeItem')
             ->with($addressItemId);
-        $addressItem = $this->createPartialMock(
-            AddressItem::class,
-            [
-                'getId',
-                'getQuoteItemId'
-            ]
-        );
+        $addressItem = $this->getMockBuilder(AddressItem::class)
+            ->onlyMethods(['getId'])
+            ->addMethods(['getQuoteItemId'])
+            ->disableOriginalConstructor()
+            ->getMock();
         $addressItem->setAddress($address);
         $addressItem->method('getId')
             ->willReturn($addressItemId);
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoFactoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoFactoryTest.php
index 4cf571d3b6108..47e14b91b106e 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoFactoryTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoFactoryTest.php
@@ -49,18 +49,13 @@ class CreditmemoFactoryTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->orderItemMock = $this->createPartialMock(
-            Item::class,
-            ['getChildrenItems', 'isDummy', 'getHasChildren', 'getId', 'getParentItemId']
-        );
-        $this->orderChildItemOneMock = $this->createPartialMock(
-            Item::class,
-            ['getQtyToRefund', 'getId']
-        );
-        $this->orderChildItemTwoMock = $this->createPartialMock(
-            Item::class,
-            ['getQtyToRefund', 'getId']
-        );
+        $this->orderItemMock = $this->getMockBuilder(Item::class)
+            ->onlyMethods(['getChildrenItems', 'isDummy', 'getId', 'getParentItemId'])
+            ->addMethods(['getHasChildren'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->orderChildItemOneMock = $this->createPartialMock(Item::class, ['getQtyToRefund', 'getId']);
+        $this->orderChildItemTwoMock = $this->createPartialMock(Item::class, ['getQtyToRefund', 'getId']);
         $this->testMethod = new ReflectionMethod(CreditmemoFactory::class, 'canRefundItem');
 
         $objectManagerHelper = new ObjectManagerHelper($this);
diff --git a/composer.lock b/composer.lock
index 6a47e7e44ab69..dc95c8fa4fdf9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -432,16 +432,16 @@
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "1.4.1",
+            "version": "1.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "1ab9842d69e64fb3a01be6b656501032d1b78cb7"
+                "reference": "fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/1ab9842d69e64fb3a01be6b656501032d1b78cb7",
-                "reference": "1ab9842d69e64fb3a01be6b656501032d1b78cb7",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51",
+                "reference": "fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51",
                 "shasum": ""
             },
             "require": {
@@ -476,9 +476,17 @@
                 {
                     "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-03-01T12:26:26+00:00"
+            "time": "2020-06-04T11:16:35+00:00"
         },
         {
             "name": "container-interop/container-interop",
@@ -4487,25 +4495,25 @@
         },
         {
             "name": "symfony/css-selector",
-            "version": "v5.0.8",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "5f8d5271303dad260692ba73dfa21777d38e124e"
+                "reference": "e544e24472d4c97b2d11ade7caacd446727c6bf9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/5f8d5271303dad260692ba73dfa21777d38e124e",
-                "reference": "5f8d5271303dad260692ba73dfa21777d38e124e",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/e544e24472d4c97b2d11ade7caacd446727c6bf9",
+                "reference": "e544e24472d4c97b2d11ade7caacd446727c6bf9",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5"
+                "php": ">=7.2.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -4550,7 +4558,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-03-27T16:56:45+00:00"
+            "time": "2020-05-20T17:43:50+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -4696,26 +4704,26 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v5.0.8",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "7cd0dafc4353a0f62e307df90b48466379c8cc91"
+                "reference": "6e4320f06d5f2cce0d96530162491f4465179157"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/7cd0dafc4353a0f62e307df90b48466379c8cc91",
-                "reference": "7cd0dafc4353a0f62e307df90b48466379c8cc91",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/6e4320f06d5f2cce0d96530162491f4465179157",
+                "reference": "6e4320f06d5f2cce0d96530162491f4465179157",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
+                "php": ">=7.2.5",
                 "symfony/polyfill-ctype": "~1.8"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -4756,29 +4764,29 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-04-12T14:40:17+00:00"
+            "time": "2020-05-30T20:35:19+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v5.0.8",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "600a52c29afc0d1caa74acbec8d3095ca7e9910d"
+                "reference": "4298870062bfc667cb78d2b379be4bf5dec5f187"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/600a52c29afc0d1caa74acbec8d3095ca7e9910d",
-                "reference": "600a52c29afc0d1caa74acbec8d3095ca7e9910d",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/4298870062bfc667cb78d2b379be4bf5dec5f187",
+                "reference": "4298870062bfc667cb78d2b379be4bf5dec5f187",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5"
+                "php": ">=7.2.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -4819,7 +4827,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-03-27T16:56:45+00:00"
+            "time": "2020-05-20T17:43:50+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -5248,20 +5256,20 @@
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v2.0.1",
+            "version": "v2.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "144c5e51266b281231e947b51223ba14acf1a749"
+                "reference": "66a8f0957a3ca54e4f724e49028ab19d75a8918b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/144c5e51266b281231e947b51223ba14acf1a749",
-                "reference": "144c5e51266b281231e947b51223ba14acf1a749",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/66a8f0957a3ca54e4f724e49028ab19d75a8918b",
+                "reference": "66a8f0957a3ca54e4f724e49028ab19d75a8918b",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
+                "php": ">=7.2.5",
                 "psr/container": "^1.0"
             },
             "suggest": {
@@ -5270,7 +5278,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "2.1-dev"
                 }
             },
             "autoload": {
@@ -5302,7 +5310,21 @@
                 "interoperability",
                 "standards"
             ],
-            "time": "2019-11-18T17:27:11+00:00"
+            "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": "tedivm/jshrink",
@@ -5720,16 +5742,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.138.7",
+            "version": "3.140.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "6b9f3fcea4dfa6092c628c790ca6d369a75453b7"
+                "reference": "7e37960c1103ee211932be51b2282b41c948a5f0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/6b9f3fcea4dfa6092c628c790ca6d369a75453b7",
-                "reference": "6b9f3fcea4dfa6092c628c790ca6d369a75453b7",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/7e37960c1103ee211932be51b2282b41c948a5f0",
+                "reference": "7e37960c1103ee211932be51b2282b41c948a5f0",
                 "shasum": ""
             },
             "require": {
@@ -5800,7 +5822,7 @@
                 "s3",
                 "sdk"
             ],
-            "time": "2020-05-22T18:11:09+00:00"
+            "time": "2020-06-05T18:12:25+00:00"
         },
         {
             "name": "beberlei/assert",
@@ -6018,16 +6040,16 @@
         },
         {
             "name": "codeception/codeception",
-            "version": "4.1.4",
+            "version": "4.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/Codeception.git",
-                "reference": "55d8d1d882fa0777e47de17b04c29b3c50fe29e7"
+                "reference": "24f2345329b1059f1208f65581fc632a4a6e5a55"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/55d8d1d882fa0777e47de17b04c29b3c50fe29e7",
-                "reference": "55d8d1d882fa0777e47de17b04c29b3c50fe29e7",
+                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/24f2345329b1059f1208f65581fc632a4a6e5a55",
+                "reference": "24f2345329b1059f1208f65581fc632a4a6e5a55",
                 "shasum": ""
             },
             "require": {
@@ -6105,7 +6127,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2020-03-23T17:07:20+00:00"
+            "time": "2020-05-24T13:58:47+00:00"
         },
         {
             "name": "codeception/lib-asserts",
@@ -6249,16 +6271,16 @@
         },
         {
             "name": "codeception/module-webdriver",
-            "version": "1.0.8",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/module-webdriver.git",
-                "reference": "da55466876d9e73c09917f495b923395b1cdf92a"
+                "reference": "09c167817393090ce3dbce96027d94656b1963ce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/module-webdriver/zipball/da55466876d9e73c09917f495b923395b1cdf92a",
-                "reference": "da55466876d9e73c09917f495b923395b1cdf92a",
+                "url": "https://api.github.com/repos/Codeception/module-webdriver/zipball/09c167817393090ce3dbce96027d94656b1963ce",
+                "reference": "09c167817393090ce3dbce96027d94656b1963ce",
                 "shasum": ""
             },
             "require": {
@@ -6300,7 +6322,7 @@
                 "browser-testing",
                 "codeception"
             ],
-            "time": "2020-04-29T13:45:52+00:00"
+            "time": "2020-05-31T08:47:24+00:00"
         },
         {
             "name": "codeception/phpunit-wrapper",
@@ -6530,22 +6552,22 @@
         },
         {
             "name": "doctrine/annotations",
-            "version": "1.10.2",
+            "version": "1.10.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/annotations.git",
-                "reference": "b9d758e831c70751155c698c2f7df4665314a1cb"
+                "reference": "5db60a4969eba0e0c197a19c077780aadbc43c5d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/b9d758e831c70751155c698c2f7df4665314a1cb",
-                "reference": "b9d758e831c70751155c698c2f7df4665314a1cb",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/5db60a4969eba0e0c197a19c077780aadbc43c5d",
+                "reference": "5db60a4969eba0e0c197a19c077780aadbc43c5d",
                 "shasum": ""
             },
             "require": {
                 "doctrine/lexer": "1.*",
                 "ext-tokenizer": "*",
-                "php": "^7.1"
+                "php": "^7.1 || ^8.0"
             },
             "require-dev": {
                 "doctrine/cache": "1.*",
@@ -6595,24 +6617,24 @@
                 "docblock",
                 "parser"
             ],
-            "time": "2020-04-20T09:18:32+00:00"
+            "time": "2020-05-25T17:24:27+00:00"
         },
         {
             "name": "doctrine/cache",
-            "version": "1.10.0",
+            "version": "1.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/cache.git",
-                "reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62"
+                "reference": "35a4a70cd94e09e2259dfae7488afc6b474ecbd3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/cache/zipball/382e7f4db9a12dc6c19431743a2b096041bcdd62",
-                "reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62",
+                "url": "https://api.github.com/repos/doctrine/cache/zipball/35a4a70cd94e09e2259dfae7488afc6b474ecbd3",
+                "reference": "35a4a70cd94e09e2259dfae7488afc6b474ecbd3",
                 "shasum": ""
             },
             "require": {
-                "php": "~7.1"
+                "php": "~7.1 || ^8.0"
             },
             "conflict": {
                 "doctrine/common": ">2.2,<2.4"
@@ -6677,7 +6699,21 @@
                 "redis",
                 "xcache"
             ],
-            "time": "2019-11-29T15:36:20+00:00"
+            "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"
         },
         {
             "name": "doctrine/inflector",
@@ -6748,20 +6784,20 @@
         },
         {
             "name": "doctrine/instantiator",
-            "version": "1.3.0",
+            "version": "1.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "ae466f726242e637cebdd526a7d991b9433bacf1"
+                "reference": "f350df0268e904597e3bd9c4685c53e0e333feea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/ae466f726242e637cebdd526a7d991b9433bacf1",
-                "reference": "ae466f726242e637cebdd526a7d991b9433bacf1",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f350df0268e904597e3bd9c4685c53e0e333feea",
+                "reference": "f350df0268e904597e3bd9c4685c53e0e333feea",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": "^7.1 || ^8.0"
             },
             "require-dev": {
                 "doctrine/coding-standard": "^6.0",
@@ -6800,24 +6836,38 @@
                 "constructor",
                 "instantiate"
             ],
-            "time": "2019-10-21T16:45:58+00:00"
+            "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"
         },
         {
             "name": "doctrine/lexer",
-            "version": "1.2.0",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/lexer.git",
-                "reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6"
+                "reference": "e864bbf5904cb8f5bb334f99209b48018522f042"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6",
-                "reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042",
+                "reference": "e864bbf5904cb8f5bb334f99209b48018522f042",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2"
+                "php": "^7.2 || ^8.0"
             },
             "require-dev": {
                 "doctrine/coding-standard": "^6.0",
@@ -6862,7 +6912,21 @@
                 "parser",
                 "php"
             ],
-            "time": "2019-10-30T14:39:59+00:00"
+            "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"
         },
         {
             "name": "friendsofphp/php-cs-fixer",
@@ -8443,16 +8507,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "8.0.1",
+            "version": "8.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "31e94ccc084025d6abee0585df533eb3a792b96a"
+                "reference": "ca6647ffddd2add025ab3f21644a441d7c146cdc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/31e94ccc084025d6abee0585df533eb3a792b96a",
-                "reference": "31e94ccc084025d6abee0585df533eb3a792b96a",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca6647ffddd2add025ab3f21644a441d7c146cdc",
+                "reference": "ca6647ffddd2add025ab3f21644a441d7c146cdc",
                 "shasum": ""
             },
             "require": {
@@ -8503,7 +8567,13 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2020-02-19T13:41:19+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-05-23T08:02:54+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -9654,28 +9724,28 @@
         },
         {
             "name": "sebastian/type",
-            "version": "2.0.0",
+            "version": "2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "9e8f42f740afdea51f5f4e8cec2035580e797ee1"
+                "reference": "bad49207c6f854e7a25cef0ea948ac8ebe3ef9d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/9e8f42f740afdea51f5f4e8cec2035580e797ee1",
-                "reference": "9e8f42f740afdea51f5f4e8cec2035580e797ee1",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/bad49207c6f854e7a25cef0ea948ac8ebe3ef9d8",
+                "reference": "bad49207c6f854e7a25cef0ea948ac8ebe3ef9d8",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.0"
+                "phpunit/phpunit": "^9.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "2.1-dev"
                 }
             },
             "autoload": {
@@ -9696,7 +9766,13 @@
             ],
             "description": "Collection of value objects that represent the types of the PHP type system",
             "homepage": "https://github.com/sebastianbergmann/type",
-            "time": "2020-02-07T06:13:43+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-01T12:21:09+00:00"
         },
         {
             "name": "sebastian/version",
@@ -9865,22 +9941,24 @@
         },
         {
             "name": "symfony/config",
-            "version": "v5.0.8",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "db1674e1a261148429f123871f30d211992294e7"
+                "reference": "b8623ef3d99fe62a34baf7a111b576216965f880"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/db1674e1a261148429f123871f30d211992294e7",
-                "reference": "db1674e1a261148429f123871f30d211992294e7",
+                "url": "https://api.github.com/repos/symfony/config/zipball/b8623ef3d99fe62a34baf7a111b576216965f880",
+                "reference": "b8623ef3d99fe62a34baf7a111b576216965f880",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1",
                 "symfony/filesystem": "^4.4|^5.0",
-                "symfony/polyfill-ctype": "~1.8"
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-php80": "^1.15"
             },
             "conflict": {
                 "symfony/finder": "<4.4"
@@ -9898,7 +9976,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -9939,29 +10017,31 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-04-15T15:59:10+00:00"
+            "time": "2020-05-23T13:08:13+00:00"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v5.0.8",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "92d8b3bd896a87cdd8aba0a3dd041bc072e8cfba"
+                "reference": "6a6791e9584273b32eeb01790da4c7446d87a621"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/92d8b3bd896a87cdd8aba0a3dd041bc072e8cfba",
-                "reference": "92d8b3bd896a87cdd8aba0a3dd041bc072e8cfba",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/6a6791e9584273b32eeb01790da4c7446d87a621",
+                "reference": "6a6791e9584273b32eeb01790da4c7446d87a621",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
+                "php": ">=7.2.5",
                 "psr/container": "^1.0",
+                "symfony/deprecation-contracts": "^2.1",
+                "symfony/polyfill-php80": "^1.15",
                 "symfony/service-contracts": "^1.1.6|^2"
             },
             "conflict": {
-                "symfony/config": "<5.0",
+                "symfony/config": "<5.1",
                 "symfony/finder": "<4.4",
                 "symfony/proxy-manager-bridge": "<4.4",
                 "symfony/yaml": "<4.4"
@@ -9971,7 +10051,7 @@
                 "symfony/service-implementation": "1.0"
             },
             "require-dev": {
-                "symfony/config": "^5.0",
+                "symfony/config": "^5.1",
                 "symfony/expression-language": "^4.4|^5.0",
                 "symfony/yaml": "^4.4|^5.0"
             },
@@ -9985,7 +10065,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -10026,35 +10106,101 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-04-28T17:58:55+00:00"
+            "time": "2020-05-30T20:35:19+00:00"
+        },
+        {
+            "name": "symfony/deprecation-contracts",
+            "version": "v2.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/deprecation-contracts.git",
+                "reference": "dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337",
+                "reference": "dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.1-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "function.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "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"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v5.0.8",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "e47fdf8b24edc12022ba52923150ec6484d7f57d"
+                "reference": "e0d853bddc2b2cfb0d67b0b4496c03fffe1d37fa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e47fdf8b24edc12022ba52923150ec6484d7f57d",
-                "reference": "e47fdf8b24edc12022ba52923150ec6484d7f57d",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e0d853bddc2b2cfb0d67b0b4496c03fffe1d37fa",
+                "reference": "e0d853bddc2b2cfb0d67b0b4496c03fffe1d37fa",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
-                "symfony/mime": "^4.4|^5.0",
-                "symfony/polyfill-mbstring": "~1.1"
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1",
+                "symfony/polyfill-mbstring": "~1.1",
+                "symfony/polyfill-php80": "^1.15"
             },
             "require-dev": {
                 "predis/predis": "~1.0",
-                "symfony/expression-language": "^4.4|^5.0"
+                "symfony/cache": "^4.4|^5.0",
+                "symfony/expression-language": "^4.4|^5.0",
+                "symfony/mime": "^4.4|^5.0"
+            },
+            "suggest": {
+                "symfony/mime": "To use the file extension guesser"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -10095,26 +10241,27 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-04-18T20:50:06+00:00"
+            "time": "2020-05-24T12:18:07+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v5.0.8",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "5d6c81c39225a750f3f43bee15f03093fb9aaa0b"
+                "reference": "56261f89385f9d13cf843a5101ac72131190bc91"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/5d6c81c39225a750f3f43bee15f03093fb9aaa0b",
-                "reference": "5d6c81c39225a750f3f43bee15f03093fb9aaa0b",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/56261f89385f9d13cf843a5101ac72131190bc91",
+                "reference": "56261f89385f9d13cf843a5101ac72131190bc91",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
+                "php": ">=7.2.5",
                 "symfony/polyfill-intl-idn": "^1.10",
-                "symfony/polyfill-mbstring": "^1.0"
+                "symfony/polyfill-mbstring": "^1.0",
+                "symfony/polyfill-php80": "^1.15"
             },
             "conflict": {
                 "symfony/mailer": "<4.4"
@@ -10126,7 +10273,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -10171,29 +10318,31 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-04-17T03:29:44+00:00"
+            "time": "2020-05-25T12:33:44+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v5.0.8",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "3707e3caeff2b797c0bfaadd5eba723dd44e6bf1"
+                "reference": "663f5dd5e14057d1954fe721f9709d35837f2447"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/3707e3caeff2b797c0bfaadd5eba723dd44e6bf1",
-                "reference": "3707e3caeff2b797c0bfaadd5eba723dd44e6bf1",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/663f5dd5e14057d1954fe721f9709d35837f2447",
+                "reference": "663f5dd5e14057d1954fe721f9709d35837f2447",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5"
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1",
+                "symfony/polyfill-php80": "^1.15"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -10239,7 +10388,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-04-06T10:40:56+00:00"
+            "time": "2020-05-23T13:08:13+00:00"
         },
         {
             "name": "symfony/polyfill-php70",
@@ -10314,28 +10463,104 @@
             ],
             "time": "2020-05-12T16:47:27+00:00"
         },
+        {
+            "name": "symfony/polyfill-php80",
+            "version": "v1.17.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php80.git",
+                "reference": "5e30b2799bc1ad68f7feb62b60a73743589438dd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/5e30b2799bc1ad68f7feb62b60a73743589438dd",
+                "reference": "5e30b2799bc1ad68f7feb62b60a73743589438dd",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0.8"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.17-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ],
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ion Bazan",
+                    "email": "ion.bazan@gmail.com"
+                },
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "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"
+        },
         {
             "name": "symfony/stopwatch",
-            "version": "v5.0.8",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "a1d86d30d4522423afc998f32404efa34fcf5a73"
+                "reference": "0f7c58cf81dbb5dd67d423a89d577524a2ec0323"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/a1d86d30d4522423afc998f32404efa34fcf5a73",
-                "reference": "a1d86d30d4522423afc998f32404efa34fcf5a73",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/0f7c58cf81dbb5dd67d423a89d577524a2ec0323",
+                "reference": "0f7c58cf81dbb5dd67d423a89d577524a2ec0323",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
+                "php": ">=7.2.5",
                 "symfony/service-contracts": "^1.0|^2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -10376,24 +10601,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-03-27T16:56:45+00:00"
+            "time": "2020-05-20T17:43:50+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v5.0.8",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "482fb4e710e5af3e0e78015f19aa716ad953392f"
+                "reference": "ea342353a3ef4f453809acc4ebc55382231d4d23"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/482fb4e710e5af3e0e78015f19aa716ad953392f",
-                "reference": "482fb4e710e5af3e0e78015f19aa716ad953392f",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/ea342353a3ef4f453809acc4ebc55382231d4d23",
+                "reference": "ea342353a3ef4f453809acc4ebc55382231d4d23",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1",
                 "symfony/polyfill-ctype": "~1.8"
             },
             "conflict": {
@@ -10405,10 +10631,13 @@
             "suggest": {
                 "symfony/console": "For validating YAML files using the lint command"
             },
+            "bin": [
+                "Resources/bin/yaml-lint"
+            ],
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -10449,7 +10678,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-04-28T17:58:55+00:00"
+            "time": "2020-05-20T17:43:50+00:00"
         },
         {
             "name": "thecodingmachine/safe",

From 01309d878fe86ead33cad7144187029fa217b3f6 Mon Sep 17 00:00:00 2001
From: Chris Snedaker <df2002@gmail.com>
Date: Sun, 7 Jun 2020 22:48:45 -0400
Subject: [PATCH 0393/1718] Update code to reduce redundancy and simplify
 readability

---
 .../Magento/Framework/App/Request/Http.php    | 37 ++++++-------------
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/lib/internal/Magento/Framework/App/Request/Http.php b/lib/internal/Magento/Framework/App/Request/Http.php
index 5fc4716f4bbf8..a1e9a244098fc 100644
--- a/lib/internal/Magento/Framework/App/Request/Http.php
+++ b/lib/internal/Magento/Framework/App/Request/Http.php
@@ -199,13 +199,8 @@ public function isDirectAccessFrontendName($code)
      */
     public function getBasePath()
     {
-        $path = parent::getBasePath();
-        if (empty($path)) {
-            $path = '/';
-        } else {
-            $path = str_replace('\\', '/', $path);
-        }
-        return $path;
+        return empty(parent::getBasePath()) ? '/'
+            : str_replace('\\', '/', parent::getBasePath());
     }
 
     /**
@@ -228,8 +223,7 @@ public function getFrontName()
     public function setRouteName($route)
     {
         $this->route = $route;
-        $module = $this->routeConfig->getRouteFrontName($route);
-        if ($module) {
+        if ($module = $this->routeConfig->getRouteFrontName($route)) {
             $this->setModuleName($module);
         }
         return $this;
@@ -292,13 +286,11 @@ public function initForward()
      * If passed name will be null whole state array will be returned.
      *
      * @param string $name
-     * @return array|string|null
+     * @return mixed|null
      */
     public function getBeforeForwardInfo($name = null)
     {
-        if ($name === null) {
-            return $this->beforeForwardInfo;
-        } elseif (isset($this->beforeForwardInfo[$name])) {
+        if ($name !== null && isset($this->beforeForwardInfo[$name])) {
             return $this->beforeForwardInfo[$name];
         }
         return null;
@@ -311,13 +303,9 @@ public function getBeforeForwardInfo($name = null)
      */
     public function isAjax()
     {
-        if ($this->isXmlHttpRequest()) {
-            return true;
-        }
-        if ($this->getParam('ajax') || $this->getParam('isAjax')) {
-            return true;
-        }
-        return false;
+        return $this->isXmlHttpRequest()
+            || $this->getParam('ajax', null)
+            || $this->getParam('isAjax', null);
     }
 
     /**
@@ -365,7 +353,7 @@ public static function getDistroBaseUrlPath($server)
         $result = '';
         if (isset($server['SCRIPT_NAME'])) {
             $envPath = str_replace('\\', '/', dirname(str_replace('\\', '/', $server['SCRIPT_NAME'])));
-            if ($envPath != '.' && $envPath != '/') {
+            if ($envPath !== '.' && $envPath !== '/') {
                 $result = $envPath;
             }
         }
@@ -425,11 +413,8 @@ public function __sleep()
     public function isSafeMethod()
     {
         if ($this->isSafeMethod === null) {
-            if (isset($_SERVER['REQUEST_METHOD']) && (in_array($_SERVER['REQUEST_METHOD'], $this->safeRequestTypes))) {
-                $this->isSafeMethod = true;
-            } else {
-                $this->isSafeMethod = false;
-            }
+            $this->isSafeMethod = isset($_SERVER['REQUEST_METHOD'])
+                && (in_array($_SERVER['REQUEST_METHOD'], $this->safeRequestTypes));
         }
         return $this->isSafeMethod;
     }

From 45a668acc3c9e9bca13c325879f0d888688bd084 Mon Sep 17 00:00:00 2001
From: Chris Snedaker <df2002@gmail.com>
Date: Mon, 8 Jun 2020 10:30:31 -0400
Subject: [PATCH 0394/1718] Update
 lib/internal/Magento/Framework/App/Request/Http.php

Co-authored-by: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
---
 lib/internal/Magento/Framework/App/Request/Http.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/App/Request/Http.php b/lib/internal/Magento/Framework/App/Request/Http.php
index a1e9a244098fc..57f33c2808ca8 100644
--- a/lib/internal/Magento/Framework/App/Request/Http.php
+++ b/lib/internal/Magento/Framework/App/Request/Http.php
@@ -413,8 +413,7 @@ public function __sleep()
     public function isSafeMethod()
     {
         if ($this->isSafeMethod === null) {
-            $this->isSafeMethod = isset($_SERVER['REQUEST_METHOD'])
-                && (in_array($_SERVER['REQUEST_METHOD'], $this->safeRequestTypes));
+            $this->isSafeMethod = in_array($_SERVER['REQUEST_METHOD'] ?? null, $this->safeRequestTypes, true);
         }
         return $this->isSafeMethod;
     }

From 0a1b76ae8714b3f9d386af7878ec987694ca1fba Mon Sep 17 00:00:00 2001
From: Chris Snedaker <df2002@gmail.com>
Date: Mon, 8 Jun 2020 11:06:30 -0400
Subject: [PATCH 0395/1718] Update based on review for getBeforeForwardInfo

---
 lib/internal/Magento/Framework/App/Request/Http.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/internal/Magento/Framework/App/Request/Http.php b/lib/internal/Magento/Framework/App/Request/Http.php
index 57f33c2808ca8..9e05b6ca5cf01 100644
--- a/lib/internal/Magento/Framework/App/Request/Http.php
+++ b/lib/internal/Magento/Framework/App/Request/Http.php
@@ -286,14 +286,15 @@ public function initForward()
      * If passed name will be null whole state array will be returned.
      *
      * @param string $name
-     * @return mixed|null
+     * @return array|string|null
      */
     public function getBeforeForwardInfo($name = null)
     {
-        if ($name !== null && isset($this->beforeForwardInfo[$name])) {
-            return $this->beforeForwardInfo[$name];
+        if ($name === null) {
+            return $this->beforeForwardInfo;
         }
-        return null;
+
+        return $this->beforeForwardInfo[$name] ?? null;
     }
 
     /**

From 910da38c999bd2379f003d80ed7fa41886f501ee Mon Sep 17 00:00:00 2001
From: Chris Snedaker <df2002@gmail.com>
Date: Mon, 8 Jun 2020 11:12:48 -0400
Subject: [PATCH 0396/1718] Updated based on comments

---
 lib/internal/Magento/Framework/App/Request/Http.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/App/Request/Http.php b/lib/internal/Magento/Framework/App/Request/Http.php
index 9e05b6ca5cf01..8e4a184c51843 100644
--- a/lib/internal/Magento/Framework/App/Request/Http.php
+++ b/lib/internal/Magento/Framework/App/Request/Http.php
@@ -223,7 +223,8 @@ public function getFrontName()
     public function setRouteName($route)
     {
         $this->route = $route;
-        if ($module = $this->routeConfig->getRouteFrontName($route)) {
+        $module = $this->routeConfig->getRouteFrontName($route);
+        if ($module) {
             $this->setModuleName($module);
         }
         return $this;
@@ -414,7 +415,11 @@ public function __sleep()
     public function isSafeMethod()
     {
         if ($this->isSafeMethod === null) {
-            $this->isSafeMethod = in_array($_SERVER['REQUEST_METHOD'] ?? null, $this->safeRequestTypes, true);
+            if (isset($_SERVER['REQUEST_METHOD']) && (in_array($_SERVER['REQUEST_METHOD'], $this->safeRequestTypes))) {
+                $this->isSafeMethod = true;
+            } else {
+                $this->isSafeMethod = false;
+            }
         }
         return $this->isSafeMethod;
     }

From 692af26d1c656b9cdf8774acdaf160f1551a05bc Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Fri, 5 Jun 2020 12:03:34 +0300
Subject: [PATCH 0397/1718] MC-34950 - Wrong style for Product in Checkout Cart

---
 .../frontend/web/template/summary/item/details/thumbnail.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details/thumbnail.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details/thumbnail.html
index eb218bbee9941..fa32ea1b212ae 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details/thumbnail.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details/thumbnail.html
@@ -5,7 +5,7 @@
  */
 -->
 <span class="product-image-container"
-      data-bind="attr: {'style': 'height: ' + getHeight($parents[1]) + 'px; width: ' + getWidth($parents[1]) + 'px;' }">
+      data-bind="attr: {'style': 'height: ' + getHeight($parents[1])/2 + 'px; width: ' + getWidth($parents[1])/2 + 'px;' }">
     <span class="product-image-wrapper">
         <img
             data-bind="attr: {'src': getSrc($parents[1]), 'width': getWidth($parents[1]), 'height': getHeight($parents[1]), 'alt': getAlt($parents[1]), 'title': getAlt($parents[1]) }"/>

From d1133e4a28a798d97f842fdb85183c5701236cfc Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Mon, 8 Jun 2020 12:36:48 -0500
Subject: [PATCH 0398/1718] MC-34764: Fix performance degradation cause by CSP

---
 .../catalog/product/composite/configure.phtml       | 13 +++++++------
 .../templates/product/image_with_borders.phtml      |  5 +++--
 .../view/frontend/templates/js/cookie_status.phtml  |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
index 24aa060e3259a..b7aa24107562c 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
@@ -23,7 +23,8 @@
             <div id="product_composite_configure_form_fields" class="content product-composite-configure-inner"></div>
             <div id="product_composite_configure_form_additional" class="product_composite_configure_form_additional">
             </div>
-            <div id="product_composite_configure_form_confirmed" class="product_composite_configure_form_confirmed"></div>
+            <div id="product_composite_configure_form_confirmed" class="product_composite_configure_form_confirmed">
+            </div>
         </div>
         <input type="hidden" name="as_js_varname" value="iFrameResponse" />
         <input type="hidden" name="form_key" value="<?= $block->escapeHtmlAttr($block->getFormKey()) ?>" />
@@ -44,11 +45,11 @@
         prodCompConfIframe.style.position = "absolute";
         prodCompConfIframe.style.top = "-1000px";
         prodCompConfIframe.style.left = "-1000px";
-        document.querySelector(".product_composite_configure_messages:last-of-type").style.display = "none";
-        document.querySelector(".product_composite_configure_form_additional:last-of-type").style.display = "none";
-        document.querySelector(".product_composite_configure_form_confirmed:last-of-type").style.display = "none";
-        document.querySelector(".product_composite_configure_confirmed:last-of-type").style.display = "none";
-        document.querySelector(".product-configure-popup:last-of-type").style.display = "none";
+        document.querySelectorAll(".product_composite_configure_messages").forEach((e) => e.style.display = "none");
+        document.querySelectorAll(".product_composite_configure_form_additional").forEach((e) => e.style.display = "none");
+        document.querySelectorAll(".product_composite_configure_form_confirmed").forEach((e) => e.style.display = "none");
+        document.querySelectorAll(".product_composite_configure_confirmed").forEach((e) => e.style.display = "none");
+        document.querySelectorAll(".product-configure-popup").forEach((e) => e.style.display = "none");
 
         require([
             "jquery",
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
index ead23a150629b..a98e622b4156a 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
@@ -41,7 +41,8 @@ $padding = $block->getRatio() * 100;
 <?php
 $script = <<<SCRIPT
 document.querySelector('#product-image-container-{$block->getProductId()}').style.width = '{$width}px';
-document.querySelector('#product-image-container-{$block->getProductId()} span.product-image-wrapper').style.paddingBottom = '{$padding}%'
+document.querySelector('#product-image-container-{$block->getProductId()} span.product-image-wrapper')
+    .style.paddingBottom = '{$padding}%'
 SCRIPT;
-echo /* @noEscape */$secureRenderer->renderTag('script', ['type' => 'text/javascript'], $script, false);
 ?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', ['type' => 'text/javascript'], $script, false); ?>
diff --git a/app/code/Magento/Theme/view/frontend/templates/js/cookie_status.phtml b/app/code/Magento/Theme/view/frontend/templates/js/cookie_status.phtml
index 084b2b54c7188..7d43ffcbb8063 100644
--- a/app/code/Magento/Theme/view/frontend/templates/js/cookie_status.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/js/cookie_status.phtml
@@ -12,8 +12,8 @@
 </div>
 <?php
 $script = 'document.querySelector("#cookie-status").style.display = "none";';
-echo /* @noEscape */ $secureRenderer->renderTag('script', ['type' => 'text/javascript'], $script, false);
 ?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', ['type' => 'text/javascript'], $script, false); ?>
 
 <script type="text/x-magento-init">
     {

From bfeb5bc2f9a52ad41ebbf78097b77668a0f3bfa9 Mon Sep 17 00:00:00 2001
From: Ji Lu <jilu1@adobe.com>
Date: Mon, 8 Jun 2020 13:41:51 -0500
Subject: [PATCH 0399/1718] MQE-2153: bump MFTF version to 3.0.0-RC4

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

diff --git a/composer.json b/composer.json
index 4cd8a3989f188..aa293fdfb014b 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": "dev-3.0.0-RC4",
+        "magento/magento2-functional-testing-framework": "3.0.0-RC4",
         "pdepend/pdepend": "~2.7.1",
         "phpcompatibility/php-compatibility": "^9.3",
         "phpmd/phpmd": "^2.8.0",
diff --git a/composer.lock b/composer.lock
index d8f088f450af2..eea11746a42fa 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": "e25a6a8d64ffec2bd0b839679158f286",
+    "content-hash": "2ddc5369636a860cfa82ef023c958bd6",
     "packages": [
         {
             "name": "colinmollenhour/cache-backend-file",
@@ -7083,16 +7083,16 @@
         },
         {
             "name": "magento/magento2-functional-testing-framework",
-            "version": "dev-3.0.0-RC4",
+            "version": "3.0.0-RC4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/magento/magento2-functional-testing-framework.git",
-                "reference": "e36fc50f8a73a9d22239895fb819cc16767a5179"
+                "reference": "34781ccc7385993b1e5bc9182e6ddddde7f2769f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/e36fc50f8a73a9d22239895fb819cc16767a5179",
-                "reference": "e36fc50f8a73a9d22239895fb819cc16767a5179",
+                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/34781ccc7385993b1e5bc9182e6ddddde7f2769f",
+                "reference": "34781ccc7385993b1e5bc9182e6ddddde7f2769f",
                 "shasum": ""
             },
             "require": {
@@ -7168,7 +7168,7 @@
                 "magento",
                 "testing"
             ],
-            "time": "2020-06-05T22:31:19+00:00"
+            "time": "2020-06-08T18:17:54+00:00"
         },
         {
             "name": "mikey179/vfsstream",
@@ -10514,7 +10514,7 @@
     "minimum-stability": "stable",
     "stability-flags": {
         "magento/composer": 20,
-        "magento/magento2-functional-testing-framework": 20
+        "magento/magento2-functional-testing-framework": 5
     },
     "prefer-stable": true,
     "prefer-lowest": false,

From d24daec2a1776c40f8f09becff138e361b14cc36 Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Mon, 8 Jun 2020 14:59:44 -0500
Subject: [PATCH 0400/1718] MC-33857: Update AdapterInterface::fetchRow return
 type

---
 .../Framework/DB/Adapter/AdapterInterface.php | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
index f654fd263f605..5e061100c4216 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
@@ -36,7 +36,7 @@ interface AdapterInterface
     const INSERT_ON_DUPLICATE = 1;
 
     const INSERT_IGNORE = 2;
-    
+
     /** Strategy for updating data in table. See https://dev.mysql.com/doc/refman/5.7/en/replace.html */
     const REPLACE = 4;
 
@@ -258,7 +258,7 @@ public function renameTable($oldTableName, $newTableName, $schemaName = null);
      *
      * @param string $tableName
      * @param string $columnName
-     * @param array|string $definition  string specific or universal array DB Server definition
+     * @param array|string $definition string specific or universal array DB Server definition
      * @param string $schemaName
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
      */
@@ -273,7 +273,7 @@ public function addColumn($tableName, $columnName, $definition, $schemaName = nu
      * @param string $oldColumnName
      * @param string $newColumnName
      * @param array|string $definition
-     * @param boolean $flushData        flush table statistic
+     * @param boolean $flushData flush table statistic
      * @param string $schemaName
      * @return \Magento\Framework\DB\Adapter\AdapterInterface
      */
@@ -323,8 +323,8 @@ public function tableColumnExists($tableName, $columnName, $schemaName = null);
      *
      * @param string $tableName
      * @param string $indexName
-     * @param string|array $fields  the table column name or array of ones
-     * @param string $indexType     the index type
+     * @param string|array $fields the table column name or array of ones
+     * @param string $indexType the index type
      * @param string $schemaName
      * @return \Zend_Db_Statement_Interface
      */
@@ -468,7 +468,7 @@ public function insertMultiple($table, array $data);
      *      array('value1', 'value2')
      *
      * @param   string $table
-     * @param   string[] $columns  the data array column map
+     * @param   string[] $columns the data array column map
      * @param   array $data
      * @return  int
      */
@@ -550,7 +550,7 @@ public function fetchAll($sql, $bind = [], $fetchMode = null);
      * @param string|\Magento\Framework\DB\Select $sql An SQL SELECT statement.
      * @param mixed $bind Data to bind into SELECT placeholders.
      * @param mixed $fetchMode Override current fetch mode.
-     * @return array
+     * @return mixed Array, object, or scalar depending on fetch mode.
      */
     public function fetchRow($sql, $bind = [], $fetchMode = null);
 
@@ -750,7 +750,7 @@ public function saveDdlCache($tableCacheKey, $ddlType, $data);
      * Return false if cache does not exists
      *
      * @param string $tableCacheKey the table cache key
-     * @param int $ddlType          the DDL constant
+     * @param int $ddlType the DDL constant
      * @return string|array|int|false
      */
     public function loadDdlCache($tableCacheKey, $ddlType);
@@ -864,7 +864,7 @@ public function getGreatestSql(array $data);
      *
      * @see INTERVAL_* constants for $unit
      *
-     * @param \Zend_Db_Expr|string $date   quoted field name or SQL statement
+     * @param \Zend_Db_Expr|string $date quoted field name or SQL statement
      * @param int $interval
      * @param string $unit
      * @return \Zend_Db_Expr
@@ -876,7 +876,7 @@ public function getDateAddSql($date, $interval, $unit);
      *
      * @see INTERVAL_* constants for $unit
      *
-     * @param \Zend_Db_Expr|string $date   quoted field name or SQL statement
+     * @param \Zend_Db_Expr|string $date quoted field name or SQL statement
      * @param int|string $interval
      * @param string $unit
      * @return \Zend_Db_Expr
@@ -895,7 +895,7 @@ public function getDateSubSql($date, $interval, $unit);
      * %m   Month, numeric (00..12)
      * %Y   Year, numeric, four digits
      *
-     * @param \Zend_Db_Expr|string $date   quoted field name or SQL statement
+     * @param \Zend_Db_Expr|string $date quoted field name or SQL statement
      * @param string $format
      * @return \Zend_Db_Expr
      */
@@ -932,7 +932,7 @@ public function getStandardDeviationSql($expressionField);
      *
      * @see INTERVAL_* constants for $unit
      *
-     * @param \Zend_Db_Expr|string $date   quoted field name or SQL statement
+     * @param \Zend_Db_Expr|string $date quoted field name or SQL statement
      * @param string $unit
      * @return \Zend_Db_Expr
      */
@@ -951,9 +951,9 @@ public function getTableName($tableName);
     /**
      * Build a trigger name based on table name and trigger details
      *
-     * @param string $tableName  The table that is the subject of the trigger
-     * @param string $time  Either "before" or "after"
-     * @param string $event  The DB level event which activates the trigger, i.e. "update" or "insert"
+     * @param string $tableName The table that is the subject of the trigger
+     * @param string $time Either "before" or "after"
+     * @param string $event The DB level event which activates the trigger, i.e. "update" or "insert"
      * @return string
      */
     public function getTriggerName($tableName, $time, $event);
@@ -964,7 +964,7 @@ public function getTriggerName($tableName, $time, $event);
      * Check index name length and allowed symbols
      *
      * @param string $tableName
-     * @param string|array $fields  the columns list
+     * @param string|array $fields the columns list
      * @param string $indexType
      * @return string
      */

From 7bd81ec10f09db8ddfd3a89e74669e366c9c15ca Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Mon, 8 Jun 2020 15:39:50 -0500
Subject: [PATCH 0401/1718] MC-34764: Fix performance degradation cause by CSP

---
 .../templates/catalog/product/composite/configure.phtml   | 6 ++++--
 .../frontend/templates/product/layered/renderer.phtml     | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
index b7aa24107562c..d8a278f24d616 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
@@ -46,8 +46,10 @@
         prodCompConfIframe.style.top = "-1000px";
         prodCompConfIframe.style.left = "-1000px";
         document.querySelectorAll(".product_composite_configure_messages").forEach((e) => e.style.display = "none");
-        document.querySelectorAll(".product_composite_configure_form_additional").forEach((e) => e.style.display = "none");
-        document.querySelectorAll(".product_composite_configure_form_confirmed").forEach((e) => e.style.display = "none");
+        document.querySelectorAll(".product_composite_configure_form_additional")
+            .forEach((e) => e.style.display = "none");
+        document.querySelectorAll(".product_composite_configure_form_confirmed")
+            .forEach((e) => e.style.display = "none");
         document.querySelectorAll(".product_composite_configure_confirmed").forEach((e) => e.style.display = "none");
         document.querySelectorAll(".product-configure-popup").forEach((e) => e.style.display = "none");
 
diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
index f72f914233134..e4c60951ddc89 100644
--- a/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
+++ b/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
@@ -58,11 +58,11 @@
                             $script = 'let ' .$element
                                 .' = document.querySelector(\'div[data-option-id="' .$escaper->escapeJs($option)
                                 .'"]\');' .PHP_EOL;
-                            $script .= $element .'.style.background = "background: url(\''
+                            $script .= $element .'.style.background = "url(\''
                                 .$escapedUrl .'\') no-repeat center";' .PHP_EOL;
                             $script .= $element .'.style.backgroundSize = "initial";';
-                            echo /* @noEscape*/ $secureRenderer->renderTag('script', [], $script, false);
                             ?>
+                            <?= /* @noEscape*/ $secureRenderer->renderTag('script', [], $script, false); ?>
                             <?php break;
                         case '1':
                             ?>
@@ -84,11 +84,11 @@
                             $script = 'let ' .$element
                                 .' = document.querySelector(\'div[data-option-id="' .$escaper->escapeJs($option)
                                 .'"]\');' .PHP_EOL;
-                            $script .= $element .'.style.background = "background: ' .$backgroundValue
+                            $script .= $element .'.style.background = "' .$backgroundValue
                                 .' no-repeat center";' .PHP_EOL;
                             $script .= $element .'.style.backgroundSize = "initial";';
-                            echo /* @noEscape*/ $secureRenderer->renderTag('script', [], $script, false);
                             ?>
+                            <?= /* @noEscape*/ $secureRenderer->renderTag('script', [], $script, false); ?>
                             <?php break;
                         case '0':
                         default:

From e1fa935e5337e3db8320b8259c97319ff750f76a Mon Sep 17 00:00:00 2001
From: John Carlo Octabio <johncarlo@abovethefray.io>
Date: Tue, 9 Jun 2020 06:21:57 +0800
Subject: [PATCH 0402/1718] magento/magento2#108: Clear Shopping Cart - Restore
 removed composer.lock file

---
 composer.lock | 10854 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 10854 insertions(+)
 create mode 100644 composer.lock

diff --git a/composer.lock b/composer.lock
new file mode 100644
index 0000000000000..6a47e7e44ab69
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,10854 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "e86af25d9a4a1942c437cca58f9f1efb",
+    "packages": [
+        {
+            "name": "colinmollenhour/cache-backend-file",
+            "version": "v1.4.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/colinmollenhour/Cm_Cache_Backend_File.git",
+                "reference": "03c7d4c0f43b2de1b559a3527d18ff697d306544"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_File/zipball/03c7d4c0f43b2de1b559a3527d18ff697d306544",
+                "reference": "03c7d4c0f43b2de1b559a3527d18ff697d306544",
+                "shasum": ""
+            },
+            "type": "magento-module",
+            "autoload": {
+                "classmap": [
+                    "File.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Colin Mollenhour"
+                }
+            ],
+            "description": "The stock Zend_Cache_Backend_File backend has extremely poor performance for cleaning by tags making it become unusable as the number of cached items increases. This backend makes many changes resulting in a huge performance boost, especially for tag cleaning.",
+            "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_File",
+            "time": "2019-04-18T21:54:31+00:00"
+        },
+        {
+            "name": "colinmollenhour/cache-backend-redis",
+            "version": "1.11.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis.git",
+                "reference": "389fb68de15660e39b055d149d31f3708b5d6cbc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_Redis/zipball/389fb68de15660e39b055d149d31f3708b5d6cbc",
+                "reference": "389fb68de15660e39b055d149d31f3708b5d6cbc",
+                "shasum": ""
+            },
+            "require": {
+                "magento-hackathon/magento-composer-installer": "*"
+            },
+            "type": "magento-module",
+            "autoload": {
+                "classmap": [
+                    "Cm/Cache/Backend/Redis.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Colin Mollenhour"
+                }
+            ],
+            "description": "Zend_Cache backend using Redis with full support for tags.",
+            "homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis",
+            "time": "2019-03-03T04:04:49+00:00"
+        },
+        {
+            "name": "colinmollenhour/credis",
+            "version": "1.11.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/colinmollenhour/credis.git",
+                "reference": "bd1da4698ab1918477f9e71e5ff0062b9a345008"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/colinmollenhour/credis/zipball/bd1da4698ab1918477f9e71e5ff0062b9a345008",
+                "reference": "bd1da4698ab1918477f9e71e5ff0062b9a345008",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "Client.php",
+                    "Cluster.php",
+                    "Sentinel.php",
+                    "Module.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Colin Mollenhour",
+                    "email": "colin@mollenhour.com"
+                }
+            ],
+            "description": "Credis is a lightweight interface to the Redis key-value store which wraps the phpredis library when available for better performance.",
+            "homepage": "https://github.com/colinmollenhour/credis",
+            "time": "2019-11-26T18:09:45+00:00"
+        },
+        {
+            "name": "colinmollenhour/php-redis-session-abstract",
+            "version": "v1.4.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/colinmollenhour/php-redis-session-abstract.git",
+                "reference": "669521218794f125c7b668252f4f576eda65e1e4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/colinmollenhour/php-redis-session-abstract/zipball/669521218794f125c7b668252f4f576eda65e1e4",
+                "reference": "669521218794f125c7b668252f4f576eda65e1e4",
+                "shasum": ""
+            },
+            "require": {
+                "colinmollenhour/credis": "~1.6",
+                "php": "^5.5 || ^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Cm\\RedisSession\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Colin Mollenhour"
+                }
+            ],
+            "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"
+        },
+        {
+            "name": "composer/ca-bundle",
+            "version": "1.2.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/ca-bundle.git",
+                "reference": "95c63ab2117a72f48f5a55da9740a3273d45b7fd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/95c63ab2117a72f48f5a55da9740a3273d45b7fd",
+                "reference": "95c63ab2117a72f48f5a55da9740a3273d45b7fd",
+                "shasum": ""
+            },
+            "require": {
+                "ext-openssl": "*",
+                "ext-pcre": "*",
+                "php": "^5.3.2 || ^7.0 || ^8.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8",
+                "psr/log": "^1.0",
+                "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\CaBundle\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.",
+            "keywords": [
+                "cabundle",
+                "cacert",
+                "certificate",
+                "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"
+        },
+        {
+            "name": "composer/composer",
+            "version": "1.10.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/composer.git",
+                "reference": "be81b9c4735362c26876bdbfd3b5bc7e7f711c88"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/composer/zipball/be81b9c4735362c26876bdbfd3b5bc7e7f711c88",
+                "reference": "be81b9c4735362c26876bdbfd3b5bc7e7f711c88",
+                "shasum": ""
+            },
+            "require": {
+                "composer/ca-bundle": "^1.0",
+                "composer/semver": "^1.0",
+                "composer/spdx-licenses": "^1.2",
+                "composer/xdebug-handler": "^1.1",
+                "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
+                "php": "^5.3.2 || ^7.0",
+                "psr/log": "^1.0",
+                "seld/jsonlint": "^1.4",
+                "seld/phar-utils": "^1.0",
+                "symfony/console": "^2.7 || ^3.0 || ^4.0 || ^5.0",
+                "symfony/filesystem": "^2.7 || ^3.0 || ^4.0 || ^5.0",
+                "symfony/finder": "^2.7 || ^3.0 || ^4.0 || ^5.0",
+                "symfony/process": "^2.7 || ^3.0 || ^4.0 || ^5.0"
+            },
+            "conflict": {
+                "symfony/console": "2.8.38",
+                "symfony/phpunit-bridge": "3.4.40"
+            },
+            "require-dev": {
+                "phpspec/prophecy": "^1.10",
+                "symfony/phpunit-bridge": "^3.4"
+            },
+            "suggest": {
+                "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
+                "ext-zip": "Enabling the zip extension allows you to unzip archives",
+                "ext-zlib": "Allow gzip compression of HTTP requests"
+            },
+            "bin": [
+                "bin/composer"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.10-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\": "src/Composer"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nils Adermann",
+                    "email": "naderman@naderman.de",
+                    "homepage": "http://www.naderman.de"
+                },
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "Composer helps you declare, manage and install dependencies of PHP projects. It ensures you have the right stack everywhere.",
+            "homepage": "https://getcomposer.org/",
+            "keywords": [
+                "autoload",
+                "dependency",
+                "package"
+            ],
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-05-06T08:28:10+00:00"
+        },
+        {
+            "name": "composer/semver",
+            "version": "1.5.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/semver.git",
+                "reference": "c6bea70230ef4dd483e6bbcab6005f682ed3a8de"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/semver/zipball/c6bea70230ef4dd483e6bbcab6005f682ed3a8de",
+                "reference": "c6bea70230ef4dd483e6bbcab6005f682ed3a8de",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.2 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.5 || ^5.0.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\Semver\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nils Adermann",
+                    "email": "naderman@naderman.de",
+                    "homepage": "http://www.naderman.de"
+                },
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                },
+                {
+                    "name": "Rob Bast",
+                    "email": "rob.bast@gmail.com",
+                    "homepage": "http://robbast.nl"
+                }
+            ],
+            "description": "Semver library that offers utilities, version constraint parsing and validation.",
+            "keywords": [
+                "semantic",
+                "semver",
+                "validation",
+                "versioning"
+            ],
+            "time": "2020-01-13T12:06:48+00:00"
+        },
+        {
+            "name": "composer/spdx-licenses",
+            "version": "1.5.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/spdx-licenses.git",
+                "reference": "0c3e51e1880ca149682332770e25977c70cf9dae"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/0c3e51e1880ca149682332770e25977c70cf9dae",
+                "reference": "0c3e51e1880ca149682332770e25977c70cf9dae",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.2 || ^7.0 || ^8.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 7"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\Spdx\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nils Adermann",
+                    "email": "naderman@naderman.de",
+                    "homepage": "http://www.naderman.de"
+                },
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                },
+                {
+                    "name": "Rob Bast",
+                    "email": "rob.bast@gmail.com",
+                    "homepage": "http://robbast.nl"
+                }
+            ],
+            "description": "SPDX licenses list and validation library.",
+            "keywords": [
+                "license",
+                "spdx",
+                "validator"
+            ],
+            "time": "2020-02-14T07:44:31+00:00"
+        },
+        {
+            "name": "composer/xdebug-handler",
+            "version": "1.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/xdebug-handler.git",
+                "reference": "1ab9842d69e64fb3a01be6b656501032d1b78cb7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/1ab9842d69e64fb3a01be6b656501032d1b78cb7",
+                "reference": "1ab9842d69e64fb3a01be6b656501032d1b78cb7",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.2 || ^7.0 || ^8.0",
+                "psr/log": "^1.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Composer\\XdebugHandler\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "John Stevenson",
+                    "email": "john-stevenson@blueyonder.co.uk"
+                }
+            ],
+            "description": "Restarts a process without Xdebug.",
+            "keywords": [
+                "Xdebug",
+                "performance"
+            ],
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                }
+            ],
+            "time": "2020-03-01T12:26:26+00:00"
+        },
+        {
+            "name": "container-interop/container-interop",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/container-interop/container-interop.git",
+                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8",
+                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8",
+                "shasum": ""
+            },
+            "require": {
+                "psr/container": "^1.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Interop\\Container\\": "src/Interop/Container/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
+            "homepage": "https://github.com/container-interop/container-interop",
+            "abandoned": "psr/container",
+            "time": "2017-02-14T19:40:03+00:00"
+        },
+        {
+            "name": "elasticsearch/elasticsearch",
+            "version": "v7.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/elastic/elasticsearch-php.git",
+                "reference": "1d90a7ff4fb1936dc4376f09d723af75714f6f05"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/1d90a7ff4fb1936dc4376f09d723af75714f6f05",
+                "reference": "1d90a7ff4fb1936dc4376f09d723af75714f6f05",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": ">=1.3.7",
+                "ezimuel/ringphp": "^1.1.2",
+                "php": "^7.1",
+                "psr/log": "~1.0"
+            },
+            "require-dev": {
+                "cpliakas/git-wrapper": "~2.0",
+                "doctrine/inflector": "^1.3",
+                "mockery/mockery": "^1.2",
+                "phpstan/phpstan": "^0.12",
+                "phpunit/phpunit": "^7.5",
+                "squizlabs/php_codesniffer": "^3.4",
+                "symfony/finder": "~4.0",
+                "symfony/yaml": "~4.0"
+            },
+            "suggest": {
+                "ext-curl": "*",
+                "monolog/monolog": "Allows for client-level logging and tracing"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/autoload.php"
+                ],
+                "psr-4": {
+                    "Elasticsearch\\": "src/Elasticsearch/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Zachary Tong"
+                },
+                {
+                    "name": "Enrico Zimuel"
+                }
+            ],
+            "description": "PHP Client for Elasticsearch",
+            "keywords": [
+                "client",
+                "elasticsearch",
+                "search"
+            ],
+            "time": "2020-05-13T15:19:26+00:00"
+        },
+        {
+            "name": "ezimuel/guzzlestreams",
+            "version": "3.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ezimuel/guzzlestreams.git",
+                "reference": "abe3791d231167f14eb80d413420d1eab91163a8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ezimuel/guzzlestreams/zipball/abe3791d231167f14eb80d413420d1eab91163a8",
+                "reference": "abe3791d231167f14eb80d413420d1eab91163a8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Stream\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Fork of guzzle/streams (abandoned) to be used with elasticsearch-php",
+            "homepage": "http://guzzlephp.org/",
+            "keywords": [
+                "Guzzle",
+                "stream"
+            ],
+            "time": "2020-02-14T23:11:50+00:00"
+        },
+        {
+            "name": "ezimuel/ringphp",
+            "version": "1.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ezimuel/ringphp.git",
+                "reference": "0b78f89d8e0bb9e380046c31adfa40347e9f663b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ezimuel/ringphp/zipball/0b78f89d8e0bb9e380046c31adfa40347e9f663b",
+                "reference": "0b78f89d8e0bb9e380046c31adfa40347e9f663b",
+                "shasum": ""
+            },
+            "require": {
+                "ezimuel/guzzlestreams": "^3.0.1",
+                "php": ">=5.4.0",
+                "react/promise": "~2.0"
+            },
+            "require-dev": {
+                "ext-curl": "*",
+                "phpunit/phpunit": "~4.0"
+            },
+            "suggest": {
+                "ext-curl": "Guzzle will use specific adapters if cURL is present"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Ring\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Fork of guzzle/RingPHP (abandoned) to be used with elasticsearch-php",
+            "time": "2020-02-14T23:51:21+00:00"
+        },
+        {
+            "name": "guzzlehttp/guzzle",
+            "version": "6.5.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/guzzle.git",
+                "reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/aab4ebd862aa7d04f01a4b51849d657db56d882e",
+                "reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "guzzlehttp/promises": "^1.0",
+                "guzzlehttp/psr7": "^1.6.1",
+                "php": ">=5.5",
+                "symfony/polyfill-intl-idn": "^1.11"
+            },
+            "require-dev": {
+                "ext-curl": "*",
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
+                "psr/log": "^1.1"
+            },
+            "suggest": {
+                "psr/log": "Required for using the Log middleware"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "6.5-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Guzzle is a PHP HTTP client library",
+            "homepage": "http://guzzlephp.org/",
+            "keywords": [
+                "client",
+                "curl",
+                "framework",
+                "http",
+                "http client",
+                "rest",
+                "web service"
+            ],
+            "time": "2020-04-18T10:38:46+00:00"
+        },
+        {
+            "name": "guzzlehttp/promises",
+            "version": "v1.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/promises.git",
+                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Promise\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Guzzle promises library",
+            "keywords": [
+                "promise"
+            ],
+            "time": "2016-12-20T10:07:11+00:00"
+        },
+        {
+            "name": "guzzlehttp/psr7",
+            "version": "1.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/psr7.git",
+                "reference": "239400de7a173fe9901b9ac7c06497751f00727a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a",
+                "reference": "239400de7a173fe9901b9ac7c06497751f00727a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0",
+                "psr/http-message": "~1.0",
+                "ralouphie/getallheaders": "^2.0.5 || ^3.0.0"
+            },
+            "provide": {
+                "psr/http-message-implementation": "1.0"
+            },
+            "require-dev": {
+                "ext-zlib": "*",
+                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
+            },
+            "suggest": {
+                "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Psr7\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Tobias Schultze",
+                    "homepage": "https://github.com/Tobion"
+                }
+            ],
+            "description": "PSR-7 message implementation that also provides common utility methods",
+            "keywords": [
+                "http",
+                "message",
+                "psr-7",
+                "request",
+                "response",
+                "stream",
+                "uri",
+                "url"
+            ],
+            "time": "2019-07-01T23:21:34+00:00"
+        },
+        {
+            "name": "justinrainbow/json-schema",
+            "version": "5.2.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/justinrainbow/json-schema.git",
+                "reference": "44c6787311242a979fa15c704327c20e7221a0e4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/44c6787311242a979fa15c704327c20e7221a0e4",
+                "reference": "44c6787311242a979fa15c704327c20e7221a0e4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1",
+                "json-schema/json-schema-test-suite": "1.2.0",
+                "phpunit/phpunit": "^4.8.35"
+            },
+            "bin": [
+                "bin/validate-json"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "JsonSchema\\": "src/JsonSchema/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bruno Prieto Reis",
+                    "email": "bruno.p.reis@gmail.com"
+                },
+                {
+                    "name": "Justin Rainbow",
+                    "email": "justin.rainbow@gmail.com"
+                },
+                {
+                    "name": "Igor Wiedler",
+                    "email": "igor@wiedler.ch"
+                },
+                {
+                    "name": "Robert Schönthal",
+                    "email": "seroscho@googlemail.com"
+                }
+            ],
+            "description": "A library to validate a json schema.",
+            "homepage": "https://github.com/justinrainbow/json-schema",
+            "keywords": [
+                "json",
+                "schema"
+            ],
+            "time": "2019-09-25T14:49:45+00:00"
+        },
+        {
+            "name": "laminas/laminas-captcha",
+            "version": "2.9.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-captcha.git",
+                "reference": "b88f650f3adf2d902ef56f6377cceb5cd87b9876"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-captcha/zipball/b88f650f3adf2d902ef56f6377cceb5cd87b9876",
+                "reference": "b88f650f3adf2d902ef56f6377cceb5cd87b9876",
+                "shasum": ""
+            },
+            "require": {
+                "laminas/laminas-math": "^2.7 || ^3.0",
+                "laminas/laminas-stdlib": "^3.2.1",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-captcha": "self.version"
+            },
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-recaptcha": "^3.0",
+                "laminas/laminas-session": "^2.8",
+                "laminas/laminas-text": "^2.6",
+                "laminas/laminas-validator": "^2.10.1",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
+            },
+            "suggest": {
+                "laminas/laminas-i18n-resources": "Translations of captcha messages",
+                "laminas/laminas-recaptcha": "Laminas\\ReCaptcha component",
+                "laminas/laminas-session": "Laminas\\Session component",
+                "laminas/laminas-text": "Laminas\\Text component",
+                "laminas/laminas-validator": "Laminas\\Validator component"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.9.x-dev",
+                    "dev-develop": "2.10.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\Captcha\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Generate and validate CAPTCHAs using Figlets, images, ReCaptcha, and more",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "captcha",
+                "laminas"
+            ],
+            "time": "2019-12-31T16:24:14+00:00"
+        },
+        {
+            "name": "laminas/laminas-code",
+            "version": "3.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-code.git",
+                "reference": "1cb8f203389ab1482bf89c0e70a04849bacd7766"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-code/zipball/1cb8f203389ab1482bf89c0e70a04849bacd7766",
+                "reference": "1cb8f203389ab1482bf89c0e70a04849bacd7766",
+                "shasum": ""
+            },
+            "require": {
+                "laminas/laminas-eventmanager": "^2.6 || ^3.0",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^7.1"
+            },
+            "conflict": {
+                "phpspec/prophecy": "<1.9.0"
+            },
+            "replace": {
+                "zendframework/zend-code": "self.version"
+            },
+            "require-dev": {
+                "doctrine/annotations": "^1.7",
+                "ext-phar": "*",
+                "laminas/laminas-coding-standard": "^1.0",
+                "laminas/laminas-stdlib": "^2.7 || ^3.0",
+                "phpunit/phpunit": "^7.5.16 || ^8.4"
+            },
+            "suggest": {
+                "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features",
+                "laminas/laminas-stdlib": "Laminas\\Stdlib component"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.4.x-dev",
+                    "dev-develop": "3.5.x-dev",
+                    "dev-dev-4.0": "4.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\Code\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Extensions to the PHP Reflection API, static code scanning, and code generation",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "code",
+                "laminas"
+            ],
+            "time": "2019-12-31T16:28:24+00:00"
+        },
+        {
+            "name": "laminas/laminas-config",
+            "version": "2.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-config.git",
+                "reference": "71ba6d5dd703196ce66b25abc4d772edb094dae1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-config/zipball/71ba6d5dd703196ce66b25abc4d772edb094dae1",
+                "reference": "71ba6d5dd703196ce66b25abc4d772edb094dae1",
+                "shasum": ""
+            },
+            "require": {
+                "laminas/laminas-stdlib": "^2.7 || ^3.0",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.5 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-config": "self.version"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "laminas/laminas-filter": "^2.6",
+                "laminas/laminas-i18n": "^2.5",
+                "laminas/laminas-json": "^2.6.1",
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+                "phpunit/phpunit": "~4.0"
+            },
+            "suggest": {
+                "laminas/laminas-filter": "Laminas\\Filter component",
+                "laminas/laminas-i18n": "Laminas\\I18n component",
+                "laminas/laminas-json": "Laminas\\Json to use the Json reader or writer classes",
+                "laminas/laminas-servicemanager": "Laminas\\ServiceManager for use with the Config Factory to retrieve reader and writer instances"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.6-dev",
+                    "dev-develop": "2.7-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\Config\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "provides a nested object property based user interface for accessing this configuration data within application code",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "config",
+                "laminas"
+            ],
+            "time": "2019-12-31T16:30:04+00:00"
+        },
+        {
+            "name": "laminas/laminas-console",
+            "version": "2.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-console.git",
+                "reference": "478a6ceac3e31fb38d6314088abda8b239ee23a5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-console/zipball/478a6ceac3e31fb38d6314088abda8b239ee23a5",
+                "reference": "478a6ceac3e31fb38d6314088abda8b239ee23a5",
+                "shasum": ""
+            },
+            "require": {
+                "laminas/laminas-stdlib": "^3.2.1",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-console": "self.version"
+            },
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-filter": "^2.7.2",
+                "laminas/laminas-json": "^2.6 || ^3.0",
+                "laminas/laminas-validator": "^2.10.1",
+                "phpunit/phpunit": "^5.7.23 || ^6.4.3"
+            },
+            "suggest": {
+                "laminas/laminas-filter": "To support DefaultRouteMatcher usage",
+                "laminas/laminas-validator": "To support DefaultRouteMatcher usage"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8.x-dev",
+                    "dev-develop": "2.9.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\Console\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Build console applications using getopt syntax or routing, complete with prompts",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "console",
+                "laminas"
+            ],
+            "time": "2019-12-31T16:31:45+00:00"
+        },
+        {
+            "name": "laminas/laminas-crypt",
+            "version": "2.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-crypt.git",
+                "reference": "6f291fe90c84c74d737c9dc9b8f0ad2b55dc0567"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-crypt/zipball/6f291fe90c84c74d737c9dc9b8f0ad2b55dc0567",
+                "reference": "6f291fe90c84c74d737c9dc9b8f0ad2b55dc0567",
+                "shasum": ""
+            },
+            "require": {
+                "container-interop/container-interop": "~1.0",
+                "laminas/laminas-math": "^2.6",
+                "laminas/laminas-stdlib": "^2.7 || ^3.0",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.5 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-crypt": "self.version"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0"
+            },
+            "suggest": {
+                "ext-mcrypt": "Required for most features of Laminas\\Crypt"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.6-dev",
+                    "dev-develop": "2.7-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\Crypt\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "crypt",
+                "laminas"
+            ],
+            "time": "2019-12-31T16:33:11+00:00"
+        },
+        {
+            "name": "laminas/laminas-db",
+            "version": "2.11.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-db.git",
+                "reference": "6c4238918b9204db1eb8cafae2c1940d40f4c007"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-db/zipball/6c4238918b9204db1eb8cafae2c1940d40f4c007",
+                "reference": "6c4238918b9204db1eb8cafae2c1940d40f4c007",
+                "shasum": ""
+            },
+            "require": {
+                "laminas/laminas-stdlib": "^2.7 || ^3.0",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-db": "^2.11.0"
+            },
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
+                "laminas/laminas-hydrator": "^1.1 || ^2.1 || ^3.0",
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.14"
+            },
+            "suggest": {
+                "laminas/laminas-eventmanager": "Laminas\\EventManager component",
+                "laminas/laminas-hydrator": "Laminas\\Hydrator component for using HydratingResultSets",
+                "laminas/laminas-servicemanager": "Laminas\\ServiceManager component"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.11.x-dev",
+                    "dev-develop": "2.12.x-dev"
+                },
+                "laminas": {
+                    "component": "Laminas\\Db",
+                    "config-provider": "Laminas\\Db\\ConfigProvider"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\Db\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Database abstraction layer, SQL abstraction, result set abstraction, and RowDataGateway and TableDataGateway implementations",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "db",
+                "laminas"
+            ],
+            "time": "2020-03-29T12:08:51+00:00"
+        },
+        {
+            "name": "laminas/laminas-dependency-plugin",
+            "version": "1.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-dependency-plugin.git",
+                "reference": "38bf91861f5b4d49f9a1c530327c997f7a7fb2db"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-dependency-plugin/zipball/38bf91861f5b4d49f9a1c530327c997f7a7fb2db",
+                "reference": "38bf91861f5b4d49f9a1c530327c997f7a7fb2db",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^1.1",
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "composer/composer": "^1.9",
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
+                "phpcompatibility/php-compatibility": "^9.3",
+                "phpunit/phpunit": "^8.4",
+                "roave/security-advisories": "dev-master",
+                "webimpress/coding-standard": "^1.0"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev",
+                    "dev-develop": "1.1.x-dev"
+                },
+                "class": "Laminas\\DependencyPlugin\\DependencyRewriterPlugin"
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\DependencyPlugin\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "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"
+        },
+        {
+            "name": "laminas/laminas-di",
+            "version": "2.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-di.git",
+                "reference": "239b22408a1f8eacda6fc2b838b5065c4cf1d88e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-di/zipball/239b22408a1f8eacda6fc2b838b5065c4cf1d88e",
+                "reference": "239b22408a1f8eacda6fc2b838b5065c4cf1d88e",
+                "shasum": ""
+            },
+            "require": {
+                "container-interop/container-interop": "^1.1",
+                "laminas/laminas-code": "^2.6 || ^3.0",
+                "laminas/laminas-stdlib": "^2.7 || ^3.0",
+                "laminas/laminas-zendframework-bridge": "^0.4.5 || ^1.0",
+                "php": "^5.5 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-di": "self.version"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.6-dev",
+                    "dev-develop": "2.7-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\Di\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "di",
+                "laminas"
+            ],
+            "time": "2019-12-31T15:17:33+00:00"
+        },
+        {
+            "name": "laminas/laminas-diactoros",
+            "version": "1.8.7p2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-diactoros.git",
+                "reference": "6991c1af7c8d2c8efee81b22ba97024781824aaa"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/6991c1af7c8d2c8efee81b22ba97024781824aaa",
+                "reference": "6991c1af7c8d2c8efee81b22ba97024781824aaa",
+                "shasum": ""
+            },
+            "require": {
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0",
+                "psr/http-message": "^1.0"
+            },
+            "provide": {
+                "psr/http-message-implementation": "1.0"
+            },
+            "replace": {
+                "zendframework/zend-diactoros": "~1.8.7.0"
+            },
+            "require-dev": {
+                "ext-dom": "*",
+                "ext-libxml": "*",
+                "laminas/laminas-coding-standard": "~1.0",
+                "php-http/psr7-integration-tests": "dev-master",
+                "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-release-1.8": "1.8.x-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/functions/create_uploaded_file.php",
+                    "src/functions/marshal_headers_from_sapi.php",
+                    "src/functions/marshal_method_from_sapi.php",
+                    "src/functions/marshal_protocol_version_from_sapi.php",
+                    "src/functions/marshal_uri_from_sapi.php",
+                    "src/functions/normalize_server.php",
+                    "src/functions/normalize_uploaded_files.php",
+                    "src/functions/parse_cookie_header.php",
+                    "src/functions/create_uploaded_file.legacy.php",
+                    "src/functions/marshal_headers_from_sapi.legacy.php",
+                    "src/functions/marshal_method_from_sapi.legacy.php",
+                    "src/functions/marshal_protocol_version_from_sapi.legacy.php",
+                    "src/functions/marshal_uri_from_sapi.legacy.php",
+                    "src/functions/normalize_server.legacy.php",
+                    "src/functions/normalize_uploaded_files.legacy.php",
+                    "src/functions/parse_cookie_header.legacy.php"
+                ],
+                "psr-4": {
+                    "Laminas\\Diactoros\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "PSR HTTP Message implementations",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "http",
+                "laminas",
+                "psr",
+                "psr-7"
+            ],
+            "time": "2020-03-23T15:28:28+00:00"
+        },
+        {
+            "name": "laminas/laminas-escaper",
+            "version": "2.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-escaper.git",
+                "reference": "25f2a053eadfa92ddacb609dcbbc39362610da70"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/25f2a053eadfa92ddacb609dcbbc39362610da70",
+                "reference": "25f2a053eadfa92ddacb609dcbbc39362610da70",
+                "shasum": ""
+            },
+            "require": {
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-escaper": "self.version"
+            },
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.6.x-dev",
+                    "dev-develop": "2.7.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\Escaper\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "escaper",
+                "laminas"
+            ],
+            "time": "2019-12-31T16:43:30+00:00"
+        },
+        {
+            "name": "laminas/laminas-eventmanager",
+            "version": "3.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-eventmanager.git",
+                "reference": "ce4dc0bdf3b14b7f9815775af9dfee80a63b4748"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-eventmanager/zipball/ce4dc0bdf3b14b7f9815775af9dfee80a63b4748",
+                "reference": "ce4dc0bdf3b14b7f9815775af9dfee80a63b4748",
+                "shasum": ""
+            },
+            "require": {
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-eventmanager": "self.version"
+            },
+            "require-dev": {
+                "athletic/athletic": "^0.1",
+                "container-interop/container-interop": "^1.1.0",
+                "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"
+            },
+            "suggest": {
+                "container-interop/container-interop": "^1.1.0, 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"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\EventManager\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Trigger and listen to events within a PHP application",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "event",
+                "eventmanager",
+                "events",
+                "laminas"
+            ],
+            "time": "2019-12-31T16:44:52+00:00"
+        },
+        {
+            "name": "laminas/laminas-feed",
+            "version": "2.12.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-feed.git",
+                "reference": "8a193ac96ebcb3e16b6ee754ac2a889eefacb654"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-feed/zipball/8a193ac96ebcb3e16b6ee754ac2a889eefacb654",
+                "reference": "8a193ac96ebcb3e16b6ee754ac2a889eefacb654",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-libxml": "*",
+                "laminas/laminas-escaper": "^2.5.2",
+                "laminas/laminas-stdlib": "^3.2.1",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-feed": "^2.12.0"
+            },
+            "require-dev": {
+                "laminas/laminas-cache": "^2.7.2",
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-db": "^2.8.2",
+                "laminas/laminas-http": "^2.7",
+                "laminas/laminas-servicemanager": "^2.7.8 || ^3.3",
+                "laminas/laminas-validator": "^2.10.1",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20",
+                "psr/http-message": "^1.0.1"
+            },
+            "suggest": {
+                "laminas/laminas-cache": "Laminas\\Cache component, for optionally caching feeds between requests",
+                "laminas/laminas-db": "Laminas\\Db component, for use with PubSubHubbub",
+                "laminas/laminas-http": "Laminas\\Http for PubSubHubbub, and optionally for use with Laminas\\Feed\\Reader",
+                "laminas/laminas-servicemanager": "Laminas\\ServiceManager component, for easily extending ExtensionManager implementations",
+                "laminas/laminas-validator": "Laminas\\Validator component, for validating email addresses used in Atom feeds and entries when using the Writer subcomponent",
+                "psr/http-message": "PSR-7 ^1.0.1, if you wish to use Laminas\\Feed\\Reader\\Http\\Psr7ResponseDecorator"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.12.x-dev",
+                    "dev-develop": "2.13.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\Feed\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "provides functionality for consuming RSS and Atom feeds",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "feed",
+                "laminas"
+            ],
+            "time": "2020-03-29T12:36:29+00:00"
+        },
+        {
+            "name": "laminas/laminas-filter",
+            "version": "2.9.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-filter.git",
+                "reference": "3c4476e772a062cef7531c6793377ae585d89c82"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/3c4476e772a062cef7531c6793377ae585d89c82",
+                "reference": "3c4476e772a062cef7531c6793377ae585d89c82",
+                "shasum": ""
+            },
+            "require": {
+                "laminas/laminas-stdlib": "^2.7.7 || ^3.1",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "conflict": {
+                "laminas/laminas-validator": "<2.10.1"
+            },
+            "replace": {
+                "zendframework/zend-filter": "^2.9.2"
+            },
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-crypt": "^3.2.1",
+                "laminas/laminas-servicemanager": "^2.7.8 || ^3.3",
+                "laminas/laminas-uri": "^2.6",
+                "pear/archive_tar": "^1.4.3",
+                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+                "psr/http-factory": "^1.0"
+            },
+            "suggest": {
+                "laminas/laminas-crypt": "Laminas\\Crypt component, for encryption filters",
+                "laminas/laminas-i18n": "Laminas\\I18n component for filters depending on i18n functionality",
+                "laminas/laminas-servicemanager": "Laminas\\ServiceManager component, for using the filter chain functionality",
+                "laminas/laminas-uri": "Laminas\\Uri component, for the UriNormalize filter",
+                "psr/http-factory-implementation": "psr/http-factory-implementation, for creating file upload instances when consuming PSR-7 in file upload filters"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.9.x-dev",
+                    "dev-develop": "2.10.x-dev"
+                },
+                "laminas": {
+                    "component": "Laminas\\Filter",
+                    "config-provider": "Laminas\\Filter\\ConfigProvider"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\Filter\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Programmatically filter and normalize data and files",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "filter",
+                "laminas"
+            ],
+            "time": "2020-03-29T12:41:29+00:00"
+        },
+        {
+            "name": "laminas/laminas-form",
+            "version": "2.14.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-form.git",
+                "reference": "3e22e09751cf6ae031be87a44e092e7925ce5b7b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-form/zipball/3e22e09751cf6ae031be87a44e092e7925ce5b7b",
+                "reference": "3e22e09751cf6ae031be87a44e092e7925ce5b7b",
+                "shasum": ""
+            },
+            "require": {
+                "laminas/laminas-hydrator": "^1.1 || ^2.1 || ^3.0",
+                "laminas/laminas-inputfilter": "^2.8",
+                "laminas/laminas-stdlib": "^3.2.1",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-form": "^2.14.3"
+            },
+            "require-dev": {
+                "doctrine/annotations": "~1.0",
+                "laminas/laminas-cache": "^2.6.1",
+                "laminas/laminas-captcha": "^2.7.1",
+                "laminas/laminas-code": "^2.6 || ^3.0",
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-escaper": "^2.5",
+                "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
+                "laminas/laminas-filter": "^2.6",
+                "laminas/laminas-i18n": "^2.6",
+                "laminas/laminas-recaptcha": "^3.0.0",
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+                "laminas/laminas-session": "^2.8.1",
+                "laminas/laminas-text": "^2.6",
+                "laminas/laminas-validator": "^2.6",
+                "laminas/laminas-view": "^2.6.2",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20"
+            },
+            "suggest": {
+                "laminas/laminas-captcha": "^2.7.1, required for using CAPTCHA form elements",
+                "laminas/laminas-code": "^2.6 || ^3.0, required to use laminas-form annotations support",
+                "laminas/laminas-eventmanager": "^2.6.2 || ^3.0, reuired for laminas-form annotations support",
+                "laminas/laminas-i18n": "^2.6, required when using laminas-form view helpers",
+                "laminas/laminas-recaptcha": "in order to use the ReCaptcha form element",
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3, required to use the form factories or provide services",
+                "laminas/laminas-view": "^2.6.2, required for using the laminas-form view helpers"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.14.x-dev",
+                    "dev-develop": "2.15.x-dev"
+                },
+                "laminas": {
+                    "component": "Laminas\\Form",
+                    "config-provider": "Laminas\\Form\\ConfigProvider"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\Form\\": "src/"
+                },
+                "files": [
+                    "autoload/formElementManagerPolyfill.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Validate and display simple and complex forms, casting forms to business objects and vice versa",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "form",
+                "laminas"
+            ],
+            "time": "2020-03-29T12:46:16+00:00"
+        },
+        {
+            "name": "laminas/laminas-http",
+            "version": "2.11.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-http.git",
+                "reference": "8c66963b933c80da59433da56a44dfa979f3ec88"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-http/zipball/8c66963b933c80da59433da56a44dfa979f3ec88",
+                "reference": "8c66963b933c80da59433da56a44dfa979f3ec88",
+                "shasum": ""
+            },
+            "require": {
+                "laminas/laminas-loader": "^2.5.1",
+                "laminas/laminas-stdlib": "^3.2.1",
+                "laminas/laminas-uri": "^2.5.2",
+                "laminas/laminas-validator": "^2.10.1",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-http": "self.version"
+            },
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-config": "^3.1 || ^2.6",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.3"
+            },
+            "suggest": {
+                "paragonie/certainty": "For automated management of cacert.pem"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.11.x-dev",
+                    "dev-develop": "2.12.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\Http\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "http",
+                "http client",
+                "laminas"
+            ],
+            "time": "2019-12-31T17:02:36+00:00"
+        },
+        {
+            "name": "laminas/laminas-hydrator",
+            "version": "2.4.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-hydrator.git",
+                "reference": "4a0e81cf05f32edcace817f1f48cb4055f689d85"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-hydrator/zipball/4a0e81cf05f32edcace817f1f48cb4055f689d85",
+                "reference": "4a0e81cf05f32edcace817f1f48cb4055f689d85",
+                "shasum": ""
+            },
+            "require": {
+                "laminas/laminas-stdlib": "^3.0",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-hydrator": "self.version"
+            },
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
+                "laminas/laminas-filter": "^2.6",
+                "laminas/laminas-inputfilter": "^2.6",
+                "laminas/laminas-serializer": "^2.6.1",
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
+            },
+            "suggest": {
+                "laminas/laminas-eventmanager": "^2.6.2 || ^3.0, to support aggregate hydrator usage",
+                "laminas/laminas-filter": "^2.6, to support naming strategy hydrator usage",
+                "laminas/laminas-serializer": "^2.6.1, to use the SerializableStrategy",
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3, to support hydrator plugin manager usage"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-release-2.4": "2.4.x-dev"
+                },
+                "laminas": {
+                    "component": "Laminas\\Hydrator",
+                    "config-provider": "Laminas\\Hydrator\\ConfigProvider"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\Hydrator\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Serialize objects to arrays, and vice versa",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "hydrator",
+                "laminas"
+            ],
+            "time": "2019-12-31T17:06:38+00:00"
+        },
+        {
+            "name": "laminas/laminas-i18n",
+            "version": "2.10.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-i18n.git",
+                "reference": "94ff957a1366f5be94f3d3a9b89b50386649e3ae"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-i18n/zipball/94ff957a1366f5be94f3d3a9b89b50386649e3ae",
+                "reference": "94ff957a1366f5be94f3d3a9b89b50386649e3ae",
+                "shasum": ""
+            },
+            "require": {
+                "ext-intl": "*",
+                "laminas/laminas-stdlib": "^2.7 || ^3.0",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "conflict": {
+                "phpspec/prophecy": "<1.9.0"
+            },
+            "replace": {
+                "zendframework/zend-i18n": "^2.10.1"
+            },
+            "require-dev": {
+                "laminas/laminas-cache": "^2.6.1",
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-config": "^2.6",
+                "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
+                "laminas/laminas-filter": "^2.6.1",
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+                "laminas/laminas-validator": "^2.6",
+                "laminas/laminas-view": "^2.6.3",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.16"
+            },
+            "suggest": {
+                "laminas/laminas-cache": "Laminas\\Cache component",
+                "laminas/laminas-config": "Laminas\\Config component",
+                "laminas/laminas-eventmanager": "You should install this package to use the events in the translator",
+                "laminas/laminas-filter": "You should install this package to use the provided filters",
+                "laminas/laminas-i18n-resources": "Translation resources",
+                "laminas/laminas-servicemanager": "Laminas\\ServiceManager component",
+                "laminas/laminas-validator": "You should install this package to use the provided validators",
+                "laminas/laminas-view": "You should install this package to use the provided view helpers"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.10.x-dev",
+                    "dev-develop": "2.11.x-dev"
+                },
+                "laminas": {
+                    "component": "Laminas\\I18n",
+                    "config-provider": "Laminas\\I18n\\ConfigProvider"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\I18n\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Provide translations for your application, and filter and validate internationalized values",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "i18n",
+                "laminas"
+            ],
+            "time": "2020-03-29T12:51:08+00:00"
+        },
+        {
+            "name": "laminas/laminas-inputfilter",
+            "version": "2.10.1",
+            "source": {
+                "type": "git",
+                "url": "git@github.com:laminas/laminas-inputfilter.git",
+                "reference": "b29ce8f512c966468eee37ea4873ae5fb545d00a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-inputfilter/zipball/b29ce8f512c966468eee37ea4873ae5fb545d00a",
+                "reference": "b29ce8f512c966468eee37ea4873ae5fb545d00a",
+                "shasum": ""
+            },
+            "require": {
+                "laminas/laminas-filter": "^2.9.1",
+                "laminas/laminas-servicemanager": "^2.7.10 || ^3.3.1",
+                "laminas/laminas-stdlib": "^2.7 || ^3.0",
+                "laminas/laminas-validator": "^2.11",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-inputfilter": "self.version"
+            },
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.15",
+                "psr/http-message": "^1.0"
+            },
+            "suggest": {
+                "psr/http-message-implementation": "PSR-7 is required if you wish to validate PSR-7 UploadedFileInterface payloads"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.10.x-dev",
+                    "dev-develop": "2.11.x-dev"
+                },
+                "laminas": {
+                    "component": "Laminas\\InputFilter",
+                    "config-provider": "Laminas\\InputFilter\\ConfigProvider"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\InputFilter\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Normalize and validate input sets from the web, APIs, the CLI, and more, including files",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "inputfilter",
+                "laminas"
+            ],
+            "time": "2019-12-31T17:11:54+00:00"
+        },
+        {
+            "name": "laminas/laminas-json",
+            "version": "2.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-json.git",
+                "reference": "db58425b7f0eba44a7539450cc926af80915951a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-json/zipball/db58425b7f0eba44a7539450cc926af80915951a",
+                "reference": "db58425b7f0eba44a7539450cc926af80915951a",
+                "shasum": ""
+            },
+            "require": {
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.5 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-json": "self.version"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "laminas/laminas-http": "^2.5.4",
+                "laminas/laminas-server": "^2.6.1",
+                "laminas/laminas-stdlib": "^2.5 || ^3.0",
+                "laminas/laminas-xml": "^1.0.2",
+                "phpunit/phpunit": "~4.0"
+            },
+            "suggest": {
+                "laminas/laminas-http": "Laminas\\Http component, required to use Laminas\\Json\\Server",
+                "laminas/laminas-server": "Laminas\\Server component, required to use Laminas\\Json\\Server",
+                "laminas/laminas-stdlib": "Laminas\\Stdlib component, for use with caching Laminas\\Json\\Server responses",
+                "laminas/laminas-xml": "To support Laminas\\Json\\Json::fromXml() usage"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.6-dev",
+                    "dev-develop": "2.7-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\Json\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "json",
+                "laminas"
+            ],
+            "time": "2019-12-31T17:15:00+00:00"
+        },
+        {
+            "name": "laminas/laminas-loader",
+            "version": "2.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-loader.git",
+                "reference": "5d01c2c237ae9e68bec262f339947e2ea18979bc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-loader/zipball/5d01c2c237ae9e68bec262f339947e2ea18979bc",
+                "reference": "5d01c2c237ae9e68bec262f339947e2ea18979bc",
+                "shasum": ""
+            },
+            "require": {
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-loader": "self.version"
+            },
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.6.x-dev",
+                    "dev-develop": "2.7.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\Loader\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Autoloading and plugin loading strategies",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "laminas",
+                "loader"
+            ],
+            "time": "2019-12-31T17:18:27+00:00"
+        },
+        {
+            "name": "laminas/laminas-log",
+            "version": "2.12.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-log.git",
+                "reference": "4e92d841b48868714a070b10866e94be80fc92ff"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-log/zipball/4e92d841b48868714a070b10866e94be80fc92ff",
+                "reference": "4e92d841b48868714a070b10866e94be80fc92ff",
+                "shasum": ""
+            },
+            "require": {
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+                "laminas/laminas-stdlib": "^2.7 || ^3.0",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0",
+                "psr/log": "^1.1.2"
+            },
+            "provide": {
+                "psr/log-implementation": "1.0.0"
+            },
+            "replace": {
+                "zendframework/zend-log": "self.version"
+            },
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-db": "^2.6",
+                "laminas/laminas-escaper": "^2.5",
+                "laminas/laminas-filter": "^2.5",
+                "laminas/laminas-mail": "^2.6.1",
+                "laminas/laminas-validator": "^2.10.1",
+                "mikey179/vfsstream": "^1.6.7",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.15"
+            },
+            "suggest": {
+                "ext-mongo": "mongo extension to use Mongo writer",
+                "ext-mongodb": "mongodb extension to use MongoDB writer",
+                "laminas/laminas-db": "Laminas\\Db component to use the database log writer",
+                "laminas/laminas-escaper": "Laminas\\Escaper component, for use in the XML log formatter",
+                "laminas/laminas-mail": "Laminas\\Mail component to use the email log writer",
+                "laminas/laminas-validator": "Laminas\\Validator component to block invalid log messages"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.12.x-dev",
+                    "dev-develop": "2.13.x-dev"
+                },
+                "laminas": {
+                    "component": "Laminas\\Log",
+                    "config-provider": "Laminas\\Log\\ConfigProvider"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\Log\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Robust, composite logger with filtering, formatting, and PSR-3 support",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "laminas",
+                "log",
+                "logging"
+            ],
+            "time": "2019-12-31T17:18:59+00:00"
+        },
+        {
+            "name": "laminas/laminas-mail",
+            "version": "2.10.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-mail.git",
+                "reference": "cfe0711446c8d9c392e9fc664c9ccc180fa89005"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-mail/zipball/cfe0711446c8d9c392e9fc664c9ccc180fa89005",
+                "reference": "cfe0711446c8d9c392e9fc664c9ccc180fa89005",
+                "shasum": ""
+            },
+            "require": {
+                "ext-iconv": "*",
+                "laminas/laminas-loader": "^2.5",
+                "laminas/laminas-mime": "^2.5",
+                "laminas/laminas-stdlib": "^2.7 || ^3.0",
+                "laminas/laminas-validator": "^2.10.2",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0",
+                "true/punycode": "^2.1"
+            },
+            "replace": {
+                "zendframework/zend-mail": "^2.10.0"
+            },
+            "require-dev": {
+                "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"
+            },
+            "suggest": {
+                "laminas/laminas-crypt": "Crammd5 support in SMTP Auth",
+                "laminas/laminas-servicemanager": "^2.7.10 || ^3.3.1 when using SMTP to deliver messages"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.10.x-dev",
+                    "dev-develop": "2.11.x-dev"
+                },
+                "laminas": {
+                    "component": "Laminas\\Mail",
+                    "config-provider": "Laminas\\Mail\\ConfigProvider"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\Mail\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Provides generalized functionality to compose and send both text and MIME-compliant multipart e-mail messages",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "laminas",
+                "mail"
+            ],
+            "funding": [
+                {
+                    "url": "https://funding.communitybridge.org/projects/laminas-project",
+                    "type": "community_bridge"
+                }
+            ],
+            "time": "2020-04-21T16:42:19+00:00"
+        },
+        {
+            "name": "laminas/laminas-math",
+            "version": "2.7.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-math.git",
+                "reference": "8027b37e00accc43f28605c7d8fd081baed1f475"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-math/zipball/8027b37e00accc43f28605c7d8fd081baed1f475",
+                "reference": "8027b37e00accc43f28605c7d8fd081baed1f475",
+                "shasum": ""
+            },
+            "require": {
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.5 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-math": "self.version"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "1.7.*",
+                "ircmaxell/random-lib": "~1.1",
+                "phpunit/phpunit": "~4.0"
+            },
+            "suggest": {
+                "ext-bcmath": "If using the bcmath functionality",
+                "ext-gmp": "If using the gmp functionality",
+                "ircmaxell/random-lib": "Fallback random byte generator for Laminas\\Math\\Rand if Mcrypt extensions is unavailable"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.7-dev",
+                    "dev-develop": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\Math\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "laminas",
+                "math"
+            ],
+            "time": "2019-12-31T17:24:15+00:00"
+        },
+        {
+            "name": "laminas/laminas-mime",
+            "version": "2.7.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-mime.git",
+                "reference": "e45a7d856bf7b4a7b5bd00d6371f9961dc233add"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-mime/zipball/e45a7d856bf7b4a7b5bd00d6371f9961dc233add",
+                "reference": "e45a7d856bf7b4a7b5bd00d6371f9961dc233add",
+                "shasum": ""
+            },
+            "require": {
+                "laminas/laminas-stdlib": "^2.7 || ^3.0",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-mime": "^2.7.2"
+            },
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-mail": "^2.6",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20"
+            },
+            "suggest": {
+                "laminas/laminas-mail": "Laminas\\Mail component"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.7.x-dev",
+                    "dev-develop": "2.8.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\Mime\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Create and parse MIME messages and parts",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "laminas",
+                "mime"
+            ],
+            "time": "2020-03-29T13:12:07+00:00"
+        },
+        {
+            "name": "laminas/laminas-modulemanager",
+            "version": "2.8.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-modulemanager.git",
+                "reference": "92b1cde1aab5aef687b863face6dd5d9c6751c78"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-modulemanager/zipball/92b1cde1aab5aef687b863face6dd5d9c6751c78",
+                "reference": "92b1cde1aab5aef687b863face6dd5d9c6751c78",
+                "shasum": ""
+            },
+            "require": {
+                "laminas/laminas-config": "^3.1 || ^2.6",
+                "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"
+            },
+            "replace": {
+                "zendframework/zend-modulemanager": "self.version"
+            },
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-console": "^2.6",
+                "laminas/laminas-di": "^2.6",
+                "laminas/laminas-loader": "^2.5",
+                "laminas/laminas-mvc": "^3.0 || ^2.7",
+                "laminas/laminas-servicemanager": "^3.0.3 || ^2.7.5",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.16"
+            },
+            "suggest": {
+                "laminas/laminas-console": "Laminas\\Console component",
+                "laminas/laminas-loader": "Laminas\\Loader component if you are not using Composer autoloading for your modules",
+                "laminas/laminas-mvc": "Laminas\\Mvc component",
+                "laminas/laminas-servicemanager": "Laminas\\ServiceManager component"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8.x-dev",
+                    "dev-develop": "2.9.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\ModuleManager\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Modular application system for laminas-mvc applications",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "laminas",
+                "modulemanager"
+            ],
+            "time": "2019-12-31T17:26:56+00:00"
+        },
+        {
+            "name": "laminas/laminas-mvc",
+            "version": "2.7.15",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-mvc.git",
+                "reference": "7e7198b03556a57fb5fd3ed919d9e1cf71500642"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-mvc/zipball/7e7198b03556a57fb5fd3ed919d9e1cf71500642",
+                "reference": "7e7198b03556a57fb5fd3ed919d9e1cf71500642",
+                "shasum": ""
+            },
+            "require": {
+                "container-interop/container-interop": "^1.1",
+                "laminas/laminas-console": "^2.7",
+                "laminas/laminas-eventmanager": "^2.6.4 || ^3.0",
+                "laminas/laminas-form": "^2.11",
+                "laminas/laminas-hydrator": "^1.1 || ^2.4",
+                "laminas/laminas-psr7bridge": "^0.2",
+                "laminas/laminas-servicemanager": "^2.7.10 || ^3.0.3",
+                "laminas/laminas-stdlib": "^2.7.5 || ^3.0",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.5 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-mvc": "self.version"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "1.7.*",
+                "laminas/laminas-authentication": "^2.6",
+                "laminas/laminas-cache": "^2.8",
+                "laminas/laminas-di": "^2.6",
+                "laminas/laminas-filter": "^2.8",
+                "laminas/laminas-http": "^2.8",
+                "laminas/laminas-i18n": "^2.8",
+                "laminas/laminas-inputfilter": "^2.8",
+                "laminas/laminas-json": "^2.6.1",
+                "laminas/laminas-log": "^2.9.3",
+                "laminas/laminas-modulemanager": "^2.8",
+                "laminas/laminas-serializer": "^2.8",
+                "laminas/laminas-session": "^2.8.1",
+                "laminas/laminas-text": "^2.7",
+                "laminas/laminas-uri": "^2.6",
+                "laminas/laminas-validator": "^2.10",
+                "laminas/laminas-view": "^2.9",
+                "phpunit/phpunit": "^4.8.36",
+                "sebastian/comparator": "^1.2.4",
+                "sebastian/version": "^1.0.4"
+            },
+            "suggest": {
+                "laminas/laminas-authentication": "Laminas\\Authentication component for Identity plugin",
+                "laminas/laminas-config": "Laminas\\Config component",
+                "laminas/laminas-di": "Laminas\\Di component",
+                "laminas/laminas-filter": "Laminas\\Filter component",
+                "laminas/laminas-http": "Laminas\\Http component",
+                "laminas/laminas-i18n": "Laminas\\I18n component for translatable segments",
+                "laminas/laminas-inputfilter": "Laminas\\Inputfilter component",
+                "laminas/laminas-json": "Laminas\\Json component",
+                "laminas/laminas-log": "Laminas\\Log component",
+                "laminas/laminas-modulemanager": "Laminas\\ModuleManager component",
+                "laminas/laminas-serializer": "Laminas\\Serializer component",
+                "laminas/laminas-servicemanager-di": "^1.0.1, if using laminas-servicemanager v3 and requiring the laminas-di integration",
+                "laminas/laminas-session": "Laminas\\Session component for FlashMessenger, PRG, and FPRG plugins",
+                "laminas/laminas-text": "Laminas\\Text component",
+                "laminas/laminas-uri": "Laminas\\Uri component",
+                "laminas/laminas-validator": "Laminas\\Validator component",
+                "laminas/laminas-view": "Laminas\\View component"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.7-dev",
+                    "dev-develop": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/autoload.php"
+                ],
+                "psr-4": {
+                    "Laminas\\Mvc\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "laminas",
+                "mvc"
+            ],
+            "time": "2019-12-31T17:32:15+00:00"
+        },
+        {
+            "name": "laminas/laminas-psr7bridge",
+            "version": "0.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-psr7bridge.git",
+                "reference": "14780ef1d40effd59d77ab29c6d439b2af42cdfa"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-psr7bridge/zipball/14780ef1d40effd59d77ab29c6d439b2af42cdfa",
+                "reference": "14780ef1d40effd59d77ab29c6d439b2af42cdfa",
+                "shasum": ""
+            },
+            "require": {
+                "laminas/laminas-diactoros": "^1.1",
+                "laminas/laminas-http": "^2.5",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": ">=5.5",
+                "psr/http-message": "^1.0"
+            },
+            "replace": {
+                "zendframework/zend-psr7bridge": "self.version"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.7",
+                "squizlabs/php_codesniffer": "^2.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev",
+                    "dev-develop": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\Psr7Bridge\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "PSR-7 <-> Laminas\\Http bridge",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "http",
+                "laminas",
+                "psr",
+                "psr-7"
+            ],
+            "time": "2019-12-31T17:38:47+00:00"
+        },
+        {
+            "name": "laminas/laminas-serializer",
+            "version": "2.9.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-serializer.git",
+                "reference": "c1c9361f114271b0736db74e0083a919081af5e0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-serializer/zipball/c1c9361f114271b0736db74e0083a919081af5e0",
+                "reference": "c1c9361f114271b0736db74e0083a919081af5e0",
+                "shasum": ""
+            },
+            "require": {
+                "laminas/laminas-json": "^2.5 || ^3.0",
+                "laminas/laminas-stdlib": "^2.7 || ^3.0",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-serializer": "self.version"
+            },
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-math": "^2.6 || ^3.0",
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.16"
+            },
+            "suggest": {
+                "laminas/laminas-math": "(^2.6 || ^3.0) To support Python Pickle serialization",
+                "laminas/laminas-servicemanager": "(^2.7.5 || ^3.0.3) To support plugin manager support"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.9.x-dev",
+                    "dev-develop": "2.10.x-dev"
+                },
+                "laminas": {
+                    "component": "Laminas\\Serializer",
+                    "config-provider": "Laminas\\Serializer\\ConfigProvider"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\Serializer\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Serialize and deserialize PHP structures to a variety of representations",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "laminas",
+                "serializer"
+            ],
+            "time": "2019-12-31T17:42:11+00:00"
+        },
+        {
+            "name": "laminas/laminas-server",
+            "version": "2.8.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-server.git",
+                "reference": "4aaca9174c40a2fab2e2aa77999da99f71bdd88e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-server/zipball/4aaca9174c40a2fab2e2aa77999da99f71bdd88e",
+                "reference": "4aaca9174c40a2fab2e2aa77999da99f71bdd88e",
+                "shasum": ""
+            },
+            "require": {
+                "laminas/laminas-code": "^2.5 || ^3.0",
+                "laminas/laminas-stdlib": "^2.5 || ^3.0",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-server": "self.version"
+            },
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8.x-dev",
+                    "dev-develop": "2.9.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\Server\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Create Reflection-based RPC servers",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "laminas",
+                "server"
+            ],
+            "time": "2019-12-31T17:43:03+00:00"
+        },
+        {
+            "name": "laminas/laminas-servicemanager",
+            "version": "2.7.11",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-servicemanager.git",
+                "reference": "841abb656c6018afebeec1f355be438426d6a3dd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/841abb656c6018afebeec1f355be438426d6a3dd",
+                "reference": "841abb656c6018afebeec1f355be438426d6a3dd",
+                "shasum": ""
+            },
+            "require": {
+                "container-interop/container-interop": "~1.0",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.5 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-servicemanager": "self.version"
+            },
+            "require-dev": {
+                "athletic/athletic": "dev-master",
+                "fabpot/php-cs-fixer": "1.7.*",
+                "laminas/laminas-di": "~2.5",
+                "laminas/laminas-mvc": "~2.5",
+                "phpunit/phpunit": "~4.0"
+            },
+            "suggest": {
+                "laminas/laminas-di": "Laminas\\Di component",
+                "ocramius/proxy-manager": "ProxyManager 0.5.* to handle lazy initialization of services"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.7-dev",
+                    "dev-develop": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\ServiceManager\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "laminas",
+                "servicemanager"
+            ],
+            "time": "2019-12-31T17:44:16+00:00"
+        },
+        {
+            "name": "laminas/laminas-session",
+            "version": "2.9.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-session.git",
+                "reference": "519e8966146536cd97c1cc3d59a21b095fb814d7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-session/zipball/519e8966146536cd97c1cc3d59a21b095fb814d7",
+                "reference": "519e8966146536cd97c1cc3d59a21b095fb814d7",
+                "shasum": ""
+            },
+            "require": {
+                "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
+                "laminas/laminas-stdlib": "^3.2.1",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-session": "^2.9.1"
+            },
+            "require-dev": {
+                "container-interop/container-interop": "^1.1",
+                "laminas/laminas-cache": "^2.6.1",
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-db": "^2.7",
+                "laminas/laminas-http": "^2.5.4",
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+                "laminas/laminas-validator": "^2.6",
+                "mongodb/mongodb": "^1.0.1",
+                "php-mock/php-mock-phpunit": "^1.1.2 || ^2.0",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20"
+            },
+            "suggest": {
+                "laminas/laminas-cache": "Laminas\\Cache component",
+                "laminas/laminas-db": "Laminas\\Db component",
+                "laminas/laminas-http": "Laminas\\Http component",
+                "laminas/laminas-servicemanager": "Laminas\\ServiceManager component",
+                "laminas/laminas-validator": "Laminas\\Validator component",
+                "mongodb/mongodb": "If you want to use the MongoDB session save handler"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.9.x-dev",
+                    "dev-develop": "2.10.x-dev"
+                },
+                "laminas": {
+                    "component": "Laminas\\Session",
+                    "config-provider": "Laminas\\Session\\ConfigProvider"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\Session\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Object-oriented interface to PHP sessions and storage",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "laminas",
+                "session"
+            ],
+            "time": "2020-03-29T13:26:04+00:00"
+        },
+        {
+            "name": "laminas/laminas-soap",
+            "version": "2.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-soap.git",
+                "reference": "34f91d5c4c0a78bc5689cca2d1eaf829b27edd72"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-soap/zipball/34f91d5c4c0a78bc5689cca2d1eaf829b27edd72",
+                "reference": "34f91d5c4c0a78bc5689cca2d1eaf829b27edd72",
+                "shasum": ""
+            },
+            "require": {
+                "ext-soap": "*",
+                "laminas/laminas-server": "^2.6.1",
+                "laminas/laminas-stdlib": "^2.7 || ^3.0",
+                "laminas/laminas-uri": "^2.5.2",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-soap": "self.version"
+            },
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-config": "^2.6",
+                "laminas/laminas-http": "^2.5.4",
+                "phpunit/phpunit": "^5.7.21 || ^6.3"
+            },
+            "suggest": {
+                "laminas/laminas-http": "Laminas\\Http component"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.7.x-dev",
+                    "dev-develop": "2.8.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\Soap\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "laminas",
+                "soap"
+            ],
+            "time": "2019-12-31T17:48:49+00:00"
+        },
+        {
+            "name": "laminas/laminas-stdlib",
+            "version": "3.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-stdlib.git",
+                "reference": "2b18347625a2f06a1a485acfbc870f699dbe51c6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/2b18347625a2f06a1a485acfbc870f699dbe51c6",
+                "reference": "2b18347625a2f06a1a485acfbc870f699dbe51c6",
+                "shasum": ""
+            },
+            "require": {
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-stdlib": "self.version"
+            },
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "phpbench/phpbench": "^0.13",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2.x-dev",
+                    "dev-develop": "3.3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\Stdlib\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "SPL extensions, array utilities, error handlers, and more",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "laminas",
+                "stdlib"
+            ],
+            "time": "2019-12-31T17:51:15+00:00"
+        },
+        {
+            "name": "laminas/laminas-text",
+            "version": "2.7.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-text.git",
+                "reference": "3601b5eacb06ed0a12f658df860cc0f9613cf4db"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-text/zipball/3601b5eacb06ed0a12f658df860cc0f9613cf4db",
+                "reference": "3601b5eacb06ed0a12f658df860cc0f9613cf4db",
+                "shasum": ""
+            },
+            "require": {
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+                "laminas/laminas-stdlib": "^2.7 || ^3.0",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-text": "self.version"
+            },
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-config": "^2.6",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.7.x-dev",
+                    "dev-develop": "2.8.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\Text\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Create FIGlets and text-based tables",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "laminas",
+                "text"
+            ],
+            "time": "2019-12-31T17:54:52+00:00"
+        },
+        {
+            "name": "laminas/laminas-uri",
+            "version": "2.7.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-uri.git",
+                "reference": "6be8ce19622f359b048ce4faebf1aa1bca73a7ff"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-uri/zipball/6be8ce19622f359b048ce4faebf1aa1bca73a7ff",
+                "reference": "6be8ce19622f359b048ce4faebf1aa1bca73a7ff",
+                "shasum": ""
+            },
+            "require": {
+                "laminas/laminas-escaper": "^2.5",
+                "laminas/laminas-validator": "^2.10",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-uri": "self.version"
+            },
+            "require-dev": {
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.7.x-dev",
+                    "dev-develop": "2.8.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\Uri\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "A component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "laminas",
+                "uri"
+            ],
+            "time": "2019-12-31T17:56:00+00:00"
+        },
+        {
+            "name": "laminas/laminas-validator",
+            "version": "2.13.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-validator.git",
+                "reference": "93593684e70b8ed1e870cacd34ca32b0c0ace185"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/93593684e70b8ed1e870cacd34ca32b0c0ace185",
+                "reference": "93593684e70b8ed1e870cacd34ca32b0c0ace185",
+                "shasum": ""
+            },
+            "require": {
+                "container-interop/container-interop": "^1.1",
+                "laminas/laminas-stdlib": "^3.2.1",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^7.1"
+            },
+            "replace": {
+                "zendframework/zend-validator": "^2.13.0"
+            },
+            "require-dev": {
+                "laminas/laminas-cache": "^2.6.1",
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-config": "^2.6",
+                "laminas/laminas-db": "^2.7",
+                "laminas/laminas-filter": "^2.6",
+                "laminas/laminas-http": "^2.5.4",
+                "laminas/laminas-i18n": "^2.6",
+                "laminas/laminas-math": "^2.6",
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+                "laminas/laminas-session": "^2.8",
+                "laminas/laminas-uri": "^2.5",
+                "phpunit/phpunit": "^7.5.20 || ^8.5.2",
+                "psr/http-client": "^1.0",
+                "psr/http-factory": "^1.0",
+                "psr/http-message": "^1.0"
+            },
+            "suggest": {
+                "laminas/laminas-db": "Laminas\\Db component, required by the (No)RecordExists validator",
+                "laminas/laminas-filter": "Laminas\\Filter component, required by the Digits validator",
+                "laminas/laminas-i18n": "Laminas\\I18n component to allow translation of validation error messages",
+                "laminas/laminas-i18n-resources": "Translations of validator messages",
+                "laminas/laminas-math": "Laminas\\Math component, required by the Csrf validator",
+                "laminas/laminas-servicemanager": "Laminas\\ServiceManager component to allow using the ValidatorPluginManager and validator chains",
+                "laminas/laminas-session": "Laminas\\Session component, ^2.8; required by the Csrf validator",
+                "laminas/laminas-uri": "Laminas\\Uri component, required by the Uri and Sitemap\\Loc validators",
+                "psr/http-message": "psr/http-message, required when validating PSR-7 UploadedFileInterface instances via the Upload and UploadFile validators"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.13.x-dev",
+                    "dev-develop": "2.14.x-dev"
+                },
+                "laminas": {
+                    "component": "Laminas\\Validator",
+                    "config-provider": "Laminas\\Validator\\ConfigProvider"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\Validator\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Validation classes for a wide range of domains, and the ability to chain validators to create complex validation criteria",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "laminas",
+                "validator"
+            ],
+            "time": "2020-03-31T18:57:01+00:00"
+        },
+        {
+            "name": "laminas/laminas-view",
+            "version": "2.11.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-view.git",
+                "reference": "3bbb2e94287383604c898284a18d2d06cf17301e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-view/zipball/3bbb2e94287383604c898284a18d2d06cf17301e",
+                "reference": "3bbb2e94287383604c898284a18d2d06cf17301e",
+                "shasum": ""
+            },
+            "require": {
+                "laminas/laminas-eventmanager": "^2.6.2 || ^3.0",
+                "laminas/laminas-json": "^2.6.1 || ^3.0",
+                "laminas/laminas-loader": "^2.5",
+                "laminas/laminas-stdlib": "^2.7 || ^3.0",
+                "laminas/laminas-zendframework-bridge": "^1.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "replace": {
+                "zendframework/zend-view": "self.version"
+            },
+            "require-dev": {
+                "laminas/laminas-authentication": "^2.5",
+                "laminas/laminas-cache": "^2.6.1",
+                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-config": "^2.6",
+                "laminas/laminas-console": "^2.6",
+                "laminas/laminas-escaper": "^2.5",
+                "laminas/laminas-feed": "^2.7",
+                "laminas/laminas-filter": "^2.6.1",
+                "laminas/laminas-http": "^2.5.4",
+                "laminas/laminas-i18n": "^2.6",
+                "laminas/laminas-log": "^2.7",
+                "laminas/laminas-modulemanager": "^2.7.1",
+                "laminas/laminas-mvc": "^2.7.14 || ^3.0",
+                "laminas/laminas-navigation": "^2.5",
+                "laminas/laminas-paginator": "^2.5",
+                "laminas/laminas-permissions-acl": "^2.6",
+                "laminas/laminas-router": "^3.0.1",
+                "laminas/laminas-serializer": "^2.6.1",
+                "laminas/laminas-servicemanager": "^2.7.5 || ^3.0.3",
+                "laminas/laminas-session": "^2.8.1",
+                "laminas/laminas-uri": "^2.5",
+                "phpunit/phpunit": "^5.7.15 || ^6.0.8"
+            },
+            "suggest": {
+                "laminas/laminas-authentication": "Laminas\\Authentication component",
+                "laminas/laminas-escaper": "Laminas\\Escaper component",
+                "laminas/laminas-feed": "Laminas\\Feed component",
+                "laminas/laminas-filter": "Laminas\\Filter component",
+                "laminas/laminas-http": "Laminas\\Http component",
+                "laminas/laminas-i18n": "Laminas\\I18n component",
+                "laminas/laminas-mvc": "Laminas\\Mvc component",
+                "laminas/laminas-mvc-plugin-flashmessenger": "laminas-mvc-plugin-flashmessenger component, if you want to use the FlashMessenger view helper with laminas-mvc versions 3 and up",
+                "laminas/laminas-navigation": "Laminas\\Navigation component",
+                "laminas/laminas-paginator": "Laminas\\Paginator component",
+                "laminas/laminas-permissions-acl": "Laminas\\Permissions\\Acl component",
+                "laminas/laminas-servicemanager": "Laminas\\ServiceManager component",
+                "laminas/laminas-uri": "Laminas\\Uri component"
+            },
+            "bin": [
+                "bin/templatemap_generator.php"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.11.x-dev",
+                    "dev-develop": "2.12.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laminas\\View\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Flexible view layer supporting and providing multiple view layers, helpers, and more",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "laminas",
+                "view"
+            ],
+            "time": "2019-12-31T18:03:30+00:00"
+        },
+        {
+            "name": "laminas/laminas-zendframework-bridge",
+            "version": "1.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-zendframework-bridge.git",
+                "reference": "fcd87520e4943d968557803919523772475e8ea3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/fcd87520e4943d968557803919523772475e8ea3",
+                "reference": "fcd87520e4943d968557803919523772475e8ea3",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1",
+                "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"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/autoload.php"
+                ],
+                "psr-4": {
+                    "Laminas\\ZendFrameworkBridge\\": "src//"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Alias legacy ZF class names to Laminas Project equivalents.",
+            "keywords": [
+                "ZendFramework",
+                "autoloading",
+                "laminas",
+                "zf"
+            ],
+            "funding": [
+                {
+                    "url": "https://funding.communitybridge.org/projects/laminas-project",
+                    "type": "community_bridge"
+                }
+            ],
+            "time": "2020-05-20T16:45:56+00:00"
+        },
+        {
+            "name": "magento/composer",
+            "version": "1.6.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/magento/composer.git",
+                "reference": "f3e4bec8fc73a97a6cbc391b1b93d4c32566763d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/magento/composer/zipball/f3e4bec8fc73a97a6cbc391b1b93d4c32566763d",
+                "reference": "f3e4bec8fc73a97a6cbc391b1b93d4c32566763d",
+                "shasum": ""
+            },
+            "require": {
+                "composer/composer": "^1.9",
+                "php": "~7.3.0||~7.4.0",
+                "symfony/console": "~4.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Magento\\Composer\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "OSL-3.0",
+                "AFL-3.0"
+            ],
+            "description": "Magento composer library helps to instantiate Composer application and run composer commands.",
+            "time": "2020-05-08T01:07:09+00:00"
+        },
+        {
+            "name": "magento/magento-composer-installer",
+            "version": "0.1.13",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/magento/magento-composer-installer.git",
+                "reference": "8b6c32f53b4944a5d6656e86344cd0f9784709a1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/magento/magento-composer-installer/zipball/8b6c32f53b4944a5d6656e86344cd0f9784709a1",
+                "reference": "8b6c32f53b4944a5d6656e86344cd0f9784709a1",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^1.0"
+            },
+            "replace": {
+                "magento-hackathon/magento-composer-installer": "*"
+            },
+            "require-dev": {
+                "composer/composer": "*@dev",
+                "firegento/phpcs": "dev-patch-1",
+                "mikey179/vfsstream": "*",
+                "phpunit/phpunit": "*",
+                "phpunit/phpunit-mock-objects": "dev-master",
+                "squizlabs/php_codesniffer": "1.4.7",
+                "symfony/process": "*"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "composer-command-registry": [
+                    "MagentoHackathon\\Composer\\Magento\\Command\\DeployCommand"
+                ],
+                "class": "MagentoHackathon\\Composer\\Magento\\Plugin"
+            },
+            "autoload": {
+                "psr-0": {
+                    "MagentoHackathon\\Composer\\Magento": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "OSL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "Vinai Kopp",
+                    "email": "vinai@netzarbeiter.com"
+                },
+                {
+                    "name": "Daniel Fahlke aka Flyingmana",
+                    "email": "flyingmana@googlemail.com"
+                },
+                {
+                    "name": "Jörg Weller",
+                    "email": "weller@flagbit.de"
+                },
+                {
+                    "name": "Karl Spies",
+                    "email": "karl.spies@gmx.net"
+                },
+                {
+                    "name": "Tobias Vogt",
+                    "email": "tobi@webguys.de"
+                },
+                {
+                    "name": "David Fuhr",
+                    "email": "fuhr@flagbit.de"
+                }
+            ],
+            "description": "Composer installer for Magento modules",
+            "homepage": "https://github.com/magento/magento-composer-installer",
+            "keywords": [
+                "composer-installer",
+                "magento"
+            ],
+            "time": "2017-12-29T16:45:24+00:00"
+        },
+        {
+            "name": "magento/zendframework1",
+            "version": "1.14.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/magento/zf1.git",
+                "reference": "250f35c0e80b5e6fa1a1598c144cba2fff36b565"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/magento/zf1/zipball/250f35c0e80b5e6fa1a1598c144cba2fff36b565",
+                "reference": "250f35c0e80b5e6fa1a1598c144cba2fff36b565",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.2.11"
+            },
+            "require-dev": {
+                "phpunit/dbunit": "1.3.*",
+                "phpunit/phpunit": "3.7.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.12.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Zend_": "library/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                "library/"
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Magento Zend Framework 1",
+            "homepage": "http://framework.zend.com/",
+            "keywords": [
+                "ZF1",
+                "framework"
+            ],
+            "time": "2020-05-19T23:25:07+00:00"
+        },
+        {
+            "name": "monolog/monolog",
+            "version": "1.25.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Seldaek/monolog.git",
+                "reference": "3022efff205e2448b560c833c6fbbf91c3139168"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/3022efff205e2448b560c833c6fbbf91c3139168",
+                "reference": "3022efff205e2448b560c833c6fbbf91c3139168",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0",
+                "psr/log": "~1.0"
+            },
+            "provide": {
+                "psr/log-implementation": "1.0.0"
+            },
+            "require-dev": {
+                "aws/aws-sdk-php": "^2.4.9 || ^3.0",
+                "doctrine/couchdb": "~1.0@dev",
+                "graylog2/gelf-php": "~1.0",
+                "php-amqplib/php-amqplib": "~2.4",
+                "php-console/php-console": "^3.1.3",
+                "php-parallel-lint/php-parallel-lint": "^1.0",
+                "phpunit/phpunit": "~4.5",
+                "ruflin/elastica": ">=0.90 <3.0",
+                "sentry/sentry": "^0.13",
+                "swiftmailer/swiftmailer": "^5.3|^6.0"
+            },
+            "suggest": {
+                "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
+                "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
+                "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
+                "ext-mongo": "Allow sending log messages to a MongoDB server",
+                "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
+                "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver",
+                "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
+                "php-console/php-console": "Allow sending log messages to Google Chrome",
+                "rollbar/rollbar": "Allow sending log messages to Rollbar",
+                "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
+                "sentry/sentry": "Allow sending log messages to a Sentry server"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Monolog\\": "src/Monolog"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
+            "homepage": "http://github.com/Seldaek/monolog",
+            "keywords": [
+                "log",
+                "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"
+        },
+        {
+            "name": "paragonie/random_compat",
+            "version": "v9.99.99",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/paragonie/random_compat.git",
+                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
+                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.*|5.*",
+                "vimeo/psalm": "^1"
+            },
+            "suggest": {
+                "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
+            },
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Paragon Initiative Enterprises",
+                    "email": "security@paragonie.com",
+                    "homepage": "https://paragonie.com"
+                }
+            ],
+            "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
+            "keywords": [
+                "csprng",
+                "polyfill",
+                "pseudorandom",
+                "random"
+            ],
+            "time": "2018-07-02T15:55:56+00:00"
+        },
+        {
+            "name": "paragonie/sodium_compat",
+            "version": "v1.13.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/paragonie/sodium_compat.git",
+                "reference": "bbade402cbe84c69b718120911506a3aa2bae653"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/bbade402cbe84c69b718120911506a3aa2bae653",
+                "reference": "bbade402cbe84c69b718120911506a3aa2bae653",
+                "shasum": ""
+            },
+            "require": {
+                "paragonie/random_compat": ">=1",
+                "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7|^8"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^3|^4|^5|^6|^7"
+            },
+            "suggest": {
+                "ext-libsodium": "PHP < 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security.",
+                "ext-sodium": "PHP >= 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "autoload.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "ISC"
+            ],
+            "authors": [
+                {
+                    "name": "Paragon Initiative Enterprises",
+                    "email": "security@paragonie.com"
+                },
+                {
+                    "name": "Frank Denis",
+                    "email": "jedisct1@pureftpd.org"
+                }
+            ],
+            "description": "Pure PHP implementation of libsodium; uses the PHP extension if it exists",
+            "keywords": [
+                "Authentication",
+                "BLAKE2b",
+                "ChaCha20",
+                "ChaCha20-Poly1305",
+                "Chapoly",
+                "Curve25519",
+                "Ed25519",
+                "EdDSA",
+                "Edwards-curve Digital Signature Algorithm",
+                "Elliptic Curve Diffie-Hellman",
+                "Poly1305",
+                "Pure-PHP cryptography",
+                "RFC 7748",
+                "RFC 8032",
+                "Salpoly",
+                "Salsa20",
+                "X25519",
+                "XChaCha20-Poly1305",
+                "XSalsa20-Poly1305",
+                "Xchacha20",
+                "Xsalsa20",
+                "aead",
+                "cryptography",
+                "ecdh",
+                "elliptic curve",
+                "elliptic curve cryptography",
+                "encryption",
+                "libsodium",
+                "php",
+                "public-key cryptography",
+                "secret-key cryptography",
+                "side-channel resistant"
+            ],
+            "time": "2020-03-20T21:48:09+00:00"
+        },
+        {
+            "name": "pelago/emogrifier",
+            "version": "v3.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/MyIntervals/emogrifier.git",
+                "reference": "f6a5c7d44612d86c3901c93f1592f5440e6b2cd8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/f6a5c7d44612d86c3901c93f1592f5440e6b2cd8",
+                "reference": "f6a5c7d44612d86c3901c93f1592f5440e6b2cd8",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-libxml": "*",
+                "php": "^5.6 || ~7.0 || ~7.1 || ~7.2 || ~7.3 || ~7.4",
+                "symfony/css-selector": "^2.8 || ^3.0 || ^4.0 || ^5.0"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^2.15.3",
+                "phpmd/phpmd": "^2.7.0",
+                "phpunit/phpunit": "^5.7.27",
+                "squizlabs/php_codesniffer": "^3.5.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Pelago\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Oliver Klee",
+                    "email": "github@oliverklee.de"
+                },
+                {
+                    "name": "Zoli Szabó",
+                    "email": "zoli.szabo+github@gmail.com"
+                },
+                {
+                    "name": "John Reeve",
+                    "email": "jreeve@pelagodesign.com"
+                },
+                {
+                    "name": "Jake Hotson",
+                    "email": "jake@qzdesign.co.uk"
+                },
+                {
+                    "name": "Cameron Brooks"
+                },
+                {
+                    "name": "Jaime Prado"
+                }
+            ],
+            "description": "Converts CSS styles into inline style attributes in your HTML code",
+            "homepage": "https://www.myintervals.com/emogrifier.php",
+            "keywords": [
+                "css",
+                "email",
+                "pre-processing"
+            ],
+            "time": "2019-12-26T19:37:31+00:00"
+        },
+        {
+            "name": "php-amqplib/php-amqplib",
+            "version": "v2.10.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-amqplib/php-amqplib.git",
+                "reference": "6e2b2501e021e994fb64429e5a78118f83b5c200"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-amqplib/php-amqplib/zipball/6e2b2501e021e994fb64429e5a78118f83b5c200",
+                "reference": "6e2b2501e021e994fb64429e5a78118f83b5c200",
+                "shasum": ""
+            },
+            "require": {
+                "ext-bcmath": "*",
+                "ext-sockets": "*",
+                "php": ">=5.6"
+            },
+            "replace": {
+                "videlalvaro/php-amqplib": "self.version"
+            },
+            "require-dev": {
+                "ext-curl": "*",
+                "nategood/httpful": "^0.2.20",
+                "phpunit/phpunit": "^5.7|^6.5|^7.0",
+                "squizlabs/php_codesniffer": "^2.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.10-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PhpAmqpLib\\": "PhpAmqpLib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-2.1-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Alvaro Videla",
+                    "role": "Original Maintainer"
+                },
+                {
+                    "name": "John Kelly",
+                    "email": "johnmkelly86@gmail.com",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "Raúl Araya",
+                    "email": "nubeiro@gmail.com",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "Luke Bakken",
+                    "email": "luke@bakken.io",
+                    "role": "Maintainer"
+                }
+            ],
+            "description": "Formerly videlalvaro/php-amqplib.  This library is a pure PHP implementation of the AMQP protocol. It's been tested against RabbitMQ.",
+            "homepage": "https://github.com/php-amqplib/php-amqplib/",
+            "keywords": [
+                "message",
+                "queue",
+                "rabbitmq"
+            ],
+            "time": "2019-10-10T13:23:40+00:00"
+        },
+        {
+            "name": "phpseclib/mcrypt_compat",
+            "version": "1.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpseclib/mcrypt_compat.git",
+                "reference": "f74c7b1897b62f08f268184b8bb98d9d9ab723b0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpseclib/mcrypt_compat/zipball/f74c7b1897b62f08f268184b8bb98d9d9ab723b0",
+                "reference": "f74c7b1897b62f08f268184b8bb98d9d9ab723b0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "phpseclib/phpseclib": ">=2.0.11 <3.0.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35|^5.7|^6.0"
+            },
+            "suggest": {
+                "ext-openssl": "Will enable faster cryptographic operations"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "lib/mcrypt.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jim Wigginton",
+                    "email": "terrafrost@php.net",
+                    "homepage": "http://phpseclib.sourceforge.net"
+                }
+            ],
+            "description": "PHP 7.1 polyfill for the mcrypt extension from PHP <= 7.0",
+            "keywords": [
+                "cryptograpy",
+                "encryption",
+                "mcrypt"
+            ],
+            "time": "2018-08-22T03:11:43+00:00"
+        },
+        {
+            "name": "phpseclib/phpseclib",
+            "version": "2.0.27",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpseclib/phpseclib.git",
+                "reference": "34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc",
+                "reference": "34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "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": {
+                "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
+                "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
+                "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
+                "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations."
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "phpseclib/bootstrap.php"
+                ],
+                "psr-4": {
+                    "phpseclib\\": "phpseclib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jim Wigginton",
+                    "email": "terrafrost@php.net",
+                    "role": "Lead Developer"
+                },
+                {
+                    "name": "Patrick Monnerat",
+                    "email": "pm@datasphere.ch",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Andreas Fischer",
+                    "email": "bantu@phpbb.com",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Hans-Jürgen Petrich",
+                    "email": "petrich@tronic-media.com",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Graham Campbell",
+                    "email": "graham@alt-three.com",
+                    "role": "Developer"
+                }
+            ],
+            "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.",
+            "homepage": "http://phpseclib.sourceforge.net",
+            "keywords": [
+                "BigInteger",
+                "aes",
+                "asn.1",
+                "asn1",
+                "blowfish",
+                "crypto",
+                "cryptography",
+                "encryption",
+                "rsa",
+                "security",
+                "sftp",
+                "signature",
+                "signing",
+                "ssh",
+                "twofish",
+                "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"
+        },
+        {
+            "name": "psr/container",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/container.git",
+                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Container\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common Container Interface (PHP FIG PSR-11)",
+            "homepage": "https://github.com/php-fig/container",
+            "keywords": [
+                "PSR-11",
+                "container",
+                "container-interface",
+                "container-interop",
+                "psr"
+            ],
+            "time": "2017-02-14T16:28:37+00:00"
+        },
+        {
+            "name": "psr/http-message",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-message.git",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP messages",
+            "homepage": "https://github.com/php-fig/http-message",
+            "keywords": [
+                "http",
+                "http-message",
+                "psr",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "time": "2016-08-06T14:39:51+00:00"
+        },
+        {
+            "name": "psr/log",
+            "version": "1.1.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
+                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Log\\": "Psr/Log/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for logging libraries",
+            "homepage": "https://github.com/php-fig/log",
+            "keywords": [
+                "log",
+                "psr",
+                "psr-3"
+            ],
+            "time": "2020-03-23T09:12:05+00:00"
+        },
+        {
+            "name": "ralouphie/getallheaders",
+            "version": "3.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ralouphie/getallheaders.git",
+                "reference": "120b605dfeb996808c31b6477290a714d356e822"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
+                "reference": "120b605dfeb996808c31b6477290a714d356e822",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "require-dev": {
+                "php-coveralls/php-coveralls": "^2.1",
+                "phpunit/phpunit": "^5 || ^6.5"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/getallheaders.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ralph Khattar",
+                    "email": "ralph.khattar@gmail.com"
+                }
+            ],
+            "description": "A polyfill for getallheaders.",
+            "time": "2019-03-08T08:55:37+00:00"
+        },
+        {
+            "name": "ramsey/uuid",
+            "version": "3.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ramsey/uuid.git",
+                "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/d09ea80159c1929d75b3f9c60504d613aeb4a1e3",
+                "reference": "d09ea80159c1929d75b3f9c60504d613aeb4a1e3",
+                "shasum": ""
+            },
+            "require": {
+                "paragonie/random_compat": "^1.0|^2.0|9.99.99",
+                "php": "^5.4 || ^7.0",
+                "symfony/polyfill-ctype": "^1.8"
+            },
+            "replace": {
+                "rhumsaa/uuid": "self.version"
+            },
+            "require-dev": {
+                "codeception/aspect-mock": "^1.0 | ~2.0.0",
+                "doctrine/annotations": "~1.2.0",
+                "goaop/framework": "1.0.0-alpha.2 | ^1.0 | ~2.1.0",
+                "ircmaxell/random-lib": "^1.1",
+                "jakub-onderka/php-parallel-lint": "^0.9.0",
+                "mockery/mockery": "^0.9.9",
+                "moontoast/math": "^1.1",
+                "php-mock/php-mock-phpunit": "^0.3|^1.1",
+                "phpunit/phpunit": "^4.7|^5.0|^6.5",
+                "squizlabs/php_codesniffer": "^2.3"
+            },
+            "suggest": {
+                "ext-ctype": "Provides support for PHP Ctype functions",
+                "ext-libsodium": "Provides the PECL libsodium extension for use with the SodiumRandomGenerator",
+                "ext-uuid": "Provides the PECL UUID extension for use with the PeclUuidTimeGenerator and PeclUuidRandomGenerator",
+                "ircmaxell/random-lib": "Provides RandomLib for use with the RandomLibAdapter",
+                "moontoast/math": "Provides support for converting UUID to 128-bit integer (in string form).",
+                "ramsey/uuid-console": "A console application for generating UUIDs with ramsey/uuid",
+                "ramsey/uuid-doctrine": "Allows the use of Ramsey\\Uuid\\Uuid as Doctrine field type."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Ramsey\\Uuid\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ben Ramsey",
+                    "email": "ben@benramsey.com",
+                    "homepage": "https://benramsey.com"
+                },
+                {
+                    "name": "Marijn Huizendveld",
+                    "email": "marijn.huizendveld@gmail.com"
+                },
+                {
+                    "name": "Thibaud Fabre",
+                    "email": "thibaud@aztech.io"
+                }
+            ],
+            "description": "Formerly rhumsaa/uuid. A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).",
+            "homepage": "https://github.com/ramsey/uuid",
+            "keywords": [
+                "guid",
+                "identifier",
+                "uuid"
+            ],
+            "time": "2018-07-19T23:38:55+00:00"
+        },
+        {
+            "name": "react/promise",
+            "version": "v2.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/promise.git",
+                "reference": "f3cff96a19736714524ca0dd1d4130de73dbbbc4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/promise/zipball/f3cff96a19736714524ca0dd1d4130de73dbbbc4",
+                "reference": "f3cff96a19736714524ca0dd1d4130de73dbbbc4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^7.0 || ^6.5 || ^5.7 || ^4.8.36"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\Promise\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com"
+                }
+            ],
+            "description": "A lightweight implementation of CommonJS Promises/A for PHP",
+            "keywords": [
+                "promise",
+                "promises"
+            ],
+            "time": "2020-05-12T15:16:56+00:00"
+        },
+        {
+            "name": "seld/jsonlint",
+            "version": "1.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Seldaek/jsonlint.git",
+                "reference": "ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1",
+                "reference": "ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3 || ^7.0 || ^8.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+            },
+            "bin": [
+                "bin/jsonlint"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Seld\\JsonLint\\": "src/Seld/JsonLint/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "JSON Linter",
+            "keywords": [
+                "json",
+                "linter",
+                "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"
+        },
+        {
+            "name": "seld/phar-utils",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Seldaek/phar-utils.git",
+                "reference": "8800503d56b9867d43d9c303b9cbcc26016e82f0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/8800503d56b9867d43d9c303b9cbcc26016e82f0",
+                "reference": "8800503d56b9867d43d9c303b9cbcc26016e82f0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Seld\\PharUtils\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be"
+                }
+            ],
+            "description": "PHAR file format utilities, for when PHP phars you up",
+            "keywords": [
+                "phar"
+            ],
+            "time": "2020-02-14T15:25:33+00:00"
+        },
+        {
+            "name": "symfony/console",
+            "version": "v4.4.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/console.git",
+                "reference": "10bb3ee3c97308869d53b3e3d03f6ac23ff985f7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/console/zipball/10bb3ee3c97308869d53b3e3d03f6ac23ff985f7",
+                "reference": "10bb3ee3c97308869d53b3e3d03f6ac23ff985f7",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1.3",
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/polyfill-php73": "^1.8",
+                "symfony/service-contracts": "^1.1|^2"
+            },
+            "conflict": {
+                "symfony/dependency-injection": "<3.4",
+                "symfony/event-dispatcher": "<4.3|>=5",
+                "symfony/lock": "<4.4",
+                "symfony/process": "<3.3"
+            },
+            "provide": {
+                "psr/log-implementation": "1.0"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/config": "^3.4|^4.0|^5.0",
+                "symfony/dependency-injection": "^3.4|^4.0|^5.0",
+                "symfony/event-dispatcher": "^4.3",
+                "symfony/lock": "^4.4|^5.0",
+                "symfony/process": "^3.4|^4.0|^5.0",
+                "symfony/var-dumper": "^4.3|^5.0"
+            },
+            "suggest": {
+                "psr/log": "For using the console logger",
+                "symfony/event-dispatcher": "",
+                "symfony/lock": "",
+                "symfony/process": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Console\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "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-03-30T11:41:10+00:00"
+        },
+        {
+            "name": "symfony/css-selector",
+            "version": "v5.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/css-selector.git",
+                "reference": "5f8d5271303dad260692ba73dfa21777d38e124e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/5f8d5271303dad260692ba73dfa21777d38e124e",
+                "reference": "5f8d5271303dad260692ba73dfa21777d38e124e",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\CssSelector\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Jean-François Simon",
+                    "email": "jeanfrancois.simon@sensiolabs.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "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-03-27T16:56:45+00:00"
+        },
+        {
+            "name": "symfony/event-dispatcher",
+            "version": "v4.4.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/event-dispatcher.git",
+                "reference": "abc8e3618bfdb55e44c8c6a00abd333f831bbfed"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/abc8e3618bfdb55e44c8c6a00abd333f831bbfed",
+                "reference": "abc8e3618bfdb55e44c8c6a00abd333f831bbfed",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1.3",
+                "symfony/event-dispatcher-contracts": "^1.1"
+            },
+            "conflict": {
+                "symfony/dependency-injection": "<3.4"
+            },
+            "provide": {
+                "psr/event-dispatcher-implementation": "1.0",
+                "symfony/event-dispatcher-implementation": "1.1"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/config": "^3.4|^4.0|^5.0",
+                "symfony/dependency-injection": "^3.4|^4.0|^5.0",
+                "symfony/expression-language": "^3.4|^4.0|^5.0",
+                "symfony/http-foundation": "^3.4|^4.0|^5.0",
+                "symfony/service-contracts": "^1.1|^2",
+                "symfony/stopwatch": "^3.4|^4.0|^5.0"
+            },
+            "suggest": {
+                "symfony/dependency-injection": "",
+                "symfony/http-kernel": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\EventDispatcher\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "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-03-27T16:54:36+00:00"
+        },
+        {
+            "name": "symfony/event-dispatcher-contracts",
+            "version": "v1.1.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/event-dispatcher-contracts.git",
+                "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c43ab685673fb6c8d84220c77897b1d6cdbe1d18",
+                "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1.3"
+            },
+            "suggest": {
+                "psr/event-dispatcher": "",
+                "symfony/event-dispatcher-implementation": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\EventDispatcher\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Generic abstractions related to dispatching event",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "time": "2019-09-17T09:54:03+00:00"
+        },
+        {
+            "name": "symfony/filesystem",
+            "version": "v5.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/filesystem.git",
+                "reference": "7cd0dafc4353a0f62e307df90b48466379c8cc91"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/7cd0dafc4353a0f62e307df90b48466379c8cc91",
+                "reference": "7cd0dafc4353a0f62e307df90b48466379c8cc91",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2.5",
+                "symfony/polyfill-ctype": "~1.8"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Filesystem\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "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-04-12T14:40:17+00:00"
+        },
+        {
+            "name": "symfony/finder",
+            "version": "v5.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/finder.git",
+                "reference": "600a52c29afc0d1caa74acbec8d3095ca7e9910d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/600a52c29afc0d1caa74acbec8d3095ca7e9910d",
+                "reference": "600a52c29afc0d1caa74acbec8d3095ca7e9910d",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Finder\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "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-03-27T16:56:45+00:00"
+        },
+        {
+            "name": "symfony/polyfill-ctype",
+            "version": "v1.17.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-ctype.git",
+                "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
+                "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-ctype": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.17-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Gert de Pagter",
+                    "email": "BackEndTea@gmail.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for ctype functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "ctype",
+                "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-05-12T16:14:59+00:00"
+        },
+        {
+            "name": "symfony/polyfill-intl-idn",
+            "version": "v1.17.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-idn.git",
+                "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3bff59ea7047e925be6b7f2059d60af31bb46d6a",
+                "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "symfony/polyfill-mbstring": "^1.3",
+                "symfony/polyfill-php72": "^1.10"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.17-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Idn\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Laurent Bassin",
+                    "email": "laurent@bassin.info"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "idn",
+                "intl",
+                "polyfill",
+                "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"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.17.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "fa79b11539418b02fc5e1897267673ba2c19419c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fa79b11539418b02fc5e1897267673ba2c19419c",
+                "reference": "fa79b11539418b02fc5e1897267673ba2c19419c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.17-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "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"
+        },
+        {
+            "name": "symfony/polyfill-php72",
+            "version": "v1.17.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php72.git",
+                "reference": "f048e612a3905f34931127360bdd2def19a5e582"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/f048e612a3905f34931127360bdd2def19a5e582",
+                "reference": "f048e612a3905f34931127360bdd2def19a5e582",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.17-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php72\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "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"
+        },
+        {
+            "name": "symfony/polyfill-php73",
+            "version": "v1.17.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php73.git",
+                "reference": "a760d8964ff79ab9bf057613a5808284ec852ccc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a760d8964ff79ab9bf057613a5808284ec852ccc",
+                "reference": "a760d8964ff79ab9bf057613a5808284ec852ccc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.17-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php73\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ],
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "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"
+        },
+        {
+            "name": "symfony/process",
+            "version": "v4.4.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/process.git",
+                "reference": "4b6a9a4013baa65d409153cbb5a895bf093dc7f4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/process/zipball/4b6a9a4013baa65d409153cbb5a895bf093dc7f4",
+                "reference": "4b6a9a4013baa65d409153cbb5a895bf093dc7f4",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Process\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "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-04-15T15:56:18+00:00"
+        },
+        {
+            "name": "symfony/service-contracts",
+            "version": "v2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/service-contracts.git",
+                "reference": "144c5e51266b281231e947b51223ba14acf1a749"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/144c5e51266b281231e947b51223ba14acf1a749",
+                "reference": "144c5e51266b281231e947b51223ba14acf1a749",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2.5",
+                "psr/container": "^1.0"
+            },
+            "suggest": {
+                "symfony/service-implementation": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\Service\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Generic abstractions related to writing services",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "time": "2019-11-18T17:27:11+00:00"
+        },
+        {
+            "name": "tedivm/jshrink",
+            "version": "v1.3.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/tedious/JShrink.git",
+                "reference": "566e0c731ba4e372be2de429ef7d54f4faf4477a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/tedious/JShrink/zipball/566e0c731ba4e372be2de429ef7d54f4faf4477a",
+                "reference": "566e0c731ba4e372be2de429ef7d54f4faf4477a",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6|^7.0"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^2.8",
+                "php-coveralls/php-coveralls": "^1.1.0",
+                "phpunit/phpunit": "^6"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "JShrink": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Robert Hafner",
+                    "email": "tedivm@tedivm.com"
+                }
+            ],
+            "description": "Javascript Minifier built in PHP",
+            "homepage": "http://github.com/tedious/JShrink",
+            "keywords": [
+                "javascript",
+                "minifier"
+            ],
+            "time": "2019-06-28T18:11:46+00:00"
+        },
+        {
+            "name": "true/punycode",
+            "version": "v2.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/true/php-punycode.git",
+                "reference": "a4d0c11a36dd7f4e7cd7096076cab6d3378a071e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/true/php-punycode/zipball/a4d0c11a36dd7f4e7cd7096076cab6d3378a071e",
+                "reference": "a4d0c11a36dd7f4e7cd7096076cab6d3378a071e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0",
+                "symfony/polyfill-mbstring": "^1.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.7",
+                "squizlabs/php_codesniffer": "~2.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "TrueBV\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Renan Gonçalves",
+                    "email": "renan.saddam@gmail.com"
+                }
+            ],
+            "description": "A Bootstring encoding of Unicode for Internationalized Domain Names in Applications (IDNA)",
+            "homepage": "https://github.com/true/php-punycode",
+            "keywords": [
+                "idna",
+                "punycode"
+            ],
+            "time": "2016-11-16T10:37:54+00:00"
+        },
+        {
+            "name": "tubalmartin/cssmin",
+            "version": "v4.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port.git",
+                "reference": "3cbf557f4079d83a06f9c3ff9b957c022d7805cf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/tubalmartin/YUI-CSS-compressor-PHP-port/zipball/3cbf557f4079d83a06f9c3ff9b957c022d7805cf",
+                "reference": "3cbf557f4079d83a06f9c3ff9b957c022d7805cf",
+                "shasum": ""
+            },
+            "require": {
+                "ext-pcre": "*",
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "cogpowered/finediff": "0.3.*",
+                "phpunit/phpunit": "4.8.*"
+            },
+            "bin": [
+                "cssmin"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "tubalmartin\\CssMin\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Túbal Martín",
+                    "homepage": "http://tubalmartin.me/"
+                }
+            ],
+            "description": "A PHP port of the YUI CSS compressor",
+            "homepage": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port",
+            "keywords": [
+                "compress",
+                "compressor",
+                "css",
+                "cssmin",
+                "minify",
+                "yui"
+            ],
+            "time": "2018-01-15T15:26:51+00:00"
+        },
+        {
+            "name": "webonyx/graphql-php",
+            "version": "v0.13.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webonyx/graphql-php.git",
+                "reference": "6829ae58f4c59121df1f86915fb9917a2ec595e8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/6829ae58f4c59121df1f86915fb9917a2ec595e8",
+                "reference": "6829ae58f4c59121df1f86915fb9917a2ec595e8",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "php": "^7.1||^8.0"
+            },
+            "require-dev": {
+                "doctrine/coding-standard": "^6.0",
+                "phpbench/phpbench": "^0.14.0",
+                "phpstan/phpstan": "^0.11.4",
+                "phpstan/phpstan-phpunit": "^0.11.0",
+                "phpstan/phpstan-strict-rules": "^0.11.0",
+                "phpunit/phpcov": "^5.0",
+                "phpunit/phpunit": "^7.2",
+                "psr/http-message": "^1.0",
+                "react/promise": "2.*"
+            },
+            "suggest": {
+                "psr/http-message": "To use standard GraphQL server",
+                "react/promise": "To leverage async resolving on React PHP platform"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "GraphQL\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "A PHP port of GraphQL reference implementation",
+            "homepage": "https://github.com/webonyx/graphql-php",
+            "keywords": [
+                "api",
+                "graphql"
+            ],
+            "time": "2019-08-25T10:32:47+00:00"
+        },
+        {
+            "name": "wikimedia/less.php",
+            "version": "1.8.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/wikimedia/less.php.git",
+                "reference": "e238ad228d74b6ffd38209c799b34e9826909266"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/wikimedia/less.php/zipball/e238ad228d74b6ffd38209c799b34e9826909266",
+                "reference": "e238ad228d74b6ffd38209c799b34e9826909266",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.9"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "7.5.14"
+            },
+            "bin": [
+                "bin/lessc"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Less": "lib/"
+                },
+                "classmap": [
+                    "lessc.inc.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Josh Schmidt",
+                    "homepage": "https://github.com/oyejorge"
+                },
+                {
+                    "name": "Matt Agar",
+                    "homepage": "https://github.com/agar"
+                },
+                {
+                    "name": "Martin Jantošovič",
+                    "homepage": "https://github.com/Mordred"
+                }
+            ],
+            "description": "PHP port of the Javascript version of LESS http://lesscss.org (Originally maintained by Josh Schmidt)",
+            "keywords": [
+                "css",
+                "less",
+                "less.js",
+                "lesscss",
+                "php",
+                "stylesheet"
+            ],
+            "time": "2019-11-06T18:30:11+00:00"
+        }
+    ],
+    "packages-dev": [
+        {
+            "name": "allure-framework/allure-codeception",
+            "version": "1.4.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/allure-framework/allure-codeception.git",
+                "reference": "9e0e25f8960fa5ac17c65c932ea8153ce6700713"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/allure-framework/allure-codeception/zipball/9e0e25f8960fa5ac17c65c932ea8153ce6700713",
+                "reference": "9e0e25f8960fa5ac17c65c932ea8153ce6700713",
+                "shasum": ""
+            },
+            "require": {
+                "allure-framework/allure-php-api": "~1.1.8",
+                "codeception/codeception": "^2.3|^3.0|^4.0",
+                "php": ">=5.6",
+                "symfony/filesystem": ">=2.6",
+                "symfony/finder": ">=2.6"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Yandex": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Ivan Krutov",
+                    "email": "vania-pooh@yandex-team.ru",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A Codeception adapter for Allure report.",
+            "homepage": "http://allure.qatools.ru/",
+            "keywords": [
+                "allure",
+                "attachments",
+                "cases",
+                "codeception",
+                "report",
+                "steps",
+                "testing"
+            ],
+            "time": "2020-03-13T11:07:13+00:00"
+        },
+        {
+            "name": "allure-framework/allure-php-api",
+            "version": "1.1.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/allure-framework/allure-php-commons.git",
+                "reference": "5ae2deac1c7e1b992cfa572167370de45bdd346d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/allure-framework/allure-php-commons/zipball/5ae2deac1c7e1b992cfa572167370de45bdd346d",
+                "reference": "5ae2deac1c7e1b992cfa572167370de45bdd346d",
+                "shasum": ""
+            },
+            "require": {
+                "jms/serializer": "^0.16 || ^1.0",
+                "php": ">=5.4.0",
+                "ramsey/uuid": "^3.0",
+                "symfony/http-foundation": "^2.0 || ^3.0 || ^4.0 || ^5.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Yandex": [
+                        "src/",
+                        "test/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Ivan Krutov",
+                    "email": "vania-pooh@yandex-team.ru",
+                    "role": "Developer"
+                }
+            ],
+            "description": "PHP API for Allure adapter",
+            "homepage": "http://allure.qatools.ru/",
+            "keywords": [
+                "allure",
+                "api",
+                "php",
+                "report"
+            ],
+            "time": "2020-03-13T10:47:35+00:00"
+        },
+        {
+            "name": "allure-framework/allure-phpunit",
+            "version": "1.2.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/allure-framework/allure-phpunit.git",
+                "reference": "9399629c6eed79da4be18fd22adf83ef36c2d2e0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/allure-framework/allure-phpunit/zipball/9399629c6eed79da4be18fd22adf83ef36c2d2e0",
+                "reference": "9399629c6eed79da4be18fd22adf83ef36c2d2e0",
+                "shasum": ""
+            },
+            "require": {
+                "allure-framework/allure-php-api": "~1.1.0",
+                "mikey179/vfsstream": "1.*",
+                "php": ">=7.1.0",
+                "phpunit/phpunit": ">=7.0.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Yandex": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Ivan Krutov",
+                    "email": "vania-pooh@yandex-team.ru",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A PHPUnit adapter for Allure report.",
+            "homepage": "http://allure.qatools.ru/",
+            "keywords": [
+                "allure",
+                "attachments",
+                "cases",
+                "phpunit",
+                "report",
+                "steps",
+                "testing"
+            ],
+            "time": "2018-10-25T12:03:54+00:00"
+        },
+        {
+            "name": "aws/aws-sdk-php",
+            "version": "3.138.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/aws/aws-sdk-php.git",
+                "reference": "6b9f3fcea4dfa6092c628c790ca6d369a75453b7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/6b9f3fcea4dfa6092c628c790ca6d369a75453b7",
+                "reference": "6b9f3fcea4dfa6092c628c790ca6d369a75453b7",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "ext-pcre": "*",
+                "ext-simplexml": "*",
+                "guzzlehttp/guzzle": "^5.3.3|^6.2.1|^7.0",
+                "guzzlehttp/promises": "^1.0",
+                "guzzlehttp/psr7": "^1.4.1",
+                "mtdowling/jmespath.php": "^2.5",
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "andrewsville/php-token-reflection": "^1.4",
+                "aws/aws-php-sns-message-validator": "~1.0",
+                "behat/behat": "~3.0",
+                "doctrine/cache": "~1.4",
+                "ext-dom": "*",
+                "ext-openssl": "*",
+                "ext-pcntl": "*",
+                "ext-sockets": "*",
+                "nette/neon": "^2.3",
+                "phpunit/phpunit": "^4.8.35|^5.4.3",
+                "psr/cache": "^1.0",
+                "psr/simple-cache": "^1.0",
+                "sebastian/comparator": "^1.2.3"
+            },
+            "suggest": {
+                "aws/aws-php-sns-message-validator": "To validate incoming SNS notifications",
+                "doctrine/cache": "To use the DoctrineCacheAdapter",
+                "ext-curl": "To send requests using cURL",
+                "ext-openssl": "Allows working with CloudFront private distributions and verifying received SNS messages",
+                "ext-sockets": "To use client-side monitoring"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Aws\\": "src/"
+                },
+                "files": [
+                    "src/functions.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Amazon Web Services",
+                    "homepage": "http://aws.amazon.com"
+                }
+            ],
+            "description": "AWS SDK for PHP - Use Amazon Web Services in your PHP project",
+            "homepage": "http://aws.amazon.com/sdkforphp",
+            "keywords": [
+                "amazon",
+                "aws",
+                "cloud",
+                "dynamodb",
+                "ec2",
+                "glacier",
+                "s3",
+                "sdk"
+            ],
+            "time": "2020-05-22T18:11:09+00:00"
+        },
+        {
+            "name": "beberlei/assert",
+            "version": "v3.2.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/beberlei/assert.git",
+                "reference": "d63a6943fc4fd1a2aedb65994e3548715105abcf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/beberlei/assert/zipball/d63a6943fc4fd1a2aedb65994e3548715105abcf",
+                "reference": "d63a6943fc4fd1a2aedb65994e3548715105abcf",
+                "shasum": ""
+            },
+            "require": {
+                "ext-ctype": "*",
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "ext-simplexml": "*",
+                "php": "^7"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "*",
+                "phpstan/phpstan-shim": "*",
+                "phpunit/phpunit": ">=6.0.0 <8"
+            },
+            "suggest": {
+                "ext-intl": "Needed to allow Assertion::count(), Assertion::isCountable(), Assertion::minCount(), and Assertion::maxCount() to operate on ResourceBundles"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Assert\\": "lib/Assert"
+                },
+                "files": [
+                    "lib/Assert/functions.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-2-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de",
+                    "role": "Lead Developer"
+                },
+                {
+                    "name": "Richard Quadling",
+                    "email": "rquadling@gmail.com",
+                    "role": "Collaborator"
+                }
+            ],
+            "description": "Thin assertion library for input validation in business models.",
+            "keywords": [
+                "assert",
+                "assertion",
+                "validation"
+            ],
+            "time": "2019-12-19T17:51:41+00:00"
+        },
+        {
+            "name": "behat/gherkin",
+            "version": "v4.6.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Behat/Gherkin.git",
+                "reference": "51ac4500c4dc30cbaaabcd2f25694299df666a31"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/51ac4500c4dc30cbaaabcd2f25694299df666a31",
+                "reference": "51ac4500c4dc30cbaaabcd2f25694299df666a31",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.5|~5",
+                "symfony/phpunit-bridge": "~2.7|~3|~4",
+                "symfony/yaml": "~2.3|~3|~4"
+            },
+            "suggest": {
+                "symfony/yaml": "If you want to parse features, represented in YAML files"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Behat\\Gherkin": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                }
+            ],
+            "description": "Gherkin DSL parser for PHP 5.3",
+            "homepage": "http://behat.org/",
+            "keywords": [
+                "BDD",
+                "Behat",
+                "Cucumber",
+                "DSL",
+                "gherkin",
+                "parser"
+            ],
+            "time": "2020-03-17T14:03:26+00:00"
+        },
+        {
+            "name": "cache/cache",
+            "version": "0.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-cache/cache.git",
+                "reference": "902b2e5b54ea57e3a801437748652228c4c58604"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-cache/cache/zipball/902b2e5b54ea57e3a801437748652228c4c58604",
+                "reference": "902b2e5b54ea57e3a801437748652228c4c58604",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/cache": "^1.3",
+                "league/flysystem": "^1.0",
+                "php": "^5.6 || ^7.0",
+                "psr/cache": "^1.0",
+                "psr/log": "^1.0",
+                "psr/simple-cache": "^1.0"
+            },
+            "conflict": {
+                "cache/adapter-common": "*",
+                "cache/apc-adapter": "*",
+                "cache/apcu-adapter": "*",
+                "cache/array-adapter": "*",
+                "cache/chain-adapter": "*",
+                "cache/doctrine-adapter": "*",
+                "cache/filesystem-adapter": "*",
+                "cache/hierarchical-cache": "*",
+                "cache/illuminate-adapter": "*",
+                "cache/memcache-adapter": "*",
+                "cache/memcached-adapter": "*",
+                "cache/mongodb-adapter": "*",
+                "cache/predis-adapter": "*",
+                "cache/psr-6-doctrine-bridge": "*",
+                "cache/redis-adapter": "*",
+                "cache/session-handler": "*",
+                "cache/taggable-cache": "*",
+                "cache/void-adapter": "*"
+            },
+            "require-dev": {
+                "cache/integration-tests": "^0.16",
+                "defuse/php-encryption": "^2.0",
+                "illuminate/cache": "^5.4",
+                "mockery/mockery": "^0.9",
+                "phpunit/phpunit": "^4.0 || ^5.1",
+                "predis/predis": "^1.0",
+                "symfony/cache": "dev-master"
+            },
+            "suggest": {
+                "ext-apc": "APC extension is required to use the APC Adapter",
+                "ext-apcu": "APCu extension is required to use the APCu Adapter",
+                "ext-memcache": "Memcache extension is required to use the Memcache Adapter",
+                "ext-memcached": "Memcached extension is required to use the Memcached Adapter",
+                "ext-mongodb": "Mongodb extension required to use the Mongodb adapter",
+                "ext-redis": "Redis extension is required to use the Redis adapter",
+                "mongodb/mongodb": "Mongodb lib required to use the Mongodb adapter"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Cache\\": "src/"
+                },
+                "exclude-from-classmap": [
+                    "**/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Aaron Scherer",
+                    "email": "aequasi@gmail.com",
+                    "homepage": "https://github.com/aequasi"
+                },
+                {
+                    "name": "Tobias Nyholm",
+                    "email": "tobias.nyholm@gmail.com",
+                    "homepage": "https://github.com/Nyholm"
+                }
+            ],
+            "description": "Library of all the php-cache adapters",
+            "homepage": "http://www.php-cache.com/en/latest/",
+            "keywords": [
+                "cache",
+                "psr6"
+            ],
+            "time": "2017-03-28T16:08:48+00:00"
+        },
+        {
+            "name": "codeception/codeception",
+            "version": "4.1.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Codeception/Codeception.git",
+                "reference": "55d8d1d882fa0777e47de17b04c29b3c50fe29e7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/55d8d1d882fa0777e47de17b04c29b3c50fe29e7",
+                "reference": "55d8d1d882fa0777e47de17b04c29b3c50fe29e7",
+                "shasum": ""
+            },
+            "require": {
+                "behat/gherkin": "^4.4.0",
+                "codeception/lib-asserts": "^1.0",
+                "codeception/phpunit-wrapper": ">6.0.15 <6.1.0 | ^6.6.1 | ^7.7.1 | ^8.1.1 | ^9.0",
+                "codeception/stub": "^2.0 | ^3.0",
+                "ext-curl": "*",
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "guzzlehttp/psr7": "~1.4",
+                "php": ">=5.6.0 <8.0",
+                "symfony/console": ">=2.7 <6.0",
+                "symfony/css-selector": ">=2.7 <6.0",
+                "symfony/event-dispatcher": ">=2.7 <6.0",
+                "symfony/finder": ">=2.7 <6.0",
+                "symfony/yaml": ">=2.7 <6.0"
+            },
+            "require-dev": {
+                "codeception/module-asserts": "*@dev",
+                "codeception/module-cli": "*@dev",
+                "codeception/module-db": "*@dev",
+                "codeception/module-filesystem": "*@dev",
+                "codeception/module-phpbrowser": "*@dev",
+                "codeception/specify": "~0.3",
+                "codeception/util-universalframework": "*@dev",
+                "monolog/monolog": "~1.8",
+                "squizlabs/php_codesniffer": "~2.0",
+                "symfony/process": ">=2.7 <6.0",
+                "vlucas/phpdotenv": "^2.0 | ^3.0 | ^4.0"
+            },
+            "suggest": {
+                "codeception/specify": "BDD-style code blocks",
+                "codeception/verify": "BDD-style assertions",
+                "hoa/console": "For interactive console functionality",
+                "stecman/symfony-console-completion": "For BASH autocompletion",
+                "symfony/phpunit-bridge": "For phpunit-bridge support"
+            },
+            "bin": [
+                "codecept"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": []
+            },
+            "autoload": {
+                "psr-4": {
+                    "Codeception\\": "src/Codeception",
+                    "Codeception\\Extension\\": "ext"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Bodnarchuk",
+                    "email": "davert@mail.ua",
+                    "homepage": "http://codegyre.com"
+                }
+            ],
+            "description": "BDD-style testing framework",
+            "homepage": "http://codeception.com/",
+            "keywords": [
+                "BDD",
+                "TDD",
+                "acceptance testing",
+                "functional testing",
+                "unit testing"
+            ],
+            "funding": [
+                {
+                    "url": "https://opencollective.com/codeception",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2020-03-23T17:07:20+00:00"
+        },
+        {
+            "name": "codeception/lib-asserts",
+            "version": "1.12.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Codeception/lib-asserts.git",
+                "reference": "acd0dc8b394595a74b58dcc889f72569ff7d8e71"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Codeception/lib-asserts/zipball/acd0dc8b394595a74b58dcc889f72569ff7d8e71",
+                "reference": "acd0dc8b394595a74b58dcc889f72569ff7d8e71",
+                "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"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Bodnarchuk",
+                    "email": "davert@mail.ua",
+                    "homepage": "http://codegyre.com"
+                },
+                {
+                    "name": "Gintautas Miselis"
+                }
+            ],
+            "description": "Assertion methods used by Codeception core and Asserts module",
+            "homepage": "http://codeception.com/",
+            "keywords": [
+                "codeception"
+            ],
+            "time": "2020-04-17T18:20:46+00:00"
+        },
+        {
+            "name": "codeception/module-asserts",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Codeception/module-asserts.git",
+                "reference": "79f13d05b63f2fceba4d0e78044bab668c9b2a6b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Codeception/module-asserts/zipball/79f13d05b63f2fceba4d0e78044bab668c9b2a6b",
+                "reference": "79f13d05b63f2fceba4d0e78044bab668c9b2a6b",
+                "shasum": ""
+            },
+            "require": {
+                "codeception/codeception": "*@dev",
+                "codeception/lib-asserts": "^1.12.0",
+                "php": ">=5.6.0 <8.0"
+            },
+            "conflict": {
+                "codeception/codeception": "<4.0"
+            },
+            "require-dev": {
+                "codeception/util-robohelpers": "dev-master"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Bodnarchuk"
+                },
+                {
+                    "name": "Gintautas Miselis"
+                }
+            ],
+            "description": "Codeception module containing various assertions",
+            "homepage": "http://codeception.com/",
+            "keywords": [
+                "assertions",
+                "asserts",
+                "codeception"
+            ],
+            "time": "2020-04-20T07:26:11+00:00"
+        },
+        {
+            "name": "codeception/module-sequence",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Codeception/module-sequence.git",
+                "reference": "70563527b768194d6ab22e1ff943a5e69741c5dd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Codeception/module-sequence/zipball/70563527b768194d6ab22e1ff943a5e69741c5dd",
+                "reference": "70563527b768194d6ab22e1ff943a5e69741c5dd",
+                "shasum": ""
+            },
+            "require": {
+                "codeception/codeception": "4.0.x-dev | ^4.0",
+                "php": ">=5.6.0 <8.0"
+            },
+            "require-dev": {
+                "codeception/util-robohelpers": "dev-master"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Bodnarchuk"
+                }
+            ],
+            "description": "Sequence module for Codeception",
+            "homepage": "http://codeception.com/",
+            "keywords": [
+                "codeception"
+            ],
+            "time": "2019-10-10T12:08:50+00:00"
+        },
+        {
+            "name": "codeception/module-webdriver",
+            "version": "1.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Codeception/module-webdriver.git",
+                "reference": "da55466876d9e73c09917f495b923395b1cdf92a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Codeception/module-webdriver/zipball/da55466876d9e73c09917f495b923395b1cdf92a",
+                "reference": "da55466876d9e73c09917f495b923395b1cdf92a",
+                "shasum": ""
+            },
+            "require": {
+                "codeception/codeception": "^4.0",
+                "php": ">=5.6.0 <8.0",
+                "php-webdriver/webdriver": "^1.6.0"
+            },
+            "require-dev": {
+                "codeception/util-robohelpers": "dev-master"
+            },
+            "suggest": {
+                "codeception/phpbuiltinserver": "Start and stop PHP built-in web server for your tests"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Bodnarchuk"
+                },
+                {
+                    "name": "Gintautas Miselis"
+                },
+                {
+                    "name": "Zaahid Bateson"
+                }
+            ],
+            "description": "WebDriver module for Codeception",
+            "homepage": "http://codeception.com/",
+            "keywords": [
+                "acceptance-testing",
+                "browser-testing",
+                "codeception"
+            ],
+            "time": "2020-04-29T13:45:52+00:00"
+        },
+        {
+            "name": "codeception/phpunit-wrapper",
+            "version": "9.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Codeception/phpunit-wrapper.git",
+                "reference": "eb27243d8edde68593bf8d9ef5e9074734777931"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/eb27243d8edde68593bf8d9ef5e9074734777931",
+                "reference": "eb27243d8edde68593bf8d9ef5e9074734777931",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2",
+                "phpunit/phpunit": "^9.0"
+            },
+            "require-dev": {
+                "codeception/specify": "*",
+                "vlucas/phpdotenv": "^3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Codeception\\PHPUnit\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Davert",
+                    "email": "davert.php@resend.cc"
+                },
+                {
+                    "name": "Naktibalda"
+                }
+            ],
+            "description": "PHPUnit classes used by Codeception",
+            "time": "2020-04-17T18:16:31+00:00"
+        },
+        {
+            "name": "codeception/stub",
+            "version": "3.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Codeception/Stub.git",
+                "reference": "a3ba01414cbee76a1bced9f9b6b169cc8d203880"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Codeception/Stub/zipball/a3ba01414cbee76a1bced9f9b6b169cc8d203880",
+                "reference": "a3ba01414cbee76a1bced9f9b6b169cc8d203880",
+                "shasum": ""
+            },
+            "require": {
+                "phpunit/phpunit": "^8.4 | ^9.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Codeception\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Flexible Stub wrapper for PHPUnit's Mock Builder",
+            "time": "2020-02-07T18:42:28+00:00"
+        },
+        {
+            "name": "csharpru/vault-php",
+            "version": "3.5.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/CSharpRU/vault-php.git",
+                "reference": "04be9776310fe7d1afb97795645f95c21e6b4fcf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/CSharpRU/vault-php/zipball/04be9776310fe7d1afb97795645f95c21e6b4fcf",
+                "reference": "04be9776310fe7d1afb97795645f95c21e6b4fcf",
+                "shasum": ""
+            },
+            "require": {
+                "cache/cache": "^0.4.0",
+                "doctrine/inflector": "~1.1.0",
+                "guzzlehttp/promises": "^1.3",
+                "guzzlehttp/psr7": "^1.4",
+                "psr/cache": "^1.0",
+                "psr/log": "^1.0",
+                "weew/helpers-array": "^1.3"
+            },
+            "require-dev": {
+                "codacy/coverage": "^1.1",
+                "codeception/codeception": "^2.2",
+                "csharpru/vault-php-guzzle6-transport": "~2.0",
+                "php-vcr/php-vcr": "^1.3"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Vault\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Yaroslav Lukyanov",
+                    "email": "c_sharp@mail.ru"
+                }
+            ],
+            "description": "Best Vault client for PHP that you can find",
+            "time": "2018-04-28T04:52:17+00:00"
+        },
+        {
+            "name": "csharpru/vault-php-guzzle6-transport",
+            "version": "2.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/CSharpRU/vault-php-guzzle6-transport.git",
+                "reference": "33c392120ac9f253b62b034e0e8ffbbdb3513bd8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/CSharpRU/vault-php-guzzle6-transport/zipball/33c392120ac9f253b62b034e0e8ffbbdb3513bd8",
+                "reference": "33c392120ac9f253b62b034e0e8ffbbdb3513bd8",
+                "shasum": ""
+            },
+            "require": {
+                "guzzlehttp/guzzle": "~6.2",
+                "guzzlehttp/promises": "^1.3",
+                "guzzlehttp/psr7": "^1.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "VaultTransports\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Yaroslav Lukyanov",
+                    "email": "c_sharp@mail.ru"
+                }
+            ],
+            "description": "Guzzle6 transport for Vault PHP client",
+            "time": "2019-03-10T06:17:37+00:00"
+        },
+        {
+            "name": "dealerdirect/phpcodesniffer-composer-installer",
+            "version": "v0.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Dealerdirect/phpcodesniffer-composer-installer.git",
+                "reference": "e749410375ff6fb7a040a68878c656c2e610b132"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/e749410375ff6fb7a040a68878c656c2e610b132",
+                "reference": "e749410375ff6fb7a040a68878c656c2e610b132",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^1.0",
+                "php": "^5.3|^7",
+                "squizlabs/php_codesniffer": "^2|^3"
+            },
+            "require-dev": {
+                "composer/composer": "*",
+                "phpcompatibility/php-compatibility": "^9.0",
+                "sensiolabs/security-checker": "^4.1.0"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "class": "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin"
+            },
+            "autoload": {
+                "psr-4": {
+                    "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Franck Nijhof",
+                    "email": "franck.nijhof@dealerdirect.com",
+                    "homepage": "http://www.frenck.nl",
+                    "role": "Developer / IT Manager"
+                }
+            ],
+            "description": "PHP_CodeSniffer Standards Composer Installer Plugin",
+            "homepage": "http://www.dealerdirect.com",
+            "keywords": [
+                "PHPCodeSniffer",
+                "PHP_CodeSniffer",
+                "code quality",
+                "codesniffer",
+                "composer",
+                "installer",
+                "phpcs",
+                "plugin",
+                "qa",
+                "quality",
+                "standard",
+                "standards",
+                "style guide",
+                "stylecheck",
+                "tests"
+            ],
+            "time": "2018-10-26T13:21:45+00:00"
+        },
+        {
+            "name": "doctrine/annotations",
+            "version": "1.10.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/annotations.git",
+                "reference": "b9d758e831c70751155c698c2f7df4665314a1cb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/b9d758e831c70751155c698c2f7df4665314a1cb",
+                "reference": "b9d758e831c70751155c698c2f7df4665314a1cb",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/lexer": "1.*",
+                "ext-tokenizer": "*",
+                "php": "^7.1"
+            },
+            "require-dev": {
+                "doctrine/cache": "1.*",
+                "phpunit/phpunit": "^7.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.9.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Jonathan Wage",
+                    "email": "jonwage@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "Docblock Annotations Parser",
+            "homepage": "http://www.doctrine-project.org",
+            "keywords": [
+                "annotations",
+                "docblock",
+                "parser"
+            ],
+            "time": "2020-04-20T09:18:32+00:00"
+        },
+        {
+            "name": "doctrine/cache",
+            "version": "1.10.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/cache.git",
+                "reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/cache/zipball/382e7f4db9a12dc6c19431743a2b096041bcdd62",
+                "reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62",
+                "shasum": ""
+            },
+            "require": {
+                "php": "~7.1"
+            },
+            "conflict": {
+                "doctrine/common": ">2.2,<2.4"
+            },
+            "require-dev": {
+                "alcaeus/mongo-php-adapter": "^1.1",
+                "doctrine/coding-standard": "^6.0",
+                "mongodb/mongodb": "^1.1",
+                "phpunit/phpunit": "^7.0",
+                "predis/predis": "~1.0"
+            },
+            "suggest": {
+                "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.9.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Jonathan Wage",
+                    "email": "jonwage@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "PHP Doctrine Cache library is a popular cache implementation that supports many different drivers such as redis, memcache, apc, mongodb and others.",
+            "homepage": "https://www.doctrine-project.org/projects/cache.html",
+            "keywords": [
+                "abstraction",
+                "apcu",
+                "cache",
+                "caching",
+                "couchdb",
+                "memcached",
+                "php",
+                "redis",
+                "xcache"
+            ],
+            "time": "2019-11-29T15:36:20+00:00"
+        },
+        {
+            "name": "doctrine/inflector",
+            "version": "v1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/inflector.git",
+                "reference": "90b2128806bfde671b6952ab8bea493942c1fdae"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/inflector/zipball/90b2128806bfde671b6952ab8bea493942c1fdae",
+                "reference": "90b2128806bfde671b6952ab8bea493942c1fdae",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Doctrine\\Common\\Inflector\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Jonathan Wage",
+                    "email": "jonwage@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "Common String Manipulations with regard to casing and singular/plural rules.",
+            "homepage": "http://www.doctrine-project.org",
+            "keywords": [
+                "inflection",
+                "pluralize",
+                "singularize",
+                "string"
+            ],
+            "time": "2015-11-06T14:35:42+00:00"
+        },
+        {
+            "name": "doctrine/instantiator",
+            "version": "1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "ae466f726242e637cebdd526a7d991b9433bacf1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/ae466f726242e637cebdd526a7d991b9433bacf1",
+                "reference": "ae466f726242e637cebdd526a7d991b9433bacf1",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1"
+            },
+            "require-dev": {
+                "doctrine/coding-standard": "^6.0",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpbench/phpbench": "^0.13",
+                "phpstan/phpstan-phpunit": "^0.11",
+                "phpstan/phpstan-shim": "^0.11",
+                "phpunit/phpunit": "^7.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2019-10-21T16:45:58+00:00"
+        },
+        {
+            "name": "doctrine/lexer",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/lexer.git",
+                "reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6",
+                "reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2"
+            },
+            "require-dev": {
+                "doctrine/coding-standard": "^6.0",
+                "phpstan/phpstan": "^0.11.8",
+                "phpunit/phpunit": "^8.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.",
+            "homepage": "https://www.doctrine-project.org/projects/lexer.html",
+            "keywords": [
+                "annotations",
+                "docblock",
+                "lexer",
+                "parser",
+                "php"
+            ],
+            "time": "2019-10-30T14:39:59+00:00"
+        },
+        {
+            "name": "friendsofphp/php-cs-fixer",
+            "version": "v2.16.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
+                "reference": "83baf823a33a1cbd5416c8626935cf3f843c10b0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/83baf823a33a1cbd5416c8626935cf3f843c10b0",
+                "reference": "83baf823a33a1cbd5416c8626935cf3f843c10b0",
+                "shasum": ""
+            },
+            "require": {
+                "composer/semver": "^1.4",
+                "composer/xdebug-handler": "^1.2",
+                "doctrine/annotations": "^1.2",
+                "ext-json": "*",
+                "ext-tokenizer": "*",
+                "php": "^5.6 || ^7.0",
+                "php-cs-fixer/diff": "^1.3",
+                "symfony/console": "^3.4.17 || ^4.1.6 || ^5.0",
+                "symfony/event-dispatcher": "^3.0 || ^4.0 || ^5.0",
+                "symfony/filesystem": "^3.0 || ^4.0 || ^5.0",
+                "symfony/finder": "^3.0 || ^4.0 || ^5.0",
+                "symfony/options-resolver": "^3.0 || ^4.0 || ^5.0",
+                "symfony/polyfill-php70": "^1.0",
+                "symfony/polyfill-php72": "^1.4",
+                "symfony/process": "^3.0 || ^4.0 || ^5.0",
+                "symfony/stopwatch": "^3.0 || ^4.0 || ^5.0"
+            },
+            "require-dev": {
+                "johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0",
+                "justinrainbow/json-schema": "^5.0",
+                "keradus/cli-executor": "^1.2",
+                "mikey179/vfsstream": "^1.6",
+                "php-coveralls/php-coveralls": "^2.1",
+                "php-cs-fixer/accessible-object": "^1.0",
+                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.1",
+                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.1",
+                "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.1",
+                "phpunitgoodpractices/traits": "^1.8",
+                "symfony/phpunit-bridge": "^4.3 || ^5.0",
+                "symfony/yaml": "^3.0 || ^4.0 || ^5.0"
+            },
+            "suggest": {
+                "ext-dom": "For handling output formats in XML",
+                "ext-mbstring": "For handling non-UTF8 characters in cache signature.",
+                "php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.",
+                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.",
+                "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible."
+            },
+            "bin": [
+                "php-cs-fixer"
+            ],
+            "type": "application",
+            "autoload": {
+                "psr-4": {
+                    "PhpCsFixer\\": "src/"
+                },
+                "classmap": [
+                    "tests/Test/AbstractFixerTestCase.php",
+                    "tests/Test/AbstractIntegrationCaseFactory.php",
+                    "tests/Test/AbstractIntegrationTestCase.php",
+                    "tests/Test/Assert/AssertTokensTrait.php",
+                    "tests/Test/IntegrationCase.php",
+                    "tests/Test/IntegrationCaseFactory.php",
+                    "tests/Test/IntegrationCaseFactoryInterface.php",
+                    "tests/Test/InternalIntegrationCaseFactory.php",
+                    "tests/Test/IsIdenticalConstraint.php",
+                    "tests/TestCase.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Dariusz Rumiński",
+                    "email": "dariusz.ruminski@gmail.com"
+                }
+            ],
+            "description": "A tool to automatically fix PHP code style",
+            "funding": [
+                {
+                    "url": "https://github.com/keradus",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-04-15T18:51:10+00:00"
+        },
+        {
+            "name": "jms/metadata",
+            "version": "1.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/schmittjoh/metadata.git",
+                "reference": "e5854ab1aa643623dc64adde718a8eec32b957a8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/e5854ab1aa643623dc64adde718a8eec32b957a8",
+                "reference": "e5854ab1aa643623dc64adde718a8eec32b957a8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "doctrine/cache": "~1.0",
+                "symfony/cache": "~3.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.5.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Metadata\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Asmir Mustafic",
+                    "email": "goetas@gmail.com"
+                },
+                {
+                    "name": "Johannes M. Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "Class/method/property metadata management in PHP",
+            "keywords": [
+                "annotations",
+                "metadata",
+                "xml",
+                "yaml"
+            ],
+            "time": "2018-10-26T12:40:10+00:00"
+        },
+        {
+            "name": "jms/parser-lib",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/schmittjoh/parser-lib.git",
+                "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/schmittjoh/parser-lib/zipball/c509473bc1b4866415627af0e1c6cc8ac97fa51d",
+                "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d",
+                "shasum": ""
+            },
+            "require": {
+                "phpoption/phpoption": ">=0.9,<2.0-dev"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "JMS\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache2"
+            ],
+            "description": "A library for easily creating recursive-descent parsers.",
+            "time": "2012-11-18T18:08:43+00:00"
+        },
+        {
+            "name": "jms/serializer",
+            "version": "1.14.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/schmittjoh/serializer.git",
+                "reference": "ba908d278fff27ec01fb4349f372634ffcd697c0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/ba908d278fff27ec01fb4349f372634ffcd697c0",
+                "reference": "ba908d278fff27ec01fb4349f372634ffcd697c0",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/annotations": "^1.0",
+                "doctrine/instantiator": "^1.0.3",
+                "jms/metadata": "^1.3",
+                "jms/parser-lib": "1.*",
+                "php": "^5.5|^7.0",
+                "phpcollection/phpcollection": "~0.1",
+                "phpoption/phpoption": "^1.1"
+            },
+            "conflict": {
+                "twig/twig": "<1.12"
+            },
+            "require-dev": {
+                "doctrine/orm": "~2.1",
+                "doctrine/phpcr-odm": "^1.3|^2.0",
+                "ext-pdo_sqlite": "*",
+                "jackalope/jackalope-doctrine-dbal": "^1.1.5",
+                "phpunit/phpunit": "^4.8|^5.0",
+                "propel/propel1": "~1.7",
+                "psr/container": "^1.0",
+                "symfony/dependency-injection": "^2.7|^3.3|^4.0",
+                "symfony/expression-language": "^2.6|^3.0",
+                "symfony/filesystem": "^2.1",
+                "symfony/form": "~2.1|^3.0",
+                "symfony/translation": "^2.1|^3.0",
+                "symfony/validator": "^2.2|^3.0",
+                "symfony/yaml": "^2.1|^3.0",
+                "twig/twig": "~1.12|~2.0"
+            },
+            "suggest": {
+                "doctrine/cache": "Required if you like to use cache functionality.",
+                "doctrine/collections": "Required if you like to use doctrine collection types as ArrayCollection.",
+                "symfony/yaml": "Required if you'd like to serialize data to YAML format."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-1.x": "1.14-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "JMS\\Serializer": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Johannes M. Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                },
+                {
+                    "name": "Asmir Mustafic",
+                    "email": "goetas@gmail.com"
+                }
+            ],
+            "description": "Library for (de-)serializing data of any complexity; supports XML, JSON, and YAML.",
+            "homepage": "http://jmsyst.com/libs/serializer",
+            "keywords": [
+                "deserialization",
+                "jaxb",
+                "json",
+                "serialization",
+                "xml"
+            ],
+            "time": "2020-02-22T20:59:37+00:00"
+        },
+        {
+            "name": "league/flysystem",
+            "version": "1.0.69",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/flysystem.git",
+                "reference": "7106f78428a344bc4f643c233a94e48795f10967"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/7106f78428a344bc4f643c233a94e48795f10967",
+                "reference": "7106f78428a344bc4f643c233a94e48795f10967",
+                "shasum": ""
+            },
+            "require": {
+                "ext-fileinfo": "*",
+                "php": ">=5.5.9"
+            },
+            "conflict": {
+                "league/flysystem-sftp": "<1.0.6"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "^3.4",
+                "phpunit/phpunit": "^5.7.26"
+            },
+            "suggest": {
+                "ext-fileinfo": "Required for MimeType",
+                "ext-ftp": "Allows you to use FTP server storage",
+                "ext-openssl": "Allows you to use FTPS server storage",
+                "league/flysystem-aws-s3-v2": "Allows you to use S3 storage with AWS SDK v2",
+                "league/flysystem-aws-s3-v3": "Allows you to use S3 storage with AWS SDK v3",
+                "league/flysystem-azure": "Allows you to use Windows Azure Blob storage",
+                "league/flysystem-cached-adapter": "Flysystem adapter decorator for metadata caching",
+                "league/flysystem-eventable-filesystem": "Allows you to use EventableFilesystem",
+                "league/flysystem-rackspace": "Allows you to use Rackspace Cloud Files",
+                "league/flysystem-sftp": "Allows you to use SFTP server storage via phpseclib",
+                "league/flysystem-webdav": "Allows you to use WebDAV storage",
+                "league/flysystem-ziparchive": "Allows you to use ZipArchive adapter",
+                "spatie/flysystem-dropbox": "Allows you to use Dropbox storage",
+                "srmklive/flysystem-dropbox-v2": "Allows you to use Dropbox storage for PHP 5 applications"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "League\\Flysystem\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Frank de Jonge",
+                    "email": "info@frenky.net"
+                }
+            ],
+            "description": "Filesystem abstraction: Many filesystems, one API.",
+            "keywords": [
+                "Cloud Files",
+                "WebDAV",
+                "abstraction",
+                "aws",
+                "cloud",
+                "copy.com",
+                "dropbox",
+                "file systems",
+                "files",
+                "filesystem",
+                "filesystems",
+                "ftp",
+                "rackspace",
+                "remote",
+                "s3",
+                "sftp",
+                "storage"
+            ],
+            "funding": [
+                {
+                    "url": "https://offset.earth/frankdejonge",
+                    "type": "other"
+                }
+            ],
+            "time": "2020-05-18T15:13:39+00:00"
+        },
+        {
+            "name": "lusitanian/oauth",
+            "version": "v0.8.11",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Lusitanian/PHPoAuthLib.git",
+                "reference": "fc11a53db4b66da555a6a11fce294f574a8374f9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Lusitanian/PHPoAuthLib/zipball/fc11a53db4b66da555a6a11fce294f574a8374f9",
+                "reference": "fc11a53db4b66da555a6a11fce294f574a8374f9",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "3.7.*",
+                "predis/predis": "0.8.*@dev",
+                "squizlabs/php_codesniffer": "2.*",
+                "symfony/http-foundation": "~2.1"
+            },
+            "suggest": {
+                "ext-openssl": "Allows for usage of secure connections with the stream-based HTTP client.",
+                "predis/predis": "Allows using the Redis storage backend.",
+                "symfony/http-foundation": "Allows using the Symfony Session storage backend."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "OAuth": "src",
+                    "OAuth\\Unit": "tests"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "David Desberg",
+                    "email": "david@daviddesberg.com"
+                },
+                {
+                    "name": "Elliot Chance",
+                    "email": "elliotchance@gmail.com"
+                },
+                {
+                    "name": "Pieter Hordijk",
+                    "email": "info@pieterhordijk.com"
+                }
+            ],
+            "description": "PHP 5.3+ oAuth 1/2 Library",
+            "keywords": [
+                "Authentication",
+                "authorization",
+                "oauth",
+                "security"
+            ],
+            "time": "2018-02-14T22:37:14+00:00"
+        },
+        {
+            "name": "magento/magento-coding-standard",
+            "version": "5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/magento/magento-coding-standard.git",
+                "reference": "da46c5d57a43c950dfa364edc7f1f0436d5353a5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/magento/magento-coding-standard/zipball/da46c5d57a43c950dfa364edc7f1f0436d5353a5",
+                "reference": "da46c5d57a43c950dfa364edc7f1f0436d5353a5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6.0",
+                "squizlabs/php_codesniffer": "^3.4",
+                "webonyx/graphql-php": ">=0.12.6 <1.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
+            },
+            "type": "phpcodesniffer-standard",
+            "autoload": {
+                "classmap": [
+                    "PHP_CodeSniffer/Tokenizers/"
+                ],
+                "psr-4": {
+                    "Magento2\\": "Magento2/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "OSL-3.0",
+                "AFL-3.0"
+            ],
+            "description": "A set of Magento specific PHP CodeSniffer rules.",
+            "time": "2019-11-04T22:08:27+00:00"
+        },
+        {
+            "name": "magento/magento2-functional-testing-framework",
+            "version": "dev-3.0.0-RC3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/magento/magento2-functional-testing-framework.git",
+                "reference": "aea30ae1df2fe6618478ba8813864c204561fde3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/aea30ae1df2fe6618478ba8813864c204561fde3",
+                "reference": "aea30ae1df2fe6618478ba8813864c204561fde3",
+                "shasum": ""
+            },
+            "require": {
+                "allure-framework/allure-codeception": "~1.4.0",
+                "aws/aws-sdk-php": "^3.132",
+                "codeception/codeception": "~4.1.4",
+                "codeception/module-asserts": "^1.1",
+                "codeception/module-sequence": "^1.0",
+                "codeception/module-webdriver": "^1.0",
+                "composer/composer": "^1.9",
+                "csharpru/vault-php": "~3.5.3",
+                "csharpru/vault-php-guzzle6-transport": "^2.0",
+                "ext-curl": "*",
+                "ext-dom": "*",
+                "ext-intl": "*",
+                "ext-json": "*",
+                "ext-openssl": "*",
+                "monolog/monolog": "^1.17",
+                "mustache/mustache": "~2.5",
+                "php": "^7.3",
+                "php-webdriver/webdriver": "^1.8.0",
+                "spomky-labs/otphp": "^10.0",
+                "symfony/console": "^4.4",
+                "symfony/finder": "^5.0",
+                "symfony/mime": "^5.0",
+                "symfony/process": "^4.4",
+                "vlucas/phpdotenv": "^2.4"
+            },
+            "replace": {
+                "facebook/webdriver": "^1.7.1"
+            },
+            "require-dev": {
+                "brainmaestro/composer-git-hooks": "^2.3.1",
+                "codacy/coverage": "^1.4",
+                "codeception/aspect-mock": "^3.0",
+                "doctrine/cache": "<1.7.0",
+                "goaop/framework": "~2.3.4",
+                "php-coveralls/php-coveralls": "^1.0",
+                "phpmd/phpmd": "^2.8.0",
+                "phpunit/phpunit": "^9.0",
+                "rregeer/phpunit-coverage-check": "^0.1.4",
+                "sebastian/phpcpd": "~5.0.0",
+                "squizlabs/php_codesniffer": "~3.5.4",
+                "symfony/stopwatch": "~3.4.6"
+            },
+            "bin": [
+                "bin/mftf"
+            ],
+            "type": "library",
+            "extra": {
+                "hooks": {
+                    "pre-push": "bin/all-checks"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/Magento/FunctionalTestingFramework/_bootstrap.php"
+                ],
+                "psr-4": {
+                    "Magento\\FunctionalTestingFramework\\": "src/Magento/FunctionalTestingFramework",
+                    "MFTF\\": "dev/tests/functional/tests/MFTF"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "AGPL-3.0"
+            ],
+            "description": "Magento2 Functional Testing Framework",
+            "keywords": [
+                "automation",
+                "functional",
+                "magento",
+                "testing"
+            ],
+            "time": "2020-05-22T19:17:05+00:00"
+        },
+        {
+            "name": "mikey179/vfsstream",
+            "version": "v1.6.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/bovigo/vfsStream.git",
+                "reference": "231c73783ebb7dd9ec77916c10037eff5a2b6efe"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/231c73783ebb7dd9ec77916c10037eff5a2b6efe",
+                "reference": "231c73783ebb7dd9ec77916c10037eff5a2b6efe",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.5|^5.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.6.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "org\\bovigo\\vfs\\": "src/main/php"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Frank Kleine",
+                    "homepage": "http://frankkleine.de/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Virtual file system to mock the real file system in unit tests.",
+            "homepage": "http://vfs.bovigo.org/",
+            "time": "2019-10-30T15:31:00+00:00"
+        },
+        {
+            "name": "mtdowling/jmespath.php",
+            "version": "2.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/jmespath/jmespath.php.git",
+                "reference": "52168cb9472de06979613d365c7f1ab8798be895"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/52168cb9472de06979613d365c7f1ab8798be895",
+                "reference": "52168cb9472de06979613d365c7f1ab8798be895",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0",
+                "symfony/polyfill-mbstring": "^1.4"
+            },
+            "require-dev": {
+                "composer/xdebug-handler": "^1.2",
+                "phpunit/phpunit": "^4.8.36|^7.5.15"
+            },
+            "bin": [
+                "bin/jp.php"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.5-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "JmesPath\\": "src/"
+                },
+                "files": [
+                    "src/JmesPath.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Declaratively specify how to extract elements from a JSON document",
+            "keywords": [
+                "json",
+                "jsonpath"
+            ],
+            "time": "2019-12-30T18:03:34+00:00"
+        },
+        {
+            "name": "mustache/mustache",
+            "version": "v2.13.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/bobthecow/mustache.php.git",
+                "reference": "e95c5a008c23d3151d59ea72484d4f72049ab7f4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/bobthecow/mustache.php/zipball/e95c5a008c23d3151d59ea72484d4f72049ab7f4",
+                "reference": "e95c5a008c23d3151d59ea72484d4f72049ab7f4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.2.4"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "~1.11",
+                "phpunit/phpunit": "~3.7|~4.0|~5.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Mustache": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Justin Hileman",
+                    "email": "justin@justinhileman.info",
+                    "homepage": "http://justinhileman.com"
+                }
+            ],
+            "description": "A Mustache implementation in PHP.",
+            "homepage": "https://github.com/bobthecow/mustache.php",
+            "keywords": [
+                "mustache",
+                "templating"
+            ],
+            "time": "2019-11-23T21:40:31+00:00"
+        },
+        {
+            "name": "myclabs/deep-copy",
+            "version": "1.9.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/myclabs/DeepCopy.git",
+                "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/b2c28789e80a97badd14145fda39b545d83ca3ef",
+                "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1"
+            },
+            "replace": {
+                "myclabs/deep-copy": "self.version"
+            },
+            "require-dev": {
+                "doctrine/collections": "^1.0",
+                "doctrine/common": "^2.6",
+                "phpunit/phpunit": "^7.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                },
+                "files": [
+                    "src/DeepCopy/deep_copy.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Create deep copies (clones) of your objects",
+            "keywords": [
+                "clone",
+                "copy",
+                "duplicate",
+                "object",
+                "object graph"
+            ],
+            "time": "2020-01-17T21:11:47+00:00"
+        },
+        {
+            "name": "paragonie/constant_time_encoding",
+            "version": "v2.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/paragonie/constant_time_encoding.git",
+                "reference": "47a1cedd2e4d52688eb8c96469c05ebc8fd28fa2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/47a1cedd2e4d52688eb8c96469c05ebc8fd28fa2",
+                "reference": "47a1cedd2e4d52688eb8c96469c05ebc8fd28fa2",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7|^8"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6|^7",
+                "vimeo/psalm": "^1|^2|^3"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "ParagonIE\\ConstantTime\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Paragon Initiative Enterprises",
+                    "email": "security@paragonie.com",
+                    "homepage": "https://paragonie.com",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "Steve 'Sc00bz' Thomas",
+                    "email": "steve@tobtu.com",
+                    "homepage": "https://www.tobtu.com",
+                    "role": "Original Developer"
+                }
+            ],
+            "description": "Constant-time Implementations of RFC 4648 Encoding (Base-64, Base-32, Base-16)",
+            "keywords": [
+                "base16",
+                "base32",
+                "base32_decode",
+                "base32_encode",
+                "base64",
+                "base64_decode",
+                "base64_encode",
+                "bin2hex",
+                "encoding",
+                "hex",
+                "hex2bin",
+                "rfc4648"
+            ],
+            "time": "2019-11-06T19:20:29+00:00"
+        },
+        {
+            "name": "pdepend/pdepend",
+            "version": "2.7.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pdepend/pdepend.git",
+                "reference": "daba1cf0a6edaf172fa02a17807ae29f4c1c7471"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/daba1cf0a6edaf172fa02a17807ae29f4c1c7471",
+                "reference": "daba1cf0a6edaf172fa02a17807ae29f4c1c7471",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.7",
+                "symfony/config": "^2.3.0|^3|^4|^5",
+                "symfony/dependency-injection": "^2.3.0|^3|^4|^5",
+                "symfony/filesystem": "^2.3.0|^3|^4|^5"
+            },
+            "require-dev": {
+                "easy-doc/easy-doc": "0.0.0 || ^1.2.3",
+                "gregwar/rst": "^1.0",
+                "phpunit/phpunit": "^4.8.35|^5.7",
+                "squizlabs/php_codesniffer": "^2.0.0"
+            },
+            "bin": [
+                "src/bin/pdepend"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PDepend\\": "src/main/php/PDepend"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Official version of pdepend to be handled with Composer",
+            "time": "2020-02-08T12:06:13+00:00"
+        },
+        {
+            "name": "phar-io/manifest",
+            "version": "1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phar-io/manifest.git",
+                "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
+                "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-phar": "*",
+                "phar-io/version": "^2.0",
+                "php": "^5.6 || ^7.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Heuer",
+                    "email": "sebastian@phpeople.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
+            "time": "2018-07-08T19:23:20+00:00"
+        },
+        {
+            "name": "phar-io/version",
+            "version": "2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phar-io/version.git",
+                "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6",
+                "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Heuer",
+                    "email": "sebastian@phpeople.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Library for handling version information and constraints",
+            "time": "2018-07-08T19:19:57+00:00"
+        },
+        {
+            "name": "php-cs-fixer/diff",
+            "version": "v1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHP-CS-Fixer/diff.git",
+                "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/78bb099e9c16361126c86ce82ec4405ebab8e756",
+                "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+                "symfony/process": "^3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "SpacePossum"
+                }
+            ],
+            "description": "sebastian/diff v2 backport support for PHP5.6",
+            "homepage": "https://github.com/PHP-CS-Fixer",
+            "keywords": [
+                "diff"
+            ],
+            "time": "2018-02-15T16:58:55+00:00"
+        },
+        {
+            "name": "php-webdriver/webdriver",
+            "version": "1.8.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-webdriver/php-webdriver.git",
+                "reference": "3308a70be084d6d7fd1ee5787b4c2e6eb4b70aab"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/3308a70be084d6d7fd1ee5787b4c2e6eb4b70aab",
+                "reference": "3308a70be084d6d7fd1ee5787b4c2e6eb4b70aab",
+                "shasum": ""
+            },
+            "require": {
+                "ext-curl": "*",
+                "ext-json": "*",
+                "ext-zip": "*",
+                "php": "^5.6 || ~7.0",
+                "symfony/polyfill-mbstring": "^1.12",
+                "symfony/process": "^2.8 || ^3.1 || ^4.0 || ^5.0"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^2.0",
+                "jakub-onderka/php-parallel-lint": "^1.0",
+                "php-coveralls/php-coveralls": "^2.0",
+                "php-mock/php-mock-phpunit": "^1.1",
+                "phpunit/phpunit": "^5.7",
+                "sebastian/environment": "^1.3.4 || ^2.0 || ^3.0",
+                "sminnee/phpunit-mock-objects": "^3.4",
+                "squizlabs/php_codesniffer": "^3.5",
+                "symfony/var-dumper": "^3.3 || ^4.0 || ^5.0"
+            },
+            "suggest": {
+                "ext-SimpleXML": "For Firefox profile creation"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.8.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Facebook\\WebDriver\\": "lib/"
+                },
+                "files": [
+                    "lib/Exception/TimeoutException.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "A PHP client for Selenium WebDriver. Previously facebook/webdriver.",
+            "homepage": "https://github.com/php-webdriver/php-webdriver",
+            "keywords": [
+                "Chromedriver",
+                "geckodriver",
+                "php",
+                "selenium",
+                "webdriver"
+            ],
+            "time": "2020-03-04T14:40:12+00:00"
+        },
+        {
+            "name": "phpcollection/phpcollection",
+            "version": "0.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/schmittjoh/php-collection.git",
+                "reference": "f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6",
+                "reference": "f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6",
+                "shasum": ""
+            },
+            "require": {
+                "phpoption/phpoption": "1.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "PhpCollection": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache2"
+            ],
+            "authors": [
+                {
+                    "name": "Johannes M. Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "General-Purpose Collection Library for PHP",
+            "keywords": [
+                "collection",
+                "list",
+                "map",
+                "sequence",
+                "set"
+            ],
+            "time": "2015-05-17T12:39:23+00:00"
+        },
+        {
+            "name": "phpcompatibility/php-compatibility",
+            "version": "9.3.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHPCompatibility/PHPCompatibility.git",
+                "reference": "9fb324479acf6f39452e0655d2429cc0d3914243"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/9fb324479acf6f39452e0655d2429cc0d3914243",
+                "reference": "9fb324479acf6f39452e0655d2429cc0d3914243",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3",
+                "squizlabs/php_codesniffer": "^2.3 || ^3.0.2"
+            },
+            "conflict": {
+                "squizlabs/php_codesniffer": "2.6.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.5 || ^5.0 || ^6.0 || ^7.0"
+            },
+            "suggest": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.5 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically.",
+                "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues."
+            },
+            "type": "phpcodesniffer-standard",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Wim Godden",
+                    "homepage": "https://github.com/wimg",
+                    "role": "lead"
+                },
+                {
+                    "name": "Juliette Reinders Folmer",
+                    "homepage": "https://github.com/jrfnl",
+                    "role": "lead"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/PHPCompatibility/PHPCompatibility/graphs/contributors"
+                }
+            ],
+            "description": "A set of sniffs for PHP_CodeSniffer that checks for PHP cross-version compatibility.",
+            "homepage": "http://techblog.wimgodden.be/tag/codesniffer/",
+            "keywords": [
+                "compatibility",
+                "phpcs",
+                "standards"
+            ],
+            "time": "2019-12-27T09:44:58+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-common",
+            "version": "2.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
+                "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/6568f4687e5b41b054365f9ae03fcb1ed5f2069b",
+                "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "opensource@ijaap.nl"
+                }
+            ],
+            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
+            "homepage": "http://www.phpdoc.org",
+            "keywords": [
+                "FQSEN",
+                "phpDocumentor",
+                "phpdoc",
+                "reflection",
+                "static analysis"
+            ],
+            "time": "2020-04-27T09:25:28+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-docblock",
+            "version": "5.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+                "reference": "cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e",
+                "reference": "cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e",
+                "shasum": ""
+            },
+            "require": {
+                "ext-filter": "^7.1",
+                "php": "^7.2",
+                "phpdocumentor/reflection-common": "^2.0",
+                "phpdocumentor/type-resolver": "^1.0",
+                "webmozart/assert": "^1"
+            },
+            "require-dev": {
+                "doctrine/instantiator": "^1",
+                "mockery/mockery": "^1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                },
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "account@ijaap.nl"
+                }
+            ],
+            "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-02-22T12:28:44+00:00"
+        },
+        {
+            "name": "phpdocumentor/type-resolver",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/TypeResolver.git",
+                "reference": "7462d5f123dfc080dfdf26897032a6513644fc95"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/7462d5f123dfc080dfdf26897032a6513644fc95",
+                "reference": "7462d5f123dfc080dfdf26897032a6513644fc95",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2",
+                "phpdocumentor/reflection-common": "^2.0"
+            },
+            "require-dev": {
+                "ext-tokenizer": "^7.2",
+                "mockery/mockery": "~1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
+            "time": "2020-02-18T18:59:58+00:00"
+        },
+        {
+            "name": "phpmd/phpmd",
+            "version": "2.8.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpmd/phpmd.git",
+                "reference": "714629ed782537f638fe23c4346637659b779a77"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/714629ed782537f638fe23c4346637659b779a77",
+                "reference": "714629ed782537f638fe23c4346637659b779a77",
+                "shasum": ""
+            },
+            "require": {
+                "composer/xdebug-handler": "^1.0",
+                "ext-xml": "*",
+                "pdepend/pdepend": "^2.7.1",
+                "php": ">=5.3.9"
+            },
+            "require-dev": {
+                "easy-doc/easy-doc": "0.0.0 || ^1.3.2",
+                "gregwar/rst": "^1.0",
+                "mikey179/vfsstream": "^1.6.4",
+                "phpunit/phpunit": "^4.8.36 || ^5.7.27",
+                "squizlabs/php_codesniffer": "^2.0"
+            },
+            "bin": [
+                "src/bin/phpmd"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "PHPMD\\": "src/main/php"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Manuel Pichler",
+                    "email": "github@manuel-pichler.de",
+                    "homepage": "https://github.com/manuelpichler",
+                    "role": "Project Founder"
+                },
+                {
+                    "name": "Marc Würth",
+                    "email": "ravage@bluewin.ch",
+                    "homepage": "https://github.com/ravage84",
+                    "role": "Project Maintainer"
+                },
+                {
+                    "name": "Other contributors",
+                    "homepage": "https://github.com/phpmd/phpmd/graphs/contributors",
+                    "role": "Contributors"
+                }
+            ],
+            "description": "PHPMD is a spin-off project of PHP Depend and aims to be a PHP equivalent of the well known Java tool PMD.",
+            "homepage": "https://phpmd.org/",
+            "keywords": [
+                "mess detection",
+                "mess detector",
+                "pdepend",
+                "phpmd",
+                "pmd"
+            ],
+            "time": "2020-02-16T20:15:50+00:00"
+        },
+        {
+            "name": "phpoption/phpoption",
+            "version": "1.7.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/schmittjoh/php-option.git",
+                "reference": "4acfd6a4b33a509d8c88f50e5222f734b6aeebae"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/4acfd6a4b33a509d8c88f50e5222f734b6aeebae",
+                "reference": "4acfd6a4b33a509d8c88f50e5222f734b6aeebae",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5.9 || ^7.0 || ^8.0"
+            },
+            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.3",
+                "phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0 || ^7.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.7-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PhpOption\\": "src/PhpOption/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Johannes M. Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                },
+                {
+                    "name": "Graham Campbell",
+                    "email": "graham@alt-three.com"
+                }
+            ],
+            "description": "Option Type for PHP",
+            "keywords": [
+                "language",
+                "option",
+                "php",
+                "type"
+            ],
+            "time": "2020-03-21T18:07:53+00:00"
+        },
+        {
+            "name": "phpspec/prophecy",
+            "version": "v1.10.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/prophecy.git",
+                "reference": "451c3cd1418cf640de218914901e51b064abb093"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/451c3cd1418cf640de218914901e51b064abb093",
+                "reference": "451c3cd1418cf640de218914901e51b064abb093",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": "^5.3|^7.0",
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0",
+                "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0",
+                "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "^2.5 || ^3.2",
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.10.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Prophecy\\": "src/Prophecy"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                },
+                {
+                    "name": "Marcello Duarte",
+                    "email": "marcello.duarte@gmail.com"
+                }
+            ],
+            "description": "Highly opinionated mocking framework for PHP 5.3+",
+            "homepage": "https://github.com/phpspec/prophecy",
+            "keywords": [
+                "Double",
+                "Dummy",
+                "fake",
+                "mock",
+                "spy",
+                "stub"
+            ],
+            "time": "2020-03-05T15:02:03+00:00"
+        },
+        {
+            "name": "phpstan/phpstan",
+            "version": "0.12.23",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpstan/phpstan.git",
+                "reference": "71e529efced79e055fa8318b692e7f7d03ea4e75"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/71e529efced79e055fa8318b692e7f7d03ea4e75",
+                "reference": "71e529efced79e055fa8318b692e7f7d03ea4e75",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1"
+            },
+            "conflict": {
+                "phpstan/phpstan-shim": "*"
+            },
+            "bin": [
+                "phpstan",
+                "phpstan.phar"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.12-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "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"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "8.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "31e94ccc084025d6abee0585df533eb3a792b96a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/31e94ccc084025d6abee0585df533eb3a792b96a",
+                "reference": "31e94ccc084025d6abee0585df533eb3a792b96a",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-xmlwriter": "*",
+                "php": "^7.3",
+                "phpunit/php-file-iterator": "^3.0",
+                "phpunit/php-text-template": "^2.0",
+                "phpunit/php-token-stream": "^4.0",
+                "sebastian/code-unit-reverse-lookup": "^2.0",
+                "sebastian/environment": "^5.0",
+                "sebastian/version": "^3.0",
+                "theseer/tokenizer": "^1.1.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.0"
+            },
+            "suggest": {
+                "ext-pcov": "*",
+                "ext-xdebug": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "8.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "time": "2020-02-19T13:41:19+00:00"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "3.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "4ac5b3e13df14829daa60a2eb4fdd2f2b7d33cf4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/4ac5b3e13df14829daa60a2eb4fdd2f2b7d33cf4",
+                "reference": "4ac5b3e13df14829daa60a2eb4fdd2f2b7d33cf4",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-04-18T05:02:12+00:00"
+        },
+        {
+            "name": "phpunit/php-invoker",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-invoker.git",
+                "reference": "7579d5a1ba7f3ac11c80004d205877911315ae7a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/7579d5a1ba7f3ac11c80004d205877911315ae7a",
+                "reference": "7579d5a1ba7f3ac11c80004d205877911315ae7a",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.3"
+            },
+            "require-dev": {
+                "ext-pcntl": "*",
+                "phpunit/phpunit": "^9.0"
+            },
+            "suggest": {
+                "ext-pcntl": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Invoke callables with a timeout",
+            "homepage": "https://github.com/sebastianbergmann/php-invoker/",
+            "keywords": [
+                "process"
+            ],
+            "time": "2020-02-07T06:06:11+00:00"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "526dc996cc0ebdfa428cd2dfccd79b7b53fee346"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/526dc996cc0ebdfa428cd2dfccd79b7b53fee346",
+                "reference": "526dc996cc0ebdfa428cd2dfccd79b7b53fee346",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "time": "2020-02-01T07:43:44+00:00"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "3.1.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "dc9368fae6ef2ffa57eba80a7410bcef81df6258"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/dc9368fae6ef2ffa57eba80a7410bcef81df6258",
+                "reference": "dc9368fae6ef2ffa57eba80a7410bcef81df6258",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-04-20T06:00:37+00:00"
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "4.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "cdc0db5aed8fbfaf475fbd95bfd7bab83c7a779c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/cdc0db5aed8fbfaf475fbd95bfd7bab83c7a779c",
+                "reference": "cdc0db5aed8fbfaf475fbd95bfd7bab83c7a779c",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": "^7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-05-06T09:56:31+00:00"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "9.1.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "1b570cd7edbe136055bf5f651857dc8af6b829d2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1b570cd7edbe136055bf5f651857dc8af6b829d2",
+                "reference": "1b570cd7edbe136055bf5f651857dc8af6b829d2",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.2.0",
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-libxml": "*",
+                "ext-mbstring": "*",
+                "ext-xml": "*",
+                "ext-xmlwriter": "*",
+                "myclabs/deep-copy": "^1.9.1",
+                "phar-io/manifest": "^1.0.3",
+                "phar-io/version": "^2.0.1",
+                "php": "^7.3",
+                "phpspec/prophecy": "^1.8.1",
+                "phpunit/php-code-coverage": "^8.0.1",
+                "phpunit/php-file-iterator": "^3.0",
+                "phpunit/php-invoker": "^3.0",
+                "phpunit/php-text-template": "^2.0",
+                "phpunit/php-timer": "^3.1.4",
+                "sebastian/code-unit": "^1.0.2",
+                "sebastian/comparator": "^4.0",
+                "sebastian/diff": "^4.0",
+                "sebastian/environment": "^5.0.1",
+                "sebastian/exporter": "^4.0",
+                "sebastian/global-state": "^4.0",
+                "sebastian/object-enumerator": "^4.0",
+                "sebastian/resource-operations": "^3.0",
+                "sebastian/type": "^2.0",
+                "sebastian/version": "^3.0"
+            },
+            "require-dev": {
+                "ext-pdo": "*",
+                "phpspec/prophecy-phpunit": "^2.0"
+            },
+            "suggest": {
+                "ext-soap": "*",
+                "ext-xdebug": "*"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "9.1-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ],
+                "files": [
+                    "src/Framework/Assert/Functions.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "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"
+        },
+        {
+            "name": "psr/cache",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/cache.git",
+                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8",
+                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Cache\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for caching libraries",
+            "keywords": [
+                "cache",
+                "psr",
+                "psr-6"
+            ],
+            "time": "2016-08-06T20:24:11+00:00"
+        },
+        {
+            "name": "psr/simple-cache",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/simple-cache.git",
+                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
+                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\SimpleCache\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interfaces for simple caching",
+            "keywords": [
+                "cache",
+                "caching",
+                "psr",
+                "psr-16",
+                "simple-cache"
+            ],
+            "time": "2017-10-23T01:57:42+00:00"
+        },
+        {
+            "name": "sebastian/code-unit",
+            "version": "1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit.git",
+                "reference": "ac958085bc19fcd1d36425c781ef4cbb5b06e2a5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/ac958085bc19fcd1d36425c781ef4cbb5b06e2a5",
+                "reference": "ac958085bc19fcd1d36425c781ef4cbb5b06e2a5",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "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-04-30T05:58:10+00:00"
+        },
+        {
+            "name": "sebastian/code-unit-reverse-lookup",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
+                "reference": "5b5dbe0044085ac41df47e79d34911a15b96d82e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/5b5dbe0044085ac41df47e79d34911a15b96d82e",
+                "reference": "5b5dbe0044085ac41df47e79d34911a15b96d82e",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Looks up which function or method a line of code belongs to",
+            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
+            "time": "2020-02-07T06:20:13+00:00"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "4.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "85b3435da967696ed618ff745f32be3ff4a2b8e8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/85b3435da967696ed618ff745f32be3ff4a2b8e8",
+                "reference": "85b3435da967696ed618ff745f32be3ff4a2b8e8",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.3",
+                "sebastian/diff": "^4.0",
+                "sebastian/exporter": "^4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "https://github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "time": "2020-02-07T06:08:51+00:00"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "4.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "3e523c576f29dacecff309f35e4cc5a5c168e78a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3e523c576f29dacecff309f35e4cc5a5c168e78a",
+                "reference": "3e523c576f29dacecff309f35e4cc5a5c168e78a",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.0",
+                "symfony/process": "^4.2 || ^5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff",
+                "udiff",
+                "unidiff",
+                "unified diff"
+            ],
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-05-08T05:01:12+00:00"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "5.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "c753f04d68cd489b6973cf9b4e505e191af3b05c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/c753f04d68cd489b6973cf9b4e505e191af3b05c",
+                "reference": "c753f04d68cd489b6973cf9b4e505e191af3b05c",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.0"
+            },
+            "suggest": {
+                "ext-posix": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-04-14T13:36:52+00:00"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "4.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "80c26562e964016538f832f305b2286e1ec29566"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/80c26562e964016538f832f305b2286e1ec29566",
+                "reference": "80c26562e964016538f832f305b2286e1ec29566",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.3",
+                "sebastian/recursion-context": "^4.0"
+            },
+            "require-dev": {
+                "ext-mbstring": "*",
+                "phpunit/phpunit": "^9.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "time": "2020-02-07T06:10:52+00:00"
+        },
+        {
+            "name": "sebastian/finder-facade",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/finder-facade.git",
+                "reference": "9d3e74b845a2ce50e19b25b5f0c2718e153bee6c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/finder-facade/zipball/9d3e74b845a2ce50e19b25b5f0c2718e153bee6c",
+                "reference": "9d3e74b845a2ce50e19b25b5f0c2718e153bee6c",
+                "shasum": ""
+            },
+            "require": {
+                "ext-ctype": "*",
+                "php": "^7.3",
+                "symfony/finder": "^4.1|^5.0",
+                "theseer/fdomdocument": "^1.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FinderFacade is a convenience wrapper for Symfony's Finder component.",
+            "homepage": "https://github.com/sebastianbergmann/finder-facade",
+            "time": "2020-02-08T06:07:58+00:00"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "4.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "bdb1e7c79e592b8c82cb1699be3c8743119b8a72"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bdb1e7c79e592b8c82cb1699be3c8743119b8a72",
+                "reference": "bdb1e7c79e592b8c82cb1699be3c8743119b8a72",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.3",
+                "sebastian/object-reflector": "^2.0",
+                "sebastian/recursion-context": "^4.0"
+            },
+            "require-dev": {
+                "ext-dom": "*",
+                "phpunit/phpunit": "^9.0"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "time": "2020-02-07T06:11:37+00:00"
+        },
+        {
+            "name": "sebastian/object-enumerator",
+            "version": "4.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
+                "reference": "e67516b175550abad905dc952f43285957ef4363"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67516b175550abad905dc952f43285957ef4363",
+                "reference": "e67516b175550abad905dc952f43285957ef4363",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.3",
+                "sebastian/object-reflector": "^2.0",
+                "sebastian/recursion-context": "^4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
+            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
+            "time": "2020-02-07T06:12:23+00:00"
+        },
+        {
+            "name": "sebastian/object-reflector",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-reflector.git",
+                "reference": "f4fd0835cabb0d4a6546d9fe291e5740037aa1e7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/f4fd0835cabb0d4a6546d9fe291e5740037aa1e7",
+                "reference": "f4fd0835cabb0d4a6546d9fe291e5740037aa1e7",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Allows reflection of object attributes, including inherited and non-public ones",
+            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
+            "time": "2020-02-07T06:19:40+00:00"
+        },
+        {
+            "name": "sebastian/phpcpd",
+            "version": "5.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpcpd.git",
+                "reference": "8724382966b1861df4e12db915eaed2165e10bf3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/8724382966b1861df4e12db915eaed2165e10bf3",
+                "reference": "8724382966b1861df4e12db915eaed2165e10bf3",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "php": "^7.3",
+                "phpunit/php-timer": "^3.0",
+                "sebastian/finder-facade": "^2.0",
+                "sebastian/version": "^3.0",
+                "symfony/console": "^4.0|^5.0"
+            },
+            "bin": [
+                "phpcpd"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Copy/Paste Detector (CPD) for PHP code.",
+            "homepage": "https://github.com/sebastianbergmann/phpcpd",
+            "time": "2020-02-22T06:03:17+00:00"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "4.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "cdd86616411fc3062368b720b0425de10bd3d579"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cdd86616411fc3062368b720b0425de10bd3d579",
+                "reference": "cdd86616411fc3062368b720b0425de10bd3d579",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "time": "2020-02-07T06:18:20+00:00"
+        },
+        {
+            "name": "sebastian/resource-operations",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/resource-operations.git",
+                "reference": "8c98bf0dfa1f9256d0468b9803a1e1df31b6fa98"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/8c98bf0dfa1f9256d0468b9803a1e1df31b6fa98",
+                "reference": "8c98bf0dfa1f9256d0468b9803a1e1df31b6fa98",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides a list of PHP built-in functions that operate on resources",
+            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
+            "time": "2020-02-07T06:13:02+00:00"
+        },
+        {
+            "name": "sebastian/type",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/type.git",
+                "reference": "9e8f42f740afdea51f5f4e8cec2035580e797ee1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/9e8f42f740afdea51f5f4e8cec2035580e797ee1",
+                "reference": "9e8f42f740afdea51f5f4e8cec2035580e797ee1",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Collection of value objects that represent the types of the PHP type system",
+            "homepage": "https://github.com/sebastianbergmann/type",
+            "time": "2020-02-07T06:13:43+00:00"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "0411bde656dce64202b39c2f4473993a9081d39e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/0411bde656dce64202b39c2f4473993a9081d39e",
+                "reference": "0411bde656dce64202b39c2f4473993a9081d39e",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "time": "2020-01-21T06:36:37+00:00"
+        },
+        {
+            "name": "spomky-labs/otphp",
+            "version": "v10.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Spomky-Labs/otphp.git",
+                "reference": "f44cce5a9db4b8da410215d992110482c931232f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Spomky-Labs/otphp/zipball/f44cce5a9db4b8da410215d992110482c931232f",
+                "reference": "f44cce5a9db4b8da410215d992110482c931232f",
+                "shasum": ""
+            },
+            "require": {
+                "beberlei/assert": "^3.0",
+                "ext-mbstring": "*",
+                "paragonie/constant_time_encoding": "^2.0",
+                "php": "^7.2|^8.0",
+                "thecodingmachine/safe": "^0.1.14|^1.0"
+            },
+            "require-dev": {
+                "php-coveralls/php-coveralls": "^2.0",
+                "phpstan/phpstan": "^0.12",
+                "phpstan/phpstan-beberlei-assert": "^0.12",
+                "phpstan/phpstan-deprecation-rules": "^0.12",
+                "phpstan/phpstan-phpunit": "^0.12",
+                "phpstan/phpstan-strict-rules": "^0.12",
+                "phpunit/phpunit": "^8.0",
+                "thecodingmachine/phpstan-safe-rule": "^1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "v10.0": "10.0.x-dev",
+                    "v9.0": "9.0.x-dev",
+                    "v8.3": "8.3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "OTPHP\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Florent Morselli",
+                    "homepage": "https://github.com/Spomky"
+                },
+                {
+                    "name": "All contributors",
+                    "homepage": "https://github.com/Spomky-Labs/otphp/contributors"
+                }
+            ],
+            "description": "A PHP library for generating one time passwords according to RFC 4226 (HOTP Algorithm) and the RFC 6238 (TOTP Algorithm) and compatible with Google Authenticator",
+            "homepage": "https://github.com/Spomky-Labs/otphp",
+            "keywords": [
+                "FreeOTP",
+                "RFC 4226",
+                "RFC 6238",
+                "google authenticator",
+                "hotp",
+                "otp",
+                "totp"
+            ],
+            "time": "2020-01-28T09:24:19+00:00"
+        },
+        {
+            "name": "squizlabs/php_codesniffer",
+            "version": "3.5.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
+                "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/73e2e7f57d958e7228fce50dc0c61f58f017f9f6",
+                "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6",
+                "shasum": ""
+            },
+            "require": {
+                "ext-simplexml": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
+            },
+            "bin": [
+                "bin/phpcs",
+                "bin/phpcbf"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.x-dev"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Greg Sherwood",
+                    "role": "lead"
+                }
+            ],
+            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
+            "homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
+            "keywords": [
+                "phpcs",
+                "standards"
+            ],
+            "time": "2020-04-17T01:09:41+00:00"
+        },
+        {
+            "name": "symfony/config",
+            "version": "v5.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/config.git",
+                "reference": "db1674e1a261148429f123871f30d211992294e7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/config/zipball/db1674e1a261148429f123871f30d211992294e7",
+                "reference": "db1674e1a261148429f123871f30d211992294e7",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2.5",
+                "symfony/filesystem": "^4.4|^5.0",
+                "symfony/polyfill-ctype": "~1.8"
+            },
+            "conflict": {
+                "symfony/finder": "<4.4"
+            },
+            "require-dev": {
+                "symfony/event-dispatcher": "^4.4|^5.0",
+                "symfony/finder": "^4.4|^5.0",
+                "symfony/messenger": "^4.4|^5.0",
+                "symfony/service-contracts": "^1.1|^2",
+                "symfony/yaml": "^4.4|^5.0"
+            },
+            "suggest": {
+                "symfony/yaml": "To use the yaml reference dumper"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Config\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "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-04-15T15:59:10+00:00"
+        },
+        {
+            "name": "symfony/dependency-injection",
+            "version": "v5.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/dependency-injection.git",
+                "reference": "92d8b3bd896a87cdd8aba0a3dd041bc072e8cfba"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/92d8b3bd896a87cdd8aba0a3dd041bc072e8cfba",
+                "reference": "92d8b3bd896a87cdd8aba0a3dd041bc072e8cfba",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2.5",
+                "psr/container": "^1.0",
+                "symfony/service-contracts": "^1.1.6|^2"
+            },
+            "conflict": {
+                "symfony/config": "<5.0",
+                "symfony/finder": "<4.4",
+                "symfony/proxy-manager-bridge": "<4.4",
+                "symfony/yaml": "<4.4"
+            },
+            "provide": {
+                "psr/container-implementation": "1.0",
+                "symfony/service-implementation": "1.0"
+            },
+            "require-dev": {
+                "symfony/config": "^5.0",
+                "symfony/expression-language": "^4.4|^5.0",
+                "symfony/yaml": "^4.4|^5.0"
+            },
+            "suggest": {
+                "symfony/config": "",
+                "symfony/expression-language": "For using expressions in service container configuration",
+                "symfony/finder": "For using double-star glob patterns or when GLOB_BRACE portability is required",
+                "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them",
+                "symfony/yaml": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\DependencyInjection\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "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-04-28T17:58:55+00:00"
+        },
+        {
+            "name": "symfony/http-foundation",
+            "version": "v5.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/http-foundation.git",
+                "reference": "e47fdf8b24edc12022ba52923150ec6484d7f57d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e47fdf8b24edc12022ba52923150ec6484d7f57d",
+                "reference": "e47fdf8b24edc12022ba52923150ec6484d7f57d",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2.5",
+                "symfony/mime": "^4.4|^5.0",
+                "symfony/polyfill-mbstring": "~1.1"
+            },
+            "require-dev": {
+                "predis/predis": "~1.0",
+                "symfony/expression-language": "^4.4|^5.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\HttpFoundation\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "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-04-18T20:50:06+00:00"
+        },
+        {
+            "name": "symfony/mime",
+            "version": "v5.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/mime.git",
+                "reference": "5d6c81c39225a750f3f43bee15f03093fb9aaa0b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/5d6c81c39225a750f3f43bee15f03093fb9aaa0b",
+                "reference": "5d6c81c39225a750f3f43bee15f03093fb9aaa0b",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2.5",
+                "symfony/polyfill-intl-idn": "^1.10",
+                "symfony/polyfill-mbstring": "^1.0"
+            },
+            "conflict": {
+                "symfony/mailer": "<4.4"
+            },
+            "require-dev": {
+                "egulias/email-validator": "^2.1.10",
+                "symfony/dependency-injection": "^4.4|^5.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Mime\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "A library to manipulate MIME messages",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "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-04-17T03:29:44+00:00"
+        },
+        {
+            "name": "symfony/options-resolver",
+            "version": "v5.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/options-resolver.git",
+                "reference": "3707e3caeff2b797c0bfaadd5eba723dd44e6bf1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/3707e3caeff2b797c0bfaadd5eba723dd44e6bf1",
+                "reference": "3707e3caeff2b797c0bfaadd5eba723dd44e6bf1",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\OptionsResolver\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony OptionsResolver Component",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "config",
+                "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-04-06T10:40:56+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php70",
+            "version": "v1.17.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php70.git",
+                "reference": "82225c2d7d23d7e70515496d249c0152679b468e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/82225c2d7d23d7e70515496d249c0152679b468e",
+                "reference": "82225c2d7d23d7e70515496d249c0152679b468e",
+                "shasum": ""
+            },
+            "require": {
+                "paragonie/random_compat": "~1.0|~2.0|~9.99",
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.17-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php70\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ],
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "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"
+        },
+        {
+            "name": "symfony/stopwatch",
+            "version": "v5.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/stopwatch.git",
+                "reference": "a1d86d30d4522423afc998f32404efa34fcf5a73"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/a1d86d30d4522423afc998f32404efa34fcf5a73",
+                "reference": "a1d86d30d4522423afc998f32404efa34fcf5a73",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2.5",
+                "symfony/service-contracts": "^1.0|^2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Stopwatch\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "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-03-27T16:56:45+00:00"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v5.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "482fb4e710e5af3e0e78015f19aa716ad953392f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/482fb4e710e5af3e0e78015f19aa716ad953392f",
+                "reference": "482fb4e710e5af3e0e78015f19aa716ad953392f",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2.5",
+                "symfony/polyfill-ctype": "~1.8"
+            },
+            "conflict": {
+                "symfony/console": "<4.4"
+            },
+            "require-dev": {
+                "symfony/console": "^4.4|^5.0"
+            },
+            "suggest": {
+                "symfony/console": "For validating YAML files using the lint command"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Yaml\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "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-04-28T17:58:55+00:00"
+        },
+        {
+            "name": "thecodingmachine/safe",
+            "version": "v1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thecodingmachine/safe.git",
+                "reference": "04f9ffae372a9816d4472dfb7bcf6126b623a9df"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thecodingmachine/safe/zipball/04f9ffae372a9816d4472dfb7bcf6126b623a9df",
+                "reference": "04f9ffae372a9816d4472dfb7bcf6126b623a9df",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^0.12",
+                "squizlabs/php_codesniffer": "^3.2",
+                "thecodingmachine/phpstan-strict-rules": "^0.12"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Safe\\": [
+                        "lib/",
+                        "generated/"
+                    ]
+                },
+                "files": [
+                    "generated/apache.php",
+                    "generated/apc.php",
+                    "generated/apcu.php",
+                    "generated/array.php",
+                    "generated/bzip2.php",
+                    "generated/classobj.php",
+                    "generated/com.php",
+                    "generated/cubrid.php",
+                    "generated/curl.php",
+                    "generated/datetime.php",
+                    "generated/dir.php",
+                    "generated/eio.php",
+                    "generated/errorfunc.php",
+                    "generated/exec.php",
+                    "generated/fileinfo.php",
+                    "generated/filesystem.php",
+                    "generated/filter.php",
+                    "generated/fpm.php",
+                    "generated/ftp.php",
+                    "generated/funchand.php",
+                    "generated/gmp.php",
+                    "generated/gnupg.php",
+                    "generated/hash.php",
+                    "generated/ibase.php",
+                    "generated/ibmDb2.php",
+                    "generated/iconv.php",
+                    "generated/image.php",
+                    "generated/imap.php",
+                    "generated/info.php",
+                    "generated/ingres-ii.php",
+                    "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",
+                    "generated/mysqlndQc.php",
+                    "generated/network.php",
+                    "generated/oci8.php",
+                    "generated/opcache.php",
+                    "generated/openssl.php",
+                    "generated/outcontrol.php",
+                    "generated/password.php",
+                    "generated/pcntl.php",
+                    "generated/pcre.php",
+                    "generated/pdf.php",
+                    "generated/pgsql.php",
+                    "generated/posix.php",
+                    "generated/ps.php",
+                    "generated/pspell.php",
+                    "generated/readline.php",
+                    "generated/rpminfo.php",
+                    "generated/rrd.php",
+                    "generated/sem.php",
+                    "generated/session.php",
+                    "generated/shmop.php",
+                    "generated/simplexml.php",
+                    "generated/sockets.php",
+                    "generated/sodium.php",
+                    "generated/solr.php",
+                    "generated/spl.php",
+                    "generated/sqlsrv.php",
+                    "generated/ssdeep.php",
+                    "generated/ssh2.php",
+                    "generated/stats.php",
+                    "generated/stream.php",
+                    "generated/strings.php",
+                    "generated/swoole.php",
+                    "generated/uodbc.php",
+                    "generated/uopz.php",
+                    "generated/url.php",
+                    "generated/var.php",
+                    "generated/xdiff.php",
+                    "generated/xml.php",
+                    "generated/xmlrpc.php",
+                    "generated/yaml.php",
+                    "generated/yaz.php",
+                    "generated/zip.php",
+                    "generated/zlib.php",
+                    "lib/special_cases.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "PHP core functions that throw exceptions instead of returning FALSE on error",
+            "time": "2020-05-04T15:25:36+00:00"
+        },
+        {
+            "name": "theseer/fdomdocument",
+            "version": "1.6.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/theseer/fDOMDocument.git",
+                "reference": "6e8203e40a32a9c770bcb62fe37e68b948da6dca"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/theseer/fDOMDocument/zipball/6e8203e40a32a9c770bcb62fe37e68b948da6dca",
+                "reference": "6e8203e40a32a9c770bcb62fe37e68b948da6dca",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "lib-libxml": "*",
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.",
+            "homepage": "https://github.com/theseer/fDOMDocument",
+            "time": "2017-06-30T11:53:12+00:00"
+        },
+        {
+            "name": "theseer/tokenizer",
+            "version": "1.1.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/theseer/tokenizer.git",
+                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
+                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": "^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
+            "time": "2019-06-13T22:48:21+00:00"
+        },
+        {
+            "name": "vlucas/phpdotenv",
+            "version": "v2.6.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/vlucas/phpdotenv.git",
+                "reference": "67d472b1794c986381a8950e4958e1adb779d561"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/67d472b1794c986381a8950e4958e1adb779d561",
+                "reference": "67d472b1794c986381a8950e4958e1adb779d561",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.9 || ^7.0 || ^8.0",
+                "symfony/polyfill-ctype": "^1.9"
+            },
+            "require-dev": {
+                "ext-filter": "*",
+                "ext-pcre": "*",
+                "phpunit/phpunit": "^4.8.35 || ^5.0"
+            },
+            "suggest": {
+                "ext-filter": "Required to use the boolean validator.",
+                "ext-pcre": "Required to use most of the library."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Dotenv\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "graham@alt-three.com",
+                    "homepage": "https://gjcampbell.co.uk/"
+                },
+                {
+                    "name": "Vance Lucas",
+                    "email": "vance@vancelucas.com",
+                    "homepage": "https://vancelucas.com/"
+                }
+            ],
+            "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
+            "keywords": [
+                "dotenv",
+                "env",
+                "environment"
+            ],
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-05-02T13:38:00+00:00"
+        },
+        {
+            "name": "webmozart/assert",
+            "version": "1.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webmozart/assert.git",
+                "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/ab2cb0b3b559010b75981b1bdce728da3ee90ad6",
+                "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0",
+                "symfony/polyfill-ctype": "^1.8"
+            },
+            "conflict": {
+                "vimeo/psalm": "<3.9.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.36 || ^7.5.13"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Webmozart\\Assert\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Assertions to validate method input/output with nice error messages.",
+            "keywords": [
+                "assert",
+                "check",
+                "validate"
+            ],
+            "time": "2020-04-18T12:12:48+00:00"
+        },
+        {
+            "name": "weew/helpers-array",
+            "version": "v1.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/weew/helpers-array.git",
+                "reference": "9bff63111f9765b4277750db8d276d92b3e16ed0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/weew/helpers-array/zipball/9bff63111f9765b4277750db8d276d92b3e16ed0",
+                "reference": "9bff63111f9765b4277750db8d276d92b3e16ed0",
+                "shasum": ""
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.7",
+                "satooshi/php-coveralls": "^0.6.1"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/array.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Maxim Kott",
+                    "email": "maximkott@gmail.com"
+                }
+            ],
+            "description": "Useful collection of php array helpers.",
+            "time": "2016-07-21T11:18:01+00:00"
+        }
+    ],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": {
+        "magento/composer": 20,
+        "magento/magento2-functional-testing-framework": 20
+    },
+    "prefer-stable": true,
+    "prefer-lowest": false,
+    "platform": {
+        "php": "~7.3.0||~7.4.0",
+        "ext-bcmath": "*",
+        "ext-ctype": "*",
+        "ext-curl": "*",
+        "ext-dom": "*",
+        "ext-gd": "*",
+        "ext-hash": "*",
+        "ext-iconv": "*",
+        "ext-intl": "*",
+        "ext-mbstring": "*",
+        "ext-openssl": "*",
+        "ext-pdo_mysql": "*",
+        "ext-simplexml": "*",
+        "ext-soap": "*",
+        "ext-xsl": "*",
+        "ext-zip": "*",
+        "lib-libxml": "*"
+    },
+    "platform-dev": [],
+    "plugin-api-version": "1.1.0"
+}

From 7dad27c0f1260ae5d22d3712e6af7dc911541e1c Mon Sep 17 00:00:00 2001
From: John Carlo Octabio <johncarlo@abovethefray.io>
Date: Tue, 9 Jun 2020 13:48:44 +0800
Subject: [PATCH 0403/1718] magento/magento2#108: Clear Shopping Cart -
 Refactor to fix Static Tests failed result

---
 app/code/Magento/Checkout/Block/Cart/Grid.php          |  8 +++++---
 .../Checkout/view/frontend/templates/cart/form.phtml   | 10 +++++-----
 .../Checkout/view/frontend/web/js/shopping-cart.js     |  4 ++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Checkout/Block/Cart/Grid.php b/app/code/Magento/Checkout/Block/Cart/Grid.php
index d03e7642ce8a4..ed70619b0a66c 100644
--- a/app/code/Magento/Checkout/Block/Cart/Grid.php
+++ b/app/code/Magento/Checkout/Block/Cart/Grid.php
@@ -107,7 +107,8 @@ protected function _construct()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @since 100.2.0
      */
     protected function _prepareLayout()
@@ -151,7 +152,8 @@ public function getItemsForGrid()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @since 100.2.0
      */
     public function getItems()
@@ -187,7 +189,7 @@ private function isPagerDisplayedOnPage()
      */
     public function isClearShoppingCartEnabled()
     {
-        return (bool) $this->_scopeConfig->getValue(
+        return (bool)$this->_scopeConfig->getValue(
             self::XPATH_CONFIG_ENABLE_CLEAR_SHOPPING_CART,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
index dc272d404f862..58c920011061b 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
@@ -20,7 +20,7 @@
           class="form form-cart">
     <?= $block->getBlockHtml('formkey') ?>
     <div class="cart table-wrapper<?= $mergedCells == 2 ? ' detailed' : '' ?>">
-        <?php if ($block->getPagerHtml()) :?>
+        <?php if ($block->getPagerHtml()): ?>
             <div class="cart-products-toolbar cart-products-toolbar-top toolbar"
                  data-attribute="cart-products-toolbar-top"><?= $block->getPagerHtml() ?>
             </div>
@@ -38,25 +38,25 @@
                     <th class="col subtotal" scope="col"><span><?= $block->escapeHtml(__('Subtotal')) ?></span></th>
                 </tr>
             </thead>
-            <?php foreach ($block->getItems() as $_item) :?>
+            <?php foreach ($block->getItems() as $_item): ?>
                 <?= $block->getItemHtml($_item) ?>
             <?php endforeach ?>
         </table>
-        <?php if ($block->getPagerHtml()) :?>
+        <?php if ($block->getPagerHtml()): ?>
             <div class="cart-products-toolbar cart-products-toolbar-bottom toolbar"
                  data-attribute="cart-products-toolbar-bottom"><?= $block->getPagerHtml() ?>
             </div>
         <?php endif ?>
     </div>
     <div class="cart main actions">
-        <?php if ($block->getContinueShoppingUrl()) :?>
+        <?php if ($block->getContinueShoppingUrl()): ?>
             <a class="action continue"
                href="<?= $block->escapeUrl($block->getContinueShoppingUrl()) ?>"
                title="<?= $block->escapeHtml(__('Continue Shopping')) ?>">
                 <span><?= $block->escapeHtml(__('Continue Shopping')) ?></span>
             </a>
         <?php endif; ?>
-        <?php if ($block->isClearShoppingCartEnabled()) :?>
+        <?php if ($block->isClearShoppingCartEnabled()): ?>
             <button type="button"
                     name="update_cart_action"
                     data-cart-empty=""
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js b/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
index fa754acb8c1f0..f5b9a87fd8dde 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
@@ -63,7 +63,7 @@ define([
          * Display confirmation modal for clearing the cart
          * @private
          */
-        _clearCartConfirmation: function() {
+        _clearCartConfirmation: function () {
             var self = this;
 
             confirm({
@@ -80,7 +80,7 @@ define([
          * Prepares the form and submit to clear the cart
          * @public
          */
-        clearCart: function() {
+        clearCart: function () {
             $(this.options.emptyCartButton).attr('name', 'update_cart_action_temp');
             $(this.options.updateCartActionContainer)
                 .attr('name', 'update_cart_action').attr('value', 'empty_cart');

From c1ba0e03377df6a27d1b4741ce7ed86c7a6c0ada Mon Sep 17 00:00:00 2001
From: John Carlo Octabio <johncarlo@abovethefray.io>
Date: Tue, 9 Jun 2020 18:50:53 +0800
Subject: [PATCH 0404/1718] magento/magento2#108: Clear Shopping Cart -
 Refactor to fix expected jsdoc-block in shopping-cart.js and fix Grid.php
 PHPdoc long description

---
 app/code/Magento/Checkout/Block/Cart/Grid.php                 | 4 ++--
 .../Magento/Checkout/view/frontend/web/js/shopping-cart.js    | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Checkout/Block/Cart/Grid.php b/app/code/Magento/Checkout/Block/Cart/Grid.php
index ed70619b0a66c..0ec5f33c4a656 100644
--- a/app/code/Magento/Checkout/Block/Cart/Grid.php
+++ b/app/code/Magento/Checkout/Block/Cart/Grid.php
@@ -165,8 +165,8 @@ public function getItems()
     }
 
     /**
-     * Verify if display pager on shopping cart
-     * If cart block has custom_items and items qty in the shopping cart<limit from stores configuration
+     * Verify if display pager on shopping cart if cart block has custom_items and items qty in the shopping cart<limit
+     * from stores configuration
      *
      * @return bool
      */
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js b/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
index f5b9a87fd8dde..b353bc911872c 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
@@ -69,6 +69,9 @@ define([
             confirm({
                 content: $.mage.__('Are you sure you want to remove all items from your shopping cart?'),
                 actions: {
+                    /**
+                     * Confirmation modal handler to execute clear cart action
+                     */
                     confirm: function () {
                         self.clearCart();
                     }

From 0051ec911cd5e02f964ea3c634737a44602edb9d Mon Sep 17 00:00:00 2001
From: John Carlo Octabio <johncarlo@abovethefray.io>
Date: Tue, 9 Jun 2020 18:57:11 +0800
Subject: [PATCH 0405/1718] magento/magento2#108: Clear Shopping Cart -
 Refactor _clearCartConfirmation to _confirmClearCart for a simple and concise
 function naming

---
 .../Magento/Checkout/view/frontend/web/js/shopping-cart.js    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js b/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
index b353bc911872c..97dff2f6fd47a 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js
@@ -17,7 +17,7 @@ define([
             var items, i, reload;
 
             $(this.options.emptyCartButton).on('click', $.proxy(function () {
-                this._clearCartConfirmation();
+                this._confirmClearCart();
             }, this));
             items = $.find('[data-role="cart-item-qty"]');
 
@@ -63,7 +63,7 @@ define([
          * Display confirmation modal for clearing the cart
          * @private
          */
-        _clearCartConfirmation: function () {
+        _confirmClearCart: function () {
             var self = this;
 
             confirm({

From a50dcf52d30d502ed85d0df51d49118c8a190216 Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Tue, 9 Jun 2020 12:05:22 +0300
Subject: [PATCH 0406/1718] refactoring

---
 app/code/Magento/ProductAlert/Model/Email.php | 11 +++++-----
 .../Magento/ProductAlert/Model/EmailTest.php  | 20 ++++++++++++-------
 .../second_store_with_second_identity.php     |  5 +++--
 ...nd_store_with_second_identity_rollback.php | 10 ++++++----
 4 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/app/code/Magento/ProductAlert/Model/Email.php b/app/code/Magento/ProductAlert/Model/Email.php
index 673f2c06b6e07..379ae29ef4649 100644
--- a/app/code/Magento/ProductAlert/Model/Email.php
+++ b/app/code/Magento/ProductAlert/Model/Email.php
@@ -1,9 +1,10 @@
 <?php
-
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\ProductAlert\Model;
 
 use Magento\Catalog\Model\Product;
@@ -206,7 +207,7 @@ public function getType()
      *
      * @return $this
      */
-    public function setWebsite(\Magento\Store\Model\Website $website)
+    public function setWebsite(Website $website)
     {
         $this->_website = $website;
         return $this;
@@ -275,7 +276,7 @@ public function clean()
      *
      * @return $this
      */
-    public function addPriceProduct(\Magento\Catalog\Model\Product $product)
+    public function addPriceProduct(Product $product)
     {
         $this->_priceProducts[$product->getId()] = $product;
         return $this;
@@ -288,7 +289,7 @@ public function addPriceProduct(\Magento\Catalog\Model\Product $product)
      *
      * @return $this
      */
-    public function addStockProduct(\Magento\Catalog\Model\Product $product)
+    public function addStockProduct(Product $product)
     {
         $this->_stockProducts[$product->getId()] = $product;
         return $this;
@@ -342,7 +343,7 @@ public function send()
             return false;
         }
 
-        $storeId = $this->getStoreId() ?: (int) $this->_customer->getStoreId();
+        $storeId = (int) $this->getStoreId() ?: (int) $this->_customer->getStoreId();
         $store = $this->getStore($storeId);
 
         $this->_appEmulation->startEnvironmentEmulation($storeId);
diff --git a/dev/tests/integration/testsuite/Magento/ProductAlert/Model/EmailTest.php b/dev/tests/integration/testsuite/Magento/ProductAlert/Model/EmailTest.php
index 8466cf700b5d4..94fe0e85a8ddf 100644
--- a/dev/tests/integration/testsuite/Magento/ProductAlert/Model/EmailTest.php
+++ b/dev/tests/integration/testsuite/Magento/ProductAlert/Model/EmailTest.php
@@ -3,18 +3,24 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\ProductAlert\Model;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Helper\View;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\MailException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Model\Website;
+use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Mail\Template\TransportBuilderMock;
+use Magento\TestFramework\ObjectManager;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Test for Magento\ProductAlert\Model\Email class.
@@ -22,7 +28,7 @@
  * @magentoAppIsolation enabled
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class EmailTest extends \PHPUnit\Framework\TestCase
+class EmailTest extends TestCase
 {
     /**
      * @var Email
@@ -30,7 +36,7 @@ class EmailTest extends \PHPUnit\Framework\TestCase
     protected $_emailModel;
 
     /**
-     * @var \Magento\TestFramework\ObjectManager
+     * @var ObjectManager
      */
     protected $_objectManager;
 
@@ -40,7 +46,7 @@ class EmailTest extends \PHPUnit\Framework\TestCase
     protected $customerAccountManagement;
 
     /**
-     * @var \Magento\Customer\Helper\View
+     * @var View
      */
     protected $_customerViewHelper;
 
@@ -64,11 +70,11 @@ class EmailTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp(): void
     {
-        $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->_objectManager = Bootstrap::getObjectManager();
         $this->customerAccountManagement = $this->_objectManager->create(
             AccountManagementInterface::class
         );
-        $this->_customerViewHelper = $this->_objectManager->create(\Magento\Customer\Helper\View::class);
+        $this->_customerViewHelper = $this->_objectManager->create(View::class);
         $this->transportBuilder = $this->_objectManager->get(TransportBuilderMock::class);
         $this->customerRepository = $this->_objectManager->create(CustomerRepositoryInterface::class);
         $this->productRepository = $this->_objectManager->create(ProductRepositoryInterface::class);
@@ -102,7 +108,7 @@ public function testSend($isCustomerIdUsed)
             $this->_emailModel->setCustomerData($customer);
         }
 
-        /** @var \Magento\Catalog\Model\Product $product */
+        /** @var Product $product */
         $product = $this->productRepository->getById(1);
 
         $this->_emailModel->addPriceProduct($product);
@@ -189,7 +195,7 @@ public function testScopedMessageIdentity()
         $customer = $this->customerRepository->getById(1);
         $this->_emailModel->setCustomerData($customer);
 
-        /** @var \Magento\Catalog\Model\Product $product */
+        /** @var Product $product */
         $product = $this->productRepository->getById(1);
 
         $this->_emailModel->addPriceProduct($product);
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/second_store_with_second_identity.php b/dev/tests/integration/testsuite/Magento/Store/_files/second_store_with_second_identity.php
index 3a4195a037f4d..495992a38c1fe 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/second_store_with_second_identity.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/second_store_with_second_identity.php
@@ -7,13 +7,14 @@
  */
 declare(strict_types=1);
 
-require_once __DIR__ . '/second_store.php';
-
 use Magento\Config\Model\ResourceModel\Config;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\Store;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Store/_files/second_store.php');
 
 $objectManager = Bootstrap::getObjectManager();
 $store = $objectManager->create(Store::class);
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/second_store_with_second_identity_rollback.php b/dev/tests/integration/testsuite/Magento/Store/_files/second_store_with_second_identity_rollback.php
index 5926f3af0573e..6769a640a13d1 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/second_store_with_second_identity_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/second_store_with_second_identity_rollback.php
@@ -1,20 +1,22 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 declare(strict_types=1);
 
+use Magento\Config\Model\ResourceModel\Config;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\Store;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
 $objectManager = Bootstrap::getObjectManager();
-$store = $objectManager->create(\Magento\Store\Model\Store::class);
+$store = $objectManager->create(Store::class);
 $storeId = $store->load('fixture_second_store', 'code')->getId();
 
 if ($storeId) {
-    $configResource = $objectManager->get(\Magento\Config\Model\ResourceModel\Config::class);
+    $configResource = $objectManager->get(Config::class);
     $configResource->deleteConfig(
         'trans_email/ident_general/name',
         ScopeInterface::SCOPE_STORES,
@@ -27,4 +29,4 @@
     );
 }
 
-require_once __DIR__ . '/second_store_rollback.php';
+Resolver::getInstance()->requireDataFixture('Magento/Store/_files/second_store_rollback.php');

From a6049d55f20ffa75f25312b4e07554d8dd9616b1 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Tue, 9 Jun 2020 16:38:53 +0300
Subject: [PATCH 0407/1718] fix issue with null config value

---
 .../Console/Command/ConfigShowCommand.php     |  42 +++--
 .../Config/Source/RuntimeConfigSourceTest.php |   1 +
 .../Console/Command/ConfigShowCommandTest.php | 143 ++++++++++++++----
 3 files changed, 146 insertions(+), 40 deletions(-)

diff --git a/app/code/Magento/Config/Console/Command/ConfigShowCommand.php b/app/code/Magento/Config/Console/Command/ConfigShowCommand.php
index cae5a7dafd589..4e90d717af101 100644
--- a/app/code/Magento/Config/Console/Command/ConfigShowCommand.php
+++ b/app/code/Magento/Config/Console/Command/ConfigShowCommand.php
@@ -16,6 +16,8 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Config\Model\Config\PathValidatorFactory;
 
 /**
  * Command provides possibility to show saved system configuration.
@@ -78,24 +80,42 @@ class ConfigShowCommand extends Command
      */
     private $inputPath;
 
+    /**
+     * @var PathValidatorFactory
+     */
+    private $pathValidatorFactory;
+
+    /**
+     * @var EmulatedAdminhtmlAreaProcessor
+     */
+    private $emulatedAreaProcessor;
+
     /**
      * @param ValidatorInterface $scopeValidator
      * @param ConfigSourceInterface $configSource
      * @param ConfigPathResolver $pathResolver
      * @param ValueProcessor $valueProcessor
+     * @param PathValidatorFactory|null $pathValidatorFactory
+     * @param EmulatedAdminhtmlAreaProcessor|null $emulatedAreaProcessor
      * @internal param ScopeConfigInterface $appConfig
      */
     public function __construct(
         ValidatorInterface $scopeValidator,
         ConfigSourceInterface $configSource,
         ConfigPathResolver $pathResolver,
-        ValueProcessor $valueProcessor
+        ValueProcessor $valueProcessor,
+        ?PathValidatorFactory $pathValidatorFactory = null,
+        ?EmulatedAdminhtmlAreaProcessor $emulatedAreaProcessor = null
     ) {
         parent::__construct();
         $this->scopeValidator = $scopeValidator;
         $this->configSource = $configSource;
         $this->pathResolver = $pathResolver;
         $this->valueProcessor = $valueProcessor;
+        $this->pathValidatorFactory = $pathValidatorFactory
+            ?: ObjectManager::getInstance()->get(PathValidatorFactory::class);
+        $this->emulatedAreaProcessor = $emulatedAreaProcessor
+            ?: ObjectManager::getInstance()->get(EmulatedAdminhtmlAreaProcessor::class);
     }
 
     /**
@@ -146,17 +166,17 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $this->scopeCode = $input->getOption(self::INPUT_OPTION_SCOPE_CODE);
             $this->inputPath = trim($input->getArgument(self::INPUT_ARGUMENT_PATH), '/');
 
-            $this->scopeValidator->isValid($this->scope, $this->scopeCode);
-            $configPath = $this->pathResolver->resolve($this->inputPath, $this->scope, $this->scopeCode);
-            $configValue = $this->configSource->get($configPath);
+            $configValue = $this->emulatedAreaProcessor->process(function () {
+                $this->scopeValidator->isValid($this->scope, $this->scopeCode);
+                if ($this->inputPath) {
+                    $pathValidator = $this->pathValidatorFactory->create();
+                    $pathValidator->validate($this->inputPath);
+                }
 
-            if ($configValue === null) {
-                $output->writeln(sprintf(
-                    '<error>%s</error>',
-                    __('Configuration for path: "%1" doesn\'t exist', $this->inputPath)->render()
-                ));
-                return Cli::RETURN_FAILURE;
-            }
+                $configPath = $this->pathResolver->resolve($this->inputPath, $this->scope, $this->scopeCode);
+
+                return $this->configSource->get($configPath);
+            });
 
             $this->outputResult($output, $configValue, $this->inputPath);
             return Cli::RETURN_SUCCESS;
diff --git a/app/code/Magento/Config/Test/Unit/App/Config/Source/RuntimeConfigSourceTest.php b/app/code/Magento/Config/Test/Unit/App/Config/Source/RuntimeConfigSourceTest.php
index d246ebd6bbaa4..a16208c0e61b0 100644
--- a/app/code/Magento/Config/Test/Unit/App/Config/Source/RuntimeConfigSourceTest.php
+++ b/app/code/Magento/Config/Test/Unit/App/Config/Source/RuntimeConfigSourceTest.php
@@ -262,6 +262,7 @@ public function configDataProvider(): array
         return [
             'config value 0' => ['default/test/option', ['test' => ['option' => 0]], '0'],
             'config value blank' => ['default/test/option', ['test' => ['option' => '']], ''],
+            'config value null' => ['default/test/option', ['test' => ['option' => null]], ''],
         ];
     }
 }
diff --git a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigShowCommandTest.php b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigShowCommandTest.php
index 59511d9a947ab..dc3db6ab926f7 100644
--- a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigShowCommandTest.php
+++ b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigShowCommandTest.php
@@ -3,23 +3,41 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 declare(strict_types=1);
 
 namespace Magento\Config\Test\Unit\Console\Command;
 
 use Magento\Config\Console\Command\ConfigShow\ValueProcessor;
 use Magento\Config\Console\Command\ConfigShowCommand;
+use Magento\Config\Console\Command\EmulatedAdminhtmlAreaProcessor;
 use Magento\Framework\App\Config\ConfigPathResolver;
 use Magento\Framework\App\Config\ConfigSourceInterface;
 use Magento\Framework\App\Scope\ValidatorInterface;
 use Magento\Framework\Console\Cli;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Config\Model\Config\PathValidatorFactory;
+use Magento\Config\Model\Config\PathValidator;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Tester\CommandTester;
 
+/**
+ * Test for \Magento\Config\Console\Command\ConfigShowCommand.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class ConfigShowCommandTest extends TestCase
 {
+    private const CONFIG_PATH = 'some/config/path';
+    private const SCOPE = 'some/config/path';
+    private const SCOPE_CODE = 'someScopeCode';
+
+    /**
+     * @var ConfigShowCommand
+     */
+    private $model;
+
     /**
      * @var ValidatorInterface|MockObject
      */
@@ -41,12 +59,22 @@ class ConfigShowCommandTest extends TestCase
     private $pathResolverMock;
 
     /**
-     * @var ConfigShowCommand
+     * @var EmulatedAdminhtmlAreaProcessor|MockObject
+     */
+    private $emulatedAreProcessorMock;
+
+    /**
+     * @var PathValidator|MockObject
      */
-    private $command;
+    private $pathValidatorMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp(): void
     {
+        $objectManager = new ObjectManager($this);
+
         $this->valueProcessorMock = $this->getMockBuilder(ValueProcessor::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -57,29 +85,49 @@ protected function setUp(): void
             ->getMockForAbstractClass();
         $this->configSourceMock = $this->getMockBuilder(ConfigSourceInterface::class)
             ->getMockForAbstractClass();
+        $this->pathValidatorMock = $this->getMockBuilder(PathValidator::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $pathValidatorFactoryMock = $this->getMockBuilder(PathValidatorFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $pathValidatorFactoryMock->expects($this->atMost(1))
+            ->method('create')
+            ->willReturn($this->pathValidatorMock);
 
-        $this->command = new ConfigShowCommand(
-            $this->scopeValidatorMock,
-            $this->configSourceMock,
-            $this->pathResolverMock,
-            $this->valueProcessorMock
+        $this->emulatedAreProcessorMock = $this->getMockBuilder(EmulatedAdminhtmlAreaProcessor::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->model = $objectManager->getObject(
+            ConfigShowCommand::class,
+            [
+                'scopeValidator' => $this->scopeValidatorMock,
+                'configSource' => $this->configSourceMock,
+                'pathResolver' => $this->pathResolverMock,
+                'valueProcessor' => $this->valueProcessorMock,
+                'pathValidatorFactory' => $pathValidatorFactoryMock,
+                'emulatedAreaProcessor' => $this->emulatedAreProcessorMock,
+            ]
         );
     }
 
-    public function testExecute()
+    /**
+     * Test get config value
+     *
+     * @return void
+     */
+    public function testExecute(): void
     {
-        $configPath = 'some/config/path';
         $resolvedConfigPath = 'someScope/someScopeCode/some/config/path';
-        $scope = 'someScope';
-        $scopeCode = 'someScopeCode';
 
         $this->scopeValidatorMock->expects($this->once())
             ->method('isValid')
-            ->with($scope, $scopeCode)
+            ->with(self::SCOPE, self::SCOPE_CODE)
             ->willReturn(true);
         $this->pathResolverMock->expects($this->once())
             ->method('resolve')
-            ->with($configPath, $scope, $scopeCode)
+            ->with(self::CONFIG_PATH, self::SCOPE, self::SCOPE_CODE)
             ->willReturn($resolvedConfigPath);
         $this->configSourceMock->expects($this->once())
             ->method('get')
@@ -87,10 +135,19 @@ public function testExecute()
             ->willReturn('someValue');
         $this->valueProcessorMock->expects($this->once())
             ->method('process')
-            ->with($scope, $scopeCode, 'someValue', $configPath)
+            ->with(self::SCOPE, self::SCOPE_CODE, 'someValue', self::CONFIG_PATH)
             ->willReturn('someProcessedValue');
-
-        $tester = $this->getConfigShowCommandTester($configPath, $scope, $scopeCode);
+        $this->emulatedAreProcessorMock->expects($this->once())
+            ->method('process')
+            ->willReturnCallback(function ($function) {
+                return $function();
+            });
+
+        $tester = $this->getConfigShowCommandTester(
+            self::CONFIG_PATH,
+            self::SCOPE,
+            self::SCOPE_CODE
+        );
 
         $this->assertEquals(
             Cli::RETURN_SUCCESS,
@@ -102,18 +159,28 @@ public function testExecute()
         );
     }
 
-    public function testNotValidScopeOrScopeCode()
+    /**
+     * Test not valid scope or scope code
+     *
+     * @return void
+     */
+    public function testNotValidScopeOrScopeCode(): void
     {
-        $configPath = 'some/config/path';
-        $scope = 'someScope';
-        $scopeCode = 'someScopeCode';
-
         $this->scopeValidatorMock->expects($this->once())
             ->method('isValid')
-            ->with($scope, $scopeCode)
+            ->with(self::SCOPE, self::SCOPE_CODE)
             ->willThrowException(new LocalizedException(__('error message')));
-
-        $tester = $this->getConfigShowCommandTester($configPath, $scope, $scopeCode);
+        $this->emulatedAreProcessorMock->expects($this->once())
+            ->method('process')
+            ->willReturnCallback(function ($function) {
+                return $function();
+            });
+
+        $tester = $this->getConfigShowCommandTester(
+            self::CONFIG_PATH,
+            self::SCOPE,
+            self::SCOPE_CODE
+        );
 
         $this->assertEquals(
             Cli::RETURN_FAILURE,
@@ -125,17 +192,35 @@ public function testNotValidScopeOrScopeCode()
         );
     }
 
-    public function testConfigPathNotExist()
+    /**
+     * Test get config value for not existed path.
+     *
+     * @return void
+     */
+    public function testConfigPathNotExist(): void
     {
-        $configPath = 'some/path';
-        $tester = $this->getConfigShowCommandTester($configPath);
+        $exception = new LocalizedException(
+            __('The  "%1" path doesn\'t exist. Verify and try again.', self::CONFIG_PATH)
+        );
+
+        $this->pathValidatorMock->expects($this->once())
+            ->method('validate')
+            ->with(self::CONFIG_PATH)
+            ->willThrowException($exception);
+        $this->emulatedAreProcessorMock->expects($this->once())
+            ->method('process')
+            ->willReturnCallback(function ($function) {
+                return $function();
+            });
+
+        $tester = $this->getConfigShowCommandTester(self::CONFIG_PATH);
 
         $this->assertEquals(
             Cli::RETURN_FAILURE,
             $tester->getStatusCode()
         );
         $this->assertStringContainsString(
-            __('Configuration for path: "%1" doesn\'t exist', $configPath)->render(),
+            __('The  "%1" path doesn\'t exist. Verify and try again.', self::CONFIG_PATH)->render(),
             $tester->getDisplay()
         );
     }
@@ -159,7 +244,7 @@ private function getConfigShowCommandTester($configPath, $scope = null, $scopeCo
             $arguments['--' . ConfigShowCommand::INPUT_OPTION_SCOPE_CODE] = $scopeCode;
         }
 
-        $tester = new CommandTester($this->command);
+        $tester = new CommandTester($this->model);
         $tester->execute($arguments);
 
         return $tester;

From 0973b2e5dd77d1ba0cbd316a5e448c49d0af8cd9 Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Tue, 9 Jun 2020 09:45:36 -0500
Subject: [PATCH 0408/1718] MC-33857: Update AdapterInterface::fetchRow return
 type

---
 dev/tests/api-functional/phpunit_graphql.xml.dist | 2 +-
 dev/tests/api-functional/phpunit_rest.xml.dist    | 6 +++---
 dev/tests/api-functional/phpunit_soap.xml.dist    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev/tests/api-functional/phpunit_graphql.xml.dist b/dev/tests/api-functional/phpunit_graphql.xml.dist
index aa1899d88f48e..b9f38daddb3a6 100644
--- a/dev/tests/api-functional/phpunit_graphql.xml.dist
+++ b/dev/tests/api-functional/phpunit_graphql.xml.dist
@@ -8,7 +8,7 @@
  */
 -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.2/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.1/phpunit.xsd"
          colors="true"
          columns="max"
          beStrictAboutTestsThatDoNotTestAnything="false"
diff --git a/dev/tests/api-functional/phpunit_rest.xml.dist b/dev/tests/api-functional/phpunit_rest.xml.dist
index c5173e5dd432e..f6c0d49a93853 100644
--- a/dev/tests/api-functional/phpunit_rest.xml.dist
+++ b/dev/tests/api-functional/phpunit_rest.xml.dist
@@ -8,7 +8,7 @@
  */
 -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.2/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.1/phpunit.xsd"
          colors="true"
          columns="max"
          beStrictAboutTestsThatDoNotTestAnything="false"
@@ -17,9 +17,9 @@
     <!-- Test suites definition -->
     <testsuites>
         <testsuite name="Magento REST web API functional tests">
-            <directory suffix="Test.php">testsuite</directory>
+            <directory>testsuite</directory>
+            <directory>../../../app/code/*/*/Test/Api</directory>
             <exclude>testsuite/Magento/GraphQl</exclude>
-            <directory suffix="Test.php">../../../app/code/*/*/Test/Api</directory>
         </testsuite>
     </testsuites>
 
diff --git a/dev/tests/api-functional/phpunit_soap.xml.dist b/dev/tests/api-functional/phpunit_soap.xml.dist
index 935f5113b67a7..743a82d72c9e3 100644
--- a/dev/tests/api-functional/phpunit_soap.xml.dist
+++ b/dev/tests/api-functional/phpunit_soap.xml.dist
@@ -8,7 +8,7 @@
  */
 -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.2/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.1/phpunit.xsd"
          colors="true"
          columns="max"
          beStrictAboutTestsThatDoNotTestAnything="false"

From 3337da2decf2549ac96e9cc524c37c42d3adf2f9 Mon Sep 17 00:00:00 2001
From: Tu Nguyen <tuna@ecommage.com>
Date: Tue, 9 Jun 2020 22:05:57 +0700
Subject: [PATCH 0409/1718] Improve html markup thumbnail image

---
 .../Ui/view/base/web/templates/grid/cells/thumbnail.html    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/cells/thumbnail.html b/app/code/Magento/Ui/view/base/web/templates/grid/cells/thumbnail.html
index 705becce75a0a..25f26813d6eaa 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/cells/thumbnail.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/cells/thumbnail.html
@@ -4,4 +4,8 @@
  * See COPYING.txt for license details.
  */
 -->
-<img class="admin__control-thumbnail" attr="src: $col.getSrc($row()), alt: $col.getAlt($row())"/>
+<span class="thumbnail-container">
+    <span class="thumbnail-wrapper">
+        <img class="admin__control-thumbnail" attr="src: $col.getSrc($row()), alt: $col.getAlt($row())"/>
+    </span>
+</span>

From fcb1bd10a67318a9d4ef5e8c8a4d88ee93c5ca45 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Tue, 9 Jun 2020 13:22:47 -0500
Subject: [PATCH 0410/1718] MC-34764: Fix performance degradation cause by CSP

---
 .../catalog/product/composite/configure.phtml | 27 ++++++++++++++-----
 .../templates/order/create/data.phtml         |  2 +-
 .../templates/product/layered/renderer.phtml  |  4 +--
 .../View/Helper/SecureHtmlRenderer.php        |  8 +++---
 4 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
index d8a278f24d616..d04eb300746ac 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
@@ -45,13 +45,26 @@
         prodCompConfIframe.style.position = "absolute";
         prodCompConfIframe.style.top = "-1000px";
         prodCompConfIframe.style.left = "-1000px";
-        document.querySelectorAll(".product_composite_configure_messages").forEach((e) => e.style.display = "none");
-        document.querySelectorAll(".product_composite_configure_form_additional")
-            .forEach((e) => e.style.display = "none");
-        document.querySelectorAll(".product_composite_configure_form_confirmed")
-            .forEach((e) => e.style.display = "none");
-        document.querySelectorAll(".product_composite_configure_confirmed").forEach((e) => e.style.display = "none");
-        document.querySelectorAll(".product-configure-popup").forEach((e) => e.style.display = "none");
+        prodCompConfMessages = document.querySelectorAll(".product_composite_configure_messages");
+        for (var i = 0; i < prodCompConfMessages.length; i++) {
+            prodCompConfMessages[i].style.display = "none";
+        }
+        prodCompConfFormAdd = document.querySelectorAll(".product_composite_configure_form_additional");
+        for (var i = 0; i < prodCompConfFormAdd.length; i++) {
+            prodCompConfFormAdd[i].style.display = "none";
+        }
+        prodCompConfFormConf = document.querySelectorAll(".product_composite_configure_form_confirmed");
+        for (var i = 0; i < prodCompConfFormConf.length; i++) {
+            prodCompConfFormConf[i].style.display = "none";
+        }
+        prodCompConfConf = document.querySelectorAll(".product_composite_configure_confirmed");
+        for (var i = 0; i < prodCompConfConf.length; i++) {
+            prodCompConfConf[i].style.display = "none";
+        }
+        prodConfPopup = document.querySelectorAll(".product-configure-popup");
+        for (var i = 0; i < prodConfPopup.length; i++) {
+            prodConfPopup[i].style.display = "none";
+        }
 
         require([
             "jquery",
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml
index afa08c32773ed..ced1ea5e7b73a 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml
@@ -31,7 +31,7 @@ script;
         <?= /* @noEscape */ $secureRenderer->renderTag(
             'script',
             [],
-            "let elemOrderSearch = document.querySelector('div#order-search');
+            "var elemOrderSearch = document.querySelector('div#order-search');
             if (elemOrderSearch) {
                 elemOrderSearch.style.display = 'none';
                 elemOrderSearch.classList.remove('no-display');
diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
index e4c60951ddc89..bae3820042de0 100644
--- a/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
+++ b/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
@@ -55,7 +55,7 @@
                             </div>
                             <?php
                             $element = 'swatchImageOption' .$escaper->escapeJs($option);
-                            $script = 'let ' .$element
+                            $script = 'var ' .$element
                                 .' = document.querySelector(\'div[data-option-id="' .$escaper->escapeJs($option)
                                 .'"]\');' .PHP_EOL;
                             $script .= $element .'.style.background = "url(\''
@@ -81,7 +81,7 @@
                             $backgroundValue = $escaper->escapeJs(
                                 str_replace('\'', '\\\'', $swatchData['swatches'][$option]['value'])
                             );
-                            $script = 'let ' .$element
+                            $script = 'var ' .$element
                                 .' = document.querySelector(\'div[data-option-id="' .$escaper->escapeJs($option)
                                 .'"]\');' .PHP_EOL;
                             $script .= $element .'.style.background = "' .$backgroundValue
diff --git a/lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php b/lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php
index 4c9bdaa5a68d4..ae8ab3f15bc96 100644
--- a/lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php
+++ b/lib/internal/Magento/Framework/View/Helper/SecureHtmlRenderer.php
@@ -111,10 +111,10 @@ public function renderEventListenerAsTag(
             function {$listenerFunction} () {
                 {$attributeJavascript};
             }
-            let {$elementName} = document.querySelector("{$elementSelector}");
+            var {$elementName} = document.querySelector("{$elementSelector}");
             if ({$elementName}) {
-                {$elementName}.{$eventName} = (event) => {
-                    let targetElement = {$elementName};
+                {$elementName}.{$eventName} = function (event) {
+                    var targetElement = {$elementName};
                     if (event && event.target) {
                         targetElement = event.target;
                     }
@@ -161,7 +161,7 @@ public function renderStyleAsTag(string $style, string $selector): string
         return $this->renderTag(
             'script',
             ['type' => 'text/javascript'],
-            "let $elementVariable = document.querySelector('$selector');\n"
+            "var $elementVariable = document.querySelector('$selector');\n"
             ."if ($elementVariable) {\n{$stylesAssignments}}",
             false
         );

From e1a484c25f6f898ff0f31a4606b4aa1597f2ef87 Mon Sep 17 00:00:00 2001
From: Iryna Lagno <ilagno@adobe.com>
Date: Tue, 9 Jun 2020 13:54:52 -0500
Subject: [PATCH 0411/1718] MC-35039: Update Elasticsearch dependencies for
 2.4.0

---
 app/code/Magento/Elasticsearch/composer.json  |   2 +-
 .../System/Config/TestConnection.php          |   1 +
 .../FieldName/Resolver/DefaultResolver.php    |   2 +
 .../Model/Client/Elasticsearch.php            |   2 +
 app/code/Magento/Elasticsearch6/composer.json |   2 +-
 app/code/Magento/Elasticsearch6/etc/di.xml    |   2 +-
 app/code/Magento/Elasticsearch7/composer.json |   2 +-
 composer.json                                 |   2 +-
 composer.lock                                 | 638 ++++++++++++------
 .../testFromCreateProject/composer.lock       |   6 +-
 .../_files/testSkeleton/composer.lock         |   6 +-
 11 files changed, 457 insertions(+), 208 deletions(-)

diff --git a/app/code/Magento/Elasticsearch/composer.json b/app/code/Magento/Elasticsearch/composer.json
index 386bb1af298bb..8527991f354d9 100644
--- a/app/code/Magento/Elasticsearch/composer.json
+++ b/app/code/Magento/Elasticsearch/composer.json
@@ -12,7 +12,7 @@
         "magento/module-store": "*",
         "magento/module-catalog-inventory": "*",
         "magento/framework": "*",
-        "elasticsearch/elasticsearch": "~7.6"
+        "elasticsearch/elasticsearch": "7.6.*"
     },
     "suggest": {
         "magento/module-config": "*"
diff --git a/app/code/Magento/Elasticsearch6/Block/Adminhtml/System/Config/TestConnection.php b/app/code/Magento/Elasticsearch6/Block/Adminhtml/System/Config/TestConnection.php
index 1b17db1a00f6e..c192b43bdc081 100644
--- a/app/code/Magento/Elasticsearch6/Block/Adminhtml/System/Config/TestConnection.php
+++ b/app/code/Magento/Elasticsearch6/Block/Adminhtml/System/Config/TestConnection.php
@@ -7,6 +7,7 @@
 
 /**
  * Elasticsearch 6.x test connection block
+ * @deprecated the new minor release supports compatibility with Elasticsearch 7
  */
 class TestConnection extends \Magento\AdvancedSearch\Block\Adminhtml\System\Config\TestConnection
 {
diff --git a/app/code/Magento/Elasticsearch6/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolver.php b/app/code/Magento/Elasticsearch6/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolver.php
index 7532927f1dc85..cc8f69e92a858 100644
--- a/app/code/Magento/Elasticsearch6/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolver.php
+++ b/app/code/Magento/Elasticsearch6/Model/Adapter/FieldMapper/Product/FieldProvider/FieldName/Resolver/DefaultResolver.php
@@ -12,6 +12,8 @@
 
 /**
  * Default name resolver.
+ *
+ * @deprecated the new minor release supports compatibility with Elasticsearch 7
  */
 class DefaultResolver extends Base
 {
diff --git a/app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php b/app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php
index 2c1c283c5b24d..20ce70a4eba4c 100644
--- a/app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php
+++ b/app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php
@@ -11,6 +11,8 @@
 
 /**
  * Elasticsearch client
+ *
+ * @deprecated the new minor release supports compatibility with Elasticsearch 7
  */
 class Elasticsearch implements ClientInterface
 {
diff --git a/app/code/Magento/Elasticsearch6/composer.json b/app/code/Magento/Elasticsearch6/composer.json
index 36297b03198e2..c3b32ba043345 100644
--- a/app/code/Magento/Elasticsearch6/composer.json
+++ b/app/code/Magento/Elasticsearch6/composer.json
@@ -8,7 +8,7 @@
         "magento/module-catalog-search": "*",
         "magento/module-search": "*",
         "magento/module-elasticsearch": "*",
-        "elasticsearch/elasticsearch": "~7.6"
+        "elasticsearch/elasticsearch": "7.6.*"
     },
     "suggest": {
         "magento/module-config": "*"
diff --git a/app/code/Magento/Elasticsearch6/etc/di.xml b/app/code/Magento/Elasticsearch6/etc/di.xml
index 7263ae01f0f6d..e60f331f9ee8d 100644
--- a/app/code/Magento/Elasticsearch6/etc/di.xml
+++ b/app/code/Magento/Elasticsearch6/etc/di.xml
@@ -17,7 +17,7 @@
     <type name="Magento\Search\Model\Adminhtml\System\Config\Source\Engine">
         <arguments>
             <argument name="engines" xsi:type="array">
-                <item sortOrder="20" name="elasticsearch6" xsi:type="string">Elasticsearch 6.x</item>
+                <item sortOrder="20" name="elasticsearch6" xsi:type="string">Elasticsearch 6.x (Deprecated)</item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/Elasticsearch7/composer.json b/app/code/Magento/Elasticsearch7/composer.json
index 739ac1019c5ae..92074f9bc0de6 100644
--- a/app/code/Magento/Elasticsearch7/composer.json
+++ b/app/code/Magento/Elasticsearch7/composer.json
@@ -5,7 +5,7 @@
         "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-elasticsearch": "*",
-        "elasticsearch/elasticsearch": "~7.6",
+        "elasticsearch/elasticsearch": "7.6.*",
         "magento/module-advanced-search": "*",
         "magento/module-catalog-search": "*"
     },
diff --git a/composer.json b/composer.json
index d487ad5975040..f3bb73bac082e 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
         "colinmollenhour/credis": "1.11.1",
         "colinmollenhour/php-redis-session-abstract": "~1.4.0",
         "composer/composer": "^1.9",
-        "elasticsearch/elasticsearch": "~7.6",
+        "elasticsearch/elasticsearch": "7.6.*",
         "guzzlehttp/guzzle": "^6.3.3",
         "laminas/laminas-captcha": "^2.7.1",
         "laminas/laminas-code": "~3.4.1",
diff --git a/composer.lock b/composer.lock
index 6a47e7e44ab69..fc5c02b02a68f 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": "e86af25d9a4a1942c437cca58f9f1efb",
+    "content-hash": "5f3c699b683c0423f6320bb81c7b8dc4",
     "packages": [
         {
             "name": "colinmollenhour/cache-backend-file",
@@ -220,16 +220,16 @@
         },
         {
             "name": "composer/composer",
-            "version": "1.10.6",
+            "version": "1.10.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/composer.git",
-                "reference": "be81b9c4735362c26876bdbfd3b5bc7e7f711c88"
+                "reference": "956608ea4f7de9e58c53dfb019d85ae62b193c39"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/be81b9c4735362c26876bdbfd3b5bc7e7f711c88",
-                "reference": "be81b9c4735362c26876bdbfd3b5bc7e7f711c88",
+                "url": "https://api.github.com/repos/composer/composer/zipball/956608ea4f7de9e58c53dfb019d85ae62b193c39",
+                "reference": "956608ea4f7de9e58c53dfb019d85ae62b193c39",
                 "shasum": ""
             },
             "require": {
@@ -237,7 +237,7 @@
                 "composer/semver": "^1.0",
                 "composer/spdx-licenses": "^1.2",
                 "composer/xdebug-handler": "^1.1",
-                "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
+                "justinrainbow/json-schema": "^5.2.10",
                 "php": "^5.3.2 || ^7.0",
                 "psr/log": "^1.0",
                 "seld/jsonlint": "^1.4",
@@ -302,12 +302,16 @@
                     "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-05-06T08:28:10+00:00"
+            "time": "2020-06-03T08:03:56+00:00"
         },
         {
             "name": "composer/semver",
@@ -432,16 +436,16 @@
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "1.4.1",
+            "version": "1.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "1ab9842d69e64fb3a01be6b656501032d1b78cb7"
+                "reference": "fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/1ab9842d69e64fb3a01be6b656501032d1b78cb7",
-                "reference": "1ab9842d69e64fb3a01be6b656501032d1b78cb7",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51",
+                "reference": "fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51",
                 "shasum": ""
             },
             "require": {
@@ -476,9 +480,17 @@
                 {
                     "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-03-01T12:26:26+00:00"
+            "time": "2020-06-04T11:16:35+00:00"
         },
         {
             "name": "container-interop/container-interop",
@@ -514,16 +526,16 @@
         },
         {
             "name": "elasticsearch/elasticsearch",
-            "version": "v7.7.0",
+            "version": "v7.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/elastic/elasticsearch-php.git",
-                "reference": "1d90a7ff4fb1936dc4376f09d723af75714f6f05"
+                "reference": "d4f24bc43c2af60aece3df20eb689d322f9c8acf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/1d90a7ff4fb1936dc4376f09d723af75714f6f05",
-                "reference": "1d90a7ff4fb1936dc4376f09d723af75714f6f05",
+                "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/d4f24bc43c2af60aece3df20eb689d322f9c8acf",
+                "reference": "d4f24bc43c2af60aece3df20eb689d322f9c8acf",
                 "shasum": ""
             },
             "require": {
@@ -573,7 +585,7 @@
                 "elasticsearch",
                 "search"
             ],
-            "time": "2020-05-13T15:19:26+00:00"
+            "time": "2020-02-15T00:09:00+00:00"
         },
         {
             "name": "ezimuel/guzzlestreams",
@@ -678,16 +690,16 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "6.5.3",
+            "version": "6.5.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e"
+                "reference": "a4a1b6930528a8f7ee03518e6442ec7a44155d9d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/aab4ebd862aa7d04f01a4b51849d657db56d882e",
-                "reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/a4a1b6930528a8f7ee03518e6442ec7a44155d9d",
+                "reference": "a4a1b6930528a8f7ee03518e6442ec7a44155d9d",
                 "shasum": ""
             },
             "require": {
@@ -695,7 +707,7 @@
                 "guzzlehttp/promises": "^1.0",
                 "guzzlehttp/psr7": "^1.6.1",
                 "php": ">=5.5",
-                "symfony/polyfill-intl-idn": "^1.11"
+                "symfony/polyfill-intl-idn": "1.17.0"
             },
             "require-dev": {
                 "ext-curl": "*",
@@ -741,7 +753,7 @@
                 "rest",
                 "web service"
             ],
-            "time": "2020-04-18T10:38:46+00:00"
+            "time": "2020-05-25T19:35:05+00:00"
         },
         {
             "name": "guzzlehttp/promises",
@@ -867,16 +879,16 @@
         },
         {
             "name": "justinrainbow/json-schema",
-            "version": "5.2.9",
+            "version": "5.2.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/justinrainbow/json-schema.git",
-                "reference": "44c6787311242a979fa15c704327c20e7221a0e4"
+                "reference": "2ba9c8c862ecd5510ed16c6340aa9f6eadb4f31b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/44c6787311242a979fa15c704327c20e7221a0e4",
-                "reference": "44c6787311242a979fa15c704327c20e7221a0e4",
+                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/2ba9c8c862ecd5510ed16c6340aa9f6eadb4f31b",
+                "reference": "2ba9c8c862ecd5510ed16c6340aa9f6eadb4f31b",
                 "shasum": ""
             },
             "require": {
@@ -929,7 +941,7 @@
                 "json",
                 "schema"
             ],
-            "time": "2019-09-25T14:49:45+00:00"
+            "time": "2020-05-27T16:41:55+00:00"
         },
         {
             "name": "laminas/laminas-captcha",
@@ -4223,11 +4235,6 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Ben Ramsey",
-                    "email": "ben@benramsey.com",
-                    "homepage": "https://benramsey.com"
-                },
                 {
                     "name": "Marijn Huizendveld",
                     "email": "marijn.huizendveld@gmail.com"
@@ -4235,6 +4242,11 @@
                 {
                     "name": "Thibaud Fabre",
                     "email": "thibaud@aztech.io"
+                },
+                {
+                    "name": "Ben Ramsey",
+                    "email": "ben@benramsey.com",
+                    "homepage": "https://benramsey.com"
                 }
             ],
             "description": "Formerly rhumsaa/uuid. A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).",
@@ -4397,22 +4409,23 @@
         },
         {
             "name": "symfony/console",
-            "version": "v4.4.8",
+            "version": "v4.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "10bb3ee3c97308869d53b3e3d03f6ac23ff985f7"
+                "reference": "326b064d804043005526f5a0494cfb49edb59bb0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/10bb3ee3c97308869d53b3e3d03f6ac23ff985f7",
-                "reference": "10bb3ee3c97308869d53b3e3d03f6ac23ff985f7",
+                "url": "https://api.github.com/repos/symfony/console/zipball/326b064d804043005526f5a0494cfb49edb59bb0",
+                "reference": "326b064d804043005526f5a0494cfb49edb59bb0",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3",
+                "php": ">=7.1.3",
                 "symfony/polyfill-mbstring": "~1.0",
                 "symfony/polyfill-php73": "^1.8",
+                "symfony/polyfill-php80": "^1.15",
                 "symfony/service-contracts": "^1.1|^2"
             },
             "conflict": {
@@ -4483,29 +4496,29 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-03-30T11:41:10+00:00"
+            "time": "2020-05-30T20:06:45+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v5.0.8",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "5f8d5271303dad260692ba73dfa21777d38e124e"
+                "reference": "e544e24472d4c97b2d11ade7caacd446727c6bf9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/5f8d5271303dad260692ba73dfa21777d38e124e",
-                "reference": "5f8d5271303dad260692ba73dfa21777d38e124e",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/e544e24472d4c97b2d11ade7caacd446727c6bf9",
+                "reference": "e544e24472d4c97b2d11ade7caacd446727c6bf9",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5"
+                "php": ">=7.2.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -4550,24 +4563,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-03-27T16:56:45+00:00"
+            "time": "2020-05-20T17:43:50+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v4.4.8",
+            "version": "v4.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "abc8e3618bfdb55e44c8c6a00abd333f831bbfed"
+                "reference": "a5370aaa7807c7a439b21386661ffccf3dff2866"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/abc8e3618bfdb55e44c8c6a00abd333f831bbfed",
-                "reference": "abc8e3618bfdb55e44c8c6a00abd333f831bbfed",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a5370aaa7807c7a439b21386661ffccf3dff2866",
+                "reference": "a5370aaa7807c7a439b21386661ffccf3dff2866",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3",
+                "php": ">=7.1.3",
                 "symfony/event-dispatcher-contracts": "^1.1"
             },
             "conflict": {
@@ -4634,7 +4647,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-03-27T16:54:36+00:00"
+            "time": "2020-05-20T08:37:50+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -4696,26 +4709,26 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v5.0.8",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "7cd0dafc4353a0f62e307df90b48466379c8cc91"
+                "reference": "6e4320f06d5f2cce0d96530162491f4465179157"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/7cd0dafc4353a0f62e307df90b48466379c8cc91",
-                "reference": "7cd0dafc4353a0f62e307df90b48466379c8cc91",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/6e4320f06d5f2cce0d96530162491f4465179157",
+                "reference": "6e4320f06d5f2cce0d96530162491f4465179157",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
+                "php": ">=7.2.5",
                 "symfony/polyfill-ctype": "~1.8"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -4756,29 +4769,29 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-04-12T14:40:17+00:00"
+            "time": "2020-05-30T20:35:19+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v5.0.8",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "600a52c29afc0d1caa74acbec8d3095ca7e9910d"
+                "reference": "4298870062bfc667cb78d2b379be4bf5dec5f187"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/600a52c29afc0d1caa74acbec8d3095ca7e9910d",
-                "reference": "600a52c29afc0d1caa74acbec8d3095ca7e9910d",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/4298870062bfc667cb78d2b379be4bf5dec5f187",
+                "reference": "4298870062bfc667cb78d2b379be4bf5dec5f187",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5"
+                "php": ">=7.2.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -4819,7 +4832,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-03-27T16:56:45+00:00"
+            "time": "2020-05-20T17:43:50+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -5183,18 +5196,94 @@
             ],
             "time": "2020-05-12T16:47:27+00:00"
         },
+        {
+            "name": "symfony/polyfill-php80",
+            "version": "v1.17.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php80.git",
+                "reference": "5e30b2799bc1ad68f7feb62b60a73743589438dd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/5e30b2799bc1ad68f7feb62b60a73743589438dd",
+                "reference": "5e30b2799bc1ad68f7feb62b60a73743589438dd",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0.8"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.17-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ],
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ion Bazan",
+                    "email": "ion.bazan@gmail.com"
+                },
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "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"
+        },
         {
             "name": "symfony/process",
-            "version": "v4.4.8",
+            "version": "v4.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "4b6a9a4013baa65d409153cbb5a895bf093dc7f4"
+                "reference": "c714958428a85c86ab97e3a0c96db4c4f381b7f5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/4b6a9a4013baa65d409153cbb5a895bf093dc7f4",
-                "reference": "4b6a9a4013baa65d409153cbb5a895bf093dc7f4",
+                "url": "https://api.github.com/repos/symfony/process/zipball/c714958428a85c86ab97e3a0c96db4c4f381b7f5",
+                "reference": "c714958428a85c86ab97e3a0c96db4c4f381b7f5",
                 "shasum": ""
             },
             "require": {
@@ -5244,24 +5333,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-04-15T15:56:18+00:00"
+            "time": "2020-05-30T20:06:45+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v2.0.1",
+            "version": "v2.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "144c5e51266b281231e947b51223ba14acf1a749"
+                "reference": "66a8f0957a3ca54e4f724e49028ab19d75a8918b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/144c5e51266b281231e947b51223ba14acf1a749",
-                "reference": "144c5e51266b281231e947b51223ba14acf1a749",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/66a8f0957a3ca54e4f724e49028ab19d75a8918b",
+                "reference": "66a8f0957a3ca54e4f724e49028ab19d75a8918b",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
+                "php": ">=7.2.5",
                 "psr/container": "^1.0"
             },
             "suggest": {
@@ -5270,7 +5359,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "2.1-dev"
                 }
             },
             "autoload": {
@@ -5302,7 +5391,21 @@
                 "interoperability",
                 "standards"
             ],
-            "time": "2019-11-18T17:27:11+00:00"
+            "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": "tedivm/jshrink",
@@ -5720,16 +5823,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.138.7",
+            "version": "3.140.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "6b9f3fcea4dfa6092c628c790ca6d369a75453b7"
+                "reference": "298ec070adad5760c4b90348219bb3e6bd7a9322"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/6b9f3fcea4dfa6092c628c790ca6d369a75453b7",
-                "reference": "6b9f3fcea4dfa6092c628c790ca6d369a75453b7",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/298ec070adad5760c4b90348219bb3e6bd7a9322",
+                "reference": "298ec070adad5760c4b90348219bb3e6bd7a9322",
                 "shasum": ""
             },
             "require": {
@@ -5800,7 +5903,7 @@
                 "s3",
                 "sdk"
             ],
-            "time": "2020-05-22T18:11:09+00:00"
+            "time": "2020-06-09T18:11:16+00:00"
         },
         {
             "name": "beberlei/assert",
@@ -6018,16 +6121,16 @@
         },
         {
             "name": "codeception/codeception",
-            "version": "4.1.4",
+            "version": "4.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/Codeception.git",
-                "reference": "55d8d1d882fa0777e47de17b04c29b3c50fe29e7"
+                "reference": "5515b6a6c6f1e1c909aaff2e5f3a15c177dfd1a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/55d8d1d882fa0777e47de17b04c29b3c50fe29e7",
-                "reference": "55d8d1d882fa0777e47de17b04c29b3c50fe29e7",
+                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/5515b6a6c6f1e1c909aaff2e5f3a15c177dfd1a9",
+                "reference": "5515b6a6c6f1e1c909aaff2e5f3a15c177dfd1a9",
                 "shasum": ""
             },
             "require": {
@@ -6105,7 +6208,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2020-03-23T17:07:20+00:00"
+            "time": "2020-06-07T16:31:51+00:00"
         },
         {
             "name": "codeception/lib-asserts",
@@ -6249,16 +6352,16 @@
         },
         {
             "name": "codeception/module-webdriver",
-            "version": "1.0.8",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/module-webdriver.git",
-                "reference": "da55466876d9e73c09917f495b923395b1cdf92a"
+                "reference": "09c167817393090ce3dbce96027d94656b1963ce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/module-webdriver/zipball/da55466876d9e73c09917f495b923395b1cdf92a",
-                "reference": "da55466876d9e73c09917f495b923395b1cdf92a",
+                "url": "https://api.github.com/repos/Codeception/module-webdriver/zipball/09c167817393090ce3dbce96027d94656b1963ce",
+                "reference": "09c167817393090ce3dbce96027d94656b1963ce",
                 "shasum": ""
             },
             "require": {
@@ -6300,7 +6403,7 @@
                 "browser-testing",
                 "codeception"
             ],
-            "time": "2020-04-29T13:45:52+00:00"
+            "time": "2020-05-31T08:47:24+00:00"
         },
         {
             "name": "codeception/phpunit-wrapper",
@@ -6530,22 +6633,22 @@
         },
         {
             "name": "doctrine/annotations",
-            "version": "1.10.2",
+            "version": "1.10.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/annotations.git",
-                "reference": "b9d758e831c70751155c698c2f7df4665314a1cb"
+                "reference": "5db60a4969eba0e0c197a19c077780aadbc43c5d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/b9d758e831c70751155c698c2f7df4665314a1cb",
-                "reference": "b9d758e831c70751155c698c2f7df4665314a1cb",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/5db60a4969eba0e0c197a19c077780aadbc43c5d",
+                "reference": "5db60a4969eba0e0c197a19c077780aadbc43c5d",
                 "shasum": ""
             },
             "require": {
                 "doctrine/lexer": "1.*",
                 "ext-tokenizer": "*",
-                "php": "^7.1"
+                "php": "^7.1 || ^8.0"
             },
             "require-dev": {
                 "doctrine/cache": "1.*",
@@ -6595,24 +6698,24 @@
                 "docblock",
                 "parser"
             ],
-            "time": "2020-04-20T09:18:32+00:00"
+            "time": "2020-05-25T17:24:27+00:00"
         },
         {
             "name": "doctrine/cache",
-            "version": "1.10.0",
+            "version": "1.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/cache.git",
-                "reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62"
+                "reference": "35a4a70cd94e09e2259dfae7488afc6b474ecbd3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/cache/zipball/382e7f4db9a12dc6c19431743a2b096041bcdd62",
-                "reference": "382e7f4db9a12dc6c19431743a2b096041bcdd62",
+                "url": "https://api.github.com/repos/doctrine/cache/zipball/35a4a70cd94e09e2259dfae7488afc6b474ecbd3",
+                "reference": "35a4a70cd94e09e2259dfae7488afc6b474ecbd3",
                 "shasum": ""
             },
             "require": {
-                "php": "~7.1"
+                "php": "~7.1 || ^8.0"
             },
             "conflict": {
                 "doctrine/common": ">2.2,<2.4"
@@ -6677,7 +6780,21 @@
                 "redis",
                 "xcache"
             ],
-            "time": "2019-11-29T15:36:20+00:00"
+            "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"
         },
         {
             "name": "doctrine/inflector",
@@ -6748,20 +6865,20 @@
         },
         {
             "name": "doctrine/instantiator",
-            "version": "1.3.0",
+            "version": "1.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "ae466f726242e637cebdd526a7d991b9433bacf1"
+                "reference": "f350df0268e904597e3bd9c4685c53e0e333feea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/ae466f726242e637cebdd526a7d991b9433bacf1",
-                "reference": "ae466f726242e637cebdd526a7d991b9433bacf1",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f350df0268e904597e3bd9c4685c53e0e333feea",
+                "reference": "f350df0268e904597e3bd9c4685c53e0e333feea",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": "^7.1 || ^8.0"
             },
             "require-dev": {
                 "doctrine/coding-standard": "^6.0",
@@ -6800,24 +6917,38 @@
                 "constructor",
                 "instantiate"
             ],
-            "time": "2019-10-21T16:45:58+00:00"
+            "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"
         },
         {
             "name": "doctrine/lexer",
-            "version": "1.2.0",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/lexer.git",
-                "reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6"
+                "reference": "e864bbf5904cb8f5bb334f99209b48018522f042"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6",
-                "reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042",
+                "reference": "e864bbf5904cb8f5bb334f99209b48018522f042",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2"
+                "php": "^7.2 || ^8.0"
             },
             "require-dev": {
                 "doctrine/coding-standard": "^6.0",
@@ -6862,7 +6993,21 @@
                 "parser",
                 "php"
             ],
-            "time": "2019-10-30T14:39:59+00:00"
+            "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"
         },
         {
             "name": "friendsofphp/php-cs-fixer",
@@ -8269,16 +8414,16 @@
         },
         {
             "name": "phpoption/phpoption",
-            "version": "1.7.3",
+            "version": "1.7.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/schmittjoh/php-option.git",
-                "reference": "4acfd6a4b33a509d8c88f50e5222f734b6aeebae"
+                "reference": "b2ada2ad5d8a32b89088b8adc31ecd2e3a13baf3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/4acfd6a4b33a509d8c88f50e5222f734b6aeebae",
-                "reference": "4acfd6a4b33a509d8c88f50e5222f734b6aeebae",
+                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/b2ada2ad5d8a32b89088b8adc31ecd2e3a13baf3",
+                "reference": "b2ada2ad5d8a32b89088b8adc31ecd2e3a13baf3",
                 "shasum": ""
             },
             "require": {
@@ -8320,7 +8465,17 @@
                 "php",
                 "type"
             ],
-            "time": "2020-03-21T18:07:53+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpoption/phpoption",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-06-07T10:40:07+00:00"
         },
         {
             "name": "phpspec/prophecy",
@@ -8443,16 +8598,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "8.0.1",
+            "version": "8.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "31e94ccc084025d6abee0585df533eb3a792b96a"
+                "reference": "ca6647ffddd2add025ab3f21644a441d7c146cdc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/31e94ccc084025d6abee0585df533eb3a792b96a",
-                "reference": "31e94ccc084025d6abee0585df533eb3a792b96a",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca6647ffddd2add025ab3f21644a441d7c146cdc",
+                "reference": "ca6647ffddd2add025ab3f21644a441d7c146cdc",
                 "shasum": ""
             },
             "require": {
@@ -8503,7 +8658,13 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2020-02-19T13:41:19+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-05-23T08:02:54+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -9654,28 +9815,28 @@
         },
         {
             "name": "sebastian/type",
-            "version": "2.0.0",
+            "version": "2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "9e8f42f740afdea51f5f4e8cec2035580e797ee1"
+                "reference": "bad49207c6f854e7a25cef0ea948ac8ebe3ef9d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/9e8f42f740afdea51f5f4e8cec2035580e797ee1",
-                "reference": "9e8f42f740afdea51f5f4e8cec2035580e797ee1",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/bad49207c6f854e7a25cef0ea948ac8ebe3ef9d8",
+                "reference": "bad49207c6f854e7a25cef0ea948ac8ebe3ef9d8",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.0"
+                "phpunit/phpunit": "^9.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "2.1-dev"
                 }
             },
             "autoload": {
@@ -9696,7 +9857,13 @@
             ],
             "description": "Collection of value objects that represent the types of the PHP type system",
             "homepage": "https://github.com/sebastianbergmann/type",
-            "time": "2020-02-07T06:13:43+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-01T12:21:09+00:00"
         },
         {
             "name": "sebastian/version",
@@ -9865,22 +10032,24 @@
         },
         {
             "name": "symfony/config",
-            "version": "v5.0.8",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "db1674e1a261148429f123871f30d211992294e7"
+                "reference": "b8623ef3d99fe62a34baf7a111b576216965f880"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/db1674e1a261148429f123871f30d211992294e7",
-                "reference": "db1674e1a261148429f123871f30d211992294e7",
+                "url": "https://api.github.com/repos/symfony/config/zipball/b8623ef3d99fe62a34baf7a111b576216965f880",
+                "reference": "b8623ef3d99fe62a34baf7a111b576216965f880",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1",
                 "symfony/filesystem": "^4.4|^5.0",
-                "symfony/polyfill-ctype": "~1.8"
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-php80": "^1.15"
             },
             "conflict": {
                 "symfony/finder": "<4.4"
@@ -9898,7 +10067,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -9939,29 +10108,31 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-04-15T15:59:10+00:00"
+            "time": "2020-05-23T13:08:13+00:00"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v5.0.8",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "92d8b3bd896a87cdd8aba0a3dd041bc072e8cfba"
+                "reference": "6a6791e9584273b32eeb01790da4c7446d87a621"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/92d8b3bd896a87cdd8aba0a3dd041bc072e8cfba",
-                "reference": "92d8b3bd896a87cdd8aba0a3dd041bc072e8cfba",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/6a6791e9584273b32eeb01790da4c7446d87a621",
+                "reference": "6a6791e9584273b32eeb01790da4c7446d87a621",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
+                "php": ">=7.2.5",
                 "psr/container": "^1.0",
+                "symfony/deprecation-contracts": "^2.1",
+                "symfony/polyfill-php80": "^1.15",
                 "symfony/service-contracts": "^1.1.6|^2"
             },
             "conflict": {
-                "symfony/config": "<5.0",
+                "symfony/config": "<5.1",
                 "symfony/finder": "<4.4",
                 "symfony/proxy-manager-bridge": "<4.4",
                 "symfony/yaml": "<4.4"
@@ -9971,7 +10142,7 @@
                 "symfony/service-implementation": "1.0"
             },
             "require-dev": {
-                "symfony/config": "^5.0",
+                "symfony/config": "^5.1",
                 "symfony/expression-language": "^4.4|^5.0",
                 "symfony/yaml": "^4.4|^5.0"
             },
@@ -9985,7 +10156,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -10026,35 +10197,101 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-04-28T17:58:55+00:00"
+            "time": "2020-05-30T20:35:19+00:00"
+        },
+        {
+            "name": "symfony/deprecation-contracts",
+            "version": "v2.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/deprecation-contracts.git",
+                "reference": "dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337",
+                "reference": "dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.1-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "function.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "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"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v5.0.8",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "e47fdf8b24edc12022ba52923150ec6484d7f57d"
+                "reference": "e0d853bddc2b2cfb0d67b0b4496c03fffe1d37fa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e47fdf8b24edc12022ba52923150ec6484d7f57d",
-                "reference": "e47fdf8b24edc12022ba52923150ec6484d7f57d",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e0d853bddc2b2cfb0d67b0b4496c03fffe1d37fa",
+                "reference": "e0d853bddc2b2cfb0d67b0b4496c03fffe1d37fa",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
-                "symfony/mime": "^4.4|^5.0",
-                "symfony/polyfill-mbstring": "~1.1"
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1",
+                "symfony/polyfill-mbstring": "~1.1",
+                "symfony/polyfill-php80": "^1.15"
             },
             "require-dev": {
                 "predis/predis": "~1.0",
-                "symfony/expression-language": "^4.4|^5.0"
+                "symfony/cache": "^4.4|^5.0",
+                "symfony/expression-language": "^4.4|^5.0",
+                "symfony/mime": "^4.4|^5.0"
+            },
+            "suggest": {
+                "symfony/mime": "To use the file extension guesser"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -10095,26 +10332,27 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-04-18T20:50:06+00:00"
+            "time": "2020-05-24T12:18:07+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v5.0.8",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "5d6c81c39225a750f3f43bee15f03093fb9aaa0b"
+                "reference": "56261f89385f9d13cf843a5101ac72131190bc91"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/5d6c81c39225a750f3f43bee15f03093fb9aaa0b",
-                "reference": "5d6c81c39225a750f3f43bee15f03093fb9aaa0b",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/56261f89385f9d13cf843a5101ac72131190bc91",
+                "reference": "56261f89385f9d13cf843a5101ac72131190bc91",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
+                "php": ">=7.2.5",
                 "symfony/polyfill-intl-idn": "^1.10",
-                "symfony/polyfill-mbstring": "^1.0"
+                "symfony/polyfill-mbstring": "^1.0",
+                "symfony/polyfill-php80": "^1.15"
             },
             "conflict": {
                 "symfony/mailer": "<4.4"
@@ -10126,7 +10364,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -10171,29 +10409,31 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-04-17T03:29:44+00:00"
+            "time": "2020-05-25T12:33:44+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v5.0.8",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "3707e3caeff2b797c0bfaadd5eba723dd44e6bf1"
+                "reference": "663f5dd5e14057d1954fe721f9709d35837f2447"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/3707e3caeff2b797c0bfaadd5eba723dd44e6bf1",
-                "reference": "3707e3caeff2b797c0bfaadd5eba723dd44e6bf1",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/663f5dd5e14057d1954fe721f9709d35837f2447",
+                "reference": "663f5dd5e14057d1954fe721f9709d35837f2447",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5"
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1",
+                "symfony/polyfill-php80": "^1.15"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -10239,7 +10479,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-04-06T10:40:56+00:00"
+            "time": "2020-05-23T13:08:13+00:00"
         },
         {
             "name": "symfony/polyfill-php70",
@@ -10316,26 +10556,26 @@
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v5.0.8",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "a1d86d30d4522423afc998f32404efa34fcf5a73"
+                "reference": "0f7c58cf81dbb5dd67d423a89d577524a2ec0323"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/a1d86d30d4522423afc998f32404efa34fcf5a73",
-                "reference": "a1d86d30d4522423afc998f32404efa34fcf5a73",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/0f7c58cf81dbb5dd67d423a89d577524a2ec0323",
+                "reference": "0f7c58cf81dbb5dd67d423a89d577524a2ec0323",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
+                "php": ">=7.2.5",
                 "symfony/service-contracts": "^1.0|^2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -10376,24 +10616,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-03-27T16:56:45+00:00"
+            "time": "2020-05-20T17:43:50+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v5.0.8",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "482fb4e710e5af3e0e78015f19aa716ad953392f"
+                "reference": "ea342353a3ef4f453809acc4ebc55382231d4d23"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/482fb4e710e5af3e0e78015f19aa716ad953392f",
-                "reference": "482fb4e710e5af3e0e78015f19aa716ad953392f",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/ea342353a3ef4f453809acc4ebc55382231d4d23",
+                "reference": "ea342353a3ef4f453809acc4ebc55382231d4d23",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1",
                 "symfony/polyfill-ctype": "~1.8"
             },
             "conflict": {
@@ -10405,10 +10646,13 @@
             "suggest": {
                 "symfony/console": "For validating YAML files using the lint command"
             },
+            "bin": [
+                "Resources/bin/yaml-lint"
+            ],
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -10449,7 +10693,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-04-28T17:58:55+00:00"
+            "time": "2020-05-20T17:43:50+00:00"
         },
         {
             "name": "thecodingmachine/safe",
@@ -10666,26 +10910,26 @@
         },
         {
             "name": "vlucas/phpdotenv",
-            "version": "v2.6.4",
+            "version": "v2.6.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "67d472b1794c986381a8950e4958e1adb779d561"
+                "reference": "2e977311ffb17b2f82028a9c36824647789c6365"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/67d472b1794c986381a8950e4958e1adb779d561",
-                "reference": "67d472b1794c986381a8950e4958e1adb779d561",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2e977311ffb17b2f82028a9c36824647789c6365",
+                "reference": "2e977311ffb17b2f82028a9c36824647789c6365",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.3.9 || ^7.0 || ^8.0",
-                "symfony/polyfill-ctype": "^1.9"
+                "symfony/polyfill-ctype": "^1.16"
             },
             "require-dev": {
                 "ext-filter": "*",
                 "ext-pcre": "*",
-                "phpunit/phpunit": "^4.8.35 || ^5.0"
+                "phpunit/phpunit": "^4.8.35 || ^5.7.27"
             },
             "suggest": {
                 "ext-filter": "Required to use the boolean validator.",
@@ -10734,7 +10978,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-05-02T13:38:00+00:00"
+            "time": "2020-06-02T14:06:52+00:00"
         },
         {
             "name": "webmozart/assert",
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/composer.lock b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/composer.lock
index 064b5d5f992ab..400073e6a87a6 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/composer.lock
+++ b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/composer.lock
@@ -4775,7 +4775,7 @@
                 "shasum": "ed1da1137848560dde1a85f0f54dc2fac262359e"
             },
             "require": {
-                "elasticsearch/elasticsearch": "~7.6",
+                "elasticsearch/elasticsearch": "7.6.*",
                 "magento/framework": "102.0.*",
                 "magento/module-advanced-search": "100.3.*",
                 "magento/module-catalog": "103.0.*",
@@ -4815,7 +4815,7 @@
                 "shasum": "a9da3243900390ad163efc7969b07116d2eb793f"
             },
             "require": {
-                "elasticsearch/elasticsearch": "~7.6",
+                "elasticsearch/elasticsearch": "7.6.*",
                 "magento/framework": "102.0.*",
                 "magento/module-advanced-search": "100.3.*",
                 "magento/module-catalog-search": "101.0.*",
@@ -9408,7 +9408,7 @@
                 "colinmollenhour/php-redis-session-abstract": "~1.4.0",
                 "composer/composer": "^1.6",
                 "dotmailer/dotmailer-magento2-extension": "3.1.1",
-                "elasticsearch/elasticsearch": "~7.6",
+                "elasticsearch/elasticsearch": "7.6.*",
                 "ext-bcmath": "*",
                 "ext-ctype": "*",
                 "ext-curl": "*",
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/composer.lock b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/composer.lock
index a6f208c9c0d8d..01daa792ed352 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/composer.lock
+++ b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/composer.lock
@@ -4775,7 +4775,7 @@
                 "shasum": "ed1da1137848560dde1a85f0f54dc2fac262359e"
             },
             "require": {
-                "elasticsearch/elasticsearch": "~7.6",
+                "elasticsearch/elasticsearch": "7.6.*",
                 "magento/framework": "102.0.*",
                 "magento/module-advanced-search": "100.3.*",
                 "magento/module-catalog": "103.0.*",
@@ -4815,7 +4815,7 @@
                 "shasum": "a9da3243900390ad163efc7969b07116d2eb793f"
             },
             "require": {
-                "elasticsearch/elasticsearch": "~7.6",
+                "elasticsearch/elasticsearch": "7.6.*",
                 "magento/framework": "102.0.*",
                 "magento/module-advanced-search": "100.3.*",
                 "magento/module-catalog-search": "101.0.*",
@@ -9408,7 +9408,7 @@
                 "colinmollenhour/php-redis-session-abstract": "~1.4.0",
                 "composer/composer": "^1.6",
                 "dotmailer/dotmailer-magento2-extension": "3.1.1",
-                "elasticsearch/elasticsearch": "~7.6",
+                "elasticsearch/elasticsearch": "7.6.*",
                 "ext-bcmath": "*",
                 "ext-ctype": "*",
                 "ext-curl": "*",

From 9104cb571ef4a41bd03cfaa8dc68b487ccb8946f Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Tue, 9 Jun 2020 23:47:36 +0300
Subject: [PATCH 0412/1718] Remove redundant method

---
 .../AdvancedPricing/Validator/TierPrice.php   | 28 ++++++++++------
 .../Validator/TierPriceType.php               | 14 +++-----
 .../AdvancedPricing/Validator/Website.php     | 32 +++++++++----------
 3 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPrice.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPrice.php
index b1f99bb1fc05f..e936244d242dc 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPrice.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPrice.php
@@ -3,15 +3,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator;
 
 use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing;
 use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface;
+use Magento\CatalogImportExport\Model\Import\Product\StoreResolver;
+use Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractPrice;
+use Magento\Customer\Api\GroupRepositoryInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
 
-class TierPrice extends \Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractPrice
+class TierPrice extends AbstractPrice
 {
     /**
-     * @var \Magento\CatalogImportExport\Model\Import\Product\StoreResolver
+     * @var StoreResolver
      */
     protected $storeResolver;
 
@@ -27,14 +34,14 @@ class TierPrice extends \Magento\CatalogImportExport\Model\Import\Product\Valida
     ];
 
     /**
-     * @param \Magento\Customer\Api\GroupRepositoryInterface $groupRepository
-     * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
-     * @param \Magento\CatalogImportExport\Model\Import\Product\StoreResolver $storeResolver
+     * @param GroupRepositoryInterface $groupRepository
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param StoreResolver $storeResolver
      */
     public function __construct(
-        \Magento\Customer\Api\GroupRepositoryInterface $groupRepository,
-        \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder,
-        \Magento\CatalogImportExport\Model\Import\Product\StoreResolver $storeResolver
+        GroupRepositoryInterface $groupRepository,
+        SearchCriteriaBuilder $searchCriteriaBuilder,
+        StoreResolver $storeResolver
     ) {
         $this->storeResolver = $storeResolver;
         parent::__construct($groupRepository, $searchCriteriaBuilder);
@@ -53,6 +60,7 @@ public function init($context)
 
     /**
      * @param string $attribute
+     *
      * @return void
      */
     protected function addDecimalError($attribute)
@@ -83,12 +91,12 @@ public function getCustomerGroups()
     }
 
     /**
-     * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
      * Validation
      *
      * @param mixed $value
      * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
      */
     public function isValid($value)
     {
@@ -133,6 +141,7 @@ public function isValid($value)
      * Check if at list one value and length are valid
      *
      * @param array $value
+     *
      * @return bool
      */
     protected function isValidValueAndLength(array $value)
@@ -150,6 +159,7 @@ protected function isValidValueAndLength(array $value)
      * Check if value has empty columns
      *
      * @param array $value
+     *
      * @return bool
      */
     protected function hasEmptyColumns(array $value)
diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPriceType.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPriceType.php
index 6aa59e6227a05..71b5271a90fa2 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPriceType.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPriceType.php
@@ -4,28 +4,24 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator;
 
 use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing;
 use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface;
+use Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractImportValidator;
 
 /**
  * Class TierPriceType validates tier price type.
  */
-class TierPriceType extends \Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractImportValidator
+class TierPriceType extends AbstractImportValidator
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function init($context)
-    {
-        return parent::init($context);
-    }
-
     /**
      * Validate tier price type.
      *
      * @param array $value
+     *
      * @return bool
      */
     public function isValid($value)
diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php
index 0f3f8b3389c7d..a6c6bbb4cd49b 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php
@@ -3,49 +3,47 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator;
 
 use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing;
-use Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractImportValidator;
 use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface;
+use Magento\CatalogImportExport\Model\Import\Product\StoreResolver;
+use Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractImportValidator;
+use Magento\Store\Model\Website as WebsiteModel;
 
 class Website extends AbstractImportValidator implements RowValidatorInterface
 {
     /**
-     * @var \Magento\CatalogImportExport\Model\Import\Product\StoreResolver
+     * @var StoreResolver
      */
     protected $storeResolver;
 
     /**
-     * @var \Magento\Store\Model\Website
+     * @var WebsiteModel
      */
     protected $websiteModel;
 
     /**
-     * @param \Magento\CatalogImportExport\Model\Import\Product\StoreResolver $storeResolver
-     * @param \Magento\Store\Model\Website $websiteModel
+     * @param StoreResolver $storeResolver
+     * @param WebsiteModel $websiteModel
      */
     public function __construct(
-        \Magento\CatalogImportExport\Model\Import\Product\StoreResolver $storeResolver,
-        \Magento\Store\Model\Website $websiteModel
+        StoreResolver $storeResolver,
+        WebsiteModel $websiteModel
     ) {
         $this->storeResolver = $storeResolver;
         $this->websiteModel = $websiteModel;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function init($context)
-    {
-        return parent::init($context);
-    }
-
     /**
      * Validate by website type
      *
      * @param array $value
      * @param string $websiteCode
+     *
      * @return bool
      */
     protected function isWebsiteValid($value, $websiteCode)
@@ -63,6 +61,7 @@ protected function isWebsiteValid($value, $websiteCode)
      * Validate value
      *
      * @param mixed $value
+     *
      * @return bool
      */
     public function isValid($value)
@@ -85,6 +84,7 @@ public function isValid($value)
      */
     public function getAllWebsitesValue()
     {
-        return AdvancedPricing::VALUE_ALL_WEBSITES . ' ['.$this->websiteModel->getBaseCurrency()->getCurrencyCode().']';
+        return AdvancedPricing::VALUE_ALL_WEBSITES .
+            ' [' . $this->websiteModel->getBaseCurrency()->getCurrencyCode() . ']';
     }
 }

From bbcb7b71dd9daf0eb055d5dbd94bc5902a02803a Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Tue, 9 Jun 2020 15:51:42 -0500
Subject: [PATCH 0413/1718] MC-35049: 2.4.0 Page Builder Failed tests

---
 .../product/image_with_borders.phtml          | 38 ++++++++++++++-----
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
index ce21a2473f7a5..0ac6bc88df8ce 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
@@ -18,8 +18,10 @@ $enableLazyLoadingWithoutBorders = (bool)$block->getVar(
     'enable_lazy_loading_for_images_without_borders',
     'Magento_Catalog'
 );
+$width = (int)$block->getWidth();
+$paddingBottom = $block->getRatio() * 100;
 ?>
-<span class="product-image-container" id="product-image-container-<?= /* @noEscape */ $block->getProductId() ?>">
+<span class="product-image-container product-image-container-<?= /* @noEscape */ $block->getProductId() ?>">
     <span class="product-image-wrapper">
         <img class="<?= $escaper->escapeHtmlAttr($block->getClass()) ?>"
             <?php foreach ($block->getCustomAttributes() as $name => $value): ?>
@@ -36,11 +38,29 @@ $enableLazyLoadingWithoutBorders = (bool)$block->getVar(
             <?php endif; ?>
             alt="<?= $escaper->escapeHtmlAttr($block->getLabel()) ?>"/></span>
 </span>
-<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-    'width:' . (int)$block->getWidth() . 'px;',
-    '#product-image-container-' . $block->getProductId()
-) ?>
-<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-    'padding-bottom: '. ($block->getRatio() * 100) . '%;',
-    '#product-image-container-' . $block->getProductId() . ' span.product-image-wrapper'
-) ?>
+<?php
+$styles = <<<STYLE
+.product-image-container-{$block->getProductId()} {
+    width: {$width}px;
+}
+.product-image-container-{$block->getProductId()} span.product-image-wrapper {
+    padding-bottom: {$paddingBottom}%;
+}
+STYLE;
+//In case a script was using "style" attributes of these elements
+$script = <<<SCRIPT
+prodImageContainers = document.querySelectorAll(".product-image-container-{$block->getProductId()}");
+for (var i = 0; i < prodImageContainers.length; i++) {
+    prodImageContainers[i].style.width = "{$width}px";
+}
+prodImageContainersWrappers = document.querySelectorAll(
+    ".product-image-container-{$block->getProductId()}  span.product-image-wrapper"
+);
+for (var i = 0; i < prodImageContainersWrappers.length; i++) {
+    prodImageContainersWrappers[i].style.paddingBottom = "{$paddingBottom}%";
+}
+SCRIPT;
+
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('style', [], $styles, false) ?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', ['type' => 'text/javascript'], $script, false) ?>

From 2cf4beb424ef1f411018b81b1d00a3663c1da4b4 Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Tue, 9 Jun 2020 16:23:17 -0500
Subject: [PATCH 0414/1718] MC-35004: WsdlGenerationFromDataObjectTest is
 failed with PHP 7.4.6

---
 .../WsdlGenerationFromDataObjectTest.php      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php b/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php
index dadc2caef7a13..c43cb81683aac 100644
--- a/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php
@@ -116,7 +116,7 @@ protected function _getWsdlContent($wsdlUrl)
             $responseDom->loadXML($responseContent),
             "Valid XML is always expected as a response for WSDL request."
         );
-        return $responseContent;
+        return $responseDom->saveXML();
     }
 
     /**
@@ -207,7 +207,7 @@ protected function _checkComplexTypesDeclaration($wsdlContent)
     <xsd:sequence>
         <xsd:element name="id" minOccurs="1" maxOccurs="1" type="xsd:int">
             <xsd:annotation>
-                <xsd:documentation></xsd:documentation>
+                <xsd:documentation/>
                 <xsd:appinfo xmlns:inf="{$this->_soapUrl}">
                     <inf:min/>
                     <inf:max/>
@@ -231,7 +231,7 @@ protected function _checkComplexTypesDeclaration($wsdlContent)
     <xsd:sequence>
         <xsd:element name="entityId" minOccurs="1" maxOccurs="1" type="xsd:int">
             <xsd:annotation>
-                <xsd:documentation></xsd:documentation>
+                <xsd:documentation/>
                 <xsd:appinfo xmlns:inf="{$this->_soapUrl}">
                     <inf:min/>
                     <inf:max/>
@@ -266,7 +266,7 @@ protected function _checkComplexTypesDeclaration($wsdlContent)
     <xsd:sequence>
         <xsd:element name="result" minOccurs="1" maxOccurs="1" type="tns:TestModule5V2EntityAllSoapAndRest">
             <xsd:annotation>
-                <xsd:documentation></xsd:documentation>
+                <xsd:documentation/>
                 <xsd:appinfo xmlns:inf="{$this->_soapUrl}">
                     <inf:callInfo>
                         <inf:callName>testModule5AllSoapAndRestV2Item</inf:callName>
@@ -290,7 +290,7 @@ protected function _checkComplexTypesDeclaration($wsdlContent)
     <xsd:sequence>
         <xsd:element name="result" minOccurs="1" maxOccurs="1" type="tns:TestModule5V1EntityAllSoapAndRest">
             <xsd:annotation>
-                <xsd:documentation></xsd:documentation>
+                <xsd:documentation/>
                 <xsd:appinfo xmlns:inf="{$this->_soapUrl}">
                     <inf:callInfo>
                         <inf:callName>testModule5AllSoapAndRestV1Item</inf:callName>
@@ -331,7 +331,7 @@ protected function _checkReferencedTypeDeclaration($wsdlContent)
     <xsd:sequence>
         <xsd:element name="price" minOccurs="1" maxOccurs="1" type="xsd:int">
             <xsd:annotation>
-                <xsd:documentation></xsd:documentation>
+                <xsd:documentation/>
                 <xsd:appinfo xmlns:inf="{$this->_soapUrl}">
                     <inf:min/>
                     <inf:max/>
@@ -835,7 +835,7 @@ protected function _checkFaultsComplexTypeSection($wsdlContent)
     <xsd:sequence>
         <xsd:element name="key" minOccurs="1" maxOccurs="1" type="xsd:string">
             <xsd:annotation>
-                <xsd:documentation></xsd:documentation>
+                <xsd:documentation/>
                 <xsd:appinfo xmlns:inf="{$this->_soapUrl}">
                     <inf:maxLength/>
                 </xsd:appinfo>
@@ -843,7 +843,7 @@ protected function _checkFaultsComplexTypeSection($wsdlContent)
         </xsd:element>
         <xsd:element name="value" minOccurs="1" maxOccurs="1" type="xsd:string">
             <xsd:annotation>
-                <xsd:documentation></xsd:documentation>
+                <xsd:documentation/>
                 <xsd:appinfo xmlns:inf="{$this->_soapUrl}">
                     <inf:maxLength/>
                 </xsd:appinfo>
@@ -865,7 +865,7 @@ protected function _checkFaultsComplexTypeSection($wsdlContent)
     <xsd:sequence>
         <xsd:element name="message" minOccurs="1" maxOccurs="1" type="xsd:string">
             <xsd:annotation>
-                <xsd:documentation></xsd:documentation>
+                <xsd:documentation/>
                 <xsd:appinfo xmlns:inf="{$this->_baseUrl}/soap/{$this->_storeCode}?services=testModule5AllSoapAndRestV2">
                     <inf:maxLength/>
                 </xsd:appinfo>
@@ -888,7 +888,7 @@ protected function _checkFaultsComplexTypeSection($wsdlContent)
     <xsd:sequence>
         <xsd:element name="message" minOccurs="1" maxOccurs="1" type="xsd:string">
             <xsd:annotation>
-                <xsd:documentation></xsd:documentation>
+                <xsd:documentation/>
                 <xsd:appinfo xmlns:inf="{$this->_baseUrl}/soap/{$this->_storeCode}?services=testModule5AllSoapAndRestV1%2CtestModule5AllSoapAndRestV2">
                     <inf:maxLength/>
                 </xsd:appinfo>

From 7eeba38866f1dfd3cf1a1168667697b782454937 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 10 Jun 2020 00:33:15 +0300
Subject: [PATCH 0415/1718] removed unused construct parameters

---
 .../Model/Import/AdvancedPricing.php            |  4 ----
 .../Unit/Model/Import/AdvancedPricingTest.php   | 17 -----------------
 2 files changed, 21 deletions(-)

diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
index 974397226c56c..e0e70251fefb2 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
@@ -176,10 +176,8 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
      * @param \Magento\ImportExport\Helper\Data $importExportData
      * @param \Magento\ImportExport\Model\ResourceModel\Import\Data $importData
-     * @param \Magento\Eav\Model\Config $config
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param \Magento\ImportExport\Model\ResourceModel\Helper $resourceHelper
-     * @param \Magento\Framework\Stdlib\StringUtils $string
      * @param ProcessingErrorAggregatorInterface $errorAggregator
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
      * @param \Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory $resourceFactory
@@ -197,10 +195,8 @@ public function __construct(
         \Magento\Framework\Json\Helper\Data $jsonHelper,
         \Magento\ImportExport\Helper\Data $importExportData,
         \Magento\ImportExport\Model\ResourceModel\Import\Data $importData,
-        \Magento\Eav\Model\Config $config,
         \Magento\Framework\App\ResourceConnection $resource,
         \Magento\ImportExport\Model\ResourceModel\Helper $resourceHelper,
-        \Magento\Framework\Stdlib\StringUtils $string,
         ProcessingErrorAggregatorInterface $errorAggregator,
         \Magento\Framework\Stdlib\DateTime\DateTime $dateTime,
         \Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory $resourceFactory,
diff --git a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php
index e57ed2c91409d..08d75f0f36f07 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php
@@ -16,7 +16,6 @@
 use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface as RowValidatorInterface;
 use Magento\CatalogImportExport\Model\Import\Product\StoreResolver;
 use Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory as ResourceFactory;
-use Magento\Eav\Model\Config;
 use Magento\Eav\Model\Entity\Type;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
@@ -26,7 +25,6 @@
 use Magento\Framework\Json\Helper\Data;
 use Magento\Framework\Stdlib\DateTime\DateTime;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
-use Magento\Framework\Stdlib\StringUtils;
 use Magento\ImportExport\Model\Import;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
 use Magento\ImportExport\Model\ResourceModel\Helper;
@@ -99,11 +97,6 @@ class AdvancedPricingTest extends AbstractImportTestCase
      */
     protected $dataSourceModel;
 
-    /**
-     * @var Config
-     */
-    protected $eavConfig;
-
     /**
      * @var TimezoneInterface|MockObject
      */
@@ -139,11 +132,6 @@ class AdvancedPricingTest extends AbstractImportTestCase
      */
     protected $advancedPricing;
 
-    /**
-     * @var StringUtils
-     */
-    protected $stringObject;
-
     /**
      * @var ProcessingErrorAggregatorInterface
      */
@@ -165,10 +153,8 @@ protected function setUp(): void
         );
         $this->resource->method('getConnection')->willReturn($this->connection);
         $this->dataSourceModel = $this->createMock(\Magento\ImportExport\Model\ResourceModel\Import\Data::class);
-        $this->eavConfig = $this->createMock(Config::class);
         $entityType = $this->createMock(Type::class);
         $entityType->method('getEntityTypeId')->willReturn('');
-        $this->eavConfig->method('getEntityType')->willReturn($entityType);
         $this->resourceFactory = $this->getMockBuilder(
             \Magento\CatalogImportExport\Model\Import\Proxy\Product\ResourceModelFactory::class
         )
@@ -193,7 +179,6 @@ protected function setUp(): void
         $this->tierPriceValidator = $this->createMock(
             TierPrice::class
         );
-        $this->stringObject = $this->createMock(StringUtils::class);
         $this->errorAggregator = $this->getErrorAggregatorObject();
         $this->dateTime = $this->getMockBuilder(DateTime::class)
             ->disableOriginalConstructor()
@@ -1070,10 +1055,8 @@ private function getAdvancedPricingMock($methods = [])
                     $this->jsonHelper,
                     $this->importExportData,
                     $this->dataSourceModel,
-                    $this->eavConfig,
                     $this->resource,
                     $this->resourceHelper,
-                    $this->stringObject,
                     $this->errorAggregator,
                     $this->dateTime,
                     $this->resourceFactory,

From f1516ba52826d8b9a3c1c83538d8fa5bac90cb09 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 10 Jun 2020 00:45:43 +0300
Subject: [PATCH 0416/1718] fixed static issues

---
 .../Import/AdvancedPricing/Validator/TierPrice.php   | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPrice.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPrice.php
index e936244d242dc..2ad96cfeab1d9 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPrice.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPrice.php
@@ -9,11 +9,14 @@
 namespace Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing\Validator;
 
 use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing;
+use Magento\CatalogImportExport\Model\Import\Product;
 use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface;
 use Magento\CatalogImportExport\Model\Import\Product\StoreResolver;
+use Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractImportValidator;
 use Magento\CatalogImportExport\Model\Import\Product\Validator\AbstractPrice;
 use Magento\Customer\Api\GroupRepositoryInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Exception\LocalizedException;
 
 class TierPrice extends AbstractPrice
 {
@@ -48,7 +51,12 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * Initialize method
+     *
+     * @param Product $context
+     *
+     * @return RowValidatorInterface|AbstractImportValidator|void
+     * @throws LocalizedException
      */
     public function init($context)
     {
@@ -59,6 +67,8 @@ public function init($context)
     }
 
     /**
+     * Add decimal error
+     *
      * @param string $attribute
      *
      * @return void

From e9c6dd110118ac9a1ce803a76f5318c2fb5e2d5b Mon Sep 17 00:00:00 2001
From: John Carlo Octabio <johncarlo@abovethefray.io>
Date: Wed, 10 Jun 2020 12:30:19 +0800
Subject: [PATCH 0417/1718] magento/magento2#108: Clear Shopping Cart - Add RWD
 styling to cart actions container using flex

---
 app/code/Magento/Checkout/Block/Cart/Grid.php            | 4 ++--
 .../Magento_Checkout/web/css/source/module/_cart.less    | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Checkout/Block/Cart/Grid.php b/app/code/Magento/Checkout/Block/Cart/Grid.php
index 0ec5f33c4a656..ed70619b0a66c 100644
--- a/app/code/Magento/Checkout/Block/Cart/Grid.php
+++ b/app/code/Magento/Checkout/Block/Cart/Grid.php
@@ -165,8 +165,8 @@ public function getItems()
     }
 
     /**
-     * Verify if display pager on shopping cart if cart block has custom_items and items qty in the shopping cart<limit
-     * from stores configuration
+     * Verify if display pager on shopping cart
+     * If cart block has custom_items and items qty in the shopping cart<limit from stores configuration
      *
      * @return bool
      */
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 87990c3e48280..5d9746317af55 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
@@ -424,7 +424,14 @@
     .cart-container {
         .form-cart {
             .actions.main {
-                text-align: center;
+                .lib-vendor-prefix-display();
+                .lib-vendor-prefix-flex-direction(column);
+                .lib-vendor-box-align(center);
+
+                .clear,
+                .continue {
+                    .lib-css(margin, 0 0 @indent__m 0);
+                }
             }
         }
     }

From 06f21adaf7d289c94f0a065fcf521f53c5c298f9 Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@magento.com>
Date: Wed, 10 Jun 2020 00:34:49 -0500
Subject: [PATCH 0418/1718] MC-31618: Move static config to files - PLUGIN_LIST

- Introduce new interfaces for config load and write;
---
 app/etc/di.xml                                |   4 +-
 .../Framework/Interception/ConfigLoader.php   |  39 ++
 .../Interception/ConfigLoaderInterface.php    |  20 +
 .../Framework/Interception/ConfigWriter.php   | 374 ++++++++++++++++++
 .../Interception/ConfigWriterInterface.php    |  20 +
 .../Interception/PluginList/PluginList.php    |  38 +-
 .../Task/Operation/PluginListGenerator.php    | 346 +---------------
 7 files changed, 478 insertions(+), 363 deletions(-)
 create mode 100644 lib/internal/Magento/Framework/Interception/ConfigLoader.php
 create mode 100644 lib/internal/Magento/Framework/Interception/ConfigLoaderInterface.php
 create mode 100644 lib/internal/Magento/Framework/Interception/ConfigWriter.php
 create mode 100644 lib/internal/Magento/Framework/Interception/ConfigWriterInterface.php

diff --git a/app/etc/di.xml b/app/etc/di.xml
index 14b87b5c2b0b0..c90cc493a4357 100644
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -209,6 +209,8 @@
     <preference for="Magento\Framework\MessageQueue\QueueFactoryInterface" type="Magento\Framework\MessageQueue\QueueFactory" />
     <preference for="Magento\Framework\Search\Request\IndexScopeResolverInterface" type="Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver"/>
     <preference for="Magento\Framework\HTTP\ClientInterface" type="Magento\Framework\HTTP\Client\Curl" />
+    <preference for="Magento\Framework\Interception\ConfigLoaderInterface" type="Magento\Framework\Interception\ConfigLoader" />
+    <preference for="Magento\Framework\Interception\ConfigWriterInterface" type="Magento\Framework\Interception\ConfigWriter" />
     <type name="Magento\Framework\Model\ResourceModel\Db\TransactionManager" shared="false" />
     <type name="Magento\Framework\Acl\Data\Cache">
         <arguments>
@@ -430,7 +432,7 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Setup\Module\Di\App\Task\Operation\PluginListGenerator">
+    <type name="Magento\Framework\Interception\ConfigWriter">
         <arguments>
             <argument name="reader" xsi:type="object">Magento\Framework\ObjectManager\Config\Reader\Dom\Proxy</argument>
             <argument name="scopePriorityScheme" xsi:type="array">
diff --git a/lib/internal/Magento/Framework/Interception/ConfigLoader.php b/lib/internal/Magento/Framework/Interception/ConfigLoader.php
new file mode 100644
index 0000000000000..6772f981c542d
--- /dev/null
+++ b/lib/internal/Magento/Framework/Interception/ConfigLoader.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Interception;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+
+/**
+ * Interception config loader per scope
+ */
+class ConfigLoader implements ConfigLoaderInterface
+{
+    /** @var DirectoryList */
+    private $directoryList;
+
+    /**
+     * @param DirectoryList $directoryList
+     */
+    public function __construct(
+        DirectoryList $directoryList
+    ) {
+        $this->directoryList = $directoryList;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function load($cacheId)
+    {
+        $file = $this->directoryList->getPath(DirectoryList::GENERATED_METADATA) . '/' . $cacheId . '.' . 'php';
+        if (file_exists($file)) {
+            return include $file;
+        }
+
+        return [];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Interception/ConfigLoaderInterface.php b/lib/internal/Magento/Framework/Interception/ConfigLoaderInterface.php
new file mode 100644
index 0000000000000..23d6a36aa633b
--- /dev/null
+++ b/lib/internal/Magento/Framework/Interception/ConfigLoaderInterface.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Interception;
+
+/**
+ * Interception configuration loader interface.
+ */
+interface ConfigLoaderInterface
+{
+    /**
+     * Load interception configuration data per scope.
+     *
+     * @param string $cacheId
+     * @return array
+     */
+    public function load($cacheId);
+}
diff --git a/lib/internal/Magento/Framework/Interception/ConfigWriter.php b/lib/internal/Magento/Framework/Interception/ConfigWriter.php
new file mode 100644
index 0000000000000..ef9ce896b043b
--- /dev/null
+++ b/lib/internal/Magento/Framework/Interception/ConfigWriter.php
@@ -0,0 +1,374 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Interception;
+
+use Magento\Framework\App\ObjectManager\ConfigWriterInterface as ObjectManagerConfigWriterInterface;
+use Magento\Framework\Config\ReaderInterface;
+use Magento\Framework\Config\ScopeInterface;
+use Magento\Framework\Interception\ObjectManager\ConfigInterface;
+use Magento\Framework\ObjectManager\DefinitionInterface as ClassDefinitions;
+use Magento\Framework\ObjectManager\RelationsInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Interception configuration writer for scopes.
+ */
+class ConfigWriter implements ConfigWriterInterface
+{
+    /**
+     * @var ScopeInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * Configuration reader
+     *
+     * @var ReaderInterface
+     */
+    private $reader;
+
+    /**
+     * Cache tag
+     *
+     * @var string
+     */
+    private $cacheId = 'plugin-list';
+
+    /**
+     * Loaded scopes
+     *
+     * @var array
+     */
+    private $loadedScopes = [];
+
+    /**
+     * Type config
+     *
+     * @var ConfigInterface
+     */
+    private $omConfig;
+
+    /**
+     * Class relations information provider
+     *
+     * @var RelationsInterface
+     */
+    private $relations;
+
+    /**
+     * List of interception methods per plugin
+     *
+     * @var DefinitionInterface
+     */
+    private $definitions;
+
+    /**
+     * List of interceptable application classes
+     *
+     * @var ClassDefinitions
+     */
+    private $classDefinitions;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var ObjectManagerConfigWriterInterface
+     */
+    private $configWriter;
+
+    /**
+     * @var array
+     */
+    private $pluginData;
+
+    /**
+     * @var array
+     */
+    private $inherited = [];
+
+    /**
+     * @var array
+     */
+    private $processed;
+
+    /**
+     * Scope priority loading scheme
+     *
+     * @var string[]
+     */
+    private $scopePriorityScheme;
+
+    /**
+     * @var array
+     */
+    private $globalScopePluginData = [];
+
+    /**
+     * @param ReaderInterface $reader
+     * @param ScopeInterface $scopeConfig
+     * @param ConfigInterface $omConfig
+     * @param RelationsInterface $relations
+     * @param DefinitionInterface $definitions
+     * @param ClassDefinitions $classDefinitions
+     * @param LoggerInterface $logger
+     * @param ObjectManagerConfigWriterInterface $configWriter
+     * @param array $scopePriorityScheme
+     */
+    public function __construct(
+        ReaderInterface $reader,
+        ScopeInterface $scopeConfig,
+        ConfigInterface $omConfig,
+        RelationsInterface $relations,
+        DefinitionInterface $definitions,
+        ClassDefinitions $classDefinitions,
+        LoggerInterface $logger,
+        ObjectManagerConfigWriterInterface $configWriter,
+        array $scopePriorityScheme = ['global']
+    ) {
+        $this->reader = $reader;
+        $this->scopeConfig = $scopeConfig;
+        $this->omConfig = $omConfig;
+        $this->relations = $relations;
+        $this->definitions = $definitions;
+        $this->classDefinitions = $classDefinitions;
+        $this->logger = $logger;
+        $this->configWriter = $configWriter;
+        $this->scopePriorityScheme = $scopePriorityScheme;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function write($scopes)
+    {
+        foreach ($scopes as $scope) {
+            $this->scopeConfig->setCurrentScope($scope);
+            if (false === isset($this->loadedScopes[$scope])) {
+                if (false === in_array($scope, $this->scopePriorityScheme, true)) {
+                    $this->scopePriorityScheme[] = $scope;
+                }
+                $cacheId = implode('|', $this->scopePriorityScheme) . "|" . $this->cacheId;
+                foreach ($this->loadScopedVirtualTypes() as $class) {
+                    $this->inheritPlugins($class);
+                }
+                foreach ($this->pluginData as $className => $value) {
+                    $this->inheritPlugins($className);
+                }
+                foreach ($this->getClassDefinitions() as $class) {
+                    $this->inheritPlugins($class);
+                }
+                $this->configWriter->write(
+                    $cacheId,
+                    [$this->pluginData, $this->inherited, $this->processed]
+                );
+                // need global scope plugin data for non global scopes
+                if ($scope === 'global') {
+                    $this->globalScopePluginData = $this->pluginData;
+                }
+                if (count($this->scopePriorityScheme) > 1) {
+                    array_pop($this->scopePriorityScheme);
+                    // merge global scope plugin data to other scopes by default
+                    $this->pluginData = $this->globalScopePluginData;
+                }
+            }
+        }
+    }
+
+    /**
+     * Load virtual types for current scope
+     *
+     * @return array
+     */
+    private function loadScopedVirtualTypes()
+    {
+        $virtualTypes = [];
+        foreach ($this->scopePriorityScheme as $scopeCode) {
+            if (!isset($this->loadedScopes[$scopeCode])) {
+                $data = $this->reader->read($scopeCode) ?: [];
+                unset($data['preferences']);
+                if (count($data) > 0) {
+                    $this->inherited = [];
+                    $this->processed = [];
+                    $this->merge($data);
+                    foreach ($data as $class => $config) {
+                        if (isset($config['type'])) {
+                            $virtualTypes[] = $class;
+                        }
+                    }
+                }
+                $this->loadedScopes[$scopeCode] = true;
+            }
+            if ($this->isCurrentScope($scopeCode)) {
+                break;
+            }
+        }
+        return $virtualTypes;
+    }
+
+    /**
+     * Returns class definitions
+     *
+     * @return array
+     */
+    private function getClassDefinitions()
+    {
+        return $this->classDefinitions->getClasses();
+    }
+
+    /**
+     * Whether scope code is current scope code
+     *
+     * @param string $scopeCode
+     * @return bool
+     */
+    private function isCurrentScope($scopeCode)
+    {
+        return $this->scopeConfig->getCurrentScope() === $scopeCode;
+    }
+
+    /**
+     * Collect parent types configuration for requested type
+     *
+     * @param string $type
+     * @return array
+     * @throws \InvalidArgumentException
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     */
+    private function inheritPlugins($type)
+    {
+        $type = ltrim($type, '\\');
+        if (!isset($this->inherited[$type])) {
+            $realType = $this->omConfig->getOriginalInstanceType($type);
+
+            if ($realType !== $type) {
+                $plugins = $this->inheritPlugins($realType);
+            } elseif ($this->relations->has($type)) {
+                $relations = $this->relations->getParents($type);
+                $plugins = [];
+                foreach ($relations as $relation) {
+                    if ($relation) {
+                        $relationPlugins = $this->inheritPlugins($relation);
+                        if ($relationPlugins) {
+                            $plugins = array_replace_recursive($plugins, $relationPlugins);
+                        }
+                    }
+                }
+            } else {
+                $plugins = [];
+            }
+            if (isset($this->pluginData[$type])) {
+                if (!$plugins) {
+                    $plugins = $this->pluginData[$type];
+                } else {
+                    $plugins = array_replace_recursive($plugins, $this->pluginData[$type]);
+                }
+            }
+            $this->inherited[$type] = null;
+            if (is_array($plugins) && count($plugins)) {
+                $this->filterPlugins($plugins);
+                uasort($plugins, [$this, 'sort']);
+                $this->trimInstanceStartingBackslash($plugins);
+                $this->inherited[$type] = $plugins;
+                $lastPerMethod = [];
+                foreach ($plugins as $key => $plugin) {
+                    // skip disabled plugins
+                    if (isset($plugin['disabled']) && $plugin['disabled']) {
+                        unset($plugins[$key]);
+                        continue;
+                    }
+                    $pluginType = $this->omConfig->getOriginalInstanceType($plugin['instance']);
+                    if (!class_exists($pluginType)) {
+                        throw new \InvalidArgumentException('Plugin class ' . $pluginType . ' doesn\'t exist');
+                    }
+                    foreach ($this->definitions->getMethodList($pluginType) as $pluginMethod => $methodTypes) {
+                        $current = $lastPerMethod[$pluginMethod] ?? '__self';
+                        $currentKey = $type . '_' . $pluginMethod . '_' . $current;
+                        if ($methodTypes & DefinitionInterface::LISTENER_AROUND) {
+                            $this->processed[$currentKey][DefinitionInterface::LISTENER_AROUND] = $key;
+                            $lastPerMethod[$pluginMethod] = $key;
+                        }
+                        if ($methodTypes & DefinitionInterface::LISTENER_BEFORE) {
+                            $this->processed[$currentKey][DefinitionInterface::LISTENER_BEFORE][] = $key;
+                        }
+                        if ($methodTypes & DefinitionInterface::LISTENER_AFTER) {
+                            $this->processed[$currentKey][DefinitionInterface::LISTENER_AFTER][] = $key;
+                        }
+                    }
+                }
+            }
+            return $plugins;
+        }
+        return $this->inherited[$type];
+    }
+
+    /**
+     * Trims starting backslash from plugin instance name
+     *
+     * @param array $plugins
+     * @return void
+     */
+    private function trimInstanceStartingBackslash(&$plugins)
+    {
+        foreach ($plugins as &$plugin) {
+            $plugin['instance'] = ltrim($plugin['instance'], '\\');
+        }
+    }
+
+    /**
+     * Remove from list not existing plugins
+     *
+     * @param array $plugins
+     * @return void
+     */
+    private function filterPlugins(array &$plugins)
+    {
+        foreach ($plugins as $name => $plugin) {
+            if (empty($plugin['instance'])) {
+                unset($plugins[$name]);
+                $this->logger->info("Reference to undeclared plugin with name '{$name}'.");
+            }
+        }
+    }
+
+    /**
+     * Merge configuration
+     *
+     * @param array $config
+     * @return void
+     */
+    private function merge(array $config)
+    {
+        foreach ($config as $type => $typeConfig) {
+            if (isset($typeConfig['plugins'])) {
+                $type = ltrim($type, '\\');
+                if (isset($this->pluginData[$type])) {
+                    $this->pluginData[$type] = array_replace_recursive(
+                        $this->pluginData[$type],
+                        $typeConfig['plugins']
+                    );
+                } else {
+                    $this->pluginData[$type] = $typeConfig['plugins'];
+                }
+            }
+        }
+    }
+
+    /**
+     * Sort items
+     *
+     * @param array $itemA
+     * @param array $itemB
+     * @return int
+     */
+    private function sort($itemA, $itemB)
+    {
+        return ($itemA['sortOrder'] ?? PHP_INT_MIN) - ($itemB['sortOrder'] ?? PHP_INT_MIN);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Interception/ConfigWriterInterface.php b/lib/internal/Magento/Framework/Interception/ConfigWriterInterface.php
new file mode 100644
index 0000000000000..79f891ccbb3f1
--- /dev/null
+++ b/lib/internal/Magento/Framework/Interception/ConfigWriterInterface.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Interception;
+
+/**
+ * Interception config writer interface.
+ */
+interface ConfigWriterInterface
+{
+    /**
+     * Write interception configuration for scopes.
+     *
+     * @param array $scopes
+     * @return array
+     */
+    public function write($scopes);
+}
diff --git a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
index 3446a9b33f4f2..7da4623f7fb94 100644
--- a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
+++ b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Framework\Interception\PluginList;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Config\CacheInterface;
 use Magento\Framework\Config\Data\Scoped;
 use Magento\Framework\Config\ReaderInterface;
@@ -18,6 +17,8 @@
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\Serialize\Serializer\Serialize;
+use Magento\Framework\Interception\ConfigLoader;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Plugin config, provides list of plugins for a type
@@ -88,6 +89,11 @@ class PluginList extends Scoped implements InterceptionPluginList
      */
     private $serializer;
 
+    /**
+     * @var ConfigLoader
+     */
+    private $configLoader;
+
     /**
      * Constructor
      *
@@ -102,6 +108,7 @@ class PluginList extends Scoped implements InterceptionPluginList
      * @param array $scopePriorityScheme
      * @param string|null $cacheId
      * @param SerializerInterface|null $serializer
+     * @param ConfigLoader|null $configLoader
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -115,7 +122,8 @@ public function __construct(
         ClassDefinitions $classDefinitions,
         array $scopePriorityScheme = ['global'],
         $cacheId = 'plugins',
-        SerializerInterface $serializer = null
+        SerializerInterface $serializer = null,
+        ConfigLoader $configLoader = null
     ) {
         $this->serializer = $serializer ?: $objectManager->get(Serialize::class);
         parent::__construct($reader, $configScope, $cache, $cacheId, $this->serializer);
@@ -125,6 +133,7 @@ public function __construct(
         $this->_classDefinitions = $classDefinitions;
         $this->_scopePriorityScheme = $scopePriorityScheme;
         $this->_objectManager = $objectManager;
+        $this->configLoader = $configLoader ?: ObjectManager::getInstance()->get(ConfigLoader::class);
     }
 
     /**
@@ -225,16 +234,7 @@ private function trimInstanceStartingBackslash(&$plugins)
      */
     protected function _sort($itemA, $itemB)
     {
-        if (isset($itemA['sortOrder'])) {
-            if (isset($itemB['sortOrder'])) {
-                return $itemA['sortOrder'] - $itemB['sortOrder'];
-            }
-            return $itemA['sortOrder'];
-        } elseif (isset($itemB['sortOrder'])) {
-            return (0 - (int)$itemB['sortOrder']);
-        } else {
-            return 0;
-        }
+        return ($itemA['sortOrder'] ?? PHP_INT_MIN) - ($itemB['sortOrder'] ?? PHP_INT_MIN);
     }
 
     /**
@@ -286,15 +286,11 @@ protected function _loadScopedData()
                 $this->_scopePriorityScheme[] = $scope;
             }
             $cacheId = implode('|', $this->_scopePriorityScheme) . "|" . $this->_cacheId;
-            $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-            $directoryList = $objectManager->get(DirectoryList::class);
-            $file = $directoryList->getPath(DirectoryList::GENERATED_METADATA) . '/' . $cacheId . '.' . 'php';
-            if (file_exists($file)) {
-                $data = include $file;
-                [$this->_data, $this->_inherited, $this->_processed] = $data;
-                foreach ($this->_scopePriorityScheme as $scopeCode) {
-                    $this->_loadedScopes[$scopeCode] = true;
-                }
+            $configData = $this->configLoader->load($cacheId);
+
+            if ($configData) {
+                [$this->_data, $this->_inherited, $this->_processed] = $configData;
+                $this->_loadedScopes[$scope] = true;
             } else {
                 $data = $this->_cache->load($cacheId);
                 if ($data) {
diff --git a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/PluginListGenerator.php b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/PluginListGenerator.php
index 10023cd107102..54fad36b5ed45 100644
--- a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/PluginListGenerator.php
+++ b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/PluginListGenerator.php
@@ -5,18 +5,12 @@
  */
 namespace Magento\Setup\Module\Di\App\Task\Operation;
 
-use Magento\Framework\App\ObjectManager\ConfigWriterInterface;
-use Magento\Framework\Config\ReaderInterface;
 use Magento\Framework\Config\ScopeInterface;
-use Magento\Framework\Interception\DefinitionInterface;
-use Magento\Framework\Interception\ObjectManager\ConfigInterface;
-use Magento\Framework\ObjectManager\DefinitionInterface as ClassDefinitions;
-use Magento\Framework\ObjectManager\RelationsInterface;
 use Magento\Setup\Module\Di\App\Task\OperationInterface;
-use Psr\Log\LoggerInterface;
+use Magento\Framework\Interception\ConfigWriterInterface;
 
 /**
- * Generates plugins for Magento per scope
+ * Writes plugins configuration data per scope to generated metadata files.
  */
 class PluginListGenerator implements OperationInterface
 {
@@ -25,122 +19,20 @@ class PluginListGenerator implements OperationInterface
      */
     private $scopeConfig;
 
-    /**
-     * Configuration reader
-     *
-     * @var ReaderInterface
-     */
-    private $reader;
-
-    /**
-     * Cache tag
-     *
-     * @var string
-     */
-    private $cacheId = 'plugin-list';
-
-    /**
-     * Scope priority loading scheme
-     *
-     * @var string[]
-     */
-    private $scopePriorityScheme;
-
-    /**
-     * Loaded scopes
-     *
-     * @var array
-     */
-    private $loadedScopes = [];
-
-    /**
-     * Type config
-     *
-     * @var ConfigInterface
-     */
-    private $omConfig;
-
-    /**
-     * Class relations information provider
-     *
-     * @var RelationsInterface
-     */
-    private $relations;
-
-    /**
-     * List of interception methods per plugin
-     *
-     * @var DefinitionInterface
-     */
-    private $definitions;
-
-    /**
-     * List of interceptable application classes
-     *
-     * @var ClassDefinitions
-     */
-    private $classDefinitions;
-
-    /**
-     * @var LoggerInterface
-     */
-    private $logger;
-
     /**
      * @var ConfigWriterInterface
      */
     private $configWriter;
 
     /**
-     * @var array
-     */
-    private $pluginData;
-
-    /**
-     * @var array
-     */
-    private $globalScopePluginData = [];
-
-    /**
-     * @var array
-     */
-    private $inherited = [];
-
-    /**
-     * @var array
-     */
-    private $processed;
-
-    /**
-     * @param ReaderInterface $reader
      * @param ScopeInterface $scopeConfig
-     * @param ConfigInterface $omConfig
-     * @param RelationsInterface $relations
-     * @param DefinitionInterface $definitions
-     * @param ClassDefinitions $classDefinitions
-     * @param LoggerInterface $logger
      * @param ConfigWriterInterface $configWriter
-     * @param array $scopePriorityScheme
      */
     public function __construct(
-        ReaderInterface $reader,
         ScopeInterface $scopeConfig,
-        ConfigInterface $omConfig,
-        RelationsInterface $relations,
-        DefinitionInterface $definitions,
-        ClassDefinitions $classDefinitions,
-        LoggerInterface $logger,
-        ConfigWriterInterface $configWriter,
-        array $scopePriorityScheme = ['global']
+        ConfigWriterInterface $configWriter
     ) {
-        $this->reader = $reader;
         $this->scopeConfig = $scopeConfig;
-        $this->omConfig = $omConfig;
-        $this->relations = $relations;
-        $this->definitions = $definitions;
-        $this->classDefinitions = $classDefinitions;
-        $this->logger = $logger;
-        $this->scopePriorityScheme = $scopePriorityScheme;
         $this->configWriter = $configWriter;
     }
 
@@ -151,39 +43,9 @@ public function doOperation()
     {
         $scopes = $this->scopeConfig->getAllScopes();
         // remove primary scope for production mode
-        array_shift($scopes);
+        $scopes = array_diff($scopes, ['primary']); // it does not reindex array
 
-        foreach ($scopes as $scope) {
-            $this->scopeConfig->setCurrentScope($scope);
-            if (false === isset($this->loadedScopes[$scope])) {
-                if (false === in_array($scope, $this->scopePriorityScheme, true)) {
-                    $this->scopePriorityScheme[] = $scope;
-                }
-                $cacheId = implode('|', $this->scopePriorityScheme) . "|" . $this->cacheId;
-
-                foreach ($this->loadScopedVirtualTypes() as $class) {
-                    $this->inheritPlugins($class);
-                }
-                foreach ($this->pluginData as $className => $value) {
-                    $this->inheritPlugins($className);
-                }
-                foreach ($this->getClassDefinitions() as $class) {
-                    $this->inheritPlugins($class);
-                }
-                if ($scope === 'global') {
-                    $this->globalScopePluginData = $this->pluginData;
-                }
-                $this->configWriter->write(
-                    $cacheId,
-                    [$this->pluginData, $this->inherited, $this->processed]
-                );
-                if (count($this->scopePriorityScheme) > 1) {
-                    array_pop($this->scopePriorityScheme);
-                    // merge global scope plugin data to other scopes by default
-                    $this->pluginData = $this->globalScopePluginData;
-                }
-            }
-        }
+        $this->configWriter->write($scopes);
     }
 
     /**
@@ -193,202 +55,4 @@ public function getName()
     {
         return 'Plugin list generation';
     }
-
-    /**
-     * Load virtual types for current scope
-     *
-     * @return array
-     */
-    private function loadScopedVirtualTypes()
-    {
-        $virtualTypes = [];
-        foreach ($this->scopePriorityScheme as $scopeCode) {
-            if (!isset($this->loadedScopes[$scopeCode])) {
-                $data = $this->reader->read($scopeCode) ?: [];
-                unset($data['preferences']);
-                if (count($data) > 0) {
-                    $this->inherited = [];
-                    $this->processed = [];
-                    $this->merge($data);
-                    foreach ($data as $class => $config) {
-                        if (isset($config['type'])) {
-                            $virtualTypes[] = $class;
-                        }
-                    }
-                }
-                $this->loadedScopes[$scopeCode] = true;
-            }
-            if ($this->isCurrentScope($scopeCode)) {
-                break;
-            }
-        }
-        return $virtualTypes;
-    }
-
-    /**
-     * Returns class definitions
-     *
-     * @return array
-     */
-    private function getClassDefinitions()
-    {
-        return $this->classDefinitions->getClasses();
-    }
-
-    /**
-     * Whether scope code is current scope code
-     *
-     * @param string $scopeCode
-     * @return bool
-     */
-    private function isCurrentScope($scopeCode)
-    {
-        return $this->scopeConfig->getCurrentScope() === $scopeCode;
-    }
-
-    /**
-     * Collect parent types configuration for requested type
-     *
-     * @param string $type
-     * @return array
-     * @throws \InvalidArgumentException
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
-     */
-    private function inheritPlugins($type)
-    {
-        $type = ltrim($type, '\\');
-        if (!isset($this->inherited[$type])) {
-            $realType = $this->omConfig->getOriginalInstanceType($type);
-
-            if ($realType !== $type) {
-                $plugins = $this->inheritPlugins($realType);
-            } elseif ($this->relations->has($type)) {
-                $relations = $this->relations->getParents($type);
-                $plugins = [];
-                foreach ($relations as $relation) {
-                    if ($relation) {
-                        $relationPlugins = $this->inheritPlugins($relation);
-                        if ($relationPlugins) {
-                            $plugins = array_replace_recursive($plugins, $relationPlugins);
-                        }
-                    }
-                }
-            } else {
-                $plugins = [];
-            }
-            if (isset($this->pluginData[$type])) {
-                if (!$plugins) {
-                    $plugins = $this->pluginData[$type];
-                } else {
-                    $plugins = array_replace_recursive($plugins, $this->pluginData[$type]);
-                }
-            }
-            $this->inherited[$type] = null;
-            if (is_array($plugins) && count($plugins)) {
-                $this->filterPlugins($plugins);
-                uasort($plugins, [$this, 'sort']);
-                $this->trimInstanceStartingBackslash($plugins);
-                $this->inherited[$type] = $plugins;
-                $lastPerMethod = [];
-                foreach ($plugins as $key => $plugin) {
-                    // skip disabled plugins
-                    if (isset($plugin['disabled']) && $plugin['disabled']) {
-                        unset($plugins[$key]);
-                        continue;
-                    }
-                    $pluginType = $this->omConfig->getOriginalInstanceType($plugin['instance']);
-                    if (!class_exists($pluginType)) {
-                        throw new \InvalidArgumentException('Plugin class ' . $pluginType . ' doesn\'t exist');
-                    }
-                    foreach ($this->definitions->getMethodList($pluginType) as $pluginMethod => $methodTypes) {
-                        $current = $lastPerMethod[$pluginMethod] ?? '__self';
-                        $currentKey = $type . '_' . $pluginMethod . '_' . $current;
-                        if ($methodTypes & DefinitionInterface::LISTENER_AROUND) {
-                            $this->processed[$currentKey][DefinitionInterface::LISTENER_AROUND] = $key;
-                            $lastPerMethod[$pluginMethod] = $key;
-                        }
-                        if ($methodTypes & DefinitionInterface::LISTENER_BEFORE) {
-                            $this->processed[$currentKey][DefinitionInterface::LISTENER_BEFORE][] = $key;
-                        }
-                        if ($methodTypes & DefinitionInterface::LISTENER_AFTER) {
-                            $this->processed[$currentKey][DefinitionInterface::LISTENER_AFTER][] = $key;
-                        }
-                    }
-                }
-            }
-            return $plugins;
-        }
-        return $this->inherited[$type];
-    }
-
-    /**
-     * Trims starting backslash from plugin instance name
-     *
-     * @param array $plugins
-     * @return void
-     */
-    private function trimInstanceStartingBackslash(&$plugins)
-    {
-        foreach ($plugins as &$plugin) {
-            $plugin['instance'] = ltrim($plugin['instance'], '\\');
-        }
-    }
-
-    /**
-     * Remove from list not existing plugins
-     *
-     * @param array $plugins
-     * @return void
-     */
-    private function filterPlugins(array &$plugins)
-    {
-        foreach ($plugins as $name => $plugin) {
-            if (empty($plugin['instance'])) {
-                unset($plugins[$name]);
-                $this->logger->info("Reference to undeclared plugin with name '{$name}'.");
-            }
-        }
-    }
-
-    /**
-     * Merge configuration
-     *
-     * @param array $config
-     * @return void
-     */
-    private function merge(array $config)
-    {
-        foreach ($config as $type => $typeConfig) {
-            if (isset($typeConfig['plugins'])) {
-                $type = ltrim($type, '\\');
-                if (isset($this->pluginData[$type])) {
-                    $this->pluginData[$type] = array_replace_recursive($this->pluginData[$type], $typeConfig['plugins']);
-                } else {
-                    $this->pluginData[$type] = $typeConfig['plugins'];
-                }
-            }
-        }
-    }
-
-    /**
-     * Sort items
-     *
-     * @param array $itemA
-     * @param array $itemB
-     * @return int
-     */
-    private function sort($itemA, $itemB)
-    {
-        if (isset($itemA['sortOrder'])) {
-            if (isset($itemB['sortOrder'])) {
-                return $itemA['sortOrder'] - $itemB['sortOrder'];
-            }
-            return $itemA['sortOrder'];
-        } elseif (isset($itemB['sortOrder'])) {
-            return (0 - (int)$itemB['sortOrder']);
-        } else {
-            return 0;
-        }
-    }
 }

From 6d43eb149677be44be5b76400a1c4b9cba97a1aa Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 10 Jun 2020 11:17:31 +0300
Subject: [PATCH 0419/1718] add type to parameter

---
 .../Model/Import/AdvancedPricing/Validator/Website.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php
index a6c6bbb4cd49b..93c63dcbcab28 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/Website.php
@@ -60,7 +60,7 @@ protected function isWebsiteValid($value, $websiteCode)
     /**
      * Validate value
      *
-     * @param mixed $value
+     * @param array $value
      *
      * @return bool
      */

From d57ff13811645c8f44737294a75e05cb1d89e325 Mon Sep 17 00:00:00 2001
From: John Carlo Octabio <johncarlo@abovethefray.io>
Date: Wed, 10 Jun 2020 16:19:52 +0800
Subject: [PATCH 0420/1718] magento/magento2#108: Clear Shopping Cart -
 Refactor PHPdoc to fix Code Sniffer error must have one blank line between
 short and long description

---
 app/code/Magento/Checkout/Block/Cart/Grid.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/Block/Cart/Grid.php b/app/code/Magento/Checkout/Block/Cart/Grid.php
index ed70619b0a66c..357e750f4bb6b 100644
--- a/app/code/Magento/Checkout/Block/Cart/Grid.php
+++ b/app/code/Magento/Checkout/Block/Cart/Grid.php
@@ -166,7 +166,8 @@ public function getItems()
 
     /**
      * Verify if display pager on shopping cart
-     * If cart block has custom_items and items qty in the shopping cart<limit from stores configuration
+     *
+     * Check if cart block has custom_items and items qty in the shopping cart<limit from stores configuration
      *
      * @return bool
      */

From e15fc1d9741a566d657e06950e5a3b3fe6a6c579 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 10 Jun 2020 11:34:54 +0300
Subject: [PATCH 0421/1718] fixed static test

---
 .../Model/Import/AdvancedPricing.php           | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
index e0e70251fefb2..254dbcca852ee 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php
@@ -10,7 +10,7 @@
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
 
 /**
- * Class AdvancedPricing
+ *  Import advanced pricing class
  *
  * @SuppressWarnings(PHPMD.ExcessiveParameterList)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -19,35 +19,20 @@
 class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
 {
     const VALUE_ALL_GROUPS = 'ALL GROUPS';
-
     const VALUE_ALL_WEBSITES = 'All Websites';
-
     const COL_SKU = 'sku';
-
     const COL_TIER_PRICE_WEBSITE = 'tier_price_website';
-
     const COL_TIER_PRICE_CUSTOMER_GROUP = 'tier_price_customer_group';
-
     const COL_TIER_PRICE_QTY = 'tier_price_qty';
-
     const COL_TIER_PRICE = 'tier_price';
-
     const COL_TIER_PRICE_PERCENTAGE_VALUE = 'percentage_value';
-
     const COL_TIER_PRICE_TYPE = 'tier_price_value_type';
-
     const TIER_PRICE_TYPE_FIXED = 'Fixed';
-
     const TIER_PRICE_TYPE_PERCENT = 'Discount';
-
     const TABLE_TIER_PRICE = 'catalog_product_entity_tier_price';
-
     const DEFAULT_ALL_GROUPS_GROUPED_PRICE_VALUE = '0';
-
     const ENTITY_TYPE_CODE = 'advanced_pricing';
-
     const VALIDATOR_MAIN = 'validator';
-
     const VALIDATOR_WEBSITE = 'validator_website';
 
     /**
@@ -55,7 +40,6 @@ class AdvancedPricing extends \Magento\ImportExport\Model\Import\Entity\Abstract
      * @see VALIDATOR_TIER_PRICE
      */
     private const VALIDATOR_TEAR_PRICE = 'validator_tier_price';
-
     private const VALIDATOR_TIER_PRICE = 'validator_tier_price';
 
     /**

From 62d4146754bf2dd1387887cd3dd5cf202baa8027 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Wed, 10 Jun 2020 11:19:12 +0200
Subject: [PATCH 0422/1718] Use CamelCase for mutation parameters

---
 .../Model/Resolver/AddProductsToCart.php             | 12 ++++++------
 app/code/Magento/QuoteGraphQl/etc/schema.graphqls    |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/AddProductsToCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/AddProductsToCart.php
index ccb6897e358d0..b8213cab61bba 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/AddProductsToCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/AddProductsToCart.php
@@ -51,16 +51,16 @@ public function __construct(
      */
     public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
     {
-        if (empty($args['cart_id'])) {
-            throw new GraphQlInputException(__('Required parameter "cart_id" is missing'));
+        if (empty($args['cartId'])) {
+            throw new GraphQlInputException(__('Required parameter "cartId" is missing'));
         }
-        if (empty($args['cart_items']) || !is_array($args['cart_items'])
+        if (empty($args['cartItems']) || !is_array($args['cartItems'])
         ) {
-            throw new GraphQlInputException(__('Required parameter "cart_items" is missing'));
+            throw new GraphQlInputException(__('Required parameter "cartItems" is missing'));
         }
 
-        $maskedCartId = $args['cart_id'];
-        $cartItemsData = $args['cart_items'];
+        $maskedCartId = $args['cartId'];
+        $cartItemsData = $args['cartItems'];
         $storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
 
         // Shopping Cart validation
diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
index dc0bf89abb9d8..725c34870a042 100644
--- a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -22,7 +22,7 @@ type Mutation {
     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")
     placeOrder(input: PlaceOrderInput): PlaceOrderOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\PlaceOrder")
-    addProductsToCart(cart_id: String!, cart_items: [CartItemInput!]!): AddProductsToCartOutput @doc(description:"Add products to the cart. Provide single interface for all product types ") @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\AddProductsToCart")
+    addProductsToCart(cartId: String!, cartItems: [CartItemInput!]!): AddProductsToCartOutput @doc(description:"Add products to the cart. Provide single interface for all product types ") @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\AddProductsToCart")
 }
 
 input createEmptyCartInput {

From d29468da99c7dae39be1dbef880edd867440891f Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 10 Jun 2020 12:31:55 +0300
Subject: [PATCH 0423/1718] add data to schema

---
 app/code/Magento/PaypalGraphQl/etc/schema.graphqls | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/code/Magento/PaypalGraphQl/etc/schema.graphqls b/app/code/Magento/PaypalGraphQl/etc/schema.graphqls
index b8f14eec70d18..b925aba293209 100644
--- a/app/code/Magento/PaypalGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/PaypalGraphQl/etc/schema.graphqls
@@ -51,6 +51,7 @@ input PaymentMethodInput {
     payflow_link: PayflowLinkInput @doc(description:"Required input for PayPal Payflow Link and Payments Advanced payments")
     payflowpro: PayflowProInput @doc(description: "Required input type for PayPal Payflow Pro and Payment Pro payments")
     hosted_pro: HostedProInput @doc(description:"Required input for PayPal Hosted pro payments")
+    payflowpro_cc_vault: VaultTokenInput
 }
 
 input HostedProInput @doc(description:"A set of relative URLs that PayPal will use in response to various actions during the authorization process. Magento prepends the base URL to this value to create a full URL. For example, if the full URL is https://www.example.com/path/to/page.html, the relative URL is path/to/page.html. Use this input for Payments Pro Hosted Solution payment method.") {
@@ -102,6 +103,7 @@ input PayflowProTokenInput @doc(description:"Input required to fetch payment tok
 
 input PayflowProInput @doc(description:"Required input for Payflow Pro and Payments Pro payment methods.") {
     cc_details: CreditCardDetailsInput! @doc(description: "Required input for credit card related information")
+    is_active_payment_token_enabler: Boolean! @doc(description:"States whether an entered by a customer credit/debit card should be tokenized for later usage. Required only if Vault is enabled for PayPal Payflow Pro payment integration.")
 }
 
 input CreditCardDetailsInput @doc(description:"Required fields for Payflow Pro and Payments Pro credit card payments") {
@@ -141,3 +143,7 @@ input PayflowProResponseInput @doc(description:"Input required to complete payme
 type PayflowProResponseOutput {
     cart: Cart!
 }
+
+input VaultTokenInput @doc(description:"Required input for payment methods with Vault support.") {
+    public_hash: String! @doc(description: "The public hash of the payment token")
+}

From 8293d8739dbd3401594c599750653556f47e571d Mon Sep 17 00:00:00 2001
From: Kate Kyzyma <kate@atwix.com>
Date: Wed, 10 Jun 2020 13:23:45 +0300
Subject: [PATCH 0424/1718] Updating the test

---
 ...frontAssertProperUrlIsShownActionGroup.xml | 21 ++++++++
 ...nUpdateCategoryUrlKeyWithStoreViewTest.xml | 54 +++++++------------
 2 files changed, 39 insertions(+), 36 deletions(-)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProperUrlIsShownActionGroup.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProperUrlIsShownActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProperUrlIsShownActionGroup.xml
new file mode 100644
index 0000000000000..6fb7f68f64320
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProperUrlIsShownActionGroup.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="StorefrontAssertProperUrlIsShownActionGroup">
+        <annotations>
+            <description>Validate that the URL path is correct</description>
+        </annotations>
+        <arguments>
+           <argument name="urlPath" type="string"/>
+        </arguments>
+
+        <seeInCurrentUrl url="{{urlPath}}" stepKey="checkUrl"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryUrlKeyWithStoreViewTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryUrlKeyWithStoreViewTest.xml
index 6b968237d2727..3bbe8722d8bfc 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryUrlKeyWithStoreViewTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryUrlKeyWithStoreViewTest.xml
@@ -32,17 +32,7 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
-        <!--&lt;!&ndash;Open Store Page &ndash;&gt;-->
-        <!--<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>-->
-        <!--<waitForPageLoad stepKey="waitForSystemStorePage"/>-->
-
-        <!--&lt;!&ndash;Create Custom Store &ndash;&gt;-->
-        <!--<click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>-->
-        <!--<fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" stepKey="fillStoreName"/>-->
-        <!--<fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" stepKey="fillStoreCode"/>-->
-        <!--<selectOption userInput="{{NewRootCategory.name}}" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectStoreStatus"/>-->
-        <!--<click selector="{{AdminStoresMainActionsSection.saveButton}}" stepKey="clickSaveStoreButton"/>-->
-
+        <!--Create Custom Store -->
         <actionGroup ref="CreateCustomStoreActionGroup" stepKey="createCustomStore">
             <argument name="website" value="{{_defaultWebsite.name}}"/>
             <argument name="store" value="{{customStore.name}}"/>
@@ -56,16 +46,8 @@
         </actionGroup>
 
         <!--Verify Category in Store View-->
-        <!--<amOnPage url="/{{NewRootCategory.name}}/{{SimpleRootSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFront"/>-->
-        <!--<waitForPageLoad stepKey="waitForSystemStorePage1"/>-->
-        <!--<click selector="{{StorefrontFooterSection.switchStoreButton}}" stepKey="ClickSwitchStoreButtonOnDefaultStore"/>-->
-        <!--<click selector="{{StorefrontFooterSection.storeLink(customStore.name)}}" stepKey="SelectSecondStoreToSwitchOn"/>-->
-        <!--<seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="seeCatergoryInStoreFront"/>-->
-        <!--<click selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="selectCategory"/>-->
-        <!--<waitForPageLoad stepKey="waitForProductToLoad"/>-->
-
         <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToHomepage"/>
-        <actionGroup ref="StorefrontSwitchStoreActionGroup" stepKey="switchCustomStore">
+        <actionGroup ref="StorefrontSwitchStoreActionGroup" stepKey="switchToCustomStore">
             <argument name="storeName" value="{{customStore.name}}"/>
         </actionGroup>
         <actionGroup ref="StorefrontAssertCategoryNameIsShownInMenuActionGroup" stepKey="seeCatergoryInStoreFront">
@@ -76,25 +58,25 @@
         </actionGroup>
 
         <!--Update URL Key-->
-        <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleRootSubCategory.name)}}" stepKey="selectCategory1"/>
-        <scrollTo selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="scrollToSearchEngineOptimization"/>
-        <click selector="{{AdminCategorySEOSection.SectionHeader}}"  stepKey="openSeoSection"/>
-        <clearField selector="{{AdminCategorySEOSection.UrlKeyInput}}" stepKey="clearUrlKeyField"/>
-        <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="newurlkey" stepKey="enterURLKey"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategoryAfterFirstSeoUpdate"/>
-        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccessMessage"/>
-        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <actionGroup ref="NavigateToCreatedCategoryActionGroup" stepKey="openCreatedSubCategory">
+            <argument name="Category" value="$$category$$"/>
+        </actionGroup>
+        <actionGroup ref="ChangeSeoUrlKeyActionGroup" stepKey="changeSeoUrlKey">
+            <argument name="value" value="newurlkey"/>
+        </actionGroup>
 
         <!--Open Category Store Front Page-->
-        <amOnPage url="/{{NewRootCategory.name}}/{{SimpleRootSubCategory.name}}.html" stepKey="seeTheCategoryInStoreFront1"/>
-        <waitForPageLoad stepKey="waitForSystemStorePage3"/>
-        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="seeCategoryOnNavigation1"/>
-        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleRootSubCategory.name)}}" stepKey="selectCategory2"/>
-        <waitForPageLoad stepKey="waitForProductToLoad1"/>
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openHomepage"/>
+        <actionGroup ref="StorefrontAssertCategoryNameIsShownInMenuActionGroup" stepKey="seeCatergoryNameInStoreFront">
+            <argument name="categoryName" value="{{SimpleRootSubCategory.name}}"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openCategory">
+            <argument name="categoryName" value="{{SimpleRootSubCategory.name}}"/>
+        </actionGroup>
 
         <!--Verify Updated URLKey is present-->
-        <seeInCurrentUrl stepKey="verifyUpdatedUrlKey" url="newurlkey.html"/>
+        <actionGroup ref="StorefrontAssertProperUrlIsShownActionGroup" stepKey="seeUpdatedUrlkey">
+            <argument name="urlPath" value="newurlkey.html"/>
+        </actionGroup>
     </test>
 </tests>

From 88778bdaa8797e221490f360799760e872495f88 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Wed, 10 Jun 2020 14:09:57 +0300
Subject: [PATCH 0425/1718] magento/magento2#23972 fix disabled guest checkout
 issue

---
 .../Observer/IsAllowedGuestCheckoutObserver.php  | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php b/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
index b24cddd845c9c..6e42f73c0f95c 100644
--- a/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
+++ b/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
@@ -15,6 +15,7 @@
 use Magento\Quote\Api\Data\CartItemInterface;
 use Magento\Quote\Model\Quote;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Checks if guest checkout is allowed then quote contains downloadable products.
@@ -36,14 +37,25 @@ class IsAllowedGuestCheckoutObserver implements ObserverInterface
      * @var LinkCollectionFactory
      */
     private $linkCollectionFactory;
+    
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
 
     /**
      * @param ScopeConfigInterface $scopeConfig
      * @param LinkCollectionFactory $linkCollectionFactory
+     * @param StoreManagerInterface $storeManager
      */
-    public function __construct(ScopeConfigInterface $scopeConfig, LinkCollectionFactory $linkCollectionFactory) {
+    public function __construct(
+        ScopeConfigInterface $scopeConfig,
+        LinkCollectionFactory $linkCollectionFactory,
+        StoreManagerInterface $storeManager
+    ) {
         $this->scopeConfig = $scopeConfig;
         $this->linkCollectionFactory = $linkCollectionFactory;
+        $this->storeManager = $storeManager;
     }
 
     /**
@@ -54,7 +66,7 @@ public function __construct(ScopeConfigInterface $scopeConfig, LinkCollectionFac
      */
     public function execute(Observer $observer)
     {
-        $storeId = (int)$observer->getEvent()->getStore()->getId();
+        $storeId = (int)$this->storeManager->getStore($observer->getEvent()->getStore())->getId();
         $result = $observer->getEvent()->getResult();
 
         /* @var $quote Quote */

From 63ad4a30723c6c7990731a725c5caaa049f1db7d Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Wed, 10 Jun 2020 14:24:22 +0300
Subject: [PATCH 0426/1718] magento/magento2#23972 fix disabled guest checkout
 issue

Fix static test
---
 .../Downloadable/Observer/IsAllowedGuestCheckoutObserver.php  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php b/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
index 6e42f73c0f95c..ea8df05e6a79a 100644
--- a/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
+++ b/app/code/Magento/Downloadable/Observer/IsAllowedGuestCheckoutObserver.php
@@ -37,7 +37,7 @@ class IsAllowedGuestCheckoutObserver implements ObserverInterface
      * @var LinkCollectionFactory
      */
     private $linkCollectionFactory;
-    
+
     /**
      * @var StoreManagerInterface
      */
@@ -118,6 +118,8 @@ private function checkForShareableLinks(CartItemInterface $item, int $storeId):
     }
 
     /**
+     * Returns not sharable values depending on configuration
+     *
      * @param int $storeId
      * @return array
      */

From 88953acffdf5c0c270baa1b514c7bbbf4dce1e50 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Wed, 10 Jun 2020 14:24:54 +0300
Subject: [PATCH 0427/1718] magento/magento2#23972 fix disabled guest checkout
 issue

Fix unit tests
---
 .../IsAllowedGuestCheckoutObserverTest.php    | 44 ++++++++++++-------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php b/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
index eba1242d53916..6040b301a60a8 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Observer/IsAllowedGuestCheckoutObserverTest.php
@@ -18,6 +18,7 @@
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\Quote\Item as QuoteItem;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -27,7 +28,9 @@
 class IsAllowedGuestCheckoutObserverTest extends TestCase
 {
     private const XML_PATH_DISABLE_GUEST_CHECKOUT = 'catalog/downloadable/disable_guest_checkout';
-    
+
+    private const STUB_STORE_ID = 1;
+
     /** @var IsAllowedGuestCheckoutObserver */
     private $isAllowedGuestCheckoutObserver;
 
@@ -56,6 +59,11 @@ class IsAllowedGuestCheckoutObserverTest extends TestCase
      */
     private $storeMock;
 
+    /**
+     * @var MockObject|StoreManagerInterface
+     */
+    private $storeManagerMock;
+
     /**
      * Sets up the fixture, for example, open a network connection.
      * This method is called before a test is executed.
@@ -86,12 +94,20 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->isAllowedGuestCheckoutObserver = (new ObjectManagerHelper($this))->getObject(
-            IsAllowedGuestCheckoutObserver::class,
-            [
-                'scopeConfig' => $this->scopeConfigMock,
-            ]
-        );
+        $this->storeManagerMock = $this->getMockForAbstractClass(StoreManagerInterface::class);
+        $this->storeManagerMock
+            ->method('getStore')
+            ->with(self::STUB_STORE_ID)
+            ->willReturn($this->storeMock);
+
+        $this->isAllowedGuestCheckoutObserver = (new ObjectManagerHelper($this))
+            ->getObject(
+                IsAllowedGuestCheckoutObserver::class,
+                [
+                    'scopeConfig' => $this->scopeConfigMock,
+                    'storeManager'=> $this->storeManagerMock
+                ]
+            );
     }
 
     /**
@@ -103,8 +119,6 @@ protected function setUp(): void
      */
     public function testIsAllowedGuestCheckoutConfigSetToTrue($productType, $isAllowed): void
     {
-        $storeId = 1;
-
         if ($isAllowed) {
             $this->resultMock->expects($this->at(0))
                 ->method('setIsAllowed')
@@ -144,7 +158,7 @@ public function testIsAllowedGuestCheckoutConfigSetToTrue($productType, $isAllow
 
         $this->storeMock->expects($this->any())
             ->method('getId')
-            ->willReturn($storeId);
+            ->willReturn(self::STUB_STORE_ID);
 
         $this->eventMock->expects($this->once())
             ->method('getResult')
@@ -159,7 +173,7 @@ public function testIsAllowedGuestCheckoutConfigSetToTrue($productType, $isAllow
             ->with(
                 self::XML_PATH_DISABLE_GUEST_CHECKOUT,
                 ScopeInterface::SCOPE_STORE,
-                $storeId
+                self::STUB_STORE_ID
             )
             ->willReturn(true);
 
@@ -186,8 +200,6 @@ public function dataProviderForTestisAllowedGuestCheckoutConfigSetToTrue(): arra
 
     public function testIsAllowedGuestCheckoutConfigSetToFalse(): void
     {
-        $storeId = 1;
-
         $product = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
             ->setMethods(['getTypeId'])
@@ -218,10 +230,10 @@ public function testIsAllowedGuestCheckoutConfigSetToFalse(): void
         $this->eventMock->expects($this->once())
             ->method('getStore')
             ->willReturn($this->storeMock);
-        
+
         $this->storeMock->expects($this->any())
             ->method('getId')
-            ->willReturn($storeId);
+            ->willReturn(self::STUB_STORE_ID);
 
         $this->eventMock->expects($this->once())
             ->method('getResult')
@@ -236,7 +248,7 @@ public function testIsAllowedGuestCheckoutConfigSetToFalse(): void
             ->with(
                 self::XML_PATH_DISABLE_GUEST_CHECKOUT,
                 ScopeInterface::SCOPE_STORE,
-                $storeId
+                self::STUB_STORE_ID
             )
             ->willReturn(false);
 

From 1f7eace566744d292a5430afc38ec833e6f06f79 Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Wed, 10 Jun 2020 16:02:38 +0300
Subject: [PATCH 0428/1718] MFTF test.

---
 ...roductLinkInCustomerAccountActionGroup.xml |  26 +++++
 ...ontCustomerDownloadableProductsSection.xml |   1 +
 ...dableProductLinkAfterPartialRefundTest.xml | 107 ++++++++++++++++++
 3 files changed, 134 insertions(+)
 create mode 100644 app/code/Magento/Downloadable/Test/Mftf/ActionGroup/StorefrontNotAssertDownloadableProductLinkInCustomerAccountActionGroup.xml
 create mode 100644 app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontAccountDownloadableProductLinkAfterPartialRefundTest.xml

diff --git a/app/code/Magento/Downloadable/Test/Mftf/ActionGroup/StorefrontNotAssertDownloadableProductLinkInCustomerAccountActionGroup.xml b/app/code/Magento/Downloadable/Test/Mftf/ActionGroup/StorefrontNotAssertDownloadableProductLinkInCustomerAccountActionGroup.xml
new file mode 100644
index 0000000000000..ae288c7033e17
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/ActionGroup/StorefrontNotAssertDownloadableProductLinkInCustomerAccountActionGroup.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="StorefrontNotAssertDownloadableProductLinkInCustomerAccountActionGroup">
+        <annotations>
+            <description>Goes to the Storefront Customer Dashboard page. Clicks on 'My Downloadable Products'. Validates that the provided Downloadable Product is present and Downloadable link not exist.</description>
+        </annotations>
+        <arguments>
+            <argument name="product"/>
+        </arguments>
+
+        <amOnPage url="{{StorefrontCustomerDashboardPage.url}}" stepKey="goToMyAccountPage"/>
+        <click selector="{{StorefrontCustomerSidebarSection.sidebarTab('My Downloadable Products')}}" stepKey="clickDownloadableProducts"/>
+        <waitForPageLoad stepKey="waitForDownloadableProductsPageLoad"/>
+        <seeElement selector="{{StorefrontCustomerDownloadableProductsSection.productName(product.name)}}" stepKey="seeStorefrontDownloadableProductsProductName"/>
+        <dontSeeElement selector="{{StorefrontCustomerDownloadableProductsSection.downloadableLink}}" stepKey="dontSeeStorefrontMyDownloadableProductsLink"/>
+
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Section/StorefrontCustomerDownloadableProductsSection.xml b/app/code/Magento/Downloadable/Test/Mftf/Section/StorefrontCustomerDownloadableProductsSection.xml
index d45a774077ba0..5d340e6c91060 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Section/StorefrontCustomerDownloadableProductsSection.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Section/StorefrontCustomerDownloadableProductsSection.xml
@@ -10,5 +10,6 @@
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontCustomerDownloadableProductsSection">
         <element name="productName" type="text" selector="//table[@id='my-downloadable-products-table']//strong[contains(@class, 'product-name') and normalize-space(.)='{{productName}}']" parameterized="true"/>
+        <element name="downloadableLink" type="button" selector="//table[@id='my-downloadable-products-table']//a[contains(@class, 'download')]"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontAccountDownloadableProductLinkAfterPartialRefundTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontAccountDownloadableProductLinkAfterPartialRefundTest.xml
new file mode 100644
index 0000000000000..3659fd882c5d3
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontAccountDownloadableProductLinkAfterPartialRefundTest.xml
@@ -0,0 +1,107 @@
+<?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="StorefrontAccountDownloadableProductLinkAfterPartialRefundTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Customer Account Downloadable Products Link"/>
+            <title value="My Account Downloadable Product Link after Partially Refunded"/>
+            <description value="Verify that Downloadable product is not available in My Download Products tab after it has been partially refunded."/>
+            <severity value="CRITICAL"/>
+            <group value="Downloadable"/>
+        </annotations>
+
+        <before>
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add example.com static.magento.com"/>
+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
+
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiDownloadableProduct" stepKey="createDownloadableProduct"/>
+            <createData entity="downloadableLink1" stepKey="addDownloadableLink1">
+                <requiredEntity createDataKey="createDownloadableProduct"/>
+            </createData>
+
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
+            <createData entity="Simple_US_Customer_Multiple_Addresses" stepKey="createCustomer"/>
+            <actionGroup ref="LoginToStorefrontActionGroup" stepKey="signIn">
+                <argument name="Customer" value="$$createCustomer$$"/>
+            </actionGroup>
+        </before>
+
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
+
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createDownloadableProduct" stepKey="deleteDownloadableProduct"/>
+
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove example.com static.magento.com"/>
+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        </after>
+
+        <actionGroup ref="StorefrontAddSimpleProductToShoppingCartActionGroup" stepKey="addSimpleProductToCart">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+
+        <amOnPage url="{{StorefrontProductPage.url($$createDownloadableProduct.custom_attributes[url_key]$$)}}" stepKey="OpenStoreFrontProductPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+
+        <actionGroup ref="StorefrontAddToCartCustomOptionsProductPageActionGroup" stepKey="addToTheCart">
+            <argument name="productName" value="$$createDownloadableProduct.name$$"/>
+        </actionGroup>
+
+        <actionGroup ref="ClickViewAndEditCartFromMiniCartActionGroup" stepKey="goToShoppingCartFromMinicart"/>
+        <click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout"/>
+        <waitForPageLoad stepKey="waitForProceedToCheckout"/>
+        <waitForElementVisible selector="{{CheckoutShippingSection.shipHereButton(UK_Not_Default_Address.street[0])}}" stepKey="waitForShipHereVisible"/>
+        <click selector="{{CheckoutShippingSection.shipHereButton(UK_Not_Default_Address.street[0])}}" stepKey="clickShipHere"/>
+        <click selector="{{CheckoutShippingGuestInfoSection.next}}" stepKey="clickNext"/>
+        <waitForPageLoad stepKey="waitForShipmentPageLoad"/>
+        <checkOption selector="{{CheckoutPaymentSection.billingAddressNotSameCheckbox}}" stepKey="selectPaymentSolution"/>
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" stepKey="waitForPaymentSectionLoaded"/>
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrderButton"/>
+        <seeElement selector="{{CheckoutSuccessMainSection.success}}" stepKey="orderIsSuccessfullyPlaced"/>
+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
+
+        <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
+
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
+        <actionGroup ref="SearchAdminDataGridByKeywordActionGroup" stepKey="searchOrder">
+            <argument name="keyword" value="$grabOrderNumber"/>
+        </actionGroup>
+        <actionGroup ref="AdminOrderGridClickFirstRowActionGroup" stepKey="clickOrderRow"/>
+
+        <actionGroup ref="AdminCreateInvoiceActionGroup" stepKey="createCreditMemo"/>
+
+        <actionGroup ref="OpenOrderByIdActionGroup" stepKey="openOrder">
+            <argument name="orderId" value="{$grabOrderNumber}"/>
+        </actionGroup>
+
+        <actionGroup ref="AdminOpenAndFillCreditMemoRefundActionGroup" stepKey="fillCreditMemoRefund">
+            <argument name="itemQtyToRefund" value="0"/>
+            <argument name="rowNumber" value="1"/>
+        </actionGroup>
+
+        <click selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="clickRefundOffline"/>
+        <waitForPageLoad stepKey="waitForResultPage"/>
+
+        <actionGroup ref="StorefrontNotAssertDownloadableProductLinkInCustomerAccountActionGroup" stepKey="dontSeeStorefrontMyAccountDownloadableProductsLink">
+            <argument name="product" value="$$createDownloadableProduct$$"/>
+        </actionGroup>
+
+    </test>
+</tests>

From f77a8f78469b8b11fa8c1165932b007e5b70f7fc Mon Sep 17 00:00:00 2001
From: Viktor Sevch <viktor.sevch@transoftgroup.com>
Date: Wed, 10 Jun 2020 17:17:42 +0300
Subject: [PATCH 0429/1718] MC-35071: Unexpected behavior when closing tab in
 admin panel

---
 app/code/Magento/Config/Block/System/Config/Form/Fieldset.php | 1 +
 1 file changed, 1 insertion(+)

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 20b6408eebe82..2617da442cfd1 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Fieldset.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Fieldset.php
@@ -175,6 +175,7 @@ protected function _getHeaderTitleHtml($element)
             '-link">' . $element->getLegend() . '</a>' .
             /* @noEscape */ $this->secureRenderer->renderEventListenerAsTag(
                 'onclick',
+                'event.preventDefault();' .
                 "Fieldset.toggleCollapse('" . $element->getHtmlId() . "', '" .
                  $this->_urlBuilder->getUrl('*/*/state') . "'); return false;",
                 'a#' . $element->getHtmlId() . '-head'

From b4394d0fe31f7ce3905a33198c31d69e8337f637 Mon Sep 17 00:00:00 2001
From: Ji Lu <jilu1@adobe.com>
Date: Wed, 10 Jun 2020 13:48:58 -0500
Subject: [PATCH 0430/1718] MQE-2153: bump MFTF version to 3.0.0-RC4

---
 .../Test/AdminLockAdminUserWhenCreatingNewIntegrationTest.xml  | 3 +++
 .../Mftf/Test/AdminLockAdminUserWhenCreatingNewRoleTest.xml    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/app/code/Magento/Security/Test/Mftf/Test/AdminLockAdminUserWhenCreatingNewIntegrationTest.xml b/app/code/Magento/Security/Test/Mftf/Test/AdminLockAdminUserWhenCreatingNewIntegrationTest.xml
index 83e3479c753e4..d2896736908d3 100644
--- a/app/code/Magento/Security/Test/Mftf/Test/AdminLockAdminUserWhenCreatingNewIntegrationTest.xml
+++ b/app/code/Magento/Security/Test/Mftf/Test/AdminLockAdminUserWhenCreatingNewIntegrationTest.xml
@@ -18,6 +18,9 @@
             <testCaseId value="MC-14382" />
             <group value="security"/>
             <group value="mtf_migrated"/>
+            <skip>
+                <issueId value="MQE-1964"/>
+            </skip>
         </annotations>
         <before>
             <!-- Log in to Admin Panel -->
diff --git a/app/code/Magento/Security/Test/Mftf/Test/AdminLockAdminUserWhenCreatingNewRoleTest.xml b/app/code/Magento/Security/Test/Mftf/Test/AdminLockAdminUserWhenCreatingNewRoleTest.xml
index 3fffbcd480761..ac5e998e53f5f 100644
--- a/app/code/Magento/Security/Test/Mftf/Test/AdminLockAdminUserWhenCreatingNewRoleTest.xml
+++ b/app/code/Magento/Security/Test/Mftf/Test/AdminLockAdminUserWhenCreatingNewRoleTest.xml
@@ -18,6 +18,9 @@
             <testCaseId value="MC-14384" />
             <group value="security"/>
             <group value="mtf_migrated"/>
+            <skip>
+                <issueId value="MQE-1964"/>
+            </skip>
         </annotations>
         <before>
             <!-- Log in to Admin Panel -->

From 1ad25f9e48d19b3740fdbff5229da9b169e85aff Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Wed, 10 Jun 2020 22:32:27 +0300
Subject: [PATCH 0431/1718] magento/magento2-login-as-customer#156: Banner
 disappear when admin edit customer data from Account Information tab.

---
 .../frontend/web/js/view/loginAsCustomer.js   | 41 +++++++++++++++----
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/web/js/view/loginAsCustomer.js b/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/web/js/view/loginAsCustomer.js
index 7f6cad6ce3f2d..06dffd76f19f3 100644
--- a/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/web/js/view/loginAsCustomer.js
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/web/js/view/loginAsCustomer.js
@@ -8,7 +8,7 @@ define([
     'uiComponent',
     'Magento_Customer/js/customer-data',
     'mage/translate'
-], function ($, Component, customerData) {
+], function ($, Component, customer) {
     'use strict';
 
     return Component.extend({
@@ -19,23 +19,48 @@ define([
 
         /** @inheritdoc */
         initialize: function () {
+            var customerData, loggedAsCustomerData;
+
             this._super();
 
-            this.customer = customerData.get('customer');
-            this.loginAsCustomer = customerData.get('loggedAsCustomer');
-            this.isVisible(this.loginAsCustomer().adminUserId);
+            customerData = customer.get('customer');
+            loggedAsCustomerData = customer.get('loggedAsCustomer');
+
+            customerData.subscribe(function (data) {
+                this.fullname = data.fullname;
+                this._updateBanner();
+            }.bind(this));
+            loggedAsCustomerData.subscribe(function (data) {
+                this.adminUserId = data.adminUserId;
+                this.websiteName = data.websiteName;
+                this._updateBanner();
+            }.bind(this));
+
+            this.fullname = customerData().fullname;
+            this.adminUserId = loggedAsCustomerData().adminUserId;
+            this.websiteName = loggedAsCustomerData().websiteName;
 
-            this.notificationText = $.mage.__('You are connected as <strong>%1</strong> on %2')
-                .replace('%1', this.customer().fullname)
-                .replace('%2', this.loginAsCustomer().websiteName);
+            this._updateBanner();
         },
 
         /** @inheritdoc */
         initObservable: function () {
             this._super()
-                .observe('isVisible');
+                .observe(['isVisible', 'notificationText']);
 
             return this;
+        },
+
+        _updateBanner: function () {
+            if (this.adminUserId !== undefined) {
+                this.isVisible(this.adminUserId);
+            }
+
+            if (this.fullname !== undefined && this.websiteName !== undefined) {
+                this.notificationText($.mage.__('You are connected as <strong>%1</strong> on %2')
+                    .replace('%1', this.fullname)
+                    .replace('%2', this.websiteName));
+            }
         }
     });
 });

From f5bb9507fecbf269cb701bb1188673b9cf093478 Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Wed, 10 Jun 2020 14:52:39 -0500
Subject: [PATCH 0432/1718] MC-33857: Update AdapterInterface::fetchRow return
 type

---
 dev/tests/api-functional/phpunit_graphql.xml.dist             | 2 +-
 dev/tests/api-functional/phpunit_soap.xml.dist                | 4 ++--
 dev/tests/integration/framework/tests/unit/phpunit.xml.dist   | 4 ++--
 .../setup-integration/framework/tests/unit/phpunit.xml.dist   | 4 ++--
 dev/tests/setup-integration/phpunit.xml.dist                  | 2 +-
 dev/tests/static/framework/tests/unit/phpunit.xml.dist        | 4 ++--
 dev/tests/static/phpunit-all.xml.dist                         | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dev/tests/api-functional/phpunit_graphql.xml.dist b/dev/tests/api-functional/phpunit_graphql.xml.dist
index b9f38daddb3a6..f6a67527c5c44 100644
--- a/dev/tests/api-functional/phpunit_graphql.xml.dist
+++ b/dev/tests/api-functional/phpunit_graphql.xml.dist
@@ -17,7 +17,7 @@
     <!-- Test suites definition -->
     <testsuites>
         <testsuite name="Magento GraphQL web API functional tests">
-            <directory suffix="Test.php">testsuite/Magento/GraphQl</directory>
+            <directory>testsuite/Magento/GraphQl</directory>
         </testsuite>
     </testsuites>
 
diff --git a/dev/tests/api-functional/phpunit_soap.xml.dist b/dev/tests/api-functional/phpunit_soap.xml.dist
index 743a82d72c9e3..9c30a79d3742c 100644
--- a/dev/tests/api-functional/phpunit_soap.xml.dist
+++ b/dev/tests/api-functional/phpunit_soap.xml.dist
@@ -17,9 +17,9 @@
     <!-- Test suites definition -->
     <testsuites>
         <testsuite name="Magento SOAP web API functional tests">
-            <directory suffix="Test.php">testsuite</directory>
+            <directory>testsuite</directory>
             <!-- <exclude>testsuite/Magento/GraphQl</exclude> -->
-            <directory suffix="Test.php">../../../app/code/*/*/Test/Api</directory>
+            <directory>../../../app/code/*/*/Test/Api</directory>
         </testsuite>
     </testsuites>
 
diff --git a/dev/tests/integration/framework/tests/unit/phpunit.xml.dist b/dev/tests/integration/framework/tests/unit/phpunit.xml.dist
index 1a93397caaa4a..d15c5f1818784 100644
--- a/dev/tests/integration/framework/tests/unit/phpunit.xml.dist
+++ b/dev/tests/integration/framework/tests/unit/phpunit.xml.dist
@@ -6,7 +6,7 @@
  */
 -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.1/phpunit.xsd"
          colors="true"
          columns="max"
          beStrictAboutTestsThatDoNotTestAnything="false"
@@ -15,7 +15,7 @@
     <!-- Test suites definition -->
     <testsuites>
         <testsuite name="Unit Tests for Integration Tests Framework">
-            <directory suffix="Test.php">testsuite</directory>
+            <directory>testsuite</directory>
         </testsuite>
     </testsuites>
     <php>
diff --git a/dev/tests/setup-integration/framework/tests/unit/phpunit.xml.dist b/dev/tests/setup-integration/framework/tests/unit/phpunit.xml.dist
index 1a93397caaa4a..d15c5f1818784 100644
--- a/dev/tests/setup-integration/framework/tests/unit/phpunit.xml.dist
+++ b/dev/tests/setup-integration/framework/tests/unit/phpunit.xml.dist
@@ -6,7 +6,7 @@
  */
 -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.1/phpunit.xsd"
          colors="true"
          columns="max"
          beStrictAboutTestsThatDoNotTestAnything="false"
@@ -15,7 +15,7 @@
     <!-- Test suites definition -->
     <testsuites>
         <testsuite name="Unit Tests for Integration Tests Framework">
-            <directory suffix="Test.php">testsuite</directory>
+            <directory>testsuite</directory>
         </testsuite>
     </testsuites>
     <php>
diff --git a/dev/tests/setup-integration/phpunit.xml.dist b/dev/tests/setup-integration/phpunit.xml.dist
index 65a3273c4fdcd..0317d0e39efb1 100644
--- a/dev/tests/setup-integration/phpunit.xml.dist
+++ b/dev/tests/setup-integration/phpunit.xml.dist
@@ -16,7 +16,7 @@
     <!-- Test suites definition -->
     <testsuites>
         <testsuite name="Magento Setup/Upgrade Tests">
-            <directory suffix="Test.php">testsuite</directory>
+            <directory>testsuite</directory>
         </testsuite>
     </testsuites>
     <!-- Code coverage filters -->
diff --git a/dev/tests/static/framework/tests/unit/phpunit.xml.dist b/dev/tests/static/framework/tests/unit/phpunit.xml.dist
index aca48f6f8d1d0..f1cd910f3b02b 100644
--- a/dev/tests/static/framework/tests/unit/phpunit.xml.dist
+++ b/dev/tests/static/framework/tests/unit/phpunit.xml.dist
@@ -6,7 +6,7 @@
  */
 -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.1/phpunit.xsd"
          colors="true"
          columns="max"
          beStrictAboutTestsThatDoNotTestAnything="false"
@@ -14,7 +14,7 @@
 >
     <testsuites>
         <testsuite name="Magento Unit Tests for Static Code Analysis Framework">
-            <directory suffix="Test.php">testsuite/Magento/TestFramework</directory>
+            <directory>testsuite/Magento/TestFramework</directory>
         </testsuite>
     </testsuites>
     <php>
diff --git a/dev/tests/static/phpunit-all.xml.dist b/dev/tests/static/phpunit-all.xml.dist
index 7f067d9290f3a..1d1464161da58 100644
--- a/dev/tests/static/phpunit-all.xml.dist
+++ b/dev/tests/static/phpunit-all.xml.dist
@@ -8,7 +8,7 @@
  */
 -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/9.1/phpunit.xsd"
          colors="true"
          columns="max"
          bootstrap="./framework/bootstrap.php"

From 9d70a32057c91f89d994c24b8de83e44972c18b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Szubert?= <bartlomiejszubert@gmail.com>
Date: Wed, 10 Jun 2020 22:03:42 +0200
Subject: [PATCH 0433/1718] Fix #26427 - Expand all sections that contains
 invalid elements

---
 .../templates/system/config/edit.phtml        | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml
index ddd2fc2b2d625..e8f725533952b 100644
--- a/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml
+++ b/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml
@@ -256,15 +256,21 @@ require([
     });
 
     window.configForm.on('invalid-form.validate', function (event, validation) {
-        var firstActive = jQuery(validation.errorList[0].element || []);
-
-        if (firstActive.length) {
-            jQuery(firstActive.parents('.section-config')).each(function () {
-                if (!jQuery(this).hasClass('active')) {
-                    Fieldset.toggleCollapse(jQuery(this).children('.config.admin__collapsible-block').attr('id'));
-                }
-            })
+        if (validation.errorList.length === 0) {
+            return;
         }
+
+        jQuery.each(validation.errorList, function () {
+            var element = jQuery(this.element || []);
+
+            if (element.length) {
+                jQuery(element.parents('.section-config')).each(function () {
+                    if (!jQuery(this).hasClass('active')) {
+                        Fieldset.toggleCollapse(jQuery(this).children('.config.admin__collapsible-block').attr('id'));
+                    }
+                });
+            }
+        });
     })
 
     $$('.shared').each(function(element){

From 7bb9f8ecfbe302a22478acfedd41ceb0ada0ed0e Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@magento.com>
Date: Wed, 10 Jun 2020 15:26:50 -0500
Subject: [PATCH 0434/1718] MC-31618: Move static config to files - PLUGIN_LIST

- Add primary scope to scope priority schema;
---
 app/etc/di.xml                                              | 1 +
 .../Magento/Framework/Interception/ConfigWriter.php         | 6 +++---
 .../Module/Di/App/Task/Operation/PluginListGenerator.php    | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/etc/di.xml b/app/etc/di.xml
index d2eac8e8a0c6d..d28c0ec6bb99f 100644
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -437,6 +437,7 @@
         <arguments>
             <argument name="reader" xsi:type="object">Magento\Framework\ObjectManager\Config\Reader\Dom\Proxy</argument>
             <argument name="scopePriorityScheme" xsi:type="array">
+                <item name="primary" xsi:type="string">primary</item>
                 <item name="first" xsi:type="string">global</item>
             </argument>
         </arguments>
diff --git a/lib/internal/Magento/Framework/Interception/ConfigWriter.php b/lib/internal/Magento/Framework/Interception/ConfigWriter.php
index ef9ce896b043b..9dee8ce8bcd3e 100644
--- a/lib/internal/Magento/Framework/Interception/ConfigWriter.php
+++ b/lib/internal/Magento/Framework/Interception/ConfigWriter.php
@@ -167,13 +167,13 @@ public function write($scopes)
                     $cacheId,
                     [$this->pluginData, $this->inherited, $this->processed]
                 );
-                // need global scope plugin data for non global scopes
+                // need global & primary scopes plugin data for other scopes
                 if ($scope === 'global') {
                     $this->globalScopePluginData = $this->pluginData;
                 }
-                if (count($this->scopePriorityScheme) > 1) {
+                if (count($this->scopePriorityScheme) > 2) {
                     array_pop($this->scopePriorityScheme);
-                    // merge global scope plugin data to other scopes by default
+                    // merge global & primary scopes plugin data to other scopes by default
                     $this->pluginData = $this->globalScopePluginData;
                 }
             }
diff --git a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/PluginListGenerator.php b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/PluginListGenerator.php
index 54fad36b5ed45..d0605cfbafcae 100644
--- a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/PluginListGenerator.php
+++ b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/PluginListGenerator.php
@@ -42,8 +42,8 @@ public function __construct(
     public function doOperation()
     {
         $scopes = $this->scopeConfig->getAllScopes();
-        // remove primary scope for production mode
-        $scopes = array_diff($scopes, ['primary']); // it does not reindex array
+        // remove primary scope for production mode as it is only called in developer mode
+        $scopes = array_diff($scopes, ['primary']);
 
         $this->configWriter->write($scopes);
     }

From fb3fe5879107a0f5d0a4457d3ddc501c166f4545 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Thu, 11 Jun 2020 08:12:33 +0300
Subject: [PATCH 0435/1718] MC-34941: [MFTF] Replace magentoCli calls with
 appropriate AG calls

---
 .../StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup.xml  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup.xml
index 5619aa27860ce..b046ad6534f82 100644
--- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup.xml
@@ -25,6 +25,5 @@
         <fillField selector="{{PayPalPaymentSection.password}}" userInput="{{credentials.magento/paypal_sandbox_login_password}}" stepKey="fillPassword"/>
         <click selector="{{PayPalPaymentSection.loginBtn}}" stepKey="login"/>
         <waitForPageLoad stepKey="wait"/>
-        <see userInput="{{payerName}}" selector="{{PayPalPaymentSection.reviewUserInfo}}" stepKey="seePayerName"/>
     </actionGroup>
 </actionGroups>

From 246dd8c2ad1345916762d2fa748a9f14610f607b Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Thu, 11 Jun 2020 11:59:06 +0200
Subject: [PATCH 0436/1718] Perform upgrade of `-dev` dependencies again

---
 composer.lock | 659 +++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 598 insertions(+), 61 deletions(-)

diff --git a/composer.lock b/composer.lock
index 39282cb149dc6..269e01f659b20 100644
--- a/composer.lock
+++ b/composer.lock
@@ -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"
         },
         {
@@ -287,6 +297,16 @@
                 "dependency",
                 "package"
             ],
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-05-06T08:28:10+00:00"
         },
         {
@@ -412,16 +432,16 @@
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "1.4.1",
+            "version": "1.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "1ab9842d69e64fb3a01be6b656501032d1b78cb7"
+                "reference": "fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/1ab9842d69e64fb3a01be6b656501032d1b78cb7",
-                "reference": "1ab9842d69e64fb3a01be6b656501032d1b78cb7",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51",
+                "reference": "fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51",
                 "shasum": ""
             },
             "require": {
@@ -452,7 +472,21 @@
                 "Xdebug",
                 "performance"
             ],
-            "time": "2020-03-01T12:26:26+00:00"
+            "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"
         },
         {
             "name": "container-interop/container-interop",
@@ -1305,6 +1339,12 @@
                 "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"
         },
         {
@@ -2262,6 +2302,12 @@
                 "laminas",
                 "mail"
             ],
+            "funding": [
+                {
+                    "url": "https://funding.communitybridge.org/projects/laminas-project",
+                    "type": "community_bridge"
+                }
+            ],
             "time": "2020-04-21T16:42:19+00:00"
         },
         {
@@ -3254,6 +3300,12 @@
                 "laminas",
                 "zf"
             ],
+            "funding": [
+                {
+                    "url": "https://funding.communitybridge.org/projects/laminas-project",
+                    "type": "community_bridge"
+                }
+            ],
             "time": "2020-05-20T16:45:56+00:00"
         },
         {
@@ -3493,6 +3545,16 @@
                 "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"
         },
         {
@@ -3908,6 +3970,20 @@
                 "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"
         },
         {
@@ -4271,6 +4347,16 @@
                 "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"
         },
         {
@@ -4391,6 +4477,20 @@
             ],
             "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-03-30T11:41:10+00:00"
         },
         {
@@ -4444,6 +4544,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"
         },
         {
@@ -4514,6 +4628,20 @@
             ],
             "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-03-27T16:54:36+00:00"
         },
         {
@@ -4622,6 +4750,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"
         },
         {
@@ -4671,6 +4813,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"
         },
         {
@@ -4729,6 +4885,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-05-12T16:14:59+00:00"
         },
         {
@@ -4791,6 +4961,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-05-12T16:47:27+00:00"
         },
         {
@@ -4850,6 +5034,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-05-12T16:47:27+00:00"
         },
         {
@@ -4905,6 +5103,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-05-12T16:47:27+00:00"
         },
         {
@@ -4963,6 +5175,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-05-12T16:47:27+00:00"
         },
         {
@@ -5012,24 +5238,38 @@
             ],
             "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-04-15T15:56:18+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v2.0.1",
+            "version": "v2.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "144c5e51266b281231e947b51223ba14acf1a749"
+                "reference": "66a8f0957a3ca54e4f724e49028ab19d75a8918b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/144c5e51266b281231e947b51223ba14acf1a749",
-                "reference": "144c5e51266b281231e947b51223ba14acf1a749",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/66a8f0957a3ca54e4f724e49028ab19d75a8918b",
+                "reference": "66a8f0957a3ca54e4f724e49028ab19d75a8918b",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
+                "php": ">=7.2.5",
                 "psr/container": "^1.0"
             },
             "suggest": {
@@ -5038,7 +5278,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "2.1-dev"
                 }
             },
             "autoload": {
@@ -5070,7 +5310,21 @@
                 "interoperability",
                 "standards"
             ],
-            "time": "2019-11-18T17:27:11+00:00"
+            "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": "tedivm/jshrink",
@@ -6439,6 +6693,20 @@
                 "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"
         },
         {
@@ -6562,6 +6830,20 @@
                 "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"
         },
         {
@@ -6624,6 +6906,20 @@
                 "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"
         },
         {
@@ -6715,6 +7011,12 @@
                 }
             ],
             "description": "A tool to automatically fix PHP code style",
+            "funding": [
+                {
+                    "url": "https://github.com/keradus",
+                    "type": "github"
+                }
+            ],
             "time": "2020-04-15T18:51:10+00:00"
         },
         {
@@ -6973,6 +7275,12 @@
                 "sftp",
                 "storage"
             ],
+            "funding": [
+                {
+                    "url": "https://offset.earth/frankdejonge",
+                    "type": "other"
+                }
+            ],
             "time": "2020-05-18T15:13:39+00:00"
         },
         {
@@ -8020,16 +8328,16 @@
         },
         {
             "name": "phpoption/phpoption",
-            "version": "1.7.3",
+            "version": "1.7.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/schmittjoh/php-option.git",
-                "reference": "4acfd6a4b33a509d8c88f50e5222f734b6aeebae"
+                "reference": "b2ada2ad5d8a32b89088b8adc31ecd2e3a13baf3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/4acfd6a4b33a509d8c88f50e5222f734b6aeebae",
-                "reference": "4acfd6a4b33a509d8c88f50e5222f734b6aeebae",
+                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/b2ada2ad5d8a32b89088b8adc31ecd2e3a13baf3",
+                "reference": "b2ada2ad5d8a32b89088b8adc31ecd2e3a13baf3",
                 "shasum": ""
             },
             "require": {
@@ -8071,7 +8379,17 @@
                 "php",
                 "type"
             ],
-            "time": "2020-03-21T18:07:53+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpoption/phpoption",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-06-07T10:40:07+00:00"
         },
         {
             "name": "phpspec/prophecy",
@@ -8176,20 +8494,34 @@
                 "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"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "8.0.1",
+            "version": "8.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "31e94ccc084025d6abee0585df533eb3a792b96a"
+                "reference": "ca6647ffddd2add025ab3f21644a441d7c146cdc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/31e94ccc084025d6abee0585df533eb3a792b96a",
-                "reference": "31e94ccc084025d6abee0585df533eb3a792b96a",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca6647ffddd2add025ab3f21644a441d7c146cdc",
+                "reference": "ca6647ffddd2add025ab3f21644a441d7c146cdc",
                 "shasum": ""
             },
             "require": {
@@ -8240,7 +8572,13 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2020-02-19T13:41:19+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-05-23T08:02:54+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -8290,6 +8628,12 @@
                 "filesystem",
                 "iterator"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-04-18T05:02:12+00:00"
         },
         {
@@ -8438,6 +8782,12 @@
             "keywords": [
                 "timer"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-04-20T06:00:37+00:00"
         },
         {
@@ -8487,6 +8837,12 @@
             "keywords": [
                 "tokenizer"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-05-06T09:56:31+00:00"
         },
         {
@@ -8575,6 +8931,16 @@
                 "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"
         },
         {
@@ -8715,6 +9081,12 @@
             ],
             "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-04-30T05:58:10+00:00"
         },
         {
@@ -8880,6 +9252,12 @@
                 "unidiff",
                 "unified diff"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-05-08T05:01:12+00:00"
         },
         {
@@ -8933,6 +9311,12 @@
                 "environment",
                 "hhvm"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-04-14T13:36:52+00:00"
         },
         {
@@ -9345,28 +9729,28 @@
         },
         {
             "name": "sebastian/type",
-            "version": "2.0.0",
+            "version": "2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "9e8f42f740afdea51f5f4e8cec2035580e797ee1"
+                "reference": "bad49207c6f854e7a25cef0ea948ac8ebe3ef9d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/9e8f42f740afdea51f5f4e8cec2035580e797ee1",
-                "reference": "9e8f42f740afdea51f5f4e8cec2035580e797ee1",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/bad49207c6f854e7a25cef0ea948ac8ebe3ef9d8",
+                "reference": "bad49207c6f854e7a25cef0ea948ac8ebe3ef9d8",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.0"
+                "phpunit/phpunit": "^9.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "2.1-dev"
                 }
             },
             "autoload": {
@@ -9387,7 +9771,13 @@
             ],
             "description": "Collection of value objects that represent the types of the PHP type system",
             "homepage": "https://github.com/sebastianbergmann/type",
-            "time": "2020-02-07T06:13:43+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-01T12:21:09+00:00"
         },
         {
             "name": "sebastian/version",
@@ -9556,22 +9946,24 @@
         },
         {
             "name": "symfony/config",
-            "version": "v5.0.8",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "db1674e1a261148429f123871f30d211992294e7"
+                "reference": "b8623ef3d99fe62a34baf7a111b576216965f880"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/db1674e1a261148429f123871f30d211992294e7",
-                "reference": "db1674e1a261148429f123871f30d211992294e7",
+                "url": "https://api.github.com/repos/symfony/config/zipball/b8623ef3d99fe62a34baf7a111b576216965f880",
+                "reference": "b8623ef3d99fe62a34baf7a111b576216965f880",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1",
                 "symfony/filesystem": "^4.4|^5.0",
-                "symfony/polyfill-ctype": "~1.8"
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-php80": "^1.15"
             },
             "conflict": {
                 "symfony/finder": "<4.4"
@@ -9589,7 +9981,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -9616,29 +10008,45 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
-            "time": "2020-04-15T15:59:10+00:00"
+            "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"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v5.0.8",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "92d8b3bd896a87cdd8aba0a3dd041bc072e8cfba"
+                "reference": "6a6791e9584273b32eeb01790da4c7446d87a621"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/92d8b3bd896a87cdd8aba0a3dd041bc072e8cfba",
-                "reference": "92d8b3bd896a87cdd8aba0a3dd041bc072e8cfba",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/6a6791e9584273b32eeb01790da4c7446d87a621",
+                "reference": "6a6791e9584273b32eeb01790da4c7446d87a621",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
+                "php": ">=7.2.5",
                 "psr/container": "^1.0",
+                "symfony/deprecation-contracts": "^2.1",
+                "symfony/polyfill-php80": "^1.15",
                 "symfony/service-contracts": "^1.1.6|^2"
             },
             "conflict": {
-                "symfony/config": "<5.0",
+                "symfony/config": "<5.1",
                 "symfony/finder": "<4.4",
                 "symfony/proxy-manager-bridge": "<4.4",
                 "symfony/yaml": "<4.4"
@@ -9648,7 +10056,7 @@
                 "symfony/service-implementation": "1.0"
             },
             "require-dev": {
-                "symfony/config": "^5.0",
+                "symfony/config": "^5.1",
                 "symfony/expression-language": "^4.4|^5.0",
                 "symfony/yaml": "^4.4|^5.0"
             },
@@ -9662,7 +10070,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -9689,7 +10097,21 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
-            "time": "2020-04-28T17:58:55+00:00"
+            "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"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -9735,6 +10157,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-05-27T08:34:37+00:00"
         },
         {
@@ -9796,6 +10232,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-05-24T12:18:07+00:00"
         },
         {
@@ -9859,29 +10309,45 @@
                 "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"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v5.0.8",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "3707e3caeff2b797c0bfaadd5eba723dd44e6bf1"
+                "reference": "663f5dd5e14057d1954fe721f9709d35837f2447"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/3707e3caeff2b797c0bfaadd5eba723dd44e6bf1",
-                "reference": "3707e3caeff2b797c0bfaadd5eba723dd44e6bf1",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/663f5dd5e14057d1954fe721f9709d35837f2447",
+                "reference": "663f5dd5e14057d1954fe721f9709d35837f2447",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5"
+                "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1",
+                "symfony/polyfill-php80": "^1.15"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -9913,7 +10379,21 @@
                 "configuration",
                 "options"
             ],
-            "time": "2020-04-06T10:40:56+00:00"
+            "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"
         },
         {
             "name": "symfony/polyfill-php70",
@@ -9972,6 +10452,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-05-12T16:47:27+00:00"
         },
         {
@@ -10034,30 +10528,44 @@
                 "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"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v5.0.8",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "a1d86d30d4522423afc998f32404efa34fcf5a73"
+                "reference": "0f7c58cf81dbb5dd67d423a89d577524a2ec0323"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/a1d86d30d4522423afc998f32404efa34fcf5a73",
-                "reference": "a1d86d30d4522423afc998f32404efa34fcf5a73",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/0f7c58cf81dbb5dd67d423a89d577524a2ec0323",
+                "reference": "0f7c58cf81dbb5dd67d423a89d577524a2ec0323",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5",
+                "php": ">=7.2.5",
                 "symfony/service-contracts": "^1.0|^2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -10084,7 +10592,21 @@
             ],
             "description": "Symfony Stopwatch Component",
             "homepage": "https://symfony.com",
-            "time": "2020-03-27T16:56:45+00:00"
+            "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",
@@ -10147,6 +10669,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"
         },
         {
@@ -10537,5 +11073,6 @@
         "ext-zip": "*",
         "lib-libxml": "*"
     },
-    "platform-dev": []
+    "platform-dev": [],
+    "plugin-api-version": "1.1.0"
 }

From d6da5e27f4b876146d3f78700a567408b13b4b3c Mon Sep 17 00:00:00 2001
From: Viktor Sevch <viktor.sevch@transoftgroup.com>
Date: Thu, 11 Jun 2020 15:08:15 +0300
Subject: [PATCH 0437/1718] MC-35101: Stacked Paypal message on Admin Settings
 Menu tabs

---
 app/code/Magento/Config/Block/System/Config/Form/Fieldset.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 20b6408eebe82..51ee6dbee1e2e 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Fieldset.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Fieldset.php
@@ -225,7 +225,7 @@ protected function _getFooterHtml($element)
                 );
                 $html .= $this->secureRenderer->renderStyleAsTag(
                     'display:none;',
-                    'row_' . $field->getId() . '_comment'
+                    '#row_' . $field->getId() . '_comment'
                 );
             }
         }

From 4d24466fb2ce20fcd769fd4b68c9e4d3e476fe35 Mon Sep 17 00:00:00 2001
From: ameysar <andrii.meysar@transoftgroup.com>
Date: Thu, 11 Jun 2020 17:28:50 +0300
Subject: [PATCH 0438/1718] MC-34415: Shopping Cart is not empty after removing
 item

---
 .../view/frontend/web/js/empty-cart.js        |  16 +--
 .../view/frontend/web/js/customer-data.js     |  13 +-
 .../templates/checkout/addresses.phtml        |   2 +-
 .../view/frontend/web/js/multi-shipping.js    |  18 ++-
 .../Checkout/frontend/js/empty-cart.test.js   | 113 ++++++++++++++++++
 .../frontend/js/multi-shipping.test.js        | 110 +++++++++++++++++
 6 files changed, 262 insertions(+), 10 deletions(-)
 create mode 100644 dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/empty-cart.test.js
 create mode 100644 dev/tests/js/jasmine/tests/app/code/Magento/Multishipping/frontend/js/multi-shipping.test.js

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/empty-cart.js b/app/code/Magento/Checkout/view/frontend/web/js/empty-cart.js
index 4b30ad8075274..2e9bdf1f31086 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/empty-cart.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/empty-cart.js
@@ -3,14 +3,16 @@
  * See COPYING.txt for license details.
  */
 
-define([
-    'Magento_Customer/js/customer-data'
-], function (customerData) {
+define(['Magento_Customer/js/customer-data'], function (customerData) {
     'use strict';
 
-    var cartData = customerData.get('cart');
+    return function () {
+        var cartData = customerData.get('cart');
 
-    if (cartData().items && cartData().items.length !== 0) {
-        customerData.reload(['cart'], false);
-    }
+        customerData.getInitCustomerData().done(function () {
+            if (cartData().items && cartData().items.length !== 0) {
+                customerData.reload(['cart'], false);
+            }
+        });
+    };
 });
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 770ea47d754d3..8976d0dda4673 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
@@ -24,7 +24,8 @@ define([
         invalidateCacheByCloseCookieSession,
         dataProvider,
         buffer,
-        customerData;
+        customerData,
+        deferred = $.Deferred();
 
     url.setBaseUrl(window.BASE_URL);
     options.sectionLoadUrl = url.build('customer/section/load');
@@ -341,6 +342,15 @@ define([
             $.cookieStorage.set('section_data_ids', sectionDataIds);
         },
 
+        /**
+         * Checks if customer data is initialized.
+         *
+         * @returns {jQuery.Deferred}
+         */
+        getInitCustomerData: function () {
+            return deferred.promise();
+        },
+
         /**
          * @param {Object} settings
          * @constructor
@@ -350,6 +360,7 @@ define([
             invalidateCacheBySessionTimeOut(settings);
             invalidateCacheByCloseCookieSession();
             customerData.init();
+            deferred.resolve();
         }
     };
 
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml
index e941ecf63255b..a37ff04a8dc2a 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml
@@ -16,7 +16,7 @@
 ?>
 <form id="checkout_multishipping_form"
       data-mage-init='{
-          "multiShipping":{},
+          "multiShipping": {"itemsQty": <?= /* @noEscape */ (int)$block->getCheckout()->getQuote()->getItemsSummaryQty() ?>},
           "cartUpdate": {
                "validationURL": "<?= $block->escapeUrl($block->getUrl('multishipping/checkout/checkItems')) ?>",
                "eventName": "updateMulticartItemQty"
diff --git a/app/code/Magento/Multishipping/view/frontend/web/js/multi-shipping.js b/app/code/Magento/Multishipping/view/frontend/web/js/multi-shipping.js
index 537abb3aa2071..8af1c1ed06fc1 100644
--- a/app/code/Magento/Multishipping/view/frontend/web/js/multi-shipping.js
+++ b/app/code/Magento/Multishipping/view/frontend/web/js/multi-shipping.js
@@ -5,12 +5,14 @@
 
 define([
     'jquery',
+    'Magento_Customer/js/customer-data',
     'jquery-ui-modules/widget'
-], function ($) {
+], function ($, customerData) {
     'use strict';
 
     $.widget('mage.multiShipping', {
         options: {
+            itemsQty: 0,
             addNewAddressBtn: 'button[data-role="add-new-address"]', // Add a new multishipping address.
             addNewAddressFlag: '#add_new_address_flag', // Hidden input field with value 0 or 1.
             canContinueBtn: 'button[data-role="can-continue"]', // Continue (update quantity or go to shipping).
@@ -22,10 +24,24 @@ define([
          * @private
          */
         _create: function () {
+            this._prepareCartData();
             $(this.options.addNewAddressBtn).on('click', $.proxy(this._addNewAddress, this));
             $(this.options.canContinueBtn).on('click', $.proxy(this._canContinue, this));
         },
 
+        /**
+         * Takes cart items qty from current cart data and compare it with current items qty
+         * Reloads cart data if cart items qty is wrong
+         * @private
+         */
+        _prepareCartData: function () {
+            var cartData = customerData.get('cart');
+
+            if (cartData()['summary_count'] !== this.options.itemsQty) {
+                customerData.reload(['cart'], false);
+            }
+        },
+
         /**
          * Add a new address. Set the hidden input field and submit the form. Then enter a new shipping address.
          * @private
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/empty-cart.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/empty-cart.test.js
new file mode 100644
index 0000000000000..7de56c869a81a
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/empty-cart.test.js
@@ -0,0 +1,113 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* eslint-disable max-nested-callbacks */
+/*jscs:disable jsDoc*/
+define([
+    'squire', 'jquery', 'ko'
+], function (Squire, $, ko) {
+    'use strict';
+
+    describe('Magento_Checkout/js/empty-cart', function () {
+        var injector = new Squire(),
+            cartData = ko.observable({}),
+            mocks = {
+                'Magento_Customer/js/customer-data': {
+                    get: jasmine.createSpy('get', function () {
+                        return cartData;
+                    }).and.callThrough(),
+                    reload: jasmine.createSpy(),
+                    getInitCustomerData: function () {}
+                }
+            },
+            deferred,
+            emptyCart;
+
+        beforeEach(function (done) {
+            injector.mock(mocks);
+            injector.require(['Magento_Checkout/js/empty-cart'], function (instance) {
+                emptyCart = instance;
+                done();
+            });
+        });
+
+        afterEach(function () {
+            try {
+                injector.clean();
+                injector.remove();
+            } catch (e) {}
+
+            cartData({});
+        });
+
+        describe('Check Cart data preparation process', function () {
+            it('Tests that Cart data is NOT checked before initialization', function () {
+                spyOn(mocks['Magento_Customer/js/customer-data'], 'getInitCustomerData').and.callFake(function () {
+                    deferred = $.Deferred();
+
+                    return deferred.promise();
+                });
+                expect(emptyCart()).toBe(undefined);
+
+                expect(mocks['Magento_Customer/js/customer-data'].get).toHaveBeenCalledWith('cart');
+                expect(mocks['Magento_Customer/js/customer-data'].getInitCustomerData).toHaveBeenCalled();
+                expect(mocks['Magento_Customer/js/customer-data'].reload).not.toHaveBeenCalled();
+            });
+
+            it('Tests that Cart data does NOT reload if there are no items in it', function () {
+                spyOn(mocks['Magento_Customer/js/customer-data'], 'getInitCustomerData').and.callFake(function () {
+                    deferred = $.Deferred();
+
+                    deferred.resolve();
+
+                    return deferred.promise();
+                });
+                cartData({
+                    items: []
+                });
+                emptyCart();
+
+                expect(mocks['Magento_Customer/js/customer-data'].get).toHaveBeenCalledWith('cart');
+                expect(mocks['Magento_Customer/js/customer-data'].reload).not.toHaveBeenCalled();
+            });
+
+            it('Tests that Cart data is checked only after initialization', function () {
+                spyOn(mocks['Magento_Customer/js/customer-data'], 'getInitCustomerData').and.callFake(function () {
+                    deferred = $.Deferred();
+
+                    return deferred.promise();
+                });
+                cartData({
+                    items: [1]
+                });
+                emptyCart();
+
+                expect(mocks['Magento_Customer/js/customer-data'].get).toHaveBeenCalledWith('cart');
+                expect(mocks['Magento_Customer/js/customer-data'].reload).not.toHaveBeenCalled();
+
+                deferred.resolve();
+
+                expect(mocks['Magento_Customer/js/customer-data'].reload).toHaveBeenCalledWith(['cart'], false);
+            });
+
+            it('Tests that Cart data reloads if it has items', function () {
+                spyOn(mocks['Magento_Customer/js/customer-data'], 'getInitCustomerData').and.callFake(function () {
+                    deferred = $.Deferred();
+
+                    deferred.resolve();
+
+                    return deferred.promise();
+                });
+                cartData({
+                    items: [1]
+                });
+                emptyCart();
+
+                expect(mocks['Magento_Customer/js/customer-data'].get).toHaveBeenCalledWith('cart');
+                expect(mocks['Magento_Customer/js/customer-data'].reload).toHaveBeenCalledWith(['cart'], false);
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Multishipping/frontend/js/multi-shipping.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Multishipping/frontend/js/multi-shipping.test.js
new file mode 100644
index 0000000000000..65ee180476f3a
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Multishipping/frontend/js/multi-shipping.test.js
@@ -0,0 +1,110 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'squire',
+    'jquery',
+    'ko',
+    'multiShipping'
+], function (Squire, $, ko, MultiShipping) {
+    'use strict';
+
+    describe('Magento_Multishipping/js/multi-shipping', function () {
+        var injector = new Squire(),
+            Obj;
+
+        describe('Check Cart data preparation process', function () {
+            var customerData = ko.observable({}),
+                mocks = {
+                    'Magento_Customer/js/customer-data': {
+                        get: jasmine.createSpy('get', function () {
+                            return customerData;
+                        }).and.callThrough(),
+                        reload: jasmine.createSpy()
+                    }
+                },
+                summaryCount = {};
+
+            beforeEach(function (done) {
+                injector.mock(mocks);
+                injector.require(['multiShipping'], function (Instance) {
+                    Obj = Instance;
+                    done();
+                });
+            });
+
+            afterEach(function () {
+                try {
+                    injector.clean();
+                    injector.remove();
+                } catch (e) {}
+
+                customerData({});
+            });
+
+            it('Prepare Cart data with the same items qty', function () {
+                summaryCount['summary_count'] = 0;
+                customerData(summaryCount);
+                new Obj({});
+
+                expect(mocks['Magento_Customer/js/customer-data'].get).toHaveBeenCalledWith('cart');
+                expect(mocks['Magento_Customer/js/customer-data'].reload).not.toHaveBeenCalled();
+            });
+
+            it('Prepare Cart data with different items qty', function () {
+                summaryCount['summary_count'] = 1;
+                customerData(summaryCount);
+                new Obj({});
+
+                expect(mocks['Magento_Customer/js/customer-data'].get).toHaveBeenCalledWith('cart');
+                expect(mocks['Magento_Customer/js/customer-data'].reload).toHaveBeenCalledWith(['cart'], false);
+            });
+        });
+
+        describe('Check Multishipping events', function () {
+            var addNewAddressBtn,
+                addressflag,
+                canContinueBtn,
+                canContinueFlag;
+
+            beforeEach(function () {
+                addNewAddressBtn = $('<button type="button" data-role="add-new-address"/>');
+                addressflag = $('<input type="hidden" value="0" id="add_new_address_flag"/>');
+                canContinueBtn = $('<button type="submit" data-role="can-continue" data-flag="1"/>');
+                canContinueFlag = $('<input type="hidden" value="0" id="can_continue_flag"/>');
+                $(document.body).append(addNewAddressBtn)
+                    .append(addressflag)
+                    .append(canContinueBtn)
+                    .append(canContinueFlag);
+            });
+
+            afterEach(function () {
+                addNewAddressBtn.remove();
+                addressflag.remove();
+                canContinueBtn.remove();
+                canContinueFlag.remove();
+            });
+
+            it('Check add new address event', function () {
+                Obj = new MultiShipping({});
+                Obj.element = jasmine.createSpyObj('element', ['submit']);
+                addNewAddressBtn.click();
+
+                expect(Obj.element.submit).toHaveBeenCalled();
+                expect(addressflag.val()).toBe('1');
+            });
+
+            it('Check can continue event', function () {
+                Obj = new MultiShipping({});
+                Obj.element = jasmine.createSpyObj('element', ['submit']);
+                canContinueBtn.click();
+
+                expect(Obj.element.submit).not.toHaveBeenCalled();
+                expect(canContinueFlag.val()).toBe('1');
+            });
+        });
+    });
+});

From 0010f64d70f0c70e82d932ee29eeab0d5fbf13b6 Mon Sep 17 00:00:00 2001
From: Dmitriy Gallyamov <dmitrijs.gallamovs@gmail.com>
Date: Thu, 11 Jun 2020 18:01:18 +0300
Subject: [PATCH 0439/1718] magento/magento2#28628: GraphQL price range numeric
 values

- Removed wildcard usage for price filters
---
 .../Elasticsearch/SearchAdapter/Dynamic/DataProvider.php    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Dynamic/DataProvider.php b/app/code/Magento/Elasticsearch/SearchAdapter/Dynamic/DataProvider.php
index 496a77e4c5ac3..7bc64b59ffe78 100644
--- a/app/code/Magento/Elasticsearch/SearchAdapter/Dynamic/DataProvider.php
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Dynamic/DataProvider.php
@@ -235,11 +235,9 @@ public function prepareData($range, array $dbRanges)
     {
         $data = [];
         if (!empty($dbRanges)) {
-            $lastIndex = array_keys($dbRanges);
-            $lastIndex = $lastIndex[count($lastIndex) - 1];
             foreach ($dbRanges as $index => $count) {
-                $fromPrice = $index == 1 ? '' : ($index - 1) * $range;
-                $toPrice = $index == $lastIndex ? '' : $index * $range;
+                $fromPrice = $index == 1 ? 0 : ($index - 1) * $range;
+                $toPrice = $index * $range;
                 $data[] = [
                     'from' => $fromPrice,
                     'to' => $toPrice,

From 52701916926d4e3be6f8cadd21187abf15e98d13 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Thu, 11 Jun 2020 18:44:52 +0300
Subject: [PATCH 0440/1718] MC-34425: Magento crashes when trying to oepn
 category when Website Restrictions is enabled

---
 app/code/Magento/Catalog/Controller/Category/View.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Controller/Category/View.php b/app/code/Magento/Catalog/Controller/Category/View.php
index 552af244f0097..e448be9a1df21 100644
--- a/app/code/Magento/Catalog/Controller/Category/View.php
+++ b/app/code/Magento/Catalog/Controller/Category/View.php
@@ -205,10 +205,9 @@ protected function _initCategory()
     /**
      * Category view action
      *
-     * @return ResultInterface
      * @throws NoSuchEntityException
      */
-    public function execute(): ?ResultInterface
+    public function execute()
     {
         $result = null;
 

From 12e1a886c8d798a65b68648e71918059e20510de Mon Sep 17 00:00:00 2001
From: Viktor Sevch <viktor.sevch@transoftgroup.com>
Date: Thu, 11 Jun 2020 18:55:19 +0300
Subject: [PATCH 0441/1718] MC-35101: Stacked Paypal message on Admin Settings
 Menu tabs

---
 .../Config/Test/Unit/Block/System/Config/Form/FieldsetTest.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldsetTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldsetTest.php
index 54c5a1426e352..fd5fbe7c4cdc6 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldsetTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldsetTest.php
@@ -243,7 +243,7 @@ public function testRenderWithStoredElements($expanded, $nested, $extra)
         $this->assertStringContainsString('test_field_toHTML', $actual);
 
         $expected = '<div id="row_test_field_id_comment" class="system-tooltip-box">test_field_tootip</div>' .
-        '<style>row_test_field_id_comment { display:none; }</style>';
+        '<style>#row_test_field_id_comment { display:none; }</style>';
         $this->assertStringContainsString($expected, $actual);
         if ($nested) {
             $this->assertStringContainsString('nested', $actual);

From 6ef64f6038b148cd9eb753f7b9da3d3890db53ef Mon Sep 17 00:00:00 2001
From: Viktor Sevch <viktor.sevch@transoftgroup.com>
Date: Thu, 11 Jun 2020 19:20:49 +0300
Subject: [PATCH 0442/1718] MC-35120: Radio icon is not displayed on the order
 create page

---
 .../adminhtml/templates/order/create/store/select.phtml     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml
index 180486870446d..1c21d51a2df32 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml
@@ -51,14 +51,14 @@
                                 <div class="admin__field admin__field-option">
                                     <input type="radio"
                                            id="store_<?= (int) $_store->getId() ?>" class="admin__control-radio"/>
+                                    <label class="admin__field-label" for="store_<?= (int) $_store->getId() ?>">
+                                        <?= $block->escapeHtml($_store->getName()) ?>
+                                    </label>
                                     <?= /* @noEscape*/ $secureRenderer->renderEventListenerAsTag(
                                         'onclick',
                                         "order.setStoreId('" .  (int)$_store->getId() . "')",
                                         'input#store_' . (int)$_store->getId()
                                     ) ?>
-                                    <label class="admin__field-label" for="store_<?= (int) $_store->getId() ?>">
-                                        <?= $block->escapeHtml($_store->getName()) ?>
-                                    </label>
                                 </div>
                             </div>
                         </div>

From 61c8674f33f7b3a3fae1c00f2511ac876e77d275 Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Thu, 11 Jun 2020 11:35:16 -0500
Subject: [PATCH 0443/1718] MC-35039: Update Elasticsearch dependencies for
 2.4.0

---
 app/code/Magento/Elasticsearch/composer.json  |  2 +-
 app/code/Magento/Elasticsearch6/composer.json |  2 +-
 app/code/Magento/Elasticsearch7/composer.json |  2 +-
 composer.json                                 |  2 +-
 composer.lock                                 | 77 ++++++-------------
 .../testFromCreateProject/composer.lock       |  6 +-
 .../_files/testSkeleton/composer.lock         |  6 +-
 7 files changed, 34 insertions(+), 63 deletions(-)

diff --git a/app/code/Magento/Elasticsearch/composer.json b/app/code/Magento/Elasticsearch/composer.json
index 8527991f354d9..b79ae7bc5cc47 100644
--- a/app/code/Magento/Elasticsearch/composer.json
+++ b/app/code/Magento/Elasticsearch/composer.json
@@ -12,7 +12,7 @@
         "magento/module-store": "*",
         "magento/module-catalog-inventory": "*",
         "magento/framework": "*",
-        "elasticsearch/elasticsearch": "7.6.*"
+        "elasticsearch/elasticsearch": "~7.7.0"
     },
     "suggest": {
         "magento/module-config": "*"
diff --git a/app/code/Magento/Elasticsearch6/composer.json b/app/code/Magento/Elasticsearch6/composer.json
index c3b32ba043345..1ee92c0b0a3b3 100644
--- a/app/code/Magento/Elasticsearch6/composer.json
+++ b/app/code/Magento/Elasticsearch6/composer.json
@@ -8,7 +8,7 @@
         "magento/module-catalog-search": "*",
         "magento/module-search": "*",
         "magento/module-elasticsearch": "*",
-        "elasticsearch/elasticsearch": "7.6.*"
+        "elasticsearch/elasticsearch": "~7.7.0"
     },
     "suggest": {
         "magento/module-config": "*"
diff --git a/app/code/Magento/Elasticsearch7/composer.json b/app/code/Magento/Elasticsearch7/composer.json
index 92074f9bc0de6..1e59ceaebaf84 100644
--- a/app/code/Magento/Elasticsearch7/composer.json
+++ b/app/code/Magento/Elasticsearch7/composer.json
@@ -5,7 +5,7 @@
         "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-elasticsearch": "*",
-        "elasticsearch/elasticsearch": "7.6.*",
+        "elasticsearch/elasticsearch": "~7.7.0",
         "magento/module-advanced-search": "*",
         "magento/module-catalog-search": "*"
     },
diff --git a/composer.json b/composer.json
index 4a95ef3e066a9..bcd4af8c2090f 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
         "colinmollenhour/credis": "1.11.1",
         "colinmollenhour/php-redis-session-abstract": "~1.4.0",
         "composer/composer": "^1.9",
-        "elasticsearch/elasticsearch": "7.6.*",
+        "elasticsearch/elasticsearch": "~7.7.0",
         "guzzlehttp/guzzle": "^6.3.3",
         "laminas/laminas-captcha": "^2.7.1",
         "laminas/laminas-code": "~3.4.1",
diff --git a/composer.lock b/composer.lock
index fc5c02b02a68f..20dfc8010947d 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": "5f3c699b683c0423f6320bb81c7b8dc4",
+    "content-hash": "02fccb2d01ffd97470ee6ba2f551f5fc",
     "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"
         },
         {
@@ -526,16 +516,16 @@
         },
         {
             "name": "elasticsearch/elasticsearch",
-            "version": "v7.6.1",
+            "version": "v7.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/elastic/elasticsearch-php.git",
-                "reference": "d4f24bc43c2af60aece3df20eb689d322f9c8acf"
+                "reference": "1d90a7ff4fb1936dc4376f09d723af75714f6f05"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/d4f24bc43c2af60aece3df20eb689d322f9c8acf",
-                "reference": "d4f24bc43c2af60aece3df20eb689d322f9c8acf",
+                "url": "https://api.github.com/repos/elastic/elasticsearch-php/zipball/1d90a7ff4fb1936dc4376f09d723af75714f6f05",
+                "reference": "1d90a7ff4fb1936dc4376f09d723af75714f6f05",
                 "shasum": ""
             },
             "require": {
@@ -585,7 +575,7 @@
                 "elasticsearch",
                 "search"
             ],
-            "time": "2020-02-15T00:09:00+00:00"
+            "time": "2020-05-13T15:19:26+00:00"
         },
         {
             "name": "ezimuel/guzzlestreams",
@@ -2306,12 +2296,6 @@
                 "laminas",
                 "mail"
             ],
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
             "time": "2020-04-21T16:42:19+00:00"
         },
         {
@@ -3974,20 +3958,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"
         },
         {
@@ -4235,6 +4205,11 @@
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Ben Ramsey",
+                    "email": "ben@benramsey.com",
+                    "homepage": "https://benramsey.com"
+                },
                 {
                     "name": "Marijn Huizendveld",
                     "email": "marijn.huizendveld@gmail.com"
@@ -4242,11 +4217,6 @@
                 {
                     "name": "Thibaud Fabre",
                     "email": "thibaud@aztech.io"
-                },
-                {
-                    "name": "Ben Ramsey",
-                    "email": "ben@benramsey.com",
-                    "homepage": "https://benramsey.com"
                 }
             ],
             "description": "Formerly rhumsaa/uuid. A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).",
@@ -5823,16 +5793,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.140.4",
+            "version": "3.141.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "298ec070adad5760c4b90348219bb3e6bd7a9322"
+                "reference": "d57dbde176a7db7a6131bb5d325aff63515eabc3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/298ec070adad5760c4b90348219bb3e6bd7a9322",
-                "reference": "298ec070adad5760c4b90348219bb3e6bd7a9322",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/d57dbde176a7db7a6131bb5d325aff63515eabc3",
+                "reference": "d57dbde176a7db7a6131bb5d325aff63515eabc3",
                 "shasum": ""
             },
             "require": {
@@ -5903,7 +5873,7 @@
                 "s3",
                 "sdk"
             ],
-            "time": "2020-06-09T18:11:16+00:00"
+            "time": "2020-06-10T18:11:38+00:00"
         },
         {
             "name": "beberlei/assert",
@@ -7478,16 +7448,16 @@
         },
         {
             "name": "magento/magento2-functional-testing-framework",
-            "version": "dev-3.0.0-RC3",
+            "version": "3.0.0-RC4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/magento/magento2-functional-testing-framework.git",
-                "reference": "aea30ae1df2fe6618478ba8813864c204561fde3"
+                "reference": "34781ccc7385993b1e5bc9182e6ddddde7f2769f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/aea30ae1df2fe6618478ba8813864c204561fde3",
-                "reference": "aea30ae1df2fe6618478ba8813864c204561fde3",
+                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/34781ccc7385993b1e5bc9182e6ddddde7f2769f",
+                "reference": "34781ccc7385993b1e5bc9182e6ddddde7f2769f",
                 "shasum": ""
             },
             "require": {
@@ -7514,7 +7484,8 @@
                 "symfony/finder": "^5.0",
                 "symfony/mime": "^5.0",
                 "symfony/process": "^4.4",
-                "vlucas/phpdotenv": "^2.4"
+                "vlucas/phpdotenv": "^2.4",
+                "weew/helpers-array": "^1.3"
             },
             "replace": {
                 "facebook/webdriver": "^1.7.1"
@@ -7562,7 +7533,7 @@
                 "magento",
                 "testing"
             ],
-            "time": "2020-05-22T19:17:05+00:00"
+            "time": "2020-06-08T18:17:54+00:00"
         },
         {
             "name": "mikey179/vfsstream",
@@ -11070,7 +11041,7 @@
     "minimum-stability": "stable",
     "stability-flags": {
         "magento/composer": 20,
-        "magento/magento2-functional-testing-framework": 20
+        "magento/magento2-functional-testing-framework": 5
     },
     "prefer-stable": true,
     "prefer-lowest": false,
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/composer.lock b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/composer.lock
index 400073e6a87a6..9b008d03e0037 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/composer.lock
+++ b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testFromCreateProject/composer.lock
@@ -4775,7 +4775,7 @@
                 "shasum": "ed1da1137848560dde1a85f0f54dc2fac262359e"
             },
             "require": {
-                "elasticsearch/elasticsearch": "7.6.*",
+                "elasticsearch/elasticsearch": "~7.7.0",
                 "magento/framework": "102.0.*",
                 "magento/module-advanced-search": "100.3.*",
                 "magento/module-catalog": "103.0.*",
@@ -4815,7 +4815,7 @@
                 "shasum": "a9da3243900390ad163efc7969b07116d2eb793f"
             },
             "require": {
-                "elasticsearch/elasticsearch": "7.6.*",
+                "elasticsearch/elasticsearch": "~7.7.0",
                 "magento/framework": "102.0.*",
                 "magento/module-advanced-search": "100.3.*",
                 "magento/module-catalog-search": "101.0.*",
@@ -9408,7 +9408,7 @@
                 "colinmollenhour/php-redis-session-abstract": "~1.4.0",
                 "composer/composer": "^1.6",
                 "dotmailer/dotmailer-magento2-extension": "3.1.1",
-                "elasticsearch/elasticsearch": "7.6.*",
+                "elasticsearch/elasticsearch": "~7.7.0",
                 "ext-bcmath": "*",
                 "ext-ctype": "*",
                 "ext-curl": "*",
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/composer.lock b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/composer.lock
index 01daa792ed352..ba21896d665f9 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/composer.lock
+++ b/dev/tests/integration/testsuite/Magento/Framework/Composer/_files/testSkeleton/composer.lock
@@ -4775,7 +4775,7 @@
                 "shasum": "ed1da1137848560dde1a85f0f54dc2fac262359e"
             },
             "require": {
-                "elasticsearch/elasticsearch": "7.6.*",
+                "elasticsearch/elasticsearch": "~7.7.0",
                 "magento/framework": "102.0.*",
                 "magento/module-advanced-search": "100.3.*",
                 "magento/module-catalog": "103.0.*",
@@ -4815,7 +4815,7 @@
                 "shasum": "a9da3243900390ad163efc7969b07116d2eb793f"
             },
             "require": {
-                "elasticsearch/elasticsearch": "7.6.*",
+                "elasticsearch/elasticsearch": "~7.7.0",
                 "magento/framework": "102.0.*",
                 "magento/module-advanced-search": "100.3.*",
                 "magento/module-catalog-search": "101.0.*",
@@ -9408,7 +9408,7 @@
                 "colinmollenhour/php-redis-session-abstract": "~1.4.0",
                 "composer/composer": "^1.6",
                 "dotmailer/dotmailer-magento2-extension": "3.1.1",
-                "elasticsearch/elasticsearch": "7.6.*",
+                "elasticsearch/elasticsearch": "~7.7.0",
                 "ext-bcmath": "*",
                 "ext-ctype": "*",
                 "ext-curl": "*",

From cd791b90595b9652c5ec7d69548c99f890466f36 Mon Sep 17 00:00:00 2001
From: Pieter Hoste <hoste.pieter@gmail.com>
Date: Fri, 5 Jun 2020 17:06:35 +0200
Subject: [PATCH 0444/1718] Simplify version constraint for the
 php-amqplib/php-amqplib package, now that the php extension sockets is
 considered required for Magento.

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index aa293fdfb014b..ce431c9b6db28 100644
--- a/composer.json
+++ b/composer.json
@@ -70,7 +70,7 @@
         "monolog/monolog": "^1.17",
         "paragonie/sodium_compat": "^1.6",
         "pelago/emogrifier": "^3.1.0",
-        "php-amqplib/php-amqplib": "~2.7.0||~2.10.0",
+        "php-amqplib/php-amqplib": "~2.10.0",
         "phpseclib/mcrypt_compat": "1.0.8",
         "phpseclib/phpseclib": "2.0.*",
         "ramsey/uuid": "~3.8.0",

From e5ab51f5e6b5c26f08c17760a99c166bb128e95e Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Thu, 11 Jun 2020 23:31:46 +0300
Subject: [PATCH 0445/1718] removed unused imports

---
 .../Data/AddCustomerUpdatedAtAttribute.php    |  7 ++-
 .../AddNonSpecifiedGenderAttributeOption.php  | 18 ++------
 .../Data/AddSecurityTrackingAttributes.php    |  7 ++-
 ...ertValidationRulesFromSerializedToJson.php |  7 ++-
 .../DefaultCustomerGroupsAndAttributes.php    | 12 +++---
 ...MigrateStoresAllowedCountriesToWebsite.php | 11 +++--
 ...oveCheckoutRegisterAndUpdateAttributes.php | 43 ++++++++-----------
 ...dateAutocompleteOnStorefrontConfigPath.php | 10 ++---
 .../UpdateCustomerAttributeInputFilters.php   |  7 ++-
 ...IdentifierCustomerAttributesVisibility.php |  7 ++-
 .../Setup/Patch/Data/UpdateVATNumber.php      | 26 +++++------
 .../Data/UpgradePasswordHashAndAddress.php    |  7 ++-
 12 files changed, 68 insertions(+), 94 deletions(-)

diff --git a/app/code/Magento/Customer/Setup/Patch/Data/AddCustomerUpdatedAtAttribute.php b/app/code/Magento/Customer/Setup/Patch/Data/AddCustomerUpdatedAtAttribute.php
index bad5735bc3e3a..77bb515c8e52b 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/AddCustomerUpdatedAtAttribute.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/AddCustomerUpdatedAtAttribute.php
@@ -4,18 +4,18 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Customer\Setup\Patch\Data;
 
 use Magento\Customer\Model\Customer;
 use Magento\Customer\Setup\CustomerSetupFactory;
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
- * Class AddCustomerUpdatedAtAttribute
- * @package Magento\Customer\Setup\Patch
+ * Class add customer updated attribute to customer
  */
 class AddCustomerUpdatedAtAttribute implements DataPatchInterface, PatchVersionInterface
 {
@@ -30,7 +30,6 @@ class AddCustomerUpdatedAtAttribute implements DataPatchInterface, PatchVersionI
     private $customerSetupFactory;
 
     /**
-     * AddCustomerUpdatedAtAttribute constructor.
      * @param ModuleDataSetupInterface $moduleDataSetup
      * @param CustomerSetupFactory $customerSetupFactory
      */
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/AddNonSpecifiedGenderAttributeOption.php b/app/code/Magento/Customer/Setup/Patch/Data/AddNonSpecifiedGenderAttributeOption.php
index ba50f6e17dd87..e958093b89621 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/AddNonSpecifiedGenderAttributeOption.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/AddNonSpecifiedGenderAttributeOption.php
@@ -4,29 +4,18 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Customer\Setup\Patch\Data;
 
 use Magento\Customer\Model\Customer;
 use Magento\Customer\Setup\CustomerSetupFactory;
-use Magento\Directory\Model\AllowedCountries;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Encryption\Encryptor;
-use Magento\Framework\Indexer\IndexerRegistry;
-use Magento\Framework\Setup\SetupInterface;
-use Magento\Framework\Setup\UpgradeDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Store\Model\ScopeInterface;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\DB\FieldDataConverterFactory;
-use Magento\Framework\DB\DataConverter\SerializedToJson;
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
- * Class AddNonSpecifiedGenderAttributeOption
- * @package Magento\Customer\Setup\Patch
+ * Class add non specified gender attribute option to customer
  */
 class AddNonSpecifiedGenderAttributeOption implements DataPatchInterface, PatchVersionInterface
 {
@@ -41,7 +30,6 @@ class AddNonSpecifiedGenderAttributeOption implements DataPatchInterface, PatchV
     private $customerSetupFactory;
 
     /**
-     * AddNonSpecifiedGenderAttributeOption constructor.
      * @param ModuleDataSetupInterface $moduleDataSetup
      * @param CustomerSetupFactory $customerSetupFactory
      */
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/AddSecurityTrackingAttributes.php b/app/code/Magento/Customer/Setup/Patch/Data/AddSecurityTrackingAttributes.php
index b066d14a3c63e..737ac2b085b34 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/AddSecurityTrackingAttributes.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/AddSecurityTrackingAttributes.php
@@ -4,18 +4,18 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Customer\Setup\Patch\Data;
 
 use Magento\Customer\Model\Customer;
 use Magento\Customer\Setup\CustomerSetupFactory;
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
- * Class AddSecurityTrackingAttributes
- * @package Magento\Customer\Setup\Patch
+ * Class add security tracking attributes to customer
  */
 class AddSecurityTrackingAttributes implements DataPatchInterface, PatchVersionInterface
 {
@@ -30,7 +30,6 @@ class AddSecurityTrackingAttributes implements DataPatchInterface, PatchVersionI
     private $customerSetupFactory;
 
     /**
-     * AddSecurityTrackingAttributes constructor.
      * @param ModuleDataSetupInterface $moduleDataSetup
      * @param CustomerSetupFactory $customerSetupFactory
      */
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/ConvertValidationRulesFromSerializedToJson.php b/app/code/Magento/Customer/Setup/Patch/Data/ConvertValidationRulesFromSerializedToJson.php
index 83c5fe7ae6d1e..ed3fb5b00c524 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/ConvertValidationRulesFromSerializedToJson.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/ConvertValidationRulesFromSerializedToJson.php
@@ -4,18 +4,18 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Customer\Setup\Patch\Data;
 
 use Magento\Framework\DB\FieldDataConverterFactory;
 use Magento\Framework\DB\DataConverter\SerializedToJson;
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
- * Class ConvertValidationRulesFromSerializedToJson
- * @package Magento\Customer\Setup\Patch
+ * Class convert validation rules from serialized to json for customer
  */
 class ConvertValidationRulesFromSerializedToJson implements DataPatchInterface, PatchVersionInterface
 {
@@ -30,7 +30,6 @@ class ConvertValidationRulesFromSerializedToJson implements DataPatchInterface,
     private $fieldDataConverterFactory;
 
     /**
-     * ConvertValidationRulesFromSerializedToJson constructor.
      * @param ModuleDataSetupInterface $moduleDataSetup
      * @param FieldDataConverterFactory $fieldDataConverterFactory
      */
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/DefaultCustomerGroupsAndAttributes.php b/app/code/Magento/Customer/Setup/Patch/Data/DefaultCustomerGroupsAndAttributes.php
index 6e61b66f3c9db..e6dd3f36e8ebd 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/DefaultCustomerGroupsAndAttributes.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/DefaultCustomerGroupsAndAttributes.php
@@ -4,19 +4,20 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Customer\Setup\Patch\Data;
 
 use Magento\Customer\Setup\CustomerSetup;
 use Magento\Customer\Setup\CustomerSetupFactory;
+use Magento\Eav\Model\Entity\Attribute\Backend\DefaultBackend;
 use Magento\Framework\Module\Setup\Migration;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
- * Class DefaultCustomerGroupsAndAttributes
- * @package Magento\Customer\Setup\Patch
+ * Class default groups and attributes for customer
  */
 class DefaultCustomerGroupsAndAttributes implements DataPatchInterface, PatchVersionInterface
 {
@@ -31,13 +32,12 @@ class DefaultCustomerGroupsAndAttributes implements DataPatchInterface, PatchVer
     private $moduleDataSetup;
 
     /**
-     * DefaultCustomerGroupsAndAttributes constructor.
      * @param CustomerSetupFactory $customerSetupFactory
      * @param ModuleDataSetupInterface $moduleDataSetup
      */
     public function __construct(
         CustomerSetupFactory $customerSetupFactory,
-        \Magento\Framework\Setup\ModuleDataSetupInterface $moduleDataSetup
+        ModuleDataSetupInterface $moduleDataSetup
     ) {
         $this->customerSetupFactory = $customerSetupFactory;
         $this->moduleDataSetup = $moduleDataSetup;
@@ -133,7 +133,7 @@ public function apply()
             'customer_address',
             'street',
             'backend_model',
-            \Magento\Eav\Model\Entity\Attribute\Backend\DefaultBackend::class
+            DefaultBackend::class
         );
 
         $migrationSetup = $this->moduleDataSetup->createMigrationSetup();
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/MigrateStoresAllowedCountriesToWebsite.php b/app/code/Magento/Customer/Setup/Patch/Data/MigrateStoresAllowedCountriesToWebsite.php
index e4978070f53ad..d041ea920eb5b 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/MigrateStoresAllowedCountriesToWebsite.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/MigrateStoresAllowedCountriesToWebsite.php
@@ -4,8 +4,11 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Customer\Setup\Patch\Data;
 
+use Exception;
 use Magento\Directory\Model\AllowedCountries;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Store\Model\ScopeInterface;
@@ -34,15 +37,14 @@ class MigrateStoresAllowedCountriesToWebsite implements DataPatchInterface, Patc
     private $allowedCountries;
 
     /**
-     * MigrateStoresAllowedCountriesToWebsite constructor.
      * @param ModuleDataSetupInterface $moduleDataSetup
      * @param StoreManagerInterface $storeManager
      * @param AllowedCountries $allowedCountries
      */
     public function __construct(
         ModuleDataSetupInterface $moduleDataSetup,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Directory\Model\AllowedCountries $allowedCountries
+        StoreManagerInterface $storeManager,
+        AllowedCountries $allowedCountries
     ) {
         $this->moduleDataSetup = $moduleDataSetup;
         $this->storeManager = $storeManager;
@@ -51,6 +53,7 @@ public function __construct(
 
     /**
      * @inheritdoc
+     * @throws Exception
      */
     public function apply()
     {
@@ -60,7 +63,7 @@ public function apply()
         try {
             $this->migrateStoresAllowedCountriesToWebsite();
             $this->moduleDataSetup->getConnection()->commit();
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             $this->moduleDataSetup->getConnection()->rollBack();
             throw $e;
         }
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/RemoveCheckoutRegisterAndUpdateAttributes.php b/app/code/Magento/Customer/Setup/Patch/Data/RemoveCheckoutRegisterAndUpdateAttributes.php
index 51f54dc4a432c..7c621c710c463 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/RemoveCheckoutRegisterAndUpdateAttributes.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/RemoveCheckoutRegisterAndUpdateAttributes.php
@@ -4,29 +4,23 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Customer\Setup\Patch\Data;
 
 use Magento\Customer\Model\Customer;
+use Magento\Customer\Model\ResourceModel\Address;
+use Magento\Customer\Model\ResourceModel\Address\Attribute\Backend\Region;
+use Magento\Customer\Model\ResourceModel\Address\Attribute\Source\Country;
+use Magento\Customer\Model\ResourceModel\Attribute\Collection;
 use Magento\Customer\Setup\CustomerSetupFactory;
-use Magento\Directory\Model\AllowedCountries;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Encryption\Encryptor;
-use Magento\Framework\Indexer\IndexerRegistry;
-use Magento\Framework\Setup\SetupInterface;
-use Magento\Framework\Setup\UpgradeDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Eav\Model\Entity\Increment\NumericValue;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Store\Model\ScopeInterface;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\DB\FieldDataConverterFactory;
-use Magento\Framework\DB\DataConverter\SerializedToJson;
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
- * Class RemoveCheckoutRegisterAndUpdateAttributes
- * @package Magento\Customer\Setup\Patch
+ * Remove register and update attributes for checkout
  */
 class RemoveCheckoutRegisterAndUpdateAttributes implements DataPatchInterface, PatchVersionInterface
 {
@@ -41,7 +35,6 @@ class RemoveCheckoutRegisterAndUpdateAttributes implements DataPatchInterface, P
     private $customerSetupFactory;
 
     /**
-     * RemoveCheckoutRegisterAndUpdateAttributes constructor.
      * @param ModuleDataSetupInterface $moduleDataSetup
      * @param CustomerSetupFactory $customerSetupFactory
      */
@@ -64,47 +57,47 @@ public function apply()
         );
         $customerSetup = $this->customerSetupFactory->create(['setup' => $this->moduleDataSetup]);
         $customerSetup->updateEntityType(
-            \Magento\Customer\Model\Customer::ENTITY,
+            Customer::ENTITY,
             'entity_model',
             \Magento\Customer\Model\ResourceModel\Customer::class
         );
         $customerSetup->updateEntityType(
-            \Magento\Customer\Model\Customer::ENTITY,
+            Customer::ENTITY,
             'increment_model',
-            \Magento\Eav\Model\Entity\Increment\NumericValue::class
+            NumericValue::class
         );
         $customerSetup->updateEntityType(
-            \Magento\Customer\Model\Customer::ENTITY,
+            Customer::ENTITY,
             'entity_attribute_collection',
-            \Magento\Customer\Model\ResourceModel\Attribute\Collection::class
+            Collection::class
         );
         $customerSetup->updateEntityType(
             'customer_address',
             'entity_model',
-            \Magento\Customer\Model\ResourceModel\Address::class
+            Address::class
         );
         $customerSetup->updateEntityType(
             'customer_address',
             'entity_attribute_collection',
-            \Magento\Customer\Model\ResourceModel\Address\Attribute\Collection::class
+            Address\Attribute\Collection::class
         );
         $customerSetup->updateAttribute(
             'customer_address',
             'country_id',
             'source_model',
-            \Magento\Customer\Model\ResourceModel\Address\Attribute\Source\Country::class
+            Country::class
         );
         $customerSetup->updateAttribute(
             'customer_address',
             'region',
             'backend_model',
-            \Magento\Customer\Model\ResourceModel\Address\Attribute\Backend\Region::class
+            Region::class
         );
         $customerSetup->updateAttribute(
             'customer_address',
             'region_id',
             'source_model',
-            \Magento\Customer\Model\ResourceModel\Address\Attribute\Source\Region::class
+            Address\Attribute\Source\Region::class
         );
     }
 
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/UpdateAutocompleteOnStorefrontConfigPath.php b/app/code/Magento/Customer/Setup/Patch/Data/UpdateAutocompleteOnStorefrontConfigPath.php
index 30435ace54d46..64fef20008f09 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/UpdateAutocompleteOnStorefrontConfigPath.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/UpdateAutocompleteOnStorefrontConfigPath.php
@@ -4,16 +4,17 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Customer\Setup\Patch\Data;
 
-use Magento\Framework\App\ResourceConnection;
+use Magento\Customer\Model\Form;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
- * Class UpdateAutocompleteOnStorefrontCOnfigPath
- * @package Magento\Customer\Setup\Patch
+ * Update storefront's autocomplete of config path
  */
 class UpdateAutocompleteOnStorefrontConfigPath implements DataPatchInterface, PatchVersionInterface
 {
@@ -23,7 +24,6 @@ class UpdateAutocompleteOnStorefrontConfigPath implements DataPatchInterface, Pa
     private $moduleDataSetup;
 
     /**
-     * UpdateAutocompleteOnStorefrontCOnfigPath constructor.
      * @param ModuleDataSetupInterface $moduleDataSetup
      */
     public function __construct(
@@ -39,7 +39,7 @@ public function apply()
     {
         $this->moduleDataSetup->getConnection()->update(
             $this->moduleDataSetup->getTable('core_config_data'),
-            ['path' => \Magento\Customer\Model\Form::XML_PATH_ENABLE_AUTOCOMPLETE],
+            ['path' => Form::XML_PATH_ENABLE_AUTOCOMPLETE],
             ['path = ?' => 'general/restriction/autocomplete_on_storefront']
         );
     }
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/UpdateCustomerAttributeInputFilters.php b/app/code/Magento/Customer/Setup/Patch/Data/UpdateCustomerAttributeInputFilters.php
index 938cd3cd52e73..9d6bd2d4f7c69 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/UpdateCustomerAttributeInputFilters.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/UpdateCustomerAttributeInputFilters.php
@@ -4,17 +4,17 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Customer\Setup\Patch\Data;
 
 use Magento\Customer\Setup\CustomerSetupFactory;
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
- * Class UpdateCustomerAttributeInputFilters
- * @package Magento\Customer\Setup\Patch
+ * Update attribute input filters for customer
  */
 class UpdateCustomerAttributeInputFilters implements DataPatchInterface, PatchVersionInterface
 {
@@ -29,7 +29,6 @@ class UpdateCustomerAttributeInputFilters implements DataPatchInterface, PatchVe
     private $customerSetupFactory;
 
     /**
-     * UpdateCustomerAttributeInputFilters constructor.
      * @param ModuleDataSetupInterface $moduleDataSetup
      * @param CustomerSetupFactory $customerSetupFactory
      */
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/UpdateIdentifierCustomerAttributesVisibility.php b/app/code/Magento/Customer/Setup/Patch/Data/UpdateIdentifierCustomerAttributesVisibility.php
index 7d0cad768d6b0..bfb97c6045c92 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/UpdateIdentifierCustomerAttributesVisibility.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/UpdateIdentifierCustomerAttributesVisibility.php
@@ -4,17 +4,17 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Customer\Setup\Patch\Data;
 
 use Magento\Customer\Setup\CustomerSetupFactory;
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
- * Class UpdateIdentifierCustomerAttributesVisibility
- * @package Magento\Customer\Setup\Patch
+ * Update identifier attributes visibility for customer
  */
 class UpdateIdentifierCustomerAttributesVisibility implements DataPatchInterface, PatchVersionInterface
 {
@@ -29,7 +29,6 @@ class UpdateIdentifierCustomerAttributesVisibility implements DataPatchInterface
     private $customerSetupFactory;
 
     /**
-     * UpdateIdentifierCustomerAttributesVisibility constructor.
      * @param ModuleDataSetupInterface $moduleDataSetup
      * @param CustomerSetupFactory $customerSetupFactory
      */
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/UpdateVATNumber.php b/app/code/Magento/Customer/Setup/Patch/Data/UpdateVATNumber.php
index d31301eedf4b1..1fa8614485870 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/UpdateVATNumber.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/UpdateVATNumber.php
@@ -4,26 +4,18 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Customer\Setup\Patch\Data;
 
-use Magento\Customer\Model\Customer;
 use Magento\Customer\Setup\CustomerSetupFactory;
-use Magento\Directory\Model\AllowedCountries;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Encryption\Encryptor;
-use Magento\Framework\Indexer\IndexerRegistry;
-use Magento\Framework\Setup\SetupInterface;
-use Magento\Framework\Setup\UpgradeDataInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Store\Model\ScopeInterface;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\DB\FieldDataConverterFactory;
-use Magento\Framework\DB\DataConverter\SerializedToJson;
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
+/**
+ * Upgrade vat number
+ */
 class UpdateVATNumber implements DataPatchInterface, PatchVersionInterface
 {
     /**
@@ -37,7 +29,6 @@ class UpdateVATNumber implements DataPatchInterface, PatchVersionInterface
     private $customerSetupFactory;
 
     /**
-     * UpdateVATNumber constructor.
      * @param ModuleDataSetupInterface $moduleDataSetup
      * @param CustomerSetupFactory $customerSetupFactory
      */
@@ -55,7 +46,12 @@ public function __construct(
     public function apply()
     {
         $customerSetup = $this->customerSetupFactory->create(['resourceConnection' => $this->moduleDataSetup]);
-        $customerSetup->updateAttribute('customer_address', 'vat_id', 'frontend_label', 'VAT Number');
+        $customerSetup->updateAttribute(
+            'customer_address',
+            'vat_id',
+            'frontend_label',
+            'VAT Number'
+        );
     }
 
     /**
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/UpgradePasswordHashAndAddress.php b/app/code/Magento/Customer/Setup/Patch/Data/UpgradePasswordHashAndAddress.php
index 3b8f96a037343..cec2de71fb477 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/UpgradePasswordHashAndAddress.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/UpgradePasswordHashAndAddress.php
@@ -4,18 +4,18 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Customer\Setup\Patch\Data;
 
 use Magento\Customer\Setup\CustomerSetupFactory;
 use Magento\Framework\Encryption\Encryptor;
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
- * Class UpgradePasswordHashAndAddress
- * @package Magento\Customer\Setup\Patch
+ * Update passwordHash and address
  */
 class UpgradePasswordHashAndAddress implements DataPatchInterface, PatchVersionInterface
 {
@@ -30,7 +30,6 @@ class UpgradePasswordHashAndAddress implements DataPatchInterface, PatchVersionI
     private $customerSetupFactory;
 
     /**
-     * UpgradePasswordHashAndAddress constructor.
      * @param ModuleDataSetupInterface $moduleDataSetup
      * @param CustomerSetupFactory $customerSetupFactory
      */

From 50f94e40dbe4be56a3d99f7b3968e787a15b420b Mon Sep 17 00:00:00 2001
From: Lena Orobei <oorobei@magento.com>
Date: Thu, 11 Jun 2020 15:34:03 -0500
Subject: [PATCH 0446/1718] magento/magento2#27200: Dependency
 php-amqplib/php-amqplib vs php extension sockets causes inconsistent
 composer.lock file

---
 composer.lock | 293 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 291 insertions(+), 2 deletions(-)

diff --git a/composer.lock b/composer.lock
index eea11746a42fa..c059a77c3e35b 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": "2ddc5369636a860cfa82ef023c958bd6",
+    "content-hash": "d41767acdd1e6d4926c14821738ed8d5",
     "packages": [
         {
             "name": "colinmollenhour/cache-backend-file",
@@ -1305,6 +1305,12 @@
                 "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"
         },
         {
@@ -3254,6 +3260,12 @@
                 "laminas",
                 "zf"
             ],
+            "funding": [
+                {
+                    "url": "https://funding.communitybridge.org/projects/laminas-project",
+                    "type": "community_bridge"
+                }
+            ],
             "time": "2020-05-20T16:45:56+00:00"
         },
         {
@@ -3493,6 +3505,16 @@
                 "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"
         },
         {
@@ -4444,6 +4466,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"
         },
         {
@@ -4622,6 +4658,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"
         },
         {
@@ -4671,6 +4721,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"
         },
         {
@@ -4729,6 +4793,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-05-12T16:14:59+00:00"
         },
         {
@@ -4791,6 +4869,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-05-12T16:47:27+00:00"
         },
         {
@@ -4850,6 +4942,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-05-12T16:47:27+00:00"
         },
         {
@@ -4905,6 +5011,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-05-12T16:47:27+00:00"
         },
         {
@@ -4963,6 +5083,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-05-12T16:47:27+00:00"
         },
         {
@@ -5867,6 +6001,12 @@
                 "functional testing",
                 "unit testing"
             ],
+            "funding": [
+                {
+                    "url": "https://opencollective.com/codeception",
+                    "type": "open_collective"
+                }
+            ],
             "time": "2020-05-24T13:58:47+00:00"
         },
         {
@@ -6439,6 +6579,20 @@
                 "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"
         },
         {
@@ -6562,6 +6716,20 @@
                 "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"
         },
         {
@@ -6624,6 +6792,20 @@
                 "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"
         },
         {
@@ -6973,6 +7155,12 @@
                 "sftp",
                 "storage"
             ],
+            "funding": [
+                {
+                    "url": "https://offset.earth/frankdejonge",
+                    "type": "other"
+                }
+            ],
             "time": "2020-05-18T15:13:39+00:00"
         },
         {
@@ -8575,6 +8763,16 @@
                 "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"
         },
         {
@@ -8880,6 +9078,12 @@
                 "unidiff",
                 "unified diff"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-05-08T05:01:12+00:00"
         },
         {
@@ -9735,6 +9939,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-05-27T08:34:37+00:00"
         },
         {
@@ -9796,6 +10014,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-05-24T12:18:07+00:00"
         },
         {
@@ -9859,6 +10091,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-05-25T12:33:44+00:00"
         },
         {
@@ -9972,6 +10218,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-05-12T16:47:27+00:00"
         },
         {
@@ -10034,6 +10294,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-05-12T16:47:27+00:00"
         },
         {
@@ -10147,6 +10421,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"
         },
         {
@@ -10537,5 +10825,6 @@
         "ext-zip": "*",
         "lib-libxml": "*"
     },
-    "platform-dev": []
+    "platform-dev": [],
+    "plugin-api-version": "1.1.0"
 }

From e21fbddd942844fac7f1d61b5b51abdf848a94da Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Fri, 12 Jun 2020 15:34:09 +0300
Subject: [PATCH 0447/1718] magento/magento2-login-as-customer#158: Enable Page
 Cache - Admin is not logged in as customer because was redirected to the
 "Sign In" page.

---
 .../view/frontend/layout/loginascustomer_login_index.xml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/layout/loginascustomer_login_index.xml b/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/layout/loginascustomer_login_index.xml
index efb866690c401..768b63cbbecea 100644
--- a/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/layout/loginascustomer_login_index.xml
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/layout/loginascustomer_login_index.xml
@@ -13,7 +13,7 @@
             </action>
         </referenceBlock>
         <referenceContainer name="content">
-            <block class="Magento\Framework\View\Element\Template" name="loginascustomer_login" template="Magento_LoginAsCustomerFrontendUi::login.phtml"/>
+            <block class="Magento\Framework\View\Element\Template" name="loginascustomer_login" template="Magento_LoginAsCustomerFrontendUi::login.phtml" cacheable="false"/>
         </referenceContainer>
     </body>
 </page>

From 8a5e79d5be26e6e694c3e5950c2cbc0dc278273a Mon Sep 17 00:00:00 2001
From: Viktor Sevch <viktor.sevch@transoftgroup.com>
Date: Fri, 12 Jun 2020 16:11:43 +0300
Subject: [PATCH 0448/1718] MC-35139: [UPS] Allowed Methods are absent

---
 .../templates/system/shipping/carrier_config.phtml        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml b/app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml
index d0b6443994aa6..f068b0cf0079f 100644
--- a/app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml
+++ b/app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml
@@ -156,7 +156,7 @@ $scriptString .= <<<script
         setFormValues: function()
         {
             var a;
-            if ($(this.carriersUpsTypeId) == 'UPS') {
+            if (\$F(this.carriersUpsTypeId) == 'UPS') {
                 for (a = 0; a < this.checkingUpsXmlId.length; a++) {
                     $(this.checkingUpsXmlId[a]).removeClassName('required-entry');
                 }
@@ -184,13 +184,13 @@ $scriptString .= <<<script
         },
         changeOriginShipment: function(Event, key)
         {
-            this.originShipmentTitle = key ? key : $('carriers_ups_origin_shipment');
+            this.originShipmentTitle = key ? key : \$F('carriers_ups_origin_shipment');
             this.updateAllowedMethods(this.originShipmentTitle);
         },
         changeFieldsDisabledState: function (fields, key) {
-            $(fields[key]).disabled = $(this.carriersUpsActiveId) !== '1'
+            $(fields[key]).disabled = \$F(this.carriersUpsActiveId) !== '1'
                 || $(fields[key] + '_inherit') !== null
-                && $(fields[key] + '_inherit') === '1';
+                && \$F(fields[key] + '_inherit') === '1';
 
             if ($(fields[key]).next() !== undefined) {
                 $(fields[key]).removeClassName('mage-error').next().remove();

From b7ed3e6a96941d02bc5f6fc579f88dad60ab77b3 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Fri, 12 Jun 2020 18:24:43 +0100
Subject: [PATCH 0449/1718] magento/adobe-stock-integration#1439: Added
 description and hash fields to the media asset

---
 app/code/Magento/MediaGallery/Model/Asset.php | 32 +++++++++++++++++++
 .../Model/Asset/Command/GetById.php           |  2 ++
 .../Model/Asset/Command/GetByPath.php         |  2 ++
 .../Model/ResourceModel/GetAssetsByIds.php    |  2 ++
 .../Model/ResourceModel/GetAssetsByPaths.php  |  2 ++
 .../Model/ResourceModel/SaveAssets.php        |  2 ++
 .../Magento/MediaGallery/etc/db_schema.xml    |  2 ++
 .../MediaGallery/etc/db_schema_whitelist.json |  2 ++
 .../Api/Data/AssetInterface.php               | 14 ++++++++
 9 files changed, 60 insertions(+)

diff --git a/app/code/Magento/MediaGallery/Model/Asset.php b/app/code/Magento/MediaGallery/Model/Asset.php
index 78b9477a70b08..7a4e51709dc0a 100644
--- a/app/code/Magento/MediaGallery/Model/Asset.php
+++ b/app/code/Magento/MediaGallery/Model/Asset.php
@@ -32,11 +32,21 @@ class Asset implements AssetInterface
      */
     private $title;
 
+    /**
+     * @var string|null
+     */
+    private $description;
+
     /**
      * @var string|null
      */
     private $source;
 
+    /**
+     * @var string|null
+     */
+    private $hash;
+
     /**
      * @var string
      */
@@ -80,7 +90,9 @@ class Asset implements AssetInterface
      * @param int $size
      * @param int|null $id
      * @param string|null $title
+     * @param string|null $description
      * @param string|null $source
+     * @param string|null $hash
      * @param string|null $createdAt
      * @param string|null $updatedAt
      * @param AssetExtensionInterface|null $extensionAttributes
@@ -93,7 +105,9 @@ public function __construct(
         int $size,
         ?int $id = null,
         ?string $title = null,
+        ?string $description = null,
         ?string $source = null,
+        ?string $hash = null,
         ?string $createdAt = null,
         ?string $updatedAt = null,
         ?AssetExtensionInterface $extensionAttributes = null
@@ -105,7 +119,9 @@ public function __construct(
         $this->size = $size;
         $this->id = $id;
         $this->title = $title;
+        $this->description = $description;
         $this->source = $source;
+        $this->hash = $hash;
         $this->createdAt = $createdAt;
         $this->updatedAt = $updatedAt;
         $this->extensionAttributes = $extensionAttributes;
@@ -135,6 +151,14 @@ public function getTitle(): ?string
         return $this->title;
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function getDescription(): ?string
+    {
+        return $this->description;
+    }
+
     /**
      * @inheritdoc
      */
@@ -143,6 +167,14 @@ public function getSource(): ?string
         return $this->source;
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function getHash(): ?string
+    {
+        return $this->hash;
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/app/code/Magento/MediaGallery/Model/Asset/Command/GetById.php b/app/code/Magento/MediaGallery/Model/Asset/Command/GetById.php
index b2f900233e46a..71e2cb70663f3 100644
--- a/app/code/Magento/MediaGallery/Model/Asset/Command/GetById.php
+++ b/app/code/Magento/MediaGallery/Model/Asset/Command/GetById.php
@@ -94,7 +94,9 @@ public function execute(int $mediaAssetId): AssetInterface
                     'id' => $mediaAssetData['id'],
                     'path' => $mediaAssetData['path'],
                     'title' => $mediaAssetData['title'],
+                    'description' => $mediaAssetData['description'],
                     'source' => $mediaAssetData['source'],
+                    'hash' => $mediaAssetData['hash'],
                     'contentType' => $mediaAssetData['content_type'],
                     'width' => $mediaAssetData['width'],
                     'height' => $mediaAssetData['height'],
diff --git a/app/code/Magento/MediaGallery/Model/Asset/Command/GetByPath.php b/app/code/Magento/MediaGallery/Model/Asset/Command/GetByPath.php
index d9faad62b2cd1..02512a12f9d07 100644
--- a/app/code/Magento/MediaGallery/Model/Asset/Command/GetByPath.php
+++ b/app/code/Magento/MediaGallery/Model/Asset/Command/GetByPath.php
@@ -86,7 +86,9 @@ public function execute(string $path): AssetInterface
                     'id' => $data['id'],
                     'path' => $data['path'],
                     'title' => $data['title'],
+                    'description' => $data['description'],
                     'source' => $data['source'],
+                    'hash' => $data['hash'],
                     'contentType' => $data['content_type'],
                     'width' => $data['width'],
                     'height' => $data['height'],
diff --git a/app/code/Magento/MediaGallery/Model/ResourceModel/GetAssetsByIds.php b/app/code/Magento/MediaGallery/Model/ResourceModel/GetAssetsByIds.php
index 53185939b2283..f73162b775683 100644
--- a/app/code/Magento/MediaGallery/Model/ResourceModel/GetAssetsByIds.php
+++ b/app/code/Magento/MediaGallery/Model/ResourceModel/GetAssetsByIds.php
@@ -65,7 +65,9 @@ public function execute(array $ids): array
                         'id' => $assetData['id'],
                         'path' => $assetData['path'],
                         'title' => $assetData['title'],
+                        'description' => $assetData['description'],
                         'source' => $assetData['source'],
+                        'hash' => $assetData['hash'],
                         'contentType' => $assetData['content_type'],
                         'width' => $assetData['width'],
                         'height' => $assetData['height'],
diff --git a/app/code/Magento/MediaGallery/Model/ResourceModel/GetAssetsByPaths.php b/app/code/Magento/MediaGallery/Model/ResourceModel/GetAssetsByPaths.php
index 5593083d9673a..b25d2e22aabd4 100644
--- a/app/code/Magento/MediaGallery/Model/ResourceModel/GetAssetsByPaths.php
+++ b/app/code/Magento/MediaGallery/Model/ResourceModel/GetAssetsByPaths.php
@@ -66,7 +66,9 @@ public function execute(array $paths): array
                         'id' => $assetData['id'],
                         'path' => $assetData['path'],
                         'title' => $assetData['title'],
+                        'description' => $assetData['description'],
                         'source' => $assetData['source'],
+                        'hash' => $assetData['hash'],
                         'contentType' => $assetData['content_type'],
                         'width' => $assetData['width'],
                         'height' => $assetData['height'],
diff --git a/app/code/Magento/MediaGallery/Model/ResourceModel/SaveAssets.php b/app/code/Magento/MediaGallery/Model/ResourceModel/SaveAssets.php
index ec08addf93462..801279aa7fd7d 100644
--- a/app/code/Magento/MediaGallery/Model/ResourceModel/SaveAssets.php
+++ b/app/code/Magento/MediaGallery/Model/ResourceModel/SaveAssets.php
@@ -60,7 +60,9 @@ public function execute(array $assets): void
                     'id' => $asset->getId(),
                     'path' => $asset->getPath(),
                     'title' => $asset->getTitle(),
+                    'description' => $asset->getDescription(),
                     'source' => $asset->getSource(),
+                    'hash' => $asset->getHash(),
                     'content_type' => $asset->getContentType(),
                     'width' => $asset->getWidth(),
                     'height' => $asset->getHeight(),
diff --git a/app/code/Magento/MediaGallery/etc/db_schema.xml b/app/code/Magento/MediaGallery/etc/db_schema.xml
index 31a764ef00c4d..1001737daa8a7 100644
--- a/app/code/Magento/MediaGallery/etc/db_schema.xml
+++ b/app/code/Magento/MediaGallery/etc/db_schema.xml
@@ -10,7 +10,9 @@
         <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="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"/>
+        <column xsi:type="varchar" name="hash" length="255" nullable="true" comment="File hash"/>
         <column xsi:type="varchar" name="content_type" length="255" nullable="true" comment="Content Type"/>
         <column xsi:type="int" name="width" unsigned="true" nullable="false" identity="false" default="0" comment="Width"/>
         <column xsi:type="int" name="height" unsigned="true" nullable="false" identity="false" default="0" comment="Height"/>
diff --git a/app/code/Magento/MediaGallery/etc/db_schema_whitelist.json b/app/code/Magento/MediaGallery/etc/db_schema_whitelist.json
index 8f5098caa9753..b32dfbf082175 100644
--- a/app/code/Magento/MediaGallery/etc/db_schema_whitelist.json
+++ b/app/code/Magento/MediaGallery/etc/db_schema_whitelist.json
@@ -4,7 +4,9 @@
             "id": true,
             "path": true,
             "title": true,
+            "description": true,
             "source": true,
+            "hash": true,
             "content_type": true,
             "width": true,
             "height": true,
diff --git a/app/code/Magento/MediaGalleryApi/Api/Data/AssetInterface.php b/app/code/Magento/MediaGalleryApi/Api/Data/AssetInterface.php
index 5df420a274933..a747cb963baab 100644
--- a/app/code/Magento/MediaGalleryApi/Api/Data/AssetInterface.php
+++ b/app/code/Magento/MediaGalleryApi/Api/Data/AssetInterface.php
@@ -38,6 +38,13 @@ public function getPath(): string;
      */
     public function getTitle(): ?string;
 
+    /**
+     * Get description
+     *
+     * @return string|null
+     */
+    public function getDescription(): ?string;
+
     /**
      * Get the name of the channel/stock/integration file was retrieved from. null if not identified.
      *
@@ -45,6 +52,13 @@ public function getTitle(): ?string;
      */
     public function getSource(): ?string;
 
+    /**
+     * Get file hash
+     *
+     * @return string|null
+     */
+    public function getHash(): ?string;
+
     /**
      * Get content type
      *

From 74727b2515d9b17f650bcf7a581d06a8c2358616 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Fri, 12 Jun 2020 17:40:37 -0500
Subject: [PATCH 0450/1718] MC-35064: [Cloud] Can't deploy 2.4.0-alpha8 on
 cloud pro instance

---
 .../Framework/View/Template/Html/Minifier.php | 23 ++++++++++++++++++-
 .../Test/Unit/Template/Html/MinifierTest.php  | 11 ++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/View/Template/Html/Minifier.php b/lib/internal/Magento/Framework/View/Template/Html/Minifier.php
index 796cc8bef0f28..0a8db80cae349 100644
--- a/lib/internal/Magento/Framework/View/Template/Html/Minifier.php
+++ b/lib/internal/Magento/Framework/View/Template/Html/Minifier.php
@@ -114,6 +114,18 @@ public function minify($file)
     {
         $dir = dirname($file);
         $fileName = basename($file);
+        $content = $this->readFactory->create($dir)->readFile($fileName);
+        //Storing Heredocs
+        $heredocs = [];
+        $content = preg_replace_callback(
+            '/<<<([A-z]+).*?\1;/ims',
+            function ($match) use (&$heredocs) {
+                $heredocs[] = $match[0];
+
+                return '__MINIFIED_HEREDOC__' .(count($heredocs) - 1);
+            },
+            $content
+        );
         $content = preg_replace(
             '#(?<!]]>)\s+</#',
             '</',
@@ -136,7 +148,7 @@ public function minify($file)
                                 preg_replace(
                                     '#(?<!:)//[^\n\r]*(\<\?php)[^\n\r]*(\s\?\>)[^\n\r]*#',
                                     '',
-                                    $this->readFactory->create($dir)->readFile($fileName)
+                                    $content
                                 )
                             )
                         )
@@ -145,6 +157,15 @@ public function minify($file)
             )
         );
 
+        //Restoring Heredocs
+        $content = preg_replace_callback(
+            '/__MINIFIED_HEREDOC__(\d+)/ims',
+            function ($match) use ($heredocs) {
+                return $heredocs[(int)$match[1]];
+            },
+            $content
+        );
+
         if (!$this->htmlDirectory->isExist()) {
             $this->htmlDirectory->create();
         }
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php
index 3e9db46c354d7..21f8aa598a721 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php
@@ -167,6 +167,12 @@ public function testMinify()
             <?php // echo \$block->getChildHtml('anotherChildBlock'); ?>
         <?php // endif; ?>
     </body>
+    <?php
+    \$sometext = <<<SOMETEXT
+    mytext
+    mytextline2
+SOMETEXT;
+    ?>
 </html>
 TEXT;
 
@@ -189,7 +195,10 @@ public function testMinify()
                 }
             });
             //]]>
-</script><?php echo "http://some.link.com/" ?> <?php echo "//some.link.com/" ?> <?php echo '//some.link.com/' ?> <em>inline text</em> <a href="http://www.<?php echo 'hi' ?>"></a> <?php ?> <?php echo \$block->getChildHtml('someChildBlock'); ?> <?php ?> <?php ?> <?php ?></body></html>
+</script><?php echo "http://some.link.com/" ?> <?php echo "//some.link.com/" ?> <?php echo '//some.link.com/' ?> <em>inline text</em> <a href="http://www.<?php echo 'hi' ?>"></a> <?php ?> <?php echo \$block->getChildHtml('someChildBlock'); ?> <?php ?> <?php ?> <?php ?></body><?php \$sometext = <<<SOMETEXT
+    mytext
+    mytextline2
+SOMETEXT; ?></html>
 TEXT;
 
         $this->appDirectoryMock->expects($this->once())

From f979863fabe9ca8bec051876a303eb2578212672 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Mon, 15 Jun 2020 11:55:18 +0300
Subject: [PATCH 0451/1718] =?UTF-8?q?magento/magento2-login-as-customer#94?=
 =?UTF-8?q?:=20"Login=20as=20Customer"=20button=20must=20be=20next=20to=20?=
 =?UTF-8?q?the=20=E2=80=9CBack=20button=E2=80=9D=20on=20the=20left.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Component/Control/LoginAsCustomerButton.php        |  2 +-
 .../view/adminhtml/web/css/source/_module.less         | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/Control/LoginAsCustomerButton.php b/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/Control/LoginAsCustomerButton.php
index 0f8f7750262f2..d900641c131a3 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/Control/LoginAsCustomerButton.php
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/Control/LoginAsCustomerButton.php
@@ -69,7 +69,7 @@ public function getButtonData(): array
                 'on_click' => 'window.lacConfirmationPopup("'
                     . $this->escaper->escapeHtml($this->escaper->escapeJs($this->getLoginUrl()))
                     . '")',
-                'sort_order' => 70,
+                'sort_order' => 15,
             ];
         }
 
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/view/adminhtml/web/css/source/_module.less b/app/code/Magento/LoginAsCustomerAdminUi/view/adminhtml/web/css/source/_module.less
index 2901f95f0e279..d702bc49f23ed 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/view/adminhtml/web/css/source/_module.less
+++ b/app/code/Magento/LoginAsCustomerAdminUi/view/adminhtml/web/css/source/_module.less
@@ -39,4 +39,14 @@
             }
         }
     }
+
+    .page-actions {
+        .page-actions-buttons {
+            .login-button {
+                -ms-flex-order: -1;
+                -webkit-order: -1;
+                order: -1;
+            }
+        }
+    }
 }

From 62d0a299d84bad081b9ba683c74af7eeb672cc3d Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Mon, 15 Jun 2020 11:58:40 +0300
Subject: [PATCH 0452/1718] magento/magento2-login-as-customer#144: "Login as
 Customer" functionality should be enabled by default.

---
 app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php | 2 +-
 app/code/Magento/LoginAsCustomer/etc/config.xml               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php b/app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php
index 3b8d26129a91e..f473dcebcf9ea 100644
--- a/app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php
+++ b/app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php
@@ -45,7 +45,7 @@ public function __construct(
      */
     public function beforeLogout(Auth $subject): void
     {
-        if ($this->config->isEnabled()) {
+        if ($this->config->isEnabled() && $subject->getUser()) {
             $userId = (int)$subject->getUser()->getId();
             $this->deleteAuthenticationDataForUser->execute($userId);
         }
diff --git a/app/code/Magento/LoginAsCustomer/etc/config.xml b/app/code/Magento/LoginAsCustomer/etc/config.xml
index 936ae1ff2f05d..7e39cc39145eb 100644
--- a/app/code/Magento/LoginAsCustomer/etc/config.xml
+++ b/app/code/Magento/LoginAsCustomer/etc/config.xml
@@ -10,7 +10,7 @@
     <default>
         <login_as_customer>
             <general>
-                <enabled>0</enabled>
+                <enabled>1</enabled>
                 <store_view_manual_choice_enabled>0</store_view_manual_choice_enabled>
                 <authentication_data_expiration_time>60</authentication_data_expiration_time>
             </general>

From 3947566b61e028b640fefcb9f2a1369a58d0a833 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Mon, 15 Jun 2020 12:39:21 +0100
Subject: [PATCH 0453/1718] magento-engcom/magento2ce#3890: Fixed unit tests

---
 .../GetByIdExceptionDuringMediaAssetInitializationTest.php      | 2 ++
 .../Unit/Model/Asset/Command/GetByIdExceptionOnGetDataTest.php  | 2 ++
 .../Test/Unit/Model/Asset/Command/GetByIdSuccessfulTest.php     | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdExceptionDuringMediaAssetInitializationTest.php b/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdExceptionDuringMediaAssetInitializationTest.php
index 09ce7ffe8ff20..5f99163db8f12 100644
--- a/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdExceptionDuringMediaAssetInitializationTest.php
+++ b/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdExceptionDuringMediaAssetInitializationTest.php
@@ -28,7 +28,9 @@ class GetByIdExceptionDuringMediaAssetInitializationTest extends TestCase
         'id' => 45,
         'path' => 'img.jpg',
         'title' => 'Img',
+        'description' => 'Img Description',
         'source' => 'Adobe Stock',
+        'hash' => 'hash',
         'content_type' => 'image/jpeg',
         'width' => 420,
         'height' => 240,
diff --git a/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdExceptionOnGetDataTest.php b/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdExceptionOnGetDataTest.php
index 89efae07360b4..3b47b0036224b 100644
--- a/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdExceptionOnGetDataTest.php
+++ b/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdExceptionOnGetDataTest.php
@@ -29,7 +29,9 @@ class GetByIdExceptionOnGetDataTest extends TestCase
         'id' => 45,
         'path' => 'img.jpg',
         'title' => 'Img',
+        'description' => 'Img Description',
         'source' => 'Adobe Stock',
+        'hash' => 'hash',
         'content_type' => 'image/jpeg',
         'width' => 420,
         'height' => 240,
diff --git a/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdSuccessfulTest.php b/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdSuccessfulTest.php
index 8b805d0256e37..2c24899746473 100644
--- a/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdSuccessfulTest.php
+++ b/app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdSuccessfulTest.php
@@ -29,7 +29,9 @@ class GetByIdSuccessfulTest extends TestCase
         'id' => 45,
         'path' => 'img.jpg',
         'title' => 'Img',
+        'description' => 'Img Description',
         'source' => 'Adobe Stock',
+        'hash' => 'hash',
         'content_type' => 'image/jpeg',
         'width' => 420,
         'height' => 240,

From 9274371309d9b39d74b04a16a4d917b42cd1fd25 Mon Sep 17 00:00:00 2001
From: Serhii Balko <serhii.balko@transoftgroup.com>
Date: Mon, 15 Jun 2020 14:55:02 +0300
Subject: [PATCH 0454/1718] MC-32996: Product Attribute Option Label update
 Magento 2.3.4 REST API

---
 ...ductAttributeOptionManagementInterface.php |  13 -
 .../ProductAttributeOptionUpdateInterface.php |  33 +++
 .../Product/Attribute/OptionManagement.php    |  19 +-
 app/code/Magento/Catalog/etc/di.xml           |   1 +
 app/code/Magento/Catalog/etc/webapi.xml       |   2 +-
 .../AttributeOptionManagementInterface.php    |  14 --
 .../Api/AttributeOptionUpdateInterface.php    |  35 +++
 .../Entity/Attribute/OptionManagement.php     |  11 +-
 app/code/Magento/Eav/etc/di.xml               |   1 +
 ...AttributeOptionManagementInterfaceTest.php | 151 +----------
 ...ductAttributeOptionUpdateInterfaceTest.php | 234 ++++++++++++++++++
 11 files changed, 334 insertions(+), 180 deletions(-)
 create mode 100644 app/code/Magento/Catalog/Api/ProductAttributeOptionUpdateInterface.php
 create mode 100644 app/code/Magento/Eav/Api/AttributeOptionUpdateInterface.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeOptionUpdateInterfaceTest.php

diff --git a/app/code/Magento/Catalog/Api/ProductAttributeOptionManagementInterface.php b/app/code/Magento/Catalog/Api/ProductAttributeOptionManagementInterface.php
index 7e826f4707a55..3f255d93f96b0 100644
--- a/app/code/Magento/Catalog/Api/ProductAttributeOptionManagementInterface.php
+++ b/app/code/Magento/Catalog/Api/ProductAttributeOptionManagementInterface.php
@@ -33,19 +33,6 @@ public function getItems($attributeCode);
      */
     public function add($attributeCode, $option);
 
-    /**
-     * Update attribute option
-     *
-     * @param string $attributeCode
-     * @param int $optionId
-     * @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
-     * @return bool
-     * @throws \Magento\Framework\Exception\StateException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @throws \Magento\Framework\Exception\InputException
-     */
-    public function update($attributeCode, $optionId, $option);
-
     /**
      * Delete option from attribute
      *
diff --git a/app/code/Magento/Catalog/Api/ProductAttributeOptionUpdateInterface.php b/app/code/Magento/Catalog/Api/ProductAttributeOptionUpdateInterface.php
new file mode 100644
index 0000000000000..c783033b6d7b7
--- /dev/null
+++ b/app/code/Magento/Catalog/Api/ProductAttributeOptionUpdateInterface.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Api;
+
+/**
+ * Interface to update product attribute option
+ *
+ * @api
+ */
+interface ProductAttributeOptionUpdateInterface
+{
+    /**
+     * Update attribute option
+     *
+     * @param string $attributeCode
+     * @param int $optionId
+     * @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
+     * @return bool
+     * @throws \Magento\Framework\Exception\StateException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \Magento\Framework\Exception\InputException
+     */
+    public function update(
+        string $attributeCode,
+        int $optionId,
+        \Magento\Eav\Api\Data\AttributeOptionInterface $option
+    ): bool;
+}
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php b/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php
index ef982e157a11f..1554293661c02 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php
@@ -8,26 +8,37 @@
 
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Catalog\Api\ProductAttributeOptionManagementInterface;
+use Magento\Catalog\Api\ProductAttributeOptionUpdateInterface;
 use Magento\Eav\Api\AttributeOptionManagementInterface;
+use Magento\Eav\Api\AttributeOptionUpdateInterface;
+use Magento\Eav\Api\Data\AttributeOptionInterface;
 use Magento\Framework\Exception\InputException;
 
 /**
  * Option management model for product attribute.
  */
-class OptionManagement implements ProductAttributeOptionManagementInterface
+class OptionManagement implements ProductAttributeOptionManagementInterface, ProductAttributeOptionUpdateInterface
 {
     /**
      * @var AttributeOptionManagementInterface
      */
     protected $eavOptionManagement;
 
+    /**
+     * @var AttributeOptionUpdateInterface
+     */
+    private $eavOptionUpdate;
+
     /**
      * @param AttributeOptionManagementInterface $eavOptionManagement
+     * @param AttributeOptionUpdateInterface $eavOptionUpdate
      */
     public function __construct(
-        AttributeOptionManagementInterface $eavOptionManagement
+        AttributeOptionManagementInterface $eavOptionManagement,
+        AttributeOptionUpdateInterface $eavOptionUpdate
     ) {
         $this->eavOptionManagement = $eavOptionManagement;
+        $this->eavOptionUpdate = $eavOptionUpdate;
     }
 
     /**
@@ -56,9 +67,9 @@ public function add($attributeCode, $option)
     /**
      * @inheritdoc
      */
-    public function update($attributeCode, $optionId, $option)
+    public function update(string $attributeCode, int $optionId, AttributeOptionInterface $option): bool
     {
-        return $this->eavOptionManagement->update(
+        return $this->eavOptionUpdate->update(
             ProductAttributeInterface::ENTITY_TYPE_CODE,
             $attributeCode,
             $optionId,
diff --git a/app/code/Magento/Catalog/etc/di.xml b/app/code/Magento/Catalog/etc/di.xml
index 5a7a3135b4bfe..97a787c87bfa8 100644
--- a/app/code/Magento/Catalog/etc/di.xml
+++ b/app/code/Magento/Catalog/etc/di.xml
@@ -35,6 +35,7 @@
     <preference for="Magento\Catalog\Api\Data\ProductAttributeTypeInterface" type="Magento\Catalog\Model\Product\Attribute\Type" />
     <preference for="Magento\Catalog\Api\ProductAttributeGroupRepositoryInterface" type="Magento\Catalog\Model\ProductAttributeGroupRepository" />
     <preference for="Magento\Catalog\Api\ProductAttributeOptionManagementInterface" type="Magento\Catalog\Model\Product\Attribute\OptionManagement" />
+    <preference for="Magento\Catalog\Api\ProductAttributeOptionUpdateInterface" type="Magento\Catalog\Model\Product\Attribute\OptionManagement" />
     <preference for="Magento\Catalog\Api\ProductLinkRepositoryInterface" type="Magento\Catalog\Model\ProductLink\Repository" />
     <preference for="Magento\Catalog\Api\Data\ProductAttributeSearchResultsInterface" type="Magento\Catalog\Model\ProductAttributeSearchResults" />
     <preference for="Magento\Catalog\Api\Data\CategoryAttributeSearchResultsInterface" type="Magento\Catalog\Model\CategoryAttributeSearchResults" />
diff --git a/app/code/Magento/Catalog/etc/webapi.xml b/app/code/Magento/Catalog/etc/webapi.xml
index 7c9582980081f..5e799cd9f426d 100644
--- a/app/code/Magento/Catalog/etc/webapi.xml
+++ b/app/code/Magento/Catalog/etc/webapi.xml
@@ -184,7 +184,7 @@
         </resources>
     </route>
     <route url="/V1/products/attributes/:attributeCode/options/:optionId" method="PUT">
-        <service class="Magento\Catalog\Api\ProductAttributeOptionManagementInterface" method="update" />
+        <service class="Magento\Catalog\Api\ProductAttributeOptionUpdateInterface" method="update" />
         <resources>
             <resource ref="Magento_Catalog::attributes_attributes" />
         </resources>
diff --git a/app/code/Magento/Eav/Api/AttributeOptionManagementInterface.php b/app/code/Magento/Eav/Api/AttributeOptionManagementInterface.php
index 68aff1235bc1c..5359230c08c2a 100644
--- a/app/code/Magento/Eav/Api/AttributeOptionManagementInterface.php
+++ b/app/code/Magento/Eav/Api/AttributeOptionManagementInterface.php
@@ -24,20 +24,6 @@ interface AttributeOptionManagementInterface
      */
     public function add($entityType, $attributeCode, $option);
 
-    /**
-     * Update attribute option
-     *
-     * @param string $entityType
-     * @param string $attributeCode
-     * @param int $optionId
-     * @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
-     * @return bool
-     * @throws \Magento\Framework\Exception\StateException
-     * @throws \Magento\Framework\Exception\InputException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
-     */
-    public function update($entityType, $attributeCode, $optionId, $option);
-
     /**
      * Delete option from attribute
      *
diff --git a/app/code/Magento/Eav/Api/AttributeOptionUpdateInterface.php b/app/code/Magento/Eav/Api/AttributeOptionUpdateInterface.php
new file mode 100644
index 0000000000000..fd755a08fdf9a
--- /dev/null
+++ b/app/code/Magento/Eav/Api/AttributeOptionUpdateInterface.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Eav\Api;
+
+/**
+ * Interface to update attribute option
+ *
+ * @api
+ */
+interface AttributeOptionUpdateInterface
+{
+    /**
+     * Update attribute option
+     *
+     * @param string $entityType
+     * @param string $attributeCode
+     * @param int $optionId
+     * @param \Magento\Eav\Api\Data\AttributeOptionInterface $option
+     * @return bool
+     * @throws \Magento\Framework\Exception\StateException
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function update(
+        string $entityType,
+        string $attributeCode,
+        int $optionId,
+        \Magento\Eav\Api\Data\AttributeOptionInterface $option
+    ): bool;
+}
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php b/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php
index b65738adafea5..e99f4395953ad 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/OptionManagement.php
@@ -8,6 +8,7 @@
 namespace Magento\Eav\Model\Entity\Attribute;
 
 use Magento\Eav\Api\AttributeOptionManagementInterface;
+use Magento\Eav\Api\AttributeOptionUpdateInterface;
 use Magento\Eav\Api\Data\AttributeInterface as EavAttributeInterface;
 use Magento\Eav\Api\Data\AttributeOptionInterface;
 use Magento\Eav\Model\AttributeRepository;
@@ -19,7 +20,7 @@
 /**
  * Eav Option Management
  */
-class OptionManagement implements AttributeOptionManagementInterface
+class OptionManagement implements AttributeOptionManagementInterface, AttributeOptionUpdateInterface
 {
     /**
      * @var AttributeRepository
@@ -82,8 +83,12 @@ public function add($entityType, $attributeCode, $option)
     /**
      * @inheritdoc
      */
-    public function update($entityType, $attributeCode, $optionId, $option)
-    {
+    public function update(
+        string $entityType,
+        string $attributeCode,
+        int $optionId,
+        AttributeOptionInterface $option
+    ): bool {
         $attribute = $this->loadAttribute($entityType, (string)$attributeCode);
         if (empty($optionId)) {
             throw new InputException(__('The option id is empty. Enter the value and try again.'));
diff --git a/app/code/Magento/Eav/etc/di.xml b/app/code/Magento/Eav/etc/di.xml
index 21f248f1b1094..4f5d7d7112961 100644
--- a/app/code/Magento/Eav/etc/di.xml
+++ b/app/code/Magento/Eav/etc/di.xml
@@ -20,6 +20,7 @@
     <preference for="Magento\Eav\Api\Data\AttributeFrontendLabelInterface" type="Magento\Eav\Model\Entity\Attribute\FrontendLabel" />
     <preference for="Magento\Eav\Api\Data\AttributeOptionInterface" type="Magento\Eav\Model\Entity\Attribute\Option" />
     <preference for="Magento\Eav\Api\AttributeOptionManagementInterface" type="Magento\Eav\Model\Entity\Attribute\OptionManagement" />
+    <preference for="Magento\Eav\Api\AttributeOptionUpdateInterface" type="Magento\Eav\Model\Entity\Attribute\OptionManagement" />
     <preference for="Magento\Eav\Api\Data\AttributeOptionLabelInterface" type="Magento\Eav\Model\Entity\Attribute\OptionLabel" />
     <preference for="Magento\Eav\Api\Data\AttributeValidationRuleInterface" type="Magento\Eav\Model\Entity\Attribute\ValidationRule" />
     <preference for="Magento\Eav\Api\Data\AttributeSearchResultsInterface" type="Magento\Eav\Model\AttributeSearchResults" />
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeOptionManagementInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeOptionManagementInterfaceTest.php
index b13e873902609..2b628c05ae736 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeOptionManagementInterfaceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeOptionManagementInterfaceTest.php
@@ -36,19 +36,12 @@ public function testGetItems()
             ],
         ];
 
-        $serviceInfo = [
-            'rest' => [
-                'resourcePath' => self::RESOURCE_PATH . '/' . $testAttributeCode . '/options',
-                'httpMethod' => Request::HTTP_METHOD_GET,
-            ],
-            'soap' => [
-                'service' => self::SERVICE_NAME,
-                'serviceVersion' => self::SERVICE_VERSION,
-                'operation' => self::SERVICE_NAME . 'getItems',
-            ],
-        ];
-
-        $response = $this->_webApiCall($serviceInfo, ['attributeCode' => $testAttributeCode]);
+        $response = $this->webApiCallAttributeOptions(
+            $testAttributeCode,
+            Request::HTTP_METHOD_GET,
+            'getItems',
+            ['attributeCode' => $testAttributeCode]
+        );
 
         $this->assertIsArray($response);
         $this->assertEquals($expectedOptions, $response);
@@ -123,138 +116,6 @@ public function addDataProvider(): array
         ];
     }
 
-    /**
-     * Test to update attribute option
-     *
-     * @magentoApiDataFixture Magento/Catalog/Model/Product/Attribute/_files/select_attribute.php
-     */
-    public function testUpdate()
-    {
-        $testAttributeCode = 'select_attribute';
-        $optionData = [
-            AttributeOptionInterface::LABEL => 'Fixture Option Changed',
-            AttributeOptionInterface::VALUE => 'option_value',
-            AttributeOptionInterface::STORE_LABELS => [
-                [
-                    AttributeOptionLabelInterface::LABEL => 'Store Label Changed',
-                    AttributeOptionLabelInterface::STORE_ID => 1,
-                ],
-            ],
-        ];
-
-        $existOptionLabel = 'Fixture Option';
-        $existAttributeOption = $this->getAttributeOption($testAttributeCode, $existOptionLabel, 'all');
-        $optionId = $existAttributeOption['value'];
-
-        $response = $this->webApiCallAttributeOptions(
-            $testAttributeCode,
-            Request::HTTP_METHOD_PUT,
-            'update',
-            [
-                'attributeCode' => $testAttributeCode,
-                'optionId' => $optionId,
-                'option' => $optionData,
-            ],
-            $optionId
-        );
-
-        $this->assertTrue($response);
-
-        /* Check update option labels by stores */
-        $expectedStoreLabels = [
-            'all' => $optionData[AttributeOptionLabelInterface::LABEL],
-            'default' => $optionData[AttributeOptionInterface::STORE_LABELS][0][AttributeOptionLabelInterface::LABEL],
-        ];
-        foreach ($expectedStoreLabels as $store => $label) {
-            $this->assertNotNull($this->getAttributeOption($testAttributeCode, $label, $store));
-        }
-    }
-
-    /**
-     * Test to update option with already exist exception
-     *
-     * Test to except case when the two options has a same label
-     *
-     * @magentoApiDataFixture Magento/Catalog/Model/Product/Attribute/_files/select_attribute.php
-     */
-    public function testUpdateWithAlreadyExistsException()
-    {
-        $this->expectExceptionMessage("Admin store attribute option label '%1' is already exists.");
-        $testAttributeCode = 'select_attribute';
-
-        $newOptionData = [
-            AttributeOptionInterface::LABEL => 'New Option',
-            AttributeOptionInterface::VALUE => 'new_option_value',
-        ];
-        $newOptionId = $this->webApiCallAttributeOptions(
-            $testAttributeCode,
-            Request::HTTP_METHOD_POST,
-            'add',
-            [
-                'attributeCode' => $testAttributeCode,
-                'option' => $newOptionData,
-            ]
-        );
-
-        $editOptionData = [
-            AttributeOptionInterface::LABEL => 'Fixture Option',
-            AttributeOptionInterface::VALUE => $newOptionId,
-        ];
-        $this->webApiCallAttributeOptions(
-            $testAttributeCode,
-            Request::HTTP_METHOD_PUT,
-            'update',
-            [
-                'attributeCode' => $testAttributeCode,
-                'optionId' => $newOptionId,
-                'option' => $editOptionData,
-            ],
-            $newOptionId
-        );
-    }
-
-    /**
-     * Test to update option with not exist exception
-     *
-     * @magentoApiDataFixture Magento/Catalog/Model/Product/Attribute/_files/select_attribute.php
-     */
-    public function testUpdateWithNotExistsException()
-    {
-        $this->expectExceptionMessage("The '%1' attribute doesn't include an option id '%2'.");
-        $testAttributeCode = 'select_attribute';
-
-        $newOptionData = [
-            AttributeOptionInterface::LABEL => 'New Option',
-            AttributeOptionInterface::VALUE => 'new_option_value'
-        ];
-        $newOptionId = (int)$this->webApiCallAttributeOptions(
-            $testAttributeCode,
-            Request::HTTP_METHOD_POST,
-            'add',
-            [
-                'attributeCode' => $testAttributeCode,
-                'option' => $newOptionData,
-            ]
-        );
-
-        $newOptionId++;
-        $editOptionData = [
-            AttributeOptionInterface::LABEL => 'New Option Changed',
-            AttributeOptionInterface::VALUE => $newOptionId
-        ];
-        $this->webApiCallAttributeOptions(
-            $testAttributeCode,
-            Request::HTTP_METHOD_PUT,
-            'update',
-            [
-                'attributeCode' => $testAttributeCode,
-                'optionId' => $newOptionId,
-                'option' => $editOptionData,
-            ],
-            $newOptionId
-        );
-    }
-
     /**
      * Test to delete attribute option
      *
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeOptionUpdateInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeOptionUpdateInterfaceTest.php
new file mode 100644
index 0000000000000..dc3648f68b10c
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeOptionUpdateInterfaceTest.php
@@ -0,0 +1,234 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Api;
+
+use Magento\Eav\Api\Data\AttributeOptionInterface;
+use Magento\Eav\Api\Data\AttributeOptionLabelInterface;
+use Magento\Framework\Webapi\Rest\Request;
+use Magento\TestFramework\TestCase\WebapiAbstract;
+
+/**
+ * Class to test update Product Attribute Options
+ */
+class ProductAttributeOptionUpdateInterfaceTest extends WebapiAbstract
+{
+    private const SERVICE_NAME_UPDATE = 'catalogProductAttributeOptionUpdateV1';
+    private const SERVICE_NAME = 'catalogProductAttributeOptionManagementV1';
+    private const SERVICE_VERSION = 'V1';
+    private const RESOURCE_PATH = '/V1/products/attributes';
+
+    /**
+     * Test to update attribute option
+     *
+     * @magentoApiDataFixture Magento/Catalog/Model/Product/Attribute/_files/select_attribute.php
+     */
+    public function testUpdate()
+    {
+        $testAttributeCode = 'select_attribute';
+        $optionData = [
+            AttributeOptionInterface::LABEL => 'Fixture Option Changed',
+            AttributeOptionInterface::VALUE => 'option_value',
+            AttributeOptionInterface::STORE_LABELS => [
+                [
+                    AttributeOptionLabelInterface::LABEL => 'Store Label Changed',
+                    AttributeOptionLabelInterface::STORE_ID => 1,
+                ],
+            ],
+        ];
+
+        $existOptionLabel = 'Fixture Option';
+        $existAttributeOption = $this->getAttributeOption($testAttributeCode, $existOptionLabel, 'all');
+        $optionId = $existAttributeOption['value'];
+
+        $response = $this->webApiCallAttributeOptions(
+            $testAttributeCode,
+            Request::HTTP_METHOD_PUT,
+            'update',
+            [
+                'attributeCode' => $testAttributeCode,
+                'optionId' => $optionId,
+                'option' => $optionData,
+            ],
+            $optionId
+        );
+
+        $this->assertTrue($response);
+
+        /* Check update option labels by stores */
+        $expectedStoreLabels = [
+            'all' => $optionData[AttributeOptionLabelInterface::LABEL],
+            'default' => $optionData[AttributeOptionInterface::STORE_LABELS][0][AttributeOptionLabelInterface::LABEL],
+        ];
+        foreach ($expectedStoreLabels as $store => $label) {
+            $this->assertNotNull($this->getAttributeOption($testAttributeCode, $label, $store));
+        }
+    }
+
+    /**
+     * Test to update option with already exist exception
+     *
+     * Test to except case when the two options has a same label
+     *
+     * @magentoApiDataFixture Magento/Catalog/Model/Product/Attribute/_files/select_attribute.php
+     */
+    public function testUpdateWithAlreadyExistsException()
+    {
+        $this->expectExceptionMessage("Admin store attribute option label '%1' is already exists.");
+        $testAttributeCode = 'select_attribute';
+
+        $newOptionData = [
+            AttributeOptionInterface::LABEL => 'New Option',
+            AttributeOptionInterface::VALUE => 'new_option_value',
+        ];
+        $newOptionId = $this->webApiCallAttributeOptions(
+            $testAttributeCode,
+            Request::HTTP_METHOD_POST,
+            'add',
+            [
+                'attributeCode' => $testAttributeCode,
+                'option' => $newOptionData,
+            ]
+        );
+
+        $editOptionData = [
+            AttributeOptionInterface::LABEL => 'Fixture Option',
+            AttributeOptionInterface::VALUE => $newOptionId,
+        ];
+        $this->webApiCallAttributeOptions(
+            $testAttributeCode,
+            Request::HTTP_METHOD_PUT,
+            'update',
+            [
+                'attributeCode' => $testAttributeCode,
+                'optionId' => $newOptionId,
+                'option' => $editOptionData,
+            ],
+            $newOptionId
+        );
+    }
+
+    /**
+     * Test to update option with not exist exception
+     *
+     * @magentoApiDataFixture Magento/Catalog/Model/Product/Attribute/_files/select_attribute.php
+     */
+    public function testUpdateWithNotExistsException()
+    {
+        $this->expectExceptionMessage("The '%1' attribute doesn't include an option id '%2'.");
+        $testAttributeCode = 'select_attribute';
+
+        $newOptionData = [
+            AttributeOptionInterface::LABEL => 'New Option',
+            AttributeOptionInterface::VALUE => 'new_option_value'
+        ];
+        $newOptionId = (int)$this->webApiCallAttributeOptions(
+            $testAttributeCode,
+            Request::HTTP_METHOD_POST,
+            'add',
+            [
+                'attributeCode' => $testAttributeCode,
+                'option' => $newOptionData,
+            ]
+        );
+
+        $newOptionId++;
+        $editOptionData = [
+            AttributeOptionInterface::LABEL => 'New Option Changed',
+            AttributeOptionInterface::VALUE => $newOptionId
+        ];
+        $this->webApiCallAttributeOptions(
+            $testAttributeCode,
+            Request::HTTP_METHOD_PUT,
+            'update',
+            [
+                'attributeCode' => $testAttributeCode,
+                'optionId' => $newOptionId,
+                'option' => $editOptionData,
+            ],
+            $newOptionId
+        );
+    }
+
+    /**
+     * Perform Web API call to the system under test
+     *
+     * @param string $attributeCode
+     * @param string $httpMethod
+     * @param string $soapMethod
+     * @param array $arguments
+     * @param null $storeCode
+     * @param null $optionId
+     * @return array|bool|float|int|string
+     */
+    private function webApiCallAttributeOptions(
+        string $attributeCode,
+        string $httpMethod,
+        string $soapMethod,
+        array $arguments = [],
+        $optionId = null,
+        $storeCode = null
+    ) {
+        $resourcePath = self::RESOURCE_PATH . "/{$attributeCode}/options";
+        if ($optionId) {
+            $resourcePath .= '/' . $optionId;
+        }
+        $serviceName = $soapMethod === 'update' ? self::SERVICE_NAME_UPDATE : self::SERVICE_NAME;
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => $resourcePath,
+                'httpMethod' => $httpMethod,
+            ],
+            'soap' => [
+                'service' => $serviceName,
+                'serviceVersion' => self::SERVICE_VERSION,
+                'operation' => $serviceName . $soapMethod,
+            ],
+        ];
+
+        return $this->_webApiCall($serviceInfo, $arguments, null, $storeCode);
+    }
+
+    /**
+     * @param string $attributeCode
+     * @param string $optionLabel
+     * @param string|null $storeCode
+     * @return array|null
+     */
+    private function getAttributeOption(
+        string $attributeCode,
+        string $optionLabel,
+        ?string $storeCode = null
+    ): ?array {
+        $attributeOptions = $this->getAttributeOptions($attributeCode, $storeCode);
+        $option = null;
+        /** @var array $attributeOption */
+        foreach ($attributeOptions as $attributeOption) {
+            if ($attributeOption['label'] === $optionLabel) {
+                $option = $attributeOption;
+                break;
+            }
+        }
+
+        return $option;
+    }
+
+    /**
+     * @param string $testAttributeCode
+     * @param string|null $storeCode
+     * @return array|bool|float|int|string
+     */
+    private function getAttributeOptions(string $testAttributeCode, ?string $storeCode = null)
+    {
+        return $this->webApiCallAttributeOptions(
+            $testAttributeCode,
+            Request::HTTP_METHOD_GET,
+            'getItems',
+            ['attributeCode' => $testAttributeCode],
+            null,
+            $storeCode
+        );
+    }
+}

From 3af121ce855c80a434c5a8847203a72cb9546320 Mon Sep 17 00:00:00 2001
From: Serhii Balko <serhii.balko@transoftgroup.com>
Date: Mon, 15 Jun 2020 16:14:28 +0300
Subject: [PATCH 0455/1718] MC-32996: Product Attribute Option Label update
 Magento 2.3.4 REST API

---
 .../Attribute/OptionManagementTest.php        | 47 ++++++++++++++++++-
 1 file changed, 45 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/OptionManagementTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/OptionManagementTest.php
index edbbaebd0576b..05bd3ec2a3d33 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/OptionManagementTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/OptionManagementTest.php
@@ -10,10 +10,14 @@
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Catalog\Model\Product\Attribute\OptionManagement;
 use Magento\Eav\Api\AttributeOptionManagementInterface;
+use Magento\Eav\Api\AttributeOptionUpdateInterface;
 use Magento\Eav\Api\Data\AttributeOptionInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * Class to test management of attribute options
+ */
 class OptionManagementTest extends TestCase
 {
     /**
@@ -22,18 +26,28 @@ class OptionManagementTest extends TestCase
     protected $model;
 
     /**
-     * @var MockObject
+     * @var AttributeOptionManagementInterface|MockObject
      */
     protected $eavOptionManagementMock;
 
+    /**
+     * @var AttributeOptionUpdateInterface|MockObject
+     */
+    private $eavOptionUpdateMock;
+
     protected function setUp(): void
     {
         $this->eavOptionManagementMock = $this->getMockForAbstractClass(AttributeOptionManagementInterface::class);
+        $this->eavOptionUpdateMock = $this->getMockForAbstractClass(AttributeOptionUpdateInterface::class);
         $this->model = new OptionManagement(
-            $this->eavOptionManagementMock
+            $this->eavOptionManagementMock,
+            $this->eavOptionUpdateMock
         );
     }
 
+    /**
+     * Test to Retrieve list of attribute options
+     */
     public function testGetItems()
     {
         $attributeCode = 10;
@@ -44,6 +58,9 @@ public function testGetItems()
         $this->assertEquals([], $this->model->getItems($attributeCode));
     }
 
+    /**
+     * Test to Add option to attribute
+     */
     public function testAdd()
     {
         $attributeCode = 42;
@@ -56,6 +73,9 @@ public function testAdd()
         $this->assertTrue($this->model->add($attributeCode, $optionMock));
     }
 
+    /**
+     * Test to delete attribute option
+     */
     public function testDelete()
     {
         $attributeCode = 'atrCde';
@@ -68,6 +88,9 @@ public function testDelete()
         $this->assertTrue($this->model->delete($attributeCode, $optionId));
     }
 
+    /**
+     * Test to delete attribute option with invalid option id
+     */
     public function testDeleteWithInvalidOption()
     {
         $this->expectException('Magento\Framework\Exception\InputException');
@@ -77,4 +100,24 @@ public function testDeleteWithInvalidOption()
         $this->eavOptionManagementMock->expects($this->never())->method('delete');
         $this->model->delete($attributeCode, $optionId);
     }
+
+    /**
+     * Test to update attribute option
+     */
+    public function testUpdate()
+    {
+        $attributeCode = 'atrCde';
+        $optionId = 10;
+        $optionMock = $this->getMockForAbstractClass(AttributeOptionInterface::class);
+
+        $this->eavOptionUpdateMock->expects($this->once())
+            ->method('update')
+            ->with(
+                ProductAttributeInterface::ENTITY_TYPE_CODE,
+                $attributeCode,
+                $optionId,
+                $optionMock
+            )->willReturn(true);
+        $this->assertTrue($this->model->update($attributeCode, $optionId, $optionMock));
+    }
 }

From 4511c460ab78e751221e9a4ed57942740c9382d1 Mon Sep 17 00:00:00 2001
From: Munkh-Ulzii Balidar <mbalidar@comwrap.com>
Date: Fri, 12 Jun 2020 17:50:51 +0200
Subject: [PATCH 0456/1718] 28584 fixed issue category query does not handle
 fragments

28584 fix typo

28584 fix typo

28584 implement fragment spread for category
---
 .../CatalogGraphQl/Model/AttributesJoiner.php | 60 ++++++++++++++++++-
 .../Model/Category/DepthCalculator.php        | 41 ++++++++++++-
 .../Model/Resolver/Categories.php             | 11 ++--
 .../Product/ProductFieldsSelector.php         |  5 +-
 .../Products/DataProvider/CategoryTree.php    | 30 +++++++---
 .../Products/DataProvider/ProductSearch.php   |  2 +-
 .../GraphQl/Catalog/CategoryListTest.php      | 56 +++++++++++++++++
 7 files changed, 182 insertions(+), 23 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/AttributesJoiner.php b/app/code/Magento/CatalogGraphQl/Model/AttributesJoiner.php
index 69592657241a0..ee00cdeb52c30 100644
--- a/app/code/Magento/CatalogGraphQl/Model/AttributesJoiner.php
+++ b/app/code/Magento/CatalogGraphQl/Model/AttributesJoiner.php
@@ -8,7 +8,11 @@
 namespace Magento\CatalogGraphQl\Model;
 
 use GraphQL\Language\AST\FieldNode;
+use GraphQL\Language\AST\FragmentSpreadNode;
+use GraphQL\Language\AST\InlineFragmentNode;
+use GraphQL\Language\AST\NodeKind;
 use Magento\Eav\Model\Entity\Collection\AbstractCollection;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 
 /**
  * Joins attributes for provided field node field names.
@@ -30,6 +34,11 @@ class AttributesJoiner
      */
     private $fieldToAttributeMap = [];
 
+    /**
+     * @var ResolveInfo
+     */
+    private $resolverInfo = null;
+
     /**
      * @param array $fieldToAttributeMap
      */
@@ -65,10 +74,21 @@ public function getQueryFields(FieldNode $fieldNode): array
             $selectedFields = [];
             /** @var FieldNode $field */
             foreach ($query as $field) {
-                if ($field->kind === 'InlineFragment') {
-                    continue;
+                if ($field->kind === NodeKind::INLINE_FRAGMENT) {
+                    $inlineFragmentFields = $this->addInlineFragmentFields($field);
+                    $selectedFields = array_merge($selectedFields, $inlineFragmentFields);
+                } elseif ($field->kind === NodeKind::FRAGMENT_SPREAD && isset($this->resolverInfo->fragments[$field->name->value])) {
+                    foreach ($this->resolverInfo->fragments[$field->name->value]->selectionSet->selections as $spreadNode) {
+                        if (isset($spreadNode->selectionSet->selections)) {
+                            $fragmentSpreadFields = $this->getQueryFields($spreadNode);
+                            $selectedFields = array_merge($selectedFields, $fragmentSpreadFields);
+                        } else {
+                            $selectedFields[] = $spreadNode->name->value;
+                        }
+                    }
+                } else {
+                    $selectedFields[] = $field->name->value;
                 }
-                $selectedFields[] = $field->name->value;
             }
             $this->setSelectionsForFieldNode($fieldNode, $selectedFields);
         }
@@ -76,6 +96,32 @@ public function getQueryFields(FieldNode $fieldNode): array
         return $this->getFieldNodeSelections($fieldNode);
     }
 
+    /**
+     * Add fields from inline fragment nodes
+     *
+     * @param InlineFragmentNode $inlineFragmentField
+     * @param array $inlineFragmentFields
+     * @return string[]
+     */
+    private function addInlineFragmentFields(InlineFragmentNode $inlineFragmentField, $inlineFragmentFields = [])
+    {
+        $query = $inlineFragmentField->selectionSet->selections;
+        /** @var FieldNode $field */
+        foreach ($query as $field) {
+            if ($field->kind === NodeKind::INLINE_FRAGMENT) {
+                $this->addInlineFragmentFields($field, $inlineFragmentFields);
+            } elseif (isset($field->selectionSet->selections)) {
+                if (is_array($queryFields = $this->getQueryFields($field))) {
+                    $inlineFragmentFields = array_merge($inlineFragmentFields, $queryFields);
+                }
+            } else {
+                $inlineFragmentFields[] = $field->name->value;
+            }
+        }
+
+        return array_unique($inlineFragmentFields);
+    }
+
     /**
      * Add field to collection select
      *
@@ -124,4 +170,12 @@ private function setSelectionsForFieldNode(FieldNode $fieldNode, array $selected
     {
         $this->queryFields[$fieldNode->name->value][$fieldNode->name->loc->start] = $selectedFields;
     }
+
+    /**
+     * @param ResolveInfo $resolverInfo
+     */
+    public function setResolverInfo(ResolveInfo $resolverInfo): void
+    {
+        $this->resolverInfo = $resolverInfo;
+    }
 }
diff --git a/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php b/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php
index b5d02511da4e7..6bbd163436c2c 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php
@@ -8,6 +8,9 @@
 namespace Magento\CatalogGraphQl\Model\Category;
 
 use GraphQL\Language\AST\FieldNode;
+use GraphQL\Language\AST\InlineFragmentNode;
+use GraphQL\Language\AST\NodeKind;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 
 /**
  * Used for determining the depth information for a requested category tree in a GraphQL request
@@ -17,22 +20,54 @@ class DepthCalculator
     /**
      * Calculate the total depth of a category tree inside a GraphQL request
      *
+     * @param ResolveInfo $resolveInfo
      * @param FieldNode $fieldNode
      * @return int
      */
-    public function calculate(FieldNode $fieldNode) : int
+    public function calculate(ResolveInfo $resolveInfo, FieldNode $fieldNode) : int
     {
         $selections = $fieldNode->selectionSet->selections ?? [];
         $depth = count($selections) ? 1 : 0;
         $childrenDepth = [0];
         foreach ($selections as $node) {
-            if ($node->kind === 'InlineFragment' || null !== $node->alias) {
+            if (isset($node->alias) && null !== $node->alias) {
                 continue;
             }
 
-            $childrenDepth[] = $this->calculate($node);
+            if ($node->kind ===  NodeKind::INLINE_FRAGMENT) {
+                $childrenDepth[] = $this->addInlineFragmentDepth($resolveInfo, $node);
+            } elseif ($node->kind === NodeKind::FRAGMENT_SPREAD && isset($resolveInfo->fragments[$node->name->value])) {
+                foreach ($resolveInfo->fragments[$node->name->value]->selectionSet->selections as $spreadNode) {
+                    $childrenDepth[] = $this->calculate($resolveInfo, $spreadNode);
+                }
+            } else {
+                $childrenDepth[] = $this->calculate($resolveInfo, $node);
+            }
         }
 
         return $depth + max($childrenDepth);
     }
+
+    /**
+     * Add inline fragment fields into calculating of category depth
+     *
+     * @param ResolveInfo $resolveInfo
+     * @param InlineFragmentNode $inlineFragmentField
+     * @param array $depth
+     * @return int[]
+     */
+    private function addInlineFragmentDepth(ResolveInfo $resolveInfo, InlineFragmentNode $inlineFragmentField, $depth = [])
+    {
+        $selections = $inlineFragmentField->selectionSet->selections;
+        /** @var FieldNode $field */
+        foreach ($selections as $field) {
+            if ($field->kind === NodeKind::INLINE_FRAGMENT) {
+                $depth[] = $this->addInlineFragmentDepth($resolveInfo, $field, $depth);
+            } elseif ($field->selectionSet && $field->selectionSet->selections) {
+                $depth[] = $this->calculate($resolveInfo, $field);
+            }
+        }
+
+        return $depth ? max($depth) : 0;
+    }
 }
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Categories.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Categories.php
index 535fe3a80cd25..bc0eb2145fe34 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Categories.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Categories.php
@@ -7,18 +7,18 @@
 
 namespace Magento\CatalogGraphQl\Model\Resolver;
 
-use Magento\CatalogGraphQl\Model\Resolver\Product\ProductCategories;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\Catalog\Model\ResourceModel\Category\Collection;
 use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
 use Magento\CatalogGraphQl\Model\AttributesJoiner;
+use Magento\CatalogGraphQl\Model\Category\Hydrator as CategoryHydrator;
+use Magento\CatalogGraphQl\Model\Resolver\Product\ProductCategories;
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\CustomAttributesFlattener;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
-use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
-use Magento\CatalogGraphQl\Model\Category\Hydrator as CategoryHydrator;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -112,6 +112,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         $categoryIds = $this->productCategories->getCategoryIdsByProduct((int)$product->getId(), (int)$storeId);
         $this->categoryIds = array_merge($this->categoryIds, $categoryIds);
         $that = $this;
+        $that->attributesJoiner->setResolverInfo($info);
 
         return $this->valueFactory->create(
             function () use ($that, $categoryIds, $info) {
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductFieldsSelector.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductFieldsSelector.php
index 9ddad4e6451fa..3139c35774008 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductFieldsSelector.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductFieldsSelector.php
@@ -7,6 +7,7 @@
 
 namespace Magento\CatalogGraphQl\Model\Resolver\Product;
 
+use GraphQL\Language\AST\NodeKind;
 use Magento\Framework\GraphQl\Query\FieldTranslator;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 
@@ -43,9 +44,9 @@ public function getProductFieldsFromInfo(ResolveInfo $info, string $productNodeN
                 continue;
             }
             foreach ($node->selectionSet->selections as $selectionNode) {
-                if ($selectionNode->kind === 'InlineFragment') {
+                if ($selectionNode->kind === NodeKind::INLINE_FRAGMENT) {
                     foreach ($selectionNode->selectionSet->selections as $inlineSelection) {
-                        if ($inlineSelection->kind === 'InlineFragment') {
+                        if ($inlineSelection->kind === NodeKind::INLINE_FRAGMENT) {
                             continue;
                         }
                         $fieldNames[] = $this->fieldTranslator->translate($inlineSelection->name->value);
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
index fc5a563c82b4e..649ecab9c5a0f 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
@@ -8,15 +8,16 @@
 namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider;
 
 use GraphQL\Language\AST\FieldNode;
-use Magento\CatalogGraphQl\Model\Category\DepthCalculator;
-use Magento\CatalogGraphQl\Model\Category\LevelCalculator;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use GraphQL\Language\AST\NodeKind;
 use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\ResourceModel\Category\Collection;
 use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
 use Magento\CatalogGraphQl\Model\AttributesJoiner;
-use Magento\Catalog\Model\Category;
+use Magento\CatalogGraphQl\Model\Category\DepthCalculator;
+use Magento\CatalogGraphQl\Model\Category\LevelCalculator;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 
 /**
  * Category tree data provider
@@ -53,6 +54,11 @@ class CategoryTree
      */
     private $metadata;
 
+    /**
+     * @var ResolveInfo
+     */
+    private $resolverInfo;
+
     /**
      * @param CollectionFactory $collectionFactory
      * @param AttributesJoiner $attributesJoiner
@@ -85,8 +91,10 @@ public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId): \Iterato
     {
         $categoryQuery = $resolveInfo->fieldNodes[0];
         $collection = $this->collectionFactory->create();
+        $this->resolverInfo = $resolveInfo;
+        $this->attributesJoiner->setResolverInfo($resolveInfo);
         $this->joinAttributesRecursively($collection, $categoryQuery);
-        $depth = $this->depthCalculator->calculate($categoryQuery);
+        $depth = $this->depthCalculator->calculate($resolveInfo, $categoryQuery);
         $level = $this->levelCalculator->calculate($rootCategoryId);
 
         // If root category is being filter, we've to remove first slash
@@ -137,11 +145,15 @@ private function joinAttributesRecursively(Collection $collection, FieldNode $fi
 
         /** @var FieldNode $node */
         foreach ($subSelection as $node) {
-            if ($node->kind === 'InlineFragment') {
+            if ($node->kind === NodeKind::INLINE_FRAGMENT) {
                 continue;
+            } elseif ($node->kind === NodeKind::FRAGMENT_SPREAD && isset($this->resolverInfo->fragments[$node->name->value])) {
+                foreach ($this->resolverInfo->fragments[$node->name->value]->selectionSet->selections as $spreadNode) {
+                    $this->joinAttributesRecursively($collection, $spreadNode);
+                }
+            } else {
+                $this->joinAttributesRecursively($collection, $node);
             }
-
-            $this->joinAttributesRecursively($collection, $node);
         }
     }
 }
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 4c83afb89cc46..298cfd2b0e99c 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php
@@ -110,7 +110,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/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php
index 00eb235cb4dc3..d6477c82513e9 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php
@@ -714,4 +714,60 @@ private function assertCategoryChildren(array $category, array $expectedChildren
             $this->assertResponseFields($category['children'][$i], $expectedChild);
         }
     }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+     */
+    public function testFilterCategoryInlineFragment()
+    {
+        $query = <<<QUERY
+{
+    categoryList(filters: {ids: {eq: "6"}}){
+        ... on CategoryTree {
+            id
+            name
+            url_key
+            url_path
+            children_count
+            path
+            position
+        }
+    }
+}
+QUERY;
+        $result = $this->graphQlQuery($query);
+        $this->assertArrayNotHasKey('errors', $result);
+        $this->assertCount(1, $result['categoryList']);
+        $this->assertEquals($result['categoryList'][0]['name'], 'Category 2');
+        $this->assertEquals($result['categoryList'][0]['url_path'], 'category-2');
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+     */
+    public function testFilterCategoryNamedFragment()
+    {
+        $query = <<<QUERY
+{
+    categoryList(filters: {ids: {eq: "6"}}){
+        ...Cat
+    }
+}
+
+fragment Cat on CategoryTree {
+    id
+    name
+    url_key
+    url_path
+    children_count
+    path
+    position
+}
+QUERY;
+        $result = $this->graphQlQuery($query);
+        $this->assertArrayNotHasKey('errors', $result);
+        $this->assertCount(1, $result['categoryList']);
+        $this->assertEquals($result['categoryList'][0]['name'], 'Category 2');
+        $this->assertEquals($result['categoryList'][0]['url_path'], 'category-2');
+    }
 }

From b917a014ad62442277ed4133da65725d60b1950f Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Mon, 15 Jun 2020 11:43:25 -0500
Subject: [PATCH 0457/1718] MC-35064: [Cloud] Can't deploy 2.4.0-alpha8 on
 cloud pro instance

---
 .../Framework/View/Test/Unit/Template/Html/MinifierTest.php     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php
index 21f8aa598a721..6aafa5a46cf63 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php
@@ -113,6 +113,8 @@ public function testGetPathToMinified()
     /**
      * Covered method minify and test regular expressions
      * @test
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function testMinify()
     {

From 78728a3b1bbd85b8bf906d86e51e18074159953d Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Mon, 15 Jun 2020 12:00:26 -0500
Subject: [PATCH 0458/1718] MC-35039: Update Elasticsearch dependencies for
 2.4.0

---
 app/code/Magento/Elasticsearch7/etc/adminhtml/system.xml | 2 +-
 app/code/Magento/Elasticsearch7/etc/di.xml               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Elasticsearch7/etc/adminhtml/system.xml b/app/code/Magento/Elasticsearch7/etc/adminhtml/system.xml
index 52e5be5a5beeb..9e818ff61eb89 100644
--- a/app/code/Magento/Elasticsearch7/etc/adminhtml/system.xml
+++ b/app/code/Magento/Elasticsearch7/etc/adminhtml/system.xml
@@ -10,7 +10,7 @@
     <system>
         <section id="catalog">
             <group id="search">
-                <!-- Elasticsearch 7.0+ -->
+                <!-- Elasticsearch 7 -->
                 <field id="elasticsearch7_server_hostname" translate="label" type="text" sortOrder="61"
                        showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Elasticsearch Server Hostname</label>
diff --git a/app/code/Magento/Elasticsearch7/etc/di.xml b/app/code/Magento/Elasticsearch7/etc/di.xml
index b5d013a294e26..446331edc63fb 100644
--- a/app/code/Magento/Elasticsearch7/etc/di.xml
+++ b/app/code/Magento/Elasticsearch7/etc/di.xml
@@ -17,7 +17,7 @@
     <type name="Magento\Search\Model\Adminhtml\System\Config\Source\Engine">
         <arguments>
             <argument name="engines" xsi:type="array">
-                <item sortOrder="30" name="elasticsearch7" xsi:type="string">Elasticsearch 7.0+</item>
+                <item sortOrder="30" name="elasticsearch7" xsi:type="string">Elasticsearch 7</item>
             </argument>
         </arguments>
     </type>

From 1373e358c2b1be9a1a3086d07f553f6fd3433879 Mon Sep 17 00:00:00 2001
From: Soumya Unnikrishnan <sunnikri@adobe.com>
Date: Mon, 15 Jun 2020 12:00:50 -0500
Subject: [PATCH 0459/1718] MQE-2179: [3.0.0 RC5 - Release] Checklist

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

diff --git a/composer.json b/composer.json
index aa293fdfb014b..c5557a9df986f 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.0-RC4",
+        "magento/magento2-functional-testing-framework": "dev-3.0.0-RC5",
         "pdepend/pdepend": "~2.7.1",
         "phpcompatibility/php-compatibility": "^9.3",
         "phpmd/phpmd": "^2.8.0",
diff --git a/composer.lock b/composer.lock
index eea11746a42fa..8d22b58d32ddf 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": "2ddc5369636a860cfa82ef023c958bd6",
+    "content-hash": "d55c9c67cc6b0568bbffb1d78997f8d5",
     "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"
         },
         {
@@ -452,6 +462,12 @@
                 "Xdebug",
                 "performance"
             ],
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                }
+            ],
             "time": "2020-03-01T12:26:26+00:00"
         },
         {
@@ -3908,6 +3924,20 @@
                 "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"
         },
         {
@@ -4444,6 +4474,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"
         },
         {
@@ -4622,6 +4666,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"
         },
         {
@@ -4671,6 +4729,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"
         },
         {
@@ -5867,6 +5939,12 @@
                 "functional testing",
                 "unit testing"
             ],
+            "funding": [
+                {
+                    "url": "https://opencollective.com/codeception",
+                    "type": "open_collective"
+                }
+            ],
             "time": "2020-05-24T13:58:47+00:00"
         },
         {
@@ -6439,6 +6517,20 @@
                 "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"
         },
         {
@@ -6562,6 +6654,20 @@
                 "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"
         },
         {
@@ -6624,6 +6730,20 @@
                 "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"
         },
         {
@@ -7083,16 +7203,16 @@
         },
         {
             "name": "magento/magento2-functional-testing-framework",
-            "version": "3.0.0-RC4",
+            "version": "dev-3.0.0-RC5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/magento/magento2-functional-testing-framework.git",
-                "reference": "34781ccc7385993b1e5bc9182e6ddddde7f2769f"
+                "reference": "bd2eee29eac0e438a2d09f63e6b5e3a8f852d933"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/34781ccc7385993b1e5bc9182e6ddddde7f2769f",
-                "reference": "34781ccc7385993b1e5bc9182e6ddddde7f2769f",
+                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/bd2eee29eac0e438a2d09f63e6b5e3a8f852d933",
+                "reference": "bd2eee29eac0e438a2d09f63e6b5e3a8f852d933",
                 "shasum": ""
             },
             "require": {
@@ -7168,7 +7288,7 @@
                 "magento",
                 "testing"
             ],
-            "time": "2020-06-08T18:17:54+00:00"
+            "time": "2020-06-15T16:31:51+00:00"
         },
         {
             "name": "mikey179/vfsstream",
@@ -9735,6 +9855,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-05-27T08:34:37+00:00"
         },
         {
@@ -9796,6 +9930,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-05-24T12:18:07+00:00"
         },
         {
@@ -9859,6 +10007,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-05-25T12:33:44+00:00"
         },
         {
@@ -10034,6 +10196,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-05-12T16:47:27+00:00"
         },
         {
@@ -10147,6 +10323,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"
         },
         {
@@ -10514,7 +10704,7 @@
     "minimum-stability": "stable",
     "stability-flags": {
         "magento/composer": 20,
-        "magento/magento2-functional-testing-framework": 5
+        "magento/magento2-functional-testing-framework": 20
     },
     "prefer-stable": true,
     "prefer-lowest": false,
@@ -10537,5 +10727,6 @@
         "ext-zip": "*",
         "lib-libxml": "*"
     },
-    "platform-dev": []
+    "platform-dev": [],
+    "plugin-api-version": "1.1.0"
 }

From 65c1404f8eaf95c78725215c94b1b3800777706e Mon Sep 17 00:00:00 2001
From: Soumya Unnikrishnan <sunnikri@adobe.com>
Date: Mon, 15 Jun 2020 12:07:11 -0500
Subject: [PATCH 0460/1718] MQE-2164: Remove problematic terms from MFTF

---
 ...minCreateDownloadableProductWithInvalidDomainLinkUrlTest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithInvalidDomainLinkUrlTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithInvalidDomainLinkUrlTest.xml
index 9ad20385519d1..34b9701f2dca5 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithInvalidDomainLinkUrlTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithInvalidDomainLinkUrlTest.xml
@@ -37,7 +37,7 @@
             <argument name="link" value="downloadableLink"/>
             <argument name="index" value="0"/>
         </actionGroup>
-        <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProductAfterAddingDomainToWhitelist" after="addDownloadableProductLinkAgain" />
+        <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProductAfterAddingDomainToAllowlist" after="addDownloadableProductLinkAgain" />
         <scrollTo selector="{{StorefrontDownloadableProductSection.downloadableLinkByTitle(downloadableLink.title)}}" stepKey="scrollToLinks"/>
         <click selector="{{StorefrontDownloadableProductSection.downloadableLinkByTitle(downloadableLink.title)}}" stepKey="selectProductLink"/>
         <see selector="{{CheckoutCartProductSection.ProductPriceByName(DownloadableProduct.name)}}" userInput="$52.99" stepKey="assertProductPriceInCart"/>

From 6f60490ca15b02304959a104087033b8e2028d35 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Mon, 8 Jun 2020 14:06:40 +0200
Subject: [PATCH 0461/1718] Remove classes that were deprecated, as these were
 not released yet, remove `isDenied` that is inappropriate to the context of
 excluding directories. Replacing back to Exclude from Deny.

---
 .../Model/FilterProductCustomAttribute.php    | 12 +++----
 app/code/Magento/CatalogInventory/etc/di.xml  |  2 +-
 .../Eav/Model/Validator/Attribute/Data.php    | 18 +++++------
 .../Model/Validator/Attribute/DataTest.php    | 31 ++++++++++---------
 app/code/Magento/Elasticsearch/etc/di.xml     |  2 +-
 .../Fedex/etc/wsdl/RateService_v10.wsdl       |  8 ++---
 .../Fedex/etc/wsdl/RateService_v9.wsdl        |  6 ++--
 .../Fedex/etc/wsdl/ShipService_v10.wsdl       |  4 +--
 .../Fedex/etc/wsdl/ShipService_v9.wsdl        |  4 +--
 .../Model/Import/AbstractEntity.php           | 12 +++++--
 .../Model/Directory/Command/CreateByPaths.php | 14 ++++-----
 .../Model/Directory/Command/DeleteByPaths.php | 14 ++++-----
 .../Model/Directory/Config/Converter.php      | 14 ++++-----
 ...sConfig.php => ExcludedPatternsConfig.php} |  8 ++---
 .../{IsBlacklisted.php => IsExcluded.php}     | 14 ++++-----
 ...BlacklistedTest.php => IsExcludedTest.php} | 24 +++++++-------
 app/code/Magento/MediaGallery/etc/di.xml      |  9 +++---
 .../Magento/MediaGallery/etc/directory.xml    |  4 +--
 ...erface.php => IsPathExcludedInterface.php} |  6 ++--
 ...hp => ExcludedPatternsConfigInterface.php} |  4 +--
 .../Magento/MediaGalleryApi/etc/directory.xsd |  6 ++--
 .../MediaGalleryCatalog/etc/directory.xml     |  4 +--
 .../ResourceModel/Order/Rss/OrderStatus.php   |  6 ++--
 app/code/Magento/SampleData/README.md         |  4 +--
 .../Search/Model/SearchEngine/Validator.php   | 14 ++++-----
 .../Unit/Model/SearchEngine/ValidatorTest.php |  4 +--
 .../plugins/lists/editor_plugin_src.js        | 16 +++++-----
 .../Test/AdminCreateActiveUserEntityTest.xml  |  2 +-
 .../AdminCreateInactiveUserEntityTest.xml     |  4 +--
 .../Workaround/Cleanup/StaticProperties.php   |  2 +-
 ...BlacklistedTest.php => IsExcludedTest.php} | 21 ++++++-------
 .../Magento/Test/Integrity/ClassesTest.php    | 28 ++++++++---------
 32 files changed, 164 insertions(+), 157 deletions(-)
 rename app/code/Magento/MediaGallery/Model/Directory/{BlacklistPatternsConfig.php => ExcludedPatternsConfig.php} (68%)
 rename app/code/Magento/MediaGallery/Model/Directory/{IsBlacklisted.php => IsExcluded.php} (61%)
 rename app/code/Magento/MediaGallery/Test/Unit/Model/Directory/{IsBlacklistedTest.php => IsExcludedTest.php} (70%)
 rename app/code/Magento/MediaGalleryApi/Api/{IsPathBlacklistedInterface.php => IsPathExcludedInterface.php} (71%)
 rename app/code/Magento/MediaGalleryApi/Model/{BlacklistPatternsConfigInterface.php => ExcludedPatternsConfigInterface.php} (75%)
 rename dev/tests/integration/testsuite/Magento/MediaGallery/Model/{IsBlacklistedTest.php => IsExcludedTest.php} (62%)

diff --git a/app/code/Magento/Catalog/Model/FilterProductCustomAttribute.php b/app/code/Magento/Catalog/Model/FilterProductCustomAttribute.php
index 497ed2fd49953..a928ddea03a70 100644
--- a/app/code/Magento/Catalog/Model/FilterProductCustomAttribute.php
+++ b/app/code/Magento/Catalog/Model/FilterProductCustomAttribute.php
@@ -8,21 +8,21 @@
 namespace Magento\Catalog\Model;
 
 /**
- * Filter custom attributes for product using the blacklist
+ * Filter custom attributes for product using the excluded list
  */
 class FilterProductCustomAttribute
 {
     /**
      * @var array
      */
-    private $blackList;
+    private $excludedList;
 
     /**
-     * @param array $blackList
+     * @param array $excludedList
      */
-    public function __construct(array $blackList = [])
+    public function __construct(array $excludedList = [])
     {
-        $this->blackList = $blackList;
+        $this->excludedList = $excludedList;
     }
 
     /**
@@ -33,6 +33,6 @@ public function __construct(array $blackList = [])
      */
     public function execute(array $attributes): array
     {
-        return array_diff_key($attributes, array_flip($this->blackList));
+        return array_diff_key($attributes, array_flip($this->excludedList));
     }
 }
diff --git a/app/code/Magento/CatalogInventory/etc/di.xml b/app/code/Magento/CatalogInventory/etc/di.xml
index 78a0c2b734315..927fd8583ad26 100644
--- a/app/code/Magento/CatalogInventory/etc/di.xml
+++ b/app/code/Magento/CatalogInventory/etc/di.xml
@@ -37,7 +37,7 @@
     </type>
     <type name="Magento\Catalog\Model\FilterProductCustomAttribute">
         <arguments>
-            <argument name="blackList" xsi:type="array">
+            <argument name="excludedList" xsi:type="array">
                 <item name="quantity_and_stock_status" xsi:type="string">quantity_and_stock_status</item>
             </argument>
         </arguments>
diff --git a/app/code/Magento/Eav/Model/Validator/Attribute/Data.php b/app/code/Magento/Eav/Model/Validator/Attribute/Data.php
index 15dcea077c887..7e434166a15be 100644
--- a/app/code/Magento/Eav/Model/Validator/Attribute/Data.php
+++ b/app/code/Magento/Eav/Model/Validator/Attribute/Data.php
@@ -23,12 +23,12 @@ class Data extends \Magento\Framework\Validator\AbstractValidator
     /**
      * @var array
      */
-    protected $_attributesWhiteList = [];
+    protected $allowedAttributesList = [];
 
     /**
      * @var array
      */
-    protected $_attributesBlackList = [];
+    protected $deniedAttributesList = [];
 
     /**
      * @var array
@@ -68,9 +68,9 @@ public function setAttributes(array $attributes)
      * @param array $attributesCodes
      * @return $this
      */
-    public function setAttributesWhiteList(array $attributesCodes)
+    public function setAllowedAttributesList(array $attributesCodes)
     {
-        $this->_attributesWhiteList = $attributesCodes;
+        $this->allowedAttributesList = $attributesCodes;
         return $this;
     }
 
@@ -82,9 +82,9 @@ public function setAttributesWhiteList(array $attributesCodes)
      * @param array $attributesCodes
      * @return $this
      */
-    public function setAttributesBlackList(array $attributesCodes)
+    public function setDeniedAttributesList(array $attributesCodes)
     {
-        $this->_attributesBlackList = $attributesCodes;
+        $this->deniedAttributesList = $attributesCodes;
         return $this;
     }
 
@@ -171,11 +171,11 @@ protected function _getAttributes($entity)
             $attributesCodes[] = $attributeCode;
         }
 
-        $ignoreAttributes = $this->_attributesBlackList;
-        if ($this->_attributesWhiteList) {
+        $ignoreAttributes = $this->deniedAttributesList;
+        if ($this->allowedAttributesList) {
             $ignoreAttributes = array_merge(
                 $ignoreAttributes,
-                array_diff($attributesCodes, $this->_attributesWhiteList)
+                array_diff($attributesCodes, $this->allowedAttributesList)
             );
         }
 
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Validator/Attribute/DataTest.php b/app/code/Magento/Eav/Test/Unit/Model/Validator/Attribute/DataTest.php
index 774b968f1b697..a8ecbb8371ac9 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Validator/Attribute/DataTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Validator/Attribute/DataTest.php
@@ -249,10 +249,10 @@ public function testIsValidAttributesFromCollection()
     }
 
     /**
-     * @dataProvider whiteBlackListProvider
+     * @dataProvider allowDenyListProvider
      * @param callable $callback
      */
-    public function testIsValidBlackListWhiteListChecks($callback)
+    public function testIsValidExclusionInclusionListChecks($callback)
     {
         $attribute = $this->_getAttributeMock(
             [
@@ -302,19 +302,19 @@ public function testIsValidBlackListWhiteListChecks($callback)
     /**
      * @return array
      */
-    public function whiteBlackListProvider()
+    public function allowDenyListProvider()
     {
-        $whiteCallback = function ($validator) {
-            $validator->setAttributesWhiteList(['attribute']);
+        $allowedCallbackList = function ($validator) {
+            $validator->setAllowedAttributesList(['attribute']);
         };
 
-        $blackCallback = function ($validator) {
-            $validator->setAttributesBlackList(['attribute2']);
+        $deniedCallbackList = function ($validator) {
+            $validator->setDeniedAttributesList(['attribute2']);
         };
-        return ['white_list' => [$whiteCallback], 'black_list' => [$blackCallback]];
+        return ['allowed' => [$allowedCallbackList], 'denied' => [$deniedCallbackList]];
     }
 
-    public function testSetAttributesWhiteList()
+    public function testSetAttributesAllowedList()
     {
         $this->markTestSkipped('Skipped in #27500 due to testing protected/private methods and properties');
 
@@ -328,12 +328,14 @@ public function testSetAttributesWhiteList()
             )
             ->getMock();
         $validator = new Data($attrDataFactory);
-        $result = $validator->setAttributesWhiteList($attributes);
-        $this->assertAttributeEquals($attributes, '_attributesWhiteList', $validator);
+        $result = $validator->setIncludedAttributesList($attributes);
+
+        // phpstan:ignore
+        $this->assertAttributeEquals($attributes, '_attributesAllowed', $validator);
         $this->assertEquals($validator, $result);
     }
 
-    public function testSetAttributesBlackList()
+    public function testSetAttributesDeniedList()
     {
         $this->markTestSkipped('Skipped in #27500 due to testing protected/private methods and properties');
 
@@ -347,8 +349,9 @@ public function testSetAttributesBlackList()
             )
             ->getMock();
         $validator = new Data($attrDataFactory);
-        $result = $validator->setAttributesBlackList($attributes);
-        $this->assertAttributeEquals($attributes, '_attributesBlackList', $validator);
+        $result = $validator->setDeniedAttributesList($attributes);
+        // phpstan:ignore
+        $this->assertAttributeEquals($attributes, '_attributesDenied', $validator);
         $this->assertEquals($validator, $result);
     }
 
diff --git a/app/code/Magento/Elasticsearch/etc/di.xml b/app/code/Magento/Elasticsearch/etc/di.xml
index 633889e70591b..633e67dfe698e 100644
--- a/app/code/Magento/Elasticsearch/etc/di.xml
+++ b/app/code/Magento/Elasticsearch/etc/di.xml
@@ -537,7 +537,7 @@
     </type>
     <type name="Magento\Search\Model\SearchEngine\Validator">
         <arguments>
-            <argument name="engineBlacklist" xsi:type="array">
+            <argument name="excludedEngineList" xsi:type="array">
                 <item name="elasticsearch" xsi:type="string">Elasticsearch 2</item>
             </argument>
             <argument name="engineValidators" xsi:type="array">
diff --git a/app/code/Magento/Fedex/etc/wsdl/RateService_v10.wsdl b/app/code/Magento/Fedex/etc/wsdl/RateService_v10.wsdl
index 62795f07239a6..3629bb424f207 100644
--- a/app/code/Magento/Fedex/etc/wsdl/RateService_v10.wsdl
+++ b/app/code/Magento/Fedex/etc/wsdl/RateService_v10.wsdl
@@ -472,7 +472,7 @@
       <xs:complexType name="Commodity">
         <xs:annotation>
           <xs:documentation>
-            For international multiple piece shipments, commodity information must be passed in the Master and on each child transaction.
+            For international multiple piece shipments, commodity information must be passed in the Main and on each child transaction.
             If this shipment contains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
           </xs:documentation>
         </xs:annotation>
@@ -983,7 +983,7 @@
           </xs:element>
           <xs:element name="CustomsValue" type="ns:Money" minOccurs="0">
             <xs:annotation>
-              <xs:documentation>The total customs value for the shipment. This total will rrepresent th esum of the values of all commodities, and may include freight, miscellaneous, and insurance charges. Must contain 2 explicit decimal positions with a max length of 17 including the decimal. For Express International MPS, the Total Customs Value is in the master transaction and all child transactions</xs:documentation>
+              <xs:documentation>The total customs value for the shipment. This total will rrepresent th esum of the values of all commodities, and may include freight, miscellaneous, and insurance charges. Must contain 2 explicit decimal positions with a max length of 17 including the decimal. For Express International MPS, the Total Customs Value is in the main transaction and all child transactions</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="FreightOnValue" type="ns:FreightOnValueType" minOccurs="0">
@@ -1005,7 +1005,7 @@
           <xs:element name="Commodities" type="ns:Commodity" minOccurs="0" maxOccurs="99">
             <xs:annotation>
               <xs:documentation>
-                For international multiple piece shipments, commodity information must be passed in the Master and on each child transaction.
+                For international multiple piece shipments, commodity information must be passed in the Main and on each child transaction.
                 If this shipment contains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
               </xs:documentation>
             </xs:annotation>
@@ -4867,4 +4867,4 @@
       <s1:address location="https://wsbeta.fedex.com:443/web-services/rate"/>
     </port>
   </service>
-</definitions>
\ No newline at end of file
+</definitions>
diff --git a/app/code/Magento/Fedex/etc/wsdl/RateService_v9.wsdl b/app/code/Magento/Fedex/etc/wsdl/RateService_v9.wsdl
index 17a6f74cc09b8..2f3feecb58084 100644
--- a/app/code/Magento/Fedex/etc/wsdl/RateService_v9.wsdl
+++ b/app/code/Magento/Fedex/etc/wsdl/RateService_v9.wsdl
@@ -471,7 +471,7 @@
       <xs:complexType name="Commodity">
         <xs:annotation>
           <xs:documentation>
-            For international multiple piece shipments, commodity information must be passed in the Master and on each child transaction.
+            For international multiple piece shipments, commodity information must be passed in the Main and on each child transaction.
             If this shipment commitment more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
           </xs:documentation>
         </xs:annotation>
@@ -983,7 +983,7 @@
           </xs:element>
           <xs:element name="CustomsValue" type="ns:Money" minOccurs="0">
             <xs:annotation>
-              <xs:documentation>The total customs value for the shipment. This total will rrepresent th esum of the values of all commodities, and may include freight, miscellaneous, and insurance charges. Must contain 2 explicit decimal positions with a max length of 17 including the decimal. For Express International MPS, the Total Customs Value is in the master transaction and all child transactions</xs:documentation>
+              <xs:documentation>The total customs value for the shipment. This total will rrepresent th esum of the values of all commodities, and may include freight, miscellaneous, and insurance charges. Must contain 2 explicit decimal positions with a max length of 17 including the decimal. For Express International MPS, the Total Customs Value is in the main transaction and all child transactions</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="FreightOnValue" type="ns:FreightOnValueType" minOccurs="0">
@@ -1005,7 +1005,7 @@
           <xs:element name="Commodities" type="ns:Commodity" minOccurs="0" maxOccurs="99">
             <xs:annotation>
               <xs:documentation>
-                For international multiple piece shipments, commodity information must be passed in the Master and on each child transaction.
+                For international multiple piece shipments, commodity information must be passed in the Main and on each child transaction.
                 If this shipment contains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
               </xs:documentation>
             </xs:annotation>
diff --git a/app/code/Magento/Fedex/etc/wsdl/ShipService_v10.wsdl b/app/code/Magento/Fedex/etc/wsdl/ShipService_v10.wsdl
index 54bb57d490c76..439d032a61fd0 100644
--- a/app/code/Magento/Fedex/etc/wsdl/ShipService_v10.wsdl
+++ b/app/code/Magento/Fedex/etc/wsdl/ShipService_v10.wsdl
@@ -497,7 +497,7 @@
       <xs:complexType name="Commodity">
         <xs:annotation>
           <xs:documentation>
-            For international multiple piece shipments, commodity information must be passed in the Master and on each child transaction.
+            For international multiple piece shipments, commodity information must be passed in the Main and on each child transaction.
             If this shipment contains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
           </xs:documentation>
         </xs:annotation>
@@ -724,7 +724,7 @@
           </xs:element>
           <xs:element name="MasterTrackingId" type="ns:TrackingId" minOccurs="0">
             <xs:annotation>
-              <xs:documentation>The master tracking number and form id of this multiple piece shipment. This information is to be provided for each subsequent of a multiple piece shipment.</xs:documentation>
+              <xs:documentation>The main tracking number and form id of this multiple piece shipment. This information is to be provided for each subsequent of a multiple piece shipment.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="ServiceTypeDescription" type="xs:string" minOccurs="0">
diff --git a/app/code/Magento/Fedex/etc/wsdl/ShipService_v9.wsdl b/app/code/Magento/Fedex/etc/wsdl/ShipService_v9.wsdl
index d8dc0fdfed4ab..a449bf41dbd68 100644
--- a/app/code/Magento/Fedex/etc/wsdl/ShipService_v9.wsdl
+++ b/app/code/Magento/Fedex/etc/wsdl/ShipService_v9.wsdl
@@ -497,7 +497,7 @@
       <xs:complexType name="Commodity">
         <xs:annotation>
           <xs:documentation>
-            For international multiple piece shipments, commodity information must be passed in the Master and on each child transaction.
+            For international multiple piece shipments, commodity information must be passed in the Main and on each child transaction.
             If this shipment contains more than four commodity line items, the four highest valued should be included in the first 4 occurrences for this request.
           </xs:documentation>
         </xs:annotation>
@@ -724,7 +724,7 @@
           </xs:element>
           <xs:element name="MasterTrackingId" type="ns:TrackingId" minOccurs="0">
             <xs:annotation>
-              <xs:documentation>The master tracking number and form id of this multiple piece shipment. This information is to be provided for each subsequent of a multiple piece shipment.</xs:documentation>
+              <xs:documentation>The main tracking number and form id of this multiple piece shipment. This information is to be provided for each subsequent of a multiple piece shipment.</xs:documentation>
             </xs:annotation>
           </xs:element>
           <xs:element name="ServiceTypeDescription" type="xs:string" minOccurs="0">
diff --git a/app/code/Magento/ImportExport/Model/Import/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Import/AbstractEntity.php
index 5bd956c1bc322..9bf5b945c8fbd 100644
--- a/app/code/Magento/ImportExport/Model/Import/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Import/AbstractEntity.php
@@ -15,6 +15,7 @@
 /**
  * Import entity abstract model
  *
+ * phpcs:disable Magento2.Classes.AbstractApi
  * @api
  *
  * @SuppressWarnings(PHPMD.TooManyFields)
@@ -335,6 +336,8 @@ public function __construct(
     }
 
     /**
+     * Returns Error aggregator
+     *
      * @return ProcessingErrorAggregatorInterface
      */
     public function getErrorAggregator()
@@ -413,7 +416,7 @@ protected function _saveValidatedBunches()
 
         $source->rewind();
         $this->_dataSourceModel->cleanBunches();
-        $masterAttributeCode = $this->getMasterAttributeCode();
+        $mainAttributeCode = $this->getMasterAttributeCode();
 
         while ($source->valid() || count($bunchRows) || isset($entityGroup)) {
             if ($startNewBunch || !$source->valid()) {
@@ -453,7 +456,7 @@ protected function _saveValidatedBunches()
                     continue;
                 }
 
-                if (isset($rowData[$masterAttributeCode]) && trim($rowData[$masterAttributeCode])) {
+                if (isset($rowData[$mainAttributeCode]) && trim($rowData[$mainAttributeCode])) {
                     /* Add entity group that passed validation to bunch */
                     if (isset($entityGroup)) {
                         foreach ($entityGroup as $key => $value) {
@@ -590,6 +593,7 @@ public function getBehavior(array $rowData = null)
      * Get default import behavior
      *
      * @return string
+     * phpcs:disable Magento2.Functions.StaticFunction
      */
     public static function getDefaultBehavior()
     {
@@ -652,7 +656,9 @@ public function isAttributeParticular($attributeCode)
     }
 
     /**
-     * @return string the master attribute code to use in an import
+     * Returns the master attribute code to use in an import
+     *
+     * @return string
      */
     public function getMasterAttributeCode()
     {
diff --git a/app/code/Magento/MediaGallery/Model/Directory/Command/CreateByPaths.php b/app/code/Magento/MediaGallery/Model/Directory/Command/CreateByPaths.php
index 4d87c1aa95285..f33c22a18b4b8 100644
--- a/app/code/Magento/MediaGallery/Model/Directory/Command/CreateByPaths.php
+++ b/app/code/Magento/MediaGallery/Model/Directory/Command/CreateByPaths.php
@@ -10,7 +10,7 @@
 use Magento\Cms\Model\Wysiwyg\Images\Storage;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\MediaGalleryApi\Api\CreateDirectoriesByPathsInterface;
-use Magento\MediaGalleryApi\Api\IsPathBlacklistedInterface;
+use Magento\MediaGalleryApi\Api\IsPathExcludedInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -29,23 +29,23 @@ class CreateByPaths implements CreateDirectoriesByPathsInterface
     private $storage;
 
     /**
-     * @var IsPathBlacklistedInterface
+     * @var IsPathExcludedInterface
      */
-    private $isPathBlacklisted;
+    private $isPathExcluded;
 
     /**
      * @param LoggerInterface $logger
      * @param Storage $storage
-     * @param IsPathBlacklistedInterface $isPathBlacklisted
+     * @param IsPathExcludedInterface $isPathExcluded
      */
     public function __construct(
         LoggerInterface $logger,
         Storage $storage,
-        IsPathBlacklistedInterface $isPathBlacklisted
+        IsPathExcludedInterface $isPathExcluded
     ) {
         $this->logger = $logger;
         $this->storage = $storage;
-        $this->isPathBlacklisted = $isPathBlacklisted;
+        $this->isPathExcluded = $isPathExcluded;
     }
 
     /**
@@ -55,7 +55,7 @@ public function execute(array $paths): void
     {
         $failedPaths = [];
         foreach ($paths as $path) {
-            if ($this->isPathBlacklisted->execute($path)) {
+            if ($this->isPathExcluded->execute($path)) {
                 $failedPaths[] = $path;
                 continue;
             }
diff --git a/app/code/Magento/MediaGallery/Model/Directory/Command/DeleteByPaths.php b/app/code/Magento/MediaGallery/Model/Directory/Command/DeleteByPaths.php
index d46fb854fff22..2e45000c07225 100644
--- a/app/code/Magento/MediaGallery/Model/Directory/Command/DeleteByPaths.php
+++ b/app/code/Magento/MediaGallery/Model/Directory/Command/DeleteByPaths.php
@@ -10,7 +10,7 @@
 use Magento\Cms\Model\Wysiwyg\Images\Storage;
 use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\MediaGalleryApi\Api\DeleteDirectoriesByPathsInterface;
-use Magento\MediaGalleryApi\Api\IsPathBlacklistedInterface;
+use Magento\MediaGalleryApi\Api\IsPathExcludedInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -29,23 +29,23 @@ class DeleteByPaths implements DeleteDirectoriesByPathsInterface
     private $storage;
 
     /**
-     * @var IsPathBlacklistedInterface
+     * @var IsPathExcludedInterface
      */
-    private $isPathBlacklisted;
+    private $isPathExcluded;
 
     /**
      * @param LoggerInterface $logger
      * @param Storage $storage
-     * @param IsPathBlacklistedInterface $isPathBlacklisted
+     * @param IsPathExcludedInterface $isPathExcluded
      */
     public function __construct(
         LoggerInterface $logger,
         Storage $storage,
-        IsPathBlacklistedInterface $isPathBlacklisted
+        IsPathExcludedInterface $isPathExcluded
     ) {
         $this->logger = $logger;
         $this->storage = $storage;
-        $this->isPathBlacklisted = $isPathBlacklisted;
+        $this->isPathExcluded = $isPathExcluded;
     }
 
     /**
@@ -55,7 +55,7 @@ public function execute(array $paths): void
     {
         $failedPaths = [];
         foreach ($paths as $path) {
-            if ($this->isPathBlacklisted->execute($path)) {
+            if ($this->isPathExcluded->execute($path)) {
                 $failedPaths[] = $path;
                 continue;
             }
diff --git a/app/code/Magento/MediaGallery/Model/Directory/Config/Converter.php b/app/code/Magento/MediaGallery/Model/Directory/Config/Converter.php
index 91f16d246f636..3d9911c805efb 100644
--- a/app/code/Magento/MediaGallery/Model/Directory/Config/Converter.php
+++ b/app/code/Magento/MediaGallery/Model/Directory/Config/Converter.php
@@ -15,9 +15,9 @@
 class Converter implements ConverterInterface
 {
     /**
-     * Blacklist tag name
+     * Excluded list tag name
      */
-    private const BLACKLIST_TAG_NAME = 'blacklist';
+    private const EXCLUDED_LIST_TAG_NAME = 'exclude';
 
     /**
      * Patterns tag name
@@ -43,12 +43,12 @@ public function convert($source): array
             throw new \InvalidArgumentException('The source should be instance of DOMDocument');
         }
 
-        foreach ($source->getElementsByTagName(self::BLACKLIST_TAG_NAME) as $blacklist) {
-            $result[self::BLACKLIST_TAG_NAME] = [];
-            foreach ($blacklist->getElementsByTagName(self::PATTERNS_TAG_NAME) as $patterns) {
-                $result[self::BLACKLIST_TAG_NAME][self::PATTERNS_TAG_NAME] = [];
+        foreach ($source->getElementsByTagName(self::EXCLUDED_LIST_TAG_NAME) as $excludedList) {
+            $result[self::EXCLUDED_LIST_TAG_NAME] = [];
+            foreach ($excludedList->getElementsByTagName(self::PATTERNS_TAG_NAME) as $patterns) {
+                $result[self::EXCLUDED_LIST_TAG_NAME][self::PATTERNS_TAG_NAME] = [];
                 foreach ($patterns->getElementsByTagName(self::PATTERN_TAG_NAME) as $pattern) {
-                    $result[self::BLACKLIST_TAG_NAME][self::PATTERNS_TAG_NAME]
+                    $result[self::EXCLUDED_LIST_TAG_NAME][self::PATTERNS_TAG_NAME]
                     [$pattern->attributes->getNamedItem('name')->nodeValue] = $pattern->nodeValue;
                 }
             }
diff --git a/app/code/Magento/MediaGallery/Model/Directory/BlacklistPatternsConfig.php b/app/code/Magento/MediaGallery/Model/Directory/ExcludedPatternsConfig.php
similarity index 68%
rename from app/code/Magento/MediaGallery/Model/Directory/BlacklistPatternsConfig.php
rename to app/code/Magento/MediaGallery/Model/Directory/ExcludedPatternsConfig.php
index 8fdd4f70d5060..29ed5fbf04ecd 100644
--- a/app/code/Magento/MediaGallery/Model/Directory/BlacklistPatternsConfig.php
+++ b/app/code/Magento/MediaGallery/Model/Directory/ExcludedPatternsConfig.php
@@ -8,14 +8,14 @@
 namespace Magento\MediaGallery\Model\Directory;
 
 use Magento\Framework\Config\DataInterface;
-use Magento\MediaGalleryApi\Model\BlacklistPatternsConfigInterface;
+use Magento\MediaGalleryApi\Model\ExcludedPatternsConfigInterface;
 
 /**
  * Media gallery directory config
  */
-class BlacklistPatternsConfig implements BlacklistPatternsConfigInterface
+class ExcludedPatternsConfig implements ExcludedPatternsConfigInterface
 {
-    private const XML_PATH_BLACKLIST_PATTERNS = 'blacklist/patterns';
+    private const XML_PATH_EXCLUDED_PATTERNS = 'exclude/patterns';
 
     /**
      * @var DataInterface
@@ -37,6 +37,6 @@ public function __construct(DataInterface $data)
      */
     public function get() : array
     {
-        return $this->data->get(self::XML_PATH_BLACKLIST_PATTERNS);
+        return $this->data->get(self::XML_PATH_EXCLUDED_PATTERNS);
     }
 }
diff --git a/app/code/Magento/MediaGallery/Model/Directory/IsBlacklisted.php b/app/code/Magento/MediaGallery/Model/Directory/IsExcluded.php
similarity index 61%
rename from app/code/Magento/MediaGallery/Model/Directory/IsBlacklisted.php
rename to app/code/Magento/MediaGallery/Model/Directory/IsExcluded.php
index 0191b357aaefa..8fb0e03b76548 100644
--- a/app/code/Magento/MediaGallery/Model/Directory/IsBlacklisted.php
+++ b/app/code/Magento/MediaGallery/Model/Directory/IsExcluded.php
@@ -7,23 +7,23 @@
 
 namespace Magento\MediaGallery\Model\Directory;
 
-use Magento\MediaGalleryApi\Api\IsPathBlacklistedInterface;
-use Magento\MediaGalleryApi\Model\BlacklistPatternsConfigInterface;
+use Magento\MediaGalleryApi\Api\IsPathExcludedInterface;
+use Magento\MediaGalleryApi\Model\ExcludedPatternsConfigInterface;
 
 /**
- * Check if the path is blacklisted for media gallery. Directory path may be blacklisted if it's reserved by the system
+ * Check if the path is excluded for media gallery. Directory path may be blacklisted if it's reserved by the system
  */
-class IsBlacklisted implements IsPathBlacklistedInterface
+class IsExcluded implements IsPathExcludedInterface
 {
     /**
-     * @var BlacklistPatternsConfigInterface
+     * @var ExcludedPatternsConfigInterface
      */
     private $config;
 
     /**
-     * @param BlacklistPatternsConfigInterface $config
+     * @param ExcludedPatternsConfigInterface $config
      */
-    public function __construct(BlacklistPatternsConfigInterface $config)
+    public function __construct(ExcludedPatternsConfigInterface $config)
     {
         $this->config = $config;
     }
diff --git a/app/code/Magento/MediaGallery/Test/Unit/Model/Directory/IsBlacklistedTest.php b/app/code/Magento/MediaGallery/Test/Unit/Model/Directory/IsExcludedTest.php
similarity index 70%
rename from app/code/Magento/MediaGallery/Test/Unit/Model/Directory/IsBlacklistedTest.php
rename to app/code/Magento/MediaGallery/Test/Unit/Model/Directory/IsExcludedTest.php
index c96fd2ee54512..cc57b043954d7 100644
--- a/app/code/Magento/MediaGallery/Test/Unit/Model/Directory/IsBlacklistedTest.php
+++ b/app/code/Magento/MediaGallery/Test/Unit/Model/Directory/IsExcludedTest.php
@@ -8,45 +8,45 @@
 namespace Magento\MediaGallery\Test\Unit\Model\Directory;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\MediaGallery\Model\Directory\IsBlacklisted;
-use Magento\MediaGalleryApi\Model\BlacklistPatternsConfigInterface;
+use Magento\MediaGallery\Model\Directory\IsExcluded;
+use Magento\MediaGalleryApi\Model\ExcludedPatternsConfigInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 /**
- * Test for IsBlacklisted
+ * Test for IsExcluded
  */
-class IsBlacklistedTest extends TestCase
+class IsExcludedTest extends TestCase
 {
     /**
-     * @var IsBlacklisted
+     * @var IsExcluded
      */
     private $object;
 
     /**
-     * @var BlacklistPatternsConfigInterface|MockObject
+     * @var ExcludedPatternsConfigInterface|MockObject
      */
-    private $config;
+    private $configMock;
 
     /**
      * Initialize basic test class mocks
      */
     protected function setUp(): void
     {
-        $this->config = $this->getMockBuilder(BlacklistPatternsConfigInterface::class)
+        $this->configMock = $this->getMockBuilder(ExcludedPatternsConfigInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
-        $this->config->expects($this->at(0))->method('get')->willReturn([
+        $this->configMock->expects($this->at(0))->method('get')->willReturn([
             'tmp' => '/pub\/media\/tmp/',
             'captcha' => '/pub\/media\/captcha/'
         ]);
-        $this->object = (new ObjectManager($this))->getObject(IsBlacklisted::class, [
-            'config' => $this->config
+        $this->object = (new ObjectManager($this))->getObject(IsExcluded::class, [
+            'config' => $this->configMock
         ]);
     }
 
     /**
-     * Test if the directory path is blacklisted
+     * Test if the directory path is excluded
      *
      * @param string $path
      * @param bool $isExcluded
diff --git a/app/code/Magento/MediaGallery/etc/di.xml b/app/code/Magento/MediaGallery/etc/di.xml
index a85c26e275226..bedb78758786b 100644
--- a/app/code/Magento/MediaGallery/etc/di.xml
+++ b/app/code/Magento/MediaGallery/etc/di.xml
@@ -21,7 +21,7 @@
     <preference for="Magento\MediaGalleryApi\Api\CreateDirectoriesByPathsInterface" type="Magento\MediaGallery\Model\Directory\Command\CreateByPaths"/>
     <preference for="Magento\MediaGalleryApi\Api\DeleteDirectoriesByPathsInterface" type="Magento\MediaGallery\Model\Directory\Command\DeleteByPaths"/>
 
-    <preference for="Magento\MediaGalleryApi\Api\IsPathBlacklistedInterface" type="Magento\MediaGallery\Model\Directory\IsBlacklisted"/>
+    <preference for="Magento\MediaGalleryApi\Api\IsPathExcludedInterface" type="Magento\MediaGallery\Model\Directory\IsExcluded"/>
 
     <preference for="Magento\MediaGalleryApi\Api\DeleteAssetsByPathsInterface" type="Magento\MediaGallery\Model\ResourceModel\DeleteAssetsByPaths"/>
     <preference for="Magento\MediaGalleryApi\Api\GetAssetsByIdsInterface" type="Magento\MediaGallery\Model\ResourceModel\GetAssetsByIds"/>
@@ -40,7 +40,7 @@
             <argument name="converter" xsi:type="object">Magento\MediaGallery\Model\Directory\Config\Converter</argument>
             <argument name="schemaLocator" xsi:type="object">Magento\MediaGallery\Model\Directory\Config\SchemaLocator</argument>
             <argument name="idAttributes" xsi:type="array">
-                <item name="/config/blacklist/patterns/pattern" xsi:type="string">name</item>
+                <item name="/config/exclude/patterns/pattern" xsi:type="string">name</item>
             </argument>
         </arguments>
     </virtualType>
@@ -50,11 +50,10 @@
             <argument name="cacheId" xsi:type="string">Media_Gallery_Patterns_CacheId</argument>
         </arguments>
     </virtualType>
-    <type name="Magento\MediaGallery\Model\Directory\BlacklistPatternsConfig">
+    <type name="Magento\MediaGallery\Model\Directory\ExcludedPatternsConfig">
         <arguments>
             <argument name="data" xsi:type="object">Magento\MediaGallery\Model\Directory\Config\Data</argument>
         </arguments>
     </type>
-
-    <preference for="Magento\MediaGalleryApi\Model\BlacklistPatternsConfigInterface" type="Magento\MediaGallery\Model\Directory\BlacklistPatternsConfig"/>
+    <preference for="Magento\MediaGalleryApi\Model\ExcludedPatternsConfigInterface" type="Magento\MediaGallery\Model\Directory\ExcludedPatternsConfig"/>
 </config>
diff --git a/app/code/Magento/MediaGallery/etc/directory.xml b/app/code/Magento/MediaGallery/etc/directory.xml
index 92f50b2dd0a30..42094aff72640 100644
--- a/app/code/Magento/MediaGallery/etc/directory.xml
+++ b/app/code/Magento/MediaGallery/etc/directory.xml
@@ -6,7 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_MediaGalleryApi:etc/directory.xsd">
-    <blacklist>
+    <exclude>
         <patterns>
             <pattern name="captcha">/^captcha/</pattern>
             <pattern name="customer">/^customer/</pattern>
@@ -17,5 +17,5 @@
             <pattern name="tmp">/^tmp/</pattern>
             <pattern name="directories-with-dots">/^\./</pattern>
         </patterns>
-    </blacklist>
+    </exclude>
 </config>
diff --git a/app/code/Magento/MediaGalleryApi/Api/IsPathBlacklistedInterface.php b/app/code/Magento/MediaGalleryApi/Api/IsPathExcludedInterface.php
similarity index 71%
rename from app/code/Magento/MediaGalleryApi/Api/IsPathBlacklistedInterface.php
rename to app/code/Magento/MediaGalleryApi/Api/IsPathExcludedInterface.php
index cbd23ec3fbde7..1e41debb1b1c5 100644
--- a/app/code/Magento/MediaGalleryApi/Api/IsPathBlacklistedInterface.php
+++ b/app/code/Magento/MediaGalleryApi/Api/IsPathExcludedInterface.php
@@ -8,12 +8,12 @@
 namespace Magento\MediaGalleryApi\Api;
 
 /**
- * Check if the path is blacklisted for media gallery.
+ * Check if the path is excluded for media gallery.
  *
- * Directory path may be blacklisted if it's reserved by the system.
+ * Directory path may be excluded if it's reserved by the system.
  * @api
  */
-interface IsPathBlacklistedInterface
+interface IsPathExcludedInterface
 {
     /**
      * Check if the path is excluded from displaying and processing in the media gallery
diff --git a/app/code/Magento/MediaGalleryApi/Model/BlacklistPatternsConfigInterface.php b/app/code/Magento/MediaGalleryApi/Model/ExcludedPatternsConfigInterface.php
similarity index 75%
rename from app/code/Magento/MediaGalleryApi/Model/BlacklistPatternsConfigInterface.php
rename to app/code/Magento/MediaGalleryApi/Model/ExcludedPatternsConfigInterface.php
index b4710f32e0c46..dd82f87780a49 100644
--- a/app/code/Magento/MediaGalleryApi/Model/BlacklistPatternsConfigInterface.php
+++ b/app/code/Magento/MediaGalleryApi/Model/ExcludedPatternsConfigInterface.php
@@ -7,9 +7,9 @@
 namespace Magento\MediaGalleryApi\Model;
 
 /**
- * Returns list of blacklist regexp patterns
+ * Returns list of excluded regexp patterns
  */
-interface BlacklistPatternsConfigInterface
+interface ExcludedPatternsConfigInterface
 {
     /**
      * Get regexp patterns
diff --git a/app/code/Magento/MediaGalleryApi/etc/directory.xsd b/app/code/Magento/MediaGalleryApi/etc/directory.xsd
index 2ad76c8fcc9f2..2fb4fed028469 100644
--- a/app/code/Magento/MediaGalleryApi/etc/directory.xsd
+++ b/app/code/Magento/MediaGalleryApi/etc/directory.xsd
@@ -11,14 +11,14 @@
 
     <xs:complexType name="configType">
         <xs:sequence>
-            <xs:element type="blacklistType" name="blacklist" maxOccurs="unbounded" minOccurs="1"/>
+            <xs:element type="excludeType" name="exclude" maxOccurs="unbounded" minOccurs="1"/>
         </xs:sequence>
     </xs:complexType>
 
-    <xs:complexType name="blacklistType">
+    <xs:complexType name="excludeType">
         <xs:annotation>
             <xs:documentation>
-                Blacklist used for excluding directories from media gallery rendering and operations
+                List used for excluding directories from media gallery rendering and operations
             </xs:documentation>
         </xs:annotation>
         <xs:sequence>
diff --git a/app/code/Magento/MediaGalleryCatalog/etc/directory.xml b/app/code/Magento/MediaGalleryCatalog/etc/directory.xml
index eaced3f642f70..f1ec76a877368 100644
--- a/app/code/Magento/MediaGalleryCatalog/etc/directory.xml
+++ b/app/code/Magento/MediaGalleryCatalog/etc/directory.xml
@@ -6,9 +6,9 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_MediaGalleryApi:etc/directory.xsd">
-    <blacklist>
+    <exclude>
         <patterns>
             <pattern name="catalog">/^catalog\/product/</pattern>
         </patterns>
-    </blacklist>
+    </exclude>
 </config>
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Rss/OrderStatus.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Rss/OrderStatus.php
index 19d9b6f300eba..b1d2deb248ba1 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Rss/OrderStatus.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Rss/OrderStatus.php
@@ -43,13 +43,13 @@ public function getAllCommentCollection($orderId)
         $commentSelects = [];
         foreach (['invoice', 'shipment', 'creditmemo'] as $entityTypeCode) {
             $mainTable = $resource->getTableName('sales_' . $entityTypeCode);
-            $slaveTable = $resource->getTableName('sales_' . $entityTypeCode . '_comment');
+            $commentTable = $resource->getTableName('sales_' . $entityTypeCode . '_comment');
             $select = $read->select()->from(
                 ['main' => $mainTable],
                 ['entity_id' => 'order_id', 'entity_type_code' => new \Zend_Db_Expr("'{$entityTypeCode}'")]
             )->join(
-                ['slave' => $slaveTable],
-                'main.entity_id = slave.parent_id',
+                ['comment' => $commentTable],
+                'main.entity_id = comment.parent_id',
                 $fields
             )->where(
                 'main.order_id = ?',
diff --git a/app/code/Magento/SampleData/README.md b/app/code/Magento/SampleData/README.md
index c71439b929013..e0666ba73fe24 100644
--- a/app/code/Magento/SampleData/README.md
+++ b/app/code/Magento/SampleData/README.md
@@ -11,7 +11,7 @@ You can deploy sample data from one of the following sources:
 * From the Magento composer repository, optionally using Magento CLI
 * From the Magento GitHub repository
 
-If your Magento code base was cloned from the `master` branch, you can use either source of the sample data. If it was cloned from the `develop` branch, use the GitHub repository and choose to get sample data modules from the `develop` branch.
+If your Magento code base was cloned from the mainline branch, you can use either source of the sample data. If it was cloned from the `develop` branch, use the GitHub repository and choose to get sample data modules from the `develop` branch.
 
 ### Deploy Sample Data from Composer Repository
 
@@ -46,7 +46,7 @@ Each package corresponds to a sample data module. The complete list of available
 
 To deploy sample data from the GitHub repository:
 
-1. Clone sample data from `https://github.com/magento/magento2-sample-data`. If your Magento instance was cloned from the `master` branch, choose the `master` branch when cloning sample data; choose the `develop` branch if Magento was cloned from `develop`.
+1. Clone sample data from `https://github.com/magento/magento2-sample-data`. If your Magento instance was cloned from the mainline branch, choose the mainline branch when cloning sample data; choose the `develop` branch if Magento was cloned from `develop`.
 2. Link the sample data and your Magento instance by running: `# php -f <sample-data_clone_dir>/dev/tools/build-sample-data.php -- --ce-source="<path_to_your_magento_instance>"`
 
 ## Install Sample Data
diff --git a/app/code/Magento/Search/Model/SearchEngine/Validator.php b/app/code/Magento/Search/Model/SearchEngine/Validator.php
index f4fc8a9a62e0e..264e7c69dd520 100644
--- a/app/code/Magento/Search/Model/SearchEngine/Validator.php
+++ b/app/code/Magento/Search/Model/SearchEngine/Validator.php
@@ -22,7 +22,7 @@ class Validator implements ValidatorInterface
     /**
      * @var array
      */
-    private $engineBlacklist = ['mysql' => 'MySQL'];
+    private $excludedEngineList = ['mysql' => 'MySQL'];
 
     /**
      * @var ValidatorInterface[]
@@ -32,16 +32,16 @@ class Validator implements ValidatorInterface
     /**
      * @param ScopeConfigInterface $scopeConfig
      * @param array $engineValidators
-     * @param array $engineBlacklist
+     * @param array $excludedEngineList
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
         array $engineValidators = [],
-        array $engineBlacklist = []
+        array $excludedEngineList = []
     ) {
         $this->scopeConfig = $scopeConfig;
         $this->engineValidators = $engineValidators;
-        $this->engineBlacklist = array_merge($this->engineBlacklist, $engineBlacklist);
+        $this->excludedEngineList = array_merge($this->excludedEngineList, $excludedEngineList);
     }
 
     /**
@@ -51,9 +51,9 @@ public function validate(): array
     {
         $errors = [];
         $currentEngine = $this->scopeConfig->getValue('catalog/search/engine');
-        if (isset($this->engineBlacklist[$currentEngine])) {
-            $blacklistedEngine = $this->engineBlacklist[$currentEngine];
-            $errors[] = "Your current search engine, '{$blacklistedEngine}', is not supported."
+        if (isset($this->excludedEngineList[$currentEngine])) {
+            $excludedEngine = $this->excludedEngineList[$currentEngine];
+            $errors[] = "Your current search engine, '{$excludedEngine}', is not supported."
                 . " You must install a supported search engine before upgrading."
                 . " See the System Upgrade Guide for more information.";
         }
diff --git a/app/code/Magento/Search/Test/Unit/Model/SearchEngine/ValidatorTest.php b/app/code/Magento/Search/Test/Unit/Model/SearchEngine/ValidatorTest.php
index c91c0fce9dd47..cc272ccb60162 100644
--- a/app/code/Magento/Search/Test/Unit/Model/SearchEngine/ValidatorTest.php
+++ b/app/code/Magento/Search/Test/Unit/Model/SearchEngine/ValidatorTest.php
@@ -34,7 +34,7 @@ protected function setUp(): void
             [
                 'scopeConfig' => $this->scopeConfigMock,
                 'engineValidators' => ['otherEngine' => $this->otherEngineValidatorMock],
-                'engineBlacklist' => ['badEngine' => 'Bad Engine']
+                'excludedEngineList' => ['badEngine' => 'Bad Engine']
             ]
         );
     }
@@ -54,7 +54,7 @@ public function testValidateValid()
         $this->assertEquals($expectedErrors, $this->validator->validate());
     }
 
-    public function testValidateBlacklist()
+    public function testValidateExcludedList()
     {
         $this->scopeConfigMock
             ->expects($this->once())
diff --git a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/lists/editor_plugin_src.js b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/lists/editor_plugin_src.js
index a3bd16cab718e..2119426a5c157 100644
--- a/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/lists/editor_plugin_src.js
+++ b/app/code/Magento/Tinymce3/view/base/web/tiny_mce/plugins/lists/editor_plugin_src.js
@@ -82,9 +82,9 @@
 		}
 	}
 
-	function attemptMerge(e1, e2, differentStylesMasterElement, mergeParagraphs) {
-		if (canMerge(e1, e2, !!differentStylesMasterElement, mergeParagraphs)) {
-			return merge(e1, e2, differentStylesMasterElement);
+	function attemptMerge(e1, e2, differentStylesMainElement, mergeParagraphs) {
+		if (canMerge(e1, e2, !!differentStylesMainElement, mergeParagraphs)) {
+			return merge(e1, e2, differentStylesMainElement);
 		} else if (e1 && e1.tagName === 'LI' && isList(e2)) {
 			// Fix invalidly nested lists.
 			e1.appendChild(e2);
@@ -112,7 +112,7 @@
 		return firstChild && lastChild && firstChild === lastChild && isList(firstChild);
 	}
 
-	function merge(e1, e2, masterElement) {
+	function merge(e1, e2, mainElement) {
 		var lastOriginal = skipWhitespaceNodesBackwards(e1.lastChild), firstNew = skipWhitespaceNodesForwards(e2.firstChild);
 		if (e1.tagName === 'P') {
 			e1.appendChild(e1.ownerDocument.createElement('br'));
@@ -120,8 +120,8 @@
 		while (e2.firstChild) {
 			e1.appendChild(e2.firstChild);
 		}
-		if (masterElement) {
-			e1.style.listStyleType = masterElement.style.listStyleType;
+		if (mainElement) {
+			e1.style.listStyleType = mainElement.style.listStyleType;
 		}
 		e2.parentNode.removeChild(e2);
 		attemptMerge(lastOriginal, firstNew, false);
@@ -164,7 +164,7 @@
                 }
                 return false;
             }
-			
+
             // If we are at the end of a paragraph in a list item, pressing enter should create a new list item instead of a new paragraph.
             function isEndOfParagraph() {
 				var node = ed.selection.getNode();
@@ -241,7 +241,7 @@
 					Event.cancel(e);
 				}
 			}
-			
+
             // Creates a new list item after the current selection's list item parent
             function createNewLi(ed, e) {
                 if (state == LIST_PARAGRAPH) {
diff --git a/app/code/Magento/User/Test/Mftf/Test/AdminCreateActiveUserEntityTest.xml b/app/code/Magento/User/Test/Mftf/Test/AdminCreateActiveUserEntityTest.xml
index 668ae550f1b3d..ba8d6ef433e13 100644
--- a/app/code/Magento/User/Test/Mftf/Test/AdminCreateActiveUserEntityTest.xml
+++ b/app/code/Magento/User/Test/Mftf/Test/AdminCreateActiveUserEntityTest.xml
@@ -32,7 +32,7 @@
             <argument name="user" value="activeAdmin"/>
             <argument name="role" value="roleDefaultAdministrator"/>
         </actionGroup>
-        <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutMasterAdmin"/>
+        <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutMainAdmin"/>
 
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginToNewAdmin">
             <argument name="username" value="{{activeAdmin.username}}"/>
diff --git a/app/code/Magento/User/Test/Mftf/Test/AdminCreateInactiveUserEntityTest.xml b/app/code/Magento/User/Test/Mftf/Test/AdminCreateInactiveUserEntityTest.xml
index 23a30246bd999..c26821d5be4b2 100644
--- a/app/code/Magento/User/Test/Mftf/Test/AdminCreateInactiveUserEntityTest.xml
+++ b/app/code/Magento/User/Test/Mftf/Test/AdminCreateInactiveUserEntityTest.xml
@@ -20,7 +20,7 @@
             <group value="mtf_migrated"/>
         </annotations>
 
-        <actionGroup ref="AdminLoginActionGroup" stepKey="adminMasterLogin"/>
+        <actionGroup ref="AdminLoginActionGroup" stepKey="adminMainLogin"/>
         <actionGroup ref="AdminCreateUserWithRoleAndIsActiveActionGroup" stepKey="createAdminUser">
             <argument name="user" value="inactiveAdmin"/>
             <argument name="role" value="roleDefaultAdministrator"/>
@@ -29,7 +29,7 @@
         <actionGroup ref="AssertAdminUserIsInGridActionGroup" stepKey="assertAdminIsInGrid">
             <argument name="user" value="inactiveAdmin"/>
         </actionGroup>
-        <actionGroup ref="AdminLogoutActionGroup" stepKey="adminMasterLogout"/>
+        <actionGroup ref="AdminLogoutActionGroup" stepKey="adminMainLogout"/>
 
         <actionGroup ref="AdminLoginActionGroup" stepKey="adminNewLogin">
             <argument name="username" value="{{inactiveAdmin.username}}"/>
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php b/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
index 73786707b417b..4af90d5038f36 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
@@ -79,7 +79,7 @@ public function __construct()
      */
     protected static function _isClassCleanable(\ReflectionClass $reflectionClass)
     {
-        // do not process blacklisted classes from integration framework
+        // do not process skipped classes from integration framework
         foreach (self::$_classesToSkip as $notCleanableClass) {
             if ($reflectionClass->getName() == $notCleanableClass || is_subclass_of(
                 $reflectionClass->getName(),
diff --git a/dev/tests/integration/testsuite/Magento/MediaGallery/Model/IsBlacklistedTest.php b/dev/tests/integration/testsuite/Magento/MediaGallery/Model/IsExcludedTest.php
similarity index 62%
rename from dev/tests/integration/testsuite/Magento/MediaGallery/Model/IsBlacklistedTest.php
rename to dev/tests/integration/testsuite/Magento/MediaGallery/Model/IsExcludedTest.php
index f63674754ea3d..bd0df51162620 100644
--- a/dev/tests/integration/testsuite/Magento/MediaGallery/Model/IsBlacklistedTest.php
+++ b/dev/tests/integration/testsuite/Magento/MediaGallery/Model/IsExcludedTest.php
@@ -7,18 +7,17 @@
 
 namespace Magento\MediaGallery\Model;
 
-use Magento\MediaGalleryApi\Api\IsPathBlacklistedInterface;
+use Magento\MediaGalleryApi\Api\IsPathExcludedInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 
 /**
- * Test for IsPathBlacklistedInterface
+ * Test for IsPathExcludedInterface
  */
-class IsBlacklistedTest extends TestCase
+class IsExcludedTest extends TestCase
 {
-
     /**
-     * @var IsPathBlacklistedInterface
+     * @var IsPathExcludedInterface
      */
     private $service;
 
@@ -27,23 +26,23 @@ class IsBlacklistedTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->service = Bootstrap::getObjectManager()->get(IsPathBlacklistedInterface::class);
+        $this->service = Bootstrap::getObjectManager()->get(IsPathExcludedInterface::class);
     }
 
     /**
-     * Testing the blacklisted paths
+     * Testing the excluded paths
      *
      * @param string $path
-     * @param bool $isBlacklisted
+     * @param bool $isExcluded
      * @dataProvider pathsProvider
      */
-    public function testExecute(string $path, bool $isBlacklisted): void
+    public function testExecute(string $path, bool $isExcluded): void
     {
-        $this->assertEquals($isBlacklisted, $this->service->execute($path));
+        $this->assertEquals($isExcluded, $this->service->execute($path));
     }
 
     /**
-     * Provider of paths and if the path should be in the blacklist
+     * Provider of paths and if the path should be in the excluded list
      *
      * @return array
      */
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php
index 7f7d9be162dec..d82c5e068f880 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/ClassesTest.php
@@ -31,12 +31,12 @@ class ClassesTest extends \PHPUnit\Framework\TestCase
     /**
      * @var array
      */
-    private static $keywordsBlacklist = ["String", "Array", "Boolean", "Element"];
+    private static $excludeKeywords = ["String", "Array", "Boolean", "Element"];
 
     /**
      * @var array|null
      */
-    private $referenceBlackList = null;
+    private $excludeReference = null;
 
     /**
      * Set Up
@@ -307,7 +307,7 @@ private function assertClassNamespace(string $file, string $relativePath, string
     public function testClassReferences()
     {
         $this->markTestSkipped("To be fixed in MC-33329. The test is not working properly "
-            . "after blacklisting logic was fixed. Previously it was ignoring all files.");
+            . "after excluded logic was fixed. Previously it was ignoring all files.");
         $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
         $invoker(
             /**
@@ -373,7 +373,7 @@ function ($file) {
                 );
 
                 $vendorClasses = array_filter($vendorClasses, 'strlen');
-                $vendorClasses = $this->referenceBlacklistFilter($vendorClasses);
+                $vendorClasses = $this->excludedReferenceFilter($vendorClasses);
                 if (!empty($vendorClasses)) {
                     $this->assertClassesExist($vendorClasses, $file);
                 }
@@ -392,7 +392,7 @@ function ($file) {
                     $badClasses = $this->handleAliasClasses($aliasClasses, $badClasses);
                 }
 
-                $badClasses = $this->referenceBlacklistFilter($badClasses);
+                $badClasses = $this->excludedReferenceFilter($badClasses);
                 $badClasses = $this->removeSpecialCases($badClasses, $file, $contents, $namespacePath);
                 $this->assertClassReferences($badClasses, $file);
             },
@@ -426,12 +426,12 @@ private function handleAliasClasses(array $aliasClasses, array $badClasses): arr
      * @param array $classes
      * @return array
      */
-    private function referenceBlacklistFilter(array $classes): array
+    private function excludedReferenceFilter(array $classes): array
     {
-        // exceptions made for the files from the blacklist
-        $blacklistClasses = $this->getReferenceBlacklist();
+        // exceptions made for the files from the exclusion
+        $excludeClasses = $this->getExcludedReferences();
         foreach ($classes as $class) {
-            if (in_array($class, $blacklistClasses)) {
+            if (in_array($class, $excludeClasses)) {
                 unset($classes[array_search($class, $classes)]);
             }
         }
@@ -444,16 +444,16 @@ private function referenceBlacklistFilter(array $classes): array
      *
      * @return array
      */
-    private function getReferenceBlacklist(): array
+    private function getExcludedReferences(): array
     {
-        if (!isset($this->referenceBlackList)) {
-            $this->referenceBlackList = file(
+        if (!isset($this->excludeReference)) {
+            $this->excludeReference = file(
                 __DIR__ . '/_files/blacklist/reference.txt',
                 FILE_IGNORE_NEW_LINES
             );
         }
 
-        return $this->referenceBlackList;
+        return $this->excludeReference;
     }
 
     /**
@@ -479,7 +479,7 @@ private function removeSpecialCases(array $badClasses, string $file, string $con
             }
 
             // Remove usage of key words such as "Array", "String", and "Boolean"
-            if (in_array($badClass, self::$keywordsBlacklist)) {
+            if (in_array($badClass, self::$excludeKeywords)) {
                 unset($badClasses[array_search($badClass, $badClasses)]);
                 continue;
             }

From 709487013af8e53f43e3054e8f6177f8e91801bc Mon Sep 17 00:00:00 2001
From: Soumya Unnikrishnan <sunnikri@adobe.com>
Date: Mon, 15 Jun 2020 14:57:53 -0500
Subject: [PATCH 0462/1718] MQE-2179: [3.0.0 RC5 - Release] Checklist

---
 composer.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.lock b/composer.lock
index 8d22b58d32ddf..5b96dcf674818 100644
--- a/composer.lock
+++ b/composer.lock
@@ -7207,12 +7207,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/magento/magento2-functional-testing-framework.git",
-                "reference": "bd2eee29eac0e438a2d09f63e6b5e3a8f852d933"
+                "reference": "e5126f4eb476e227e3b668b622159c917f123175"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/bd2eee29eac0e438a2d09f63e6b5e3a8f852d933",
-                "reference": "bd2eee29eac0e438a2d09f63e6b5e3a8f852d933",
+                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/e5126f4eb476e227e3b668b622159c917f123175",
+                "reference": "e5126f4eb476e227e3b668b622159c917f123175",
                 "shasum": ""
             },
             "require": {
@@ -7288,7 +7288,7 @@
                 "magento",
                 "testing"
             ],
-            "time": "2020-06-15T16:31:51+00:00"
+            "time": "2020-06-15T19:51:46+00:00"
         },
         {
             "name": "mikey179/vfsstream",

From 9aebc4d1fd81e4652a11a16ee5b8f26b49d53ec5 Mon Sep 17 00:00:00 2001
From: Ji Lu <jilu1@adobe.com>
Date: Mon, 15 Jun 2020 16:59:10 -0500
Subject: [PATCH 0463/1718] MQE-2194: fix mftf tests static check failures

---
 ...orefrontLoginToPayPalPaymentAccountTwoStepActionGroup.xml | 1 -
 .../StorefrontLoginToPayPalPaymentFromCartActionGroup.xml    | 5 ++++-
 .../Test/StorefrontPaypalSmartButtonInProductPageTest.xml    | 5 ++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup.xml
index b046ad6534f82..040e258484ee6 100644
--- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup.xml
@@ -9,7 +9,6 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup">
         <arguments>
-            <argument name="payerName" defaultValue="MPI" type="string"/>
             <argument name="credentials" defaultValue="_CREDS"/>
         </arguments>
         <!--Check in-context-->
diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontLoginToPayPalPaymentFromCartActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontLoginToPayPalPaymentFromCartActionGroup.xml
index f627b9158f868..aa682cb7a3bb3 100644
--- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontLoginToPayPalPaymentFromCartActionGroup.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontLoginToPayPalPaymentFromCartActionGroup.xml
@@ -8,7 +8,10 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="StorefrontLoginToPayPalPaymentFromCartAccountActionGroup" extends="StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup">
+        <arguments>
+            <argument name="payerName" defaultValue="MPI" type="string"/>
+        </arguments>
         <seeElement selector="{{PayPalCheckoutAsGuestSection.CreditDebitBtn}}" stepKey="assertCheckoutAsGuest" before="waitForLoginForm"/>
-        <see userInput="{{payerName}}" selector="{{PayPalPaymentSection.userName}}" stepKey="seePayerName"/>
+        <see userInput="{{payerName}}" selector="{{PayPalPaymentSection.userName}}" stepKey="seePayerName" after="assertCheckoutAsGuest"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInProductPageTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInProductPageTest.xml
index 41578eed67625..53f9f8adf4d44 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInProductPageTest.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInProductPageTest.xml
@@ -79,9 +79,8 @@
         <actionGroup ref="SwitchToPayPalGroupBtnActionGroup" stepKey="clickPayPalBtn"/>
 
         <!--Login to Paypal in-context-->
-        <actionGroup ref="StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup" stepKey="LoginToPayPal">
-            <argument name="payerName" value="{{Payer.firstName}}"/>
-        </actionGroup>
+        <actionGroup ref="StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup" stepKey="LoginToPayPal"/>
+
         <!--Transfer Cart Line and Shipping Method assertion-->
         <actionGroup ref="PayPalAssertTransferLineAndShippingMethodNotExistActionGroup" stepKey="assertPayPalSettings"/>
 

From 82f5a3696c55e65387fc330749e7267dcc269cf1 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <viktor.sevch@transoftgroup.com>
Date: Tue, 16 Jun 2020 09:51:19 +0300
Subject: [PATCH 0464/1718] MC-35166: Admin user and user role pages are
 loading not correctly

---
 .../adminhtml/templates/widget/tabs.phtml     | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml
index 2346a619f4dc8..51183f733434e 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml
@@ -31,7 +31,7 @@
             <?php $_tabHref = $block->getTabUrl($_tab) == '#' ? '#' . $block->getTabId($_tab) . '_content' :
                 $block->getTabUrl($_tab) ?>
 
-            <li class="admin__page-nav-item" id="<?= $block->escapeHtmlAttr($block->getTabId($_tab)) ?>"
+            <li class="admin__page-nav-item no-display" id="<?= $block->escapeHtmlAttr($block->getTabId($_tab)) ?>"
                 <?= /* @noEscape */ $block->getUiId('tab', 'item', $_tab->getId()) ?>>
                 <a href="<?=  $block->escapeUrl($_tabHref) ?>"
                    id="<?=  $block->escapeHtmlAttr($block->getTabId($_tab)) ?>"
@@ -72,17 +72,27 @@
                     <?= /* @noEscape */ $block->getUiId('tab', 'content', $_tab->getId()) ?>>
                     <?= /* @noEscape */ $block->getTabContent($_tab) ?>
                 </div>
-                <?php if ($block->getTabIsHidden($_tab)): ?>
-                    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-                        'display:none',
-                        'li.admin__page-nav-item#' . $block->escapeJs($block->getTabId($_tab))
-                    ); ?>
-                <?php endif; ?>
                 <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
                     'display:none',
                     'div#' . $block->escapeJs($block->getTabId($_tab)) . '_content'
                 ); ?>
             </li>
+            <?php $scriptString = <<<script
+    require(['jquery'], function($){
+        'use strict';
+script;
+            if ($block->getTabIsHidden($_tab)):
+                $scriptString .= <<<script
+        $('li.admin__page-nav-item#{$block->escapeJs($block->getTabId($_tab))}').css('display', 'none');
+script;
+            endif;
+
+            $scriptString .= <<<script
+        $('li.admin__page-nav-item#{$block->escapeJs($block->getTabId($_tab))}').removeClass('no-display');
+    })
+script;
+            ?>
+            <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
         <?php endforeach; ?>
     </ul>
 </div>

From f6e2e294e7bb03de0502e78133ef7022bb126a89 Mon Sep 17 00:00:00 2001
From: Munkh-Ulzii Balidar <mbalidar@comwrap.com>
Date: Tue, 16 Jun 2020 11:20:19 +0200
Subject: [PATCH 0465/1718] 28584 fix dependency

---
 .../CatalogGraphQl/Model/AttributesJoiner.php | 46 ++++++++-----------
 .../Model/Resolver/Categories.php             |  5 +-
 .../Products/DataProvider/CategoryTree.php    | 28 ++++-------
 3 files changed, 32 insertions(+), 47 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/AttributesJoiner.php b/app/code/Magento/CatalogGraphQl/Model/AttributesJoiner.php
index ee00cdeb52c30..b7bdb6ddbb9d7 100644
--- a/app/code/Magento/CatalogGraphQl/Model/AttributesJoiner.php
+++ b/app/code/Magento/CatalogGraphQl/Model/AttributesJoiner.php
@@ -8,7 +8,6 @@
 namespace Magento\CatalogGraphQl\Model;
 
 use GraphQL\Language\AST\FieldNode;
-use GraphQL\Language\AST\FragmentSpreadNode;
 use GraphQL\Language\AST\InlineFragmentNode;
 use GraphQL\Language\AST\NodeKind;
 use Magento\Eav\Model\Entity\Collection\AbstractCollection;
@@ -34,11 +33,6 @@ class AttributesJoiner
      */
     private $fieldToAttributeMap = [];
 
-    /**
-     * @var ResolveInfo
-     */
-    private $resolverInfo = null;
-
     /**
      * @param array $fieldToAttributeMap
      */
@@ -52,11 +46,12 @@ public function __construct(array $fieldToAttributeMap = [])
      *
      * @param FieldNode $fieldNode
      * @param AbstractCollection $collection
+     * @param ResolveInfo $resolverInfo
      * @return void
      */
-    public function join(FieldNode $fieldNode, AbstractCollection $collection): void
+    public function join(FieldNode $fieldNode, AbstractCollection $collection, ResolveInfo $resolverInfo): void
     {
-        foreach ($this->getQueryFields($fieldNode) as $field) {
+        foreach ($this->getQueryFields($fieldNode, $resolverInfo) as $field) {
             $this->addFieldToCollection($collection, $field);
         }
     }
@@ -65,9 +60,10 @@ public function join(FieldNode $fieldNode, AbstractCollection $collection): void
      * Get an array of queried fields.
      *
      * @param FieldNode $fieldNode
+     * @param ResolveInfo $resolverInfo
      * @return string[]
      */
-    public function getQueryFields(FieldNode $fieldNode): array
+    public function getQueryFields(FieldNode $fieldNode, ResolveInfo $resolveInfo): array
     {
         if (null === $this->getFieldNodeSelections($fieldNode)) {
             $query = $fieldNode->selectionSet->selections;
@@ -75,12 +71,14 @@ public function getQueryFields(FieldNode $fieldNode): array
             /** @var FieldNode $field */
             foreach ($query as $field) {
                 if ($field->kind === NodeKind::INLINE_FRAGMENT) {
-                    $inlineFragmentFields = $this->addInlineFragmentFields($field);
+                    $inlineFragmentFields = $this->addInlineFragmentFields($resolveInfo, $field);
                     $selectedFields = array_merge($selectedFields, $inlineFragmentFields);
-                } elseif ($field->kind === NodeKind::FRAGMENT_SPREAD && isset($this->resolverInfo->fragments[$field->name->value])) {
-                    foreach ($this->resolverInfo->fragments[$field->name->value]->selectionSet->selections as $spreadNode) {
+                } elseif ($field->kind === NodeKind::FRAGMENT_SPREAD &&
+                    ($spreadFragmentNode = $resolveInfo->fragments[$field->name->value])) {
+
+                    foreach ($spreadFragmentNode->selectionSet->selections as $spreadNode) {
                         if (isset($spreadNode->selectionSet->selections)) {
-                            $fragmentSpreadFields = $this->getQueryFields($spreadNode);
+                            $fragmentSpreadFields = $this->getQueryFields($spreadNode, $resolveInfo);
                             $selectedFields = array_merge($selectedFields, $fragmentSpreadFields);
                         } else {
                             $selectedFields[] = $spreadNode->name->value;
@@ -90,7 +88,7 @@ public function getQueryFields(FieldNode $fieldNode): array
                     $selectedFields[] = $field->name->value;
                 }
             }
-            $this->setSelectionsForFieldNode($fieldNode, $selectedFields);
+            $this->setSelectionsForFieldNode($fieldNode, array_unique($selectedFields));
         }
 
         return $this->getFieldNodeSelections($fieldNode);
@@ -99,19 +97,23 @@ public function getQueryFields(FieldNode $fieldNode): array
     /**
      * Add fields from inline fragment nodes
      *
+     * @param ResolveInfo $resolveInfo
      * @param InlineFragmentNode $inlineFragmentField
      * @param array $inlineFragmentFields
      * @return string[]
      */
-    private function addInlineFragmentFields(InlineFragmentNode $inlineFragmentField, $inlineFragmentFields = [])
-    {
+    private function addInlineFragmentFields(
+        ResolveInfo $resolveInfo,
+        InlineFragmentNode $inlineFragmentField,
+        $inlineFragmentFields = []
+    ): array {
         $query = $inlineFragmentField->selectionSet->selections;
         /** @var FieldNode $field */
         foreach ($query as $field) {
             if ($field->kind === NodeKind::INLINE_FRAGMENT) {
-                $this->addInlineFragmentFields($field, $inlineFragmentFields);
+                $this->addInlineFragmentFields($resolveInfo, $field, $inlineFragmentFields);
             } elseif (isset($field->selectionSet->selections)) {
-                if (is_array($queryFields = $this->getQueryFields($field))) {
+                if (is_array($queryFields = $this->getQueryFields($field, $resolveInfo))) {
                     $inlineFragmentFields = array_merge($inlineFragmentFields, $queryFields);
                 }
             } else {
@@ -170,12 +172,4 @@ private function setSelectionsForFieldNode(FieldNode $fieldNode, array $selected
     {
         $this->queryFields[$fieldNode->name->value][$fieldNode->name->loc->start] = $selectedFields;
     }
-
-    /**
-     * @param ResolveInfo $resolverInfo
-     */
-    public function setResolverInfo(ResolveInfo $resolverInfo): void
-    {
-        $this->resolverInfo = $resolverInfo;
-    }
 }
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Categories.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Categories.php
index bc0eb2145fe34..d7118d71db89b 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Categories.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Categories.php
@@ -112,7 +112,6 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         $categoryIds = $this->productCategories->getCategoryIdsByProduct((int)$product->getId(), (int)$storeId);
         $this->categoryIds = array_merge($this->categoryIds, $categoryIds);
         $that = $this;
-        $that->attributesJoiner->setResolverInfo($info);
 
         return $this->valueFactory->create(
             function () use ($that, $categoryIds, $info) {
@@ -122,7 +121,7 @@ function () use ($that, $categoryIds, $info) {
                 }
 
                 if (!$this->collection->isLoaded()) {
-                    $that->attributesJoiner->join($info->fieldNodes[0], $this->collection);
+                    $that->attributesJoiner->join($info->fieldNodes[0], $this->collection, $info);
                     $this->collection->addIdFilter($this->categoryIds);
                 }
                 /** @var CategoryInterface | \Magento\Catalog\Model\Category $item */
@@ -131,7 +130,7 @@ function () use ($that, $categoryIds, $info) {
                         // Try to extract all requested fields from the loaded collection data
                         $categories[$item->getId()] = $this->categoryHydrator->hydrateCategory($item, true);
                         $categories[$item->getId()]['model'] = $item;
-                        $requestedFields = $that->attributesJoiner->getQueryFields($info->fieldNodes[0]);
+                        $requestedFields = $that->attributesJoiner->getQueryFields($info->fieldNodes[0], $info);
                         $extractedFields = array_keys($categories[$item->getId()]);
                         $foundFields = array_intersect($requestedFields, $extractedFields);
                         if (count($requestedFields) === count($foundFields)) {
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
index 649ecab9c5a0f..c553d4486f9e9 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php
@@ -54,11 +54,6 @@ class CategoryTree
      */
     private $metadata;
 
-    /**
-     * @var ResolveInfo
-     */
-    private $resolverInfo;
-
     /**
      * @param CollectionFactory $collectionFactory
      * @param AttributesJoiner $attributesJoiner
@@ -91,9 +86,7 @@ public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId): \Iterato
     {
         $categoryQuery = $resolveInfo->fieldNodes[0];
         $collection = $this->collectionFactory->create();
-        $this->resolverInfo = $resolveInfo;
-        $this->attributesJoiner->setResolverInfo($resolveInfo);
-        $this->joinAttributesRecursively($collection, $categoryQuery);
+        $this->joinAttributesRecursively($collection, $categoryQuery, $resolveInfo);
         $depth = $this->depthCalculator->calculate($resolveInfo, $categoryQuery);
         $level = $this->levelCalculator->calculate($rootCategoryId);
 
@@ -132,28 +125,27 @@ public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId): \Iterato
      *
      * @param Collection $collection
      * @param FieldNode $fieldNode
+     * @param ResolveInfo $resolveInfo
      * @return void
      */
-    private function joinAttributesRecursively(Collection $collection, FieldNode $fieldNode) : void
-    {
+    private function joinAttributesRecursively(
+        Collection $collection,
+        FieldNode $fieldNode,
+        ResolveInfo $resolveInfo
+    ): void {
         if (!isset($fieldNode->selectionSet->selections)) {
             return;
         }
 
         $subSelection = $fieldNode->selectionSet->selections;
-        $this->attributesJoiner->join($fieldNode, $collection);
+        $this->attributesJoiner->join($fieldNode, $collection, $resolveInfo);
 
         /** @var FieldNode $node */
         foreach ($subSelection as $node) {
-            if ($node->kind === NodeKind::INLINE_FRAGMENT) {
+            if ($node->kind === NodeKind::INLINE_FRAGMENT || $node->kind === NodeKind::FRAGMENT_SPREAD) {
                 continue;
-            } elseif ($node->kind === NodeKind::FRAGMENT_SPREAD && isset($this->resolverInfo->fragments[$node->name->value])) {
-                foreach ($this->resolverInfo->fragments[$node->name->value]->selectionSet->selections as $spreadNode) {
-                    $this->joinAttributesRecursively($collection, $spreadNode);
-                }
-            } else {
-                $this->joinAttributesRecursively($collection, $node);
             }
+            $this->joinAttributesRecursively($collection, $node, $resolveInfo);
         }
     }
 }

From 1e10e6cdf1bcdf0b185b9eb047910cb965d5d328 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <viktor.sevch@transoftgroup.com>
Date: Tue, 16 Jun 2020 12:31:54 +0300
Subject: [PATCH 0466/1718] MC-35195: Unexpected ";" character appears when
 loading the Home page

---
 .../view/frontend/templates/account/authentication-popup.phtml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml b/app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml
index edeaf5667b9cf..8355e229fe452 100644
--- a/app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml
@@ -9,7 +9,7 @@
 ?>
 <div id="authenticationPopup" data-bind="scope:'authenticationPopup', style: {display: 'none'}">
     <?php $scriptString = 'window.authenticationPopup = ' . /* @noEscape */ $block->getSerializedConfig(); ?>
-    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>;
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
     <!-- ko template: getTemplate() --><!-- /ko -->
     <script type="text/x-magento-init">
         {

From ce8752e5859bb95e680ef2467a18cf7f42e9e891 Mon Sep 17 00:00:00 2001
From: Serhii Balko <serhii.balko@transoftgroup.com>
Date: Tue, 16 Jun 2020 13:28:59 +0300
Subject: [PATCH 0467/1718] MC-35008: Quote doesn't expire at time set when
 updated_at table gets updated

---
 .../Quote/Model/ResourceModel/Quote.php       | 39 ++++++----
 .../Product/Plugin/UpdateQuoteItemsTest.php   | 78 +++++++++++++++++++
 2 files changed, 101 insertions(+), 16 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Quote/Model/Product/Plugin/UpdateQuoteItemsTest.php

diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote.php b/app/code/Magento/Quote/Model/ResourceModel/Quote.php
index 48945dacd1738..749e9944a6ad3 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote.php
@@ -230,7 +230,8 @@ public function subtractProductFromQuotes($product)
                 'items_qty' => new \Zend_Db_Expr(
                     $connection->quoteIdentifier('q.items_qty') . ' - ' . $connection->quoteIdentifier('qi.qty')
                 ),
-                'items_count' => new \Zend_Db_Expr($ifSql)
+                'items_count' => new \Zend_Db_Expr($ifSql),
+                'updated_at' => 'q.updated_at',
             ]
         )->join(
             ['qi' => $this->getTable('quote_item')],
@@ -277,21 +278,27 @@ public function markQuotesRecollect($productIds)
     {
         $tableQuote = $this->getTable('quote');
         $tableItem = $this->getTable('quote_item');
-        $subSelect = $this->getConnection()->select()->from(
-            $tableItem,
-            ['entity_id' => 'quote_id']
-        )->where(
-            'product_id IN ( ? )',
-            $productIds
-        )->group(
-            'quote_id'
-        );
-
-        $select = $this->getConnection()->select()->join(
-            ['t2' => $subSelect],
-            't1.entity_id = t2.entity_id',
-            ['trigger_recollect' => new \Zend_Db_Expr('1')]
-        );
+        $subSelect = $this->getConnection()
+            ->select()
+            ->from(
+                $tableItem,
+                ['entity_id' => 'quote_id']
+            )->where(
+                'product_id IN ( ? )',
+                $productIds
+            )->group(
+                'quote_id'
+            );
+        $select = $this->getConnection()
+            ->select()
+            ->join(
+                ['t2' => $subSelect],
+                't1.entity_id = t2.entity_id',
+                [
+                    'trigger_recollect' => new \Zend_Db_Expr('1'),
+                    'updated_at' => 't1.updated_at',
+                ]
+            );
         $updateQuery = $select->crossUpdateFromSelect(['t1' => $tableQuote]);
         $this->getConnection()->query($updateQuery);
 
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/Product/Plugin/UpdateQuoteItemsTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/Product/Plugin/UpdateQuoteItemsTest.php
new file mode 100644
index 0000000000000..3aadad7e9ebec
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/Product/Plugin/UpdateQuoteItemsTest.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model\Product\Plugin;
+
+use Magento\Catalog\Model\ProductRepository;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Quote\Model\GetQuoteByReservedOrderId;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Tests for update quote items plugin
+ *
+ * @magentoAppArea adminhtml
+ */
+class UpdateQuoteItemsTest extends TestCase
+{
+    /**
+     * @var GetQuoteByReservedOrderId
+     */
+    private $getQuoteByReservedOrderId;
+
+    /**
+     * @var ProductRepository
+     */
+    private $productRepository;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $objectManager = Bootstrap::getObjectManager();
+        $this->getQuoteByReservedOrderId = $objectManager->get(GetQuoteByReservedOrderId::class);
+        $this->productRepository = $objectManager->get(ProductRepository::class);
+    }
+
+    /**
+     * Test to mark the quote as need to recollect and doesn't update the field "updated_at" after change product price
+     *
+     * @magentoDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @return void
+     */
+    public function testMarkQuoteRecollectAfterChangeProductPrice(): void
+    {
+        $quote = $this->getQuoteByReservedOrderId->execute('test_order_with_simple_product_without_address');
+        $this->assertNotNull($quote);
+        $this->assertFalse((bool)$quote->getTriggerRecollect());
+        $this->assertNotEmpty($quote->getItems());
+        $quoteItem = current($quote->getItems());
+        $product = $quoteItem->getProduct();
+
+        $product->setPrice((float)$product->getPrice() + 10);
+        $this->productRepository->save($product);
+
+        /** @var AdapterInterface $connection */
+        $connection = $quote->getResource()->getConnection();
+        $select = $connection->select()
+            ->from(
+                $connection->getTableName('quote'),
+                ['updated_at', 'trigger_recollect']
+            )->where(
+                "reserved_order_id = 'test_order_with_simple_product_without_address'"
+            );
+
+        $quoteRow = $connection->fetchRow($select);
+        $this->assertNotEmpty($quoteRow);
+        $this->assertTrue((bool)$quoteRow['trigger_recollect']);
+        $this->assertEquals($quote->getUpdatedAt(), $quoteRow['updated_at']);
+    }
+}

From e125f004b8637efa8f26e578ae71afde1cf5d51e Mon Sep 17 00:00:00 2001
From: Marjan Petkovski <petkovski.marjan@gmail.com>
Date: Tue, 16 Jun 2020 13:02:18 +0200
Subject: [PATCH 0468/1718] magento/magento2#28580: False positive behavior of
 testQueryCustomAttributeField

Set attributeSetId on custom attribute creation.
---
 .../testsuite/Magento/GraphQl/Catalog/ProductViewTest.php  | 4 ++--
 .../_files/product_simple_with_custom_attribute.php        | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php
index 99fdfb2cf1b00..5b2a318c23ac2 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php
@@ -701,10 +701,10 @@ private function assertMediaGalleryEntries($product, $actualResponse)
      */
     private function assertCustomAttribute($actualResponse)
     {
-        $customAttribute = null;
+        $customAttribute = 'customAttributeValue';
         $this->assertEquals($customAttribute, $actualResponse['attribute_code_custom']);
     }
-    
+
     /**
      * @param ProductInterface $product
      * @param $actualResponse
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_attribute.php
index 4ed783100fa98..7c8ce4c63034d 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_custom_attribute.php
@@ -20,6 +20,9 @@
 $entityTypeId = $entityModel->setType(\Magento\Catalog\Model\Product::ENTITY)->getTypeId();
 $groupId = $installer->getDefaultAttributeGroupId($entityTypeId, $attributeSetId);
 
+/** @var \Magento\Catalog\Model\Product $product */
+$product = $productRepository->get('simple', true);
+
 /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
 $attribute = $objectManager->create(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class);
 $attribute->setAttributeCode(
@@ -30,6 +33,8 @@
     'text'
 )->setFrontendLabel(
     'custom_attributes_frontend_label'
+)->setAttributeSetId(
+    $product->getDefaultAttributeSetId()
 )->setAttributeGroupId(
     $groupId
 )->setIsFilterable(
@@ -40,8 +45,6 @@
     $attribute->getBackendTypeByInput($attribute->getFrontendInput())
 )->save();
 
-$product = $productRepository->get('simple', true);
-
 $product->setCustomAttribute($attribute->getAttributeCode(), 'customAttributeValue');
 
 $productRepository->save($product);

From 62fe3d4d232e991d5a21dbfbcb58bd8bb41e1c68 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <viktor.sevch@transoftgroup.com>
Date: Tue, 16 Jun 2020 14:13:46 +0300
Subject: [PATCH 0469/1718] MC-35191: The style of the PayPal express review
 page is broken

---
 .../Checkout/view/frontend/templates/total/default.phtml    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml b/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml
index 37e9ded4a3aa4..dbe8a2142e3f1 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml
@@ -39,5 +39,7 @@ $checkoutHelper = $block->getData('checkoutHelper');
         <?php endif; ?>
     </td>
 </tr>
-<?= /* @noEscape */ $secureRenderer->renderStyleAsTag($block->getTotal()->getStyle(), 'tr.totals th.mark') ?>
-<?= /* @noEscape */ $secureRenderer->renderStyleAsTag($block->getTotal()->getStyle(), 'tr.totals td.amount') ?>
+<?php if ($block->getTotal()->getStyle()): ?>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($block->getTotal()->getStyle(), 'tr.totals th.mark') ?>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($block->getTotal()->getStyle(), 'tr.totals td.amount') ?>
+<?php endif; ?>

From db84d3afad32c2e6a361a19ade83b86d8236469d Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Tue, 16 Jun 2020 14:20:46 +0300
Subject: [PATCH 0470/1718] MFTF test, updated testCaseId.

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

diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontAccountDownloadableProductLinkAfterPartialRefundTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontAccountDownloadableProductLinkAfterPartialRefundTest.xml
index 3659fd882c5d3..eaff4a5b116c3 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontAccountDownloadableProductLinkAfterPartialRefundTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontAccountDownloadableProductLinkAfterPartialRefundTest.xml
@@ -14,6 +14,7 @@
             <title value="My Account Downloadable Product Link after Partially Refunded"/>
             <description value="Verify that Downloadable product is not available in My Download Products tab after it has been partially refunded."/>
             <severity value="CRITICAL"/>
+            <testCaseId value="MC-35198"/>
             <group value="Downloadable"/>
         </annotations>
 

From 256806aabbb802a545393c07bc8b8135dc7126e9 Mon Sep 17 00:00:00 2001
From: Dmitriy Gallyamov <dmitrijs.gallamovs@gmail.com>
Date: Tue, 16 Jun 2020 16:48:31 +0300
Subject: [PATCH 0471/1718] magento/magento2#28628: GraphQL price range numeric
 values

- Fixed price range wildcard values and associated test cases
---
 .../Model/Layer/Filter/Price/Render.php       |  6 ++---
 .../Model/Layer/Filter/Price.php              | 25 +++++++++----------
 .../Aggregation/Builder/Dynamic.php           |  6 +----
 .../Category/Bundle/PriceFilterTest.php       |  2 +-
 .../Navigation/Category/PriceFilterTest.php   | 24 +++++++++---------
 .../Search/Dynamic/Algorithm/Improved.php     |  5 ++--
 6 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php b/app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php
index 77dedb9eb0121..59c0e11f7918b 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php
@@ -81,12 +81,10 @@ public function renderRangeData($range, $dbRanges)
         if (empty($dbRanges)) {
             return [];
         }
-        $lastIndex = array_keys($dbRanges);
-        $lastIndex = $lastIndex[count($lastIndex) - 1];
 
         foreach ($dbRanges as $index => $count) {
-            $fromPrice = $index == 1 ? '' : ($index - 1) * $range;
-            $toPrice = $index == $lastIndex ? '' : $index * $range;
+            $fromPrice = $index == 1 ? 0 : ($index - 1) * $range;
+            $toPrice = $index * $range;
             $this->itemDataBuilder->addItemData(
                 $this->renderRangeLabel($fromPrice, $toPrice),
                 $fromPrice . '-' . $toPrice,
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
index 332bb991bf29f..66ea2ac09505c 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
@@ -138,7 +138,7 @@ public function apply(\Magento\Framework\App\RequestInterface $request)
             $this->dataProvider->setPriorIntervals($priorFilters);
         }
 
-        list($from, $to) = $filter;
+        [$from, $to] = $filter;
 
         $this->getLayer()->getProductCollection()->addFieldToFilter(
             'price',
@@ -176,15 +176,16 @@ public function getCurrencyRate()
      *
      * @param float|string $fromPrice
      * @param float|string $toPrice
+     * @param boolean $isLast
      * @return float|\Magento\Framework\Phrase
      */
-    protected function _renderRangeLabel($fromPrice, $toPrice)
+    protected function _renderRangeLabel($fromPrice, $toPrice, $isLast = false)
     {
         $fromPrice = empty($fromPrice) ? 0 : $fromPrice * $this->getCurrencyRate();
         $toPrice = empty($toPrice) ? $toPrice : $toPrice * $this->getCurrencyRate();
 
         $formattedFromPrice = $this->priceCurrency->format($fromPrice);
-        if ($toPrice === '') {
+        if ($isLast) {
             return __('%1 and above', $formattedFromPrice);
         } elseif ($fromPrice == $toPrice && $this->dataProvider->getOnePriceIntervalValue()) {
             return $formattedFromPrice;
@@ -215,12 +216,15 @@ protected function _getItemsData()
 
         $data = [];
         if (count($facets) > 1) { // two range minimum
+            $lastFacet = array_key_last($facets);
             foreach ($facets as $key => $aggregation) {
                 $count = $aggregation['count'];
                 if (strpos($key, '_') === false) {
                     continue;
                 }
-                $data[] = $this->prepareData($key, $count, $data);
+
+                $isLast = $lastFacet === $key;
+                $data[] = $this->prepareData($key, $count, $isLast);
             }
         }
 
@@ -264,18 +268,13 @@ protected function getFrom($from)
      *
      * @param string $key
      * @param int $count
+     * @param boolean $isLast
      * @return array
      */
-    private function prepareData($key, $count)
+    private function prepareData($key, $count, $isLast = false)
     {
-        list($from, $to) = explode('_', $key);
-        if ($from == '*') {
-            $from = $this->getFrom($to);
-        }
-        if ($to == '*') {
-            $to = $this->getTo($to);
-        }
-        $label = $this->_renderRangeLabel($from, $to);
+        [$from, $to] = explode('_', $key);
+        $label = $this->_renderRangeLabel($from, $to, $isLast);
         $value = $from . '-' . $to . $this->dataProvider->getAdditionalRequestData();
 
         $data = [
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Dynamic.php b/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Dynamic.php
index 1e106023ea00d..ec9f007f70936 100644
--- a/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Dynamic.php
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Dynamic.php
@@ -77,11 +77,7 @@ private function prepareData($data)
     {
         $resultData = [];
         foreach ($data as $value) {
-            $from = is_numeric($value['from']) ? $value['from'] : '*';
-            $to = is_numeric($value['to']) ? $value['to'] : '*';
-            unset($value['from'], $value['to']);
-
-            $rangeName = "{$from}_{$to}";
+            $rangeName = "{$value['from']}_{$value['to']}";
             $resultData[$rangeName] = array_merge(['value' => $rangeName], $value);
         }
 
diff --git a/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/Bundle/PriceFilterTest.php b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/Bundle/PriceFilterTest.php
index dd4fdde250c03..b6508e3b3dfda 100644
--- a/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/Bundle/PriceFilterTest.php
+++ b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/Bundle/PriceFilterTest.php
@@ -53,7 +53,7 @@ public function testGetFilters(): void
             ['is_filterable' => '1'],
             [
                 ['label' => '$10.00 - $19.99', 'value' => '10-20', 'count' => 1],
-                ['label' => '$20.00 and above', 'value' => '20-', 'count' => 1],
+                ['label' => '$20.00 and above', 'value' => '20-30', 'count' => 1],
             ],
             'Category 1'
         );
diff --git a/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/PriceFilterTest.php b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/PriceFilterTest.php
index 3b2673b18635a..97928463620f4 100644
--- a/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/PriceFilterTest.php
+++ b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/PriceFilterTest.php
@@ -71,15 +71,15 @@ public function getFiltersDataProvider(): array
                 'expectation' => [
                     ['label' => '$10.00 - $19.99', 'value' => '10-20', 'count' => 1],
                     ['label' => '$20.00 - $29.99', 'value' => '20-30', 'count' => 1],
-                    ['label' => '$50.00 and above', 'value' => '50-', 'count' => 1],
+                    ['label' => '$50.00 and above', 'value' => '50-60', 'count' => 1],
                 ],
             ],
             'auto_calculation_variation_with_big_price_difference' => [
                 'config' => ['catalog/layered_navigation/price_range_calculation' => 'auto'],
                 'products_data' => ['simple1000' => 10.00, 'simple1001' => 20.00, 'simple1002' => 300.00],
                 'expectation' => [
-                    ['label' => '$0.00 - $99.99', 'value' => '-100', 'count' => 2],
-                    ['label' => '$300.00 and above', 'value' => '300-', 'count' => 1],
+                    ['label' => '$0.00 - $99.99', 'value' => '0-100', 'count' => 2],
+                    ['label' => '$300.00 and above', 'value' => '300-400', 'count' => 1],
                 ],
             ],
             'auto_calculation_variation_with_fixed_price_step' => [
@@ -88,7 +88,7 @@ public function getFiltersDataProvider(): array
                 'expectation' => [
                     ['label' => '$300.00 - $399.99', 'value' => '300-400', 'count' => 1],
                     ['label' => '$400.00 - $499.99', 'value' => '400-500', 'count' => 1],
-                    ['label' => '$500.00 and above', 'value' => '500-', 'count' => 1],
+                    ['label' => '$500.00 and above', 'value' => '500-600', 'count' => 1],
                 ],
             ],
             'improved_calculation_variation_with_small_price_difference' => [
@@ -98,8 +98,8 @@ public function getFiltersDataProvider(): array
                 ],
                 'products_data' => ['simple1000' => 10.00, 'simple1001' => 20.00, 'simple1002' => 50.00],
                 'expectation' => [
-                    ['label' => '$0.00 - $49.99', 'value' => '-50', 'count' => 2],
-                    ['label' => '$50.00 and above', 'value' => '50-', 'count' => 1],
+                    ['label' => '$0.00 - $19.99', 'value' => '0-20', 'count' => 1],
+                    ['label' => '$20.00 and above', 'value' => '20-50', 'count' => 2],
                 ],
             ],
             'improved_calculation_variation_with_big_price_difference' => [
@@ -109,8 +109,8 @@ public function getFiltersDataProvider(): array
                 ],
                 'products_data' => ['simple1000' => 10.00, 'simple1001' => 20.00, 'simple1002' => 300.00],
                 'expectation' => [
-                    ['label' => '$0.00 - $299.99', 'value' => '-300', 'count' => 2.0],
-                    ['label' => '$300.00 and above', 'value' => '300-', 'count' => 1.0],
+                    ['label' => '$0.00 - $19.99', 'value' => '0-20', 'count' => 1],
+                    ['label' => '$20.00 and above', 'value' => '20-300', 'count' => 2],
                 ],
             ],
             'manual_calculation_with_price_step_200' => [
@@ -121,7 +121,7 @@ public function getFiltersDataProvider(): array
                 'products_data' => ['simple1000' => 300.00, 'simple1001' => 300.00, 'simple1002' => 500.00],
                 'expectation' => [
                     ['label' => '$200.00 - $399.99', 'value' => '200-400', 'count' => 2],
-                    ['label' => '$400.00 and above', 'value' => '400-', 'count' => 1],
+                    ['label' => '$400.00 and above', 'value' => '400-600', 'count' => 1],
                 ],
             ],
             'manual_calculation_with_price_step_10' => [
@@ -132,7 +132,7 @@ public function getFiltersDataProvider(): array
                 'products_data' => ['simple1000' => 300.00, 'simple1001' => 300.00, 'simple1002' => 500.00],
                 'expectation' => [
                     ['label' => '$300.00 - $309.99', 'value' => '300-310', 'count' => 2],
-                    ['label' => '$500.00 and above', 'value' => '500-', 'count' => 1],
+                    ['label' => '$500.00 and above', 'value' => '500-510', 'count' => 1],
                 ],
             ],
             'manual_calculation_with_number_of_intervals_10' => [
@@ -145,7 +145,7 @@ public function getFiltersDataProvider(): array
                 'expectation' => [
                     ['label' => '$10.00 - $19.99', 'value' => '10-20', 'count' => 1],
                     ['label' => '$20.00 - $29.99', 'value' => '20-30', 'count' => 1],
-                    ['label' => '$30.00 and above', 'value' => '30-', 'count' => 1],
+                    ['label' => '$30.00 and above', 'value' => '30-40', 'count' => 1],
                 ],
             ],
             'manual_calculation_with_number_of_intervals_2' => [
@@ -157,7 +157,7 @@ public function getFiltersDataProvider(): array
                 'products_data' => ['simple1000' => 10.00, 'simple1001' => 20.00, 'simple1002' => 30.00],
                 'expectation' => [
                     ['label' => '$10.00 - $19.99', 'value' => '10-20', 'count' => 1],
-                    ['label' => '$20.00 and above', 'value' => '20-', 'count' => 2],
+                    ['label' => '$20.00 and above', 'value' => '20-30', 'count' => 2],
                 ],
             ],
         ];
diff --git a/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Improved.php b/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Improved.php
index a3e9ed61824ed..1639ee3d75428 100644
--- a/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Improved.php
+++ b/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Improved.php
@@ -64,13 +64,12 @@ public function getItems(
             $aggregations['count']
         );
 
-        $this->algorithm->setLimits($aggregations['min'], $aggregations['max'] + 0.01);
+        $this->algorithm->setLimits($aggregations['min'], $aggregations['max']);
 
         $interval = $this->dataProvider->getInterval($bucket, $dimensions, $entityStorage);
         $data = $this->algorithm->calculateSeparators($interval);
 
-        $data[0]['from'] = ''; // We should not calculate min and max value
-        $data[count($data) - 1]['to'] = '';
+        $data[0]['from'] = 0;
 
         $dataSize = count($data);
         for ($key = 0; $key < $dataSize; $key++) {

From e4c613223a00c82c2838ac2f4fdb47ff9675b2a4 Mon Sep 17 00:00:00 2001
From: Dmitriy Gallyamov <dmitrijs.gallamovs@gmail.com>
Date: Tue, 16 Jun 2020 17:48:55 +0300
Subject: [PATCH 0472/1718] magento/magento2#28628: GraphQL price range numeric
 values

- Code style fixes
---
 app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php    | 2 ++
 .../Elasticsearch/SearchAdapter/Aggregation/Builder/Dynamic.php | 2 +-
 .../Magento/Framework/Search/Dynamic/Algorithm/Improved.php     | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php b/app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php
index 59c0e11f7918b..3494fd00a8b6c 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php
@@ -72,6 +72,8 @@ public function renderRangeLabel($fromPrice, $toPrice)
     }
 
     /**
+     * Prepare range data
+     *
      * @param int $range
      * @param int[] $dbRanges
      * @return array
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Dynamic.php b/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Dynamic.php
index ec9f007f70936..f4b55ce43c421 100644
--- a/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Dynamic.php
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Dynamic.php
@@ -35,7 +35,7 @@ public function __construct(Repository $algorithmRepository, EntityStorageFactor
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function build(
         RequestBucketInterface $bucket,
diff --git a/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Improved.php b/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Improved.php
index 1639ee3d75428..c4f6c67200b2b 100644
--- a/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Improved.php
+++ b/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Improved.php
@@ -44,7 +44,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getItems(
         BucketInterface $bucket,

From 886718514a4569351414187fc071646c109fbd46 Mon Sep 17 00:00:00 2001
From: Dmitriy Gallyamov <dmitrijs.gallamovs@gmail.com>
Date: Tue, 16 Jun 2020 17:53:09 +0300
Subject: [PATCH 0473/1718] magento/magento2#28628: GraphQL price range numeric
 values

- Fixed tests
---
 .../Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php
index c5b9089acd91c..0595b667f4ee8 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Dynamic/DataProviderTest.php
@@ -390,13 +390,13 @@ public function testPrepareData()
     {
         $expectedResult = [
             [
-                'from' => '',
+                'from' => 0,
                 'to' => 10,
                 'count' => 1,
             ],
             [
                 'from' => 10,
-                'to' => '',
+                'to' => 20,
                 'count' => 1,
             ],
         ];

From 27ad26995cdd253f622cf212085da31cd79f2fb2 Mon Sep 17 00:00:00 2001
From: Peter Dohogne <pdohogne@magento.com>
Date: Tue, 16 Jun 2020 10:11:30 -0500
Subject: [PATCH 0474/1718] MC-35047: Updating to magento/composer 1.6.0

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

diff --git a/composer.json b/composer.json
index 9a4cff5a652dd..76e179d5e8e89 100644
--- a/composer.json
+++ b/composer.json
@@ -64,7 +64,7 @@
         "laminas/laminas-uri": "^2.5.1",
         "laminas/laminas-validator": "^2.6.0",
         "laminas/laminas-view": "~2.11.2",
-        "magento/composer": "1.6.x-dev",
+        "magento/composer": "1.6.0",
         "magento/magento-composer-installer": ">=0.1.11",
         "magento/zendframework1": "~1.14.2",
         "monolog/monolog": "^1.17",
diff --git a/composer.lock b/composer.lock
index 53cb6bcbf59ac..c31bff6466d8d 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": "0675947ee8db6a44dc6efe0672f43fd3",
+    "content-hash": "c6003e70c11db07e1adeb97615c349ab",
     "packages": [
         {
             "name": "colinmollenhour/cache-backend-file",
@@ -1333,12 +1333,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"
         },
         {
@@ -3288,26 +3282,20 @@
                 "laminas",
                 "zf"
             ],
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
             "time": "2020-05-20T16:45:56+00:00"
         },
         {
             "name": "magento/composer",
-            "version": "1.6.x-dev",
+            "version": "1.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/magento/composer.git",
-                "reference": "f3e4bec8fc73a97a6cbc391b1b93d4c32566763d"
+                "reference": "fcc66f535d631788f2ba160ff547357086d9b2c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/magento/composer/zipball/f3e4bec8fc73a97a6cbc391b1b93d4c32566763d",
-                "reference": "f3e4bec8fc73a97a6cbc391b1b93d4c32566763d",
+                "url": "https://api.github.com/repos/magento/composer/zipball/fcc66f535d631788f2ba160ff547357086d9b2c9",
+                "reference": "fcc66f535d631788f2ba160ff547357086d9b2c9",
                 "shasum": ""
             },
             "require": {
@@ -3330,7 +3318,7 @@
                 "AFL-3.0"
             ],
             "description": "Magento composer library helps to instantiate Composer application and run composer commands.",
-            "time": "2020-05-08T01:07:09+00:00"
+            "time": "2020-06-15T17:52:31+00:00"
         },
         {
             "name": "magento/magento-composer-installer",
@@ -3533,16 +3521,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"
         },
         {
@@ -4205,11 +4183,6 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Ben Ramsey",
-                    "email": "ben@benramsey.com",
-                    "homepage": "https://benramsey.com"
-                },
                 {
                     "name": "Marijn Huizendveld",
                     "email": "marijn.huizendveld@gmail.com"
@@ -4217,6 +4190,11 @@
                 {
                     "name": "Thibaud Fabre",
                     "email": "thibaud@aztech.io"
+                },
+                {
+                    "name": "Ben Ramsey",
+                    "email": "ben@benramsey.com",
+                    "homepage": "https://benramsey.com"
                 }
             ],
             "description": "Formerly rhumsaa/uuid. A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).",
@@ -4850,20 +4828,6 @@
                 "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-05-12T16:14:59+00:00"
         },
         {
@@ -4926,20 +4890,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"
         },
         {
@@ -4999,20 +4949,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"
         },
         {
@@ -5068,20 +5004,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"
         },
         {
@@ -5140,20 +5062,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"
         },
         {
@@ -5216,20 +5124,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"
         },
         {
@@ -6740,20 +6634,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"
         },
         {
@@ -6877,20 +6757,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"
         },
         {
@@ -6953,20 +6819,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"
         },
         {
@@ -7316,12 +7168,6 @@
                 "sftp",
                 "storage"
             ],
-            "funding": [
-                {
-                    "url": "https://offset.earth/frankdejonge",
-                    "type": "other"
-                }
-            ],
             "time": "2020-05-18T15:13:39+00:00"
         },
         {
@@ -8655,6 +8501,12 @@
                 "filesystem",
                 "iterator"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-04-18T05:02:12+00:00"
         },
         {
@@ -8940,16 +8792,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"
         },
         {
@@ -9090,6 +8932,12 @@
             ],
             "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-04-30T05:58:10+00:00"
         },
         {
@@ -9255,12 +9103,6 @@
                 "unidiff",
                 "unified diff"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-05-08T05:01:12+00:00"
         },
         {
@@ -9314,6 +9156,12 @@
                 "environment",
                 "hhvm"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-04-14T13:36:52+00:00"
         },
         {
@@ -10154,20 +10002,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"
         },
         {
@@ -10449,20 +10283,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"
         },
         {
@@ -10980,7 +10800,6 @@
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "magento/composer": 20,
         "magento/magento2-functional-testing-framework": 5
     },
     "prefer-stable": true,

From 8a0ad511a44721dec4eed72b922d9c95ea80ba94 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <viktor.sevch@transoftgroup.com>
Date: Tue, 16 Jun 2020 20:33:56 +0300
Subject: [PATCH 0475/1718] =?UTF-8?q?MC-35197:=20Unexpected=20loading=20of?=
 =?UTF-8?q?=20the=20=E2=80=9CCreate=20New=20Order=E2=80=9D=20page=20in=20t?=
 =?UTF-8?q?he=20Magento=20Admin=20panel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../view/adminhtml/templates/popup.phtml      | 22 ++++++---
 .../templates/order/create/form.phtml         | 46 +++++++++++++------
 2 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml
index 397b4db4d811f..746044c2ae553 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml
@@ -8,7 +8,7 @@
 ?>
 
 <?php if ($block->getChildHtml()):?>
-<div id="gift_options_configure_new" class="gift-options-popup product-configure-popup">
+<div id="gift_options_configure_new" class="gift-options-popup product-configure-popup no-display">
     <div id="gift_options_form_contents">
         <div class="content">
             <?= $block->getChildHtml() ?>
@@ -23,11 +23,21 @@
         </div>
     </div>
 </div>
-    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display: none;", 'div#gift_options_configure_new') ?>
-<div id="giftoptions_tooltip_window" class="gift-options-tooltip">
-    <div id="giftoptions_tooltip_window_content">&nbsp;</div>
-</div>
-    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display: none;", 'div#giftoptions_tooltip_window') ?>
+    <div id="giftoptions_tooltip_window" class="gift-options-tooltip">
+        <div id="giftoptions_tooltip_window_content">&nbsp;</div>
+    </div>
+    <?php $scriptString = <<<script
+    require(['jquery'], function($){
+        'use strict';
+        $('div#gift_options_configure_new').css('display', 'none');
+        $('div#gift_options_configure_new').removeClass('no-display');
+
+        $('div#giftoptions_tooltip_window').css('display', 'none');
+        $('div#giftoptions_tooltip_window').removeClass('no-display');
+    });
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
     <?php $scriptString = <<<script
 require([
     "Magento_Sales/order/create/giftmessage",
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form.phtml
index 4f1ee1f93c02c..80749b9c55a4b 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form.phtml
@@ -14,25 +14,41 @@
     <div id="order-message">
         <?= $block->getChildHtml('message') ?>
     </div>
-    <div id="order-customer-selector" class="fieldset-wrapper order-customer-selector">
+    <div id="order-customer-selector" class="fieldset-wrapper order-customer-selector no-display">
         <?= $block->getChildHtml('customer.grid.container') ?>
     </div>
-    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-        'display:' . /* @noEscape */ $block->getCustomerSelectorDisplay(),
-        'div#order-customer-selector'
-    ) ?>
-    <div id="order-store-selector" class="fieldset-wrapper">
+    <div id="order-store-selector" class="fieldset-wrapper no-display">
         <?= $block->getChildHtml('store') ?>
     </div>
-    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-        'display:' . /* @noEscape */ $block->getStoreSelectorDisplay(),
-        'div#order-store-selector'
-    ) ?>
-    <div id="order-data">
+    <div id="order-data" class="no-display">
         <?= $block->getChildHtml('data') ?>
     </div>
-    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-        'display:' . /* @noEscape */ $block->getDataSelectorDisplay(),
-        'div#order-data'
-    ) ?>
 </form>
+<?php $scriptString = <<<script
+require(['jquery'], function($){
+    'use strict';
+
+script;
+if ($block->getCustomerSelectorDisplay()) {
+    $scriptString .= <<<script
+    $('div#order-customer-selector').css('display', '{$block->getCustomerSelectorDisplay()}');
+    $('div#order-customer-selector').removeClass('no-display');
+script;
+}
+if ($block->getStoreSelectorDisplay()) {
+    $scriptString .= <<<script
+    $('div#order-store-selector').css('display', '{$block->getStoreSelectorDisplay()}');
+    $('div#order-store-selector').removeClass('no-display');
+script;
+}
+if ($block->getDataSelectorDisplay()) {
+    $scriptString .= <<<script
+    $('div#order-data').css('display', '{$block->getDataSelectorDisplay()}');
+    $('div#order-data').removeClass('no-display');
+script;
+}
+$scriptString .= <<<script
+});
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>

From 64b806ffd2ef7f9fdf90efe927541f6c27d8db42 Mon Sep 17 00:00:00 2001
From: Oleksandr Melnyk <sasha19957099@gmail.com>
Date: Tue, 16 Jun 2020 21:59:15 +0300
Subject: [PATCH 0476/1718] magento/magento2#28579:DependencyTest does not
 analyze GraphQL schema files - added tests and missing dependency for
 SwatchesGraphQl module

---
 .../Magento/SwatchesGraphQl/composer.json     |   4 +-
 composer.lock                                 |   2 +-
 .../DeclarativeSchemaDependencyProvider.php   | 179 +--------------
 .../Dependency/DependencyProvider.php         | 205 ++++++++++++++++++
 .../GraphQlSchemaDependencyProvider.php       | 141 ++++++++++++
 .../Magento/Test/Integrity/DependencyTest.php |   5 +-
 .../Test/Integrity/GraphQlDependencyTest.php  | 123 +++++++++++
 .../GraphQlSchemaStitching/GraphQlReader.php  |  63 +++++-
 8 files changed, 538 insertions(+), 184 deletions(-)
 create mode 100644 dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DependencyProvider.php
 create mode 100644 dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/GraphQlSchemaDependencyProvider.php
 create mode 100644 dev/tests/static/testsuite/Magento/Test/Integrity/GraphQlDependencyTest.php

diff --git a/app/code/Magento/SwatchesGraphQl/composer.json b/app/code/Magento/SwatchesGraphQl/composer.json
index 383575302e6ae..1b98b4044a2ff 100644
--- a/app/code/Magento/SwatchesGraphQl/composer.json
+++ b/app/code/Magento/SwatchesGraphQl/composer.json
@@ -6,9 +6,7 @@
         "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-swatches": "*",
-        "magento/module-catalog": "*"
-    },
-    "suggest": {
+        "magento/module-catalog": "*",
         "magento/module-catalog-graph-ql": "*"
     },
     "license": [
diff --git a/composer.lock b/composer.lock
index 6a47e7e44ab69..6a6c945b6416b 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": "e86af25d9a4a1942c437cca58f9f1efb",
+    "content-hash": "f3674961f96b48fdd025a6c94610c8eb",
     "packages": [
         {
             "name": "colinmollenhour/cache-backend-file",
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php
index 965bc6184144b..332e1b88a53fe 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php
@@ -17,23 +17,8 @@
  *
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  */
-class DeclarativeSchemaDependencyProvider
+class DeclarativeSchemaDependencyProvider extends DependencyProvider
 {
-    /**
-     * Types of dependency between modules.
-     */
-    const TYPE_HARD = 'hard';
-
-    /**
-     * The identifier of dependency for mapping.
-     */
-    const MAP_TYPE_DECLARED = 'declared';
-
-    /**
-     * The identifier of dependency for mapping.
-     */
-    const MAP_TYPE_FOUND = 'found';
-
     /**
      * Declarative name for table entity of the declarative schema.
      */
@@ -54,21 +39,11 @@ class DeclarativeSchemaDependencyProvider
      */
     const SCHEMA_ENTITY_INDEX = 'index';
 
-    /**
-     * @var array
-     */
-    private $mapDependencies = [];
-
     /**
      * @var array
      */
     private $dbSchemaDeclaration = [];
 
-    /**
-     * @var array
-     */
-    private $packageModuleMapping = [];
-
     /**
      * @var array
      */
@@ -145,42 +120,6 @@ private function getSchemaFileNameByModuleName(string $module): string
         return $this->moduleSchemaFileMapping[$module] ?? '';
     }
 
-    /**
-     * Initialise map of dependencies.
-     *
-     * @throws \Exception
-     */
-    private function initDeclaredDependencies()
-    {
-        if (empty($this->mapDependencies)) {
-            $jsonFiles = Files::init()->getComposerFiles(ComponentRegistrar::MODULE, false);
-            foreach ($jsonFiles as $file) {
-                $json = new \Magento\Framework\Config\Composer\Package($this->readJsonFile($file));
-                $moduleName = $this->convertModuleName($json->get('name'));
-                $require = array_keys((array)$json->get('require'));
-                $this->presetDependencies($moduleName, $require, self::TYPE_HARD);
-            }
-        }
-    }
-
-    /**
-     * Read data from json file.
-     *
-     * @param string $file
-     * @return mixed
-     * @throws \Exception
-     */
-    private function readJsonFile(string $file, bool $asArray = false)
-    {
-        $decodedJson = json_decode(file_get_contents($file), $asArray);
-        if (null == $decodedJson) {
-            //phpcs:ignore Magento2.Exceptions.DirectThrow
-            throw new \Exception("Invalid Json: $file");
-        }
-
-        return $decodedJson;
-    }
-
     /**
      * Remove self dependencies.
      *
@@ -629,74 +568,6 @@ private function collectDependency(
         }
     }
 
-    /**
-     * Add dependencies to dependency list.
-     *
-     * @param string $moduleName
-     * @param array $packageNames
-     * @param string $type
-     *
-     * @return void
-     * @throws \Exception
-     */
-    private function presetDependencies(
-        string $moduleName,
-        array $packageNames,
-        string $type
-    ): void {
-        $packageNames = array_filter($packageNames, function ($packageName) {
-            return $this->getModuleName($packageName) ||
-                0 === strpos($packageName, 'magento/') && 'magento/magento-composer-installer' != $packageName;
-        });
-
-        foreach ($packageNames as $packageName) {
-            $this->addDependencies(
-                $moduleName,
-                $type,
-                self::MAP_TYPE_DECLARED,
-                [$this->convertModuleName($packageName)]
-            );
-        }
-    }
-
-    /**
-     * Returns package name on module name mapping.
-     *
-     * @return array
-     * @throws \Exception
-     */
-    private function getPackageModuleMapping(): array
-    {
-        if (!$this->packageModuleMapping) {
-            $jsonFiles = Files::init()->getComposerFiles(ComponentRegistrar::MODULE, false);
-
-            $packageModuleMapping = [];
-            foreach ($jsonFiles as $file) {
-                $moduleXml = simplexml_load_file(dirname($file) . '/etc/module.xml');
-                $moduleName = str_replace('_', '\\', (string)$moduleXml->module->attributes()->name);
-                $composerJson = $this->readJsonFile($file);
-                $packageName = $composerJson->name;
-                $packageModuleMapping[$packageName] = $moduleName;
-            }
-
-            $this->packageModuleMapping = $packageModuleMapping;
-        }
-
-        return $this->packageModuleMapping;
-    }
-
-    /**
-     * Retrieve Magento style module name.
-     *
-     * @param string $packageName
-     * @return null|string
-     * @throws \Exception
-     */
-    private function getModuleName(string $packageName): ?string
-    {
-        return $this->getPackageModuleMapping()[$packageName] ?? null;
-    }
-
     /**
      * Retrieve array of dependency items.
      *
@@ -705,54 +576,8 @@ private function getModuleName(string $packageName): ?string
      * @param $mapType
      * @return array
      */
-    private function getDeclaredDependencies(string $module, string $type, string $mapType)
+    protected function getDeclaredDependencies(string $module, string $type, string $mapType)
     {
         return $this->mapDependencies[$module][$type][$mapType] ?? [];
     }
-
-    /**
-     * Add dependency map items.
-     *
-     * @param $module
-     * @param $type
-     * @param $mapType
-     * @param $dependencies
-     */
-    protected function addDependencies(string $module, string $type, string $mapType, array $dependencies)
-    {
-        $this->mapDependencies[$module][$type][$mapType] = array_merge_recursive(
-            $this->getDeclaredDependencies($module, $type, $mapType),
-            $dependencies
-        );
-    }
-
-    /**
-     * Converts a composer json component name into the Magento Module form.
-     *
-     * @param string $jsonName The name of a composer json component or dependency e.g. 'magento/module-theme'
-     * @return string The corresponding Magento Module e.g. 'Magento\Theme'
-     * @throws \Exception
-     */
-    private function convertModuleName(string $jsonName): string
-    {
-        $moduleName = $this->getModuleName($jsonName);
-        if ($moduleName) {
-            return $moduleName;
-        }
-
-        if (strpos($jsonName, 'magento/magento') !== false
-            || strpos($jsonName, 'magento/framework') !== false
-        ) {
-            $moduleName = str_replace('/', "\t", $jsonName);
-            $moduleName = str_replace('framework-', "Framework\t", $moduleName);
-            $moduleName = str_replace('-', ' ', $moduleName);
-            $moduleName = ucwords($moduleName);
-            $moduleName = str_replace("\t", '\\', $moduleName);
-            $moduleName = str_replace(' ', '', $moduleName);
-        } else {
-            $moduleName = $jsonName;
-        }
-
-        return $moduleName;
-    }
 }
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DependencyProvider.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DependencyProvider.php
new file mode 100644
index 0000000000000..a29e39a31b9e5
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DependencyProvider.php
@@ -0,0 +1,205 @@
+<?php
+
+namespace Magento\Test\Integrity\Dependency;
+
+use Magento\Framework\App\Utility\Files;
+use Magento\Framework\Component\ComponentRegistrar;
+
+abstract class DependencyProvider
+{
+    /**
+     * Types of dependency between modules.
+     */
+    const TYPE_HARD = 'hard';
+
+    /**
+     * The identifier of dependency for mapping.
+     */
+    const MAP_TYPE_DECLARED = 'declared';
+
+    /**
+     * The identifier of dependency for mapping.
+     */
+    const MAP_TYPE_FOUND = 'found';
+
+    /**
+     * @var array
+     */
+    protected $mapDependencies = [];
+
+    /**
+     * @var array
+     */
+    protected $packageModuleMapping = [];
+
+    /**
+     * Retrieve array of dependency items.
+     *
+     * @param $module
+     * @param $type
+     * @param $mapType
+     * @return array
+     */
+    abstract protected function getDeclaredDependencies(string $module, string $type, string $mapType);
+
+    /**
+     * @param string $moduleName
+     * @return array
+     */
+    abstract public function getDeclaredExistingModuleDependencies(string $moduleName): array;
+
+    /**
+     * @param string $moduleName
+     * @return array
+     */
+    abstract public function getUndeclaredModuleDependencies(string $moduleName): array;
+
+    /**
+     * Initialise map of dependencies.
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    protected function initDeclaredDependencies()
+    {
+        if (empty($this->mapDependencies)) {
+            $jsonFiles = Files::init()->getComposerFiles(ComponentRegistrar::MODULE, false);
+            foreach ($jsonFiles as $file) {
+                $json = new \Magento\Framework\Config\Composer\Package($this->readJsonFile($file));
+                $moduleName = $this->convertModuleName($json->get('name'));
+                $require = array_keys((array)$json->get('require'));
+                $this->presetDependencies($moduleName, $require, self::TYPE_HARD);
+            }
+        }
+    }
+
+    /**
+     * Add dependencies to dependency list.
+     *
+     * @param string $moduleName
+     * @param array $packageNames
+     * @param string $type
+     *
+     * @return void
+     * @throws \Exception
+     */
+    protected function presetDependencies(
+        string $moduleName,
+        array $packageNames,
+        string $type
+    ): void
+    {
+        $packageNames = array_filter($packageNames, function ($packageName) {
+            return $this->getModuleName($packageName) ||
+                0 === strpos($packageName, 'magento/') && 'magento/magento-composer-installer' != $packageName;
+        });
+
+        foreach ($packageNames as $packageName) {
+            $this->addDependencies(
+                $moduleName,
+                $type,
+                self::MAP_TYPE_DECLARED,
+                [$this->convertModuleName($packageName)]
+            );
+        }
+    }
+
+    /**
+     * @param string $jsonName
+     * @return string
+     * @throws \Exception
+     */
+    protected function convertModuleName(string $jsonName): string
+    {
+        $moduleName = $this->getModuleName($jsonName);
+        if ($moduleName) {
+            return $moduleName;
+        }
+
+        if (strpos($jsonName, 'magento/magento') !== false
+            || strpos($jsonName, 'magento/framework') !== false
+        ) {
+            $moduleName = str_replace('/', "\t", $jsonName);
+            $moduleName = str_replace('framework-', "Framework\t", $moduleName);
+            $moduleName = str_replace('-', ' ', $moduleName);
+            $moduleName = ucwords($moduleName);
+            $moduleName = str_replace("\t", '\\', $moduleName);
+            $moduleName = str_replace(' ', '', $moduleName);
+        } else {
+            $moduleName = $jsonName;
+        }
+
+        return $moduleName;
+    }
+
+    /**
+     * Read data from json file.
+     *
+     * @param string $file
+     * @return mixed
+     * @throws \Exception
+     */
+    protected function readJsonFile(string $file, bool $asArray = false)
+    {
+        $decodedJson = json_decode(file_get_contents($file), $asArray);
+        if (null == $decodedJson) {
+            //phpcs:ignore Magento2.Exceptions.DirectThrow
+            throw new \Exception("Invalid Json: $file");
+        }
+
+        return $decodedJson;
+    }
+
+    /**
+     * Retrieve Magento style module name.
+     *
+     * @param string $packageName
+     * @return null|string
+     * @throws \Exception
+     */
+    protected function getModuleName(string $packageName): ?string
+    {
+        return $this->getPackageModuleMapping()[$packageName] ?? null;
+    }
+
+    /**
+     * Returns package name on module name mapping.
+     *
+     * @return array
+     * @throws \Exception
+     */
+    protected function getPackageModuleMapping(): array
+    {
+        if (!$this->packageModuleMapping) {
+            $jsonFiles = Files::init()->getComposerFiles(ComponentRegistrar::MODULE, false);
+
+            $packageModuleMapping = [];
+            foreach ($jsonFiles as $file) {
+                $moduleXml = simplexml_load_file(dirname($file) . '/etc/module.xml');
+                $moduleName = str_replace('_', '\\', (string)$moduleXml->module->attributes()->name);
+                $composerJson = $this->readJsonFile($file);
+                $packageName = $composerJson->name;
+                $packageModuleMapping[$packageName] = $moduleName;
+            }
+
+            $this->packageModuleMapping = $packageModuleMapping;
+        }
+
+        return $this->packageModuleMapping;
+    }
+
+    /**
+     * Add dependency map items.
+     *
+     * @param $module
+     * @param $type
+     * @param $mapType
+     * @param $dependencies
+     */
+    protected function addDependencies(string $module, string $type, string $mapType, array $dependencies)
+    {
+        $this->mapDependencies[$module][$type][$mapType] = array_merge_recursive(
+            $this->getDeclaredDependencies($module, $type, $mapType),
+            $dependencies
+        );
+    }
+}
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/GraphQlSchemaDependencyProvider.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/GraphQlSchemaDependencyProvider.php
new file mode 100644
index 0000000000000..f210813c797c4
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/GraphQlSchemaDependencyProvider.php
@@ -0,0 +1,141 @@
+<?php
+
+namespace Magento\Test\Integrity\Dependency;
+
+use Magento\Framework\App\Bootstrap;
+
+/**
+ * Class GraphQlSchemaDependencyProvider
+ * @package Magento\Test\Integrity\Dependency
+ */
+class GraphQlSchemaDependencyProvider extends DependencyProvider
+{
+    /**
+     * @var array
+     */
+    private $parsedSchema = [];
+
+    /**
+     * GraphQlSchemaDependencyProvider constructor.
+     */
+    public function __construct()
+    {
+        $this->getGraphQlSchemaDeclaration();
+    }
+
+    /**
+     * Provide declared dependencies between modules based on the declarative schema configuration.
+     *
+     * @param string $moduleName
+     * @return array
+     * @throws \Exception
+     */
+    public function getDeclaredExistingModuleDependencies(string $moduleName): array
+    {
+        $this->initDeclaredDependencies();
+        $dependencies = $this->getDependenciesFromSchema($moduleName);
+        $declared = $this->getDeclaredDependencies($moduleName, self::TYPE_HARD, self::MAP_TYPE_DECLARED);
+        return array_unique(array_values(array_intersect($declared, $dependencies)));
+    }
+
+    /**
+     * Provide undeclared dependencies between modules based on the declarative schema configuration.
+     *
+     * [
+     *     $dependencyId => [$module1, $module2, $module3 ...],
+     *     ...
+     * ]
+     *
+     * @param string $moduleName
+     * @return array
+     * @throws \Exception
+     */
+    public function getUndeclaredModuleDependencies(string $moduleName): array
+    {
+        $this->initDeclaredDependencies();
+        $dependencies = $this->getDependenciesFromSchema($moduleName);
+        return $this->collectDependencies($moduleName, $dependencies);
+    }
+
+    /**
+     * Retrieve array of dependency items.
+     *
+     * @param $module
+     * @param $type
+     * @param $mapType
+     * @return array
+     */
+    protected function getDeclaredDependencies(string $module, string $type, string $mapType): array
+    {
+        return $this->mapDependencies[$module][$type][$mapType] ?? [];
+    }
+
+    /**
+     * Get parsed GraphQl schema
+     *
+     * @return array
+     */
+    private function getGraphQlSchemaDeclaration(): array
+    {
+        if (!$this->parsedSchema) {
+            $objectManager = Bootstrap::create(BP, $_SERVER)->getObjectManager();
+            $reader = $objectManager->create(\Magento\Framework\GraphQlSchemaStitching\GraphQlReader::class);
+            $this->parsedSchema = $reader->read();
+        }
+
+        return $this->parsedSchema;
+    }
+
+    /**
+     * Get dependencies from GraphQl schema
+     *
+     * @param string $moduleName
+     * @return array
+     */
+    private function getDependenciesFromSchema(string $moduleName): array
+    {
+        $schema = $this->parsedSchema;
+
+        $dependencies = [];
+
+        foreach ($schema as $typeName => $type) {
+            if (isset($type['module']) && $type['module'] == $moduleName && isset($type['implements'])) {
+                foreach ($type['implements'] as $interfaceName => $interfaceData) {
+                    $dependOnModule = $schema[$interfaceName]['module'];
+                    if ($dependOnModule != $moduleName) {
+                        $dependencies[] = $dependOnModule;
+                    }
+                }
+
+            }
+        }
+        return array_unique($dependencies);
+    }
+
+    /**
+     * Collect module dependencies.
+     *
+     * @param string $currentModuleName
+     * @param array $dependencies
+     * @return array
+     */
+    private function collectDependencies(string $currentModuleName, array $dependencies = []): array
+    {
+        if (empty($dependencies)) {
+            return [];
+        }
+        $declared = $this->getDeclaredDependencies($currentModuleName, self::TYPE_HARD, self::MAP_TYPE_DECLARED);
+        $checkResult = array_intersect($declared, $dependencies);
+
+        if (empty($checkResult)) {
+            $this->addDependencies(
+                $currentModuleName,
+                self::TYPE_HARD,
+                self::MAP_TYPE_FOUND,
+                [$currentModuleName => $dependencies]
+            );
+        }
+
+        return $this->getDeclaredDependencies($currentModuleName, self::TYPE_HARD, self::MAP_TYPE_FOUND);
+    }
+}
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
index 6711de91200dd..5653069564e99 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
@@ -12,6 +12,7 @@
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Test\Integrity\Dependency\DeclarativeSchemaDependencyProvider;
+use Magento\Test\Integrity\Dependency\GraphQlSchemaDependencyProvider;
 use Magento\TestFramework\Dependency\DbRule;
 use Magento\TestFramework\Dependency\DiRule;
 use Magento\TestFramework\Dependency\LayoutRule;
@@ -783,6 +784,7 @@ function (&$moduleName) {
     public function collectRedundant()
     {
         $schemaDependencyProvider = new DeclarativeSchemaDependencyProvider();
+        $graphQlSchemaDependencyProvider = new GraphQlSchemaDependencyProvider();
 
         foreach (array_keys(self::$mapDependencies) as $module) {
             $declared = $this->_getDependencies($module, self::TYPE_HARD, self::MAP_TYPE_DECLARED);
@@ -790,7 +792,8 @@ public function collectRedundant()
             $found = array_merge(
                 $this->_getDependencies($module, self::TYPE_HARD, self::MAP_TYPE_FOUND),
                 $this->_getDependencies($module, self::TYPE_SOFT, self::MAP_TYPE_FOUND),
-                $schemaDependencyProvider->getDeclaredExistingModuleDependencies($module)
+                $schemaDependencyProvider->getDeclaredExistingModuleDependencies($module),
+                $graphQlSchemaDependencyProvider->getDeclaredExistingModuleDependencies($module)
             );
             $found['Magento\Framework'] = 'Magento\Framework';
             $this->_setDependencies($module, self::TYPE_HARD, self::MAP_TYPE_REDUNDANT, array_diff($declared, $found));
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/GraphQlDependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/GraphQlDependencyTest.php
new file mode 100644
index 0000000000000..c9684a9a4be76
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/GraphQlDependencyTest.php
@@ -0,0 +1,123 @@
+<?php
+
+
+namespace Magento\Test\Integrity;
+
+
+use Magento\Framework\App\Utility\Files;
+use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Test\Integrity\Dependency\GraphQlSchemaDependencyProvider;
+
+class GraphQlDependencyTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var GraphQlSchemaDependencyProvider
+     */
+    private $dependencyProvider;
+
+    /**
+     * Sets up data
+     *
+     * @throws \Exception
+     */
+    protected function setUp(): void
+    {
+        $root = BP;
+        $rootJson = $this->readJsonFile($root . '/composer.json', true);
+        if (preg_match('/magento\/project-*/', $rootJson['name']) == 1) {
+            // The Dependency test is skipped for vendor/magento build
+            self::markTestSkipped(
+                'MAGETWO-43654: The build is running from vendor/magento. DependencyTest is skipped.'
+            );
+        }
+        $this->dependencyProvider = new GraphQlSchemaDependencyProvider();
+    }
+
+    /**
+     * @throws \Exception
+     */
+    public function testUndeclaredDependencies()
+    {
+        $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
+        $invoker(
+        /**
+         * Check undeclared modules dependencies for specified file
+         *
+         * @param string $fileType
+         * @param string $file
+         */
+            function ($file) {
+                $componentRegistrar = new ComponentRegistrar();
+                $foundModuleName = '';
+                foreach ($componentRegistrar->getPaths(ComponentRegistrar::MODULE) as $moduleName => $moduleDir) {
+                    if (strpos($file, $moduleDir . '/') !== false) {
+                        $foundModuleName = str_replace('_', '\\', $moduleName);
+                        break;
+                    }
+                }
+                if (empty($foundModuleName)) {
+                    return;
+                }
+
+                $undeclaredDependency = $this->dependencyProvider->getUndeclaredModuleDependencies($foundModuleName);
+
+                $result = [];
+                foreach ($undeclaredDependency as $name => $modules) {
+                    $modules = array_unique($modules);
+                    $result[] = $this->getErrorMessage($name) . "\n" . implode("\t\n", $modules) . "\n";
+                }
+                if (!empty($result)) {
+                    $this->fail(
+                        'Module ' . $moduleName . ' has undeclared dependencies: ' . "\n" . implode("\t\n", $result)
+                    );
+                }
+            },
+            $this->prepareFiles(Files::init()->getDbSchemaFiles('schema.graphqls'))
+        );
+    }
+
+    /**
+     * Convert file list to data provider structure.
+     *
+     * @param string[] $files
+     * @return array
+     */
+    private function prepareFiles(array $files): array
+    {
+        $result = [];
+        foreach ($files as $relativePath => $file) {
+            $absolutePath = reset($file);
+            $result[$relativePath] = [$absolutePath];
+        }
+        return $result;
+    }
+
+    /**
+     * Retrieve error message for dependency.
+     *
+     * @param string $id
+     * @return string
+     */
+    private function getErrorMessage(string $id): string
+    {
+        return sprintf('%s has undeclared dependency on one of the following modules:', $id);
+    }
+
+    /**
+     * Read data from json file.
+     *
+     * @param string $file
+     * @return mixed
+     * @throws \Exception
+     */
+    private function readJsonFile(string $file, bool $asArray = false)
+    {
+        $decodedJson = json_decode(file_get_contents($file), $asArray);
+        if (null == $decodedJson) {
+            //phpcs:ignore Magento2.Exceptions.DirectThrow
+            throw new \Exception("Invalid Json: $file");
+        }
+
+        return $decodedJson;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
index 91387d7b98469..fc922bced9003 100644
--- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
@@ -7,6 +7,7 @@
 
 namespace Magento\Framework\GraphQlSchemaStitching;
 
+use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\Config\FileResolverInterface;
 use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\TypeMetaReaderInterface as TypeReaderComposite;
 use Magento\Framework\Config\ReaderInterface;
@@ -42,6 +43,11 @@ class GraphQlReader implements ReaderInterface
      */
     private $defaultScope;
 
+    /**
+     * @var ComponentRegistrar
+     */
+    private static $componentRegistrar;
+
     /**
      * @param FileResolverInterface $fileResolver
      * @param TypeReaderComposite $typeReader
@@ -76,7 +82,7 @@ public function read($scope = null) : array
          * Compatible with @see GraphQlReader::parseTypes
          */
         $knownTypes = [];
-        foreach ($schemaFiles as $partialSchemaContent) {
+        foreach ($schemaFiles as $filePath => $partialSchemaContent) {
             $partialSchemaTypes = $this->parseTypes($partialSchemaContent);
 
             // Keep declarations from current partial schema, add missing declarations from all previously read schemas
@@ -84,8 +90,8 @@ public function read($scope = null) : array
             $schemaContent = implode("\n", $knownTypes);
 
             $partialResults = $this->readPartialTypes($schemaContent);
-
             $results = array_replace_recursive($results, $partialResults);
+            $results = $this->addModuleNameToTypes($results, $filePath);
         }
 
         $results = $this->copyInterfaceFieldsToConcreteTypes($results);
@@ -285,4 +291,57 @@ private function removePlaceholderFromResults(array $partialResults) : array
         }
         return $partialResults;
     }
+
+    /**
+     * Get a module name by file path
+     *
+     * @param string $file
+     * @return string
+     */
+    private static function getModuleNameForRelevantFile($file)
+    {
+        if (!isset(self::$componentRegistrar)) {
+            self::$componentRegistrar = new ComponentRegistrar();
+        }
+        // Validates file when it belongs to default themes
+        foreach (self::$componentRegistrar->getPaths(ComponentRegistrar::THEME) as $themeDir) {
+            if (strpos($file, $themeDir . '/') !== false) {
+                return '';
+            }
+        }
+
+        $foundModuleName = '';
+        foreach (self::$componentRegistrar->getPaths(ComponentRegistrar::MODULE) as $moduleName => $moduleDir) {
+            if (strpos($file, $moduleDir . '/') !== false) {
+                $foundModuleName = str_replace('_', '\\', $moduleName);
+                break;
+            }
+        }
+        if (empty($foundModuleName)) {
+            return '';
+        }
+
+        return $foundModuleName;
+    }
+
+    /**
+     * Add a module name to types
+     *
+     * @param array $source
+     * @param string $filePath
+     * @return array
+     */
+    private function addModuleNameToTypes(array $source, string $filePath): array
+    {
+        foreach ($source as $typeName => $type) {
+            if (!isset($type['module']) && (
+                    ($type['type'] == 'graphql_interface' && isset($type['typeResolver']))
+                    || isset($type['implements']))
+            ) {
+                $source[$typeName]['module'] = self::getModuleNameForRelevantFile($filePath);
+            }
+        }
+
+        return $source;
+    }
 }

From 98b4b8178826e5cb46245f1fc17d4bf817d5002d Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Tue, 16 Jun 2020 16:23:52 -0500
Subject: [PATCH 0477/1718] MC-20638: MyAccount :: Order Details :: Shipping
 Details by Order Number

---
 .../Resolver/OrderShipment/ShipmentItems.php  |  2 +-
 .../Magento/SalesGraphQl/etc/schema.graphqls  | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderShipment/ShipmentItems.php b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderShipment/ShipmentItems.php
index 92e165729d768..49e55584c5fa6 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderShipment/ShipmentItems.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderShipment/ShipmentItems.php
@@ -47,7 +47,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
                     'currency' => $order->getOrderCurrencyCode()
                 ],
                 'quantity_shipped' => $item->getQty(),
-                'model' => $item
+                'model' => $item,
             ];
         }
 
diff --git a/app/code/Magento/SalesGraphQl/etc/schema.graphqls b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
index 5bdc381b4ad02..2eef0db1bf94c 100644
--- a/app/code/Magento/SalesGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
@@ -47,7 +47,7 @@ type CustomerOrder @doc(description: "Contains details about each of the custome
     total: OrderTotal @doc(description: "Contains details about the calculated totals for this order") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\OrderTotal")
     invoices: [Invoice]! @doc(description: "Invoice list for the order") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\Invoices")
     credit_memos: [CreditMemo] @doc(description: "credit memo list for the order")
-    shipments: [OrderShipment] @doc(description: "shipment list for the order")
+    shipments: [OrderShipment] @doc(description: "shipment list for the order") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\OrderShipments")
     payment_methods: [PaymentMethod] @doc(description: "payment details for the order")
     shipping_address: CustomerAddress @doc(description: "shipping address for the order")
     billing_address: CustomerAddress @doc(description: "billing address for the order")
@@ -166,7 +166,7 @@ type OrderShipment @doc(description: "Order shipment details") {
     id: ID! @doc(description: "The unique ID of the shipment")
     number: String! @doc(description: "The sequential credit shipment number")
     tracking: [ShipmentTracking] @doc(description: "Contains shipment tracking details")
-    items: [ShipmentItem] @doc(description: "Contains items included in the shipment")
+    items: [ShipmentItemInterface] @doc(description: "Contains items included in the shipment") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\OrderShipment\\ShipmentItems")
     comments: [CommentItem] @doc(description: "Comments added to the shipment")
 }
 
@@ -175,7 +175,7 @@ type CommentItem @doc(description: "Comment item details") {
     message: String! @doc(description: "The text of the message")
 }
 
-type ShipmentItem @doc(description: "Order shipment item details") {
+interface ShipmentItemInterface @doc(description: "Order shipment item details") @typeResolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\ShipmentItemTypeResolver"){
     id: ID! @doc(description: "Shipment item unique identifier")
     order_item: OrderItemInterface @doc(description: "Associated order item") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\OrderItem")
     product_name: String @doc(description: "Name of the base product")
@@ -184,6 +184,19 @@ type ShipmentItem @doc(description: "Order shipment item details") {
     quantity_shipped: Float! @doc(description: "Number of shipped items")
 }
 
+type ShipmentItem implements ShipmentItemInterface {
+}
+
+type BundleShipmentItem implements ShipmentItemInterface {
+    bundle_options: [ShipmentItemSelectedBundleOptions] @doc(description: "A list of bundle options that are assigned to the bundle product") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\BundleOptions")
+}
+
+type ShipmentItemSelectedBundleOptions {
+    id: ID! @doc(description: "The unique identifier of the option")
+    label: String! @doc(description: "The label of the option")
+    items: [ShipmentItemInterface] @doc(description: "A list of products that represent the values of the parent option") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\BundleOptions\\SelectedBundleOptionLineItems")
+}
+
 type ShipmentTracking @doc(description: "Order shipment tracking details") {
     title: String! @doc(description: "The shipment tracking title")
     carrier: String! @doc(description: "The shipping carrier for the order delivery")

From 6588700ba9bbf60236b9987048d3873bc68b10fe Mon Sep 17 00:00:00 2001
From: Munkh-Ulzii Balidar <mbalidar@comwrap.com>
Date: Tue, 16 Jun 2020 23:27:30 +0200
Subject: [PATCH 0478/1718] 28584 fix mismatched variable name, modify
 array_merge in loop

---
 .../CatalogGraphQl/Model/AttributesJoiner.php | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/AttributesJoiner.php b/app/code/Magento/CatalogGraphQl/Model/AttributesJoiner.php
index b7bdb6ddbb9d7..0bfd9d58ec969 100644
--- a/app/code/Magento/CatalogGraphQl/Model/AttributesJoiner.php
+++ b/app/code/Magento/CatalogGraphQl/Model/AttributesJoiner.php
@@ -46,12 +46,12 @@ public function __construct(array $fieldToAttributeMap = [])
      *
      * @param FieldNode $fieldNode
      * @param AbstractCollection $collection
-     * @param ResolveInfo $resolverInfo
+     * @param ResolveInfo $resolveInfo
      * @return void
      */
-    public function join(FieldNode $fieldNode, AbstractCollection $collection, ResolveInfo $resolverInfo): void
+    public function join(FieldNode $fieldNode, AbstractCollection $collection, ResolveInfo $resolveInfo): void
     {
-        foreach ($this->getQueryFields($fieldNode, $resolverInfo) as $field) {
+        foreach ($this->getQueryFields($fieldNode, $resolveInfo) as $field) {
             $this->addFieldToCollection($collection, $field);
         }
     }
@@ -60,7 +60,7 @@ public function join(FieldNode $fieldNode, AbstractCollection $collection, Resol
      * Get an array of queried fields.
      *
      * @param FieldNode $fieldNode
-     * @param ResolveInfo $resolverInfo
+     * @param ResolveInfo $resolveInfo
      * @return string[]
      */
     public function getQueryFields(FieldNode $fieldNode, ResolveInfo $resolveInfo): array
@@ -68,18 +68,17 @@ public function getQueryFields(FieldNode $fieldNode, ResolveInfo $resolveInfo):
         if (null === $this->getFieldNodeSelections($fieldNode)) {
             $query = $fieldNode->selectionSet->selections;
             $selectedFields = [];
+            $fragmentFields = [];
             /** @var FieldNode $field */
             foreach ($query as $field) {
                 if ($field->kind === NodeKind::INLINE_FRAGMENT) {
-                    $inlineFragmentFields = $this->addInlineFragmentFields($resolveInfo, $field);
-                    $selectedFields = array_merge($selectedFields, $inlineFragmentFields);
+                    $fragmentFields[] = $this->addInlineFragmentFields($resolveInfo, $field);
                 } elseif ($field->kind === NodeKind::FRAGMENT_SPREAD &&
                     ($spreadFragmentNode = $resolveInfo->fragments[$field->name->value])) {
 
                     foreach ($spreadFragmentNode->selectionSet->selections as $spreadNode) {
                         if (isset($spreadNode->selectionSet->selections)) {
-                            $fragmentSpreadFields = $this->getQueryFields($spreadNode, $resolveInfo);
-                            $selectedFields = array_merge($selectedFields, $fragmentSpreadFields);
+                            $fragmentFields[] = $this->getQueryFields($spreadNode, $resolveInfo);
                         } else {
                             $selectedFields[] = $spreadNode->name->value;
                         }
@@ -88,6 +87,9 @@ public function getQueryFields(FieldNode $fieldNode, ResolveInfo $resolveInfo):
                     $selectedFields[] = $field->name->value;
                 }
             }
+            if ($fragmentFields) {
+                $selectedFields = array_merge($selectedFields, array_merge(...$fragmentFields));
+            }
             $this->setSelectionsForFieldNode($fieldNode, array_unique($selectedFields));
         }
 
@@ -113,9 +115,7 @@ private function addInlineFragmentFields(
             if ($field->kind === NodeKind::INLINE_FRAGMENT) {
                 $this->addInlineFragmentFields($resolveInfo, $field, $inlineFragmentFields);
             } elseif (isset($field->selectionSet->selections)) {
-                if (is_array($queryFields = $this->getQueryFields($field, $resolveInfo))) {
-                    $inlineFragmentFields = array_merge($inlineFragmentFields, $queryFields);
-                }
+                continue;
             } else {
                 $inlineFragmentFields[] = $field->name->value;
             }

From f9757abb979ba8db2b4e0ab8ea6de6de8848824d Mon Sep 17 00:00:00 2001
From: Ihor Vansach <ihor@magefan.com>
Date: Wed, 10 Jun 2020 23:30:32 +0300
Subject: [PATCH 0479/1718] Fixed issue magento2-login-as-customer/issues/159

---
 .../ProcessShoppingCartPlugin.php             | 26 ++-----------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomerQuote/Plugin/LoginAsCustomerApi/ProcessShoppingCartPlugin.php b/app/code/Magento/LoginAsCustomerQuote/Plugin/LoginAsCustomerApi/ProcessShoppingCartPlugin.php
index cf25962a104b2..592d1b2bf206f 100644
--- a/app/code/Magento/LoginAsCustomerQuote/Plugin/LoginAsCustomerApi/ProcessShoppingCartPlugin.php
+++ b/app/code/Magento/LoginAsCustomerQuote/Plugin/LoginAsCustomerApi/ProcessShoppingCartPlugin.php
@@ -60,7 +60,7 @@ public function __construct(
     }
 
     /**
-     * Remove all items from guest shopping cart
+     * Remove all items from guest shopping cart and mark customer cart as not-guest
      *
      * @param AuthenticateCustomerBySecretInterface $subject
      * @param string $secret
@@ -77,31 +77,9 @@ public function beforeExecute(
             $quote = $this->checkoutSession->getQuote();
             /* Remove items from guest cart */
             $quote->removeAllItems();
+            $quote->setCustomerIsGuest(0);
             $this->quoteRepository->save($quote);
         }
         return null;
     }
-
-    /**
-     * Mark customer cart as not-guest
-     *
-     * @param AuthenticateCustomerBySecretInterface $subject
-     * @param void $result
-     * @param string $secret
-     * @return void
-     * @throws LocalizedException
-     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function afterExecute(
-        AuthenticateCustomerBySecretInterface $subject,
-        $result,
-        string $secret
-    ) {
-        $this->checkoutSession->loadCustomerQuote();
-        $quote = $this->checkoutSession->getQuote();
-
-        $quote->setCustomerIsGuest(0);
-        $this->quoteRepository->save($quote);
-    }
 }

From 4a6b670c2051a125055d2fd28b7fb17646f2ebfa Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Tue, 16 Jun 2020 17:04:19 -0500
Subject: [PATCH 0480/1718] magento2-login-as-customer/pull/162: Fixed issue
 magento2-login-as-customer/issues/156

---
 .../Plugin/LoginAsCustomerApi/ProcessShoppingCartPlugin.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/LoginAsCustomerQuote/Plugin/LoginAsCustomerApi/ProcessShoppingCartPlugin.php b/app/code/Magento/LoginAsCustomerQuote/Plugin/LoginAsCustomerApi/ProcessShoppingCartPlugin.php
index 592d1b2bf206f..2d781274a0b29 100644
--- a/app/code/Magento/LoginAsCustomerQuote/Plugin/LoginAsCustomerApi/ProcessShoppingCartPlugin.php
+++ b/app/code/Magento/LoginAsCustomerQuote/Plugin/LoginAsCustomerApi/ProcessShoppingCartPlugin.php
@@ -15,7 +15,7 @@
 use Magento\LoginAsCustomerApi\Api\GetAuthenticationDataBySecretInterface;
 
 /**
- * Remove all items from guest shopping cart before execute. Mark customer cart as not-guest after execute
+ * Mark customer cart as guest cart and remove all items from it
  *
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */

From c6535cb0834da161c1226403e486b5119028b2b5 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Tue, 16 Jun 2020 17:06:59 -0500
Subject: [PATCH 0481/1718] magento2-login-as-customer/pull/162: Fixed issue
 magento2-login-as-customer/issues/156

---
 .../Plugin/LoginAsCustomerApi/ProcessShoppingCartPlugin.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomerQuote/Plugin/LoginAsCustomerApi/ProcessShoppingCartPlugin.php b/app/code/Magento/LoginAsCustomerQuote/Plugin/LoginAsCustomerApi/ProcessShoppingCartPlugin.php
index 2d781274a0b29..4aa068a0ccc61 100644
--- a/app/code/Magento/LoginAsCustomerQuote/Plugin/LoginAsCustomerApi/ProcessShoppingCartPlugin.php
+++ b/app/code/Magento/LoginAsCustomerQuote/Plugin/LoginAsCustomerApi/ProcessShoppingCartPlugin.php
@@ -15,7 +15,7 @@
 use Magento\LoginAsCustomerApi\Api\GetAuthenticationDataBySecretInterface;
 
 /**
- * Mark customer cart as guest cart and remove all items from it
+ * Remove all items from guest shopping cart and mark cart as not-guest
  *
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
@@ -60,7 +60,7 @@ public function __construct(
     }
 
     /**
-     * Remove all items from guest shopping cart and mark customer cart as not-guest
+     * Remove all items from guest shopping cart and mark cart as not-guest
      *
      * @param AuthenticateCustomerBySecretInterface $subject
      * @param string $secret

From eb3ea37fb9739ac1da033abae500fd085e4e2641 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Tue, 16 Jun 2020 21:05:19 -0500
Subject: [PATCH 0482/1718] magento2-login-as-customer/issues/168: [CE] Endless
 loading of the page after trying to search any word in "Login as Customer Log

---
 .../adminhtml/ui_component/login_as_customer_log_listing.xml     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/LoginAsCustomerLog/view/adminhtml/ui_component/login_as_customer_log_listing.xml b/app/code/Magento/LoginAsCustomerLog/view/adminhtml/ui_component/login_as_customer_log_listing.xml
index 077fd6e18db7c..fdd1bf55c91b9 100644
--- a/app/code/Magento/LoginAsCustomerLog/view/adminhtml/ui_component/login_as_customer_log_listing.xml
+++ b/app/code/Magento/LoginAsCustomerLog/view/adminhtml/ui_component/login_as_customer_log_listing.xml
@@ -38,7 +38,6 @@
         </settings>
         <bookmark name="bookmarks"/>
         <columnsControls name="columns_controls"/>
-        <filterSearch name="name"/>
         <filters name="listing_filters">
             <settings>
                 <templates>

From 361239fb75c3dbba3e47e3fa433ff5ca2859ee31 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Tue, 16 Jun 2020 21:11:11 -0500
Subject: [PATCH 0483/1718] magento/magento2-login-as-customer#156: Banner
 disappear when admin edit customer data from Account Information tab

---
 .../view/frontend/web/js/view/loginAsCustomer.js    | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/web/js/view/loginAsCustomer.js b/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/web/js/view/loginAsCustomer.js
index 06dffd76f19f3..9687525ee26eb 100644
--- a/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/web/js/view/loginAsCustomer.js
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/web/js/view/loginAsCustomer.js
@@ -28,19 +28,19 @@ define([
 
             customerData.subscribe(function (data) {
                 this.fullname = data.fullname;
-                this._updateBanner();
+                this.updateBanner();
             }.bind(this));
             loggedAsCustomerData.subscribe(function (data) {
                 this.adminUserId = data.adminUserId;
                 this.websiteName = data.websiteName;
-                this._updateBanner();
+                this.updateBanner();
             }.bind(this));
 
             this.fullname = customerData().fullname;
             this.adminUserId = loggedAsCustomerData().adminUserId;
             this.websiteName = loggedAsCustomerData().websiteName;
 
-            this._updateBanner();
+            this.updateBanner();
         },
 
         /** @inheritdoc */
@@ -51,7 +51,12 @@ define([
             return this;
         },
 
-        _updateBanner: function () {
+        /**
+         * Update banner area
+         *
+         * @returns void
+         */
+        updateBanner: function () {
             if (this.adminUserId !== undefined) {
                 this.isVisible(this.adminUserId);
             }

From 2bc1209586de144c3f61c4c4e937c28bcac80bc9 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Tue, 16 Jun 2020 21:22:46 -0500
Subject: [PATCH 0484/1718] magento/magento2-login-as-customer#171: Force
 customer unlogin during admin loglout without additional MySQL queries

---
 app/code/Magento/LoginAsCustomer/etc/di.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomer/etc/di.xml b/app/code/Magento/LoginAsCustomer/etc/di.xml
index c0ba4901ba7b8..c53e37d284daa 100755
--- a/app/code/Magento/LoginAsCustomer/etc/di.xml
+++ b/app/code/Magento/LoginAsCustomer/etc/di.xml
@@ -13,7 +13,4 @@
     <preference for="Magento\LoginAsCustomerApi\Api\DeleteAuthenticationDataForUserInterface" type="Magento\LoginAsCustomer\Model\ResourceModel\DeleteAuthenticationDataForUser"/>
     <preference for="Magento\LoginAsCustomerApi\Api\ConfigInterface" type="Magento\LoginAsCustomer\Model\Config"/>
     <preference for="Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerSessionActiveInterface" type="Magento\LoginAsCustomer\Model\ResourceModel\IsLoginAsCustomerSessionActive"/>
-    <type name="Magento\Backend\Model\Auth">
-        <plugin name="login_as_customer_admin_logout" type="Magento\LoginAsCustomer\Plugin\AdminLogoutPlugin"/>
-    </type>
 </config>

From 8dc6b6fcc3d6b5873ff0b048087a4f85ca299bff Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Tue, 16 Jun 2020 22:13:48 -0500
Subject: [PATCH 0485/1718] magento/magento2-login-as-customer#171: Force
 customer unlogin during admin loglout without additional MySQL queries

---
 .../Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php     | 5 +++--
 app/code/Magento/LoginAsCustomer/etc/di.xml                  | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php b/app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php
index f473dcebcf9ea..fddc11b0a4d6d 100644
--- a/app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php
+++ b/app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php
@@ -45,8 +45,9 @@ public function __construct(
      */
     public function beforeLogout(Auth $subject): void
     {
-        if ($this->config->isEnabled() && $subject->getUser()) {
-            $userId = (int)$subject->getUser()->getId();
+        $user = $subject->getUser();
+        if ($this->config->isEnabled() && $user && $user->getIsLoggedAsCustomer()) {
+            $userId = (int)$user->getId();
             $this->deleteAuthenticationDataForUser->execute($userId);
         }
     }
diff --git a/app/code/Magento/LoginAsCustomer/etc/di.xml b/app/code/Magento/LoginAsCustomer/etc/di.xml
index c53e37d284daa..c0ba4901ba7b8 100755
--- a/app/code/Magento/LoginAsCustomer/etc/di.xml
+++ b/app/code/Magento/LoginAsCustomer/etc/di.xml
@@ -13,4 +13,7 @@
     <preference for="Magento\LoginAsCustomerApi\Api\DeleteAuthenticationDataForUserInterface" type="Magento\LoginAsCustomer\Model\ResourceModel\DeleteAuthenticationDataForUser"/>
     <preference for="Magento\LoginAsCustomerApi\Api\ConfigInterface" type="Magento\LoginAsCustomer\Model\Config"/>
     <preference for="Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerSessionActiveInterface" type="Magento\LoginAsCustomer\Model\ResourceModel\IsLoginAsCustomerSessionActive"/>
+    <type name="Magento\Backend\Model\Auth">
+        <plugin name="login_as_customer_admin_logout" type="Magento\LoginAsCustomer\Plugin\AdminLogoutPlugin"/>
+    </type>
 </config>

From 76c4198b9060adcc2a8495843dcf42105797de66 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Tue, 16 Jun 2020 23:46:46 -0500
Subject: [PATCH 0486/1718] magento/magento2-login-as-customer#171: Force
 customer unlogin during admin loglout without additional MySQL queries

---
 app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php | 2 +-
 app/code/Magento/LoginAsCustomer/etc/config.xml               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php b/app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php
index fddc11b0a4d6d..ef757b3c081d7 100644
--- a/app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php
+++ b/app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php
@@ -46,7 +46,7 @@ public function __construct(
     public function beforeLogout(Auth $subject): void
     {
         $user = $subject->getUser();
-        if ($this->config->isEnabled() && $user && $user->getIsLoggedAsCustomer()) {
+        if ($this->config->isEnabled() && $user) {
             $userId = (int)$user->getId();
             $this->deleteAuthenticationDataForUser->execute($userId);
         }
diff --git a/app/code/Magento/LoginAsCustomer/etc/config.xml b/app/code/Magento/LoginAsCustomer/etc/config.xml
index 7e39cc39145eb..936ae1ff2f05d 100644
--- a/app/code/Magento/LoginAsCustomer/etc/config.xml
+++ b/app/code/Magento/LoginAsCustomer/etc/config.xml
@@ -10,7 +10,7 @@
     <default>
         <login_as_customer>
             <general>
-                <enabled>1</enabled>
+                <enabled>0</enabled>
                 <store_view_manual_choice_enabled>0</store_view_manual_choice_enabled>
                 <authentication_data_expiration_time>60</authentication_data_expiration_time>
             </general>

From 38892865b20e048a220abe52c94559b070c36c97 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Tue, 16 Jun 2020 23:56:00 -0500
Subject: [PATCH 0487/1718] magento/magento2-login-as-customer#171: Force
 customer unlogin during admin loglout without additional MySQL queries

---
 app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php   | 2 +-
 app/code/Magento/LoginAsCustomer/etc/config.xml                 | 2 +-
 .../CustomerData/LoginAsCustomerUi.php                          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php b/app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php
index ef757b3c081d7..fddc11b0a4d6d 100644
--- a/app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php
+++ b/app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php
@@ -46,7 +46,7 @@ public function __construct(
     public function beforeLogout(Auth $subject): void
     {
         $user = $subject->getUser();
-        if ($this->config->isEnabled() && $user) {
+        if ($this->config->isEnabled() && $user && $user->getIsLoggedAsCustomer()) {
             $userId = (int)$user->getId();
             $this->deleteAuthenticationDataForUser->execute($userId);
         }
diff --git a/app/code/Magento/LoginAsCustomer/etc/config.xml b/app/code/Magento/LoginAsCustomer/etc/config.xml
index 936ae1ff2f05d..7e39cc39145eb 100644
--- a/app/code/Magento/LoginAsCustomer/etc/config.xml
+++ b/app/code/Magento/LoginAsCustomer/etc/config.xml
@@ -10,7 +10,7 @@
     <default>
         <login_as_customer>
             <general>
-                <enabled>0</enabled>
+                <enabled>1</enabled>
                 <store_view_manual_choice_enabled>0</store_view_manual_choice_enabled>
                 <authentication_data_expiration_time>60</authentication_data_expiration_time>
             </general>
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/CustomerData/LoginAsCustomerUi.php b/app/code/Magento/LoginAsCustomerFrontendUi/CustomerData/LoginAsCustomerUi.php
index 6303989c0c667..985561df0bbc4 100644
--- a/app/code/Magento/LoginAsCustomerFrontendUi/CustomerData/LoginAsCustomerUi.php
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/CustomerData/LoginAsCustomerUi.php
@@ -49,7 +49,7 @@ public function __construct(
      */
     public function getSectionData(): array
     {
-        if (!$this->customerSession->getCustomerId()) {
+        if (!$this->customerSession->getCustomerId() || !$this->customerSession->getLoggedAsCustomerAdmindId()) {
             return [];
         }
 

From 29b501aae0e13ffdae752ef30654ede76eecbdac Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Wed, 17 Jun 2020 08:51:16 +0300
Subject: [PATCH 0488/1718] Move localstorage polyfill declaration to frontend

---
 .../Theme/view/frontend/requirejs-config.js   | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/app/code/Magento/Theme/view/frontend/requirejs-config.js b/app/code/Magento/Theme/view/frontend/requirejs-config.js
index e14c93d329a07..79c8e69d94338 100644
--- a/app/code/Magento/Theme/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Theme/view/frontend/requirejs-config.js
@@ -49,3 +49,24 @@ var config = {
         }
     }
 };
+
+/* eslint-disable max-depth */
+/**
+ * Adds polyfills only for browser contexts which prevents bundlers from including them.
+ */
+if (typeof window !== 'undefined' && window.document) {
+    /**
+     * Polyfill localStorage and sessionStorage for browsers that do not support them.
+     */
+    try {
+        if (!window.localStorage || !window.sessionStorage) {
+            throw new Error();
+        }
+
+        localStorage.setItem('storage_test', 1);
+        localStorage.removeItem('storage_test');
+    } catch (e) {
+        config.deps.push('mage/polyfill');
+    }
+}
+/* eslint-enable max-depth */

From cc01557f16066403d1932c91a2fb5ee4f1ee0980 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Wed, 17 Jun 2020 08:51:29 +0300
Subject: [PATCH 0489/1718] Move localstorage polyfill declaration to frontend

---
 .../Theme/view/base/requirejs-config.js       | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/app/code/Magento/Theme/view/base/requirejs-config.js b/app/code/Magento/Theme/view/base/requirejs-config.js
index 423ac707c6572..4bd854f2e4670 100644
--- a/app/code/Magento/Theme/view/base/requirejs-config.js
+++ b/app/code/Magento/Theme/view/base/requirejs-config.js
@@ -60,27 +60,6 @@ var config = {
     }
 };
 
-/* eslint-disable max-depth */
-/**
- * Adds polyfills only for browser contexts which prevents bundlers from including them.
- */
-if (typeof window !== 'undefined' && window.document) {
-    /**
-     * Polyfill localStorage and sessionStorage for browsers that do not support them.
-     */
-    try {
-        if (!window.localStorage || !window.sessionStorage) {
-            throw new Error();
-        }
-
-        localStorage.setItem('storage_test', 1);
-        localStorage.removeItem('storage_test');
-    } catch (e) {
-        config.deps.push('mage/polyfill');
-    }
-}
-/* eslint-enable max-depth */
-
 require(['jquery'], function ($) {
     'use strict';
 

From 048510321722f2d7c883a0e45a07ce355e55a999 Mon Sep 17 00:00:00 2001
From: DmytroPaidych <dimonovp@gmail.com>
Date: Wed, 17 Jun 2020 09:09:40 +0300
Subject: [PATCH 0490/1718] MC-34604: Customer configuration: Account
 information options

---
 .../Customer/Model/EmailNotificationTest.php  | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/EmailNotificationTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/EmailNotificationTest.php
index e63c3d2761c49..69afd17c674a6 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/EmailNotificationTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/EmailNotificationTest.php
@@ -141,6 +141,36 @@ public function testRemindPasswordCustomTemplate(): void
         $this->assertMessage($expectedSender);
     }
 
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     *
+     * @return void
+     */
+    public function testChangeEmailCustomTemplate(): void
+    {
+        $this->setEmailTemplateConfig(EmailNotification::XML_PATH_CHANGE_EMAIL_TEMPLATE);
+        $customer = $this->customerRepository->get('customer@example.com');
+        $customer->setEmail('customer_update@example.com');
+        $this->emailNotification->credentialsChanged($customer, 'customer@example.com');
+        $expectedSender = ['name' => 'CustomerSupport', 'email' => 'support@example.com'];
+        $this->assertMessage($expectedSender);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     *
+     * @return void
+     */
+    public function testChangeEmailAndPasswordCustomTemplate(): void
+    {
+        $this->setEmailTemplateConfig(EmailNotification::XML_PATH_CHANGE_EMAIL_AND_PASSWORD_TEMPLATE);
+        $customer = $this->customerRepository->get('customer@example.com');
+        $customer->setEmail('customer_update@example.com');
+        $this->emailNotification->credentialsChanged($customer, 'customer@example.com', true);
+        $expectedSender = ['name' => 'CustomerSupport', 'email' => 'support@example.com'];
+        $this->assertMessage($expectedSender);
+    }
+
     /**
      * Assert message.
      *

From 229f045852a05c555bad4d527320d72615c71272 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Wed, 17 Jun 2020 01:45:23 -0500
Subject: [PATCH 0491/1718] magento/magento2-login-as-customer#171: Force
 customer unlogin during admin loglout without additional MySQL queries

---
 .../Magento/LoginAsCustomerFrontendUi/etc/frontend/di.xml  | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/etc/frontend/di.xml b/app/code/Magento/LoginAsCustomerFrontendUi/etc/frontend/di.xml
index 2204402b7dd30..6e595270f0b04 100644
--- a/app/code/Magento/LoginAsCustomerFrontendUi/etc/frontend/di.xml
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/etc/frontend/di.xml
@@ -6,13 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\Customer\CustomerData\SectionPoolInterface">
-        <arguments>
-            <argument name="sectionSourceMap" xsi:type="array">
-                <item name="loggedAsCustomer" xsi:type="string">Magento\LoginAsCustomerFrontendUi\CustomerData\LoginAsCustomerUi</item>
-            </argument>
-        </arguments>
-    </type>
     <type name="Magento\Framework\App\ActionInterface">
         <plugin name="invalidate_expired_session_plugin"
                 type="Magento\LoginAsCustomerFrontendUi\Plugin\InvalidateExpiredSessionPlugin"/>

From e0191e0818bc3fdf53a8c1c6d746260480d6beff Mon Sep 17 00:00:00 2001
From: Viktor Sevch <viktor.sevch@transoftgroup.com>
Date: Wed, 17 Jun 2020 11:13:10 +0300
Subject: [PATCH 0492/1718] =?UTF-8?q?MC-35197:=20Unexpected=20loading=20of?=
 =?UTF-8?q?=20the=20=E2=80=9CCreate=20New=20Order=E2=80=9D=20page=20in=20t?=
 =?UTF-8?q?he=20Magento=20Admin=20panel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Magento/GiftMessage/view/adminhtml/templates/popup.phtml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml
index 746044c2ae553..e45446450f872 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml
@@ -23,7 +23,7 @@
         </div>
     </div>
 </div>
-    <div id="giftoptions_tooltip_window" class="gift-options-tooltip">
+    <div id="giftoptions_tooltip_window" class="gift-options-tooltip no-display">
         <div id="giftoptions_tooltip_window_content">&nbsp;</div>
     </div>
     <?php $scriptString = <<<script

From 733d72a13d816a70845fdef5e2e2414c7909c873 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Wed, 17 Jun 2020 11:41:19 +0300
Subject: [PATCH 0493/1718] fix 24922

---
 .../Adminhtml/Category/Tab/Attributes.php     |  89 ++++++++--
 .../Adminhtml/Category/Tab/AttributesTest.php | 157 ++++++++++++++++++
 2 files changed, 228 insertions(+), 18 deletions(-)
 create mode 100644 app/code/Magento/CatalogUrlRewrite/Test/Unit/Plugin/Catalog/Block/Adminhtml/Category/Tab/AttributesTest.php

diff --git a/app/code/Magento/CatalogUrlRewrite/Plugin/Catalog/Block/Adminhtml/Category/Tab/Attributes.php b/app/code/Magento/CatalogUrlRewrite/Plugin/Catalog/Block/Adminhtml/Category/Tab/Attributes.php
index ca514be51d99b..3937b62262097 100644
--- a/app/code/Magento/CatalogUrlRewrite/Plugin/Catalog/Block/Adminhtml/Category/Tab/Attributes.php
+++ b/app/code/Magento/CatalogUrlRewrite/Plugin/Catalog/Block/Adminhtml/Category/Tab/Attributes.php
@@ -3,38 +3,91 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\CatalogUrlRewrite\Plugin\Catalog\Block\Adminhtml\Category\Tab;
 
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Model\Category\DataProvider;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\CatalogUrlRewrite\Block\UrlKeyRenderer;
+use Magento\Store\Model\ScopeInterface;
+
 /**
- * Class Attributes
+ * Category tab attributes
  */
 class Attributes
 {
     /**
-     * @param \Magento\Catalog\Model\Category\DataProvider $subject
-     * @param array $result
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(ScopeConfigInterface $scopeConfig)
+    {
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * Adds attributes meta if url_key exist
      *
+     * @param DataProvider $subject
+     * @param array $result
      * @return array
      */
-    public function afterGetAttributesMeta(
-        \Magento\Catalog\Model\Category\DataProvider $subject,
-        $result
-    ) {
-        /** @var \Magento\Catalog\Model\Category $category */
+    public function afterGetAttributesMeta(DataProvider $subject, $result): array
+    {
+        if (!isset($result['url_key'])) {
+            return $result;
+        }
+
         $category = $subject->getCurrentCategory();
-        if (isset($result['url_key'])) {
-            if ($category && $category->getId()) {
-                if ($category->getLevel() == 1) {
-                    $result['url_key_group']['componentDisabled'] = true;
-                } else {
-                    $result['url_key_create_redirect']['valueMap']['true'] = $category->getUrlKey();
-                    $result['url_key_create_redirect']['value'] = $category->getUrlKey();
-                    $result['url_key_create_redirect']['disabled'] = true;
-                }
+        if ($category && $category->getId()) {
+            if ((int) $category->getLevel() === 1) {
+                $result['url_key_group']['componentDisabled'] = true;
             } else {
-                $result['url_key_create_redirect']['visible'] = false;
+                $result['url_key_create_redirect'] = $this->getUrlRewriteMeta($category);
             }
+        } else {
+            $result['url_key_create_redirect']['visible'] = false;
         }
+
         return $result;
     }
+
+    /**
+     * Returns url rewrite meta
+     *
+     * @param CategoryInterface $category
+     * @return array
+     */
+    private function getUrlRewriteMeta(CategoryInterface $category): array
+    {
+        return [
+            'value' => $category->getUrlKey(),
+            'valueMap' => [
+                'true' => $this->isSaveRewriteHistory($category->getStoreId()) ? $category->getUrlKey() : false
+            ],
+            'disabled' => true,
+        ];
+    }
+
+    /**
+     * Returns Create Permanent Redirect for URLs if changed config enabled
+     *
+     * @param int $storeId
+     * @return bool
+     */
+    private function isSaveRewriteHistory(int $storeId): bool
+    {
+        return $this->scopeConfig->isSetFlag(
+            UrlKeyRenderer::XML_PATH_SEO_SAVE_HISTORY,
+            ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
+    }
 }
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Plugin/Catalog/Block/Adminhtml/Category/Tab/AttributesTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Plugin/Catalog/Block/Adminhtml/Category/Tab/AttributesTest.php
new file mode 100644
index 0000000000000..b1e013ddd7ed3
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Plugin/Catalog/Block/Adminhtml/Category/Tab/AttributesTest.php
@@ -0,0 +1,157 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\CatalogUrlRewrite\Test\Unit\Plugin\Catalog\Block\Adminhtml\Category\Tab;
+
+use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\Category\DataProvider as CategoryDataProvider;
+use Magento\CatalogUrlRewrite\Plugin\Catalog\Block\Adminhtml\Category\Tab\Attributes;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for \Magento\CatalogUrlRewrite\Plugin\Catalog\Block\Adminhtml\Category\Tab\Attributes.
+ */
+class AttributesTest extends TestCase
+{
+    private const STUB_CATEGORY_META = ['url_key' => 'url_key_test'];
+    private const STUB_URL_KEY = 'url_key_777';
+
+    /**
+     * @var Attributes
+     */
+    private $model;
+
+    /**
+     * @var Category|MockObject
+     */
+    private $categoryMock;
+
+    /**
+     * @var CategoryDataProvider|MockObject
+     */
+    private $dataProviderMock;
+
+    /**
+     * @var ScopeConfigInterface|MockObject
+     */
+    private $scopeConfigMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $objectManager = new ObjectManager($this);
+
+        $this->categoryMock = $this->createMock(Category::class);
+        $this->dataProviderMock = $this->createMock(CategoryDataProvider::class);
+        $this->dataProviderMock->expects($this->any())
+            ->method('getCurrentCategory')
+            ->willReturn($this->categoryMock);
+
+        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
+        $this->model = $objectManager->getObject(Attributes::class, ['scopeConfig' => $this->scopeConfigMock]);
+    }
+
+    /**
+     * Test get attributes meta
+     *
+     * @dataProvider attributesMetaDataProvider
+     *
+     * @param bool $configEnabled
+     * @param bool|string $expected
+     * @return void
+     */
+    public function testGetAttributesMeta(bool $configEnabled, $expected): void
+    {
+        $this->categoryMock->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
+        $this->categoryMock->expects($this->once())
+            ->method('getLevel')
+            ->willReturn(2);
+        $this->categoryMock->expects($this->atMost(2))
+            ->method('getUrlKey')
+            ->willReturn(self::STUB_URL_KEY);
+        $this->scopeConfigMock->expects($this->once())
+            ->method('isSetFlag')
+            ->willReturn($configEnabled);
+        $this->categoryMock->expects($this->once())
+            ->method('getStoreId')
+            ->willReturn(1);
+
+        $result = $this->model->afterGetAttributesMeta($this->dataProviderMock, self::STUB_CATEGORY_META);
+
+        $this->assertArrayHasKey('url_key_create_redirect', $result);
+
+        $this->assertArrayHasKey('value', $result['url_key_create_redirect']);
+        $this->assertEquals(self::STUB_URL_KEY, $result['url_key_create_redirect']['value']);
+
+        $this->assertArrayHasKey('valueMap', $result['url_key_create_redirect']);
+        $this->assertArrayHasKey('true', $result['url_key_create_redirect']['valueMap']);
+        $this->assertEquals($expected, $result['url_key_create_redirect']['valueMap']['true']);
+
+        $this->assertArrayHasKey('disabled', $result['url_key_create_redirect']);
+        $this->assertTrue($result['url_key_create_redirect']['disabled']);
+    }
+
+    /**
+     * DataProvider for testGetAttributesMeta
+     *
+     * @return array
+     */
+    public function attributesMetaDataProvider(): array
+    {
+        return [
+            'save rewrite history config enabled' => [true, self::STUB_URL_KEY],
+            'save rewrite history config disabled' => [false, false]
+        ];
+    }
+
+    /**
+     * Test get category without id attributes meta
+     *
+     * @return void
+     */
+    public function testGetAttributesMetaWithoutCategoryId(): void
+    {
+        $this->categoryMock->expects($this->once())
+            ->method('getId')
+            ->willReturn(null);
+
+        $result = $this->model->afterGetAttributesMeta($this->dataProviderMock, self::STUB_CATEGORY_META);
+
+        $this->assertArrayHasKey('url_key_create_redirect', $result);
+        $this->assertArrayHasKey('visible', $result['url_key_create_redirect']);
+        $this->assertFalse($result['url_key_create_redirect']['visible']);
+    }
+
+    /**
+     * Test get root category attributes meta
+     *
+     * @return void
+     */
+    public function testGetAttributesMetaRootCategory(): void
+    {
+        $this->categoryMock->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
+        $this->categoryMock->expects($this->once())
+            ->method('getLevel')
+            ->willReturn(1);
+
+        $result = $this->model->afterGetAttributesMeta($this->dataProviderMock, self::STUB_CATEGORY_META);
+
+        $this->assertArrayHasKey('url_key_group', $result);
+        $this->assertArrayHasKey('componentDisabled', $result['url_key_group']);
+        $this->assertTrue($result['url_key_group']['componentDisabled']);
+    }
+}

From 4592de4372db8b8bde4546d01a271fac45f40671 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Wed, 17 Jun 2020 12:09:57 +0300
Subject: [PATCH 0494/1718] impr

---
 .../Catalog/Block/Adminhtml/Category/Tab/Attributes.php       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/code/Magento/CatalogUrlRewrite/Plugin/Catalog/Block/Adminhtml/Category/Tab/Attributes.php b/app/code/Magento/CatalogUrlRewrite/Plugin/Catalog/Block/Adminhtml/Category/Tab/Attributes.php
index 3937b62262097..d89013bcfd4df 100644
--- a/app/code/Magento/CatalogUrlRewrite/Plugin/Catalog/Block/Adminhtml/Category/Tab/Attributes.php
+++ b/app/code/Magento/CatalogUrlRewrite/Plugin/Catalog/Block/Adminhtml/Category/Tab/Attributes.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-declare(strict_types=1);
-
 namespace Magento\CatalogUrlRewrite\Plugin\Catalog\Block\Adminhtml\Category\Tab;
 
 use Magento\Catalog\Api\Data\CategoryInterface;
@@ -39,7 +37,7 @@ public function __construct(ScopeConfigInterface $scopeConfig)
      * @param array $result
      * @return array
      */
-    public function afterGetAttributesMeta(DataProvider $subject, $result): array
+    public function afterGetAttributesMeta(DataProvider $subject, $result)
     {
         if (!isset($result['url_key'])) {
             return $result;

From 14528a3bac0027997094444055124e93dc2533ae Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Wed, 17 Jun 2020 04:12:19 -0500
Subject: [PATCH 0495/1718] magento/magento2-login-as-customer#171: Force
 customer logout during admin loglout without additional MySQL queries

---
 app/code/Magento/LoginAsCustomer/etc/config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/LoginAsCustomer/etc/config.xml b/app/code/Magento/LoginAsCustomer/etc/config.xml
index 7e39cc39145eb..936ae1ff2f05d 100644
--- a/app/code/Magento/LoginAsCustomer/etc/config.xml
+++ b/app/code/Magento/LoginAsCustomer/etc/config.xml
@@ -10,7 +10,7 @@
     <default>
         <login_as_customer>
             <general>
-                <enabled>1</enabled>
+                <enabled>0</enabled>
                 <store_view_manual_choice_enabled>0</store_view_manual_choice_enabled>
                 <authentication_data_expiration_time>60</authentication_data_expiration_time>
             </general>

From 1d300ba5e755028134fa7bbc759d661167b8ef51 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Wed, 17 Jun 2020 14:00:13 +0300
Subject: [PATCH 0496/1718] magento/magento2-login-as-customer#171: Force
 customer unlogin during admin loglout without additional MySQL queries.

---
 .../LoginAsCustomer/Plugin/AdminLogoutPlugin.php     | 12 +++++++++++-
 .../Controller/Adminhtml/Login/Login.php             |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php b/app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php
index fddc11b0a4d6d..0a4f61469b031 100644
--- a/app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php
+++ b/app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php
@@ -8,6 +8,7 @@
 namespace Magento\LoginAsCustomer\Plugin;
 
 use Magento\Backend\Model\Auth;
+use Magento\Backend\Model\Auth\Session as AuthSession;
 use Magento\LoginAsCustomerApi\Api\ConfigInterface;
 use Magento\LoginAsCustomerApi\Api\DeleteAuthenticationDataForUserInterface;
 
@@ -16,6 +17,11 @@
  */
 class AdminLogoutPlugin
 {
+    /**
+     * @var AuthSession
+     */
+    private $authSession;
+
     /**
      * @var ConfigInterface
      */
@@ -27,13 +33,16 @@ class AdminLogoutPlugin
     private $deleteAuthenticationDataForUser;
 
     /**
+     * @param AuthSession $authSession
      * @param ConfigInterface $config
      * @param DeleteAuthenticationDataForUserInterface $deleteAuthenticationDataForUser
      */
     public function __construct(
+        AuthSession $authSession,
         ConfigInterface $config,
         DeleteAuthenticationDataForUserInterface $deleteAuthenticationDataForUser
     ) {
+        $this->authSession = $authSession;
         $this->config = $config;
         $this->deleteAuthenticationDataForUser = $deleteAuthenticationDataForUser;
     }
@@ -46,7 +55,8 @@ public function __construct(
     public function beforeLogout(Auth $subject): void
     {
         $user = $subject->getUser();
-        if ($this->config->isEnabled() && $user && $user->getIsLoggedAsCustomer()) {
+        $isLoggedAsCustomer = $this->authSession->getIsLoggedAsCustomer();
+        if ($this->config->isEnabled() && $user && $isLoggedAsCustomer) {
             $userId = (int)$user->getId();
             $this->deleteAuthenticationDataForUser->execute($userId);
         }
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php b/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php
index 7ccdcfe45e482..70eef5347f8e3 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php
@@ -167,6 +167,7 @@ public function execute(): ResultInterface
 
         $this->deleteAuthenticationDataForUser->execute($userId);
         $secret = $this->saveAuthenticationData->execute($authenticationData);
+        $this->authSession->setIsLoggedAsCustomer(true);
 
         $redirectUrl = $this->getLoginProceedRedirectUrl($secret, $storeId);
         $resultRedirect->setUrl($redirectUrl);

From 622e2aeda03b7dbb5d4bf6aed4ebc2b179a07387 Mon Sep 17 00:00:00 2001
From: Dmitriy Gallyamov <dmitrijs.gallamovs@gmail.com>
Date: Wed, 17 Jun 2020 14:21:16 +0300
Subject: [PATCH 0497/1718] magento/magento2#28628: GraphQL price range numeric
 values

- Fixed tests
---
 .../SearchAdapter/Aggregation/Builder/Dynamic.php         | 7 +++----
 .../Magento/GraphQl/Catalog/ProductSearchTest.php         | 8 ++++----
 .../Navigation/Category/Configurable/PriceFilterTest.php  | 4 ++--
 .../Block/Navigation/Search/Bundle/PriceFilterTest.php    | 2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Dynamic.php b/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Dynamic.php
index f4b55ce43c421..548a57e55f3e2 100644
--- a/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Dynamic.php
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Aggregation/Builder/Dynamic.php
@@ -46,9 +46,7 @@ public function build(
         /** @var DynamicBucket $bucket */
         $algorithm = $this->algorithmRepository->get($bucket->getMethod(), ['dataProvider' => $dataProvider]);
         $data = $algorithm->getItems($bucket, $dimensions, $this->getEntityStorage($queryResult));
-        $resultData = $this->prepareData($data);
-
-        return $resultData;
+        return $this->prepareData($data);
     }
 
     /**
@@ -78,7 +76,8 @@ private function prepareData($data)
         $resultData = [];
         foreach ($data as $value) {
             $rangeName = "{$value['from']}_{$value['to']}";
-            $resultData[$rangeName] = array_merge(['value' => $rangeName], $value);
+            $value['value'] = $rangeName;
+            $resultData[$rangeName] = $value;
         }
 
         return $resultData;
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 1a95a3d6f4925..dd5b5827c8017 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
@@ -570,8 +570,8 @@ public function testSearchAndFilterByCustomAttribute()
                      ],
                     [
                         'count' => 1,
-                        'label' => '40-*',
-                        'value' => '40_*',
+                        'label' => '40-50',
+                        'value' => '40_50',
 
                     ],
                  ],
@@ -1431,8 +1431,8 @@ public function testFilterProductsForExactMatchingName()
                         'count' => 1,
                     ],
                     [
-                        'label' => '20-*',
-                        'value' => '20_*',
+                        'label' => '20-30',
+                        'value' => '20_30',
                         'count' => 1,
                     ]
                 ]
diff --git a/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/Configurable/PriceFilterTest.php b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/Configurable/PriceFilterTest.php
index 07882b68d62d5..e226881b9cfcc 100644
--- a/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/Configurable/PriceFilterTest.php
+++ b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/Configurable/PriceFilterTest.php
@@ -76,7 +76,7 @@ public function getFiltersDataProvider(): array
                     ],
                     [
                         'label' => '<span class="price">$60.00</span> and above',
-                        'value' => '60-',
+                        'value' => '60-70',
                         'count' => 1,
                     ],
                 ],
@@ -94,7 +94,7 @@ public function getFiltersDataProvider(): array
                     ],
                     [
                         'label' => '<span class="price">$50.00</span> and above',
-                        'value' => '50-',
+                        'value' => '50-60',
                         'count' => 1,
                     ],
                 ],
diff --git a/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Search/Bundle/PriceFilterTest.php b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Search/Bundle/PriceFilterTest.php
index 435dd29e16dfa..760f4031b8844 100644
--- a/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Search/Bundle/PriceFilterTest.php
+++ b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Search/Bundle/PriceFilterTest.php
@@ -32,7 +32,7 @@ public function testGetFilters(): void
             ['is_filterable_in_search' => 1],
             [
                 ['label' => '$10.00 - $19.99', 'value' => '10-20', 'count' => 1],
-                ['label' => '$20.00 and above', 'value' => '20-', 'count' => 1],
+                ['label' => '$20.00 and above', 'value' => '20-30', 'count' => 1],
             ]
         );
     }

From 495832cb9ed305c518c9ed762f0d36ef2adbc83c Mon Sep 17 00:00:00 2001
From: Viktor Sevch <viktor.sevch@transoftgroup.com>
Date: Wed, 17 Jun 2020 14:53:53 +0300
Subject: [PATCH 0498/1718] =?UTF-8?q?MC-35197:=20Unexpected=20loading=20of?=
 =?UTF-8?q?=20the=20=E2=80=9CCreate=20New=20Order=E2=80=9D=20page=20in=20t?=
 =?UTF-8?q?he=20Magento=20Admin=20panel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/order/create/form.phtml         | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form.phtml
index 80749b9c55a4b..bd2e08d30ccdd 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form.phtml
@@ -24,31 +24,31 @@
         <?= $block->getChildHtml('data') ?>
     </div>
 </form>
-<?php $scriptString = <<<script
+<?php $scriptString = <<<Script
 require(['jquery'], function($){
     'use strict';
 
-script;
+Script;
 if ($block->getCustomerSelectorDisplay()) {
-    $scriptString .= <<<script
+    $scriptString .= <<<Script
     $('div#order-customer-selector').css('display', '{$block->getCustomerSelectorDisplay()}');
     $('div#order-customer-selector').removeClass('no-display');
-script;
+Script;
 }
 if ($block->getStoreSelectorDisplay()) {
-    $scriptString .= <<<script
+    $scriptString .= <<<Script
     $('div#order-store-selector').css('display', '{$block->getStoreSelectorDisplay()}');
     $('div#order-store-selector').removeClass('no-display');
-script;
+Script;
 }
 if ($block->getDataSelectorDisplay()) {
-    $scriptString .= <<<script
+    $scriptString .= <<<Script
     $('div#order-data').css('display', '{$block->getDataSelectorDisplay()}');
     $('div#order-data').removeClass('no-display');
-script;
+Script;
 }
-$scriptString .= <<<script
+$scriptString .= <<<Script
 });
-script;
+Script;
 ?>
 <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>

From 5b65095b557102c98d90530e8b0e4b388e16c190 Mon Sep 17 00:00:00 2001
From: Oleksandr Melnyk <sasha19957099@gmail.com>
Date: Wed, 17 Jun 2020 15:00:57 +0300
Subject: [PATCH 0499/1718] magento/magento2#28579:DependencyTest does not
 analyze GraphQL schema files - fixed tests

---
 .../Framework/GraphQl/GraphQlConfigTest.php    |  6 ++++--
 .../Dependency/DependencyProvider.php          | 12 +++++++-----
 .../GraphQlSchemaDependencyProvider.php        | 18 +++++++++++++-----
 .../Test/Integrity/GraphQlDependencyTest.php   |  6 +++++-
 .../GraphQlSchemaStitching/GraphQlReader.php   | 12 ++++++++----
 5 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/GraphQlConfigTest.php b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/GraphQlConfigTest.php
index 5d4047b1456d5..5f62888596348 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/GraphQlConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/GraphQlConfigTest.php
@@ -36,9 +36,11 @@ protected function setUp(): void
         $fileResolverMock = $this->getMockBuilder(
             \Magento\Framework\Config\FileResolverInterface::class
         )->disableOriginalConstructor()->getMock();
+        $filePath1 = __DIR__ . '/_files/schemaC.graphqls';
+        $filePath2 = __DIR__ . '/_files/schemaD.graphqls';
         $fileList = [
-            file_get_contents(__DIR__ . '/_files/schemaC.graphqls'),
-            file_get_contents(__DIR__ . '/_files/schemaD.graphqls')
+            $filePath1 => file_get_contents($filePath1),
+            $filePath2 => file_get_contents($filePath2)
         ];
         $fileResolverMock->expects($this->any())->method('get')->willReturn($fileList);
         $graphQlReader = $objectManager->create(
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DependencyProvider.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DependencyProvider.php
index a29e39a31b9e5..a01a538e198a9 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DependencyProvider.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DependencyProvider.php
@@ -1,4 +1,10 @@
 <?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
 
 namespace Magento\Test\Integrity\Dependency;
 
@@ -82,11 +88,7 @@ protected function initDeclaredDependencies()
      * @return void
      * @throws \Exception
      */
-    protected function presetDependencies(
-        string $moduleName,
-        array $packageNames,
-        string $type
-    ): void
+    protected function presetDependencies(string $moduleName, array $packageNames, string $type): void
     {
         $packageNames = array_filter($packageNames, function ($packageName) {
             return $this->getModuleName($packageName) ||
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/GraphQlSchemaDependencyProvider.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/GraphQlSchemaDependencyProvider.php
index f210813c797c4..b43308513d5ec 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/GraphQlSchemaDependencyProvider.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/GraphQlSchemaDependencyProvider.php
@@ -1,12 +1,19 @@
 <?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
 
 namespace Magento\Test\Integrity\Dependency;
 
 use Magento\Framework\App\Bootstrap;
 
 /**
- * Class GraphQlSchemaDependencyProvider
- * @package Magento\Test\Integrity\Dependency
+ * Provide information on the dependency between the modules according to the GraphQL schema.
+ *
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  */
 class GraphQlSchemaDependencyProvider extends DependencyProvider
 {
@@ -98,10 +105,11 @@ private function getDependenciesFromSchema(string $moduleName): array
 
         $dependencies = [];
 
-        foreach ($schema as $typeName => $type) {
+        foreach ($schema as $type) {
             if (isset($type['module']) && $type['module'] == $moduleName && isset($type['implements'])) {
-                foreach ($type['implements'] as $interfaceName => $interfaceData) {
-                    $dependOnModule = $schema[$interfaceName]['module'];
+                $interfaces = array_keys($type['implements']);
+                foreach ($interfaces as $interface) {
+                    $dependOnModule = $schema[$interface]['module'];
                     if ($dependOnModule != $moduleName) {
                         $dependencies[] = $dependOnModule;
                     }
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/GraphQlDependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/GraphQlDependencyTest.php
index c9684a9a4be76..edd611ad9fd0f 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/GraphQlDependencyTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/GraphQlDependencyTest.php
@@ -1,9 +1,13 @@
 <?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
 
+declare(strict_types=1);
 
 namespace Magento\Test\Integrity;
 
-
 use Magento\Framework\App\Utility\Files;
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Test\Integrity\Dependency\GraphQlSchemaDependencyProvider;
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
index fc922bced9003..c56b0256ca53b 100644
--- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
@@ -9,8 +9,8 @@
 
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\Config\FileResolverInterface;
-use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\TypeMetaReaderInterface as TypeReaderComposite;
 use Magento\Framework\Config\ReaderInterface;
+use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\TypeMetaReaderInterface as TypeReaderComposite;
 
 /**
  * Reads *.graphqls files from modules and combines the results as array to be used with a library to configure objects
@@ -67,7 +67,10 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
+     * @param string|null $scope
+     * @return array
      */
     public function read($scope = null) : array
     {
@@ -335,8 +338,9 @@ private function addModuleNameToTypes(array $source, string $filePath): array
     {
         foreach ($source as $typeName => $type) {
             if (!isset($type['module']) && (
-                    ($type['type'] == 'graphql_interface' && isset($type['typeResolver']))
-                    || isset($type['implements']))
+                ($type['type'] == 'graphql_interface' && isset($type['typeResolver']))
+                    || isset($type['implements'])
+            )
             ) {
                 $source[$typeName]['module'] = self::getModuleNameForRelevantFile($filePath);
             }

From 308ef0e7932653cfedfdc1cc3176da3b8b8faaec Mon Sep 17 00:00:00 2001
From: Marjan Petkovski <petkovski.marjan@gmail.com>
Date: Wed, 10 Jun 2020 14:39:50 +0200
Subject: [PATCH 0500/1718] Make Customer Group Id available to Context

---
 .../Model/Context/AddUserInfoToContext.php    | 26 +++++++++++++++++--
 .../etc/extension_attributes.xml              |  3 ++-
 .../Magento/CustomerGraphQl/etc/module.xml    |  3 +++
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/CustomerGraphQl/Model/Context/AddUserInfoToContext.php b/app/code/Magento/CustomerGraphQl/Model/Context/AddUserInfoToContext.php
index 0f0b91967e473..247ad1fa23656 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Context/AddUserInfoToContext.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Context/AddUserInfoToContext.php
@@ -10,6 +10,8 @@
 use Magento\Authorization\Model\UserContextInterface;
 use Magento\GraphQl\Model\Query\ContextParametersInterface;
 use Magento\GraphQl\Model\Query\ContextParametersProcessorInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\GroupInterface;
 
 /**
  * @inheritdoc
@@ -21,13 +23,21 @@ class AddUserInfoToContext implements ContextParametersProcessorInterface
      */
     private $userContext;
 
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
     /**
      * @param UserContextInterface $userContext
+     * @param CustomerRepositoryInterface $customerRepository
      */
     public function __construct(
-        UserContextInterface $userContext
+        UserContextInterface $userContext,
+        CustomerRepositoryInterface $customerRepository
     ) {
         $this->userContext = $userContext;
+        $this->customerRepository = $customerRepository;
     }
 
     /**
@@ -47,7 +57,19 @@ public function execute(ContextParametersInterface $contextParameters): ContextP
         }
         $contextParameters->setUserType($currentUserType);
 
-        $contextParameters->addExtensionAttribute('is_customer', $this->isCustomer($currentUserId, $currentUserType));
+        if ($isCustomer = $this->isCustomer($currentUserId, $currentUserType)) {
+
+            $contextParameters->addExtensionAttribute('is_customer', $isCustomer);
+
+            try {
+                $customerGroupId = $this->customerRepository->getById($currentUserId)->getGroupId();
+            } catch (\Exception $e) {
+                $customerGroupId = GroupInterface::NOT_LOGGED_IN_ID;
+            }
+
+            $contextParameters->addExtensionAttribute('customer_group_id', $customerGroupId);
+        }
+
         return $contextParameters;
     }
 
diff --git a/app/code/Magento/CustomerGraphQl/etc/extension_attributes.xml b/app/code/Magento/CustomerGraphQl/etc/extension_attributes.xml
index 26840551eaeb8..b8bdb5a46ca81 100644
--- a/app/code/Magento/CustomerGraphQl/etc/extension_attributes.xml
+++ b/app/code/Magento/CustomerGraphQl/etc/extension_attributes.xml
@@ -8,5 +8,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Api/etc/extension_attributes.xsd">
     <extension_attributes for="Magento\GraphQl\Model\Query\ContextInterface">
         <attribute code="is_customer" type="boolean"/>
+        <attribute code="customer_group_id" type="integer"/>
     </extension_attributes>
-</config>
\ No newline at end of file
+</config>
diff --git a/app/code/Magento/CustomerGraphQl/etc/module.xml b/app/code/Magento/CustomerGraphQl/etc/module.xml
index eeed4862bbbfd..ab21c6411bef6 100644
--- a/app/code/Magento/CustomerGraphQl/etc/module.xml
+++ b/app/code/Magento/CustomerGraphQl/etc/module.xml
@@ -7,4 +7,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
     <module name="Magento_CustomerGraphQl"/>
+        <sequence>
+            <module name="Magento_Customer"/>
+        </sequence>
 </config>

From 332369d81ca99be42514df19f0aaaa84c8ee96c4 Mon Sep 17 00:00:00 2001
From: Marjan Petkovski <petkovski.marjan@gmail.com>
Date: Wed, 17 Jun 2020 13:57:42 +0200
Subject: [PATCH 0501/1718] magento/magento2#28563: Pass the context to get
 product search results based on catalog permissions

---
 .../Model/Resolver/Category/ProductsCount.php        |  2 +-
 .../CatalogGraphQl/Model/Resolver/Product.php        |  4 ++--
 .../CatalogGraphQl/Model/Resolver/Products.php       |  2 +-
 .../Products/DataProvider/Deferred/Product.php       | 12 ++++++++----
 .../Model/Resolver/Products/DataProvider/Product.php |  7 +++++--
 .../CollectionProcessor/AttributeProcessor.php       |  4 +++-
 .../ExtensibleEntityProcessor.php                    | 10 ++++------
 .../CollectionProcessor/MediaGalleryProcessor.php    |  4 +++-
 .../CollectionProcessor/RequiredColumnsProcessor.php |  4 +++-
 .../CollectionProcessor/SearchCriteriaProcessor.php  |  4 +++-
 .../Product/CollectionProcessor/StockProcessor.php   |  4 +++-
 .../VisibilityStatusProcessor.php                    |  4 +++-
 .../Product/CollectionProcessorInterface.php         |  5 ++++-
 .../Product/CompositeCollectionProcessor.php         |  6 ++++--
 .../Resolver/Products/DataProvider/ProductSearch.php |  7 +++++--
 .../Model/Resolver/Products/Query/Filter.php         |  7 +++++--
 .../Products/Query/ProductQueryInterface.php         |  4 +++-
 .../Model/Resolver/Products/Query/Search.php         |  8 +++++---
 .../Model/Resolver/Batch/AbstractLikedProducts.php   |  7 ++++---
 19 files changed, 69 insertions(+), 36 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/ProductsCount.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/ProductsCount.php
index 397fd12b7e714..744501e04878f 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/ProductsCount.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/ProductsCount.php
@@ -63,7 +63,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         $category = $value['model'];
         $productsCollection = $category->getProductCollection();
         $productsCollection->setVisibility($this->catalogProductVisibility->getVisibleInSiteIds());
-        $productsCollection = $this->stockProcessor->process($productsCollection, $this->searchCriteria, []);
+        $productsCollection = $this->stockProcessor->process($productsCollection, $this->searchCriteria, [], $context);
 
         return $productsCollection->getSize();
     }
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product.php
index 889735a5f4d88..df725c02eb5bd 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product.php
@@ -63,8 +63,8 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         $fields = $this->productFieldsSelector->getProductFieldsFromInfo($info);
         $this->productDataProvider->addEavAttributes($fields);
 
-        $result = function () use ($value) {
-            $data = $value['product'] ?? $this->productDataProvider->getProductBySku($value['sku']);
+        $result = function () use ($value, $context) {
+            $data = $value['product'] ?? $this->productDataProvider->getProductBySku($value['sku'], $context);
             if (empty($data)) {
                 return null;
             }
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products.php
index e3d9ba2a9b3c6..1a244b8a10546 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products.php
@@ -69,7 +69,7 @@ public function resolve(
             );
         }
 
-        $searchResult = $this->searchQuery->getResult($args, $info);
+        $searchResult = $this->searchQuery->getResult($args, $info, $context);
 
         if ($searchResult->getCurrentPage() > $searchResult->getTotalPages() && $searchResult->getTotalCount() > 0) {
             throw new GraphQlInputException(
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Deferred/Product.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Deferred/Product.php
index 86616cc14fe50..ff4141cc0dca4 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Deferred/Product.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Deferred/Product.php
@@ -10,6 +10,7 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product as ProductDataProvider;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\GraphQl\Model\Query\ContextInterface;
 
 /**
  * Deferred resolver for product data.
@@ -102,11 +103,12 @@ public function addEavAttributes(array $attributeCodes) : void
      * Get product from result set.
      *
      * @param string $sku
+     * @param ContextInterface $context
      * @return array
      */
-    public function getProductBySku(string $sku) : array
+    public function getProductBySku(string $sku, ContextInterface $context) : array
     {
-        $products = $this->fetch();
+        $products = $this->fetch($context);
 
         if (!isset($products[$sku])) {
             return [];
@@ -118,9 +120,10 @@ public function getProductBySku(string $sku) : array
     /**
      * Fetch product data and return in array format. Keys for products will be their skus.
      *
+     * @param ContextInterface $context
      * @return array
      */
-    private function fetch() : array
+    private function fetch(ContextInterface $context) : array
     {
         if (empty($this->productSkus) || !empty($this->productList)) {
             return $this->productList;
@@ -131,7 +134,8 @@ private function fetch() : array
             $this->searchCriteriaBuilder->create(),
             $this->attributeCodes,
             false,
-            true
+            true,
+            $context
         );
 
         /** @var \Magento\Catalog\Model\Product $product */
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product.php
index 2076ec6726988..e17b938fa15e1 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product.php
@@ -14,6 +14,7 @@
 use Magento\Catalog\Api\Data\ProductSearchResultsInterfaceFactory;
 use Magento\Framework\Api\SearchResultsInterface;
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessorInterface;
+use Magento\GraphQl\Model\Query\ContextInterface;
 
 /**
  * Product field data provider, used for GraphQL resolver processing.
@@ -73,18 +74,20 @@ public function __construct(
      * @param string[] $attributes
      * @param bool $isSearch
      * @param bool $isChildSearch
+     * @param ContextInterface $context
      * @return SearchResultsInterface
      */
     public function getList(
         SearchCriteriaInterface $searchCriteria,
         array $attributes = [],
         bool $isSearch = false,
-        bool $isChildSearch = false
+        bool $isChildSearch = false,
+        ContextInterface $context
     ): SearchResultsInterface {
         /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $collection */
         $collection = $this->collectionFactory->create();
 
-        $this->collectionPreProcessor->process($collection, $searchCriteria, $attributes);
+        $this->collectionPreProcessor->process($collection, $searchCriteria, $attributes, $context);
 
         if (!$isChildSearch) {
             $visibilityIds = $isSearch
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/AttributeProcessor.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/AttributeProcessor.php
index fef224b12acfc..ba769bd8fce3d 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/AttributeProcessor.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/AttributeProcessor.php
@@ -10,6 +10,7 @@
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\GraphQl\Model\Query\ContextInterface;
 
 /**
  * Adds passed in attributes to product collection results
@@ -39,7 +40,8 @@ public function __construct($fieldToAttributeMap = [])
     public function process(
         Collection $collection,
         SearchCriteriaInterface $searchCriteria,
-        array $attributeNames
+        array $attributeNames,
+        ContextInterface $context
     ): Collection {
         foreach ($attributeNames as $name) {
             $this->addAttribute($collection, $name);
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/ExtensibleEntityProcessor.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/ExtensibleEntityProcessor.php
index 5fff991c0d6cd..e348fe1dfdf04 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/ExtensibleEntityProcessor.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/ExtensibleEntityProcessor.php
@@ -11,6 +11,7 @@
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
+use Magento\GraphQl\Model\Query\ContextInterface;
 
 /**
  * Add necessary joins for extensible entities.
@@ -33,16 +34,13 @@ public function __construct(JoinProcessorInterface $joinProcessor)
     }
 
     /**
-     * @param Collection $collection
-     * @param SearchCriteriaInterface $searchCriteria
-     * @param array $attributeNames
-     * @return Collection
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @inheritdoc
      */
     public function process(
         Collection $collection,
         SearchCriteriaInterface $searchCriteria,
-        array $attributeNames
+        array $attributeNames,
+        ContextInterface $context
     ): Collection {
         $this->joinProcessor->process($collection);
 
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/MediaGalleryProcessor.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/MediaGalleryProcessor.php
index be300e11f12ec..5f5b7f14d3f61 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/MediaGalleryProcessor.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/MediaGalleryProcessor.php
@@ -11,6 +11,7 @@
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Catalog\Model\Product\Media\Config as MediaConfig;
+use Magento\GraphQl\Model\Query\ContextInterface;
 
 /**
  * Add attributes required for every GraphQL product resolution process.
@@ -40,7 +41,8 @@ public function __construct(MediaConfig $mediaConfig)
     public function process(
         Collection $collection,
         SearchCriteriaInterface $searchCriteria,
-        array $attributeNames
+        array $attributeNames,
+        ContextInterface $context
     ): Collection {
         if (in_array('media_gallery_entries', $attributeNames)) {
             $mediaAttributes = $this->mediaConfig->getMediaAttributeCodes();
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/RequiredColumnsProcessor.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/RequiredColumnsProcessor.php
index 4c5b657874713..7d8ccf43f892f 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/RequiredColumnsProcessor.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/RequiredColumnsProcessor.php
@@ -10,6 +10,7 @@
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\GraphQl\Model\Query\ContextInterface;
 
 /**
  * Add attributes required for every GraphQL product resolution process.
@@ -24,7 +25,8 @@ class RequiredColumnsProcessor implements CollectionProcessorInterface
     public function process(
         Collection $collection,
         SearchCriteriaInterface $searchCriteria,
-        array $attributeNames
+        array $attributeNames,
+        ContextInterface $context
     ): Collection {
         $collection->addAttributeToSelect('special_price');
         $collection->addAttributeToSelect('special_price_from');
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/SearchCriteriaProcessor.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/SearchCriteriaProcessor.php
index e4c338f599577..bbb5b11135d27 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/SearchCriteriaProcessor.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/SearchCriteriaProcessor.php
@@ -11,6 +11,7 @@
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface as SearchCriteriaApplier;
+use Magento\GraphQl\Model\Query\ContextInterface;
 
 /**
  * Apply search criteria data to passed in collection.
@@ -38,7 +39,8 @@ public function __construct(SearchCriteriaApplier $searchCriteriaApplier)
     public function process(
         Collection $collection,
         SearchCriteriaInterface $searchCriteria,
-        array $attributeNames
+        array $attributeNames,
+        ContextInterface $context
     ): Collection {
         $this->searchCriteriaApplier->process($searchCriteria, $collection);
 
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/StockProcessor.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/StockProcessor.php
index e68136f64e5cf..66473f74fab6b 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/StockProcessor.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/StockProcessor.php
@@ -12,6 +12,7 @@
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
 use Magento\CatalogInventory\Model\ResourceModel\Stock\Status as StockStatusResource;
+use Magento\GraphQl\Model\Query\ContextInterface;
 
 /**
  * Add stock filtering if configuration requires it.
@@ -46,7 +47,8 @@ public function __construct(StockConfigurationInterface $stockConfig, StockStatu
     public function process(
         Collection $collection,
         SearchCriteriaInterface $searchCriteria,
-        array $attributeNames
+        array $attributeNames,
+        ContextInterface $context
     ): Collection {
         if (!$this->stockConfig->isShowOutOfStock()) {
             $this->stockStatusResource->addIsInStockFilterToCollection($collection);
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/VisibilityStatusProcessor.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/VisibilityStatusProcessor.php
index 30174a94aaba0..019b4cccc8946 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/VisibilityStatusProcessor.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/VisibilityStatusProcessor.php
@@ -10,6 +10,7 @@
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\GraphQl\Model\Query\ContextInterface;
 
 /**
  * Join visibility and status tables to product collection
@@ -24,7 +25,8 @@ class VisibilityStatusProcessor implements CollectionProcessorInterface
     public function process(
         Collection $collection,
         SearchCriteriaInterface $searchCriteria,
-        array $attributeNames
+        array $attributeNames,
+        ContextInterface $context
     ): Collection {
         $collection->joinAttribute('status', 'catalog_product/status', 'entity_id', null, 'inner');
         $collection->joinAttribute('visibility', 'catalog_product/visibility', 'entity_id', null, 'inner');
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessorInterface.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessorInterface.php
index 62501a1a2382b..312aea552bd06 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessorInterface.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessorInterface.php
@@ -9,6 +9,7 @@
 
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\GraphQl\Model\Query\ContextInterface;
 
 /**
  * Add additional joins, attributes, and clauses to a product collection.
@@ -21,11 +22,13 @@ interface CollectionProcessorInterface
      * @param Collection $collection
      * @param SearchCriteriaInterface $searchCriteria
      * @param array $attributeNames
+     * @param ContextInterface $context
      * @return Collection
      */
     public function process(
         Collection $collection,
         SearchCriteriaInterface $searchCriteria,
-        array $attributeNames
+        array $attributeNames,
+        ContextInterface $context
     ): Collection;
 }
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CompositeCollectionProcessor.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CompositeCollectionProcessor.php
index 687899c1e60ac..c2f7565403cb2 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CompositeCollectionProcessor.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CompositeCollectionProcessor.php
@@ -9,6 +9,7 @@
 
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\GraphQl\Model\Query\ContextInterface;
 
 /**
  * {@inheritdoc}
@@ -34,10 +35,11 @@ public function __construct(array $collectionProcessors = [])
     public function process(
         Collection $collection,
         SearchCriteriaInterface $searchCriteria,
-        array $attributeNames
+        array $attributeNames,
+        ContextInterface $context
     ): Collection {
         foreach ($this->collectionProcessors as $collectionProcessor) {
-            $collection = $collectionProcessor->process($collection, $searchCriteria, $attributeNames);
+            $collection = $collectionProcessor->process($collection, $searchCriteria, $attributeNames, $context);
         }
 
         return $collection;
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 4c83afb89cc46..bb963cb9b5e01 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php
@@ -18,6 +18,7 @@
 use Magento\Framework\Api\Search\SearchResultInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\Api\SearchResultsInterface;
+use Magento\GraphQl\Model\Query\ContextInterface;
 
 /**
  * Product field data provider for product search, used for GraphQL resolver processing.
@@ -84,12 +85,14 @@ public function __construct(
      * @param SearchCriteriaInterface $searchCriteria
      * @param SearchResultInterface $searchResult
      * @param array $attributes
+     * @param ContextInterface $context
      * @return SearchResultsInterface
      */
     public function getList(
         SearchCriteriaInterface $searchCriteria,
         SearchResultInterface $searchResult,
-        array $attributes = []
+        array $attributes = [],
+        ContextInterface $context
     ): SearchResultsInterface {
         /** @var Collection $collection */
         $collection = $this->collectionFactory->create();
@@ -103,7 +106,7 @@ public function getList(
             $this->getSortOrderArray($searchCriteriaForCollection)
         )->apply();
 
-        $this->collectionPreProcessor->process($collection, $searchCriteriaForCollection, $attributes);
+        $this->collectionPreProcessor->process($collection, $searchCriteriaForCollection, $attributes, $context);
         $collection->load();
         $this->collectionPostProcessor->process($collection, $attributes);
 
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Filter.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Filter.php
index 670eee9c4583e..5016e17e8b8e8 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Filter.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Filter.php
@@ -16,6 +16,7 @@
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product as ProductProvider;
 use Magento\CatalogGraphQl\Model\Resolver\Products\SearchResult;
 use Magento\CatalogGraphQl\Model\Resolver\Products\SearchResultFactory;
+use Magento\GraphQl\Model\Query\ContextInterface;
 use Magento\Search\Model\Query;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Store\Model\ScopeInterface;
@@ -84,16 +85,18 @@ public function __construct(
      *
      * @param array $args
      * @param ResolveInfo $info
+     * @param ContextInterface $context
      * @return SearchResult
      */
     public function getResult(
         array $args,
-        ResolveInfo $info
+        ResolveInfo $info,
+        ContextInterface $context
     ): SearchResult {
         $fields = $this->fieldSelection->getProductsFieldSelection($info);
         try {
             $searchCriteria = $this->buildSearchCriteria($args, $info);
-            $searchResults = $this->productDataProvider->getList($searchCriteria, $fields);
+            $searchResults = $this->productDataProvider->getList($searchCriteria, $fields, false, false, $context);
         } catch (InputException $e) {
             return $this->createEmptyResult($args);
         }
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/ProductQueryInterface.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/ProductQueryInterface.php
index 580af5d87be26..fca6f3d4f7770 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/ProductQueryInterface.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/ProductQueryInterface.php
@@ -8,6 +8,7 @@
 
 use Magento\CatalogGraphQl\Model\Resolver\Products\SearchResult;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\GraphQl\Model\Query\ContextInterface;
 
 /**
  * Search for products by criteria
@@ -19,7 +20,8 @@ interface ProductQueryInterface
      *
      * @param array $args
      * @param ResolveInfo $info
+     * @param ContextInterface $context
      * @return SearchResult
      */
-    public function getResult(array $args, ResolveInfo $info): SearchResult;
+    public function getResult(array $args, ResolveInfo $info, ContextInterface $context): SearchResult;
 }
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search.php
index fbb0e42f2afeb..29c3ce279e6a1 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search.php
@@ -13,6 +13,7 @@
 use Magento\CatalogGraphQl\Model\Resolver\Products\SearchResultFactory;
 use Magento\Framework\Api\Search\SearchCriteriaInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\GraphQl\Model\Query\ContextInterface;
 use Magento\Search\Api\SearchInterface;
 use Magento\Search\Model\Search\PageSizeProvider;
 
@@ -80,12 +81,13 @@ public function __construct(
      *
      * @param array $args
      * @param ResolveInfo $info
+     * @param ContextInterface $context
      * @return SearchResult
-     * @throws \Exception
      */
     public function getResult(
         array $args,
-        ResolveInfo $info
+        ResolveInfo $info,
+        ContextInterface $context
     ): SearchResult {
         $queryFields = $this->fieldSelection->getProductsFieldSelection($info);
         $searchCriteria = $this->buildSearchCriteria($args, $info);
@@ -101,7 +103,7 @@ public function getResult(
         //Address limitations of sort and pagination on search API apply original pagination from GQL query
         $searchCriteria->setPageSize($realPageSize);
         $searchCriteria->setCurrentPage($realCurrentPage);
-        $searchResults = $this->productsProvider->getList($searchCriteria, $itemsResults, $queryFields);
+        $searchResults = $this->productsProvider->getList($searchCriteria, $itemsResults, $queryFields, $context);
 
         $totalPages = $realPageSize ? ((int)ceil($searchResults->getTotalCount() / $realPageSize)) : 0;
 
diff --git a/app/code/Magento/RelatedProductGraphQl/Model/Resolver/Batch/AbstractLikedProducts.php b/app/code/Magento/RelatedProductGraphQl/Model/Resolver/Batch/AbstractLikedProducts.php
index 7ad2e5dde2985..bcd3074b7be0a 100644
--- a/app/code/Magento/RelatedProductGraphQl/Model/Resolver/Batch/AbstractLikedProducts.php
+++ b/app/code/Magento/RelatedProductGraphQl/Model/Resolver/Batch/AbstractLikedProducts.php
@@ -82,7 +82,7 @@ abstract protected function getLinkType(): int;
      * @param int $linkType
      * @return \Magento\Catalog\Api\Data\ProductInterface[][]
      */
-    private function findRelations(array $products, array $loadAttributes, int $linkType): array
+    private function findRelations(array $products, array $loadAttributes, int $linkType, ContextInterface $context): array
     {
         //Loading relations
         $relations = $this->relatedProductDataProvider->getRelations($products, $linkType);
@@ -97,7 +97,8 @@ private function findRelations(array $products, array $loadAttributes, int $link
             $this->searchCriteriaBuilder->create(),
             $loadAttributes,
             false,
-            true
+            true,
+            $context
         );
         //Filling related products map.
         /** @var \Magento\Catalog\Api\Data\ProductInterface[] $relatedProducts */
@@ -141,7 +142,7 @@ public function resolve(ContextInterface $context, Field $field, array $requests
         $fields = array_unique(array_merge(...$fields));
 
         //Finding relations.
-        $related = $this->findRelations($products, $fields, $this->getLinkType());
+        $related = $this->findRelations($products, $fields, $this->getLinkType(), $context);
 
         //Matching requests with responses.
         $response = new BatchResponse();

From 8818e304323b3c048db7432c2b8302eff81bc54a Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Wed, 17 Jun 2020 11:45:15 +0300
Subject: [PATCH 0502/1718] magento/magento2-login-as-customer#172: Persistent
 banner is not shown when admin is logged in as customer.

---
 .../Magento/LoginAsCustomerFrontendUi/etc/frontend/di.xml  | 7 +++++++
 .../view/frontend/web/js/view/loginAsCustomer.js           | 7 ++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/etc/frontend/di.xml b/app/code/Magento/LoginAsCustomerFrontendUi/etc/frontend/di.xml
index 6e595270f0b04..2204402b7dd30 100644
--- a/app/code/Magento/LoginAsCustomerFrontendUi/etc/frontend/di.xml
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/etc/frontend/di.xml
@@ -6,6 +6,13 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Customer\CustomerData\SectionPoolInterface">
+        <arguments>
+            <argument name="sectionSourceMap" xsi:type="array">
+                <item name="loggedAsCustomer" xsi:type="string">Magento\LoginAsCustomerFrontendUi\CustomerData\LoginAsCustomerUi</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Framework\App\ActionInterface">
         <plugin name="invalidate_expired_session_plugin"
                 type="Magento\LoginAsCustomerFrontendUi\Plugin\InvalidateExpiredSessionPlugin"/>
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/web/js/view/loginAsCustomer.js b/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/web/js/view/loginAsCustomer.js
index 9687525ee26eb..c19adbf0dfb4f 100644
--- a/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/web/js/view/loginAsCustomer.js
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/web/js/view/loginAsCustomer.js
@@ -5,10 +5,11 @@
 
 define([
     'jquery',
+    'underscore',
     'uiComponent',
     'Magento_Customer/js/customer-data',
     'mage/translate'
-], function ($, Component, customer) {
+], function ($, _, Component, customer) {
     'use strict';
 
     return Component.extend({
@@ -63,8 +64,8 @@ define([
 
             if (this.fullname !== undefined && this.websiteName !== undefined) {
                 this.notificationText($.mage.__('You are connected as <strong>%1</strong> on %2')
-                    .replace('%1', this.fullname)
-                    .replace('%2', this.websiteName));
+                    .replace('%1', _.escape(this.fullname))
+                    .replace('%2', _.escape(this.websiteName)));
             }
         }
     });

From 74a48fd21a694a43a2417e5a4586a6ceb52bf082 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Wed, 17 Jun 2020 11:04:56 -0500
Subject: [PATCH 0503/1718] magento/magento2-login-as-customer#171: Force
 customer logout during admin logout without additional MySQL queries

---
 app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php b/app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php
index 0a4f61469b031..244fed20c21e8 100644
--- a/app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php
+++ b/app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php
@@ -14,6 +14,8 @@
 
 /**
  * Delete all Login as Customer sessions for logging out admin.
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class AdminLogoutPlugin
 {

From ce1464ed96766c0ab5b399e4574e784ea1e332cd Mon Sep 17 00:00:00 2001
From: Oleksandr Melnyk <sasha19957099@gmail.com>
Date: Thu, 18 Jun 2020 01:22:49 +0300
Subject: [PATCH 0504/1718] magento/magento2#28579:DependencyTest does not
 analyze GraphQL schema files - fixed static and integration tests

---
 .../GraphQl/Config/GraphQlReaderTest.php       | 18 ++++++++++--------
 .../Framework/GraphQl/GraphQlConfigTest.php    |  2 ++
 .../DeclarativeSchemaDependencyProvider.php    |  3 +++
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php
index 79c8765dd4220..6c20590bd23a6 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php
@@ -47,9 +47,11 @@ protected function setUp(): void
         $fileResolverMock = $this->getMockBuilder(
             \Magento\Framework\Config\FileResolverInterface::class
         )->disableOriginalConstructor()->getMock();
+        $filePath1 = __DIR__ . '/../_files/schemaA.graphqls';
+        $filePath2 = __DIR__ . '/../_files/schemaB.graphqls';
         $fileList = [
-            file_get_contents(__DIR__ . '/../_files/schemaA.graphqls'),
-            file_get_contents(__DIR__ . '/../_files/schemaB.graphqls')
+            $filePath1 => file_get_contents($filePath1),
+            $filePath2 => file_get_contents($filePath2)
         ];
         $fileResolverMock->expects($this->any())->method('get')->willReturn($fileList);
         $graphQlReader = $this->objectManager->create(
@@ -219,31 +221,31 @@ function ($a, $b) {
         }
         //Checks to make sure that the given description exists in the expectedOutput array
         $this->assertArrayHasKey(
-            
+
                 array_search(
                     'Comment for empty PhysicalProductInterface',
                     array_column($expectedOutput, 'description')
                 ),
                 $expectedOutput
-            
+
         );
         $this->assertArrayHasKey(
-            
+
                 array_search(
                     'Comment for empty Enum',
                     array_column($expectedOutput, 'description')
                 ),
                 $expectedOutput
-            
+
         );
         $this->assertArrayHasKey(
-            
+
                 array_search(
                     'Comment for SearchResultPageInfo',
                     array_column($expectedOutput, 'description')
                 ),
                 $expectedOutput
-            
+
         );
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/GraphQlConfigTest.php b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/GraphQlConfigTest.php
index 5f62888596348..f74d96bcc42a3 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/GraphQlConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/GraphQlConfigTest.php
@@ -48,10 +48,12 @@ protected function setUp(): void
             ['fileResolver' => $fileResolverMock]
         );
         $reader = $objectManager->create(
+            // phpstan:ignore
             \Magento\Framework\GraphQlSchemaStitching\Reader::class,
             ['readers' => ['graphql_reader' => $graphQlReader]]
         );
         $data = $objectManager->create(
+            // phpstan:ignore
             \Magento\Framework\GraphQl\Config\Data ::class,
             ['reader' => $reader]
         );
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php
index 332e1b88a53fe..84b5533326b06 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php
@@ -67,6 +67,7 @@ public function getDeclaredExistingModuleDependencies(string $moduleName): array
         foreach ($dependencies as $dependency) {
             $checkResult = array_intersect($declared, $dependency);
             if ($checkResult) {
+                //phpcs:ignore Magento2.Performance.ForeachArrayMerge
                 $existingDeclared = array_merge($existingDeclared, array_values($checkResult));
             }
         }
@@ -161,6 +162,7 @@ private function filterComplexDependency(string $moduleName, array $modules): ar
         } else {
             foreach ($modules as $dependencySet) {
                 if (array_search($moduleName, $dependencySet) === false) {
+                    //phpcs:ignore Magento2.Performance.ForeachArrayMerge
                     $resultDependencies = array_merge(
                         $resultDependencies,
                         $dependencySet
@@ -406,6 +408,7 @@ private function getConstraintDependencies(array $moduleDeclaration): array
                     $this->getDependencyId($tableName, self::SCHEMA_ENTITY_CONSTRAINT, $constraintName);
                 switch ($constraintDeclaration['type']) {
                     case 'foreign':
+                        //phpcs:ignore Magento2.Performance.ForeachArrayMerge
                         $constraintDependencies = array_merge(
                             $constraintDependencies,
                             $this->getFKDependencies($constraintDeclaration)

From 6f62bea96c0521ac597b280f2fb8494e7982ca05 Mon Sep 17 00:00:00 2001
From: Oleksandr Melnyk <sasha19957099@gmail.com>
Date: Thu, 18 Jun 2020 10:13:53 +0300
Subject: [PATCH 0505/1718] magento/magento2#28579:DependencyTest does not
 analyze GraphQL schema files - fixed static code style test

---
 .../GraphQl/Config/GraphQlReaderTest.php      | 36 ++++++++-----------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php
index 6c20590bd23a6..96e31a753adaa 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php
@@ -221,31 +221,25 @@ function ($a, $b) {
         }
         //Checks to make sure that the given description exists in the expectedOutput array
         $this->assertArrayHasKey(
-
-                array_search(
-                    'Comment for empty PhysicalProductInterface',
-                    array_column($expectedOutput, 'description')
-                ),
-                $expectedOutput
-
+            array_search(
+                'Comment for empty PhysicalProductInterface',
+                array_column($expectedOutput, 'description')
+            ),
+            $expectedOutput
         );
         $this->assertArrayHasKey(
-
-                array_search(
-                    'Comment for empty Enum',
-                    array_column($expectedOutput, 'description')
-                ),
-                $expectedOutput
-
+            array_search(
+                'Comment for empty Enum',
+                array_column($expectedOutput, 'description')
+            ),
+            $expectedOutput
         );
         $this->assertArrayHasKey(
-
-                array_search(
-                    'Comment for SearchResultPageInfo',
-                    array_column($expectedOutput, 'description')
-                ),
-                $expectedOutput
-
+            array_search(
+                'Comment for SearchResultPageInfo',
+                array_column($expectedOutput, 'description')
+            ),
+            $expectedOutput
         );
     }
 }

From 50639da7edd7e36d1c873060df789edd4f2a9d25 Mon Sep 17 00:00:00 2001
From: Oleksandr Melnyk <sasha19957099@gmail.com>
Date: Thu, 18 Jun 2020 11:00:46 +0300
Subject: [PATCH 0506/1718] magento/magento2#28579:DependencyTest does not
 analyze GraphQL schema files - composer.lock changes

---
 composer.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.lock b/composer.lock
index e5614cfd0ac99..f792088841987 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",

From 54531b3a57aa6828c4a84c4ac4d330dbbe102e63 Mon Sep 17 00:00:00 2001
From: Vova Yatsyuk <vova.yatsyuk@gmail.com>
Date: Thu, 18 Jun 2020 13:27:05 +0300
Subject: [PATCH 0507/1718] Fixed 'Undefined class constant' error when
 interceptor is generated (Plugin).

---
 app/code/Magento/Theme/Block/Html/Title.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Theme/Block/Html/Title.php b/app/code/Magento/Theme/Block/Html/Title.php
index 9059afe19ab05..a2ef83117ccf5 100644
--- a/app/code/Magento/Theme/Block/Html/Title.php
+++ b/app/code/Magento/Theme/Block/Html/Title.php
@@ -101,7 +101,7 @@ public function setPageTitle($pageTitle)
     private function shouldTranslateTitle(): bool
     {
         return $this->scopeConfig->isSetFlag(
-            static::XML_PATH_HEADER_TRANSLATE_TITLE,
+            self::XML_PATH_HEADER_TRANSLATE_TITLE,
             ScopeInterface::SCOPE_STORE
         );
     }

From 0b577a309a97a56cbd031201d635ae4672e25659 Mon Sep 17 00:00:00 2001
From: Dmitriy Gallyamov <dmitrijs.gallamovs@gmail.com>
Date: Thu, 18 Jun 2020 13:31:49 +0300
Subject: [PATCH 0508/1718] magento/magento2#28569:Multi-store: Missing store
 codes in relation to a group and website - Added stores for storeConfig query

---
 .../Store/StoreConfigDataProvider.php         | 30 +++---
 .../Magento/StoreGraphQl/etc/schema.graphqls  |  1 +
 .../GraphQl/Store/StoreConfigResolverTest.php | 95 ++++++++++++++-----
 3 files changed, 87 insertions(+), 39 deletions(-)

diff --git a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
index 59f9831789a35..6f4b7b833f2e2 100644
--- a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
+++ b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
@@ -8,6 +8,7 @@
 namespace Magento\StoreGraphQl\Model\Resolver\Store;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Api\Data\StoreConfigInterface;
 use Magento\Store\Api\StoreConfigManagerInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Api\Data\StoreInterface;
@@ -55,24 +56,26 @@ public function __construct(
      */
     public function getStoreConfigData(StoreInterface $store): array
     {
-        $storeConfigData = array_merge(
-            $this->getBaseConfigData($store),
-            $this->getExtendedConfigData((int)$store->getId())
-        );
-        return $storeConfigData;
+        $stores = $this->storeConfigManager->getStoreConfigs();
+        $defaultStoreConfig = current($this->storeConfigManager->getStoreConfigs([$store->getCode()]));
+        $defaultStoreConfigData = $this->prepareStoreConfigData($defaultStoreConfig);
+
+        foreach ($stores as $storeConfig) {
+            $defaultStoreConfigData['stores'][] = $this->prepareStoreConfigData($storeConfig);
+        }
+
+        return $defaultStoreConfigData;
     }
 
     /**
-     * Get base config data
+     * Prepare store config data
      *
-     * @param StoreInterface $store
+     * @param StoreConfigInterface $storeConfig
      * @return array
      */
-    private function getBaseConfigData(StoreInterface $store) : array
+    private function prepareStoreConfigData($storeConfig): array
     {
-        $storeConfig = current($this->storeConfigManager->getStoreConfigs([$store->getCode()]));
-
-        $storeConfigData = [
+        return array_merge([
             'id' => $storeConfig->getId(),
             'code' => $storeConfig->getCode(),
             'website_id' => $storeConfig->getWebsiteId(),
@@ -83,14 +86,13 @@ private function getBaseConfigData(StoreInterface $store) : array
             'weight_unit' => $storeConfig->getWeightUnit(),
             'base_url' => $storeConfig->getBaseUrl(),
             'base_link_url' => $storeConfig->getBaseLinkUrl(),
-            'base_static_url' => $storeConfig->getSecureBaseStaticUrl(),
+            'base_static_url' => $storeConfig->getBaseStaticUrl(),
             'base_media_url' => $storeConfig->getBaseMediaUrl(),
             'secure_base_url' => $storeConfig->getSecureBaseUrl(),
             'secure_base_link_url' => $storeConfig->getSecureBaseLinkUrl(),
             'secure_base_static_url' => $storeConfig->getSecureBaseStaticUrl(),
             'secure_base_media_url' => $storeConfig->getSecureBaseMediaUrl()
-        ];
-        return $storeConfigData;
+        ], $this->getExtendedConfigData((int)$storeConfig->getId()));
     }
 
     /**
diff --git a/app/code/Magento/StoreGraphQl/etc/schema.graphqls b/app/code/Magento/StoreGraphQl/etc/schema.graphqls
index 919c94684eb21..478b906c54481 100644
--- a/app/code/Magento/StoreGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/StoreGraphQl/etc/schema.graphqls
@@ -31,4 +31,5 @@ type StoreConfig @doc(description: "The type contains information about a store
     secure_base_static_url : String @doc(description: "Secure base static URL for the store")
     secure_base_media_url : String @doc(description: "Secure base media URL for the store")
     store_name : String @doc(description: "Name of the store")
+    stores: [StoreConfig] @doc(description: "Contains information about all stores")
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
index 48619d1392309..0fa1f446892e5 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
@@ -7,10 +7,13 @@
 
 namespace Magento\GraphQl\Store;
 
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Store\Api\Data\StoreConfigInterface;
 use Magento\Store\Api\StoreConfigManagerInterface;
 use Magento\Store\Api\StoreRepositoryInterface;
 use Magento\Store\Api\StoreResolverInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\ObjectManager;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -25,25 +28,28 @@ class StoreConfigResolverTest extends GraphQlAbstract
 
     protected function setUp(): void
     {
-        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->objectManager = Bootstrap::getObjectManager();
     }
 
     /**
      * @magentoApiDataFixture Magento/Store/_files/store.php
-     * @magentoConfigFixture default_store store/information/name Test Store
+     * @magentoConfigFixture default_store store/information/name Default Store
+     * @magentoConfigFixture test_store store/information/name Test Store
      */
     public function testGetStoreConfig()
     {
-        /** @var  StoreConfigManagerInterface $storeConfigsManager */
-        $storeConfigsManager = $this->objectManager->get(StoreConfigManagerInterface::class);
+        /** @var  StoreConfigManagerInterface $defaultStoreConfigsManager */
+        $defaultStoreConfigsManager = $this->objectManager->get(StoreConfigManagerInterface::class);
         /** @var StoreResolverInterface $storeResolver */
         $storeResolver = $this->objectManager->get(StoreResolverInterface::class);
         /** @var StoreRepositoryInterface $storeRepository */
         $storeRepository = $this->objectManager->get(StoreRepositoryInterface::class);
         $storeId = $storeResolver->getCurrentStoreId();
         $store = $storeRepository->getById($storeId);
-        /** @var StoreConfigInterface $storeConfig */
-        $storeConfig = current($storeConfigsManager->getStoreConfigs([$store->getCode()]));
+        /** @var StoreConfigInterface $defaultStoreConfig */
+        $defaultStoreConfig = current($defaultStoreConfigsManager->getStoreConfigs([$store->getCode()]));
+        /** @var StoreConfigInterface $storeConfigs */
+        $storeConfigs = $defaultStoreConfigsManager->getStoreConfigs();
         $query
             = <<<QUERY
 {
@@ -65,32 +71,71 @@ public function testGetStoreConfig()
     secure_base_static_url,
     secure_base_media_url,
     store_name
+    stores {
+        id,
+        code,
+        website_id,
+        locale,
+        base_currency_code,
+        default_display_currency_code,
+        timezone,
+        weight_unit,
+        base_url,
+        base_link_url,
+        base_static_url,
+        base_media_url,
+        secure_base_url,
+        secure_base_link_url,
+        secure_base_static_url,
+        secure_base_media_url,
+        store_name
+    }
   }
 }
 QUERY;
         $response = $this->graphQlQuery($query);
         $this->assertArrayHasKey('storeConfig', $response);
-        $this->assertEquals($storeConfig->getId(), $response['storeConfig']['id']);
-        $this->assertEquals($storeConfig->getCode(), $response['storeConfig']['code']);
-        $this->assertEquals($storeConfig->getLocale(), $response['storeConfig']['locale']);
-        $this->assertEquals($storeConfig->getBaseCurrencyCode(), $response['storeConfig']['base_currency_code']);
+        $this->validateStoreConfig($defaultStoreConfig, $response['storeConfig']);
+
+        $this->assertArrayHasKey('stores', $response['storeConfig']);
+        foreach ($storeConfigs as $key => $storeConfig) {
+            $this->assertArrayHasKey($key, $response['storeConfig']['stores']);
+            $this->validateStoreConfig($storeConfig, $response['storeConfig']['stores'][$key]);
+        }
+    }
+
+    /**
+     * Validate Store Config Data
+     *
+     * @param StoreConfigInterface $storeConfig
+     * @param array $responseConfig
+     */
+    private function validateStoreConfig($storeConfig, $responseConfig): void
+    {
+        /* @var $scopeConfig ScopeConfigInterface */
+        $scopeConfig = $this->objectManager->get(ScopeConfigInterface::class);
+        $this->assertEquals($storeConfig->getId(), $responseConfig['id']);
+        $this->assertEquals($storeConfig->getCode(), $responseConfig['code']);
+        $this->assertEquals($storeConfig->getLocale(), $responseConfig['locale']);
+        $this->assertEquals($storeConfig->getBaseCurrencyCode(), $responseConfig['base_currency_code']);
         $this->assertEquals(
             $storeConfig->getDefaultDisplayCurrencyCode(),
-            $response['storeConfig']['default_display_currency_code']
-        );
-        $this->assertEquals($storeConfig->getTimezone(), $response['storeConfig']['timezone']);
-        $this->assertEquals($storeConfig->getWeightUnit(), $response['storeConfig']['weight_unit']);
-        $this->assertEquals($storeConfig->getBaseUrl(), $response['storeConfig']['base_url']);
-        $this->assertEquals($storeConfig->getBaseLinkUrl(), $response['storeConfig']['base_link_url']);
-        $this->assertEquals($storeConfig->getBaseStaticUrl(), $response['storeConfig']['base_static_url']);
-        $this->assertEquals($storeConfig->getBaseMediaUrl(), $response['storeConfig']['base_media_url']);
-        $this->assertEquals($storeConfig->getSecureBaseUrl(), $response['storeConfig']['secure_base_url']);
-        $this->assertEquals($storeConfig->getSecureBaseLinkUrl(), $response['storeConfig']['secure_base_link_url']);
-        $this->assertEquals(
-            $storeConfig->getSecureBaseStaticUrl(),
-            $response['storeConfig']['secure_base_static_url']
+            $responseConfig['default_display_currency_code']
         );
-        $this->assertEquals($storeConfig->getSecureBaseMediaUrl(), $response['storeConfig']['secure_base_media_url']);
-        $this->assertEquals('Test Store', $response['storeConfig']['store_name']);
+        $this->assertEquals($storeConfig->getTimezone(), $responseConfig['timezone']);
+        $this->assertEquals($storeConfig->getWeightUnit(), $responseConfig['weight_unit']);
+        $this->assertEquals($storeConfig->getBaseUrl(), $responseConfig['base_url']);
+        $this->assertEquals($storeConfig->getBaseLinkUrl(), $responseConfig['base_link_url']);
+        $this->assertEquals($storeConfig->getBaseStaticUrl(), $responseConfig['base_static_url']);
+        $this->assertEquals($storeConfig->getBaseMediaUrl(), $responseConfig['base_media_url']);
+        $this->assertEquals($storeConfig->getSecureBaseUrl(), $responseConfig['secure_base_url']);
+        $this->assertEquals($storeConfig->getSecureBaseLinkUrl(), $responseConfig['secure_base_link_url']);
+        $this->assertEquals($storeConfig->getSecureBaseStaticUrl(), $responseConfig['secure_base_static_url']);
+        $this->assertEquals($storeConfig->getSecureBaseMediaUrl(), $responseConfig['secure_base_media_url']);
+        $this->assertEquals($scopeConfig->getValue(
+            'store/information/name',
+            ScopeInterface::SCOPE_STORE,
+            $storeConfig->getId()
+        ), $responseConfig['store_name']);
     }
 }

From 191b758e017b57d46ddb700cee48b5eaeaf37990 Mon Sep 17 00:00:00 2001
From: Marjan Petkovski <petkovski.marjan@gmail.com>
Date: Thu, 18 Jun 2020 13:05:05 +0200
Subject: [PATCH 0509/1718] magento/magento2#28563: Make the pass of the
 context optional argument

---
 .../Model/Resolver/Category/ProductsCount.php         |  2 +-
 .../Magento/CatalogGraphQl/Model/Resolver/Product.php |  4 ++--
 .../Products/DataProvider/Deferred/Product.php        | 11 ++++-------
 .../Model/Resolver/Products/DataProvider/Product.php  |  4 ++--
 .../CollectionProcessor/AttributeProcessor.php        | 11 +++++++++--
 .../CollectionProcessor/ExtensibleEntityProcessor.php | 11 +++++++++--
 .../CollectionProcessor/MediaGalleryProcessor.php     | 11 +++++++++--
 .../CollectionProcessor/RequiredColumnsProcessor.php  | 11 +++++++++--
 .../CollectionProcessor/SearchCriteriaProcessor.php   | 11 +++++++++--
 .../Product/CollectionProcessor/StockProcessor.php    | 11 +++++++++--
 .../CollectionProcessor/VisibilityStatusProcessor.php | 11 +++++++++--
 .../Product/CollectionProcessorInterface.php          |  4 ++--
 .../Product/CompositeCollectionProcessor.php          |  2 +-
 .../Resolver/Products/DataProvider/ProductSearch.php  |  4 ++--
 .../Model/Resolver/Batch/AbstractLikedProducts.php    |  7 +++----
 15 files changed, 80 insertions(+), 35 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/ProductsCount.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/ProductsCount.php
index 744501e04878f..397fd12b7e714 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/ProductsCount.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/ProductsCount.php
@@ -63,7 +63,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         $category = $value['model'];
         $productsCollection = $category->getProductCollection();
         $productsCollection->setVisibility($this->catalogProductVisibility->getVisibleInSiteIds());
-        $productsCollection = $this->stockProcessor->process($productsCollection, $this->searchCriteria, [], $context);
+        $productsCollection = $this->stockProcessor->process($productsCollection, $this->searchCriteria, []);
 
         return $productsCollection->getSize();
     }
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product.php
index df725c02eb5bd..889735a5f4d88 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product.php
@@ -63,8 +63,8 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         $fields = $this->productFieldsSelector->getProductFieldsFromInfo($info);
         $this->productDataProvider->addEavAttributes($fields);
 
-        $result = function () use ($value, $context) {
-            $data = $value['product'] ?? $this->productDataProvider->getProductBySku($value['sku'], $context);
+        $result = function () use ($value) {
+            $data = $value['product'] ?? $this->productDataProvider->getProductBySku($value['sku']);
             if (empty($data)) {
                 return null;
             }
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Deferred/Product.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Deferred/Product.php
index ff4141cc0dca4..22bbc991a78e2 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Deferred/Product.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Deferred/Product.php
@@ -103,12 +103,11 @@ public function addEavAttributes(array $attributeCodes) : void
      * Get product from result set.
      *
      * @param string $sku
-     * @param ContextInterface $context
      * @return array
      */
-    public function getProductBySku(string $sku, ContextInterface $context) : array
+    public function getProductBySku(string $sku) : array
     {
-        $products = $this->fetch($context);
+        $products = $this->fetch();
 
         if (!isset($products[$sku])) {
             return [];
@@ -120,10 +119,9 @@ public function getProductBySku(string $sku, ContextInterface $context) : array
     /**
      * Fetch product data and return in array format. Keys for products will be their skus.
      *
-     * @param ContextInterface $context
      * @return array
      */
-    private function fetch(ContextInterface $context) : array
+    private function fetch() : array
     {
         if (empty($this->productSkus) || !empty($this->productList)) {
             return $this->productList;
@@ -134,8 +132,7 @@ private function fetch(ContextInterface $context) : array
             $this->searchCriteriaBuilder->create(),
             $this->attributeCodes,
             false,
-            true,
-            $context
+            true
         );
 
         /** @var \Magento\Catalog\Model\Product $product */
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product.php
index e17b938fa15e1..3e955ae303453 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product.php
@@ -74,7 +74,7 @@ public function __construct(
      * @param string[] $attributes
      * @param bool $isSearch
      * @param bool $isChildSearch
-     * @param ContextInterface $context
+     * @param ContextInterface|null $context
      * @return SearchResultsInterface
      */
     public function getList(
@@ -82,7 +82,7 @@ public function getList(
         array $attributes = [],
         bool $isSearch = false,
         bool $isChildSearch = false,
-        ContextInterface $context
+        ContextInterface $context = null
     ): SearchResultsInterface {
         /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $collection */
         $collection = $this->collectionFactory->create();
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/AttributeProcessor.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/AttributeProcessor.php
index ba769bd8fce3d..abed0ed2a897d 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/AttributeProcessor.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/AttributeProcessor.php
@@ -35,13 +35,20 @@ public function __construct($fieldToAttributeMap = [])
     }
 
     /**
-     * @inheritdoc
+     * Process collection to add additional joins, attributes, and clauses to a product collection.
+     *
+     * @param Collection $collection
+     * @param SearchCriteriaInterface $searchCriteria
+     * @param array $attributeNames
+     * @param ContextInterface|null $context
+     * @return Collection
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function process(
         Collection $collection,
         SearchCriteriaInterface $searchCriteria,
         array $attributeNames,
-        ContextInterface $context
+        ContextInterface $context = null
     ): Collection {
         foreach ($attributeNames as $name) {
             $this->addAttribute($collection, $name);
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/ExtensibleEntityProcessor.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/ExtensibleEntityProcessor.php
index e348fe1dfdf04..3c19965c5f7b5 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/ExtensibleEntityProcessor.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/ExtensibleEntityProcessor.php
@@ -34,13 +34,20 @@ public function __construct(JoinProcessorInterface $joinProcessor)
     }
 
     /**
-     * @inheritdoc
+     * Process collection to add additional joins, attributes, and clauses to a product collection.
+     *
+     * @param Collection $collection
+     * @param SearchCriteriaInterface $searchCriteria
+     * @param array $attributeNames
+     * @param ContextInterface|null $context
+     * @return Collection
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function process(
         Collection $collection,
         SearchCriteriaInterface $searchCriteria,
         array $attributeNames,
-        ContextInterface $context
+        ContextInterface $context = null
     ): Collection {
         $this->joinProcessor->process($collection);
 
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/MediaGalleryProcessor.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/MediaGalleryProcessor.php
index 5f5b7f14d3f61..b636bcb001a3b 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/MediaGalleryProcessor.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/MediaGalleryProcessor.php
@@ -36,13 +36,20 @@ public function __construct(MediaConfig $mediaConfig)
     }
 
     /**
-     * @inheritdoc
+     * Process collection to add additional joins, attributes, and clauses to a product collection.
+     *
+     * @param Collection $collection
+     * @param SearchCriteriaInterface $searchCriteria
+     * @param array $attributeNames
+     * @param ContextInterface|null $context
+     * @return Collection
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function process(
         Collection $collection,
         SearchCriteriaInterface $searchCriteria,
         array $attributeNames,
-        ContextInterface $context
+        ContextInterface $context = null
     ): Collection {
         if (in_array('media_gallery_entries', $attributeNames)) {
             $mediaAttributes = $this->mediaConfig->getMediaAttributeCodes();
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/RequiredColumnsProcessor.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/RequiredColumnsProcessor.php
index 7d8ccf43f892f..b545047d01541 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/RequiredColumnsProcessor.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/RequiredColumnsProcessor.php
@@ -20,13 +20,20 @@
 class RequiredColumnsProcessor implements CollectionProcessorInterface
 {
     /**
-     * {@inheritdoc}
+     * Process collection to add additional joins, attributes, and clauses to a product collection.
+     *
+     * @param Collection $collection
+     * @param SearchCriteriaInterface $searchCriteria
+     * @param array $attributeNames
+     * @param ContextInterface|null $context
+     * @return Collection
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function process(
         Collection $collection,
         SearchCriteriaInterface $searchCriteria,
         array $attributeNames,
-        ContextInterface $context
+        ContextInterface $context = null
     ): Collection {
         $collection->addAttributeToSelect('special_price');
         $collection->addAttributeToSelect('special_price_from');
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/SearchCriteriaProcessor.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/SearchCriteriaProcessor.php
index bbb5b11135d27..45df0d3343c11 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/SearchCriteriaProcessor.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/SearchCriteriaProcessor.php
@@ -34,13 +34,20 @@ public function __construct(SearchCriteriaApplier $searchCriteriaApplier)
     }
 
     /**
-     * {@inheritdoc}
+     * Process collection to add additional joins, attributes, and clauses to a product collection.
+     *
+     * @param Collection $collection
+     * @param SearchCriteriaInterface $searchCriteria
+     * @param array $attributeNames
+     * @param ContextInterface|null $context
+     * @return Collection
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function process(
         Collection $collection,
         SearchCriteriaInterface $searchCriteria,
         array $attributeNames,
-        ContextInterface $context
+        ContextInterface $context = null
     ): Collection {
         $this->searchCriteriaApplier->process($searchCriteria, $collection);
 
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/StockProcessor.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/StockProcessor.php
index 66473f74fab6b..61085c10a7335 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/StockProcessor.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/StockProcessor.php
@@ -42,13 +42,20 @@ public function __construct(StockConfigurationInterface $stockConfig, StockStatu
     }
 
     /**
-     * {@inheritdoc}
+     * Process collection to add additional joins, attributes, and clauses to a product collection.
+     *
+     * @param Collection $collection
+     * @param SearchCriteriaInterface $searchCriteria
+     * @param array $attributeNames
+     * @param ContextInterface|null $context
+     * @return Collection
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function process(
         Collection $collection,
         SearchCriteriaInterface $searchCriteria,
         array $attributeNames,
-        ContextInterface $context
+        ContextInterface $context = null
     ): Collection {
         if (!$this->stockConfig->isShowOutOfStock()) {
             $this->stockStatusResource->addIsInStockFilterToCollection($collection);
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/VisibilityStatusProcessor.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/VisibilityStatusProcessor.php
index 019b4cccc8946..964edc9d5a0ad 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/VisibilityStatusProcessor.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/VisibilityStatusProcessor.php
@@ -20,13 +20,20 @@
 class VisibilityStatusProcessor implements CollectionProcessorInterface
 {
     /**
-     * {@inheritdoc}
+     * Process collection to add additional joins, attributes, and clauses to a product collection.
+     *
+     * @param Collection $collection
+     * @param SearchCriteriaInterface $searchCriteria
+     * @param array $attributeNames
+     * @param ContextInterface|null $context
+     * @return Collection
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function process(
         Collection $collection,
         SearchCriteriaInterface $searchCriteria,
         array $attributeNames,
-        ContextInterface $context
+        ContextInterface $context = null
     ): Collection {
         $collection->joinAttribute('status', 'catalog_product/status', 'entity_id', null, 'inner');
         $collection->joinAttribute('visibility', 'catalog_product/visibility', 'entity_id', null, 'inner');
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessorInterface.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessorInterface.php
index 312aea552bd06..18e249ff23ac7 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessorInterface.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessorInterface.php
@@ -22,13 +22,13 @@ interface CollectionProcessorInterface
      * @param Collection $collection
      * @param SearchCriteriaInterface $searchCriteria
      * @param array $attributeNames
-     * @param ContextInterface $context
+     * @param ContextInterface|null $context
      * @return Collection
      */
     public function process(
         Collection $collection,
         SearchCriteriaInterface $searchCriteria,
         array $attributeNames,
-        ContextInterface $context
+        ContextInterface $context = null
     ): Collection;
 }
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CompositeCollectionProcessor.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CompositeCollectionProcessor.php
index c2f7565403cb2..be0ff02ffefb9 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CompositeCollectionProcessor.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CompositeCollectionProcessor.php
@@ -36,7 +36,7 @@ public function process(
         Collection $collection,
         SearchCriteriaInterface $searchCriteria,
         array $attributeNames,
-        ContextInterface $context
+        ContextInterface $context = null
     ): Collection {
         foreach ($this->collectionProcessors as $collectionProcessor) {
             $collection = $collectionProcessor->process($collection, $searchCriteria, $attributeNames, $context);
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 bb963cb9b5e01..c35caa07b4785 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php
@@ -85,14 +85,14 @@ public function __construct(
      * @param SearchCriteriaInterface $searchCriteria
      * @param SearchResultInterface $searchResult
      * @param array $attributes
-     * @param ContextInterface $context
+     * @param ContextInterface|null $context
      * @return SearchResultsInterface
      */
     public function getList(
         SearchCriteriaInterface $searchCriteria,
         SearchResultInterface $searchResult,
         array $attributes = [],
-        ContextInterface $context
+        ContextInterface $context = null
     ): SearchResultsInterface {
         /** @var Collection $collection */
         $collection = $this->collectionFactory->create();
diff --git a/app/code/Magento/RelatedProductGraphQl/Model/Resolver/Batch/AbstractLikedProducts.php b/app/code/Magento/RelatedProductGraphQl/Model/Resolver/Batch/AbstractLikedProducts.php
index bcd3074b7be0a..7ad2e5dde2985 100644
--- a/app/code/Magento/RelatedProductGraphQl/Model/Resolver/Batch/AbstractLikedProducts.php
+++ b/app/code/Magento/RelatedProductGraphQl/Model/Resolver/Batch/AbstractLikedProducts.php
@@ -82,7 +82,7 @@ abstract protected function getLinkType(): int;
      * @param int $linkType
      * @return \Magento\Catalog\Api\Data\ProductInterface[][]
      */
-    private function findRelations(array $products, array $loadAttributes, int $linkType, ContextInterface $context): array
+    private function findRelations(array $products, array $loadAttributes, int $linkType): array
     {
         //Loading relations
         $relations = $this->relatedProductDataProvider->getRelations($products, $linkType);
@@ -97,8 +97,7 @@ private function findRelations(array $products, array $loadAttributes, int $link
             $this->searchCriteriaBuilder->create(),
             $loadAttributes,
             false,
-            true,
-            $context
+            true
         );
         //Filling related products map.
         /** @var \Magento\Catalog\Api\Data\ProductInterface[] $relatedProducts */
@@ -142,7 +141,7 @@ public function resolve(ContextInterface $context, Field $field, array $requests
         $fields = array_unique(array_merge(...$fields));
 
         //Finding relations.
-        $related = $this->findRelations($products, $fields, $this->getLinkType(), $context);
+        $related = $this->findRelations($products, $fields, $this->getLinkType());
 
         //Matching requests with responses.
         $response = new BatchResponse();

From 8bbfa36bb481c8ffc058d991d1f1faa3795407ea Mon Sep 17 00:00:00 2001
From: Nikita Shcherbatykh <nikita.shcherbatykh@transoftgroup.com>
Date: Thu, 18 Jun 2020 14:48:03 +0300
Subject: [PATCH 0510/1718] MC-35152: String to be escaped was not valid UTF-8
 or could not be converted

---
 .../Payment/Block/Transparent/Redirect.php    |  13 ++-
 .../Unit/Block/Transparent/RedirectTest.php   | 102 ++++++++++++++++++
 2 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Payment/Test/Unit/Block/Transparent/RedirectTest.php

diff --git a/app/code/Magento/Payment/Block/Transparent/Redirect.php b/app/code/Magento/Payment/Block/Transparent/Redirect.php
index 1be6dec4cc1d8..97a09df38d120 100644
--- a/app/code/Magento/Payment/Block/Transparent/Redirect.php
+++ b/app/code/Magento/Payment/Block/Transparent/Redirect.php
@@ -53,10 +53,21 @@ public function getRedirectUrl(): string
     /**
      * Returns params to be redirected.
      *
+     * Encodes invalid UTF-8 values to UTF-8 to prevent character escape error.
+     * Some payment methods like PayPal, send data in merchant defined language encoding
+     * which can be different from the system character encoding (UTF-8).
+     *
      * @return array
      */
     public function getPostParams(): array
     {
-        return (array)$this->_request->getPostValue();
+        $params = [];
+        foreach ($this->_request->getPostValue() as $name => $value) {
+            if (!empty($value) && mb_detect_encoding($value, 'UTF-8', true) === false) {
+                $value = utf8_encode($value);
+            }
+            $params[$name] = $value;
+        }
+        return $params;
     }
 }
diff --git a/app/code/Magento/Payment/Test/Unit/Block/Transparent/RedirectTest.php b/app/code/Magento/Payment/Test/Unit/Block/Transparent/RedirectTest.php
new file mode 100644
index 0000000000000..1cd1230a14634
--- /dev/null
+++ b/app/code/Magento/Payment/Test/Unit/Block/Transparent/RedirectTest.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Payment\Test\Unit\Block\Transparent;
+
+use Magento\Payment\Block\Transparent\Redirect;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
+
+class RedirectTest extends TestCase
+{
+    /**
+     * @var \Magento\Framework\View\Element\Context|MockObject
+     */
+    private $context;
+    /**
+     * @var \Magento\Framework\UrlInterface|MockObject
+     */
+    private $url;
+    /**
+     * @var Redirect
+     */
+    private $model;
+    /**
+     * @var \Magento\Framework\App\RequestInterface|MockObject
+     */
+    private $request;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->context = $this->createMock(\Magento\Framework\View\Element\Template\Context::class);
+        $this->request = $this->createMock(\Magento\Framework\App\Request\Http::class);
+        $this->context->method('getRequest')
+            ->willReturn($this->request);
+        $this->url = $this->createMock(\Magento\Framework\UrlInterface::class);
+        $this->model = new Redirect(
+            $this->context,
+            $this->url
+        );
+    }
+
+    /**
+     * @param array $postData
+     * @param array $expected
+     * @dataProvider getPostParamsDataProvider
+     */
+    public function testGetPostParams(array $postData, array $expected): void
+    {
+        $this->request->method('getPostValue')
+            ->willReturn($postData);
+        $this->assertEquals($expected, $this->model->getPostParams());
+    }
+
+    /**
+     * @return array
+     */
+    public function getPostParamsDataProvider(): array
+    {
+        return [
+            [
+                [
+                    'BILLTOEMAIL' => 'john.doe@magento.lo',
+                    'BILLTOSTREET' => '3640 Holdrege Ave',
+                    'BILLTOZIP' => '90016',
+                    'BILLTOLASTNAME' => 'Ãtienne',
+                    'BILLTOFIRSTNAME' => 'Ãillin',
+                ],
+                [
+                    'BILLTOEMAIL' => 'john.doe@magento.lo',
+                    'BILLTOSTREET' => '3640 Holdrege Ave',
+                    'BILLTOZIP' => '90016',
+                    'BILLTOLASTNAME' => 'Ãtienne',
+                    'BILLTOFIRSTNAME' => 'Ãillin',
+                ]
+            ],
+            [
+                [
+                    'BILLTOEMAIL' => 'john.doe@magento.lo',
+                    'BILLTOSTREET' => '3640 Holdrege Ave',
+                    'BILLTOZIP' => '90016',
+                    'BILLTOLASTNAME' => mb_convert_encoding('Ãtienne', 'ISO-8859-1'),
+                    'BILLTOFIRSTNAME' => mb_convert_encoding('Ãillin', 'ISO-8859-1'),
+                ],
+                [
+                    'BILLTOEMAIL' => 'john.doe@magento.lo',
+                    'BILLTOSTREET' => '3640 Holdrege Ave',
+                    'BILLTOZIP' => '90016',
+                    'BILLTOLASTNAME' => 'Ãtienne',
+                    'BILLTOFIRSTNAME' => 'Ãillin',
+                ]
+            ]
+        ];
+    }
+}

From f35fb2bbc50e7acb0a88706ccc5ea1cf2ddbdcae Mon Sep 17 00:00:00 2001
From: Tu <ladiesman9x@gmail.com>
Date: Thu, 18 Jun 2020 19:14:17 +0700
Subject: [PATCH 0511/1718] Cleanup duplicate html class

Fix test fails


fix static tests


Fix static fails

update


update


update
---
 .../templates/order/print/shipment.phtml      | 60 ++++++++++++-------
 .../Block/Order/PrintOrder/ShipmentTest.php   |  2 +-
 2 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/app/code/Magento/Sales/view/frontend/templates/order/print/shipment.phtml b/app/code/Magento/Sales/view/frontend/templates/order/print/shipment.phtml
index 3f12ca1f7b270..903b9da16575a 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/print/shipment.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/print/shipment.phtml
@@ -3,26 +3,36 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/**
+ * @var \Magento\Sales\Block\Order\PrintOrder\Shipment $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
-<?php /* @var $block \Magento\Sales\Block\Order\PrintOrder\Shipment */ ?>
 <?php $order = $block->getOrder(); ?>
-<?php if (!$block->getObjectData($order, 'is_virtual')) : ?>
-    <?php foreach ($block->getShipmentsCollection() as $shipment) : ?>
+<?php if (!$block->getObjectData($order, 'is_virtual')): ?>
+    <?php foreach ($block->getShipmentsCollection() as $shipment): ?>
         <div class="order-details-items shipments">
             <div class="order-title">
-                <strong><?= $block->escapeHtml(__('Shipment #%1', $block->getObjectData($shipment, 'increment_id'))) ?></strong>
+                <strong><?= $escaper->escapeHtml(
+                            __(
+                                'Shipment #%1',
+                                $block->getObjectData($shipment, 'increment_id')
+                            )
+                        ) ?></strong>
             </div>
             <div class="table-wrapper order-items-shipment">
-                <table class="data table table-order-items shipment" id="my-shipment-table-<?= (int) $block->getObjectData($shipment, 'id') ?>">
-                    <caption class="table-caption"><?= $block->escapeHtml(__('Items Invoiced')) ?></caption>
+                <table class="data table table-order-items shipment"
+                        id="my-shipment-table-<?= (int)$block->getObjectData($shipment, 'id') ?>">
+                    <caption class="table-caption"><?= $escaper->escapeHtml(__('Items Invoiced')) ?></caption>
                     <thead>
-                    <tr>
-                        <th class="col name"><?= $block->escapeHtml(__('Product Name')) ?></th>
-                        <th class="col sku"><?= $block->escapeHtml(__('SKU')) ?></th>
-                        <th class="col price"><?= $block->escapeHtml(__('Qty Shipped')) ?></th>
-                    </tr>
+                        <tr>
+                            <th class="col name"><?= $escaper->escapeHtml(__('Product Name')) ?></th>
+                            <th class="col sku"><?= $escaper->escapeHtml(__('SKU')) ?></th>
+                            <th class="col price"><?= $escaper->escapeHtml(__('Qty Shipped')) ?></th>
+                        </tr>
                     </thead>
-                    <?php foreach ($block->getShipmentItems($shipment) as $item) : ?>
+                    <?php foreach ($block->getShipmentItems($shipment) as $item): ?>
                         <tbody>
                             <?= $block->getItemHtml($item) ?>
                         </tbody>
@@ -31,12 +41,12 @@
             </div>
             <div class="block block-order-details-view">
                 <div class="block-title">
-                    <strong><?= $block->escapeHtml(__('Order Information')) ?></strong>
+                    <strong><?= $escaper->escapeHtml(__('Order Information')) ?></strong>
                 </div>
                 <div class="block-content">
                     <div class="box box-order-shipping-address">
                         <div class="box-title">
-                            <strong><?= $block->escapeHtml(__('Shipping Address')) ?></strong>
+                            <strong><?= $escaper->escapeHtml(__('Shipping Address')) ?></strong>
                         </div>
                         <div class="box-content">
                             <address><?= $block->getShipmentAddressFormattedHtml($shipment) ?></address>
@@ -45,25 +55,29 @@
 
                     <div class="box box-order-shipping-method">
                         <div class="box-title">
-                            <strong><?= $block->escapeHtml(__('Shipping Method')) ?></strong>
+                            <strong><?= $escaper->escapeHtml(__('Shipping Method')) ?></strong>
                         </div>
                         <div class="box-content">
-                        <?= $block->escapeHtml($block->getObjectData($order, 'shipping_description')) ?>
+                        <?= $escaper->escapeHtml($block->getObjectData($order, 'shipping_description')) ?>
                         <?php $tracks = $block->getShipmentTracks($shipment);
-                        if ($tracks) : ?>
+                        if ($tracks): ?>
                             <dl class="order-tracking">
-                            <?php foreach ($tracks as $track) : ?>
-                                <dt class="tracking-title"><?= $block->escapeHtml($block->getObjectData($track, 'title')) ?></dt>
-                                <dd class="tracking-content"><?= $block->escapeHtml($block->getObjectData($track, 'number')) ?></dd>
+                            <?php foreach ($tracks as $track): ?>
+                                <dt class="tracking-title">
+                                    <?= $escaper->escapeHtml($block->getObjectData($track, 'title')) ?>
+                                </dt>
+                                <dd class="tracking-content">
+                                    <?= $escaper->escapeHtml($block->getObjectData($track, 'number')) ?>
+                                </dd>
                             <?php endforeach; ?>
                             </dl>
                         <?php endif; ?>
                         </div>
                     </div>
 
-                    <div class="box box-order-billing-method">
+                    <div class="box box-order-billing-address">
                         <div class="box-title">
-                            <strong><?= $block->escapeHtml(__('Billing Address')) ?></strong>
+                            <strong><?= $escaper->escapeHtml(__('Billing Address')) ?></strong>
                         </div>
                         <div class="box-content">
                             <address><?= $block->getBillingAddressFormattedHtml($order) ?></address>
@@ -72,7 +86,7 @@
 
                     <div class="box box-order-billing-method">
                         <div class="box-title">
-                            <strong><?= $block->escapeHtml(__('Payment Method')) ?></strong>
+                            <strong><?= $escaper->escapeHtml(__('Payment Method')) ?></strong>
                         </div>
                         <div class="box-content">
                             <?= $block->getPaymentInfoHtml() ?>
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Order/PrintOrder/ShipmentTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Order/PrintOrder/ShipmentTest.php
index 434dacec5c6b8..384445a7cd5f8 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Block/Order/PrintOrder/ShipmentTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Order/PrintOrder/ShipmentTest.php
@@ -151,7 +151,7 @@ private function assertOrderInformation(OrderInterface $order, string $html): vo
         foreach ([$order->getShippingAddress(), $order->getBillingAddress()] as $address) {
             $addressBoxXpath = ($address->getAddressType() == 'shipping')
                 ? "//div[contains(@class, 'box-order-shipping-address')]//address[contains(., '%s')]"
-                : "//div[contains(@class, 'box-order-billing-method')]//address[contains(., '%s')]";
+                : "//div[contains(@class, 'box-order-billing-address')]//address[contains(., '%s')]";
             $this->assertEquals(
                 1,
                 Xpath::getElementsCountForXpath(sprintf($addressBoxXpath, $address->getName()), $html),

From 50635d947b5d0b62496d9078fb7d46ae15f4e336 Mon Sep 17 00:00:00 2001
From: Michal Derlatka <michal.derlatka1@gmail.com>
Date: Fri, 12 Jun 2020 19:21:13 +0200
Subject: [PATCH 0512/1718] magento/magento2#28561: GraphQL added CORS headers

---
 .../CorsAllowCredentialsHeaderProvider.php    | 38 ++++++++++++
 .../Cors/CorsAllowHeadersHeaderProvider.php   | 43 ++++++++++++++
 .../Cors/CorsAllowMethodsHeaderProvider.php   | 44 ++++++++++++++
 .../Cors/CorsAllowOriginHeaderProvider.php    | 39 ++++++++++++
 .../Cors/CorsMaxAgeHeaderProvider.php         | 44 ++++++++++++++
 .../GraphQl/Model/Cors/Configuration.php      | 58 ++++++++++++++++++
 .../Model/Cors/ConfigurationInterface.php     | 20 +++++++
 .../Magento/GraphQl/etc/adminhtml/system.xml  | 59 +++++++++++++++++++
 app/code/Magento/GraphQl/etc/config.xml       | 16 +++++
 app/code/Magento/GraphQl/etc/di.xml           |  2 +
 app/code/Magento/GraphQl/etc/graphql/di.xml   | 11 ++++
 11 files changed, 374 insertions(+)
 create mode 100644 app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowCredentialsHeaderProvider.php
 create mode 100644 app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowHeadersHeaderProvider.php
 create mode 100644 app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowMethodsHeaderProvider.php
 create mode 100644 app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowOriginHeaderProvider.php
 create mode 100644 app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsMaxAgeHeaderProvider.php
 create mode 100644 app/code/Magento/GraphQl/Model/Cors/Configuration.php
 create mode 100644 app/code/Magento/GraphQl/Model/Cors/ConfigurationInterface.php
 create mode 100644 app/code/Magento/GraphQl/etc/adminhtml/system.xml
 create mode 100644 app/code/Magento/GraphQl/etc/config.xml

diff --git a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowCredentialsHeaderProvider.php b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowCredentialsHeaderProvider.php
new file mode 100644
index 0000000000000..3f7c912b574fc
--- /dev/null
+++ b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowCredentialsHeaderProvider.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Magento\GraphQl\Controller\HttpResponse\Cors;
+
+use Magento\Framework\App\Response\HeaderProvider\HeaderProviderInterface;
+use Magento\GraphQl\Model\Cors\ConfigurationInterface;
+
+class CorsAllowCredentialsHeaderProvider implements HeaderProviderInterface
+{
+    protected $headerName = 'Access-Control-Allow-Credentials';
+
+    /**
+     * CORS configuration provider
+     *
+     * @var \Magento\GraphQl\Model\Cors\ConfigurationInterface
+     */
+    private $corsConfiguration;
+
+    public function __construct(ConfigurationInterface $corsConfiguration)
+    {
+        $this->corsConfiguration = $corsConfiguration;
+    }
+
+    public function getName()
+    {
+        return $this->headerName;
+    }
+
+    public function getValue()
+    {
+        return true;
+    }
+
+    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
new file mode 100644
index 0000000000000..e44e7c6b1e872
--- /dev/null
+++ b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowHeadersHeaderProvider.php
@@ -0,0 +1,43 @@
+<?php
+
+
+namespace Magento\GraphQl\Controller\HttpResponse\Cors;
+
+use Magento\Framework\App\Response\HeaderProvider\HeaderProviderInterface;
+use Magento\GraphQl\Model\Cors\ConfigurationInterface;
+
+class CorsAllowHeadersHeaderProvider implements HeaderProviderInterface
+{
+    protected $headerName = 'Access-Control-Allow-Headers';
+
+    protected $headerValue = '';
+
+    /**
+     * CORS configuration provider
+     *
+     * @var \Magento\GraphQl\Model\Cors\ConfigurationInterface
+     */
+    private $corsConfiguration;
+
+    public function __construct(ConfigurationInterface $corsConfiguration)
+    {
+        $this->corsConfiguration = $corsConfiguration;
+    }
+
+    public function getName()
+    {
+        return $this->headerName;
+    }
+
+    public function canApply() : bool
+    {
+        return $this->corsConfiguration->isEnabled() && $this->getValue();
+    }
+
+    public function getValue()
+    {
+        return $this->corsConfiguration->getAllowedHeaders()
+            ? $this->corsConfiguration->getAllowedHeaders()
+            : $this->headerValue;
+    }
+}
diff --git a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowMethodsHeaderProvider.php b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowMethodsHeaderProvider.php
new file mode 100644
index 0000000000000..548ffc1aec3f6
--- /dev/null
+++ b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowMethodsHeaderProvider.php
@@ -0,0 +1,44 @@
+<?php
+
+
+namespace Magento\GraphQl\Controller\HttpResponse\Cors;
+
+
+use Magento\Framework\App\Response\HeaderProvider\HeaderProviderInterface;
+use Magento\GraphQl\Model\Cors\ConfigurationInterface;
+
+class CorsAllowMethodsHeaderProvider implements HeaderProviderInterface
+{
+    protected $headerName = 'Access-Control-Allow-Methods';
+
+    protected $headerValue = 'GET,POST,OPTIONS';
+
+    /**
+     * CORS configuration provider
+     *
+     * @var \Magento\GraphQl\Model\Cors\ConfigurationInterface
+     */
+    private $corsConfiguration;
+
+    public function __construct(ConfigurationInterface $corsConfiguration)
+    {
+        $this->corsConfiguration = $corsConfiguration;
+    }
+
+    public function getName()
+    {
+        return $this->headerName;
+    }
+
+    public function canApply() : bool
+    {
+        return $this->corsConfiguration->isEnabled() && $this->getValue();
+    }
+
+    public function getValue()
+    {
+        return $this->corsConfiguration->getAllowedMethods()
+            ? $this->corsConfiguration->getAllowedMethods()
+            : $this->headerValue;
+    }
+}
diff --git a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowOriginHeaderProvider.php b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowOriginHeaderProvider.php
new file mode 100644
index 0000000000000..8df8c2ec6e39c
--- /dev/null
+++ b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowOriginHeaderProvider.php
@@ -0,0 +1,39 @@
+<?php
+
+
+namespace Magento\GraphQl\Controller\HttpResponse\Cors;
+
+use Magento\Framework\App\Response\HeaderProvider\HeaderProviderInterface;
+use Magento\GraphQl\Model\Cors\ConfigurationInterface;
+
+class CorsAllowOriginHeaderProvider implements HeaderProviderInterface
+{
+    protected $headerName = 'Access-Control-Allow-Origin';
+
+    /**
+     * CORS configuration provider
+     *
+     * @var \Magento\GraphQl\Model\Cors\ConfigurationInterface
+     */
+    private $corsConfiguration;
+
+    public function __construct(ConfigurationInterface $corsConfiguration)
+    {
+        $this->corsConfiguration = $corsConfiguration;
+    }
+
+    public function getName()
+    {
+        return $this->headerName;
+    }
+
+    public function canApply() : bool
+    {
+        return $this->corsConfiguration->isEnabled() && $this->getValue();
+    }
+
+    public function getValue()
+    {
+        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
new file mode 100644
index 0000000000000..b74f405930caf
--- /dev/null
+++ b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsMaxAgeHeaderProvider.php
@@ -0,0 +1,44 @@
+<?php
+
+
+namespace Magento\GraphQl\Controller\HttpResponse\Cors;
+
+
+use Magento\Framework\App\Response\HeaderProvider\HeaderProviderInterface;
+use Magento\GraphQl\Model\Cors\ConfigurationInterface;
+
+class CorsMaxAgeHeaderProvider implements HeaderProviderInterface
+{
+    protected $headerName = 'Access-Control-Max-Age';
+
+    protected $headerValue = '86400';
+
+    /**
+     * CORS configuration provider
+     *
+     * @var \Magento\GraphQl\Model\Cors\ConfigurationInterface
+     */
+    private $corsConfiguration;
+
+    public function __construct(ConfigurationInterface $corsConfiguration)
+    {
+        $this->corsConfiguration = $corsConfiguration;
+    }
+
+    public function getName()
+    {
+        return $this->headerName;
+    }
+
+    public function canApply()
+    {
+        return $this->corsConfiguration->isEnabled() && $this->getValue();
+    }
+
+    public function getValue()
+    {
+        return $this->corsConfiguration->getMaxAge()
+            ? $this->corsConfiguration->getMaxAge()
+            : $this->headerValue;
+    }
+}
diff --git a/app/code/Magento/GraphQl/Model/Cors/Configuration.php b/app/code/Magento/GraphQl/Model/Cors/Configuration.php
new file mode 100644
index 0000000000000..6748ea6c3c9a1
--- /dev/null
+++ b/app/code/Magento/GraphQl/Model/Cors/Configuration.php
@@ -0,0 +1,58 @@
+<?php
+
+
+namespace Magento\GraphQl\Model\Cors;
+
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
+class Configuration implements ConfigurationInterface
+{
+    const XML_PATH_CORS_HEADERS_ENABLED = 'graphql/cors/enabled';
+    const XML_PATH_CORS_ALLOWED_ORIGINS = 'graphql/cors/allowed_origins';
+    const XML_PATH_CORS_ALLOWED_HEADERS = 'graphql/cors/allowed_headers';
+    const XML_PATH_CORS_ALLOWED_METHODS = 'graphql/cors/allowed_methods';
+    const XML_PATH_CORS_MAX_AGE = 'graphql/cors/max_age';
+    const XML_PATH_CORS_ALLOW_CREDENTIALS = 'graphql/cors/allow_credentials';
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    protected $scopeConfig;
+
+    public function __construct(ScopeConfigInterface $scopeConfig)
+    {
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    public function isEnabled(): bool
+    {
+        return $this->scopeConfig->isSetFlag(self::XML_PATH_CORS_HEADERS_ENABLED);
+    }
+
+    public function getAllowedOrigins(): ?string
+    {
+        return $this->scopeConfig->getValue(self::XML_PATH_CORS_ALLOWED_ORIGINS);
+    }
+
+    public function getAllowedHeaders(): ?string
+    {
+        return $this->scopeConfig->getValue(self::XML_PATH_CORS_ALLOWED_HEADERS);
+    }
+
+    public function getAllowedMethods(): ?string
+    {
+        return $this->scopeConfig->getValue(self::XML_PATH_CORS_ALLOWED_METHODS);
+    }
+
+    public function getMaxAge(): int
+    {
+        return $this->scopeConfig->getValue(self::XML_PATH_CORS_MAX_AGE);
+    }
+
+    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
new file mode 100644
index 0000000000000..bbb23abe854b6
--- /dev/null
+++ b/app/code/Magento/GraphQl/Model/Cors/ConfigurationInterface.php
@@ -0,0 +1,20 @@
+<?php
+
+
+namespace Magento\GraphQl\Model\Cors;
+
+
+interface ConfigurationInterface
+{
+    public function isEnabled() : bool;
+
+    public function getAllowedOrigins() : ?string;
+
+    public function getAllowedHeaders() : ?string;
+
+    public function getAllowedMethods() : ?string;
+
+    public function getMaxAge() : int;
+
+    public function isCredentialsAllowed() : bool;
+}
diff --git a/app/code/Magento/GraphQl/etc/adminhtml/system.xml b/app/code/Magento/GraphQl/etc/adminhtml/system.xml
new file mode 100644
index 0000000000000..e35471038c3fd
--- /dev/null
+++ b/app/code/Magento/GraphQl/etc/adminhtml/system.xml
@@ -0,0 +1,59 @@
+<?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>
+                    <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>
+                    <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>
+                    <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>
+                    <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>
+                    <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
new file mode 100644
index 0000000000000..76a1fac199582
--- /dev/null
+++ b/app/code/Magento/GraphQl/etc/config.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<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 b356f33c4f4bf..79052c717bc96 100644
--- a/app/code/Magento/GraphQl/etc/di.xml
+++ b/app/code/Magento/GraphQl/etc/di.xml
@@ -98,4 +98,6 @@
             <argument name="queryComplexity" xsi:type="number">300</argument>
         </arguments>
     </type>
+
+    <preference for="Magento\GraphQl\Model\Cors\ConfigurationInterface" type="Magento\GraphQl\Model\Cors\Configuration" />
 </config>
diff --git a/app/code/Magento/GraphQl/etc/graphql/di.xml b/app/code/Magento/GraphQl/etc/graphql/di.xml
index 77fce336374dd..23d49124d1a02 100644
--- a/app/code/Magento/GraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/GraphQl/etc/graphql/di.xml
@@ -30,4 +30,15 @@
             </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>

From a09d71afe6f0ed68df98e145f3b4f9858ab71c6d Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Thu, 18 Jun 2020 15:54:33 +0300
Subject: [PATCH 0513/1718] fix Rest-API updating product stock_item deletes
 downloadable product data

---
 .../Downloadable/Model/Link/UpdateHandler.php |  42 +++++--
 .../Model/Sample/UpdateHandler.php            |  42 +++++--
 .../Unit/Model/Link/UpdateHandlerTest.php     | 114 +++++++++++-------
 .../Unit/Model/Sample/UpdateHandlerTest.php   | 114 +++++++++++-------
 .../Api/ProductRepositoryTest.php             |  29 +++++
 5 files changed, 227 insertions(+), 114 deletions(-)

diff --git a/app/code/Magento/Downloadable/Model/Link/UpdateHandler.php b/app/code/Magento/Downloadable/Model/Link/UpdateHandler.php
index 8e351b3dfb0a5..3e7095825a353 100644
--- a/app/code/Magento/Downloadable/Model/Link/UpdateHandler.php
+++ b/app/code/Magento/Downloadable/Model/Link/UpdateHandler.php
@@ -5,15 +5,18 @@
  */
 namespace Magento\Downloadable\Model\Link;
 
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Downloadable\Api\LinkRepositoryInterface as LinkRepository;
 use Magento\Downloadable\Model\Product\Type;
 use Magento\Framework\EntityManager\Operation\ExtensionInterface;
 
 /**
- * Class UpdateHandler
+ * UpdateHandler for downloadable product links
  */
 class UpdateHandler implements ExtensionInterface
 {
+    private const GLOBAL_SCOPE_ID = 0;
+
     /**
      * @var LinkRepository
      */
@@ -28,35 +31,48 @@ public function __construct(LinkRepository $linkRepository)
     }
 
     /**
+     * Update links for downloadable product if exist
+     *
      * @param object $entity
      * @param array $arguments
-     * @return \Magento\Catalog\Api\Data\ProductInterface|object
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @return ProductInterface|object
      */
     public function execute($entity, $arguments = [])
     {
-        /** @var $entity \Magento\Catalog\Api\Data\ProductInterface */
-        if ($entity->getTypeId() != Type::TYPE_DOWNLOADABLE) {
-            return $entity;
+        $links = $entity->getExtensionAttributes()->getDownloadableProductLinks();
+
+        /** @var $entity ProductInterface */
+        if ($links && $entity->getTypeId() === Type::TYPE_DOWNLOADABLE) {
+            $this->updateLinks($entity, $links);
         }
 
-        /** @var \Magento\Downloadable\Api\Data\LinkInterface[] $links */
-        $links = $entity->getExtensionAttributes()->getDownloadableProductLinks() ?: [];
-        $updatedLinks = [];
+        return $entity;
+    }
+
+    /**
+     * Update product links
+     *
+     * @param ProductInterface $entity
+     * @param array $links
+     * @return void
+     */
+    private function updateLinks(ProductInterface $entity, array $links): void
+    {
+        $isGlobalScope = (int) $entity->getStoreId() === self::GLOBAL_SCOPE_ID;
         $oldLinks = $this->linkRepository->getList($entity->getSku());
+
+        $updatedLinks = [];
         foreach ($links as $link) {
             if ($link->getId()) {
                 $updatedLinks[$link->getId()] = true;
             }
-            $this->linkRepository->save($entity->getSku(), $link, !(bool)$entity->getStoreId());
+            $this->linkRepository->save($entity->getSku(), $link, $isGlobalScope);
         }
-        /** @var \Magento\Catalog\Api\Data\ProductInterface $entity */
+
         foreach ($oldLinks as $link) {
             if (!isset($updatedLinks[$link->getId()])) {
                 $this->linkRepository->delete($link->getId());
             }
         }
-
-        return $entity;
     }
 }
diff --git a/app/code/Magento/Downloadable/Model/Sample/UpdateHandler.php b/app/code/Magento/Downloadable/Model/Sample/UpdateHandler.php
index 80294032aea1b..5def2daa23030 100644
--- a/app/code/Magento/Downloadable/Model/Sample/UpdateHandler.php
+++ b/app/code/Magento/Downloadable/Model/Sample/UpdateHandler.php
@@ -5,15 +5,18 @@
  */
 namespace Magento\Downloadable\Model\Sample;
 
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Downloadable\Api\SampleRepositoryInterface as SampleRepository;
 use Magento\Downloadable\Model\Product\Type;
 use Magento\Framework\EntityManager\Operation\ExtensionInterface;
 
 /**
- * Class UpdateHandler
+ * UpdateHandler for downloadable product samples
  */
 class UpdateHandler implements ExtensionInterface
 {
+    private const GLOBAL_SCOPE_ID = 0;
+
     /**
      * @var SampleRepository
      */
@@ -28,35 +31,48 @@ public function __construct(SampleRepository $sampleRepository)
     }
 
     /**
+     * Update samples for downloadable product if exist
+     *
      * @param object $entity
      * @param array $arguments
-     * @return \Magento\Catalog\Api\Data\ProductInterface|object
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @return ProductInterface|object
      */
     public function execute($entity, $arguments = [])
     {
-        /** @var $entity \Magento\Catalog\Api\Data\ProductInterface */
-        if ($entity->getTypeId() != Type::TYPE_DOWNLOADABLE) {
-            return $entity;
+        $samples = $entity->getExtensionAttributes()->getDownloadableProductSamples();
+
+        /** @var $entity ProductInterface */
+        if ($samples && $entity->getTypeId() === Type::TYPE_DOWNLOADABLE) {
+            $this->updateSamples($entity, $samples);
         }
 
-        /** @var \Magento\Downloadable\Api\Data\SampleInterface[] $samples */
-        $samples = $entity->getExtensionAttributes()->getDownloadableProductSamples() ?: [];
-        $updatedSamples = [];
+        return $entity;
+    }
+
+    /**
+     * Update product samples
+     *
+     * @param ProductInterface $entity
+     * @param array $samples
+     * @return void
+     */
+    private function updateSamples(ProductInterface $entity, array $samples): void
+    {
+        $isGlobalScope = (int) $entity->getStoreId() === self::GLOBAL_SCOPE_ID;
         $oldSamples = $this->sampleRepository->getList($entity->getSku());
+
+        $updatedSamples = [];
         foreach ($samples as $sample) {
             if ($sample->getId()) {
                 $updatedSamples[$sample->getId()] = true;
             }
-            $this->sampleRepository->save($entity->getSku(), $sample, !(bool)$entity->getStoreId());
+            $this->sampleRepository->save($entity->getSku(), $sample, $isGlobalScope);
         }
-        /** @var \Magento\Catalog\Api\Data\ProductInterface $entity */
+
         foreach ($oldSamples as $sample) {
             if (!isset($updatedSamples[$sample->getId()])) {
                 $this->sampleRepository->delete($sample->getId());
             }
         }
-
-        return $entity;
     }
 }
diff --git a/app/code/Magento/Downloadable/Test/Unit/Model/Link/UpdateHandlerTest.php b/app/code/Magento/Downloadable/Test/Unit/Model/Link/UpdateHandlerTest.php
index 069e8a4e1a3d9..22cf4b9abf7ca 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Model/Link/UpdateHandlerTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Model/Link/UpdateHandlerTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 declare(strict_types=1);
 
 namespace Magento\Downloadable\Test\Unit\Model\Link;
@@ -16,37 +17,72 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * Test for \Magento\Downloadable\Model\Link\UpdateHandler.
+ */
 class UpdateHandlerTest extends TestCase
 {
-    /** @var UpdateHandler */
-    protected $model;
-
-    /** @var LinkRepositoryInterface|MockObject */
-    protected $linkRepositoryMock;
-
+    /**
+     * @var UpdateHandler
+     */
+    private $model;
+
+    /**
+     * @var LinkRepositoryInterface|MockObject
+     */
+    private $linkRepositoryMock;
+
+    /**
+     * @var LinkInterface|MockObject
+     */
+    private $linkMock;
+
+    /**
+     * @var ProductExtensionInterface|MockObject
+     */
+    private $productExtensionMock;
+
+    /**
+     * @var ProductInterface|MockObject
+     */
+    private $entityMock;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp(): void
     {
         $this->linkRepositoryMock = $this->getMockBuilder(LinkRepositoryInterface::class)
             ->getMockForAbstractClass();
+        $this->linkMock = $this->getMockBuilder(LinkInterface::class)
+            ->getMock();
+        $this->productExtensionMock = $this->createMock(ProductExtensionInterface::class);
+        $this->productExtensionMock->expects($this->once())
+            ->method('getDownloadableProductLinks')
+            ->willReturn([$this->linkMock]);
+        $this->entityMock = $this->getMockBuilder(ProductInterface::class)
+            ->addMethods(['getStoreId'])
+            ->getMockForAbstractClass();
 
         $this->model = new UpdateHandler(
             $this->linkRepositoryMock
         );
     }
 
-    public function testExecute()
+    /**
+     * Update links for downloadable product
+     *
+     * @return void
+     */
+    public function testExecute(): void
     {
         $entitySku = 'sku';
         $entityStoreId = 0;
-        $linkId = 11;
         $linkToDeleteId = 22;
 
-        /** @var LinkInterface|MockObject $linkMock */
-        $linkMock = $this->getMockBuilder(LinkInterface::class)
-            ->getMock();
-        $linkMock->expects($this->exactly(3))
+        $this->linkMock->expects($this->exactly(3))
             ->method('getId')
-            ->willReturn($linkId);
+            ->willReturn(1);
 
         /** @var LinkInterface|MockObject $linkToDeleteMock */
         $linkToDeleteMock = $this->getMockBuilder(LinkInterface::class)
@@ -55,59 +91,49 @@ public function testExecute()
             ->method('getId')
             ->willReturn($linkToDeleteId);
 
-        /** @var ProductExtensionInterface|MockObject $productExtensionMock */
-        $productExtensionMock = $this->getMockBuilder(ProductExtensionInterface::class)
-            ->setMethods(['getDownloadableProductLinks'])
-            ->getMockForAbstractClass();
-        $productExtensionMock->expects($this->once())
-            ->method('getDownloadableProductLinks')
-            ->willReturn([$linkMock]);
-
-        /** @var ProductInterface|MockObject $entityMock */
-        $entityMock = $this->getMockBuilder(ProductInterface::class)
-            ->setMethods(['getTypeId', 'getExtensionAttributes', 'getSku', 'getStoreId'])
-            ->getMockForAbstractClass();
-        $entityMock->expects($this->once())
+        $this->entityMock->expects($this->once())
             ->method('getTypeId')
             ->willReturn(Type::TYPE_DOWNLOADABLE);
-        $entityMock->expects($this->once())
+        $this->entityMock->expects($this->once())
             ->method('getExtensionAttributes')
-            ->willReturn($productExtensionMock);
-        $entityMock->expects($this->exactly(2))
+            ->willReturn($this->productExtensionMock);
+        $this->entityMock->expects($this->exactly(2))
             ->method('getSku')
             ->willReturn($entitySku);
-        $entityMock->expects($this->once())
+        $this->entityMock->expects($this->once())
             ->method('getStoreId')
             ->willReturn($entityStoreId);
 
         $this->linkRepositoryMock->expects($this->once())
             ->method('getList')
             ->with($entitySku)
-            ->willReturn([$linkMock, $linkToDeleteMock]);
+            ->willReturn([$this->linkMock, $linkToDeleteMock]);
         $this->linkRepositoryMock->expects($this->once())
             ->method('save')
-            ->with($entitySku, $linkMock, !$entityStoreId);
+            ->with($entitySku, $this->linkMock, !$entityStoreId);
         $this->linkRepositoryMock->expects($this->once())
             ->method('delete')
             ->with($linkToDeleteId);
 
-        $this->assertEquals($entityMock, $this->model->execute($entityMock));
+        $this->assertEquals($this->entityMock, $this->model->execute($this->entityMock));
     }
 
-    public function testExecuteNonDownloadable()
+    /**
+     * Update links for non downloadable product
+     *
+     * @return void
+     */
+    public function testExecuteNonDownloadable(): void
     {
-        /** @var ProductInterface|MockObject $entityMock */
-        $entityMock = $this->getMockBuilder(ProductInterface::class)
-            ->setMethods(['getTypeId', 'getExtensionAttributes', 'getSku', 'getStoreId'])
-            ->getMockForAbstractClass();
-        $entityMock->expects($this->once())
+        $this->entityMock->expects($this->once())
             ->method('getTypeId')
             ->willReturn(Type::TYPE_DOWNLOADABLE . 'some');
-        $entityMock->expects($this->never())
-            ->method('getExtensionAttributes');
-        $entityMock->expects($this->never())
+        $this->entityMock->expects($this->once())
+            ->method('getExtensionAttributes')
+            ->willReturn($this->productExtensionMock);
+        $this->entityMock->expects($this->never())
             ->method('getSku');
-        $entityMock->expects($this->never())
+        $this->entityMock->expects($this->never())
             ->method('getStoreId');
 
         $this->linkRepositoryMock->expects($this->never())
@@ -117,6 +143,6 @@ public function testExecuteNonDownloadable()
         $this->linkRepositoryMock->expects($this->never())
             ->method('delete');
 
-        $this->assertEquals($entityMock, $this->model->execute($entityMock));
+        $this->assertEquals($this->entityMock, $this->model->execute($this->entityMock));
     }
 }
diff --git a/app/code/Magento/Downloadable/Test/Unit/Model/Sample/UpdateHandlerTest.php b/app/code/Magento/Downloadable/Test/Unit/Model/Sample/UpdateHandlerTest.php
index 34d313a175b55..0f8fe92e467ce 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Model/Sample/UpdateHandlerTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Model/Sample/UpdateHandlerTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 declare(strict_types=1);
 
 namespace Magento\Downloadable\Test\Unit\Model\Sample;
@@ -16,37 +17,72 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * Test for \Magento\Downloadable\Model\Sample\UpdateHandler.
+ */
 class UpdateHandlerTest extends TestCase
 {
-    /** @var UpdateHandler */
-    protected $model;
-
-    /** @var SampleRepositoryInterface|MockObject */
-    protected $sampleRepositoryMock;
-
+    /**
+     * @var UpdateHandler
+     */
+    private $model;
+
+    /**
+     * @var SampleRepositoryInterface|MockObject
+     */
+    private $sampleRepositoryMock;
+
+    /**
+     * @var SampleInterface|MockObject
+     */
+    private $sampleMock;
+
+    /**
+     * @var ProductExtensionInterface|MockObject
+     */
+    private $productExtensionMock;
+
+    /**
+     * @var ProductInterface|MockObject
+     */
+    private $entityMock;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp(): void
     {
         $this->sampleRepositoryMock = $this->getMockBuilder(SampleRepositoryInterface::class)
             ->getMockForAbstractClass();
+        $this->sampleMock = $this->getMockBuilder(SampleInterface::class)
+            ->getMock();
+        $this->productExtensionMock = $this->createMock(ProductExtensionInterface::class);
+        $this->productExtensionMock//->expects($this->once())
+            ->method('getDownloadableProductSamples')
+            ->willReturn([$this->sampleMock]);
+        $this->entityMock = $this->getMockBuilder(ProductInterface::class)
+            ->addMethods(['getStoreId'])
+            ->getMockForAbstractClass();
 
         $this->model = new UpdateHandler(
             $this->sampleRepositoryMock
         );
     }
 
-    public function testExecute()
+    /**
+     * Update samples for downloadable product
+     *
+     * @return void
+     */
+    public function testExecute(): void
     {
         $entitySku = 'sku';
         $entityStoreId = 0;
-        $sampleId = 11;
         $sampleToDeleteId = 22;
 
-        /** @var SampleInterface|MockObject $sampleMock */
-        $sampleMock = $this->getMockBuilder(SampleInterface::class)
-            ->getMock();
-        $sampleMock->expects($this->exactly(3))
+        $this->sampleMock->expects($this->exactly(3))
             ->method('getId')
-            ->willReturn($sampleId);
+            ->willReturn(1);
 
         /** @var SampleInterface|MockObject $sampleToDeleteMock */
         $sampleToDeleteMock = $this->getMockBuilder(SampleInterface::class)
@@ -55,59 +91,49 @@ public function testExecute()
             ->method('getId')
             ->willReturn($sampleToDeleteId);
 
-        /** @var ProductExtensionInterface|MockObject $productExtensionMock */
-        $productExtensionMock = $this->getMockBuilder(ProductExtensionInterface::class)
-            ->setMethods(['getDownloadableProductSamples'])
-            ->getMockForAbstractClass();
-        $productExtensionMock->expects($this->once())
-            ->method('getDownloadableProductSamples')
-            ->willReturn([$sampleMock]);
-
-        /** @var ProductInterface|MockObject $entityMock */
-        $entityMock = $this->getMockBuilder(ProductInterface::class)
-            ->setMethods(['getTypeId', 'getExtensionAttributes', 'getSku', 'getStoreId'])
-            ->getMockForAbstractClass();
-        $entityMock->expects($this->once())
+        $this->entityMock->expects($this->once())
             ->method('getTypeId')
             ->willReturn(Type::TYPE_DOWNLOADABLE);
-        $entityMock->expects($this->once())
+        $this->entityMock->expects($this->once())
             ->method('getExtensionAttributes')
-            ->willReturn($productExtensionMock);
-        $entityMock->expects($this->exactly(2))
+            ->willReturn($this->productExtensionMock);
+        $this->entityMock->expects($this->exactly(2))
             ->method('getSku')
             ->willReturn($entitySku);
-        $entityMock->expects($this->once())
+        $this->entityMock->expects($this->once())
             ->method('getStoreId')
             ->willReturn($entityStoreId);
 
         $this->sampleRepositoryMock->expects($this->once())
             ->method('getList')
             ->with($entitySku)
-            ->willReturn([$sampleMock, $sampleToDeleteMock]);
+            ->willReturn([$this->sampleMock, $sampleToDeleteMock]);
         $this->sampleRepositoryMock->expects($this->once())
             ->method('save')
-            ->with($entitySku, $sampleMock, !$entityStoreId);
+            ->with($entitySku, $this->sampleMock, !$entityStoreId);
         $this->sampleRepositoryMock->expects($this->once())
             ->method('delete')
             ->with($sampleToDeleteId);
 
-        $this->assertEquals($entityMock, $this->model->execute($entityMock));
+        $this->assertEquals($this->entityMock, $this->model->execute($this->entityMock));
     }
 
-    public function testExecuteNonDownloadable()
+    /**
+     * Update samples for non downloadable product
+     *
+     * @return void
+     */
+    public function testExecuteNonDownloadable(): void
     {
-        /** @var ProductInterface|MockObject $entityMock */
-        $entityMock = $this->getMockBuilder(ProductInterface::class)
-            ->setMethods(['getTypeId', 'getExtensionAttributes', 'getSku', 'getStoreId'])
-            ->getMockForAbstractClass();
-        $entityMock->expects($this->once())
+        $this->entityMock->expects($this->once())
             ->method('getTypeId')
             ->willReturn(Type::TYPE_DOWNLOADABLE . 'some');
-        $entityMock->expects($this->never())
-            ->method('getExtensionAttributes');
-        $entityMock->expects($this->never())
+        $this->entityMock->expects($this->once())
+            ->method('getExtensionAttributes')
+            ->willReturn($this->productExtensionMock);
+        $this->entityMock->expects($this->never())
             ->method('getSku');
-        $entityMock->expects($this->never())
+        $this->entityMock->expects($this->never())
             ->method('getStoreId');
 
         $this->sampleRepositoryMock->expects($this->never())
@@ -117,6 +143,6 @@ public function testExecuteNonDownloadable()
         $this->sampleRepositoryMock->expects($this->never())
             ->method('delete');
 
-        $this->assertEquals($entityMock, $this->model->execute($entityMock));
+        $this->assertEquals($this->entityMock, $this->model->execute($this->entityMock));
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/ProductRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/ProductRepositoryTest.php
index 1361f10427fab..910386bca25c0 100644
--- a/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/ProductRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/ProductRepositoryTest.php
@@ -296,6 +296,35 @@ public function testUpdateDownloadableProductLinks()
         $this->assertCount(2, $resultSamples);
     }
 
+    /**
+     * Update downloadable product extension attribute and check data
+     *
+     * @return void
+     */
+    public function testUpdateDownloadableProductData(): void
+    {
+        $this->createDownloadableProduct();
+        $extensionAttributes = ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY;
+
+        $productData = [
+            ProductInterface::SKU => self::PRODUCT_SKU,
+            ProductInterface::EXTENSION_ATTRIBUTES_KEY => [
+                'stock_item' => [
+                    'manage_stock' => false,
+                ],
+            ],
+        ];
+
+        $response = $this->saveProduct($productData);
+
+        $this->assertArrayHasKey(ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY, $response);
+        $this->assertArrayHasKey('downloadable_product_samples', $response[$extensionAttributes]);
+        $this->assertArrayHasKey('downloadable_product_links', $response[$extensionAttributes]);
+
+        $this->assertCount(2, $response[$extensionAttributes]['downloadable_product_samples']);
+        $this->assertCount(2, $response[$extensionAttributes]['downloadable_product_links']);
+    }
+
     /**
      * Update downloadable product, update two links and change file content
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)

From a5e978e0cca31600bcce04a785620f58d800c4a0 Mon Sep 17 00:00:00 2001
From: Marjan Petkovski <petkovski.marjan@gmail.com>
Date: Thu, 18 Jun 2020 16:55:21 +0200
Subject: [PATCH 0514/1718] magento/magento2#28563: Edits addressing static
 tests

---
 .../Product/CompositeCollectionProcessor.php             | 8 +++++++-
 .../Model/Resolver/Products/Query/Filter.php             | 9 ---------
 app/code/Magento/CatalogGraphQl/composer.json            | 3 ++-
 .../Model/Context/AddUserInfoToContext.php               | 5 ++---
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CompositeCollectionProcessor.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CompositeCollectionProcessor.php
index be0ff02ffefb9..415dbf565a0b7 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CompositeCollectionProcessor.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CompositeCollectionProcessor.php
@@ -30,7 +30,13 @@ public function __construct(array $collectionProcessors = [])
     }
 
     /**
-     * {@inheritdoc}
+     * Process collection to add additional joins, attributes, and clauses to a product collection.
+     *
+     * @param Collection $collection
+     * @param SearchCriteriaInterface $searchCriteria
+     * @param array $attributeNames
+     * @param ContextInterface|null $context
+     * @return Collection
      */
     public function process(
         Collection $collection,
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Filter.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Filter.php
index 5016e17e8b8e8..d70a3aa7e63c3 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Filter.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Filter.php
@@ -7,7 +7,6 @@
 
 namespace Magento\CatalogGraphQl\Model\Resolver\Products\Query;
 
-use Magento\Catalog\Model\Layer\Resolver as LayerResolver;
 use Magento\Catalog\Model\Product;
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\Exception\InputException;
@@ -36,11 +35,6 @@ class Filter implements ProductQueryInterface
      */
     private $productDataProvider;
 
-    /**
-     * @var LayerResolver
-     */
-    private $layerResolver;
-
     /**
      * FieldSelection
      */
@@ -59,7 +53,6 @@ class Filter implements ProductQueryInterface
     /**
      * @param SearchResultFactory $searchResultFactory
      * @param ProductProvider $productDataProvider
-     * @param LayerResolver $layerResolver
      * @param FieldSelection $fieldSelection
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param ScopeConfigInterface $scopeConfig
@@ -67,14 +60,12 @@ class Filter implements ProductQueryInterface
     public function __construct(
         SearchResultFactory $searchResultFactory,
         ProductProvider $productDataProvider,
-        LayerResolver $layerResolver,
         FieldSelection $fieldSelection,
         SearchCriteriaBuilder $searchCriteriaBuilder,
         ScopeConfigInterface $scopeConfig
     ) {
         $this->searchResultFactory = $searchResultFactory;
         $this->productDataProvider = $productDataProvider;
-        $this->layerResolver = $layerResolver;
         $this->fieldSelection = $fieldSelection;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
         $this->scopeConfig = $scopeConfig;
diff --git a/app/code/Magento/CatalogGraphQl/composer.json b/app/code/Magento/CatalogGraphQl/composer.json
index d6e9bfa3c0505..de0e4908ff979 100644
--- a/app/code/Magento/CatalogGraphQl/composer.json
+++ b/app/code/Magento/CatalogGraphQl/composer.json
@@ -11,7 +11,8 @@
         "magento/module-store": "*",
         "magento/module-eav-graph-ql": "*",
         "magento/module-catalog-search": "*",
-        "magento/framework": "*"
+        "magento/framework": "*",
+        "magento/module-graph-ql": "*"
     },
     "suggest": {
         "magento/module-graph-ql": "*",
diff --git a/app/code/Magento/CustomerGraphQl/Model/Context/AddUserInfoToContext.php b/app/code/Magento/CustomerGraphQl/Model/Context/AddUserInfoToContext.php
index 247ad1fa23656..603a86c1e6f39 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Context/AddUserInfoToContext.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Context/AddUserInfoToContext.php
@@ -57,10 +57,9 @@ public function execute(ContextParametersInterface $contextParameters): ContextP
         }
         $contextParameters->setUserType($currentUserType);
 
-        if ($isCustomer = $this->isCustomer($currentUserId, $currentUserType)) {
-
-            $contextParameters->addExtensionAttribute('is_customer', $isCustomer);
+        $contextParameters->addExtensionAttribute('is_customer', $this->isCustomer($currentUserId, $currentUserType));
 
+        if ($this->isCustomer($currentUserId, $currentUserType)) {
             try {
                 $customerGroupId = $this->customerRepository->getById($currentUserId)->getGroupId();
             } catch (\Exception $e) {

From 433a7d0f7849eb6b18f3f583d3df22c738323b95 Mon Sep 17 00:00:00 2001
From: Marjan Petkovski <petkovski.marjan@gmail.com>
Date: Thu, 18 Jun 2020 17:10:24 +0200
Subject: [PATCH 0515/1718] magento/magento2#25580: Address static tests issues

---
 .../testsuite/Magento/GraphQl/Catalog/ProductViewTest.php      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php
index 5b2a318c23ac2..c6719f1862ddc 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php
@@ -665,7 +665,8 @@ private function assertMediaGalleryEntries($product, $actualResponse)
     {
         $mediaGalleryEntries = $product->getMediaGalleryEntries();
         $this->assertCount(1, $mediaGalleryEntries, "Precondition failed, incorrect number of media gallery entries.");
-        $this->assertIsArray([$actualResponse['media_gallery_entries']],
+        $this->assertIsArray(
+            [$actualResponse['media_gallery_entries']],
             "Media galleries field must be of an array type."
         );
         $this->assertCount(1, $actualResponse['media_gallery_entries'], "There must be 1 record in media gallery.");

From 7e6827db4b2b08de98a089e6568e515397b54cac Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Thu, 18 Jun 2020 21:22:26 +0300
Subject: [PATCH 0516/1718] impr

---
 .../Downloadable/Model/Link/UpdateHandler.php |  1 +
 .../Model/Sample/UpdateHandler.php            |  1 +
 .../Api/ProductRepositoryTest.php             | 48 +++++++++++--------
 3 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/app/code/Magento/Downloadable/Model/Link/UpdateHandler.php b/app/code/Magento/Downloadable/Model/Link/UpdateHandler.php
index 3e7095825a353..371731237a136 100644
--- a/app/code/Magento/Downloadable/Model/Link/UpdateHandler.php
+++ b/app/code/Magento/Downloadable/Model/Link/UpdateHandler.php
@@ -36,6 +36,7 @@ public function __construct(LinkRepository $linkRepository)
      * @param object $entity
      * @param array $arguments
      * @return ProductInterface|object
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($entity, $arguments = [])
     {
diff --git a/app/code/Magento/Downloadable/Model/Sample/UpdateHandler.php b/app/code/Magento/Downloadable/Model/Sample/UpdateHandler.php
index 5def2daa23030..fa766dd9e3bbd 100644
--- a/app/code/Magento/Downloadable/Model/Sample/UpdateHandler.php
+++ b/app/code/Magento/Downloadable/Model/Sample/UpdateHandler.php
@@ -36,6 +36,7 @@ public function __construct(SampleRepository $sampleRepository)
      * @param object $entity
      * @param array $arguments
      * @return ProductInterface|object
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($entity, $arguments = [])
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/ProductRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/ProductRepositoryTest.php
index 910386bca25c0..1b88c33691341 100644
--- a/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/ProductRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/ProductRepositoryTest.php
@@ -8,6 +8,7 @@
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Framework\Api\ExtensibleDataInterface;
+use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\WebapiAbstract;
 
 /**
@@ -15,22 +16,27 @@
  */
 class ProductRepositoryTest extends WebapiAbstract
 {
-    const SERVICE_NAME = 'catalogProductRepositoryV1';
-    const SERVICE_VERSION = 'V1';
-    const RESOURCE_PATH = '/V1/products';
-    const PRODUCT_SKU = 'sku-test-product-downloadable';
+    private const SERVICE_NAME = 'catalogProductRepositoryV1';
+    private const SERVICE_VERSION = 'V1';
+    private const RESOURCE_PATH = '/V1/products';
+    private const PRODUCT_SKU = 'sku-test-product-downloadable';
+
+    private const PRODUCT_SAMPLES = 'downloadable_product_samples';
+    private const PRODUCT_LINKS = 'downloadable_product_links';
 
     /**
      * @var string
      */
-    protected $testImagePath;
+    private $testImagePath;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp(): void
     {
-        parent::setUp();
-        $this->testImagePath = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'test_image.jpg';
+        $objectManager = Bootstrap::getObjectManager();
 
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->testImagePath = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'test_image.jpg';
 
         /** @var DomainManagerInterface $domainManager */
         $domainManager = $objectManager->get(DomainManagerInterface::class);
@@ -45,7 +51,7 @@ protected function tearDown(): void
         $this->deleteProductBySku(self::PRODUCT_SKU);
         parent::tearDown();
 
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $objectManager = Bootstrap::getObjectManager();
 
         /** @var DomainManagerInterface $domainManager */
         $domainManager = $objectManager->get(DomainManagerInterface::class);
@@ -303,26 +309,26 @@ public function testUpdateDownloadableProductLinks()
      */
     public function testUpdateDownloadableProductData(): void
     {
-        $this->createDownloadableProduct();
-        $extensionAttributes = ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY;
+        $productResponce = $this->createDownloadableProduct();
+        $stockItemData = $productResponce[ProductInterface::EXTENSION_ATTRIBUTES_KEY]['stock_item'];
+
+        $stockItemData = TESTS_WEB_API_ADAPTER === self::ADAPTER_SOAP
+            ? $stockItemData['manage_stock'] = false
+            : ['stock_item' => ['manage_stock' => false]];
 
         $productData = [
             ProductInterface::SKU => self::PRODUCT_SKU,
-            ProductInterface::EXTENSION_ATTRIBUTES_KEY => [
-                'stock_item' => [
-                    'manage_stock' => false,
-                ],
-            ],
+            ProductInterface::EXTENSION_ATTRIBUTES_KEY => $stockItemData,
         ];
 
         $response = $this->saveProduct($productData);
 
-        $this->assertArrayHasKey(ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY, $response);
-        $this->assertArrayHasKey('downloadable_product_samples', $response[$extensionAttributes]);
-        $this->assertArrayHasKey('downloadable_product_links', $response[$extensionAttributes]);
+        $this->assertArrayHasKey(ProductInterface::EXTENSION_ATTRIBUTES_KEY, $response);
+        $this->assertArrayHasKey(self::PRODUCT_SAMPLES, $response[ProductInterface::EXTENSION_ATTRIBUTES_KEY]);
+        $this->assertArrayHasKey(self::PRODUCT_LINKS, $response[ProductInterface::EXTENSION_ATTRIBUTES_KEY]);
 
-        $this->assertCount(2, $response[$extensionAttributes]['downloadable_product_samples']);
-        $this->assertCount(2, $response[$extensionAttributes]['downloadable_product_links']);
+        $this->assertCount(2, $response[ProductInterface::EXTENSION_ATTRIBUTES_KEY][self::PRODUCT_SAMPLES]);
+        $this->assertCount(2, $response[ProductInterface::EXTENSION_ATTRIBUTES_KEY][self::PRODUCT_LINKS]);
     }
 
     /**

From b1a526dc9a2a9958b28eb4a541e26aa6a59415f2 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Thu, 18 Jun 2020 13:41:20 -0500
Subject: [PATCH 0517/1718] MC-35301: Allow inline scripts and styles for 2.4.0

---
 app/code/Magento/Csp/etc/config.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Csp/etc/config.xml b/app/code/Magento/Csp/etc/config.xml
index dd3ddcbbf85bc..6e2235479da93 100644
--- a/app/code/Magento/Csp/etc/config.xml
+++ b/app/code/Magento/Csp/etc/config.xml
@@ -75,14 +75,14 @@
                     <styles>
                         <policy_id>style-src</policy_id>
                         <self>1</self>
-                        <inline>0</inline>
+                        <inline>1</inline>
                         <eval>0</eval>
                         <dynamic>0</dynamic>
                     </styles>
                     <scripts>
                         <policy_id>script-src</policy_id>
                         <self>1</self>
-                        <inline>0</inline>
+                        <inline>1</inline>
                         <eval>1</eval>
                         <dynamic>0</dynamic>
                     </scripts>
@@ -180,14 +180,14 @@
                     <styles>
                         <policy_id>style-src</policy_id>
                         <self>1</self>
-                        <inline>0</inline>
+                        <inline>1</inline>
                         <eval>0</eval>
                         <dynamic>0</dynamic>
                     </styles>
                     <scripts>
                         <policy_id>script-src</policy_id>
                         <self>1</self>
-                        <inline>0</inline>
+                        <inline>1</inline>
                         <eval>1</eval>
                         <dynamic>0</dynamic>
                     </scripts>

From a9d6eb3265663b35abf0d799963a5c6097fbaa23 Mon Sep 17 00:00:00 2001
From: Munkh-Ulzii Balidar <mbalidar@comwrap.com>
Date: Thu, 18 Jun 2020 22:08:12 +0200
Subject: [PATCH 0518/1718] 28584 fix static code style

---
 .../CatalogGraphQl/Model/Category/DepthCalculator.php    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php b/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php
index 6bbd163436c2c..f3dd4aafaeb0d 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php
@@ -54,10 +54,13 @@ public function calculate(ResolveInfo $resolveInfo, FieldNode $fieldNode) : int
      * @param ResolveInfo $resolveInfo
      * @param InlineFragmentNode $inlineFragmentField
      * @param array $depth
-     * @return int[]
+     * @return int
      */
-    private function addInlineFragmentDepth(ResolveInfo $resolveInfo, InlineFragmentNode $inlineFragmentField, $depth = [])
-    {
+    private function addInlineFragmentDepth(
+        ResolveInfo $resolveInfo,
+        InlineFragmentNode
+        $inlineFragmentField, $depth = []
+    ): int {
         $selections = $inlineFragmentField->selectionSet->selections;
         /** @var FieldNode $field */
         foreach ($selections as $field) {

From c53526484b93d75349cfe815fd214f95c255f171 Mon Sep 17 00:00:00 2001
From: Marjan Petkovski <petkovski.marjan@gmail.com>
Date: Thu, 18 Jun 2020 23:12:22 +0200
Subject: [PATCH 0519/1718] magento/magento2#28563: Edits session 1 -
 addressing WebApi tests failures

---
 .../Magento/CatalogGraphQl/Model/Resolver/Category/Products.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Products.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Products.php
index 85b86f313de4d..b966fce43f56d 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Products.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Products.php
@@ -63,7 +63,7 @@ public function resolve(
                 'eq' => $value['id']
             ]
         ];
-        $searchResult = $this->searchQuery->getResult($args, $info);
+        $searchResult = $this->searchQuery->getResult($args, $info, $context);
 
         //possible division by 0
         if ($searchResult->getPageSize()) {

From 1688f8f45e91ece49c980fee13e386083075af28 Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@magento.com>
Date: Fri, 19 Jun 2020 00:22:13 -0500
Subject: [PATCH 0520/1718] MC-31618: Move static config to files - PLUGIN_LIST

- Move possible common logic to ConfigWriter;
---
 app/etc/di.xml                                |  1 +
 .../Framework/Interception/ConfigWriter.php   | 10 +--
 .../Interception/PluginList/PluginList.php    | 76 +++++--------------
 3 files changed, 24 insertions(+), 63 deletions(-)

diff --git a/app/etc/di.xml b/app/etc/di.xml
index d28c0ec6bb99f..7792f43592f5b 100644
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -436,6 +436,7 @@
     <type name="Magento\Framework\Interception\ConfigWriter">
         <arguments>
             <argument name="reader" xsi:type="object">Magento\Framework\ObjectManager\Config\Reader\Dom\Proxy</argument>
+            <argument name="logger" xsi:type="object">\Psr\Log\LoggerInterface\Proxy</argument>
             <argument name="scopePriorityScheme" xsi:type="array">
                 <item name="primary" xsi:type="string">primary</item>
                 <item name="first" xsi:type="string">global</item>
diff --git a/lib/internal/Magento/Framework/Interception/ConfigWriter.php b/lib/internal/Magento/Framework/Interception/ConfigWriter.php
index 9dee8ce8bcd3e..08cf613650baa 100644
--- a/lib/internal/Magento/Framework/Interception/ConfigWriter.php
+++ b/lib/internal/Magento/Framework/Interception/ConfigWriter.php
@@ -216,7 +216,7 @@ private function loadScopedVirtualTypes()
      *
      * @return array
      */
-    private function getClassDefinitions()
+    public function getClassDefinitions()
     {
         return $this->classDefinitions->getClasses();
     }
@@ -227,7 +227,7 @@ private function getClassDefinitions()
      * @param string $scopeCode
      * @return bool
      */
-    private function isCurrentScope($scopeCode)
+    public function isCurrentScope($scopeCode)
     {
         return $this->scopeConfig->getCurrentScope() === $scopeCode;
     }
@@ -314,7 +314,7 @@ private function inheritPlugins($type)
      * @param array $plugins
      * @return void
      */
-    private function trimInstanceStartingBackslash(&$plugins)
+    public function trimInstanceStartingBackslash(&$plugins)
     {
         foreach ($plugins as &$plugin) {
             $plugin['instance'] = ltrim($plugin['instance'], '\\');
@@ -327,7 +327,7 @@ private function trimInstanceStartingBackslash(&$plugins)
      * @param array $plugins
      * @return void
      */
-    private function filterPlugins(array &$plugins)
+    public function filterPlugins(array &$plugins)
     {
         foreach ($plugins as $name => $plugin) {
             if (empty($plugin['instance'])) {
@@ -367,7 +367,7 @@ private function merge(array $config)
      * @param array $itemB
      * @return int
      */
-    private function sort($itemA, $itemB)
+    public function sort($itemA, $itemB)
     {
         return ($itemA['sortOrder'] ?? PHP_INT_MIN) - ($itemB['sortOrder'] ?? PHP_INT_MIN);
     }
diff --git a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
index 9b53f5d023c56..64e55b78f1fc5 100644
--- a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
+++ b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
@@ -18,7 +18,7 @@
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\Serialize\Serializer\Serialize;
 use Magento\Framework\Interception\ConfigLoader;
-use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Interception\ConfigWriter;
 
 /**
  * Plugin config, provides list of plugins for a type
@@ -79,11 +79,6 @@ class PluginList extends Scoped implements InterceptionPluginList
      */
     protected $_pluginInstances = [];
 
-    /**
-     * @var \Psr\Log\LoggerInterface
-     */
-    private $logger;
-
     /**
      * @var SerializerInterface
      */
@@ -94,6 +89,11 @@ class PluginList extends Scoped implements InterceptionPluginList
      */
     private $configLoader;
 
+    /**
+     * @var ConfigWriter
+     */
+    private $configWriter;
+
     /**
      * Constructor
      *
@@ -109,6 +109,7 @@ class PluginList extends Scoped implements InterceptionPluginList
      * @param string|null $cacheId
      * @param SerializerInterface|null $serializer
      * @param ConfigLoader|null $configLoader
+     * @param ConfigWriter|null $configWriter
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -123,7 +124,8 @@ public function __construct(
         array $scopePriorityScheme = ['global'],
         $cacheId = 'plugins',
         SerializerInterface $serializer = null,
-        ConfigLoader $configLoader = null
+        ConfigLoader $configLoader = null,
+        ConfigWriter $configWriter = null
     ) {
         $this->serializer = $serializer ?: $objectManager->get(Serialize::class);
         parent::__construct($reader, $configScope, $cache, $cacheId, $this->serializer);
@@ -133,7 +135,8 @@ public function __construct(
         $this->_classDefinitions = $classDefinitions;
         $this->_scopePriorityScheme = $scopePriorityScheme;
         $this->_objectManager = $objectManager;
-        $this->configLoader = $configLoader ?: ObjectManager::getInstance()->get(ConfigLoader::class);
+        $this->configLoader = $configLoader ?: $this->_objectManager->get(ConfigLoader::class);
+        $this->configWriter = $configWriter ?: $this->_objectManager->get(ConfigWriter::class);
     }
 
     /**
@@ -176,9 +179,9 @@ protected function _inheritPlugins($type)
             }
             $this->_inherited[$type] = null;
             if (is_array($plugins) && count($plugins)) {
-                $this->filterPlugins($plugins);
+                $this->configWriter->filterPlugins($plugins);
                 uasort($plugins, [$this, '_sort']);
-                $this->trimInstanceStartingBackslash($plugins);
+                $this->configWriter->trimInstanceStartingBackslash($plugins);
                 $this->_inherited[$type] = $plugins;
                 $lastPerMethod = [];
                 foreach ($plugins as $key => $plugin) {
@@ -212,19 +215,6 @@ protected function _inheritPlugins($type)
         return $this->_inherited[$type];
     }
 
-    /**
-     * Trims starting backslash from plugin instance name
-     *
-     * @param array $plugins
-     * @return void
-     */
-    private function trimInstanceStartingBackslash(&$plugins)
-    {
-        foreach ($plugins as &$plugin) {
-            $plugin['instance'] = ltrim($plugin['instance'], '\\');
-        }
-    }
-
     /**
      * Sort items
      *
@@ -234,7 +224,7 @@ private function trimInstanceStartingBackslash(&$plugins)
      */
     protected function _sort($itemA, $itemB)
     {
-        return ($itemA['sortOrder'] ?? PHP_INT_MIN) - ($itemB['sortOrder'] ?? PHP_INT_MIN);
+        return $this->configWriter->sort($itemA, $itemB);
     }
 
     /**
@@ -281,8 +271,8 @@ public function getNext($type, $method, $code = '__self')
     protected function _loadScopedData()
     {
         $scope = $this->_configScope->getCurrentScope();
-        if (false == isset($this->_loadedScopes[$scope])) {
-            $index = array_search($scope, $this->_scopePriorityScheme);
+        if (false === isset($this->_loadedScopes[$scope])) {
+            $index = array_search($scope, $this->_scopePriorityScheme, true);
             /**
              * Force current scope to be at the end of the scheme to ensure that default priority scopes are loaded.
              * Mostly happens when the current scope is primary.
@@ -363,7 +353,7 @@ private function _loadScopedVirtualTypes()
      */
     protected function isCurrentScope($scopeCode)
     {
-        return $this->_configScope->getCurrentScope() === $scopeCode;
+        return $this->configWriter->isCurrentScope($scopeCode);
     }
 
     /**
@@ -373,7 +363,7 @@ protected function isCurrentScope($scopeCode)
      */
     protected function getClassDefinitions()
     {
-        return $this->_classDefinitions->getClasses();
+        return $this->configWriter->getClassDefinitions();
     }
 
     /**
@@ -395,34 +385,4 @@ public function merge(array $config)
             }
         }
     }
-
-    /**
-     * Remove from list not existing plugins
-     *
-     * @param array $plugins
-     * @return void
-     */
-    private function filterPlugins(array &$plugins)
-    {
-        foreach ($plugins as $name => $plugin) {
-            if (empty($plugin['instance'])) {
-                unset($plugins[$name]);
-                $this->getLogger()->info("Reference to undeclared plugin with name '{$name}'.");
-            }
-        }
-    }
-
-    /**
-     * Get logger
-     *
-     * @return \Psr\Log\LoggerInterface
-     * @deprecated 100.2.0
-     */
-    private function getLogger()
-    {
-        if ($this->logger === null) {
-            $this->logger = $this->_objectManager->get(\Psr\Log\LoggerInterface::class);
-        }
-        return $this->logger;
-    }
 }

From ea0ea52ae770656486ab5636ad678f7c72646dc0 Mon Sep 17 00:00:00 2001
From: Marjan Petkovski <petkovski.marjan@gmail.com>
Date: Fri, 19 Jun 2020 10:05:01 +0200
Subject: [PATCH 0521/1718] magento/magento2#28563: Edits session 2 -
 addressing Static tests failures

---
 app/code/Magento/CustomerGraphQl/etc/module.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/CustomerGraphQl/etc/module.xml b/app/code/Magento/CustomerGraphQl/etc/module.xml
index ab21c6411bef6..b15df7fc0be6b 100644
--- a/app/code/Magento/CustomerGraphQl/etc/module.xml
+++ b/app/code/Magento/CustomerGraphQl/etc/module.xml
@@ -6,8 +6,9 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_CustomerGraphQl"/>
+    <module name="Magento_CustomerGraphQl" >
         <sequence>
             <module name="Magento_Customer"/>
         </sequence>
+    </module>
 </config>

From 423939c02b833056db22f42d640ff21261c5dd58 Mon Sep 17 00:00:00 2001
From: Munkh-Ulzii Balidar <mbalidar@comwrap.com>
Date: Fri, 19 Jun 2020 10:17:50 +0200
Subject: [PATCH 0522/1718] 28584 fix static code style

---
 .../Magento/CatalogGraphQl/Model/Category/DepthCalculator.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php b/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php
index f3dd4aafaeb0d..ab100c7272ba0 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Category/DepthCalculator.php
@@ -58,8 +58,8 @@ public function calculate(ResolveInfo $resolveInfo, FieldNode $fieldNode) : int
      */
     private function addInlineFragmentDepth(
         ResolveInfo $resolveInfo,
-        InlineFragmentNode
-        $inlineFragmentField, $depth = []
+        InlineFragmentNode $inlineFragmentField,
+        $depth = []
     ): int {
         $selections = $inlineFragmentField->selectionSet->selections;
         /** @var FieldNode $field */

From c52c6e9fe9f3f8f4fadb5c1db7f6a1672563b0c8 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Fri, 19 Jun 2020 11:29:11 +0300
Subject: [PATCH 0523/1718] add strict types

---
 .../Magento/Downloadable/Model/Link/UpdateHandler.php  | 10 ++++++----
 .../Downloadable/Model/Sample/UpdateHandler.php        | 10 ++++++----
 .../Magento/Downloadable/Api/ProductRepositoryTest.php |  2 ++
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Downloadable/Model/Link/UpdateHandler.php b/app/code/Magento/Downloadable/Model/Link/UpdateHandler.php
index 371731237a136..21bc0a121f5e2 100644
--- a/app/code/Magento/Downloadable/Model/Link/UpdateHandler.php
+++ b/app/code/Magento/Downloadable/Model/Link/UpdateHandler.php
@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Downloadable\Model\Link;
 
 use Magento\Catalog\Api\Data\ProductInterface;
@@ -33,16 +36,15 @@ public function __construct(LinkRepository $linkRepository)
     /**
      * Update links for downloadable product if exist
      *
-     * @param object $entity
+     * @param ProductInterface $entity
      * @param array $arguments
-     * @return ProductInterface|object
+     * @return ProductInterface
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function execute($entity, $arguments = [])
+    public function execute($entity, $arguments = []): ProductInterface
     {
         $links = $entity->getExtensionAttributes()->getDownloadableProductLinks();
 
-        /** @var $entity ProductInterface */
         if ($links && $entity->getTypeId() === Type::TYPE_DOWNLOADABLE) {
             $this->updateLinks($entity, $links);
         }
diff --git a/app/code/Magento/Downloadable/Model/Sample/UpdateHandler.php b/app/code/Magento/Downloadable/Model/Sample/UpdateHandler.php
index fa766dd9e3bbd..cb7ff725a21d3 100644
--- a/app/code/Magento/Downloadable/Model/Sample/UpdateHandler.php
+++ b/app/code/Magento/Downloadable/Model/Sample/UpdateHandler.php
@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Downloadable\Model\Sample;
 
 use Magento\Catalog\Api\Data\ProductInterface;
@@ -33,16 +36,15 @@ public function __construct(SampleRepository $sampleRepository)
     /**
      * Update samples for downloadable product if exist
      *
-     * @param object $entity
+     * @param ProductInterface $entity
      * @param array $arguments
-     * @return ProductInterface|object
+     * @return ProductInterface
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function execute($entity, $arguments = [])
+    public function execute($entity, $arguments = []): ProductInterface
     {
         $samples = $entity->getExtensionAttributes()->getDownloadableProductSamples();
 
-        /** @var $entity ProductInterface */
         if ($samples && $entity->getTypeId() === Type::TYPE_DOWNLOADABLE) {
             $this->updateSamples($entity, $samples);
         }
diff --git a/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/ProductRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/ProductRepositoryTest.php
index 1b88c33691341..00bbb3f435cae 100644
--- a/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/ProductRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Downloadable/Api/ProductRepositoryTest.php
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Downloadable\Api;
 
 use Magento\Catalog\Api\Data\ProductInterface;

From fb64618a39666061be0bd1bb7971e3d424bf5a8c Mon Sep 17 00:00:00 2001
From: Viktor Petryk <victor.petryk@transoftgroup.com>
Date: Fri, 19 Jun 2020 13:08:26 +0300
Subject: [PATCH 0524/1718] MC-32518: [2.4] [ElasticSearch] Product is not
 shown on category page after attribute is added

---
 .../Model/Client/Elasticsearch.php            | 20 ++++++--
 .../BatchDataMapper/ProductDataMapper.php     | 46 +++++++++++++++++--
 .../Model/Client/ElasticsearchTest.php        | 20 +++++++-
 .../BatchDataMapper/ProductDataMapperTest.php | 32 ++++++++-----
 app/code/Magento/Elasticsearch/etc/di.xml     |  5 ++
 .../Model/Client/Elasticsearch.php            | 17 +++++--
 .../Unit/Model/Client/ElasticsearchTest.php   | 24 ++++++++--
 .../Model/Client/Elasticsearch.php            | 38 +++++++++------
 .../Unit/Model/Client/ElasticsearchTest.php   | 24 ++++++++--
 .../BatchDataMapper/ProductDataMapperTest.php | 18 ++++----
 10 files changed, 187 insertions(+), 57 deletions(-)

diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php
index bd9a380230652..4c0fbca0da6b9 100644
--- a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php
+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Elasticsearch\Elasticsearch5\Model\Client;
 
 use Magento\Framework\Exception\LocalizedException;
@@ -11,7 +12,7 @@
 /**
  * Elasticsearch client
  *
- * @deprecated the Elasticsearch 5 doesn't supported due to EOL
+ * @deprecated 100.3.5 the Elasticsearch 5 doesn't supported due to EOL
  */
 class Elasticsearch implements ClientInterface
 {
@@ -48,8 +49,10 @@ public function __construct(
         $options = [],
         $elasticsearchClient = null
     ) {
-        if (empty($options['hostname']) || ((!empty($options['enableAuth']) &&
-                    ($options['enableAuth'] == 1)) && (empty($options['username']) || empty($options['password'])))) {
+        if (empty($options['hostname'])
+            || ((!empty($options['enableAuth']) && ($options['enableAuth'] == 1))
+                && (empty($options['username']) || empty($options['password'])))
+        ) {
             throw new LocalizedException(
                 __('The search failed because of a search engine misconfiguration.')
             );
@@ -302,7 +305,15 @@ public function addFieldsMapping(array $fields, $index, $entityType)
                                     ]
                                 ),
                             ],
-                        ]
+                        ],
+                        [
+                            'integer_mapping' => [
+                                'match_mapping_type' => 'long',
+                                'mapping' => [
+                                    'type' => 'integer',
+                                ],
+                            ],
+                        ],
                     ],
                 ],
             ],
@@ -323,7 +334,6 @@ public function addFieldsMapping(array $fields, $index, $entityType)
      */
     private function prepareFieldInfo($fieldInfo)
     {
-
         if (strcmp($this->getServerVersion(), '5') < 0) {
             if ($fieldInfo['type'] == 'keyword') {
                 $fieldInfo['type'] = 'string';
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapper.php b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapper.php
index 245e4d494afe1..9fa001097df87 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapper.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapper.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Elasticsearch\Model\Adapter\BatchDataMapper;
 
 use Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider;
@@ -74,7 +75,7 @@ class ProductDataMapper implements BatchDataMapperInterface
     private $attributesExcludedFromMerge = [
         'status',
         'visibility',
-        'tax_class_id'
+        'tax_class_id',
     ];
 
     /**
@@ -85,8 +86,11 @@ class ProductDataMapper implements BatchDataMapperInterface
     ];
 
     /**
-     * Construction for DocumentDataMapper
-     *
+     * @var string[]
+     */
+    private $filterableAttributeTypes;
+
+    /**
      * @param Builder $builder
      * @param FieldMapperInterface $fieldMapper
      * @param DateFieldType $dateFieldType
@@ -94,6 +98,7 @@ class ProductDataMapper implements BatchDataMapperInterface
      * @param DataProvider $dataProvider
      * @param array $excludedAttributes
      * @param array $sortableAttributesValuesToImplode
+     * @param array $filterableAttributeTypes
      */
     public function __construct(
         Builder $builder,
@@ -102,7 +107,8 @@ public function __construct(
         AdditionalFieldsProviderInterface $additionalFieldsProvider,
         DataProvider $dataProvider,
         array $excludedAttributes = [],
-        array $sortableAttributesValuesToImplode = []
+        array $sortableAttributesValuesToImplode = [],
+        array $filterableAttributeTypes = []
     ) {
         $this->builder = $builder;
         $this->fieldMapper = $fieldMapper;
@@ -115,6 +121,7 @@ public function __construct(
         $this->additionalFieldsProvider = $additionalFieldsProvider;
         $this->dataProvider = $dataProvider;
         $this->attributeOptionsCache = [];
+        $this->filterableAttributeTypes = $filterableAttributeTypes;
     }
 
     /**
@@ -212,7 +219,7 @@ private function convertAttribute(Attribute $attribute, array $attributeValues,
         if ($retrievedValue !== null) {
             $productAttributes[$attribute->getAttributeCode()] = $retrievedValue;
 
-            if ($attribute->getIsSearchable()) {
+            if ($this->isAttributeLabelsShouldBeMapped($attribute)) {
                 $attributeLabels = $this->getValuesLabels($attribute, $attributeValues, $storeId);
                 $retrievedLabel = $this->retrieveFieldValue($attributeLabels);
                 if ($retrievedLabel) {
@@ -224,6 +231,26 @@ private function convertAttribute(Attribute $attribute, array $attributeValues,
         return $productAttributes;
     }
 
+    /**
+     * Check if an attribute has one of the next storefront properties enabled for mapping labels:
+     * - "Use in Search" (is_searchable)
+     * - "Visible in Advanced Search" (is_visible_in_advanced_search)
+     * - "Use in Layered Navigation" (is_filterable)
+     * - "Use in Search Results Layered Navigation" (is_filterable_in_search)
+     *
+     * @param Attribute $attribute
+     * @return bool
+     */
+    private function isAttributeLabelsShouldBeMapped(Attribute $attribute): bool
+    {
+        return (
+            $attribute->getIsSearchable()
+            || $attribute->getIsVisibleInAdvancedSearch()
+            || $attribute->getIsFilterable()
+            || $attribute->getIsFilterableInSearch()
+        );
+    }
+
     /**
      * Prepare attribute values.
      *
@@ -249,6 +276,15 @@ private function prepareAttributeValues(
             $attributeValues = $this->prepareMultiselectValues($attributeValues);
         }
 
+        if (in_array($attribute->getFrontendInput(), $this->filterableAttributeTypes)) {
+            $attributeValues = array_map(
+                function (string $valueId) {
+                    return (int)$valueId;
+                },
+                $attributeValues
+            );
+        }
+
         if ($this->isAttributeDate($attribute)) {
             foreach ($attributeValues as $key => $attributeValue) {
                 $attributeValues[$key] = $this->dateFieldType->formatDate($storeId, $attributeValue);
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php
index 49a894f1295c7..e7d23faed026c 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php
@@ -340,7 +340,7 @@ public function testAddFieldsMapping()
                                         'match_mapping_type' => 'string',
                                         'mapping' => [
                                             'type' => 'integer',
-                                            'index' => true
+                                            'index' => true,
                                         ],
                                     ],
                                 ],
@@ -354,6 +354,14 @@ public function testAddFieldsMapping()
                                         ],
                                     ],
                                 ],
+                                [
+                                    'integer_mapping' => [
+                                        'match_mapping_type' => 'long',
+                                        'mapping' => [
+                                            'type' => 'integer',
+                                        ],
+                                    ],
+                                ],
                             ],
                         ],
                     ],
@@ -424,7 +432,15 @@ public function testAddFieldsMappingFailure()
                                             'index' => true,
                                         ],
                                     ],
-                                ]
+                                ],
+                                [
+                                    'integer_mapping' => [
+                                        'match_mapping_type' => 'long',
+                                        'mapping' => [
+                                            'type' => 'integer',
+                                        ],
+                                    ],
+                                ],
                             ],
                         ],
                     ],
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/BatchDataMapper/ProductDataMapperTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/BatchDataMapper/ProductDataMapperTest.php
index 2c87549da6075..9f1b59b1bfc81 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/BatchDataMapper/ProductDataMapperTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/BatchDataMapper/ProductDataMapperTest.php
@@ -21,6 +21,8 @@
 use PHPUnit\Framework\TestCase;
 
 /**
+ * Unit tests for \Magento\Elasticsearch\Model\Adapter\BatchDataMapper\ProductDataMapper class.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ProductDataMapperTest extends TestCase
@@ -56,12 +58,12 @@ class ProductDataMapperTest extends TestCase
     private $additionalFieldsProvider;
 
     /**
-     * @var MockObject
+     * @var DataProvider|MockObject
      */
     private $dataProvider;
 
     /**
-     * Set up test environment.
+     * @inheritdoc
      */
     protected function setUp(): void
     {
@@ -71,6 +73,11 @@ protected function setUp(): void
         $this->attribute = $this->createMock(Attribute::class);
         $this->additionalFieldsProvider = $this->getMockForAbstractClass(AdditionalFieldsProviderInterface::class);
         $this->dateFieldTypeMock = $this->createMock(Date::class);
+        $filterableAttributeTypes = [
+            'boolean' => 'boolean',
+            'multiselect' => 'multiselect',
+            'select' => 'select',
+        ];
 
         $objectManager = new ObjectManagerHelper($this);
         $this->model = $objectManager->getObject(
@@ -81,6 +88,7 @@ protected function setUp(): void
                 'dateFieldType' => $this->dateFieldTypeMock,
                 'dataProvider' => $this->dataProvider,
                 'additionalFieldsProvider' => $this->additionalFieldsProvider,
+                'filterableAttributeTypes' => $filterableAttributeTypes,
             ]
         );
     }
@@ -159,8 +167,8 @@ public function testGetMap(int $productId, array $attributeData, $attributeValue
             $productId => [$attributeId => $attributeValue],
         ];
         $documents = $this->model->map($documentData, $storeId, $context);
-        $returnAttributeData['store_id'] = $storeId;
-        $this->assertEquals($returnAttributeData, $documents[$productId]);
+        $returnAttributeData = ['store_id' => $storeId] + $returnAttributeData;
+        $this->assertSame($returnAttributeData, $documents[$productId]);
     }
 
     /**
@@ -305,8 +313,8 @@ public static function mapProvider(): array
                         ['value' => '2', 'label' => 'Disabled'],
                     ],
                 ],
-                [10  => '1', 11 => '2'],
-                ['status' => '1'],
+                [10 => '1', 11 => '2'],
+                ['status' => 1],
             ],
             'select without options' => [
                 10,
@@ -318,7 +326,7 @@ public static function mapProvider(): array
                     'options' => [],
                 ],
                 '44',
-                ['color' => '44'],
+                ['color' => 44],
             ],
             'unsearchable select with options' => [
                 10,
@@ -333,7 +341,7 @@ public static function mapProvider(): array
                     ],
                 ],
                 '44',
-                ['color' => '44'],
+                ['color' => 44],
             ],
             'searchable select with options' => [
                 10,
@@ -348,7 +356,7 @@ public static function mapProvider(): array
                     ],
                 ],
                 '44',
-                ['color' => '44', 'color_value' => 'red'],
+                ['color' => 44, 'color_value' => 'red'],
             ],
             'composite select with options' => [
                 10,
@@ -363,7 +371,7 @@ public static function mapProvider(): array
                     ],
                 ],
                 [10 => '44', 11 => '45'],
-                ['color' => ['44', '45'], 'color_value' => ['red', 'black']],
+                ['color' => [44, 45], 'color_value' => ['red', 'black']],
             ],
             'multiselect without options' => [
                 10,
@@ -430,10 +438,10 @@ public static function mapProvider(): array
                     'backend_type' => 'int',
                     'frontend_input' => 'int',
                     'is_searchable' => false,
-                    'options' => []
+                    'options' => [],
                 ],
                 15,
-                []
+                [],
             ],
         ];
     }
diff --git a/app/code/Magento/Elasticsearch/etc/di.xml b/app/code/Magento/Elasticsearch/etc/di.xml
index 633e67dfe698e..6c1a771958081 100644
--- a/app/code/Magento/Elasticsearch/etc/di.xml
+++ b/app/code/Magento/Elasticsearch/etc/di.xml
@@ -153,6 +153,11 @@
     <type name="Magento\Elasticsearch\Model\Adapter\BatchDataMapper\ProductDataMapper">
         <arguments>
             <argument name="additionalFieldsProvider" xsi:type="object">additionalFieldsProviderForElasticsearch</argument>
+            <argument name="filterableAttributeTypes" xsi:type="array">
+                <item name="boolean" xsi:type="string">boolean</item>
+                <item name="multiselect" xsi:type="string">multiselect</item>
+                <item name="select" xsi:type="string">select</item>
+            </argument>
         </arguments>
     </type>
     <preference for="Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface" type="Magento\Elasticsearch\Model\Adapter\BatchDataMapper\DataMapperResolver" />
diff --git a/app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php b/app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php
index 2c1c283c5b24d..dadc35e6c2b33 100644
--- a/app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php
+++ b/app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Elasticsearch6\Model\Client;
 
 use Magento\AdvancedSearch\Model\Client\ClientInterface;
@@ -48,8 +49,10 @@ public function __construct(
         $elasticsearchClient = null,
         $fieldsMappingPreprocessors = []
     ) {
-        if (empty($options['hostname']) || ((!empty($options['enableAuth']) &&
-                    ($options['enableAuth'] == 1)) && (empty($options['username']) || empty($options['password'])))) {
+        if (empty($options['hostname'])
+            || ((!empty($options['enableAuth']) && ($options['enableAuth'] == 1))
+                && (empty($options['username']) || empty($options['password'])))
+        ) {
             throw new LocalizedException(
                 __('The search failed because of a search engine misconfiguration.')
             );
@@ -303,7 +306,15 @@ public function addFieldsMapping(array $fields, $index, $entityType)
                                 'mapping' => [
                                     'type' => 'text',
                                     'index' => true,
-                                    'copy_to' => '_search'
+                                    'copy_to' => '_search',
+                                ],
+                            ],
+                        ],
+                        [
+                            'integer_mapping' => [
+                                'match_mapping_type' => 'long',
+                                'mapping' => [
+                                    'type' => 'integer',
                                 ],
                             ],
                         ],
diff --git a/app/code/Magento/Elasticsearch6/Test/Unit/Model/Client/ElasticsearchTest.php b/app/code/Magento/Elasticsearch6/Test/Unit/Model/Client/ElasticsearchTest.php
index aa0b49400c517..e7c6343d07268 100644
--- a/app/code/Magento/Elasticsearch6/Test/Unit/Model/Client/ElasticsearchTest.php
+++ b/app/code/Magento/Elasticsearch6/Test/Unit/Model/Client/ElasticsearchTest.php
@@ -461,10 +461,18 @@ public function testAddFieldsMapping()
                                         'mapping' => [
                                             'type' => 'text',
                                             'index' => true,
-                                            'copy_to' => '_search'
+                                            'copy_to' => '_search',
                                         ],
                                     ],
-                                ]
+                                ],
+                                [
+                                    'integer_mapping' => [
+                                        'match_mapping_type' => 'long',
+                                        'mapping' => [
+                                            'type' => 'integer',
+                                        ],
+                                    ],
+                                ],
                             ],
                         ],
                     ],
@@ -531,10 +539,18 @@ public function testAddFieldsMappingFailure()
                                         'mapping' => [
                                             'type' => 'text',
                                             'index' => true,
-                                            'copy_to' => '_search'
+                                            'copy_to' => '_search',
                                         ],
                                     ],
-                                ]
+                                ],
+                                [
+                                    'integer_mapping' => [
+                                        'match_mapping_type' => 'long',
+                                        'mapping' => [
+                                            'type' => 'integer',
+                                        ],
+                                    ],
+                                ],
                             ],
                         ],
                     ],
diff --git a/app/code/Magento/Elasticsearch7/Model/Client/Elasticsearch.php b/app/code/Magento/Elasticsearch7/Model/Client/Elasticsearch.php
index feacca8d62804..9aac2293b3002 100644
--- a/app/code/Magento/Elasticsearch7/Model/Client/Elasticsearch.php
+++ b/app/code/Magento/Elasticsearch7/Model/Client/Elasticsearch.php
@@ -51,8 +51,10 @@ public function __construct(
         $elasticsearchClient = null,
         $fieldsMappingPreprocessors = []
     ) {
-        if (empty($options['hostname']) || ((!empty($options['enableAuth']) &&
-                    ($options['enableAuth'] == 1)) && (empty($options['username']) || empty($options['password'])))) {
+        if (empty($options['hostname'])
+            || ((!empty($options['enableAuth']) && ($options['enableAuth'] == 1))
+                && (empty($options['username']) || empty($options['password'])))
+        ) {
             throw new LocalizedException(
                 __('The search failed because of a search engine misconfiguration.')
             );
@@ -71,7 +73,7 @@ public function __construct(
      * @param array $query
      * @return array
      */
-    public function suggest(array $query) : array
+    public function suggest(array $query): array
     {
         return $this->getElasticsearchClient()->suggest($query);
     }
@@ -96,7 +98,7 @@ private function getElasticsearchClient(): \Elasticsearch\Client
      *
      * @return bool
      */
-    public function ping() : bool
+    public function ping(): bool
     {
         if ($this->pingResult === null) {
             $this->pingResult = $this->getElasticsearchClient()
@@ -111,7 +113,7 @@ public function ping() : bool
      *
      * @return bool
      */
-    public function testConnection() : bool
+    public function testConnection(): bool
     {
         return $this->ping();
     }
@@ -122,7 +124,7 @@ public function testConnection() : bool
      * @param array $options
      * @return array
      */
-    private function buildESConfig(array $options = []) : array
+    private function buildESConfig(array $options = []): array
     {
         $hostname = preg_replace('/http[s]?:\/\//i', '', $options['hostname']);
         // @codingStandardsIgnoreStart
@@ -194,12 +196,13 @@ public function deleteIndex(string $index)
      * @param string $index
      * @return bool
      */
-    public function isEmptyIndex(string $index) : bool
+    public function isEmptyIndex(string $index): bool
     {
         $stats = $this->getElasticsearchClient()->indices()->stats(['index' => $index, 'metric' => 'docs']);
-        if ($stats['indices'][$index]['primaries']['docs']['count'] ===  0) {
+        if ($stats['indices'][$index]['primaries']['docs']['count'] === 0) {
             return true;
         }
+
         return false;
     }
 
@@ -234,7 +237,7 @@ public function updateAlias(string $alias, string $newIndex, string $oldIndex =
      * @param string $index
      * @return bool
      */
-    public function indexExists(string $index) : bool
+    public function indexExists(string $index): bool
     {
         return $this->getElasticsearchClient()->indices()->exists(['index' => $index]);
     }
@@ -246,12 +249,13 @@ public function indexExists(string $index) : bool
      * @param string $index
      * @return bool
      */
-    public function existsAlias(string $alias, string $index = '') : bool
+    public function existsAlias(string $alias, string $index = ''): bool
     {
         $params = ['name' => $alias];
         if ($index) {
             $params['index'] = $index;
         }
+
         return $this->getElasticsearchClient()->indices()->existsAlias($params);
     }
 
@@ -261,7 +265,7 @@ public function existsAlias(string $alias, string $index = '') : bool
      * @param string $alias
      * @return array
      */
-    public function getAlias(string $alias) : array
+    public function getAlias(string $alias): array
     {
         return $this->getElasticsearchClient()->indices()->getAlias(['name' => $alias]);
     }
@@ -311,7 +315,15 @@ public function addFieldsMapping(array $fields, string $index, string $entityTyp
                                 'mapping' => [
                                     'type' => 'text',
                                     'index' => true,
-                                    'copy_to' => '_search'
+                                    'copy_to' => '_search',
+                                ],
+                            ],
+                        ],
+                        [
+                            'integer_mapping' => [
+                                'match_mapping_type' => 'long',
+                                'mapping' => [
+                                    'type' => 'integer',
                                 ],
                             ],
                         ],
@@ -333,7 +345,7 @@ public function addFieldsMapping(array $fields, string $index, string $entityTyp
      * @param array $query
      * @return array
      */
-    public function query(array $query) : array
+    public function query(array $query): array
     {
         return $this->getElasticsearchClient()->search($query);
     }
diff --git a/app/code/Magento/Elasticsearch7/Test/Unit/Model/Client/ElasticsearchTest.php b/app/code/Magento/Elasticsearch7/Test/Unit/Model/Client/ElasticsearchTest.php
index 593bbd7792f46..885a78816fb01 100644
--- a/app/code/Magento/Elasticsearch7/Test/Unit/Model/Client/ElasticsearchTest.php
+++ b/app/code/Magento/Elasticsearch7/Test/Unit/Model/Client/ElasticsearchTest.php
@@ -460,10 +460,18 @@ public function testAddFieldsMapping()
                                         'mapping' => [
                                             'type' => 'text',
                                             'index' => true,
-                                            'copy_to' => '_search'
+                                            'copy_to' => '_search',
                                         ],
                                     ],
-                                ]
+                                ],
+                                [
+                                    'integer_mapping' => [
+                                        'match_mapping_type' => 'long',
+                                        'mapping' => [
+                                            'type' => 'integer',
+                                        ],
+                                    ],
+                                ],
                             ],
                         ],
                     ],
@@ -531,10 +539,18 @@ public function testAddFieldsMappingFailure()
                                         'mapping' => [
                                             'type' => 'text',
                                             'index' => true,
-                                            'copy_to' => '_search'
+                                            'copy_to' => '_search',
                                         ],
                                     ],
-                                ]
+                                ],
+                                [
+                                    'integer_mapping' => [
+                                        'match_mapping_type' => 'long',
+                                        'mapping' => [
+                                            'type' => 'integer',
+                                        ],
+                                    ],
+                                ],
                             ],
                         ],
                     ],
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapperTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapperTest.php
index a5c88fc7571a2..2bff6f5ce82f6 100644
--- a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapperTest.php
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapperTest.php
@@ -54,7 +54,7 @@ protected function setUp(): void
         $this->model = $this->objectManager->create(
             ProductDataMapper::class,
             [
-                'additionalFieldsProvider' => $additionalFieldsProvider
+                'additionalFieldsProvider' => $additionalFieldsProvider,
             ]
         );
         $this->eavConfig = $this->objectManager->get(Config::class);
@@ -83,24 +83,24 @@ public function testMapSelectAttributeWithDifferentStoreLabels(): void
         $defaultStoreMap = [
             $productId => [
                 'store_id' => $defaultStore->getId(),
-                'select_attribute' => $attributeValue,
+                'select_attribute' => (int)$attributeValue,
                 'select_attribute_value' => 'Table_default',
-            ]
+            ],
         ];
         $secondStoreMap = [
             $productId => [
                 'store_id' => $secondStore->getId(),
-                'select_attribute' => $attributeValue,
+                'select_attribute' => (int)$attributeValue,
                 'select_attribute_value' => 'Table_fixture_second_store',
-            ]
+            ],
         ];
         $data = [
             $productId => [
-                $attributeId => $attributeValue
-            ]
+                $attributeId => $attributeValue,
+            ],
         ];
-        $this->assertEquals($defaultStoreMap, $this->model->map($data, $defaultStore->getId(), []));
-        $this->assertEquals($secondStoreMap, $this->model->map($data, $secondStore->getId(), []));
+        $this->assertSame($defaultStoreMap, $this->model->map($data, $defaultStore->getId(), []));
+        $this->assertSame($secondStoreMap, $this->model->map($data, $secondStore->getId(), []));
     }
 
     /**

From 4793b6ece1caa04e080de877494452f4a400daa0 Mon Sep 17 00:00:00 2001
From: Konstantin Dubovik <konstantin.dubovik@guidance.com>
Date: Fri, 19 Jun 2020 13:10:38 +0300
Subject: [PATCH 0525/1718] Fix shipping address id getter misspelling

---
 .../ResourceModel/Order/Handler/Address.php   |  2 +-
 .../Order/Handler/AddressTest.php             | 60 +++++++++++++++++++
 2 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/Address.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/Address.php
index 0fec004a25fae..c334f6e7a9576 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/Address.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/Address.php
@@ -69,7 +69,7 @@ public function process(Order $order)
                 $attributesForSave[] = 'billing_address_id';
             }
             $shippingAddress = $order->getShippingAddress();
-            if ($shippingAddress && $order->getShippigAddressId() != $shippingAddress->getId()) {
+            if ($shippingAddress && $order->getShippingAddressId() != $shippingAddress->getId()) {
                 $order->setShippingAddressId($shippingAddress->getId());
                 $attributesForSave[] = 'shipping_address_id';
             }
diff --git a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/AddressTest.php b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/AddressTest.php
index 5267686a447cc..0978dda09f7a7 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/AddressTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/AddressTest.php
@@ -133,6 +133,66 @@ public function testProcessShippingAddress()
         $this->assertEquals($this->address, $this->address->process($this->orderMock));
     }
 
+    /**
+     * Test processing of the shipping address when shipping address id was not changed.
+     * setShippingAddressId and saveAttribute methods must not be executed.
+     */
+    public function testProcessShippingAddressNotChanged()
+    {
+        $this->orderMock->expects($this->exactly(2))
+            ->method('getAddresses')
+            ->willReturn([$this->addressMock]);
+        $this->addressMock->expects($this->once())
+            ->method('save')->willReturnSelf();
+        $this->orderMock->expects($this->once())
+            ->method('getBillingAddress')
+            ->willReturn(null);
+        $this->orderMock->expects($this->once())
+            ->method('getShippingAddress')
+            ->willReturn($this->addressMock);
+        $this->addressMock->expects($this->once())
+            ->method('getId')->willReturn(1);
+        $this->orderMock->expects($this->once())
+            ->method('getShippingAddressId')
+            ->willReturn(1);
+        $this->orderMock->expects($this->never())
+            ->method('setShippingAddressId')->willReturnSelf();
+        $this->attributeMock->expects($this->never())
+            ->method('saveAttribute')
+            ->with($this->orderMock, ['shipping_address_id'])->willReturnSelf();
+        $this->assertEquals($this->address, $this->address->process($this->orderMock));
+    }
+
+    /**
+     * Test processing of the billing address when billing address id was not changed.
+     * setBillingAddressId and saveAttribute methods must not be executed.
+     */
+    public function testProcessBillingAddressNotChanged()
+    {
+        $this->orderMock->expects($this->exactly(2))
+            ->method('getAddresses')
+            ->willReturn([$this->addressMock]);
+        $this->addressMock->expects($this->once())
+            ->method('save')->willReturnSelf();
+        $this->orderMock->expects($this->once())
+            ->method('getBillingAddress')
+            ->willReturn($this->addressMock);
+        $this->orderMock->expects($this->once())
+            ->method('getShippingAddress')
+            ->willReturn(null);
+        $this->addressMock->expects($this->once())
+            ->method('getId')->willReturn(1);
+        $this->orderMock->expects($this->once())
+            ->method('getBillingAddressId')
+            ->willReturn(1);
+        $this->orderMock->expects($this->never())
+            ->method('setBillingAddressId')->willReturnSelf();
+        $this->attributeMock->expects($this->never())
+            ->method('saveAttribute')
+            ->with($this->orderMock, ['billing_address_id'])->willReturnSelf();
+        $this->assertEquals($this->address, $this->address->process($this->orderMock));
+    }
+
     /**
      * Test method removeEmptyAddresses
      */

From fcb60426aa34cd92b88cbd2e994e52dc1adba7b3 Mon Sep 17 00:00:00 2001
From: Dmitry Tsymbal <d.tsymbal@atwix.com>
Date: Fri, 19 Jun 2020 14:45:46 +0300
Subject: [PATCH 0526/1718] Sharing Wishlist with more than allowed Text Length
 Limit

---
 ...eThanMaximumAllowedTextLengthLimitTest.xml | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontShareWishlistWithMoreThanMaximumAllowedTextLengthLimitTest.xml

diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontShareWishlistWithMoreThanMaximumAllowedTextLengthLimitTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontShareWishlistWithMoreThanMaximumAllowedTextLengthLimitTest.xml
new file mode 100644
index 0000000000000..807906301466a
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontShareWishlistWithMoreThanMaximumAllowedTextLengthLimitTest.xml
@@ -0,0 +1,57 @@
+<?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="StorefrontShareWishlistWithMoreThanMaximumAllowedTextLengthLimitTest">
+        <annotations>
+            <features value="Wishlist"/>
+            <stories value="Sharing wishlist with more than Maximum Allowed Text Length Limit"/>
+            <title value="Sharing wishlist with more than Maximum Allowed Text Length Limit"/>
+            <description value="Customer should not have a possibility share wishlist with more than maximum allowed Email Text Length Limit"/>
+            <group value="wishlist"/>
+            <group value="configuration"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set wishlist/email/text_limit 10" stepKey="changeTextLengthLimit"/>
+            <magentoCLI command="cache:clean config" stepKey="cleanCache"/>
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+        </before>
+        <after>
+            <magentoCLI command="config:set wishlist/email/text_limit 255" stepKey="returnDefaultValue"/>
+            <magentoCLI command="cache:clean config" stepKey="cacheClean"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+        </after>
+
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
+            <argument name="Customer" value="$createCustomer$"/>
+        </actionGroup>
+        <actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="openProductPage">
+            <argument name="productUrlKey" value="$$createProduct.custom_attributes[url_key]$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCustomerAddProductToWishlistActionGroup" stepKey="addToWishlistProduct">
+            <argument name="productVar" value="$createProduct$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontShareCustomerWishlistActionGroup" stepKey="shareWishList">
+            <argument name="email" value="{{Wishlist.shareInfo_emails}}"/>
+            <argument name="message" value="{{Wishlist.shareInfo_message}}"/>
+        </actionGroup>
+        <actionGroup ref="AssertMessageCustomerChangeAccountInfoActionGroup" stepKey="assertMessage">
+            <argument name="message" value="Message length must not exceed 10 symbols"/>
+            <argument name="messageType" value="error"/>
+        </actionGroup>
+    </test>
+</tests>

From 5f1d4e01b70faf4453313f969d5c54e4a900a070 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <viktor.sevch@transoftgroup.com>
Date: Fri, 19 Jun 2020 15:20:10 +0300
Subject: [PATCH 0527/1718] MC-35316: Pagination products not work in admin
 create order page

---
 .../Backend/view/adminhtml/templates/widget/grid.phtml      | 6 ++++--
 .../view/adminhtml/templates/widget/grid/extended.phtml     | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
index f4ef4db022a8e..667622fb2254b 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
@@ -101,7 +101,8 @@ $numColumns = $block->getColumns() !== null ? count($block->getColumns()): 0;
                                     'onclick',
                                     /* @noEscape */ $block->getJsObjectName() . '.setPage(\'' .
                                         /* @noEscape */ ($_curPage - 1) . '\');event.preventDefault();',
-                                    'button.action-previous'
+                                    'div#' . $block->escapeJs($block->getId()) .
+                                    ' .admin__data-grid-pager button.action-previous:not(.disabled)'
                                 ) ?>
                             <?php else: ?>
                                 <button type="button" class="action-previous disabled">
@@ -137,7 +138,8 @@ $numColumns = $block->getColumns() !== null ? count($block->getColumns()): 0;
                                     'onclick',
                                     /* @noEscape */ $block->getJsObjectName() . '.setPage(\'' .
                                     /* @noEscape */ ($_curPage + 1) . '\');event.preventDefault();',
-                                    'button.action-next'
+                                    'div#' . $block->escapeJs($block->getId()) .
+                                    ' .admin__data-grid-pager button.action-next:not(.disabled)'
                                 ) ?>
                             <?php else: ?>
                                 <button type="button" class="action-next disabled">
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
index 9cf4e18b8af1f..d4aa14250837f 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
@@ -116,7 +116,8 @@ $numColumns = count($block->getColumns());
                                 'onclick',
                                 /* @noEscape */ $block->getJsObjectName() . '.setPage(\'' .
                                 /* @noEscape */ ($_curPage - 1) . '\');event.preventDefault();',
-                                '.admin__data-grid-pager button.action-previous'
+                                'div#' . $block->escapeJs($block->getId()) .
+                                ' .admin__data-grid-pager button.action-previous:not(.disabled)'
                             ) ?>
                         <?php else: ?>
                             <button type="button" class="action-previous disabled">
@@ -150,7 +151,8 @@ $numColumns = count($block->getColumns());
                                 'onclick',
                                 /* @noEscape */ $block->getJsObjectName() . '.setPage(\'' .
                                 /* @noEscape */ ($_curPage + 1) . '\');event.preventDefault();',
-                                '.admin__data-grid-pager button.action-next'
+                                'div#' . $block->escapeJs($block->getId()) .
+                                ' .admin__data-grid-pager button.action-next:not(.disabled)'
                             ) ?>
                         <?php else: ?>
                             <button type="button" class="action-next disabled">

From c31e32deb3c678296b7b18a6d7cc6cd7b2a09f86 Mon Sep 17 00:00:00 2001
From: DianaRusin <rusind95@gmail.com>
Date: Fri, 19 Jun 2020 17:21:48 +0300
Subject: [PATCH 0528/1718] MC-35322: [MFTF]
 CreateOrderFromEditCustomerPageTest unstable on Jenkins

---
 .../ActionGroup/AddConfigurableProductToOrderActionGroup.xml    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AddConfigurableProductToOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AddConfigurableProductToOrderActionGroup.xml
index dee2af6cd4053..48443512ee4c8 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AddConfigurableProductToOrderActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AddConfigurableProductToOrderActionGroup.xml
@@ -18,6 +18,8 @@
             <argument name="option"/>
         </arguments>
 
+        <scrollToTopOfPage stepKey="scrollToTopOfThePage"/>
+        <waitForElementVisible selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="waitForAddProductsButton"/>
         <click selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="clickAddProducts"/>
         <fillField selector="{{AdminOrderFormItemsSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillSkuFilterConfigurable"/>
         <click selector="{{AdminOrderFormItemsSection.search}}" stepKey="clickSearchConfigurable"/>

From 2dfa2218604b370840935e65e982eac02f8afa68 Mon Sep 17 00:00:00 2001
From: Savvas Radevic <sradevic@gmail.com>
Date: Fri, 19 Jun 2020 18:19:47 +0200
Subject: [PATCH 0529/1718]  #28802: Fix typo retires => retries

#28802: Fix typo retires => retries
---
 setup/src/Magento/Setup/Model/ConfigOptionsList/Session.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/Session.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/Session.php
index e864a81ffcc0e..4a3a02b37a6ab 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsList/Session.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/Session.php
@@ -40,7 +40,7 @@ class Session implements ConfigOptionsListInterface
     const INPUT_KEY_SESSION_REDIS_SENTINEL_SERVERS = 'session-save-redis-sentinel-servers';
     const INPUT_KEY_SESSION_REDIS_SENTINEL_MASTER = 'session-save-redis-sentinel-master';
     const INPUT_KEY_SESSION_REDIS_SENTINEL_VERIFY_MASTER = 'session-save-redis-sentinel-verify-master';
-    const INPUT_KEY_SESSION_REDIS_SENTINEL_CONNECT_RETRIES = 'session-save-redis-sentinel-connect-retires';
+    const INPUT_KEY_SESSION_REDIS_SENTINEL_CONNECT_RETRIES = 'session-save-redis-sentinel-connect-retries';
 
     const CONFIG_PATH_SESSION_REDIS = 'session/redis';
     const CONFIG_PATH_SESSION_REDIS_HOST = 'session/redis/host';

From c1eeed2407b425cae955d3c06ab1efaf07a8e12b Mon Sep 17 00:00:00 2001
From: Zach Nanninga <zach@mediotype.com>
Date: Fri, 19 Jun 2020 11:24:31 -0500
Subject: [PATCH 0530/1718] ISSUE-28656 - Prevent inline translation markup
 from being added to translated phrases for areas other than frontend and
 adminhtml.

---
 .../Magento/Framework/Translate/Inline.php    | 36 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Translate/Inline.php b/lib/internal/Magento/Framework/Translate/Inline.php
index c04c240e73927..4e9dcc0f8df7a 100644
--- a/lib/internal/Magento/Framework/Translate/Inline.php
+++ b/lib/internal/Magento/Framework/Translate/Inline.php
@@ -69,6 +69,19 @@ class Inline implements \Magento\Framework\Translate\InlineInterface
      */
     protected $state;
 
+    /**
+     * @var array
+     */
+    private $allowedAreas = [
+        \Magento\Framework\App\Area::AREA_FRONTEND,
+        \Magento\Framework\App\Area::AREA_ADMINHTML
+    ];
+
+    /**
+     * @var \Magento\Framework\App\State
+     */
+    private $appState;
+
     /**
      * Initialize inline translation model
      *
@@ -78,6 +91,7 @@ class Inline implements \Magento\Framework\Translate\InlineInterface
      * @param Inline\ConfigInterface $config
      * @param Inline\ParserInterface $parser
      * @param Inline\StateInterface $state
+     * @param \Magento\Framework\App\State $appState
      * @param string $templateFileName
      * @param string $translatorRoute
      * @param null $scope
@@ -89,6 +103,7 @@ public function __construct(
         \Magento\Framework\Translate\Inline\ConfigInterface $config,
         \Magento\Framework\Translate\Inline\ParserInterface $parser,
         \Magento\Framework\Translate\Inline\StateInterface $state,
+        \Magento\Framework\App\State $appState,
         $templateFileName = '',
         $translatorRoute = '',
         $scope = null
@@ -99,6 +114,7 @@ public function __construct(
         $this->config = $config;
         $this->parser = $parser;
         $this->state = $state;
+        $this->appState = $appState;
         $this->templateFileName = $templateFileName;
         $this->translatorRoute = $translatorRoute;
         $this->scope = $scope;
@@ -115,7 +131,8 @@ public function isAllowed()
             if (!$this->scope instanceof \Magento\Framework\App\ScopeInterface) {
                 $scope = $this->scopeResolver->getScope($this->scope);
             }
-            $this->isAllowed = $this->config->isActive($scope)
+            $this->isAllowed = $this->isAreaAllowed()
+                && $this->config->isActive($scope)
                 && $this->config->isDevAllowed($scope);
         }
         return $this->state->isEnabled() && $this->isAllowed;
@@ -249,4 +266,21 @@ protected function stripInlineTranslations(&$body)
         }
         return $this;
     }
+
+    /**
+     * Indicates whether the current area is valid for inline translation
+     *
+     * @return bool
+     */
+    private function isAreaAllowed()
+    {
+        try {
+            return in_array(
+                $this->appState->getAreaCode(),
+                $this->allowedAreas
+            );
+        } catch (\Magento\Framework\Exception\LocalizedException $e) {
+            return false;
+        }
+    }
 }

From 11c5a67c45e6ece91e477dd490feb641388decc4 Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@magento.com>
Date: Fri, 19 Jun 2020 15:27:57 -0500
Subject: [PATCH 0531/1718] MC-31618: Move static config to files - PLUGIN_LIST

- Move loadScopedVirtualTypes to ConfigWriter;
---
 .../Framework/Interception/ConfigWriter.php   | 53 +++++++++++------
 .../Interception/PluginList/PluginList.php    | 58 +++++--------------
 2 files changed, 52 insertions(+), 59 deletions(-)

diff --git a/lib/internal/Magento/Framework/Interception/ConfigWriter.php b/lib/internal/Magento/Framework/Interception/ConfigWriter.php
index 08cf613650baa..80fd9018b3624 100644
--- a/lib/internal/Magento/Framework/Interception/ConfigWriter.php
+++ b/lib/internal/Magento/Framework/Interception/ConfigWriter.php
@@ -154,7 +154,21 @@ public function write($scopes)
                     $this->scopePriorityScheme[] = $scope;
                 }
                 $cacheId = implode('|', $this->scopePriorityScheme) . "|" . $this->cacheId;
-                foreach ($this->loadScopedVirtualTypes() as $class) {
+                [
+                    $virtualTypes,
+                    $this->scopePriorityScheme,
+                    $this->loadedScopes,
+                    $this->pluginData,
+                    $this->inherited,
+                    $this->processed
+                ] = $this->loadScopedVirtualTypes(
+                    $this->scopePriorityScheme,
+                    $this->loadedScopes,
+                    $this->pluginData,
+                    $this->inherited,
+                    $this->processed
+                );
+                foreach ($virtualTypes as $class) {
                     $this->inheritPlugins($class);
                 }
                 foreach ($this->pluginData as $className => $value) {
@@ -183,32 +197,37 @@ public function write($scopes)
     /**
      * Load virtual types for current scope
      *
+     * @param array $scopePriorityScheme
+     * @param array $loadedScopes
+     * @param array|null $pluginData
+     * @param array $inherited
+     * @param array $processed
      * @return array
      */
-    private function loadScopedVirtualTypes()
+    public function loadScopedVirtualTypes($scopePriorityScheme, $loadedScopes, $pluginData, $inherited, $processed)
     {
         $virtualTypes = [];
-        foreach ($this->scopePriorityScheme as $scopeCode) {
-            if (!isset($this->loadedScopes[$scopeCode])) {
+        foreach ($scopePriorityScheme as $scopeCode) {
+            if (!isset($loadedScopes[$scopeCode])) {
                 $data = $this->reader->read($scopeCode) ?: [];
                 unset($data['preferences']);
                 if (count($data) > 0) {
-                    $this->inherited = [];
-                    $this->processed = [];
-                    $this->merge($data);
+                    $inherited = [];
+                    $processed = [];
+                    $pluginData = $this->merge($data, $pluginData);
                     foreach ($data as $class => $config) {
                         if (isset($config['type'])) {
                             $virtualTypes[] = $class;
                         }
                     }
                 }
-                $this->loadedScopes[$scopeCode] = true;
+                $loadedScopes[$scopeCode] = true;
             }
             if ($this->isCurrentScope($scopeCode)) {
                 break;
             }
         }
-        return $virtualTypes;
+        return [$virtualTypes, $scopePriorityScheme, $loadedScopes, $pluginData, $inherited, $processed];
     }
 
     /**
@@ -341,23 +360,23 @@ public function filterPlugins(array &$plugins)
      * Merge configuration
      *
      * @param array $config
-     * @return void
+     * @param array|null $pluginData
+     * @return array
      */
-    private function merge(array $config)
+    public function merge(array $config, $pluginData)
     {
         foreach ($config as $type => $typeConfig) {
             if (isset($typeConfig['plugins'])) {
                 $type = ltrim($type, '\\');
-                if (isset($this->pluginData[$type])) {
-                    $this->pluginData[$type] = array_replace_recursive(
-                        $this->pluginData[$type],
-                        $typeConfig['plugins']
-                    );
+                if (isset($pluginData[$type])) {
+                    $pluginData[$type] = array_replace_recursive($pluginData[$type], $typeConfig['plugins']);
                 } else {
-                    $this->pluginData[$type] = $typeConfig['plugins'];
+                    $pluginData[$type] = $typeConfig['plugins'];
                 }
             }
         }
+
+        return $pluginData;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
index 64e55b78f1fc5..eff3feff9cef1 100644
--- a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
+++ b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
@@ -298,7 +298,21 @@ protected function _loadScopedData()
                         $this->_loadedScopes[$scopeCode] = true;
                     }
                 } else {
-                    foreach ($this->_loadScopedVirtualTypes() as $class) {
+                    [
+                        $virtualTypes,
+                        $this->_scopePriorityScheme,
+                        $this->_loadedScopes,
+                        $this->_data,
+                        $this->_inherited,
+                        $this->_processed
+                    ] = $this->configWriter->loadScopedVirtualTypes(
+                        $this->_scopePriorityScheme,
+                        $this->_loadedScopes,
+                        $this->_data,
+                        $this->_inherited,
+                        $this->_processed
+                    );
+                    foreach ($virtualTypes as $class) {
                         $this->_inheritPlugins($class);
                     }
                     foreach ($this->getClassDefinitions() as $class) {
@@ -314,37 +328,6 @@ protected function _loadScopedData()
         }
     }
 
-    /**
-     * Load virtual types for current scope
-     *
-     * @return array
-     */
-    private function _loadScopedVirtualTypes()
-    {
-        $virtualTypes = [];
-        foreach ($this->_scopePriorityScheme as $scopeCode) {
-            if (!isset($this->_loadedScopes[$scopeCode])) {
-                $data = $this->_reader->read($scopeCode) ?: [];
-                unset($data['preferences']);
-                if (count($data) > 0) {
-                    $this->_inherited = [];
-                    $this->_processed = [];
-                    $this->merge($data);
-                    foreach ($data as $class => $config) {
-                        if (isset($config['type'])) {
-                            $virtualTypes[] = $class;
-                        }
-                    }
-                }
-                $this->_loadedScopes[$scopeCode] = true;
-            }
-            if ($this->isCurrentScope($scopeCode)) {
-                break;
-            }
-        }
-        return $virtualTypes;
-    }
-
     /**
      * Whether scope code is current scope code
      *
@@ -374,15 +357,6 @@ protected function getClassDefinitions()
      */
     public function merge(array $config)
     {
-        foreach ($config as $type => $typeConfig) {
-            if (isset($typeConfig['plugins'])) {
-                $type = ltrim($type, '\\');
-                if (isset($this->_data[$type])) {
-                    $this->_data[$type] = array_replace_recursive($this->_data[$type], $typeConfig['plugins']);
-                } else {
-                    $this->_data[$type] = $typeConfig['plugins'];
-                }
-            }
-        }
+        $this->_data = $this->configWriter->merge($config, $this->_data);
     }
 }

From 7db4ca169ebcfb70e4f0c2f996ac4ac6efd23839 Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@magento.com>
Date: Sat, 20 Jun 2020 00:46:26 -0500
Subject: [PATCH 0532/1718] MC-31618: Move static config to files - PLUGIN_LIST

- Move inheritPlugins to ConfigWriter;
---
 .../Framework/Interception/ConfigWriter.php   | 36 +++++-----
 .../Interception/PluginList/PluginList.php    | 69 +------------------
 2 files changed, 20 insertions(+), 85 deletions(-)

diff --git a/lib/internal/Magento/Framework/Interception/ConfigWriter.php b/lib/internal/Magento/Framework/Interception/ConfigWriter.php
index 80fd9018b3624..6a3fbc95fcb78 100644
--- a/lib/internal/Magento/Framework/Interception/ConfigWriter.php
+++ b/lib/internal/Magento/Framework/Interception/ConfigWriter.php
@@ -169,13 +169,13 @@ public function write($scopes)
                     $this->processed
                 );
                 foreach ($virtualTypes as $class) {
-                    $this->inheritPlugins($class);
+                    $this->inheritPlugins($class, $this->pluginData, $this->inherited, $this->processed);
                 }
                 foreach ($this->pluginData as $className => $value) {
-                    $this->inheritPlugins($className);
+                    $this->inheritPlugins($className, $this->pluginData, $this->inherited, $this->processed);
                 }
                 foreach ($this->getClassDefinitions() as $class) {
-                    $this->inheritPlugins($class);
+                    $this->inheritPlugins($class, $this->pluginData, $this->inherited, $this->processed);
                 }
                 $this->configWriter->write(
                     $cacheId,
@@ -255,25 +255,27 @@ public function isCurrentScope($scopeCode)
      * Collect parent types configuration for requested type
      *
      * @param string $type
+     * @param array $pluginData
+     * @param array $inherited
+     * @param array $processed
      * @return array
-     * @throws \InvalidArgumentException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    private function inheritPlugins($type)
+    public function inheritPlugins($type, &$pluginData, &$inherited, &$processed)
     {
         $type = ltrim($type, '\\');
-        if (!isset($this->inherited[$type])) {
+        if (!isset($inherited[$type])) {
             $realType = $this->omConfig->getOriginalInstanceType($type);
 
             if ($realType !== $type) {
-                $plugins = $this->inheritPlugins($realType);
+                $plugins = $this->inheritPlugins($realType, $pluginData, $inherited, $processed);
             } elseif ($this->relations->has($type)) {
                 $relations = $this->relations->getParents($type);
                 $plugins = [];
                 foreach ($relations as $relation) {
                     if ($relation) {
-                        $relationPlugins = $this->inheritPlugins($relation);
+                        $relationPlugins = $this->inheritPlugins($relation, $pluginData, $inherited, $processed);
                         if ($relationPlugins) {
                             $plugins = array_replace_recursive($plugins, $relationPlugins);
                         }
@@ -282,19 +284,19 @@ private function inheritPlugins($type)
             } else {
                 $plugins = [];
             }
-            if (isset($this->pluginData[$type])) {
+            if (isset($pluginData[$type])) {
                 if (!$plugins) {
-                    $plugins = $this->pluginData[$type];
+                    $plugins = $pluginData[$type];
                 } else {
-                    $plugins = array_replace_recursive($plugins, $this->pluginData[$type]);
+                    $plugins = array_replace_recursive($plugins, $pluginData[$type]);
                 }
             }
-            $this->inherited[$type] = null;
+            $inherited[$type] = null;
             if (is_array($plugins) && count($plugins)) {
                 $this->filterPlugins($plugins);
                 uasort($plugins, [$this, 'sort']);
                 $this->trimInstanceStartingBackslash($plugins);
-                $this->inherited[$type] = $plugins;
+                $inherited[$type] = $plugins;
                 $lastPerMethod = [];
                 foreach ($plugins as $key => $plugin) {
                     // skip disabled plugins
@@ -310,21 +312,21 @@ private function inheritPlugins($type)
                         $current = $lastPerMethod[$pluginMethod] ?? '__self';
                         $currentKey = $type . '_' . $pluginMethod . '_' . $current;
                         if ($methodTypes & DefinitionInterface::LISTENER_AROUND) {
-                            $this->processed[$currentKey][DefinitionInterface::LISTENER_AROUND] = $key;
+                            $processed[$currentKey][DefinitionInterface::LISTENER_AROUND] = $key;
                             $lastPerMethod[$pluginMethod] = $key;
                         }
                         if ($methodTypes & DefinitionInterface::LISTENER_BEFORE) {
-                            $this->processed[$currentKey][DefinitionInterface::LISTENER_BEFORE][] = $key;
+                            $processed[$currentKey][DefinitionInterface::LISTENER_BEFORE][] = $key;
                         }
                         if ($methodTypes & DefinitionInterface::LISTENER_AFTER) {
-                            $this->processed[$currentKey][DefinitionInterface::LISTENER_AFTER][] = $key;
+                            $processed[$currentKey][DefinitionInterface::LISTENER_AFTER][] = $key;
                         }
                     }
                 }
             }
             return $plugins;
         }
-        return $this->inherited[$type];
+        return $inherited[$type];
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
index eff3feff9cef1..096e58ab3a273 100644
--- a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
+++ b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
@@ -22,8 +22,6 @@
 
 /**
  * Plugin config, provides list of plugins for a type
- *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class PluginList extends Scoped implements InterceptionPluginList
 {
@@ -144,75 +142,10 @@ public function __construct(
      *
      * @param string $type
      * @return array
-     * @throws \InvalidArgumentException
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     protected function _inheritPlugins($type)
     {
-        $type = ltrim($type, '\\');
-        if (!isset($this->_inherited[$type])) {
-            $realType = $this->_omConfig->getOriginalInstanceType($type);
-
-            if ($realType !== $type) {
-                $plugins = $this->_inheritPlugins($realType);
-            } elseif ($this->_relations->has($type)) {
-                $relations = $this->_relations->getParents($type);
-                $plugins = [];
-                foreach ($relations as $relation) {
-                    if ($relation) {
-                        $relationPlugins = $this->_inheritPlugins($relation);
-                        if ($relationPlugins) {
-                            $plugins = array_replace_recursive($plugins, $relationPlugins);
-                        }
-                    }
-                }
-            } else {
-                $plugins = [];
-            }
-            if (isset($this->_data[$type])) {
-                if (!$plugins) {
-                    $plugins = $this->_data[$type];
-                } else {
-                    $plugins = array_replace_recursive($plugins, $this->_data[$type]);
-                }
-            }
-            $this->_inherited[$type] = null;
-            if (is_array($plugins) && count($plugins)) {
-                $this->configWriter->filterPlugins($plugins);
-                uasort($plugins, [$this, '_sort']);
-                $this->configWriter->trimInstanceStartingBackslash($plugins);
-                $this->_inherited[$type] = $plugins;
-                $lastPerMethod = [];
-                foreach ($plugins as $key => $plugin) {
-                    // skip disabled plugins
-                    if (isset($plugin['disabled']) && $plugin['disabled']) {
-                        unset($plugins[$key]);
-                        continue;
-                    }
-                    $pluginType = $this->_omConfig->getOriginalInstanceType($plugin['instance']);
-                    if (!class_exists($pluginType)) {
-                        throw new \InvalidArgumentException('Plugin class ' . $pluginType . ' doesn\'t exist');
-                    }
-                    foreach ($this->_definitions->getMethodList($pluginType) as $pluginMethod => $methodTypes) {
-                        $current = isset($lastPerMethod[$pluginMethod]) ? $lastPerMethod[$pluginMethod] : '__self';
-                        $currentKey = $type . '_' . $pluginMethod . '_' . $current;
-                        if ($methodTypes & DefinitionInterface::LISTENER_AROUND) {
-                            $this->_processed[$currentKey][DefinitionInterface::LISTENER_AROUND] = $key;
-                            $lastPerMethod[$pluginMethod] = $key;
-                        }
-                        if ($methodTypes & DefinitionInterface::LISTENER_BEFORE) {
-                            $this->_processed[$currentKey][DefinitionInterface::LISTENER_BEFORE][] = $key;
-                        }
-                        if ($methodTypes & DefinitionInterface::LISTENER_AFTER) {
-                            $this->_processed[$currentKey][DefinitionInterface::LISTENER_AFTER][] = $key;
-                        }
-                    }
-                }
-            }
-            return $plugins;
-        }
-        return $this->_inherited[$type];
+        return $this->configWriter->inheritPlugins($type, $this->_data, $this->_inherited, $this->_processed);
     }
 
     /**

From add79e6c1ee00c29a45211f018a35161f4f6cf1d Mon Sep 17 00:00:00 2001
From: Tu Nguyen <tuna@ecommage.com>
Date: Sat, 20 Jun 2020 15:06:11 +0700
Subject: [PATCH 0533/1718] fix static tests fails

update


update


fix static test
---
 .../frontend/templates/order/print/shipment.phtml  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Sales/view/frontend/templates/order/print/shipment.phtml b/app/code/Magento/Sales/view/frontend/templates/order/print/shipment.phtml
index 903b9da16575a..90b5f0f289e64 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/print/shipment.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/print/shipment.phtml
@@ -14,12 +14,14 @@
     <?php foreach ($block->getShipmentsCollection() as $shipment): ?>
         <div class="order-details-items shipments">
             <div class="order-title">
-                <strong><?= $escaper->escapeHtml(
-                            __(
-                                'Shipment #%1',
-                                $block->getObjectData($shipment, 'increment_id')
-                            )
-                        ) ?></strong>
+                <strong>
+                    <?= $escaper->escapeHtml(
+                        __(
+                            'Shipment #%1',
+                            $block->getObjectData($shipment, 'increment_id')
+                        )
+                    ) ?>
+                </strong>
             </div>
             <div class="table-wrapper order-items-shipment">
                 <table class="data table table-order-items shipment"

From 4ed80e3fdfd8280e2c13d7a86f348e21cf2fd3bd Mon Sep 17 00:00:00 2001
From: Marjan Petkovski <petkovski.marjan@gmail.com>
Date: Sun, 21 Jun 2020 10:06:51 +0200
Subject: [PATCH 0534/1718] magento/magento2#28563: Edit session 3: addressing
 static tests failures

---
 app/code/Magento/CatalogGraphQl/composer.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/CatalogGraphQl/composer.json b/app/code/Magento/CatalogGraphQl/composer.json
index de0e4908ff979..46d7454a6d7e2 100644
--- a/app/code/Magento/CatalogGraphQl/composer.json
+++ b/app/code/Magento/CatalogGraphQl/composer.json
@@ -15,7 +15,6 @@
         "magento/module-graph-ql": "*"
     },
     "suggest": {
-        "magento/module-graph-ql": "*",
         "magento/module-graph-ql-cache": "*",
         "magento/module-store-graph-ql": "*"
     },

From e798f7553d6ab21132d476ef0d7f7ab7a99475ea Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Sun, 21 Jun 2020 23:10:09 +0300
Subject: [PATCH 0535/1718] add cc data

---
 .../Observer/PayflowProSetCcData.php          | 39 +++++++++++++++++++
 .../PaypalGraphQl/etc/graphql/events.xml      |  3 ++
 2 files changed, 42 insertions(+)
 create mode 100644 app/code/Magento/PaypalGraphQl/Observer/PayflowProSetCcData.php

diff --git a/app/code/Magento/PaypalGraphQl/Observer/PayflowProSetCcData.php b/app/code/Magento/PaypalGraphQl/Observer/PayflowProSetCcData.php
new file mode 100644
index 0000000000000..9dd5969672529
--- /dev/null
+++ b/app/code/Magento/PaypalGraphQl/Observer/PayflowProSetCcData.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\PaypalGraphQl\Observer;
+
+use Magento\Framework\Event\Observer;
+use Magento\Payment\Observer\AbstractDataAssignObserver;
+use Magento\Quote\Api\Data\PaymentInterface;
+
+/**
+ * Class PayflowProSetCcData set CcData to quote payment
+ */
+class PayflowProSetCcData extends AbstractDataAssignObserver
+{
+    /**
+     * Set CcData
+     *
+     * @param Observer $observer
+     */
+    public function execute(Observer $observer)
+    {
+        $dataObject = $this->readDataArgument($observer);
+        $additionalData = $dataObject->getData(PaymentInterface::KEY_ADDITIONAL_DATA);
+
+        if (!isset($additionalData['cc_details'])) {
+            return;
+        }
+
+        $paymentModel = $this->readPaymentModelArgument($observer);
+        foreach ($additionalData['cc_details'] as $ccKey => $ccValue) {
+            $paymentModel->setData($ccKey, $ccValue);
+        }
+    }
+}
diff --git a/app/code/Magento/PaypalGraphQl/etc/graphql/events.xml b/app/code/Magento/PaypalGraphQl/etc/graphql/events.xml
index 41154e5ae06e6..0d2be95d77c92 100644
--- a/app/code/Magento/PaypalGraphQl/etc/graphql/events.xml
+++ b/app/code/Magento/PaypalGraphQl/etc/graphql/events.xml
@@ -12,4 +12,7 @@
     <event name="payment_method_assign_data_payflow_advanced">
         <observer name="payflow_advanced_data_assigner" instance="Magento\PaypalGraphQl\Observer\PayflowLinkSetAdditionalData"/>
     </event>
+    <event name="payment_method_assign_data_payflowpro">
+        <observer name="payflowpro_cc_data_assigner" instance="Magento\PaypalGraphQl\Observer\PayflowProSetCcData" />
+    </event>
 </config>

From 017da272abe3d461994c937f4c8196d50b8ef41c Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Mon, 22 Jun 2020 09:33:32 +0300
Subject: [PATCH 0536/1718] Updating schema description

---
 .../Magento/ReviewGraphQl/etc/schema.graphqls | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/code/Magento/ReviewGraphQl/etc/schema.graphqls b/app/code/Magento/ReviewGraphQl/etc/schema.graphqls
index e9b99a48bb99a..14b4fc60e8b09 100644
--- a/app/code/Magento/ReviewGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/ReviewGraphQl/etc/schema.graphqls
@@ -17,31 +17,31 @@ type ProductReviews {
 
 type ProductReview @doc(description: "Details of a product review") {
     product: ProductInterface! @doc(description: "Contains details about the reviewed product") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product")
-    summary: String! @doc(description: "The review summary (a.k.a title")
+    summary: String! @doc(description: "The summary (title) of the review")
     text: String! @doc(description: "The review text.")
-    nickname: String! @doc(description: "The customer's nickname. Defaults to customer name if logged in.")
+    nickname: String! @doc(description: "The customer's nickname. Defaults to the customer name, if logged in")
     created_at: String! @doc(description: "Date indicating when the review was created.")
     average_rating: Float! @doc(description: "The average rating for product review.") @resolver(class: "Magento\\ReviewGraphQl\\Model\\Resolver\\Product\\Review\\AverageRating")
-    ratings_breakdown: [ProductReviewRating!]! @doc(description: "An array of ratings by rating category. For example quality, price.") @resolver(class: "Magento\\ReviewGraphQl\\Model\\Resolver\\Product\\Review\\RatingBreakdown")
+    ratings_breakdown: [ProductReviewRating!]! @doc(description: "An array of ratings by rating category, such as quality, price, and value") @resolver(class: "Magento\\ReviewGraphQl\\Model\\Resolver\\Product\\Review\\RatingBreakdown")
 }
 
 type ProductReviewRating {
-    name: String! @doc(description: "The review rating name for example quality, price.")
-    value: String! @doc(description: "The rating value given by customer. Possible values by default: 1 to 5.")
+    name: String! @doc(description: "The label assigned to an aspect of a product that is being rated, such as quality or price")
+    value: String! @doc(description: "The rating value given by customer. By default, possible values range from 1 to 5.")
 }
 
 type Query {
-    productReviewRatingsMetadata: ProductReviewRatingsMetadata! @doc(description: "Metadata required by clients to render ratings & reviews section.") @resolver(class: "Magento\\ReviewGraphQl\\Model\\Resolver\\ProductReviewRatingsMetadata")
+    productReviewRatingsMetadata: ProductReviewRatingsMetadata! @doc(description: "Retrieves metadata required by clients to render the Reviews section.") @resolver(class: "Magento\\ReviewGraphQl\\Model\\Resolver\\ProductReviewRatingsMetadata")
 }
 
 type ProductReviewRatingsMetadata {
-    items: [ProductReviewRatingMetadata!]! @doc(description: "List of product reviews sorted based on position")
+    items: [ProductReviewRatingMetadata!]! @doc(description: "List of product reviews sorted by position")
 }
 
 type ProductReviewRatingMetadata {
-    id: String! @doc(description: "Base 64 encoded rating id.")
-    name: String! @doc(description: "The review rating name for example quality, price")
-    values: [ProductReviewRatingValueMetadata!]! @doc(description: "List of product review ratings sorted based on position.") @resolver(class: "Magento\\ReviewGraphQl\\Model\\Resolver\\ProductReviewRatingValueMetadata")
+    id: String! @doc(description: "Base64 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 {
@@ -53,26 +53,26 @@ type Customer {
     reviews(
         pageSize: Int = 20 @doc(description: "Specifies the maximum number of results to return at once."),
         currentPage: Int = 1 @doc(description: "Specifies which page of results to return."),
-    ): ProductReviews! @resolver(class: "Magento\\ReviewGraphQl\\Model\\Resolver\\Customer\\Reviews")
+    ): ProductReviews! @doc(description: "Contains the customer's product reviews") @resolver(class: "Magento\\ReviewGraphQl\\Model\\Resolver\\Customer\\Reviews")
 }
 
 type Mutation {
-    createProductReview(input: CreateProductReviewInput!): CreateProductReviewOutput! @resolver(class: "Magento\\ReviewGraphQl\\Model\\Resolver\\CreateProductReview")
+    createProductReview(input: CreateProductReviewInput!): CreateProductReviewOutput! @doc(description: "Creates a product review for the specified SKU") @resolver(class: "Magento\\ReviewGraphQl\\Model\\Resolver\\CreateProductReview")
 }
 
 type CreateProductReviewOutput {
-    review: ProductReview!
+    review: ProductReview! @doc(description: "Contains the completed product review")
 }
 
 input CreateProductReviewInput {
-    sku: String! @doc(description: "The SKU of the product that the review is assigned")
-    nickname: String! @doc(description: "The customer's nickname. Defaults to customer name if logged in.")
-    summary: String! @doc(description: "The review summary (a.k.a title")
+    sku: String! @doc(description: "The SKU of the reviewed product")
+    nickname: String! @doc(description: "The customer's nickname. Defaults to the customer name, if logged in")
+    summary: String! @doc(description: "The summary (title) of the review")
     text: String! @doc(description: "The review text.")
     ratings: [ProductReviewRatingInput!]! @doc(description: "Ratings details by category. e.g price: 5, quality: 4 etc")
 }
 
 input ProductReviewRatingInput {
-    id: String! @doc(description: "Base 64 encoded rating id.")
+    id: String! @doc(description: "Base64 encoded rating ID.")
     value_id: String! @doc(description: "Base 64 encoded rating value id.")
 }

From efb73f7dfc146e1eff6f226f0181c358b69b6ede Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Mon, 22 Jun 2020 10:37:38 +0300
Subject: [PATCH 0537/1718] fix enabled checkbox

---
 .../Block/Adminhtml/Category/Tab/Attributes.php     |  5 +++--
 .../Block/Adminhtml/Category/Tab/AttributesTest.php | 13 +++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/CatalogUrlRewrite/Plugin/Catalog/Block/Adminhtml/Category/Tab/Attributes.php b/app/code/Magento/CatalogUrlRewrite/Plugin/Catalog/Block/Adminhtml/Category/Tab/Attributes.php
index d89013bcfd4df..8816b2816b797 100644
--- a/app/code/Magento/CatalogUrlRewrite/Plugin/Catalog/Block/Adminhtml/Category/Tab/Attributes.php
+++ b/app/code/Magento/CatalogUrlRewrite/Plugin/Catalog/Block/Adminhtml/Category/Tab/Attributes.php
@@ -66,9 +66,10 @@ public function afterGetAttributesMeta(DataProvider $subject, $result)
     private function getUrlRewriteMeta(CategoryInterface $category): array
     {
         return [
-            'value' => $category->getUrlKey(),
+            'value' => $this->isSaveRewriteHistory($category->getStoreId()) ? $category->getUrlKey() : '',
             'valueMap' => [
-                'true' => $this->isSaveRewriteHistory($category->getStoreId()) ? $category->getUrlKey() : false
+                'false' => '',
+                'true' => $category->getUrlKey()
             ],
             'disabled' => true,
         ];
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Plugin/Catalog/Block/Adminhtml/Category/Tab/AttributesTest.php b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Plugin/Catalog/Block/Adminhtml/Category/Tab/AttributesTest.php
index b1e013ddd7ed3..8134ecef3db6d 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Unit/Plugin/Catalog/Block/Adminhtml/Category/Tab/AttributesTest.php
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Unit/Plugin/Catalog/Block/Adminhtml/Category/Tab/AttributesTest.php
@@ -67,10 +67,11 @@ protected function setUp(): void
      * @dataProvider attributesMetaDataProvider
      *
      * @param bool $configEnabled
-     * @param bool|string $expected
+     * @param string $expectedValue
+     * @param string $expectedValueMap
      * @return void
      */
-    public function testGetAttributesMeta(bool $configEnabled, $expected): void
+    public function testGetAttributesMeta(bool $configEnabled, string $expectedValue, string $expectedValueMap): void
     {
         $this->categoryMock->expects($this->once())
             ->method('getId')
@@ -93,11 +94,11 @@ public function testGetAttributesMeta(bool $configEnabled, $expected): void
         $this->assertArrayHasKey('url_key_create_redirect', $result);
 
         $this->assertArrayHasKey('value', $result['url_key_create_redirect']);
-        $this->assertEquals(self::STUB_URL_KEY, $result['url_key_create_redirect']['value']);
+        $this->assertEquals($expectedValue, $result['url_key_create_redirect']['value']);
 
         $this->assertArrayHasKey('valueMap', $result['url_key_create_redirect']);
         $this->assertArrayHasKey('true', $result['url_key_create_redirect']['valueMap']);
-        $this->assertEquals($expected, $result['url_key_create_redirect']['valueMap']['true']);
+        $this->assertEquals($expectedValueMap, $result['url_key_create_redirect']['valueMap']['true']);
 
         $this->assertArrayHasKey('disabled', $result['url_key_create_redirect']);
         $this->assertTrue($result['url_key_create_redirect']['disabled']);
@@ -111,8 +112,8 @@ public function testGetAttributesMeta(bool $configEnabled, $expected): void
     public function attributesMetaDataProvider(): array
     {
         return [
-            'save rewrite history config enabled' => [true, self::STUB_URL_KEY],
-            'save rewrite history config disabled' => [false, false]
+            'save rewrite history config enabled' => [true, self::STUB_URL_KEY, self::STUB_URL_KEY],
+            'save rewrite history config disabled' => [false, '', 'url_key_777']
         ];
     }
 

From a209c510716a054efd8eab17374e85cb84f8a2e0 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Mon, 22 Jun 2020 11:47:19 +0300
Subject: [PATCH 0538/1718] fix create customer token

---
 .../Customer/Model/CustomerRegistry.php       |  4 ++-
 .../Model/CustomerTokenServiceTest.php        | 35 ++++++++++++++-----
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Customer/Model/CustomerRegistry.php b/app/code/Magento/Customer/Model/CustomerRegistry.php
index d68904f6d1645..f2868132790cf 100644
--- a/app/code/Magento/Customer/Model/CustomerRegistry.php
+++ b/app/code/Magento/Customer/Model/CustomerRegistry.php
@@ -101,8 +101,10 @@ public function retrieve($customerId)
     public function retrieveByEmail($customerEmail, $websiteId = null)
     {
         if ($websiteId === null) {
-            $websiteId = $this->storeManager->getStore()->getWebsiteId();
+            $websiteId = $this->storeManager->getStore()->getWebsiteId()
+                ?: $this->storeManager->getDefaultStoreView()->getWebsiteId();
         }
+
         $emailKey = $this->getEmailKey($customerEmail, $websiteId);
         if (isset($this->customerRegistryByEmail[$emailKey])) {
             return $this->customerRegistryByEmail[$emailKey];
diff --git a/dev/tests/api-functional/testsuite/Magento/Integration/Model/CustomerTokenServiceTest.php b/dev/tests/api-functional/testsuite/Magento/Integration/Model/CustomerTokenServiceTest.php
index 91a044f189b4c..0e277ac942263 100644
--- a/dev/tests/api-functional/testsuite/Magento/Integration/Model/CustomerTokenServiceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Integration/Model/CustomerTokenServiceTest.php
@@ -7,7 +7,7 @@
 namespace Magento\Integration\Model;
 
 use Magento\Customer\Api\AccountManagementInterface;
-use Magento\Framework\Exception\InputException;
+use Magento\Framework\Webapi\Rest\Request;
 use Magento\Integration\Model\Oauth\Token as TokenModel;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\WebapiAbstract;
@@ -76,9 +76,15 @@ protected function setUp(): void
     }
 
     /**
+     * Create customer access token
+     *
+     * @dataProvider storesDataProvider
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     *
+     * @param string|null $store
+     * @return void
      */
-    public function testCreateCustomerAccessToken()
+    public function testCreateCustomerAccessToken(?string $store): void
     {
         $userName = 'customer@example.com';
         $password = 'password';
@@ -86,15 +92,28 @@ public function testCreateCustomerAccessToken()
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => self::RESOURCE_PATH_CUSTOMER_TOKEN,
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
+                'httpMethod' => Request::HTTP_METHOD_POST,
             ],
         ];
         $requestData = ['username' => $userName, 'password' => $password];
-        $accessToken = $this->_webApiCall($serviceInfo, $requestData);
+        $accessToken = $this->_webApiCall($serviceInfo, $requestData, null, $store);
 
         $this->assertToken($accessToken, $userName, $password);
     }
 
+    /**
+     * DataProvider for testCreateCustomerAccessToken
+     *
+     * @return array
+     */
+    public function storesDataProvider(): array
+    {
+        return [
+            'default store' => [null],
+            'all store view' => ['all'],
+        ];
+    }
+
     /**
      * @dataProvider validationDataProvider
      */
@@ -105,7 +124,7 @@ public function testCreateCustomerAccessTokenEmptyOrNullCredentials($username, $
             $serviceInfo = [
                 'rest' => [
                     'resourcePath' => self::RESOURCE_PATH_CUSTOMER_TOKEN,
-                    'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
+                    'httpMethod' => Request::HTTP_METHOD_POST,
                 ],
             ];
             $requestData = ['username' => $username, 'password' => $password];
@@ -128,7 +147,7 @@ public function testCreateCustomerAccessTokenInvalidCustomer()
             $serviceInfo = [
                 'rest' => [
                     'resourcePath' => self::RESOURCE_PATH_CUSTOMER_TOKEN,
-                    'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
+                    'httpMethod' => Request::HTTP_METHOD_POST,
                 ],
             ];
             $requestData = ['username' => $customerUserName, 'password' => $password];
@@ -195,7 +214,7 @@ public function testThrottlingMaxAttempts()
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => self::RESOURCE_PATH_CUSTOMER_TOKEN,
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
+                'httpMethod' => Request::HTTP_METHOD_POST,
             ],
         ];
         $invalidCredentials = [
@@ -238,7 +257,7 @@ public function testThrottlingAccountLockout()
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => self::RESOURCE_PATH_CUSTOMER_TOKEN,
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
+                'httpMethod' => Request::HTTP_METHOD_POST,
             ],
         ];
         $invalidCredentials = [

From 7a108aa646f8b7f2f117513ea18946d84c256dd9 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Mon, 22 Jun 2020 10:52:33 +0200
Subject: [PATCH 0539/1718] Upgrade to PHPUnit 9.2.5

---
 composer.json |   4 +-
 composer.lock | 630 ++++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 510 insertions(+), 124 deletions(-)

diff --git a/composer.json b/composer.json
index 1b260cc122865..fec1654f276f2 100644
--- a/composer.json
+++ b/composer.json
@@ -93,8 +93,8 @@
         "phpcompatibility/php-compatibility": "^9.3",
         "phpmd/phpmd": "^2.8.0",
         "phpstan/phpstan": ">=0.12.3 <=0.12.23",
-        "phpunit/phpunit": "^9",
-        "sebastian/phpcpd": "~5.0.0",
+        "phpunit/phpunit": "^9.2",
+        "sebastian/phpcpd": "@stable",
         "squizlabs/php_codesniffer": "~3.5.4"
     },
     "suggest": {
diff --git a/composer.lock b/composer.lock
index e5614cfd0ac99..834c5d9961672 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": "ae8dac1805260cc117a4e9a9b752b566",
     "packages": [
         {
             "name": "colinmollenhour/cache-backend-file",
@@ -297,6 +297,16 @@
                 "dependency",
                 "package"
             ],
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-05-06T08:28:10+00:00"
         },
         {
@@ -1321,6 +1331,12 @@
                 "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"
         },
         {
@@ -2278,6 +2294,12 @@
                 "laminas",
                 "mail"
             ],
+            "funding": [
+                {
+                    "url": "https://funding.communitybridge.org/projects/laminas-project",
+                    "type": "community_bridge"
+                }
+            ],
             "time": "2020-04-21T16:42:19+00:00"
         },
         {
@@ -3270,6 +3292,12 @@
                 "laminas",
                 "zf"
             ],
+            "funding": [
+                {
+                    "url": "https://funding.communitybridge.org/projects/laminas-project",
+                    "type": "community_bridge"
+                }
+            ],
             "time": "2020-05-20T16:45:56+00:00"
         },
         {
@@ -3509,6 +3537,16 @@
                 "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"
         },
         {
@@ -4301,6 +4339,16 @@
                 "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"
         },
         {
@@ -4421,6 +4469,20 @@
             ],
             "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-03-30T11:41:10+00:00"
         },
         {
@@ -4558,6 +4620,20 @@
             ],
             "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-03-27T16:54:36+00:00"
         },
         {
@@ -4684,7 +4760,7 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v5.1.0",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
@@ -4747,16 +4823,16 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.17.0",
+            "version": "v1.17.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9"
+                "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
-                "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d",
+                "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d",
                 "shasum": ""
             },
             "require": {
@@ -4769,6 +4845,10 @@
             "extra": {
                 "branch-alias": {
                     "dev-master": "1.17-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -4801,7 +4881,21 @@
                 "polyfill",
                 "portable"
             ],
-            "time": "2020-05-12T16:14:59+00:00"
+            "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:46:27+00:00"
         },
         {
             "name": "symfony/polyfill-intl-idn",
@@ -4863,6 +4957,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-05-12T16:47:27+00:00"
         },
         {
@@ -4922,6 +5030,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-05-12T16:47:27+00:00"
         },
         {
@@ -4977,6 +5099,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-05-12T16:47:27+00:00"
         },
         {
@@ -5035,6 +5171,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-05-12T16:47:27+00:00"
         },
         {
@@ -5084,6 +5234,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-04-15T15:56:18+00:00"
         },
         {
@@ -6835,6 +6999,12 @@
                 }
             ],
             "description": "A tool to automatically fix PHP code style",
+            "funding": [
+                {
+                    "url": "https://github.com/keradus",
+                    "type": "github"
+                }
+            ],
             "time": "2020-04-15T18:51:10+00:00"
         },
         {
@@ -7093,6 +7263,12 @@
                 "sftp",
                 "storage"
             ],
+            "funding": [
+                {
+                    "url": "https://offset.earth/frankdejonge",
+                    "type": "other"
+                }
+            ],
             "time": "2020-05-18T15:13:39+00:00"
         },
         {
@@ -8024,16 +8200,16 @@
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.1.0",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "7462d5f123dfc080dfdf26897032a6513644fc95"
+                "reference": "30441f2752e493c639526b215ed81d54f369d693"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/7462d5f123dfc080dfdf26897032a6513644fc95",
-                "reference": "7462d5f123dfc080dfdf26897032a6513644fc95",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/30441f2752e493c639526b215ed81d54f369d693",
+                "reference": "30441f2752e493c639526b215ed81d54f369d693",
                 "shasum": ""
             },
             "require": {
@@ -8047,7 +8223,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.x-dev"
+                    "dev-1.x": "1.x-dev"
                 }
             },
             "autoload": {
@@ -8066,7 +8242,7 @@
                 }
             ],
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
-            "time": "2020-02-18T18:59:58+00:00"
+            "time": "2020-06-19T20:22:09+00:00"
         },
         {
             "name": "phpmd/phpmd",
@@ -8296,20 +8472,34 @@
                 "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"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "8.0.1",
+            "version": "8.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "31e94ccc084025d6abee0585df533eb3a792b96a"
+                "reference": "ca6647ffddd2add025ab3f21644a441d7c146cdc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/31e94ccc084025d6abee0585df533eb3a792b96a",
-                "reference": "31e94ccc084025d6abee0585df533eb3a792b96a",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca6647ffddd2add025ab3f21644a441d7c146cdc",
+                "reference": "ca6647ffddd2add025ab3f21644a441d7c146cdc",
                 "shasum": ""
             },
             "require": {
@@ -8360,20 +8550,26 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2020-02-19T13:41:19+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-05-23T08:02:54+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "3.0.1",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "4ac5b3e13df14829daa60a2eb4fdd2f2b7d33cf4"
+                "reference": "eba15e538f2bb3fe018b7bbb47d2fe32d404bfd2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/4ac5b3e13df14829daa60a2eb4fdd2f2b7d33cf4",
-                "reference": "4ac5b3e13df14829daa60a2eb4fdd2f2b7d33cf4",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/eba15e538f2bb3fe018b7bbb47d2fe32d404bfd2",
+                "reference": "eba15e538f2bb3fe018b7bbb47d2fe32d404bfd2",
                 "shasum": ""
             },
             "require": {
@@ -8410,20 +8606,26 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2020-04-18T05:02:12+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-15T12:54:35+00:00"
         },
         {
             "name": "phpunit/php-invoker",
-            "version": "3.0.0",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-invoker.git",
-                "reference": "7579d5a1ba7f3ac11c80004d205877911315ae7a"
+                "reference": "62f696ad0d140e0e513e69eaafdebb674d622b4c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/7579d5a1ba7f3ac11c80004d205877911315ae7a",
-                "reference": "7579d5a1ba7f3ac11c80004d205877911315ae7a",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/62f696ad0d140e0e513e69eaafdebb674d622b4c",
+                "reference": "62f696ad0d140e0e513e69eaafdebb674d622b4c",
                 "shasum": ""
             },
             "require": {
@@ -8463,25 +8665,34 @@
             "keywords": [
                 "process"
             ],
-            "time": "2020-02-07T06:06:11+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-15T13:10:07+00:00"
         },
         {
             "name": "phpunit/php-text-template",
-            "version": "2.0.0",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "526dc996cc0ebdfa428cd2dfccd79b7b53fee346"
+                "reference": "0c69cbf965d5317ba33f24a352539f354a25db09"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/526dc996cc0ebdfa428cd2dfccd79b7b53fee346",
-                "reference": "526dc996cc0ebdfa428cd2dfccd79b7b53fee346",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/0c69cbf965d5317ba33f24a352539f354a25db09",
+                "reference": "0c69cbf965d5317ba33f24a352539f354a25db09",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.3"
             },
+            "require-dev": {
+                "phpunit/phpunit": "^9.0"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -8509,32 +8720,38 @@
             "keywords": [
                 "template"
             ],
-            "time": "2020-02-01T07:43:44+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-15T12:52:43+00:00"
         },
         {
             "name": "phpunit/php-timer",
-            "version": "3.1.4",
+            "version": "5.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "dc9368fae6ef2ffa57eba80a7410bcef81df6258"
+                "reference": "b0d089de001ba60ffa3be36b23e1b8150d072238"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/dc9368fae6ef2ffa57eba80a7410bcef81df6258",
-                "reference": "dc9368fae6ef2ffa57eba80a7410bcef81df6258",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/b0d089de001ba60ffa3be36b23e1b8150d072238",
+                "reference": "b0d089de001ba60ffa3be36b23e1b8150d072238",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.0"
+                "phpunit/phpunit": "^9.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1-dev"
+                    "dev-master": "5.0-dev"
                 }
             },
             "autoload": {
@@ -8558,20 +8775,26 @@
             "keywords": [
                 "timer"
             ],
-            "time": "2020-04-20T06:00:37+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-07T12:05:53+00:00"
         },
         {
             "name": "phpunit/php-token-stream",
-            "version": "4.0.1",
+            "version": "4.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "cdc0db5aed8fbfaf475fbd95bfd7bab83c7a779c"
+                "reference": "e61c593e9734b47ef462340c24fca8d6a57da14e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/cdc0db5aed8fbfaf475fbd95bfd7bab83c7a779c",
-                "reference": "cdc0db5aed8fbfaf475fbd95bfd7bab83c7a779c",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e61c593e9734b47ef462340c24fca8d6a57da14e",
+                "reference": "e61c593e9734b47ef462340c24fca8d6a57da14e",
                 "shasum": ""
             },
             "require": {
@@ -8607,20 +8830,26 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2020-05-06T09:56:31+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-16T07:00:44+00:00"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.1.5",
+            "version": "9.2.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "1b570cd7edbe136055bf5f651857dc8af6b829d2"
+                "reference": "ad7cc5ec3ab2597b329880e30442d9054526023b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1b570cd7edbe136055bf5f651857dc8af6b829d2",
-                "reference": "1b570cd7edbe136055bf5f651857dc8af6b829d2",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ad7cc5ec3ab2597b329880e30442d9054526023b",
+                "reference": "ad7cc5ec3ab2597b329880e30442d9054526023b",
                 "shasum": ""
             },
             "require": {
@@ -8640,7 +8869,7 @@
                 "phpunit/php-file-iterator": "^3.0",
                 "phpunit/php-invoker": "^3.0",
                 "phpunit/php-text-template": "^2.0",
-                "phpunit/php-timer": "^3.1.4",
+                "phpunit/php-timer": "^5.0",
                 "sebastian/code-unit": "^1.0.2",
                 "sebastian/comparator": "^4.0",
                 "sebastian/diff": "^4.0",
@@ -8649,7 +8878,7 @@
                 "sebastian/global-state": "^4.0",
                 "sebastian/object-enumerator": "^4.0",
                 "sebastian/resource-operations": "^3.0",
-                "sebastian/type": "^2.0",
+                "sebastian/type": "^2.1",
                 "sebastian/version": "^3.0"
             },
             "require-dev": {
@@ -8666,7 +8895,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "9.1-dev"
+                    "dev-master": "9.2-dev"
                 }
             },
             "autoload": {
@@ -8695,7 +8924,17 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2020-05-22T13:54:05+00:00"
+            "funding": [
+                {
+                    "url": "https://phpunit.de/donate.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-22T07:10:55+00:00"
         },
         {
             "name": "psr/cache",
@@ -8793,16 +9032,16 @@
         },
         {
             "name": "sebastian/code-unit",
-            "version": "1.0.2",
+            "version": "1.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit.git",
-                "reference": "ac958085bc19fcd1d36425c781ef4cbb5b06e2a5"
+                "reference": "d650ef9b1fece15ed4d6eaed6e6b469b7b81183a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/ac958085bc19fcd1d36425c781ef4cbb5b06e2a5",
-                "reference": "ac958085bc19fcd1d36425c781ef4cbb5b06e2a5",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/d650ef9b1fece15ed4d6eaed6e6b469b7b81183a",
+                "reference": "d650ef9b1fece15ed4d6eaed6e6b469b7b81183a",
                 "shasum": ""
             },
             "require": {
@@ -8835,20 +9074,26 @@
             ],
             "description": "Collection of value objects that represent the PHP code units",
             "homepage": "https://github.com/sebastianbergmann/code-unit",
-            "time": "2020-04-30T05:58:10+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-15T13:11:26+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
-            "version": "2.0.0",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "5b5dbe0044085ac41df47e79d34911a15b96d82e"
+                "reference": "c771130f0e8669104a4320b7101a81c2cc2963ef"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/5b5dbe0044085ac41df47e79d34911a15b96d82e",
-                "reference": "5b5dbe0044085ac41df47e79d34911a15b96d82e",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/c771130f0e8669104a4320b7101a81c2cc2963ef",
+                "reference": "c771130f0e8669104a4320b7101a81c2cc2963ef",
                 "shasum": ""
             },
             "require": {
@@ -8880,20 +9125,26 @@
             ],
             "description": "Looks up which function or method a line of code belongs to",
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "time": "2020-02-07T06:20:13+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-15T12:56:39+00:00"
         },
         {
             "name": "sebastian/comparator",
-            "version": "4.0.0",
+            "version": "4.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "85b3435da967696ed618ff745f32be3ff4a2b8e8"
+                "reference": "266d85ef789da8c41f06af4093c43e9798af2784"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/85b3435da967696ed618ff745f32be3ff4a2b8e8",
-                "reference": "85b3435da967696ed618ff745f32be3ff4a2b8e8",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/266d85ef789da8c41f06af4093c43e9798af2784",
+                "reference": "266d85ef789da8c41f06af4093c43e9798af2784",
                 "shasum": ""
             },
             "require": {
@@ -8944,7 +9195,13 @@
                 "compare",
                 "equality"
             ],
-            "time": "2020-02-07T06:08:51+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-15T15:04:48+00:00"
         },
         {
             "name": "sebastian/diff",
@@ -9000,20 +9257,26 @@
                 "unidiff",
                 "unified diff"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-05-08T05:01:12+00:00"
         },
         {
             "name": "sebastian/environment",
-            "version": "5.1.0",
+            "version": "5.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "c753f04d68cd489b6973cf9b4e505e191af3b05c"
+                "reference": "16eb0fa43e29c33d7f2117ed23072e26fc5ab34e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/c753f04d68cd489b6973cf9b4e505e191af3b05c",
-                "reference": "c753f04d68cd489b6973cf9b4e505e191af3b05c",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/16eb0fa43e29c33d7f2117ed23072e26fc5ab34e",
+                "reference": "16eb0fa43e29c33d7f2117ed23072e26fc5ab34e",
                 "shasum": ""
             },
             "require": {
@@ -9053,20 +9316,26 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2020-04-14T13:36:52+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-15T13:00:01+00:00"
         },
         {
             "name": "sebastian/exporter",
-            "version": "4.0.0",
+            "version": "4.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "80c26562e964016538f832f305b2286e1ec29566"
+                "reference": "d12fbca85da932d01d941b59e4b71a0d559db091"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/80c26562e964016538f832f305b2286e1ec29566",
-                "reference": "80c26562e964016538f832f305b2286e1ec29566",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/d12fbca85da932d01d941b59e4b71a0d559db091",
+                "reference": "d12fbca85da932d01d941b59e4b71a0d559db091",
                 "shasum": ""
             },
             "require": {
@@ -9120,7 +9389,13 @@
                 "export",
                 "exporter"
             ],
-            "time": "2020-02-07T06:10:52+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-15T13:12:44+00:00"
         },
         {
             "name": "sebastian/finder-facade",
@@ -9224,16 +9499,16 @@
         },
         {
             "name": "sebastian/object-enumerator",
-            "version": "4.0.0",
+            "version": "4.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "e67516b175550abad905dc952f43285957ef4363"
+                "reference": "15f319d67c49fc55ebcdbffb3377433125588455"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67516b175550abad905dc952f43285957ef4363",
-                "reference": "e67516b175550abad905dc952f43285957ef4363",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/15f319d67c49fc55ebcdbffb3377433125588455",
+                "reference": "15f319d67c49fc55ebcdbffb3377433125588455",
                 "shasum": ""
             },
             "require": {
@@ -9267,20 +9542,26 @@
             ],
             "description": "Traverses array structures and object graphs to enumerate all referenced objects",
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-            "time": "2020-02-07T06:12:23+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-15T13:15:25+00:00"
         },
         {
             "name": "sebastian/object-reflector",
-            "version": "2.0.0",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-reflector.git",
-                "reference": "f4fd0835cabb0d4a6546d9fe291e5740037aa1e7"
+                "reference": "14e04b3c25b821cc0702d4837803fe497680b062"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/f4fd0835cabb0d4a6546d9fe291e5740037aa1e7",
-                "reference": "f4fd0835cabb0d4a6546d9fe291e5740037aa1e7",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/14e04b3c25b821cc0702d4837803fe497680b062",
+                "reference": "14e04b3c25b821cc0702d4837803fe497680b062",
                 "shasum": ""
             },
             "require": {
@@ -9312,29 +9593,35 @@
             ],
             "description": "Allows reflection of object attributes, including inherited and non-public ones",
             "homepage": "https://github.com/sebastianbergmann/object-reflector/",
-            "time": "2020-02-07T06:19:40+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-15T13:08:02+00:00"
         },
         {
             "name": "sebastian/phpcpd",
-            "version": "5.0.2",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpcpd.git",
-                "reference": "8724382966b1861df4e12db915eaed2165e10bf3"
+                "reference": "a9462153f2dd90466a010179901d31fbff598365"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/8724382966b1861df4e12db915eaed2165e10bf3",
-                "reference": "8724382966b1861df4e12db915eaed2165e10bf3",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpcpd/zipball/a9462153f2dd90466a010179901d31fbff598365",
+                "reference": "a9462153f2dd90466a010179901d31fbff598365",
                 "shasum": ""
             },
             "require": {
-                "ext-dom": "*",
-                "php": "^7.3",
-                "phpunit/php-timer": "^3.0",
-                "sebastian/finder-facade": "^2.0",
-                "sebastian/version": "^3.0",
-                "symfony/console": "^4.0|^5.0"
+                "php": ">=5.3.3",
+                "phpunit/php-timer": ">=1.0.4",
+                "sebastian/finder-facade": ">=1.1.0",
+                "sebastian/version": ">=1.0.3",
+                "symfony/console": ">=2.2.0",
+                "theseer/fdomdocument": "~1.4"
             },
             "bin": [
                 "phpcpd"
@@ -9342,7 +9629,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -9363,20 +9650,20 @@
             ],
             "description": "Copy/Paste Detector (CPD) for PHP code.",
             "homepage": "https://github.com/sebastianbergmann/phpcpd",
-            "time": "2020-02-22T06:03:17+00:00"
+            "time": "2014-03-31T09:25:30+00:00"
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "4.0.0",
+            "version": "4.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "cdd86616411fc3062368b720b0425de10bd3d579"
+                "reference": "a32789e5f0157c10cf216ce6c5136db12a12b847"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cdd86616411fc3062368b720b0425de10bd3d579",
-                "reference": "cdd86616411fc3062368b720b0425de10bd3d579",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/a32789e5f0157c10cf216ce6c5136db12a12b847",
+                "reference": "a32789e5f0157c10cf216ce6c5136db12a12b847",
                 "shasum": ""
             },
             "require": {
@@ -9416,20 +9703,26 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2020-02-07T06:18:20+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-15T13:06:44+00:00"
         },
         {
             "name": "sebastian/resource-operations",
-            "version": "3.0.0",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "8c98bf0dfa1f9256d0468b9803a1e1df31b6fa98"
+                "reference": "71421c1745788de4facae1b79af923650bd3ec15"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/8c98bf0dfa1f9256d0468b9803a1e1df31b6fa98",
-                "reference": "8c98bf0dfa1f9256d0468b9803a1e1df31b6fa98",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/71421c1745788de4facae1b79af923650bd3ec15",
+                "reference": "71421c1745788de4facae1b79af923650bd3ec15",
                 "shasum": ""
             },
             "require": {
@@ -9461,32 +9754,38 @@
             ],
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "time": "2020-02-07T06:13:02+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-15T13:17:14+00:00"
         },
         {
             "name": "sebastian/type",
-            "version": "2.0.0",
+            "version": "2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "9e8f42f740afdea51f5f4e8cec2035580e797ee1"
+                "reference": "bad49207c6f854e7a25cef0ea948ac8ebe3ef9d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/9e8f42f740afdea51f5f4e8cec2035580e797ee1",
-                "reference": "9e8f42f740afdea51f5f4e8cec2035580e797ee1",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/bad49207c6f854e7a25cef0ea948ac8ebe3ef9d8",
+                "reference": "bad49207c6f854e7a25cef0ea948ac8ebe3ef9d8",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.0"
+                "phpunit/phpunit": "^9.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "2.1-dev"
                 }
             },
             "autoload": {
@@ -9507,7 +9806,13 @@
             ],
             "description": "Collection of value objects that represent the types of the PHP type system",
             "homepage": "https://github.com/sebastianbergmann/type",
-            "time": "2020-02-07T06:13:43+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-01T12:21:09+00:00"
         },
         {
             "name": "sebastian/version",
@@ -9736,6 +10041,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-04-15T15:59:10+00:00"
         },
         {
@@ -9809,6 +10128,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-04-28T17:58:55+00:00"
         },
         {
@@ -10075,6 +10408,20 @@
                 "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-04-06T10:40:56+00:00"
         },
         {
@@ -10134,6 +10481,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-05-12T16:47:27+00:00"
         },
         {
@@ -10260,6 +10621,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-03-27T16:56:45+00:00"
         },
         {
@@ -10612,20 +10987,30 @@
                 "env",
                 "environment"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-05-02T13:38:00+00:00"
         },
         {
             "name": "webmozart/assert",
-            "version": "1.8.0",
+            "version": "1.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozart/assert.git",
-                "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6"
+                "reference": "9dc4f203e36f2b486149058bade43c851dd97451"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/ab2cb0b3b559010b75981b1bdce728da3ee90ad6",
-                "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/9dc4f203e36f2b486149058bade43c851dd97451",
+                "reference": "9dc4f203e36f2b486149058bade43c851dd97451",
                 "shasum": ""
             },
             "require": {
@@ -10633,6 +11018,7 @@
                 "symfony/polyfill-ctype": "^1.8"
             },
             "conflict": {
+                "phpstan/phpstan": "<0.12.20",
                 "vimeo/psalm": "<3.9.1"
             },
             "require-dev": {
@@ -10660,7 +11046,7 @@
                 "check",
                 "validate"
             ],
-            "time": "2020-04-18T12:12:48+00:00"
+            "time": "2020-06-16T10:16:42+00:00"
         },
         {
             "name": "weew/helpers-array",

From e2933a9b78d8c5c8b21e8d4b46cef413fed5f7c2 Mon Sep 17 00:00:00 2001
From: Konstantin Dubovik <konstantin.dubovik@guidance.com>
Date: Mon, 22 Jun 2020 12:10:17 +0300
Subject: [PATCH 0540/1718] Remove sales order address handler class phpdoc
 (static test compliance)

---
 .../Sales/Model/ResourceModel/Order/Handler/Address.php        | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/Address.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/Address.php
index c334f6e7a9576..274132a7fea50 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/Address.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/Address.php
@@ -9,9 +9,6 @@
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\ResourceModel\Attribute;
 
-/**
- * Class Address
- */
 class Address
 {
     /**

From b6ae25beb1cb683b55b0b308651ce65ffbb9c6a6 Mon Sep 17 00:00:00 2001
From: Oleksandr Melnyk <sasha19957099@gmail.com>
Date: Mon, 22 Jun 2020 15:39:31 +0300
Subject: [PATCH 0541/1718] magento/magento2#28579:DependencyTest does not
 analyze GraphQL schema files - fixed static test

---
 .../Integrity/Dependency/GraphQlSchemaDependencyProvider.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/GraphQlSchemaDependencyProvider.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/GraphQlSchemaDependencyProvider.php
index b43308513d5ec..ada16c7a96bca 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/GraphQlSchemaDependencyProvider.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/GraphQlSchemaDependencyProvider.php
@@ -9,6 +9,8 @@
 namespace Magento\Test\Integrity\Dependency;
 
 use Magento\Framework\App\Bootstrap;
+use Magento\Framework\GraphQlSchemaStitching\GraphQlReader;
+use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\TypeReaderComposite;
 
 /**
  * Provide information on the dependency between the modules according to the GraphQL schema.
@@ -86,7 +88,8 @@ private function getGraphQlSchemaDeclaration(): array
     {
         if (!$this->parsedSchema) {
             $objectManager = Bootstrap::create(BP, $_SERVER)->getObjectManager();
-            $reader = $objectManager->create(\Magento\Framework\GraphQlSchemaStitching\GraphQlReader::class);
+            $typeReader = $objectManager->create(TypeReaderComposite::class);
+            $reader = $objectManager->create(GraphQlReader::class, ['typeReader' => $typeReader]);
             $this->parsedSchema = $reader->read();
         }
 

From b79c484c3b0f9153a78edb3aa96f1332c6157fd8 Mon Sep 17 00:00:00 2001
From: Michal Derlatka <michal.derlatka1@gmail.com>
Date: Mon, 22 Jun 2020 14:47:12 +0200
Subject: [PATCH 0542/1718] magento/magento2#28561: GraphQL added CORS headers

---
 .../CorsAllowCredentialsHeaderProvider.php    |  17 ++-
 .../Cors/CorsAllowHeadersHeaderProvider.php   |  24 ++--
 .../Cors/CorsAllowMethodsHeaderProvider.php   |  25 ++--
 .../Cors/CorsAllowOriginHeaderProvider.php    |  18 ++-
 .../Cors/CorsMaxAgeHeaderProvider.php         |  25 ++--
 .../GraphQl/Model/Cors/Configuration.php      |  12 +-
 .../Model/Cors/ConfigurationInterface.php     |  10 +-
 .../Magento/GraphQl/etc/adminhtml/system.xml  |   6 +
 app/code/Magento/GraphQl/etc/di.xml           |  25 ++++
 .../Magento/GraphQl/CorsHeadersTest.php       | 122 ++++++++++++++++++
 10 files changed, 243 insertions(+), 41 deletions(-)
 create 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
index 3f7c912b574fc..086cf2bbef877 100644
--- a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowCredentialsHeaderProvider.php
+++ b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowCredentialsHeaderProvider.php
@@ -1,13 +1,21 @@
 <?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
 {
-    protected $headerName = 'Access-Control-Allow-Credentials';
+    private $headerName;
 
     /**
      * CORS configuration provider
@@ -16,9 +24,12 @@ class CorsAllowCredentialsHeaderProvider implements HeaderProviderInterface
      */
     private $corsConfiguration;
 
-    public function __construct(ConfigurationInterface $corsConfiguration)
-    {
+    public function __construct(
+        ConfigurationInterface $corsConfiguration,
+        string $headerName
+    ) {
         $this->corsConfiguration = $corsConfiguration;
+        $this->headerName = $headerName;
     }
 
     public function getName()
diff --git a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowHeadersHeaderProvider.php b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowHeadersHeaderProvider.php
index e44e7c6b1e872..26df47cb1e312 100644
--- a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowHeadersHeaderProvider.php
+++ b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowHeadersHeaderProvider.php
@@ -1,16 +1,21 @@
 <?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
 {
-    protected $headerName = 'Access-Control-Allow-Headers';
-
-    protected $headerValue = '';
+    private $headerName;
 
     /**
      * CORS configuration provider
@@ -19,9 +24,12 @@ class CorsAllowHeadersHeaderProvider implements HeaderProviderInterface
      */
     private $corsConfiguration;
 
-    public function __construct(ConfigurationInterface $corsConfiguration)
-    {
+    public function __construct(
+        ConfigurationInterface $corsConfiguration,
+        string $headerName
+    ) {
         $this->corsConfiguration = $corsConfiguration;
+        $this->headerName = $headerName;
     }
 
     public function getName()
@@ -36,8 +44,6 @@ public function canApply() : bool
 
     public function getValue()
     {
-        return $this->corsConfiguration->getAllowedHeaders()
-            ? $this->corsConfiguration->getAllowedHeaders()
-            : $this->headerValue;
+        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
index 548ffc1aec3f6..d2b2994367883 100644
--- a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowMethodsHeaderProvider.php
+++ b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowMethodsHeaderProvider.php
@@ -1,17 +1,21 @@
 <?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
 {
-    protected $headerName = 'Access-Control-Allow-Methods';
-
-    protected $headerValue = 'GET,POST,OPTIONS';
+    private $headerName;
 
     /**
      * CORS configuration provider
@@ -20,9 +24,12 @@ class CorsAllowMethodsHeaderProvider implements HeaderProviderInterface
      */
     private $corsConfiguration;
 
-    public function __construct(ConfigurationInterface $corsConfiguration)
-    {
+    public function __construct(
+        ConfigurationInterface $corsConfiguration,
+        string $headerName
+    ) {
         $this->corsConfiguration = $corsConfiguration;
+        $this->headerName = $headerName;
     }
 
     public function getName()
@@ -37,8 +44,6 @@ public function canApply() : bool
 
     public function getValue()
     {
-        return $this->corsConfiguration->getAllowedMethods()
-            ? $this->corsConfiguration->getAllowedMethods()
-            : $this->headerValue;
+        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
index 8df8c2ec6e39c..0cdc976525a7d 100644
--- a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowOriginHeaderProvider.php
+++ b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowOriginHeaderProvider.php
@@ -1,14 +1,21 @@
 <?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
 {
-    protected $headerName = 'Access-Control-Allow-Origin';
+    private $headerName;
 
     /**
      * CORS configuration provider
@@ -17,9 +24,12 @@ class CorsAllowOriginHeaderProvider implements HeaderProviderInterface
      */
     private $corsConfiguration;
 
-    public function __construct(ConfigurationInterface $corsConfiguration)
-    {
+    public function __construct(
+        ConfigurationInterface $corsConfiguration,
+        string $headerName
+    ) {
         $this->corsConfiguration = $corsConfiguration;
+        $this->headerName = $headerName;
     }
 
     public function getName()
diff --git a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsMaxAgeHeaderProvider.php b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsMaxAgeHeaderProvider.php
index b74f405930caf..065138dcd7936 100644
--- a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsMaxAgeHeaderProvider.php
+++ b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsMaxAgeHeaderProvider.php
@@ -1,17 +1,21 @@
 <?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
 {
-    protected $headerName = 'Access-Control-Max-Age';
-
-    protected $headerValue = '86400';
+    private $headerName;
 
     /**
      * CORS configuration provider
@@ -20,9 +24,12 @@ class CorsMaxAgeHeaderProvider implements HeaderProviderInterface
      */
     private $corsConfiguration;
 
-    public function __construct(ConfigurationInterface $corsConfiguration)
-    {
+    public function __construct(
+        ConfigurationInterface $corsConfiguration,
+        string $headerName
+    ) {
         $this->corsConfiguration = $corsConfiguration;
+        $this->headerName = $headerName;
     }
 
     public function getName()
@@ -37,8 +44,6 @@ public function canApply()
 
     public function getValue()
     {
-        return $this->corsConfiguration->getMaxAge()
-            ? $this->corsConfiguration->getMaxAge()
-            : $this->headerValue;
+        return $this->corsConfiguration->getMaxAge();
     }
 }
diff --git a/app/code/Magento/GraphQl/Model/Cors/Configuration.php b/app/code/Magento/GraphQl/Model/Cors/Configuration.php
index 6748ea6c3c9a1..cddc3f2ae9653 100644
--- a/app/code/Magento/GraphQl/Model/Cors/Configuration.php
+++ b/app/code/Magento/GraphQl/Model/Cors/Configuration.php
@@ -1,11 +1,17 @@
 <?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
 {
     const XML_PATH_CORS_HEADERS_ENABLED = 'graphql/cors/enabled';
@@ -47,7 +53,7 @@ public function getAllowedMethods(): ?string
 
     public function getMaxAge(): int
     {
-        return $this->scopeConfig->getValue(self::XML_PATH_CORS_MAX_AGE);
+        return (int) $this->scopeConfig->getValue(self::XML_PATH_CORS_MAX_AGE);
     }
 
     public function isCredentialsAllowed(): bool
diff --git a/app/code/Magento/GraphQl/Model/Cors/ConfigurationInterface.php b/app/code/Magento/GraphQl/Model/Cors/ConfigurationInterface.php
index bbb23abe854b6..ef298f2d9cfda 100644
--- a/app/code/Magento/GraphQl/Model/Cors/ConfigurationInterface.php
+++ b/app/code/Magento/GraphQl/Model/Cors/ConfigurationInterface.php
@@ -1,9 +1,15 @@
 <?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
 {
     public function isEnabled() : bool;
diff --git a/app/code/Magento/GraphQl/etc/adminhtml/system.xml b/app/code/Magento/GraphQl/etc/adminhtml/system.xml
index e35471038c3fd..ddee7596eca3e 100644
--- a/app/code/Magento/GraphQl/etc/adminhtml/system.xml
+++ b/app/code/Magento/GraphQl/etc/adminhtml/system.xml
@@ -20,6 +20,7 @@
 
                 <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>
@@ -27,6 +28,7 @@
 
                 <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>
@@ -34,6 +36,7 @@
 
                 <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>
@@ -41,6 +44,8 @@
 
                 <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>
@@ -49,6 +54,7 @@
                 <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>
diff --git a/app/code/Magento/GraphQl/etc/di.xml b/app/code/Magento/GraphQl/etc/di.xml
index 79052c717bc96..f0a8eca87ec58 100644
--- a/app/code/Magento/GraphQl/etc/di.xml
+++ b/app/code/Magento/GraphQl/etc/di.xml
@@ -100,4 +100,29 @@
     </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/dev/tests/api-functional/testsuite/Magento/GraphQl/CorsHeadersTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CorsHeadersTest.php
new file mode 100644
index 0000000000000..8110937468280
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CorsHeadersTest.php
@@ -0,0 +1,122 @@
+<?php
+
+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(); // TODO: Change the autogenerated stub
+
+        $this->resourceConfig->saveConfig(Configuration::XML_PATH_CORS_HEADERS_ENABLED, 0);
+        $this->reinitConfig->reinit();
+    }
+
+    public function testNoCorsHeadersWhenCorsIsDisabled()
+    {
+        $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()
+    {
+        $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()
+    {
+        $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()
+    {
+        $query
+            = <<<QUERY
+ query IntrospectionQuery {
+    __schema {
+        types {
+        name
+        }
+    }
+  }
+QUERY;
+
+        return $this->graphQlQueryWithResponseHeaders($query)['headers'];
+    }
+}

From ae076d67f481df6093ccd603809de5c1b99c09eb Mon Sep 17 00:00:00 2001
From: Pierre Grimaud <grimaud.pierre@gmail.com>
Date: Mon, 22 Jun 2020 14:59:01 +0200
Subject: [PATCH 0543/1718] docs: fix typos

---
 .../Test/Unit/Model/ResourceModel/RulesTest.php  |  4 ++--
 .../Initialization/Helper/Plugin/BundleTest.php  | 16 ++++++++--------
 .../PageRepository/ValidationCompositeTest.php   |  2 +-
 .../CleanConfigurationTmpImagesTest.php          |  6 +++---
 .../Cookie/Test/Unit/Helper/CookieTest.php       |  2 +-
 .../ResourceModel/Address/Grid/Collection.php    | 10 +++++-----
 .../Model/ResourceModel/Grid/Collection.php      | 10 +++++-----
 app/code/Magento/Paypal/Model/Api/Nvp.php        |  4 ++--
 .../ResetAttemptForFrontendObserverTest.php      |  2 +-
 .../Sales/CustomerData/LastOrderedItemsTest.php  |  2 +-
 .../Unit/View/Element/UiComponentFactoryTest.php |  4 ++--
 .../Magento/Framework/App/Utility/Files.php      |  2 +-
 .../Framework/Locale/Test/Unit/CurrencyTest.php  | 12 ++++++------
 13 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/app/code/Magento/Authorization/Test/Unit/Model/ResourceModel/RulesTest.php b/app/code/Magento/Authorization/Test/Unit/Model/ResourceModel/RulesTest.php
index 6560b3be3b947..cbd9012e1a80d 100644
--- a/app/code/Magento/Authorization/Test/Unit/Model/ResourceModel/RulesTest.php
+++ b/app/code/Magento/Authorization/Test/Unit/Model/ResourceModel/RulesTest.php
@@ -182,7 +182,7 @@ public function testSaveRelNoResources()
     /**
      * Test LocalizedException throw case.
      */
-    public function testLocalizedExceptionOccurance()
+    public function testLocalizedExceptionOccurrence()
     {
         $this->expectException(LocalizedException::class);
         $this->expectExceptionMessage("TestException");
@@ -212,7 +212,7 @@ public function testLocalizedExceptionOccurance()
     /**
      * Test generic exception throw case.
      */
-    public function testGenericExceptionOccurance()
+    public function testGenericExceptionOccurrence()
     {
         $exception = new \Exception('GenericException');
 
diff --git a/app/code/Magento/Bundle/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/BundleTest.php b/app/code/Magento/Bundle/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/BundleTest.php
index 2d86f130767c8..0092c894ac44a 100644
--- a/app/code/Magento/Bundle/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/BundleTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/BundleTest.php
@@ -150,13 +150,13 @@ public function testAfterInitializeIfBundleAnsCustomOptionsAndBundleSelectionsEx
         $this->productMock->expects($this->once())
             ->method('getBundleOptionsData')
             ->willReturn(['option_1' => ['delete' => 1]]);
-        $extentionAttribute = $this->getMockBuilder(ProductExtensionInterface::class)
+        $extensionAttribute = $this->getMockBuilder(ProductExtensionInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['setBundleProductOptions'])
             ->getMockForAbstractClass();
-        $extentionAttribute->expects($this->once())->method('setBundleProductOptions')->with([]);
-        $this->productMock->expects($this->once())->method('getExtensionAttributes')->willReturn($extentionAttribute);
-        $this->productMock->expects($this->once())->method('setExtensionAttributes')->with($extentionAttribute);
+        $extensionAttribute->expects($this->once())->method('setBundleProductOptions')->with([]);
+        $this->productMock->expects($this->once())->method('getExtensionAttributes')->willReturn($extensionAttribute);
+        $this->productMock->expects($this->once())->method('setExtensionAttributes')->with($extensionAttribute);
 
         $this->model->afterInitialize($this->subjectMock, $this->productMock);
     }
@@ -191,14 +191,14 @@ public function testAfterInitializeIfBundleOptionsNotExist(): void
             ['affect_bundle_product_selections', null, false],
         ];
         $this->requestMock->expects($this->any())->method('getPost')->willReturnMap($valueMap);
-        $extentionAttribute = $this->getMockBuilder(ProductExtensionInterface::class)
+        $extensionAttribute = $this->getMockBuilder(ProductExtensionInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['setBundleProductOptions'])
             ->getMockForAbstractClass();
-        $extentionAttribute->expects($this->once())->method('setBundleProductOptions')->with([]);
+        $extensionAttribute->expects($this->once())->method('setBundleProductOptions')->with([]);
         $this->productMock->expects($this->any())->method('getCompositeReadonly')->willReturn(false);
-        $this->productMock->expects($this->once())->method('getExtensionAttributes')->willReturn($extentionAttribute);
-        $this->productMock->expects($this->once())->method('setExtensionAttributes')->with($extentionAttribute);
+        $this->productMock->expects($this->once())->method('getExtensionAttributes')->willReturn($extensionAttribute);
+        $this->productMock->expects($this->once())->method('setExtensionAttributes')->with($extensionAttribute);
         $this->productMock->expects($this->once())->method('setCanSaveBundleSelections')->with(false);
 
         $this->model->afterInitialize($this->subjectMock, $this->productMock);
diff --git a/app/code/Magento/Cms/Test/Unit/Model/PageRepository/ValidationCompositeTest.php b/app/code/Magento/Cms/Test/Unit/Model/PageRepository/ValidationCompositeTest.php
index 9b02050156cc7..f942e62588f0e 100644
--- a/app/code/Magento/Cms/Test/Unit/Model/PageRepository/ValidationCompositeTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Model/PageRepository/ValidationCompositeTest.php
@@ -43,7 +43,7 @@ public function testConstructorValidation($validators)
         new ValidationComposite($this->subject, $validators);
     }
 
-    public function testSaveInvokesValidatorsWithSucess()
+    public function testSaveInvokesValidatorsWithSuccess()
     {
         $validator1 = $this->getMockForAbstractClass(ValidatorInterface::class);
         $validator2 = $this->getMockForAbstractClass(ValidatorInterface::class);
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Product/Initialization/CleanConfigurationTmpImagesTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Product/Initialization/CleanConfigurationTmpImagesTest.php
index 0a014b9aeef99..bb79c13bba82a 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Product/Initialization/CleanConfigurationTmpImagesTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Product/Initialization/CleanConfigurationTmpImagesTest.php
@@ -64,7 +64,7 @@ class CleanConfigurationTmpImagesTest extends TestCase
     /**
      * @var Json|MockObject
      */
-    private $seralizer;
+    private $serializer;
 
     /**
      * @var ProductInitializationHelper|MockObject
@@ -87,7 +87,7 @@ protected function setUp(): void
         $this->writeFolder = $this->getMockBuilder(Write::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->seralizer = $this->getMockBuilder(Json::class)
+        $this->serializer = $this->getMockBuilder(Json::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->subjectMock = $this->getMockBuilder(ProductInitializationHelper::class)
@@ -106,7 +106,7 @@ protected function setUp(): void
                 'fileStorageDb' => $this->fileStorageDb,
                 'mediaConfig' => $this->mediaConfig,
                 'filesystem' => $this->filesystem,
-                'seralizer' => $this->seralizer
+                'serializer' => $this->serializer
             ]
         );
     }
diff --git a/app/code/Magento/Cookie/Test/Unit/Helper/CookieTest.php b/app/code/Magento/Cookie/Test/Unit/Helper/CookieTest.php
index 9e370a186d272..6522c3ad1dcaa 100644
--- a/app/code/Magento/Cookie/Test/Unit/Helper/CookieTest.php
+++ b/app/code/Magento/Cookie/Test/Unit/Helper/CookieTest.php
@@ -162,6 +162,6 @@ public function getConfigMethodStub($hashName)
             return $defaultConfig[$hashName];
         }
 
-        throw new \InvalidArgumentException('Unknow id = ' . $hashName);
+        throw new \InvalidArgumentException('Unknown id = ' . $hashName);
     }
 }
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address/Grid/Collection.php b/app/code/Magento/Customer/Model/ResourceModel/Address/Grid/Collection.php
index 0e2eb3e1d8e65..c7b44288bc85f 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Address/Grid/Collection.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Address/Grid/Collection.php
@@ -185,7 +185,7 @@ public function addFieldToFilter($field, $condition = null)
     {
         if ($field === 'region') {
             $conditionSql = $this->_getConditionSql(
-                $this->getRegionNameExpresion(),
+                $this->getRegionNameExpression(),
                 $condition
             );
             $this->getSelect()->where($conditionSql);
@@ -211,7 +211,7 @@ public function addFullTextFilter(string $value)
         $whereCondition = '';
         foreach ($fields as $key => $field) {
             $field = $field === 'region'
-                ? $this->getRegionNameExpresion()
+                ? $this->getRegionNameExpression()
                 : 'main_table.' . $field;
             $condition = $this->_getConditionSql(
                 $this->getConnection()->quoteIdentifier($field),
@@ -246,18 +246,18 @@ private function joinRegionNameTable()
             )->joinLeft(
                 ['rnt' => $this->getTable('directory_country_region_name')],
                 "rnt.region_id={$regionIdField} AND {$localeCondition}",
-                ['region' => $this->getRegionNameExpresion()]
+                ['region' => $this->getRegionNameExpression()]
             );
 
         return $this;
     }
 
     /**
-     * Get SQL Expresion to define Region Name field by locale
+     * Get SQL Expression to define Region Name field by locale
      *
      * @return \Zend_Db_Expr
      */
-    private function getRegionNameExpresion(): \Zend_Db_Expr
+    private function getRegionNameExpression(): \Zend_Db_Expr
     {
         $connection = $this->getConnection();
         $defaultNameExpr = $connection->getIfNullSql(
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Grid/Collection.php b/app/code/Magento/Customer/Model/ResourceModel/Grid/Collection.php
index bf8ef767063bd..0fab27161ce25 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Grid/Collection.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Grid/Collection.php
@@ -74,7 +74,7 @@ public function addFieldToFilter($field, $condition = null)
     {
         if ($field === 'billing_region') {
             $conditionSql = $this->_getConditionSql(
-                $this->getRegionNameExpresion(),
+                $this->getRegionNameExpression(),
                 $condition
             );
             $this->getSelect()->where($conditionSql);
@@ -100,7 +100,7 @@ public function addFullTextFilter(string $value)
         $whereCondition = '';
         foreach ($fields as $key => $field) {
             $field = $field === 'billing_region'
-                ? $this->getRegionNameExpresion()
+                ? $this->getRegionNameExpression()
                 : 'main_table.' . $field;
             $condition = $this->_getConditionSql(
                 $this->getConnection()->quoteIdentifier($field),
@@ -152,18 +152,18 @@ private function joinRegionNameTable()
             )->joinLeft(
                 ['rnt' => $this->getTable('directory_country_region_name')],
                 "rnt.region_id={$regionIdField} AND {$localeCondition}",
-                ['billing_region' => $this->getRegionNameExpresion()]
+                ['billing_region' => $this->getRegionNameExpression()]
             );
 
         return $this;
     }
 
     /**
-     * Get SQL Expresion to define Region Name field by locale
+     * Get SQL Expression to define Region Name field by locale
      *
      * @return \Zend_Db_Expr
      */
-    private function getRegionNameExpresion(): \Zend_Db_Expr
+    private function getRegionNameExpression(): \Zend_Db_Expr
     {
         $connection = $this->getConnection();
         $defaultNameExpr = $connection->getIfNullSql(
diff --git a/app/code/Magento/Paypal/Model/Api/Nvp.php b/app/code/Magento/Paypal/Model/Api/Nvp.php
index 9e4f7693f4bfb..33fc7fcccf0db 100644
--- a/app/code/Magento/Paypal/Model/Api/Nvp.php
+++ b/app/code/Magento/Paypal/Model/Api/Nvp.php
@@ -1423,7 +1423,7 @@ protected function _validateResponse($method, $response)
      */
     protected function _deformatNVP($nvpstr)
     {
-        $intial = 0;
+        $initial = 0;
         $nvpArray = [];
 
         $nvpstr = strpos($nvpstr, "\r\n\r\n") !== false ? substr($nvpstr, strpos($nvpstr, "\r\n\r\n") + 4) : $nvpstr;
@@ -1435,7 +1435,7 @@ protected function _deformatNVP($nvpstr)
             $valuepos = strpos($nvpstr, '&') ? strpos($nvpstr, '&') : strlen($nvpstr);
 
             /*getting the Key and Value values and storing in a Associative Array*/
-            $keyval = substr($nvpstr, $intial, $keypos);
+            $keyval = substr($nvpstr, $initial, $keypos);
             $valval = substr($nvpstr, $keypos + 1, $valuepos - $keypos - 1);
             //decoding the response
             $nvpArray[urldecode($keyval)] = urldecode($valval);
diff --git a/dev/tests/integration/testsuite/Magento/Captcha/Observer/ResetAttemptForFrontendObserverTest.php b/dev/tests/integration/testsuite/Magento/Captcha/Observer/ResetAttemptForFrontendObserverTest.php
index c0acf3344f60f..33c42d794bd78 100644
--- a/dev/tests/integration/testsuite/Magento/Captcha/Observer/ResetAttemptForFrontendObserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Captcha/Observer/ResetAttemptForFrontendObserverTest.php
@@ -34,7 +34,7 @@ protected function setUp(): void
     /**
      * @magentoDataFixture Magento/Captcha/_files/failed_logins_frontend.php
      */
-    public function testSuccesfulLoginRemovesFailedAttempts()
+    public function testSuccessfulLoginRemovesFailedAttempts()
     {
         $customerEmail = 'mageuser@dummy.com';
         $customerFactory = $this->objectManager->get(CustomerFactory::class);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/CustomerData/LastOrderedItemsTest.php b/dev/tests/integration/testsuite/Magento/Sales/CustomerData/LastOrderedItemsTest.php
index 6605d43c84264..3919f91a3241e 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/CustomerData/LastOrderedItemsTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/CustomerData/LastOrderedItemsTest.php
@@ -42,7 +42,7 @@ public function testDefaultFormatterIsAppliedWhenBasicIntegration()
         $this->assertEquals(
             LastOrderedItems::SIDEBAR_ORDER_LIMIT,
             count($data['items']),
-            'Section items count should not be greater then ' . LastOrderedItems::SIDEBAR_ORDER_LIMIT
+            'Section items count should not be greater than ' . LastOrderedItems::SIDEBAR_ORDER_LIMIT
         );
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/lib/internal/Magento/Framework/Test/Unit/View/Element/UiComponentFactoryTest.php b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/lib/internal/Magento/Framework/Test/Unit/View/Element/UiComponentFactoryTest.php
index 5643ef10782e8..3152b4a6e0efb 100644
--- a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/lib/internal/Magento/Framework/Test/Unit/View/Element/UiComponentFactoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/lib/internal/Magento/Framework/Test/Unit/View/Element/UiComponentFactoryTest.php
@@ -115,7 +115,7 @@ public function testNonRootComponent()
         $name = "fieldset";
         $context = $this->createMock(\Magento\Framework\View\Element\UiComponent\ContextInterface::class);
         $arguments = ['context' => $context];
-        $defintionArguments = [
+        $definitionArguments = [
             'componentType' => 'select',
             'attributes' => [
                 'class' => '\Some\Class',
@@ -132,7 +132,7 @@ public function testNonRootComponent()
         $this->dataMock->expects($this->once())
             ->method('get')
             ->with($name)
-            ->willReturn($defintionArguments);
+            ->willReturn($definitionArguments);
         $this->objectManagerMock->expects($this->once())
             ->method('create')
             ->with('\Some\Class', $expectedArguments);
diff --git a/lib/internal/Magento/Framework/App/Utility/Files.php b/lib/internal/Magento/Framework/App/Utility/Files.php
index 901bbbde3dc9f..5f5814c5c6568 100644
--- a/lib/internal/Magento/Framework/App/Utility/Files.php
+++ b/lib/internal/Magento/Framework/App/Utility/Files.php
@@ -1116,7 +1116,7 @@ public function getJsFilesForArea($area)
         } else {
             $frontendPaths = [BP . "/lib/web/mage"];
             /* current structure of /lib/web/mage directory contains frontend javascript in the root,
-               backend javascript in subdirectories. That's why script shouldn't go recursive throught subdirectories
+               backend javascript in subdirectories. That's why script shouldn't go recursive through subdirectories
                to get js files for frontend */
             $files = array_merge($files, self::getFiles($frontendPaths, '*.js', false));
         }
diff --git a/lib/internal/Magento/Framework/Locale/Test/Unit/CurrencyTest.php b/lib/internal/Magento/Framework/Locale/Test/Unit/CurrencyTest.php
index f04300eeeb5ab..664540d33f7ad 100644
--- a/lib/internal/Magento/Framework/Locale/Test/Unit/CurrencyTest.php
+++ b/lib/internal/Magento/Framework/Locale/Test/Unit/CurrencyTest.php
@@ -41,8 +41,8 @@ class CurrencyTest extends TestCase
     const TEST_NONCACHED_CURRENCY_LOCALE = 'en_US';
     const TEST_CACHED_CURRENCY = 'CAD';
     const TEST_CACHED_CURRENCY_LOCALE = 'en_CA';
-    const TEST_NONEXISTANT_CURRENCY = 'QQQ';
-    const TEST_NONEXISTANT_CURRENCY_LOCALE = 'fr_FR';
+    const TEST_NONEXISTENT_CURRENCY = 'QQQ';
+    const TEST_NONEXISTENT_CURRENCY_LOCALE = 'fr_FR';
     const TEST_EXCEPTION_CURRENCY = 'ZZZ';
     const TEST_EXCEPTION_CURRENCY_LOCALE = 'es_ES';
 
@@ -146,9 +146,9 @@ public function testGetCurrencyCached()
         $this->assertEquals([self::TEST_CACHED_CURRENCY], $retrievedCurrencyObject->getCurrencyList());
     }
 
-    public function testGetNonExistantCurrency()
+    public function testGetNonExistentCurrency()
     {
-        $options = new \Zend_Currency(null, self::TEST_NONEXISTANT_CURRENCY_LOCALE);
+        $options = new \Zend_Currency(null, self::TEST_NONEXISTENT_CURRENCY_LOCALE);
 
         $this->mockCurrencyFactory
             ->expects($this->once())
@@ -164,10 +164,10 @@ public function testGetNonExistantCurrency()
             ->method('dispatch');
 
         $retrievedCurrencyObject = $this->testCurrencyObject
-            ->getCurrency(self::TEST_NONEXISTANT_CURRENCY);
+            ->getCurrency(self::TEST_NONEXISTENT_CURRENCY);
 
         $this->assertInstanceOf('Zend_Currency', $retrievedCurrencyObject);
-        $this->assertEquals(self::TEST_NONEXISTANT_CURRENCY_LOCALE, $retrievedCurrencyObject->getLocale());
+        $this->assertEquals(self::TEST_NONEXISTENT_CURRENCY_LOCALE, $retrievedCurrencyObject->getLocale());
         $this->assertEquals('euro', $retrievedCurrencyObject->getName());
         $this->assertEquals(['EUR'], $retrievedCurrencyObject->getCurrencyList());
     }

From 5ab033d832df0a6b608f55d531f137f1ef73a61a Mon Sep 17 00:00:00 2001
From: Dmitriy Gallyamov <dmitrijs.gallamovs@gmail.com>
Date: Mon, 22 Jun 2020 16:38:49 +0300
Subject: [PATCH 0544/1718] magento/magento2#28569: Missing store codes in
 relation to a group and website

- Refactored code to use getList
---
 .../Model/Service/StoreConfigManager.php      | 41 ++++++++++++-------
 .../Store/StoreConfigDataProvider.php         | 30 ++++++++++++--
 2 files changed, 53 insertions(+), 18 deletions(-)

diff --git a/app/code/Magento/Store/Model/Service/StoreConfigManager.php b/app/code/Magento/Store/Model/Service/StoreConfigManager.php
index b3c2208a58361..1e221216cfaaa 100644
--- a/app/code/Magento/Store/Model/Service/StoreConfigManager.php
+++ b/app/code/Magento/Store/Model/Service/StoreConfigManager.php
@@ -3,24 +3,33 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Store\Model\Service;
 
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Api\Data\StoreConfigInterface;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\Data\StoreConfig;
+use Magento\Store\Model\Data\StoreConfigFactory;
+use Magento\Store\Model\ResourceModel\Store\CollectionFactory;
+use Magento\Store\Model\Store;
+
 class StoreConfigManager implements \Magento\Store\Api\StoreConfigManagerInterface
 {
     /**
-     * @var \Magento\Store\Model\ResourceModel\Store\CollectionFactory
+     * @var CollectionFactory
      */
     protected $storeCollectionFactory;
 
     /**
-     * @var \Magento\Store\Model\Data\StoreConfigFactory
+     * @var StoreConfigFactory
      */
     protected $storeConfigFactory;
 
     /**
      * Core store config
      *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     * @var ScopeConfigInterface
      */
     protected $scopeConfig;
 
@@ -38,14 +47,14 @@ class StoreConfigManager implements \Magento\Store\Api\StoreConfigManagerInterfa
     ];
 
     /**
-     * @param \Magento\Store\Model\ResourceModel\Store\CollectionFactory $storeCollectionFactory
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Store\Model\Data\StoreConfigFactory $storeConfigFactory
+     * @param CollectionFactory $storeCollectionFactory
+     * @param ScopeConfigInterface $scopeConfig
+     * @param StoreConfigFactory $storeConfigFactory
      */
     public function __construct(
-        \Magento\Store\Model\ResourceModel\Store\CollectionFactory $storeCollectionFactory,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Store\Model\Data\StoreConfigFactory $storeConfigFactory
+        CollectionFactory $storeCollectionFactory,
+        ScopeConfigInterface $scopeConfig,
+        StoreConfigFactory $storeConfigFactory
     ) {
         $this->storeCollectionFactory = $storeCollectionFactory;
         $this->scopeConfig = $scopeConfig;
@@ -53,8 +62,10 @@ public function __construct(
     }
 
     /**
+     * Get store configurations
+     *
      * @param string[] $storeCodes list of stores by store codes, will return all if storeCodes is not set
-     * @return \Magento\Store\Api\Data\StoreConfigInterface[]
+     * @return StoreConfigInterface[]
      */
     public function getStoreConfigs(array $storeCodes = null)
     {
@@ -71,12 +82,14 @@ public function getStoreConfigs(array $storeCodes = null)
     }
 
     /**
-     * @param \Magento\Store\Model\Store $store
-     * @return \Magento\Store\Api\Data\StoreConfigInterface
+     * Get store specific configs
+     *
+     * @param Store|StoreInterface $store
+     * @return StoreConfigInterface
      */
-    protected function getStoreConfig($store)
+    public function getStoreConfig($store)
     {
-        /** @var \Magento\Store\Model\Data\StoreConfig $storeConfig */
+        /** @var StoreConfig $storeConfig */
         $storeConfig = $this->storeConfigFactory->create();
 
         $storeConfig->setId($store->getId())
diff --git a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
index 6f4b7b833f2e2..60880a781800c 100644
--- a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
+++ b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
@@ -10,6 +10,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Store\Api\Data\StoreConfigInterface;
 use Magento\Store\Api\StoreConfigManagerInterface;
+use Magento\Store\Api\StoreRepositoryInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Api\Data\StoreInterface;
 
@@ -33,19 +34,27 @@ class StoreConfigDataProvider
      */
     private $extendedConfigData;
 
+    /**
+     * @var StoreRepositoryInterface
+     */
+    private $storeRepository;
+
     /**
      * @param StoreConfigManagerInterface $storeConfigManager
      * @param ScopeConfigInterface $scopeConfig
+     * @param StoreRepositoryInterface $storeRepository
      * @param array $extendedConfigData
      */
     public function __construct(
         StoreConfigManagerInterface $storeConfigManager,
         ScopeConfigInterface $scopeConfig,
+        StoreRepositoryInterface $storeRepository,
         array $extendedConfigData = []
     ) {
         $this->storeConfigManager = $storeConfigManager;
         $this->scopeConfig = $scopeConfig;
         $this->extendedConfigData = $extendedConfigData;
+        $this->storeRepository = $storeRepository;
     }
 
     /**
@@ -56,11 +65,24 @@ public function __construct(
      */
     public function getStoreConfigData(StoreInterface $store): array
     {
-        $stores = $this->storeConfigManager->getStoreConfigs();
-        $defaultStoreConfig = current($this->storeConfigManager->getStoreConfigs([$store->getCode()]));
+        $defaultStoreConfig = $this->storeConfigManager->getStoreConfig($store);
         $defaultStoreConfigData = $this->prepareStoreConfigData($defaultStoreConfig);
 
-        foreach ($stores as $storeConfig) {
+        return $this->addStores($defaultStoreConfigData);
+    }
+
+    /**
+     * Add all stores
+     *
+     * @param array $defaultStoreConfigData
+     * @return mixed
+     */
+    private function addStores($defaultStoreConfigData)
+    {
+        $stores = $this->storeRepository->getList();
+
+        foreach ($stores as $store) {
+            $storeConfig = $this->storeConfigManager->getStoreConfig($store);
             $defaultStoreConfigData['stores'][] = $this->prepareStoreConfigData($storeConfig);
         }
 
@@ -101,7 +123,7 @@ private function prepareStoreConfigData($storeConfig): array
      * @param int $storeId
      * @return array
      */
-    private function getExtendedConfigData(int $storeId)
+    private function getExtendedConfigData(int $storeId): array
     {
         $extendedConfigData = [];
         foreach ($this->extendedConfigData as $key => $path) {

From ac5835bf1a6c149e1a4deda4616a90b001b2671b Mon Sep 17 00:00:00 2001
From: Dmitriy Gallyamov <dmitrijs.gallamovs@gmail.com>
Date: Mon, 22 Jun 2020 16:40:41 +0300
Subject: [PATCH 0545/1718] magento/magento2#28569: Missing store codes in
 relation to a group and website

- Added param type hint
---
 .../Model/Resolver/Store/StoreConfigDataProvider.php            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
index 60880a781800c..54220e67a926e 100644
--- a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
+++ b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
@@ -95,7 +95,7 @@ private function addStores($defaultStoreConfigData)
      * @param StoreConfigInterface $storeConfig
      * @return array
      */
-    private function prepareStoreConfigData($storeConfig): array
+    private function prepareStoreConfigData(StoreConfigInterface $storeConfig): array
     {
         return array_merge([
             'id' => $storeConfig->getId(),

From def4e04a3d28334a05e99926f8e88eb4f679439d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tylek?= <pawel.tylek@creativestyle.pl>
Date: Mon, 22 Jun 2020 16:39:43 +0200
Subject: [PATCH 0546/1718] Initialize toolbar.js once

---
 .../frontend/web/js/product/list/toolbar.js   |  7 +++-
 .../frontend/js/product/list/toolbar.test.js  | 33 +++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/list/toolbar.test.js

diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js b/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
index dfc0b4291cd6e..3bd2b8f51509d 100644
--- a/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
+++ b/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
@@ -30,15 +30,20 @@ define([
             limitDefault: '9',
             url: '',
             formKey: '',
-            post: false
+            post: false,
+            isToolbarInitialized: false
         },
 
         /** @inheritdoc */
         _create: function () {
+            if (this.options.isToolbarInitialized) {
+                return;
+            }
             this._bind($(this.options.modeControl), this.options.mode, this.options.modeDefault);
             this._bind($(this.options.directionControl), this.options.direction, this.options.directionDefault);
             this._bind($(this.options.orderControl), this.options.order, this.options.orderDefault);
             this._bind($(this.options.limitControl), this.options.limit, this.options.limitDefault);
+            this.options.isToolbarInitialized = true;
         },
 
         /** @inheritdoc */
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/list/toolbar.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/list/toolbar.test.js
new file mode 100644
index 0000000000000..791ebfc4fd13d
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/list/toolbar.test.js
@@ -0,0 +1,33 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'Magento_Catalog/js/product/list/toolbar'
+], function ($, productListToolbarForm) {
+    'use strict';
+
+    describe('Magento_Catalog/js/product/list/toolbar', function () {
+        var widget,
+            wdContainer;
+
+        beforeEach(function () {
+            wdContainer = $('<div class="toolbar toolbar-products"></div>');
+            widget = wdContainer.productListToolbarForm();
+        });
+
+        afterEach(function () {
+            $(wdContainer).remove();
+        });
+
+        it('Widget extends jQuery object', function () {
+            expect($.fn.productListToolbarForm).toBeDefined();
+        });
+
+        it('Toolbar is initialized', function () {
+            expect(wdContainer.productListToolbarForm('option', 'isToolbarInitialized')).not.toBe(false);
+        });
+    });
+});

From 0769167b8ad1fb27f1897db8293d61e5066dfe9f Mon Sep 17 00:00:00 2001
From: Viktor Sevch <viktor.sevch@transoftgroup.com>
Date: Mon, 22 Jun 2020 18:39:49 +0300
Subject: [PATCH 0547/1718] MC-35316: Pagination products not work in admin
 create order page

---
 .../Test/Mftf/Test/AdminOrderPagerTest.xml    | 133 ++++++++++++++++++
 .../AdminDataGridPaginationSection.xml        |   5 +-
 2 files changed, 136 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Test/AdminOrderPagerTest.xml

diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminOrderPagerTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminOrderPagerTest.xml
new file mode 100644
index 0000000000000..176bd440f7e22
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminOrderPagerTest.xml
@@ -0,0 +1,133 @@
+<?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="AdminOrderPagerTest">
+        <annotations>
+            <stories value="Admin order pager"/>
+            <title value="Check pager is working"/>
+            <description value="Check Pager in order add products grid"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-35349"/>
+            <group value="sales"/>
+        </annotations>
+        <before>
+            <!-- 21 products created and category -->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createProduct01">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="createProduct02">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="createProduct03">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="createProduct04">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="_defaultProduct" stepKey="createProduct05">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="_defaultProduct" stepKey="createProduct06">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="_defaultProduct" stepKey="createProduct07">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="_defaultProduct" stepKey="createProduct08">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="_defaultProduct" stepKey="createProduct09">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="createProduct10">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="createProduct11">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="createProduct12">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct13">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct14">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct15">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct16">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct17">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct18">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct19">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct20">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="createProduct21">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <!-- Customer is created -->
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <!-- Login to Admin -->
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+            <!-- Delete category and products -->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct01" stepKey="deleteProduct1"/>
+            <deleteData createDataKey="createProduct02" stepKey="deleteProduct2"/>
+            <deleteData createDataKey="createProduct03" stepKey="deleteProduct3"/>
+            <deleteData createDataKey="createProduct04" stepKey="deleteProduct4"/>
+            <deleteData createDataKey="createProduct05" stepKey="deleteProduct5"/>
+            <deleteData createDataKey="createProduct06" stepKey="deleteProduct6"/>
+            <deleteData createDataKey="createProduct07" stepKey="deleteProduct7"/>
+            <deleteData createDataKey="createProduct08" stepKey="deleteProduct8"/>
+            <deleteData createDataKey="createProduct09" stepKey="deleteProduct9"/>
+            <deleteData createDataKey="createProduct10" stepKey="deleteProduct10"/>
+            <deleteData createDataKey="createProduct11" stepKey="deleteProduct11"/>
+            <deleteData createDataKey="createProduct12" stepKey="deleteProduct12"/>
+            <deleteData createDataKey="createProduct13" stepKey="deleteProduct13"/>
+            <deleteData createDataKey="createProduct14" stepKey="deleteProduct14"/>
+            <deleteData createDataKey="createProduct15" stepKey="deleteProduct15"/>
+            <deleteData createDataKey="createProduct16" stepKey="deleteProduct16"/>
+            <deleteData createDataKey="createProduct17" stepKey="deleteProduct17"/>
+            <deleteData createDataKey="createProduct18" stepKey="deleteProduct18"/>
+            <deleteData createDataKey="createProduct19" stepKey="deleteProduct19"/>
+            <deleteData createDataKey="createProduct20" stepKey="deleteProduct20"/>
+            <deleteData createDataKey="createProduct21" stepKey="deleteProduct21"/>
+
+            <!-- Delete Customer -->
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+        </after>
+
+        <!-- Initiate create new order -->
+        <actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="navigateToNewOrderWithExistingCustomer">
+            <argument name="customer" value="$createCustomer$"/>
+        </actionGroup>
+
+        <click selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="clickAddProducts"/>
+        <click selector="{{AdminDataGridPaginationSection.nextPage}}" stepKey="clickNextPage"/>
+        <seeInField selector="{{AdminDataGridPaginationSection.selectedPage}}" userInput="2" stepKey="seeSecondPageOrderGrid"/>
+        <click selector="{{AdminDataGridPaginationSection.previousPage}}" stepKey="clickPreviousPage"/>
+        <seeInField selector="{{AdminDataGridPaginationSection.selectedPage}}" userInput="1" stepKey="seeFirstPageOrderGrid"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml
index 133836761174d..6f3cf005f9ba7 100644
--- a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml
+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml
@@ -16,10 +16,11 @@
         <element name="perPageDropDownItem" type="button" selector="//*[contains(@class, 'selectmenu-items _active')]//button[contains(@class, 'selectmenu-item-action') and text()='{{dropDownItem}}']" timeout="30" parameterized="true"/>
         <element name="perPageEditCustomValue" type="button" selector="//div[contains(@class, 'selectmenu-items _active')]//div[contains(@class, 'selectmenu-item')]//button[text()='{{perPageCustomValue}}']/following-sibling::button[contains(@class, 'action-edit')]" parameterized="true"/>
         <element name="perPageDeleteCustomValue" type="button" selector="//div[contains(@class, 'selectmenu-items _active')]//div[contains(@class, 'selectmenu-item')]//button[text()='{{perPageCustomValue}}']/parent::div/preceding-sibling::div/button[contains(@class, 'action-delete')]" parameterized="true"/>
-        <element name="nextPage" type="button" selector="div.admin__data-grid-pager > button.action-next" timeout="30"/>
-        <element name="previousPage" type="button" selector="div.admin__data-grid-pager > button.action-previous" timeout="30"/>
+        <element name="nextPage" type="button" selector="div.admin__data-grid-pager > button.action-next:not(.disabled)" timeout="30"/>
+        <element name="previousPage" type="button" selector="div.admin__data-grid-pager > button.action-previous:not(.disabled)" timeout="30"/>
         <element name="currentPage" type="input" selector="div.admin__data-grid-pager > input[data-ui-id='current-page-input']"/>
         <element name="totalPages" type="text" selector="div.admin__data-grid-pager > label"/>
         <element name="perPageDropDownValue" type="input" selector=".selectmenu-value input" timeout="30"/>
+        <element name="selectedPage" type="input" selector="#sales_order_create_search_grid_page-current" timeout="30"/>
     </section>
 </sections>

From 630bebd12e55264ac2ddd37fb4f1fe2d2a930903 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tylek?= <pawel.tylek@creativestyle.pl>
Date: Mon, 22 Jun 2020 18:43:12 +0200
Subject: [PATCH 0548/1718] Move isToolbarInitialized to private variable,
 rewrite test

---
 .../view/frontend/web/js/product/list/toolbar.js | 11 ++++++-----
 .../frontend/js/product/list/toolbar.test.js     | 16 ++++++----------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js b/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
index 3bd2b8f51509d..3955ce9a033e1 100644
--- a/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
+++ b/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
@@ -9,6 +9,8 @@ define([
 ], function ($) {
     'use strict';
 
+    var isToolbarInitialized = false;
+
     /**
      * ProductListToolbarForm Widget - this widget is setting cookie and submitting form according to toolbar controls
      */
@@ -30,20 +32,19 @@ define([
             limitDefault: '9',
             url: '',
             formKey: '',
-            post: false,
-            isToolbarInitialized: false
+            post: false
         },
 
         /** @inheritdoc */
         _create: function () {
-            if (this.options.isToolbarInitialized) {
-                return;
+            if (isToolbarInitialized) {
+                return false;
             }
             this._bind($(this.options.modeControl), this.options.mode, this.options.modeDefault);
             this._bind($(this.options.directionControl), this.options.direction, this.options.directionDefault);
             this._bind($(this.options.orderControl), this.options.order, this.options.orderDefault);
             this._bind($(this.options.limitControl), this.options.limit, this.options.limitDefault);
-            this.options.isToolbarInitialized = true;
+            isToolbarInitialized = true;
         },
 
         /** @inheritdoc */
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/list/toolbar.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/list/toolbar.test.js
index 791ebfc4fd13d..4a46149ed83b0 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/list/toolbar.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/list/toolbar.test.js
@@ -10,24 +10,20 @@ define([
     'use strict';
 
     describe('Magento_Catalog/js/product/list/toolbar', function () {
-        var widget,
-            wdContainer;
+        var widget;
 
         beforeEach(function () {
-            wdContainer = $('<div class="toolbar toolbar-products"></div>');
-            widget = wdContainer.productListToolbarForm();
-        });
-
-        afterEach(function () {
-            $(wdContainer).remove();
+            widget = new productListToolbarForm();
         });
 
         it('Widget extends jQuery object', function () {
-            expect($.fn.productListToolbarForm).toBeDefined();
+            expect($.mage.productListToolbarForm).toBeDefined();
         });
 
         it('Toolbar is initialized', function () {
-            expect(wdContainer.productListToolbarForm('option', 'isToolbarInitialized')).not.toBe(false);
+            spyOn(widget, '_create');
+            widget._create();
+            expect(widget._create).toHaveBeenCalled();
         });
     });
 });

From 6005a92fa59f40294cd0074cb586f99b06f6b54e Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Mon, 22 Jun 2020 20:33:45 +0300
Subject: [PATCH 0549/1718] add case BuyXGetYAction

---
 .../Magento/SalesRule/Model/Validator.php     | 59 ++++++++++++++++---
 1 file changed, 50 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/SalesRule/Model/Validator.php b/app/code/Magento/SalesRule/Model/Validator.php
index 0fc0b062c7887..fd292c00ad81a 100644
--- a/app/code/Magento/SalesRule/Model/Validator.php
+++ b/app/code/Magento/SalesRule/Model/Validator.php
@@ -7,6 +7,7 @@
 namespace Magento\SalesRule\Model;
 
 use Magento\Framework\App\ObjectManager;
+use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\Quote\Address;
 use Magento\Quote\Model\Quote\Item\AbstractItem;
 use Magento\SalesRule\Helper\CartFixedDiscount;
@@ -319,7 +320,7 @@ public function processShippingAmount(Address $address)
         $quote = $address->getQuote();
         $appliedRuleIds = [];
         foreach ($this->_getRules($address) as $rule) {
-            /* @var \Magento\SalesRule\Model\Rule $rule */
+            /* @var Rule $rule */
             if (!$rule->getApplyToShipping() || !$this->validatorUtility->canProcessRule($rule, $address)) {
                 continue;
             }
@@ -328,28 +329,28 @@ public function processShippingAmount(Address $address)
             $baseDiscountAmount = 0;
             $rulePercent = min(100, $rule->getDiscountAmount());
             switch ($rule->getSimpleAction()) {
-                case \Magento\SalesRule\Model\Rule::TO_PERCENT_ACTION:
+                case Rule::TO_PERCENT_ACTION:
                     $rulePercent = max(0, 100 - $rule->getDiscountAmount());
                 // break is intentionally omitted
                 // no break
-                case \Magento\SalesRule\Model\Rule::BY_PERCENT_ACTION:
+                case Rule::BY_PERCENT_ACTION:
                     $discountAmount = ($shippingAmount - $address->getShippingDiscountAmount()) * $rulePercent / 100;
                     $baseDiscountAmount = ($baseShippingAmount -
                             $address->getBaseShippingDiscountAmount()) * $rulePercent / 100;
                     $discountPercent = min(100, $address->getShippingDiscountPercent() + $rulePercent);
                     $address->setShippingDiscountPercent($discountPercent);
                     break;
-                case \Magento\SalesRule\Model\Rule::TO_FIXED_ACTION:
+                case Rule::TO_FIXED_ACTION:
                     $quoteAmount = $this->priceCurrency->convert($rule->getDiscountAmount(), $quote->getStore());
                     $discountAmount = $shippingAmount - $quoteAmount;
                     $baseDiscountAmount = $baseShippingAmount - $rule->getDiscountAmount();
                     break;
-                case \Magento\SalesRule\Model\Rule::BY_FIXED_ACTION:
+                case Rule::BY_FIXED_ACTION:
                     $quoteAmount = $this->priceCurrency->convert($rule->getDiscountAmount(), $quote->getStore());
                     $discountAmount = $quoteAmount;
                     $baseDiscountAmount = $rule->getDiscountAmount();
                     break;
-                case \Magento\SalesRule\Model\Rule::CART_FIXED_ACTION:
+                case Rule::CART_FIXED_ACTION:
                     $cartRules = $address->getCartFixedRules();
                     $quoteAmount = $this->priceCurrency->convert($rule->getDiscountAmount(), $quote->getStore());
                     $isAppliedToShipping = (int) $rule->getApplyToShipping();
@@ -385,6 +386,12 @@ public function processShippingAmount(Address $address)
                     }
                     $address->setCartFixedRules($cartRules);
                     break;
+                case Rule::BUY_X_GET_Y_ACTION:
+                    $qty = $this->getDiscountQtyAllItemsBuyXGetYAction($quote, $rule);
+                    $quoteAmount = $address->getBaseShippingAmount() / $quote->getItemsQty() * $qty;
+                    $discountAmount = $this->priceCurrency->convert($quoteAmount, $quote->getStore());
+                    $baseDiscountAmount = $quoteAmount;
+                    break;
             }
 
             $discountAmount = min($address->getShippingDiscountAmount() + $discountAmount, $shippingAmount);
@@ -426,9 +433,9 @@ public function initTotals($items, Address $address)
             return $this;
         }
 
-        /** @var \Magento\SalesRule\Model\Rule $rule */
+        /** @var Rule $rule */
         foreach ($this->_getRules($address) as $rule) {
-            if (\Magento\SalesRule\Model\Rule::CART_FIXED_ACTION == $rule->getSimpleAction()
+            if (Rule::CART_FIXED_ACTION == $rule->getSimpleAction()
                 && $this->validatorUtility->canProcessRule($rule, $address)
             ) {
                 $ruleTotalItemsPrice = 0;
@@ -481,6 +488,40 @@ private function isValidItemForRule(AbstractItem $item, Rule $rule)
         return true;
     }
 
+    /**
+     * Return discount Qty for all items at Buy_X_Get_Y_Action
+     *
+     * @param Quote $quote
+     * @param Rule $rule
+     * @return float
+     */
+    private function getDiscountQtyAllItemsBuyXGetYAction($quote, $rule)
+    {
+        $discountAllQty = 0;
+        foreach ($quote->getItems() as $item) {
+            $qty = $item->getQty();
+
+            $x = $rule->getDiscountStep();
+            $y = $rule->getDiscountAmount();
+            if (!$x || $y > $x) {
+                continue;
+            }
+            $buyAndDiscountQty = $x + $y;
+
+            $fullRuleQtyPeriod = floor($qty / $buyAndDiscountQty);
+            $freeQty = $qty - $fullRuleQtyPeriod * $buyAndDiscountQty;
+
+            $discountQty = $fullRuleQtyPeriod * $y;
+            if ($freeQty > $x) {
+                $discountQty += $freeQty - $x;
+            }
+
+            $discountAllQty += $discountQty;
+        }
+
+        return $discountAllQty;
+    }
+
     /**
      * Return item price
      *
@@ -564,7 +605,7 @@ public function prepareDescription($address, $separator = ', ')
     public function sortItemsByPriority($items, Address $address = null)
     {
         $itemsSorted = [];
-        /** @var $rule \Magento\SalesRule\Model\Rule */
+        /** @var $rule Rule */
         foreach ($this->_getRules($address) as $rule) {
             foreach ($items as $itemKey => $itemValue) {
                 if ($rule->getActions()->validate($itemValue)) {

From 8f1c69571e57270135964ab9cb207584f60d657f Mon Sep 17 00:00:00 2001
From: Viktor Sevch <viktor.sevch@transoftgroup.com>
Date: Mon, 22 Jun 2020 21:45:25 +0300
Subject: [PATCH 0550/1718] MC-35316: Pagination products not work in admin
 create order page

---
 .../Sales/Test/Mftf/Test/AdminOrderPagerTest.xml  | 15 +++++++++++----
 .../Section/AdminDataGridPaginationSection.xml    |  6 ++++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminOrderPagerTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminOrderPagerTest.xml
index 176bd440f7e22..fea3fe68fd522 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminOrderPagerTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminOrderPagerTest.xml
@@ -10,11 +10,13 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminOrderPagerTest">
         <annotations>
+            <features value="Sales"/>
             <stories value="Admin order pager"/>
             <title value="Check pager is working"/>
             <description value="Check Pager in order add products grid"/>
             <severity value="AVERAGE"/>
             <testCaseId value="MC-35349"/>
+            <useCaseId value="MC-35316"/>
             <group value="sales"/>
         </annotations>
         <before>
@@ -91,8 +93,7 @@
         </before>
         <after>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
-            <!-- Delete category and products -->
-            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <!-- Delete products -->
             <deleteData createDataKey="createProduct01" stepKey="deleteProduct1"/>
             <deleteData createDataKey="createProduct02" stepKey="deleteProduct2"/>
             <deleteData createDataKey="createProduct03" stepKey="deleteProduct3"/>
@@ -115,6 +116,9 @@
             <deleteData createDataKey="createProduct20" stepKey="deleteProduct20"/>
             <deleteData createDataKey="createProduct21" stepKey="deleteProduct21"/>
 
+            <!-- Delete Category -->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
             <!-- Delete Customer -->
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
         </after>
@@ -124,10 +128,13 @@
             <argument name="customer" value="$createCustomer$"/>
         </actionGroup>
 
+        <waitForElementVisible selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="waitForAddProductsButtonAppeared"/>
         <click selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="clickAddProducts"/>
-        <click selector="{{AdminDataGridPaginationSection.nextPage}}" stepKey="clickNextPage"/>
+        <dontSee selector="{{AdminDataGridPaginationSection.prevPageActive}}" stepKey="previousPageDisabled"/>
+        <click selector="{{AdminDataGridPaginationSection.nextPageActive}}" stepKey="clickNextPage"/>
         <seeInField selector="{{AdminDataGridPaginationSection.selectedPage}}" userInput="2" stepKey="seeSecondPageOrderGrid"/>
-        <click selector="{{AdminDataGridPaginationSection.previousPage}}" stepKey="clickPreviousPage"/>
+        <click selector="{{AdminDataGridPaginationSection.prevPageActive}}" stepKey="clickPreviousPage"/>
         <seeInField selector="{{AdminDataGridPaginationSection.selectedPage}}" userInput="1" stepKey="seeFirstPageOrderGrid"/>
+        <dontSee selector="{{AdminDataGridPaginationSection.prevPageActive}}" stepKey="prevPageDisabled"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml
index 6f3cf005f9ba7..51cebdb01a74d 100644
--- a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml
+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridPaginationSection.xml
@@ -16,11 +16,13 @@
         <element name="perPageDropDownItem" type="button" selector="//*[contains(@class, 'selectmenu-items _active')]//button[contains(@class, 'selectmenu-item-action') and text()='{{dropDownItem}}']" timeout="30" parameterized="true"/>
         <element name="perPageEditCustomValue" type="button" selector="//div[contains(@class, 'selectmenu-items _active')]//div[contains(@class, 'selectmenu-item')]//button[text()='{{perPageCustomValue}}']/following-sibling::button[contains(@class, 'action-edit')]" parameterized="true"/>
         <element name="perPageDeleteCustomValue" type="button" selector="//div[contains(@class, 'selectmenu-items _active')]//div[contains(@class, 'selectmenu-item')]//button[text()='{{perPageCustomValue}}']/parent::div/preceding-sibling::div/button[contains(@class, 'action-delete')]" parameterized="true"/>
-        <element name="nextPage" type="button" selector="div.admin__data-grid-pager > button.action-next:not(.disabled)" timeout="30"/>
-        <element name="previousPage" type="button" selector="div.admin__data-grid-pager > button.action-previous:not(.disabled)" timeout="30"/>
+        <element name="nextPage" type="button" selector="div.admin__data-grid-pager > button.action-next" timeout="30"/>
+        <element name="previousPage" type="button" selector="div.admin__data-grid-pager > button.action-previous" timeout="30"/>
         <element name="currentPage" type="input" selector="div.admin__data-grid-pager > input[data-ui-id='current-page-input']"/>
         <element name="totalPages" type="text" selector="div.admin__data-grid-pager > label"/>
         <element name="perPageDropDownValue" type="input" selector=".selectmenu-value input" timeout="30"/>
         <element name="selectedPage" type="input" selector="#sales_order_create_search_grid_page-current" timeout="30"/>
+        <element name="nextPageActive" type="button" selector="div.admin__data-grid-pager > button.action-next:not(.disabled)" timeout="30"/>
+        <element name="prevPageActive" type="button" selector="div.admin__data-grid-pager > button.action-previous:not(.disabled)" timeout="30"/>
     </section>
 </sections>

From 934db87d56bad355d759925aff9fe837c61ef398 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Mon, 22 Jun 2020 23:20:17 +0300
Subject: [PATCH 0551/1718] Add some checks

---
 .../Observer/PayflowProSetCcData.php          | 59 ++++++++++++++++++-
 .../Magento/PaypalGraphQl/etc/schema.graphqls |  2 +-
 .../Customer/PlaceOrderWithPayflowProTest.php |  1 +
 3 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/PaypalGraphQl/Observer/PayflowProSetCcData.php b/app/code/Magento/PaypalGraphQl/Observer/PayflowProSetCcData.php
index 9dd5969672529..9bb8dfc0589fa 100644
--- a/app/code/Magento/PaypalGraphQl/Observer/PayflowProSetCcData.php
+++ b/app/code/Magento/PaypalGraphQl/Observer/PayflowProSetCcData.php
@@ -8,32 +8,89 @@
 
 namespace Magento\PaypalGraphQl\Observer;
 
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Event\Observer;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Payment\Observer\AbstractDataAssignObserver;
 use Magento\Quote\Api\Data\PaymentInterface;
+use Magento\Customer\Model\Session as CustomerModelSession;
 
 /**
  * Class PayflowProSetCcData set CcData to quote payment
  */
 class PayflowProSetCcData extends AbstractDataAssignObserver
 {
+    const XML_PATH_PAYMENT_PAYFLOWPRO_CC_VAULT_ACTIVE = "payment/payflowpro_cc_vault/active";
+    const IS_ACTIVE_PAYMENT_TOKEN_ENABLER = "is_active_payment_token_enabler";
+
+    /**
+     * @var CustomerModelSession
+     */
+    private $customerSession;
+
+    /**
+     * Core store config
+     *
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @param CustomerModelSession $customerSession
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(
+        CustomerModelSession $customerSession,
+        ScopeConfigInterface $scopeConfig
+    ) {
+        $this->customerSession = $customerSession;
+        $this->scopeConfig = $scopeConfig;
+    }
+
     /**
      * Set CcData
      *
      * @param Observer $observer
+     *
+     * @throws GraphQlInputException
      */
     public function execute(Observer $observer)
     {
         $dataObject = $this->readDataArgument($observer);
         $additionalData = $dataObject->getData(PaymentInterface::KEY_ADDITIONAL_DATA);
+        $paymentModel = $this->readPaymentModelArgument($observer);
 
         if (!isset($additionalData['cc_details'])) {
             return;
         }
 
-        $paymentModel = $this->readPaymentModelArgument($observer);
+        if($this->customerSession->isLoggedIn() && $this->isPayflowProVaultEnable()) {
+            if (!isset($additionalData[self::IS_ACTIVE_PAYMENT_TOKEN_ENABLER])) {
+                throw new GraphQlInputException(
+                    __('Required parameter "is_active_payment_token_enabler" is missing.')
+                );
+            }
+
+            $paymentModel->setData(
+                self::IS_ACTIVE_PAYMENT_TOKEN_ENABLER,
+                $additionalData[self::IS_ACTIVE_PAYMENT_TOKEN_ENABLER]
+            );
+        } else {
+            $paymentModel->setData(self::IS_ACTIVE_PAYMENT_TOKEN_ENABLER, false);
+        }
+
         foreach ($additionalData['cc_details'] as $ccKey => $ccValue) {
             $paymentModel->setData($ccKey, $ccValue);
         }
     }
+
+    /**
+     * Check if payflowpro vault is enable
+     *
+     * @return bool
+     */
+    private function isPayflowProVaultEnable()
+    {
+        return (bool)$this->scopeConfig->getValue(self::XML_PATH_PAYMENT_PAYFLOWPRO_CC_VAULT_ACTIVE);
+    }
 }
diff --git a/app/code/Magento/PaypalGraphQl/etc/schema.graphqls b/app/code/Magento/PaypalGraphQl/etc/schema.graphqls
index b925aba293209..e5adb6f25b1c2 100644
--- a/app/code/Magento/PaypalGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/PaypalGraphQl/etc/schema.graphqls
@@ -103,7 +103,7 @@ input PayflowProTokenInput @doc(description:"Input required to fetch payment tok
 
 input PayflowProInput @doc(description:"Required input for Payflow Pro and Payments Pro payment methods.") {
     cc_details: CreditCardDetailsInput! @doc(description: "Required input for credit card related information")
-    is_active_payment_token_enabler: Boolean! @doc(description:"States whether an entered by a customer credit/debit card should be tokenized for later usage. Required only if Vault is enabled for PayPal Payflow Pro payment integration.")
+    is_active_payment_token_enabler: Boolean @doc(description:"States whether an entered by a customer credit/debit card should be tokenized for later usage. Required only if Vault is enabled for PayPal Payflow Pro payment integration.")
 }
 
 input CreditCardDetailsInput @doc(description:"Required fields for Payflow Pro and Payments Pro credit card payments") {
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowProTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowProTest.php
index 8ad5e4d98c24e..6a8b6cbc4df61 100644
--- a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowProTest.php
+++ b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowProTest.php
@@ -77,6 +77,7 @@ public function testResolveCustomer(): void
         payment_method: {
           code: "{$paymentMethod}",
             payflowpro: {
+              is_active_payment_token_enabler: true
               cc_details: {
                  cc_exp_month: 12,
                  cc_exp_year: 2030,

From 76e011a981d2ab38e6d23763e55dd53c2859fbcf Mon Sep 17 00:00:00 2001
From: Oleksandr Dubovyk <odubovyk@magento.com>
Date: Mon, 22 Jun 2020 20:55:57 -0500
Subject: [PATCH 0552/1718] MC-31085: Add/Edit Product | Duplicating ".00"
 zeros on saves

- fixed
- modified test
---
 .../Magento/Framework/Locale/Format.php       | 34 +++++++++++++++++++
 .../Framework/Locale/Test/Unit/FormatTest.php |  2 ++
 2 files changed, 36 insertions(+)

diff --git a/lib/internal/Magento/Framework/Locale/Format.php b/lib/internal/Magento/Framework/Locale/Format.php
index 934c9638c7392..e332840327bf7 100644
--- a/lib/internal/Magento/Framework/Locale/Format.php
+++ b/lib/internal/Magento/Framework/Locale/Format.php
@@ -15,6 +15,17 @@ class Format implements \Magento\Framework\Locale\FormatInterface
      */
     private const JAPAN_LOCALE_CODE = 'ja_JP';
 
+    /**
+     * Arab locale code
+     */
+    private const ARABIC_LOCALE_CODES = [
+        'ar_DZ',
+        'ar_EG',
+        'ar_KW',
+        'ar_MA',
+        'ar_SA',
+    ];
+
     /**
      * @var \Magento\Framework\App\ScopeResolverInterface
      */
@@ -73,6 +84,11 @@ public function getNumber($value)
             return (float)$value;
         }
 
+        /** Normalize for Arabic locale */
+        if (in_array($this->_localeResolver->getLocale(), self::ARABIC_LOCALE_CODES)) {
+            $value = $this->normalizeArabicLocale($value);
+        }
+
         //trim spaces and apostrophes
         $value = preg_replace('/[^0-9^\^.,-]/m', '', $value);
 
@@ -163,4 +179,22 @@ public function getPriceFormat($localeCode = null, $currencyCode = null)
 
         return $result;
     }
+
+    /**
+     * Normalizes the number of Arabic locale.
+     *
+     * Substitutes Arabic thousands grouping and Arabic decimal separator symbols (U+066C, U+066B)
+     * with common grouping and decimal separator
+     *
+     * @param string $value
+     * @return string
+     */
+    private function normalizeArabicLocale($value): string
+    {
+        $arabicGroupSymbol = '٬';
+        $arabicDecimalSymbol = '٫';
+        $value = str_replace([$arabicGroupSymbol, $arabicDecimalSymbol], [',', '.'], $value);
+
+        return $value;
+    }
 }
diff --git a/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php b/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php
index a204a733dc848..9c992ecff245c 100644
--- a/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php
+++ b/lib/internal/Magento/Framework/Locale/Test/Unit/FormatTest.php
@@ -146,6 +146,8 @@ public function provideNumbers(): array
             ['2,054.00', 2054],
             ['4,000', 4000.0, 'ja_JP'],
             ['4,000', 4.0, 'en_US'],
+            ['2٬599٫50', 2599.50, 'ar_EG'],
+            ['2٬000٬000٫99', 2000000.99, 'ar_SA'],
         ];
     }
 }

From 6085e89e65bce88b4878ac2d6b5efdba4edf660a Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@magento.com>
Date: Mon, 22 Jun 2020 23:42:42 -0500
Subject: [PATCH 0553/1718] MC-31618: Move static config to files - PLUGIN_LIST

- Fix integration tests;
---
 .../TestFramework/Interception/PluginList.php | 12 +++++++++--
 .../Framework/Interception/AbstractPlugin.php | 11 ++++++++++
 .../Framework/Interception/ConfigLoader.php   |  6 +++++-
 .../Framework/Interception/ConfigWriter.php   |  5 ++++-
 .../Interception/ConfigWriterInterface.php    |  2 +-
 .../Interception/PluginList/PluginList.php    | 20 +++++++++----------
 .../Console/Command/DiCompileCommandTest.php  |  5 +++--
 7 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/dev/tests/integration/framework/Magento/TestFramework/Interception/PluginList.php b/dev/tests/integration/framework/Magento/TestFramework/Interception/PluginList.php
index 88c9086f8270b..5bad5acf51b37 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Interception/PluginList.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Interception/PluginList.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\TestFramework\Interception;
 
+use Magento\Framework\Interception\ConfigLoaderInterface;
+use Magento\Framework\Interception\ConfigWriterInterface;
 use Magento\Framework\Serialize\SerializerInterface;
 
 /**
@@ -31,6 +33,8 @@ class PluginList extends \Magento\Framework\Interception\PluginList\PluginList
      * @param array $scopePriorityScheme
      * @param string|null $cacheId
      * @param SerializerInterface|null $serializer
+     * @param ConfigLoaderInterface|null $configLoader
+     * @param ConfigWriterInterface|null $configWriter
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -44,7 +48,9 @@ public function __construct(
         \Magento\Framework\ObjectManager\DefinitionInterface $classDefinitions,
         array $scopePriorityScheme,
         $cacheId = 'plugins',
-        SerializerInterface $serializer = null
+        SerializerInterface $serializer = null,
+        ConfigLoaderInterface $configLoader = null,
+        ConfigWriterInterface $configWriter = null
     ) {
         parent::__construct(
             $reader,
@@ -57,7 +63,9 @@ public function __construct(
             $classDefinitions,
             $scopePriorityScheme,
             $cacheId,
-            $serializer
+            $serializer,
+            $configLoader,
+            $configWriter
         );
         $this->_originScopeScheme = $this->_scopePriorityScheme;
     }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/AbstractPlugin.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/AbstractPlugin.php
index 1f65bca8f5f1d..e05ed274d097a 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Interception/AbstractPlugin.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/AbstractPlugin.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Framework\Interception;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
+
 /**
  * Class GeneralTest
  *
@@ -81,6 +83,10 @@ public function setUpInterceptionConfig($pluginConfig)
         $cacheManager->method('load')->willReturn(null);
         $definitions = new \Magento\Framework\ObjectManager\Definition\Runtime();
         $relations = new \Magento\Framework\ObjectManager\Relations\Runtime();
+        $dirList = new DirectoryList(DirectoryList::GENERATED_METADATA);
+        $configLoader = new \Magento\Framework\Interception\ConfigLoader($dirList);
+        $logger = $this->createMock(\Psr\Log\LoggerInterface::class);
+        $configWriter = $this->createMock(\Magento\Framework\App\ObjectManager\ConfigWriterInterface::class);
         $interceptionConfig = new Config\Config(
             $this->_configReader,
             $configScope,
@@ -104,6 +110,9 @@ public function setUpInterceptionConfig($pluginConfig)
             \Magento\Framework\ObjectManager\DefinitionInterface::class          => $definitions,
             \Magento\Framework\Interception\DefinitionInterface::class           => $interceptionDefinitions,
             \Magento\Framework\Serialize\SerializerInterface::class              => $json,
+            \Magento\Framework\Interception\ConfigLoaderInterface::class         => $configLoader,
+            \Psr\Log\LoggerInterface::class                                      => $logger,
+            \Magento\Framework\App\ObjectManager\ConfigWriterInterface::class    => $configWriter
         ];
         $this->_objectManager = new \Magento\Framework\ObjectManager\ObjectManager(
             $factory,
@@ -120,6 +129,8 @@ public function setUpInterceptionConfig($pluginConfig)
                         \Magento\Framework\Interception\PluginList\PluginList::class,
                     \Magento\Framework\Interception\ChainInterface::class =>
                         \Magento\Framework\Interception\Chain\Chain::class,
+                    \Magento\Framework\Interception\ConfigWriterInterface::class =>
+                        \Magento\Framework\Interception\ConfigWriter::class
                 ],
             ]
         );
diff --git a/lib/internal/Magento/Framework/Interception/ConfigLoader.php b/lib/internal/Magento/Framework/Interception/ConfigLoader.php
index 6772f981c542d..c83c5d8c2bcbd 100644
--- a/lib/internal/Magento/Framework/Interception/ConfigLoader.php
+++ b/lib/internal/Magento/Framework/Interception/ConfigLoader.php
@@ -25,7 +25,11 @@ public function __construct(
     }
 
     /**
-     * @inheritDoc
+     * Load interception configuration data per scope.
+     *
+     * @param string $cacheId
+     * @return array
+     * @throws \Magento\Framework\Exception\FileSystemException
      */
     public function load($cacheId)
     {
diff --git a/lib/internal/Magento/Framework/Interception/ConfigWriter.php b/lib/internal/Magento/Framework/Interception/ConfigWriter.php
index 6a3fbc95fcb78..050513a55f07d 100644
--- a/lib/internal/Magento/Framework/Interception/ConfigWriter.php
+++ b/lib/internal/Magento/Framework/Interception/ConfigWriter.php
@@ -143,7 +143,10 @@ public function __construct(
     }
 
     /**
-     * @inheritDoc
+     * Write interception configuration for scopes.
+     *
+     * @param array $scopes
+     * @return void
      */
     public function write($scopes)
     {
diff --git a/lib/internal/Magento/Framework/Interception/ConfigWriterInterface.php b/lib/internal/Magento/Framework/Interception/ConfigWriterInterface.php
index 79f891ccbb3f1..635833cf4f8d3 100644
--- a/lib/internal/Magento/Framework/Interception/ConfigWriterInterface.php
+++ b/lib/internal/Magento/Framework/Interception/ConfigWriterInterface.php
@@ -14,7 +14,7 @@ interface ConfigWriterInterface
      * Write interception configuration for scopes.
      *
      * @param array $scopes
-     * @return array
+     * @return void
      */
     public function write($scopes);
 }
diff --git a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
index 096e58ab3a273..9acc8c547ae7f 100644
--- a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
+++ b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
@@ -9,6 +9,8 @@
 use Magento\Framework\Config\Data\Scoped;
 use Magento\Framework\Config\ReaderInterface;
 use Magento\Framework\Config\ScopeInterface;
+use Magento\Framework\Interception\ConfigLoaderInterface;
+use Magento\Framework\Interception\ConfigWriterInterface;
 use Magento\Framework\Interception\DefinitionInterface;
 use Magento\Framework\Interception\PluginListInterface as InterceptionPluginList;
 use Magento\Framework\Interception\ObjectManager\ConfigInterface;
@@ -17,8 +19,6 @@
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\Serialize\Serializer\Serialize;
-use Magento\Framework\Interception\ConfigLoader;
-use Magento\Framework\Interception\ConfigWriter;
 
 /**
  * Plugin config, provides list of plugins for a type
@@ -83,12 +83,12 @@ class PluginList extends Scoped implements InterceptionPluginList
     private $serializer;
 
     /**
-     * @var ConfigLoader
+     * @var ConfigLoaderInterface
      */
     private $configLoader;
 
     /**
-     * @var ConfigWriter
+     * @var ConfigWriterInterface
      */
     private $configWriter;
 
@@ -106,8 +106,8 @@ class PluginList extends Scoped implements InterceptionPluginList
      * @param array $scopePriorityScheme
      * @param string|null $cacheId
      * @param SerializerInterface|null $serializer
-     * @param ConfigLoader|null $configLoader
-     * @param ConfigWriter|null $configWriter
+     * @param ConfigLoaderInterface|null $configLoader
+     * @param ConfigWriterInterface|null $configWriter
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -122,8 +122,8 @@ public function __construct(
         array $scopePriorityScheme = ['global'],
         $cacheId = 'plugins',
         SerializerInterface $serializer = null,
-        ConfigLoader $configLoader = null,
-        ConfigWriter $configWriter = null
+        ConfigLoaderInterface $configLoader = null,
+        ConfigWriterInterface $configWriter = null
     ) {
         $this->serializer = $serializer ?: $objectManager->get(Serialize::class);
         parent::__construct($reader, $configScope, $cache, $cacheId, $this->serializer);
@@ -133,8 +133,8 @@ public function __construct(
         $this->_classDefinitions = $classDefinitions;
         $this->_scopePriorityScheme = $scopePriorityScheme;
         $this->_objectManager = $objectManager;
-        $this->configLoader = $configLoader ?: $this->_objectManager->get(ConfigLoader::class);
-        $this->configWriter = $configWriter ?: $this->_objectManager->get(ConfigWriter::class);
+        $this->configLoader = $configLoader ?: $this->_objectManager->get(ConfigLoaderInterface::class);
+        $this->configWriter = $configWriter ?: $this->_objectManager->get(ConfigWriterInterface::class);
     }
 
     /**
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/DiCompileCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/DiCompileCommandTest.php
index e269f89073dd7..a085eb0b20611 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/DiCompileCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/DiCompileCommandTest.php
@@ -160,7 +160,7 @@ public function testExecute()
             ->with(ProgressBar::class)
             ->willReturn($progressBar);
 
-        $this->managerMock->expects($this->exactly(8))->method('addOperation')
+        $this->managerMock->expects($this->exactly(9))->method('addOperation')
             ->withConsecutive(
                 [OperationFactory::PROXY_GENERATOR, []],
                 [OperationFactory::REPOSITORY_GENERATOR, $this->anything()],
@@ -178,7 +178,8 @@ public function testExecute()
                 [OperationFactory::INTERCEPTION, $this->anything()],
                 [OperationFactory::AREA_CONFIG_GENERATOR, $this->anything()],
                 [OperationFactory::INTERCEPTION_CACHE, $this->anything()],
-                [OperationFactory::APPLICATION_ACTION_LIST_GENERATOR, $this->anything()]
+                [OperationFactory::APPLICATION_ACTION_LIST_GENERATOR, $this->anything()],
+                [OperationFactory::PLUGIN_LIST_GENERATOR, $this->anything()]
             );
 
         $this->managerMock->expects($this->once())->method('process');

From aef0f96fdc93dbfe01817426178223b73aae5088 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Tue, 23 Jun 2020 10:01:49 +0300
Subject: [PATCH 0554/1718] fix static issues

---
 .../Magento/PaypalGraphQl/Observer/PayflowProSetCcData.php     | 3 ++-
 app/code/Magento/PaypalGraphQl/composer.json                   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/PaypalGraphQl/Observer/PayflowProSetCcData.php b/app/code/Magento/PaypalGraphQl/Observer/PayflowProSetCcData.php
index 9bb8dfc0589fa..d45db9ae45a32 100644
--- a/app/code/Magento/PaypalGraphQl/Observer/PayflowProSetCcData.php
+++ b/app/code/Magento/PaypalGraphQl/Observer/PayflowProSetCcData.php
@@ -53,6 +53,7 @@ public function __construct(
      * @param Observer $observer
      *
      * @throws GraphQlInputException
+     * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
      */
     public function execute(Observer $observer)
     {
@@ -64,7 +65,7 @@ public function execute(Observer $observer)
             return;
         }
 
-        if($this->customerSession->isLoggedIn() && $this->isPayflowProVaultEnable()) {
+        if ($this->customerSession->isLoggedIn() && $this->isPayflowProVaultEnable()) {
             if (!isset($additionalData[self::IS_ACTIVE_PAYMENT_TOKEN_ENABLER])) {
                 throw new GraphQlInputException(
                     __('Required parameter "is_active_payment_token_enabler" is missing.')
diff --git a/app/code/Magento/PaypalGraphQl/composer.json b/app/code/Magento/PaypalGraphQl/composer.json
index 8d012be3492dd..6cf790dcfc0f7 100644
--- a/app/code/Magento/PaypalGraphQl/composer.json
+++ b/app/code/Magento/PaypalGraphQl/composer.json
@@ -13,7 +13,8 @@
         "magento/module-quote-graph-ql": "*",
         "magento/module-sales": "*",
         "magento/module-payment": "*",
-        "magento/module-store": "*"
+        "magento/module-store": "*",
+        "magento/module-customer": "*"
     },
     "suggest": {
         "magento/module-graph-ql": "*"

From 0ac4bb155f2052ac35d52d1b3d404a54a6c6ba64 Mon Sep 17 00:00:00 2001
From: Munkh-Ulzii Balidar <mbalidar@comwrap.com>
Date: Tue, 23 Jun 2020 09:37:38 +0200
Subject: [PATCH 0555/1718] 28584 revert setting searchresult total count

---
 .../Model/Resolver/Products/DataProvider/ProductSearch.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 298cfd2b0e99c..4c83afb89cc46 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php
@@ -110,7 +110,7 @@ public function getList(
         $searchResults = $this->searchResultsFactory->create();
         $searchResults->setSearchCriteria($searchCriteriaForCollection);
         $searchResults->setItems($collection->getItems());
-        $searchResults->setTotalCount($collection->getSize());
+        $searchResults->setTotalCount($searchResult->getTotalCount());
         return $searchResults;
     }
 

From 5ba8fd7888ccc2658616fa8897ca9dff58265198 Mon Sep 17 00:00:00 2001
From: Michal Derlatka <michal.derlatka1@gmail.com>
Date: Tue, 23 Jun 2020 10:23:21 +0200
Subject: [PATCH 0556/1718] magento/magento2#28561: GraphQL added CORS headers
 (static test fix)

---
 .../CorsAllowCredentialsHeaderProvider.php    | 24 ++++++++++++-
 .../Cors/CorsAllowHeadersHeaderProvider.php   | 22 ++++++++++++
 .../Cors/CorsAllowMethodsHeaderProvider.php   | 15 ++++++++
 .../Cors/CorsAllowOriginHeaderProvider.php    | 15 ++++++++
 .../Cors/CorsMaxAgeHeaderProvider.php         | 15 ++++++++
 .../GraphQl/Model/Cors/Configuration.php      | 36 +++++++++++++++++--
 .../Model/Cors/ConfigurationInterface.php     | 30 ++++++++++++++++
 app/code/Magento/GraphQl/etc/config.xml       |  6 ++++
 .../Magento/GraphQl/CorsHeadersTest.php       |  6 +++-
 9 files changed, 165 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowCredentialsHeaderProvider.php b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowCredentialsHeaderProvider.php
index 086cf2bbef877..39edeb8e6667b 100644
--- a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowCredentialsHeaderProvider.php
+++ b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowCredentialsHeaderProvider.php
@@ -15,6 +15,9 @@
  */
 class CorsAllowCredentialsHeaderProvider implements HeaderProviderInterface
 {
+    /**
+     * @var string
+     */
     private $headerName;
 
     /**
@@ -24,6 +27,10 @@ class CorsAllowCredentialsHeaderProvider implements HeaderProviderInterface
      */
     private $corsConfiguration;
 
+    /**
+     * @param ConfigurationInterface $corsConfiguration
+     * @param string $headerName
+     */
     public function __construct(
         ConfigurationInterface $corsConfiguration,
         string $headerName
@@ -32,16 +39,31 @@ public function __construct(
         $this->headerName = $headerName;
     }
 
+    /**
+     * Get name of header
+     *
+     * @return string
+     */
     public function getName()
     {
         return $this->headerName;
     }
 
+    /**
+     * Get value for header
+     *
+     * @return string
+     */
     public function getValue()
     {
-        return true;
+        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
index 26df47cb1e312..e07cb70644441 100644
--- a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowHeadersHeaderProvider.php
+++ b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowHeadersHeaderProvider.php
@@ -15,6 +15,9 @@
  */
 class CorsAllowHeadersHeaderProvider implements HeaderProviderInterface
 {
+    /**
+     * @var string
+     */
     private $headerName;
 
     /**
@@ -24,6 +27,10 @@ class CorsAllowHeadersHeaderProvider implements HeaderProviderInterface
      */
     private $corsConfiguration;
 
+    /**
+     * @param ConfigurationInterface $corsConfiguration
+     * @param string $headerName
+     */
     public function __construct(
         ConfigurationInterface $corsConfiguration,
         string $headerName
@@ -32,16 +39,31 @@ public function __construct(
         $this->headerName = $headerName;
     }
 
+    /**
+     * Get name of header
+     *
+     * @return string
+     */
     public function getName()
     {
         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
+     */
     public function getValue()
     {
         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
index d2b2994367883..35edca3e90615 100644
--- a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowMethodsHeaderProvider.php
+++ b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowMethodsHeaderProvider.php
@@ -32,16 +32,31 @@ public function __construct(
         $this->headerName = $headerName;
     }
 
+    /**
+     * Get name of header
+     *
+     * @return string
+     */
     public function getName()
     {
         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
+     */
     public function getValue()
     {
         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
index 0cdc976525a7d..b6c3641e8580c 100644
--- a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowOriginHeaderProvider.php
+++ b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowOriginHeaderProvider.php
@@ -32,16 +32,31 @@ public function __construct(
         $this->headerName = $headerName;
     }
 
+    /**
+     * Get name of header
+     *
+     * @return string
+     */
     public function getName()
     {
         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
+     */
     public function getValue()
     {
         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
index 065138dcd7936..46a2f44d8ea38 100644
--- a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsMaxAgeHeaderProvider.php
+++ b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsMaxAgeHeaderProvider.php
@@ -32,16 +32,31 @@ public function __construct(
         $this->headerName = $headerName;
     }
 
+    /**
+     * Get name of header
+     *
+     * @return string
+     */
     public function getName()
     {
         return $this->headerName;
     }
 
+    /**
+     * Check if header can be applied
+     *
+     * @return bool
+     */
     public function canApply()
     {
         return $this->corsConfiguration->isEnabled() && $this->getValue();
     }
 
+    /**
+     * Get value for header
+     *
+     * @return string
+     */
     public function getValue()
     {
         return $this->corsConfiguration->getMaxAge();
diff --git a/app/code/Magento/GraphQl/Model/Cors/Configuration.php b/app/code/Magento/GraphQl/Model/Cors/Configuration.php
index cddc3f2ae9653..b06d63832b8d2 100644
--- a/app/code/Magento/GraphQl/Model/Cors/Configuration.php
+++ b/app/code/Magento/GraphQl/Model/Cors/Configuration.php
@@ -24,41 +24,73 @@ class Configuration implements ConfigurationInterface
     /**
      * @var ScopeConfigInterface
      */
-    protected $scopeConfig;
+    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
index ef298f2d9cfda..9e54e979323fa 100644
--- a/app/code/Magento/GraphQl/Model/Cors/ConfigurationInterface.php
+++ b/app/code/Magento/GraphQl/Model/Cors/ConfigurationInterface.php
@@ -12,15 +12,45 @@
  */
 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/config.xml b/app/code/Magento/GraphQl/etc/config.xml
index 76a1fac199582..39caacbec42d2 100644
--- a/app/code/Magento/GraphQl/etc/config.xml
+++ b/app/code/Magento/GraphQl/etc/config.xml
@@ -1,4 +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:module:Magento_Store:etc/config.xsd">
     <default>
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CorsHeadersTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CorsHeadersTest.php
index 8110937468280..3628d3e4bca32 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/CorsHeadersTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CorsHeadersTest.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
 
 namespace Magento\GraphQl;
 
@@ -15,7 +20,6 @@ class CorsHeadersTest extends GraphQlAbstract
      * @var Config $config
      */
     private $resourceConfig;
-
     /**
      * @var ReinitableConfigInterface
      */

From e82cca43cfc3786148d3bd2a2a660cae1e00161e Mon Sep 17 00:00:00 2001
From: Michal Derlatka <michal.derlatka1@gmail.com>
Date: Tue, 23 Jun 2020 11:50:54 +0200
Subject: [PATCH 0557/1718] magento/magento2#28561: GraphQL added CORS headers
 (static test fix)

---
 .../HttpResponse/Cors/CorsAllowMethodsHeaderProvider.php      | 4 ++++
 .../HttpResponse/Cors/CorsAllowOriginHeaderProvider.php       | 4 ++++
 .../Controller/HttpResponse/Cors/CorsMaxAgeHeaderProvider.php | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowMethodsHeaderProvider.php b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowMethodsHeaderProvider.php
index 35edca3e90615..654cacfeb4633 100644
--- a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowMethodsHeaderProvider.php
+++ b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowMethodsHeaderProvider.php
@@ -24,6 +24,10 @@ class CorsAllowMethodsHeaderProvider implements HeaderProviderInterface
      */
     private $corsConfiguration;
 
+    /**
+     * @param ConfigurationInterface $corsConfiguration
+     * @param string $headerName
+     */
     public function __construct(
         ConfigurationInterface $corsConfiguration,
         string $headerName
diff --git a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowOriginHeaderProvider.php b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowOriginHeaderProvider.php
index b6c3641e8580c..7ecc06376ca04 100644
--- a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowOriginHeaderProvider.php
+++ b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowOriginHeaderProvider.php
@@ -24,6 +24,10 @@ class CorsAllowOriginHeaderProvider implements HeaderProviderInterface
      */
     private $corsConfiguration;
 
+    /**
+     * @param ConfigurationInterface $corsConfiguration
+     * @param string $headerName
+     */
     public function __construct(
         ConfigurationInterface $corsConfiguration,
         string $headerName
diff --git a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsMaxAgeHeaderProvider.php b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsMaxAgeHeaderProvider.php
index 46a2f44d8ea38..7221cd252fab0 100644
--- a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsMaxAgeHeaderProvider.php
+++ b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsMaxAgeHeaderProvider.php
@@ -24,6 +24,10 @@ class CorsMaxAgeHeaderProvider implements HeaderProviderInterface
      */
     private $corsConfiguration;
 
+    /**
+     * @param ConfigurationInterface $corsConfiguration
+     * @param string $headerName
+     */
     public function __construct(
         ConfigurationInterface $corsConfiguration,
         string $headerName

From dee50092ec72e5265ced5250aa8842c20fe7a0f6 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Tue, 23 Jun 2020 13:30:49 +0300
Subject: [PATCH 0558/1718] Fix static issue

---
 app/code/Magento/PaypalGraphQl/Observer/PayflowProSetCcData.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/PaypalGraphQl/Observer/PayflowProSetCcData.php b/app/code/Magento/PaypalGraphQl/Observer/PayflowProSetCcData.php
index d45db9ae45a32..54d4986d9e1d6 100644
--- a/app/code/Magento/PaypalGraphQl/Observer/PayflowProSetCcData.php
+++ b/app/code/Magento/PaypalGraphQl/Observer/PayflowProSetCcData.php
@@ -17,6 +17,7 @@
 
 /**
  * Class PayflowProSetCcData set CcData to quote payment
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class PayflowProSetCcData extends AbstractDataAssignObserver
 {
@@ -53,7 +54,6 @@ public function __construct(
      * @param Observer $observer
      *
      * @throws GraphQlInputException
-     * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
      */
     public function execute(Observer $observer)
     {

From ed1a21e3f9cf14b4c5cf805eeea90881fb1c559a Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Tue, 23 Jun 2020 14:10:02 +0300
Subject: [PATCH 0559/1718] add MFTF test

---
 ...uyXGetYFreeWithApplyShippingAmountTest.xml | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateBuyXGetYFreeWithApplyShippingAmountTest.xml

diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateBuyXGetYFreeWithApplyShippingAmountTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateBuyXGetYFreeWithApplyShippingAmountTest.xml
new file mode 100644
index 0000000000000..602e2a3544e96
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateBuyXGetYFreeWithApplyShippingAmountTest.xml
@@ -0,0 +1,26 @@
+<?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="AdminCreateBuyXGetYFreeWithApplyShippingAmountTest" extends="AdminCreateBuyXGetYFreeTest">
+        <annotations>
+            <title value="Admin should be able to create a cart price rule of type Buy X get Y free enable 'Apply to Shipping Amount' "/>
+            <description value="Use cart price rule of type Buy X get Y free with enable 'Apply to Shipping Amount'"/>
+            <group value="SalesRule"/>
+        </annotations>
+
+        <remove keyForRemoval="verifyStorefront"/>
+        <click selector="{{AdminCartPriceRulesFormSection.applyDiscountToShippingLabel}}" stepKey="enabledApplyDiscountToShipping" after="fillDiscountStep"/>
+        <actionGroup ref="VerifyDiscountAmountActionGroup" stepKey="verifyStorefrontDiscount" after="fillProductFieldsInAdmin">
+            <argument name="productUrl" value="{{_defaultProduct.urlKey}}.html"/>
+            <argument name="quantity" value="2"/>
+            <argument name="expectedDiscount" value="-$128.00"/>
+        </actionGroup>
+    </test>
+</tests>

From 70809f9eaae4a0ad129cbdf929ee39039ee3e9bd Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Tue, 23 Jun 2020 14:32:31 +0300
Subject: [PATCH 0560/1718] fix integration test

---
 .../Console/Command/ConfigShowCommandTest.php | 78 +++++++++++++++----
 1 file changed, 62 insertions(+), 16 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigShowCommandTest.php b/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigShowCommandTest.php
index e7f714250f2c8..4906014ad1903 100644
--- a/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigShowCommandTest.php
+++ b/dev/tests/integration/testsuite/Magento/Config/Console/Command/ConfigShowCommandTest.php
@@ -6,24 +6,23 @@
 
 namespace Magento\Config\Console\Command;
 
+use Magento\Config\Model\Config\Structure;
 use Magento\Framework\App\DeploymentConfig\FileReader;
 use Magento\Framework\App\DeploymentConfig\Writer;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\Console\Cli;
 use Magento\Framework\Filesystem;
-use Magento\Framework\ObjectManagerInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Tester\CommandTester;
 
-class ConfigShowCommandTest extends \PHPUnit\Framework\TestCase
+/**
+ * Test for \Magento\Config\Console\Command\ConfigShowCommand.
+ */
+class ConfigShowCommandTest extends TestCase
 {
-    /**
-     * @var ObjectManagerInterface
-     */
-    private $objectManager;
-
     /**
      * @var CommandTester
      */
@@ -64,16 +63,22 @@ class ConfigShowCommandTest extends \PHPUnit\Framework\TestCase
      */
     private $envConfig;
 
+    /**
+     * @var Structure
+     */
+    private $structure;
+
     /**
      * @inheritdoc
      */
     protected function setUp(): void
     {
-        $this->objectManager = Bootstrap::getObjectManager();
-        $this->configFilePool = $this->objectManager->get(ConfigFilePool::class);
-        $this->filesystem = $this->objectManager->get(Filesystem::class);
-        $this->reader = $this->objectManager->get(FileReader::class);
-        $this->writer = $this->objectManager->get(Writer::class);
+        $objectManager = Bootstrap::getObjectManager();
+        $this->configFilePool = $objectManager->get(ConfigFilePool::class);
+        $this->filesystem = $objectManager->get(Filesystem::class);
+        $this->reader = $objectManager->get(FileReader::class);
+        $this->writer = $objectManager->get(Writer::class);
+        $this->structure = $objectManager->get(Structure::class);
 
         $this->config = $this->loadConfig();
         $this->envConfig = $this->loadEnvConfig();
@@ -89,21 +94,27 @@ protected function setUp(): void
         $_ENV['CONFIG__WEBSITES__BASE__WEB__TEST2__TEST_VALUE_4'] = 'value4.env.website_base.test';
         $_ENV['CONFIG__STORES__DEFAULT__WEB__TEST2__TEST_VALUE_4'] = 'value4.env.store_default.test';
 
-        $command = $this->objectManager->create(ConfigShowCommand::class);
+        $command = $objectManager->create(ConfigShowCommand::class);
         $this->commandTester = new CommandTester($command);
     }
 
     /**
+     * Test execute config show command
+     *
      * @param string $scope
      * @param string $scopeCode
      * @param int $resultCode
      * @param array $configs
+     * @return void
+     *
      * @magentoDbIsolation enabled
      * @magentoDataFixture Magento/Config/_files/config_data.php
      * @dataProvider executeDataProvider
      */
-    public function testExecute($scope, $scopeCode, $resultCode, array $configs)
+    public function testExecute($scope, $scopeCode, $resultCode, array $configs): void
     {
+        $this->setConfigPaths();
+
         foreach ($configs as $inputPath => $configValue) {
             $arguments = [
                 ConfigShowCommand::INPUT_ARGUMENT_PATH => $inputPath
@@ -130,6 +141,41 @@ public function testExecute($scope, $scopeCode, $resultCode, array $configs)
         }
     }
 
+    /**
+     * Set config paths to structure
+     *
+     * @return void
+     */
+    private function setConfigPaths(): void
+    {
+        $reflection = new \ReflectionClass(Structure::class);
+        $mappedPaths = $reflection->getProperty('mappedPaths');
+        $mappedPaths->setAccessible(true);
+        $mappedPaths->setValue($this->structure, $this->getConfigPaths());
+    }
+
+    /**
+     * Returns config paths
+     *
+     * @return array
+     */
+    private function getConfigPaths(): array
+    {
+        $configs = [
+            'web/test/test_value_1',
+            'web/test/test_value_2',
+            'web/test2/test_value_3',
+            'web/test2/test_value_4',
+            'carriers/fedex/account',
+            'paypal/fetch_reports/ftp_password',
+            'web/test',
+            'web/test2',
+            'web',
+        ];
+
+        return array_flip($configs);
+    }
+
     /**
      * @return array
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
@@ -240,7 +286,7 @@ public function executeDataProvider()
                 Cli::RETURN_FAILURE,
                 [
                     'web/test/test_wrong_value' => [
-                        'Configuration for path: "web/test/test_wrong_value" doesn\'t exist'
+                        'The "web/test/test_wrong_value" path doesn\'t exist. Verify and try again.'
                     ],
                 ]
             ],
@@ -250,7 +296,7 @@ public function executeDataProvider()
                 Cli::RETURN_FAILURE,
                 [
                     'web/test/test_wrong_value' => [
-                        'Configuration for path: "web/test/test_wrong_value" doesn\'t exist'
+                        'The "web/test/test_wrong_value" path doesn\'t exist. Verify and try again.'
                     ],
                 ]
             ],

From 42889f84a5f95a717887ae61314988605bbdd3be Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Tue, 23 Jun 2020 14:36:41 +0300
Subject: [PATCH 0561/1718] uses magento validation rule

---
 .../Test/StorefrontOnePageCheckoutPhoneValidationTest.xml  | 2 +-
 .../Checkout/view/frontend/layout/checkout_index_index.xml | 2 +-
 .../Magento/Ui/view/base/web/js/lib/validation/rules.js    | 7 -------
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutPhoneValidationTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutPhoneValidationTest.xml
index 1558b4dc3943c..38b946892677c 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutPhoneValidationTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutPhoneValidationTest.xml
@@ -38,6 +38,6 @@
         <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, 123-456-7890, +(123)4567890, +1234567890" selector="{{CheckoutShippingSection.addressFieldValidationError}}" stepKey="checkPhoneFieldValidationIsPassed"/>
+        <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 3b67c9a7ead79..ab058110fe66f 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
@@ -224,7 +224,7 @@
                                                                     </item>
                                                                     <item name="telephone" xsi:type="array">
                                                                         <item name="validation" xsi:type="array">
-                                                                            <item name="validate-phone" xsi:type="number">0</item>
+                                                                            <item name="validate-phoneStrict" xsi:type="number">0</item>
                                                                         </item>
                                                                         <item name="config" xsi:type="array">
                                                                             <item name="tooltip" xsi:type="array">
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js b/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js
index 3cb30e0d21ab1..f9778ad8d688c 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js
@@ -432,13 +432,6 @@ define([
             },
             $.mage.__('Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890.')
         ],
-        'validate-phone': [
-            function (value) {
-                return utils.isEmptyNoTrim(value) ||
-                    /^[+]*[(]{0,1}[0-9]{1,4}[)]{0,1}[-\s\.\/0-9]*$/.test(value);
-            },
-            $.mage.__('Please enter a valid phone number. For example (123) 456-7890, 123-456-7890, +(123)4567890, +1234567890')//eslint-disable-line max-len
-        ],
         'validate-fax': [
             function (value) {
                 return utils.isEmptyNoTrim(value) || /^(\()?\d{3}(\))?(-|\s)?\d{3}(-|\s)\d{4}$/.test(value);

From e76f1c567296d4019cbc94a561e9a22f17a5f0e7 Mon Sep 17 00:00:00 2001
From: Oleksandr Melnyk <sasha19957099@gmail.com>
Date: Tue, 23 Jun 2020 15:35:18 +0300
Subject: [PATCH 0562/1718] magento/magento2#28579:DependencyTest does not
 analyze GraphQL schema files - added requested changes

---
 .../Integrity/DeclarativeDependencyTest.php   |  11 +-
 .../DeclarativeSchemaDependencyProvider.php   |  82 +++++++-------
 .../Dependency/DependencyProvider.php         | 103 +++++++++---------
 .../GraphQlSchemaDependencyProvider.php       |  61 ++++++-----
 .../Magento/Test/Integrity/DependencyTest.php |   8 +-
 .../Test/Integrity/GraphQlDependencyTest.php  |  15 ++-
 .../GraphQlSchemaStitching/GraphQlReader.php  |  15 +--
 7 files changed, 152 insertions(+), 143 deletions(-)

diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php
index a5d9f9be41d23..10ce22b8c026f 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php
@@ -25,7 +25,7 @@ class DeclarativeDependencyTest extends \PHPUnit\Framework\TestCase
     /**
      * Sets up data
      *
-     * @throws \Exception
+     * @throws \Magento\TestFramework\Inspection\Exception
      */
     protected function setUp(): void
     {
@@ -37,11 +37,12 @@ protected function setUp(): void
                 'MAGETWO-43654: The build is running from vendor/magento. DependencyTest is skipped.'
             );
         }
-        $this->dependencyProvider = new DeclarativeSchemaDependencyProvider();
+        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+        $this->dependencyProvider = $objectManager->create(DeclarativeSchemaDependencyProvider::class);
     }
 
     /**
-     * @throws \Exception
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function testUndeclaredDependencies()
     {
@@ -131,14 +132,14 @@ private function getErrorMessage(string $id): string
      *
      * @param string $file
      * @return mixed
-     * @throws \Exception
+     * @throws \Magento\TestFramework\Inspection\Exception
      */
     private function readJsonFile(string $file, bool $asArray = false)
     {
         $decodedJson = json_decode(file_get_contents($file), $asArray);
         if (null == $decodedJson) {
             //phpcs:ignore Magento2.Exceptions.DirectThrow
-            throw new \Exception("Invalid Json: $file");
+            throw new \Magento\TestFramework\Inspection\Exception("Invalid Json: $file");
         }
 
         return $decodedJson;
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php
index 84b5533326b06..84de29e316b95 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php
@@ -17,7 +17,7 @@
  *
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  */
-class DeclarativeSchemaDependencyProvider extends DependencyProvider
+class DeclarativeSchemaDependencyProvider
 {
     /**
      * Declarative name for table entity of the declarative schema.
@@ -49,6 +49,16 @@ class DeclarativeSchemaDependencyProvider extends DependencyProvider
      */
     private $moduleSchemaFileMapping = [];
 
+    /**
+     * @var DependencyProvider
+     */
+    private $dependencyProvider;
+
+    public function __construct(DependencyProvider $dependencyProvider)
+    {
+        $this->dependencyProvider = $dependencyProvider;
+    }
+
     /**
      * Provide declared dependencies between modules based on the declarative schema configuration.
      *
@@ -58,10 +68,14 @@ class DeclarativeSchemaDependencyProvider extends DependencyProvider
      */
     public function getDeclaredExistingModuleDependencies(string $moduleName): array
     {
-        $this->initDeclaredDependencies();
+        $this->dependencyProvider->initDeclaredDependencies();
         $dependencies = $this->getDependenciesFromFiles($this->getSchemaFileNameByModuleName($moduleName));
         $dependencies = $this->filterSelfDependency($moduleName, $dependencies);
-        $declared = $this->getDeclaredDependencies($moduleName, self::TYPE_HARD, self::MAP_TYPE_DECLARED);
+        $declared = $this->dependencyProvider->getDeclaredDependencies(
+            $moduleName,
+            DependencyProvider::TYPE_HARD,
+            DependencyProvider::MAP_TYPE_DECLARED
+        );
 
         $existingDeclared = [];
         foreach ($dependencies as $dependency) {
@@ -89,7 +103,7 @@ public function getDeclaredExistingModuleDependencies(string $moduleName): array
      */
     public function getUndeclaredModuleDependencies(string $moduleName): array
     {
-        $this->initDeclaredDependencies();
+        $this->dependencyProvider->initDeclaredDependencies();
         $dependencies = $this->getDependenciesFromFiles($this->getSchemaFileNameByModuleName($moduleName));
         $dependencies = $this->filterSelfDependency($moduleName, $dependencies);
         return $this->collectDependencies($moduleName, $dependencies);
@@ -100,7 +114,7 @@ public function getUndeclaredModuleDependencies(string $moduleName): array
      *
      * @param string $module
      * @return string
-     * @throws \Exception
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     private function getSchemaFileNameByModuleName(string $module): string
     {
@@ -128,10 +142,10 @@ private function getSchemaFileNameByModuleName(string $module): string
      * @param array $dependencies
      * @return array
      */
-    private function filterSelfDependency(string $moduleName, array $dependencies):array
+    private function filterSelfDependency(string $moduleName, array $dependencies): array
     {
         foreach ($dependencies as $id => $modules) {
-            $decodedId = $this->decodeDependencyId($id);
+            $decodedId = self::decodeDependencyId($id);
             $entityType = $decodedId['entityType'];
             if ($entityType === self::SCHEMA_ENTITY_TABLE || $entityType === "column") {
                 if (array_search($moduleName, $modules) !== false) {
@@ -178,7 +192,7 @@ private function filterComplexDependency(string $moduleName, array $modules): ar
      * Retrieve declarative schema declaration.
      *
      * @return array
-     * @throws \Exception
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     private function getDeclarativeSchema(): array
     {
@@ -201,10 +215,9 @@ private function getDeclarativeSchema(): array
                 array_push($tableDeclaration['modules'], $moduleName);
                 $moduleDeclaration = array_replace_recursive(
                     $moduleDeclaration,
-                    [self::SCHEMA_ENTITY_TABLE =>
-                        [
-                            $tableName => $tableDeclaration,
-                        ]
+                    [self::SCHEMA_ENTITY_TABLE => [
+                        $tableName => $tableDeclaration,
+                    ]
                     ]
                 );
                 foreach ($entityTypes as $entityType) {
@@ -213,11 +226,9 @@ private function getDeclarativeSchema(): array
                     }
                     $moduleDeclaration = array_replace_recursive(
                         $moduleDeclaration,
-                        [self::SCHEMA_ENTITY_TABLE =>
-                            [
-                                $tableName =>
-                                    $this->addModuleAssigment($tableDeclaration, $entityType, $moduleName)
-                            ]
+                        [self::SCHEMA_ENTITY_TABLE => [
+                            $tableName => $this->addModuleAssigment($tableDeclaration, $entityType, $moduleName)
+                        ]
                         ]
                     );
                 }
@@ -236,7 +247,7 @@ private function getDeclarativeSchema(): array
      * @param string $entityType
      * @param null|string $entityName
      * @return array
-     * @throws \Exception
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     private function resolveEntityDependencies(string $tableName, string $entityType, ?string $entityName = null): array
     {
@@ -319,7 +330,7 @@ private function getDependenciesFromFiles($file)
      *
      * @param array $moduleDeclaration
      * @return array
-     * @throws \Exception
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     private function getDisabledDependencies(array $moduleDeclaration): array
     {
@@ -532,7 +543,7 @@ public static function decodeDependencyId(string $id): array
      * @param array $dependencies
      * @return array
      */
-    private function collectDependencies($currentModuleName, $dependencies = [])
+    private function collectDependencies($currentModuleName, $dependencies = []): array
     {
         if (empty($dependencies)) {
             return [];
@@ -541,7 +552,11 @@ private function collectDependencies($currentModuleName, $dependencies = [])
             $this->collectDependency($dependencyName, $dependency, $currentModuleName);
         }
 
-        return $this->getDeclaredDependencies($currentModuleName, self::TYPE_HARD, self::MAP_TYPE_FOUND);
+        return $this->dependencyProvider->getDeclaredDependencies(
+            $currentModuleName,
+            DependencyProvider::TYPE_HARD,
+            DependencyProvider::MAP_TYPE_FOUND
+        );
     }
 
     /**
@@ -556,31 +571,22 @@ private function collectDependency(
         array $dependency,
         string $currentModule
     ) {
-        $declared = $this->getDeclaredDependencies($currentModule, self::TYPE_HARD, self::MAP_TYPE_DECLARED);
+        $declared = $this->dependencyProvider->getDeclaredDependencies(
+            $currentModule,
+            DependencyProvider::TYPE_HARD,
+            DependencyProvider::MAP_TYPE_DECLARED
+        );
         $checkResult = array_intersect($declared, $dependency);
 
         if (empty($checkResult)) {
-            $this->addDependencies(
+            $this->dependencyProvider->addDependencies(
                 $currentModule,
-                self::TYPE_HARD,
-                self::MAP_TYPE_FOUND,
+                DependencyProvider::TYPE_HARD,
+                DependencyProvider::MAP_TYPE_FOUND,
                 [
                     $dependencyName => $dependency,
                 ]
             );
         }
     }
-
-    /**
-     * Retrieve array of dependency items.
-     *
-     * @param $module
-     * @param $type
-     * @param $mapType
-     * @return array
-     */
-    protected function getDeclaredDependencies(string $module, string $type, string $mapType)
-    {
-        return $this->mapDependencies[$module][$type][$mapType] ?? [];
-    }
 }
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DependencyProvider.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DependencyProvider.php
index a01a538e198a9..755d2dda0e08f 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DependencyProvider.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DependencyProvider.php
@@ -11,7 +11,7 @@
 use Magento\Framework\App\Utility\Files;
 use Magento\Framework\Component\ComponentRegistrar;
 
-abstract class DependencyProvider
+class DependencyProvider
 {
     /**
      * Types of dependency between modules.
@@ -31,41 +31,20 @@ abstract class DependencyProvider
     /**
      * @var array
      */
-    protected $mapDependencies = [];
+    private $mapDependencies = [];
 
     /**
      * @var array
      */
-    protected $packageModuleMapping = [];
-
-    /**
-     * Retrieve array of dependency items.
-     *
-     * @param $module
-     * @param $type
-     * @param $mapType
-     * @return array
-     */
-    abstract protected function getDeclaredDependencies(string $module, string $type, string $mapType);
-
-    /**
-     * @param string $moduleName
-     * @return array
-     */
-    abstract public function getDeclaredExistingModuleDependencies(string $moduleName): array;
-
-    /**
-     * @param string $moduleName
-     * @return array
-     */
-    abstract public function getUndeclaredModuleDependencies(string $moduleName): array;
+    private $packageModuleMapping = [];
 
     /**
      * Initialise map of dependencies.
      *
+     * @throws \Magento\TestFramework\Inspection\Exception
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    protected function initDeclaredDependencies()
+    public function initDeclaredDependencies()
     {
         if (empty($this->mapDependencies)) {
             $jsonFiles = Files::init()->getComposerFiles(ComponentRegistrar::MODULE, false);
@@ -78,6 +57,35 @@ protected function initDeclaredDependencies()
         }
     }
 
+    /**
+     * Add dependency map items.
+     *
+     * @param $module
+     * @param $type
+     * @param $mapType
+     * @param $dependencies
+     */
+    public function addDependencies(string $module, string $type, string $mapType, array $dependencies)
+    {
+        $this->mapDependencies[$module][$type][$mapType] = array_merge_recursive(
+            $this->getDeclaredDependencies($module, $type, $mapType),
+            $dependencies
+        );
+    }
+
+    /**
+     * Retrieve array of dependency items.
+     *
+     * @param $module
+     * @param $type
+     * @param $mapType
+     * @return array
+     */
+    public function getDeclaredDependencies(string $module, string $type, string $mapType): array
+    {
+        return $this->mapDependencies[$module][$type][$mapType] ?? [];
+    }
+
     /**
      * Add dependencies to dependency list.
      *
@@ -86,9 +94,10 @@ protected function initDeclaredDependencies()
      * @param string $type
      *
      * @return void
-     * @throws \Exception
+     * @throws \Magento\TestFramework\Inspection\Exception
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
-    protected function presetDependencies(string $moduleName, array $packageNames, string $type): void
+    private function presetDependencies(string $moduleName, array $packageNames, string $type): void
     {
         $packageNames = array_filter($packageNames, function ($packageName) {
             return $this->getModuleName($packageName) ||
@@ -108,9 +117,10 @@ protected function presetDependencies(string $moduleName, array $packageNames, s
     /**
      * @param string $jsonName
      * @return string
-     * @throws \Exception
+     * @throws \Magento\TestFramework\Inspection\Exception
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
-    protected function convertModuleName(string $jsonName): string
+    private function convertModuleName(string $jsonName): string
     {
         $moduleName = $this->getModuleName($jsonName);
         if ($moduleName) {
@@ -138,14 +148,13 @@ protected function convertModuleName(string $jsonName): string
      *
      * @param string $file
      * @return mixed
-     * @throws \Exception
+     * @throws \Magento\TestFramework\Inspection\Exception
      */
-    protected function readJsonFile(string $file, bool $asArray = false)
+    private function readJsonFile(string $file, bool $asArray = false)
     {
         $decodedJson = json_decode(file_get_contents($file), $asArray);
         if (null == $decodedJson) {
-            //phpcs:ignore Magento2.Exceptions.DirectThrow
-            throw new \Exception("Invalid Json: $file");
+            throw new \Magento\TestFramework\Inspection\Exception("Invalid Json: $file");
         }
 
         return $decodedJson;
@@ -156,9 +165,10 @@ protected function readJsonFile(string $file, bool $asArray = false)
      *
      * @param string $packageName
      * @return null|string
-     * @throws \Exception
+     * @throws \Magento\TestFramework\Inspection\Exception
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
-    protected function getModuleName(string $packageName): ?string
+    private function getModuleName(string $packageName): ?string
     {
         return $this->getPackageModuleMapping()[$packageName] ?? null;
     }
@@ -167,9 +177,10 @@ protected function getModuleName(string $packageName): ?string
      * Returns package name on module name mapping.
      *
      * @return array
-     * @throws \Exception
+     * @throws \Magento\TestFramework\Inspection\Exception
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
-    protected function getPackageModuleMapping(): array
+    private function getPackageModuleMapping(): array
     {
         if (!$this->packageModuleMapping) {
             $jsonFiles = Files::init()->getComposerFiles(ComponentRegistrar::MODULE, false);
@@ -188,20 +199,4 @@ protected function getPackageModuleMapping(): array
 
         return $this->packageModuleMapping;
     }
-
-    /**
-     * Add dependency map items.
-     *
-     * @param $module
-     * @param $type
-     * @param $mapType
-     * @param $dependencies
-     */
-    protected function addDependencies(string $module, string $type, string $mapType, array $dependencies)
-    {
-        $this->mapDependencies[$module][$type][$mapType] = array_merge_recursive(
-            $this->getDeclaredDependencies($module, $type, $mapType),
-            $dependencies
-        );
-    }
 }
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/GraphQlSchemaDependencyProvider.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/GraphQlSchemaDependencyProvider.php
index ada16c7a96bca..7d0b6f7c391a1 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/GraphQlSchemaDependencyProvider.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/GraphQlSchemaDependencyProvider.php
@@ -8,7 +8,6 @@
 
 namespace Magento\Test\Integrity\Dependency;
 
-use Magento\Framework\App\Bootstrap;
 use Magento\Framework\GraphQlSchemaStitching\GraphQlReader;
 use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\TypeReaderComposite;
 
@@ -17,18 +16,25 @@
  *
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  */
-class GraphQlSchemaDependencyProvider extends DependencyProvider
+class GraphQlSchemaDependencyProvider
 {
     /**
      * @var array
      */
     private $parsedSchema = [];
 
+    /**
+     * @var DependencyProvider
+     */
+    private $dependencyProvider;
+
     /**
      * GraphQlSchemaDependencyProvider constructor.
+     * @param DependencyProvider $dependencyProvider
      */
-    public function __construct()
+    public function __construct(DependencyProvider $dependencyProvider)
     {
+        $this->dependencyProvider = $dependencyProvider;
         $this->getGraphQlSchemaDeclaration();
     }
 
@@ -37,13 +43,18 @@ public function __construct()
      *
      * @param string $moduleName
      * @return array
-     * @throws \Exception
+     * @throws \Magento\TestFramework\Inspection\Exception
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getDeclaredExistingModuleDependencies(string $moduleName): array
     {
-        $this->initDeclaredDependencies();
+        $this->dependencyProvider->initDeclaredDependencies();
         $dependencies = $this->getDependenciesFromSchema($moduleName);
-        $declared = $this->getDeclaredDependencies($moduleName, self::TYPE_HARD, self::MAP_TYPE_DECLARED);
+        $declared = $this->dependencyProvider->getDeclaredDependencies(
+            $moduleName,
+            DependencyProvider::TYPE_HARD,
+            DependencyProvider::MAP_TYPE_DECLARED
+        );
         return array_unique(array_values(array_intersect($declared, $dependencies)));
     }
 
@@ -57,28 +68,16 @@ public function getDeclaredExistingModuleDependencies(string $moduleName): array
      *
      * @param string $moduleName
      * @return array
-     * @throws \Exception
+     * @throws \Magento\TestFramework\Inspection\Exception
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getUndeclaredModuleDependencies(string $moduleName): array
     {
-        $this->initDeclaredDependencies();
+        $this->dependencyProvider->initDeclaredDependencies();
         $dependencies = $this->getDependenciesFromSchema($moduleName);
         return $this->collectDependencies($moduleName, $dependencies);
     }
 
-    /**
-     * Retrieve array of dependency items.
-     *
-     * @param $module
-     * @param $type
-     * @param $mapType
-     * @return array
-     */
-    protected function getDeclaredDependencies(string $module, string $type, string $mapType): array
-    {
-        return $this->mapDependencies[$module][$type][$mapType] ?? [];
-    }
-
     /**
      * Get parsed GraphQl schema
      *
@@ -87,7 +86,7 @@ protected function getDeclaredDependencies(string $module, string $type, string
     private function getGraphQlSchemaDeclaration(): array
     {
         if (!$this->parsedSchema) {
-            $objectManager = Bootstrap::create(BP, $_SERVER)->getObjectManager();
+            $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
             $typeReader = $objectManager->create(TypeReaderComposite::class);
             $reader = $objectManager->create(GraphQlReader::class, ['typeReader' => $typeReader]);
             $this->parsedSchema = $reader->read();
@@ -135,18 +134,26 @@ private function collectDependencies(string $currentModuleName, array $dependenc
         if (empty($dependencies)) {
             return [];
         }
-        $declared = $this->getDeclaredDependencies($currentModuleName, self::TYPE_HARD, self::MAP_TYPE_DECLARED);
+        $declared = $this->dependencyProvider->getDeclaredDependencies(
+            $currentModuleName,
+            DependencyProvider::TYPE_HARD,
+            DependencyProvider::MAP_TYPE_DECLARED
+        );
         $checkResult = array_intersect($declared, $dependencies);
 
         if (empty($checkResult)) {
-            $this->addDependencies(
+            $this->dependencyProvider->addDependencies(
                 $currentModuleName,
-                self::TYPE_HARD,
-                self::MAP_TYPE_FOUND,
+                DependencyProvider::TYPE_HARD,
+                DependencyProvider::MAP_TYPE_FOUND,
                 [$currentModuleName => $dependencies]
             );
         }
 
-        return $this->getDeclaredDependencies($currentModuleName, self::TYPE_HARD, self::MAP_TYPE_FOUND);
+        return $this->dependencyProvider->getDeclaredDependencies(
+            $currentModuleName,
+            DependencyProvider::TYPE_HARD,
+            DependencyProvider::MAP_TYPE_FOUND
+        );
     }
 }
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
index 5653069564e99..d79e94af2bc01 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/DependencyTest.php
@@ -8,6 +8,7 @@
  */
 namespace Magento\Test\Integrity;
 
+use Magento\Framework\App\Bootstrap;
 use Magento\Framework\App\Utility\Files;
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\Exception\LocalizedException;
@@ -765,7 +766,7 @@ function (&$moduleName) {
                 $this->_setDependencies($currentModule, $type, self::MAP_TYPE_REDUNDANT, $moduleName);
             }
 
-            $this->addDependency($currentModule, $type, self::MAP_TYPE_FOUND, $moduleName);
+            self::addDependency($currentModule, $type, self::MAP_TYPE_FOUND, $moduleName);
         }
 
         if (empty($declaredDependencies)) {
@@ -783,8 +784,9 @@ function (&$moduleName) {
      */
     public function collectRedundant()
     {
-        $schemaDependencyProvider = new DeclarativeSchemaDependencyProvider();
-        $graphQlSchemaDependencyProvider = new GraphQlSchemaDependencyProvider();
+        $objectManager = Bootstrap::create(BP, $_SERVER)->getObjectManager();
+        $schemaDependencyProvider = $objectManager->create(DeclarativeSchemaDependencyProvider::class);
+        $graphQlSchemaDependencyProvider = $objectManager->create(GraphQlSchemaDependencyProvider::class);
 
         foreach (array_keys(self::$mapDependencies) as $module) {
             $declared = $this->_getDependencies($module, self::TYPE_HARD, self::MAP_TYPE_DECLARED);
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/GraphQlDependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/GraphQlDependencyTest.php
index edd611ad9fd0f..375f63ee1a61b 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/GraphQlDependencyTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/GraphQlDependencyTest.php
@@ -22,7 +22,7 @@ class GraphQlDependencyTest extends \PHPUnit\Framework\TestCase
     /**
      * Sets up data
      *
-     * @throws \Exception
+     * @throws \Magento\TestFramework\Inspection\Exception
      */
     protected function setUp(): void
     {
@@ -34,11 +34,12 @@ protected function setUp(): void
                 'MAGETWO-43654: The build is running from vendor/magento. DependencyTest is skipped.'
             );
         }
-        $this->dependencyProvider = new GraphQlSchemaDependencyProvider();
+        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+        $this->dependencyProvider = $objectManager->create(GraphQlSchemaDependencyProvider::class);
     }
 
     /**
-     * @throws \Exception
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function testUndeclaredDependencies()
     {
@@ -49,6 +50,9 @@ public function testUndeclaredDependencies()
          *
          * @param string $fileType
          * @param string $file
+         * @throws \Magento\Framework\Exception\LocalizedException
+         * @throws \Magento\TestFramework\Inspection\Exception
+         * @throws \PHPUnit\Framework\AssertionFailedError
          */
             function ($file) {
                 $componentRegistrar = new ComponentRegistrar();
@@ -112,14 +116,13 @@ private function getErrorMessage(string $id): string
      *
      * @param string $file
      * @return mixed
-     * @throws \Exception
+     * @throws \Magento\TestFramework\Inspection\Exception
      */
     private function readJsonFile(string $file, bool $asArray = false)
     {
         $decodedJson = json_decode(file_get_contents($file), $asArray);
         if (null == $decodedJson) {
-            //phpcs:ignore Magento2.Exceptions.DirectThrow
-            throw new \Exception("Invalid Json: $file");
+            throw new \Magento\TestFramework\Inspection\Exception("Invalid Json: $file");
         }
 
         return $decodedJson;
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
index c56b0256ca53b..d486a42e67ba6 100644
--- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
@@ -21,6 +21,8 @@ class GraphQlReader implements ReaderInterface
 
     const GRAPHQL_SCHEMA_FILE = 'schema.graphqls';
 
+    const GRAPHQL_INTERFACE = 'graphql_interface';
+
     /**
      * File locator
      *
@@ -301,18 +303,11 @@ private function removePlaceholderFromResults(array $partialResults) : array
      * @param string $file
      * @return string
      */
-    private static function getModuleNameForRelevantFile($file)
+    private static function getModuleNameForRelevantFile(string $file): string
     {
         if (!isset(self::$componentRegistrar)) {
             self::$componentRegistrar = new ComponentRegistrar();
         }
-        // Validates file when it belongs to default themes
-        foreach (self::$componentRegistrar->getPaths(ComponentRegistrar::THEME) as $themeDir) {
-            if (strpos($file, $themeDir . '/') !== false) {
-                return '';
-            }
-        }
-
         $foundModuleName = '';
         foreach (self::$componentRegistrar->getPaths(ComponentRegistrar::MODULE) as $moduleName => $moduleDir) {
             if (strpos($file, $moduleDir . '/') !== false) {
@@ -321,7 +316,7 @@ private static function getModuleNameForRelevantFile($file)
             }
         }
         if (empty($foundModuleName)) {
-            return '';
+            $foundModuleName = '';
         }
 
         return $foundModuleName;
@@ -338,7 +333,7 @@ private function addModuleNameToTypes(array $source, string $filePath): array
     {
         foreach ($source as $typeName => $type) {
             if (!isset($type['module']) && (
-                ($type['type'] == 'graphql_interface' && isset($type['typeResolver']))
+                ($type['type'] == self::GRAPHQL_INTERFACE && isset($type['typeResolver']))
                     || isset($type['implements'])
             )
             ) {

From df84abf89b84520859f9a13b757fabdaaf0c7aac Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Tue, 23 Jun 2020 16:20:47 +0300
Subject: [PATCH 0563/1718] MFTF remove redundant cron run

---
 ...dminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml | 5 ++---
 .../Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml   | 5 ++---
 .../Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml  | 5 ++---
 .../Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml  | 3 +--
 .../Test/ApplyCatalogPriceRuleByProductAttributeTest.xml     | 5 ++---
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
index f8346f5a9dd5c..c5126769cc8c9 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
@@ -37,9 +37,8 @@
             <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1"/>
             <!--Open Index Management Page and Select Index mode "Update by Schedule" -->
             <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
-            <!-- Run cron twice -->
-            <magentoCLI command="cron:run" arguments="--group=index" stepKey="runCron1"/>
-            <magentoCLI command="cron:run" arguments="--group=index" stepKey="runCron2"/>
+            <!-- Run cron -->
+            <magentoCLI command="cron:run" arguments="--group=index" stepKey="runCron"/>
         </before>
         <after>
             <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml
index 0aa89bdfd45b6..8bb47fbc1cb2e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml
@@ -37,9 +37,8 @@
             <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1"/>
             <!--Open Index Management Page and Select Index mode "Update by Schedule" -->
             <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
-            <!-- Run cron twice -->
-            <magentoCLI command="cron:run" arguments="--group=index" stepKey="runCron1"/>
-            <magentoCLI command="cron:run" arguments="--group=index" stepKey="runCron2"/>
+            <!-- Run cron -->
+            <magentoCLI command="cron:run" arguments="--group=index" stepKey="runCron"/>
         </before>
         <after>
             <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml
index 171d15fe6ed4f..b7e94cfbb8679 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml
@@ -37,9 +37,8 @@
             <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1"/>
             <!--Open Index Management Page and Select Index mode "Update by Schedule" -->
             <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
-            <!-- Run cron twice -->
-            <magentoCLI command="cron:run" arguments="--group=index" stepKey="runCron1"/>
-            <magentoCLI command="cron:run" arguments="--group=index" stepKey="runCron2"/>
+            <!-- Run cron -->
+            <magentoCLI command="cron:run" arguments="--group=index" stepKey="runCron"/>
         </before>
         <after>
             <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
index 1950b385c4a68..741e98fa3336b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
@@ -38,9 +38,8 @@
             <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 1"/>
             <!--Open Index Management Page and Select Index mode "Update by Schedule" -->
             <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
-            <!-- Run cron twice -->
+            <!-- Run cron -->
             <magentoCLI command="cron:run" stepKey="runCron1"/>
-            <magentoCLI command="cron:run" stepKey="runCron2"/>
         </before>
         <after>
             <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogPriceRuleByProductAttributeTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogPriceRuleByProductAttributeTest.xml
index 1919f7d5cc544..2c4e41b8151cf 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogPriceRuleByProductAttributeTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogPriceRuleByProductAttributeTest.xml
@@ -232,9 +232,8 @@
         <see userInput="You saved the rule." selector="{{ContentManagementSection.StoreConfigurationPageSuccessMessage}}" stepKey="seeMessage"/>
         <see userInput="Updated rules applied." selector="{{ContentManagementSection.StoreConfigurationPageSuccessMessage}}" stepKey="seeSuccessMessage"/>
 
-        <!-- Run cron twice -->
-        <magentoCLI command="cron:run" stepKey="runCron1"/>
-        <magentoCLI command="cron:run" stepKey="runCron2"/>
+        <!-- Run cron -->
+        <magentoCLI command="cron:run" stepKey="runCron"/>
         <magentoCLI command="cache:flush" stepKey="flushCache"/>
 
         <!-- Go to Frontend and open the simple product -->

From 625e57eae13c6dd47e758c9fdd56bfbfd54fcb4a Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Tue, 23 Jun 2020 16:23:18 +0300
Subject: [PATCH 0564/1718] magento/magento2-login-as-customer#144: Session
 interfaces introduction.

---
 .../Model/AuthenticateCustomerBySecret.php    | 13 +++++-
 .../Model/GetLoggedAsCustomerAdminId.php      | 40 +++++++++++++++++++
 .../Model/GetLoggedAsCustomerCustomerId.php   | 40 +++++++++++++++++++
 .../Model/SetLoggedAsCustomerAdminId.php      | 40 +++++++++++++++++++
 .../Model/SetLoggedAsCustomerCustomerId.php   | 40 +++++++++++++++++++
 .../Plugin/AdminLogoutPlugin.php              | 22 +++++-----
 app/code/Magento/LoginAsCustomer/etc/di.xml   |  4 ++
 .../Controller/Adminhtml/Login/Login.php      | 15 ++++++-
 .../GetLoggedAsCustomerAdminIdInterface.php   | 23 +++++++++++
 ...GetLoggedAsCustomerCustomerIdInterface.php | 23 +++++++++++
 .../SetLoggedAsCustomerAdminIdInterface.php   | 24 +++++++++++
 ...SetLoggedAsCustomerCustomerIdInterface.php | 24 +++++++++++
 .../CustomerData/LoginAsCustomerUi.php        | 17 ++++++--
 .../Plugin/InvalidateExpiredSessionPlugin.php | 13 +++++-
 .../Config/DisablePageCacheIfNeededPlugin.php | 14 +++----
 .../FrontAddCommentOnOrderPlacementPlugin.php | 20 +++++-----
 16 files changed, 335 insertions(+), 37 deletions(-)
 create mode 100644 app/code/Magento/LoginAsCustomer/Model/GetLoggedAsCustomerAdminId.php
 create mode 100644 app/code/Magento/LoginAsCustomer/Model/GetLoggedAsCustomerCustomerId.php
 create mode 100644 app/code/Magento/LoginAsCustomer/Model/SetLoggedAsCustomerAdminId.php
 create mode 100644 app/code/Magento/LoginAsCustomer/Model/SetLoggedAsCustomerCustomerId.php
 create mode 100644 app/code/Magento/LoginAsCustomerApi/Api/GetLoggedAsCustomerAdminIdInterface.php
 create mode 100644 app/code/Magento/LoginAsCustomerApi/Api/GetLoggedAsCustomerCustomerIdInterface.php
 create mode 100644 app/code/Magento/LoginAsCustomerApi/Api/SetLoggedAsCustomerAdminIdInterface.php
 create mode 100644 app/code/Magento/LoginAsCustomerApi/Api/SetLoggedAsCustomerCustomerIdInterface.php

diff --git a/app/code/Magento/LoginAsCustomer/Model/AuthenticateCustomerBySecret.php b/app/code/Magento/LoginAsCustomer/Model/AuthenticateCustomerBySecret.php
index a728f4c3a4393..a27c1c43ad965 100644
--- a/app/code/Magento/LoginAsCustomer/Model/AuthenticateCustomerBySecret.php
+++ b/app/code/Magento/LoginAsCustomer/Model/AuthenticateCustomerBySecret.php
@@ -11,6 +11,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\LoginAsCustomerApi\Api\AuthenticateCustomerBySecretInterface;
 use Magento\LoginAsCustomerApi\Api\GetAuthenticationDataBySecretInterface;
+use Magento\LoginAsCustomerApi\Api\SetLoggedAsCustomerAdminIdInterface;
 
 /**
  * @inheritdoc
@@ -29,16 +30,24 @@ class AuthenticateCustomerBySecret implements AuthenticateCustomerBySecretInterf
      */
     private $customerSession;
 
+    /**
+     * @var SetLoggedAsCustomerAdminIdInterface
+     */
+    private $setLoggedAsCustomerAdminId;
+
     /**
      * @param GetAuthenticationDataBySecretInterface $getAuthenticationDataBySecret
      * @param Session $customerSession
+     * @param SetLoggedAsCustomerAdminIdInterface $setLoggedAsCustomerAdminId
      */
     public function __construct(
         GetAuthenticationDataBySecretInterface $getAuthenticationDataBySecret,
-        Session $customerSession
+        Session $customerSession,
+        SetLoggedAsCustomerAdminIdInterface $setLoggedAsCustomerAdminId
     ) {
         $this->getAuthenticationDataBySecret = $getAuthenticationDataBySecret;
         $this->customerSession = $customerSession;
+        $this->setLoggedAsCustomerAdminId = $setLoggedAsCustomerAdminId;
     }
 
     /**
@@ -58,6 +67,6 @@ public function execute(string $secret): void
         }
 
         $this->customerSession->regenerateId();
-        $this->customerSession->setLoggedAsCustomerAdmindId($authenticationData->getAdminId());
+        $this->setLoggedAsCustomerAdminId->execute($authenticationData->getAdminId());
     }
 }
diff --git a/app/code/Magento/LoginAsCustomer/Model/GetLoggedAsCustomerAdminId.php b/app/code/Magento/LoginAsCustomer/Model/GetLoggedAsCustomerAdminId.php
new file mode 100644
index 0000000000000..17af8a3b5c11f
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Model/GetLoggedAsCustomerAdminId.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomer\Model;
+
+use Magento\Customer\Model\Session;
+use Magento\LoginAsCustomerApi\Api\GetLoggedAsCustomerAdminIdInterface;
+
+/**
+ * @inheritdoc
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ */
+class GetLoggedAsCustomerAdminId implements GetLoggedAsCustomerAdminIdInterface
+{
+    /**
+     * @var Session
+     */
+    private $session;
+
+    /**
+     * @param Session $session
+     */
+    public function __construct(Session $session)
+    {
+        $this->session = $session;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(): int
+    {
+        return (int)$this->session->getLoggedAsCustomerAdmindId();
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomer/Model/GetLoggedAsCustomerCustomerId.php b/app/code/Magento/LoginAsCustomer/Model/GetLoggedAsCustomerCustomerId.php
new file mode 100644
index 0000000000000..9783b04a5a03f
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Model/GetLoggedAsCustomerCustomerId.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomer\Model;
+
+use Magento\Backend\Model\Auth\Session;
+use Magento\LoginAsCustomerApi\Api\GetLoggedAsCustomerCustomerIdInterface;
+
+/**
+ * @inheritdoc
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ */
+class GetLoggedAsCustomerCustomerId implements GetLoggedAsCustomerCustomerIdInterface
+{
+    /**
+     * @var Session
+     */
+    private $session;
+
+    /**
+     * @param Session $session
+     */
+    public function __construct(Session $session)
+    {
+        $this->session = $session;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(): int
+    {
+        return (int)$this->session->getLoggedAsCustomerCustomerId();
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomer/Model/SetLoggedAsCustomerAdminId.php b/app/code/Magento/LoginAsCustomer/Model/SetLoggedAsCustomerAdminId.php
new file mode 100644
index 0000000000000..aa16dbcd4f808
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Model/SetLoggedAsCustomerAdminId.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomer\Model;
+
+use Magento\Customer\Model\Session;
+use Magento\LoginAsCustomerApi\Api\SetLoggedAsCustomerAdminIdInterface;
+
+/**
+ * @inheritdoc
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ */
+class SetLoggedAsCustomerAdminId implements SetLoggedAsCustomerAdminIdInterface
+{
+    /**
+     * @var Session
+     */
+    private $session;
+
+    /**
+     * @param Session $session
+     */
+    public function __construct(Session $session)
+    {
+        $this->session = $session;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(int $adminId): void
+    {
+        $this->session->setLoggedAsCustomerAdmindId($adminId);
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomer/Model/SetLoggedAsCustomerCustomerId.php b/app/code/Magento/LoginAsCustomer/Model/SetLoggedAsCustomerCustomerId.php
new file mode 100644
index 0000000000000..95e159bdeded3
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Model/SetLoggedAsCustomerCustomerId.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomer\Model;
+
+use Magento\Backend\Model\Auth\Session;
+use Magento\LoginAsCustomerApi\Api\SetLoggedAsCustomerCustomerIdInterface;
+
+/**
+ * @inheritdoc
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ */
+class SetLoggedAsCustomerCustomerId implements SetLoggedAsCustomerCustomerIdInterface
+{
+    /**
+     * @var Session
+     */
+    private $session;
+
+    /**
+     * @param Session $session
+     */
+    public function __construct(Session $session)
+    {
+        $this->session = $session;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(int $customerId): void
+    {
+        $this->session->setLoggedAsCustomerCustomerId($customerId);
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php b/app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php
index 244fed20c21e8..9b8567663578d 100644
--- a/app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php
+++ b/app/code/Magento/LoginAsCustomer/Plugin/AdminLogoutPlugin.php
@@ -8,9 +8,9 @@
 namespace Magento\LoginAsCustomer\Plugin;
 
 use Magento\Backend\Model\Auth;
-use Magento\Backend\Model\Auth\Session as AuthSession;
 use Magento\LoginAsCustomerApi\Api\ConfigInterface;
 use Magento\LoginAsCustomerApi\Api\DeleteAuthenticationDataForUserInterface;
+use Magento\LoginAsCustomerApi\Api\GetLoggedAsCustomerCustomerIdInterface;
 
 /**
  * Delete all Login as Customer sessions for logging out admin.
@@ -19,11 +19,6 @@
  */
 class AdminLogoutPlugin
 {
-    /**
-     * @var AuthSession
-     */
-    private $authSession;
-
     /**
      * @var ConfigInterface
      */
@@ -35,18 +30,23 @@ class AdminLogoutPlugin
     private $deleteAuthenticationDataForUser;
 
     /**
-     * @param AuthSession $authSession
+     * @var GetLoggedAsCustomerCustomerIdInterface
+     */
+    private $getLoggedAsCustomerCustomerId;
+
+    /**
      * @param ConfigInterface $config
      * @param DeleteAuthenticationDataForUserInterface $deleteAuthenticationDataForUser
+     * @param GetLoggedAsCustomerCustomerIdInterface $getLoggedAsCustomerCustomerId
      */
     public function __construct(
-        AuthSession $authSession,
         ConfigInterface $config,
-        DeleteAuthenticationDataForUserInterface $deleteAuthenticationDataForUser
+        DeleteAuthenticationDataForUserInterface $deleteAuthenticationDataForUser,
+        GetLoggedAsCustomerCustomerIdInterface $getLoggedAsCustomerCustomerId
     ) {
-        $this->authSession = $authSession;
         $this->config = $config;
         $this->deleteAuthenticationDataForUser = $deleteAuthenticationDataForUser;
+        $this->getLoggedAsCustomerCustomerId = $getLoggedAsCustomerCustomerId;
     }
 
     /**
@@ -57,7 +57,7 @@ public function __construct(
     public function beforeLogout(Auth $subject): void
     {
         $user = $subject->getUser();
-        $isLoggedAsCustomer = $this->authSession->getIsLoggedAsCustomer();
+        $isLoggedAsCustomer = (bool)$this->getLoggedAsCustomerCustomerId->execute();
         if ($this->config->isEnabled() && $user && $isLoggedAsCustomer) {
             $userId = (int)$user->getId();
             $this->deleteAuthenticationDataForUser->execute($userId);
diff --git a/app/code/Magento/LoginAsCustomer/etc/di.xml b/app/code/Magento/LoginAsCustomer/etc/di.xml
index c0ba4901ba7b8..a1b4dfdb7ca27 100755
--- a/app/code/Magento/LoginAsCustomer/etc/di.xml
+++ b/app/code/Magento/LoginAsCustomer/etc/di.xml
@@ -13,6 +13,10 @@
     <preference for="Magento\LoginAsCustomerApi\Api\DeleteAuthenticationDataForUserInterface" type="Magento\LoginAsCustomer\Model\ResourceModel\DeleteAuthenticationDataForUser"/>
     <preference for="Magento\LoginAsCustomerApi\Api\ConfigInterface" type="Magento\LoginAsCustomer\Model\Config"/>
     <preference for="Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerSessionActiveInterface" type="Magento\LoginAsCustomer\Model\ResourceModel\IsLoginAsCustomerSessionActive"/>
+    <preference for="Magento\LoginAsCustomerApi\Api\GetLoggedAsCustomerAdminIdInterface" type="Magento\LoginAsCustomer\Model\GetLoggedAsCustomerAdminId"/>
+    <preference for="Magento\LoginAsCustomerApi\Api\GetLoggedAsCustomerCustomerIdInterface" type="Magento\LoginAsCustomer\Model\GetLoggedAsCustomerCustomerId"/>
+    <preference for="Magento\LoginAsCustomerApi\Api\SetLoggedAsCustomerAdminIdInterface" type="Magento\LoginAsCustomer\Model\SetLoggedAsCustomerAdminId"/>
+    <preference for="Magento\LoginAsCustomerApi\Api\SetLoggedAsCustomerCustomerIdInterface" type="Magento\LoginAsCustomer\Model\SetLoggedAsCustomerCustomerId"/>
     <type name="Magento\Backend\Model\Auth">
         <plugin name="login_as_customer_admin_logout" type="Magento\LoginAsCustomer\Plugin\AdminLogoutPlugin"/>
     </type>
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php b/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php
index 70eef5347f8e3..4edd5491a0fee 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php
@@ -23,6 +23,7 @@
 use Magento\LoginAsCustomerApi\Api\Data\AuthenticationDataInterfaceFactory;
 use Magento\LoginAsCustomerApi\Api\DeleteAuthenticationDataForUserInterface;
 use Magento\LoginAsCustomerApi\Api\SaveAuthenticationDataInterface;
+use Magento\LoginAsCustomerApi\Api\SetLoggedAsCustomerCustomerIdInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -80,6 +81,11 @@ class Login extends Action implements HttpGetActionInterface
      */
     private $url;
 
+    /**
+     * @var SetLoggedAsCustomerCustomerIdInterface
+     */
+    private $setLoggedAsCustomerCustomerId;
+
     /**
      * @param Context $context
      * @param Session $authSession
@@ -90,6 +96,9 @@ class Login extends Action implements HttpGetActionInterface
      * @param SaveAuthenticationDataInterface $saveAuthenticationData ,
      * @param DeleteAuthenticationDataForUserInterface $deleteAuthenticationDataForUser
      * @param Url $url
+     * @param SetLoggedAsCustomerCustomerIdInterface $setLoggedAsCustomerCustomerId
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         Context $context,
@@ -100,7 +109,8 @@ public function __construct(
         AuthenticationDataInterfaceFactory $authenticationDataFactory,
         SaveAuthenticationDataInterface $saveAuthenticationData,
         DeleteAuthenticationDataForUserInterface $deleteAuthenticationDataForUser,
-        Url $url
+        Url $url,
+        SetLoggedAsCustomerCustomerIdInterface $setLoggedAsCustomerCustomerId
     ) {
         parent::__construct($context);
 
@@ -112,6 +122,7 @@ public function __construct(
         $this->saveAuthenticationData = $saveAuthenticationData;
         $this->deleteAuthenticationDataForUser = $deleteAuthenticationDataForUser;
         $this->url = $url;
+        $this->setLoggedAsCustomerCustomerId = $setLoggedAsCustomerCustomerId;
     }
 
     /**
@@ -167,7 +178,7 @@ public function execute(): ResultInterface
 
         $this->deleteAuthenticationDataForUser->execute($userId);
         $secret = $this->saveAuthenticationData->execute($authenticationData);
-        $this->authSession->setIsLoggedAsCustomer(true);
+        $this->setLoggedAsCustomerCustomerId->execute($customerId);
 
         $redirectUrl = $this->getLoginProceedRedirectUrl($secret, $storeId);
         $resultRedirect->setUrl($redirectUrl);
diff --git a/app/code/Magento/LoginAsCustomerApi/Api/GetLoggedAsCustomerAdminIdInterface.php b/app/code/Magento/LoginAsCustomerApi/Api/GetLoggedAsCustomerAdminIdInterface.php
new file mode 100644
index 0000000000000..44b59c7810acc
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerApi/Api/GetLoggedAsCustomerAdminIdInterface.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerApi\Api;
+
+/**
+ * Get id of Admin logged as Customer.
+ *
+ * @api
+ */
+interface GetLoggedAsCustomerAdminIdInterface
+{
+    /**
+     * Get id of Admin logged as Customer.
+     *
+     * @return int
+     */
+    public function execute(): int;
+}
diff --git a/app/code/Magento/LoginAsCustomerApi/Api/GetLoggedAsCustomerCustomerIdInterface.php b/app/code/Magento/LoginAsCustomerApi/Api/GetLoggedAsCustomerCustomerIdInterface.php
new file mode 100644
index 0000000000000..1d12d6551a2ff
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerApi/Api/GetLoggedAsCustomerCustomerIdInterface.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerApi\Api;
+
+/**
+ * Get id of Customer Admin is logged as.
+ *
+ * @api
+ */
+interface GetLoggedAsCustomerCustomerIdInterface
+{
+    /**
+     * Get id of Customer Admin is logged as.
+     *
+     * @return int
+     */
+    public function execute(): int;
+}
diff --git a/app/code/Magento/LoginAsCustomerApi/Api/SetLoggedAsCustomerAdminIdInterface.php b/app/code/Magento/LoginAsCustomerApi/Api/SetLoggedAsCustomerAdminIdInterface.php
new file mode 100644
index 0000000000000..531a21496901e
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerApi/Api/SetLoggedAsCustomerAdminIdInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerApi\Api;
+
+/**
+ * Set id of Admin logged as Customer.
+ *
+ * @api
+ */
+interface SetLoggedAsCustomerAdminIdInterface
+{
+    /**
+     * Set id of Admin logged as Customer.
+     *
+     * @param int $adminId
+     * @return void
+     */
+    public function execute(int $adminId): void;
+}
diff --git a/app/code/Magento/LoginAsCustomerApi/Api/SetLoggedAsCustomerCustomerIdInterface.php b/app/code/Magento/LoginAsCustomerApi/Api/SetLoggedAsCustomerCustomerIdInterface.php
new file mode 100644
index 0000000000000..a77300528ba72
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerApi/Api/SetLoggedAsCustomerCustomerIdInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerApi\Api;
+
+/**
+ * Set id of Customer Admin is logged as.
+ *
+ * @api
+ */
+interface SetLoggedAsCustomerCustomerIdInterface
+{
+    /**
+     * Set id of Customer Admin is logged as.
+     *
+     * @param int $customerId
+     * @return void
+     */
+    public function execute(int $customerId): void;
+}
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/CustomerData/LoginAsCustomerUi.php b/app/code/Magento/LoginAsCustomerFrontendUi/CustomerData/LoginAsCustomerUi.php
index 985561df0bbc4..762061ac5f364 100644
--- a/app/code/Magento/LoginAsCustomerFrontendUi/CustomerData/LoginAsCustomerUi.php
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/CustomerData/LoginAsCustomerUi.php
@@ -10,6 +10,7 @@
 use Magento\Customer\CustomerData\SectionSourceInterface;
 use Magento\Customer\Model\Session;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\LoginAsCustomerApi\Api\GetLoggedAsCustomerAdminIdInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -29,16 +30,24 @@ class LoginAsCustomerUi implements SectionSourceInterface
      */
     private $storeManager;
 
+    /**
+     * @var GetLoggedAsCustomerAdminIdInterface
+     */
+    private $getLoggedAsCustomerAdminId;
+
     /**
      * @param Session $customerSession
      * @param StoreManagerInterface $storeManager
+     * @param GetLoggedAsCustomerAdminIdInterface $getLoggedAsCustomerAdminId
      */
     public function __construct(
         Session $customerSession,
-        StoreManagerInterface $storeManager
+        StoreManagerInterface $storeManager,
+        GetLoggedAsCustomerAdminIdInterface $getLoggedAsCustomerAdminId
     ) {
         $this->customerSession = $customerSession;
         $this->storeManager = $storeManager;
+        $this->getLoggedAsCustomerAdminId = $getLoggedAsCustomerAdminId;
     }
 
     /**
@@ -49,12 +58,14 @@ public function __construct(
      */
     public function getSectionData(): array
     {
-        if (!$this->customerSession->getCustomerId() || !$this->customerSession->getLoggedAsCustomerAdmindId()) {
+        $adminId = $this->getLoggedAsCustomerAdminId->execute();
+
+        if (!$adminId || !$this->customerSession->getCustomerId()) {
             return [];
         }
 
         return [
-            'adminUserId' => $this->customerSession->getLoggedAsCustomerAdmindId(),
+            'adminUserId' => $adminId,
             'websiteName' => $this->storeManager->getWebsite()->getName()
         ];
     }
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/Plugin/InvalidateExpiredSessionPlugin.php b/app/code/Magento/LoginAsCustomerFrontendUi/Plugin/InvalidateExpiredSessionPlugin.php
index b68e871c5f955..9fe4b43032045 100644
--- a/app/code/Magento/LoginAsCustomerFrontendUi/Plugin/InvalidateExpiredSessionPlugin.php
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/Plugin/InvalidateExpiredSessionPlugin.php
@@ -9,6 +9,7 @@
 use Magento\Customer\Model\Session;
 use Magento\Framework\App\ActionInterface;
 use Magento\LoginAsCustomerApi\Api\ConfigInterface;
+use Magento\LoginAsCustomerApi\Api\GetLoggedAsCustomerAdminIdInterface;
 use Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerSessionActiveInterface;
 
 /**
@@ -31,19 +32,27 @@ class InvalidateExpiredSessionPlugin
      */
     private $isLoginAsCustomerSessionActive;
 
+    /**
+     * @var GetLoggedAsCustomerAdminIdInterface
+     */
+    private $getLoggedAsCustomerAdminId;
+
     /**
      * @param ConfigInterface $config
      * @param Session $session
      * @param IsLoginAsCustomerSessionActiveInterface $isLoginAsCustomerSessionActive
+     * @param GetLoggedAsCustomerAdminIdInterface $getLoggedAsCustomerAdminId
      */
     public function __construct(
         ConfigInterface $config,
         Session $session,
-        IsLoginAsCustomerSessionActiveInterface $isLoginAsCustomerSessionActive
+        IsLoginAsCustomerSessionActiveInterface $isLoginAsCustomerSessionActive,
+        GetLoggedAsCustomerAdminIdInterface $getLoggedAsCustomerAdminId
     ) {
         $this->session = $session;
         $this->isLoginAsCustomerSessionActive = $isLoginAsCustomerSessionActive;
         $this->config = $config;
+        $this->getLoggedAsCustomerAdminId = $getLoggedAsCustomerAdminId;
     }
 
     /**
@@ -57,7 +66,7 @@ public function __construct(
     public function beforeExecute(ActionInterface $subject)
     {
         if ($this->config->isEnabled()) {
-            $adminId = (int)$this->session->getLoggedAsCustomerAdmindId();
+            $adminId = $this->getLoggedAsCustomerAdminId->execute();
             $customerId = (int)$this->session->getCustomerId();
             if ($adminId && $customerId) {
                 if (!$this->isLoginAsCustomerSessionActive->execute($customerId, $adminId)) {
diff --git a/app/code/Magento/LoginAsCustomerPageCache/Plugin/PageCache/Model/Config/DisablePageCacheIfNeededPlugin.php b/app/code/Magento/LoginAsCustomerPageCache/Plugin/PageCache/Model/Config/DisablePageCacheIfNeededPlugin.php
index 6b36a0720ecb3..dabf8c62e1dee 100644
--- a/app/code/Magento/LoginAsCustomerPageCache/Plugin/PageCache/Model/Config/DisablePageCacheIfNeededPlugin.php
+++ b/app/code/Magento/LoginAsCustomerPageCache/Plugin/PageCache/Model/Config/DisablePageCacheIfNeededPlugin.php
@@ -7,8 +7,8 @@
 
 namespace Magento\LoginAsCustomerPageCache\Plugin\PageCache\Model\Config;
 
-use Magento\Customer\Model\Session;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\LoginAsCustomerApi\Api\GetLoggedAsCustomerAdminIdInterface;
 use Magento\PageCache\Model\Config;
 use Magento\Store\Model\ScopeInterface;
 
@@ -27,20 +27,20 @@ class DisablePageCacheIfNeededPlugin
     private $scopeConfig;
 
     /**
-     * @var Session
+     * @var GetLoggedAsCustomerAdminIdInterface
      */
-    private $customerSession;
+    private $getLoggedAsCustomerAdminId;
 
     /**
      * @param ScopeConfigInterface $scopeConfig
-     * @param Session $customerSession
+     * @param GetLoggedAsCustomerAdminIdInterface $getLoggedAsCustomerAdminId
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
-        Session $customerSession
+        GetLoggedAsCustomerAdminIdInterface $getLoggedAsCustomerAdminId
     ) {
         $this->scopeConfig = $scopeConfig;
-        $this->customerSession = $customerSession;
+        $this->getLoggedAsCustomerAdminId = $getLoggedAsCustomerAdminId;
     }
 
     /**
@@ -58,7 +58,7 @@ public function afterIsEnabled(Config $subject, $isEnabled): bool
                 'login_as_customer/general/disable_page_cache',
                 ScopeInterface::SCOPE_STORE
             );
-            $adminId = $this->customerSession->getLoggedAsCustomerAdmindId();
+            $adminId = $this->getLoggedAsCustomerAdminId->execute();
             if ($disable && $adminId) {
                 $isEnabled = false;
             }
diff --git a/app/code/Magento/LoginAsCustomerSales/Plugin/FrontAddCommentOnOrderPlacementPlugin.php b/app/code/Magento/LoginAsCustomerSales/Plugin/FrontAddCommentOnOrderPlacementPlugin.php
index dc7b295f61c4d..87ffe81998d58 100644
--- a/app/code/Magento/LoginAsCustomerSales/Plugin/FrontAddCommentOnOrderPlacementPlugin.php
+++ b/app/code/Magento/LoginAsCustomerSales/Plugin/FrontAddCommentOnOrderPlacementPlugin.php
@@ -7,7 +7,7 @@
 
 namespace Magento\LoginAsCustomerSales\Plugin;
 
-use Magento\Customer\Model\Session;
+use Magento\LoginAsCustomerApi\Api\GetLoggedAsCustomerAdminIdInterface;
 use Magento\Sales\Model\Order;
 use Magento\User\Model\UserFactory;
 
@@ -19,25 +19,25 @@
 class FrontAddCommentOnOrderPlacementPlugin
 {
     /**
-     * @var Session
+     * @var UserFactory
      */
-    private $customerSession;
+    private $userFactory;
 
     /**
-     * @var UserFactory
+     * @var GetLoggedAsCustomerAdminIdInterface
      */
-    private $userFactory;
+    private $getLoggedAsCustomerAdminId;
 
     /**
-     * @param Session $session
      * @param UserFactory $userFactory
+     * @param GetLoggedAsCustomerAdminIdInterface $getLoggedAsCustomerAdminId
      */
     public function __construct(
-        Session $session,
-        UserFactory $userFactory
+        UserFactory $userFactory,
+        GetLoggedAsCustomerAdminIdInterface $getLoggedAsCustomerAdminId
     ) {
-        $this->customerSession = $session;
         $this->userFactory = $userFactory;
+        $this->getLoggedAsCustomerAdminId = $getLoggedAsCustomerAdminId;
     }
 
     /**
@@ -49,7 +49,7 @@ public function __construct(
      */
     public function afterPlace(Order $subject, Order $result): Order
     {
-        $adminId = $this->customerSession->getLoggedAsCustomerAdmindId();
+        $adminId = $this->getLoggedAsCustomerAdminId->execute();
         if ($adminId) {
             $adminUser = $this->userFactory->create()->load($adminId);
             $subject->addCommentToStatusHistory(

From 5a4c5bedab4eddbbb5ec006d3119c8b564acf2e7 Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Tue, 23 Jun 2020 16:56:01 +0300
Subject: [PATCH 0565/1718] MC-35295: Unable to hide product images via import

---
 .../Model/Import/Product.php                  | 12 +++++----
 .../Import/Product/MediaGalleryProcessor.php  |  4 ++-
 .../Model/Import/ProductTest.php              | 25 +++++++++++++++++++
 .../import_image_name_without_slash.csv       |  3 +++
 4 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_image_name_without_slash.csv

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index c5fcac99767bd..189bfa61f2c42 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -1595,6 +1595,7 @@ protected function _saveProducts()
                 }
 
                 $rowSku = $rowData[self::COL_SKU];
+                $rowSkuNormalized = mb_strtolower($rowSku);
 
                 if (null === $rowSku) {
                     $this->getErrorAggregator()->addRowToSkip($rowNum);
@@ -1604,9 +1605,9 @@ protected function _saveProducts()
                 $storeId = !empty($rowData[self::COL_STORE])
                     ? $this->getStoreIdByCode($rowData[self::COL_STORE])
                     : Store::DEFAULT_STORE_ID;
-                $rowExistingImages = $existingImages[$storeId][$rowSku] ?? [];
+                $rowExistingImages = $existingImages[$storeId][$rowSkuNormalized] ?? [];
                 $rowStoreMediaGalleryValues = $rowExistingImages;
-                $rowExistingImages += $existingImages[Store::DEFAULT_STORE_ID][$rowSku] ?? [];
+                $rowExistingImages += $existingImages[Store::DEFAULT_STORE_ID][$rowSkuNormalized] ?? [];
 
                 if (self::SCOPE_STORE == $rowScope) {
                     // set necessary data from SCOPE_DEFAULT row
@@ -1762,10 +1763,11 @@ protected function _saveProducts()
                             continue;
                         }
 
-                        if (isset($rowExistingImages[$uploadedFile])) {
-                            $currentFileData = $rowExistingImages[$uploadedFile];
+                        $uploadedFileNormalized = ltrim($uploadedFile, '/\\');
+                        if (isset($rowExistingImages[$uploadedFileNormalized])) {
+                            $currentFileData = $rowExistingImages[$uploadedFileNormalized];
                             $currentFileData['store_id'] = $storeId;
-                            $storeMediaGalleryValueExists = isset($rowStoreMediaGalleryValues[$uploadedFile]);
+                            $storeMediaGalleryValueExists = isset($rowStoreMediaGalleryValues[$uploadedFileNormalized]);
                             if (array_key_exists($uploadedFile, $imageHiddenStates)
                                 && $currentFileData['disabled'] != $imageHiddenStates[$uploadedFile]
                             ) {
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/MediaGalleryProcessor.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/MediaGalleryProcessor.php
index a94a87a44b32a..d4694b72ba64f 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/MediaGalleryProcessor.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/MediaGalleryProcessor.php
@@ -384,7 +384,9 @@ public function getExistingImages(array $bunch)
         foreach ($this->connection->fetchAll($select) as $image) {
             $storeId = $image['store_id'];
             unset($image['store_id']);
-            $result[$storeId][$image['sku']][$image['value']] = $image;
+            $sku = mb_strtolower($image['sku']);
+            $value = ltrim($image['value'], '/\\');
+            $result[$storeId][$sku][$value] = $image;
         }
 
         return $result;
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 9dee418f010a8..d3f012bb0852f 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
@@ -3196,4 +3196,29 @@ public function testImportProductsWithLinksInDifferentBunches()
         }
         $this->assertEquals($linksData, $importedProductLinks);
     }
+
+    /**
+     * Tests that image name does not have to be prefixed by slash
+     *
+     * @magentoDataFixture mediaImportImageFixture
+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
+     * @magentoDataFixture Magento/Catalog/_files/product_with_image.php
+     */
+    public function testUpdateImageByNameNotPrefixedWithSlash()
+    {
+        $expectedLabelForDefaultStoreView = 'image label updated';
+        $expectedImageFile = '/m/a/magento_image.jpg';
+        $secondStoreCode = 'fixturestore';
+        $productSku = 'simple';
+        $this->importDataForMediaTest('import_image_name_without_slash.csv');
+        $product = $this->getProductBySku($productSku);
+        $imageItems = $product->getMediaGalleryImages()->getItems();
+        $this->assertCount(1, $imageItems);
+        $imageItem = array_shift($imageItems);
+        $this->assertEquals($expectedImageFile, $imageItem->getFile());
+        $this->assertEquals($expectedLabelForDefaultStoreView, $imageItem->getLabel());
+        $product = $this->getProductBySku($productSku, $secondStoreCode);
+        $imageItems = $product->getMediaGalleryImages()->getItems();
+        $this->assertCount(0, $imageItems);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_image_name_without_slash.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_image_name_without_slash.csv
new file mode 100644
index 0000000000000..415501daf89d8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_image_name_without_slash.csv
@@ -0,0 +1,3 @@
+"sku","store_view_code","base_image","base_image_label","hide_from_product_page"
+"simple",,"m/a/magento_image.jpg","image label updated",
+"simple","fixturestore",,,"m/a/magento_image.jpg"

From d9c02ed6db4d43427366f8356a2b59b64a37284f Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Tue, 23 Jun 2020 17:02:10 +0300
Subject: [PATCH 0566/1718] magento/magento2-login-as-customer#144: "Login as
 Customer" functionality should be enabled by default.

---
 .../Magento/LoginAsCustomer/etc/config.xml     |  2 +-
 .../ViewModel/Configuration.php                | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomer/etc/config.xml b/app/code/Magento/LoginAsCustomer/etc/config.xml
index 936ae1ff2f05d..7e39cc39145eb 100644
--- a/app/code/Magento/LoginAsCustomer/etc/config.xml
+++ b/app/code/Magento/LoginAsCustomer/etc/config.xml
@@ -10,7 +10,7 @@
     <default>
         <login_as_customer>
             <general>
-                <enabled>0</enabled>
+                <enabled>1</enabled>
                 <store_view_manual_choice_enabled>0</store_view_manual_choice_enabled>
                 <authentication_data_expiration_time>60</authentication_data_expiration_time>
             </general>
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/ViewModel/Configuration.php b/app/code/Magento/LoginAsCustomerFrontendUi/ViewModel/Configuration.php
index 7d8738d06f54f..5de790968c5e9 100644
--- a/app/code/Magento/LoginAsCustomerFrontendUi/ViewModel/Configuration.php
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/ViewModel/Configuration.php
@@ -8,7 +8,9 @@
 namespace Magento\LoginAsCustomerFrontendUi\ViewModel;
 
 use Magento\Customer\Model\Context;
+use Magento\Framework\App\Http\Context as HttpContext;
 use Magento\LoginAsCustomerApi\Api\ConfigInterface;
+use Magento\LoginAsCustomerApi\Api\GetLoggedAsCustomerAdminIdInterface;
 
 /**
  * View model to get extension configuration in the template
@@ -21,20 +23,28 @@ class Configuration implements \Magento\Framework\View\Element\Block\ArgumentInt
     private $config;
 
     /**
-     * @var \Magento\Framework\App\Http\Context
+     * @var HttpContext
      */
     private $httpContext;
 
+    /**
+     * @var GetLoggedAsCustomerAdminIdInterface
+     */
+    private $getLoggedAsCustomerAdminId;
+
     /**
      * @param ConfigInterface $config
-     * @param \Magento\Framework\App\Http\Context $httpContext
+     * @param HttpContext $httpContext
+     * @param GetLoggedAsCustomerAdminIdInterface $getLoggedAsCustomerAdminId
      */
     public function __construct(
         ConfigInterface $config,
-        \Magento\Framework\App\Http\Context $httpContext
+        HttpContext $httpContext,
+        GetLoggedAsCustomerAdminIdInterface $getLoggedAsCustomerAdminId
     ) {
         $this->config = $config;
         $this->httpContext = $httpContext;
+        $this->getLoggedAsCustomerAdminId = $getLoggedAsCustomerAdminId;
     }
 
     /**
@@ -44,7 +54,7 @@ public function __construct(
      */
     public function isEnabled(): bool
     {
-        return $this->config->isEnabled() && $this->isLoggedIn();
+        return $this->config->isEnabled() && $this->isLoggedIn() && $this->getLoggedAsCustomerAdminId->execute();
     }
 
     /**

From 4f497903a254a8f41c72ba3e3b22066bbc0c2310 Mon Sep 17 00:00:00 2001
From: Tu Nguyen <tuna@ecommage.com>
Date: Fri, 12 Jun 2020 00:48:04 +0700
Subject: [PATCH 0567/1718] Fix incorrect compare sort order link

Fix static test

Fix fail unit test

Update test file

Reorder links via layout xml

Update links order in other extensions

Update order delimiter link

Update link again for toplinks

Update order link after reviews

Remove whitespace anchor tag

Update default.xml

Replace sortOrder zero
Update customer_account.xml
---
 .../Customer/Block/Account/Navigation.php     |  8 +++---
 .../Unit/Block/Account/NavigationTest.php     | 25 +++++++++++--------
 .../view/frontend/layout/customer_account.xml | 10 ++++----
 .../Customer/view/frontend/layout/default.xml | 10 +++++---
 .../account/link/authorization.phtml          |  7 +++---
 .../templates/account/link/my-account.phtml   | 12 +++++++++
 .../view/frontend/layout/customer_account.xml |  2 +-
 .../view/frontend/layout/customer_account.xml |  2 +-
 .../view/frontend/layout/customer_account.xml |  2 +-
 .../view/frontend/layout/customer_account.xml |  2 +-
 .../view/frontend/layout/customer_account.xml |  2 +-
 .../view/frontend/layout/customer_account.xml |  2 +-
 .../view/frontend/layout/customer_account.xml |  2 +-
 .../Wishlist/view/frontend/layout/default.xml |  2 +-
 14 files changed, 54 insertions(+), 34 deletions(-)
 create mode 100644 app/code/Magento/Customer/view/frontend/templates/account/link/my-account.phtml

diff --git a/app/code/Magento/Customer/Block/Account/Navigation.php b/app/code/Magento/Customer/Block/Account/Navigation.php
index 705acbcda4c6a..cd963f16652d6 100644
--- a/app/code/Magento/Customer/Block/Account/Navigation.php
+++ b/app/code/Magento/Customer/Block/Account/Navigation.php
@@ -7,8 +7,8 @@
 
 namespace Magento\Customer\Block\Account;
 
-use \Magento\Framework\View\Element\Html\Links;
-use \Magento\Customer\Block\Account\SortLinkInterface;
+use Magento\Framework\View\Element\Html\Links;
+use Magento\Customer\Block\Account\SortLinkInterface;
 
 /**
  * Class for sorting links in navigation panels.
@@ -19,7 +19,7 @@
 class Navigation extends Links
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @since 100.2.0
      */
     public function getLinks()
@@ -47,6 +47,6 @@ public function getLinks()
      */
     private function compare(SortLinkInterface $firstLink, SortLinkInterface $secondLink): int
     {
-        return  $secondLink->getSortOrder() <=> $firstLink->getSortOrder();
+        return $firstLink->getSortOrder() <=> $secondLink->getSortOrder();
     }
 }
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Account/NavigationTest.php b/app/code/Magento/Customer/Test/Unit/Block/Account/NavigationTest.php
index c93e7110c5d96..0dc375908e561 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Account/NavigationTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Account/NavigationTest.php
@@ -18,6 +18,11 @@
 
 class NavigationTest extends TestCase
 {
+    /**
+     * Stub name top links
+     */
+    private const STUB_TOP_LINKS_NAME_IN_LAYOUT = 'top.links';
+
     /**
      * @var ObjectManagerHelper
      */
@@ -62,7 +67,7 @@ protected function setUp(): void
      *
      * @return void
      */
-    public function testGetLinksWithCustomerAndWishList()
+    public function testGetLinksWithCustomerAndWishList(): void
     {
         $wishListLinkMock = $this->getMockBuilder(WishListLink::class)
             ->disableOriginalConstructor()
@@ -76,30 +81,30 @@ public function testGetLinksWithCustomerAndWishList()
 
         $wishListLinkMock->expects($this->any())
             ->method('getSortOrder')
-            ->willReturn(100);
+            ->willReturn(30);
 
         $customerAccountLinkMock->expects($this->any())
             ->method('getSortOrder')
-            ->willReturn(20);
+            ->willReturn(0);
 
-        $nameInLayout = 'top.links';
+        $topLinksNameInLayout = self::STUB_TOP_LINKS_NAME_IN_LAYOUT;
 
         $blockChildren = [
-            'wishListLink' => $wishListLinkMock,
-            'customerAccountLink' => $customerAccountLinkMock
+            'customerAccountLink' => $customerAccountLinkMock,
+            'wishListLink' => $wishListLinkMock
         ];
 
-        $this->navigation->setNameInLayout($nameInLayout);
+        $this->navigation->setNameInLayout($topLinksNameInLayout);
         $this->layoutMock->expects($this->any())
             ->method('getChildBlocks')
-            ->with($nameInLayout)
+            ->with($topLinksNameInLayout)
             ->willReturn($blockChildren);
 
         /* Assertion */
         $this->assertEquals(
             [
-                0 => $wishListLinkMock,
-                1 => $customerAccountLinkMock
+                0 => $customerAccountLinkMock,
+                1 => $wishListLinkMock
             ],
             $this->navigation->getLinks()
         );
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account.xml
index a2a15a4166b73..260f35e3cf444 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_account.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/customer_account.xml
@@ -24,31 +24,31 @@
                         <arguments>
                             <argument name="label" xsi:type="string" translate="true">My Account</argument>
                             <argument name="path" xsi:type="string">customer/account</argument>
-                            <argument name="sortOrder" xsi:type="number">250</argument>
+                            <argument name="sortOrder" xsi:type="number">1</argument>
                         </arguments>
                     </block>
                     <block class="Magento\Customer\Block\Account\Delimiter" name="customer-account-navigation-delimiter-1" template="Magento_Customer::account/navigation-delimiter.phtml">
                         <arguments>
-                            <argument name="sortOrder" xsi:type="number">200</argument>
+                            <argument name="sortOrder" xsi:type="number">40</argument>
                         </arguments>
                     </block>
                     <block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-address-link">
                         <arguments>
                             <argument name="label" xsi:type="string" translate="true">Address Book</argument>
                             <argument name="path" xsi:type="string">customer/address</argument>
-                            <argument name="sortOrder" xsi:type="number">190</argument>
+                            <argument name="sortOrder" xsi:type="number">50</argument>
                         </arguments>
                     </block>
                     <block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-account-edit-link">
                         <arguments>
                             <argument name="label" xsi:type="string" translate="true">Account Information</argument>
                             <argument name="path" xsi:type="string">customer/account/edit</argument>
-                            <argument name="sortOrder" xsi:type="number">180</argument>
+                            <argument name="sortOrder" xsi:type="number">60</argument>
                         </arguments>
                     </block>
                     <block class="Magento\Customer\Block\Account\Delimiter" name="customer-account-navigation-delimiter-2" template="Magento_Customer::account/navigation-delimiter.phtml">
                         <arguments>
-                            <argument name="sortOrder" xsi:type="number">130</argument>
+                            <argument name="sortOrder" xsi:type="number">90</argument>
                         </arguments>
                     </block>
                 </block>
diff --git a/app/code/Magento/Customer/view/frontend/layout/default.xml b/app/code/Magento/Customer/view/frontend/layout/default.xml
index 3976fc6bd9090..3c6be7a9ee5fe 100644
--- a/app/code/Magento/Customer/view/frontend/layout/default.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/default.xml
@@ -8,10 +8,10 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="top.links">
-            <block class="Magento\Customer\Block\Account\Link" name="my-account-link">
+            <block class="Magento\Customer\Block\Account\Link" name="my-account-link" template="Magento_Customer::account/link/my-account.phtml">
                 <arguments>
                     <argument name="label" xsi:type="string" translate="true">My Account</argument>
-                    <argument name="sortOrder" xsi:type="number">110</argument>
+                    <argument name="sortOrder" xsi:type="number">1</argument>
                 </arguments>
             </block>
             <block class="Magento\Customer\Block\Account\RegisterLink" name="register-link">
@@ -20,7 +20,11 @@
                 </arguments>
             </block>
             <block class="Magento\Customer\Block\Account\AuthorizationLink" name="authorization-link"
-                   template="Magento_Customer::account/link/authorization.phtml"/>
+                   template="Magento_Customer::account/link/authorization.phtml">
+                <arguments>
+                    <argument name="sortOrder" xsi:type="number">30</argument>
+                </arguments>
+            </block>
         </referenceBlock>
         <referenceContainer name="content">
             <block class="Magento\Customer\Block\Account\AuthenticationPopup" name="authentication-popup" as="authentication-popup" template="Magento_Customer::account/authentication-popup.phtml">
diff --git a/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml b/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml
index 14827388e3894..bd0b6cc820e19 100644
--- a/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml
@@ -11,8 +11,7 @@ if ($block->isLoggedIn()) {
     $dataPostParam = sprintf(" data-post='%s'", $block->getPostParams());
 }
 ?>
-<li class="authorization-link" data-label="<?= $block->escapeHtml(__('or')) ?>">
-    <a <?= /* @noEscape */ $block->getLinkAttributes() ?><?= /* @noEscape */ $dataPostParam ?>>
-        <?= $block->escapeHtml($block->getLabel()) ?>
-    </a>
+<li class="link authorization-link" data-label="<?= $block->escapeHtml(__('or')) ?>">
+    <a <?= /* @noEscape */ $block->getLinkAttributes() ?>
+        <?= /* @noEscape */ $dataPostParam ?>><?= $block->escapeHtml($block->getLabel()) ?></a>
 </li>
diff --git a/app/code/Magento/Customer/view/frontend/templates/account/link/my-account.phtml b/app/code/Magento/Customer/view/frontend/templates/account/link/my-account.phtml
new file mode 100644
index 0000000000000..3e1d31df96077
--- /dev/null
+++ b/app/code/Magento/Customer/view/frontend/templates/account/link/my-account.phtml
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Customer\Block\Account\Link $block */
+
+?>
+<li class="link my-account-link">
+    <a <?= /* @noEscape */ $block->getLinkAttributes() ?>><?= $block->escapeHtml($block->getLabel()) ?></a>
+</li>
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/customer_account.xml b/app/code/Magento/Downloadable/view/frontend/layout/customer_account.xml
index 5ce45a27615e0..b86d05d20afaa 100644
--- a/app/code/Magento/Downloadable/view/frontend/layout/customer_account.xml
+++ b/app/code/Magento/Downloadable/view/frontend/layout/customer_account.xml
@@ -12,7 +12,7 @@
                 <arguments>
                     <argument name="path" xsi:type="string">downloadable/customer/products</argument>
                     <argument name="label" xsi:type="string" translate="true">My Downloadable Products</argument>
-                    <argument name="sortOrder" xsi:type="number">217</argument>
+                    <argument name="sortOrder" xsi:type="number">20</argument>
                 </arguments>
             </block>
         </referenceBlock>
diff --git a/app/code/Magento/Newsletter/view/frontend/layout/customer_account.xml b/app/code/Magento/Newsletter/view/frontend/layout/customer_account.xml
index fd55fce8ee016..9572c7e11e951 100644
--- a/app/code/Magento/Newsletter/view/frontend/layout/customer_account.xml
+++ b/app/code/Magento/Newsletter/view/frontend/layout/customer_account.xml
@@ -12,7 +12,7 @@
                 <arguments>
                     <argument name="path" xsi:type="string">newsletter/manage</argument>
                     <argument name="label" xsi:type="string" translate="true">Newsletter Subscriptions</argument>
-                    <argument name="sortOrder" xsi:type="number">40</argument>
+                    <argument name="sortOrder" xsi:type="number">110</argument>
                 </arguments>
             </block>
         </referenceBlock>
diff --git a/app/code/Magento/Paypal/view/frontend/layout/customer_account.xml b/app/code/Magento/Paypal/view/frontend/layout/customer_account.xml
index 712cccc3c1295..c830045e7991e 100644
--- a/app/code/Magento/Paypal/view/frontend/layout/customer_account.xml
+++ b/app/code/Magento/Paypal/view/frontend/layout/customer_account.xml
@@ -16,7 +16,7 @@
                 <arguments>
                     <argument name="path" xsi:type="string">paypal/billing_agreement</argument>
                     <argument name="label" xsi:type="string" translate="true">Billing Agreements</argument>
-                    <argument name="sortOrder" xsi:type="number">140</argument>
+                    <argument name="sortOrder" xsi:type="number">80</argument>
                 </arguments>
             </block>
         </referenceBlock>
diff --git a/app/code/Magento/Review/view/frontend/layout/customer_account.xml b/app/code/Magento/Review/view/frontend/layout/customer_account.xml
index 9f759dba41782..01d2281681a33 100644
--- a/app/code/Magento/Review/view/frontend/layout/customer_account.xml
+++ b/app/code/Magento/Review/view/frontend/layout/customer_account.xml
@@ -12,7 +12,7 @@
                 <arguments>
                     <argument name="path" xsi:type="string">review/customer</argument>
                     <argument name="label" xsi:type="string" translate="true">My Product Reviews</argument>
-                    <argument name="sortOrder" xsi:type="number">50</argument>
+                    <argument name="sortOrder" xsi:type="number">100</argument>
                 </arguments>
             </block>
         </referenceBlock>
diff --git a/app/code/Magento/Sales/view/frontend/layout/customer_account.xml b/app/code/Magento/Sales/view/frontend/layout/customer_account.xml
index 84ed48e2566ac..e2a74fe09f718 100644
--- a/app/code/Magento/Sales/view/frontend/layout/customer_account.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/customer_account.xml
@@ -12,7 +12,7 @@
                 <arguments>
                     <argument name="path" xsi:type="string">sales/order/history</argument>
                     <argument name="label" xsi:type="string" translate="true">My Orders</argument>
-                    <argument name="sortOrder" xsi:type="number">230</argument>
+                    <argument name="sortOrder" xsi:type="number">10</argument>
                 </arguments>
             </block>
         </referenceBlock>
diff --git a/app/code/Magento/Vault/view/frontend/layout/customer_account.xml b/app/code/Magento/Vault/view/frontend/layout/customer_account.xml
index 05044da272e6d..4495d425ff595 100644
--- a/app/code/Magento/Vault/view/frontend/layout/customer_account.xml
+++ b/app/code/Magento/Vault/view/frontend/layout/customer_account.xml
@@ -15,7 +15,7 @@
                 <arguments>
                     <argument name="path" xsi:type="string">vault/cards/listaction</argument>
                     <argument name="label" xsi:type="string" translate="true">Stored Payment Methods</argument>
-                    <argument name="sortOrder" xsi:type="number">160</argument>
+                    <argument name="sortOrder" xsi:type="number">70</argument>
                 </arguments>
             </block>
         </referenceBlock>
diff --git a/app/code/Magento/Wishlist/view/frontend/layout/customer_account.xml b/app/code/Magento/Wishlist/view/frontend/layout/customer_account.xml
index 4d0ffce0a2274..63a296dd3e48e 100644
--- a/app/code/Magento/Wishlist/view/frontend/layout/customer_account.xml
+++ b/app/code/Magento/Wishlist/view/frontend/layout/customer_account.xml
@@ -12,7 +12,7 @@
                 <arguments>
                     <argument name="path" xsi:type="string">wishlist</argument>
                     <argument name="label" xsi:type="string" translate="true">My Wish List</argument>
-                    <argument name="sortOrder" xsi:type="number">210</argument>
+                    <argument name="sortOrder" xsi:type="number">30</argument>
                 </arguments>
             </block>
         </referenceBlock>
diff --git a/app/code/Magento/Wishlist/view/frontend/layout/default.xml b/app/code/Magento/Wishlist/view/frontend/layout/default.xml
index c4f0d01707b20..cd8e6349783b4 100644
--- a/app/code/Magento/Wishlist/view/frontend/layout/default.xml
+++ b/app/code/Magento/Wishlist/view/frontend/layout/default.xml
@@ -13,7 +13,7 @@
         <referenceBlock name="top.links">
             <block class="Magento\Wishlist\Block\Link" name="wish-list-link" after="my-account-link">
                 <arguments>
-                    <argument name="sortOrder" xsi:type="number">60</argument>
+                    <argument name="sortOrder" xsi:type="number">30</argument>
                 </arguments>
             </block>
         </referenceBlock>

From d9f626d2f7fafe278e058c1cd852a624377325fe Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Tue, 23 Jun 2020 17:21:31 +0300
Subject: [PATCH 0568/1718] Add validation for phone to billing form

---
 app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
index 16450ec6ff2c2..4c84ea5ae764f 100644
--- a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
+++ b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
@@ -351,6 +351,9 @@ private function getBillingAddressComponent($paymentCode, $elements)
                                 ],
                             ],
                             'telephone' => [
+                                'validation' => [
+                                    'validate-phoneStrict' => 0,
+                                ],
                                 'config' => [
                                     'tooltip' => [
                                         'description' => __('For delivery questions.'),

From 3ed5cc4c16440ff2425197697e9b41b5e59b45b8 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Tue, 23 Jun 2020 18:29:05 +0300
Subject: [PATCH 0569/1718] use action group for adding to cart

---
 .../CaptchaWithDisabledGuestCheckoutTest.xml              | 4 +---
 .../Mftf/Test/AdminAddInStockProductToTheCartTest.xml     | 4 +---
 ...roductWithRegularPriceInStockWithCustomOptionsTest.xml | 4 +---
 .../AdminCreateCatalogPriceRuleByPercentTest.xml          | 3 +--
 ...eCatalogPriceRuleEntityFromConfigurableProductTest.xml | 4 +---
 ...ptionToTheShoppingCartWithoutAnySelectedOptionTest.xml | 3 +--
 .../Mftf/Test/StorefrontCheckTaxAddingValidVATIdTest.xml  | 4 +---
 .../Test/AdminCreateCartPriceRuleEmptyFromDateTest.xml    | 4 +---
 .../Test/AdminCreateCartPriceRuleForCouponCodeTest.xml    | 4 +---
 .../AdminCreateCartPriceRuleForGeneratedCouponTest.xml    | 4 +---
 .../Mftf/Test/CartPriceRuleForConfigurableProductTest.xml | 8 ++------
 .../Test/Mftf/Test/StorefrontCartPriceRuleCountryTest.xml | 4 +---
 .../Mftf/Test/StorefrontCartPriceRulePostcodeTest.xml     | 4 +---
 .../Mftf/Test/StorefrontCartPriceRuleQuantityTest.xml     | 8 ++------
 .../Test/Mftf/Test/StorefrontCartPriceRuleStateTest.xml   | 4 +---
 .../Mftf/Test/StorefrontCartPriceRuleSubtotalTest.xml     | 8 ++------
 16 files changed, 19 insertions(+), 55 deletions(-)

diff --git a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest/CaptchaWithDisabledGuestCheckoutTest.xml b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest/CaptchaWithDisabledGuestCheckoutTest.xml
index bfea4e99996c3..9e99fa96ee766 100644
--- a/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest/CaptchaWithDisabledGuestCheckoutTest.xml
+++ b/app/code/Magento/Captcha/Test/Mftf/Test/CaptchaFormsDisplayingTest/CaptchaWithDisabledGuestCheckoutTest.xml
@@ -34,9 +34,7 @@
         </after>
         <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.sku$$)}}" stepKey="openProductPage"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
-        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addToCart"/>
-        <waitForPageLoad stepKey="waitForAddToCart"/>
-        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
+        <actionGroup ref="StorefrontClickAddToCartOnProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage"/>
         <waitForText userInput="You added $$createSimpleProduct.name$$ to your shopping cart." stepKey="waitForText"/>
         <actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickCart"/>
         <click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml
index 52da8c70a3bc8..a41d0836a2ded 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml
@@ -78,9 +78,7 @@
         <see selector="{{StorefrontProductInfoMainSection.productStockStatus}}" userInput="In Stock" stepKey="seeProductStatusInStoreFront"/>
         <!--Add Product to the cart-->
         <fillField selector="{{StorefrontProductPageSection.qtyInput}}" userInput="1" stepKey="fillProductQuantity"/>
-        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="clickOnAddToCartButton"/>
-        <waitForPageLoad stepKey="waitForProductToAddInCart"/>
-        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
+        <actionGroup ref="StorefrontClickAddToCartOnProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage"/>
         <seeElement selector="{{StorefrontProductPageSection.successMsg}}" stepKey="seeSuccessSaveMessage"/>
         <seeElement selector="{{StorefrontMinicartSection.quantity(1)}}" stepKey="seeAddedProductQuantityInCart"/>
         <actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickOnMiniCart"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml
index 855a2b1d9b0cc..e68e903360aeb 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml
@@ -150,9 +150,7 @@
         <!-- Verify added Product in cart -->
         <selectOption selector="{{StorefrontProductPageSection.customOptionDropDown}}" userInput="{{simpleProductCustomizableOption.option_0_title}} +$98.00" stepKey="selectCustomOption"/>
         <fillField selector="{{StorefrontProductPageSection.qtyInput}}" userInput="1" stepKey="fillProductQuantity"/>
-        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="clickOnAddToCartButton"/>
-        <waitForPageLoad stepKey="waitForProductToAddInCart"/>
-        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
+        <actionGroup ref="StorefrontClickAddToCartOnProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage"/>
         <seeElement selector="{{StorefrontProductPageSection.successMsg}}" stepKey="seeYouAddedSimpleprod4ToYourShoppingCartSuccessSaveMessage"/>
         <seeElement selector="{{StorefrontMinicartSection.quantity(1)}}" stepKey="seeAddedProductQuantityInCart"/>
         <actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickOnMiniCart"/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleByPercentTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleByPercentTest.xml
index fcae0065f1b53..a0145b117f112 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleByPercentTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleByPercentTest.xml
@@ -61,8 +61,7 @@
         <see stepKey="seeNewPrice2" selector="{{StorefrontProductInfoMainSection.updatedPrice}}" userInput="$110.70"/>
 
         <!-- Add the product to cart and check that the price is correct there -->
-        <click stepKey="addToCart" selector="{{StorefrontProductActionSection.addToCart}}"/>
-        <waitForPageLoad stepKey="waitForAddedToCart"/>
+        <actionGroup ref="StorefrontClickAddToCartOnProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage"/>
         <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToCheckout"/>
         <see stepKey="seeNewPriceInCart" selector="{{CheckoutCartSummarySection.subtotal}}" userInput="$110.70"/>
     </test>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest/AdminDeleteCatalogPriceRuleEntityFromConfigurableProductTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest/AdminDeleteCatalogPriceRuleEntityFromConfigurableProductTest.xml
index 6b34fd1e67e9b..6666e80f3ee04 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest/AdminDeleteCatalogPriceRuleEntityFromConfigurableProductTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest/AdminDeleteCatalogPriceRuleEntityFromConfigurableProductTest.xml
@@ -131,9 +131,7 @@
 
         <!-- Assert that the rule isn't present in the Shopping Cart -->
         <selectOption selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" userInput="option1" stepKey="selectOption1"/>
-        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addToCart1"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad4"/>
-        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
+        <actionGroup ref="StorefrontClickAddToCartOnProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage"/>
         <see selector="{{StorefrontMessagesSection.success}}" userInput="You added $$createConfigProduct1.name$ to your shopping cart." stepKey="seeAddToCartSuccessMessage"/>
         <actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="openMiniShoppingCart1"/>
         <see selector="{{StorefrontMinicartSection.productPriceByName($$createConfigProduct1.name$$)}}" userInput="$$createConfigProduct1.price$$" stepKey="seeCorrectProductPrice1"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontAddProductWithAllTypesOfCustomOptionToTheShoppingCartWithoutAnySelectedOptionTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontAddProductWithAllTypesOfCustomOptionToTheShoppingCartWithoutAnySelectedOptionTest.xml
index a5c8eb0da6530..f70b39d839422 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontAddProductWithAllTypesOfCustomOptionToTheShoppingCartWithoutAnySelectedOptionTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontAddProductWithAllTypesOfCustomOptionToTheShoppingCartWithoutAnySelectedOptionTest.xml
@@ -36,8 +36,7 @@
         </actionGroup>
 
         <!--Click on Add To Cart button-->
-        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addToCart"/>
-        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <actionGroup ref="StorefrontClickAddToCartOnProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage"/>
 
         <!--Assert all types of product options field displayed Required message -->
         <actionGroup ref="AssertStorefrontSeeElementActionGroup" stepKey="assertRequiredProductOptionField">
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCheckTaxAddingValidVATIdTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCheckTaxAddingValidVATIdTest.xml
index 80cdeadb391da..85f4976c88572 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCheckTaxAddingValidVATIdTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCheckTaxAddingValidVATIdTest.xml
@@ -83,9 +83,7 @@
         <see userInput="$$createProduct.name$$" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertFirstProductNameTitle"/>
 
         <!--Add a product to the cart-->
-        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
-        <waitForPageLoad stepKey="waitForAddProductToCart"/>
-        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
+        <actionGroup ref="StorefrontClickAddToCartOnProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage"/>
         <!--Proceed to checkout-->
         <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="GoToCheckoutFromMinicartActionGroup"/>
         <!-- Click next button to open payment section -->
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleEmptyFromDateTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleEmptyFromDateTest.xml
index 221f80b887fe5..f32442ca5bc98 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleEmptyFromDateTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleEmptyFromDateTest.xml
@@ -83,9 +83,7 @@
         <!-- Spot check the storefront -->
         <amOnPage url="$$product.custom_attributes[url_key]$$.html" stepKey="goToProductPage"/>
         <waitForPageLoad stepKey="waitForProductPageLoad"/>
-        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
-        <waitForPageLoad stepKey="waitForAddToCart"/>
-        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
+        <actionGroup ref="StorefrontClickAddToCartOnProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage"/>
         <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToCartPage"/>
         <actionGroup ref="StorefrontApplyCouponActionGroup" stepKey="applyCoupon">
             <argument name="coupon" value="_defaultCoupon"/>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForCouponCodeTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForCouponCodeTest.xml
index e2a65685bd97e..557a585858868 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForCouponCodeTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForCouponCodeTest.xml
@@ -75,9 +75,7 @@
         <!-- Spot check the storefront -->
         <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="goToProductPage"/>
         <waitForPageLoad stepKey="waitForProductPageLoad"/>
-        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
-        <waitForPageLoad stepKey="waitForAddToCart"/>
-        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
+        <actionGroup ref="StorefrontClickAddToCartOnProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage"/>
         <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToCartPage"/>
         <actionGroup ref="StorefrontApplyCouponActionGroup" stepKey="applyCoupon">
             <argument name="coupon" value="_defaultCoupon"/>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml
index 9f4168575595a..e18a9eaadcd23 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForGeneratedCouponTest.xml
@@ -79,9 +79,7 @@
         <!-- Spot check the storefront -->
         <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="goToProductPage"/>
         <waitForPageLoad stepKey="waitForProductPageLoad"/>
-        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
-        <waitForPageLoad stepKey="waitForAddToCart"/>
-        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
+        <actionGroup ref="StorefrontClickAddToCartOnProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage"/>
         <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToCartPage"/>
         <conditionalClick selector="{{StorefrontSalesRuleCartCouponSection.couponHeader}}" dependentSelector="{{StorefrontSalesRuleCartCouponSection.discountBlockActive}}" visible="false" stepKey="clickCouponHeader"/>
         <waitForElementVisible selector="{{StorefrontSalesRuleCartCouponSection.couponField}}" stepKey="waitForCouponField" />
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/CartPriceRuleForConfigurableProductTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/CartPriceRuleForConfigurableProductTest.xml
index bc608c0e06086..ad1ff69a60901 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/CartPriceRuleForConfigurableProductTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/CartPriceRuleForConfigurableProductTest.xml
@@ -126,15 +126,11 @@
         <!-- Add the first product to the cart -->
         <amOnPage url="$$createConfigChildProduct1.sku$$.html" stepKey="goToProductPage1"/>
         <waitForPageLoad stepKey="waitForProductPageLoad1"/>
-        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart1"/>
-        <waitForPageLoad stepKey="waitForAddToCart1"/>
-        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
+        <actionGroup ref="StorefrontClickAddToCartOnProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage"/>
         <!-- Add the second product to the cart -->
         <amOnPage url="$$createConfigChildProduct2.sku$$.html" stepKey="goToProductPage2"/>
         <waitForPageLoad stepKey="waitForProductPageLoad2"/>
-        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart2"/>
-        <waitForPageLoad stepKey="waitForAddToCart2"/>
-        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage2"/>
+        <actionGroup ref="StorefrontClickAddToCartOnProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage2"/>
 
         <!--View and edit cart-->
         <actionGroup ref="ClickViewAndEditCartFromMiniCartActionGroup" stepKey="clickViewAndEditCartFromMiniCart"/>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleCountryTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleCountryTest.xml
index 51e25d3a7e255..eef5dadfbe5d8 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleCountryTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleCountryTest.xml
@@ -66,9 +66,7 @@
         <amOnPage url="$$createPreReqProduct.name$$.html" stepKey="goToProductPage"/>
         <waitForPageLoad stepKey="waitForProductPageLoad"/>
         <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="1" stepKey="fillQuantity"/>
-        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
-        <waitForPageLoad stepKey="waitForAddToCart"/>
-        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
+        <actionGroup ref="StorefrontClickAddToCartOnProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage"/>
 
         <!-- Should not see the discount yet because we have not set country -->
         <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToCartPage"/>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRulePostcodeTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRulePostcodeTest.xml
index 420bc37d5c1b2..69097e3269fcb 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRulePostcodeTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRulePostcodeTest.xml
@@ -70,9 +70,7 @@
         <amOnPage url="$$createPreReqProduct.name$$.html" stepKey="goToProductPage"/>
         <waitForPageLoad stepKey="waitForProductPageLoad"/>
         <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="1" stepKey="fillQuantity"/>
-        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
-        <waitForPageLoad stepKey="waitForAddToCart"/>
-        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
+        <actionGroup ref="StorefrontClickAddToCartOnProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage"/>
 
         <!-- Should not see the discount yet because we have not filled in postcode -->
         <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToCartPage"/>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleQuantityTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleQuantityTest.xml
index 279747f87d66d..18057965c28e1 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleQuantityTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleQuantityTest.xml
@@ -68,9 +68,7 @@
         <amOnPage url="$$createPreReqProduct.name$$.html" stepKey="goToProductPage"/>
         <waitForPageLoad stepKey="waitForProductPageLoad"/>
         <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="1" stepKey="fillQuantity"/>
-        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
-        <waitForPageLoad stepKey="waitForAddToCart"/>
-        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
+        <actionGroup ref="StorefrontClickAddToCartOnProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage"/>
 
         <!-- Should not see the discount yet because we have only 1 item in our cart -->
         <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToCartPage"/>
@@ -81,9 +79,7 @@
         <amOnPage url="$$createPreReqProduct.name$$.html" stepKey="goToProductPage2"/>
         <waitForPageLoad stepKey="waitForProductPageLoad2"/>
         <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="1" stepKey="fillQuantity2"/>
-        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart2"/>
-        <waitForPageLoad stepKey="waitForAddToCart2"/>
-        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage2"/>
+        <actionGroup ref="StorefrontClickAddToCartOnProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage2"/>
 
         <!-- Now we should see the discount because we have more than 1 item -->
         <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToCartPage2"/>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleStateTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleStateTest.xml
index a3f32c0781a52..c13b74b6990d0 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleStateTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleStateTest.xml
@@ -66,9 +66,7 @@
         <amOnPage url="$$createPreReqProduct.name$$.html" stepKey="goToProductPage"/>
         <waitForPageLoad stepKey="waitForProductPageLoad"/>
         <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="1" stepKey="fillQuantity"/>
-        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
-        <waitForPageLoad stepKey="waitForAddToCart"/>
-        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
+        <actionGroup ref="StorefrontClickAddToCartOnProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage"/>
 
         <!-- Should not see the discount yet because we have not filled in postcode -->
         <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToCartPage"/>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleSubtotalTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleSubtotalTest.xml
index 39ac14315110e..97b75ae772f08 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleSubtotalTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRuleSubtotalTest.xml
@@ -66,9 +66,7 @@
         <amOnPage url="$$createPreReqProduct.name$$.html" stepKey="goToProductPage"/>
         <waitForPageLoad stepKey="waitForProductPageLoad"/>
         <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="1" stepKey="fillQuantity"/>
-        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart"/>
-        <waitForPageLoad stepKey="waitForAddToCart"/>
-        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
+        <actionGroup ref="StorefrontClickAddToCartOnProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage"/>
 
         <!-- Should not see the discount yet because we have not exceeded $200 -->
         <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToCartPage"/>
@@ -79,9 +77,7 @@
         <amOnPage url="$$createPreReqProduct.name$$.html" stepKey="goToProductPage2"/>
         <waitForPageLoad stepKey="waitForProductPageLoad2"/>
         <fillField selector="{{StorefrontProductActionSection.quantity}}" userInput="1" stepKey="fillQuantity2"/>
-        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addProductToCart2"/>
-        <waitForPageLoad stepKey="waitForAddToCart2"/>
-        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage2"/>
+        <actionGroup ref="StorefrontClickAddToCartOnProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage2"/>
 
         <!-- Now we should see the discount because we exceeded $200 -->
         <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToCartPage2"/>

From 1e22f3d2dd53a4c6497f72630fc4e5d8420034fc Mon Sep 17 00:00:00 2001
From: Tu Nguyen <tuna@ecommage.com>
Date: Tue, 23 Jun 2020 23:31:53 +0700
Subject: [PATCH 0570/1718] used escaper in block

---
 .../templates/account/link/authorization.phtml         | 10 ++++++----
 .../frontend/templates/account/link/my-account.phtml   |  8 +++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml b/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml
index bd0b6cc820e19..e9df83a5913c1 100644
--- a/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml
@@ -4,14 +4,16 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Customer\Block\Account\AuthorizationLink $block */
-
+/**
+ * @var \Magento\Customer\Block\Account\AuthorizationLink $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 $dataPostParam = '';
 if ($block->isLoggedIn()) {
     $dataPostParam = sprintf(" data-post='%s'", $block->getPostParams());
 }
 ?>
-<li class="link authorization-link" data-label="<?= $block->escapeHtml(__('or')) ?>">
+<li class="link authorization-link" data-label="<?= $escaper->escapeHtml(__('or')) ?>">
     <a <?= /* @noEscape */ $block->getLinkAttributes() ?>
-        <?= /* @noEscape */ $dataPostParam ?>><?= $block->escapeHtml($block->getLabel()) ?></a>
+        <?= /* @noEscape */ $dataPostParam ?>><?= $escaper->escapeHtml($block->getLabel()) ?></a>
 </li>
diff --git a/app/code/Magento/Customer/view/frontend/templates/account/link/my-account.phtml b/app/code/Magento/Customer/view/frontend/templates/account/link/my-account.phtml
index 3e1d31df96077..5649ac7c7d7b4 100644
--- a/app/code/Magento/Customer/view/frontend/templates/account/link/my-account.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/account/link/my-account.phtml
@@ -4,9 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Customer\Block\Account\Link $block */
-
+/**
+ * @var \Magento\Customer\Block\Account\Link $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <li class="link my-account-link">
-    <a <?= /* @noEscape */ $block->getLinkAttributes() ?>><?= $block->escapeHtml($block->getLabel()) ?></a>
+    <a <?= /* @noEscape */ $block->getLinkAttributes() ?>><?= $escaper->escapeHtml($block->getLabel()) ?></a>
 </li>

From 35f7e8d29a8f570c0eb02b80116618f9d09d5de1 Mon Sep 17 00:00:00 2001
From: Zach Nanninga <zach@mediotype.com>
Date: Tue, 23 Jun 2020 12:38:22 -0500
Subject: [PATCH 0571/1718] ISSUE-28656 - Add basic unit test compatibility for
 new Inline app state dependency

---
 .../Magento/Framework/Translate/Inline.php    |  6 ++--
 .../Translate/Test/Unit/InlineTest.php        | 34 ++++++++++++++++---
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/lib/internal/Magento/Framework/Translate/Inline.php b/lib/internal/Magento/Framework/Translate/Inline.php
index 4e9dcc0f8df7a..87f9525910e02 100644
--- a/lib/internal/Magento/Framework/Translate/Inline.php
+++ b/lib/internal/Magento/Framework/Translate/Inline.php
@@ -131,9 +131,9 @@ public function isAllowed()
             if (!$this->scope instanceof \Magento\Framework\App\ScopeInterface) {
                 $scope = $this->scopeResolver->getScope($this->scope);
             }
-            $this->isAllowed = $this->isAreaAllowed()
-                && $this->config->isActive($scope)
-                && $this->config->isDevAllowed($scope);
+            $this->isAllowed = $this->config->isActive($scope)
+                && $this->config->isDevAllowed($scope)
+                && $this->isAreaAllowed();
         }
         return $this->state->isEnabled() && $this->isAllowed;
     }
diff --git a/lib/internal/Magento/Framework/Translate/Test/Unit/InlineTest.php b/lib/internal/Magento/Framework/Translate/Test/Unit/InlineTest.php
index 8ef3d840568dc..d0828d2255f11 100644
--- a/lib/internal/Magento/Framework/Translate/Test/Unit/InlineTest.php
+++ b/lib/internal/Magento/Framework/Translate/Test/Unit/InlineTest.php
@@ -7,8 +7,10 @@
 
 namespace Magento\Framework\Translate\Test\Unit;
 
+use Magento\Framework\App\Area;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ScopeResolverInterface;
+use Magento\Framework\App\State as AppState;
 use Magento\Framework\Translate\Inline;
 use Magento\Framework\Translate\Inline\ConfigInterface;
 use Magento\Framework\Translate\Inline\ParserFactory;
@@ -51,6 +53,11 @@ class InlineTest extends TestCase
      */
     protected $stateMock;
 
+    /**
+     * @var AppState|MockObject
+     */
+    protected $appStateMock;
+
     protected function setUp(): void
     {
         $this->scopeResolverMock =
@@ -60,6 +67,7 @@ protected function setUp(): void
         $this->configMock = $this->getMockForAbstractClass(ConfigInterface::class);
         $this->parserMock = $this->getMockForAbstractClass(ParserInterface::class);
         $this->stateMock = $this->getMockForAbstractClass(StateInterface::class);
+        $this->appStateMock = $this->createMock(AppState::class);
     }
 
     /**
@@ -79,7 +87,8 @@ public function testIsAllowed($isEnabled, $isActive, $isDevAllowed, $result)
             $this->layoutMock,
             $this->configMock,
             $this->parserMock,
-            $this->stateMock
+            $this->stateMock,
+            $this->appStateMock
         );
 
         $this->assertEquals($result, $model->isAllowed());
@@ -111,7 +120,8 @@ public function testGetParser()
             $this->layoutMock,
             $this->configMock,
             $this->parserMock,
-            $this->stateMock
+            $this->stateMock,
+            $this->appStateMock
         );
         $this->assertEquals($this->parserMock, $model->getParser());
     }
@@ -133,6 +143,7 @@ public function testProcessResponseBodyStripInline($body, $expected)
             $this->configMock,
             $this->parserMock,
             $this->stateMock,
+            $this->appStateMock,
             '',
             '',
             $scope
@@ -201,6 +212,7 @@ public function testProcessResponseBody($scope, $body, $expected)
             $this->configMock,
             $this->parserMock,
             $this->stateMock,
+            $this->appStateMock,
             '',
             '',
             $scope
@@ -266,6 +278,7 @@ public function testProcessResponseBodyGetInlineScript($scope, $body, $expected)
             $this->configMock,
             $this->parserMock,
             $this->stateMock,
+            $this->appStateMock,
             '',
             '',
             $scope
@@ -292,8 +305,13 @@ public function processResponseBodyGetInlineScriptDataProvider()
      * @param bool $isDevAllowed
      * @param null|string $scope
      */
-    protected function prepareIsAllowed($isEnabled, $isActive, $isDevAllowed, $scope = null)
-    {
+    protected function prepareIsAllowed(
+        $isEnabled,
+        $isActive,
+        $isDevAllowed,
+        $scope = null,
+        $area = Area::AREA_FRONTEND
+    ) {
         $scopeMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
         $this->stateMock->expects($this->any())->method('isEnabled')->willReturn($isEnabled);
         $this->scopeResolverMock->expects(
@@ -323,5 +341,13 @@ protected function prepareIsAllowed($isEnabled, $isActive, $isDevAllowed, $scope
         )->willReturn(
             $isDevAllowed
         );
+
+        $this->appStateMock->expects(
+            ($isActive && $isDevAllowed) ? $this->once() : $this->never()
+        )->method(
+            'getAreaCode'
+        )->willReturn(
+            $area
+        );
     }
 }

From b444002620bc37a75ac4a521f84b76109b194dc0 Mon Sep 17 00:00:00 2001
From: Zach Nanninga <zach@mediotype.com>
Date: Tue, 23 Jun 2020 12:56:50 -0500
Subject: [PATCH 0572/1718] ISSUE-28656 - Add frontend area (allowed) to
 existing isAllowed scenarios, and add scenarios for all other areas where
 other enabled checks are true

---
 .../Translate/Test/Unit/InlineTest.php        | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/lib/internal/Magento/Framework/Translate/Test/Unit/InlineTest.php b/lib/internal/Magento/Framework/Translate/Test/Unit/InlineTest.php
index d0828d2255f11..a689204cbb7dc 100644
--- a/lib/internal/Magento/Framework/Translate/Test/Unit/InlineTest.php
+++ b/lib/internal/Magento/Framework/Translate/Test/Unit/InlineTest.php
@@ -74,12 +74,13 @@ protected function setUp(): void
      * @param bool $isEnabled
      * @param bool $isActive
      * @param bool $isDevAllowed
+     * @param string $area
      * @param bool $result
      * @dataProvider isAllowedDataProvider
      */
-    public function testIsAllowed($isEnabled, $isActive, $isDevAllowed, $result)
+    public function testIsAllowed($isEnabled, $isActive, $isDevAllowed, $area, $result)
     {
-        $this->prepareIsAllowed($isEnabled, $isActive, $isDevAllowed);
+        $this->prepareIsAllowed($isEnabled, $isActive, $isDevAllowed, null, $area);
 
         $model = new Inline(
             $this->scopeResolverMock,
@@ -101,14 +102,21 @@ public function testIsAllowed($isEnabled, $isActive, $isDevAllowed, $result)
     public function isAllowedDataProvider()
     {
         return [
-            [true, true, true, true],
-            [true, false, true, false],
-            [true, true, false, false],
-            [true, false, false, false],
-            [false, true, true, false],
-            [false, false, true, false],
-            [false, true, false, false],
-            [false, false, false, false],
+            [true, true, true, Area::AREA_FRONTEND, true],
+            [true, false, true, Area::AREA_FRONTEND, false],
+            [true, true, false, Area::AREA_FRONTEND, false],
+            [true, false, false, Area::AREA_FRONTEND, false],
+            [false, true, true, Area::AREA_FRONTEND, false],
+            [false, false, true, Area::AREA_FRONTEND, false],
+            [false, true, false, Area::AREA_FRONTEND, false],
+            [false, false, false, Area::AREA_FRONTEND, false],
+            [true, true, true, Area::AREA_GLOBAL, false],
+            [true, true, true, Area::AREA_ADMINHTML, true],
+            [true, true, true, Area::AREA_DOC, false],
+            [true, true, true, Area::AREA_CRONTAB, false],
+            [true, true, true, Area::AREA_WEBAPI_REST, false],
+            [true, true, true, Area::AREA_WEBAPI_SOAP, false],
+            [true, true, true, Area::AREA_GRAPHQL, false]
         ];
     }
 

From 85db11d88a350d01d764efd2bf469cb227f6955b Mon Sep 17 00:00:00 2001
From: Oleksandr Melnyk <sasha19957099@gmail.com>
Date: Tue, 23 Jun 2020 21:01:23 +0300
Subject: [PATCH 0573/1718] magento/magento2#27952: missing store_name in
 GraphQL resolver - added store_name

---
 .../Store/Api/Data/StoreConfigInterface.php   | 21 ++++++++++--
 .../Magento/Store/Model/Data/StoreConfig.php  | 32 ++++++++++++++++---
 .../Model/Service/StoreConfigManager.php      | 11 ++++++-
 .../Model/Service/StoreConfigManagerTest.php  |  6 ++++
 .../Store/StoreConfigDataProvider.php         | 13 ++++----
 composer.lock                                 |  2 +-
 .../GraphQl/Store/StoreConfigResolverTest.php |  2 +-
 7 files changed, 69 insertions(+), 18 deletions(-)

diff --git a/app/code/Magento/Store/Api/Data/StoreConfigInterface.php b/app/code/Magento/Store/Api/Data/StoreConfigInterface.php
index 537fec4c75df6..78d7455dc5a92 100644
--- a/app/code/Magento/Store/Api/Data/StoreConfigInterface.php
+++ b/app/code/Magento/Store/Api/Data/StoreConfigInterface.php
@@ -7,7 +7,7 @@
 
 /**
  * StoreConfig interface
- *
+ * Interface for store config
  * @api
  * @since 100.0.2
  */
@@ -141,7 +141,7 @@ public function setWeightUnit($weightUnit);
     public function getBaseUrl();
 
     /**
-     * set base URL
+     * Set base URL
      *
      * @param string $baseUrl
      * @return $this
@@ -201,7 +201,7 @@ public function setBaseMediaUrl($baseMediaUrl);
     public function getSecureBaseUrl();
 
     /**
-     * set secure base URL
+     * Set secure base URL
      *
      * @param string $secureBaseUrl
      * @return $this
@@ -269,4 +269,19 @@ public function getExtensionAttributes();
     public function setExtensionAttributes(
         \Magento\Store\Api\Data\StoreConfigExtensionInterface $extensionAttributes
     );
+
+    /**
+     * Get store code
+     *
+     * @return string
+     */
+    public function getStoreName();
+
+    /**
+     * Set store name
+     *
+     * @param string $storeName
+     * @return $this
+     */
+    public function setStoreName(string $storeName);
 }
diff --git a/app/code/Magento/Store/Model/Data/StoreConfig.php b/app/code/Magento/Store/Model/Data/StoreConfig.php
index 6634e2cb05bd9..d1e4aa3e25088 100644
--- a/app/code/Magento/Store/Model/Data/StoreConfig.php
+++ b/app/code/Magento/Store/Model/Data/StoreConfig.php
@@ -7,7 +7,7 @@
 
 /**
  * Class StoreConfig
- *
+ * Allows to get and set store config values
  * @codeCoverageIgnore
  */
 class StoreConfig extends \Magento\Framework\Api\AbstractExtensibleObject implements
@@ -29,6 +29,7 @@ class StoreConfig extends \Magento\Framework\Api\AbstractExtensibleObject implem
     const KEY_SECURE_BASE_LINK_URL = 'secure_base_link_url';
     const KEY_SECURE_BASE_STATIC_URL = 'secure_base_static_url';
     const KEY_SECURE_BASE_MEDIA_URL = 'secure_base_media_url';
+    const KEY_STORE_NAME = 'store_name';
 
     /**
      * Get store id
@@ -188,7 +189,7 @@ public function getBaseUrl()
     }
 
     /**
-     * set base URL
+     * Set base URL
      *
      * @param string $baseUrl
      * @return $this
@@ -293,7 +294,7 @@ public function getSecureBaseUrl()
     }
 
     /**
-     * set secure base URL
+     * Set secure base URL
      *
      * @param string $secureBaseUrl
      * @return $this
@@ -367,7 +368,7 @@ public function setSecureBaseMediaUrl($secureBaseMediaUrl)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @return \Magento\Store\Api\Data\StoreConfigExtensionInterface|null
      */
@@ -377,7 +378,7 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @param \Magento\Store\Api\Data\StoreConfigExtensionInterface $extensionAttributes
      * @return $this
@@ -387,4 +388,25 @@ public function setExtensionAttributes(
     ) {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
+
+    /**
+     * Get store code
+     *
+     * @return string
+     */
+    public function getStoreName()
+    {
+        return $this->_get(self::KEY_STORE_NAME);
+    }
+
+    /**
+     * Set store name
+     *
+     * @param string $storeName
+     * @return $this
+     */
+    public function setStoreName(string $storeName)
+    {
+        return $this->setData(self::KEY_STORE_NAME, $storeName);
+    }
 }
diff --git a/app/code/Magento/Store/Model/Service/StoreConfigManager.php b/app/code/Magento/Store/Model/Service/StoreConfigManager.php
index b3c2208a58361..26f4b0e9837c4 100644
--- a/app/code/Magento/Store/Model/Service/StoreConfigManager.php
+++ b/app/code/Magento/Store/Model/Service/StoreConfigManager.php
@@ -5,6 +5,10 @@
  */
 namespace Magento\Store\Model\Service;
 
+/**
+ * Class StoreConfigManager
+ * Allows to get store config
+ */
 class StoreConfigManager implements \Magento\Store\Api\StoreConfigManagerInterface
 {
     /**
@@ -53,6 +57,8 @@ public function __construct(
     }
 
     /**
+     * Get store configs
+     *
      * @param string[] $storeCodes list of stores by store codes, will return all if storeCodes is not set
      * @return \Magento\Store\Api\Data\StoreConfigInterface[]
      */
@@ -71,6 +77,8 @@ public function getStoreConfigs(array $storeCodes = null)
     }
 
     /**
+     * Get store config
+     *
      * @param \Magento\Store\Model\Store $store
      * @return \Magento\Store\Api\Data\StoreConfigInterface
      */
@@ -81,7 +89,8 @@ protected function getStoreConfig($store)
 
         $storeConfig->setId($store->getId())
             ->setCode($store->getCode())
-            ->setWebsiteId($store->getWebsiteId());
+            ->setWebsiteId($store->getWebsiteId())
+            ->setStoreName($store->getName());
 
         foreach ($this->configPaths as $methodName => $configPath) {
             $configValue = $this->scopeConfig->getValue(
diff --git a/app/code/Magento/Store/Test/Unit/Model/Service/StoreConfigManagerTest.php b/app/code/Magento/Store/Test/Unit/Model/Service/StoreConfigManagerTest.php
index c17e2846e22df..51aecb7f39f12 100644
--- a/app/code/Magento/Store/Test/Unit/Model/Service/StoreConfigManagerTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/Service/StoreConfigManagerTest.php
@@ -87,6 +87,9 @@ protected function getStoreMock(array $storeConfig)
         $storeMock->expects($this->once())
             ->method('getWebsiteId')
             ->willReturn($storeConfig['website_id']);
+        $storeMock->expects($this->any())
+            ->method('getName')
+            ->willReturn($storeConfig['store_name']);
 
         $urlMap = [
             [UrlInterface::URL_TYPE_WEB, false, $storeConfig['base_url']],
@@ -145,6 +148,7 @@ public function testGetStoreConfigs()
         $baseCurrencyCode = 'USD';
         $defaultDisplayCurrencyCode = 'GBP';
         $weightUnit = 'lbs';
+        $storeName = 'Default Store View';
 
         $storeMocks = [];
         $storeConfigs = [
@@ -159,6 +163,7 @@ public function testGetStoreConfigs()
             'secure_base_static_url' => $secureBaseStaticUrl,
             'base_media_url' => $baseMediaUrl,
             'secure_base_media_url' => $secureBaseMediaUrl,
+            'store_name' => $storeName,
         ];
         $storeMocks[] = $this->getStoreMock($storeConfigs);
 
@@ -205,6 +210,7 @@ public function testGetStoreConfigs()
         $this->assertEquals($secureBaseStaticUrl, $result[0]->getSecureBaseStaticUrl());
         $this->assertEquals($baseMediaUrl, $result[0]->getBaseMediaUrl());
         $this->assertEquals($secureBaseMediaUrl, $result[0]->getSecureBaseMediaUrl());
+        $this->assertEquals($storeName, $result[0]->getStoreName());
 
         $this->assertEquals($timeZone, $result[0]->getTimezone());
         $this->assertEquals($locale, $result[0]->getLocale());
diff --git a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
index 59f9831789a35..76b9a12ad0893 100644
--- a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
+++ b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
@@ -55,11 +55,10 @@ public function __construct(
      */
     public function getStoreConfigData(StoreInterface $store): array
     {
-        $storeConfigData = array_merge(
-            $this->getBaseConfigData($store),
-            $this->getExtendedConfigData((int)$store->getId())
+        return array_merge(
+            $this->getExtendedConfigData((int)$store->getId()),
+            $this->getBaseConfigData($store)
         );
-        return $storeConfigData;
     }
 
     /**
@@ -72,7 +71,7 @@ private function getBaseConfigData(StoreInterface $store) : array
     {
         $storeConfig = current($this->storeConfigManager->getStoreConfigs([$store->getCode()]));
 
-        $storeConfigData = [
+        return [
             'id' => $storeConfig->getId(),
             'code' => $storeConfig->getCode(),
             'website_id' => $storeConfig->getWebsiteId(),
@@ -88,9 +87,9 @@ private function getBaseConfigData(StoreInterface $store) : array
             'secure_base_url' => $storeConfig->getSecureBaseUrl(),
             'secure_base_link_url' => $storeConfig->getSecureBaseLinkUrl(),
             'secure_base_static_url' => $storeConfig->getSecureBaseStaticUrl(),
-            'secure_base_media_url' => $storeConfig->getSecureBaseMediaUrl()
+            'secure_base_media_url' => $storeConfig->getSecureBaseMediaUrl(),
+            'store_name' => $storeConfig->getStoreName()
         ];
-        return $storeConfigData;
     }
 
     /**
diff --git a/composer.lock b/composer.lock
index 6a47e7e44ab69..6a6c945b6416b 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": "e86af25d9a4a1942c437cca58f9f1efb",
+    "content-hash": "f3674961f96b48fdd025a6c94610c8eb",
     "packages": [
         {
             "name": "colinmollenhour/cache-backend-file",
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
index 48619d1392309..6a87788ab09e9 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
@@ -91,6 +91,6 @@ public function testGetStoreConfig()
             $response['storeConfig']['secure_base_static_url']
         );
         $this->assertEquals($storeConfig->getSecureBaseMediaUrl(), $response['storeConfig']['secure_base_media_url']);
-        $this->assertEquals('Test Store', $response['storeConfig']['store_name']);
+        $this->assertEquals($storeConfig->getStoreName(), $response['storeConfig']['store_name']);
     }
 }

From 26df598a660ad6b7785db32505f1431be63ad105 Mon Sep 17 00:00:00 2001
From: Oleksandr Melnyk <sasha19957099@gmail.com>
Date: Tue, 23 Jun 2020 21:48:55 +0300
Subject: [PATCH 0574/1718] magento/magento2#27952: missing store_name in
 GraphQL resolver - static test fix

---
 .../Magento/Test/Integrity/DeclarativeDependencyTest.php         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php
index 10ce22b8c026f..281f672712f1d 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php
@@ -14,6 +14,7 @@
 
 /**
  * Class DeclarativeDependencyTest
+ * Test for undeclared dependencies in declarative schema
  */
 class DeclarativeDependencyTest extends \PHPUnit\Framework\TestCase
 {

From 8f8443e9746b3de2b95f870f66bd51e18951e165 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Tue, 23 Jun 2020 22:26:20 +0300
Subject: [PATCH 0575/1718] revert changes

---
 ...stomOptionToTheShoppingCartWithoutAnySelectedOptionTest.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontAddProductWithAllTypesOfCustomOptionToTheShoppingCartWithoutAnySelectedOptionTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontAddProductWithAllTypesOfCustomOptionToTheShoppingCartWithoutAnySelectedOptionTest.xml
index f70b39d839422..a5c8eb0da6530 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontAddProductWithAllTypesOfCustomOptionToTheShoppingCartWithoutAnySelectedOptionTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontAddProductWithAllTypesOfCustomOptionToTheShoppingCartWithoutAnySelectedOptionTest.xml
@@ -36,7 +36,8 @@
         </actionGroup>
 
         <!--Click on Add To Cart button-->
-        <actionGroup ref="StorefrontClickAddToCartOnProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage"/>
+        <click selector="{{StorefrontProductActionSection.addToCart}}" stepKey="addToCart"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
 
         <!--Assert all types of product options field displayed Required message -->
         <actionGroup ref="AssertStorefrontSeeElementActionGroup" stepKey="assertRequiredProductOptionField">

From a675e30bef1d7eca234531b4bfcca611a3979229 Mon Sep 17 00:00:00 2001
From: Marjan Petkovski <petkovski.marjan@gmail.com>
Date: Tue, 23 Jun 2020 21:30:57 +0200
Subject: [PATCH 0576/1718] magento/magento2#28563: Add customerGroupId to
 Context without explicit 'this is customer' check

---
 .../Model/Context/AddUserInfoToContext.php         | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/CustomerGraphQl/Model/Context/AddUserInfoToContext.php b/app/code/Magento/CustomerGraphQl/Model/Context/AddUserInfoToContext.php
index 603a86c1e6f39..478b2be2a3505 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Context/AddUserInfoToContext.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Context/AddUserInfoToContext.php
@@ -59,16 +59,14 @@ public function execute(ContextParametersInterface $contextParameters): ContextP
 
         $contextParameters->addExtensionAttribute('is_customer', $this->isCustomer($currentUserId, $currentUserType));
 
-        if ($this->isCustomer($currentUserId, $currentUserType)) {
-            try {
-                $customerGroupId = $this->customerRepository->getById($currentUserId)->getGroupId();
-            } catch (\Exception $e) {
-                $customerGroupId = GroupInterface::NOT_LOGGED_IN_ID;
-            }
-
-            $contextParameters->addExtensionAttribute('customer_group_id', $customerGroupId);
+        try {
+            $customerGroupId = $this->customerRepository->getById($currentUserId)->getGroupId();
+        } catch (\Exception $e) {
+            $customerGroupId = GroupInterface::NOT_LOGGED_IN_ID;
         }
 
+        $contextParameters->addExtensionAttribute('customer_group_id', $customerGroupId);
+
         return $contextParameters;
     }
 

From c9ed41b28779b748f4cb46d706ce30133995de6c Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@magento.com>
Date: Wed, 24 Jun 2020 00:00:15 -0500
Subject: [PATCH 0577/1718] MC-31618: Move static config to files - PLUGIN_LIST

- Fix unit tests;
- Some assertions from PluginList unit test were removed because its logic was moved to ConfigWriter;
---
 .../Framework/Interception/AbstractPlugin.php |   2 -
 .../Test/Unit/PluginList/PluginListTest.php   | 399 +++++++++---------
 .../Test/Unit/_files/load_scoped_mock_map.php |  85 ++++
 3 files changed, 279 insertions(+), 207 deletions(-)
 create mode 100644 lib/internal/Magento/Framework/Interception/Test/Unit/_files/load_scoped_mock_map.php

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/AbstractPlugin.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/AbstractPlugin.php
index e05ed274d097a..d9c0e0e17da3a 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Interception/AbstractPlugin.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/AbstractPlugin.php
@@ -127,8 +127,6 @@ public function setUpInterceptionConfig($pluginConfig)
                 'preferences' => [
                     \Magento\Framework\Interception\PluginListInterface::class =>
                         \Magento\Framework\Interception\PluginList\PluginList::class,
-                    \Magento\Framework\Interception\ChainInterface::class =>
-                        \Magento\Framework\Interception\Chain\Chain::class,
                     \Magento\Framework\Interception\ConfigWriterInterface::class =>
                         \Magento\Framework\Interception\ConfigWriter::class
                 ],
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/PluginList/PluginListTest.php b/lib/internal/Magento/Framework/Interception/Test/Unit/PluginList/PluginListTest.php
index 56740268026c2..ef24c2d9329da 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/PluginList/PluginListTest.php
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/PluginList/PluginListTest.php
@@ -9,23 +9,23 @@
 
 use Magento\Framework\Config\CacheInterface;
 use Magento\Framework\Config\ScopeInterface;
+use Magento\Framework\Interception\ConfigLoaderInterface;
+use Magento\Framework\Interception\ConfigWriterInterface;
 use Magento\Framework\Interception\ObjectManager\ConfigInterface;
 use Magento\Framework\Interception\PluginList\PluginList;
 use Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item;
-use Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item\Enhanced;
 use Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemContainer;
+use Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemContainerPlugin\Simple as ItemContainerPlugin;
 use Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemPlugin\Advanced;
 use Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemPlugin\Simple;
 use Magento\Framework\Interception\Test\Unit\Custom\Module\Model\StartingBackslash;
-use Magento\Framework\Interception\Test\Unit\Custom\Module\Model\StartingBackslash\Plugin;
+use Magento\Framework\Interception\Test\Unit\Custom\Module\Model\StartingBackslash\Plugin as StartingBackslashPlugin;
 use Magento\Framework\ObjectManager\Config\Reader\Dom;
 use Magento\Framework\ObjectManager\Definition\Runtime;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Serialize\SerializerInterface;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use Psr\Log\LoggerInterface;
 
 require_once __DIR__ . '/../Custom/Module/Model/Item.php';
 require_once __DIR__ . '/../Custom/Module/Model/Item/Enhanced.php';
@@ -57,81 +57,151 @@ class PluginListTest extends TestCase
      */
     private $cacheMock;
 
-    /**
-     * @var LoggerInterface|MockObject
-     */
-    private $loggerMock;
-
     /**
      * @var SerializerInterface|MockObject
      */
     private $serializerMock;
 
     /**
-     * @var ObjectManagerInterface|MockObject
+     * @var ConfigLoaderInterface|MockObject
      */
-    private $objectManagerMock;
+    private $configLoaderMock;
 
     protected function setUp(): void
     {
-        $readerMap = include __DIR__ . '/../_files/reader_mock_map.php';
+        $loadScoped = include __DIR__ . '/../_files/load_scoped_mock_map.php';
         $readerMock = $this->createMock(Dom::class);
-        $readerMock->expects($this->any())->method('read')->willReturnMap($readerMap);
 
         $this->configScopeMock = $this->getMockForAbstractClass(ScopeInterface::class);
         $this->cacheMock = $this->getMockBuilder(CacheInterface::class)
             ->setMethods(['get'])
             ->getMockForAbstractClass();
         // turn cache off
-        $this->cacheMock->expects($this->any())
-            ->method('get')
-            ->willReturn(false);
+        $this->cacheMock->method('get')->willReturn(false);
 
         $omConfigMock =  $this->getMockForAbstractClass(
             ConfigInterface::class
         );
 
-        $omConfigMock->expects($this->any())->method('getOriginalInstanceType')->willReturnArgument(0);
+        $omConfigMock->method('getOriginalInstanceType')->willReturnArgument(0);
 
-        $this->objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class)
+        $objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class)
             ->setMethods(['get'])
             ->getMockForAbstractClass();
-        $this->objectManagerMock->expects($this->any())
-            ->method('get')
-            ->willReturnArgument(0);
+        $objectManagerMock->method('get')->willReturnArgument(0);
         $this->serializerMock = $this->getMockForAbstractClass(SerializerInterface::class);
 
-        $definitions = new Runtime();
+        $this->configLoaderMock = $this->getMockBuilder(ConfigLoaderInterface::class)
+            ->onlyMethods(['load'])
+            ->getMockForAbstractClass();
+        $configWriterMock = $this->getMockBuilder(ConfigWriterInterface::class)
+            ->addMethods(['loadScopedVirtualTypes', 'getClassDefinitions', 'inheritPlugins'])
+            ->getMockForAbstractClass();
+        $configWriterMock->method('loadScopedVirtualTypes')
+            ->willReturnMap($loadScoped);
+        $configWriterMock->method('getClassDefinitions')
+            ->willReturn([]);
 
-        $objectManagerHelper = new ObjectManager($this);
-        $this->object = $objectManagerHelper->getObject(
-            PluginList::class,
-            [
-                'reader' => $readerMock,
-                'configScope' => $this->configScopeMock,
-                'cache' => $this->cacheMock,
-                'relations' => new \Magento\Framework\ObjectManager\Relations\Runtime(),
-                'omConfig' => $omConfigMock,
-                'definitions' => new \Magento\Framework\Interception\Definition\Runtime(),
-                'objectManager' => $this->objectManagerMock,
-                'classDefinitions' => $definitions,
-                'scopePriorityScheme' => ['global'],
-                'cacheId' => 'interception',
-                'serializer' => $this->serializerMock
-            ]
-        );
+        $definitions = new Runtime();
 
-        $this->loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
-        $objectManagerHelper->setBackwardCompatibleProperty(
-            $this->object,
-            'logger',
-            $this->loggerMock
-        );
+        // tested class is a mock to be able to set its protected properties values in closure
+        $this->object = $this->getMockBuilder(PluginList::class)
+            ->disableProxyingToOriginalMethods()
+            ->onlyMethods(['_inheritPlugins'])
+            ->setConstructorArgs(
+                [
+                    'reader' => $readerMock,
+                    'configScope' => $this->configScopeMock,
+                    'cache' => $this->cacheMock,
+                    'relations' => new \Magento\Framework\ObjectManager\Relations\Runtime(),
+                    'omConfig' => $omConfigMock,
+                    'definitions' => new \Magento\Framework\Interception\Definition\Runtime(),
+                    'objectManager' => $objectManagerMock,
+                    'classDefinitions' => $definitions,
+                    'scopePriorityScheme' => ['global'],
+                    'cacheId' => 'interception',
+                    'serializer' => $this->serializerMock,
+                    'configLoader' => $this->configLoaderMock,
+                    'configWriter' => $configWriterMock
+                ]
+            )
+            ->getMock();
     }
 
     public function testGetPlugin()
     {
-        $this->configScopeMock->expects($this->any())->method('getCurrentScope')->willReturn('backend');
+        $inheritPlugins = function ($type)
+        {
+            $inheritedItem = [
+                Item::class => [
+                    'advanced_plugin' => [
+                        'sortOrder' => 5,
+                        'instance' => Advanced::class,
+                    ],
+                    'simple_plugin' => [
+                        'sortOrder' => 10,
+                        'instance' => Simple::class
+                    ]
+                ]
+            ];
+            $processedItem = [
+                'Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item_getName___self' => [
+                    2 => 'advanced_plugin',
+                    4 => [
+                        'advanced_plugin'
+                    ]
+                ],
+                'Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item_getName_advanced_plugin' => [
+                    4 => [
+                        'simple_plugin'
+                    ]
+                ]
+            ];
+
+            $inheritedItemContainer = [
+                ItemContainer::class => [
+                    'simple_plugin' => [
+                        'sortOrder' => 15,
+                        'instance' => ItemContainerPlugin::class
+                    ]
+                ]
+            ];
+            $processedItemContainer = [
+                'Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemContainer_getName___self' => [
+                    4 => [
+                        'simple_plugin'
+                    ]
+                ]
+            ];
+
+            $inheritedStartingBackslash = [
+                StartingBackslash::class => [
+                    'simple_plugin' => [
+                        'sortOrder' => 20,
+                        'instance' => StartingBackslashPlugin::class
+                    ]
+                ]
+            ];
+
+            if ($type === 'Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item') {
+                $this->_inherited = $inheritedItem;
+                $this->_processed = $processedItem;
+            }
+
+            if ($type === 'Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemContainer') {
+                $this->_inherited = array_merge($inheritedItem, $inheritedItemContainer);
+                $this->_processed = array_merge($processedItem, $processedItemContainer);
+            }
+
+            if ($type === 'Magento\Framework\Interception\Test\Unit\Custom\Module\Model\StartingBackslash') {
+                $this->_inherited = array_merge($inheritedItem, $inheritedItemContainer, $inheritedStartingBackslash);
+                $this->_processed = array_merge($processedItem, $processedItemContainer);
+            }
+        };
+        $inheritPlugins = $inheritPlugins->bindTo($this->object, PluginList::class);
+        $this->object->method('_inheritPlugins')->willReturnCallback($inheritPlugins);
+
+        $this->configScopeMock->method('getCurrentScope')->willReturn('backend');
         $this->object->getNext(Item::class, 'getName');
         $this->object->getNext(
             ItemContainer::class,
@@ -156,14 +226,14 @@ public function testGetPlugin()
             )
         );
         $this->assertEquals(
-            \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemContainerPlugin\Simple::class,
+            ItemContainerPlugin::class,
             $this->object->getPlugin(
                 ItemContainer::class,
                 'simple_plugin'
             )
         );
         $this->assertEquals(
-            Plugin::class,
+            StartingBackslashPlugin::class,
             $this->object->getPlugin(
                 StartingBackslash::class,
                 'simple_plugin'
@@ -189,13 +259,34 @@ public function testGetPlugins(
         array $scopePriorityScheme = ['global']
     ): void {
         $this->setScopePriorityScheme($scopePriorityScheme);
-        $this->configScopeMock->expects(
-            $this->any()
-        )->method(
-            'getCurrentScope'
-        )->willReturn(
-            $scopeCode
-        );
+        $this->configScopeMock->method('getCurrentScope')->willReturn($scopeCode);
+
+        $inheritPlugins = function ($type)
+        {
+            $inheritedItem = [
+                Item::class => [
+                    'simple_plugin' => [
+                        'sortOrder' => 10,
+                        'instance' => Simple::class
+                    ]
+                ]
+            ];
+            $processedItem = [
+                'Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item_getName___self' => [
+                    4 => [
+                        'simple_plugin'
+                    ]
+                ],
+            ];
+
+            if ($type === 'Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item') {
+                $this->_inherited = $inheritedItem;
+                $this->_processed = $processedItem;
+            }
+        };
+        $inheritPlugins = $inheritPlugins->bindTo($this->object, PluginList::class);
+        $this->object->method('_inheritPlugins')->willReturnCallback($inheritPlugins);
+
         $this->assertEquals($expectedResult, $this->object->getNext($type, $method, $code));
     }
 
@@ -209,139 +300,10 @@ public function getPluginsDataProvider()
                 [4 => ['simple_plugin']], Item::class,
                 'getName',
                 'global',
-            ],
-            [
-                // advanced plugin has lower sort order
-                [2 => 'advanced_plugin', 4 => ['advanced_plugin']],
-                Item::class,
-                'getName',
-                'backend'
-            ],
-            [
-                // advanced plugin has lower sort order
-                [4 => ['simple_plugin']],
-                Item::class,
-                'getName',
-                'backend',
-                'advanced_plugin'
-            ],
-            // simple plugin is disabled in configuration for
-            // \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item in frontend
-            [null, Item::class, 'getName', 'frontend'],
-            // test plugin inheritance
-            [
-                [4 => ['simple_plugin']],
-                Enhanced::class,
-                'getName',
-                'global'
-            ],
-            [
-                // simple plugin is disabled in configuration for parent
-                [2 => 'advanced_plugin', 4 => ['advanced_plugin']],
-                Enhanced::class,
-                'getName',
-                'frontend'
-            ],
-            [
-                null,
-                ItemContainer::class,
-                'getName',
-                'global'
-            ],
-            [
-                [4 => ['simple_plugin']],
-                ItemContainer::class,
-                'getName',
-                'backend'
-            ],
-            [
-                // even though the scope is primary, both primary and global scopes are loaded
-                // because global is in default priority scheme
-                [
-                    4 => [
-                        'primary_plugin',
-                        'simple_plugin',
-                    ]
-                ],
-                \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item::class,
-                'getName',
-                'primary',
-                '__self',
-                ['primary', 'global']
-            ],
-            [
-                [
-                    4 => [
-                        'primary_plugin',
-                        'simple_plugin',
-                    ]
-                ],
-                \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item::class,
-                'getName',
-                'global',
-                '__self',
-                ['primary', 'global']
-            ],
-            [
-                [
-                    4 => [
-                        'primary_plugin',
-                    ]
-                ],
-                \Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item::class,
-                'getName',
-                'frontend',
-                '__self',
-                ['primary', 'global']
-            ],
+            ]
         ];
     }
 
-    /**
-     * @covers \Magento\Framework\Interception\PluginList\PluginList::getNext
-     * @covers \Magento\Framework\Interception\PluginList\PluginList::_inheritPlugins
-     */
-    public function testInheritPluginsWithNonExistingClass()
-    {
-        $this->expectException('InvalidArgumentException');
-        $this->configScopeMock->expects($this->any())
-            ->method('getCurrentScope')
-            ->willReturn('frontend');
-
-        $this->object->getNext('SomeType', 'someMethod');
-    }
-
-    public function testLoadScopedDataNotCached()
-    {
-        $this->configScopeMock->expects($this->exactly(3))
-            ->method('getCurrentScope')
-            ->willReturn('scope');
-        $this->serializerMock->expects($this->once())
-            ->method('serialize');
-        $this->serializerMock->expects($this->never())
-            ->method('unserialize');
-        $this->cacheMock->expects($this->once())
-            ->method('save');
-
-        $this->assertNull($this->object->getNext('Type', 'method'));
-    }
-
-    /**
-     * @covers \Magento\Framework\Interception\PluginList\PluginList::getNext
-     * @covers \Magento\Framework\Interception\PluginList\PluginList::_inheritPlugins
-     */
-    public function testInheritPluginsWithNotExistingPlugin()
-    {
-        $this->loggerMock->expects($this->once())
-            ->method('info')
-            ->with("Reference to undeclared plugin with name 'simple_plugin'.");
-        $this->configScopeMock->expects($this->any())
-            ->method('getCurrentScope')
-            ->willReturn('frontend');
-
-        $this->assertNull($this->object->getNext('typeWithoutInstance', 'someMethod'));
-    }
-
     /**
      * @covers \Magento\Framework\Interception\PluginList\PluginList::getNext
      * @covers \Magento\Framework\Interception\PluginList\PluginList::_loadScopedData
@@ -365,6 +327,24 @@ public function testLoadScopedDataCached()
             ->with('global|scope|interception')
             ->willReturn($serializedData);
 
+        $inheritPlugins = function ($type)
+        {
+            $inherited = [
+                0 => 'key',
+                'Type' => null
+            ];
+            $processed = [
+                0 => 'key'
+            ];
+
+            if ($type === 'Type') {
+                $this->_inherited = $inherited;
+                $this->_processed = $processed;
+            }
+        };
+        $inheritPlugins = $inheritPlugins->bindTo($this->object, PluginList::class);
+        $this->object->method('_inheritPlugins')->willReturnCallback($inheritPlugins);
+
         $this->assertNull($this->object->getNext('Type', 'method'));
     }
 
@@ -372,29 +352,38 @@ public function testLoadScopedDataCached()
      * @covers \Magento\Framework\Interception\PluginList\PluginList::getNext
      * @covers \Magento\Framework\Interception\PluginList\PluginList::_loadScopedData
      */
-    public function testLoadScopeDataWithEmptyData()
+    public function testLoadScopedDataGenerated()
     {
-        $this->objectManagerMock->expects($this->any())
-            ->method('get')
-            ->willReturnArgument(0);
-        $this->configScopeMock->expects($this->any())
+        $this->configScopeMock->expects($this->once())
             ->method('getCurrentScope')
-            ->willReturn('emptyscope');
+            ->willReturn('scope');
 
-        $this->assertEquals(
-            [4 => ['simple_plugin']],
-            $this->object->getNext(
-                Item::class,
-                'getName'
-            )
-        );
-        $this->assertEquals(
-            Simple::class,
-            $this->object->getPlugin(
-                Item::class,
-                'simple_plugin'
-            )
-        );
+        $data = [['key'], ['key'], ['key']];
+
+        $this->configLoaderMock->expects($this->once())
+            ->method('load')
+            ->with('global|scope|interception')
+            ->willReturn($data);
+
+        $inheritPlugins = function ($type)
+        {
+            $inherited = [
+                0 => 'key',
+                'Type' => null
+            ];
+            $processed = [
+                0 => 'key'
+            ];
+
+            if ($type === 'Type') {
+                $this->_inherited = $inherited;
+                $this->_processed = $processed;
+            }
+        };
+        $inheritPlugins = $inheritPlugins->bindTo($this->object, PluginList::class);
+        $this->object->method('_inheritPlugins')->willReturnCallback($inheritPlugins);
+
+        $this->assertNull($this->object->getNext('Type', 'method'));
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/_files/load_scoped_mock_map.php b/lib/internal/Magento/Framework/Interception/Test/Unit/_files/load_scoped_mock_map.php
new file mode 100644
index 0000000000000..3773ea0007590
--- /dev/null
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/_files/load_scoped_mock_map.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item;
+use Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemContainer;
+use Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemContainerPlugin\Simple;
+use Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemPlugin\Advanced;
+use Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemPlugin\Simple as ItemPluginSimple;
+use Magento\Framework\Interception\Test\Unit\Custom\Module\Model\StartingBackslash;
+use Magento\Framework\Interception\Test\Unit\Custom\Module\Model\StartingBackslash\Plugin;
+
+return [
+    [
+        [1 => 'global'],
+        [],
+        [],
+        [],
+        null,
+        [
+            [],
+            [1 => 'global'],
+            ['global' => true],
+            [
+                Item::class => [
+                    'simple_plugin' => [
+                        'sortOrder' => 10,
+                        'instance' => ItemPluginSimple::class,
+                    ],
+                ]
+            ],
+            [],
+            []
+        ],
+    ],
+    [
+        [
+            'global',
+            'backend'
+        ],
+        [],
+        [],
+        [],
+        null,
+        [
+            [],
+            [
+                'global',
+                'backend'
+            ],
+            [
+                'global' => true,
+                'backend' => true
+            ],
+            [
+                Item::class => [
+                    'simple_plugin' => [
+                        'sortOrder' => 10,
+                        'instance' => Simple::class,
+                    ],
+                    'advanced_plugin' => [
+                        'sortOrder' => 5,
+                        'instance' => Advanced::class,
+                    ],
+                ],
+                ItemContainer::class => [
+                    'simple_plugin' => [
+                        'sortOrder' => 15,
+                        'instance' => Simple::class,
+                    ],
+                ],
+                StartingBackslash::class => [
+                    'simple_plugin' => [
+                        'sortOrder' => 20,
+                        'instance' => Plugin::class,
+                    ],
+                ]
+            ],
+            [],
+            []
+        ]
+    ]
+];

From 36ff6d71e0ccb383022e33d58989ee461ea563e9 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Wed, 24 Jun 2020 08:59:34 +0300
Subject: [PATCH 0578/1718] fix static

---
 app/code/Magento/Config/Console/Command/ConfigShowCommand.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Config/Console/Command/ConfigShowCommand.php b/app/code/Magento/Config/Console/Command/ConfigShowCommand.php
index 4e90d717af101..647397e11a571 100644
--- a/app/code/Magento/Config/Console/Command/ConfigShowCommand.php
+++ b/app/code/Magento/Config/Console/Command/ConfigShowCommand.php
@@ -24,6 +24,7 @@
  *
  * @api
  * @since 100.2.0
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ConfigShowCommand extends Command
 {

From 76dd91b026e11036ba1992aa4370c9c50e26ade2 Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Wed, 24 Jun 2020 09:52:36 +0300
Subject: [PATCH 0579/1718] MC-35123: An invoiced order of a product with a
 Customizable Option (file) can not be reordered

---
 .../Test/Unit/Model/Product/TypeTest.php      | 19 ++++++----
 .../Model/Product/Option/Type/File.php        | 14 +++++---
 .../Model/Product/Type/AbstractType.php       | 35 ++++++++++++++-----
 .../Model/Product/Option/Type/FileTest.php    | 10 ++++++
 app/code/Magento/Checkout/Model/Cart.php      | 22 +++++++++---
 .../Magento/Sales/Model/AdminOrder/Create.php |  8 +++++
 6 files changed, 83 insertions(+), 25 deletions(-)

diff --git a/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php b/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
index 771b5c53b3347..b7041051591d8 100644
--- a/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
@@ -11,6 +11,7 @@
 use Magento\Bundle\Model\Product\Type;
 use Magento\Bundle\Model\ResourceModel\BundleFactory;
 use Magento\Bundle\Model\ResourceModel\Option\Collection;
+use Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessor;
 use Magento\Bundle\Model\ResourceModel\Selection\Collection as SelectionCollection;
 use Magento\Bundle\Model\ResourceModel\Selection\CollectionFactory;
 use Magento\Bundle\Model\Selection;
@@ -42,6 +43,8 @@
 use PHPUnit\Framework\TestCase;
 
 /**
+ * Test for bundle product type
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class TypeTest extends TestCase
@@ -116,6 +119,11 @@ class TypeTest extends TestCase
      */
     private $arrayUtility;
 
+    /**
+     * @var CollectionProcessor|MockObject
+     */
+    private $catalogRuleProcessor;
+
     /**
      * @return void
      */
@@ -172,20 +180,20 @@ protected function setUp(): void
             ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
-
         $this->serializer = $this->getMockBuilder(Json::class)
             ->setMethods(null)
             ->disableOriginalConstructor()
             ->getMock();
-
         $this->metadataPool = $this->getMockBuilder(MetadataPool::class)
             ->disableOriginalConstructor()
             ->getMock();
-
         $this->arrayUtility = $this->getMockBuilder(ArrayUtils::class)
             ->setMethods(['flatten'])
             ->disableOriginalConstructor()
             ->getMock();
+        $this->catalogRuleProcessor = $this->getMockBuilder(CollectionProcessor::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $objectHelper = new ObjectManager($this);
         $this->model = $objectHelper->getObject(
@@ -1542,7 +1550,7 @@ public function testPrepareForCartAdvancedSpecifyProductOptions()
 
         $this->parentClass($group, $option, $buyRequest, $product);
 
-        $product->expects($this->once())
+        $product->expects($this->any())
             ->method('getSkipCheckRequiredOption')
             ->willReturn(true);
         $buyRequest->expects($this->once())
@@ -2424,9 +2432,6 @@ protected function parentClass($group, $option, $buyRequest, $product)
         $group->expects($this->once())
             ->method('setProcessMode')
             ->willReturnSelf();
-        $group->expects($this->once())
-            ->method('validateUserValue')
-            ->willReturnSelf();
         $group->expects($this->once())
             ->method('prepareForCart')
             ->willReturn('someString');
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File.php
index 9f1eae207e116..dd16fc3911ee3 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/File.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/File.php
@@ -16,8 +16,9 @@
 /**
  * Catalog product option file type
  *
- * @author     Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class File extends \Magento\Catalog\Model\Product\Option\Type\DefaultType
 {
@@ -262,7 +263,6 @@ public function validateUserValue($values)
                             . "Make sure the options are entered and try again."
                         )
                     );
-                    break;
                 default:
                     $this->setUserValue(null);
                     break;
@@ -330,7 +330,11 @@ public function prepareForCart()
     public function getFormattedOptionValue($optionValue)
     {
         if ($this->_formattedOptionValue === null) {
-            $value = $this->serializer->unserialize($optionValue);
+            try {
+                $value = $this->serializer->unserialize($optionValue);
+            } catch (\InvalidArgumentException $e) {
+                return $optionValue;
+            }
             if ($value === null) {
                 return $optionValue;
             }
@@ -476,13 +480,13 @@ public function copyQuoteToOrder()
         try {
             $value = $this->serializer->unserialize($quoteOption->getValue());
             if (!isset($value['quote_path'])) {
-                throw new \Exception();
+                return $this;
             }
             $quotePath = $value['quote_path'];
             $orderPath = $value['order_path'];
 
             if (!$this->mediaDirectory->isFile($quotePath) || !$this->mediaDirectory->isReadable($quotePath)) {
-                throw new \Exception();
+                return $this;
             }
 
             if ($this->_coreFileStorageDatabase->checkDbUsage()) {
diff --git a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
index e6804d9246faa..811b8f421c8b7 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
@@ -9,15 +9,18 @@
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\App\ObjectManager;
 
 /**
- * @api
  * Abstract model for product type implementation
+ *
+ * phpcs:disable Magento2.Classes.AbstractApi
+ * @api
+ * @since 100.0.2
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 100.0.2
  */
 abstract class AbstractType
 {
@@ -207,7 +210,7 @@ public function __construct(
         $this->_filesystem = $filesystem;
         $this->_logger = $logger;
         $this->productRepository = $productRepository;
-        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
+        $this->serializer = $serializer ?: ObjectManager::getInstance()
             ->get(\Magento\Framework\Serialize\Serializer\Json::class);
     }
 
@@ -476,6 +479,7 @@ public function prepareForCart(\Magento\Framework\DataObject $buyRequest, $produ
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * phpcs:disable Generic.Metrics.NestingLevel
      */
     public function processFileQueue()
     {
@@ -492,6 +496,7 @@ public function processFileQueue()
                         /** @var $uploader \Zend_File_Transfer_Adapter_Http */
                         $uploader = isset($queueOptions['uploader']) ? $queueOptions['uploader'] : null;
 
+                        // phpcs:ignore Magento2.Functions.DiscouragedFunction
                         $path = dirname($dst);
 
                         try {
@@ -529,6 +534,7 @@ public function processFileQueue()
 
         return $this;
     }
+    //phpcs:enable
 
     /**
      * Add file to File Queue
@@ -572,6 +578,7 @@ public function getSpecifyOptionMessage()
      * @param string $processMode
      * @return array
      * @throws LocalizedException
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     protected function _prepareOptions(\Magento\Framework\DataObject $buyRequest, $product, $processMode)
     {
@@ -583,6 +590,7 @@ protected function _prepareOptions(\Magento\Framework\DataObject $buyRequest, $p
         }
         if ($options !== null) {
             $results = [];
+            $optionsFromRequest = $buyRequest->getOptions();
             foreach ($options as $option) {
                 /* @var $option \Magento\Catalog\Model\Product\Option */
                 try {
@@ -590,8 +598,14 @@ protected function _prepareOptions(\Magento\Framework\DataObject $buyRequest, $p
                         ->setOption($option)
                         ->setProduct($product)
                         ->setRequest($buyRequest)
-                        ->setProcessMode($processMode)
-                        ->validateUserValue($buyRequest->getOptions());
+                        ->setProcessMode($processMode);
+
+                    if ($product->getSkipCheckRequiredOption() !== true) {
+                        $group->validateUserValue($optionsFromRequest);
+                    } elseif ($optionsFromRequest !== null && isset($optionsFromRequest[$option->getId()])) {
+                        $transport->options[$option->getId()] = $optionsFromRequest[$option->getId()];
+                    }
+
                 } catch (LocalizedException $e) {
                     $results[] = $e->getMessage();
                     continue;
@@ -643,8 +657,7 @@ public function checkProductBuyState($product)
     }
 
     /**
-     * Prepare additional options/information for order item which will be
-     * created from this product
+     * Prepare additional options/information for order item which will be created from this product
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return array
@@ -900,7 +913,7 @@ public function getStoreFilter($product)
     /**
      * Set store filter for associated products
      *
-     * @param $store int|\Magento\Store\Model\Store
+     * @param int|\Magento\Store\Model\Store $store
      * @param \Magento\Catalog\Model\Product $product
      * @return $this
      */
@@ -913,6 +926,7 @@ public function setStoreFilter($store, $product)
 
     /**
      * Allow for updates of children qty's
+     *
      * (applicable for complicated product types. As default returns false)
      *
      * @param \Magento\Catalog\Model\Product $product
@@ -940,6 +954,7 @@ public function prepareQuoteItemQty($qty, $product)
 
     /**
      * Implementation of product specify logic of which product needs to be assigned to option.
+     *
      * For example if product which was added to option already removed from catalog.
      *
      * @param \Magento\Catalog\Model\Product $optionProduct
@@ -979,6 +994,7 @@ public function setConfig($config)
 
     /**
      * Retrieve additional searchable data from type instance
+     *
      * Using based on product id and store_id data
      *
      * @param \Magento\Catalog\Model\Product $product
@@ -999,6 +1015,7 @@ public function getSearchableData($product)
 
     /**
      * Retrieve products divided into groups required to purchase
+     *
      * At least one product in each group has to be purchased
      *
      * @param \Magento\Catalog\Model\Product $product
@@ -1092,6 +1109,8 @@ public function getIdentities(\Magento\Catalog\Model\Product $product)
     }
 
     /**
+     * Get Associated Products
+     *
      * @param \Magento\Catalog\Model\Product\Type\AbstractType $product
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Type/FileTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Type/FileTest.php
index 539489f18f404..0e6fb8ececf03 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Type/FileTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Type/FileTest.php
@@ -24,6 +24,8 @@
 use PHPUnit\Framework\TestCase;
 
 /**
+ * Test file option type
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class FileTest extends TestCase
@@ -142,6 +144,14 @@ protected function getFileObject()
         );
     }
 
+    public function testGetFormattedOptionValueWithUnserializedValue()
+    {
+        $fileObject = $this->getFileObject();
+
+        $value = 'some unserialized value, 1, 2.test';
+        $this->assertEquals($value, $fileObject->getFormattedOptionValue($value));
+    }
+
     public function testGetCustomizedView()
     {
         $fileObject = $this->getFileObject();
diff --git a/app/code/Magento/Checkout/Model/Cart.php b/app/code/Magento/Checkout/Model/Cart.php
index cec99909dc999..9f1ff991c93e3 100644
--- a/app/code/Magento/Checkout/Model/Cart.php
+++ b/app/code/Magento/Checkout/Model/Cart.php
@@ -18,6 +18,7 @@
  * @api
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @deprecated 100.1.0 Use \Magento\Quote\Model\Quote instead
  * @see \Magento\Quote\Api\Data\CartInterface
  */
@@ -272,6 +273,10 @@ public function addOrderItem($orderItem, $qtyFlag = null)
                  * with the same id may have different sets of order attributes.
                  */
                 $product = $this->productRepository->getById($orderItem->getProductId(), false, $storeId, true);
+                if ($orderItem->getOrderId() !== null) {
+                    //reorder existing order
+                    $product->setSkipCheckRequiredOption(true);
+                }
             } catch (NoSuchEntityException $e) {
                 return $this;
             }
@@ -282,7 +287,14 @@ public function addOrderItem($orderItem, $qtyFlag = null)
             } else {
                 $info->setQty(1);
             }
-
+            $productOptions = $orderItem->getProductOptions();
+            if ($productOptions !== null && !empty($productOptions['options'])) {
+                $formattedOptions = [];
+                foreach ($productOptions['options'] as $option) {
+                    $formattedOptions[$option['option_id']] = $option['option_value'];
+                }
+                $info->setData('options', $formattedOptions);
+            }
             $this->addProduct($product, $info);
         }
         return $this;
@@ -291,8 +303,8 @@ public function addOrderItem($orderItem, $qtyFlag = null)
     /**
      * Get product object based on requested product information
      *
-     * @param   Product|int|string $productInfo
-     * @return  Product
+     * @param Product|int|string $productInfo
+     * @return Product
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function _getProduct($productInfo)
@@ -332,8 +344,8 @@ protected function _getProduct($productInfo)
     /**
      * Get request for product add to cart procedure
      *
-     * @param   \Magento\Framework\DataObject|int|array $requestInfo
-     * @return  \Magento\Framework\DataObject
+     * @param \Magento\Framework\DataObject|int|array $requestInfo
+     * @return \Magento\Framework\DataObject
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function _getProductRequest($requestInfo)
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
index 67a533ea88550..0107af0b77a99 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/Create.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -663,6 +663,14 @@ public function initFromOrderItem(\Magento\Sales\Model\Order\Item $orderItem, $q
             if (is_numeric($qty)) {
                 $buyRequest->setQty($qty);
             }
+            $productOptions = $orderItem->getProductOptions();
+            if ($productOptions !== null && !empty($productOptions['options'])) {
+                $formattedOptions = [];
+                foreach ($productOptions['options'] as $option) {
+                    $formattedOptions[$option['option_id']] = $option['option_value'];
+                }
+                $buyRequest->setData('options', $formattedOptions);
+            }
             $item = $this->getQuote()->addProduct($product, $buyRequest);
             if (is_string($item)) {
                 return $item;

From ee29f5fe6d2bea7b35a0dfbe0ac3b01044a6ba27 Mon Sep 17 00:00:00 2001
From: John Carlo Octabio <johncarlo@abovethefray.io>
Date: Wed, 24 Jun 2020 16:26:14 +0800
Subject: [PATCH 0580/1718] magento/magento2#108: Clear Shopping Cart - Added
 admin configuration for display of clear shopping cart button

---
 app/code/Magento/Checkout/Block/Cart/Grid.php | 25 ++---------
 app/code/Magento/Checkout/ViewModel/Cart.php  | 43 +++++++++++++++++++
 .../frontend/layout/checkout_cart_index.xml   |  3 ++
 .../view/frontend/templates/cart/form.phtml   |  2 +-
 4 files changed, 50 insertions(+), 23 deletions(-)
 create mode 100644 app/code/Magento/Checkout/ViewModel/Cart.php

diff --git a/app/code/Magento/Checkout/Block/Cart/Grid.php b/app/code/Magento/Checkout/Block/Cart/Grid.php
index 357e750f4bb6b..e112bfe351370 100644
--- a/app/code/Magento/Checkout/Block/Cart/Grid.php
+++ b/app/code/Magento/Checkout/Block/Cart/Grid.php
@@ -22,11 +22,6 @@ class Grid extends \Magento\Checkout\Block\Cart
      */
     const XPATH_CONFIG_NUMBER_ITEMS_TO_DISPLAY_PAGER = 'checkout/cart/number_items_to_display_pager';
 
-    /**
-     * Config settings path to enable clear shopping cart button
-     */
-    const XPATH_CONFIG_ENABLE_CLEAR_SHOPPING_CART = 'checkout/cart/enable_clear_shopping_cart';
-
     /**
      * @var \Magento\Quote\Model\ResourceModel\Quote\Item\Collection
      */
@@ -107,7 +102,7 @@ protected function _construct()
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      *
      * @since 100.2.0
      */
@@ -152,7 +147,7 @@ public function getItemsForGrid()
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      *
      * @since 100.2.0
      */
@@ -166,8 +161,7 @@ public function getItems()
 
     /**
      * Verify if display pager on shopping cart
-     *
-     * Check if cart block has custom_items and items qty in the shopping cart<limit from stores configuration
+     * If cart block has custom_items and items qty in the shopping cart<limit from stores configuration
      *
      * @return bool
      */
@@ -182,17 +176,4 @@ private function isPagerDisplayedOnPage()
         }
         return $this->isPagerDisplayed;
     }
-
-    /**
-     * Check if clear shopping cart button is enabled
-     *
-     * @return bool
-     */
-    public function isClearShoppingCartEnabled()
-    {
-        return (bool)$this->_scopeConfig->getValue(
-            self::XPATH_CONFIG_ENABLE_CLEAR_SHOPPING_CART,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        );
-    }
 }
diff --git a/app/code/Magento/Checkout/ViewModel/Cart.php b/app/code/Magento/Checkout/ViewModel/Cart.php
new file mode 100644
index 0000000000000..6adcd5f1d66de
--- /dev/null
+++ b/app/code/Magento/Checkout/ViewModel/Cart.php
@@ -0,0 +1,43 @@
+<?php
+namespace Magento\Checkout\ViewModel;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\Framework\View\Element\Context;
+
+class Cart implements ArgumentInterface
+{
+    /**
+     * Config settings path to enable clear shopping cart button
+     */
+    private const XPATH_CONFIG_ENABLE_CLEAR_SHOPPING_CART = 'checkout/cart/enable_clear_shopping_cart';
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $_scopeConfig;
+
+    /**
+     * Constructor
+     *
+     * @param Context $context
+     */
+    public function __construct(
+        Context $context
+    ) {
+        $this->_scopeConfig = $context->getScopeConfig();
+    }
+
+    /**
+     * Check if clear shopping cart button is enabled
+     *
+     * @return bool
+     */
+    public function isClearShoppingCartEnabled()
+    {
+        return (bool) $this->_scopeConfig->getValue(
+            self::XPATH_CONFIG_ENABLE_CLEAR_SHOPPING_CART,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+    }
+}
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_index.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_index.xml
index 81ee1a5e6db4c..b465c68078641 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_index.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_cart_index.xml
@@ -181,6 +181,9 @@
                             </block>
                         </container>
                         <block class="Magento\Checkout\Block\Cart\Grid" name="checkout.cart.form" as="cart-items" template="Magento_Checkout::cart/form.phtml" after="cart.summary">
+                            <arguments>
+                                <argument name="view_model" xsi:type="object">Magento\Checkout\ViewModel\Cart</argument>
+                            </arguments>
                             <block class="Magento\Framework\View\Element\RendererList" name="checkout.cart.item.renderers" as="renderer.list"/>
                             <block class="Magento\Framework\View\Element\Text\ListText" name="checkout.cart.order.actions"/>
                         </block>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
index 58c920011061b..59e33a7c855ce 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
@@ -56,7 +56,7 @@
                 <span><?= $block->escapeHtml(__('Continue Shopping')) ?></span>
             </a>
         <?php endif; ?>
-        <?php if ($block->isClearShoppingCartEnabled()): ?>
+        <?php if ($block->getViewModel()->isClearShoppingCartEnabled()): ?>
             <button type="button"
                     name="update_cart_action"
                     data-cart-empty=""

From 888a9f3f5826be0b5ba16b15f75c2c6735504203 Mon Sep 17 00:00:00 2001
From: John Carlo Octabio <johncarlo@abovethefray.io>
Date: Wed, 24 Jun 2020 16:29:48 +0800
Subject: [PATCH 0581/1718] magento/magento2#108: Clear Shopping Cart -
 Refactor initial changes to remove diff in PR

---
 app/code/Magento/Checkout/Block/Cart/Grid.php | 2 --
 app/code/Magento/Checkout/ViewModel/Cart.php  | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Checkout/Block/Cart/Grid.php b/app/code/Magento/Checkout/Block/Cart/Grid.php
index e112bfe351370..bfe4b6ceed9d0 100644
--- a/app/code/Magento/Checkout/Block/Cart/Grid.php
+++ b/app/code/Magento/Checkout/Block/Cart/Grid.php
@@ -103,7 +103,6 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     *
      * @since 100.2.0
      */
     protected function _prepareLayout()
@@ -148,7 +147,6 @@ public function getItemsForGrid()
 
     /**
      * {@inheritdoc}
-     *
      * @since 100.2.0
      */
     public function getItems()
diff --git a/app/code/Magento/Checkout/ViewModel/Cart.php b/app/code/Magento/Checkout/ViewModel/Cart.php
index 6adcd5f1d66de..e748c1dda25ec 100644
--- a/app/code/Magento/Checkout/ViewModel/Cart.php
+++ b/app/code/Magento/Checkout/ViewModel/Cart.php
@@ -4,6 +4,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\View\Element\Block\ArgumentInterface;
 use Magento\Framework\View\Element\Context;
+use Magento\Store\Model\ScopeInterface;
 
 class Cart implements ArgumentInterface
 {
@@ -37,7 +38,7 @@ public function isClearShoppingCartEnabled()
     {
         return (bool) $this->_scopeConfig->getValue(
             self::XPATH_CONFIG_ENABLE_CLEAR_SHOPPING_CART,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_STORE
         );
     }
 }

From b96085979a5009112b82caf7ee028e8f307ef87c Mon Sep 17 00:00:00 2001
From: John Carlo Octabio <johncarlo@abovethefray.io>
Date: Wed, 24 Jun 2020 16:30:58 +0800
Subject: [PATCH 0582/1718] magento/magento2#108: Clear Shopping Cart - Added
 file header copyright

---
 app/code/Magento/Checkout/ViewModel/Cart.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/code/Magento/Checkout/ViewModel/Cart.php b/app/code/Magento/Checkout/ViewModel/Cart.php
index e748c1dda25ec..e160fc1923b63 100644
--- a/app/code/Magento/Checkout/ViewModel/Cart.php
+++ b/app/code/Magento/Checkout/ViewModel/Cart.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
 namespace Magento\Checkout\ViewModel;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;

From 1de0335fdaad95ff8ec3faf74d47c9ed2e540964 Mon Sep 17 00:00:00 2001
From: Serhii Balko <serhii.balko@transoftgroup.com>
Date: Wed, 24 Jun 2020 12:56:05 +0300
Subject: [PATCH 0583/1718] MC-35361: [GraphQL] - Grouped Products - No data
 returns for arrays like "product_links"

---
 .../Model/ProductLinksTypeResolver.php        |   6 +-
 .../Resolver/Product/BatchProductLinks.php    |  12 +-
 app/code/Magento/CatalogGraphQl/etc/di.xml    |  10 ++
 .../Model/GroupedProductLinksTypeResolver.php |   8 +-
 .../Magento/GroupedProductGraphQl/etc/di.xml  |   7 ++
 .../GroupedProduct/GroupedProductViewTest.php | 107 +++++++++++++-----
 6 files changed, 113 insertions(+), 37 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/ProductLinksTypeResolver.php b/app/code/Magento/CatalogGraphQl/Model/ProductLinksTypeResolver.php
index 5a230ceed0ca4..c6de07bdedd19 100644
--- a/app/code/Magento/CatalogGraphQl/Model/ProductLinksTypeResolver.php
+++ b/app/code/Magento/CatalogGraphQl/Model/ProductLinksTypeResolver.php
@@ -10,7 +10,7 @@
 use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
 
 /**
- * {@inheritdoc}
+ * @inheritdoc
  */
 class ProductLinksTypeResolver implements TypeResolverInterface
 {
@@ -20,9 +20,9 @@ class ProductLinksTypeResolver implements TypeResolverInterface
     private $linkTypes = ['related', 'upsell', 'crosssell'];
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
-    public function resolveType(array $data) : string
+    public function resolveType(array $data): string
     {
         if (isset($data['link_type'])) {
             $linkType = $data['link_type'];
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/BatchProductLinks.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/BatchProductLinks.php
index 14732ecf37c63..187fd05c1001e 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/BatchProductLinks.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/BatchProductLinks.php
@@ -22,7 +22,15 @@ class BatchProductLinks implements BatchServiceContractResolverInterface
     /**
      * @var string[]
      */
-    private static $linkTypes = ['related', 'upsell', 'crosssell'];
+    private $linkTypes;
+
+    /**
+     * @param array $linkTypes
+     */
+    public function __construct(array $linkTypes)
+    {
+        $this->linkTypes = $linkTypes;
+    }
 
     /**
      * @inheritDoc
@@ -44,7 +52,7 @@ public function convertToServiceArgument(ResolveRequestInterface $request)
         /** @var \Magento\Catalog\Model\Product $product */
         $product = $value['model'];
 
-        return new ListCriteria((string)$product->getId(), self::$linkTypes, $product);
+        return new ListCriteria((string)$product->getId(), $this->linkTypes, $product);
     }
 
     /**
diff --git a/app/code/Magento/CatalogGraphQl/etc/di.xml b/app/code/Magento/CatalogGraphQl/etc/di.xml
index 5fec7bfd4fda7..03f9d7ad03f04 100644
--- a/app/code/Magento/CatalogGraphQl/etc/di.xml
+++ b/app/code/Magento/CatalogGraphQl/etc/di.xml
@@ -74,4 +74,14 @@
     <preference type="\Magento\CatalogGraphQl\Model\Resolver\Product\Price\Provider" for="\Magento\CatalogGraphQl\Model\Resolver\Product\Price\ProviderInterface"/>
 
     <preference type="Magento\CatalogGraphQl\Model\Resolver\Products\Query\Search" for="Magento\CatalogGraphQl\Model\Resolver\Products\Query\ProductQueryInterface"/>
+
+    <type name="\Magento\CatalogGraphQl\Model\Resolver\Product\BatchProductLinks">
+        <arguments>
+            <argument name="linkTypes" xsi:type="array">
+                <item name="related" xsi:type="string">related</item>
+                <item name="upsell" xsi:type="string">upsell</item>
+                <item name="crosssell" xsi:type="string">crosssell</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/GroupedProductGraphQl/Model/GroupedProductLinksTypeResolver.php b/app/code/Magento/GroupedProductGraphQl/Model/GroupedProductLinksTypeResolver.php
index 92cfb375fea41..29fa2bffabb3b 100644
--- a/app/code/Magento/GroupedProductGraphQl/Model/GroupedProductLinksTypeResolver.php
+++ b/app/code/Magento/GroupedProductGraphQl/Model/GroupedProductLinksTypeResolver.php
@@ -10,7 +10,7 @@
 use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
 
 /**
- * {@inheritdoc}
+ * @inheritdoc
  */
 class GroupedProductLinksTypeResolver implements TypeResolverInterface
 {
@@ -20,14 +20,14 @@ class GroupedProductLinksTypeResolver implements TypeResolverInterface
     private $linkTypes = ['associated'];
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
-    public function resolveType(array $data) : string
+    public function resolveType(array $data): string
     {
         if (isset($data['link_type'])) {
             $linkType = $data['link_type'];
             if (in_array($linkType, $this->linkTypes)) {
-                return 'GroupedProductLinks';
+                return 'ProductLinks';
             }
         }
         return '';
diff --git a/app/code/Magento/GroupedProductGraphQl/etc/di.xml b/app/code/Magento/GroupedProductGraphQl/etc/di.xml
index 35b63370baf2f..717bc14826f70 100644
--- a/app/code/Magento/GroupedProductGraphQl/etc/di.xml
+++ b/app/code/Magento/GroupedProductGraphQl/etc/di.xml
@@ -13,4 +13,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="\Magento\CatalogGraphQl\Model\Resolver\Product\BatchProductLinks">
+        <arguments>
+            <argument name="linkTypes" xsi:type="array">
+                <item name="associated" xsi:type="string">associated</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/GroupedProduct/GroupedProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/GroupedProduct/GroupedProductViewTest.php
index e6db0b9e808ef..8cb0a6db972b4 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/GroupedProduct/GroupedProductViewTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/GroupedProduct/GroupedProductViewTest.php
@@ -7,12 +7,29 @@
 
 namespace Magento\GraphQl\GroupedProduct;
 
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\TestFramework\ObjectManager;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
+/**
+ * Class to test GraphQl response with grouped products
+ */
 class GroupedProductViewTest extends GraphQlAbstract
 {
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
+    }
 
     /**
      * @magentoApiDataFixture Magento/GroupedProduct/_files/product_grouped.php
@@ -20,17 +37,16 @@ class GroupedProductViewTest extends GraphQlAbstract
     public function testAllFieldsGroupedProduct()
     {
         $productSku = 'grouped-product';
-        $query
-            = <<<QUERY
+        $query = <<<QUERY
 {
   products(filter: {sku: {eq: "{$productSku}"}}) {
-    items {    
+    items {
       id
       attribute_set_id
       created_at
       name
       sku
-      type_id     
+      type_id
       ... on GroupedProduct {
         items{
           qty
@@ -39,9 +55,14 @@ public function testAllFieldsGroupedProduct()
             sku
             name
             type_id
-            url_key            
+            url_key
           }
         }
+        product_links{
+          linked_product_sku
+          position
+          link_type
+        }
       }
     }
   }
@@ -49,47 +70,77 @@ public function testAllFieldsGroupedProduct()
 QUERY;
 
         $response = $this->graphQlQuery($query);
-        /** @var ProductRepositoryInterface $productRepository */
-        $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
-        $groupedProduct = $productRepository->get($productSku, false, null, true);
+        $groupedProduct = $this->productRepository->get($productSku, false, null, true);
 
-        $this->assertGroupedProductItems($groupedProduct, $response['products']['items'][0]);
+        $this->assertNotEmpty(
+            $response['products']['items'][0]['items'],
+            "Precondition failed: 'Grouped product items' must not be empty"
+        );
+        $this->assertGroupedProductItems($groupedProduct, $response['products']['items'][0]['items']);
+        $this->assertNotEmpty(
+            $response['products']['items'][0]['product_links'],
+            "Precondition failed: 'Linked product items' must not be empty"
+        );
+        $this->assertProductLinks($groupedProduct, $response['products']['items'][0]['product_links']);
     }
 
-    private function assertGroupedProductItems($product, $actualResponse)
+    /**
+     * @param ProductInterface $product
+     * @param array $items
+     */
+    private function assertGroupedProductItems(ProductInterface $product, array $items): void
     {
-        $this->assertNotEmpty(
-            $actualResponse['items'],
-            "Precondition failed: 'grouped product items' must not be empty"
-        );
-        $this->assertCount(2, $actualResponse['items']);
+        $this->assertCount(2, $items);
         $groupedProductLinks = $product->getProductLinks();
-        foreach ($actualResponse['items'] as $itemIndex => $bundleItems) {
-            $this->assertNotEmpty($bundleItems);
+        foreach ($items as $itemIndex => $bundleItem) {
+            $this->assertNotEmpty($bundleItem);
             $associatedProductSku = $groupedProductLinks[$itemIndex]->getLinkedProductSku();
-
-            $productsRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
-            /** @var \Magento\Catalog\Model\Product $associatedProduct */
-            $associatedProduct = $productsRepository->get($associatedProductSku);
+            $associatedProduct = $this->productRepository->get($associatedProductSku);
 
             $this->assertEquals(
                 $groupedProductLinks[$itemIndex]->getExtensionAttributes()->getQty(),
-                $actualResponse['items'][$itemIndex]['qty']
+                $bundleItem['qty']
             );
             $this->assertEquals(
                 $groupedProductLinks[$itemIndex]->getPosition(),
-                $actualResponse['items'][$itemIndex]['position']
+                $bundleItem['position']
             );
             $this->assertResponseFields(
-                $actualResponse['items'][$itemIndex]['product'],
+                $bundleItem['product'],
                 [
-                  'sku' => $associatedProductSku,
-                  'type_id' => $groupedProductLinks[$itemIndex]->getLinkedProductType(),
-                  'url_key'=> $associatedProduct->getUrlKey(),
-                  'name' => $associatedProduct->getName()
+                    'sku' => $associatedProductSku,
+                    'type_id' => $groupedProductLinks[$itemIndex]->getLinkedProductType(),
+                    'url_key'=> $associatedProduct->getUrlKey(),
+                    'name' => $associatedProduct->getName()
 
                 ]
             );
         }
     }
+
+    /**
+     * @param ProductInterface $product
+     * @param array $links
+     * @return void
+     */
+    private function assertProductLinks(ProductInterface $product, array $links): void
+    {
+        $this->assertCount(2, $links);
+        $productLinks = $product->getProductLinks();
+        foreach ($links as $itemIndex => $linkedItem) {
+            $this->assertNotEmpty($linkedItem);
+            $this->assertEquals(
+                $productLinks[$itemIndex]->getPosition(),
+                $linkedItem['position']
+            );
+            $this->assertEquals(
+                $productLinks[$itemIndex]->getLinkedProductSku(),
+                $linkedItem['linked_product_sku']
+            );
+            $this->assertEquals(
+                $productLinks[$itemIndex]->getLinkType(),
+                $linkedItem['link_type']
+            );
+        }
+    }
 }

From 89169805e30b15b465225fe01cd26a4326cb93d4 Mon Sep 17 00:00:00 2001
From: Kate Kyzyma <kate@atwix.com>
Date: Wed, 24 Jun 2020 13:34:26 +0300
Subject: [PATCH 0584/1718] Updating the test

---
 ...ryWithInactiveIncludeInMenuActionGroup.xml | 22 +++++++++++++++++++
 ...AdminCreateInactiveCategoryActionGroup.xml | 22 +++++++++++++++++++
 ...sertAdminCategoryIsInactiveActionGroup.xml | 18 +++++++++++++++
 ...CreateCategoryWithInactiveCategoryTest.xml | 20 +++++------------
 ...eCategoryWithInactiveIncludeInMenuTest.xml | 20 +++++------------
 5 files changed, 73 insertions(+), 29 deletions(-)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateCategoryWithInactiveIncludeInMenuActionGroup.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateInactiveCategoryActionGroup.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAdminCategoryIsInactiveActionGroup.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateCategoryWithInactiveIncludeInMenuActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateCategoryWithInactiveIncludeInMenuActionGroup.xml
new file mode 100644
index 0000000000000..c407e9ba829d7
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateCategoryWithInactiveIncludeInMenuActionGroup.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="AdminCreateCategoryWithInactiveIncludeInMenuActionGroup" extends="CreateCategoryActionGroup">
+        <annotations>
+            <description>EXTENDS: CreateCategory. Add "disableIncludeInMenuOption" step.</description>
+        </annotations>
+        <arguments>
+            <argument name="categoryEntity" defaultValue="_defaultCategory"/>
+        </arguments>
+
+        <click selector="{{AdminCategoryBasicFieldSection.includeInMenuLabel}}" stepKey="disableIncludeInMenuOption"
+               after="seeCategoryPageTitle"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateInactiveCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateInactiveCategoryActionGroup.xml
new file mode 100644
index 0000000000000..b16ff59b91329
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCreateInactiveCategoryActionGroup.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="AdminCreateInactiveCategoryActionGroup" extends="CreateCategoryActionGroup">
+    <annotations>
+        <description>EXTENDS: CreateCategory. Add "disableCategory" step.</description>
+    </annotations>
+    <arguments>
+        <argument name="categoryEntity" defaultValue="_defaultCategory"/>
+    </arguments>
+
+    <click selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}" stepKey="disableCategory"
+           after="seeCategoryPageTitle"/>
+</actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAdminCategoryIsInactiveActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAdminCategoryIsInactiveActionGroup.xml
new file mode 100644
index 0000000000000..cec6d42fc2dc4
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertAdminCategoryIsInactiveActionGroup.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="AssertAdminCategoryIsInactiveActionGroup">
+        <annotations>
+            <description>Verify the category is disabled</description>
+        </annotations>
+
+        <dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="seeCategoryIsDisabled"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveCategoryTest.xml
index a7dab57173377..6d7d56861b731 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveCategoryTest.xml
@@ -26,20 +26,12 @@
         </after>
         <!-- Create In active Category -->
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
-        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
-        <click selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}" stepKey="disableCategory"/>
-        <checkOption selector="{{AdminCategoryBasicFieldSection.IncludeInMenu}}" stepKey="enableIncludeInMenu"/>
-        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="fillCategoryName"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForCategorySaved"/>
-        <actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage"/>
-        <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seePageTitle" />
-        <dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="dontCategoryIsChecked"/>
-        <!--Verify InActive Category is created-->
-        <seeElement  selector="{{AdminCategoryContentSection.categoryInTree(_defaultCategory.name)}}" stepKey="seeCategoryInTree" />
+        <actionGroup ref="AdminCreateInactiveCategoryActionGroup" stepKey="createInactiveCategory"/>
+        <actionGroup ref="AssertAdminCategoryIsInactiveActionGroup" stepKey="seeDisabledCategory"/>
         <!--Verify Category is not listed store front page-->
-        <amOnPage url="{{StorefrontCategoryPage.url(_defaultCategory.name)}}"  stepKey="amOnCategoryPage"/>
-        <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
-        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="dontSeeCategoryOnStoreFrontPage"/>
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStoreFront"/>
+        <actionGroup ref="StorefrontAssertCategoryNameIsNotShownInMenuActionGroup" stepKey="doNotSeeCategoryNameInMenu">
+            <argument name="categoryName" value="{{_defaultCategory.name}}"/>
+        </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveIncludeInMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveIncludeInMenuTest.xml
index d3a766be2c99f..f60312f19a7e0 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveIncludeInMenuTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveIncludeInMenuTest.xml
@@ -26,21 +26,11 @@
         </after>
         <!--Create Category with not included in menu Subcategory  -->
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
-        <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
-        <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
-        <click selector="{{AdminCategoryBasicFieldSection.includeInMenuLabel}}" stepKey="disableIncludeInMenu"/>
-        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="fillCategoryName"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForCategorySaved"/>
-        <actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage"/>
-        <waitForPageLoad stepKey="waitForPageSaved"/>
-        <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seePageTitle" />
-        <!--Verify Category is created/>-->
-        <seeElement selector="{{AdminCategoryContentSection.activeCategoryInTree(_defaultCategory.name)}}" stepKey="seeCategoryInTree"  />
+        <actionGroup ref="AdminCreateCategoryWithInactiveIncludeInMenuActionGroup" stepKey="createNotIncludedInMenuCategory"/>
         <!--Verify Category in store front page menu/>-->
-        <amOnPage url="{{StorefrontCategoryPage.url(_defaultCategory.name)}}"  stepKey="amOnCategoryPage"/>
-        <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
-        <see selector="{{StorefrontCategoryMainSection.CategoryTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seeCategoryPageTitle"/>
-        <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="dontSeeCategoryOnNavigation"/>
+        <actionGroup ref="CheckCategoryOnStorefrontActionGroup" stepKey="CheckCategoryOnStorefront"/>
+        <actionGroup ref="StorefrontAssertCategoryNameIsNotShownInMenuActionGroup" stepKey="doNotSeeCategoryOnNavigation">
+            <argument name="categoryName" value="{{_defaultCategory.name}}"/>
+        </actionGroup>
     </test>
 </tests>

From 096aa37be5ca575276075dfd174490a76ef8a064 Mon Sep 17 00:00:00 2001
From: Oleksandr Melnyk <sasha19957099@gmail.com>
Date: Wed, 24 Jun 2020 13:47:32 +0300
Subject: [PATCH 0585/1718] magento/magento2#27952: missing store_name in
 GraphQL resolver - added requested changes

---
 .../Store/Api/Data/StoreConfigInterface.php   | 15 -------------
 .../Magento/Store/Model/Data/StoreConfig.php  | 22 -------------------
 .../Model/Service/StoreConfigManager.php      |  3 +--
 .../Model/Service/StoreConfigManagerTest.php  |  6 -----
 .../Store/StoreConfigDataProvider.php         |  4 ++--
 .../Magento/StoreGraphQl/etc/graphql/di.xml   |  7 ------
 .../GraphQl/Store/StoreConfigResolverTest.php |  2 +-
 7 files changed, 4 insertions(+), 55 deletions(-)

diff --git a/app/code/Magento/Store/Api/Data/StoreConfigInterface.php b/app/code/Magento/Store/Api/Data/StoreConfigInterface.php
index 78d7455dc5a92..758b24d3bc655 100644
--- a/app/code/Magento/Store/Api/Data/StoreConfigInterface.php
+++ b/app/code/Magento/Store/Api/Data/StoreConfigInterface.php
@@ -269,19 +269,4 @@ public function getExtensionAttributes();
     public function setExtensionAttributes(
         \Magento\Store\Api\Data\StoreConfigExtensionInterface $extensionAttributes
     );
-
-    /**
-     * Get store code
-     *
-     * @return string
-     */
-    public function getStoreName();
-
-    /**
-     * Set store name
-     *
-     * @param string $storeName
-     * @return $this
-     */
-    public function setStoreName(string $storeName);
 }
diff --git a/app/code/Magento/Store/Model/Data/StoreConfig.php b/app/code/Magento/Store/Model/Data/StoreConfig.php
index d1e4aa3e25088..aa9b48ef198b8 100644
--- a/app/code/Magento/Store/Model/Data/StoreConfig.php
+++ b/app/code/Magento/Store/Model/Data/StoreConfig.php
@@ -29,7 +29,6 @@ class StoreConfig extends \Magento\Framework\Api\AbstractExtensibleObject implem
     const KEY_SECURE_BASE_LINK_URL = 'secure_base_link_url';
     const KEY_SECURE_BASE_STATIC_URL = 'secure_base_static_url';
     const KEY_SECURE_BASE_MEDIA_URL = 'secure_base_media_url';
-    const KEY_STORE_NAME = 'store_name';
 
     /**
      * Get store id
@@ -388,25 +387,4 @@ public function setExtensionAttributes(
     ) {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
-
-    /**
-     * Get store code
-     *
-     * @return string
-     */
-    public function getStoreName()
-    {
-        return $this->_get(self::KEY_STORE_NAME);
-    }
-
-    /**
-     * Set store name
-     *
-     * @param string $storeName
-     * @return $this
-     */
-    public function setStoreName(string $storeName)
-    {
-        return $this->setData(self::KEY_STORE_NAME, $storeName);
-    }
 }
diff --git a/app/code/Magento/Store/Model/Service/StoreConfigManager.php b/app/code/Magento/Store/Model/Service/StoreConfigManager.php
index 26f4b0e9837c4..87570d1ff6307 100644
--- a/app/code/Magento/Store/Model/Service/StoreConfigManager.php
+++ b/app/code/Magento/Store/Model/Service/StoreConfigManager.php
@@ -89,8 +89,7 @@ protected function getStoreConfig($store)
 
         $storeConfig->setId($store->getId())
             ->setCode($store->getCode())
-            ->setWebsiteId($store->getWebsiteId())
-            ->setStoreName($store->getName());
+            ->setWebsiteId($store->getWebsiteId());
 
         foreach ($this->configPaths as $methodName => $configPath) {
             $configValue = $this->scopeConfig->getValue(
diff --git a/app/code/Magento/Store/Test/Unit/Model/Service/StoreConfigManagerTest.php b/app/code/Magento/Store/Test/Unit/Model/Service/StoreConfigManagerTest.php
index 51aecb7f39f12..c17e2846e22df 100644
--- a/app/code/Magento/Store/Test/Unit/Model/Service/StoreConfigManagerTest.php
+++ b/app/code/Magento/Store/Test/Unit/Model/Service/StoreConfigManagerTest.php
@@ -87,9 +87,6 @@ protected function getStoreMock(array $storeConfig)
         $storeMock->expects($this->once())
             ->method('getWebsiteId')
             ->willReturn($storeConfig['website_id']);
-        $storeMock->expects($this->any())
-            ->method('getName')
-            ->willReturn($storeConfig['store_name']);
 
         $urlMap = [
             [UrlInterface::URL_TYPE_WEB, false, $storeConfig['base_url']],
@@ -148,7 +145,6 @@ public function testGetStoreConfigs()
         $baseCurrencyCode = 'USD';
         $defaultDisplayCurrencyCode = 'GBP';
         $weightUnit = 'lbs';
-        $storeName = 'Default Store View';
 
         $storeMocks = [];
         $storeConfigs = [
@@ -163,7 +159,6 @@ public function testGetStoreConfigs()
             'secure_base_static_url' => $secureBaseStaticUrl,
             'base_media_url' => $baseMediaUrl,
             'secure_base_media_url' => $secureBaseMediaUrl,
-            'store_name' => $storeName,
         ];
         $storeMocks[] = $this->getStoreMock($storeConfigs);
 
@@ -210,7 +205,6 @@ public function testGetStoreConfigs()
         $this->assertEquals($secureBaseStaticUrl, $result[0]->getSecureBaseStaticUrl());
         $this->assertEquals($baseMediaUrl, $result[0]->getBaseMediaUrl());
         $this->assertEquals($secureBaseMediaUrl, $result[0]->getSecureBaseMediaUrl());
-        $this->assertEquals($storeName, $result[0]->getStoreName());
 
         $this->assertEquals($timeZone, $result[0]->getTimezone());
         $this->assertEquals($locale, $result[0]->getLocale());
diff --git a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
index 76b9a12ad0893..713179ee2bcca 100644
--- a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
+++ b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
@@ -56,8 +56,8 @@ public function __construct(
     public function getStoreConfigData(StoreInterface $store): array
     {
         return array_merge(
+            $this->getBaseConfigData($store),
             $this->getExtendedConfigData((int)$store->getId()),
-            $this->getBaseConfigData($store)
         );
     }
 
@@ -88,7 +88,7 @@ private function getBaseConfigData(StoreInterface $store) : array
             'secure_base_link_url' => $storeConfig->getSecureBaseLinkUrl(),
             'secure_base_static_url' => $storeConfig->getSecureBaseStaticUrl(),
             'secure_base_media_url' => $storeConfig->getSecureBaseMediaUrl(),
-            'store_name' => $storeConfig->getStoreName()
+            'store_name' => $store->getName()
         ];
     }
 
diff --git a/app/code/Magento/StoreGraphQl/etc/graphql/di.xml b/app/code/Magento/StoreGraphQl/etc/graphql/di.xml
index f3771b704c3e9..3a0143821d8b9 100644
--- a/app/code/Magento/StoreGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/StoreGraphQl/etc/graphql/di.xml
@@ -23,11 +23,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\StoreGraphQl\Model\Resolver\Store\StoreConfigDataProvider">
-        <arguments>
-            <argument name="extendedConfigData" xsi:type="array">
-                <item name="store_name" xsi:type="string">store/information/name</item>
-            </argument>
-        </arguments>
-    </type>
 </config>
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
index 6a87788ab09e9..e7af77f23fa88 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
@@ -91,6 +91,6 @@ public function testGetStoreConfig()
             $response['storeConfig']['secure_base_static_url']
         );
         $this->assertEquals($storeConfig->getSecureBaseMediaUrl(), $response['storeConfig']['secure_base_media_url']);
-        $this->assertEquals($storeConfig->getStoreName(), $response['storeConfig']['store_name']);
+        $this->assertEquals($store->getName(), $response['storeConfig']['store_name']);
     }
 }

From de9ff7dc57cb1c6b4c882bcb8777e53c62d81663 Mon Sep 17 00:00:00 2001
From: Oleksandr Melnyk <sasha19957099@gmail.com>
Date: Wed, 24 Jun 2020 13:57:24 +0300
Subject: [PATCH 0586/1718] Update StoreConfigDataProvider.php

---
 .../Model/Resolver/Store/StoreConfigDataProvider.php            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
index 713179ee2bcca..0baee00f468a0 100644
--- a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
+++ b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
@@ -57,7 +57,7 @@ public function getStoreConfigData(StoreInterface $store): array
     {
         return array_merge(
             $this->getBaseConfigData($store),
-            $this->getExtendedConfigData((int)$store->getId()),
+            $this->getExtendedConfigData((int)$store->getId())
         );
     }
 

From 86ccd2d12e2c601a9d0a535bf135bf81816146fb Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Wed, 24 Jun 2020 14:56:34 +0300
Subject: [PATCH 0587/1718] MC-35123: An invoiced order of a product with a
 Customizable Option (file) can not be reordered

---
 app/code/Magento/Catalog/Model/Product/Option/Type/File.php  | 3 +++
 app/code/Magento/Catalog/Model/Product/Type/AbstractType.php | 3 +++
 app/code/Magento/Sales/Model/AdminOrder/Create.php           | 1 -
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File.php
index dd16fc3911ee3..425c81a5a9c43 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/File.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/File.php
@@ -182,6 +182,7 @@ protected function _getProcessingParams()
 
     /**
      * Returns file info array if we need to get file from already existing file.
+     *
      * Or returns null, if we need to get file from uploaded array.
      *
      * @return null|array
@@ -528,6 +529,8 @@ protected function _getOptionDownloadUrl($route, $params)
     }
 
     /**
+     * Prepare size
+     *
      * @param array $value
      * @return string
      */
diff --git a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
index 811b8f421c8b7..5afac9636d7b4 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
@@ -358,6 +358,7 @@ public function isSalable($product)
 
     /**
      * Prepare product and its configuration to be added to some products list.
+     *
      * Perform standard preparation process and then prepare options belonging to specific product type.
      *
      * @param  \Magento\Framework\DataObject $buyRequest
@@ -443,6 +444,7 @@ public function processConfiguration(
 
     /**
      * Initialize product(s) for add to cart process.
+     *
      * Advanced version of func to prepare product for cart - processMode can be specified there.
      *
      * @param \Magento\Framework\DataObject $buyRequest
@@ -538,6 +540,7 @@ public function processFileQueue()
 
     /**
      * Add file to File Queue
+     *
      * @param array $queueOptions Array of File Queue
      *                              (eg. ['operation'=>'move',
      *                                    'src_name'=>'filename',
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
index 0107af0b77a99..e0b61e9bb150e 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/Create.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -1377,7 +1377,6 @@ protected function _setQuoteAddress(\Magento\Quote\Model\Quote\Address $address,
         $data = isset($data['region']) && is_array($data['region']) ? array_merge($data, $data['region']) : $data;
 
         $addressForm = $this->_metadataFormFactory->create(
-
             AddressMetadataInterface::ENTITY_TYPE_ADDRESS,
             'adminhtml_customer_address',
             $data,

From 2ac710d04e4953c1c850567daa88a5e6d9e7cdb7 Mon Sep 17 00:00:00 2001
From: Dmitry Tsymbal <d.tsymbal@atwix.com>
Date: Wed, 24 Jun 2020 15:39:19 +0300
Subject: [PATCH 0588/1718]  Newsletter Guest Subscription With Disallowed
 Optio nTest

---
 ...orefrontCreateNewSubscriberActionGroup.xml |  3 +-
 ...tCreateNewsletterSubscriberActionGroup.xml | 18 +++++++++
 .../BasicFrontendNewsletterFormSection.xml    |  4 +-
 ...stSubscriptionWithDisallowedOptionTest.xml | 38 +++++++++++++++++++
 ...inkDisplayedForGuestSubscriptionNoTest.xml |  3 +-
 ...torefrontAssertErrorMessageActionGroup.xml | 19 ++++++++++
 .../Section/StorefrontMessagesSection.xml     |  1 +
 7 files changed, 82 insertions(+), 4 deletions(-)
 create mode 100644 app/code/Magento/Newsletter/Test/Mftf/ActionGroup/StorefrontCreateNewsletterSubscriberActionGroup.xml
 create mode 100644 app/code/Magento/Newsletter/Test/Mftf/Test/StorefrontNewsletterGuestSubscriptionWithDisallowedOptionTest.xml
 create mode 100644 app/code/Magento/Ui/Test/Mftf/ActionGroup/StorefrontAssertErrorMessageActionGroup.xml

diff --git a/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/StorefrontCreateNewSubscriberActionGroup.xml b/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/StorefrontCreateNewSubscriberActionGroup.xml
index 0aee2cb9b2e3c..482ecec583552 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/StorefrontCreateNewSubscriberActionGroup.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/StorefrontCreateNewSubscriberActionGroup.xml
@@ -8,7 +8,8 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="StorefrontCreateNewSubscriberActionGroup">
+    <actionGroup name="StorefrontCreateNewSubscriberActionGroup" deprecated="Use StorefrontCreateNewsletterSubscriberActionGroup">
+        <!-- Deprecated Due to inconsistency with the best practices -->
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage"/>
         <submitForm selector="{{BasicFrontendNewsletterFormSection.subscribeForm}}"
                     parameterArray="['email' => '{{_defaultNewsletter.senderEmail}}']"
diff --git a/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/StorefrontCreateNewsletterSubscriberActionGroup.xml b/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/StorefrontCreateNewsletterSubscriberActionGroup.xml
new file mode 100644
index 0000000000000..44104f3adf0d9
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/StorefrontCreateNewsletterSubscriberActionGroup.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="StorefrontCreateNewsletterSubscriberActionGroup">
+        <arguments>
+            <argument name="email" type="string"/>
+        </arguments>
+        <fillField stepKey="fillEmailField" selector="{{BasicFrontendNewsletterFormSection.newsletterEmail}}" userInput="{{email}}"/>
+        <click selector="{{BasicFrontendNewsletterFormSection.subscribeButton}}" stepKey="submitForm"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Section/NewsletterTemplateSection/BasicFrontendNewsletterFormSection.xml b/app/code/Magento/Newsletter/Test/Mftf/Section/NewsletterTemplateSection/BasicFrontendNewsletterFormSection.xml
index 8475fb4d55b9e..f4c685e730be3 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/Section/NewsletterTemplateSection/BasicFrontendNewsletterFormSection.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Section/NewsletterTemplateSection/BasicFrontendNewsletterFormSection.xml
@@ -8,8 +8,8 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="BasicFrontendNewsletterFormSection">
-        <element name="newsletterEmail" type="input" selector="#newsletter"/>
-        <element name="subscribeButton" type="button" selector=".subscribe" timeout="30"/>
+        <element name="newsletterEmail" type="input" selector=".control #newsletter"/>
+        <element name="subscribeButton" type="button" selector=".actions .action.subscribe.primary" timeout="30"/>
         <element name="subscribeForm" type="input" selector="#newsletter-validate-detail" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/StorefrontNewsletterGuestSubscriptionWithDisallowedOptionTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/StorefrontNewsletterGuestSubscriptionWithDisallowedOptionTest.xml
new file mode 100644
index 0000000000000..bb4b550f04063
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/StorefrontNewsletterGuestSubscriptionWithDisallowedOptionTest.xml
@@ -0,0 +1,38 @@
+<?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="StorefrontNewsletterGuestSubscriptionWithDisallowedOptionTest">
+        <annotations>
+            <features value="Newsletter"/>
+            <stories value="Disabled Guest Newsletter Subscription"/>
+            <title value="Newsletter Subscription for guest is disabled and cannot be performed"/>
+            <description value="Guest cannot subscribe to Newsletter if it is disallowed in configurations"/>
+            <group value="newsletter"/>
+            <group value="configuration"/>
+        </annotations>
+        <before>
+            <magentoCLI stepKey="disableGuestSubscription" command="config:set newsletter/subscription/allow_guest_subscribe 0"/>
+            <magentoCLI command="cache:clean config" stepKey="cleanCache"/>
+        </before>
+        <after>
+            <magentoCLI stepKey="allowGuestSubscription" command="config:set newsletter/subscription/allow_guest_subscribe 1"/>
+            <magentoCLI command="cache:clean config" stepKey="cacheClean"/>
+        </after>
+
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openStorefrontPage"/>
+        <actionGroup ref="StorefrontCreateNewsletterSubscriberActionGroup" stepKey="createSubscription">
+            <argument name="email" value="{{_defaultNewsletter.senderEmail}}"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAssertErrorMessageActionGroup" stepKey="assertMessage">
+            <argument name="message" value="Sorry, but the administrator denied subscription for guests. Please register."/>
+            <argument name="messageType" value="error"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/VerifyRegistredLinkDisplayedForGuestSubscriptionNoTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/VerifyRegistredLinkDisplayedForGuestSubscriptionNoTest.xml
index cffce8da1d710..42df2061e4350 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/Test/VerifyRegistredLinkDisplayedForGuestSubscriptionNoTest.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/VerifyRegistredLinkDisplayedForGuestSubscriptionNoTest.xml
@@ -8,7 +8,8 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="VerifyRegistredLinkDisplayedForGuestSubscriptionNoTest">
+    <test name="VerifyRegistredLinkDisplayedForGuestSubscriptionNoTest" deprecated="Use StorefrontNewsletterGuestSubscriptionWithDisallowedOptionTest">
+        <!-- Deprecated Due to inconsistency with the best practices -->
         <annotations>
             <features value="Newsletter"/>
             <stories value="Configure guest newsletter subscription to 'No'"/>
diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/StorefrontAssertErrorMessageActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/StorefrontAssertErrorMessageActionGroup.xml
new file mode 100644
index 0000000000000..fa9b7c377e32b
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/StorefrontAssertErrorMessageActionGroup.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="StorefrontAssertErrorMessageActionGroup">
+        <arguments>
+            <argument name="message" type="string"/>
+            <argument name="messageType" type="string" defaultValue="success"/>
+        </arguments>
+
+        <see userInput="{{message}}" selector="{{StorefrontMessagesSection.messageByType(messageType)}}" stepKey="verifyMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Ui/Test/Mftf/Section/StorefrontMessagesSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/StorefrontMessagesSection.xml
index c58479a7b73e5..f46e25a832134 100644
--- a/app/code/Magento/Ui/Test/Mftf/Section/StorefrontMessagesSection.xml
+++ b/app/code/Magento/Ui/Test/Mftf/Section/StorefrontMessagesSection.xml
@@ -12,5 +12,6 @@
         <element name="success" type="text" selector="div.message-success.success.message"/>
         <element name="error" type="text" selector="div.message-error.error.message"/>
         <element name="noticeMessage" type="text" selector="div.message.notice div"/>
+        <element name="messageByType" type="text" selector=".messages .message-{{messageType}}" parameterized="true" />
     </section>
 </sections>

From 4fe5f8fbd30da5ca9215a2f292874b6c105ed87a Mon Sep 17 00:00:00 2001
From: Dmitriy Gallyamov <dmitrijs.gallamovs@gmail.com>
Date: Wed, 24 Jun 2020 15:51:27 +0300
Subject: [PATCH 0589/1718] magento/magento2#28569: Multi-store: Missing store
 codes in relation to a group and website

- Implemented new availableStores query

- Code refactor
---
 .../Resolver/AvailableStoresResolver.php      | 46 ++++++++++++
 .../Store/StoreConfigDataProvider.php         | 30 +++-----
 .../Magento/StoreGraphQl/etc/schema.graphqls  |  2 +-
 .../GraphQl/Store/StoreConfigResolverTest.php | 75 ++++++++++++-------
 4 files changed, 103 insertions(+), 50 deletions(-)
 create mode 100644 app/code/Magento/StoreGraphQl/Model/Resolver/AvailableStoresResolver.php

diff --git a/app/code/Magento/StoreGraphQl/Model/Resolver/AvailableStoresResolver.php b/app/code/Magento/StoreGraphQl/Model/Resolver/AvailableStoresResolver.php
new file mode 100644
index 0000000000000..904e1d487ff47
--- /dev/null
+++ b/app/code/Magento/StoreGraphQl/Model/Resolver/AvailableStoresResolver.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\StoreGraphQl\Model\Resolver;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\StoreGraphQl\Model\Resolver\Store\StoreConfigDataProvider;
+
+/**
+ * AvailableStores page field resolver, used for GraphQL request processing.
+ */
+class AvailableStoresResolver implements ResolverInterface
+{
+    /**
+     * @var StoreConfigDataProvider
+     */
+    private $storeConfigDataProvider;
+
+    /**
+     * @param StoreConfigDataProvider $storeConfigsDataProvider
+     */
+    public function __construct(
+        StoreConfigDataProvider $storeConfigsDataProvider
+    ) {
+        $this->storeConfigDataProvider = $storeConfigsDataProvider;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        return $this->storeConfigDataProvider->getAvailableStores();
+    }
+}
diff --git a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
index 54220e67a926e..f44633c6ca973 100644
--- a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
+++ b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
@@ -10,7 +10,6 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Store\Api\Data\StoreConfigInterface;
 use Magento\Store\Api\StoreConfigManagerInterface;
-use Magento\Store\Api\StoreRepositoryInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Api\Data\StoreInterface;
 
@@ -34,27 +33,19 @@ class StoreConfigDataProvider
      */
     private $extendedConfigData;
 
-    /**
-     * @var StoreRepositoryInterface
-     */
-    private $storeRepository;
-
     /**
      * @param StoreConfigManagerInterface $storeConfigManager
      * @param ScopeConfigInterface $scopeConfig
-     * @param StoreRepositoryInterface $storeRepository
      * @param array $extendedConfigData
      */
     public function __construct(
         StoreConfigManagerInterface $storeConfigManager,
         ScopeConfigInterface $scopeConfig,
-        StoreRepositoryInterface $storeRepository,
         array $extendedConfigData = []
     ) {
         $this->storeConfigManager = $storeConfigManager;
         $this->scopeConfig = $scopeConfig;
         $this->extendedConfigData = $extendedConfigData;
-        $this->storeRepository = $storeRepository;
     }
 
     /**
@@ -66,27 +57,24 @@ public function __construct(
     public function getStoreConfigData(StoreInterface $store): array
     {
         $defaultStoreConfig = $this->storeConfigManager->getStoreConfig($store);
-        $defaultStoreConfigData = $this->prepareStoreConfigData($defaultStoreConfig);
-
-        return $this->addStores($defaultStoreConfigData);
+        return $this->prepareStoreConfigData($defaultStoreConfig);
     }
 
     /**
-     * Add all stores
+     * Get available stores
      *
-     * @param array $defaultStoreConfigData
-     * @return mixed
+     * @return array
      */
-    private function addStores($defaultStoreConfigData)
+    public function getAvailableStores(): array
     {
-        $stores = $this->storeRepository->getList();
+        $storesConfigData = [];
+        $storeConfigs = $this->storeConfigManager->getStoreConfigs();
 
-        foreach ($stores as $store) {
-            $storeConfig = $this->storeConfigManager->getStoreConfig($store);
-            $defaultStoreConfigData['stores'][] = $this->prepareStoreConfigData($storeConfig);
+        foreach ($storeConfigs as $storeConfig) {
+            $storesConfigData[] = $this->prepareStoreConfigData($storeConfig);
         }
 
-        return $defaultStoreConfigData;
+        return $storesConfigData;
     }
 
     /**
diff --git a/app/code/Magento/StoreGraphQl/etc/schema.graphqls b/app/code/Magento/StoreGraphQl/etc/schema.graphqls
index 478b906c54481..d85bac7801f39 100644
--- a/app/code/Magento/StoreGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/StoreGraphQl/etc/schema.graphqls
@@ -2,6 +2,7 @@
 # See COPYING.txt for license details.
 type Query {
     storeConfig : StoreConfig @resolver(class: "Magento\\StoreGraphQl\\Model\\Resolver\\StoreConfigResolver") @doc(description: "The store config query") @cache(cacheable: false)
+    availableStores: [StoreConfig] @resolver(class: "Magento\\StoreGraphQl\\Model\\Resolver\\AvailableStoresResolver") @doc(description: "Get a list of available store views and their config information.")
 }
 
 type Website @doc(description: "Website is deprecated because it is should not be used on storefront. The type contains information about a website") {
@@ -31,5 +32,4 @@ type StoreConfig @doc(description: "The type contains information about a store
     secure_base_static_url : String @doc(description: "Secure base static URL for the store")
     secure_base_media_url : String @doc(description: "Secure base media URL for the store")
     store_name : String @doc(description: "Name of the store")
-    stores: [StoreConfig] @doc(description: "Contains information about all stores")
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
index 0fa1f446892e5..5e46921591d68 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
@@ -7,7 +7,9 @@
 
 namespace Magento\GraphQl\Store;
 
+use Exception;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Store\Api\Data\StoreConfigInterface;
 use Magento\Store\Api\StoreConfigManagerInterface;
 use Magento\Store\Api\StoreRepositoryInterface;
@@ -18,7 +20,7 @@
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 /**
- * Test the GraphQL endpoint's StoreConfigs query
+ * Test the GraphQL endpoint's StoreConfigs and AvailableStores queries
  */
 class StoreConfigResolverTest extends GraphQlAbstract
 {
@@ -34,9 +36,9 @@ protected function setUp(): void
     /**
      * @magentoApiDataFixture Magento/Store/_files/store.php
      * @magentoConfigFixture default_store store/information/name Default Store
-     * @magentoConfigFixture test_store store/information/name Test Store
+     * @throws NoSuchEntityException
      */
-    public function testGetStoreConfig()
+    public function testGetStoreConfig(): void
     {
         /** @var  StoreConfigManagerInterface $defaultStoreConfigsManager */
         $defaultStoreConfigsManager = $this->objectManager->get(StoreConfigManagerInterface::class);
@@ -48,12 +50,10 @@ public function testGetStoreConfig()
         $store = $storeRepository->getById($storeId);
         /** @var StoreConfigInterface $defaultStoreConfig */
         $defaultStoreConfig = current($defaultStoreConfigsManager->getStoreConfigs([$store->getCode()]));
-        /** @var StoreConfigInterface $storeConfigs */
-        $storeConfigs = $defaultStoreConfigsManager->getStoreConfigs();
         $query
             = <<<QUERY
 {
-  storeConfig{
+  storeConfig {
     id,
     code,
     website_id,
@@ -71,36 +71,55 @@ public function testGetStoreConfig()
     secure_base_static_url,
     secure_base_media_url,
     store_name
-    stores {
-        id,
-        code,
-        website_id,
-        locale,
-        base_currency_code,
-        default_display_currency_code,
-        timezone,
-        weight_unit,
-        base_url,
-        base_link_url,
-        base_static_url,
-        base_media_url,
-        secure_base_url,
-        secure_base_link_url,
-        secure_base_static_url,
-        secure_base_media_url,
-        store_name
-    }
   }
 }
 QUERY;
         $response = $this->graphQlQuery($query);
         $this->assertArrayHasKey('storeConfig', $response);
         $this->validateStoreConfig($defaultStoreConfig, $response['storeConfig']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Store/_files/store.php
+     * @magentoConfigFixture default_store store/information/name Default Store
+     * @magentoConfigFixture test_store store/information/name Test Store
+     * @throws Exception
+     */
+    public function testAvailableStoreConfigs(): void
+    {
+        /** @var  StoreConfigManagerInterface $defaultStoreConfigsManager */
+        $defaultStoreConfigsManager = $this->objectManager->get(StoreConfigManagerInterface::class);
+        $storeConfigs = $defaultStoreConfigsManager->getStoreConfigs();
+
+        $query
+            = <<<QUERY
+{
+  availableStores {
+    id,
+    code,
+    website_id,
+    locale,
+    base_currency_code,
+    default_display_currency_code,
+    timezone,
+    weight_unit,
+    base_url,
+    base_link_url,
+    base_static_url,
+    base_media_url,
+    secure_base_url,
+    secure_base_link_url,
+    secure_base_static_url,
+    secure_base_media_url,
+    store_name
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
 
-        $this->assertArrayHasKey('stores', $response['storeConfig']);
+        $this->assertArrayHasKey('availableStores', $response);
         foreach ($storeConfigs as $key => $storeConfig) {
-            $this->assertArrayHasKey($key, $response['storeConfig']['stores']);
-            $this->validateStoreConfig($storeConfig, $response['storeConfig']['stores'][$key]);
+            $this->validateStoreConfig($storeConfig, $response['availableStores'][$key]);
         }
     }
 

From 07f03fe8a728aad4ebe807c30bdd68b9007917ea Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Wed, 24 Jun 2020 16:25:57 +0300
Subject: [PATCH 0590/1718] magento/magento2-login-as-customer#144: Banner is
 not shown on Category page if Disable Page Cache For Admin User = No.

---
 .../KeepLoginAsCustomerSessionDataPlugin.php  | 71 +++++++++++++++++++
 .../etc/frontend/di.xml                       |  4 ++
 2 files changed, 75 insertions(+)
 create mode 100644 app/code/Magento/LoginAsCustomerFrontendUi/Plugin/KeepLoginAsCustomerSessionDataPlugin.php

diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/Plugin/KeepLoginAsCustomerSessionDataPlugin.php b/app/code/Magento/LoginAsCustomerFrontendUi/Plugin/KeepLoginAsCustomerSessionDataPlugin.php
new file mode 100644
index 0000000000000..2252786d1a408
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/Plugin/KeepLoginAsCustomerSessionDataPlugin.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\LoginAsCustomerFrontendUi\Plugin;
+
+use Magento\Framework\Session\SessionManagerInterface;
+use Magento\LoginAsCustomerApi\Api\ConfigInterface;
+use Magento\LoginAsCustomerApi\Api\GetLoggedAsCustomerAdminIdInterface;
+use Magento\LoginAsCustomerApi\Api\SetLoggedAsCustomerAdminIdInterface;
+
+/**
+ * Keep adminId in customer session if session data is cleared.
+ */
+class KeepLoginAsCustomerSessionDataPlugin
+{
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var GetLoggedAsCustomerAdminIdInterface
+     */
+    private $getLoggedAsCustomerAdminId;
+
+    /**
+     * @var SetLoggedAsCustomerAdminIdInterface
+     */
+    private $setLoggedAsCustomerAdminId;
+
+    /**
+     * @param ConfigInterface $config
+     * @param GetLoggedAsCustomerAdminIdInterface $getLoggedAsCustomerAdminId
+     * @param SetLoggedAsCustomerAdminIdInterface $setLoggedAsCustomerAdminId
+     */
+    public function __construct(
+        ConfigInterface $config,
+        GetLoggedAsCustomerAdminIdInterface $getLoggedAsCustomerAdminId,
+        SetLoggedAsCustomerAdminIdInterface $setLoggedAsCustomerAdminId
+    ) {
+        $this->config = $config;
+        $this->getLoggedAsCustomerAdminId = $getLoggedAsCustomerAdminId;
+        $this->setLoggedAsCustomerAdminId = $setLoggedAsCustomerAdminId;
+    }
+
+    /**
+     * Keep adminId in customer session if session data is cleared.
+     *
+     * @param SessionManagerInterface $subject
+     * @param \Closure $proceed
+     * @return SessionManagerInterface
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function aroundClearStorage(
+        SessionManagerInterface $subject,
+        \Closure $proceed
+    ): SessionManagerInterface {
+        $enabled = $this->config->isEnabled();
+        $adminId = $enabled ? $this->getLoggedAsCustomerAdminId->execute() : null;
+        $result = $proceed();
+        if ($enabled && $adminId) {
+            $this->setLoggedAsCustomerAdminId->execute($adminId);
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/etc/frontend/di.xml b/app/code/Magento/LoginAsCustomerFrontendUi/etc/frontend/di.xml
index 2204402b7dd30..bff511b6bb6e6 100644
--- a/app/code/Magento/LoginAsCustomerFrontendUi/etc/frontend/di.xml
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/etc/frontend/di.xml
@@ -17,4 +17,8 @@
         <plugin name="invalidate_expired_session_plugin"
                 type="Magento\LoginAsCustomerFrontendUi\Plugin\InvalidateExpiredSessionPlugin"/>
     </type>
+    <type name="Magento\Framework\Session\SessionManagerInterface">
+        <plugin name="keep_login_as_customer_session_data"
+                type="Magento\LoginAsCustomerFrontendUi\Plugin\KeepLoginAsCustomerSessionDataPlugin"/>
+    </type>
 </config>

From 0e32b44dcedb7550a494f48333d1a6e6e2241f3f Mon Sep 17 00:00:00 2001
From: Oleksandr Melnyk <sasha19957099@gmail.com>
Date: Wed, 24 Jun 2020 17:45:51 +0300
Subject: [PATCH 0591/1718] magento/magento2#27952: missing store_name in
 GraphQL resolver - initDeclaredDependencies() fix

---
 .../DeclarativeSchemaDependencyProvider.php   |  6 ++--
 .../Dependency/DependencyProvider.php         | 36 ++++++++++++-------
 .../GraphQlSchemaDependencyProvider.php       |  2 --
 3 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php
index 84de29e316b95..df8986d2a3c56 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php
@@ -54,6 +54,10 @@ class DeclarativeSchemaDependencyProvider
      */
     private $dependencyProvider;
 
+    /**
+     * DeclarativeSchemaDependencyProvider constructor.
+     * @param DependencyProvider $dependencyProvider
+     */
     public function __construct(DependencyProvider $dependencyProvider)
     {
         $this->dependencyProvider = $dependencyProvider;
@@ -68,7 +72,6 @@ public function __construct(DependencyProvider $dependencyProvider)
      */
     public function getDeclaredExistingModuleDependencies(string $moduleName): array
     {
-        $this->dependencyProvider->initDeclaredDependencies();
         $dependencies = $this->getDependenciesFromFiles($this->getSchemaFileNameByModuleName($moduleName));
         $dependencies = $this->filterSelfDependency($moduleName, $dependencies);
         $declared = $this->dependencyProvider->getDeclaredDependencies(
@@ -103,7 +106,6 @@ public function getDeclaredExistingModuleDependencies(string $moduleName): array
      */
     public function getUndeclaredModuleDependencies(string $moduleName): array
     {
-        $this->dependencyProvider->initDeclaredDependencies();
         $dependencies = $this->getDependenciesFromFiles($this->getSchemaFileNameByModuleName($moduleName));
         $dependencies = $this->filterSelfDependency($moduleName, $dependencies);
         return $this->collectDependencies($moduleName, $dependencies);
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DependencyProvider.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DependencyProvider.php
index 755d2dda0e08f..ef05b91ba54d4 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DependencyProvider.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DependencyProvider.php
@@ -39,22 +39,13 @@ class DependencyProvider
     private $packageModuleMapping = [];
 
     /**
-     * Initialise map of dependencies.
-     *
-     * @throws \Magento\TestFramework\Inspection\Exception
+     * DependencyProvider constructor.
      * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\TestFramework\Inspection\Exception
      */
-    public function initDeclaredDependencies()
+    public function __construct()
     {
-        if (empty($this->mapDependencies)) {
-            $jsonFiles = Files::init()->getComposerFiles(ComponentRegistrar::MODULE, false);
-            foreach ($jsonFiles as $file) {
-                $json = new \Magento\Framework\Config\Composer\Package($this->readJsonFile($file));
-                $moduleName = $this->convertModuleName($json->get('name'));
-                $require = array_keys((array)$json->get('require'));
-                $this->presetDependencies($moduleName, $require, self::TYPE_HARD);
-            }
-        }
+        $this->initDeclaredDependencies();
     }
 
     /**
@@ -86,6 +77,25 @@ public function getDeclaredDependencies(string $module, string $type, string $ma
         return $this->mapDependencies[$module][$type][$mapType] ?? [];
     }
 
+    /**
+     * Initialise map of dependencies.
+     *
+     * @throws \Magento\TestFramework\Inspection\Exception
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function initDeclaredDependencies()
+    {
+        if (empty($this->mapDependencies)) {
+            $jsonFiles = Files::init()->getComposerFiles(ComponentRegistrar::MODULE, false);
+            foreach ($jsonFiles as $file) {
+                $json = new \Magento\Framework\Config\Composer\Package($this->readJsonFile($file));
+                $moduleName = $this->convertModuleName($json->get('name'));
+                $require = array_keys((array)$json->get('require'));
+                $this->presetDependencies($moduleName, $require, self::TYPE_HARD);
+            }
+        }
+    }
+
     /**
      * Add dependencies to dependency list.
      *
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/GraphQlSchemaDependencyProvider.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/GraphQlSchemaDependencyProvider.php
index 7d0b6f7c391a1..b759649ac3151 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/GraphQlSchemaDependencyProvider.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/GraphQlSchemaDependencyProvider.php
@@ -48,7 +48,6 @@ public function __construct(DependencyProvider $dependencyProvider)
      */
     public function getDeclaredExistingModuleDependencies(string $moduleName): array
     {
-        $this->dependencyProvider->initDeclaredDependencies();
         $dependencies = $this->getDependenciesFromSchema($moduleName);
         $declared = $this->dependencyProvider->getDeclaredDependencies(
             $moduleName,
@@ -73,7 +72,6 @@ public function getDeclaredExistingModuleDependencies(string $moduleName): array
      */
     public function getUndeclaredModuleDependencies(string $moduleName): array
     {
-        $this->dependencyProvider->initDeclaredDependencies();
         $dependencies = $this->getDependenciesFromSchema($moduleName);
         return $this->collectDependencies($moduleName, $dependencies);
     }

From c3295e0367146bf9c91a21e5457ffe2023f33970 Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@magento.com>
Date: Wed, 24 Jun 2020 10:39:55 -0500
Subject: [PATCH 0592/1718] MC-31618: Move static config to files - PLUGIN_LIST

- Fix static tests;
---
 .../Framework/Interception/ConfigWriter.php   |  2 +-
 .../Test/Unit/PluginList/PluginListTest.php   | 38 +++++--------------
 2 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/lib/internal/Magento/Framework/Interception/ConfigWriter.php b/lib/internal/Magento/Framework/Interception/ConfigWriter.php
index 050513a55f07d..ed93c543f8d31 100644
--- a/lib/internal/Magento/Framework/Interception/ConfigWriter.php
+++ b/lib/internal/Magento/Framework/Interception/ConfigWriter.php
@@ -174,7 +174,7 @@ public function write($scopes)
                 foreach ($virtualTypes as $class) {
                     $this->inheritPlugins($class, $this->pluginData, $this->inherited, $this->processed);
                 }
-                foreach ($this->pluginData as $className => $value) {
+                foreach (array_keys($this->pluginData) as $className) {
                     $this->inheritPlugins($className, $this->pluginData, $this->inherited, $this->processed);
                 }
                 foreach ($this->getClassDefinitions() as $class) {
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/PluginList/PluginListTest.php b/lib/internal/Magento/Framework/Interception/Test/Unit/PluginList/PluginListTest.php
index ef24c2d9329da..e036e51c39fb4 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/PluginList/PluginListTest.php
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/PluginList/PluginListTest.php
@@ -130,8 +130,7 @@ protected function setUp(): void
 
     public function testGetPlugin()
     {
-        $inheritPlugins = function ($type)
-        {
+        $inheritPlugins = function ($type) {
             $inheritedItem = [
                 Item::class => [
                     'advanced_plugin' => [
@@ -147,17 +146,12 @@ public function testGetPlugin()
             $processedItem = [
                 'Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item_getName___self' => [
                     2 => 'advanced_plugin',
-                    4 => [
-                        'advanced_plugin'
-                    ]
+                    4 => ['advanced_plugin']
                 ],
                 'Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item_getName_advanced_plugin' => [
-                    4 => [
-                        'simple_plugin'
-                    ]
+                    4 => ['simple_plugin']
                 ]
             ];
-
             $inheritedItemContainer = [
                 ItemContainer::class => [
                     'simple_plugin' => [
@@ -168,12 +162,9 @@ public function testGetPlugin()
             ];
             $processedItemContainer = [
                 'Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemContainer_getName___self' => [
-                    4 => [
-                        'simple_plugin'
-                    ]
+                    4 => ['simple_plugin']
                 ]
             ];
-
             $inheritedStartingBackslash = [
                 StartingBackslash::class => [
                     'simple_plugin' => [
@@ -187,12 +178,10 @@ public function testGetPlugin()
                 $this->_inherited = $inheritedItem;
                 $this->_processed = $processedItem;
             }
-
             if ($type === 'Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemContainer') {
                 $this->_inherited = array_merge($inheritedItem, $inheritedItemContainer);
                 $this->_processed = array_merge($processedItem, $processedItemContainer);
             }
-
             if ($type === 'Magento\Framework\Interception\Test\Unit\Custom\Module\Model\StartingBackslash') {
                 $this->_inherited = array_merge($inheritedItem, $inheritedItemContainer, $inheritedStartingBackslash);
                 $this->_processed = array_merge($processedItem, $processedItemContainer);
@@ -203,14 +192,8 @@ public function testGetPlugin()
 
         $this->configScopeMock->method('getCurrentScope')->willReturn('backend');
         $this->object->getNext(Item::class, 'getName');
-        $this->object->getNext(
-            ItemContainer::class,
-            'getName'
-        );
-        $this->object->getNext(
-            StartingBackslash::class,
-            'getName'
-        );
+        $this->object->getNext(ItemContainer::class, 'getName');
+        $this->object->getNext(StartingBackslash::class, 'getName');
         $this->assertEquals(
             Simple::class,
             $this->object->getPlugin(
@@ -261,8 +244,7 @@ public function testGetPlugins(
         $this->setScopePriorityScheme($scopePriorityScheme);
         $this->configScopeMock->method('getCurrentScope')->willReturn($scopeCode);
 
-        $inheritPlugins = function ($type)
-        {
+        $inheritPlugins = function ($type) {
             $inheritedItem = [
                 Item::class => [
                     'simple_plugin' => [
@@ -327,8 +309,7 @@ public function testLoadScopedDataCached()
             ->with('global|scope|interception')
             ->willReturn($serializedData);
 
-        $inheritPlugins = function ($type)
-        {
+        $inheritPlugins = function ($type) {
             $inherited = [
                 0 => 'key',
                 'Type' => null
@@ -365,8 +346,7 @@ public function testLoadScopedDataGenerated()
             ->with('global|scope|interception')
             ->willReturn($data);
 
-        $inheritPlugins = function ($type)
-        {
+        $inheritPlugins = function ($type) {
             $inherited = [
                 0 => 'key',
                 'Type' => null

From 2355d97168f0471426b79198ef67e3fca8f626e5 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 24 Jun 2020 22:16:32 +0300
Subject: [PATCH 0593/1718] changed method for call cron job

---
 .../AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml  | 2 +-
 .../Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml      | 2 +-
 .../Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml     | 2 +-
 .../Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml     | 2 +-
 .../Mftf/Test/ApplyCatalogPriceRuleByProductAttributeTest.xml   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
index c5126769cc8c9..bf9aa5509fa50 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
@@ -38,7 +38,7 @@
             <!--Open Index Management Page and Select Index mode "Update by Schedule" -->
             <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
             <!-- Run cron -->
-            <magentoCLI command="cron:run" arguments="--group=index" stepKey="runCron"/>
+            <magentoCron stepKey="runIndexCronJobs" groups="index"/>
         </before>
         <after>
             <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml
index 8bb47fbc1cb2e..3f54f60f382e4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml
@@ -38,7 +38,7 @@
             <!--Open Index Management Page and Select Index mode "Update by Schedule" -->
             <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
             <!-- Run cron -->
-            <magentoCLI command="cron:run" arguments="--group=index" stepKey="runCron"/>
+            <magentoCron stepKey="runIndexCronJobs" groups="index"/>
         </before>
         <after>
             <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml
index b7e94cfbb8679..df9d28637f727 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml
@@ -38,7 +38,7 @@
             <!--Open Index Management Page and Select Index mode "Update by Schedule" -->
             <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
             <!-- Run cron -->
-            <magentoCLI command="cron:run" arguments="--group=index" stepKey="runCron"/>
+            <magentoCron stepKey="runIndexCronJobs" groups="index"/>
         </before>
         <after>
             <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
index 741e98fa3336b..011eae0572a9a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
@@ -39,7 +39,7 @@
             <!--Open Index Management Page and Select Index mode "Update by Schedule" -->
             <magentoCLI stepKey="setIndexerMode" command="indexer:set-mode" arguments="schedule" />
             <!-- Run cron -->
-            <magentoCLI command="cron:run" stepKey="runCron1"/>
+            <magentoCron stepKey="runAllCronJobs"/>
         </before>
         <after>
             <magentoCLI stepKey="setFlatCatalogCategory" command="config:set catalog/frontend/flat_catalog_category 0 "/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogPriceRuleByProductAttributeTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogPriceRuleByProductAttributeTest.xml
index 2c4e41b8151cf..56144b5908868 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogPriceRuleByProductAttributeTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogPriceRuleByProductAttributeTest.xml
@@ -233,7 +233,7 @@
         <see userInput="Updated rules applied." selector="{{ContentManagementSection.StoreConfigurationPageSuccessMessage}}" stepKey="seeSuccessMessage"/>
 
         <!-- Run cron -->
-        <magentoCLI command="cron:run" stepKey="runCron"/>
+        <magentoCron stepKey="runAllCronJobs"/>
         <magentoCLI command="cache:flush" stepKey="flushCache"/>
 
         <!-- Go to Frontend and open the simple product -->

From a020625517c036c3f671eccdb88b2ec772ce188c Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Wed, 24 Jun 2020 22:23:02 +0300
Subject: [PATCH 0594/1718] Adding reviews config checking

---
 .../Magento/Review/Model/Review/Config.php    | 46 +++++++++++++++++++
 .../ReviewGraphQl/Mapper/ReviewDataMapper.php |  1 -
 .../Model/Resolver/CreateProductReview.php    | 15 +++++-
 .../Model/Resolver/Product/RatingSummary.php  | 15 +++++-
 .../Model/Resolver/Product/ReviewCount.php    | 14 +++++-
 .../Model/Resolver/Product/Reviews.php        | 15 +++++-
 .../Resolver/ProductReviewRatingsMetadata.php | 14 +++++-
 7 files changed, 114 insertions(+), 6 deletions(-)
 create mode 100644 app/code/Magento/Review/Model/Review/Config.php

diff --git a/app/code/Magento/Review/Model/Review/Config.php b/app/code/Magento/Review/Model/Review/Config.php
new file mode 100644
index 0000000000000..8fa32f0a7e340
--- /dev/null
+++ b/app/code/Magento/Review/Model/Review/Config.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Review\Model\Review;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
+
+/**
+ * Provides reviews configuration
+ */
+class Config
+{
+    const XML_PATH_WISHLIST_ACTIVE = 'catalog/review/active';
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(
+        ScopeConfigInterface $scopeConfig
+    ) {
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * Check whether the reviews are enabled or not
+     *
+     * @return bool
+     */
+    public function isEnabled(): bool
+    {
+        return $this->scopeConfig->isSetFlag(
+            self::XML_PATH_WISHLIST_ACTIVE,
+            ScopeInterface::SCOPE_STORES
+        );
+    }
+}
diff --git a/app/code/Magento/ReviewGraphQl/Mapper/ReviewDataMapper.php b/app/code/Magento/ReviewGraphQl/Mapper/ReviewDataMapper.php
index e5a05712e3018..6a06fbfc4102c 100644
--- a/app/code/Magento/ReviewGraphQl/Mapper/ReviewDataMapper.php
+++ b/app/code/Magento/ReviewGraphQl/Mapper/ReviewDataMapper.php
@@ -29,7 +29,6 @@ public function map(Review $review): array
             'text' => $review->getData('detail'),
             'nickname' => $review->getData('nickname'),
             'created_at' => $review->getData('created_at'),
-            'rating_votes' => $review->getData('rating_votes'),
             'sku' => $review->getSku(),
             'model' => $review
         ];
diff --git a/app/code/Magento/ReviewGraphQl/Model/Resolver/CreateProductReview.php b/app/code/Magento/ReviewGraphQl/Model/Resolver/CreateProductReview.php
index 6db31f3a50f33..9b0171c3b700a 100644
--- a/app/code/Magento/ReviewGraphQl/Model/Resolver/CreateProductReview.php
+++ b/app/code/Magento/ReviewGraphQl/Model/Resolver/CreateProductReview.php
@@ -15,6 +15,7 @@
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Review\Helper\Data as ReviewHelper;
+use Magento\Review\Model\Review\Config as ReviewsConfig;
 use Magento\ReviewGraphQl\Mapper\ReviewDataMapper;
 use Magento\ReviewGraphQl\Model\Review\AddReviewToProduct;
 use Magento\Store\Api\Data\StoreInterface;
@@ -39,20 +40,28 @@ class CreateProductReview implements ResolverInterface
      */
     private $reviewDataMapper;
 
+    /**
+     * @var ReviewsConfig
+     */
+    private $reviewsConfig;
+
     /**
      * @param AddReviewToProduct $addReviewToProduct
      * @param ReviewDataMapper $reviewDataMapper
      * @param ReviewHelper $reviewHelper
+     * @param ReviewsConfig $reviewsConfig
      */
     public function __construct(
         AddReviewToProduct $addReviewToProduct,
         ReviewDataMapper $reviewDataMapper,
-        ReviewHelper $reviewHelper
+        ReviewHelper $reviewHelper,
+        ReviewsConfig $reviewsConfig
     ) {
 
         $this->addReviewToProduct = $addReviewToProduct;
         $this->reviewDataMapper = $reviewDataMapper;
         $this->reviewHelper = $reviewHelper;
+        $this->reviewsConfig = $reviewsConfig;
     }
 
     /**
@@ -78,6 +87,10 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
+        if (false === $this->reviewsConfig->isEnabled()) {
+            throw new GraphQlAuthorizationException(__('Creating product reviews are not currently available.'));
+        }
+
         $input = $args['input'];
         $customerId = null;
 
diff --git a/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/RatingSummary.php b/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/RatingSummary.php
index 56c7e7b5912f2..eed5034c59daa 100644
--- a/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/RatingSummary.php
+++ b/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/RatingSummary.php
@@ -14,6 +14,7 @@
 use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Review\Model\Review\Config as ReviewsConfig;
 use Magento\Review\Model\Review\SummaryFactory;
 use Magento\Store\Api\Data\StoreInterface;
 
@@ -27,13 +28,21 @@ class RatingSummary implements ResolverInterface
      */
     private $summaryFactory;
 
+    /**
+     * @var ReviewsConfig
+     */
+    private $reviewsConfig;
+
     /**
      * @param SummaryFactory $summaryFactory
+     * @param ReviewsConfig $reviewsConfig
      */
     public function __construct(
-        SummaryFactory $summaryFactory
+        SummaryFactory $summaryFactory,
+        ReviewsConfig $reviewsConfig
     ) {
         $this->summaryFactory = $summaryFactory;
+        $this->reviewsConfig = $reviewsConfig;
     }
 
     /**
@@ -58,6 +67,10 @@ public function resolve(
         array $value = null,
         array $args = null
     ): float {
+        if (false === $this->reviewsConfig->isEnabled()) {
+            return 0;
+        }
+
         if (!isset($value['model'])) {
             throw new GraphQlInputException(__('Value must contain "model" property.'));
         }
diff --git a/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/ReviewCount.php b/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/ReviewCount.php
index 5e9fa490fcd8f..dfa62adf0266e 100644
--- a/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/ReviewCount.php
+++ b/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/ReviewCount.php
@@ -15,6 +15,7 @@
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Review\Model\Review;
+use Magento\Review\Model\Review\Config as ReviewsConfig;
 
 /**
  * Product total review count
@@ -26,12 +27,19 @@ class ReviewCount implements ResolverInterface
      */
     private $review;
 
+    /**
+     * @var ReviewsConfig
+     */
+    private $reviewsConfig;
+
     /**
      * @param Review $review
+     * @param ReviewsConfig $reviewsConfig
      */
-    public function __construct(Review $review)
+    public function __construct(Review $review, ReviewsConfig $reviewsConfig)
     {
         $this->review = $review;
+        $this->reviewsConfig = $reviewsConfig;
     }
 
     /**
@@ -56,6 +64,10 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
+        if (false === $this->reviewsConfig->isEnabled()) {
+            return 0;
+        }
+
         if (!isset($value['model'])) {
             throw new GraphQlInputException(__('Value must contain "model" property.'));
         }
diff --git a/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/Reviews.php b/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/Reviews.php
index f414e189d8b1f..72eea5e6b3bd2 100644
--- a/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/Reviews.php
+++ b/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/Reviews.php
@@ -14,6 +14,7 @@
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Review\Model\Review\Config as ReviewsConfig;
 use Magento\ReviewGraphQl\Model\DataProvider\AggregatedReviewsDataProvider;
 use Magento\ReviewGraphQl\Model\DataProvider\ProductReviewsDataProvider;
 
@@ -32,16 +33,24 @@ class Reviews implements ResolverInterface
      */
     private $aggregatedReviewsDataProvider;
 
+    /**
+     * @var ReviewsConfig
+     */
+    private $reviewsConfig;
+
     /**
      * @param ProductReviewsDataProvider $productReviewsDataProvider
      * @param AggregatedReviewsDataProvider $aggregatedReviewsDataProvider
+     * @param ReviewsConfig $reviewsConfig
      */
     public function __construct(
         ProductReviewsDataProvider $productReviewsDataProvider,
-        AggregatedReviewsDataProvider $aggregatedReviewsDataProvider
+        AggregatedReviewsDataProvider $aggregatedReviewsDataProvider,
+        ReviewsConfig $reviewsConfig
     ) {
         $this->productReviewsDataProvider = $productReviewsDataProvider;
         $this->aggregatedReviewsDataProvider = $aggregatedReviewsDataProvider;
+        $this->reviewsConfig = $reviewsConfig;
     }
 
     /**
@@ -66,6 +75,10 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
+        if (false === $this->reviewsConfig->isEnabled()) {
+            return ['items' => []];
+        }
+
         if (!isset($value['model'])) {
             throw new GraphQlInputException(__('Value must contain "model" property.'));
         }
diff --git a/app/code/Magento/ReviewGraphQl/Model/Resolver/ProductReviewRatingsMetadata.php b/app/code/Magento/ReviewGraphQl/Model/Resolver/ProductReviewRatingsMetadata.php
index 075666ef9a0ad..2cf536255baf7 100644
--- a/app/code/Magento/ReviewGraphQl/Model/Resolver/ProductReviewRatingsMetadata.php
+++ b/app/code/Magento/ReviewGraphQl/Model/Resolver/ProductReviewRatingsMetadata.php
@@ -15,6 +15,7 @@
 use Magento\Review\Model\ResourceModel\Rating\Collection as RatingCollection;
 use Magento\Review\Model\ResourceModel\Rating\CollectionFactory;
 use Magento\Review\Model\Review;
+use Magento\Review\Model\Review\Config as ReviewsConfig;
 use Magento\Store\Api\Data\StoreInterface;
 
 /**
@@ -27,12 +28,19 @@ class ProductReviewRatingsMetadata implements ResolverInterface
      */
     private $ratingCollectionFactory;
 
+    /**
+     * @var ReviewsConfig
+     */
+    private $reviewsConfig;
+
     /**
      * @param CollectionFactory $ratingCollectionFactory
+     * @param ReviewsConfig $reviewsConfig
      */
-    public function __construct(CollectionFactory $ratingCollectionFactory)
+    public function __construct(CollectionFactory $ratingCollectionFactory, ReviewsConfig $reviewsConfig)
     {
         $this->ratingCollectionFactory = $ratingCollectionFactory;
+        $this->reviewsConfig = $reviewsConfig;
     }
 
     /**
@@ -55,6 +63,10 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
+        if (false === $this->reviewsConfig->isEnabled()) {
+            return ['items' => []];
+        }
+
         $items = [];
         /** @var StoreInterface $store */
         $store = $context->getExtensionAttributes()->getStore();

From 2e6e63ecf38a1b6679cca324c278bf7d5cf692c6 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 24 Jun 2020 22:55:20 +0300
Subject: [PATCH 0595/1718] Save data using setters

---
 .../PaypalGraphQl/Observer/PayflowProSetCcData.php     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/PaypalGraphQl/Observer/PayflowProSetCcData.php b/app/code/Magento/PaypalGraphQl/Observer/PayflowProSetCcData.php
index 54d4986d9e1d6..191d2c0435f60 100644
--- a/app/code/Magento/PaypalGraphQl/Observer/PayflowProSetCcData.php
+++ b/app/code/Magento/PaypalGraphQl/Observer/PayflowProSetCcData.php
@@ -8,12 +8,12 @@
 
 namespace Magento\PaypalGraphQl\Observer;
 
+use Magento\Customer\Model\Session as CustomerModelSession;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Payment\Observer\AbstractDataAssignObserver;
 use Magento\Quote\Api\Data\PaymentInterface;
-use Magento\Customer\Model\Session as CustomerModelSession;
 
 /**
  * Class PayflowProSetCcData set CcData to quote payment
@@ -80,9 +80,11 @@ public function execute(Observer $observer)
             $paymentModel->setData(self::IS_ACTIVE_PAYMENT_TOKEN_ENABLER, false);
         }
 
-        foreach ($additionalData['cc_details'] as $ccKey => $ccValue) {
-            $paymentModel->setData($ccKey, $ccValue);
-        }
+        $ccData = $additionalData['cc_details'];
+        $paymentModel->setCcType($ccData['cc_type']);
+        $paymentModel->setCcExpYear($ccData['cc_exp_year']);
+        $paymentModel->setCcExpMonth($ccData['cc_exp_month']);
+        $paymentModel->setCcLast4($ccData['cc_last_4']);
     }
 
     /**

From 0111b2d5956a791ef1cc4a63a95299a8f98b7899 Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Wed, 24 Jun 2020 23:05:05 +0300
Subject: [PATCH 0596/1718] Adding return types

---
 .../Magento/GraphQl/Review/CreateProductReviewsTest.php         | 2 +-
 .../testsuite/Magento/GraphQl/Review/GetProductReviewsTest.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Review/CreateProductReviewsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Review/CreateProductReviewsTest.php
index 0e4560b6af77a..77d2b5121e747 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Review/CreateProductReviewsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Review/CreateProductReviewsTest.php
@@ -45,7 +45,7 @@ class CreateProductReviewsTest extends GraphQlAbstract
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Review/GetProductReviewsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Review/GetProductReviewsTest.php
index 8d0b462a4d5a5..3d5655b912914 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Review/GetProductReviewsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Review/GetProductReviewsTest.php
@@ -43,7 +43,7 @@ class GetProductReviewsTest extends GraphQlAbstract
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->customerTokenService = $objectManager->get(CustomerTokenServiceInterface::class);

From 42c534c3bcc937f01921281ce6133f9784edd4ac Mon Sep 17 00:00:00 2001
From: Oleksandr Melnyk <sasha19957099@gmail.com>
Date: Wed, 24 Jun 2020 23:18:36 +0300
Subject: [PATCH 0597/1718] magento/magento2#27952: missing store_name in
 GraphQL resolver - small amendments with class names

---
 app/code/Magento/Store/Api/Data/StoreConfigInterface.php    | 3 +--
 app/code/Magento/Store/Model/Data/StoreConfig.php           | 2 +-
 app/code/Magento/Store/Model/Service/StoreConfigManager.php | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Store/Api/Data/StoreConfigInterface.php b/app/code/Magento/Store/Api/Data/StoreConfigInterface.php
index 758b24d3bc655..9fb70d44a6038 100644
--- a/app/code/Magento/Store/Api/Data/StoreConfigInterface.php
+++ b/app/code/Magento/Store/Api/Data/StoreConfigInterface.php
@@ -6,10 +6,9 @@
 namespace Magento\Store\Api\Data;
 
 /**
- * StoreConfig interface
  * Interface for store config
+ *
  * @api
- * @since 100.0.2
  */
 interface StoreConfigInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
diff --git a/app/code/Magento/Store/Model/Data/StoreConfig.php b/app/code/Magento/Store/Model/Data/StoreConfig.php
index aa9b48ef198b8..e68d98b162613 100644
--- a/app/code/Magento/Store/Model/Data/StoreConfig.php
+++ b/app/code/Magento/Store/Model/Data/StoreConfig.php
@@ -6,8 +6,8 @@
 namespace Magento\Store\Model\Data;
 
 /**
- * Class StoreConfig
  * Allows to get and set store config values
+ *
  * @codeCoverageIgnore
  */
 class StoreConfig extends \Magento\Framework\Api\AbstractExtensibleObject implements
diff --git a/app/code/Magento/Store/Model/Service/StoreConfigManager.php b/app/code/Magento/Store/Model/Service/StoreConfigManager.php
index 87570d1ff6307..debb08438a3b4 100644
--- a/app/code/Magento/Store/Model/Service/StoreConfigManager.php
+++ b/app/code/Magento/Store/Model/Service/StoreConfigManager.php
@@ -6,7 +6,6 @@
 namespace Magento\Store\Model\Service;
 
 /**
- * Class StoreConfigManager
  * Allows to get store config
  */
 class StoreConfigManager implements \Magento\Store\Api\StoreConfigManagerInterface

From c3e38ac7661bef15976e30197ffacce457d45153 Mon Sep 17 00:00:00 2001
From: Oleksandr Melnyk <sasha19957099@gmail.com>
Date: Wed, 24 Jun 2020 23:22:42 +0300
Subject: [PATCH 0598/1718] magento/magento2#27952: missing store_name in
 GraphQL resolver - small amendments with class name

---
 app/code/Magento/Store/Api/Data/StoreConfigInterface.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Store/Api/Data/StoreConfigInterface.php b/app/code/Magento/Store/Api/Data/StoreConfigInterface.php
index 9fb70d44a6038..8f6011f1ae56f 100644
--- a/app/code/Magento/Store/Api/Data/StoreConfigInterface.php
+++ b/app/code/Magento/Store/Api/Data/StoreConfigInterface.php
@@ -9,6 +9,7 @@
  * Interface for store config
  *
  * @api
+ * @since 100.0.2
  */
 interface StoreConfigInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {

From bf281672e11d38edf057d4765c53b06c6be9b56f Mon Sep 17 00:00:00 2001
From: Anusha Vattam <avattam@adobe.com>
Date: Wed, 24 Jun 2020 18:21:24 -0500
Subject: [PATCH 0599/1718] MC:32658:MyAccount :: Order Details :: Order
 Details by Order Number Taxes and Discounts

- Added changes on taxes and related taxes tests
---
 .../Model/Resolver/OrderTotal.php             | 71 +++++++++++++------
 .../Sales/RetrieveOrdersByOrderNumberTest.php | 12 ++--
 ...dersWithBundleProductByOrderNumberTest.php |  4 +-
 3 files changed, 57 insertions(+), 30 deletions(-)

diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php
index 6251a7dd07c7d..9ab2e8ca326ee 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php
@@ -11,7 +11,6 @@
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Sales\Api\Data\OrderExtensionInterface;
 use Magento\Sales\Api\Data\OrderInterface;
 
 class OrderTotal implements ResolverInterface
@@ -35,9 +34,10 @@ public function resolve(
         $currency = $order->getOrderCurrencyCode();
         $extensionAttributes = $order->getExtensionAttributes();
 
-        $allAppliedTaxesForItemsData =  $this->getAllAppliedTaxesForItems(
-            $extensionAttributes->getItemAppliedTaxes() ?? []
+        $allAppliedTaxOnOrdersData =  $this->getAllAppliedTaxesOnOrders(
+            $extensionAttributes->getAppliedTaxes() ?? []
         );
+
         $appliedShippingTaxesForItemsData = $this->getAppliedShippingTaxesForItems(
             $extensionAttributes->getItemAppliedTaxes() ?? []
         );
@@ -47,7 +47,7 @@ public function resolve(
             'grand_total' => ['value' => $order->getGrandTotal(), 'currency' => $currency],
             'subtotal' => ['value' => $order->getSubtotal(), 'currency' => $currency],
             'total_tax' => ['value' => $order->getTaxAmount(), 'currency' => $currency],
-            'taxes' => $this->getAppliedTaxesDetails($order, $allAppliedTaxesForItemsData),
+            'taxes' => $this->getAppliedTaxesDetails($order, $allAppliedTaxOnOrdersData),
             'discounts' => $this->getDiscountDetails($order),
             'total_shipping' => ['value' => $order->getShippingAmount(), 'currency' => $currency],
             'shipping_handling' => [
@@ -63,35 +63,33 @@ public function resolve(
                     'value' => $order->getShippingAmount(),
                     'currency' => $currency
                 ],
-                'taxes' => $this->getAppliedTaxesDetails($order, $appliedShippingTaxesForItemsData),
+                'taxes' => $this->getAppliedShippingTaxesDetails($order, $appliedShippingTaxesForItemsData),
                 'discounts' => $this->getShippingDiscountDetails($order),
             ]
         ];
     }
 
     /**
-     * Retrieve applied taxes that apply to items
+     * Retrieve applied taxes that apply to the order
      *
-     * @param \Magento\Tax\Api\Data\OrderTaxDetailsItemInterface[] $itemAppliedTaxes
+     * @param \Magento\Tax\Api\Data\OrderTaxDetailsItemInterface[] $appliedTaxes
      * @return array
      */
-    private function getAllAppliedTaxesForItems(array $itemAppliedTaxes): array
+    private function getAllAppliedTaxesOnOrders(array $appliedTaxes): array
     {
-        $allAppliedTaxesForItemsData = [];
-        foreach ($itemAppliedTaxes as $taxItemIndex => $appliedTaxForItem) {
-            foreach ($appliedTaxForItem->getAppliedTaxes() ?? [] as $taxLineItem) {
-                $allAppliedTaxesForItemsData[$taxItemIndex][$taxItemIndex] = [
-                    'title' => $taxLineItem->getDataByKey('title'),
-                    'percent' => $taxLineItem->getDataByKey('percent'),
-                    'amount' => $taxLineItem->getDataByKey('amount'),
-                ];
-            }
+        $allAppliedTaxOnOrdersData = [];
+        foreach ($appliedTaxes as $taxIndex => $appliedTaxesData) {
+            $allAppliedTaxOnOrdersData[$taxIndex][$taxIndex] = [
+                'title' => $appliedTaxesData->getDataByKey('title'),
+                'percent' => $appliedTaxesData->getDataByKey('percent'),
+                'amount' => $appliedTaxesData->getDataByKey('amount'),
+            ];
         }
-        return $allAppliedTaxesForItemsData;
+        return $allAppliedTaxOnOrdersData;
     }
 
     /**
-     * Retrieve applied taxes that apply to shipping
+     * Retrieve applied shipping taxes on items for the orders
      *
      * @param \Magento\Tax\Api\Data\OrderTaxDetailsItemInterface $itemAppliedTaxes
      * @return array
@@ -100,9 +98,10 @@ private function getAppliedShippingTaxesForItems(array $itemAppliedTaxes): array
     {
         $appliedShippingTaxesForItemsData = [];
         foreach ($itemAppliedTaxes as $taxItemIndex => $appliedTaxForItem) {
-            foreach ($appliedTaxForItem->getAppliedTaxes() ?? [] as $taxLineItem) {
-                if ($appliedTaxForItem->getType() === "shipping") {
-                    $appliedShippingTaxesForItemsData[$taxItemIndex][$taxItemIndex] = [
+            if ($appliedTaxForItem->getType() === "shipping") {
+                foreach ($appliedTaxForItem->getAppliedTaxes() ?? [] as $taxLineItem) {
+                    $taxItemIndexTitle = $taxLineItem->getDataByKey('title');
+                    $appliedShippingTaxesForItemsData[$taxItemIndex][$taxItemIndexTitle] = [
                         'title' => $taxLineItem->getDataByKey('title'),
                         'percent' => $taxLineItem->getDataByKey('percent'),
                         'amount' => $taxLineItem->getDataByKey('amount')
@@ -181,4 +180,32 @@ private function getAppliedTaxesDetails(OrderInterface $order, array $appliedTax
         }
         return $taxes;
     }
+
+    /**
+     * Returns taxes applied to the current order
+     *
+     * @param OrderInterface $order
+     * @param array $appliedShippingTaxesForItemsData
+     * @return array
+     */
+    private function getAppliedShippingTaxesDetails(OrderInterface $order, array $appliedShippingTaxesForItemsData): array
+    {
+        $shippingTaxes = [];
+        foreach ($appliedShippingTaxesForItemsData  as $appliedTaxesKeyIndex => $appliedShippingTaxes) {
+            foreach ($appliedShippingTaxes as $key => $appliedShippingTax) {
+                $appliedShippingTaxesArray = [
+                    'title' => $appliedShippingTax['title'] ?? null,
+                    'amount' => [
+                        'value' => $appliedShippingTax['amount'] ?? 0,
+                        'currency' => $order->getOrderCurrencyCode()
+                    ],
+                ];
+                if (!empty($appliedShippingTax)) {
+                    $appliedShippingTaxesArray['rate'] = $appliedShippingTax['percent'] ?? 0;
+                }
+                $shippingTaxes[] = $appliedShippingTaxesArray;
+            }
+        }
+        return $shippingTaxes;
+    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php
index 61834ea71c24f..36f62f0ea400a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php
@@ -168,8 +168,8 @@ public function testCustomerOrdersSimpleProductWithTaxesAndDiscounts()
      */
     private function assertTotalsWithTaxesAndDiscounts(array $customerOrderItemTotal): void
     {
-        $this->assertCount(2, $customerOrderItemTotal['taxes']);
-        $expectedProductAndShippingTaxes = [2.7, 1.35];
+        $this->assertCount(1, $customerOrderItemTotal['taxes']);
+        $expectedProductAndShippingTaxes = [4.05];
         $totalTaxes = [];
         foreach ($customerOrderItemTotal['taxes'] as $totalTaxFromResponse) {
             array_push($totalTaxes, $totalTaxFromResponse['amount']['value']);
@@ -744,8 +744,8 @@ public function testCustomerOrderWithTaxesExcludedOnShipping()
      */
     private function assertTotalsAndShippingWithExcludedTaxSetting($customerOrderItemTotal): void
     {
-        $this->assertCount(2, $customerOrderItemTotal['taxes']);
-        $expectedProductAndShippingTaxes = [1.5, 0.75];
+        $this->assertCount(1, $customerOrderItemTotal['taxes']);
+        $expectedProductAndShippingTaxes = [2.25];
 
         $totalTaxes = [];
         foreach ($customerOrderItemTotal['taxes'] as $totalTaxFromResponse) {
@@ -819,8 +819,8 @@ public function testCustomerOrderWithTaxesIncludedOnShippingAndTotals()
      */
     private function assertTotalsAndShippingWithTaxes(array $customerOrderItemTotal): void
     {
-        $this->assertCount(2, $customerOrderItemTotal['taxes']);
-        $expectedProductAndShippingTaxes = [1.5, 0.75];
+        $this->assertCount(1, $customerOrderItemTotal['taxes']);
+        $expectedProductAndShippingTaxes = [2.25];
         $totalTaxes = [];
         foreach ($customerOrderItemTotal['taxes'] as $totalTaxFromResponse) {
             array_push($totalTaxes, $totalTaxFromResponse['amount']['value']);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithBundleProductByOrderNumberTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithBundleProductByOrderNumberTest.php
index 7db72ce6dfcd3..30a42f5d73d07 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithBundleProductByOrderNumberTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithBundleProductByOrderNumberTest.php
@@ -163,8 +163,8 @@ public function testGetCustomerOrderBundleProductWithTaxesAndDiscounts()
      */
     private function assertTotalsOnBundleProductWithTaxesAndDiscounts(array $customerOrderItemTotal): void
     {
-        $this->assertCount(2, $customerOrderItemTotal['taxes']);
-        $expectedProductAndShippingTaxes = [4.05, 1.35];
+        $this->assertCount(1, $customerOrderItemTotal['taxes']);
+        $expectedProductAndShippingTaxes = [5.4];
         $totalTaxes = [];
         foreach ($customerOrderItemTotal['taxes'] as $totalTaxFromResponse) {
             array_push($totalTaxes, $totalTaxFromResponse['amount']['value']);

From 7e4a72e70103a57e28c798f6b7e0e835d8a266da Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@magento.com>
Date: Wed, 24 Jun 2020 19:24:57 -0500
Subject: [PATCH 0600/1718] MC-31618: Move static config to files - PLUGIN_LIST

- Implement 2 interfaces by one plugin list generator;
---
 app/etc/di.xml                                |  6 +-
 .../TestFramework/Interception/PluginList.php |  8 +-
 .../Framework/Interception/AbstractPlugin.php |  9 ++-
 .../Framework/Interception/ConfigLoader.php   | 43 -----------
 .../Interception/PluginList/PluginList.php    | 24 +++---
 ...nfigWriter.php => PluginListGenerator.php} | 74 ++++++++++++++-----
 .../Test/Unit/PluginList/PluginListTest.php   | 44 +++++------
 .../Task/Operation/PluginListGenerator.php    |  2 +-
 8 files changed, 104 insertions(+), 106 deletions(-)
 delete mode 100644 lib/internal/Magento/Framework/Interception/ConfigLoader.php
 rename lib/internal/Magento/Framework/Interception/{ConfigWriter.php => PluginListGenerator.php} (85%)

diff --git a/app/etc/di.xml b/app/etc/di.xml
index 7792f43592f5b..31cc5caf3ba67 100644
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -209,8 +209,8 @@
     <preference for="Magento\Framework\MessageQueue\QueueFactoryInterface" type="Magento\Framework\MessageQueue\QueueFactory" />
     <preference for="Magento\Framework\Search\Request\IndexScopeResolverInterface" type="Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver"/>
     <preference for="Magento\Framework\HTTP\ClientInterface" type="Magento\Framework\HTTP\Client\Curl" />
-    <preference for="Magento\Framework\Interception\ConfigLoaderInterface" type="Magento\Framework\Interception\ConfigLoader" />
-    <preference for="Magento\Framework\Interception\ConfigWriterInterface" type="Magento\Framework\Interception\ConfigWriter" />
+    <preference for="Magento\Framework\Interception\ConfigLoaderInterface" type="Magento\Framework\Interception\PluginListGenerator" />
+    <preference for="Magento\Framework\Interception\ConfigWriterInterface" type="Magento\Framework\Interception\PluginListGenerator" />
     <type name="Magento\Framework\Model\ResourceModel\Db\TransactionManager" shared="false" />
     <type name="Magento\Framework\Acl\Data\Cache">
         <arguments>
@@ -433,7 +433,7 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\Interception\ConfigWriter">
+    <type name="Magento\Framework\Interception\PluginListGenerator">
         <arguments>
             <argument name="reader" xsi:type="object">Magento\Framework\ObjectManager\Config\Reader\Dom\Proxy</argument>
             <argument name="logger" xsi:type="object">\Psr\Log\LoggerInterface\Proxy</argument>
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Interception/PluginList.php b/dev/tests/integration/framework/Magento/TestFramework/Interception/PluginList.php
index 5bad5acf51b37..0b5fc407d438b 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Interception/PluginList.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Interception/PluginList.php
@@ -6,7 +6,7 @@
 namespace Magento\TestFramework\Interception;
 
 use Magento\Framework\Interception\ConfigLoaderInterface;
-use Magento\Framework\Interception\ConfigWriterInterface;
+use Magento\Framework\Interception\PluginListGenerator;
 use Magento\Framework\Serialize\SerializerInterface;
 
 /**
@@ -34,7 +34,7 @@ class PluginList extends \Magento\Framework\Interception\PluginList\PluginList
      * @param string|null $cacheId
      * @param SerializerInterface|null $serializer
      * @param ConfigLoaderInterface|null $configLoader
-     * @param ConfigWriterInterface|null $configWriter
+     * @param PluginListGenerator|null $pluginListGenerator
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -50,7 +50,7 @@ public function __construct(
         $cacheId = 'plugins',
         SerializerInterface $serializer = null,
         ConfigLoaderInterface $configLoader = null,
-        ConfigWriterInterface $configWriter = null
+        PluginListGenerator $pluginListGenerator = null
     ) {
         parent::__construct(
             $reader,
@@ -65,7 +65,7 @@ public function __construct(
             $cacheId,
             $serializer,
             $configLoader,
-            $configWriter
+            $pluginListGenerator
         );
         $this->_originScopeScheme = $this->_scopePriorityScheme;
     }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/AbstractPlugin.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/AbstractPlugin.php
index d9c0e0e17da3a..b9deeb3bb968f 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Interception/AbstractPlugin.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/AbstractPlugin.php
@@ -83,10 +83,10 @@ public function setUpInterceptionConfig($pluginConfig)
         $cacheManager->method('load')->willReturn(null);
         $definitions = new \Magento\Framework\ObjectManager\Definition\Runtime();
         $relations = new \Magento\Framework\ObjectManager\Relations\Runtime();
-        $dirList = new DirectoryList(DirectoryList::GENERATED_METADATA);
-        $configLoader = new \Magento\Framework\Interception\ConfigLoader($dirList);
+        $configLoader = $this->createMock(ConfigLoaderInterface::class);
         $logger = $this->createMock(\Psr\Log\LoggerInterface::class);
-        $configWriter = $this->createMock(\Magento\Framework\App\ObjectManager\ConfigWriterInterface::class);
+        $directoryList = $this->createMock(DirectoryList::class);
+        $configWriter = $this->createMock(PluginListGenerator::class);
         $interceptionConfig = new Config\Config(
             $this->_configReader,
             $configScope,
@@ -112,6 +112,7 @@ public function setUpInterceptionConfig($pluginConfig)
             \Magento\Framework\Serialize\SerializerInterface::class              => $json,
             \Magento\Framework\Interception\ConfigLoaderInterface::class         => $configLoader,
             \Psr\Log\LoggerInterface::class                                      => $logger,
+            \Magento\Framework\App\Filesystem\DirectoryList::class               => $directoryList,
             \Magento\Framework\App\ObjectManager\ConfigWriterInterface::class    => $configWriter
         ];
         $this->_objectManager = new \Magento\Framework\ObjectManager\ObjectManager(
@@ -128,7 +129,7 @@ public function setUpInterceptionConfig($pluginConfig)
                     \Magento\Framework\Interception\PluginListInterface::class =>
                         \Magento\Framework\Interception\PluginList\PluginList::class,
                     \Magento\Framework\Interception\ConfigWriterInterface::class =>
-                        \Magento\Framework\Interception\ConfigWriter::class
+                        \Magento\Framework\Interception\PluginListGenerator::class
                 ],
             ]
         );
diff --git a/lib/internal/Magento/Framework/Interception/ConfigLoader.php b/lib/internal/Magento/Framework/Interception/ConfigLoader.php
deleted file mode 100644
index c83c5d8c2bcbd..0000000000000
--- a/lib/internal/Magento/Framework/Interception/ConfigLoader.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Framework\Interception;
-
-use Magento\Framework\App\Filesystem\DirectoryList;
-
-/**
- * Interception config loader per scope
- */
-class ConfigLoader implements ConfigLoaderInterface
-{
-    /** @var DirectoryList */
-    private $directoryList;
-
-    /**
-     * @param DirectoryList $directoryList
-     */
-    public function __construct(
-        DirectoryList $directoryList
-    ) {
-        $this->directoryList = $directoryList;
-    }
-
-    /**
-     * Load interception configuration data per scope.
-     *
-     * @param string $cacheId
-     * @return array
-     * @throws \Magento\Framework\Exception\FileSystemException
-     */
-    public function load($cacheId)
-    {
-        $file = $this->directoryList->getPath(DirectoryList::GENERATED_METADATA) . '/' . $cacheId . '.' . 'php';
-        if (file_exists($file)) {
-            return include $file;
-        }
-
-        return [];
-    }
-}
diff --git a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
index 9acc8c547ae7f..26697e70a8f87 100644
--- a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
+++ b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
@@ -10,8 +10,8 @@
 use Magento\Framework\Config\ReaderInterface;
 use Magento\Framework\Config\ScopeInterface;
 use Magento\Framework\Interception\ConfigLoaderInterface;
-use Magento\Framework\Interception\ConfigWriterInterface;
 use Magento\Framework\Interception\DefinitionInterface;
+use Magento\Framework\Interception\PluginListGenerator;
 use Magento\Framework\Interception\PluginListInterface as InterceptionPluginList;
 use Magento\Framework\Interception\ObjectManager\ConfigInterface;
 use Magento\Framework\ObjectManager\RelationsInterface;
@@ -88,9 +88,9 @@ class PluginList extends Scoped implements InterceptionPluginList
     private $configLoader;
 
     /**
-     * @var ConfigWriterInterface
+     * @var PluginListGenerator
      */
-    private $configWriter;
+    private $pluginListGenerator;
 
     /**
      * Constructor
@@ -107,7 +107,7 @@ class PluginList extends Scoped implements InterceptionPluginList
      * @param string|null $cacheId
      * @param SerializerInterface|null $serializer
      * @param ConfigLoaderInterface|null $configLoader
-     * @param ConfigWriterInterface|null $configWriter
+     * @param PluginListGenerator|null $pluginListGenerator
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -123,7 +123,7 @@ public function __construct(
         $cacheId = 'plugins',
         SerializerInterface $serializer = null,
         ConfigLoaderInterface $configLoader = null,
-        ConfigWriterInterface $configWriter = null
+        PluginListGenerator $pluginListGenerator = null
     ) {
         $this->serializer = $serializer ?: $objectManager->get(Serialize::class);
         parent::__construct($reader, $configScope, $cache, $cacheId, $this->serializer);
@@ -134,7 +134,7 @@ public function __construct(
         $this->_scopePriorityScheme = $scopePriorityScheme;
         $this->_objectManager = $objectManager;
         $this->configLoader = $configLoader ?: $this->_objectManager->get(ConfigLoaderInterface::class);
-        $this->configWriter = $configWriter ?: $this->_objectManager->get(ConfigWriterInterface::class);
+        $this->pluginListGenerator = $pluginListGenerator ?: $this->_objectManager->get(PluginListGenerator::class);
     }
 
     /**
@@ -145,7 +145,7 @@ public function __construct(
      */
     protected function _inheritPlugins($type)
     {
-        return $this->configWriter->inheritPlugins($type, $this->_data, $this->_inherited, $this->_processed);
+        return $this->pluginListGenerator->inheritPlugins($type, $this->_data, $this->_inherited, $this->_processed);
     }
 
     /**
@@ -157,7 +157,7 @@ protected function _inheritPlugins($type)
      */
     protected function _sort($itemA, $itemB)
     {
-        return $this->configWriter->sort($itemA, $itemB);
+        return ($itemA['sortOrder'] ?? PHP_INT_MIN) - ($itemB['sortOrder'] ?? PHP_INT_MIN);
     }
 
     /**
@@ -238,7 +238,7 @@ protected function _loadScopedData()
                         $this->_data,
                         $this->_inherited,
                         $this->_processed
-                    ] = $this->configWriter->loadScopedVirtualTypes(
+                    ] = $this->pluginListGenerator->loadScopedVirtualTypes(
                         $this->_scopePriorityScheme,
                         $this->_loadedScopes,
                         $this->_data,
@@ -269,7 +269,7 @@ protected function _loadScopedData()
      */
     protected function isCurrentScope($scopeCode)
     {
-        return $this->configWriter->isCurrentScope($scopeCode);
+        return $this->_configScope->getCurrentScope() === $scopeCode;
     }
 
     /**
@@ -279,7 +279,7 @@ protected function isCurrentScope($scopeCode)
      */
     protected function getClassDefinitions()
     {
-        return $this->configWriter->getClassDefinitions();
+        return $this->_classDefinitions->getClasses();
     }
 
     /**
@@ -290,6 +290,6 @@ protected function getClassDefinitions()
      */
     public function merge(array $config)
     {
-        $this->_data = $this->configWriter->merge($config, $this->_data);
+        $this->_data = $this->pluginListGenerator->merge($config, $this->_data);
     }
 }
diff --git a/lib/internal/Magento/Framework/Interception/ConfigWriter.php b/lib/internal/Magento/Framework/Interception/PluginListGenerator.php
similarity index 85%
rename from lib/internal/Magento/Framework/Interception/ConfigWriter.php
rename to lib/internal/Magento/Framework/Interception/PluginListGenerator.php
index ed93c543f8d31..4f794fd5b39c9 100644
--- a/lib/internal/Magento/Framework/Interception/ConfigWriter.php
+++ b/lib/internal/Magento/Framework/Interception/PluginListGenerator.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Interception;
 
-use Magento\Framework\App\ObjectManager\ConfigWriterInterface as ObjectManagerConfigWriterInterface;
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Config\ReaderInterface;
 use Magento\Framework\Config\ScopeInterface;
 use Magento\Framework\Interception\ObjectManager\ConfigInterface;
@@ -14,9 +14,9 @@
 use Psr\Log\LoggerInterface;
 
 /**
- * Interception configuration writer for scopes.
+ * Plugin list configuration writer and loader for scopes.
  */
-class ConfigWriter implements ConfigWriterInterface
+class PluginListGenerator implements ConfigWriterInterface, ConfigLoaderInterface
 {
     /**
      * @var ScopeInterface
@@ -78,9 +78,9 @@ class ConfigWriter implements ConfigWriterInterface
     private $logger;
 
     /**
-     * @var ObjectManagerConfigWriterInterface
+     * @var DirectoryList
      */
-    private $configWriter;
+    private $directoryList;
 
     /**
      * @var array
@@ -117,7 +117,7 @@ class ConfigWriter implements ConfigWriterInterface
      * @param DefinitionInterface $definitions
      * @param ClassDefinitions $classDefinitions
      * @param LoggerInterface $logger
-     * @param ObjectManagerConfigWriterInterface $configWriter
+     * @param DirectoryList $directoryList
      * @param array $scopePriorityScheme
      */
     public function __construct(
@@ -128,7 +128,7 @@ public function __construct(
         DefinitionInterface $definitions,
         ClassDefinitions $classDefinitions,
         LoggerInterface $logger,
-        ObjectManagerConfigWriterInterface $configWriter,
+        DirectoryList $directoryList,
         array $scopePriorityScheme = ['global']
     ) {
         $this->reader = $reader;
@@ -138,7 +138,7 @@ public function __construct(
         $this->definitions = $definitions;
         $this->classDefinitions = $classDefinitions;
         $this->logger = $logger;
-        $this->configWriter = $configWriter;
+        $this->directoryList = $directoryList;
         $this->scopePriorityScheme = $scopePriorityScheme;
     }
 
@@ -180,7 +180,7 @@ public function write($scopes)
                 foreach ($this->getClassDefinitions() as $class) {
                     $this->inheritPlugins($class, $this->pluginData, $this->inherited, $this->processed);
                 }
-                $this->configWriter->write(
+                $this->writeConfig(
                     $cacheId,
                     [$this->pluginData, $this->inherited, $this->processed]
                 );
@@ -197,6 +197,23 @@ public function write($scopes)
         }
     }
 
+    /**
+     * Load interception configuration data per scope.
+     *
+     * @param string $cacheId
+     * @return array
+     * @throws \Magento\Framework\Exception\FileSystemException
+     */
+    public function load($cacheId)
+    {
+        $file = $this->directoryList->getPath(DirectoryList::GENERATED_METADATA) . '/' . $cacheId . '.' . 'php';
+        if (file_exists($file)) {
+            return include $file;
+        }
+
+        return [];
+    }
+
     /**
      * Load virtual types for current scope
      *
@@ -238,7 +255,7 @@ public function loadScopedVirtualTypes($scopePriorityScheme, $loadedScopes, $plu
      *
      * @return array
      */
-    public function getClassDefinitions()
+    private function getClassDefinitions()
     {
         return $this->classDefinitions->getClasses();
     }
@@ -249,7 +266,7 @@ public function getClassDefinitions()
      * @param string $scopeCode
      * @return bool
      */
-    public function isCurrentScope($scopeCode)
+    private function isCurrentScope($scopeCode)
     {
         return $this->scopeConfig->getCurrentScope() === $scopeCode;
     }
@@ -297,7 +314,9 @@ public function inheritPlugins($type, &$pluginData, &$inherited, &$processed)
             $inherited[$type] = null;
             if (is_array($plugins) && count($plugins)) {
                 $this->filterPlugins($plugins);
-                uasort($plugins, [$this, 'sort']);
+                uasort($plugins, function ($itemA, $itemB) {
+                    return ($itemA['sortOrder'] ?? PHP_INT_MIN) - ($itemB['sortOrder'] ?? PHP_INT_MIN);
+                });
                 $this->trimInstanceStartingBackslash($plugins);
                 $inherited[$type] = $plugins;
                 $lastPerMethod = [];
@@ -385,14 +404,33 @@ public function merge(array $config, $pluginData)
     }
 
     /**
-     * Sort items
+     * Writes config in storage
      *
-     * @param array $itemA
-     * @param array $itemB
-     * @return int
+     * @param string $key
+     * @param array $config
+     * @return void
+     * @throws \Magento\Framework\Exception\FileSystemException
      */
-    public function sort($itemA, $itemB)
+    private function writeConfig(string $key, array $config)
     {
-        return ($itemA['sortOrder'] ?? PHP_INT_MIN) - ($itemB['sortOrder'] ?? PHP_INT_MIN);
+        $this->initialize();
+        $configuration = sprintf('<?php return %s;', var_export($config, true));
+        file_put_contents(
+            $this->directoryList->getPath(DirectoryList::GENERATED_METADATA) . '/' . $key  . '.php',
+            $configuration
+        );
+    }
+
+    /**
+     * Initializes writer
+     *
+     * @return void
+     * @throws \Magento\Framework\Exception\FileSystemException
+     */
+    private function initialize()
+    {
+        if (!file_exists($this->directoryList->getPath(DirectoryList::GENERATED_METADATA))) {
+            mkdir($this->directoryList->getPath(DirectoryList::GENERATED_METADATA));
+        }
     }
 }
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/PluginList/PluginListTest.php b/lib/internal/Magento/Framework/Interception/Test/Unit/PluginList/PluginListTest.php
index e036e51c39fb4..f2fe5510d9b1c 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/PluginList/PluginListTest.php
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/PluginList/PluginListTest.php
@@ -10,9 +10,9 @@
 use Magento\Framework\Config\CacheInterface;
 use Magento\Framework\Config\ScopeInterface;
 use Magento\Framework\Interception\ConfigLoaderInterface;
-use Magento\Framework\Interception\ConfigWriterInterface;
 use Magento\Framework\Interception\ObjectManager\ConfigInterface;
 use Magento\Framework\Interception\PluginList\PluginList;
+use Magento\Framework\Interception\PluginListGenerator;
 use Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item;
 use Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemContainer;
 use Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemContainerPlugin\Simple as ItemContainerPlugin;
@@ -94,15 +94,17 @@ protected function setUp(): void
         $this->configLoaderMock = $this->getMockBuilder(ConfigLoaderInterface::class)
             ->onlyMethods(['load'])
             ->getMockForAbstractClass();
-        $configWriterMock = $this->getMockBuilder(ConfigWriterInterface::class)
-            ->addMethods(['loadScopedVirtualTypes', 'getClassDefinitions', 'inheritPlugins'])
-            ->getMockForAbstractClass();
-        $configWriterMock->method('loadScopedVirtualTypes')
+        $pluginListGeneratorMock = $this->getMockBuilder(PluginListGenerator::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['loadScopedVirtualTypes', 'inheritPlugins'])
+            ->getMock();
+        $pluginListGeneratorMock->method('loadScopedVirtualTypes')
             ->willReturnMap($loadScoped);
-        $configWriterMock->method('getClassDefinitions')
-            ->willReturn([]);
 
-        $definitions = new Runtime();
+        $definitions = $this->getMockBuilder(Runtime::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $definitions->method('getClasses')->willReturn([]);
 
         // tested class is a mock to be able to set its protected properties values in closure
         $this->object = $this->getMockBuilder(PluginList::class)
@@ -122,7 +124,7 @@ protected function setUp(): void
                     'cacheId' => 'interception',
                     'serializer' => $this->serializerMock,
                     'configLoader' => $this->configLoaderMock,
-                    'configWriter' => $configWriterMock
+                    'pluginListGenerator' => $pluginListGeneratorMock
                 ]
             )
             ->getMock();
@@ -175,16 +177,16 @@ public function testGetPlugin()
             ];
 
             if ($type === 'Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item') {
-                $this->_inherited = $inheritedItem;
-                $this->_processed = $processedItem;
+                $this->_inherited = $inheritedItem; /** @phpstan-ignore-line */
+                $this->_processed = $processedItem; /** @phpstan-ignore-line */
             }
             if ($type === 'Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemContainer') {
-                $this->_inherited = array_merge($inheritedItem, $inheritedItemContainer);
-                $this->_processed = array_merge($processedItem, $processedItemContainer);
+                $this->_inherited = array_merge($inheritedItem, $inheritedItemContainer); /** @phpstan-ignore-line */
+                $this->_processed = array_merge($processedItem, $processedItemContainer); /** @phpstan-ignore-line */
             }
             if ($type === 'Magento\Framework\Interception\Test\Unit\Custom\Module\Model\StartingBackslash') {
-                $this->_inherited = array_merge($inheritedItem, $inheritedItemContainer, $inheritedStartingBackslash);
-                $this->_processed = array_merge($processedItem, $processedItemContainer);
+                $this->_inherited = array_merge($inheritedItem, $inheritedItemContainer, $inheritedStartingBackslash); /** @phpstan-ignore-line */
+                $this->_processed = array_merge($processedItem, $processedItemContainer); /** @phpstan-ignore-line */
             }
         };
         $inheritPlugins = $inheritPlugins->bindTo($this->object, PluginList::class);
@@ -262,8 +264,8 @@ public function testGetPlugins(
             ];
 
             if ($type === 'Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item') {
-                $this->_inherited = $inheritedItem;
-                $this->_processed = $processedItem;
+                $this->_inherited = $inheritedItem; /** @phpstan-ignore-line */
+                $this->_processed = $processedItem; /** @phpstan-ignore-line */
             }
         };
         $inheritPlugins = $inheritPlugins->bindTo($this->object, PluginList::class);
@@ -319,8 +321,8 @@ public function testLoadScopedDataCached()
             ];
 
             if ($type === 'Type') {
-                $this->_inherited = $inherited;
-                $this->_processed = $processed;
+                $this->_inherited = $inherited; /** @phpstan-ignore-line */
+                $this->_processed = $processed; /** @phpstan-ignore-line */
             }
         };
         $inheritPlugins = $inheritPlugins->bindTo($this->object, PluginList::class);
@@ -356,8 +358,8 @@ public function testLoadScopedDataGenerated()
             ];
 
             if ($type === 'Type') {
-                $this->_inherited = $inherited;
-                $this->_processed = $processed;
+                $this->_inherited = $inherited; /** @phpstan-ignore-line */
+                $this->_processed = $processed; /** @phpstan-ignore-line */
             }
         };
         $inheritPlugins = $inheritPlugins->bindTo($this->object, PluginList::class);
diff --git a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/PluginListGenerator.php b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/PluginListGenerator.php
index d0605cfbafcae..2db990505e861 100644
--- a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/PluginListGenerator.php
+++ b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/PluginListGenerator.php
@@ -10,7 +10,7 @@
 use Magento\Framework\Interception\ConfigWriterInterface;
 
 /**
- * Writes plugins configuration data per scope to generated metadata files.
+ * Writes plugin list configuration data per scope to generated metadata.
  */
 class PluginListGenerator implements OperationInterface
 {

From 0658f817b3d423048e410068602cfdce77f00d41 Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@magento.com>
Date: Thu, 25 Jun 2020 00:39:47 -0500
Subject: [PATCH 0601/1718] MC-31618: Move static config to files - PLUGIN_LIST

- Fix static test;
---
 .../Interception/Test/Unit/PluginList/PluginListTest.php       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/PluginList/PluginListTest.php b/lib/internal/Magento/Framework/Interception/Test/Unit/PluginList/PluginListTest.php
index f2fe5510d9b1c..b0cb500eeed66 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/PluginList/PluginListTest.php
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/PluginList/PluginListTest.php
@@ -185,7 +185,8 @@ public function testGetPlugin()
                 $this->_processed = array_merge($processedItem, $processedItemContainer); /** @phpstan-ignore-line */
             }
             if ($type === 'Magento\Framework\Interception\Test\Unit\Custom\Module\Model\StartingBackslash') {
-                $this->_inherited = array_merge($inheritedItem, $inheritedItemContainer, $inheritedStartingBackslash); /** @phpstan-ignore-line */
+                /** @phpstan-ignore-next-line */
+                $this->_inherited = array_merge($inheritedItem, $inheritedItemContainer, $inheritedStartingBackslash);
                 $this->_processed = array_merge($processedItem, $processedItemContainer); /** @phpstan-ignore-line */
             }
         };

From 3b33889c69b24a71f7d118c3c139902a34b9cb5b Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Wed, 24 Jun 2020 14:45:37 +0300
Subject: [PATCH 0602/1718] cleanup code

---
 .../Model/Rule/Action/Discount/BuyXGetY.php   | 16 ++++++++++-----
 .../Magento/SalesRule/Model/Validator.php     | 20 +++++++++----------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/BuyXGetY.php b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/BuyXGetY.php
index 114d2e6784b72..eaa2433e63ed0 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/BuyXGetY.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/BuyXGetY.php
@@ -3,19 +3,25 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\SalesRule\Model\Rule\Action\Discount;
 
+use Magento\Quote\Model\Quote\Item\AbstractItem;
+use Magento\SalesRule\Model\Rule;
+
 class BuyXGetY extends AbstractDiscount
 {
     /**
-     * @param \Magento\SalesRule\Model\Rule $rule
-     * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
+     * Calculate discount data for BuyXGetY action.
+     *
+     * @param Rule $rule
+     * @param AbstractItem $item
      * @param float $qty
-     * @return \Magento\SalesRule\Model\Rule\Action\Discount\Data
+     * @return Data
      */
-    public function calculate($rule, $item, $qty)
+    public function calculate($rule, $item, $qty): Data
     {
-        /** @var \Magento\SalesRule\Model\Rule\Action\Discount\Data $discountData */
         $discountData = $this->discountFactory->create();
 
         $itemPrice = $this->validator->getItemPrice($item);
diff --git a/app/code/Magento/SalesRule/Model/Validator.php b/app/code/Magento/SalesRule/Model/Validator.php
index fd292c00ad81a..2d027e3521191 100644
--- a/app/code/Magento/SalesRule/Model/Validator.php
+++ b/app/code/Magento/SalesRule/Model/Validator.php
@@ -387,8 +387,8 @@ public function processShippingAmount(Address $address)
                     $address->setCartFixedRules($cartRules);
                     break;
                 case Rule::BUY_X_GET_Y_ACTION:
-                    $qty = $this->getDiscountQtyAllItemsBuyXGetYAction($quote, $rule);
-                    $quoteAmount = $address->getBaseShippingAmount() / $quote->getItemsQty() * $qty;
+                    $allQtyDiscount = $this->getDiscountQtyAllItemsBuyXGetYAction($quote, $rule);
+                    $quoteAmount = $address->getBaseShippingAmount() / $quote->getItemsQty() * $allQtyDiscount;
                     $discountAmount = $this->priceCurrency->convert($quoteAmount, $quote->getStore());
                     $baseDiscountAmount = $quoteAmount;
                     break;
@@ -495,25 +495,25 @@ private function isValidItemForRule(AbstractItem $item, Rule $rule)
      * @param Rule $rule
      * @return float
      */
-    private function getDiscountQtyAllItemsBuyXGetYAction($quote, $rule)
+    private function getDiscountQtyAllItemsBuyXGetYAction(Quote $quote, Rule $rule): float
     {
         $discountAllQty = 0;
         foreach ($quote->getItems() as $item) {
             $qty = $item->getQty();
 
-            $x = $rule->getDiscountStep();
-            $y = $rule->getDiscountAmount();
-            if (!$x || $y > $x) {
+            $discountStep = $rule->getDiscountStep();
+            $discountAmount = $rule->getDiscountAmount();
+            if (!$discountStep || $discountAmount > $discountStep) {
                 continue;
             }
-            $buyAndDiscountQty = $x + $y;
+            $buyAndDiscountQty = $discountStep + $discountAmount;
 
             $fullRuleQtyPeriod = floor($qty / $buyAndDiscountQty);
             $freeQty = $qty - $fullRuleQtyPeriod * $buyAndDiscountQty;
 
-            $discountQty = $fullRuleQtyPeriod * $y;
-            if ($freeQty > $x) {
-                $discountQty += $freeQty - $x;
+            $discountQty = $fullRuleQtyPeriod * $discountAmount;
+            if ($freeQty > $discountStep) {
+                $discountQty += $freeQty - $discountStep;
             }
 
             $discountAllQty += $discountQty;

From f569729002c4b5602e30c6e8c13655829a3116fd Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Thu, 25 Jun 2020 10:37:13 +0300
Subject: [PATCH 0603/1718] MC-35256: Elasticsearch Filters Product Prices
 Differently than MySQL

---
 .../FieldProvider/FieldType/Converter.php     |  4 +-
 .../Model/Client/Elasticsearch.php            |  2 +-
 .../FieldProvider/FieldType/Converter.php     |  4 +-
 .../Setup/Patch/Data/InvalidateIndex.php      | 66 +++++++++++++++++++
 .../Model/Client/ElasticsearchTest.php        |  4 +-
 .../FieldProvider/DynamicFieldTest.php        |  8 +--
 .../FieldProvider/FieldType/ConverterTest.php |  2 +-
 .../Model/Client/Elasticsearch.php            |  2 +-
 .../Unit/Model/Client/ElasticsearchTest.php   |  4 +-
 .../Model/Client/Elasticsearch.php            |  2 +-
 .../Unit/Model/Client/ElasticsearchTest.php   |  4 +-
 11 files changed, 84 insertions(+), 18 deletions(-)
 create mode 100644 app/code/Magento/Elasticsearch/Setup/Patch/Data/InvalidateIndex.php

diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Converter.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Converter.php
index 1f6e05c9e02fc..8576d8df0cc95 100644
--- a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Converter.php
+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Converter.php
@@ -19,7 +19,7 @@ class Converter implements ConverterInterface
      */
     private const ES_DATA_TYPE_TEXT = 'text';
     private const ES_DATA_TYPE_KEYWORD = 'keyword';
-    private const ES_DATA_TYPE_FLOAT = 'float';
+    private const ES_DATA_TYPE_DOUBLE = 'double';
     private const ES_DATA_TYPE_INT = 'integer';
     private const ES_DATA_TYPE_DATE = 'date';
     /**#@-*/
@@ -32,7 +32,7 @@ class Converter implements ConverterInterface
     private $mapping = [
         self::INTERNAL_DATA_TYPE_STRING => self::ES_DATA_TYPE_TEXT,
         self::INTERNAL_DATA_TYPE_KEYWORD => self::ES_DATA_TYPE_KEYWORD,
-        self::INTERNAL_DATA_TYPE_FLOAT => self::ES_DATA_TYPE_FLOAT,
+        self::INTERNAL_DATA_TYPE_FLOAT => self::ES_DATA_TYPE_DOUBLE,
         self::INTERNAL_DATA_TYPE_INT => self::ES_DATA_TYPE_INT,
         self::INTERNAL_DATA_TYPE_DATE => self::ES_DATA_TYPE_DATE,
     ];
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php
index bd9a380230652..8d8787a5eff72 100644
--- a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php
+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php
@@ -276,7 +276,7 @@ public function addFieldsMapping(array $fields, $index, $entityType)
                                 'match' => 'price_*',
                                 'match_mapping_type' => 'string',
                                 'mapping' => [
-                                    'type' => 'float',
+                                    'type' => 'double',
                                     'store' => true,
                                 ],
                             ],
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Converter.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Converter.php
index 88dab83698794..2067dcdc7fe9f 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Converter.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/Converter.php
@@ -16,7 +16,7 @@ class Converter implements ConverterInterface
      * Text flags for Elasticsearch field types
      */
     private const ES_DATA_TYPE_STRING = 'string';
-    private const ES_DATA_TYPE_FLOAT = 'float';
+    private const ES_DATA_TYPE_DOUBLE = 'double';
     private const ES_DATA_TYPE_INT = 'integer';
     private const ES_DATA_TYPE_DATE = 'date';
     /**#@-*/
@@ -29,7 +29,7 @@ class Converter implements ConverterInterface
     private $mapping = [
         self::INTERNAL_DATA_TYPE_STRING => self::ES_DATA_TYPE_STRING,
         self::INTERNAL_DATA_TYPE_KEYWORD => self::ES_DATA_TYPE_STRING,
-        self::INTERNAL_DATA_TYPE_FLOAT => self::ES_DATA_TYPE_FLOAT,
+        self::INTERNAL_DATA_TYPE_FLOAT => self::ES_DATA_TYPE_DOUBLE,
         self::INTERNAL_DATA_TYPE_INT => self::ES_DATA_TYPE_INT,
         self::INTERNAL_DATA_TYPE_DATE => self::ES_DATA_TYPE_DATE,
     ];
diff --git a/app/code/Magento/Elasticsearch/Setup/Patch/Data/InvalidateIndex.php b/app/code/Magento/Elasticsearch/Setup/Patch/Data/InvalidateIndex.php
new file mode 100644
index 0000000000000..7cd72c322d647
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Setup/Patch/Data/InvalidateIndex.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Setup\Patch\Data;
+
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\CatalogSearch\Model\Indexer\Fulltext as FulltextIndexer;
+use Magento\Framework\Setup\Patch\PatchInterface;
+
+/**
+ * Invalidate fulltext index
+ */
+class InvalidateIndex implements DataPatchInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var IndexerRegistry
+     */
+    private $indexerRegistry;
+
+    /**
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param IndexerRegistry $indexerRegistry
+     */
+    public function __construct(ModuleDataSetupInterface $moduleDataSetup, IndexerRegistry $indexerRegistry)
+    {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->indexerRegistry = $indexerRegistry;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function apply(): PatchInterface
+    {
+        $this->indexerRegistry->get(FulltextIndexer::INDEXER_ID)->invalidate();
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public static function getDependencies(): array
+    {
+        return [];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getAliases(): array
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php
index 49a894f1295c7..575a64dc43abd 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php
@@ -329,7 +329,7 @@ public function testAddFieldsMapping()
                                         'match' => 'price_*',
                                         'match_mapping_type' => 'string',
                                         'mapping' => [
-                                            'type' => 'float',
+                                            'type' => 'double',
                                             'store' => true,
                                         ],
                                     ],
@@ -400,7 +400,7 @@ public function testAddFieldsMappingFailure()
                                         'match' => 'price_*',
                                         'match_mapping_type' => 'string',
                                         'mapping' => [
-                                            'type' => 'float',
+                                            'type' => 'double',
                                             'store' => true,
                                         ],
                                     ],
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicFieldTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicFieldTest.php
index 87f072836544e..a9bcd1a20a1b2 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicFieldTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/DynamicFieldTest.php
@@ -246,7 +246,7 @@ function ($type) use ($complexType) {
                     if ($type === 'string') {
                         return 'string';
                     } elseif ($type === 'float') {
-                        return 'float';
+                        return 'double';
                     } elseif ($type === 'integer') {
                         return 'integer';
                     } else {
@@ -281,7 +281,7 @@ public function attributeProvider()
                         'index' => 'no_index'
                     ],
                     'price_1_1' => [
-                        'type' => 'float',
+                        'type' => 'double',
                         'store' => true
                     ]
                 ]
@@ -300,7 +300,7 @@ public function attributeProvider()
                         'index' => 'no_index'
                     ],
                     'price_1_1' => [
-                        'type' => 'float',
+                        'type' => 'double',
                         'store' => true
                     ]
                 ],
@@ -319,7 +319,7 @@ public function attributeProvider()
                         'index' => 'no_index'
                     ],
                     'price_1_1' => [
-                        'type' => 'float',
+                        'type' => 'double',
                         'store' => true
                     ]
                 ]
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/ConverterTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/ConverterTest.php
index 75b79bc43e805..718adf255254f 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/ConverterTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/ConverterTest.php
@@ -56,7 +56,7 @@ public function convertProvider()
     {
         return [
             ['string', 'string'],
-            ['float', 'float'],
+            ['float', 'double'],
             ['integer', 'integer'],
         ];
     }
diff --git a/app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php b/app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php
index 2c1c283c5b24d..0571b075aff28 100644
--- a/app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php
+++ b/app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php
@@ -281,7 +281,7 @@ public function addFieldsMapping(array $fields, $index, $entityType)
                                 'match' => 'price_*',
                                 'match_mapping_type' => 'string',
                                 'mapping' => [
-                                    'type' => 'float',
+                                    'type' => 'double',
                                     'store' => true,
                                 ],
                             ],
diff --git a/app/code/Magento/Elasticsearch6/Test/Unit/Model/Client/ElasticsearchTest.php b/app/code/Magento/Elasticsearch6/Test/Unit/Model/Client/ElasticsearchTest.php
index aa0b49400c517..2a7fa2ce8114a 100644
--- a/app/code/Magento/Elasticsearch6/Test/Unit/Model/Client/ElasticsearchTest.php
+++ b/app/code/Magento/Elasticsearch6/Test/Unit/Model/Client/ElasticsearchTest.php
@@ -439,7 +439,7 @@ public function testAddFieldsMapping()
                                         'match' => 'price_*',
                                         'match_mapping_type' => 'string',
                                         'mapping' => [
-                                            'type' => 'float',
+                                            'type' => 'double',
                                             'store' => true,
                                         ],
                                     ],
@@ -509,7 +509,7 @@ public function testAddFieldsMappingFailure()
                                         'match' => 'price_*',
                                         'match_mapping_type' => 'string',
                                         'mapping' => [
-                                            'type' => 'float',
+                                            'type' => 'double',
                                             'store' => true,
                                         ],
                                     ],
diff --git a/app/code/Magento/Elasticsearch7/Model/Client/Elasticsearch.php b/app/code/Magento/Elasticsearch7/Model/Client/Elasticsearch.php
index feacca8d62804..4b318f987abfe 100644
--- a/app/code/Magento/Elasticsearch7/Model/Client/Elasticsearch.php
+++ b/app/code/Magento/Elasticsearch7/Model/Client/Elasticsearch.php
@@ -289,7 +289,7 @@ public function addFieldsMapping(array $fields, string $index, string $entityTyp
                                 'match' => 'price_*',
                                 'match_mapping_type' => 'string',
                                 'mapping' => [
-                                    'type' => 'float',
+                                    'type' => 'double',
                                     'store' => true,
                                 ],
                             ],
diff --git a/app/code/Magento/Elasticsearch7/Test/Unit/Model/Client/ElasticsearchTest.php b/app/code/Magento/Elasticsearch7/Test/Unit/Model/Client/ElasticsearchTest.php
index 593bbd7792f46..091387f844d55 100644
--- a/app/code/Magento/Elasticsearch7/Test/Unit/Model/Client/ElasticsearchTest.php
+++ b/app/code/Magento/Elasticsearch7/Test/Unit/Model/Client/ElasticsearchTest.php
@@ -438,7 +438,7 @@ public function testAddFieldsMapping()
                                         'match' => 'price_*',
                                         'match_mapping_type' => 'string',
                                         'mapping' => [
-                                            'type' => 'float',
+                                            'type' => 'double',
                                             'store' => true,
                                         ],
                                     ],
@@ -509,7 +509,7 @@ public function testAddFieldsMappingFailure()
                                         'match' => 'price_*',
                                         'match_mapping_type' => 'string',
                                         'mapping' => [
-                                            'type' => 'float',
+                                            'type' => 'double',
                                             'store' => true,
                                         ],
                                     ],

From 88840a79ad7076a40fd4fe0cf7e5c70d2bd1b2f4 Mon Sep 17 00:00:00 2001
From: Michal Derlatka <michal.derlatka1@gmail.com>
Date: Thu, 25 Jun 2020 09:50:57 +0200
Subject: [PATCH 0604/1718] magento/magento2#28561: GraphQL added CORS headers
 (fixing issues)

---
 .../Cors/CorsAllowCredentialsHeaderProvider.php     |  6 +++---
 .../Cors/CorsAllowHeadersHeaderProvider.php         |  8 ++++----
 .../Cors/CorsAllowMethodsHeaderProvider.php         | 11 +++++++----
 .../Cors/CorsAllowOriginHeaderProvider.php          | 11 +++++++----
 .../HttpResponse/Cors/CorsMaxAgeHeaderProvider.php  | 13 ++++++++-----
 .../Magento/GraphQl/Model/Cors/Configuration.php    | 12 ++++++------
 .../GraphQl/Model/Cors/ConfigurationInterface.php   | 10 +++++-----
 app/code/Magento/GraphQl/etc/di.xml                 | 10 +++++-----
 .../testsuite/Magento/GraphQl/CorsHeadersTest.php   | 12 ++++++------
 9 files changed, 51 insertions(+), 42 deletions(-)

diff --git a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowCredentialsHeaderProvider.php b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowCredentialsHeaderProvider.php
index 39edeb8e6667b..ba2e995d4f704 100644
--- a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowCredentialsHeaderProvider.php
+++ b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowCredentialsHeaderProvider.php
@@ -44,7 +44,7 @@ public function __construct(
      *
      * @return string
      */
-    public function getName()
+    public function getName(): string
     {
         return $this->headerName;
     }
@@ -54,7 +54,7 @@ public function getName()
      *
      * @return string
      */
-    public function getValue()
+    public function getValue(): string
     {
         return "1";
     }
@@ -64,7 +64,7 @@ public function getValue()
      *
      * @return bool
      */
-    public function canApply() : 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
index e07cb70644441..68760de543daa 100644
--- a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowHeadersHeaderProvider.php
+++ b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowHeadersHeaderProvider.php
@@ -44,7 +44,7 @@ public function __construct(
      *
      * @return string
      */
-    public function getName()
+    public function getName(): string
     {
         return $this->headerName;
     }
@@ -54,7 +54,7 @@ public function getName()
      *
      * @return bool
      */
-    public function canApply() : bool
+    public function canApply(): bool
     {
         return $this->corsConfiguration->isEnabled() && $this->getValue();
     }
@@ -62,9 +62,9 @@ public function canApply() : bool
     /**
      * Get value for header
      *
-     * @return string
+     * @return string|null
      */
-    public function getValue()
+    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
index 654cacfeb4633..233839b9deb74 100644
--- a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowMethodsHeaderProvider.php
+++ b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowMethodsHeaderProvider.php
@@ -15,6 +15,9 @@
  */
 class CorsAllowMethodsHeaderProvider implements HeaderProviderInterface
 {
+    /**
+     * @var string
+     */
     private $headerName;
 
     /**
@@ -41,7 +44,7 @@ public function __construct(
      *
      * @return string
      */
-    public function getName()
+    public function getName(): string
     {
         return $this->headerName;
     }
@@ -51,7 +54,7 @@ public function getName()
      *
      * @return bool
      */
-    public function canApply() : bool
+    public function canApply(): bool
     {
         return $this->corsConfiguration->isEnabled() && $this->getValue();
     }
@@ -59,9 +62,9 @@ public function canApply() : bool
     /**
      * Get value for header
      *
-     * @return string
+     * @return string|null
      */
-    public function getValue()
+    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
index 7ecc06376ca04..21850f18db1f2 100644
--- a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowOriginHeaderProvider.php
+++ b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowOriginHeaderProvider.php
@@ -15,6 +15,9 @@
  */
 class CorsAllowOriginHeaderProvider implements HeaderProviderInterface
 {
+    /**
+     * @var string
+     */
     private $headerName;
 
     /**
@@ -41,7 +44,7 @@ public function __construct(
      *
      * @return string
      */
-    public function getName()
+    public function getName(): string
     {
         return $this->headerName;
     }
@@ -51,7 +54,7 @@ public function getName()
      *
      * @return bool
      */
-    public function canApply() : bool
+    public function canApply(): bool
     {
         return $this->corsConfiguration->isEnabled() && $this->getValue();
     }
@@ -59,9 +62,9 @@ public function canApply() : bool
     /**
      * Get value for header
      *
-     * @return string
+     * @return string|null
      */
-    public function getValue()
+    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
index 7221cd252fab0..e30209ae25e68 100644
--- a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsMaxAgeHeaderProvider.php
+++ b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsMaxAgeHeaderProvider.php
@@ -15,6 +15,9 @@
  */
 class CorsMaxAgeHeaderProvider implements HeaderProviderInterface
 {
+    /**
+     * @var string
+     */
     private $headerName;
 
     /**
@@ -41,7 +44,7 @@ public function __construct(
      *
      * @return string
      */
-    public function getName()
+    public function getName(): string
     {
         return $this->headerName;
     }
@@ -51,7 +54,7 @@ public function getName()
      *
      * @return bool
      */
-    public function canApply()
+    public function canApply(): bool
     {
         return $this->corsConfiguration->isEnabled() && $this->getValue();
     }
@@ -59,10 +62,10 @@ public function canApply()
     /**
      * Get value for header
      *
-     * @return string
+     * @return string|null
      */
-    public function getValue()
+    public function getValue(): ?string
     {
-        return $this->corsConfiguration->getMaxAge();
+        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
index b06d63832b8d2..dd5a0b426e22d 100644
--- a/app/code/Magento/GraphQl/Model/Cors/Configuration.php
+++ b/app/code/Magento/GraphQl/Model/Cors/Configuration.php
@@ -14,12 +14,12 @@
  */
 class Configuration implements ConfigurationInterface
 {
-    const XML_PATH_CORS_HEADERS_ENABLED = 'graphql/cors/enabled';
-    const XML_PATH_CORS_ALLOWED_ORIGINS = 'graphql/cors/allowed_origins';
-    const XML_PATH_CORS_ALLOWED_HEADERS = 'graphql/cors/allowed_headers';
-    const XML_PATH_CORS_ALLOWED_METHODS = 'graphql/cors/allowed_methods';
-    const XML_PATH_CORS_MAX_AGE = 'graphql/cors/max_age';
-    const XML_PATH_CORS_ALLOW_CREDENTIALS = 'graphql/cors/allow_credentials';
+    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
diff --git a/app/code/Magento/GraphQl/Model/Cors/ConfigurationInterface.php b/app/code/Magento/GraphQl/Model/Cors/ConfigurationInterface.php
index 9e54e979323fa..b40b64f48e51f 100644
--- a/app/code/Magento/GraphQl/Model/Cors/ConfigurationInterface.php
+++ b/app/code/Magento/GraphQl/Model/Cors/ConfigurationInterface.php
@@ -17,35 +17,35 @@ interface ConfigurationInterface
      *
      * @return bool
      */
-    public function isEnabled() : bool;
+    public function isEnabled(): bool;
 
     /**
      * Get allowed origins or null if stored configuration is empty
      *
      * @return string|null
      */
-    public function getAllowedOrigins() : ?string;
+    public function getAllowedOrigins(): ?string;
 
     /**
      * Get allowed headers or null if stored configuration is empty
      *
      * @return string|null
      */
-    public function getAllowedHeaders() : ?string;
+    public function getAllowedHeaders(): ?string;
 
     /**
      * Get allowed methods or null if stored configuration is empty
      *
      * @return string|null
      */
-    public function getAllowedMethods() : ?string;
+    public function getAllowedMethods(): ?string;
 
     /**
      * Get max age header value
      *
      * @return int
      */
-    public function getMaxAge() : int;
+    public function getMaxAge(): int;
 
     /**
      * Are credentials allowed
diff --git a/app/code/Magento/GraphQl/etc/di.xml b/app/code/Magento/GraphQl/etc/di.xml
index f0a8eca87ec58..fca6c425e2507 100644
--- a/app/code/Magento/GraphQl/etc/di.xml
+++ b/app/code/Magento/GraphQl/etc/di.xml
@@ -100,27 +100,27 @@
     </type>
 
     <preference for="Magento\GraphQl\Model\Cors\ConfigurationInterface" type="Magento\GraphQl\Model\Cors\Configuration" />
-    <type name="\Magento\GraphQl\Controller\HttpResponse\Cors\CorsMaxAgeHeaderProvider">
+    <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">
+    <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">
+    <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">
+    <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">
+    <type name="Magento\GraphQl\Controller\HttpResponse\Cors\CorsAllowOriginHeaderProvider">
         <arguments>
             <argument name="headerName" xsi:type="string">Access-Control-Allow-Origin</argument>
         </arguments>
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CorsHeadersTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CorsHeadersTest.php
index 3628d3e4bca32..25c808a549e80 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/CorsHeadersTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CorsHeadersTest.php
@@ -45,13 +45,13 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        parent::tearDown(); // TODO: Change the autogenerated stub
+        parent::tearDown();
 
         $this->resourceConfig->saveConfig(Configuration::XML_PATH_CORS_HEADERS_ENABLED, 0);
         $this->reinitConfig->reinit();
     }
 
-    public function testNoCorsHeadersWhenCorsIsDisabled()
+    public function testNoCorsHeadersWhenCorsIsDisabled(): void
     {
         $this->resourceConfig->saveConfig(Configuration::XML_PATH_CORS_HEADERS_ENABLED, 0);
         $this->resourceConfig->saveConfig(Configuration::XML_PATH_CORS_ALLOWED_HEADERS, 'Origin');
@@ -70,7 +70,7 @@ public function testNoCorsHeadersWhenCorsIsDisabled()
         self::assertArrayNotHasKey('Access-Control-Allow-Origin', $headers);
     }
 
-    public function testCorsHeadersWhenCorsIsEnabled()
+    public function testCorsHeadersWhenCorsIsEnabled(): void
     {
         $this->resourceConfig->saveConfig(Configuration::XML_PATH_CORS_HEADERS_ENABLED, 1);
         $this->resourceConfig->saveConfig(Configuration::XML_PATH_CORS_ALLOWED_HEADERS, 'Origin');
@@ -89,7 +89,7 @@ public function testCorsHeadersWhenCorsIsEnabled()
         self::assertEquals('86400', $headers['Access-Control-Max-Age']);
     }
 
-    public function testEmptyCorsHeadersWhenCorsIsEnabled()
+    public function testEmptyCorsHeadersWhenCorsIsEnabled(): void
     {
         $this->resourceConfig->saveConfig(Configuration::XML_PATH_CORS_HEADERS_ENABLED, 1);
         $this->resourceConfig->saveConfig(Configuration::XML_PATH_CORS_ALLOWED_HEADERS, '');
@@ -108,7 +108,7 @@ public function testEmptyCorsHeadersWhenCorsIsEnabled()
         self::assertArrayNotHasKey('Access-Control-Allow-Origin', $headers);
     }
 
-    private function getHeadersFromIntrospectionQuery()
+    private function getHeadersFromIntrospectionQuery(): array
     {
         $query
             = <<<QUERY
@@ -121,6 +121,6 @@ private function getHeadersFromIntrospectionQuery()
   }
 QUERY;
 
-        return $this->graphQlQueryWithResponseHeaders($query)['headers'];
+        return $this->graphQlQueryWithResponseHeaders($query)['headers'] ?? [];
     }
 }

From 7c8943fddce5f21b101b3ea2654a578097c94ff1 Mon Sep 17 00:00:00 2001
From: Sergio Vera <svera@adobe.com>
Date: Thu, 25 Jun 2020 09:59:45 +0200
Subject: [PATCH 0605/1718] MC-25043: Layered Navigation does not return "No"
 option for boolean attributes when using elasticsearch - Take into account
 also type when comparing against empty string

---
 .../Model/Indexer/Fulltext/Action/DataProvider.php              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 360df8f4edc66..ffa7dfd80df0c 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php
@@ -572,7 +572,7 @@ public function prepareProductIndex($indexData, $productData, $storeId)
         foreach ($indexData as $entityId => $attributeData) {
             foreach ($attributeData as $attributeId => $attributeValues) {
                 $value = $this->getAttributeValue($attributeId, $attributeValues, $storeId);
-                if ($value !== null && $value !== false && $value != '') {
+                if ($value !== null && $value !== false && $value !== '') {
                     if (!isset($index[$attributeId])) {
                         $index[$attributeId] = [];
                     }

From 4514e0cc201ac790303142859218d658d2fdd7fc Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Thu, 25 Jun 2020 12:37:58 +0300
Subject: [PATCH 0606/1718] integration test

---
 .../Sales/Model/ResourceModel/OrderTest.php   | 83 ++++++++++++-------
 1 file changed, 52 insertions(+), 31 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/OrderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/OrderTest.php
index c7aa78d96f5e6..cd1a458fc7e9f 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/OrderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/OrderTest.php
@@ -3,34 +3,46 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 declare(strict_types=1);
 
 namespace Magento\Sales\Model\ResourceModel;
 
-use Magento\Store\Api\StoreRepositoryInterface;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Registry;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order as OrderModel;
+use Magento\Sales\Model\Order\Address;
+use Magento\Sales\Model\Order\Item;
+use Magento\Sales\Model\Order\Payment;
 use Magento\Sales\Model\ResourceModel\Order\CollectionFactory as OrderCollectionFactory;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
 
 /**
+ * Test for \Magento\Sales\Model\ResourceModel\Order.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class OrderTest extends \PHPUnit\Framework\TestCase
+class OrderTest extends TestCase
 {
     /**
-     * @var \Magento\Sales\Model\ResourceModel\Order
+     * @var Order
      */
-    protected $resourceModel;
+    private $resourceModel;
 
     /**
      * @var int
      */
-    protected $orderIncrementId;
+    private $orderIncrementId;
 
     /**
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var ObjectManagerInterface
      */
-    protected $objectManager;
+    private $objectManager;
 
     /**
      * @var StoreManagerInterface
@@ -47,8 +59,9 @@ class OrderTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp(): void
     {
-        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->resourceModel = $this->objectManager->create(\Magento\Sales\Model\ResourceModel\Order::class);
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        $this->resourceModel = $this->objectManager->create(Order::class);
         $this->orderIncrementId = '100000001';
         $this->storeManager = $this->objectManager->get(StoreManagerInterface::class);
         $this->storeRepository = $this->objectManager->get(StoreRepositoryInterface::class);
@@ -59,7 +72,7 @@ protected function setUp(): void
      */
     protected function tearDown(): void
     {
-        $registry = $this->objectManager->get(\Magento\Framework\Registry::class);
+        $registry = $this->objectManager->get(Registry::class);
         $registry->unregister('isSecureArea');
         $registry->register('isSecureArea', true);
 
@@ -73,14 +86,15 @@ protected function tearDown(): void
 
         $defaultStore = $this->storeRepository->get('default');
         $this->storeManager->setCurrentStore($defaultStore->getId());
-
-        parent::tearDown();
     }
 
     /**
+     * Test save order
+     *
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @return void
      */
-    public function testSaveOrder()
+    public function testSaveOrder(): void
     {
         $addressData = [
             'region' => 'CA',
@@ -94,31 +108,28 @@ public function testSaveOrder()
             'country_id' => 'US'
         ];
 
-        $billingAddress = $this->objectManager->create(
-            \Magento\Sales\Model\Order\Address::class,
-            ['data' => $addressData]
-        );
+        $billingAddress = $this->objectManager->create(Address::class, ['data' => $addressData]);
         $billingAddress->setAddressType('billing');
 
         $shippingAddress = clone $billingAddress;
         $shippingAddress->setId(null)->setAddressType('shipping');
 
-        $payment = $this->objectManager->create(\Magento\Sales\Model\Order\Payment::class);
+        $payment = $this->objectManager->create(Payment::class);
         $payment->setMethod('checkmo');
 
-        /** @var \Magento\Sales\Model\Order\Item $orderItem */
-        $orderItem = $this->objectManager->create(\Magento\Sales\Model\Order\Item::class);
+        /** @var Item $orderItem */
+        $orderItem = $this->objectManager->create(Item::class);
         $orderItem->setProductId(1)
             ->setQtyOrdered(2)
             ->setBasePrice(10)
             ->setPrice(10)
             ->setRowTotal(10);
 
-        /** @var \Magento\Sales\Model\Order $order */
-        $order = $this->objectManager->create(\Magento\Sales\Model\Order::class);
+        /** @var OrderModel $order */
+        $order = $this->objectManager->create(OrderModel::class);
         $order->setIncrementId($this->orderIncrementId)
-            ->setState(\Magento\Sales\Model\Order::STATE_PROCESSING)
-            ->setStatus($order->getConfig()->getStateDefaultStatus(\Magento\Sales\Model\Order::STATE_PROCESSING))
+            ->setState(OrderModel::STATE_PROCESSING)
+            ->setStatus($order->getConfig()->getStateDefaultStatus(OrderModel::STATE_PROCESSING))
             ->setSubtotal(100)
             ->setBaseSubtotal(100)
             ->setBaseGrandTotal(100)
@@ -128,7 +139,7 @@ public function testSaveOrder()
             ->setShippingAddress($shippingAddress)
             ->setStoreId(
                 $this->objectManager
-                    ->get(\Magento\Store\Model\StoreManagerInterface::class)
+                    ->get(StoreManagerInterface::class)
                     ->getStore()
                     ->getId()
             )
@@ -141,26 +152,36 @@ public function testSaveOrder()
     }
 
     /**
-     * Check that store name with length within 255 chars can be saved in table sales_order
+     * Check that store name and x_forwarded_for with length within 255 chars can be saved in table sales_order
      *
      * @magentoDataFixture Magento/Store/_files/store_with_long_name.php
      * @magentoDbIsolation disabled
      * @return void
      */
-    public function testSaveStoreName()
+    public function testSaveLongNames(): void
     {
+        $xForwardedFor = str_repeat('x', 255);
+
         $store = $this->storeRepository->get('test_2');
         $this->storeManager->setCurrentStore($store->getId());
         $eventManager = $this->objectManager->get(ManagerInterface::class);
         $eventManager->dispatch('store_add', ['store' => $store]);
-        $order = $this->objectManager->create(\Magento\Sales\Model\Order::class);
-        $payment = $this->objectManager->create(\Magento\Sales\Model\Order\Payment::class);
+        $order = $this->objectManager->create(OrderModel::class);
+        $payment = $this->objectManager->create(Payment::class);
         $payment->setMethod('checkmo');
+
         $order->setStoreId($store->getId())->setPayment($payment);
+        $order->setXForwardedFor($xForwardedFor);
+        $order->setPayment($payment);
         $this->resourceModel->save($order);
-        $orderRepository = $this->objectManager->create(\Magento\Sales\Api\OrderRepositoryInterface::class);
+
+        $orderRepository = $this->objectManager->create(OrderRepositoryInterface::class);
         $order = $orderRepository->get($order->getId());
+
         $this->assertEquals(255, strlen($order->getStoreName()));
+        $this->assertEquals(255, strlen($order->getXForwardedFor()));
+
+        $this->assertEquals($xForwardedFor, $order->getXForwardedFor());
         $this->assertStringContainsString($store->getWebsite()->getName(), $order->getStoreName());
         $this->assertStringContainsString($store->getGroup()->getName(), $order->getStoreName());
     }

From aa59e482127642e83b1904e4dff5a29072710a58 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Thu, 25 Jun 2020 12:41:53 +0300
Subject: [PATCH 0607/1718] minor fix

---
 .../testsuite/Magento/Sales/Model/ResourceModel/OrderTest.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/OrderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/OrderTest.php
index cd1a458fc7e9f..74a9ccc35d379 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/OrderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/OrderTest.php
@@ -170,7 +170,7 @@ public function testSaveLongNames(): void
         $payment = $this->objectManager->create(Payment::class);
         $payment->setMethod('checkmo');
 
-        $order->setStoreId($store->getId())->setPayment($payment);
+        $order->setStoreId($store->getId());
         $order->setXForwardedFor($xForwardedFor);
         $order->setPayment($payment);
         $this->resourceModel->save($order);

From 8c4cff429708f6f52ddd266220f53707308181c2 Mon Sep 17 00:00:00 2001
From: Oleksandr Melnyk <sasha19957099@gmail.com>
Date: Thu, 25 Jun 2020 14:11:42 +0300
Subject: [PATCH 0608/1718] magento/magento2#27952: missing store_name in
 GraphQL resolver - changed to proxy

---
 .../Dependency/DeclarativeSchemaDependencyProvider.php        | 4 ++--
 .../Integrity/Dependency/GraphQlSchemaDependencyProvider.php  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php
index df8986d2a3c56..a1e94f8baa66a 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php
@@ -56,9 +56,9 @@ class DeclarativeSchemaDependencyProvider
 
     /**
      * DeclarativeSchemaDependencyProvider constructor.
-     * @param DependencyProvider $dependencyProvider
+     * @param \Magento\Test\Integrity\Dependency\DependencyProvider\Proxy $dependencyProvider
      */
-    public function __construct(DependencyProvider $dependencyProvider)
+    public function __construct(\Magento\Test\Integrity\Dependency\DependencyProvider\Proxy $dependencyProvider)
     {
         $this->dependencyProvider = $dependencyProvider;
     }
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/GraphQlSchemaDependencyProvider.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/GraphQlSchemaDependencyProvider.php
index b759649ac3151..961d5e3d2e34b 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/GraphQlSchemaDependencyProvider.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/GraphQlSchemaDependencyProvider.php
@@ -30,9 +30,9 @@ class GraphQlSchemaDependencyProvider
 
     /**
      * GraphQlSchemaDependencyProvider constructor.
-     * @param DependencyProvider $dependencyProvider
+     * @param \Magento\Test\Integrity\Dependency\DependencyProvider\Proxy $dependencyProvider
      */
-    public function __construct(DependencyProvider $dependencyProvider)
+    public function __construct(\Magento\Test\Integrity\Dependency\DependencyProvider\Proxy $dependencyProvider)
     {
         $this->dependencyProvider = $dependencyProvider;
         $this->getGraphQlSchemaDeclaration();

From 3a27449976106cef570833ec11b1b9658b88baec Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Thu, 25 Jun 2020 15:18:42 +0300
Subject: [PATCH 0609/1718] MFTF tests updates.

---
 .../AdminLoginAsCustomerLogPageNotAvailableActionGroup.xml    | 3 +--
 .../AdminLoginAsCustomerLoginFromCustomerPageActionGroup.xml  | 3 +--
 ...AsCustomerLoginFromCustomerPageManualChooseActionGroup.xml | 3 +--
 .../AdminLoginAsCustomerLoginFromOrderPageActionGroup.xml     | 3 +--
 .../Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml  | 4 ----
 .../Test/AdminLoginAsCustomerDirectlyToCustomWebsiteTest.xml  | 4 ----
 ...oginAsCustomerLogNotShownIfLoginAsCustomerDisabledTest.xml | 3 ---
 .../Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml   | 2 +-
 8 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogPageNotAvailableActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogPageNotAvailableActionGroup.xml
index 9f23a69ab3aff..0efab2c1368c2 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogPageNotAvailableActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogPageNotAvailableActionGroup.xml
@@ -15,7 +15,6 @@
 
         <amOnPage url="{{AdminLoginAsCustomerLogPage.url}}" stepKey="openAdminLoginAsCustomerLogPage"/>
         <waitForPageLoad stepKey="waitForLoginAsCustomerLogPageLoad"/>
-        <see userInput="Sorry, you need permissions to view this content."
-             selector="{{AdminMessagesSection.accessDenied}}" stepKey="seeAccessDenied"/>
+        <see userInput="404 Error" selector="{{AdminHeaderSection.pageHeading}}" stepKey="see404PageHeading"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageActionGroup.xml
index b10bad9fa2900..0aa12d21e4772 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageActionGroup.xml
@@ -21,8 +21,7 @@
         <click selector="{{AdminCustomerMainActionsSection.loginAsCustomer}}" stepKey="clickLoginAsCustomerLink"/>
         <see selector="{{AdminConfirmationModalSection.title}}" userInput="You are about to Login as Customer"
              stepKey="seeModal"/>
-        <!-- TODO: Unskip after https://github.com/magento/magento2-login-as-customer/issues/137 is fixed-->
-        <!-- <see selector="{{AdminConfirmationModalSection.message}}" userInput="Actions taken while in "Login as Customer" will affect actual customer data." stepKey="seeModalMessage"/>-->
+         <see selector="{{AdminConfirmationModalSection.message}}" userInput="Actions taken while in &quot;Login as Customer&quot; will affect actual customer data." stepKey="seeModalMessage"/>
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="clickLogin"/>
         <switchToNextTab stepKey="switchToNewTab"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup.xml
index 6fda137c3f6a4..e09fd270712d7 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup.xml
@@ -21,8 +21,7 @@
         <waitForPageLoad stepKey="waitForCustomerPageLoad"/>
         <click selector="{{AdminCustomerMainActionsSection.loginAsCustomer}}" stepKey="clickLoginAsCustomerLink"/>
         <see selector="{{AdminConfirmationModalSection.title}}" userInput="Login as Customer: Select Store View" stepKey="seeModal"/>
-        <!-- TODO: Unskip after https://github.com/magento/magento2-login-as-customer/issues/137 is fixed-->
-        <!-- <see selector="{{AdminConfirmationModalSection.message}}" userInput="Actions taken while in "Login as Customer" will affect actual customer data." stepKey="seeModalMessage"/>-->
+         <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"/>
         <switchToNextTab stepKey="switchToNewTab"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageActionGroup.xml
index 1aab6aa58c9e6..5be590d78361e 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageActionGroup.xml
@@ -21,8 +21,7 @@
         <click selector="{{AdminOrderDetailsMainActionsSection.loginAsCustomer}}" stepKey="clickLoginAsCustomerLink"/>
         <see selector="{{AdminConfirmationModalSection.title}}" userInput="You are about to Login as Customer"
              stepKey="seeModal"/>
-        <!-- TODO: Unskip after https://github.com/magento/magento2-login-as-customer/issues/137 is fixed-->
-        <!-- <see selector="{{AdminConfirmationModalSection.message}}" userInput="Actions taken while in "Login as Customer" will affect actual customer data." stepKey="seeModalMessage"/>-->
+         <see selector="{{AdminConfirmationModalSection.message}}" userInput="Actions taken while in &quot;Login as Customer&quot; will affect actual customer data." stepKey="seeModalMessage"/>
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="clickLogin"/>
         <switchToNextTab stepKey="switchToNewTab"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml
index bbb6e342cca10..2ea3cb5ec341b 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml
@@ -18,9 +18,6 @@
                 value="Verify admin user can directly login into customer account to Default store view when Store View To Login In = Auto detection"/>
             <severity value="BLOCKER"/>
             <group value="login_as_customer"/>
-            <skip>
-                <issueId value="https://github.com/magento/magento2-login-as-customer/pull/135"/>
-            </skip>
         </annotations>
         <before>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
@@ -60,7 +57,6 @@
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
             <argument name="customerEmail" value="$$createCustomer.email$$"/>
         </actionGroup>
-        <actionGroup ref="StorefrontClickOnHeaderLogoActionGroup" stepKey="clickOnStorefrontHeaderLogo"/>
         <actionGroup ref="AssertStorefrontStoreCodeInUrlActionGroup" stepKey="seeDefaultStoreCodeInUrl"/>
 
         <!-- Log out Customer and close tab -->
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerDirectlyToCustomWebsiteTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerDirectlyToCustomWebsiteTest.xml
index d88f860b6078b..8c7724a5f6ce6 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerDirectlyToCustomWebsiteTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerDirectlyToCustomWebsiteTest.xml
@@ -17,9 +17,6 @@
                 value="Verify admin user can directly login into customer account on custom website using 'Login as customer' functionality"/>
             <severity value="BLOCKER"/>
             <group value="login_as_customer"/>
-            <skip>
-                <issueId value="https://github.com/magento/magento2-login-as-customer/issues/102"/>
-            </skip>
         </annotations>
         <before>
             <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
@@ -77,7 +74,6 @@
         </actionGroup>
 
         <!-- Assert Customer logged on Custom Website -->
-        <actionGroup ref="StorefrontClickOnHeaderLogoActionGroup" stepKey="clickOnStorefrontHeaderLogo"/>
         <actionGroup ref="AssertStorefrontStoreCodeInUrlActionGroup" stepKey="seeStoreCodeInUrl">
             <argument name="storeCode" value="{{customStoreEN.code}}"/>
         </actionGroup>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLogNotShownIfLoginAsCustomerDisabledTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLogNotShownIfLoginAsCustomerDisabledTest.xml
index 3047843b0c758..bcd824707a1cd 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLogNotShownIfLoginAsCustomerDisabledTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLogNotShownIfLoginAsCustomerDisabledTest.xml
@@ -16,9 +16,6 @@
             <description value="Verify that 'Login As Customer Log' not shown if 'Login as customer' functionality is disabled"/>
             <severity value="CRITICAL"/>
             <group value="login_as_customer"/>
-            <skip>
-                <issueId value="https://github.com/magento/magento2-login-as-customer/issues/136"/>
-            </skip>
         </annotations>
         <before>
             <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0" stepKey="disableLoginAsCustomer"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
index beda69e8d256c..028ef0526b0c5 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
@@ -19,7 +19,7 @@
             <severity value="CRITICAL"/>
             <group value="login_as_customer"/>
             <skip>
-                <issueId value="https://github.com/magento/magento2-login-as-customer/issues/102"/>
+                <issueId value="https://github.com/magento/magento2-login-as-customer/issues/58"/>
             </skip>
         </annotations>
         <before>

From f168ca6067aee1caf741e9e124802a8d97e87205 Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Thu, 25 Jun 2020 15:31:51 +0300
Subject: [PATCH 0610/1718] Small improvements

---
 app/code/Magento/Review/Model/Review/Config.php               | 4 ++--
 .../Model/Resolver/Product/Review/AverageRating.php           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Review/Model/Review/Config.php b/app/code/Magento/Review/Model/Review/Config.php
index 8fa32f0a7e340..a3082503b1391 100644
--- a/app/code/Magento/Review/Model/Review/Config.php
+++ b/app/code/Magento/Review/Model/Review/Config.php
@@ -15,7 +15,7 @@
  */
 class Config
 {
-    const XML_PATH_WISHLIST_ACTIVE = 'catalog/review/active';
+    const XML_PATH_REVIEW_ACTIVE = 'catalog/review/active';
 
     /**
      * @var ScopeConfigInterface
@@ -39,7 +39,7 @@ public function __construct(
     public function isEnabled(): bool
     {
         return $this->scopeConfig->isSetFlag(
-            self::XML_PATH_WISHLIST_ACTIVE,
+            self::XML_PATH_REVIEW_ACTIVE,
             ScopeInterface::SCOPE_STORES
         );
     }
diff --git a/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/Review/AverageRating.php b/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/Review/AverageRating.php
index b33ea592425af..385d273d5368c 100644
--- a/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/Review/AverageRating.php
+++ b/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/Review/AverageRating.php
@@ -64,9 +64,9 @@ public function resolve(
         /** @var Review $review */
         $review = $value['model'];
         $summary = $this->ratingFactory->create()->getReviewSummary($review->getId());
-        $averageRating = $summary->getSum();
+        $averageRating = $summary->getSum() ?: 0;
 
-        if ($summary->getSum() > 0) {
+        if ($averageRating > 0) {
             $averageRating = (float) number_format($summary->getSum() / $summary->getCount() / 20, 2);
         }
 

From 1943018094edcedddc73463a5e703a9a76653ad8 Mon Sep 17 00:00:00 2001
From: Michal Derlatka <michal.derlatka1@gmail.com>
Date: Thu, 18 Jun 2020 12:46:18 +0200
Subject: [PATCH 0611/1718] magento/magento2#28570: createCustomer does not
 match validation requirements

---
 .../Model/Resolver/UpdateCustomerEmail.php    | 78 +++++++++++++++++++
 .../CustomerGraphQl/etc/schema.graphqls       | 34 +++++++-
 2 files changed, 110 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerEmail.php

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerEmail.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerEmail.php
new file mode 100644
index 0000000000000..3ed010b2819ca
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerEmail.php
@@ -0,0 +1,78 @@
+<?php
+
+
+namespace Magento\CustomerGraphQl\Model\Resolver;
+
+
+use Magento\CustomerGraphQl\Model\Customer\ExtractCustomerData;
+use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
+use Magento\CustomerGraphQl\Model\Customer\UpdateCustomerAccount;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Framework\GraphQl\Query\Resolver\Value;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+class UpdateCustomerEmail implements ResolverInterface
+{
+    /**
+     * @var GetCustomer
+     */
+    private $getCustomer;
+    /**
+     * @var UpdateCustomerAccount
+     */
+    private $updateCustomerAccount;
+    /**
+     * @var ExtractCustomerData
+     */
+    private $extractCustomerData;
+
+    /**
+     * @param GetCustomer $getCustomer
+     * @param UpdateCustomerAccount $updateCustomerAccount
+     * @param ExtractCustomerData $extractCustomerData
+     */
+    public function __construct(
+        GetCustomer $getCustomer,
+        UpdateCustomerAccount $updateCustomerAccount,
+        ExtractCustomerData $extractCustomerData
+    ) {
+        $this->getCustomer = $getCustomer;
+        $this->updateCustomerAccount = $updateCustomerAccount;
+        $this->extractCustomerData = $extractCustomerData;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        /** @var \Magento\GraphQl\Model\Query\ContextInterface $context */
+        if (false === $context->getExtensionAttributes()->getIsCustomer()) {
+            throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
+        }
+
+        if (empty($args['email']) || empty($args['password'])) {
+            throw new GraphQlInputException(__('"email" and "password" values should be specified'));
+        }
+
+        $customer = $this->getCustomer->execute($context);
+        $this->updateCustomerAccount->execute(
+            $customer,
+            ['email' => $args['email'], 'password' => $args['password']],
+            $context->getExtensionAttributes()->getStore()
+        );
+
+        $data = $this->extractCustomerData->execute($customer);
+
+        return ['customer' => $data];
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
index 42a52bd5a99a7..8b3c691abef57 100644
--- a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
@@ -17,14 +17,16 @@ type Query {
 type Mutation {
     generateCustomerToken(email: String!, password: String!): CustomerToken @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\GenerateCustomerToken") @doc(description:"Retrieve the customer token")
     changeCustomerPassword(currentPassword: String!, newPassword: String!): Customer @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\ChangePassword") @doc(description:"Changes the password for the logged-in customer")
-    createCustomer (input: CustomerInput!): CustomerOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\CreateCustomer") @doc(description:"Create customer account")
-    updateCustomer (input: CustomerInput!): CustomerOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\UpdateCustomer") @doc(description:"Update the customer's personal information")
+    createCustomer (input: CustomerCreateInput!): CustomerOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\CreateCustomer") @doc(description:"Create customer account")
+    updateCustomer (input: CustomerInput!): CustomerOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\UpdateCustomer") @doc(description:"Deprecated. Use UpdateCustomerV2 instead.")
+    updateCustomerV2 (input: CustomerUpdateInput!): CustomerOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\UpdateCustomer") @doc(description:"Update the customer's personal information")
     revokeCustomerToken: RevokeCustomerTokenOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\RevokeCustomerToken") @doc(description:"Revoke the customer token")
     createCustomerAddress(input: CustomerAddressInput!): CustomerAddress @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\CreateCustomerAddress") @doc(description: "Create customer address")
     updateCustomerAddress(id: Int!, input: CustomerAddressInput): CustomerAddress @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\UpdateCustomerAddress") @doc(description: "Update customer address")
     deleteCustomerAddress(id: Int!): Boolean @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\DeleteCustomerAddress") @doc(description: "Delete customer address")
     requestPasswordResetEmail(email: String!): Boolean  @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\RequestPasswordResetEmail") @doc(description: "Request an email with a reset password token for the registered customer identified by the specified email.")
     resetPassword(email: String!, resetPasswordToken: String!, newPassword: String!): Boolean  @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\ResetPassword") @doc(description: "Reset a customer's password using the reset password token that the customer received in an email after requesting it using requestPasswordResetEmail.")
+    updateCustomerEmail(email: String!, password: String!): CustomerOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\UpdateCustomerEmail") @doc(description: "")
 }
 
 input CustomerAddressInput {
@@ -78,6 +80,34 @@ input CustomerInput {
     is_subscribed: Boolean @doc(description: "Indicates whether the customer is subscribed to the company's newsletter")
 }
 
+input CustomerCreateInput {
+    prefix: String @doc(description: "An honorific, such as Dr., Mr., or Mrs.")
+    firstname: String! @doc(description: "The customer's first name")
+    middlename: String @doc(description: "The customer's middle name")
+    lastname: String! @doc(description: "The customer's family name")
+    suffix: String @doc(description: "A value such as Sr., Jr., or III")
+    email: String! @doc(description: "The customer's email address. Required for customer creation")
+    dob: String @doc(description: "Deprecated: Use `date_of_birth` instead")
+    date_of_birth: String @doc(description: "The customer's date of birth")
+    taxvat: String @doc(description: "The customer's Tax/VAT number (for corporate customers)")
+    gender: Int @doc(description: "The customer's gender (Male - 1, Female - 2)")
+    password: String @doc(description: "The customer's password")
+    is_subscribed: Boolean @doc(description: "Indicates whether the customer is subscribed to the company's newsletter")
+}
+
+input CustomerUpdateInput {
+    date_of_birth: String @doc(description: "The customer's date of birth")
+    dob: String @doc(description: "Deprecated: Use `date_of_birth` instead")
+    firstname: String @doc(description: "The customer's first name")
+    gender: Int @doc(description: "The customer's gender (Male - 1, Female - 2)")
+    is_subscribed: Boolean @doc(description: "Indicates whether the customer is subscribed to the company's newsletter")
+    lastname: String @doc(description: "The customer's family name")
+    middlename: String @doc(description: "The customer's middle name")
+    prefix: String @doc(description: "An honorific, such as Dr., Mr., or Mrs.")
+    suffix: String @doc(description: "A value such as Sr., Jr., or III")
+    taxvat: String @doc(description: "The customer's Tax/VAT number (for corporate customers)")
+}
+
 type CustomerOutput {
     customer: Customer!
 }

From 5c69aa1bf0fba6306d86f97a7f99b11ec79a269e Mon Sep 17 00:00:00 2001
From: Marjan Petkovski <petkovski.marjan@gmail.com>
Date: Thu, 25 Jun 2020 15:48:06 +0200
Subject: [PATCH 0612/1718] magento/magento2#26121: special price & tier price
 are coming in base currency

Collect store specific value for store specific currecny when querying products special_price and price_tiers
---
 .../Model/Resolver/PriceTiers.php             | 11 +++--
 .../Model/Resolver/Product/Price/Tiers.php    |  7 +++-
 .../Model/Resolver/Product/SpecialPrice.php   | 42 +++++++++++++++++++
 .../CatalogGraphQl/etc/schema.graphqls        |  2 +-
 4 files changed, 56 insertions(+), 6 deletions(-)
 create mode 100644 app/code/Magento/CatalogGraphQl/Model/Resolver/Product/SpecialPrice.php

diff --git a/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/PriceTiers.php b/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/PriceTiers.php
index 4e75139c1a882..9f198f70741df 100644
--- a/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/PriceTiers.php
+++ b/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/PriceTiers.php
@@ -130,18 +130,21 @@ private function formatProductTierPrices(array $tierPrices, float $productPrice,
         $tiers = [];
 
         foreach ($tierPrices as $tierPrice) {
-            $percentValue = $tierPrice->getExtensionAttributes()->getPercentageValue();
+            $websitePrice = $tierPrice['website_price'];
+            $percentValue = $tierPrice['percentage_value'];
+            $quantity = $tierPrice['price_qty'];
+
             if ($percentValue && is_numeric($percentValue)) {
                 $discount = $this->discount->getDiscountByPercent($productPrice, (float)$percentValue);
             } else {
-                $discount = $this->discount->getDiscountByDifference($productPrice, (float)$tierPrice->getValue());
+                $discount = $this->discount->getDiscountByDifference($productPrice, (float)$websitePrice);
             }
 
             $tiers[] = [
                 "discount" => $discount,
-                "quantity" => $tierPrice->getQty(),
+                "quantity" => $quantity,
                 "final_price" => [
-                    "value" => $tierPrice->getValue(),
+                    "value" => $websitePrice,
                     "currency" => $store->getCurrentCurrencyCode()
                 ]
             ];
diff --git a/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/Product/Price/Tiers.php b/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/Product/Price/Tiers.php
index 73a2ba83d5096..f574e13d6296d 100644
--- a/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/Product/Price/Tiers.php
+++ b/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/Product/Price/Tiers.php
@@ -10,6 +10,7 @@
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
+use Magento\Catalog\Pricing\Price\TierPrice;
 use Magento\Customer\Model\GroupManagement;
 use Magento\Catalog\Api\Data\ProductTierPriceInterface;
 use Magento\CatalogGraphQl\Model\Resolver\Product\Price\ProviderPool as PriceProviderPool;
@@ -97,7 +98,11 @@ public function getProductTierPrices($productId): ?array
         if (empty($this->products[$productId])) {
             return null;
         }
-        return $this->products[$productId]->getTierPrices();
+
+        /** @var TierPrice $tierPrice */
+        $tierPrice = $this->products[$productId]->getPriceInfo()->getPrice(TierPrice::PRICE_CODE);
+
+        return $tierPrice->getTierPriceList();
     }
 
     /**
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/SpecialPrice.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/SpecialPrice.php
new file mode 100644
index 0000000000000..a1e61d77fb190
--- /dev/null
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/SpecialPrice.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogGraphQl\Model\Resolver\Product;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Framework\GraphQl\Query\Resolver\Value;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Catalog\Pricing\Price\SpecialPrice as PricingSpecialPrice;
+
+class SpecialPrice implements ResolverInterface
+{
+    /**
+     * Fetches the data from persistence models and format it according to the GraphQL schema.
+     *
+     * @param \Magento\Framework\GraphQl\Config\Element\Field $field
+     * @param ContextInterface $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     * @return mixed|Value
+     * @throws \Exception
+     */public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        /** @var \Magento\Catalog\Model\Product $product */
+        $product = $value['model'];
+        /** @var PricingSpecialPrice $specialPrice */
+        $specialPrice = $product->getPriceInfo()->getPrice(PricingSpecialPrice::PRICE_CODE);
+
+        if ($specialPrice->getValue()) {
+            return $specialPrice->getValue();
+        }
+
+        return null;
+    }
+}
diff --git a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
index a9720bf17445b..81e1ac1ea860c 100644
--- a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
@@ -88,7 +88,7 @@ interface ProductInterface @typeResolver(class: "Magento\\CatalogGraphQl\\Model\
     sku: String @doc(description: "A number or code assigned to a product to identify the product, options, price, and manufacturer.")
     description: ComplexTextValue @doc(description: "Detailed information about the product. The value can include simple HTML tags.") @resolver(class: "\\Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductComplexTextAttribute")
     short_description: ComplexTextValue @doc(description: "A short description of the product. Its use depends on the theme.") @resolver(class: "\\Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\ProductComplexTextAttribute")
-    special_price: Float @doc(description: "The discounted price of the product.")
+    special_price: Float @doc(description: "The discounted price of the product.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\SpecialPrice")
     special_from_date: String @doc(description: "The beginning date that a product has a special price.")
     special_to_date: String @doc(description: "The end date that a product has a special price.")
     attribute_set_id: Int @doc(description: "The attribute set assigned to the product.")

From b5b0648a07b91c6df211673076c6da380837344b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Corr=C3=AAa=20Gomes?=
 <rafaelstz@users.noreply.github.com>
Date: Thu, 25 Jun 2020 10:41:38 -0400
Subject: [PATCH 0613/1718] README > Removing extra space

I removed the extra space between the new logo and the badges, and I changed the logo alt from Magento to Magento Commerce as it's represented in the new logo.
---
 README.md | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index ba194266f691a..7b959edb4ef7b 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,9 @@
 <p align="center">
-  <a href="https://magento.com">
-    <img src="https://static.magento.com/sites/all/themes/magento/logo.svg" width="300px" alt="Magento" />
-  </a>
-</p>
-<p align="center">
-    <br /><br />
+    <a href="https://magento.com">
+        <img src="https://static.magento.com/sites/all/themes/magento/logo.svg" width="300px" alt="Magento Commerce" />
+    </a>
+    <br />
+    <br />
     <a href="https://www.codetriage.com/magento/magento2">
         <img src="https://www.codetriage.com/magento/magento2/badges/users.svg" alt="Open Source Helpers" />
     </a>

From d8643e2855f383abfe4b389795e270c422aff830 Mon Sep 17 00:00:00 2001
From: Dmitriy Gallyamov <dmitrijs.gallamovs@gmail.com>
Date: Thu, 25 Jun 2020 19:42:10 +0300
Subject: [PATCH 0614/1718] magento/magento2#28569: Multi-store: Missing store
 codes in relation to a group and website

- Created separate test for available stores

Added website specific store output
---
 .../Resolver/AvailableStoresResolver.php      |   2 +-
 .../Store/StoreConfigDataProvider.php         |  34 +++-
 .../Store/AvailableStoreConfigTest.php        | 171 ++++++++++++++++++
 .../GraphQl/Store/StoreConfigResolverTest.php |  56 +-----
 4 files changed, 208 insertions(+), 55 deletions(-)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Store/AvailableStoreConfigTest.php

diff --git a/app/code/Magento/StoreGraphQl/Model/Resolver/AvailableStoresResolver.php b/app/code/Magento/StoreGraphQl/Model/Resolver/AvailableStoresResolver.php
index 904e1d487ff47..9392c630e511d 100644
--- a/app/code/Magento/StoreGraphQl/Model/Resolver/AvailableStoresResolver.php
+++ b/app/code/Magento/StoreGraphQl/Model/Resolver/AvailableStoresResolver.php
@@ -41,6 +41,6 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        return $this->storeConfigDataProvider->getAvailableStores();
+        return $this->storeConfigDataProvider->getAvailableStoreConfig($context->getExtensionAttributes()->getStore());
     }
 }
diff --git a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
index f44633c6ca973..9ee06e353fd1a 100644
--- a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
+++ b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
@@ -10,6 +10,8 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Store\Api\Data\StoreConfigInterface;
 use Magento\Store\Api\StoreConfigManagerInterface;
+use Magento\Store\Model\ResourceModel\Store\Collection;
+use Magento\Store\Model\ResourceModel\StoreWebsiteRelation;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Api\Data\StoreInterface;
 
@@ -33,19 +35,35 @@ class StoreConfigDataProvider
      */
     private $extendedConfigData;
 
+    /**
+     * @var StoreWebsiteRelation
+     */
+    private $storeWebsiteRelation;
+
+    /**
+     * @var Collection
+     */
+    private $storeCollection;
+
     /**
      * @param StoreConfigManagerInterface $storeConfigManager
      * @param ScopeConfigInterface $scopeConfig
+     * @param StoreWebsiteRelation $storeWebsiteRelation
+     * @param Collection $storeCollection
      * @param array $extendedConfigData
      */
     public function __construct(
         StoreConfigManagerInterface $storeConfigManager,
         ScopeConfigInterface $scopeConfig,
+        StoreWebsiteRelation $storeWebsiteRelation,
+        Collection $storeCollection,
         array $extendedConfigData = []
     ) {
         $this->storeConfigManager = $storeConfigManager;
         $this->scopeConfig = $scopeConfig;
         $this->extendedConfigData = $extendedConfigData;
+        $this->storeWebsiteRelation = $storeWebsiteRelation;
+        $this->storeCollection = $storeCollection;
     }
 
     /**
@@ -61,17 +79,23 @@ public function getStoreConfigData(StoreInterface $store): array
     }
 
     /**
-     * Get available stores
+     * Get website available stores
      *
+     * @param StoreInterface $store
      * @return array
      */
-    public function getAvailableStores(): array
+    public function getAvailableStoreConfig(StoreInterface $store): array
     {
+        $storeIds = $this->storeWebsiteRelation->getStoreByWebsiteId($store->getWebsiteId());
+        $websiteStores = $this->storeCollection->addIdFilter($storeIds);
         $storesConfigData = [];
-        $storeConfigs = $this->storeConfigManager->getStoreConfigs();
 
-        foreach ($storeConfigs as $storeConfig) {
-            $storesConfigData[] = $this->prepareStoreConfigData($storeConfig);
+        foreach ($websiteStores as $websiteStore) {
+            if ($websiteStore->getIsActive()) {
+                $storesConfigData[] = $this->prepareStoreConfigData(
+                    $this->storeConfigManager->getStoreConfig($websiteStore)
+                );
+            }
         }
 
         return $storesConfigData;
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/AvailableStoreConfigTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/AvailableStoreConfigTest.php
new file mode 100644
index 0000000000000..bdb5201c51342
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/AvailableStoreConfigTest.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Store;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Store\Api\Data\StoreConfigInterface;
+use Magento\Store\Api\StoreConfigManagerInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test the GraphQL endpoint's StoreConfigs and AvailableStores queries
+ */
+class AvailableStoreConfigTest extends GraphQlAbstract
+{
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Store/_files/store.php
+     * @magentoApiDataFixture Magento/Store/_files/inactive_store.php
+     * @magentoConfigFixture default_store store/information/name Default Store
+     * @magentoConfigFixture test_store store/information/name Test Store
+     */
+    public function testDefaultWebsiteAvailableStoreConfigs(): void
+    {
+        /** @var StoreConfigManagerInterface $storeConfigManager */
+        $storeConfigManager = $this->objectManager->get(StoreConfigManagerInterface::class);
+        $storeConfigs = $storeConfigManager->getStoreConfigs();
+
+        $expectedAvailableStores = [];
+        $expectedAvailableStoreCodes = [
+            'default',
+            'test'
+        ];
+
+        foreach ($storeConfigs as $storeConfig) {
+            if (in_array($storeConfig->getCode(), $expectedAvailableStoreCodes)) {
+                $expectedAvailableStores[] = $storeConfig;
+            }
+        }
+
+        $query
+            = <<<QUERY
+{
+  availableStores {
+    id,
+    code,
+    website_id,
+    locale,
+    base_currency_code,
+    default_display_currency_code,
+    timezone,
+    weight_unit,
+    base_url,
+    base_link_url,
+    base_static_url,
+    base_media_url,
+    secure_base_url,
+    secure_base_link_url,
+    secure_base_static_url,
+    secure_base_media_url,
+    store_name
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        $this->assertArrayHasKey('availableStores', $response);
+        foreach ($expectedAvailableStores as $key => $storeConfig) {
+            $this->validateStoreConfig($storeConfig, $response['availableStores'][$key]);
+        }
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Store/_files/second_website_with_two_stores.php
+     * @magentoConfigFixture fixture_second_store_store store/information/name Fixture Second Store
+     * @magentoConfigFixture fixture_third_store_store store/information/name Fixture Third Store
+     */
+    public function testNonDefaultWebsiteAvailableStoreConfigs(): void
+    {
+        /** @var StoreConfigManagerInterface $storeConfigManager */
+        $storeConfigManager = $this->objectManager->get(StoreConfigManagerInterface::class);
+        $storeConfigs = $storeConfigManager->getStoreConfigs(['fixture_second_store', 'fixture_third_store']);
+
+        $query
+            = <<<QUERY
+{
+  availableStores {
+    id,
+    code,
+    website_id,
+    locale,
+    base_currency_code,
+    default_display_currency_code,
+    timezone,
+    weight_unit,
+    base_url,
+    base_link_url,
+    base_static_url,
+    base_media_url,
+    secure_base_url,
+    secure_base_link_url,
+    secure_base_static_url,
+    secure_base_media_url,
+    store_name
+  }
+}
+QUERY;
+        $headerMap = ['Store' => 'fixture_second_store'];
+        $response = $this->graphQlQuery($query, [], '', $headerMap);
+
+        $this->assertArrayHasKey('availableStores', $response);
+        foreach ($storeConfigs as $key => $storeConfig) {
+            $this->validateStoreConfig($storeConfig, $response['availableStores'][$key]);
+        }
+    }
+
+    /**
+     * Validate Store Config Data
+     *
+     * @param StoreConfigInterface $storeConfig
+     * @param array $responseConfig
+     */
+    private function validateStoreConfig($storeConfig, $responseConfig): void
+    {
+        /* @var $scopeConfig ScopeConfigInterface */
+        $scopeConfig = $this->objectManager->get(ScopeConfigInterface::class);
+        $this->assertEquals($storeConfig->getId(), $responseConfig['id']);
+        $this->assertEquals($storeConfig->getCode(), $responseConfig['code']);
+        $this->assertEquals($storeConfig->getLocale(), $responseConfig['locale']);
+        $this->assertEquals($storeConfig->getBaseCurrencyCode(), $responseConfig['base_currency_code']);
+        $this->assertEquals(
+            $storeConfig->getDefaultDisplayCurrencyCode(),
+            $responseConfig['default_display_currency_code']
+        );
+        $this->assertEquals($storeConfig->getTimezone(), $responseConfig['timezone']);
+        $this->assertEquals($storeConfig->getWeightUnit(), $responseConfig['weight_unit']);
+        $this->assertEquals($storeConfig->getBaseUrl(), $responseConfig['base_url']);
+        $this->assertEquals($storeConfig->getBaseLinkUrl(), $responseConfig['base_link_url']);
+        $this->assertEquals($storeConfig->getBaseStaticUrl(), $responseConfig['base_static_url']);
+        $this->assertEquals($storeConfig->getBaseMediaUrl(), $responseConfig['base_media_url']);
+        $this->assertEquals($storeConfig->getSecureBaseUrl(), $responseConfig['secure_base_url']);
+        $this->assertEquals($storeConfig->getSecureBaseLinkUrl(), $responseConfig['secure_base_link_url']);
+        $this->assertEquals($storeConfig->getSecureBaseStaticUrl(), $responseConfig['secure_base_static_url']);
+        $this->assertEquals($storeConfig->getSecureBaseMediaUrl(), $responseConfig['secure_base_media_url']);
+        $this->assertEquals($scopeConfig->getValue(
+            'store/information/name',
+            ScopeInterface::SCOPE_STORE,
+            $storeConfig->getId()
+        ), $responseConfig['store_name']);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
index 5e46921591d68..b4ff8778347b8 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
@@ -7,7 +7,6 @@
 
 namespace Magento\GraphQl\Store;
 
-use Exception;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Store\Api\Data\StoreConfigInterface;
@@ -25,9 +24,12 @@
 class StoreConfigResolverTest extends GraphQlAbstract
 {
 
-    /** @var  ObjectManager */
+    /** @var ObjectManager */
     private $objectManager;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
@@ -40,8 +42,8 @@ protected function setUp(): void
      */
     public function testGetStoreConfig(): void
     {
-        /** @var  StoreConfigManagerInterface $defaultStoreConfigsManager */
-        $defaultStoreConfigsManager = $this->objectManager->get(StoreConfigManagerInterface::class);
+        /** @var  StoreConfigManagerInterface $storeConfigManager */
+        $storeConfigManager = $this->objectManager->get(StoreConfigManagerInterface::class);
         /** @var StoreResolverInterface $storeResolver */
         $storeResolver = $this->objectManager->get(StoreResolverInterface::class);
         /** @var StoreRepositoryInterface $storeRepository */
@@ -49,7 +51,7 @@ public function testGetStoreConfig(): void
         $storeId = $storeResolver->getCurrentStoreId();
         $store = $storeRepository->getById($storeId);
         /** @var StoreConfigInterface $defaultStoreConfig */
-        $defaultStoreConfig = current($defaultStoreConfigsManager->getStoreConfigs([$store->getCode()]));
+        $defaultStoreConfig = current($storeConfigManager->getStoreConfigs([$store->getCode()]));
         $query
             = <<<QUERY
 {
@@ -79,50 +81,6 @@ public function testGetStoreConfig(): void
         $this->validateStoreConfig($defaultStoreConfig, $response['storeConfig']);
     }
 
-    /**
-     * @magentoApiDataFixture Magento/Store/_files/store.php
-     * @magentoConfigFixture default_store store/information/name Default Store
-     * @magentoConfigFixture test_store store/information/name Test Store
-     * @throws Exception
-     */
-    public function testAvailableStoreConfigs(): void
-    {
-        /** @var  StoreConfigManagerInterface $defaultStoreConfigsManager */
-        $defaultStoreConfigsManager = $this->objectManager->get(StoreConfigManagerInterface::class);
-        $storeConfigs = $defaultStoreConfigsManager->getStoreConfigs();
-
-        $query
-            = <<<QUERY
-{
-  availableStores {
-    id,
-    code,
-    website_id,
-    locale,
-    base_currency_code,
-    default_display_currency_code,
-    timezone,
-    weight_unit,
-    base_url,
-    base_link_url,
-    base_static_url,
-    base_media_url,
-    secure_base_url,
-    secure_base_link_url,
-    secure_base_static_url,
-    secure_base_media_url,
-    store_name
-  }
-}
-QUERY;
-        $response = $this->graphQlQuery($query);
-
-        $this->assertArrayHasKey('availableStores', $response);
-        foreach ($storeConfigs as $key => $storeConfig) {
-            $this->validateStoreConfig($storeConfig, $response['availableStores'][$key]);
-        }
-    }
-
     /**
      * Validate Store Config Data
      *

From f3406490443d3b53bd7d6bde0585b71dc8c0d11a Mon Sep 17 00:00:00 2001
From: Raoul Rego <rrego@adobe.com>
Date: Wed, 10 Jun 2020 09:43:15 -0500
Subject: [PATCH 0615/1718] MC-33330: Product is removed from Shopping Cart
 after cancel PayPal checkout flow

- Remove quoteID from paypal session after completing or cancelling order
- Removed comment
---
 .../Magento/Paypal/Controller/Express/AbstractExpress/Cancel.php | 1 +
 .../Paypal/Controller/Express/AbstractExpress/PlaceOrder.php     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Cancel.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Cancel.php
index c469338d03961..375a2639ab073 100644
--- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Cancel.php
+++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/Cancel.php
@@ -31,6 +31,7 @@ public function execute()
                     ->unsLastSuccessQuoteId()
                     ->unsLastOrderId()
                     ->unsLastRealOrderId();
+                $this->_getSession()->unsQuoteId(); // clean quote from session that was set in OnAuthorization
                 $this->messageManager->addSuccessMessage(
                     __('Express Checkout and Order have been canceled.')
                 );
diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php
index 055af4162d5f3..50efc763a4456 100644
--- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php
+++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php
@@ -127,6 +127,7 @@ public function execute()
                 return;
             }
             $this->_initToken(false); // no need in token anymore
+            $this->_getSession()->unsQuoteId(); // clean quote from session that was set in OnAuthorization
             $this->_redirect('checkout/onepage/success');
             return;
         } catch (ApiProcessableException $e) {

From 0b33f28116ecee648e3f9930cd0e30265d691783 Mon Sep 17 00:00:00 2001
From: Anusha Vattam <avattam@adobe.com>
Date: Thu, 25 Jun 2020 13:52:30 -0500
Subject: [PATCH 0616/1718] MC:32658:MyAccount :: Order Details :: Order
 Details by Order Number Taxes and Discounts

- Added new test case and static fixes on code
---
 .../Model/Resolver/OrderTotal.php             |  10 +-
 .../Sales/RetrieveOrdersByOrderNumberTest.php | 144 +++++++++++++-----
 ...dersWithBundleProductByOrderNumberTest.php |  19 +--
 .../Tax/_files/tax_rule_for_region_al.php     |  53 +++++++
 .../tax_rule_for_region_al_rollback.php       |  38 +++++
 5 files changed, 208 insertions(+), 56 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Tax/_files/tax_rule_for_region_al.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Tax/_files/tax_rule_for_region_al_rollback.php

diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php
index 9ab2e8ca326ee..d4753e25ea233 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php
@@ -188,11 +188,13 @@ private function getAppliedTaxesDetails(OrderInterface $order, array $appliedTax
      * @param array $appliedShippingTaxesForItemsData
      * @return array
      */
-    private function getAppliedShippingTaxesDetails(OrderInterface $order, array $appliedShippingTaxesForItemsData): array
-    {
+    private function getAppliedShippingTaxesDetails(
+        OrderInterface $order,
+        array $appliedShippingTaxesForItemsData
+    ): array {
         $shippingTaxes = [];
-        foreach ($appliedShippingTaxesForItemsData  as $appliedTaxesKeyIndex => $appliedShippingTaxes) {
-            foreach ($appliedShippingTaxes as $key => $appliedShippingTax) {
+        foreach ($appliedShippingTaxesForItemsData as $appliedShippingTaxes) {
+            foreach ($appliedShippingTaxes as $appliedShippingTax) {
                 $appliedShippingTaxesArray = [
                     'title' => $appliedShippingTax['title'] ?? null,
                     'amount' => [
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php
index 36f62f0ea400a..ed987fd33a5ca 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php
@@ -169,19 +169,12 @@ public function testCustomerOrdersSimpleProductWithTaxesAndDiscounts()
     private function assertTotalsWithTaxesAndDiscounts(array $customerOrderItemTotal): void
     {
         $this->assertCount(1, $customerOrderItemTotal['taxes']);
-        $expectedProductAndShippingTaxes = [4.05];
-        $totalTaxes = [];
-        foreach ($customerOrderItemTotal['taxes'] as $totalTaxFromResponse) {
-            array_push($totalTaxes, $totalTaxFromResponse['amount']['value']);
-        }
-        foreach ($totalTaxes as $value) {
-            $this->assertTrue(in_array($value, $expectedProductAndShippingTaxes));
-        }
-        foreach ($customerOrderItemTotal['taxes'] as $taxData) {
-            $this->assertEquals('USD', $taxData['amount']['currency']);
-            $this->assertEquals('US-TEST-*-Rate-1', $taxData['title']);
-            $this->assertEquals(7.5, $taxData['rate']);
-        }
+        $taxData = $customerOrderItemTotal['taxes'][0];
+        $this->assertEquals('USD', $taxData['amount']['currency']);
+        $this->assertEquals(4.05, $taxData['amount']['value']);
+        $this->assertEquals('US-TEST-*-Rate-1', $taxData['title']);
+        $this->assertEquals(7.5, $taxData['rate']);
+
         unset($customerOrderItemTotal['taxes']);
         $assertionMap = [
             'base_grand_total' => ['value' => 58.05, 'currency' =>'USD'],
@@ -215,6 +208,93 @@ private function assertTotalsWithTaxesAndDiscounts(array $customerOrderItemTotal
         $this->assertResponseFields($customerOrderItemTotal, $assertionMap);
     }
 
+    /**
+     *  Verify the customer order with tax, discount with shipping tax class set for calculation setting
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_with_url_key.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Tax/_files/tax_rule_for_region_1.php
+     * @magentoApiDataFixture Magento/GraphQl/Tax/_files/tax_rule_for_region_al.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/cart_rule_10_percent_off_with_discount_on_shipping.php
+     * @magentoApiDataFixture Magento/GraphQl/Tax/_files/tax_calculation_shipping_excludeTax_order_display_settings.php
+     */
+    public function testCustomerOrdersSimpleProductWithTaxesAndDiscountsWithTwoRules()
+    {
+        $quantity = 4;
+        $sku = 'simple1';
+        $cartId = $this->createEmptyCart();
+        $this->addProductToCart($cartId, $quantity, $sku);
+        $this->setBillingAddress($cartId);
+        $shippingMethod = $this->setShippingAddress($cartId);
+        $paymentMethod = $this->setShippingMethod($cartId, $shippingMethod);
+        $this->setPaymentMethod($cartId, $paymentMethod);
+        $orderNumber = $this->placeOrder($cartId);
+        $customerOrderResponse = $this->getCustomerOrderQuery($orderNumber);
+        // Asserting discounts on order item level
+        $this->assertEquals(4, $customerOrderResponse[0]['items'][0]['discounts'][0]['amount']['value']);
+        $this->assertEquals('USD', $customerOrderResponse[0]['items'][0]['discounts'][0]['amount']['currency']);
+        $this->assertEquals('Discount', $customerOrderResponse[0]['items'][0]['discounts'][0]['label']);
+        $customerOrderItem = $customerOrderResponse[0];
+        $this->assertTotalsWithTaxesAndDiscountsWithTwoRules($customerOrderItem['total']);
+        $this->deleteOrder();
+    }
+
+    /**
+     * @param array $customerOrderItemTotal
+     */
+    private function assertTotalsWithTaxesAndDiscountsWithTwoRules(array $customerOrderItemTotal): void
+    {
+        $this->assertCount(2, $customerOrderItemTotal['taxes']);
+        $taxData = $customerOrderItemTotal['taxes'][0];
+        $this->assertEquals('USD', $taxData['amount']['currency']);
+        $this->assertEquals(4.05, $taxData['amount']['value']);
+        $this->assertEquals('US-TEST-*-Rate-1', $taxData['title']);
+        $this->assertEquals(7.5, $taxData['rate']);
+
+        $secondTaxData = $customerOrderItemTotal['taxes'][1];
+        $this->assertEquals('USD', $secondTaxData['amount']['currency']);
+        $this->assertEquals(2.97, $secondTaxData['amount']['value']);
+        $this->assertEquals('US-AL-*-Rate-1', $secondTaxData['title']);
+        $this->assertEquals(5.5, $secondTaxData['rate']);
+
+        unset($customerOrderItemTotal['taxes']);
+        $assertionMap = [
+            'base_grand_total' => ['value' => 61.02, 'currency' =>'USD'],
+            'grand_total' => ['value' => 61.02, 'currency' =>'USD'],
+            'subtotal' => ['value' => 40, 'currency' =>'USD'],
+            'total_tax' => ['value' => 7.02, 'currency' =>'USD'],
+            'total_shipping' => ['value' => 20, 'currency' =>'USD'],
+            'shipping_handling' => [
+                'amount_including_tax' => ['value' => 22.6],
+                'amount_excluding_tax' => ['value' => 20],
+                'total_amount' => ['value' => 20, 'currency' =>'USD'],
+                'discounts' => [
+                    0 => ['amount'=>['value'=> 2, 'currency' =>'USD'],
+                        'label' => 'Discount'
+                    ]
+                ],
+                'taxes'=> [
+                    0 => [
+                        'amount'=>['value' => 1.35],
+                        'title' => 'US-TEST-*-Rate-1',
+                        'rate' => 7.5
+                    ],
+                    1 => [
+                        'amount'=>['value' => 0.99],
+                        'title' => 'US-AL-*-Rate-1',
+                        'rate' => 5.5
+                    ]
+                ]
+            ],
+            'discounts' => [
+                0 => ['amount' => [ 'value' => -6, 'currency' =>'USD'],
+                    'label' => 'Discount'
+                ]
+            ]
+        ];
+        $this->assertResponseFields($customerOrderItemTotal, $assertionMap);
+    }
+
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/GraphQl/Sales/_files/orders_with_customer.php
@@ -745,20 +825,12 @@ public function testCustomerOrderWithTaxesExcludedOnShipping()
     private function assertTotalsAndShippingWithExcludedTaxSetting($customerOrderItemTotal): void
     {
         $this->assertCount(1, $customerOrderItemTotal['taxes']);
-        $expectedProductAndShippingTaxes = [2.25];
+        $taxData = $customerOrderItemTotal['taxes'][0];
+        $this->assertEquals('USD', $taxData['amount']['currency']);
+        $this->assertEquals(2.25, $taxData['amount']['value']);
+        $this->assertEquals('US-TEST-*-Rate-1', $taxData['title']);
+        $this->assertEquals(7.5, $taxData['rate']);
 
-        $totalTaxes = [];
-        foreach ($customerOrderItemTotal['taxes'] as $totalTaxFromResponse) {
-            array_push($totalTaxes, $totalTaxFromResponse['amount']['value']);
-        }
-        foreach ($totalTaxes as $value) {
-            $this->assertTrue(in_array($value, $expectedProductAndShippingTaxes));
-        }
-        foreach ($customerOrderItemTotal['taxes'] as $taxData) {
-            $this->assertEquals('USD', $taxData['amount']['currency']);
-            $this->assertEquals('US-TEST-*-Rate-1', $taxData['title']);
-            $this->assertEquals(7.5, $taxData['rate']);
-        }
         unset($customerOrderItemTotal['taxes']);
         $assertionMap = [
             'base_grand_total' => ['value' => 32.25, 'currency' =>'USD'],
@@ -820,19 +892,13 @@ public function testCustomerOrderWithTaxesIncludedOnShippingAndTotals()
     private function assertTotalsAndShippingWithTaxes(array $customerOrderItemTotal): void
     {
         $this->assertCount(1, $customerOrderItemTotal['taxes']);
-        $expectedProductAndShippingTaxes = [2.25];
-        $totalTaxes = [];
-        foreach ($customerOrderItemTotal['taxes'] as $totalTaxFromResponse) {
-            array_push($totalTaxes, $totalTaxFromResponse['amount']['value']);
-        }
-        foreach ($totalTaxes as $value) {
-            $this->assertTrue(in_array($value, $expectedProductAndShippingTaxes));
-        }
-        foreach ($customerOrderItemTotal['taxes'] as $taxData) {
-            $this->assertEquals('USD', $taxData['amount']['currency']);
-            $this->assertEquals('US-TEST-*-Rate-1', $taxData['title']);
-            $this->assertEquals(7.5, $taxData['rate']);
-        }
+
+        $taxData = $customerOrderItemTotal['taxes'][0];
+        $this->assertEquals('USD', $taxData['amount']['currency']);
+        $this->assertEquals(2.25, $taxData['amount']['value']);
+        $this->assertEquals('US-TEST-*-Rate-1', $taxData['title']);
+        $this->assertEquals(7.5, $taxData['rate']);
+
         unset($customerOrderItemTotal['taxes']);
         unset($customerOrderItemTotal['shipping_handling']['discounts']);
         $assertionMap = [
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithBundleProductByOrderNumberTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithBundleProductByOrderNumberTest.php
index 30a42f5d73d07..fdc284e95644d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithBundleProductByOrderNumberTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithBundleProductByOrderNumberTest.php
@@ -164,19 +164,12 @@ public function testGetCustomerOrderBundleProductWithTaxesAndDiscounts()
     private function assertTotalsOnBundleProductWithTaxesAndDiscounts(array $customerOrderItemTotal): void
     {
         $this->assertCount(1, $customerOrderItemTotal['taxes']);
-        $expectedProductAndShippingTaxes = [5.4];
-        $totalTaxes = [];
-        foreach ($customerOrderItemTotal['taxes'] as $totalTaxFromResponse) {
-            array_push($totalTaxes, $totalTaxFromResponse['amount']['value']);
-        }
-        foreach ($totalTaxes as $value) {
-            $this->assertTrue(in_array($value, $expectedProductAndShippingTaxes));
-        }
-        foreach ($customerOrderItemTotal['taxes'] as $taxData) {
-            $this->assertEquals('USD', $taxData['amount']['currency']);
-            $this->assertEquals('US-TEST-*-Rate-1', $taxData['title']);
-            $this->assertEquals(7.5, $taxData['rate']);
-        }
+        $taxData = $customerOrderItemTotal['taxes'][0];
+        $this->assertEquals('USD', $taxData['amount']['currency']);
+        $this->assertEquals(5.4, $taxData['amount']['value']);
+        $this->assertEquals('US-TEST-*-Rate-1', $taxData['title']);
+        $this->assertEquals(7.5, $taxData['rate']);
+
         unset($customerOrderItemTotal['taxes']);
         $assertionMap = [
             'base_grand_total' => ['value' => 77.4, 'currency' =>'USD'],
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Tax/_files/tax_rule_for_region_al.php b/dev/tests/integration/testsuite/Magento/GraphQl/Tax/_files/tax_rule_for_region_al.php
new file mode 100644
index 0000000000000..2603e2056f19d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Tax/_files/tax_rule_for_region_al.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Tax\Api\Data\TaxRateInterface;
+use Magento\Tax\Api\Data\TaxRuleInterface;
+use Magento\Tax\Api\TaxRateRepositoryInterface;
+use Magento\Tax\Api\TaxRuleRepositoryInterface;
+use Magento\Tax\Model\Calculation\Rate;
+use Magento\Tax\Model\Calculation\RateFactory;
+use Magento\Tax\Model\Calculation\RateRepository;
+use Magento\Tax\Model\Calculation\Rule;
+use Magento\Tax\Model\Calculation\RuleFactory;
+use Magento\Tax\Model\TaxRuleRepository;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\Api\DataObjectHelper;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var DataObjectHelper $dataObjectHelper */
+$dataObjectHelper = Bootstrap::getObjectManager()->get(DataObjectHelper::class);
+/** @var RateFactory $rateFactory */
+$rateFactory = $objectManager->get(RateFactory::class);
+/** @var RuleFactory $ruleFactory */
+$ruleFactory = $objectManager->get(RuleFactory::class);
+/** @var RateRepository $rateRepository */
+$rateRepository = $objectManager->get(TaxRateRepositoryInterface::class);
+/** @var TaxRuleRepository $ruleRepository */
+$ruleRepository = $objectManager->get(TaxRuleRepositoryInterface::class);
+/** @var Rate $rate */
+$rate = $rateFactory->create();
+$rateData = [
+    Rate::KEY_COUNTRY_ID => 'US',
+    Rate::KEY_REGION_ID => '1',
+    Rate::KEY_POSTCODE => '*',
+    Rate::KEY_CODE => 'US-AL-*-Rate-1',
+    Rate::KEY_PERCENTAGE_RATE => '5.5',
+];
+$dataObjectHelper->populateWithArray($rate, $rateData, TaxRateInterface::class);
+$rateRepository->save($rate);
+
+$rule = $ruleFactory->create();
+$ruleData = [
+    Rule::KEY_CODE=> 'GraphQl Test Rule AL',
+    Rule::KEY_PRIORITY => '0',
+    Rule::KEY_POSITION => '0',
+    Rule::KEY_CUSTOMER_TAX_CLASS_IDS => [3],
+    Rule::KEY_PRODUCT_TAX_CLASS_IDS => [2],
+    Rule::KEY_TAX_RATE_IDS => [$rate->getId()],
+];
+$dataObjectHelper->populateWithArray($rule, $ruleData, TaxRuleInterface::class);
+$ruleRepository->save($rule);
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Tax/_files/tax_rule_for_region_al_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Tax/_files/tax_rule_for_region_al_rollback.php
new file mode 100644
index 0000000000000..22372f3a21022
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Tax/_files/tax_rule_for_region_al_rollback.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Tax\Api\TaxRateRepositoryInterface;
+use Magento\Tax\Api\TaxRuleRepositoryInterface;
+use Magento\Tax\Model\Calculation\Rate;
+use Magento\Tax\Model\Calculation\RateFactory;
+use Magento\Tax\Model\Calculation\RateRepository;
+use Magento\Tax\Model\Calculation\Rule;
+use Magento\Tax\Model\Calculation\RuleFactory;
+use Magento\Tax\Model\TaxRuleRepository;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Tax\Model\ResourceModel\Calculation\Rate as RateResource;
+use Magento\Tax\Model\ResourceModel\Calculation\Rule as RuleResource;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var RateFactory $rateFactory */
+$rateFactory = $objectManager->get(RateFactory::class);
+/** @var RuleFactory $ruleFactory */
+$ruleFactory = $objectManager->get(RuleFactory::class);
+/** @var RateRepository $rateRepository */
+$rateRepository = $objectManager->get(TaxRateRepositoryInterface::class);
+/** @var TaxRuleRepository $ruleRepository */
+$ruleRepository = $objectManager->get(TaxRuleRepositoryInterface::class);
+/** @var RateResource $rateResource */
+$rateResource = $objectManager->get(RateResource::class);
+/** @var RuleResource $ruleResource */
+$ruleResource = $objectManager->get(RuleResource::class);
+
+$rate = $rateFactory->create();
+$rateResource->load($rate, 'US-AL-*-Rate-1', Rate::KEY_CODE);
+$rule = $ruleFactory->create();
+$ruleResource->load($rule, 'GraphQl Test Rule AL', Rule::KEY_CODE);
+$ruleRepository->delete($rule);
+$rateRepository->delete($rate);

From d10d06154683be6148f63e89e288a897a90950a4 Mon Sep 17 00:00:00 2001
From: Anusha Vattam <avattam@adobe.com>
Date: Thu, 25 Jun 2020 15:47:02 -0500
Subject: [PATCH 0617/1718] MC:32658:MyAccount :: Order Details :: Order
 Details by Order Number Taxes and Discounts

- Addressed code review fixes
---
 .../Model/Resolver/OrderTotal.php             | 168 ++++++++----------
 .../Sales/RetrieveOrdersByOrderNumberTest.php |   5 +-
 ...dersWithBundleProductByOrderNumberTest.php |   4 +-
 3 files changed, 82 insertions(+), 95 deletions(-)

diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php
index d4753e25ea233..a20639ab4c02c 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php
@@ -32,22 +32,13 @@ public function resolve(
         /** @var OrderInterface $order */
         $order = $value['model'];
         $currency = $order->getOrderCurrencyCode();
-        $extensionAttributes = $order->getExtensionAttributes();
-
-        $allAppliedTaxOnOrdersData =  $this->getAllAppliedTaxesOnOrders(
-            $extensionAttributes->getAppliedTaxes() ?? []
-        );
-
-        $appliedShippingTaxesForItemsData = $this->getAppliedShippingTaxesForItems(
-            $extensionAttributes->getItemAppliedTaxes() ?? []
-        );
 
         return [
             'base_grand_total' => ['value' => $order->getBaseGrandTotal(), 'currency' => $currency],
             'grand_total' => ['value' => $order->getGrandTotal(), 'currency' => $currency],
             'subtotal' => ['value' => $order->getSubtotal(), 'currency' => $currency],
             'total_tax' => ['value' => $order->getTaxAmount(), 'currency' => $currency],
-            'taxes' => $this->getAppliedTaxesDetails($order, $allAppliedTaxOnOrdersData),
+            'taxes' => $this->getAppliedTaxesDetails($order),
             'discounts' => $this->getDiscountDetails($order),
             'total_shipping' => ['value' => $order->getShippingAmount(), 'currency' => $currency],
             'shipping_handling' => [
@@ -63,7 +54,7 @@ public function resolve(
                     'value' => $order->getShippingAmount(),
                     'currency' => $currency
                 ],
-                'taxes' => $this->getAppliedShippingTaxesDetails($order, $appliedShippingTaxesForItemsData),
+                'taxes' => $this->getAppliedShippingTaxesDetails($order),
                 'discounts' => $this->getShippingDiscountDetails($order),
             ]
         ];
@@ -72,66 +63,46 @@ public function resolve(
     /**
      * Retrieve applied taxes that apply to the order
      *
-     * @param \Magento\Tax\Api\Data\OrderTaxDetailsItemInterface[] $appliedTaxes
+     * @param OrderInterface $order
      * @return array
      */
-    private function getAllAppliedTaxesOnOrders(array $appliedTaxes): array
+    private function getAllAppliedTaxesOnOrders(OrderInterface $order): array
     {
-        $allAppliedTaxOnOrdersData = [];
+        $extensionAttributes = $order->getExtensionAttributes();
+        $appliedTaxes = $extensionAttributes->getAppliedTaxes() ?? [];
+        $allAppliedTaxOnOrders = [];
         foreach ($appliedTaxes as $taxIndex => $appliedTaxesData) {
-            $allAppliedTaxOnOrdersData[$taxIndex][$taxIndex] = [
+            $allAppliedTaxOnOrders[$taxIndex] = [
                 'title' => $appliedTaxesData->getDataByKey('title'),
                 'percent' => $appliedTaxesData->getDataByKey('percent'),
                 'amount' => $appliedTaxesData->getDataByKey('amount'),
             ];
         }
-        return $allAppliedTaxOnOrdersData;
+        return $allAppliedTaxOnOrders;
     }
 
     /**
-     * Retrieve applied shipping taxes on items for the orders
-     *
-     * @param \Magento\Tax\Api\Data\OrderTaxDetailsItemInterface $itemAppliedTaxes
-     * @return array
-     */
-    private function getAppliedShippingTaxesForItems(array $itemAppliedTaxes): array
-    {
-        $appliedShippingTaxesForItemsData = [];
-        foreach ($itemAppliedTaxes as $taxItemIndex => $appliedTaxForItem) {
-            if ($appliedTaxForItem->getType() === "shipping") {
-                foreach ($appliedTaxForItem->getAppliedTaxes() ?? [] as $taxLineItem) {
-                    $taxItemIndexTitle = $taxLineItem->getDataByKey('title');
-                    $appliedShippingTaxesForItemsData[$taxItemIndex][$taxItemIndexTitle] = [
-                        'title' => $taxLineItem->getDataByKey('title'),
-                        'percent' => $taxLineItem->getDataByKey('percent'),
-                        'amount' => $taxLineItem->getDataByKey('amount')
-                    ];
-                }
-            }
-        }
-        return $appliedShippingTaxesForItemsData;
-    }
-
-    /**
-     * Return information about an applied discount
+     * Return taxes applied to the current order
      *
      * @param OrderInterface $order
      * @return array
      */
-    private function getShippingDiscountDetails(OrderInterface $order)
+    private function getAppliedTaxesDetails(OrderInterface $order): array
     {
-        $shippingDiscounts = [];
-        if (!($order->getDiscountDescription() === null && $order->getShippingDiscountAmount() == 0)) {
-            $shippingDiscounts[] =
-                [
-                    'label' => $order->getDiscountDescription() ?? __('Discount'),
-                    'amount' => [
-                        'value' => $order->getShippingDiscountAmount(),
-                        'currency' => $order->getOrderCurrencyCode()
-                    ]
-                ];
+        $allAppliedTaxOnOrders = $this->getAllAppliedTaxesOnOrders($order);
+        $taxes = [];
+        foreach ($allAppliedTaxOnOrders as $appliedTaxes) {
+            $appliedTaxesArray = [
+                'rate' => $appliedTaxes['percent'] ?? 0,
+                'title' => $appliedTaxes['title'] ?? null,
+                'amount' => [
+                    'value' => $appliedTaxes['amount'] ?? 0,
+                    'currency' => $order->getOrderCurrencyCode()
+                ]
+            ];
+            $taxes[] = $appliedTaxesArray;
         }
-        return $shippingDiscounts;
+        return $taxes;
     }
 
     /**
@@ -140,74 +111,91 @@ private function getShippingDiscountDetails(OrderInterface $order)
      * @param OrderInterface $order
      * @return array
      */
-    private function getDiscountDetails(OrderInterface $order)
+    private function getDiscountDetails(OrderInterface $order): array
     {
-        $discounts = [];
+        $orderDiscounts = [];
         if (!($order->getDiscountDescription() === null && $order->getDiscountAmount() == 0)) {
-            $discounts[] = [
+            $orderDiscounts[] = [
                 'label' => $order->getDiscountDescription() ?? __('Discount'),
                 'amount' => [
-                    'value' => $order->getDiscountAmount(),
+                    'value' => abs($order->getDiscountAmount()),
                     'currency' => $order->getOrderCurrencyCode()
                 ]
             ];
         }
-        return $discounts;
+        return $orderDiscounts;
     }
 
     /**
-     * Returns taxes applied to the current order
+     * Retrieve applied shipping taxes on items for the orders
      *
      * @param OrderInterface $order
-     * @param array $appliedTaxesArray
      * @return array
      */
-    private function getAppliedTaxesDetails(OrderInterface $order, array $appliedTaxesArray): array
+    private function getAppliedShippingTaxesForItems(OrderInterface $order): array
     {
-        $taxes = [];
-        foreach ($appliedTaxesArray as $appliedTaxesKeyIndex => $appliedTaxes) {
-            $appliedTaxesArray = [
-                'title' => $appliedTaxes[$appliedTaxesKeyIndex]['title'] ?? null,
-                'amount' => [
-                    'value' => $appliedTaxes[$appliedTaxesKeyIndex]['amount'] ?? 0,
-                    'currency' => $order->getOrderCurrencyCode()
-                ],
-            ];
-            if (!empty($appliedTaxes[$appliedTaxesKeyIndex])) {
-                $appliedTaxesArray['rate'] = $appliedTaxes[$appliedTaxesKeyIndex]['percent'] ?? null;
+        $extensionAttributes = $order->getExtensionAttributes();
+        $itemAppliedTaxes = $extensionAttributes->getItemAppliedTaxes() ?? [];
+        $appliedShippingTaxesForItems = [];
+        foreach ($itemAppliedTaxes as $appliedTaxForItem) {
+            if ($appliedTaxForItem->getType() === "shipping") {
+                foreach ($appliedTaxForItem->getAppliedTaxes() ?? [] as $taxLineItem) {
+                    $taxItemIndexTitle = $taxLineItem->getDataByKey('title');
+                    $appliedShippingTaxesForItems[$taxItemIndexTitle] = [
+                        'title' => $taxLineItem->getDataByKey('title'),
+                        'percent' => $taxLineItem->getDataByKey('percent'),
+                        'amount' => $taxLineItem->getDataByKey('amount')
+                    ];
+                }
             }
-            $taxes[] = $appliedTaxesArray;
         }
-        return $taxes;
+        return $appliedShippingTaxesForItems;
     }
 
     /**
-     * Returns taxes applied to the current order
+     * Return taxes applied to the current order
      *
      * @param OrderInterface $order
-     * @param array $appliedShippingTaxesForItemsData
      * @return array
      */
     private function getAppliedShippingTaxesDetails(
-        OrderInterface $order,
-        array $appliedShippingTaxesForItemsData
+        OrderInterface $order
     ): array {
+        $appliedShippingTaxesForItems = $this->getAppliedShippingTaxesForItems($order);
         $shippingTaxes = [];
-        foreach ($appliedShippingTaxesForItemsData as $appliedShippingTaxes) {
-            foreach ($appliedShippingTaxes as $appliedShippingTax) {
-                $appliedShippingTaxesArray = [
-                    'title' => $appliedShippingTax['title'] ?? null,
+        foreach ($appliedShippingTaxesForItems as $appliedShippingTaxes) {
+            $appliedShippingTaxesArray = [
+                'rate' => $appliedShippingTaxes['percent'] ?? 0,
+                'title' => $appliedShippingTaxes['title'] ?? null,
+                'amount' => [
+                    'value' => $appliedShippingTaxes['amount'] ?? 0,
+                    'currency' => $order->getOrderCurrencyCode()
+                ]
+            ];
+            $shippingTaxes[] = $appliedShippingTaxesArray;
+        }
+        return $shippingTaxes;
+    }
+
+    /**
+     * Return information about an applied discount
+     *
+     * @param OrderInterface $order
+     * @return array
+     */
+    private function getShippingDiscountDetails(OrderInterface $order): array
+    {
+        $shippingDiscounts = [];
+        if (!($order->getDiscountDescription() === null && $order->getShippingDiscountAmount() == 0)) {
+            $shippingDiscounts[] =
+                [
+                    'label' => $order->getDiscountDescription() ?? __('Discount'),
                     'amount' => [
-                        'value' => $appliedShippingTax['amount'] ?? 0,
+                        'value' => abs($order->getShippingDiscountAmount()),
                         'currency' => $order->getOrderCurrencyCode()
-                    ],
+                    ]
                 ];
-                if (!empty($appliedShippingTax)) {
-                    $appliedShippingTaxesArray['rate'] = $appliedShippingTax['percent'] ?? 0;
-                }
-                $shippingTaxes[] = $appliedShippingTaxesArray;
-            }
         }
-        return $shippingTaxes;
+        return $shippingDiscounts;
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php
index ed987fd33a5ca..8c72f9ed368ff 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php
@@ -200,7 +200,7 @@ private function assertTotalsWithTaxesAndDiscounts(array $customerOrderItemTotal
                 ]
             ],
             'discounts' => [
-                0 => ['amount' => [ 'value' => -6, 'currency' =>'USD'],
+                0 => ['amount' => [ 'value' => 6, 'currency' =>'USD'],
                     'label' => 'Discount'
                 ]
             ]
@@ -287,7 +287,7 @@ private function assertTotalsWithTaxesAndDiscountsWithTwoRules(array $customerOr
                 ]
             ],
             'discounts' => [
-                0 => ['amount' => [ 'value' => -6, 'currency' =>'USD'],
+                0 => ['amount' => [ 'value' => 6, 'currency' =>'USD'],
                     'label' => 'Discount'
                 ]
             ]
@@ -911,7 +911,6 @@ private function assertTotalsAndShippingWithTaxes(array $customerOrderItemTotal)
                 'amount_including_tax' => ['value' => 10.75],
                 'amount_excluding_tax' => ['value' => 10],
                 'total_amount' => ['value' => 10, 'currency' =>'USD'],
-
                 'taxes'=> [
                     0 => [
                         'amount'=>['value' => 0.75],
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithBundleProductByOrderNumberTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithBundleProductByOrderNumberTest.php
index fdc284e95644d..daa93bbb2c991 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithBundleProductByOrderNumberTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithBundleProductByOrderNumberTest.php
@@ -182,7 +182,7 @@ private function assertTotalsOnBundleProductWithTaxesAndDiscounts(array $custome
                 'amount_excluding_tax' => ['value' => 20],
                 'total_amount' => ['value' => 20],
                 'discounts' => [
-                    0 => ['amount'=>['value'=>2],
+                    0 => ['amount'=>['value'=> 2],
                         'label' => 'Discount'
                     ]
                 ],
@@ -195,7 +195,7 @@ private function assertTotalsOnBundleProductWithTaxesAndDiscounts(array $custome
                 ]
             ],
             'discounts' => [
-                0 => ['amount' => [ 'value' => -8, 'currency' =>'USD'],
+                0 => ['amount' => [ 'value' => 8, 'currency' =>'USD'],
                     'label' => 'Discount'
                 ]
             ]

From 1505a2504943fcac5810e696f67251c3d445b839 Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@magento.com>
Date: Thu, 25 Jun 2020 17:42:27 -0500
Subject: [PATCH 0618/1718] MC-31618: Move static config to files - PLUGIN_LIST

- Add plugin list config generation integration test;
---
 .../Magento/TestFramework/Application.php     |   1 +
 .../Interception/PluginListGeneratorTest.php  | 115 ++++++++++++++++++
 2 files changed, 116 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php

diff --git a/dev/tests/integration/framework/Magento/TestFramework/Application.php b/dev/tests/integration/framework/Magento/TestFramework/Application.php
index f0ce2e24545eb..d375fbdf7d43e 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Application.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Application.php
@@ -714,6 +714,7 @@ protected function getCustomDirs()
             DirectoryList::TMP => [$path => "{$var}/tmp"],
             DirectoryList::UPLOAD => [$path => "{$var}/upload"],
             DirectoryList::PUB => [$path => "{$this->installDir}/pub"],
+            DirectoryList::GENERATED_METADATA => [$path => "{$generated}/metadata"]
         ];
         return $customDirs;
     }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php
new file mode 100644
index 0000000000000..04babcf726547
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Interception;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem\DriverInterface;
+use Magento\TestFramework\Application;
+use Magento\TestFramework\Helper\Bootstrap;
+
+class PluginListGeneratorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Generated plugin list config for frontend scope
+     */
+    const CACHE_ID = 'primary|global|frontend|plugin-list';
+
+    /**
+     * @var PluginListGenerator
+     */
+    private $model;
+
+    /**
+     * @var DirectoryList
+     */
+    private $directoryList;
+
+    /**
+     * @var DriverInterface
+     */
+    private $file;
+
+    /**
+     * @var Application
+     */
+    private $application;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        $this->application = Bootstrap::getInstance()->getBootstrap()->getApplication();
+        $this->directoryList = new DirectoryList(BP, $this->getCustomDirs());
+        $this->file = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            DriverInterface::class
+        );
+        $this->model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            PluginListGenerator::class
+        );
+    }
+
+    /**
+     * Test plugin list configuration generation and load.
+     */
+    public function testPluginListConfigGeneration()
+    {
+        $scopes = ['frontend'];
+        $this->model->write($scopes);
+        $configData = $this->model->load(self::CACHE_ID);
+        $this->assertNotEmpty($configData[0]);
+        $this->assertNotEmpty($configData[1]);
+        $this->assertNotEmpty($configData[2]);
+        $expected = [
+            1 => [
+                0 => 'genericHeaderPlugin',
+                1 => 'asyncCssLoad',
+                2 => 'response-http-page-cache'
+            ]
+        ];
+        // Here in test I assume that this class below has 3 plugins. But the amount of plugins and class itself
+        // may vary. If it is changed, please update these assertions.
+        $this->assertArrayHasKey(
+            'Magento\\Framework\\App\\Response\\Http_sendResponse___self',
+            $configData[2],
+            'Processed plugin does not exist in the processed plugins array.'
+        );
+        $this->assertSame(
+            $expected,
+            $configData[2]['Magento\\Framework\\App\\Response\\Http_sendResponse___self'],
+            'Plugin configurations are not equal'
+        );
+    }
+
+    /**
+     * Gets customized directory paths
+     *
+     * @return array
+     */
+    private function getCustomDirs()
+    {
+        $path = DirectoryList::PATH;
+        $generated = "{$this->application->getTempDir()}/generated";
+
+        return [
+            DirectoryList::GENERATED_METADATA => [$path => "{$generated}/metadata"],
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function tearDown(): void
+    {
+        $filePath = $this->directoryList->getPath(DirectoryList::GENERATED_METADATA)
+            . '/' . self::CACHE_ID . '.' . 'php';
+
+        if (file_exists($filePath)) {
+            $this->file->deleteFile($filePath);
+        }
+    }
+}

From ad6054de0bef5ab1b382c55758466e279e6ed113 Mon Sep 17 00:00:00 2001
From: Deepty Thampy <dthampy@adobe.com>
Date: Thu, 25 Jun 2020 18:07:17 -0500
Subject: [PATCH 0619/1718] MC-32658: MyAccount :: Order Details :: Order
 Details by Order Number Taxes and Discounts

- fixed message format
---
 .../SalesGraphQl/Model/Resolver/OrderItem/DataProvider.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderItem/DataProvider.php b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderItem/DataProvider.php
index 219ea45a330ca..d33b28ffb1d91 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderItem/DataProvider.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderItem/DataProvider.php
@@ -225,7 +225,7 @@ private function getDiscountDetails(OrderInterface $associatedOrder, OrderItemIn
             $discounts = [];
         } else {
             $discounts [] = [
-                'label' => $associatedOrder->getDiscountDescription() ?? _('Discount'),
+                'label' => $associatedOrder->getDiscountDescription() ?? __('Discount'),
                 'amount' => [
                     'value' => $orderItem->getDiscountAmount() ?? 0,
                     'currency' => $associatedOrder->getOrderCurrencyCode()

From 81f0504bbd2623daee960069b2b3a8f06024f478 Mon Sep 17 00:00:00 2001
From: Anusha Vattam <avattam@adobe.com>
Date: Thu, 25 Jun 2020 19:40:48 -0500
Subject: [PATCH 0620/1718] MC:32658:MyAccount :: Order Details :: Order
 Details by Order Number Taxes and Discounts

- Added new test changes for discounts descriptions
---
 .../Model/Resolver/OrderItem/DataProvider.php        |  2 +-
 .../Sales/RetrieveOrdersByOrderNumberTest.php        | 12 ++++++------
 ...rieveOrdersWithBundleProductByOrderNumberTest.php |  9 +++++++--
 ...rule_10_percent_off_with_discount_on_shipping.php |  6 +++++-
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderItem/DataProvider.php b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderItem/DataProvider.php
index d33b28ffb1d91..20cdd7313b8ad 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderItem/DataProvider.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderItem/DataProvider.php
@@ -227,7 +227,7 @@ private function getDiscountDetails(OrderInterface $associatedOrder, OrderItemIn
             $discounts [] = [
                 'label' => $associatedOrder->getDiscountDescription() ?? __('Discount'),
                 'amount' => [
-                    'value' => $orderItem->getDiscountAmount() ?? 0,
+                    'value' => abs($orderItem->getDiscountAmount()) ?? 0,
                     'currency' => $associatedOrder->getOrderCurrencyCode()
                 ]
             ];
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php
index 8c72f9ed368ff..0d3f28b612b8b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php
@@ -157,7 +157,7 @@ public function testCustomerOrdersSimpleProductWithTaxesAndDiscounts()
         // Asserting discounts on order item level
         $this->assertEquals(4, $customerOrderResponse[0]['items'][0]['discounts'][0]['amount']['value']);
         $this->assertEquals('USD', $customerOrderResponse[0]['items'][0]['discounts'][0]['amount']['currency']);
-        $this->assertEquals('Discount', $customerOrderResponse[0]['items'][0]['discounts'][0]['label']);
+        $this->assertEquals('Discount Label for 10% off', $customerOrderResponse[0]['items'][0]['discounts'][0]['label']);
         $customerOrderItem = $customerOrderResponse[0];
         $this->assertTotalsWithTaxesAndDiscounts($customerOrderItem['total']);
         $this->deleteOrder();
@@ -188,7 +188,7 @@ private function assertTotalsWithTaxesAndDiscounts(array $customerOrderItemTotal
                 'total_amount' => ['value' => 20, 'currency' =>'USD'],
                 'discounts' => [
                     0 => ['amount'=>['value'=> 2, 'currency' =>'USD'],
-                        'label' => 'Discount'
+                        'label' => 'Discount Label for 10% off'
                     ]
                 ],
                 'taxes'=> [
@@ -201,7 +201,7 @@ private function assertTotalsWithTaxesAndDiscounts(array $customerOrderItemTotal
             ],
             'discounts' => [
                 0 => ['amount' => [ 'value' => 6, 'currency' =>'USD'],
-                    'label' => 'Discount'
+                    'label' => 'Discount Label for 10% off'
                 ]
             ]
         ];
@@ -233,7 +233,7 @@ public function testCustomerOrdersSimpleProductWithTaxesAndDiscountsWithTwoRules
         // Asserting discounts on order item level
         $this->assertEquals(4, $customerOrderResponse[0]['items'][0]['discounts'][0]['amount']['value']);
         $this->assertEquals('USD', $customerOrderResponse[0]['items'][0]['discounts'][0]['amount']['currency']);
-        $this->assertEquals('Discount', $customerOrderResponse[0]['items'][0]['discounts'][0]['label']);
+        $this->assertEquals('Discount Label for 10% off', $customerOrderResponse[0]['items'][0]['discounts'][0]['label']);
         $customerOrderItem = $customerOrderResponse[0];
         $this->assertTotalsWithTaxesAndDiscountsWithTwoRules($customerOrderItem['total']);
         $this->deleteOrder();
@@ -270,7 +270,7 @@ private function assertTotalsWithTaxesAndDiscountsWithTwoRules(array $customerOr
                 'total_amount' => ['value' => 20, 'currency' =>'USD'],
                 'discounts' => [
                     0 => ['amount'=>['value'=> 2, 'currency' =>'USD'],
-                        'label' => 'Discount'
+                        'label' => 'Discount Label for 10% off'
                     ]
                 ],
                 'taxes'=> [
@@ -288,7 +288,7 @@ private function assertTotalsWithTaxesAndDiscountsWithTwoRules(array $customerOr
             ],
             'discounts' => [
                 0 => ['amount' => [ 'value' => 6, 'currency' =>'USD'],
-                    'label' => 'Discount'
+                    'label' => 'Discount Label for 10% off'
                 ]
             ]
         ];
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithBundleProductByOrderNumberTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithBundleProductByOrderNumberTest.php
index daa93bbb2c991..f0a63b10b2a5b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithBundleProductByOrderNumberTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithBundleProductByOrderNumberTest.php
@@ -145,6 +145,11 @@ public function testGetCustomerOrderBundleProductWithTaxesAndDiscounts()
             'bundle-product-two-dropdown-options-simple1-simple2',
             $bundledItemInTheOrder['product_sku']
         );
+        $this->assertEquals(6, $bundledItemInTheOrder['discounts'][0]['amount']['value']);
+        $this->assertEquals(
+            'Discount Label for 10% off',
+            $bundledItemInTheOrder["discounts"][0]['label']
+        );
         $this->assertArrayHasKey('bundle_options', $bundledItemInTheOrder);
         $childItemsInTheOrder = $bundledItemInTheOrder['bundle_options'];
         $this->assertNotEmpty($childItemsInTheOrder);
@@ -183,7 +188,7 @@ private function assertTotalsOnBundleProductWithTaxesAndDiscounts(array $custome
                 'total_amount' => ['value' => 20],
                 'discounts' => [
                     0 => ['amount'=>['value'=> 2],
-                        'label' => 'Discount'
+                        'label' => 'Discount Label for 10% off'
                     ]
                 ],
                 'taxes'=> [
@@ -196,7 +201,7 @@ private function assertTotalsOnBundleProductWithTaxesAndDiscounts(array $custome
             ],
             'discounts' => [
                 0 => ['amount' => [ 'value' => 8, 'currency' =>'USD'],
-                    'label' => 'Discount'
+                    'label' => 'Discount Label for 10% off'
                 ]
             ]
         ];
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_10_percent_off_with_discount_on_shipping.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_10_percent_off_with_discount_on_shipping.php
index 30c4ebbdfa98f..6ac4f65f36e5f 100644
--- a/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_10_percent_off_with_discount_on_shipping.php
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_10_percent_off_with_discount_on_shipping.php
@@ -27,7 +27,11 @@
         'discount_step' => 0,
         'apply_to_shipping' => 1,
         'stop_rules_processing' => 1,
-        'website_ids' => [$websiteId]
+        'website_ids' => [$websiteId],
+         'store_labels' => [
+            'store_id' => 0,
+            'store_label' => 'Discount Label for 10% off',
+         ]
     ]
 );
 

From e7089bbbf2ceddcf762e08fb0b5d43560dbbe85e Mon Sep 17 00:00:00 2001
From: Anusha Vattam <avattam@adobe.com>
Date: Thu, 25 Jun 2020 19:44:49 -0500
Subject: [PATCH 0621/1718] MC:32658:MyAccount :: Order Details :: Order
 Details by Order Number Taxes and Discounts

- Added short description on order totals
---
 app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php
index a20639ab4c02c..6f7b943bf6ca2 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php
@@ -13,6 +13,9 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Sales\Api\Data\OrderInterface;
 
+/**
+ * Resolve order totals taxes and discounts for order
+ */
 class OrderTotal implements ResolverInterface
 {
     /**

From e715fdcea41e821441ff17ee360b352f91f3248a Mon Sep 17 00:00:00 2001
From: Tu <ladiesman9x@gmail.com>
Date: Fri, 26 Jun 2020 09:15:33 +0700
Subject: [PATCH 0622/1718] Fix issue extend match class in style-old admin

---
 .../adminhtml/Magento/backend/web/css/styles-old.less       | 2 +-
 .../adminhtml/Magento/backend/web/mui/styles/_table.less    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/web/css/styles-old.less b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
index 247316ab0361b..3087e7762a2d8 100644
--- a/app/design/adminhtml/Magento/backend/web/css/styles-old.less
+++ b/app/design/adminhtml/Magento/backend/web/css/styles-old.less
@@ -5105,7 +5105,7 @@
 .adminhtml-locks-index {
     .admin__scope-old {
         .grid .col-name {
-            &:extend(.col-570 all);
+            &:extend(.col-570-max all);
         }
     }
 }
diff --git a/app/design/adminhtml/Magento/backend/web/mui/styles/_table.less b/app/design/adminhtml/Magento/backend/web/mui/styles/_table.less
index 70ae82045b3d1..bdd4ba3ec4fb5 100644
--- a/app/design/adminhtml/Magento/backend/web/mui/styles/_table.less
+++ b/app/design/adminhtml/Magento/backend/web/mui/styles/_table.less
@@ -414,7 +414,7 @@ td.col-type {
     }
 
     tbody tr:nth-child(odd) td {
-        &:extend(.data-table tbody tr:nth-child(odd) td);
+        &:extend(.data-table tbody tr:nth-child(odd) td all);
     }
 
     tfoot tr:last-child td {
@@ -601,13 +601,13 @@ td.col-type {
         }
 
         .label {
-            &:extend(.grid-actions .export .label);
+            &:extend(.grid-actions .export .label all);
             padding: 0;
             width: auto;
         }
 
         .action- {
-            &:extend(.grid-actions .export .action-);
+            &:extend(.grid-actions .export .action- all);
             vertical-align: top;
         }
     }

From 7745875dc39a0d4b0148bb063733744f95965808 Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@magento.com>
Date: Fri, 26 Jun 2020 00:02:44 -0500
Subject: [PATCH 0623/1718] MC-31618: Move static config to files - PLUGIN_LIST

- Fix static tests;;
---
 .../Magento/TestFramework/Application.php     |  1 -
 .../Interception/PluginListGeneratorTest.php  | 33 ++++++++++++++++---
 .../Console/Command/DiCompileCommand.php      | 31 +++++++++--------
 .../Module/Di/App/Task/OperationFactory.php   | 18 +++++-----
 .../Console/Command/DiCompileCommandTest.php  | 25 +++++++++++++-
 5 files changed, 79 insertions(+), 29 deletions(-)

diff --git a/dev/tests/integration/framework/Magento/TestFramework/Application.php b/dev/tests/integration/framework/Magento/TestFramework/Application.php
index d375fbdf7d43e..f0ce2e24545eb 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Application.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Application.php
@@ -714,7 +714,6 @@ protected function getCustomDirs()
             DirectoryList::TMP => [$path => "{$var}/tmp"],
             DirectoryList::UPLOAD => [$path => "{$var}/upload"],
             DirectoryList::PUB => [$path => "{$this->installDir}/pub"],
-            DirectoryList::GENERATED_METADATA => [$path => "{$generated}/metadata"]
         ];
         return $customDirs;
     }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php
index 04babcf726547..b386140fc9e1c 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php
@@ -45,11 +45,34 @@ protected function setUp(): void
     {
         $this->application = Bootstrap::getInstance()->getBootstrap()->getApplication();
         $this->directoryList = new DirectoryList(BP, $this->getCustomDirs());
-        $this->file = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            DriverInterface::class
+        $this->file = Bootstrap::getObjectManager()->create(DriverInterface::class);
+        $reader = Bootstrap::getObjectManager()->create(
+            \Magento\Framework\ObjectManager\Config\Reader\Dom\Proxy::class
         );
-        $this->model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            PluginListGenerator::class
+        $scopeConfig = Bootstrap::getObjectManager()->create(\Magento\Framework\Config\Scope::class);
+        $omConfig = Bootstrap::getObjectManager()->create(
+            \Magento\Framework\Interception\ObjectManager\Config\Developer::class
+        );
+        $relations = Bootstrap::getObjectManager()->create(
+            \Magento\Framework\ObjectManager\Relations\Runtime::class
+        );
+        $definitions = Bootstrap::getObjectManager()->create(
+            \Magento\Framework\Interception\Definition\Runtime::class
+        );
+        $classDefinitions = Bootstrap::getObjectManager()->create(
+            \Magento\Framework\ObjectManager\Definition\Runtime::class
+        );
+        $logger = Bootstrap::getObjectManager()->create(\Psr\Log\LoggerInterface\Proxy::class);
+        $this->model = new PluginListGenerator(
+            $reader,
+            $scopeConfig,
+            $omConfig,
+            $relations,
+            $definitions,
+            $classDefinitions,
+            $logger,
+            $this->directoryList,
+            ['primary', 'global']
         );
     }
 
@@ -71,7 +94,7 @@ public function testPluginListConfigGeneration()
                 2 => 'response-http-page-cache'
             ]
         ];
-        // Here in test I assume that this class below has 3 plugins. But the amount of plugins and class itself
+        // Here in test is assumed that this class below has 3 plugins. But the amount of plugins and class itself
         // may vary. If it is changed, please update these assertions.
         $this->assertArrayHasKey(
             'Magento\\Framework\\App\\Response\\Http_sendResponse___self',
diff --git a/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php b/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php
index cfd5da0d6b7ef..4c50a3de4fb31 100644
--- a/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/DiCompileCommand.php
@@ -5,8 +5,9 @@
  */
 namespace Magento\Setup\Console\Command;
 
-use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Filesystem\DriverInterface;
+use Magento\Framework\Filesystem\Io\File;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Magento\Framework\Filesystem;
@@ -72,6 +73,11 @@ class DiCompileCommand extends Command
      */
     private $componentRegistrar;
 
+    /**
+     * @var File
+     */
+    private $file;
+
     /**
      * Constructor
      *
@@ -82,6 +88,8 @@ class DiCompileCommand extends Command
      * @param Filesystem $filesystem
      * @param DriverInterface $fileDriver
      * @param \Magento\Framework\Component\ComponentRegistrar $componentRegistrar
+     * @param File|null $file
+     * @throws \Magento\Setup\Exception
      */
     public function __construct(
         DeploymentConfig $deploymentConfig,
@@ -90,7 +98,8 @@ public function __construct(
         ObjectManagerProvider $objectManagerProvider,
         Filesystem $filesystem,
         DriverInterface $fileDriver,
-        ComponentRegistrar $componentRegistrar
+        ComponentRegistrar $componentRegistrar,
+        File $file = null
     ) {
         $this->deploymentConfig = $deploymentConfig;
         $this->directoryList    = $directoryList;
@@ -99,6 +108,7 @@ public function __construct(
         $this->filesystem       = $filesystem;
         $this->fileDriver       = $fileDriver;
         $this->componentRegistrar  = $componentRegistrar;
+        $this->file = $file ?: ObjectManager::getInstance()->get(File::class);
         parent::__construct();
     }
 
@@ -227,10 +237,10 @@ private function getExcludedModulePaths(array $modulePaths)
     {
         $modulesByBasePath = [];
         foreach ($modulePaths as $modulePath) {
-            $moduleDir = basename($modulePath);
-            $vendorPath = dirname($modulePath);
-            $vendorDir = basename($vendorPath);
-            $basePath = dirname($vendorPath);
+            $moduleDir = $this->file->getPathInfo($modulePath)['basename'];
+            $vendorPath = $this->fileDriver->getParentDirectory($modulePath);
+            $vendorDir = $this->file->getPathInfo($vendorPath)['basename'];
+            $basePath = $this->fileDriver->getParentDirectory($vendorPath);
             $modulesByBasePath[$basePath][$vendorDir][] = $moduleDir;
         }
 
@@ -360,12 +370,9 @@ private function configureObjectManager(OutputInterface $output)
     private function getOperationsConfiguration(
         array $compiledPathsList
     ) {
-        $excludePatterns = [];
-        foreach ($this->excludedPathsList as $excludedPaths) {
-            $excludePatterns = array_merge($excludedPaths, $excludePatterns);
-        }
+        $excludePatterns = array_merge([], ...array_values($this->excludedPathsList));
 
-        $operations = [
+        return [
             OperationFactory::PROXY_GENERATOR => [],
             OperationFactory::REPOSITORY_GENERATOR => [
                 'paths' => $compiledPathsList['application'],
@@ -402,7 +409,5 @@ private function getOperationsConfiguration(
             OperationFactory::APPLICATION_ACTION_LIST_GENERATOR => [],
             OperationFactory::PLUGIN_LIST_GENERATOR => [],
         ];
-
-        return $operations;
     }
 }
diff --git a/setup/src/Magento/Setup/Module/Di/App/Task/OperationFactory.php b/setup/src/Magento/Setup/Module/Di/App/Task/OperationFactory.php
index cd6bf213f8027..07ff60c367392 100644
--- a/setup/src/Magento/Setup/Module/Di/App/Task/OperationFactory.php
+++ b/setup/src/Magento/Setup/Module/Di/App/Task/OperationFactory.php
@@ -19,47 +19,47 @@ class OperationFactory
     private $objectManager;
 
     /**
-     * Area
+     * Area config generator operation definition
      */
     const AREA_CONFIG_GENERATOR = 'area';
 
     /**
-     * Interception
+     * Interception operation definition
      */
     const INTERCEPTION = 'interception';
 
     /**
-     * Interception cache
+     * Interception cache operation definition
      */
     const INTERCEPTION_CACHE = 'interception_cache';
 
     /**
-     * Repository generator
+     * Repository generator operation definition
      */
     const REPOSITORY_GENERATOR = 'repository_generator';
 
     /**
-     * Proxy generator
+     * Proxy generator operation definition
      */
     const PROXY_GENERATOR = 'proxy_generator';
 
     /**
-     * Service data attributes generator
+     * Service data attributes generator operation definition
      */
     const DATA_ATTRIBUTES_GENERATOR = 'extension_attributes_generator';
 
     /**
-     * Application code generator
+     * Application code generator operation definition
      */
     const APPLICATION_CODE_GENERATOR = 'application_code_generator';
 
     /**
-     * Application action list generator
+     * Application action list generator operation definition
      */
     const APPLICATION_ACTION_LIST_GENERATOR = 'application_action_list_generator';
 
     /**
-     * Plugin list generator
+     * Plugin list generator operation definition
      */
     const PLUGIN_LIST_GENERATOR = 'plugin_list_generator';
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/DiCompileCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/DiCompileCommandTest.php
index a085eb0b20611..0386353a0b2df 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/DiCompileCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/DiCompileCommandTest.php
@@ -65,6 +65,9 @@ class DiCompileCommandTest extends TestCase
     /** @var OutputFormatterInterface|MockObject */
     private $outputFormatterMock;
 
+    /** @var Filesystem\Io\File|MockObject */
+    private $fileMock;
+
     protected function setUp(): void
     {
         $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
@@ -96,6 +99,14 @@ protected function setUp(): void
         $this->fileDriverMock = $this->getMockBuilder(File::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->fileDriverMock->method('getParentDirectory')->willReturnMap(
+            [
+                ['/path/to/module/one', '/path/to/module'],
+                ['/path/to/module', '/path/to'],
+                ['/path (1)/to/module/two', '/path (1)/to/module'],
+                ['/path (1)/to/module', '/path (1)/to'],
+            ]
+        );
         $this->componentRegistrarMock = $this->createMock(ComponentRegistrar::class);
         $this->componentRegistrarMock->expects($this->any())->method('getPaths')->willReturnMap([
             [ComponentRegistrar::MODULE, ['/path/to/module/one', '/path (1)/to/module/two']],
@@ -108,6 +119,17 @@ protected function setUp(): void
         $this->outputMock = $this->getMockForAbstractClass(OutputInterface::class);
         $this->outputMock->method('getFormatter')
             ->willReturn($this->outputFormatterMock);
+        $this->fileMock = $this->getMockBuilder(Filesystem\Io\File::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->fileMock->method('getPathInfo')->willReturnMap(
+            [
+                ['/path/to/module/one', ['basename' => 'one']],
+                ['/path/to/module', ['basename' => 'module']],
+                ['/path (1)/to/module/two', ['basename' => 'two']],
+                ['/path (1)/to/module', ['basename' => 'module']],
+            ]
+        );
 
         $this->command = new DiCompileCommand(
             $this->deploymentConfigMock,
@@ -116,7 +138,8 @@ protected function setUp(): void
             $objectManagerProviderMock,
             $this->filesystemMock,
             $this->fileDriverMock,
-            $this->componentRegistrarMock
+            $this->componentRegistrarMock,
+            $this->fileMock
         );
     }
 

From c3855c831a9e401f9bc1fc1cd5722debb7281f83 Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Thu, 25 Jun 2020 16:22:36 +0300
Subject: [PATCH 0624/1718] minor change

---
 .../Model/ForgotPasswordToken/GetCustomerByTokenTest.php     | 2 +-
 .../Model/ForgotPasswordToken/GetCustomerByTokenTest.php     | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Unit/Model/ForgotPasswordToken/GetCustomerByTokenTest.php b/app/code/Magento/Customer/Test/Unit/Model/ForgotPasswordToken/GetCustomerByTokenTest.php
index 0de1912ee4f7e..67dbb136297ff 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/ForgotPasswordToken/GetCustomerByTokenTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/ForgotPasswordToken/GetCustomerByTokenTest.php
@@ -54,7 +54,7 @@ class GetCustomerByTokenTest extends TestCase
      */
     private $model;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->searchCriteriaBuilderMock = $this->createMock(SearchCriteriaBuilder::class);
         $this->searchCriteriaMock = $this->createMock(SearchCriteria::class);
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/ForgotPasswordToken/GetCustomerByTokenTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/ForgotPasswordToken/GetCustomerByTokenTest.php
index 10a30f10e96a7..55e9a9572d229 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/ForgotPasswordToken/GetCustomerByTokenTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/ForgotPasswordToken/GetCustomerByTokenTest.php
@@ -24,7 +24,7 @@ class GetCustomerByTokenTest extends TestCase
      */
     private $customerByToken;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
         $this->customerByToken = $this->objectManager->get(GetCustomerByToken::class);
@@ -35,7 +35,8 @@ protected function setUp()
      */
     public function testExecuteWithNoSuchEntityException(): void
     {
-        $this->expectExceptionMessage('No such entity with rp_token = ' . self::RESET_PASSWORD);
+        self::expectException(NoSuchEntityException::class);
+        self::expectExceptionMessage('No such entity with rp_token = ' . self::RESET_PASSWORD);
         $this->customerByToken->execute(self::RESET_PASSWORD);
     }
 }

From 0b7dff4b607be226cdac7564fcbdf7597478cfd5 Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@magento.com>
Date: Fri, 26 Jun 2020 02:37:31 -0500
Subject: [PATCH 0625/1718] MC-31618: Move static config to files - PLUGIN_LIST

- Fix static tests;
---
 .../Magento/Framework/Interception/PluginListGeneratorTest.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php
index b386140fc9e1c..e2444dc44c5c0 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php
@@ -47,6 +47,7 @@ protected function setUp(): void
         $this->directoryList = new DirectoryList(BP, $this->getCustomDirs());
         $this->file = Bootstrap::getObjectManager()->create(DriverInterface::class);
         $reader = Bootstrap::getObjectManager()->create(
+        // phpstan:ignore "Class Magento\Framework\ObjectManager\Config\Reader\Dom\Proxy not found."
             \Magento\Framework\ObjectManager\Config\Reader\Dom\Proxy::class
         );
         $scopeConfig = Bootstrap::getObjectManager()->create(\Magento\Framework\Config\Scope::class);
@@ -62,6 +63,7 @@ protected function setUp(): void
         $classDefinitions = Bootstrap::getObjectManager()->create(
             \Magento\Framework\ObjectManager\Definition\Runtime::class
         );
+        // phpstan:ignore "Class Psr\Log\LoggerInterface\Proxy not found."
         $logger = Bootstrap::getObjectManager()->create(\Psr\Log\LoggerInterface\Proxy::class);
         $this->model = new PluginListGenerator(
             $reader,

From 07d6a66bec89af4bcaa7d57988798c7e9463da05 Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@magento.com>
Date: Fri, 26 Jun 2020 04:35:38 -0500
Subject: [PATCH 0626/1718] MC-31618: Move static config to files - PLUGIN_LIST

- Remove integration test for test;
---
 .../Interception/PluginListGeneratorTest.php  | 140 ------------------
 1 file changed, 140 deletions(-)
 delete mode 100644 dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php
deleted file mode 100644
index e2444dc44c5c0..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\Interception;
-
-use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Filesystem\DriverInterface;
-use Magento\TestFramework\Application;
-use Magento\TestFramework\Helper\Bootstrap;
-
-class PluginListGeneratorTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * Generated plugin list config for frontend scope
-     */
-    const CACHE_ID = 'primary|global|frontend|plugin-list';
-
-    /**
-     * @var PluginListGenerator
-     */
-    private $model;
-
-    /**
-     * @var DirectoryList
-     */
-    private $directoryList;
-
-    /**
-     * @var DriverInterface
-     */
-    private $file;
-
-    /**
-     * @var Application
-     */
-    private $application;
-
-    /**
-     * @inheritDoc
-     */
-    protected function setUp(): void
-    {
-        $this->application = Bootstrap::getInstance()->getBootstrap()->getApplication();
-        $this->directoryList = new DirectoryList(BP, $this->getCustomDirs());
-        $this->file = Bootstrap::getObjectManager()->create(DriverInterface::class);
-        $reader = Bootstrap::getObjectManager()->create(
-        // phpstan:ignore "Class Magento\Framework\ObjectManager\Config\Reader\Dom\Proxy not found."
-            \Magento\Framework\ObjectManager\Config\Reader\Dom\Proxy::class
-        );
-        $scopeConfig = Bootstrap::getObjectManager()->create(\Magento\Framework\Config\Scope::class);
-        $omConfig = Bootstrap::getObjectManager()->create(
-            \Magento\Framework\Interception\ObjectManager\Config\Developer::class
-        );
-        $relations = Bootstrap::getObjectManager()->create(
-            \Magento\Framework\ObjectManager\Relations\Runtime::class
-        );
-        $definitions = Bootstrap::getObjectManager()->create(
-            \Magento\Framework\Interception\Definition\Runtime::class
-        );
-        $classDefinitions = Bootstrap::getObjectManager()->create(
-            \Magento\Framework\ObjectManager\Definition\Runtime::class
-        );
-        // phpstan:ignore "Class Psr\Log\LoggerInterface\Proxy not found."
-        $logger = Bootstrap::getObjectManager()->create(\Psr\Log\LoggerInterface\Proxy::class);
-        $this->model = new PluginListGenerator(
-            $reader,
-            $scopeConfig,
-            $omConfig,
-            $relations,
-            $definitions,
-            $classDefinitions,
-            $logger,
-            $this->directoryList,
-            ['primary', 'global']
-        );
-    }
-
-    /**
-     * Test plugin list configuration generation and load.
-     */
-    public function testPluginListConfigGeneration()
-    {
-        $scopes = ['frontend'];
-        $this->model->write($scopes);
-        $configData = $this->model->load(self::CACHE_ID);
-        $this->assertNotEmpty($configData[0]);
-        $this->assertNotEmpty($configData[1]);
-        $this->assertNotEmpty($configData[2]);
-        $expected = [
-            1 => [
-                0 => 'genericHeaderPlugin',
-                1 => 'asyncCssLoad',
-                2 => 'response-http-page-cache'
-            ]
-        ];
-        // Here in test is assumed that this class below has 3 plugins. But the amount of plugins and class itself
-        // may vary. If it is changed, please update these assertions.
-        $this->assertArrayHasKey(
-            'Magento\\Framework\\App\\Response\\Http_sendResponse___self',
-            $configData[2],
-            'Processed plugin does not exist in the processed plugins array.'
-        );
-        $this->assertSame(
-            $expected,
-            $configData[2]['Magento\\Framework\\App\\Response\\Http_sendResponse___self'],
-            'Plugin configurations are not equal'
-        );
-    }
-
-    /**
-     * Gets customized directory paths
-     *
-     * @return array
-     */
-    private function getCustomDirs()
-    {
-        $path = DirectoryList::PATH;
-        $generated = "{$this->application->getTempDir()}/generated";
-
-        return [
-            DirectoryList::GENERATED_METADATA => [$path => "{$generated}/metadata"],
-        ];
-    }
-
-    /**
-     * @inheritDoc
-     */
-    protected function tearDown(): void
-    {
-        $filePath = $this->directoryList->getPath(DirectoryList::GENERATED_METADATA)
-            . '/' . self::CACHE_ID . '.' . 'php';
-
-        if (file_exists($filePath)) {
-            $this->file->deleteFile($filePath);
-        }
-    }
-}

From 4a8536439280fe98692020ce570e64b32555764d Mon Sep 17 00:00:00 2001
From: Rudolf Vince <rudolf@mediotype.com>
Date: Fri, 26 Jun 2020 11:57:18 +0200
Subject: [PATCH 0627/1718] added extend Action back, updated tests

---
 .../Magento/Wishlist/Controller/Shared/Allcart.php   |  9 +++++++--
 app/code/Magento/Wishlist/Controller/Shared/Cart.php | 11 ++++++++---
 .../Test/Unit/Controller/Shared/AllcartTest.php      | 12 ++++++++----
 .../Test/Unit/Controller/Shared/CartTest.php         |  1 +
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Wishlist/Controller/Shared/Allcart.php b/app/code/Magento/Wishlist/Controller/Shared/Allcart.php
index b6e93d7047c76..17ee92e8c1307 100644
--- a/app/code/Magento/Wishlist/Controller/Shared/Allcart.php
+++ b/app/code/Magento/Wishlist/Controller/Shared/Allcart.php
@@ -8,14 +8,16 @@
 
 namespace Magento\Wishlist\Controller\Shared;
 
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\RequestInterface;
-use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Controller\Result\Forward;
 use Magento\Framework\Controller\Result\Redirect;
+use Magento\Framework\Controller\ResultFactory;
 use Magento\Wishlist\Model\ItemCarrier;
 
-class Allcart implements HttpGetActionInterface
+class Allcart extends Action implements HttpGetActionInterface
 {
     /**
      * @var ItemCarrier
@@ -38,12 +40,14 @@ class Allcart implements HttpGetActionInterface
     private $resultFactory;
 
     /**
+     * @param Context $context
      * @param ItemCarrier $itemCarrier
      * @param RequestInterface $request
      * @param ResultFactory $resultFactory
      * @param WishlistProvider $wishlistProvider
      */
     public function __construct(
+        Context $context,
         ItemCarrier $itemCarrier,
         RequestInterface $request,
         ResultFactory $resultFactory,
@@ -53,6 +57,7 @@ public function __construct(
         $this->request = $request;
         $this->resultFactory = $resultFactory;
         $this->wishlistProvider = $wishlistProvider;
+        parent::__construct($context);
     }
 
     /**
diff --git a/app/code/Magento/Wishlist/Controller/Shared/Cart.php b/app/code/Magento/Wishlist/Controller/Shared/Cart.php
index df023ffc01ddf..b6e7904ae412c 100644
--- a/app/code/Magento/Wishlist/Controller/Shared/Cart.php
+++ b/app/code/Magento/Wishlist/Controller/Shared/Cart.php
@@ -11,14 +11,16 @@
 use Magento\Catalog\Model\Product\Exception as ProductException;
 use Magento\Checkout\Helper\Cart as CartHelper;
 use Magento\Checkout\Model\Cart as CustomerCart;
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Action\Context as ActionContext;
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\RequestInterface;
-use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\App\Response\RedirectInterface;
 use Magento\Framework\Controller\Result\Redirect as ResultRedirect;
+use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Escaper;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Message\ManagerInterface as MessageManagerInterface;
-use Magento\Framework\App\Response\RedirectInterface;
 use Magento\Wishlist\Model\Item;
 use Magento\Wishlist\Model\Item\OptionFactory;
 use Magento\Wishlist\Model\ItemFactory;
@@ -29,7 +31,7 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Cart implements HttpGetActionInterface
+class Cart extends Action implements HttpGetActionInterface
 {
     /**
      * @var CustomerCart
@@ -77,6 +79,7 @@ class Cart implements HttpGetActionInterface
     private $resultFactory;
 
     /**
+     * @param ActionContext $context
      * @param CustomerCart $cart
      * @param OptionFactory $optionFactory
      * @param ItemFactory $itemFactory
@@ -88,6 +91,7 @@ class Cart implements HttpGetActionInterface
      * @param ResultFactory $resultFactory
      */
     public function __construct(
+        ActionContext $context,
         CustomerCart $cart,
         OptionFactory $optionFactory,
         ItemFactory $itemFactory,
@@ -107,6 +111,7 @@ public function __construct(
         $this->redirect = $redirect;
         $this->messageManager = $messageManager;
         $this->resultFactory = $resultFactory;
+        parent::__construct($context);
     }
 
     /**
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php
index 239f65f50c424..e80404b55ffdb 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php
@@ -27,14 +27,14 @@ class AllcartTest extends TestCase
     protected $allcartController;
 
     /**
-     * @var Context
+     * @var WishlistProvider|MockObject
      */
-    protected $context;
+    protected $wishlistProviderMock;
 
     /**
-     * @var WishlistProvider|MockObject
+     * @var Context|MockObject
      */
-    protected $wishlistProviderMock;
+    protected $contextMock;
 
     /**
      * @var ItemCarrier|MockObject
@@ -74,6 +74,9 @@ protected function setUp(): void
         $this->itemCarrierMock = $this->getMockBuilder(ItemCarrier::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->contextMock = $this->getMockBuilder(Context::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->wishlistMock = $this->getMockBuilder(Wishlist::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -100,6 +103,7 @@ protected function setUp(): void
             );
 
         $this->allcartController = new Allcart(
+            $this->contextMock,
             $this->itemCarrierMock,
             $this->requestMock,
             $this->resultFactoryMock,
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php
index 0c284d1c917b9..c0181ab061529 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php
@@ -178,6 +178,7 @@ protected function setUp(): void
             ->getMock();
 
         $this->model = new SharedCart(
+            $this->context,
             $this->cart,
             $this->optionFactory,
             $this->itemFactory,

From f9d4e0abb7d019b1745f9d85fd20927af1c22c42 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Fri, 26 Jun 2020 13:22:16 +0300
Subject: [PATCH 0628/1718] fix samples accessible when product is out of stock

---
 .../Controller/Download/Sample.php            | 103 +++++++++++++-----
 .../Test/Mftf/Data/ProductData.xml            |  11 ++
 ...oadableProductSamplesAreAccessibleTest.xml |  78 +++++++++++++
 3 files changed, 165 insertions(+), 27 deletions(-)
 create mode 100644 app/code/Magento/Downloadable/Test/Mftf/Test/VerifyOutOfStockDownloadableProductSamplesAreAccessibleTest.xml

diff --git a/app/code/Magento/Downloadable/Controller/Download/Sample.php b/app/code/Magento/Downloadable/Controller/Download/Sample.php
index e2561092a7592..839083b320878 100644
--- a/app/code/Magento/Downloadable/Controller/Download/Sample.php
+++ b/app/code/Magento/Downloadable/Controller/Download/Sample.php
@@ -3,14 +3,21 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 declare(strict_types=1);
 
 namespace Magento\Downloadable\Controller\Download;
 
+use Magento\Downloadable\Controller\Download;
 use Magento\Downloadable\Helper\Download as DownloadHelper;
+use Magento\Downloadable\Helper\File;
 use Magento\Downloadable\Model\RelatedProductRetriever;
 use Magento\Downloadable\Model\Sample as SampleModel;
+use Magento\Downloadable\Model\SampleFactory;
 use Magento\Framework\App\Action\Context;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\CatalogInventory\Api\StockConfigurationInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ResponseInterface;
 
 /**
@@ -18,24 +25,49 @@
  *
  * @SuppressWarnings(PHPMD.AllPurposeAction)
  */
-class Sample extends \Magento\Downloadable\Controller\Download
+class Sample extends Download
 {
     /**
      * @var RelatedProductRetriever
      */
     private $relatedProductRetriever;
 
+    /**
+     * @var File
+     */
+    private $file;
+
+    /**
+     * @var SampleFactory
+     */
+    private $sampleFactory;
+
+    /**
+     * @var StockConfigurationInterface
+     */
+    private $stockConfiguration;
+
     /**
      * @param Context $context
      * @param RelatedProductRetriever $relatedProductRetriever
+     * @param File|null $file
+     * @param SampleFactory|null $sampleFactory
+     * @param StockConfigurationInterface|null $stockConfiguration
      */
     public function __construct(
         Context $context,
-        RelatedProductRetriever $relatedProductRetriever
+        RelatedProductRetriever $relatedProductRetriever,
+        ?File $file = null,
+        ?SampleFactory $sampleFactory = null,
+        ?StockConfigurationInterface $stockConfiguration = null
     ) {
         parent::__construct($context);
 
         $this->relatedProductRetriever = $relatedProductRetriever;
+        $this->file = $file ?: ObjectManager::getInstance()->get(File::class);
+        $this->sampleFactory = $sampleFactory ?: ObjectManager::getInstance()->get(SampleFactory::class);
+        $this->stockConfiguration = $stockConfiguration
+            ?: ObjectManager::getInstance()->get(StockConfigurationInterface::class);
     }
 
     /**
@@ -47,43 +79,60 @@ public function execute()
     {
         $sampleId = $this->getRequest()->getParam('sample_id', 0);
         /** @var SampleModel $sample */
-        $sample = $this->_objectManager->create(SampleModel::class);
+        $sample = $this->sampleFactory->create();
         $sample->load($sampleId);
-        if ($sample->getId() && $this->isProductSalable($sample)) {
-            $resource = '';
-            $resourceType = '';
-            if ($sample->getSampleType() == DownloadHelper::LINK_TYPE_URL) {
-                $resource = $sample->getSampleUrl();
-                $resourceType = DownloadHelper::LINK_TYPE_URL;
-            } elseif ($sample->getSampleType() == DownloadHelper::LINK_TYPE_FILE) {
-                /** @var \Magento\Downloadable\Helper\File $helper */
-                $helper = $this->_objectManager->get(\Magento\Downloadable\Helper\File::class);
-                $resource = $helper->getFilePath($sample->getBasePath(), $sample->getSampleFile());
-                $resourceType = DownloadHelper::LINK_TYPE_FILE;
-            }
-            try {
-                $this->_processDownload($resource, $resourceType);
-                // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
-                exit(0);
-            } catch (\Exception $e) {
-                $this->messageManager->addError(
-                    __('Sorry, there was an error getting requested content. Please contact the store owner.')
-                );
-            }
+        if ($this->isCanDownload($sample)) {
+            $this->download($sample);
         }
 
         return $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl());
     }
 
     /**
-     * Check is related product salable.
+     * Is sample can be downloaded
      *
      * @param SampleModel $sample
      * @return bool
      */
-    private function isProductSalable(SampleModel $sample): bool
+    private function isCanDownload(SampleModel $sample): bool
     {
         $product = $this->relatedProductRetriever->getProduct((int) $sample->getProductId());
-        return $product ? $product->isSalable() : false;
+        if ($product && $sample->getId()) {
+            $isProductEnabled = (int) $product->getStatus() === Status::STATUS_ENABLED;
+
+            return $product->isSalable() || $this->stockConfiguration->isShowOutOfStock() && $isProductEnabled;
+        }
+
+        return false;
+    }
+
+    /**
+     * Download process
+     *
+     * @param SampleModel $sample
+     * @return void
+     */
+    private function download(SampleModel $sample): void
+    {
+        $resource = '';
+        $resourceType = '';
+
+        if ($sample->getSampleType() === DownloadHelper::LINK_TYPE_URL) {
+            $resource = $sample->getSampleUrl();
+            $resourceType = DownloadHelper::LINK_TYPE_URL;
+        } elseif ($sample->getSampleType() === DownloadHelper::LINK_TYPE_FILE) {
+            $resource = $this->file->getFilePath($sample->getBasePath(), $sample->getSampleFile());
+            $resourceType = DownloadHelper::LINK_TYPE_FILE;
+        }
+
+        try {
+            $this->_processDownload($resource, $resourceType);
+            // phpcs:ignore Magento2.Security.LanguageConstruct.ExitUsage
+            exit(0);
+        } catch (\Exception $e) {
+            $this->messageManager->addErrorMessage(
+                __('Sorry, there was an error getting requested content. Please contact the store owner.')
+            );
+        }
     }
 }
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml
index 2986532ef1138..9dca730dfd5c5 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Data/ProductData.xml
@@ -105,4 +105,15 @@
         <requiredEntity type="downloadable_link">downloadableLink1</requiredEntity>
         <requiredEntity type="downloadable_link">downloadableLink2</requiredEntity>
     </entity>
+    <entity name="DownloadableProductWithoutLinksOutOfStock" type="product">
+        <data key="sku" unique="suffix">downloadableproduct</data>
+        <data key="type_id">downloadable</data>
+        <data key="attribute_set_id">4</data>
+        <data key="name" unique="suffix">DownloadableProduct</data>
+        <data key="price">99.99</data>
+        <data key="quantity">50</data>
+        <data key="status">1</data>
+        <data key="is_in_stock">0</data>
+        <data key="urlKey" unique="suffix">downloadableproduct</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/VerifyOutOfStockDownloadableProductSamplesAreAccessibleTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/VerifyOutOfStockDownloadableProductSamplesAreAccessibleTest.xml
new file mode 100644
index 0000000000000..8913ff574264f
--- /dev/null
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/VerifyOutOfStockDownloadableProductSamplesAreAccessibleTest.xml
@@ -0,0 +1,78 @@
+<?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="VerifyOutOfStockDownloadableProductSamplesAreAccessibleTest">
+        <annotations>
+            <features value="Downloadable"/>
+            <stories value="Downloadable product"/>
+            <title value="Samples of Downloadable Products are accessible, if product is out of stock"/>
+            <description value="Samples of Downloadable Products are accessible, if product is out of stock"/>
+            <severity value="MAJOR"/>
+            <group value="downloadable"/>
+            <group value="catalog"/>
+        </annotations>
+        <before>
+            <!-- Enable show out of stock product -->
+            <magentoCLI stepKey="enableShowOutOfStockProduct" command="config:set cataloginventory/options/show_out_of_stock 1"/>
+
+            <!-- Add downloadable domains -->
+            <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add example.com static.magento.com"/>
+
+            <!-- Create category -->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+
+            <!-- Create downloadable product -->
+            <createData entity="DownloadableProductWithoutLinksOutOfStock" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <!-- Add downloadable link -->
+            <createData entity="downloadableLink1" stepKey="addDownloadableLink">
+                <requiredEntity createDataKey="createProduct"/>
+            </createData>
+
+            <!-- Add downloadable sample -->
+            <createData entity="DownloadableSample" stepKey="addDownloadableSample">
+                <requiredEntity createDataKey="createProduct"/>
+            </createData>
+        </before>
+        <after>
+            <!-- Disable show out of stock product -->
+            <magentoCLI stepKey="enableShowOutOfStockProduct" command="config:set cataloginventory/options/show_out_of_stock 0"/>
+
+            <!-- Remove downloadable domains -->
+            <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove example.com static.magento.com"/>
+
+            <!-- Delete product -->
+            <deleteData createDataKey="createProduct" stepKey="deleteDownloadableProduct"/>
+
+            <!-- Delete category -->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+            <!-- Admin logout -->
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
+        </after>
+
+        <!-- Open Downloadable product from precondition on Storefront -->
+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openStorefrontProductPage">
+            <argument name="productUrl" value="$createProduct.custom_attributes[url_key]$"/>
+        </actionGroup>
+
+        <!-- Sample url is accessible -->
+        <actionGroup ref="AssertStorefrontSeeElementActionGroup" stepKey="seeDownloadableSample">
+            <argument name="selector" value="{{StorefrontDownloadableProductSection.downloadableSampleLabel(DownloadableSample.title)}}"/>
+        </actionGroup>
+        <click selector="{{StorefrontDownloadableProductSection.downloadableSampleLabel(DownloadableSample.title)}}" stepKey="clickDownloadableSample"/>
+        <switchToNextTab stepKey="switchToSampleTab"/>
+        <wait time="2" stepKey="waitToMakeSureThereWillBeNoRedirectToHomePage"/>
+        <seeInCurrentUrl url="downloadable/download/sample/sample_id/" stepKey="amOnSampleDownloadPage"/>
+        <closeTab stepKey="closeSampleTab"/>
+    </test>
+</tests>

From d64ef3df4c86ba6c3bcc45b2cd4bebd2c3daa299 Mon Sep 17 00:00:00 2001
From: Oleksandr Melnyk <sasha19957099@gmail.com>
Date: Fri, 26 Jun 2020 14:09:39 +0300
Subject: [PATCH 0629/1718] magento/magento2#28579:DependencyTest does not
 analyze GraphQL schema files - fixed reaquested changes

---
 .../Integrity/DeclarativeDependencyTest.php   | 24 ++++----
 .../DeclarativeSchemaDependencyProvider.php   | 35 +++++++-----
 .../Dependency/DependencyProvider.php         | 55 +++++++++++--------
 .../GraphQlSchemaDependencyProvider.php       | 27 +++++----
 .../Test/Integrity/GraphQlDependencyTest.php  | 26 +++++----
 ...-1d21-444e-881d-40cea007b24f-testsuite.xml | 19 +++++++
 .../GraphQlSchemaStitching/GraphQlReader.php  | 11 ++--
 7 files changed, 120 insertions(+), 77 deletions(-)
 create mode 100644 dev/tests/static/testsuite/Magento/Test/Integrity/var/allure-results/3a0f0075-1d21-444e-881d-40cea007b24f-testsuite.xml

diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php
index 281f672712f1d..2f9d7f6fdac82 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/DeclarativeDependencyTest.php
@@ -8,15 +8,20 @@
 
 namespace Magento\Test\Integrity;
 
-use Magento\Test\Integrity\Dependency\DeclarativeSchemaDependencyProvider;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\Utility\AggregateInvoker;
 use Magento\Framework\App\Utility\Files;
 use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Test\Integrity\Dependency\DeclarativeSchemaDependencyProvider;
+use Magento\TestFramework\Inspection\Exception as InspectionException;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class DeclarativeDependencyTest
  * Test for undeclared dependencies in declarative schema
  */
-class DeclarativeDependencyTest extends \PHPUnit\Framework\TestCase
+class DeclarativeDependencyTest extends TestCase
 {
     /**
      * @var DeclarativeSchemaDependencyProvider
@@ -26,7 +31,7 @@ class DeclarativeDependencyTest extends \PHPUnit\Framework\TestCase
     /**
      * Sets up data
      *
-     * @throws \Magento\TestFramework\Inspection\Exception
+     * @throws InspectionException
      */
     protected function setUp(): void
     {
@@ -38,16 +43,16 @@ protected function setUp(): void
                 'MAGETWO-43654: The build is running from vendor/magento. DependencyTest is skipped.'
             );
         }
-        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+        $objectManager = ObjectManager::getInstance();
         $this->dependencyProvider = $objectManager->create(DeclarativeSchemaDependencyProvider::class);
     }
 
     /**
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function testUndeclaredDependencies()
     {
-        $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
+        $invoker = new AggregateInvoker($this);
         $invoker(
             /**
              * Check undeclared modules dependencies for specified file
@@ -109,7 +114,7 @@ private function prepareFiles(array $files): array
      */
     private function getErrorMessage(string $id): string
     {
-        $decodedId = $this->dependencyProvider->decodeDependencyId($id);
+        $decodedId = DeclarativeSchemaDependencyProvider::decodeDependencyId($id);
         $entityType = $decodedId['entityType'];
         if ($entityType === DeclarativeSchemaDependencyProvider::SCHEMA_ENTITY_TABLE) {
             $message = sprintf(
@@ -133,14 +138,13 @@ private function getErrorMessage(string $id): string
      *
      * @param string $file
      * @return mixed
-     * @throws \Magento\TestFramework\Inspection\Exception
+     * @throws InspectionException
      */
     private function readJsonFile(string $file, bool $asArray = false)
     {
         $decodedJson = json_decode(file_get_contents($file), $asArray);
         if (null == $decodedJson) {
-            //phpcs:ignore Magento2.Exceptions.DirectThrow
-            throw new \Magento\TestFramework\Inspection\Exception("Invalid Json: $file");
+            throw new InspectionException("Invalid Json: $file");
         }
 
         return $decodedJson;
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php
index a1e94f8baa66a..e1d35431c5e1d 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DeclarativeSchemaDependencyProvider.php
@@ -11,6 +11,8 @@
 use Magento\Framework\App\Utility\Files;
 use Magento\Framework\Component\ComponentRegistrar;
 use Magento\Framework\Setup\Declaration\Schema\Config\Converter;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\TestFramework\Inspection\Exception as InspectionException;
 
 /**
  * Provide information on the dependency between the modules according to the declarative schema.
@@ -22,22 +24,22 @@ class DeclarativeSchemaDependencyProvider
     /**
      * Declarative name for table entity of the declarative schema.
      */
-    const SCHEMA_ENTITY_TABLE = 'table';
+    public const SCHEMA_ENTITY_TABLE = 'table';
 
     /**
      * Declarative name for column entity of the declarative schema.
      */
-    const SCHEMA_ENTITY_COLUMN = 'column';
+    public const SCHEMA_ENTITY_COLUMN = 'column';
 
     /**
      * Declarative name for constraint entity of the declarative schema.
      */
-    const SCHEMA_ENTITY_CONSTRAINT = 'constraint';
+    public const SCHEMA_ENTITY_CONSTRAINT = 'constraint';
 
     /**
      * Declarative name for index entity of the declarative schema.
      */
-    const SCHEMA_ENTITY_INDEX = 'index';
+    public const SCHEMA_ENTITY_INDEX = 'index';
 
     /**
      * @var array
@@ -55,10 +57,9 @@ class DeclarativeSchemaDependencyProvider
     private $dependencyProvider;
 
     /**
-     * DeclarativeSchemaDependencyProvider constructor.
-     * @param \Magento\Test\Integrity\Dependency\DependencyProvider\Proxy $dependencyProvider
+     * @param DependencyProvider $dependencyProvider
      */
-    public function __construct(\Magento\Test\Integrity\Dependency\DependencyProvider\Proxy $dependencyProvider)
+    public function __construct(DependencyProvider $dependencyProvider)
     {
         $this->dependencyProvider = $dependencyProvider;
     }
@@ -116,7 +117,7 @@ public function getUndeclaredModuleDependencies(string $moduleName): array
      *
      * @param string $module
      * @return string
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     private function getSchemaFileNameByModuleName(string $module): string
     {
@@ -194,7 +195,7 @@ private function filterComplexDependency(string $moduleName, array $modules): ar
      * Retrieve declarative schema declaration.
      *
      * @return array
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     private function getDeclarativeSchema(): array
     {
@@ -249,7 +250,7 @@ private function getDeclarativeSchema(): array
      * @param string $entityType
      * @param null|string $entityName
      * @return array
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     private function resolveEntityDependencies(string $tableName, string $entityType, ?string $entityName = null): array
     {
@@ -332,7 +333,7 @@ private function getDependenciesFromFiles($file)
      *
      * @param array $moduleDeclaration
      * @return array
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     private function getDisabledDependencies(array $moduleDeclaration): array
     {
@@ -445,7 +446,7 @@ private function getConstraintDependencies(array $moduleDeclaration): array
      * @param string $tableName
      * @param array $entityDeclaration
      * @return array
-     * @throws \Exception
+     * @throws LocalizedException
      */
     private function getComplexDependency(string $tableName, array $entityDeclaration): array
     {
@@ -471,7 +472,7 @@ private function getComplexDependency(string $tableName, array $entityDeclaratio
      *
      * @param array $moduleDeclaration
      * @return array
-     * @throws \Exception
+     * @throws LocalizedException
      */
     private function getIndexDependencies(array $moduleDeclaration): array
     {
@@ -541,9 +542,11 @@ public static function decodeDependencyId(string $id): array
     /**
      * Collect module dependencies.
      *
-     * @param string $currentModuleName
+     * @param $currentModuleName
      * @param array $dependencies
      * @return array
+     * @throws InspectionException
+     * @throws LocalizedException
      */
     private function collectDependencies($currentModuleName, $dependencies = []): array
     {
@@ -562,11 +565,13 @@ private function collectDependencies($currentModuleName, $dependencies = []): ar
     }
 
     /**
-     * Collect a module dependency.
+     *  Collect a module dependency.
      *
      * @param string $dependencyName
      * @param array $dependency
      * @param string $currentModule
+     * @throws LocalizedException
+     * @throws InspectionException
      */
     private function collectDependency(
         string $dependencyName,
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DependencyProvider.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DependencyProvider.php
index ef05b91ba54d4..fc1eb128db4ff 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DependencyProvider.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/DependencyProvider.php
@@ -10,23 +10,26 @@
 
 use Magento\Framework\App\Utility\Files;
 use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Config\Composer\Package;
+use Magento\TestFramework\Inspection\Exception as InspectionException;
 
 class DependencyProvider
 {
     /**
      * Types of dependency between modules.
      */
-    const TYPE_HARD = 'hard';
+    public const TYPE_HARD = 'hard';
 
     /**
      * The identifier of dependency for mapping.
      */
-    const MAP_TYPE_DECLARED = 'declared';
+    public const MAP_TYPE_DECLARED = 'declared';
 
     /**
      * The identifier of dependency for mapping.
      */
-    const MAP_TYPE_FOUND = 'found';
+    public const MAP_TYPE_FOUND = 'found';
 
     /**
      * @var array
@@ -39,14 +42,9 @@ class DependencyProvider
     private $packageModuleMapping = [];
 
     /**
-     * DependencyProvider constructor.
-     * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \Magento\TestFramework\Inspection\Exception
+     * @var bool
      */
-    public function __construct()
-    {
-        $this->initDeclaredDependencies();
-    }
+    private $isInited = false;
 
     /**
      * Add dependency map items.
@@ -55,9 +53,14 @@ public function __construct()
      * @param $type
      * @param $mapType
      * @param $dependencies
+     * @throws LocalizedException
+     * @throws InspectionException
      */
     public function addDependencies(string $module, string $type, string $mapType, array $dependencies)
     {
+        if (!$this->isInited) {
+            $this->initDeclaredDependencies();
+        }
         $this->mapDependencies[$module][$type][$mapType] = array_merge_recursive(
             $this->getDeclaredDependencies($module, $type, $mapType),
             $dependencies
@@ -71,24 +74,30 @@ public function addDependencies(string $module, string $type, string $mapType, a
      * @param $type
      * @param $mapType
      * @return array
+     * @throws LocalizedException
+     * @throws InspectionException
      */
     public function getDeclaredDependencies(string $module, string $type, string $mapType): array
     {
+        if (!$this->isInited) {
+            $this->initDeclaredDependencies();
+        }
         return $this->mapDependencies[$module][$type][$mapType] ?? [];
     }
 
     /**
      * Initialise map of dependencies.
      *
-     * @throws \Magento\TestFramework\Inspection\Exception
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws InspectionException
+     * @throws LocalizedException
      */
     private function initDeclaredDependencies()
     {
+        $this->isInited = true;
         if (empty($this->mapDependencies)) {
             $jsonFiles = Files::init()->getComposerFiles(ComponentRegistrar::MODULE, false);
             foreach ($jsonFiles as $file) {
-                $json = new \Magento\Framework\Config\Composer\Package($this->readJsonFile($file));
+                $json = new Package($this->readJsonFile($file));
                 $moduleName = $this->convertModuleName($json->get('name'));
                 $require = array_keys((array)$json->get('require'));
                 $this->presetDependencies($moduleName, $require, self::TYPE_HARD);
@@ -104,8 +113,8 @@ private function initDeclaredDependencies()
      * @param string $type
      *
      * @return void
-     * @throws \Magento\TestFramework\Inspection\Exception
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws InspectionException
+     * @throws LocalizedException
      */
     private function presetDependencies(string $moduleName, array $packageNames, string $type): void
     {
@@ -127,8 +136,8 @@ private function presetDependencies(string $moduleName, array $packageNames, str
     /**
      * @param string $jsonName
      * @return string
-     * @throws \Magento\TestFramework\Inspection\Exception
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws InspectionException
+     * @throws LocalizedException
      */
     private function convertModuleName(string $jsonName): string
     {
@@ -158,13 +167,13 @@ private function convertModuleName(string $jsonName): string
      *
      * @param string $file
      * @return mixed
-     * @throws \Magento\TestFramework\Inspection\Exception
+     * @throws InspectionException
      */
     private function readJsonFile(string $file, bool $asArray = false)
     {
         $decodedJson = json_decode(file_get_contents($file), $asArray);
         if (null == $decodedJson) {
-            throw new \Magento\TestFramework\Inspection\Exception("Invalid Json: $file");
+            throw new InspectionException("Invalid Json: $file");
         }
 
         return $decodedJson;
@@ -175,8 +184,8 @@ private function readJsonFile(string $file, bool $asArray = false)
      *
      * @param string $packageName
      * @return null|string
-     * @throws \Magento\TestFramework\Inspection\Exception
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws InspectionException
+     * @throws LocalizedException
      */
     private function getModuleName(string $packageName): ?string
     {
@@ -187,8 +196,8 @@ private function getModuleName(string $packageName): ?string
      * Returns package name on module name mapping.
      *
      * @return array
-     * @throws \Magento\TestFramework\Inspection\Exception
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws InspectionException
+     * @throws LocalizedException
      */
     private function getPackageModuleMapping(): array
     {
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/GraphQlSchemaDependencyProvider.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/GraphQlSchemaDependencyProvider.php
index 961d5e3d2e34b..b5a0b177b35fe 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/GraphQlSchemaDependencyProvider.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Dependency/GraphQlSchemaDependencyProvider.php
@@ -10,6 +10,9 @@
 
 use Magento\Framework\GraphQlSchemaStitching\GraphQlReader;
 use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\TypeReaderComposite;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\TestFramework\Inspection\Exception as InspectionException;
 
 /**
  * Provide information on the dependency between the modules according to the GraphQL schema.
@@ -29,13 +32,11 @@ class GraphQlSchemaDependencyProvider
     private $dependencyProvider;
 
     /**
-     * GraphQlSchemaDependencyProvider constructor.
-     * @param \Magento\Test\Integrity\Dependency\DependencyProvider\Proxy $dependencyProvider
+     * @param DependencyProvider $dependencyProvider
      */
-    public function __construct(\Magento\Test\Integrity\Dependency\DependencyProvider\Proxy $dependencyProvider)
+    public function __construct(DependencyProvider $dependencyProvider)
     {
         $this->dependencyProvider = $dependencyProvider;
-        $this->getGraphQlSchemaDeclaration();
     }
 
     /**
@@ -43,8 +44,8 @@ public function __construct(\Magento\Test\Integrity\Dependency\DependencyProvide
      *
      * @param string $moduleName
      * @return array
-     * @throws \Magento\TestFramework\Inspection\Exception
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
+     * @throws InspectionException
      */
     public function getDeclaredExistingModuleDependencies(string $moduleName): array
     {
@@ -67,8 +68,8 @@ public function getDeclaredExistingModuleDependencies(string $moduleName): array
      *
      * @param string $moduleName
      * @return array
-     * @throws \Magento\TestFramework\Inspection\Exception
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws InspectionException
+     * @throws LocalizedException
      */
     public function getUndeclaredModuleDependencies(string $moduleName): array
     {
@@ -84,7 +85,7 @@ public function getUndeclaredModuleDependencies(string $moduleName): array
     private function getGraphQlSchemaDeclaration(): array
     {
         if (!$this->parsedSchema) {
-            $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+            $objectManager = ObjectManager::getInstance();
             $typeReader = $objectManager->create(TypeReaderComposite::class);
             $reader = $objectManager->create(GraphQlReader::class, ['typeReader' => $typeReader]);
             $this->parsedSchema = $reader->read();
@@ -101,16 +102,16 @@ private function getGraphQlSchemaDeclaration(): array
      */
     private function getDependenciesFromSchema(string $moduleName): array
     {
-        $schema = $this->parsedSchema;
+        $schema = $this->getGraphQlSchemaDeclaration();
 
         $dependencies = [];
 
         foreach ($schema as $type) {
-            if (isset($type['module']) && $type['module'] == $moduleName && isset($type['implements'])) {
+            if (isset($type['module']) && $type['module'] === $moduleName && isset($type['implements'])) {
                 $interfaces = array_keys($type['implements']);
                 foreach ($interfaces as $interface) {
                     $dependOnModule = $schema[$interface]['module'];
-                    if ($dependOnModule != $moduleName) {
+                    if ($dependOnModule !== $moduleName) {
                         $dependencies[] = $dependOnModule;
                     }
                 }
@@ -126,6 +127,8 @@ private function getDependenciesFromSchema(string $moduleName): array
      * @param string $currentModuleName
      * @param array $dependencies
      * @return array
+     * @throws InspectionException
+     * @throws LocalizedException
      */
     private function collectDependencies(string $currentModuleName, array $dependencies = []): array
     {
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/GraphQlDependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/GraphQlDependencyTest.php
index 375f63ee1a61b..9ef14d90a6f3b 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/GraphQlDependencyTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/GraphQlDependencyTest.php
@@ -8,11 +8,17 @@
 
 namespace Magento\Test\Integrity;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\Utility\AggregateInvoker;
 use Magento\Framework\App\Utility\Files;
 use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Test\Integrity\Dependency\GraphQlSchemaDependencyProvider;
+use Magento\TestFramework\Inspection\Exception as InspectionException;
+use PHPUnit\Framework\AssertionFailedError;
+use PHPUnit\Framework\TestCase;
 
-class GraphQlDependencyTest extends \PHPUnit\Framework\TestCase
+class GraphQlDependencyTest extends TestCase
 {
     /**
      * @var GraphQlSchemaDependencyProvider
@@ -22,7 +28,7 @@ class GraphQlDependencyTest extends \PHPUnit\Framework\TestCase
     /**
      * Sets up data
      *
-     * @throws \Magento\TestFramework\Inspection\Exception
+     * @throws InspectionException
      */
     protected function setUp(): void
     {
@@ -34,25 +40,25 @@ protected function setUp(): void
                 'MAGETWO-43654: The build is running from vendor/magento. DependencyTest is skipped.'
             );
         }
-        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+        $objectManager = ObjectManager::getInstance();
         $this->dependencyProvider = $objectManager->create(GraphQlSchemaDependencyProvider::class);
     }
 
     /**
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function testUndeclaredDependencies()
     {
-        $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
+        $invoker = new AggregateInvoker($this);
         $invoker(
         /**
          * Check undeclared modules dependencies for specified file
          *
          * @param string $fileType
          * @param string $file
-         * @throws \Magento\Framework\Exception\LocalizedException
-         * @throws \Magento\TestFramework\Inspection\Exception
-         * @throws \PHPUnit\Framework\AssertionFailedError
+         * @throws LocalizedException
+         * @throws InspectionException
+         * @throws AssertionFailedError
          */
             function ($file) {
                 $componentRegistrar = new ComponentRegistrar();
@@ -116,13 +122,13 @@ private function getErrorMessage(string $id): string
      *
      * @param string $file
      * @return mixed
-     * @throws \Magento\TestFramework\Inspection\Exception
+     * @throws InspectionException
      */
     private function readJsonFile(string $file, bool $asArray = false)
     {
         $decodedJson = json_decode(file_get_contents($file), $asArray);
         if (null == $decodedJson) {
-            throw new \Magento\TestFramework\Inspection\Exception("Invalid Json: $file");
+            throw new InspectionException("Invalid Json: $file");
         }
 
         return $decodedJson;
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/var/allure-results/3a0f0075-1d21-444e-881d-40cea007b24f-testsuite.xml b/dev/tests/static/testsuite/Magento/Test/Integrity/var/allure-results/3a0f0075-1d21-444e-881d-40cea007b24f-testsuite.xml
new file mode 100644
index 0000000000000..4c1edc9c7c8b5
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/var/allure-results/3a0f0075-1d21-444e-881d-40cea007b24f-testsuite.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<alr:test-suite xmlns:alr="urn:model.allure.qatools.yandex.ru" start="1592475309651" stop="1592475309672" version="1.4.0">
+  <name>Magento\Test\Integrity\DeclarativeDependencyTest</name>
+  <test-cases>
+    <test-case start="1592475309653" stop="1592475309671" status="broken">
+      <name>testUndeclaredDependencies</name>
+      <failure>
+        <message>Class 'Magento\Test\Integrity\Dependency\DeclarativeSchemaDependencyProvider' not found</message>
+        <stack-trace>#0 /Users/a1/Documents/local/magento2/vendor/phpunit/phpunit/src/Framework/TestCase.php(772): PHPUnit\Framework\TestResult-&gt;run(Object(Magento\Test\Integrity\DeclarativeDependencyTest))
+#1 /Users/a1/Documents/local/magento2/vendor/phpunit/phpunit/src/Framework/TestSuite.php(639): PHPUnit\Framework\TestCase-&gt;run(Object(PHPUnit\Framework\TestResult))
+#2 /Users/a1/Documents/local/magento2/vendor/phpunit/phpunit/src/TextUI/TestRunner.php(653): PHPUnit\Framework\TestSuite-&gt;run(Object(PHPUnit\Framework\TestResult))
+#3 /Users/a1/Documents/local/magento2/vendor/phpunit/phpunit/src/TextUI/Command.php(108): PHPUnit\TextUI\TestRunner-&gt;run(Object(PHPUnit\Framework\TestSuite), Array, Array, true)
+#4 /Users/a1/Documents/local/magento2/vendor/phpunit/phpunit/src/TextUI/Command.php(68): PHPUnit\TextUI\Command-&gt;run(Array, true)
+#5 /Users/a1/Documents/local/magento2/vendor/phpunit/phpunit/phpunit(61): PHPUnit\TextUI\Command::main()
+#6 {main}</stack-trace>
+      </failure>
+    </test-case>
+  </test-cases>
+</alr:test-suite>
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
index d486a42e67ba6..1e8b33f79854b 100644
--- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
@@ -17,11 +17,11 @@
  */
 class GraphQlReader implements ReaderInterface
 {
-    const GRAPHQL_PLACEHOLDER_FIELD_NAME = 'placeholder_graphql_field';
+    public const GRAPHQL_PLACEHOLDER_FIELD_NAME = 'placeholder_graphql_field';
 
-    const GRAPHQL_SCHEMA_FILE = 'schema.graphqls';
+    public const GRAPHQL_SCHEMA_FILE = 'schema.graphqls';
 
-    const GRAPHQL_INTERFACE = 'graphql_interface';
+    public const GRAPHQL_INTERFACE = 'graphql_interface';
 
     /**
      * File locator
@@ -315,9 +315,6 @@ private static function getModuleNameForRelevantFile(string $file): string
                 break;
             }
         }
-        if (empty($foundModuleName)) {
-            $foundModuleName = '';
-        }
 
         return $foundModuleName;
     }
@@ -333,7 +330,7 @@ private function addModuleNameToTypes(array $source, string $filePath): array
     {
         foreach ($source as $typeName => $type) {
             if (!isset($type['module']) && (
-                ($type['type'] == self::GRAPHQL_INTERFACE && isset($type['typeResolver']))
+                ($type['type'] === self::GRAPHQL_INTERFACE && isset($type['typeResolver']))
                     || isset($type['implements'])
             )
             ) {

From 1305a3ed85b606ba992629ffad40d27eccc59b94 Mon Sep 17 00:00:00 2001
From: Oleksandr Melnyk <sasha19957099@gmail.com>
Date: Fri, 26 Jun 2020 14:57:19 +0300
Subject: [PATCH 0630/1718] Delete
 3a0f0075-1d21-444e-881d-40cea007b24f-testsuite.xml

---
 ...-1d21-444e-881d-40cea007b24f-testsuite.xml | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 dev/tests/static/testsuite/Magento/Test/Integrity/var/allure-results/3a0f0075-1d21-444e-881d-40cea007b24f-testsuite.xml

diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/var/allure-results/3a0f0075-1d21-444e-881d-40cea007b24f-testsuite.xml b/dev/tests/static/testsuite/Magento/Test/Integrity/var/allure-results/3a0f0075-1d21-444e-881d-40cea007b24f-testsuite.xml
deleted file mode 100644
index 4c1edc9c7c8b5..0000000000000
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/var/allure-results/3a0f0075-1d21-444e-881d-40cea007b24f-testsuite.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<alr:test-suite xmlns:alr="urn:model.allure.qatools.yandex.ru" start="1592475309651" stop="1592475309672" version="1.4.0">
-  <name>Magento\Test\Integrity\DeclarativeDependencyTest</name>
-  <test-cases>
-    <test-case start="1592475309653" stop="1592475309671" status="broken">
-      <name>testUndeclaredDependencies</name>
-      <failure>
-        <message>Class 'Magento\Test\Integrity\Dependency\DeclarativeSchemaDependencyProvider' not found</message>
-        <stack-trace>#0 /Users/a1/Documents/local/magento2/vendor/phpunit/phpunit/src/Framework/TestCase.php(772): PHPUnit\Framework\TestResult-&gt;run(Object(Magento\Test\Integrity\DeclarativeDependencyTest))
-#1 /Users/a1/Documents/local/magento2/vendor/phpunit/phpunit/src/Framework/TestSuite.php(639): PHPUnit\Framework\TestCase-&gt;run(Object(PHPUnit\Framework\TestResult))
-#2 /Users/a1/Documents/local/magento2/vendor/phpunit/phpunit/src/TextUI/TestRunner.php(653): PHPUnit\Framework\TestSuite-&gt;run(Object(PHPUnit\Framework\TestResult))
-#3 /Users/a1/Documents/local/magento2/vendor/phpunit/phpunit/src/TextUI/Command.php(108): PHPUnit\TextUI\TestRunner-&gt;run(Object(PHPUnit\Framework\TestSuite), Array, Array, true)
-#4 /Users/a1/Documents/local/magento2/vendor/phpunit/phpunit/src/TextUI/Command.php(68): PHPUnit\TextUI\Command-&gt;run(Array, true)
-#5 /Users/a1/Documents/local/magento2/vendor/phpunit/phpunit/phpunit(61): PHPUnit\TextUI\Command::main()
-#6 {main}</stack-trace>
-      </failure>
-    </test-case>
-  </test-cases>
-</alr:test-suite>

From 7cb5e98a1311c04682a84aa0baa4ce3936711de4 Mon Sep 17 00:00:00 2001
From: Dmitriy Gallyamov <dmitrijs.gallamovs@gmail.com>
Date: Fri, 26 Jun 2020 15:34:49 +0300
Subject: [PATCH 0631/1718] magento/magento2#28569: Multi-store: Missing store
 codes in relation to a group and website

- Code style and logic fixes
---
 .../ResourceModel/StoreWebsiteRelation.php    | 25 +++++++++++++++
 .../Model/Service/StoreConfigManager.php      |  2 +-
 .../Resolver/AvailableStoresResolver.php      |  4 ++-
 .../Store/StoreConfigDataProvider.php         | 31 ++++++-------------
 .../Store/AvailableStoreConfigTest.php        |  2 +-
 .../GraphQl/Store/StoreConfigResolverTest.php |  2 +-
 6 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php b/app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php
index 7fcd9ac28c3ec..f17ce4df6a13a 100644
--- a/app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php
+++ b/app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php
@@ -41,4 +41,29 @@ public function getStoreByWebsiteId($websiteId)
         $data = $connection->fetchCol($storeSelect);
         return $data;
     }
+
+    /**
+     * Get website store codes
+     *
+     * @param int $websiteId
+     * @param bool $available
+     * @return array
+     */
+    public function getWebsiteStoreCodes($websiteId, $available = false): array
+    {
+        $connection = $this->resource->getConnection();
+        $storeTable = $this->resource->getTableName('store');
+        $storeSelect = $connection->select()->from($storeTable, ['code'])->where(
+            'website_id = ?',
+            $websiteId
+        );
+
+        if ($available) {
+            $storeSelect = $storeSelect->where(
+                'is_active = 1'
+            );
+        }
+
+        return $connection->fetchCol($storeSelect);
+    }
 }
diff --git a/app/code/Magento/Store/Model/Service/StoreConfigManager.php b/app/code/Magento/Store/Model/Service/StoreConfigManager.php
index 1e221216cfaaa..ebc73036f7e37 100644
--- a/app/code/Magento/Store/Model/Service/StoreConfigManager.php
+++ b/app/code/Magento/Store/Model/Service/StoreConfigManager.php
@@ -87,7 +87,7 @@ public function getStoreConfigs(array $storeCodes = null)
      * @param Store|StoreInterface $store
      * @return StoreConfigInterface
      */
-    public function getStoreConfig($store)
+    protected function getStoreConfig($store)
     {
         /** @var StoreConfig $storeConfig */
         $storeConfig = $this->storeConfigFactory->create();
diff --git a/app/code/Magento/StoreGraphQl/Model/Resolver/AvailableStoresResolver.php b/app/code/Magento/StoreGraphQl/Model/Resolver/AvailableStoresResolver.php
index 9392c630e511d..5369ed655b2e1 100644
--- a/app/code/Magento/StoreGraphQl/Model/Resolver/AvailableStoresResolver.php
+++ b/app/code/Magento/StoreGraphQl/Model/Resolver/AvailableStoresResolver.php
@@ -41,6 +41,8 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        return $this->storeConfigDataProvider->getAvailableStoreConfig($context->getExtensionAttributes()->getStore());
+        return $this->storeConfigDataProvider->getAvailableStoreConfig(
+            $context->getExtensionAttributes()->getStore()->getWebsiteId()
+        );
     }
 }
diff --git a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
index 9ee06e353fd1a..b8aa90fe0fd93 100644
--- a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
+++ b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
@@ -10,7 +10,6 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Store\Api\Data\StoreConfigInterface;
 use Magento\Store\Api\StoreConfigManagerInterface;
-use Magento\Store\Model\ResourceModel\Store\Collection;
 use Magento\Store\Model\ResourceModel\StoreWebsiteRelation;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Api\Data\StoreInterface;
@@ -40,30 +39,22 @@ class StoreConfigDataProvider
      */
     private $storeWebsiteRelation;
 
-    /**
-     * @var Collection
-     */
-    private $storeCollection;
-
     /**
      * @param StoreConfigManagerInterface $storeConfigManager
      * @param ScopeConfigInterface $scopeConfig
      * @param StoreWebsiteRelation $storeWebsiteRelation
-     * @param Collection $storeCollection
      * @param array $extendedConfigData
      */
     public function __construct(
         StoreConfigManagerInterface $storeConfigManager,
         ScopeConfigInterface $scopeConfig,
         StoreWebsiteRelation $storeWebsiteRelation,
-        Collection $storeCollection,
         array $extendedConfigData = []
     ) {
         $this->storeConfigManager = $storeConfigManager;
         $this->scopeConfig = $scopeConfig;
         $this->extendedConfigData = $extendedConfigData;
         $this->storeWebsiteRelation = $storeWebsiteRelation;
-        $this->storeCollection = $storeCollection;
     }
 
     /**
@@ -74,28 +65,24 @@ public function __construct(
      */
     public function getStoreConfigData(StoreInterface $store): array
     {
-        $defaultStoreConfig = $this->storeConfigManager->getStoreConfig($store);
-        return $this->prepareStoreConfigData($defaultStoreConfig);
+        $defaultStoreConfig = $this->storeConfigManager->getStoreConfigs([$store->getCode()]);
+        return $this->prepareStoreConfigData(current($defaultStoreConfig));
     }
 
     /**
-     * Get website available stores
+     * Get available website stores
      *
-     * @param StoreInterface $store
+     * @param string $websiteId
      * @return array
      */
-    public function getAvailableStoreConfig(StoreInterface $store): array
+    public function getAvailableStoreConfig($websiteId): array
     {
-        $storeIds = $this->storeWebsiteRelation->getStoreByWebsiteId($store->getWebsiteId());
-        $websiteStores = $this->storeCollection->addIdFilter($storeIds);
+        $websiteStores = $this->storeWebsiteRelation->getWebsiteStoreCodes($websiteId, true);
+        $storeConfigs = $this->storeConfigManager->getStoreConfigs($websiteStores);
         $storesConfigData = [];
 
-        foreach ($websiteStores as $websiteStore) {
-            if ($websiteStore->getIsActive()) {
-                $storesConfigData[] = $this->prepareStoreConfigData(
-                    $this->storeConfigManager->getStoreConfig($websiteStore)
-                );
-            }
+        foreach ($storeConfigs as $storeConfig) {
+            $storesConfigData[] = $this->prepareStoreConfigData($storeConfig);
         }
 
         return $storesConfigData;
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/AvailableStoreConfigTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/AvailableStoreConfigTest.php
index bdb5201c51342..b6e6de74be90b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/AvailableStoreConfigTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/AvailableStoreConfigTest.php
@@ -16,7 +16,7 @@
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 /**
- * Test the GraphQL endpoint's StoreConfigs and AvailableStores queries
+ * Test the GraphQL endpoint's AvailableStores query
  */
 class AvailableStoreConfigTest extends GraphQlAbstract
 {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
index b4ff8778347b8..f3c0a90c7b2b8 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
@@ -19,7 +19,7 @@
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 /**
- * Test the GraphQL endpoint's StoreConfigs and AvailableStores queries
+ * Test the GraphQL endpoint's StoreConfigs query
  */
 class StoreConfigResolverTest extends GraphQlAbstract
 {

From a49709f0ba48954ff21b16e0314f46be23b3ef3e Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Fri, 26 Jun 2020 15:54:26 +0300
Subject: [PATCH 0632/1718] Fix MFTF tests.

---
 ...ProductAndProductCategoryPartialReindexTest.xml | 14 ++++++++------
 .../AdminCustomerFindWishlistItemActionGroup.xml   |  2 +-
 .../Test/AdminDeleteCustomerWishListItemTest.xml   |  1 -
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyCategoryProductAndProductCategoryPartialReindexTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyCategoryProductAndProductCategoryPartialReindexTest.xml
index b4514c9b53736..75876352e5eda 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyCategoryProductAndProductCategoryPartialReindexTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyCategoryProductAndProductCategoryPartialReindexTest.xml
@@ -55,9 +55,9 @@
                 <argument name="categoryName" value="$$categoryN.name$$, $$categoryM.name$$"/>
             </actionGroup>
 
-            <wait stepKey="waitBeforeRunCronIndex" time="30"/>
+            <wait stepKey="waitBeforeRunCronIndex" time="60"/>
             <magentoCLI stepKey="runCronIndex" command="cron:run --group=index"/>
-            <wait stepKey="waitAfterRunCronIndex" time="60"/>
+            <wait stepKey="waitAfterRunCronIndex" time="120"/>
         </before>
         <after>
             <!-- Change "Category Products" and "Product Categories" indexers to "Update on Save" mode -->
@@ -103,6 +103,8 @@
             <argument name="categoryName" value="$$categoryK.name$$"/>
         </actionGroup>
 
+        <wait stepKey="waitAfterAssignCategoryK" time="60"/>
+
         <!--  Unassign category M from Product B -->
         <actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="amOnEditCategoryPageB">
             <argument name="productId" value="$$productB.id$$"/>
@@ -142,9 +144,9 @@
         <see userInput="$$productC.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProductInCategoryN"/>
 
         <!-- Run cron -->
-        <wait stepKey="waitBeforeRunMagentoCron" time="30"/>
+        <wait stepKey="waitBeforeRunMagentoCron" time="60"/>
         <magentoCLI stepKey="runMagentoCron" command="cron:run --group=index"/>
-        <wait stepKey="waitAfterRunMagentoCron" time="60"/>
+        <wait stepKey="waitAfterRunMagentoCron" time="120"/>
 
         <!-- Open categories K, L, M, N on Storefront in order to make sure that new assigments are applied -->
         <!-- Category K contains only Products A, C -->
@@ -208,9 +210,9 @@
         <see userInput="$$productC.name$$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="productCOnCategoryN"/>
 
         <!-- Run Cron once to reindex product changes -->
-        <wait stepKey="waitBeforeRunCronIndexAfterProductAssignToCategory" time="30"/>
+        <wait stepKey="waitBeforeRunCronIndexAfterProductAssignToCategory" time="60"/>
         <magentoCLI stepKey="runCronIndexAfterProductAssignToCategory" command="cron:run --group=index"/>
-        <wait stepKey="waitAfterRunCronIndexAfterProductAssignToCategory" time="60"/>
+        <wait stepKey="waitAfterRunCronIndexAfterProductAssignToCategory" time="120"/>
 
         <!-- Open categories K, L, M, N on Storefront in order to make sure that new assigments are applied -->
 
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerFindWishlistItemActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerFindWishlistItemActionGroup.xml
index bbdc4de330840..cd581ed1836dd 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerFindWishlistItemActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerFindWishlistItemActionGroup.xml
@@ -14,6 +14,6 @@
         </arguments>
         <fillField userInput="{{productName}}" selector="{{AdminCustomerWishlistSection.productName}}" stepKey="fillProductNameField"/>
         <click selector="{{AdminCustomerWishlistSection.searchButton}}" stepKey="clickSearchButton"/>
-        <waitForPageLoad stepKey="waitForGridLoading"/>
+        <waitForAjaxLoad time="60" stepKey="waitForLoading"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/AdminDeleteCustomerWishListItemTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/AdminDeleteCustomerWishListItemTest.xml
index af229b3507077..275106d491078 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/AdminDeleteCustomerWishListItemTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/AdminDeleteCustomerWishListItemTest.xml
@@ -22,7 +22,6 @@
             <createData entity="SimpleProduct" stepKey="createProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
-            <magentoCLI command="cron:run --group=index" stepKey="runCronIndexer"/>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
         </before>
         <after>

From c9fef1b4c98a3341a5c034d376c747460dc14f6e Mon Sep 17 00:00:00 2001
From: Konstantin Dubovik <konstantin.dubovik@guidance.com>
Date: Fri, 26 Jun 2020 16:44:46 +0300
Subject: [PATCH 0633/1718] Fixing bug with non-existent customer group
 breaking quote

---
 app/code/Magento/Quote/Model/Quote.php        | 18 +++++++-
 .../Quote/Test/Unit/Model/QuoteTest.php       | 44 +++++++++++++++++++
 2 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
index c7d40c82bbcc2..deefb9acf9714 100644
--- a/app/code/Magento/Quote/Model/Quote.php
+++ b/app/code/Magento/Quote/Model/Quote.php
@@ -10,6 +10,7 @@
 use Magento\Directory\Model\AllowedCountries;
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Model\AbstractExtensibleModel;
 use Magento\Quote\Api\Data\PaymentInterface;
 use Magento\Quote\Model\Quote\Address;
@@ -1104,7 +1105,22 @@ public function getCustomerTaxClassId()
         //if (!$this->getData('customer_group_id') && !$this->getData('customer_tax_class_id')) {
         $groupId = $this->getCustomerGroupId();
         if ($groupId !== null) {
-            $taxClassId = $this->groupRepository->getById($this->getCustomerGroupId())->getTaxClassId();
+            $taxClassId = null;
+            try {
+                $taxClassId = $this->groupRepository->getById($this->getCustomerGroupId())->getTaxClassId();
+            } catch (NoSuchEntityException $e) {
+                /**
+                 * A customer MAY create a quote and AFTER that customer group MAY be deleted.
+                 * That breaks a quote because it still refers no a non-existent customer group.
+                 * In such a case we should load a new customer group id from the current customer
+                 * object and use it to retrieve tax class and update quote.
+                 */
+                $groupId = $this->getCustomer()->getGroupId();
+                $this->setCustomerGroupId($groupId);
+                if ($groupId !== null) {
+                    $taxClassId = $this->groupRepository->getById($groupId)->getTaxClassId();
+                }
+            }
             $this->setCustomerTaxClassId($taxClassId);
         }
 
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php
index d9b797c454d4e..422a6cbcb7bbe 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php
@@ -30,7 +30,9 @@
 use Magento\Framework\DataObject\Copy;
 use Magento\Framework\DataObject\Factory;
 use Magento\Framework\Event\Manager;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Model\Context;
+use Magento\Framework\Phrase;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Quote\Api\Data\CartInterface;
 use Magento\Quote\Model\Quote;
@@ -640,6 +642,48 @@ public function testGetCustomerTaxClassId()
         $this->assertEquals($taxClassId, $result);
     }
 
+    /**
+     * Test case when non-existent customer group is stored into the quote.
+     * In such a case we should get a NoSuchEntityException exception and try
+     * to get a valid customer group from the current customer object.
+     */
+    public function testGetCustomerTaxClassIdForNonExistentCustomerGroup()
+    {
+        $customerId = 1;
+        $nonExistentGroupId = 100;
+        $groupId = 1;
+        $taxClassId = 1;
+        $groupMock = $this->getMockForAbstractClass(GroupInterface::class, [], '', false);
+        $this->groupRepositoryMock->expects($this->at(0))
+            ->method('getById')
+            ->with($nonExistentGroupId)
+            ->willThrowException(new NoSuchEntityException(new Phrase('Entity Id does not exist')));
+        $customerMock = $this->getMockForAbstractClass(
+            CustomerInterface::class,
+            [],
+            '',
+            false
+        );
+        $customerMock->expects($this->once())
+            ->method('getGroupId')
+            ->willReturn($groupId);
+        $this->customerRepositoryMock->expects($this->once())
+            ->method('getById')
+            ->with($customerId)
+            ->willReturn($customerMock);
+        $this->groupRepositoryMock->expects($this->at(1))
+            ->method('getById')
+            ->with($groupId)
+            ->willReturn($groupMock);
+        $groupMock->expects($this->once())
+            ->method('getTaxClassId')
+            ->willReturn($taxClassId);
+        $this->quote->setData('customer_id', $customerId);
+        $this->quote->setData('customer_group_id', $nonExistentGroupId);
+        $result = $this->quote->getCustomerTaxClassId();
+        $this->assertEquals($taxClassId, $result);
+    }
+
     public function testGetAllAddresses()
     {
         $id = 1;

From 0ec0c70ac0d389d1f164715aa3aa096fa1dfae48 Mon Sep 17 00:00:00 2001
From: Anusha Vattam <avattam@adobe.com>
Date: Fri, 26 Jun 2020 09:04:09 -0500
Subject: [PATCH 0634/1718] MC:32658:MyAccount :: Order Details :: Order
 Details by Order Number Taxes and Discounts

- Added static failure fixes
---
 .../GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php
index 0d3f28b612b8b..ed7cda3b46ebc 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php
@@ -157,7 +157,10 @@ public function testCustomerOrdersSimpleProductWithTaxesAndDiscounts()
         // Asserting discounts on order item level
         $this->assertEquals(4, $customerOrderResponse[0]['items'][0]['discounts'][0]['amount']['value']);
         $this->assertEquals('USD', $customerOrderResponse[0]['items'][0]['discounts'][0]['amount']['currency']);
-        $this->assertEquals('Discount Label for 10% off', $customerOrderResponse[0]['items'][0]['discounts'][0]['label']);
+        $this->assertEquals(
+            'Discount Label for 10% off',
+            $customerOrderResponse[0]['items'][0]['discounts'][0]['label']
+        );
         $customerOrderItem = $customerOrderResponse[0];
         $this->assertTotalsWithTaxesAndDiscounts($customerOrderItem['total']);
         $this->deleteOrder();
@@ -233,7 +236,10 @@ public function testCustomerOrdersSimpleProductWithTaxesAndDiscountsWithTwoRules
         // Asserting discounts on order item level
         $this->assertEquals(4, $customerOrderResponse[0]['items'][0]['discounts'][0]['amount']['value']);
         $this->assertEquals('USD', $customerOrderResponse[0]['items'][0]['discounts'][0]['amount']['currency']);
-        $this->assertEquals('Discount Label for 10% off', $customerOrderResponse[0]['items'][0]['discounts'][0]['label']);
+        $this->assertEquals(
+            'Discount Label for 10% off',
+            $customerOrderResponse[0]['items'][0]['discounts'][0]['label']
+        );
         $customerOrderItem = $customerOrderResponse[0];
         $this->assertTotalsWithTaxesAndDiscountsWithTwoRules($customerOrderItem['total']);
         $this->deleteOrder();

From a16efb632ff2433a365e5126fbd0081e5882d70e Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Fri, 26 Jun 2020 17:07:22 +0300
Subject: [PATCH 0635/1718] add customer group id validation

---
 .../ResourceModel/CustomerRepository.php      | 34 ++++++-
 .../ResourceModel/CustomerRepositoryTest.php  |  6 +-
 app/code/Magento/Customer/i18n/en_US.csv      |  1 +
 .../Customer/Api/CustomerRepositoryTest.php   | 96 +++++++++++++++++--
 4 files changed, 125 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
index 0611a2df641e7..3a5b6593c2190 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
@@ -10,6 +10,7 @@
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Api\Data\CustomerSearchResultsInterfaceFactory;
+use Magento\Customer\Api\GroupRepositoryInterface;
 use Magento\Customer\Model\Customer as CustomerModel;
 use Magento\Customer\Model\Customer\NotificationStorage;
 use Magento\Customer\Model\CustomerFactory;
@@ -27,6 +28,8 @@
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -119,6 +122,11 @@ class CustomerRepository implements CustomerRepositoryInterface
      */
     private $delegatedStorage;
 
+    /**
+     * @var GroupRepositoryInterface
+     */
+    private $groupRepository;
+
     /**
      * @param CustomerFactory $customerFactory
      * @param CustomerSecureFactory $customerSecureFactory
@@ -136,6 +144,7 @@ class CustomerRepository implements CustomerRepositoryInterface
      * @param CollectionProcessorInterface $collectionProcessor
      * @param NotificationStorage $notificationStorage
      * @param DelegatedStorage|null $delegatedStorage
+     * @param GroupRepositoryInterface|null $groupRepository
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -154,7 +163,8 @@ public function __construct(
         JoinProcessorInterface $extensionAttributesJoinProcessor,
         CollectionProcessorInterface $collectionProcessor,
         NotificationStorage $notificationStorage,
-        DelegatedStorage $delegatedStorage = null
+        DelegatedStorage $delegatedStorage = null,
+        ?GroupRepositoryInterface $groupRepository = null
     ) {
         $this->customerFactory = $customerFactory;
         $this->customerSecureFactory = $customerSecureFactory;
@@ -172,6 +182,7 @@ public function __construct(
         $this->collectionProcessor = $collectionProcessor;
         $this->notificationStorage = $notificationStorage;
         $this->delegatedStorage = $delegatedStorage ?? ObjectManager::getInstance()->get(DelegatedStorage::class);
+        $this->groupRepository = $groupRepository ?: ObjectManager::getInstance()->get(GroupRepositoryInterface::class);
     }
 
     /**
@@ -216,6 +227,7 @@ public function save(CustomerInterface $customer, $passwordHash = null)
                 $prevCustomerData ? $prevCustomerData->getStoreId() : $this->storeManager->getStore()->getId()
             );
         }
+        $this->validateGroupId($customer->getGroupId());
         $this->setCustomerGroupId($customerModel, $customerArr, $prevCustomerDataArr);
         // Need to use attribute set or future updates can cause data loss
         if (!$customerModel->getAttributeSetId()) {
@@ -286,6 +298,26 @@ public function save(CustomerInterface $customer, $passwordHash = null)
         return $savedCustomer;
     }
 
+    /**
+     * Validate customer group id if exist
+     *
+     * @param int|null $groupId
+     * @return bool
+     * @throws LocalizedException
+     */
+    private function validateGroupId(?int $groupId): bool
+    {
+        if ($groupId) {
+            try {
+                $this->groupRepository->getById($groupId);
+            } catch (NoSuchEntityException $e) {
+                throw new LocalizedException(__('The specified customer group id does not exist.'));
+            }
+        }
+
+        return true;
+    }
+
     /**
      * Set secure data to customer model
      *
diff --git a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php
index 7466505d2cca5..b7ed01ee9da8b 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/ResourceModel/CustomerRepositoryTest.php
@@ -249,7 +249,8 @@ public function testSave()
                 'getEmail',
                 'getWebsiteId',
                 'getAddresses',
-                'setAddresses'
+                'setAddresses',
+                'getGroupId',
             ]
         );
         $customerSecureData = $this->getMockBuilder(CustomerSecure::class)
@@ -433,7 +434,8 @@ public function testSaveWithPasswordHash()
                 'getEmail',
                 'getWebsiteId',
                 'getAddresses',
-                'setAddresses'
+                'setAddresses',
+                'getGroupId'
             ]
         );
         $customerModel->expects($this->atLeastOnce())
diff --git a/app/code/Magento/Customer/i18n/en_US.csv b/app/code/Magento/Customer/i18n/en_US.csv
index 7c88ffec1170a..0a81e70964b4c 100644
--- a/app/code/Magento/Customer/i18n/en_US.csv
+++ b/app/code/Magento/Customer/i18n/en_US.csv
@@ -542,3 +542,4 @@ Addresses,Addresses
 "The store view is not in the associated website.","The store view is not in the associated website."
 "The Store View selected for sending Welcome email from is not related to the customer's associated website.","The Store View selected for sending Welcome email from is not related to the customer's associated website."
 "Add/Update Address","Add/Update Address"
+"The specified customer group id does not exist.","The specified customer group id does not exist."
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 f4aedb86c50b1..7384696a9ebcc 100644
--- a/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php
@@ -31,16 +31,11 @@
  */
 class CustomerRepositoryTest extends WebapiAbstract
 {
-    const SERVICE_VERSION = 'V1';
-    const SERVICE_NAME = 'customerCustomerRepositoryV1';
-    const RESOURCE_PATH = '/V1/customers';
-    const RESOURCE_PATH_CUSTOMER_TOKEN = "/V1/integration/customer/token";
+    private const SERVICE_VERSION = 'V1';
+    private const SERVICE_NAME = 'customerCustomerRepositoryV1';
+    private const RESOURCE_PATH = '/V1/customers';
 
-    /**
-     * Sample values for testing
-     */
-    const ATTRIBUTE_CODE = 'attribute_code';
-    const ATTRIBUTE_VALUE = 'attribute_value';
+    private const STUB_INVALID_CUSTOMER_GROUP_ID = 777;
 
     /**
      * @var CustomerRepositoryInterface
@@ -412,6 +407,89 @@ public function testUpdateCustomerException(): void
         }
     }
 
+    /**
+     * Test customer update with invalid customer group id
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     *
+     * @return void
+     */
+    public function testUpdateCustomerWithInvalidGroupId(): void
+    {
+        $customerId = 1;
+        $customerData = $this->dataObjectProcessor->buildOutputDataArray(
+            $this->getCustomerData($customerId),
+            Customer::class
+        );
+        $customerData[Customer::GROUP_ID] = self::STUB_INVALID_CUSTOMER_GROUP_ID;
+
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::RESOURCE_PATH . '/' . $customerId,
+                'httpMethod' => Request::HTTP_METHOD_PUT,
+            ],
+            'soap' => [
+                'service' => self::SERVICE_NAME,
+                'serviceVersion' => self::SERVICE_VERSION,
+                'operation' => self::SERVICE_NAME . 'Save',
+            ],
+        ];
+
+        $requestData['customer'] = $customerData;
+        $expectedMessage = 'The specified customer group id does not exist.';
+
+        try {
+            $this->_webApiCall($serviceInfo, $requestData);
+            $this->fail('Expected exception was not raised');
+        } catch (\SoapFault $e) {
+            $this->assertStringContainsString($expectedMessage, $e->getMessage());
+        } catch (\Exception $e) {
+            $errorObj = $this->processRestExceptionResult($e);
+            $this->assertEquals(HTTPExceptionCodes::HTTP_BAD_REQUEST, $e->getCode());
+            $this->assertEquals($expectedMessage, $errorObj['message']);
+        }
+    }
+
+    /**
+     * Test customer create with invalid customer group id
+     *
+     * @return void
+     */
+    public function testCreateCustomerWithInvalidGroupId(): void
+    {
+        $customerData = $this->dataObjectProcessor->buildOutputDataArray(
+            $this->customerHelper->createSampleCustomerDataObject(),
+            Customer::class
+        );
+        $customerData[Customer::GROUP_ID] = self::STUB_INVALID_CUSTOMER_GROUP_ID;
+
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::RESOURCE_PATH,
+                'httpMethod' => Request::HTTP_METHOD_POST,
+            ],
+            'soap' => [
+                'service' => self::SERVICE_NAME,
+                'serviceVersion' => self::SERVICE_VERSION,
+                'operation' => self::SERVICE_NAME . 'Save',
+            ],
+        ];
+
+        $requestData = ['customer' => $customerData];
+        $expectedMessage = 'The specified customer group id does not exist.';
+
+        try {
+            $this->_webApiCall($serviceInfo, $requestData);
+            $this->fail('Expected exception was not raised');
+        } catch (\SoapFault $e) {
+            $this->assertStringContainsString($expectedMessage, $e->getMessage());
+        } catch (\Exception $e) {
+            $errorObj = $this->processRestExceptionResult($e);
+            $this->assertEquals(HTTPExceptionCodes::HTTP_BAD_REQUEST, $e->getCode());
+            $this->assertEquals($expectedMessage, $errorObj['message']);
+        }
+    }
+
     /**
      * Test creating a customer with absent required address fields
      *

From edfaf7c0a0f3e0905736a840bc6983fc07a464f8 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <p.bystritsky@yandex.ru>
Date: Fri, 26 Jun 2020 15:00:38 +0300
Subject: [PATCH 0636/1718] Static properties serialization fix - update.

---
 .../TestFramework/Workaround/Cleanup/StaticProperties.php      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php b/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
index b3461340aa7c0..f094cb9c1ca62 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
@@ -185,7 +185,8 @@ public static function backupStaticVariables()
                 | Files::INCLUDE_TESTS
             ),
             function ($classFile) {
-                return StaticProperties::_isClassInCleanableFolders($classFile)
+                return strpos($classFile, 'TestFramework')  === -1
+                    && StaticProperties::_isClassInCleanableFolders($classFile)
                     // phpcs:ignore Magento2.Functions.DiscouragedFunction
                     && strpos(file_get_contents($classFile), ' static ')  > 0;
             }

From 1cb568519160395224a77930f14f24d0114a3879 Mon Sep 17 00:00:00 2001
From: Kamil <lumnn@mailfence.com>
Date: Fri, 26 Jun 2020 16:36:36 +0200
Subject: [PATCH 0637/1718] Remove over complicated setup for closing minicart

---
 .../Checkout/view/frontend/web/js/view/minicart.js | 14 --------------
 .../frontend/web/template/minicart/content.html    |  8 ++++++--
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js b/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js
index c77e72e38107a..d3890556f3ccd 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js
@@ -123,20 +123,6 @@ define([
             $('[data-block="minicart"]').find('[data-role="dropdownDialog"]').dropdownDialog('close');
         },
 
-        /**
-         * @return {Boolean}
-         */
-        closeSidebar: function () {
-            var minicart = $('[data-block="minicart"]');
-
-            minicart.on('click', '[data-action="close"]', function (event) {
-                event.stopPropagation();
-                minicart.find('[data-role="dropdownDialog"]').dropdownDialog('close');
-            });
-
-            return true;
-        },
-
         /**
          * @param {String} productType
          * @return {*|String}
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html b/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html
index c5fd6d545702b..a47f11e5787c3 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html
@@ -21,7 +21,12 @@
             id="btn-minicart-close"
             class="action close"
             data-action="close"
-            data-bind="attr: { title: $t('Close') }">
+            data-bind="
+                attr: {
+                    title: $t('Close')
+                },
+                click: closeMinicart()
+            ">
         <span translate="'Close'"/>
     </button>
 
@@ -74,7 +79,6 @@
 
     <ifnot args="getCartParam('summary_count')">
         <strong class="subtitle empty"
-                data-bind="visible: closeSidebar()"
                 translate="'You have no items in your shopping cart.'"
         />
         <if args="getCartParam('cart_empty_message')">

From 43c21fc44728d84c34f3f2618a270317490c2cd2 Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@magento.com>
Date: Fri, 26 Jun 2020 09:50:54 -0500
Subject: [PATCH 0638/1718] MC-31618: Move static config to files - PLUGIN_LIST

- Add integration test with app isolation;
---
 .../Interception/PluginListGeneratorTest.php  | 143 ++++++++++++++++++
 1 file changed, 143 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php
new file mode 100644
index 0000000000000..1e67098391545
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Interception;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem\DriverInterface;
+use Magento\TestFramework\Application;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * @magentoAppIsolation enabled
+ */
+class PluginListGeneratorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Generated plugin list config for frontend scope
+     */
+    const CACHE_ID = 'primary|global|frontend|plugin-list';
+
+    /**
+     * @var PluginListGenerator
+     */
+    private $model;
+
+    /**
+     * @var DirectoryList
+     */
+    private $directoryList;
+
+    /**
+     * @var DriverInterface
+     */
+    private $file;
+
+    /**
+     * @var Application
+     */
+    private $application;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        $this->application = Bootstrap::getInstance()->getBootstrap()->getApplication();
+        $this->directoryList = new DirectoryList(BP, $this->getCustomDirs());
+        $this->file = Bootstrap::getObjectManager()->create(DriverInterface::class);
+        $reader = Bootstrap::getObjectManager()->create(
+        // phpstan:ignore "Class Magento\Framework\ObjectManager\Config\Reader\Dom\Proxy not found."
+            \Magento\Framework\ObjectManager\Config\Reader\Dom\Proxy::class
+        );
+        $scopeConfig = Bootstrap::getObjectManager()->create(\Magento\Framework\Config\Scope::class);
+        $omConfig = Bootstrap::getObjectManager()->create(
+            \Magento\Framework\Interception\ObjectManager\Config\Developer::class
+        );
+        $relations = Bootstrap::getObjectManager()->create(
+            \Magento\Framework\ObjectManager\Relations\Runtime::class
+        );
+        $definitions = Bootstrap::getObjectManager()->create(
+            \Magento\Framework\Interception\Definition\Runtime::class
+        );
+        $classDefinitions = Bootstrap::getObjectManager()->create(
+            \Magento\Framework\ObjectManager\Definition\Runtime::class
+        );
+        // phpstan:ignore "Class Psr\Log\LoggerInterface\Proxy not found."
+        $logger = Bootstrap::getObjectManager()->create(\Psr\Log\LoggerInterface\Proxy::class);
+        $this->model = new PluginListGenerator(
+            $reader,
+            $scopeConfig,
+            $omConfig,
+            $relations,
+            $definitions,
+            $classDefinitions,
+            $logger,
+            $this->directoryList,
+            ['primary', 'global']
+        );
+    }
+
+    /**
+     * Test plugin list configuration generation and load.
+     */
+    public function testPluginListConfigGeneration()
+    {
+        $scopes = ['frontend'];
+        $this->model->write($scopes);
+        $configData = $this->model->load(self::CACHE_ID);
+        $this->assertNotEmpty($configData[0]);
+        $this->assertNotEmpty($configData[1]);
+        $this->assertNotEmpty($configData[2]);
+        $expected = [
+            1 => [
+                0 => 'genericHeaderPlugin',
+                1 => 'asyncCssLoad',
+                2 => 'response-http-page-cache'
+            ]
+        ];
+        // Here in test is assumed that this class below has 3 plugins. But the amount of plugins and class itself
+        // may vary. If it is changed, please update these assertions.
+        $this->assertArrayHasKey(
+            'Magento\\Framework\\App\\Response\\Http_sendResponse___self',
+            $configData[2],
+            'Processed plugin does not exist in the processed plugins array.'
+        );
+        $this->assertSame(
+            $expected,
+            $configData[2]['Magento\\Framework\\App\\Response\\Http_sendResponse___self'],
+            'Plugin configurations are not equal'
+        );
+    }
+
+    /**
+     * Gets customized directory paths
+     *
+     * @return array
+     */
+    private function getCustomDirs()
+    {
+        $path = DirectoryList::PATH;
+        $generated = "{$this->application->getTempDir()}/generated";
+
+        return [
+            DirectoryList::GENERATED_METADATA => [$path => "{$generated}/metadata"],
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function tearDown(): void
+    {
+        $filePath = $this->directoryList->getPath(DirectoryList::GENERATED_METADATA)
+            . '/' . self::CACHE_ID . '.' . 'php';
+
+        if (file_exists($filePath)) {
+            $this->file->deleteFile($filePath);
+        }
+    }
+}

From 1091a3089a0cf0c4fec43998dc1b9d82101b720b Mon Sep 17 00:00:00 2001
From: Michal Derlatka <michal.derlatka1@gmail.com>
Date: Fri, 26 Jun 2020 18:11:04 +0200
Subject: [PATCH 0639/1718] magento/magento2#26107: Exception message on cart
 with no shipment items

---
 app/code/Magento/Quote/Model/ShippingAddressManagement.php      | 2 +-
 .../GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php     | 2 +-
 .../GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Quote/Model/ShippingAddressManagement.php b/app/code/Magento/Quote/Model/ShippingAddressManagement.php
index b9edcc13d0077..45b3313d32114 100644
--- a/app/code/Magento/Quote/Model/ShippingAddressManagement.php
+++ b/app/code/Magento/Quote/Model/ShippingAddressManagement.php
@@ -88,7 +88,7 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres
         $quote = $this->quoteRepository->getActive($cartId);
         if ($quote->isVirtual()) {
             throw new NoSuchEntityException(
-                __('The Cart includes virtual product(s) only, so a shipping address is not used.')
+                __('Shipping address is not allowed on cart: cart contains no items for shipment.')
             );
         }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
index 3e06b89c77fb7..4108e803f6e1f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetShippingAddressOnCartTest.php
@@ -149,7 +149,7 @@ public function testSetNewShippingAddressOnCartWithSimpleProduct()
     public function testSetNewShippingAddressOnCartWithVirtualProduct()
     {
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('The Cart includes virtual product(s) only, so a shipping address is not used.');
+        $this->expectExceptionMessage('Shipping address is not allowed on cart: cart contains no items for shipment.');
 
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
index b4136d06bf67c..b7ddd085f932e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetShippingAddressOnCartTest.php
@@ -97,7 +97,7 @@ public function testSetNewShippingAddressOnCartWithSimpleProduct()
     public function testSetNewShippingAddressOnCartWithVirtualProduct()
     {
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('The Cart includes virtual product(s) only, so a shipping address is not used.');
+        $this->expectExceptionMessage('Shipping address is not allowed on cart: cart contains no items for shipment.');
 
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 

From 59239ac75ee587371b3e8e4493bb70ce7f561958 Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@magento.com>
Date: Fri, 26 Jun 2020 11:51:45 -0500
Subject: [PATCH 0640/1718] MC-31618: Move static config to files - PLUGIN_LIST

- Update integration test;
---
 .../Interception/PluginListGeneratorTest.php  | 31 +++++++------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php
index 1e67098391545..9c1ed133e2b0d 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php
@@ -48,26 +48,17 @@ protected function setUp(): void
     {
         $this->application = Bootstrap::getInstance()->getBootstrap()->getApplication();
         $this->directoryList = new DirectoryList(BP, $this->getCustomDirs());
-        $this->file = Bootstrap::getObjectManager()->create(DriverInterface::class);
-        $reader = Bootstrap::getObjectManager()->create(
-        // phpstan:ignore "Class Magento\Framework\ObjectManager\Config\Reader\Dom\Proxy not found."
-            \Magento\Framework\ObjectManager\Config\Reader\Dom\Proxy::class
-        );
-        $scopeConfig = Bootstrap::getObjectManager()->create(\Magento\Framework\Config\Scope::class);
-        $omConfig = Bootstrap::getObjectManager()->create(
-            \Magento\Framework\Interception\ObjectManager\Config\Developer::class
-        );
-        $relations = Bootstrap::getObjectManager()->create(
-            \Magento\Framework\ObjectManager\Relations\Runtime::class
-        );
-        $definitions = Bootstrap::getObjectManager()->create(
-            \Magento\Framework\Interception\Definition\Runtime::class
-        );
-        $classDefinitions = Bootstrap::getObjectManager()->create(
-            \Magento\Framework\ObjectManager\Definition\Runtime::class
-        );
-        // phpstan:ignore "Class Psr\Log\LoggerInterface\Proxy not found."
-        $logger = Bootstrap::getObjectManager()->create(\Psr\Log\LoggerInterface\Proxy::class);
+        $this->file = new \Magento\Framework\Filesystem\Driver\File();
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $reader = new \Magento\Framework\ObjectManager\Config\Reader\Dom\Proxy($objectManager);
+        $areaList = $this->createMock(\Magento\Framework\App\AreaList::class);
+        $areaList->method('getCodes')->willReturn([]);
+        $scopeConfig = new \Magento\Framework\Config\Scope($areaList, 'global');
+        $omConfig = new \Magento\Framework\Interception\ObjectManager\Config\Developer();
+        $relations = new \Magento\Framework\ObjectManager\Relations\Runtime();
+        $definitions = new \Magento\Framework\Interception\Definition\Runtime();
+        $classDefinitions = new \Magento\Framework\ObjectManager\Definition\Runtime();
+        $logger = $this->createMock(\Psr\Log\LoggerInterface::class);
         $this->model = new PluginListGenerator(
             $reader,
             $scopeConfig,

From 79de211f8a1fd0f6ba9ee6a50ec6d98e2ee49803 Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@magento.com>
Date: Fri, 26 Jun 2020 12:53:48 -0500
Subject: [PATCH 0641/1718] MC-31618: Move static config to files - PLUGIN_LIST

- Add PluginList preference;
---
 .../Magento/Framework/Interception/PluginListGeneratorTest.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php
index 9c1ed133e2b0d..de2c732615d7c 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php
@@ -11,9 +11,6 @@
 use Magento\TestFramework\Application;
 use Magento\TestFramework\Helper\Bootstrap;
 
-/**
- * @magentoAppIsolation enabled
- */
 class PluginListGeneratorTest extends \PHPUnit\Framework\TestCase
 {
     /**

From 6f918fa450580d623454f7be36d439def9cf6779 Mon Sep 17 00:00:00 2001
From: Alex Taranovsky <firster@atwix.com>
Date: Wed, 24 Jun 2020 15:47:52 +0300
Subject: [PATCH 0642/1718] magento/magento2#28481: GraphQl. updateCustomer
 allows to set any INT value in gender argument

---
 .../Api/ValidateCustomerDataInterface.php     | 24 +++++
 .../Model/Customer/ValidateCustomerData.php   | 97 +++----------------
 .../ValidateCustomerData/ValidateEmail.php    | 45 +++++++++
 .../ValidateCustomerData/ValidateGender.php   | 58 +++++++++++
 .../ValidateRequiredArguments.php             | 59 +++++++++++
 .../CustomerGraphQl/etc/graphql/di.xml        | 10 ++
 6 files changed, 209 insertions(+), 84 deletions(-)
 create mode 100644 app/code/Magento/CustomerGraphQl/Api/ValidateCustomerDataInterface.php
 create mode 100644 app/code/Magento/CustomerGraphQl/Model/Customer/ValidateCustomerData/ValidateEmail.php
 create mode 100644 app/code/Magento/CustomerGraphQl/Model/Customer/ValidateCustomerData/ValidateGender.php
 create mode 100644 app/code/Magento/CustomerGraphQl/Model/Customer/ValidateCustomerData/ValidateRequiredArguments.php

diff --git a/app/code/Magento/CustomerGraphQl/Api/ValidateCustomerDataInterface.php b/app/code/Magento/CustomerGraphQl/Api/ValidateCustomerDataInterface.php
new file mode 100644
index 0000000000000..ef3e86788c43f
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Api/ValidateCustomerDataInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Api;
+
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+
+/**
+ * Interface for customer data validator
+ */
+interface ValidateCustomerDataInterface
+{
+    /**
+     * Validate customer data
+     *
+     * @param array $customerData
+     * @throws GraphQlInputException
+     */
+    public function execute(array $customerData): void;
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/ValidateCustomerData.php b/app/code/Magento/CustomerGraphQl/Model/Customer/ValidateCustomerData.php
index 5d60df5cba4d3..95d68d69d71e7 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Customer/ValidateCustomerData.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/ValidateCustomerData.php
@@ -7,8 +7,7 @@
 
 namespace Magento\CustomerGraphQl\Model\Customer;
 
-use Magento\Customer\Api\CustomerMetadataInterface;
-use Magento\Customer\Model\Data\AttributeMetadata;
+use Magento\CustomerGraphQl\Api\ValidateCustomerDataInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
@@ -19,11 +18,6 @@
  */
 class ValidateCustomerData
 {
-    /**
-     * @var CustomerMetadataInterface
-     */
-    private $customerMetadata;
-
     /**
      * Get allowed/required customer attributes
      *
@@ -36,21 +30,26 @@ class ValidateCustomerData
      */
     private $emailAddressValidator;
 
+    /**
+     * @var ValidateCustomerDataInterface[]
+     */
+    private $validators = [];
+
     /**
      * ValidateCustomerData constructor.
      *
      * @param GetAllowedCustomerAttributes $getAllowedCustomerAttributes
      * @param EmailAddressValidator $emailAddressValidator
-     * @param CustomerMetadataInterface $customerMetadata
+     * @param array $validators
      */
     public function __construct(
         GetAllowedCustomerAttributes $getAllowedCustomerAttributes,
         EmailAddressValidator $emailAddressValidator,
-        CustomerMetadataInterface $customerMetadata
+        $validators = []
     ) {
         $this->getAllowedCustomerAttributes = $getAllowedCustomerAttributes;
         $this->emailAddressValidator = $emailAddressValidator;
-        $this->customerMetadata = $customerMetadata;
+        $this->validators = $validators;
     }
 
     /**
@@ -61,81 +60,11 @@ public function __construct(
      * @throws LocalizedException
      * @throws NoSuchEntityException
      */
-    public function execute(array $customerData): void
-    {
-        $this->validateRequiredArguments($customerData);
-        $this->validateEmail($customerData);
-        $this->validateGender($customerData);
-    }
-
-    /**
-     * Validate required attributes
-     *
-     * @param array $customerData
-     * @throws GraphQlInputException
-     */
-    private function validateRequiredArguments(array $customerData): void
+    public function execute(array $customerData)
     {
-        $attributes = $this->getAllowedCustomerAttributes->execute(array_keys($customerData));
-        $errorInput = [];
-
-        foreach ($attributes as $attributeInfo) {
-            if ($attributeInfo->getIsRequired()
-                && (!isset($customerData[$attributeInfo->getAttributeCode()])
-                    || $customerData[$attributeInfo->getAttributeCode()] == '')
-            ) {
-                $errorInput[] = $attributeInfo->getDefaultFrontendLabel();
-            }
-        }
-
-        if ($errorInput) {
-            throw new GraphQlInputException(
-                __('Required parameters are missing: %1', [implode(', ', $errorInput)])
-            );
-        }
-    }
-
-    /**
-     * Validate an email
-     *
-     * @param array $customerData
-     * @throws GraphQlInputException
-     */
-    private function validateEmail(array $customerData): void
-    {
-        if (isset($customerData['email']) && !$this->emailAddressValidator->isValid($customerData['email'])) {
-            throw new GraphQlInputException(
-                __('"%1" is not a valid email address.', $customerData['email'])
-            );
-        }
-    }
-
-    /**
-     * Validate gender value
-     *
-     * @param array $customerData
-     * @throws GraphQlInputException
-     * @throws LocalizedException
-     * @throws NoSuchEntityException
-     */
-    private function validateGender(array $customerData): void
-    {
-        if (isset($customerData['gender']) && $customerData['gender']) {
-            /** @var AttributeMetadata $genderData */
-            $options = $this->customerMetadata->getAttributeMetadata('gender')->getOptions();
-
-            $isValid = false;
-            foreach ($options as $optionData) {
-                if ($optionData->getValue() && $optionData->getValue() == $customerData['gender']) {
-                    $isValid = true;
-                }
-            }
-
-            if (!$isValid) {
-                throw new GraphQlInputException(
-                    __('"%1" is not a valid gender value.', $customerData['gender'])
-                );
-            }
+        /** @var ValidateCustomerDataInterface $validator */
+        foreach ($this->validators as $validator) {
+            $validator->execute($customerData);
         }
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/ValidateCustomerData/ValidateEmail.php b/app/code/Magento/CustomerGraphQl/Model/Customer/ValidateCustomerData/ValidateEmail.php
new file mode 100644
index 0000000000000..87f8831550f04
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/ValidateCustomerData/ValidateEmail.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Customer\ValidateCustomerData;
+
+use Magento\CustomerGraphQl\Api\ValidateCustomerDataInterface;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\Validator\EmailAddress as EmailAddressValidator;
+
+/**
+ * Validates an email
+ */
+class ValidateEmail implements ValidateCustomerDataInterface
+{
+    /**
+     * @var EmailAddressValidator
+     */
+    private $emailAddressValidator;
+
+    /**
+     * ValidateEmail constructor.
+     *
+     * @param EmailAddressValidator $emailAddressValidator
+     */
+    public function __construct(EmailAddressValidator $emailAddressValidator)
+    {
+        $this->emailAddressValidator = $emailAddressValidator;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function execute(array $customerData): void
+    {
+        if (isset($customerData['email']) && !$this->emailAddressValidator->isValid($customerData['email'])) {
+            throw new GraphQlInputException(
+                __('"%1" is not a valid email address.', $customerData['email'])
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/ValidateCustomerData/ValidateGender.php b/app/code/Magento/CustomerGraphQl/Model/Customer/ValidateCustomerData/ValidateGender.php
new file mode 100644
index 0000000000000..463372a63d8d5
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/ValidateCustomerData/ValidateGender.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Customer\ValidateCustomerData;
+
+use Magento\Customer\Api\CustomerMetadataInterface;
+use Magento\Customer\Model\Data\AttributeMetadata;
+use Magento\CustomerGraphQl\Api\ValidateCustomerDataInterface;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+
+/**
+ * Validates gender value
+ */
+class ValidateGender implements ValidateCustomerDataInterface
+{
+    /**
+     * @var CustomerMetadataInterface
+     */
+    private $customerMetadata;
+
+    /**
+     * ValidateGender constructor.
+     *
+     * @param CustomerMetadataInterface $customerMetadata
+     */
+    public function __construct(CustomerMetadataInterface $customerMetadata)
+    {
+        $this->customerMetadata = $customerMetadata;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function execute(array $customerData): void
+    {
+        if (isset($customerData['gender']) && $customerData['gender']) {
+            /** @var AttributeMetadata $genderData */
+            $options = $this->customerMetadata->getAttributeMetadata('gender')->getOptions();
+
+            $isValid = false;
+            foreach ($options as $optionData) {
+                if ($optionData->getValue() && $optionData->getValue() == $customerData['gender']) {
+                    $isValid = true;
+                }
+            }
+
+            if (!$isValid) {
+                throw new GraphQlInputException(
+                    __('"%1" is not a valid gender value.', $customerData['gender'])
+                );
+            }
+        }
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/ValidateCustomerData/ValidateRequiredArguments.php b/app/code/Magento/CustomerGraphQl/Model/Customer/ValidateCustomerData/ValidateRequiredArguments.php
new file mode 100644
index 0000000000000..fdf4fa1c824f2
--- /dev/null
+++ b/app/code/Magento/CustomerGraphQl/Model/Customer/ValidateCustomerData/ValidateRequiredArguments.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Customer\ValidateCustomerData;
+
+use Magento\CustomerGraphQl\Api\ValidateCustomerDataInterface;
+use Magento\CustomerGraphQl\Model\Customer\GetAllowedCustomerAttributes;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+
+/**
+ * Validates required attributes
+ */
+class ValidateRequiredArguments implements ValidateCustomerDataInterface
+{
+    /**
+     * Get allowed/required customer attributes
+     *
+     * @var GetAllowedCustomerAttributes
+     */
+    private $getAllowedCustomerAttributes;
+
+    /**
+     * ValidateRequiredArguments constructor.
+     *
+     * @param GetAllowedCustomerAttributes $getAllowedCustomerAttributes
+     */
+    public function __construct(GetAllowedCustomerAttributes $getAllowedCustomerAttributes)
+    {
+        $this->getAllowedCustomerAttributes = $getAllowedCustomerAttributes;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function execute(array $customerData): void
+    {
+        $attributes = $this->getAllowedCustomerAttributes->execute(array_keys($customerData));
+        $errorInput = [];
+
+        foreach ($attributes as $attributeInfo) {
+            if ($attributeInfo->getIsRequired()
+                && (!isset($customerData[$attributeInfo->getAttributeCode()])
+                    || $customerData[$attributeInfo->getAttributeCode()] == '')
+            ) {
+                $errorInput[] = $attributeInfo->getDefaultFrontendLabel();
+            }
+        }
+
+        if ($errorInput) {
+            throw new GraphQlInputException(
+                __('Required parameters are missing: %1', [implode(', ', $errorInput)])
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/CustomerGraphQl/etc/graphql/di.xml b/app/code/Magento/CustomerGraphQl/etc/graphql/di.xml
index 1ba0e457430e0..3ed77a2ad563c 100644
--- a/app/code/Magento/CustomerGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/CustomerGraphQl/etc/graphql/di.xml
@@ -29,4 +29,14 @@
             </argument>
         </arguments>
     </type>
+    <!-- Validate input customer data -->
+    <type name="Magento\CustomerGraphQl\Model\Customer\ValidateCustomerData">
+        <arguments>
+            <argument name="validators" xsi:type="array">
+                <item name="validateRequiredArguments" xsi:type="object">Magento\CustomerGraphQl\Model\Customer\ValidateCustomerData\ValidateRequiredArguments</item>
+                <item name="validateEmail" xsi:type="object">Magento\CustomerGraphQl\Model\Customer\ValidateCustomerData\ValidateEmail</item>
+                <item name="validateGender" xsi:type="object">Magento\CustomerGraphQl\Model\Customer\ValidateCustomerData\ValidateGender</item>
+            </argument>
+        </arguments>
+    </type>
 </config>

From c8c4e06b23a41beb24c347829b41b623c14b70db Mon Sep 17 00:00:00 2001
From: Michal Derlatka <michal.derlatka1@gmail.com>
Date: Sat, 27 Jun 2020 22:54:37 +0200
Subject: [PATCH 0643/1718] magento/magento2#26107: Exception message on cart
 with no shipment items

---
 .../Magento/Quote/Model/ShippingAddressManagement.php    | 2 +-
 .../Model/Cart/AssignShippingAddressToCart.php           | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Quote/Model/ShippingAddressManagement.php b/app/code/Magento/Quote/Model/ShippingAddressManagement.php
index 45b3313d32114..b9edcc13d0077 100644
--- a/app/code/Magento/Quote/Model/ShippingAddressManagement.php
+++ b/app/code/Magento/Quote/Model/ShippingAddressManagement.php
@@ -88,7 +88,7 @@ public function assign($cartId, \Magento\Quote\Api\Data\AddressInterface $addres
         $quote = $this->quoteRepository->getActive($cartId);
         if ($quote->isVirtual()) {
             throw new NoSuchEntityException(
-                __('Shipping address is not allowed on cart: cart contains no items for shipment.')
+                __('The Cart includes virtual product(s) only, so a shipping address is not used.')
             );
         }
 
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingAddressToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingAddressToCart.php
index 4dbcfad31e84c..2d1b57cf69836 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingAddressToCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingAddressToCart.php
@@ -49,7 +49,14 @@ public function execute(
         try {
             $this->shippingAddressManagement->assign($cart->getId(), $shippingAddress);
         } catch (NoSuchEntityException $e) {
-            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+            if ($cart->getIsVirtual()) {
+                throw new GraphQlNoSuchEntityException(
+                    __('Shipping address is not allowed on cart: cart contains no items for shipment.'),
+                    $e
+                );
+            } else {
+                throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+            }
         } catch (InputException $e) {
             throw new GraphQlInputException(__($e->getMessage()), $e);
         }

From 77bd6138370b66f733c6b51e1d0d62422402dd12 Mon Sep 17 00:00:00 2001
From: Michal Derlatka <michal.derlatka1@gmail.com>
Date: Sun, 28 Jun 2020 13:03:48 +0200
Subject: [PATCH 0644/1718] magento/magento2#26107: Exception message on cart
 with no shipment items (static test fix)

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

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingAddressToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingAddressToCart.php
index 2d1b57cf69836..51303df345827 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingAddressToCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AssignShippingAddressToCart.php
@@ -16,7 +16,7 @@
 use Magento\Quote\Model\ShippingAddressManagementInterface;
 
 /**
- * Assign shipping address to cart
+ * Assigning shipping address to cart
  */
 class AssignShippingAddressToCart
 {

From f5f8556ce6b1b7a050be1a1e5554f6b7f6919051 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tylek?= <pawel.tylek@creativestyle.pl>
Date: Sun, 28 Jun 2020 19:10:45 +0200
Subject: [PATCH 0645/1718] Include initialize toolbar once test

---
 .../frontend/web/js/product/list/toolbar.js   |  2 +-
 .../frontend/js/product/list/toolbar.test.js  | 27 +++++++++++++++----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js b/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
index 3955ce9a033e1..3c188a4229aa4 100644
--- a/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
+++ b/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
@@ -38,7 +38,7 @@ define([
         /** @inheritdoc */
         _create: function () {
             if (isToolbarInitialized) {
-                return false;
+                return;
             }
             this._bind($(this.options.modeControl), this.options.mode, this.options.modeDefault);
             this._bind($(this.options.directionControl), this.options.direction, this.options.directionDefault);
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/list/toolbar.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/list/toolbar.test.js
index 4a46149ed83b0..5d09f0d85a95a 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/list/toolbar.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/list/toolbar.test.js
@@ -10,10 +10,14 @@ define([
     'use strict';
 
     describe('Magento_Catalog/js/product/list/toolbar', function () {
-        var widget;
+        var toolbar;
 
         beforeEach(function () {
-            widget = new productListToolbarForm();
+            toolbar = $('<div class="toolbar"></div>');
+        });
+
+        afterEach(function () {
+            toolbar.remove();
         });
 
         it('Widget extends jQuery object', function () {
@@ -21,9 +25,22 @@ define([
         });
 
         it('Toolbar is initialized', function () {
-            spyOn(widget, '_create');
-            widget._create();
-            expect(widget._create).toHaveBeenCalled();
+            spyOn($.mage.productListToolbarForm.prototype, '_create');
+
+            toolbar.productListToolbarForm();
+
+            expect($.mage.productListToolbarForm.prototype._create).toEqual(jasmine.any(Function));
+            expect($.mage.productListToolbarForm.prototype._create).toHaveBeenCalledTimes(1);
+        });
+
+        it('Toolbar is initialized once', function () {
+            spyOn($.mage.productListToolbarForm.prototype, '_bind');
+
+            toolbar.productListToolbarForm();
+            var secondToolbar = $('<div class="toolbar"></div>');
+            secondToolbar.productListToolbarForm();
+
+            expect($.mage.productListToolbarForm.prototype._bind).toHaveBeenCalledTimes(4);
         });
     });
 });

From 6cb1924666cf21c7d42b8a9052f5122c58cde721 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tylek?= <pawel.tylek@creativestyle.pl>
Date: Sun, 28 Jun 2020 19:17:11 +0200
Subject: [PATCH 0646/1718] fix test

---
 .../Magento/Catalog/frontend/js/product/list/toolbar.test.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/list/toolbar.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/list/toolbar.test.js
index 5d09f0d85a95a..84dd8695fb8b7 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/list/toolbar.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/list/toolbar.test.js
@@ -35,9 +35,9 @@ define([
 
         it('Toolbar is initialized once', function () {
             spyOn($.mage.productListToolbarForm.prototype, '_bind');
+            var secondToolbar = $('<div class="toolbar"></div>');
 
             toolbar.productListToolbarForm();
-            var secondToolbar = $('<div class="toolbar"></div>');
             secondToolbar.productListToolbarForm();
 
             expect($.mage.productListToolbarForm.prototype._bind).toHaveBeenCalledTimes(4);

From 7efd88d1e7352f97fcc7723577c051bca2aa0831 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tylek?= <pawel.tylek@creativestyle.pl>
Date: Sun, 28 Jun 2020 19:18:29 +0200
Subject: [PATCH 0647/1718] remove second toolbar after the test is done

---
 .../Magento/Catalog/frontend/js/product/list/toolbar.test.js     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/list/toolbar.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/list/toolbar.test.js
index 84dd8695fb8b7..e17c880a2fcf3 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/list/toolbar.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/list/toolbar.test.js
@@ -41,6 +41,7 @@ define([
             secondToolbar.productListToolbarForm();
 
             expect($.mage.productListToolbarForm.prototype._bind).toHaveBeenCalledTimes(4);
+            secondToolbar.remove();
         });
     });
 });

From 979ab1f1c37e4e6534a0a9905e166218d792722f Mon Sep 17 00:00:00 2001
From: Rudolf Vince <rudolf@mediotype.com>
Date: Mon, 29 Jun 2020 10:30:29 +0200
Subject: [PATCH 0648/1718] removed unnecessary properties

---
 .../Wishlist/Controller/Shared/Allcart.php    | 19 +--------
 .../Wishlist/Controller/Shared/Cart.php       | 41 ++-----------------
 2 files changed, 4 insertions(+), 56 deletions(-)

diff --git a/app/code/Magento/Wishlist/Controller/Shared/Allcart.php b/app/code/Magento/Wishlist/Controller/Shared/Allcart.php
index 17ee92e8c1307..96b3102a6f443 100644
--- a/app/code/Magento/Wishlist/Controller/Shared/Allcart.php
+++ b/app/code/Magento/Wishlist/Controller/Shared/Allcart.php
@@ -11,7 +11,6 @@
 use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\Action\HttpGetActionInterface;
-use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Controller\Result\Forward;
 use Magento\Framework\Controller\Result\Redirect;
 use Magento\Framework\Controller\ResultFactory;
@@ -29,33 +28,17 @@ class Allcart extends Action implements HttpGetActionInterface
      */
     private $wishlistProvider;
 
-    /**
-     * @var RequestInterface
-     */
-    private $request;
-
-    /**
-     * @var ResultFactory
-     */
-    private $resultFactory;
-
     /**
      * @param Context $context
      * @param ItemCarrier $itemCarrier
-     * @param RequestInterface $request
-     * @param ResultFactory $resultFactory
      * @param WishlistProvider $wishlistProvider
      */
     public function __construct(
         Context $context,
         ItemCarrier $itemCarrier,
-        RequestInterface $request,
-        ResultFactory $resultFactory,
         WishlistProvider $wishlistProvider
     ) {
         $this->itemCarrier = $itemCarrier;
-        $this->request = $request;
-        $this->resultFactory = $resultFactory;
         $this->wishlistProvider = $wishlistProvider;
         parent::__construct($context);
     }
@@ -74,7 +57,7 @@ public function execute()
             $resultForward->forward('noroute');
             return $resultForward;
         }
-        $redirectUrl = $this->itemCarrier->moveAllToCart($wishlist, $this->request->getParam('qty'));
+        $redirectUrl = $this->itemCarrier->moveAllToCart($wishlist, $this->getRequest()->getParam('qty'));
         /** @var Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         $resultRedirect->setUrl($redirectUrl);
diff --git a/app/code/Magento/Wishlist/Controller/Shared/Cart.php b/app/code/Magento/Wishlist/Controller/Shared/Cart.php
index b6e7904ae412c..9fdadb917a920 100644
--- a/app/code/Magento/Wishlist/Controller/Shared/Cart.php
+++ b/app/code/Magento/Wishlist/Controller/Shared/Cart.php
@@ -14,13 +14,10 @@
 use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\Action\Context as ActionContext;
 use Magento\Framework\App\Action\HttpGetActionInterface;
-use Magento\Framework\App\RequestInterface;
-use Magento\Framework\App\Response\RedirectInterface;
 use Magento\Framework\Controller\Result\Redirect as ResultRedirect;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Escaper;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Message\ManagerInterface as MessageManagerInterface;
 use Magento\Wishlist\Model\Item;
 use Magento\Wishlist\Model\Item\OptionFactory;
 use Magento\Wishlist\Model\ItemFactory;
@@ -58,26 +55,6 @@ class Cart extends Action implements HttpGetActionInterface
      */
     private $escaper;
 
-    /**
-     * @var RequestInterface
-     */
-    private $request;
-
-    /**
-     * @var RedirectInterface
-     */
-    private $redirect;
-
-    /**
-     * @var MessageManagerInterface
-     */
-    private $messageManager;
-
-    /**
-     * @var ResultFactory
-     */
-    private $resultFactory;
-
     /**
      * @param ActionContext $context
      * @param CustomerCart $cart
@@ -85,10 +62,6 @@ class Cart extends Action implements HttpGetActionInterface
      * @param ItemFactory $itemFactory
      * @param CartHelper $cartHelper
      * @param Escaper $escaper
-     * @param RequestInterface $request
-     * @param RedirectInterface $redirect
-     * @param MessageManagerInterface $messageManager
-     * @param ResultFactory $resultFactory
      */
     public function __construct(
         ActionContext $context,
@@ -96,21 +69,13 @@ public function __construct(
         OptionFactory $optionFactory,
         ItemFactory $itemFactory,
         CartHelper $cartHelper,
-        Escaper $escaper,
-        RequestInterface $request,
-        RedirectInterface $redirect,
-        MessageManagerInterface $messageManager,
-        ResultFactory $resultFactory
+        Escaper $escaper
     ) {
         $this->cart = $cart;
         $this->optionFactory = $optionFactory;
         $this->itemFactory = $itemFactory;
         $this->cartHelper = $cartHelper;
         $this->escaper = $escaper;
-        $this->request = $request;
-        $this->redirect = $redirect;
-        $this->messageManager = $messageManager;
-        $this->resultFactory = $resultFactory;
         parent::__construct($context);
     }
 
@@ -124,13 +89,13 @@ public function __construct(
      */
     public function execute()
     {
-        $itemId = (int)$this->request->getParam('item');
+        $itemId = (int)$this->getRequest()->getParam('item');
 
         /* @var $item Item */
         $item = $this->itemFactory->create()
             ->load($itemId);
 
-        $redirectUrl = $this->redirect->getRefererUrl();
+        $redirectUrl = $this->_redirect->getRefererUrl();
 
         try {
             /** @var OptionCollection $options */

From 6d8f77c7ffe52075d0b5ff117b39100bd06e1474 Mon Sep 17 00:00:00 2001
From: Rudolf Vince <rudolf@mediotype.com>
Date: Mon, 29 Jun 2020 12:10:08 +0200
Subject: [PATCH 0649/1718] fixed tests

---
 .../Wishlist/Test/Unit/Controller/Shared/AllcartTest.php    | 2 --
 .../Wishlist/Test/Unit/Controller/Shared/CartTest.php       | 6 +-----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php
index e80404b55ffdb..f44fdf1b6568b 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php
@@ -105,8 +105,6 @@ protected function setUp(): void
         $this->allcartController = new Allcart(
             $this->contextMock,
             $this->itemCarrierMock,
-            $this->requestMock,
-            $this->resultFactoryMock,
             $this->wishlistProviderMock
         );
     }
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php
index c0181ab061529..cee4b39ecfc2f 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php
@@ -183,11 +183,7 @@ protected function setUp(): void
             $this->optionFactory,
             $this->itemFactory,
             $this->cartHelper,
-            $this->escaper,
-            $this->request,
-            $this->redirect,
-            $this->messageManager,
-            $this->resultFactory
+            $this->escaper
         );
     }
 

From 2616ba14c89b3cb85a88399bca245b7ea764f4e2 Mon Sep 17 00:00:00 2001
From: Rudolf Vince <rudolf@mediotype.com>
Date: Mon, 29 Jun 2020 12:29:13 +0200
Subject: [PATCH 0650/1718] fixed tests

---
 .../Unit/Controller/Shared/AllcartTest.php    | 24 -------------------
 .../Test/Unit/Controller/Shared/CartTest.php  |  3 ---
 2 files changed, 27 deletions(-)

diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php
index f44fdf1b6568b..6c96cefe8f92f 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php
@@ -77,30 +77,6 @@ protected function setUp(): void
         $this->contextMock = $this->getMockBuilder(Context::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->wishlistMock = $this->getMockBuilder(Wishlist::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->requestMock = $this->getMockBuilder(Http::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->resultFactoryMock = $this->getMockBuilder(ResultFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->resultRedirectMock = $this->getMockBuilder(Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->resultForwardMock = $this->getMockBuilder(Forward::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultFactoryMock->expects($this->any())
-            ->method('create')
-            ->willReturnMap(
-                [
-                    [ResultFactory::TYPE_REDIRECT, [], $this->resultRedirectMock],
-                    [ResultFactory::TYPE_FORWARD, [], $this->resultForwardMock]
-                ]
-            );
 
         $this->allcartController = new Allcart(
             $this->contextMock,
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php
index cee4b39ecfc2f..da9c2d536830f 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php
@@ -173,9 +173,6 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->product = $this->getMockBuilder(Product::class)
-            ->disableOriginalConstructor()
-            ->getMock();
 
         $this->model = new SharedCart(
             $this->context,

From dd91daefe2956d8c3d2cd18a5d170f4325ae363a Mon Sep 17 00:00:00 2001
From: Michal Derlatka <michal.derlatka1@gmail.com>
Date: Mon, 29 Jun 2020 13:12:49 +0200
Subject: [PATCH 0651/1718] magento/magento2#26425: Fix TestFramework GraphQL
 headers parsing

---
 .../Magento/TestFramework/TestCase/GraphQl/Client.php         | 2 +-
 .../testsuite/Magento/GraphQl/CorsHeadersTest.php             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQl/Client.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQl/Client.php
index 5af6413840c27..2fe93c02e7adb 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQl/Client.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQl/Client.php
@@ -213,7 +213,7 @@ private function processResponseHeaders(string $headers): array
 
         $headerLines = preg_split('/((\r?\n)|(\r\n?))/', $headers);
         foreach ($headerLines as $headerLine) {
-            $headerParts = preg_split('/:/', $headerLine);
+            $headerParts = preg_split('/: /', $headerLine, 2);
             if (count($headerParts) == 2) {
                 $headersArray[trim($headerParts[0])] = trim($headerParts[1]);
             } elseif (preg_match('/HTTP\/[\.0-9]+/', $headerLine)) {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CorsHeadersTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CorsHeadersTest.php
index 25c808a549e80..b8f59b34fae0c 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/CorsHeadersTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CorsHeadersTest.php
@@ -76,7 +76,7 @@ public function testCorsHeadersWhenCorsIsEnabled(): void
         $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_ALLOWED_ORIGINS, 'http://magento.local');
         $this->resourceConfig->saveConfig(Configuration::XML_PATH_CORS_MAX_AGE, '86400');
         $this->reinitConfig->reinit();
 
@@ -85,7 +85,7 @@ public function testCorsHeadersWhenCorsIsEnabled(): void
         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('http://magento.local', $headers['Access-Control-Allow-Origin']);
         self::assertEquals('86400', $headers['Access-Control-Max-Age']);
     }
 

From 3afe988cf1bd974af1e18ec733a827d268b20816 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Mon, 29 Jun 2020 17:41:35 +0300
Subject: [PATCH 0652/1718] Fix phone

---
 app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
index e31be78185aaf..07006fe8726f8 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">1234568910</data>
+        <data key="telephone">123-456-7890</data>
         <data key="fax">1234568910</data>
         <data key="postcode">78729</data>
         <data key="city">Austin</data>

From cce0a99547cb0e597f8e3325fd59574ddc7049f8 Mon Sep 17 00:00:00 2001
From: Marjan Petkovski <petkovski.marjan@gmail.com>
Date: Mon, 29 Jun 2020 18:15:00 +0200
Subject: [PATCH 0653/1718] magento/magento2#26121: special price & tier price
 are coming in base currency

Adjust to take customer group (via setting customerGroupId) into consideration.
---
 .../Catalog/Model/Product/Type/Price.php      | 27 +++++++++-
 .../Model/Resolver/PriceTiers.php             | 11 ++---
 .../Model/Resolver/Product/Price/Tiers.php    | 30 ++++++++++--
 .../Pricing/Price/TierPrice.php               | 49 +++++++++++++++++++
 4 files changed, 104 insertions(+), 13 deletions(-)
 create mode 100644 app/code/Magento/CatalogCustomerGraphQl/Pricing/Price/TierPrice.php

diff --git a/app/code/Magento/Catalog/Model/Product/Type/Price.php b/app/code/Magento/Catalog/Model/Product/Type/Price.php
index e702965270639..40b98e55ebedc 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/Price.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/Price.php
@@ -368,10 +368,33 @@ protected function getAllCustomerGroupsId()
      * @return \Magento\Catalog\Api\Data\ProductTierPriceInterface[]
      */
     public function getTierPrices($product)
+    {
+        $tierPricesRaw = $this->getExistingPrices($product, 'tier_price');
+
+        return $this->buildProductTierPriceInterfaceObjects($tierPricesRaw);
+    }
+
+    /**
+     * Return ProductTierPriceInterface[] given raw tier prices array
+     *
+     * @param array $tierPricesRaw
+     * @return \Magento\Catalog\Api\Data\ProductTierPriceInterface[]
+     */
+    public function transformTierPrices($tierPricesRaw)
+    {
+        return $this->buildProductTierPriceInterfaceObjects($tierPricesRaw);
+    }
+
+    /**
+     * Return ProductTierPriceInterface[] given raw tier prices array
+     *
+     * @param array $tierPricesRaw
+     * @return \Magento\Catalog\Api\Data\ProductTierPriceInterface[]
+     */
+    private function buildProductTierPriceInterfaceObjects($tierPricesRaw)
     {
         $prices = [];
-        $tierPrices = $this->getExistingPrices($product, 'tier_price');
-        foreach ($tierPrices as $price) {
+        foreach ($tierPricesRaw as $price) {
             /** @var \Magento\Catalog\Api\Data\ProductTierPriceInterface $tierPrice */
             $tierPrice = $this->tierPriceFactory->create()
                 ->setExtensionAttributes($this->tierPriceExtensionFactory->create());
diff --git a/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/PriceTiers.php b/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/PriceTiers.php
index 9f198f70741df..4e75139c1a882 100644
--- a/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/PriceTiers.php
+++ b/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/PriceTiers.php
@@ -130,21 +130,18 @@ private function formatProductTierPrices(array $tierPrices, float $productPrice,
         $tiers = [];
 
         foreach ($tierPrices as $tierPrice) {
-            $websitePrice = $tierPrice['website_price'];
-            $percentValue = $tierPrice['percentage_value'];
-            $quantity = $tierPrice['price_qty'];
-
+            $percentValue = $tierPrice->getExtensionAttributes()->getPercentageValue();
             if ($percentValue && is_numeric($percentValue)) {
                 $discount = $this->discount->getDiscountByPercent($productPrice, (float)$percentValue);
             } else {
-                $discount = $this->discount->getDiscountByDifference($productPrice, (float)$websitePrice);
+                $discount = $this->discount->getDiscountByDifference($productPrice, (float)$tierPrice->getValue());
             }
 
             $tiers[] = [
                 "discount" => $discount,
-                "quantity" => $quantity,
+                "quantity" => $tierPrice->getQty(),
                 "final_price" => [
-                    "value" => $websitePrice,
+                    "value" => $tierPrice->getValue(),
                     "currency" => $store->getCurrentCurrencyCode()
                 ]
             ];
diff --git a/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/Product/Price/Tiers.php b/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/Product/Price/Tiers.php
index f574e13d6296d..2dc25f64af685 100644
--- a/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/Product/Price/Tiers.php
+++ b/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/Product/Price/Tiers.php
@@ -10,10 +10,12 @@
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
-use Magento\Catalog\Pricing\Price\TierPrice;
+use Magento\CatalogCustomerGraphQl\Pricing\Price\TierPrice;
 use Magento\Customer\Model\GroupManagement;
 use Magento\Catalog\Api\Data\ProductTierPriceInterface;
 use Magento\CatalogGraphQl\Model\Resolver\Product\Price\ProviderPool as PriceProviderPool;
+use Magento\Framework\App\ObjectManager;
+use Magento\Catalog\Model\Product\Type\Price;
 
 /**
  * Get product tier price information
@@ -55,22 +57,30 @@ class Tiers
      */
     private $products = [];
 
+    /**
+     * @var Price
+     */
+    private $price;
+
     /**
      * @param CollectionFactory $collectionFactory
      * @param ProductResource $productResource
      * @param PriceProviderPool $priceProviderPool
      * @param int $customerGroupId
+     * @param Price $price
      */
     public function __construct(
         CollectionFactory $collectionFactory,
         ProductResource $productResource,
         PriceProviderPool $priceProviderPool,
-        $customerGroupId
+        $customerGroupId,
+        Price $price
     ) {
         $this->collectionFactory = $collectionFactory;
         $this->productResource = $productResource;
         $this->priceProviderPool = $priceProviderPool;
         $this->customerGroupId = $customerGroupId;
+        $this->price = $price;
     }
 
     /**
@@ -100,9 +110,21 @@ public function getProductTierPrices($productId): ?array
         }
 
         /** @var TierPrice $tierPrice */
-        $tierPrice = $this->products[$productId]->getPriceInfo()->getPrice(TierPrice::PRICE_CODE);
+        $tierPrice = ObjectManager::getInstance()->create(TierPrice::class,
+            [
+                'saleableItem' => $this->products[$productId],
+                'quantity' => 1,
+                'customerGroupId' => $this->customerGroupId
+            ]
+        );
+
+        /** @var array $tierPricesRaw */
+        $tierPricesRaw = $tierPrice->getTierPriceList();
+
+        /** @var ProductTierPriceInterface[] $tierPrices */
+        $tierPrices = $this->price->transformTierPrices($tierPricesRaw);
 
-        return $tierPrice->getTierPriceList();
+        return $tierPrices;
     }
 
     /**
diff --git a/app/code/Magento/CatalogCustomerGraphQl/Pricing/Price/TierPrice.php b/app/code/Magento/CatalogCustomerGraphQl/Pricing/Price/TierPrice.php
new file mode 100644
index 0000000000000..8b2d8fd391b6a
--- /dev/null
+++ b/app/code/Magento/CatalogCustomerGraphQl/Pricing/Price/TierPrice.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogCustomerGraphQl\Pricing\Price;
+
+use Magento\Catalog\Model\Product;
+use Magento\Customer\Api\GroupManagementInterface;
+use Magento\Customer\Model\Session;
+use Magento\Framework\Pricing\Adjustment\CalculatorInterface;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+
+class TierPrice extends \Magento\Catalog\Pricing\Price\TierPrice
+{
+    /**
+     * TierPrice constructor.
+     * @param Product $saleableItem
+     * @param float $quantity
+     * @param CalculatorInterface $calculator
+     * @param PriceCurrencyInterface $priceCurrency
+     * @param Session $customerSession
+     * @param GroupManagementInterface $groupManagement
+     * @param int $customerGroupId
+     */
+    public function __construct(
+        Product $saleableItem,
+        $quantity,
+        CalculatorInterface $calculator,
+        PriceCurrencyInterface $priceCurrency,
+        Session $customerSession,
+        GroupManagementInterface $groupManagement,
+        $customerGroupId
+    ) {
+        parent::__construct(
+            $saleableItem,
+            $quantity,
+            $calculator,
+            $priceCurrency,
+            $customerSession,
+            $groupManagement
+        );
+
+        $this->customerGroup = $customerGroupId;
+    }
+}

From b7b2bfe403239c499e4be97345546da0d2bb3abe Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Mon, 29 Jun 2020 21:44:11 +0300
Subject: [PATCH 0654/1718] use action group for go to orders grid page

---
 .../Mftf/Test/AdminDashboardWithChartsTest.xml |  3 +--
 ...eckoutAsCustomerUsingDefaultAddressTest.xml |  3 +--
 ...geCheckoutAsCustomerUsingNewAddressTest.xml |  3 +--
 ...outAsCustomerUsingNonDefaultAddressTest.xml |  3 +--
 .../OnePageCheckoutUsingSignInLinkTest.xml     |  3 +--
 .../OnePageCheckoutWithAllProductTypesTest.xml |  3 +--
 ...lingAddressAndProductWithTierPricesTest.xml |  3 +--
 ...essAndRegisterCustomerAfterCheckoutTest.xml |  3 +--
 ...ontCheckoutWithSpecialPriceProductsTest.xml |  3 +--
 ...tOnLoginWhenGuestCheckoutIsDisabledTest.xml |  3 +--
 ...RegistrationAndDisableGuestCheckoutTest.xml |  3 +--
 ...stCheckoutUsingFreeShippingAndTaxesTest.xml |  3 +--
 ...stCheckoutWithCouponAndZeroSubtotalTest.xml |  3 +--
 ...angesInBackendAfterCustomerCheckoutTest.xml |  3 +--
 ...refrontUKCustomerCheckoutWithCouponTest.xml |  3 +--
 ...ductQuantityEqualsToOrderedQuantityTest.xml |  3 +--
 ...hCouponAndBankTransferPaymentMethodTest.xml |  3 +--
 .../Test/AdminCreatingShippingLabelTest.xml    |  2 +-
 ...outWhenCartPageIsOpenedInAnotherTabTest.xml |  2 +-
 .../AdminOpenOrdersPageActionGroup.xml         | 18 ++++++++++++++++++
 ...derWithCheckMoneyOrderPaymentMethodTest.xml |  3 +--
 ...rWithProductQtyWithoutStockDecreaseTest.xml |  6 ++----
 ...rectnessInvoicedItemInBundleProductTest.xml |  2 +-
 ...inMassOrdersCancelCompleteAndClosedTest.xml |  3 +--
 ...MassOrdersCancelProcessingAndClosedTest.xml |  3 +--
 .../Test/AdminMassOrdersHoldOnCompleteTest.xml |  3 +--
 ...assOrdersHoldOnPendingAndProcessingTest.xml |  3 +--
 .../AdminMassOrdersReleasePendingOrderTest.xml |  3 +--
 ...nMassOrdersUpdateCancelPendingOrderTest.xml |  3 +--
 .../AdminOrdersReleaseInUnholdStatusTest.xml   |  3 +--
 ...SubmitsOrderPaymentMethodValidationTest.xml |  3 +--
 ...dminSubmitsOrderWithAndWithoutEmailTest.xml |  3 +--
 ...OrderWithAndWithoutFieldsValidationTest.xml |  3 +--
 ...omOrderStatusNotVisibleOnStorefrontTest.xml |  6 ++----
 .../CreateInvoiceAndCheckInvoiceOrderTest.xml  |  6 ++----
 ...oiceWithCashOnDeliveryPaymentMethodTest.xml |  3 +--
 ...ceWithShipmentAndCheckInvoicedOrderTest.xml |  9 +++------
 ...eateInvoiceWithZeroSubtotalCheckoutTest.xml |  3 +--
 ...reditMemoTotalAfterShippingDiscountTest.xml |  3 +--
 39 files changed, 61 insertions(+), 83 deletions(-)
 create mode 100644 app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenOrdersPageActionGroup.xml

diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml
index 972947656cd3d..f7763c8825b62 100644
--- a/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml
@@ -93,8 +93,7 @@
         <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessInvoiceMessage"/>
         <!--Create Shipment for the order-->
         <comment userInput="Create Shipment for the order" stepKey="createShipmentForOrder"/>
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage2"/>
-        <waitForPageLoad time="30" stepKey="waitForOrderListPageLoading"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="onOrdersPage2"/>
         <actionGroup ref="AdminOrderGridClickFirstRowActionGroup" stepKey="openOrderPageForShip"/>
         <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction"/>
         <waitForPageLoad stepKey="waitForShipmentPagePage"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingDefaultAddressTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingDefaultAddressTest.xml
index 3215503b3205a..cdb4a16d904fc 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingDefaultAddressTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingDefaultAddressTest.xml
@@ -85,8 +85,7 @@
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
 
         <!-- Open created order in backend -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
-        <waitForPageLoad stepKey="waitForOrdersPageLoad"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
         <actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrderGridById">
             <argument name="orderId" value="$grabOrderNumber"/>
         </actionGroup>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNewAddressTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNewAddressTest.xml
index 76a998fec8adc..a5c90fbdc58a8 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNewAddressTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNewAddressTest.xml
@@ -98,8 +98,7 @@
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
 
         <!-- Open created order in backend -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
-        <waitForPageLoad stepKey="waitForOrdersPageLoad"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
         <actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrderGridById">
             <argument name="orderId" value="$grabOrderNumber"/>
         </actionGroup>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNonDefaultAddressTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNonDefaultAddressTest.xml
index 340ff4159900a..5774b2a5f32b2 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNonDefaultAddressTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNonDefaultAddressTest.xml
@@ -86,8 +86,7 @@
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
 
         <!-- Open created order in backend -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
-        <waitForPageLoad stepKey="waitForOrdersPageLoad"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
         <actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrderGridById">
             <argument name="orderId" value="$grabOrderNumber"/>
         </actionGroup>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutUsingSignInLinkTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutUsingSignInLinkTest.xml
index 1c03808ac71cf..e863a2f500fdc 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutUsingSignInLinkTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutUsingSignInLinkTest.xml
@@ -79,8 +79,7 @@
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
 
         <!-- Open created order in backend -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
-        <waitForPageLoad stepKey="waitForOrdersPageLoad"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
         <actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrderGridById">
             <argument name="orderId" value="$grabOrderNumber"/>
         </actionGroup>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutWithAllProductTypesTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutWithAllProductTypesTest.xml
index e678bb0d2a87b..6958f89a483af 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutWithAllProductTypesTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutWithAllProductTypesTest.xml
@@ -198,8 +198,7 @@
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
 
         <!-- Open created order -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
-        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
         <actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrderGridById">
             <argument name="orderId" value="$grabOrderNumber"/>
         </actionGroup>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithDifferentShippingAndBillingAddressAndProductWithTierPricesTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithDifferentShippingAndBillingAddressAndProductWithTierPricesTest.xml
index 38efc9d7eca24..adf254e955a4f 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithDifferentShippingAndBillingAddressAndProductWithTierPricesTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithDifferentShippingAndBillingAddressAndProductWithTierPricesTest.xml
@@ -108,8 +108,7 @@
         <see selector="{{StorefrontCustomerAddressesSection.shippingAddress}}" userInput="T: {{updateCustomerUKAddress.telephone}}" stepKey="seeTelephoneInShippingAddress"/>
 
         <!--Open Order Index Page -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
-        <waitForPageLoad stepKey="waitForOrderIndexPageToLoad"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
 
         <!-- Filter Order using orderId and assert order-->
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithDifferentShippingAndBillingAddressAndRegisterCustomerAfterCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithDifferentShippingAndBillingAddressAndRegisterCustomerAfterCheckoutTest.xml
index eda6d5f867540..fbde35f1696c8 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithDifferentShippingAndBillingAddressAndRegisterCustomerAfterCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithDifferentShippingAndBillingAddressAndRegisterCustomerAfterCheckoutTest.xml
@@ -77,8 +77,7 @@
         <actionGroup ref="StorefrontRegisterCustomerAfterCheckoutActionGroup" stepKey="registerCustomer"/>
 
         <!-- Open Order Index Page -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
-        <waitForPageLoad stepKey="waitForPageLoad5"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
 
         <!-- Filter Order using orderId and assert order-->
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithSpecialPriceProductsTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithSpecialPriceProductsTest.xml
index 0042c73b13826..389762ae5e96f 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithSpecialPriceProductsTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithSpecialPriceProductsTest.xml
@@ -150,8 +150,7 @@
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="orderId"/>
 
         <!-- Open Order Index Page -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
-        <waitForPageLoad stepKey="waitForPageLoad5"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
 
         <!-- Filter Order using orderId and assert order-->
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutOnLoginWhenGuestCheckoutIsDisabledTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutOnLoginWhenGuestCheckoutIsDisabledTest.xml
index 5fbfdb5a07678..f0b6c767f7297 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutOnLoginWhenGuestCheckoutIsDisabledTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutOnLoginWhenGuestCheckoutIsDisabledTest.xml
@@ -77,8 +77,7 @@
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="orderId"/>
 
         <!-- Open Order Index Page -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
 
         <!-- Filter Order using orderId and assert order-->
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutWithNewCustomerRegistrationAndDisableGuestCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutWithNewCustomerRegistrationAndDisableGuestCheckoutTest.xml
index 0f82302260995..9d36c24a151d2 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutWithNewCustomerRegistrationAndDisableGuestCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutWithNewCustomerRegistrationAndDisableGuestCheckoutTest.xml
@@ -115,8 +115,7 @@
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="orderId"/>
 
         <!-- Open Order Index Page -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
 
         <!-- Filter Order using orderId and assert order-->
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml
index dbb695fb4fb00..814030277ab6a 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml
@@ -195,8 +195,7 @@
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumberWithoutLink}}" stepKey="orderId"/>
 
         <!-- Open Order Index Page -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
-        <waitForPageLoad stepKey="waitForPageLoad5"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
 
         <!-- Filter Order using orderId and assert order-->
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutWithCouponAndZeroSubtotalTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutWithCouponAndZeroSubtotalTest.xml
index e9d056417330d..332548354f561 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutWithCouponAndZeroSubtotalTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutWithCouponAndZeroSubtotalTest.xml
@@ -73,8 +73,7 @@
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumberWithoutLink}}" stepKey="orderId"/>
 
         <!-- Open Order Index Page -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
-        <waitForPageLoad stepKey="waitForPageLoad5"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
 
         <!-- Filter Order using orderId and assert order-->
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductQuantityChangesInBackendAfterCustomerCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductQuantityChangesInBackendAfterCustomerCheckoutTest.xml
index ffdbab03ca337..00973eee1bea4 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductQuantityChangesInBackendAfterCustomerCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductQuantityChangesInBackendAfterCustomerCheckoutTest.xml
@@ -67,8 +67,7 @@
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumberWithoutLink}}" stepKey="orderId"/>
 
         <!-- Open Order Index Page -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
-        <waitForPageLoad stepKey="waitForPageLoad5"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
 
         <!-- Filter Order using orderId and assert order-->
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUKCustomerCheckoutWithCouponTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUKCustomerCheckoutWithCouponTest.xml
index 792025acf1708..2bff260a6126f 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUKCustomerCheckoutWithCouponTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUKCustomerCheckoutWithCouponTest.xml
@@ -112,8 +112,7 @@
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminPanel"/>
 
         <!-- Open Order Index Page -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
-        <waitForPageLoad stepKey="waitForPageLoad5"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
 
         <!-- Filter Order using orderId and assert order-->
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUKGuestCheckoutWithConditionProductQuantityEqualsToOrderedQuantityTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUKGuestCheckoutWithConditionProductQuantityEqualsToOrderedQuantityTest.xml
index 76a3adfb67057..b3514735716c9 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUKGuestCheckoutWithConditionProductQuantityEqualsToOrderedQuantityTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUKGuestCheckoutWithConditionProductQuantityEqualsToOrderedQuantityTest.xml
@@ -62,8 +62,7 @@
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumberWithoutLink}}" stepKey="orderId"/>
 
         <!-- Open Order Index Page -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
-        <waitForPageLoad stepKey="waitForPageLoad5"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
 
         <!-- Filter Order using orderId and assert order-->
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUSCustomerCheckoutWithCouponAndBankTransferPaymentMethodTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUSCustomerCheckoutWithCouponAndBankTransferPaymentMethodTest.xml
index 8410dd15fa04e..e6dc176c35c82 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUSCustomerCheckoutWithCouponAndBankTransferPaymentMethodTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUSCustomerCheckoutWithCouponAndBankTransferPaymentMethodTest.xml
@@ -74,8 +74,7 @@
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumberWithoutLink}}" stepKey="orderId"/>
 
         <!-- Open Order Index Page -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
 
         <!-- Filter Order using orderId and assert order-->
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
diff --git a/app/code/Magento/Fedex/Test/Mftf/Test/AdminCreatingShippingLabelTest.xml b/app/code/Magento/Fedex/Test/Mftf/Test/AdminCreatingShippingLabelTest.xml
index 1c61bd290f005..be5638bf70080 100644
--- a/app/code/Magento/Fedex/Test/Mftf/Test/AdminCreatingShippingLabelTest.xml
+++ b/app/code/Magento/Fedex/Test/Mftf/Test/AdminCreatingShippingLabelTest.xml
@@ -105,7 +105,7 @@
         </actionGroup>
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
         <!--Open created order in admin-->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="onOrdersPage"/>
         <actionGroup ref="SearchAdminDataGridByKeywordActionGroup" stepKey="searchOrder">
             <argument name="keyword" value="$grabOrderNumber"/>
         </actionGroup>
diff --git a/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontProcessMultishippingCheckoutWhenCartPageIsOpenedInAnotherTabTest.xml b/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontProcessMultishippingCheckoutWhenCartPageIsOpenedInAnotherTabTest.xml
index 7bb26525b173f..8025c1f005a49 100644
--- a/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontProcessMultishippingCheckoutWhenCartPageIsOpenedInAnotherTabTest.xml
+++ b/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontProcessMultishippingCheckoutWhenCartPageIsOpenedInAnotherTabTest.xml
@@ -101,7 +101,7 @@
         <seeElement selector="{{StorefrontCustomerOrdersGridSection.orderView({$grabSecondOrderId})}}" stepKey="seeSecondOrder"/>
         <waitForPageLoad stepKey="waitForOrderPageLoad"/>
         <!-- Go to Admin > Sales > Orders -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="onOrdersPage"/>
         <actionGroup ref="SearchAdminDataGridByKeywordActionGroup" stepKey="searchFirstOrder">
             <argument name="keyword" value="$grabFirstOrderId"/>
         </actionGroup>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenOrdersPageActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenOrdersPageActionGroup.xml
new file mode 100644
index 0000000000000..b116880263c15
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenOrdersPageActionGroup.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="AdminOpenOrdersPageActionGroup">
+        <annotations>
+            <description>Goes to the Admin Orders page.</description>
+        </annotations>
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="openOrdersGridPage"/>
+        <waitForPageLoad stepKey="waitForLoadingPage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCheckMoneyOrderPaymentMethodTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCheckMoneyOrderPaymentMethodTest.xml
index c0ebbe450119e..2d3f3a9db4ead 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCheckMoneyOrderPaymentMethodTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCheckMoneyOrderPaymentMethodTest.xml
@@ -215,8 +215,7 @@
         </actionGroup>
         <!-- Open Order Index Page -->
         <comment userInput="Open Order Index Page" stepKey="openOrderIndexPageComemnt"/>
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
-        <waitForPageLoad stepKey="waitForPageLoad5"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
         <!-- Filter order using orderId -->
         <comment userInput="Filter order using orderId" stepKey="filterOrderUsingOrderIdComment"/>
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithProductQtyWithoutStockDecreaseTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithProductQtyWithoutStockDecreaseTest.xml
index 256417c0d0d10..7fa9c40e6f1e4 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithProductQtyWithoutStockDecreaseTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithProductQtyWithoutStockDecreaseTest.xml
@@ -76,8 +76,7 @@
         <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="In Stock" stepKey="seeProductStockStatus"/>
 
         <!-- Open Order Index Page -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
-        <waitForPageLoad stepKey="waitForPageLoad5"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
 
         <!-- Filter Order using orderId -->
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
@@ -98,8 +97,7 @@
         <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="In Stock" stepKey="seeProductStockStatusAfterCancelOrder"/>
 
         <!-- Open Order Index Page -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders1"/>
-        <waitForPageLoad stepKey="waitForPageLoad6"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders1"/>
 
         <!-- Filter Order using orderId -->
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById1">
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml
index b8612f7f795fb..1814b554f9884 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml
@@ -77,7 +77,7 @@
 
         <!--Go to order page submit invoice-->
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="onOrdersPage"/>
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
             <argument name="orderId" value="$grabOrderNumber"/>
         </actionGroup>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedTest.xml
index a89e9f7ce6ebe..98182aa7ec720 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedTest.xml
@@ -63,8 +63,7 @@
         <actionGroup ref="AdminCreateInvoiceAndCreditMemoActionGroup" stepKey="createCreditMemo"/>
 
         <!-- Navigate to backend: Go to Sales > Orders -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrderPage"/>
-        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="onOrderPage"/>
         <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
 
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelProcessingAndClosedTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelProcessingAndClosedTest.xml
index 45cbe23042e03..76662791fd477 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelProcessingAndClosedTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelProcessingAndClosedTest.xml
@@ -63,8 +63,7 @@
         <actionGroup ref="AdminCreateInvoiceAndCreditMemoActionGroup" stepKey="createCreditMemo"/>
 
         <!-- Navigate to backend: Go to Sales > Orders -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrderPage"/>
-        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="onOrderPage"/>
         <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
 
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnCompleteTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnCompleteTest.xml
index 22b2d69a73090..46419aaad8f7d 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnCompleteTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnCompleteTest.xml
@@ -50,8 +50,7 @@
         <actionGroup ref="AdminCreateInvoiceAndShipmentActionGroup" stepKey="createShipment"/>
 
         <!-- Navigate to backend: Go to Sales > Orders -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrderPage"/>
-        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="onOrderPage"/>
         <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
 
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnPendingAndProcessingTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnPendingAndProcessingTest.xml
index 4b690a00ee9ed..cc9daded11a49 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnPendingAndProcessingTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnPendingAndProcessingTest.xml
@@ -60,8 +60,7 @@
         <actionGroup ref="AdminCreateInvoiceActionGroup" stepKey="createInvoice"/>
 
         <!-- Navigate to backend: Go to Sales > Orders -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrderPage"/>
-        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="onOrderPage"/>
         <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
 
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersReleasePendingOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersReleasePendingOrderTest.xml
index e1d934f794142..98396d439e672 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersReleasePendingOrderTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersReleasePendingOrderTest.xml
@@ -47,8 +47,7 @@
         </assertNotEmpty>
 
         <!-- Navigate to backend: Go to Sales > Orders -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrderPage"/>
-        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="onOrderPage"/>
         <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
 
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersUpdateCancelPendingOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersUpdateCancelPendingOrderTest.xml
index 86a3e381cb237..e58997cee0d9e 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersUpdateCancelPendingOrderTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersUpdateCancelPendingOrderTest.xml
@@ -46,8 +46,7 @@
         </assertNotEmpty>
 
         <!-- Navigate to backend: Go to Sales > Orders -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrderPage"/>
-        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="onOrderPage"/>
         <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
 
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminOrdersReleaseInUnholdStatusTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminOrdersReleaseInUnholdStatusTest.xml
index bfd75a69b81d6..db9cb4c71892e 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminOrdersReleaseInUnholdStatusTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminOrdersReleaseInUnholdStatusTest.xml
@@ -52,8 +52,7 @@
         <see userInput="You put the order on hold." stepKey="seeHoldMessage"/>
 
         <!-- Navigate to backend: Go to Sales > Orders -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrderPage"/>
-        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="onOrderPage"/>
         <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
 
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderPaymentMethodValidationTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderPaymentMethodValidationTest.xml
index 85665dfc1b00e..10c3134bac7e3 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderPaymentMethodValidationTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderPaymentMethodValidationTest.xml
@@ -33,8 +33,7 @@
         </after>
         <!--Create order via Admin-->
         <comment userInput="Admin creates order" stepKey="adminCreateOrderComment"/>
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderIndexPage"/>
-        <waitForPageLoad stepKey="waitForIndexPageLoad"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="navigateToOrderIndexPage"/>
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Orders" stepKey="seeIndexPageTitle"/>
         <click selector="{{AdminOrdersGridSection.createNewOrder}}" stepKey="clickCreateNewOrder"/>
         <click selector="{{AdminOrderFormActionSection.CreateNewCustomer}}" stepKey="clickCreateCustomer"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml
index 7615cc219d430..47a7e7bf86f83 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml
@@ -32,8 +32,7 @@
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         <comment userInput="Admin creates order" stepKey="adminCreateOrderComment"/>
         <!--<actionGroup ref="NavigateToNewOrderPageNewCustomerActionGroup" stepKey="navigateToNewOrderPage"/>-->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderIndexPage"/>
-        <waitForPageLoad stepKey="waitForIndexPageLoad"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="navigateToOrderIndexPage"/>
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Orders" stepKey="seeIndexPageTitle"/>
         <click selector="{{AdminOrdersGridSection.createNewOrder}}" stepKey="clickCreateNewOrder"/>
         <click selector="{{AdminOrderFormActionSection.CreateNewCustomer}}" stepKey="clickCreateCustomer"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutFieldsValidationTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutFieldsValidationTest.xml
index fd26ca1ca601e..187674e8d8d33 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutFieldsValidationTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutFieldsValidationTest.xml
@@ -31,8 +31,7 @@
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         <comment userInput="Admin creates order" stepKey="adminCreateOrderComment"/>
         <!--<actionGroup ref="NavigateToNewOrderPageNewCustomerActionGroup" stepKey="navigateToNewOrderPage"/>-->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderIndexPage"/>
-        <waitForPageLoad stepKey="waitForIndexPageLoad"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="navigateToOrderIndexPage"/>
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Orders" stepKey="seeIndexPageTitle"/>
         <click selector="{{AdminOrdersGridSection.createNewOrder}}" stepKey="clickCreateNewOrder"/>
         <click selector="{{AdminOrderFormActionSection.CreateNewCustomer}}" stepKey="clickCreateCustomer"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AssignCustomOrderStatusNotVisibleOnStorefrontTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AssignCustomOrderStatusNotVisibleOnStorefrontTest.xml
index f0f4cf9d1a468..dcbe59f3f89f2 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AssignCustomOrderStatusNotVisibleOnStorefrontTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AssignCustomOrderStatusNotVisibleOnStorefrontTest.xml
@@ -85,8 +85,7 @@
         <grabTextFrom selector="|Order # (\d+)|" stepKey="getOrderId"/>
 
         <!-- Assert order status is correct -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrdersPage"/>
-        <waitForPageLoad stepKey="waitForOrdersPageLoad"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrdersPage"/>
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrdersGridById">
             <argument name="orderId" value="$getOrderId"/>
         </actionGroup>
@@ -110,8 +109,7 @@
         <see selector="{{StorefrontOrderInformationMainSection.emptyMessage}}" userInput="You have placed no orders." stepKey="seeEmptyMessage"/>
 
         <!-- Cancel order -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToAdminOrdersPage"/>
-        <waitForPageLoad stepKey="waitForAdminOrdersPageLoad"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToAdminOrdersPage"/>
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrdersGridByOrderId">
             <argument name="orderId" value="$getOrderId"/>
         </actionGroup>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceAndCheckInvoiceOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceAndCheckInvoiceOrderTest.xml
index d8a3db76da05e..bd5749e238cc2 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceAndCheckInvoiceOrderTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceAndCheckInvoiceOrderTest.xml
@@ -77,8 +77,7 @@
         <grabTextFrom selector="|Order # (\d+)|" stepKey="getOrderId"/>
 
         <!-- Open created order -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrdersPage"/>
-        <waitForPageLoad stepKey="waitForOrdersPageLoad"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrdersPage"/>
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrdersGridById">
             <argument name="orderId" value="$getOrderId"/>
         </actionGroup>
@@ -103,8 +102,7 @@
         <grabFromCurrentUrl regex="~/invoice_id/(\d+)/~" stepKey="grabInvoiceId"/>
 
         <!-- Assert invoice in invoices tab -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
-        <waitForPageLoad stepKey="waitForOrdersLoad"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridByIdForAssertingInvoiceBtn">
             <argument name="orderId" value="$getOrderId"/>
         </actionGroup>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithCashOnDeliveryPaymentMethodTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithCashOnDeliveryPaymentMethodTest.xml
index c58b95a41b157..9e60964f447d8 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithCashOnDeliveryPaymentMethodTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithCashOnDeliveryPaymentMethodTest.xml
@@ -77,8 +77,7 @@
         <grabTextFrom selector="|Order # (\d+)|" stepKey="getOrderId"/>
 
         <!-- Open created order -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrdersPage"/>
-        <waitForPageLoad stepKey="waitForOrdersPageLoad"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrdersPage"/>
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrdersGridById">
             <argument name="orderId" value="$getOrderId"/>
         </actionGroup>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithShipmentAndCheckInvoicedOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithShipmentAndCheckInvoicedOrderTest.xml
index 1c92c2dae3712..7cd966777294d 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithShipmentAndCheckInvoicedOrderTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithShipmentAndCheckInvoicedOrderTest.xml
@@ -71,8 +71,7 @@
         <grabTextFrom selector="|Order # (\d+)|" stepKey="getOrderId"/>
 
         <!-- Open created order -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrdersPage"/>
-        <waitForPageLoad stepKey="waitForOrdersPageLoad"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrdersPage"/>
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrdersGridById">
             <argument name="orderId" value="$getOrderId"/>
         </actionGroup>
@@ -101,8 +100,7 @@
         <grabFromCurrentUrl regex="~/invoice_id/(\d+)/~" stepKey="grabInvoiceId"/>
 
         <!-- Assert no invoice button -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
-        <waitForPageLoad stepKey="waitForOrdersLoad"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridByIdForAssertingInvoiceBtn">
             <argument name="orderId" value="$getOrderId"/>
         </actionGroup>
@@ -146,8 +144,7 @@
         <grabFromCurrentUrl regex="~/shipment_id/(\d+)/~" stepKey="grabShipmentId"/>
 
         <!-- Assert no ship button -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToAdminOrdersPage"/>
-        <waitForPageLoad stepKey="waitForOrdersPageToLoad"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToAdminOrdersPage"/>
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridByIdForAssertingShipBtn">
             <argument name="orderId" value="$getOrderId"/>
         </actionGroup>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithZeroSubtotalCheckoutTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithZeroSubtotalCheckoutTest.xml
index b562073a1276f..920513db2621b 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithZeroSubtotalCheckoutTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithZeroSubtotalCheckoutTest.xml
@@ -86,8 +86,7 @@
         <grabTextFrom selector="|Order # (\d+)|" stepKey="getOrderId"/>
 
         <!-- Open created order -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrdersPage"/>
-        <waitForPageLoad stepKey="waitForOrdersPageLoad"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrdersPage"/>
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrdersGridById">
             <argument name="orderId" value="$getOrderId"/>
         </actionGroup>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml
index bd76f5c10b488..6e4dbe1b79033 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml
@@ -95,8 +95,7 @@
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
 
         <!-- Search for Order in the order grid -->
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="onOrdersPage"/>
-        <waitForPageLoad time="30" stepKey="waitForOrderListPageLoad"/>
+        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="onOrdersPage"/>
         <conditionalClick selector="{{AdminOrdersGridSection.clearFilters}}" dependentSelector="{{AdminOrdersGridSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilter"/>
         <fillField selector="{{AdminOrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="searchOrderNum"/>
         <click selector="{{AdminOrdersGridSection.submitSearch}}" stepKey="submitSearch"/>

From 15ceda004e00ce90d998f5fda8b83b7b914498da Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Mon, 29 Jun 2020 21:59:44 +0300
Subject: [PATCH 0655/1718] Update some phones

---
 app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
index 07006fe8726f8..44d6e725af9d8 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
@@ -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-44-444-44</data>
+        <data key="telephone">444-444-4444</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">0123456789-02134567</data>
+        <data key="telephone">888-777-7890</data>
         <array key="street">
             <item>172, Westminster Bridge Rd</item>
             <item>7700 xyz street</item>

From d87d307baeb67ca38c6caa3aa5a63e6931686560 Mon Sep 17 00:00:00 2001
From: Vitaliy Ryaboy <vriaboy@gmail.com>
Date: Mon, 29 Jun 2020 18:43:26 +0200
Subject: [PATCH 0656/1718] improve and make more strict autoload.php

---
 app/autoload.php | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/app/autoload.php b/app/autoload.php
index d6407083dc0b3..6a0a95347a681 100644
--- a/app/autoload.php
+++ b/app/autoload.php
@@ -5,36 +5,48 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 use Magento\Framework\Autoload\AutoloaderRegistry;
 use Magento\Framework\Autoload\ClassLoaderWrapper;
 
 /**
  * Shortcut constant for the root directory
  */
-define('BP', dirname(__DIR__));
+\define('BP', \dirname(__DIR__));
 
-define('VENDOR_PATH', BP . '/app/etc/vendor_path.php');
+\define('VENDOR_PATH', BP . '/app/etc/vendor_path.php');
 
-if (!file_exists(VENDOR_PATH)) {
+if (!\is_readable(VENDOR_PATH)) {
     throw new \Exception(
         'We can\'t read some files that are required to run the Magento application. '
          . 'This usually means file permissions are set incorrectly.'
     );
 }
 
-$vendorDir = require VENDOR_PATH;
-$vendorAutoload = BP . "/{$vendorDir}/autoload.php";
+$vendorAutoload = (
+    static function (): ?string {
+        $vendorDir = require VENDOR_PATH;
+
+        $vendorAutoload = BP . "/{$vendorDir}/autoload.php";
+        if (\is_readable($vendorAutoload)) {
+            return $vendorAutoload;
+        }
+
+        $vendorAutoload = "{$vendorDir}/autoload.php";
+        if (\is_readable($vendorAutoload)) {
+            return $vendorAutoload;
+        }
+
+        return null;
+    }
+)();
 
-/* 'composer install' validation */
-if (file_exists($vendorAutoload)) {
-    $composerAutoloader = include $vendorAutoload;
-} else if (file_exists("{$vendorDir}/autoload.php")) {
-	$vendorAutoload = "{$vendorDir}/autoload.php";
-	$composerAutoloader = include $vendorAutoload;
-} else {
+if ($vendorAutoload === null) {
     throw new \Exception(
         'Vendor autoload is not found. Please run \'composer install\' under application root directory.'
     );
 }
 
+$composerAutoloader = include $vendorAutoload;
 AutoloaderRegistry::registerAutoloader(new ClassLoaderWrapper($composerAutoloader));

From 7f8dd4456dde2e6c435741905ac07ae36466243e Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Tue, 30 Jun 2020 09:39:16 +0300
Subject: [PATCH 0657/1718] fix static

---
 .../Customer/Model/ResourceModel/CustomerRepository.php     | 1 +
 .../Magento/Customer/Api/CustomerRepositoryTest.php         | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
index 3a5b6593c2190..8125ddc52c8df 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
@@ -196,6 +196,7 @@ public function __construct(
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function save(CustomerInterface $customer, $passwordHash = null)
     {
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 7384696a9ebcc..e1fb9e29105b9 100644
--- a/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php
@@ -31,9 +31,9 @@
  */
 class CustomerRepositoryTest extends WebapiAbstract
 {
-    private const SERVICE_VERSION = 'V1';
-    private const SERVICE_NAME = 'customerCustomerRepositoryV1';
-    private const RESOURCE_PATH = '/V1/customers';
+    const SERVICE_VERSION = 'V1';
+    const SERVICE_NAME = 'customerCustomerRepositoryV1';
+    const RESOURCE_PATH = '/V1/customers';
 
     private const STUB_INVALID_CUSTOMER_GROUP_ID = 777;
 

From 6dd0bb69333c549d2267cfc7a054eb66da1deadf Mon Sep 17 00:00:00 2001
From: Anton Evers <evers@adobe.com>
Date: Mon, 15 Apr 2019 14:08:49 +0200
Subject: [PATCH 0658/1718] Support cron expressions like `3/10 * * * *` and
 handle hyphen expressions like `3-23/5 * * * *` correctly

---
 app/code/Magento/Cron/Model/Schedule.php         | 10 +++++++++-
 .../Cron/Test/Unit/Model/ScheduleTest.php        | 16 ++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Cron/Model/Schedule.php b/app/code/Magento/Cron/Model/Schedule.php
index 3769b8f12cad2..136e2ef191084 100644
--- a/app/code/Magento/Cron/Model/Schedule.php
+++ b/app/code/Magento/Cron/Model/Schedule.php
@@ -189,6 +189,7 @@ public function matchCronExpression($expr, $num)
         }
 
         // handle all match by modulus
+        $offset = 0;
         if ($expr === '*') {
             $from = 0;
             $to = 60;
@@ -201,6 +202,13 @@ public function matchCronExpression($expr, $num)
 
             $from = $this->getNumeric($e[0]);
             $to = $this->getNumeric($e[1]);
+            if ($mod !== 1) {
+                $offset = $from;
+            }
+        } elseif ($mod !== 1) {
+            $offset = $this->getNumeric($expr);
+            $from = 0;
+            $to = 60;
         } else {
             // handle regular token
             $from = $this->getNumeric($expr);
@@ -211,7 +219,7 @@ public function matchCronExpression($expr, $num)
             throw new CronException(__('Invalid cron expression: %1', $expr));
         }
 
-        return $num >= $from && $num <= $to && $num % $mod === 0;
+        return $num >= $from && $num <= $to && ($num - $offset) % $mod === 0;
     }
 
     /**
diff --git a/app/code/Magento/Cron/Test/Unit/Model/ScheduleTest.php b/app/code/Magento/Cron/Test/Unit/Model/ScheduleTest.php
index 25e9a8347b2cd..81e96c6ea75b3 100644
--- a/app/code/Magento/Cron/Test/Unit/Model/ScheduleTest.php
+++ b/app/code/Magento/Cron/Test/Unit/Model/ScheduleTest.php
@@ -128,24 +128,28 @@ public function setCronExprDataProvider(): array
             [', * * * *', [',', '*', '*', '*', '*']],
             ['1-2 * * * *', ['1-2', '*', '*', '*', '*']],
             ['0/5 * * * *', ['0/5', '*', '*', '*', '*']],
+            ['3/5 * * * *', ['3/5', '*', '*', '*', '*']],
 
             ['* 0 * * *', ['*', '0', '*', '*', '*']],
             ['* 59 * * *', ['*', '59', '*', '*', '*']],
             ['* , * * *', ['*', ',', '*', '*', '*']],
             ['* 1-2 * * *', ['*', '1-2', '*', '*', '*']],
             ['* 0/5 * * *', ['*', '0/5', '*', '*', '*']],
+            ['* 3/5 * * *', ['*', '3/5', '*', '*', '*']],
 
             ['* * 0 * *', ['*', '*', '0', '*', '*']],
             ['* * 23 * *', ['*', '*', '23', '*', '*']],
             ['* * , * *', ['*', '*', ',', '*', '*']],
             ['* * 1-2 * *', ['*', '*', '1-2', '*', '*']],
             ['* * 0/5 * *', ['*', '*', '0/5', '*', '*']],
+            ['* * 3/5 * *', ['*', '*', '3/5', '*', '*']],
 
             ['* * * 1 *', ['*', '*', '*', '1', '*']],
             ['* * * 31 *', ['*', '*', '*', '31', '*']],
             ['* * * , *', ['*', '*', '*', ',', '*']],
             ['* * * 1-2 *', ['*', '*', '*', '1-2', '*']],
             ['* * * 0/5 *', ['*', '*', '*', '0/5', '*']],
+            ['* * * 3/5 *', ['*', '*', '*', '3/5', '*']],
             ['* * * ? *', ['*', '*', '*', '?', '*']],
             ['* * * L *', ['*', '*', '*', 'L', '*']],
             ['* * * W *', ['*', '*', '*', 'W', '*']],
@@ -156,6 +160,7 @@ public function setCronExprDataProvider(): array
             ['* * * * ,', ['*', '*', '*', '*', ',']],
             ['* * * * 1-2', ['*', '*', '*', '*', '1-2']],
             ['* * * * 0/5', ['*', '*', '*', '*', '0/5']],
+            ['* * * * 3/5', ['*', '*', '*', '*', '3/5']],
             ['* * * * JAN', ['*', '*', '*', '*', 'JAN']],
             ['* * * * DEC', ['*', '*', '*', '*', 'DEC']],
             ['* * * * JAN-DEC', ['*', '*', '*', '*', 'JAN-DEC']],
@@ -165,6 +170,7 @@ public function setCronExprDataProvider(): array
             ['* * * * * ,', ['*', '*', '*', '*', '*', ',']],
             ['* * * * * 1-2', ['*', '*', '*', '*', '*', '1-2']],
             ['* * * * * 0/5', ['*', '*', '*', '*', '*', '0/5']],
+            ['* * * * * 3/5', ['*', '*', '*', '*', '*', '3/5']],
             ['* * * * * ?', ['*', '*', '*', '*', '*', '?']],
             ['* * * * * L', ['*', '*', '*', '*', '*', 'L']],
             ['* * * * * 6#3', ['*', '*', '*', '*', '*', '6#3']],
@@ -372,9 +378,19 @@ public function matchCronExpressionDataProvider(): array
             ['0-20/5', 21, false],
             ['0-20/5', 25, false],
 
+            ['3-20/5', 3, true],
+            ['3-20/5', 8, true],
+            ['3-20/5', 13, true],
+            ['3-20/5', 24, false],
+            ['3-20/5', 28, false],
+
             ['1/5', 5, false],
             ['5/5', 5, true],
             ['10/5', 10, true],
+
+            ['4/5', 8, false],
+            ['8/5', 8, true],
+            ['13/5', 13, true],
         ];
     }
 

From f15154594c8864ee53bf471157643a577928ac98 Mon Sep 17 00:00:00 2001
From: Stas Kozar <stas.kozar@transoftgroup.com>
Date: Tue, 30 Jun 2020 12:24:01 +0300
Subject: [PATCH 0659/1718] =?UTF-8?q?MC-35370:=20Unexpected=20scrolling=20?=
 =?UTF-8?q?of=20the=20=E2=80=9CCreate=20New=20Order=E2=80=9D=20page?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/web/mage/validation.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js
index 10f9dab6bdd9b..2480f3be080c4 100644
--- a/lib/web/mage/validation.js
+++ b/lib/web/mage/validation.js
@@ -1971,8 +1971,9 @@ define([
             }
 
             if (firstActive.length) {
+                parent = firstActive.parent();
                 $('html, body').stop().animate({
-                    scrollTop: firstActive.offset().top - windowHeight / 2
+                    scrollTop: parent.offset().top - windowHeight / 2
                 });
                 firstActive.focus();
             }

From be428f7a4255de6b8ba5ae4668bf27be8ca0a38b Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Tue, 30 Jun 2020 10:46:07 +0100
Subject: [PATCH 0660/1718] Added url filter applier

---
 .../Magento/Ui/Component/UrlFilterApplier.php | 44 +++++++++++++++++
 app/code/Magento/Ui/etc/ui_components.xsd     |  1 +
 app/code/Magento/Ui/etc/ui_configuration.xsd  | 10 ++++
 app/code/Magento/Ui/etc/ui_definition.xsd     |  1 +
 .../base/ui_component/etc/definition.map.xml  |  1 +
 .../view/base/ui_component/etc/definition.xml |  1 +
 .../etc/definition/urlFilterApplier.xsd       | 18 +++++++
 .../base/web/js/grid/url-filter-applier.js    | 47 +++++++++++++++++++
 8 files changed, 123 insertions(+)
 create mode 100644 app/code/Magento/Ui/Component/UrlFilterApplier.php
 create mode 100644 app/code/Magento/Ui/view/base/ui_component/etc/definition/urlFilterApplier.xsd
 create mode 100644 app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js

diff --git a/app/code/Magento/Ui/Component/UrlFilterApplier.php b/app/code/Magento/Ui/Component/UrlFilterApplier.php
new file mode 100644
index 0000000000000..ee7397b69e9ff
--- /dev/null
+++ b/app/code/Magento/Ui/Component/UrlFilterApplier.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Ui\Component;
+
+/**
+ * UrlFilterApplier component
+ */
+class UrlFilterApplier extends AbstractComponent
+{
+    const NAME = 'urlFilterApplier';
+
+    /**
+     * @inheritdoc
+     */
+    public function prepare(): void
+    {
+        parent::prepare();
+        $filters = is_array($this->getContext()->getRequestParam('filters')) ?
+            $this->getContext()->getRequestParam('filters') : null;
+
+        $this->setData(
+            'config',
+            array_replace_recursive(
+                (array)$this->getData('config'),
+                [
+                    'filters' => $filters,
+                ]
+            )
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getComponentName()
+    {
+        return static::NAME;
+    }
+}
diff --git a/app/code/Magento/Ui/etc/ui_components.xsd b/app/code/Magento/Ui/etc/ui_components.xsd
index eb8cc08f904fd..ed4be78b93aa8 100644
--- a/app/code/Magento/Ui/etc/ui_components.xsd
+++ b/app/code/Magento/Ui/etc/ui_components.xsd
@@ -62,4 +62,5 @@
     <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/exportButton.xsd"/>
     <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/listingToolbar.xsd"/>
     <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/dataProvider.xsd"/>
+    <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/urlFilterApplier.xsd"/>
 </xs:schema>
diff --git a/app/code/Magento/Ui/etc/ui_configuration.xsd b/app/code/Magento/Ui/etc/ui_configuration.xsd
index d45a3d7497637..4d7b8f20e4587 100644
--- a/app/code/Magento/Ui/etc/ui_configuration.xsd
+++ b/app/code/Magento/Ui/etc/ui_configuration.xsd
@@ -107,6 +107,7 @@
             <xs:element ref="text" maxOccurs="unbounded"/>
             <xs:element ref="textarea" maxOccurs="unbounded"/>
             <xs:element ref="wysiwyg" maxOccurs="unbounded"/>
+            <xs:element ref="urlFilterApplier" maxOccurs="unbounded" />
         </xs:choice>
     </xs:group>
     <xs:group name="fieldsetElements">
@@ -206,6 +207,7 @@
             <xs:element ref="text" maxOccurs="unbounded"/>
             <xs:element ref="textarea" maxOccurs="unbounded"/>
             <xs:element ref="wysiwyg" maxOccurs="unbounded"/>
+            <xs:element ref="urlFilterApplier" maxOccurs="unbounded" />
         </xs:choice>
     </xs:group>
 
@@ -824,4 +826,12 @@
             </xs:documentation>
         </xs:annotation>
     </xs:element>
+    <xs:element name="urlFilterApplier" type="componentUrlFilterApplier">
+        <xs:annotation>
+            <xs:documentation>
+                The Url Filter Applier component retrieves the values from the "filters" GET parameter and applies it
+                to the grid.
+            </xs:documentation>
+        </xs:annotation>
+    </xs:element>
 </xs:schema>
diff --git a/app/code/Magento/Ui/etc/ui_definition.xsd b/app/code/Magento/Ui/etc/ui_definition.xsd
index e86e2654ff629..80aaf1ebeb3c2 100644
--- a/app/code/Magento/Ui/etc/ui_definition.xsd
+++ b/app/code/Magento/Ui/etc/ui_definition.xsd
@@ -77,6 +77,7 @@
             <xs:element name="wysiwyg" type="componentWysiwyg"/>
             <xs:element name="inlineEditing" type="componentInlineEditing"/>
             <xs:element name="urlInput" type="componentUrlInput"/>
+            <xs:element name="urlFilterApplier" type="componentUrlFilterApplier" />
         </xs:choice>
     </xs:complexType>
 </xs:schema>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition.map.xml b/app/code/Magento/Ui/view/base/ui_component/etc/definition.map.xml
index 8f82b98112f18..89f400f34924f 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition.map.xml
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition.map.xml
@@ -499,6 +499,7 @@
             </argument>
         </schema>
     </component>
+    <component name="urlFilterApplier" include="uiElementSettings"/>
     <component name="filterSearch" include="uiElementSettings">
         <schema name="current">
             <argument name="data" xsi:type="array">
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition.xml b/app/code/Magento/Ui/view/base/ui_component/etc/definition.xml
index f0a5f357f8a92..98870e44bcee7 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition.xml
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition.xml
@@ -284,4 +284,5 @@
     </dynamicRows>
     <htmlContent class="Magento\Ui\Component\HtmlContent" component="Magento_Ui/js/form/components/html"/>
     <button class="Magento\Ui\Component\Container" component="Magento_Ui/js/form/components/button"/>
+    <urlFilterApplier class="Magento\Ui\Component\UrlFilterApplier" component="Magento_Ui/js/grid/url-filter-applier" />
 </components>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/urlFilterApplier.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/urlFilterApplier.xsd
new file mode 100644
index 0000000000000..ac1dd490ee248
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/urlFilterApplier.xsd
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <!-- Include section -->
+    <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/ui_component.xsd"/>
+
+    <xs:complexType name="componentUrlFilterApplier">
+        <xs:sequence>
+            <xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+</xs:schema>
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
new file mode 100644
index 0000000000000..16d26e2da984f
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js
@@ -0,0 +1,47 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'uiComponent',
+    'underscore',
+], function (Component, _) {
+    'use strict';
+
+    return Component.extend({
+        defaults: {
+            filterProvider: 'componentType = filters, ns = ${ $.ns }',
+            filters: null,
+            modules: {
+                filterComponent: '${ $.filterProvider }',
+            }
+        },
+
+        /**
+         * Init component
+         *
+         * @return {exports}
+         */
+        initialize: function () {
+            this._super();
+            this.apply();
+
+            return this;
+        },
+
+        /**
+         * Apply filter
+         */
+        apply: function () {
+            if (_.isUndefined(this.filterComponent())) {
+                setTimeout(function () {this.apply()}.bind(this), 100);
+            } else {
+                if (!_.isNull(this.filters)) {
+                    this.filterComponent().setData(this.filters, false);
+                    this.filterComponent().apply();
+                }
+            }
+        }
+    });
+});

From d3dfc52c5d01ac4c849b3a3a2ccda6bc0a9bdef2 Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Tue, 30 Jun 2020 13:08:36 +0300
Subject: [PATCH 0661/1718] add integration test

---
 .../Block/Adminhtml/Order/TotalsTest.php      | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/TotalsTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/TotalsTest.php
index 11c13258283fe..d7c37052247f5 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/TotalsTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/TotalsTest.php
@@ -72,6 +72,36 @@ public function testTotalsInclTax(): void
         $this->assertShipping($blockTotals->toHtml(), (float) $order->getShippingInclTax());
     }
 
+    /**
+     * Test block totals including canceled amount.
+     *
+     * @magentoDataFixture Magento/Sales/_files/order.php
+     *
+     * @return void
+     */
+    public function testTotalCanceled(): void
+    {
+        $order = $this->orderFactory->create()->loadByIncrementId('100000001');
+        $order->cancel();
+        $blockTotals = $this->getBlockTotals()->setOrder($order);
+        $this->assertCanceled($blockTotals->toHtml(), $order->getTotalCanceled());
+    }
+
+    /**
+     * Check if canceled amount present in block.
+     *
+     * @param string $blockTotalsHtml
+     * @param float $amount
+     * @return void
+     */
+    private function assertCanceled(string $blockTotalsHtml, float $amount): void
+    {
+        $this->assertTrue(
+            $this->isBlockContainsTotalAmount($blockTotalsHtml, __('Total Canceled'), $amount),
+            'Canceled amount is missing or incorrect.'
+        );
+    }
+
     /**
      * Check if subtotal amount present in block.
      *

From f01c6d91c45d6a71b56c1c7079a589d1c320b44b Mon Sep 17 00:00:00 2001
From: ameysar <andrii.meysar@transoftgroup.com>
Date: Tue, 30 Jun 2020 13:34:39 +0300
Subject: [PATCH 0662/1718] MC-35415: It is not possible to filter Customer
 Wishlist grid by name after creating Schedule Update

---
 .../Model/ResourceModel/Item/Collection.php      |  8 +++++++-
 .../Model/ResourceModel/Item/CollectionTest.php  | 16 ++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php
index 61d444f786ca8..b10b62ec21167 100644
--- a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php
+++ b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php
@@ -575,10 +575,15 @@ protected function _joinProductNameTable()
             $storeId = $this->_storeManager->getStore(\Magento\Store\Model\Store::ADMIN_CODE)->getId();
 
             $entityMetadata = $this->getMetadataPool()->getMetadata(ProductInterface::class);
+            $linkField = $entityMetadata->getLinkField();
 
             $this->getSelect()->join(
+                ['product_entity' => $this->getTable('catalog_product_entity')],
+                'product_entity.entity_id = main_table.product_id',
+                []
+            )->join(
                 ['product_name_table' => $attribute->getBackendTable()],
-                'product_name_table.' . $entityMetadata->getLinkField() . ' = main_table.product_id' .
+                'product_name_table.' . $linkField . ' = product_entity.' . $linkField .
                 ' AND product_name_table.store_id = ' .
                 $storeId .
                 ' AND product_name_table.attribute_id = ' .
@@ -588,6 +593,7 @@ protected function _joinProductNameTable()
 
             $this->_isProductNameJoined = true;
         }
+
         return $this;
     }
 
diff --git a/app/code/Magento/Wishlist/Test/Unit/Model/ResourceModel/Item/CollectionTest.php b/app/code/Magento/Wishlist/Test/Unit/Model/ResourceModel/Item/CollectionTest.php
index 72705acb8cd06..28705d54e6e20 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Model/ResourceModel/Item/CollectionTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Model/ResourceModel/Item/CollectionTest.php
@@ -54,7 +54,8 @@ class CollectionTest extends TestCase
 
     /** @var  string */
     protected $sql = "SELECT `main_table`.* FROM `testMainTableName` AS `main_table`
- INNER JOIN `testBackendTableName` AS `product_name_table` ON product_name_table.entity_id = main_table.product_id
+ INNER JOIN `testEntityTableName` AS `product_entity` ON product_entity.entity_id = main_table.product_id
+ INNER JOIN `testBackendTableName` AS `product_name_table` ON product_name_table.entity_id = product_entity.entity_id
  AND product_name_table.store_id = 1
  AND product_name_table.attribute_id = 12
  WHERE (INSTR(product_name_table.value, 'TestProductName'))";
@@ -90,18 +91,13 @@ protected function setUp(): void
             ->expects($this->any())
             ->method('getConnection')
             ->willReturn($connection);
-        $resource
-            ->expects($this->any())
-            ->method('getMainTable')
-            ->willReturn('testMainTableName');
-        $resource
-            ->expects($this->any())
-            ->method('getTableName')
-            ->willReturn('testMainTableName');
         $resource
             ->expects($this->any())
             ->method('getTable')
-            ->willReturn('testMainTableName');
+            ->willReturnOnConsecutiveCalls(
+                'testMainTableName',
+                'testEntityTableName'
+            );
 
         $catalogConfFactory = $this->createPartialMock(
             ConfigFactory::class,

From 89b968ad23feaf0b572bb281ad34d915591c3a9d Mon Sep 17 00:00:00 2001
From: Marjan Petkovski <petkovski.marjan@gmail.com>
Date: Tue, 30 Jun 2020 12:39:10 +0200
Subject: [PATCH 0663/1718] magento/magento2#26121: special price & tier price
 are coming in base currency

Edits, Support by api-functional tests, Address static tests
---
 .../Model/Resolver/Product/Price/Tiers.php    |  15 +-
 .../Pricing/Price/TierPrice.php               |   6 +-
 .../Model/Resolver/Product/SpecialPrice.php   |  18 +-
 .../CatalogCustomer/PriceTiersTest.php        | 230 ++++++++++++++++++
 .../CatalogCustomer/SpecialPriceTest.php      |  99 ++++++++
 5 files changed, 348 insertions(+), 20 deletions(-)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCustomer/PriceTiersTest.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCustomer/SpecialPriceTest.php

diff --git a/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/Product/Price/Tiers.php b/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/Product/Price/Tiers.php
index 2dc25f64af685..436fc0c04ca7e 100644
--- a/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/Product/Price/Tiers.php
+++ b/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/Product/Price/Tiers.php
@@ -10,12 +10,11 @@
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
-use Magento\CatalogCustomerGraphQl\Pricing\Price\TierPrice;
 use Magento\Customer\Model\GroupManagement;
 use Magento\Catalog\Api\Data\ProductTierPriceInterface;
 use Magento\CatalogGraphQl\Model\Resolver\Product\Price\ProviderPool as PriceProviderPool;
-use Magento\Framework\App\ObjectManager;
 use Magento\Catalog\Model\Product\Type\Price;
+use Magento\CatalogCustomerGraphQl\Pricing\Price\TierPriceFactory;
 
 /**
  * Get product tier price information
@@ -62,25 +61,33 @@ class Tiers
      */
     private $price;
 
+    /**
+     * @var TierPriceFactory
+     */
+    private $tierPriceFactory;
+
     /**
      * @param CollectionFactory $collectionFactory
      * @param ProductResource $productResource
      * @param PriceProviderPool $priceProviderPool
      * @param int $customerGroupId
      * @param Price $price
+     * @param TierPriceFactory $tierPriceFactory
      */
     public function __construct(
         CollectionFactory $collectionFactory,
         ProductResource $productResource,
         PriceProviderPool $priceProviderPool,
         $customerGroupId,
-        Price $price
+        Price $price,
+        TierPriceFactory $tierPriceFactory
     ) {
         $this->collectionFactory = $collectionFactory;
         $this->productResource = $productResource;
         $this->priceProviderPool = $priceProviderPool;
         $this->customerGroupId = $customerGroupId;
         $this->price = $price;
+        $this->tierPriceFactory = $tierPriceFactory;
     }
 
     /**
@@ -110,7 +117,7 @@ public function getProductTierPrices($productId): ?array
         }
 
         /** @var TierPrice $tierPrice */
-        $tierPrice = ObjectManager::getInstance()->create(TierPrice::class,
+        $tierPrice = $this->tierPriceFactory->create(
             [
                 'saleableItem' => $this->products[$productId],
                 'quantity' => 1,
diff --git a/app/code/Magento/CatalogCustomerGraphQl/Pricing/Price/TierPrice.php b/app/code/Magento/CatalogCustomerGraphQl/Pricing/Price/TierPrice.php
index 8b2d8fd391b6a..5cb63dcb11e33 100644
--- a/app/code/Magento/CatalogCustomerGraphQl/Pricing/Price/TierPrice.php
+++ b/app/code/Magento/CatalogCustomerGraphQl/Pricing/Price/TierPrice.php
@@ -10,9 +10,9 @@
 
 use Magento\Catalog\Model\Product;
 use Magento\Customer\Api\GroupManagementInterface;
-use Magento\Customer\Model\Session;
 use Magento\Framework\Pricing\Adjustment\CalculatorInterface;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Framework\App\ObjectManager;
 
 class TierPrice extends \Magento\Catalog\Pricing\Price\TierPrice
 {
@@ -22,7 +22,6 @@ class TierPrice extends \Magento\Catalog\Pricing\Price\TierPrice
      * @param float $quantity
      * @param CalculatorInterface $calculator
      * @param PriceCurrencyInterface $priceCurrency
-     * @param Session $customerSession
      * @param GroupManagementInterface $groupManagement
      * @param int $customerGroupId
      */
@@ -31,7 +30,6 @@ public function __construct(
         $quantity,
         CalculatorInterface $calculator,
         PriceCurrencyInterface $priceCurrency,
-        Session $customerSession,
         GroupManagementInterface $groupManagement,
         $customerGroupId
     ) {
@@ -40,7 +38,7 @@ public function __construct(
             $quantity,
             $calculator,
             $priceCurrency,
-            $customerSession,
+            ObjectManager::getInstance()->get(\Magento\Customer\Model\Session::class),
             $groupManagement
         );
 
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/SpecialPrice.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/SpecialPrice.php
index a1e61d77fb190..e85365a16bd50 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/SpecialPrice.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/SpecialPrice.php
@@ -8,25 +8,19 @@
 namespace Magento\CatalogGraphQl\Model\Resolver\Product;
 
 use Magento\Framework\GraphQl\Config\Element\Field;
-use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
-use Magento\Framework\GraphQl\Query\Resolver\Value;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Catalog\Pricing\Price\SpecialPrice as PricingSpecialPrice;
 
+/**
+ * Resolver for Special Price
+ */
 class SpecialPrice implements ResolverInterface
 {
     /**
-     * Fetches the data from persistence models and format it according to the GraphQL schema.
-     *
-     * @param \Magento\Framework\GraphQl\Config\Element\Field $field
-     * @param ContextInterface $context
-     * @param ResolveInfo $info
-     * @param array|null $value
-     * @param array|null $args
-     * @return mixed|Value
-     * @throws \Exception
-     */public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+     * @inheritdoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
     {
         /** @var \Magento\Catalog\Model\Product $product */
         $product = $value['model'];
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCustomer/PriceTiersTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCustomer/PriceTiersTest.php
new file mode 100644
index 0000000000000..6a82e46b6c907
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCustomer/PriceTiersTest.php
@@ -0,0 +1,230 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\CatalogCustomer;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+class PriceTiersTest extends GraphQlAbstract
+{
+    /**
+     * @var \Magento\TestFramework\ObjectManager
+     */
+    private $objectManager;
+
+    protected function setUp(): void
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     */
+    public function testAllGroups()
+    {
+        /** @var string $productSku */
+        $productSku = 'simple';
+        /** @var string $query */
+        $query = $this->getProductSearchQuery($productSku);
+
+        $response = $this->graphQlQuery($query);
+
+        $itemTiers = $response['products']['items'][0]['price_tiers'];
+        $this->assertEquals(5, sizeof($itemTiers));
+        $this->assertEquals(8, $this->getValueForQuantity(2, $itemTiers));
+        $this->assertEquals(5, $this->getValueForQuantity(3, $itemTiers));
+        $this->assertEquals(6, $this->getValueForQuantity(3.2, $itemTiers));
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testLoggedInCustomer()
+    {
+        /** @var string $productSku */
+        $productSku = 'simple';
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        /** @var Product $product */
+        $product = $productRepository->get($productSku, false, null, true);
+        $tierPriceData =[
+            [
+                'customer_group_id' => 1,
+                'percentage_value'=> null,
+                'qty'=> 2,
+                'value'=> 9
+            ],
+            [
+                'customer_group_id' => 1,
+                'percentage_value'=> null,
+                'qty'=> 3,
+                'value'=> 8.25
+            ],
+            [
+                'customer_group_id' => 1,
+                'percentage_value'=> null,
+                'qty'=> 5,
+                'value'=> 7
+            ],
+            [
+                'customer_group_id' => 2,
+                'percentage_value'=> null,
+                'qty'=> 3,
+                'value'=> 8
+            ]
+        ];
+
+        $this->saveTierPrices($product, $tierPriceData);
+        /** @var string $query */
+
+        $query = $this->getProductSearchQuery($productSku);
+        $response = $this->graphQlQuery(
+            $query,
+            [],
+            '',
+            $this->getHeaderAuthorization('customer@example.com', 'password')
+        );
+
+        $itemTiers = $response['products']['items'][0]['price_tiers'];
+        $this->assertEquals(3, sizeof($itemTiers));
+        $this->assertEquals(9, $this->getValueForQuantity(2, $itemTiers));
+        $this->assertEquals(8.25, $this->getValueForQuantity(3, $itemTiers));
+        $this->assertEquals(7, $this->getValueForQuantity(5, $itemTiers));
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Store/_files/second_store_with_second_currency.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     */
+    public function testSecondStoreViewWithCurrencyRate()
+    {
+        /** @var string $storeViewCode */
+        $storeViewCode = 'fixture_second_store';
+        /** @var StoreRepositoryInterface $storeRepository */
+        $storeRepository = $this->objectManager->get(StoreRepositoryInterface::class);
+        /** @var float $rate */
+        $rate = $storeRepository->get($storeViewCode)->getCurrentCurrencyRate();
+        /** @var string $productSku */
+        $productSku = 'simple';
+        /** @var string $query */
+        $query = $this->getProductSearchQuery($productSku);
+        /** @var array $headers */
+        $headers = array_merge(
+            $this->getHeaderAuthorization('customer@example.com', 'password'),
+            $this->getHeaderStore($storeViewCode)
+        );
+
+        $response = $this->graphQlQuery(
+            $query,
+            [],
+            '',
+            $headers
+        );
+
+        $itemTiers = $response['products']['items'][0]['price_tiers'];
+        $this->assertEquals(2, sizeof($itemTiers));
+        $this->assertEquals(round(8 * $rate, 2), $this->getValueForQuantity(2, $itemTiers));
+        $this->assertEquals(round(5 * $rate, 2), $this->getValueForQuantity(5, $itemTiers));
+    }
+
+    /**
+     * @param float $quantity
+     * @param array $tiers
+     * @return float
+     */
+    private function getValueForQuantity(float $quantity, array $tiers)
+    {
+        $filteredResult = array_values(array_filter($tiers, function($tier) use ($quantity) {
+            if ((float)$tier['quantity'] == $quantity) {
+                return $tier;
+            }
+        }));
+
+        return (float)$filteredResult[0]['final_price']['value'];
+    }
+
+    /**
+     * @param ProductInterface $product
+     * @param array $tierPriceData
+     */
+    private function saveTierPrices(ProductInterface $product, array $tierPriceData)
+    {
+        /** @var array $tierPrices */
+        $tierPrices = [];
+        /** @var ProductTierPriceInterfaceFactory $tierPriceFactory */
+        $tierPriceFactory = $this->objectManager->get(ProductTierPriceInterfaceFactory::class);
+
+        foreach ($tierPriceData as $tierPrice) {
+            $tierPrices[] = $tierPriceFactory->create(
+                [
+                    'data' => $tierPrice
+                ]
+            );
+        }
+
+        $product->setTierPrices($tierPrices);
+        $product->save();
+    }
+
+    /**
+     * @param string $productSku
+     * @return string
+     */
+    private function getProductSearchQuery(string $productSku): string
+    {
+        return <<<QUERY
+{
+  products(search: "{$productSku}") {
+    items {
+      price_tiers {
+     	final_price {
+          currency
+          value
+        }
+        discount {
+          amount_off
+          percent_off
+        }
+        quantity
+      }
+    }
+  }
+}
+QUERY;
+    }
+
+    /**
+     * @param string $username
+     * @param string $password
+     * @return array
+     */
+    private function getHeaderAuthorization(string $username, string $password): array
+    {
+        $customerToken = $this->objectManager->get(CustomerTokenServiceInterface::class)
+            ->createCustomerAccessToken($username, $password);
+
+        return ['Authorization' => 'Bearer ' . $customerToken];
+    }
+
+    /**
+     * @param string $storeViewCode
+     * @return array
+     */
+    private function getHeaderStore(string $storeViewCode): array
+    {
+        return ['Store' => $storeViewCode];
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCustomer/SpecialPriceTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCustomer/SpecialPriceTest.php
new file mode 100644
index 0000000000000..3e8c6fdb3e26b
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCustomer/SpecialPriceTest.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\CatalogCustomer;
+
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+class SpecialPriceTest extends GraphQlAbstract
+{
+    /**
+     * @var \Magento\TestFramework\ObjectManager
+     */
+    private $objectManager;
+
+    protected function setUp(): void
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_special_price.php
+     */
+    public function testSpecialPrice()
+    {
+        /** @var string $productSku */
+        $productSku = 'simple';
+        /** @var string $query */
+        $query = $this->getProductSearchQuery($productSku);
+
+        $response = $this->graphQlQuery($query);
+
+        /** @var float $specialPrice */
+        $specialPrice = (float)$response['products']['items'][0]['special_price'];
+        $this->assertEquals(5.99, $specialPrice);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Store/_files/second_store_with_second_currency.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_special_price.php
+     */
+    public function testSpecialPriceWithCurrencyRate()
+    {
+        /** @var string $storeViewCode */
+        $storeViewCode = 'fixture_second_store';
+        /** @var StoreRepositoryInterface $storeRepository */
+        $storeRepository = $this->objectManager->get(StoreRepositoryInterface::class);
+        /** @var float $rate */
+        $rate = $storeRepository->get($storeViewCode)->getCurrentCurrencyRate();
+        /** @var string $productSku */
+        $productSku = 'simple';
+        /** @var string $query */
+        $query = $this->getProductSearchQuery($productSku);
+        /** @var array $headers */
+        $headers = $this->getHeaderStore($storeViewCode);
+
+        $response = $this->graphQlQuery(
+            $query,
+            [],
+            '',
+            $headers
+        );
+
+        /** @var float $specialPrice */
+        $specialPrice = (float)$response['products']['items'][0]['special_price'];
+        $this->assertEquals(round(5.99 * $rate, 2), $specialPrice);
+    }
+
+    /**
+     * @param string $productSku
+     * @return string
+     */
+    private function getProductSearchQuery(string $productSku): string
+    {
+        return <<<QUERY
+{
+  products(search: "{$productSku}") {
+    items {
+      special_price
+    }
+  }
+}
+QUERY;
+    }
+
+    /**
+     * @param string $storeViewCode
+     * @return array
+     */
+    private function getHeaderStore(string $storeViewCode): array
+    {
+        return ['Store' => $storeViewCode];
+    }
+}

From b5208cd5800bcdf14644c65847ecb4781e05ef8a Mon Sep 17 00:00:00 2001
From: Michal Derlatka <michal.derlatka1@gmail.com>
Date: Fri, 26 Jun 2020 17:51:31 +0200
Subject: [PATCH 0664/1718] magento/magento2#28570: createCustomer does not
 match validation requirements

---
 .../Model/Resolver/UpdateCustomerEmail.php    |  20 +-
 .../GraphQl/Customer/CreateCustomerTest.php   |  12 +-
 .../Customer/UpdateCustomerEmailTest.php      | 171 +++++++++++
 .../GraphQl/Customer/UpdateCustomerV2Test.php | 273 ++++++++++++++++++
 4 files changed, 462 insertions(+), 14 deletions(-)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerEmailTest.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerV2Test.php

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerEmail.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerEmail.php
index 3ed010b2819ca..dc584f84a21b1 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerEmail.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerEmail.php
@@ -1,20 +1,24 @@
 <?php
-
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
-
 use Magento\CustomerGraphQl\Model\Customer\ExtractCustomerData;
 use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
 use Magento\CustomerGraphQl\Model\Customer\UpdateCustomerAccount;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
-use Magento\Framework\GraphQl\Query\Resolver\Value;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\GraphQl\Model\Query\ContextInterface;
 
+/**
+ * Customer email update, used for GraphQL request processing
+ */
 class UpdateCustomerEmail implements ResolverInterface
 {
     /**
@@ -55,15 +59,11 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        /** @var \Magento\GraphQl\Model\Query\ContextInterface $context */
+        /** @var ContextInterface $context */
         if (false === $context->getExtensionAttributes()->getIsCustomer()) {
             throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
         }
 
-        if (empty($args['email']) || empty($args['password'])) {
-            throw new GraphQlInputException(__('"email" and "password" values should be specified'));
-        }
-
         $customer = $this->getCustomer->execute($context);
         $this->updateCustomerAccount->execute(
             $customer,
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
index 3560a6ba48dd5..7557dcfdf088a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
@@ -116,14 +116,18 @@ public function testCreateCustomerAccountWithoutPassword()
      */
     public function testCreateCustomerIfInputDataIsEmpty()
     {
+        $exceptionMessage = 'Field CustomerCreateInput.email of required type String! was not provided.
+Field CustomerCreateInput.firstname of required type String! was not provided.
+Field CustomerCreateInput.lastname of required type String! was not provided.';
+
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('"input" value should be specified');
+        $this->expectExceptionMessage($exceptionMessage);
 
         $query = <<<QUERY
 mutation {
     createCustomer(
         input: {
-        
+
         }
     ) {
         customer {
@@ -144,7 +148,7 @@ public function testCreateCustomerIfInputDataIsEmpty()
     public function testCreateCustomerIfEmailMissed()
     {
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('Required parameters are missing: Email');
+        $this->expectExceptionMessage('Field CustomerCreateInput.email of required type String! was not provided');
 
         $newFirstname = 'Richard';
         $newLastname = 'Rowe';
@@ -234,7 +238,7 @@ public function invalidEmailAddressDataProvider(): array
     public function testCreateCustomerIfPassedAttributeDosNotExistsInCustomerInput()
     {
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('Field "test123" is not defined by type CustomerInput.');
+        $this->expectExceptionMessage('Field "test123" is not defined by type CustomerCreateInput.');
 
         $newFirstname = 'Richard';
         $newLastname = 'Rowe';
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerEmailTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerEmailTest.php
new file mode 100644
index 0000000000000..ca21aa7d9c45b
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerEmailTest.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Customer;
+
+use Exception;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\CustomerGraphQl\Model\Customer\UpdateCustomerAccount;
+use Magento\Framework\Exception\AuthenticationException;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test for update customer's email
+ */
+class UpdateCustomerEmailTest extends GraphQlAbstract
+{
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+    /**
+     * @var UpdateCustomerAccount
+     */
+    private $updateCustomerAccount;
+    /**
+     * @var StoreRepositoryInterface
+     */
+    private $storeRepository;
+
+    /**
+     * Setting up tests
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
+        $this->customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
+        $this->updateCustomerAccount = Bootstrap::getObjectManager()->get(UpdateCustomerAccount::class);
+        $this->storeRepository = Bootstrap::getObjectManager()->get(StoreRepositoryInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testUpdateCustomerEmail(): void
+    {
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+
+        $newEmail = 'newcustomer@example.com';
+
+        $query = <<<QUERY
+mutation {
+    updateCustomerEmail(
+        email: "{$newEmail}"
+        password: "{$currentPassword}"
+    ) {
+        customer {
+            email
+        }
+    }
+}
+QUERY;
+
+        $response = $this->graphQlMutation(
+            $query,
+            [],
+            '',
+            $this->getCustomerAuthHeaders($currentEmail, $currentPassword)
+        );
+
+        $this->assertEquals($newEmail, $response['updateCustomerEmail']['customer']['email']);
+
+/*        $this->updateCustomerAccount->execute(
+            $this->customerRepository->get($newEmail),
+            ['email' => $currentEmail, 'password' => $currentPassword],
+            $this->storeRepository->getById(1)
+        );*/
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testUpdateCustomerEmailIfPasswordIsWrong(): void
+    {
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage('Invalid login or password.');
+
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+
+        $newEmail = 'newcustomer@example.com';
+        $wrongPassword = 'wrongpassword';
+
+        $query = <<<QUERY
+mutation {
+    updateCustomerEmail(
+        email: "{$newEmail}"
+        password: "{$wrongPassword}"
+    ) {
+        customer {
+            email
+        }
+    }
+}
+QUERY;
+
+        $this->graphQlMutation(
+            $query,
+            [],
+            '',
+            $this->getCustomerAuthHeaders($currentEmail, $currentPassword)
+        );
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/two_customers.php
+     */
+    public function testUpdateEmailIfEmailAlreadyExists()
+    {
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage(
+            'A customer with the same email address already exists in an associated website.'
+        );
+
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+        $existedEmail = 'customer_two@example.com';
+
+        $query = <<<QUERY
+mutation {
+    updateCustomerEmail(
+        email: "{$existedEmail}"
+        password: "{$currentPassword}"
+    ) {
+        customer {
+            firstname
+        }
+    }
+}
+QUERY;
+        $this->graphQlMutation($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
+    }
+
+    /**
+     * Get customer authorization headers
+     *
+     * @param string $email
+     * @param string $password
+     * @return array
+     * @throws AuthenticationException
+     */
+    private function getCustomerAuthHeaders(string $email, string $password): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
+        return ['Authorization' => 'Bearer ' . $customerToken];
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerV2Test.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerV2Test.php
new file mode 100644
index 0000000000000..8b3d1a565add4
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerV2Test.php
@@ -0,0 +1,273 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Customer;
+
+use Exception;
+use Magento\Framework\Exception\AuthenticationException;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Tests for new update customer endpoint
+ */
+class UpdateCustomerV2Test extends GraphQlAbstract
+{
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var LockCustomer
+     */
+    private $lockCustomer;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
+        $this->lockCustomer = Bootstrap::getObjectManager()->get(LockCustomer::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testUpdateCustomer(): void
+    {
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+
+        $newPrefix = 'Dr';
+        $newFirstname = 'Richard';
+        $newMiddlename = 'Riley';
+        $newLastname = 'Rowe';
+        $newSuffix = 'III';
+        $newDob = '3/11/1972';
+        $newTaxVat = 'GQL1234567';
+        $newGender = 2;
+
+        $query = <<<QUERY
+mutation {
+    updateCustomerV2(
+        input: {
+            prefix: "{$newPrefix}"
+            firstname: "{$newFirstname}"
+            middlename: "{$newMiddlename}"
+            lastname: "{$newLastname}"
+            suffix: "{$newSuffix}"
+            date_of_birth: "{$newDob}"
+            taxvat: "{$newTaxVat}"
+            gender: {$newGender}
+        }
+    ) {
+        customer {
+            prefix
+            firstname
+            middlename
+            lastname
+            suffix
+            date_of_birth
+            taxvat
+            email
+            gender
+        }
+    }
+}
+QUERY;
+        $response = $this->graphQlMutation(
+            $query,
+            [],
+            '',
+            $this->getCustomerAuthHeaders($currentEmail, $currentPassword)
+        );
+
+        $this->assertEquals($newPrefix, $response['updateCustomerV2']['customer']['prefix']);
+        $this->assertEquals($newFirstname, $response['updateCustomerV2']['customer']['firstname']);
+        $this->assertEquals($newMiddlename, $response['updateCustomerV2']['customer']['middlename']);
+        $this->assertEquals($newLastname, $response['updateCustomerV2']['customer']['lastname']);
+        $this->assertEquals($newSuffix, $response['updateCustomerV2']['customer']['suffix']);
+        $this->assertEquals($newDob, $response['updateCustomerV2']['customer']['date_of_birth']);
+        $this->assertEquals($newTaxVat, $response['updateCustomerV2']['customer']['taxvat']);
+        $this->assertEquals($newGender, $response['updateCustomerV2']['customer']['gender']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testUpdateCustomerIfInputDataIsEmpty(): void
+    {
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage('"input" value should be specified');
+
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+
+        $query = <<<QUERY
+mutation {
+    updateCustomerV2(
+        input: {
+
+        }
+    ) {
+        customer {
+            firstname
+        }
+    }
+}
+QUERY;
+        $this->graphQlMutation($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
+    }
+
+    /**
+     */
+    public function testUpdateCustomerIfUserIsNotAuthorized(): void
+    {
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage('The current customer isn\'t authorized.');
+
+        $newFirstname = 'Richard';
+
+        $query = <<<QUERY
+mutation {
+    updateCustomerV2(
+        input: {
+            firstname: "{$newFirstname}"
+        }
+    ) {
+        customer {
+            firstname
+        }
+    }
+}
+QUERY;
+        $this->graphQlMutation($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testUpdateCustomerIfAccountIsLocked(): void
+    {
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage('The account is locked.');
+
+        $this->lockCustomer->execute(1);
+
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+        $newFirstname = 'Richard';
+
+        $query = <<<QUERY
+mutation {
+    updateCustomerV2(
+        input: {
+            firstname: "{$newFirstname}"
+        }
+    ) {
+        customer {
+            firstname
+        }
+    }
+}
+QUERY;
+        $this->graphQlMutation($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testEmptyCustomerName(): void
+    {
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage('Required parameters are missing: First Name');
+
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+
+        $query = <<<QUERY
+mutation {
+    updateCustomerV2(
+        input: {
+            firstname: ""
+        }
+    ) {
+        customer {
+            email
+        }
+    }
+}
+QUERY;
+        $this->graphQlMutation($query, [], '', $this->getCustomerAuthHeaders($currentEmail, $currentPassword));
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testEmptyCustomerLastName(): void
+    {
+        $query = <<<QUERY
+mutation {
+    updateCustomerV2(
+        input: {
+            lastname: ""
+        }
+    ) {
+        customer {
+            lastname
+        }
+    }
+}
+QUERY;
+
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage('Required parameters are missing: Last Name');
+
+        $this->graphQlMutation($query, [], '', $this->getCustomerAuthHeaders('customer@example.com', 'password'));
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testUpdateCustomerIfDobIsInvalid(): void
+    {
+        $invalidDob = 'bla-bla-bla';
+
+        $query = <<<QUERY
+mutation {
+    updateCustomerV2(
+        input: {
+            date_of_birth: "{$invalidDob}"
+        }
+    ) {
+        customer {
+            date_of_birth
+        }
+    }
+}
+QUERY;
+
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage('Invalid date');
+
+        $this->graphQlMutation($query, [], '', $this->getCustomerAuthHeaders('customer@example.com', 'password'));
+    }
+
+    /**
+     * @param string $email
+     * @param string $password
+     * @return array
+     * @throws AuthenticationException
+     */
+    private function getCustomerAuthHeaders(string $email, string $password): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
+        return ['Authorization' => 'Bearer ' . $customerToken];
+    }
+}

From d627611b5f3ed894dbbc74a56a48289a34b78f58 Mon Sep 17 00:00:00 2001
From: Dmitriy Gallyamov <dmitrijs.gallamovs@gmail.com>
Date: Tue, 30 Jun 2020 14:14:44 +0300
Subject: [PATCH 0665/1718] magento/magento2#28569: Multi-store: Missing store
 codes in relation to a group and website

- Fixed merge conflicts with #27952
---
 .../Store/Api/Data/StoreConfigInterface.php   | 15 ++++++++++
 .../Magento/Store/Model/Data/StoreConfig.php  | 22 +++++++++++++++
 .../ResourceModel/StoreWebsiteRelation.php    |  2 +-
 .../Model/Service/StoreConfigManager.php      |  3 +-
 .../Store/StoreConfigDataProvider.php         |  5 ++--
 .../Store/AvailableStoreConfigTest.php        | 28 +++++++------------
 6 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/app/code/Magento/Store/Api/Data/StoreConfigInterface.php b/app/code/Magento/Store/Api/Data/StoreConfigInterface.php
index 8f6011f1ae56f..48911db9c8134 100644
--- a/app/code/Magento/Store/Api/Data/StoreConfigInterface.php
+++ b/app/code/Magento/Store/Api/Data/StoreConfigInterface.php
@@ -43,6 +43,21 @@ public function getCode();
      */
     public function setCode($code);
 
+    /**
+     * Get store name
+     *
+     * @return string
+     */
+    public function getName();
+
+    /**
+     * Set store code
+     *
+     * @param string $name
+     * @return $this
+     */
+    public function setName($name);
+
     /**
      * Get website id of the store
      *
diff --git a/app/code/Magento/Store/Model/Data/StoreConfig.php b/app/code/Magento/Store/Model/Data/StoreConfig.php
index e68d98b162613..16b38cf37e416 100644
--- a/app/code/Magento/Store/Model/Data/StoreConfig.php
+++ b/app/code/Magento/Store/Model/Data/StoreConfig.php
@@ -15,6 +15,7 @@ class StoreConfig extends \Magento\Framework\Api\AbstractExtensibleObject implem
 {
     const KEY_ID = 'id';
     const KEY_CODE = 'code';
+    const KEY_NAME = 'name';
     const KEY_WEBSITE_ID = 'website_id';
     const KEY_LOCALE = 'locale';
     const KEY_BASE_CURRENCY_CODE = 'base_currency_code';
@@ -72,6 +73,27 @@ public function setCode($code)
         return $this->setData(self::KEY_CODE, $code);
     }
 
+    /**
+     * Get store name
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->_get(self::KEY_NAME);
+    }
+
+    /**
+     * Get store name
+     *
+     * @param string $name
+     * @return $this
+     */
+    public function setName($name)
+    {
+        return $this->setData(self::KEY_NAME, $name);
+    }
+
     /**
      * Get website id of the store
      *
diff --git a/app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php b/app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php
index f17ce4df6a13a..d47e6ba949821 100644
--- a/app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php
+++ b/app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php
@@ -45,7 +45,7 @@ public function getStoreByWebsiteId($websiteId)
     /**
      * Get website store codes
      *
-     * @param int $websiteId
+     * @param string $websiteId
      * @param bool $available
      * @return array
      */
diff --git a/app/code/Magento/Store/Model/Service/StoreConfigManager.php b/app/code/Magento/Store/Model/Service/StoreConfigManager.php
index ebc73036f7e37..29f6a9c95d60b 100644
--- a/app/code/Magento/Store/Model/Service/StoreConfigManager.php
+++ b/app/code/Magento/Store/Model/Service/StoreConfigManager.php
@@ -94,7 +94,8 @@ protected function getStoreConfig($store)
 
         $storeConfig->setId($store->getId())
             ->setCode($store->getCode())
-            ->setWebsiteId($store->getWebsiteId());
+            ->setWebsiteId($store->getWebsiteId())
+            ->setName($store->getName());
 
         foreach ($this->configPaths as $methodName => $configPath) {
             $configValue = $this->scopeConfig->getValue(
diff --git a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
index b8aa90fe0fd93..93c70c98051f5 100644
--- a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
+++ b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
@@ -75,7 +75,7 @@ public function getStoreConfigData(StoreInterface $store): array
      * @param string $websiteId
      * @return array
      */
-    public function getAvailableStoreConfig($websiteId): array
+    public function getAvailableStoreConfig(string $websiteId): array
     {
         $websiteStores = $this->storeWebsiteRelation->getWebsiteStoreCodes($websiteId, true);
         $storeConfigs = $this->storeConfigManager->getStoreConfigs($websiteStores);
@@ -112,7 +112,8 @@ private function prepareStoreConfigData(StoreConfigInterface $storeConfig): arra
             'secure_base_url' => $storeConfig->getSecureBaseUrl(),
             'secure_base_link_url' => $storeConfig->getSecureBaseLinkUrl(),
             'secure_base_static_url' => $storeConfig->getSecureBaseStaticUrl(),
-            'secure_base_media_url' => $storeConfig->getSecureBaseMediaUrl()
+            'secure_base_media_url' => $storeConfig->getSecureBaseMediaUrl(),
+            'store_name' => $storeConfig->getName(),
         ], $this->getExtendedConfigData((int)$storeConfig->getId()));
     }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/AvailableStoreConfigTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/AvailableStoreConfigTest.php
index b6e6de74be90b..d9d27ac9c462c 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/AvailableStoreConfigTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/AvailableStoreConfigTest.php
@@ -26,25 +26,27 @@ class AvailableStoreConfigTest extends GraphQlAbstract
      */
     private $objectManager;
 
+    /**
+     * @var StoreConfigManagerInterface
+     */
+    private $storeConfigManager;
+
     /**
      * @inheritDoc
      */
     protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
+        $this->storeConfigManager = $this->objectManager->get(StoreConfigManagerInterface::class);
     }
 
     /**
      * @magentoApiDataFixture Magento/Store/_files/store.php
      * @magentoApiDataFixture Magento/Store/_files/inactive_store.php
-     * @magentoConfigFixture default_store store/information/name Default Store
-     * @magentoConfigFixture test_store store/information/name Test Store
      */
     public function testDefaultWebsiteAvailableStoreConfigs(): void
     {
-        /** @var StoreConfigManagerInterface $storeConfigManager */
-        $storeConfigManager = $this->objectManager->get(StoreConfigManagerInterface::class);
-        $storeConfigs = $storeConfigManager->getStoreConfigs();
+        $storeConfigs = $this->storeConfigManager->getStoreConfigs();
 
         $expectedAvailableStores = [];
         $expectedAvailableStoreCodes = [
@@ -92,14 +94,10 @@ public function testDefaultWebsiteAvailableStoreConfigs(): void
 
     /**
      * @magentoApiDataFixture Magento/Store/_files/second_website_with_two_stores.php
-     * @magentoConfigFixture fixture_second_store_store store/information/name Fixture Second Store
-     * @magentoConfigFixture fixture_third_store_store store/information/name Fixture Third Store
      */
     public function testNonDefaultWebsiteAvailableStoreConfigs(): void
     {
-        /** @var StoreConfigManagerInterface $storeConfigManager */
-        $storeConfigManager = $this->objectManager->get(StoreConfigManagerInterface::class);
-        $storeConfigs = $storeConfigManager->getStoreConfigs(['fixture_second_store', 'fixture_third_store']);
+        $storeConfigs = $this->storeConfigManager->getStoreConfigs(['fixture_second_store', 'fixture_third_store']);
 
         $query
             = <<<QUERY
@@ -140,10 +138,8 @@ public function testNonDefaultWebsiteAvailableStoreConfigs(): void
      * @param StoreConfigInterface $storeConfig
      * @param array $responseConfig
      */
-    private function validateStoreConfig($storeConfig, $responseConfig): void
+    private function validateStoreConfig(StoreConfigInterface $storeConfig, array $responseConfig): void
     {
-        /* @var $scopeConfig ScopeConfigInterface */
-        $scopeConfig = $this->objectManager->get(ScopeConfigInterface::class);
         $this->assertEquals($storeConfig->getId(), $responseConfig['id']);
         $this->assertEquals($storeConfig->getCode(), $responseConfig['code']);
         $this->assertEquals($storeConfig->getLocale(), $responseConfig['locale']);
@@ -162,10 +158,6 @@ private function validateStoreConfig($storeConfig, $responseConfig): void
         $this->assertEquals($storeConfig->getSecureBaseLinkUrl(), $responseConfig['secure_base_link_url']);
         $this->assertEquals($storeConfig->getSecureBaseStaticUrl(), $responseConfig['secure_base_static_url']);
         $this->assertEquals($storeConfig->getSecureBaseMediaUrl(), $responseConfig['secure_base_media_url']);
-        $this->assertEquals($scopeConfig->getValue(
-            'store/information/name',
-            ScopeInterface::SCOPE_STORE,
-            $storeConfig->getId()
-        ), $responseConfig['store_name']);
+        $this->assertEquals($storeConfig->getName(), $responseConfig['store_name']);
     }
 }

From 48749bcf9c620d2b833c23f5fadc0fd0027d3d67 Mon Sep 17 00:00:00 2001
From: Dmitriy Gallyamov <dmitrijs.gallamovs@gmail.com>
Date: Tue, 30 Jun 2020 14:22:16 +0300
Subject: [PATCH 0666/1718] magento/magento2#28569: Multi-store: Missing store
 codes in relation to a group and website

- Added strict types
---
 .../Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php b/app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php
index d47e6ba949821..217e32a660f15 100644
--- a/app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php
+++ b/app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php
@@ -49,7 +49,7 @@ public function getStoreByWebsiteId($websiteId)
      * @param bool $available
      * @return array
      */
-    public function getWebsiteStoreCodes($websiteId, $available = false): array
+    public function getWebsiteStoreCodes(string $websiteId, bool $available = false): array
     {
         $connection = $this->resource->getConnection();
         $storeTable = $this->resource->getTableName('store');

From cff0e9840e6058af103c04d1f947af0241e744c5 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Tue, 30 Jun 2020 16:11:17 +0300
Subject: [PATCH 0667/1718] add mftf

---
 .../AdminNotificationToolbarSection.xml       | 15 +++++
 ...nSystemNotificationToolbarBlockAclTest.xml | 62 +++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 app/code/Magento/AdminNotification/Test/Mftf/Section/AdminNotificationToolbarSection.xml
 create mode 100644 app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationToolbarBlockAclTest.xml

diff --git a/app/code/Magento/AdminNotification/Test/Mftf/Section/AdminNotificationToolbarSection.xml b/app/code/Magento/AdminNotification/Test/Mftf/Section/AdminNotificationToolbarSection.xml
new file mode 100644
index 0000000000000..c4a9290cb5641
--- /dev/null
+++ b/app/code/Magento/AdminNotification/Test/Mftf/Section/AdminNotificationToolbarSection.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="AdminNotificationToolbarSection">
+        <element name="notification" type="block" selector=".notifications-wrapper.admin__action-dropdown-wrap"/>
+        <element name="notificationCounter" type="block" selector=".notifications-action.admin__action-dropdown .notifications-counter"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationToolbarBlockAclTest.xml b/app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationToolbarBlockAclTest.xml
new file mode 100644
index 0000000000000..74e595c601f32
--- /dev/null
+++ b/app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationToolbarBlockAclTest.xml
@@ -0,0 +1,62 @@
+<?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="AdminSystemNotificationToolbarBlockAclTest">
+        <annotations>
+            <features value="AdminNotification"/>
+            <title value="Admin system notification toolbar block acl test"/>
+            <description value="Admin should not see system notification toolbar block if acl not restricted"/>
+            <severity value="MAJOR"/>
+            <group value="menu"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
+
+            <actionGroup ref="AdminFillUserRoleRequiredDataActionGroup" stepKey="fillUserRoleRequiredData">
+                <argument name="User" value="adminRole"/>
+                <argument name="restrictedRole" value="Stores"/>
+            </actionGroup>
+            <actionGroup ref="AdminUserClickRoleResourceTabActionGroup" stepKey="goToRoleResourcesTab" />
+            <actionGroup ref="AdminAddRestrictedRoleActionGroup" stepKey="addRestrictedRoleStores">
+                <argument name="User" value="adminRole"/>
+                <argument name="restrictedRole" value="Products"/>
+            </actionGroup>
+            <actionGroup ref="AdminUserSaveRoleActionGroup" stepKey="saveUserRole" />
+
+            <actionGroup ref="AdminCreateUserActionGroup" stepKey="createAdminUser">
+                <argument name="role" value="adminRole"/>
+                <argument name="User" value="admin2"/>
+            </actionGroup>
+
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
+        </before>
+        <after>
+            <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>
+            <actionGroup ref="AdminOpenAdminUsersPageActionGroup" stepKey="goToAllUsersPage"/>
+            <actionGroup ref="AdminDeleteNewUserActionGroup" stepKey="deleteUser">
+                <argument name="userName" value="{{admin2.username}}"/>
+            </actionGroup>
+        </after>
+
+        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsNewUser">
+            <argument name="username" value="{{admin2.username}}"/>
+            <argument name="password" value="{{admin2.password}}"/>
+        </actionGroup>
+
+        <waitForPageLoad stepKey="waitBeforePageLoad"/>
+        <dontSeeElement selector="{{AdminNotificationToolbarSection.notification}}" stepKey="doNotSeeNotificationBellIcon"/>
+    </test>
+</tests>

From e2db162bb51e794809dbc402a7e52c21e7c43c04 Mon Sep 17 00:00:00 2001
From: Rudolf Vince <rudolf@mediotype.com>
Date: Tue, 30 Jun 2020 15:23:49 +0200
Subject: [PATCH 0668/1718] reverted fixed tests

---
 .../Test/Unit/Controller/Shared/AllcartTest.php   | 15 +++++++++++++++
 .../Test/Unit/Controller/Shared/CartTest.php      |  3 +++
 2 files changed, 18 insertions(+)

diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php
index 6c96cefe8f92f..4c2175a55ce9d 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php
@@ -77,6 +77,21 @@ protected function setUp(): void
         $this->contextMock = $this->getMockBuilder(Context::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->wishlistMock = $this->getMockBuilder(Wishlist::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->requestMock = $this->getMockBuilder(Http::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resultFactoryMock = $this->getMockBuilder(ResultFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resultRedirectMock = $this->getMockBuilder(Redirect::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->resultForwardMock = $this->getMockBuilder(Forward::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->allcartController = new Allcart(
             $this->contextMock,
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php
index da9c2d536830f..cee4b39ecfc2f 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php
@@ -173,6 +173,9 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->product = $this->getMockBuilder(Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->model = new SharedCart(
             $this->context,

From 75f71a47c52272670832ac8d811e9e8d9ac641d7 Mon Sep 17 00:00:00 2001
From: Marjan Petkovski <petkovski.marjan@gmail.com>
Date: Tue, 30 Jun 2020 15:27:00 +0200
Subject: [PATCH 0669/1718] magento/magento2#26121: special price & tier price
 are coming in base currency

Address static tests - session 2
---
 .../Magento/GraphQl/CatalogCustomer/PriceTiersTest.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCustomer/PriceTiersTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCustomer/PriceTiersTest.php
index 6a82e46b6c907..90c7c88075ba5 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCustomer/PriceTiersTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCustomer/PriceTiersTest.php
@@ -147,7 +147,7 @@ public function testSecondStoreViewWithCurrencyRate()
      */
     private function getValueForQuantity(float $quantity, array $tiers)
     {
-        $filteredResult = array_values(array_filter($tiers, function($tier) use ($quantity) {
+        $filteredResult = array_values(array_filter($tiers, function ($tier) use ($quantity) {
             if ((float)$tier['quantity'] == $quantity) {
                 return $tier;
             }

From 984dab1cf1c475ed2b60d12e98358fc69ede9dc0 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Tue, 30 Jun 2020 14:40:19 +0100
Subject: [PATCH 0670/1718] Simplified PR to a JS only approach

---
 .../Magento/Ui/Component/UrlFilterApplier.php | 44 -------------------
 app/code/Magento/Ui/etc/ui_components.xsd     |  1 -
 app/code/Magento/Ui/etc/ui_configuration.xsd  | 10 -----
 app/code/Magento/Ui/etc/ui_definition.xsd     |  1 -
 .../base/ui_component/etc/definition.map.xml  |  1 -
 .../view/base/ui_component/etc/definition.xml |  1 -
 .../etc/definition/urlFilterApplier.xsd       | 18 --------
 .../base/web/js/grid/url-filter-applier.js    | 36 ++++++++++++---
 8 files changed, 31 insertions(+), 81 deletions(-)
 delete mode 100644 app/code/Magento/Ui/Component/UrlFilterApplier.php
 delete mode 100644 app/code/Magento/Ui/view/base/ui_component/etc/definition/urlFilterApplier.xsd

diff --git a/app/code/Magento/Ui/Component/UrlFilterApplier.php b/app/code/Magento/Ui/Component/UrlFilterApplier.php
deleted file mode 100644
index ee7397b69e9ff..0000000000000
--- a/app/code/Magento/Ui/Component/UrlFilterApplier.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Ui\Component;
-
-/**
- * UrlFilterApplier component
- */
-class UrlFilterApplier extends AbstractComponent
-{
-    const NAME = 'urlFilterApplier';
-
-    /**
-     * @inheritdoc
-     */
-    public function prepare(): void
-    {
-        parent::prepare();
-        $filters = is_array($this->getContext()->getRequestParam('filters')) ?
-            $this->getContext()->getRequestParam('filters') : null;
-
-        $this->setData(
-            'config',
-            array_replace_recursive(
-                (array)$this->getData('config'),
-                [
-                    'filters' => $filters,
-                ]
-            )
-        );
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function getComponentName()
-    {
-        return static::NAME;
-    }
-}
diff --git a/app/code/Magento/Ui/etc/ui_components.xsd b/app/code/Magento/Ui/etc/ui_components.xsd
index ed4be78b93aa8..eb8cc08f904fd 100644
--- a/app/code/Magento/Ui/etc/ui_components.xsd
+++ b/app/code/Magento/Ui/etc/ui_components.xsd
@@ -62,5 +62,4 @@
     <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/exportButton.xsd"/>
     <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/listingToolbar.xsd"/>
     <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/dataProvider.xsd"/>
-    <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/urlFilterApplier.xsd"/>
 </xs:schema>
diff --git a/app/code/Magento/Ui/etc/ui_configuration.xsd b/app/code/Magento/Ui/etc/ui_configuration.xsd
index 4d7b8f20e4587..d45a3d7497637 100644
--- a/app/code/Magento/Ui/etc/ui_configuration.xsd
+++ b/app/code/Magento/Ui/etc/ui_configuration.xsd
@@ -107,7 +107,6 @@
             <xs:element ref="text" maxOccurs="unbounded"/>
             <xs:element ref="textarea" maxOccurs="unbounded"/>
             <xs:element ref="wysiwyg" maxOccurs="unbounded"/>
-            <xs:element ref="urlFilterApplier" maxOccurs="unbounded" />
         </xs:choice>
     </xs:group>
     <xs:group name="fieldsetElements">
@@ -207,7 +206,6 @@
             <xs:element ref="text" maxOccurs="unbounded"/>
             <xs:element ref="textarea" maxOccurs="unbounded"/>
             <xs:element ref="wysiwyg" maxOccurs="unbounded"/>
-            <xs:element ref="urlFilterApplier" maxOccurs="unbounded" />
         </xs:choice>
     </xs:group>
 
@@ -826,12 +824,4 @@
             </xs:documentation>
         </xs:annotation>
     </xs:element>
-    <xs:element name="urlFilterApplier" type="componentUrlFilterApplier">
-        <xs:annotation>
-            <xs:documentation>
-                The Url Filter Applier component retrieves the values from the "filters" GET parameter and applies it
-                to the grid.
-            </xs:documentation>
-        </xs:annotation>
-    </xs:element>
 </xs:schema>
diff --git a/app/code/Magento/Ui/etc/ui_definition.xsd b/app/code/Magento/Ui/etc/ui_definition.xsd
index 80aaf1ebeb3c2..e86e2654ff629 100644
--- a/app/code/Magento/Ui/etc/ui_definition.xsd
+++ b/app/code/Magento/Ui/etc/ui_definition.xsd
@@ -77,7 +77,6 @@
             <xs:element name="wysiwyg" type="componentWysiwyg"/>
             <xs:element name="inlineEditing" type="componentInlineEditing"/>
             <xs:element name="urlInput" type="componentUrlInput"/>
-            <xs:element name="urlFilterApplier" type="componentUrlFilterApplier" />
         </xs:choice>
     </xs:complexType>
 </xs:schema>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition.map.xml b/app/code/Magento/Ui/view/base/ui_component/etc/definition.map.xml
index 89f400f34924f..8f82b98112f18 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition.map.xml
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition.map.xml
@@ -499,7 +499,6 @@
             </argument>
         </schema>
     </component>
-    <component name="urlFilterApplier" include="uiElementSettings"/>
     <component name="filterSearch" include="uiElementSettings">
         <schema name="current">
             <argument name="data" xsi:type="array">
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition.xml b/app/code/Magento/Ui/view/base/ui_component/etc/definition.xml
index 98870e44bcee7..f0a5f357f8a92 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition.xml
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition.xml
@@ -284,5 +284,4 @@
     </dynamicRows>
     <htmlContent class="Magento\Ui\Component\HtmlContent" component="Magento_Ui/js/form/components/html"/>
     <button class="Magento\Ui\Component\Container" component="Magento_Ui/js/form/components/button"/>
-    <urlFilterApplier class="Magento\Ui\Component\UrlFilterApplier" component="Magento_Ui/js/grid/url-filter-applier" />
 </components>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/urlFilterApplier.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/urlFilterApplier.xsd
deleted file mode 100644
index ac1dd490ee248..0000000000000
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/urlFilterApplier.xsd
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <!-- Include section -->
-    <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/ui_component.xsd"/>
-
-    <xs:complexType name="componentUrlFilterApplier">
-        <xs:sequence>
-            <xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-        <xs:attributeGroup ref="ui_element_attributes"/>
-    </xs:complexType>
-</xs:schema>
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 16d26e2da984f..d379d2611aba4 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
@@ -12,7 +12,7 @@ define([
     return Component.extend({
         defaults: {
             filterProvider: 'componentType = filters, ns = ${ $.ns }',
-            filters: null,
+            filterKey: 'filters',
             modules: {
                 filterComponent: '${ $.filterProvider }',
             }
@@ -34,14 +34,40 @@ define([
          * Apply filter
          */
         apply: function () {
+            var urlFilter = this.getFilterParam();
+
             if (_.isUndefined(this.filterComponent())) {
                 setTimeout(function () {this.apply()}.bind(this), 100);
             } else {
-                if (!_.isNull(this.filters)) {
-                    this.filterComponent().setData(this.filters, false);
-                    this.filterComponent().apply();
-                }
+                 if (Object.keys(urlFilter).length) {
+                     this.filterComponent().setData(urlFilter, false);
+                     this.filterComponent().apply();
+                 }
             }
+        },
+
+        /**
+         * Get filter param from url
+         *
+         * @returns {Object}
+         */
+        getFilterParam: function () {
+            var searchString = decodeURI(location.search);
+
+            return _.chain(searchString.slice(1).split('&'))
+                .map(function (item) {
+                    if (item && item.search(this.filterKey) !== -1) {
+                        var itemArray = item.split('=');
+
+                        itemArray[0] = itemArray[0].replace(this.filterKey, '')
+                                .replace(/[\[\]]/g, '');
+
+                        return itemArray
+                    }
+                }.bind(this))
+                .compact()
+                .object()
+                .value();
         }
     });
 });

From a9c4d2ad89c5f2147017cc226da259de36e471d0 Mon Sep 17 00:00:00 2001
From: Kamil <lumnn@mailfence.com>
Date: Tue, 30 Jun 2020 16:57:27 +0200
Subject: [PATCH 0671/1718] Remove unneccessary isOverflowed function from
 checkout sidebar widget

---
 .../Checkout/view/frontend/web/js/sidebar.js   | 18 ------------------
 .../web/template/summary/cart-items.html       |  2 +-
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
index a7ccb217fa102..2e501c0c42b77 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js
@@ -42,7 +42,6 @@ define([
         update: function () {
             $(this.options.targetElement).trigger('contentUpdated');
             this._calcHeight();
-            this._isOverflowed();
         },
 
         /**
@@ -135,23 +134,6 @@ define([
 
             this._on(this.element, events);
             this._calcHeight();
-            this._isOverflowed();
-        },
-
-        /**
-         * Add 'overflowed' class to minicart items wrapper element
-         *
-         * @private
-         */
-        _isOverflowed: function () {
-            var list = $(this.options.minicart.list),
-                cssOverflowClass = 'overflowed';
-
-            if (this.scrollHeight > list.innerHeight()) {
-                list.parent().addClass(cssOverflowClass);
-            } else {
-                list.parent().removeClass(cssOverflowClass);
-            }
         },
 
         /**
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/cart-items.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/cart-items.html
index 4e49d4502d8a8..8fc514990d567 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/summary/cart-items.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/cart-items.html
@@ -15,7 +15,7 @@
         </strong>
     </div>
     <div class="content minicart-items" data-role="content">
-        <div class="minicart-items-wrapper overflowed">
+        <div class="minicart-items-wrapper">
             <ol class="minicart-items">
                 <each args="items()">
                     <li class="product-item">

From 2f080644f1f1f7cfed677a9eb3008932fcef9a2c Mon Sep 17 00:00:00 2001
From: Rudolf Vince <rudolf@mediotype.com>
Date: Tue, 30 Jun 2020 17:07:06 +0200
Subject: [PATCH 0672/1718] objectmanager added to test

---
 .../Unit/Controller/Shared/AllcartTest.php    | 31 ++++++++++++++++---
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php
index 4c2175a55ce9d..5fa5eb748ac65 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php
@@ -12,6 +12,7 @@
 use Magento\Framework\Controller\Result\Forward;
 use Magento\Framework\Controller\Result\Redirect;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Wishlist\Controller\Shared\Allcart;
 use Magento\Wishlist\Controller\Shared\WishlistProvider;
 use Magento\Wishlist\Model\ItemCarrier;
@@ -26,6 +27,11 @@ class AllcartTest extends TestCase
      */
     protected $allcartController;
 
+    /**
+     * @var ObjectManagerHelper
+     */
+    protected $objectManagerHelper;
+
     /**
      * @var WishlistProvider|MockObject
      */
@@ -34,7 +40,7 @@ class AllcartTest extends TestCase
     /**
      * @var Context|MockObject
      */
-    protected $contextMock;
+    protected $context;
 
     /**
      * @var ItemCarrier|MockObject
@@ -74,9 +80,6 @@ protected function setUp(): void
         $this->itemCarrierMock = $this->getMockBuilder(ItemCarrier::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->contextMock = $this->getMockBuilder(Context::class)
-            ->disableOriginalConstructor()
-            ->getMock();
         $this->wishlistMock = $this->getMockBuilder(Wishlist::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -93,8 +96,26 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->resultFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturnMap(
+                [
+                    [ResultFactory::TYPE_REDIRECT, [], $this->resultRedirectMock],
+                    [ResultFactory::TYPE_FORWARD, [], $this->resultForwardMock]
+                ]
+            );
+
+        $this->objectManagerHelper = new ObjectManagerHelper($this);
+        $this->context = $this->objectManagerHelper->getObject(
+            Context::class,
+            [
+                'request' => $this->requestMock,
+                'resultFactory' => $this->resultFactoryMock
+            ]
+        );
+
         $this->allcartController = new Allcart(
-            $this->contextMock,
+            $this->context,
             $this->itemCarrierMock,
             $this->wishlistProviderMock
         );

From a86e1da7becc8621f513d87221fef698587b7a9a Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Tue, 30 Jun 2020 21:47:11 +0300
Subject: [PATCH 0673/1718] Rename action group

---
 .../Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml | 2 +-
 .../OnePageCheckoutAsCustomerUsingDefaultAddressTest.xml    | 2 +-
 .../Test/OnePageCheckoutAsCustomerUsingNewAddressTest.xml   | 2 +-
 .../OnePageCheckoutAsCustomerUsingNonDefaultAddressTest.xml | 2 +-
 .../Test/Mftf/Test/OnePageCheckoutUsingSignInLinkTest.xml   | 2 +-
 .../Mftf/Test/OnePageCheckoutWithAllProductTypesTest.xml    | 2 +-
 ...hippingAndBillingAddressAndProductWithTierPricesTest.xml | 2 +-
 ...ndBillingAddressAndRegisterCustomerAfterCheckoutTest.xml | 2 +-
 .../Test/StorefrontCheckoutWithSpecialPriceProductsTest.xml | 2 +-
 ...stomerCheckoutOnLoginWhenGuestCheckoutIsDisabledTest.xml | 2 +-
 ...thNewCustomerRegistrationAndDisableGuestCheckoutTest.xml | 2 +-
 ...StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml | 2 +-
 ...StorefrontGuestCheckoutWithCouponAndZeroSubtotalTest.xml | 2 +-
 ...uctQuantityChangesInBackendAfterCustomerCheckoutTest.xml | 2 +-
 .../Test/StorefrontUKCustomerCheckoutWithCouponTest.xml     | 2 +-
 ...hConditionProductQuantityEqualsToOrderedQuantityTest.xml | 2 +-
 ...erCheckoutWithCouponAndBankTransferPaymentMethodTest.xml | 2 +-
 .../Fedex/Test/Mftf/Test/AdminCreatingShippingLabelTest.xml | 2 +-
 ...shippingCheckoutWhenCartPageIsOpenedInAnotherTabTest.xml | 2 +-
 ...geActionGroup.xml => AdminOrdersPageOpenActionGroup.xml} | 2 +-
 ...lTheCreatedOrderWithCheckMoneyOrderPaymentMethodTest.xml | 2 +-
 ...heCreatedOrderWithProductQtyWithoutStockDecreaseTest.xml | 4 ++--
 .../AdminCorrectnessInvoicedItemInBundleProductTest.xml     | 2 +-
 .../Test/AdminMassOrdersCancelCompleteAndClosedTest.xml     | 2 +-
 .../Test/AdminMassOrdersCancelProcessingAndClosedTest.xml   | 2 +-
 .../Test/Mftf/Test/AdminMassOrdersHoldOnCompleteTest.xml    | 2 +-
 .../Test/AdminMassOrdersHoldOnPendingAndProcessingTest.xml  | 2 +-
 .../Mftf/Test/AdminMassOrdersReleasePendingOrderTest.xml    | 2 +-
 .../Test/AdminMassOrdersUpdateCancelPendingOrderTest.xml    | 2 +-
 .../Test/Mftf/Test/AdminOrdersReleaseInUnholdStatusTest.xml | 2 +-
 .../Test/AdminSubmitsOrderPaymentMethodValidationTest.xml   | 2 +-
 .../Mftf/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml  | 2 +-
 .../AdminSubmitsOrderWithAndWithoutFieldsValidationTest.xml | 2 +-
 .../AssignCustomOrderStatusNotVisibleOnStorefrontTest.xml   | 4 ++--
 .../Mftf/Test/CreateInvoiceAndCheckInvoiceOrderTest.xml     | 4 ++--
 .../CreateInvoiceWithCashOnDeliveryPaymentMethodTest.xml    | 2 +-
 .../CreateInvoiceWithShipmentAndCheckInvoicedOrderTest.xml  | 6 +++---
 .../Mftf/Test/CreateInvoiceWithZeroSubtotalCheckoutTest.xml | 2 +-
 .../Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml  | 2 +-
 39 files changed, 44 insertions(+), 44 deletions(-)
 rename app/code/Magento/Sales/Test/Mftf/ActionGroup/{AdminOpenOrdersPageActionGroup.xml => AdminOrdersPageOpenActionGroup.xml} (91%)

diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml
index f7763c8825b62..78a5d78a53d92 100644
--- a/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml
@@ -93,7 +93,7 @@
         <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessInvoiceMessage"/>
         <!--Create Shipment for the order-->
         <comment userInput="Create Shipment for the order" stepKey="createShipmentForOrder"/>
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="onOrdersPage2"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="onOrdersPage2"/>
         <actionGroup ref="AdminOrderGridClickFirstRowActionGroup" stepKey="openOrderPageForShip"/>
         <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction"/>
         <waitForPageLoad stepKey="waitForShipmentPagePage"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingDefaultAddressTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingDefaultAddressTest.xml
index cdb4a16d904fc..e90e1bf5a2e82 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingDefaultAddressTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingDefaultAddressTest.xml
@@ -85,7 +85,7 @@
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
 
         <!-- Open created order in backend -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
         <actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrderGridById">
             <argument name="orderId" value="$grabOrderNumber"/>
         </actionGroup>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNewAddressTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNewAddressTest.xml
index a5c90fbdc58a8..a0be4aaa5c97b 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNewAddressTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNewAddressTest.xml
@@ -98,7 +98,7 @@
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
 
         <!-- Open created order in backend -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
         <actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrderGridById">
             <argument name="orderId" value="$grabOrderNumber"/>
         </actionGroup>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNonDefaultAddressTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNonDefaultAddressTest.xml
index 5774b2a5f32b2..6a211c3908059 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNonDefaultAddressTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNonDefaultAddressTest.xml
@@ -86,7 +86,7 @@
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
 
         <!-- Open created order in backend -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
         <actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrderGridById">
             <argument name="orderId" value="$grabOrderNumber"/>
         </actionGroup>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutUsingSignInLinkTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutUsingSignInLinkTest.xml
index e863a2f500fdc..42d61abca845b 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutUsingSignInLinkTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutUsingSignInLinkTest.xml
@@ -79,7 +79,7 @@
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
 
         <!-- Open created order in backend -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
         <actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrderGridById">
             <argument name="orderId" value="$grabOrderNumber"/>
         </actionGroup>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutWithAllProductTypesTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutWithAllProductTypesTest.xml
index 6958f89a483af..89feb713c6a65 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutWithAllProductTypesTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutWithAllProductTypesTest.xml
@@ -198,7 +198,7 @@
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
 
         <!-- Open created order -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
         <actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrderGridById">
             <argument name="orderId" value="$grabOrderNumber"/>
         </actionGroup>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithDifferentShippingAndBillingAddressAndProductWithTierPricesTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithDifferentShippingAndBillingAddressAndProductWithTierPricesTest.xml
index adf254e955a4f..04aa290a4f6a1 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithDifferentShippingAndBillingAddressAndProductWithTierPricesTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithDifferentShippingAndBillingAddressAndProductWithTierPricesTest.xml
@@ -108,7 +108,7 @@
         <see selector="{{StorefrontCustomerAddressesSection.shippingAddress}}" userInput="T: {{updateCustomerUKAddress.telephone}}" stepKey="seeTelephoneInShippingAddress"/>
 
         <!--Open Order Index Page -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
 
         <!-- Filter Order using orderId and assert order-->
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithDifferentShippingAndBillingAddressAndRegisterCustomerAfterCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithDifferentShippingAndBillingAddressAndRegisterCustomerAfterCheckoutTest.xml
index fbde35f1696c8..23a8fd5a2c88c 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithDifferentShippingAndBillingAddressAndRegisterCustomerAfterCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithDifferentShippingAndBillingAddressAndRegisterCustomerAfterCheckoutTest.xml
@@ -77,7 +77,7 @@
         <actionGroup ref="StorefrontRegisterCustomerAfterCheckoutActionGroup" stepKey="registerCustomer"/>
 
         <!-- Open Order Index Page -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
 
         <!-- Filter Order using orderId and assert order-->
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithSpecialPriceProductsTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithSpecialPriceProductsTest.xml
index 389762ae5e96f..9b20f7b69bb57 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithSpecialPriceProductsTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithSpecialPriceProductsTest.xml
@@ -150,7 +150,7 @@
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="orderId"/>
 
         <!-- Open Order Index Page -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
 
         <!-- Filter Order using orderId and assert order-->
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutOnLoginWhenGuestCheckoutIsDisabledTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutOnLoginWhenGuestCheckoutIsDisabledTest.xml
index f0b6c767f7297..5112be119df80 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutOnLoginWhenGuestCheckoutIsDisabledTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutOnLoginWhenGuestCheckoutIsDisabledTest.xml
@@ -77,7 +77,7 @@
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="orderId"/>
 
         <!-- Open Order Index Page -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
 
         <!-- Filter Order using orderId and assert order-->
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutWithNewCustomerRegistrationAndDisableGuestCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutWithNewCustomerRegistrationAndDisableGuestCheckoutTest.xml
index 9d36c24a151d2..4672815fb1b10 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutWithNewCustomerRegistrationAndDisableGuestCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutWithNewCustomerRegistrationAndDisableGuestCheckoutTest.xml
@@ -115,7 +115,7 @@
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="orderId"/>
 
         <!-- Open Order Index Page -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
 
         <!-- Filter Order using orderId and assert order-->
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml
index 814030277ab6a..259853059b24e 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml
@@ -195,7 +195,7 @@
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumberWithoutLink}}" stepKey="orderId"/>
 
         <!-- Open Order Index Page -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
 
         <!-- Filter Order using orderId and assert order-->
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutWithCouponAndZeroSubtotalTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutWithCouponAndZeroSubtotalTest.xml
index 332548354f561..f910a9d47244f 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutWithCouponAndZeroSubtotalTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutWithCouponAndZeroSubtotalTest.xml
@@ -73,7 +73,7 @@
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumberWithoutLink}}" stepKey="orderId"/>
 
         <!-- Open Order Index Page -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
 
         <!-- Filter Order using orderId and assert order-->
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductQuantityChangesInBackendAfterCustomerCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductQuantityChangesInBackendAfterCustomerCheckoutTest.xml
index 00973eee1bea4..492bcec7bcc37 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductQuantityChangesInBackendAfterCustomerCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductQuantityChangesInBackendAfterCustomerCheckoutTest.xml
@@ -67,7 +67,7 @@
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumberWithoutLink}}" stepKey="orderId"/>
 
         <!-- Open Order Index Page -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
 
         <!-- Filter Order using orderId and assert order-->
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUKCustomerCheckoutWithCouponTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUKCustomerCheckoutWithCouponTest.xml
index 2bff260a6126f..d037718a1ec94 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUKCustomerCheckoutWithCouponTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUKCustomerCheckoutWithCouponTest.xml
@@ -112,7 +112,7 @@
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminPanel"/>
 
         <!-- Open Order Index Page -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
 
         <!-- Filter Order using orderId and assert order-->
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUKGuestCheckoutWithConditionProductQuantityEqualsToOrderedQuantityTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUKGuestCheckoutWithConditionProductQuantityEqualsToOrderedQuantityTest.xml
index b3514735716c9..f11144aa454af 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUKGuestCheckoutWithConditionProductQuantityEqualsToOrderedQuantityTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUKGuestCheckoutWithConditionProductQuantityEqualsToOrderedQuantityTest.xml
@@ -62,7 +62,7 @@
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumberWithoutLink}}" stepKey="orderId"/>
 
         <!-- Open Order Index Page -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
 
         <!-- Filter Order using orderId and assert order-->
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUSCustomerCheckoutWithCouponAndBankTransferPaymentMethodTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUSCustomerCheckoutWithCouponAndBankTransferPaymentMethodTest.xml
index e6dc176c35c82..655865a62cdba 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUSCustomerCheckoutWithCouponAndBankTransferPaymentMethodTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUSCustomerCheckoutWithCouponAndBankTransferPaymentMethodTest.xml
@@ -74,7 +74,7 @@
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumberWithoutLink}}" stepKey="orderId"/>
 
         <!-- Open Order Index Page -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
 
         <!-- Filter Order using orderId and assert order-->
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
diff --git a/app/code/Magento/Fedex/Test/Mftf/Test/AdminCreatingShippingLabelTest.xml b/app/code/Magento/Fedex/Test/Mftf/Test/AdminCreatingShippingLabelTest.xml
index be5638bf70080..b52efc3c2ce6d 100644
--- a/app/code/Magento/Fedex/Test/Mftf/Test/AdminCreatingShippingLabelTest.xml
+++ b/app/code/Magento/Fedex/Test/Mftf/Test/AdminCreatingShippingLabelTest.xml
@@ -105,7 +105,7 @@
         </actionGroup>
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
         <!--Open created order in admin-->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="onOrdersPage"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="onOrdersPage"/>
         <actionGroup ref="SearchAdminDataGridByKeywordActionGroup" stepKey="searchOrder">
             <argument name="keyword" value="$grabOrderNumber"/>
         </actionGroup>
diff --git a/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontProcessMultishippingCheckoutWhenCartPageIsOpenedInAnotherTabTest.xml b/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontProcessMultishippingCheckoutWhenCartPageIsOpenedInAnotherTabTest.xml
index 8025c1f005a49..46f1daad053d5 100644
--- a/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontProcessMultishippingCheckoutWhenCartPageIsOpenedInAnotherTabTest.xml
+++ b/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontProcessMultishippingCheckoutWhenCartPageIsOpenedInAnotherTabTest.xml
@@ -101,7 +101,7 @@
         <seeElement selector="{{StorefrontCustomerOrdersGridSection.orderView({$grabSecondOrderId})}}" stepKey="seeSecondOrder"/>
         <waitForPageLoad stepKey="waitForOrderPageLoad"/>
         <!-- Go to Admin > Sales > Orders -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="onOrdersPage"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="onOrdersPage"/>
         <actionGroup ref="SearchAdminDataGridByKeywordActionGroup" stepKey="searchFirstOrder">
             <argument name="keyword" value="$grabFirstOrderId"/>
         </actionGroup>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenOrdersPageActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrdersPageOpenActionGroup.xml
similarity index 91%
rename from app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenOrdersPageActionGroup.xml
rename to app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrdersPageOpenActionGroup.xml
index b116880263c15..2f08637cdcb53 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenOrdersPageActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrdersPageOpenActionGroup.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="AdminOpenOrdersPageActionGroup">
+    <actionGroup name="AdminOrdersPageOpenActionGroup">
         <annotations>
             <description>Goes to the Admin Orders page.</description>
         </annotations>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCheckMoneyOrderPaymentMethodTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCheckMoneyOrderPaymentMethodTest.xml
index 2d3f3a9db4ead..68be007babee6 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCheckMoneyOrderPaymentMethodTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCheckMoneyOrderPaymentMethodTest.xml
@@ -215,7 +215,7 @@
         </actionGroup>
         <!-- Open Order Index Page -->
         <comment userInput="Open Order Index Page" stepKey="openOrderIndexPageComemnt"/>
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
         <!-- Filter order using orderId -->
         <comment userInput="Filter order using orderId" stepKey="filterOrderUsingOrderIdComment"/>
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithProductQtyWithoutStockDecreaseTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithProductQtyWithoutStockDecreaseTest.xml
index 7fa9c40e6f1e4..62425cefb20db 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithProductQtyWithoutStockDecreaseTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithProductQtyWithoutStockDecreaseTest.xml
@@ -76,7 +76,7 @@
         <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="In Stock" stepKey="seeProductStockStatus"/>
 
         <!-- Open Order Index Page -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
 
         <!-- Filter Order using orderId -->
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
@@ -97,7 +97,7 @@
         <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="In Stock" stepKey="seeProductStockStatusAfterCancelOrder"/>
 
         <!-- Open Order Index Page -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders1"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders1"/>
 
         <!-- Filter Order using orderId -->
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById1">
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml
index 1814b554f9884..904d3fc686684 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCorrectnessInvoicedItemInBundleProductTest.xml
@@ -77,7 +77,7 @@
 
         <!--Go to order page submit invoice-->
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="onOrdersPage"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="onOrdersPage"/>
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
             <argument name="orderId" value="$grabOrderNumber"/>
         </actionGroup>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedTest.xml
index 98182aa7ec720..188002f3938a6 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedTest.xml
@@ -63,7 +63,7 @@
         <actionGroup ref="AdminCreateInvoiceAndCreditMemoActionGroup" stepKey="createCreditMemo"/>
 
         <!-- Navigate to backend: Go to Sales > Orders -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="onOrderPage"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="onOrderPage"/>
         <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
 
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelProcessingAndClosedTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelProcessingAndClosedTest.xml
index 76662791fd477..055388570479e 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelProcessingAndClosedTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelProcessingAndClosedTest.xml
@@ -63,7 +63,7 @@
         <actionGroup ref="AdminCreateInvoiceAndCreditMemoActionGroup" stepKey="createCreditMemo"/>
 
         <!-- Navigate to backend: Go to Sales > Orders -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="onOrderPage"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="onOrderPage"/>
         <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
 
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnCompleteTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnCompleteTest.xml
index 46419aaad8f7d..9b2ded574b737 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnCompleteTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnCompleteTest.xml
@@ -50,7 +50,7 @@
         <actionGroup ref="AdminCreateInvoiceAndShipmentActionGroup" stepKey="createShipment"/>
 
         <!-- Navigate to backend: Go to Sales > Orders -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="onOrderPage"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="onOrderPage"/>
         <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
 
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnPendingAndProcessingTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnPendingAndProcessingTest.xml
index cc9daded11a49..1a89c5656b2f1 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnPendingAndProcessingTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnPendingAndProcessingTest.xml
@@ -60,7 +60,7 @@
         <actionGroup ref="AdminCreateInvoiceActionGroup" stepKey="createInvoice"/>
 
         <!-- Navigate to backend: Go to Sales > Orders -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="onOrderPage"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="onOrderPage"/>
         <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
 
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersReleasePendingOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersReleasePendingOrderTest.xml
index 98396d439e672..2252c0a813bcf 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersReleasePendingOrderTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersReleasePendingOrderTest.xml
@@ -47,7 +47,7 @@
         </assertNotEmpty>
 
         <!-- Navigate to backend: Go to Sales > Orders -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="onOrderPage"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="onOrderPage"/>
         <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
 
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersUpdateCancelPendingOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersUpdateCancelPendingOrderTest.xml
index e58997cee0d9e..d4004c519b7df 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersUpdateCancelPendingOrderTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersUpdateCancelPendingOrderTest.xml
@@ -46,7 +46,7 @@
         </assertNotEmpty>
 
         <!-- Navigate to backend: Go to Sales > Orders -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="onOrderPage"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="onOrderPage"/>
         <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
 
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminOrdersReleaseInUnholdStatusTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminOrdersReleaseInUnholdStatusTest.xml
index db9cb4c71892e..28ce9661e259b 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminOrdersReleaseInUnholdStatusTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminOrdersReleaseInUnholdStatusTest.xml
@@ -52,7 +52,7 @@
         <see userInput="You put the order on hold." stepKey="seeHoldMessage"/>
 
         <!-- Navigate to backend: Go to Sales > Orders -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="onOrderPage"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="onOrderPage"/>
         <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
 
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderPaymentMethodValidationTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderPaymentMethodValidationTest.xml
index 10c3134bac7e3..bd6a21e3112ca 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderPaymentMethodValidationTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderPaymentMethodValidationTest.xml
@@ -33,7 +33,7 @@
         </after>
         <!--Create order via Admin-->
         <comment userInput="Admin creates order" stepKey="adminCreateOrderComment"/>
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="navigateToOrderIndexPage"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="navigateToOrderIndexPage"/>
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Orders" stepKey="seeIndexPageTitle"/>
         <click selector="{{AdminOrdersGridSection.createNewOrder}}" stepKey="clickCreateNewOrder"/>
         <click selector="{{AdminOrderFormActionSection.CreateNewCustomer}}" stepKey="clickCreateCustomer"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml
index 47a7e7bf86f83..727aef99352ec 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutEmailTest.xml
@@ -32,7 +32,7 @@
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         <comment userInput="Admin creates order" stepKey="adminCreateOrderComment"/>
         <!--<actionGroup ref="NavigateToNewOrderPageNewCustomerActionGroup" stepKey="navigateToNewOrderPage"/>-->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="navigateToOrderIndexPage"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="navigateToOrderIndexPage"/>
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Orders" stepKey="seeIndexPageTitle"/>
         <click selector="{{AdminOrdersGridSection.createNewOrder}}" stepKey="clickCreateNewOrder"/>
         <click selector="{{AdminOrderFormActionSection.CreateNewCustomer}}" stepKey="clickCreateCustomer"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutFieldsValidationTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutFieldsValidationTest.xml
index 187674e8d8d33..2bedb16f3d1dc 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutFieldsValidationTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutFieldsValidationTest.xml
@@ -31,7 +31,7 @@
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         <comment userInput="Admin creates order" stepKey="adminCreateOrderComment"/>
         <!--<actionGroup ref="NavigateToNewOrderPageNewCustomerActionGroup" stepKey="navigateToNewOrderPage"/>-->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="navigateToOrderIndexPage"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="navigateToOrderIndexPage"/>
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Orders" stepKey="seeIndexPageTitle"/>
         <click selector="{{AdminOrdersGridSection.createNewOrder}}" stepKey="clickCreateNewOrder"/>
         <click selector="{{AdminOrderFormActionSection.CreateNewCustomer}}" stepKey="clickCreateCustomer"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AssignCustomOrderStatusNotVisibleOnStorefrontTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AssignCustomOrderStatusNotVisibleOnStorefrontTest.xml
index dcbe59f3f89f2..885f019b864de 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AssignCustomOrderStatusNotVisibleOnStorefrontTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AssignCustomOrderStatusNotVisibleOnStorefrontTest.xml
@@ -85,7 +85,7 @@
         <grabTextFrom selector="|Order # (\d+)|" stepKey="getOrderId"/>
 
         <!-- Assert order status is correct -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrdersPage"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrdersPage"/>
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrdersGridById">
             <argument name="orderId" value="$getOrderId"/>
         </actionGroup>
@@ -109,7 +109,7 @@
         <see selector="{{StorefrontOrderInformationMainSection.emptyMessage}}" userInput="You have placed no orders." stepKey="seeEmptyMessage"/>
 
         <!-- Cancel order -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToAdminOrdersPage"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToAdminOrdersPage"/>
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrdersGridByOrderId">
             <argument name="orderId" value="$getOrderId"/>
         </actionGroup>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceAndCheckInvoiceOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceAndCheckInvoiceOrderTest.xml
index bd5749e238cc2..75b13e15ce151 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceAndCheckInvoiceOrderTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceAndCheckInvoiceOrderTest.xml
@@ -77,7 +77,7 @@
         <grabTextFrom selector="|Order # (\d+)|" stepKey="getOrderId"/>
 
         <!-- Open created order -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrdersPage"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrdersPage"/>
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrdersGridById">
             <argument name="orderId" value="$getOrderId"/>
         </actionGroup>
@@ -102,7 +102,7 @@
         <grabFromCurrentUrl regex="~/invoice_id/(\d+)/~" stepKey="grabInvoiceId"/>
 
         <!-- Assert invoice in invoices tab -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridByIdForAssertingInvoiceBtn">
             <argument name="orderId" value="$getOrderId"/>
         </actionGroup>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithCashOnDeliveryPaymentMethodTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithCashOnDeliveryPaymentMethodTest.xml
index 9e60964f447d8..fd9b4fe2052e3 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithCashOnDeliveryPaymentMethodTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithCashOnDeliveryPaymentMethodTest.xml
@@ -77,7 +77,7 @@
         <grabTextFrom selector="|Order # (\d+)|" stepKey="getOrderId"/>
 
         <!-- Open created order -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrdersPage"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrdersPage"/>
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrdersGridById">
             <argument name="orderId" value="$getOrderId"/>
         </actionGroup>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithShipmentAndCheckInvoicedOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithShipmentAndCheckInvoicedOrderTest.xml
index 7cd966777294d..1e01560a6e646 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithShipmentAndCheckInvoicedOrderTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithShipmentAndCheckInvoicedOrderTest.xml
@@ -71,7 +71,7 @@
         <grabTextFrom selector="|Order # (\d+)|" stepKey="getOrderId"/>
 
         <!-- Open created order -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrdersPage"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrdersPage"/>
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrdersGridById">
             <argument name="orderId" value="$getOrderId"/>
         </actionGroup>
@@ -100,7 +100,7 @@
         <grabFromCurrentUrl regex="~/invoice_id/(\d+)/~" stepKey="grabInvoiceId"/>
 
         <!-- Assert no invoice button -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrders"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrders"/>
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridByIdForAssertingInvoiceBtn">
             <argument name="orderId" value="$getOrderId"/>
         </actionGroup>
@@ -144,7 +144,7 @@
         <grabFromCurrentUrl regex="~/shipment_id/(\d+)/~" stepKey="grabShipmentId"/>
 
         <!-- Assert no ship button -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToAdminOrdersPage"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToAdminOrdersPage"/>
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridByIdForAssertingShipBtn">
             <argument name="orderId" value="$getOrderId"/>
         </actionGroup>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithZeroSubtotalCheckoutTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithZeroSubtotalCheckoutTest.xml
index 920513db2621b..6a4c670dde72e 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithZeroSubtotalCheckoutTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithZeroSubtotalCheckoutTest.xml
@@ -86,7 +86,7 @@
         <grabTextFrom selector="|Order # (\d+)|" stepKey="getOrderId"/>
 
         <!-- Open created order -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="goToOrdersPage"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToOrdersPage"/>
         <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrdersGridById">
             <argument name="orderId" value="$getOrderId"/>
         </actionGroup>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml
index 6e4dbe1b79033..1aebbecd08542 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml
@@ -95,7 +95,7 @@
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
 
         <!-- Search for Order in the order grid -->
-        <actionGroup ref="AdminOpenOrdersPageActionGroup" stepKey="onOrdersPage"/>
+        <actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="onOrdersPage"/>
         <conditionalClick selector="{{AdminOrdersGridSection.clearFilters}}" dependentSelector="{{AdminOrdersGridSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilter"/>
         <fillField selector="{{AdminOrdersGridSection.search}}" userInput="{$grabOrderNumber}" stepKey="searchOrderNum"/>
         <click selector="{{AdminOrdersGridSection.submitSearch}}" stepKey="submitSearch"/>

From a69286315250148607d750c09484ec4b82867b77 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Tue, 30 Jun 2020 21:58:19 +0300
Subject: [PATCH 0674/1718] Fix phone

---
 app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
index 44d6e725af9d8..695fc138e592b 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
@@ -305,7 +305,7 @@
         <data key="firstname">Jane</data>
         <data key="lastname">Miller</data>
         <data key="company">Magento</data>
-        <data key="telephone">44 20 7123 1234</data>
+        <data key="telephone">123-456-7899</data>
         <array key="street">
             <item>1 London Bridge Street</item>
         </array>

From ca5c26dd977e8f43af5873058531eaf985595231 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Tue, 30 Jun 2020 22:44:31 +0300
Subject: [PATCH 0675/1718] Use action group go to ProductCatalogPage

---
 .../MassEnableDisableBundleProductsTest.xml   |  3 +--
 ...AdminProductCatalogPageOpenActionGroup.xml | 19 +++++++++++++++++++
 ...untryOfManufactureAttributeSKUMaskTest.xml |  6 ++----
 ...alProductFillingRequiredFieldsOnlyTest.xml |  6 ++----
 ...tualProductOutOfStockWithTierPriceTest.xml |  3 +--
 ...CustomOptionsSuiteAndImportOptionsTest.xml |  3 +--
 ...nCreateVirtualProductWithTierPriceTest.xml |  6 ++----
 ...teVirtualProductWithoutManageStockTest.xml |  3 +--
 ...dPageNumberAfterSaveAndCloseActionTest.xml | 10 ++++------
 ...rifyDataOverridingOnStoreViewLevelTest.xml |  3 +--
 ...rifyDataOverridingOnStoreViewLevelTest.xml |  3 +--
 ...dminUpdateSimpleProductTieredPriceTest.xml |  6 ++----
 ...RegularPriceInStockDisabledProductTest.xml |  6 ++----
 ...WithRegularPriceInStockEnabledFlatTest.xml |  6 ++----
 ...PriceInStockNotVisibleIndividuallyTest.xml |  6 ++----
 ...arPriceInStockUnassignFromCategoryTest.xml |  3 +--
 ...ceInStockVisibleInCatalogAndSearchTest.xml |  6 ++----
 ...arPriceInStockVisibleInCatalogOnlyTest.xml |  6 ++----
 ...larPriceInStockVisibleInSearchOnlyTest.xml |  6 ++----
 ...gularPriceInStockWithCustomOptionsTest.xml |  6 ++----
 ...eProductWithRegularPriceOutOfStockTest.xml |  6 ++----
 ...rPriceInStockVisibleInCategoryOnlyTest.xml |  6 ++----
 ...thCustomOptionsVisibleInSearchOnlyTest.xml |  6 ++----
 ...tOfStockVisibleInCategoryAndSearchTest.xml |  6 ++----
 ...iceOutOfStockVisibleInCategoryOnlyTest.xml |  6 ++----
 ...PriceOutOfStockVisibleInSearchOnlyTest.xml |  6 ++----
 ...eInStockVisibleInCategoryAndSearchTest.xml |  6 ++----
 ...tOfStockVisibleInCategoryAndSearchTest.xml |  6 ++----
 ...rPriceInStockVisibleInCategoryOnlyTest.xml |  6 ++----
 ...tOfStockVisibleInCategoryAndSearchTest.xml |  6 ++----
 ...minUrlForProductRewrittenCorrectlyTest.xml |  3 +--
 ...bleProductAttributeValueUniquenessTest.xml |  3 +--
 ...onfigurableProductBasedOnParentSkuTest.xml |  3 +--
 ...rontConfigurableProductChildSearchTest.xml |  3 +--
 ...ontElasticsearchSearchInvalidValueTest.xml |  3 +--
 ...dAreaSessionMustNotAffectAdminAreaTest.xml |  3 +--
 36 files changed, 78 insertions(+), 116 deletions(-)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductCatalogPageOpenActionGroup.xml

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
index fd94ca93b1600..8092e1b5ea8bf 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
@@ -130,8 +130,7 @@
         <dontSeeElement stepKey="LookingForNameOfProductDisabled" selector="{{StorefrontBundledSection.bundleProductName}}"/>
 
         <!--Enabling bundle products-->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="GoToCatalogPageChangingView"/>
-        <waitForPageLoad stepKey="WaitForPageToLoadFullyChangingView"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="GoToCatalogPageChangingView"/>
         <click selector="{{AdminProductFiltersSection.allCheckbox}}" stepKey="ClickOnSelectAllCheckBoxChangingView"/>
         <click selector="{{AdminProductFiltersSection.actions}}" stepKey="ClickOnActionsChangingView"/>
         <click selector="{{AdminProductFiltersSection.changeStatus}}" stepKey="ClickOnChangeStatusChangingView"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductCatalogPageOpenActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductCatalogPageOpenActionGroup.xml
new file mode 100644
index 0000000000000..ef2610dddbbbb
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductCatalogPageOpenActionGroup.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="AdminProductCatalogPageOpenActionGroup">
+        <annotations>
+            <description>Goes to the Admin Product Catalog Page grid page.</description>
+        </annotations>
+
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml
index c378ca5b2c27a..29ab115128b44 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml
@@ -31,8 +31,7 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="openProductCatalogPage"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
         <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
         <waitForPageLoad stepKey="waitForProductToggleToSelectSimpleProduct"/>
         <click selector="{{AdminProductGridActionSection.addSimpleProduct}}" stepKey="clickSimpleProductFromDropDownList"/>
@@ -49,8 +48,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
 
         <!-- Search created simple product(from above step) in the grid page to verify sku masked as name and country of manufacture -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchCreatedSimpleProduct"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchCreatedSimpleProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.name}}-{{nameAndAttributeSkuMaskSimpleProduct.country_of_manufacture_label}}" stepKey="fillSkuFilterFieldWithNameAndCountryOfManufactureInput" />
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml
index 9d3a47cd115aa..6e6107df9b9fe 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml
@@ -25,8 +25,7 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
         <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
         <waitForPageLoad stepKey="waitForProductToggleToSelectProduct"/>
         <click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickVirtualProduct"/>
@@ -42,8 +41,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
 
         <!-- Verify we see created virtual product(from the above step) on the product grid page -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage1"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickSelector"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFilter"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{virtualProductWithRequiredFields.name}}" stepKey="fillProductName1"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml
index 842f93b49c14a..46b5d5d0c2aa4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml
@@ -31,8 +31,7 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
         <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
         <waitForPageLoad stepKey="waitForProductToggleToSelectProduct"/>
         <click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickVirtualProduct"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
index 8bb3391b5240b..bfbabf1a5fea2 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
@@ -31,8 +31,7 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
         <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
         <waitForPageLoad stepKey="waitForProductToggleToSelectProduct"/>
         <click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickVirtualProduct"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
index faae6a371db24..b129bc4b69f0a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
@@ -27,8 +27,7 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
         <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
         <waitForPageLoad stepKey="waitForProductToggleToSelectProduct"/>
         <click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickVirtualProduct"/>
@@ -60,8 +59,7 @@
         <!-- Verify we see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
 
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage1"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="checkRetailCustomerTaxClass" />
         <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="{{virtualProductBigQty.name}}" stepKey="fillProductName1"/>
         <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml
index 3b5a8d8e753da..b1ff97243e931 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml
@@ -27,8 +27,7 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
         <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
         <waitForPageLoad stepKey="waitForProductToggleToSelectProduct"/>
         <click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickVirtualProduct"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml
index f6b2a74eca0f0..f10288bea36d9 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminGridPageNumberAfterSaveAndCloseActionTest.xml
@@ -23,8 +23,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <!--Clear product grid-->
             <comment userInput="Clear product grid" stepKey="commentClearProductGrid"/>
-            <amOnPage url="{{ProductCatalogPage.url}}" stepKey="goToProductCatalog"/>
-            <waitForPageLoad stepKey="waitForProductIndexPage"/>
+            <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="goToProductCatalog"/>
             <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetProductGridToDefaultView"/>
             <actionGroup ref="DeleteProductsIfTheyExistActionGroup" stepKey="deleteProductIfTheyExist"/>
             <createData stepKey="category1" entity="SimpleSubCategory"/>
@@ -37,8 +36,8 @@
             </createData>
         </before>
         <after>
-            <amOnPage url="{{ProductCatalogPage.url}}" stepKey="goToProductCatalog"/>
-            <waitForPageLoad stepKey="waitForProductIndexPage"/>
+
+            <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="goToProductCatalog"/>
             <click selector="{{AdminDataGridPaginationSection.previousPage}}" stepKey="clickPrevPageOrderGrid"/>
             <actionGroup ref="AdminDataGridDeleteCustomPerPageActionGroup" stepKey="deleteCustomAddedPerPage">
                 <argument name="perPage" value="ProductPerPage.productCount"/>
@@ -49,8 +48,7 @@
             <deleteData stepKey="deleteProduct2" createDataKey="product2"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="goToProductCatalog"/>
-        <waitForPageLoad stepKey="waitForProductIndexPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="goToProductCatalog"/>
         <actionGroup ref="AdminDataGridSelectCustomPerPageActionGroup" stepKey="select1OrderPerPage">
             <argument name="perPage" value="ProductPerPage.productCount"/>
         </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductNameToVerifyDataOverridingOnStoreViewLevelTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductNameToVerifyDataOverridingOnStoreViewLevelTest.xml
index 6edffb923d540..9d1059597f21e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductNameToVerifyDataOverridingOnStoreViewLevelTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductNameToVerifyDataOverridingOnStoreViewLevelTest.xml
@@ -42,8 +42,7 @@
         </after>
 
         <!-- Search default simple product in grid -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
         <actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGrid">
             <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
         </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductPriceToVerifyDataOverridingOnStoreViewLevelTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductPriceToVerifyDataOverridingOnStoreViewLevelTest.xml
index e954de90ef542..ead8e24c618bd 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductPriceToVerifyDataOverridingOnStoreViewLevelTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductPriceToVerifyDataOverridingOnStoreViewLevelTest.xml
@@ -42,8 +42,7 @@
         </after>
 
         <!-- Search default simple product in grid -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
         <actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGrid">
             <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
         </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml
index f5b0fb8054dc1..54e4c459e285f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml
@@ -40,8 +40,7 @@
         </after>
 
         <!-- Search default simple product in the grid -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
         <actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGrid">
             <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
         </actionGroup>
@@ -85,8 +84,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
 
         <!-- Search updated simple product(from above step) in the grid page -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{simpleProductTierPrice300InStock.name}}" stepKey="fillSimpleProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockDisabledProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockDisabledProductTest.xml
index d20594461173b..e71733a3c998d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockDisabledProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockDisabledProductTest.xml
@@ -34,8 +34,7 @@
         </after>
 
         <!-- Search default simple product in the grid page -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
         <actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGrid">
             <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
         </actionGroup>
@@ -60,8 +59,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
 
         <!-- Search updated simple product(from above step) in the grid -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{simpleProductDisabled.name}}" stepKey="fillSimpleProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest.xml
index 5fa7acbeb8de9..731988c77bc1e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest.xml
@@ -38,8 +38,7 @@
         </after>
 
         <!-- Search default simple product in the grid page -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
         <actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGrid">
             <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
         </actionGroup>
@@ -79,8 +78,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
 
         <!-- Search updated simple product(from above step) in the grid page -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{simpleProductEnabledFlat.name}}" stepKey="fillSimpleProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockNotVisibleIndividuallyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockNotVisibleIndividuallyTest.xml
index 4b21d1337e9b7..1748fc68b112d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockNotVisibleIndividuallyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockNotVisibleIndividuallyTest.xml
@@ -36,8 +36,7 @@
         </after>
 
         <!-- Search default simple product in the grid page -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
         <actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGrid">
             <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
         </actionGroup>
@@ -70,8 +69,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
 
         <!-- Search updated simple product(from above step) in the grid page -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{simpleProductNotVisibleIndividually.name}}" stepKey="fillSimpleProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockUnassignFromCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockUnassignFromCategoryTest.xml
index 4256f93ea41d1..7f9ccfdeb452a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockUnassignFromCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockUnassignFromCategoryTest.xml
@@ -34,8 +34,7 @@
         </after>
 
         <!--Search default simple product in the grid page -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
         <actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGrid">
             <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
         </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml
index 58db163bed720..12089c181bb13 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml
@@ -36,8 +36,7 @@
         </after>
 
         <!-- Search default simple product in the grid page -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
         <actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGrid">
             <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
         </actionGroup>
@@ -70,8 +69,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
 
         <!-- Search updated simple product(from above step) in the grid page -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{simpleProductRegularPrice245InStock.name}}" stepKey="fillSimpleProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml
index 5e9a48f659d6b..eefd0b70a1782 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml
@@ -36,8 +36,7 @@
         </after>
 
         <!-- Search default simple product in the grid -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
         <actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGrid">
             <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
         </actionGroup>
@@ -70,8 +69,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
 
         <!-- Search updated simple product(from above step) in the grid page -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{simpleProductRegularPrice32501InStock.name}}" stepKey="fillSimpleProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInSearchOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInSearchOnlyTest.xml
index 3d37b54dfa439..99226b8beee8c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInSearchOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInSearchOnlyTest.xml
@@ -36,8 +36,7 @@
         </after>
 
         <!-- Search default simple product in the grid -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
         <actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGrid">
             <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
         </actionGroup>
@@ -70,8 +69,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
 
         <!-- Search updated simple product(from above step) in the grid page -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{simpleProductRegularPrice325InStock.name}}" stepKey="fillSimpleProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml
index 855a2b1d9b0cc..010e61c430227 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml
@@ -36,8 +36,7 @@
         </after>
 
         <!-- Search default simple product in the grid -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
         <actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGrid">
             <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
         </actionGroup>
@@ -83,8 +82,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
 
         <!--Search updated simple product(from above step) in the grid page-->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{simpleProductRegularPriceCustomOptions.name}}" stepKey="fillSimpleProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceOutOfStockTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceOutOfStockTest.xml
index af836efcf6be6..83f44d4de9afa 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceOutOfStockTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceOutOfStockTest.xml
@@ -36,8 +36,7 @@
         </after>
 
         <!-- Search default simple product in the grid -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
         <actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGrid">
             <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
         </actionGroup>
@@ -69,8 +68,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
 
         <!-- Search updated simple product(from above step) in the grid page -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{simpleProductRegularPrice32503OutOfStock.name}}" stepKey="fillSimpleProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
index 595f9bcd489ec..c5d07ffd819b4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
@@ -37,8 +37,7 @@
         </after>
 
         <!-- Search default virtual product in the grid page -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage1"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
         <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
         <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
@@ -81,8 +80,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
 
         <!-- Search updated virtual product(from above step) in the grid page -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductRegularPrice.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
index 458d02d61426d..c3a80bf7e43b3 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
@@ -34,8 +34,7 @@
         </after>
 
         <!-- Search default virtual product in the grid page -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage1"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
         <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
         <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
@@ -126,8 +125,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
 
         <!-- Search updated virtual product(from above step) in the grid page -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductRegularPriceInStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml
index 6d6ff0b3b1b89..bd3ddbb3bad79 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml
@@ -37,8 +37,7 @@
         </after>
 
         <!-- Search default virtual product in the grid page -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage1"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
         <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
         <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
@@ -62,8 +61,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
 
         <!-- Search updated virtual product(from above step) in the grid page -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
index d5ae971d87695..ee5f61c8056b4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
@@ -37,8 +37,7 @@
         </after>
 
         <!-- Search default virtual product in the grid page -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage1"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickclearAllFilter" />
         <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
         <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
@@ -70,8 +69,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
 
         <!-- Search updated virtual product(from above step) in the grid page -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml
index 314df67d43d00..83205e80a3121 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml
@@ -35,8 +35,7 @@
         </after>
 
         <!-- Search default virtual product in the grid page -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage1"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
         <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
         <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
@@ -60,8 +59,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
 
         <!-- Search updated virtual product(from above step) in the grid -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml
index d0f4fc8882e3f..e0d0a4c46f00a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml
@@ -37,8 +37,7 @@
         </after>
 
         <!-- Search default virtual product in the grid page -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
         <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
         <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
@@ -76,8 +75,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
 
         <!-- Search updated virtual product(from above step) in the grid page -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductSpecialPrice.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml
index 2234d6f338b62..03629ca567b0a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml
@@ -37,8 +37,7 @@
         </after>
 
         <!-- Search default virtual product in the grid page -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage1"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
         <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
         <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
@@ -75,8 +74,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
 
         <!-- Search updated virtual product with special price(out of stock) in the grid -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
index 8f0861fe33371..7b5188c5fd27b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
@@ -37,8 +37,7 @@
         </after>
 
         <!-- Search default virtual product in the grid page -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage1"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
         <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
         <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
@@ -81,8 +80,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
 
         <!-- Search updated virtual product(from above step) in the grid -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductWithTierPriceInStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
index f7f5385381590..7a494868173fe 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
@@ -37,8 +37,7 @@
         </after>
 
         <!-- Search default virtual product in the grid page -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage1"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPage1"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage1"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
         <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
         <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
@@ -81,8 +80,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
 
         <!-- Search updated virtual product(from above step) in the grid page -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPageToLoad"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualTierPriceOutOfStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml
index 329f5e8cae3f6..b499cbacb780c 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml
@@ -56,8 +56,7 @@
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
 
         <!--Select product and go toUpdate Attribute page-->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="GoToCatalogPageChangingView"/>
-        <waitForPageLoad stepKey="WaitForPageToLoadFullyChangingView"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="GoToCatalogPageChangingView"/>
         <actionGroup ref="FilterProductGridByNameActionGroup" stepKey="filterBundleProductOptionsDownToName">
             <argument name="product" value="ApiSimpleProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckConfigurableProductAttributeValueUniquenessTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckConfigurableProductAttributeValueUniquenessTest.xml
index 8962efbb8dd26..43083ee13b0fc 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckConfigurableProductAttributeValueUniquenessTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckConfigurableProductAttributeValueUniquenessTest.xml
@@ -46,8 +46,7 @@
         </createData>
         <!--Go to created product page-->
         <comment userInput="Go to created product page" stepKey="goToProdPage"/>
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="goToProductGrid"/>
-        <waitForPageLoad stepKey="waitForProductPage1"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="goToProductGrid"/>
         <actionGroup ref="FilterProductGridByName2ActionGroup" stepKey="filterByName">
             <argument name="name" value="$$createConfigProduct.name$$"/>
         </actionGroup>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductBasedOnParentSkuTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductBasedOnParentSkuTest.xml
index e5456429373e1..abe4ce5e46661 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductBasedOnParentSkuTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductBasedOnParentSkuTest.xml
@@ -68,8 +68,7 @@
         <actionGroup ref="SaveConfigurableProductAddToCurrentAttributeSetActionGroup" stepKey="saveProduct"/>
 
         <!-- Assert child products generated sku in grid -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="openProductCatalogPage"/>
-        <waitForPageLoad stepKey="waitForProductCatalogPageLoad"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
         <actionGroup ref="FilterProductGridByName2ActionGroup" stepKey="filterFirstProductByNameInGrid">
             <argument name="name" value="{{colorConfigurableProductAttribute1.name}}"/>
         </actionGroup>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml
index fbf23597a3927..77579c4d90ad5 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml
@@ -117,8 +117,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
 
             <!-- Go to the product page for the first product -->
-            <amOnPage stepKey="goToProductGrid" url="{{ProductCatalogPage.url}}"/>
-            <waitForPageLoad stepKey="waitForProductGridLoad"/>
+            <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="goToProductGrid"/>
             <actionGroup stepKey="searchForSimpleProduct" ref="FilterProductGridBySku2ActionGroup">
                 <argument name="sku" value="$$createConfigChildProduct1.sku$$"/>
             </actionGroup>
diff --git a/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticsearchSearchInvalidValueTest.xml b/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticsearchSearchInvalidValueTest.xml
index e173090bfa318..282bd70d2e546 100644
--- a/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticsearchSearchInvalidValueTest.xml
+++ b/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticsearchSearchInvalidValueTest.xml
@@ -44,8 +44,7 @@
             <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
             <waitForPageLoad stepKey="waitForAttributePageLoad"/>
             <click selector="{{AdminProductAttributeGridSection.ResetFilter}}" stepKey="resetFiltersOnGrid"/>
-            <amOnPage url="{{ProductCatalogPage.url}}" stepKey="goToProductCatalog"/>
-            <waitForPageLoad stepKey="waitForProductIndexPage"/>
+            <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="goToProductCatalog"/>
             <actionGroup ref="DeleteProductsIfTheyExistActionGroup" stepKey="deleteProduct"/>
             <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="resetFiltersIfExist"/>
             <magentoCLI command="indexer:reindex catalogsearch_fulltext" stepKey="reindex"/>
diff --git a/app/code/Magento/PageCache/Test/Mftf/Test/AdminFrontendAreaSessionMustNotAffectAdminAreaTest.xml b/app/code/Magento/PageCache/Test/Mftf/Test/AdminFrontendAreaSessionMustNotAffectAdminAreaTest.xml
index d2c738398aae1..fdf8ceef0d647 100644
--- a/app/code/Magento/PageCache/Test/Mftf/Test/AdminFrontendAreaSessionMustNotAffectAdminAreaTest.xml
+++ b/app/code/Magento/PageCache/Test/Mftf/Test/AdminFrontendAreaSessionMustNotAffectAdminAreaTest.xml
@@ -61,8 +61,7 @@
         <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
 
         <!-- 2. Navigate Go to "Catalog"->"Products" -->
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="onCatalogProductPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="onCatalogProductPage"/>
 
         <!-- 3. Open separate tab with Storefront -->
         <openNewTab stepKey="openNewTab"/>

From 22aea4a91499b534ac3446f9f2b4edf0afd1c2e1 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Tue, 30 Jun 2020 23:13:01 +0300
Subject: [PATCH 0676/1718] Use action group for logout

---
 .../Test/Mftf/Test/AdminAddDefaultImageBundleProductTest.xml    | 2 +-
 .../Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml    | 2 +-
 .../Test/Mftf/Test/AdminBasicBundleProductAttributesTest.xml    | 2 +-
 .../Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml     | 2 +-
 .../Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml | 2 +-
 .../Mftf/Test/AdminFilterProductListByBundleProductTest.xml     | 2 +-
 .../Bundle/Test/Mftf/Test/AdminMassDeleteBundleProductsTest.xml | 2 +-
 .../Test/Mftf/Test/AdminRemoveDefaultImageBundleProductTest.xml | 2 +-
 .../Test/Mftf/Test/BundleProductWithTierPriceInCartTest.xml     | 2 +-
 .../Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml  | 2 +-
 .../Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml      | 2 +-
 .../Bundle/Test/Mftf/Test/NewBundleProductSelectionTest.xml     | 2 +-
 .../Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml       | 2 +-
 .../Test/Mftf/Test/StorefrontBundleAddToCartSuccessTest.xml     | 2 +-
 .../Magento/Bundle/Test/Mftf/Test/StorefrontBundleCartTest.xml  | 2 +-
 .../StorefrontBundleProductShownInCategoryListAndGridTest.xml   | 2 +-
 .../Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml    | 2 +-
 .../Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml   | 2 +-
 .../Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml | 2 +-
 .../Test/Mftf/Test/AdminAddDefaultImageSimpleProductTest.xml    | 2 +-
 .../Test/Mftf/Test/AdminAddDefaultImageVirtualProductTest.xml   | 2 +-
 .../Test/Mftf/Test/AdminCreateCategoryFromProductPageTest.xml   | 2 +-
 .../Test/Mftf/Test/AdminMassChangeProductsStatusTest.xml        | 2 +-
 ...AdminMassUpdateProductAttributesMissingRequiredFieldTest.xml | 2 +-
 .../AdminMassUpdateProductAttributesStoreViewScopeTest.xml      | 2 +-
 .../Test/Mftf/Test/AdminRemoveDefaultImageSimpleProductTest.xml | 2 +-
 .../Mftf/Test/AdminRemoveDefaultImageVirtualProductTest.xml     | 2 +-
 .../Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml    | 2 +-
 .../Test/Mftf/Test/SimpleProductTwoCustomOptionsTest.xml        | 2 +-
 .../Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml      | 2 +-
 .../AdminCreateCatalogPriceRuleByPercentTest.xml                | 2 +-
 .../AdminCreateCatalogPriceRuleWithInvalidDataTest.xml          | 2 +-
 .../Test/Mftf/Test/AdminAddDefaultImageConfigurableTest.xml     | 2 +-
 .../Test/Mftf/Test/AdminRelatedProductsTest.xml                 | 2 +-
 .../Test/Mftf/Test/AdminRemoveDefaultImageConfigurableTest.xml  | 2 +-
 .../Mftf/Test/AdminAddDefaultImageDownloadableProductTest.xml   | 2 +-
 .../Test/AdminRemoveDefaultImageDownloadableProductTest.xml     | 2 +-
 .../Test/Mftf/Test/AdminAddDefaultImageGroupedProductTest.xml   | 2 +-
 .../Mftf/Test/AdminRemoveDefaultImageGroupedProductTest.xml     | 2 +-
 .../Mftf/Test/AdminCreateOrderWithMinimumAmountEnabledTest.xml  | 2 +-
 .../StorefrontTaxQuoteCartGuestSimpleTest.xml                   | 2 +-
 .../StorefrontTaxQuoteCartGuestVirtualTest.xml                  | 2 +-
 .../StorefrontTaxQuoteCartLoggedInSimpleTest.xml                | 2 +-
 .../StorefrontTaxQuoteCartLoggedInVirtualTest.xml               | 2 +-
 .../StorefrontTaxQuoteCheckoutGuestSimpleTest.xml               | 2 +-
 .../StorefrontTaxQuoteCheckoutGuestVirtualTest.xml              | 2 +-
 .../StorefrontTaxQuoteCheckoutLoggedInSimpleTest.xml            | 2 +-
 .../StorefrontTaxQuoteCheckoutLoggedInVirtualTest.xml           | 2 +-
 .../Mftf/Test/AdminUrlRewritesForProductAfterImportTest.xml     | 2 +-
 49 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultImageBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultImageBundleProductTest.xml
index 55038b0c68c44..3588bd360004d 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultImageBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultImageBundleProductTest.xml
@@ -25,7 +25,7 @@
             <magentoCron stepKey="runCronIndex" groups="index"/>
         </before>
         <after>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
             <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
         </after>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml
index 06a05e7a29cd9..6bb4c3e0e1a5f 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml
@@ -22,7 +22,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
         </after>
         <!-- Create a new attribute set -->
         <amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="goToAttributeSets"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminBasicBundleProductAttributesTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminBasicBundleProductAttributesTest.xml
index b9fb1c72e079f..56dad8b214d0f 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminBasicBundleProductAttributesTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminBasicBundleProductAttributesTest.xml
@@ -21,7 +21,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
         </after>
         <!--Create attribute set-->
         <actionGroup ref="CreateDefaultAttributeSetActionGroup" stepKey="createDefaultAttributeSet">
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml
index 51c30ef86242c..e9b91a0efb595 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml
@@ -25,7 +25,7 @@
             <magentoCron stepKey="runCronIndex" groups="index"/>
         </before>
         <after>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
             <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
         </after>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml
index 4ba5d0f66e096..61a9c7c975324 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml
@@ -31,7 +31,7 @@
                 <argument name="product" value="BundleProduct"/>
             </actionGroup>
             <!--Logging out-->
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="simpleProduct0" stepKey="deleteSimpleProduct0"/>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
         </after>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProductTest.xml
index f8914656cc32b..45cbb7d83bb2d 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProductTest.xml
@@ -25,7 +25,7 @@
             <magentoCron stepKey="runCronIndex" groups="index"/>
         </before>
         <after>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
             <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
         </after>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProductsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProductsTest.xml
index 2c1fcb6d7de42..a995a629092c6 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProductsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProductsTest.xml
@@ -29,7 +29,7 @@
         <after>
             <!--Clear Filters-->
             <actionGroup ref="AdminClearFiltersActionGroup" stepKey="ClearFiltersAfter"/>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
             <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
             <deleteData createDataKey="simpleProduct3" stepKey="deleteSimpleProduct3"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultImageBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultImageBundleProductTest.xml
index ab1d4bb5ce68a..e0e0fe571fe32 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultImageBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultImageBundleProductTest.xml
@@ -29,7 +29,7 @@
             <actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteBundleProduct">
                 <argument name="sku" value="{{BundleProduct.sku}}"/>
             </actionGroup>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
             <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
         </after>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithTierPriceInCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithTierPriceInCartTest.xml
index b5812817b5640..478ebd149772d 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithTierPriceInCartTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithTierPriceInCartTest.xml
@@ -34,7 +34,7 @@
             <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomer">
                 <argument name="customerEmail" value="CustomerEntityOne.email"/>
             </actionGroup>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="logout"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
         </after>
         <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage"/>
         <waitForPageLoad stepKey="waitForBundleProductCreatePageToLoad"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml
index ada91d068efcf..f72f46b3b26e7 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml
@@ -40,7 +40,7 @@
                 <click selector="{{CurrencySetupSection.currencyOptions}}" stepKey="closeOptions"/>
                 <waitForPageLoad stepKey="waitForCloseOptions"/>
                 <click stepKey="saveUnselectedConfigs" selector="{{AdminConfigSection.saveButton}}"/>
-                <amOnPage url="{{AdminLogoutPage.url}}" stepKey="logout"/>
+                <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
                 <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
                 <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
             </after>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
index fd94ca93b1600..fbe17c0208235 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
@@ -29,7 +29,7 @@
         <after>
             <!--Clear Filters-->
             <actionGroup ref="AdminClearFiltersActionGroup" stepKey="ClearFiltersAfter"/>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
             <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
             <deleteData createDataKey="simpleProduct3" stepKey="deleteSimpleProduct3"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/NewBundleProductSelectionTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/NewBundleProductSelectionTest.xml
index efef033f9d974..e722caaf090c5 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/NewBundleProductSelectionTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/NewBundleProductSelectionTest.xml
@@ -22,7 +22,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
         </after>
         <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="GoToCatalogProductPage"/>
         <waitForPageLoad stepKey="WaitForPageToLoad"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml
index 8e8df1f4f16f0..1fe16f068e2e6 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml
@@ -25,7 +25,7 @@
             <magentoCron stepKey="runCronIndex" groups="index"/>
         </before>
         <after>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
             <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
         </after>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleAddToCartSuccessTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleAddToCartSuccessTest.xml
index e6f8834336683..a9772227d1a8b 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleAddToCartSuccessTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleAddToCartSuccessTest.xml
@@ -24,7 +24,7 @@
             <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
         </before>
         <after>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="logout"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
             <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
         </after>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleCartTest.xml
index 966082739aa68..ec39de91c4f11 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleCartTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleCartTest.xml
@@ -25,7 +25,7 @@
             <magentoCron stepKey="runCronIndex" groups="index"/>
         </before>
         <after>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="logout"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
             <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
         </after>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGridTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGridTest.xml
index 871bf71d1f876..3532e8f4fdd54 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGridTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGridTest.xml
@@ -29,7 +29,7 @@
         </before>
         <after>
             <!--Logging out-->
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
             <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
             <deleteData createDataKey="simpleProduct3" stepKey="deleteSimpleProduct3"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml
index 77c561f311280..f4dc19278b097 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml
@@ -30,7 +30,7 @@
             <actionGroup stepKey="deleteBundle" ref="DeleteProductUsingProductGridActionGroup">
                 <argument name="product" value="BundleProduct"/>
             </actionGroup>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="logout"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
             <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
         </after>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
index 161d308044b4a..262c216218c7f 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
@@ -25,7 +25,7 @@
             <magentoCron stepKey="runCronIndex" groups="index"/>
         </before>
         <after>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
             <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
         </after>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml
index add819e2d3f14..f0836229bb653 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml
@@ -26,7 +26,7 @@
             <magentoCron stepKey="runCronIndex" groups="index"/>
         </before>
         <after>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
             <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageSimpleProductTest.xml
index 92f24fe76502d..110cfa0cd83a7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageSimpleProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageSimpleProductTest.xml
@@ -22,7 +22,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
         </after>
 
         <!--Create product-->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageVirtualProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageVirtualProductTest.xml
index 7cf388914207b..dc215ac51f075 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageVirtualProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddDefaultImageVirtualProductTest.xml
@@ -22,7 +22,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
         </after>
 
         <!--Create product-->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryFromProductPageTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryFromProductPageTest.xml
index b94c12d1d7a39..b96052d2d0685 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryFromProductPageTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryFromProductPageTest.xml
@@ -27,7 +27,7 @@
         <after>
             <!-- Delete the created category -->
             <actionGroup ref="DeleteMostRecentCategoryActionGroup" stepKey="getRidOfCreatedCategory"/>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
         </after>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassChangeProductsStatusTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassChangeProductsStatusTest.xml
index 0214f9141b903..abec993167fa9 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassChangeProductsStatusTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassChangeProductsStatusTest.xml
@@ -30,7 +30,7 @@
             </createData>
         </before>
         <after>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="createProductOne" stepKey="deleteProductOne"/>
             <deleteData createDataKey="createProductTwo" stepKey="deleteProductTwo"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesMissingRequiredFieldTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesMissingRequiredFieldTest.xml
index e4d69e9169613..7809dbbe498da 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesMissingRequiredFieldTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesMissingRequiredFieldTest.xml
@@ -30,7 +30,7 @@
             </createData>
         </before>
         <after>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="createProductOne" stepKey="deleteProductOne"/>
             <deleteData createDataKey="createProductTwo" stepKey="deleteProductTwo"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest/AdminMassUpdateProductAttributesStoreViewScopeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest/AdminMassUpdateProductAttributesStoreViewScopeTest.xml
index 08b2d924e2a5e..6014176f0702c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest/AdminMassUpdateProductAttributesStoreViewScopeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest/AdminMassUpdateProductAttributesStoreViewScopeTest.xml
@@ -31,7 +31,7 @@
             <deleteData createDataKey="createProductTwo" stepKey="deleteProductTwo"/>
             <deleteData createDataKey="createProductThree" stepKey="deleteProductThree"/>
             <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="AdminDeleteStoreViewActionGroup"/>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
         </after>
 
         <!-- Search and select products -->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageSimpleProductTest.xml
index 00eaa623e2bca..1d216b6eda359 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageSimpleProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageSimpleProductTest.xml
@@ -22,7 +22,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
         </after>
 
         <!--Create product-->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageVirtualProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageVirtualProductTest.xml
index 6cc1b256e5ec9..2ff76520cee38 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageVirtualProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRemoveDefaultImageVirtualProductTest.xml
@@ -22,7 +22,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
         </after>
 
         <!--Create product-->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml
index 534924e0f70c9..2396bea2768a7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml
@@ -35,7 +35,7 @@
             <actionGroup ref="DeleteProductUsingProductGridActionGroup" stepKey="deleteProduct">
                 <argument name="product" value="SimpleProduct3"/>
             </actionGroup>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="simpleProduct0" stepKey="deleteSimpleProduct0"/>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
             <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/SimpleProductTwoCustomOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/SimpleProductTwoCustomOptionsTest.xml
index 7b2e004495fea..ea4d32b780f6e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/SimpleProductTwoCustomOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/SimpleProductTwoCustomOptionsTest.xml
@@ -37,7 +37,7 @@
             <actionGroup ref="DeleteProductUsingProductGridActionGroup" stepKey="deleteProduct">
                 <argument name="product" value="SimpleProduct3"/>
             </actionGroup>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
         </after>
 
         <!-- opens the custom option panel and clicks add options -->
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml
index d1f9ebd4c99a4..3aacc75d0b4a4 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml
@@ -42,7 +42,7 @@
                 <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
             </actionGroup>
 
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
         </after>
 
         <!-- 1. Begin creating a new catalog price rule -->
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleByPercentTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleByPercentTest.xml
index fcae0065f1b53..3488391eaa8d0 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleByPercentTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleByPercentTest.xml
@@ -42,7 +42,7 @@
                 <argument name="name" value="{{_defaultCatalogRule.name}}"/>
                 <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
             </actionGroup>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="createProduct" stepKey="deleteSimpleProduct"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
         </after>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleWithInvalidDataTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleWithInvalidDataTest.xml
index 90a0835508b06..77228dde8797f 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleWithInvalidDataTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleWithInvalidDataTest.xml
@@ -20,7 +20,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
         </after>
 
         <actionGroup ref="NewCatalogPriceRuleWithInvalidDataActionGroup" stepKey="createNewPriceRule">
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddDefaultImageConfigurableTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddDefaultImageConfigurableTest.xml
index 0d83cc6610194..9628121348476 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddDefaultImageConfigurableTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAddDefaultImageConfigurableTest.xml
@@ -81,7 +81,7 @@
             </createData>
         </before>
         <after>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="simple1Handle" stepKey="deleteSimple1"/>
             <deleteData createDataKey="simple2Handle" stepKey="deleteSimple2"/>
             <deleteData createDataKey="childProductHandle1" stepKey="deleteChild1"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRelatedProductsTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRelatedProductsTest.xml
index b6b3d21c8a626..3ca6b21e7dbb9 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRelatedProductsTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRelatedProductsTest.xml
@@ -81,7 +81,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
         </before>
         <after>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="simple1Handle" stepKey="deleteSimple1"/>
             <deleteData createDataKey="simple2Handle" stepKey="deleteSimple2"/>
             <deleteData createDataKey="childProductHandle1" stepKey="deleteChild1"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRemoveDefaultImageConfigurableTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRemoveDefaultImageConfigurableTest.xml
index 86d4070a9a2c8..4a28e76851b25 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRemoveDefaultImageConfigurableTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminRemoveDefaultImageConfigurableTest.xml
@@ -81,7 +81,7 @@
             </createData>
         </before>
         <after>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="simple1Handle" stepKey="deleteSimple1"/>
             <deleteData createDataKey="simple2Handle" stepKey="deleteSimple2"/>
             <deleteData createDataKey="childProductHandle1" stepKey="deleteChild1"/>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultImageDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultImageDownloadableProductTest.xml
index c634a8426eac0..59aae6f5f28a3 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultImageDownloadableProductTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminAddDefaultImageDownloadableProductTest.xml
@@ -27,7 +27,7 @@
                 <argument name="product" value="DownloadableProduct"/>
             </actionGroup>
             <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove static.magento.com"/>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
         </after>
 
         <!-- Create product -->
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultImageDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultImageDownloadableProductTest.xml
index 27d3d3d10a0b7..24917a8b332ed 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultImageDownloadableProductTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminRemoveDefaultImageDownloadableProductTest.xml
@@ -24,7 +24,7 @@
         </before>
         <after>
             <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove static.magento.com"/>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
         </after>
 
         <!-- Create product -->
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultImageGroupedProductTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultImageGroupedProductTest.xml
index 04b704b9193ca..0371cdcd843f2 100644
--- a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultImageGroupedProductTest.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminAddDefaultImageGroupedProductTest.xml
@@ -32,7 +32,7 @@
             <actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteGroupedProduct">
                 <argument name="sku" value="{{GroupedProduct.sku}}"/>
             </actionGroup>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="createProductOne" stepKey="deleteProductOne"/>
             <deleteData createDataKey="createProductTwo" stepKey="deleteProductTwo"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminRemoveDefaultImageGroupedProductTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminRemoveDefaultImageGroupedProductTest.xml
index 053949fa20fb2..83f43c3a1cd8a 100644
--- a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminRemoveDefaultImageGroupedProductTest.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminRemoveDefaultImageGroupedProductTest.xml
@@ -29,7 +29,7 @@
             </createData>
         </before>
         <after>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="createProductOne" stepKey="deleteProductOne"/>
             <deleteData createDataKey="createProductTwo" stepKey="deleteProductTwo"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithMinimumAmountEnabledTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithMinimumAmountEnabledTest.xml
index ade1f783c1309..1f6d7c40be99b 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithMinimumAmountEnabledTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithMinimumAmountEnabledTest.xml
@@ -32,7 +32,7 @@
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
             <createData entity="DisabledMinimumOrderAmount" stepKey="disableMinimumOrderAmount"/>
             <actionGroup ref="ClearCacheActionGroup" stepKey="clearCacheAfter"/>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
         </after>
 
         <!--Admin creates order-->
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartGuestSimpleTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartGuestSimpleTest.xml
index b1e91886960c5..9359f7348e8a2 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartGuestSimpleTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartGuestSimpleTest.xml
@@ -70,7 +70,7 @@
             <!-- Ensure tax won't be shown in the cart -->
             <actionGroup ref="ChangeToDefaultTaxConfigurationUIActionGroup" stepKey="changeToDefaultTaxConfiguration"/>
 
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
         </after>
 
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartGuestVirtualTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartGuestVirtualTest.xml
index 8a04156f3d857..4dea418c8321e 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartGuestVirtualTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartGuestVirtualTest.xml
@@ -70,7 +70,7 @@
             <!-- Ensure tax won't be shown in the cart -->
             <actionGroup ref="ChangeToDefaultTaxConfigurationUIActionGroup" stepKey="changeToDefaultTaxConfiguration"/>
 
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="virtualProduct1" stepKey="deleteVirtualProduct1"/>
         </after>
 
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartLoggedInSimpleTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartLoggedInSimpleTest.xml
index b76f015679ae2..018594c39ba67 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartLoggedInSimpleTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartLoggedInSimpleTest.xml
@@ -84,7 +84,7 @@
             <!-- Ensure tax won't be shown in the cart -->
             <actionGroup ref="ChangeToDefaultTaxConfigurationUIActionGroup" stepKey="changeToDefaultTaxConfiguration"/>
 
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
         </after>
 
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartLoggedInVirtualTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartLoggedInVirtualTest.xml
index 5f98093ec874f..09ffca716e318 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartLoggedInVirtualTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartLoggedInVirtualTest.xml
@@ -83,7 +83,7 @@
             <!-- Ensure tax won't be shown in the cart -->
             <actionGroup ref="ChangeToDefaultTaxConfigurationUIActionGroup" stepKey="changeToDefaultTaxConfiguration"/>
 
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="virtualProduct1" stepKey="deleteVirtualProduct1"/>
         </after>
 
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestSimpleTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestSimpleTest.xml
index d005f4b657448..3c72b5177e692 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestSimpleTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestSimpleTest.xml
@@ -70,7 +70,7 @@
             <!-- Ensure tax won't be shown in the cart -->
             <actionGroup ref="ChangeToDefaultTaxConfigurationUIActionGroup" stepKey="changeToDefaultTaxConfiguration"/>
 
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
         </after>
 
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestVirtualTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestVirtualTest.xml
index d1fc0654fc496..4cd508b03d156 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestVirtualTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestVirtualTest.xml
@@ -70,7 +70,7 @@
             <!-- Ensure tax won't be shown in the cart -->
             <actionGroup ref="ChangeToDefaultTaxConfigurationUIActionGroup" stepKey="changeToDefaultTaxConfiguration"/>
 
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="virtualProduct1" stepKey="deleteVirtualProduct1"/>
         </after>
 
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInSimpleTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInSimpleTest.xml
index 18a1a11d35fd2..43d12bf848f13 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInSimpleTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInSimpleTest.xml
@@ -70,7 +70,7 @@
             <!-- Ensure tax won't be shown in the cart -->
             <actionGroup ref="ChangeToDefaultTaxConfigurationUIActionGroup" stepKey="changeToDefaultTaxConfiguration"/>
 
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
         </after>
 
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInVirtualTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInVirtualTest.xml
index 35a483da7f690..949d9a89b656f 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInVirtualTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInVirtualTest.xml
@@ -70,7 +70,7 @@
             <!-- Ensure tax won't be shown in the cart -->
             <actionGroup ref="ChangeToDefaultTaxConfigurationUIActionGroup" stepKey="changeToDefaultTaxConfiguration"/>
 
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="virtualProduct1" stepKey="deleteVirtualProduct1"/>
         </after>
 
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUrlRewritesForProductAfterImportTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUrlRewritesForProductAfterImportTest.xml
index a70065dc1d307..2dd7df9cbb548 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUrlRewritesForProductAfterImportTest.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminUrlRewritesForProductAfterImportTest.xml
@@ -43,7 +43,7 @@
             <deleteData createDataKey="simpleSubCategory1" stepKey="deleteSimpleSubCategory1"/>
             <comment userInput="Disable config to generate category/product URL Rewrites " stepKey="commentDisableConfig" />
             <magentoCLI command="config:set catalog/seo/generate_category_product_rewrites 1" stepKey="disableGenerateUrlRewrite"/>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
         </after>
 
         <comment userInput="1. Log in to Admin " stepKey="commentAdminLogin" />

From cf2c90e8842d69e1382ef3fecdb84fc48c0aab0f Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 1 Jul 2020 11:14:39 +0300
Subject: [PATCH 0677/1718] use original stepKey

---
 .../Test/Mftf/Test/BundleProductWithTierPriceInCartTest.xml     | 2 +-
 .../Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml  | 2 +-
 .../Test/Mftf/Test/StorefrontBundleAddToCartSuccessTest.xml     | 2 +-
 .../Magento/Bundle/Test/Mftf/Test/StorefrontBundleCartTest.xml  | 2 +-
 .../Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithTierPriceInCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithTierPriceInCartTest.xml
index 478ebd149772d..def24c86e1730 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithTierPriceInCartTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithTierPriceInCartTest.xml
@@ -34,7 +34,7 @@
             <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomer">
                 <argument name="customerEmail" value="CustomerEntityOne.email"/>
             </actionGroup>
-            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage"/>
         <waitForPageLoad stepKey="waitForBundleProductCreatePageToLoad"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml
index f72f46b3b26e7..b25139835de59 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml
@@ -40,7 +40,7 @@
                 <click selector="{{CurrencySetupSection.currencyOptions}}" stepKey="closeOptions"/>
                 <waitForPageLoad stepKey="waitForCloseOptions"/>
                 <click stepKey="saveUnselectedConfigs" selector="{{AdminConfigSection.saveButton}}"/>
-                <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
+                <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
                 <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
                 <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
             </after>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleAddToCartSuccessTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleAddToCartSuccessTest.xml
index a9772227d1a8b..7231f61b28899 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleAddToCartSuccessTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleAddToCartSuccessTest.xml
@@ -24,7 +24,7 @@
             <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
         </before>
         <after>
-            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
             <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
         </after>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleCartTest.xml
index ec39de91c4f11..2152717fad8da 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleCartTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleCartTest.xml
@@ -25,7 +25,7 @@
             <magentoCron stepKey="runCronIndex" groups="index"/>
         </before>
         <after>
-            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
             <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
         </after>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml
index f4dc19278b097..565af8b3dbfdb 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSelectAndSetBundleOptionsTest.xml
@@ -30,7 +30,7 @@
             <actionGroup stepKey="deleteBundle" ref="DeleteProductUsingProductGridActionGroup">
                 <argument name="product" value="BundleProduct"/>
             </actionGroup>
-            <actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
             <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
         </after>

From ddc5f20b87f7f50b36f357c39ed10097a3bdce8f Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 1 Jul 2020 11:26:09 +0300
Subject: [PATCH 0678/1718] use camelCase name in stepName

---
 .../Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml    | 2 +-
 .../ActionGroup/AdminProductCatalogPageOpenActionGroup.xml    | 2 +-
 ...pleProductWithCountryOfManufactureAttributeSKUMaskTest.xml | 2 +-
 ...AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml | 4 ++--
 .../AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml  | 2 +-
 ...rtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml | 2 +-
 .../Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml  | 4 ++--
 .../Test/AdminCreateVirtualProductWithoutManageStockTest.xml  | 2 +-
 ...eProductNameToVerifyDataOverridingOnStoreViewLevelTest.xml | 2 +-
 ...ProductPriceToVerifyDataOverridingOnStoreViewLevelTest.xml | 2 +-
 .../Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml     | 4 ++--
 ...impleProductWithRegularPriceInStockDisabledProductTest.xml | 4 ++--
 ...ateSimpleProductWithRegularPriceInStockEnabledFlatTest.xml | 4 ++--
 ...oductWithRegularPriceInStockNotVisibleIndividuallyTest.xml | 4 ++--
 ...ProductWithRegularPriceInStockUnassignFromCategoryTest.xml | 2 +-
 ...ctWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml | 4 ++--
 ...ProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml | 4 ++--
 ...eProductWithRegularPriceInStockVisibleInSearchOnlyTest.xml | 4 ++--
 ...pleProductWithRegularPriceInStockWithCustomOptionsTest.xml | 4 ++--
 ...AdminUpdateSimpleProductWithRegularPriceOutOfStockTest.xml | 4 ++--
 ...roductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml | 4 ++--
 ...arPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml | 4 ++--
 ...thRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml | 4 ++--
 ...uctWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml | 4 ++--
 ...oductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml | 4 ++--
 ...tWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml | 4 ++--
 ...thSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml | 4 ++--
 ...alProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml | 4 ++--
 ...tWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml | 4 ++--
 .../Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml    | 2 +-
 30 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
index 8092e1b5ea8bf..b59d1bc46dd85 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
@@ -130,7 +130,7 @@
         <dontSeeElement stepKey="LookingForNameOfProductDisabled" selector="{{StorefrontBundledSection.bundleProductName}}"/>
 
         <!--Enabling bundle products-->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="GoToCatalogPageChangingView"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="goToCatalogPageChangingView"/>
         <click selector="{{AdminProductFiltersSection.allCheckbox}}" stepKey="ClickOnSelectAllCheckBoxChangingView"/>
         <click selector="{{AdminProductFiltersSection.actions}}" stepKey="ClickOnActionsChangingView"/>
         <click selector="{{AdminProductFiltersSection.changeStatus}}" stepKey="ClickOnChangeStatusChangingView"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductCatalogPageOpenActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductCatalogPageOpenActionGroup.xml
index ef2610dddbbbb..f25f73977bf4e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductCatalogPageOpenActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductCatalogPageOpenActionGroup.xml
@@ -13,7 +13,7 @@
             <description>Goes to the Admin Product Catalog Page grid page.</description>
         </annotations>
 
-        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="openProductCatalogPage"/>
         <waitForPageLoad stepKey="waitForProductCatalogPageLoad"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml
index 29ab115128b44..5d88d687754e0 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml
@@ -48,7 +48,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
 
         <!-- Search created simple product(from above step) in the grid page to verify sku masked as name and country of manufacture -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchCreatedSimpleProduct"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPageToSearchCreatedSimpleProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.name}}-{{nameAndAttributeSkuMaskSimpleProduct.country_of_manufacture_label}}" stepKey="fillSkuFilterFieldWithNameAndCountryOfManufactureInput" />
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml
index 6e6107df9b9fe..c82c038b75d74 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml
@@ -25,7 +25,7 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
         <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
         <waitForPageLoad stepKey="waitForProductToggleToSelectProduct"/>
         <click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickVirtualProduct"/>
@@ -41,7 +41,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
 
         <!-- Verify we see created virtual product(from the above step) on the product grid page -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage1"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage1"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickSelector"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFilter"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{virtualProductWithRequiredFields.name}}" stepKey="fillProductName1"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml
index 46b5d5d0c2aa4..9747ae6314b7d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml
@@ -31,7 +31,7 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
         <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
         <waitForPageLoad stepKey="waitForProductToggleToSelectProduct"/>
         <click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickVirtualProduct"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
index bfbabf1a5fea2..f119c995d3a61 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
@@ -31,7 +31,7 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
         <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
         <waitForPageLoad stepKey="waitForProductToggleToSelectProduct"/>
         <click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickVirtualProduct"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
index b129bc4b69f0a..16da9c0642edc 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
@@ -27,7 +27,7 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
         <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
         <waitForPageLoad stepKey="waitForProductToggleToSelectProduct"/>
         <click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickVirtualProduct"/>
@@ -59,7 +59,7 @@
         <!-- Verify we see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
 
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage1"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage1"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="checkRetailCustomerTaxClass" />
         <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="{{virtualProductBigQty.name}}" stepKey="fillProductName1"/>
         <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml
index b1ff97243e931..14f228375bfaa 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml
@@ -27,7 +27,7 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
         <click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductToggle"/>
         <waitForPageLoad stepKey="waitForProductToggleToSelectProduct"/>
         <click selector="{{AdminProductGridActionSection.addVirtualProduct}}" stepKey="clickVirtualProduct"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductNameToVerifyDataOverridingOnStoreViewLevelTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductNameToVerifyDataOverridingOnStoreViewLevelTest.xml
index 9d1059597f21e..1f4024f47bdf3 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductNameToVerifyDataOverridingOnStoreViewLevelTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductNameToVerifyDataOverridingOnStoreViewLevelTest.xml
@@ -42,7 +42,7 @@
         </after>
 
         <!-- Search default simple product in grid -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
         <actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGrid">
             <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
         </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductPriceToVerifyDataOverridingOnStoreViewLevelTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductPriceToVerifyDataOverridingOnStoreViewLevelTest.xml
index ead8e24c618bd..10b488c9848ba 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductPriceToVerifyDataOverridingOnStoreViewLevelTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductPriceToVerifyDataOverridingOnStoreViewLevelTest.xml
@@ -42,7 +42,7 @@
         </after>
 
         <!-- Search default simple product in grid -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
         <actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGrid">
             <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
         </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml
index 54e4c459e285f..522f0c712754f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml
@@ -40,7 +40,7 @@
         </after>
 
         <!-- Search default simple product in the grid -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
         <actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGrid">
             <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
         </actionGroup>
@@ -84,7 +84,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
 
         <!-- Search updated simple product(from above step) in the grid page -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPageToSearchUpdatedSimpleProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{simpleProductTierPrice300InStock.name}}" stepKey="fillSimpleProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockDisabledProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockDisabledProductTest.xml
index e71733a3c998d..74774f936cba8 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockDisabledProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockDisabledProductTest.xml
@@ -34,7 +34,7 @@
         </after>
 
         <!-- Search default simple product in the grid page -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
         <actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGrid">
             <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
         </actionGroup>
@@ -59,7 +59,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
 
         <!-- Search updated simple product(from above step) in the grid -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPageToSearchUpdatedSimpleProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{simpleProductDisabled.name}}" stepKey="fillSimpleProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest.xml
index 731988c77bc1e..9819ba61c21b7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest.xml
@@ -38,7 +38,7 @@
         </after>
 
         <!-- Search default simple product in the grid page -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
         <actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGrid">
             <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
         </actionGroup>
@@ -78,7 +78,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
 
         <!-- Search updated simple product(from above step) in the grid page -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPageToSearchUpdatedSimpleProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{simpleProductEnabledFlat.name}}" stepKey="fillSimpleProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockNotVisibleIndividuallyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockNotVisibleIndividuallyTest.xml
index 1748fc68b112d..7dcad35c34d13 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockNotVisibleIndividuallyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockNotVisibleIndividuallyTest.xml
@@ -36,7 +36,7 @@
         </after>
 
         <!-- Search default simple product in the grid page -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
         <actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGrid">
             <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
         </actionGroup>
@@ -69,7 +69,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
 
         <!-- Search updated simple product(from above step) in the grid page -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPageToSearchUpdatedSimpleProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{simpleProductNotVisibleIndividually.name}}" stepKey="fillSimpleProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockUnassignFromCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockUnassignFromCategoryTest.xml
index 7f9ccfdeb452a..3450a8fb6e017 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockUnassignFromCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockUnassignFromCategoryTest.xml
@@ -34,7 +34,7 @@
         </after>
 
         <!--Search default simple product in the grid page -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
         <actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGrid">
             <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
         </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml
index 12089c181bb13..2a260c606c71f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml
@@ -36,7 +36,7 @@
         </after>
 
         <!-- Search default simple product in the grid page -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
         <actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGrid">
             <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
         </actionGroup>
@@ -69,7 +69,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
 
         <!-- Search updated simple product(from above step) in the grid page -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPageToSearchUpdatedSimpleProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{simpleProductRegularPrice245InStock.name}}" stepKey="fillSimpleProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml
index eefd0b70a1782..db7d0f7adbec6 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml
@@ -36,7 +36,7 @@
         </after>
 
         <!-- Search default simple product in the grid -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
         <actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGrid">
             <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
         </actionGroup>
@@ -69,7 +69,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
 
         <!-- Search updated simple product(from above step) in the grid page -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPageToSearchUpdatedSimpleProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{simpleProductRegularPrice32501InStock.name}}" stepKey="fillSimpleProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInSearchOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInSearchOnlyTest.xml
index 99226b8beee8c..0a892b004f150 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInSearchOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInSearchOnlyTest.xml
@@ -36,7 +36,7 @@
         </after>
 
         <!-- Search default simple product in the grid -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
         <actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGrid">
             <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
         </actionGroup>
@@ -69,7 +69,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
 
         <!-- Search updated simple product(from above step) in the grid page -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPageToSearchUpdatedSimpleProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{simpleProductRegularPrice325InStock.name}}" stepKey="fillSimpleProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml
index 010e61c430227..6d22bf432320b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml
@@ -36,7 +36,7 @@
         </after>
 
         <!-- Search default simple product in the grid -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
         <actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGrid">
             <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
         </actionGroup>
@@ -82,7 +82,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
 
         <!--Search updated simple product(from above step) in the grid page-->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPageToSearchUpdatedSimpleProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{simpleProductRegularPriceCustomOptions.name}}" stepKey="fillSimpleProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceOutOfStockTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceOutOfStockTest.xml
index 83f44d4de9afa..98096f2702e12 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceOutOfStockTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceOutOfStockTest.xml
@@ -36,7 +36,7 @@
         </after>
 
         <!-- Search default simple product in the grid -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
         <actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGrid">
             <argument name="sku" value="$$initialSimpleProduct.sku$$"/>
         </actionGroup>
@@ -68,7 +68,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
 
         <!-- Search updated simple product(from above step) in the grid page -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedSimpleProduct"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPageToSearchUpdatedSimpleProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{simpleProductRegularPrice32503OutOfStock.name}}" stepKey="fillSimpleProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
index c5d07ffd819b4..f77138c6e2b8a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
@@ -37,7 +37,7 @@
         </after>
 
         <!-- Search default virtual product in the grid page -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage1"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage1"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
         <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
         <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
@@ -80,7 +80,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
 
         <!-- Search updated virtual product(from above step) in the grid page -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPageToSearchUpdatedVirtualProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductRegularPrice.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
index c3a80bf7e43b3..1bc66cca8d5fa 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
@@ -34,7 +34,7 @@
         </after>
 
         <!-- Search default virtual product in the grid page -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage1"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage1"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
         <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
         <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
@@ -125,7 +125,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
 
         <!-- Search updated virtual product(from above step) in the grid page -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPageToSearchUpdatedVirtualProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductRegularPriceInStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml
index bd3ddbb3bad79..8316d71f7b7da 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml
@@ -37,7 +37,7 @@
         </after>
 
         <!-- Search default virtual product in the grid page -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage1"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage1"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
         <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
         <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
@@ -61,7 +61,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
 
         <!-- Search updated virtual product(from above step) in the grid page -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPageToSearchUpdatedVirtualProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
index ee5f61c8056b4..6e346f38a2836 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
@@ -37,7 +37,7 @@
         </after>
 
         <!-- Search default virtual product in the grid page -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage1"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage1"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickclearAllFilter" />
         <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
         <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
@@ -69,7 +69,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
 
         <!-- Search updated virtual product(from above step) in the grid page -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPageToSearchUpdatedVirtualProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml
index 83205e80a3121..57cf6f6e45d97 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml
@@ -35,7 +35,7 @@
         </after>
 
         <!-- Search default virtual product in the grid page -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage1"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage1"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
         <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
         <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
@@ -59,7 +59,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
 
         <!-- Search updated virtual product(from above step) in the grid -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPageToSearchUpdatedVirtualProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml
index e0d0a4c46f00a..d1aa7a31ed297 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml
@@ -37,7 +37,7 @@
         </after>
 
         <!-- Search default virtual product in the grid page -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
         <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
         <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
@@ -75,7 +75,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
 
         <!-- Search updated virtual product(from above step) in the grid page -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPageToSearchUpdatedVirtualProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductSpecialPrice.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml
index 03629ca567b0a..ba8ccbe932bfa 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml
@@ -37,7 +37,7 @@
         </after>
 
         <!-- Search default virtual product in the grid page -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage1"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage1"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
         <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
         <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
@@ -74,7 +74,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
 
         <!-- Search updated virtual product with special price(out of stock) in the grid -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPageToSearchUpdatedVirtualProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
index 7b5188c5fd27b..e43b04bb5e08b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
@@ -37,7 +37,7 @@
         </after>
 
         <!-- Search default virtual product in the grid page -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage1"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage1"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
         <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
         <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
@@ -80,7 +80,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
 
         <!-- Search updated virtual product(from above step) in the grid -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPageToSearchUpdatedVirtualProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualProductWithTierPriceInStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
index 7a494868173fe..52d8c08294e86 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
@@ -37,7 +37,7 @@
         </after>
 
         <!-- Search default virtual product in the grid page -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPage1"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage1"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
         <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
         <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
@@ -80,7 +80,7 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
 
         <!-- Search updated virtual product(from above step) in the grid page -->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="OpenProductCatalogPageToSearchUpdatedVirtualProduct"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPageToSearchUpdatedVirtualProduct"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAll"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
         <fillField selector="{{AdminProductGridFilterSection.nameFilter}}" userInput="{{updateVirtualTierPriceOutOfStock.name}}" stepKey="fillVirtualProductNameInNameFilter"/>
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml
index b499cbacb780c..ad426c4bc6c4c 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminUrlForProductRewrittenCorrectlyTest.xml
@@ -56,7 +56,7 @@
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
 
         <!--Select product and go toUpdate Attribute page-->
-        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="GoToCatalogPageChangingView"/>
+        <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="goToCatalogPageChangingView"/>
         <actionGroup ref="FilterProductGridByNameActionGroup" stepKey="filterBundleProductOptionsDownToName">
             <argument name="product" value="ApiSimpleProduct"/>
         </actionGroup>

From 362b81a35c42fa83fdac22e4662d34f84357de32 Mon Sep 17 00:00:00 2001
From: Dmitriy Gallyamov <dmitrijs.gallamovs@gmail.com>
Date: Wed, 1 Jul 2020 12:04:13 +0300
Subject: [PATCH 0679/1718] magento/magento2#28569: Multi-store: Missing store
 codes in relation to a group and website

- Fixed static code checks and web api tests
---
 .../Store/Model/ResourceModel/StoreWebsiteRelation.php     | 2 ++
 .../Magento/GraphQl/Store/StoreConfigResolverTest.php      | 7 +------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php b/app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php
index 217e32a660f15..4bfe713806174 100644
--- a/app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php
+++ b/app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php
@@ -27,6 +27,8 @@ public function __construct(ResourceConnection $resource)
     }
 
     /**
+     * Get store by website id
+     *
      * @param int $websiteId
      * @return array
      */
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
index f3c0a90c7b2b8..a3ee05f90236e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
@@ -37,7 +37,6 @@ protected function setUp(): void
 
     /**
      * @magentoApiDataFixture Magento/Store/_files/store.php
-     * @magentoConfigFixture default_store store/information/name Default Store
      * @throws NoSuchEntityException
      */
     public function testGetStoreConfig(): void
@@ -109,10 +108,6 @@ private function validateStoreConfig($storeConfig, $responseConfig): void
         $this->assertEquals($storeConfig->getSecureBaseLinkUrl(), $responseConfig['secure_base_link_url']);
         $this->assertEquals($storeConfig->getSecureBaseStaticUrl(), $responseConfig['secure_base_static_url']);
         $this->assertEquals($storeConfig->getSecureBaseMediaUrl(), $responseConfig['secure_base_media_url']);
-        $this->assertEquals($scopeConfig->getValue(
-            'store/information/name',
-            ScopeInterface::SCOPE_STORE,
-            $storeConfig->getId()
-        ), $responseConfig['store_name']);
+        $this->assertEquals($storeConfig->getName(), $responseConfig['store_name']);
     }
 }

From 5531f50ff1ba3ad3812ddef4c886c8bae6b5b8cd Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Wed, 1 Jul 2020 11:56:53 +0100
Subject: [PATCH 0680/1718] Added jasmine tests

---
 .../base/web/js/grid/url-filter-applier.js    | 11 ++--
 .../base/js/grid/url-filter-applier.test.js   | 65 +++++++++++++++++++
 2 files changed, 71 insertions(+), 5 deletions(-)
 create mode 100644 dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/url-filter-applier.test.js

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 d379d2611aba4..f9f6e9d7a73de 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
@@ -11,8 +11,9 @@ define([
 
     return Component.extend({
         defaults: {
-            filterProvider: 'componentType = filters, ns = ${ $.ns }',
+            filterProvider: 'componentType = filters',
             filterKey: 'filters',
+            searchString: location.search,
             modules: {
                 filterComponent: '${ $.filterProvider }',
             }
@@ -34,12 +35,12 @@ define([
          * Apply filter
          */
         apply: function () {
-            var urlFilter = this.getFilterParam();
+            var urlFilter = this.getFilterParam(this.searchString);
 
             if (_.isUndefined(this.filterComponent())) {
                 setTimeout(function () {this.apply()}.bind(this), 100);
             } else {
-                 if (Object.keys(urlFilter).length) {
+                if (Object.keys(urlFilter).length) {
                      this.filterComponent().setData(urlFilter, false);
                      this.filterComponent().apply();
                  }
@@ -51,8 +52,8 @@ define([
          *
          * @returns {Object}
          */
-        getFilterParam: function () {
-            var searchString = decodeURI(location.search);
+        getFilterParam: function (url) {
+            var searchString = decodeURI(url);
 
             return _.chain(searchString.slice(1).split('&'))
                 .map(function (item) {
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
new file mode 100644
index 0000000000000..03bf5300e8ded
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/url-filter-applier.test.js
@@ -0,0 +1,65 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/*eslint max-nested-callbacks: 0*/
+define([
+    'Magento_Ui/js/grid/url-filter-applier'
+], function (UrlFilterApplier) {
+    'use strict';
+
+    describe('Magento_Ui/js/grid/url-filter-applier', function () {
+        var urlFilterApplierObj,
+            filterComponentMock = {
+                setData: jasmine.createSpy(),
+                apply: jasmine.createSpy()
+            };
+
+        beforeEach(function () {
+            urlFilterApplierObj = new UrlFilterApplier({});
+            urlFilterApplierObj.filterComponent = jasmine.createSpy().and.returnValue(filterComponentMock);
+        });
+
+        describe('"getFilterParam" method', function () {
+            it('return object from url with a simple filters parameter', function () {
+                var urlSearch = '?filters[name]=test';
+
+                expect(urlFilterApplierObj.getFilterParam(urlSearch)).toEqual({'name': 'test'});
+            });
+            it('return object from url with multiple filters parameter', function () {
+                var urlSearch = '?filters[name]=test&filters[qty]=1';
+
+                expect(urlFilterApplierObj.getFilterParam(urlSearch)).toEqual({
+                        'name': 'test',
+                        'qty': '1'
+                    });
+            });
+            it('return object from url with multiple filters parameter and another parameter', function () {
+                var urlSearch = '?filters[name]=test&filters[qty]=1&anotherparam=1';
+
+                expect(urlFilterApplierObj.getFilterParam(urlSearch)).toEqual({
+                    'name': 'test',
+                    'qty': '1'
+                });
+            });
+            it('return object from url with another parameter', function () {
+                var urlSearch = '?anotherparam=1';
+
+                expect(urlFilterApplierObj.getFilterParam(urlSearch)).toEqual({});
+            });
+        });
+
+        describe('"apply" method', function () {
+            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();
+            });
+        });
+    });
+});

From 1574740ad1c71f1b74212bfd1449881212f25fc3 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Wed, 1 Jul 2020 11:57:38 +0100
Subject: [PATCH 0681/1718] Added url filter applier to product grid

---
 .../adminhtml/layout/catalog_product_index.xml    |  1 +
 .../product/grid/url_filter_applier.phtml         | 15 +++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml

diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_index.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_index.xml
index c503196cc8647..75391ede7f261 100644
--- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_index.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_index.xml
@@ -21,6 +21,7 @@
         <referenceContainer name="content">
             <uiComponent name="product_listing"/>
             <block class="Magento\Catalog\Block\Adminhtml\Product" name="products_list"/>
+            <block class="Magento\Backend\Block\Template" template="Magento_Catalog::product/grid/url_filter_applier.phtml" />
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml
new file mode 100644
index 0000000000000..a09b0944b68e5
--- /dev/null
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var $block \Magento\Backend\Block\Template */
+?>
+<script type="text/x-magento-init">
+    {
+        "*": {
+            "Magento_Ui/js/grid/url-filter-applier": {}
+        }
+    }
+</script>

From 607aed6ff371c7aba0e78f41974196458b112937 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Wed, 1 Jul 2020 12:10:33 +0100
Subject: [PATCH 0682/1718] Added url filter applier to cms grids

---
 .../Cms/view/adminhtml/layout/cms_block_index.xml |  1 +
 .../Cms/view/adminhtml/layout/cms_page_index.xml  |  1 +
 .../adminhtml/templates/url_filter_applier.phtml  | 15 +++++++++++++++
 3 files changed, 17 insertions(+)
 create mode 100644 app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml

diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml
index d22eaf504e703..fb73b4caf5b20 100644
--- a/app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml
+++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml
@@ -9,6 +9,7 @@
     <body>
         <referenceContainer name="content">
             <uiComponent name="cms_block_listing"/>
+            <block class="Magento\Backend\Block\Template" template="Magento_Cms::url_filter_applier.phtml" />
         </referenceContainer>
         <referenceContainer name="admin.scope.col.wrap" htmlClass="admin__old" /> <!-- ToDo UI: remove this wrapper with old styles removal. The class name "admin__old" is for tests only, we shouldn't use it in any way -->
     </body>
diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml
index bf78b1cd49448..a6e4960c9d892 100644
--- a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml
+++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml
@@ -10,6 +10,7 @@
     <body>
         <referenceContainer name="content">
             <uiComponent name="cms_page_listing"/>
+            <block class="Magento\Backend\Block\Template" template="Magento_Cms::url_filter_applier.phtml" />
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml b/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
new file mode 100644
index 0000000000000..a09b0944b68e5
--- /dev/null
+++ b/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var $block \Magento\Backend\Block\Template */
+?>
+<script type="text/x-magento-init">
+    {
+        "*": {
+            "Magento_Ui/js/grid/url-filter-applier": {}
+        }
+    }
+</script>

From 78ea7b86ed26fde1168ff345e06dea3c20aaca93 Mon Sep 17 00:00:00 2001
From: Dmitriy Gallyamov <dmitrijs.gallamovs@gmail.com>
Date: Wed, 1 Jul 2020 15:56:29 +0300
Subject: [PATCH 0683/1718] magento/magento2#28569: Multi-store: Missing store
 codes in relation to a group and website

- Static code and test fixes
---
 .../Magento/GraphQl/Store/StoreConfigResolverTest.php         | 4 ----
 .../testsuite/Magento/Store/Api/StoreConfigManagerTest.php    | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
index a3ee05f90236e..f91682de4aecf 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
@@ -7,13 +7,11 @@
 
 namespace Magento\GraphQl\Store;
 
-use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Store\Api\Data\StoreConfigInterface;
 use Magento\Store\Api\StoreConfigManagerInterface;
 use Magento\Store\Api\StoreRepositoryInterface;
 use Magento\Store\Api\StoreResolverInterface;
-use Magento\Store\Model\ScopeInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\ObjectManager;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -88,8 +86,6 @@ public function testGetStoreConfig(): void
      */
     private function validateStoreConfig($storeConfig, $responseConfig): void
     {
-        /* @var $scopeConfig ScopeConfigInterface */
-        $scopeConfig = $this->objectManager->get(ScopeConfigInterface::class);
         $this->assertEquals($storeConfig->getId(), $responseConfig['id']);
         $this->assertEquals($storeConfig->getCode(), $responseConfig['code']);
         $this->assertEquals($storeConfig->getLocale(), $responseConfig['locale']);
diff --git a/dev/tests/api-functional/testsuite/Magento/Store/Api/StoreConfigManagerTest.php b/dev/tests/api-functional/testsuite/Magento/Store/Api/StoreConfigManagerTest.php
index 0a2ecaaed8b5d..4fcf38f92a9b9 100644
--- a/dev/tests/api-functional/testsuite/Magento/Store/Api/StoreConfigManagerTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Store/Api/StoreConfigManagerTest.php
@@ -43,6 +43,7 @@ public function testGetStoreConfigs()
         $expectedKeys = [
             'id',
             'code',
+            'name',
             'website_id',
             'locale',
             'base_currency_code',

From b2372453014325ddbeb9fe22e68c123e65f4a68a Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 1 Jul 2020 16:31:06 +0300
Subject: [PATCH 0684/1718] mftf use action group go to home page

---
 .../Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.xml | 2 +-
 .../QuickSearchAndAddToCartBundleDynamicTest.xml              | 2 +-
 .../QuickSearchAndAddToCartBundleFixedTest.xml                | 2 +-
 .../QuickSearchAndAddToCartConfigurableTest.xml               | 2 +-
 .../QuickSearchAndAddToCartDownloadableTest.xml               | 2 +-
 .../QuickSearchAndAddToCartGroupedTest.xml                    | 2 +-
 .../SearchEntityResultsTest/QuickSearchAndAddToCartTest.xml   | 2 +-
 .../QuickSearchAndAddToCartVirtualTest.xml                    | 2 +-
 .../SearchEntityResultsTest/QuickSearchEmptyResultsTest.xml   | 2 +-
 .../SearchEntityResultsTest/QuickSearchProductBySkuTest.xml   | 2 +-
 .../QuickSearchTwoProductsWithSameWeightTest.xml              | 2 +-
 .../Test/StorefrontQuickSearchConfigurableChildrenTest.xml    | 4 ++--
 ...ontPersistentDataForGuestCustomerWithPhysicalQuoteTest.xml | 2 +-
 .../Test/StorefrontConfigurableProductChildSearchTest.xml     | 3 +--
 .../Test/LinkDownloadableProductFromGuestToCustomerTest.xml   | 2 +-
 .../Mftf/Test/ProductQuickSearchUsingElasticSearchTest.xml    | 4 +---
 .../Test/Mftf/Test/ShippingQuotePersistedForGuestTest.xml     | 2 +-
 ...ntVerifyShoppingCartPersistenceUnderLongTermCookieTest.xml | 2 +-
 ...torefrontCategoryRulesShouldApplyToComplexProductsTest.xml | 2 +-
 19 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.xml
index 44bfc66a466a8..d6a5aa8b93572 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.xml
@@ -36,7 +36,7 @@
         </after>
         <actionGroup ref="SetMinimalQueryLengthActionGroup" stepKey="setMinQueryLength"/>
         <comment userInput="Go to Storefront and search for product" stepKey="searchProdUsingMinQueryLength"/>
-        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePage"/>
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToHomePage"/>
         <comment userInput="Quick search by single character and avoid using ES stopwords" stepKey="commentQuickSearch"/>
         <fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="B" stepKey="fillAttribute"/>
         <waitForPageLoad stepKey="waitForSearchTextBox"/>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartBundleDynamicTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartBundleDynamicTest.xml
index 49fce41fddf05..d68cf4d2e8a10 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartBundleDynamicTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartBundleDynamicTest.xml
@@ -53,7 +53,7 @@
             <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
         </after>
-        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToFrontPage"/>
         <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
             <argument name="phrase" value="$createBundleProduct.name$"/>
         </actionGroup>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartBundleFixedTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartBundleFixedTest.xml
index 4b0a5c84ac360..3529168d8f0b9 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartBundleFixedTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartBundleFixedTest.xml
@@ -67,7 +67,7 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
         </after>
         <comment userInput="$simpleProduct1.name$" stepKey="asdf"/>
-        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToFrontPage"/>
         <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
             <argument name="phrase" value="$createBundleProduct.name$"/>
         </actionGroup>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartConfigurableTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartConfigurableTest.xml
index 35db90363b1ae..a3b7eb6a9cf21 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartConfigurableTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartConfigurableTest.xml
@@ -37,7 +37,7 @@
             <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearProductsGridFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
         </after>
-        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToFrontPage"/>
         <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
             <argument name="phrase" value="{{_defaultProduct.name}}"/>
         </actionGroup>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartDownloadableTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartDownloadableTest.xml
index 79a2fc8646c04..f1d5ac9ae2cb3 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartDownloadableTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartDownloadableTest.xml
@@ -36,7 +36,7 @@
             <deleteData stepKey="deleteProduct" createDataKey="createProduct"/>
             <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
         </after>
-        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToFrontPage"/>
         <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
             <argument name="phrase" value="$createProduct.name$"/>
         </actionGroup>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartGroupedTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartGroupedTest.xml
index cf30e4d06e8e7..a1e4a0b0ddb0f 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartGroupedTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartGroupedTest.xml
@@ -36,7 +36,7 @@
             <deleteData stepKey="deleteSimpleProduct" createDataKey="simple1"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
         </after>
-        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToFrontPage"/>
         <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
             <argument name="phrase" value="&quot;$createProduct.name$&quot;"/>
         </actionGroup>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartTest.xml
index ba6fa813367c3..b5e3be6a1f745 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartTest.xml
@@ -31,7 +31,7 @@
             <deleteData stepKey="deleteProduct" createDataKey="createSimpleProduct"/>
             <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
         </after>
-        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToFrontPage"/>
         <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
             <argument name="phrase" value="$createSimpleProduct.name$"/>
         </actionGroup>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartVirtualTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartVirtualTest.xml
index b71388f5f409b..133924350142d 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartVirtualTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartVirtualTest.xml
@@ -31,7 +31,7 @@
             <deleteData stepKey="deleteProduct" createDataKey="createVirtualProduct"/>
             <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
         </after>
-        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToFrontPage"/>
         <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
             <argument name="phrase" value="$createVirtualProduct.name$"/>
         </actionGroup>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchEmptyResultsTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchEmptyResultsTest.xml
index 566b4d204751d..d01a761bfc22d 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchEmptyResultsTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchEmptyResultsTest.xml
@@ -33,7 +33,7 @@
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
         </after>
 
-        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToFrontPage"/>
         <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
             <argument name="phrase" value="ThisShouldn'tReturnAnything"/>
         </actionGroup>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchProductBySkuTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchProductBySkuTest.xml
index 814e27182799f..d4499d215ac54 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchProductBySkuTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchProductBySkuTest.xml
@@ -31,7 +31,7 @@
             <deleteData stepKey="deleteProduct" createDataKey="createSimpleProduct"/>
             <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
         </after>
-        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToFrontPage"/>
         <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
             <argument name="phrase" value="$createSimpleProduct.sku$"/>
         </actionGroup>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchTwoProductsWithSameWeightTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchTwoProductsWithSameWeightTest.xml
index e1488f4d000eb..b28a810344e5c 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchTwoProductsWithSameWeightTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchTwoProductsWithSameWeightTest.xml
@@ -77,7 +77,7 @@
             <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
 
         </after>
-        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToFrontPage"/>
         <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
             <argument name="phrase" value="{{_defaultProduct.name}}"/>
         </actionGroup>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontQuickSearchConfigurableChildrenTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontQuickSearchConfigurableChildrenTest.xml
index 6f510fa315d7d..725d4d15267b4 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontQuickSearchConfigurableChildrenTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontQuickSearchConfigurableChildrenTest.xml
@@ -83,7 +83,7 @@
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
         </after>
-        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePage"/>
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToFrontPage"/>
         <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
             <argument name="phrase" value="$createConfigurableProduct.name$"/>
         </actionGroup>
@@ -98,7 +98,7 @@
         <actionGroup ref="ToggleProductEnabledActionGroup" stepKey="disableProduct"/>
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
 
-        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePageAgain"/>
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToHomePageAgain"/>
         <actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefrontAgain">
             <argument name="phrase" value="$createConfigurableProduct.name$"/>
         </actionGroup>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontPersistentDataForGuestCustomerWithPhysicalQuoteTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontPersistentDataForGuestCustomerWithPhysicalQuoteTest.xml
index 9aea4ac79312a..e42d5e1bae956 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontPersistentDataForGuestCustomerWithPhysicalQuoteTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontPersistentDataForGuestCustomerWithPhysicalQuoteTest.xml
@@ -23,7 +23,7 @@
                 <field key="price">10</field>
             </createData>
             <createData entity="FreeShippinMethodConfig" stepKey="enableFreeShipping"/>
-            <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefront"/>
+            <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStorefront"/>
             <executeJS function="window.localStorage.clear();" stepKey="clearLocalStorage"/>
         </before>
         <after>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml
index fbf23597a3927..63d457a54321f 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml
@@ -149,8 +149,7 @@
         <magentoCLI command="cache:flush" stepKey="flushCache"/>
 
         <!-- Quick search the storefront for the first attribute option -->
-        <amOnPage stepKey="goToStoreFront" url="{{StorefrontHomePage.url}}"/>
-        <waitForPageLoad stepKey="waitForStorefront"/>
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStoreFront"/>
         <submitForm selector="#search_mini_form" parameterArray="['q' => $$createConfigProductAttributeSelectOption1.option[store_labels][0][label]$$]" stepKey="searchStorefront1" />
         <seeElement stepKey="seeProduct1" selector="{{StorefrontCategoryProductSection.ProductTitleByName('$$createConfigProduct.name$$')}}"/>
 
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/LinkDownloadableProductFromGuestToCustomerTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/LinkDownloadableProductFromGuestToCustomerTest.xml
index b9773415059ec..b8f9ce260f057 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/LinkDownloadableProductFromGuestToCustomerTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/LinkDownloadableProductFromGuestToCustomerTest.xml
@@ -35,7 +35,7 @@
             <deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
         </after>
         <!--Step 1: Go to Storefront as Guest-->
-        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage"/>
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="amOnStorefrontPage"/>
         <!--Step 2: Add downloadable product to shopping cart-->
         <amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="amOnStorefrontProductPage"/>
         <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
diff --git a/app/code/Magento/Elasticsearch/Test/Mftf/Test/ProductQuickSearchUsingElasticSearchTest.xml b/app/code/Magento/Elasticsearch/Test/Mftf/Test/ProductQuickSearchUsingElasticSearchTest.xml
index e8a0df9b9dc87..8d1b420f3c17f 100644
--- a/app/code/Magento/Elasticsearch/Test/Mftf/Test/ProductQuickSearchUsingElasticSearchTest.xml
+++ b/app/code/Magento/Elasticsearch/Test/Mftf/Test/ProductQuickSearchUsingElasticSearchTest.xml
@@ -46,9 +46,7 @@
         <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         <!--Navigate to storefront and do a quick search for the product -->
         <comment userInput="Navigate to Storefront to check if quick search works" stepKey="commentCheckQuickSearch" />
-        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePage"/>
-
-        <waitForPageLoad stepKey="waitForHomePageToLoad" time="30"/>
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToHomePage"/>
         <fillField userInput="Simple" selector="{{StorefrontQuickSearchSection.searchPhrase}}" stepKey="fillSearchBar"/>
         <waitForPageLoad stepKey="wait2" time="30"/>
         <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
diff --git a/app/code/Magento/Persistent/Test/Mftf/Test/ShippingQuotePersistedForGuestTest.xml b/app/code/Magento/Persistent/Test/Mftf/Test/ShippingQuotePersistedForGuestTest.xml
index 7c4e6948386f3..f094c4f07475d 100644
--- a/app/code/Magento/Persistent/Test/Mftf/Test/ShippingQuotePersistedForGuestTest.xml
+++ b/app/code/Magento/Persistent/Test/Mftf/Test/ShippingQuotePersistedForGuestTest.xml
@@ -66,7 +66,7 @@
         <selectOption selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_CA.state}}" stepKey="selectCaliforniaRegion"/>
         <fillField selector="{{CheckoutCartSummarySection.postcode}}" userInput="{{US_Address_CA.postcode}}" stepKey="inputPostCode"/>
         <!--Step 6: Go to Homepage-->
-        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePageAfterChangingShippingAndTaxSection"/>
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToHomePageAfterChangingShippingAndTaxSection"/>
         <!--Step 7: Go to shopping cart and check "Estimate Shipping and Tax" fields values are saved-->
         <actionGroup ref="ClickViewAndEditCartFromMiniCartActionGroup" after="goToHomePageAfterChangingShippingAndTaxSection" stepKey="goToShoppingCartAfterChangingShippingAndTaxSection"/>
         <conditionalClick  selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingAndTaxAfterChanging" />
diff --git a/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontVerifyShoppingCartPersistenceUnderLongTermCookieTest.xml b/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontVerifyShoppingCartPersistenceUnderLongTermCookieTest.xml
index dd24c6ae4279d..80ca7a2eb90c7 100644
--- a/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontVerifyShoppingCartPersistenceUnderLongTermCookieTest.xml
+++ b/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontVerifyShoppingCartPersistenceUnderLongTermCookieTest.xml
@@ -49,7 +49,7 @@
         </after>
 
         <!-- 1. Go to storefront and click the Create an Account link-->
-        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnHomePage"/>
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="amOnHomePage"/>
         <click selector="{{StorefrontPanelHeaderSection.createAnAccountLink}}" stepKey="clickCreateAnAccountLink" />
         <actionGroup ref="StorefrontAssertPersistentRegistrationPageFields" stepKey="assertPersistentRegistrationPageFields"/>
 
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCategoryRulesShouldApplyToComplexProductsTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCategoryRulesShouldApplyToComplexProductsTest.xml
index 85a30b3a3a2b4..6b634fa37da2c 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCategoryRulesShouldApplyToComplexProductsTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCategoryRulesShouldApplyToComplexProductsTest.xml
@@ -81,7 +81,7 @@
             <argument name="actionValue" value="$$createCategory.id$$"/>
         </actionGroup>
         <!-- 2: Go to frontend and add an item from both CAT1 and CAT2 to your cart -->
-        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontend"/>
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToFrontend"/>
         <!-- 3: Open configurable product 1 and add all his child products to cart -->
         <amOnPage url="{{StorefrontProductPage.url($$createConfigProductCreateConfigurableProduct1.custom_attributes[url_key]$$)}}" stepKey="amOnConfigurableProductPage"/>
         <selectOption selector="{{StorefrontProductInfoMainSection.productOptionSelect('$$createConfigProductAttributeCreateConfigurableProduct1.attribute[frontend_labels][0][label]$$')}}"  userInput="$$createConfigProductAttributeOption1CreateConfigurableProduct1.option[store_labels][0][label]$$" stepKey="selectOption"/>

From 83ba777e2629e30f8f5b3504d3b1aeafee425605 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 1 Jul 2020 16:47:38 +0300
Subject: [PATCH 0685/1718] use action group go to attribute grid page

---
 ...minCreateCustomProductAttributeWithDropdownFieldTest.xml | 2 +-
 .../Mftf/Test/AdminCreateDatetimeProductAttributeTest.xml   | 3 +--
 ...ctAttributeVisibleInStorefrontAdvancedSearchFormTest.xml | 2 +-
 ...ctAttributeVisibleInStorefrontAdvancedSearchFormTest.xml | 2 +-
 .../Test/AdminCreateProductAttributeFromProductPageTest.xml | 2 +-
 .../Mftf/Test/AdminDeleteSystemProductAttributeTest.xml     | 3 +--
 .../Mftf/Test/AdminEditTextEditorProductAttributeTest.xml   | 3 +--
 .../Test/AdminProductGridFilteringByDateAttributeTest.xml   | 3 +--
 .../AdminProductStatusAttributeDisabledByDefaultTest.xml    | 6 ++----
 .../CreateProductAttributeEntityDateTest.xml                | 2 +-
 .../CreateProductAttributeEntityDropdownTest.xml            | 2 +-
 ...ateProductAttributeEntityDropdownWithSingleQuoteTest.xml | 2 +-
 .../CreateProductAttributeEntityMultiSelectTest.xml         | 2 +-
 .../CreateProductAttributeEntityPriceTest.xml               | 2 +-
 .../CreateProductAttributeEntityTextFieldTest.xml           | 2 +-
 ...nfigurableProductAfterGettingIncorrectSKUMessageTest.xml | 3 +--
 .../Test/StorefrontElasticsearchSearchInvalidValueTest.xml  | 5 ++---
 .../Swatches/Test/Mftf/Test/AdminCreateVisualSwatchTest.xml | 6 ++----
 .../Test/Mftf/Test/AdminDisablingSwatchTooltipsTest.xml     | 6 ++----
 19 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml
index 7b2c67b205ea8..19df6e29f36a2 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml
@@ -105,7 +105,7 @@
         <seeElement selector="{{AdminProductFormSection.attributeLabelByText(ProductAttributeFrontendLabel.label)}}" stepKey="seeAttributeLabelInProductForm"/>
 
         <!--Verify Product Attribute in Attribute Form -->
-        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
+        <actionGroup ref="AdminOpenProductAttributePageActionGroup" stepKey="navigateToProductAttributeGrid"/>
         <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="{{newProductAttribute.attribute_code}}" stepKey="setAttributeCode"/>
         <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>
         <waitForPageLoad stepKey="waitForPageLoad" />
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDatetimeProductAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDatetimeProductAttributeTest.xml
index 37dc7de910917..4c57504b60ad7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDatetimeProductAttributeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDatetimeProductAttributeTest.xml
@@ -29,8 +29,7 @@
         <!-- Generate the datetime default value -->
         <generateDate date="now" format="n/j/y g:i A" stepKey="generateDefaultValue"/>
         <!-- Create new datetime product attribute -->
-        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="goToProductAttributes"/>
-        <waitForPageLoad stepKey="waitForPageLoadAttributes"/>
+        <actionGroup ref="AdminOpenProductAttributePageActionGroup" stepKey="goToProductAttributes"/>
         <actionGroup ref="CreateProductAttributeWithDatetimeFieldActionGroup" stepKey="createAttribute">
             <argument name="attribute" value="DatetimeProductAttribute"/>
             <argument name="date" value="{$generateDefaultValue}"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDropdownProductAttributeVisibleInStorefrontAdvancedSearchFormTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDropdownProductAttributeVisibleInStorefrontAdvancedSearchFormTest.xml
index fef69edde23e8..0bfa5b925483e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDropdownProductAttributeVisibleInStorefrontAdvancedSearchFormTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDropdownProductAttributeVisibleInStorefrontAdvancedSearchFormTest.xml
@@ -60,7 +60,7 @@
         <actionGroup ref="SaveAttributeSetActionGroup" stepKey="saveAttributeSet"/>
 
         <!-- Go to Product Attribute Grid page -->
-        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
+        <actionGroup ref="AdminOpenProductAttributePageActionGroup" stepKey="navigateToProductAttributeGrid"/>
         <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="$$attribute.attribute_code$$" stepKey="fillAttrCodeField" />
         <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="clickSearchBtn" />
         <click selector="{{AdminProductAttributeGridSection.FirstRow}}" stepKey="chooseFirstRow" />
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateMultipleSelectProductAttributeVisibleInStorefrontAdvancedSearchFormTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateMultipleSelectProductAttributeVisibleInStorefrontAdvancedSearchFormTest.xml
index caacfde89d1cb..174bfc3e18ba5 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateMultipleSelectProductAttributeVisibleInStorefrontAdvancedSearchFormTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateMultipleSelectProductAttributeVisibleInStorefrontAdvancedSearchFormTest.xml
@@ -64,7 +64,7 @@
         <actionGroup ref="SaveAttributeSetActionGroup" stepKey="saveAttributeSet"/>
 
         <!-- Go to Product Attribute Grid page -->
-        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
+        <actionGroup ref="AdminOpenProductAttributePageActionGroup" stepKey="navigateToProductAttributeGrid"/>
         <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="$$attribute.attribute_code$$" stepKey="fillAttrCodeField" />
         <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="clickSearchBtn" />
         <click selector="{{AdminProductAttributeGridSection.FirstRow}}" stepKey="chooseFirstRow" />
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml
index 7fdab11d0a050..7154b7b27650d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml
@@ -100,7 +100,7 @@
         <seeElement selector="{{AdminProductFormSection.attributeLabelByText(ProductAttributeFrontendLabel.label)}}" stepKey="seeAttributeLabelInProductForm"/>
 
         <!--Verify Product Attribute in Attribute Form -->
-        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
+        <actionGroup ref="AdminOpenProductAttributePageActionGroup" stepKey="navigateToProductAttributeGrid"/>
         <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="{{newProductAttribute.attribute_code}}" stepKey="setAttributeCode"/>
         <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>
         <waitForPageLoad stepKey="waitForPageLoad" />
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteSystemProductAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteSystemProductAttributeTest.xml
index 22c6bf061f274..b7e037b323ee2 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteSystemProductAttributeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteSystemProductAttributeTest.xml
@@ -23,8 +23,7 @@
         <after>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
-        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttribute"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <actionGroup ref="AdminOpenProductAttributePageActionGroup" stepKey="navigateToProductAttribute"/>
         <click selector="{{AdminProductAttributeGridSection.ResetFilter}}" stepKey="resetFiltersOnGrid"/>
         <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="{{newsFromDate.attribute_code}}" stepKey="setAttributeCode"/>
         <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminEditTextEditorProductAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminEditTextEditorProductAttributeTest.xml
index ebbfdc4d72f40..f0d670cd35471 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminEditTextEditorProductAttributeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminEditTextEditorProductAttributeTest.xml
@@ -50,8 +50,7 @@
         <amOnPage url="{{_defaultProduct.name}}.html" stepKey="navigateToProductPage"/>
         <waitForPageLoad stepKey="waitForPageLoad5"/>
         <see userInput="Text Area" stepKey="seeText2" />
-        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid2"/>
-        <waitForPageLoad stepKey="waitForPageLoad6"/>
+        <actionGroup ref="AdminOpenProductAttributePageActionGroup" stepKey="navigateToProductAttributeGrid2"/>
         <click selector="{{AdminProductAttributeGridSection.AttributeCode($$myProductAttributeCreation.attribute_code$$)}}" stepKey="navigateToAttributeEditPage2" />
         <waitForPageLoad stepKey="waitForPageLoad7" />
         <seeOptionIsSelected selector="{{AttributePropertiesSection.InputType}}" userInput="Text Area" stepKey="seeTextAreaSelected" />
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByDateAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByDateAttributeTest.xml
index d47730a99308b..d4d32ae47b827 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByDateAttributeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByDateAttributeTest.xml
@@ -26,8 +26,7 @@
             <deleteData createDataKey="createSimpleProductWithDate" stepKey="deleteProduct"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
-        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttribute"/>
-        <waitForPageLoad stepKey="wait1"/>
+        <actionGroup ref="AdminOpenProductAttributePageActionGroup" stepKey="navigateToProductAttribute"/>
         <click selector="{{AdminProductAttributeGridSection.ResetFilter}}" stepKey="resetFiltersOnGrid"/>
         <fillField selector="{{AdminProductAttributeGridSection.GridFilterFrontEndLabel}}" userInput="Set Product as New from Date" stepKey="setAttributeLabel"/>
         <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromGrid"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml
index ae63158990b96..e681feb77c380 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductStatusAttributeDisabledByDefaultTest.xml
@@ -23,8 +23,7 @@
 
         </before>
         <after>
-            <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttribute"/>
-            <waitForPageLoad stepKey="wait1"/>
+            <actionGroup ref="AdminOpenProductAttributePageActionGroup" stepKey="navigateToProductAttribute"/>
             <click selector="{{AdminProductAttributeGridSection.ResetFilter}}" stepKey="resetFiltersOnGrid1"/>
             <fillField selector="{{AdminProductAttributeGridSection.GridFilterFrontEndLabel}}" userInput="Enable Product" stepKey="setAttributeLabel1"/>
             <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid1"/>
@@ -37,8 +36,7 @@
 
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
-        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttribute"/>
-        <waitForPageLoad stepKey="wait1"/>
+        <actionGroup ref="AdminOpenProductAttributePageActionGroup" stepKey="navigateToProductAttribute"/>
         <click selector="{{AdminProductAttributeGridSection.ResetFilter}}" stepKey="resetFiltersOnGrid"/>
         <fillField selector="{{AdminProductAttributeGridSection.GridFilterFrontEndLabel}}" userInput="Enable Product" stepKey="setAttributeLabel"/>
         <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="searchForAttributeFromTheGrid"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityDateTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityDateTest.xml
index 437532b9baebf..26ff1bc45be9d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityDateTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityDateTest.xml
@@ -39,7 +39,7 @@
         <generateDate date="now" format="m/j/Y" stepKey="generateDefaultDate"/>
 
         <!--Navigate to Stores > Attributes > Product.-->
-        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="goToProductAttributes"/>
+        <actionGroup ref="AdminOpenProductAttributePageActionGroup" stepKey="goToProductAttributes"/>
 
         <!--Create new Product Attribute as TextField, with code and default value.-->
         <actionGroup ref="CreateProductAttributeWithDateFieldActionGroup" stepKey="createAttribute">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityDropdownTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityDropdownTest.xml
index 580a5bd4939bb..61787dcff0b91 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityDropdownTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityDropdownTest.xml
@@ -33,7 +33,7 @@
         </after>
 
         <!--Navigate to Stores > Attributes > Product.-->
-        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="goToProductAttributes"/>
+        <actionGroup ref="AdminOpenProductAttributePageActionGroup" stepKey="goToProductAttributes"/>
 
         <!--Create new Product Attribute as TextField, with code and default value.-->
         <actionGroup ref="CreateProductAttributeActionGroup" stepKey="createAttribute">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityDropdownWithSingleQuoteTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityDropdownWithSingleQuoteTest.xml
index e24bf0d7b1115..73c8bafba0625 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityDropdownWithSingleQuoteTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityDropdownWithSingleQuoteTest.xml
@@ -33,7 +33,7 @@
         </after>
 
         <!--Navigate to Stores > Attributes > Product.-->
-        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="goToProductAttributes"/>
+        <actionGroup ref="AdminOpenProductAttributePageActionGroup" stepKey="goToProductAttributes"/>
 
         <!--Create new Product Attribute as TextField, with code and default value.-->
         <actionGroup ref="CreateProductAttributeActionGroup" stepKey="createAttribute">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityMultiSelectTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityMultiSelectTest.xml
index 0a84d9af3c918..9952f6a4a85fe 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityMultiSelectTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityMultiSelectTest.xml
@@ -32,7 +32,7 @@
         </after>
 
         <!--Navigate to Stores > Attributes > Product.-->
-        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="goToProductAttributes"/>
+        <actionGroup ref="AdminOpenProductAttributePageActionGroup" stepKey="goToProductAttributes"/>
 
         <!--Create new Product Attribute as TextField, with code and default value.-->
         <actionGroup ref="CreateProductAttributeActionGroup" stepKey="createAttribute">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityPriceTest.xml
index 97eff20b2d560..760cd5e0e488a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityPriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityPriceTest.xml
@@ -33,7 +33,7 @@
         </after>
 
         <!--Navigate to Stores > Attributes > Product.-->
-        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="goToProductAttributes"/>
+        <actionGroup ref="AdminOpenProductAttributePageActionGroup" stepKey="goToProductAttributes"/>
 
         <!--Create new Product Attribute with Price-->
         <actionGroup ref="CreateProductAttributeActionGroup" stepKey="createAttribute">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityTextFieldTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityTextFieldTest.xml
index c0cff7b0b2bc9..ea94fc58400a6 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityTextFieldTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/CreateProductAttributeEntityTest/CreateProductAttributeEntityTextFieldTest.xml
@@ -33,7 +33,7 @@
         </after>
 
         <!--Navigate to Stores > Attributes > Product.-->
-        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="goToProductAttributes"/>
+        <actionGroup ref="AdminOpenProductAttributePageActionGroup" stepKey="goToProductAttributes"/>
 
         <!--Create new Product Attribute as TextField, with code and default value.-->
         <actionGroup ref="CreateProductAttributeWithTextFieldActionGroup" stepKey="createAttribute">
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest/AdminCreateConfigurableProductAfterGettingIncorrectSKUMessageTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest/AdminCreateConfigurableProductAfterGettingIncorrectSKUMessageTest.xml
index 274a75aedbc5f..d53cc5f34b967 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest/AdminCreateConfigurableProductAfterGettingIncorrectSKUMessageTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest/AdminCreateConfigurableProductAfterGettingIncorrectSKUMessageTest.xml
@@ -60,8 +60,7 @@
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct2"/>
         <conditionalClick selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" dependentSelector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" visible="true" stepKey="clickOnConfirmInPopup"/>
         <see userInput="You saved the product." stepKey="seeSaveConfirmation"/>
-        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="goToProductAttributes"/>
-        <waitForPageLoad stepKey="waitForProductAttributes"/>
+        <actionGroup ref="AdminOpenProductAttributePageActionGroup" stepKey="goToProductAttributes"/>
         <click selector="{{AdminProductAttributeGridSection.ResetFilter}}" stepKey="resetFiltersOnGrid1"/>
         <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="color" stepKey="fillFilter"/>
         <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="clickSearch"/>
diff --git a/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticsearchSearchInvalidValueTest.xml b/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticsearchSearchInvalidValueTest.xml
index e173090bfa318..e31ea99982dce 100644
--- a/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticsearchSearchInvalidValueTest.xml
+++ b/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticsearchSearchInvalidValueTest.xml
@@ -41,8 +41,7 @@
                 <argument name="productAttributeCode" value="{{textProductAttribute.attribute_code}}"/>
             </actionGroup>
             <actionGroup ref="AssertProductAttributeRemovedSuccessfullyActionGroup" stepKey="deleteProductAttributeSuccess"/>
-            <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
-            <waitForPageLoad stepKey="waitForAttributePageLoad"/>
+            <actionGroup ref="AdminOpenProductAttributePageActionGroup" stepKey="navigateToProductAttributeGrid"/>
             <click selector="{{AdminProductAttributeGridSection.ResetFilter}}" stepKey="resetFiltersOnGrid"/>
             <amOnPage url="{{ProductCatalogPage.url}}" stepKey="goToProductCatalog"/>
             <waitForPageLoad stepKey="waitForProductIndexPage"/>
@@ -53,7 +52,7 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!--Create new searchable product attribute-->
-        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="goToProductAttributes"/>
+        <actionGroup ref="AdminOpenProductAttributePageActionGroup" stepKey="goToProductAttributes"/>
         <actionGroup ref="AdminCreateSearchableProductAttributeActionGroup" stepKey="createAttribute">
             <argument name="attribute" value="textProductAttribute"/>
         </actionGroup>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateVisualSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateVisualSwatchTest.xml
index 1a6c0341c0704..62a3c668fcf07 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateVisualSwatchTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateVisualSwatchTest.xml
@@ -24,8 +24,7 @@
         </before>
         <after>
             <!-- Clean up our modifications to the existing color attribute -->
-            <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="goToProductAttributes"/>
-            <waitForPageLoad stepKey="waitForProductAttributes"/>
+            <actionGroup ref="AdminOpenProductAttributePageActionGroup" stepKey="goToProductAttributes"/>
             <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="color" stepKey="fillFilter"/>
             <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="clickSearch"/>
             <click selector="{{AdminProductAttributeGridSection.AttributeCode('color')}}" stepKey="clickRowToEdit"/>
@@ -39,8 +38,7 @@
         </after>
 
         <!-- Go to the edit page for the "color" attribute -->
-        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="goToProductAttributes"/>
-        <waitForPageLoad stepKey="waitForProductAttributes"/>
+        <actionGroup ref="AdminOpenProductAttributePageActionGroup" stepKey="goToProductAttributes"/>
         <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="color" stepKey="fillFilter"/>
         <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="clickSearch"/>
         <click selector="{{AdminProductAttributeGridSection.AttributeCode('color')}}" stepKey="clickRowToEdit"/>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/AdminDisablingSwatchTooltipsTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/AdminDisablingSwatchTooltipsTest.xml
index 8fd21acbd51d9..4075d89e0894f 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/AdminDisablingSwatchTooltipsTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/AdminDisablingSwatchTooltipsTest.xml
@@ -26,8 +26,7 @@
         </before>
         <after>
             <!-- Clean up our modifications to the existing color attribute -->
-            <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="goToProductAttributes"/>
-            <waitForPageLoad stepKey="waitForProductAttributes"/>
+            <actionGroup ref="AdminOpenProductAttributePageActionGroup" stepKey="goToProductAttributes"/>
             <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="color"
                        stepKey="fillFilter"/>
             <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="clickSearch"/>
@@ -48,8 +47,7 @@
         </after>
 
         <!-- Go to the edit page for the "color" attribute -->
-        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="goToProductAttributes"/>
-        <waitForPageLoad stepKey="waitForProductAttributes"/>
+        <actionGroup ref="AdminOpenProductAttributePageActionGroup" stepKey="goToProductAttributes"/>
         <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="color"
                    stepKey="fillFilter"/>
         <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="clickSearch"/>

From 0c9623a74a65fae3a2ce10abb4fecfd4b5ef144f Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Wed, 1 Jul 2020 17:45:19 +0300
Subject: [PATCH 0686/1718] add MFTF test

---
 .../Mftf/Section/AdminProductSEOSection.xml   |  1 +
 ...ateCategoryProductUrlRewriteConfigData.xml |  8 +++
 ...sabledCreatePermanentRedirectSetNoTest.xml | 53 +++++++++++++++++++
 3 files changed, 62 insertions(+)
 create mode 100644 app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminVerifyCheckboxIsDisabledCreatePermanentRedirectSetNoTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductSEOSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductSEOSection.xml
index 8685e84a347f2..f2cd9f4de3570 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductSEOSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductSEOSection.xml
@@ -12,6 +12,7 @@
         <element name="sectionHeader" type="button" selector="div[data-index='search-engine-optimization']" timeout="30"/>
         <element name="urlKeyInput" type="input" selector="input[name='product[url_key]']"/>
         <element name="useDefaultUrl" type="checkbox" selector="input[name='use_default[url_key]']"/>
+        <element name="urlKeyRedirectCheckbox" type="checkbox" selector="input[name='product[url_key_create_redirect]']"/>
         <element name="metaTitleInput" type="input" selector="input[name='product[meta_title]']"/>
         <element name="metaKeywordsInput" type="textarea" selector="textarea[name='product[meta_keyword]']"/>
         <element name="metaDescriptionInput" type="textarea" selector="textarea[name='product[meta_description]']"/>
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Data/GenerateCategoryProductUrlRewriteConfigData.xml b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Data/GenerateCategoryProductUrlRewriteConfigData.xml
index 9ce6d397a551b..b4b391326a36f 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Data/GenerateCategoryProductUrlRewriteConfigData.xml
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Data/GenerateCategoryProductUrlRewriteConfigData.xml
@@ -27,4 +27,12 @@
         <data key="path">catalog/seo/product_use_categories</data>
         <data key="value">0</data>
     </entity>
+    <entity name="EnableCreatePermanentRedirect">
+        <data key="path">catalog/seo/save_rewrites_history</data>
+        <data key="value">1</data>
+    </entity>
+    <entity name="DisableCreatePermanentRedirect">
+        <data key="path">catalog/seo/save_rewrites_history</data>
+        <data key="value">0</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminVerifyCheckboxIsDisabledCreatePermanentRedirectSetNoTest.xml b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminVerifyCheckboxIsDisabledCreatePermanentRedirectSetNoTest.xml
new file mode 100644
index 0000000000000..407bc273dfbfc
--- /dev/null
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminVerifyCheckboxIsDisabledCreatePermanentRedirectSetNoTest.xml
@@ -0,0 +1,53 @@
+<?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="AdminVerifyCheckboxIsDisabledCreatePermanentRedirectSetNoTest">
+        <annotations>
+            <features value="CatalogUrlRewrite"/>
+            <stories value="Url rewrites"/>
+            <title value="Verify checkbox is disabled 'Create Permanent Redirect' set 'No'"/>
+            <description value="Verify checkbox is disabled 'Create Permanent Redirect' set 'No' on category and product edit page."/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set {{DisableCreatePermanentRedirect.path}} {{DisableCreatePermanentRedirect.value}}" stepKey="enableCreatePermanentRedirect"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <createData entity="_defaultCategory" stepKey="createDefaultCategory"/>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createDefaultCategory"/>
+            </createData>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createDefaultCategory" stepKey="deleteDefaultCategory"/>
+            <magentoCLI command="config:set {{EnableCreatePermanentRedirect.path}} {{EnableCreatePermanentRedirect.value}}" stepKey="disableCreatePermanentRedirect"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="goToProductEditPage">
+            <argument name="productId" value="$$createSimpleProduct.id$$"/>
+        </actionGroup>
+        <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="scrollToSeoSection" x="0" y="-120" />
+        <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
+        <grabValueFrom selector="{{AdminProductSEOSection.urlKeyRedirectCheckbox}}" stepKey="grabValue"/>
+        <assertEmpty stepKey="checkUrlKeyRedirectCheckbox">
+            <actualResult type="string">$grabValue</actualResult>
+        </assertEmpty>
+
+        <actionGroup ref="NavigateToCreatedCategoryActionGroup" stepKey="openCreatedSubCategory">
+            <argument name="Category" value="$$createDefaultCategory$$"/>
+        </actionGroup>
+        <scrollTo selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="scrollToSeoSection1" x="0" y="-120" />
+        <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="openSeoSection1"/>
+        <grabValueFrom selector="{{AdminCategorySEOSection.UrlKeyRedirectCheckbox}}" stepKey="grabValue1"/>
+        <assertEmpty stepKey="checkUrlKeyRedirectCheckbox1">
+            <actualResult type="string">$grabValue1</actualResult>
+        </assertEmpty>
+    </test>
+</tests>

From 22c2be9dbccfea3fbc4ebae5a0f47626f7d41f6c Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Wed, 1 Jul 2020 16:01:45 +0100
Subject: [PATCH 0687/1718] Added mftf for product grid

---
 .../AdminProductGridUrlFilterApplierTest.xml  | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
new file mode 100644
index 0000000000000..0d0ba22a37e0b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
@@ -0,0 +1,37 @@
+<?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="AdminProductGridUrlFilterApplierTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Filter product using GET URL parameter"/>
+            <title value="Verify that filter is applied when filters parameter is set on url"/>
+            <description value="Accessing product grid url with filters parameter"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="to-be-added"/>
+            <group value="product"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <createData entity="simpleProductWithShortNameAndSku" stepKey="createSimpleProduct"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
+        </after>
+        <amOnPage url="{{AdminProductIndexPage.url}}?filters[name]=$$createSimpleProduct.name$$" stepKey="navigateToProductGridWithFilters"/>
+        <waitForPageLoad stepKey="waitForProductGrid"/>
+        <see selector="{{AdminProductGridSection.productGridNameProduct($$createSimpleProduct.name$$)}}" userInput="$$createSimpleProduct.name$$" stepKey="seeProduct"/>
+        <seeElement selector="{{AdminProductGridFilterSection.enabledFilters}}" stepKey="seeEnabledFilters"/>
+        <see selector="{{AdminProductGridFilterSection.enabledFilters}}" userInput="Name: $$createSimpleProduct.name$$" stepKey="seeProductNameFilter"/>
+        <click selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="clearFilters" />
+        <waitForPageLoad stepKey="waitForClearFilter"/>
+    </test>
+</tests>

From f272d02c80ceebd5190115f1ea0ea475e5b52468 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 1 Jul 2020 18:09:34 +0300
Subject: [PATCH 0688/1718] use action group to click save button

---
 ...nProductFormSaveButtonClickActionGroup.xml | 19 +++++++++++++++++++
 ...mProductAttributeWithDropdownFieldTest.xml |  3 +--
 ...ateProductAttributeFromProductPageTest.xml |  3 +--
 ...eProductAttributeRequiredTextFieldTest.xml |  6 ++----
 ...untryOfManufactureAttributeSKUMaskTest.xml |  3 +--
 ...alProductFillingRequiredFieldsOnlyTest.xml |  3 +--
 ...tualProductOutOfStockWithTierPriceTest.xml |  3 +--
 ...CustomOptionsSuiteAndImportOptionsTest.xml |  3 +--
 ...nCreateVirtualProductWithTierPriceTest.xml |  3 +--
 ...teVirtualProductWithoutManageStockTest.xml |  3 +--
 .../AdminMoveProductBetweenCategoriesTest.xml |  9 +++------
 ...rifyDataOverridingOnStoreViewLevelTest.xml |  3 +--
 ...rifyDataOverridingOnStoreViewLevelTest.xml |  3 +--
 ...dminUpdateSimpleProductTieredPriceTest.xml |  3 +--
 ...RegularPriceInStockDisabledProductTest.xml |  3 +--
 ...WithRegularPriceInStockEnabledFlatTest.xml |  3 +--
 ...PriceInStockNotVisibleIndividuallyTest.xml |  3 +--
 ...arPriceInStockUnassignFromCategoryTest.xml |  3 +--
 ...ceInStockVisibleInCatalogAndSearchTest.xml |  3 +--
 ...arPriceInStockVisibleInCatalogOnlyTest.xml |  3 +--
 ...larPriceInStockVisibleInSearchOnlyTest.xml |  3 +--
 ...gularPriceInStockWithCustomOptionsTest.xml |  3 +--
 ...eProductWithRegularPriceOutOfStockTest.xml |  4 ++--
 ...rPriceInStockVisibleInCategoryOnlyTest.xml |  4 ++--
 ...thCustomOptionsVisibleInSearchOnlyTest.xml |  4 ++--
 ...tOfStockVisibleInCategoryAndSearchTest.xml |  4 ++--
 ...iceOutOfStockVisibleInCategoryOnlyTest.xml |  4 ++--
 ...PriceOutOfStockVisibleInSearchOnlyTest.xml |  4 ++--
 ...eInStockVisibleInCategoryAndSearchTest.xml |  4 ++--
 ...tOfStockVisibleInCategoryAndSearchTest.xml |  4 ++--
 ...rPriceInStockVisibleInCategoryOnlyTest.xml |  4 ++--
 ...tOfStockVisibleInCategoryAndSearchTest.xml |  4 ++--
 .../Test/StorefrontPrintOrderGuestTest.xml    |  4 ++--
 33 files changed, 65 insertions(+), 70 deletions(-)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormSaveButtonClickActionGroup.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormSaveButtonClickActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormSaveButtonClickActionGroup.xml
new file mode 100644
index 0000000000000..cb481c43c5484
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormSaveButtonClickActionGroup.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="AdminProductFormSaveButtonClickActionGroup">
+        <annotations>
+            <description>Click Save button of product form.</description>
+        </annotations>
+
+        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForProductSaved"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml
index 7b2c67b205ea8..a501c0f999c40 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml
@@ -94,8 +94,7 @@
         <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
         <click selector="{{AdminCreateNewProductAttributeSection.saveAttribute}}" stepKey="clickOnSaveAttribute"/>
         <waitForPageLoad stepKey="waitForAttributeToSave"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="saveTheProduct"/>
-        <waitForPageLoad stepKey="waitForProductToSave"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="saveTheProduct"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
 
         <!--Verify product attribute added in product form -->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml
index 7fdab11d0a050..a673cfbcd833a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml
@@ -86,8 +86,7 @@
         <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
         <click selector="{{AdminCreateNewProductAttributeSection.saveAttribute}}" stepKey="clickOnSaveAttribute"/>
         <waitForPageLoad stepKey="waitForAttributeToSave"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="saveTheProduct"/>
-        <waitForPageLoad stepKey="waitForProductToSave"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="saveTheProduct"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
 
         <!--Run Re-Index task -->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeRequiredTextFieldTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeRequiredTextFieldTest.xml
index 274a560d343d8..7de0450c1bdf7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeRequiredTextFieldTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeRequiredTextFieldTest.xml
@@ -74,8 +74,7 @@
         <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
         <click selector="{{AdminCreateNewProductAttributeSection.saveAttribute}}" stepKey="clickOnSaveAttribute"/>
         <waitForPageLoad stepKey="waitForAttributeToSave"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="saveTheProduct"/>
-        <waitForPageLoad stepKey="waitForProductToSave"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="saveTheProduct"/>
 
         <!--Verify product attribute added in product form and Is Required message displayed-->
         <scrollTo selector="{{AdminProductFormSection.contentTab}}" stepKey="scrollToContentTab"/>
@@ -85,8 +84,7 @@
         <!--Fill the Required field and save the product -->
         <fillField selector="{{AdminProductFormSection.attributeRequiredInput(newProductAttribute.attribute_code)}}" userInput="attribute" stepKey="fillTheAttributeRequiredInputField"/>
         <scrollToTopOfPage stepKey="scrollToTopOfProductFormPage"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="saveTheProduct1"/>
-        <waitForPageLoad stepKey="waitForProductToSave1"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="saveTheProduct1"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml
index c378ca5b2c27a..a63a218a3adc5 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductWithCountryOfManufactureAttributeSKUMaskTest.xml
@@ -43,8 +43,7 @@
         <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.price}}" stepKey="fillSimpleProductPrice"/>
         <fillField selector="{{AdminProductFormSection.productWeight}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.weight}}" stepKey="fillSimpleProductWeight"/>
         <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{nameAndAttributeSkuMaskSimpleProduct.quantity}}" stepKey="fillSimpleProductQuantity"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForSimpleProductToSave"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
         <!-- Verify customer see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml
index 9d3a47cd115aa..1134c06831bc4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductFillingRequiredFieldsOnlyTest.xml
@@ -35,8 +35,7 @@
         <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{virtualProductWithRequiredFields.name}}" stepKey="fillProductName"/>
         <fillField selector="{{AdminProductFormSection.productSku}}" userInput="{{virtualProductWithRequiredFields.sku}}" stepKey="fillProductSku"/>
         <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{virtualProductWithRequiredFields.price}}" stepKey="fillProductPrice"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForVirtualProductSaved" />
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
 
         <!-- Verify we see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml
index 842f93b49c14a..e98b7c044bf33 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml
@@ -62,8 +62,7 @@
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductOutOfStock.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
 
         <!-- Verify we see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
index 8bb3391b5240b..78dea4eb557ab 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
@@ -112,8 +112,7 @@
         <selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(virtualProductCustomizableOption4.title,'1')}}" userInput="{{virtualProductCustomizableOption4.option_1_price_type}}" stepKey="selectOptionPriceTypeForFourthDataSetSecondRow"/>
         <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(virtualProductCustomizableOption4.title,'1')}}" userInput="{{virtualProductCustomizableOption4.option_1_sku}}" stepKey="fillOptionSkuForFourthDataSetSecondRow"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
 
         <!-- Verify we see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
index faae6a371db24..730548ff97997 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
@@ -54,8 +54,7 @@
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductBigQty.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
 
         <!-- Verify we see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml
index 3b5a8d8e753da..961a3b65faa9e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml
@@ -52,8 +52,7 @@
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductWithoutManageStock.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
 
         <!-- Verify we see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml
index 055f4e23cd9e7..d228e60de0a80 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml
@@ -78,8 +78,7 @@
         <click selector="{{AdminProductFormSection.selectCategory(SimpleSubCategory.name)}}" stepKey="selectSub1Category"/>
         <click selector="{{AdminProductFormSection.done}}" stepKey="clickDone"/>
         <waitForPageLoad stepKey="waitForApplyCategory"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSave"/>
-        <waitForPageLoad stepKey="waitForSavingChanges"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSave"/>
 
         <!-- Enable `Use Categories Path for Product URLs` on Stores -> Configuration -> Catalog -> Catalog -> Search Engine Optimization -->
         <amOnPage url="{{AdminCatalogSearchConfigurationPage.url}}" stepKey="onConfigPage"/>
@@ -109,8 +108,7 @@
         <checkOption selector="{{AdminProductFormSection.selectCategory($$createSecondCategory.name$$)}}" stepKey="selectCategory"/>
         <click selector="{{AdminProductFormSection.done}}" stepKey="pressButtonDone"/>
         <waitForPageLoad stepKey="waitForApplyCategory2"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="pushButtonSave"/>
-        <waitForPageLoad stepKey="waitForSavingProduct"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="pushButtonSave"/>
 
         <!--Product is saved -->
         <see userInput="You saved the product." selector="{{CatalogProductsSection.messageSuccessSavedProduct}}" stepKey="seeSuccessMessage"/>
@@ -181,8 +179,7 @@
         <click selector="{{AdminProductFormSection.selectCategory({$grabNameSubCategory})}}" stepKey="selectSubCategory"/>
         <click selector="{{AdminProductFormSection.done}}" stepKey="clickButtonDone"/>
         <waitForPageLoad stepKey="waitForCategoryApply"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickButtonSave"/>
-        <waitForPageLoad stepKey="waitForSaveChanges"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickButtonSave"/>
 
         <!-- Product is saved successfully -->
         <see userInput="You saved the product." selector="{{CatalogProductsSection.messageSuccessSavedProduct}}" stepKey="seeSaveMessage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductNameToVerifyDataOverridingOnStoreViewLevelTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductNameToVerifyDataOverridingOnStoreViewLevelTest.xml
index 6edffb923d540..ae0afef98d567 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductNameToVerifyDataOverridingOnStoreViewLevelTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductNameToVerifyDataOverridingOnStoreViewLevelTest.xml
@@ -64,8 +64,7 @@
 
         <!-- Update default simple product with name -->
         <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{simpleProductDataOverriding.name}}" stepKey="fillSimpleProductName"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForSimpleProductSave"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickButtonSave"/>
 
         <!-- Verify customer see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductPriceToVerifyDataOverridingOnStoreViewLevelTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductPriceToVerifyDataOverridingOnStoreViewLevelTest.xml
index e954de90ef542..023588b7ef5ce 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductPriceToVerifyDataOverridingOnStoreViewLevelTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductPriceToVerifyDataOverridingOnStoreViewLevelTest.xml
@@ -62,8 +62,7 @@
 
         <!-- Update default simple product with price -->
         <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{simpleProductDataOverriding.price}}" stepKey="fillSimpleProductPrice"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForSimpleProductSave"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickButtonSave"/>
 
         <!-- Verify customer see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml
index f5b0fb8054dc1..abd941c929fae 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml
@@ -78,8 +78,7 @@
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductTierPrice300InStock.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForSimpleProductSave"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
 
         <!-- Verify customer see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockDisabledProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockDisabledProductTest.xml
index d20594461173b..c68a987441897 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockDisabledProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockDisabledProductTest.xml
@@ -53,8 +53,7 @@
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductDisabled.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
         <click selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="clickEnableProductLabelToDisableProduct"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForSimpleProductSave"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
 
         <!-- Verify customer see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest.xml
index 5fa7acbeb8de9..d3f8ef2aa306d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest.xml
@@ -72,8 +72,7 @@
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductEnabledFlat.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForSimpleProductSave"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
 
         <!-- Verify customer see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockNotVisibleIndividuallyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockNotVisibleIndividuallyTest.xml
index 4b21d1337e9b7..ab4556ff6ed60 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockNotVisibleIndividuallyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockNotVisibleIndividuallyTest.xml
@@ -63,8 +63,7 @@
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductNotVisibleIndividually.urlKey}}" stepKey="fillSimpleProductUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForSimpleProductSave"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
 
         <!-- Verify customer see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockUnassignFromCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockUnassignFromCategoryTest.xml
index 4256f93ea41d1..2848e25bb9309 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockUnassignFromCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockUnassignFromCategoryTest.xml
@@ -48,8 +48,7 @@
         <click selector="{{AdminProductFormSection.unselectCategories($$initialCategoryEntity.name$$)}}" stepKey="unselectCategories"/>
         <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategory"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForSimpleProductSave"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
 
         <!-- Verify customer see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml
index 58db163bed720..a709de5245879 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml
@@ -63,8 +63,7 @@
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductRegularPrice245InStock.urlKey}}" stepKey="fillSimpleProductUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForSimpleProductSave"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
 
         <!-- Verify customer see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml
index 5e9a48f659d6b..fec519d48c236 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml
@@ -63,8 +63,7 @@
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductRegularPrice32501InStock.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForSimpleProductSave"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
 
         <!-- Verify customer see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInSearchOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInSearchOnlyTest.xml
index 3d37b54dfa439..6cd502c14697e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInSearchOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInSearchOnlyTest.xml
@@ -63,8 +63,7 @@
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductRegularPrice325InStock.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForSimpleProductSave"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
 
         <!-- Verify customer see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml
index 855a2b1d9b0cc..ab4d5420f1da7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml
@@ -76,8 +76,7 @@
         <selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(simpleProductCustomizableOption.title,'0')}}" userInput="{{simpleProductCustomizableOption.option_0_price_type}}" stepKey="selectOptionPriceType"/>
         <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(simpleProductCustomizableOption.title,'0')}}" userInput="{{simpleProductCustomizableOption.option_0_sku}}" stepKey="fillOptionSku"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForSimpleProductSave"/>
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
 
         <!--Verify customer see success message-->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceOutOfStockTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceOutOfStockTest.xml
index af836efcf6be6..1c8fddacf9bdb 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceOutOfStockTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceOutOfStockTest.xml
@@ -62,8 +62,8 @@
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductRegularPrice32503OutOfStock.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForSimpleProductSave"/>
+
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
 
         <!-- Verify customer see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertSimpleProductSaveSuccessMessage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
index 595f9bcd489ec..288647047648e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
@@ -75,8 +75,8 @@
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPrice.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
         <!-- Verify we see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
index 458d02d61426d..6cde166ab42a2 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
@@ -120,8 +120,8 @@
         <selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType(virtualProductCustomizableOption4.title,'1')}}" userInput="{{virtualProductCustomizableOption4.option_1_price_type}}" stepKey="selectOptionPriceTypeForFourthDataSetSecondRow"/>
         <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueSku(virtualProductCustomizableOption4.title,'1')}}" userInput="{{virtualProductCustomizableOption4.option_1_sku}}" stepKey="fillOptionSkuForFourthDataSetSecondRow"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
         <!-- Verify we see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml
index 6d6ff0b3b1b89..b5f84caebdb26 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml
@@ -56,8 +56,8 @@
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
         <!-- Verify we see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
index d5ae971d87695..92841d35c7b62 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
@@ -64,8 +64,8 @@
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
         <!-- Verify we see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml
index 314df67d43d00..b14f65cf7ce4f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml
@@ -54,8 +54,8 @@
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
         <!-- Verify we see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml
index d0f4fc8882e3f..c1957a10b7e36 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml
@@ -70,8 +70,8 @@
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductSpecialPrice.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
         <!-- Verify we see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml
index 2234d6f338b62..81c7e46fa2c74 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml
@@ -69,8 +69,8 @@
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
         <!-- Verify we see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
index 8f0861fe33371..fef950de97385 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
@@ -75,8 +75,8 @@
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductWithTierPriceInStock.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
         <!-- Verify we see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
index f7f5385381590..0976fd47be136 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
@@ -75,8 +75,8 @@
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualTierPriceOutOfStock.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
-        <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForVirtualProductSaved"/>
+
+        <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSaveButton"/>
         <!-- Verify we see success message -->
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSaveSuccessMessage"/>
 
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontPrintOrderGuestTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontPrintOrderGuestTest.xml
index 00117c56de439..bd4f35212d2d1 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontPrintOrderGuestTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontPrintOrderGuestTest.xml
@@ -44,8 +44,8 @@
             <checkOption selector="{{AdminProductDownloadableSection.isLinksPurchasedSeparately}}" stepKey="checkOption"/>
             <waitForAjaxLoad stepKey="waitForAjaxLoad"/>
             <grabValueFrom selector="{{AdminProductDownloadableSection.addLinkTitleInput('0')}}" stepKey="grabLink"/>
-            <click selector="{{AdminProductFormSection.save}}" stepKey="clickSave"/>
-            <waitForLoadingMaskToDisappear stepKey="waitForSave"/>
+
+            <actionGroup ref="AdminProductFormSaveButtonClickActionGroup" stepKey="clickSave"/>
 
             <!-- Create configurable Product -->
             <createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">

From 58158aafc3614d5d918fcd3382b35702eaeefaa3 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Wed, 1 Jul 2020 16:25:59 +0100
Subject: [PATCH 0689/1718] Added cms page mftf tests

---
 .../AdminProductGridUrlFilterApplierTest.xml  |  2 +-
 .../Section/CmsPagesPageActionsSection.xml    |  2 +
 .../AdminCmsPageGridUrlFilterApplierTest.xml  | 37 +++++++++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
index 0d0ba22a37e0b..605457f5d7575 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
@@ -12,7 +12,7 @@
         <annotations>
             <features value="Catalog"/>
             <stories value="Filter product using GET URL parameter"/>
-            <title value="Verify that filter is applied when filters parameter is set on url"/>
+            <title value="Verify that filter is applied on product grid when filters parameter is set on url"/>
             <description value="Accessing product grid url with filters parameter"/>
             <severity value="MAJOR"/>
             <testCaseId value="to-be-added"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml
index ebf024490cce6..0d618cf82ce6d 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml
@@ -19,6 +19,7 @@
         <element name="edit" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='Edit']" parameterized="true"/>
         <element name="preview" type="button" selector="//div[text()='{{var1}}']/parent::td//following-sibling::td[@class='data-grid-actions-cell']//a[text()='View']" parameterized="true"/>
         <element name="clearAllButton" type="button" selector="//div[@class='admin__data-grid-header']//button[contains(text(), 'Clear all')]"/>
+        <element name="clearFilters" type="button" selector=".admin__data-grid-header button[data-action='grid-filter-reset']" timeout="30"/>
         <element name="activeFilters" type="button" selector="//div[@class='admin__data-grid-header']//span[contains(text(), 'Active filters:')]" />
         <element name="spinner" type="input" selector='//div[@data-component="cms_page_listing.cms_page_listing.cms_page_columns"]'/>
         <element name="firstItemSelectButton" type="button" selector=".data-grid .action-select-wrap button.action-select"/>
@@ -31,5 +32,6 @@
         <element name="massActionsButton" type="button" selector="//div[@class='admin__data-grid-header'][(not(ancestor::*[@class='sticky-header']) and not(contains(@style,'visibility: hidden'))) or (ancestor::*[@class='sticky-header' and not(contains(@style,'display: none'))])]//button[contains(@class, 'action-select')]" />
         <element name="massActionsOption" type="button" selector="//div[@class='admin__data-grid-header'][(not(ancestor::*[@class='sticky-header']) and not(contains(@style,'visibility: hidden'))) or (ancestor::*[@class='sticky-header' and not(contains(@style,'display: none'))])]//span[contains(@class, 'action-menu-item') and .= '{{action}}']" parameterized="true"/>
         <element name="gridDataRow" type="input" selector=".data-row .data-grid-cell-content"/>
+        <element name="pagesGridRowByTitle" type="input" selector="//tbody//tr//td//div[contains(., '{{var1}}')]" parameterized="true" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml
new file mode 100644
index 0000000000000..0cfae38123e90
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml
@@ -0,0 +1,37 @@
+<?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="AdminCmsPageGridUrlFilterApplierTest">
+        <annotations>
+            <features value="CmsPage"/>
+            <stories value="Filter CMS page using GET URL parameter"/>
+            <title value="Verify that filter is applied on page grid when filters parameter is set on url"/>
+            <description value="Accessing page grid url with filters parameter"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="to-be-added"/>
+            <group value="Cms"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <createData entity="_defaultCmsPage" stepKey="createPage"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createPage" stepKey="deletePage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
+        </after>
+        <amOnPage url="{{CmsPagesPage.url}}?filters[title]=$$createPage.title$$" stepKey="navigateToPageGridWithFilters"/>
+        <waitForPageLoad stepKey="waitForPageGrid"/>
+        <see selector="{{CmsPagesPageActionsSection.pagesGridRowByTitle($$createPage.title$$)}}" userInput="$$createPage.title$$" stepKey="seePage"/>
+        <seeElement selector="{{CmsPagesPageActionsSection.activeFilter}}" stepKey="seeEnabledFilters"/>
+        <see selector="{{CmsPagesPageActionsSection.activeFilter}}" userInput="Title: $$createPage.title$$" stepKey="seePageTitleFilter"/>
+        <click selector="{{CmsPagesPageActionsSection.clearFilters}}" stepKey="clearFilters" />
+        <waitForPageLoad stepKey="waitForClearFilter"/>
+    </test>
+</tests>

From 1467c6ef93b6dab35210429090657d840a8ed4bf Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Wed, 1 Jul 2020 16:32:35 +0100
Subject: [PATCH 0690/1718] Added mftf block test

---
 .../Mftf/Section/BlockPageActionsSection.xml  |  3 ++
 .../AdminCmsBlockGridUrlFilterApplierTest.xml | 37 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 app/code/Magento/Cms/Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml

diff --git a/app/code/Magento/Cms/Test/Mftf/Section/BlockPageActionsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/BlockPageActionsSection.xml
index d487517269c01..4f69801e4b648 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/BlockPageActionsSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/BlockPageActionsSection.xml
@@ -15,8 +15,11 @@
         <element name="idColumn" type="button" selector="//div[contains(@data-role, 'grid-wrapper')]/table/thead/tr/th/span[contains(text(), 'ID')]"/>
         <element name="clearAll" type="button" selector="//div[@class='admin__data-grid-header']//button[contains(text(), 'Clear all')]"/>
         <element name="activeFilters" type="button" selector="//div[@class='admin__data-grid-header']//span[contains(text(), 'Active filters:')]" />
+        <element name="activeFilterDiv" type="button" selector="(//div[contains(@class, 'admin__data-grid-filters-current') and contains(@class, '_show')])[1]"/>
         <element name="FilterBtn" type="input" selector="//button[text()='Filters']"/>
         <element name="URLKey" type="input" selector="//div[@class='admin__form-field-control']/input[@name='identifier']"/>
         <element name="ApplyFiltersBtn" type="button" selector="//span[text()='Apply Filters']"/>
+        <element name="blockGridRowByTitle" type="input" selector="//tbody//tr//td//div[contains(., '{{var1}}')]" parameterized="true" timeout="30"/>
+        <element name="clearFilters" type="button" selector=".admin__data-grid-header button[data-action='grid-filter-reset']" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml
new file mode 100644
index 0000000000000..2af33312ef18d
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml
@@ -0,0 +1,37 @@
+<?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="AdminCmsBlockGridUrlFilterApplierTest">
+        <annotations>
+            <features value="Cms"/>
+            <stories value="Filter CMS block using GET URL parameter"/>
+            <title value="Verify that filter is applied on block grid when filters parameter is set on url"/>
+            <description value="Accessing block grid url with filters parameter"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="to-be-added"/>
+            <group value="Cms"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <createData entity="Sales25offBlock" stepKey="createBlock"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createBlock" stepKey="deletePage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
+        </after>
+        <amOnPage url="{{CmsBlocksPage.url}}?filters[title]=$$createBlock.title$$" stepKey="navigateToBlockGridWithFilters"/>
+        <waitForPageLoad stepKey="waitForBlockGrid"/>
+        <see selector="{{BlockPageActionsSection.blockGridRowByTitle($$createBlock.title$$)}}" userInput="$$createBlock.title$$" stepKey="seeBlock"/>
+        <seeElement selector="{{BlockPageActionsSection.activeFilterDiv}}" stepKey="seeEnabledFilters"/>
+        <see selector="{{BlockPageActionsSection.activeFilterDiv}}" userInput="Title: $$createBlock.title$$" stepKey="seeBlockTitleFilter"/>
+        <click selector="{{BlockPageActionsSection.clearFilters}}" stepKey="clearFilters" />
+        <waitForPageLoad stepKey="waitForClearFilter"/>
+    </test>
+</tests>

From 273607c41173302aadfea916569e404c1abe73ba Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Wed, 1 Jul 2020 17:21:11 +0100
Subject: [PATCH 0691/1718] Using existing action group

---
 .../Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml    | 3 +--
 .../Magento/Cms/Test/Mftf/Section/BlockPageActionsSection.xml  | 1 -
 .../Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml   | 3 +--
 .../Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml    | 3 +--
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
index 605457f5d7575..f912060a4ba48 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
@@ -31,7 +31,6 @@
         <see selector="{{AdminProductGridSection.productGridNameProduct($$createSimpleProduct.name$$)}}" userInput="$$createSimpleProduct.name$$" stepKey="seeProduct"/>
         <seeElement selector="{{AdminProductGridFilterSection.enabledFilters}}" stepKey="seeEnabledFilters"/>
         <see selector="{{AdminProductGridFilterSection.enabledFilters}}" userInput="Name: $$createSimpleProduct.name$$" stepKey="seeProductNameFilter"/>
-        <click selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="clearFilters" />
-        <waitForPageLoad stepKey="waitForClearFilter"/>
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilter"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/BlockPageActionsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/BlockPageActionsSection.xml
index 4f69801e4b648..ac9c66fe82c74 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/BlockPageActionsSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/BlockPageActionsSection.xml
@@ -20,6 +20,5 @@
         <element name="URLKey" type="input" selector="//div[@class='admin__form-field-control']/input[@name='identifier']"/>
         <element name="ApplyFiltersBtn" type="button" selector="//span[text()='Apply Filters']"/>
         <element name="blockGridRowByTitle" type="input" selector="//tbody//tr//td//div[contains(., '{{var1}}')]" parameterized="true" timeout="30"/>
-        <element name="clearFilters" type="button" selector=".admin__data-grid-header button[data-action='grid-filter-reset']" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml
index 2af33312ef18d..10e9781134c31 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml
@@ -31,7 +31,6 @@
         <see selector="{{BlockPageActionsSection.blockGridRowByTitle($$createBlock.title$$)}}" userInput="$$createBlock.title$$" stepKey="seeBlock"/>
         <seeElement selector="{{BlockPageActionsSection.activeFilterDiv}}" stepKey="seeEnabledFilters"/>
         <see selector="{{BlockPageActionsSection.activeFilterDiv}}" userInput="Title: $$createBlock.title$$" stepKey="seeBlockTitleFilter"/>
-        <click selector="{{BlockPageActionsSection.clearFilters}}" stepKey="clearFilters" />
-        <waitForPageLoad stepKey="waitForClearFilter"/>
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilter"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml
index 0cfae38123e90..2063b402266f9 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml
@@ -31,7 +31,6 @@
         <see selector="{{CmsPagesPageActionsSection.pagesGridRowByTitle($$createPage.title$$)}}" userInput="$$createPage.title$$" stepKey="seePage"/>
         <seeElement selector="{{CmsPagesPageActionsSection.activeFilter}}" stepKey="seeEnabledFilters"/>
         <see selector="{{CmsPagesPageActionsSection.activeFilter}}" userInput="Title: $$createPage.title$$" stepKey="seePageTitleFilter"/>
-        <click selector="{{CmsPagesPageActionsSection.clearFilters}}" stepKey="clearFilters" />
-        <waitForPageLoad stepKey="waitForClearFilter"/>
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilter"/>
     </test>
 </tests>

From 8660c73416c732b9772eb0b4aedb293ab088015d Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Thu, 2 Jul 2020 10:19:09 +0100
Subject: [PATCH 0692/1718] Fixed static tests

---
 .../Ui/view/base/web/js/grid/url-filter-applier.js | 14 ++++++++------
 .../Ui/base/js/grid/url-filter-applier.test.js     |  4 +++-
 2 files changed, 11 insertions(+), 7 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 f9f6e9d7a73de..a33f2c30e21fc 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,7 +5,7 @@
 
 define([
     'uiComponent',
-    'underscore',
+    'underscore'
 ], function (Component, _) {
     'use strict';
 
@@ -15,7 +15,7 @@ define([
             filterKey: 'filters',
             searchString: location.search,
             modules: {
-                filterComponent: '${ $.filterProvider }',
+                filterComponent: '${ $.filterProvider }'
             }
         },
 
@@ -38,12 +38,14 @@ define([
             var urlFilter = this.getFilterParam(this.searchString);
 
             if (_.isUndefined(this.filterComponent())) {
-                setTimeout(function () {this.apply()}.bind(this), 100);
+                setTimeout(function () {
+                    this.apply();
+                }.bind(this), 100);
             } else {
                 if (Object.keys(urlFilter).length) {
-                     this.filterComponent().setData(urlFilter, false);
-                     this.filterComponent().apply();
-                 }
+                    this.filterComponent().setData(urlFilter, false);
+                    this.filterComponent().apply();
+                }
             }
         },
 
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 03bf5300e8ded..fb37c73abdd41 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
@@ -25,7 +25,9 @@ define([
             it('return object from url with a simple filters parameter', function () {
                 var urlSearch = '?filters[name]=test';
 
-                expect(urlFilterApplierObj.getFilterParam(urlSearch)).toEqual({'name': 'test'});
+                expect(urlFilterApplierObj.getFilterParam(urlSearch)).toEqual({
+                    'name': 'test'
+                });
             });
             it('return object from url with multiple filters parameter', function () {
                 var urlSearch = '?filters[name]=test&filters[qty]=1';

From a8c3f67a063244dacd8f289bfb7295c6149294d7 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Thu, 2 Jul 2020 10:29:53 +0100
Subject: [PATCH 0693/1718] Fixed static tests

---
 .../base/web/js/grid/url-filter-applier.js     | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 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 a33f2c30e21fc..62e5b292615f9 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
@@ -41,11 +41,12 @@ define([
                 setTimeout(function () {
                     this.apply();
                 }.bind(this), 100);
-            } else {
-                if (Object.keys(urlFilter).length) {
-                    this.filterComponent().setData(urlFilter, false);
-                    this.filterComponent().apply();
-                }
+
+                return;
+            }
+            if (Object.keys(urlFilter).length) {
+                this.filterComponent().setData(urlFilter, false);
+                this.filterComponent().apply();
             }
         },
 
@@ -55,17 +56,18 @@ define([
          * @returns {Object}
          */
         getFilterParam: function (url) {
-            var searchString = decodeURI(url);
+            var searchString = decodeURI(url),
+                itemArray;
 
             return _.chain(searchString.slice(1).split('&'))
                 .map(function (item) {
                     if (item && item.search(this.filterKey) !== -1) {
-                        var itemArray = item.split('=');
+                        itemArray = item.split('=');
 
                         itemArray[0] = itemArray[0].replace(this.filterKey, '')
                                 .replace(/[\[\]]/g, '');
 
-                        return itemArray
+                        return itemArray;
                     }
                 }.bind(this))
                 .compact()

From 420c7f5e83fed1dca92f59a67b657a03698dd8ce Mon Sep 17 00:00:00 2001
From: Viktor Sevch <viktor.sevch@transoftgroup.com>
Date: Thu, 2 Jul 2020 12:42:35 +0300
Subject: [PATCH 0694/1718] MC-35582: [Cloud] Backend not loading after
 authorization for 2.4.0-beta1

---
 .../view/adminhtml/templates/notification.phtml               | 4 ++--
 .../Backend/view/adminhtml/templates/widget/grid.phtml        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/AdminAnalytics/view/adminhtml/templates/notification.phtml b/app/code/Magento/AdminAnalytics/view/adminhtml/templates/notification.phtml
index a8fdb2e04ef31..718d63dcd5b80 100644
--- a/app/code/Magento/AdminAnalytics/view/adminhtml/templates/notification.phtml
+++ b/app/code/Magento/AdminAnalytics/view/adminhtml/templates/notification.phtml
@@ -11,14 +11,14 @@
 <?php
 $isAnaliticsVisible = $block->getNotification()->isAnalyticsVisible() ? 1 : 0;
 $isReleaseVisible = $block->getNotification()->isReleaseVisible() ? 1 : 0;
-$scriptString = <<<script
+$scriptString = "
     define('analyticsPopupConfig', function () {
         return {
             analyticsVisible: {$isAnaliticsVisible},
             releaseVisible: {$isReleaseVisible},
         }
     });
-script
+";
 ?>
 
 <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
index 667622fb2254b..9034b045f3edf 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
@@ -189,7 +189,7 @@ $numColumns = $block->getColumns() !== null ? count($block->getColumns()): 0;
 
         $scriptString .= '
 require(deps, function('. ($block->getDependencyJsObject() ? 'registry' : '') .'){' . PHP_EOL .'
-        //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed' . PHP_EOL;
+        /* TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed */' . PHP_EOL;
         if ($block->getDependencyJsObject()) {
             $scriptString .= 'registry.get(\'' . $block->escapeJs($block->getDependencyJsObject()) .
                 '\', function ('. $block->escapeJs($block->getDependencyJsObject()) . ') {' . PHP_EOL;

From b9de9adf3b9f241e57af307e40a6661e53455315 Mon Sep 17 00:00:00 2001
From: Stas Kozar <stas.kozar@transoftgroup.com>
Date: Thu, 2 Jul 2020 13:37:48 +0300
Subject: [PATCH 0695/1718] =?UTF-8?q?MC-35370:=20Unexpected=20scrolling=20?=
 =?UTF-8?q?of=20the=20=E2=80=9CCreate=20New=20Order=E2=80=9D=20page?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/web/mage/validation.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/web/mage/validation.js b/lib/web/mage/validation.js
index 2480f3be080c4..de40e3afa40ab 100644
--- a/lib/web/mage/validation.js
+++ b/lib/web/mage/validation.js
@@ -1971,9 +1971,8 @@ define([
             }
 
             if (firstActive.length) {
-                parent = firstActive.parent();
                 $('html, body').stop().animate({
-                    scrollTop: parent.offset().top - windowHeight / 2
+                    scrollTop: firstActive.parent().offset().top - windowHeight / 2
                 });
                 firstActive.focus();
             }

From d8afb0e8b8721bdaa4e17238de1e8ff604c2cfe0 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Thu, 2 Jul 2020 14:16:27 +0300
Subject: [PATCH 0696/1718] cover by unit test, fix failed unit tests

---
 .../Unit/Model/Order/Payment/InfoTest.php     | 191 +++++++++++++-----
 .../Test/Unit/Model/Order/PaymentTest.php     |  32 +--
 2 files changed, 156 insertions(+), 67 deletions(-)

diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/InfoTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/InfoTest.php
index 3b3a2f2816118..d5f0525ae9bbe 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/InfoTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Payment/InfoTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 declare(strict_types=1);
 
 namespace Magento\Sales\Test\Unit\Model\Order\Payment;
@@ -12,72 +13,90 @@
 use Magento\Framework\Registry;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Payment\Helper\Data;
-use Magento\Payment\Model\Method;
 use Magento\Payment\Model\Method\Substitution;
 use Magento\Payment\Model\MethodInterface;
+use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Model\Order\Payment\Info;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Magento\Framework\Exception\LocalizedException;
 
+/**
+ * Test for \Magento\Sales\Model\Order\Payment\Info.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class InfoTest extends TestCase
 {
-    /** @var \Magento\Sales\Model\Order\Payment\Info */
-    protected $info;
-
-    /** @var ObjectManagerHelper */
-    protected $objectManagerHelper;
-
-    /** @var Context|MockObject */
-    protected $contextMock;
+    /**
+     * @var Info
+     */
+    private $info;
 
-    /** @var Registry|MockObject */
-    protected $registryMock;
+    /**
+     * @var Data|MockObject
+     */
+    private $paymentHelperMock;
 
-    /** @var Data|MockObject */
-    protected $paymentHelperMock;
+    /**
+     * @var EncryptorInterface|MockObject
+     */
+    private $encryptorInterfaceMock;
 
-    /** @var EncryptorInterface|MockObject */
-    protected $encryptorInterfaceMock;
+    /**
+     * @var Data|MockObject
+     */
+    private $methodInstanceMock;
 
-    /** @var Data|MockObject */
-    protected $methodInstanceMock;
+    /**
+     * @var OrderInterface|MockObject
+     */
+    private $orderMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp(): void
     {
-        $this->contextMock = $this->createMock(Context::class);
-        $this->registryMock = $this->createMock(Registry::class);
+        $contextMock = $this->createMock(Context::class);
+        $registryMock = $this->createMock(Registry::class);
         $this->paymentHelperMock = $this->createPartialMock(Data::class, ['getMethodInstance']);
         $this->encryptorInterfaceMock = $this->getMockForAbstractClass(EncryptorInterface::class);
-        $this->methodInstanceMock = $this->getMockBuilder(MethodInterface::class)
-            ->getMockForAbstractClass();
+        $this->methodInstanceMock = $this->getMockForAbstractClass(MethodInterface::class);
+        $this->orderMock = $this->createMock(OrderInterface::class);
 
-        $this->objectManagerHelper = new ObjectManagerHelper($this);
-        $this->info = $this->objectManagerHelper->getObject(
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->info = $objectManagerHelper->getObject(
             Info::class,
             [
-                'context' => $this->contextMock,
-                'registry' => $this->registryMock,
+                'context' => $contextMock,
+                'registry' => $registryMock,
                 'paymentData' => $this->paymentHelperMock,
                 'encryptor' => $this->encryptorInterfaceMock
             ]
         );
+        $this->info->setData('order', $this->orderMock);
     }
 
     /**
+     * Get data cc number
+     *
      * @dataProvider ccKeysDataProvider
      * @param string $keyCc
      * @param string $keyCcEnc
+     * @return void
      */
-    public function testGetDataCcNumber($keyCc, $keyCcEnc)
+    public function testGetDataCcNumber($keyCc, $keyCcEnc): void
     {
         // no data was set
         $this->assertNull($this->info->getData($keyCc));
 
         // we set encrypted data
         $this->info->setData($keyCcEnc, $keyCcEnc);
-        $this->encryptorInterfaceMock->expects($this->once())->method('decrypt')->with($keyCcEnc)->willReturn(
-            $keyCc
-        );
+        $this->encryptorInterfaceMock->expects($this->once())
+            ->method('decrypt')
+            ->with($keyCcEnc)
+            ->willReturn($keyCc);
+
         $this->assertEquals($keyCc, $this->info->getData($keyCc));
     }
 
@@ -86,7 +105,7 @@ public function testGetDataCcNumber($keyCc, $keyCcEnc)
      *
      * @return array
      */
-    public function ccKeysDataProvider()
+    public function ccKeysDataProvider(): array
     {
         return [
             ['cc_number', 'cc_number_enc'],
@@ -94,14 +113,26 @@ public function ccKeysDataProvider()
         ];
     }
 
-    public function testGetMethodInstanceWithRealMethod()
+    /**
+     * Get method instance with real method
+     *
+     * @return void
+     */
+    public function testGetMethodInstanceWithRealMethod(): void
     {
+        $storeId = 2;
         $method = 'real_method';
         $this->info->setData('method', $method);
 
+        $this->orderMock->expects($this->once())
+            ->method('getStoreId')
+            ->willReturn($storeId);
         $this->methodInstanceMock->expects($this->once())
             ->method('setInfoInstance')
             ->with($this->info);
+        $this->methodInstanceMock->expects($this->once())
+            ->method('setStore')
+            ->with($storeId);
 
         $this->paymentHelperMock->expects($this->once())
             ->method('getMethodInstance')
@@ -111,7 +142,12 @@ public function testGetMethodInstanceWithRealMethod()
         $this->info->getMethodInstance();
     }
 
-    public function testGetMethodInstanceWithUnrealMethod()
+    /**
+     * Get method instance with unreal method
+     *
+     * @return void
+     */
+    public function testGetMethodInstanceWithUnrealMethod(): void
     {
         $method = 'unreal_method';
         $this->info->setData('method', $method);
@@ -133,15 +169,26 @@ public function testGetMethodInstanceWithUnrealMethod()
         $this->info->getMethodInstance();
     }
 
-    public function testGetMethodInstanceWithNoMethod()
+    /**
+     * Get method instance withot method
+     *
+     * @return void
+     */
+    public function testGetMethodInstanceWithNoMethod(): void
     {
-        $this->expectException('Magento\Framework\Exception\LocalizedException');
+        $this->expectException(LocalizedException::class);
         $this->expectExceptionMessage('The payment method you requested is not available.');
+
         $this->info->setData('method', false);
         $this->info->getMethodInstance();
     }
 
-    public function testGetMethodInstanceRequestedMethod()
+    /**
+     * Get method instance requested method
+     *
+     * @return void
+     */
+    public function testGetMethodInstanceRequestedMethod(): void
     {
         $code = 'real_method';
         $this->info->setData('method', $code);
@@ -160,40 +207,62 @@ public function testGetMethodInstanceRequestedMethod()
         $this->assertSame($this->methodInstanceMock, $this->info->getMethodInstance());
     }
 
-    public function testEncrypt()
+    /**
+     * Encrypt test
+     *
+     * @return void
+     */
+    public function testEncrypt(): void
     {
         $data = 'data';
         $encryptedData = 'd1a2t3a4';
 
-        $this->encryptorInterfaceMock->expects($this->once())->method('encrypt')->with($data)->willReturn(
-            $encryptedData
-        );
+        $this->encryptorInterfaceMock->expects($this->once())
+            ->method('encrypt')
+            ->with($data)
+            ->willReturn($encryptedData);
+
         $this->assertEquals($encryptedData, $this->info->encrypt($data));
     }
 
-    public function testDecrypt()
+    /**
+     * Decrypt test
+     *
+     * @return void
+     */
+    public function testDecrypt(): void
     {
         $data = 'data';
         $encryptedData = 'd1a2t3a4';
 
-        $this->encryptorInterfaceMock->expects($this->once())->method('decrypt')->with($encryptedData)->willReturn(
-            $data
-        );
+        $this->encryptorInterfaceMock->expects($this->once())
+            ->method('decrypt')
+            ->with($encryptedData)
+            ->willReturn($data);
+
         $this->assertEquals($data, $this->info->decrypt($encryptedData));
     }
 
-    public function testSetAdditionalInformationException()
+    /**
+     * Set additional information exception
+     *
+     * @return void
+     */
+    public function testSetAdditionalInformationException(): void
     {
-        $this->expectException('Magento\Framework\Exception\LocalizedException');
+        $this->expectException(LocalizedException::class);
         $this->info->setAdditionalInformation('object', new \stdClass());
     }
 
     /**
+     * Set additional info multiple types
+     *
      * @dataProvider additionalInformationDataProvider
      * @param mixed $key
      * @param mixed $value
+     * @return void
      */
-    public function testSetAdditionalInformationMultipleTypes($key, $value = null)
+    public function testSetAdditionalInformationMultipleTypes($key, $value = null): void
     {
         $this->info->setAdditionalInformation($key, $value);
         $this->assertEquals($value ? [$key => $value] : $key, $this->info->getAdditionalInformation());
@@ -204,7 +273,7 @@ public function testSetAdditionalInformationMultipleTypes($key, $value = null)
      *
      * @return array
      */
-    public function additionalInformationDataProvider()
+    public function additionalInformationDataProvider(): array
     {
         return [
             [['key1' => 'data1', 'key2' => 'data2'], null],
@@ -212,7 +281,12 @@ public function additionalInformationDataProvider()
         ];
     }
 
-    public function testGetAdditionalInformationByKey()
+    /**
+     * Get additional info by key
+     *
+     * @return void
+     */
+    public function testGetAdditionalInformationByKey(): void
     {
         $key = 'key';
         $value = 'value';
@@ -220,7 +294,12 @@ public function testGetAdditionalInformationByKey()
         $this->assertEquals($value, $this->info->getAdditionalInformation($key));
     }
 
-    public function testUnsAdditionalInformation()
+    /**
+     * Unsetter additional info
+     *
+     * @return void
+     */
+    public function testUnsAdditionalInformation(): void
     {
         // set array to additional
         $data = ['key1' => 'data1', 'key2' => 'data2'];
@@ -236,7 +315,12 @@ public function testUnsAdditionalInformation()
         $this->assertEmpty($this->info->unsAdditionalInformation()->getAdditionalInformation());
     }
 
-    public function testHasAdditionalInformation()
+    /**
+     * Has additional info
+     *
+     * @return void
+     */
+    public function testHasAdditionalInformation(): void
     {
         $this->assertFalse($this->info->hasAdditionalInformation());
 
@@ -248,7 +332,12 @@ public function testHasAdditionalInformation()
         $this->assertTrue($this->info->hasAdditionalInformation());
     }
 
-    public function testInitAdditionalInformationWithUnserialize()
+    /**
+     * Init additional info with unserialize
+     *
+     * @return void
+     */
+    public function testInitAdditionalInformationWithUnserialize(): void
     {
         $data = ['key1' => 'data1', 'key2' => 'data2'];
         $this->info->setData('additional_information', $data);
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/PaymentTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/PaymentTest.php
index a64ad8c53bcf8..91a269300a7fc 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/PaymentTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/PaymentTest.php
@@ -637,7 +637,7 @@ public function testAcceptApprovePaymentTrue()
             ->method('getMethodInstance')
             ->willReturn($this->paymentMethod);
 
-        $this->paymentMethod->expects($this->once())
+        $this->paymentMethod->expects($this->exactly(2))
             ->method('setStore')->willReturnSelf();
 
         $this->paymentMethod->expects($this->once())
@@ -690,7 +690,7 @@ public function testAcceptApprovePaymentFalse($isFraudDetected, $status)
             ->method('getMethodInstance')
             ->willReturn($this->paymentMethod);
 
-        $this->paymentMethod->expects($this->once())
+        $this->paymentMethod->expects($this->exactly(2))
             ->method('setStore')->willReturnSelf();
 
         $this->paymentMethod->expects($this->once())
@@ -730,7 +730,7 @@ public function testAcceptApprovePaymentFalseOrderState($isFraudDetected)
             ->method('getMethodInstance')
             ->willReturn($this->paymentMethod);
 
-        $this->paymentMethod->expects($this->once())
+        $this->paymentMethod->expects($this->exactly(2))
             ->method('setStore')->willReturnSelf();
 
         $this->paymentMethod->expects($this->once())
@@ -756,7 +756,7 @@ public function testDenyPaymentFalse()
             ->method('getMethodInstance')
             ->willReturn($this->paymentMethod);
 
-        $this->paymentMethod->expects($this->once())
+        $this->paymentMethod->expects($this->exactly(2))
             ->method('setStore')->willReturnSelf();
 
         $this->paymentMethod->expects($this->once())
@@ -812,7 +812,7 @@ public function testDenyPaymentNegative($isFraudDetected, $status)
             ->method('getMethodInstance')
             ->willReturn($this->paymentMethod);
 
-        $this->paymentMethod->expects($this->once())
+        $this->paymentMethod->expects($this->exactly(2))
             ->method('setStore')->willReturnSelf();
 
         $this->paymentMethod->expects($this->once())
@@ -846,7 +846,7 @@ public function testDenyPaymentNegativeStateReview()
             ->method('getMethodInstance')
             ->willReturn($this->paymentMethod);
 
-        $this->paymentMethod->expects($this->once())
+        $this->paymentMethod->expects($this->exactly(2))
             ->method('setStore')->willReturnSelf();
 
         $this->paymentMethod->expects($this->once())
@@ -925,13 +925,13 @@ public function testUpdateOnlineTransactionApproved()
         $this->invoice->setBaseGrandTotal($baseGrandTotal);
         $this->mockResultTrueMethods($this->transactionId, $baseGrandTotal, $message);
 
-        $this->order->expects($this->once())
+        $this->order->expects($this->exactly(2))
             ->method('getStoreId')
             ->willReturn($storeId);
         $this->helper->expects($this->once())
             ->method('getMethodInstance')
             ->willReturn($this->paymentMethod);
-        $this->paymentMethod->expects($this->once())
+        $this->paymentMethod->expects($this->exactly(2))
             ->method('setStore')
             ->with($storeId)
             ->willReturn($this->paymentMethod);
@@ -985,13 +985,13 @@ public function testUpdateOnlineTransactionDenied()
         $this->mockInvoice($this->transactionId);
         $this->mockResultFalseMethods($message);
 
-        $this->order->expects($this->once())
+        $this->order->expects($this->exactly(2))
             ->method('getStoreId')
             ->willReturn($storeId);
         $this->helper->expects($this->once())
             ->method('getMethodInstance')
             ->willReturn($this->paymentMethod);
-        $this->paymentMethod->expects($this->once())
+        $this->paymentMethod->expects($this->exactly(2))
             ->method('setStore')
             ->with($storeId)
             ->willReturn($this->paymentMethod);
@@ -1027,13 +1027,13 @@ public function testUpdateOnlineTransactionDeniedFalse($isFraudDetected, $status
 
         $this->assertOrderUpdated(Order::STATE_PAYMENT_REVIEW, $status, $message);
 
-        $this->order->expects($this->once())
+        $this->order->expects($this->exactly(2))
             ->method('getStoreId')
             ->willReturn($storeId);
         $this->helper->expects($this->once())
             ->method('getMethodInstance')
             ->willReturn($this->paymentMethod);
-        $this->paymentMethod->expects($this->once())
+        $this->paymentMethod->expects($this->exactly(2))
             ->method('setStore')
             ->with($storeId)
             ->willReturn($this->paymentMethod);
@@ -1069,13 +1069,13 @@ public function testUpdateOnlineTransactionDeniedFalseHistoryComment()
             ->method('addStatusHistoryComment')
             ->with($message);
 
-        $this->order->expects($this->once())
+        $this->order->expects($this->exactly(2))
             ->method('getStoreId')
             ->willReturn($storeId);
         $this->helper->expects($this->once())
             ->method('getMethodInstance')
             ->willReturn($this->paymentMethod);
-        $this->paymentMethod->expects($this->once())
+        $this->paymentMethod->expects($this->exactly(2))
             ->method('setStore')
             ->with($storeId)
             ->willReturn($this->paymentMethod);
@@ -1144,7 +1144,7 @@ public function testAcceptWithoutInvoiceResultTrue()
             ->method('getMethodInstance')
             ->willReturn($this->paymentMethod);
 
-        $this->paymentMethod->expects($this->once())
+        $this->paymentMethod->expects($this->exactly(2))
             ->method('setStore')->willReturnSelf();
 
         $this->paymentMethod->expects($this->once())
@@ -1178,7 +1178,7 @@ public function testDenyWithoutInvoiceResultFalse()
             ->method('getMethodInstance')
             ->willReturn($this->paymentMethod);
 
-        $this->paymentMethod->expects($this->once())
+        $this->paymentMethod->expects($this->exactly(2))
             ->method('setStore')->willReturnSelf();
 
         $this->paymentMethod->expects($this->once())

From 96e67524c5637c2a634b80375948fb42b26d1a87 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Thu, 2 Jul 2020 12:42:27 +0100
Subject: [PATCH 0697/1718] Added block names

---
 .../Catalog/view/adminhtml/layout/catalog_product_index.xml     | 2 +-
 app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml  | 2 +-
 app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_index.xml b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_index.xml
index 75391ede7f261..89f34a21415d3 100644
--- a/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_index.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/layout/catalog_product_index.xml
@@ -21,7 +21,7 @@
         <referenceContainer name="content">
             <uiComponent name="product_listing"/>
             <block class="Magento\Catalog\Block\Adminhtml\Product" name="products_list"/>
-            <block class="Magento\Backend\Block\Template" template="Magento_Catalog::product/grid/url_filter_applier.phtml" />
+            <block class="Magento\Backend\Block\Template" template="Magento_Catalog::product/grid/url_filter_applier.phtml" name="product_list_url_filter_applier" />
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml
index fb73b4caf5b20..c85302ae341f4 100644
--- a/app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml
+++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml
@@ -9,7 +9,7 @@
     <body>
         <referenceContainer name="content">
             <uiComponent name="cms_block_listing"/>
-            <block class="Magento\Backend\Block\Template" template="Magento_Cms::url_filter_applier.phtml" />
+            <block class="Magento\Backend\Block\Template" template="Magento_Cms::url_filter_applier.phtml" name="block_list_url_filter_applier" />
         </referenceContainer>
         <referenceContainer name="admin.scope.col.wrap" htmlClass="admin__old" /> <!-- ToDo UI: remove this wrapper with old styles removal. The class name "admin__old" is for tests only, we shouldn't use it in any way -->
     </body>
diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml
index a6e4960c9d892..68843c77e82c7 100644
--- a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml
+++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml
@@ -10,7 +10,7 @@
     <body>
         <referenceContainer name="content">
             <uiComponent name="cms_page_listing"/>
-            <block class="Magento\Backend\Block\Template" template="Magento_Cms::url_filter_applier.phtml" />
+            <block class="Magento\Backend\Block\Template" template="Magento_Cms::url_filter_applier.phtml" name="page_list_url_filter_applier" />
         </referenceContainer>
     </body>
 </page>

From aeba2c4d96851429d5a39e8104caadab339b8ad5 Mon Sep 17 00:00:00 2001
From: Dmitry Tsymbal <d.tsymbal@atwix.com>
Date: Thu, 2 Jul 2020 15:24:53 +0300
Subject: [PATCH 0698/1718] Admin Delete Newsletter Subscriber

---
 ...ewsletterSubscriberFromGridActionGroup.xml | 19 +++++++
 ...NewsletterSubscribersInGridActionGroup.xml | 22 ++++++++
 ...letterSubscriberIsNotInGridActionGroup.xml | 17 +++++++
 .../AdminNewsletterSubscriberGridSection.xml  |  7 +++
 ...arketingDeleteNewsletterSubscriberTest.xml | 50 +++++++++++++++++++
 5 files changed, 115 insertions(+)
 create mode 100644 app/code/Magento/Newsletter/Test/Mftf/ActionGroup/AdminMarketingDeleteNewsletterSubscriberFromGridActionGroup.xml
 create mode 100644 app/code/Magento/Newsletter/Test/Mftf/ActionGroup/AdminMarketingFindNewsletterSubscribersInGridActionGroup.xml
 create mode 100644 app/code/Magento/Newsletter/Test/Mftf/ActionGroup/AssertAdminDeletedNewsletterSubscriberIsNotInGridActionGroup.xml
 create mode 100644 app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingDeleteNewsletterSubscriberTest.xml

diff --git a/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/AdminMarketingDeleteNewsletterSubscriberFromGridActionGroup.xml b/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/AdminMarketingDeleteNewsletterSubscriberFromGridActionGroup.xml
new file mode 100644
index 0000000000000..ed60c1509e453
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/AdminMarketingDeleteNewsletterSubscriberFromGridActionGroup.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="AdminMarketingDeleteNewsletterSubscriberFromGridActionGroup">
+        <click selector="{{AdminNewsletterSubscriberGridSection.rowCheckbox('1')}}" stepKey="clickOnFirstCheckbox"/>
+        <selectOption selector="{{AdminNewsletterSubscriberGridSection.actionsDropdown}}" userInput="Delete" stepKey="selectDelete"/>
+        <click selector="{{AdminNewsletterSubscriberGridSection.submit}}" stepKey="clickSubmitBtn"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <click selector="{{AdminNewsletterSubscriberGridSection.okButton}}" stepKey="clickOkButton"/>
+        <waitForPageLoad stepKey="waitForResultsLoading"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/AdminMarketingFindNewsletterSubscribersInGridActionGroup.xml b/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/AdminMarketingFindNewsletterSubscribersInGridActionGroup.xml
new file mode 100644
index 0000000000000..9f9231397a1f8
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/AdminMarketingFindNewsletterSubscribersInGridActionGroup.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="AdminMarketingFindNewsletterSubscribersInGridActionGroup">
+        <arguments>
+            <argument name="email" type="string"/>
+        </arguments>
+
+        <click stepKey="resetFilter" selector="{{AdminNewsletterSubscriberGridSection.resetFilter}}"/>
+        <waitForPageLoad stepKey="waitForPageLoading"/>
+        <fillField stepKey="fillEmailField" selector="{{AdminNewsletterSubscriberGridSection.emailField}}" userInput="{{email}}"/>
+        <click stepKey="clickSearchButton" selector="{{AdminNewsletterSubscriberGridSection.searchButton}}"/>
+        <waitForPageLoad stepKey="waitForResultsLoading"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/AssertAdminDeletedNewsletterSubscriberIsNotInGridActionGroup.xml b/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/AssertAdminDeletedNewsletterSubscriberIsNotInGridActionGroup.xml
new file mode 100644
index 0000000000000..e114a4e640fa2
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/ActionGroup/AssertAdminDeletedNewsletterSubscriberIsNotInGridActionGroup.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="AssertAdminDeletedNewsletterSubscriberIsNotInGridActionGroup">
+        <arguments>
+            <argument name="email" type="string"/>
+        </arguments>
+        <dontSee selector="{{AdminNewsletterSubscriberGridSection.email('1')}}" userInput="{{email}}" stepKey="dontSeeSubscriber"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Section/AdminNewsletterSubscriberGridSection.xml b/app/code/Magento/Newsletter/Test/Mftf/Section/AdminNewsletterSubscriberGridSection.xml
index 3332041817150..26512a28c9f3d 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/Section/AdminNewsletterSubscriberGridSection.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Section/AdminNewsletterSubscriberGridSection.xml
@@ -12,5 +12,12 @@
         <element name="type" type="text" selector="//table[contains(@class, 'data-grid')]/tbody/tr[{{row}}][@data-role='row']/td[@data-column='type']" parameterized="true"/>
         <element name="firstName" type="text" selector="//table[contains(@class, 'data-grid')]/tbody/tr[{{row}}][@data-role='row']/td[@data-column='firstname']" parameterized="true"/>
         <element name="lastName" type="text" selector="//table[contains(@class, 'data-grid')]/tbody/tr[{{row}}][@data-role='row']/td[@data-column='lastname']" parameterized="true"/>
+        <element name="resetFilter" type="button" selector=".action-default.scalable.action-reset.action-tertiary"/>
+        <element name="emailField" type="input" selector=".col-email #subscriberGrid_filter_email"/>
+        <element name="searchButton" type="button" selector="//*[@class='admin__filter-actions']//*[text()='Search']"/>
+        <element name="rowCheckbox" type="checkbox" selector="table.data-grid tbody > tr:nth-of-type({{row}}) td.data-grid-checkbox-cell input" parameterized="true"/>
+        <element name="actionsDropdown" type="select" selector=".admin__grid-massaction-form #subscriberGrid_massaction-select"/>
+        <element name="submit" type="button" selector="//*[@class='admin__grid-massaction-form']//*[text()='Submit']"/>
+        <element name="okButton" type="button" selector="//footer[@class='modal-footer']/button[contains(@class, 'action-accept')]" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingDeleteNewsletterSubscriberTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingDeleteNewsletterSubscriberTest.xml
new file mode 100644
index 0000000000000..eea77a6be0784
--- /dev/null
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingDeleteNewsletterSubscriberTest.xml
@@ -0,0 +1,50 @@
+<?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="AdminMarketingDeleteNewsletterSubscriberTest">
+        <annotations>
+            <features value="Newsletter"/>
+            <stories value="Subscribers Deleting"/>
+            <title value="Admin deletes newsletter subscribers"/>
+            <description value="Admin should be able delete newsletter subscribers"/>
+            <group value="newsletter"/>
+        </annotations>
+        <before>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCreatedCustomer"/>
+        </after>
+
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCustomerNavigateToNewsletterPageActionGroup" stepKey="navigateToNewsletterPage"/>
+        <actionGroup ref="StorefrontCustomerUpdateGeneralSubscriptionActionGroup" stepKey="subscribeToNewsletter"/>
+        <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToNewsletterSubscribersPage">
+            <argument name="menuUiId" value="{{AdminMenuMarketing.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuMarketingCommunicationsNewsletterSubscribers.dataUiId}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminMarketingFindNewsletterSubscribersInGridActionGroup" stepKey="findSubscriber">
+            <argument name="email" value="{{Simple_US_Customer.email}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminMarketingDeleteNewsletterSubscriberFromGridActionGroup" stepKey="deleteSubscriber"/>
+        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSuccessMessage">
+            <argument name="message" value="Total of 1 record(s) were deleted."/>
+        </actionGroup>
+        <actionGroup ref="AdminMarketingFindNewsletterSubscribersInGridActionGroup" stepKey="findDeletedSubscriber">
+            <argument name="email" value="{{Simple_US_Customer.email}}"/>
+        </actionGroup>
+        <actionGroup ref="AssertAdminDeletedNewsletterSubscriberIsNotInGridActionGroup" stepKey="dontSeeSubscriber">
+            <argument name="email" value="{{Simple_US_Customer.email}}"/>
+        </actionGroup>
+    </test>
+</tests>

From 8cc7055f4264a455f9d7d0e982711a11130415bd Mon Sep 17 00:00:00 2001
From: Viktor Sevch <viktor.sevch@transoftgroup.com>
Date: Thu, 2 Jul 2020 16:27:47 +0300
Subject: [PATCH 0699/1718] MC-35599: A Customer can not change the file of the
 Product with Customizable Option, updating the Shopping Cart

---
 .../frontend/templates/product/view/options/type/file.phtml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml
index a11f5db1f4842..f5fd1c5aa64e1 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml
@@ -75,6 +75,6 @@
     <?= $_fileExists ?
         /* @noEscape */ $secureRenderer->renderStyleAsTag(
             'display:none',
-            'input-box-' . /* @noEscape */ $_fileName
+            '#input-box-' . /* @noEscape */ $_fileName
         ) : '' ?>
 </div>

From c77d81209df9023ba925157728e7edb133e44c81 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Thu, 2 Jul 2020 14:52:53 +0100
Subject: [PATCH 0700/1718] Implemented suggestions and fixed tests

---
 .../Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml | 2 +-
 .../templates/product/grid/url_filter_applier.phtml         | 4 +++-
 .../Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml     | 2 +-
 .../Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml | 2 +-
 .../Magento/Cms/view/adminhtml/layout/cms_block_index.xml   | 6 +++++-
 .../Magento/Cms/view/adminhtml/layout/cms_page_index.xml    | 6 +++++-
 .../Cms/view/adminhtml/templates/url_filter_applier.phtml   | 4 +++-
 .../Magento/Ui/view/base/web/js/grid/url-filter-applier.js  | 4 +++-
 8 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
index f912060a4ba48..2055a7599b4b4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
@@ -23,6 +23,7 @@
             <createData entity="simpleProductWithShortNameAndSku" stepKey="createSimpleProduct"/>
         </before>
         <after>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilter"/>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
@@ -31,6 +32,5 @@
         <see selector="{{AdminProductGridSection.productGridNameProduct($$createSimpleProduct.name$$)}}" userInput="$$createSimpleProduct.name$$" stepKey="seeProduct"/>
         <seeElement selector="{{AdminProductGridFilterSection.enabledFilters}}" stepKey="seeEnabledFilters"/>
         <see selector="{{AdminProductGridFilterSection.enabledFilters}}" userInput="Name: $$createSimpleProduct.name$$" stepKey="seeProductNameFilter"/>
-        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilter"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml
index a09b0944b68e5..3e00503a882db 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml
@@ -9,7 +9,9 @@
 <script type="text/x-magento-init">
     {
         "*": {
-            "Magento_Ui/js/grid/url-filter-applier": {}
+            "Magento_Ui/js/grid/url-filter-applier": {
+                "listingNamespace": "product_listing"
+            }
         }
     }
 </script>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml
index 10e9781134c31..817460e97a645 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml
@@ -23,6 +23,7 @@
             <createData entity="Sales25offBlock" stepKey="createBlock"/>
         </before>
         <after>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilter"/>
             <deleteData createDataKey="createBlock" stepKey="deletePage"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
@@ -31,6 +32,5 @@
         <see selector="{{BlockPageActionsSection.blockGridRowByTitle($$createBlock.title$$)}}" userInput="$$createBlock.title$$" stepKey="seeBlock"/>
         <seeElement selector="{{BlockPageActionsSection.activeFilterDiv}}" stepKey="seeEnabledFilters"/>
         <see selector="{{BlockPageActionsSection.activeFilterDiv}}" userInput="Title: $$createBlock.title$$" stepKey="seeBlockTitleFilter"/>
-        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilter"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml
index 2063b402266f9..b2f0912369fff 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml
@@ -23,6 +23,7 @@
             <createData entity="_defaultCmsPage" stepKey="createPage"/>
         </before>
         <after>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilter"/>
             <deleteData createDataKey="createPage" stepKey="deletePage"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
@@ -31,6 +32,5 @@
         <see selector="{{CmsPagesPageActionsSection.pagesGridRowByTitle($$createPage.title$$)}}" userInput="$$createPage.title$$" stepKey="seePage"/>
         <seeElement selector="{{CmsPagesPageActionsSection.activeFilter}}" stepKey="seeEnabledFilters"/>
         <see selector="{{CmsPagesPageActionsSection.activeFilter}}" userInput="Title: $$createPage.title$$" stepKey="seePageTitleFilter"/>
-        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilter"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml
index c85302ae341f4..4a8002d89726d 100644
--- a/app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml
+++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_block_index.xml
@@ -9,7 +9,11 @@
     <body>
         <referenceContainer name="content">
             <uiComponent name="cms_block_listing"/>
-            <block class="Magento\Backend\Block\Template" template="Magento_Cms::url_filter_applier.phtml" name="block_list_url_filter_applier" />
+            <block class="Magento\Backend\Block\Template" template="Magento_Cms::url_filter_applier.phtml" name="block_list_url_filter_applier">
+                <arguments>
+                    <argument name="listing_namespace" xsi:type="string">cms_block_listing</argument>
+                </arguments>
+            </block>
         </referenceContainer>
         <referenceContainer name="admin.scope.col.wrap" htmlClass="admin__old" /> <!-- ToDo UI: remove this wrapper with old styles removal. The class name "admin__old" is for tests only, we shouldn't use it in any way -->
     </body>
diff --git a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml b/app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml
index 68843c77e82c7..1256751e65742 100644
--- a/app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml
+++ b/app/code/Magento/Cms/view/adminhtml/layout/cms_page_index.xml
@@ -10,7 +10,11 @@
     <body>
         <referenceContainer name="content">
             <uiComponent name="cms_page_listing"/>
-            <block class="Magento\Backend\Block\Template" template="Magento_Cms::url_filter_applier.phtml" name="page_list_url_filter_applier" />
+            <block class="Magento\Backend\Block\Template" template="Magento_Cms::url_filter_applier.phtml" name="page_list_url_filter_applier">
+                <arguments>
+                    <argument name="listing_namespace" xsi:type="string">cms_page_listing</argument>
+                </arguments>
+            </block>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml b/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
index a09b0944b68e5..4467035278bdd 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
@@ -9,7 +9,9 @@
 <script type="text/x-magento-init">
     {
         "*": {
-            "Magento_Ui/js/grid/url-filter-applier": {}
+            "Magento_Ui/js/grid/url-filter-applier": {
+                "listingNamespace": "<?php echo $block->getListingNamespace() ?>"
+            }
         }
     }
 </script>
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 62e5b292615f9..83220028a72df 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
@@ -11,7 +11,8 @@ define([
 
     return Component.extend({
         defaults: {
-            filterProvider: 'componentType = filters',
+            listingNamespace: null,
+            filterProvider: 'componentType = filters, ns = ${ $.listingNamespace }',
             filterKey: 'filters',
             searchString: location.search,
             modules: {
@@ -44,6 +45,7 @@ define([
 
                 return;
             }
+
             if (Object.keys(urlFilter).length) {
                 this.filterComponent().setData(urlFilter, false);
                 this.filterComponent().apply();

From 75ac691828891604d7a1e1a6f13d3e0b1de296bd Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Thu, 2 Jul 2020 16:09:24 +0300
Subject: [PATCH 0701/1718] magento/magento2-login-as-customer#144: Banner is
 not shown on Category page if Disable Page Cache For Admin User = No -
 updated.

---
 .../LoginAsCustomer/Model/AuthenticateCustomerBySecret.php   | 5 +++--
 .../Controller/Adminhtml/Login/Login.php                     | 5 +++--
 .../Api/GetLoggedAsCustomerAdminIdInterface.php              | 2 --
 .../Api/GetLoggedAsCustomerCustomerIdInterface.php           | 2 --
 .../Api/SetLoggedAsCustomerAdminIdInterface.php              | 2 --
 .../Api/SetLoggedAsCustomerCustomerIdInterface.php           | 2 --
 .../CustomerData/LoginAsCustomerUi.php                       | 5 +++--
 .../Plugin/KeepLoginAsCustomerSessionDataPlugin.php          | 2 ++
 .../LoginAsCustomerFrontendUi/ViewModel/Configuration.php    | 5 +++--
 9 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomer/Model/AuthenticateCustomerBySecret.php b/app/code/Magento/LoginAsCustomer/Model/AuthenticateCustomerBySecret.php
index a27c1c43ad965..a445d4e55c2fc 100644
--- a/app/code/Magento/LoginAsCustomer/Model/AuthenticateCustomerBySecret.php
+++ b/app/code/Magento/LoginAsCustomer/Model/AuthenticateCustomerBySecret.php
@@ -8,6 +8,7 @@
 namespace Magento\LoginAsCustomer\Model;
 
 use Magento\Customer\Model\Session;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\LoginAsCustomerApi\Api\AuthenticateCustomerBySecretInterface;
 use Magento\LoginAsCustomerApi\Api\GetAuthenticationDataBySecretInterface;
@@ -43,11 +44,11 @@ class AuthenticateCustomerBySecret implements AuthenticateCustomerBySecretInterf
     public function __construct(
         GetAuthenticationDataBySecretInterface $getAuthenticationDataBySecret,
         Session $customerSession,
-        SetLoggedAsCustomerAdminIdInterface $setLoggedAsCustomerAdminId
+        ?SetLoggedAsCustomerAdminIdInterface $setLoggedAsCustomerAdminId = null
     ) {
         $this->getAuthenticationDataBySecret = $getAuthenticationDataBySecret;
         $this->customerSession = $customerSession;
-        $this->setLoggedAsCustomerAdminId = $setLoggedAsCustomerAdminId;
+        $this->setLoggedAsCustomerAdminId = $setLoggedAsCustomerAdminId ?? ObjectManager::getInstance()->get(SetLoggedAsCustomerAdminIdInterface::class);
     }
 
     /**
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php b/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php
index 4edd5491a0fee..703fb98a93077 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php
@@ -12,6 +12,7 @@
 use Magento\Backend\Model\Auth\Session;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 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;
@@ -110,7 +111,7 @@ public function __construct(
         SaveAuthenticationDataInterface $saveAuthenticationData,
         DeleteAuthenticationDataForUserInterface $deleteAuthenticationDataForUser,
         Url $url,
-        SetLoggedAsCustomerCustomerIdInterface $setLoggedAsCustomerCustomerId
+        ?SetLoggedAsCustomerCustomerIdInterface $setLoggedAsCustomerCustomerId = null
     ) {
         parent::__construct($context);
 
@@ -122,7 +123,7 @@ public function __construct(
         $this->saveAuthenticationData = $saveAuthenticationData;
         $this->deleteAuthenticationDataForUser = $deleteAuthenticationDataForUser;
         $this->url = $url;
-        $this->setLoggedAsCustomerCustomerId = $setLoggedAsCustomerCustomerId;
+        $this->setLoggedAsCustomerCustomerId = $setLoggedAsCustomerCustomerId ?? ObjectManager::getInstance()->get(SetLoggedAsCustomerCustomerIdInterface::class);
     }
 
     /**
diff --git a/app/code/Magento/LoginAsCustomerApi/Api/GetLoggedAsCustomerAdminIdInterface.php b/app/code/Magento/LoginAsCustomerApi/Api/GetLoggedAsCustomerAdminIdInterface.php
index 44b59c7810acc..49c0f796be006 100644
--- a/app/code/Magento/LoginAsCustomerApi/Api/GetLoggedAsCustomerAdminIdInterface.php
+++ b/app/code/Magento/LoginAsCustomerApi/Api/GetLoggedAsCustomerAdminIdInterface.php
@@ -9,8 +9,6 @@
 
 /**
  * Get id of Admin logged as Customer.
- *
- * @api
  */
 interface GetLoggedAsCustomerAdminIdInterface
 {
diff --git a/app/code/Magento/LoginAsCustomerApi/Api/GetLoggedAsCustomerCustomerIdInterface.php b/app/code/Magento/LoginAsCustomerApi/Api/GetLoggedAsCustomerCustomerIdInterface.php
index 1d12d6551a2ff..047061b3edd69 100644
--- a/app/code/Magento/LoginAsCustomerApi/Api/GetLoggedAsCustomerCustomerIdInterface.php
+++ b/app/code/Magento/LoginAsCustomerApi/Api/GetLoggedAsCustomerCustomerIdInterface.php
@@ -9,8 +9,6 @@
 
 /**
  * Get id of Customer Admin is logged as.
- *
- * @api
  */
 interface GetLoggedAsCustomerCustomerIdInterface
 {
diff --git a/app/code/Magento/LoginAsCustomerApi/Api/SetLoggedAsCustomerAdminIdInterface.php b/app/code/Magento/LoginAsCustomerApi/Api/SetLoggedAsCustomerAdminIdInterface.php
index 531a21496901e..b921c2fc6e8d3 100644
--- a/app/code/Magento/LoginAsCustomerApi/Api/SetLoggedAsCustomerAdminIdInterface.php
+++ b/app/code/Magento/LoginAsCustomerApi/Api/SetLoggedAsCustomerAdminIdInterface.php
@@ -9,8 +9,6 @@
 
 /**
  * Set id of Admin logged as Customer.
- *
- * @api
  */
 interface SetLoggedAsCustomerAdminIdInterface
 {
diff --git a/app/code/Magento/LoginAsCustomerApi/Api/SetLoggedAsCustomerCustomerIdInterface.php b/app/code/Magento/LoginAsCustomerApi/Api/SetLoggedAsCustomerCustomerIdInterface.php
index a77300528ba72..265ae1aa36c45 100644
--- a/app/code/Magento/LoginAsCustomerApi/Api/SetLoggedAsCustomerCustomerIdInterface.php
+++ b/app/code/Magento/LoginAsCustomerApi/Api/SetLoggedAsCustomerCustomerIdInterface.php
@@ -9,8 +9,6 @@
 
 /**
  * Set id of Customer Admin is logged as.
- *
- * @api
  */
 interface SetLoggedAsCustomerCustomerIdInterface
 {
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/CustomerData/LoginAsCustomerUi.php b/app/code/Magento/LoginAsCustomerFrontendUi/CustomerData/LoginAsCustomerUi.php
index 762061ac5f364..78ac010c965e3 100644
--- a/app/code/Magento/LoginAsCustomerFrontendUi/CustomerData/LoginAsCustomerUi.php
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/CustomerData/LoginAsCustomerUi.php
@@ -9,6 +9,7 @@
 
 use Magento\Customer\CustomerData\SectionSourceInterface;
 use Magento\Customer\Model\Session;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\LoginAsCustomerApi\Api\GetLoggedAsCustomerAdminIdInterface;
 use Magento\Store\Model\StoreManagerInterface;
@@ -43,11 +44,11 @@ class LoginAsCustomerUi implements SectionSourceInterface
     public function __construct(
         Session $customerSession,
         StoreManagerInterface $storeManager,
-        GetLoggedAsCustomerAdminIdInterface $getLoggedAsCustomerAdminId
+        ?GetLoggedAsCustomerAdminIdInterface $getLoggedAsCustomerAdminId = null
     ) {
         $this->customerSession = $customerSession;
         $this->storeManager = $storeManager;
-        $this->getLoggedAsCustomerAdminId = $getLoggedAsCustomerAdminId;
+        $this->getLoggedAsCustomerAdminId = $getLoggedAsCustomerAdminId ?? ObjectManager::getInstance()->get(GetLoggedAsCustomerAdminIdInterface::class);
     }
 
     /**
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/Plugin/KeepLoginAsCustomerSessionDataPlugin.php b/app/code/Magento/LoginAsCustomerFrontendUi/Plugin/KeepLoginAsCustomerSessionDataPlugin.php
index 2252786d1a408..9519f3a54077b 100644
--- a/app/code/Magento/LoginAsCustomerFrontendUi/Plugin/KeepLoginAsCustomerSessionDataPlugin.php
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/Plugin/KeepLoginAsCustomerSessionDataPlugin.php
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\LoginAsCustomerFrontendUi\Plugin;
 
 use Magento\Framework\Session\SessionManagerInterface;
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/ViewModel/Configuration.php b/app/code/Magento/LoginAsCustomerFrontendUi/ViewModel/Configuration.php
index 5de790968c5e9..e7a5cd146410e 100644
--- a/app/code/Magento/LoginAsCustomerFrontendUi/ViewModel/Configuration.php
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/ViewModel/Configuration.php
@@ -9,6 +9,7 @@
 
 use Magento\Customer\Model\Context;
 use Magento\Framework\App\Http\Context as HttpContext;
+use Magento\Framework\App\ObjectManager;
 use Magento\LoginAsCustomerApi\Api\ConfigInterface;
 use Magento\LoginAsCustomerApi\Api\GetLoggedAsCustomerAdminIdInterface;
 
@@ -40,11 +41,11 @@ class Configuration implements \Magento\Framework\View\Element\Block\ArgumentInt
     public function __construct(
         ConfigInterface $config,
         HttpContext $httpContext,
-        GetLoggedAsCustomerAdminIdInterface $getLoggedAsCustomerAdminId
+        ?GetLoggedAsCustomerAdminIdInterface $getLoggedAsCustomerAdminId = null
     ) {
         $this->config = $config;
         $this->httpContext = $httpContext;
-        $this->getLoggedAsCustomerAdminId = $getLoggedAsCustomerAdminId;
+        $this->getLoggedAsCustomerAdminId = $getLoggedAsCustomerAdminId ?? ObjectManager::getInstance()->get(GetLoggedAsCustomerAdminIdInterface::class);
     }
 
     /**

From 03b3ef5183f2e383b070004400ab9790d3c0eb04 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Thu, 2 Jul 2020 15:48:34 +0100
Subject: [PATCH 0702/1718] Fix static test

---
 .../Cms/view/adminhtml/templates/url_filter_applier.phtml       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml b/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
index 4467035278bdd..18f48c3ebb108 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
@@ -10,7 +10,7 @@
     {
         "*": {
             "Magento_Ui/js/grid/url-filter-applier": {
-                "listingNamespace": "<?php echo $block->getListingNamespace() ?>"
+                "listingNamespace": "<?= $block->getListingNamespace() ?>"
             }
         }
     }

From b4b16fff64ee2bdc4d57b1e9b9ac9f6d738d7698 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Thu, 2 Jul 2020 16:45:41 +0100
Subject: [PATCH 0703/1718] Added escape for block argument

---
 .../Cms/view/adminhtml/templates/url_filter_applier.phtml      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml b/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
index 18f48c3ebb108..a4918e86715a8 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
@@ -5,12 +5,13 @@
  */
 
 /** @var $block \Magento\Backend\Block\Template */
+/** @var \Magento\Framework\Escaper $escaper */
 ?>
 <script type="text/x-magento-init">
     {
         "*": {
             "Magento_Ui/js/grid/url-filter-applier": {
-                "listingNamespace": "<?= $block->getListingNamespace() ?>"
+                "listingNamespace": "<?= $escaper->escapeJs($block->getListingNamespace()) ?>"
             }
         }
     }

From 8e456167c2a7f4b4f13e50a2ae44ba15fb537e79 Mon Sep 17 00:00:00 2001
From: Vitaliy Ryaboy <vriaboy@gmail.com>
Date: Thu, 2 Jul 2020 19:13:37 +0200
Subject: [PATCH 0704/1718] improve NonComposerComponentRegistration

---
 app/etc/NonComposerComponentRegistration.php | 23 ++++++++++----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/etc/NonComposerComponentRegistration.php b/app/etc/NonComposerComponentRegistration.php
index a7377ebfca3af..831f1aa27382e 100644
--- a/app/etc/NonComposerComponentRegistration.php
+++ b/app/etc/NonComposerComponentRegistration.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 //Register components (via a list of glob patterns)
 namespace Magento\NonComposerComponentRegistration;
@@ -11,23 +12,23 @@
 
 /**
  * Include files from a list of glob patterns
- *
- * @throws RuntimeException
- * @return void
  */
-$main = function ()
-{
+(static function (): void {
     $globPatterns = require __DIR__ . '/registration_globlist.php';
-    $baseDir = dirname(dirname(__DIR__)) . '/';
+    $baseDir = \dirname(__DIR__, 2) . '/';
 
     foreach ($globPatterns as $globPattern) {
         // Sorting is disabled intentionally for performance improvement
-        $files = glob($baseDir . $globPattern, GLOB_NOSORT);
+        $files = \glob($baseDir . $globPattern, GLOB_NOSORT);
         if ($files === false) {
             throw new RuntimeException("glob(): error with '$baseDir$globPattern'");
         }
-        array_map(function ($file) { require_once $file; }, $files);
-    }
-};
 
-$main();
+        \array_map(
+            static function (string $file): void {
+                require_once $file;
+            },
+            $files
+        );
+    }
+})();

From e3f4a0c369dbbcd380d2661ac9f439431a368105 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Fri, 3 Jul 2020 08:42:54 +0300
Subject: [PATCH 0705/1718] MC-35490: Price sort order not working properly

---
 .../Indexer/Product/Price/AbstractAction.php  |  12 +-
 .../Indexer/Price/ConfigurableTest.php        |  42 +++++--
 ...uct_configurable_with_assigned_simples.php | 106 ++++++++++++++++++
 ...gurable_with_assigned_simples_rollback.php |  40 +++++++
 .../Adminhtml/Export/File/DeleteTest.php      |   2 +
 5 files changed, 190 insertions(+), 12 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_assigned_simples.php
 create mode 100644 dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_assigned_simples_rollback.php

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 f010536f06ee5..ef36af340994a 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
@@ -368,14 +368,20 @@ protected function _reindexRows($changedIds = [])
         $productsTypes = $this->getProductsTypes($changedIds);
         $parentProductsTypes = $this->getParentProductsTypes($changedIds);
 
-        $changedIds = array_merge($changedIds, ...array_values($parentProductsTypes));
+        $changedIds = array_unique(array_merge($changedIds, ...array_values($parentProductsTypes)));
         $productsTypes = array_merge_recursive($productsTypes, $parentProductsTypes);
 
         if ($changedIds) {
             $this->deleteIndexData($changedIds);
         }
-        foreach ($productsTypes as $productType => $entityIds) {
-            $indexer = $this->_getIndexer($productType);
+
+        $typeIndexers = $this->getTypeIndexers();
+        foreach ($typeIndexers as $productType => $indexer) {
+            $entityIds = $productsTypes[$productType] ?? [];
+            if (empty($entityIds)) {
+                continue;
+            }
+
             if ($indexer instanceof DimensionalIndexerInterface) {
                 foreach ($this->dimensionCollectionFactory->create() as $dimensions) {
                     $this->tableMaintainer->createMainTmpTable($dimensions);
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 32eddb28151a7..ffa84ca740e62 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
@@ -6,6 +6,7 @@
 namespace Magento\ConfigurableProduct\Model\ResourceModel\Product\Indexer\Price;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Indexer\Product\Price\Processor as PriceIndexerProcessor;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
@@ -18,7 +19,7 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 
 /**
- * Configurable test
+ * Test reindex of configurable products
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @magentoAppArea adminhtml
@@ -64,7 +65,7 @@ protected function setUp(): void
      */
     public function testGetProductFinalPriceIfOneOfChildIsDisabled(): void
     {
-        $configurableProduct = $this->getConfigurableProductFromCollection();
+        $configurableProduct = $this->getConfigurableProductFromCollection(1);
         $this->assertEquals(10, $configurableProduct->getMinimalPrice());
 
         $childProduct = $this->productRepository->getById(10, false, null, true);
@@ -75,7 +76,7 @@ public function testGetProductFinalPriceIfOneOfChildIsDisabled(): void
         $this->productRepository->save($childProduct);
         $this->storeManager->setCurrentStore($currentStoreId);
 
-        $configurableProduct = $this->getConfigurableProductFromCollection();
+        $configurableProduct = $this->getConfigurableProductFromCollection(1);
         $this->assertEquals(20, $configurableProduct->getMinimalPrice());
     }
 
@@ -93,7 +94,7 @@ public function testGetProductFinalPriceIfOneOfChildIsDisabled(): void
      */
     public function testGetProductFinalPriceIfOneOfChildIsDisabledPerStore(): void
     {
-        $configurableProduct = $this->getConfigurableProductFromCollection();
+        $configurableProduct = $this->getConfigurableProductFromCollection(1);
         $this->assertEquals(10, $configurableProduct->getMinimalPrice());
 
         $childProduct = $this->productRepository->get('simple_10', false, null, true);
@@ -106,7 +107,7 @@ public function testGetProductFinalPriceIfOneOfChildIsDisabledPerStore(): void
         $this->productRepository->save($childProduct);
         $this->storeManager->setCurrentStore($currentStoreId);
 
-        $configurableProduct = $this->getConfigurableProductFromCollection();
+        $configurableProduct = $this->getConfigurableProductFromCollection(1);
         $this->assertEquals(20, $configurableProduct->getMinimalPrice());
     }
 
@@ -122,7 +123,7 @@ public function testGetProductFinalPriceIfOneOfChildIsDisabledPerStore(): void
      */
     public function testGetProductMinimalPriceIfOneOfChildIsOutOfStock(): void
     {
-        $configurableProduct = $this->getConfigurableProductFromCollection();
+        $configurableProduct = $this->getConfigurableProductFromCollection(1);
         $this->assertEquals(10, $configurableProduct->getMinimalPrice());
 
         $childProduct = $this->productRepository->getById(10, false, null, true);
@@ -130,25 +131,48 @@ public function testGetProductMinimalPriceIfOneOfChildIsOutOfStock(): void
         $stockItem->setIsInStock(Stock::STOCK_OUT_OF_STOCK);
         $this->stockRepository->save($stockItem);
 
-        $configurableProduct = $this->getConfigurableProductFromCollection();
+        $configurableProduct = $this->getConfigurableProductFromCollection(1);
         $this->assertEquals(20, $configurableProduct->getMinimalPrice());
     }
 
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/enable_price_index_schedule.php
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable_with_assigned_simples.php
+     * @magentoDbIsolation disabled
+     *
+     * @return void
+     */
+    public function testReindexWithCorrectPriority()
+    {
+        $configurableProduct = $this->productRepository->get('configurable');
+        $childProduct1 = $this->productRepository->get('simple_1');
+        $childProduct2 = $this->productRepository->get('simple_2');
+        $priceIndexerProcessor = Bootstrap::getObjectManager()->get(PriceIndexerProcessor::class);
+        $priceIndexerProcessor->reindexList(
+            [$configurableProduct->getId(), $childProduct1->getId(), $childProduct2->getId()],
+            true
+        );
+
+        $configurableProduct = $this->getConfigurableProductFromCollection($configurableProduct->getId());
+        $this->assertEquals($childProduct1->getPrice(), $configurableProduct->getMinimalPrice());
+    }
+
     /**
      * Retrieve configurable product.
      * Returns Configurable product that was created by Magento/ConfigurableProduct/_files/product_configurable.php
      * fixture
      *
+     * @param int $productId
      * @return ProductInterface
      */
-    private function getConfigurableProductFromCollection(): ProductInterface
+    private function getConfigurableProductFromCollection(int $productId): ProductInterface
     {
         /** @var Collection $collection */
         $collection = Bootstrap::getObjectManager()->get(CollectionFactory::class)
             ->create();
         /** @var ProductInterface $configurableProduct */
         $configurableProduct = $collection
-            ->addIdFilter([1])
+            ->addIdFilter([$productId])
             ->addMinimalPrice()
             ->load()
             ->getFirstItem();
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_assigned_simples.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_assigned_simples.php
new file mode 100644
index 0000000000000..cd8c5392d746a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_assigned_simples.php
@@ -0,0 +1,106 @@
+<?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\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\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Bootstrap::getInstance()->reinitialize();
+
+Resolver::getInstance()->requireDataFixture('Magento/ConfigurableProduct/_files/configurable_attribute.php');
+
+$installer = Bootstrap::getObjectManager()->create(CategorySetup::class);
+$attributeSetId = $installer->getAttributeSetId('catalog_product', 'Default');
+
+$product = Bootstrap::getObjectManager()->create(Product::class);
+$product->setTypeId(Configurable::TYPE_CODE)
+    ->setAttributeSetId($attributeSetId)
+    ->setWebsiteIds([1])
+    ->setName('Configurable Product')
+    ->setSku('configurable')
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setStockData(['use_config_manage_stock' => 1, 'is_in_stock' => 1]);
+$productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
+$product = $productRepository->save($product);
+
+$attributeValues = [];
+$associatedProductIds = [];
+/** @var AttributeOptionInterface[] $options */
+$options = $attribute->getOptions();
+array_shift($options); //remove the first option which is empty
+$productNumber = 0;
+foreach ($options as $option) {
+    $productNumber++;
+
+    $childProduct = Bootstrap::getObjectManager()->create(Product::class);
+    $childProduct->setTypeId(Type::TYPE_SIMPLE)
+        ->setAttributeSetId($attributeSetId)
+        ->setWebsiteIds([1])
+        ->setName('Configurable Option' . $option->getLabel())
+        ->setSku('simple_' . $productNumber)
+        ->setPrice($productNumber * 10)
+        ->setTestConfigurable($option->getValue())
+        ->setVisibility(Visibility::VISIBILITY_NOT_VISIBLE)
+        ->setStatus(Status::STATUS_ENABLED)
+        ->setStockData(
+            ['use_config_manage_stock' => 1,'qty' => $productNumber * 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1]
+        );
+    $childProduct = $productRepository->save($childProduct);
+
+    $stockItem = Bootstrap::getObjectManager()->create(Item::class);
+    $stockItem->load($childProduct->getId(), 'product_id');
+    if (!$stockItem->getProductId()) {
+        $stockItem->setProductId($childProduct->getId());
+    }
+    $stockItem->setUseConfigManageStock(1);
+    $stockItem->setQty($productNumber * 100);
+    $stockItem->setIsQtyDecimal(0);
+    $stockItem->setIsInStock(1);
+    $stockItem->save();
+
+    $attributeValues[] = [
+        'label' => 'test',
+        'attribute_id' => $attribute->getId(),
+        'value_index' => $option->getValue(),
+    ];
+    $associatedProductIds[] = $childProduct->getId();
+}
+
+$indexerProcessor = Bootstrap::getObjectManager()->get(PriceIndexerProcessor::class);
+$indexerProcessor->reindexList($associatedProductIds);
+
+$optionsFactory = Bootstrap::getObjectManager()->create(Factory::class);
+$configurableOptions = $optionsFactory->create(
+    [
+        [
+            'attribute_id' => $attribute->getId(),
+            'code' => $attribute->getAttributeCode(),
+            'label' => $attribute->getStoreLabel(),
+            'position' => '0',
+            'values' => $attributeValues,
+        ],
+    ]
+);
+$extensionConfigurableAttributes = $product->getExtensionAttributes();
+$extensionConfigurableAttributes->setConfigurableProductOptions($configurableOptions);
+$extensionConfigurableAttributes->setConfigurableProductLinks($associatedProductIds);
+$product->setExtensionAttributes($extensionConfigurableAttributes);
+$product = $productRepository->save($product);
+
+$indexerProcessor = Bootstrap::getObjectManager()->get(PriceIndexerProcessor::class);
+$indexerProcessor->reindexRow($product->getId());
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_assigned_simples_rollback.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_assigned_simples_rollback.php
new file mode 100644
index 0000000000000..68621f78745e8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_assigned_simples_rollback.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\CatalogInventory\Model\Stock\Status;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+$objectManager = Bootstrap::getObjectManager();
+
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+foreach (['simple_1', 'simple_2', 'configurable'] as $sku) {
+    try {
+        $product = $productRepository->get($sku, true);
+
+        $stockStatus = $objectManager->create(Status::class);
+        $stockStatus->load($product->getEntityId(), 'product_id');
+        $stockStatus->delete();
+
+        if ($product->getId()) {
+            $productRepository->delete($product);
+        }
+    } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+        //Product already removed
+    }
+}
+
+Resolver::getInstance()->requireDataFixture('Magento/ConfigurableProduct/_files/configurable_attribute_rollback.php');
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Export/File/DeleteTest.php b/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Export/File/DeleteTest.php
index 2a460a8ce622a..3d4f35a9e08ac 100644
--- a/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Export/File/DeleteTest.php
+++ b/dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Export/File/DeleteTest.php
@@ -16,6 +16,8 @@
 
 /**
  * Test for \Magento\ImportExport\Controller\Adminhtml\Export\File\Delete class.
+ *
+ * @magentoAppArea adminhtml
  */
 class DeleteTest extends AbstractBackendController
 {

From 3c7613da66f9175c789326bcfaafbdd258ccf4d0 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Fri, 3 Jul 2020 08:56:31 +0300
Subject: [PATCH 0706/1718] MC-31892: Attribute sets not preserving attribute
 values when set is changed

---
 .../Section/AdminProductContentSection.xml    |  1 +
 .../AdminChangeProductAttributeGroupTest.xml  | 85 +++++++++++++++++++
 .../view/base/web/js/core/renderer/layout.js  |  2 +-
 3 files changed, 87 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeGroupTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductContentSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductContentSection.xml
index fafae5d535546..4b4aa20300d14 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductContentSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductContentSection.xml
@@ -15,5 +15,6 @@
         <element name="shortDescriptionTextArea" type="textarea" selector="#product_form_short_description"/>
         <element name="sectionHeaderIfNotShowing" type="button" selector="//div[@data-index='content']//div[contains(@class, '_hide')]"/>
         <element name="pageHeader" type="textarea" selector="//*[@class='page-header row']"/>
+        <element name="attributeInput" type="input" selector="input[name='product[{{attributeCode}}]']" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeGroupTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeGroupTest.xml
new file mode 100644
index 0000000000000..401b74e730fd6
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeGroupTest.xml
@@ -0,0 +1,85 @@
+<?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="AdminChangeProductAttributeGroupTest">
+        <annotations>
+            <title value="Preserving attribute value after attribute group is changed"/>
+            <description value="Attribute value should be preserved after changing attribute group"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-35612"/>
+            <useCaseId value="MC-31892"/>
+            <group value="catalog"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <createData entity="productAttributeText" stepKey="createProductAttribute"/>
+            <createData entity="CatalogAttributeSet" stepKey="createAttributeSet"/>
+            <createData entity="CatalogAttributeSet" stepKey="createSecondAttributeSet"/>
+
+            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <amOnPage url="{{AdminProductAttributeSetEditPage.url}}/$createAttributeSet.attribute_set_id$/"
+                      stepKey="onAttributeSetEdit"/>
+            <actionGroup ref="AssignAttributeToGroup" stepKey="assignAttributeToGroup">
+                <argument name="group" value="Product Details"/>
+                <argument name="attribute" value="$createProductAttribute.attribute_code$"/>
+            </actionGroup>
+            <actionGroup ref="SaveAttributeSet" stepKey="saveAttributeSet"/>
+            <amOnPage url="{{AdminProductAttributeSetEditPage.url}}/$createSecondAttributeSet.attribute_set_id$/"
+                      stepKey="onSecondAttributeSetEdit"/>
+            <actionGroup ref="AssignAttributeToGroup" stepKey="assignAttributeToContentGroup">
+                <argument name="group" value="Content"/>
+                <argument name="attribute" value="$createProductAttribute.attribute_code$"/>
+            </actionGroup>
+            <actionGroup ref="SaveAttributeSet" stepKey="saveSecondAttributeSet"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProductAttribute" stepKey="deleteProductAttribute"/>
+            <deleteData createDataKey="createAttributeSet" stepKey="deleteAttributeSet"/>
+            <deleteData createDataKey="createSecondAttributeSet" stepKey="deleteSecondAttributeSet"/>
+            <actionGroup ref="ClearProductsFilterActionGroup" stepKey="clearProductsFilter"/>
+
+            <!-- Reindex invalidated indices after product attribute has been created/deleted -->
+            <actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct">
+            <argument name="product" value="$createSimpleProduct$"/>
+        </actionGroup>
+
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct1">
+            <argument name="product" value="$createSimpleProduct$"/>
+        </actionGroup>
+
+        <actionGroup ref="AdminProductPageSelectAttributeSet" stepKey="selectAttributeSet">
+            <argument name="attributeSetName" value="$createAttributeSet.attribute_set_name$"/>
+        </actionGroup>
+        <waitForText userInput="$createProductAttribute.default_frontend_label$" stepKey="seeAttributeInForm"/>
+        <fillField selector="{{AdminProductFormSection.attributeRequiredInput($createProductAttribute.attribute_code$)}}"
+                   userInput="test"
+                   stepKey="fillProductAttributeValue"/>
+        <actionGroup ref="AdminProductPageSelectAttributeSet" stepKey="selectSecondAttributeSet">
+            <argument name="attributeSetName" value="$createSecondAttributeSet.attribute_set_name$"/>
+        </actionGroup>
+        <actionGroup ref="ExpandAdminProductSectionActionGroup" stepKey="expandContentSection"/>
+        <waitForText userInput="$createProductAttribute.default_frontend_label$" stepKey="seeAttributeInSection"/>
+        <grabValueFrom selector="{{AdminProductContentSection.attributeInput($createProductAttribute.attribute_code$)}}"
+                      stepKey="attributeValue"/>
+        <assertEquals stepKey="assertAttributeValue">
+            <expectedResult type="string">test</expectedResult>
+            <actualResult type="variable">attributeValue</actualResult>
+        </assertEquals>
+    </test>
+</tests>
diff --git a/app/code/Magento/Ui/view/base/web/js/core/renderer/layout.js b/app/code/Magento/Ui/view/base/web/js/core/renderer/layout.js
index ac1de4631e908..5240fe55f6a74 100644
--- a/app/code/Magento/Ui/view/base/web/js/core/renderer/layout.js
+++ b/app/code/Magento/Ui/view/base/web/js/core/renderer/layout.js
@@ -499,7 +499,7 @@ define([
                 component = registry.get(val.path);
 
                 if (component) {
-                    component.cleanData().destroy();
+                    component.destroy();
                 }
             });
 

From de9318d7f41e3db30f03ef0bdabb1ae64d27f122 Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Fri, 3 Jul 2020 09:11:37 +0300
Subject: [PATCH 0707/1718] MC-35491: Patch Request : Re: Slow query on
 search_query

---
 .../Search/ViewModel/ConfigProvider.php       | 50 +++++++++++++++++++
 .../Search/view/frontend/layout/default.xml   |  6 ++-
 .../view/frontend/templates/form.mini.phtml   | 16 +++---
 3 files changed, 65 insertions(+), 7 deletions(-)
 create mode 100644 app/code/Magento/Search/ViewModel/ConfigProvider.php

diff --git a/app/code/Magento/Search/ViewModel/ConfigProvider.php b/app/code/Magento/Search/ViewModel/ConfigProvider.php
new file mode 100644
index 0000000000000..be3366e62e965
--- /dev/null
+++ b/app/code/Magento/Search/ViewModel/ConfigProvider.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Search\ViewModel;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\Store\Model\ScopeInterface;
+
+/**
+ * View model for search
+ */
+class ConfigProvider implements ArgumentInterface
+{
+    /**
+     * Suggestions settings config paths
+     */
+    private const SEARCH_SUGGESTION_ENABLED = 'catalog/search/search_suggestion_enabled';
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(
+        ScopeConfigInterface $scopeConfig
+    ) {
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * Is Search Suggestions Allowed
+     *
+     * @return bool
+     */
+    public function isSuggestionsAllowed(): bool
+    {
+        return $this->scopeConfig->isSetFlag(
+            self::SEARCH_SUGGESTION_ENABLED,
+            ScopeInterface::SCOPE_STORE
+        );
+    }
+}
diff --git a/app/code/Magento/Search/view/frontend/layout/default.xml b/app/code/Magento/Search/view/frontend/layout/default.xml
index 0cb18adedd952..69c99f979d51b 100644
--- a/app/code/Magento/Search/view/frontend/layout/default.xml
+++ b/app/code/Magento/Search/view/frontend/layout/default.xml
@@ -8,7 +8,11 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceContainer name="header-wrapper">
-            <block class="Magento\Framework\View\Element\Template" name="top.search" as="topSearch" template="Magento_Search::form.mini.phtml" />
+            <block class="Magento\Framework\View\Element\Template" name="top.search" as="topSearch" template="Magento_Search::form.mini.phtml">
+                <arguments>
+                    <argument name="configProvider" xsi:type="object">Magento\Search\ViewModel\ConfigProvider</argument>
+                </arguments>
+            </block>
         </referenceContainer>
         <referenceBlock name="footer_links">
             <block class="Magento\Framework\View\Element\Html\Link\Current" ifconfig="catalog/seo/search_terms" name="search-term-popular-link">
diff --git a/app/code/Magento/Search/view/frontend/templates/form.mini.phtml b/app/code/Magento/Search/view/frontend/templates/form.mini.phtml
index 35f3876599731..80e720e2c2fe2 100644
--- a/app/code/Magento/Search/view/frontend/templates/form.mini.phtml
+++ b/app/code/Magento/Search/view/frontend/templates/form.mini.phtml
@@ -9,7 +9,9 @@
 <?php
 /** @var $block \Magento\Framework\View\Element\Template */
 /** @var $helper \Magento\Search\Helper\Data */
+/** @var $configProvider \Magento\Search\ViewModel\ConfigProvider */
 $helper = $this->helper(\Magento\Search\Helper\Data::class);
+$configProvider = $block->getData('configProvider');
 ?>
 <div class="block block-search">
     <div class="block block-title"><strong><?= $block->escapeHtml(__('Search')) ?></strong></div>
@@ -22,12 +24,14 @@ $helper = $this->helper(\Magento\Search\Helper\Data::class);
                 </label>
                 <div class="control">
                     <input id="search"
-                           data-mage-init='{"quickSearch":{
-                                "formSelector":"#search_mini_form",
-                                "url":"<?= $block->escapeUrl($helper->getSuggestUrl())?>",
-                                "destinationSelector":"#search_autocomplete",
-                                "minSearchLength":"<?= $block->escapeHtml($helper->getMinQueryLength()) ?>"}
-                           }'
+                            <?php if ($configProvider->isSuggestionsAllowed()):?>
+                               data-mage-init='{"quickSearch":{
+                                    "formSelector":"#search_mini_form",
+                                    "url":"<?= $block->escapeUrl($helper->getSuggestUrl())?>",
+                                    "destinationSelector":"#search_autocomplete",
+                                    "minSearchLength":"<?= $block->escapeHtml($helper->getMinQueryLength()) ?>"}
+                               }'
+                            <?php endif;?>
                            type="text"
                            name="<?= $block->escapeHtmlAttr($helper->getQueryParamName()) ?>"
                            value="<?= /* @noEscape */ $helper->getEscapedQueryText() ?>"

From e08f991eba14c5b87cc9d8a3aceed18c6163a6b1 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Fri, 3 Jul 2020 09:28:55 +0300
Subject: [PATCH 0708/1718] MC-31892: Attribute sets not preserving attribute
 values when set is changed

---
 .../AdminChangeProductAttributeGroupTest.xml   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeGroupTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeGroupTest.xml
index 401b74e730fd6..04955807d7618 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeGroupTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeGroupTest.xml
@@ -26,21 +26,21 @@
             <createData entity="CatalogAttributeSet" stepKey="createAttributeSet"/>
             <createData entity="CatalogAttributeSet" stepKey="createSecondAttributeSet"/>
 
-            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
             <amOnPage url="{{AdminProductAttributeSetEditPage.url}}/$createAttributeSet.attribute_set_id$/"
                       stepKey="onAttributeSetEdit"/>
-            <actionGroup ref="AssignAttributeToGroup" stepKey="assignAttributeToGroup">
+            <actionGroup ref="AssignAttributeToGroupActionGroup" stepKey="assignAttributeToGroup">
                 <argument name="group" value="Product Details"/>
                 <argument name="attribute" value="$createProductAttribute.attribute_code$"/>
             </actionGroup>
-            <actionGroup ref="SaveAttributeSet" stepKey="saveAttributeSet"/>
+            <actionGroup ref="SaveAttributeSetActionGroup" stepKey="saveAttributeSet"/>
             <amOnPage url="{{AdminProductAttributeSetEditPage.url}}/$createSecondAttributeSet.attribute_set_id$/"
                       stepKey="onSecondAttributeSetEdit"/>
-            <actionGroup ref="AssignAttributeToGroup" stepKey="assignAttributeToContentGroup">
+            <actionGroup ref="AssignAttributeToGroupActionGroup" stepKey="assignAttributeToContentGroup">
                 <argument name="group" value="Content"/>
                 <argument name="attribute" value="$createProductAttribute.attribute_code$"/>
             </actionGroup>
-            <actionGroup ref="SaveAttributeSet" stepKey="saveSecondAttributeSet"/>
+            <actionGroup ref="SaveAttributeSetActionGroup" stepKey="saveSecondAttributeSet"/>
         </before>
         <after>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
@@ -51,8 +51,8 @@
             <actionGroup ref="ClearProductsFilterActionGroup" stepKey="clearProductsFilter"/>
 
             <!-- Reindex invalidated indices after product attribute has been created/deleted -->
-            <actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
-            <actionGroup ref="logout" stepKey="logout"/>
+            <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
         <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct">
@@ -63,14 +63,14 @@
             <argument name="product" value="$createSimpleProduct$"/>
         </actionGroup>
 
-        <actionGroup ref="AdminProductPageSelectAttributeSet" stepKey="selectAttributeSet">
+        <actionGroup ref="AdminProductPageSelectAttributeSetActionGroup" stepKey="selectAttributeSet">
             <argument name="attributeSetName" value="$createAttributeSet.attribute_set_name$"/>
         </actionGroup>
         <waitForText userInput="$createProductAttribute.default_frontend_label$" stepKey="seeAttributeInForm"/>
         <fillField selector="{{AdminProductFormSection.attributeRequiredInput($createProductAttribute.attribute_code$)}}"
                    userInput="test"
                    stepKey="fillProductAttributeValue"/>
-        <actionGroup ref="AdminProductPageSelectAttributeSet" stepKey="selectSecondAttributeSet">
+        <actionGroup ref="AdminProductPageSelectAttributeSetActionGroup" stepKey="selectSecondAttributeSet">
             <argument name="attributeSetName" value="$createSecondAttributeSet.attribute_set_name$"/>
         </actionGroup>
         <actionGroup ref="ExpandAdminProductSectionActionGroup" stepKey="expandContentSection"/>

From b729b5af3854a42589043013f09c90a1b6a5415b Mon Sep 17 00:00:00 2001
From: Andrii Kalinich <51681435+engcom-Echo@users.noreply.github.com>
Date: Fri, 3 Jul 2020 09:48:43 +0300
Subject: [PATCH 0709/1718] add tesaCaseId

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

diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminVerifyCheckboxIsDisabledCreatePermanentRedirectSetNoTest.xml b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminVerifyCheckboxIsDisabledCreatePermanentRedirectSetNoTest.xml
index 407bc273dfbfc..920ba679f4798 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminVerifyCheckboxIsDisabledCreatePermanentRedirectSetNoTest.xml
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminVerifyCheckboxIsDisabledCreatePermanentRedirectSetNoTest.xml
@@ -13,6 +13,7 @@
             <stories value="Url rewrites"/>
             <title value="Verify checkbox is disabled 'Create Permanent Redirect' set 'No'"/>
             <description value="Verify checkbox is disabled 'Create Permanent Redirect' set 'No' on category and product edit page."/>
+            <testCaseId value="MC-35589"/>
         </annotations>
         <before>
             <magentoCLI command="config:set {{DisableCreatePermanentRedirect.path}} {{DisableCreatePermanentRedirect.value}}" stepKey="enableCreatePermanentRedirect"/>

From d0e0605c03b33862d95c085e29b0eb8c365189c2 Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Fri, 3 Jul 2020 11:24:35 +0300
Subject: [PATCH 0710/1718] fix static

---
 .../Patch/Data/AddCustomerUpdatedAtAttribute.php    | 11 ++++++-----
 .../Data/AddNonSpecifiedGenderAttributeOption.php   | 11 ++++++-----
 .../Patch/Data/AddSecurityTrackingAttributes.php    | 13 +++++++------
 .../ConvertValidationRulesFromSerializedToJson.php  | 11 ++++++-----
 .../Data/DefaultCustomerGroupsAndAttributes.php     | 11 +++++++----
 .../Data/MigrateStoresAllowedCountriesToWebsite.php |  4 +++-
 .../RemoveCheckoutRegisterAndUpdateAttributes.php   | 11 ++++++-----
 .../UpdateAutocompleteOnStorefrontConfigPath.php    | 11 ++++++-----
 .../Data/UpdateCustomerAttributeInputFilters.php    | 11 ++++++-----
 ...UpdateIdentifierCustomerAttributesVisibility.php | 11 ++++++-----
 .../Customer/Setup/Patch/Data/UpdateVATNumber.php   | 11 ++++++-----
 .../Patch/Data/UpgradePasswordHashAndAddress.php    | 13 ++++++++-----
 12 files changed, 73 insertions(+), 56 deletions(-)

diff --git a/app/code/Magento/Customer/Setup/Patch/Data/AddCustomerUpdatedAtAttribute.php b/app/code/Magento/Customer/Setup/Patch/Data/AddCustomerUpdatedAtAttribute.php
index 77bb515c8e52b..1a8cdb8987db7 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/AddCustomerUpdatedAtAttribute.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/AddCustomerUpdatedAtAttribute.php
@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\Customer\Setup\Patch\Data;
@@ -42,7 +41,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function apply()
     {
@@ -60,10 +59,12 @@ public function apply()
                 'system' => false,
             ]
         );
+
+        return $this;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDependencies()
     {
@@ -73,7 +74,7 @@ public static function getDependencies()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getVersion()
     {
@@ -81,7 +82,7 @@ public static function getVersion()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAliases()
     {
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/AddNonSpecifiedGenderAttributeOption.php b/app/code/Magento/Customer/Setup/Patch/Data/AddNonSpecifiedGenderAttributeOption.php
index e958093b89621..36611afc6a2aa 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/AddNonSpecifiedGenderAttributeOption.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/AddNonSpecifiedGenderAttributeOption.php
@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\Customer\Setup\Patch\Data;
@@ -42,7 +41,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function apply()
     {
@@ -52,10 +51,12 @@ public function apply()
 
         $option = ['attribute_id' => $attributeId, 'values' => [3 => 'Not Specified']];
         $customerSetup->addAttributeOption($option);
+
+        return $this;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDependencies()
     {
@@ -65,7 +66,7 @@ public static function getDependencies()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getVersion()
     {
@@ -73,7 +74,7 @@ public static function getVersion()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAliases()
     {
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/AddSecurityTrackingAttributes.php b/app/code/Magento/Customer/Setup/Patch/Data/AddSecurityTrackingAttributes.php
index 737ac2b085b34..09611ac1ccca3 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/AddSecurityTrackingAttributes.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/AddSecurityTrackingAttributes.php
@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\Customer\Setup\Patch\Data;
@@ -42,7 +41,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function apply()
     {
@@ -93,12 +92,14 @@ public function apply()
         $this->moduleDataSetup->getConnection()->update(
             $configTable,
             ['value' => new \Zend_Db_Expr('value*24')],
-            ['path = ?' => \Magento\Customer\Model\Customer::XML_PATH_CUSTOMER_RESET_PASSWORD_LINK_EXPIRATION_PERIOD]
+            ['path = ?' => Customer::XML_PATH_CUSTOMER_RESET_PASSWORD_LINK_EXPIRATION_PERIOD]
         );
+
+        return $this;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDependencies()
     {
@@ -108,7 +109,7 @@ public static function getDependencies()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getVersion()
     {
@@ -116,7 +117,7 @@ public static function getVersion()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAliases()
     {
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/ConvertValidationRulesFromSerializedToJson.php b/app/code/Magento/Customer/Setup/Patch/Data/ConvertValidationRulesFromSerializedToJson.php
index ed3fb5b00c524..e25fe5803e46c 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/ConvertValidationRulesFromSerializedToJson.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/ConvertValidationRulesFromSerializedToJson.php
@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\Customer\Setup\Patch\Data;
@@ -42,7 +41,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function apply()
     {
@@ -53,10 +52,12 @@ public function apply()
             'attribute_id',
             'validate_rules'
         );
+
+        return $this;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDependencies()
     {
@@ -66,7 +67,7 @@ public static function getDependencies()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getVersion()
     {
@@ -74,7 +75,7 @@ public static function getVersion()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAliases()
     {
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/DefaultCustomerGroupsAndAttributes.php b/app/code/Magento/Customer/Setup/Patch/Data/DefaultCustomerGroupsAndAttributes.php
index e6dd3f36e8ebd..fccda2ee9dac1 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/DefaultCustomerGroupsAndAttributes.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/DefaultCustomerGroupsAndAttributes.php
@@ -44,7 +44,8 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function apply()
@@ -146,10 +147,12 @@ public function apply()
             ['attribute_id']
         );
         $migrationSetup->doUpdateClassAliases();
+
+        return $this;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDependencies()
     {
@@ -157,7 +160,7 @@ public static function getDependencies()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getVersion()
     {
@@ -165,7 +168,7 @@ public static function getVersion()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAliases()
     {
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/MigrateStoresAllowedCountriesToWebsite.php b/app/code/Magento/Customer/Setup/Patch/Data/MigrateStoresAllowedCountriesToWebsite.php
index d041ea920eb5b..1f21c7d4e83ba 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/MigrateStoresAllowedCountriesToWebsite.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/MigrateStoresAllowedCountriesToWebsite.php
@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\Customer\Setup\Patch\Data;
@@ -53,6 +52,7 @@ public function __construct(
 
     /**
      * @inheritdoc
+     *
      * @throws Exception
      */
     public function apply()
@@ -67,6 +67,8 @@ public function apply()
             $this->moduleDataSetup->getConnection()->rollBack();
             throw $e;
         }
+
+        return $this;
     }
 
     /**
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/RemoveCheckoutRegisterAndUpdateAttributes.php b/app/code/Magento/Customer/Setup/Patch/Data/RemoveCheckoutRegisterAndUpdateAttributes.php
index 7c621c710c463..5dfcf2bf9bf0d 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/RemoveCheckoutRegisterAndUpdateAttributes.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/RemoveCheckoutRegisterAndUpdateAttributes.php
@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\Customer\Setup\Patch\Data;
@@ -47,7 +46,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function apply()
     {
@@ -99,10 +98,12 @@ public function apply()
             'source_model',
             Address\Attribute\Source\Region::class
         );
+
+        return $this;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDependencies()
     {
@@ -112,7 +113,7 @@ public static function getDependencies()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getVersion()
     {
@@ -120,7 +121,7 @@ public static function getVersion()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAliases()
     {
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/UpdateAutocompleteOnStorefrontConfigPath.php b/app/code/Magento/Customer/Setup/Patch/Data/UpdateAutocompleteOnStorefrontConfigPath.php
index 64fef20008f09..8b8092cbb22c6 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/UpdateAutocompleteOnStorefrontConfigPath.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/UpdateAutocompleteOnStorefrontConfigPath.php
@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\Customer\Setup\Patch\Data;
@@ -33,7 +32,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function apply()
     {
@@ -42,10 +41,12 @@ public function apply()
             ['path' => Form::XML_PATH_ENABLE_AUTOCOMPLETE],
             ['path = ?' => 'general/restriction/autocomplete_on_storefront']
         );
+
+        return $this;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDependencies()
     {
@@ -55,7 +56,7 @@ public static function getDependencies()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getVersion()
     {
@@ -63,7 +64,7 @@ public static function getVersion()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAliases()
     {
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/UpdateCustomerAttributeInputFilters.php b/app/code/Magento/Customer/Setup/Patch/Data/UpdateCustomerAttributeInputFilters.php
index 9d6bd2d4f7c69..ff6decb1d2123 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/UpdateCustomerAttributeInputFilters.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/UpdateCustomerAttributeInputFilters.php
@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\Customer\Setup\Patch\Data;
@@ -41,7 +40,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function apply()
     {
@@ -71,10 +70,12 @@ public function apply()
             ],
         ];
         $customerSetup->upgradeAttributes($entityAttributes);
+
+        return $this;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDependencies()
     {
@@ -84,7 +85,7 @@ public static function getDependencies()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getVersion()
     {
@@ -92,7 +93,7 @@ public static function getVersion()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAliases()
     {
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/UpdateIdentifierCustomerAttributesVisibility.php b/app/code/Magento/Customer/Setup/Patch/Data/UpdateIdentifierCustomerAttributesVisibility.php
index bfb97c6045c92..8519fab81efc5 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/UpdateIdentifierCustomerAttributesVisibility.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/UpdateIdentifierCustomerAttributesVisibility.php
@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\Customer\Setup\Patch\Data;
@@ -41,7 +40,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function apply()
     {
@@ -69,10 +68,12 @@ public function apply()
             ],
         ];
         $customerSetup->upgradeAttributes($entityAttributes);
+
+        return $this;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDependencies()
     {
@@ -82,7 +83,7 @@ public static function getDependencies()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getVersion()
     {
@@ -90,7 +91,7 @@ public static function getVersion()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAliases()
     {
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/UpdateVATNumber.php b/app/code/Magento/Customer/Setup/Patch/Data/UpdateVATNumber.php
index 1fa8614485870..ea3207c7ccb85 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/UpdateVATNumber.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/UpdateVATNumber.php
@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\Customer\Setup\Patch\Data;
@@ -41,7 +40,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function apply()
     {
@@ -52,10 +51,12 @@ public function apply()
             'frontend_label',
             'VAT Number'
         );
+
+        return $this;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDependencies()
     {
@@ -65,7 +66,7 @@ public static function getDependencies()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getVersion()
     {
@@ -73,7 +74,7 @@ public static function getVersion()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAliases()
     {
diff --git a/app/code/Magento/Customer/Setup/Patch/Data/UpgradePasswordHashAndAddress.php b/app/code/Magento/Customer/Setup/Patch/Data/UpgradePasswordHashAndAddress.php
index cec2de71fb477..5d6e490bead22 100644
--- a/app/code/Magento/Customer/Setup/Patch/Data/UpgradePasswordHashAndAddress.php
+++ b/app/code/Magento/Customer/Setup/Patch/Data/UpgradePasswordHashAndAddress.php
@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\Customer\Setup\Patch\Data;
@@ -42,7 +41,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function apply()
     {
@@ -57,9 +56,13 @@ public function apply()
         ];
         $customerSetup = $this->customerSetupFactory->create(['setup' => $this->moduleDataSetup]);
         $customerSetup->upgradeAttributes($entityAttributes);
+
+        return $this;
     }
 
     /**
+     * Password hash upgrade
+     *
      * @return void
      */
     private function upgradeHash()
@@ -92,7 +95,7 @@ private function upgradeHash()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDependencies()
     {
@@ -102,7 +105,7 @@ public static function getDependencies()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getVersion()
     {
@@ -110,7 +113,7 @@ public static function getVersion()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAliases()
     {

From 2f8035e5af8f2b85a67eb54e3be119964696b1dc Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Fri, 3 Jul 2020 11:29:59 +0300
Subject: [PATCH 0711/1718] MC-35490: Price sort order not working properly

---
 .../_files/product_configurable_with_assigned_simples.php     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_assigned_simples.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_assigned_simples.php
index cd8c5392d746a..81a067195e902 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_assigned_simples.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_assigned_simples.php
@@ -16,6 +16,7 @@
 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\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
@@ -26,6 +27,9 @@
 $installer = Bootstrap::getObjectManager()->create(CategorySetup::class);
 $attributeSetId = $installer->getAttributeSetId('catalog_product', 'Default');
 
+$eavConfig = Bootstrap::getObjectManager()->get(Config::class);
+$attribute = $eavConfig->getAttribute('catalog_product', 'test_configurable');
+
 $product = Bootstrap::getObjectManager()->create(Product::class);
 $product->setTypeId(Configurable::TYPE_CODE)
     ->setAttributeSetId($attributeSetId)

From 76d86d9e00dc535e60e5b920e310c9e38a8fc34d Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Fri, 3 Jul 2020 11:41:15 +0300
Subject: [PATCH 0712/1718] magento/magento2-login-as-customer#187: Move
 frontend-specific code (such as session-related) to LoginAsCustomerFrontendUi
 module.

---
 app/code/Magento/LoginAsCustomer/etc/di.xml                     | 1 -
 .../Model/AuthenticateCustomerBySecret.php                      | 2 +-
 app/code/Magento/LoginAsCustomerFrontendUi/etc/frontend/di.xml  | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename app/code/Magento/{LoginAsCustomer => LoginAsCustomerFrontendUi}/Model/AuthenticateCustomerBySecret.php (97%)

diff --git a/app/code/Magento/LoginAsCustomer/etc/di.xml b/app/code/Magento/LoginAsCustomer/etc/di.xml
index c0ba4901ba7b8..c3cb05ea0c433 100755
--- a/app/code/Magento/LoginAsCustomer/etc/di.xml
+++ b/app/code/Magento/LoginAsCustomer/etc/di.xml
@@ -9,7 +9,6 @@
     <preference for="Magento\LoginAsCustomerApi\Api\Data\AuthenticationDataInterface" type="Magento\LoginAsCustomer\Model\AuthenticationData"/>
     <preference for="Magento\LoginAsCustomerApi\Api\SaveAuthenticationDataInterface" type="Magento\LoginAsCustomer\Model\ResourceModel\SaveAuthenticationData"/>
     <preference for="Magento\LoginAsCustomerApi\Api\GetAuthenticationDataBySecretInterface" type="Magento\LoginAsCustomer\Model\ResourceModel\GetAuthenticationDataBySecret"/>
-    <preference for="Magento\LoginAsCustomerApi\Api\AuthenticateCustomerBySecretInterface" type="Magento\LoginAsCustomer\Model\AuthenticateCustomerBySecret"/>
     <preference for="Magento\LoginAsCustomerApi\Api\DeleteAuthenticationDataForUserInterface" type="Magento\LoginAsCustomer\Model\ResourceModel\DeleteAuthenticationDataForUser"/>
     <preference for="Magento\LoginAsCustomerApi\Api\ConfigInterface" type="Magento\LoginAsCustomer\Model\Config"/>
     <preference for="Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerSessionActiveInterface" type="Magento\LoginAsCustomer\Model\ResourceModel\IsLoginAsCustomerSessionActive"/>
diff --git a/app/code/Magento/LoginAsCustomer/Model/AuthenticateCustomerBySecret.php b/app/code/Magento/LoginAsCustomerFrontendUi/Model/AuthenticateCustomerBySecret.php
similarity index 97%
rename from app/code/Magento/LoginAsCustomer/Model/AuthenticateCustomerBySecret.php
rename to app/code/Magento/LoginAsCustomerFrontendUi/Model/AuthenticateCustomerBySecret.php
index a728f4c3a4393..59251be8012c1 100644
--- a/app/code/Magento/LoginAsCustomer/Model/AuthenticateCustomerBySecret.php
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/Model/AuthenticateCustomerBySecret.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\LoginAsCustomer\Model;
+namespace Magento\LoginAsCustomerFrontendUi\Model;
 
 use Magento\Customer\Model\Session;
 use Magento\Framework\Exception\LocalizedException;
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/etc/frontend/di.xml b/app/code/Magento/LoginAsCustomerFrontendUi/etc/frontend/di.xml
index 2204402b7dd30..2cdde68397700 100644
--- a/app/code/Magento/LoginAsCustomerFrontendUi/etc/frontend/di.xml
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/etc/frontend/di.xml
@@ -6,6 +6,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Magento\LoginAsCustomerApi\Api\AuthenticateCustomerBySecretInterface" type="Magento\LoginAsCustomerFrontendUi\Model\AuthenticateCustomerBySecret"/>
     <type name="Magento\Customer\CustomerData\SectionPoolInterface">
         <arguments>
             <argument name="sectionSourceMap" xsi:type="array">

From 21f9fa4e30295d3e2e5d3c548922aa7e57421dce Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Fri, 3 Jul 2020 12:02:18 +0300
Subject: [PATCH 0713/1718] impr

---
 .../Wishlist/Controller/Shared/Allcart.php    |  20 +-
 .../Wishlist/Controller/Shared/Cart.php       |  11 +-
 .../Unit/Controller/Shared/AllcartTest.php    |  86 ++++-----
 .../Test/Unit/Controller/Shared/CartTest.php  | 178 ++++++++----------
 4 files changed, 134 insertions(+), 161 deletions(-)

diff --git a/app/code/Magento/Wishlist/Controller/Shared/Allcart.php b/app/code/Magento/Wishlist/Controller/Shared/Allcart.php
index 96b3102a6f443..c1e908cc0f49e 100644
--- a/app/code/Magento/Wishlist/Controller/Shared/Allcart.php
+++ b/app/code/Magento/Wishlist/Controller/Shared/Allcart.php
@@ -16,30 +16,33 @@
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Wishlist\Model\ItemCarrier;
 
+/**
+ * Wishlist Allcart Controller
+ */
 class Allcart extends Action implements HttpGetActionInterface
 {
     /**
-     * @var ItemCarrier
+     * @var WishlistProvider
      */
-    private $itemCarrier;
+    protected $wishlistProvider;
 
     /**
-     * @var WishlistProvider
+     * @var ItemCarrier
      */
-    private $wishlistProvider;
+    protected $itemCarrier;
 
     /**
      * @param Context $context
-     * @param ItemCarrier $itemCarrier
      * @param WishlistProvider $wishlistProvider
+     * @param ItemCarrier $itemCarrier
      */
     public function __construct(
         Context $context,
-        ItemCarrier $itemCarrier,
-        WishlistProvider $wishlistProvider
+        WishlistProvider $wishlistProvider,
+        ItemCarrier $itemCarrier
     ) {
-        $this->itemCarrier = $itemCarrier;
         $this->wishlistProvider = $wishlistProvider;
+        $this->itemCarrier = $itemCarrier;
         parent::__construct($context);
     }
 
@@ -61,6 +64,7 @@ public function execute()
         /** @var Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         $resultRedirect->setUrl($redirectUrl);
+
         return $resultRedirect;
     }
 }
diff --git a/app/code/Magento/Wishlist/Controller/Shared/Cart.php b/app/code/Magento/Wishlist/Controller/Shared/Cart.php
index 9fdadb917a920..bee1e187be648 100644
--- a/app/code/Magento/Wishlist/Controller/Shared/Cart.php
+++ b/app/code/Magento/Wishlist/Controller/Shared/Cart.php
@@ -33,27 +33,27 @@ class Cart extends Action implements HttpGetActionInterface
     /**
      * @var CustomerCart
      */
-    private $cart;
+    protected $cart;
 
     /**
      * @var OptionFactory
      */
-    private $optionFactory;
+    protected $optionFactory;
 
     /**
      * @var ItemFactory
      */
-    private $itemFactory;
+    protected $itemFactory;
 
     /**
      * @var CartHelper
      */
-    private $cartHelper;
+    protected $cartHelper;
 
     /**
      * @var Escaper
      */
-    private $escaper;
+    protected $escaper;
 
     /**
      * @param ActionContext $context
@@ -128,6 +128,7 @@ public function execute()
         /** @var ResultRedirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         $resultRedirect->setUrl($redirectUrl);
+
         return $resultRedirect;
     }
 }
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php
index 5fa5eb748ac65..d9339af8144f4 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 declare(strict_types=1);
 
 namespace Magento\Wishlist\Test\Unit\Controller\Shared;
@@ -20,83 +21,60 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * Test for \Magento\Wishlist\Controller\Shared\Allcart.
+ */
 class AllcartTest extends TestCase
 {
     /**
      * @var Allcart
      */
-    protected $allcartController;
-
-    /**
-     * @var ObjectManagerHelper
-     */
-    protected $objectManagerHelper;
+    private $allcartController;
 
     /**
      * @var WishlistProvider|MockObject
      */
-    protected $wishlistProviderMock;
-
-    /**
-     * @var Context|MockObject
-     */
-    protected $context;
+    private $wishlistProviderMock;
 
     /**
      * @var ItemCarrier|MockObject
      */
-    protected $itemCarrierMock;
+    private $itemCarrierMock;
 
     /**
      * @var Wishlist|MockObject
      */
-    protected $wishlistMock;
+    private $wishlistMock;
 
     /**
      * @var Http|MockObject
      */
-    protected $requestMock;
-
-    /**
-     * @var ResultFactory|MockObject
-     */
-    protected $resultFactoryMock;
+    private $requestMock;
 
     /**
      * @var Redirect|MockObject
      */
-    protected $resultRedirectMock;
+    private $resultRedirectMock;
 
     /**
      * @var Forward|MockObject
      */
-    protected $resultForwardMock;
+    private $resultForwardMock;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp(): void
     {
-        $this->wishlistProviderMock = $this->getMockBuilder(WishlistProvider::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->itemCarrierMock = $this->getMockBuilder(ItemCarrier::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->wishlistMock = $this->getMockBuilder(Wishlist::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->requestMock = $this->getMockBuilder(Http::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->resultFactoryMock = $this->getMockBuilder(ResultFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->resultRedirectMock = $this->getMockBuilder(Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->resultForwardMock = $this->getMockBuilder(Forward::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultFactoryMock->expects($this->any())
+        $this->wishlistProviderMock = $this->createMock(WishlistProvider::class);
+        $this->itemCarrierMock = $this->createMock(ItemCarrier::class);
+        $this->wishlistMock = $this->createMock(Wishlist::class);
+        $this->requestMock = $this->createMock(Http::class);
+        $resultFactoryMock = $this->createMock(ResultFactory::class);
+        $this->resultRedirectMock = $this->createMock(Redirect::class);
+        $this->resultForwardMock = $this->createMock(Forward::class);
+
+        $resultFactoryMock->expects($this->any())
             ->method('create')
             ->willReturnMap(
                 [
@@ -105,19 +83,21 @@ protected function setUp(): void
                 ]
             );
 
-        $this->objectManagerHelper = new ObjectManagerHelper($this);
-        $this->context = $this->objectManagerHelper->getObject(
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $context = $objectManagerHelper->getObject(
             Context::class,
             [
                 'request' => $this->requestMock,
-                'resultFactory' => $this->resultFactoryMock
+                'resultFactory' => $resultFactoryMock
             ]
         );
-
-        $this->allcartController = new Allcart(
-            $this->context,
-            $this->itemCarrierMock,
-            $this->wishlistProviderMock
+        $this->allcartController = $objectManagerHelper->getObject(
+            Allcart::class,
+            [
+                'context' => $context,
+                'wishlistProvider' => $this->wishlistProviderMock,
+                'itemCarrier' => $this->itemCarrierMock
+            ]
         );
     }
 
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php
index cee4b39ecfc2f..e6a127457a6c6 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php
@@ -30,158 +30,146 @@
 use PHPUnit\Framework\TestCase;
 
 /**
+ * Test for \Magento\Wishlist\Controller\Shared\Cart.
+ *
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CartTest extends TestCase
 {
-    /** @var  SharedCart|MockObject */
-    protected $model;
-
-    /** @var  RequestInterface|MockObject */
-    protected $request;
-
-    /** @var  ManagerInterface|MockObject */
-    protected $messageManager;
-
-    /** @var  ActionContext|MockObject */
-    protected $context;
-
-    /** @var  Cart|MockObject */
-    protected $cart;
+    /**
+     * @var SharedCart|MockObject
+     */
+    private $model;
 
-    /** @var  CartHelper|MockObject */
-    protected $cartHelper;
+    /**
+     * @var RequestInterface|MockObject
+     */
+    private $request;
 
-    /** @var  Quote|MockObject */
-    protected $quote;
+    /**
+     * @var ManagerInterface|MockObject
+     */
+    private $messageManager;
 
-    /** @var  OptionCollection|MockObject */
-    protected $optionCollection;
+    /**
+     * @var Cart|MockObject
+     */
+    private $cart;
 
-    /** @var  OptionFactory|MockObject */
-    protected $optionFactory;
+    /**
+     * @var CartHelper|MockObject
+     */
+    private $cartHelper;
 
-    /** @var  Option|MockObject */
-    protected $option;
+    /**
+     * @var Quote|MockObject
+     */
+    private $quote;
 
-    /** @var  ItemFactory|MockObject */
-    protected $itemFactory;
+    /**
+     * @var OptionCollection|MockObject
+     */
+    private $optionCollection;
 
-    /** @var  Item|MockObject */
-    protected $item;
+    /**
+     * @var Option|MockObject
+     */
+    private $option;
 
-    /** @var  Escaper|MockObject */
-    protected $escaper;
+    /**
+     * @var Item|MockObject
+     */
+    private $item;
 
-    /** @var  RedirectInterface|MockObject */
-    protected $redirect;
+    /**
+     * @var Escaper|MockObject
+     */
+    private $escaper;
 
-    /** @var  ResultFactory|MockObject */
-    protected $resultFactory;
+    /**
+     * @var RedirectInterface|MockObject
+     */
+    private $redirect;
 
-    /** @var  Redirect|MockObject */
-    protected $resultRedirect;
+    /**
+     * @var Redirect|MockObject
+     */
+    private $resultRedirect;
 
-    /** @var  Product|MockObject */
-    protected $product;
+    /**
+     * @var Product|MockObject
+     */
+    private $product;
 
     /**
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @inheritDoc
      */
     protected function setUp(): void
     {
-        $this->request = $this->getMockBuilder(RequestInterface::class)
-            ->getMockForAbstractClass();
-
-        $this->redirect = $this->getMockBuilder(RedirectInterface::class)
-            ->getMockForAbstractClass();
+        $this->request = $this->getMockForAbstractClass(RequestInterface::class);
+        $this->redirect = $this->getMockForAbstractClass(RedirectInterface::class);
+        $this->messageManager = $this->getMockForAbstractClass(ManagerInterface::class);
+        $this->resultRedirect = $this->createMock(Redirect::class);
 
-        $this->messageManager = $this->getMockBuilder(ManagerInterface::class)
-            ->getMockForAbstractClass();
-
-        $this->resultRedirect = $this->getMockBuilder(Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultFactory = $this->getMockBuilder(ResultFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->resultFactory->expects($this->once())
+        $resultFactory = $this->createMock(ResultFactory::class);
+        $resultFactory->expects($this->once())
             ->method('create')
             ->with(ResultFactory::TYPE_REDIRECT)
             ->willReturn($this->resultRedirect);
 
-        $this->context = $this->getMockBuilder(ActionContext::class)
+        /** @var ActionContext|MockObject $context */
+        $context = $this->getMockBuilder(ActionContext::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->context->expects($this->any())
+        $context->expects($this->any())
             ->method('getRequest')
             ->willReturn($this->request);
-        $this->context->expects($this->any())
+        $context->expects($this->any())
             ->method('getRedirect')
             ->willReturn($this->redirect);
-        $this->context->expects($this->any())
+        $context->expects($this->any())
             ->method('getMessageManager')
             ->willReturn($this->messageManager);
-        $this->context->expects($this->any())
+        $context->expects($this->any())
             ->method('getResultFactory')
-            ->willReturn($this->resultFactory);
-
-        $this->cart = $this->getMockBuilder(Cart::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+            ->willReturn($resultFactory);
 
-        $this->cartHelper = $this->getMockBuilder(CartHelper::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->cart = $this->createMock(Cart::class);
+        $this->cartHelper = $this->createMock(CartHelper::class);
 
         $this->quote = $this->getMockBuilder(Quote::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getHasError'])
+            ->addMethods(['getHasError'])
             ->getMock();
 
-        $this->optionCollection = $this->getMockBuilder(
-            OptionCollection::class
-        )->disableOriginalConstructor()->getMock();
+        $this->optionCollection = $this->createMock(OptionCollection::class);
 
         $this->option = $this->getMockBuilder(Option::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->optionFactory = $this->getMockBuilder(OptionFactory::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-        $this->optionFactory->expects($this->once())
+        /** @var OptionFactory|MockObject $optionFactory */
+        $optionFactory = $this->createMock(OptionFactory::class);
+        $optionFactory->expects($this->once())
             ->method('create')
             ->willReturn($this->option);
 
-        $this->item = $this->getMockBuilder(Item::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->item = $this->createMock(Item::class);
 
-        $this->itemFactory = $this->getMockBuilder(ItemFactory::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['create'])
-            ->getMock();
-        $this->itemFactory->expects($this->once())
+        $itemFactory = $this->createMock(ItemFactory::class);
+        $itemFactory->expects($this->once())
             ->method('create')
             ->willReturn($this->item);
 
-        $this->escaper = $this->getMockBuilder(Escaper::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->product = $this->getMockBuilder(Product::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->escaper = $this->createMock(Escaper::class);
+        $this->product = $this->createMock(Product::class);
 
         $this->model = new SharedCart(
-            $this->context,
+            $context,
             $this->cart,
-            $this->optionFactory,
-            $this->itemFactory,
+            $optionFactory,
+            $itemFactory,
             $this->cartHelper,
             $this->escaper
         );

From 7e81497c040648b297f41f942fd65c437844154d Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Fri, 3 Jul 2020 13:33:11 +0300
Subject: [PATCH 0714/1718] MC-35123: An invoiced order of a product with a
 Customizable Option (file) can not be reordered

---
 app/code/Magento/Sales/Model/Reorder/Reorder.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/Model/Reorder/Reorder.php b/app/code/Magento/Sales/Model/Reorder/Reorder.php
index a1a8d6e8c9928..a5d40df07bd69 100644
--- a/app/code/Magento/Sales/Model/Reorder/Reorder.php
+++ b/app/code/Magento/Sales/Model/Reorder/Reorder.php
@@ -225,7 +225,8 @@ private function getOrderProducts(string $storeId, array $orderItemProductIds):
             ->addStoreFilter()
             ->addAttributeToSelect('*')
             ->joinAttribute('status', 'catalog_product/status', 'entity_id', null, 'inner')
-            ->joinAttribute('visibility', 'catalog_product/visibility', 'entity_id', null, 'inner');
+            ->joinAttribute('visibility', 'catalog_product/visibility', 'entity_id', null, 'inner')
+            ->addOptionsToResult();
 
         return $collection->getItems();
     }

From c67166f5425b20c79a9f9a6b51087eaa8a313223 Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Fri, 3 Jul 2020 14:35:27 +0300
Subject: [PATCH 0715/1718] MC-35491: Patch Request : Re: Slow query on
 search_query

---
 .../testsuite/Magento/CatalogSearch/Block/ResultTest.php  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Block/ResultTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Block/ResultTest.php
index 76a4ff9714ebd..2b6711eeaf99b 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Block/ResultTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Block/ResultTest.php
@@ -12,6 +12,7 @@
 use Magento\Framework\View\LayoutInterface;
 use Magento\Search\Model\QueryFactory;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Search\ViewModel\ConfigProvider;
 
 class ResultTest extends \PHPUnit\Framework\TestCase
 {
@@ -25,6 +26,11 @@ class ResultTest extends \PHPUnit\Framework\TestCase
      */
     private $layout;
 
+    /**
+     * @var ConfigProvider
+     */
+    private $configProvider;
+
     /**
      * @inheritdoc
      */
@@ -32,6 +38,7 @@ protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
         $this->layout = $this->objectManager->get(LayoutInterface::class);
+        $this->configProvider = $this->objectManager->get(ConfigProvider::class);
     }
 
     public function testSetListOrders()
@@ -62,6 +69,7 @@ public function testEscapeSearchText(string $searchValue, string $expectedOutput
         $searchResultBlock = $this->layout->createBlock(Result::class);
         /** @var Template $searchBlock */
         $searchBlock = $this->layout->createBlock(Template::class);
+        $searchBlock->setData(['configProvider' => $this->configProvider]);
         $searchBlock->setTemplate('Magento_Search::form.mini.phtml');
         /** @var RequestInterface $request */
         $request = $this->objectManager->get(RequestInterface::class);

From 9b1284e312a950469d037b7ccbad0285330059a5 Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Fri, 3 Jul 2020 14:37:39 +0300
Subject: [PATCH 0716/1718] MC-35491: Patch Request : Re: Slow query on
 search_query

---
 .../testsuite/Magento/CatalogSearch/Block/ResultTest.php   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Block/ResultTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Block/ResultTest.php
index 2b6711eeaf99b..6d679a5aea7d4 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Block/ResultTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Block/ResultTest.php
@@ -41,7 +41,12 @@ protected function setUp(): void
         $this->configProvider = $this->objectManager->get(ConfigProvider::class);
     }
 
-    public function testSetListOrders()
+    /**
+     * Set list orders test
+     *
+     * @return void
+     */
+    public function testSetListOrders(): void
     {
         $this->layout->addBlock(Text::class, 'head');
         // The tested block is using head block

From 42d85ba88ead0942fbab1f38bf5d537e47288af1 Mon Sep 17 00:00:00 2001
From: Serhii Balko <serhii.balko@transoftgroup.com>
Date: Fri, 3 Jul 2020 15:57:05 +0300
Subject: [PATCH 0717/1718] MC-35353: Localised region name is not showing on
 order page if it is edited

---
 .../Order/Address/Collection.php              |  90 +++++++++++++++-
 .../Service/V1/OrderAddressUpdateTest.php     |   7 +-
 .../Magento/Sales/Service/V1/OrderGetTest.php |   2 +-
 .../Order/Address/CollectionTest.php          | 101 ++++++++++++++++++
 4 files changed, 192 insertions(+), 8 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Order/Address/CollectionTest.php

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 8af6c03b44275..f2a28b613cfea 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Address/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Address/Collection.php
@@ -6,12 +6,19 @@
 namespace Magento\Sales\Model\ResourceModel\Order\Address;
 
 use Magento\Sales\Api\Data\OrderAddressSearchResultInterface;
-use \Magento\Sales\Model\ResourceModel\Order\Collection\AbstractCollection;
+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;
 
 /**
- * Flat sales order payment collection
- *
- * @author      Magento Core Team <core@magentocommerce.com>
+ * Order addresses collection
  */
 class Collection extends AbstractCollection implements OrderAddressSearchResultInterface
 {
@@ -29,6 +36,44 @@ 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
      *
@@ -42,6 +87,16 @@ protected function _construct()
         );
     }
 
+    /**
+     * @inheritdoc
+     */
+    protected function _initSelect()
+    {
+        parent::_initSelect();
+        $this->joinRegions();
+        return $this;
+    }
+
     /**
      * Redeclare after load method for dispatch event
      *
@@ -55,4 +110,31 @@ 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 1096c0dca6530..c5b06285f1fe1 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
@@ -3,13 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Sales\Service\V1;
 
 use Magento\Sales\Api\Data\OrderAddressInterface as OrderAddress;
 use Magento\TestFramework\TestCase\WebapiAbstract;
 
 /**
- * Class OrderAddressUpdateTest
+ * Test for address update
  */
 class OrderAddressUpdateTest extends WebapiAbstract
 {
@@ -28,7 +29,7 @@ public function testOrderAddressUpdate()
         $order = $objectManager->get(\Magento\Sales\Model\Order::class)->loadByIncrementId('100000001');
 
         $address = [
-            OrderAddress::REGION => 'CA',
+            OrderAddress::REGION => 'California',
             OrderAddress::POSTCODE => '11111',
             OrderAddress::LASTNAME => 'lastname',
             OrderAddress::STREET => ['street'],
@@ -75,7 +76,7 @@ public function testOrderAddressUpdate()
         $billingAddress = $actualOrder->getBillingAddress();
 
         $validate = [
-            OrderAddress::REGION => 'CA',
+            OrderAddress::REGION => 'California',
             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 021698f874e55..e28cca72e8fb8 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' => 'CA'
+            'region' => 'California'
         ];
 
         $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
new file mode 100644
index 0000000000000..52284b3c9ddf9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Order/Address/CollectionTest.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Model\ResourceModel\Order\Address;
+
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Sales\Model\Order\Payment;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Api\Data\OrderAddressInterface as OrderAddress;
+use Magento\Backend\Model\Locale\Resolver;
+use Magento\Framework\Locale\ResolverInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for address collection
+ *
+ * @magentoAppArea adminhtml
+ */
+class CollectionTest extends TestCase
+{
+    /**
+     * @var ResolverInterface|MockObject
+     */
+    private $localeResolverMock;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $addressCollectionFactory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->localeResolverMock = $this->createMock(ResolverInterface::class);
+        Bootstrap::getObjectManager()->removeSharedInstance(ResolverInterface::class);
+        Bootstrap::getObjectManager()->removeSharedInstance(Resolver::class);
+        Bootstrap::getObjectManager()->addSharedInstance($this->localeResolverMock, ResolverInterface::class);
+        Bootstrap::getObjectManager()->addSharedInstance($this->localeResolverMock, Resolver::class);
+
+        $addressData = [
+            OrderAddress::REGION => 'Alabama',
+            OrderAddress::REGION_ID => '1',
+            OrderAddress::POSTCODE => '11111',
+            OrderAddress::LASTNAME => 'lastname',
+            OrderAddress::FIRSTNAME => 'firstname',
+            OrderAddress::STREET => 'street',
+            OrderAddress::CITY => 'Montgomery',
+            OrderAddress::EMAIL => 'admin@example.com',
+            OrderAddress::TELEPHONE => '11111111',
+            OrderAddress::COUNTRY_ID => 'US'
+        ];
+        $billingAddress = Bootstrap::getObjectManager()->create(OrderAddress::class, ['data' => $addressData]);
+        $billingAddress->setAddressType('billing');
+        $shippingAddress = clone $billingAddress;
+        $shippingAddress->setId(null)->setAddressType('shipping');
+        $payment = Bootstrap::getObjectManager()->create(Payment::class);
+        $payment->setMethod('payflowpro')
+            ->setCcExpMonth('5')
+            ->setCcLast4('0005')
+            ->setCcType('AE')
+            ->setCcExpYear('2022');
+        $order = Bootstrap::getObjectManager()->create(Order::class);
+        $order->setIncrementId('100000001')
+            ->setSubtotal(100)
+            ->setBaseSubtotal(100)
+            ->setCustomerEmail('admin@example.com')
+            ->setCustomerIsGuest(true)
+            ->setBillingAddress($billingAddress)
+            ->setShippingAddress($shippingAddress)
+            ->setStoreId(Bootstrap::getObjectManager()->get(StoreManagerInterface::class)->getStore()->getId())
+            ->setPayment($payment);
+        $order->save();
+
+        $this->addressCollectionFactory = Bootstrap::getObjectManager()->get(CollectionFactory::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Directory/_files/region_name_jp.php
+     */
+    public function testCollectionWithJpLocale(): void
+    {
+        $locale = 'JA_jp';
+        $this->localeResolverMock->method('getLocale')->willReturn($locale);
+
+        $order = Bootstrap::getObjectManager()->create(Order::class)
+            ->loadByIncrementId('100000001');
+
+        $collection = $this->addressCollectionFactory->create()->setOrderFilter($order);
+        foreach ($collection as $address) {
+            $this->assertEquals('アラバマ', $address->getData(OrderAddress::REGION));
+        }
+    }
+}

From 86ec81c9567dced0bc6a284b3dca76809c748f33 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Fri, 3 Jul 2020 16:28:51 +0300
Subject: [PATCH 0718/1718] magento/magento2-login-as-customer#188: Introduce
 Login as Customer "is enabled" check extensibility.

---
 ...LoginAsCustomerEnabledForCustomerChain.php | 66 ++++++++++++++++
 ...oginAsCustomerEnabledForCustomerResult.php | 53 +++++++++++++
 .../IsLoginAsCustomerEnabledResolver.php      | 54 +++++++++++++
 app/code/Magento/LoginAsCustomer/etc/di.xml   | 32 ++++++--
 .../Controller/Adminhtml/Login/Login.php      | 32 ++++++--
 .../Plugin/Button/ToolbarPlugin.php           | 67 +++++++++-------
 .../Component/Button/DataProvider.php         | 79 +++++++++++++++++++
 .../Control/LoginAsCustomerButton.php         | 42 +++-------
 .../etc/adminhtml/di.xml                      | 12 ++-
 .../Magento/LoginAsCustomerAdminUi/etc/di.xml | 31 ++++++++
 ...tomerEnabledForCustomerResultInterface.php | 37 +++++++++
 ...nAsCustomerEnabledForCustomerInterface.php | 26 ++++++
 12 files changed, 459 insertions(+), 72 deletions(-)
 create mode 100644 app/code/Magento/LoginAsCustomer/Model/IsLoginAsCustomerEnabledForCustomerChain.php
 create mode 100644 app/code/Magento/LoginAsCustomer/Model/IsLoginAsCustomerEnabledForCustomerResult.php
 create mode 100644 app/code/Magento/LoginAsCustomer/Model/Resolver/IsLoginAsCustomerEnabledResolver.php
 create mode 100644 app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/Button/DataProvider.php
 create mode 100644 app/code/Magento/LoginAsCustomerAdminUi/etc/di.xml
 create mode 100644 app/code/Magento/LoginAsCustomerApi/Api/Data/IsLoginAsCustomerEnabledForCustomerResultInterface.php
 create mode 100644 app/code/Magento/LoginAsCustomerApi/Api/IsLoginAsCustomerEnabledForCustomerInterface.php

diff --git a/app/code/Magento/LoginAsCustomer/Model/IsLoginAsCustomerEnabledForCustomerChain.php b/app/code/Magento/LoginAsCustomer/Model/IsLoginAsCustomerEnabledForCustomerChain.php
new file mode 100644
index 0000000000000..6937a11eb3b58
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Model/IsLoginAsCustomerEnabledForCustomerChain.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomer\Model;
+
+use Magento\LoginAsCustomerApi\Api\ConfigInterface;
+use Magento\LoginAsCustomerApi\Api\Data\IsLoginAsCustomerEnabledForCustomerResultInterface;
+use Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerEnabledForCustomerInterface;
+use Magento\LoginAsCustomerApi\Model\IsLoginAsCustomerEnabledForCustomerResolverInterface;
+
+/**
+ * @inheritdoc
+ */
+class IsLoginAsCustomerEnabledForCustomerChain implements IsLoginAsCustomerEnabledForCustomerInterface
+{
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var IsLoginAsCustomerEnabledForCustomerResultFactory
+     */
+    private $resultFactory;
+
+    /**
+     * @var IsLoginAsCustomerEnabledForCustomerResultInterface[]
+     */
+    private $resolvers;
+
+    /**
+     * @param ConfigInterface $config
+     * @param IsLoginAsCustomerEnabledForCustomerResultFactory $resultFactory
+     * @param array $resolvers
+     */
+    public function __construct(
+        ConfigInterface $config,
+        IsLoginAsCustomerEnabledForCustomerResultFactory $resultFactory,
+        array $resolvers = []
+    ) {
+        $this->config = $config;
+        $this->resultFactory = $resultFactory;
+        $this->resolvers = $resolvers;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(int $customerId): IsLoginAsCustomerEnabledForCustomerResultInterface
+    {
+        $messages = [[]];
+        /** @var IsLoginAsCustomerEnabledForCustomerResultInterface $resolver */
+        foreach ($this->resolvers as $resolver) {
+            $resolverResult = $resolver->execute($customerId);
+            if (!$resolverResult->isEnabled()) {
+                $messages[] = $resolverResult->getMessages();
+            }
+        }
+
+        return $this->resultFactory->create(['messages' => array_merge(...$messages)]);
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomer/Model/IsLoginAsCustomerEnabledForCustomerResult.php b/app/code/Magento/LoginAsCustomer/Model/IsLoginAsCustomerEnabledForCustomerResult.php
new file mode 100644
index 0000000000000..0d2af8669777c
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Model/IsLoginAsCustomerEnabledForCustomerResult.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomer\Model;
+
+use Magento\LoginAsCustomerApi\Api\Data\IsLoginAsCustomerEnabledForCustomerResultInterface;
+
+/**
+ * @inheritdoc
+ */
+class IsLoginAsCustomerEnabledForCustomerResult implements IsLoginAsCustomerEnabledForCustomerResultInterface
+{
+    /**
+     * @var string[]
+     */
+    private $messages;
+
+    /**
+     * @param array $messages
+     */
+    public function __construct(array $messages = [])
+    {
+        $this->messages = $messages;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isEnabled(): bool
+    {
+        return empty($this->messages);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getMessages(): array
+    {
+        return $this->messages;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setMessages(array $messages): void
+    {
+        $this->messages = $messages;
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomer/Model/Resolver/IsLoginAsCustomerEnabledResolver.php b/app/code/Magento/LoginAsCustomer/Model/Resolver/IsLoginAsCustomerEnabledResolver.php
new file mode 100644
index 0000000000000..de16a798983c0
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Model/Resolver/IsLoginAsCustomerEnabledResolver.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomer\Model\Resolver;
+
+use Magento\LoginAsCustomer\Model\IsLoginAsCustomerEnabledForCustomerResultFactory;
+use Magento\LoginAsCustomerApi\Api\ConfigInterface;
+use Magento\LoginAsCustomerApi\Api\Data\IsLoginAsCustomerEnabledForCustomerResultInterface;
+use Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerEnabledForCustomerInterface;
+
+/**
+ * @inheritdoc
+ */
+class IsLoginAsCustomerEnabledResolver implements IsLoginAsCustomerEnabledForCustomerInterface
+{
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var IsLoginAsCustomerEnabledForCustomerResultFactory
+     */
+    private $resultFactory;
+
+    /**
+     * @param ConfigInterface $config
+     * @param IsLoginAsCustomerEnabledForCustomerResultFactory $resultFactory
+     */
+    public function __construct(
+        ConfigInterface $config,
+        IsLoginAsCustomerEnabledForCustomerResultFactory $resultFactory
+    ) {
+        $this->config = $config;
+        $this->resultFactory = $resultFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(int $customerId): IsLoginAsCustomerEnabledForCustomerResultInterface
+    {
+        $messages = [];
+        if (!$this->config->isEnabled()) {
+            $messages[] = __('Login as Customer is disabled.');
+        }
+
+        return $this->resultFactory->create(['messages' => $messages]);
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomer/etc/di.xml b/app/code/Magento/LoginAsCustomer/etc/di.xml
index c0ba4901ba7b8..d4728bc0c8f42 100755
--- a/app/code/Magento/LoginAsCustomer/etc/di.xml
+++ b/app/code/Magento/LoginAsCustomer/etc/di.xml
@@ -5,14 +5,32 @@
  * 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">
-    <preference for="Magento\LoginAsCustomerApi\Api\Data\AuthenticationDataInterface" type="Magento\LoginAsCustomer\Model\AuthenticationData"/>
-    <preference for="Magento\LoginAsCustomerApi\Api\SaveAuthenticationDataInterface" type="Magento\LoginAsCustomer\Model\ResourceModel\SaveAuthenticationData"/>
-    <preference for="Magento\LoginAsCustomerApi\Api\GetAuthenticationDataBySecretInterface" type="Magento\LoginAsCustomer\Model\ResourceModel\GetAuthenticationDataBySecret"/>
-    <preference for="Magento\LoginAsCustomerApi\Api\AuthenticateCustomerBySecretInterface" type="Magento\LoginAsCustomer\Model\AuthenticateCustomerBySecret"/>
-    <preference for="Magento\LoginAsCustomerApi\Api\DeleteAuthenticationDataForUserInterface" type="Magento\LoginAsCustomer\Model\ResourceModel\DeleteAuthenticationDataForUser"/>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Magento\LoginAsCustomerApi\Api\Data\AuthenticationDataInterface"
+                type="Magento\LoginAsCustomer\Model\AuthenticationData"/>
+    <preference for="Magento\LoginAsCustomerApi\Api\SaveAuthenticationDataInterface"
+                type="Magento\LoginAsCustomer\Model\ResourceModel\SaveAuthenticationData"/>
+    <preference for="Magento\LoginAsCustomerApi\Api\GetAuthenticationDataBySecretInterface"
+                type="Magento\LoginAsCustomer\Model\ResourceModel\GetAuthenticationDataBySecret"/>
+    <preference for="Magento\LoginAsCustomerApi\Api\AuthenticateCustomerBySecretInterface"
+                type="Magento\LoginAsCustomer\Model\AuthenticateCustomerBySecret"/>
+    <preference for="Magento\LoginAsCustomerApi\Api\DeleteAuthenticationDataForUserInterface"
+                type="Magento\LoginAsCustomer\Model\ResourceModel\DeleteAuthenticationDataForUser"/>
     <preference for="Magento\LoginAsCustomerApi\Api\ConfigInterface" type="Magento\LoginAsCustomer\Model\Config"/>
-    <preference for="Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerSessionActiveInterface" type="Magento\LoginAsCustomer\Model\ResourceModel\IsLoginAsCustomerSessionActive"/>
+    <preference for="Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerSessionActiveInterface"
+                type="Magento\LoginAsCustomer\Model\ResourceModel\IsLoginAsCustomerSessionActive"/>
+    <preference for="Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerEnabledForCustomerInterface"
+                type="Magento\LoginAsCustomer\Model\IsLoginAsCustomerEnabledForCustomerChain"/>
+    <type name="Magento\LoginAsCustomer\Model\IsLoginAsCustomerEnabledForCustomerChain">
+        <arguments>
+            <argument name="resolvers" xsi:type="array">
+                <item name="is_enabled" xsi:type="object">
+                    Magento\LoginAsCustomer\Model\Resolver\IsLoginAsCustomerEnabledResolver
+                </item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Backend\Model\Auth">
         <plugin name="login_as_customer_admin_logout" type="Magento\LoginAsCustomer\Plugin\AdminLogoutPlugin"/>
     </type>
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php b/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php
index 70eef5347f8e3..27189cb2682e9 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php
@@ -12,6 +12,7 @@
 use Magento\Backend\Model\Auth\Session;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 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;
@@ -22,6 +23,7 @@
 use Magento\LoginAsCustomerApi\Api\Data\AuthenticationDataInterface;
 use Magento\LoginAsCustomerApi\Api\Data\AuthenticationDataInterfaceFactory;
 use Magento\LoginAsCustomerApi\Api\DeleteAuthenticationDataForUserInterface;
+use Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerEnabledForCustomerInterface;
 use Magento\LoginAsCustomerApi\Api\SaveAuthenticationDataInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
@@ -80,6 +82,11 @@ class Login extends Action implements HttpGetActionInterface
      */
     private $url;
 
+    /**
+     * @var IsLoginAsCustomerEnabledForCustomerInterface
+     */
+    private $isLoginAsCustomerEnabled;
+
     /**
      * @param Context $context
      * @param Session $authSession
@@ -87,9 +94,11 @@ class Login extends Action implements HttpGetActionInterface
      * @param CustomerRepositoryInterface $customerRepository
      * @param ConfigInterface $config
      * @param AuthenticationDataInterfaceFactory $authenticationDataFactory
-     * @param SaveAuthenticationDataInterface $saveAuthenticationData ,
+     * @param SaveAuthenticationDataInterface $saveAuthenticationData
      * @param DeleteAuthenticationDataForUserInterface $deleteAuthenticationDataForUser
      * @param Url $url
+     * @param IsLoginAsCustomerEnabledForCustomerInterface $isLoginAsCustomerEnabled
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         Context $context,
@@ -100,7 +109,8 @@ public function __construct(
         AuthenticationDataInterfaceFactory $authenticationDataFactory,
         SaveAuthenticationDataInterface $saveAuthenticationData,
         DeleteAuthenticationDataForUserInterface $deleteAuthenticationDataForUser,
-        Url $url
+        Url $url,
+        ?IsLoginAsCustomerEnabledForCustomerInterface $isLoginAsCustomerEnabled = null
     ) {
         parent::__construct($context);
 
@@ -112,6 +122,8 @@ public function __construct(
         $this->saveAuthenticationData = $saveAuthenticationData;
         $this->deleteAuthenticationDataForUser = $deleteAuthenticationDataForUser;
         $this->url = $url;
+        $this->isLoginAsCustomerEnabled = $isLoginAsCustomerEnabled
+            ?? ObjectManager::getInstance()->get(IsLoginAsCustomerEnabledForCustomerInterface::class);
     }
 
     /**
@@ -126,20 +138,24 @@ public function execute(): ResultInterface
         /** @var Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
 
-        if (!$this->config->isEnabled()) {
-            $this->messageManager->addErrorMessage(__('Login as Customer is disabled.'));
-            return $resultRedirect->setPath('customer/index/index');
-        }
-
         $customerId = (int)$this->_request->getParam('customer_id');
         if (!$customerId) {
             $customerId = (int)$this->_request->getParam('entity_id');
         }
 
+        $isLoginAsCustomerEnabled = $this->isLoginAsCustomerEnabled->execute($customerId);
+        if (!$isLoginAsCustomerEnabled->isEnabled()) {
+            foreach ($isLoginAsCustomerEnabled->getMessages() as $message) {
+                $this->messageManager->addErrorMessage(__($message));
+            }
+
+            return $resultRedirect->setPath('customer/index/index');
+        }
+
         try {
             $customer = $this->customerRepository->getById($customerId);
         } catch (NoSuchEntityException $e) {
-            $this->messageManager->addErrorMessage(__('Customer with this ID are no longer exist.'));
+            $this->messageManager->addErrorMessage('Customer with this ID are no longer exist.');
             return $resultRedirect->setPath('customer/index/index');
         }
 
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Plugin/Button/ToolbarPlugin.php b/app/code/Magento/LoginAsCustomerAdminUi/Plugin/Button/ToolbarPlugin.php
index 89ee2791e38af..3516a181b5dde 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/Plugin/Button/ToolbarPlugin.php
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Plugin/Button/ToolbarPlugin.php
@@ -9,9 +9,10 @@
 
 use Magento\Backend\Block\Widget\Button\ButtonList;
 use Magento\Backend\Block\Widget\Button\Toolbar;
-use Magento\Framework\View\Element\AbstractBlock;
-use Magento\Framework\Escaper;
 use Magento\Framework\AuthorizationInterface;
+use Magento\Framework\Escaper;
+use Magento\Framework\View\Element\AbstractBlock;
+use Magento\LoginAsCustomerAdminUi\Ui\Customer\Component\Button\DataProvider;
 use Magento\LoginAsCustomerApi\Api\ConfigInterface;
 
 /**
@@ -34,20 +35,28 @@ class ToolbarPlugin
      */
     private $config;
 
+    /**
+     * @var DataProvider
+     */
+    private $dataProvider;
+
     /**
      * ToolbarPlugin constructor.
      * @param AuthorizationInterface $authorization
      * @param ConfigInterface $config
      * @param Escaper $escaper
+     * @param DataProvider $dataProvider
      */
     public function __construct(
         AuthorizationInterface $authorization,
         ConfigInterface $config,
-        Escaper $escaper
+        Escaper $escaper,
+        DataProvider $dataProvider
     ) {
         $this->authorization = $authorization;
         $this->config = $config;
         $this->escaper = $escaper;
+        $this->dataProvider = $dataProvider;
     }
 
     /**
@@ -62,10 +71,35 @@ public function beforePushButtons(
         Toolbar $subject,
         AbstractBlock $context,
         ButtonList $buttonList
-    ):void {
-        $order = false;
+    ): void {
         $nameInLayout = $context->getNameInLayout();
 
+        $order = $this->getOrder($nameInLayout, $context);
+        if ($order
+            && !empty($order['customer_id'])
+            && $this->config->isEnabled()
+            && $this->authorization->isAllowed('Magento_LoginAsCustomer::login_button')
+        ) {
+            $customerId = (int)$order['customer_id'];
+            $buttonList->add(
+                'guest_to_customer',
+                $this->dataProvider->getData($customerId),
+                -1
+            );
+        }
+    }
+
+    /**
+     * Extract order data from context.
+     *
+     * @param string $nameInLayout
+     * @param AbstractBlock $context
+     * @return array|null
+     */
+    private function getOrder(string $nameInLayout, AbstractBlock $context)
+    {
+        $order = null;
+
         if ('sales_order_edit' == $nameInLayout) {
             $order = $context->getOrder();
         } elseif ('sales_invoice_view' == $nameInLayout) {
@@ -75,28 +109,7 @@ public function beforePushButtons(
         } elseif ('sales_creditmemo_view' == $nameInLayout) {
             $order = $context->getCreditmemo()->getOrder();
         }
-        if ($order) {
 
-            $isAllowed = $this->authorization->isAllowed('Magento_LoginAsCustomer::login_button');
-            $isEnabled = $this->config->isEnabled();
-            if ($isAllowed && $isEnabled) {
-                if (!empty($order['customer_id'])) {
-                    $buttonUrl = $context->getUrl('loginascustomer/login/login', [
-                        'customer_id' => $order['customer_id']
-                    ]);
-                    $buttonList->add(
-                        'guest_to_customer',
-                        [
-                            'label' => __('Login as Customer'),
-                            'onclick' => 'window.lacConfirmationPopup("'
-                                . $this->escaper->escapeHtml($this->escaper->escapeJs($buttonUrl))
-                                . '")',
-                            'class' => 'reset'
-                        ],
-                        -1
-                    );
-                }
-            }
-        }
+        return $order;
     }
 }
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/Button/DataProvider.php b/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/Button/DataProvider.php
new file mode 100644
index 0000000000000..19db8c67f945e
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/Button/DataProvider.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerAdminUi\Ui\Customer\Component\Button;
+
+use Magento\Framework\Escaper;
+use Magento\Framework\UrlInterface;
+
+/**
+ * Get data for Login as Customer button.
+ *
+ * Use this class as a base for virtual types declaration.
+ *
+ * @api
+ */
+class DataProvider
+{
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
+    /**
+     * @var UrlInterface
+     */
+    private $urlBuilder;
+
+    /**
+     * @var array
+     */
+    private $data;
+
+    /**
+     * @param Escaper $escaper
+     * @param UrlInterface $urlBuilder
+     * @param array $data
+     */
+    public function __construct(
+        Escaper $escaper,
+        UrlInterface $urlBuilder,
+        array $data = []
+    ) {
+        $this->escaper = $escaper;
+        $this->urlBuilder = $urlBuilder;
+        $this->data = $data;
+    }
+
+    /**
+     * Get data for Login as Customer button.
+     *
+     * @param int $customerId
+     * @return array
+     */
+    public function getData(int $customerId): array
+    {
+        $buttonData = [
+            'on_click' => 'window.lacConfirmationPopup("'
+                . $this->escaper->escapeHtml($this->escaper->escapeJs($this->getLoginUrl($customerId)))
+                . '")',
+        ];
+
+        return array_merge_recursive($buttonData, $this->data);
+    }
+
+    /**
+     * Get Login as Customer login url.
+     *
+     * @param int $customerId
+     * @return string
+     */
+    private function getLoginUrl(int $customerId): string
+    {
+        return $this->urlBuilder->getUrl('loginascustomer/login/login', ['customer_id' => $customerId]);
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/Control/LoginAsCustomerButton.php b/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/Control/LoginAsCustomerButton.php
index d900641c131a3..ab43fca3d447e 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/Control/LoginAsCustomerButton.php
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/Control/LoginAsCustomerButton.php
@@ -7,12 +7,13 @@
 
 namespace Magento\LoginAsCustomerAdminUi\Ui\Customer\Component\Control;
 
-use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
-use Magento\Framework\AuthorizationInterface;
-use Magento\Framework\Escaper;
-use Magento\Framework\Registry;
 use Magento\Backend\Block\Widget\Context;
 use Magento\Customer\Block\Adminhtml\Edit\GenericButton;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\AuthorizationInterface;
+use Magento\Framework\Registry;
+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
+use Magento\LoginAsCustomerAdminUi\Ui\Customer\Component\Button\DataProvider;
 use Magento\LoginAsCustomerApi\Api\ConfigInterface;
 
 /**
@@ -31,26 +32,26 @@ class LoginAsCustomerButton extends GenericButton implements ButtonProviderInter
     private $config;
 
     /**
-     * Escaper
-     *
-     * @var Escaper
+     * @var DataProvider
      */
-    private $escaper;
+    private $dataProvider;
 
     /**
      * @param Context $context
      * @param Registry $registry
      * @param ConfigInterface $config
+     * @param DataProvider $dataProvider
      */
     public function __construct(
         Context $context,
         Registry $registry,
-        ConfigInterface $config
+        ConfigInterface $config,
+        ?DataProvider $dataProvider = null
     ) {
         parent::__construct($context, $registry);
         $this->authorization = $context->getAuthorization();
         $this->config = $config;
-        $this->escaper = $context->getEscaper();
+        $this->dataProvider = $dataProvider ?? ObjectManager::getInstance()->get(DataProvider::class);
     }
 
     /**
@@ -58,31 +59,14 @@ public function __construct(
      */
     public function getButtonData(): array
     {
-        $customerId = $this->getCustomerId();
+        $customerId = (int)$this->getCustomerId();
         $data = [];
         $isAllowed = $customerId && $this->authorization->isAllowed('Magento_LoginAsCustomer::login_button');
         $isEnabled = $this->config->isEnabled();
         if ($isAllowed && $isEnabled) {
-            $data = [
-                'label' => __('Login as Customer'),
-                'class' => 'login login-button',
-                'on_click' => 'window.lacConfirmationPopup("'
-                    . $this->escaper->escapeHtml($this->escaper->escapeJs($this->getLoginUrl()))
-                    . '")',
-                'sort_order' => 15,
-            ];
+            $data = $this->dataProvider->getData($customerId);
         }
 
         return $data;
     }
-
-    /**
-     * Get Login as Customer login url.
-     *
-     * @return string
-     */
-    public function getLoginUrl(): string
-    {
-        return $this->getUrl('loginascustomer/login/login', ['customer_id' => $this->getCustomerId()]);
-    }
 }
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/etc/adminhtml/di.xml b/app/code/Magento/LoginAsCustomerAdminUi/etc/adminhtml/di.xml
index dabab45205527..b73a1d856c888 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/etc/adminhtml/di.xml
+++ b/app/code/Magento/LoginAsCustomerAdminUi/etc/adminhtml/di.xml
@@ -6,7 +6,17 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\Backend\Block\Widget\Button\Toolbar">
+    <type name="Magento\Backend\Block\Widget\Button\ToolbarInterface">
         <plugin name="login_as_customer_button_toolbar" type="Magento\LoginAsCustomerAdminUi\Plugin\Button\ToolbarPlugin"/>
     </type>
+    <type name="Magento\LoginAsCustomerAdminUi\Ui\Customer\Component\Control\LoginAsCustomerButton">
+        <arguments>
+            <argument name="dataProvider" xsi:type="object">Magento\LoginAsCustomerAdminUi\Ui\Customer\Component\Control\LoginAsCustomerButton\DataProvider</argument>
+        </arguments>
+    </type>
+    <type name="Magento\LoginAsCustomerAdminUi\Plugin\Button\ToolbarPlugin">
+        <arguments>
+            <argument name="dataProvider" xsi:type="object">Magento\LoginAsCustomerAdminUi\Plugin\Button\ToolbarPlugin\DataProvider</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/etc/di.xml b/app/code/Magento/LoginAsCustomerAdminUi/etc/di.xml
new file mode 100644
index 0000000000000..8ba8c5c6ead43
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAdminUi/etc/di.xml
@@ -0,0 +1,31 @@
+<?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">
+    <!-- Move to adminhtml area after https://github.com/magento/magento2/issues/17825 is fixed. -->
+    <virtualType name="Magento\LoginAsCustomerAdminUi\Ui\Customer\Component\Control\LoginAsCustomerButton\DataProvider"
+                 type="Magento\LoginAsCustomerAdminUi\Ui\Customer\Component\Button\DataProvider">
+        <arguments>
+            <argument name="data" xsi:type="array">
+                <item name="label" xsi:type="string" translatable="true">Login as Customer</item>
+                <item name="class" xsi:type="string">login login-button</item>
+                <item name="sort_order" xsi:type="number">15</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <!-- Move to adminhtml area after https://github.com/magento/magento2/issues/17825 is fixed. -->
+    <virtualType name="Magento\LoginAsCustomerAdminUi\Plugin\Button\ToolbarPlugin\DataProvider"
+                 type="Magento\LoginAsCustomerAdminUi\Ui\Customer\Component\Button\DataProvider">
+        <arguments>
+            <argument name="data" xsi:type="array">
+                <item name="label" xsi:type="string" translatable="true">Login as Customer</item>
+                <item name="class" xsi:type="string">reset</item>
+            </argument>
+        </arguments>
+    </virtualType>
+</config>
diff --git a/app/code/Magento/LoginAsCustomerApi/Api/Data/IsLoginAsCustomerEnabledForCustomerResultInterface.php b/app/code/Magento/LoginAsCustomerApi/Api/Data/IsLoginAsCustomerEnabledForCustomerResultInterface.php
new file mode 100644
index 0000000000000..4f517fd7f315f
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerApi/Api/Data/IsLoginAsCustomerEnabledForCustomerResultInterface.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerApi\Api\Data;
+
+/**
+ * IsLoginAsCustomerEnabledForCustomerInterface results.
+ *
+ * @api
+ */
+interface IsLoginAsCustomerEnabledForCustomerResultInterface
+{
+    /**
+     * Check if no validation failures occurred.
+     *
+     * @return bool
+     */
+    public function isEnabled(): bool;
+
+    /**
+     * Get error messages as array in case of validation failure, else return empty array.
+     *
+     * @return string[]
+     */
+    public function getMessages(): array;
+
+    /**
+     * Set error messages as array in case of validation failure.
+     *
+     * @param string[] $messages
+     */
+    public function setMessages(array $messages): void;
+}
diff --git a/app/code/Magento/LoginAsCustomerApi/Api/IsLoginAsCustomerEnabledForCustomerInterface.php b/app/code/Magento/LoginAsCustomerApi/Api/IsLoginAsCustomerEnabledForCustomerInterface.php
new file mode 100644
index 0000000000000..7742bc23e421b
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerApi/Api/IsLoginAsCustomerEnabledForCustomerInterface.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerApi\Api;
+
+use Magento\LoginAsCustomerApi\Api\Data\IsLoginAsCustomerEnabledForCustomerResultInterface;
+
+/**
+ * Check if Login as Customer functionality is enabled for Customer.
+ *
+ * @api
+ */
+interface IsLoginAsCustomerEnabledForCustomerInterface
+{
+    /**
+     * Check if Login as Customer functionality is enabled for Customer.
+     *
+     * @param int $customerId
+     * @return IsLoginAsCustomerEnabledForCustomerResultInterface
+     */
+    public function execute(int $customerId): IsLoginAsCustomerEnabledForCustomerResultInterface;
+}

From 1086450a07a6d6c98656c7ef08de820a1f35a3db Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Fri, 3 Jul 2020 21:52:52 +0300
Subject: [PATCH 0719/1718] mftf use action group to click done button on popup

---
 ...AdminCategoriesClickDoneButtonOnPopupActionGroup.xml} | 3 ++-
 ...inCreateVirtualProductOutOfStockWithTierPriceTest.xml | 2 +-
 ...ProductWithCustomOptionsSuiteAndImportOptionsTest.xml | 2 +-
 ...ateVirtualProductWithTierPriceForGeneralGroupTest.xml | 2 +-
 .../Test/AdminCreateVirtualProductWithTierPriceTest.xml  | 4 ++--
 .../AdminCreateVirtualProductWithoutManageStockTest.xml  | 2 +-
 .../Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml  | 9 +++------
 .../Test/AdminUpdateSimpleProductTieredPriceTest.xml     | 2 +-
 ...mpleProductWithRegularPriceInStockEnabledFlatTest.xml | 2 +-
 ...WithRegularPriceInStockNotVisibleIndividuallyTest.xml | 2 +-
 ...ctWithRegularPriceInStockUnassignFromCategoryTest.xml | 2 +-
 ...hRegularPriceInStockVisibleInCatalogAndSearchTest.xml | 2 +-
 ...ctWithRegularPriceInStockVisibleInCatalogOnlyTest.xml | 2 +-
 ...uctWithRegularPriceInStockVisibleInSearchOnlyTest.xml | 2 +-
 ...oductWithRegularPriceInStockWithCustomOptionsTest.xml | 2 +-
 ...UpdateSimpleProductWithRegularPriceOutOfStockTest.xml | 2 +-
 ...tWithRegularPriceInStockVisibleInCategoryOnlyTest.xml | 4 ++--
 ...ceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml | 4 ++--
 ...thRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml | 4 ++--
 ...SpecialPriceInStockVisibleInCategoryAndSearchTest.xml | 4 ++--
 ...cialPriceOutOfStockVisibleInCategoryAndSearchTest.xml | 4 ++--
 ...ithTierPriceInStockVisibleInCategoryAndSearchTest.xml | 2 +-
 ...ductWithTierPriceInStockVisibleInCategoryOnlyTest.xml | 4 ++--
 ...TierPriceOutOfStockVisibleInCategoryAndSearchTest.xml | 4 ++--
 ...ProductWithSeveralWebsitesAndCheckURLRewritesTest.xml | 4 ++--
 25 files changed, 37 insertions(+), 39 deletions(-)
 rename app/code/Magento/Catalog/Test/Mftf/ActionGroup/{AdminSubmitCategoriesPopupActionGroup.xml => AdminCategoriesClickDoneButtonOnPopupActionGroup.xml} (81%)

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSubmitCategoriesPopupActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoriesClickDoneButtonOnPopupActionGroup.xml
similarity index 81%
rename from app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSubmitCategoriesPopupActionGroup.xml
rename to app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoriesClickDoneButtonOnPopupActionGroup.xml
index 8905643658cd8..fab7e5fd5584a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSubmitCategoriesPopupActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoriesClickDoneButtonOnPopupActionGroup.xml
@@ -8,11 +8,12 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AdminSubmitCategoriesPopupActionGroup">
+    <actionGroup name="AdminCategoriesClickDoneButtonOnPopupActionGroup">
         <annotations>
             <description>Clicks the "Done" button on the Search Categories popup.</description>
         </annotations>
 
         <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneButton" />
+        <waitForPageLoad stepKey="waitForCategoryApply"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml
index 842f93b49c14a..0a0241cd81d20 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml
@@ -58,7 +58,7 @@
         <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductOutOfStock.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
index 8bb3391b5240b..e8e792348871e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
@@ -46,7 +46,7 @@
         <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductCustomImportOptions.urlKey}}" stepKey="fillUrlKey"/>
         <click selector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" stepKey="clickAdminProductCustomizableOption"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml
index 5076ab2515332..8163a0f89a708 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml
@@ -86,7 +86,7 @@
             <actualResult type="variable">selectedCategories</actualResult>
             <expectedResult type="array">[$categoryEntity.name$]</expectedResult>
         </assertEquals>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneOnCategorySelect"/>
         <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{virtualProductGeneralGroup.visibility}}" stepKey="seeVisibility"/>
         <conditionalClick selector="{{AdminProductSEOSection.sectionHeader}}" dependentSelector="{{AdminProductSEOSection.useDefaultUrl}}" visible="false" stepKey="openSearchEngineOptimizationSection"/>
         <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="scrollToAdminProductSEOSection"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
index faae6a371db24..5c92cb18545d6 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
@@ -49,7 +49,7 @@
         <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{virtualProductBigQty.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductBigQty.urlKey}}" stepKey="fillUrlKey"/>
@@ -86,7 +86,7 @@
             <actualResult type="variable">selectedCategories</actualResult>
             <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
         </assertEquals>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneOnCategorySelect"/>
         <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{virtualProductBigQty.visibility}}" stepKey="seeVisibility"/>
         <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml
index 3b5a8d8e753da..3997b26c58681 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml
@@ -48,7 +48,7 @@
         <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductWithoutManageStock.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml
index 055f4e23cd9e7..9792cc55c3278 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml
@@ -76,8 +76,7 @@
         <fillField userInput="{{SimpleSubCategory.name}}" selector="{{AdminProductFormSection.searchCategory}}" stepKey="fillSearch"/>
         <waitForPageLoad stepKey="waitForSubCategory"/>
         <click selector="{{AdminProductFormSection.selectCategory(SimpleSubCategory.name)}}" stepKey="selectSub1Category"/>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="clickDone"/>
-        <waitForPageLoad stepKey="waitForApplyCategory"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickDone"/>
         <click selector="{{AdminProductFormSection.save}}" stepKey="clickSave"/>
         <waitForPageLoad stepKey="waitForSavingChanges"/>
 
@@ -107,8 +106,7 @@
         <click selector="{{AdminProductFormSection.unselectCategories(SimpleSubCategory.name)}}" stepKey="removeCategory"/>
         <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="openDropDown"/>
         <checkOption selector="{{AdminProductFormSection.selectCategory($$createSecondCategory.name$$)}}" stepKey="selectCategory"/>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="pressButtonDone"/>
-        <waitForPageLoad stepKey="waitForApplyCategory2"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="pressButtonDone"/>
         <click selector="{{AdminProductFormSection.save}}" stepKey="pushButtonSave"/>
         <waitForPageLoad stepKey="waitForSavingProduct"/>
 
@@ -179,8 +177,7 @@
         <fillField userInput="{$grabNameSubCategory}" selector="{{AdminProductFormSection.searchCategory}}" stepKey="fillSearchField"/>
         <waitForPageLoad stepKey="waitForSearchSubCategory"/>
         <click selector="{{AdminProductFormSection.selectCategory({$grabNameSubCategory})}}" stepKey="selectSubCategory"/>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="clickButtonDone"/>
-        <waitForPageLoad stepKey="waitForCategoryApply"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickButtonDone"/>
         <click selector="{{AdminProductFormSection.save}}" stepKey="clickButtonSave"/>
         <waitForPageLoad stepKey="waitForSaveChanges"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml
index f5b0fb8054dc1..1b88993bd605a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml
@@ -74,7 +74,7 @@
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <waitForPageLoad stepKey="waitForCategory2"/>
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductTierPrice300InStock.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest.xml
index 5fa7acbeb8de9..e35791af51132 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest.xml
@@ -67,7 +67,7 @@
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <waitForPageLoad stepKey="waitForCategory2"/>
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{simpleProductEnabledFlat.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductEnabledFlat.urlKey}}" stepKey="fillUrlKey"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockNotVisibleIndividuallyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockNotVisibleIndividuallyTest.xml
index 4b21d1337e9b7..79db8809c057b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockNotVisibleIndividuallyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockNotVisibleIndividuallyTest.xml
@@ -58,7 +58,7 @@
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory"/>
         <waitForPageLoad stepKey="waitForCategory2"/>
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{simpleProductNotVisibleIndividually.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductNotVisibleIndividually.urlKey}}" stepKey="fillSimpleProductUrlKey"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockUnassignFromCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockUnassignFromCategoryTest.xml
index 4256f93ea41d1..a9abecb98ab30 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockUnassignFromCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockUnassignFromCategoryTest.xml
@@ -46,7 +46,7 @@
         <scrollTo selector="{{AdminProductFormSection.productStockStatus}}" stepKey="scroll"/>
         <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
         <click selector="{{AdminProductFormSection.unselectCategories($$initialCategoryEntity.name$$)}}" stepKey="unselectCategories"/>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategory"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategory"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
         <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
         <waitForPageLoad stepKey="waitForSimpleProductSave"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml
index 58db163bed720..497e28db4339e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml
@@ -58,7 +58,7 @@
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <waitForPageLoad stepKey="waitForCategory2"/>
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{simpleProductRegularPrice245InStock.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductRegularPrice245InStock.urlKey}}" stepKey="fillSimpleProductUrlKey"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml
index 5e9a48f659d6b..db7a9e21e5b29 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml
@@ -58,7 +58,7 @@
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory"/>
         <waitForPageLoad stepKey="waitForCategory2"/>
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{simpleProductRegularPrice32501InStock.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductRegularPrice32501InStock.urlKey}}" stepKey="fillUrlKey"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInSearchOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInSearchOnlyTest.xml
index 3d37b54dfa439..1fcaf9e5383cc 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInSearchOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInSearchOnlyTest.xml
@@ -58,7 +58,7 @@
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <waitForPageLoad stepKey="waitForCategory2"/>
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{simpleProductRegularPrice325InStock.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductRegularPrice325InStock.urlKey}}" stepKey="fillUrlKey"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml
index 855a2b1d9b0cc..b8881f4224109 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml
@@ -58,7 +58,7 @@
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory"/>
         <waitForPageLoad stepKey="waitForCategory2"/>
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductRegularPriceCustomOptions.urlKey}}" stepKey="fillUrlKey"/>
         <click selector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" stepKey="clickAdminProductCustomizableOption"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceOutOfStockTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceOutOfStockTest.xml
index af836efcf6be6..068080c3a46f5 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceOutOfStockTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceOutOfStockTest.xml
@@ -58,7 +58,7 @@
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory"/>
         <waitForPageLoad stepKey="waitForCategory2"/>
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductRegularPrice32503OutOfStock.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
index 595f9bcd489ec..25efaaa43d3f2 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
@@ -70,7 +70,7 @@
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <waitForPageLoad stepKey="waitForCategory2"/>
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPrice.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPrice.urlKey}}" stepKey="fillUrlKey"/>
@@ -110,7 +110,7 @@
             <actualResult type="variable">selectedCategories</actualResult>
             <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
         </assertEquals>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneOnCategorySelect"/>
         <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPrice.visibility}}" stepKey="seeVisibility"/>
         <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
index 458d02d61426d..c1a87cd376bdd 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
@@ -57,7 +57,7 @@
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <waitForPageLoad stepKey="waitForCategory2"/>
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPriceInStock.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPriceInStock.urlKey}}" stepKey="fillUrlKey"/>
@@ -149,7 +149,7 @@
             <actualResult type="variable">selectedCategories</actualResult>
             <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
         </assertEquals>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneOnCategorySelect"/>
         <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPriceInStock.visibility}}" stepKey="seeVisibility"/>
         <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
index d5ae971d87695..ab955ea5c256d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
@@ -59,7 +59,7 @@
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <waitForPageLoad stepKey="waitForCategory2"/>
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.urlKey}}" stepKey="fillUrlKey"/>
@@ -92,7 +92,7 @@
             <actualResult type="variable">selectedCategories</actualResult>
             <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
         </assertEquals>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneOnCategorySelect"/>
         <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.visibility}}" stepKey="seeVisibility"/>
         <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml
index d0f4fc8882e3f..7b4fdf2f05523 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml
@@ -65,7 +65,7 @@
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <waitForPageLoad stepKey="waitForCategory2"/>
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductSpecialPrice.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductSpecialPrice.urlKey}}" stepKey="fillUrlKey"/>
@@ -101,7 +101,7 @@
             <actualResult type="variable">selectedCategories</actualResult>
             <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
         </assertEquals>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneOnCategorySelect"/>
         <see selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductSpecialPrice.visibility}}" stepKey="seeVisibility"/>
         <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml
index 2234d6f338b62..a491c0dd10d8f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml
@@ -64,7 +64,7 @@
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <waitForPageLoad stepKey="waitForCategory2"/>
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.urlKey}}" stepKey="fillUrlKey"/>
@@ -99,7 +99,7 @@
             <actualResult type="variable">selectedCategories</actualResult>
             <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
         </assertEquals>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneOnCategorySelect"/>
         <see selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.visibility}}" stepKey="seeVisibility"/>
         <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryAndSearchTest.xml
index ab5d23f0f875e..14497aa5cd5bf 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryAndSearchTest.xml
@@ -97,7 +97,7 @@
             <actualResult type="variable">selectedCategories</actualResult>
             <expectedResult type="array">[$categoryEntity.name$]</expectedResult>
         </assertEquals>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneOnCategorySelect"/>
         <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductTierPriceInStock.visibility}}" stepKey="seeVisibility"/>
 
         <conditionalClick selector="{{AdminProductSEOSection.sectionHeader}}" dependentSelector="{{AdminProductSEOSection.useDefaultUrl}}" visible="false" stepKey="openSearchEngineOptimizationSection"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
index 8f0861fe33371..78fbfc83d6071 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
@@ -70,7 +70,7 @@
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <waitForPageLoad stepKey="waitForCategory2"/>
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductWithTierPriceInStock.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductWithTierPriceInStock.urlKey}}" stepKey="fillUrlKey"/>
@@ -110,7 +110,7 @@
             <actualResult type="variable">selectedCategories</actualResult>
             <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
         </assertEquals>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneOnCategorySelect"/>
         <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductWithTierPriceInStock.visibility}}" stepKey="seeVisibility"/>
         <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
index f7f5385381590..e13760ca7faec 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
@@ -70,7 +70,7 @@
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <waitForPageLoad stepKey="waitForCategory2"/>
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualTierPriceOutOfStock.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualTierPriceOutOfStock.urlKey}}" stepKey="fillUrlKey"/>
@@ -110,7 +110,7 @@
             <actualResult type="variable">selectedCategories</actualResult>
             <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
         </assertEquals>
-        <click selector="{{AdminProductFormSection.done}}" stepKey="clickOnDoneOnCategorySelect"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneOnCategorySelect"/>
         <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualTierPriceOutOfStock.visibility}}" stepKey="seeVisibility"/>
         <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductWithSeveralWebsitesAndCheckURLRewritesTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductWithSeveralWebsitesAndCheckURLRewritesTest.xml
index d890cde5ecf9d..02a8f543f8fa8 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductWithSeveralWebsitesAndCheckURLRewritesTest.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductWithSeveralWebsitesAndCheckURLRewritesTest.xml
@@ -71,11 +71,11 @@
         <actionGroup ref="SetCategoryByNameActionGroup" stepKey="unselectInitialCategory">
             <argument name="categoryName" value="$$rootCategory.name$$"/>
         </actionGroup>
-        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="pressDoneButton"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="pressDoneButton"/>
         <actionGroup ref="SetCategoryByNameActionGroup" stepKey="setNewCategory">
             <argument name="categoryName" value="$$category.name$$"/>
         </actionGroup>
-        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickOnDoneButton"/>
+        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneButton"/>
         <actionGroup ref="SaveProductFormNoSuccessCheckActionGroup" stepKey="saveProduct"/>
 
         <!-- Verify customer see success message -->

From 7a25cc66fa96e520ecd21bf5d7dad5b609dce5ac Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Fri, 3 Jul 2020 23:15:53 +0300
Subject: [PATCH 0720/1718] use actionGroup go to new product attribute page

---
 .../Mftf/Test/AdminAttributeTextSwatchesCanBeFiledTest.xml     | 3 +--
 .../Test/Mftf/Test/AdminCreateDropdownProductAttributeTest.xml | 3 +--
 .../Mftf/Test/AdminCheckColorUploadChooserVisualSwatchTest.xml | 2 +-
 .../Swatches/Test/Mftf/Test/AdminCreateImageSwatchTest.xml     | 3 +--
 .../Swatches/Test/Mftf/Test/AdminCreateTextSwatchTest.xml      | 3 +--
 .../Test/AdminCreateVisualSwatchWithNonValidOptionsTest.xml    | 3 +--
 .../Test/Mftf/Test/StorefrontFilterByImageSwatchTest.xml       | 3 +--
 .../Test/Mftf/Test/StorefrontFilterByTextSwatchTest.xml        | 3 +--
 .../Test/Mftf/Test/StorefrontFilterByVisualSwatchTest.xml      | 3 +--
 .../StorefrontSeeProductImagesMatchingProductSwatchesTest.xml  | 2 +-
 10 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminAttributeTextSwatchesCanBeFiledTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminAttributeTextSwatchesCanBeFiledTest.xml
index 8ac7af096da0a..ef69764a87833 100644
--- a/app/code/Magento/Backend/Test/Mftf/Test/AdminAttributeTextSwatchesCanBeFiledTest.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminAttributeTextSwatchesCanBeFiledTest.xml
@@ -94,8 +94,7 @@
         </actionGroup>
 
         <!--Navigate to Product attribute page-->
-        <amOnPage url="{{ProductAttributePage.url}}" stepKey="navigateToNewProductAttributePage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <actionGroup ref="AdminNavigateToNewProductAttributePageActionGroup" stepKey="navigateToNewProductAttributePage"/>
         <fillField userInput="test_label" selector="{{AttributePropertiesSection.DefaultLabel}}" stepKey="fillDefaultLabel"/>
         <selectOption selector="{{AttributePropertiesSection.InputType}}" userInput="Text Swatch" stepKey="selectInputType"/>
         <click selector="{{AttributePropertiesSection.addSwatch}}" stepKey="clickAddSwatch"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDropdownProductAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDropdownProductAttributeTest.xml
index 88b1c874caadc..b8fec6d5bc001 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDropdownProductAttributeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateDropdownProductAttributeTest.xml
@@ -27,8 +27,7 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
-        <amOnPage url="{{ProductAttributePage.url}}" stepKey="navigateToNewProductAttributePage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <actionGroup ref="AdminNavigateToNewProductAttributePageActionGroup" stepKey="navigateToNewProductAttributePage"/>
 
         <!-- Set attribute properties -->
         <fillField selector="{{AttributePropertiesSection.DefaultLabel}}"
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/AdminCheckColorUploadChooserVisualSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCheckColorUploadChooserVisualSwatchTest.xml
index a4fc0bdcfd1fb..9833ee79a297a 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/AdminCheckColorUploadChooserVisualSwatchTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCheckColorUploadChooserVisualSwatchTest.xml
@@ -19,7 +19,7 @@
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
-        <amOnPage url="{{ProductAttributePage.url}}" stepKey="addNewProductAttribute"/>
+        <actionGroup ref="AdminNavigateToNewProductAttributePageActionGroup" stepKey="addNewProductAttribute"/>
         <selectOption selector="{{AttributePropertiesSection.InputType}}"
                       userInput="{{visualSwatchAttribute.input_type}}" stepKey="fillInputType"/>
 
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateImageSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateImageSwatchTest.xml
index e67d0c763308c..a972456e22ac5 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateImageSwatchTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateImageSwatchTest.xml
@@ -35,8 +35,7 @@
         </after>
 
         <!-- Begin creating a new product attribute of type "Image Swatch" -->
-        <amOnPage url="{{ProductAttributePage.url}}" stepKey="goToNewProductAttributePage"/>
-        <waitForPageLoad stepKey="waitForNewProductAttributePage"/>
+        <actionGroup ref="AdminNavigateToNewProductAttributePageActionGroup" stepKey="goToNewProductAttributePage"/>
         <fillField selector="{{AttributePropertiesSection.DefaultLabel}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="fillDefaultLabel"/>
 
         <!-- Select visual swatch -->
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateTextSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateTextSwatchTest.xml
index 6b2a29d8ec451..6e05e1a4e6c03 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateTextSwatchTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateTextSwatchTest.xml
@@ -25,8 +25,7 @@
         </after>
 
         <!-- Create a new product attribute of type "Text Swatch" -->
-        <amOnPage url="{{ProductAttributePage.url}}" stepKey="goToNewProductAttributePage"/>
-        <waitForPageLoad stepKey="waitForNewProductAttributePage"/>
+        <actionGroup ref="AdminNavigateToNewProductAttributePageActionGroup" stepKey="goToNewProductAttributePage"/>
         <fillField selector="{{AttributePropertiesSection.DefaultLabel}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="fillDefaultLabel"/>
         <selectOption selector="{{AttributePropertiesSection.InputType}}" userInput="swatch_text" stepKey="selectInputType"/>
         <click selector="{{AdminManageSwatchSection.addSwatchText}}" stepKey="clickAddSwatch0"/>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateVisualSwatchWithNonValidOptionsTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateVisualSwatchWithNonValidOptionsTest.xml
index e93a27d377a52..0d58ba8fc9917 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateVisualSwatchWithNonValidOptionsTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/AdminCreateVisualSwatchWithNonValidOptionsTest.xml
@@ -27,8 +27,7 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
-        <amOnPage url="{{ProductAttributePage.url}}" stepKey="navigateToNewProductAttributePage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <actionGroup ref="AdminNavigateToNewProductAttributePageActionGroup" stepKey="navigateToNewProductAttributePage"/>
 
         <!-- Set attribute properties -->
         <fillField selector="{{AttributePropertiesSection.DefaultLabel}}"
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByImageSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByImageSwatchTest.xml
index 2ca26d84d45c7..f90190f9961de 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByImageSwatchTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByImageSwatchTest.xml
@@ -34,8 +34,7 @@
         </after>
 
         <!-- Begin creating a new product attribute -->
-        <amOnPage url="{{ProductAttributePage.url}}" stepKey="goToNewProductAttributePage"/>
-        <waitForPageLoad stepKey="waitForNewProductAttributePage"/>
+        <actionGroup ref="AdminNavigateToNewProductAttributePageActionGroup" stepKey="goToNewProductAttributePage"/>
         <fillField selector="{{AttributePropertiesSection.DefaultLabel}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="fillDefaultLabel"/>
 
         <!-- Select visual swatch -->
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByTextSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByTextSwatchTest.xml
index 82dbff950d62f..7218d257ccf88 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByTextSwatchTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByTextSwatchTest.xml
@@ -32,8 +32,7 @@
         </after>
 
         <!-- Begin creating a new product attribute -->
-        <amOnPage url="{{ProductAttributePage.url}}" stepKey="goToNewProductAttributePage"/>
-        <waitForPageLoad stepKey="waitForNewProductAttributePage"/>
+        <actionGroup ref="AdminNavigateToNewProductAttributePageActionGroup" stepKey="goToNewProductAttributePage"/>
         <fillField selector="{{AttributePropertiesSection.DefaultLabel}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="fillDefaultLabel"/>
 
         <!-- Select text swatch -->
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByVisualSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByVisualSwatchTest.xml
index bf820863cf9b6..84cdc6590b11f 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByVisualSwatchTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByVisualSwatchTest.xml
@@ -34,8 +34,7 @@
         </after>
 
         <!-- Begin creating a new product attribute -->
-        <amOnPage url="{{ProductAttributePage.url}}" stepKey="goToNewProductAttributePage"/>
-        <waitForPageLoad stepKey="waitForNewProductAttributePage"/>
+        <actionGroup ref="AdminNavigateToNewProductAttributePageActionGroup" stepKey="goToNewProductAttributePage"/>
         <fillField selector="{{AttributePropertiesSection.DefaultLabel}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="fillDefaultLabel"/>
 
         <!-- Select visual swatch -->
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSeeProductImagesMatchingProductSwatchesTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSeeProductImagesMatchingProductSwatchesTest.xml
index 43944ceef33ef..27cbb01eafff0 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSeeProductImagesMatchingProductSwatchesTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSeeProductImagesMatchingProductSwatchesTest.xml
@@ -38,7 +38,7 @@
         </after>
 
         <!-- Begin creating a new product attribute -->
-        <amOnPage url="{{ProductAttributePage.url}}" stepKey="goToNewProductAttributePage"/>
+        <actionGroup ref="AdminNavigateToNewProductAttributePageActionGroup" stepKey="goToNewProductAttributePage"/>
 
         <actionGroup ref="AdminFillProductAttributePropertiesActionGroup" stepKey="fillProductAttributeProperties">
             <argument name="attributeName" value="{{VisualSwatchProductAttribute.attribute_code}}"/>

From b59dc722059f3a87716a41dc0f5ae62ec297fb69 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Sat, 4 Jul 2020 02:19:41 +0200
Subject: [PATCH 0721/1718] Avoid multiple calls and config fetch

---
 app/code/Magento/PageCache/Model/Config.php              | 2 +-
 app/code/Magento/PageCache/Model/Layout/LayoutPlugin.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/PageCache/Model/Config.php b/app/code/Magento/PageCache/Model/Config.php
index 10ae41be21d4d..bf144cc46637e 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 $this->_scopeConfig->getValue(self::XML_PAGECACHE_TYPE);
+        return (int)$this->_scopeConfig->getValue(self::XML_PAGECACHE_TYPE);
     }
 
     /**
diff --git a/app/code/Magento/PageCache/Model/Layout/LayoutPlugin.php b/app/code/Magento/PageCache/Model/Layout/LayoutPlugin.php
index 762f393f2a1b9..9e22c95232ee0 100644
--- a/app/code/Magento/PageCache/Model/Layout/LayoutPlugin.php
+++ b/app/code/Magento/PageCache/Model/Layout/LayoutPlugin.php
@@ -74,10 +74,11 @@ public function afterGetOutput(Layout $subject, $result)
     {
         if ($subject->isCacheable() && $this->config->isEnabled()) {
             $tags = [[]];
+            $isVarnish = $this->config->getType() === Config::VARNISH;
+
             foreach ($subject->getAllBlocks() as $block) {
                 if ($block instanceof IdentityInterface) {
                     $isEsiBlock = $block->getTtl() > 0;
-                    $isVarnish = $this->config->getType() == Config::VARNISH;
                     if ($isVarnish && $isEsiBlock) {
                         continue;
                     }

From d8b754ad931aded6c389dddd3467e58dc9f2060e Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Sat, 4 Jul 2020 10:17:49 +0300
Subject: [PATCH 0722/1718] use action group to save categories

---
 ...egoryAndSubcategoryIsNotVisibleInNavigationTest.xml |  3 +--
 ...yAndSubcategoryIsNotVisibleInNavigationMenuTest.xml |  3 +--
 ...egoryAndSubcategoryIsNotVisibleInNavigationTest.xml |  3 +--
 .../Mftf/Test/AdminCheckPaginationInStorefrontTest.xml |  3 +--
 .../Test/AdminCreateCategoryWithAnchorFieldTest.xml    |  3 +--
 .../Test/AdminCreateCategoryWithFiveNestingTest.xml    |  3 +--
 .../AdminMoveAnchoredCategoryToDefaultCategoryTest.xml | 10 ++++------
 7 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveAndNotIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveAndNotIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest.xml
index de8110f995606..e6167d6346ea4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveAndNotIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveAndNotIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest.xml
@@ -40,8 +40,7 @@
         <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
         <checkOption selector="{{AdminCategoryBasicFieldSection.IncludeInMenu}}" stepKey="enableIncludeInMenu"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
-        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSubCategory"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
         <!-- Verify Parent Category and Sub category is not visible in navigation menu -->
         <amOnPage url="$$createCategory.name_lwr$$/{{SimpleSubCategory.name_lwr}}.html" stepKey="openCategoryStoreFrontPage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveCategoryAndSubcategoryIsNotVisibleInNavigationMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveCategoryAndSubcategoryIsNotVisibleInNavigationMenuTest.xml
index fd8093d8d3b52..a2e03079a739a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveCategoryAndSubcategoryIsNotVisibleInNavigationMenuTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveCategoryAndSubcategoryIsNotVisibleInNavigationMenuTest.xml
@@ -39,8 +39,7 @@
         <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
         <checkOption selector="{{AdminCategoryBasicFieldSection.IncludeInMenu}}" stepKey="enableIncludeInMenu"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
-        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSubCategory"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
         <!-- Verify Parent Category and Sub category is not visible in navigation menu -->
         <amOnPage url="$$createCategory.name_lwr$$/{{SimpleSubCategory.name_lwr}}.html" stepKey="openCategoryStoreFrontPage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest.xml
index e6cbe156698e7..21c8c687c7681 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest.xml
@@ -40,8 +40,7 @@
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName"/>
         <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
         <checkOption selector="{{AdminCategoryBasicFieldSection.IncludeInMenu}}" stepKey="enableIncludeInMenu"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
-        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSubCategory"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
         <!-- Verify Parent Category and Sub category is not visible in navigation menu -->
         <amOnPage url="$$createCategory.name_lwr$$/{{SimpleSubCategory.name_lwr}}.html" stepKey="openCategoryStoreFrontPage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml
index 6ac71c4a7982d..6bd06b0196be7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml
@@ -120,8 +120,7 @@
         <waitForPageLoad stepKey="waitFroPageToLoad2"/>
         <see selector="{{AdminProductGridFilterSection.productCount}}" userInput="30" stepKey="seeNumberOfProductsFound"/>
         <click selector="{{AdminCategoryProductsGridSection.productSelectAll}}" stepKey="selectSelectAll"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForCategorySaved"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="clickSaveButton"/>
         <actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage"/>
         <waitForPageLoad stepKey="waitForPageTitleToBeSaved"/>
         <!--Open Category Store Front Page-->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithAnchorFieldTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithAnchorFieldTest.xml
index 4c1993eb803b3..cefc8cc789498 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithAnchorFieldTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithAnchorFieldTest.xml
@@ -57,8 +57,7 @@
         <fillField selector="{{AdminCategoryContentSection.productTableColumnName}}" userInput="$$simpleProduct.name$$"  stepKey="selectProduct"/>
         <click selector="{{AdminCategoryContentSection.productSearch}}" stepKey="clickSearchButton"/>
         <click selector="{{AdminCategoryContentSection.productTableRow}}" stepKey="selectProductFromTableRow"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForCategorySaved"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="clickSaveButton"/>
         <actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage"/>
         <waitForPageLoad stepKey="waitForPageTitleToBeSaved"/>
         <!--Verify the Category Title-->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithFiveNestingTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithFiveNestingTest.xml
index b27d9239c53e1..8b52fe0515f10 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithFiveNestingTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithFiveNestingTest.xml
@@ -40,8 +40,7 @@
         <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
         <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{FirstLevelSubCat.name}}" stepKey="fillFirstSubCategoryName"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveFirstSubCategory"/>
-        <waitForPageLoad stepKey="waitForSFirstSubCategorySaved"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveFirstSubCategory"/>
         <!-- Verify success message -->
         <actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage"/>
         <!--Create Nested Second Sub Category-->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml
index bf5fde3b85bba..7264c8951e080 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml
@@ -39,8 +39,8 @@
         <scrollTo selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" x="0" y="-80" stepKey="scrollToDisplaySetting"/>
         <click selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" stepKey="selectDisplaySetting"/>
         <checkOption selector="{{CategoryDisplaySettingsSection.anchor}}" stepKey="enableAnchor"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
-        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSubCategory"/>
+
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
 
         <!--Enable Anchor for FirstLevelSubCat Category-->
@@ -49,8 +49,7 @@
         <scrollTo selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" x="0" y="-80" stepKey="scrollToDisplaySetting1"/>
         <click selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" stepKey="selectDisplaySetting1"/>
         <checkOption selector="{{CategoryDisplaySettingsSection.anchor}}" stepKey="enableAnchor1"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory1"/>
-        <waitForPageLoad stepKey="waitForSecondCategoryToSave1"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSubCategory1"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage1"/>
 
         <!--Enable Anchor for SimpleSubCategory Category and add products to the Category-->
@@ -64,8 +63,7 @@
         <fillField selector="{{AdminCategoryContentSection.productTableColumnName}}" userInput="$$simpleProduct.name$$" stepKey="selectProduct"/>
         <click selector="{{AdminCategoryContentSection.productSearch}}" stepKey="clickSearchButton"/>
         <click selector="{{AdminCategoryContentSection.productTableRow}}" stepKey="selectProductFromTableRow"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory2"/>
-        <waitForPageLoad stepKey="waitForSecondCategoryToSave2"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSubCategory2"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage2"/>
 
         <!-- TODO: REMOVE AFTER FIX MC-21717 -->

From ac74a48d3e84888a96176985a403362eaa6a9166 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Sat, 4 Jul 2020 10:29:32 +0300
Subject: [PATCH 0723/1718] refactor some files

---
 .../Test/AdminCreateCategoryWithFiveNestingTest.xml  | 12 ++++--------
 .../AdminCreateCategoryWithInactiveCategoryTest.xml  |  3 +--
 ...inCreateCategoryWithInactiveIncludeInMenuTest.xml |  3 +--
 .../AdminCreateCategoryWithNoAnchorFieldTest.xml     |  3 +--
 ...AdminCreateCategoryWithProductsGridFilterTest.xml |  3 +--
 .../AdminCreateCategoryWithRequiredFieldsTest.xml    |  3 +--
 ...teInactiveFlatCategoryAndUpdateAsInactiveTest.xml |  3 +--
 .../Test/AdminCreateInactiveFlatCategoryTest.xml     |  3 +--
 .../AdminCreateInactiveInMenuFlatCategoryTest.xml    |  3 +--
 .../AdminCreateRootCategoryRequiredFieldsTest.xml    |  3 +--
 .../AdminMoveCategoryAndCheckUrlRewritesTest.xml     |  3 +--
 11 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithFiveNestingTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithFiveNestingTest.xml
index 8b52fe0515f10..6215c9b881c84 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithFiveNestingTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithFiveNestingTest.xml
@@ -46,29 +46,25 @@
         <!--Create Nested Second Sub Category-->
         <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton1"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SecondLevelSubCat.name}}" stepKey="fillSecondSubCategoryName"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSecondSubCategory"/>
-        <waitForPageLoad stepKey="waitForSecondCategory"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSecondSubCategory"/>
         <!-- Verify success message -->
         <actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage1"/>
         <!--Create Nested Third Sub Category/>-->
         <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton2"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{ThirdLevelSubCat.name}}" stepKey="fillThirdSubCategoryName"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveThirdSubCategory"/>
-        <waitForPageLoad stepKey="waitForThirdCategorySaved"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveThirdSubCategory"/>
         <!-- Verify success message -->
         <actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage2"/>
         <!--Create Nested fourth Sub Category />-->
         <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton3"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{FourthLevelSubCat.name}}" stepKey="fillFourthSubCategoryName"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveFourthSubCategory"/>
-        <waitForPageLoad stepKey="waitForFourthCategorySaved"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveFourthSubCategory"/>
         <!-- Verify success message -->
         <actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage3"/>
         <!--Create Nested fifth Sub Category />-->
         <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton4"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{FifthLevelCat.name}}" stepKey="fillFifthSubCategoryName"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveFifthLevelCategory"/>
-        <waitForPageLoad stepKey="waitForFifthCategorySaved"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveFifthLevelCategory"/>
         <!-- Verify success message -->
         <actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage4"/>
         <amOnPage url="/{{FirstLevelSubCat.name}}/{{SecondLevelSubCat.name}}/{{ThirdLevelSubCat.name}}/{{FourthLevelSubCat.name}}/{{FifthLevelCat.name}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveCategoryTest.xml
index a7dab57173377..b12b77f2405f8 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveCategoryTest.xml
@@ -30,8 +30,7 @@
         <click selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}" stepKey="disableCategory"/>
         <checkOption selector="{{AdminCategoryBasicFieldSection.IncludeInMenu}}" stepKey="enableIncludeInMenu"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="fillCategoryName"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForCategorySaved"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="clickSaveButton"/>
         <actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage"/>
         <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seePageTitle" />
         <dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="dontCategoryIsChecked"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveIncludeInMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveIncludeInMenuTest.xml
index d3a766be2c99f..6daea64063238 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveIncludeInMenuTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithInactiveIncludeInMenuTest.xml
@@ -30,8 +30,7 @@
         <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
         <click selector="{{AdminCategoryBasicFieldSection.includeInMenuLabel}}" stepKey="disableIncludeInMenu"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="fillCategoryName"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForCategorySaved"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="clickSaveButton"/>
         <actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage"/>
         <waitForPageLoad stepKey="waitForPageSaved"/>
         <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seePageTitle" />
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithNoAnchorFieldTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithNoAnchorFieldTest.xml
index 3273fb62e7d9c..4173254c66fc3 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithNoAnchorFieldTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithNoAnchorFieldTest.xml
@@ -59,8 +59,7 @@
         <actionGroup ref="AdminAddProductToCategoryActionGroup" stepKey="addProductToCategory">
             <argument name="product" value="$$simpleProduct$$"/>
         </actionGroup>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForCategorySaved"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="clickSaveButton"/>
         <actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage"/>
         <waitForPageLoad stepKey="waitForPageTitleToBeSaved"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilterTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilterTest.xml
index 0b269749c5dd6..4e3a01892e3fb 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilterTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilterTest.xml
@@ -72,8 +72,7 @@
         <fillField selector="{{AdminCategoryContentSection.productTableColumnName}}" userInput="{{defaultSimpleProduct.name}}"  stepKey="selectDefaultProduct"/>
         <click selector="{{AdminCategoryContentSection.productSearch}}" stepKey="clickSearchButton1"/>
         <click selector="{{AdminCategoryContentSection.productTableRow}}" stepKey="selectDefaultProductFromTableRow"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="WaitForCategorySaved"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="clickSaveButton"/>
         <actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="successMessageYouSavedTheCategory"/>
         <!--Verify product with grid filter is not not visible-->
         <amOnPage url="{{StorefrontProductPage.url(defaultSimpleProduct.urlKey)}}" stepKey="seeOnProductPage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithRequiredFieldsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithRequiredFieldsTest.xml
index 19552ddaab729..af72dba3f8051 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithRequiredFieldsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithRequiredFieldsTest.xml
@@ -29,8 +29,7 @@
         <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="fillCategoryName"/>
         <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForCategorySaved"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="clickSaveButton"/>
         <!-- Verify success message -->
         <actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage"/>
         <!-- Verify subcategory created with required fields -->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
index f8346f5a9dd5c..4e8d9476eb503 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
@@ -59,8 +59,7 @@
         <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(CatNotActive.name)}}" stepKey="selectCreatedCategory"/>
         <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
-        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSubCategory"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
         <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{CatNotActive.name}}" stepKey="seeUpdatedCategoryTitle"/>
         <dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}"  stepKey="verifyInactiveCategory"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml
index 0aa89bdfd45b6..7e93816c9e890 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml
@@ -60,8 +60,7 @@
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" stepKey="selectCreatedCategory"/>
         <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
         <click selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}" stepKey="disableActiveCategory"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
-        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSubCategory"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
         <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{SimpleSubCategory.name}}" stepKey="seeUpdatedCategoryTitle"/>
         <dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}"  stepKey="verifyInactiveIncludeInMenu"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml
index 171d15fe6ed4f..c1c867715d4dc 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml
@@ -60,8 +60,7 @@
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" stepKey="selectCreatedCategory"/>
         <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
         <click selector="{{AdminCategoryBasicFieldSection.includeInMenuLabel}}" stepKey="disableIcludeInMenuOption"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
-        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSubCategory"/>
         <!--Verify category is saved and Include In Menu Option is disabled in Category Page -->
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
         <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{SimpleSubCategory.name}}" stepKey="seeUpdatedCategoryTitle"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryRequiredFieldsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryRequiredFieldsTest.xml
index 29c7bc6828662..8d947fba5f368 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryRequiredFieldsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryRequiredFieldsTest.xml
@@ -33,8 +33,7 @@
         <click selector="{{AdminCategorySidebarActionSection.AddRootCategoryButton}}" stepKey="ClickOnAddRootButton"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="FillCategoryField"/>
         <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="EnableCheckOption"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="ClickSaveButton"/>
-        <waitForPageLoad stepKey="WaitForCategorySaved"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="ClickSaveButton"/>
         <actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="AssertSuccessMessage"/>
         <seeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.EnableCategory}}"  stepKey="SeeCheckBoxisSelected"/>
         <seeInField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="SeedFieldInput"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml
index 4dbbdc8f4399e..76ead78ac660a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml
@@ -41,8 +41,7 @@
         <!--Create second level category-->
         <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SubCategory.name}}" stepKey="addSubCategoryName"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory1"/>
-        <waitForPageLoad stepKey="waitForSecondCategoryToSave1"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSubCategory1"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage1"/>
 
         <!--Create third level category under second level category-->

From 109cd0969e6b827251abe873f9f0807954db9478 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Sat, 4 Jul 2020 10:36:19 +0300
Subject: [PATCH 0724/1718] use acrion group

---
 ...ynamicBundleProductPricesForCombinationOfOptionsTest.xml | 1 +
 .../Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml  | 3 +--
 .../AdminMoveCategoryFromParentAnchoredCategoryTest.xml     | 3 +--
 ...AdminMoveCategoryToAnotherPositionInCategoryTreeTest.xml | 6 ++----
 .../Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml     | 3 +--
 ...inUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml | 3 +--
 .../Mftf/Test/AdminUpdateCategoryAndMakeInactiveTest.xml    | 3 +--
 .../AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml    | 3 +--
 .../Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml  | 3 +--
 .../Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml | 3 +--
 .../Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml | 3 +--
 .../Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml  | 3 +--
 .../Test/AdminUpdateTopCategoryUrlWithNoRedirectTest.xml    | 3 +--
 .../Mftf/Test/AdminUpdateTopCategoryUrlWithRedirectTest.xml | 3 +--
 .../Mftf/Test/CatalogProductListWidgetOperatorsTest.xml     | 3 +--
 15 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontVerifyDynamicBundleProductPricesForCombinationOfOptionsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontVerifyDynamicBundleProductPricesForCombinationOfOptionsTest.xml
index ac2ab4806fd44..bfa77632c2e6b 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontVerifyDynamicBundleProductPricesForCombinationOfOptionsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontVerifyDynamicBundleProductPricesForCombinationOfOptionsTest.xml
@@ -165,6 +165,7 @@
             <scrollToTopOfPage stepKey="scrollToTop"/>
             <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveTaxOptions"/>
             <waitForPageLoad stepKey="waitForTaxSaved"/>
+
             <see userInput="You saved the configuration." selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccess"/>
 
             <magentoCLI command="indexer:reindex" stepKey="reindex"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml
index 76ead78ac660a..83079416d6b4b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml
@@ -47,8 +47,7 @@
         <!--Create third level category under second level category-->
         <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton1"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName1"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory2"/>
-        <waitForPageLoad stepKey="waitForSecondCategoryToSave2"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSubCategory2"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage2"/>
         <grabFromCurrentUrl stepKey="categoryId" regex="#\/([0-9]*)?\/$#" />
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml
index 116df566f2bd0..d6dfa716790ce 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml
@@ -54,8 +54,7 @@
         <fillField selector="{{AdminCategoryContentSection.productTableColumnName}}" userInput="$$simpleProduct.name$$" stepKey="selectProduct"/>
         <click selector="{{AdminCategoryContentSection.productSearch}}" stepKey="clickSearchButton"/>
         <click selector="{{AdminCategoryContentSection.productTableRow}}" stepKey="selectProductFromTableRow"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory1"/>
-        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSubCategory1"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
 
         <!--Run re-index task -->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryToAnotherPositionInCategoryTreeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryToAnotherPositionInCategoryTreeTest.xml
index fd9e50928d748..6f7c7cd251830 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryToAnotherPositionInCategoryTreeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryToAnotherPositionInCategoryTreeTest.xml
@@ -40,13 +40,11 @@
         <!-- Create three level deep sub Category -->
         <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickAddSubCategoryButton"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{FirstLevelSubCat.name}}" stepKey="fillSubCategoryName"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveFirstLevelSubCategory"/>
-        <waitForPageLoad stepKey="waitForFirstLevelCategoryToSave"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveFirstLevelSubCategory"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
         <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButtonAgain"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SecondLevelSubCat.name}}" stepKey="fillSecondLevelSubCategoryName"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSecondLevelSubCategory"/>
-        <waitForPageLoad stepKey="waitForSecondLevelCategoryToSave"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSecondLevelSubCategory"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSaveSuccessMessage"/>
         <grabFromCurrentUrl stepKey="categoryId" regex="#\/([0-9]*)?\/$#" />
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml
index 055f4e23cd9e7..4d420b110f1a4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml
@@ -63,8 +63,7 @@
         <!-- Create subcategory <Sub1> of the anchored category -->
         <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory1"/>
-        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSubCategory1"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSaveSuccessMessage"/>
 
         <!-- Assign <product1> to the <Sub1> -->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml
index e0e517defdeac..289befeec1cae 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml
@@ -55,8 +55,7 @@
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleRootSubCategory.name)}}" stepKey="selectCategory"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="updateCategoryName"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveUpdatedCategory"/>
-        <waitForPageLoad stepKey="waitForCateforyToSave"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveUpdatedCategory"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
         <waitForPageLoad stepKey="waitForPageToLoad1"/>
         <scrollTo  selector="{{AdminCategorySEOSection.SectionHeader}}" x="0" y="-80" stepKey="scrollToSearchEngineOptimization1"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndMakeInactiveTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndMakeInactiveTest.xml
index a4ba859714982..0c4ed2786d2d0 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndMakeInactiveTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndMakeInactiveTest.xml
@@ -33,8 +33,7 @@
         <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory"/>
         <click selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}" stepKey="disableCategory"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForCategorySaved"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="clickSaveButton"/>
         <actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage"/>
         <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seePageTitle" />
         <dontSeeCheckboxIsChecked selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="dontCategoryIsChecked"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml
index db6cfce167bce..81b67e3fe07cd 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml
@@ -44,8 +44,7 @@
         <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="selectSearchEngineOptimization"/>
         <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{SimpleRootSubCategory.url_key}}" stepKey="fillUpdatedUrlKey"/>
         <fillField selector="{{AdminCategorySEOSection.MetaTitleInput}}" userInput="{{SimpleRootSubCategory.name}}" stepKey="fillUpdatedMetaTitle"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForCategorySaved"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="clickSaveButton"/>
         <actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage"/>
 
         <!--Open UrlRewrite Page-->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml
index 9b827550a6817..26b12dbc9f6be 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml
@@ -55,8 +55,7 @@
         <waitForPageLoad stepKey="waitFroPageToLoad1"/>
         <scrollTo  selector="{{AdminCategoryContentSection.productTableRow}}"  stepKey="scrollToTableRow"/>
         <click selector="{{AdminCategoryContentSection.productTableRow}}" stepKey="selectProduct1FromTableRow"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
-        <waitForPageLoad stepKey="waitForCategorySaved"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="clickSaveButton"/>
         <actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="assertSuccessMessage"/>
         <waitForPageLoad stepKey="waitForPageTitleToBeSaved"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
index 1950b385c4a68..d9c7d6a3ca83e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
@@ -73,8 +73,7 @@
         <waitForPageLoad stepKey="waitFroPageToLoad1"/>
         <scrollTo  selector="{{AdminCategoryContentSection.productTableRow}}"  stepKey="scrollToTableRow"/>
         <click selector="{{AdminCategoryContentSection.productTableRow}}" stepKey="selectProductFromTableRow"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
-        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSubCategory"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
         <!--Open Index Management Page and verify flat categoryIndex status-->
         <magentoCLI command="indexer:reindex" stepKey="reindex"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml
index 1214ba879f211..7010c8d047c0c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml
@@ -62,8 +62,7 @@
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(CatNotIncludeInMenu.name)}}" stepKey="selectCreatedCategory"/>
         <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
         <click selector="{{AdminCategoryBasicFieldSection.includeInMenuLabel}}" stepKey="enableIncludeInMenuOption"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
-        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSubCategory"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
         <!--Run full reindex and clear caches -->
         <magentoCLI command="indexer:reindex" stepKey="reindex"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml
index 490f8dbdc4f81..56b465d83a5ad 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml
@@ -65,8 +65,7 @@
         <scrollTo  selector="{{AdminCategoryContentSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToContent"/>
         <click selector="{{AdminCategoryContentSection.sectionHeader}}"  stepKey="selectContent"/>
         <fillField selector="{{AdminCategoryContentSection.description}}"  userInput="Updated category Description Fields" stepKey="fillUpdatedDescription"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
-        <waitForPageLoad stepKey="waitForSecondCategoryToSave"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSubCategory"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
         <!--Run full reindex and clear caches -->
         <magentoCLI command="indexer:reindex" stepKey="reindex"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithNoRedirectTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithNoRedirectTest.xml
index 5221510fd4dce..af4d413f5e32b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithNoRedirectTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithNoRedirectTest.xml
@@ -55,8 +55,7 @@
         <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="updatedurl" stepKey="updateUrlKey"/>
         <uncheckOption selector="{{AdminCategorySEOSection.UrlKeyRedirectCheckbox}}" stepKey="uncheckPermanentRedirectCheckBox"/>
         <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="selectSearchEngineOptimization1"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveUpdatedCategory"/>
-        <waitForPageLoad stepKey="waitForCategoryToSave"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveUpdatedCategory"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
 
         <!-- Get Category Id -->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithRedirectTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithRedirectTest.xml
index 505ca583da3f4..99b2c83d38696 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithRedirectTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithRedirectTest.xml
@@ -53,8 +53,7 @@
         <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="updateredirecturl" stepKey="updateUrlKey"/>
         <checkOption selector="{{AdminCategorySEOSection.UrlKeyRedirectCheckbox}}" stepKey="checkPermanentRedirectCheckBox"/>
         <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="selectSearchEngineOptimization1"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveUpdatedCategory"/>
-        <waitForPageLoad stepKey="waitForCategoryToSave"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveUpdatedCategory"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
 
         <!-- Get Category ID -->
diff --git a/app/code/Magento/CatalogWidget/Test/Mftf/Test/CatalogProductListWidgetOperatorsTest.xml b/app/code/Magento/CatalogWidget/Test/Mftf/Test/CatalogProductListWidgetOperatorsTest.xml
index 59f0cd7437f44..c40071f4ef263 100644
--- a/app/code/Magento/CatalogWidget/Test/Mftf/Test/CatalogProductListWidgetOperatorsTest.xml
+++ b/app/code/Magento/CatalogWidget/Test/Mftf/Test/CatalogProductListWidgetOperatorsTest.xml
@@ -71,8 +71,7 @@
         <conditionalClick selector="{{AdminCategoryDisplaySettingsSection.settingsHeader}}" dependentSelector="{{AdminCategoryDisplaySettingsSection.displayMode}}" visible="false" stepKey="openDisplaySettingsSection"/>
         <waitForPageLoad stepKey="waitForDisplaySettingsLoad"/>
         <selectOption stepKey="selectStaticBlockOnlyOption" userInput="Static block only" selector="{{AdminCategoryDisplaySettingsSection.displayMode}}"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategoryWithProducts"/>
-        <waitForPageLoad stepKey="waitForCategorySaved"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveCategoryWithProducts"/>
         <actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="seeSuccessMessage"/>
 
         <!--Go to Storefront > category-->

From 40e845e1789f35a218b40fad5880eac9de46feb0 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Sat, 4 Jul 2020 11:02:11 +0300
Subject: [PATCH 0725/1718] use action group to save category

---
 ...ynamicBundleProductPricesForCombinationOfOptionsTest.xml | 6 ++----
 .../Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml    | 2 +-
 .../AdminMoveCategoryFromParentAnchoredCategoryTest.xml     | 2 +-
 .../Test/Mftf/Test/AdminUpdateCategoryStoreUrlKeyTest.xml   | 4 ++--
 .../Test/AdminUpdateCategoryUrlKeyWithStoreViewTest.xml     | 2 +-
 .../Magento/Catalog/Test/Mftf/Test/DeleteCategoriesTest.xml | 2 +-
 .../Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCatalogTest.xml    | 2 +-
 7 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontVerifyDynamicBundleProductPricesForCombinationOfOptionsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontVerifyDynamicBundleProductPricesForCombinationOfOptionsTest.xml
index bfa77632c2e6b..134b6d66fd5d6 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontVerifyDynamicBundleProductPricesForCombinationOfOptionsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontVerifyDynamicBundleProductPricesForCombinationOfOptionsTest.xml
@@ -163,8 +163,7 @@
 
             <!-- Save the settings -->
             <scrollToTopOfPage stepKey="scrollToTop"/>
-            <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveTaxOptions"/>
-            <waitForPageLoad stepKey="waitForTaxSaved"/>
+            <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveTaxOptions"/>
 
             <see userInput="You saved the configuration." selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccess"/>
 
@@ -191,8 +190,7 @@
 
             <!-- Save the settings -->
             <scrollToTopOfPage stepKey="scrollToTop"/>
-            <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveTaxOptions"/>
-            <waitForPageLoad stepKey="waitForTaxSaved"/>
+            <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveTaxOptions"/>
             <see userInput="You saved the configuration." selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccess"/>
 
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml
index 6eb4de39726f0..0cf866a60a13e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml
@@ -44,7 +44,7 @@
         </actionGroup>
         <actionGroup ref="SaveImageActionGroup" stepKey="insertImage"/>
         <actionGroup ref="FillOutUploadImagePopupActionGroup" stepKey="fillOutUploadImagePopup" />
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCatalog"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveCatalog"/>
         <amOnPage url="/{{SimpleSubCategory.name_lwr}}.html" stepKey="goToCategoryFrontPage"/>
         <waitForPageLoad stepKey="waitForPageLoad2"/>
         <seeElement selector="{{StorefrontCategoryMainSection.mediaDescription(ImageUpload3.content)}}" stepKey="assertMediaDescription"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml
index d6dfa716790ce..875cab73d2951 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml
@@ -42,7 +42,7 @@
         <scrollTo selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" x="0" y="-80" stepKey="scrollToDisplaySetting"/>
         <click selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" stepKey="selectDisplaySetting"/>
         <checkOption selector="{{CategoryDisplaySettingsSection.anchor}}" stepKey="enableAnchor"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSubCategory"/>
 
         <!--Create a Subcategory under _defaultCategory category-->
         <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryStoreUrlKeyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryStoreUrlKeyTest.xml
index 87d7f91431dc3..4389bf4bd6383 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryStoreUrlKeyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryStoreUrlKeyTest.xml
@@ -46,7 +46,7 @@
         <uncheckOption selector="{{AdminCategorySEOSection.UrlKeyDefaultValueCheckbox}}" stepKey="uncheckUseDefaultUrlKey"/>
         <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{_defaultCategory.name_lwr}}-hattest" stepKey="enterURLKey"/>
         <uncheckOption selector="{{AdminCategorySEOSection.UrlKeyRedirectCheckbox}}"  stepKey="uncheckRedirect1"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategoryAfterFirstSeoUpdate"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveCategoryAfterFirstSeoUpdate"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccessMessage"/>
         <amOnPage url="" stepKey="goToStorefront"/>
         <waitForPageLoad stepKey="waitForFrontendLoad"/>
@@ -64,7 +64,7 @@
         <click selector="{{AdminCategorySEOSection.SectionHeader}}"  stepKey="openSeoSection2"/>
         <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{_defaultCategory.name_lwr}}" stepKey="enterOriginalURLKey"/>
         <uncheckOption selector="{{AdminCategorySEOSection.UrlKeyRedirectCheckbox}}"  stepKey="uncheckRedirect2"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategoryAfterOriginalSeoKey"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveCategoryAfterOriginalSeoKey"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccessMessageAfterOriginalSeoKey"/>
         <amOnPage url="" stepKey="goToStorefrontAfterOriginalSeoKey"/>
         <waitForPageLoad stepKey="waitForFrontendLoadAfterOriginalSeoKey"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryUrlKeyWithStoreViewTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryUrlKeyWithStoreViewTest.xml
index 6a12b991bd225..e9ff41b0a76f0 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryUrlKeyWithStoreViewTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryUrlKeyWithStoreViewTest.xml
@@ -66,7 +66,7 @@
         <click selector="{{AdminCategorySEOSection.SectionHeader}}"  stepKey="openSeoSection"/>
         <clearField selector="{{AdminCategorySEOSection.UrlKeyInput}}" stepKey="clearUrlKeyField"/>
         <fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="newurlkey" stepKey="enterURLKey"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategoryAfterFirstSeoUpdate"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveCategoryAfterFirstSeoUpdate"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccessMessage"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/DeleteCategoriesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/DeleteCategoriesTest.xml
index ce9ff3af18607..5798fa44b2165 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/DeleteCategoriesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/DeleteCategoriesTest.xml
@@ -152,7 +152,7 @@
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree('$$createNewRootCategoryA.name$$')}}" stepKey="clickOnNewRootCategoryA"/>
         <waitForPageLoad stepKey="waitForPageNewRootCategoryALoad" />
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="Default Category" stepKey="enterCategoryNameAsDefaultCategory"/>
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategoryDefaultCategory"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveCategoryDefaultCategory"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccessMessageAfterSaveDefaultCategory"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCatalogTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCatalogTest.xml
index a15081e0cbda3..d7e4f97ed0bc2 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCatalogTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnCatalogTest.xml
@@ -37,7 +37,7 @@
         <seeElement selector="{{TinyMCESection.InsertImageBtn}}" stepKey="insertImage"/>
         <dontSee selector="{{TinyMCESection.InsertWidgetBtn}}" stepKey="insertWidget" />
         <dontSee selector="{{TinyMCESection.InsertVariableBtn}}" stepKey="insertVariable" />
-        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCatalog"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveCatalog"/>
         <!-- Go to storefront product page, assert product content -->
         <amOnPage url="/{{SimpleSubCategory.name_lwr}}.html" stepKey="goToCategoryFrontPage"/>
         <waitForPageLoad stepKey="waitForPageLoad2"/>

From 8ec67c345e8738fe4382da9f039500b06f4db8a4 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Sun, 5 Jul 2020 18:51:10 +0300
Subject: [PATCH 0726/1718] Revert name of action group

---
 ...nGroup.xml => AdminSubmitCategoriesPopupActionGroup.xml} | 2 +-
 ...AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml | 2 +-
 ...ualProductWithCustomOptionsSuiteAndImportOptionsTest.xml | 2 +-
 ...CreateVirtualProductWithTierPriceForGeneralGroupTest.xml | 2 +-
 .../Test/AdminCreateVirtualProductWithTierPriceTest.xml     | 4 ++--
 .../AdminCreateVirtualProductWithoutManageStockTest.xml     | 2 +-
 .../Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml     | 6 +++---
 .../Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml   | 2 +-
 ...eSimpleProductWithRegularPriceInStockEnabledFlatTest.xml | 2 +-
 ...uctWithRegularPriceInStockNotVisibleIndividuallyTest.xml | 2 +-
 ...oductWithRegularPriceInStockUnassignFromCategoryTest.xml | 2 +-
 ...WithRegularPriceInStockVisibleInCatalogAndSearchTest.xml | 2 +-
 ...oductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml | 2 +-
 ...roductWithRegularPriceInStockVisibleInSearchOnlyTest.xml | 2 +-
 ...eProductWithRegularPriceInStockWithCustomOptionsTest.xml | 2 +-
 ...minUpdateSimpleProductWithRegularPriceOutOfStockTest.xml | 2 +-
 ...ductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml | 4 ++--
 ...PriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml | 4 ++--
 ...tWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml | 4 ++--
 ...ithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml | 4 ++--
 ...SpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml | 4 ++--
 ...ctWithTierPriceInStockVisibleInCategoryAndSearchTest.xml | 2 +-
 ...ProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml | 4 ++--
 ...ithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml | 4 ++--
 ...ateProductWithSeveralWebsitesAndCheckURLRewritesTest.xml | 4 ++--
 25 files changed, 36 insertions(+), 36 deletions(-)
 rename app/code/Magento/Catalog/Test/Mftf/ActionGroup/{AdminCategoriesClickDoneButtonOnPopupActionGroup.xml => AdminSubmitCategoriesPopupActionGroup.xml} (89%)

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoriesClickDoneButtonOnPopupActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSubmitCategoriesPopupActionGroup.xml
similarity index 89%
rename from app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoriesClickDoneButtonOnPopupActionGroup.xml
rename to app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSubmitCategoriesPopupActionGroup.xml
index fab7e5fd5584a..59958f4266084 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoriesClickDoneButtonOnPopupActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSubmitCategoriesPopupActionGroup.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="AdminCategoriesClickDoneButtonOnPopupActionGroup">
+    <actionGroup name="AdminSubmitCategoriesPopupActionGroup">
         <annotations>
             <description>Clicks the "Done" button on the Search Categories popup.</description>
         </annotations>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml
index 0a0241cd81d20..d5327017165cc 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml
@@ -58,7 +58,7 @@
         <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductOutOfStock.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
index e8e792348871e..256a071019c5d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
@@ -46,7 +46,7 @@
         <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductCustomImportOptions.urlKey}}" stepKey="fillUrlKey"/>
         <click selector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" stepKey="clickAdminProductCustomizableOption"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml
index 8163a0f89a708..378264141bf20 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceForGeneralGroupTest.xml
@@ -86,7 +86,7 @@
             <actualResult type="variable">selectedCategories</actualResult>
             <expectedResult type="array">[$categoryEntity.name$]</expectedResult>
         </assertEquals>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneOnCategorySelect"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickOnDoneOnCategorySelect"/>
         <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{virtualProductGeneralGroup.visibility}}" stepKey="seeVisibility"/>
         <conditionalClick selector="{{AdminProductSEOSection.sectionHeader}}" dependentSelector="{{AdminProductSEOSection.useDefaultUrl}}" visible="false" stepKey="openSearchEngineOptimizationSection"/>
         <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="scrollToAdminProductSEOSection"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
index 5c92cb18545d6..c206200fdfd20 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
@@ -49,7 +49,7 @@
         <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{virtualProductBigQty.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductBigQty.urlKey}}" stepKey="fillUrlKey"/>
@@ -86,7 +86,7 @@
             <actualResult type="variable">selectedCategories</actualResult>
             <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
         </assertEquals>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneOnCategorySelect"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickOnDoneOnCategorySelect"/>
         <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{virtualProductBigQty.visibility}}" stepKey="seeVisibility"/>
         <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml
index 3997b26c58681..007f5df1582c4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml
@@ -48,7 +48,7 @@
         <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{virtualProductWithoutManageStock.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml
index 9792cc55c3278..9ad569e384928 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml
@@ -76,7 +76,7 @@
         <fillField userInput="{{SimpleSubCategory.name}}" selector="{{AdminProductFormSection.searchCategory}}" stepKey="fillSearch"/>
         <waitForPageLoad stepKey="waitForSubCategory"/>
         <click selector="{{AdminProductFormSection.selectCategory(SimpleSubCategory.name)}}" stepKey="selectSub1Category"/>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickDone"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickDone"/>
         <click selector="{{AdminProductFormSection.save}}" stepKey="clickSave"/>
         <waitForPageLoad stepKey="waitForSavingChanges"/>
 
@@ -106,7 +106,7 @@
         <click selector="{{AdminProductFormSection.unselectCategories(SimpleSubCategory.name)}}" stepKey="removeCategory"/>
         <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="openDropDown"/>
         <checkOption selector="{{AdminProductFormSection.selectCategory($$createSecondCategory.name$$)}}" stepKey="selectCategory"/>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="pressButtonDone"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="pressButtonDone"/>
         <click selector="{{AdminProductFormSection.save}}" stepKey="pushButtonSave"/>
         <waitForPageLoad stepKey="waitForSavingProduct"/>
 
@@ -177,7 +177,7 @@
         <fillField userInput="{$grabNameSubCategory}" selector="{{AdminProductFormSection.searchCategory}}" stepKey="fillSearchField"/>
         <waitForPageLoad stepKey="waitForSearchSubCategory"/>
         <click selector="{{AdminProductFormSection.selectCategory({$grabNameSubCategory})}}" stepKey="selectSubCategory"/>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickButtonDone"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickButtonDone"/>
         <click selector="{{AdminProductFormSection.save}}" stepKey="clickButtonSave"/>
         <waitForPageLoad stepKey="waitForSaveChanges"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml
index 1b88993bd605a..de26a1749e12b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml
@@ -74,7 +74,7 @@
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <waitForPageLoad stepKey="waitForCategory2"/>
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductTierPrice300InStock.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest.xml
index e35791af51132..7b988284358ab 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest.xml
@@ -67,7 +67,7 @@
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <waitForPageLoad stepKey="waitForCategory2"/>
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{simpleProductEnabledFlat.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductEnabledFlat.urlKey}}" stepKey="fillUrlKey"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockNotVisibleIndividuallyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockNotVisibleIndividuallyTest.xml
index 79db8809c057b..12181c4bf9ca9 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockNotVisibleIndividuallyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockNotVisibleIndividuallyTest.xml
@@ -58,7 +58,7 @@
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory"/>
         <waitForPageLoad stepKey="waitForCategory2"/>
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{simpleProductNotVisibleIndividually.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductNotVisibleIndividually.urlKey}}" stepKey="fillSimpleProductUrlKey"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockUnassignFromCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockUnassignFromCategoryTest.xml
index a9abecb98ab30..e1a2acd51d048 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockUnassignFromCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockUnassignFromCategoryTest.xml
@@ -46,7 +46,7 @@
         <scrollTo selector="{{AdminProductFormSection.productStockStatus}}" stepKey="scroll"/>
         <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
         <click selector="{{AdminProductFormSection.unselectCategories($$initialCategoryEntity.name$$)}}" stepKey="unselectCategories"/>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategory"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickOnDoneAdvancedCategory"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
         <click selector="{{AdminProductFormSection.save}}" stepKey="clickSaveButton"/>
         <waitForPageLoad stepKey="waitForSimpleProductSave"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml
index 497e28db4339e..93343d0a2e014 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml
@@ -58,7 +58,7 @@
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <waitForPageLoad stepKey="waitForCategory2"/>
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{simpleProductRegularPrice245InStock.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductRegularPrice245InStock.urlKey}}" stepKey="fillSimpleProductUrlKey"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml
index db7a9e21e5b29..9daef6bd19d52 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml
@@ -58,7 +58,7 @@
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory"/>
         <waitForPageLoad stepKey="waitForCategory2"/>
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{simpleProductRegularPrice32501InStock.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductRegularPrice32501InStock.urlKey}}" stepKey="fillUrlKey"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInSearchOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInSearchOnlyTest.xml
index 1fcaf9e5383cc..624752edafaf8 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInSearchOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInSearchOnlyTest.xml
@@ -58,7 +58,7 @@
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <waitForPageLoad stepKey="waitForCategory2"/>
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{simpleProductRegularPrice325InStock.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductRegularPrice325InStock.urlKey}}" stepKey="fillUrlKey"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml
index b8881f4224109..f73ee5bde3b27 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml
@@ -58,7 +58,7 @@
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory"/>
         <waitForPageLoad stepKey="waitForCategory2"/>
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductRegularPriceCustomOptions.urlKey}}" stepKey="fillUrlKey"/>
         <click selector="{{AdminProductCustomizableOptionsSection.checkIfCustomizableOptionsTabOpen}}" stepKey="clickAdminProductCustomizableOption"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceOutOfStockTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceOutOfStockTest.xml
index 068080c3a46f5..9f34b0cfd7163 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceOutOfStockTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceOutOfStockTest.xml
@@ -58,7 +58,7 @@
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory"/>
         <waitForPageLoad stepKey="waitForCategory2"/>
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{simpleProductRegularPrice32503OutOfStock.urlKey}}" stepKey="fillUrlKey"/>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
index 25efaaa43d3f2..34518c96148cb 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
@@ -70,7 +70,7 @@
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <waitForPageLoad stepKey="waitForCategory2"/>
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPrice.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPrice.urlKey}}" stepKey="fillUrlKey"/>
@@ -110,7 +110,7 @@
             <actualResult type="variable">selectedCategories</actualResult>
             <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
         </assertEquals>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneOnCategorySelect"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickOnDoneOnCategorySelect"/>
         <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPrice.visibility}}" stepKey="seeVisibility"/>
         <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
index c1a87cd376bdd..4346d985f7893 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
@@ -57,7 +57,7 @@
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <waitForPageLoad stepKey="waitForCategory2"/>
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPriceInStock.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPriceInStock.urlKey}}" stepKey="fillUrlKey"/>
@@ -149,7 +149,7 @@
             <actualResult type="variable">selectedCategories</actualResult>
             <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
         </assertEquals>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneOnCategorySelect"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickOnDoneOnCategorySelect"/>
         <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPriceInStock.visibility}}" stepKey="seeVisibility"/>
         <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
index ab955ea5c256d..799227454ff50 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
@@ -59,7 +59,7 @@
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <waitForPageLoad stepKey="waitForCategory2"/>
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.urlKey}}" stepKey="fillUrlKey"/>
@@ -92,7 +92,7 @@
             <actualResult type="variable">selectedCategories</actualResult>
             <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
         </assertEquals>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneOnCategorySelect"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickOnDoneOnCategorySelect"/>
         <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.visibility}}" stepKey="seeVisibility"/>
         <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml
index 7b4fdf2f05523..8c9974e283879 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml
@@ -65,7 +65,7 @@
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <waitForPageLoad stepKey="waitForCategory2"/>
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductSpecialPrice.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductSpecialPrice.urlKey}}" stepKey="fillUrlKey"/>
@@ -101,7 +101,7 @@
             <actualResult type="variable">selectedCategories</actualResult>
             <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
         </assertEquals>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneOnCategorySelect"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickOnDoneOnCategorySelect"/>
         <see selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductSpecialPrice.visibility}}" stepKey="seeVisibility"/>
         <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml
index a491c0dd10d8f..7cfb1d584440a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml
@@ -64,7 +64,7 @@
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <waitForPageLoad stepKey="waitForCategory2"/>
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.urlKey}}" stepKey="fillUrlKey"/>
@@ -99,7 +99,7 @@
             <actualResult type="variable">selectedCategories</actualResult>
             <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
         </assertEquals>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneOnCategorySelect"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickOnDoneOnCategorySelect"/>
         <see selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.visibility}}" stepKey="seeVisibility"/>
         <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryAndSearchTest.xml
index 14497aa5cd5bf..79a1bf96671d9 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryAndSearchTest.xml
@@ -97,7 +97,7 @@
             <actualResult type="variable">selectedCategories</actualResult>
             <expectedResult type="array">[$categoryEntity.name$]</expectedResult>
         </assertEquals>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneOnCategorySelect"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickOnDoneOnCategorySelect"/>
         <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductTierPriceInStock.visibility}}" stepKey="seeVisibility"/>
 
         <conditionalClick selector="{{AdminProductSEOSection.sectionHeader}}" dependentSelector="{{AdminProductSEOSection.useDefaultUrl}}" visible="false" stepKey="openSearchEngineOptimizationSection"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
index 78fbfc83d6071..aadef10ae7054 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
@@ -70,7 +70,7 @@
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <waitForPageLoad stepKey="waitForCategory2"/>
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductWithTierPriceInStock.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualProductWithTierPriceInStock.urlKey}}" stepKey="fillUrlKey"/>
@@ -110,7 +110,7 @@
             <actualResult type="variable">selectedCategories</actualResult>
             <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
         </assertEquals>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneOnCategorySelect"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickOnDoneOnCategorySelect"/>
         <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualProductWithTierPriceInStock.visibility}}" stepKey="seeVisibility"/>
         <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
index e13760ca7faec..8ff82814f47f1 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
@@ -70,7 +70,7 @@
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <waitForPageLoad stepKey="waitForCategory2"/>
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickOnDoneAdvancedCategorySelect"/>
         <selectOption selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualTierPriceOutOfStock.visibility}}" stepKey="selectVisibility"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection"/>
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="{{updateVirtualTierPriceOutOfStock.urlKey}}" stepKey="fillUrlKey"/>
@@ -110,7 +110,7 @@
             <actualResult type="variable">selectedCategories</actualResult>
             <expectedResult type="array">[$$categoryEntity.name$$]</expectedResult>
         </assertEquals>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneOnCategorySelect"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickOnDoneOnCategorySelect"/>
         <seeInField selector="{{AdminProductFormSection.visibility}}" userInput="{{updateVirtualTierPriceOutOfStock.visibility}}" stepKey="seeVisibility"/>
         <scrollTo selector="{{AdminProductSEOSection.sectionHeader}}" x="0" y="-80" stepKey="scrollToAdminProductSEOSection1"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="clickAdminProductSEOSection1"/>
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductWithSeveralWebsitesAndCheckURLRewritesTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductWithSeveralWebsitesAndCheckURLRewritesTest.xml
index 02a8f543f8fa8..d890cde5ecf9d 100644
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductWithSeveralWebsitesAndCheckURLRewritesTest.xml
+++ b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCreateProductWithSeveralWebsitesAndCheckURLRewritesTest.xml
@@ -71,11 +71,11 @@
         <actionGroup ref="SetCategoryByNameActionGroup" stepKey="unselectInitialCategory">
             <argument name="categoryName" value="$$rootCategory.name$$"/>
         </actionGroup>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="pressDoneButton"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="pressDoneButton"/>
         <actionGroup ref="SetCategoryByNameActionGroup" stepKey="setNewCategory">
             <argument name="categoryName" value="$$category.name$$"/>
         </actionGroup>
-        <actionGroup ref="AdminCategoriesClickDoneButtonOnPopupActionGroup" stepKey="clickOnDoneButton"/>
+        <actionGroup ref="AdminSubmitCategoriesPopupActionGroup" stepKey="clickOnDoneButton"/>
         <actionGroup ref="SaveProductFormNoSuccessCheckActionGroup" stepKey="saveProduct"/>
 
         <!-- Verify customer see success message -->

From e892d452ec8496b26bee0b5f0cb82e86340b4579 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <viktor.sevch@transoftgroup.com>
Date: Mon, 6 Jul 2020 11:11:38 +0300
Subject: [PATCH 0727/1718] MC-35582: [Cloud] Backend not loading after
 authorization for 2.4.0-beta1

---
 .../view/adminhtml/templates/notification.phtml               | 4 ++--
 .../Backend/view/adminhtml/templates/widget/grid.phtml        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/AdminAnalytics/view/adminhtml/templates/notification.phtml b/app/code/Magento/AdminAnalytics/view/adminhtml/templates/notification.phtml
index 718d63dcd5b80..6d56cd4452a91 100644
--- a/app/code/Magento/AdminAnalytics/view/adminhtml/templates/notification.phtml
+++ b/app/code/Magento/AdminAnalytics/view/adminhtml/templates/notification.phtml
@@ -11,14 +11,14 @@
 <?php
 $isAnaliticsVisible = $block->getNotification()->isAnalyticsVisible() ? 1 : 0;
 $isReleaseVisible = $block->getNotification()->isReleaseVisible() ? 1 : 0;
-$scriptString = "
+$scriptString = <<<script
     define('analyticsPopupConfig', function () {
         return {
             analyticsVisible: {$isAnaliticsVisible},
             releaseVisible: {$isReleaseVisible},
         }
     });
-";
+script;
 ?>
 
 <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
index 9034b045f3edf..6f9344d7e1d77 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
@@ -188,8 +188,8 @@ $numColumns = $block->getColumns() !== null ? count($block->getColumns()): 0;
         $scriptString .= 'deps.push(\'mage/adminhtml/grid\');' . PHP_EOL;
 
         $scriptString .= '
-require(deps, function('. ($block->getDependencyJsObject() ? 'registry' : '') .'){' . PHP_EOL .'
-        /* TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed */' . PHP_EOL;
+require(deps, function('. ($block->getDependencyJsObject() ? 'registry' : '') .'){' . PHP_EOL;
+        //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed
         if ($block->getDependencyJsObject()) {
             $scriptString .= 'registry.get(\'' . $block->escapeJs($block->getDependencyJsObject()) .
                 '\', function ('. $block->escapeJs($block->getDependencyJsObject()) . ') {' . PHP_EOL;

From 989ab6eda67eb72e529ded2c41254216d1e95b2e Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Mon, 6 Jul 2020 11:32:07 +0300
Subject: [PATCH 0728/1718] Use actionGroup go to CatalogRulePage

---
 .../Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml  |  5 ++---
 ...talogPriceRuleEntityFromConfigurableProductTest.xml |  3 +--
 ...leteCatalogPriceRuleEntityFromSimpleProductTest.xml |  3 +--
 .../Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml |  2 +-
 ...nEnableAttributeIsUndefinedCatalogPriceRuleTest.xml | 10 ++++------
 .../ApplyCatalogPriceRuleByProductAttributeTest.xml    |  2 +-
 ...yCatalogRuleForSimpleAndConfigurableProductTest.xml |  2 +-
 ...lyCatalogRuleForSimpleProductAndFixedMethodTest.xml |  2 +-
 ...alogRuleForSimpleProductForNewCustomerGroupTest.xml |  2 +-
 ...atalogRuleForSimpleProductWithCustomOptionsTest.xml |  2 +-
 10 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml
index d1f9ebd4c99a4..c4ce7f172212e 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminApplyCatalogRuleByCategoryTest.xml
@@ -36,7 +36,7 @@
             <deleteData createDataKey="createSimpleProductTwo" stepKey="deleteSimpleProductTwo"/>
 
             <!-- Delete the catalog price rule -->
-            <amOnPage stepKey="goToPriceRulePage" url="{{CatalogRulePage.url}}"/>
+            <actionGroup ref="AdminOpenCatalogPriceRulePageActionGroup" stepKey="goToPriceRulePage"/>
             <actionGroup stepKey="deletePriceRule" ref="deleteEntitySecondaryGrid">
                 <argument name="name" value="{{_defaultCatalogRule.name}}"/>
                 <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
@@ -46,8 +46,7 @@
         </after>
 
         <!-- 1. Begin creating a new catalog price rule -->
-        <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToPriceRulePage"/>
-        <waitForPageLoad stepKey="waitForPriceRulePage"/>
+        <actionGroup ref="AdminOpenCatalogPriceRulePageActionGroup" stepKey="goToPriceRulePage"/>
         <click selector="{{AdminGridMainControls.add}}" stepKey="addNewRule"/>
         <waitForPageLoad stepKey="waitForIndividualRulePage"/>
         <fillField selector="{{AdminNewCatalogPriceRule.ruleName}}" userInput="{{_defaultCatalogRule.name}}" stepKey="fillName"/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest/AdminDeleteCatalogPriceRuleEntityFromConfigurableProductTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest/AdminDeleteCatalogPriceRuleEntityFromConfigurableProductTest.xml
index 6b34fd1e67e9b..01a8fde52e2bf 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest/AdminDeleteCatalogPriceRuleEntityFromConfigurableProductTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest/AdminDeleteCatalogPriceRuleEntityFromConfigurableProductTest.xml
@@ -105,8 +105,7 @@
         </after>
 
         <!-- Delete the simple product and catalog price rule -->
-        <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToPriceRulePage1"/>
-        <waitForPageLoad stepKey="waitForPriceRulePage"/>
+        <actionGroup ref="AdminOpenCatalogPriceRulePageActionGroup" stepKey="goToPriceRulePage1"/>
         <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRule1">
             <argument name="name" value="{{DeleteActiveCatalogPriceRuleWithConditions.name}}"/>
             <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest/AdminDeleteCatalogPriceRuleEntityFromSimpleProductTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest/AdminDeleteCatalogPriceRuleEntityFromSimpleProductTest.xml
index 59fa4fde1c88a..0ddf1a08c46fc 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest/AdminDeleteCatalogPriceRuleEntityFromSimpleProductTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleEntityTest/AdminDeleteCatalogPriceRuleEntityFromSimpleProductTest.xml
@@ -49,8 +49,7 @@
         </after>
 
         <!-- Delete the simple product and catalog price rule -->
-        <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToPriceRulePage1"/>
-        <waitForPageLoad stepKey="waitForPriceRulePage"/>
+        <actionGroup ref="AdminOpenCatalogPriceRulePageActionGroup" stepKey="goToPriceRulePage1"/>
         <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRule1">
             <argument name="name" value="{{DeleteActiveCatalogPriceRuleWithConditions.name}}"/>
             <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml
index 69508490774dd..7e8d7b0880f4c 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml
@@ -71,7 +71,7 @@
         <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$0.90" stepKey="seeCorrectPrice2"/>
 
         <!-- Delete the rule -->
-        <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToPriceRulePage"/>
+        <actionGroup ref="AdminOpenCatalogPriceRulePageActionGroup" stepKey="goToPriceRulePage"/>
         <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRule">
             <argument name="name" value="{{_defaultCatalogRule.name}}"/>
             <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml
index 9d7607d7521c9..6b054340391d1 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminEnableAttributeIsUndefinedCatalogPriceRuleTest.xml
@@ -49,7 +49,7 @@
         <after>
 
             <!--Delete created data-->
-            <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToCatalogPriceRulePage"/>
+            <actionGroup ref="AdminOpenCatalogPriceRulePageActionGroup" stepKey="goToCatalogPriceRulePage"/>
             <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRule">
                 <argument name="name" value="{{CatalogRuleWithAllCustomerGroups.name}}"/>
                 <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
@@ -68,8 +68,7 @@
         </after>
 
         <!--Create catalog price rule-->
-        <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToPriceRulePage"/>
-        <waitForPageLoad stepKey="waitForPriceRulePage"/>
+        <actionGroup ref="AdminOpenCatalogPriceRulePageActionGroup" stepKey="goToPriceRulePage"/>
         <actionGroup ref="CreateCatalogPriceRuleActionGroup" stepKey="createCatalogPriceRule">
             <argument name="catalogRule" value="CatalogRuleWithAllCustomerGroups"/>
         </actionGroup>
@@ -104,7 +103,7 @@
 
         <!--Delete previous attribute and Catalog Price Rule-->
         <deleteData createDataKey="createProductAttribute" stepKey="deleteProductAttribute"/>
-        <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToCatalogPriceRulePage"/>
+        <actionGroup ref="AdminOpenCatalogPriceRulePageActionGroup" stepKey="goToCatalogPriceRulePage"/>
         <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRule">
             <argument name="name" value="{{CatalogRuleWithAllCustomerGroups.name}}"/>
             <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
@@ -116,8 +115,7 @@
         </createData>
 
         <!--Create new Catalog Price Rule-->
-        <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToPriceRulePage1"/>
-        <waitForPageLoad stepKey="waitForPriceRulePage1"/>
+        <actionGroup ref="AdminOpenCatalogPriceRulePageActionGroup" stepKey="goToPriceRulePage1"/>
         <actionGroup ref="CreateCatalogPriceRuleActionGroup" stepKey="createCatalogPriceRule1">
             <argument name="catalogRule" value="CatalogRuleWithAllCustomerGroups"/>
         </actionGroup>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogPriceRuleByProductAttributeTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogPriceRuleByProductAttributeTest.xml
index 1919f7d5cc544..cc1e927b2f8cd 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogPriceRuleByProductAttributeTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogPriceRuleByProductAttributeTest.xml
@@ -97,7 +97,7 @@
             <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
             <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
 
-            <amOnPage url="{{CatalogRulePage.url}}" stepKey="goToCatalogPriceRulePage"/>
+            <actionGroup ref="AdminOpenCatalogPriceRulePageActionGroup" stepKey="goToCatalogPriceRulePage"/>
             <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deletePriceRule">
                 <argument name="name" value="{{SimpleCatalogPriceRule.name}}"/>
                 <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleAndConfigurableProductTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleAndConfigurableProductTest.xml
index 23fc7e1a9ffba..d70b29fd23b0b 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleAndConfigurableProductTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleAndConfigurableProductTest.xml
@@ -81,7 +81,7 @@
         </before>
         <after>
             <!-- Delete the catalog price rule -->
-            <amOnPage stepKey="goToPriceRulePage" url="{{CatalogRulePage.url}}"/>
+            <actionGroup ref="AdminOpenCatalogPriceRulePageActionGroup" stepKey="goToPriceRulePage"/>
             <actionGroup stepKey="deletePriceRule" ref="deleteEntitySecondaryGrid">
                 <argument name="name" value="{{_defaultCatalogRule.name}}"/>
                 <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductAndFixedMethodTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductAndFixedMethodTest.xml
index dfd34181108b8..4621af30d01a7 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductAndFixedMethodTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductAndFixedMethodTest.xml
@@ -41,7 +41,7 @@
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
 
             <!-- Delete the catalog price rule -->
-            <amOnPage stepKey="goToPriceRulePage" url="{{CatalogRulePage.url}}"/>
+            <actionGroup ref="AdminOpenCatalogPriceRulePageActionGroup" stepKey="goToPriceRulePage"/>
             <actionGroup stepKey="deletePriceRule" ref="deleteEntitySecondaryGrid">
                 <argument name="name" value="{{CatalogRuleByFixed.name}}"/>
                 <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductForNewCustomerGroupTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductForNewCustomerGroupTest.xml
index 25351ca650db9..6e1ec1ae28c94 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductForNewCustomerGroupTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductForNewCustomerGroupTest.xml
@@ -46,7 +46,7 @@
             <deleteData createDataKey="customerGroup" stepKey="deleteCustomerGroup"/>
 
             <!-- Delete the catalog price rule -->
-            <amOnPage stepKey="goToPriceRulePage" url="{{CatalogRulePage.url}}"/>
+            <actionGroup ref="AdminOpenCatalogPriceRulePageActionGroup" stepKey="goToPriceRulePage"/>
             <actionGroup stepKey="deletePriceRule" ref="deleteEntitySecondaryGrid">
                 <argument name="name" value="{{CatalogRuleByFixed.name}}"/>
                 <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductWithCustomOptionsTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductWithCustomOptionsTest.xml
index 59976fbac1724..6083105390c0d 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductWithCustomOptionsTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductWithCustomOptionsTest.xml
@@ -49,7 +49,7 @@
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
 
             <!-- Delete the catalog price rule -->
-            <amOnPage stepKey="goToPriceRulePage" url="{{CatalogRulePage.url}}"/>
+            <actionGroup ref="AdminOpenCatalogPriceRulePageActionGroup" stepKey="goToPriceRulePage"/>
             <actionGroup stepKey="deletePriceRule" ref="deleteEntitySecondaryGrid">
                 <argument name="name" value="{{_defaultCatalogRule.name}}"/>
                 <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>

From 43837b2efb4c7bfc2d2ae8d9c43f66f7f617fa80 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Mon, 6 Jul 2020 11:48:37 +0300
Subject: [PATCH 0729/1718] Use action group to click
 AdminProductGridSection.firstRow

---
 .../Mftf/Test/StorefrontAdminEditDataTest.xml  |  3 +--
 ...ductGridSectionClickFirstRowActionGroup.xml | 18 ++++++++++++++++++
 .../AdminCreateCategoryFromProductPageTest.xml |  3 +--
 ...ProductGridFilteringByDateAttributeTest.xml |  3 +--
 ...ableProductAttributeValueUniquenessTest.xml |  3 +--
 ...inCheckValidatorConfigurableProductTest.xml |  3 +--
 ...nfigurableProductChildrenOutOfStockTest.xml |  6 ++----
 ...oductOutOfStockAndDeleteCombinationTest.xml |  3 +--
 ...nConfigurableProductUpdateAttributeTest.xml |  4 +---
 ...uctWithCreatingCategoryAndAttributeTest.xml |  3 +--
 ...ProductWithDisabledChildrenProductsTest.xml |  3 +--
 ...nloadableProductWithDefaultSetLinksTest.xml |  3 +--
 ...teDownloadableProductWithGroupPriceTest.xml |  3 +--
 ...eDownloadableProductWithManageStockTest.xml |  3 +--
 ...loadableProductWithOutOfStockStatusTest.xml |  3 +--
 ...DownloadableProductWithSpecialPriceTest.xml |  3 +--
 ...oductWithoutFillingQuantityAndStockTest.xml |  3 +--
 ...ownloadableProductWithoutTaxClassIdTest.xml |  3 +--
 ...refrontGuestCheckoutDisabledProductTest.xml |  6 ++----
 19 files changed, 38 insertions(+), 41 deletions(-)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridSectionClickFirstRowActionGroup.xml

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml
index 8e8df1f4f16f0..d2d7be032b135 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml
@@ -91,8 +91,7 @@
             <argument name="product" value="BundleProduct"/>
         </actionGroup>
         <waitForPageLoad stepKey="waitForProductFilterLoad"/>
-        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage"/>
-        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <actionGroup ref="AdminProductGridSectionClickFirstRowActionGroup" stepKey="clickOnProductPage"/>
 
         <!-- Change the product option title -->
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="BundleOption2" stepKey="fillOptionTitle2"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridSectionClickFirstRowActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridSectionClickFirstRowActionGroup.xml
new file mode 100644
index 0000000000000..da71e7816ef0f
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridSectionClickFirstRowActionGroup.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="AdminProductGridSectionClickFirstRowActionGroup">
+        <annotations>
+            <description>Click first row on the product grid page.</description>
+        </annotations>
+
+        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryFromProductPageTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryFromProductPageTest.xml
index b94c12d1d7a39..9bd2c2f5f4617 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryFromProductPageTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryFromProductPageTest.xml
@@ -39,8 +39,7 @@
             <argument name="product" value="SimpleTwo"/>
         </actionGroup>
         <waitForPageLoad stepKey="waitForFiltersToBeApplied"/>
-        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage"/>
-        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <actionGroup ref="AdminProductGridSectionClickFirstRowActionGroup" stepKey="clickOnProductPage"/>
 
         <!-- Fill out the form for the new category -->
         <actionGroup ref="FillNewProductCategoryActionGroup" stepKey="FillNewProductCategory">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByDateAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByDateAttributeTest.xml
index d47730a99308b..0806d5440ce90 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByDateAttributeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridFilteringByDateAttributeTest.xml
@@ -46,8 +46,7 @@
         <seeElement selector="{{AdminProductGridSection.columnHeader('Set Product as New from Date')}}" stepKey="seeNewFromDateColumn"/>
         <waitForPageLoad stepKey="waitforFiltersToApply"/>
         <actionGroup ref="FilterProductGridBySetNewFromDateActionGroup" stepKey="filterProductGridToCheckSetAsNewColumn"/>
-        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnFirstRowProductGrid"/>
-        <waitForPageLoad stepKey="waitForProductEditPageToLoad"/>
+        <actionGroup ref="AdminProductGridSectionClickFirstRowActionGroup" stepKey="clickOnFirstRowProductGrid"/>
         <actionGroup ref="AdminFormSaveAndCloseActionGroup" stepKey="saveAndCloseProductForm"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="expandFilters"/>
         <seeInField selector="{{AdminProductGridFilterSection.newFromDateFilter}}" userInput="05/16/2018" stepKey="checkForNewFromDate"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckConfigurableProductAttributeValueUniquenessTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckConfigurableProductAttributeValueUniquenessTest.xml
index 8962efbb8dd26..3551b87d57db0 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckConfigurableProductAttributeValueUniquenessTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckConfigurableProductAttributeValueUniquenessTest.xml
@@ -51,8 +51,7 @@
         <actionGroup ref="FilterProductGridByName2ActionGroup" stepKey="filterByName">
             <argument name="name" value="$$createConfigProduct.name$$"/>
         </actionGroup>
-        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductName"/>
-        <waitForPageLoad stepKey="waitForProductEditPageToLoad"/>
+        <actionGroup ref="AdminProductGridSectionClickFirstRowActionGroup" stepKey="clickOnProductName"/>
         <!--Create configurations for the product-->
         <comment userInput="Create configurations for the product" stepKey="createConfigurations"/>
         <conditionalClick selector="{{AdminProductFormConfigurationsSection.sectionHeader}}" dependentSelector="{{AdminProductFormConfigurationsSection.createConfigurations}}" visible="false" stepKey="expandConfigurationsTab1"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml
index dc8c09864d0ab..17787bce12846 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml
@@ -58,8 +58,7 @@
             <argument name="product" value="ApiConfigurableProduct"/>
         </actionGroup>
         <waitForPageLoad stepKey="waitForProductFilterLoad"/>
-        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage"/>
-        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <actionGroup ref="AdminProductGridSectionClickFirstRowActionGroup" stepKey="clickOnProductPage"/>
 
         <!-- Create configurations based off the Text Swatch we created earlier -->
         <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickCreateConfigurations"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest/AdminConfigurableProductChildrenOutOfStockTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest/AdminConfigurableProductChildrenOutOfStockTest.xml
index 8d2f80ef262fd..5313b882dc24b 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest/AdminConfigurableProductChildrenOutOfStockTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest/AdminConfigurableProductChildrenOutOfStockTest.xml
@@ -100,8 +100,7 @@
             <argument name="product" value="ApiSimpleOne"/>
         </actionGroup>
         <waitForPageLoad stepKey="waitForFiltersToBeApplied"/>
-        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage"/>
-        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <actionGroup ref="AdminProductGridSectionClickFirstRowActionGroup" stepKey="clickOnProductPage"/>
 
         <!-- Edit the quantity of the simple first product as 0 -->
         <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="0" stepKey="fillProductQuantity"/>
@@ -120,8 +119,7 @@
             <argument name="product" value="ApiSimpleTwo"/>
         </actionGroup>
         <waitForPageLoad stepKey="waitForFiltersToBeApplied2"/>
-        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage2"/>
-        <waitForPageLoad stepKey="waitForProductPageLoad2"/>
+        <actionGroup ref="AdminProductGridSectionClickFirstRowActionGroup" stepKey="clickOnProductPage2"/>
 
         <!-- Edit the quantity of the second simple product as 0 -->
         <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="0" stepKey="fillProductQuantity2"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest/AdminConfigurableProductOutOfStockAndDeleteCombinationTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest/AdminConfigurableProductOutOfStockAndDeleteCombinationTest.xml
index 3121725c23fe9..e81077a8d1096 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest/AdminConfigurableProductOutOfStockAndDeleteCombinationTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest/AdminConfigurableProductOutOfStockAndDeleteCombinationTest.xml
@@ -109,8 +109,7 @@
             <argument name="product" value="ApiSimpleTwo"/>
         </actionGroup>
         <waitForPageLoad stepKey="waitForFiltersToBeApplied2"/>
-        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage2"/>
-        <waitForPageLoad stepKey="waitForProductPageLoad2"/>
+        <actionGroup ref="AdminProductGridSectionClickFirstRowActionGroup" stepKey="clickOnProductPage2"/>
 
         <!-- Edit the quantity of the second simple product as 0 -->
         <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="0" stepKey="fillProductQuantity2"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateAttributeTest/AdminConfigurableProductUpdateAttributeTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateAttributeTest/AdminConfigurableProductUpdateAttributeTest.xml
index 4b6baf8c58493..edda4254799fd 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateAttributeTest/AdminConfigurableProductUpdateAttributeTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateAttributeTest/AdminConfigurableProductUpdateAttributeTest.xml
@@ -123,9 +123,7 @@
             <argument name="product" value="ApiConfigurableProduct"/>
         </actionGroup>
         <waitForPageLoad stepKey="waitForProductFilterLoad"/>
-
-        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage"/>
-        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <actionGroup ref="AdminProductGridSectionClickFirstRowActionGroup" stepKey="clickOnProductPage"/>
 
         <!-- change the option on the first attribute -->
         <selectOption stepKey="clickFirstAttribute" selector="{{ModifyAttributes.nthExistingAttribute($$createModifiableProductAttribute.default_frontend_label$$)}}" userInput="option1"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithCreatingCategoryAndAttributeTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithCreatingCategoryAndAttributeTest.xml
index 32117fdfe4366..7f556ad19f5fd 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithCreatingCategoryAndAttributeTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithCreatingCategoryAndAttributeTest.xml
@@ -95,8 +95,7 @@
         </actionGroup>
 
         <!-- Assert configurable product on admin product page -->
-        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage"/>
-        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <actionGroup ref="AdminProductGridSectionClickFirstRowActionGroup" stepKey="clickOnProductPage"/>
         <actionGroup ref="AssertConfigurableProductOnAdminProductPageActionGroup" stepKey="assertConfigurableProductOnAdminProductPage">
             <argument name="product" value="ApiConfigurableProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithDisabledChildrenProductsTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithDisabledChildrenProductsTest.xml
index 3bf5666d5a997..62f06427e8604 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithDisabledChildrenProductsTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithDisabledChildrenProductsTest.xml
@@ -96,8 +96,7 @@
         </actionGroup>
 
         <!-- Assert configurable product on admin product page -->
-        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage"/>
-        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <actionGroup ref="AdminProductGridSectionClickFirstRowActionGroup" stepKey="clickOnProductPage"/>
         <actionGroup ref="AssertConfigurableProductOnAdminProductPageActionGroup" stepKey="assertConfigurableProductOnAdminProductPage">
             <argument name="product" value="ApiConfigurableProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithDefaultSetLinksTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithDefaultSetLinksTest.xml
index 850a73cd354a5..e20268663a285 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithDefaultSetLinksTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithDefaultSetLinksTest.xml
@@ -85,8 +85,7 @@
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="findCreatedConfigurableProduct">
             <argument name="product" value="DownloadableProduct"/>
         </actionGroup>
-        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProduct"/>
-        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <actionGroup ref="AdminProductGridSectionClickFirstRowActionGroup" stepKey="clickOnProduct"/>
 
         <!-- Assert downloadable links in product form -->
         <scrollTo selector="{{AdminProductDownloadableSection.sectionLinkGrid}}" stepKey="scrollToLinks"/>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithGroupPriceTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithGroupPriceTest.xml
index ba2e5e89005cf..433bd5181802c 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithGroupPriceTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithGroupPriceTest.xml
@@ -87,8 +87,7 @@
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="findCreatedConfigurableProduct">
             <argument name="product" value="ApiDownloadableProduct"/>
         </actionGroup>
-        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProduct"/>
-        <waitForPageLoad stepKey="waitForProductFormPageLoad"/>
+        <actionGroup ref="AdminProductGridSectionClickFirstRowActionGroup" stepKey="clickOnProduct"/>
 
         <!-- Assert downloadable links in product form -->
         <scrollTo selector="{{AdminProductDownloadableSection.sectionLinkGrid}}" stepKey="scrollToLinks"/>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithManageStockTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithManageStockTest.xml
index 0ff7c9bab26ca..9125676730126 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithManageStockTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithManageStockTest.xml
@@ -94,8 +94,7 @@
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="findCreatedConfigurableProduct">
             <argument name="product" value="DownloadableProduct"/>
         </actionGroup>
-        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProduct"/>
-        <waitForPageLoad stepKey="waitForProductFormPageLoad"/>
+        <actionGroup ref="AdminProductGridSectionClickFirstRowActionGroup" stepKey="clickOnProduct"/>
 
         <!-- Assert downloadable links in product form -->
         <scrollTo selector="{{AdminProductDownloadableSection.sectionLinkGrid}}" stepKey="scrollToLinks"/>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithOutOfStockStatusTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithOutOfStockStatusTest.xml
index 5615c66762c52..03a9351681c5d 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithOutOfStockStatusTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithOutOfStockStatusTest.xml
@@ -86,8 +86,7 @@
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="findCreatedConfigurableProduct">
             <argument name="product" value="DownloadableProductOutOfStock"/>
         </actionGroup>
-        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProduct"/>
-        <waitForPageLoad stepKey="waitForProductFormPageLoad"/>
+        <actionGroup ref="AdminProductGridSectionClickFirstRowActionGroup" stepKey="clickOnProduct"/>
 
         <!-- Assert downloadable links in product form -->
         <scrollTo selector="{{AdminProductDownloadableSection.sectionLinkGrid}}" stepKey="scrollToLinks"/>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithSpecialPriceTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithSpecialPriceTest.xml
index f1d00d83b6666..3a5809ac34a3e 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithSpecialPriceTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithSpecialPriceTest.xml
@@ -86,8 +86,7 @@
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="findCreatedConfigurableProduct">
             <argument name="product" value="ApiDownloadableProduct"/>
         </actionGroup>
-        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProduct"/>
-        <waitForPageLoad stepKey="waitForProductFormPageLoad"/>
+        <actionGroup ref="AdminProductGridSectionClickFirstRowActionGroup" stepKey="clickOnProduct"/>
 
         <!-- Assert downloadable links in product form -->
         <scrollTo selector="{{AdminProductDownloadableSection.sectionLinkGrid}}" stepKey="scrollToLinks"/>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithoutFillingQuantityAndStockTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithoutFillingQuantityAndStockTest.xml
index fb0532d9d1fbe..7509c70ca167e 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithoutFillingQuantityAndStockTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithoutFillingQuantityAndStockTest.xml
@@ -83,8 +83,7 @@
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="findCreatedConfigurableProduct">
             <argument name="product" value="DownloadableProduct"/>
         </actionGroup>
-        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProduct"/>
-        <waitForPageLoad stepKey="waitForProductFormPageLoad"/>
+        <actionGroup ref="AdminProductGridSectionClickFirstRowActionGroup" stepKey="clickOnProduct"/>
 
         <!-- Assert downloadable links in product form -->
         <scrollTo selector="{{AdminProductDownloadableSection.sectionLinkGrid}}" stepKey="scrollToLinks"/>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithoutTaxClassIdTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithoutTaxClassIdTest.xml
index 50a2215d441ad..3204a264931a8 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithoutTaxClassIdTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithoutTaxClassIdTest.xml
@@ -84,8 +84,7 @@
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="findCreatedConfigurableProduct">
             <argument name="product" value="DownloadableProduct"/>
         </actionGroup>
-        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProduct"/>
-        <waitForPageLoad stepKey="waitForProductFormPageLoad"/>
+        <actionGroup ref="AdminProductGridSectionClickFirstRowActionGroup" stepKey="clickOnProduct"/>
 
         <!-- Assert downloadable links in product form -->
         <scrollTo selector="{{AdminProductDownloadableSection.sectionLinkGrid}}" stepKey="scrollToLinks"/>
diff --git a/app/code/Magento/Quote/Test/Mftf/Test/StorefrontGuestCheckoutDisabledProductTest.xml b/app/code/Magento/Quote/Test/Mftf/Test/StorefrontGuestCheckoutDisabledProductTest.xml
index 904a07d72035f..4a7b745e52f8e 100644
--- a/app/code/Magento/Quote/Test/Mftf/Test/StorefrontGuestCheckoutDisabledProductTest.xml
+++ b/app/code/Magento/Quote/Test/Mftf/Test/StorefrontGuestCheckoutDisabledProductTest.xml
@@ -110,8 +110,7 @@
             <argument name="product" value="$$createConfigChildProduct1$$"/>
         </actionGroup>
         <waitForPageLoad stepKey="waitForFiltersToBeApplied"/>
-        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage"/>
-        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <actionGroup ref="AdminProductGridSectionClickFirstRowActionGroup" stepKey="clickOnProductPage"/>
         <!-- Disabled child configurable product -->
         <click selector="{{AdminProductFormSection.enableProductAttributeLabel}}" stepKey="clickDisableProduct"/>
         <actionGroup ref="SaveProductFormActionGroup" stepKey="clickSaveProduct"/>
@@ -141,8 +140,7 @@
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="findCreatedProduct2">
             <argument name="product" value="$$createSimpleProduct2$$"/>
         </actionGroup>
-        <click selector="{{AdminProductGridSection.firstRow}}" stepKey="clickOnProductPage2"/>
-        <waitForPageLoad stepKey="waitForProductPageLoad2"/>
+        <actionGroup ref="AdminProductGridSectionClickFirstRowActionGroup" stepKey="clickOnProductPage2"/>
         <!-- Disabled simple product from grid -->
         <actionGroup ref="ChangeStatusProductUsingProductGridActionGroup" stepKey="disabledProductFromGrid2">
             <argument name="product" value="$$createSimpleProduct2$$"/>

From 2e4b71cdcec16709a93fcfb22be7e482b3f66969 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Mon, 6 Jul 2020 12:24:31 +0300
Subject: [PATCH 0730/1718] fix Configurable Product Links Validation Bug when
 int value is 0

---
 .../Model/Plugin/ProductRepositorySave.php    | 19 +++--
 .../Plugin/ProductRepositorySaveTest.php      | 33 ++++++---
 .../Api/ProductRepositoryTest.php             | 74 ++++++++++++++++++-
 3 files changed, 107 insertions(+), 19 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Model/Plugin/ProductRepositorySave.php b/app/code/Magento/ConfigurableProduct/Model/Plugin/ProductRepositorySave.php
index 8bc7f05b49e30..dc4ad39752e4f 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Plugin/ProductRepositorySave.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Plugin/ProductRepositorySave.php
@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\ConfigurableProduct\Model\Plugin;
 
 use Magento\Catalog\Api\Data\ProductInterface;
@@ -56,7 +59,7 @@ public function beforeSave(
         ProductRepositoryInterface $subject,
         ProductInterface $product,
         $saveOptions = false
-    ) {
+    ): array {
         $result[] = $product;
         if ($product->getTypeId() !== Configurable::TYPE_CODE) {
             return $result;
@@ -102,7 +105,7 @@ public function afterSave(
         ProductInterface $result,
         ProductInterface $product,
         $saveOptions = false
-    ) {
+    ): ProductInterface {
         if ($product->getTypeId() !== Configurable::TYPE_CODE) {
             return $result;
         }
@@ -120,19 +123,23 @@ public function afterSave(
      * @throws InputException
      * @throws NoSuchEntityException
      */
-    private function validateProductLinks(array $attributeCodes, array $linkIds)
+    private function validateProductLinks(array $attributeCodes, array $linkIds): void
     {
         $valueMap = [];
         foreach ($linkIds as $productId) {
             $variation = $this->productRepository->getById($productId);
             $valueKey = '';
             foreach ($attributeCodes as $attributeCode) {
-                if (!$variation->getData($attributeCode)) {
+                if ($variation->getData($attributeCode) === null) {
                     throw new InputException(
-                        __('Product with id "%1" does not contain required attribute "%2".', $productId, $attributeCode)
+                        __(
+                            'Product with id "%1" does not contain required attribute "%2".',
+                            $productId,
+                            $attributeCode
+                        )
                     );
                 }
-                $valueKey = $valueKey . $attributeCode . ':' . $variation->getData($attributeCode) . ';';
+                $valueKey .= $attributeCode . ':' . $variation->getData($attributeCode) . ';';
             }
             if (isset($valueMap[$valueKey])) {
                 throw new InputException(
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Plugin/ProductRepositorySaveTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Plugin/ProductRepositorySaveTest.php
index a79c2ebbceca9..07b4a1faf3db4 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Plugin/ProductRepositorySaveTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Plugin/ProductRepositorySaveTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 declare(strict_types=1);
 
 namespace Magento\ConfigurableProduct\Test\Unit\Model\Plugin;
@@ -18,6 +19,7 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Magento\Framework\Exception\InputException;
 
 /**
  * Test for ProductRepositorySave plugin
@@ -71,7 +73,8 @@ class ProductRepositorySaveTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->productAttributeRepository = $this->getMockForAbstractClass(ProductAttributeRepositoryInterface::class);
+        $this->productAttributeRepository =
+            $this->getMockForAbstractClass(ProductAttributeRepositoryInterface::class);
 
         $this->product = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
@@ -105,8 +108,10 @@ protected function setUp(): void
 
     /**
      * Validating the result after saving a configurable product
+     *
+     * @return void
      */
-    public function testBeforeSaveWhenProductIsSimple()
+    public function testBeforeSaveWhenProductIsSimple(): void
     {
         $this->product->expects(static::once())
             ->method('getTypeId')
@@ -122,8 +127,10 @@ public function testBeforeSaveWhenProductIsSimple()
 
     /**
      * Test saving a configurable product without attribute options
+     *
+     * @return void
      */
-    public function testBeforeSaveWithoutOptions()
+    public function testBeforeSaveWithoutOptions(): void
     {
         $this->product->expects(static::once())
             ->method('getTypeId')
@@ -151,10 +158,12 @@ public function testBeforeSaveWithoutOptions()
 
     /**
      * Test saving a configurable product with same set of attribute values
+     *
+     * @return void
      */
-    public function testBeforeSaveWithLinks()
+    public function testBeforeSaveWithLinks(): void
     {
-        $this->expectException('Magento\Framework\Exception\InputException');
+        $this->expectException(InputException::class);
         $this->expectExceptionMessage('Products "5" and "4" have the same set of attribute values.');
         $links = [4, 5];
         $this->product->expects(static::once())
@@ -191,10 +200,12 @@ public function testBeforeSaveWithLinks()
 
     /**
      * Test saving a configurable product with missing attribute
+     *
+     * @return void
      */
-    public function testBeforeSaveWithLinksWithMissingAttribute()
+    public function testBeforeSaveWithLinksWithMissingAttribute(): void
     {
-        $this->expectException('Magento\Framework\Exception\InputException');
+        $this->expectException(InputException::class);
         $this->expectExceptionMessage('Product with id "4" does not contain required attribute "color".');
         $simpleProductId = 4;
         $links = [$simpleProductId, 5];
@@ -239,17 +250,19 @@ public function testBeforeSaveWithLinksWithMissingAttribute()
         $product->expects(static::once())
             ->method('getData')
             ->with($attributeCode)
-            ->willReturn(false);
+            ->willReturn(null);
 
         $this->plugin->beforeSave($this->productRepository, $this->product);
     }
 
     /**
      * Test saving a configurable product with duplicate attributes
+     *
+     * @return void
      */
-    public function testBeforeSaveWithLinksWithDuplicateAttributes()
+    public function testBeforeSaveWithLinksWithDuplicateAttributes(): void
     {
-        $this->expectException('Magento\Framework\Exception\InputException');
+        $this->expectException(InputException::class);
         $this->expectExceptionMessage('Products "5" and "4" have the same set of attribute values.');
         $links = [4, 5];
         $attributeCode = 'color';
diff --git a/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/ProductRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/ProductRepositoryTest.php
index 4c024008e6853..ade56db3aa4b6 100644
--- a/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/ProductRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/ProductRepositoryTest.php
@@ -6,6 +6,7 @@
 namespace Magento\ConfigurableProduct\Api;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Entity\Attribute;
 use Magento\Eav\Model\Config;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection;
@@ -13,10 +14,12 @@
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Webapi\Rest\Request;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\TestFramework\TestCase\WebapiAbstract;
 
 /**
  * Class ProductRepositoryTest for testing ConfigurableProduct integration
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ProductRepositoryTest extends WebapiAbstract
 {
@@ -28,17 +31,22 @@ class ProductRepositoryTest extends WebapiAbstract
     /**
      * @var Config
      */
-    protected $eavConfig;
+    private $eavConfig;
 
     /**
      * @var ObjectManagerInterface
      */
-    protected $objectManager;
+    private $objectManager;
 
     /**
      * @var Attribute
      */
-    protected $configurableAttribute;
+    private $configurableAttribute;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
 
     /**
      * @inheritdoc
@@ -47,6 +55,7 @@ protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
         $this->eavConfig = $this->objectManager->get(Config::class);
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
     }
 
     /**
@@ -164,6 +173,65 @@ public function testCreateConfigurableProduct()
         $this->assertEquals([$productId1, $productId2], $resultConfigurableProductLinks);
     }
 
+    /**
+     * Create configurable with simple which has zero attribute value
+     *
+     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/configurable_attribute_with_source_model.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @return void
+     */
+    public function testCreateConfigurableProductWithZeroOptionValue(): void
+    {
+        $attributeCode = 'test_configurable_with_sm';
+        $attributeValue = 0;
+
+        $product = $this->productRepository->get('simple');
+        $product->setCustomAttribute($attributeCode, $attributeValue);
+        $this->productRepository->save($product);
+
+        $configurableAttribute = $this->eavConfig->getAttribute('catalog_product', $attributeCode);
+
+        $productData = [
+            'sku' => self::CONFIGURABLE_PRODUCT_SKU,
+            'name' => self::CONFIGURABLE_PRODUCT_SKU,
+            'type_id' => Configurable::TYPE_CODE,
+            'attribute_set_id' => 4,
+            'extension_attributes' => [
+                'configurable_product_options' => [
+                    [
+                        'attribute_id' => $configurableAttribute->getId(),
+                        'label' => 'Test configurable with source model',
+                        'values' => [
+                            ['value_index' => '0'],
+                        ],
+                    ],
+                ],
+                'configurable_product_links' => [$product->getId()],
+            ],
+        ];
+
+        $response = $this->createProduct($productData);
+
+        $this->assertArrayHasKey(ProductInterface::SKU, $response);
+        $this->assertEquals(self::CONFIGURABLE_PRODUCT_SKU, $response[ProductInterface::SKU]);
+
+        $this->assertArrayHasKey(ProductInterface::TYPE_ID, $response);
+        $this->assertEquals('configurable', $response[ProductInterface::TYPE_ID]);
+
+        $this->assertArrayHasKey(ProductInterface::EXTENSION_ATTRIBUTES_KEY, $response);
+        $this->assertArrayHasKey(
+            'configurable_product_options',
+            $response[ProductInterface::EXTENSION_ATTRIBUTES_KEY]
+        );
+        $configurableProductOption =
+            current($response[ProductInterface::EXTENSION_ATTRIBUTES_KEY]['configurable_product_options']);
+
+        $this->assertArrayHasKey('attribute_id', $configurableProductOption);
+        $this->assertEquals($configurableAttribute->getId(), $configurableProductOption['attribute_id']);
+        $this->assertArrayHasKey('values', $configurableProductOption);
+        $this->assertEquals($attributeValue, $configurableAttribute['values'][0]['value_index']);
+    }
+
     /**
      * @magentoApiDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
      */

From b717f1bb11aeac17f0624e66db82a6a49f24295b Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Mon, 6 Jul 2020 12:54:01 +0300
Subject: [PATCH 0731/1718] Use action group for QuickSearch

---
 .../Test/Mftf/Test/AdminDeleteBundleDynamicProductTest.xml | 7 +++----
 .../Test/Mftf/Test/AdminDeleteBundleFixedProductTest.xml   | 7 +++----
 .../Mftf/Test/AdminDeleteProductWithCustomOptionTest.xml   | 7 +++----
 .../Test/Mftf/Test/AdminDeleteSimpleProductTest.xml        | 7 +++----
 .../Test/Mftf/Test/AdminDeleteVirtualProductTest.xml       | 7 +++----
 .../Test/Mftf/Test/AdminDeleteConfigurableProductTest.xml  | 7 +++----
 .../Test/Mftf/Test/AdminDeleteDownloadableProductTest.xml  | 7 +++----
 .../Test/Mftf/Test/AdminDeleteGroupedProductTest.xml       | 7 +++----
 .../Mftf/ActionGroup/StoreFrontQuickSearchActionGroup.xml  | 1 +
 9 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleDynamicProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleDynamicProductTest.xml
index 5b603ef2f0a44..a2f26e235fc23 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleDynamicProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleDynamicProductTest.xml
@@ -40,10 +40,9 @@
         <amOnPage url="{{StorefrontProductPage.url($$createDynamicBundleProduct.name$$)}}" stepKey="amOnBundleProductPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
         <!-- Search for the product by sku -->
-        <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createDynamicBundleProduct.sku$$" stepKey="fillSearchBarByProductSku"/>
-        <waitForPageLoad stepKey="waitForSearchButton"/>
-        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
-        <waitForPageLoad stepKey="waitForSearchResults"/>
+        <actionGroup ref="StoreFrontQuickSearchActionGroup" stepKey="searchByCreatedTerm">
+            <argument name="query" value="$$createDynamicBundleProduct.sku$$"/>
+        </actionGroup>
          <!-- Should not see any search results -->
         <dontSee userInput="$$createDynamicBundleProduct.sku$$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
         <see selector="{{StorefrontCatalogSearchMainSection.message}}" userInput="Your search returned no results." stepKey="seeCantFindProductOneMessage"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleFixedProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleFixedProductTest.xml
index 46244603f2868..edde81f338437 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleFixedProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteBundleFixedProductTest.xml
@@ -37,10 +37,9 @@
         <amOnPage url="{{StorefrontProductPage.url($$createFixedBundleProduct.name$$)}}" stepKey="amOnBundleProductPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
         <!-- Search for the product by sku -->
-        <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createFixedBundleProduct.sku$$" stepKey="fillSearchBarByProductSku"/>
-        <waitForPageLoad stepKey="waitForSearchButton"/>
-        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
-        <waitForPageLoad stepKey="waitForSearchResults"/>
+        <actionGroup ref="StoreFrontQuickSearchActionGroup" stepKey="searchByCreatedTerm">
+            <argument name="query" value="$$createFixedBundleProduct.sku$$"/>
+        </actionGroup>
         <!-- Should not see any search results -->
         <dontSee userInput="$$createFixedBundleProduct.sku$$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
         <see selector="{{StorefrontCatalogSearchMainSection.message}}" userInput="Your search returned no results." stepKey="seeCantFindProductOneMessage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductWithCustomOptionTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductWithCustomOptionTest.xml
index 22e1d7d7c5d9e..4599d0c275214 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductWithCustomOptionTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductWithCustomOptionTest.xml
@@ -38,10 +38,9 @@
         <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="amOnSimpleProductPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
         <!-- Search for the product by sku -->
-        <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createSimpleProduct.sku$$" stepKey="fillSearchBarByProductSku"/>
-        <waitForPageLoad stepKey="waitForSearchButton"/>
-        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
-        <waitForPageLoad stepKey="waitForSearchResults"/>
+        <actionGroup ref="StoreFrontQuickSearchActionGroup" stepKey="searchByCreatedTerm">
+            <argument name="query" value="$$createSimpleProduct.sku$$"/>
+        </actionGroup>
         <!-- Should not see any search results -->
         <dontSee userInput="$$createSimpleProduct.sku$$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
         <see selector="{{StorefrontCatalogSearchMainSection.message}}" userInput="Your search returned no results." stepKey="seeCantFindProductOneMessage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteSimpleProductTest.xml
index 390002f5d9498..bdd1a4b4c70fe 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteSimpleProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteSimpleProductTest.xml
@@ -37,10 +37,9 @@
         <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.name$$)}}" stepKey="amOnSimpleProductPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
         <!-- Search for the product by sku -->
-        <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createSimpleProduct.sku$$" stepKey="fillSearchBarByProductSku"/>
-        <waitForPageLoad stepKey="waitForSearchButton"/>
-        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
-        <waitForPageLoad stepKey="waitForSearchResults"/>
+        <actionGroup ref="StoreFrontQuickSearchActionGroup" stepKey="searchByCreatedTerm">
+            <argument name="query" value="$$createSimpleProduct.sku$$"/>
+        </actionGroup>
         <!-- Should not see any search results -->
         <dontSee userInput="$$createSimpleProduct.sku$$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
         <see selector="{{StorefrontCatalogSearchMainSection.message}}" userInput="Your search returned no results." stepKey="seeCantFindProductOneMessage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteVirtualProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteVirtualProductTest.xml
index f49e1142315eb..dcfcbd699fc6b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteVirtualProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteVirtualProductTest.xml
@@ -38,10 +38,9 @@
         <amOnPage url="{{StorefrontProductPage.url($$createVirtualProduct.name$$)}}" stepKey="amOnVirtualProductPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
         <!-- Search for the product by sku -->
-        <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createVirtualProduct.sku$$" stepKey="fillSearchBarByProductSku"/>
-        <waitForPageLoad stepKey="waitForSearchButton"/>
-        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
-        <waitForPageLoad stepKey="waitForSearchResults"/>
+        <actionGroup ref="StoreFrontQuickSearchActionGroup" stepKey="searchByCreatedTerm">
+            <argument name="query" value="$$createVirtualProduct.sku$$"/>
+        </actionGroup>
         <!-- Should not see any search results -->
         <dontSee userInput="$$createVirtualProduct.sku$$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
         <see selector="{{StorefrontCatalogSearchMainSection.message}}" userInput="Your search returned no results." stepKey="seeCantFindProductOneMessage"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminDeleteConfigurableProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminDeleteConfigurableProductTest.xml
index e625a1cf6f2be..1a6d802987cd3 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminDeleteConfigurableProductTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminDeleteConfigurableProductTest.xml
@@ -36,10 +36,9 @@
         <amOnPage url="{{StorefrontProductPage.url($$createConfigurableProduct.name$$)}}" stepKey="amOnConfigurableProductPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
         <!-- Search for the product by sku -->
-        <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createConfigurableProduct.sku$$" stepKey="fillSearchBarByProductSku"/>
-        <waitForPageLoad stepKey="waitForSearchButton"/>
-        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
-        <waitForPageLoad stepKey="waitForSearchResults"/>
+        <actionGroup ref="StoreFrontQuickSearchActionGroup" stepKey="searchBarByProductSku">
+            <argument name="query" value="$$createConfigurableProduct.sku$$"/>
+        </actionGroup>
         <!-- Should not see any search results -->
         <dontSee userInput="$$createConfigurableProduct.sku$$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
         <see selector="{{StorefrontCatalogSearchMainSection.message}}" userInput="Your search returned no results." stepKey="seeCantFindProductOneMessage"/>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDeleteDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDeleteDownloadableProductTest.xml
index 7062b15aeedbf..e04b53ff208af 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDeleteDownloadableProductTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminDeleteDownloadableProductTest.xml
@@ -44,10 +44,9 @@
         <amOnPage url="{{StorefrontProductPage.url($$createDownloadableProduct.name$$)}}" stepKey="amOnDownloadableProductPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
         <!-- Search for the product by sku -->
-        <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createDownloadableProduct.sku$$" stepKey="fillSearchBarByProductSku"/>
-        <waitForPageLoad stepKey="waitForSearchButton"/>
-        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
-        <waitForPageLoad stepKey="waitForSearchResults"/>
+        <actionGroup ref="StoreFrontQuickSearchActionGroup" stepKey="searchByCreatedTerm">
+            <argument name="query" value="$$createDownloadableProduct.sku$$"/>
+        </actionGroup>
         <!-- Should not see any search results -->
         <dontSee userInput="$$createDownloadableProduct.sku$$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
         <see selector="{{StorefrontCatalogSearchMainSection.message}}" userInput="Your search returned no results." stepKey="seeCantFindProductOneMessage"/>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminDeleteGroupedProductTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminDeleteGroupedProductTest.xml
index b88f909d977ab..a00a341c4e6af 100644
--- a/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminDeleteGroupedProductTest.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/AdminDeleteGroupedProductTest.xml
@@ -42,10 +42,9 @@
         <amOnPage url="{{StorefrontProductPage.url($$createGroupedProduct.name$$)}}" stepKey="amOnGroupedProductPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="Whoops, our bad..." stepKey="seeWhoops"/>
         <!--Search for the product by sku-->
-        <fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="$$createGroupedProduct.sku$$" stepKey="fillSearchBarByProductSku"/>
-        <waitForPageLoad stepKey="waitForSearchButton"/>
-        <click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
-        <waitForPageLoad stepKey="waitForSearchResults"/>
+        <actionGroup ref="StoreFrontQuickSearchActionGroup" stepKey="searchByCreatedTerm">
+            <argument name="query" value="$$createGroupedProduct.sku$$"/>
+        </actionGroup>
         <!-- Should not see any search results -->
         <dontSee userInput="$$createGroupedProduct.sku$$" selector="{{StorefrontCatalogSearchMainSection.searchResults}}" stepKey="dontSeeProduct"/>
         <see selector="{{StorefrontCatalogSearchMainSection.message}}" userInput="Your search returned no results." stepKey="seeCantFindProductOneMessage"/>
diff --git a/app/code/Magento/Search/Test/Mftf/ActionGroup/StoreFrontQuickSearchActionGroup.xml b/app/code/Magento/Search/Test/Mftf/ActionGroup/StoreFrontQuickSearchActionGroup.xml
index aec874e7b6d85..840d8439e3d63 100644
--- a/app/code/Magento/Search/Test/Mftf/ActionGroup/StoreFrontQuickSearchActionGroup.xml
+++ b/app/code/Magento/Search/Test/Mftf/ActionGroup/StoreFrontQuickSearchActionGroup.xml
@@ -16,5 +16,6 @@
         <fillField stepKey="fillSearchField" selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="{{query}}"/>
         <waitForElementVisible selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="waitForSubmitButton"/>
         <click stepKey="clickSearchButton" selector="{{StorefrontQuickSearchSection.searchButton}}"/>
+        <waitForPageLoad stepKey="waitForSearchResults"/>
     </actionGroup>
 </actionGroups>

From ff32a42f724f185084314b81cd4e3ed36001bca0 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Mon, 6 Jul 2020 13:16:45 +0300
Subject: [PATCH 0732/1718] magento/magento2-login-as-customer#190: No order
 comments are created when admin is logged in as customer and place order with
 Multiple Addresses.

---
 .../Magento/LoginAsCustomerSales/etc/frontend/di.xml | 12 ++++++++++++
 .../LoginAsCustomerSales/etc/webapi_rest/di.xml      |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/LoginAsCustomerSales/etc/frontend/di.xml

diff --git a/app/code/Magento/LoginAsCustomerSales/etc/frontend/di.xml b/app/code/Magento/LoginAsCustomerSales/etc/frontend/di.xml
new file mode 100644
index 0000000000000..1a010fcdead85
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerSales/etc/frontend/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\Sales\Model\Order">
+        <plugin name="front-order-placement-comment" type="Magento\LoginAsCustomerSales\Plugin\FrontAddCommentOnOrderPlacementPlugin"/>
+    </type>
+</config>
diff --git a/app/code/Magento/LoginAsCustomerSales/etc/webapi_rest/di.xml b/app/code/Magento/LoginAsCustomerSales/etc/webapi_rest/di.xml
index 1a010fcdead85..6dda349f1e60d 100644
--- a/app/code/Magento/LoginAsCustomerSales/etc/webapi_rest/di.xml
+++ b/app/code/Magento/LoginAsCustomerSales/etc/webapi_rest/di.xml
@@ -7,6 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <type name="Magento\Sales\Model\Order">
-        <plugin name="front-order-placement-comment" type="Magento\LoginAsCustomerSales\Plugin\FrontAddCommentOnOrderPlacementPlugin"/>
+        <plugin name="rest-order-placement-comment" type="Magento\LoginAsCustomerSales\Plugin\FrontAddCommentOnOrderPlacementPlugin"/>
     </type>
 </config>

From 616f0827865ba282c1f9ea3ac33ec0a2c314a82a Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Mon, 6 Jul 2020 14:06:29 +0300
Subject: [PATCH 0733/1718] move to new method

---
 .../ResourceModel/CustomerRepository.php      | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
index 8125ddc52c8df..4a5b8a6d3f45c 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
@@ -196,7 +196,6 @@ public function __construct(
      * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function save(CustomerInterface $customer, $passwordHash = null)
     {
@@ -281,10 +280,7 @@ public function save(CustomerInterface $customer, $passwordHash = null)
                     $savedAddressIds[] = $address->getId();
                 }
             }
-            $addressIdsToDelete = array_diff($existingAddressIds, $savedAddressIds);
-            foreach ($addressIdsToDelete as $addressId) {
-                $this->addressRepository->deleteById($addressId);
-            }
+            $this->deleteAddressesByIds(array_diff($existingAddressIds, $savedAddressIds));
         }
         $this->customerRegistry->remove($customerId);
         $savedCustomer = $this->get($customer->getEmail(), $customer->getWebsiteId());
@@ -299,6 +295,19 @@ public function save(CustomerInterface $customer, $passwordHash = null)
         return $savedCustomer;
     }
 
+    /**
+     * Delete addresses by ids
+     *
+     * @param array $addressIds
+     * @return void
+     */
+    private function deleteAddressesByIds(array $addressIds): void
+    {
+        foreach ($addressIds as $id) {
+            $this->addressRepository->deleteById($id);
+        }
+    }
+
     /**
      * Validate customer group id if exist
      *

From 8af0f46e1404a30f155b37ab19ba045048532f42 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Mon, 6 Jul 2020 14:17:41 +0300
Subject: [PATCH 0734/1718] add testCaseId

---
 .../Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml     | 2 +-
 .../Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml    | 2 +-
 .../Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
index 2055a7599b4b4..0565f2d08cc1f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
@@ -15,7 +15,7 @@
             <title value="Verify that filter is applied on product grid when filters parameter is set on url"/>
             <description value="Accessing product grid url with filters parameter"/>
             <severity value="MAJOR"/>
-            <testCaseId value="to-be-added"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/4931106"/>
             <group value="product"/>
         </annotations>
         <before>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml
index 817460e97a645..e2cf9c20627f8 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsBlockGridUrlFilterApplierTest.xml
@@ -15,7 +15,7 @@
             <title value="Verify that filter is applied on block grid when filters parameter is set on url"/>
             <description value="Accessing block grid url with filters parameter"/>
             <severity value="MAJOR"/>
-            <testCaseId value="to-be-added"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/4931106"/>
             <group value="Cms"/>
         </annotations>
         <before>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml
index b2f0912369fff..1f1f1c98d507b 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminCmsPageGridUrlFilterApplierTest.xml
@@ -15,7 +15,7 @@
             <title value="Verify that filter is applied on page grid when filters parameter is set on url"/>
             <description value="Accessing page grid url with filters parameter"/>
             <severity value="MAJOR"/>
-            <testCaseId value="to-be-added"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/4931106"/>
             <group value="Cms"/>
         </annotations>
         <before>

From 3d288c7953cd1d5fa282b2d752f4b358259710d5 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Mon, 6 Jul 2020 14:21:54 +0300
Subject: [PATCH 0735/1718] use action group go to AdminTaxRuleGridPage

---
 ...stWithMultipleAddressesAndTaxRatesTest.xml |  6 ++----
 ...tCheckoutUsingFreeShippingAndTaxesTest.xml |  3 +--
 ...StorefrontCheckTaxAddingValidVATIdTest.xml |  3 +--
 ...ValueWithFullDiscountUsingCartRuleTest.xml |  6 ++----
 .../AdminTaxRuleGridOpenPageActionGroup.xml   | 19 +++++++++++++++++++
 .../Test/AdminCheckCreditMemoTotalsTest.xml   |  2 +-
 .../Test/AdminCreateDefaultsTaxRuleTest.xml   |  3 +--
 .../AdminCreateTaxRateAllPostCodesTest.xml    |  3 +--
 .../Test/AdminCreateTaxRateLargeRateTest.xml  |  3 +--
 ...AdminCreateTaxRateSpecificPostcodeTest.xml |  3 +--
 ...dminCreateTaxRateWiderZipCodeRangeTest.xml |  3 +--
 .../AdminCreateTaxRateZipCodeRangeTest.xml    |  3 +--
 ...RuleWithCustomerAndProductTaxClassTest.xml |  5 ++---
 ...xRateAndCustomerAndProductTaxClassTest.xml |  3 +--
 ...TaxRuleWithNewTaxClassesAndTaxRateTest.xml |  3 +--
 .../AdminCreateTaxRuleWithZipRangeTest.xml    |  3 +--
 .../Test/Mftf/Test/AdminDeleteTaxRuleTest.xml |  6 ++----
 .../Test/AdminUpdateDefaultTaxRuleTest.xml    |  3 +--
 ...dminUpdateTaxRuleWithCustomClassesTest.xml |  3 +--
 ...AdminUpdateTaxRuleWithFixedZipUtahTest.xml |  3 +--
 .../Mftf/Test/DeleteTaxRateEntityTest.xml     |  2 +-
 .../StorefrontTaxQuoteCartGuestSimpleTest.xml |  6 ++----
 ...StorefrontTaxQuoteCartGuestVirtualTest.xml |  6 ++----
 ...orefrontTaxQuoteCartLoggedInSimpleTest.xml |  6 ++----
 ...refrontTaxQuoteCartLoggedInVirtualTest.xml |  6 ++----
 ...refrontTaxQuoteCheckoutGuestSimpleTest.xml |  6 ++----
 ...efrontTaxQuoteCheckoutGuestVirtualTest.xml |  6 ++----
 ...rontTaxQuoteCheckoutLoggedInSimpleTest.xml |  6 ++----
 ...ontTaxQuoteCheckoutLoggedInVirtualTest.xml |  6 ++----
 29 files changed, 59 insertions(+), 77 deletions(-)
 create mode 100644 app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxRuleGridOpenPageActionGroup.xml

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithMultipleAddressesAndTaxRatesTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithMultipleAddressesAndTaxRatesTest.xml
index 4c3c1561a2445..882d5a87b2843 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithMultipleAddressesAndTaxRatesTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithMultipleAddressesAndTaxRatesTest.xml
@@ -27,8 +27,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
 
             <!-- Go to tax rule page -->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
-            <waitForPageLoad stepKey="waitForTaxRatePage"/>
+            <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRulePage"/>
             <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
             <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
 
@@ -49,8 +48,7 @@
         </before>
         <after>
             <!-- Go to the tax rule page and delete the row we created-->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
-            <waitForPageLoad stepKey="waitForRulesPage"/>
+            <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRulesPage"/>
             <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
                 <argument name="name" value="SampleRule"/>
                 <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml
index dbb695fb4fb00..fdbcd159ebfbd 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml
@@ -115,8 +115,7 @@
         </after>
 
         <!-- Create a Tax Rule -->
-        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
-        <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
+        <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
         <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAddNewTaxRuleButton"/>
         <waitForPageLoad stepKey="waitForTaxRuleIndex2"/>
 
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCheckTaxAddingValidVATIdTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCheckTaxAddingValidVATIdTest.xml
index 80cdeadb391da..6afef7e8ecb38 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCheckTaxAddingValidVATIdTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCheckTaxAddingValidVATIdTest.xml
@@ -103,8 +103,7 @@
 
         <after>
             <!-- Go to the tax rule page and delete the row we created-->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
-            <waitForPageLoad stepKey="waitForRulesPage"/>
+            <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRulesPage"/>
 
             <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
                 <argument name="name" value="{{TaxRule.name}}"/>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartTotalValueWithFullDiscountUsingCartRuleTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartTotalValueWithFullDiscountUsingCartRuleTest.xml
index 9b5f8fbb2912d..9ab52a636145d 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartTotalValueWithFullDiscountUsingCartRuleTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartTotalValueWithFullDiscountUsingCartRuleTest.xml
@@ -34,8 +34,7 @@
             <createData entity="defaultTaxRule" stepKey="initialTaxRule"/>
             <createData entity="defaultTaxRate" stepKey="initialTaxRate"/>
             <!-- Go to tax rule page -->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
-            <waitForPageLoad stepKey="waitForTaxRatePage"/>
+            <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRulePage"/>
             <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
             <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
             <!-- Add tax rule with 20% tax rate -->
@@ -62,8 +61,7 @@
         </before>
         <after>
             <!-- Removed created Data -->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
-            <waitForPageLoad stepKey="waitForRulesPage"/>
+            <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRulesPage"/>
             <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
                 <argument name="name" value="SampleRule"/>
                 <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxRuleGridOpenPageActionGroup.xml b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxRuleGridOpenPageActionGroup.xml
new file mode 100644
index 0000000000000..768dcd6cb42a8
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxRuleGridOpenPageActionGroup.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="AdminTaxRuleGridOpenPageActionGroup">
+        <annotations>
+            <description>Go to tax rule grid page.</description>
+        </annotations>
+
+        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleGridPage"/>
+        <waitForPageLoad stepKey="waitForTaxRulePage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCheckCreditMemoTotalsTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCheckCreditMemoTotalsTest.xml
index fc4b6dd8b84c5..c873e14797470 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCheckCreditMemoTotalsTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCheckCreditMemoTotalsTest.xml
@@ -50,7 +50,7 @@
             <!-- Reset admin order filter -->
             <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
             <!-- Go to the tax rule page and delete the row we created-->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
+            <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRulesPage"/>
             <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
                 <argument name="name" value="{{defaultTaxRule.code}}"/>
                 <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateDefaultsTaxRuleTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateDefaultsTaxRuleTest.xml
index 3a5f905d89dd5..07968c281c68b 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateDefaultsTaxRuleTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateDefaultsTaxRuleTest.xml
@@ -29,8 +29,7 @@
             <deleteData stepKey="deleteTaxRate" createDataKey="initialTaxRate" />
         </after>
 
-        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
-        <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
+        <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
         <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAddNewTaxRuleButton"/>
         <waitForPageLoad stepKey="waitForTaxRuleIndex2"/>
         <!-- Create a tax rule with defaults -->
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateAllPostCodesTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateAllPostCodesTest.xml
index e132b86ab4417..ee201d67b0dbf 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateAllPostCodesTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateAllPostCodesTest.xml
@@ -69,8 +69,7 @@
         <seeInField selector="{{AdminTaxRateFormSection.rate}}" userInput="20.0000" stepKey="seeRate"/>
 
         <!-- Go to the tax rule grid page and verify our tax rate can be used in the rule -->
-        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
-        <waitForPageLoad stepKey="waitForTaxRuleIndex"/>
+        <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
         <click selector="{{AdminGridMainControls.add}}" stepKey="clickAddNewTaxRule"/>
         <see selector="{{AdminTaxRulesSection.taxRateMultiSelectItems}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxRateOnNewTaxRulePage"/>
     </test>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml
index 0f1b5b08ffcec..3c58b27495d2e 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml
@@ -60,8 +60,7 @@
         <seeInField selector="{{AdminTaxRateFormSection.rate}}" userInput="999.0000" stepKey="seeRate"/>
 
         <!-- Verify we see expected values on the tax rule form page -->
-        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
-        <waitForPageLoad stepKey="waitForTaxRateIndex4"/>
+        <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
         <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAdd"/>
         <see selector="{{AdminTaxRulesSection.taxRateMultiSelectItems}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxRateOnNewTaxRulePage"/>
     </test>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml
index 379164d134448..dbc116796c85c 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml
@@ -58,8 +58,7 @@
         <seeInField selector="{{AdminTaxRateFormSection.country}}" userInput="Canada" stepKey="seeCountry2"/>
 
         <!-- Verify we see expected values on the tax rule form page -->
-        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
-        <waitForPageLoad stepKey="waitForTaxRateIndex4"/>
+        <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
         <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAdd"/>
         <see selector="{{AdminTaxRulesSection.taxRateMultiSelectItems}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxRateOnNewTaxRulePage"/>
     </test>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml
index d276a6a276b2c..ce5b83f90ebb8 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml
@@ -61,8 +61,7 @@
         <seeOptionIsSelected selector="{{AdminTaxRateFormSection.country}}" userInput="United Kingdom" stepKey="seeCountry2"/>
 
         <!-- Verify we see expected values on the tax rule form page -->
-        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
-        <waitForPageLoad stepKey="waitForTaxRateIndex4"/>
+        <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
         <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAdd"/>
         <see selector="{{AdminTaxRulesSection.taxRateMultiSelectItems}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxRateOnNewTaxRulePage"/>
     </test>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml
index 998c948d869d0..9e541a6400640 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml
@@ -63,8 +63,7 @@
         <seeOptionIsSelected selector="{{AdminTaxRateFormSection.country}}" userInput="United States" stepKey="seeCountry2"/>
 
         <!-- Verify we see expected values on the tax rule form page -->
-        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
-        <waitForPageLoad stepKey="waitForTaxRateIndex4"/>
+        <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
         <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAdd"/>
         <see selector="{{AdminTaxRulesSection.taxRateMultiSelectItems}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxRateOnNewTaxRulePage"/>
     </test>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithCustomerAndProductTaxClassTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithCustomerAndProductTaxClassTest.xml
index 6e2ca794379f6..ba0834da7c0e7 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithCustomerAndProductTaxClassTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithCustomerAndProductTaxClassTest.xml
@@ -39,8 +39,7 @@
             <deleteData stepKey="deleteProductTaxClass" createDataKey="createProductTaxClass"/>
         </after>
 
-        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
-        <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
+        <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
         <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAddNewTaxRuleButton"/>
         <waitForPageLoad stepKey="waitForTaxRuleIndex2"/>
 
@@ -90,4 +89,4 @@
         <seeInField selector="{{AdminTaxRuleFormSection.priority}}" userInput="{{taxRuleWithCustomPriorityPosition.priority}}" stepKey="seePriority"/>
         <seeInField selector="{{AdminTaxRuleFormSection.sortOrder}}" userInput="{{taxRuleWithCustomPriorityPosition.position}}" stepKey="seeSortOrder"/>
     </test>
-</tests>
\ No newline at end of file
+</tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewAndExistingTaxRateAndCustomerAndProductTaxClassTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewAndExistingTaxRateAndCustomerAndProductTaxClassTest.xml
index 895bb920973c8..ae37bc8a8930a 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewAndExistingTaxRateAndCustomerAndProductTaxClassTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewAndExistingTaxRateAndCustomerAndProductTaxClassTest.xml
@@ -40,8 +40,7 @@
             <deleteData stepKey="deleteProductTaxClass" createDataKey="createProductTaxClass"/>
         </after>
 
-        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
-        <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
+        <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
         <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAddNewTaxRuleButton"/>
         <waitForPageLoad stepKey="waitForTaxRuleIndex2"/>
 
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewTaxClassesAndTaxRateTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewTaxClassesAndTaxRateTest.xml
index 43ce4059ad84e..2a008991c2dc8 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewTaxClassesAndTaxRateTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewTaxClassesAndTaxRateTest.xml
@@ -40,8 +40,7 @@
             <deleteData stepKey="deleteProductTaxClass" createDataKey="createProductTaxClass"/>
         </after>
 
-        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
-        <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
+        <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
         <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAddNewTaxRuleButton"/>
         <waitForPageLoad stepKey="waitForTaxRuleIndex2"/>
 
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithZipRangeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithZipRangeTest.xml
index 0293e04293daf..de55453fcabc4 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithZipRangeTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithZipRangeTest.xml
@@ -40,8 +40,7 @@
             <deleteData stepKey="deleteProductTaxClass" createDataKey="createProductTaxClass"/>
         </after>
 
-        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
-        <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
+        <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
         <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAddNewTaxRuleButton"/>
         <waitForPageLoad stepKey="waitForTaxRuleIndex2"/>
 
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminDeleteTaxRuleTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminDeleteTaxRuleTest.xml
index 770cdd1e3b2c4..37b90300aad28 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminDeleteTaxRuleTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminDeleteTaxRuleTest.xml
@@ -30,8 +30,7 @@
             <deleteData stepKey="deleteCustomer" createDataKey="customer" />
         </after>
 
-        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
-        <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
+        <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
         <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
         <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="$$initialTaxRule.code$$" stepKey="fillTaxCodeSearch"/>
         <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch1"/>
@@ -46,8 +45,7 @@
         <see selector="{{AdminMessagesSection.success}}" userInput="The tax rule has been deleted." stepKey="seeAssertTaxRuleDeleteMessage"/>
 
         <!-- Confirm Deleted Tax Rule(from the above step) on the tax rule grid page -->
-        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex2"/>
-        <waitForPageLoad stepKey="waitForTaxRuleIndex2"/>
+        <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex2"/>
         <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
         <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="$$initialTaxRule.code$$" stepKey="fillTaxCodeSearch2"/>
         <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch2"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateDefaultTaxRuleTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateDefaultTaxRuleTest.xml
index 61b09eabe7d35..fd445326976e4 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateDefaultTaxRuleTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateDefaultTaxRuleTest.xml
@@ -38,8 +38,7 @@
                 <deleteData stepKey="deleteProductTaxClass" createDataKey="createProductTaxClass"/>
             </after>
 
-        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
-        <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
+        <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
         <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
         <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="$$initialTaxRule.code$$" stepKey="fillTaxCodeSearch"/>
         <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch1"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateTaxRuleWithCustomClassesTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateTaxRuleWithCustomClassesTest.xml
index b7ffe05ebf5c2..3a5607ea598ca 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateTaxRuleWithCustomClassesTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateTaxRuleWithCustomClassesTest.xml
@@ -39,8 +39,7 @@
             <deleteData stepKey="deleteProductTaxClass" createDataKey="createProductTaxClass"/>
         </after>
 
-        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
-        <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
+        <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
         <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
         <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="$$initialTaxRule.code$$" stepKey="fillTaxCodeSearch"/>
         <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch1"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateTaxRuleWithFixedZipUtahTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateTaxRuleWithFixedZipUtahTest.xml
index 14df3f8987f5e..fa42ce5ddafa3 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateTaxRuleWithFixedZipUtahTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateTaxRuleWithFixedZipUtahTest.xml
@@ -43,8 +43,7 @@
             <deleteData stepKey="deleteCustomer" createDataKey="customer" />
         </after>
 
-        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex1"/>
-        <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
+        <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
         <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
         <fillField selector="{{AdminTaxRuleGridSection.code}}" userInput="$$initialTaxRule.code$$" stepKey="fillTaxCodeSearch"/>
         <click selector="{{AdminTaxRuleGridSection.search}}" stepKey="clickSearch1"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml
index 4b34121b10829..299e554c91e4c 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml
@@ -45,7 +45,7 @@
         <see selector="{{AdminTaxRateGridSection.emptyText}}" userInput="We couldn't find any records." stepKey="seeSuccess"/>
 
         <!-- Confirm Deleted TaxIdentifier on the tax rule grid page -->
-        <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRuleIndex3"/>
+        <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex3"/>
         <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAddNewTaxRuleButton"/>
         <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
         <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="$$initialTaxRate.code$$" stepKey="fillTaxRateSearch"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartGuestSimpleTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartGuestSimpleTest.xml
index b1e91886960c5..b74842fe6a2a4 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartGuestSimpleTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartGuestSimpleTest.xml
@@ -25,8 +25,7 @@
             <actionGroup ref="EditTaxConfigurationByUIActionGroup" stepKey="fillDefaultTaxForms"/>
 
             <!-- Go to tax rule page -->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
-            <waitForPageLoad stepKey="waitForTaxRatePage"/>
+            <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRulePage"/>
             <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
             <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
 
@@ -45,8 +44,7 @@
         </before>
         <after>
             <!-- Go to the tax rule page and delete the row we created-->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
-            <waitForPageLoad stepKey="waitForRulesPage"/>
+            <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRulesPage"/>
             <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
                 <argument name="name" value="SampleRule"/>
                 <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartGuestVirtualTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartGuestVirtualTest.xml
index 8a04156f3d857..69ae2df77e654 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartGuestVirtualTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartGuestVirtualTest.xml
@@ -25,8 +25,7 @@
             <actionGroup ref="EditTaxConfigurationByUIActionGroup" stepKey="fillDefaultTaxForms"/>
 
             <!-- Go to tax rule page -->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
-            <waitForPageLoad stepKey="waitForTaxRatePage"/>
+            <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRulePage"/>
             <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
             <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
 
@@ -45,8 +44,7 @@
         </before>
         <after>
             <!-- Go to the tax rule page and delete the row we created-->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
-            <waitForPageLoad stepKey="waitForRulesPage"/>
+            <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRulesPage"/>
             <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
                 <argument name="name" value="SampleRule"/>
                 <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartLoggedInSimpleTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartLoggedInSimpleTest.xml
index b76f015679ae2..8cf6aa4a86f37 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartLoggedInSimpleTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartLoggedInSimpleTest.xml
@@ -25,8 +25,7 @@
             <actionGroup ref="EditTaxConfigurationByUIActionGroup" stepKey="fillDefaultTaxForms"/>
 
             <!-- Go to tax rule page -->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
-            <waitForPageLoad stepKey="waitForTaxRatePage"/>
+            <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRulePage"/>
             <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
             <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
 
@@ -59,8 +58,7 @@
         </before>
         <after>
             <!-- Go to the tax rule page and delete the row we created-->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
-            <waitForPageLoad stepKey="waitForRulesPage"/>
+            <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRulesPage"/>
             <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
                 <argument name="name" value="SampleRule"/>
                 <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartLoggedInVirtualTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartLoggedInVirtualTest.xml
index 5f98093ec874f..90c2acb51747f 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartLoggedInVirtualTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartLoggedInVirtualTest.xml
@@ -25,8 +25,7 @@
             <actionGroup ref="EditTaxConfigurationByUIActionGroup" stepKey="fillDefaultTaxForms"/>
 
             <!-- Go to tax rule page -->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
-            <waitForPageLoad stepKey="waitForTaxRatePage"/>
+            <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRulePage"/>
             <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
             <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
 
@@ -58,8 +57,7 @@
         </before>
         <after>
             <!-- Go to the tax rule page and delete the row we created-->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
-            <waitForPageLoad stepKey="waitForRulesPage"/>
+            <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRulesPage"/>
             <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
                 <argument name="name" value="SampleRule"/>
                 <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestSimpleTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestSimpleTest.xml
index d005f4b657448..a603265cfd829 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestSimpleTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestSimpleTest.xml
@@ -25,8 +25,7 @@
             <actionGroup ref="EditTaxConfigurationByUIActionGroup" stepKey="fillDefaultTaxForms"/>
 
             <!-- Go to tax rule page -->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
-            <waitForPageLoad stepKey="waitForTaxRatePage"/>
+            <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRulePage"/>
             <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
             <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
 
@@ -45,8 +44,7 @@
         </before>
         <after>
             <!-- Go to the tax rule page and delete the row we created-->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
-            <waitForPageLoad stepKey="waitForRulesPage"/>
+            <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRulesPage"/>
             <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
                 <argument name="name" value="SampleRule"/>
                 <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestVirtualTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestVirtualTest.xml
index d1fc0654fc496..6fd4ee216868a 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestVirtualTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestVirtualTest.xml
@@ -25,8 +25,7 @@
             <actionGroup ref="EditTaxConfigurationByUIActionGroup" stepKey="fillDefaultTaxForms"/>
 
             <!-- Go to tax rule page -->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
-            <waitForPageLoad stepKey="waitForTaxRatePage"/>
+            <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRulePage"/>
             <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
             <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
 
@@ -45,8 +44,7 @@
         </before>
         <after>
             <!-- Go to the tax rule page and delete the row we created-->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
-            <waitForPageLoad stepKey="waitForRulesPage"/>
+            <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRulesPage"/>
             <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
                 <argument name="name" value="SampleRule"/>
                 <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInSimpleTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInSimpleTest.xml
index 18a1a11d35fd2..99abb6469fe64 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInSimpleTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInSimpleTest.xml
@@ -25,8 +25,7 @@
             <actionGroup ref="EditTaxConfigurationByUIActionGroup" stepKey="fillDefaultTaxForms"/>
 
             <!-- Go to tax rule page -->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
-            <waitForPageLoad stepKey="waitForTaxRatePage"/>
+            <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRulePage"/>
             <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
             <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
 
@@ -45,8 +44,7 @@
         </before>
         <after>
             <!-- Go to the tax rule page and delete the row we created-->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
-            <waitForPageLoad stepKey="waitForRulesPage"/>
+            <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRulesPage"/>
             <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
                 <argument name="name" value="SampleRule"/>
                 <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInVirtualTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInVirtualTest.xml
index 35a483da7f690..7e7254784b11a 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInVirtualTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInVirtualTest.xml
@@ -25,8 +25,7 @@
             <actionGroup ref="EditTaxConfigurationByUIActionGroup" stepKey="fillDefaultTaxForms"/>
 
             <!-- Go to tax rule page -->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulePage"/>
-            <waitForPageLoad stepKey="waitForTaxRatePage"/>
+            <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRulePage"/>
             <click stepKey="addNewTaxRate" selector="{{AdminGridMainControls.add}}"/>
             <fillField stepKey="fillRuleName" selector="{{AdminTaxRulesSection.ruleName}}" userInput="SampleRule"/>
 
@@ -45,8 +44,7 @@
         </before>
         <after>
             <!-- Go to the tax rule page and delete the row we created-->
-            <amOnPage url="{{AdminTaxRuleGridPage.url}}" stepKey="goToTaxRulesPage"/>
-            <waitForPageLoad stepKey="waitForRulesPage"/>
+            <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRulesPage"/>
             <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteRule">
                 <argument name="name" value="SampleRule"/>
                 <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>

From acd5177e9f442a3bed8f87e035d6d59bfc7a0f42 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Mon, 6 Jul 2020 14:47:26 +0300
Subject: [PATCH 0736/1718] fix webapi test

---
 .../Magento/ConfigurableProduct/Api/ProductRepositoryTest.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/ProductRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/ProductRepositoryTest.php
index ade56db3aa4b6..069944c8c35a9 100644
--- a/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/ProductRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/ProductRepositoryTest.php
@@ -229,7 +229,7 @@ public function testCreateConfigurableProductWithZeroOptionValue(): void
         $this->assertArrayHasKey('attribute_id', $configurableProductOption);
         $this->assertEquals($configurableAttribute->getId(), $configurableProductOption['attribute_id']);
         $this->assertArrayHasKey('values', $configurableProductOption);
-        $this->assertEquals($attributeValue, $configurableAttribute['values'][0]['value_index']);
+        $this->assertEquals($attributeValue, $configurableProductOption['values'][0]['value_index']);
     }
 
     /**

From 092f5a991753e2e81ce657665af431dc53f7f23b Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Mon, 6 Jul 2020 15:32:59 +0300
Subject: [PATCH 0737/1718] MC-35123: An invoiced order of a product with a
 Customizable Option (file) can not be reordered

---
 .../Magento/GraphQl/Sales/ReorderTest.php     |  2 +-
 .../order_with_product_out_of_stock.php       | 79 ++++++++++++++++---
 ...der_with_product_out_of_stock_rollback.php |  4 +-
 3 files changed, 72 insertions(+), 13 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/ReorderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/ReorderTest.php
index 7bece410a06f8..0baee2797bf5d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/ReorderTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/ReorderTest.php
@@ -108,7 +108,7 @@ public function testSimpleProductOutOfStock()
         /** @var \Magento\Catalog\Api\ProductRepositoryInterface $repository */
         $productRepository = Bootstrap::getObjectManager()
             ->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-        $productSku = 'simple';
+        $productSku = 'simple-2';
         /** @var \Magento\Catalog\Api\Data\ProductInterface $product */
         $product = $productRepository->get($productSku);
 
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_product_out_of_stock.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_product_out_of_stock.php
index 9bd4c9b303cb9..e93e4143311b5 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_product_out_of_stock.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_product_out_of_stock.php
@@ -4,25 +4,82 @@
  * See COPYING.txt for license details.
  */
 
-use Magento\Sales\Api\Data\OrderInterfaceFactory;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Model\Order;
-use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Sales\Model\Order\Address as OrderAddress;
+use Magento\Sales\Model\Order\Item as OrderItem;
+use Magento\Sales\Model\Order\Payment;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+use Magento\Catalog\Model\Product;
+use Magento\TestFramework\Helper\Bootstrap;
 
-Resolver::getInstance()->requireDataFixture(
-    'Magento/Sales/_files/customer_order_item_with_product_and_custom_options.php'
-);
+Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/default_rollback.php');
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer.php');
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/product_simple_without_custom_options.php');
 
 $objectManager = Bootstrap::getObjectManager();
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+$product = $productRepository->get('simple-2');
+$billingAddress = $objectManager->create(
+    OrderAddress::class,
+    [
+        'data' => [
+            'region' => 'CA',
+            'region_id' => '12',
+            'postcode' => '11111',
+            'lastname' => 'lastname',
+            'firstname' => 'firstname',
+            'street' => 'street',
+            'city' => 'Los Angeles',
+            'email' => 'admin@example.com',
+            'telephone' => '11111111',
+            'country_id' => 'US',
+        ],
+    ],
+);
+$billingAddress->setAddressType('billing');
+$shippingAddress = clone $billingAddress;
+$shippingAddress->setId(null)->setAddressType('shipping');
+
+/** @var Payment $payment */
+$payment = $objectManager->create(\Magento\Sales\Model\Order\Payment::class);
+$payment->setMethod('checkmo');
+
+/** @var OrderItem $orderItem */
+$orderItem = $objectManager->create(OrderItem::class);
+$orderItem->setProductId($product->getId())
+    ->setQtyOrdered(2)
+    ->setBasePrice($product->getPrice())
+    ->setPrice($product->getPrice())
+    ->setRowTotal($product->getPrice())
+    ->setProductType('simple-2')
+    ->setName($product->getName())
+    ->setSku($product->getSku())
+    ->setProductOptions(['info_buyRequest' => ['qty' => 1]]);
+
 /** @var Order $order */
-$order = $objectManager->get(OrderInterfaceFactory::class)->create()->loadByIncrementId('100000001');
-$order->setCustomerId(1)->setCustomerIsGuest(false)->save();
+$order = $objectManager->create(Order::class);
+$order->setIncrementId('100000001')
+    ->setCustomerIsGuest(false)
+    ->setCustomerId(1)
+    ->setCustomerEmail('customer@null.com')
+    ->setBillingAddress($billingAddress)
+    ->setShippingAddress($shippingAddress)
+    ->setStoreId($objectManager->get(StoreManagerInterface::class)->getStore()->getId())
+    ->addItem($orderItem)
+    ->setPayment($payment);
+/** @var OrderRepositoryInterface $orderRepository */
+$orderRepository = $objectManager->create(OrderRepositoryInterface::class);
+$orderRepository->save($order);
 
 // load product and set it out of stock
-/** @var \Magento\Catalog\Api\ProductRepositoryInterface $repository */
-$productRepository = Bootstrap::getObjectManager()->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-$productSku = 'simple';
-/** @var \Magento\Catalog\Model\Product $product */
+/** @var ProductRepositoryInterface $repository */
+$productRepository = Bootstrap::getObjectManager()->create(ProductRepositoryInterface::class);
+$productSku = 'simple-2';
+/** @var Product $product */
 $product = $productRepository->get($productSku);
 // set product as out of stock
 $product->setStockData(
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_product_out_of_stock_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_product_out_of_stock_rollback.php
index c4b3a1a18b03a..e6ff6de159a17 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_product_out_of_stock_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_product_out_of_stock_rollback.php
@@ -5,6 +5,8 @@
  */
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_rollback.php');
 Resolver::getInstance()->requireDataFixture(
-    'Magento/Sales/_files/customer_order_item_with_product_and_custom_options_rollback.php'
+    'Magento/Catalog/_files/product_simple_without_custom_options_rollback.php'
 );
+Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/default_rollback.php');

From 881b75c20f7ada58682a3917c55ed71eae8e6804 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Mon, 6 Jul 2020 15:45:22 +0300
Subject: [PATCH 0738/1718] create AdminTaxRateGridOpenPageActionGroup

---
 ...stWithMultipleAddressesAndTaxRatesTest.xml |  3 +--
 ...StorefrontCheckTaxAddingValidVATIdTest.xml |  3 +--
 ...ValueWithFullDiscountUsingCartRuleTest.xml |  3 +--
 .../AdminTaxRateGridOpenPageActionGroup.xml   | 19 +++++++++++++++++++
 .../AdminCreateTaxRateAllPostCodesTest.xml    | 11 ++++-------
 ...teTaxRateInvalidPostcodeTestLengthTest.xml |  3 +--
 .../Test/AdminCreateTaxRateLargeRateTest.xml  |  8 +++-----
 ...AdminCreateTaxRateSpecificPostcodeTest.xml |  7 +++----
 ...dminCreateTaxRateWiderZipCodeRangeTest.xml |  8 +++-----
 .../AdminCreateTaxRateZipCodeRangeTest.xml    |  8 +++-----
 .../Mftf/Test/DeleteTaxRateEntityTest.xml     |  6 ++----
 .../StorefrontTaxQuoteCartGuestSimpleTest.xml |  3 +--
 ...StorefrontTaxQuoteCartGuestVirtualTest.xml |  3 +--
 ...orefrontTaxQuoteCartLoggedInSimpleTest.xml |  3 +--
 ...refrontTaxQuoteCartLoggedInVirtualTest.xml |  3 +--
 ...refrontTaxQuoteCheckoutGuestSimpleTest.xml |  3 +--
 ...efrontTaxQuoteCheckoutGuestVirtualTest.xml |  3 +--
 ...rontTaxQuoteCheckoutLoggedInSimpleTest.xml |  3 +--
 ...ontTaxQuoteCheckoutLoggedInVirtualTest.xml |  3 +--
 .../Mftf/Test/Update01TaxRateEntityTest.xml   |  6 ++----
 .../Mftf/Test/Update100TaxRateEntityTest.xml  |  6 ++----
 .../Mftf/Test/Update1299TaxRateEntityTest.xml |  6 ++----
 .../Test/UpdateAnyRegionTaxRateEntityTest.xml |  6 ++----
 .../Test/UpdateDecimalTaxRateEntityTest.xml   |  6 ++----
 .../Test/UpdateLargeTaxRateEntityTest.xml     |  6 ++----
 25 files changed, 61 insertions(+), 78 deletions(-)
 create mode 100644 app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxRateGridOpenPageActionGroup.xml

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithMultipleAddressesAndTaxRatesTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithMultipleAddressesAndTaxRatesTest.xml
index 4c3c1561a2445..4fec6d934d913 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithMultipleAddressesAndTaxRatesTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithMultipleAddressesAndTaxRatesTest.xml
@@ -57,8 +57,7 @@
             </actionGroup>
 
             <!-- Go to the tax rate page -->
-            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
-            <waitForPageLoad stepKey="waitForRatesPage"/>
+            <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRatesPage"/>
             <!-- Delete the two tax rates that were created -->
             <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
                 <argument name="name" value="{{SimpleTaxNY.state}}-{{SimpleTaxNY.rate}}"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCheckTaxAddingValidVATIdTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCheckTaxAddingValidVATIdTest.xml
index 80cdeadb391da..971bb09b96274 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCheckTaxAddingValidVATIdTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCheckTaxAddingValidVATIdTest.xml
@@ -117,8 +117,7 @@
             </actionGroup>
 
             <!-- Go to the tax rate page -->
-            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
-            <waitForPageLoad stepKey="waitForRatesPage"/>
+            <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRatesPage"/>
 
             <!-- Delete the two tax rates that were created -->
             <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartTotalValueWithFullDiscountUsingCartRuleTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartTotalValueWithFullDiscountUsingCartRuleTest.xml
index 9b5f8fbb2912d..a28f86c730a05 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartTotalValueWithFullDiscountUsingCartRuleTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartTotalValueWithFullDiscountUsingCartRuleTest.xml
@@ -69,8 +69,7 @@
                 <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
             </actionGroup>
             <!-- Delete the tax rate that were created -->
-            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
-            <waitForPageLoad stepKey="waitForRatesPage"/>
+            <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRatesPage"/>
             <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
                 <argument name="name" value="{{SimpleTaxNYRate.state}}-{{SimpleTaxNYRate.rate}}"/>
                 <argument name="searchInput" value="{{AdminSecondaryGridSection.taxIdentifierSearch}}"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxRateGridOpenPageActionGroup.xml b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxRateGridOpenPageActionGroup.xml
new file mode 100644
index 0000000000000..58762e4fa02ef
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminTaxRateGridOpenPageActionGroup.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="AdminTaxRateGridOpenPageActionGroup">
+        <annotations>
+            <description>Go to tax rate grid page.</description>
+        </annotations>
+
+        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatePage"/>
+        <waitForPageLoad stepKey="waitForTaxRatePage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateAllPostCodesTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateAllPostCodesTest.xml
index e132b86ab4417..f9272b2a8bf0b 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateAllPostCodesTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateAllPostCodesTest.xml
@@ -22,7 +22,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
-            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex"/>
+            <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex"/>
             <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
             <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillNameFilter"/>
             <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
@@ -31,8 +31,7 @@
             <click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
         </after>
 
-        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
-        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
+        <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex1"/>
         <!-- Create a tax rate with * for postcodes -->
         <click selector="{{AdminTaxRateGridSection.add}}" stepKey="clickAddNewTaxRateButton"/>
         <fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillRuleName"/>
@@ -43,8 +42,7 @@
         <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
 
         <!-- Verify the tax rate grid page shows the tax rate we just created -->
-        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex2"/>
-        <waitForPageLoad stepKey="waitForTaxRateIndex2"/>
+        <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex2"/>
         <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
         <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillNameFilter"/>
         <selectOption selector="{{AdminTaxRateGridSection.filterByCountry}}" userInput="Australia" stepKey="fillCountryFilter"/>
@@ -55,8 +53,7 @@
         <see selector="{{AdminTaxRateGridSection.grid}}" userInput="*" stepKey="seePostCode"/>
 
         <!-- Go to the tax rate edit page for our new tax rate -->
-        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex3"/>
-        <waitForPageLoad stepKey="waitForTaxRateIndex3"/>
+        <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex3"/>
         <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
         <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillNameFilter2"/>
         <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateInvalidPostcodeTestLengthTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateInvalidPostcodeTestLengthTest.xml
index 3a6e4dfef5bac..6f8379e460c34 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateInvalidPostcodeTestLengthTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateInvalidPostcodeTestLengthTest.xml
@@ -22,8 +22,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
 
-        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
-        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
+        <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex1"/>
         <!-- Create a tax rate for large postcodes -->
         <click selector="{{AdminTaxRateGridSection.add}}" stepKey="clickAddNewTaxRateButton"/>
         <fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{taxRateWithInvalidPostCodeLength.code}}" stepKey="fillRuleName"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml
index 0f1b5b08ffcec..11b215e7dd680 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml
@@ -22,7 +22,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
-            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex"/>
+            <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex"/>
             <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
             <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillNameFilter"/>
             <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
@@ -31,8 +31,7 @@
             <click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
         </after>
 
-        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
-        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
+        <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex1"/>
         <!-- Create a tax rate for large postcodes -->
         <click selector="{{AdminTaxRateGridSection.add}}" stepKey="clickAddNewTaxRateButton"/>
         <fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillRuleName"/>
@@ -43,8 +42,7 @@
         <click selector="{{AdminTaxRateFormSection.save}}" stepKey="clickSave"/>
         <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
 
-        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex2"/>
-        <waitForPageLoad stepKey="waitForTaxRateIndex3"/>
+        <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex2"/>
         <!-- Create a tax rate for large postcodes and verify we see expected values on the tax rate grid page -->
         <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
         <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillTaxIdentifierField2"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml
index 379164d134448..9f1f123dec5eb 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml
@@ -22,7 +22,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
-            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex"/>
+            <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex"/>
             <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
             <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillNameFilter"/>
             <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
@@ -31,7 +31,7 @@
             <click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
         </after>
 
-        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
+        <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex1"/>
         <click selector="{{AdminTaxRateGridSection.add}}" stepKey="clickAddNewTaxRateButton"/>
         <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
         <!-- Create a tax rate with specific postcode -->
@@ -43,8 +43,7 @@
         <click selector="{{AdminTaxRateFormSection.save}}" stepKey="clickSave"/>
         <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
 
-        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex2"/>
-        <waitForPageLoad stepKey="waitForTaxRateIndex2"/>
+        <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex2"/>
         <!-- Verify the tax rate grid page shows the specific postcode we just created -->
         <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
         <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillTaxIdentifierField2"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml
index d276a6a276b2c..c665514462a88 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml
@@ -22,7 +22,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
-            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex"/>
+            <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex"/>
             <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
             <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillNameFilter"/>
             <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
@@ -31,8 +31,7 @@
             <click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
         </after>
 
-        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
-        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
+        <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex1"/>
         <!-- Create a tax rate with range from 1-7800935 for zipCodes -->
         <click selector="{{AdminTaxRateGridSection.add}}" stepKey="clickAddNewTaxRateButton"/>
         <fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillRuleName"/>
@@ -44,8 +43,7 @@
         <click selector="{{AdminTaxRateFormSection.save}}" stepKey="clickSave"/>
         <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
 
-        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex2"/>
-        <waitForPageLoad stepKey="waitForTaxRateIndex3"/>
+        <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex2"/>
         <!-- Create a tax rate for zipCodeRange and verify we see expected values on the tax rate grid page -->
         <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
         <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillTaxIdentifierField2"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml
index 998c948d869d0..f3a0af495caa6 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml
@@ -22,7 +22,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
-            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex"/>
+            <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex"/>
             <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
             <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillNameFilter"/>
             <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch"/>
@@ -31,8 +31,7 @@
             <click selector="{{AdminTaxRateFormSection.ok}}" stepKey="clickOk"/>
         </after>
 
-        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
-        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
+        <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex1"/>
         <!-- Create a tax rate with range from 90001-96162 for zipCodes -->
         <click selector="{{AdminTaxRateGridSection.add}}" stepKey="clickAddNewTaxRateButton"/>
         <fillField selector="{{AdminTaxRateFormSection.taxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillRuleName"/>
@@ -45,8 +44,7 @@
         <click selector="{{AdminTaxRateFormSection.save}}" stepKey="clickSave"/>
         <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
 
-        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex2"/>
-        <waitForPageLoad stepKey="waitForTaxRateIndex3"/>
+        <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex2"/>
         <!-- Create a tax rate for zipCodeRange and verify we see expected values on the tax rate grid page -->
         <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
         <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{SimpleTaxRate.code}}" stepKey="fillTaxIdentifierField2"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml
index 4b34121b10829..3874ee84c1b67 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml
@@ -24,8 +24,7 @@
         </before>
 
         <!-- Search the tax rate on tax grid page -->
-        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
-        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
+        <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex1"/>
         <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
         <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="$$initialTaxRate.code$$" stepKey="fillCode"/>
         <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch1"/>
@@ -37,8 +36,7 @@
         <see selector="{{AdminMessagesSection.success}}" userInput="You Deleted the tax rate." stepKey="seeSuccess1"/>
 
         <!-- Confirm Deleted TaxIdentifier(from the above step) on the tax rate grid page -->
-        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex2"/>
-        <waitForPageLoad stepKey="waitForTaxRateIndex2"/>
+        <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex2"/>
         <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
         <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{defaultTaxRate.code}}" stepKey="fillTaxIdentifierField3"/>
         <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartGuestSimpleTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartGuestSimpleTest.xml
index b1e91886960c5..6fc8684f4d6ed 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartGuestSimpleTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartGuestSimpleTest.xml
@@ -53,8 +53,7 @@
             </actionGroup>
 
             <!-- Go to the tax rate page -->
-            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
-            <waitForPageLoad stepKey="waitForRatesPage"/>
+            <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRatesPage"/>
 
             <!-- Delete the two tax rates that were created -->
             <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartGuestVirtualTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartGuestVirtualTest.xml
index 8a04156f3d857..002f8c3aa42e4 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartGuestVirtualTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartGuestVirtualTest.xml
@@ -53,8 +53,7 @@
             </actionGroup>
 
             <!-- Go to the tax rate page -->
-            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
-            <waitForPageLoad stepKey="waitForRatesPage"/>
+            <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRatesPage"/>
 
             <!-- Delete the two tax rates that were created -->
             <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartLoggedInSimpleTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartLoggedInSimpleTest.xml
index b76f015679ae2..0e047e15c4aa1 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartLoggedInSimpleTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartLoggedInSimpleTest.xml
@@ -67,8 +67,7 @@
             </actionGroup>
 
             <!-- Go to the tax rate page -->
-            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
-            <waitForPageLoad stepKey="waitForRatesPage"/>
+            <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRatesPage"/>
 
             <!-- Delete the two tax rates that were created -->
             <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartLoggedInVirtualTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartLoggedInVirtualTest.xml
index 5f98093ec874f..611cc2a55a932 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartLoggedInVirtualTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest/StorefrontTaxQuoteCartLoggedInVirtualTest.xml
@@ -66,8 +66,7 @@
             </actionGroup>
 
             <!-- Go to the tax rate page -->
-            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
-            <waitForPageLoad stepKey="waitForRatesPage"/>
+            <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRatesPage"/>
 
             <!-- Delete the two tax rates that were created -->
             <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestSimpleTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestSimpleTest.xml
index d005f4b657448..6a7219cf06047 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestSimpleTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestSimpleTest.xml
@@ -53,8 +53,7 @@
             </actionGroup>
 
             <!-- Go to the tax rate page -->
-            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
-            <waitForPageLoad stepKey="waitForRatesPage"/>
+            <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRatesPage"/>
 
             <!-- Delete the two tax rates that were created -->
             <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestVirtualTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestVirtualTest.xml
index d1fc0654fc496..cc8117e66f851 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestVirtualTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestVirtualTest.xml
@@ -53,8 +53,7 @@
             </actionGroup>
 
             <!-- Go to the tax rate page -->
-            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
-            <waitForPageLoad stepKey="waitForRatesPage"/>
+            <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRatesPage"/>
 
             <!-- Delete the two tax rates that were created -->
             <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInSimpleTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInSimpleTest.xml
index 18a1a11d35fd2..970a914a6509e 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInSimpleTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInSimpleTest.xml
@@ -53,8 +53,7 @@
             </actionGroup>
 
             <!-- Go to the tax rate page -->
-            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
-            <waitForPageLoad stepKey="waitForRatesPage"/>
+            <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRatesPage"/>
 
             <!-- Delete the two tax rates that were created -->
             <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInVirtualTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInVirtualTest.xml
index 35a483da7f690..b8a9b3a48b04e 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInVirtualTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInVirtualTest.xml
@@ -53,8 +53,7 @@
             </actionGroup>
 
             <!-- Go to the tax rate page -->
-            <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRatesPage"/>
-            <waitForPageLoad stepKey="waitForRatesPage"/>
+            <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRatesPage"/>
 
             <!-- Delete the two tax rates that were created -->
             <actionGroup ref="deleteEntitySecondaryGrid" stepKey="deleteNYRate">
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/Update01TaxRateEntityTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/Update01TaxRateEntityTest.xml
index 306216422adea..ff75b1e95646a 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/Update01TaxRateEntityTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/Update01TaxRateEntityTest.xml
@@ -27,8 +27,7 @@
         </after>
 
         <!-- Search the tax rate on tax grid page -->
-        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
-        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
+        <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex1"/>
         <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
         <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="$$initialTaxRate.code$$" stepKey="fillCode"/>
         <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch1"/>
@@ -45,8 +44,7 @@
         <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
 
         <!-- Verify we see updated 0.1 tax rate(from the above step) on the tax rate grid page -->
-        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex4"/>
-        <waitForPageLoad stepKey="waitForTaxRateIndex2"/>
+        <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex4"/>
         <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
         <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{taxRateCustomRateFrance.code}}" stepKey="fillTaxIdentifierField3"/>
         <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/Update100TaxRateEntityTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/Update100TaxRateEntityTest.xml
index c22bab774de29..ebfa1288b59dd 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/Update100TaxRateEntityTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/Update100TaxRateEntityTest.xml
@@ -27,8 +27,7 @@
         </after>
 
         <!-- Search the tax rate on tax grid page -->
-        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
-        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
+        <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex1"/>
         <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
         <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="$$initialTaxRate.code$$" stepKey="fillCode"/>
         <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch1"/>
@@ -44,8 +43,7 @@
         <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
 
         <!-- Verify we see updated TaxIdentifier(from the above step) on the tax rate grid page -->
-        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex4"/>
-        <waitForPageLoad stepKey="waitForTaxRateIndex2"/>
+        <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex4"/>
         <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
         <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{taxRateCustomRateUS.code}}" stepKey="fillTaxIdentifierField3"/>
         <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/Update1299TaxRateEntityTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/Update1299TaxRateEntityTest.xml
index 6f93d07b76eed..ed1c126930df8 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/Update1299TaxRateEntityTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/Update1299TaxRateEntityTest.xml
@@ -27,8 +27,7 @@
         </after>
 
         <!-- Search the tax identifier on tax grid page -->
-        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
-        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
+        <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex1"/>
         <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
         <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="$$initialTaxRate.code$$" stepKey="fillCode1"/>
         <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch1"/>
@@ -45,8 +44,7 @@
         <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
 
         <!-- Verify we see updated tax rate(from the above step) on the tax rate grid page -->
-        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex2"/>
-        <waitForPageLoad stepKey="waitForTaxRateIndex2"/>
+        <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex2"/>
         <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
         <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{taxRateCustomRateUK.code}}" stepKey="fillTaxIdentifierField2"/>
         <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/UpdateAnyRegionTaxRateEntityTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/UpdateAnyRegionTaxRateEntityTest.xml
index c3986e6a8d0cc..7a2f0664d7757 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/UpdateAnyRegionTaxRateEntityTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/UpdateAnyRegionTaxRateEntityTest.xml
@@ -27,8 +27,7 @@
         </after>
 
         <!-- Search the tax rate on tax grid page -->
-        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
-        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
+        <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex1"/>
         <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
         <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="$$initialTaxRate.code$$" stepKey="fillCode"/>
         <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch1"/>
@@ -44,8 +43,7 @@
         <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
 
         <!-- Verify we see updated any region tax rate(from the above step) on the tax rate grid page -->
-        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex2"/>
-        <waitForPageLoad stepKey="waitForTaxRateIndex2"/>
+        <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex2"/>
         <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
         <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{taxRateCustomRateCanada.code}}" stepKey="fillTaxIdentifierField3"/>
         <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/UpdateDecimalTaxRateEntityTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/UpdateDecimalTaxRateEntityTest.xml
index fb1eff1d74067..03aba8da8ae19 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/UpdateDecimalTaxRateEntityTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/UpdateDecimalTaxRateEntityTest.xml
@@ -27,8 +27,7 @@
         </after>
 
         <!-- Search the tax rate on tax grid page -->
-        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
-        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
+        <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex1"/>
         <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
         <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="$$initialTaxRate.code$$" stepKey="fillCode"/>
         <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch1"/>
@@ -46,8 +45,7 @@
         <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
 
         <!-- Verify we see updated tax rate(from the above step) on the tax rate grid page -->
-        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex2"/>
-        <waitForPageLoad stepKey="waitForTaxRateIndex2"/>
+        <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex2"/>
         <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
         <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{defaultTaxRateWithZipRange.code}}" stepKey="fillTaxIdentifierField3"/>
         <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/UpdateLargeTaxRateEntityTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/UpdateLargeTaxRateEntityTest.xml
index 1f0406244a926..37b8bb8d95618 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/UpdateLargeTaxRateEntityTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/UpdateLargeTaxRateEntityTest.xml
@@ -27,8 +27,7 @@
         </after>
 
         <!-- Search the tax rate on tax grid page -->
-        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex1"/>
-        <waitForPageLoad stepKey="waitForTaxRateIndex1"/>
+        <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex1"/>
         <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters1"/>
         <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="$$initialTaxRate.code$$" stepKey="fillCode"/>
         <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch1"/>
@@ -43,8 +42,7 @@
         <see selector="{{AdminMessagesSection.success}}" userInput="You saved the tax rate." stepKey="seeSuccess"/>
 
         <!-- Verify we see updated large tax rate(from the above step) on the tax rate grid page -->
-        <amOnPage url="{{AdminTaxRateGridPage.url}}" stepKey="goToTaxRateIndex4"/>
-        <waitForPageLoad stepKey="waitForTaxRateIndex2"/>
+        <actionGroup ref="AdminTaxRateGridOpenPageActionGroup" stepKey="goToTaxRateIndex4"/>
         <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters2"/>
         <fillField selector="{{AdminTaxRateGridSection.filterByTaxIdentifier}}" userInput="{{defaultTaxRateWithLargeRate.code}}" stepKey="fillTaxIdentifierField3"/>
         <click selector="{{AdminTaxRateGridSection.search}}" stepKey="clickSearch2"/>

From 4c08148d81850a0a717bf2625ea286664766b423 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Mon, 6 Jul 2020 15:19:48 +0200
Subject: [PATCH 0739/1718] Resolving merge conflicts

---
 app/code/Magento/SalesGraphQl/etc/schema.graphqls | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/app/code/Magento/SalesGraphQl/etc/schema.graphqls b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
index 6724e6cbdf7c3..243757d1cb8e2 100644
--- a/app/code/Magento/SalesGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
@@ -204,16 +204,6 @@ type KeyValue @doc(description: "The key-value type") {
     value: String @doc(description: "The value part of the name/value pair")
 }
 
-type CheckoutUserInputError @doc(description:"An error encountered while adding an item the the cart.") {
-    message: String! @doc(description: "Localized error message")
-    path: [String]! @doc(description: "Path to the input field that caused an error. See the GraphQL specification about path errors for details: http://spec.graphql.org/draft/#sec-Errors")
-    code: CheckoutUserInputErrorCodes! @doc(description: "Checkout-specific error code")
-}
-
 enum CheckoutUserInputErrorCodes {
     REORDER_NOT_AVAILABLE
-    PRODUCT_NOT_FOUND
-    NOT_SALABLE
-    INSUFFICIENT_STOCK
-    UNDEFINED
 }

From 0ea00f04b8dab17c396d8248280fed9ab08e5230 Mon Sep 17 00:00:00 2001
From: Andrii Kalinich <51681435+engcom-Echo@users.noreply.github.com>
Date: Mon, 6 Jul 2020 16:26:13 +0300
Subject: [PATCH 0740/1718] add testCaseId

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

diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/VerifyOutOfStockDownloadableProductSamplesAreAccessibleTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/VerifyOutOfStockDownloadableProductSamplesAreAccessibleTest.xml
index 8913ff574264f..337d4c7dd38b5 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/VerifyOutOfStockDownloadableProductSamplesAreAccessibleTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/VerifyOutOfStockDownloadableProductSamplesAreAccessibleTest.xml
@@ -15,6 +15,7 @@
             <title value="Samples of Downloadable Products are accessible, if product is out of stock"/>
             <description value="Samples of Downloadable Products are accessible, if product is out of stock"/>
             <severity value="MAJOR"/>
+            <testCaseId value="MC-35639"/>
             <group value="downloadable"/>
             <group value="catalog"/>
         </annotations>

From 195a7f37a0639b92a63939783f23881b528d6719 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Mon, 6 Jul 2020 17:01:25 +0300
Subject: [PATCH 0741/1718] MC-34803: Incorrect item subtotal on partial
 invoice email

---
 .../Block/Order/Email/Items/DefaultItems.php  | 16 ++++-
 .../Order/Email/Sender/InvoiceSender.php      | 28 +++++++-
 .../Order/Email/Items/DefaultItemsTest.php    | 71 ++++++++++++++-----
 .../Order/Email/Sender/InvoiceSenderTest.php  | 27 ++++---
 4 files changed, 111 insertions(+), 31 deletions(-)

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 064405daf89a8..7eccebbcb957f 100644
--- a/app/code/Magento/Sales/Block/Order/Email/Items/DefaultItems.php
+++ b/app/code/Magento/Sales/Block/Order/Email/Items/DefaultItems.php
@@ -3,8 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Block\Order\Email\Items;
 
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\View\Element\AbstractBlock;
+use Magento\Framework\View\Element\Template;
+use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Creditmemo\Item as CreditmemoItem;
 use Magento\Sales\Model\Order\Invoice\Item as InvoiceItem;
 use Magento\Sales\Model\Order\Item as OrderItem;
@@ -16,12 +22,12 @@
  * @author     Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
-class DefaultItems extends \Magento\Framework\View\Element\Template
+class DefaultItems extends Template
 {
     /**
      * Retrieve current order model instance
      *
-     * @return \Magento\Sales\Model\Order
+     * @return Order
      */
     public function getOrder()
     {
@@ -91,7 +97,8 @@ public function getSku($item)
     /**
      * Return product additional information block
      *
-     * @return \Magento\Framework\View\Element\AbstractBlock
+     * @return AbstractBlock
+     * @throws LocalizedException
      */
     public function getProductAdditionalInformationBlock()
     {
@@ -103,10 +110,13 @@ public function getProductAdditionalInformationBlock()
      *
      * @param OrderItem|InvoiceItem|CreditmemoItem $item
      * @return string
+     * @throws LocalizedException
      */
     public function getItemPrice($item)
     {
         $block = $this->getLayout()->getBlock('item_price');
+        $item->setRowTotal((float) $item->getPrice() * (float) $this->getItem()->getQty());
+        $item->setBaseRowTotal((float) $item->getBasePrice() * (float) $this->getItem()->getQty());
         $block->setItem($item);
         return $block->toHtml();
     }
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
index 05164d1b7b5f3..d0247294e75a1 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/InvoiceSender.php
@@ -3,18 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Model\Order\Email\Sender;
 
+use Magento\Framework\DataObject;
+use Magento\Framework\Event\ManagerInterface;
 use Magento\Payment\Helper\Data as PaymentHelper;
 use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Address\Renderer;
 use Magento\Sales\Model\Order\Email\Container\InvoiceIdentity;
 use Magento\Sales\Model\Order\Email\Container\Template;
 use Magento\Sales\Model\Order\Email\Sender;
 use Magento\Sales\Model\Order\Invoice;
 use Magento\Sales\Model\ResourceModel\Order\Invoice as InvoiceResource;
-use Magento\Sales\Model\Order\Address\Renderer;
-use Magento\Framework\Event\ManagerInterface;
-use Magento\Framework\DataObject;
 
 /**
  * Sends order invoice email to the customer.
@@ -106,6 +108,12 @@ public function send(Invoice $invoice, $forceSyncMode = false)
             $order = $invoice->getOrder();
             $this->identityContainer->setStore($order->getStore());
 
+            if ($this->checkIfPartialInvoice($order, $invoice)) {
+                $order->setBaseSubtotal((float) $invoice->getBaseSubtotal());
+                $order->setBaseTaxAmount((float) $invoice->getBaseTaxAmount());
+                $order->setBaseShippingAmount((float) $invoice->getBaseShippingAmount());
+            }
+
             $transport = [
                 'order' => $order,
                 'order_id' => $order->getId(),
@@ -165,4 +173,18 @@ protected function getPaymentHtml(Order $order)
             $this->identityContainer->getStore()->getStoreId()
         );
     }
+
+    /**
+     * Check if the order contains partial invoice
+     *
+     * @param Order $order
+     * @param Invoice $invoice
+     * @return bool
+     */
+    private function checkIfPartialInvoice(Order $order, Invoice $invoice): bool
+    {
+        $totalQtyOrdered = (float) $order->getTotalQtyOrdered();
+        $totalQtyInvoiced = (float) $invoice->getTotalQty();
+        return $totalQtyOrdered !== $totalQtyInvoiced;
+    }
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Order/Email/Items/DefaultItemsTest.php b/app/code/Magento/Sales/Test/Unit/Block/Order/Email/Items/DefaultItemsTest.php
index 4d8b8033f60da..7123a81306ef1 100644
--- a/app/code/Magento/Sales/Test/Unit/Block/Order/Email/Items/DefaultItemsTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Block/Order/Email/Items/DefaultItemsTest.php
@@ -11,7 +11,7 @@
 use Magento\Backend\Block\Template\Context;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Layout;
-use Magento\Quote\Model\Quote\Item;
+use Magento\Quote\Model\Quote\Item as QuoteItem;
 use Magento\Sales\Block\Order\Email\Items\DefaultItems;
 use Magento\Sales\Model\Order\Item as OrderItem;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -20,7 +20,7 @@
 class DefaultItemsTest extends TestCase
 {
     /**
-     * @var MockObject|\Magento\Sales\Block\Order\Email\Items\DefaultItem
+     * @var MockObject|DefaultItems
      */
     protected $block;
 
@@ -39,9 +39,16 @@ class DefaultItemsTest extends TestCase
      */
     protected $objectManager;
 
-    /** @var MockObject|Item  */
+    /**
+     * @var MockObject|OrderItem
+     */
     protected $itemMock;
 
+    /**
+     * @var MockObject|QuoteItem
+     */
+    protected $quoteItemMock;
+
     /**
      * Initialize required data
      */
@@ -54,16 +61,6 @@ protected function setUp(): void
             ->setMethods(['getBlock'])
             ->getMock();
 
-        $this->block = $this->objectManager->getObject(
-            DefaultItems::class,
-            [
-                'context' => $this->objectManager->getObject(
-                    Context::class,
-                    ['layout' => $this->layoutMock]
-                )
-            ]
-        );
-
         $this->priceRenderBlock = $this->getMockBuilder(Template::class)
             ->disableOriginalConstructor()
             ->setMethods(['setItem', 'toHtml'])
@@ -72,16 +69,47 @@ protected function setUp(): void
         $this->itemMock = $this->getMockBuilder(OrderItem::class)
             ->disableOriginalConstructor()
             ->getMock();
+
+        $this->quoteItemMock = $this->getMockBuilder(QuoteItem::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getQty'])
+            ->getMock();
+
+        $this->block = $this->objectManager->getObject(
+            DefaultItems::class,
+            [
+                'context' => $this->objectManager->getObject(
+                    Context::class,
+                    ['layout' => $this->layoutMock]
+                ),
+                'data' => [
+                    'item' => $this->quoteItemMock
+                ]
+            ]
+        );
     }
 
-    public function testGetItemPrice()
+    /**
+     * @param float $price
+     * @param string $html
+     * @param float $quantity
+     * @dataProvider getItemPriceDataProvider
+     * */
+    public function testGetItemPrice($price, $html, $quantity)
     {
-        $html = '$34.28';
-
         $this->layoutMock->expects($this->once())
             ->method('getBlock')
             ->with('item_price')
             ->willReturn($this->priceRenderBlock);
+        $this->quoteItemMock->expects($this->any())
+            ->method('getQty')
+            ->willReturn($quantity);
+        $this->itemMock->expects($this->any())
+            ->method('setRowTotal')
+            ->willReturn($price * $quantity);
+        $this->itemMock->expects($this->any())
+            ->method('setBaseRowTotal')
+            ->willReturn($price * $quantity);
 
         $this->priceRenderBlock->expects($this->once())
             ->method('setItem')
@@ -93,4 +121,15 @@ public function testGetItemPrice()
 
         $this->assertEquals($html, $this->block->getItemPrice($this->itemMock));
     }
+
+    /**
+     * @return array
+     */
+    public function getItemPriceDataProvider()
+    {
+        return [
+            'get default item price' => [34.28,'$34.28',1.0],
+            'get item price with quantity 2.0' => [12.00,'$24.00',2.0]
+        ];
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Email/Sender/InvoiceSenderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Email/Sender/InvoiceSenderTest.php
index 60021c7086267..55af8e9d2ee62 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Email/Sender/InvoiceSenderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/Email/Sender/InvoiceSenderTest.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Model\Order\Email\Sender;
 
 use Magento\Customer\Api\CustomerRepositoryInterface;
@@ -11,6 +13,7 @@
 use Magento\Sales\Model\Order\Email\Container\InvoiceIdentity;
 use Magento\Sales\Model\Order\Invoice;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Area;
 use PHPUnit\Framework\TestCase;
 
 class InvoiceSenderTest extends TestCase
@@ -39,27 +42,33 @@ protected function setUp(): void
      */
     public function testSend()
     {
-        \Magento\TestFramework\Helper\Bootstrap::getInstance()
-            ->loadArea(\Magento\Framework\App\Area::AREA_FRONTEND);
-        $order = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Sales\Model\Order::class);
+        Bootstrap::getInstance()
+            ->loadArea(Area::AREA_FRONTEND);
+        $order = Bootstrap::getObjectManager()
+            ->create(Order::class);
         $order->loadByIncrementId('100000001');
         $order->setCustomerEmail('customer@example.com');
 
-        $invoice = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Sales\Model\Order\Invoice::class
+        $invoice = Bootstrap::getObjectManager()->create(
+            Invoice::class
         );
         $invoice->setOrder($order);
-
+        $invoice->setTotalQty(1);
+        $invoice->setBaseSubtotal(50);
+        $invoice->setBaseTaxAmount(10);
+        $invoice->setBaseShippingAmount(5);
         /** @var InvoiceSender $invoiceSender */
-        $invoiceSender = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Sales\Model\Order\Email\Sender\InvoiceSender::class);
+        $invoiceSender = Bootstrap::getObjectManager()
+            ->create(InvoiceSender::class);
 
         $this->assertEmpty($invoice->getEmailSent());
         $result = $invoiceSender->send($invoice, true);
 
         $this->assertTrue($result);
         $this->assertNotEmpty($invoice->getEmailSent());
+        $this->assertEquals($invoice->getBaseSubtotal(), $order->getBaseSubtotal());
+        $this->assertEquals($invoice->getBaseTaxAmount(), $order->getBaseTaxAmount());
+        $this->assertEquals($invoice->getBaseShippingAmount(), $order->getBaseShippingAmount());
     }
 
     /**

From 03253e32852d298c7b5858f2d196d113246d0a3f Mon Sep 17 00:00:00 2001
From: Vadim Malesh <51680850+engcom-Charlie@users.noreply.github.com>
Date: Mon, 6 Jul 2020 17:30:21 +0300
Subject: [PATCH 0742/1718] add test case id

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

diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontShareWishlistWithMoreThanMaximumAllowedTextLengthLimitTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontShareWishlistWithMoreThanMaximumAllowedTextLengthLimitTest.xml
index 807906301466a..aa69a56cb7cae 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontShareWishlistWithMoreThanMaximumAllowedTextLengthLimitTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontShareWishlistWithMoreThanMaximumAllowedTextLengthLimitTest.xml
@@ -14,6 +14,7 @@
             <stories value="Sharing wishlist with more than Maximum Allowed Text Length Limit"/>
             <title value="Sharing wishlist with more than Maximum Allowed Text Length Limit"/>
             <description value="Customer should not have a possibility share wishlist with more than maximum allowed Email Text Length Limit"/>
+            <testCaseId value="MC-35647"/>
             <group value="wishlist"/>
             <group value="configuration"/>
         </annotations>

From cd18428f2d68d03140009a680e68a9079452f45c Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Tue, 7 Jul 2020 08:38:56 +0300
Subject: [PATCH 0743/1718] MC-34803: Incorrect item subtotal on partial
 invoice email

---
 .../Magento/Sales/Block/Order/Email/Items/DefaultItems.php  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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 7eccebbcb957f..cbb79f188f231 100644
--- a/app/code/Magento/Sales/Block/Order/Email/Items/DefaultItems.php
+++ b/app/code/Magento/Sales/Block/Order/Email/Items/DefaultItems.php
@@ -8,9 +8,7 @@
 namespace Magento\Sales\Block\Order\Email\Items;
 
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\View\Element\AbstractBlock;
 use Magento\Framework\View\Element\Template;
-use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Creditmemo\Item as CreditmemoItem;
 use Magento\Sales\Model\Order\Invoice\Item as InvoiceItem;
 use Magento\Sales\Model\Order\Item as OrderItem;
@@ -27,7 +25,7 @@ class DefaultItems extends Template
     /**
      * Retrieve current order model instance
      *
-     * @return Order
+     * @return \Magento\Sales\Model\Order
      */
     public function getOrder()
     {
@@ -97,7 +95,7 @@ public function getSku($item)
     /**
      * Return product additional information block
      *
-     * @return AbstractBlock
+     * @return \Magento\Framework\View\Element\AbstractBlock
      * @throws LocalizedException
      */
     public function getProductAdditionalInformationBlock()

From 0f7d805b24f35a8c9650b1fa61e6048d14fd7a27 Mon Sep 17 00:00:00 2001
From: Michal Derlatka <michal.derlatka1@gmail.com>
Date: Tue, 7 Jul 2020 07:52:02 +0200
Subject: [PATCH 0744/1718] magento/magento2#28570: createCustomer does not
 match validation requirements (static test fix)

---
 .../testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
index 7557dcfdf088a..840f05f846e66 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
@@ -343,7 +343,9 @@ public function testCreateCustomerSubscribed()
     public function testCreateCustomerIfCustomerWithProvidedEmailAlreadyExists()
     {
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('A customer with the same email address already exists in an associated website.');
+        $this->expectExceptionMessage(
+            'A customer with the same email address already exists in an associated website.'
+        );
 
         $existedEmail = 'customer@example.com';
         $password = 'test123#';

From b974b487d21ed32795cb1d244ebf620f31663085 Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Tue, 7 Jul 2020 09:41:39 +0300
Subject: [PATCH 0745/1718] Adding rollback fixtures and providing small
 adjustments

---
 .../DataProvider/CustomerReviewsDataProvider.php      |  2 +-
 .../Model/Resolver/Product/Review/AverageRating.php   |  5 ++++-
 .../_files/customer_review_with_rating_rollback.php   | 11 +++++++++++
 .../Review/_files/different_reviews_rollback.php      | 10 ++++++++++
 4 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Review/_files/customer_review_with_rating_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Review/_files/different_reviews_rollback.php

diff --git a/app/code/Magento/ReviewGraphQl/Model/DataProvider/CustomerReviewsDataProvider.php b/app/code/Magento/ReviewGraphQl/Model/DataProvider/CustomerReviewsDataProvider.php
index a1d7b4bb7d7cc..42adc8009c010 100644
--- a/app/code/Magento/ReviewGraphQl/Model/DataProvider/CustomerReviewsDataProvider.php
+++ b/app/code/Magento/ReviewGraphQl/Model/DataProvider/CustomerReviewsDataProvider.php
@@ -43,7 +43,7 @@ public function getData(int $customerId, int $currentPage, int $pageSize): Revie
     {
         /** @var ReviewsCollection $reviewsCollection */
         $reviewsCollection = $this->collectionFactory->create();
-        $reviewsCollection->addStatusFilter(Review::STATUS_APPROVED)
+        $reviewsCollection
             ->addCustomerFilter($customerId)
             ->setPageSize($pageSize)
             ->setCurPage($currentPage)
diff --git a/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/Review/AverageRating.php b/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/Review/AverageRating.php
index 385d273d5368c..2e0d428b47873 100644
--- a/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/Review/AverageRating.php
+++ b/app/code/Magento/ReviewGraphQl/Model/Resolver/Product/Review/AverageRating.php
@@ -67,7 +67,10 @@ public function resolve(
         $averageRating = $summary->getSum() ?: 0;
 
         if ($averageRating > 0) {
-            $averageRating = (float) number_format($summary->getSum() / $summary->getCount() / 20, 2);
+            $averageRating = (float) number_format(
+                (int) $summary->getSum() / (int) $summary->getCount(),
+                2
+            );
         }
 
         return $averageRating;
diff --git a/dev/tests/integration/testsuite/Magento/Review/_files/customer_review_with_rating_rollback.php b/dev/tests/integration/testsuite/Magento/Review/_files/customer_review_with_rating_rollback.php
new file mode 100644
index 0000000000000..0931d881a6fdc
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Review/_files/customer_review_with_rating_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/Customer/_files/customer_rollback.php');
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/product_simple_rollback.php');
diff --git a/dev/tests/integration/testsuite/Magento/Review/_files/different_reviews_rollback.php b/dev/tests/integration/testsuite/Magento/Review/_files/different_reviews_rollback.php
new file mode 100644
index 0000000000000..328c1e229da5c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Review/_files/different_reviews_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/Catalog/_files/product_simple_rollback.php');

From 86a72f468d06dc21644505667dd0b825f99eb41a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tylek?= <pawel.tylek@creativestyle.pl>
Date: Tue, 7 Jul 2020 12:51:32 +0200
Subject: [PATCH 0746/1718] Fix toolbar initialization in order to use
 specified element

---
 .../frontend/web/js/product/list/toolbar.js    | 14 ++++----------
 .../frontend/js/product/list/toolbar.test.js   | 18 +++++++++---------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js b/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
index 3c188a4229aa4..607930348bf4f 100644
--- a/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
+++ b/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
@@ -9,8 +9,6 @@ define([
 ], function ($) {
     'use strict';
 
-    var isToolbarInitialized = false;
-
     /**
      * ProductListToolbarForm Widget - this widget is setting cookie and submitting form according to toolbar controls
      */
@@ -37,14 +35,10 @@ define([
 
         /** @inheritdoc */
         _create: function () {
-            if (isToolbarInitialized) {
-                return;
-            }
-            this._bind($(this.options.modeControl), this.options.mode, this.options.modeDefault);
-            this._bind($(this.options.directionControl), this.options.direction, this.options.directionDefault);
-            this._bind($(this.options.orderControl), this.options.order, this.options.orderDefault);
-            this._bind($(this.options.limitControl), this.options.limit, this.options.limitDefault);
-            isToolbarInitialized = true;
+            this._bind($(this.options.modeControl, this.element), this.options.mode, this.options.modeDefault);
+            this._bind($(this.options.directionControl, this.element), this.options.direction, this.options.directionDefault);
+            this._bind($(this.options.orderControl, this.element), this.options.order, this.options.orderDefault);
+            this._bind($(this.options.limitControl, this.element), this.options.limit, this.options.limitDefault);
         },
 
         /** @inheritdoc */
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/list/toolbar.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/list/toolbar.test.js
index e17c880a2fcf3..d434b9fab0fcf 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/list/toolbar.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/list/toolbar.test.js
@@ -6,11 +6,12 @@
 define([
     'jquery',
     'Magento_Catalog/js/product/list/toolbar'
-], function ($, productListToolbarForm) {
+], function ($) {
     'use strict';
 
     describe('Magento_Catalog/js/product/list/toolbar', function () {
-        var toolbar;
+        var widget,
+            toolbar;
 
         beforeEach(function () {
             toolbar = $('<div class="toolbar"></div>');
@@ -33,15 +34,14 @@ define([
             expect($.mage.productListToolbarForm.prototype._create).toHaveBeenCalledTimes(1);
         });
 
-        it('Toolbar is initialized once', function () {
-            spyOn($.mage.productListToolbarForm.prototype, '_bind');
-            var secondToolbar = $('<div class="toolbar"></div>');
-
+        it('Toolbar receives options properly', function () {
             toolbar.productListToolbarForm();
-            secondToolbar.productListToolbarForm();
+            expect(toolbar.productListToolbarForm('option', 'page')).toBe('p');
+        });
 
-            expect($.mage.productListToolbarForm.prototype._bind).toHaveBeenCalledTimes(4);
-            secondToolbar.remove();
+        it('Toolbar receives element properly', function () {
+            widget = toolbar.productListToolbarForm();
+            expect(widget).toBe(toolbar);
         });
     });
 });

From dfc733a98eb96cf685938a9cfdb1e10c3aeb1ee1 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Tue, 7 Jul 2020 12:02:24 +0100
Subject: [PATCH 0747/1718] Implemented content status filter

---
 .../Model/GetAssetIdByContentStatus.php       | 114 +++++++++++++++
 .../GetAssetIdByContentStatusComposite.php    |  43 ++++++
 .../Model/GetAssetIdByEavContentStatus.php    | 136 ++++++++++++++++++
 .../Magento/MediaContent/etc/adminhtml/di.xml |  55 +++++++
 .../GetAssetIdByContentStatusInterface.php    |  20 +++
 app/code/Magento/MediaContentUi/LICENSE.txt   |  48 +++++++
 .../Magento/MediaContentUi/LICENSE_AFL.txt    |  48 +++++++
 .../FilterProcessor/ContentStatus.php         |  47 ++++++
 app/code/Magento/MediaContentUi/README.md     |  13 ++
 app/code/Magento/MediaContentUi/composer.json |  24 ++++
 .../MediaContentUi/etc/adminhtml/di.xml       |  21 +++
 .../Magento/MediaContentUi/etc/module.xml     |  10 ++
 .../Magento/MediaContentUi/registration.php   |   9 ++
 13 files changed, 588 insertions(+)
 create mode 100644 app/code/Magento/MediaContent/Model/GetAssetIdByContentStatus.php
 create mode 100644 app/code/Magento/MediaContent/Model/GetAssetIdByContentStatusComposite.php
 create mode 100644 app/code/Magento/MediaContent/Model/GetAssetIdByEavContentStatus.php
 create mode 100644 app/code/Magento/MediaContent/etc/adminhtml/di.xml
 create mode 100644 app/code/Magento/MediaContentApi/Model/GetAssetIdByContentStatusInterface.php
 create mode 100644 app/code/Magento/MediaContentUi/LICENSE.txt
 create mode 100644 app/code/Magento/MediaContentUi/LICENSE_AFL.txt
 create mode 100644 app/code/Magento/MediaContentUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/ContentStatus.php
 create mode 100644 app/code/Magento/MediaContentUi/README.md
 create mode 100644 app/code/Magento/MediaContentUi/composer.json
 create mode 100644 app/code/Magento/MediaContentUi/etc/adminhtml/di.xml
 create mode 100644 app/code/Magento/MediaContentUi/etc/module.xml
 create mode 100644 app/code/Magento/MediaContentUi/registration.php

diff --git a/app/code/Magento/MediaContent/Model/GetAssetIdByContentStatus.php b/app/code/Magento/MediaContent/Model/GetAssetIdByContentStatus.php
new file mode 100644
index 0000000000000..05c6ea8ac9b7b
--- /dev/null
+++ b/app/code/Magento/MediaContent/Model/GetAssetIdByContentStatus.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContent\Model;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\MediaContentApi\Model\GetAssetIdByContentStatusInterface;
+
+/**
+ * Class GetAssetIdByContentStatus
+ */
+class GetAssetIdByContentStatus implements GetAssetIdByContentStatusInterface
+{
+    private const TABLE_CONTENT_ASSET = 'media_content_asset';
+
+    /**
+     * @var ResourceConnection
+     */
+    private $connection;
+
+    /**
+     * @var string
+     */
+    private $entityType;
+
+    /**
+     * @var string
+     */
+    private $contentTable;
+
+    /**
+     * @var string
+     */
+    private $statusColumn;
+
+    /**
+     * @var string
+     */
+    private $idColumn;
+
+    /**
+     * @var array
+     */
+    private $valueMap;
+
+    /**
+     * GetContentIdByStatus constructor.
+     * @param ResourceConnection $resource
+     * @param string $entityType
+     * @param string $contentTable
+     * @param string $idColumn
+     * @param string $statusColumn
+     * @param array $valueMap
+     */
+    public function __construct(
+        ResourceConnection $resource,
+        string $entityType,
+        string $contentTable,
+        string $idColumn,
+        string $statusColumn,
+        array $valueMap = []
+    ) {
+        $this->connection = $resource;
+        $this->entityType = $entityType;
+        $this->contentTable = $contentTable;
+        $this->idColumn = $idColumn;
+        $this->statusColumn = $statusColumn;
+        $this->valueMap = $valueMap;
+    }
+
+    /**
+     * @param string $value
+     * @return array
+     */
+    public function execute(string $value): array
+    {
+        $sql = $this->connection->getConnection()->select()->from(
+            ['asset_content_table' => $this->connection->getTableName(self::TABLE_CONTENT_ASSET)],
+            ['asset_id']
+        )->where(
+            'entity_type = ?',
+            $this->entityType
+        )->joinInner(
+            ['content_table' => $this->connection->getTableName($this->contentTable)],
+            'asset_content_table.entity_id = content_table.' . $this->idColumn,
+            []
+        )->where(
+            'content_table.' . $this->statusColumn . ' = ?',
+            $this->getValueFromMap($value)
+        );
+
+        $result = $this->connection->getConnection()->fetchAll($sql);
+
+        return array_map(function ($item) {
+            return $item['asset_id'];
+        }, $result);
+    }
+
+    /**
+     * @param string $value
+     * @return string
+     */
+    private function getValueFromMap(string $value): string
+    {
+        if (count($this->valueMap) > 0 && array_key_exists($value, $this->valueMap)) {
+            return $this->valueMap[$value];
+        }
+        return $value;
+    }
+}
diff --git a/app/code/Magento/MediaContent/Model/GetAssetIdByContentStatusComposite.php b/app/code/Magento/MediaContent/Model/GetAssetIdByContentStatusComposite.php
new file mode 100644
index 0000000000000..72ea5354fae36
--- /dev/null
+++ b/app/code/Magento/MediaContent/Model/GetAssetIdByContentStatusComposite.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContent\Model;
+
+use Magento\MediaContentApi\Model\GetAssetIdByContentStatusInterface;
+
+/**
+ * Class GetAssetIdByContentStatusComposite
+ */
+class GetAssetIdByContentStatusComposite implements GetAssetIdByContentStatusInterface
+{
+    /**
+     * @var GetAssetIdByContentStatus[]
+     */
+    private $getAssetIdByContentStatusArray;
+
+    /**
+     * GetAssetIdByContentStatusComposite constructor.
+     * @param array $getAssetIdByContentStatusArray
+     */
+    public function __construct($getAssetIdByContentStatusArray = [])
+    {
+        $this->getAssetIdByContentStatusArray = $getAssetIdByContentStatusArray;
+    }
+
+    /**
+     * @param string $value
+     * @return array
+     */
+    public function execute(string $value): array
+    {
+        $ids = [];
+        foreach ($this->getAssetIdByContentStatusArray as $getAssetIdByContentStatus) {
+            $ids = array_merge($ids, $getAssetIdByContentStatus->execute($value));
+        }
+        return array_unique($ids);
+    }
+}
diff --git a/app/code/Magento/MediaContent/Model/GetAssetIdByEavContentStatus.php b/app/code/Magento/MediaContent/Model/GetAssetIdByEavContentStatus.php
new file mode 100644
index 0000000000000..c76c7c0623399
--- /dev/null
+++ b/app/code/Magento/MediaContent/Model/GetAssetIdByEavContentStatus.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContent\Model;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\MediaContentApi\Model\GetAssetIdByContentStatusInterface;
+
+/**
+ * Class GetAssetIdByEavContentStatus
+ */
+class GetAssetIdByEavContentStatus implements GetAssetIdByContentStatusInterface
+{
+    private const TABLE_CONTENT_ASSET = 'media_content_asset';
+    private const TABLE_EAV_ATTRIBUTE = 'eav_attribute';
+
+    /**
+     * @var ResourceConnection
+     */
+    private $connection;
+
+    /**
+     * @var string
+     */
+    private $entityEavTypeTable;
+
+    /**
+     * @var string
+     */
+    private $attributeCode;
+
+    /**
+     * @var string
+     */
+    private $entityType;
+
+    /**
+     * @var int
+     */
+    private $entityTypeId;
+
+    /**
+     * @var array
+     */
+    private $valueMap;
+
+    /**
+     * GetEavContentIdByStatus constructor.
+     * @param ResourceConnection $resource
+     * @param string $entityEavTypeTable
+     * @param string $attributeCode
+     * @param string $entityType
+     * @param int $entityTypeId
+     * @param array $valueMap
+     */
+    public function __construct(
+        ResourceConnection $resource,
+        string $entityEavTypeTable,
+        string $attributeCode,
+        string $entityType,
+        int $entityTypeId,
+        array $valueMap = []
+    ) {
+        $this->connection = $resource;
+        $this->entityEavTypeTable = $entityEavTypeTable;
+        $this->attributeCode = $attributeCode;
+        $this->entityType = $entityType;
+        $this->entityTypeId = $entityTypeId;
+        $this->valueMap = $valueMap;
+    }
+
+    /**
+     * @param string $value
+     * @return array
+     */
+    public function execute(string $value): array
+    {
+        $statusAttributeId = $this->getAttributeId();
+        $sql = $this->connection->getConnection()->select()->from(
+            ['asset_content_table' => $this->connection->getTableName(self::TABLE_CONTENT_ASSET)],
+            ['asset_id']
+        )->where(
+            'entity_type = ?',
+            $this->entityType
+        )->joinInner(
+            ['entity_eav_type' => $this->connection->getTableName($this->entityEavTypeTable)],
+            'asset_content_table.entity_id = entity_eav_type.entity_id AND entity_eav_type.attribute_id = ' .
+            $statusAttributeId,
+            []
+        )->where(
+            'entity_eav_type.value = ?',
+            $this->getValueFromMap($value)
+        );
+
+        $result = $this->connection->getConnection()->fetchAll($sql);
+
+        return array_map(function ($item) {
+            return $item['asset_id'];
+        }, $result);
+    }
+
+    /**
+     * @return string
+     */
+    private function getAttributeId(): string
+    {
+        $sql = $this->connection->getConnection()->select()->from(
+            ['eav' => $this->connection->getTableName(self::TABLE_EAV_ATTRIBUTE)],
+            ['attribute_id']
+        )->where(
+            'entity_type_id = ?',
+            $this->entityTypeId
+        )->where(
+            'attribute_code = ?',
+            $this->attributeCode
+        );
+
+        return $this->connection->getConnection()->fetchOne($sql);
+    }
+
+    /**
+     * @param string $value
+     * @return string
+     */
+    private function getValueFromMap(string $value): string
+    {
+        if (count($this->valueMap) > 0 && array_key_exists($value, $this->valueMap)) {
+            return $this->valueMap[$value];
+        }
+        return $value;
+    }
+}
diff --git a/app/code/Magento/MediaContent/etc/adminhtml/di.xml b/app/code/Magento/MediaContent/etc/adminhtml/di.xml
new file mode 100644
index 0000000000000..b85f39e8beda7
--- /dev/null
+++ b/app/code/Magento/MediaContent/etc/adminhtml/di.xml
@@ -0,0 +1,55 @@
+<?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\MediaContent\Model\GetAssetIdByContentStatusComposite">
+        <arguments>
+            <argument name="getAssetIdByContentStatusArray" xsi:type="array">
+                <item name="getAssetIdByProductStatus" xsi:type="object">Magento\MediaContent\Model\GetAssetIdByProductStatus</item>
+                <item name="getAssetIdByCategoryStatus" xsi:type="object">Magento\MediaContent\Model\GetAssetIdByCategoryStatus</item>
+                <item name="getAssetIdByPageStatus" xsi:type="object">Magento\MediaContent\Model\GetAssetIdByPageStatus</item>
+                <item name="getAssetIdByBlockStatus" xsi:type="object">Magento\MediaContent\Model\GetAssetIdByBlockStatus</item>
+            </argument>
+        </arguments>
+    </type>
+    <virtualType name="Magento\MediaContent\Model\GetAssetIdByProductStatus" type="Magento\MediaContent\Model\GetAssetIdByEavContentStatus">
+        <arguments>
+            <argument name="entityEavTypeTable" xsi:type="string">catalog_product_entity_int</argument>
+            <argument name="attributeCode" xsi:type="string">status</argument>
+            <argument name="entityType" xsi:type="string">catalog_product</argument>
+            <argument name="entityTypeId" xsi:type="string">4</argument>
+            <argument name="valueMap" xsi:type="array">
+                <item name="1" xsi:type="string">1</item>
+                <item name="0" xsi:type="string">2</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\MediaContent\Model\GetAssetIdByCategoryStatus" type="Magento\MediaContent\Model\GetAssetIdByEavContentStatus">
+        <arguments>
+            <argument name="entityEavTypeTable" xsi:type="string">catalog_category_entity_int</argument>
+            <argument name="attributeCode" xsi:type="string">is_active</argument>
+            <argument name="entityType" xsi:type="string">catalog_category</argument>
+            <argument name="entityTypeId" xsi:type="string">3</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\MediaContent\Model\GetAssetIdByPageStatus" type="Magento\MediaContent\Model\GetAssetIdByContentStatus">
+        <arguments>
+            <argument name="entityType" xsi:type="string">cms_page</argument>
+            <argument name="contentTable" xsi:type="string">cms_page</argument>
+            <argument name="idColumn" xsi:type="string">page_id</argument>
+            <argument name="statusColumn" xsi:type="string">is_active</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\MediaContent\Model\GetAssetIdByBlockStatus" type="Magento\MediaContent\Model\GetAssetIdByContentStatus">
+        <arguments>
+            <argument name="entityType" xsi:type="string">cms_block</argument>
+            <argument name="contentTable" xsi:type="string">cms_block</argument>
+            <argument name="idColumn" xsi:type="string">block_id</argument>
+            <argument name="statusColumn" xsi:type="string">is_active</argument>
+        </arguments>
+    </virtualType>
+</config>
diff --git a/app/code/Magento/MediaContentApi/Model/GetAssetIdByContentStatusInterface.php b/app/code/Magento/MediaContentApi/Model/GetAssetIdByContentStatusInterface.php
new file mode 100644
index 0000000000000..6eb609f68a389
--- /dev/null
+++ b/app/code/Magento/MediaContentApi/Model/GetAssetIdByContentStatusInterface.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentApi\Model;
+
+/**
+ * Interface used to return Asset id by content status (enabled, disabled).
+ */
+interface GetAssetIdByContentStatusInterface
+{
+    /**
+     * @param string $status
+     * @return int[]
+     */
+    public function execute(string $status): array;
+}
diff --git a/app/code/Magento/MediaContentUi/LICENSE.txt b/app/code/Magento/MediaContentUi/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/MediaContentUi/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/MediaContentUi/LICENSE_AFL.txt b/app/code/Magento/MediaContentUi/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/MediaContentUi/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/MediaContentUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/ContentStatus.php b/app/code/Magento/MediaContentUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/ContentStatus.php
new file mode 100644
index 0000000000000..bf157569586ba
--- /dev/null
+++ b/app/code/Magento/MediaContentUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/ContentStatus.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor;
+
+use Magento\Framework\Api\Filter;
+use Magento\Framework\Api\SearchCriteria\CollectionProcessor\FilterProcessor\CustomFilterInterface;
+use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\MediaContentApi\Model\GetAssetIdByContentStatusInterface;
+
+class ContentStatus implements CustomFilterInterface
+{
+    private const TABLE_ALIAS = 'main_table';
+
+    /**
+     * @var GetAssetIdByContentStatusInterface
+     */
+    private $getAssetIdByContentStatus;
+
+    /**
+     * ContentStatus constructor.
+     * @param GetAssetIdByContentStatusInterface $getAssetIdByContentStatus
+     */
+    public function __construct(
+        GetAssetIdByContentStatusInterface $getAssetIdByContentStatus
+    ) {
+        $this->getAssetIdByContentStatus = $getAssetIdByContentStatus;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function apply(Filter $filter, AbstractDb $collection): bool
+    {
+        $collection->addFieldToFilter(
+            self::TABLE_ALIAS . '.id',
+            ['in' => $this->getAssetIdByContentStatus->execute($filter->getValue())]
+        );
+
+        return true;
+    }
+
+}
diff --git a/app/code/Magento/MediaContentUi/README.md b/app/code/Magento/MediaContentUi/README.md
new file mode 100644
index 0000000000000..2145d9c328914
--- /dev/null
+++ b/app/code/Magento/MediaContentUi/README.md
@@ -0,0 +1,13 @@
+# Magento_MediaContentUi module
+
+The Magento_MediaContentUi module is responsible for the media content user interface (UI) implementation.
+
+## Extensibility
+
+Extension developers can interact with the Magento_MediaContentUi module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.4/extension-dev-guide/plugins.html).
+
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.4/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_MediaContentUi module.
+
+## Additional information
+
+For information about significant changes in patch releases, see [2.3.x Release information](https://devdocs.magento.com/guides/v2.4/release-notes/bk-release-notes.html).
diff --git a/app/code/Magento/MediaContentUi/composer.json b/app/code/Magento/MediaContentUi/composer.json
new file mode 100644
index 0000000000000..67b92f925d11d
--- /dev/null
+++ b/app/code/Magento/MediaContentUi/composer.json
@@ -0,0 +1,24 @@
+{
+    "name": "magento/module-media-content-ui",
+    "description": "Magento module responsible for media content user interface",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*",
+        "magento/module-media-content-api": "*",
+        "magento/module-media-content": "*",
+        "magento/module-media-gallery-ui": "*"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\MediaContentUi\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/MediaContentUi/etc/adminhtml/di.xml b/app/code/Magento/MediaContentUi/etc/adminhtml/di.xml
new file mode 100644
index 0000000000000..e8fc8ef9c1ddd
--- /dev/null
+++ b/app/code/Magento/MediaContentUi/etc/adminhtml/di.xml
@@ -0,0 +1,21 @@
+<?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">
+    <virtualType name="Magento\MediaGalleryUi\Model\Api\SearchCriteria\CollectionProcessor\FilterProcessor">
+        <arguments>
+            <argument name="customFilters" xsi:type="array">
+                <item name="content_status" xsi:type="object">Magento\MediaContentUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor\ContentStatus</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\MediaContentUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor\ContentStatus">
+        <arguments>
+            <argument name="getAssetIdByContentStatus" xsi:type="object">Magento\MediaContent\Model\GetAssetIdByContentStatusComposite</argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/MediaContentUi/etc/module.xml b/app/code/Magento/MediaContentUi/etc/module.xml
new file mode 100644
index 0000000000000..3f615d11ae2ff
--- /dev/null
+++ b/app/code/Magento/MediaContentUi/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_MediaContentUi" />
+</config>
diff --git a/app/code/Magento/MediaContentUi/registration.php b/app/code/Magento/MediaContentUi/registration.php
new file mode 100644
index 0000000000000..5f55c31a5936c
--- /dev/null
+++ b/app/code/Magento/MediaContentUi/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_MediaContentUi', __DIR__);

From a925a0377651cbc73edf83665f4b5cd80ba16737 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Tue, 7 Jul 2020 14:12:08 +0300
Subject: [PATCH 0748/1718] code improvement; fix tests

---
 .../Translation/Model/InlineParserTest.php    | 133 ++++++++++++------
 .../Magento/Framework/Translate/Inline.php    | 103 +++++++-------
 2 files changed, 142 insertions(+), 94 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Translation/Model/InlineParserTest.php b/dev/tests/integration/testsuite/Magento/Translation/Model/InlineParserTest.php
index 6b1dd4758d633..5078219fbb41f 100644
--- a/dev/tests/integration/testsuite/Magento/Translation/Model/InlineParserTest.php
+++ b/dev/tests/integration/testsuite/Magento/Translation/Model/InlineParserTest.php
@@ -3,93 +3,134 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Translation\Model;
 
-class InlineParserTest extends \PHPUnit\Framework\TestCase
+use Magento\Framework\App\Config\MutableScopeConfigInterface;
+use Magento\Framework\App\State;
+use Magento\Framework\Translate\Inline;
+use Magento\Framework\App\Area;
+use Magento\Store\Model\ScopeInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Translation\Model\Inline\Parser;
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Test for \Magento\Translation\Model\Inline\Parser.
+ */
+class InlineParserTest extends TestCase
 {
+    private const STUB_STORE = 'default';
+    private const XML_PATH_TRANSLATE_INLINE_ACTIVE = 'dev/translate_inline/active';
+
     /**
-     * @var \Magento\Translation\Model\Inline\Parser
+     * @var Parser
      */
-    protected $_inlineParser;
-
-    /** @var string */
-    protected $_storeId = 'default';
+    private $model;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp(): void
     {
-        /** @var $inline \Magento\Framework\Translate\Inline */
-        $inline = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Framework\Translate\Inline::class);
-        $this->_inlineParser = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Translation\Model\Inline\Parser::class,
-            ['translateInline' => $inline]
-        );
-        /* Called getConfig as workaround for setConfig bug */
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Store\Model\StoreManagerInterface::class
-        )->getStore(
-            $this->_storeId
-        )->getConfig(
-            'dev/translate_inline/active'
-        );
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Framework\App\Config\MutableScopeConfigInterface::class
-        )->setValue(
-            'dev/translate_inline/active',
-            true,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-            $this->_storeId
-        );
+        $inline = Bootstrap::getObjectManager()->create(Inline::class);
+        $this->model = Bootstrap::getObjectManager()->create(Parser::class, ['translateInline' => $inline]);
+        Bootstrap::getObjectManager()->get(MutableScopeConfigInterface::class)
+            ->setValue(self::XML_PATH_TRANSLATE_INLINE_ACTIVE, true, ScopeInterface::SCOPE_STORE, self::STUB_STORE);
     }
 
     /**
+     * Process ajax post test
+     *
      * @dataProvider processAjaxPostDataProvider
+     *
+     * @param string $originalText
+     * @param string $translatedText
+     * @param string $area
+     * @param bool|null $isPerStore
+     * @return void
      */
-    public function testProcessAjaxPost($originalText, $translatedText, $isPerStore = null)
-    {
+    public function testProcessAjaxPost(
+        string $originalText,
+        string $translatedText,
+        string $area,
+        ?bool $isPerStore = null
+    ): void {
+        Bootstrap::getObjectManager()->get(State::class)
+            ->setAreaCode($area);
+
         $inputArray = [['original' => $originalText, 'custom' => $translatedText]];
         if ($isPerStore !== null) {
             $inputArray[0]['perstore'] = $isPerStore;
         }
-        $this->_inlineParser->processAjaxPost($inputArray);
+        $this->model->processAjaxPost($inputArray);
 
-        $model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Translation\Model\StringUtils::class
-        );
+        $model = Bootstrap::getObjectManager()->create(StringUtils::class);
         $model->load($originalText);
+
         try {
             $this->assertEquals($translatedText, $model->getTranslate());
             $model->delete();
         } catch (\Exception $e) {
             $model->delete();
-            \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-                ->get(\Psr\Log\LoggerInterface::class)
+            Bootstrap::getObjectManager()->get(LoggerInterface::class)
                 ->critical($e);
         }
     }
 
     /**
+     * Data provider for testProcessAjaxPost
+     *
      * @return array
      */
-    public function processAjaxPostDataProvider()
+    public function processAjaxPostDataProvider(): array
     {
         return [
-            ['original text 1', 'translated text 1'],
-            ['original text 2', 'translated text 2', true]
+            ['original text 1', 'translated text 1', Area::AREA_ADMINHTML],
+            ['original text 1', 'translated text 1', Area::AREA_FRONTEND],
+            ['original text 2', 'translated text 2', Area::AREA_ADMINHTML, true],
+            ['original text 2', 'translated text 2', Area::AREA_FRONTEND, true],
         ];
     }
 
-    public function testSetGetIsJson()
+    /**
+     * Set get is json test
+     *
+     * @dataProvider allowedAreasDataProvider
+     *
+     * @param string $area
+     * @return void
+     */
+    public function testSetGetIsJson(string $area): void
     {
-        $isJsonProperty = new \ReflectionProperty(get_class($this->_inlineParser), '_isJson');
+        Bootstrap::getObjectManager()->get(State::class)
+            ->setAreaCode($area);
+
+        $isJsonProperty = new \ReflectionProperty(get_class($this->model), '_isJson');
         $isJsonProperty->setAccessible(true);
 
-        $this->assertFalse($isJsonProperty->getValue($this->_inlineParser));
+        $this->assertFalse($isJsonProperty->getValue($this->model));
 
-        $setIsJsonMethod = new \ReflectionMethod($this->_inlineParser, 'setIsJson');
+        $setIsJsonMethod = new \ReflectionMethod($this->model, 'setIsJson');
         $setIsJsonMethod->setAccessible(true);
-        $setIsJsonMethod->invoke($this->_inlineParser, true);
+        $setIsJsonMethod->invoke($this->model, true);
 
-        $this->assertTrue($isJsonProperty->getValue($this->_inlineParser));
+        $this->assertTrue($isJsonProperty->getValue($this->model));
+    }
+
+    /**
+     * Data provider for testSetGetIsJson
+     *
+     * @return array
+     */
+    public function allowedAreasDataProvider(): array
+    {
+        return [
+            [Area::AREA_ADMINHTML],
+            [Area::AREA_FRONTEND]
+        ];
     }
 }
diff --git a/lib/internal/Magento/Framework/Translate/Inline.php b/lib/internal/Magento/Framework/Translate/Inline.php
index 87f9525910e02..2ba27d9d5c5df 100644
--- a/lib/internal/Magento/Framework/Translate/Inline.php
+++ b/lib/internal/Magento/Framework/Translate/Inline.php
@@ -8,7 +8,24 @@
 
 namespace Magento\Framework\Translate;
 
-class Inline implements \Magento\Framework\Translate\InlineInterface
+use Magento\Framework\App\Area;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\ScopeInterface;
+use Magento\Framework\App\ScopeResolverInterface;
+use Magento\Framework\App\State;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Translate\Inline\ConfigInterface;
+use Magento\Framework\Translate\Inline\ParserInterface;
+use Magento\Framework\Translate\Inline\StateInterface;
+use Magento\Framework\UrlInterface;
+use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\LayoutInterface;
+
+/**
+ * Translate Inline Class
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class Inline implements InlineInterface
 {
     /**
      * Indicator to hold state of whether inline translation is allowed
@@ -18,7 +35,7 @@ class Inline implements \Magento\Framework\Translate\InlineInterface
     protected $isAllowed;
 
     /**
-     * @var \Magento\Framework\Translate\Inline\ParserInterface
+     * @var ParserInterface
      */
     protected $parser;
 
@@ -30,22 +47,22 @@ class Inline implements \Magento\Framework\Translate\InlineInterface
     protected $isScriptInserted = false;
 
     /**
-     * @var \Magento\Framework\UrlInterface
+     * @var UrlInterface
      */
     protected $url;
 
     /**
-     * @var \Magento\Framework\View\LayoutInterface
+     * @var LayoutInterface
      */
     protected $layout;
 
     /**
-     * @var \Magento\Framework\Translate\Inline\ConfigInterface
+     * @var ConfigInterface
      */
     protected $config;
 
     /**
-     * @var \Magento\Framework\App\ScopeResolverInterface
+     * @var ScopeResolverInterface
      */
     protected $scopeResolver;
 
@@ -72,41 +89,37 @@ class Inline implements \Magento\Framework\Translate\InlineInterface
     /**
      * @var array
      */
-    private $allowedAreas = [
-        \Magento\Framework\App\Area::AREA_FRONTEND,
-        \Magento\Framework\App\Area::AREA_ADMINHTML
-    ];
+    private $allowedAreas = [Area::AREA_FRONTEND, Area::AREA_ADMINHTML];
 
     /**
-     * @var \Magento\Framework\App\State
+     * @var State
      */
     private $appState;
 
     /**
-     * Initialize inline translation model
-     *
-     * @param \Magento\Framework\App\ScopeResolverInterface $scopeResolver
-     * @param \Magento\Framework\UrlInterface $url
-     * @param \Magento\Framework\View\LayoutInterface $layout
+     * @param ScopeResolverInterface $scopeResolver
+     * @param UrlInterface $url
+     * @param LayoutInterface $layout
      * @param Inline\ConfigInterface $config
      * @param Inline\ParserInterface $parser
      * @param Inline\StateInterface $state
-     * @param \Magento\Framework\App\State $appState
      * @param string $templateFileName
      * @param string $translatorRoute
-     * @param null $scope
+     * @param string|null $scope
+     * @param State|null $appState
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
-        \Magento\Framework\App\ScopeResolverInterface $scopeResolver,
-        \Magento\Framework\UrlInterface $url,
-        \Magento\Framework\View\LayoutInterface $layout,
-        \Magento\Framework\Translate\Inline\ConfigInterface $config,
-        \Magento\Framework\Translate\Inline\ParserInterface $parser,
-        \Magento\Framework\Translate\Inline\StateInterface $state,
-        \Magento\Framework\App\State $appState,
+        ScopeResolverInterface $scopeResolver,
+        UrlInterface $url,
+        LayoutInterface $layout,
+        ConfigInterface $config,
+        ParserInterface $parser,
+        StateInterface $state,
         $templateFileName = '',
         $translatorRoute = '',
-        $scope = null
+        $scope = null,
+        ?State $appState = null
     ) {
         $this->scopeResolver = $scopeResolver;
         $this->url = $url;
@@ -114,10 +127,10 @@ public function __construct(
         $this->config = $config;
         $this->parser = $parser;
         $this->state = $state;
-        $this->appState = $appState;
         $this->templateFileName = $templateFileName;
         $this->translatorRoute = $translatorRoute;
         $this->scope = $scope;
+        $this->appState = $appState ?: ObjectManager::getInstance()->get(State::class);
     }
 
     /**
@@ -128,13 +141,13 @@ public function __construct(
     public function isAllowed()
     {
         if ($this->isAllowed === null) {
-            if (!$this->scope instanceof \Magento\Framework\App\ScopeInterface) {
-                $scope = $this->scopeResolver->getScope($this->scope);
-            }
+            $scope = $this->scope instanceof ScopeInterface ? null : $this->scopeResolver->getScope($this->scope);
+
             $this->isAllowed = $this->config->isActive($scope)
                 && $this->config->isDevAllowed($scope)
                 && $this->isAreaAllowed();
         }
+
         return $this->state->isEnabled() && $this->isAllowed;
     }
 
@@ -151,7 +164,7 @@ public function getParser()
     /**
      * Replace translation templates with HTML fragments
      *
-     * @param array|string &$body
+     * @param array|string $body
      * @param bool $isJson
      * @return $this
      */
@@ -206,7 +219,9 @@ protected function addInlineScript()
             return;
         }
         if (!$this->isScriptInserted) {
-            $this->getParser()->setContent(str_ireplace('</body>', $this->getInlineScript() . '</body>', $content));
+            $this->getParser()->setContent(
+                str_ireplace('</body>', $this->getInlineScript() . '</body>', $content)
+            );
             $this->isScriptInserted = true;
         }
     }
@@ -221,8 +236,8 @@ protected function addInlineScript()
      */
     protected function getInlineScript()
     {
-        /** @var $block \Magento\Framework\View\Element\Template */
-        $block = $this->layout->createBlock(\Magento\Framework\View\Element\Template::class);
+        /** @var $block Template */
+        $block = $this->layout->createBlock(Template::class);
 
         $block->setAjaxUrl($this->getAjaxUrl());
         $block->setTemplate($this->templateFileName);
@@ -255,15 +270,10 @@ protected function stripInlineTranslations(&$body)
             foreach ($body as &$part) {
                 $this->stripInlineTranslations($part);
             }
-        } else {
-            if (is_string($body)) {
-                $body = preg_replace(
-                    '#' . \Magento\Framework\Translate\Inline\ParserInterface::REGEXP_TOKEN . '#',
-                    '$1',
-                    $body
-                );
-            }
+        } elseif (is_string($body)) {
+            $body = preg_replace('#' . ParserInterface::REGEXP_TOKEN . '#', '$1', $body);
         }
+
         return $this;
     }
 
@@ -272,14 +282,11 @@ protected function stripInlineTranslations(&$body)
      *
      * @return bool
      */
-    private function isAreaAllowed()
+    private function isAreaAllowed(): bool
     {
         try {
-            return in_array(
-                $this->appState->getAreaCode(),
-                $this->allowedAreas
-            );
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
+            return in_array($this->appState->getAreaCode(), $this->allowedAreas, true);
+        } catch (LocalizedException $e) {
             return false;
         }
     }

From 3a1a3c73bdcf29835641572bc4e51ece2941db33 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Tue, 7 Jul 2020 12:18:06 +0100
Subject: [PATCH 0749/1718] Improved attribute fetching

---
 .../Model/GetAssetIdByContentStatus.php       | 14 +----
 .../Model/GetAssetIdByEavContentStatus.php    | 53 ++++++-------------
 .../Magento/MediaContent/etc/adminhtml/di.xml |  4 --
 3 files changed, 16 insertions(+), 55 deletions(-)

diff --git a/app/code/Magento/MediaContent/Model/GetAssetIdByContentStatus.php b/app/code/Magento/MediaContent/Model/GetAssetIdByContentStatus.php
index 05c6ea8ac9b7b..10f974ab104e2 100644
--- a/app/code/Magento/MediaContent/Model/GetAssetIdByContentStatus.php
+++ b/app/code/Magento/MediaContent/Model/GetAssetIdByContentStatus.php
@@ -90,7 +90,7 @@ public function execute(string $value): array
             []
         )->where(
             'content_table.' . $this->statusColumn . ' = ?',
-            $this->getValueFromMap($value)
+            $value
         );
 
         $result = $this->connection->getConnection()->fetchAll($sql);
@@ -99,16 +99,4 @@ public function execute(string $value): array
             return $item['asset_id'];
         }, $result);
     }
-
-    /**
-     * @param string $value
-     * @return string
-     */
-    private function getValueFromMap(string $value): string
-    {
-        if (count($this->valueMap) > 0 && array_key_exists($value, $this->valueMap)) {
-            return $this->valueMap[$value];
-        }
-        return $value;
-    }
 }
diff --git a/app/code/Magento/MediaContent/Model/GetAssetIdByEavContentStatus.php b/app/code/Magento/MediaContent/Model/GetAssetIdByEavContentStatus.php
index c76c7c0623399..9da0dc1cd3f53 100644
--- a/app/code/Magento/MediaContent/Model/GetAssetIdByEavContentStatus.php
+++ b/app/code/Magento/MediaContent/Model/GetAssetIdByEavContentStatus.php
@@ -7,6 +7,8 @@
 
 namespace Magento\MediaContent\Model;
 
+use Magento\Eav\Api\Data\AttributeInterface;
+use Magento\Eav\Model\Config;
 use Magento\Framework\App\ResourceConnection;
 use Magento\MediaContentApi\Model\GetAssetIdByContentStatusInterface;
 
@@ -16,7 +18,6 @@
 class GetAssetIdByEavContentStatus implements GetAssetIdByContentStatusInterface
 {
     private const TABLE_CONTENT_ASSET = 'media_content_asset';
-    private const TABLE_EAV_ATTRIBUTE = 'eav_attribute';
 
     /**
      * @var ResourceConnection
@@ -24,9 +25,9 @@ class GetAssetIdByEavContentStatus implements GetAssetIdByContentStatusInterface
     private $connection;
 
     /**
-     * @var string
+     * @var Config
      */
-    private $entityEavTypeTable;
+    private $config;
 
     /**
      * @var string
@@ -38,48 +39,42 @@ class GetAssetIdByEavContentStatus implements GetAssetIdByContentStatusInterface
      */
     private $entityType;
 
-    /**
-     * @var int
-     */
-    private $entityTypeId;
-
     /**
      * @var array
      */
     private $valueMap;
 
     /**
-     * GetEavContentIdByStatus constructor.
+     * GetAssetIdByEavContentStatus constructor.
      * @param ResourceConnection $resource
-     * @param string $entityEavTypeTable
+     * @param Config $config
      * @param string $attributeCode
      * @param string $entityType
-     * @param int $entityTypeId
      * @param array $valueMap
      */
     public function __construct(
         ResourceConnection $resource,
-        string $entityEavTypeTable,
+        Config $config,
         string $attributeCode,
         string $entityType,
-        int $entityTypeId,
         array $valueMap = []
     ) {
         $this->connection = $resource;
-        $this->entityEavTypeTable = $entityEavTypeTable;
+        $this->config = $config;
         $this->attributeCode = $attributeCode;
         $this->entityType = $entityType;
-        $this->entityTypeId = $entityTypeId;
         $this->valueMap = $valueMap;
     }
 
     /**
      * @param string $value
      * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function execute(string $value): array
     {
-        $statusAttributeId = $this->getAttributeId();
+        $statusAttribute = $this->config->getAttribute($this->entityType, $this->attributeCode);
+
         $sql = $this->connection->getConnection()->select()->from(
             ['asset_content_table' => $this->connection->getTableName(self::TABLE_CONTENT_ASSET)],
             ['asset_id']
@@ -87,9 +82,10 @@ public function execute(string $value): array
             'entity_type = ?',
             $this->entityType
         )->joinInner(
-            ['entity_eav_type' => $this->connection->getTableName($this->entityEavTypeTable)],
-            'asset_content_table.entity_id = entity_eav_type.entity_id AND entity_eav_type.attribute_id = ' .
-            $statusAttributeId,
+            ['entity_eav_type' => $statusAttribute->getBackendTable()],
+            'asset_content_table.entity_id = entity_eav_type.' . $statusAttribute->getEntityIdField() .
+            ' AND entity_eav_type.attribute_id = ' .
+            $statusAttribute->getAttributeId(),
             []
         )->where(
             'entity_eav_type.value = ?',
@@ -103,25 +99,6 @@ public function execute(string $value): array
         }, $result);
     }
 
-    /**
-     * @return string
-     */
-    private function getAttributeId(): string
-    {
-        $sql = $this->connection->getConnection()->select()->from(
-            ['eav' => $this->connection->getTableName(self::TABLE_EAV_ATTRIBUTE)],
-            ['attribute_id']
-        )->where(
-            'entity_type_id = ?',
-            $this->entityTypeId
-        )->where(
-            'attribute_code = ?',
-            $this->attributeCode
-        );
-
-        return $this->connection->getConnection()->fetchOne($sql);
-    }
-
     /**
      * @param string $value
      * @return string
diff --git a/app/code/Magento/MediaContent/etc/adminhtml/di.xml b/app/code/Magento/MediaContent/etc/adminhtml/di.xml
index b85f39e8beda7..6f0f8efc1ac53 100644
--- a/app/code/Magento/MediaContent/etc/adminhtml/di.xml
+++ b/app/code/Magento/MediaContent/etc/adminhtml/di.xml
@@ -18,10 +18,8 @@
     </type>
     <virtualType name="Magento\MediaContent\Model\GetAssetIdByProductStatus" type="Magento\MediaContent\Model\GetAssetIdByEavContentStatus">
         <arguments>
-            <argument name="entityEavTypeTable" xsi:type="string">catalog_product_entity_int</argument>
             <argument name="attributeCode" xsi:type="string">status</argument>
             <argument name="entityType" xsi:type="string">catalog_product</argument>
-            <argument name="entityTypeId" xsi:type="string">4</argument>
             <argument name="valueMap" xsi:type="array">
                 <item name="1" xsi:type="string">1</item>
                 <item name="0" xsi:type="string">2</item>
@@ -30,10 +28,8 @@
     </virtualType>
     <virtualType name="Magento\MediaContent\Model\GetAssetIdByCategoryStatus" type="Magento\MediaContent\Model\GetAssetIdByEavContentStatus">
         <arguments>
-            <argument name="entityEavTypeTable" xsi:type="string">catalog_category_entity_int</argument>
             <argument name="attributeCode" xsi:type="string">is_active</argument>
             <argument name="entityType" xsi:type="string">catalog_category</argument>
-            <argument name="entityTypeId" xsi:type="string">3</argument>
         </arguments>
     </virtualType>
     <virtualType name="Magento\MediaContent\Model\GetAssetIdByPageStatus" type="Magento\MediaContent\Model\GetAssetIdByContentStatus">

From 15aa96f9ee6bebebe8d3102c39e655553ef21ee0 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Tue, 7 Jul 2020 12:25:29 +0100
Subject: [PATCH 0750/1718] Improved php doc blocks

---
 .../Model/GetAssetIdByContentStatus.php             |  8 ++++----
 .../Model/GetAssetIdByContentStatusComposite.php    | 11 +++++++----
 .../Model/GetAssetIdByEavContentStatus.php          | 13 +++++++------
 .../Model/GetAssetIdByContentStatusInterface.php    |  4 +++-
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/MediaContent/Model/GetAssetIdByContentStatus.php b/app/code/Magento/MediaContent/Model/GetAssetIdByContentStatus.php
index 10f974ab104e2..f9ec4cff77bae 100644
--- a/app/code/Magento/MediaContent/Model/GetAssetIdByContentStatus.php
+++ b/app/code/Magento/MediaContent/Model/GetAssetIdByContentStatus.php
@@ -11,7 +11,7 @@
 use Magento\MediaContentApi\Model\GetAssetIdByContentStatusInterface;
 
 /**
- * Class GetAssetIdByContentStatus
+ * Class responsible to return Asset id by entity status
  */
 class GetAssetIdByContentStatus implements GetAssetIdByContentStatusInterface
 {
@@ -48,7 +48,8 @@ class GetAssetIdByContentStatus implements GetAssetIdByContentStatusInterface
     private $valueMap;
 
     /**
-     * GetContentIdByStatus constructor.
+     * GetAssetIdByContentStatus constructor.
+     *
      * @param ResourceConnection $resource
      * @param string $entityType
      * @param string $contentTable
@@ -73,8 +74,7 @@ public function __construct(
     }
 
     /**
-     * @param string $value
-     * @return array
+     * @inheritDoc
      */
     public function execute(string $value): array
     {
diff --git a/app/code/Magento/MediaContent/Model/GetAssetIdByContentStatusComposite.php b/app/code/Magento/MediaContent/Model/GetAssetIdByContentStatusComposite.php
index 72ea5354fae36..f62b3cd2ffb52 100644
--- a/app/code/Magento/MediaContent/Model/GetAssetIdByContentStatusComposite.php
+++ b/app/code/Magento/MediaContent/Model/GetAssetIdByContentStatusComposite.php
@@ -10,7 +10,7 @@
 use Magento\MediaContentApi\Model\GetAssetIdByContentStatusInterface;
 
 /**
- * Class GetAssetIdByContentStatusComposite
+ * Class responsible to return Asset ids by content status
  */
 class GetAssetIdByContentStatusComposite implements GetAssetIdByContentStatusInterface
 {
@@ -21,6 +21,7 @@ class GetAssetIdByContentStatusComposite implements GetAssetIdByContentStatusInt
 
     /**
      * GetAssetIdByContentStatusComposite constructor.
+     *
      * @param array $getAssetIdByContentStatusArray
      */
     public function __construct($getAssetIdByContentStatusArray = [])
@@ -29,14 +30,16 @@ public function __construct($getAssetIdByContentStatusArray = [])
     }
 
     /**
-     * @param string $value
+     * Get Asset ids by Content status
+     *
+     * @param string $status
      * @return array
      */
-    public function execute(string $value): array
+    public function execute(string $status): array
     {
         $ids = [];
         foreach ($this->getAssetIdByContentStatusArray as $getAssetIdByContentStatus) {
-            $ids = array_merge($ids, $getAssetIdByContentStatus->execute($value));
+            $ids = array_merge($ids, $getAssetIdByContentStatus->execute($status));
         }
         return array_unique($ids);
     }
diff --git a/app/code/Magento/MediaContent/Model/GetAssetIdByEavContentStatus.php b/app/code/Magento/MediaContent/Model/GetAssetIdByEavContentStatus.php
index 9da0dc1cd3f53..c9d2e93182802 100644
--- a/app/code/Magento/MediaContent/Model/GetAssetIdByEavContentStatus.php
+++ b/app/code/Magento/MediaContent/Model/GetAssetIdByEavContentStatus.php
@@ -7,13 +7,12 @@
 
 namespace Magento\MediaContent\Model;
 
-use Magento\Eav\Api\Data\AttributeInterface;
 use Magento\Eav\Model\Config;
 use Magento\Framework\App\ResourceConnection;
 use Magento\MediaContentApi\Model\GetAssetIdByContentStatusInterface;
 
 /**
- * Class GetAssetIdByEavContentStatus
+ * Class responsible to return Asset id by eav entity status
  */
 class GetAssetIdByEavContentStatus implements GetAssetIdByContentStatusInterface
 {
@@ -46,6 +45,7 @@ class GetAssetIdByEavContentStatus implements GetAssetIdByContentStatusInterface
 
     /**
      * GetAssetIdByEavContentStatus constructor.
+     *
      * @param ResourceConnection $resource
      * @param Config $config
      * @param string $attributeCode
@@ -67,11 +67,10 @@ public function __construct(
     }
 
     /**
-     * @param string $value
-     * @return array
+     * @inheritDoc
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    public function execute(string $value): array
+    public function execute(string $status): array
     {
         $statusAttribute = $this->config->getAttribute($this->entityType, $this->attributeCode);
 
@@ -89,7 +88,7 @@ public function execute(string $value): array
             []
         )->where(
             'entity_eav_type.value = ?',
-            $this->getValueFromMap($value)
+            $this->getValueFromMap($status)
         );
 
         $result = $this->connection->getConnection()->fetchAll($sql);
@@ -100,6 +99,8 @@ public function execute(string $value): array
     }
 
     /**
+     * Get a value from a value map
+     *
      * @param string $value
      * @return string
      */
diff --git a/app/code/Magento/MediaContentApi/Model/GetAssetIdByContentStatusInterface.php b/app/code/Magento/MediaContentApi/Model/GetAssetIdByContentStatusInterface.php
index 6eb609f68a389..cfd75a8274c4c 100644
--- a/app/code/Magento/MediaContentApi/Model/GetAssetIdByContentStatusInterface.php
+++ b/app/code/Magento/MediaContentApi/Model/GetAssetIdByContentStatusInterface.php
@@ -8,11 +8,13 @@
 namespace Magento\MediaContentApi\Model;
 
 /**
- * Interface used to return Asset id by content status (enabled, disabled).
+ * Interface used to return Asset id by content status.
  */
 interface GetAssetIdByContentStatusInterface
 {
     /**
+     * This function returns asset ids by entity status
+     *
      * @param string $status
      * @return int[]
      */

From 1fcb11a63b832c4811621c636e2571ed261e27ac Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Tue, 7 Jul 2020 12:44:02 +0100
Subject: [PATCH 0751/1718] Added UI filter to media gallery

---
 .../Listing/Filters/Options/Status.php        | 27 +++++++++++++++++++
 .../ui_component/media_gallery_listing.xml    | 22 +++++++++++++++
 .../standalone_media_gallery_listing.xml      | 22 +++++++++++++++
 3 files changed, 71 insertions(+)
 create mode 100644 app/code/Magento/MediaContentUi/Ui/Component/Listing/Filters/Options/Status.php
 create mode 100644 app/code/Magento/MediaContentUi/view/adminhtml/ui_component/media_gallery_listing.xml
 create mode 100644 app/code/Magento/MediaContentUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml

diff --git a/app/code/Magento/MediaContentUi/Ui/Component/Listing/Filters/Options/Status.php b/app/code/Magento/MediaContentUi/Ui/Component/Listing/Filters/Options/Status.php
new file mode 100644
index 0000000000000..4ac4161453d17
--- /dev/null
+++ b/app/code/Magento/MediaContentUi/Ui/Component/Listing/Filters/Options/Status.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentUi\Ui\Component\Listing\Filters\Options;
+
+use Magento\Framework\Data\OptionSourceInterface;
+
+/**
+ * Status filter options
+ */
+class Status implements OptionSourceInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function toOptionArray(): array
+    {
+        return [
+            ['value' => '1', 'label' => __('Enabled')],
+            ['value' => '0', 'label' => __('Disabled')]
+        ];
+    }
+}
diff --git a/app/code/Magento/MediaContentUi/view/adminhtml/ui_component/media_gallery_listing.xml b/app/code/Magento/MediaContentUi/view/adminhtml/ui_component/media_gallery_listing.xml
new file mode 100644
index 0000000000000..fe6ccd94cd0b1
--- /dev/null
+++ b/app/code/Magento/MediaContentUi/view/adminhtml/ui_component/media_gallery_listing.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <listingToolbar name="listing_top">
+        <filters name="listing_filters">
+            <filterSelect name="content_status" provider="${ $.parentName }" sortOrder="10">
+                <settings>
+                    <options class="Magento\MediaContentUi\Ui\Component\Listing\Filters\Options\Status"/>
+                    <label translate="true">Content Status</label>
+                    <caption>All</caption>
+                    <dataScope>content_status</dataScope>
+                </settings>
+            </filterSelect>
+        </filters>
+    </listingToolbar>
+</listing>
diff --git a/app/code/Magento/MediaContentUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml b/app/code/Magento/MediaContentUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml
new file mode 100644
index 0000000000000..fe6ccd94cd0b1
--- /dev/null
+++ b/app/code/Magento/MediaContentUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <listingToolbar name="listing_top">
+        <filters name="listing_filters">
+            <filterSelect name="content_status" provider="${ $.parentName }" sortOrder="10">
+                <settings>
+                    <options class="Magento\MediaContentUi\Ui\Component\Listing\Filters\Options\Status"/>
+                    <label translate="true">Content Status</label>
+                    <caption>All</caption>
+                    <dataScope>content_status</dataScope>
+                </settings>
+            </filterSelect>
+        </filters>
+    </listingToolbar>
+</listing>

From 8ab5415e546e1affbe94d80f62a611745a978c9b Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Tue, 7 Jul 2020 17:53:24 +0300
Subject: [PATCH 0752/1718] fixed related issue

---
 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 598b204a33097..1b84d5e2d4907 100644
--- a/app/code/Magento/Sales/Model/Order.php
+++ b/app/code/Magento/Sales/Model/Order.php
@@ -716,7 +716,7 @@ private function canCreditmemoForZeroTotal($totalRefunded)
         $hasDueAmount = $this->canInvoice() && ($checkAmtTotalPaid);
         //case when paid amount is refunded and order has creditmemo created
         $creditmemos = ($this->getCreditmemosCollection() === false) ?
-             true : (count($this->getCreditmemosCollection()) > 0);
+             true : ($this->_memoCollectionFactory->create()->setOrderFilter($this)->getTotalCount() > 0);
         $paidAmtIsRefunded = $this->getTotalRefunded() == $totalPaid && $creditmemos;
         if (($hasDueAmount || $paidAmtIsRefunded) ||
             (!$checkAmtTotalPaid &&

From de8598c313b74b3f0bde8374a3d52d83022c2f2c Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Tue, 7 Jul 2020 18:57:27 +0300
Subject: [PATCH 0753/1718] Updating WebAPI tests

---
 .../Magento/GraphQl/Review/CreateProductReviewsTest.php         | 2 +-
 .../testsuite/Magento/GraphQl/Review/GetProductReviewsTest.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Review/CreateProductReviewsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Review/CreateProductReviewsTest.php
index 77d2b5121e747..f9df1dac5df34 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Review/CreateProductReviewsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Review/CreateProductReviewsTest.php
@@ -82,7 +82,7 @@ public function testCustomerAddProductReviews(string $customerName, bool $isGues
             'nickname' => $customerName,
             'summary' => 'Summary Test',
             'text' => 'Text Test',
-            'average_rating' => 3.33,
+            'average_rating' => 66.67,
             'ratings_breakdown' => [
                 [
                     'name' => 'Price',
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Review/GetProductReviewsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Review/GetProductReviewsTest.php
index 3d5655b912914..f09a1827961f0 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Review/GetProductReviewsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Review/GetProductReviewsTest.php
@@ -226,7 +226,7 @@ public function testCustomerReviewsAddedToProduct()
             'nickname' => 'Nickname',
             'summary' => 'Review Summary',
             'text' => 'Review text',
-            'average_rating' => 2,
+            'average_rating' => 40,
             'ratings_breakdown' => [
                 [
                     'name' => 'Quality',

From 8ce092ea471a481f7395be246ce90ea010da729a Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@magento.com>
Date: Tue, 7 Jul 2020 12:19:21 -0500
Subject: [PATCH 0754/1718] MC-31618: Move static config to files - PLUGIN_LIST

- Add declaration of strict types;
---
 .../Interception/PluginListGeneratorTest.php    |  1 +
 .../Interception/ConfigLoaderInterface.php      |  7 ++++++-
 .../Interception/ConfigWriterInterface.php      |  7 ++++++-
 .../Interception/PluginListGenerator.php        | 17 ++++++-----------
 .../Test/Unit/_files/load_scoped_mock_map.php   |  1 +
 .../App/Task/Operation/PluginListGenerator.php  |  2 ++
 6 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php
index de2c732615d7c..64188f8251886 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Framework\Interception;
 
diff --git a/lib/internal/Magento/Framework/Interception/ConfigLoaderInterface.php b/lib/internal/Magento/Framework/Interception/ConfigLoaderInterface.php
index 23d6a36aa633b..d41461e092726 100644
--- a/lib/internal/Magento/Framework/Interception/ConfigLoaderInterface.php
+++ b/lib/internal/Magento/Framework/Interception/ConfigLoaderInterface.php
@@ -3,8 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\Interception;
 
+use Magento\Framework\Exception\FileSystemException;
+
 /**
  * Interception configuration loader interface.
  */
@@ -15,6 +19,7 @@ interface ConfigLoaderInterface
      *
      * @param string $cacheId
      * @return array
+     * @throws FileSystemException
      */
-    public function load($cacheId);
+    public function load(string $cacheId): array;
 }
diff --git a/lib/internal/Magento/Framework/Interception/ConfigWriterInterface.php b/lib/internal/Magento/Framework/Interception/ConfigWriterInterface.php
index 635833cf4f8d3..9a08eca200fe0 100644
--- a/lib/internal/Magento/Framework/Interception/ConfigWriterInterface.php
+++ b/lib/internal/Magento/Framework/Interception/ConfigWriterInterface.php
@@ -3,8 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\Interception;
 
+use Magento\Framework\Exception\FileSystemException;
+
 /**
  * Interception config writer interface.
  */
@@ -15,6 +19,7 @@ interface ConfigWriterInterface
      *
      * @param array $scopes
      * @return void
+     * @throws FileSystemException
      */
-    public function write($scopes);
+    public function write(array $scopes): void;
 }
diff --git a/lib/internal/Magento/Framework/Interception/PluginListGenerator.php b/lib/internal/Magento/Framework/Interception/PluginListGenerator.php
index 4f794fd5b39c9..effc291bb883b 100644
--- a/lib/internal/Magento/Framework/Interception/PluginListGenerator.php
+++ b/lib/internal/Magento/Framework/Interception/PluginListGenerator.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\Interception;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
@@ -143,12 +145,9 @@ public function __construct(
     }
 
     /**
-     * Write interception configuration for scopes.
-     *
-     * @param array $scopes
-     * @return void
+     * @inheritdoc
      */
-    public function write($scopes)
+    public function write(array $scopes): void
     {
         foreach ($scopes as $scope) {
             $this->scopeConfig->setCurrentScope($scope);
@@ -198,13 +197,9 @@ public function write($scopes)
     }
 
     /**
-     * Load interception configuration data per scope.
-     *
-     * @param string $cacheId
-     * @return array
-     * @throws \Magento\Framework\Exception\FileSystemException
+     * @inheritdoc
      */
-    public function load($cacheId)
+    public function load(string $cacheId): array
     {
         $file = $this->directoryList->getPath(DirectoryList::GENERATED_METADATA) . '/' . $cacheId . '.' . 'php';
         if (file_exists($file)) {
diff --git a/lib/internal/Magento/Framework/Interception/Test/Unit/_files/load_scoped_mock_map.php b/lib/internal/Magento/Framework/Interception/Test/Unit/_files/load_scoped_mock_map.php
index 3773ea0007590..b5002512dc093 100644
--- a/lib/internal/Magento/Framework/Interception/Test/Unit/_files/load_scoped_mock_map.php
+++ b/lib/internal/Magento/Framework/Interception/Test/Unit/_files/load_scoped_mock_map.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 use Magento\Framework\Interception\Test\Unit\Custom\Module\Model\Item;
 use Magento\Framework\Interception\Test\Unit\Custom\Module\Model\ItemContainer;
diff --git a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/PluginListGenerator.php b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/PluginListGenerator.php
index 2db990505e861..c1314ec39c245 100644
--- a/setup/src/Magento/Setup/Module/Di/App/Task/Operation/PluginListGenerator.php
+++ b/setup/src/Magento/Setup/Module/Di/App/Task/Operation/PluginListGenerator.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Setup\Module\Di\App\Task\Operation;
 
 use Magento\Framework\Config\ScopeInterface;

From ab461801f9932f9166341c1c6ab50add249f4246 Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Tue, 7 Jul 2020 14:16:19 -0500
Subject: [PATCH 0755/1718] MC-35649: Admin Login Unusable on PHP 7.4 Due to
 PHP Notices

---
 .../Framework/View/Element/Html/Calendar.php    | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/lib/internal/Magento/Framework/View/Element/Html/Calendar.php b/lib/internal/Magento/Framework/View/Element/Html/Calendar.php
index 0c8187569cf28..c29e52387c2d7 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Calendar.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Calendar.php
@@ -107,9 +107,20 @@ protected function _toHtml()
             ]
         );
 
-        // get "today" and "week" words
-        $this->assign('today', $this->encoder->encode($localeData['fields']['day']['relative']['0']));
-        $this->assign('week', $this->encoder->encode($localeData['fields']['week']['dn']));
+        /**
+         * Get "today" and "week" words
+         *
+         * Fields value in the current position have been added to ICU Data tables,
+         * starting with ICU library version 51.1.
+         * Due to fact that we do not use these variables in templates, we do not initialize them for older versions
+         *
+         * @see https://github.com/unicode-org/icu/blob/release-50-2/icu4c/source/data/locales/en.txt
+         * @see https://github.com/unicode-org/icu/blob/release-51-2/icu4c/source/data/locales/en.txt
+         */
+        if ($localeData->get('fields')) {
+            $this->assign('today', $this->encoder->encode($localeData['fields']['day']['relative']['0']));
+            $this->assign('week', $this->encoder->encode($localeData['fields']['week']['dn']));
+        }
 
         // get "am" & "pm" words
         $this->assign('am', $this->encoder->encode($localeData['calendar']['gregorian']['AmPmMarkers']['0']));

From b25aafc59da49ade9bd2855f65d5ec0f13101b79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tylek?= <pawel.tylek@creativestyle.pl>
Date: Tue, 7 Jul 2020 21:17:09 +0200
Subject: [PATCH 0756/1718] fix static test for toolbar.js

---
 .../frontend/web/js/product/list/toolbar.js   | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js b/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
index 607930348bf4f..013732ca57875 100644
--- a/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
+++ b/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
@@ -35,10 +35,26 @@ define([
 
         /** @inheritdoc */
         _create: function () {
-            this._bind($(this.options.modeControl, this.element), this.options.mode, this.options.modeDefault);
-            this._bind($(this.options.directionControl, this.element), this.options.direction, this.options.directionDefault);
-            this._bind($(this.options.orderControl, this.element), this.options.order, this.options.orderDefault);
-            this._bind($(this.options.limitControl, this.element), this.options.limit, this.options.limitDefault);
+            this._bind(
+                $(this.options.modeControl, this.element),
+                this.options.mode,
+                this.options.modeDefault
+            );
+            this._bind(
+                $(this.options.directionControl, this.element),
+                this.options.direction,
+                this.options.directionDefault
+            );
+            this._bind(
+                $(this.options.orderControl, this.element),
+                this.options.order,
+                this.options.orderDefault
+            );
+            this._bind(
+                $(this.options.limitControl, this.element),
+                this.options.limit,
+                this.options.limitDefault
+            );
         },
 
         /** @inheritdoc */

From f1f9ce7cf919b676b115c526403aab1091988e74 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Tue, 7 Jul 2020 15:13:47 -0500
Subject: [PATCH 0757/1718] MC-32014: Remove google-shopping-ads module from
 core in 2.4.1

---
 .../Framework/DB/Adapter/AdapterInterface.php | 10 +++-
 .../Framework/DB/Adapter/Pdo/Mysql.php        | 13 +++++
 .../Setup/Console/Command/UpgradeCommand.php  | 58 ++++++++++++++++++-
 3 files changed, 78 insertions(+), 3 deletions(-)

diff --git a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
index f654fd263f605..3a7fc59a005e7 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
@@ -36,7 +36,7 @@ interface AdapterInterface
     const INSERT_ON_DUPLICATE = 1;
 
     const INSERT_IGNORE = 2;
-    
+
     /** Strategy for updating data in table. See https://dev.mysql.com/doc/refman/5.7/en/replace.html */
     const REPLACE = 4;
 
@@ -1127,6 +1127,14 @@ public function dropTrigger($triggerName, $schemaName = null);
      */
     public function getTables($likeCondition = null);
 
+    /**
+     * Retrieve triggers list
+     *
+     * @param null|string $likeCondition
+     * @return array
+     */
+    public function getTriggers($likeCondition = null);
+
     /**
      * Generates case SQL fragment
      *
diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
index 7db91c06d9649..51c639e4f7476 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -4038,6 +4038,19 @@ public function getTables($likeCondition = null)
         return $tables;
     }
 
+    /**
+     * Retrieve triggers list
+     *
+     * @param null|string $likeCondition
+     * @return array
+     */
+    public function getTriggers($likeCondition = null)
+    {
+        $sql = ($likeCondition === null) ? 'SHOW TRIGGERS' : sprintf("SHOW TRIGGERS LIKE '%s'", $likeCondition);
+        $result = $this->query($sql);
+        return $result->fetchAll();
+    }
+
     /**
      * Returns auto increment field if exists
      *
diff --git a/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php b/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
index 4a0cd3bc9a69a..03b0d03538c9b 100644
--- a/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
@@ -6,9 +6,13 @@
 namespace Magento\Setup\Console\Command;
 
 use Magento\Deploy\Console\Command\App\ConfigImportCommand;
-use Magento\Framework\App\State as AppState;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\App\State as AppState;
+use Magento\Framework\DB\Ddl\Trigger;
+use Magento\Framework\Mview\View\CollectionInterface as ViewCollection;
+use Magento\Framework\Mview\View\StateInterface;
 use Magento\Framework\Setup\ConsoleLogger;
 use Magento\Framework\Setup\Declaration\Schema\DryRunLogger;
 use Magento\Framework\Setup\Declaration\Schema\OperationsExecutor;
@@ -52,22 +56,30 @@ class UpgradeCommand extends AbstractSetupCommand
      */
     private $searchConfigFactory;
 
+    /*
+     * @var ViewCollection
+     */
+    private $viewCollection;
+
     /**
      * @param InstallerFactory $installerFactory
      * @param SearchConfigFactory $searchConfigFactory
      * @param DeploymentConfig $deploymentConfig
      * @param AppState|null $appState
+     * @param ViewCollection|null $viewCollection
      */
     public function __construct(
         InstallerFactory $installerFactory,
         SearchConfigFactory $searchConfigFactory,
         DeploymentConfig $deploymentConfig = null,
-        AppState $appState = null
+        AppState $appState = null,
+        ViewCollection $viewCollection = null
     ) {
         $this->installerFactory = $installerFactory;
         $this->searchConfigFactory = $searchConfigFactory;
         $this->deploymentConfig = $deploymentConfig ?: ObjectManager::getInstance()->get(DeploymentConfig::class);
         $this->appState = $appState ?: ObjectManager::getInstance()->get(AppState::class);
+        $this->viewCollection = $viewCollection ?: ObjectManager::getInstance()->get(ViewCollection::class);
         parent::__construct();
     }
 
@@ -130,6 +142,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $installer->updateModulesSequence($keepGenerated);
             $searchConfig = $this->searchConfigFactory->create();
             $searchConfig->validateSearchEngine();
+
+            $this->removeUnusedTriggers();
+
             $installer->installSchema($request);
             $installer->installDataFixtures($request);
 
@@ -157,4 +172,43 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
+
+    /**
+     * Remove unused triggers
+     */
+    private function removeUnusedTriggers()
+    {
+        // unsubscribe mview
+        $viewList = $this->viewCollection->getViewsByStateMode(StateInterface::MODE_ENABLED);
+        foreach ($viewList as $view) {
+            /** @var \Magento\Framework\Mview\ViewInterface $view */
+            $view->unsubscribe();
+        }
+
+        // remove extra triggers that have correct naming structure
+        /* @var ResourceConnection $resource */
+        $resource = ObjectManager::getInstance()->get(ResourceConnection::class);
+        $connection = $resource->getConnection();
+        $triggers = $connection->getTriggers();
+        foreach ($triggers as $trigger) {
+            $triggerNames = [];
+            foreach (Trigger::getListOfEvents() as $event) {
+                $triggerName = $resource->getTriggerName(
+                    $resource->getTableName($trigger['Table']),
+                    Trigger::TIME_AFTER,
+                    $event
+                );
+                $triggerNames[] = strtolower($triggerName);
+            }
+            if (in_array($trigger['Trigger'], $triggerNames)) {
+                $connection->dropTrigger($trigger['Trigger']);
+            }
+        }
+
+        // subscribe mview
+        foreach ($viewList as $view) {
+            /** @var \Magento\Framework\Mview\ViewInterface $view */
+            $view->subscribe();
+        }
+    }
 }

From 49be96fe3bbcf11009cd31b3ecd7e9fabe878859 Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@magento.com>
Date: Tue, 7 Jul 2020 15:35:10 -0500
Subject: [PATCH 0758/1718] MC-31618: Move static config to files - PLUGIN_LIST

- Add integration test for multiple scopes;
---
 .../PluginListGeneratorMultipleScopesTest.php | 131 ++++++++++++++++++
 .../Interception/PluginListGeneratorTest.php  |  31 +++--
 .../Interception/ConfigLoaderInterface.php    |   3 -
 .../Interception/ConfigWriterInterface.php    |   3 -
 4 files changed, 151 insertions(+), 17 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorMultipleScopesTest.php

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorMultipleScopesTest.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorMultipleScopesTest.php
new file mode 100644
index 0000000000000..65f5b9f3919e7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorMultipleScopesTest.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Interception;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem\DriverInterface;
+use Magento\TestFramework\Application;
+use Magento\TestFramework\Helper\Bootstrap;
+
+class PluginListGeneratorMultipleScopesTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Generated plugin list configs for frontend, adminhtml, graphql scopes
+     */
+    private $cacheIds = [
+        'primary|global|frontend|plugin-list',
+        'primary|global|adminhtml|plugin-list',
+        'primary|global|graphql|plugin-list'
+    ];
+
+    /**
+     * @var PluginListGenerator
+     */
+    private $model;
+
+    /**
+     * @var DirectoryList
+     */
+    private $directoryList;
+
+    /**
+     * @var DriverInterface
+     */
+    private $file;
+
+    /**
+     * @var Application
+     */
+    private $application;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        $this->application = Bootstrap::getInstance()->getBootstrap()->getApplication();
+        $this->directoryList = new DirectoryList(BP, $this->getCustomDirs());
+        $this->file = Bootstrap::getObjectManager()->create(DriverInterface::class);
+        $reader = Bootstrap::getObjectManager()->create(
+        // phpstan:ignore "Class Magento\Framework\ObjectManager\Config\Reader\Dom\Proxy not found."
+            \Magento\Framework\ObjectManager\Config\Reader\Dom\Proxy::class
+        );
+        $scopeConfig = Bootstrap::getObjectManager()->create(\Magento\Framework\Config\Scope::class);
+        $omConfig = Bootstrap::getObjectManager()->create(
+            \Magento\Framework\Interception\ObjectManager\Config\Developer::class
+        );
+        $relations = Bootstrap::getObjectManager()->create(
+            \Magento\Framework\ObjectManager\Relations\Runtime::class
+        );
+        $definitions = Bootstrap::getObjectManager()->create(
+            \Magento\Framework\Interception\Definition\Runtime::class
+        );
+        $classDefinitions = Bootstrap::getObjectManager()->create(
+            \Magento\Framework\ObjectManager\Definition\Runtime::class
+        );
+        // phpstan:ignore "Class Psr\Log\LoggerInterface\Proxy not found."
+        $logger = Bootstrap::getObjectManager()->create(\Psr\Log\LoggerInterface\Proxy::class);
+        $this->model = new PluginListGenerator(
+            $reader,
+            $scopeConfig,
+            $omConfig,
+            $relations,
+            $definitions,
+            $classDefinitions,
+            $logger,
+            $this->directoryList,
+            ['primary', 'global']
+        );
+    }
+
+    /**
+     * Test multiple scopes plugin list configuration generation and load.
+     */
+    public function testPluginListMultipleScopesConfigGeneration()
+    {
+        $scopes = ['frontend', 'adminhtml', 'graphql'];
+        $this->model->write($scopes);
+
+        foreach ($this->cacheIds as $cacheId) {
+            $configData = $this->model->load($cacheId);
+            $this->assertNotEmpty($configData[0]);
+            $this->assertNotEmpty($configData[1]);
+            $this->assertNotEmpty($configData[2]);
+        }
+    }
+
+    /**
+     * Gets customized directory paths
+     *
+     * @return array
+     */
+    private function getCustomDirs()
+    {
+        $path = DirectoryList::PATH;
+        $generated = "{$this->application->getTempDir()}/generated";
+
+        return [
+            DirectoryList::GENERATED_METADATA => [$path => "{$generated}/metadata"],
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function tearDown(): void
+    {
+        foreach ($this->cacheIds as $cacheId) {
+            $filePath = $this->directoryList->getPath(DirectoryList::GENERATED_METADATA)
+                . '/' . $cacheId . '.' . 'php';
+
+            if (file_exists($filePath)) {
+                $this->file->deleteFile($filePath);
+            }
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php
index 64188f8251886..8f1771759cee0 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php
@@ -46,17 +46,26 @@ protected function setUp(): void
     {
         $this->application = Bootstrap::getInstance()->getBootstrap()->getApplication();
         $this->directoryList = new DirectoryList(BP, $this->getCustomDirs());
-        $this->file = new \Magento\Framework\Filesystem\Driver\File();
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $reader = new \Magento\Framework\ObjectManager\Config\Reader\Dom\Proxy($objectManager);
-        $areaList = $this->createMock(\Magento\Framework\App\AreaList::class);
-        $areaList->method('getCodes')->willReturn([]);
-        $scopeConfig = new \Magento\Framework\Config\Scope($areaList, 'global');
-        $omConfig = new \Magento\Framework\Interception\ObjectManager\Config\Developer();
-        $relations = new \Magento\Framework\ObjectManager\Relations\Runtime();
-        $definitions = new \Magento\Framework\Interception\Definition\Runtime();
-        $classDefinitions = new \Magento\Framework\ObjectManager\Definition\Runtime();
-        $logger = $this->createMock(\Psr\Log\LoggerInterface::class);
+        $this->file = Bootstrap::getObjectManager()->create(DriverInterface::class);
+        $reader = Bootstrap::getObjectManager()->create(
+        // phpstan:ignore "Class Magento\Framework\ObjectManager\Config\Reader\Dom\Proxy not found."
+            \Magento\Framework\ObjectManager\Config\Reader\Dom\Proxy::class
+        );
+        $scopeConfig = Bootstrap::getObjectManager()->create(\Magento\Framework\Config\Scope::class);
+        $omConfig = Bootstrap::getObjectManager()->create(
+            \Magento\Framework\Interception\ObjectManager\Config\Developer::class
+        );
+        $relations = Bootstrap::getObjectManager()->create(
+            \Magento\Framework\ObjectManager\Relations\Runtime::class
+        );
+        $definitions = Bootstrap::getObjectManager()->create(
+            \Magento\Framework\Interception\Definition\Runtime::class
+        );
+        $classDefinitions = Bootstrap::getObjectManager()->create(
+            \Magento\Framework\ObjectManager\Definition\Runtime::class
+        );
+        // phpstan:ignore "Class Psr\Log\LoggerInterface\Proxy not found."
+        $logger = Bootstrap::getObjectManager()->create(\Psr\Log\LoggerInterface\Proxy::class);
         $this->model = new PluginListGenerator(
             $reader,
             $scopeConfig,
diff --git a/lib/internal/Magento/Framework/Interception/ConfigLoaderInterface.php b/lib/internal/Magento/Framework/Interception/ConfigLoaderInterface.php
index d41461e092726..2a739f4cf9486 100644
--- a/lib/internal/Magento/Framework/Interception/ConfigLoaderInterface.php
+++ b/lib/internal/Magento/Framework/Interception/ConfigLoaderInterface.php
@@ -7,8 +7,6 @@
 
 namespace Magento\Framework\Interception;
 
-use Magento\Framework\Exception\FileSystemException;
-
 /**
  * Interception configuration loader interface.
  */
@@ -19,7 +17,6 @@ interface ConfigLoaderInterface
      *
      * @param string $cacheId
      * @return array
-     * @throws FileSystemException
      */
     public function load(string $cacheId): array;
 }
diff --git a/lib/internal/Magento/Framework/Interception/ConfigWriterInterface.php b/lib/internal/Magento/Framework/Interception/ConfigWriterInterface.php
index 9a08eca200fe0..9193937b65816 100644
--- a/lib/internal/Magento/Framework/Interception/ConfigWriterInterface.php
+++ b/lib/internal/Magento/Framework/Interception/ConfigWriterInterface.php
@@ -7,8 +7,6 @@
 
 namespace Magento\Framework\Interception;
 
-use Magento\Framework\Exception\FileSystemException;
-
 /**
  * Interception config writer interface.
  */
@@ -19,7 +17,6 @@ interface ConfigWriterInterface
      *
      * @param array $scopes
      * @return void
-     * @throws FileSystemException
      */
     public function write(array $scopes): void;
 }

From 3d0cbfadab049d738148c4a60316a4c9b3ae81ce Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Tue, 7 Jul 2020 16:40:54 -0500
Subject: [PATCH 0759/1718] MC-35649: Admin Login Unusable on PHP 7.4 Due to
 PHP Notices

---
 .../Framework/View/Element/Html/Calendar.php  | 36 +++++++++++--------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/lib/internal/Magento/Framework/View/Element/Html/Calendar.php b/lib/internal/Magento/Framework/View/Element/Html/Calendar.php
index c29e52387c2d7..0e17626160bd6 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Calendar.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Calendar.php
@@ -107,20 +107,7 @@ protected function _toHtml()
             ]
         );
 
-        /**
-         * Get "today" and "week" words
-         *
-         * Fields value in the current position have been added to ICU Data tables,
-         * starting with ICU library version 51.1.
-         * Due to fact that we do not use these variables in templates, we do not initialize them for older versions
-         *
-         * @see https://github.com/unicode-org/icu/blob/release-50-2/icu4c/source/data/locales/en.txt
-         * @see https://github.com/unicode-org/icu/blob/release-51-2/icu4c/source/data/locales/en.txt
-         */
-        if ($localeData->get('fields')) {
-            $this->assign('today', $this->encoder->encode($localeData['fields']['day']['relative']['0']));
-            $this->assign('week', $this->encoder->encode($localeData['fields']['week']['dn']));
-        }
+        $this->assignFieldsValues($localeData);
 
         // get "am" & "pm" words
         $this->assign('am', $this->encoder->encode($localeData['calendar']['gregorian']['AmPmMarkers']['0']));
@@ -200,4 +187,25 @@ public function getYearRange()
         return (new \DateTime())->modify('- 100 years')->format('Y')
             . ':' . (new \DateTime())->modify('+ 100 years')->format('Y');
     }
+
+    /**
+     * Assign "fields" values from the ICU data
+     *
+     * @param \ResourceBundle $localeData
+     */
+    private function assignFieldsValues(\ResourceBundle $localeData): void
+    {
+        /**
+         * Fields value in the current position has been added to ICU Data tables
+         * starting with ICU library version 51.1.
+         * Due to fact that we do not use these variables in templates, we do not initialize them for older versions
+         *
+         * @see https://github.com/unicode-org/icu/blob/release-50-2/icu4c/source/data/locales/en.txt
+         * @see https://github.com/unicode-org/icu/blob/release-51-2/icu4c/source/data/locales/en.txt
+         */
+        if ($localeData->get('fields')) {
+            $this->assign('today', $this->encoder->encode($localeData['fields']['day']['relative']['0']));
+            $this->assign('week', $this->encoder->encode($localeData['fields']['week']['dn']));
+        }
+    }
 }

From 9204022c7c003183a75eceddb333eee93a4febbb Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Wed, 8 Jul 2020 11:07:58 +0300
Subject: [PATCH 0760/1718] fix and refactor unit

---
 .../Translate/Test/Unit/InlineTest.php        | 329 +++++++++---------
 1 file changed, 164 insertions(+), 165 deletions(-)

diff --git a/lib/internal/Magento/Framework/Translate/Test/Unit/InlineTest.php b/lib/internal/Magento/Framework/Translate/Test/Unit/InlineTest.php
index a689204cbb7dc..1a5feb9506768 100644
--- a/lib/internal/Magento/Framework/Translate/Test/Unit/InlineTest.php
+++ b/lib/internal/Magento/Framework/Translate/Test/Unit/InlineTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 declare(strict_types=1);
 
 namespace Magento\Framework\Translate\Test\Unit;
@@ -11,6 +12,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ScopeResolverInterface;
 use Magento\Framework\App\State as AppState;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Translate\Inline;
 use Magento\Framework\Translate\Inline\ConfigInterface;
 use Magento\Framework\Translate\Inline\ParserFactory;
@@ -21,45 +23,64 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * Test for \Magento\Framework\Translate\Inline.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class InlineTest extends TestCase
 {
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var Inline
+     */
+    private $model;
+
     /**
      * @var ScopeResolverInterface|MockObject
      */
-    protected $scopeResolverMock;
+    private $scopeResolverMock;
 
     /**
      * @var UrlInterface|MockObject
      */
-    protected $urlMock;
+    private $urlMock;
 
     /**
      * @var LayoutInterface|MockObject
      */
-    protected $layoutMock;
+    private $layoutMock;
 
     /**
      * @var ConfigInterface|MockObject
      */
-    protected $configMock;
+    private $configMock;
 
     /**
      * @var ParserFactory|MockObject
      */
-    protected $parserMock;
+    private $parserMock;
 
     /**
      * @var StateInterface|MockObject
      */
-    protected $stateMock;
+    private $stateMock;
 
     /**
      * @var AppState|MockObject
      */
-    protected $appStateMock;
+    private $appStateMock;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp(): void
     {
+        $this->objectManager = new ObjectManager($this);
+
         $this->scopeResolverMock =
             $this->getMockForAbstractClass(ScopeResolverInterface::class);
         $this->urlMock = $this->getMockForAbstractClass(UrlInterface::class);
@@ -68,9 +89,23 @@ protected function setUp(): void
         $this->parserMock = $this->getMockForAbstractClass(ParserInterface::class);
         $this->stateMock = $this->getMockForAbstractClass(StateInterface::class);
         $this->appStateMock = $this->createMock(AppState::class);
+        $this->model = $this->objectManager->getObject(
+            Inline::class,
+            [
+                'scopeResolver' => $this->scopeResolverMock,
+                'url' => $this->urlMock,
+                'layout' => $this->layoutMock,
+                'config' => $this->configMock,
+                'parser' => $this->parserMock,
+                'state' => $this->stateMock,
+                'appState' => $this->appStateMock,
+            ]
+        );
     }
 
     /**
+     * Is allowed test
+     *
      * @param bool $isEnabled
      * @param bool $isActive
      * @param bool $isDevAllowed
@@ -78,28 +113,20 @@ protected function setUp(): void
      * @param bool $result
      * @dataProvider isAllowedDataProvider
      */
-    public function testIsAllowed($isEnabled, $isActive, $isDevAllowed, $area, $result)
+    public function testIsAllowed(bool $isEnabled, bool $isActive, bool $isDevAllowed, string $area, bool $result): void
     {
         $this->prepareIsAllowed($isEnabled, $isActive, $isDevAllowed, null, $area);
 
-        $model = new Inline(
-            $this->scopeResolverMock,
-            $this->urlMock,
-            $this->layoutMock,
-            $this->configMock,
-            $this->parserMock,
-            $this->stateMock,
-            $this->appStateMock
-        );
-
-        $this->assertEquals($result, $model->isAllowed());
-        $this->assertEquals($result, $model->isAllowed());
+        $this->assertEquals($result, $this->model->isAllowed());
+        $this->assertEquals($result, $this->model->isAllowed());
     }
 
     /**
+     * Data provider for testIsAllowed
+     *
      * @return array
      */
-    public function isAllowedDataProvider()
+    public function isAllowedDataProvider(): array
     {
         return [
             [true, true, true, Area::AREA_FRONTEND, true],
@@ -120,50 +147,52 @@ public function isAllowedDataProvider()
         ];
     }
 
-    public function testGetParser()
+    /**
+     * Get parser test
+     *
+     * @return void
+     */
+    public function testGetParser(): void
     {
-        $model = new Inline(
-            $this->scopeResolverMock,
-            $this->urlMock,
-            $this->layoutMock,
-            $this->configMock,
-            $this->parserMock,
-            $this->stateMock,
-            $this->appStateMock
-        );
-        $this->assertEquals($this->parserMock, $model->getParser());
+        $this->assertEquals($this->parserMock, $this->model->getParser());
     }
 
     /**
+     * Process response body strip inline
+     *
      * @param string|array $body
-     * @param string $expected
+     * @param string|array $expected
+     * @return void
      * @dataProvider processResponseBodyStripInlineDataProvider
      */
-    public function testProcessResponseBodyStripInline($body, $expected)
+    public function testProcessResponseBodyStripInline($body, $expected): void
     {
         $scope = 'admin';
         $this->prepareIsAllowed(false, true, true, $scope);
 
-        $model = new Inline(
-            $this->scopeResolverMock,
-            $this->urlMock,
-            $this->layoutMock,
-            $this->configMock,
-            $this->parserMock,
-            $this->stateMock,
-            $this->appStateMock,
-            '',
-            '',
-            $scope
+        $model = $this->objectManager->getObject(
+            Inline::class,
+            [
+                'scopeResolver' => $this->scopeResolverMock,
+                'url' => $this->urlMock,
+                'layout' => $this->layoutMock,
+                'config' => $this->configMock,
+                'parser' => $this->parserMock,
+                'state' => $this->stateMock,
+                'appState' => $this->appStateMock,
+                'scope' => $scope,
+            ]
         );
         $model->processResponseBody($body, true);
         $this->assertEquals($body, $expected);
     }
 
     /**
+     * Data provider for testProcessResponseBodyStripInline
+     *
      * @return array
      */
-    public function processResponseBodyStripInlineDataProvider()
+    public function processResponseBodyStripInlineDataProvider(): array
     {
         return [
             ['test', 'test'],
@@ -176,64 +205,55 @@ public function processResponseBodyStripInlineDataProvider()
     }
 
     /**
+     * Process response body
+     *
      * @param string $scope
-     * @param array|string $body
-     * @param array|string $expected
+     * @param string $body
+     * @param string $expected
+     * @return void
      * @dataProvider processResponseBodyDataProvider
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    public function testProcessResponseBody($scope, $body, $expected)
+    public function testProcessResponseBody(string $scope, string $body, string $expected): void
     {
         $isJson = true;
         $this->prepareIsAllowed(true, true, true, $scope);
 
         $jsonCall = is_array($body) ? 2 * (count($body) + 1) : 2;
-        $this->parserMock->expects(
-            $this->exactly($jsonCall)
-        )->method(
-            'setIsJson'
-        )->willReturnMap(
+        $this->parserMock->expects($this->exactly($jsonCall))
+            ->method('setIsJson')
+            ->willReturnMap([[$isJson, $this->returnSelf()], [!$isJson, $this->returnSelf()]]);
+        $this->parserMock->expects($this->once())
+            ->method('processResponseBodyString')
+            ->with(is_array($body) ? reset($body) : $body);
+        $this->parserMock->expects($this->exactly(2))
+            ->method('getContent')
+            ->willReturn(is_array($body) ? reset($body) : $body);
+
+        $model = $this->objectManager->getObject(
+            Inline::class,
             [
-                [$isJson, $this->returnSelf()],
-                [!$isJson, $this->returnSelf()],
+                'scopeResolver' => $this->scopeResolverMock,
+                'url' => $this->urlMock,
+                'layout' => $this->layoutMock,
+                'config' => $this->configMock,
+                'parser' => $this->parserMock,
+                'state' => $this->stateMock,
+                'appState' => $this->appStateMock,
+                'scope' => $scope,
             ]
         );
-        $this->parserMock->expects(
-            $this->exactly(1)
-        )->method(
-            'processResponseBodyString'
-        )->with(
-            is_array($body) ? reset($body) : $body
-        );
-        $this->parserMock->expects(
-            $this->exactly(2)
-        )->method(
-            'getContent'
-        )->willReturn(
-            is_array($body) ? reset($body) : $body
-        );
-
-        $model = new Inline(
-            $this->scopeResolverMock,
-            $this->urlMock,
-            $this->layoutMock,
-            $this->configMock,
-            $this->parserMock,
-            $this->stateMock,
-            $this->appStateMock,
-            '',
-            '',
-            $scope
-        );
 
         $model->processResponseBody($body, $isJson);
         $this->assertEquals($body, $expected);
     }
 
     /**
+     * Data provider for testProcessResponseBody
+     *
      * @return array
      */
-    public function processResponseBodyDataProvider()
+    public function processResponseBodyDataProvider(): array
     {
         return [
             ['admin', 'test', 'test'],
@@ -242,64 +262,55 @@ public function processResponseBodyDataProvider()
     }
 
     /**
-     * @param $scope
-     * @param $body
-     * @param $expected
+     * Process response body get script
+     *
+     * @param string $scope
+     * @param string $body
+     * @param string $expected
+     * @return void
      * @dataProvider processResponseBodyGetInlineScriptDataProvider
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    public function testProcessResponseBodyGetInlineScript($scope, $body, $expected)
+    public function testProcessResponseBodyGetInlineScript(string $scope, string $body, string $expected): void
     {
         $isJson = true;
         $this->prepareIsAllowed(true, true, true, $scope);
 
         $jsonCall = is_array($body) ? 2 * (count($body) + 1) : 2;
-        $this->parserMock->expects(
-            $this->exactly($jsonCall)
-        )->method(
-            'setIsJson'
-        )->willReturnMap(
+        $this->parserMock->expects($this->exactly($jsonCall))
+            ->method('setIsJson')
+            ->willReturnMap([[$isJson, $this->returnSelf()], [!$isJson, $this->returnSelf()]]);
+        $this->parserMock->expects($this->once())
+            ->method('processResponseBodyString')
+            ->with(is_array($body) ? reset($body) : $body);
+        $this->parserMock->expects($this->exactly(2))
+            ->method('getContent')
+            ->willReturn(is_array($body) ? reset($body) : $body);
+
+        $model = $this->objectManager->getObject(
+            Inline::class,
             [
-                [$isJson, $this->returnSelf()],
-                [!$isJson, $this->returnSelf()],
+                'scopeResolver' => $this->scopeResolverMock,
+                'url' => $this->urlMock,
+                'layout' => $this->layoutMock,
+                'config' => $this->configMock,
+                'parser' => $this->parserMock,
+                'state' => $this->stateMock,
+                'appState' => $this->appStateMock,
+                'scope' => $scope,
             ]
         );
-        $this->parserMock->expects(
-            $this->exactly(1)
-        )->method(
-            'processResponseBodyString'
-        )->with(
-            is_array($body) ? reset($body) : $body
-        );
-        $this->parserMock->expects(
-            $this->exactly(2)
-        )->method(
-            'getContent'
-        )->willReturn(
-            is_array($body) ? reset($body) : $body
-        );
-
-        $model = new Inline(
-            $this->scopeResolverMock,
-            $this->urlMock,
-            $this->layoutMock,
-            $this->configMock,
-            $this->parserMock,
-            $this->stateMock,
-            $this->appStateMock,
-            '',
-            '',
-            $scope
-        );
 
         $model->processResponseBody($body, $isJson);
         $this->assertEquals($body, $expected);
     }
 
     /**
+     * Data provider for testProcessResponseBodyGetInlineScript
+     *
      * @return array
      */
-    public function processResponseBodyGetInlineScriptDataProvider()
+    public function processResponseBodyGetInlineScriptDataProvider(): array
     {
         return [
             ['admin', 'test', 'test'],
@@ -308,54 +319,42 @@ public function processResponseBodyGetInlineScriptDataProvider()
     }
 
     /**
+     * Prepare is allowed
+     *
      * @param bool $isEnabled
      * @param bool $isActive
      * @param bool $isDevAllowed
      * @param null|string $scope
+     * @param string $area
+     * @return void
      */
     protected function prepareIsAllowed(
-        $isEnabled,
-        $isActive,
-        $isDevAllowed,
-        $scope = null,
-        $area = Area::AREA_FRONTEND
-    ) {
+        bool $isEnabled,
+        bool $isActive,
+        bool $isDevAllowed,
+        ?string $scope = null,
+        string $area = Area::AREA_FRONTEND
+    ): void {
         $scopeMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
-        $this->stateMock->expects($this->any())->method('isEnabled')->willReturn($isEnabled);
-        $this->scopeResolverMock->expects(
-            $this->once()
-        )->method(
-            'getScope'
-        )->with(
-            $scope
-        )->willReturn(
-            $scopeMock
-        );
-
-        $this->configMock->expects(
-            $this->once()
-        )->method(
-            'isActive'
-        )->with(
-            $scopeMock
-        )->willReturn(
-            $isActive
-        );
-
-        $this->configMock->expects(
-            $this->exactly((int)$isActive)
-        )->method(
-            'isDevAllowed'
-        )->willReturn(
-            $isDevAllowed
-        );
-
-        $this->appStateMock->expects(
-            ($isActive && $isDevAllowed) ? $this->once() : $this->never()
-        )->method(
-            'getAreaCode'
-        )->willReturn(
-            $area
-        );
+        $this->stateMock->expects($this->atLeastOnce())
+            ->method('isEnabled')
+            ->willReturn($isEnabled);
+        $this->scopeResolverMock->expects($this->once())
+            ->method('getScope')
+            ->with($scope)
+            ->willReturn($scopeMock);
+
+        $this->configMock->expects($this->once())
+            ->method('isActive')
+            ->with($scopeMock)
+            ->willReturn($isActive);
+
+        $this->configMock->expects($this->exactly((int)$isActive))
+            ->method('isDevAllowed')
+            ->willReturn($isDevAllowed);
+
+        $this->appStateMock->expects(($isActive && $isDevAllowed) ? $this->once() : $this->never())
+            ->method('getAreaCode')
+            ->willReturn($area);
     }
 }

From e2b578de08d4e9853be51c52cc9872f394e55079 Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Wed, 8 Jul 2020 11:54:38 +0300
Subject: [PATCH 0761/1718] add mftf test

---
 .../Catalog/Test/Mftf/Data/ProductData.xml    | 14 +++++
 ...tMemoWithZeroPriceCheckOrderStatusTest.xml | 55 +++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithZeroPriceCheckOrderStatusTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index 7aabedbf1c3f7..4f632e259d60a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -1249,6 +1249,20 @@
         <requiredEntity type="product_extension_attribute">EavStock777</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
+    <entity name="SimpleProduct_zero" type="product">
+        <data key="sku" unique="suffix">testSku</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">testProductName</data>
+        <data key="price">0.00</data>
+        <data key="urlKey" unique="suffix">testurlkey</data>
+        <data key="status">1</data>
+        <data key="quantity">777</data>
+        <data key="weight">1</data>
+        <requiredEntity type="product_extension_attribute">EavStock777</requiredEntity>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
+    </entity>
     <entity name="ApiSimpleOneQty10" type="product2">
         <data key="sku" unique="suffix">api-simple-product</data>
         <data key="type_id">simple</data>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithZeroPriceCheckOrderStatusTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithZeroPriceCheckOrderStatusTest.xml
new file mode 100644
index 0000000000000..ba4944970e3fb
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithZeroPriceCheckOrderStatusTest.xml
@@ -0,0 +1,55 @@
+<?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="AdminCreateCreditMemoWithZeroPriceCheckOrderStatusTest">
+        <annotations>
+            <title value="Create Credit Memo with zero total."/>
+            <description value="Assert order status after create CreditMemo with zero total."/>
+            <group value="sales"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct_zero" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <createData entity="FreeShippinMethodConfig" stepKey="enableFreeShipping"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <createData entity="FreeShippingMethodDisableConfig" stepKey="disableFreeShipping"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+
+        <actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="navigateToNewOrderPage">
+            <argument name="customer" value="$createCustomer$"/>
+        </actionGroup>
+        <actionGroup ref="AddSimpleProductToOrderActionGroup" stepKey="addSecondProduct">
+            <argument name="product" value="$createProduct$"/>
+            <argument name="productQty" value="1"/>
+        </actionGroup>
+        <actionGroup ref="FillOrderCustomerInformationActionGroup" stepKey="fillCustomerInfo">
+            <argument name="customer" value="$createCustomer$"/>
+            <argument name="address" value="US_Address_TX"/>
+        </actionGroup>
+        <actionGroup ref="OrderSelectFreeShippingActionGroup" stepKey="selectFlatRate"/>
+        <actionGroup ref="AdminSubmitOrderActionGroup" stepKey="submitOrder"/>
+
+        <actionGroup ref="AdminCreateInvoiceAndCreditMemoActionGroup" stepKey="createCreditMemo"/>
+
+        <actionGroup ref="AdminOrderViewCheckStatusActionGroup" stepKey="seeOrderClose">
+            <argument name="status" value="Closed"/>
+        </actionGroup>
+    </test>
+</tests>

From 1a73d0ef24ac4fabfeb493f34414bdce20355f7f Mon Sep 17 00:00:00 2001
From: Pieter Hoste <hoste.pieter@gmail.com>
Date: Wed, 8 Jul 2020 12:05:57 +0200
Subject: [PATCH 0762/1718] Adds missing return value in afterSave plugin.

---
 .../Magento/CmsUrlRewrite/Plugin/Cms/Model/Store/View.php   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CmsUrlRewrite/Plugin/Cms/Model/Store/View.php b/app/code/Magento/CmsUrlRewrite/Plugin/Cms/Model/Store/View.php
index 9e360481e8eb3..15e62d00cd9f9 100644
--- a/app/code/Magento/CmsUrlRewrite/Plugin/Cms/Model/Store/View.php
+++ b/app/code/Magento/CmsUrlRewrite/Plugin/Cms/Model/Store/View.php
@@ -70,16 +70,18 @@ public function __construct(
      * @param ResourceStore $object
      * @param ResourceStore $result
      * @param ResourceStore $store
-     * @return void
+     * @return ResourceStore
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function afterSave(ResourceStore $object, ResourceStore $result, AbstractModel $store): void
+    public function afterSave(ResourceStore $object, ResourceStore $result, AbstractModel $store): ResourceStore
     {
         if ($store->isObjectNew()) {
             $this->urlPersist->replace(
                 $this->generateCmsPagesUrls((int)$store->getId())
             );
         }
+
+        return $result;
     }
 
     /**

From c5b320bd105e67d7ceeb86f42fdb1b08367e9a2f Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Wed, 8 Jul 2020 15:07:16 +0300
Subject: [PATCH 0763/1718] fix Custom Admin Domain and Internal Redirects

---
 .../Magento/Store/App/Response/Redirect.php   | 180 +++++++++++++-----
 .../Test/Unit/App/Response/RedirectTest.php   | 139 ++++++++------
 2 files changed, 220 insertions(+), 99 deletions(-)

diff --git a/app/code/Magento/Store/App/Response/Redirect.php b/app/code/Magento/Store/App/Response/Redirect.php
index da0c49aa1bc11..7984939108d89 100644
--- a/app/code/Magento/Store/App/Response/Redirect.php
+++ b/app/code/Magento/Store/App/Response/Redirect.php
@@ -7,36 +7,55 @@
  */
 namespace Magento\Store\App\Response;
 
+use Laminas\Uri\Uri;
+use Magento\Framework\App\ActionInterface;
+use Magento\Framework\App\Area;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\App\Response\RedirectInterface;
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\App\State;
+use Magento\Framework\Encryption\UrlCoder;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Session\SessionManagerInterface;
+use Magento\Framework\Session\SidResolverInterface;
+use Magento\Framework\UrlInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class Redirect computes redirect urls responses.
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Redirect implements \Magento\Framework\App\Response\RedirectInterface
+class Redirect implements RedirectInterface
 {
+    private const XML_PATH_USE_CUSTOM_ADMIN_URL = 'admin/url/use_custom';
+    private const XML_PATH_CUSTOM_ADMIN_URL = 'admin/url/custom';
+
     /**
-     * @var \Magento\Framework\App\RequestInterface
+     * @var RequestInterface
      */
     protected $_request;
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
-     * @var \Magento\Framework\Encryption\UrlCoder
+     * @var UrlCoder
      */
     protected $_urlCoder;
 
     /**
-     * @var \Magento\Framework\Session\SessionManagerInterface
+     * @var SessionManagerInterface
      */
     protected $_session;
 
     /**
-     * @var \Magento\Framework\Session\SidResolverInterface
+     * @var SidResolverInterface
      */
     protected $_sidResolver;
 
@@ -46,36 +65,51 @@ class Redirect implements \Magento\Framework\App\Response\RedirectInterface
     protected $_canUseSessionIdInParam;
 
     /**
-     * @var \Magento\Framework\UrlInterface
+     * @var UrlInterface
      */
     protected $_urlBuilder;
 
     /**
-     * @var \Laminas\Uri\Uri|null
+     * @var Uri
      */
     private $uri;
 
+    /**
+     * @var State
+     */
+    private $appState;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
     /**
      * Constructor
      *
-     * @param \Magento\Framework\App\RequestInterface $request
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\Encryption\UrlCoder $urlCoder
-     * @param \Magento\Framework\Session\SessionManagerInterface $session
-     * @param \Magento\Framework\Session\SidResolverInterface $sidResolver
-     * @param \Magento\Framework\UrlInterface $urlBuilder
-     * @param \Laminas\Uri\Uri|null $uri
+     * @param RequestInterface $request
+     * @param StoreManagerInterface $storeManager
+     * @param UrlCoder $urlCoder
+     * @param SessionManagerInterface $session
+     * @param SidResolverInterface $sidResolver
+     * @param UrlInterface $urlBuilder
+     * @param Uri|null $uri
      * @param bool $canUseSessionIdInParam
+     * @param State|null $appState
+     * @param ScopeConfigInterface|null $scopeConfig
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
-        \Magento\Framework\App\RequestInterface $request,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\Encryption\UrlCoder $urlCoder,
-        \Magento\Framework\Session\SessionManagerInterface $session,
-        \Magento\Framework\Session\SidResolverInterface $sidResolver,
-        \Magento\Framework\UrlInterface $urlBuilder,
-        \Laminas\Uri\Uri $uri = null,
-        $canUseSessionIdInParam = true
+        RequestInterface $request,
+        StoreManagerInterface $storeManager,
+        UrlCoder $urlCoder,
+        SessionManagerInterface $session,
+        SidResolverInterface $sidResolver,
+        UrlInterface $urlBuilder,
+        Uri $uri = null,
+        $canUseSessionIdInParam = true,
+        ?State $appState = null,
+        ?ScopeConfigInterface $scopeConfig = null
     ) {
         $this->_canUseSessionIdInParam = $canUseSessionIdInParam;
         $this->_request = $request;
@@ -84,20 +118,22 @@ public function __construct(
         $this->_session = $session;
         $this->_sidResolver = $sidResolver;
         $this->_urlBuilder = $urlBuilder;
-        $this->uri = $uri ?: ObjectManager::getInstance()->get(\Laminas\Uri\Uri::class);
+        $this->uri = $uri ?: ObjectManager::getInstance()->get(Uri::class);
+        $this->appState = $appState ?: ObjectManager::getInstance()->get(State::class);
+        $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
     }
 
     /**
      * Get the referrer url.
      *
      * @return string
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws NoSuchEntityException
      */
     protected function _getUrl()
     {
         $refererUrl = $this->_request->getServer('HTTP_REFERER');
-        $encodedUrl = $this->_request->getParam(\Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED)
-            ?: $this->_request->getParam(\Magento\Framework\App\ActionInterface::PARAM_NAME_BASE64_URL);
+        $encodedUrl = $this->_request->getParam(ActionInterface::PARAM_NAME_URL_ENCODED)
+            ?: $this->_request->getParam(ActionInterface::PARAM_NAME_BASE64_URL);
 
         if ($encodedUrl) {
             $refererUrl = $this->_urlCoder->decode($encodedUrl);
@@ -113,6 +149,7 @@ protected function _getUrl()
         } else {
             $refererUrl = $this->normalizeRefererUrl($refererUrl);
         }
+
         return $refererUrl;
     }
 
@@ -130,9 +167,9 @@ public function getRefererUrl()
      * Set referer url for redirect in response
      *
      * @param   string $defaultUrl
-     * @return  \Magento\Framework\App\ActionInterface
+     * @return  ActionInterface
      *
-     * @throws  \Magento\Framework\Exception\NoSuchEntityException
+     * @throws  NoSuchEntityException
      */
     public function getRedirectUrl($defaultUrl = null)
     {
@@ -149,7 +186,7 @@ public function getRedirectUrl($defaultUrl = null)
      * @param   string $defaultUrl
      * @return  string
      *
-     * @throws  \Magento\Framework\Exception\NoSuchEntityException
+     * @throws  NoSuchEntityException
      */
     public function error($defaultUrl)
     {
@@ -160,6 +197,7 @@ public function error($defaultUrl)
         if (!$this->_isUrlInternal($errorUrl)) {
             $errorUrl = $this->_storeManager->getStore()->getBaseUrl();
         }
+
         return $errorUrl;
     }
 
@@ -169,17 +207,17 @@ public function error($defaultUrl)
      * @param string $defaultUrl
      * @return string
      *
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws NoSuchEntityException
      */
     public function success($defaultUrl)
     {
         $successUrl = $this->_request->getParam(self::PARAM_NAME_SUCCESS_URL);
-        if (empty($successUrl)) {
-            $successUrl = $defaultUrl;
-        }
+        $successUrl = $successUrl ?: $defaultUrl;
+
         if (!$this->_isUrlInternal($successUrl)) {
             $successUrl = $this->_storeManager->getStore()->getBaseUrl();
         }
+
         return $successUrl;
     }
 
@@ -194,12 +232,12 @@ public function updatePathParams(array $arguments)
     /**
      * Set redirect into response
      *
-     * @param \Magento\Framework\App\ResponseInterface $response
+     * @param ResponseInterface $response
      * @param string $path
      * @param array $arguments
      * @return void
      */
-    public function redirect(\Magento\Framework\App\ResponseInterface $response, $path, $arguments = [])
+    public function redirect(ResponseInterface $response, $path, $arguments = [])
     {
         $arguments = $this->updatePathParams($arguments);
         $response->setRedirect($this->_urlBuilder->getUrl($path, $arguments));
@@ -213,15 +251,69 @@ public function redirect(\Magento\Framework\App\ResponseInterface $response, $pa
      */
     protected function _isUrlInternal($url)
     {
-        if (strpos($url, 'http') !== false) {
-            $directLinkType = \Magento\Framework\UrlInterface::URL_TYPE_DIRECT_LINK;
-            $unsecureBaseUrl = $this->_storeManager->getStore()->getBaseUrl($directLinkType, false);
-            $secureBaseUrl = $this->_storeManager->getStore()->getBaseUrl($directLinkType, true);
-            return (strpos($url, (string) $unsecureBaseUrl) === 0) || (strpos($url, (string) $secureBaseUrl) === 0);
+        return strpos($url, 'http') !== false
+            ? $this->isInternalUrl($url) || $this->isCustomAdminUrl($url)
+            : false;
+    }
+
+    /**
+     * Is `Use Custom Admin URL` config enabled
+     *
+     * @return bool
+     */
+    private function isUseCustomAdminUrlEnabled(): bool
+    {
+        return $this->scopeConfig->isSetFlag(
+            self::XML_PATH_USE_CUSTOM_ADMIN_URL,
+            ScopeInterface::SCOPE_STORE
+        );
+    }
+
+    /**
+     * Returns custom admin url
+     *
+     * @return string
+     */
+    private function getCustomAdminUrl(): string
+    {
+        return $this->scopeConfig->getValue(
+            self::XML_PATH_CUSTOM_ADMIN_URL,
+            ScopeInterface::SCOPE_STORE
+        );
+    }
+
+    /**
+     * Is internal custom admin url
+     *
+     * @param string $url
+     * @return bool
+     */
+    private function isCustomAdminUrl(string $url): bool
+    {
+        if ($this->appState->getAreaCode() === Area::AREA_ADMINHTML && $this->isUseCustomAdminUrlEnabled()) {
+            return strpos($url, $this->getCustomAdminUrl()) === 0;
         }
+
         return false;
     }
 
+    /**
+     * Is url internal
+     *
+     * @param string $url
+     * @return bool
+     */
+    private function isInternalUrl(string $url): bool
+    {
+        $directLinkType = UrlInterface::URL_TYPE_DIRECT_LINK;
+        $unsecureBaseUrl = $this->_storeManager->getStore()
+            ->getBaseUrl($directLinkType, false);
+        $secureBaseUrl = $this->_storeManager->getStore()
+            ->getBaseUrl($directLinkType, true);
+
+        return strpos($url, (string) $unsecureBaseUrl) === 0 || strpos($url, (string) $secureBaseUrl) === 0;
+    }
+
     /**
      * Normalize path to avoid wrong store change
      *
@@ -264,10 +356,10 @@ protected function normalizeRefererQueryParts($refererQuery)
         $store = $this->_storeManager->getStore();
 
         if ($store
-            && !empty($refererQuery[\Magento\Store\Model\StoreManagerInterface::PARAM_NAME])
-            && ($refererQuery[\Magento\Store\Model\StoreManagerInterface::PARAM_NAME] !== $store->getCode())
+            && !empty($refererQuery[StoreManagerInterface::PARAM_NAME])
+            && ($refererQuery[StoreManagerInterface::PARAM_NAME] !== $store->getCode())
         ) {
-            $refererQuery[\Magento\Store\Model\StoreManagerInterface::PARAM_NAME] = $store->getCode();
+            $refererQuery[StoreManagerInterface::PARAM_NAME] = $store->getCode();
         }
 
         return $refererQuery;
diff --git a/app/code/Magento/Store/Test/Unit/App/Response/RedirectTest.php b/app/code/Magento/Store/Test/Unit/App/Response/RedirectTest.php
index 9648af9ddf61f..20879bd31ac16 100644
--- a/app/code/Magento/Store/Test/Unit/App/Response/RedirectTest.php
+++ b/app/code/Magento/Store/Test/Unit/App/Response/RedirectTest.php
@@ -5,110 +5,139 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 declare(strict_types=1);
 
 namespace Magento\Store\Test\Unit\App\Response;
 
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Request\Http;
-use Magento\Framework\Encryption\UrlCoder;
-use Magento\Framework\Session\SessionManagerInterface;
-use Magento\Framework\Session\SidResolverInterface;
-use Magento\Framework\UrlInterface;
+use Magento\Framework\App\State;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Store\App\Response\Redirect;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\App\Area;
+use Magento\Store\Model\ScopeInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * Test for \Magento\Store\App\Response\Redirect.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class RedirectTest extends TestCase
 {
-    /**
-     * @var Redirect
-     */
-    protected $_model;
+    private const XML_PATH_USE_CUSTOM_ADMIN_URL = 'admin/url/use_custom';
+    private const XML_PATH_CUSTOM_ADMIN_URL = 'admin/url/custom';
+
+    private const STUB_INTERNAL_URL = 'http://internalurl.com/';
+    private const STUB_EXTERNAL_URL = 'http://externalurl.com/';
+    private const STUB_CUSTOM_ADMIN_URL = 'http://externalurl.com/admin/';
 
     /**
-     * @var MockObject
+     * @var Redirect
      */
-    protected $_requestMock;
+    private $model;
 
     /**
-     * @var MockObject
+     * @var Http|MockObject
      */
-    protected $_storeManagerMock;
+    private $requestMock;
 
     /**
-     * @var MockObject
+     * @var StoreManagerInterface|MockObject
      */
-    protected $_urlCoderMock;
+    private $storeManagerMock;
 
     /**
-     * @var MockObject
+     * @var State|MockObject
      */
-    protected $_sessionMock;
+    private $appStateMock;
 
     /**
-     * @var MockObject
+     * @var ScopeConfigInterface|MockObject
      */
-    protected $_sidResolverMock;
+    private $scopeConfigMock;
 
     /**
-     * @var MockObject
+     * @inheritDoc
      */
-    protected $_urlBuilderMock;
-
     protected function setUp(): void
     {
-        $this->_requestMock = $this->getMockBuilder(Http::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->_storeManagerMock = $this->getMockForAbstractClass(StoreManagerInterface::class);
-        $this->_urlCoderMock = $this->createMock(UrlCoder::class);
-        $this->_sessionMock = $this->getMockForAbstractClass(SessionManagerInterface::class);
-        $this->_sidResolverMock = $this->getMockForAbstractClass(SidResolverInterface::class);
-        $this->_urlBuilderMock = $this->getMockForAbstractClass(UrlInterface::class);
-
-        $this->_model = new Redirect(
-            $this->_requestMock,
-            $this->_storeManagerMock,
-            $this->_urlCoderMock,
-            $this->_sessionMock,
-            $this->_sidResolverMock,
-            $this->_urlBuilderMock
+        $objectManager = new ObjectManager($this);
+
+        $this->requestMock = $this->createMock(Http::class);
+        $this->storeManagerMock = $this->getMockForAbstractClass(StoreManagerInterface::class);
+        $this->appStateMock = $this->createMock(State::class);
+        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
+
+        $this->model = $objectManager->getObject(
+            Redirect::class,
+            [
+                'request' => $this->requestMock,
+                'storeManager' => $this->storeManagerMock,
+                'appState' =>  $this->appStateMock,
+                'scopeConfig' =>  $this->scopeConfigMock,
+            ]
         );
     }
 
     /**
+     * Success url test
+     *
      * @dataProvider urlAddresses
-     * @param string $baseUrl
-     * @param string $successUrl
+     *
+     * @param string $url
+     * @param string $area
+     * @param bool $isCustomAdminUrlEnabled
+     * @param string $expectedUrl
+     * @return void
      */
-    public function testSuccessUrl($baseUrl, $successUrl)
-    {
+    public function testSuccessUrl(
+        string $url,
+        string $area,
+        bool $isCustomAdminUrlEnabled,
+        string $expectedUrl
+    ): void {
         $testStoreMock = $this->createMock(Store::class);
-        $testStoreMock->expects($this->any())->method('getBaseUrl')->willReturn($baseUrl);
-        $this->_requestMock->expects($this->any())->method('getParam')->willReturn(null);
-        $this->_storeManagerMock->expects($this->any())->method('getStore')
+        $testStoreMock->expects($this->atLeastOnce())
+            ->method('getBaseUrl')
+            ->willReturn(self::STUB_INTERNAL_URL);
+        $this->requestMock->expects($this->once())
+            ->method('getParam')
+            ->willReturn(null);
+        $this->storeManagerMock->expects($this->atLeastOnce())
+            ->method('getStore')
             ->willReturn($testStoreMock);
-        $this->assertEquals($baseUrl, $this->_model->success($successUrl));
+        $this->appStateMock->expects($this->once())
+            ->method('getAreaCode')
+            ->willReturn($area);
+        $this->scopeConfigMock->expects($this->any())
+            ->method('isSetFlag')
+            ->with(self::XML_PATH_USE_CUSTOM_ADMIN_URL, ScopeInterface::SCOPE_STORE)
+            ->willReturn($isCustomAdminUrlEnabled);
+        $this->scopeConfigMock->expects($this->any())
+            ->method('getValue')
+            ->with(self::XML_PATH_CUSTOM_ADMIN_URL, ScopeInterface::SCOPE_STORE)
+            ->willReturn(self::STUB_CUSTOM_ADMIN_URL);
+
+        $this->assertEquals($expectedUrl, $this->model->success($url));
     }
 
     /**
-     * DataProvider with the test urls
+     * Data provider for testSuccessUrlWithCustomAdminUrl
      *
      * @return array
      */
-    public function urlAddresses()
+    public function urlAddresses(): array
     {
         return [
-            [
-                'http://externalurl.com/',
-                'http://internalurl.com/',
-            ],
-            [
-                'http://internalurl.com/',
-                'http://internalurl.com/'
-            ]
+            [self::STUB_CUSTOM_ADMIN_URL, Area::AREA_ADMINHTML, true, self::STUB_CUSTOM_ADMIN_URL],
+            [self::STUB_CUSTOM_ADMIN_URL, Area::AREA_ADMINHTML, false, self::STUB_INTERNAL_URL],
+            [self::STUB_CUSTOM_ADMIN_URL, Area::AREA_FRONTEND, true, self::STUB_INTERNAL_URL],
+            [self::STUB_EXTERNAL_URL, Area::AREA_ADMINHTML, true, self::STUB_INTERNAL_URL],
+            [self::STUB_EXTERNAL_URL, Area::AREA_FRONTEND, true, self::STUB_INTERNAL_URL],
         ];
     }
 }

From 289d609911cd607f1cf698747f5ecc9c0dec134c Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Wed, 8 Jul 2020 15:13:06 +0300
Subject: [PATCH 0764/1718] magento/magento2-login-as-customer#186: [CE] Admin
 cannot login as customer in two different customers account

---
 .../Plugin/InvalidateExpiredSessionPlugin.php                 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/Plugin/InvalidateExpiredSessionPlugin.php b/app/code/Magento/LoginAsCustomerFrontendUi/Plugin/InvalidateExpiredSessionPlugin.php
index b68e871c5f955..37aad2cef8998 100644
--- a/app/code/Magento/LoginAsCustomerFrontendUi/Plugin/InvalidateExpiredSessionPlugin.php
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/Plugin/InvalidateExpiredSessionPlugin.php
@@ -61,7 +61,9 @@ public function beforeExecute(ActionInterface $subject)
             $customerId = (int)$this->session->getCustomerId();
             if ($adminId && $customerId) {
                 if (!$this->isLoginAsCustomerSessionActive->execute($customerId, $adminId)) {
-                    $this->session->destroy();
+                    $this->session->clearStorage();
+                    $this->session->expireSessionCookie();
+                    $this->session->regenerateId();
                 }
             }
         }

From 343cbd03c42a29403fe66972abe6f3fea996bd97 Mon Sep 17 00:00:00 2001
From: Nikita Shcherbatykh <nikita.shcherbatykh@transoftgroup.com>
Date: Wed, 8 Jul 2020 16:27:26 +0300
Subject: [PATCH 0765/1718] MC-34988: Upon sending price 0 to the special price
 endpoint, price is saved, but does NOT return the schedule.

---
 .../Catalog/Api/SpecialPriceStorageTest.php   | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/SpecialPriceStorageTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/SpecialPriceStorageTest.php
index ef374dc1873cf..90fe075f91e30 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/SpecialPriceStorageTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/SpecialPriceStorageTest.php
@@ -68,6 +68,35 @@ public function testGet()
         $this->assertEquals($product->getSpecialPrice(), $response[0]['price']);
     }
 
+    /**
+     * Test get method when special price is 0.
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     */
+    public function testGetZeroValue()
+    {
+        $specialPrice = 0;
+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        $product = $productRepository->get(self::SIMPLE_PRODUCT_SKU, true);
+        $product->setData('special_price', $specialPrice);
+        $productRepository->save($product);
+
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => '/V1/products/special-price-information',
+                'httpMethod' => Request::HTTP_METHOD_POST
+            ],
+            'soap' => [
+                'service' => self::SERVICE_NAME,
+                'serviceVersion' => self::SERVICE_VERSION,
+                'operation' => self::SERVICE_NAME . 'Get',
+            ],
+        ];
+        $response = $this->_webApiCall($serviceInfo, ['skus' => [self::SIMPLE_PRODUCT_SKU]]);
+        $this->assertNotEmpty($response);
+        $this->assertEquals($specialPrice, $response[0]['price']);
+    }
+
     /**
      * Test update method.
      *

From c689798c58e6be2232164be9035d08c79e1f15e3 Mon Sep 17 00:00:00 2001
From: Marjan Petkovski <petkovski.marjan@gmail.com>
Date: Wed, 8 Jul 2020 15:32:24 +0200
Subject: [PATCH 0766/1718] magento/magento2#28563: GraphQL product search does
 not consider Category Permissions configuration - Pass the context as
 argument

Reveert AddUsserInfoToContext
---
 .../Model/Context/AddUserInfoToContext.php    | 21 +------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/app/code/Magento/CustomerGraphQl/Model/Context/AddUserInfoToContext.php b/app/code/Magento/CustomerGraphQl/Model/Context/AddUserInfoToContext.php
index 478b2be2a3505..0f0b91967e473 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Context/AddUserInfoToContext.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Context/AddUserInfoToContext.php
@@ -10,8 +10,6 @@
 use Magento\Authorization\Model\UserContextInterface;
 use Magento\GraphQl\Model\Query\ContextParametersInterface;
 use Magento\GraphQl\Model\Query\ContextParametersProcessorInterface;
-use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\Customer\Api\Data\GroupInterface;
 
 /**
  * @inheritdoc
@@ -23,21 +21,13 @@ class AddUserInfoToContext implements ContextParametersProcessorInterface
      */
     private $userContext;
 
-    /**
-     * @var CustomerRepositoryInterface
-     */
-    private $customerRepository;
-
     /**
      * @param UserContextInterface $userContext
-     * @param CustomerRepositoryInterface $customerRepository
      */
     public function __construct(
-        UserContextInterface $userContext,
-        CustomerRepositoryInterface $customerRepository
+        UserContextInterface $userContext
     ) {
         $this->userContext = $userContext;
-        $this->customerRepository = $customerRepository;
     }
 
     /**
@@ -58,15 +48,6 @@ public function execute(ContextParametersInterface $contextParameters): ContextP
         $contextParameters->setUserType($currentUserType);
 
         $contextParameters->addExtensionAttribute('is_customer', $this->isCustomer($currentUserId, $currentUserType));
-
-        try {
-            $customerGroupId = $this->customerRepository->getById($currentUserId)->getGroupId();
-        } catch (\Exception $e) {
-            $customerGroupId = GroupInterface::NOT_LOGGED_IN_ID;
-        }
-
-        $contextParameters->addExtensionAttribute('customer_group_id', $customerGroupId);
-
         return $contextParameters;
     }
 

From 1b0f8df856aedb16d2afd731638fa9d2677cad45 Mon Sep 17 00:00:00 2001
From: Dmitry Tsymbal <d.tsymbal@atwix.com>
Date: Wed, 8 Jul 2020 17:13:05 +0300
Subject: [PATCH 0767/1718] Enabling Email To Friend Functionality

---
 ...gateToEmailToFriendSettingsActionGroup.xml | 15 ++++++++
 ...ailToFriendOptionsAvailableActionGroup.xml | 18 ++++++++++
 .../AdminConfigurationEmailToFriendPage.xml   | 14 ++++++++
 .../AdminCatalogEmailToFriendSettingsTest.xml | 34 +++++++++++++++++++
 .../Section/AdminEmailToFriendSection.xml     | 20 +++++++++++
 5 files changed, 101 insertions(+)
 create mode 100644 app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateToEmailToFriendSettingsActionGroup.xml
 create mode 100644 app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminEmailToFriendOptionsAvailableActionGroup.xml
 create mode 100644 app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationEmailToFriendPage.xml
 create mode 100644 app/code/Magento/Backend/Test/Mftf/Test/AdminCatalogEmailToFriendSettingsTest.xml
 create mode 100644 app/code/Magento/Config/Test/Mftf/Section/AdminEmailToFriendSection.xml

diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateToEmailToFriendSettingsActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateToEmailToFriendSettingsActionGroup.xml
new file mode 100644
index 0000000000000..05903581747d9
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminNavigateToEmailToFriendSettingsActionGroup.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="AdminNavigateToEmailToFriendSettingsActionGroup">
+        <amOnPage url="{{AdminConfigurationEmailToFriendPage.url}}" stepKey="navigateToPersistencePage"/>
+        <conditionalClick selector="{{AdminEmailToFriendSection.DefaultLayoutsTab}}" dependentSelector="{{AdminEmailToFriendSection.CheckIfTabExpand}}" visible="true" stepKey="clickTab"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminEmailToFriendOptionsAvailableActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminEmailToFriendOptionsAvailableActionGroup.xml
new file mode 100644
index 0000000000000..88152a2cb4f73
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminEmailToFriendOptionsAvailableActionGroup.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="AssertAdminEmailToFriendOptionsAvailableActionGroup">
+        <seeElement stepKey="seeEmailTemplateInput" selector="{{AdminEmailToFriendSection.emailTemplate}}"/>
+        <seeElement stepKey="seeAllowForGuestsInput" selector="{{AdminEmailToFriendSection.allowForGuests}}"/>
+        <seeElement stepKey="seeMaxRecipientsInput" selector="{{AdminEmailToFriendSection.maxRecipients}}"/>
+        <seeElement stepKey="seeMaxPerHourInput" selector="{{AdminEmailToFriendSection.maxPerHour}}"/>
+        <seeElement stepKey="seeLimitSendingBy" selector="{{AdminEmailToFriendSection.limitSendingBy}}"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationEmailToFriendPage.xml b/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationEmailToFriendPage.xml
new file mode 100644
index 0000000000000..14bd514f1a16f
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Page/AdminConfigurationEmailToFriendPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminConfigurationEmailToFriendPage" url="admin/system_config/edit/section/sendfriend/" module="Catalog" area="admin">
+        <section name="AdminEmailToFriendSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminCatalogEmailToFriendSettingsTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminCatalogEmailToFriendSettingsTest.xml
new file mode 100644
index 0000000000000..79150854c5939
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminCatalogEmailToFriendSettingsTest.xml
@@ -0,0 +1,34 @@
+<?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="AdminCatalogEmailToFriendSettingsTest">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Enable Email To A Friend Functionality"/>
+            <title value="Admin should be able to manage settings of Email To A Friend Functionality"/>
+            <description value="Admin should be able to enable Email To A Friend functionality in Magento Admin backend and see additional options"/>
+            <group value="backend"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <magentoCLI stepKey="enableSendFriend" command="config:set sendfriend/email/enabled 1"/>
+            <magentoCLI stepKey="cacheClean" command="cache:clean config"/>
+        </before>
+        <after>
+            <magentoCLI stepKey="disableSendFriend" command="config:set sendfriend/email/enabled 0"/>
+            <magentoCLI stepKey="cacheClean" command="cache:clean config"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+
+        <actionGroup ref="AdminNavigateToEmailToFriendSettingsActionGroup" stepKey="navigateToSendFriendSettings"/>
+        <actionGroup ref="AssertAdminEmailToFriendOptionsAvailableActionGroup" stepKey="assertOptions"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Config/Test/Mftf/Section/AdminEmailToFriendSection.xml b/app/code/Magento/Config/Test/Mftf/Section/AdminEmailToFriendSection.xml
new file mode 100644
index 0000000000000..956316ed5cb46
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Section/AdminEmailToFriendSection.xml
@@ -0,0 +1,20 @@
+<?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="AdminEmailToFriendSection">
+        <element name="DefaultLayoutsTab" type="button" selector=".entry-edit-head-link"/>
+        <element name="CheckIfTabExpand" type="button" selector=".entry-edit-head-link:not(.open)"/>
+        <element name="emailTemplate" type="input" selector="#sendfriend_email_template"/>
+        <element name="allowForGuests" type="input" selector="#sendfriend_email_allow_guest"/>
+        <element name="maxRecipients" type="input" selector="#sendfriend_email_max_recipients"/>
+        <element name="maxPerHour" type="input" selector="#sendfriend_email_max_per_hour"/>
+        <element name="limitSendingBy" type="input" selector="#sendfriend_email_check_by"/>
+    </section>
+</sections>

From 53dccc7ad9f774d2850beb18d17f1169d5982780 Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@magento.com>
Date: Wed, 8 Jul 2020 09:19:35 -0500
Subject: [PATCH 0768/1718] MC-31618: Move static config to files - PLUGIN_LIST

- Enable app isolation for 2 integration tests for them not to initialize global fixtures as it causes fatal errors with missed preferences;
---
 .../PluginListGeneratorMultipleScopesTest.php | 131 ------------------
 .../ObjectManager/Factory/CompiledTest.php    |   3 +
 .../Factory/Dynamic/DeveloperTest.php         |   3 +
 3 files changed, 6 insertions(+), 131 deletions(-)
 delete mode 100644 dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorMultipleScopesTest.php

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorMultipleScopesTest.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorMultipleScopesTest.php
deleted file mode 100644
index 65f5b9f3919e7..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorMultipleScopesTest.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Framework\Interception;
-
-use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Filesystem\DriverInterface;
-use Magento\TestFramework\Application;
-use Magento\TestFramework\Helper\Bootstrap;
-
-class PluginListGeneratorMultipleScopesTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * Generated plugin list configs for frontend, adminhtml, graphql scopes
-     */
-    private $cacheIds = [
-        'primary|global|frontend|plugin-list',
-        'primary|global|adminhtml|plugin-list',
-        'primary|global|graphql|plugin-list'
-    ];
-
-    /**
-     * @var PluginListGenerator
-     */
-    private $model;
-
-    /**
-     * @var DirectoryList
-     */
-    private $directoryList;
-
-    /**
-     * @var DriverInterface
-     */
-    private $file;
-
-    /**
-     * @var Application
-     */
-    private $application;
-
-    /**
-     * @inheritDoc
-     */
-    protected function setUp(): void
-    {
-        $this->application = Bootstrap::getInstance()->getBootstrap()->getApplication();
-        $this->directoryList = new DirectoryList(BP, $this->getCustomDirs());
-        $this->file = Bootstrap::getObjectManager()->create(DriverInterface::class);
-        $reader = Bootstrap::getObjectManager()->create(
-        // phpstan:ignore "Class Magento\Framework\ObjectManager\Config\Reader\Dom\Proxy not found."
-            \Magento\Framework\ObjectManager\Config\Reader\Dom\Proxy::class
-        );
-        $scopeConfig = Bootstrap::getObjectManager()->create(\Magento\Framework\Config\Scope::class);
-        $omConfig = Bootstrap::getObjectManager()->create(
-            \Magento\Framework\Interception\ObjectManager\Config\Developer::class
-        );
-        $relations = Bootstrap::getObjectManager()->create(
-            \Magento\Framework\ObjectManager\Relations\Runtime::class
-        );
-        $definitions = Bootstrap::getObjectManager()->create(
-            \Magento\Framework\Interception\Definition\Runtime::class
-        );
-        $classDefinitions = Bootstrap::getObjectManager()->create(
-            \Magento\Framework\ObjectManager\Definition\Runtime::class
-        );
-        // phpstan:ignore "Class Psr\Log\LoggerInterface\Proxy not found."
-        $logger = Bootstrap::getObjectManager()->create(\Psr\Log\LoggerInterface\Proxy::class);
-        $this->model = new PluginListGenerator(
-            $reader,
-            $scopeConfig,
-            $omConfig,
-            $relations,
-            $definitions,
-            $classDefinitions,
-            $logger,
-            $this->directoryList,
-            ['primary', 'global']
-        );
-    }
-
-    /**
-     * Test multiple scopes plugin list configuration generation and load.
-     */
-    public function testPluginListMultipleScopesConfigGeneration()
-    {
-        $scopes = ['frontend', 'adminhtml', 'graphql'];
-        $this->model->write($scopes);
-
-        foreach ($this->cacheIds as $cacheId) {
-            $configData = $this->model->load($cacheId);
-            $this->assertNotEmpty($configData[0]);
-            $this->assertNotEmpty($configData[1]);
-            $this->assertNotEmpty($configData[2]);
-        }
-    }
-
-    /**
-     * Gets customized directory paths
-     *
-     * @return array
-     */
-    private function getCustomDirs()
-    {
-        $path = DirectoryList::PATH;
-        $generated = "{$this->application->getTempDir()}/generated";
-
-        return [
-            DirectoryList::GENERATED_METADATA => [$path => "{$generated}/metadata"],
-        ];
-    }
-
-    /**
-     * @inheritDoc
-     */
-    protected function tearDown(): void
-    {
-        foreach ($this->cacheIds as $cacheId) {
-            $filePath = $this->directoryList->getPath(DirectoryList::GENERATED_METADATA)
-                . '/' . $cacheId . '.' . 'php';
-
-            if (file_exists($filePath)) {
-                $this->file->deleteFile($filePath);
-            }
-        }
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Framework/ObjectManager/Factory/CompiledTest.php b/dev/tests/integration/testsuite/Magento/Framework/ObjectManager/Factory/CompiledTest.php
index c620251ca9b67..7d3b9d2089cf9 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/ObjectManager/Factory/CompiledTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/ObjectManager/Factory/CompiledTest.php
@@ -14,6 +14,9 @@
 use Magento\Framework\ObjectManager\TestAsset\InterfaceImplementation;
 use Magento\Framework\ObjectManager\TestAsset\TestAssetInterface;
 
+/**
+ * @magentoAppIsolation enabled
+ */
 class CompiledTest extends AbstractFactoryRuntimeDefinitionsTestCases
 {
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Framework/ObjectManager/Factory/Dynamic/DeveloperTest.php b/dev/tests/integration/testsuite/Magento/Framework/ObjectManager/Factory/Dynamic/DeveloperTest.php
index 7fa7e677e0d8d..c74c00de4ce53 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/ObjectManager/Factory/Dynamic/DeveloperTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/ObjectManager/Factory/Dynamic/DeveloperTest.php
@@ -15,6 +15,9 @@
 use Magento\Framework\ObjectManager\TestAsset\InterfaceImplementation;
 use Magento\Framework\ObjectManager\TestAsset\TestAssetInterface;
 
+/**
+ * @magentoAppIsolation enabled
+ */
 class DeveloperTest extends AbstractFactoryRuntimeDefinitionsTestCases
 {
     /**

From 3deb545952d45c8b3f6f2c8948a537550a4fdb99 Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Wed, 8 Jul 2020 21:17:14 +0300
Subject: [PATCH 0769/1718] Added testCaseId to MFTF test.

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

diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/StorefrontNewsletterGuestSubscriptionWithDisallowedOptionTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/StorefrontNewsletterGuestSubscriptionWithDisallowedOptionTest.xml
index bb4b550f04063..8d6e707930bba 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/Test/StorefrontNewsletterGuestSubscriptionWithDisallowedOptionTest.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/StorefrontNewsletterGuestSubscriptionWithDisallowedOptionTest.xml
@@ -16,6 +16,7 @@
             <description value="Guest cannot subscribe to Newsletter if it is disallowed in configurations"/>
             <group value="newsletter"/>
             <group value="configuration"/>
+            <testCaseId value="MC-35728"/>
         </annotations>
         <before>
             <magentoCLI stepKey="disableGuestSubscription" command="config:set newsletter/subscription/allow_guest_subscribe 0"/>

From 5c8daac5d3037c786c91dec013385d3374a3fcf3 Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Wed, 8 Jul 2020 13:51:35 -0500
Subject: [PATCH 0770/1718] MC-20637: MyAccount :: Order Details :: Invoice
 Details by Order Number - invoice updated impl and added new tests

---
 .../Model/Resolver/InvoiceItems.php           |  29 +-
 .../Model/Resolver/InvoiceTotal.php           | 111 +++
 .../Model/SalesItem/ShippingTaxHelper.php     | 100 +++
 app/code/Magento/SalesGraphQl/composer.json   |   1 +
 .../Magento/GraphQl/Sales/InvoiceTest.php     | 790 ++++++++++++++----
 5 files changed, 874 insertions(+), 157 deletions(-)
 create mode 100644 app/code/Magento/SalesGraphQl/Model/SalesItem/ShippingTaxHelper.php

diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceItems.php b/app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceItems.php
index bac9ea5480580..a8cd0c83ed190 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceItems.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceItems.php
@@ -122,7 +122,34 @@ private function getInvoiceItemData(OrderInterface $order, InvoiceItemInterface
             ],
             'quantity_invoiced' => $invoiceItem->getQty(),
             'model' => $invoiceItem,
-            'product_type' => $orderItem['product_type']
+            'product_type' => $orderItem['product_type'],
+            'order_item' => $orderItem,
+            'discounts' => $this->getDiscountDetails($order, $invoiceItem)
         ];
     }
+
+    /**
+     * Returns information about an applied discount
+     *
+     * @param OrderInterface $associatedOrder
+     * @param InvoiceItemInterface $invoiceItem
+     * @return array
+     */
+    private function getDiscountDetails(OrderInterface $associatedOrder, InvoiceItemInterface $invoiceItem) : array
+    {
+        if ($associatedOrder->getDiscountDescription() === null && $invoiceItem->getDiscountAmount() == 0
+            && $associatedOrder->getDiscountAmount() == 0
+        ) {
+            $discounts = [];
+        } else {
+            $discounts [] = [
+                'label' => $associatedOrder->getDiscountDescription() ?? _('Discount'),
+                'amount' => [
+                    'value' => $invoiceItem->getDiscountAmount() ?? 0,
+                    'currency' => $associatedOrder->getOrderCurrencyCode()
+                ]
+            ];
+        }
+        return $discounts;
+    }
 }
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceTotal.php b/app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceTotal.php
index 45752c5f807b8..cc1ec3c88d768 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceTotal.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceTotal.php
@@ -13,12 +13,45 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Sales\Api\Data\InvoiceInterface;
 use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Tax\Api\OrderTaxManagementInterface;
+use Magento\SalesGraphQl\Model\SalesItem\ShippingTaxHelper;
+use Magento\Tax\Helper\Data as TaxHelper;
 
 /**
  * Resolver for Invoice total
  */
 class InvoiceTotal implements ResolverInterface
 {
+    /**
+     * @var TaxHelper
+     */
+    private $taxHelper;
+
+    /**
+     * @var OrderTaxManagementInterface
+     */
+    private $orderTaxManagement;
+
+    /**
+     * @var ShippingTaxHelper
+     */
+    private $shippingTaxHelper;
+
+    /**
+     * @param OrderTaxManagementInterface $orderTaxManagement
+     * @param TaxHelper $taxHelper
+     * @param ShippingTaxHelper $shippingTaxHelper
+     */
+    public function __construct(
+        OrderTaxManagementInterface $orderTaxManagement,
+        TaxHelper $taxHelper,
+        ShippingTaxHelper $shippingTaxHelper
+    ) {
+        $this->taxHelper = $taxHelper;
+        $this->orderTaxManagement = $orderTaxManagement;
+        $this->shippingTaxHelper = $shippingTaxHelper;
+    }
+
     /**
      * @inheritDoc
      */
@@ -48,6 +81,11 @@ public function resolve(
             'subtotal' => ['value' =>  $invoiceModel->getSubtotal(), 'currency' => $currency],
             'total_tax' => ['value' =>  $invoiceModel->getTaxAmount(), 'currency' => $currency],
             'total_shipping' => ['value' => $invoiceModel->getShippingAmount(), 'currency' => $currency],
+            'discounts' => $this->getDiscountDetails($invoiceModel),
+            'taxes' => $this->formatTaxes(
+                $orderModel,
+                $this->taxHelper->getCalculatedTaxes($invoiceModel),
+            ),
             'shipping_handling' => [
                 'amount_excluding_tax' => [
                     'value' => $invoiceModel->getShippingAmount(),
@@ -61,7 +99,80 @@ public function resolve(
                     'value' => $invoiceModel->getShippingAmount(),
                     'currency' => $currency
                 ],
+                'discounts' => $this->getShippingDiscountDetails($invoiceModel),
+                'taxes' => $this->formatTaxes(
+                    $orderModel,
+                    $this->shippingTaxHelper->calculateShippingTaxes($orderModel, $invoiceModel),
+                )
             ]
         ];
     }
+
+    /**
+     * Return information about an applied discount on shipping
+     *
+     * @param InvoiceInterface $invoice
+     * @return array
+     */
+    private function getShippingDiscountDetails(InvoiceInterface $invoice)
+    {
+        $shippingDiscounts = [];
+        if (!($invoice->getDiscountDescription() === null
+             && $invoice->getShippingDiscountTaxCompensationAmount() == 0)) {
+            $shippingDiscounts[] =
+                [
+                    'label' => $invoice->getDiscountDescription() ?? __('Discount'),
+                    'amount' => [
+                        'value' => abs($invoice->getShippingDiscountTaxCompensationAmount()),
+                        'currency' => $invoice->getOrderCurrencyCode()
+                    ]
+                ];
+        }
+        return $shippingDiscounts;
+    }
+
+    /**
+     * Return information about an applied discount
+     *
+     * @param InvoiceInterface $invoice
+     * @return array
+     */
+    private function getDiscountDetails(InvoiceInterface $invoice)
+    {
+        $discounts = [];
+        if (!($invoice->getDiscountDescription() === null && $invoice->getDiscountAmount() == 0)) {
+            $discounts[] = [
+                'label' => $invoice->getDiscountDescription() ?? __('Discount'),
+                'amount' => [
+                    'value' => abs($invoice->getDiscountAmount()),
+                    'currency' => $invoice->getOrderCurrencyCode()
+                ]
+            ];
+        }
+        return $discounts;
+    }
+
+    /**
+     * Format applied taxes
+     *
+     * @param OrderInterface $order
+     * @param array $appliedTaxes
+     * @return array
+     */
+    private function formatTaxes(OrderInterface $order, array $appliedTaxes)
+    {
+        $taxes = [];
+        foreach ($appliedTaxes as $appliedTax) {
+            $appliedTaxesArray = [
+                'rate' => $appliedTax['percent'] ?? 0,
+                'title' => $appliedTax['title'] ?? null,
+                'amount' => [
+                    'value' => $appliedTax['tax_amount'] ?? 0,
+                    'currency' => $order->getOrderCurrencyCode()
+                ]
+            ];
+            $taxes[] = $appliedTaxesArray;
+        }
+        return $taxes;
+    }
 }
diff --git a/app/code/Magento/SalesGraphQl/Model/SalesItem/ShippingTaxHelper.php b/app/code/Magento/SalesGraphQl/Model/SalesItem/ShippingTaxHelper.php
new file mode 100644
index 0000000000000..1f1db50548af4
--- /dev/null
+++ b/app/code/Magento/SalesGraphQl/Model/SalesItem/ShippingTaxHelper.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace Magento\SalesGraphQl\Model\SalesItem;
+
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Model\EntityInterface;
+use Magento\Tax\Api\Data\OrderTaxDetailsItemInterface;
+use Magento\Tax\Api\OrderTaxManagementInterface;
+
+class ShippingTaxHelper
+{
+    /**
+     * @var OrderTaxManagementInterface
+     */
+    private $orderTaxManagement;
+
+    /**
+     * @param OrderTaxManagementInterface $orderTaxManagement
+     */
+    public function __construct(
+        OrderTaxManagementInterface $orderTaxManagement
+    ) {
+        $this->orderTaxManagement = $orderTaxManagement;
+    }
+
+    /**
+     * Calculate shipping taxes for sales item
+     *
+     * @param OrderInterface $order
+     * @param EntityInterface $salesItem
+     * @return array
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function calculateShippingTaxes(
+        OrderInterface $order,
+        EntityInterface $salesItem
+    ) {
+        $orderTaxDetails = $this->orderTaxManagement->getOrderTaxDetails($order->getId());
+        $taxClassAmount = [];
+        // Apply any taxes for shipping
+        $shippingTaxAmount = $salesItem->getShippingTaxAmount();
+        $originalShippingTaxAmount = $order->getShippingTaxAmount();
+        if ($shippingTaxAmount && $originalShippingTaxAmount &&
+            $shippingTaxAmount != 0 && (float)$originalShippingTaxAmount
+        ) {
+            //An invoice or credit memo can have a different qty than its order
+            $shippingRatio = $shippingTaxAmount / $originalShippingTaxAmount;
+            $itemTaxDetails = $orderTaxDetails->getItems();
+            foreach ($itemTaxDetails as $itemTaxDetail) {
+                //Aggregate taxable items associated with shipping
+                if ($itemTaxDetail->getType() == \Magento\Quote\Model\Quote\Address::TYPE_SHIPPING) {
+                    $taxClassAmount = $this->_aggregateTaxes($taxClassAmount, $itemTaxDetail, $shippingRatio);
+                }
+            }
+        }
+
+        return $taxClassAmount;
+    }
+
+    /**
+     * Accumulates the pre-calculated taxes for each tax class
+     *
+     * This method accepts and returns the 'taxClassAmount' array with format:
+     * array(
+     *  $index => array(
+     *      'tax_amount'        => $taxAmount,
+     *      'base_tax_amount'   => $baseTaxAmount,
+     *      'title'             => $title,
+     *      'percent'           => $percent
+     *  )
+     * )
+     *
+     * @param  array                        $taxClassAmount
+     * @param  OrderTaxDetailsItemInterface $itemTaxDetail
+     * @param  float                        $ratio
+     * @return array
+     */
+    private function _aggregateTaxes($taxClassAmount, OrderTaxDetailsItemInterface $itemTaxDetail, $ratio)
+    {
+        $itemAppliedTaxes = $itemTaxDetail->getAppliedTaxes();
+        foreach ($itemAppliedTaxes as $itemAppliedTax) {
+            $taxAmount = $itemAppliedTax->getAmount() * $ratio;
+            $baseTaxAmount = $itemAppliedTax->getBaseAmount() * $ratio;
+            if (0 == $taxAmount && 0 == $baseTaxAmount) {
+                continue;
+            }
+            $taxCode = $itemAppliedTax->getCode();
+            if (!isset($taxClassAmount[$taxCode])) {
+                $taxClassAmount[$taxCode]['title'] = $itemAppliedTax->getTitle();
+                $taxClassAmount[$taxCode]['percent'] = $itemAppliedTax->getPercent();
+                $taxClassAmount[$taxCode]['tax_amount'] = $taxAmount;
+                $taxClassAmount[$taxCode]['base_tax_amount'] = $baseTaxAmount;
+            } else {
+                $taxClassAmount[$taxCode]['tax_amount'] += $taxAmount;
+                $taxClassAmount[$taxCode]['base_tax_amount'] += $baseTaxAmount;
+            }
+        }
+        return $taxClassAmount;
+    }
+}
diff --git a/app/code/Magento/SalesGraphQl/composer.json b/app/code/Magento/SalesGraphQl/composer.json
index 9fd6e76220df3..6448f442b2760 100644
--- a/app/code/Magento/SalesGraphQl/composer.json
+++ b/app/code/Magento/SalesGraphQl/composer.json
@@ -8,6 +8,7 @@
         "magento/module-sales": "*",
         "magento/module-store": "*",
         "magento/module-catalog": "*",
+        "magento/module-tax": "*",
         "magento/module-graph-ql": "*"
     },
     "suggest": {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/InvoiceTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/InvoiceTest.php
index db4b2c31a7f48..0404486d3be69 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/InvoiceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/InvoiceTest.php
@@ -7,6 +7,9 @@
 
 namespace Magento\GraphQl\Sales;
 
+use Magento\Framework\Registry;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\ResourceModel\Order\Collection;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 use Magento\GraphQl\GetCustomerAuthenticationHeader;
@@ -19,10 +22,14 @@ class InvoiceTest extends GraphQlAbstract
     /** @var GetCustomerAuthenticationHeader */
     private $customerAuthenticationHeader;
 
+    /** @var OrderRepositoryInterface */
+    private $orderRepository;
+
     protected function setUp(): void
     {
         $this->customerAuthenticationHeader
             = Bootstrap::getObjectManager()->get(GetCustomerAuthenticationHeader::class);
+        $this->orderRepository = Bootstrap::getObjectManager()->get(OrderRepositoryInterface::class);
     }
 
     /**
@@ -31,63 +38,12 @@ protected function setUp(): void
      */
     public function testSingleInvoiceForLoggedInCustomerQuery()
     {
-        $query =
-            <<<QUERY
-query {
-  customer
-  {
-  orders {
-    items {
-      order_number
-      grand_total
-      status
-      invoices {
-          items{
-            product_name
-            product_sku
-            product_sale_price {
-              value
-            }
-            quantity_invoiced
-          }
-          total {
-            subtotal {
-              value
-            }
-            grand_total {
-              value
-            }
-            total_shipping {
-              value
-            }
-      			shipping_handling {
-              total_amount {
-                value
-              }
-            }
-          }
-        }
-    }
-  }
- }
-}
-QUERY;
-
-        $currentEmail = 'customer@example.com';
-        $currentPassword = 'password';
-        $response = $this->graphQlQuery(
-            $query,
-            [],
-            '',
-            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
-        );
-
+        $response = $this->getCustomerInvoice();
         $expectedOrdersData = [
             'order_number' => '100000001',
             'status' => 'Processing',
             'grand_total' => 100.00
         ];
-
         $expectedInvoiceData = [
             [
                 'items' => [
@@ -116,35 +72,28 @@ public function testSingleInvoiceForLoggedInCustomerQuery()
                         'value' => 100
                     ],
                     'total_shipping' => [
-                        'value' => 0
+                        'value' => 0,
+                        'currency' => 'USD'
                     ],
                     'shipping_handling' => [
                         'total_amount' => [
-                            'value' => null
+                            'value' => 0,
+                            'currency' => 'USD'
+                        ],
+                        'amount_including_tax' => [
+                            'value' => 0,
+                            'currency' => 'USD'
+                        ],
+                        'amount_excluding_tax' => [
+                            'value' => 0,
+                            'currency' => 'USD'
                         ]
                     ]
                 ]
             ]
         ];
-
-        $actualData = $response['customer']['orders']['items'][0];
-
-        $this->assertEquals(
-            $expectedOrdersData['order_number'],
-            $actualData['order_number'],
-            "order_number is different than the expected for order - " . $expectedOrdersData['order_number']
-        );
-        $this->assertEquals(
-            $expectedOrdersData['grand_total'],
-            $actualData['grand_total'],
-            "grand_total is different than the expected for order - " . $expectedOrdersData['order_number']
-        );
-        $this->assertEquals(
-            $expectedOrdersData['status'],
-            $actualData['status'],
-            "status is different than the expected for order - " . $expectedOrdersData['order_number']
-        );
-        $invoices = $actualData['invoices'];
+        $this->assertOrdersData($response, $expectedOrdersData);
+        $invoices = $response['customer']['orders']['items'][0]['invoices'];
         $this->assertResponseFields($invoices, $expectedInvoiceData);
     }
 
@@ -154,73 +103,12 @@ public function testSingleInvoiceForLoggedInCustomerQuery()
      */
     public function testMultipleInvoiceForLoggedInCustomerQuery()
     {
-        $query =
-            <<<QUERY
-query {
-  customer
-  {
-  orders {
-    items {
-      order_number
-      grand_total
-      status
-      invoices {
-          items{
-            product_name
-            product_sku
-            product_sale_price {
-              value
-            }
-            quantity_invoiced
-      }
-      total {
-        subtotal {
-          value
-        }
-        grand_total {
-          value
-        }
-        total_shipping {
-          value
-          currency
-        }
-        shipping_handling {
-          total_amount {
-            value
-            currency
-          }
-          amount_including_tax {
-            value
-            currency
-          }
-          amount_excluding_tax {
-            value
-            currency
-          }
-        }
-      }
-    }
-}
-}
-}
-}
-QUERY;
-
-        $currentEmail = 'customer@example.com';
-        $currentPassword = 'password';
-        $response = $this->graphQlQuery(
-            $query,
-            [],
-            '',
-            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
-        );
-
+        $response = $this->getCustomerInvoice();
         $expectedOrdersData = [
             'order_number' => '100000002',
             'status' => 'Processing',
             'grand_total' => 50.00
         ];
-
         $expectedInvoiceData = [
             [
                 'items' => [
@@ -299,24 +187,8 @@ public function testMultipleInvoiceForLoggedInCustomerQuery()
                 ]
             ]
         ];
-
-        $actualData = $response['customer']['orders']['items'][0];
-        $this->assertEquals(
-            $expectedOrdersData['order_number'],
-            $actualData['order_number'],
-            "order_number is different than the expected for order - " . $expectedOrdersData['order_number']
-        );
-        $this->assertEquals(
-            $expectedOrdersData['grand_total'],
-            $actualData['grand_total'],
-            "grand_total is different than the expected for order - " . $expectedOrdersData['order_number']
-        );
-        $this->assertEquals(
-            $expectedOrdersData['status'],
-            $actualData['status'],
-            "status is different than the expected for order - " . $expectedOrdersData['order_number']
-        );
-        $invoices = $actualData['invoices'];
+        $this->assertOrdersData($response, $expectedOrdersData);
+        $invoices = $response['customer']['orders']['items'][0]['invoices'];
         $this->assertResponseFields($invoices, $expectedInvoiceData);
     }
 
@@ -375,7 +247,6 @@ public function testMultipleCustomersWithInvoicesQuery()
             '',
             $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
         );
-
         $expectedOrdersData = [
             'order_number' => '100000001',
             'status' => 'Processing',
@@ -411,7 +282,533 @@ public function testMultipleCustomersWithInvoicesQuery()
                 ]
             ]
         ];
+        $this->assertOrdersData($response, $expectedOrdersData);
+        $invoices = $response['customer']['orders']['items'][0]['invoices'];
+        $this->assertResponseFields($invoices, $expectedInvoiceData);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_with_url_key.php
+     * @magentoApiDataFixture Magento/GraphQl/Tax/_files/tax_rule_for_region_1.php
+     * @magentoApiDataFixture Magento/GraphQl/Tax/_files/tax_calculation_shipping_and_order_display_settings.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/cart_rule_10_percent_off_with_discount_on_shipping.php
+     */
+    public function testInvoiceForCustomerWithTaxesAndDiscounts()
+    {
+        $quantity = 2;
+        $sku = 'simple1';
+        $cartId = $this->createEmptyCart();
+        $this->addProductToCart($cartId, $quantity, $sku);
+
+        $this->setBillingAddress($cartId);
+        $shippingMethod = $this->setShippingAddress($cartId);
+        $paymentMethod = $this->setShippingMethod($cartId, $shippingMethod);
+        $this->setPaymentMethod($cartId, $paymentMethod);
+
+        $orderNumber = $this->placeOrder($cartId);
+        $this->prepareInvoice($orderNumber, 2);
+        $customerOrderResponse = $this->getCustomerOrderQuery($orderNumber);
+        $customerOrderItem = $customerOrderResponse[0];
+        $invoice = $customerOrderItem['invoices'][0];
+        $this->assertEquals(3, $invoice['total']['discounts'][0]['amount']['value']);
+        $this->assertEquals('USD', $invoice['total']['discounts'][0]['amount']['currency']);
+        $this->assertEquals(
+            'Discount Label for 10% off',
+            $invoice['total']['discounts'][0]['label']
+        );
+        $this->assertTotalsAndShippingWithTaxesAndDiscounts($customerOrderItem['invoices'][0]['total']);
+        $this->deleteOrder();
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_with_url_key.php
+     * @magentoApiDataFixture Magento/GraphQl/Tax/_files/tax_rule_for_region_1.php
+     * @magentoApiDataFixture Magento/GraphQl/Tax/_files/tax_calculation_shipping_and_order_display_settings.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/cart_rule_10_percent_off_with_discount_on_shipping.php
+     */
+    public function testPartialInvoiceForCustomerWithTaxesAndDiscounts()
+    {
+        $quantity = 2;
+        $sku = 'simple1';
+        $cartId = $this->createEmptyCart();
+        $this->addProductToCart($cartId, $quantity, $sku);
+
+        $this->setBillingAddress($cartId);
+        $shippingMethod = $this->setShippingAddress($cartId);
+        $paymentMethod = $this->setShippingMethod($cartId, $shippingMethod);
+        $this->setPaymentMethod($cartId, $paymentMethod);
+
+        $orderNumber = $this->placeOrder($cartId);
+        $this->prepareInvoice($orderNumber, 1);
+        $customerOrderResponse = $this->getCustomerOrderQuery($orderNumber);
+        $customerOrderItem = $customerOrderResponse[0];
+        $invoice = $customerOrderItem['invoices'][0];
+        $this->assertEquals(2, $invoice['total']['discounts'][0]['amount']['value']);
+        $this->assertEquals('USD', $invoice['total']['discounts'][0]['amount']['currency']);
+        $this->assertEquals(
+            'Discount Label for 10% off',
+            $invoice['total']['discounts'][0]['label']
+        );
+        $this->assertTotalsAndShippingWithTaxesAndDiscountsForOneQty($customerOrderItem['invoices'][0]['total']);
+        $this->deleteOrder();
+    }
+
+    /**
+     * @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();
+    }
+
+    /**
+     * Check order totals an shipping amounts with taxes
+     *
+     * @param array $customerOrderItemTotal
+     */
+    private function assertTotalsAndShippingWithTaxesAndDiscounts(array $customerOrderItemTotal): void
+    {
+        $this->assertCount(1, $customerOrderItemTotal['taxes']);
+        $taxData = $customerOrderItemTotal['taxes'][0];
+        $this->assertEquals('USD', $taxData['amount']['currency']);
+        $this->assertEquals(2.03, $taxData['amount']['value']);
+        $this->assertEquals('US-TEST-*-Rate-1', $taxData['title']);
+        $this->assertEquals(7.5, $taxData['rate']);
+
+        unset($customerOrderItemTotal['taxes']);
+        $assertionMap = [
+            'base_grand_total' => ['value' => 29.1, 'currency' =>'USD'],
+            'grand_total' => ['value' => 29.1, 'currency' =>'USD'],
+            'total_tax' => ['value' => 2.03, 'currency' =>'USD'],
+            'subtotal' => ['value' => 20, 'currency' =>'USD'],
+            'total_shipping' => ['value' => 10, 'currency' =>'USD'],
+            'shipping_handling' => [
+                'amount_including_tax' => ['value' => 10.75],
+                'amount_excluding_tax' => ['value' => 10],
+                'total_amount' => ['value' => 10, 'currency' =>'USD'],
+                'taxes'=> [
+                    0 => [
+                        'amount'=>['value' => 0.68],
+                        'title' => 'US-TEST-*-Rate-1',
+                        'rate' => 7.5
+                    ]
+                ],
+                'discounts'=> [
+                    0 => [
+                        'amount'=>['value' => 0.07, 'currency'=> 'USD'],
+                        'label' => 'Discount Label for 10% off'
+                    ]
+                ],
+            ]
+        ];
+        $this->assertResponseFields($customerOrderItemTotal, $assertionMap);
+    }
+
+    /**
+     * Check order totals an shipping amounts with taxes
+     *
+     * @param array $customerOrderItemTotal
+     */
+    private function assertTotalsAndShippingWithTaxesAndDiscountsForOneQty(array $customerOrderItemTotal): void
+    {
+        $this->assertCount(1, $customerOrderItemTotal['taxes']);
+        $taxData = $customerOrderItemTotal['taxes'][0];
+        $this->assertEquals('USD', $taxData['amount']['currency']);
+        $this->assertEquals(1.36, $taxData['amount']['value']);
+        $this->assertEquals('US-TEST-*-Rate-1', $taxData['title']);
+        $this->assertEquals(7.5, $taxData['rate']);
+
+        unset($customerOrderItemTotal['taxes']);
+        $assertionMap = [
+            'base_grand_total' => ['value' => 19.43, 'currency' =>'USD'],
+            'grand_total' => ['value' => 19.43, 'currency' =>'USD'],
+            'total_tax' => ['value' => 1.36, 'currency' =>'USD'],
+            'subtotal' => ['value' => 10, 'currency' =>'USD'],
+            'total_shipping' => ['value' => 10, 'currency' =>'USD'],
+            'shipping_handling' => [
+                'amount_including_tax' => ['value' => 10.75],
+                'amount_excluding_tax' => ['value' => 10],
+                'total_amount' => ['value' => 10, 'currency' =>'USD'],
+                'taxes'=> [
+                    0 => [
+                        'amount'=>['value' => 0.68],
+                        'title' => 'US-TEST-*-Rate-1',
+                        'rate' => 7.5
+                    ]
+                ],
+                'discounts'=> [
+                    0 => [
+                        'amount'=>['value' => 0.07, 'currency'=> 'USD'],
+                        'label' => 'Discount Label for 10% off'
+                    ]
+                ],
+            ]
+        ];
+        $this->assertResponseFields($customerOrderItemTotal, $assertionMap);
+    }
+
+    /**
+     * Create an empty cart with GraphQl mutation
+     *
+     * @return string
+     */
+    private function createEmptyCart(): string
+    {
+        $query = <<<QUERY
+mutation {
+  createEmptyCart
+}
+QUERY;
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+        $response = $this->graphQlMutation(
+            $query,
+            [],
+            '',
+            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
+        );
+        return $response['createEmptyCart'];
+    }
+
+    /**
+     * Add product to cart with GraphQl query
+     *
+     * @param string $cartId
+     * @param float $qty
+     * @param string $sku
+     * @return void
+     */
+    private function addProductToCart(string $cartId, float $qty, string $sku): void
+    {
+        $query = <<<QUERY
+mutation {
+  addSimpleProductsToCart(
+    input: {
+      cart_id: "{$cartId}"
+      cart_items: [
+        {
+          data: {
+            quantity: {$qty}
+            sku: "{$sku}"
+          }
+        }
+      ]
+    }
+  ) {
+    cart {items{quantity product {sku}}}}
+}
+QUERY;
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+        $this->graphQlMutation(
+            $query,
+            [],
+            '',
+            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
+        );
+    }
+
+    /**
+     * Set billing address on cart with GraphQL mutation
+     *
+     * @param string $cartId
+     * @return void
+     */
+    private function setBillingAddress(string $cartId): void
+    {
+        $query = <<<QUERY
+mutation {
+  setBillingAddressOnCart(
+    input: {
+      cart_id: "{$cartId}"
+      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;
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+        $this->graphQlMutation(
+            $query,
+            [],
+            '',
+            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
+        );
+    }
 
+    /**
+     * Set shipping address on cart with GraphQl query
+     *
+     * @param string $cartId
+     * @return array
+     */
+    private function setShippingAddress(string $cartId): array
+    {
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$cartId"
+      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;
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+        $response = $this->graphQlMutation(
+            $query,
+            [],
+            '',
+            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
+        );
+        $shippingAddress = current($response['setShippingAddressesOnCart']['cart']['shipping_addresses']);
+        $availableShippingMethod = current($shippingAddress['available_shipping_methods']);
+        return $availableShippingMethod;
+    }
+
+    /**
+     * Set shipping method on cart with GraphQl mutation
+     *
+     * @param string $cartId
+     * @param array $method
+     * @return array
+     */
+    private function setShippingMethod(string $cartId, array $method): array
+    {
+        $query = <<<QUERY
+mutation {
+  setShippingMethodsOnCart(input:  {
+    cart_id: "{$cartId}",
+    shipping_methods: [
+      {
+         carrier_code: "{$method['carrier_code']}"
+         method_code: "{$method['method_code']}"
+      }
+    ]
+  }) {
+    cart {
+      available_payment_methods {
+        code
+        title
+      }
+    }
+  }
+}
+QUERY;
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+        $response = $this->graphQlMutation(
+            $query,
+            [],
+            '',
+            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
+        );
+        $availablePaymentMethod = current($response['setShippingMethodsOnCart']['cart']['available_payment_methods']);
+        return $availablePaymentMethod;
+    }
+
+    /**
+     * Set payment method on cart with GrpahQl mutation
+     *
+     * @param string $cartId
+     * @param array $method
+     * @return void
+     */
+    private function setPaymentMethod(string $cartId, array $method): void
+    {
+        $query = <<<QUERY
+mutation {
+  setPaymentMethodOnCart(
+    input: {
+      cart_id: "{$cartId}"
+      payment_method: {
+        code: "{$method['code']}"
+      }
+    }
+  ) {
+    cart {selected_payment_method {code}}
+  }
+}
+QUERY;
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+        $this->graphQlMutation(
+            $query,
+            [],
+            '',
+            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
+        );
+    }
+
+    /**
+     * Place order using GraphQl mutation
+     *
+     * @param string $cartId
+     * @return string
+     */
+    private function placeOrder(string $cartId): string
+    {
+        $query = <<<QUERY
+mutation {
+  placeOrder(
+    input: {
+      cart_id: "{$cartId}"
+    }
+  ) {
+    order {
+      order_number
+    }
+  }
+}
+QUERY;
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+        $response = $this->graphQlMutation(
+            $query,
+            [],
+            '',
+            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
+        );
+        return $response['placeOrder']['order']['order_number'];
+    }
+
+    /**
+     * Get customer order query
+     *
+     * @param string $orderNumber
+     * @return array
+     */
+    private function getCustomerOrderQuery($orderNumber): array
+    {
+        $query =
+            <<<QUERY
+{
+     customer {
+       email
+       orders(filter:{number:{eq:"{$orderNumber}"}}) {
+         total_count
+         items {
+           id
+           number
+           order_date
+           status
+           items{product_name product_sku quantity_ordered discounts {amount{value currency} label}}
+           total {
+             base_grand_total{value currency}
+             grand_total{value currency}
+             total_tax{value currency}
+             subtotal { value currency }
+             taxes {amount{value currency} title rate}
+             discounts {amount{value currency} label}
+             total_shipping{value currency}
+             shipping_handling
+             {
+               amount_including_tax{value}
+               amount_excluding_tax{value}
+               total_amount{value currency}
+               taxes {amount{value} title rate}
+               discounts {amount{value currency} label}
+             }
+           }
+           invoices {
+              total {
+             base_grand_total{value currency}
+             grand_total{value currency}
+             total_tax{value currency}
+             subtotal { value currency }
+             taxes {amount{value currency} title rate}
+             discounts {amount{value currency} label}
+             total_shipping{value currency}
+             shipping_handling
+             {
+               amount_including_tax{value}
+               amount_excluding_tax{value}
+               total_amount{value currency}
+               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']);
+        return $response['customer']['orders']['items'];
+    }
+
+    private function assertOrdersData($response, $expectedOrdersData): void
+    {
         $actualData = $response['customer']['orders']['items'][0];
         $this->assertEquals(
             $expectedOrdersData['order_number'],
@@ -428,7 +825,88 @@ public function testMultipleCustomersWithInvoicesQuery()
             $actualData['status'],
             "status is different than the expected for order - " . $expectedOrdersData['order_number']
         );
-        $invoices = $actualData['invoices'];
-        $this->assertResponseFields($invoices, $expectedInvoiceData);
+    }
+
+    private function getCustomerInvoice(): array
+    {
+        $query =
+            <<<QUERY
+query {
+  customer
+  {
+  orders {
+    items {
+      order_number
+      grand_total
+      status
+      invoices {
+          items{
+            product_name
+            product_sku
+            product_sale_price {
+              value
+            }
+            quantity_invoiced
+          }
+          total {
+            subtotal {
+              value
+            }
+            grand_total {
+              value
+            }
+            total_shipping {
+              value
+              currency
+            }
+      			shipping_handling {
+              total_amount {
+                value
+                currency
+              }
+              amount_including_tax {
+                value
+                currency
+              }
+              amount_excluding_tax {
+                value
+                currency
+              }
+            }
+          }
+        }
+    }
+  }
+ }
+}
+QUERY;
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+        return $this->graphQlQuery(
+            $query,
+            [],
+            '',
+            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
+        );
+    }
+
+    /**
+     * Clean up orders
+     *
+     * @return void
+     */
+    private function deleteOrder(): void
+    {
+        /** @var Registry $registry */
+        $registry = Bootstrap::getObjectManager()->get(Registry::class);
+        $registry->unregister('isSecureArea');
+        $registry->register('isSecureArea', true);
+        /** @var $order \Magento\Sales\Model\Order */
+        $orderCollection = Bootstrap::getObjectManager()->create(Collection::class);
+        foreach ($orderCollection as $order) {
+            $this->orderRepository->delete($order);
+        }
+        $registry->unregister('isSecureArea');
+        $registry->register('isSecureArea', false);
     }
 }

From 588b87bb139125d2b20bcee81c018a80cdfa42eb Mon Sep 17 00:00:00 2001
From: DianaRusin <rusind95@gmail.com>
Date: Thu, 9 Jul 2020 09:44:42 +0300
Subject: [PATCH 0771/1718] MC-35754: [MFTF] skip
 StorefrontPaypalSmartButtonInCheckoutPageTest and
 StorefrontPaypalSmartButtonWithFranceMerchantCountryTest

---
 .../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..2bf940bc42448 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml
@@ -17,6 +17,9 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-13690"/>
             <group value="paypalExpress"/>
+            <skip>
+                <issueId value="MC-35754"/>
+            </skip>
         </annotations>
         <before>
             <!-- Login -->
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml
index 3fd5f44d5a4b6..38ebbdb699945 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml
@@ -17,6 +17,9 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-33274"/>
             <group value="paypalExpress"/>
+            <skip>
+                <issueId value="MC-35754"/>
+            </skip>
         </annotations>
         <before>
             <!--Set price scope global-->

From 3fdf24b210798270c4a90056dbd35604bc2c97cb Mon Sep 17 00:00:00 2001
From: DianaRusin <rusind95@gmail.com>
Date: Thu, 9 Jul 2020 10:17:27 +0300
Subject: [PATCH 0772/1718] MC-35754: [MFTF] skip
 StorefrontPaypalSmartButtonInCheckoutPageTest and
 StorefrontPaypalSmartButtonWithFranceMerchantCountryTest

---
 .../Mftf/Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml | 2 +-
 ...StorefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml
index 2bf940bc42448..d2c3d2ed4f01b 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml
@@ -18,7 +18,7 @@
             <testCaseId value="MC-13690"/>
             <group value="paypalExpress"/>
             <skip>
-                <issueId value="MC-35754"/>
+                <issueId value="MC-35722"/>
             </skip>
         </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 38ebbdb699945..5a765e469bc9d 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml
@@ -18,7 +18,7 @@
             <testCaseId value="MC-33274"/>
             <group value="paypalExpress"/>
             <skip>
-                <issueId value="MC-35754"/>
+                <issueId value="MC-35722"/>
             </skip>
         </annotations>
         <before>

From 454695ca20f701f3133afc15317c13545e338ef4 Mon Sep 17 00:00:00 2001
From: Dmitriy Gallyamov <dmitrijs.gallamovs@gmail.com>
Date: Thu, 9 Jul 2020 12:36:45 +0300
Subject: [PATCH 0773/1718] magento/magento2#28569: Multi-store: Missing store
 codes in relation to a group and website

- Replaced interface updates
---
 .../Store/Api/Data/StoreConfigInterface.php   | 15 -------------
 .../Magento/Store/Model/Data/StoreConfig.php  | 22 -------------------
 .../ResourceModel/StoreWebsiteRelation.php    |  8 +++----
 .../Model/Service/StoreConfigManager.php      |  3 +--
 .../Store/StoreConfigDataProvider.php         | 16 +++++++++-----
 .../Store/AvailableStoreConfigTest.php        | 12 ++++++++--
 .../GraphQl/Store/StoreConfigResolverTest.php | 10 ++++++---
 7 files changed, 32 insertions(+), 54 deletions(-)

diff --git a/app/code/Magento/Store/Api/Data/StoreConfigInterface.php b/app/code/Magento/Store/Api/Data/StoreConfigInterface.php
index 48911db9c8134..8f6011f1ae56f 100644
--- a/app/code/Magento/Store/Api/Data/StoreConfigInterface.php
+++ b/app/code/Magento/Store/Api/Data/StoreConfigInterface.php
@@ -43,21 +43,6 @@ public function getCode();
      */
     public function setCode($code);
 
-    /**
-     * Get store name
-     *
-     * @return string
-     */
-    public function getName();
-
-    /**
-     * Set store code
-     *
-     * @param string $name
-     * @return $this
-     */
-    public function setName($name);
-
     /**
      * Get website id of the store
      *
diff --git a/app/code/Magento/Store/Model/Data/StoreConfig.php b/app/code/Magento/Store/Model/Data/StoreConfig.php
index 16b38cf37e416..e68d98b162613 100644
--- a/app/code/Magento/Store/Model/Data/StoreConfig.php
+++ b/app/code/Magento/Store/Model/Data/StoreConfig.php
@@ -15,7 +15,6 @@ class StoreConfig extends \Magento\Framework\Api\AbstractExtensibleObject implem
 {
     const KEY_ID = 'id';
     const KEY_CODE = 'code';
-    const KEY_NAME = 'name';
     const KEY_WEBSITE_ID = 'website_id';
     const KEY_LOCALE = 'locale';
     const KEY_BASE_CURRENCY_CODE = 'base_currency_code';
@@ -73,27 +72,6 @@ public function setCode($code)
         return $this->setData(self::KEY_CODE, $code);
     }
 
-    /**
-     * Get store name
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->_get(self::KEY_NAME);
-    }
-
-    /**
-     * Get store name
-     *
-     * @param string $name
-     * @return $this
-     */
-    public function setName($name)
-    {
-        return $this->setData(self::KEY_NAME, $name);
-    }
-
     /**
      * Get website id of the store
      *
diff --git a/app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php b/app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php
index 4bfe713806174..2c066ff2e0f27 100644
--- a/app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php
+++ b/app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php
@@ -45,17 +45,17 @@ public function getStoreByWebsiteId($websiteId)
     }
 
     /**
-     * Get website store codes
+     * Get website store data
      *
      * @param string $websiteId
      * @param bool $available
      * @return array
      */
-    public function getWebsiteStoreCodes(string $websiteId, bool $available = false): array
+    public function getWebsiteStores(string $websiteId, bool $available = false): array
     {
         $connection = $this->resource->getConnection();
         $storeTable = $this->resource->getTableName('store');
-        $storeSelect = $connection->select()->from($storeTable, ['code'])->where(
+        $storeSelect = $connection->select()->from($storeTable)->where(
             'website_id = ?',
             $websiteId
         );
@@ -66,6 +66,6 @@ public function getWebsiteStoreCodes(string $websiteId, bool $available = false)
             );
         }
 
-        return $connection->fetchCol($storeSelect);
+        return $connection->fetchAll($storeSelect);
     }
 }
diff --git a/app/code/Magento/Store/Model/Service/StoreConfigManager.php b/app/code/Magento/Store/Model/Service/StoreConfigManager.php
index 29f6a9c95d60b..ebc73036f7e37 100644
--- a/app/code/Magento/Store/Model/Service/StoreConfigManager.php
+++ b/app/code/Magento/Store/Model/Service/StoreConfigManager.php
@@ -94,8 +94,7 @@ protected function getStoreConfig($store)
 
         $storeConfig->setId($store->getId())
             ->setCode($store->getCode())
-            ->setWebsiteId($store->getWebsiteId())
-            ->setName($store->getName());
+            ->setWebsiteId($store->getWebsiteId());
 
         foreach ($this->configPaths as $methodName => $configPath) {
             $configValue = $this->scopeConfig->getValue(
diff --git a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
index 93c70c98051f5..647aa0372532f 100644
--- a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
+++ b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
@@ -66,7 +66,7 @@ public function __construct(
     public function getStoreConfigData(StoreInterface $store): array
     {
         $defaultStoreConfig = $this->storeConfigManager->getStoreConfigs([$store->getCode()]);
-        return $this->prepareStoreConfigData(current($defaultStoreConfig));
+        return $this->prepareStoreConfigData(current($defaultStoreConfig), $store->getName());
     }
 
     /**
@@ -77,12 +77,15 @@ public function getStoreConfigData(StoreInterface $store): array
      */
     public function getAvailableStoreConfig(string $websiteId): array
     {
-        $websiteStores = $this->storeWebsiteRelation->getWebsiteStoreCodes($websiteId, true);
-        $storeConfigs = $this->storeConfigManager->getStoreConfigs($websiteStores);
+        $websiteStores = $this->storeWebsiteRelation->getWebsiteStores($websiteId, true);
+        $storeCodes = array_column($websiteStores, 'code');
+
+        $storeConfigs = $this->storeConfigManager->getStoreConfigs($storeCodes);
         $storesConfigData = [];
 
         foreach ($storeConfigs as $storeConfig) {
-            $storesConfigData[] = $this->prepareStoreConfigData($storeConfig);
+            $key = array_search($storeConfig->getCode(), array_column($websiteStores, 'code'), true);
+            $storesConfigData[] = $this->prepareStoreConfigData($storeConfig, $websiteStores[$key]['name']);
         }
 
         return $storesConfigData;
@@ -92,9 +95,10 @@ public function getAvailableStoreConfig(string $websiteId): array
      * Prepare store config data
      *
      * @param StoreConfigInterface $storeConfig
+     * @param string $storeName
      * @return array
      */
-    private function prepareStoreConfigData(StoreConfigInterface $storeConfig): array
+    private function prepareStoreConfigData(StoreConfigInterface $storeConfig, string $storeName): array
     {
         return array_merge([
             'id' => $storeConfig->getId(),
@@ -113,7 +117,7 @@ private function prepareStoreConfigData(StoreConfigInterface $storeConfig): arra
             'secure_base_link_url' => $storeConfig->getSecureBaseLinkUrl(),
             'secure_base_static_url' => $storeConfig->getSecureBaseStaticUrl(),
             'secure_base_media_url' => $storeConfig->getSecureBaseMediaUrl(),
-            'store_name' => $storeConfig->getName(),
+            'store_name' => $storeName,
         ], $this->getExtendedConfigData((int)$storeConfig->getId()));
     }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/AvailableStoreConfigTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/AvailableStoreConfigTest.php
index d9d27ac9c462c..239f6886d8d2d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/AvailableStoreConfigTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/AvailableStoreConfigTest.php
@@ -7,11 +7,11 @@
 
 namespace Magento\GraphQl\Store;
 
-use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Store\Api\Data\StoreConfigInterface;
 use Magento\Store\Api\StoreConfigManagerInterface;
-use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\ResourceModel\Store as StoreResource;
+use Magento\Store\Model\Store;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -31,6 +31,11 @@ class AvailableStoreConfigTest extends GraphQlAbstract
      */
     private $storeConfigManager;
 
+    /**
+     * @var StoreResource
+     */
+    private $storeResource;
+
     /**
      * @inheritDoc
      */
@@ -38,6 +43,7 @@ protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
         $this->storeConfigManager = $this->objectManager->get(StoreConfigManagerInterface::class);
+        $this->storeResource = $this->objectManager->get(StoreResource::class);
     }
 
     /**
@@ -140,6 +146,8 @@ public function testNonDefaultWebsiteAvailableStoreConfigs(): void
      */
     private function validateStoreConfig(StoreConfigInterface $storeConfig, array $responseConfig): void
     {
+        $store = $this->objectManager->get(Store::class);
+        $this->storeResource->load($store, $storeConfig->getCode(), 'code');
         $this->assertEquals($storeConfig->getId(), $responseConfig['id']);
         $this->assertEquals($storeConfig->getCode(), $responseConfig['code']);
         $this->assertEquals($storeConfig->getLocale(), $responseConfig['locale']);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
index f91682de4aecf..6bbf07eeaf5fb 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
@@ -75,7 +75,7 @@ public function testGetStoreConfig(): void
 QUERY;
         $response = $this->graphQlQuery($query);
         $this->assertArrayHasKey('storeConfig', $response);
-        $this->validateStoreConfig($defaultStoreConfig, $response['storeConfig']);
+        $this->validateStoreConfig($defaultStoreConfig, $response['storeConfig'], $store->getName());
     }
 
     /**
@@ -83,9 +83,13 @@ public function testGetStoreConfig(): void
      *
      * @param StoreConfigInterface $storeConfig
      * @param array $responseConfig
+     * @param string $storeName
      */
-    private function validateStoreConfig($storeConfig, $responseConfig): void
-    {
+    private function validateStoreConfig(
+        StoreConfigInterface $storeConfig,
+        array $responseConfig,
+        string $storeName
+    ): void {
         $this->assertEquals($storeConfig->getId(), $responseConfig['id']);
         $this->assertEquals($storeConfig->getCode(), $responseConfig['code']);
         $this->assertEquals($storeConfig->getLocale(), $responseConfig['locale']);

From 3c770e2ac04f21cc45a725ed781287bb8a7d8a16 Mon Sep 17 00:00:00 2001
From: Dmitriy Gallyamov <dmitrijs.gallamovs@gmail.com>
Date: Thu, 9 Jul 2020 13:54:31 +0300
Subject: [PATCH 0774/1718] magento/magento2#28569: Multi-store: Missing store
 codes in relation to a group and website

- Static code fix
---
 .../testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
index 6bbf07eeaf5fb..cc8a60cf0937a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreConfigResolverTest.php
@@ -108,6 +108,6 @@ private function validateStoreConfig(
         $this->assertEquals($storeConfig->getSecureBaseLinkUrl(), $responseConfig['secure_base_link_url']);
         $this->assertEquals($storeConfig->getSecureBaseStaticUrl(), $responseConfig['secure_base_static_url']);
         $this->assertEquals($storeConfig->getSecureBaseMediaUrl(), $responseConfig['secure_base_media_url']);
-        $this->assertEquals($storeConfig->getName(), $responseConfig['store_name']);
+        $this->assertEquals($storeName, $responseConfig['store_name']);
     }
 }

From 5514e889fb02a5a5fe56e6937bb42552e7fba999 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Thu, 9 Jul 2020 13:57:54 +0300
Subject: [PATCH 0775/1718] add action group for submit invoice

---
 .../Test/AdminDashboardWithChartsTest.xml     |  2 +-
 ...tedProductToConfigurableOutOfStockTest.xml |  3 +--
 .../ProductsQtyReturnAfterOrderCancelTest.xml |  2 +-
 .../CancelOrdersInOrderSalesReportTest.xml    |  3 +--
 .../AdminInvoiceClickSubmitActionGroup.xml    | 19 +++++++++++++++++++
 ...reateCreditMemoBankTransferPaymentTest.xml |  2 +-
 ...AdminCreateCreditMemoPartialRefundTest.xml |  2 +-
 ...CreateCreditMemoWithCashOnDeliveryTest.xml |  3 ++-
 ...nCreateCreditMemoWithPurchaseOrderTest.xml |  2 +-
 .../Test/Mftf/Test/AdminCreateInvoiceTest.xml |  3 +--
 .../CreateInvoiceAndCheckInvoiceOrderTest.xml |  2 +-
 ...iceWithCashOnDeliveryPaymentMethodTest.xml |  2 +-
 ...eWithShipmentAndCheckInvoicedOrderTest.xml |  2 +-
 ...ateInvoiceWithZeroSubtotalCheckoutTest.xml |  2 +-
 ...editMemoTotalAfterShippingDiscountTest.xml |  2 +-
 15 files changed, 34 insertions(+), 17 deletions(-)
 create mode 100644 app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceClickSubmitActionGroup.xml

diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml
index 972947656cd3d..b8ea71cbb3cab 100644
--- a/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml
@@ -89,7 +89,7 @@
         <waitForPageLoad stepKey="waitForInvoicePageToLoad"/>
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seeNewInvoiceInPageTitle" after="clickInvoiceButton"/>
         <see selector="{{AdminInvoiceTotalSection.total('Subtotal')}}" userInput="$150.00" stepKey="seeCorrectGrandTotal"/>
-        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
+        <actionGroup ref="AdminInvoiceClickSubmitActionGroup" stepKey="clickSubmitInvoice"/>
         <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessInvoiceMessage"/>
         <!--Create Shipment for the order-->
         <comment userInput="Create Shipment for the order" stepKey="createShipmentForOrder"/>
diff --git a/app/code/Magento/CatalogInventory/Test/Mftf/Test/AssociatedProductToConfigurableOutOfStockTest.xml b/app/code/Magento/CatalogInventory/Test/Mftf/Test/AssociatedProductToConfigurableOutOfStockTest.xml
index 2cdb2413122bd..5dd7ddd3a0b3a 100644
--- a/app/code/Magento/CatalogInventory/Test/Mftf/Test/AssociatedProductToConfigurableOutOfStockTest.xml
+++ b/app/code/Magento/CatalogInventory/Test/Mftf/Test/AssociatedProductToConfigurableOutOfStockTest.xml
@@ -128,8 +128,7 @@
         <actionGroup ref="AdminOrderGridClickFirstRowActionGroup" stepKey="clickOrderRow"/>
         <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoice"/>
         <waitForPageLoad stepKey="waitForNewInvoicePageToLoad"/>
-        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-        <waitForPageLoad stepKey="waitForNewInvoiceToBeCreated"/>
+        <actionGroup ref="AdminInvoiceClickSubmitActionGroup" stepKey="clickSubmitInvoice"/>
         <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage"/>
         <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShip"/>
         <waitForLoadingMaskToDisappear stepKey="waitForShipLoadingMask"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml
index a8856288b422a..ec2ae2c946c39 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml
@@ -76,7 +76,7 @@
         <fillField selector="{{AdminInvoiceItemsSection.qtyToInvoiceColumn}}" userInput="1" stepKey="ChangeQtyToInvoice"/>
         <click selector="{{AdminInvoiceItemsSection.updateQty}}" stepKey="updateQuantity"/>
         <waitForPageLoad stepKey="waitPageToBeLoaded"/>
-        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
+        <actionGroup ref="AdminInvoiceClickSubmitActionGroup" stepKey="clickSubmitInvoice"/>
         <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction"/>
         <waitForPageLoad stepKey="waitOrderDetailToLoad"/>
         <fillField selector="{{AdminShipmentItemsSection.itemQtyToShip('1')}}" userInput="1" stepKey="changeItemQtyToShip"/>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml
index e572febec5a5c..3e79eb044b5cb 100644
--- a/app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml
+++ b/app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml
@@ -49,8 +49,7 @@
 
         <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceAction"/>
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Invoice" stepKey="seePageNameNewInvoicePage"/>
-        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-
+        <actionGroup ref="AdminInvoiceClickSubmitActionGroup" stepKey="clickSubmitInvoice"/>
         <click selector="{{AdminOrderDetailsMainActionsSection.ship}}" stepKey="clickShipAction"/>
         <seeInCurrentUrl url="{{AdminShipmentNewPage.url}}" stepKey="seeOrderShipmentUrl"/>
         <click selector="{{AdminShipmentMainActionsSection.submitShipment}}" stepKey="clickSubmitShipment"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceClickSubmitActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceClickSubmitActionGroup.xml
new file mode 100644
index 0000000000000..69d042591c198
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceClickSubmitActionGroup.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="AdminInvoiceClickSubmitActionGroup">
+        <annotations>
+            <description>Click submit invoice button for creating invoice.</description>
+        </annotations>
+
+        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
+        <waitForPageLoad stepKey="waitForInvoiceToBeCreated"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoBankTransferPaymentTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoBankTransferPaymentTest.xml
index 2935a56a6c0a1..c4656e394d349 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoBankTransferPaymentTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoBankTransferPaymentTest.xml
@@ -63,7 +63,7 @@
 
         <!-- Create Invoice -->
         <actionGroup ref="StartCreateInvoiceFromOrderPageActionGroup" stepKey="startInvoice"/>
-        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
+        <actionGroup ref="AdminInvoiceClickSubmitActionGroup" stepKey="clickSubmitInvoice"/>
         <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForMessageAppears"/>
         <see selector="{{AdminMessagesSection.success}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
 
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundTest.xml
index d9ae276de31a0..eb3d4ad991915 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoPartialRefundTest.xml
@@ -58,7 +58,7 @@
 
         <!-- Create Invoice -->
         <actionGroup ref="StartCreateInvoiceFromOrderPageActionGroup" stepKey="startInvoice"/>
-        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
+        <actionGroup ref="AdminInvoiceClickSubmitActionGroup" stepKey="clickSubmitInvoice"/>
         <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForMessageAppears"/>
         <see selector="{{AdminMessagesSection.success}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
 
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithCashOnDeliveryTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithCashOnDeliveryTest.xml
index d888e6841e34d..4383820ba6bee 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithCashOnDeliveryTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithCashOnDeliveryTest.xml
@@ -64,7 +64,8 @@
 
         <!-- Create Invoice -->
         <actionGroup ref="StartCreateInvoiceFromOrderPageActionGroup" stepKey="startInvoice"/>
-        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
+        <actionGroup ref="AdminInvoiceClickSubmitActionGroup" stepKey="clickSubmitInvoice"/>
+
         <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForMessageAppears"/>
         <see selector="{{AdminMessagesSection.success}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
 
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithPurchaseOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithPurchaseOrderTest.xml
index 7974d594eb99c..7818a1f3d9345 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithPurchaseOrderTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithPurchaseOrderTest.xml
@@ -67,7 +67,7 @@
 
         <!-- Create Invoice -->
         <actionGroup ref="StartCreateInvoiceFromOrderPageActionGroup" stepKey="startInvoice"/>
-        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
+        <actionGroup ref="AdminInvoiceClickSubmitActionGroup" stepKey="clickSubmitInvoice"/>
         <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForMessageAppears"/>
         <see selector="{{AdminMessagesSection.success}}" userInput="The invoice has been created." stepKey="seeInvoiceCreateSuccess"/>
 
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
index eea948d902282..07a5dfc95f918 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
@@ -71,8 +71,7 @@
         <actionGroup ref="AdminOrderGridClickFirstRowActionGroup" stepKey="clickOrderRow"/>
         <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoice"/>
         <waitForPageLoad stepKey="waitForNewInvoicePageToLoad"/>
-        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
-        <waitForPageLoad stepKey="waitForInvoiceToBeCreated"/>
+        <actionGroup ref="AdminInvoiceClickSubmitActionGroup" stepKey="clickSubmitInvoice"/>
         <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage"/>
         <click selector="{{AdminOrderDetailsOrderViewSection.invoices}}" stepKey="clickInvoices"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask5" />
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceAndCheckInvoiceOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceAndCheckInvoiceOrderTest.xml
index d8a3db76da05e..a5f256469a156 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceAndCheckInvoiceOrderTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceAndCheckInvoiceOrderTest.xml
@@ -89,7 +89,7 @@
         <fillField selector="{{AdminOrderInvoiceViewSection.invoiceQty}}" userInput="1" stepKey="fillInvoiceQuantity"/>
         <click selector="{{AdminOrderInvoiceViewSection.updateInvoiceBtn}}" stepKey="clickUpdateQtyInvoiceBtn"/>
         <fillField selector="{{AdminInvoiceTotalSection.invoiceComment}}" userInput="comment" stepKey="writeComment"/>
-        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
+        <actionGroup ref="AdminInvoiceClickSubmitActionGroup" stepKey="clickSubmitInvoice"/>
 
         <!-- Assert invoice with shipment success message -->
         <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithCashOnDeliveryPaymentMethodTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithCashOnDeliveryPaymentMethodTest.xml
index c58b95a41b157..86dcae98fd11e 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithCashOnDeliveryPaymentMethodTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithCashOnDeliveryPaymentMethodTest.xml
@@ -89,7 +89,7 @@
         <fillField selector="{{AdminOrderInvoiceViewSection.invoiceQty}}" userInput="1" stepKey="fillInvoiceQuantity"/>
         <click selector="{{AdminOrderInvoiceViewSection.updateInvoiceBtn}}" stepKey="clickUpdateQtyInvoiceBtn"/>
         <fillField selector="{{AdminInvoiceTotalSection.invoiceComment}}" userInput="comment" stepKey="writeComment"/>
-        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
+        <actionGroup ref="AdminInvoiceClickSubmitActionGroup" stepKey="clickSubmitInvoice"/>
 
         <!-- Assert invoice with shipment success message -->
         <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithShipmentAndCheckInvoicedOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithShipmentAndCheckInvoicedOrderTest.xml
index 1c92c2dae3712..caa7f16808860 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithShipmentAndCheckInvoicedOrderTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithShipmentAndCheckInvoicedOrderTest.xml
@@ -82,7 +82,7 @@
         <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceAction"/>
         <click selector="{{AdminInvoicePaymentShippingSection.CreateShipment}}" stepKey="createShipment"/>
         <fillField selector="{{AdminInvoiceTotalSection.invoiceComment}}" userInput="comment" stepKey="writeComment"/>
-        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
+        <actionGroup ref="AdminInvoiceClickSubmitActionGroup" stepKey="clickSubmitInvoice"/>
 
         <!-- Assert invoice with shipment success message -->
         <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the invoice and shipment." stepKey="seeSuccessMessage"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithZeroSubtotalCheckoutTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithZeroSubtotalCheckoutTest.xml
index b562073a1276f..1465904b1637a 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithZeroSubtotalCheckoutTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithZeroSubtotalCheckoutTest.xml
@@ -96,7 +96,7 @@
         <!-- Go to invoice tab and fill data -->
         <click selector="{{AdminOrderDetailsMainActionsSection.invoice}}" stepKey="clickInvoiceAction"/>
         <fillField selector="{{AdminInvoiceTotalSection.invoiceComment}}" userInput="comment" stepKey="writeComment"/>
-        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
+        <actionGroup ref="AdminInvoiceClickSubmitActionGroup" stepKey="clickSubmitInvoice"/>
 
         <!-- Assert invoice with shipment success message -->
         <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml
index bd76f5c10b488..32832a4d00083 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml
@@ -129,7 +129,7 @@
         <see selector="{{AdminInvoiceTotalSection.grandTotal}}" userInput="$113.00" stepKey="seeCorrectGrandTotal"/>
         <grabTextFrom selector="{{AdminInvoiceTotalSection.grandTotal}}" stepKey="grabInvoiceGrandTotal" after="seeCorrectGrandTotal"/>
 
-        <click selector="{{AdminInvoiceMainActionsSection.submitInvoice}}" stepKey="clickSubmitInvoice"/>
+        <actionGroup ref="AdminInvoiceClickSubmitActionGroup" stepKey="clickSubmitInvoice"/>
         <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="The invoice has been created." stepKey="seeSuccessMessage1"/>
         <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Processing" stepKey="seeOrderProcessing"/>
 

From c9cc512e13c0c47d984b2fa5d729114ccd646c55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Tylek?= <pawel.tylek@creativestyle.pl>
Date: Thu, 9 Jul 2020 13:04:08 +0200
Subject: [PATCH 0776/1718] Remove duplicated var customer.name from email
 template

---
 .../Magento/Customer/view/frontend/email/password_reset.html     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Customer/view/frontend/email/password_reset.html b/app/code/Magento/Customer/view/frontend/email/password_reset.html
index a6c54842a1573..e83c484afaec9 100644
--- a/app/code/Magento/Customer/view/frontend/email/password_reset.html
+++ b/app/code/Magento/Customer/view/frontend/email/password_reset.html
@@ -6,7 +6,6 @@
 -->
 <!--@subject {{trans "Your %store_name password has been changed" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var customer.name":"Customer Name",
 "var store.frontend_name":"Store Name",
 "var store_email":"Store Email",
 "var store_phone":"Store Phone",

From 87ce9e786b64dc737466197b640034b2e7de003f Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Thu, 9 Jul 2020 14:45:40 +0300
Subject: [PATCH 0777/1718] covered by test

---
 .../Unit/Plugin/Cms/Model/Store/ViewTest.php  | 179 ++++++++++++++++++
 1 file changed, 179 insertions(+)
 create mode 100644 app/code/Magento/CmsUrlRewrite/Test/Unit/Plugin/Cms/Model/Store/ViewTest.php

diff --git a/app/code/Magento/CmsUrlRewrite/Test/Unit/Plugin/Cms/Model/Store/ViewTest.php b/app/code/Magento/CmsUrlRewrite/Test/Unit/Plugin/Cms/Model/Store/ViewTest.php
new file mode 100644
index 0000000000000..7a0e17015dc3c
--- /dev/null
+++ b/app/code/Magento/CmsUrlRewrite/Test/Unit/Plugin/Cms/Model/Store/ViewTest.php
@@ -0,0 +1,179 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\CmsUrlRewrite\Test\Unit\Plugin\Cms\Model\Store;
+
+use Magento\Cms\Api\Data\PageSearchResultsInterface;
+use Magento\Cms\Api\PageRepositoryInterface;
+use Magento\Cms\Model\Page;
+use Magento\CmsUrlRewrite\Model\CmsPageUrlRewriteGenerator;
+use Magento\CmsUrlRewrite\Plugin\Cms\Model\Store\View;
+use Magento\Framework\Api\SearchCriteria;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Model\AbstractModel;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Model\ResourceModel\Store;
+use Magento\UrlRewrite\Model\UrlPersistInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for \Magento\CmsUrlRewrite\Plugin\Cms\Model\Store\View.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ViewTest extends TestCase
+{
+    private const STUB_STORE_ID = 777;
+    private const STUB_URL_REWRITE = ['cms/page/view'];
+
+    /**
+     * @var View
+     */
+    private $model;
+
+    /**
+     * @var SearchCriteria|MockObject
+     */
+    private $searchCriteriaMock;
+
+    /**
+     * @var PageSearchResultsInterface|MockObject
+     */
+    private $pageSearchResultMock;
+
+    /**
+     * @var Page|MockObject
+     */
+    private $pageMock;
+
+    /**
+     * @var Store|MockObject
+     */
+    private $storeObjectMock;
+
+    /**
+     * @var AbstractModel|MockObject
+     */
+    private $abstractModelMock;
+
+    /**
+     * @var UrlPersistInterface|MockObject
+     */
+    private $urlPersistMock;
+
+    /**
+     * @var PageRepositoryInterface|MockObject
+     */
+    private $pageRepositoryMock;
+
+    /**
+     * @var CmsPageUrlRewriteGenerator|MockObject
+     */
+    private $cmsPageUrlGeneratorMock;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        $objectManager = new ObjectManager($this);
+
+        $this->storeObjectMock = $this->createMock(Store::class);
+        $this->searchCriteriaMock = $this->createMock(SearchCriteria::class);
+        $this->pageSearchResultMock = $this->createMock(PageSearchResultsInterface::class);
+
+        $this->pageMock = $this->getMockBuilder(Page::class)
+            ->disableOriginalConstructor()
+            ->addMethods(['setStoreId'])
+            ->getMock();
+
+        $this->abstractModelMock = $this->getMockBuilder(AbstractModel::class)
+            ->onlyMethods(['isObjectNew', 'getId'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->urlPersistMock = $this->createMock(UrlPersistInterface::class);
+        $this->pageRepositoryMock = $this->createMock(PageRepositoryInterface::class);
+        $this->cmsPageUrlGeneratorMock = $this->createMock(CmsPageUrlRewriteGenerator::class);
+
+        $searchCriteriaBuilderMock = $this->createMock(SearchCriteriaBuilder::class);
+        $searchCriteriaBuilderMock->expects($this->any())
+            ->method('addFilter')
+            ->willReturnSelf();
+        $searchCriteriaBuilderMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->searchCriteriaMock);
+
+        $this->model = $objectManager->getObject(
+            View::class,
+            [
+                'urlPersist' => $this->urlPersistMock,
+                'searchCriteriaBuilder' => $searchCriteriaBuilderMock,
+                'pageRepository' => $this->pageRepositoryMock,
+                'cmsPageUrlRewriteGenerator' => $this->cmsPageUrlGeneratorMock,
+            ]
+        );
+    }
+
+    /**
+     * After save when object is not new
+     *
+     * @return void
+     */
+    public function testAfterSaveObjectIsNotNew(): void
+    {
+        $storeResult = clone $this->storeObjectMock;
+
+        $this->abstractModelMock->expects($this->once())
+            ->method('isObjectNew')
+            ->willReturn(false);
+
+        $this->urlPersistMock->expects($this->never())
+            ->method('replace');
+
+        $result = $this->model->afterSave($this->storeObjectMock, $storeResult, $this->abstractModelMock);
+        $this->assertEquals($storeResult, $result);
+    }
+
+    /**
+     * After save when object is new
+     *
+     * @return void
+     */
+    public function testAfterSaveObjectIsNew(): void
+    {
+        $storeResult = clone $this->storeObjectMock;
+
+        $this->abstractModelMock->expects($this->once())
+            ->method('isObjectNew')
+            ->willReturn(true);
+        $this->abstractModelMock->expects($this->once())
+            ->method('getId')
+            ->willReturn(self::STUB_STORE_ID);
+        $this->pageRepositoryMock->expects($this->once())
+            ->method('getList')
+            ->with($this->searchCriteriaMock)
+            ->willReturn($this->pageSearchResultMock);
+        $this->pageSearchResultMock->expects($this->once())
+            ->method('getItems')
+            ->willReturn([$this->pageMock]);
+        $this->pageMock->expects($this->once())
+            ->method('setStoreId')
+            ->with(self::STUB_STORE_ID);
+        $this->cmsPageUrlGeneratorMock->expects($this->once())
+            ->method('generate')
+            ->with($this->pageMock)
+            ->willReturn(self::STUB_URL_REWRITE);
+        $this->urlPersistMock->expects($this->once())
+            ->method('replace')
+            ->with(self::STUB_URL_REWRITE);
+
+        $result = $this->model->afterSave($this->storeObjectMock, $storeResult, $this->abstractModelMock);
+        $this->assertEquals($storeResult, $result);
+    }
+}

From d127628de669799f24e6f72bf5dff285fc3879a4 Mon Sep 17 00:00:00 2001
From: Marjan Petkovski <petkovski.marjan@gmail.com>
Date: Thu, 9 Jul 2020 14:22:31 +0200
Subject: [PATCH 0778/1718] magento/magento2#28563: GraphQL product search does
 not consider Category Permissions configuration - Pass the context as
 argument

Pass context to configurable variant collection
---
 .../Model/Resolver/ConfigurableVariant.php           |  4 ++--
 .../Model/Variant/Collection.php                     | 12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/ConfigurableVariant.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/ConfigurableVariant.php
index f28bf97adf930..0cb0eddf8a246 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/ConfigurableVariant.php
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/ConfigurableVariant.php
@@ -97,8 +97,8 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         $this->variantCollection->addEavAttributes($fields);
         $this->optionCollection->addProductId((int)$value[$linkField]);
 
-        $result = function () use ($value, $linkField) {
-            $children = $this->variantCollection->getChildProductsByParentId((int)$value[$linkField]);
+        $result = function () use ($value, $linkField, $context) {
+            $children = $this->variantCollection->getChildProductsByParentId((int)$value[$linkField], $context);
             $options = $this->optionCollection->getAttributesByProductId((int)$value[$linkField]);
             $variants = [];
             /** @var Product $child */
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php
index 6c4371b23927e..d9c68a9b25791 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php
@@ -13,6 +13,7 @@
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\CollectionFactory;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\GraphQl\Model\Query\ContextInterface;
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessorInterface;
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionPostProcessor;
 
@@ -118,11 +119,12 @@ public function addEavAttributes(array $attributeCodes) : void
      * Retrieve child products from for passed in parent id.
      *
      * @param int $id
+     * @param ContextInterface $context|null
      * @return array
      */
-    public function getChildProductsByParentId(int $id) : array
+    public function getChildProductsByParentId(int $id, ContextInterface $context = null) : array
     {
-        $childrenMap = $this->fetch();
+        $childrenMap = $this->fetch($context);
 
         if (!isset($childrenMap[$id])) {
             return [];
@@ -134,9 +136,10 @@ public function getChildProductsByParentId(int $id) : array
     /**
      * Fetch all children products from parent id's.
      *
+     * @param ContextInterface $context|null
      * @return array
      */
-    private function fetch() : array
+    private function fetch(ContextInterface $context = null) : array
     {
         if (empty($this->parentProducts) || !empty($this->childrenMap)) {
             return $this->childrenMap;
@@ -150,7 +153,8 @@ private function fetch() : array
             $this->collectionProcessor->process(
                 $childCollection,
                 $this->searchCriteriaBuilder->create(),
-                $attributeData
+                $attributeData,
+                $context
             );
             $childCollection->load();
             $this->collectionPostProcessor->process($childCollection, $attributeData);

From a1cdf38700b9878887b65b1c0d2bce1674bfe6e6 Mon Sep 17 00:00:00 2001
From: Serhii Balko <serhii.balko@transoftgroup.com>
Date: Thu, 9 Jul 2020 15:44:01 +0300
Subject: [PATCH 0779/1718] MC-34649: Uses Per Coupon and Uses Per Customer not
 honored with concurrent orders

---
 .../Model/Coupon/Quote/UpdateCouponUsages.php |  64 ++++++++
 .../Model/Coupon/UpdateCouponUsages.php       | 133 +++-------------
 .../Model/Coupon/Usage/Processor.php          | 149 ++++++++++++++++++
 .../Model/Coupon/Usage/UpdateInfo.php         | 107 +++++++++++++
 ...onDataAfterOrderCustomerAssignObserver.php |   7 +-
 .../Observer/CouponUsagesDecrement.php        |  42 +++++
 .../Plugin/CouponUsagesDecrement.php          |   8 +-
 .../Plugin/CouponUsagesIncrement.php          |  33 ++--
 app/code/Magento/SalesRule/etc/di.xml         |   2 +
 app/code/Magento/SalesRule/etc/events.xml     |   3 +
 .../view/frontend/requirejs-config.js         |   3 +
 .../web/js/model/place-order-mixin.js         |  42 +++++
 .../SalesRule/Plugin/CouponUsagesTest.php     | 102 +++++++++---
 .../SalesRule/_files/coupons_limited.php      |  18 ++-
 .../_files/coupons_limited_order.php          |  21 +--
 .../_files/coupons_limited_order_rollback.php |   2 +-
 16 files changed, 565 insertions(+), 171 deletions(-)
 create mode 100644 app/code/Magento/SalesRule/Model/Coupon/Quote/UpdateCouponUsages.php
 create mode 100644 app/code/Magento/SalesRule/Model/Coupon/Usage/Processor.php
 create mode 100644 app/code/Magento/SalesRule/Model/Coupon/Usage/UpdateInfo.php
 create mode 100644 app/code/Magento/SalesRule/Observer/CouponUsagesDecrement.php
 create mode 100644 app/code/Magento/SalesRule/view/frontend/web/js/model/place-order-mixin.js

diff --git a/app/code/Magento/SalesRule/Model/Coupon/Quote/UpdateCouponUsages.php b/app/code/Magento/SalesRule/Model/Coupon/Quote/UpdateCouponUsages.php
new file mode 100644
index 0000000000000..0ee2ee09cad57
--- /dev/null
+++ b/app/code/Magento/SalesRule/Model/Coupon/Quote/UpdateCouponUsages.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesRule\Model\Coupon\Quote;
+
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\SalesRule\Model\Coupon\Usage\Processor as CouponUsageProcessor;
+use Magento\SalesRule\Model\Coupon\Usage\UpdateInfo;
+use Magento\SalesRule\Model\Coupon\Usage\UpdateInfoFactory;
+
+/**
+ * Updates the coupon usages from quote
+ */
+class UpdateCouponUsages
+{
+    /**
+     * @var CouponUsageProcessor
+     */
+    private $couponUsageProcessor;
+
+    /**
+     * @var UpdateInfoFactory
+     */
+    private $updateInfoFactory;
+
+    /**
+     * @param CouponUsageProcessor $couponUsageProcessor
+     * @param UpdateInfoFactory $updateInfoFactory
+     */
+    public function __construct(
+        CouponUsageProcessor $couponUsageProcessor,
+        UpdateInfoFactory $updateInfoFactory
+    ) {
+        $this->couponUsageProcessor = $couponUsageProcessor;
+        $this->updateInfoFactory = $updateInfoFactory;
+    }
+
+    /**
+     * Executes the current command
+     *
+     * @param CartInterface $quote
+     * @param bool $increment
+     * @return void
+     */
+    public function execute(CartInterface $quote, bool $increment): void
+    {
+        if (!$quote->getAppliedRuleIds()) {
+            return;
+        }
+
+        /** @var UpdateInfo $updateInfo */
+        $updateInfo = $this->updateInfoFactory->create();
+        $updateInfo->setAppliedRuleIds(explode(',', $quote->getAppliedRuleIds()));
+        $updateInfo->setCouponCode((string)$quote->getCouponCode());
+        $updateInfo->setCustomerId((int)$quote->getCustomerId());
+        $updateInfo->setIsIncrement($increment);
+
+        $this->couponUsageProcessor->process($updateInfo);
+    }
+}
diff --git a/app/code/Magento/SalesRule/Model/Coupon/UpdateCouponUsages.php b/app/code/Magento/SalesRule/Model/Coupon/UpdateCouponUsages.php
index 3236c80e1b7ed..1645f205d1e55 100644
--- a/app/code/Magento/SalesRule/Model/Coupon/UpdateCouponUsages.php
+++ b/app/code/Magento/SalesRule/Model/Coupon/UpdateCouponUsages.php
@@ -8,56 +8,39 @@
 namespace Magento\SalesRule\Model\Coupon;
 
 use Magento\Sales\Api\Data\OrderInterface;
-use Magento\SalesRule\Model\Coupon;
-use Magento\SalesRule\Model\ResourceModel\Coupon\Usage;
-use Magento\SalesRule\Model\Rule\CustomerFactory;
-use Magento\SalesRule\Model\RuleFactory;
+use Magento\SalesRule\Model\Coupon\Usage\Processor as CouponUsageProcessor;
+use Magento\SalesRule\Model\Coupon\Usage\UpdateInfo;
+use Magento\SalesRule\Model\Coupon\Usage\UpdateInfoFactory;
 
 /**
- * Updates the coupon usages.
+ * Updates the coupon usages
  */
 class UpdateCouponUsages
 {
     /**
-     * @var RuleFactory
+     * @var CouponUsageProcessor
      */
-    private $ruleFactory;
+    private $couponUsageProcessor;
 
     /**
-     * @var RuleFactory
+     * @var UpdateInfoFactory
      */
-    private $ruleCustomerFactory;
+    private $updateInfoFactory;
 
     /**
-     * @var Coupon
-     */
-    private $coupon;
-
-    /**
-     * @var Usage
-     */
-    private $couponUsage;
-
-    /**
-     * @param RuleFactory $ruleFactory
-     * @param CustomerFactory $ruleCustomerFactory
-     * @param Coupon $coupon
-     * @param Usage $couponUsage
+     * @param CouponUsageProcessor $couponUsageProcessor
+     * @param UpdateInfoFactory $updateInfoFactory
      */
     public function __construct(
-        RuleFactory $ruleFactory,
-        CustomerFactory $ruleCustomerFactory,
-        Coupon $coupon,
-        Usage $couponUsage
+        CouponUsageProcessor $couponUsageProcessor,
+        UpdateInfoFactory $updateInfoFactory
     ) {
-        $this->ruleFactory = $ruleFactory;
-        $this->ruleCustomerFactory = $ruleCustomerFactory;
-        $this->coupon = $coupon;
-        $this->couponUsage = $couponUsage;
+        $this->couponUsageProcessor = $couponUsageProcessor;
+        $this->updateInfoFactory = $updateInfoFactory;
     }
 
     /**
-     * Executes the current command.
+     * Executes the current command
      *
      * @param OrderInterface $subject
      * @param bool $increment
@@ -68,86 +51,16 @@ public function execute(OrderInterface $subject, bool $increment): OrderInterfac
         if (!$subject || !$subject->getAppliedRuleIds()) {
             return $subject;
         }
-        // lookup rule ids
-        $ruleIds = explode(',', $subject->getAppliedRuleIds());
-        $ruleIds = array_unique($ruleIds);
-        $customerId = (int)$subject->getCustomerId();
-        // use each rule (and apply to customer, if applicable)
-        foreach ($ruleIds as $ruleId) {
-            if (!$ruleId) {
-                continue;
-            }
-            $this->updateRuleUsages($increment, (int)$ruleId, $customerId);
-        }
-        $this->updateCouponUsages($subject, $increment, $customerId);
-
-        return $subject;
-    }
 
-    /**
-     * Update the number of rule usages.
-     *
-     * @param bool $increment
-     * @param int $ruleId
-     * @param int $customerId
-     */
-    private function updateRuleUsages(bool $increment, int $ruleId, int $customerId)
-    {
-        /** @var \Magento\SalesRule\Model\Rule $rule */
-        $rule = $this->ruleFactory->create();
-        $rule->load($ruleId);
-        if ($rule->getId()) {
-            $rule->loadCouponCode();
-            if ($increment || $rule->getTimesUsed() > 0) {
-                $rule->setTimesUsed($rule->getTimesUsed() + ($increment ? 1 : -1));
-                $rule->save();
-            }
-            if ($customerId) {
-                $this->updateCustomerRuleUsages($increment, $ruleId, $customerId);
-            }
-        }
-    }
+        /** @var UpdateInfo $updateInfo */
+        $updateInfo = $this->updateInfoFactory->create();
+        $updateInfo->setAppliedRuleIds(explode(',', $subject->getAppliedRuleIds()));
+        $updateInfo->setCouponCode((string)$subject->getCouponCode());
+        $updateInfo->setCustomerId((int)$subject->getCustomerId());
+        $updateInfo->setIsIncrement($increment);
 
-    /**
-     * Update the number of rule usages per customer.
-     *
-     * @param bool $increment
-     * @param int $ruleId
-     * @param int $customerId
-     */
-    private function updateCustomerRuleUsages(bool $increment, int $ruleId, int $customerId): void
-    {
-        /** @var \Magento\SalesRule\Model\Rule\Customer $ruleCustomer */
-        $ruleCustomer = $this->ruleCustomerFactory->create();
-        $ruleCustomer->loadByCustomerRule($customerId, $ruleId);
-        if ($ruleCustomer->getId()) {
-            if ($increment || $ruleCustomer->getTimesUsed() > 0) {
-                $ruleCustomer->setTimesUsed($ruleCustomer->getTimesUsed() + ($increment ? 1 : -1));
-            }
-        } elseif ($increment) {
-            $ruleCustomer->setCustomerId($customerId)->setRuleId($ruleId)->setTimesUsed(1);
-        }
-        $ruleCustomer->save();
-    }
+        $this->couponUsageProcessor->process($updateInfo);
 
-    /**
-     * Update the number of coupon usages.
-     *
-     * @param OrderInterface $subject
-     * @param bool $increment
-     * @param int $customerId
-     */
-    private function updateCouponUsages(OrderInterface $subject, bool $increment, int $customerId): void
-    {
-        $this->coupon->load($subject->getCouponCode(), 'code');
-        if ($this->coupon->getId()) {
-            if ($increment || $this->coupon->getTimesUsed() > 0) {
-                $this->coupon->setTimesUsed($this->coupon->getTimesUsed() + ($increment ? 1 : -1));
-                $this->coupon->save();
-            }
-            if ($customerId) {
-                $this->couponUsage->updateCustomerCouponTimesUsed($customerId, $this->coupon->getId(), $increment);
-            }
-        }
+        return $subject;
     }
 }
diff --git a/app/code/Magento/SalesRule/Model/Coupon/Usage/Processor.php b/app/code/Magento/SalesRule/Model/Coupon/Usage/Processor.php
new file mode 100644
index 0000000000000..90a456d5ff833
--- /dev/null
+++ b/app/code/Magento/SalesRule/Model/Coupon/Usage/Processor.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesRule\Model\Coupon\Usage;
+
+use Magento\SalesRule\Model\Coupon;
+use Magento\SalesRule\Model\ResourceModel\Coupon\Usage;
+use Magento\SalesRule\Model\Rule\CustomerFactory;
+use Magento\SalesRule\Model\RuleFactory;
+
+/**
+ * Processor to update coupon usage
+ */
+class Processor
+{
+    /**
+     * @var RuleFactory
+     */
+    private $ruleFactory;
+
+    /**
+     * @var RuleFactory
+     */
+    private $ruleCustomerFactory;
+
+    /**
+     * @var Coupon
+     */
+    private $coupon;
+
+    /**
+     * @var Usage
+     */
+    private $couponUsage;
+
+    /**
+     * @param RuleFactory $ruleFactory
+     * @param CustomerFactory $ruleCustomerFactory
+     * @param Coupon $coupon
+     * @param Usage $couponUsage
+     */
+    public function __construct(
+        RuleFactory $ruleFactory,
+        CustomerFactory $ruleCustomerFactory,
+        Coupon $coupon,
+        Usage $couponUsage
+    ) {
+        $this->ruleFactory = $ruleFactory;
+        $this->ruleCustomerFactory = $ruleCustomerFactory;
+        $this->coupon = $coupon;
+        $this->couponUsage = $couponUsage;
+    }
+
+    /**
+     * Update coupon usage
+     *
+     * @param UpdateInfo $updateInfo
+     */
+    public function process(UpdateInfo $updateInfo): void
+    {
+        if (empty($updateInfo->getAppliedRuleIds())) {
+            return;
+        }
+
+        if (!empty($updateInfo->getCouponCode())) {
+            $this->updateCouponUsages($updateInfo);
+        }
+        $isIncrement = $updateInfo->isIncrement();
+        $customerId = $updateInfo->getCustomerId();
+        // use each rule (and apply to customer, if applicable)
+        foreach (array_unique($updateInfo->getAppliedRuleIds()) as $ruleId) {
+            if (!(int)$ruleId) {
+                continue;
+            }
+            $this->updateRuleUsages($isIncrement, (int)$ruleId);
+            if ($customerId) {
+                $this->updateCustomerRuleUsages($isIncrement, (int)$ruleId, $customerId);
+            }
+        }
+    }
+
+    /**
+     * Update the number of coupon usages
+     *
+     * @param UpdateInfo $updateInfo
+     */
+    private function updateCouponUsages(UpdateInfo $updateInfo): void
+    {
+        $isIncrement = $updateInfo->isIncrement();
+        $this->coupon->load($updateInfo->getCouponCode(), 'code');
+        if ($this->coupon->getId()) {
+            if ($updateInfo->isIncrement() || $this->coupon->getTimesUsed() > 0) {
+                $this->coupon->setTimesUsed($this->coupon->getTimesUsed() + ($isIncrement ? 1 : -1));
+                $this->coupon->save();
+            }
+            if ($updateInfo->getCustomerId()) {
+                $this->couponUsage->updateCustomerCouponTimesUsed(
+                    $updateInfo->getCustomerId(),
+                    $this->coupon->getId(),
+                    $isIncrement
+                );
+            }
+        }
+    }
+
+    /**
+     * Update the number of rule usages
+     *
+     * @param bool $isIncrement
+     * @param int $ruleId
+     */
+    private function updateRuleUsages(bool $isIncrement, int $ruleId): void
+    {
+        $rule = $this->ruleFactory->create();
+        $rule->load($ruleId);
+        if ($rule->getId()) {
+            $rule->loadCouponCode();
+            if ($isIncrement || $rule->getTimesUsed() > 0) {
+                $rule->setTimesUsed($rule->getTimesUsed() + ($isIncrement ? 1 : -1));
+                $rule->save();
+            }
+        }
+    }
+
+    /**
+     * Update the number of rule usages per customer
+     *
+     * @param bool $isIncrement
+     * @param int $ruleId
+     * @param int $customerId
+     */
+    private function updateCustomerRuleUsages(bool $isIncrement, int $ruleId, int $customerId): void
+    {
+        $ruleCustomer = $this->ruleCustomerFactory->create();
+        $ruleCustomer->loadByCustomerRule($customerId, $ruleId);
+        if ($ruleCustomer->getId()) {
+            if ($isIncrement || $ruleCustomer->getTimesUsed() > 0) {
+                $ruleCustomer->setTimesUsed($ruleCustomer->getTimesUsed() + ($isIncrement ? 1 : -1));
+            }
+        } elseif ($isIncrement) {
+            $ruleCustomer->setCustomerId($customerId)->setRuleId($ruleId)->setTimesUsed(1);
+        }
+        $ruleCustomer->save();
+    }
+}
diff --git a/app/code/Magento/SalesRule/Model/Coupon/Usage/UpdateInfo.php b/app/code/Magento/SalesRule/Model/Coupon/Usage/UpdateInfo.php
new file mode 100644
index 0000000000000..328093ca1af0e
--- /dev/null
+++ b/app/code/Magento/SalesRule/Model/Coupon/Usage/UpdateInfo.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesRule\Model\Coupon\Usage;
+
+use Magento\Framework\DataObject;
+
+/**
+ * Coupon usages info to update
+ */
+class UpdateInfo extends DataObject
+{
+    private const APPLIED_RULE_IDS_KEY = 'applied_rule_ids';
+    private const COUPON_CODE_KEY = 'coupon_code';
+    private const CUSTOMER_ID_KEY = 'customer_id';
+    private const IS_INCREMENT_KEY = 'is_increment';
+
+    /**
+     * Get applied rule ids
+     *
+     * @return array
+     */
+    public function getAppliedRuleIds(): array
+    {
+        return (array)$this->getData(self::APPLIED_RULE_IDS_KEY);
+    }
+
+    /**
+     * Set applied rule ids
+     *
+     * @param array $value
+     * @return void
+     */
+    public function setAppliedRuleIds(array $value): void
+    {
+        $this->setData(self::APPLIED_RULE_IDS_KEY, $value);
+    }
+
+    /**
+     * Get coupon code
+     *
+     * @return string
+     */
+    public function getCouponCode(): string
+    {
+        return (string)$this->getData(self::COUPON_CODE_KEY);
+    }
+
+    /**
+     * Set coupon code
+     *
+     * @param string $value
+     * @return void
+     */
+    public function setCouponCode(string $value): void
+    {
+        $this->setData(self::COUPON_CODE_KEY, $value);
+    }
+
+    /**
+     * Get customer id
+     *
+     * @return int|null
+     */
+    public function getCustomerId(): ?int
+    {
+        return $this->getData(self::CUSTOMER_ID_KEY) !== null
+            ? (int) $this->getData(self::CUSTOMER_ID_KEY)
+            : null;
+    }
+
+    /**
+     * Set customer id
+     *
+     * @param int|null $value
+     * @return void
+     */
+    public function setCustomerId(?int $value): void
+    {
+        $this->setData(self::CUSTOMER_ID_KEY, $value);
+    }
+
+    /**
+     * Get update mode: increment - true, decrement - false
+     *
+     * @return bool
+     */
+    public function isIncrement(): bool
+    {
+        return (bool)$this->getData(self::IS_INCREMENT_KEY);
+    }
+
+    /**
+     * Set update mode: increment - true, decrement - false
+     *
+     * @param bool $value
+     * @return void
+     */
+    public function setIsIncrement(bool $value): void
+    {
+        $this->setData(self::IS_INCREMENT_KEY, $value);
+    }
+}
diff --git a/app/code/Magento/SalesRule/Observer/AssignCouponDataAfterOrderCustomerAssignObserver.php b/app/code/Magento/SalesRule/Observer/AssignCouponDataAfterOrderCustomerAssignObserver.php
index 2d771e4560fcf..1d416fbcf4f52 100644
--- a/app/code/Magento/SalesRule/Observer/AssignCouponDataAfterOrderCustomerAssignObserver.php
+++ b/app/code/Magento/SalesRule/Observer/AssignCouponDataAfterOrderCustomerAssignObserver.php
@@ -45,9 +45,10 @@ public function execute(Observer $observer)
         $event = $observer->getEvent();
         /** @var OrderInterface $order */
         $order = $event->getData(self::EVENT_KEY_ORDER);
-
-        if ($order->getCustomerId()) {
-            $this->updateCouponUsages->execute($order, true);
+        if (!$order->getCustomerId()) {
+            return;
         }
+
+        $this->updateCouponUsages->execute($order, true);
     }
 }
diff --git a/app/code/Magento/SalesRule/Observer/CouponUsagesDecrement.php b/app/code/Magento/SalesRule/Observer/CouponUsagesDecrement.php
new file mode 100644
index 0000000000000..d0c7199405879
--- /dev/null
+++ b/app/code/Magento/SalesRule/Observer/CouponUsagesDecrement.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesRule\Observer;
+
+use Magento\Framework\Event\Observer as EventObserver;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\SalesRule\Model\Coupon\Quote\UpdateCouponUsages;
+
+/**
+ * Decrement number of coupon usages after error of placing order
+ */
+class CouponUsagesDecrement implements ObserverInterface
+{
+    /**
+     * @var UpdateCouponUsages
+     */
+    private $updateCouponUsages;
+
+    /**
+     * @param UpdateCouponUsages $updateCouponUsages
+     */
+    public function __construct(UpdateCouponUsages $updateCouponUsages)
+    {
+        $this->updateCouponUsages = $updateCouponUsages;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(EventObserver $observer)
+    {
+        /** @var CartInterface $quote */
+        $quote = $observer->getQuote();
+        $this->updateCouponUsages->execute($quote, false);
+    }
+}
diff --git a/app/code/Magento/SalesRule/Plugin/CouponUsagesDecrement.php b/app/code/Magento/SalesRule/Plugin/CouponUsagesDecrement.php
index 87a7c2ed1bd38..3be801a288479 100644
--- a/app/code/Magento/SalesRule/Plugin/CouponUsagesDecrement.php
+++ b/app/code/Magento/SalesRule/Plugin/CouponUsagesDecrement.php
@@ -49,11 +49,13 @@ public function __construct(
      */
     public function afterCancel(OrderService $subject, bool $result, $orderId): bool
     {
-        $order = $this->orderRepository->get($orderId);
-        if ($result) {
-            $this->updateCouponUsages->execute($order, false);
+        if (!$result) {
+            return $result;
         }
 
+        $order = $this->orderRepository->get($orderId);
+        $this->updateCouponUsages->execute($order, false);
+
         return $result;
     }
 }
diff --git a/app/code/Magento/SalesRule/Plugin/CouponUsagesIncrement.php b/app/code/Magento/SalesRule/Plugin/CouponUsagesIncrement.php
index 14bbb5fce02a5..66a32f37eee2f 100644
--- a/app/code/Magento/SalesRule/Plugin/CouponUsagesIncrement.php
+++ b/app/code/Magento/SalesRule/Plugin/CouponUsagesIncrement.php
@@ -7,12 +7,13 @@
 
 namespace Magento\SalesRule\Plugin;
 
-use Magento\Sales\Api\Data\OrderInterface;
-use Magento\Sales\Model\Service\OrderService;
-use Magento\SalesRule\Model\Coupon\UpdateCouponUsages;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\QuoteManagement;
+use Magento\SalesRule\Model\Coupon\Quote\UpdateCouponUsages;
 
 /**
- * Increments number of coupon usages after placing order.
+ * Increments number of coupon usages before placing order
  */
 class CouponUsagesIncrement
 {
@@ -24,24 +25,28 @@ class CouponUsagesIncrement
     /**
      * @param UpdateCouponUsages $updateCouponUsages
      */
-    public function __construct(
-        UpdateCouponUsages $updateCouponUsages
-    ) {
+    public function __construct(UpdateCouponUsages $updateCouponUsages)
+    {
         $this->updateCouponUsages = $updateCouponUsages;
     }
 
     /**
-     * Increments number of coupon usages after placing order.
+     * Increments number of coupon usages before placing order
      *
-     * @param OrderService $subject
-     * @param OrderInterface $result
-     * @return OrderInterface
+     * @param QuoteManagement $subject
+     * @param Quote $quote
+     * @param array $orderData
+     * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @throws NoSuchEntityException
      */
-    public function afterPlace(OrderService $subject, OrderInterface $result): OrderInterface
+    public function beforeSubmit(QuoteManagement $subject, Quote $quote, $orderData = [])
     {
-        $this->updateCouponUsages->execute($result, true);
+        /* if coupon code has been canceled then need to notify the customer */
+        if (!$quote->getCouponCode() && $quote->dataHasChangedFor('coupon_code')) {
+            throw new NoSuchEntityException(__("The coupon code isn't valid. Verify the code and try again."));
+        }
 
-        return $result;
+        $this->updateCouponUsages->execute($quote, true);
     }
 }
diff --git a/app/code/Magento/SalesRule/etc/di.xml b/app/code/Magento/SalesRule/etc/di.xml
index c4bc9c3a6decb..05bd801c3b99f 100644
--- a/app/code/Magento/SalesRule/etc/di.xml
+++ b/app/code/Magento/SalesRule/etc/di.xml
@@ -191,6 +191,8 @@
     </type>
     <type name="Magento\Sales\Model\Service\OrderService">
         <plugin name="coupon_uses_decrement_plugin" type="Magento\SalesRule\Plugin\CouponUsagesDecrement" />
+    </type>
+    <type name="\Magento\Quote\Model\QuoteManagement">
         <plugin name="coupon_uses_increment_plugin" type="Magento\SalesRule\Plugin\CouponUsagesIncrement" sortOrder="20"/>
     </type>
     <preference
diff --git a/app/code/Magento/SalesRule/etc/events.xml b/app/code/Magento/SalesRule/etc/events.xml
index c55c37de71aac..0c8335b0a6716 100644
--- a/app/code/Magento/SalesRule/etc/events.xml
+++ b/app/code/Magento/SalesRule/etc/events.xml
@@ -39,4 +39,7 @@
     <event name="sales_quote_collect_totals_before">
         <observer name="salesrule_sales_quote_collect_totals_before" instance="\Magento\SalesRule\Observer\QuoteResetAppliedRulesObserver" />
     </event>
+    <event name="sales_model_service_quote_submit_failure">
+        <observer name="sales_rule_decrement_coupon_usage_quote_submit_failure" instance="\Magento\SalesRule\Observer\CouponUsagesDecrement" />
+    </event>
 </config>
diff --git a/app/code/Magento/SalesRule/view/frontend/requirejs-config.js b/app/code/Magento/SalesRule/view/frontend/requirejs-config.js
index 21f49fb3080fc..484020a573f07 100644
--- a/app/code/Magento/SalesRule/view/frontend/requirejs-config.js
+++ b/app/code/Magento/SalesRule/view/frontend/requirejs-config.js
@@ -11,6 +11,9 @@ var config = {
             },
             'Magento_Checkout/js/model/shipping-save-processor': {
                 'Magento_SalesRule/js/model/shipping-save-processor-mixin': true
+            },
+            'Magento_Checkout/js/action/place-order': {
+                'Magento_SalesRule/js/model/place-order-mixin': true
             }
         }
     }
diff --git a/app/code/Magento/SalesRule/view/frontend/web/js/model/place-order-mixin.js b/app/code/Magento/SalesRule/view/frontend/web/js/model/place-order-mixin.js
new file mode 100644
index 0000000000000..da4de3fa19c5e
--- /dev/null
+++ b/app/code/Magento/SalesRule/view/frontend/web/js/model/place-order-mixin.js
@@ -0,0 +1,42 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'jquery',
+    'mage/utils/wrapper',
+    'Magento_Checkout/js/model/quote',
+    'Magento_SalesRule/js/model/coupon',
+    'Magento_Checkout/js/action/get-totals'
+], function ($, wrapper, quote, coupon, getTotalsAction) {
+    'use strict';
+
+    return function (placeOrderAction) {
+        return wrapper.wrap(placeOrderAction, function (originalAction, paymentData, messageContainer) {
+            var result;
+
+            $.when(
+                result = originalAction(paymentData, messageContainer)
+            ).fail(
+                function () {
+                    var deferred = $.Deferred(),
+
+                        /**
+                         * Update coupon form
+                         */
+                        updateCouponCallback = function () {
+                            if (quote.totals() && !quote.totals()['coupon_code']) {
+                                coupon.setCouponCode('');
+                                coupon.setIsApplied(false);
+                            }
+                        };
+
+                    getTotalsAction([], deferred);
+                    $.when(deferred).done(updateCouponCallback);
+                }
+            );
+
+            return result;
+        });
+    };
+});
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/Plugin/CouponUsagesTest.php b/dev/tests/integration/testsuite/Magento/SalesRule/Plugin/CouponUsagesTest.php
index f9a8b96ab1f2f..4ed096fa4418a 100644
--- a/dev/tests/integration/testsuite/Magento/SalesRule/Plugin/CouponUsagesTest.php
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/Plugin/CouponUsagesTest.php
@@ -3,35 +3,34 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\SalesRule\Plugin;
 
 use Magento\Framework\DataObject;
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Sales\Model\Order;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\QuoteManagement;
+use Magento\Sales\Api\OrderManagementInterface;
 use Magento\Sales\Model\Service\OrderService;
 use Magento\SalesRule\Model\Coupon;
 use Magento\SalesRule\Model\ResourceModel\Coupon\Usage;
 use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
 /**
- * Test increasing coupon usages after after order placing and decreasing after order cancellation.
+ * Test increasing coupon usages after order placing and decreasing after order cancellation.
  *
+ * @magentoAppArea frontend
  * @magentoDbIsolation enabled
  * @magentoAppIsolation enabled
  */
-class CouponUsagesTest extends \PHPUnit\Framework\TestCase
+class CouponUsagesTest extends TestCase
 {
     /**
      * @var ObjectManagerInterface
      */
     private $objectManager;
 
-    /**
-     * @var Coupon
-     */
-    private $coupon;
-
     /**
      * @var Usage
      */
@@ -43,9 +42,9 @@ class CouponUsagesTest extends \PHPUnit\Framework\TestCase
     private $couponUsage;
 
     /**
-     * @var Order
+     * @var QuoteManagement
      */
-    private $order;
+    private $quoteManagement;
 
     /**
      * @var OrderService
@@ -58,36 +57,38 @@ class CouponUsagesTest extends \PHPUnit\Framework\TestCase
     protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
-        $this->coupon = $this->objectManager->get(Coupon::class);
         $this->usage = $this->objectManager->get(Usage::class);
         $this->couponUsage = $this->objectManager->get(DataObject::class);
-        $this->order = $this->objectManager->get(Order::class);
+        $this->quoteManagement = $this->objectManager->get(QuoteManagement::class);
         $this->orderService = $this->objectManager->get(OrderService::class);
     }
 
     /**
      * Test increasing coupon usages after after order placing and decreasing after order cancellation.
      *
-     * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/SalesRule/_files/coupons_limited_order.php
      */
-    public function testOrderCancellation()
+    public function testSubmitQuoteAndCancelOrder()
     {
         $customerId = 1;
         $couponCode = 'one_usage';
-        $orderId = '100000001';
+        $reservedOrderId = 'test01';
 
-        $this->coupon->loadByCode($couponCode);
-        $this->order->loadByIncrementId($orderId);
+        /** @var Coupon $coupon */
+        $coupon = $this->objectManager->get(Coupon::class);
+        $coupon->loadByCode($couponCode);
+        /** @var Quote $quote */
+        $quote = $this->objectManager->get(Quote::class);
+        $quote->load($reservedOrderId, 'reserved_order_id');
 
         // Make sure coupon usages value is incremented then order is placed.
-        $this->orderService->place($this->order);
-        $this->usage->loadByCustomerCoupon($this->couponUsage, $customerId, $this->coupon->getId());
-        $this->coupon->loadByCode($couponCode);
+        $order = $this->quoteManagement->submit($quote);
+        $this->usage->loadByCustomerCoupon($this->couponUsage, $customerId, $coupon->getId());
+        $coupon->loadByCode($couponCode);
 
         self::assertEquals(
             1,
-            $this->coupon->getTimesUsed()
+            $coupon->getTimesUsed()
         );
         self::assertEquals(
             1,
@@ -95,17 +96,66 @@ public function testOrderCancellation()
         );
 
         // Make sure order coupon usages value is decremented then order is cancelled.
-        $this->orderService->cancel($this->order->getId());
-        $this->usage->loadByCustomerCoupon($this->couponUsage, $customerId, $this->coupon->getId());
-        $this->coupon->loadByCode($couponCode);
+        $this->orderService->cancel($order->getId());
+        $this->usage->loadByCustomerCoupon($this->couponUsage, $customerId, $coupon->getId());
+        $coupon->loadByCode($couponCode);
 
         self::assertEquals(
             0,
-            $this->coupon->getTimesUsed()
+            $coupon->getTimesUsed()
         );
         self::assertEquals(
             0,
             $this->couponUsage->getTimesUsed()
         );
     }
+
+    /**
+     * Test to decrement coupon usages after exception on order placing
+     *
+     * @magentoDataFixture Magento/SalesRule/_files/coupons_limited_order.php
+     */
+    public function testSubmitQuoteWithError()
+    {
+        $customerId = 1;
+        $couponCode = 'one_usage';
+        $reservedOrderId = 'test01';
+        $exceptionMessage = 'Some test exception';
+
+        /** @var Coupon $coupon */
+        $coupon = $this->objectManager->get(Coupon::class);
+        $coupon->loadByCode($couponCode);
+        /** @var Quote $quote */
+        $quote = $this->objectManager->get(Quote::class);
+        $quote->load($reservedOrderId, 'reserved_order_id');
+
+        /** @var OrderManagementInterface|MockObject $orderManagement */
+        $orderManagement = $this->createMock(OrderManagementInterface::class);
+        $orderManagement->expects($this->once())
+            ->method('place')
+            ->willThrowException(new \Exception($exceptionMessage));
+
+        /** @var QuoteManagement $quoteManagement */
+        $quoteManagement = $this->objectManager->create(
+            QuoteManagement::class,
+            ['orderManagement' => $orderManagement]
+        );
+
+        try {
+            $quoteManagement->submit($quote);
+        } catch (\Exception $exception) {
+            $this->assertEquals($exceptionMessage, $exception->getMessage());
+
+            $this->usage->loadByCustomerCoupon($this->couponUsage, $customerId, $coupon->getId());
+            $coupon->loadByCode($couponCode);
+            self::assertEquals(
+                0,
+                $coupon->getTimesUsed()
+            );
+            self::assertEquals(
+                0,
+                $this->couponUsage->getTimesUsed()
+            );
+        }
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_limited.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_limited.php
index ee477318f52b8..164f8c0d5b7c2 100644
--- a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_limited.php
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_limited.php
@@ -3,26 +3,34 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 use Magento\SalesRule\Model\Coupon;
+use Magento\SalesRule\Model\ResourceModel\Rule\Collection;
+use Magento\SalesRule\Model\Rule;
+use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
 Resolver::getInstance()->requireDataFixture('Magento/SalesRule/_files/rules.php');
 
-$collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-    \Magento\SalesRule\Model\ResourceModel\Rule\Collection::class
+$collection = Bootstrap::getObjectManager()->create(
+    Collection::class
 );
 $items = array_values($collection->getItems());
+/** @var Rule $rule */
+foreach ($items as $rule) {
+    $rule->setSimpleAction('by_percent')
+        ->setDiscountAmount(10)
+        ->save();
+}
 
 /** @var Coupon $coupon */
-$coupon = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(Coupon::class);
+$coupon = Bootstrap::getObjectManager()->create(Coupon::class);
 $coupon->setRuleId($items[0]->getId())
     ->setCode('one_usage')
     ->setType(0)
     ->setUsageLimit(1)
     ->save();
 
-$coupon = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(Coupon::class);
+$coupon = Bootstrap::getObjectManager()->create(Coupon::class);
 $coupon->setRuleId($items[1]->getId())
     ->setCode('one_usage_per_customer')
     ->setType(0)
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_limited_order.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_limited_order.php
index 79ee6ffb91f14..83f17ef0d9d46 100644
--- a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_limited_order.php
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_limited_order.php
@@ -3,25 +3,28 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-use Magento\Sales\Model\Order;
+use Magento\Quote\Model\Quote;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
 Resolver::getInstance()->requireDataFixture('Magento/SalesRule/_files/coupons_limited.php');
-Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/order.php');
+Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/quote_with_customer.php');
 
 $collection = Bootstrap::getObjectManager()->create(
     \Magento\SalesRule\Model\ResourceModel\Rule\Collection::class
 );
 $items = array_values($collection->getItems());
 
-/** @var Order $order */
-$order = Bootstrap::getObjectManager()->create(Order::class);
+/** @var Quote $quote */
+$quote = Bootstrap::getObjectManager()->create(Quote::class);
+$quote->load('test01', 'reserved_order_id');
+$quote->getShippingAddress()
+    ->setShippingMethod('flatrate_flatrate')
+    ->setShippingDescription('Flat Rate - Fixed')
+    ->setCollectShippingRates(true)
+    ->collectShippingRates()
+    ->save();
 
-$order->loadByIncrementId('100000001')
-    ->setCouponCode('one_usage')
+$quote->setCouponCode('one_usage')
     ->setAppliedRuleIds("{$items[0]->getId()}")
-    ->setCreatedAt('2014-10-25 10:10:10')
-    ->setCustomerId(1)
     ->save();
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_limited_order_rollback.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_limited_order_rollback.php
index f44b6d3a75c97..15e58a3e53da5 100644
--- a/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_limited_order_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons_limited_order_rollback.php
@@ -5,5 +5,5 @@
  */
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
+Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/quote_with_customer_rollback.php');
 Resolver::getInstance()->requireDataFixture('Magento/SalesRule/_files/coupons_limited_rollback.php');
-Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/order_rollback.php');

From 47ad3aece54117699b2fd815ada42cf35bcfa980 Mon Sep 17 00:00:00 2001
From: Stas Kozar <stas.kozar@transoftgroup.com>
Date: Thu, 9 Jul 2020 15:48:30 +0300
Subject: [PATCH 0780/1718] MC-35618: Unexpected results of editing a Grouped
 Product in the Wish List by a Customer

---
 .../Model/Wishlist/Product/Item.php           | 23 +++++++++-
 .../Unit/Model/Wishlist/Product/ItemTest.php  | 40 ++++++++++++++---
 .../Magento/Wishlist/Controller/Index/Add.php |  1 +
 .../Controller/Index/UpdateItemOptions.php    |  1 +
 .../Index/UpdateItemOptionsTest.php           | 43 +++++++++++++++++++
 .../_files/wishlist_with_grouped_product.php  | 41 ++++++++++++++++++
 ...wishlist_with_grouped_product_rollback.php | 13 ++++++
 7 files changed, 153 insertions(+), 9 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_grouped_product.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_grouped_product_rollback.php

diff --git a/app/code/Magento/GroupedProduct/Model/Wishlist/Product/Item.php b/app/code/Magento/GroupedProduct/Model/Wishlist/Product/Item.php
index d84df510195f3..b0048d66dd93e 100644
--- a/app/code/Magento/GroupedProduct/Model/Wishlist/Product/Item.php
+++ b/app/code/Magento/GroupedProduct/Model/Wishlist/Product/Item.php
@@ -7,6 +7,7 @@
 
 namespace Magento\GroupedProduct\Model\Wishlist\Product;
 
+use Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface;
 use Magento\Wishlist\Model\Item as WishlistItem;
 use Magento\GroupedProduct\Model\Product\Type\Grouped as TypeGrouped;
 use Magento\Catalog\Model\Product;
@@ -36,7 +37,7 @@ public function beforeRepresentProduct(
 
             $diff = array_diff_key($itemOptions, $productOptions);
 
-            if (!$diff) {
+            if (!$diff && $this->isAddAction($productOptions['info_buyRequest'])) {
                 $buyRequest = $subject->getBuyRequest();
                 $superGroupInfo = $buyRequest->getData('super_group');
 
@@ -78,10 +79,14 @@ public function beforeCompareOptions(
         array $options2
     ): array {
         $diff = array_diff_key($options1, $options2);
+        $productOptions = isset($options1['info_buyRequest']['product']) ? $options1 : $options2;
 
         if (!$diff) {
             foreach (array_keys($options1) as $key) {
-                if (preg_match('/associated_product_\d+/', $key)) {
+                if (
+                    preg_match('/associated_product_\d+/', $key)
+                    && $this->isAddAction($productOptions['info_buyRequest'])
+                ) {
                     unset($options1[$key]);
                     unset($options2[$key]);
                 }
@@ -90,4 +95,18 @@ public function beforeCompareOptions(
 
         return [$options1, $options2];
     }
+
+    /**
+     * Check that current request belongs to add to wishlist action.
+     *
+     * @param OptionInterface $buyRequest
+     *
+     * @return bool
+     */
+    private function isAddAction(OptionInterface $buyRequest): bool
+    {
+        $requestValue = json_decode($buyRequest->getValue(), true);
+
+        return $requestValue['action'] === 'add';
+    }
 }
diff --git a/app/code/Magento/GroupedProduct/Test/Unit/Model/Wishlist/Product/ItemTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Model/Wishlist/Product/ItemTest.php
index 7dc25c3de1245..6006ed639c92e 100644
--- a/app/code/Magento/GroupedProduct/Test/Unit/Model/Wishlist/Product/ItemTest.php
+++ b/app/code/Magento/GroupedProduct/Test/Unit/Model/Wishlist/Product/ItemTest.php
@@ -115,13 +115,29 @@ public function testBeforeRepresentProduct()
      */
     public function testBeforeCompareOptionsSameKeys()
     {
-        $options1 = ['associated_product_34' => 3];
-        $options2 = ['associated_product_34' => 2];
+        $infoBuyRequestMock = $this->createPartialMock(
+            \Magento\Catalog\Model\Product\Configuration\Item\Option::class,
+            [
+                'getValue',
+            ]
+        );
+
+        $infoBuyRequestMock->expects($this->atLeastOnce())
+            ->method('getValue')
+            ->willReturn('{"product":"3","action":"add"}');
+        $options1 = [
+            'associated_product_34' => 3,
+            'info_buyRequest' => $infoBuyRequestMock,
+        ];
+        $options2 = [
+            'associated_product_34' => 3,
+            'info_buyRequest' => $infoBuyRequestMock,
+        ];
 
         $res = $this->model->beforeCompareOptions($this->subjectMock, $options1, $options2);
 
-        $this->assertEquals([], $res[0]);
-        $this->assertEquals([], $res[1]);
+        $this->assertEquals(['info_buyRequest' => $infoBuyRequestMock], $res[0]);
+        $this->assertEquals(['info_buyRequest' => $infoBuyRequestMock], $res[1]);
     }
 
     /**
@@ -175,16 +191,26 @@ private function getProductAssocOption($initVal, $prodId)
     {
         $items = [];
 
-        $optionMock = $this->createPartialMock(
+        $associatedProductMock = $this->createPartialMock(
+            \Magento\Catalog\Model\Product\Configuration\Item\Option::class,
+            [
+                'getValue',
+            ]
+        );
+        $infoBuyRequestMock = $this->createPartialMock(
             \Magento\Catalog\Model\Product\Configuration\Item\Option::class,
             [
                 'getValue',
             ]
         );
 
-        $optionMock->expects($this->once())->method('getValue')->willReturn($initVal);
+        $associatedProductMock->expects($this->once())->method('getValue')->willReturn($initVal);
+        $infoBuyRequestMock->expects($this->once())
+            ->method('getValue')
+            ->willReturn('{"product":"'. $prodId . '","action":"add"}');
 
-        $items['associated_product_' . $prodId] = $optionMock;
+        $items['associated_product_' . $prodId] = $associatedProductMock;
+        $items['info_buyRequest'] = $infoBuyRequestMock;
 
         return $items;
     }
diff --git a/app/code/Magento/Wishlist/Controller/Index/Add.php b/app/code/Magento/Wishlist/Controller/Index/Add.php
index 3ed152cb84125..903719b245058 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Add.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Add.php
@@ -112,6 +112,7 @@ public function execute()
 
         try {
             $buyRequest = new \Magento\Framework\DataObject($requestParams);
+            $buyRequest->setData('action', 'add');
 
             $result = $wishlist->addNewItem($product, $buyRequest);
             if (is_string($result)) {
diff --git a/app/code/Magento/Wishlist/Controller/Index/UpdateItemOptions.php b/app/code/Magento/Wishlist/Controller/Index/UpdateItemOptions.php
index 6fae77fd604e5..1bc6182232b44 100644
--- a/app/code/Magento/Wishlist/Controller/Index/UpdateItemOptions.php
+++ b/app/code/Magento/Wishlist/Controller/Index/UpdateItemOptions.php
@@ -104,6 +104,7 @@ public function execute()
             }
 
             $buyRequest = new \Magento\Framework\DataObject($this->getRequest()->getParams());
+            $buyRequest->setData('action', 'updateItem');
 
             $wishlist->updateItem($id, $buyRequest)->save();
 
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/UpdateItemOptionsTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/UpdateItemOptionsTest.php
index 4301121704078..7873829207c1f 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/UpdateItemOptionsTest.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/UpdateItemOptionsTest.php
@@ -153,6 +153,33 @@ public function testUpdateItemNotSpecifyAsWishListItem(): void
         $this->assertRedirect($this->stringContains('wishlist/index/index/wishlist_id/'));
     }
 
+    /**
+     * @magentoDataFixture Magento/Wishlist/_files/wishlist_with_grouped_product.php
+     * @magentoDbIsolation disabled
+     *
+     * @return void
+     */
+    public function testUpdateItemOptionsForGroupedProduct(): void
+    {
+        $this->customerSession->setCustomerId(1);
+        $item = $this->getWishlistByCustomerId->getItemBySku(1, 'grouped');
+        $this->assertNotNull($item);
+        $params = [
+            'id' => $item->getId(),
+            'product' => $item->getProductId(),
+            'super_group' => $this->performGroupedOption(),
+            'qty' => 1,
+        ];
+        $this->performUpdateWishListItemRequest($params);
+        $message = sprintf("%s has been updated in your Wish List.", $item->getProduct()->getName());
+        $this->assertSessionMessages($this->equalTo([(string)__($message)]), MessageInterface::TYPE_SUCCESS);
+        $this->assertRedirect($this->stringContains('wishlist/index/index/wishlist_id/' . $item->getWishlistId()));
+        $this->assertUpdatedItem(
+            $this->getWishlistByCustomerId->getItemBySku(1, 'grouped'),
+            $params
+        );
+    }
+
     /**
      * Perform request update wish list item.
      *
@@ -195,4 +222,20 @@ private function performConfigurableOption(ProductInterface $product): array
 
         return [$attributeId => $option['value_index']];
     }
+
+    /**
+     * Perform group option to select.
+     *
+     * @return array
+     */
+    private function performGroupedOption(): array
+    {
+        $simple1 = $this->productRepository->get('simple_11');
+        $simple2 = $this->productRepository->get('simple_22');
+
+        return [
+            $simple1->getId() => '3',
+            $simple2->getId() => '3',
+        ];
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_grouped_product.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_grouped_product.php
new file mode 100644
index 0000000000000..b46d087d7fb71
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_grouped_product.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Customer\Model\CustomerRegistry;
+use Magento\Framework\DataObject;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Wishlist\Model\WishlistFactory;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer.php');
+Resolver::getInstance()->requireDataFixture(
+    'Magento/GroupedProduct/_files/product_grouped_with_simple.php'
+);
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var CustomerRegistry $customerRegistry */
+$customerRegistry = $objectManager->create(CustomerRegistry::class);
+$customer = $customerRegistry->retrieve(1);
+$wishlistFactory = $objectManager->get(WishlistFactory::class);
+$wishlist = $wishlistFactory->create();
+$wishlist->loadByCustomerId($customer->getId(), true);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+$product = $productRepository->get('grouped');
+$simple1 = $productRepository->get('simple_11');
+$simple2 = $productRepository->get('simple_22');
+$buyRequest = new DataObject([
+    'product' => $product->getId(),
+    'super_group' =>
+        [
+            $simple1->getId() => '1',
+            $simple2->getId() => '1',
+        ],
+    'action' => 'add',
+]);
+$wishlist->addNewItem($product, $buyRequest);
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_grouped_product_rollback.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_grouped_product_rollback.php
new file mode 100644
index 0000000000000..dc8c56d8eb73c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_grouped_product_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/Customer/_files/customer_rollback.php');
+Resolver::getInstance()->requireDataFixture(
+    'Magento/GroupedProduct/_files/product_grouped_with_simple_rollback.php'
+);

From 592f5de3a50cd80fe26a1c40534de9b92516a927 Mon Sep 17 00:00:00 2001
From: Michal Derlatka <michal.derlatka1@gmail.com>
Date: Thu, 9 Jul 2020 14:59:43 +0200
Subject: [PATCH 0781/1718] magento/magento2#28570: createCustomer does not
 match validation requirements

---
 .../Model/Resolver/UpdateCustomerEmail.php    |   9 +-
 .../CustomerGraphQl/etc/schema.graphqls       |   3 +-
 .../GraphQl/Customer/CreateCustomerTest.php   |  10 +-
 .../GraphQl/Customer/CreateCustomerV2Test.php | 390 ++++++++++++++++++
 4 files changed, 402 insertions(+), 10 deletions(-)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerV2Test.php

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerEmail.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerEmail.php
index dc584f84a21b1..14341999cc078 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerEmail.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerEmail.php
@@ -25,10 +25,12 @@ class UpdateCustomerEmail implements ResolverInterface
      * @var GetCustomer
      */
     private $getCustomer;
+
     /**
      * @var UpdateCustomerAccount
      */
     private $updateCustomerAccount;
+
     /**
      * @var ExtractCustomerData
      */
@@ -50,7 +52,7 @@ public function __construct(
     }
 
     /**
-     * @inheritdoc
+     * Resolves customer email update mutation
      */
     public function resolve(
         Field $field,
@@ -67,7 +69,10 @@ public function resolve(
         $customer = $this->getCustomer->execute($context);
         $this->updateCustomerAccount->execute(
             $customer,
-            ['email' => $args['email'], 'password' => $args['password']],
+            [
+                'email' => $args['email'] ?? null,
+                'password' => $args['password'] ?? null
+            ],
             $context->getExtensionAttributes()->getStore()
         );
 
diff --git a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
index 8b3c691abef57..5eed9a38a0350 100644
--- a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
@@ -17,7 +17,8 @@ type Query {
 type Mutation {
     generateCustomerToken(email: String!, password: String!): CustomerToken @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\GenerateCustomerToken") @doc(description:"Retrieve the customer token")
     changeCustomerPassword(currentPassword: String!, newPassword: String!): Customer @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\ChangePassword") @doc(description:"Changes the password for the logged-in customer")
-    createCustomer (input: CustomerCreateInput!): CustomerOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\CreateCustomer") @doc(description:"Create customer account")
+    createCustomer (input: CustomerInput!): CustomerOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\CreateCustomer") @doc(description:"Create customer account")
+    createCustomerV2 (input: CustomerCreateInput!): CustomerOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\CreateCustomer") @doc(description:"Create customer account")
     updateCustomer (input: CustomerInput!): CustomerOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\UpdateCustomer") @doc(description:"Deprecated. Use UpdateCustomerV2 instead.")
     updateCustomerV2 (input: CustomerUpdateInput!): CustomerOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\UpdateCustomer") @doc(description:"Update the customer's personal information")
     revokeCustomerToken: RevokeCustomerTokenOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\RevokeCustomerToken") @doc(description:"Revoke the customer token")
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
index 840f05f846e66..4f2b8f7566d31 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php
@@ -116,12 +116,8 @@ public function testCreateCustomerAccountWithoutPassword()
      */
     public function testCreateCustomerIfInputDataIsEmpty()
     {
-        $exceptionMessage = 'Field CustomerCreateInput.email of required type String! was not provided.
-Field CustomerCreateInput.firstname of required type String! was not provided.
-Field CustomerCreateInput.lastname of required type String! was not provided.';
-
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage($exceptionMessage);
+        $this->expectExceptionMessage('"input" value should be specified');
 
         $query = <<<QUERY
 mutation {
@@ -148,7 +144,7 @@ public function testCreateCustomerIfInputDataIsEmpty()
     public function testCreateCustomerIfEmailMissed()
     {
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('Field CustomerCreateInput.email of required type String! was not provided');
+        $this->expectExceptionMessage('Required parameters are missing: Email');
 
         $newFirstname = 'Richard';
         $newLastname = 'Rowe';
@@ -238,7 +234,7 @@ public function invalidEmailAddressDataProvider(): array
     public function testCreateCustomerIfPassedAttributeDosNotExistsInCustomerInput()
     {
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('Field "test123" is not defined by type CustomerCreateInput.');
+        $this->expectExceptionMessage('Field "test123" is not defined by type CustomerInput.');
 
         $newFirstname = 'Richard';
         $newLastname = 'Rowe';
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerV2Test.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerV2Test.php
new file mode 100644
index 0000000000000..10d17d5f7d1b3
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerV2Test.php
@@ -0,0 +1,390 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Customer;
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Tests for create customer (V2)
+ */
+class CreateCustomerV2Test extends GraphQlAbstract
+{
+    /**
+     * @var Registry
+     */
+    private $registry;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->registry = Bootstrap::getObjectManager()->get(Registry::class);
+        $this->customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
+    }
+
+    /**
+     * @throws \Exception
+     */
+    public function testCreateCustomerAccountWithPassword()
+    {
+        $newFirstname = 'Richard';
+        $newLastname = 'Rowe';
+        $currentPassword = 'test123#';
+        $newEmail = 'new_customer@example.com';
+
+        $query = <<<QUERY
+mutation {
+    createCustomerV2(
+        input: {
+            firstname: "{$newFirstname}"
+            lastname: "{$newLastname}"
+            email: "{$newEmail}"
+            password: "{$currentPassword}"
+            is_subscribed: true
+        }
+    ) {
+        customer {
+            id
+            firstname
+            lastname
+            email
+            is_subscribed
+        }
+    }
+}
+QUERY;
+        $response = $this->graphQlMutation($query);
+
+        $this->assertNull($response['createCustomerV2']['customer']['id']);
+        $this->assertEquals($newFirstname, $response['createCustomerV2']['customer']['firstname']);
+        $this->assertEquals($newLastname, $response['createCustomerV2']['customer']['lastname']);
+        $this->assertEquals($newEmail, $response['createCustomerV2']['customer']['email']);
+        $this->assertTrue($response['createCustomerV2']['customer']['is_subscribed']);
+    }
+
+    /**
+     * @throws \Exception
+     */
+    public function testCreateCustomerAccountWithoutPassword()
+    {
+        $newFirstname = 'Richard';
+        $newLastname = 'Rowe';
+        $newEmail = 'new_customer@example.com';
+
+        $query = <<<QUERY
+mutation {
+    createCustomerV2(
+        input: {
+            firstname: "{$newFirstname}"
+            lastname: "{$newLastname}"
+            email: "{$newEmail}"
+            is_subscribed: true
+        }
+    ) {
+        customer {
+            id
+            firstname
+            lastname
+            email
+            is_subscribed
+        }
+    }
+}
+QUERY;
+        $response = $this->graphQlMutation($query);
+
+        $this->assertEquals($newFirstname, $response['createCustomerV2']['customer']['firstname']);
+        $this->assertEquals($newLastname, $response['createCustomerV2']['customer']['lastname']);
+        $this->assertEquals($newEmail, $response['createCustomerV2']['customer']['email']);
+        $this->assertTrue($response['createCustomerV2']['customer']['is_subscribed']);
+    }
+
+    /**
+     */
+    public function testCreateCustomerIfInputDataIsEmpty()
+    {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('CustomerCreateInput.email of required type String! was not provided.');
+        $this->expectExceptionMessage('CustomerCreateInput.firstname of required type String! was not provided.');
+        $this->expectExceptionMessage('CustomerCreateInput.lastname of required type String! was not provided.');
+
+        $query = <<<QUERY
+mutation {
+    createCustomerV2(
+        input: {
+
+        }
+    ) {
+        customer {
+            id
+            firstname
+            lastname
+            email
+            is_subscribed
+        }
+    }
+}
+QUERY;
+        $this->graphQlMutation($query);
+    }
+
+    /**
+     */
+    public function testCreateCustomerIfEmailMissed()
+    {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Field CustomerCreateInput.email of required type String! was not provided');
+
+        $newFirstname = 'Richard';
+        $newLastname = 'Rowe';
+        $currentPassword = 'test123#';
+
+        $query = <<<QUERY
+mutation {
+    createCustomerV2(
+        input: {
+            firstname: "{$newFirstname}"
+            lastname: "{$newLastname}"
+            password: "{$currentPassword}"
+            is_subscribed: true
+        }
+    ) {
+        customer {
+            id
+            firstname
+            lastname
+            email
+            is_subscribed
+        }
+    }
+}
+QUERY;
+        $this->graphQlMutation($query);
+    }
+
+    /**
+     * @dataProvider invalidEmailAddressDataProvider
+     *
+     * @param string $email
+     * @throws \Exception
+     */
+    public function testCreateCustomerIfEmailIsNotValid(string $email)
+    {
+        $firstname = 'Richard';
+        $lastname = 'Rowe';
+        $password = 'test123#';
+
+        $query = <<<QUERY
+mutation {
+    createCustomerV2(
+        input: {
+            firstname: "{$firstname}"
+            lastname: "{$lastname}"
+            email: "{$email}"
+            password: "{$password}"
+            is_subscribed: true
+        }
+    ) {
+        customer {
+            id
+            firstname
+            lastname
+            email
+            is_subscribed
+        }
+    }
+}
+QUERY;
+        $this->expectExceptionMessage('"' . $email . '" is not a valid email address.');
+        $this->graphQlMutation($query);
+    }
+
+    /**
+     * @return array
+     */
+    public function invalidEmailAddressDataProvider(): array
+    {
+        return [
+            ['plainaddress'],
+            ['jØrgen@somedomain.com'],
+            ['#@%^%#$@#$@#.com'],
+            ['@example.com'],
+            ['Joe Smith <email@example.com>'],
+            ['email.example.com'],
+            ['email@example@example.com'],
+            ['email@example.com (Joe Smith)'],
+            ['email@example'],
+            ['“email”@example.com'],
+        ];
+    }
+
+    /**
+     */
+    public function testCreateCustomerIfPassedAttributeDosNotExistsInCustomerInput()
+    {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Field "test123" is not defined by type CustomerCreateInput.');
+
+        $newFirstname = 'Richard';
+        $newLastname = 'Rowe';
+        $currentPassword = 'test123#';
+        $newEmail = 'new_customer@example.com';
+
+        $query = <<<QUERY
+mutation {
+    createCustomerV2(
+        input: {
+            firstname: "{$newFirstname}"
+            lastname: "{$newLastname}"
+            test123: "123test123"
+            email: "{$newEmail}"
+            password: "{$currentPassword}"
+            is_subscribed: true
+        }
+    ) {
+        customer {
+            id
+            firstname
+            lastname
+            email
+            is_subscribed
+        }
+    }
+}
+QUERY;
+        $this->graphQlMutation($query);
+    }
+
+    /**
+     */
+    public function testCreateCustomerIfNameEmpty()
+    {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Required parameters are missing: First Name');
+
+        $newEmail = 'customer_created' . rand(1, 2000000) . '@example.com';
+        $newFirstname = '';
+        $newLastname = 'Rowe';
+        $currentPassword = 'test123#';
+        $query = <<<QUERY
+mutation {
+    createCustomerV2(
+        input: {
+            email: "{$newEmail}"
+            firstname: "{$newFirstname}"
+            lastname: "{$newLastname}"
+            password: "{$currentPassword}"
+          	is_subscribed: true
+        }
+    ) {
+        customer {
+            id
+            firstname
+            lastname
+            email
+            is_subscribed
+        }
+    }
+}
+QUERY;
+        $this->graphQlMutation($query);
+    }
+
+    /**
+     * @magentoConfigFixture default_store newsletter/general/active 0
+     */
+    public function testCreateCustomerSubscribed()
+    {
+        $newFirstname = 'Richard';
+        $newLastname = 'Rowe';
+        $newEmail = 'new_customer@example.com';
+
+        $query = <<<QUERY
+mutation {
+    createCustomerV2(
+        input: {
+            firstname: "{$newFirstname}"
+            lastname: "{$newLastname}"
+            email: "{$newEmail}"
+            is_subscribed: true
+        }
+    ) {
+        customer {
+            email
+            is_subscribed
+        }
+    }
+}
+QUERY;
+
+        $response = $this->graphQlMutation($query);
+
+        $this->assertFalse($response['createCustomerV2']['customer']['is_subscribed']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testCreateCustomerIfCustomerWithProvidedEmailAlreadyExists()
+    {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage(
+            'A customer with the same email address already exists in an associated website.'
+        );
+
+        $existedEmail = 'customer@example.com';
+        $password = 'test123#';
+        $firstname = 'John';
+        $lastname = 'Smith';
+
+        $query = <<<QUERY
+mutation {
+    createCustomerV2(
+        input: {
+            email: "{$existedEmail}"
+            password: "{$password}"
+            firstname: "{$firstname}"
+            lastname: "{$lastname}"
+        }
+    ) {
+        customer {
+            firstname
+            lastname
+            email
+        }
+    }
+}
+QUERY;
+        $this->graphQlMutation($query);
+    }
+
+    protected function tearDown(): void
+    {
+        $newEmail = 'new_customer@example.com';
+        try {
+            $customer = $this->customerRepository->get($newEmail);
+        } catch (\Exception $exception) {
+            return;
+        }
+
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', true);
+        $this->customerRepository->delete($customer);
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', false);
+        parent::tearDown();
+    }
+}

From a7e980c8c37b7caebf8500f906b010ea64abc832 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Thu, 9 Jul 2020 14:11:34 +0100
Subject: [PATCH 0782/1718] Refactor and added store view filter

---
 .../GetAssetIdByContentFieldComposite.php     |  43 +++++++
 .../GetAssetIdByContentStatusComposite.php    |  46 -------
 .../Magento/MediaContent/etc/adminhtml/di.xml |  51 --------
 app/code/Magento/MediaContent/etc/di.xml      |   2 +
 .../GetAssetIdByContentFieldInterface.php     |  22 ++++
 .../GetAssetIdByContentStatusInterface.php    |  22 ----
 .../Model/GetAssetIdByCategoryStore.php       | 120 ++++++++++++++++++
 .../Model/GetAssetIdByEavContentField.php}    |  12 +-
 .../Model/GetAssetIdByProductStore.php        | 102 +++++++++++++++
 .../Magento/MediaContentCatalog/composer.json |   2 +
 .../Magento/MediaContentCatalog/etc/di.xml    |  32 +++++
 .../Model/GetAssetIdByContentField.php}       |  41 +++---
 .../Magento/MediaContentCms/composer.json     |   1 +
 app/code/Magento/MediaContentCms/etc/di.xml   |  48 +++++++
 .../FilterProcessor/ContentStatus.php         |   8 +-
 .../FilterProcessor/StoreView.php             |  47 +++++++
 .../MediaContentUi/etc/adminhtml/di.xml       |   6 +
 .../standalone_media_gallery_listing.xml      |  11 ++
 18 files changed, 464 insertions(+), 152 deletions(-)
 create mode 100644 app/code/Magento/MediaContent/Model/GetAssetIdByContentFieldComposite.php
 delete mode 100644 app/code/Magento/MediaContent/Model/GetAssetIdByContentStatusComposite.php
 delete mode 100644 app/code/Magento/MediaContent/etc/adminhtml/di.xml
 create mode 100644 app/code/Magento/MediaContentApi/Model/GetAssetIdByContentFieldInterface.php
 delete mode 100644 app/code/Magento/MediaContentApi/Model/GetAssetIdByContentStatusInterface.php
 create mode 100644 app/code/Magento/MediaContentCatalog/Model/GetAssetIdByCategoryStore.php
 rename app/code/Magento/{MediaContent/Model/GetAssetIdByEavContentStatus.php => MediaContentCatalog/Model/GetAssetIdByEavContentField.php} (88%)
 create mode 100644 app/code/Magento/MediaContentCatalog/Model/GetAssetIdByProductStore.php
 rename app/code/Magento/{MediaContent/Model/GetAssetIdByContentStatus.php => MediaContentCms/Model/GetAssetIdByContentField.php} (61%)
 create mode 100644 app/code/Magento/MediaContentUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/StoreView.php

diff --git a/app/code/Magento/MediaContent/Model/GetAssetIdByContentFieldComposite.php b/app/code/Magento/MediaContent/Model/GetAssetIdByContentFieldComposite.php
new file mode 100644
index 0000000000000..b36b112286a8f
--- /dev/null
+++ b/app/code/Magento/MediaContent/Model/GetAssetIdByContentFieldComposite.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContent\Model;
+
+use Magento\MediaContentApi\Model\GetAssetIdByContentFieldInterface;
+
+/**
+ * Class responsible to return Asset ids by content field
+ */
+class GetAssetIdByContentFieldComposite implements GetAssetIdByContentFieldInterface
+{
+    /**
+     * @var GetAssetIdByContentFieldInterface[]
+     */
+    private $getAssetIdByContentFieldArray;
+
+    /**
+     * GetAssetIdByContentStatusComposite constructor.
+     *
+     * @param array $getAssetIdByContentFieldArray
+     */
+    public function __construct($getAssetIdByContentFieldArray = [])
+    {
+        $this->getAssetIdByContentFieldArray = $getAssetIdByContentFieldArray;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function execute(string $value): array
+    {
+        $ids = [];
+        foreach ($this->getAssetIdByContentFieldArray as $getAssetIdByContentField) {
+            $ids = array_merge($ids, $getAssetIdByContentField->execute($value));
+        }
+        return array_unique($ids);
+    }
+}
diff --git a/app/code/Magento/MediaContent/Model/GetAssetIdByContentStatusComposite.php b/app/code/Magento/MediaContent/Model/GetAssetIdByContentStatusComposite.php
deleted file mode 100644
index f62b3cd2ffb52..0000000000000
--- a/app/code/Magento/MediaContent/Model/GetAssetIdByContentStatusComposite.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\MediaContent\Model;
-
-use Magento\MediaContentApi\Model\GetAssetIdByContentStatusInterface;
-
-/**
- * Class responsible to return Asset ids by content status
- */
-class GetAssetIdByContentStatusComposite implements GetAssetIdByContentStatusInterface
-{
-    /**
-     * @var GetAssetIdByContentStatus[]
-     */
-    private $getAssetIdByContentStatusArray;
-
-    /**
-     * GetAssetIdByContentStatusComposite constructor.
-     *
-     * @param array $getAssetIdByContentStatusArray
-     */
-    public function __construct($getAssetIdByContentStatusArray = [])
-    {
-        $this->getAssetIdByContentStatusArray = $getAssetIdByContentStatusArray;
-    }
-
-    /**
-     * Get Asset ids by Content status
-     *
-     * @param string $status
-     * @return array
-     */
-    public function execute(string $status): array
-    {
-        $ids = [];
-        foreach ($this->getAssetIdByContentStatusArray as $getAssetIdByContentStatus) {
-            $ids = array_merge($ids, $getAssetIdByContentStatus->execute($status));
-        }
-        return array_unique($ids);
-    }
-}
diff --git a/app/code/Magento/MediaContent/etc/adminhtml/di.xml b/app/code/Magento/MediaContent/etc/adminhtml/di.xml
deleted file mode 100644
index 6f0f8efc1ac53..0000000000000
--- a/app/code/Magento/MediaContent/etc/adminhtml/di.xml
+++ /dev/null
@@ -1,51 +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:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\MediaContent\Model\GetAssetIdByContentStatusComposite">
-        <arguments>
-            <argument name="getAssetIdByContentStatusArray" xsi:type="array">
-                <item name="getAssetIdByProductStatus" xsi:type="object">Magento\MediaContent\Model\GetAssetIdByProductStatus</item>
-                <item name="getAssetIdByCategoryStatus" xsi:type="object">Magento\MediaContent\Model\GetAssetIdByCategoryStatus</item>
-                <item name="getAssetIdByPageStatus" xsi:type="object">Magento\MediaContent\Model\GetAssetIdByPageStatus</item>
-                <item name="getAssetIdByBlockStatus" xsi:type="object">Magento\MediaContent\Model\GetAssetIdByBlockStatus</item>
-            </argument>
-        </arguments>
-    </type>
-    <virtualType name="Magento\MediaContent\Model\GetAssetIdByProductStatus" type="Magento\MediaContent\Model\GetAssetIdByEavContentStatus">
-        <arguments>
-            <argument name="attributeCode" xsi:type="string">status</argument>
-            <argument name="entityType" xsi:type="string">catalog_product</argument>
-            <argument name="valueMap" xsi:type="array">
-                <item name="1" xsi:type="string">1</item>
-                <item name="0" xsi:type="string">2</item>
-            </argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="Magento\MediaContent\Model\GetAssetIdByCategoryStatus" type="Magento\MediaContent\Model\GetAssetIdByEavContentStatus">
-        <arguments>
-            <argument name="attributeCode" xsi:type="string">is_active</argument>
-            <argument name="entityType" xsi:type="string">catalog_category</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="Magento\MediaContent\Model\GetAssetIdByPageStatus" type="Magento\MediaContent\Model\GetAssetIdByContentStatus">
-        <arguments>
-            <argument name="entityType" xsi:type="string">cms_page</argument>
-            <argument name="contentTable" xsi:type="string">cms_page</argument>
-            <argument name="idColumn" xsi:type="string">page_id</argument>
-            <argument name="statusColumn" xsi:type="string">is_active</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="Magento\MediaContent\Model\GetAssetIdByBlockStatus" type="Magento\MediaContent\Model\GetAssetIdByContentStatus">
-        <arguments>
-            <argument name="entityType" xsi:type="string">cms_block</argument>
-            <argument name="contentTable" xsi:type="string">cms_block</argument>
-            <argument name="idColumn" xsi:type="string">block_id</argument>
-            <argument name="statusColumn" xsi:type="string">is_active</argument>
-        </arguments>
-    </virtualType>
-</config>
diff --git a/app/code/Magento/MediaContent/etc/di.xml b/app/code/Magento/MediaContent/etc/di.xml
index f2a9459447001..bfce45c797a1a 100644
--- a/app/code/Magento/MediaContent/etc/di.xml
+++ b/app/code/Magento/MediaContent/etc/di.xml
@@ -43,4 +43,6 @@
             <argument name="data" xsi:type="object">Magento\MediaContent\Model\Content\Config\Data</argument>
         </arguments>
     </type>
+    <virtualType name="Magento\MediaContent\Model\GetAssetIdByContentStatusComposite" type="Magento\MediaContent\Model\GetAssetIdByContentFieldComposite"/>
+    <virtualType name="Magento\MediaContent\Model\GetAssetIdByContentStoreComposite" type="Magento\MediaContent\Model\GetAssetIdByContentFieldComposite"/>
 </config>
diff --git a/app/code/Magento/MediaContentApi/Model/GetAssetIdByContentFieldInterface.php b/app/code/Magento/MediaContentApi/Model/GetAssetIdByContentFieldInterface.php
new file mode 100644
index 0000000000000..13d29bcfe03c7
--- /dev/null
+++ b/app/code/Magento/MediaContentApi/Model/GetAssetIdByContentFieldInterface.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentApi\Model;
+
+/**
+ * Interface used to return Asset id by content field.
+ */
+interface GetAssetIdByContentFieldInterface
+{
+    /**
+     * This function returns asset ids by content field
+     *
+     * @param string $value
+     * @return int[]
+     */
+    public function execute(string $value): array;
+}
diff --git a/app/code/Magento/MediaContentApi/Model/GetAssetIdByContentStatusInterface.php b/app/code/Magento/MediaContentApi/Model/GetAssetIdByContentStatusInterface.php
deleted file mode 100644
index cfd75a8274c4c..0000000000000
--- a/app/code/Magento/MediaContentApi/Model/GetAssetIdByContentStatusInterface.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\MediaContentApi\Model;
-
-/**
- * Interface used to return Asset id by content status.
- */
-interface GetAssetIdByContentStatusInterface
-{
-    /**
-     * This function returns asset ids by entity status
-     *
-     * @param string $status
-     * @return int[]
-     */
-    public function execute(string $status): array;
-}
diff --git a/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByCategoryStore.php b/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByCategoryStore.php
new file mode 100644
index 0000000000000..f6f0d3090a9af
--- /dev/null
+++ b/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByCategoryStore.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentCatalog\Model;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\MediaContentApi\Model\GetAssetIdByContentFieldInterface;
+use Magento\Store\Api\GroupRepositoryInterface;
+use Magento\Store\Api\StoreRepositoryInterface;
+
+/**
+ * Class responsible to return Asset id by content field
+ */
+class GetAssetIdByCategoryStore implements GetAssetIdByContentFieldInterface
+{
+    private const TABLE_CONTENT_ASSET = 'media_content_asset';
+
+    /**
+     * @var ResourceConnection
+     */
+    private $connection;
+
+    /**
+     * @var StoreRepositoryInterface
+     */
+    private $storeRepository;
+
+    /**
+     * @var GroupRepositoryInterface
+     */
+    private $storeGroupRepository;
+
+    /**
+     * @var string
+     */
+    private $entityType;
+
+    /**
+     * GetAssetIdByProductStore constructor.
+     *
+     * @param ResourceConnection $resource
+     * @param StoreRepositoryInterface $storeRepository
+     * @param GroupRepositoryInterface $storeGroupRepository
+     */
+    public function __construct(
+        ResourceConnection $resource,
+        StoreRepositoryInterface $storeRepository,
+        GroupRepositoryInterface $storeGroupRepository
+    ) {
+        $this->connection = $resource;
+        $this->storeRepository = $storeRepository;
+        $this->storeGroupRepository = $storeGroupRepository;
+        $this->entityType = 'catalog_category';
+    }
+
+    /**
+     * @inheritDoc
+     * @throws LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function execute(string $value): array
+    {
+        $storeView = $this->storeRepository->getById($value);
+        $storeGroup = $this->storeGroupRepository->get($storeView->getStoreGroupId());
+        $categoryIds = $this->getCategoryIdsByRootCategory($storeGroup->getRootCategoryId());
+        $sql = $this->connection->getConnection()->select()->from(
+            ['asset_content_table' => $this->connection->getTableName(self::TABLE_CONTENT_ASSET)],
+            ['asset_id']
+        )->where(
+            'entity_type = ?',
+            $this->entityType
+        )->where(
+            'entity_id IN (?)',
+            $categoryIds
+        );
+
+        $result = $this->connection->getConnection()->fetchAll($sql);
+
+        return array_map(function ($item) {
+            return $item['asset_id'];
+        }, $result);
+    }
+
+    private function getCategoryIdsByRootCategory($rootCategoryId)
+    {
+        $contentCategoriesSql = $this->connection->getConnection()->select()->from(
+            ['asset_content_table' => $this->connection->getTableName(self::TABLE_CONTENT_ASSET)],
+            ['entity_id']
+        )->where(
+            'entity_type = ?',
+            $this->entityType
+        )->joinInner(
+            ['category_table' => $this->connection->getTableName('catalog_category_entity')],
+            'asset_content_table.entity_id = category_table.entity_id',
+            ['path']
+        );
+
+        $result = $this->connection->getConnection()->fetchAll($contentCategoriesSql);
+
+        $result = array_filter($result, function ($item) use ($rootCategoryId) {
+            $pathArray = explode("/", $item['path']);
+            $isInPath = false;
+            foreach ($pathArray as $id) {
+                if ($id == $rootCategoryId) {
+                    $isInPath = true;
+                }
+            }
+            return  $isInPath;
+        });
+
+        return array_map(function ($item) {
+            return $item['entity_id'];
+        }, $result);
+    }
+}
diff --git a/app/code/Magento/MediaContent/Model/GetAssetIdByEavContentStatus.php b/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByEavContentField.php
similarity index 88%
rename from app/code/Magento/MediaContent/Model/GetAssetIdByEavContentStatus.php
rename to app/code/Magento/MediaContentCatalog/Model/GetAssetIdByEavContentField.php
index c9d2e93182802..91c42df7d76dd 100644
--- a/app/code/Magento/MediaContent/Model/GetAssetIdByEavContentStatus.php
+++ b/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByEavContentField.php
@@ -5,16 +5,16 @@
  */
 declare(strict_types=1);
 
-namespace Magento\MediaContent\Model;
+namespace Magento\MediaContentCatalog\Model;
 
 use Magento\Eav\Model\Config;
 use Magento\Framework\App\ResourceConnection;
-use Magento\MediaContentApi\Model\GetAssetIdByContentStatusInterface;
+use Magento\MediaContentApi\Model\GetAssetIdByContentFieldInterface;
 
 /**
- * Class responsible to return Asset id by eav entity status
+ * Class responsible to return Asset id by eav content field
  */
-class GetAssetIdByEavContentStatus implements GetAssetIdByContentStatusInterface
+class GetAssetIdByEavContentField implements GetAssetIdByContentFieldInterface
 {
     private const TABLE_CONTENT_ASSET = 'media_content_asset';
 
@@ -70,7 +70,7 @@ public function __construct(
      * @inheritDoc
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    public function execute(string $status): array
+    public function execute(string $value): array
     {
         $statusAttribute = $this->config->getAttribute($this->entityType, $this->attributeCode);
 
@@ -88,7 +88,7 @@ public function execute(string $status): array
             []
         )->where(
             'entity_eav_type.value = ?',
-            $this->getValueFromMap($status)
+            $this->getValueFromMap($value)
         );
 
         $result = $this->connection->getConnection()->fetchAll($sql);
diff --git a/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByProductStore.php b/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByProductStore.php
new file mode 100644
index 0000000000000..a13da8d501903
--- /dev/null
+++ b/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByProductStore.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentCatalog\Model;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\MediaContentApi\Model\GetAssetIdByContentFieldInterface;
+use Magento\Store\Api\StoreRepositoryInterface;
+
+/**
+ * Class responsible to return Asset id by content field
+ */
+class GetAssetIdByProductStore implements GetAssetIdByContentFieldInterface
+{
+    private const TABLE_CONTENT_ASSET = 'media_content_asset';
+    private const ENTITY_STOREVIEW_RELATION = 'store_view';
+    private const ENTITY_STOREGROUP_RELATION = 'store_group';
+    private const ENTITY_WEBSITE_RELATION = 'website';
+
+    /**
+     * @var ResourceConnection
+     */
+    private $connection;
+
+    /**
+     * @var StoreRepositoryInterface
+     */
+    private $storeRepository;
+
+    /**
+     * @var string
+     */
+    private $entityType;
+
+    /**
+     * @var string
+     */
+    private $fieldTable;
+
+    /**
+     * @var string
+     */
+    private $fieldColumn;
+
+    /**
+     * @var string
+     */
+    private $idColumn;
+
+    /**
+     * GetAssetIdByProductStore constructor.
+     *
+     * @param ResourceConnection $resource
+     * @param StoreRepositoryInterface $storeRepository
+     */
+    public function __construct(
+        ResourceConnection $resource,
+        StoreRepositoryInterface $storeRepository
+    ) {
+        $this->connection = $resource;
+        $this->storeRepository = $storeRepository;
+        $this->entityType = 'catalog_product';
+        $this->fieldTable = 'catalog_product_website';
+        $this->idColumn = 'product_id';
+        $this->fieldColumn = 'website_id';
+    }
+
+    /**
+     * @inheritDoc
+     * @throws LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function execute(string $value): array
+    {
+        $store = $this->storeRepository->getById($value);
+        $sql = $this->connection->getConnection()->select()->from(
+            ['asset_content_table' => $this->connection->getTableName(self::TABLE_CONTENT_ASSET)],
+            ['asset_id']
+        )->where(
+            'entity_type = ?',
+            $this->entityType
+        )->joinInner(
+            ['field_table' => $this->connection->getTableName($this->fieldTable)],
+            'asset_content_table.entity_id = field_table.' . $this->idColumn,
+            []
+        )->where(
+            'field_table.' . $this->fieldColumn . ' = ?',
+            $store->getWebsiteId()
+        );
+
+        $result = $this->connection->getConnection()->fetchAll($sql);
+
+        return array_map(function ($item) {
+            return $item['asset_id'];
+        }, $result);
+    }
+}
diff --git a/app/code/Magento/MediaContentCatalog/composer.json b/app/code/Magento/MediaContentCatalog/composer.json
index 21e23e6b18bdc..da592c2bf11be 100644
--- a/app/code/Magento/MediaContentCatalog/composer.json
+++ b/app/code/Magento/MediaContentCatalog/composer.json
@@ -4,8 +4,10 @@
     "require": {
         "php": "~7.3.0||~7.4.0",
         "magento/module-media-content-api": "*",
+        "magento/module-media-content": "*",
         "magento/module-catalog": "*",
         "magento/module-eav": "*",
+        "magento/module-store": "*",
         "magento/framework": "*"
     },
     "type": "magento2-module",
diff --git a/app/code/Magento/MediaContentCatalog/etc/di.xml b/app/code/Magento/MediaContentCatalog/etc/di.xml
index 6b0ee83b30788..2bc595151ddfe 100644
--- a/app/code/Magento/MediaContentCatalog/etc/di.xml
+++ b/app/code/Magento/MediaContentCatalog/etc/di.xml
@@ -46,4 +46,36 @@
             </argument>
         </arguments>
     </type>
+    <virtualType name="Magento\MediaContentCatalog\Model\GetAssetIdByProductStatus" type="Magento\MediaContentCatalog\Model\GetAssetIdByEavContentField">
+        <arguments>
+            <argument name="attributeCode" xsi:type="string">status</argument>
+            <argument name="entityType" xsi:type="string">catalog_product</argument>
+            <argument name="valueMap" xsi:type="array">
+                <item name="1" xsi:type="string">1</item>
+                <item name="0" xsi:type="string">2</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\MediaContentCatalog\Model\GetAssetIdByCategoryStatus" type="Magento\MediaContentCatalog\Model\GetAssetIdByEavContentField">
+        <arguments>
+            <argument name="attributeCode" xsi:type="string">is_active</argument>
+            <argument name="entityType" xsi:type="string">catalog_category</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\MediaContent\Model\GetAssetIdByContentStatusComposite">
+        <arguments>
+            <argument name="getAssetIdByContentFieldArray" xsi:type="array">
+                <item name="getAssetIdByProductStatus" xsi:type="object">Magento\MediaContentCatalog\Model\GetAssetIdByProductStatus</item>
+                <item name="getAssetIdByCategoryStatus" xsi:type="object">Magento\MediaContentCatalog\Model\GetAssetIdByCategoryStatus</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\MediaContent\Model\GetAssetIdByContentStoreComposite">
+        <arguments>
+            <argument name="getAssetIdByContentFieldArray" xsi:type="array">
+                <item name="getAssetIdByProductStore" xsi:type="object">Magento\MediaContentCatalog\Model\GetAssetIdByProductStore</item>
+                <item name="getAssetIdByCategoryStore" xsi:type="object">Magento\MediaContentCatalog\Model\GetAssetIdByCategoryStore</item>
+            </argument>
+        </arguments>
+    </virtualType>
 </config>
diff --git a/app/code/Magento/MediaContent/Model/GetAssetIdByContentStatus.php b/app/code/Magento/MediaContentCms/Model/GetAssetIdByContentField.php
similarity index 61%
rename from app/code/Magento/MediaContent/Model/GetAssetIdByContentStatus.php
rename to app/code/Magento/MediaContentCms/Model/GetAssetIdByContentField.php
index f9ec4cff77bae..cb10a097e59ac 100644
--- a/app/code/Magento/MediaContent/Model/GetAssetIdByContentStatus.php
+++ b/app/code/Magento/MediaContentCms/Model/GetAssetIdByContentField.php
@@ -5,15 +5,17 @@
  */
 declare(strict_types=1);
 
-namespace Magento\MediaContent\Model;
+namespace Magento\MediaContentCms\Model;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\MediaContentApi\Model\GetAssetIdByContentStatusInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\MediaContentApi\Model\GetAssetIdByContentFieldInterface;
+use Magento\Store\Api\StoreRepositoryInterface;
 
 /**
- * Class responsible to return Asset id by entity status
+ * Class responsible to return Asset id by content field
  */
-class GetAssetIdByContentStatus implements GetAssetIdByContentStatusInterface
+class GetAssetIdByContentField implements GetAssetIdByContentFieldInterface
 {
     private const TABLE_CONTENT_ASSET = 'media_content_asset';
 
@@ -30,47 +32,40 @@ class GetAssetIdByContentStatus implements GetAssetIdByContentStatusInterface
     /**
      * @var string
      */
-    private $contentTable;
+    private $fieldTable;
 
     /**
      * @var string
      */
-    private $statusColumn;
+    private $fieldColumn;
 
     /**
      * @var string
      */
     private $idColumn;
 
-    /**
-     * @var array
-     */
-    private $valueMap;
 
     /**
-     * GetAssetIdByContentStatus constructor.
+     * GetAssetIdByContentField constructor.
      *
      * @param ResourceConnection $resource
      * @param string $entityType
-     * @param string $contentTable
+     * @param string $fieldTable
      * @param string $idColumn
-     * @param string $statusColumn
-     * @param array $valueMap
+     * @param string $fieldColumn
      */
     public function __construct(
         ResourceConnection $resource,
         string $entityType,
-        string $contentTable,
+        string $fieldTable,
         string $idColumn,
-        string $statusColumn,
-        array $valueMap = []
+        string $fieldColumn
     ) {
         $this->connection = $resource;
         $this->entityType = $entityType;
-        $this->contentTable = $contentTable;
+        $this->fieldTable = $fieldTable;
         $this->idColumn = $idColumn;
-        $this->statusColumn = $statusColumn;
-        $this->valueMap = $valueMap;
+        $this->fieldColumn = $fieldColumn;
     }
 
     /**
@@ -85,11 +80,11 @@ public function execute(string $value): array
             'entity_type = ?',
             $this->entityType
         )->joinInner(
-            ['content_table' => $this->connection->getTableName($this->contentTable)],
-            'asset_content_table.entity_id = content_table.' . $this->idColumn,
+            ['field_table' => $this->connection->getTableName($this->fieldTable)],
+            'asset_content_table.entity_id = field_table.' . $this->idColumn,
             []
         )->where(
-            'content_table.' . $this->statusColumn . ' = ?',
+            'field_table.' . $this->fieldColumn . ' = ?',
             $value
         );
 
diff --git a/app/code/Magento/MediaContentCms/composer.json b/app/code/Magento/MediaContentCms/composer.json
index ea32fdd7a49fa..ff8bff348770b 100644
--- a/app/code/Magento/MediaContentCms/composer.json
+++ b/app/code/Magento/MediaContentCms/composer.json
@@ -4,6 +4,7 @@
     "require": {
         "php": "~7.3.0||~7.4.0",
         "magento/module-media-content-api": "*",
+        "magento/module-media-content": "*",
         "magento/module-cms": "*",
         "magento/framework": "*"
     },
diff --git a/app/code/Magento/MediaContentCms/etc/di.xml b/app/code/Magento/MediaContentCms/etc/di.xml
index 6f196889540af..dc633b95d0517 100644
--- a/app/code/Magento/MediaContentCms/etc/di.xml
+++ b/app/code/Magento/MediaContentCms/etc/di.xml
@@ -34,4 +34,52 @@
             </argument>
         </arguments>
     </type>
+    <virtualType name="Magento\MediaContentCms\Model\GetAssetIdByBlockStore" type="Magento\MediaContentCms\Model\GetAssetIdByContentField">
+        <arguments>
+            <argument name="entityType" xsi:type="string">cms_block</argument>
+            <argument name="fieldTable" xsi:type="string">cms_block_store</argument>
+            <argument name="idColumn" xsi:type="string">block_id</argument>
+            <argument name="fieldColumn" xsi:type="string">store_id</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\MediaContentCms\Model\GetAssetIdByPageStore" type="Magento\MediaContentCms\Model\GetAssetIdByContentField">
+        <arguments>
+            <argument name="entityType" xsi:type="string">cms_page</argument>
+            <argument name="fieldTable" xsi:type="string">cms_page_store</argument>
+            <argument name="idColumn" xsi:type="string">page_id</argument>
+            <argument name="fieldColumn" xsi:type="string">store_id</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\MediaContentCms\Model\GetAssetIdByPageStatus" type="Magento\MediaContentCms\Model\GetAssetIdByContentField">
+        <arguments>
+            <argument name="entityType" xsi:type="string">cms_page</argument>
+            <argument name="fieldTable" xsi:type="string">cms_page</argument>
+            <argument name="idColumn" xsi:type="string">page_id</argument>
+            <argument name="fieldColumn" xsi:type="string">is_active</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\MediaContentCms\Model\GetAssetIdByBlockStatus" type="Magento\MediaContentCms\Model\GetAssetIdByContentField">
+        <arguments>
+            <argument name="entityType" xsi:type="string">cms_block</argument>
+            <argument name="fieldTable" xsi:type="string">cms_block</argument>
+            <argument name="idColumn" xsi:type="string">block_id</argument>
+            <argument name="fieldColumn" xsi:type="string">is_active</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\MediaContent\Model\GetAssetIdByContentStatusComposite">
+        <arguments>
+            <argument name="getAssetIdByContentFieldArray" xsi:type="array">
+                <item name="getAssetIdByPageStatus" xsi:type="object">Magento\MediaContentCms\Model\GetAssetIdByPageStatus</item>
+                <item name="getAssetIdByBlockStatus" xsi:type="object">Magento\MediaContentCms\Model\GetAssetIdByBlockStatus</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\MediaContent\Model\GetAssetIdByContentStoreComposite">
+        <arguments>
+            <argument name="getAssetIdByContentFieldArray" xsi:type="array">
+                <item name="getAssetIdByPageStore" xsi:type="object">Magento\MediaContentCms\Model\GetAssetIdByPageStore</item>
+                <item name="getAssetIdByBlockStore" xsi:type="object">Magento\MediaContentCms\Model\GetAssetIdByBlockStore</item>
+            </argument>
+        </arguments>
+    </virtualType>
 </config>
diff --git a/app/code/Magento/MediaContentUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/ContentStatus.php b/app/code/Magento/MediaContentUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/ContentStatus.php
index bf157569586ba..3a18103b640f2 100644
--- a/app/code/Magento/MediaContentUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/ContentStatus.php
+++ b/app/code/Magento/MediaContentUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/ContentStatus.php
@@ -10,23 +10,23 @@
 use Magento\Framework\Api\Filter;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessor\FilterProcessor\CustomFilterInterface;
 use Magento\Framework\Data\Collection\AbstractDb;
-use Magento\MediaContentApi\Model\GetAssetIdByContentStatusInterface;
+use Magento\MediaContentApi\Model\GetAssetIdByContentFieldInterface;
 
 class ContentStatus implements CustomFilterInterface
 {
     private const TABLE_ALIAS = 'main_table';
 
     /**
-     * @var GetAssetIdByContentStatusInterface
+     * @var GetAssetIdByContentFieldInterface
      */
     private $getAssetIdByContentStatus;
 
     /**
      * ContentStatus constructor.
-     * @param GetAssetIdByContentStatusInterface $getAssetIdByContentStatus
+     * @param GetAssetIdByContentFieldInterface $getAssetIdByContentStatus
      */
     public function __construct(
-        GetAssetIdByContentStatusInterface $getAssetIdByContentStatus
+        GetAssetIdByContentFieldInterface $getAssetIdByContentStatus
     ) {
         $this->getAssetIdByContentStatus = $getAssetIdByContentStatus;
     }
diff --git a/app/code/Magento/MediaContentUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/StoreView.php b/app/code/Magento/MediaContentUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/StoreView.php
new file mode 100644
index 0000000000000..ad445c24986cb
--- /dev/null
+++ b/app/code/Magento/MediaContentUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/StoreView.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor;
+
+use Magento\Framework\Api\Filter;
+use Magento\Framework\Api\SearchCriteria\CollectionProcessor\FilterProcessor\CustomFilterInterface;
+use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\MediaContentApi\Model\GetAssetIdByContentFieldInterface;
+
+class StoreView implements CustomFilterInterface
+{
+    private const TABLE_ALIAS = 'main_table';
+
+    /**
+     * @var GetAssetIdByContentFieldInterface
+     */
+    private $getAssetIdByContentStatus;
+
+    /**
+     * ContentStatus constructor.
+     * @param GetAssetIdByContentFieldInterface $getAssetIdByContentStatus
+     */
+    public function __construct(
+        GetAssetIdByContentFieldInterface $getAssetIdByContentStatus
+    ) {
+        $this->getAssetIdByContentStatus = $getAssetIdByContentStatus;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function apply(Filter $filter, AbstractDb $collection): bool
+    {
+        $collection->addFieldToFilter(
+            self::TABLE_ALIAS . '.id',
+            ['in' => $this->getAssetIdByContentStatus->execute($filter->getValue())]
+        );
+
+        return true;
+    }
+
+}
diff --git a/app/code/Magento/MediaContentUi/etc/adminhtml/di.xml b/app/code/Magento/MediaContentUi/etc/adminhtml/di.xml
index e8fc8ef9c1ddd..e36e2f1305035 100644
--- a/app/code/Magento/MediaContentUi/etc/adminhtml/di.xml
+++ b/app/code/Magento/MediaContentUi/etc/adminhtml/di.xml
@@ -10,6 +10,7 @@
         <arguments>
             <argument name="customFilters" xsi:type="array">
                 <item name="content_status" xsi:type="object">Magento\MediaContentUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor\ContentStatus</item>
+                <item name="store_id" xsi:type="object">Magento\MediaContentUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor\StoreView</item>
             </argument>
         </arguments>
     </virtualType>
@@ -18,4 +19,9 @@
             <argument name="getAssetIdByContentStatus" xsi:type="object">Magento\MediaContent\Model\GetAssetIdByContentStatusComposite</argument>
         </arguments>
     </type>
+    <type name="Magento\MediaContentUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor\StoreView">
+        <arguments>
+            <argument name="getAssetIdByContentStatus" xsi:type="object">Magento\MediaContent\Model\GetAssetIdByContentStoreComposite</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/MediaContentUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml b/app/code/Magento/MediaContentUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml
index fe6ccd94cd0b1..2cf209d8b6210 100644
--- a/app/code/Magento/MediaContentUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml
+++ b/app/code/Magento/MediaContentUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml
@@ -17,6 +17,17 @@
                     <dataScope>content_status</dataScope>
                 </settings>
             </filterSelect>
+            <filterSelect name="store_id" provider="${ $.parentName }">
+                <settings>
+                    <captionValue>0</captionValue>
+                    <options class="Magento\Cms\Ui\Component\Listing\Column\Cms\Options"/>
+                    <label translate="true">Store View</label>
+                    <dataScope>store_id</dataScope>
+                    <imports>
+                        <link name="visible">componentType = column, index = ${ $.index }:visible</link>
+                    </imports>
+                </settings>
+            </filterSelect>
         </filters>
     </listingToolbar>
 </listing>

From 279cf2df2432dc71a6fdab767bcefd8dd91909c8 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Thu, 9 Jul 2020 14:14:45 +0100
Subject: [PATCH 0783/1718] Removed MediaContentUi from core repo

---
 app/code/Magento/MediaContentUi/LICENSE.txt   | 48 -------------------
 .../Magento/MediaContentUi/LICENSE_AFL.txt    | 48 -------------------
 .../FilterProcessor/ContentStatus.php         | 47 ------------------
 .../FilterProcessor/StoreView.php             | 47 ------------------
 app/code/Magento/MediaContentUi/README.md     | 13 -----
 .../Listing/Filters/Options/Status.php        | 27 -----------
 app/code/Magento/MediaContentUi/composer.json | 24 ----------
 .../MediaContentUi/etc/adminhtml/di.xml       | 27 -----------
 .../Magento/MediaContentUi/etc/module.xml     | 10 ----
 .../Magento/MediaContentUi/registration.php   |  9 ----
 .../ui_component/media_gallery_listing.xml    | 22 ---------
 .../standalone_media_gallery_listing.xml      | 33 -------------
 12 files changed, 355 deletions(-)
 delete mode 100644 app/code/Magento/MediaContentUi/LICENSE.txt
 delete mode 100644 app/code/Magento/MediaContentUi/LICENSE_AFL.txt
 delete mode 100644 app/code/Magento/MediaContentUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/ContentStatus.php
 delete mode 100644 app/code/Magento/MediaContentUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/StoreView.php
 delete mode 100644 app/code/Magento/MediaContentUi/README.md
 delete mode 100644 app/code/Magento/MediaContentUi/Ui/Component/Listing/Filters/Options/Status.php
 delete mode 100644 app/code/Magento/MediaContentUi/composer.json
 delete mode 100644 app/code/Magento/MediaContentUi/etc/adminhtml/di.xml
 delete mode 100644 app/code/Magento/MediaContentUi/etc/module.xml
 delete mode 100644 app/code/Magento/MediaContentUi/registration.php
 delete mode 100644 app/code/Magento/MediaContentUi/view/adminhtml/ui_component/media_gallery_listing.xml
 delete mode 100644 app/code/Magento/MediaContentUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml

diff --git a/app/code/Magento/MediaContentUi/LICENSE.txt b/app/code/Magento/MediaContentUi/LICENSE.txt
deleted file mode 100644
index 49525fd99da9c..0000000000000
--- a/app/code/Magento/MediaContentUi/LICENSE.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-
-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/MediaContentUi/LICENSE_AFL.txt b/app/code/Magento/MediaContentUi/LICENSE_AFL.txt
deleted file mode 100644
index f39d641b18a19..0000000000000
--- a/app/code/Magento/MediaContentUi/LICENSE_AFL.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-
-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/MediaContentUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/ContentStatus.php b/app/code/Magento/MediaContentUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/ContentStatus.php
deleted file mode 100644
index 3a18103b640f2..0000000000000
--- a/app/code/Magento/MediaContentUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/ContentStatus.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\MediaContentUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor;
-
-use Magento\Framework\Api\Filter;
-use Magento\Framework\Api\SearchCriteria\CollectionProcessor\FilterProcessor\CustomFilterInterface;
-use Magento\Framework\Data\Collection\AbstractDb;
-use Magento\MediaContentApi\Model\GetAssetIdByContentFieldInterface;
-
-class ContentStatus implements CustomFilterInterface
-{
-    private const TABLE_ALIAS = 'main_table';
-
-    /**
-     * @var GetAssetIdByContentFieldInterface
-     */
-    private $getAssetIdByContentStatus;
-
-    /**
-     * ContentStatus constructor.
-     * @param GetAssetIdByContentFieldInterface $getAssetIdByContentStatus
-     */
-    public function __construct(
-        GetAssetIdByContentFieldInterface $getAssetIdByContentStatus
-    ) {
-        $this->getAssetIdByContentStatus = $getAssetIdByContentStatus;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function apply(Filter $filter, AbstractDb $collection): bool
-    {
-        $collection->addFieldToFilter(
-            self::TABLE_ALIAS . '.id',
-            ['in' => $this->getAssetIdByContentStatus->execute($filter->getValue())]
-        );
-
-        return true;
-    }
-
-}
diff --git a/app/code/Magento/MediaContentUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/StoreView.php b/app/code/Magento/MediaContentUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/StoreView.php
deleted file mode 100644
index ad445c24986cb..0000000000000
--- a/app/code/Magento/MediaContentUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/StoreView.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\MediaContentUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor;
-
-use Magento\Framework\Api\Filter;
-use Magento\Framework\Api\SearchCriteria\CollectionProcessor\FilterProcessor\CustomFilterInterface;
-use Magento\Framework\Data\Collection\AbstractDb;
-use Magento\MediaContentApi\Model\GetAssetIdByContentFieldInterface;
-
-class StoreView implements CustomFilterInterface
-{
-    private const TABLE_ALIAS = 'main_table';
-
-    /**
-     * @var GetAssetIdByContentFieldInterface
-     */
-    private $getAssetIdByContentStatus;
-
-    /**
-     * ContentStatus constructor.
-     * @param GetAssetIdByContentFieldInterface $getAssetIdByContentStatus
-     */
-    public function __construct(
-        GetAssetIdByContentFieldInterface $getAssetIdByContentStatus
-    ) {
-        $this->getAssetIdByContentStatus = $getAssetIdByContentStatus;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function apply(Filter $filter, AbstractDb $collection): bool
-    {
-        $collection->addFieldToFilter(
-            self::TABLE_ALIAS . '.id',
-            ['in' => $this->getAssetIdByContentStatus->execute($filter->getValue())]
-        );
-
-        return true;
-    }
-
-}
diff --git a/app/code/Magento/MediaContentUi/README.md b/app/code/Magento/MediaContentUi/README.md
deleted file mode 100644
index 2145d9c328914..0000000000000
--- a/app/code/Magento/MediaContentUi/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Magento_MediaContentUi module
-
-The Magento_MediaContentUi module is responsible for the media content user interface (UI) implementation.
-
-## Extensibility
-
-Extension developers can interact with the Magento_MediaContentUi module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.4/extension-dev-guide/plugins.html).
-
-[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.4/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_MediaContentUi module.
-
-## Additional information
-
-For information about significant changes in patch releases, see [2.3.x Release information](https://devdocs.magento.com/guides/v2.4/release-notes/bk-release-notes.html).
diff --git a/app/code/Magento/MediaContentUi/Ui/Component/Listing/Filters/Options/Status.php b/app/code/Magento/MediaContentUi/Ui/Component/Listing/Filters/Options/Status.php
deleted file mode 100644
index 4ac4161453d17..0000000000000
--- a/app/code/Magento/MediaContentUi/Ui/Component/Listing/Filters/Options/Status.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\MediaContentUi\Ui\Component\Listing\Filters\Options;
-
-use Magento\Framework\Data\OptionSourceInterface;
-
-/**
- * Status filter options
- */
-class Status implements OptionSourceInterface
-{
-    /**
-     * @inheritdoc
-     */
-    public function toOptionArray(): array
-    {
-        return [
-            ['value' => '1', 'label' => __('Enabled')],
-            ['value' => '0', 'label' => __('Disabled')]
-        ];
-    }
-}
diff --git a/app/code/Magento/MediaContentUi/composer.json b/app/code/Magento/MediaContentUi/composer.json
deleted file mode 100644
index 67b92f925d11d..0000000000000
--- a/app/code/Magento/MediaContentUi/composer.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "name": "magento/module-media-content-ui",
-    "description": "Magento module responsible for media content user interface",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-media-content-api": "*",
-        "magento/module-media-content": "*",
-        "magento/module-media-gallery-ui": "*"
-    },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "autoload": {
-        "files": [
-            "registration.php"
-        ],
-        "psr-4": {
-            "Magento\\MediaContentUi\\": ""
-        }
-    }
-}
diff --git a/app/code/Magento/MediaContentUi/etc/adminhtml/di.xml b/app/code/Magento/MediaContentUi/etc/adminhtml/di.xml
deleted file mode 100644
index e36e2f1305035..0000000000000
--- a/app/code/Magento/MediaContentUi/etc/adminhtml/di.xml
+++ /dev/null
@@ -1,27 +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:framework:ObjectManager/etc/config.xsd">
-    <virtualType name="Magento\MediaGalleryUi\Model\Api\SearchCriteria\CollectionProcessor\FilterProcessor">
-        <arguments>
-            <argument name="customFilters" xsi:type="array">
-                <item name="content_status" xsi:type="object">Magento\MediaContentUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor\ContentStatus</item>
-                <item name="store_id" xsi:type="object">Magento\MediaContentUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor\StoreView</item>
-            </argument>
-        </arguments>
-    </virtualType>
-    <type name="Magento\MediaContentUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor\ContentStatus">
-        <arguments>
-            <argument name="getAssetIdByContentStatus" xsi:type="object">Magento\MediaContent\Model\GetAssetIdByContentStatusComposite</argument>
-        </arguments>
-    </type>
-    <type name="Magento\MediaContentUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor\StoreView">
-        <arguments>
-            <argument name="getAssetIdByContentStatus" xsi:type="object">Magento\MediaContent\Model\GetAssetIdByContentStoreComposite</argument>
-        </arguments>
-    </type>
-</config>
diff --git a/app/code/Magento/MediaContentUi/etc/module.xml b/app/code/Magento/MediaContentUi/etc/module.xml
deleted file mode 100644
index 3f615d11ae2ff..0000000000000
--- a/app/code/Magento/MediaContentUi/etc/module.xml
+++ /dev/null
@@ -1,10 +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:framework:Module/etc/module.xsd">
-    <module name="Magento_MediaContentUi" />
-</config>
diff --git a/app/code/Magento/MediaContentUi/registration.php b/app/code/Magento/MediaContentUi/registration.php
deleted file mode 100644
index 5f55c31a5936c..0000000000000
--- a/app/code/Magento/MediaContentUi/registration.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-use Magento\Framework\Component\ComponentRegistrar;
-
-ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_MediaContentUi', __DIR__);
diff --git a/app/code/Magento/MediaContentUi/view/adminhtml/ui_component/media_gallery_listing.xml b/app/code/Magento/MediaContentUi/view/adminhtml/ui_component/media_gallery_listing.xml
deleted file mode 100644
index fe6ccd94cd0b1..0000000000000
--- a/app/code/Magento/MediaContentUi/view/adminhtml/ui_component/media_gallery_listing.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
-    <listingToolbar name="listing_top">
-        <filters name="listing_filters">
-            <filterSelect name="content_status" provider="${ $.parentName }" sortOrder="10">
-                <settings>
-                    <options class="Magento\MediaContentUi\Ui\Component\Listing\Filters\Options\Status"/>
-                    <label translate="true">Content Status</label>
-                    <caption>All</caption>
-                    <dataScope>content_status</dataScope>
-                </settings>
-            </filterSelect>
-        </filters>
-    </listingToolbar>
-</listing>
diff --git a/app/code/Magento/MediaContentUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml b/app/code/Magento/MediaContentUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml
deleted file mode 100644
index 2cf209d8b6210..0000000000000
--- a/app/code/Magento/MediaContentUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
-    <listingToolbar name="listing_top">
-        <filters name="listing_filters">
-            <filterSelect name="content_status" provider="${ $.parentName }" sortOrder="10">
-                <settings>
-                    <options class="Magento\MediaContentUi\Ui\Component\Listing\Filters\Options\Status"/>
-                    <label translate="true">Content Status</label>
-                    <caption>All</caption>
-                    <dataScope>content_status</dataScope>
-                </settings>
-            </filterSelect>
-            <filterSelect name="store_id" provider="${ $.parentName }">
-                <settings>
-                    <captionValue>0</captionValue>
-                    <options class="Magento\Cms\Ui\Component\Listing\Column\Cms\Options"/>
-                    <label translate="true">Store View</label>
-                    <dataScope>store_id</dataScope>
-                    <imports>
-                        <link name="visible">componentType = column, index = ${ $.index }:visible</link>
-                    </imports>
-                </settings>
-            </filterSelect>
-        </filters>
-    </listingToolbar>
-</listing>

From d9edb5b498c6002df084a9f724b974553b528a21 Mon Sep 17 00:00:00 2001
From: Dmitriy Gallyamov <dmitrijs.gallamovs@gmail.com>
Date: Thu, 9 Jul 2020 16:22:39 +0300
Subject: [PATCH 0784/1718] magento/magento2#28569: Multi-store: Missing store
 codes in relation to a group and website

- Fixed store config API test
---
 .../testsuite/Magento/Store/Api/StoreConfigManagerTest.php       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/Store/Api/StoreConfigManagerTest.php b/dev/tests/api-functional/testsuite/Magento/Store/Api/StoreConfigManagerTest.php
index 4fcf38f92a9b9..0a2ecaaed8b5d 100644
--- a/dev/tests/api-functional/testsuite/Magento/Store/Api/StoreConfigManagerTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Store/Api/StoreConfigManagerTest.php
@@ -43,7 +43,6 @@ public function testGetStoreConfigs()
         $expectedKeys = [
             'id',
             'code',
-            'name',
             'website_id',
             'locale',
             'base_currency_code',

From 11082e79ed5547da5bd9db408c987ae1e3374722 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Thu, 9 Jul 2020 14:56:59 +0100
Subject: [PATCH 0785/1718] Refactor of category store class and removed
 unecessary stuff

---
 .../GetAssetIdByContentFieldComposite.php     |  1 +
 .../Model/GetAssetIdByCategoryStore.php       | 50 +++++++++++++------
 .../Model/GetAssetIdByProductStore.php        |  5 +-
 3 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/app/code/Magento/MediaContent/Model/GetAssetIdByContentFieldComposite.php b/app/code/Magento/MediaContent/Model/GetAssetIdByContentFieldComposite.php
index b36b112286a8f..eab2bd05394e1 100644
--- a/app/code/Magento/MediaContent/Model/GetAssetIdByContentFieldComposite.php
+++ b/app/code/Magento/MediaContent/Model/GetAssetIdByContentFieldComposite.php
@@ -36,6 +36,7 @@ public function execute(string $value): array
     {
         $ids = [];
         foreach ($this->getAssetIdByContentFieldArray as $getAssetIdByContentField) {
+            // phpcs:ignore Magento2.Performance.ForeachArrayMerge
             $ids = array_merge($ids, $getAssetIdByContentField->execute($value));
         }
         return array_unique($ids);
diff --git a/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByCategoryStore.php b/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByCategoryStore.php
index f6f0d3090a9af..cea27a59a44a5 100644
--- a/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByCategoryStore.php
+++ b/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByCategoryStore.php
@@ -7,6 +7,7 @@
 
 namespace Magento\MediaContentCatalog\Model;
 
+use Magento\Catalog\Api\CategoryManagementInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\MediaContentApi\Model\GetAssetIdByContentFieldInterface;
@@ -14,11 +15,12 @@
 use Magento\Store\Api\StoreRepositoryInterface;
 
 /**
- * Class responsible to return Asset id by content field
+ * Class responsible to return Asset id by category store
  */
 class GetAssetIdByCategoryStore implements GetAssetIdByContentFieldInterface
 {
     private const TABLE_CONTENT_ASSET = 'media_content_asset';
+    private const TABLE_CATALOG_CATEGORY = 'catalog_category_entity';
 
     /**
      * @var ResourceConnection
@@ -67,7 +69,7 @@ public function execute(string $value): array
     {
         $storeView = $this->storeRepository->getById($value);
         $storeGroup = $this->storeGroupRepository->get($storeView->getStoreGroupId());
-        $categoryIds = $this->getCategoryIdsByRootCategory($storeGroup->getRootCategoryId());
+        $categoryIds = $this->getCategoryIdsByRootCategory((int) $storeGroup->getRootCategoryId());
         $sql = $this->connection->getConnection()->select()->from(
             ['asset_content_table' => $this->connection->getTableName(self::TABLE_CONTENT_ASSET)],
             ['asset_id']
@@ -86,21 +88,15 @@ public function execute(string $value): array
         }, $result);
     }
 
-    private function getCategoryIdsByRootCategory($rootCategoryId)
+    /**
+     * This function returns an array of category ids that have content and are under the root parameter
+     *
+     * @param $rootCategoryId
+     * @return array
+     */
+    private function getCategoryIdsByRootCategory(int $rootCategoryId): array
     {
-        $contentCategoriesSql = $this->connection->getConnection()->select()->from(
-            ['asset_content_table' => $this->connection->getTableName(self::TABLE_CONTENT_ASSET)],
-            ['entity_id']
-        )->where(
-            'entity_type = ?',
-            $this->entityType
-        )->joinInner(
-            ['category_table' => $this->connection->getTableName('catalog_category_entity')],
-            'asset_content_table.entity_id = category_table.entity_id',
-            ['path']
-        );
-
-        $result = $this->connection->getConnection()->fetchAll($contentCategoriesSql);
+        $result = $this->getCategoryIdsAndPath();
 
         $result = array_filter($result, function ($item) use ($rootCategoryId) {
             $pathArray = explode("/", $item['path']);
@@ -117,4 +113,26 @@ private function getCategoryIdsByRootCategory($rootCategoryId)
             return $item['entity_id'];
         }, $result);
     }
+
+    /**
+     * This function returns an array of category_id and path of categories that have content
+     *
+     * @return array
+     */
+    private function getCategoryIdsAndPath(): array
+    {
+        $contentCategoriesSql = $this->connection->getConnection()->select()->from(
+            ['asset_content_table' => $this->connection->getTableName(self::TABLE_CONTENT_ASSET)],
+            ['entity_id']
+        )->where(
+            'entity_type = ?',
+            $this->entityType
+        )->joinInner(
+            ['category_table' => $this->connection->getTableName(self::TABLE_CATALOG_CATEGORY)],
+            'asset_content_table.entity_id = category_table.entity_id',
+            ['path']
+        );
+
+        return $this->connection->getConnection()->fetchAll($contentCategoriesSql);
+    }
 }
diff --git a/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByProductStore.php b/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByProductStore.php
index a13da8d501903..3772b56f82d0f 100644
--- a/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByProductStore.php
+++ b/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByProductStore.php
@@ -13,14 +13,11 @@
 use Magento\Store\Api\StoreRepositoryInterface;
 
 /**
- * Class responsible to return Asset id by content field
+ * Class responsible to return Asset ids by product store
  */
 class GetAssetIdByProductStore implements GetAssetIdByContentFieldInterface
 {
     private const TABLE_CONTENT_ASSET = 'media_content_asset';
-    private const ENTITY_STOREVIEW_RELATION = 'store_view';
-    private const ENTITY_STOREGROUP_RELATION = 'store_group';
-    private const ENTITY_WEBSITE_RELATION = 'website';
 
     /**
      * @var ResourceConnection

From e0a777b1adaff963434d7acc228b897d16ddb762 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Thu, 9 Jul 2020 15:07:09 +0100
Subject: [PATCH 0786/1718] Removed contruct params and added constants

---
 .../Model/GetAssetIdByCategoryStore.php       | 11 ++----
 .../Model/GetAssetIdByProductStore.php        | 36 +++++--------------
 2 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByCategoryStore.php b/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByCategoryStore.php
index cea27a59a44a5..7194bbc382539 100644
--- a/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByCategoryStore.php
+++ b/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByCategoryStore.php
@@ -21,6 +21,7 @@ class GetAssetIdByCategoryStore implements GetAssetIdByContentFieldInterface
 {
     private const TABLE_CONTENT_ASSET = 'media_content_asset';
     private const TABLE_CATALOG_CATEGORY = 'catalog_category_entity';
+    private const ENTITY_TYPE = 'catalog_category';
 
     /**
      * @var ResourceConnection
@@ -37,11 +38,6 @@ class GetAssetIdByCategoryStore implements GetAssetIdByContentFieldInterface
      */
     private $storeGroupRepository;
 
-    /**
-     * @var string
-     */
-    private $entityType;
-
     /**
      * GetAssetIdByProductStore constructor.
      *
@@ -57,7 +53,6 @@ public function __construct(
         $this->connection = $resource;
         $this->storeRepository = $storeRepository;
         $this->storeGroupRepository = $storeGroupRepository;
-        $this->entityType = 'catalog_category';
     }
 
     /**
@@ -75,7 +70,7 @@ public function execute(string $value): array
             ['asset_id']
         )->where(
             'entity_type = ?',
-            $this->entityType
+            self::ENTITY_TYPE
         )->where(
             'entity_id IN (?)',
             $categoryIds
@@ -126,7 +121,7 @@ private function getCategoryIdsAndPath(): array
             ['entity_id']
         )->where(
             'entity_type = ?',
-            $this->entityType
+            self::ENTITY_TYPE
         )->joinInner(
             ['category_table' => $this->connection->getTableName(self::TABLE_CATALOG_CATEGORY)],
             'asset_content_table.entity_id = category_table.entity_id',
diff --git a/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByProductStore.php b/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByProductStore.php
index 3772b56f82d0f..2e4b7620e52eb 100644
--- a/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByProductStore.php
+++ b/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByProductStore.php
@@ -18,6 +18,10 @@
 class GetAssetIdByProductStore implements GetAssetIdByContentFieldInterface
 {
     private const TABLE_CONTENT_ASSET = 'media_content_asset';
+    private const ENTITY_TYPE = 'catalog_product';
+    private const FIELD_TABLE = 'catalog_product_website';
+    private const ID_COLUMN = 'product_id';
+    private const FIELD_COLUMN = 'website_id';
 
     /**
      * @var ResourceConnection
@@ -29,26 +33,6 @@ class GetAssetIdByProductStore implements GetAssetIdByContentFieldInterface
      */
     private $storeRepository;
 
-    /**
-     * @var string
-     */
-    private $entityType;
-
-    /**
-     * @var string
-     */
-    private $fieldTable;
-
-    /**
-     * @var string
-     */
-    private $fieldColumn;
-
-    /**
-     * @var string
-     */
-    private $idColumn;
-
     /**
      * GetAssetIdByProductStore constructor.
      *
@@ -61,10 +45,6 @@ public function __construct(
     ) {
         $this->connection = $resource;
         $this->storeRepository = $storeRepository;
-        $this->entityType = 'catalog_product';
-        $this->fieldTable = 'catalog_product_website';
-        $this->idColumn = 'product_id';
-        $this->fieldColumn = 'website_id';
     }
 
     /**
@@ -80,13 +60,13 @@ public function execute(string $value): array
             ['asset_id']
         )->where(
             'entity_type = ?',
-            $this->entityType
+            self::ENTITY_TYPE
         )->joinInner(
-            ['field_table' => $this->connection->getTableName($this->fieldTable)],
-            'asset_content_table.entity_id = field_table.' . $this->idColumn,
+            ['field_table' => $this->connection->getTableName(self::FIELD_TABLE)],
+            'asset_content_table.entity_id = field_table.' . self::ID_COLUMN,
             []
         )->where(
-            'field_table.' . $this->fieldColumn . ' = ?',
+            'field_table.' . self::FIELD_COLUMN . ' = ?',
             $store->getWebsiteId()
         );
 

From a87a88dfb508f31fb655c93af0b88a110a86b52a Mon Sep 17 00:00:00 2001
From: Marjan Petkovski <petkovski.marjan@gmail.com>
Date: Thu, 9 Jul 2020 16:38:57 +0200
Subject: [PATCH 0787/1718] magento/magento2#28563: GraphQL product search does
 not consider Category Permissions configuration - Pass the context as
 argument

Address static tests
---
 .../ConfigurableProductGraphQl/Model/Variant/Collection.php   | 4 ++--
 app/code/Magento/ConfigurableProductGraphQl/composer.json     | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php
index d9c68a9b25791..b60a660251f4d 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php
@@ -119,7 +119,7 @@ public function addEavAttributes(array $attributeCodes) : void
      * Retrieve child products from for passed in parent id.
      *
      * @param int $id
-     * @param ContextInterface $context|null
+     * @param ContextInterface|null $context
      * @return array
      */
     public function getChildProductsByParentId(int $id, ContextInterface $context = null) : array
@@ -136,7 +136,7 @@ public function getChildProductsByParentId(int $id, ContextInterface $context =
     /**
      * Fetch all children products from parent id's.
      *
-     * @param ContextInterface $context|null
+     * @param ContextInterface|null $context
      * @return array
      */
     private function fetch(ContextInterface $context = null) : array
diff --git a/app/code/Magento/ConfigurableProductGraphQl/composer.json b/app/code/Magento/ConfigurableProductGraphQl/composer.json
index 76ec4ad3153e2..295efb65b1978 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/composer.json
+++ b/app/code/Magento/ConfigurableProductGraphQl/composer.json
@@ -6,6 +6,7 @@
         "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": "*",

From 6d5fbd78604fe311df6fc2f8603cc8d7d96ed32f Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Thu, 9 Jul 2020 17:47:07 +0300
Subject: [PATCH 0788/1718] MC-35600: The customer creation page not opens
 without default group selected

---
 .../UpdateDefaultCustomerGroupInConfig.php    | 79 +++++++++++++++++++
 .../Magento/Customer/etc/adminhtml/system.xml |  5 ++
 2 files changed, 84 insertions(+)
 create mode 100644 app/code/Magento/Customer/Setup/Patch/Data/UpdateDefaultCustomerGroupInConfig.php

diff --git a/app/code/Magento/Customer/Setup/Patch/Data/UpdateDefaultCustomerGroupInConfig.php b/app/code/Magento/Customer/Setup/Patch/Data/UpdateDefaultCustomerGroupInConfig.php
new file mode 100644
index 0000000000000..c8159adc2ccff
--- /dev/null
+++ b/app/code/Magento/Customer/Setup/Patch/Data/UpdateDefaultCustomerGroupInConfig.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Setup\Patch\Data;
+
+use Magento\Customer\Model\GroupManagement;
+use Magento\Customer\Model\Vat;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+
+/**
+ * Update default customer group id in customer configuration if it's value is NULL
+ */
+class UpdateDefaultCustomerGroupInConfig implements DataPatchInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var GroupManagement
+     */
+    private $groupManagement;
+
+    /**
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param GroupManagement $groupManagement
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        GroupManagement $groupManagement
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->groupManagement = $groupManagement;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function apply()
+    {
+        $customerGroups = $this->groupManagement->getLoggedInGroups();
+        $commonGroup = array_shift($customerGroups);
+
+        $this->moduleDataSetup->getConnection()->update(
+            $this->moduleDataSetup->getTable('core_config_data'),
+            ['value' => $commonGroup->getId()],
+            [
+                'value is ?' => new \Zend_Db_Expr('NULL'),
+                'path = ?' => GroupManagement::XML_PATH_DEFAULT_ID,
+            ]
+        );
+
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public static function getDependencies()
+    {
+        return [
+            DefaultCustomerGroupsAndAttributes::class,
+        ];
+    }
+}
diff --git a/app/code/Magento/Customer/etc/adminhtml/system.xml b/app/code/Magento/Customer/etc/adminhtml/system.xml
index fca625d847a1d..09a6e86eef0d2 100644
--- a/app/code/Magento/Customer/etc/adminhtml/system.xml
+++ b/app/code/Magento/Customer/etc/adminhtml/system.xml
@@ -40,6 +40,7 @@
                 <field id="default_group" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Default Group</label>
                     <source_model>Magento\Customer\Model\Config\Source\Group</source_model>
+                    <validate>required-entry</validate>
                 </field>
                 <field id="viv_domestic_group" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Group for Valid VAT ID - Domestic</label>
@@ -47,6 +48,7 @@
                     <depends>
                         <field id="auto_group_assign">1</field>
                     </depends>
+                    <validate>required-entry</validate>
                 </field>
                 <field id="viv_intra_union_group" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Group for Valid VAT ID - Intra-Union</label>
@@ -54,6 +56,7 @@
                     <depends>
                         <field id="auto_group_assign">1</field>
                     </depends>
+                    <validate>required-entry</validate>
                 </field>
                 <field id="viv_invalid_group" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Group for Invalid VAT ID</label>
@@ -61,6 +64,7 @@
                     <depends>
                         <field id="auto_group_assign">1</field>
                     </depends>
+                    <validate>required-entry</validate>
                 </field>
                 <field id="viv_error_group" translate="label" type="select" sortOrder="55" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Validation Error Group</label>
@@ -68,6 +72,7 @@
                     <depends>
                         <field id="auto_group_assign">1</field>
                     </depends>
+                    <validate>required-entry</validate>
                 </field>
                 <field id="viv_on_each_transaction" translate="label" type="select" sortOrder="56" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Validate on Each Transaction</label>

From 4b0f7ede4caca5d3a63ad0b6c7f0ad6f353894ea Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Thu, 9 Jul 2020 13:26:02 -0500
Subject: [PATCH 0789/1718] MC-32014: Remove google-shopping-ads module from
 core in 2.4.1

---
 .../Setup/Console/Command/UpgradeCommand.php    | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php b/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
index 03b0d03538c9b..ad183cfc72f39 100644
--- a/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
@@ -11,7 +11,7 @@
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\App\State as AppState;
 use Magento\Framework\DB\Ddl\Trigger;
-use Magento\Framework\Mview\View\CollectionInterface as ViewCollection;
+use Magento\Framework\Mview\View\CollectionFactory as ViewCollectionFactory;
 use Magento\Framework\Mview\View\StateInterface;
 use Magento\Framework\Setup\ConsoleLogger;
 use Magento\Framework\Setup\Declaration\Schema\DryRunLogger;
@@ -57,29 +57,29 @@ class UpgradeCommand extends AbstractSetupCommand
     private $searchConfigFactory;
 
     /*
-     * @var ViewCollection
+     * @var ViewCollectionFactory
      */
-    private $viewCollection;
+    private $viewCollectionFactory;
 
     /**
      * @param InstallerFactory $installerFactory
      * @param SearchConfigFactory $searchConfigFactory
      * @param DeploymentConfig $deploymentConfig
      * @param AppState|null $appState
-     * @param ViewCollection|null $viewCollection
+     * @param ViewCollectionFactory|null $viewCollectionFactory
      */
     public function __construct(
         InstallerFactory $installerFactory,
         SearchConfigFactory $searchConfigFactory,
         DeploymentConfig $deploymentConfig = null,
         AppState $appState = null,
-        ViewCollection $viewCollection = null
+        ViewCollectionFactory $viewCollectionFactory = null
     ) {
         $this->installerFactory = $installerFactory;
         $this->searchConfigFactory = $searchConfigFactory;
         $this->deploymentConfig = $deploymentConfig ?: ObjectManager::getInstance()->get(DeploymentConfig::class);
         $this->appState = $appState ?: ObjectManager::getInstance()->get(AppState::class);
-        $this->viewCollection = $viewCollection ?: ObjectManager::getInstance()->get(ViewCollection::class);
+        $this->viewCollectionFactory = $viewCollectionFactory ?: ObjectManager::getInstance()->get(ViewCollectionFactory::class);
         parent::__construct();
     }
 
@@ -179,14 +179,15 @@ protected function execute(InputInterface $input, OutputInterface $output)
     private function removeUnusedTriggers()
     {
         // unsubscribe mview
-        $viewList = $this->viewCollection->getViewsByStateMode(StateInterface::MODE_ENABLED);
+        $viewCollection = $this->viewCollectionFactory->create();
+        $viewList = $viewCollection->getViewsByStateMode(StateInterface::MODE_ENABLED);
         foreach ($viewList as $view) {
             /** @var \Magento\Framework\Mview\ViewInterface $view */
             $view->unsubscribe();
         }
 
         // remove extra triggers that have correct naming structure
-        /* @var ResourceConnection $resource */
+        /** @var ResourceConnection $resource */
         $resource = ObjectManager::getInstance()->get(ResourceConnection::class);
         $connection = $resource->getConnection();
         $triggers = $connection->getTriggers();

From 75bb2c3537b3a4c7ef719cca36d099bc6af9ef6c Mon Sep 17 00:00:00 2001
From: korostii <24894168+korostii@users.noreply.github.com>
Date: Thu, 9 Jul 2020 23:01:25 +0300
Subject: [PATCH 0790/1718] Fix #27523: fix tests for phpunit9 and php7.4

---
 .../Test/Unit/Console/Command/GeneratePatchCommandTest.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Developer/Test/Unit/Console/Command/GeneratePatchCommandTest.php b/app/code/Magento/Developer/Test/Unit/Console/Command/GeneratePatchCommandTest.php
index 2047c17c40b15..6fa1ca8a4674a 100644
--- a/app/code/Magento/Developer/Test/Unit/Console/Command/GeneratePatchCommandTest.php
+++ b/app/code/Magento/Developer/Test/Unit/Console/Command/GeneratePatchCommandTest.php
@@ -44,7 +44,7 @@ class GeneratePatchCommandTest extends TestCase
      */
     private $command;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->componentRegistrarMock = $this->createMock(ComponentRegistrar::class);
         $this->directoryListMock = $this->createMock(DirectoryList::class);
@@ -86,7 +86,7 @@ public function testExecute()
                 GeneratePatchCommand::INPUT_KEY_PATCH_NAME => 'SomePatch'
             ]
         );
-        $this->assertContains('successfully generated', $commandTester->getDisplay());
+        $this->assertStringContainsString('successfully generated', $commandTester->getDisplay());
     }
 
     public function testWrongParameter()

From 23a9f92646128a0ec7f5a4e4ee66fe5a3f99379e Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Thu, 9 Jul 2020 15:06:09 -0500
Subject: [PATCH 0791/1718] MC-20637: MyAccount :: Order Details :: Invoice
 Details by Order Number - review fixes

---
 .../Model/Resolver/InvoiceItems.php           |  2 +-
 .../Model/Resolver/InvoiceTotal.php           | 14 ++--
 ...axHelper.php => ShippingTaxCalculator.php} |  2 +-
 .../Magento/GraphQl/Sales/InvoiceTest.php     | 65 +++++++------------
 4 files changed, 32 insertions(+), 51 deletions(-)
 rename app/code/Magento/SalesGraphQl/Model/SalesItem/{ShippingTaxHelper.php => ShippingTaxCalculator.php} (99%)

diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceItems.php b/app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceItems.php
index a8cd0c83ed190..e9e43952641eb 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceItems.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceItems.php
@@ -145,7 +145,7 @@ private function getDiscountDetails(OrderInterface $associatedOrder, InvoiceItem
             $discounts [] = [
                 'label' => $associatedOrder->getDiscountDescription() ?? _('Discount'),
                 'amount' => [
-                    'value' => $invoiceItem->getDiscountAmount() ?? 0,
+                    'value' => abs($invoiceItem->getDiscountAmount()) ?? 0,
                     'currency' => $associatedOrder->getOrderCurrencyCode()
                 ]
             ];
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceTotal.php b/app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceTotal.php
index cc1ec3c88d768..c29b22a1f4910 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceTotal.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceTotal.php
@@ -14,7 +14,7 @@
 use Magento\Sales\Api\Data\InvoiceInterface;
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Tax\Api\OrderTaxManagementInterface;
-use Magento\SalesGraphQl\Model\SalesItem\ShippingTaxHelper;
+use Magento\SalesGraphQl\Model\SalesItem\ShippingTaxCalculator;
 use Magento\Tax\Helper\Data as TaxHelper;
 
 /**
@@ -33,23 +33,23 @@ class InvoiceTotal implements ResolverInterface
     private $orderTaxManagement;
 
     /**
-     * @var ShippingTaxHelper
+     * @var ShippingTaxCalculator
      */
-    private $shippingTaxHelper;
+    private $shippingTaxCalculator;
 
     /**
      * @param OrderTaxManagementInterface $orderTaxManagement
      * @param TaxHelper $taxHelper
-     * @param ShippingTaxHelper $shippingTaxHelper
+     * @param ShippingTaxCalculator $shippingTaxCalculator
      */
     public function __construct(
         OrderTaxManagementInterface $orderTaxManagement,
         TaxHelper $taxHelper,
-        ShippingTaxHelper $shippingTaxHelper
+        ShippingTaxCalculator $shippingTaxCalculator
     ) {
         $this->taxHelper = $taxHelper;
         $this->orderTaxManagement = $orderTaxManagement;
-        $this->shippingTaxHelper = $shippingTaxHelper;
+        $this->shippingTaxCalculator = $shippingTaxCalculator;
     }
 
     /**
@@ -102,7 +102,7 @@ public function resolve(
                 'discounts' => $this->getShippingDiscountDetails($invoiceModel),
                 'taxes' => $this->formatTaxes(
                     $orderModel,
-                    $this->shippingTaxHelper->calculateShippingTaxes($orderModel, $invoiceModel),
+                    $this->shippingTaxCalculator->calculateShippingTaxes($orderModel, $invoiceModel),
                 )
             ]
         ];
diff --git a/app/code/Magento/SalesGraphQl/Model/SalesItem/ShippingTaxHelper.php b/app/code/Magento/SalesGraphQl/Model/SalesItem/ShippingTaxCalculator.php
similarity index 99%
rename from app/code/Magento/SalesGraphQl/Model/SalesItem/ShippingTaxHelper.php
rename to app/code/Magento/SalesGraphQl/Model/SalesItem/ShippingTaxCalculator.php
index 1f1db50548af4..cb40b9bf6ac58 100644
--- a/app/code/Magento/SalesGraphQl/Model/SalesItem/ShippingTaxHelper.php
+++ b/app/code/Magento/SalesGraphQl/Model/SalesItem/ShippingTaxCalculator.php
@@ -7,7 +7,7 @@
 use Magento\Tax\Api\Data\OrderTaxDetailsItemInterface;
 use Magento\Tax\Api\OrderTaxManagementInterface;
 
-class ShippingTaxHelper
+class ShippingTaxCalculator
 {
     /**
      * @var OrderTaxManagementInterface
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/InvoiceTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/InvoiceTest.php
index 0404486d3be69..543f7edcc42b7 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/InvoiceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/InvoiceTest.php
@@ -38,9 +38,8 @@ protected function setUp(): void
      */
     public function testSingleInvoiceForLoggedInCustomerQuery()
     {
-        $response = $this->getCustomerInvoice();
+        $response = $this->getCustomerInvoices();
         $expectedOrdersData = [
-            'order_number' => '100000001',
             'status' => 'Processing',
             'grand_total' => 100.00
         ];
@@ -103,9 +102,8 @@ public function testSingleInvoiceForLoggedInCustomerQuery()
      */
     public function testMultipleInvoiceForLoggedInCustomerQuery()
     {
-        $response = $this->getCustomerInvoice();
+        $response = $this->getCustomerInvoices();
         $expectedOrdersData = [
-            'order_number' => '100000002',
             'status' => 'Processing',
             'grand_total' => 50.00
         ];
@@ -200,12 +198,11 @@ public function testMultipleCustomersWithInvoicesQuery()
     {
         $query =
             <<<QUERY
-query {
+{
   customer
   {
   orders {
     items {
-      order_number
       grand_total
       status
       invoices {
@@ -248,7 +245,6 @@ public function testMultipleCustomersWithInvoicesQuery()
             $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
         );
         $expectedOrdersData = [
-            'order_number' => '100000001',
             'status' => 'Processing',
             'grand_total' => 100.00
         ];
@@ -308,7 +304,7 @@ public function testInvoiceForCustomerWithTaxesAndDiscounts()
 
         $orderNumber = $this->placeOrder($cartId);
         $this->prepareInvoice($orderNumber, 2);
-        $customerOrderResponse = $this->getCustomerOrderQuery($orderNumber);
+        $customerOrderResponse = $this->getCustomerInvoicesBasedOnOrderNumber($orderNumber);
         $customerOrderItem = $customerOrderResponse[0];
         $invoice = $customerOrderItem['invoices'][0];
         $this->assertEquals(3, $invoice['total']['discounts'][0]['amount']['value']);
@@ -342,9 +338,13 @@ public function testPartialInvoiceForCustomerWithTaxesAndDiscounts()
 
         $orderNumber = $this->placeOrder($cartId);
         $this->prepareInvoice($orderNumber, 1);
-        $customerOrderResponse = $this->getCustomerOrderQuery($orderNumber);
+        $customerOrderResponse = $this->getCustomerInvoicesBasedOnOrderNumber($orderNumber);
         $customerOrderItem = $customerOrderResponse[0];
         $invoice = $customerOrderItem['invoices'][0];
+        $invoiceItem = $invoice['items'][0];
+        $this->assertEquals(1, $invoiceItem['discounts'][0]['amount']['value']);
+        $this->assertEquals('USD', $invoiceItem['discounts'][0]['amount']['currency']);
+        $this->assertEquals('Discount Label for 10% off', $invoiceItem['discounts'][0]['label']);
         $this->assertEquals(2, $invoice['total']['discounts'][0]['amount']['value']);
         $this->assertEquals('USD', $invoice['total']['discounts'][0]['amount']['currency']);
         $this->assertEquals(
@@ -356,6 +356,8 @@ public function testPartialInvoiceForCustomerWithTaxesAndDiscounts()
     }
 
     /**
+     * Prepare invoice for the order
+     *
      * @param string $orderNumber
      * @param int|null $qty
      */
@@ -737,7 +739,7 @@ private function placeOrder(string $cartId): string
      * @param string $orderNumber
      * @return array
      */
-    private function getCustomerOrderQuery($orderNumber): array
+    private function getCustomerInvoicesBasedOnOrderNumber($orderNumber): array
     {
         $query =
             <<<QUERY
@@ -747,29 +749,8 @@ private function getCustomerOrderQuery($orderNumber): array
        orders(filter:{number:{eq:"{$orderNumber}"}}) {
          total_count
          items {
-           id
-           number
-           order_date
-           status
-           items{product_name product_sku quantity_ordered discounts {amount{value currency} label}}
-           total {
-             base_grand_total{value currency}
-             grand_total{value currency}
-             total_tax{value currency}
-             subtotal { value currency }
-             taxes {amount{value currency} title rate}
-             discounts {amount{value currency} label}
-             total_shipping{value currency}
-             shipping_handling
-             {
-               amount_including_tax{value}
-               amount_excluding_tax{value}
-               total_amount{value currency}
-               taxes {amount{value} title rate}
-               discounts {amount{value currency} label}
-             }
-           }
            invoices {
+              items{product_sale_price{value currency} quantity_invoiced discounts {amount{value currency} label}}
               total {
              base_grand_total{value currency}
              grand_total{value currency}
@@ -810,33 +791,33 @@ private function getCustomerOrderQuery($orderNumber): array
     private function assertOrdersData($response, $expectedOrdersData): void
     {
         $actualData = $response['customer']['orders']['items'][0];
-        $this->assertEquals(
-            $expectedOrdersData['order_number'],
-            $actualData['order_number'],
-            "order_number is different than the expected for order - " . $expectedOrdersData['order_number']
-        );
         $this->assertEquals(
             $expectedOrdersData['grand_total'],
             $actualData['grand_total'],
-            "grand_total is different than the expected for order - " . $expectedOrdersData['order_number']
+            "grand_total is different than the expected for order"
         );
         $this->assertEquals(
             $expectedOrdersData['status'],
             $actualData['status'],
-            "status is different than the expected for order - " . $expectedOrdersData['order_number']
+            "status is different than the expected for order"
         );
     }
 
-    private function getCustomerInvoice(): array
+    /**
+     * Get invoices for the customer
+     *
+     * @return array
+     * @throws \Magento\Framework\Exception\AuthenticationException
+     */
+    private function getCustomerInvoices(): array
     {
         $query =
             <<<QUERY
-query {
+{
   customer
   {
   orders {
     items {
-      order_number
       grand_total
       status
       invoices {

From 18acc404f9dfdf0fe41106035196ccf83956b640 Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Tue, 9 Jun 2020 16:23:17 -0500
Subject: [PATCH 0792/1718] MC-35776: WsdlGenerationFromDataObjectTest is
 failed with PHP 7.4.6

---
 .../WsdlGenerationFromDataObjectTest.php      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php b/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php
index dadc2caef7a13..c43cb81683aac 100644
--- a/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php
@@ -116,7 +116,7 @@ protected function _getWsdlContent($wsdlUrl)
             $responseDom->loadXML($responseContent),
             "Valid XML is always expected as a response for WSDL request."
         );
-        return $responseContent;
+        return $responseDom->saveXML();
     }
 
     /**
@@ -207,7 +207,7 @@ protected function _checkComplexTypesDeclaration($wsdlContent)
     <xsd:sequence>
         <xsd:element name="id" minOccurs="1" maxOccurs="1" type="xsd:int">
             <xsd:annotation>
-                <xsd:documentation></xsd:documentation>
+                <xsd:documentation/>
                 <xsd:appinfo xmlns:inf="{$this->_soapUrl}">
                     <inf:min/>
                     <inf:max/>
@@ -231,7 +231,7 @@ protected function _checkComplexTypesDeclaration($wsdlContent)
     <xsd:sequence>
         <xsd:element name="entityId" minOccurs="1" maxOccurs="1" type="xsd:int">
             <xsd:annotation>
-                <xsd:documentation></xsd:documentation>
+                <xsd:documentation/>
                 <xsd:appinfo xmlns:inf="{$this->_soapUrl}">
                     <inf:min/>
                     <inf:max/>
@@ -266,7 +266,7 @@ protected function _checkComplexTypesDeclaration($wsdlContent)
     <xsd:sequence>
         <xsd:element name="result" minOccurs="1" maxOccurs="1" type="tns:TestModule5V2EntityAllSoapAndRest">
             <xsd:annotation>
-                <xsd:documentation></xsd:documentation>
+                <xsd:documentation/>
                 <xsd:appinfo xmlns:inf="{$this->_soapUrl}">
                     <inf:callInfo>
                         <inf:callName>testModule5AllSoapAndRestV2Item</inf:callName>
@@ -290,7 +290,7 @@ protected function _checkComplexTypesDeclaration($wsdlContent)
     <xsd:sequence>
         <xsd:element name="result" minOccurs="1" maxOccurs="1" type="tns:TestModule5V1EntityAllSoapAndRest">
             <xsd:annotation>
-                <xsd:documentation></xsd:documentation>
+                <xsd:documentation/>
                 <xsd:appinfo xmlns:inf="{$this->_soapUrl}">
                     <inf:callInfo>
                         <inf:callName>testModule5AllSoapAndRestV1Item</inf:callName>
@@ -331,7 +331,7 @@ protected function _checkReferencedTypeDeclaration($wsdlContent)
     <xsd:sequence>
         <xsd:element name="price" minOccurs="1" maxOccurs="1" type="xsd:int">
             <xsd:annotation>
-                <xsd:documentation></xsd:documentation>
+                <xsd:documentation/>
                 <xsd:appinfo xmlns:inf="{$this->_soapUrl}">
                     <inf:min/>
                     <inf:max/>
@@ -835,7 +835,7 @@ protected function _checkFaultsComplexTypeSection($wsdlContent)
     <xsd:sequence>
         <xsd:element name="key" minOccurs="1" maxOccurs="1" type="xsd:string">
             <xsd:annotation>
-                <xsd:documentation></xsd:documentation>
+                <xsd:documentation/>
                 <xsd:appinfo xmlns:inf="{$this->_soapUrl}">
                     <inf:maxLength/>
                 </xsd:appinfo>
@@ -843,7 +843,7 @@ protected function _checkFaultsComplexTypeSection($wsdlContent)
         </xsd:element>
         <xsd:element name="value" minOccurs="1" maxOccurs="1" type="xsd:string">
             <xsd:annotation>
-                <xsd:documentation></xsd:documentation>
+                <xsd:documentation/>
                 <xsd:appinfo xmlns:inf="{$this->_soapUrl}">
                     <inf:maxLength/>
                 </xsd:appinfo>
@@ -865,7 +865,7 @@ protected function _checkFaultsComplexTypeSection($wsdlContent)
     <xsd:sequence>
         <xsd:element name="message" minOccurs="1" maxOccurs="1" type="xsd:string">
             <xsd:annotation>
-                <xsd:documentation></xsd:documentation>
+                <xsd:documentation/>
                 <xsd:appinfo xmlns:inf="{$this->_baseUrl}/soap/{$this->_storeCode}?services=testModule5AllSoapAndRestV2">
                     <inf:maxLength/>
                 </xsd:appinfo>
@@ -888,7 +888,7 @@ protected function _checkFaultsComplexTypeSection($wsdlContent)
     <xsd:sequence>
         <xsd:element name="message" minOccurs="1" maxOccurs="1" type="xsd:string">
             <xsd:annotation>
-                <xsd:documentation></xsd:documentation>
+                <xsd:documentation/>
                 <xsd:appinfo xmlns:inf="{$this->_baseUrl}/soap/{$this->_storeCode}?services=testModule5AllSoapAndRestV1%2CtestModule5AllSoapAndRestV2">
                     <inf:maxLength/>
                 </xsd:appinfo>

From 6294aaf48176f7b93b922afe72ea15631d766c5f Mon Sep 17 00:00:00 2001
From: Ji Lu <jilu1@adobe.com>
Date: Thu, 9 Jul 2020 18:13:24 -0500
Subject: [PATCH 0793/1718] MQE-2220: updated mftf version to ^3.0

---
 .../ActionGroup/deleteBackupActionGroup.xml   |  12 -
 .../UpdateIndexerOnSaveActionGroup.xml        |  11 -
 composer.json                                 |   2 +-
 composer.lock                                 | 376 +-----------------
 4 files changed, 10 insertions(+), 391 deletions(-)
 delete mode 100644 app/code/Magento/Backup/Test/Mftf/ActionGroup/deleteBackupActionGroup.xml
 delete mode 100644 app/code/Magento/Indexer/Test/Mftf/ActionGroup/IndexerActionGroup/UpdateIndexerOnSaveActionGroup.xml

diff --git a/app/code/Magento/Backup/Test/Mftf/ActionGroup/deleteBackupActionGroup.xml b/app/code/Magento/Backup/Test/Mftf/ActionGroup/deleteBackupActionGroup.xml
deleted file mode 100644
index b879a2aa9647a..0000000000000
--- a/app/code/Magento/Backup/Test/Mftf/ActionGroup/deleteBackupActionGroup.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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="deleteBackup" extends="AdminBackupDeleteActionGroup" deprecated="Use DeleteBackupActionGroup"/>
-</actionGroups>
diff --git a/app/code/Magento/Indexer/Test/Mftf/ActionGroup/IndexerActionGroup/UpdateIndexerOnSaveActionGroup.xml b/app/code/Magento/Indexer/Test/Mftf/ActionGroup/IndexerActionGroup/UpdateIndexerOnSaveActionGroup.xml
deleted file mode 100644
index efa6291d5de63..0000000000000
--- a/app/code/Magento/Indexer/Test/Mftf/ActionGroup/IndexerActionGroup/UpdateIndexerOnSaveActionGroup.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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="updateIndexerOnSave" extends="AdminIndexerSetUpdateOnSaveActionGroup" deprecated="Use AdminIndexerSetUpdateOnSaveActionGroup"/>
-</actionGroups>
diff --git a/composer.json b/composer.json
index 8bf980ff19212..816fad7068837 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.0-RC5",
+        "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 2b35275620528..04ecd43514636 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": "07bb75cbd8269245d02b01a19b448f83",
+    "content-hash": "0ebe9109f59c372f9962e2a51c35c829",
     "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"
         },
         {
@@ -297,20 +287,6 @@
                 "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-06-03T08:03:56+00:00"
         },
         {
@@ -476,20 +452,6 @@
                 "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"
         },
         {
@@ -3946,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"
         },
         {
@@ -4444,20 +4392,6 @@
             ],
             "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"
         },
         {
@@ -4511,20 +4445,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"
         },
         {
@@ -4595,20 +4515,6 @@
             ],
             "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"
         },
         {
@@ -4717,20 +4623,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"
         },
         {
@@ -4780,20 +4672,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"
         },
         {
@@ -5148,20 +5026,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"
         },
         {
@@ -5211,20 +5075,6 @@
             ],
             "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"
         },
         {
@@ -5283,20 +5133,6 @@
                 "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-05-20T17:43:50+00:00"
         },
         {
@@ -6094,12 +5930,6 @@
                 "functional testing",
                 "unit testing"
             ],
-            "funding": [
-                {
-                    "url": "https://opencollective.com/codeception",
-                    "type": "open_collective"
-                }
-            ],
             "time": "2020-06-07T16:31:51+00:00"
         },
         {
@@ -6672,20 +6502,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"
         },
         {
@@ -6809,20 +6625,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"
         },
         {
@@ -6885,20 +6687,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"
         },
         {
@@ -7358,16 +7146,16 @@
         },
         {
             "name": "magento/magento2-functional-testing-framework",
-            "version": "3.0.0-RC5",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/magento/magento2-functional-testing-framework.git",
-                "reference": "e5126f4eb476e227e3b668b622159c917f123175"
+                "reference": "8d98efa7434a30ab9e82ef128c430ef8e3a50699"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/e5126f4eb476e227e3b668b622159c917f123175",
-                "reference": "e5126f4eb476e227e3b668b622159c917f123175",
+                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/8d98efa7434a30ab9e82ef128c430ef8e3a50699",
+                "reference": "8d98efa7434a30ab9e82ef128c430ef8e3a50699",
                 "shasum": ""
             },
             "require": {
@@ -7392,6 +7180,7 @@
                 "spomky-labs/otphp": "^10.0",
                 "symfony/console": "^4.4",
                 "symfony/finder": "^5.0",
+                "symfony/http-foundation": "^5.0",
                 "symfony/mime": "^5.0",
                 "symfony/process": "^4.4",
                 "vlucas/phpdotenv": "^2.4",
@@ -7443,7 +7232,7 @@
                 "magento",
                 "testing"
             ],
-            "time": "2020-06-15T19:51:46+00:00"
+            "time": "2020-07-09T21:26:19+00:00"
         },
         {
             "name": "mikey179/vfsstream",
@@ -8346,16 +8135,6 @@
                 "php",
                 "type"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/GrahamCampbell",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/phpoption/phpoption",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-06-07T10:40:07+00:00"
         },
         {
@@ -8525,12 +8304,6 @@
                 "testing",
                 "xunit"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-05-23T08:02:54+00:00"
         },
         {
@@ -9678,12 +9451,6 @@
             ],
             "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-06-01T12:21:09+00:00"
         },
         {
@@ -9915,20 +9682,6 @@
             ],
             "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"
         },
         {
@@ -10004,20 +9757,6 @@
             ],
             "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-05-30T20:35:19+00:00"
         },
         {
@@ -10064,20 +9803,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"
         },
         {
@@ -10139,20 +9864,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"
         },
         {
@@ -10216,20 +9927,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"
         },
         {
@@ -10286,20 +9983,6 @@
                 "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"
         },
         {
@@ -10409,20 +10092,6 @@
             ],
             "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"
         },
         {
@@ -10486,20 +10155,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"
         },
         {
@@ -10775,16 +10430,6 @@
                 "env",
                 "environment"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/GrahamCampbell",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-06-02T14:06:52+00:00"
         },
         {
@@ -10875,9 +10520,7 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": {
-        "magento/magento2-functional-testing-framework": 5
-    },
+    "stability-flags": [],
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
@@ -10899,6 +10542,5 @@
         "ext-zip": "*",
         "lib-libxml": "*"
     },
-    "platform-dev": [],
-    "plugin-api-version": "1.1.0"
+    "platform-dev": []
 }

From a4300591b5791aae6718bfd79f9f8034fead7179 Mon Sep 17 00:00:00 2001
From: Ji Lu <jilu1@adobe.com>
Date: Thu, 9 Jul 2020 19:10:23 -0500
Subject: [PATCH 0794/1718] MQE-2220: updated mftf version to ^3.0  - removed
 deprecated action groups as they are removed from 2.4.0  - fixed test
 annotation errors

---
 .../ActionGroup/deleteBackupActionGroup.xml   |  12 -
 .../UpdateIndexerOnSaveActionGroup.xml        |  11 -
 .../AdminDeleteCustomerWishListItemTest.xml   |   1 +
 ...abledCustomerWishlistFunctionalityTest.xml |   1 +
 ...ithMoreThanMaximumAllowedEmailsQtyTest.xml |   1 +
 composer.json                                 |   2 +-
 composer.lock                                 | 209 +-----------------
 7 files changed, 13 insertions(+), 224 deletions(-)
 delete mode 100644 app/code/Magento/Backup/Test/Mftf/ActionGroup/deleteBackupActionGroup.xml
 delete mode 100644 app/code/Magento/Indexer/Test/Mftf/ActionGroup/IndexerActionGroup/UpdateIndexerOnSaveActionGroup.xml

diff --git a/app/code/Magento/Backup/Test/Mftf/ActionGroup/deleteBackupActionGroup.xml b/app/code/Magento/Backup/Test/Mftf/ActionGroup/deleteBackupActionGroup.xml
deleted file mode 100644
index b879a2aa9647a..0000000000000
--- a/app/code/Magento/Backup/Test/Mftf/ActionGroup/deleteBackupActionGroup.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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="deleteBackup" extends="AdminBackupDeleteActionGroup" deprecated="Use DeleteBackupActionGroup"/>
-</actionGroups>
diff --git a/app/code/Magento/Indexer/Test/Mftf/ActionGroup/IndexerActionGroup/UpdateIndexerOnSaveActionGroup.xml b/app/code/Magento/Indexer/Test/Mftf/ActionGroup/IndexerActionGroup/UpdateIndexerOnSaveActionGroup.xml
deleted file mode 100644
index efa6291d5de63..0000000000000
--- a/app/code/Magento/Indexer/Test/Mftf/ActionGroup/IndexerActionGroup/UpdateIndexerOnSaveActionGroup.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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="updateIndexerOnSave" extends="AdminIndexerSetUpdateOnSaveActionGroup" deprecated="Use AdminIndexerSetUpdateOnSaveActionGroup"/>
-</actionGroups>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/AdminDeleteCustomerWishListItemTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/AdminDeleteCustomerWishListItemTest.xml
index af229b3507077..32bec763b2fd6 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/AdminDeleteCustomerWishListItemTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/AdminDeleteCustomerWishListItemTest.xml
@@ -14,6 +14,7 @@
             <stories value="Wishlist items deleting"/>
             <title value="Admin deletes an item from customer wishlist"/>
             <description value="Admin Should be able delete items from customer wishlist"/>
+            <severity value="AVERAGE"/>
             <testCaseId value="MC-35170"/>
             <group value="wishlist"/>
         </annotations>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDisabledCustomerWishlistFunctionalityTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDisabledCustomerWishlistFunctionalityTest.xml
index 17d3ff1009b9b..65cce1dcfc1c3 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDisabledCustomerWishlistFunctionalityTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontDisabledCustomerWishlistFunctionalityTest.xml
@@ -15,6 +15,7 @@
             <title value="Wishlist Functionality is disabled in system configurations and not visible on FE"/>
             <description value="Customer should not see wishlist functionality if it's disabled"/>
             <testCaseId value="MC-35200"/>
+            <severity value="AVERAGE"/>
             <group value="wishlist"/>
             <group value="configuration"/>
         </annotations>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontShareWishlistWithMoreThanMaximumAllowedEmailsQtyTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontShareWishlistWithMoreThanMaximumAllowedEmailsQtyTest.xml
index 7ec06e3f3cf4d..281272293e6a9 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontShareWishlistWithMoreThanMaximumAllowedEmailsQtyTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontShareWishlistWithMoreThanMaximumAllowedEmailsQtyTest.xml
@@ -15,6 +15,7 @@
             <title value="Sharing wishlist with more than Maximum Allowed Emails qty"/>
             <description value="Customer should not have a possibility share wishlist with more than maximum allowed emails qty"/>
             <testCaseId value="MC-35167"/>
+            <severity value="AVERAGE"/>
             <group value="wishlist"/>
             <group value="configuration"/>
         </annotations>
diff --git a/composer.json b/composer.json
index 1b260cc122865..765cad085df47 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.0-RC5",
+        "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 e5614cfd0ac99..fdb3a8a3708b7 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": "68246e4c5ac6555ff2d3d013c81c3537",
     "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"
         },
         {
@@ -7203,16 +7083,16 @@
         },
         {
             "name": "magento/magento2-functional-testing-framework",
-            "version": "3.0.0-RC5",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/magento/magento2-functional-testing-framework.git",
-                "reference": "e5126f4eb476e227e3b668b622159c917f123175"
+                "reference": "8d98efa7434a30ab9e82ef128c430ef8e3a50699"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/e5126f4eb476e227e3b668b622159c917f123175",
-                "reference": "e5126f4eb476e227e3b668b622159c917f123175",
+                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/8d98efa7434a30ab9e82ef128c430ef8e3a50699",
+                "reference": "8d98efa7434a30ab9e82ef128c430ef8e3a50699",
                 "shasum": ""
             },
             "require": {
@@ -7237,6 +7117,7 @@
                 "spomky-labs/otphp": "^10.0",
                 "symfony/console": "^4.4",
                 "symfony/finder": "^5.0",
+                "symfony/http-foundation": "^5.0",
                 "symfony/mime": "^5.0",
                 "symfony/process": "^4.4",
                 "vlucas/phpdotenv": "^2.4",
@@ -7288,7 +7169,7 @@
                 "magento",
                 "testing"
             ],
-            "time": "2020-06-15T19:51:46+00:00"
+            "time": "2020-07-09T21:26:19+00:00"
         },
         {
             "name": "mikey179/vfsstream",
@@ -9855,20 +9736,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 +9797,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 +9860,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 +10035,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 +10148,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"
         },
         {
@@ -10703,8 +10514,7 @@
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "magento/composer": 20,
-        "magento/magento2-functional-testing-framework": 5
+        "magento/composer": 20
     },
     "prefer-stable": true,
     "prefer-lowest": false,
@@ -10727,6 +10537,5 @@
         "ext-zip": "*",
         "lib-libxml": "*"
     },
-    "platform-dev": [],
-    "plugin-api-version": "1.1.0"
+    "platform-dev": []
 }

From 785b41dcb44c2aebf22433920e41291c30c74274 Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Thu, 9 Jul 2020 22:01:54 -0500
Subject: [PATCH 0795/1718] MC-20637: MyAccount :: Order Details :: Invoice
 Details by Order Number - fixed review and static failures

---
 .../Model/Resolver/InvoiceTotal.php           |   6 +-
 .../Model/SalesItem/ShippingTaxCalculator.php |  40 ++--
 app/code/Magento/SalesGraphQl/composer.json   |   1 +
 .../Magento/GraphQl/Sales/InvoiceTest.php     | 204 +++++++++---------
 ...s_with_two_products_and_custom_options.php |   9 +-
 5 files changed, 130 insertions(+), 130 deletions(-)

diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceTotal.php b/app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceTotal.php
index c29b22a1f4910..a7be11d386fd3 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceTotal.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceTotal.php
@@ -88,15 +88,15 @@ public function resolve(
             ),
             'shipping_handling' => [
                 'amount_excluding_tax' => [
-                    'value' => $invoiceModel->getShippingAmount(),
+                    'value' => $invoiceModel->getShippingAmount() ?? 0,
                     'currency' => $currency
                 ],
                 'amount_including_tax' => [
-                    'value' => $invoiceModel->getShippingInclTax(),
+                    'value' => $invoiceModel->getShippingInclTax() ?? 0,
                     'currency' => $currency
                 ],
                 'total_amount' => [
-                    'value' => $invoiceModel->getShippingAmount(),
+                    'value' => $invoiceModel->getShippingAmount() ?? 0,
                     'currency' => $currency
                 ],
                 'discounts' => $this->getShippingDiscountDetails($invoiceModel),
diff --git a/app/code/Magento/SalesGraphQl/Model/SalesItem/ShippingTaxCalculator.php b/app/code/Magento/SalesGraphQl/Model/SalesItem/ShippingTaxCalculator.php
index cb40b9bf6ac58..edb51ecc57b8d 100644
--- a/app/code/Magento/SalesGraphQl/Model/SalesItem/ShippingTaxCalculator.php
+++ b/app/code/Magento/SalesGraphQl/Model/SalesItem/ShippingTaxCalculator.php
@@ -1,4 +1,8 @@
 <?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
 
 namespace Magento\SalesGraphQl\Model\SalesItem;
 
@@ -6,6 +10,7 @@
 use Magento\Sales\Model\EntityInterface;
 use Magento\Tax\Api\Data\OrderTaxDetailsItemInterface;
 use Magento\Tax\Api\OrderTaxManagementInterface;
+use \Magento\Quote\Model\Quote\Address;
 
 class ShippingTaxCalculator
 {
@@ -36,7 +41,7 @@ public function calculateShippingTaxes(
         EntityInterface $salesItem
     ) {
         $orderTaxDetails = $this->orderTaxManagement->getOrderTaxDetails($order->getId());
-        $taxClassAmount = [];
+        $taxClassBreakdown = [];
         // Apply any taxes for shipping
         $shippingTaxAmount = $salesItem->getShippingTaxAmount();
         $originalShippingTaxAmount = $order->getShippingTaxAmount();
@@ -48,13 +53,12 @@ public function calculateShippingTaxes(
             $itemTaxDetails = $orderTaxDetails->getItems();
             foreach ($itemTaxDetails as $itemTaxDetail) {
                 //Aggregate taxable items associated with shipping
-                if ($itemTaxDetail->getType() == \Magento\Quote\Model\Quote\Address::TYPE_SHIPPING) {
-                    $taxClassAmount = $this->_aggregateTaxes($taxClassAmount, $itemTaxDetail, $shippingRatio);
+                if ($itemTaxDetail->getType() == Address::TYPE_SHIPPING) {
+                    $taxClassBreakdown = $this->aggregateTaxes($taxClassBreakdown, $itemTaxDetail, $shippingRatio);
                 }
             }
         }
-
-        return $taxClassAmount;
+        return $taxClassBreakdown;
     }
 
     /**
@@ -70,31 +74,31 @@ public function calculateShippingTaxes(
      *  )
      * )
      *
-     * @param  array                        $taxClassAmount
+     * @param  array                        $taxClassBreakdown
      * @param  OrderTaxDetailsItemInterface $itemTaxDetail
-     * @param  float                        $ratio
+     * @param  float                        $taxRatio
      * @return array
      */
-    private function _aggregateTaxes($taxClassAmount, OrderTaxDetailsItemInterface $itemTaxDetail, $ratio)
+    private function aggregateTaxes($taxClassBreakdown, OrderTaxDetailsItemInterface $itemTaxDetail, $taxRatio)
     {
         $itemAppliedTaxes = $itemTaxDetail->getAppliedTaxes();
         foreach ($itemAppliedTaxes as $itemAppliedTax) {
-            $taxAmount = $itemAppliedTax->getAmount() * $ratio;
-            $baseTaxAmount = $itemAppliedTax->getBaseAmount() * $ratio;
+            $taxAmount = $itemAppliedTax->getAmount() * $taxRatio;
+            $baseTaxAmount = $itemAppliedTax->getBaseAmount() * $taxRatio;
             if (0 == $taxAmount && 0 == $baseTaxAmount) {
                 continue;
             }
             $taxCode = $itemAppliedTax->getCode();
-            if (!isset($taxClassAmount[$taxCode])) {
-                $taxClassAmount[$taxCode]['title'] = $itemAppliedTax->getTitle();
-                $taxClassAmount[$taxCode]['percent'] = $itemAppliedTax->getPercent();
-                $taxClassAmount[$taxCode]['tax_amount'] = $taxAmount;
-                $taxClassAmount[$taxCode]['base_tax_amount'] = $baseTaxAmount;
+            if (!isset($taxClassBreakdown[$taxCode])) {
+                $taxClassBreakdown[$taxCode]['title'] = $itemAppliedTax->getTitle();
+                $taxClassBreakdown[$taxCode]['percent'] = $itemAppliedTax->getPercent();
+                $taxClassBreakdown[$taxCode]['tax_amount'] = $taxAmount;
+                $taxClassBreakdown[$taxCode]['base_tax_amount'] = $baseTaxAmount;
             } else {
-                $taxClassAmount[$taxCode]['tax_amount'] += $taxAmount;
-                $taxClassAmount[$taxCode]['base_tax_amount'] += $baseTaxAmount;
+                $taxClassBreakdown[$taxCode]['tax_amount'] += $taxAmount;
+                $taxClassBreakdown[$taxCode]['base_tax_amount'] += $baseTaxAmount;
             }
         }
-        return $taxClassAmount;
+        return $taxClassBreakdown;
     }
 }
diff --git a/app/code/Magento/SalesGraphQl/composer.json b/app/code/Magento/SalesGraphQl/composer.json
index 6448f442b2760..f820b239d727d 100644
--- a/app/code/Magento/SalesGraphQl/composer.json
+++ b/app/code/Magento/SalesGraphQl/composer.json
@@ -9,6 +9,7 @@
         "magento/module-store": "*",
         "magento/module-catalog": "*",
         "magento/module-tax": "*",
+        "magento/module-quote": "*",
         "magento/module-graph-ql": "*"
     },
     "suggest": {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/InvoiceTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/InvoiceTest.php
index 543f7edcc42b7..b37f0c6c74cd5 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/InvoiceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/InvoiceTest.php
@@ -38,7 +38,7 @@ protected function setUp(): void
      */
     public function testSingleInvoiceForLoggedInCustomerQuery()
     {
-        $response = $this->getCustomerInvoices();
+        $response = $this->getCustomerInvoicesBasedOnOrderNumber('100000001');
         $expectedOrdersData = [
             'status' => 'Processing',
             'grand_total' => 100.00
@@ -50,25 +50,31 @@ public function testSingleInvoiceForLoggedInCustomerQuery()
                         'product_name' => 'Simple Related Product',
                         'product_sku' => 'simple',
                         'product_sale_price' => [
-                            'value' => 10
+                            'value' => 10,
+                            'currency' => 'USD'
                         ],
-                        'quantity_invoiced' => 1
+                        'quantity_invoiced' => 1,
+                        'discounts' => []
                     ],
                     [
                         'product_name' => 'Simple Product With Related Product',
                         'product_sku' => 'simple_with_cross',
                         'product_sale_price' => [
-                            'value' => 10
+                            'value' => 10,
+                            'currency' => 'USD'
                         ],
-                        'quantity_invoiced' => 1
+                        'quantity_invoiced' => 1,
+                        'discounts' => []
                     ]
                 ],
                 'total' => [
                     'subtotal' => [
-                        'value' => 100
+                        'value' => 100,
+                        'currency' => 'USD'
                     ],
                     'grand_total' => [
-                        'value' => 100
+                        'value' => 100,
+                        'currency' => 'USD'
                     ],
                     'total_shipping' => [
                         'value' => 0,
@@ -86,13 +92,25 @@ public function testSingleInvoiceForLoggedInCustomerQuery()
                         'amount_excluding_tax' => [
                             'value' => 0,
                             'currency' => 'USD'
-                        ]
-                    ]
+                        ],
+                        'taxes' => [],
+                        'discounts' => []
+                    ],
+                    'taxes' => [],
+                    'discounts' => [],
+                    'base_grand_total' => [
+                        'value' => 100,
+                        'currency' => 'USD'
+                    ],
+                    'total_tax' => [
+                        'value' => 0,
+                        'currency' => 'USD'
+                    ],
                 ]
             ]
         ];
         $this->assertOrdersData($response, $expectedOrdersData);
-        $invoices = $response['customer']['orders']['items'][0]['invoices'];
+        $invoices = $response[0]['invoices'];
         $this->assertResponseFields($invoices, $expectedInvoiceData);
     }
 
@@ -102,10 +120,10 @@ public function testSingleInvoiceForLoggedInCustomerQuery()
      */
     public function testMultipleInvoiceForLoggedInCustomerQuery()
     {
-        $response = $this->getCustomerInvoices();
+        $response = $this->getCustomerInvoicesBasedOnOrderNumber('100000002');
         $expectedOrdersData = [
             'status' => 'Processing',
-            'grand_total' => 50.00
+            'grand_total' => 60.00
         ];
         $expectedInvoiceData = [
             [
@@ -114,22 +132,34 @@ public function testMultipleInvoiceForLoggedInCustomerQuery()
                         'product_name' => 'Simple Related Product',
                         'product_sku' => 'simple',
                         'product_sale_price' => [
-                            'value' => 10
+                            'value' => 10,
+                            'currency' => 'USD'
                         ],
-                        'quantity_invoiced' => 3
+                        'quantity_invoiced' => 3,
+                        'discounts'=> []
                     ]
                 ],
                 'total' => [
                     'subtotal' => [
-                        'value' => 30
+                        'value' => 30,
+                        'currency' => 'USD'
                     ],
                     'grand_total' => [
-                        'value' => 50
+                        'value' => 50,
+                        'currency' => 'USD'
                     ],
                     'total_shipping' => [
                         'value' => 20,
                         'currency' => 'USD'
                     ],
+                    'base_grand_total' => [
+                        'value' => 50,
+                        'currency' => 'USD'
+                    ],
+                    'total_tax' => [
+                        'value' => 0,
+                        'currency' => 'USD'
+                    ],
                     'shipping_handling' => [
                         'total_amount' => [
                             'value' => 20,
@@ -142,8 +172,12 @@ public function testMultipleInvoiceForLoggedInCustomerQuery()
                         'amount_excluding_tax' => [
                             'value' => 20,
                             'currency' => 'USD'
-                        ]
-                    ]
+                        ],
+                        'taxes' => [],
+                        'discounts' => [],
+                    ],
+                    'taxes' => [],
+                    'discounts' => [],
                 ]
             ],
             [
@@ -152,17 +186,29 @@ public function testMultipleInvoiceForLoggedInCustomerQuery()
                         'product_name' => 'Simple Product With Related Product',
                         'product_sku' => 'simple_with_cross',
                         'product_sale_price' => [
-                            'value' => 10
+                            'value' => 10,
+                            'currency' => 'USD'
                         ],
-                        'quantity_invoiced' => 1
+                        'quantity_invoiced' => 1,
+                        'discounts' => []
                     ]
                 ],
                 'total' => [
                     'subtotal' => [
-                        'value' => 10
+                        'value' => 10,
+                        'currency' => 'USD'
                     ],
                     'grand_total' => [
-                        'value' => 10
+                        'value' => 10,
+                        'currency' => 'USD'
+                    ],
+                    'base_grand_total' => [
+                        'value' => 0,
+                        'currency' => 'USD'
+                    ],
+                    'total_tax' => [
+                        'value' => 0,
+                        'currency' => 'USD'
                     ],
                     'total_shipping' => [
                         'value' => 0,
@@ -180,13 +226,17 @@ public function testMultipleInvoiceForLoggedInCustomerQuery()
                         'amount_excluding_tax' => [
                             'value' => 0,
                             'currency' => 'USD'
-                        ]
-                    ]
+                        ],
+                        'taxes' => [],
+                        'discounts' => [],
+                    ],
+                    'taxes' => [],
+                    'discounts' => [],
                 ]
             ]
         ];
         $this->assertOrdersData($response, $expectedOrdersData);
-        $invoices = $response['customer']['orders']['items'][0]['invoices'];
+        $invoices = $response[0]['invoices'];
         $this->assertResponseFields($invoices, $expectedInvoiceData);
     }
 
@@ -203,8 +253,13 @@ public function testMultipleCustomersWithInvoicesQuery()
   {
   orders {
     items {
-      grand_total
       status
+      total {
+        grand_total {
+          value
+          currency
+        }
+      }
       invoices {
           items{
             product_name
@@ -278,7 +333,7 @@ public function testMultipleCustomersWithInvoicesQuery()
                 ]
             ]
         ];
-        $this->assertOrdersData($response, $expectedOrdersData);
+        $this->assertOrdersData($response['customer']['orders']['items'], $expectedOrdersData);
         $invoices = $response['customer']['orders']['items'][0]['invoices'];
         $this->assertResponseFields($invoices, $expectedInvoiceData);
     }
@@ -401,8 +456,8 @@ private function assertTotalsAndShippingWithTaxesAndDiscounts(array $customerOrd
             'subtotal' => ['value' => 20, 'currency' =>'USD'],
             'total_shipping' => ['value' => 10, 'currency' =>'USD'],
             'shipping_handling' => [
-                'amount_including_tax' => ['value' => 10.75],
-                'amount_excluding_tax' => ['value' => 10],
+                'amount_including_tax' => ['value' => 10.75, 'currency' =>'USD'],
+                'amount_excluding_tax' => ['value' => 10, 'currency' =>'USD'],
                 'total_amount' => ['value' => 10, 'currency' =>'USD'],
                 'taxes'=> [
                     0 => [
@@ -444,8 +499,8 @@ private function assertTotalsAndShippingWithTaxesAndDiscountsForOneQty(array $cu
             'subtotal' => ['value' => 10, 'currency' =>'USD'],
             'total_shipping' => ['value' => 10, 'currency' =>'USD'],
             'shipping_handling' => [
-                'amount_including_tax' => ['value' => 10.75],
-                'amount_excluding_tax' => ['value' => 10],
+                'amount_including_tax' => ['value' => 10.75, 'currency' =>'USD'],
+                'amount_excluding_tax' => ['value' => 10, 'currency' =>'USD'],
                 'total_amount' => ['value' => 10, 'currency' =>'USD'],
                 'taxes'=> [
                     0 => [
@@ -739,7 +794,7 @@ private function placeOrder(string $cartId): string
      * @param string $orderNumber
      * @return array
      */
-    private function getCustomerInvoicesBasedOnOrderNumber($orderNumber): array
+    private function getCustomerInvoicesBasedOnOrderNumber($orderNumber = null): array
     {
         $query =
             <<<QUERY
@@ -749,8 +804,15 @@ private function getCustomerInvoicesBasedOnOrderNumber($orderNumber): array
        orders(filter:{number:{eq:"{$orderNumber}"}}) {
          total_count
          items {
+           status
+           total {
+           grand_total{value currency}
+           }
            invoices {
-              items{product_sale_price{value currency} quantity_invoiced discounts {amount{value currency} label}}
+              items{
+              product_name product_sku product_sale_price{value currency}quantity_invoiced
+              discounts {amount{value currency} label}
+              }
               total {
              base_grand_total{value currency}
              grand_total{value currency}
@@ -761,8 +823,8 @@ private function getCustomerInvoicesBasedOnOrderNumber($orderNumber): array
              total_shipping{value currency}
              shipping_handling
              {
-               amount_including_tax{value}
-               amount_excluding_tax{value}
+               amount_including_tax{value currency}
+               amount_excluding_tax{value currency}
                total_amount{value currency}
                taxes {amount{value} title rate}
                discounts {amount{value currency} label}
@@ -790,10 +852,10 @@ private function getCustomerInvoicesBasedOnOrderNumber($orderNumber): array
 
     private function assertOrdersData($response, $expectedOrdersData): void
     {
-        $actualData = $response['customer']['orders']['items'][0];
+        $actualData = $response[0];
         $this->assertEquals(
             $expectedOrdersData['grand_total'],
-            $actualData['grand_total'],
+            $actualData['total']['grand_total']['value'],
             "grand_total is different than the expected for order"
         );
         $this->assertEquals(
@@ -803,74 +865,6 @@ private function assertOrdersData($response, $expectedOrdersData): void
         );
     }
 
-    /**
-     * Get invoices for the customer
-     *
-     * @return array
-     * @throws \Magento\Framework\Exception\AuthenticationException
-     */
-    private function getCustomerInvoices(): array
-    {
-        $query =
-            <<<QUERY
-{
-  customer
-  {
-  orders {
-    items {
-      grand_total
-      status
-      invoices {
-          items{
-            product_name
-            product_sku
-            product_sale_price {
-              value
-            }
-            quantity_invoiced
-          }
-          total {
-            subtotal {
-              value
-            }
-            grand_total {
-              value
-            }
-            total_shipping {
-              value
-              currency
-            }
-      			shipping_handling {
-              total_amount {
-                value
-                currency
-              }
-              amount_including_tax {
-                value
-                currency
-              }
-              amount_excluding_tax {
-                value
-                currency
-              }
-            }
-          }
-        }
-    }
-  }
- }
-}
-QUERY;
-        $currentEmail = 'customer@example.com';
-        $currentPassword = 'password';
-        return $this->graphQlQuery(
-            $query,
-            [],
-            '',
-            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
-        );
-    }
-
     /**
      * Clean up orders
      *
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/customer_multiple_invoices_with_two_products_and_custom_options.php b/dev/tests/integration/testsuite/Magento/Sales/_files/customer_multiple_invoices_with_two_products_and_custom_options.php
index 996a2598dc02b..8507987240557 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/customer_multiple_invoices_with_two_products_and_custom_options.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/customer_multiple_invoices_with_two_products_and_custom_options.php
@@ -92,10 +92,10 @@
 $order->addItem($orderItem);
 $order->addItem($orderItem2);
 $order->setStoreId($objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->getStore()->getId());
-$order->setSubtotal(50);
-$order->setBaseSubtotal(50);
-$order->setBaseGrandTotal(50);
-$order->setGrandTotal(50);
+$order->setSubtotal(60);
+$order->setBaseSubtotal(60);
+$order->setBaseGrandTotal(60);
+$order->setGrandTotal(60);
 $order->setOrderCurrencyCode('USD');
 $order->setCustomerId(1)
     ->setCustomerIsGuest(false)
@@ -108,6 +108,7 @@
 $invoice = $orderService->prepareInvoice($order, [$orderItem->getId() => 3]);
 $invoice->register();
 $invoice->setGrandTotal(50);
+$invoice->setBaseGrandTotal(50);
 $invoice->setSubTotal(30);
 $invoice->setShippingInclTax(20);
 $invoice->setShippingAmount(20);

From d7156cc4e473bd59103e6acee26c46df155a29e4 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Fri, 10 Jul 2020 10:54:23 +0300
Subject: [PATCH 0796/1718] MC-35600: The customer creation page not opens
 without default group selected

---
 app/code/Magento/Customer/etc/adminhtml/system.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/code/Magento/Customer/etc/adminhtml/system.xml b/app/code/Magento/Customer/etc/adminhtml/system.xml
index 09a6e86eef0d2..569f9d09c2087 100644
--- a/app/code/Magento/Customer/etc/adminhtml/system.xml
+++ b/app/code/Magento/Customer/etc/adminhtml/system.xml
@@ -48,7 +48,6 @@
                     <depends>
                         <field id="auto_group_assign">1</field>
                     </depends>
-                    <validate>required-entry</validate>
                 </field>
                 <field id="viv_intra_union_group" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Group for Valid VAT ID - Intra-Union</label>
@@ -56,7 +55,6 @@
                     <depends>
                         <field id="auto_group_assign">1</field>
                     </depends>
-                    <validate>required-entry</validate>
                 </field>
                 <field id="viv_invalid_group" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Group for Invalid VAT ID</label>
@@ -64,7 +62,6 @@
                     <depends>
                         <field id="auto_group_assign">1</field>
                     </depends>
-                    <validate>required-entry</validate>
                 </field>
                 <field id="viv_error_group" translate="label" type="select" sortOrder="55" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Validation Error Group</label>
@@ -72,7 +69,6 @@
                     <depends>
                         <field id="auto_group_assign">1</field>
                     </depends>
-                    <validate>required-entry</validate>
                 </field>
                 <field id="viv_on_each_transaction" translate="label" type="select" sortOrder="56" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Validate on Each Transaction</label>

From 70606e1c435c070a4bbd45a1e8e10b7740edfc87 Mon Sep 17 00:00:00 2001
From: Nikita Shcherbatykh <nikita.shcherbatykh@transoftgroup.com>
Date: Fri, 10 Jul 2020 11:52:19 +0300
Subject: [PATCH 0797/1718] MC-35363: Category update clean cache by cat_c tag

---
 app/code/Magento/Catalog/Model/Category.php  | 13 +++++++++++-
 app/code/Magento/Catalog/Model/Product.php   | 21 +++++++++++++++++---
 app/code/Magento/Catalog/etc/frontend/di.xml |  5 -----
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Category.php b/app/code/Magento/Catalog/Model/Category.php
index 330debdc32469..c6e549ad3ad69 100644
--- a/app/code/Magento/Catalog/Model/Category.php
+++ b/app/code/Magento/Catalog/Model/Category.php
@@ -87,7 +87,7 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
      *
      * @var string
      */
-    protected $_cacheTag = self::CACHE_TAG;
+    protected $_cacheTag = false;
 
     /**
      * URL Model instance
@@ -1111,6 +1111,17 @@ public function afterSave()
         return $result;
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function getCacheTags()
+    {
+        $identities = $this->getIdentities();
+        $cacheTags = !empty($identities) ? (array) $identities : parent::getCacheTags();
+
+        return $cacheTags;
+    }
+
     /**
      * Init indexing process after category save
      *
diff --git a/app/code/Magento/Catalog/Model/Product.php b/app/code/Magento/Catalog/Model/Product.php
index bc8d274fb6e63..e62eb33ec4ca5 100644
--- a/app/code/Magento/Catalog/Model/Product.php
+++ b/app/code/Magento/Catalog/Model/Product.php
@@ -11,7 +11,6 @@
 use Magento\Catalog\Api\ProductLinkRepositoryInterface;
 use Magento\Catalog\Model\Product\Attribute\Backend\Media\EntryConverterPool;
 use Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface;
-use Magento\Catalog\Model\FilterProductCustomAttribute;
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
@@ -977,6 +976,17 @@ public function afterSave()
         return $result;
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function getCacheTags()
+    {
+        $identities = $this->getIdentities();
+        $cacheTags = !empty($identities) ? (array) $identities : parent::getCacheTags();
+
+        return $cacheTags;
+    }
+
     /**
      * Set quantity for product
      *
@@ -2158,7 +2168,7 @@ public function reset()
      */
     public function getCacheIdTags()
     {
-        // phpstan:ignore
+        // phpstan:ignore "Call to an undefined static method"
         $tags = parent::getCacheIdTags();
         $affectedCategoryIds = $this->getAffectedCategoryIds();
         if (!$affectedCategoryIds) {
@@ -2339,7 +2349,8 @@ public function isDisabled()
     public function getImage()
     {
         $this->getTypeInstance()->setImageFromChildProduct($this);
-        // phpstan:ignore
+
+        // phpstan:ignore "Call to an undefined static method"
         return parent::getImage();
     }
 
@@ -2403,6 +2414,8 @@ public function reloadPriceInfo()
         }
     }
 
+    //phpcs:disable PHPCompatibility.FunctionNameRestrictions.ReservedFunctionNames.MethodDoubleUnderscore
+
     /**
      * Return Data Object data in array format.
      *
@@ -2430,6 +2443,8 @@ public function __toArray() //phpcs:ignore PHPCompatibility.FunctionNameRestrict
         return $data;
     }
 
+    //phpcs:enable PHPCompatibility.FunctionNameRestrictions.ReservedFunctionNames.MethodDoubleUnderscore
+
     /**
      * Convert Category model into flat array.
      *
diff --git a/app/code/Magento/Catalog/etc/frontend/di.xml b/app/code/Magento/Catalog/etc/frontend/di.xml
index ee9c5b29da894..35938626c1253 100644
--- a/app/code/Magento/Catalog/etc/frontend/di.xml
+++ b/app/code/Magento/Catalog/etc/frontend/di.xml
@@ -13,11 +13,6 @@
             </argument>
         </arguments>
     </virtualType>
-    <type name="Magento\Catalog\Model\ResourceModel\Category\Collection">
-        <arguments>
-            <argument name="fetchStrategy" xsi:type="object">Magento\Catalog\Model\ResourceModel\Category\Collection\FetchStrategy</argument>
-        </arguments>
-    </type>
     <type name="Magento\Catalog\Model\Indexer\AbstractFlatState">
         <arguments>
             <argument name="isAvailable" xsi:type="boolean">true</argument>

From 89551473a49496ac547d27bf8ffc69981f976389 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Fri, 10 Jul 2020 11:12:19 +0100
Subject: [PATCH 0798/1718] Implemented suggestions

---
 .../GetAssetIdByContentFieldComposite.php     | 12 ++++++---
 app/code/Magento/MediaContent/etc/di.xml      |  3 +--
 .../Api/GetAssetIdByContentFieldInterface.php | 27 +++++++++++++++++++
 .../GetAssetIdByContentFieldInterface.php     |  5 ++++
 .../Model/GetAssetIdByCategoryStore.php       |  8 +-----
 .../Model/GetAssetIdByEavContentField.php     |  7 +----
 .../Model/GetAssetIdByProductStore.php        |  8 +-----
 .../Magento/MediaContentCatalog/composer.json |  1 -
 .../Magento/MediaContentCatalog/etc/di.xml    | 20 ++++++++------
 .../Model/GetAssetIdByContentField.php        |  9 +------
 .../Magento/MediaContentCms/composer.json     |  1 -
 app/code/Magento/MediaContentCms/etc/di.xml   | 20 ++++++++------
 12 files changed, 70 insertions(+), 51 deletions(-)
 create mode 100644 app/code/Magento/MediaContentApi/Api/GetAssetIdByContentFieldInterface.php

diff --git a/app/code/Magento/MediaContent/Model/GetAssetIdByContentFieldComposite.php b/app/code/Magento/MediaContent/Model/GetAssetIdByContentFieldComposite.php
index eab2bd05394e1..577ea6898f665 100644
--- a/app/code/Magento/MediaContent/Model/GetAssetIdByContentFieldComposite.php
+++ b/app/code/Magento/MediaContent/Model/GetAssetIdByContentFieldComposite.php
@@ -7,12 +7,15 @@
 
 namespace Magento\MediaContent\Model;
 
+use Magento\Framework\Exception\InvalidArgumentException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\MediaContentApi\Api\GetAssetIdByContentFieldInterface as GetAssetIdByContentFieldApiInterface;
 use Magento\MediaContentApi\Model\GetAssetIdByContentFieldInterface;
 
 /**
  * Class responsible to return Asset ids by content field
  */
-class GetAssetIdByContentFieldComposite implements GetAssetIdByContentFieldInterface
+class GetAssetIdByContentFieldComposite implements GetAssetIdByContentFieldApiInterface
 {
     /**
      * @var GetAssetIdByContentFieldInterface[]
@@ -32,10 +35,13 @@ public function __construct($getAssetIdByContentFieldArray = [])
     /**
      * @inheritDoc
      */
-    public function execute(string $value): array
+    public function execute(string $field, string $value): array
     {
+        if (!array_key_exists($field, $this->getAssetIdByContentFieldArray)) {
+            throw new InvalidArgumentException(__('The field argument is invalid.'));
+        }
         $ids = [];
-        foreach ($this->getAssetIdByContentFieldArray as $getAssetIdByContentField) {
+        foreach ($this->getAssetIdByContentFieldArray[$field] as $getAssetIdByContentField) {
             // phpcs:ignore Magento2.Performance.ForeachArrayMerge
             $ids = array_merge($ids, $getAssetIdByContentField->execute($value));
         }
diff --git a/app/code/Magento/MediaContent/etc/di.xml b/app/code/Magento/MediaContent/etc/di.xml
index bfce45c797a1a..4817c262e0bd1 100644
--- a/app/code/Magento/MediaContent/etc/di.xml
+++ b/app/code/Magento/MediaContent/etc/di.xml
@@ -16,6 +16,7 @@
     <preference for="Magento\MediaContentApi\Api\Data\ContentIdentityInterface" type="Magento\MediaContent\Model\ContentIdentity"/>
     <preference for="Magento\MediaContentApi\Api\Data\ContentAssetLinkInterface" type="Magento\MediaContent\Model\ContentAssetLink"/>
     <preference for="Magento\MediaContentApi\Model\SearchPatternConfigInterface" type="Magento\MediaContent\Model\Content\SearchPatternConfig"/>
+    <preference for="Magento\MediaContentApi\Api\GetAssetIdByContentFieldInterface" type="Magento\MediaContent\Model\GetAssetIdByContentFieldComposite"/>
     <type name="Magento\MediaGalleryApi\Api\DeleteAssetsByPathsInterface">
         <plugin name="remove_media_content_after_asset_is_removed_by_path" type="Magento\MediaContent\Plugin\MediaGalleryAssetDeleteByPath" />
     </type>
@@ -43,6 +44,4 @@
             <argument name="data" xsi:type="object">Magento\MediaContent\Model\Content\Config\Data</argument>
         </arguments>
     </type>
-    <virtualType name="Magento\MediaContent\Model\GetAssetIdByContentStatusComposite" type="Magento\MediaContent\Model\GetAssetIdByContentFieldComposite"/>
-    <virtualType name="Magento\MediaContent\Model\GetAssetIdByContentStoreComposite" type="Magento\MediaContent\Model\GetAssetIdByContentFieldComposite"/>
 </config>
diff --git a/app/code/Magento/MediaContentApi/Api/GetAssetIdByContentFieldInterface.php b/app/code/Magento/MediaContentApi/Api/GetAssetIdByContentFieldInterface.php
new file mode 100644
index 0000000000000..f66c7ffe4bc05
--- /dev/null
+++ b/app/code/Magento/MediaContentApi/Api/GetAssetIdByContentFieldInterface.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentApi\Api;
+
+use Magento\Framework\Exception\InvalidArgumentException;
+
+/**
+ * @api
+ * Interface used to return Asset id by content field.
+ */
+interface GetAssetIdByContentFieldInterface
+{
+    /**
+     * This function returns asset ids by content field
+     *
+     * @param string $field
+     * @param string $value
+     * @throws InvalidArgumentException
+     * @return int[]
+     */
+    public function execute(string $field, string $value): array;
+}
diff --git a/app/code/Magento/MediaContentApi/Model/GetAssetIdByContentFieldInterface.php b/app/code/Magento/MediaContentApi/Model/GetAssetIdByContentFieldInterface.php
index 13d29bcfe03c7..410b2aaceb60c 100644
--- a/app/code/Magento/MediaContentApi/Model/GetAssetIdByContentFieldInterface.php
+++ b/app/code/Magento/MediaContentApi/Model/GetAssetIdByContentFieldInterface.php
@@ -7,6 +7,9 @@
 
 namespace Magento\MediaContentApi\Model;
 
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+
 /**
  * Interface used to return Asset id by content field.
  */
@@ -17,6 +20,8 @@ interface GetAssetIdByContentFieldInterface
      *
      * @param string $value
      * @return int[]
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
      */
     public function execute(string $value): array;
 }
diff --git a/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByCategoryStore.php b/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByCategoryStore.php
index 7194bbc382539..da6b08a062269 100644
--- a/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByCategoryStore.php
+++ b/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByCategoryStore.php
@@ -57,8 +57,6 @@ public function __construct(
 
     /**
      * @inheritDoc
-     * @throws LocalizedException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function execute(string $value): array
     {
@@ -76,11 +74,7 @@ public function execute(string $value): array
             $categoryIds
         );
 
-        $result = $this->connection->getConnection()->fetchAll($sql);
-
-        return array_map(function ($item) {
-            return $item['asset_id'];
-        }, $result);
+        return $this->connection->getConnection()->fetchCol($sql);
     }
 
     /**
diff --git a/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByEavContentField.php b/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByEavContentField.php
index 91c42df7d76dd..c1560331a78ee 100644
--- a/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByEavContentField.php
+++ b/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByEavContentField.php
@@ -68,7 +68,6 @@ public function __construct(
 
     /**
      * @inheritDoc
-     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function execute(string $value): array
     {
@@ -91,11 +90,7 @@ public function execute(string $value): array
             $this->getValueFromMap($value)
         );
 
-        $result = $this->connection->getConnection()->fetchAll($sql);
-
-        return array_map(function ($item) {
-            return $item['asset_id'];
-        }, $result);
+        return $this->connection->getConnection()->fetchCol($sql);
     }
 
     /**
diff --git a/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByProductStore.php b/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByProductStore.php
index 2e4b7620e52eb..141198dc3e8df 100644
--- a/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByProductStore.php
+++ b/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByProductStore.php
@@ -49,8 +49,6 @@ public function __construct(
 
     /**
      * @inheritDoc
-     * @throws LocalizedException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function execute(string $value): array
     {
@@ -70,10 +68,6 @@ public function execute(string $value): array
             $store->getWebsiteId()
         );
 
-        $result = $this->connection->getConnection()->fetchAll($sql);
-
-        return array_map(function ($item) {
-            return $item['asset_id'];
-        }, $result);
+        return $this->connection->getConnection()->fetchCol($sql);
     }
 }
diff --git a/app/code/Magento/MediaContentCatalog/composer.json b/app/code/Magento/MediaContentCatalog/composer.json
index da592c2bf11be..2b19bc95f6ed3 100644
--- a/app/code/Magento/MediaContentCatalog/composer.json
+++ b/app/code/Magento/MediaContentCatalog/composer.json
@@ -4,7 +4,6 @@
     "require": {
         "php": "~7.3.0||~7.4.0",
         "magento/module-media-content-api": "*",
-        "magento/module-media-content": "*",
         "magento/module-catalog": "*",
         "magento/module-eav": "*",
         "magento/module-store": "*",
diff --git a/app/code/Magento/MediaContentCatalog/etc/di.xml b/app/code/Magento/MediaContentCatalog/etc/di.xml
index 2bc595151ddfe..adbddaa25a122 100644
--- a/app/code/Magento/MediaContentCatalog/etc/di.xml
+++ b/app/code/Magento/MediaContentCatalog/etc/di.xml
@@ -62,20 +62,24 @@
             <argument name="entityType" xsi:type="string">catalog_category</argument>
         </arguments>
     </virtualType>
-    <virtualType name="Magento\MediaContent\Model\GetAssetIdByContentStatusComposite">
+    <type name="Magento\MediaContentApi\Api\GetAssetIdByContentFieldInterface">
         <arguments>
             <argument name="getAssetIdByContentFieldArray" xsi:type="array">
-                <item name="getAssetIdByProductStatus" xsi:type="object">Magento\MediaContentCatalog\Model\GetAssetIdByProductStatus</item>
-                <item name="getAssetIdByCategoryStatus" xsi:type="object">Magento\MediaContentCatalog\Model\GetAssetIdByCategoryStatus</item>
+                <item name="content_status" xsi:type="array">
+                    <item name="getAssetIdByProductStatus" xsi:type="object">Magento\MediaContentCatalog\Model\GetAssetIdByProductStatus</item>
+                    <item name="getAssetIdByCategoryStatus" xsi:type="object">Magento\MediaContentCatalog\Model\GetAssetIdByCategoryStatus</item>
+                </item>
             </argument>
         </arguments>
-    </virtualType>
-    <virtualType name="Magento\MediaContent\Model\GetAssetIdByContentStoreComposite">
+    </type>
+    <type name="Magento\MediaContentApi\Api\GetAssetIdByContentFieldInterface">
         <arguments>
             <argument name="getAssetIdByContentFieldArray" xsi:type="array">
-                <item name="getAssetIdByProductStore" xsi:type="object">Magento\MediaContentCatalog\Model\GetAssetIdByProductStore</item>
-                <item name="getAssetIdByCategoryStore" xsi:type="object">Magento\MediaContentCatalog\Model\GetAssetIdByCategoryStore</item>
+                <item name="store_id" xsi:type="array">
+                    <item name="getAssetIdByProductStore" xsi:type="object">Magento\MediaContentCatalog\Model\GetAssetIdByProductStore</item>
+                    <item name="getAssetIdByCategoryStore" xsi:type="object">Magento\MediaContentCatalog\Model\GetAssetIdByCategoryStore</item>
+                </item>
             </argument>
         </arguments>
-    </virtualType>
+    </type>
 </config>
diff --git a/app/code/Magento/MediaContentCms/Model/GetAssetIdByContentField.php b/app/code/Magento/MediaContentCms/Model/GetAssetIdByContentField.php
index cb10a097e59ac..611fcb0fde1e1 100644
--- a/app/code/Magento/MediaContentCms/Model/GetAssetIdByContentField.php
+++ b/app/code/Magento/MediaContentCms/Model/GetAssetIdByContentField.php
@@ -8,9 +8,7 @@
 namespace Magento\MediaContentCms\Model;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\MediaContentApi\Model\GetAssetIdByContentFieldInterface;
-use Magento\Store\Api\StoreRepositoryInterface;
 
 /**
  * Class responsible to return Asset id by content field
@@ -44,7 +42,6 @@ class GetAssetIdByContentField implements GetAssetIdByContentFieldInterface
      */
     private $idColumn;
 
-
     /**
      * GetAssetIdByContentField constructor.
      *
@@ -88,10 +85,6 @@ public function execute(string $value): array
             $value
         );
 
-        $result = $this->connection->getConnection()->fetchAll($sql);
-
-        return array_map(function ($item) {
-            return $item['asset_id'];
-        }, $result);
+        return $this->connection->getConnection()->fetchCol($sql);
     }
 }
diff --git a/app/code/Magento/MediaContentCms/composer.json b/app/code/Magento/MediaContentCms/composer.json
index ff8bff348770b..ea32fdd7a49fa 100644
--- a/app/code/Magento/MediaContentCms/composer.json
+++ b/app/code/Magento/MediaContentCms/composer.json
@@ -4,7 +4,6 @@
     "require": {
         "php": "~7.3.0||~7.4.0",
         "magento/module-media-content-api": "*",
-        "magento/module-media-content": "*",
         "magento/module-cms": "*",
         "magento/framework": "*"
     },
diff --git a/app/code/Magento/MediaContentCms/etc/di.xml b/app/code/Magento/MediaContentCms/etc/di.xml
index dc633b95d0517..a673cf59e2127 100644
--- a/app/code/Magento/MediaContentCms/etc/di.xml
+++ b/app/code/Magento/MediaContentCms/etc/di.xml
@@ -66,20 +66,24 @@
             <argument name="fieldColumn" xsi:type="string">is_active</argument>
         </arguments>
     </virtualType>
-    <virtualType name="Magento\MediaContent\Model\GetAssetIdByContentStatusComposite">
+    <type name="Magento\MediaContentApi\Api\GetAssetIdByContentFieldInterface">
         <arguments>
             <argument name="getAssetIdByContentFieldArray" xsi:type="array">
-                <item name="getAssetIdByPageStatus" xsi:type="object">Magento\MediaContentCms\Model\GetAssetIdByPageStatus</item>
-                <item name="getAssetIdByBlockStatus" xsi:type="object">Magento\MediaContentCms\Model\GetAssetIdByBlockStatus</item>
+                <item name="content_status" xsi:type="array">
+                    <item name="getAssetIdByPageStatus" xsi:type="object">Magento\MediaContentCms\Model\GetAssetIdByPageStatus</item>
+                    <item name="getAssetIdByBlockStatus" xsi:type="object">Magento\MediaContentCms\Model\GetAssetIdByBlockStatus</item>
+                </item>
             </argument>
         </arguments>
-    </virtualType>
-    <virtualType name="Magento\MediaContent\Model\GetAssetIdByContentStoreComposite">
+    </type>
+    <type name="Magento\MediaContentApi\Api\GetAssetIdByContentFieldInterface">
         <arguments>
             <argument name="getAssetIdByContentFieldArray" xsi:type="array">
-                <item name="getAssetIdByPageStore" xsi:type="object">Magento\MediaContentCms\Model\GetAssetIdByPageStore</item>
-                <item name="getAssetIdByBlockStore" xsi:type="object">Magento\MediaContentCms\Model\GetAssetIdByBlockStore</item>
+                <item name="store_id" xsi:type="array">
+                    <item name="getAssetIdByPageStore" xsi:type="object">Magento\MediaContentCms\Model\GetAssetIdByPageStore</item>
+                    <item name="getAssetIdByBlockStore" xsi:type="object">Magento\MediaContentCms\Model\GetAssetIdByBlockStore</item>
+                </item>
             </argument>
         </arguments>
-    </virtualType>
+    </type>
 </config>

From ac5ce560880c0ea1963a2a99294fab60317d5c65 Mon Sep 17 00:00:00 2001
From: Vadim Malesh <51680850+engcom-Charlie@users.noreply.github.com>
Date: Fri, 10 Jul 2020 13:13:22 +0300
Subject: [PATCH 0799/1718] add test case id

---
 .../Mftf/Test/AdminConfigCollapsedFieldsetValidationTest.xml     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Config/Test/Mftf/Test/AdminConfigCollapsedFieldsetValidationTest.xml b/app/code/Magento/Config/Test/Mftf/Test/AdminConfigCollapsedFieldsetValidationTest.xml
index bf7c8c082971a..877676e2a7cda 100644
--- a/app/code/Magento/Config/Test/Mftf/Test/AdminConfigCollapsedFieldsetValidationTest.xml
+++ b/app/code/Magento/Config/Test/Mftf/Test/AdminConfigCollapsedFieldsetValidationTest.xml
@@ -15,6 +15,7 @@
             <title value="Verify that form validation triggered on element inside hidden fieldset opens the fieldset in case of error"/>
             <description value="Verify that form validation triggered on element inside hidden fieldset opens the fieldset in case of error"/>
             <severity value="AVERAGE"/>
+            <testCaseId value="MC-35785"/>
             <group value="configuration"/>
         </annotations>
         <before>

From 0ccadf5a8169295b6e23cda2fc68d36b51be3953 Mon Sep 17 00:00:00 2001
From: Dmitriy Gallyamov <dmitrijs.gallamovs@gmail.com>
Date: Fri, 10 Jul 2020 13:32:48 +0300
Subject: [PATCH 0800/1718] magento/magento2#28569: Multi-store: Missing store
 codes in relation to a group and website

- Fixed strict types and tests
---
 .../Store/Model/ResourceModel/StoreWebsiteRelation.php        | 4 ++--
 .../StoreGraphQl/Model/Resolver/AvailableStoresResolver.php   | 2 +-
 .../Model/Resolver/Store/StoreConfigDataProvider.php          | 4 ++--
 .../Magento/GraphQl/Store/AvailableStoreConfigTest.php        | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php b/app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php
index 2c066ff2e0f27..19bb45de24d64 100644
--- a/app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php
+++ b/app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php
@@ -47,11 +47,11 @@ public function getStoreByWebsiteId($websiteId)
     /**
      * Get website store data
      *
-     * @param string $websiteId
+     * @param int $websiteId
      * @param bool $available
      * @return array
      */
-    public function getWebsiteStores(string $websiteId, bool $available = false): array
+    public function getWebsiteStores(int $websiteId, bool $available = false): array
     {
         $connection = $this->resource->getConnection();
         $storeTable = $this->resource->getTableName('store');
diff --git a/app/code/Magento/StoreGraphQl/Model/Resolver/AvailableStoresResolver.php b/app/code/Magento/StoreGraphQl/Model/Resolver/AvailableStoresResolver.php
index 5369ed655b2e1..eedd7e21fa058 100644
--- a/app/code/Magento/StoreGraphQl/Model/Resolver/AvailableStoresResolver.php
+++ b/app/code/Magento/StoreGraphQl/Model/Resolver/AvailableStoresResolver.php
@@ -42,7 +42,7 @@ public function resolve(
         array $args = null
     ) {
         return $this->storeConfigDataProvider->getAvailableStoreConfig(
-            $context->getExtensionAttributes()->getStore()->getWebsiteId()
+            (int)$context->getExtensionAttributes()->getStore()->getWebsiteId()
         );
     }
 }
diff --git a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
index 647aa0372532f..6538d87de9780 100644
--- a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
+++ b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
@@ -72,10 +72,10 @@ public function getStoreConfigData(StoreInterface $store): array
     /**
      * Get available website stores
      *
-     * @param string $websiteId
+     * @param int $websiteId
      * @return array
      */
-    public function getAvailableStoreConfig(string $websiteId): array
+    public function getAvailableStoreConfig(int $websiteId): array
     {
         $websiteStores = $this->storeWebsiteRelation->getWebsiteStores($websiteId, true);
         $storeCodes = array_column($websiteStores, 'code');
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/AvailableStoreConfigTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/AvailableStoreConfigTest.php
index 239f6886d8d2d..eaf76e4559557 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/AvailableStoreConfigTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/AvailableStoreConfigTest.php
@@ -166,6 +166,6 @@ private function validateStoreConfig(StoreConfigInterface $storeConfig, array $r
         $this->assertEquals($storeConfig->getSecureBaseLinkUrl(), $responseConfig['secure_base_link_url']);
         $this->assertEquals($storeConfig->getSecureBaseStaticUrl(), $responseConfig['secure_base_static_url']);
         $this->assertEquals($storeConfig->getSecureBaseMediaUrl(), $responseConfig['secure_base_media_url']);
-        $this->assertEquals($storeConfig->getName(), $responseConfig['store_name']);
+        $this->assertEquals($store->getName(), $responseConfig['store_name']);
     }
 }

From 1586e8d22878b82a1ae990f62a5565cff8225e82 Mon Sep 17 00:00:00 2001
From: Stas Kozar <stas.kozar@transoftgroup.com>
Date: Fri, 10 Jul 2020 13:58:34 +0300
Subject: [PATCH 0801/1718] MC-35618: Unexpected results of editing a Grouped
 Product in the Wish List by a Customer

---
 .../Magento/GroupedProduct/Model/Wishlist/Product/Item.php  | 3 +--
 app/code/Magento/Wishlist/Model/Wishlist.php                | 6 +++---
 .../Test/Unit/Controller/Index/UpdateItemOptionsTest.php    | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/GroupedProduct/Model/Wishlist/Product/Item.php b/app/code/Magento/GroupedProduct/Model/Wishlist/Product/Item.php
index b0048d66dd93e..48e1a5053ac69 100644
--- a/app/code/Magento/GroupedProduct/Model/Wishlist/Product/Item.php
+++ b/app/code/Magento/GroupedProduct/Model/Wishlist/Product/Item.php
@@ -83,8 +83,7 @@ public function beforeCompareOptions(
 
         if (!$diff) {
             foreach (array_keys($options1) as $key) {
-                if (
-                    preg_match('/associated_product_\d+/', $key)
+                if (preg_match('/associated_product_\d+/', $key)
                     && $this->isAddAction($productOptions['info_buyRequest'])
                 ) {
                     unset($options1[$key]);
diff --git a/app/code/Magento/Wishlist/Model/Wishlist.php b/app/code/Magento/Wishlist/Model/Wishlist.php
index cb1a7d956570b..66d19d6dcf617 100644
--- a/app/code/Magento/Wishlist/Model/Wishlist.php
+++ b/app/code/Magento/Wishlist/Model/Wishlist.php
@@ -756,9 +756,9 @@ public function updateItem($itemId, $buyRequest, $params = null)
             $isForceSetQuantity = true;
             foreach ($items as $_item) {
                 /* @var $_item Item */
-                if ($_item->getProductId() == $product->getId() && $_item->representProduct(
-                    $product
-                ) && $_item->getId() != $item->getId()
+                if ($_item->getProductId() == $product->getId()
+                    && $_item->getId() != $item->getId()
+                    && $_item->representProduct($product)
                 ) {
                     // We do not add new wishlist item, but updating the existing one
                     $isForceSetQuantity = false;
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/UpdateItemOptionsTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/UpdateItemOptionsTest.php
index 623ba8f266fa1..69e4e48262842 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/UpdateItemOptionsTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/UpdateItemOptionsTest.php
@@ -380,7 +380,7 @@ public function testExecuteAddSuccessException()
         $wishlist
             ->expects($this->once())
             ->method('updateItem')
-            ->with(3, new DataObject([]))
+            ->with(3, new DataObject(['action' => 'updateItem']))
             ->willReturnSelf();
         $wishlist
             ->expects($this->once())
@@ -509,7 +509,7 @@ public function testExecuteAddSuccessCriticalException()
         $wishlist
             ->expects($this->once())
             ->method('updateItem')
-            ->with(3, new DataObject([]))
+            ->with(3, new DataObject(['action' => 'updateItem']))
             ->willReturnSelf();
         $wishlist
             ->expects($this->once())

From 657770953454a9916280955609b12838702b53b8 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Fri, 10 Jul 2020 14:52:05 +0300
Subject: [PATCH 0802/1718] Introduce SearchAssets service

---
 .../Model/ResourceModel/SearchAssets.php      | 173 ++++++++++++++++++
 app/code/Magento/MediaGallery/etc/di.xml      |   1 +
 .../Api/SearchAssetsInterface.php             |  29 +++
 3 files changed, 203 insertions(+)
 create mode 100644 app/code/Magento/MediaGallery/Model/ResourceModel/SearchAssets.php
 create mode 100644 app/code/Magento/MediaGalleryApi/Api/SearchAssetsInterface.php

diff --git a/app/code/Magento/MediaGallery/Model/ResourceModel/SearchAssets.php b/app/code/Magento/MediaGallery/Model/ResourceModel/SearchAssets.php
new file mode 100644
index 0000000000000..9f53eb1afccd1
--- /dev/null
+++ b/app/code/Magento/MediaGallery/Model/ResourceModel/SearchAssets.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallery\Model\ResourceModel;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
+use Magento\MediaGalleryApi\Api\SearchAssetsInterface;
+use Magento\Framework\App\ResourceConnection;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\Api\Search\SearchResultInterface;
+use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\Framework\Api\Search\SearchResultFactory;
+use Magento\Framework\DB\Select;
+use Magento\MediaGalleryApi\Api\Data\AssetInterface;
+
+/**
+ * Get media assets by searchCriteria
+ */
+class SearchAssets implements SearchAssetsInterface
+{
+    private const TABLE_MEDIA_GALLERY_ASSET = 'media_gallery_asset';
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var AssetInterfaceFactory
+     */
+    private $mediaAssetFactory;
+
+    /**
+     * @var SearchResultFactory
+     */
+    protected $searchResultFactory;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @param SearchResultFactory $searchResultFactory
+     * @param ResourceConnection $resourceConnection
+     * @param AssetInterfaceFactory $mediaAssetFactory
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        SearchResultFactory $searchResultFactory,
+        ResourceConnection $resourceConnection,
+        AssetInterfaceFactory $mediaAssetFactory,
+        LoggerInterface $logger
+    ) {
+        $this->searchResultFactory = $searchResultFactory;
+        $this->resourceConnection = $resourceConnection;
+        $this->mediaAssetFactory = $mediaAssetFactory;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(SearchCriteriaInterface $searchCriteria): array
+    {
+        $assets = [];
+        try {
+            foreach ($this->getAssetsData($searchCriteria)->getItems() as $assetData) {
+                $assets[] = $this->mediaAssetFactory->create(
+                    [
+                        'id' => $assetData['id'],
+                        'path' => $assetData['path'],
+                        'title' => $assetData['title'],
+                        'description' => $assetData['description'],
+                        'source' => $assetData['source'],
+                        'hash' => $assetData['hash'],
+                        'contentType' => $assetData['content_type'],
+                        'width' => $assetData['width'],
+                        'height' => $assetData['height'],
+                        'size' => $assetData['size'],
+                        'createdAt' => $assetData['created_at'],
+                        'updatedAt' => $assetData['updated_at'],
+                    ]
+                );
+            }
+        } catch (\Exception $exception) {
+            $this->logger->critical($exception);
+            throw new LocalizedException(__('Could not retrieve media assets'), $exception->getMessage());
+        }
+        return $assets;
+    }
+
+    /**
+     * Retrieve assets data from database
+     *
+     * @param SearchCriteriaInterface $searchCriteria
+     * @return SearchResultInterface
+     */
+    private function getAssetsData(SearchCriteriaInterface $searchCriteria): SearchResultInterface
+    {
+        $searchResult = $this->searchResultFactory->create();
+        $fields = [];
+        $conditions = [];
+       
+        foreach ($searchCriteria->getFilterGroups() as $filterGroup) {
+            foreach ($filterGroup->getFilters() as $filter) {
+                $condition = $filter->getConditionType() ? $filter->getConditionType() : 'eq';
+                $fields[] = $filter->getField();
+
+                if ($condition === 'fulltext') {
+                    $condition = 'like';
+                    $filter->setValue('%' . $filter->getValue() . '%');
+                }
+
+                $conditions[] = [$condition => $filter->getValue()];
+            }
+        }
+        
+        if ($fields) {
+            $resultCondition = $this->getResultCondition($fields, $conditions);
+            $select = $this->resourceConnection->getConnection()->select()
+                ->from(
+                    $this->resourceConnection->getTableName(self::TABLE_MEDIA_GALLERY_ASSET)
+                )
+                ->where($resultCondition, null, Select::TYPE_CONDITION);
+
+            if ($searchCriteria->getPageSize() || $searchCriteria->getCurrentPage()) {
+                $select->limit($searchCriteria->getPageSize(), $searchCriteria->getCurrentPage());
+            }
+        
+            $data = $this->resourceConnection->getConnection()->fetchAll($select);
+        }
+        
+        $searchResult->setSearchCriteria($searchCriteria);
+        $searchResult->setItems($data);
+        
+       
+        return $searchResult;
+    }
+
+    /**
+     * Get conditions data by searchCriteria
+     *
+     * @param string|array $field
+     * @param null|string|array $condition
+     */
+    public function getResultCondition($field, $condition = null)
+    {
+        $resourceConnection = $this->resourceConnection->getConnection();
+        if (is_array($field)) {
+            $conditions = [];
+            foreach ($field as $key => $value) {
+                $conditions[] = $resourceConnection->prepareSqlCondition(
+                    $resourceConnection->quoteIdentifier($value),
+                    isset($condition[$key]) ? $condition[$key] : null
+                );
+            }
+
+            $resultCondition = '(' . implode(') ' . Select::SQL_OR . ' (', $conditions) . ')';
+        } else {
+            $resultCondition = $resourceConnection->prepareSqlCondition(
+                $resourceConnection->quoteIdentifier($value),
+                $condition
+            );
+        }
+        return $resultCondition;
+    }
+}
diff --git a/app/code/Magento/MediaGallery/etc/di.xml b/app/code/Magento/MediaGallery/etc/di.xml
index bedb78758786b..8cea186ba4839 100644
--- a/app/code/Magento/MediaGallery/etc/di.xml
+++ b/app/code/Magento/MediaGallery/etc/di.xml
@@ -29,6 +29,7 @@
     <preference for="Magento\MediaGalleryApi\Api\SaveAssetsInterface" type="Magento\MediaGallery\Model\ResourceModel\SaveAssets"/>
     <preference for="Magento\MediaGalleryApi\Api\GetAssetsKeywordsInterface" type="Magento\MediaGallery\Model\ResourceModel\Keyword\GetAssetsKeywords"/>
     <preference for="Magento\MediaGalleryApi\Api\SaveAssetsKeywordsInterface" type="Magento\MediaGallery\Model\ResourceModel\Keyword\SaveAssetsKeywords"/>
+    <preference for="Magento\MediaGalleryApi\Api\SearchAssetsInterface" type="Magento\MediaGallery\Model\ResourceModel\SearchAssets"/>
 
     <type name="Magento\Cms\Model\Wysiwyg\Images\Storage">
         <plugin name="media_gallery_image_remove_metadata_after_wysiwyg" type="Magento\MediaGallery\Plugin\Wysiwyg\Images\Storage"
diff --git a/app/code/Magento/MediaGalleryApi/Api/SearchAssetsInterface.php b/app/code/Magento/MediaGalleryApi/Api/SearchAssetsInterface.php
new file mode 100644
index 0000000000000..0f1fde0ce9c9a
--- /dev/null
+++ b/app/code/Magento/MediaGalleryApi/Api/SearchAssetsInterface.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryApi\Api;
+
+use Magento\Framework\Api\Search\SearchResultInterface;
+use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\MediaGalleryApi\Api\Data\AssetInterface;
+
+/**
+ * Search media gallery assets by search criteria
+ * @api
+ */
+interface SearchAssetsInterface
+{
+    /**
+     * Search media gallery assets
+     *
+     * @param SearchCriteriaInterface $searchCriteria
+     * @return AssetInterface[]
+     * @throws LocalizedException
+     */
+    public function execute(SearchCriteriaInterface $searchCriteria): array;
+}

From 47ddb3bf58d197544c5b4dbe958475cd0aea1a90 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Fri, 10 Jul 2020 16:34:20 +0300
Subject: [PATCH 0803/1718] Code review suggestions

---
 ...sets.php => GetAssetsBySearchCriteria.php} | 50 +-----------
 .../MediaGallery/Model/SearchAssets.php       | 78 +++++++++++++++++++
 app/code/Magento/MediaGallery/etc/di.xml      |  2 +-
 .../Api/SearchAssetsInterface.php             |  4 +-
 4 files changed, 84 insertions(+), 50 deletions(-)
 rename app/code/Magento/MediaGallery/Model/ResourceModel/{SearchAssets.php => GetAssetsBySearchCriteria.php} (68%)
 create mode 100644 app/code/Magento/MediaGallery/Model/SearchAssets.php

diff --git a/app/code/Magento/MediaGallery/Model/ResourceModel/SearchAssets.php b/app/code/Magento/MediaGallery/Model/ResourceModel/GetAssetsBySearchCriteria.php
similarity index 68%
rename from app/code/Magento/MediaGallery/Model/ResourceModel/SearchAssets.php
rename to app/code/Magento/MediaGallery/Model/ResourceModel/GetAssetsBySearchCriteria.php
index 9f53eb1afccd1..f1e67a75f8796 100644
--- a/app/code/Magento/MediaGallery/Model/ResourceModel/SearchAssets.php
+++ b/app/code/Magento/MediaGallery/Model/ResourceModel/GetAssetsBySearchCriteria.php
@@ -8,8 +8,6 @@
 namespace Magento\MediaGallery\Model\ResourceModel;
 
 use Magento\Framework\Exception\LocalizedException;
-use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
-use Magento\MediaGalleryApi\Api\SearchAssetsInterface;
 use Magento\Framework\App\ResourceConnection;
 use Psr\Log\LoggerInterface;
 use Magento\Framework\Api\Search\SearchResultInterface;
@@ -19,9 +17,9 @@
 use Magento\MediaGalleryApi\Api\Data\AssetInterface;
 
 /**
- * Get media assets by searchCriteria
+ * Get assets data  by searchCriteria
  */
-class SearchAssets implements SearchAssetsInterface
+class GetAssetsBySearchCriteria
 {
     private const TABLE_MEDIA_GALLERY_ASSET = 'media_gallery_asset';
 
@@ -30,11 +28,6 @@ class SearchAssets implements SearchAssetsInterface
      */
     private $resourceConnection;
 
-    /**
-     * @var AssetInterfaceFactory
-     */
-    private $mediaAssetFactory;
-
     /**
      * @var SearchResultFactory
      */
@@ -48,60 +41,25 @@ class SearchAssets implements SearchAssetsInterface
     /**
      * @param SearchResultFactory $searchResultFactory
      * @param ResourceConnection $resourceConnection
-     * @param AssetInterfaceFactory $mediaAssetFactory
      * @param LoggerInterface $logger
      */
     public function __construct(
         SearchResultFactory $searchResultFactory,
         ResourceConnection $resourceConnection,
-        AssetInterfaceFactory $mediaAssetFactory,
         LoggerInterface $logger
     ) {
         $this->searchResultFactory = $searchResultFactory;
         $this->resourceConnection = $resourceConnection;
-        $this->mediaAssetFactory = $mediaAssetFactory;
         $this->logger = $logger;
     }
 
-    /**
-     * @inheritdoc
-     */
-    public function execute(SearchCriteriaInterface $searchCriteria): array
-    {
-        $assets = [];
-        try {
-            foreach ($this->getAssetsData($searchCriteria)->getItems() as $assetData) {
-                $assets[] = $this->mediaAssetFactory->create(
-                    [
-                        'id' => $assetData['id'],
-                        'path' => $assetData['path'],
-                        'title' => $assetData['title'],
-                        'description' => $assetData['description'],
-                        'source' => $assetData['source'],
-                        'hash' => $assetData['hash'],
-                        'contentType' => $assetData['content_type'],
-                        'width' => $assetData['width'],
-                        'height' => $assetData['height'],
-                        'size' => $assetData['size'],
-                        'createdAt' => $assetData['created_at'],
-                        'updatedAt' => $assetData['updated_at'],
-                    ]
-                );
-            }
-        } catch (\Exception $exception) {
-            $this->logger->critical($exception);
-            throw new LocalizedException(__('Could not retrieve media assets'), $exception->getMessage());
-        }
-        return $assets;
-    }
-
     /**
      * Retrieve assets data from database
      *
      * @param SearchCriteriaInterface $searchCriteria
      * @return SearchResultInterface
      */
-    private function getAssetsData(SearchCriteriaInterface $searchCriteria): SearchResultInterface
+    public function execute(SearchCriteriaInterface $searchCriteria): SearchResultInterface
     {
         $searchResult = $this->searchResultFactory->create();
         $fields = [];
@@ -164,7 +122,7 @@ public function getResultCondition($field, $condition = null)
             $resultCondition = '(' . implode(') ' . Select::SQL_OR . ' (', $conditions) . ')';
         } else {
             $resultCondition = $resourceConnection->prepareSqlCondition(
-                $resourceConnection->quoteIdentifier($value),
+                $resourceConnection->quoteIdentifier($field),
                 $condition
             );
         }
diff --git a/app/code/Magento/MediaGallery/Model/SearchAssets.php b/app/code/Magento/MediaGallery/Model/SearchAssets.php
new file mode 100644
index 0000000000000..e9cfb6f8d374b
--- /dev/null
+++ b/app/code/Magento/MediaGallery/Model/SearchAssets.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallery\Model;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\MediaGallery\Model\ResourceModel\GetAssetsBySearchCriteria;
+use Magento\MediaGalleryApi\Api\SearchAssetsInterface;
+
+/**
+ * Get media assets by searchCriteria
+ */
+class SearchAssets implements SearchAssetsInterface
+{
+    /**
+     * @var GetAssetsBySearchCriteria
+     */
+    private $getAssetsBySearchCriteria;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @param GetAssetsBySearchCriteria $getAssetsBySearchCriteria
+     * @param AssetInterfaceFactory $mediaAssetFactory
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        GetAssetsBySearchCriteria $getAssetsBySearchCriteria,
+        AssetInterfaceFactory $mediaAssetFactory,
+        LoggerInterface $logger
+    ) {
+        $this->getAssetsBySearchCriteria = $getAssetsBySearchCriteria;
+        $this->mediaAssetFactory = $mediaAssetFactory;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(SearchCriteriaInterface $searchCriteria): array
+    {
+        $assets = [];
+        try {
+            foreach ($this->getAssetsBySearchCriteria->execute($searchCriteria)->getItems() as $assetData) {
+                $assets[] = $this->mediaAssetFactory->create(
+                    [
+                        'id' => $assetData['id'],
+                        'path' => $assetData['path'],
+                        'title' => $assetData['title'],
+                        'description' => $assetData['description'],
+                        'source' => $assetData['source'],
+                        'hash' => $assetData['hash'],
+                        'contentType' => $assetData['content_type'],
+                        'width' => $assetData['width'],
+                        'height' => $assetData['height'],
+                        'size' => $assetData['size'],
+                        'createdAt' => $assetData['created_at'],
+                        'updatedAt' => $assetData['updated_at'],
+                    ]
+                );
+            }
+        } catch (\Exception $exception) {
+            $this->logger->critical($exception);
+            throw new LocalizedException(__('Could not retrieve media assets'), $exception->getMessage());
+        }
+        return $assets;
+    }
+}
diff --git a/app/code/Magento/MediaGallery/etc/di.xml b/app/code/Magento/MediaGallery/etc/di.xml
index 8cea186ba4839..b040bf9b35da3 100644
--- a/app/code/Magento/MediaGallery/etc/di.xml
+++ b/app/code/Magento/MediaGallery/etc/di.xml
@@ -29,7 +29,7 @@
     <preference for="Magento\MediaGalleryApi\Api\SaveAssetsInterface" type="Magento\MediaGallery\Model\ResourceModel\SaveAssets"/>
     <preference for="Magento\MediaGalleryApi\Api\GetAssetsKeywordsInterface" type="Magento\MediaGallery\Model\ResourceModel\Keyword\GetAssetsKeywords"/>
     <preference for="Magento\MediaGalleryApi\Api\SaveAssetsKeywordsInterface" type="Magento\MediaGallery\Model\ResourceModel\Keyword\SaveAssetsKeywords"/>
-    <preference for="Magento\MediaGalleryApi\Api\SearchAssetsInterface" type="Magento\MediaGallery\Model\ResourceModel\SearchAssets"/>
+    <preference for="Magento\MediaGalleryApi\Api\SearchAssetsInterface" type="Magento\MediaGallery\Model\SearchAssets"/>
 
     <type name="Magento\Cms\Model\Wysiwyg\Images\Storage">
         <plugin name="media_gallery_image_remove_metadata_after_wysiwyg" type="Magento\MediaGallery\Plugin\Wysiwyg\Images\Storage"
diff --git a/app/code/Magento/MediaGalleryApi/Api/SearchAssetsInterface.php b/app/code/Magento/MediaGalleryApi/Api/SearchAssetsInterface.php
index 0f1fde0ce9c9a..19c1a04f663e5 100644
--- a/app/code/Magento/MediaGalleryApi/Api/SearchAssetsInterface.php
+++ b/app/code/Magento/MediaGalleryApi/Api/SearchAssetsInterface.php
@@ -10,11 +10,9 @@
 use Magento\Framework\Api\Search\SearchResultInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\MediaGalleryApi\Api\Data\AssetInterface;
 
 /**
  * Search media gallery assets by search criteria
- * @api
  */
 interface SearchAssetsInterface
 {
@@ -22,7 +20,7 @@ interface SearchAssetsInterface
      * Search media gallery assets
      *
      * @param SearchCriteriaInterface $searchCriteria
-     * @return AssetInterface[]
+     * @return AssetsSearchResultInterface[]
      * @throws LocalizedException
      */
     public function execute(SearchCriteriaInterface $searchCriteria): array;

From ac0f4e6c48642fbf4906c88e6210c1fa0d979469 Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Fri, 10 Jul 2020 16:53:49 +0300
Subject: [PATCH 0804/1718] Added etc/graphql/di.xml

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

diff --git a/app/code/Magento/PageCache/etc/graphql/di.xml b/app/code/Magento/PageCache/etc/graphql/di.xml
new file mode 100644
index 0000000000000..c1f6647bba8f6
--- /dev/null
+++ b/app/code/Magento/PageCache/etc/graphql/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="page_cache_from_key_from_cookie" type="Magento\PageCache\Plugin\RegisterFormKeyFromCookie" />
+    </type>
+</config>

From 3e833b3b9d4f472a8e1ddb7aac47949ed7054a13 Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Fri, 10 Jul 2020 16:54:47 +0300
Subject: [PATCH 0805/1718] Revert changes in Tests

---
 .../Catalog/ProductInMultipleStoresTest.php   | 14 -------------
 .../ProductInMultipleStoresCacheTest.php      | 20 -------------------
 2 files changed, 34 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductInMultipleStoresTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductInMultipleStoresTest.php
index 2c07ca4ee096b..c2555cb4399f5 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductInMultipleStoresTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductInMultipleStoresTest.php
@@ -7,7 +7,6 @@
 
 namespace Magento\GraphQl\Catalog;
 
-use Magento\PageCache\Model\Cache\Type as PageCache;
 use Magento\TestFramework\ObjectManager;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -77,8 +76,6 @@ public function testProductFromSpecificAndDefaultStore()
             'Product name in fixture store is invalid.'
         );
 
-        $this->flushPageCache();
-
         //use case for default storeCode
         $nameInDefaultStore = 'Simple Product';
         $headerMapDefault = ['Store' => 'default'];
@@ -89,8 +86,6 @@ public function testProductFromSpecificAndDefaultStore()
             'Product name in default store is invalid.'
         );
 
-        $this->flushPageCache();
-
         //use case for empty storeCode
         $headerMapEmpty = ['Store' => ''];
         $response = $this->graphQlQuery($query, [], '', $headerMapEmpty);
@@ -100,8 +95,6 @@ public function testProductFromSpecificAndDefaultStore()
             'Product in the default store should be returned'
         );
 
-        $this->flushPageCache();
-
         // use case for invalid storeCode
         $nonExistingStoreCode = "non_existent_store";
         $headerMapInvalidStoreCode = ['Store' => $nonExistingStoreCode];
@@ -109,11 +102,4 @@ public function testProductFromSpecificAndDefaultStore()
         $this->expectExceptionMessage('Requested store is not found');
         $this->graphQlQuery($query, [], '', $headerMapInvalidStoreCode);
     }
-
-    protected function flushPageCache(): void
-    {
-        /** @var PageCache $fullPageCache */
-        $fullPageCache = ObjectManager::getInstance()->get(PageCache::class);
-        $fullPageCache->clean();
-    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/ProductInMultipleStoresCacheTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/ProductInMultipleStoresCacheTest.php
index 0e512d2575a92..92a6b80642272 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/ProductInMultipleStoresCacheTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/ProductInMultipleStoresCacheTest.php
@@ -7,7 +7,6 @@
 
 namespace Magento\GraphQl\PageCache;
 
-use Magento\PageCache\Model\Cache\Type as PageCache;
 use Magento\TestFramework\ObjectManager;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -243,8 +242,6 @@ public function testProductFromSpecificAndDefaultStoreWithMultiCurrency()
             'Currency code EUR in fixture ' . $storeCodeFromFixture . ' is unexpected'
         );
 
-        $this->flushPageCache();
-
         // test cached store + currency header in Euros
         $headerMap = ['Store' => $storeCodeFromFixture, 'Content-Currency' => 'EUR'];
         $response = $this->graphQlQuery($query, [], '', $headerMap);
@@ -259,8 +256,6 @@ public function testProductFromSpecificAndDefaultStoreWithMultiCurrency()
             'Currency code EUR in fixture ' . $storeCodeFromFixture . ' is unexpected'
         );
 
-        $this->flushPageCache();
-
         // test non cached store + currency header in USD
         $headerMap = ['Store' => $storeCodeFromFixture, 'Content-Currency' => 'USD'];
         $response = $this->graphQlQuery($query, [], '', $headerMap);
@@ -275,8 +270,6 @@ public function testProductFromSpecificAndDefaultStoreWithMultiCurrency()
             'Currency code USD in fixture ' . $storeCodeFromFixture . ' is unexpected'
         );
 
-        $this->flushPageCache();
-
         // test non cached store + currency header in USD not cached
         $headerMap = ['Store' => 'default', 'Content-Currency' => 'USD'];
         $response = $this->graphQlQuery($query, [], '', $headerMap);
@@ -291,8 +284,6 @@ public function testProductFromSpecificAndDefaultStoreWithMultiCurrency()
             'Currency code USD in fixture store default is unexpected'
         );
 
-        $this->flushPageCache();
-
         // test non cached store + currency header in USD not cached
         $headerMap = ['Store' => 'default', 'Content-Currency' => 'EUR'];
         $response = $this->graphQlQuery($query, [], '', $headerMap);
@@ -307,8 +298,6 @@ public function testProductFromSpecificAndDefaultStoreWithMultiCurrency()
             'Currency code EUR in fixture store default is unexpected'
         );
 
-        $this->flushPageCache();
-
         // test non cached store + currency header in USD  cached
         $headerMap = ['Store' => 'default'];
         $response = $this->graphQlQuery($query, [], '', $headerMap);
@@ -323,21 +312,12 @@ public function testProductFromSpecificAndDefaultStoreWithMultiCurrency()
             'Currency code USD in fixture store default is unexpected'
         );
 
-        $this->flushPageCache();
-
         // test cached response store + currency header with non existing currency, and no valid response, no cache
         $headerMap = ['Store' => $storeCodeFromFixture, 'Content-Currency' => 'SOMECURRENCY'];
         $this->expectExceptionMessage(
             'GraphQL response contains errors: Please correct the target currency'
         );
-
         $this->graphQlQuery($query, [], '', $headerMap);
     }
 
-    protected function flushPageCache(): void
-    {
-        /** @var PageCache $fullPageCache */
-        $fullPageCache = ObjectManager::getInstance()->get(PageCache::class);
-        $fullPageCache->clean();
-    }
 }

From c1f5509be14c507b71ca7fd9a036ff5b86dbe71c Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Fri, 10 Jul 2020 16:56:42 +0300
Subject: [PATCH 0806/1718] Revert changes in Tests

---
 .../Magento/GraphQl/Catalog/ProductInMultipleStoresTest.php   | 4 +---
 .../GraphQl/PageCache/ProductInMultipleStoresCacheTest.php    | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductInMultipleStoresTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductInMultipleStoresTest.php
index c2555cb4399f5..d17b434f39d9f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductInMultipleStoresTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductInMultipleStoresTest.php
@@ -11,9 +11,7 @@
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 /**
- * Class for ProductInMultipleStoresTest
- *
- * @magentoAppIsolation enabled
+ * Class ProductInMultipleStoresTest
  */
 class ProductInMultipleStoresTest extends GraphQlAbstract
 {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/ProductInMultipleStoresCacheTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/ProductInMultipleStoresCacheTest.php
index 92a6b80642272..20a612e9f88b0 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/ProductInMultipleStoresCacheTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/ProductInMultipleStoresCacheTest.php
@@ -319,5 +319,4 @@ public function testProductFromSpecificAndDefaultStoreWithMultiCurrency()
         );
         $this->graphQlQuery($query, [], '', $headerMap);
     }
-
 }

From 34e4847511e12ef85ca9025d713c35a3874d7d62 Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Fri, 10 Jul 2020 09:12:58 -0500
Subject: [PATCH 0807/1718] MC-20637: MyAccount :: Order Details :: Invoice
 Details by Order Number - fixed review comments

---
 .../Model/SalesItem/ShippingTaxCalculator.php | 24 ++++++++++++-------
 .../Magento/GraphQl/Sales/InvoiceTest.php     |  2 +-
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/SalesGraphQl/Model/SalesItem/ShippingTaxCalculator.php b/app/code/Magento/SalesGraphQl/Model/SalesItem/ShippingTaxCalculator.php
index edb51ecc57b8d..b063918de6ec0 100644
--- a/app/code/Magento/SalesGraphQl/Model/SalesItem/ShippingTaxCalculator.php
+++ b/app/code/Magento/SalesGraphQl/Model/SalesItem/ShippingTaxCalculator.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\SalesGraphQl\Model\SalesItem;
 
@@ -10,8 +11,12 @@
 use Magento\Sales\Model\EntityInterface;
 use Magento\Tax\Api\Data\OrderTaxDetailsItemInterface;
 use Magento\Tax\Api\OrderTaxManagementInterface;
-use \Magento\Quote\Model\Quote\Address;
+use Magento\Quote\Model\Quote\Address;
+use Magento\Framework\Exception\NoSuchEntityException;
 
+/**
+ * Calculates shipping taxes for sales items (Invoices, Credit memo)
+ */
 class ShippingTaxCalculator
 {
     /**
@@ -34,12 +39,12 @@ public function __construct(
      * @param OrderInterface $order
      * @param EntityInterface $salesItem
      * @return array
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws NoSuchEntityException
      */
     public function calculateShippingTaxes(
         OrderInterface $order,
         EntityInterface $salesItem
-    ) {
+    ): array {
         $orderTaxDetails = $this->orderTaxManagement->getOrderTaxDetails($order->getId());
         $taxClassBreakdown = [];
         // Apply any taxes for shipping
@@ -64,7 +69,7 @@ public function calculateShippingTaxes(
     /**
      * Accumulates the pre-calculated taxes for each tax class
      *
-     * This method accepts and returns the 'taxClassAmount' array with format:
+     * This method accepts and returns the '$taxClassBreakdown' array with format:
      * array(
      *  $index => array(
      *      'tax_amount'        => $taxAmount,
@@ -74,13 +79,16 @@ public function calculateShippingTaxes(
      *  )
      * )
      *
-     * @param  array                        $taxClassBreakdown
+     * @param  array $taxClassBreakdown
      * @param  OrderTaxDetailsItemInterface $itemTaxDetail
-     * @param  float                        $taxRatio
+     * @param  float $taxRatio
      * @return array
      */
-    private function aggregateTaxes($taxClassBreakdown, OrderTaxDetailsItemInterface $itemTaxDetail, $taxRatio)
-    {
+    private function aggregateTaxes(
+        array $taxClassBreakdown,
+        OrderTaxDetailsItemInterface $itemTaxDetail,
+        float $taxRatio
+    ): array {
         $itemAppliedTaxes = $itemTaxDetail->getAppliedTaxes();
         foreach ($itemAppliedTaxes as $itemAppliedTax) {
             $taxAmount = $itemAppliedTax->getAmount() * $taxRatio;
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/InvoiceTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/InvoiceTest.php
index b37f0c6c74cd5..10d47872b16f7 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/InvoiceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/InvoiceTest.php
@@ -794,7 +794,7 @@ private function placeOrder(string $cartId): string
      * @param string $orderNumber
      * @return array
      */
-    private function getCustomerInvoicesBasedOnOrderNumber($orderNumber = null): array
+    private function getCustomerInvoicesBasedOnOrderNumber($orderNumber): array
     {
         $query =
             <<<QUERY

From 7d6949868e59ed20ef31284ee75ec1f87f0487e9 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Fri, 10 Jul 2020 17:25:37 +0300
Subject: [PATCH 0808/1718] Fix static tests

---
 .../Model/ResourceModel/GetAssetsBySearchCriteria.php        | 1 -
 app/code/Magento/MediaGallery/Model/SearchAssets.php         | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGallery/Model/ResourceModel/GetAssetsBySearchCriteria.php b/app/code/Magento/MediaGallery/Model/ResourceModel/GetAssetsBySearchCriteria.php
index f1e67a75f8796..e871f6be8d71d 100644
--- a/app/code/Magento/MediaGallery/Model/ResourceModel/GetAssetsBySearchCriteria.php
+++ b/app/code/Magento/MediaGallery/Model/ResourceModel/GetAssetsBySearchCriteria.php
@@ -96,7 +96,6 @@ public function execute(SearchCriteriaInterface $searchCriteria): SearchResultIn
         
         $searchResult->setSearchCriteria($searchCriteria);
         $searchResult->setItems($data);
-        
        
         return $searchResult;
     }
diff --git a/app/code/Magento/MediaGallery/Model/SearchAssets.php b/app/code/Magento/MediaGallery/Model/SearchAssets.php
index e9cfb6f8d374b..69678e3cacc13 100644
--- a/app/code/Magento/MediaGallery/Model/SearchAssets.php
+++ b/app/code/Magento/MediaGallery/Model/SearchAssets.php
@@ -29,6 +29,11 @@ class SearchAssets implements SearchAssetsInterface
      */
     private $logger;
 
+    /**
+     * @var AssetInterfaceFactory
+     */
+    private $mediaAssetFactory;
+
     /**
      * @param GetAssetsBySearchCriteria $getAssetsBySearchCriteria
      * @param AssetInterfaceFactory $mediaAssetFactory

From 545f886e6b97b30f083592d05c589239aa07ab6b Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Fri, 10 Jul 2020 15:58:34 +0100
Subject: [PATCH 0809/1718] Added integration tests

---
 .../GetAssetIdByContentFieldComposite.php     |   1 +
 .../GetAssetIdByContentFieldTest.php          | 101 ++++++++++++++++++
 .../GetAssetIdByContentFieldTest.php          |  87 +++++++++++++++
 3 files changed, 189 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdByContentFieldTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdByContentFieldTest.php

diff --git a/app/code/Magento/MediaContent/Model/GetAssetIdByContentFieldComposite.php b/app/code/Magento/MediaContent/Model/GetAssetIdByContentFieldComposite.php
index 577ea6898f665..57bf5d6458577 100644
--- a/app/code/Magento/MediaContent/Model/GetAssetIdByContentFieldComposite.php
+++ b/app/code/Magento/MediaContent/Model/GetAssetIdByContentFieldComposite.php
@@ -41,6 +41,7 @@ public function execute(string $field, string $value): array
             throw new InvalidArgumentException(__('The field argument is invalid.'));
         }
         $ids = [];
+        /** @var GetAssetIdByContentFieldInterface $getAssetIdByContentField */
         foreach ($this->getAssetIdByContentFieldArray[$field] as $getAssetIdByContentField) {
             // phpcs:ignore Magento2.Performance.ForeachArrayMerge
             $ids = array_merge($ids, $getAssetIdByContentField->execute($value));
diff --git a/dev/tests/integration/testsuite/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdByContentFieldTest.php b/dev/tests/integration/testsuite/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdByContentFieldTest.php
new file mode 100644
index 0000000000000..7ca595a72f1f4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdByContentFieldTest.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ *
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentCatalog\Model\ResourceModel;
+
+use Magento\MediaContentApi\Api\GetAssetIdByContentFieldInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for GetAssetIdByContentFieldTest
+ */
+class GetAssetIdByContentFieldTest extends TestCase
+{
+    private const STORE_FIELD = 'store_id';
+    private const STATUS_FIELD = 'content_status';
+    private const STATUS_ENABLED = '1';
+    private const STATUS_DISABLED = '0';
+
+    /**
+     * @var GetAssetIdByContentFieldInterface
+     */
+    private $getAssetIdByContentField;
+
+    /**
+     * @var int
+     */
+    private $storeId;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->storeId = $objectManager->get(StoreManagerInterface::class)->getStore()->getId();
+        $this->getAssetIdByContentField = $objectManager->get(GetAssetIdByContentFieldInterface::class);
+    }
+
+    /**
+     * Test for getting asset id by store view of a category
+     *
+     * @magentoDataFixture Magento/MediaGallery/_files/media_asset.php
+     * @magentoDataFixture Magento/MediaContentCatalog/_files/category_with_asset.php
+     */
+    public function testCategoryStoreView(): void
+    {
+        $this->assertEquals(
+            [2020],
+            $this->getAssetIdByContentField->execute(self::STORE_FIELD, (string)$this->storeId)
+        );
+    }
+
+    /**
+     * Test for getting asset id by store view of a product
+     *
+     * @magentoDataFixture Magento/MediaGallery/_files/media_asset.php
+     * @magentoDataFixture Magento/MediaContentCatalog/_files/product_with_asset.php
+     */
+    public function testProductStoreView(): void
+    {
+        $this->assertEquals(
+            [2020],
+            $this->getAssetIdByContentField->execute(self::STORE_FIELD, (string)$this->storeId)
+        );
+    }
+
+    /**
+     * Test for getting asset id by enabled status of a product
+     *
+     * @magentoDataFixture Magento/MediaGallery/_files/media_asset.php
+     * @magentoDataFixture Magento/MediaContentCatalog/_files/category_with_asset.php
+     */
+    public function testProductStatusEnabled(): void
+    {
+        $this->assertEquals(
+            [2020],
+            $this->getAssetIdByContentField->execute(self::STATUS_FIELD, self::STATUS_ENABLED)
+        );
+    }
+
+    /**
+     * Test for getting asset id by disabled status of a product
+     *
+     * @magentoDataFixture Magento/MediaGallery/_files/media_asset.php
+     * @magentoDataFixture Magento/MediaContentCatalog/_files/product_with_asset.php
+     */
+    public function testProductStatusDisabled(): void
+    {
+        $this->assertEquals(
+            [],
+            $this->getAssetIdByContentField->execute(self::STATUS_FIELD, self::STATUS_DISABLED)
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdByContentFieldTest.php b/dev/tests/integration/testsuite/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdByContentFieldTest.php
new file mode 100644
index 0000000000000..33eb4f2dcff41
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdByContentFieldTest.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ *
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentCms\Model\ResourceModel;
+
+use Magento\MediaContentApi\Api\GetAssetIdByContentFieldInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for GetAssetIdByContentFieldTest
+ */
+class GetAssetIdByContentFieldTest extends TestCase
+{
+    private const STORE_FIELD = 'store_id';
+    private const STATUS_FIELD = 'content_status';
+    private const STATUS_ENABLED = '1';
+    private const STATUS_DISABLED = '0';
+
+    /**
+     * @var GetAssetIdByContentFieldInterface
+     */
+    private $getAssetIdByContentField;
+
+    /**
+     * @var int
+     */
+    private $storeId;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->storeId = $objectManager->get(StoreManagerInterface::class)->getStore()->getId();
+        $this->getAssetIdByContentField = $objectManager->get(GetAssetIdByContentFieldInterface::class);
+    }
+
+    /**
+     * Test for getting asset id by store view of a block
+     *
+     * @magentoDataFixture Magento/MediaGallery/_files/media_asset.php
+     * @magentoDataFixture Magento/MediaContentCms/_files/block_with_asset.php
+     */
+    public function testBlockStoreView(): void
+    {
+        $this->assertEquals(
+            [2020],
+            $this->getAssetIdByContentField->execute(self::STORE_FIELD, (string)$this->storeId)
+        );
+    }
+
+    /**
+     * Test for getting asset id by enabled status of a page
+     *
+     * @magentoDataFixture Magento/MediaGallery/_files/media_asset.php
+     * @magentoDataFixture Magento/MediaContentCms/_files/page_with_asset.php
+     */
+    public function testPageStatusEnabled(): void
+    {
+        $this->assertEquals(
+            [2020],
+            $this->getAssetIdByContentField->execute(self::STATUS_FIELD, self::STATUS_ENABLED)
+        );
+    }
+
+    /**
+     * Test for getting asset id by disabled status of a page
+     *
+     * @magentoDataFixture Magento/MediaGallery/_files/media_asset.php
+     * @magentoDataFixture Magento/MediaContentCms/_files/page_with_asset.php
+     */
+    public function testPageStatusDisabled(): void
+    {
+        $this->assertEquals(
+            [],
+            $this->getAssetIdByContentField->execute(self::STATUS_FIELD, self::STATUS_DISABLED)
+        );
+    }
+}

From 1831d4b80363ca2d2c6cee9ce2f385203df32145 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <viktor.sevch@transoftgroup.com>
Date: Fri, 10 Jul 2020 18:00:51 +0300
Subject: [PATCH 0810/1718] MC-35765: [2.4.0-beta1] Full Tax Details causes the
 Order Page to fail

---
 .../Sales/view/adminhtml/templates/order/totals/tax.phtml    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
index 4f1b18f3fcda8..484e11389403a 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
@@ -86,8 +86,9 @@ $taxHelper = $block->getData('taxHelper');
             $amount     = $info['tax_amount'];
             $baseAmount = $info['base_tax_amount'];
             $isFirst    = 1;
+            $infoTitle = preg_replace('/[^A-Za-z0-9\-]/', '', $info['title']);
             ?>
-            <tr id="info-<?= /* @noEscape */ $info->getCode() ?>"
+            <tr id="info-<?= /* @noEscape */ $infoTitle ?>"
                 class="summary-details<?= ($isTop ? ' summary-details-first' : '') ?>">
                 <?php if ($info['percent'] !== null): ?>
                     <td class="admin__total-mark">
@@ -98,7 +99,7 @@ $taxHelper = $block->getData('taxHelper');
                 <?php endif; ?>
                     <td><?= /* @noEscape */ $block->displayAmount($amount, $baseAmount) ?></td>
             </tr>
-            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display:none;", 'tr#info-' . $info->getCode()) ?>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display:none;", 'tr#info-' . $infoTitle) ?>
             <?php
             $isFirst = 0;
             $isTop = 0;

From 64acc51a3e48cb436f810b84584cdc72f823081b Mon Sep 17 00:00:00 2001
From: Viktor Sevch <viktor.sevch@transoftgroup.com>
Date: Fri, 10 Jul 2020 18:23:56 +0300
Subject: [PATCH 0811/1718] MC-35765: [2.4.0-beta1] Full Tax Details causes the
 Order Page to fail

---
 .../Sales/view/adminhtml/templates/order/totals/tax.phtml       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
index 484e11389403a..b13e531764679 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
@@ -86,7 +86,7 @@ $taxHelper = $block->getData('taxHelper');
             $amount     = $info['tax_amount'];
             $baseAmount = $info['base_tax_amount'];
             $isFirst    = 1;
-            $infoTitle = preg_replace('/[^A-Za-z0-9\-]/', '', $info['title']);
+            $infoTitle = sha1($info['title']);
             ?>
             <tr id="info-<?= /* @noEscape */ $infoTitle ?>"
                 class="summary-details<?= ($isTop ? ' summary-details-first' : '') ?>">

From 4e4eb6b210cd4fa42d1218e1c8ca4ed4ef2e4697 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <viktor.sevch@transoftgroup.com>
Date: Fri, 10 Jul 2020 20:00:12 +0300
Subject: [PATCH 0812/1718] MC-35765: [2.4.0-beta1] Full Tax Details causes the
 Order Page to fail

---
 .../Magento/Sales/Block/Adminhtml/Order/Totals/Tax.php    | 8 +++++++-
 .../Sales/view/adminhtml/templates/order/totals/tax.phtml | 4 +++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Tax.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Tax.php
index f145ef3625054..e923b006a0ac6 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Tax.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Totals/Tax.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Order\Totals;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Math\Random;
+
 /**
  * Adminhtml order tax totals block
  *
@@ -50,6 +53,7 @@ class Tax extends \Magento\Tax\Block\Sales\Order\Tax
      * @param \Magento\Tax\Model\Sales\Order\TaxFactory $taxOrderFactory
      * @param \Magento\Sales\Helper\Admin $salesAdminHelper
      * @param array $data
+     * @param Random $randomHelper
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -58,13 +62,15 @@ public function __construct(
         \Magento\Tax\Model\Calculation $taxCalculation,
         \Magento\Tax\Model\Sales\Order\TaxFactory $taxOrderFactory,
         \Magento\Sales\Helper\Admin $salesAdminHelper,
-        array $data = []
+        array $data = [],
+        ?Random $randomHelper = null
     ) {
         $this->_taxHelper = $taxHelper;
         $this->_taxCalculation = $taxCalculation;
         $this->_taxOrderFactory = $taxOrderFactory;
         $this->_salesAdminHelper = $salesAdminHelper;
         $data['taxHelper'] = $this->_taxHelper;
+        $data['randomHelper'] = $randomHelper ?? ObjectManager::getInstance()->get(Random::class);
         parent::__construct($context, $taxConfig, $data);
     }
 
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
index b13e531764679..7475f6d7bbe25 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
@@ -16,6 +16,8 @@ $_fullInfo  = $block->getFullTaxInfo();
 
 /** @var \Magento\Tax\Helper\Data $taxHelper */
 $taxHelper = $block->getData('taxHelper');
+/** @var \Magento\Framework\Math\Random $randomHelper */
+$randomHelper = $block->getData('randomHelper');
 ?>
 
 <?php if ($block->displayFullSummary() && $_fullInfo): ?>
@@ -86,7 +88,7 @@ $taxHelper = $block->getData('taxHelper');
             $amount     = $info['tax_amount'];
             $baseAmount = $info['base_tax_amount'];
             $isFirst    = 1;
-            $infoTitle = sha1($info['title']);
+            $infoTitle = $randomHelper->getRandomString(20);
             ?>
             <tr id="info-<?= /* @noEscape */ $infoTitle ?>"
                 class="summary-details<?= ($isTop ? ' summary-details-first' : '') ?>">

From 94afe443259892b5203178fe5930de7cf816464f Mon Sep 17 00:00:00 2001
From: Viktor Sevch <viktor.sevch@transoftgroup.com>
Date: Fri, 10 Jul 2020 20:02:16 +0300
Subject: [PATCH 0813/1718] MC-35765: [2.4.0-beta1] Full Tax Details causes the
 Order Page to fail

---
 .../Sales/view/adminhtml/templates/order/totals/tax.phtml   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
index 7475f6d7bbe25..0ae7f71145dcc 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
@@ -88,9 +88,9 @@ $randomHelper = $block->getData('randomHelper');
             $amount     = $info['tax_amount'];
             $baseAmount = $info['base_tax_amount'];
             $isFirst    = 1;
-            $infoTitle = $randomHelper->getRandomString(20);
+            $infoId = $randomHelper->getRandomString(20);
             ?>
-            <tr id="info-<?= /* @noEscape */ $infoTitle ?>"
+            <tr id="info-<?= /* @noEscape */ $infoId ?>"
                 class="summary-details<?= ($isTop ? ' summary-details-first' : '') ?>">
                 <?php if ($info['percent'] !== null): ?>
                     <td class="admin__total-mark">
@@ -101,7 +101,7 @@ $randomHelper = $block->getData('randomHelper');
                 <?php endif; ?>
                     <td><?= /* @noEscape */ $block->displayAmount($amount, $baseAmount) ?></td>
             </tr>
-            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display:none;", 'tr#info-' . $infoTitle) ?>
+            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display:none;", 'tr#info-' . $infoId) ?>
             <?php
             $isFirst = 0;
             $isTop = 0;

From b26a48ce4322dcc4503803fbf6418298ac20c530 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Fri, 10 Jul 2020 13:07:52 -0500
Subject: [PATCH 0814/1718] MC-32014: Remove google-shopping-ads module from
 core in 2.4.1

---
 .../Framework/DB/Adapter/AdapterInterface.php |   8 --
 .../Framework/DB/Adapter/Pdo/Mysql.php        |  13 ---
 .../Setup/Console/Command/UpgradeCommand.php  | 103 ++++++++++++------
 3 files changed, 72 insertions(+), 52 deletions(-)

diff --git a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
index 3a7fc59a005e7..f5064c892a7b2 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
@@ -1127,14 +1127,6 @@ public function dropTrigger($triggerName, $schemaName = null);
      */
     public function getTables($likeCondition = null);
 
-    /**
-     * Retrieve triggers list
-     *
-     * @param null|string $likeCondition
-     * @return array
-     */
-    public function getTriggers($likeCondition = null);
-
     /**
      * Generates case SQL fragment
      *
diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
index 51c639e4f7476..7db91c06d9649 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -4038,19 +4038,6 @@ public function getTables($likeCondition = null)
         return $tables;
     }
 
-    /**
-     * Retrieve triggers list
-     *
-     * @param null|string $likeCondition
-     * @return array
-     */
-    public function getTriggers($likeCondition = null)
-    {
-        $sql = ($likeCondition === null) ? 'SHOW TRIGGERS' : sprintf("SHOW TRIGGERS LIKE '%s'", $likeCondition);
-        $result = $this->query($sql);
-        return $result->fetchAll();
-    }
-
     /**
      * Returns auto increment field if exists
      *
diff --git a/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php b/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
index ad183cfc72f39..8e6879454db27 100644
--- a/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
@@ -10,9 +10,13 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\App\State as AppState;
-use Magento\Framework\DB\Ddl\Trigger;
+use Magento\Framework\Console\Cli;
+use Magento\Framework\Exception\RuntimeException;
 use Magento\Framework\Mview\View\CollectionFactory as ViewCollectionFactory;
 use Magento\Framework\Mview\View\StateInterface;
+use Magento\Framework\Mview\View\SubscriptionFactory;
+use Magento\Framework\Mview\View\SubscriptionInterface;
+use Magento\Framework\Mview\ViewInterface;
 use Magento\Framework\Setup\ConsoleLogger;
 use Magento\Framework\Setup\Declaration\Schema\DryRunLogger;
 use Magento\Framework\Setup\Declaration\Schema\OperationsExecutor;
@@ -56,30 +60,48 @@ class UpgradeCommand extends AbstractSetupCommand
      */
     private $searchConfigFactory;
 
-    /*
+    /**
      * @var ViewCollectionFactory
      */
     private $viewCollectionFactory;
 
+    /**
+     * @var SubscriptionFactory
+     */
+    private $subscriptionFactory;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resource;
+
     /**
      * @param InstallerFactory $installerFactory
      * @param SearchConfigFactory $searchConfigFactory
      * @param DeploymentConfig $deploymentConfig
      * @param AppState|null $appState
      * @param ViewCollectionFactory|null $viewCollectionFactory
+     * @param SubscriptionFactory|null $subscriptionFactory
+     * @param ResourceConnection|null $resource
      */
     public function __construct(
         InstallerFactory $installerFactory,
         SearchConfigFactory $searchConfigFactory,
         DeploymentConfig $deploymentConfig = null,
         AppState $appState = null,
-        ViewCollectionFactory $viewCollectionFactory = null
+        ViewCollectionFactory $viewCollectionFactory = null,
+        SubscriptionFactory $subscriptionFactory = null,
+        ResourceConnection $resource = null
     ) {
         $this->installerFactory = $installerFactory;
         $this->searchConfigFactory = $searchConfigFactory;
         $this->deploymentConfig = $deploymentConfig ?: ObjectManager::getInstance()->get(DeploymentConfig::class);
         $this->appState = $appState ?: ObjectManager::getInstance()->get(AppState::class);
-        $this->viewCollectionFactory = $viewCollectionFactory ?: ObjectManager::getInstance()->get(ViewCollectionFactory::class);
+        $this->viewCollectionFactory = $viewCollectionFactory
+            ?: ObjectManager::getInstance()->get(ViewCollectionFactory::class);
+        $this->subscriptionFactory = $subscriptionFactory
+            ?: ObjectManager::getInstance()->get(SubscriptionFactory::class);
+        $this->resource = $resource ?: ObjectManager::getInstance()->get(ResourceConnection::class);
         parent::__construct();
     }
 
@@ -142,9 +164,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $installer->updateModulesSequence($keepGenerated);
             $searchConfig = $this->searchConfigFactory->create();
             $searchConfig->validateSearchEngine();
-
             $this->removeUnusedTriggers();
-
             $installer->installSchema($request);
             $installer->installDataFixtures($request);
 
@@ -153,8 +173,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $arrayInput = new ArrayInput([]);
                 $arrayInput->setInteractive($input->isInteractive());
                 $result = $importConfigCommand->run($arrayInput, $output);
-                if ($result === \Magento\Framework\Console\Cli::RETURN_FAILURE) {
-                    throw new \Magento\Framework\Exception\RuntimeException(
+                if ($result === Cli::RETURN_FAILURE) {
+                    throw new RuntimeException(
                         __('%1 failed. See previous output.', ConfigImportCommand::COMMAND_NAME)
                     );
                 }
@@ -167,10 +187,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
         } catch (\Exception $e) {
             $output->writeln('<error>' . $e->getMessage() . '</error>');
-            return \Magento\Framework\Console\Cli::RETURN_FAILURE;
+            return Cli::RETURN_FAILURE;
         }
 
-        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
+        return Cli::RETURN_SUCCESS;
     }
 
     /**
@@ -178,38 +198,59 @@ protected function execute(InputInterface $input, OutputInterface $output)
      */
     private function removeUnusedTriggers()
     {
-        // unsubscribe mview
         $viewCollection = $this->viewCollectionFactory->create();
         $viewList = $viewCollection->getViewsByStateMode(StateInterface::MODE_ENABLED);
+
+        // Unsubscribe mviews
         foreach ($viewList as $view) {
-            /** @var \Magento\Framework\Mview\ViewInterface $view */
+            /** @var ViewInterface $view */
             $view->unsubscribe();
         }
 
-        // remove extra triggers that have correct naming structure
-        /** @var ResourceConnection $resource */
-        $resource = ObjectManager::getInstance()->get(ResourceConnection::class);
-        $connection = $resource->getConnection();
-        $triggers = $connection->getTriggers();
+        // Remove extra triggers that have correct naming structure
+        $triggers = $this->getTriggers();
         foreach ($triggers as $trigger) {
-            $triggerNames = [];
-            foreach (Trigger::getListOfEvents() as $event) {
-                $triggerName = $resource->getTriggerName(
-                    $resource->getTableName($trigger['Table']),
-                    Trigger::TIME_AFTER,
-                    $event
-                );
-                $triggerNames[] = strtolower($triggerName);
-            }
-            if (in_array($trigger['Trigger'], $triggerNames)) {
-                $connection->dropTrigger($trigger['Trigger']);
-            }
+            $this->initSubscriptionInstance($trigger['Table'])->remove();
         }
 
-        // subscribe mview
+        // Subscribe mviews
         foreach ($viewList as $view) {
-            /** @var \Magento\Framework\Mview\ViewInterface $view */
+            /** @var ViewInterface $view */
             $view->subscribe();
         }
     }
+
+    /**
+     * Retrieve triggers list
+     *
+     * @return array
+     */
+    private function getTriggers(): array
+    {
+        $connection = $this->resource->getConnection();
+        $result = $connection->query('SHOW TRIGGERS');
+        return $result->fetchAll();
+    }
+
+    /**
+     * Initializes subscription instance
+     *
+     * @param string $tablename
+     * @return SubscriptionInterface
+     */
+    private function initSubscriptionInstance(string $tablename): SubscriptionInterface
+    {
+        /** @var ViewInterface $view */
+        $view = ObjectManager::getInstance()->create(ViewInterface::class);
+        $view->setId('0');
+
+        return $this->subscriptionFactory->create(
+            [
+                'view' => $view,
+                'tableName' => $tablename,
+                'columnName' => '',
+                'subscriptionModel' => SubscriptionFactory::INSTANCE_NAME,
+            ]
+        );
+    }
 }

From 45bd9f6aa23b19289e5689d5fcbbe86a7d12d9e9 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Fri, 10 Jul 2020 15:32:57 -0500
Subject: [PATCH 0815/1718] MC-32014: Remove google-shopping-ads module from
 core in 2.4.1

---
 lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
index f5064c892a7b2..f654fd263f605 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
@@ -36,7 +36,7 @@ interface AdapterInterface
     const INSERT_ON_DUPLICATE = 1;
 
     const INSERT_IGNORE = 2;
-
+    
     /** Strategy for updating data in table. See https://dev.mysql.com/doc/refman/5.7/en/replace.html */
     const REPLACE = 4;
 

From feb01e40c1d28f38412145dd70e547ffdfaa951c Mon Sep 17 00:00:00 2001
From: Grimlink <sean.grimlink@gmail.com>
Date: Fri, 10 Jul 2020 22:33:11 +0200
Subject: [PATCH 0816/1718] FIX: blocky moving inside magnifier

---
 lib/web/magnifier/magnifier.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/web/magnifier/magnifier.js b/lib/web/magnifier/magnifier.js
index 06e41377ae33f..155b946b68467 100644
--- a/lib/web/magnifier/magnifier.js
+++ b/lib/web/magnifier/magnifier.js
@@ -577,8 +577,10 @@
                 isOverThumb = inBounds;
             }
 
-            if (inBounds && isOverThumb && gMode === 'outside') {
-                $magnifierPreview.removeClass(MagnifyCls.magnifyHidden);
+            if (inBounds && isOverThumb) {
+                if (gMode === 'outside') {
+                    $magnifierPreview.removeClass(MagnifyCls.magnifyHidden);
+                }
                 move();
             }
         }

From 4c5086aeae6fe08f63302e9d004429c35d9e933e Mon Sep 17 00:00:00 2001
From: Marjan Petkovski <petkovski.marjan@gmail.com>
Date: Sat, 11 Jul 2020 17:01:26 +0200
Subject: [PATCH 0817/1718] magento/magento2#26121: special price & tier price
 are coming in base currency

Refactor to pass new optional parameter to @api class constructor
---
 .../Model/Product/Price/TierPriceBuilder.php  | 134 ++++++++++++++++++
 .../Catalog/Model/Product/Type/Price.php      |  60 ++------
 .../Catalog/Pricing/Price/TierPrice.php       |   8 +-
 .../Model/Resolver/Product/Price/Tiers.php    |  24 ++--
 .../Pricing/Price/TierPrice.php               |  47 ------
 .../Model/Resolver/Product/SpecialPrice.php   |   3 +-
 6 files changed, 168 insertions(+), 108 deletions(-)
 create mode 100644 app/code/Magento/Catalog/Model/Product/Price/TierPriceBuilder.php
 delete mode 100644 app/code/Magento/CatalogCustomerGraphQl/Pricing/Price/TierPrice.php

diff --git a/app/code/Magento/Catalog/Model/Product/Price/TierPriceBuilder.php b/app/code/Magento/Catalog/Model/Product/Price/TierPriceBuilder.php
new file mode 100644
index 0000000000000..52a1d644d7954
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Product/Price/TierPriceBuilder.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product\Price;
+
+use Magento\Catalog\Api\Data\ProductTierPriceInterface;
+use Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory;
+use Magento\Catalog\Api\Data\ProductTierPriceExtensionFactory;
+use Magento\Catalog\Model\Product\Price\Validation\TierPriceValidator;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Builds ProductTierPriceInterface objects
+ */
+class TierPriceBuilder
+{
+    /**
+     * @var int
+     */
+    private $websiteId = 0;
+
+    /**
+     * @var ProductTierPriceInterfaceFactory
+     */
+    protected $tierPriceFactory;
+
+    /**
+     * @var ProductTierPriceExtensionFactory
+     */
+    private $tierPriceExtensionFactory;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @param ProductTierPriceInterfaceFactory $tierPriceFactory
+     * @param ProductTierPriceExtensionFactory $tierPriceExtensionFactory
+     * @param ScopeConfigInterface $config
+     * @param StoreManagerInterface $storeManager
+     */
+    public function __construct(
+        ProductTierPriceInterfaceFactory $tierPriceFactory,
+        ProductTierPriceExtensionFactory $tierPriceExtensionFactory,
+        ScopeConfigInterface $config,
+        StoreManagerInterface $storeManager
+    ) {
+        $this->tierPriceFactory = $tierPriceFactory;
+        $this->tierPriceExtensionFactory = $tierPriceExtensionFactory;
+        $this->config = $config;
+        $this->storeManager = $storeManager;
+    }
+
+    /**
+     * Transform the raw tier prices of the product into array of ProductTierPriceInterface objects
+     *
+     * @param array $tierPricesRaw
+     * @return ProductTierPriceInterface[]
+     */
+    public function buildTierPriceObjects(array $tierPricesRaw): array
+    {
+        $prices = [];
+
+        foreach ($tierPricesRaw as $tierPriceRaw) {
+            $prices[] = $this->createTierPriceObjectFromRawData($tierPriceRaw);
+        }
+
+        return $prices;
+    }
+
+    /**
+     * Transform the raw tier price data into ProductTierPriceInterface object
+     *
+     * @param array $tierPriceRaw
+     * @return ProductTierPriceInterface
+     */
+    private function createTierPriceObjectFromRawData(array $tierPriceRaw): ProductTierPriceInterface
+    {
+        //Find and set the website id that would be used as a fallback if the raw data does not bear it itself
+        $this->setWebsiteForPriceScope();
+
+        /** @var ProductTierPriceInterface $tierPrice */
+        $tierPrice = $this->tierPriceFactory->create()
+            ->setExtensionAttributes($this->tierPriceExtensionFactory->create());
+
+        $tierPrice->setCustomerGroupId(
+            isset($tierPriceRaw['cust_group']) ? $tierPriceRaw['cust_group'] : ''
+        );
+        $tierPrice->setValue(
+            isset($tierPriceRaw['website_price']) ? $tierPriceRaw['website_price'] : $tierPriceRaw['price']
+        );
+        $tierPrice->setQty(
+            isset($tierPriceRaw['price_qty']) ? $tierPriceRaw['price_qty'] : ''
+        );
+        $tierPrice->getExtensionAttributes()->setWebsiteId(
+            isset($tierPriceRaw['website_id']) ? (int)$tierPriceRaw['website_id'] : $this->websiteId
+        );
+        if (isset($tierPriceRaw['percentage_value'])) {
+            $tierPrice->getExtensionAttributes()->setPercentageValue($tierPriceRaw['percentage_value']);
+        }
+
+        return $tierPrice;
+    }
+
+    /**
+     * Find and set the website id, based on the catalog price scope setting
+     */
+    private function setWebsiteForPriceScope()
+    {
+        if ($this->websiteId != 0) {
+            return;
+        }
+
+        $websiteId = 0;
+        $value = $this->config->getValue('catalog/price/scope', ScopeInterface::SCOPE_WEBSITE);
+        if ($value != 0) {
+            $websiteId = $this->storeManager->getWebsite()->getId();
+        }
+
+        $this->websiteId = (int)$websiteId;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/Product/Type/Price.php b/app/code/Magento/Catalog/Model/Product/Type/Price.php
index 40b98e55ebedc..bfbc5e6d2a306 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/Price.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/Price.php
@@ -8,6 +8,7 @@
 namespace Magento\Catalog\Model\Product\Type;
 
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Price\TierPriceBuilder;
 use Magento\Customer\Api\GroupManagementInterface;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Store\Model\Store;
@@ -93,6 +94,11 @@ class Price
      */
     private $tierPriceExtensionFactory;
 
+    /**
+     * @var TierPriceBuilder
+     */
+    private $tierPriceBuilder;
+
     /**
      * Constructor
      *
@@ -103,9 +109,10 @@ class Price
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param PriceCurrencyInterface $priceCurrency
      * @param GroupManagementInterface $groupManagement
-     * @param \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory $tierPriceFactory
+     * @param \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory $tierPriceFactory  @deprecated obsolete dependency
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
-     * @param ProductTierPriceExtensionFactory|null $tierPriceExtensionFactory
+     * @param ProductTierPriceExtensionFactory|null $tierPriceExtensionFactory  @deprecated obsolete dependency
+     * @param TierPriceBuilder $tierPriceBuilder
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -118,7 +125,8 @@ public function __construct(
         GroupManagementInterface $groupManagement,
         \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory $tierPriceFactory,
         \Magento\Framework\App\Config\ScopeConfigInterface $config,
-        ProductTierPriceExtensionFactory $tierPriceExtensionFactory = null
+        ProductTierPriceExtensionFactory $tierPriceExtensionFactory = null,
+        ?TierPriceBuilder $tierPriceBuilder = null
     ) {
         $this->_ruleFactory = $ruleFactory;
         $this->_storeManager = $storeManager;
@@ -131,6 +139,8 @@ public function __construct(
         $this->config = $config;
         $this->tierPriceExtensionFactory = $tierPriceExtensionFactory ?: ObjectManager::getInstance()
             ->get(ProductTierPriceExtensionFactory::class);
+        $this->tierPriceBuilder = $tierPriceBuilder ?: ObjectManager::getInstance()
+            ->get(TierPriceBuilder::class);
     }
 
     /**
@@ -371,49 +381,7 @@ public function getTierPrices($product)
     {
         $tierPricesRaw = $this->getExistingPrices($product, 'tier_price');
 
-        return $this->buildProductTierPriceInterfaceObjects($tierPricesRaw);
-    }
-
-    /**
-     * Return ProductTierPriceInterface[] given raw tier prices array
-     *
-     * @param array $tierPricesRaw
-     * @return \Magento\Catalog\Api\Data\ProductTierPriceInterface[]
-     */
-    public function transformTierPrices($tierPricesRaw)
-    {
-        return $this->buildProductTierPriceInterfaceObjects($tierPricesRaw);
-    }
-
-    /**
-     * Return ProductTierPriceInterface[] given raw tier prices array
-     *
-     * @param array $tierPricesRaw
-     * @return \Magento\Catalog\Api\Data\ProductTierPriceInterface[]
-     */
-    private function buildProductTierPriceInterfaceObjects($tierPricesRaw)
-    {
-        $prices = [];
-        foreach ($tierPricesRaw as $price) {
-            /** @var \Magento\Catalog\Api\Data\ProductTierPriceInterface $tierPrice */
-            $tierPrice = $this->tierPriceFactory->create()
-                ->setExtensionAttributes($this->tierPriceExtensionFactory->create());
-            $tierPrice->setCustomerGroupId($price['cust_group']);
-            if (array_key_exists('website_price', $price)) {
-                $value = $price['website_price'];
-            } else {
-                $value = $price['price'];
-            }
-            $tierPrice->setValue($value);
-            $tierPrice->setQty($price['price_qty']);
-            if (isset($price['percentage_value'])) {
-                $tierPrice->getExtensionAttributes()->setPercentageValue($price['percentage_value']);
-            }
-            $websiteId = isset($price['website_id']) ? $price['website_id'] : $this->getWebsiteForPriceScope();
-            $tierPrice->getExtensionAttributes()->setWebsiteId($websiteId);
-            $prices[] = $tierPrice;
-        }
-        return $prices;
+        return $this->tierPriceBuilder->buildTierPriceObjects($tierPricesRaw);
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Pricing/Price/TierPrice.php b/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
index f250927889c29..422d719a20697 100644
--- a/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
+++ b/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
@@ -70,6 +70,7 @@ class TierPrice extends AbstractPrice implements TierPriceInterface, BasePricePr
      * @param Session $customerSession
      * @param GroupManagementInterface $groupManagement
      * @param CustomerGroupRetrieverInterface|null $customerGroupRetriever
+     * @param int|null $customerGroup
      */
     public function __construct(
         Product $saleableItem,
@@ -78,7 +79,8 @@ public function __construct(
         \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
         Session $customerSession,
         GroupManagementInterface $groupManagement,
-        CustomerGroupRetrieverInterface $customerGroupRetriever = null
+        CustomerGroupRetrieverInterface $customerGroupRetriever = null,
+        $customerGroup = null
     ) {
         $quantity = (float)$quantity ? $quantity : 1;
         parent::__construct($saleableItem, $quantity, $calculator, $priceCurrency);
@@ -86,7 +88,9 @@ public function __construct(
         $this->groupManagement = $groupManagement;
         $this->customerGroupRetriever = $customerGroupRetriever
             ?? \Magento\Framework\App\ObjectManager::getInstance()->get(CustomerGroupRetrieverInterface::class);
-        if ($saleableItem->hasCustomerGroupId()) {
+        if ($customerGroup) {
+            $this->customerGroup = $customerGroup;
+        } elseif ($saleableItem->hasCustomerGroupId()) {
             $this->customerGroup = (int) $saleableItem->getCustomerGroupId();
         } else {
             $this->customerGroup = (int) $this->customerGroupRetriever->getCustomerGroupId();
diff --git a/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/Product/Price/Tiers.php b/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/Product/Price/Tiers.php
index 436fc0c04ca7e..f484dbbdda0d3 100644
--- a/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/Product/Price/Tiers.php
+++ b/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/Product/Price/Tiers.php
@@ -13,8 +13,8 @@
 use Magento\Customer\Model\GroupManagement;
 use Magento\Catalog\Api\Data\ProductTierPriceInterface;
 use Magento\CatalogGraphQl\Model\Resolver\Product\Price\ProviderPool as PriceProviderPool;
-use Magento\Catalog\Model\Product\Type\Price;
-use Magento\CatalogCustomerGraphQl\Pricing\Price\TierPriceFactory;
+use Magento\Catalog\Pricing\Price\TierPriceFactory;
+use Magento\Catalog\Model\Product\Price\TierPriceBuilder;
 
 /**
  * Get product tier price information
@@ -57,37 +57,37 @@ class Tiers
     private $products = [];
 
     /**
-     * @var Price
+     * @var TierPriceFactory
      */
-    private $price;
+    private $tierPriceFactory;
 
     /**
-     * @var TierPriceFactory
+     * @var TierPriceBuilder
      */
-    private $tierPriceFactory;
+    private $tierPriceBuilder;
 
     /**
      * @param CollectionFactory $collectionFactory
      * @param ProductResource $productResource
      * @param PriceProviderPool $priceProviderPool
      * @param int $customerGroupId
-     * @param Price $price
      * @param TierPriceFactory $tierPriceFactory
+     * @param TierPriceBuilder $tierPriceBuilder
      */
     public function __construct(
         CollectionFactory $collectionFactory,
         ProductResource $productResource,
         PriceProviderPool $priceProviderPool,
         $customerGroupId,
-        Price $price,
-        TierPriceFactory $tierPriceFactory
+        TierPriceFactory $tierPriceFactory,
+        TierPriceBuilder $tierPriceBuilder
     ) {
         $this->collectionFactory = $collectionFactory;
         $this->productResource = $productResource;
         $this->priceProviderPool = $priceProviderPool;
         $this->customerGroupId = $customerGroupId;
-        $this->price = $price;
         $this->tierPriceFactory = $tierPriceFactory;
+        $this->tierPriceBuilder = $tierPriceBuilder;
     }
 
     /**
@@ -121,7 +121,7 @@ public function getProductTierPrices($productId): ?array
             [
                 'saleableItem' => $this->products[$productId],
                 'quantity' => 1,
-                'customerGroupId' => $this->customerGroupId
+                'customerGroup' => $this->customerGroupId
             ]
         );
 
@@ -129,7 +129,7 @@ public function getProductTierPrices($productId): ?array
         $tierPricesRaw = $tierPrice->getTierPriceList();
 
         /** @var ProductTierPriceInterface[] $tierPrices */
-        $tierPrices = $this->price->transformTierPrices($tierPricesRaw);
+        $tierPrices = $this->tierPriceBuilder->buildTierPriceObjects($tierPricesRaw);
 
         return $tierPrices;
     }
diff --git a/app/code/Magento/CatalogCustomerGraphQl/Pricing/Price/TierPrice.php b/app/code/Magento/CatalogCustomerGraphQl/Pricing/Price/TierPrice.php
deleted file mode 100644
index 5cb63dcb11e33..0000000000000
--- a/app/code/Magento/CatalogCustomerGraphQl/Pricing/Price/TierPrice.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\CatalogCustomerGraphQl\Pricing\Price;
-
-use Magento\Catalog\Model\Product;
-use Magento\Customer\Api\GroupManagementInterface;
-use Magento\Framework\Pricing\Adjustment\CalculatorInterface;
-use Magento\Framework\Pricing\PriceCurrencyInterface;
-use Magento\Framework\App\ObjectManager;
-
-class TierPrice extends \Magento\Catalog\Pricing\Price\TierPrice
-{
-    /**
-     * TierPrice constructor.
-     * @param Product $saleableItem
-     * @param float $quantity
-     * @param CalculatorInterface $calculator
-     * @param PriceCurrencyInterface $priceCurrency
-     * @param GroupManagementInterface $groupManagement
-     * @param int $customerGroupId
-     */
-    public function __construct(
-        Product $saleableItem,
-        $quantity,
-        CalculatorInterface $calculator,
-        PriceCurrencyInterface $priceCurrency,
-        GroupManagementInterface $groupManagement,
-        $customerGroupId
-    ) {
-        parent::__construct(
-            $saleableItem,
-            $quantity,
-            $calculator,
-            $priceCurrency,
-            ObjectManager::getInstance()->get(\Magento\Customer\Model\Session::class),
-            $groupManagement
-        );
-
-        $this->customerGroup = $customerGroupId;
-    }
-}
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/SpecialPrice.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/SpecialPrice.php
index e85365a16bd50..1b42b0fde2bcb 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/SpecialPrice.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/SpecialPrice.php
@@ -10,6 +10,7 @@
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Pricing\Price\SpecialPrice as PricingSpecialPrice;
 
 /**
@@ -22,7 +23,7 @@ class SpecialPrice implements ResolverInterface
      */
     public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
     {
-        /** @var \Magento\Catalog\Model\Product $product */
+        /** @var ProductInterface $product */
         $product = $value['model'];
         /** @var PricingSpecialPrice $specialPrice */
         $specialPrice = $product->getPriceInfo()->getPrice(PricingSpecialPrice::PRICE_CODE);

From 9bd5def614faaf40fd86e9064cbe0225b1576501 Mon Sep 17 00:00:00 2001
From: Marjan Petkovski <petkovski.marjan@gmail.com>
Date: Sun, 12 Jul 2020 14:48:07 +0200
Subject: [PATCH 0818/1718] magento/magento2#26121: special price & tier price
 are coming in base currency

Refactor TierPriceBuilder
---
 .../Model/Product/Price/TierPriceBuilder.php  | 109 +++++++++++++++---
 .../Catalog/Model/Product/Type/Price.php      |   8 +-
 .../Model/Resolver/Product/Price/Tiers.php    |  38 +-----
 3 files changed, 97 insertions(+), 58 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Product/Price/TierPriceBuilder.php b/app/code/Magento/Catalog/Model/Product/Price/TierPriceBuilder.php
index 52a1d644d7954..3284263e65032 100644
--- a/app/code/Magento/Catalog/Model/Product/Price/TierPriceBuilder.php
+++ b/app/code/Magento/Catalog/Model/Product/Price/TierPriceBuilder.php
@@ -10,10 +10,12 @@
 use Magento\Catalog\Api\Data\ProductTierPriceInterface;
 use Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory;
 use Magento\Catalog\Api\Data\ProductTierPriceExtensionFactory;
-use Magento\Catalog\Model\Product\Price\Validation\TierPriceValidator;
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
 
 /**
  * Builds ProductTierPriceInterface objects
@@ -23,12 +25,12 @@ class TierPriceBuilder
     /**
      * @var int
      */
-    private $websiteId = 0;
+    private $websiteId;
 
     /**
      * @var ProductTierPriceInterfaceFactory
      */
-    protected $tierPriceFactory;
+    private $tierPriceFactory;
 
     /**
      * @var ProductTierPriceExtensionFactory
@@ -45,31 +47,80 @@ class TierPriceBuilder
      */
     private $storeManager;
 
+    /**
+     * @var PriceCurrencyInterface
+     */
+    private $priceCurrency;
+
     /**
      * @param ProductTierPriceInterfaceFactory $tierPriceFactory
      * @param ProductTierPriceExtensionFactory $tierPriceExtensionFactory
      * @param ScopeConfigInterface $config
      * @param StoreManagerInterface $storeManager
+     * @param PriceCurrencyInterface $priceCurrency
      */
     public function __construct(
         ProductTierPriceInterfaceFactory $tierPriceFactory,
         ProductTierPriceExtensionFactory $tierPriceExtensionFactory,
         ScopeConfigInterface $config,
-        StoreManagerInterface $storeManager
+        StoreManagerInterface $storeManager,
+        PriceCurrencyInterface $priceCurrency
     ) {
         $this->tierPriceFactory = $tierPriceFactory;
         $this->tierPriceExtensionFactory = $tierPriceExtensionFactory;
         $this->config = $config;
         $this->storeManager = $storeManager;
+        $this->priceCurrency = $priceCurrency;
+
+        $this->setWebsiteId();
+    }
+
+    /**
+     * Gets list of product tier prices
+     *
+     * @param ProductInterface $product
+     * @return ProductTierPriceInterface[]
+     */
+    public function getTierPrices($product)
+    {
+        /** @var array $tierPricesRaw */
+        $tierPricesRaw = $this->loadData($product);
+
+        return $this->buildTierPriceObjects($tierPricesRaw);
+    }
+
+    /**
+     * Get tier data for a product
+     *
+     * @param ProductInterface $product
+     * @return array
+     */
+    private function loadData(ProductInterface $product): array
+    {
+        $tierData = $product->getData(ProductAttributeInterface::CODE_TIER_PRICE);
+
+        if ($tierData === null) {
+            $attribute = $product->getResource()->getAttribute(ProductAttributeInterface::CODE_TIER_PRICE);
+            if ($attribute) {
+                $attribute->getBackend()->afterLoad($product);
+                $tierData = $product->getData(ProductAttributeInterface::CODE_TIER_PRICE);
+            }
+        }
+
+        if ($tierData === null || !is_array($tierData)) {
+            return [];
+        }
+
+        return $tierData;
     }
 
     /**
-     * Transform the raw tier prices of the product into array of ProductTierPriceInterface objects
+     * Transform the raw tier data into array of ProductTierPriceInterface objects
      *
      * @param array $tierPricesRaw
      * @return ProductTierPriceInterface[]
      */
-    public function buildTierPriceObjects(array $tierPricesRaw): array
+    private function buildTierPriceObjects(array $tierPricesRaw): array
     {
         $prices = [];
 
@@ -88,9 +139,6 @@ public function buildTierPriceObjects(array $tierPricesRaw): array
      */
     private function createTierPriceObjectFromRawData(array $tierPriceRaw): ProductTierPriceInterface
     {
-        //Find and set the website id that would be used as a fallback if the raw data does not bear it itself
-        $this->setWebsiteForPriceScope();
-
         /** @var ProductTierPriceInterface $tierPrice */
         $tierPrice = $this->tierPriceFactory->create()
             ->setExtensionAttributes($this->tierPriceExtensionFactory->create());
@@ -99,36 +147,63 @@ private function createTierPriceObjectFromRawData(array $tierPriceRaw): ProductT
             isset($tierPriceRaw['cust_group']) ? $tierPriceRaw['cust_group'] : ''
         );
         $tierPrice->setValue(
-            isset($tierPriceRaw['website_price']) ? $tierPriceRaw['website_price'] : $tierPriceRaw['price']
+            $this->getPriceValue($tierPriceRaw)
         );
         $tierPrice->setQty(
             isset($tierPriceRaw['price_qty']) ? $tierPriceRaw['price_qty'] : ''
         );
         $tierPrice->getExtensionAttributes()->setWebsiteId(
-            isset($tierPriceRaw['website_id']) ? (int)$tierPriceRaw['website_id'] : $this->websiteId
+            isset($tierPriceRaw['website_id']) ? $tierPriceRaw['website_id'] : $this->websiteId
         );
         if (isset($tierPriceRaw['percentage_value'])) {
-            $tierPrice->getExtensionAttributes()->setPercentageValue($tierPriceRaw['percentage_value']);
+            $tierPrice->getExtensionAttributes()->setPercentageValue(
+                $tierPriceRaw['percentage_value']
+            );
         }
 
         return $tierPrice;
     }
 
     /**
-     * Find and set the website id, based on the catalog price scope setting
+     * Get price value
+     *
+     * @param array $tierPriceRaw
+     * @return float
      */
-    private function setWebsiteForPriceScope()
+    private function getPriceValue(array $tierPriceRaw): float
     {
-        if ($this->websiteId != 0) {
-            return;
+        $valueInDefaultCurrency = $this->extractPriceValue($tierPriceRaw);
+        $valueInStoreCurrency = $this->priceCurrency->convertAndRound($valueInDefaultCurrency);
+
+        return $valueInStoreCurrency;
+    }
+
+    /**
+     * Extract float price value from raw data
+     *
+     * @param array $tierPriceRaw
+     * @return float
+     */
+    private function extractPriceValue(array $tierPriceRaw): float
+    {
+        if (isset($tierPriceRaw['website_price'])) {
+            return (float)$tierPriceRaw['website_price'];
         }
 
+        return (float)$tierPriceRaw['price'];
+    }
+
+    /**
+     * Find and set the website id
+     */
+    private function setWebsiteId()
+    {
         $websiteId = 0;
         $value = $this->config->getValue('catalog/price/scope', ScopeInterface::SCOPE_WEBSITE);
         if ($value != 0) {
             $websiteId = $this->storeManager->getWebsite()->getId();
         }
 
-        $this->websiteId = (int)$websiteId;
+        $this->websiteId = $websiteId;
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Type/Price.php b/app/code/Magento/Catalog/Model/Product/Type/Price.php
index bfbc5e6d2a306..c07f7c40785e7 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/Price.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/Price.php
@@ -109,9 +109,9 @@ class Price
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param PriceCurrencyInterface $priceCurrency
      * @param GroupManagementInterface $groupManagement
-     * @param \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory $tierPriceFactory  @deprecated obsolete dependency
+     * @param \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory $tierPriceFactory @deprecated
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
-     * @param ProductTierPriceExtensionFactory|null $tierPriceExtensionFactory  @deprecated obsolete dependency
+     * @param ProductTierPriceExtensionFactory|null $tierPriceExtensionFactory @deprecated
      * @param TierPriceBuilder $tierPriceBuilder
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -379,9 +379,7 @@ protected function getAllCustomerGroupsId()
      */
     public function getTierPrices($product)
     {
-        $tierPricesRaw = $this->getExistingPrices($product, 'tier_price');
-
-        return $this->tierPriceBuilder->buildTierPriceObjects($tierPricesRaw);
+        return $this->tierPriceBuilder->getTierPrices($product);
     }
 
     /**
diff --git a/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/Product/Price/Tiers.php b/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/Product/Price/Tiers.php
index f484dbbdda0d3..73a2ba83d5096 100644
--- a/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/Product/Price/Tiers.php
+++ b/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/Product/Price/Tiers.php
@@ -13,8 +13,6 @@
 use Magento\Customer\Model\GroupManagement;
 use Magento\Catalog\Api\Data\ProductTierPriceInterface;
 use Magento\CatalogGraphQl\Model\Resolver\Product\Price\ProviderPool as PriceProviderPool;
-use Magento\Catalog\Pricing\Price\TierPriceFactory;
-use Magento\Catalog\Model\Product\Price\TierPriceBuilder;
 
 /**
  * Get product tier price information
@@ -56,38 +54,22 @@ class Tiers
      */
     private $products = [];
 
-    /**
-     * @var TierPriceFactory
-     */
-    private $tierPriceFactory;
-
-    /**
-     * @var TierPriceBuilder
-     */
-    private $tierPriceBuilder;
-
     /**
      * @param CollectionFactory $collectionFactory
      * @param ProductResource $productResource
      * @param PriceProviderPool $priceProviderPool
      * @param int $customerGroupId
-     * @param TierPriceFactory $tierPriceFactory
-     * @param TierPriceBuilder $tierPriceBuilder
      */
     public function __construct(
         CollectionFactory $collectionFactory,
         ProductResource $productResource,
         PriceProviderPool $priceProviderPool,
-        $customerGroupId,
-        TierPriceFactory $tierPriceFactory,
-        TierPriceBuilder $tierPriceBuilder
+        $customerGroupId
     ) {
         $this->collectionFactory = $collectionFactory;
         $this->productResource = $productResource;
         $this->priceProviderPool = $priceProviderPool;
         $this->customerGroupId = $customerGroupId;
-        $this->tierPriceFactory = $tierPriceFactory;
-        $this->tierPriceBuilder = $tierPriceBuilder;
     }
 
     /**
@@ -115,23 +97,7 @@ public function getProductTierPrices($productId): ?array
         if (empty($this->products[$productId])) {
             return null;
         }
-
-        /** @var TierPrice $tierPrice */
-        $tierPrice = $this->tierPriceFactory->create(
-            [
-                'saleableItem' => $this->products[$productId],
-                'quantity' => 1,
-                'customerGroup' => $this->customerGroupId
-            ]
-        );
-
-        /** @var array $tierPricesRaw */
-        $tierPricesRaw = $tierPrice->getTierPriceList();
-
-        /** @var ProductTierPriceInterface[] $tierPrices */
-        $tierPrices = $this->tierPriceBuilder->buildTierPriceObjects($tierPricesRaw);
-
-        return $tierPrices;
+        return $this->products[$productId]->getTierPrices();
     }
 
     /**

From 7a526e96cf2a506e9634ddad7856c972f605808b Mon Sep 17 00:00:00 2001
From: Marjan Petkovski <petkovski.marjan@gmail.com>
Date: Sun, 12 Jul 2020 14:52:26 +0200
Subject: [PATCH 0819/1718] magento/magento2#26121: special price & tier price
 are coming in base currency

Revert Pricing Price TierPrice
---
 app/code/Magento/Catalog/Pricing/Price/TierPrice.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Catalog/Pricing/Price/TierPrice.php b/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
index 422d719a20697..f250927889c29 100644
--- a/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
+++ b/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
@@ -70,7 +70,6 @@ class TierPrice extends AbstractPrice implements TierPriceInterface, BasePricePr
      * @param Session $customerSession
      * @param GroupManagementInterface $groupManagement
      * @param CustomerGroupRetrieverInterface|null $customerGroupRetriever
-     * @param int|null $customerGroup
      */
     public function __construct(
         Product $saleableItem,
@@ -79,8 +78,7 @@ public function __construct(
         \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
         Session $customerSession,
         GroupManagementInterface $groupManagement,
-        CustomerGroupRetrieverInterface $customerGroupRetriever = null,
-        $customerGroup = null
+        CustomerGroupRetrieverInterface $customerGroupRetriever = null
     ) {
         $quantity = (float)$quantity ? $quantity : 1;
         parent::__construct($saleableItem, $quantity, $calculator, $priceCurrency);
@@ -88,9 +86,7 @@ public function __construct(
         $this->groupManagement = $groupManagement;
         $this->customerGroupRetriever = $customerGroupRetriever
             ?? \Magento\Framework\App\ObjectManager::getInstance()->get(CustomerGroupRetrieverInterface::class);
-        if ($customerGroup) {
-            $this->customerGroup = $customerGroup;
-        } elseif ($saleableItem->hasCustomerGroupId()) {
+        if ($saleableItem->hasCustomerGroupId()) {
             $this->customerGroup = (int) $saleableItem->getCustomerGroupId();
         } else {
             $this->customerGroup = (int) $this->customerGroupRetriever->getCustomerGroupId();

From 5b4498724e20f93caae8a348936e6953e5eb0026 Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Mon, 13 Jul 2020 11:30:28 +0300
Subject: [PATCH 0820/1718] MC-34264: Shipping Method Estimator not working
 with custom address attributes

---
 .../view/frontend/web/js/model/address-converter.js   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js b/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js
index 6e1b031ab48ce..de3e8e18f4e6f 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js
@@ -84,7 +84,8 @@ define([
         quoteAddressToFormAddressData: function (addrs) {
             var self = this,
                 output = {},
-                streetObject;
+                streetObject,
+                customAttributesObject;
 
             $.each(addrs, function (key) {
                 if (addrs.hasOwnProperty(key) && !$.isFunction(addrs[key])) {
@@ -100,6 +101,14 @@ define([
                 output.street = streetObject;
             }
 
+            if ($.isArray(addrs.customAttributes)) {
+                customAttributesObject = {};
+                addrs.customAttributes.forEach(function (value, index) {
+                    customAttributesObject[value.attribute_code] = value.value;
+                });
+                output.custom_attributes = customAttributesObject;
+            }
+
             return output;
         },
 

From 5f82525415fb2cc76ee4dc08e9cc0ce995762ffd Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Mon, 13 Jul 2020 10:44:46 +0100
Subject: [PATCH 0821/1718] Updated names

---
 .../GetAssetIdByContentFieldComposite.php     | 51 -------------------
 app/code/Magento/MediaContent/etc/di.xml      |  2 +-
 ...=> GetAssetIdsByContentFieldInterface.php} |  3 +-
 .../Composite/GetAssetIdsByContentField.php   | 50 ++++++++++++++++++
 ...=> GetAssetIdsByContentFieldInterface.php} |  2 +-
 .../GetAssetIdsByCategoryStore.php}           | 10 ++--
 .../GetAssetIdsByEavContentField.php}         | 21 ++++----
 .../GetAssetIdsByProductStore.php}            |  8 +--
 .../Magento/MediaContentCatalog/etc/di.xml    | 20 ++++----
 .../GetAssetIdsByContentField.php}            |  8 +--
 app/code/Magento/MediaContentCms/etc/di.xml   | 24 ++++-----
 11 files changed, 97 insertions(+), 102 deletions(-)
 delete mode 100644 app/code/Magento/MediaContent/Model/GetAssetIdByContentFieldComposite.php
 rename app/code/Magento/MediaContentApi/Api/{GetAssetIdByContentFieldInterface.php => GetAssetIdsByContentFieldInterface.php} (91%)
 create mode 100644 app/code/Magento/MediaContentApi/Model/Composite/GetAssetIdsByContentField.php
 rename app/code/Magento/MediaContentApi/Model/{GetAssetIdByContentFieldInterface.php => GetAssetIdsByContentFieldInterface.php} (93%)
 rename app/code/Magento/MediaContentCatalog/Model/{GetAssetIdByCategoryStore.php => ResourceModel/GetAssetIdsByCategoryStore.php} (92%)
 rename app/code/Magento/MediaContentCatalog/Model/{GetAssetIdByEavContentField.php => ResourceModel/GetAssetIdsByEavContentField.php} (76%)
 rename app/code/Magento/MediaContentCatalog/Model/{GetAssetIdByProductStore.php => ResourceModel/GetAssetIdsByProductStore.php} (88%)
 rename app/code/Magento/MediaContentCms/Model/{GetAssetIdByContentField.php => ResourceModel/GetAssetIdsByContentField.php} (88%)

diff --git a/app/code/Magento/MediaContent/Model/GetAssetIdByContentFieldComposite.php b/app/code/Magento/MediaContent/Model/GetAssetIdByContentFieldComposite.php
deleted file mode 100644
index 57bf5d6458577..0000000000000
--- a/app/code/Magento/MediaContent/Model/GetAssetIdByContentFieldComposite.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\MediaContent\Model;
-
-use Magento\Framework\Exception\InvalidArgumentException;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\MediaContentApi\Api\GetAssetIdByContentFieldInterface as GetAssetIdByContentFieldApiInterface;
-use Magento\MediaContentApi\Model\GetAssetIdByContentFieldInterface;
-
-/**
- * Class responsible to return Asset ids by content field
- */
-class GetAssetIdByContentFieldComposite implements GetAssetIdByContentFieldApiInterface
-{
-    /**
-     * @var GetAssetIdByContentFieldInterface[]
-     */
-    private $getAssetIdByContentFieldArray;
-
-    /**
-     * GetAssetIdByContentStatusComposite constructor.
-     *
-     * @param array $getAssetIdByContentFieldArray
-     */
-    public function __construct($getAssetIdByContentFieldArray = [])
-    {
-        $this->getAssetIdByContentFieldArray = $getAssetIdByContentFieldArray;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function execute(string $field, string $value): array
-    {
-        if (!array_key_exists($field, $this->getAssetIdByContentFieldArray)) {
-            throw new InvalidArgumentException(__('The field argument is invalid.'));
-        }
-        $ids = [];
-        /** @var GetAssetIdByContentFieldInterface $getAssetIdByContentField */
-        foreach ($this->getAssetIdByContentFieldArray[$field] as $getAssetIdByContentField) {
-            // phpcs:ignore Magento2.Performance.ForeachArrayMerge
-            $ids = array_merge($ids, $getAssetIdByContentField->execute($value));
-        }
-        return array_unique($ids);
-    }
-}
diff --git a/app/code/Magento/MediaContent/etc/di.xml b/app/code/Magento/MediaContent/etc/di.xml
index 4817c262e0bd1..df84ad7bb0f70 100644
--- a/app/code/Magento/MediaContent/etc/di.xml
+++ b/app/code/Magento/MediaContent/etc/di.xml
@@ -16,7 +16,7 @@
     <preference for="Magento\MediaContentApi\Api\Data\ContentIdentityInterface" type="Magento\MediaContent\Model\ContentIdentity"/>
     <preference for="Magento\MediaContentApi\Api\Data\ContentAssetLinkInterface" type="Magento\MediaContent\Model\ContentAssetLink"/>
     <preference for="Magento\MediaContentApi\Model\SearchPatternConfigInterface" type="Magento\MediaContent\Model\Content\SearchPatternConfig"/>
-    <preference for="Magento\MediaContentApi\Api\GetAssetIdByContentFieldInterface" type="Magento\MediaContent\Model\GetAssetIdByContentFieldComposite"/>
+    <preference for="Magento\MediaContentApi\Api\GetAssetIdsByContentFieldInterface" type="Magento\MediaContentApi\Model\Composite\GetAssetIdsByContentField"/>
     <type name="Magento\MediaGalleryApi\Api\DeleteAssetsByPathsInterface">
         <plugin name="remove_media_content_after_asset_is_removed_by_path" type="Magento\MediaContent\Plugin\MediaGalleryAssetDeleteByPath" />
     </type>
diff --git a/app/code/Magento/MediaContentApi/Api/GetAssetIdByContentFieldInterface.php b/app/code/Magento/MediaContentApi/Api/GetAssetIdsByContentFieldInterface.php
similarity index 91%
rename from app/code/Magento/MediaContentApi/Api/GetAssetIdByContentFieldInterface.php
rename to app/code/Magento/MediaContentApi/Api/GetAssetIdsByContentFieldInterface.php
index f66c7ffe4bc05..f2f9ddbf11956 100644
--- a/app/code/Magento/MediaContentApi/Api/GetAssetIdByContentFieldInterface.php
+++ b/app/code/Magento/MediaContentApi/Api/GetAssetIdsByContentFieldInterface.php
@@ -10,10 +10,9 @@
 use Magento\Framework\Exception\InvalidArgumentException;
 
 /**
- * @api
  * Interface used to return Asset id by content field.
  */
-interface GetAssetIdByContentFieldInterface
+interface GetAssetIdsByContentFieldInterface
 {
     /**
      * This function returns asset ids by content field
diff --git a/app/code/Magento/MediaContentApi/Model/Composite/GetAssetIdsByContentField.php b/app/code/Magento/MediaContentApi/Model/Composite/GetAssetIdsByContentField.php
new file mode 100644
index 0000000000000..7130bee56d90a
--- /dev/null
+++ b/app/code/Magento/MediaContentApi/Model/Composite/GetAssetIdsByContentField.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentApi\Model\Composite;
+
+use Magento\Framework\Exception\InvalidArgumentException;
+use Magento\MediaContentApi\Api\GetAssetIdsByContentFieldInterface as GetAssetIdsByContentFieldApiInterface;
+use Magento\MediaContentApi\Model\GetAssetIdsByContentFieldInterface;
+
+/**
+ * Class responsible to return Asset ids by content field
+ */
+class GetAssetIdsByContentField implements GetAssetIdsByContentFieldApiInterface
+{
+    /**
+     * @var GetAssetIdsByContentFieldInterface[]
+     */
+    private $fieldHandlers;
+
+    /**
+     * GetAssetIdsByContentField constructor.
+     *
+     * @param array $fieldHandlers
+     */
+    public function __construct($fieldHandlers = [])
+    {
+        $this->fieldHandlers = $fieldHandlers;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function execute(string $field, string $value): array
+    {
+        if (!array_key_exists($field, $this->fieldHandlers)) {
+            throw new InvalidArgumentException(__('The field argument is invalid.'));
+        }
+        $ids = [];
+        /** @var GetAssetIdsByContentFieldInterface $fieldHandlers */
+        foreach ($this->fieldHandlers[$field] as $fieldHandlers) {
+            // phpcs:ignore Magento2.Performance.ForeachArrayMerge
+            $ids = array_merge($ids, $fieldHandlers->execute($value));
+        }
+        return array_unique($ids);
+    }
+}
diff --git a/app/code/Magento/MediaContentApi/Model/GetAssetIdByContentFieldInterface.php b/app/code/Magento/MediaContentApi/Model/GetAssetIdsByContentFieldInterface.php
similarity index 93%
rename from app/code/Magento/MediaContentApi/Model/GetAssetIdByContentFieldInterface.php
rename to app/code/Magento/MediaContentApi/Model/GetAssetIdsByContentFieldInterface.php
index 410b2aaceb60c..f38ffecedc202 100644
--- a/app/code/Magento/MediaContentApi/Model/GetAssetIdByContentFieldInterface.php
+++ b/app/code/Magento/MediaContentApi/Model/GetAssetIdsByContentFieldInterface.php
@@ -13,7 +13,7 @@
 /**
  * Interface used to return Asset id by content field.
  */
-interface GetAssetIdByContentFieldInterface
+interface GetAssetIdsByContentFieldInterface
 {
     /**
      * This function returns asset ids by content field
diff --git a/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByCategoryStore.php b/app/code/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByCategoryStore.php
similarity index 92%
rename from app/code/Magento/MediaContentCatalog/Model/GetAssetIdByCategoryStore.php
rename to app/code/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByCategoryStore.php
index da6b08a062269..386bc659ab681 100644
--- a/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByCategoryStore.php
+++ b/app/code/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByCategoryStore.php
@@ -5,19 +5,19 @@
  */
 declare(strict_types=1);
 
-namespace Magento\MediaContentCatalog\Model;
+namespace Magento\MediaContentCatalog\Model\ResourceModel;
 
 use Magento\Catalog\Api\CategoryManagementInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\MediaContentApi\Model\GetAssetIdByContentFieldInterface;
+use Magento\MediaContentApi\Model\GetAssetIdsByContentFieldInterface;
 use Magento\Store\Api\GroupRepositoryInterface;
 use Magento\Store\Api\StoreRepositoryInterface;
 
 /**
  * Class responsible to return Asset id by category store
  */
-class GetAssetIdByCategoryStore implements GetAssetIdByContentFieldInterface
+class GetAssetIdsByCategoryStore implements GetAssetIdsByContentFieldInterface
 {
     private const TABLE_CONTENT_ASSET = 'media_content_asset';
     private const TABLE_CATALOG_CATEGORY = 'catalog_category_entity';
@@ -39,7 +39,7 @@ class GetAssetIdByCategoryStore implements GetAssetIdByContentFieldInterface
     private $storeGroupRepository;
 
     /**
-     * GetAssetIdByProductStore constructor.
+     * GetAssetIdsByCategoryStore constructor.
      *
      * @param ResourceConnection $resource
      * @param StoreRepositoryInterface $storeRepository
@@ -88,7 +88,7 @@ private function getCategoryIdsByRootCategory(int $rootCategoryId): array
         $result = $this->getCategoryIdsAndPath();
 
         $result = array_filter($result, function ($item) use ($rootCategoryId) {
-            $pathArray = explode("/", $item['path']);
+            $pathArray = explode('/', $item['path']);
             $isInPath = false;
             foreach ($pathArray as $id) {
                 if ($id == $rootCategoryId) {
diff --git a/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByEavContentField.php b/app/code/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByEavContentField.php
similarity index 76%
rename from app/code/Magento/MediaContentCatalog/Model/GetAssetIdByEavContentField.php
rename to app/code/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByEavContentField.php
index c1560331a78ee..1be610e1fea77 100644
--- a/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByEavContentField.php
+++ b/app/code/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByEavContentField.php
@@ -5,16 +5,16 @@
  */
 declare(strict_types=1);
 
-namespace Magento\MediaContentCatalog\Model;
+namespace Magento\MediaContentCatalog\Model\ResourceModel;
 
 use Magento\Eav\Model\Config;
 use Magento\Framework\App\ResourceConnection;
-use Magento\MediaContentApi\Model\GetAssetIdByContentFieldInterface;
+use Magento\MediaContentApi\Model\GetAssetIdsByContentFieldInterface;
 
 /**
  * Class responsible to return Asset id by eav content field
  */
-class GetAssetIdByEavContentField implements GetAssetIdByContentFieldInterface
+class GetAssetIdsByEavContentField implements GetAssetIdsByContentFieldInterface
 {
     private const TABLE_CONTENT_ASSET = 'media_content_asset';
 
@@ -44,7 +44,7 @@ class GetAssetIdByEavContentField implements GetAssetIdByContentFieldInterface
     private $valueMap;
 
     /**
-     * GetAssetIdByEavContentStatus constructor.
+     * GetAssetIdsByEavContentField constructor.
      *
      * @param ResourceConnection $resource
      * @param Config $config
@@ -71,7 +71,7 @@ public function __construct(
      */
     public function execute(string $value): array
     {
-        $statusAttribute = $this->config->getAttribute($this->entityType, $this->attributeCode);
+        $attribute = $this->config->getAttribute($this->entityType, $this->attributeCode);
 
         $sql = $this->connection->getConnection()->select()->from(
             ['asset_content_table' => $this->connection->getTableName(self::TABLE_CONTENT_ASSET)],
@@ -80,10 +80,10 @@ public function execute(string $value): array
             'entity_type = ?',
             $this->entityType
         )->joinInner(
-            ['entity_eav_type' => $statusAttribute->getBackendTable()],
-            'asset_content_table.entity_id = entity_eav_type.' . $statusAttribute->getEntityIdField() .
+            ['entity_eav_type' => $attribute->getBackendTable()],
+            'asset_content_table.entity_id = entity_eav_type.' . $attribute->getEntityIdField() .
             ' AND entity_eav_type.attribute_id = ' .
-            $statusAttribute->getAttributeId(),
+            $attribute->getAttributeId(),
             []
         )->where(
             'entity_eav_type.value = ?',
@@ -101,9 +101,6 @@ public function execute(string $value): array
      */
     private function getValueFromMap(string $value): string
     {
-        if (count($this->valueMap) > 0 && array_key_exists($value, $this->valueMap)) {
-            return $this->valueMap[$value];
-        }
-        return $value;
+        return $this->valueMap[$value] ?? $value;
     }
 }
diff --git a/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByProductStore.php b/app/code/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByProductStore.php
similarity index 88%
rename from app/code/Magento/MediaContentCatalog/Model/GetAssetIdByProductStore.php
rename to app/code/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByProductStore.php
index 141198dc3e8df..6548b2964caaf 100644
--- a/app/code/Magento/MediaContentCatalog/Model/GetAssetIdByProductStore.php
+++ b/app/code/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByProductStore.php
@@ -5,17 +5,17 @@
  */
 declare(strict_types=1);
 
-namespace Magento\MediaContentCatalog\Model;
+namespace Magento\MediaContentCatalog\Model\ResourceModel;
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\MediaContentApi\Model\GetAssetIdByContentFieldInterface;
+use Magento\MediaContentApi\Model\GetAssetIdsByContentFieldInterface;
 use Magento\Store\Api\StoreRepositoryInterface;
 
 /**
  * Class responsible to return Asset ids by product store
  */
-class GetAssetIdByProductStore implements GetAssetIdByContentFieldInterface
+class GetAssetIdsByProductStore implements GetAssetIdsByContentFieldInterface
 {
     private const TABLE_CONTENT_ASSET = 'media_content_asset';
     private const ENTITY_TYPE = 'catalog_product';
@@ -34,7 +34,7 @@ class GetAssetIdByProductStore implements GetAssetIdByContentFieldInterface
     private $storeRepository;
 
     /**
-     * GetAssetIdByProductStore constructor.
+     * GetAssetIdsByProductStore constructor.
      *
      * @param ResourceConnection $resource
      * @param StoreRepositoryInterface $storeRepository
diff --git a/app/code/Magento/MediaContentCatalog/etc/di.xml b/app/code/Magento/MediaContentCatalog/etc/di.xml
index adbddaa25a122..865c72dfa4a5b 100644
--- a/app/code/Magento/MediaContentCatalog/etc/di.xml
+++ b/app/code/Magento/MediaContentCatalog/etc/di.xml
@@ -46,7 +46,7 @@
             </argument>
         </arguments>
     </type>
-    <virtualType name="Magento\MediaContentCatalog\Model\GetAssetIdByProductStatus" type="Magento\MediaContentCatalog\Model\GetAssetIdByEavContentField">
+    <virtualType name="Magento\MediaContentCatalog\Model\ResourceModel\GetAssetIdsByProductStatus" type="Magento\MediaContentCatalog\Model\ResourceModel\GetAssetIdsByEavContentField">
         <arguments>
             <argument name="attributeCode" xsi:type="string">status</argument>
             <argument name="entityType" xsi:type="string">catalog_product</argument>
@@ -56,28 +56,28 @@
             </argument>
         </arguments>
     </virtualType>
-    <virtualType name="Magento\MediaContentCatalog\Model\GetAssetIdByCategoryStatus" type="Magento\MediaContentCatalog\Model\GetAssetIdByEavContentField">
+    <virtualType name="Magento\MediaContentCatalog\Model\ResourceModel\GetAssetIdsByCategoryStatus" type="Magento\MediaContentCatalog\Model\ResourceModel\GetAssetIdsByEavContentField">
         <arguments>
             <argument name="attributeCode" xsi:type="string">is_active</argument>
             <argument name="entityType" xsi:type="string">catalog_category</argument>
         </arguments>
     </virtualType>
-    <type name="Magento\MediaContentApi\Api\GetAssetIdByContentFieldInterface">
+    <type name="Magento\MediaContentApi\Model\Composite\GetAssetIdsByContentField">
         <arguments>
-            <argument name="getAssetIdByContentFieldArray" xsi:type="array">
+            <argument name="fieldHandlers" xsi:type="array">
                 <item name="content_status" xsi:type="array">
-                    <item name="getAssetIdByProductStatus" xsi:type="object">Magento\MediaContentCatalog\Model\GetAssetIdByProductStatus</item>
-                    <item name="getAssetIdByCategoryStatus" xsi:type="object">Magento\MediaContentCatalog\Model\GetAssetIdByCategoryStatus</item>
+                    <item name="getAssetIdsByProductStatus" xsi:type="object">Magento\MediaContentCatalog\Model\ResourceModel\GetAssetIdsByProductStatus</item>
+                    <item name="getAssetIdsByCategoryStatus" xsi:type="object">Magento\MediaContentCatalog\Model\ResourceModel\GetAssetIdsByCategoryStatus</item>
                 </item>
             </argument>
         </arguments>
     </type>
-    <type name="Magento\MediaContentApi\Api\GetAssetIdByContentFieldInterface">
+    <type name="Magento\MediaContentApi\Model\Composite\GetAssetIdsByContentField">
         <arguments>
-            <argument name="getAssetIdByContentFieldArray" xsi:type="array">
+            <argument name="fieldHandlers" xsi:type="array">
                 <item name="store_id" xsi:type="array">
-                    <item name="getAssetIdByProductStore" xsi:type="object">Magento\MediaContentCatalog\Model\GetAssetIdByProductStore</item>
-                    <item name="getAssetIdByCategoryStore" xsi:type="object">Magento\MediaContentCatalog\Model\GetAssetIdByCategoryStore</item>
+                    <item name="getAssetIdsByProductStore" xsi:type="object">Magento\MediaContentCatalog\Model\ResourceModel\GetAssetIdsByProductStore</item>
+                    <item name="getAssetIdsByCategoryStore" xsi:type="object">Magento\MediaContentCatalog\Model\ResourceModel\GetAssetIdsByCategoryStore</item>
                 </item>
             </argument>
         </arguments>
diff --git a/app/code/Magento/MediaContentCms/Model/GetAssetIdByContentField.php b/app/code/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdsByContentField.php
similarity index 88%
rename from app/code/Magento/MediaContentCms/Model/GetAssetIdByContentField.php
rename to app/code/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdsByContentField.php
index 611fcb0fde1e1..9c223fd870645 100644
--- a/app/code/Magento/MediaContentCms/Model/GetAssetIdByContentField.php
+++ b/app/code/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdsByContentField.php
@@ -5,15 +5,15 @@
  */
 declare(strict_types=1);
 
-namespace Magento\MediaContentCms\Model;
+namespace Magento\MediaContentCms\Model\ResourceModel;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\MediaContentApi\Model\GetAssetIdByContentFieldInterface;
+use Magento\MediaContentApi\Model\GetAssetIdsByContentFieldInterface;
 
 /**
  * Class responsible to return Asset id by content field
  */
-class GetAssetIdByContentField implements GetAssetIdByContentFieldInterface
+class GetAssetIdsByContentField implements GetAssetIdsByContentFieldInterface
 {
     private const TABLE_CONTENT_ASSET = 'media_content_asset';
 
@@ -43,7 +43,7 @@ class GetAssetIdByContentField implements GetAssetIdByContentFieldInterface
     private $idColumn;
 
     /**
-     * GetAssetIdByContentField constructor.
+     * GetAssetIdsByContentField constructor.
      *
      * @param ResourceConnection $resource
      * @param string $entityType
diff --git a/app/code/Magento/MediaContentCms/etc/di.xml b/app/code/Magento/MediaContentCms/etc/di.xml
index a673cf59e2127..436c2ce94d786 100644
--- a/app/code/Magento/MediaContentCms/etc/di.xml
+++ b/app/code/Magento/MediaContentCms/etc/di.xml
@@ -34,7 +34,7 @@
             </argument>
         </arguments>
     </type>
-    <virtualType name="Magento\MediaContentCms\Model\GetAssetIdByBlockStore" type="Magento\MediaContentCms\Model\GetAssetIdByContentField">
+    <virtualType name="Magento\MediaContentCms\Model\ResourceModel\GetAssetIdsByBlockStore" type="Magento\MediaContentCms\Model\ResourceModel\GetAssetIdsByContentField">
         <arguments>
             <argument name="entityType" xsi:type="string">cms_block</argument>
             <argument name="fieldTable" xsi:type="string">cms_block_store</argument>
@@ -42,7 +42,7 @@
             <argument name="fieldColumn" xsi:type="string">store_id</argument>
         </arguments>
     </virtualType>
-    <virtualType name="Magento\MediaContentCms\Model\GetAssetIdByPageStore" type="Magento\MediaContentCms\Model\GetAssetIdByContentField">
+    <virtualType name="Magento\MediaContentCms\Model\ResourceModel\GetAssetIdsByPageStore" type="Magento\MediaContentCms\Model\ResourceModel\GetAssetIdsByContentField">
         <arguments>
             <argument name="entityType" xsi:type="string">cms_page</argument>
             <argument name="fieldTable" xsi:type="string">cms_page_store</argument>
@@ -50,7 +50,7 @@
             <argument name="fieldColumn" xsi:type="string">store_id</argument>
         </arguments>
     </virtualType>
-    <virtualType name="Magento\MediaContentCms\Model\GetAssetIdByPageStatus" type="Magento\MediaContentCms\Model\GetAssetIdByContentField">
+    <virtualType name="Magento\MediaContentCms\Model\ResourceModel\GetAssetIdsByPageStatus" type="Magento\MediaContentCms\Model\ResourceModel\GetAssetIdsByContentField">
         <arguments>
             <argument name="entityType" xsi:type="string">cms_page</argument>
             <argument name="fieldTable" xsi:type="string">cms_page</argument>
@@ -58,7 +58,7 @@
             <argument name="fieldColumn" xsi:type="string">is_active</argument>
         </arguments>
     </virtualType>
-    <virtualType name="Magento\MediaContentCms\Model\GetAssetIdByBlockStatus" type="Magento\MediaContentCms\Model\GetAssetIdByContentField">
+    <virtualType name="Magento\MediaContentCms\Model\ResourceModel\GetAssetIdsByBlockStatus" type="Magento\MediaContentCms\Model\ResourceModel\GetAssetIdsByContentField">
         <arguments>
             <argument name="entityType" xsi:type="string">cms_block</argument>
             <argument name="fieldTable" xsi:type="string">cms_block</argument>
@@ -66,22 +66,22 @@
             <argument name="fieldColumn" xsi:type="string">is_active</argument>
         </arguments>
     </virtualType>
-    <type name="Magento\MediaContentApi\Api\GetAssetIdByContentFieldInterface">
+    <type name="Magento\MediaContentApi\Model\Composite\GetAssetIdsByContentField">
         <arguments>
-            <argument name="getAssetIdByContentFieldArray" xsi:type="array">
+            <argument name="fieldHandlers" xsi:type="array">
                 <item name="content_status" xsi:type="array">
-                    <item name="getAssetIdByPageStatus" xsi:type="object">Magento\MediaContentCms\Model\GetAssetIdByPageStatus</item>
-                    <item name="getAssetIdByBlockStatus" xsi:type="object">Magento\MediaContentCms\Model\GetAssetIdByBlockStatus</item>
+                    <item name="getAssetIdsByPageStatus" xsi:type="object">Magento\MediaContentCms\Model\ResourceModel\GetAssetIdsByPageStatus</item>
+                    <item name="getAssetIdsByBlockStatus" xsi:type="object">Magento\MediaContentCms\Model\ResourceModel\GetAssetIdsByBlockStatus</item>
                 </item>
             </argument>
         </arguments>
     </type>
-    <type name="Magento\MediaContentApi\Api\GetAssetIdByContentFieldInterface">
+    <type name="Magento\MediaContentApi\Model\Composite\GetAssetIdsByContentField">
         <arguments>
-            <argument name="getAssetIdByContentFieldArray" xsi:type="array">
+            <argument name="fieldHandlers" xsi:type="array">
                 <item name="store_id" xsi:type="array">
-                    <item name="getAssetIdByPageStore" xsi:type="object">Magento\MediaContentCms\Model\GetAssetIdByPageStore</item>
-                    <item name="getAssetIdByBlockStore" xsi:type="object">Magento\MediaContentCms\Model\GetAssetIdByBlockStore</item>
+                    <item name="getAssetIdsByPageStore" xsi:type="object">Magento\MediaContentCms\Model\ResourceModel\GetAssetIdsByPageStore</item>
+                    <item name="getAssetIdsByBlockStore" xsi:type="object">Magento\MediaContentCms\Model\ResourceModel\GetAssetIdsByBlockStore</item>
                 </item>
             </argument>
         </arguments>

From aa11cf598727bffcc356ef44e11d1825d2075569 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Mon, 13 Jul 2020 10:53:25 +0100
Subject: [PATCH 0822/1718] Updated test names

---
 ...t.php => GetAssetIdsByContentFieldTest.php} | 18 +++++++++---------
 ...t.php => GetAssetIdsByContentFieldTest.php} | 16 ++++++++--------
 2 files changed, 17 insertions(+), 17 deletions(-)
 rename dev/tests/integration/testsuite/Magento/MediaContentCatalog/Model/ResourceModel/{GetAssetIdByContentFieldTest.php => GetAssetIdsByContentFieldTest.php} (76%)
 rename dev/tests/integration/testsuite/Magento/MediaContentCms/Model/ResourceModel/{GetAssetIdByContentFieldTest.php => GetAssetIdsByContentFieldTest.php} (75%)

diff --git a/dev/tests/integration/testsuite/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdByContentFieldTest.php b/dev/tests/integration/testsuite/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByContentFieldTest.php
similarity index 76%
rename from dev/tests/integration/testsuite/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdByContentFieldTest.php
rename to dev/tests/integration/testsuite/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByContentFieldTest.php
index 7ca595a72f1f4..9719c1756f2bc 100644
--- a/dev/tests/integration/testsuite/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdByContentFieldTest.php
+++ b/dev/tests/integration/testsuite/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByContentFieldTest.php
@@ -8,7 +8,7 @@
 
 namespace Magento\MediaContentCatalog\Model\ResourceModel;
 
-use Magento\MediaContentApi\Api\GetAssetIdByContentFieldInterface;
+use Magento\MediaContentApi\Api\GetAssetIdsByContentFieldInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
@@ -16,7 +16,7 @@
 /**
  * Test for GetAssetIdByContentFieldTest
  */
-class GetAssetIdByContentFieldTest extends TestCase
+class GetAssetIdsByContentFieldTest extends TestCase
 {
     private const STORE_FIELD = 'store_id';
     private const STATUS_FIELD = 'content_status';
@@ -24,9 +24,9 @@ class GetAssetIdByContentFieldTest extends TestCase
     private const STATUS_DISABLED = '0';
 
     /**
-     * @var GetAssetIdByContentFieldInterface
+     * @var GetAssetIdsByContentFieldInterface
      */
-    private $getAssetIdByContentField;
+    private $getAssetIdsByContentField;
 
     /**
      * @var int
@@ -40,7 +40,7 @@ protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->storeId = $objectManager->get(StoreManagerInterface::class)->getStore()->getId();
-        $this->getAssetIdByContentField = $objectManager->get(GetAssetIdByContentFieldInterface::class);
+        $this->getAssetIdsByContentField = $objectManager->get(GetAssetIdsByContentFieldInterface::class);
     }
 
     /**
@@ -53,7 +53,7 @@ public function testCategoryStoreView(): void
     {
         $this->assertEquals(
             [2020],
-            $this->getAssetIdByContentField->execute(self::STORE_FIELD, (string)$this->storeId)
+            $this->getAssetIdsByContentField->execute(self::STORE_FIELD, (string)$this->storeId)
         );
     }
 
@@ -67,7 +67,7 @@ public function testProductStoreView(): void
     {
         $this->assertEquals(
             [2020],
-            $this->getAssetIdByContentField->execute(self::STORE_FIELD, (string)$this->storeId)
+            $this->getAssetIdsByContentField->execute(self::STORE_FIELD, (string)$this->storeId)
         );
     }
 
@@ -81,7 +81,7 @@ public function testProductStatusEnabled(): void
     {
         $this->assertEquals(
             [2020],
-            $this->getAssetIdByContentField->execute(self::STATUS_FIELD, self::STATUS_ENABLED)
+            $this->getAssetIdsByContentField->execute(self::STATUS_FIELD, self::STATUS_ENABLED)
         );
     }
 
@@ -95,7 +95,7 @@ public function testProductStatusDisabled(): void
     {
         $this->assertEquals(
             [],
-            $this->getAssetIdByContentField->execute(self::STATUS_FIELD, self::STATUS_DISABLED)
+            $this->getAssetIdsByContentField->execute(self::STATUS_FIELD, self::STATUS_DISABLED)
         );
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdByContentFieldTest.php b/dev/tests/integration/testsuite/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdsByContentFieldTest.php
similarity index 75%
rename from dev/tests/integration/testsuite/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdByContentFieldTest.php
rename to dev/tests/integration/testsuite/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdsByContentFieldTest.php
index 33eb4f2dcff41..e9ca4d33adc63 100644
--- a/dev/tests/integration/testsuite/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdByContentFieldTest.php
+++ b/dev/tests/integration/testsuite/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdsByContentFieldTest.php
@@ -8,7 +8,7 @@
 
 namespace Magento\MediaContentCms\Model\ResourceModel;
 
-use Magento\MediaContentApi\Api\GetAssetIdByContentFieldInterface;
+use Magento\MediaContentApi\Api\GetAssetIdsByContentFieldInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
@@ -16,7 +16,7 @@
 /**
  * Test for GetAssetIdByContentFieldTest
  */
-class GetAssetIdByContentFieldTest extends TestCase
+class GetAssetIdsByContentFieldTest extends TestCase
 {
     private const STORE_FIELD = 'store_id';
     private const STATUS_FIELD = 'content_status';
@@ -24,9 +24,9 @@ class GetAssetIdByContentFieldTest extends TestCase
     private const STATUS_DISABLED = '0';
 
     /**
-     * @var GetAssetIdByContentFieldInterface
+     * @var GetAssetIdsByContentFieldInterface
      */
-    private $getAssetIdByContentField;
+    private $getAssetIdsByContentField;
 
     /**
      * @var int
@@ -40,7 +40,7 @@ protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->storeId = $objectManager->get(StoreManagerInterface::class)->getStore()->getId();
-        $this->getAssetIdByContentField = $objectManager->get(GetAssetIdByContentFieldInterface::class);
+        $this->getAssetIdsByContentField = $objectManager->get(GetAssetIdsByContentFieldInterface::class);
     }
 
     /**
@@ -53,7 +53,7 @@ public function testBlockStoreView(): void
     {
         $this->assertEquals(
             [2020],
-            $this->getAssetIdByContentField->execute(self::STORE_FIELD, (string)$this->storeId)
+            $this->getAssetIdsByContentField->execute(self::STORE_FIELD, (string)$this->storeId)
         );
     }
 
@@ -67,7 +67,7 @@ public function testPageStatusEnabled(): void
     {
         $this->assertEquals(
             [2020],
-            $this->getAssetIdByContentField->execute(self::STATUS_FIELD, self::STATUS_ENABLED)
+            $this->getAssetIdsByContentField->execute(self::STATUS_FIELD, self::STATUS_ENABLED)
         );
     }
 
@@ -81,7 +81,7 @@ public function testPageStatusDisabled(): void
     {
         $this->assertEquals(
             [],
-            $this->getAssetIdByContentField->execute(self::STATUS_FIELD, self::STATUS_DISABLED)
+            $this->getAssetIdsByContentField->execute(self::STATUS_FIELD, self::STATUS_DISABLED)
         );
     }
 }

From d99ff1b3920625ab155856463e261801c652fa48 Mon Sep 17 00:00:00 2001
From: Marjan Petkovski <petkovski.marjan@gmail.com>
Date: Mon, 13 Jul 2020 12:32:30 +0200
Subject: [PATCH 0823/1718] magento/magento2#26121: special price & tier price
 are coming in base currency

Adjust unit and integration tests
---
 .../Unit/Model/Product/Type/PriceTest.php     | 23 ++++++++++++++++++-
 .../Model/Import/AdvancedPricingTest.php      | 16 ++++++-------
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php
index 09ad8bb41de7c..1ced98e7ec482 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php
@@ -12,11 +12,13 @@
 use Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\TierPrice;
+use Magento\Catalog\Model\Product\Price\TierPriceBuilder;
 use Magento\Catalog\Model\Product\Type\Price;
 use Magento\Customer\Api\GroupManagementInterface;
 use Magento\Customer\Model\Data\Group;
 use Magento\Customer\Model\GroupManagement;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Model\Website;
@@ -69,6 +71,8 @@ class PriceTest extends TestCase
 
     private $tierPriceExtensionFactoryMock;
 
+    private $priceCurrencyMock;
+
     protected function setUp(): void
     {
         $this->objectManagerHelper = new ObjectManagerHelper($this);
@@ -113,6 +117,18 @@ protected function setUp(): void
             ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
+        $this->priceCurrencyMock = $this->getMockBuilder(PriceCurrencyInterface::class)
+            ->getMockForAbstractClass();
+        $tierPriceBuilder = $this->objectManagerHelper->getObject(
+            TierPriceBuilder::class,
+            [
+                'tierPriceFactory' => $this->tpFactory,
+                'tierPriceExtensionFactory' => $this->tierPriceExtensionFactoryMock,
+                'config' => $this->scopeConfigMock,
+                'storeManager' => $storeMangerMock,
+                'priceCurrency' => $this->priceCurrencyMock,
+            ]
+        );
         $this->model = $this->objectManagerHelper->getObject(
             Price::class,
             [
@@ -120,7 +136,8 @@ protected function setUp(): void
                 'config' => $this->scopeConfigMock,
                 'storeManager' => $storeMangerMock,
                 'groupManagement' => $this->groupManagementMock,
-                'tierPriceExtensionFactory' => $this->tierPriceExtensionFactoryMock
+                'tierPriceExtensionFactory' => $this->tierPriceExtensionFactoryMock,
+                'tierPriceBuilder' => $tierPriceBuilder
             ]
         );
     }
@@ -234,6 +251,10 @@ function () {
         $this->tierPriceExtensionFactoryMock->expects($this->any())
             ->method('create')
             ->willReturn($tierPriceExtensionMock);
+        $this->priceCurrencyMock->expects($this->any())->method('convertAndRound')
+            ->will(
+                $this->onConsecutiveCalls(10, 20)
+            );
 
         // test with the data retrieved as a REST object
         $tpRests = $this->model->getTierPrices($this->product);
diff --git a/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricingTest.php b/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricingTest.php
index 747b990ce632e..5c15e0a6658e1 100644
--- a/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricingTest.php
+++ b/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricingTest.php
@@ -46,25 +46,25 @@ protected function setUp(): void
             'AdvancedPricingSimple 1' => [
                 [
                     'customer_group_id' => \Magento\Customer\Model\Group::CUST_GROUP_ALL,
-                    'value'             => '300.000000',
+                    'value'             => 300.00,
                     'qty'               => '10.0000',
                     'percentage_value'  => null
                 ],
                 [
                     'customer_group_id' => '1',
-                    'value'             => '11.000000',
+                    'value'             => 11.00,
                     'qty'               => '11.0000',
                     'percentage_value'  => null
                 ],
                 [
                     'customer_group_id' => '3',
-                    'value'             => '14.000000',
+                    'value'             => 14.00,
                     'qty'               => '14.0000',
                     'percentage_value'  => null
                 ],
                 [
                     'customer_group_id' => \Magento\Customer\Model\Group::CUST_GROUP_ALL,
-                    'value'             => 160.5,
+                    'value'             => 160.50,
                     'qty'               => '20.0000',
                     'percentage_value'  => '50.00'
                 ]
@@ -72,25 +72,25 @@ protected function setUp(): void
             'AdvancedPricingSimple 2' => [
                 [
                     'customer_group_id' => \Magento\Customer\Model\Group::CUST_GROUP_ALL,
-                    'value'             => '1000000.000000',
+                    'value'             => 1000000.00,
                     'qty'               => '100.0000',
                     'percentage_value'  => null
                 ],
                 [
                     'customer_group_id' => '0',
-                    'value'             => '12.000000',
+                    'value'             => 12.00,
                     'qty'               => '12.0000',
                     'percentage_value'  => null
                 ],
                 [
                     'customer_group_id' => '2',
-                    'value'             => '13.000000',
+                    'value'             => 13.00,
                     'qty'               => '13.0000',
                     'percentage_value'  => null
                 ],
                 [
                     'customer_group_id' => \Magento\Customer\Model\Group::CUST_GROUP_ALL,
-                    'value'             => 327.0,
+                    'value'             => 327.00,
                     'qty'               => '200.0000',
                     'percentage_value'  => '50.00'
                 ]

From cdad976bc74f1ef92979f7fdf82885ddb7414ba3 Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Mon, 13 Jul 2020 13:37:55 +0300
Subject: [PATCH 0824/1718] MC-34264: Shipping Method Estimator not working
 with custom address attributes

---
 .../Checkout/view/frontend/web/js/model/address-converter.js  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js b/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js
index de3e8e18f4e6f..a59ea7101f16c 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/address-converter.js
@@ -101,13 +101,15 @@ define([
                 output.street = streetObject;
             }
 
+            //jscs:disable requireCamelCaseOrUpperCaseIdentifiers
             if ($.isArray(addrs.customAttributes)) {
                 customAttributesObject = {};
-                addrs.customAttributes.forEach(function (value, index) {
+                addrs.customAttributes.forEach(function (value) {
                     customAttributesObject[value.attribute_code] = value.value;
                 });
                 output.custom_attributes = customAttributesObject;
             }
+            //jscs:enable requireCamelCaseOrUpperCaseIdentifiers
 
             return output;
         },

From f63761fe6e4068eabb42ba8a81d852c74a63f458 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 13 Jul 2020 13:52:08 +0300
Subject: [PATCH 0825/1718] Cover changes with integration tests

---
 .../MediaGallery/Model/SearchAssetsTest.php   | 84 +++++++++++++++++++
 .../MediaGallery/_files/media_asset.php       |  1 +
 2 files changed, 85 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/MediaGallery/Model/SearchAssetsTest.php

diff --git a/dev/tests/integration/testsuite/Magento/MediaGallery/Model/SearchAssetsTest.php b/dev/tests/integration/testsuite/Magento/MediaGallery/Model/SearchAssetsTest.php
new file mode 100644
index 0000000000000..1c97565c059da
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MediaGallery/Model/SearchAssetsTest.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallery\Model\ResourceModel;
+
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\Search\FilterGroupBuilder;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\MediaGalleryApi\Api\SearchAssetsInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Verify SearchAssets By searchCriteria
+ */
+class SearchAssetsTest extends TestCase
+{
+    private const FIXTURE_ASSET_PATH = 'testDirectory/path.jpg';
+
+    /**
+     * @var SearchAssetsInterfcae
+     */
+    private $searchAssets;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->filterBuilder = Bootstrap::getObjectManager()->get(FilterBuilder::class);
+        $this->filterGroupBuilder = Bootstrap::getObjectManager()->get(FilterGroupBuilder::class);
+        $this->searchCriteriaBuilder = Bootstrap::getObjectManager()->get(SearchCriteriaBuilder::class);
+        $this->searchAssets = Bootstrap::getObjectManager()->get(SearchAssetsInterface::class);
+    }
+
+    /**
+     * Verify search asstes by searching with search criteria
+     *
+     * @dataProvider searchCriteriaProvider
+     * @magentoDataFixture Magento/MediaGallery/_files/media_asset.php
+     */
+    public function testExecute(array $searchCriteriaData): void
+    {
+        $titleFilter = $this->filterBuilder->setField($searchCriteriaData['field'])
+                ->setConditionType($searchCriteriaData['conditionType'])
+                ->setValue($searchCriteriaData['value'])
+                ->create();
+        $searchCriteria = $this->searchCriteriaBuilder
+                ->setFilterGroups([$this->filterGroupBuilder->setFilters([$titleFilter])->create()])
+                ->create();
+
+        $assets = $this->searchAssets->execute($searchCriteria);
+
+        $this->assertCount(1, $assets);
+        $this->assertEquals($assets[0]->getPath(), self::FIXTURE_ASSET_PATH);
+    }
+
+    /**
+     * Search criteria params provider
+     *
+     * @return array
+     */
+    public function searchCriteriaProvider(): array
+    {
+        return [
+            [
+                ['field' =>  'id', 'conditionType' => 'eq', 'value' => 2020],
+            ],
+            [
+                ['field' =>  'title', 'conditionType' => 'fulltext', 'value' => 'Img'],
+            ],
+            [
+                ['field' =>  'content_type', 'conditionType' => 'eq', 'value' => 'image']
+            ],
+            [
+                ['field' =>  'description', 'conditionType' => 'fulltext', 'value' => 'description']
+            ]
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/MediaGallery/_files/media_asset.php b/dev/tests/integration/testsuite/Magento/MediaGallery/_files/media_asset.php
index 1a2dce9e032fa..33efe102362ba 100644
--- a/dev/tests/integration/testsuite/Magento/MediaGallery/_files/media_asset.php
+++ b/dev/tests/integration/testsuite/Magento/MediaGallery/_files/media_asset.php
@@ -18,6 +18,7 @@
     [
         'id' => 2020,
         'path' => 'testDirectory/path.jpg',
+        'description' => 'Description of an image',
         'contentType' => 'image',
         'title' => 'Img',
         'source' => 'Local',

From fdec445161d39014439e382b211af4c0e9559a1d Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 13 Jul 2020 13:55:59 +0300
Subject: [PATCH 0826/1718] remove protected property

---
 .../Model/ResourceModel/GetAssetsBySearchCriteria.php           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGallery/Model/ResourceModel/GetAssetsBySearchCriteria.php b/app/code/Magento/MediaGallery/Model/ResourceModel/GetAssetsBySearchCriteria.php
index e871f6be8d71d..15a543405deda 100644
--- a/app/code/Magento/MediaGallery/Model/ResourceModel/GetAssetsBySearchCriteria.php
+++ b/app/code/Magento/MediaGallery/Model/ResourceModel/GetAssetsBySearchCriteria.php
@@ -31,7 +31,7 @@ class GetAssetsBySearchCriteria
     /**
      * @var SearchResultFactory
      */
-    protected $searchResultFactory;
+    private $searchResultFactory;
 
     /**
      * @var LoggerInterface

From 752eb5af9e1581c8a1508d63390d1fb07ea3ddae Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Mon, 13 Jul 2020 11:58:24 +0100
Subject: [PATCH 0827/1718] Added data provider to tests

---
 .../GetAssetIdsByContentFieldTest.php         | 68 ++++++++----------
 .../GetAssetIdsByContentFieldTest.php         | 71 ++++++++++++-------
 2 files changed, 77 insertions(+), 62 deletions(-)

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 9719c1756f2bc..d776c681ae6e7 100644
--- a/dev/tests/integration/testsuite/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByContentFieldTest.php
+++ b/dev/tests/integration/testsuite/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByContentFieldTest.php
@@ -8,13 +8,13 @@
 
 namespace Magento\MediaContentCatalog\Model\ResourceModel;
 
+use Magento\Framework\Exception\InvalidArgumentException;
 use Magento\MediaContentApi\Api\GetAssetIdsByContentFieldInterface;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 
 /**
- * Test for GetAssetIdByContentFieldTest
+ * Test for GetAssetIdsByContentFieldTest
  */
 class GetAssetIdsByContentFieldTest extends TestCase
 {
@@ -22,80 +22,72 @@ class GetAssetIdsByContentFieldTest extends TestCase
     private const STATUS_FIELD = 'content_status';
     private const STATUS_ENABLED = '1';
     private const STATUS_DISABLED = '0';
+    private const FIXTURE_ASSET_ID = 2020;
+    private const DEFAULT_STORE_ID = '1';
 
     /**
      * @var GetAssetIdsByContentFieldInterface
      */
     private $getAssetIdsByContentField;
 
-    /**
-     * @var int
-     */
-    private $storeId;
-
     /**
      * @inheritdoc
      */
     protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->storeId = $objectManager->get(StoreManagerInterface::class)->getStore()->getId();
         $this->getAssetIdsByContentField = $objectManager->get(GetAssetIdsByContentFieldInterface::class);
     }
 
     /**
-     * Test for getting asset id by store view of a category
+     * Test for getting asset id by category fields
      *
+     * @dataProvider testProvider
      * @magentoDataFixture Magento/MediaGallery/_files/media_asset.php
      * @magentoDataFixture Magento/MediaContentCatalog/_files/category_with_asset.php
+     * @param string $field
+     * @param string $value
+     * @param array $expectedAssetIds
+     * @throws InvalidArgumentException
      */
-    public function testCategoryStoreView(): void
+    public function testCategoryFields(string $field, string $value, array $expectedAssetIds): void
     {
         $this->assertEquals(
-            [2020],
-            $this->getAssetIdsByContentField->execute(self::STORE_FIELD, (string)$this->storeId)
+            $expectedAssetIds,
+            $this->getAssetIdsByContentField->execute($field, $value)
         );
     }
 
     /**
-     * Test for getting asset id by store view of a product
+     * Test for getting asset id by product fields
      *
+     * @dataProvider testProvider
      * @magentoDataFixture Magento/MediaGallery/_files/media_asset.php
      * @magentoDataFixture Magento/MediaContentCatalog/_files/product_with_asset.php
+     * @param string $field
+     * @param string $value
+     * @param array $expectedAssetIds
+     * @throws InvalidArgumentException
      */
-    public function testProductStoreView(): void
+    public function testProductFields(string $field, string $value, array $expectedAssetIds): void
     {
         $this->assertEquals(
-            [2020],
-            $this->getAssetIdsByContentField->execute(self::STORE_FIELD, (string)$this->storeId)
+            $expectedAssetIds,
+            $this->getAssetIdsByContentField->execute($field, $value)
         );
     }
 
     /**
-     * Test for getting asset id by enabled status of a product
+     * Data provider for tests
      *
-     * @magentoDataFixture Magento/MediaGallery/_files/media_asset.php
-     * @magentoDataFixture Magento/MediaContentCatalog/_files/category_with_asset.php
+     * @return array
      */
-    public function testProductStatusEnabled(): void
+    public static function testProvider(): array
     {
-        $this->assertEquals(
-            [2020],
-            $this->getAssetIdsByContentField->execute(self::STATUS_FIELD, self::STATUS_ENABLED)
-        );
-    }
-
-    /**
-     * Test for getting asset id by disabled status of a product
-     *
-     * @magentoDataFixture Magento/MediaGallery/_files/media_asset.php
-     * @magentoDataFixture Magento/MediaContentCatalog/_files/product_with_asset.php
-     */
-    public function testProductStatusDisabled(): void
-    {
-        $this->assertEquals(
-            [],
-            $this->getAssetIdsByContentField->execute(self::STATUS_FIELD, self::STATUS_DISABLED)
-        );
+        return [
+            [self::STATUS_FIELD, self::STATUS_ENABLED, [self::FIXTURE_ASSET_ID]],
+            [self::STATUS_FIELD, self::STATUS_DISABLED, []],
+            [self::STORE_FIELD, self::DEFAULT_STORE_ID, [self::FIXTURE_ASSET_ID]],
+        ];
     }
 }
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 e9ca4d33adc63..f136a26580e96 100644
--- a/dev/tests/integration/testsuite/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdsByContentFieldTest.php
+++ b/dev/tests/integration/testsuite/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdsByContentFieldTest.php
@@ -8,13 +8,13 @@
 
 namespace Magento\MediaContentCms\Model\ResourceModel;
 
+use Magento\Framework\Exception\InvalidArgumentException;
 use Magento\MediaContentApi\Api\GetAssetIdsByContentFieldInterface;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 
 /**
- * Test for GetAssetIdByContentFieldTest
+ * Test for GetAssetIdsByContentFieldTest
  */
 class GetAssetIdsByContentFieldTest extends TestCase
 {
@@ -22,66 +22,89 @@ class GetAssetIdsByContentFieldTest extends TestCase
     private const STATUS_FIELD = 'content_status';
     private const STATUS_ENABLED = '1';
     private const STATUS_DISABLED = '0';
+    private const FIXTURE_ASSET_ID = 2020;
+    private const DEFAULT_STORE_ID = '1';
+    private const ADMIN_STORE_ID = '0';
 
     /**
      * @var GetAssetIdsByContentFieldInterface
      */
     private $getAssetIdsByContentField;
 
-    /**
-     * @var int
-     */
-    private $storeId;
-
     /**
      * @inheritdoc
      */
     protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->storeId = $objectManager->get(StoreManagerInterface::class)->getStore()->getId();
         $this->getAssetIdsByContentField = $objectManager->get(GetAssetIdsByContentFieldInterface::class);
     }
 
     /**
-     * Test for getting asset id by store view of a block
+     * Test for getting asset id by block field
      *
+     * @dataProvider testBlockDataProvider
      * @magentoDataFixture Magento/MediaGallery/_files/media_asset.php
      * @magentoDataFixture Magento/MediaContentCms/_files/block_with_asset.php
+     *
+     * @param string $field
+     * @param string $value
+     * @param array $expectedAssetIds
+     * @throws InvalidArgumentException
      */
-    public function testBlockStoreView(): void
+    public function testBlockFields(string $field, string $value, array $expectedAssetIds): void
     {
         $this->assertEquals(
-            [2020],
-            $this->getAssetIdsByContentField->execute(self::STORE_FIELD, (string)$this->storeId)
+            $expectedAssetIds,
+            $this->getAssetIdsByContentField->execute($field, $value)
         );
     }
 
     /**
-     * Test for getting asset id by enabled status of a page
+     * Test for getting asset id by page field
      *
+     * @dataProvider testPageDataProvider
      * @magentoDataFixture Magento/MediaGallery/_files/media_asset.php
      * @magentoDataFixture Magento/MediaContentCms/_files/page_with_asset.php
+     *
+     * @param string $field
+     * @param string $value
+     * @param array $expectedAssetIds
+     * @throws InvalidArgumentException
      */
-    public function testPageStatusEnabled(): void
+    public function testPageFields(string $field, string $value, array $expectedAssetIds): void
     {
         $this->assertEquals(
-            [2020],
-            $this->getAssetIdsByContentField->execute(self::STATUS_FIELD, self::STATUS_ENABLED)
+            $expectedAssetIds,
+            $this->getAssetIdsByContentField->execute($field, $value)
         );
     }
 
     /**
-     * Test for getting asset id by disabled status of a page
+     * Data provider for block tests
      *
-     * @magentoDataFixture Magento/MediaGallery/_files/media_asset.php
-     * @magentoDataFixture Magento/MediaContentCms/_files/page_with_asset.php
+     * @return array
      */
-    public function testPageStatusDisabled(): void
+    public static function testBlockDataProvider(): array
     {
-        $this->assertEquals(
-            [],
-            $this->getAssetIdsByContentField->execute(self::STATUS_FIELD, self::STATUS_DISABLED)
-        );
+        return [
+            [self::STATUS_FIELD, self::STATUS_ENABLED, [self::FIXTURE_ASSET_ID]],
+            [self::STATUS_FIELD, self::STATUS_DISABLED, []],
+            [self::STORE_FIELD, self::DEFAULT_STORE_ID, [self::FIXTURE_ASSET_ID]],
+        ];
+    }
+
+    /**
+     * Data provider for page tests
+     *
+     * @return array
+     */
+    public static function testPageDataProvider(): array
+    {
+        return [
+            [self::STATUS_FIELD, self::STATUS_ENABLED, [self::FIXTURE_ASSET_ID]],
+            [self::STATUS_FIELD, self::STATUS_DISABLED, []],
+            [self::STORE_FIELD, self::ADMIN_STORE_ID, [self::FIXTURE_ASSET_ID]],
+        ];
     }
 }

From 9dffdc53f0e415e4f664b26861148136218b359c Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Mon, 13 Jul 2020 12:03:35 +0100
Subject: [PATCH 0828/1718] Fixed static test

---
 app/code/Magento/MediaContentCatalog/etc/di.xml | 6 ------
 app/code/Magento/MediaContentCms/etc/di.xml     | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/app/code/Magento/MediaContentCatalog/etc/di.xml b/app/code/Magento/MediaContentCatalog/etc/di.xml
index 865c72dfa4a5b..f8d03a1cb2e56 100644
--- a/app/code/Magento/MediaContentCatalog/etc/di.xml
+++ b/app/code/Magento/MediaContentCatalog/etc/di.xml
@@ -69,12 +69,6 @@
                     <item name="getAssetIdsByProductStatus" xsi:type="object">Magento\MediaContentCatalog\Model\ResourceModel\GetAssetIdsByProductStatus</item>
                     <item name="getAssetIdsByCategoryStatus" xsi:type="object">Magento\MediaContentCatalog\Model\ResourceModel\GetAssetIdsByCategoryStatus</item>
                 </item>
-            </argument>
-        </arguments>
-    </type>
-    <type name="Magento\MediaContentApi\Model\Composite\GetAssetIdsByContentField">
-        <arguments>
-            <argument name="fieldHandlers" xsi:type="array">
                 <item name="store_id" xsi:type="array">
                     <item name="getAssetIdsByProductStore" xsi:type="object">Magento\MediaContentCatalog\Model\ResourceModel\GetAssetIdsByProductStore</item>
                     <item name="getAssetIdsByCategoryStore" xsi:type="object">Magento\MediaContentCatalog\Model\ResourceModel\GetAssetIdsByCategoryStore</item>
diff --git a/app/code/Magento/MediaContentCms/etc/di.xml b/app/code/Magento/MediaContentCms/etc/di.xml
index 436c2ce94d786..551d24e02e9b2 100644
--- a/app/code/Magento/MediaContentCms/etc/di.xml
+++ b/app/code/Magento/MediaContentCms/etc/di.xml
@@ -73,12 +73,6 @@
                     <item name="getAssetIdsByPageStatus" xsi:type="object">Magento\MediaContentCms\Model\ResourceModel\GetAssetIdsByPageStatus</item>
                     <item name="getAssetIdsByBlockStatus" xsi:type="object">Magento\MediaContentCms\Model\ResourceModel\GetAssetIdsByBlockStatus</item>
                 </item>
-            </argument>
-        </arguments>
-    </type>
-    <type name="Magento\MediaContentApi\Model\Composite\GetAssetIdsByContentField">
-        <arguments>
-            <argument name="fieldHandlers" xsi:type="array">
                 <item name="store_id" xsi:type="array">
                     <item name="getAssetIdsByPageStore" xsi:type="object">Magento\MediaContentCms\Model\ResourceModel\GetAssetIdsByPageStore</item>
                     <item name="getAssetIdsByBlockStore" xsi:type="object">Magento\MediaContentCms\Model\ResourceModel\GetAssetIdsByBlockStore</item>

From e27450a8efb21e7661c080884dbbdbd84e0760d8 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 13 Jul 2020 14:27:55 +0300
Subject: [PATCH 0829/1718] Fix namespaces

---
 .../testsuite/Magento/MediaGallery/Model/SearchAssetsTest.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/MediaGallery/Model/SearchAssetsTest.php b/dev/tests/integration/testsuite/Magento/MediaGallery/Model/SearchAssetsTest.php
index 1c97565c059da..23c156e724ec1 100644
--- a/dev/tests/integration/testsuite/Magento/MediaGallery/Model/SearchAssetsTest.php
+++ b/dev/tests/integration/testsuite/Magento/MediaGallery/Model/SearchAssetsTest.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\MediaGallery\Model\ResourceModel;
+namespace Magento\MediaGallery\Model;
 
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\Search\FilterGroupBuilder;

From 3a4cfa1fd0a05e040875ff51afe1d74a124fe211 Mon Sep 17 00:00:00 2001
From: Michal Derlatka <michal.derlatka1@gmail.com>
Date: Mon, 13 Jul 2020 13:34:46 +0200
Subject: [PATCH 0830/1718] magento/magento2#28570: createCustomer does not
 match validation requirements (static test fix)

---
 .../Model/Resolver/UpdateCustomerEmail.php           | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerEmail.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerEmail.php
index 14341999cc078..e77cea69a3f9d 100644
--- a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerEmail.php
+++ b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerEmail.php
@@ -12,6 +12,7 @@
 use Magento\CustomerGraphQl\Model\Customer\UpdateCustomerAccount;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+use Magento\Framework\GraphQl\Query\Resolver\Value;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\GraphQl\Model\Query\ContextInterface;
@@ -52,7 +53,16 @@ public function __construct(
     }
 
     /**
-     * Resolves customer email update mutation
+     * Resolve customer email update mutation
+     *
+     * @param \Magento\Framework\GraphQl\Config\Element\Field $field
+     * @param \Magento\Framework\GraphQl\Query\Resolver\ContextInterface $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     * @return array|Value
+     * @throws \Exception
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function resolve(
         Field $field,

From 8c9b8d0bd9135c6246cd86bfe8627a1c380c3185 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 13 Jul 2020 15:33:23 +0300
Subject: [PATCH 0831/1718] add missing properties

---
 .../MediaGallery/Model/SearchAssetsTest.php       | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/dev/tests/integration/testsuite/Magento/MediaGallery/Model/SearchAssetsTest.php b/dev/tests/integration/testsuite/Magento/MediaGallery/Model/SearchAssetsTest.php
index 23c156e724ec1..924c7d81365a2 100644
--- a/dev/tests/integration/testsuite/Magento/MediaGallery/Model/SearchAssetsTest.php
+++ b/dev/tests/integration/testsuite/Magento/MediaGallery/Model/SearchAssetsTest.php
@@ -26,6 +26,21 @@ class SearchAssetsTest extends TestCase
      */
     private $searchAssets;
 
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @var FilterGroupBuilder
+     */
+    private $filterGroupBuilder;
+
+    /**
+     * @var FilterBuilder
+     */
+    private $filterBuilder;
+
     /**
      * @inheritdoc
      */

From f02a540efc7863011743f1878cd7b1c6b668aee6 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Mon, 13 Jul 2020 14:24:01 +0100
Subject: [PATCH 0832/1718] Fixing static tests

---
 .../Model/ResourceModel/GetAssetIdsByCategoryStore.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByCategoryStore.php b/app/code/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByCategoryStore.php
index 386bc659ab681..c427b49309c30 100644
--- a/app/code/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByCategoryStore.php
+++ b/app/code/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByCategoryStore.php
@@ -80,7 +80,7 @@ public function execute(string $value): array
     /**
      * This function returns an array of category ids that have content and are under the root parameter
      *
-     * @param $rootCategoryId
+     * @param int $rootCategoryId
      * @return array
      */
     private function getCategoryIdsByRootCategory(int $rootCategoryId): array

From 7eb4cea228a8cc31929895ba9f246501ff86ab65 Mon Sep 17 00:00:00 2001
From: Stas Kozar <stas.kozar@transoftgroup.com>
Date: Mon, 13 Jul 2020 18:47:55 +0300
Subject: [PATCH 0833/1718] MC-35618: Unexpected results of editing a Grouped
 Product in the Wish List by a Customer

---
 .../Magento/Wishlist/Controller/Index/Add.php |  1 -
 .../Controller/Index/UpdateItemOptions.php    |  1 -
 app/code/Magento/Wishlist/Model/Wishlist.php  | 14 +++--
 .../Index/UpdateItemOptionsTest.php           |  4 +-
 .../Wishlist/Test/Unit/Model/WishlistTest.php | 59 +++++++++++++------
 .../_files/wishlist_with_grouped_product.php  |  4 +-
 6 files changed, 54 insertions(+), 29 deletions(-)

diff --git a/app/code/Magento/Wishlist/Controller/Index/Add.php b/app/code/Magento/Wishlist/Controller/Index/Add.php
index 903719b245058..3ed152cb84125 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Add.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Add.php
@@ -112,7 +112,6 @@ public function execute()
 
         try {
             $buyRequest = new \Magento\Framework\DataObject($requestParams);
-            $buyRequest->setData('action', 'add');
 
             $result = $wishlist->addNewItem($product, $buyRequest);
             if (is_string($result)) {
diff --git a/app/code/Magento/Wishlist/Controller/Index/UpdateItemOptions.php b/app/code/Magento/Wishlist/Controller/Index/UpdateItemOptions.php
index 1bc6182232b44..6fae77fd604e5 100644
--- a/app/code/Magento/Wishlist/Controller/Index/UpdateItemOptions.php
+++ b/app/code/Magento/Wishlist/Controller/Index/UpdateItemOptions.php
@@ -104,7 +104,6 @@ public function execute()
             }
 
             $buyRequest = new \Magento\Framework\DataObject($this->getRequest()->getParams());
-            $buyRequest->setData('action', 'updateItem');
 
             $wishlist->updateItem($id, $buyRequest)->save();
 
diff --git a/app/code/Magento/Wishlist/Model/Wishlist.php b/app/code/Magento/Wishlist/Model/Wishlist.php
index 66d19d6dcf617..1789725791de8 100644
--- a/app/code/Magento/Wishlist/Model/Wishlist.php
+++ b/app/code/Magento/Wishlist/Model/Wishlist.php
@@ -492,6 +492,9 @@ public function addNewItem($product, $buyRequest = null, $forciblySetQty = false
         } else {
             $_buyRequest = new DataObject();
         }
+        if ($_buyRequest->getData('action') !== 'updateItem') {
+            $_buyRequest->setData('action', 'add');
+        }
 
         /* @var $product Product */
         $cartCandidates = $product->getTypeInstance()->processConfiguration($_buyRequest, clone $product);
@@ -750,15 +753,16 @@ public function updateItem($itemId, $buyRequest, $params = null)
             }
             $params->setCurrentConfig($item->getBuyRequest());
             $buyRequest = $this->_catalogProduct->addParamsToBuyRequest($buyRequest, $params);
+            $buyRequest->setData('action', 'updateItem');
 
             $product->setWishlistStoreId($item->getStoreId());
             $items = $this->getItemCollection();
             $isForceSetQuantity = true;
-            foreach ($items as $_item) {
-                /* @var $_item Item */
-                if ($_item->getProductId() == $product->getId()
-                    && $_item->getId() != $item->getId()
-                    && $_item->representProduct($product)
+            foreach ($items as $wishlistItem) {
+                /* @var $wishlistItem Item */
+                if ($wishlistItem->getProductId() == $product->getId()
+                    && $wishlistItem->getId() != $item->getId()
+                    && $wishlistItem->representProduct($product)
                 ) {
                     // We do not add new wishlist item, but updating the existing one
                     $isForceSetQuantity = false;
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/UpdateItemOptionsTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/UpdateItemOptionsTest.php
index 69e4e48262842..623ba8f266fa1 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/UpdateItemOptionsTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/UpdateItemOptionsTest.php
@@ -380,7 +380,7 @@ public function testExecuteAddSuccessException()
         $wishlist
             ->expects($this->once())
             ->method('updateItem')
-            ->with(3, new DataObject(['action' => 'updateItem']))
+            ->with(3, new DataObject([]))
             ->willReturnSelf();
         $wishlist
             ->expects($this->once())
@@ -509,7 +509,7 @@ public function testExecuteAddSuccessCriticalException()
         $wishlist
             ->expects($this->once())
             ->method('updateItem')
-            ->with(3, new DataObject(['action' => 'updateItem']))
+            ->with(3, new DataObject([]))
             ->willReturnSelf();
         $wishlist
             ->expects($this->once())
diff --git a/app/code/Magento/Wishlist/Test/Unit/Model/WishlistTest.php b/app/code/Magento/Wishlist/Test/Unit/Model/WishlistTest.php
index 19bfb3598f0e3..e09491813877b 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Model/WishlistTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Model/WishlistTest.php
@@ -243,34 +243,22 @@ public function testLoadByCustomerId()
 
     /**
      * @param int|Item|MockObject $itemId
-     * @param DataObject $buyRequest
+     * @param DataObject|MockObject $buyRequest
      * @param null|array|DataObject $param
      * @throws LocalizedException
      *
      * @dataProvider updateItemDataProvider
      */
-    public function testUpdateItem($itemId, $buyRequest, $param)
+    public function testUpdateItem($itemId, $buyRequest, $param): void
     {
         $storeId = 1;
         $productId = 1;
         $stores = [(new DataObject())->setId($storeId)];
 
-        $newItem = $this->getMockBuilder(Item::class)
-            ->setMethods(
-                ['setProductId', 'setWishlistId', 'setStoreId', 'setOptions', 'setProduct', 'setQty', 'getItem', 'save']
-            )
-            ->disableOriginalConstructor()
-            ->getMock();
-        $newItem->expects($this->any())->method('setProductId')->willReturnSelf();
-        $newItem->expects($this->any())->method('setWishlistId')->willReturnSelf();
-        $newItem->expects($this->any())->method('setStoreId')->willReturnSelf();
-        $newItem->expects($this->any())->method('setOptions')->willReturnSelf();
-        $newItem->expects($this->any())->method('setProduct')->willReturnSelf();
-        $newItem->expects($this->any())->method('setQty')->willReturnSelf();
-        $newItem->expects($this->any())->method('getItem')->willReturn(2);
-        $newItem->expects($this->any())->method('save')->willReturnSelf();
+        $newItem = $this->prepareWishlistItem();
 
         $this->itemFactory->expects($this->once())->method('create')->willReturn($newItem);
+        $this->productHelper->expects($this->once())->method('addParamsToBuyRequest')->willReturn($buyRequest);
 
         $this->storeManager->expects($this->any())->method('getStores')->willReturn($stores);
         $this->storeManager->expects($this->any())->method('getStore')->willReturn($stores[0]);
@@ -355,13 +343,48 @@ public function testUpdateItem($itemId, $buyRequest, $param)
         );
     }
 
+    /**
+     * Prepare wishlist item mock.
+     *
+     * @return MockObject
+     */
+    private function prepareWishlistItem(): MockObject
+    {
+        $newItem = $this->getMockBuilder(Item::class)
+            ->setMethods(
+                ['setProductId', 'setWishlistId', 'setStoreId', 'setOptions', 'setProduct', 'setQty', 'getItem', 'save']
+            )
+            ->disableOriginalConstructor()
+            ->getMock();
+        $newItem->expects($this->any())->method('setProductId')->willReturnSelf();
+        $newItem->expects($this->any())->method('setWishlistId')->willReturnSelf();
+        $newItem->expects($this->any())->method('setStoreId')->willReturnSelf();
+        $newItem->expects($this->any())->method('setOptions')->willReturnSelf();
+        $newItem->expects($this->any())->method('setProduct')->willReturnSelf();
+        $newItem->expects($this->any())->method('setQty')->willReturnSelf();
+        $newItem->expects($this->any())->method('getItem')->willReturn(2);
+        $newItem->expects($this->any())->method('save')->willReturnSelf();
+
+        return $newItem;
+    }
+
     /**
      * @return array
      */
-    public function updateItemDataProvider()
+    public function updateItemDataProvider(): array
     {
+        $dataObjectMock = $this->createMock(DataObject::class);
+        $dataObjectMock->expects($this->once())
+            ->method('setData')
+            ->with('action', 'updateItem')
+            ->willReturnSelf();
+        $dataObjectMock->expects($this->once())
+            ->method('getData')
+            ->with('action')
+            ->willReturn('updateItem');
+
         return [
-            '0' => [1, new DataObject(), null]
+            '0' => [1, $dataObjectMock, null]
         ];
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_grouped_product.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_grouped_product.php
index b46d087d7fb71..94d23436e2a00 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_grouped_product.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_grouped_product.php
@@ -19,13 +19,13 @@
 
 $objectManager = Bootstrap::getObjectManager();
 /** @var CustomerRegistry $customerRegistry */
-$customerRegistry = $objectManager->create(CustomerRegistry::class);
+$customerRegistry = $objectManager->get(CustomerRegistry::class);
 $customer = $customerRegistry->retrieve(1);
 $wishlistFactory = $objectManager->get(WishlistFactory::class);
 $wishlist = $wishlistFactory->create();
 $wishlist->loadByCustomerId($customer->getId(), true);
 /** @var ProductRepositoryInterface $productRepository */
-$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
 $product = $productRepository->get('grouped');
 $simple1 = $productRepository->get('simple_11');
 $simple2 = $productRepository->get('simple_22');

From 950d5041ad53963a6e9ab948c40e4c65a7627d6b Mon Sep 17 00:00:00 2001
From: Ji Lu <jilu1@adobe.com>
Date: Mon, 13 Jul 2020 11:03:31 -0500
Subject: [PATCH 0834/1718] MQE-2220: fixed deprecated action group usage and
 annotation errors in MFTF tests

---
 .../Mftf/Test/AdminChangeProductAttributeGroupTest.xml     | 1 +
 .../Test/AdminMarketingDeleteNewsletterSubscriberTest.xml  | 1 +
 ...NewsletterGuestSubscriptionWithDisallowedOptionTest.xml | 1 +
 ...ifyRegistredLinkDisplayedForGuestSubscriptionNoTest.xml | 7 ++++++-
 ...shlistWithMoreThanMaximumAllowedTextLengthLimitTest.xml | 1 +
 5 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeGroupTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeGroupTest.xml
index 04955807d7618..68e6040277247 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeGroupTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeGroupTest.xml
@@ -9,6 +9,7 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminChangeProductAttributeGroupTest">
         <annotations>
+            <stories value="Preserving attribute value after attribute group is changed"/>
             <title value="Preserving attribute value after attribute group is changed"/>
             <description value="Attribute value should be preserved after changing attribute group"/>
             <severity value="CRITICAL"/>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingDeleteNewsletterSubscriberTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingDeleteNewsletterSubscriberTest.xml
index eea77a6be0784..c472d262a34c8 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingDeleteNewsletterSubscriberTest.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminMarketingDeleteNewsletterSubscriberTest.xml
@@ -14,6 +14,7 @@
             <stories value="Subscribers Deleting"/>
             <title value="Admin deletes newsletter subscribers"/>
             <description value="Admin should be able delete newsletter subscribers"/>
+            <severity value="CRITICAL"/>
             <group value="newsletter"/>
         </annotations>
         <before>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/StorefrontNewsletterGuestSubscriptionWithDisallowedOptionTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/StorefrontNewsletterGuestSubscriptionWithDisallowedOptionTest.xml
index 8d6e707930bba..6c62434f1620e 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/Test/StorefrontNewsletterGuestSubscriptionWithDisallowedOptionTest.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/StorefrontNewsletterGuestSubscriptionWithDisallowedOptionTest.xml
@@ -14,6 +14,7 @@
             <stories value="Disabled Guest Newsletter Subscription"/>
             <title value="Newsletter Subscription for guest is disabled and cannot be performed"/>
             <description value="Guest cannot subscribe to Newsletter if it is disallowed in configurations"/>
+            <severity value="AVERAGE"/>
             <group value="newsletter"/>
             <group value="configuration"/>
             <testCaseId value="MC-35728"/>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/VerifyRegistredLinkDisplayedForGuestSubscriptionNoTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/VerifyRegistredLinkDisplayedForGuestSubscriptionNoTest.xml
index 42df2061e4350..dbce742aa0eef 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/Test/VerifyRegistredLinkDisplayedForGuestSubscriptionNoTest.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/VerifyRegistredLinkDisplayedForGuestSubscriptionNoTest.xml
@@ -23,6 +23,11 @@
             <magentoCLI command="config:set newsletter/subscription/allow_guest_subscribe 0"
                         stepKey="setConfigGuestSubscriptionDisable"/>
         </before>
-        <actionGroup ref="StorefrontCreateNewSubscriberActionGroup" stepKey="createSubscriber"/>
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage"/>
+        <submitForm selector="{{BasicFrontendNewsletterFormSection.subscribeForm}}"
+                    parameterArray="['email' => '{{_defaultNewsletter.senderEmail}}']"
+                    button="{{BasicFrontendNewsletterFormSection.subscribeButton}}" stepKey="submitForm"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <waitForElementVisible stepKey="waitForErrorAppears" selector="{{StorefrontMessagesSection.error}}"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontShareWishlistWithMoreThanMaximumAllowedTextLengthLimitTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontShareWishlistWithMoreThanMaximumAllowedTextLengthLimitTest.xml
index aa69a56cb7cae..65e67f75eb7e8 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontShareWishlistWithMoreThanMaximumAllowedTextLengthLimitTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontShareWishlistWithMoreThanMaximumAllowedTextLengthLimitTest.xml
@@ -15,6 +15,7 @@
             <title value="Sharing wishlist with more than Maximum Allowed Text Length Limit"/>
             <description value="Customer should not have a possibility share wishlist with more than maximum allowed Email Text Length Limit"/>
             <testCaseId value="MC-35647"/>
+            <severity value="AVERAGE"/>
             <group value="wishlist"/>
             <group value="configuration"/>
         </annotations>

From f990c5ddbf430c5fd1887a45229e5d0565bebc9f Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Tue, 26 May 2020 17:26:13 +0300
Subject: [PATCH 0835/1718] Small improvements and API Test coveragefor uid

---
 ...nValueIdV2.php => BundleItemOptionUid.php} |  10 +-
 .../Magento/BundleGraphQl/etc/schema.graphqls |   2 +-
 ... => CustomizableEnteredOptionValueUid.php} |   8 +-
 ...=> CustomizableSelectedOptionValueUid.php} |  10 +-
 .../CatalogGraphQl/etc/schema.graphqls        |  16 +-
 .../Model/Resolver/Variant/Attributes.php     |  19 ++-
 .../Attributes/ConfigurableAttributeIdV2.php  |  83 ----------
 .../Attributes/ConfigurableAttributeUid.php   |  67 ++++++++
 .../etc/schema.graphqls                       |   2 +-
 ...IdV2.php => DownloadableLinksValueUid.php} |   9 +-
 .../DownloadableGraphQl/etc/schema.graphqls   |   2 +-
 .../Uid/CustomizableOptionsUidTest.php        | 156 ++++++++++++++++++
 .../Options/Uid/CustomizableValueUidTest.php  |  96 +++++++++++
 .../Uid/DownloadableLinksValueUidTest.php     |  73 ++++++++
 14 files changed, 437 insertions(+), 116 deletions(-)
 rename app/code/Magento/BundleGraphQl/Model/Resolver/Options/{BundleEnteredOptionValueIdV2.php => BundleItemOptionUid.php} (76%)
 rename app/code/Magento/CatalogGraphQl/Model/Resolver/Product/{CustomizableEnteredOptionValueIdV2.php => CustomizableEnteredOptionValueUid.php} (80%)
 rename app/code/Magento/CatalogGraphQl/Model/Resolver/Product/{CustomizableSelectedOptionValueIdV2.php => CustomizableSelectedOptionValueUid.php} (76%)
 delete mode 100644 app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Attributes/ConfigurableAttributeIdV2.php
 create mode 100644 app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Attributes/ConfigurableAttributeUid.php
 rename app/code/Magento/DownloadableGraphQl/Resolver/Product/{DownloadableLinksValueIdV2.php => DownloadableLinksValueUid.php} (81%)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/Options/Uid/CustomizableOptionsUidTest.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/Options/Uid/CustomizableValueUidTest.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/DownloadableProduct/Options/Uid/DownloadableLinksValueUidTest.php

diff --git a/app/code/Magento/BundleGraphQl/Model/Resolver/Options/BundleEnteredOptionValueIdV2.php b/app/code/Magento/BundleGraphQl/Model/Resolver/Options/BundleItemOptionUid.php
similarity index 76%
rename from app/code/Magento/BundleGraphQl/Model/Resolver/Options/BundleEnteredOptionValueIdV2.php
rename to app/code/Magento/BundleGraphQl/Model/Resolver/Options/BundleItemOptionUid.php
index c1a55d9db794a..ce5c12ce69675 100644
--- a/app/code/Magento/BundleGraphQl/Model/Resolver/Options/BundleEnteredOptionValueIdV2.php
+++ b/app/code/Magento/BundleGraphQl/Model/Resolver/Options/BundleItemOptionUid.php
@@ -14,9 +14,9 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 
 /**
- * Format new option id_v2 in base64 encode for entered bundle options
+ * Format new option uid in base64 encode for entered bundle options
  */
-class BundleEnteredOptionValueIdV2 implements ResolverInterface
+class BundleItemOptionUid implements ResolverInterface
 {
     /**
      * Option type name
@@ -24,7 +24,7 @@ class BundleEnteredOptionValueIdV2 implements ResolverInterface
     private const OPTION_TYPE = 'bundle';
 
     /**
-     * Create a option id_v2 for entered option in "<option-type>/<option-id>/<option-value-id>/<quantity>" format
+     * Create a option uid for entered option in "<option-type>/<option-id>/<option-value-id>/<quantity>" format
      *
      * @param Field $field
      * @param ContextInterface $context
@@ -46,11 +46,11 @@ public function resolve(
         array $args = null
     ) {
         if (!isset($value['option_id']) || empty($value['option_id'])) {
-            throw new GraphQlInputException(__('Wrong format option data: option_id should not be empty.'));
+            throw new GraphQlInputException(__('"option_id" value should be specified.'));
         }
 
         if (!isset($value['selection_id']) || empty($value['selection_id'])) {
-            throw new GraphQlInputException(__('Wrong format option data: selection_id should not be empty.'));
+            throw new GraphQlInputException(__('"selection_id" value should be specified.'));
         }
 
         $optionDetails = [
diff --git a/app/code/Magento/BundleGraphQl/etc/schema.graphqls b/app/code/Magento/BundleGraphQl/etc/schema.graphqls
index bab1a256f7f59..361c5fad6cf8f 100644
--- a/app/code/Magento/BundleGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/BundleGraphQl/etc/schema.graphqls
@@ -66,7 +66,7 @@ type BundleItemOption @doc(description: "BundleItemOption defines characteristic
     price_type: PriceTypeEnum @doc(description: "One of FIXED, PERCENT, or DYNAMIC.")
     can_change_quantity: Boolean @doc(description: "Indicates whether the customer can change the number of items for this option.")
     product: ProductInterface @doc(description: "Contains details about this product option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product")
-    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Options\\BundleEnteredOptionValueIdV2")
+    uid: ID @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Options\\BundleItemOptionUid") # A Base64 string that encodes option details.
 }
 
 type BundleProduct implements ProductInterface, PhysicalProductInterface, CustomizableProductInterface @doc(description: "BundleProduct defines basic features of a bundle product and contains multiple BundleItems.") {
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableEnteredOptionValueIdV2.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableEnteredOptionValueUid.php
similarity index 80%
rename from app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableEnteredOptionValueIdV2.php
rename to app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableEnteredOptionValueUid.php
index efc15d5d92ca3..69fafc49c9137 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableEnteredOptionValueIdV2.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableEnteredOptionValueUid.php
@@ -14,9 +14,9 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 
 /**
- * Format new option id_v2 in base64 encode for entered custom options
+ * Format new option uid in base64 encode for entered custom options
  */
-class CustomizableEnteredOptionValueIdV2 implements ResolverInterface
+class CustomizableEnteredOptionValueUid implements ResolverInterface
 {
     /**
      * Option type name
@@ -24,7 +24,7 @@ class CustomizableEnteredOptionValueIdV2 implements ResolverInterface
     private const OPTION_TYPE = 'custom-option';
 
     /**
-     * Create a option id_v2 for entered option in "<option-type>/<option-id>" format
+     * Create a option uid for entered option in "<option-type>/<option-id>" format
      *
      * @param Field $field
      * @param ContextInterface $context
@@ -46,7 +46,7 @@ public function resolve(
         array $args = null
     ) {
         if (!isset($value['option_id']) || empty($value['option_id'])) {
-            throw new GraphQlInputException(__('Wrong format option data: option_id should not be empty.'));
+            throw new GraphQlInputException(__('"option_id" value should be specified.'));
         }
 
         $optionDetails = [
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableSelectedOptionValueIdV2.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableSelectedOptionValueUid.php
similarity index 76%
rename from app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableSelectedOptionValueIdV2.php
rename to app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableSelectedOptionValueUid.php
index f1dff2680ba93..5fbd8a56bb570 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableSelectedOptionValueIdV2.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableSelectedOptionValueUid.php
@@ -14,9 +14,9 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 
 /**
- * Format new option id_v2 in base64 encode for selected custom options
+ * Format new option uid in base64 encode for selected custom options
  */
-class CustomizableSelectedOptionValueIdV2 implements ResolverInterface
+class CustomizableSelectedOptionValueUid implements ResolverInterface
 {
     /**
      * Option type name
@@ -24,7 +24,7 @@ class CustomizableSelectedOptionValueIdV2 implements ResolverInterface
     private const OPTION_TYPE = 'custom-option';
 
     /**
-     * Create a option id_v2 for selected option in "<option-type>/<option-id>/<option-value-id>" format
+     * Create a option uid for selected option in "<option-type>/<option-id>/<option-value-id>" format
      *
      * @param Field $field
      * @param ContextInterface $context
@@ -46,11 +46,11 @@ public function resolve(
         array $args = null
     ) {
         if (!isset($value['option_id']) || empty($value['option_id'])) {
-            throw new GraphQlInputException(__('Wrong format option data: option_id should not be empty.'));
+            throw new GraphQlInputException(__('"option_id" value should be specified.'));
         }
 
         if (!isset($value['option_type_id']) || empty($value['option_type_id'])) {
-            throw new GraphQlInputException(__('Wrong format option data: option_type_id should not be empty.'));
+            throw new GraphQlInputException(__('"option_type_id" value should be specified.'));
         }
 
         $optionDetails = [
diff --git a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
index 008ed729350cd..2f505f2441f31 100644
--- a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
@@ -132,7 +132,7 @@ type CustomizableAreaValue @doc(description: "CustomizableAreaValue defines the
     price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC.")
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     max_characters: Int @doc(description: "The maximum number of characters that can be entered for this customizable option.")
-    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueIdV2")
+    uid: ID @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueUid") # A Base64 string that encodes option details.
 }
 
 type CategoryTree implements CategoryInterface @doc(description: "Category Tree implementation.") {
@@ -154,7 +154,7 @@ type CustomizableDateValue @doc(description: "CustomizableDateValue defines the
     price: Float @doc(description: "The price assigned to this option.")
     price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC.")
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
-    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueIdV2")
+    uid: ID @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueUid") # A Base64 string that encodes option details.
 }
 
 type CustomizableDropDownOption implements CustomizableOptionInterface @doc(description: "CustomizableDropDownOption contains information about a drop down menu that is defined as part of a customizable option.") {
@@ -168,7 +168,7 @@ type CustomizableDropDownValue @doc(description: "CustomizableDropDownValue defi
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     title: String @doc(description: "The display name for this option.")
     sort_order: Int @doc(description: "The order in which the option is displayed.")
-    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueIdV2")
+    uid: ID @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueUid") # A Base64 string that encodes option details.
 }
 
 type CustomizableMultipleOption implements CustomizableOptionInterface @doc(description: "CustomizableMultipleOption contains information about a multiselect that is defined as part of a customizable option.") {
@@ -182,7 +182,7 @@ type CustomizableMultipleValue @doc(description: "CustomizableMultipleValue defi
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     title: String @doc(description: "The display name for this option.")
     sort_order: Int @doc(description: "The order in which the option is displayed.")
-    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueIdV2")
+    uid: ID @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueUid")
 }
 
 type CustomizableFieldOption implements CustomizableOptionInterface @doc(description: "CustomizableFieldOption contains information about a text field that is defined as part of a customizable option.") {
@@ -195,7 +195,7 @@ type CustomizableFieldValue @doc(description: "CustomizableFieldValue defines th
     price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC.")
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     max_characters: Int @doc(description: "The maximum number of characters that can be entered for this customizable option.")
-    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueIdV2")
+    uid: ID @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueUid") # A Base64 string that encodes option details.
 }
 
 type CustomizableFileOption implements CustomizableOptionInterface @doc(description: "CustomizableFileOption contains information about a file picker that is defined as part of a customizable option.") {
@@ -210,7 +210,7 @@ type CustomizableFileValue @doc(description: "CustomizableFileValue defines the
     file_extension: String @doc(description: "The file extension to accept.")
     image_size_x: Int @doc(description: "The maximum width of an image.")
     image_size_y: Int @doc(description: "The maximum height of an image.")
-    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueIdV2")
+    uid: ID @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueUid") # A Base64 string that encodes option details.
 }
 
 interface MediaGalleryInterface @doc(description: "Contains basic information about a product image or video.") @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\MediaGalleryTypeResolver") {
@@ -280,7 +280,7 @@ type CustomizableRadioValue @doc(description: "CustomizableRadioValue defines th
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     title: String @doc(description: "The display name for this option.")
     sort_order: Int @doc(description: "The order in which the radio button is displayed.")
-    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueIdV2")
+    uid: ID @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueUid") # A Base64 string that encodes option details.
 }
 
 type CustomizableCheckboxOption implements CustomizableOptionInterface @doc(description: "CustomizableCheckbbixOption contains information about a set of checkbox values that are defined as part of a customizable option.") {
@@ -294,7 +294,7 @@ type CustomizableCheckboxValue @doc(description: "CustomizableCheckboxValue defi
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     title: String @doc(description: "The display name for this option.")
     sort_order: Int @doc(description: "The order in which the checkbox value is displayed.")
-    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueIdV2")
+    uid: ID @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueUid") # A Base64 string that encodes option details.
 }
 
 type VirtualProduct implements ProductInterface, CustomizableProductInterface @doc(description: "A virtual product is non-tangible product that does not require shipping and is not kept in inventory.") {
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Attributes.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Attributes.php
index faf666144422c..3a064f3399255 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Attributes.php
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Attributes.php
@@ -60,7 +60,8 @@ public function resolve(
                     $option['options_map'] ?? [],
                     $code,
                     (int) $optionId,
-                    (int) $model->getData($code)
+                    (int) $model->getData($code),
+                    (int) $option['attribute_id']
                 );
                 if (!empty($optionsFromMap)) {
                     $data[] = $optionsFromMap;
@@ -77,14 +78,20 @@ public function resolve(
      * @param string $code
      * @param int $optionId
      * @param int $attributeCodeId
+     * @param int $attributeId
      * @return array
      */
-    private function getOptionsFromMap(array $optionMap, string $code, int $optionId, int $attributeCodeId): array
-    {
+    private function getOptionsFromMap(
+        array $optionMap,
+        string $code,
+        int $optionId,
+        int $attributeCodeId,
+        int $attributeId
+    ): array {
         $data = [];
         if (isset($optionMap[$optionId . ':' . $attributeCodeId])) {
             $optionValue = $optionMap[$optionId . ':' . $attributeCodeId];
-            $data = $this->getOptionsArray($optionValue, $code);
+            $data = $this->getOptionsArray($optionValue, $code, $attributeId);
         }
         return $data;
     }
@@ -94,15 +101,17 @@ private function getOptionsFromMap(array $optionMap, string $code, int $optionId
      *
      * @param array $optionValue
      * @param string $code
+     * @param int $attributeId
      * @return array
      */
-    private function getOptionsArray(array $optionValue, string $code): array
+    private function getOptionsArray(array $optionValue, string $code, int $attributeId): array
     {
         return [
             'label' => $optionValue['label'] ??  null,
             'code' => $code,
             'use_default_value' => $optionValue['use_default_value'] ?? null,
             'value_index' => $optionValue['value_index'] ?? null,
+            'attribute_id' => $attributeId,
         ];
     }
 }
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Attributes/ConfigurableAttributeIdV2.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Attributes/ConfigurableAttributeIdV2.php
deleted file mode 100644
index 75cd1ade5b548..0000000000000
--- a/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Attributes/ConfigurableAttributeIdV2.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\ConfigurableProductGraphQl\Model\Resolver\Variant\Attributes;
-
-use Magento\Eav\Model\ResourceModel\Entity\Attribute;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\GraphQl\Config\Element\Field;
-use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
-use Magento\Framework\GraphQl\Query\Resolver\Value;
-use Magento\Framework\GraphQl\Query\ResolverInterface;
-use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-
-/**
- * @inheritdoc
- *
- * Format new option id_v2 in base64 encode for super attribute options
- */
-class ConfigurableAttributeIdV2 implements ResolverInterface
-{
-    private const OPTION_TYPE = 'configurable';
-
-    /**
-     * @var Attribute
-     */
-    private $eavAttribute;
-
-    /**
-     * ConfigurableAttributeIdV2 constructor.
-     *
-     * @param Attribute $eavAttribute
-     */
-    public function __construct(Attribute $eavAttribute)
-    {
-        $this->eavAttribute = $eavAttribute;
-    }
-
-    /**
-     * @inheritdoc
-     *
-     * Create new option id_v2 that encodes details for each option and in most cases can be presented
-     * as base64("<option-type>/<attribute-id>/<value-index>")
-     *
-     * @param Field $field
-     * @param ContextInterface $context
-     * @param ResolveInfo $info
-     * @param array|null $value
-     * @param array|null $args
-     * @return Value|mixed|string
-     * @throws LocalizedException
-     */
-    public function resolve(
-        Field $field,
-        $context,
-        ResolveInfo $info,
-        array $value = null,
-        array $args = null
-    ) {
-        $attribute_id = $this->eavAttribute->getIdByCode('catalog_product', $value['code']);
-        $optionDetails = [
-            self::OPTION_TYPE,
-            $attribute_id,
-            $value['value_index']
-        ];
-
-        if (empty($attribute_id)) {
-            throw new LocalizedException(__('Wrong format option data: attribute_id should not be empty.'));
-        }
-
-        if (!isset($value['value_index']) || empty($value['value_index'])) {
-            throw new LocalizedException(__('Wrong format option data: value_index should not be empty.'));
-        }
-
-        // phpcs:ignore Magento2.Functions.DiscouragedFunction
-        $content = \implode('/', $optionDetails);
-
-        return base64_encode($content);
-    }
-}
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Attributes/ConfigurableAttributeUid.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Attributes/ConfigurableAttributeUid.php
new file mode 100644
index 0000000000000..13f31e7e2ce10
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Attributes/ConfigurableAttributeUid.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\Resolver\Variant\Attributes;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+/**
+ * Format new option uid in base64 encode for super attribute options
+ */
+class ConfigurableAttributeUid implements ResolverInterface
+{
+    /**
+     * Option type name
+     */
+    private const OPTION_TYPE = 'configurable';
+
+    /**
+     * Create a option uid for super attribute in "<option-type>/<attribute-id>/<value-index>" format
+     *
+     * @param Field $field
+     * @param ContextInterface $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     *
+     * @return string
+     *
+     * @throws GraphQlInputException
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['attribute_id']) || empty($value['attribute_id'])) {
+            throw new GraphQlInputException(__('"attribute_id" value should be specified.'));
+        }
+
+        if (!isset($value['value_index']) || empty($value['value_index'])) {
+            throw new GraphQlInputException(__('"value_index" value should be specified.'));
+        }
+
+        $optionDetails = [
+            self::OPTION_TYPE,
+            $value['attribute_id'],
+            $value['value_index']
+        ];
+
+        $content = implode('/', $optionDetails);
+
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        return base64_encode($content);
+    }
+}
diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
index 537987d6153bc..5ce6d61dc6a64 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
@@ -18,7 +18,7 @@ type ConfigurableAttributeOption @doc(description: "ConfigurableAttributeOption
     label: String @doc(description: "A string that describes the configurable attribute option")
     code: String @doc(description: "The ID assigned to the attribute")
     value_index: Int @doc(description: "A unique index number assigned to the configurable product option")
-    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\ConfigurableProductGraphQl\\Model\\Resolver\\Variant\\Attributes\\ConfigurableAttributeIdV2")
+    uid: ID @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\ConfigurableProductGraphQl\\Model\\Resolver\\Variant\\Attributes\\ConfigurableAttributeUid") # A Base64 string that encodes option details.
 }
 
 type ConfigurableProductOptions @doc(description: "ConfigurableProductOptions defines configurable attributes for the specified product") {
diff --git a/app/code/Magento/DownloadableGraphQl/Resolver/Product/DownloadableLinksValueIdV2.php b/app/code/Magento/DownloadableGraphQl/Resolver/Product/DownloadableLinksValueUid.php
similarity index 81%
rename from app/code/Magento/DownloadableGraphQl/Resolver/Product/DownloadableLinksValueIdV2.php
rename to app/code/Magento/DownloadableGraphQl/Resolver/Product/DownloadableLinksValueUid.php
index 62da0ba8530fc..03727597104fd 100644
--- a/app/code/Magento/DownloadableGraphQl/Resolver/Product/DownloadableLinksValueIdV2.php
+++ b/app/code/Magento/DownloadableGraphQl/Resolver/Product/DownloadableLinksValueUid.php
@@ -13,10 +13,13 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 
 /**
- * Formatting the id_v2 for downloadable link
+ * Formatting the uid for downloadable link
  */
-class DownloadableLinksValueIdV2 implements ResolverInterface
+class DownloadableLinksValueUid implements ResolverInterface
 {
+    /**
+     * Option type name
+     */
     private const OPTION_TYPE = 'downloadable';
 
     /**
@@ -30,7 +33,7 @@ public function resolve(
         array $args = null
     ) {
         if (!isset($value['id']) || empty($value['id'])) {
-            throw new GraphQlInputException(__('Wrong format option data: `id` should not be empty.'));
+            throw new GraphQlInputException(__('"id" value should be specified.'));
         }
 
         $optionDetails = [
diff --git a/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls b/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
index 82249bf7701da..9e24ddf9ea71b 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")
-    id_v2: String @doc(description: "Base64 string, that encodes details for each option.") @resolver(class: "Magento\\DownloadableGraphQl\\Resolver\\Product\\DownloadableLinksValueIdV2")
+    uid: ID @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\DownloadableGraphQl\\Resolver\\Product\\DownloadableLinksValueUid") # A Base64 string that encodes option details.
 }
 
 type DownloadableProductSamples @doc(description: "DownloadableProductSamples defines characteristics of a downloadable product") {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/Options/Uid/CustomizableOptionsUidTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/Options/Uid/CustomizableOptionsUidTest.php
new file mode 100644
index 0000000000000..c5a44d5ff68b3
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/Options/Uid/CustomizableOptionsUidTest.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Catalog\Options\Uid;
+
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test for product custom options uid
+ */
+class CustomizableOptionsUidTest extends GraphQlAbstract
+{
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_with_full_option_set.php
+     */
+    public function testQueryUidForCustomizableOptions()
+    {
+        $productSku = 'simple';
+        $query = $this->getQuery($productSku);
+        $response = $this->graphQlQuery($query);
+        $responseProduct = $response['products']['items'][0];
+        self::assertNotEmpty($responseProduct['options']);
+
+        foreach ($responseProduct['options'] as $option) {
+            if (isset($option['entered_option'])) {
+                $enteredOption = $option['entered_option'];
+                $uid = $this->getUidForEnteredValue($option['option_id']);
+
+                self::assertEquals($uid, $enteredOption['uid']);
+            } elseif (isset($option['selected_option'])) {
+                $this->assertNotEmpty($option['selected_option']);
+
+                foreach ($option['selected_option'] as $selectedOption) {
+                    $uid = $this->getUidForSelectedValue($option['option_id'], $selectedOption['option_type_id']);
+                    self::assertEquals($uid, $selectedOption['uid']);
+                }
+            }
+        }
+    }
+
+    /**
+     * Get uid for entered option
+     *
+     * @param int $optionId
+     *
+     * @return string
+     */
+    private function getUidForEnteredValue(int $optionId): string
+    {
+        return base64_encode('custom-option/' . $optionId);
+    }
+
+    /**
+     * Get uid for selected option
+     *
+     * @param int $optionId
+     * @param int $optionValueId
+     *
+     * @return string
+     */
+    private function getUidForSelectedValue(int $optionId, int $optionValueId): string
+    {
+        return base64_encode('custom-option/' . $optionId . '/' . $optionValueId);
+    }
+
+    /**
+     * Get query
+     *
+     * @param string $sku
+     *
+     * @return string
+     */
+    private function getQuery(string $sku): string
+    {
+        return <<<QUERY
+query {
+  products(filter: { sku: { eq: "$sku" } }) {
+    items {
+      sku
+
+      ... on CustomizableProductInterface {
+        options {
+          option_id
+          title
+
+          ... on CustomizableRadioOption {
+            option_id
+            selected_option: value {
+              option_type_id
+              uid
+            }
+          }
+
+          ... on CustomizableDropDownOption {
+            option_id
+            selected_option: value {
+              option_type_id
+              uid
+            }
+          }
+
+          ... on CustomizableMultipleOption {
+            option_id
+            selected_option: value {
+              option_type_id
+              uid
+            }
+          }
+
+          ... on CustomizableCheckboxOption {
+            option_id
+            selected_option: value {
+              option_type_id
+              uid
+            }
+          }
+
+          ... on CustomizableAreaOption {
+            option_id
+            entered_option: value {
+              uid
+            }
+          }
+
+          ... on CustomizableFieldOption {
+            option_id
+            entered_option: value {
+              uid
+            }
+          }
+
+          ... on CustomizableFileOption {
+            option_id
+            entered_option: value {
+              uid
+            }
+          }
+
+          ... on CustomizableDateOption {
+            option_id
+            entered_option: value {
+              uid
+            }
+          }
+        }
+      }
+    }
+  }
+}
+QUERY;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/Options/Uid/CustomizableValueUidTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/Options/Uid/CustomizableValueUidTest.php
new file mode 100644
index 0000000000000..070d917b85330
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/Options/Uid/CustomizableValueUidTest.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\ConfigurableProduct\Options\Uid;
+
+use Magento\Catalog\Model\Product;
+use Magento\Eav\Model\ResourceModel\Entity\Attribute;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test for downloadable product links uid
+ */
+class CustomizableValueUidTest extends GraphQlAbstract
+{
+    /**
+     * @var Attribute
+     */
+    private $eavAttribute;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->eavAttribute = $objectManager->get(Attribute::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/configurable_product_with_one_simple.php
+     */
+    public function testQueryUidForConfigurableSuperAttributes()
+    {
+        $productSku = 'configurable';
+        $query = $this->getQuery($productSku);
+        $response = $this->graphQlQuery($query);
+        $responseProduct = $response['products']['items'][0];
+        self::assertNotEmpty($responseProduct['variants']);
+
+        foreach ($responseProduct['variants'] as $variant) {
+            self::assertNotEmpty($variant['attributes']);
+
+            foreach ($variant['attributes'] as $attribute) {
+                $attributeId = (int) $this->eavAttribute->getIdByCode(Product::ENTITY, $attribute['code']);
+                $uid = $this->getUidByOptionIds($attributeId, $attribute['value_index']);
+                self::assertEquals($uid, $attribute['uid']);
+            }
+        }
+    }
+
+    /**
+     * Get Uid
+     *
+     * @param int $optionId
+     * @param int $optionValueId
+     *
+     * @return string
+     */
+    private function getUidByOptionIds(int $optionId, int $optionValueId): string
+    {
+        return base64_encode('configurable/' . $optionId . '/' . $optionValueId);
+    }
+
+    /**
+     * Get query
+     *
+     * @param string $sku
+     *
+     * @return string
+     */
+    private function getQuery(string $sku): string
+    {
+        return <<<QUERY
+query {
+  products(filter: { sku: { eq: "$sku" } }) {
+    items {
+      ... on ConfigurableProduct {
+        variants {
+          attributes {
+            uid
+            code
+            value_index
+          }
+        }
+      }
+    }
+  }
+}
+QUERY;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/DownloadableProduct/Options/Uid/DownloadableLinksValueUidTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/DownloadableProduct/Options/Uid/DownloadableLinksValueUidTest.php
new file mode 100644
index 0000000000000..e2daadc5e743d
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/DownloadableProduct/Options/Uid/DownloadableLinksValueUidTest.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\DownloadableProduct\Options\Uid;
+
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test for downloadable product links uid
+ */
+class DownloadableLinksValueUidTest extends GraphQlAbstract
+{
+    /**
+     * @magentoApiDataFixture Magento/Downloadable/_files/downloadable_product_with_files_and_sample_url.php
+     */
+    public function testQueryUidForDownloadableLinks()
+    {
+        $productSku = 'downloadable-product';
+        $query = $this->getQuery($productSku);
+        $response = $this->graphQlQuery($query);
+        $responseProduct = $response['products']['items'][0];
+
+        self::assertNotEmpty($responseProduct['downloadable_product_links']);
+
+        foreach ($responseProduct['downloadable_product_links'] as $productLink) {
+            $uid = $this->getUidByLinkId((int) $productLink['id']);
+            self::assertEquals($uid, $productLink['uid']);
+        }
+    }
+
+    /**
+     * Get uid by link id
+     *
+     * @param int $linkId
+     *
+     * @return string
+     */
+    private function getUidByLinkId(int $linkId): string
+    {
+        return base64_encode('downloadable/' . $linkId);
+    }
+
+    /**
+     * Get query
+     *
+     * @param string $sku
+     *
+     * @return string
+     */
+    private function getQuery(string $sku): string
+    {
+        return <<<QUERY
+query {
+  products(filter: { sku: { eq: "$sku" } }) {
+    items {
+      sku
+
+      ... on DownloadableProduct {
+        downloadable_product_links {
+          id
+          uid
+        }
+      }
+    }
+  }
+}
+QUERY;
+    }
+}

From e2daca80c1364aedb3dc02b4b655e1e1fd162ab4 Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Tue, 14 Jul 2020 09:59:36 +0300
Subject: [PATCH 0836/1718] Making uid a mandatory field

---
 .../Magento/BundleGraphQl/etc/schema.graphqls    |  2 +-
 .../Magento/CatalogGraphQl/etc/schema.graphqls   | 16 ++++++++--------
 .../etc/schema.graphqls                          |  2 +-
 .../DownloadableGraphQl/etc/schema.graphqls      |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/BundleGraphQl/etc/schema.graphqls b/app/code/Magento/BundleGraphQl/etc/schema.graphqls
index 361c5fad6cf8f..cba5c3f2fb55e 100644
--- a/app/code/Magento/BundleGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/BundleGraphQl/etc/schema.graphqls
@@ -66,7 +66,7 @@ type BundleItemOption @doc(description: "BundleItemOption defines characteristic
     price_type: PriceTypeEnum @doc(description: "One of FIXED, PERCENT, or DYNAMIC.")
     can_change_quantity: Boolean @doc(description: "Indicates whether the customer can change the number of items for this option.")
     product: ProductInterface @doc(description: "Contains details about this product option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product")
-    uid: ID @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Options\\BundleItemOptionUid") # A Base64 string that encodes option details.
+    uid: ID! @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Options\\BundleItemOptionUid") # A Base64 string that encodes option details.
 }
 
 type BundleProduct implements ProductInterface, PhysicalProductInterface, CustomizableProductInterface @doc(description: "BundleProduct defines basic features of a bundle product and contains multiple BundleItems.") {
diff --git a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
index 2f505f2441f31..9515dae501cd8 100644
--- a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
@@ -132,7 +132,7 @@ type CustomizableAreaValue @doc(description: "CustomizableAreaValue defines the
     price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC.")
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     max_characters: Int @doc(description: "The maximum number of characters that can be entered for this customizable option.")
-    uid: ID @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueUid") # A Base64 string that encodes option details.
+    uid: ID! @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueUid") # A Base64 string that encodes option details.
 }
 
 type CategoryTree implements CategoryInterface @doc(description: "Category Tree implementation.") {
@@ -154,7 +154,7 @@ type CustomizableDateValue @doc(description: "CustomizableDateValue defines the
     price: Float @doc(description: "The price assigned to this option.")
     price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC.")
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
-    uid: ID @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueUid") # A Base64 string that encodes option details.
+    uid: ID! @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueUid") # A Base64 string that encodes option details.
 }
 
 type CustomizableDropDownOption implements CustomizableOptionInterface @doc(description: "CustomizableDropDownOption contains information about a drop down menu that is defined as part of a customizable option.") {
@@ -168,7 +168,7 @@ type CustomizableDropDownValue @doc(description: "CustomizableDropDownValue defi
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     title: String @doc(description: "The display name for this option.")
     sort_order: Int @doc(description: "The order in which the option is displayed.")
-    uid: ID @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueUid") # A Base64 string that encodes option details.
+    uid: ID! @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueUid") # A Base64 string that encodes option details.
 }
 
 type CustomizableMultipleOption implements CustomizableOptionInterface @doc(description: "CustomizableMultipleOption contains information about a multiselect that is defined as part of a customizable option.") {
@@ -182,7 +182,7 @@ type CustomizableMultipleValue @doc(description: "CustomizableMultipleValue defi
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     title: String @doc(description: "The display name for this option.")
     sort_order: Int @doc(description: "The order in which the option is displayed.")
-    uid: ID @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueUid")
+    uid: ID! @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueUid")
 }
 
 type CustomizableFieldOption implements CustomizableOptionInterface @doc(description: "CustomizableFieldOption contains information about a text field that is defined as part of a customizable option.") {
@@ -195,7 +195,7 @@ type CustomizableFieldValue @doc(description: "CustomizableFieldValue defines th
     price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC.")
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     max_characters: Int @doc(description: "The maximum number of characters that can be entered for this customizable option.")
-    uid: ID @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueUid") # A Base64 string that encodes option details.
+    uid: ID! @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueUid") # A Base64 string that encodes option details.
 }
 
 type CustomizableFileOption implements CustomizableOptionInterface @doc(description: "CustomizableFileOption contains information about a file picker that is defined as part of a customizable option.") {
@@ -210,7 +210,7 @@ type CustomizableFileValue @doc(description: "CustomizableFileValue defines the
     file_extension: String @doc(description: "The file extension to accept.")
     image_size_x: Int @doc(description: "The maximum width of an image.")
     image_size_y: Int @doc(description: "The maximum height of an image.")
-    uid: ID @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueUid") # A Base64 string that encodes option details.
+    uid: ID! @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueUid") # A Base64 string that encodes option details.
 }
 
 interface MediaGalleryInterface @doc(description: "Contains basic information about a product image or video.") @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\MediaGalleryTypeResolver") {
@@ -280,7 +280,7 @@ type CustomizableRadioValue @doc(description: "CustomizableRadioValue defines th
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     title: String @doc(description: "The display name for this option.")
     sort_order: Int @doc(description: "The order in which the radio button is displayed.")
-    uid: ID @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueUid") # A Base64 string that encodes option details.
+    uid: ID! @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueUid") # A Base64 string that encodes option details.
 }
 
 type CustomizableCheckboxOption implements CustomizableOptionInterface @doc(description: "CustomizableCheckbbixOption contains information about a set of checkbox values that are defined as part of a customizable option.") {
@@ -294,7 +294,7 @@ type CustomizableCheckboxValue @doc(description: "CustomizableCheckboxValue defi
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     title: String @doc(description: "The display name for this option.")
     sort_order: Int @doc(description: "The order in which the checkbox value is displayed.")
-    uid: ID @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueUid") # A Base64 string that encodes option details.
+    uid: ID! @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueUid") # A Base64 string that encodes option details.
 }
 
 type VirtualProduct implements ProductInterface, CustomizableProductInterface @doc(description: "A virtual product is non-tangible product that does not require shipping and is not kept in inventory.") {
diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
index 5ce6d61dc6a64..b3262726b81ed 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
@@ -18,7 +18,7 @@ type ConfigurableAttributeOption @doc(description: "ConfigurableAttributeOption
     label: String @doc(description: "A string that describes the configurable attribute option")
     code: String @doc(description: "The ID assigned to the attribute")
     value_index: Int @doc(description: "A unique index number assigned to the configurable product option")
-    uid: ID @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\ConfigurableProductGraphQl\\Model\\Resolver\\Variant\\Attributes\\ConfigurableAttributeUid") # A Base64 string that encodes option details.
+    uid: ID! @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\ConfigurableProductGraphQl\\Model\\Resolver\\Variant\\Attributes\\ConfigurableAttributeUid") # A Base64 string that encodes option details.
 }
 
 type ConfigurableProductOptions @doc(description: "ConfigurableProductOptions defines configurable attributes for the specified product") {
diff --git a/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls b/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
index 9e24ddf9ea71b..dde950e860988 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: "An encoded string that encodes option details.") @resolver(class: "Magento\\DownloadableGraphQl\\Resolver\\Product\\DownloadableLinksValueUid") # A Base64 string that encodes option details.
+    uid: ID! @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\DownloadableGraphQl\\Resolver\\Product\\DownloadableLinksValueUid") # A Base64 string that encodes option details.
 }
 
 type DownloadableProductSamples @doc(description: "DownloadableProductSamples defines characteristics of a downloadable product") {

From 702dde31526a8e9769622672a313560430b815af Mon Sep 17 00:00:00 2001
From: Serhii Voloshkov <serhii.voloshkov@transoftgroup.com>
Date: Tue, 14 Jul 2020 10:35:37 +0300
Subject: [PATCH 0837/1718] MC-34999: Storefront: Wrong behavior of the
 functional "Order by SKU" if use an existing similar sku

---
 .../simple_product_cyrillic_symbols.php       | 45 +++++++++++++++++++
 ...mple_product_cyrillic_symbols_rollback.php | 30 +++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_cyrillic_symbols.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_cyrillic_symbols_rollback.php

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_cyrillic_symbols.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_cyrillic_symbols.php
new file mode 100644
index 0000000000000..235aedc66f3f6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_cyrillic_symbols.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\Data\ProductInterfaceFactory;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+
+/** @var ObjectManagerInterface $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+/** @var WebsiteRepositoryInterface $websiteRepository */
+$websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class);
+$baseWebsiteId = $websiteRepository->get('base')->getId();
+
+$productFactory = $objectManager->get(ProductInterfaceFactory::class);
+$product = $productFactory->create();
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
+    ->setWebsiteIds([$baseWebsiteId])
+    ->setName('Простий продукт')
+    ->setSku('Продукт')
+    ->setDescription('Повний опис продукту')
+    ->setShortDescription('Короткий опис')
+    ->setPrice(10)
+    ->setTaxClassId(0)
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setStockData(
+        [
+            'qty' => 100,
+            'is_in_stock' => 1,
+            'manage_stock' => 1,
+        ]
+    );
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_cyrillic_symbols_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_cyrillic_symbols_rollback.php
new file mode 100644
index 0000000000000..3b33077988f35
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_cyrillic_symbols_rollback.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var Registry $registry */
+$registry = Bootstrap::getObjectManager()->get(Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
+
+try {
+    $product = $productRepository->get('Продукт', false, null, true);
+    $productRepository->delete($product);
+} catch (NoSuchEntityException $exception) {
+    //Product already removed
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);

From d992eaf243a023d384672d9b5c1280435b58f651 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 14 Jul 2020 11:15:11 +0300
Subject: [PATCH 0838/1718] Correct pagination behavior

---
 .../Model/ResourceModel/GetAssetsBySearchCriteria.php        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGallery/Model/ResourceModel/GetAssetsBySearchCriteria.php b/app/code/Magento/MediaGallery/Model/ResourceModel/GetAssetsBySearchCriteria.php
index 15a543405deda..3f3aaac17947d 100644
--- a/app/code/Magento/MediaGallery/Model/ResourceModel/GetAssetsBySearchCriteria.php
+++ b/app/code/Magento/MediaGallery/Model/ResourceModel/GetAssetsBySearchCriteria.php
@@ -88,7 +88,10 @@ public function execute(SearchCriteriaInterface $searchCriteria): SearchResultIn
                 ->where($resultCondition, null, Select::TYPE_CONDITION);
 
             if ($searchCriteria->getPageSize() || $searchCriteria->getCurrentPage()) {
-                $select->limit($searchCriteria->getPageSize(), $searchCriteria->getCurrentPage());
+                $select->limit(
+                    $searchCriteria->getPageSize(),
+                    $searchCriteria->getCurrentPage() * $searchCriteria->getPageSize()
+                );
             }
         
             $data = $this->resourceConnection->getConnection()->fetchAll($select);

From 500acc33cdaca4ac3629e298ee23c73880f74eec Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Tue, 14 Jul 2020 10:51:20 +0100
Subject: [PATCH 0839/1718] Removing test prefix from data providers

---
 .../Model/ResourceModel/GetAssetIdsByContentFieldTest.php | 8 +++++---
 .../Model/ResourceModel/GetAssetIdsByContentFieldTest.php | 8 ++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

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 d776c681ae6e7..2194200181729 100644
--- a/dev/tests/integration/testsuite/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByContentFieldTest.php
+++ b/dev/tests/integration/testsuite/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByContentFieldTest.php
@@ -42,9 +42,10 @@ protected function setUp(): void
     /**
      * Test for getting asset id by category fields
      *
-     * @dataProvider testProvider
+     * @dataProvider dataProvider
      * @magentoDataFixture Magento/MediaGallery/_files/media_asset.php
      * @magentoDataFixture Magento/MediaContentCatalog/_files/category_with_asset.php
+     *
      * @param string $field
      * @param string $value
      * @param array $expectedAssetIds
@@ -61,9 +62,10 @@ public function testCategoryFields(string $field, string $value, array $expected
     /**
      * Test for getting asset id by product fields
      *
-     * @dataProvider testProvider
+     * @dataProvider dataProvider
      * @magentoDataFixture Magento/MediaGallery/_files/media_asset.php
      * @magentoDataFixture Magento/MediaContentCatalog/_files/product_with_asset.php
+     *
      * @param string $field
      * @param string $value
      * @param array $expectedAssetIds
@@ -82,7 +84,7 @@ public function testProductFields(string $field, string $value, array $expectedA
      *
      * @return array
      */
-    public static function testProvider(): array
+    public static function dataProvider(): array
     {
         return [
             [self::STATUS_FIELD, self::STATUS_ENABLED, [self::FIXTURE_ASSET_ID]],
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 f136a26580e96..bd6a08a7ab189 100644
--- a/dev/tests/integration/testsuite/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdsByContentFieldTest.php
+++ b/dev/tests/integration/testsuite/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdsByContentFieldTest.php
@@ -43,7 +43,7 @@ protected function setUp(): void
     /**
      * Test for getting asset id by block field
      *
-     * @dataProvider testBlockDataProvider
+     * @dataProvider blockDataProvider
      * @magentoDataFixture Magento/MediaGallery/_files/media_asset.php
      * @magentoDataFixture Magento/MediaContentCms/_files/block_with_asset.php
      *
@@ -63,7 +63,7 @@ public function testBlockFields(string $field, string $value, array $expectedAss
     /**
      * Test for getting asset id by page field
      *
-     * @dataProvider testPageDataProvider
+     * @dataProvider pageDataProvider
      * @magentoDataFixture Magento/MediaGallery/_files/media_asset.php
      * @magentoDataFixture Magento/MediaContentCms/_files/page_with_asset.php
      *
@@ -85,7 +85,7 @@ public function testPageFields(string $field, string $value, array $expectedAsse
      *
      * @return array
      */
-    public static function testBlockDataProvider(): array
+    public static function blockDataProvider(): array
     {
         return [
             [self::STATUS_FIELD, self::STATUS_ENABLED, [self::FIXTURE_ASSET_ID]],
@@ -99,7 +99,7 @@ public static function testBlockDataProvider(): array
      *
      * @return array
      */
-    public static function testPageDataProvider(): array
+    public static function pageDataProvider(): array
     {
         return [
             [self::STATUS_FIELD, self::STATUS_ENABLED, [self::FIXTURE_ASSET_ID]],

From 8c8912c4bf4df73f2c7aba4f71ef10bd7e69fa16 Mon Sep 17 00:00:00 2001
From: Nikita Shcherbatykh <nikita.shcherbatykh@transoftgroup.com>
Date: Tue, 14 Jul 2020 13:22:08 +0300
Subject: [PATCH 0840/1718] MC-33732: [Magento Cloud] - Create / update
 category using API returns : The "string" value's type is invalid. The
 "string[]" type was expected

---
 .../Category/Attribute/Backend/Sortby.php     |  6 ++++
 .../Catalog/Api/CategoryRepositoryTest.php    | 35 +++++++++++++++++--
 .../Catalog/ProductAttributeTypeTest.php      |  8 ++---
 3 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php
index 057933c55e6de..fc3c2e5428dd6 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php
@@ -102,6 +102,12 @@ public function beforeSave($object)
             }
             $object->setData($attributeCode, implode(',', $data) ?: null);
         }
+        if ($attributeCode == 'default_sort_by') {
+            $data = $object->getData($attributeCode);
+            $attributeValue = is_array($data) ? reset($data) :
+                (!empty($data)) ? $data : null;
+            $object->setData($attributeCode, $attributeValue);
+        }
         if (!$object->hasData($attributeCode)) {
             $object->setData($attributeCode, null);
         }
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 aba065a956d4f..21b93645fd15a 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryRepositoryTest.php
@@ -7,14 +7,14 @@
 namespace Magento\Catalog\Api;
 
 use Magento\Authorization\Model\Role;
+use Magento\Authorization\Model\RoleFactory;
 use Magento\Authorization\Model\Rules;
+use Magento\Authorization\Model\RulesFactory;
+use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
 use Magento\Integration\Api\AdminTokenServiceInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\WebapiAbstract;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
-use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
-use Magento\Authorization\Model\RoleFactory;
-use Magento\Authorization\Model\RulesFactory;
 
 /**
  * Test repository web API.
@@ -218,6 +218,35 @@ public function testUpdate()
         $this->deleteCategory($categoryId);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/category.php
+     */
+    public function testUpdateWithDefaultSortByAttribute()
+    {
+        $categoryId = 333;
+        $categoryData = [
+            'name' => 'Update Category Test With default_sort_by Attribute',
+            'is_active' => true,
+            "available_sort_by" => [],
+            'custom_attributes' => [
+                [
+                    'attribute_code' => 'default_sort_by',
+                    'value' => ["name"],
+                ],
+            ],
+        ];
+        $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);
+        $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());
+        $this->assertEquals("name", $category->getDefaultSortBy());
+        // delete category to clean up auto-generated url rewrites
+        $this->deleteCategory($categoryId);
+    }
+
     protected function getSimpleCategoryData($categoryData = [])
     {
         return [
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductAttributeTypeTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductAttributeTypeTest.php
index a34d5e21704af..b4b57b3817d3d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductAttributeTypeTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductAttributeTypeTest.php
@@ -52,7 +52,7 @@ public function testAttributeTypeResolver()
       attribute_type
       entity_type
       input_type
-    } 
+    }
   }
  }
 QUERY;
@@ -125,7 +125,7 @@ public function testComplexAttributeTypeResolver()
       attribute_type
       entity_type
       input_type
-    } 
+    }
   }
  }
 QUERY;
@@ -199,8 +199,8 @@ public function testUnDefinedAttributeType()
     {
       attribute_code
       attribute_type
-      entity_type      
-    } 
+      entity_type
+    }
   }
  }
 QUERY;

From fe4daee95bbd8f2c81727a030a9f2537dae9143d Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Tue, 14 Jul 2020 13:56:56 +0300
Subject: [PATCH 0841/1718] MC-34353: [Magento On-Premise] Question : Switch
 publisher from DB to Amqp

---
 .../MessageQueue/Config/Reader/Env.php        |  5 ++-
 .../Config/Reader/Env/Validator.php           | 33 +++++++++++----
 .../Config/Topology/ConfigReaderPlugin.php    |  3 +-
 .../Topology/ConfigReaderPluginTest.php       | 40 ++++++++++---------
 4 files changed, 54 insertions(+), 27 deletions(-)

diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Env.php b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Env.php
index 52e97e80e9dff..88df5546b28ff 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Env.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Env.php
@@ -54,8 +54,11 @@ public function read($scope = null)
     {
         $configData = $this->deploymentConfig->getConfigData(self::ENV_QUEUE) ?: [];
         if (isset($configData['config'])) {
-            $configData = $this->publisherConverter->convert($configData = $configData['config']);
+            $convertedConfigData = $this->publisherConverter->convert($configData['config']);
+            unset($configData['config']);
+            $configData = array_replace_recursive($configData, $convertedConfigData);
         }
+
         return $configData;
     }
 }
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Env/Validator.php b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Env/Validator.php
index 43f788343fa88..5ea8d4e080a8f 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Env/Validator.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Env/Validator.php
@@ -40,17 +40,14 @@ public function __construct(
      * @param array $configData
      * @param array|null $xmlConfigData
      * @return void
+     * @throws \LogicException
      */
     public function validate($configData, array $xmlConfigData = [])
     {
         if (isset($configData[QueueConfig::TOPICS])) {
             foreach ($configData[QueueConfig::TOPICS] as $topicName => $configDataItem) {
-                $schemaType = $configDataItem[QueueConfig::TOPIC_SCHEMA][QueueConfig::TOPIC_SCHEMA_VALUE];
-                $responseSchemaType =
-                    $configDataItem[QueueConfig::TOPIC_RESPONSE_SCHEMA][QueueConfig::TOPIC_SCHEMA_VALUE];
+                $this->validateTopic($topicName, $configDataItem);
                 $publisherName = $configDataItem[QueueConfig::TOPIC_PUBLISHER];
-                $this->validateSchemaType($schemaType, $topicName);
-                $this->validateResponseSchemaType($responseSchemaType, $topicName);
                 $this->validateTopicPublisher(
                     $this->getAvailablePublishers($configData, $xmlConfigData),
                     $publisherName,
@@ -81,6 +78,28 @@ public function validate($configData, array $xmlConfigData = [])
         }
     }
 
+    /**
+     * Validate topic config data
+     *
+     * @param string $topicName
+     * @param array $configDataItem
+     * @return void
+     * @throws \LogicException
+     */
+    private function validateTopic(string $topicName, array $configDataItem): void
+    {
+        if (isset($configDataItem[QueueConfig::TOPIC_SCHEMA])) {
+            $schemaType = $configDataItem[QueueConfig::TOPIC_SCHEMA][QueueConfig::TOPIC_SCHEMA_VALUE];
+            $this->validateSchemaType($schemaType, $topicName);
+        }
+        if (isset($configDataItem[QueueConfig::TOPIC_RESPONSE_SCHEMA])) {
+            $responseSchemaType = $configDataItem[QueueConfig::TOPIC_RESPONSE_SCHEMA][QueueConfig::TOPIC_SCHEMA_VALUE];
+            if (null !== $responseSchemaType) {
+                $this->validateResponseSchemaType($responseSchemaType, $topicName);
+            }
+        }
+    }
+
     /**
      * Return all available publishers from xml and env configs
      *
@@ -88,7 +107,7 @@ public function validate($configData, array $xmlConfigData = [])
      * @param array $xmlConfigData
      * @return array
      */
-    private function getAvailablePublishers($configData, $xmlConfigData)
+    private function getAvailablePublishers(array $configData, array $xmlConfigData): array
     {
         $envConfigPublishers = isset($configData[QueueConfig::PUBLISHERS]) ? $configData[QueueConfig::PUBLISHERS] : [];
         $xmlConfigPublishers = isset($xmlConfigData[QueueConfig::PUBLISHERS])
@@ -108,7 +127,7 @@ private function getAvailablePublishers($configData, $xmlConfigData)
      * @param array $xmlConfigData
      * @return array
      */
-    private function getAvailableTopics($configData, $xmlConfigData)
+    private function getAvailableTopics(array $configData, array $xmlConfigData): array
     {
         $envConfigTopics = isset($configData[QueueConfig::TOPICS]) ? $configData[QueueConfig::TOPICS] : [];
         $xmlConfigTopics = isset($xmlConfigData[QueueConfig::TOPICS]) ? $xmlConfigData[QueueConfig::TOPICS] : [];
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Topology/ConfigReaderPlugin.php b/lib/internal/Magento/Framework/MessageQueue/Config/Topology/ConfigReaderPlugin.php
index b5f8d179961c6..1e2cfa4cf658f 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Config/Topology/ConfigReaderPlugin.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Topology/ConfigReaderPlugin.php
@@ -47,6 +47,7 @@ public function afterRead(
         $topologyConfigDataFromQueueConfig = $this->getTopologyConfigDataFromQueueConfig();
         foreach ($topologyConfigDataFromQueueConfig as $exchangeKey => $exchangeConfig) {
             if (isset($result[$exchangeKey])) {
+                // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                 $result[$exchangeKey]['bindings'] = array_merge(
                     $exchangeConfig['bindings'],
                     $result[$exchangeKey]['bindings']
@@ -80,7 +81,7 @@ private function getTopologyConfigDataFromQueueConfig()
                 'arguments' => []
             ];
 
-            $exchangeName = $queueConfigBinding['exchange'];
+            $exchangeName = $this->queueConfig->getExchangeByTopic($topic);
             $connection = $this->queueConfig->getConnectionByTopic($topic);
             if (isset($result[$exchangeName . '--' . $connection])) {
                 $result[$exchangeName . '--' . $connection]['bindings'][$bindingId] = $bindingData;
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Topology/ConfigReaderPluginTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Topology/ConfigReaderPluginTest.php
index e04cbc5fcc3e2..9a52d55d771f3 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Topology/ConfigReaderPluginTest.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/Config/Topology/ConfigReaderPluginTest.php
@@ -8,9 +8,9 @@
 namespace Magento\Framework\MessageQueue\Test\Unit\Config\Topology;
 
 use Magento\Framework\MessageQueue\Config\Topology\ConfigReaderPlugin as TopologyConfigReaderPlugin;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\MessageQueue\ConfigInterface;
 use Magento\Framework\MessageQueue\Topology\Config\CompositeReader as TopologyConfigCompositeReader;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -36,14 +36,13 @@ class ConfigReaderPluginTest extends TestCase
      */
     private $subjectMock;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp(): void
     {
-        $this->configMock = $this->getMockBuilder(ConfigInterface::class)
-            ->getMockForAbstractClass();
-        $this->subjectMock = $this->getMockBuilder(TopologyConfigCompositeReader::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getBinds', 'getConnectionByTopic'])
-            ->getMock();
+        $this->configMock = $this->createMock(ConfigInterface::class);
+        $this->subjectMock = $this->createMock(TopologyConfigCompositeReader::class);
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->plugin = $this->objectManagerHelper->getObject(
@@ -52,7 +51,12 @@ protected function setUp(): void
         );
     }
 
-    public function testAfterRead()
+    /**
+     * Test get config after read
+     *
+     * @return void
+     */
+    public function testAfterRead(): void
     {
         $binding = [
             [
@@ -90,17 +94,13 @@ public function testAfterRead()
                 'name' => 'magento-db',
                 'type' => 'topic',
                 'connection' => 'db',
-                'bindings' => [
-                    'defaultBinding' => $dbDefaultBinding
-                ]
+                'bindings' => ['defaultBinding' => $dbDefaultBinding]
             ],
             'magento--amqp' => [
                 'name' => 'magento',
                 'type' => 'topic',
                 'connection' => 'amqp',
-                'bindings' => [
-                    'defaultBinding' => $amqpDefaultBinding
-                ]
+                'bindings' => ['defaultBinding' => $amqpDefaultBinding]
             ]
         ];
         $expectedResult = [
@@ -138,17 +138,21 @@ public function testAfterRead()
                 ]
             ]
         ];
-
-        $this->configMock->expects(static::atLeastOnce())
+        $this->configMock->expects($this->atLeastOnce())
             ->method('getBinds')
             ->willReturn($binding);
-        $this->configMock->expects(static::exactly(2))
+        $this->configMock->expects($this->exactly(2))
+            ->method('getExchangeByTopic')
+            ->willReturnMap([
+                ['catalog.product.removed', 'magento-db'],
+                ['inventory.counter.updated', 'magento']
+            ]);
+        $this->configMock->expects($this->exactly(2))
             ->method('getConnectionByTopic')
             ->willReturnMap([
                 ['catalog.product.removed', 'db'],
                 ['inventory.counter.updated', 'amqp']
             ]);
-
         $this->assertEquals($expectedResult, $this->plugin->afterRead($this->subjectMock, $result));
     }
 }

From c00d2fd2d752895ce693721c8af5d3282e169963 Mon Sep 17 00:00:00 2001
From: Stas Kozar <stas.kozar@transoftgroup.com>
Date: Tue, 14 Jul 2020 13:58:50 +0300
Subject: [PATCH 0842/1718] MC-35618: Unexpected results of editing a Grouped
 Product in the Wish List by a Customer

---
 .../Magento/Wishlist/Model/WishlistTest.php      | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php
index cab007aa6af9c..4f9109c69a844 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php
@@ -20,7 +20,7 @@
 /**
  * Tests for wish list model.
  *
- * @magentoDbIsolation enabled
+ * @magentoDbIsolation disabled
  * @magentoAppIsolation disabled
  */
 class WishlistTest extends TestCase
@@ -143,7 +143,12 @@ public function testAddConfigurableProductToWishList(): void
         $configurableOptions = $configurableProduct->getTypeInstance()->getConfigurableOptions($configurableProduct);
         $attributeId = key($configurableOptions);
         $option = reset($configurableOptions[$attributeId]);
-        $buyRequest = ['super_attribute' => [$attributeId => $option['value_index']]];
+        $buyRequest = [
+            'super_attribute' => [
+                $attributeId => $option['value_index']
+            ],
+            'action' => 'add',
+        ];
         $wishlist = $this->getWishlistByCustomerId->execute(1);
         $wishlist->addNewItem($configurableProduct, $buyRequest);
         $item = $this->getWishlistByCustomerId->getItemBySku(1, 'Configurable product');
@@ -166,7 +171,12 @@ public function testAddBundleProductToWishList(): void
         $option = reset($bundleOptions);
         $productLinks = $option->getProductLinks();
         $this->assertNotNull($productLinks[0]);
-        $buyRequest = ['bundle_option' => [$option->getOptionId() => $productLinks[0]->getId()]];
+        $buyRequest = [
+            'bundle_option' => [
+                $option->getOptionId() => $productLinks[0]->getId()
+            ],
+            'action' => 'add',
+        ];
         $skuWithChosenOption = implode('-', [$bundleProduct->getSku(), $productLinks[0]->getSku()]);
         $wishlist = $this->getWishlistByCustomerId->execute(1);
         $wishlist->addNewItem($bundleProduct, $buyRequest);

From af840bd8d80264511883a001c6e29a5db99f46c3 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Tue, 14 Jul 2020 14:07:51 +0300
Subject: [PATCH 0843/1718] MFTF tests updates.

---
 ...merAbsentOnCustomerGirdPageActionGroup.xml | 20 -------------------
 ...stomerAbsentOnOrderGridPageActionGroup.xml | 20 -------------------
 ...INotShownIfLoginAsCustomerDisabledTest.xml |  5 -----
 3 files changed, 45 deletions(-)
 delete mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerGirdPageActionGroup.xml
 delete mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderGridPageActionGroup.xml

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerGirdPageActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerGirdPageActionGroup.xml
deleted file mode 100644
index 071b4ed0e3c15..0000000000000
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerGirdPageActionGroup.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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="AdminLoginAsCustomerAbsentOnCustomerGridPageActionGroup">
-        <annotations>
-            <description>Verify Login As Customer Login action is absent on Customer grid page.</description>
-        </annotations>
-
-        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="gotoCustomerGridPage"/>
-        <waitForPageLoad stepKey="waitForCustomerGridPageLoad"/>
-        <dontSee userInput="Login As Customer" stepKey="dontSeeLoginAsCustomer"/>
-    </actionGroup>
-</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderGridPageActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderGridPageActionGroup.xml
deleted file mode 100644
index cde0c8c484fbc..0000000000000
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderGridPageActionGroup.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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="AdminLoginAsCustomerAbsentOnOrderGridPageActionGroup">
-        <annotations>
-            <description>Verify Login As Customer Login action is absent on Order grid page.</description>
-        </annotations>
-
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="gotoOrderGridPage"/>
-        <waitForPageLoad stepKey="waitForOrderGridPageLoad"/>
-        <dontSee userInput="Login As Customer" stepKey="dontSeeLoginAsCustomer"/>
-    </actionGroup>
-</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUINotShownIfLoginAsCustomerDisabledTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUINotShownIfLoginAsCustomerDisabledTest.xml
index 595b47cb56216..a39b66a67aae1 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUINotShownIfLoginAsCustomerDisabledTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUINotShownIfLoginAsCustomerDisabledTest.xml
@@ -33,8 +33,6 @@
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
-        <!-- Verify Login As Customer Login action is absent in Customer grid page -->
-        <actionGroup ref="AdminLoginAsCustomerAbsentOnCustomerGridPageActionGroup" stepKey="verifyLoginAsCustomerAbsentOnCustomerGridPage"/>
 
         <!-- Verify Login As Customer Login action is absent on Customer page -->
         <actionGroup ref="AdminLoginAsCustomerAbsentOnCustomerPageActionGroup" stepKey="verifyLoginAsCustomerAbsentOnCustomerPage">
@@ -48,9 +46,6 @@
         </actionGroup>
         <grabTextFrom selector="{{AdminOrderDetailsInformationSection.orderId}}" stepKey="grabOrderId"/>
 
-        <!-- Verify Login As Customer Login action is absent on Order grid page -->
-        <actionGroup ref="AdminLoginAsCustomerAbsentOnOrderGridPageActionGroup" stepKey="verifyLoginAsCustomerAbsentOnOrderGridPage"/>
-
         <!-- Verify Login As Customer Login action is absent on Order page -->
         <actionGroup ref="AdminLoginAsCustomerAbsentOnOrderPageActionGroup" stepKey="verifyLoginAsCustomerAbsentOnOrderPage">
             <argument name="orderId" value="{$grabOrderId}"/>

From e8a36e7a419d0e147264718e7b77fbbf0c4fdfe1 Mon Sep 17 00:00:00 2001
From: John Carlo Octabio <johncarlo@abovethefray.io>
Date: Tue, 14 Jul 2020 19:42:45 +0800
Subject: [PATCH 0844/1718] magento/magento2#108: Clear Shopping Cart -
 Refactor MFTF to include confirmation modal

---
 .../Checkout/Test/Mftf/Data/ConfigData.xml    |  4 +-
 ...outRequisitionConfirmationModalSection.xml | 14 ++++
 ...CartPageBasedOnStoresConfigurationTest.xml | 73 -----------------
 ...rShoppingCartWithConfirmationModalTest.xml | 81 +++++++++++++++++++
 4 files changed, 97 insertions(+), 75 deletions(-)
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutRequisitionConfirmationModalSection.xml
 delete mode 100644 app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckRenderingClearCartButtonOnTheCartPageBasedOnStoresConfigurationTest.xml
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/Test/StorefrontClearShoppingCartWithConfirmationModalTest.xml

diff --git a/app/code/Magento/Checkout/Test/Mftf/Data/ConfigData.xml b/app/code/Magento/Checkout/Test/Mftf/Data/ConfigData.xml
index b5f9f44b9d2dd..bf488617c7d1d 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Data/ConfigData.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Data/ConfigData.xml
@@ -101,12 +101,12 @@
         <data key="value">0</data>
     </entity>
 
-    <entity name="EnableClearShoppingCartButtonOnTheCartPage">
+    <entity name="EnableClearShoppingCart">
         <data key="path">checkout/cart/enable_clear_shopping_cart</data>
         <data key="label">Display clear shopping cart button on the cart page</data>
         <data key="value">1</data>
     </entity>
-    <entity name="DisableClearShoppingCartButtonOnTheCartPage">
+    <entity name="DisableClearShoppingCart">
         <data key="path">checkout/cart/enable_clear_shopping_cart</data>
         <data key="label">Do not display clear shopping cart button on the cart page</data>
         <data key="value">0</data>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutRequisitionConfirmationModalSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutRequisitionConfirmationModalSection.xml
new file mode 100644
index 0000000000000..4d814cfe4e04b
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutRequisitionConfirmationModalSection.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="StorefrontCheckoutRequisitionConfirmationModalSection">
+        <element name="confirm" type="button" selector=".modal-popup.confirm .action-accept"/>
+        <element name="cancel" type="button" selector=".modal-popup.confirm .action-dismiss"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckRenderingClearCartButtonOnTheCartPageBasedOnStoresConfigurationTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckRenderingClearCartButtonOnTheCartPageBasedOnStoresConfigurationTest.xml
deleted file mode 100644
index 97c8d33043d47..0000000000000
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckRenderingClearCartButtonOnTheCartPageBasedOnStoresConfigurationTest.xml
+++ /dev/null
@@ -1,73 +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="StorefrontCheckRenderingClearShoppingCartButtonOnTheCartPageBasedOnStoresConfigurationTest">
-        <annotations>
-            <features value="Checkout"/>
-            <stories value="Shopping Cart"/>
-            <title value="Check display render of clear shopping cart button on the cart page based on checkout cart stores configuration"/>
-            <description value="Check display render of clear shopping cart button on the cart page based on checkout cart stores configuration"/>
-            <severity value="MAJOR"/>
-            <group value="shoppingCart"/>
-        </annotations>
-
-        <before>
-            <!-- Create simple product -->
-            <createData entity="SimpleProduct2" stepKey="createProduct"/>
-        </before>
-        <after>
-            <!-- Delete simple product -->
-            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-
-            <!-- Disable rendering of clear shopping cart button on the cart page -->
-            <magentoCLI command="config:set {{DisableClearShoppingCartButtonOnTheCartPage.path}} {{DisableClearShoppingCartButtonOnTheCartPage.value}}" stepKey="disableClearShoppingCart"/>
-
-            <!-- Log out -->
-            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
-        </after>
-        <!-- Add product to cart -->
-        <actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="openProductPage">
-            <argument name="productUrlKey" value="$$createProduct.custom_attributes[url_key]$$"/>
-        </actionGroup>
-        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
-            <argument name="product" value="$$createProduct$$"/>
-            <argument name="productCount" value="1"/>
-        </actionGroup>
-
-        <!-- Navigate to cart page -->
-        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openShoppingCart"/>
-        <waitForPageLoad stepKey="waitForShoppingCartLoad" />
-
-        <!-- Assert that empty cart button is not rendered on the cart page -->
-        <dontSeeElement selector="{{CheckoutCartProductSection.emptyCartButton}}" stepKey="dontSeeClearShoppingCartButton"/>
-
-        <!-- Open new browser's window and login as Admin -->
-        <openNewTab stepKey="openNewTab"/>
-        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-
-        <!-- Navigate to checkout cart configuration --> 
-        <actionGroup ref="AdminOpenSalesCheckoutConfigPageActionGroup" stepKey="openCheckoutCartConfig">
-            <argument name="tabGroupAnchor" value="#checkout_cart-link"/>
-        </actionGroup>
-
-        <!-- Enable clear shopping cart button -->
-        <actionGroup ref="AdminCheckoutClearShoppingCartEnabledActionGroup" stepKey="enableClearShoppingCartButton"/>
-
-        <!-- Flush cache -->
-        <magentoCLI command="cache:flush" stepKey="cacheFlush"/>
-
-        <!-- Back to the Cart page and refresh the page -->
-        <switchToPreviousTab stepKey="switchToPreviousTab"/>
-        <reloadPage stepKey="refreshPage"/>
-        <waitForPageLoad stepKey="waitPageReload"/>
-
-        <!-- Assert that empty cart button is rendered on the cart page -->
-        <seeElement selector="{{CheckoutCartProductSection.emptyCartButton}}" stepKey="SeeClearShoppingCartButton"/>
-    </test>
-</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontClearShoppingCartWithConfirmationModalTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontClearShoppingCartWithConfirmationModalTest.xml
new file mode 100644
index 0000000000000..7976d6ae9cfa2
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontClearShoppingCartWithConfirmationModalTest.xml
@@ -0,0 +1,81 @@
+<?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="StorefrontClearShoppingCartWithConfirmationModalTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Shopping Cart"/>
+            <title value="Show clear shopping cart button with confirmation modal"/>
+            <description value="Show clear shopping cart button on shopping cart page based on checkout shopping cart stores configuration"/>
+            <group value="shoppingCart"/>
+        </annotations>
+        <before>
+            <!-- Create simple product and category -->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+
+            <!-- Disable clear shopping cart -->
+            <magentoCLI command="config:set {{DisableClearShoppingCart.path}} {{DisableClearShoppingCart.value}}" stepKey="disableClearShoppingCart"/>
+        </after>
+
+        <!-- Add the newly created product to the shopping cart -->
+        <actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addToCartFromStorefrontProductPage">
+            <argument name="product" value="$$createProduct$$"/>
+        </actionGroup>
+
+        <!-- Go to the shopping cart -->
+        <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="amOnPageShoppingCart"/>
+
+        <!-- Assert that clear shopping cart button is not rendered on the cart page -->
+        <dontSeeElement selector="{{CheckoutCartProductSection.emptyCartButton}}" stepKey="dontSeeClearShoppingCartButton"/>
+
+        <!-- Open new tab and login as Admin -->
+        <openNewTab stepKey="openNewTab"/>
+        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+
+        <!-- Navigate to sales checkout cart configuration -->
+        <actionGroup ref="AdminOpenSalesCheckoutConfigPageActionGroup" stepKey="openCheckoutCartConfig">
+            <argument name="tabGroupAnchor" value="#checkout_cart-link"/>
+        </actionGroup>
+
+        <!-- Enable clear shopping cart button -->
+        <actionGroup ref="AdminCheckoutClearShoppingCartEnabledActionGroup" stepKey="enableClearShoppingCartButton"/>
+
+        <!-- Flush cache -->
+        <magentoCLI command="cache:flush" stepKey="cacheFlush"/>
+
+        <!-- Back to the Cart page and refresh the page -->
+        <switchToPreviousTab stepKey="switchToPreviousTab"/>
+        <reloadPage stepKey="refreshPage"/>
+        <waitForPageLoad stepKey="waitForPageReload"/>
+
+        <!-- Assert that empty cart button is rendered on the cart page -->
+        <waitForElementVisible selector="{{CheckoutCartProductSection.emptyCartButton}}" stepKey="waitForClearShoppingCartButton"/>
+        <seeElement selector="{{CheckoutCartProductSection.emptyCartButton}}" stepKey="SeeClearShoppingCartButton"/>
+
+        <!-- Click clear shopping cart button -->
+        <click selector="{{CheckoutCartProductSection.emptyCartButton}}" stepKey="clickClearShoppingCartButton"/>
+
+        <!-- Show confirmation modal -->
+        <waitForElementVisible selector=".modal-popup.confirm" stepKey="waitForRequisitionConfirmationModal"/>
+        <seeElement selector=".modal-popup.confirm" stepKey="seeRequisitionConfirmationModal"/>
+
+        <!-- Confirm modal -->
+        <click selector="{{StorefrontCheckoutRequisitionConfirmationModalSection.confirm}}" stepKey="clickOkRequisitionConfirmationModal"/>
+        <waitForPageLoad stepKey="waitForEmptyShoppingCartPageLoad"/>
+        <waitForText userInput="You have no items in your shopping cart." stepKey="waitForEmptyShoppingCartText"/>
+        <see userInput="You have no items in your shopping cart." stepKey="seeEmptyCartMessage"/>
+    </test>
+</tests>

From d8eeb973631e8d76062bc89bb5329342f55f1683 Mon Sep 17 00:00:00 2001
From: John Carlo Octabio <johncarlo@abovethefray.io>
Date: Tue, 14 Jul 2020 19:51:08 +0800
Subject: [PATCH 0845/1718] magento/magento2#108: Clear Shopping Cart -
 Refactor MFTF to include confirmation modal

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

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontClearShoppingCartWithConfirmationModalTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontClearShoppingCartWithConfirmationModalTest.xml
index 7976d6ae9cfa2..c6c76e737633c 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontClearShoppingCartWithConfirmationModalTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontClearShoppingCartWithConfirmationModalTest.xml
@@ -56,7 +56,7 @@
         <!-- Flush cache -->
         <magentoCLI command="cache:flush" stepKey="cacheFlush"/>
 
-        <!-- Back to the Cart page and refresh the page -->
+        <!-- Switch back to the Cart page tab and refresh the page -->
         <switchToPreviousTab stepKey="switchToPreviousTab"/>
         <reloadPage stepKey="refreshPage"/>
         <waitForPageLoad stepKey="waitForPageReload"/>

From cd1397d6badbdcb2aa56bdc9429fa431cab0d2fc Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Tue, 14 Jul 2020 08:09:59 -0500
Subject: [PATCH 0846/1718] MC-32014: Remove google-shopping-ads module from
 core in 2.4.1

---
 .../Magento/Framework/Mview/OldViews.php      | 116 ++++++++++++++++++
 .../Setup/Console/Command/UpgradeCommand.php  |  97 +--------------
 setup/src/Magento/Setup/Model/Installer.php   |  15 +++
 3 files changed, 133 insertions(+), 95 deletions(-)
 create mode 100644 lib/internal/Magento/Framework/Mview/OldViews.php

diff --git a/lib/internal/Magento/Framework/Mview/OldViews.php b/lib/internal/Magento/Framework/Mview/OldViews.php
new file mode 100644
index 0000000000000..1ae5c65df52e3
--- /dev/null
+++ b/lib/internal/Magento/Framework/Mview/OldViews.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Mview;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Mview\View\CollectionFactory;
+use Magento\Framework\Mview\View\StateInterface;
+
+/**
+ * Class for removing old triggers that were created by mview
+ */
+class OldViews
+{
+    /**
+     * @var CollectionFactory
+     */
+    private $viewCollectionFactory;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resource;
+
+    /**
+     * @var ViewFactory
+     */
+    private $viewFactory;
+
+    /**
+     * @param CollectionFactory $viewCollectionFactory
+     * @param ResourceConnection $resource
+     * @param ViewFactory $viewFactory
+     */
+    public function __construct(
+        CollectionFactory $viewCollectionFactory,
+        ResourceConnection $resource,
+        ViewFactory $viewFactory
+    ) {
+        $this->viewCollectionFactory = $viewCollectionFactory;
+        $this->resource = $resource;
+        $this->viewFactory = $viewFactory;
+    }
+
+    /**
+     * Remove unused triggers
+     */
+    public function unsubscribe()
+    {
+        $viewCollection = $this->viewCollectionFactory->create();
+        $viewList = $viewCollection->getViewsByStateMode(StateInterface::MODE_ENABLED);
+
+        // Unsubscribe mviews
+        foreach ($viewList as $view) {
+            /** @var ViewInterface $view */
+            $view->unsubscribe();
+        }
+
+        // Unsubscribe old views that still have triggers in db
+        $triggerTableNames = $this->getTriggerTableNames();
+        foreach ($triggerTableNames as $tableName) {
+            $this->createViewByTableName($tableName)->unsubscribe();
+        }
+
+        // Re-subscribe mviews
+        foreach ($viewList as $view) {
+            /** @var ViewInterface $view */
+            $view->subscribe();
+        }
+    }
+
+    /**
+      * Retrieve trigger table name list
+      *
+      * @return array
+      */
+    private function getTriggerTableNames(): array
+    {
+        $connection = $this->resource->getConnection();
+        $dbName = $this->resource->getSchemaName(ResourceConnection::DEFAULT_CONNECTION);
+        $sql = $connection->select()
+            ->from(
+                ['information_schema.TRIGGERS'],
+                ['EVENT_OBJECT_TABLE']
+            )
+            ->distinct(true)
+            ->where('TRIGGER_SCHEMA = ?', $dbName);
+        return $connection->fetchCol($sql);
+    }
+
+    /**
+     * Create view by db table name
+     *
+     * @param string $tableName
+     * @return ViewInterface
+     */
+    private function createViewByTableName(string $tableName): ViewInterface
+    {
+        $subscription[$tableName] = [
+            'name' => $tableName,
+            'column' => '',
+            'subscription_model' => null
+        ];
+        $data['data'] = [
+            'id' => '0',
+            'subscriptions' => $subscription,
+        ];
+
+        $view = $this->viewFactory->create($data);
+        $view->getState()->setMode(StateInterface::MODE_ENABLED);
+
+        return $view;
+    }
+}
diff --git a/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php b/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
index 8e6879454db27..af25466fa141d 100644
--- a/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
@@ -8,15 +8,9 @@
 use Magento\Deploy\Console\Command\App\ConfigImportCommand;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\App\State as AppState;
 use Magento\Framework\Console\Cli;
 use Magento\Framework\Exception\RuntimeException;
-use Magento\Framework\Mview\View\CollectionFactory as ViewCollectionFactory;
-use Magento\Framework\Mview\View\StateInterface;
-use Magento\Framework\Mview\View\SubscriptionFactory;
-use Magento\Framework\Mview\View\SubscriptionInterface;
-use Magento\Framework\Mview\ViewInterface;
 use Magento\Framework\Setup\ConsoleLogger;
 use Magento\Framework\Setup\Declaration\Schema\DryRunLogger;
 use Magento\Framework\Setup\Declaration\Schema\OperationsExecutor;
@@ -60,48 +54,22 @@ class UpgradeCommand extends AbstractSetupCommand
      */
     private $searchConfigFactory;
 
-    /**
-     * @var ViewCollectionFactory
-     */
-    private $viewCollectionFactory;
-
-    /**
-     * @var SubscriptionFactory
-     */
-    private $subscriptionFactory;
-
-    /**
-     * @var ResourceConnection
-     */
-    private $resource;
-
     /**
      * @param InstallerFactory $installerFactory
      * @param SearchConfigFactory $searchConfigFactory
      * @param DeploymentConfig $deploymentConfig
      * @param AppState|null $appState
-     * @param ViewCollectionFactory|null $viewCollectionFactory
-     * @param SubscriptionFactory|null $subscriptionFactory
-     * @param ResourceConnection|null $resource
      */
     public function __construct(
         InstallerFactory $installerFactory,
         SearchConfigFactory $searchConfigFactory,
         DeploymentConfig $deploymentConfig = null,
-        AppState $appState = null,
-        ViewCollectionFactory $viewCollectionFactory = null,
-        SubscriptionFactory $subscriptionFactory = null,
-        ResourceConnection $resource = null
+        AppState $appState = null
     ) {
         $this->installerFactory = $installerFactory;
         $this->searchConfigFactory = $searchConfigFactory;
         $this->deploymentConfig = $deploymentConfig ?: ObjectManager::getInstance()->get(DeploymentConfig::class);
         $this->appState = $appState ?: ObjectManager::getInstance()->get(AppState::class);
-        $this->viewCollectionFactory = $viewCollectionFactory
-            ?: ObjectManager::getInstance()->get(ViewCollectionFactory::class);
-        $this->subscriptionFactory = $subscriptionFactory
-            ?: ObjectManager::getInstance()->get(SubscriptionFactory::class);
-        $this->resource = $resource ?: ObjectManager::getInstance()->get(ResourceConnection::class);
         parent::__construct();
     }
 
@@ -164,7 +132,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $installer->updateModulesSequence($keepGenerated);
             $searchConfig = $this->searchConfigFactory->create();
             $searchConfig->validateSearchEngine();
-            $this->removeUnusedTriggers();
+            $installer->removeUnusedTriggers();
             $installer->installSchema($request);
             $installer->installDataFixtures($request);
 
@@ -192,65 +160,4 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         return Cli::RETURN_SUCCESS;
     }
-
-    /**
-     * Remove unused triggers
-     */
-    private function removeUnusedTriggers()
-    {
-        $viewCollection = $this->viewCollectionFactory->create();
-        $viewList = $viewCollection->getViewsByStateMode(StateInterface::MODE_ENABLED);
-
-        // Unsubscribe mviews
-        foreach ($viewList as $view) {
-            /** @var ViewInterface $view */
-            $view->unsubscribe();
-        }
-
-        // Remove extra triggers that have correct naming structure
-        $triggers = $this->getTriggers();
-        foreach ($triggers as $trigger) {
-            $this->initSubscriptionInstance($trigger['Table'])->remove();
-        }
-
-        // Subscribe mviews
-        foreach ($viewList as $view) {
-            /** @var ViewInterface $view */
-            $view->subscribe();
-        }
-    }
-
-    /**
-     * Retrieve triggers list
-     *
-     * @return array
-     */
-    private function getTriggers(): array
-    {
-        $connection = $this->resource->getConnection();
-        $result = $connection->query('SHOW TRIGGERS');
-        return $result->fetchAll();
-    }
-
-    /**
-     * Initializes subscription instance
-     *
-     * @param string $tablename
-     * @return SubscriptionInterface
-     */
-    private function initSubscriptionInstance(string $tablename): SubscriptionInterface
-    {
-        /** @var ViewInterface $view */
-        $view = ObjectManager::getInstance()->create(ViewInterface::class);
-        $view->setId('0');
-
-        return $this->subscriptionFactory->create(
-            [
-                'view' => $view,
-                'tableName' => $tablename,
-                'columnName' => '',
-                'subscriptionModel' => SubscriptionFactory::INSTANCE_NAME,
-            ]
-        );
-    }
 }
diff --git a/setup/src/Magento/Setup/Model/Installer.php b/setup/src/Magento/Setup/Model/Installer.php
index fe1cac3f076fd..13a9eeaafd9ef 100644
--- a/setup/src/Magento/Setup/Model/Installer.php
+++ b/setup/src/Magento/Setup/Model/Installer.php
@@ -25,6 +25,7 @@
 use Magento\Framework\Model\ResourceModel\Db\Context;
 use Magento\Framework\Module\ModuleList\Loader as ModuleLoader;
 use Magento\Framework\Module\ModuleListInterface;
+use Magento\Framework\Mview\OldViews;
 use Magento\Framework\Setup\Declaration\Schema\DryRunLogger;
 use Magento\Framework\Setup\FilePermissions;
 use Magento\Framework\Setup\InstallDataInterface;
@@ -247,6 +248,11 @@ class Installer
      */
     private $patchApplierFactory;
 
+    /**
+     * @var OldViews
+     */
+    private $oldViews;
+
     /**
      * Constructor
      *
@@ -320,6 +326,7 @@ public function __construct(
         $this->componentRegistrar = $componentRegistrar;
         $this->phpReadinessCheck = $phpReadinessCheck;
         $this->schemaPersistor = $this->objectManagerProvider->get()->get(SchemaPersistor::class);
+        $this->oldViews = $this->objectManagerProvider->get()->get(OldViews::class);
     }
 
     /**
@@ -1646,4 +1653,12 @@ private function updateColumnType(
             );
         }
     }
+
+    /**
+     * Remove unused triggers from db
+     */
+    public function removeUnusedTriggers(): void
+    {
+        $this->oldViews->unsubscribe();
+    }
 }

From acf425b4171db3d9b153b153eb7e17f35af719ce Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Tue, 14 Jul 2020 14:14:51 +0100
Subject: [PATCH 0847/1718] Fixing EE bugs

---
 .../GetAssetIdsByEavContentField.php          | 19 +++-
 .../Magento/MediaContentCatalog/etc/di.xml    |  2 +
 .../ResourceModel/GetAssetIdsByBlockStore.php | 94 ++++++++++++++++++
 .../ResourceModel/GetAssetIdsByPageStore.php  | 95 +++++++++++++++++++
 app/code/Magento/MediaContentCms/etc/di.xml   | 16 ----
 5 files changed, 206 insertions(+), 20 deletions(-)
 create mode 100644 app/code/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdsByBlockStore.php
 create mode 100644 app/code/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdsByPageStore.php

diff --git a/app/code/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByEavContentField.php b/app/code/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByEavContentField.php
index 1be610e1fea77..00c6e2f180a6f 100644
--- a/app/code/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByEavContentField.php
+++ b/app/code/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByEavContentField.php
@@ -38,6 +38,11 @@ class GetAssetIdsByEavContentField implements GetAssetIdsByContentFieldInterface
      */
     private $entityType;
 
+    /**
+     * @var string
+     */
+    private $entityTable;
+
     /**
      * @var array
      */
@@ -50,6 +55,7 @@ class GetAssetIdsByEavContentField implements GetAssetIdsByContentFieldInterface
      * @param Config $config
      * @param string $attributeCode
      * @param string $entityType
+     * @param string $entityTable
      * @param array $valueMap
      */
     public function __construct(
@@ -57,12 +63,14 @@ public function __construct(
         Config $config,
         string $attributeCode,
         string $entityType,
+        string $entityTable,
         array $valueMap = []
     ) {
         $this->connection = $resource;
         $this->config = $config;
         $this->attributeCode = $attributeCode;
         $this->entityType = $entityType;
+        $this->entityTable = $entityTable;
         $this->valueMap = $valueMap;
     }
 
@@ -80,10 +88,13 @@ public function execute(string $value): array
             'entity_type = ?',
             $this->entityType
         )->joinInner(
-            ['entity_eav_type' => $attribute->getBackendTable()],
-            'asset_content_table.entity_id = entity_eav_type.' . $attribute->getEntityIdField() .
-            ' AND entity_eav_type.attribute_id = ' .
-            $attribute->getAttributeId(),
+            ['entity_table' => $this->connection->getTableName($this->entityTable)],
+            'asset_content_table.entity_id = entity_table.entity_id',
+            []
+        )->joinInner(
+            ['entity_eav_type' => $this->connection->getTableName($attribute->getBackendTable())],
+            'entity_table.' . $attribute->getEntityIdField() . ' = entity_eav_type.' . $attribute->getEntityIdField() .
+            ' AND entity_eav_type.attribute_id = ' . $attribute->getAttributeId(),
             []
         )->where(
             'entity_eav_type.value = ?',
diff --git a/app/code/Magento/MediaContentCatalog/etc/di.xml b/app/code/Magento/MediaContentCatalog/etc/di.xml
index f8d03a1cb2e56..8c606a3cae49f 100644
--- a/app/code/Magento/MediaContentCatalog/etc/di.xml
+++ b/app/code/Magento/MediaContentCatalog/etc/di.xml
@@ -50,6 +50,7 @@
         <arguments>
             <argument name="attributeCode" xsi:type="string">status</argument>
             <argument name="entityType" xsi:type="string">catalog_product</argument>
+            <argument name="entityTable" xsi:type="string">catalog_product_entity</argument>
             <argument name="valueMap" xsi:type="array">
                 <item name="1" xsi:type="string">1</item>
                 <item name="0" xsi:type="string">2</item>
@@ -60,6 +61,7 @@
         <arguments>
             <argument name="attributeCode" xsi:type="string">is_active</argument>
             <argument name="entityType" xsi:type="string">catalog_category</argument>
+            <argument name="entityTable" xsi:type="string">catalog_category_entity</argument>
         </arguments>
     </virtualType>
     <type name="Magento\MediaContentApi\Model\Composite\GetAssetIdsByContentField">
diff --git a/app/code/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdsByBlockStore.php b/app/code/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdsByBlockStore.php
new file mode 100644
index 0000000000000..675f26c8d6504
--- /dev/null
+++ b/app/code/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdsByBlockStore.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentCms\Model\ResourceModel;
+
+use Magento\Cms\Api\BlockRepositoryInterface;
+use Magento\Cms\Api\Data\BlockInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\MediaContentApi\Model\GetAssetIdsByContentFieldInterface;
+
+/**
+ * Class responsible to return Asset id by content field
+ */
+class GetAssetIdsByBlockStore implements GetAssetIdsByContentFieldInterface
+{
+    private const TABLE_CONTENT_ASSET = 'media_content_asset';
+    private const ENTITY_TYPE = 'cms_block';
+    private const STORE_FIELD = 'store_id';
+
+    /**
+     * @var ResourceConnection
+     */
+    private $connection;
+
+    /**
+     * @var BlockRepositoryInterface
+     */
+    private $blockRepository;
+
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * GetAssetIdsByContentField constructor.
+     *
+     * @param ResourceConnection $resource
+     * @param BlockRepositoryInterface $blockRepository
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     */
+    public function __construct(
+        ResourceConnection $resource,
+        BlockRepositoryInterface $blockRepository,
+        SearchCriteriaBuilder $searchCriteriaBuilder
+    ) {
+        $this->connection = $resource;
+        $this->blockRepository = $blockRepository;
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function execute(string $value): array
+    {
+        $sql = $this->connection->getConnection()->select()->from(
+            ['asset_content_table' => $this->connection->getTableName(self::TABLE_CONTENT_ASSET)],
+            ['asset_id']
+        )->where(
+            'entity_type = ?',
+            self::ENTITY_TYPE
+        )->where(
+            'entity_id IN (?)',
+            $this->getBlockIdsByStore((int) $value)
+        );
+
+        return $this->connection->getConnection()->fetchCol($sql);
+    }
+
+    /**
+     * @param int $storeId
+     * @return array
+     * @throws LocalizedException
+     */
+    private function getBlockIdsByStore(int $storeId): array
+    {
+        $searchCriteria = $this->searchCriteriaBuilder
+            ->addFilter(self::STORE_FIELD, $storeId)
+            ->create();
+
+        $searchResult = $this->blockRepository->getList($searchCriteria);
+
+        return array_map(function (BlockInterface $block) {
+            return $block->getId();
+        }, $searchResult->getItems());
+    }
+}
diff --git a/app/code/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdsByPageStore.php b/app/code/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdsByPageStore.php
new file mode 100644
index 0000000000000..2eae127ab33a2
--- /dev/null
+++ b/app/code/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdsByPageStore.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentCms\Model\ResourceModel;
+
+use Magento\Cms\Api\Data\PageInterface;
+use Magento\Cms\Api\PageRepositoryInterface;
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\MediaContentApi\Model\GetAssetIdsByContentFieldInterface;
+
+/**
+ * Class responsible to return Asset id by content field
+ */
+class GetAssetIdsByPageStore implements GetAssetIdsByContentFieldInterface
+{
+    private const TABLE_CONTENT_ASSET = 'media_content_asset';
+    private const ENTITY_TYPE = 'cms_page';
+    private const STORE_FIELD = 'store_id';
+
+    /**
+     * @var ResourceConnection
+     */
+    private $connection;
+
+    /**
+     * @var PageRepositoryInterface
+     */
+    private $pageRepository;
+
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * GetAssetIdsByContentField constructor.
+     *
+     * @param ResourceConnection $resource
+     * @param PageRepositoryInterface $pageRepository
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     */
+    public function __construct(
+        ResourceConnection $resource,
+        PageRepositoryInterface $pageRepository,
+        SearchCriteriaBuilder $searchCriteriaBuilder
+    ) {
+        $this->connection = $resource;
+        $this->pageRepository = $pageRepository;
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function execute(string $value): array
+    {
+        $sql = $this->connection->getConnection()->select()->from(
+            ['asset_content_table' => $this->connection->getTableName(self::TABLE_CONTENT_ASSET)],
+            ['asset_id']
+        )->where(
+            'entity_type = ?',
+            self::ENTITY_TYPE
+        )->where(
+            'entity_id IN (?)',
+            $this->getPageIdsByStore((int) $value)
+        );
+
+        return $this->connection->getConnection()->fetchCol($sql);
+    }
+
+    /**
+     * @param int $storeId
+     * @return array
+     * @throws LocalizedException
+     */
+    private function getPageIdsByStore(int $storeId): array
+    {
+        $searchCriteria = $this->searchCriteriaBuilder
+            ->addFilter(self::STORE_FIELD, $storeId)
+            ->create();
+
+        $searchResult = $this->pageRepository->getList($searchCriteria);
+
+        return array_map(function (PageInterface $page) {
+            return $page->getId();
+        }, $searchResult->getItems());
+    }
+}
diff --git a/app/code/Magento/MediaContentCms/etc/di.xml b/app/code/Magento/MediaContentCms/etc/di.xml
index 551d24e02e9b2..c157fbf22b7ad 100644
--- a/app/code/Magento/MediaContentCms/etc/di.xml
+++ b/app/code/Magento/MediaContentCms/etc/di.xml
@@ -34,22 +34,6 @@
             </argument>
         </arguments>
     </type>
-    <virtualType name="Magento\MediaContentCms\Model\ResourceModel\GetAssetIdsByBlockStore" type="Magento\MediaContentCms\Model\ResourceModel\GetAssetIdsByContentField">
-        <arguments>
-            <argument name="entityType" xsi:type="string">cms_block</argument>
-            <argument name="fieldTable" xsi:type="string">cms_block_store</argument>
-            <argument name="idColumn" xsi:type="string">block_id</argument>
-            <argument name="fieldColumn" xsi:type="string">store_id</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="Magento\MediaContentCms\Model\ResourceModel\GetAssetIdsByPageStore" type="Magento\MediaContentCms\Model\ResourceModel\GetAssetIdsByContentField">
-        <arguments>
-            <argument name="entityType" xsi:type="string">cms_page</argument>
-            <argument name="fieldTable" xsi:type="string">cms_page_store</argument>
-            <argument name="idColumn" xsi:type="string">page_id</argument>
-            <argument name="fieldColumn" xsi:type="string">store_id</argument>
-        </arguments>
-    </virtualType>
     <virtualType name="Magento\MediaContentCms\Model\ResourceModel\GetAssetIdsByPageStatus" type="Magento\MediaContentCms\Model\ResourceModel\GetAssetIdsByContentField">
         <arguments>
             <argument name="entityType" xsi:type="string">cms_page</argument>

From eff94882403b548c32ae3d83e1347cd8a7b066c3 Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Tue, 14 Jul 2020 16:19:11 +0300
Subject: [PATCH 0848/1718] Added testCaseId to MFTF test.

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

diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithZeroPriceCheckOrderStatusTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithZeroPriceCheckOrderStatusTest.xml
index ba4944970e3fb..6e715c1fdf483 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithZeroPriceCheckOrderStatusTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithZeroPriceCheckOrderStatusTest.xml
@@ -13,6 +13,7 @@
             <title value="Create Credit Memo with zero total."/>
             <description value="Assert order status after create CreditMemo with zero total."/>
             <group value="sales"/>
+            <testCaseId value="MC-35848"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>

From 48748ce3a945a45a5a3a99762338becc166768d2 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Tue, 14 Jul 2020 08:23:57 -0500
Subject: [PATCH 0849/1718] MC-32014: Remove google-shopping-ads module from
 core in 2.4.1

---
 lib/internal/Magento/Framework/Mview/OldViews.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/Mview/OldViews.php b/lib/internal/Magento/Framework/Mview/OldViews.php
index 1ae5c65df52e3..8b78eda2fd774 100644
--- a/lib/internal/Magento/Framework/Mview/OldViews.php
+++ b/lib/internal/Magento/Framework/Mview/OldViews.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\Mview;
 
 use Magento\Framework\App\ResourceConnection;
@@ -45,9 +47,9 @@ public function __construct(
     }
 
     /**
-     * Remove unused triggers
+     * Unsubscribe old views by existing triggers
      */
-    public function unsubscribe()
+    public function unsubscribe(): void
     {
         $viewCollection = $this->viewCollectionFactory->create();
         $viewList = $viewCollection->getViewsByStateMode(StateInterface::MODE_ENABLED);

From e72936fd859ec8300e94dd56cecfbcbf707a0293 Mon Sep 17 00:00:00 2001
From: Anusha Vattam <avattam@adobe.com>
Date: Tue, 14 Jul 2020 08:33:25 -0500
Subject: [PATCH 0850/1718] MC-35653:MyAccount :: Order Details :: Payments
 Methods, shipping address, billing address by Order Number

- Added code changes for addresses and payment method
---
 .../Model/Resolver/CustomerOrders.php         | 45 +++++++++--
 .../SalesItem/ExtractOrderAddressDetails.php  | 78 +++++++++++++++++++
 .../SalesItem/ExtractOrderPaymentDetails.php  | 50 ++++++++++++
 3 files changed, 167 insertions(+), 6 deletions(-)
 create mode 100644 app/code/Magento/SalesGraphQl/Model/SalesItem/ExtractOrderAddressDetails.php
 create mode 100644 app/code/Magento/SalesGraphQl/Model/SalesItem/ExtractOrderPaymentDetails.php

diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders.php b/app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders.php
index 30fb42a1180fc..75019710bf302 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders.php
@@ -9,7 +9,6 @@
 
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Exception\InputException;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
@@ -18,6 +17,8 @@
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\SalesGraphQl\Model\Resolver\CustomerOrders\Query\OrderFilter;
+use Magento\SalesGraphQl\Model\SalesItem\ExtractOrderAddressDetails;
+use Magento\SalesGraphQl\Model\SalesItem\ExtractOrderPaymentDetails;
 use Magento\Store\Api\Data\StoreInterface;
 
 /**
@@ -30,6 +31,16 @@ class CustomerOrders implements ResolverInterface
      */
     private $searchCriteriaBuilder;
 
+    /**
+     * @var ExtractOrderAddressDetails
+     */
+    private $extractOrderAddressDetails;
+
+    /**
+     * @var ExtractOrderPaymentDetails
+     */
+    private $extractOrderPaymentDetails;
+
     /**
      * @var OrderRepositoryInterface
      */
@@ -42,15 +53,21 @@ class CustomerOrders implements ResolverInterface
 
     /**
      * @param OrderRepositoryInterface $orderRepository
+     * @param ExtractOrderAddressDetails $extractOrderAddressDetails
+     * @param ExtractOrderPaymentDetails $extractOrderPaymentDetails
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param OrderFilter $orderFilter
      */
     public function __construct(
         OrderRepositoryInterface $orderRepository,
+        ExtractOrderAddressDetails $extractOrderAddressDetails,
+        ExtractOrderPaymentDetails $extractOrderPaymentDetails,
         SearchCriteriaBuilder $searchCriteriaBuilder,
         OrderFilter $orderFilter
     ) {
         $this->orderRepository = $orderRepository;
+        $this->extractOrderAddressDetails = $extractOrderAddressDetails;
+        $this->extractOrderPaymentDetails = $extractOrderPaymentDetails;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
         $this->orderFilter = $orderFilter;
     }
@@ -77,9 +94,19 @@ public function resolve(
         $userId = $context->getUserId();
         /** @var StoreInterface $store */
         $store = $context->getExtensionAttributes()->getStore();
+        $customerModel = $value['model'];
+        $address = $customerModel->getAddresses();
+        $addressArrayData = [];
+        foreach ($address as $key => $addressArray) {
+            $addressArrayData[$key] = $addressArray;
+            foreach ($addressArray as $addressData) {
+                $shipping = $addressData->isDefaultshipping();
+                $billing = $addressData->isDefaultBilling();
+            }
+        }
 
         try {
-            $searchResult = $this->getSearchResult($args, (int) $userId, (int)$store->getId());
+            $searchResult = $this->getSearchResult($args, (int)$userId, (int)$store->getId());
             $maxPages = (int)ceil($searchResult->getTotalCount() / $searchResult->getPageSize());
         } catch (InputException $e) {
             throw new GraphQlInputException(__($e->getMessage()));
@@ -87,9 +114,9 @@ public function resolve(
 
         return [
             'total_count' => $searchResult->getTotalCount(),
-            'items' => $this->formatOrdersArray($searchResult->getItems()),
-            'page_info'   => [
-                'page_size'    => $searchResult->getPageSize(),
+            'items' => $this->formatOrdersArray($searchResult->getItems(), $address),
+            'page_info' => [
+                'page_size' => $searchResult->getPageSize(),
                 'current_page' => $searchResult->getCurPage(),
                 'total_pages' => $maxPages,
             ]
@@ -100,11 +127,13 @@ public function resolve(
      * Format order models for graphql schema
      *
      * @param OrderInterface[] $orderModels
+     * @param array $address
      * @return array
      */
-    private function formatOrdersArray(array $orderModels)
+    private function formatOrdersArray(array $orderModels, array $address)
     {
         $ordersArray = [];
+
         foreach ($orderModels as $orderModel) {
             $ordersArray[] = [
                 'created_at' => $orderModel->getCreatedAt(),
@@ -116,6 +145,9 @@ private function formatOrdersArray(array $orderModels)
                 'order_number' => $orderModel->getIncrementId(),
                 'status' => $orderModel->getStatusLabel(),
                 'shipping_method' => $orderModel->getShippingDescription(),
+                'billing_address' => $this->extractOrderAddressDetails->getBillingAddressDetails($orderModel),
+                'shipping_address' => $this->extractOrderAddressDetails->getShippingAddressDetails($orderModel),
+                'payment_methods' => $this->extractOrderPaymentDetails->getOrderPaymentMethodDetails($orderModel),
                 'model' => $orderModel,
             ];
         }
@@ -144,3 +176,4 @@ private function getSearchResult(array $args, int $userId, int $storeId)
         return $this->orderRepository->getList($this->searchCriteriaBuilder->create());
     }
 }
+
diff --git a/app/code/Magento/SalesGraphQl/Model/SalesItem/ExtractOrderAddressDetails.php b/app/code/Magento/SalesGraphQl/Model/SalesItem/ExtractOrderAddressDetails.php
new file mode 100644
index 0000000000000..ceffd46990299
--- /dev/null
+++ b/app/code/Magento/SalesGraphQl/Model/SalesItem/ExtractOrderAddressDetails.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesGraphQl\Model\SalesItem;
+
+use Magento\Sales\Api\Data\OrderInterface;
+
+/**
+ * Class to extract the order address details
+ */
+class ExtractOrderAddressDetails
+{
+    /**
+     * Get Shipping address details
+     *
+     * @param OrderInterface $order
+     * @return array
+     */
+    public function getShippingAddressDetails(
+        OrderInterface $order
+    ): array {
+        $shippingAddressFields = [];
+        $shippingAddressData = [];
+        $orderAddresses = $order->getAddresses();
+        foreach ($orderAddresses as $orderAddress) {
+            $addressType = $orderAddress->getDataByKey("address_type");
+            if ($addressType === 'shipping') {
+                $shippingAddressData = $orderAddress->getData();
+                $shippingAddressFields = [
+                    'id' => $orderAddress->getDataByKey('entity_id'),
+                    'street' => $orderAddress->getDataByKey('street'),
+                    'country_code' => $orderAddress->getDataByKey('country_id'),
+                    'region' => [
+                        'region' => $orderAddress->getDataByKey('region'),
+                        'region_id' => $orderAddress->getDataByKey('region_id'),
+                        'region_code' => $orderAddress->getDataByKey('region')
+                    ],
+                ];
+            }
+        }
+        return array_merge($shippingAddressData, $shippingAddressFields);
+    }
+
+    /**
+     * Get Billing address details
+     *
+     * @param OrderInterface $order
+     * @return array
+     */
+    public function getBillingAddressDetails(
+        OrderInterface $order
+    ): array {
+        $billingAddressFields = [];
+        $billingAddressFieldsData = [];
+        $orderAddresses = $order->getAddresses();
+        foreach ($orderAddresses as $orderAddress) {
+            $addressType = $orderAddress->getDataByKey("address_type");
+            if ($addressType === 'billing') {
+                $billingAddressFieldsData = $orderAddress->getData();
+                $billingAddressFields = [
+                    'id' => $orderAddress->getDataByKey('entity_id'),
+                    'street' => $orderAddress->getDataByKey('street'),
+                    'country_code' => $orderAddress->getDataByKey('country_id'),
+                    'region' => [
+                        'region' => $orderAddress->getDataByKey('region'),
+                        'region_id' => $orderAddress->getDataByKey('region_id'),
+                        'region_code' => $orderAddress->getDataByKey('region')
+                    ],
+                ];
+            }
+        }
+        return array_merge($billingAddressFieldsData, $billingAddressFields);
+    }
+}
diff --git a/app/code/Magento/SalesGraphQl/Model/SalesItem/ExtractOrderPaymentDetails.php b/app/code/Magento/SalesGraphQl/Model/SalesItem/ExtractOrderPaymentDetails.php
new file mode 100644
index 0000000000000..c5815eb2d7d9d
--- /dev/null
+++ b/app/code/Magento/SalesGraphQl/Model/SalesItem/ExtractOrderPaymentDetails.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesGraphQl\Model\SalesItem;
+
+use Magento\Sales\Api\Data\OrderInterface;
+
+/**
+ * Class to extract the order payment details
+ */
+class ExtractOrderPaymentDetails
+{
+    /**
+     * @param OrderInterface $orderModel
+     * @return array
+     */
+    public function getOrderPaymentMethodDetails(OrderInterface $orderModel): array
+    {
+        $orderPayment = $orderModel->getPayment();
+        $additionalInformationCcType = $orderPayment->getCcType();
+        $additionalInformationCcNumber = $orderPayment->getCcLast4();
+        if ($orderPayment->getMethod() === 'checkmo' || $orderPayment->getMethod() === 'free') {
+            $additionalData = [];
+        } else {
+            $additionalData = [
+                [
+                    'name' => 'Credit Card Type',
+                    'value' => $additionalInformationCcType ?? null
+                ],
+                [
+                    'name' => 'Credit Card Number',
+                    'value' => $additionalInformationCcNumber ?? null
+                ]
+            ];
+        }
+
+        return [
+            [
+                'name' => $orderPayment->getAdditionalInformation()['method_title'],
+                'type' => $orderPayment->getMethod(),
+                'additional_data' => $additionalData
+            ]
+        ];
+    }
+}
+

From a1a494df195caec4acbbdfa3921d6f95b444f143 Mon Sep 17 00:00:00 2001
From: Nikita Shcherbatykh <nikita.shcherbatykh@transoftgroup.com>
Date: Tue, 14 Jul 2020 16:45:03 +0300
Subject: [PATCH 0851/1718] MC-33732: [Magento Cloud] - Create / update
 category using API returns : The "string" value's type is invalid. The
 "string[]" type was expected

---
 .../Catalog/Model/Category/Attribute/Backend/Sortby.php        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php
index fc3c2e5428dd6..c1cfbdade3403 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php
@@ -104,8 +104,7 @@ public function beforeSave($object)
         }
         if ($attributeCode == 'default_sort_by') {
             $data = $object->getData($attributeCode);
-            $attributeValue = is_array($data) ? reset($data) :
-                (!empty($data)) ? $data : null;
+            $attributeValue = (is_array($data) ? reset($data) : (!empty($data))) ? $data : null;
             $object->setData($attributeCode, $attributeValue);
         }
         if (!$object->hasData($attributeCode)) {

From 377ed536493b73bbdb0c58f2b6ef6723327230bf Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Tue, 14 Jul 2020 15:16:24 +0100
Subject: [PATCH 0852/1718] Fixed static tests

---
 .../Model/ResourceModel/GetAssetIdsByBlockStore.php             | 2 ++
 .../Model/ResourceModel/GetAssetIdsByPageStore.php              | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/code/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdsByBlockStore.php b/app/code/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdsByBlockStore.php
index 675f26c8d6504..f1f8d81ec32f2 100644
--- a/app/code/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdsByBlockStore.php
+++ b/app/code/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdsByBlockStore.php
@@ -75,6 +75,8 @@ public function execute(string $value): array
     }
 
     /**
+     * Get block ids by store
+     *
      * @param int $storeId
      * @return array
      * @throws LocalizedException
diff --git a/app/code/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdsByPageStore.php b/app/code/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdsByPageStore.php
index 2eae127ab33a2..92cf67e7d03e4 100644
--- a/app/code/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdsByPageStore.php
+++ b/app/code/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdsByPageStore.php
@@ -76,6 +76,8 @@ public function execute(string $value): array
     }
 
     /**
+     * Get page ids by store
+     *
      * @param int $storeId
      * @return array
      * @throws LocalizedException

From c28747d0899432aa0978df50396c2795b6cacc44 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Tue, 14 Jul 2020 17:55:35 +0300
Subject: [PATCH 0853/1718] Add description

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

diff --git a/app/code/Magento/PaypalGraphQl/etc/schema.graphqls b/app/code/Magento/PaypalGraphQl/etc/schema.graphqls
index e5adb6f25b1c2..cf7fcebf289a4 100644
--- a/app/code/Magento/PaypalGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/PaypalGraphQl/etc/schema.graphqls
@@ -51,7 +51,7 @@ input PaymentMethodInput {
     payflow_link: PayflowLinkInput @doc(description:"Required input for PayPal Payflow Link and Payments Advanced payments")
     payflowpro: PayflowProInput @doc(description: "Required input type for PayPal Payflow Pro and Payment Pro payments")
     hosted_pro: HostedProInput @doc(description:"Required input for PayPal Hosted pro payments")
-    payflowpro_cc_vault: VaultTokenInput
+    payflowpro_cc_vault: VaultTokenInput @doc(description:"Required input for payment methods with Vault support.")
 }
 
 input HostedProInput @doc(description:"A set of relative URLs that PayPal will use in response to various actions during the authorization process. Magento prepends the base URL to this value to create a full URL. For example, if the full URL is https://www.example.com/path/to/page.html, the relative URL is path/to/page.html. Use this input for Payments Pro Hosted Solution payment method.") {
@@ -103,7 +103,7 @@ input PayflowProTokenInput @doc(description:"Input required to fetch payment tok
 
 input PayflowProInput @doc(description:"Required input for Payflow Pro and Payments Pro payment methods.") {
     cc_details: CreditCardDetailsInput! @doc(description: "Required input for credit card related information")
-    is_active_payment_token_enabler: Boolean @doc(description:"States whether an entered by a customer credit/debit card should be tokenized for later usage. Required only if Vault is enabled for PayPal Payflow Pro payment integration.")
+    is_active_payment_token_enabler: Boolean @doc(description:"States whether details about the customer's credit/debit card should be tokenized for later usage. Required only if Vault is enabled for PayPal Payflow Pro payment integration.")
 }
 
 input CreditCardDetailsInput @doc(description:"Required fields for Payflow Pro and Payments Pro credit card payments") {

From 45634d3a7f21984aa06baeb9986009392916ea9f Mon Sep 17 00:00:00 2001
From: Raoul Rego <rrego@adobe.com>
Date: Tue, 14 Jul 2020 02:08:52 -0500
Subject: [PATCH 0854/1718] MC-35722: [MFTF]
 StorefrontPaypalSmartButtonInCheckoutPageTest and
 StorefrontPaypalSmartButtonWithFranceMerchantCountryTest failed on Jekins

- Added extra steps to fix login flow
- Added waitForLoginPageLoad
---
 ...StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup.xml | 2 ++
 .../PayPalPaymentSection.xml                                   | 1 +
 .../Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml     | 3 ---
 ...torefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml | 3 ---
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup.xml
index 5619aa27860ce..00a271e2ad274 100644
--- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup.xml
@@ -17,6 +17,8 @@
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <seeCurrentUrlMatches regex="~\//www.sandbox.paypal.com/~" stepKey="seeCurrentUrlMatchesConfigPath1"/>
         <conditionalClick selector="{{PayPalPaymentSection.notYouLink}}" dependentSelector="{{PayPalPaymentSection.notYouLink}}" visible="true" stepKey="selectNotYouSection"/>
+        <conditionalClick selector="{{PayPalPaymentSection.existingAccountLoginBtn}}" dependentSelector="{{PayPalPaymentSection.existingAccountLoginBtn}}" visible="true" stepKey="skipAccountCreationAndLogin"/>
+        <waitForPageLoad stepKey="waitForLoginPageLoad"/>
         <waitForElement selector="{{PayPalPaymentSection.email}}" stepKey="waitForLoginForm" />
         <fillField selector="{{PayPalPaymentSection.email}}" userInput="{{credentials.magento/paypal_sandbox_login_email}}" stepKey="fillEmail"/>
         <click selector="{{PayPalPaymentSection.nextButton}}" stepKey="clickNext"/>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/PayPalPaymentSection.xml b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/PayPalPaymentSection.xml
index 361016c40539c..e53c1bbc1ec29 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/PayPalPaymentSection.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/PayPalPaymentSection.xml
@@ -10,6 +10,7 @@
     <section name="PayPalPaymentSection">
         <element name="guestCheckout" type="input" selector="#guest"/>
         <element name="loginSection" type="input" selector=" #main&gt;#login"/>
+        <element name="existingAccountLoginBtn" type="input" selector="#loginSection a"/>
         <element name="email" type="input" selector="//input[contains(@name, 'email') and not(contains(@style, 'display:none'))]"/>
         <element name="password" type="input" selector="//input[contains(@name, 'password') and not(contains(@style, 'display:none'))]"/>
         <element name="loginBtn" type="input" selector="button#btnLogin"/>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml
index 2cc94caf4c1b1..d27ac4c4a92f5 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml
@@ -17,9 +17,6 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-13690"/>
             <group value="paypalExpress"/>
-            <skip>
-                <issueId value="MC-33951"/>
-            </skip>
         </annotations>
         <before>
             <!-- Login -->
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml
index 22997b7005f91..0efb3f33739fa 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml
@@ -17,9 +17,6 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-33274"/>
             <group value="paypalExpress"/>
-            <skip>
-                <issueId value="MC-33951"/>
-            </skip>
         </annotations>
         <before>
             <!--Set merchant country-->

From c4ed415578a59bc6739ca3b056efd96a54ed69a9 Mon Sep 17 00:00:00 2001
From: Michal Derlatka <michal.derlatka1@gmail.com>
Date: Tue, 7 Jul 2020 07:24:55 +0200
Subject: [PATCH 0855/1718] magento/magento2#28581: Credit memo details by
 order

---
 ...memoItemInterfaceTypeResolverComposite.php |  56 ++++++++
 .../Model/CreditmemoItemTypeResolver.php      |  29 ++++
 .../CreditMemo/CreditMemoComments.php         |  55 ++++++++
 .../Resolver/CreditMemo/CreditMemoItems.php   | 129 ++++++++++++++++++
 .../Resolver/CreditMemo/CreditMemoTotal.php   |  73 ++++++++++
 .../Model/Resolver/CreditMemos.php            |  51 +++++++
 .../Magento/SalesGraphQl/etc/graphql/di.xml   |   7 +
 .../Magento/SalesGraphQl/etc/schema.graphqls  |  34 +++++
 .../Magento/GraphQl/Sales/CreditmemoTest.php  | 129 ++++++++++++++++++
 .../customer_creditmemo_with_two_items.php    |  26 ++++
 ...mer_creditmemo_with_two_items_rollback.php |  12 ++
 11 files changed, 601 insertions(+)
 create mode 100644 app/code/Magento/SalesGraphQl/Model/CreditmemoItemInterfaceTypeResolverComposite.php
 create mode 100644 app/code/Magento/SalesGraphQl/Model/CreditmemoItemTypeResolver.php
 create mode 100644 app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoComments.php
 create mode 100644 app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoItems.php
 create mode 100644 app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoTotal.php
 create mode 100644 app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemos.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/_files/customer_creditmemo_with_two_items.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/_files/customer_creditmemo_with_two_items_rollback.php

diff --git a/app/code/Magento/SalesGraphQl/Model/CreditmemoItemInterfaceTypeResolverComposite.php b/app/code/Magento/SalesGraphQl/Model/CreditmemoItemInterfaceTypeResolverComposite.php
new file mode 100644
index 0000000000000..73810ac1bb8ef
--- /dev/null
+++ b/app/code/Magento/SalesGraphQl/Model/CreditmemoItemInterfaceTypeResolverComposite.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesGraphQl\Model;
+
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
+
+/**
+ * Composite resolver for credit memo item
+ */
+class CreditmemoItemInterfaceTypeResolverComposite implements TypeResolverInterface
+{
+    /**
+     * @var TypeResolverInterface[]
+     */
+    private $creditmemoItemTypeResolvers = [];
+
+    /**
+     * @param TypeResolverInterface[] $creditMemoItemTypeResolvers
+     */
+    public function __construct(array $creditMemoItemTypeResolvers = [])
+    {
+        $this->creditmemoItemTypeResolvers = $creditMemoItemTypeResolvers;
+    }
+
+    /**
+     * Resolve item type of an credit memo through composite resolvers
+     *
+     * @param array $data
+     * @return string
+     * @throws GraphQlInputException
+     */
+    public function resolveType(array $data): string
+    {
+        foreach ($this->creditmemoItemTypeResolvers as $creditMemoTypeResolver) {
+            if (!isset($data['product_type'])) {
+                throw new GraphQlInputException(
+                    __('Missing key %1 in sales item data', ['product_type'])
+                );
+            }
+            $resolvedType = $creditMemoTypeResolver->resolveType($data);
+            if (!empty($resolvedType)) {
+                return $resolvedType;
+            }
+        }
+
+        throw new GraphQlInputException(
+            __('Concrete type for %1 not implemented', ['CreditmemoItemInterface'])
+        );
+    }
+}
diff --git a/app/code/Magento/SalesGraphQl/Model/CreditmemoItemTypeResolver.php b/app/code/Magento/SalesGraphQl/Model/CreditmemoItemTypeResolver.php
new file mode 100644
index 0000000000000..3e5847366e69a
--- /dev/null
+++ b/app/code/Magento/SalesGraphQl/Model/CreditmemoItemTypeResolver.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesGraphQl\Model;
+
+use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
+
+/**
+ * Resolve item type for credit memo item
+ */
+class CreditmemoItemTypeResolver implements TypeResolverInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function resolveType(array $data): string
+    {
+        if (isset($data['product_type'])) {
+            if ($data['product_type'] == 'bundle') {
+                return 'BundleCreditMemoItem';
+            }
+        }
+        return 'CreditMemoItem';
+    }
+}
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoComments.php b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoComments.php
new file mode 100644
index 0000000000000..9f27122466b11
--- /dev/null
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoComments.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesGraphQl\Model\Resolver\CreditMemo;
+
+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\Api\Data\CreditmemoInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+
+/**
+ * Resolve credit memo comments
+ */
+class CreditMemoComments implements ResolverInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!(($value['model'] ?? null) instanceof CreditmemoInterface)) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        if (!(($value['order'] ?? null) instanceof OrderInterface)) {
+            throw new LocalizedException(__('"order" value should be specified'));
+        }
+
+        /** @var CreditmemoInterface $creditMemo */
+        $creditMemo = $value['model'];
+
+        $comments = [];
+        foreach ($creditMemo->getComments() as $comment) {
+            if ($comment->getIsVisibleOnFront()) {
+                $comments[] = [
+                    'message' => $comment->getComment(),
+                    'timestamp' => $comment->getCreatedAt()
+                ];
+            }
+        }
+
+        return $comments;
+    }
+}
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoItems.php b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoItems.php
new file mode 100644
index 0000000000000..9b1b71e84c2d6
--- /dev/null
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoItems.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesGraphQl\Model\Resolver\CreditMemo;
+
+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\Sales\Api\Data\CreditmemoInterface;
+use Magento\Sales\Api\Data\CreditmemoItemInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\Data\OrderItemInterface;
+use Magento\SalesGraphQl\Model\Resolver\OrderItem\DataProvider as OrderItemProvider;
+
+/**
+ * Resolve credit memos items data
+ */
+class CreditMemoItems implements ResolverInterface
+{
+    /**
+     * @var ValueFactory
+     */
+    private $valueFactory;
+
+    /**
+     * @var OrderItemProvider
+     */
+    private $orderItemProvider;
+
+    /**
+     * @param ValueFactory $valueFactory
+     * @param OrderItemProvider $orderItemProvider
+     */
+    public function __construct(
+        ValueFactory $valueFactory,
+        OrderItemProvider $orderItemProvider
+    ) {
+        $this->valueFactory = $valueFactory;
+        $this->orderItemProvider = $orderItemProvider;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!(($value['model'] ?? null) instanceof CreditmemoInterface)) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        if (!(($value['order'] ?? null) instanceof OrderInterface)) {
+            throw new LocalizedException(__('"order" value should be specified'));
+        }
+
+        /** @var CreditmemoInterface $creditMemoModel */
+        $creditMemoModel = $value['model'];
+        /** @var OrderInterface $parentOrderModel */
+        $parentOrderModel = $value['order'];
+
+        return $this->valueFactory->create(
+            $this->getCreditMemoItems($parentOrderModel, $creditMemoModel->getItems())
+        );
+    }
+
+    /**
+     * Get credit memo items data as a promise
+     *
+     * @param OrderInterface $order
+     * @param array $creditMemoItems
+     * @return \Closure
+     */
+    private function getCreditMemoItems(OrderInterface $order, array $creditMemoItems): \Closure
+    {
+        $items = [];
+        foreach ($creditMemoItems as $item) {
+            $this->orderItemProvider->addOrderItemId((int)$item->getOrderItemId());
+        }
+
+        return function () use ($order, $creditMemoItems, $items): array {
+            foreach ($creditMemoItems as $creditMemoItem) {
+                $orderItem = $this->orderItemProvider->getOrderItemById((int)$creditMemoItem->getOrderItemId());
+                /** @var OrderItemInterface $orderItemModel */
+                $orderItemModel = $orderItem['model'];
+                if (!$orderItemModel->getParentItem()) {
+                    $creditMemoItemData = $this->getCreditMemoItemData($order, $creditMemoItem);
+                    if (isset($creditMemoItemData)) {
+                        $items[$creditMemoItem->getOrderItemId()] = $creditMemoItemData;
+                    }
+                }
+            }
+            return $items;
+        };
+    }
+
+    /**
+     * Get credit memo item data
+     *
+     * @param OrderInterface $order
+     * @param CreditmemoItemInterface $creditMemoItem
+     * @return array
+     */
+    private function getCreditMemoItemData(OrderInterface $order, CreditmemoItemInterface $creditMemoItem): array
+    {
+        $orderItem = $this->orderItemProvider->getOrderItemById((int)$creditMemoItem->getOrderItemId());
+        return [
+            'id' => base64_encode($creditMemoItem->getEntityId()),
+            'product_name' => $creditMemoItem->getName(),
+            'product_sku' => $creditMemoItem->getSku(),
+            'product_sale_price' => [
+                'value' => $creditMemoItem->getPrice(),
+                'currency' => $order->getOrderCurrencyCode()
+            ],
+            'quantity_refunded' => $creditMemoItem->getQty(),
+            'model' => $creditMemoItem,
+            'product_type' => $orderItem['product_type']
+        ];
+    }
+}
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoTotal.php b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoTotal.php
new file mode 100644
index 0000000000000..22dc6cccba251
--- /dev/null
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoTotal.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesGraphQl\Model\Resolver\CreditMemo;
+
+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\Api\Data\CreditmemoInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+
+/**
+ * Resolve credit memo totals information
+ */
+class CreditMemoTotal implements ResolverInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!(($value['model'] ?? null) instanceof CreditmemoInterface)) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        if (!(($value['order'] ?? null) instanceof OrderInterface)) {
+            throw new LocalizedException(__('"order" value should be specified'));
+        }
+
+        /** @var OrderInterface $orderModel */
+        $orderModel = $value['order'];
+        /** @var CreditmemoInterface $creditMemo */
+        $creditMemo = $value['model'];
+        $currency = $orderModel->getOrderCurrencyCode();
+
+        return [
+            'subtotal' => [
+                'value' =>  $creditMemo->getSubtotal(),
+                'currency' => $currency
+            ],
+            'base_grand_total' => [
+                'value' => $creditMemo->getBaseGrandTotal(),
+                'currency' => $currency
+            ],
+            'grand_total' => [
+                'value' =>  $creditMemo->getGrandTotal(),
+                'currency' => $currency
+            ],
+            'total_tax' => [
+                'value' =>  $creditMemo->getTaxAmount(),
+                'currency' => $currency
+            ],
+            'shipping_amount' => [
+                'value' =>  $creditMemo->getShippingAmount(),
+                'currency' => $currency
+            ],
+            'adjustment' => [
+                'value' =>  $creditMemo->getAdjustment(),
+                'currency' => $currency
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemos.php b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemos.php
new file mode 100644
index 0000000000000..69dbca9d66599
--- /dev/null
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemos.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesGraphQl\Model\Resolver;
+
+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\Api\Data\CreditmemoInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+
+/**
+ * Resolve credit memos for order
+ */
+class CreditMemos implements ResolverInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!(($value['model'] ?? null) instanceof OrderInterface)) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        /** @var OrderInterface $orderModel */
+        $orderModel = $value['model'];
+
+        $creditMemos = [];
+        /** @var CreditmemoInterface $creditMemo */
+        foreach ($orderModel->getCreditmemosCollection() as $creditMemo) {
+            $creditMemos[] = [
+                'id' => base64_encode($creditMemo->getEntityId()),
+                'number' => $creditMemo->getIncrementId(),
+                'order' => $orderModel,
+                'model' => $creditMemo
+            ];
+        }
+        return $creditMemos;
+    }
+}
diff --git a/app/code/Magento/SalesGraphQl/etc/graphql/di.xml b/app/code/Magento/SalesGraphQl/etc/graphql/di.xml
index 5bba224ff2fad..eb8e8eadadc5c 100644
--- a/app/code/Magento/SalesGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/SalesGraphQl/etc/graphql/di.xml
@@ -20,4 +20,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\SalesGraphQl\Model\CreditmemoItemInterfaceTypeResolverComposite">
+        <arguments>
+            <argument name="creditmemoItemTypeResolvers" xsi:type="array">
+                <item name="creditmemo_catalog_item_type_resolver" xsi:type="object">Magento\SalesGraphQl\Model\CreditmemoItemTypeResolver</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/SalesGraphQl/etc/schema.graphqls b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
index 099a3ffb959c4..de345c7cf5bc3 100644
--- a/app/code/Magento/SalesGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
@@ -47,6 +47,7 @@ type CustomerOrder @doc(description: "Contains details about each of the custome
     total: OrderTotal @doc(description: "Contains details about the calculated totals for this order") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\OrderTotal")
     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")
+    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")
     shipping_address: CustomerAddress @doc(description: "The shipping address for the order")
     billing_address: CustomerAddress @doc(description: "The billing address for the order")
@@ -199,6 +200,39 @@ type PaymentMethod @doc(description: "Contains details about the payment method
     additional_data: [KeyValue] @doc(description:  "Additional data per payment method type")
 }
 
+type CreditMemo @doc(description: "Credit memo details") {
+    id: ID! @doc(description: "The unique ID of the credit memo, used for API purposes")
+    number: String! @doc(description: "The sequential credit memo number")
+    items: [CreditMemoItem] @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")
+}
+
+interface CreditMemoItemInterface @doc(description: "Credit memo item details") @typeResolver(class: "Magento\\SalesGraphQl\\Model\\CreditmemoItemInterfaceTypeResolverComposite") {
+    id: ID! @doc(description: "The unique ID of the credit memo item, used for API purposes")
+    order_item: OrderItemInterface @doc(description: "The order item the credit memo is applied to") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\OrderItem")
+    product_name: String @doc(description: "The name of the base product")
+    product_sku: String! @doc(description: "SKU of the base product")
+    product_sale_price: Money! @doc(description: "The sale price for the base product, including selected options")
+    quantity_refunded: Float @doc(description: "The number of refunded items")
+}
+
+type CreditMemoItem implements CreditMemoItemInterface {
+}
+
+type BundleCreditMemoItem implements CreditMemoIntemInterface {
+    bundle_options: [ItemSelectedBundleOption]
+}
+
+type CreditMemoTotal @doc(description: "Credit memo price details") {
+    subtotal: Money! @doc(description: "The subtotal amount, excluding shipping, discounts, and tax")
+    total_tax: Money! @doc(description: "The total tax amount")
+    grand_total: Money! @doc(description: "The final total amount, including shipping and taxes")
+    base_grand_total: Money! @doc(description: "The final total amount in the base currency")
+    shipping_amount: Money! @doc(description: "The refunded shipping fees")
+    adjustment: Money! @doc(description: "An adjustment manually applied to the order")
+}
+
 type KeyValue @doc(description: "The key-value type") {
     name: String @doc(description: "The name part of the name/value pair")
     value: String @doc(description: "The value part of the name/value pair")
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
new file mode 100644
index 0000000000000..54b186c610994
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Sales;
+
+use Magento\GraphQl\GetCustomerAuthenticationHeader;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test for credit memo functionality
+ */
+class CreditmemoTest extends GraphQlAbstract
+{
+    /**
+     * @var GetCustomerAuthenticationHeader
+     */
+    private $customerAuthenticationHeader;
+
+    /**
+     * Set up
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->customerAuthenticationHeader = Bootstrap::getObjectManager()->get(
+            GetCustomerAuthenticationHeader::class
+        );
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Sales/_files/customer_creditmemo_with_two_items.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testCreditMemoForLoggedInCustomerQuery(): void
+    {
+        $query =
+            <<<QUERY
+query {
+  customer {
+    orders {
+        items {
+            credit_memos {
+                items {
+                    product_name
+                    product_sku
+                    product_sale_price {
+                        value
+                    }
+                    quantity_refunded
+                }
+                total {
+                    subtotal {
+                        value
+                    }
+                    grand_total {
+                        value
+                    }
+                    shipping_amount {
+                        value
+                    }
+                    adjustment {
+                        value
+                    }
+                }
+            }
+        }
+    }
+  }
+}
+QUERY;
+
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+        $response = $this->graphQlQuery(
+            $query,
+            [],
+            '',
+            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
+        );
+
+        $expectedCreditMemoData = [
+            [
+                'items' => [
+                    [
+                        'product_name' => 'Simple Related Product',
+                        'product_sku' => 'simple',
+                        'product_sale_price' => [
+                            'value' => 10
+                        ],
+                        'quantity_refunded' => 1
+                    ],
+                    [
+                        'product_name' => 'Simple Product With Related Product',
+                        'product_sku' => 'simple_with_cross',
+                        'product_sale_price' => [
+                            'value' => 10
+                        ],
+                        'quantity_refunded' => 1
+                    ]
+                ],
+                'total' => [
+                    'subtotal' => [
+                        'value' => 20
+                    ],
+                    'grand_total' => [
+                        'value' => 20
+                    ],
+                    'shipping_amount' => [
+                        'value' => 0
+                    ],
+                    'adjustment' => [
+                        'value' => 1.23
+                    ]
+                ]
+            ]
+        ];
+
+        $actualData = $response['customer']['orders']['items'][1];
+
+        $creditMemos = $actualData['credit_memos'];
+        $this->assertResponseFields($creditMemos, $expectedCreditMemoData);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/customer_creditmemo_with_two_items.php b/dev/tests/integration/testsuite/Magento/Sales/_files/customer_creditmemo_with_two_items.php
new file mode 100644
index 0000000000000..79207bfca94e7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/customer_creditmemo_with_two_items.php
@@ -0,0 +1,26 @@
+<?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/customer_invoice_with_two_products_and_custom_options.php'
+);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Sales\Model\Order\CreditmemoFactory $creditMemoFactory */
+$creditMemoFactory = $objectManager->create(\Magento\Sales\Model\Order\CreditmemoFactory::class);
+/** @var \Magento\Sales\Model\Service\CreditmemoService $creditMemoService */
+$creditMemoService = $objectManager->create(\Magento\Sales\Model\Service\CreditmemoService::class);
+/** @var \Magento\Sales\Api\OrderRepositoryInterface $orderRepository */
+$orderRepository = $objectManager->create(\Magento\Sales\Api\OrderRepositoryInterface::class);
+
+$creditMemo = $creditMemoFactory->createByOrder($orderRepository->get(2));
+$creditMemo->setAdjustment(1.23);
+
+$creditMemoService->refund($creditMemo);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/customer_creditmemo_with_two_items_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/customer_creditmemo_with_two_items_rollback.php
new file mode 100644
index 0000000000000..e40de2969ed42
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/customer_creditmemo_with_two_items_rollback.php
@@ -0,0 +1,12 @@
+<?php
+
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_rollback.php');
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/products_in_category_rollback.php');
+Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/default_rollback.php');

From 832360991aff67b94a0cdb5f80823f823210bbe2 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Tue, 14 Jul 2020 22:51:16 +0300
Subject: [PATCH 0856/1718] use AdminExpandCategoryTreeActionGroup to
 clickOnExpandTree

---
 ...nuCategoryAndSubcategoryIsNotVisibleInNavigationTest.xml | 3 +--
 ...tegoryAndSubcategoryIsNotVisibleInNavigationMenuTest.xml | 3 +--
 ...nuCategoryAndSubcategoryIsNotVisibleInNavigationTest.xml | 3 +--
 .../Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml | 3 +--
 .../Mftf/Test/AdminCreateCategoryWithFiveNestingTest.xml    | 2 +-
 ...minCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml | 2 +-
 .../Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml  | 2 +-
 .../Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml | 2 +-
 .../Test/AdminDeleteRootCategoryAssignedToStoreTest.xml     | 2 +-
 .../Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml | 6 ++----
 .../Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml  | 6 ++----
 .../AdminMoveCategoryFromParentAnchoredCategoryTest.xml     | 6 ++----
 ...AdminMoveCategoryToAnotherPositionInCategoryTreeTest.xml | 6 ++----
 ...inUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml | 2 +-
 .../Mftf/Test/AdminUpdateCategoryAndMakeInactiveTest.xml    | 4 ++--
 .../AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml    | 4 ++--
 .../Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml  | 2 +-
 .../Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml | 2 +-
 .../Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml | 2 +-
 .../Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml  | 4 ++--
 ...oductWithRegularPriceInStockUnassignFromCategoryTest.xml | 3 +--
 .../Test/AdminUpdateTopCategoryUrlWithNoRedirectTest.xml    | 3 +--
 .../Mftf/Test/AdminUpdateTopCategoryUrlWithRedirectTest.xml | 3 +--
 .../Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml | 2 +-
 24 files changed, 31 insertions(+), 46 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveAndNotIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveAndNotIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest.xml
index de8110f995606..9f7c68a006763 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveAndNotIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveAndNotIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest.xml
@@ -32,8 +32,7 @@
         <!--Open Category Page-->
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
         <!--Create subcategory under parent category -->
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
+        <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}" stepKey="selectCategory"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
         <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveCategoryAndSubcategoryIsNotVisibleInNavigationMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveCategoryAndSubcategoryIsNotVisibleInNavigationMenuTest.xml
index fd8093d8d3b52..c90626022699a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveCategoryAndSubcategoryIsNotVisibleInNavigationMenuTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveCategoryAndSubcategoryIsNotVisibleInNavigationMenuTest.xml
@@ -31,8 +31,7 @@
         <!--Open Category Page-->
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
         <!--Create subcategory under parent category -->
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
+        <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}" stepKey="selectCategory"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
         <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest.xml
index e6cbe156698e7..d8a2b5f32cd37 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckInactiveIncludeInMenuCategoryAndSubcategoryIsNotVisibleInNavigationTest.xml
@@ -32,8 +32,7 @@
         <!--Open Category Page-->
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
         <!--Create subcategory under parent category -->
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
+        <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}" stepKey="selectCategory"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
         <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml
index 6ac71c4a7982d..255602232416d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckPaginationInStorefrontTest.xml
@@ -100,8 +100,7 @@
         <!--Open Category Page and select created category-->
         <comment userInput="Open Category Page and select created category" stepKey="commentOpenCategoryPage"/>
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-        <waitForPageLoad stepKey="waitForPageToLoad0"/>
+        <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory"/>
         <waitForPageLoad stepKey="waitForPageToLoaded2"/>
         <!--Select Products-->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithFiveNestingTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithFiveNestingTest.xml
index b27d9239c53e1..f1eb61316f7a7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithFiveNestingTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithFiveNestingTest.xml
@@ -30,7 +30,7 @@
             <click selector="{{AdminCategoryModalSection.ok}}" stepKey="confirmDelete"/>
             <waitForPageLoad time="60" stepKey="waitForDeleteToFinish"/>
             <see selector="You deleted the category." stepKey="seeDeleteSuccess"/>
-            <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories"/>
+            <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="expandToSeeAllCategories"/>
             <dontSee selector="{{AdminCategorySidebarTreeSection.categoryInTree(FirstLevelSubCat.name)}}" stepKey="dontSeeCategoryInTree"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
index bf9aa5509fa50..647f2b4898629 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
@@ -55,7 +55,7 @@
         </after>
         <!-- Select created category and make category inactive-->
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
+        <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(CatNotActive.name)}}" stepKey="selectCreatedCategory"/>
         <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
         <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml
index 3f54f60f382e4..04626963ac2f5 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml
@@ -55,7 +55,7 @@
         </after>
         <!-- Select created category and make category inactive-->
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
+        <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" stepKey="selectCreatedCategory"/>
         <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
         <click selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}" stepKey="disableActiveCategory"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml
index df9d28637f727..be4d84a2a9ac9 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml
@@ -55,7 +55,7 @@
         </after>
         <!-- Select created category and disable Include In Menu option-->
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
+        <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" stepKey="selectCreatedCategory"/>
         <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
         <click selector="{{AdminCategoryBasicFieldSection.includeInMenuLabel}}" stepKey="disableIcludeInMenuOption"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryAssignedToStoreTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryAssignedToStoreTest.xml
index 2fa91604e1776..15d470e00d40d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryAssignedToStoreTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryAssignedToStoreTest.xml
@@ -41,7 +41,7 @@
         <!--Verify Delete Root Category can not be deleted-->
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage1"/>
         <scrollToTopOfPage stepKey="scrollToTopOfPage2"/>
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandToSeeAllCategories"/>
+        <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="expandToSeeAllCategories"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(NewRootCategory.name))}}" stepKey="clickRootCategoryInTree"/>
 
         <!--Verify Delete button is not displayed-->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml
index bf5fde3b85bba..08849a027fcfd 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveAnchoredCategoryToDefaultCategoryTest.xml
@@ -30,8 +30,7 @@
 
         <!--Open Category Page-->
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
+        <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCategory"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
 
@@ -92,8 +91,7 @@
 
         <!--Open Category Page-->
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage1"/>
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree2"/>
-        <waitForPageLoad stepKey="waitForPageToLoad2"/>
+        <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree2"/>
 
         <!--Move SubCategory under Default Category-->
         <dragAndDrop selector1="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" selector2="{{AdminCategorySidebarTreeSection.categoryInTree('Default Category')}}" stepKey="moveCategory"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml
index 4dbbdc8f4399e..ae7b8d9e54956 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryAndCheckUrlRewritesTest.xml
@@ -33,8 +33,7 @@
 
         <!--Open category page-->
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
+        <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(FirstLevelSubCat.name)}}" stepKey="selectCategory"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
 
@@ -74,8 +73,7 @@
 
         <!--Open Category Page -->
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage1"/>
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree2"/>
-        <waitForPageLoad stepKey="waitForPageToLoad2"/>
+        <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree2"/>
 
         <!--Move the third level category under first level category -->
         <dragAndDrop selector1="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" selector2="{{AdminCategorySidebarTreeSection.categoryInTree($$createDefaultCategory.name$$)}}" stepKey="m0oveCategory"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml
index 116df566f2bd0..281f4aa98d4e6 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryFromParentAnchoredCategoryTest.xml
@@ -33,8 +33,7 @@
 
         <!--Open Category page-->
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
+        <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCategory"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
 
@@ -81,8 +80,7 @@
 
         <!--Open Category Page-->
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage1"/>
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree2"/>
-        <waitForPageLoad stepKey="waitForPageToLoad2"/>
+        <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree2"/>
 
         <!--Move SubCategory under Default Category-->
         <dragAndDrop selector1="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" selector2="{{AdminCategorySidebarTreeSection.categoryInTree('Default Category')}}" stepKey="moveCategory"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryToAnotherPositionInCategoryTreeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryToAnotherPositionInCategoryTreeTest.xml
index fd9e50928d748..ddd4526be2eaf 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryToAnotherPositionInCategoryTreeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryToAnotherPositionInCategoryTreeTest.xml
@@ -33,8 +33,7 @@
 
         <!-- Open Category Page -->
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickExpandTree"/>
-        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
+        <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickExpandTree"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCategory"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
         <!-- Create three level deep sub Category -->
@@ -68,8 +67,7 @@
 
         <!-- Move Category to another position in category tree and click ok button-->
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openTheAdminCategoryIndexPage"/>
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree"/>
         <dragAndDrop selector1="{{AdminCategorySidebarTreeSection.categoryInTree(SecondLevelSubCat.name)}}" selector2="{{AdminCategorySidebarTreeSection.categoryInTree('Default Category')}}" stepKey="DragCategory"/>
         <see selector="{{AdminCategoryModalSection.message}}" userInput="This operation can take a long time" stepKey="seeWarningMessageForOneMoreTime"/>
         <click selector="{{AdminCategoryModalSection.ok}}" stepKey="clickOkButtonOnWarningPopup"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml
index e0e517defdeac..ab84d644c1f69 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml
@@ -51,7 +51,7 @@
 
         <!--Update Category-->
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
+        <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleRootSubCategory.name)}}" stepKey="selectCategory"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="updateCategoryName"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndMakeInactiveTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndMakeInactiveTest.xml
index a4ba859714982..4d48ae4c1bf7c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndMakeInactiveTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndMakeInactiveTest.xml
@@ -30,7 +30,7 @@
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
 
         <!--Update category and make category inactive-->
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
+        <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory"/>
         <click selector="{{AdminCategoryBasicFieldSection.enableCategoryLabel}}" stepKey="disableCategory"/>
         <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
@@ -47,7 +47,7 @@
 
         <!--Verify Inactive Category in category page -->
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage1"/>
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree1"/>
+        <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree1"/>
         <seeElement  selector="{{AdminCategoryContentSection.categoryInTree(_defaultCategory.name)}}" stepKey="assertCategoryInTree" />
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory1"/>
         <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{_defaultCategory.name}}" stepKey="seeCategoryPageTitle1" />
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml
index db6cfce167bce..10f1571dfa738 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithInactiveIncludeInMenuTest.xml
@@ -31,7 +31,7 @@
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
 
         <!--Update Category name,description, urlKey, meta title and disable Include in Menu-->
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
+        <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleRootSubCategory.name}}" stepKey="fillCategoryName"/>
         <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
@@ -65,7 +65,7 @@
 
         <!--Verify Updated fields in Category Page-->
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage1"/>
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree1"/>
+        <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree1"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleRootSubCategory.name)}}" stepKey="selectCreatedCategory1"/>
         <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
         <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{SimpleRootSubCategory.name}}" stepKey="seeUpdatedCategoryTitle"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml
index 9b827550a6817..05a432afa88d1 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryWithProductsTest.xml
@@ -30,7 +30,7 @@
 
         <!--Open Category Page-->
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
+        <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory"/>
         <checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
index 011eae0572a9a..cc61d4531607a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
@@ -58,7 +58,7 @@
         <!-- Select Created Category-->
         <magentoCLI command="indexer:reindex" stepKey="reindexBeforeFlow"/>
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
+        <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" stepKey="selectCreatedCategory"/>
         <waitForPageLoad stepKey="waitForTheCategoryPageToLoaded"/>
         <!--Add Products in Category-->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml
index 1214ba879f211..b428153b6df17 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml
@@ -58,7 +58,7 @@
         <dontSee selector="{{StorefrontHeaderSection.NavigationCategoryByName(CatNotIncludeInMenu.name)}}" stepKey="dontSeeCategoryOnNavigation"/>
         <!-- Select created category and enable Include In Menu option-->
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
+        <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(CatNotIncludeInMenu.name)}}" stepKey="selectCreatedCategory"/>
         <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
         <click selector="{{AdminCategoryBasicFieldSection.includeInMenuLabel}}" stepKey="enableIncludeInMenuOption"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml
index 490f8dbdc4f81..7421cf93a7e1b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml
@@ -57,7 +57,7 @@
         </after>
         <!-- Select Created Category-->
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
+        <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory"/>
         <waitForPageLoad stepKey="waitForPageToLoaded"/>
         <!--Update Category Name and Description -->
@@ -90,7 +90,7 @@
         <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="seeCategoryOnNavigation1"/>
         <!-- Verify Updated  Category Name and description on Category Page-->
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage1"/>
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree1"/>
+        <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree1"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}" stepKey="selectUpdatedCategory"/>
         <waitForPageLoad stepKey="waitForUpdatedCategoryPageToLoad"/>
         <seeInField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="seeUpdatedSubCategoryName"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockUnassignFromCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockUnassignFromCategoryTest.xml
index 3450a8fb6e017..c49da99febcf7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockUnassignFromCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockUnassignFromCategoryTest.xml
@@ -55,8 +55,7 @@
 
         <!--Search default simple product in the grid page -->
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="OpenCategoryCatalogPage"/>
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickExpandTree"/>
-        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
+        <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickExpandTree"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$initialCategoryEntity.name$$)}}" stepKey="selectCategory"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
         <click selector="{{AdminCategoryProductsSection.sectionHeader}}" stepKey="clickAdminCategoryProductSection"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithNoRedirectTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithNoRedirectTest.xml
index 5221510fd4dce..61e46bb39a242 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithNoRedirectTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithNoRedirectTest.xml
@@ -43,8 +43,7 @@
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
 
         <!-- Open 3rd Level category -->
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
+        <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createThreeLevelNestedCategories.name$$)}}" stepKey="selectCategory"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithRedirectTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithRedirectTest.xml
index 505ca583da3f4..0c012df1ba358 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithRedirectTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithRedirectTest.xml
@@ -41,8 +41,7 @@
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
 
         <!-- Open 3rd Level category -->
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
-        <waitForPageLoad stepKey="waitForCategoryToLoad"/>
+        <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree"/>
         <click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createThreeLevelNestedCategories.name$$)}}" stepKey="selectCategory"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml
index 5c3f79694e79a..9ced5828314d4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml
@@ -218,7 +218,7 @@
         <!--Admin moves category-->
         <comment userInput="Admin moves category." stepKey="adminMovesCategoryComment" before="onCategoryPageToMoveCategory"/>
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="onCategoryPageToMoveCategory"/>
-        <click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="expandTree"/>
+        <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="expandTree"/>
         <dragAndDrop selector1="{{AdminCategorySidebarTreeSection.categoryInTree(SimpleSubCategory.name)}}"
                      selector2="{{AdminCategorySidebarTreeSection.categoryTreeRoot}}"
                      stepKey="dragAndDropCategory"/>

From dc04ef27aca8231db71c0e6cc72ee928be37221e Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Tue, 14 Jul 2020 23:17:15 +0300
Subject: [PATCH 0857/1718] use AdminNavigateNewCustomerActionGroup to go to
 new customer

---
 .../Test/AdminCreateCustomerRetailerWithoutAddressTest.xml     | 3 +--
 .../Test/Mftf/Test/AdminCreateCustomerWithCustomGroupTest.xml  | 3 +--
 .../Test/Mftf/Test/AdminCreateCustomerWithPrefixTest.xml       | 3 +--
 .../Test/Mftf/Test/AdminCreateCustomerWithoutAddressTest.xml   | 3 +--
 .../Customer/Test/Mftf/Test/AdminCreateNewCustomerTest.xml     | 3 +--
 .../Mftf/Test/AdminVerifyCreateCustomerRequiredFieldsTest.xml  | 3 +--
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerRetailerWithoutAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerRetailerWithoutAddressTest.xml
index 3488d2c94dd69..c8e3bc10cc769 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerRetailerWithoutAddressTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerRetailerWithoutAddressTest.xml
@@ -29,8 +29,7 @@
         </after>
 
         <!--Filter the customer From grid-->
-        <amOnPage url="{{AdminNewCustomerPage.url}}" stepKey="navigateToNewCustomerPage"/>
-        <waitForPageLoad time="30" stepKey="waitToCustomerPageLoad"/>
+        <actionGroup ref="AdminNavigateNewCustomerActionGroup" stepKey="navigateToNewCustomerPage"/>
         <selectOption selector="{{AdminCustomerAccountInformationSection.group}}" userInput="Retailer" stepKey="fillCustomerGroup"/>
         <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/AdminCreateCustomerWithCustomGroupTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCustomGroupTest.xml
index 52a2483096aaf..f0abafb8a5910 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCustomGroupTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCustomGroupTest.xml
@@ -31,8 +31,7 @@
         </after>
 
         <!--Open New Customer Page -->
-        <amOnPage url="{{AdminNewCustomerPage.url}}" stepKey="navigateToNewCustomerPage"/>
-        <waitForPageLoad stepKey="waitToCustomerPageLoad"/>
+        <actionGroup ref="AdminNavigateNewCustomerActionGroup" stepKey="navigateToNewCustomerPage"/>
         <selectOption selector="{{AdminCustomerAccountInformationSection.group}}" userInput="$$customerGroup.code$$" stepKey="fillCustomerGroup"/>
         <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/AdminCreateCustomerWithPrefixTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithPrefixTest.xml
index 591cb2dd2845a..e9250be637534 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithPrefixTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithPrefixTest.xml
@@ -29,8 +29,7 @@
         </after>
 
         <!--Open New Customer Page  and create a customer with Prefix and Suffix-->
-        <amOnPage url="{{AdminNewCustomerPage.url}}" stepKey="navigateToNewCustomerPage"/>
-        <waitForPageLoad stepKey="waitToCustomerPageLoad"/>
+        <actionGroup ref="AdminNavigateNewCustomerActionGroup" stepKey="navigateToNewCustomerPage"/>
         <selectOption selector="{{AdminCustomerAccountInformationSection.group}}" userInput="Wholesale" stepKey="fillCustomerGroup"/>
         <fillField selector="{{AdminCustomerAccountInformationSection.namePrefix}}" userInput="{{CustomerEntityOne.prefix}}" stepKey="fillNamePrefix"/>
         <fillField userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminCustomerAccountInformationSection.firstName}}" stepKey="fillFirstName"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithoutAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithoutAddressTest.xml
index 081695f7ebe1e..d8cb1603ec90e 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithoutAddressTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithoutAddressTest.xml
@@ -29,8 +29,7 @@
         </after>
 
         <!--Open New Customer Page -->
-        <amOnPage url="{{AdminNewCustomerPage.url}}" stepKey="navigateToNewCustomerPage"/>
-        <waitForPageLoad stepKey="waitToCustomerPageLoad"/>
+        <actionGroup ref="AdminNavigateNewCustomerActionGroup" stepKey="navigateToNewCustomerPage"/>
         <fillField userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminCustomerAccountInformationSection.firstName}}" stepKey="fillFirstName"/>
         <fillField userInput="{{CustomerEntityOne.lastname}}" selector="{{AdminCustomerAccountInformationSection.lastName}}" stepKey="fillLastName"/>
         <fillField userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerAccountInformationSection.email}}" stepKey="fillEmail"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerTest.xml
index da25139ee8e60..cd8bcdad83bff 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerTest.xml
@@ -29,8 +29,7 @@
         </after>
 
         <!--Open New Customer Page -->
-        <amOnPage url="{{AdminNewCustomerPage.url}}" stepKey="navigateToNewCustomerPage"/>
-        <waitForPageLoad stepKey="waitToCustomerPageLoad"/>
+        <actionGroup ref="AdminNavigateNewCustomerActionGroup" stepKey="navigateToNewCustomerPage"/>
         <fillField userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminCustomerAccountInformationSection.firstName}}" stepKey="fillFirstName"/>
         <fillField userInput="{{CustomerEntityOne.lastname}}" selector="{{AdminCustomerAccountInformationSection.lastName}}" stepKey="fillLastName"/>
         <fillField userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerAccountInformationSection.email}}" stepKey="fillEmail"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminVerifyCreateCustomerRequiredFieldsTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminVerifyCreateCustomerRequiredFieldsTest.xml
index 72064617ef33b..78a2fe721453f 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminVerifyCreateCustomerRequiredFieldsTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminVerifyCreateCustomerRequiredFieldsTest.xml
@@ -26,8 +26,7 @@
         </after>
 
         <!--Open New Customer Page -->
-        <amOnPage url="{{AdminNewCustomerPage.url}}" stepKey="navigateToNewCustomerPage"/>
-        <waitForPageLoad stepKey="waitToCustomerPageLoad"/>
+        <actionGroup ref="AdminNavigateNewCustomerActionGroup" stepKey="navigateToNewCustomerPage"/>
         <click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="saveCustomer"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
 

From b2c6d64d111129d001f0c4388093e0ceabd5acb3 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Tue, 14 Jul 2020 23:49:06 +0300
Subject: [PATCH 0858/1718] use actionGroup click next button on checkout

---
 ...urchaseProductCustomOptionsDifferentStoreViewsTest.xml | 8 ++------
 .../StorefrontPurchaseProductWithCustomOptionsTest.xml    | 4 +---
 ...aseProductWithCustomOptionsWithLongValuesTitleTest.xml | 4 +---
 .../AssociatedProductToConfigurableOutOfStockTest.xml     | 3 +--
 ...tateFieldForUKCustomerRemainOptionAfterRefreshTest.xml | 3 +--
 .../Test/OnePageCheckoutAsCustomerUsingNewAddressTest.xml | 3 +--
 .../Test/StorefrontCustomerCheckoutWithoutRegionTest.xml  | 2 +-
 .../StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml    | 4 +---
 .../Test/Mftf/Test/StorefrontOrderPagerDisplayedTest.xml  | 3 +--
 .../Test/Mftf/Test/StorefrontOrderPagerIsAbsentTest.xml   | 3 +--
 ...StorefrontDisplayTableRatesShippingMethodForAETest.xml | 3 +--
 .../StorefrontTaxQuoteCheckoutGuestSimpleTest.xml         | 6 ++----
 .../StorefrontTaxQuoteCheckoutLoggedInSimpleTest.xml      | 6 ++----
 13 files changed, 16 insertions(+), 36 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml
index 767e0c88b7af2..1dabfc1bb8fc2 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml
@@ -181,9 +181,7 @@
 
         <!--Select shipping method-->
         <actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
-        <waitForElementVisible selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
-        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterClickNext"/>
+        <actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNext"/>
         <!--Select payment method-->
         <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPaymentMethod"/>
         <!-- Place Order -->
@@ -258,9 +256,7 @@
 
         <!--Select shipping method-->
         <actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod2"/>
-        <waitForElementVisible selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton2"/>
-        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext2"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterClickNext2"/>
+        <actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNext2"/>
 
         <!--Select payment method-->
         <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPaymentMethod2"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
index 09b596f298e0f..e768f7ba5317a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
@@ -115,9 +115,7 @@
         <see selector="{{CheckoutPaymentSection.ProductOptionsActiveByProductItemName($$createProduct.name$$)}}" userInput="1:00 AM" stepKey="seeProductOptionTimeInput" />
         <!--Select shipping method-->
         <actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
-        <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
-        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterClickNext"/>
+        <actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNext"/>
         <!--Select payment method-->
         <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPaymentMethod"/>
         <!-- Place Order -->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitleTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitleTest.xml
index 95e48e63419d3..aac76999636b0 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitleTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitleTest.xml
@@ -79,9 +79,7 @@
         <!--Select shipping method-->
 
         <actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
-        <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
-        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterClickNext"/>
+        <actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNext"/>
 
         <!-- Checkout select Check/Money Order payment -->
         <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
diff --git a/app/code/Magento/CatalogInventory/Test/Mftf/Test/AssociatedProductToConfigurableOutOfStockTest.xml b/app/code/Magento/CatalogInventory/Test/Mftf/Test/AssociatedProductToConfigurableOutOfStockTest.xml
index 2cdb2413122bd..3794f6df04225 100644
--- a/app/code/Magento/CatalogInventory/Test/Mftf/Test/AssociatedProductToConfigurableOutOfStockTest.xml
+++ b/app/code/Magento/CatalogInventory/Test/Mftf/Test/AssociatedProductToConfigurableOutOfStockTest.xml
@@ -106,8 +106,7 @@
         <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
         <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToShoppingCartPage"/>
         <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
-        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
-        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
+        <actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNext"/>
         <!-- Checkout select Check/Money Order payment -->
         <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
         <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldForUKCustomerRemainOptionAfterRefreshTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldForUKCustomerRemainOptionAfterRefreshTest.xml
index 52a69307550c5..7eae5d0d292d1 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldForUKCustomerRemainOptionAfterRefreshTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldForUKCustomerRemainOptionAfterRefreshTest.xml
@@ -55,8 +55,7 @@
         <fillField selector="{{CheckoutShippingSection.telephone}}" userInput="{{UK_Address.telephone}}" stepKey="enterTelephone"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
         <click selector="{{CheckoutShippingSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
-        <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
-        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
+        <actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNext"/>
         <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
         <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
 
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNewAddressTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNewAddressTest.xml
index 76a998fec8adc..4edd69f4f168b 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNewAddressTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNewAddressTest.xml
@@ -73,8 +73,7 @@
         <waitForPageLoad stepKey="waitForAddressSaving"/>
 
         <!-- Click next button to open payment section -->
-        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
-        <waitForPageLoad stepKey="waitForShipmentPageLoad"/>
+        <actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNext"/>
 
         <!-- Change the address -->
         <uncheckOption selector="{{CheckoutPaymentSection.billingAddressNotSameCheckbox}}" stepKey="selectPaymentSolution"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutWithoutRegionTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutWithoutRegionTest.xml
index 0c762519e9083..24ca488ea25e5 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutWithoutRegionTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutWithoutRegionTest.xml
@@ -49,7 +49,7 @@
 
         <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="navigateToCheckoutPage"/>
 
-        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNextButton"/>
+        <actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNextButton"/>
         <see selector="{{StorefrontMessagesSection.error}}" userInput='Please specify a regionId in shipping address.' stepKey="seeErrorMessages"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
index 5df8338030efc..82324525bad24 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutDataWhenChangeQtyTest.xml
@@ -58,9 +58,7 @@
 
         <!--Select shipping method and finalize checkout-->
         <click selector="{{CheckoutShippingSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
-        <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
-        <waitForPageLoad stepKey="waitForShippingMethodLoad"/>
-        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
+        <actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNext"/>
         <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
         <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
 
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontOrderPagerDisplayedTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontOrderPagerDisplayedTest.xml
index 5cc4fae330d05..39ae6f4ba7b93 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontOrderPagerDisplayedTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontOrderPagerDisplayedTest.xml
@@ -203,8 +203,7 @@
         <!-- Place Order -->
         <actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="onCheckout"/>
         <see userInput="21" selector="{{CheckoutOrderSummarySection.itemsQtyInCart}}" stepKey="see21Products"/>
-        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNextButton"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForCheckoutLoad"/>
+        <actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNextButton"/>
         <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="placeOrder"/>
         <waitForPageLoad stepKey="waitForSuccess"/>
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontOrderPagerIsAbsentTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontOrderPagerIsAbsentTest.xml
index 20261de502ea3..cba141e2ab271 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontOrderPagerIsAbsentTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontOrderPagerIsAbsentTest.xml
@@ -193,8 +193,7 @@
         <!-- Place Order -->
         <actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="onCheckout"/>
         <see userInput="20" selector="{{CheckoutOrderSummarySection.itemsQtyInCart}}" stepKey="see20Products"/>
-        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNextButton"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForCheckoutLoad"/>
+        <actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNextButton"/>
         <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="placeOrder"/>
         <waitForPageLoad stepKey="waitForSuccess"/>
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
diff --git a/app/code/Magento/Shipping/Test/Mftf/Test/StorefrontDisplayTableRatesShippingMethodForAETest.xml b/app/code/Magento/Shipping/Test/Mftf/Test/StorefrontDisplayTableRatesShippingMethodForAETest.xml
index 5fd9a6a29c0e3..d448f51a00406 100644
--- a/app/code/Magento/Shipping/Test/Mftf/Test/StorefrontDisplayTableRatesShippingMethodForAETest.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Test/StorefrontDisplayTableRatesShippingMethodForAETest.xml
@@ -67,8 +67,7 @@
             <argument name="shippingMethodName" value="Best Way"/>
         </actionGroup>
         <!--Proceed to Review and Payments section-->
-        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickToSaveShippingInfo"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterClickNext"/>
+        <actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickToSaveShippingInfo"/>
         <waitForPageLoad stepKey="waitForReviewAndPaymentsPageIsLoaded"/>
         <!--Place order and assert the message of success-->
         <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="placeOrderProductSuccessful"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestSimpleTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestSimpleTest.xml
index 3c72b5177e692..11afacdf1a351 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestSimpleTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestSimpleTest.xml
@@ -89,8 +89,7 @@
         <actionGroup ref="LoggedInCheckoutFillNewBillingAddressActionGroup" stepKey="changeAddress">
             <argument name="Address" value="US_Address_CA"/>
         </actionGroup>
-        <click stepKey="clickNext" selector="{{CheckoutShippingSection.next}}"/>
-        <waitForPageLoad stepKey="waitForAddressToLoad"/>
+        <actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNext"/>
         <!-- Checkout select Check/Money Order payment -->
         <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
         <see stepKey="seeAddress" selector="{{CheckoutShippingSection.defaultShipping}}" userInput="{{SimpleTaxCA.state}}"/>
@@ -109,8 +108,7 @@
         <actionGroup ref="LoggedInCheckoutFillNewBillingAddressActionGroup" stepKey="changeAddress2">
             <argument name="Address" value="US_Address_NY"/>
         </actionGroup>
-        <click stepKey="clickNext2" selector="{{CheckoutShippingSection.next}}"/>
-        <waitForPageLoad stepKey="waitForShippingToLoad"/>
+        <actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNext2"/>
         <!-- Checkout select Check/Money Order payment -->
         <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment2"/>
         <see stepKey="seeShipTo2" selector="{{CheckoutPaymentSection.shipToInformation}}" userInput="{{SimpleTaxNY.state}}"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInSimpleTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInSimpleTest.xml
index 43d12bf848f13..6aacbd105a764 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInSimpleTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInSimpleTest.xml
@@ -100,8 +100,7 @@
         <amOnPage url="{{CheckoutPage.url}}" stepKey="goToCheckout"/>
         <waitForPageLoad stepKey="waitForShippingSection"/>
         <see stepKey="seeAddress" selector="{{CheckoutShippingSection.selectedShippingAddress}}" userInput="{{SimpleTaxNY.state}}"/>
-        <click stepKey="clickNext" selector="{{CheckoutShippingSection.next}}"/>
-        <waitForPageLoad stepKey="waitForReviewAndPayments"/>
+        <actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNext"/>
 
         <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
         <see stepKey="seeTax" selector="{{CheckoutPaymentSection.tax}}" userInput="$10.30"/>
@@ -123,8 +122,7 @@
 
         <waitForPageLoad stepKey="waitForAddressSaved"/>
         <see stepKey="seeAddress2" selector="{{CheckoutShippingSection.selectedShippingAddress}}" userInput="{{SimpleTaxCA.state}}"/>
-        <click stepKey="clickNext2" selector="{{CheckoutShippingSection.next}}"/>
-        <waitForPageLoad stepKey="waitForReviewAndPayments2"/>
+        <actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNext2"/>
 
         <!-- Assert that taxes are applied correctly for CA -->
         <waitForElementVisible stepKey="waitForOverviewVisible2" selector="{{CheckoutPaymentSection.tax}}"/>

From 20fbbd665252b77fdc6b9769ca581edc5069ad20 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@users.noreply.github.com>
Date: Tue, 14 Jul 2020 16:20:07 -0500
Subject: [PATCH 0859/1718] Update description in GQL for bundle options

Co-authored-by: Kevin Harper <keharper@users.noreply.github.com>
---
 app/code/Magento/SalesGraphQl/etc/schema.graphqls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/SalesGraphQl/etc/schema.graphqls b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
index de345c7cf5bc3..8f898caf829ed 100644
--- a/app/code/Magento/SalesGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
@@ -221,7 +221,7 @@ type CreditMemoItem implements CreditMemoItemInterface {
 }
 
 type BundleCreditMemoItem implements CreditMemoIntemInterface {
-    bundle_options: [ItemSelectedBundleOption]
+    bundle_options: [ItemSelectedBundleOption] @doc(description: "A list of bundle options that are assigned to the bundle product")
 }
 
 type CreditMemoTotal @doc(description: "Credit memo price details") {

From 07003f70b2962932a1b4e5ee26eb894b1e2c793a Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 15 Jul 2020 10:52:54 +0300
Subject: [PATCH 0860/1718] Changed name of stepKeys

---
 .../Test/Mftf/Test/AdminCreateCustomerWithoutAddressTest.xml    | 2 +-
 .../Customer/Test/Mftf/Test/AdminCreateNewCustomerTest.xml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithoutAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithoutAddressTest.xml
index d8cb1603ec90e..5033f2882af42 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithoutAddressTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithoutAddressTest.xml
@@ -29,7 +29,7 @@
         </after>
 
         <!--Open New Customer Page -->
-        <actionGroup ref="AdminNavigateNewCustomerActionGroup" stepKey="navigateToNewCustomerPage"/>
+        <actionGroup ref="AdminNavigateNewCustomerActionGroup" stepKey="waitToCustomerPageLoad"/>
         <fillField userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminCustomerAccountInformationSection.firstName}}" stepKey="fillFirstName"/>
         <fillField userInput="{{CustomerEntityOne.lastname}}" selector="{{AdminCustomerAccountInformationSection.lastName}}" stepKey="fillLastName"/>
         <fillField userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerAccountInformationSection.email}}" stepKey="fillEmail"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerTest.xml
index cd8bcdad83bff..6b484e857d276 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerTest.xml
@@ -29,7 +29,7 @@
         </after>
 
         <!--Open New Customer Page -->
-        <actionGroup ref="AdminNavigateNewCustomerActionGroup" stepKey="navigateToNewCustomerPage"/>
+        <actionGroup ref="AdminNavigateNewCustomerActionGroup" stepKey="waitToCustomerPageLoad"/>
         <fillField userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminCustomerAccountInformationSection.firstName}}" stepKey="fillFirstName"/>
         <fillField userInput="{{CustomerEntityOne.lastname}}" selector="{{AdminCustomerAccountInformationSection.lastName}}" stepKey="fillLastName"/>
         <fillField userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerAccountInformationSection.email}}" stepKey="fillEmail"/>

From bccbe2ce99fdb129a9271b07abf7d9f977c43b0e Mon Sep 17 00:00:00 2001
From: Yurii Sapiha <yurasapiga93@gmail.com>
Date: Wed, 15 Jul 2020 10:59:42 +0300
Subject: [PATCH 0861/1718] MC-35421: Customer: Order by sku on storefront (EE)

---
 .../_files/simple_product_disabled.php        | 48 +++++++++++++++++++
 .../simple_product_disabled_rollback.php      | 28 +++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_disabled.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_disabled_rollback.php

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_disabled.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_disabled.php
new file mode 100644
index 0000000000000..60dcfc4ea0d24
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_disabled.php
@@ -0,0 +1,48 @@
+<?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\Data\ProductInterfaceFactory;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Helper\DefaultCategory;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var WebsiteRepositoryInterface $websiteRepository */
+$websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class);
+$defaultWebsiteId = $websiteRepository->get('base')->getId();
+/** @var DefaultCategory $defaultCategory */
+$defaultCategory = $objectManager->get(DefaultCategory::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+/** @var ProductInterfaceFactory $productFactory */
+$productFactory = $objectManager->get(ProductInterfaceFactory::class);
+$product = $productFactory->create();
+$productData = [
+    ProductInterface::TYPE_ID => Type::TYPE_SIMPLE,
+    ProductInterface::ATTRIBUTE_SET_ID => $product->getDefaultAttributeSetId(),
+    ProductInterface::SKU => 'product_disabled',
+    ProductInterface::NAME => 'Product with category',
+    ProductInterface::PRICE => 10,
+    ProductInterface::VISIBILITY => Visibility::VISIBILITY_BOTH,
+    ProductInterface::STATUS => Status::STATUS_DISABLED,
+    'website_ids' => [$defaultWebsiteId],
+    'stock_data' => [
+        'use_config_manage_stock' => 1,
+        'qty' => 100,
+        'is_qty_decimal' => 0,
+        'is_in_stock' => 1,
+    ],
+    'category_ids' => [$defaultCategory->getId()],
+];
+$product->setData($productData);
+
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_disabled_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_disabled_rollback.php
new file mode 100644
index 0000000000000..afd874f1b38b1
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_disabled_rollback.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+try {
+    $productRepository->deleteById('product_disabled');
+} catch (NoSuchEntityException $e) {
+    // product already deleted
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);

From 647865946defd5fb35e9aa133adb05f64d8e4813 Mon Sep 17 00:00:00 2001
From: Stas Kozar <stas.kozar@transoftgroup.com>
Date: Wed, 15 Jul 2020 11:13:53 +0300
Subject: [PATCH 0862/1718] MC-35618: Unexpected results of editing a Grouped
 Product in the Wish List by a Customer

---
 .../testsuite/Magento/Wishlist/Model/WishlistTest.php           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php
index 4f9109c69a844..29dda2bbde581 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php
@@ -20,7 +20,7 @@
 /**
  * Tests for wish list model.
  *
- * @magentoDbIsolation disabled
+ * @magentoDbIsolation enabled
  * @magentoAppIsolation disabled
  */
 class WishlistTest extends TestCase

From 8a1a45bdfaa178090892cb747605d0fc0627e01e Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Wed, 15 Jul 2020 11:39:32 +0300
Subject: [PATCH 0863/1718] MC-34100: [On-Premise] Issue with the Cache in
 Product Display

---
 .../Model/ProductNotFoundPageCacheTags.php    | 75 +++++++++++++++++++
 app/code/Magento/Catalog/etc/frontend/di.xml  |  9 +++
 .../PageCache/Model/Layout/LayoutPlugin.php   | 14 +++-
 .../PageCacheTagsPreprocessorComposite.php    | 69 +++++++++++++++++
 .../PageCacheTagsPreprocessorInterface.php    | 22 ++++++
 .../Unit/Model/Layout/LayoutPluginTest.php    |  4 +
 app/code/Magento/PageCache/etc/di.xml         |  1 +
 .../Catalog/Controller/Product/ViewTest.php   | 25 +++++++
 8 files changed, 218 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Catalog/Model/ProductNotFoundPageCacheTags.php
 create mode 100644 app/code/Magento/PageCache/Model/PageCacheTagsPreprocessorComposite.php
 create mode 100644 app/code/Magento/PageCache/Model/Spi/PageCacheTagsPreprocessorInterface.php

diff --git a/app/code/Magento/Catalog/Model/ProductNotFoundPageCacheTags.php b/app/code/Magento/Catalog/Model/ProductNotFoundPageCacheTags.php
new file mode 100644
index 0000000000000..685e9a69a0f8a
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/ProductNotFoundPageCacheTags.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\PageCache\Model\Spi\PageCacheTagsPreprocessorInterface;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Add product identities to "noroute" page
+ *
+ * Ensure that "noroute" page has necessary product tags
+ * so it can be invalidated once the product becomes visible again
+ */
+class ProductNotFoundPageCacheTags implements PageCacheTagsPreprocessorInterface
+{
+    private const NOROUTE_ACTION_NAME = 'cms_noroute_index';
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+    /**
+     * @var RequestInterface
+     */
+    private $request;
+
+    /**
+     * @param RequestInterface $request
+     * @param ProductRepositoryInterface $productRepository
+     * @param StoreManagerInterface $storeManager
+     */
+    public function __construct(
+        RequestInterface $request,
+        ProductRepositoryInterface $productRepository,
+        StoreManagerInterface $storeManager
+    ) {
+        $this->productRepository = $productRepository;
+        $this->storeManager = $storeManager;
+        $this->request = $request;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function process(array $tags): array
+    {
+        if ($this->request->getFullActionName() === self::NOROUTE_ACTION_NAME) {
+            try {
+                $productId = (int) $this->request->getParam('id');
+                $product = $this->productRepository->getById(
+                    $productId,
+                    false,
+                    $this->storeManager->getStore()->getId()
+                );
+            } catch (NoSuchEntityException $e) {
+                $product = null;
+            }
+            if ($product) {
+                $tags = array_merge($tags, $product->getIdentities());
+            }
+        }
+        return $tags;
+    }
+}
diff --git a/app/code/Magento/Catalog/etc/frontend/di.xml b/app/code/Magento/Catalog/etc/frontend/di.xml
index ee9c5b29da894..9113a92463e4e 100644
--- a/app/code/Magento/Catalog/etc/frontend/di.xml
+++ b/app/code/Magento/Catalog/etc/frontend/di.xml
@@ -120,4 +120,13 @@
         <plugin name="catalog_app_action_dispatch_controller_context_plugin"
                 type="Magento\Catalog\Plugin\Framework\App\Action\ContextPlugin" />
     </type>
+    <type name="\Magento\PageCache\Model\PageCacheTagsPreprocessorComposite">
+        <arguments>
+            <argument name="preprocessors" xsi:type="array">
+                <item name="catalog_product_view" xsi:type="array">
+                    <item name="product_not_found" xsi:type="object">Magento\Catalog\Model\ProductNotFoundPageCacheTags</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/PageCache/Model/Layout/LayoutPlugin.php b/app/code/Magento/PageCache/Model/Layout/LayoutPlugin.php
index 762f393f2a1b9..d41b292e18985 100644
--- a/app/code/Magento/PageCache/Model/Layout/LayoutPlugin.php
+++ b/app/code/Magento/PageCache/Model/Layout/LayoutPlugin.php
@@ -8,10 +8,12 @@
 namespace Magento\PageCache\Model\Layout;
 
 use Magento\Framework\App\MaintenanceMode;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\DataObject\IdentityInterface;
 use Magento\Framework\View\Layout;
 use Magento\PageCache\Model\Config;
+use Magento\PageCache\Model\Spi\PageCacheTagsPreprocessorInterface;
 
 /**
  * Append cacheable pages response headers.
@@ -28,6 +30,11 @@ class LayoutPlugin
      */
     private $response;
 
+    /**
+     * @var PageCacheTagsPreprocessorInterface
+     */
+    private $pageCacheTagsPreprocessor;
+
     /**
      * @var MaintenanceMode
      */
@@ -37,15 +44,19 @@ class LayoutPlugin
      * @param ResponseInterface $response
      * @param Config $config
      * @param MaintenanceMode $maintenanceMode
+     * @param PageCacheTagsPreprocessorInterface|null $pageCacheTagsPreprocessor
      */
     public function __construct(
         ResponseInterface $response,
         Config $config,
-        MaintenanceMode $maintenanceMode
+        MaintenanceMode $maintenanceMode,
+        ?PageCacheTagsPreprocessorInterface $pageCacheTagsPreprocessor = null
     ) {
         $this->response = $response;
         $this->config = $config;
         $this->maintenanceMode = $maintenanceMode;
+        $this->pageCacheTagsPreprocessor = $pageCacheTagsPreprocessor
+            ?? ObjectManager::getInstance()->get(PageCacheTagsPreprocessorInterface::class);
     }
 
     /**
@@ -85,6 +96,7 @@ public function afterGetOutput(Layout $subject, $result)
                 }
             }
             $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/PageCache/Model/PageCacheTagsPreprocessorComposite.php b/app/code/Magento/PageCache/Model/PageCacheTagsPreprocessorComposite.php
new file mode 100644
index 0000000000000..caaf3b378571c
--- /dev/null
+++ b/app/code/Magento/PageCache/Model/PageCacheTagsPreprocessorComposite.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\PageCache\Model;
+
+use InvalidArgumentException;
+use Magento\Framework\App\RequestInterface;
+use Magento\PageCache\Model\Spi\PageCacheTagsPreprocessorInterface;
+
+/**
+ * Composite page cache preprocessors
+ */
+class PageCacheTagsPreprocessorComposite implements PageCacheTagsPreprocessorInterface
+{
+    /**
+     * @var PageCacheTagsPreprocessorInterface[][]
+     */
+    private $preprocessors;
+    /**
+     * @var RequestInterface
+     */
+    private $request;
+
+    /**
+     * @param RequestInterface $request
+     * @param PageCacheTagsPreprocessorInterface[][] $preprocessors
+     */
+    public function __construct(
+        RequestInterface $request,
+        array $preprocessors = []
+    ) {
+        foreach ($preprocessors as $group) {
+            foreach ($group as $preprocessor) {
+                if (!$preprocessor instanceof PageCacheTagsPreprocessorInterface) {
+                    throw new InvalidArgumentException(
+                        sprintf(
+                            'Instance of %s is expected, got %s instead.',
+                            PageCacheTagsPreprocessorInterface::class,
+                            get_class($preprocessor)
+                        )
+                    );
+                }
+            }
+        }
+        $this->preprocessors = $preprocessors;
+        $this->request = $request;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function process(array $tags): array
+    {
+        $forwardInfo = $this->request->getBeforeForwardInfo();
+        $actionName = $forwardInfo
+            ? implode('_', [$forwardInfo['route_name'], $forwardInfo['controller_name'], $forwardInfo['action_name']])
+            : $this->request->getFullActionName();
+        if (isset($this->preprocessors[$actionName])) {
+            foreach ($this->preprocessors[$actionName] as $preprocessor) {
+                $tags = $preprocessor->process($tags);
+            }
+        }
+        return $tags;
+    }
+}
diff --git a/app/code/Magento/PageCache/Model/Spi/PageCacheTagsPreprocessorInterface.php b/app/code/Magento/PageCache/Model/Spi/PageCacheTagsPreprocessorInterface.php
new file mode 100644
index 0000000000000..19f9eedf7546d
--- /dev/null
+++ b/app/code/Magento/PageCache/Model/Spi/PageCacheTagsPreprocessorInterface.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\PageCache\Model\Spi;
+
+/**
+ * Interface for page tags preprocessors
+ */
+interface PageCacheTagsPreprocessorInterface
+{
+    /**
+     * Change page tags and returned the modified tags
+     *
+     * @param array $tags
+     * @return array
+     */
+    public function process(array $tags): array;
+}
diff --git a/app/code/Magento/PageCache/Test/Unit/Model/Layout/LayoutPluginTest.php b/app/code/Magento/PageCache/Test/Unit/Model/Layout/LayoutPluginTest.php
index a7f4a1e844264..2cb52dee43e40 100644
--- a/app/code/Magento/PageCache/Test/Unit/Model/Layout/LayoutPluginTest.php
+++ b/app/code/Magento/PageCache/Test/Unit/Model/Layout/LayoutPluginTest.php
@@ -15,6 +15,7 @@
 use Magento\Framework\View\Layout;
 use Magento\PageCache\Model\Config;
 use Magento\PageCache\Model\Layout\LayoutPlugin;
+use Magento\PageCache\Model\Spi\PageCacheTagsPreprocessorInterface;
 use Magento\PageCache\Test\Unit\Block\Controller\StubBlock;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -58,6 +59,8 @@ protected function setUp(): void
         $this->responseMock = $this->createMock(Http::class);
         $this->configMock = $this->createMock(Config::class);
         $this->maintenanceModeMock = $this->createMock(MaintenanceMode::class);
+        $preprocessor = $this->createMock(PageCacheTagsPreprocessorInterface::class);
+        $preprocessor->method('process')->willReturnArgument(0);
 
         $this->model = (new ObjectManagerHelper($this))->getObject(
             LayoutPlugin::class,
@@ -65,6 +68,7 @@ protected function setUp(): void
                 'response' => $this->responseMock,
                 'config' => $this->configMock,
                 'maintenanceMode' => $this->maintenanceModeMock,
+                'pageCacheTagsPreprocessor' => $preprocessor
             ]
         );
     }
diff --git a/app/code/Magento/PageCache/etc/di.xml b/app/code/Magento/PageCache/etc/di.xml
index 9bc86b6f1e3f9..3f4b36ce0f98c 100644
--- a/app/code/Magento/PageCache/etc/di.xml
+++ b/app/code/Magento/PageCache/etc/di.xml
@@ -49,4 +49,5 @@
     </type>
     <preference for="Magento\PageCache\Model\VclGeneratorInterface" type="Magento\PageCache\Model\Varnish\VclGenerator"/>
     <preference for="Magento\PageCache\Model\VclTemplateLocatorInterface" type="Magento\PageCache\Model\Varnish\VclTemplateLocator"/>
+    <preference for="Magento\PageCache\Model\Spi\PageCacheTagsPreprocessorInterface" type="Magento\PageCache\Model\PageCacheTagsPreprocessorComposite"/>
 </config>
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/ViewTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/ViewTest.php
index 5458de89e9b82..e8f9607530fba 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/ViewTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Product/ViewTest.php
@@ -13,6 +13,7 @@
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\Eav\Model\Entity\Type;
+use Magento\Framework\App\Cache\Manager;
 use Magento\Framework\App\Http;
 use Magento\Framework\Registry;
 use Magento\Store\Model\StoreManagerInterface;
@@ -268,6 +269,30 @@ public function testProductWithoutWebsite(): void
         $this->assert404NotFound();
     }
 
+    /**
+     * Test that 404 page has product tag if product is not visible
+     *
+     * @magentoDataFixture Magento/Quote/_files/is_not_salable_product.php
+     * @magentoCache full_page enabled
+     * @return void
+     */
+    public function test404NotFoundPageCacheTags(): void
+    {
+        $cache = $this->_objectManager->get(Manager::class);
+        $cache->clean(['full_page']);
+        $product = $this->productRepository->get('simple-99');
+        $this->dispatch(sprintf('catalog/product/view/id/%s/', $product->getId()));
+        $this->assert404NotFound();
+        $pTag = Product::CACHE_TAG . '_' . $product->getId();
+        $hTags = $this->getResponse()->getHeader('X-Magento-Tags');
+        $tags = $hTags && $hTags->getFieldValue() ? explode(',', $hTags->getFieldValue()) : [];
+        $this->assertContains(
+            $pTag,
+            $tags,
+            "Failed asserting that X-Magento-Tags: {$hTags->getFieldValue()} contains \"$pTag\""
+        );
+    }
+
     /**
      * @param string|ProductInterface $product
      * @param array $data

From 1b40d89d4b366dfb0355a2aa5c4b00319cf857df Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 15 Jul 2020 11:49:47 +0300
Subject: [PATCH 0864/1718] Create action group for saving product

---
 .../Mftf/Test/AdminAddBundleItemsTest.xml     |  4 ++--
 .../Test/AdminAttributeSetSelectionTest.xml   |  4 ++--
 .../AdminBasicBundleProductAttributesTest.xml |  2 +-
 ...ndEditBundleProductOptionsNegativeTest.xml |  2 +-
 .../Test/AdminDeleteABundleProductTest.xml    |  2 +-
 .../AdminEditRelatedBundleProductTest.xml     |  4 ++--
 ...inFilterProductListByBundleProductTest.xml |  2 +-
 .../AdminMassDeleteBundleProductsTest.xml     |  4 ++--
 .../Test/AdminProductBundleCreationTest.xml   |  2 +-
 .../Test/BundleProductFixedPricingTest.xml    |  2 +-
 .../EnableDisableBundleProductStatusTest.xml  |  5 ++---
 .../MassEnableDisableBundleProductsTest.xml   |  4 ++--
 ...NewProductsListWidgetBundleProductTest.xml |  2 +-
 .../StorefrontBundleProductDetailsTest.xml    |  2 +-
 ...eProductShownInCategoryListAndGridTest.xml |  2 +-
 ...ontGoToDetailsPageWhenAddingToCartTest.xml |  2 +-
 .../AdminProductFormSaveActionGroup.xml       | 19 +++++++++++++++++++
 .../Test/Mftf/Test/AddToCartCrossSellTest.xml |  6 ++----
 .../AdminAddImageToWYSIWYGProductTest.xml     |  3 +--
 .../AdminAddInStockProductToTheCartTest.xml   |  3 +--
 .../AdminApplyTierPriceToProductTest.xml      |  2 +-
 ...oductPriceWithDisabledChildProductTest.xml |  3 +--
 ...eateCategoryWithProductsGridFilterTest.xml |  6 ++----
 .../AdminCreateProductDuplicateUrlkeyTest.xml |  2 +-
 ...inCreateSimpleProductNegativePriceTest.xml |  2 +-
 .../AdminCreateSimpleProductZeroPriceTest.xml |  2 +-
 ...dminEditTextEditorProductAttributeTest.xml |  3 +--
 ...inMultipleWebsitesUseDefaultValuesTest.xml |  3 +--
 .../AdminSimpleProductImagesTest.xml          |  4 ++--
 .../AdminSimpleProductRemoveImagesTest.xml    |  4 ++--
 .../AdminSimpleProductSetEditContentTest.xml  |  4 ++--
 .../AdminSimpleSetEditRelatedProductsTest.xml |  4 ++--
 .../Mftf/Test/AdminSortingByWebsitesTest.xml  |  3 +--
 ...NewProductsListWidgetSimpleProductTest.xml |  2 +-
 ...ewProductsListWidgetVirtualProductTest.xml |  2 +-
 ...ductWithCustomOptionsSecondWebsiteTest.xml |  6 ++----
 ...ctCustomOptionsDifferentStoreViewsTest.xml |  6 +++---
 ...IncrementsWorkWithDecimalinventoryTest.xml |  4 ++--
 ...yTinyMCEv4IsNativeWYSIWYGOnProductTest.xml |  2 +-
 ...tOnCheckoutPageDifferentStoreViewsTest.xml |  2 +-
 ...hangedWhenSavingProductWithSameSkuTest.xml |  2 +-
 ...nCheckValidatorConfigurableProductTest.xml |  4 ++--
 ...uctAfterGettingIncorrectSKUMessageTest.xml |  4 ++--
 .../AdminConfigurableProductLongSkuTest.xml   |  4 ++--
 ...figurableProductChildrenOutOfStockTest.xml |  4 ++--
 ...ductOutOfStockAndDeleteCombinationTest.xml |  2 +-
 ...onfigurableProductAddConfigurationTest.xml |  2 +-
 ...ConfigurableProductDisableAnOptionTest.xml |  3 +--
 ...nConfigurableProductRemoveAnOptionTest.xml |  3 +--
 ...igurableProductRemoveConfigurationTest.xml |  2 +-
 ...bleProductPriceAdditionalStoreViewTest.xml |  6 ++----
 ...ductsListWidgetConfigurableProductTest.xml |  2 +-
 .../ProductsQtyReturnAfterOrderCancelTest.xml |  3 +--
 ...rontConfigurableProductChildSearchTest.xml |  2 +-
 ...gurableProductWithFileCustomOptionTest.xml |  2 +-
 ...nfigurableProductLayeredNavigationTest.xml |  3 +--
 ...ductsListWidgetDownloadableProductTest.xml |  2 +-
 ...ontElasticsearchSearchInvalidValueTest.xml |  2 +-
 ...ewProductsListWidgetGroupedProductTest.xml |  2 +-
 .../YoutubeVideoWindowOnProductPageTest.xml   |  3 +--
 ...tSwatchProductWithFileCustomOptionTest.xml |  2 +-
 ...AddMultipleStoreProductsToWishlistTest.xml |  4 ++--
 62 files changed, 102 insertions(+), 103 deletions(-)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormSaveActionGroup.xml

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddBundleItemsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddBundleItemsTest.xml
index 4a78aeb752ca7..debf023ea0a65 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddBundleItemsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddBundleItemsTest.xml
@@ -70,7 +70,7 @@
         </actionGroup>
 
         <!--Save the product-->
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
         <see userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
 
         <!--Checking on admin side-->
@@ -117,7 +117,7 @@
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '3')}}" userInput="{{BundleProduct.defaultQuantity}}" stepKey="fillNewProductDefaultQty2"/>
 
         <!--Save the product-->
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButtonAgain"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButtonAgain"/>
         <see userInput="You saved the product." stepKey="messageYouSavedTheProductIsShownAgain"/>
 
         <!--Checking on admin side-->
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml
index 6bb4c3e0e1a5f..33bfa455e2bdf 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAttributeSetSelectionTest.xml
@@ -49,7 +49,7 @@
         <fillField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{BundleProduct.sku}}" stepKey="fillProductSku"/>
 
         <!--save the product/published by default-->
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
 
         <!--Testing that price appears correctly in admin catalog-->
@@ -70,7 +70,7 @@
         <click selector="{{AdminProductFormSection.attributeSetFilterResult}}" stepKey="selectAttrSet2"/>
 
         <!--save the product/published by default-->
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton2"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton2"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown2"/>
 
         <!--Testing that price appears correctly in admin catalog-->
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminBasicBundleProductAttributesTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminBasicBundleProductAttributesTest.xml
index 56dad8b214d0f..41b372cf150a0 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminBasicBundleProductAttributesTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminBasicBundleProductAttributesTest.xml
@@ -143,7 +143,7 @@
         <selectOption selector="{{AdminProductFormBundleSection.countryOfManufactureDropDown}}" userInput="France" stepKey="countryOfManufactureDropDown"/>
 
         <!--Save the product-->
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
 
         <!--Verify form was filled out correctly after edit-->
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminCreateAndEditBundleProductOptionsNegativeTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminCreateAndEditBundleProductOptionsNegativeTest.xml
index 82da228e040dc..5a7c1beeea706 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminCreateAndEditBundleProductOptionsNegativeTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminCreateAndEditBundleProductOptionsNegativeTest.xml
@@ -111,7 +111,7 @@
 
         <!-- Save product form -->
         <actionGroup ref="SaveProductFormActionGroup" stepKey="clickSaveProduct"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveWithTwoOptions"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveWithTwoOptions"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
 
         <!-- Delete created bundle product -->
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml
index e9b91a0efb595..9716791985970 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml
@@ -57,7 +57,7 @@
         <actionGroup ref="AncillaryPrepBundleProductActionGroup" stepKey="createBundledProductForTwoSimpleProducts"/>
 
         <!--Save the product-->
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
 
         <!--Go to catalog deletion page-->
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml
index 61a9c7c975324..0b29c29e62e34 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminEditRelatedBundleProductTest.xml
@@ -52,7 +52,7 @@
         </actionGroup>
 
         <!--Save the product-->
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
 
         <actionGroup ref="AddRelatedProductBySkuActionGroup" stepKey="addRelatedProduct1">
@@ -63,7 +63,7 @@
         <click selector="{{AdminProductFormRelatedUpSellCrossSellSection.removeRelatedProduct($$simpleProduct0.sku$$)}}" stepKey="removeRelatedProduct"/>
 
         <!--Save the product-->
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButtonAfterEdit"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButtonAfterEdit"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShownAgain"/>
 
         <!--See related product in admin-->
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProductTest.xml
index 45cbb7d83bb2d..b7d2edf2ec080 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProductTest.xml
@@ -57,7 +57,7 @@
         <actionGroup ref="AncillaryPrepBundleProductActionGroup" stepKey="createBundledProductForTwoSimpleProducts"/>
 
         <!--Save the product-->
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
 
         <!--Apply Bundle Product Filter-->
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProductsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProductsTest.xml
index a995a629092c6..ef84ebd6fafea 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProductsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProductsTest.xml
@@ -67,7 +67,7 @@
         </actionGroup>
 
         <!--Save the product-->
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
 
         <!--Creating Second bundle product-->
@@ -107,7 +107,7 @@
         <fillField userInput="{{BundleProduct.urlKey2}}" selector="{{AdminProductFormBundleSection.urlKey}}" stepKey="FillsinSEOlinkExtension2"/>
 
         <!--Save the product-->
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton2"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton2"/>
         <see userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown2"/>
 
         <!--Mass delete bundle products-->
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminProductBundleCreationTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminProductBundleCreationTest.xml
index 17235c531de8f..d05a4707d6fa0 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminProductBundleCreationTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminProductBundleCreationTest.xml
@@ -66,7 +66,7 @@
         </actionGroup>
 
         <!--save the product/published by default-->
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
 
         <!-- go to page-->
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml
index b8eef5c1b406f..888c857ac61f7 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml
@@ -73,7 +73,7 @@
         <fillField userInput="{{BundleProduct.fixedPrice}}" selector="{{AdminProductFormBundleSection.priceField}}" stepKey="fillPrice"/>
 
         <!--Save the product-->
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
 
         <!--Testing that price appears correctly in admin catalog-->
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/EnableDisableBundleProductStatusTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/EnableDisableBundleProductStatusTest.xml
index 90619eeeadae9..c0d6778c2efb8 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/EnableDisableBundleProductStatusTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/EnableDisableBundleProductStatusTest.xml
@@ -65,7 +65,7 @@
         </actionGroup>
 
         <!--Save the product-->
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
 
         <!--Testing enabled view-->
@@ -83,8 +83,7 @@
         </actionGroup>
         <click selector="{{AdminDataGridTableSection.rowViewAction('1')}}" stepKey="ClickProductInGrid"/>
         <click stepKey="ClickOnEnableDisableToggle" selector="{{AdminProductFormBundleSection.enableDisableToggle}}"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButtonAgain"/>
-        <waitForPageLoad stepKey="PauseForSave"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButtonAgain"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShownAgain"/>
         <amOnPage url="{{BundleProduct.urlKey}}.html" stepKey="GoToProductPageAgain"/>
         <waitForPageLoad stepKey="WaitForProductPageToLoadToShowElement"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
index 5ebb50b161284..0edeb5a18a9db 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
@@ -64,7 +64,7 @@
         <actionGroup ref="AncillaryPrepBundleProductActionGroup" stepKey="createBundledProductForTwoSimpleProducts"/>
 
         <!--Save the product-->
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
 
         <!--Creating Second bundle product-->
@@ -105,7 +105,7 @@
         <fillField userInput="{{BundleProduct.urlKey2}}" selector="{{AdminProductFormBundleSection.urlKey}}" stepKey="FillsinSEOlinkExtension2"/>
 
         <!--Save the product-->
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton2"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton2"/>
         <see userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown2"/>
 
         <!--Clear Filters-->
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/NewProductsListWidgetBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/NewProductsListWidgetBundleProductTest.xml
index cc2aeb0602d36..77e14c8931383 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/NewProductsListWidgetBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/NewProductsListWidgetBundleProductTest.xml
@@ -64,7 +64,7 @@
         <click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="clickAddSelectedBundleProducts"/>
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '0')}}" userInput="1" stepKey="fillProductDefaultQty1"/>
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYQuantity('0', '1')}}" userInput="1" stepKey="fillProductDefaultQty2"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveProduct"/>
 
         <!-- If PageCache is enabled, Cache clearing happens here, via merge -->
 
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductDetailsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductDetailsTest.xml
index 786040d16b7e2..43b11549d0824 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductDetailsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductDetailsTest.xml
@@ -73,7 +73,7 @@
         </actionGroup>
 
         <!--save the product-->
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButtonAgain"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButtonAgain"/>
         <see userInput="You saved the product." stepKey="messageYouSavedTheProductIsShownAgain"/>
 
         <!--Checking details-->
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGridTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGridTest.xml
index 3532e8f4fdd54..2a962f6ef71b4 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGridTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGridTest.xml
@@ -73,7 +73,7 @@
         <actionGroup ref="AncillaryPrepBundleProductActionGroup" stepKey="createBundledProductForTwoSimpleProducts"/>
 
         <!--Save the product-->
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
 
         <magentoCron stepKey="runCronReindex" groups="index"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml
index f0836229bb653..b3cbdb93fb830 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml
@@ -63,7 +63,7 @@
         <actionGroup ref="AncillaryPrepBundleProductActionGroup" stepKey="createBundledProductForTwoSimpleProducts"/>
 
         <!--Save the product-->
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown"/>
 
         <!--Go to category page-->
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormSaveActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormSaveActionGroup.xml
new file mode 100644
index 0000000000000..3db88bf3054bf
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductFormSaveActionGroup.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="AdminProductFormSaveActionGroup">
+        <annotations>
+            <description>Click save button for saving product.</description>
+        </annotations>
+
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        <waitForPageLoad stepKey="waitForProductSaving"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AddToCartCrossSellTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AddToCartCrossSellTest.xml
index e00b3fe2994eb..b677fae5e58ea 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AddToCartCrossSellTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AddToCartCrossSellTest.xml
@@ -53,8 +53,7 @@
         <actionGroup ref="AddCrossSellProductBySkuActionGroup" stepKey="addProduct3ToSimp1">
             <argument name="sku" value="$simpleProduct3.sku$"/>
         </actionGroup>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
-        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSave"/>
 
         <!-- Go to simpleProduct3, add simpleProduct1 and simpleProduct2 as cross-sell-->
         <actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="goToProduct3">
@@ -68,8 +67,7 @@
         <actionGroup ref="AddCrossSellProductBySkuActionGroup" stepKey="addProduct2ToSimp3">
             <argument name="sku" value="$simpleProduct2.sku$"/>
         </actionGroup>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave2"/>
-        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSave2"/>
 
         <!-- Go to frontend, add simpleProduct1 to cart-->
         <actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addSimp1ToCart">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml
index d86a696880bae..01909afe5d495 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml
@@ -98,8 +98,7 @@
         <fillField selector="{{ProductShortDescriptionWYSIWYGToolbarSection.Height}}" userInput="{{ImageUpload3.height}}" stepKey="fillImageHeight2" />
         <click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.OkBtn}}" stepKey="clickOkBtn2" />
         <waitForPageLoad stepKey="waitForPageLoad6"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoading12" />
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveProduct"/>
         <amOnPage url="{{_defaultProduct.name}}.html" stepKey="navigateToProductPage"/>
         <waitForPageLoad stepKey="waitForPageLoad7"/>
         <seeElement selector="{{StorefrontProductInfoMainSection.mediaDescription}}" stepKey="assertMediaDescription"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml
index a41d0836a2ded..3815901b417e3 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml
@@ -57,8 +57,7 @@
         <selectOption selector="{{AdminProductFormAdvancedInventorySection.advancedInventoryStockStatus}}" userInput="In Stock" stepKey="selectOutOfStock"/>
         <click stepKey="clickOnDoneButton" selector="{{AdminProductFormAdvancedInventorySection.doneButton}}"/>
         <waitForPageLoad stepKey="waitForProductPageToLoad"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}"  stepKey="clickOnSaveButton"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickOnSaveButton"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
         <!--Clear cache and reindex-->
         <magentoCLI command="indexer:reindex" stepKey="reindex"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml
index cbbd496e8cb34..ae56c9299d678 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/AdminApplyTierPriceToProductTest.xml
@@ -246,7 +246,7 @@
         <click selector="{{AdminProductFormAdvancedPricingSection.advancedPricingCloseButton}}" stepKey="closeAdvancedPricingPopup"/>
         <waitForElementVisible selector="{{AdminProductFormSection.productPrice}}" stepKey="waitForAdminProductFormSectionProductPriceInput"/>
         <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="200" stepKey="fillProductPrice200"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
         <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToShoppingCartPage4"/>
         <grabTextFrom selector="{{CheckoutCartProductSection.productSubtotalByName($$createSimpleProduct.name$$)}}" stepKey="grabTextFromSubtotalField7"/>
         <assertEquals message="Shopping cart should contain subtotal $4,000" stepKey="assertSubtotalField7">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckConfigurableProductPriceWithDisabledChildProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckConfigurableProductPriceWithDisabledChildProductTest.xml
index 39351539d14a6..167ba8932db19 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckConfigurableProductPriceWithDisabledChildProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckConfigurableProductPriceWithDisabledChildProductTest.xml
@@ -156,8 +156,7 @@
 
         <!-- Disable the product -->
         <click selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="disableProduct"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}"  stepKey="clickOnSaveButton"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickOnSaveButton"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
 
         <!-- Open Product Store Front Page -->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilterTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilterTest.xml
index 0b269749c5dd6..9aa228174674c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilterTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryWithProductsGridFilterTest.xml
@@ -41,8 +41,7 @@
         <scrollTo selector="{{AdminProductFormBundleSection.seoDropdown}}" stepKey="scrollToSearchEngine"/>
         <click selector="{{AdminProductFormBundleSection.seoDropdown}}" stepKey="selectSearchEngineOptimization"/>
         <fillField selector="{{AdminProductFormBundleSection.urlKey}}" userInput="{{SimpleProduct.urlKey}}" stepKey="fillUrlKey"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveDefaultProduct"/>
-        <waitForPageLoad stepKey="waitForPDefaultProductSaved"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveDefaultProduct"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="successMessageYouSavedTheProductIsShown"/>
         <!--Create product with grid filter Not Visible Individually-->
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="ProductList"/>
@@ -55,8 +54,7 @@
         <scrollTo selector="{{AdminProductFormBundleSection.seoDropdown}}" stepKey="scrollToSearchEngineOptimization"/>
         <click selector="{{AdminProductFormBundleSection.seoDropdown}}" stepKey="selectSearchEngineOptimization1"/>
         <fillField selector="{{AdminProductFormBundleSection.urlKey}}" userInput="{{defaultSimpleProduct.urlKey}}" stepKey="fillUrlKey1"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
-        <waitForPageLoad stepKey="waitForProductSaved"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveProduct"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
         <!--Create sub category-->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDuplicateUrlkeyTest/AdminCreateProductDuplicateUrlkeyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDuplicateUrlkeyTest/AdminCreateProductDuplicateUrlkeyTest.xml
index c461aa8bfcf18..40ac4a1a7e9a7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDuplicateUrlkeyTest/AdminCreateProductDuplicateUrlkeyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductDuplicateUrlkeyTest/AdminCreateProductDuplicateUrlkeyTest.xml
@@ -36,7 +36,7 @@
         <fillField userInput="$$simpleProduct.quantity$$" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
         <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
         <fillField userInput="$$simpleProduct.custom_attributes[url_key]$$" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveProduct"/>
         <see userInput="The value specified in the URL Key field would generate a URL that already exists" selector="{{AdminProductMessagesSection.errorMessage}}" stepKey="assertErrorMessage"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest/AdminCreateSimpleProductNegativePriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest/AdminCreateSimpleProductNegativePriceTest.xml
index a8cc66243d73e..9f51d6227aa1d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest/AdminCreateSimpleProductNegativePriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest/AdminCreateSimpleProductNegativePriceTest.xml
@@ -22,7 +22,7 @@
         <waitForPageLoad stepKey="wait1"/>
         <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{SimpleProduct.name}}" stepKey="fillName"/>
         <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="-42" stepKey="fillPrice"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSave"/>
         <see selector="{{AdminProductFormSection.priceFieldError}}" userInput="Please enter a number 0 or greater in this field." stepKey="seePriceValidationError"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest/AdminCreateSimpleProductZeroPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest/AdminCreateSimpleProductZeroPriceTest.xml
index f4878f2948e9d..24f87cca958ab 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest/AdminCreateSimpleProductZeroPriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest/AdminCreateSimpleProductZeroPriceTest.xml
@@ -22,7 +22,7 @@
         <waitForPageLoad stepKey="wait1"/>
         <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{SimpleProduct.name}}" stepKey="fillName"/>
         <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="0" stepKey="fillPrice"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSave"/>
         <amOnPage url="{{StorefrontProductPage.url(SimpleProduct.name)}}" stepKey="viewProduct"/>
         <waitForPageLoad stepKey="wait2"/>
         <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$0.00" stepKey="seeZeroPrice"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminEditTextEditorProductAttributeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminEditTextEditorProductAttributeTest.xml
index f0d670cd35471..6e27a9094d058 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminEditTextEditorProductAttributeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminEditTextEditorProductAttributeTest.xml
@@ -44,8 +44,7 @@
         <fillField userInput="{{_defaultProduct.quantity}}" selector="{{AdminProductFormSection.productQuantity}}" stepKey="fillQuantity"/>
         <dontSeeElement selector="{{ProductAttributeWYSIWYGSection.TinyMCE4($$myProductAttributeCreation.attribute_code$$)}}" stepKey="dontSeeTinyMCE4" />
         <fillField selector="{{ProductAttributeWYSIWYGSection.TextArea($$myProductAttributeCreation.attribute_code$$)}}" userInput="Text Area" stepKey="fillContentTextarea" />
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoading1"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveProduct"/>
         <!-- Go to storefront product page, assert product content -->
         <amOnPage url="{{_defaultProduct.name}}.html" stepKey="navigateToProductPage"/>
         <waitForPageLoad stepKey="waitForPageLoad5"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml
index c1cfcf7ebe10f..11e2948e87cea 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml
@@ -64,8 +64,7 @@
         <!-- Add product to second website and save the product -->
         <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="openProductInWebsites"/>
         <click selector="{{ProductInWebsitesSection.website('Second Website')}}" stepKey="selectSecondWebsite"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForProductPageSave"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSave"/>
         <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessage"/>
 
         <!-- switch to the second store view -->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductImagesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductImagesTest.xml
index 9819890ed3751..25a7cf70c290d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductImagesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductImagesTest.xml
@@ -106,7 +106,7 @@
         <dontSeeElement selector="{{AdminProductMessagesSection.errorMessage}}" stepKey="dontSeeErrorPng"/>
 
         <!-- Save the first product and go to the storefront -->
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveProduct"/>
         <amOnPage url="$$firstProduct.name$$.html" stepKey="goToStorefront"/>
         <waitForPageLoad stepKey="waitForStorefront"/>
 
@@ -142,7 +142,7 @@
         <fillField selector="{{AdminProductSEOSection.urlKeyInput}}" userInput="$$secondProduct.name$$" stepKey="fillUrlKey2"/>
 
         <!-- Save the second product -->
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct2"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveProduct2"/>
         <magentoCLI command="indexer:reindex" stepKey="reindex"/>
         <magentoCLI command="cache:flush" stepKey="flushCache"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductRemoveImagesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductRemoveImagesTest.xml
index ec82bdcf5bc94..05b3a9173f8be 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductRemoveImagesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductImagesTest/AdminSimpleProductRemoveImagesTest.xml
@@ -85,7 +85,7 @@
         <waitForPageLoad stepKey="waitForHide3"/>
 
         <!-- Save the product with all 3 images -->
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveProduct"/>
 
         <!-- Go to the product page and see the Base image -->
         <amOnPage url="$$product.name$$.html" stepKey="goToProductPage"/>
@@ -120,7 +120,7 @@
         <click selector="{{AdminProductImagesSection.nthRemoveImageBtn('1')}}" stepKey="removeImage1"/>
         <click selector="{{AdminProductImagesSection.nthRemoveImageBtn('2')}}" stepKey="removeImage2"/>
         <click selector="{{AdminProductImagesSection.nthRemoveImageBtn('3')}}" stepKey="removeImage3"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct2"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveProduct2"/>
 
         <!-- Check admin grid for placeholder -->
         <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductIndex4"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductSetEditContentTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductSetEditContentTest.xml
index 51a91a17ff41a..7906199984b0f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductSetEditContentTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleProductSetEditContentTest.xml
@@ -51,7 +51,7 @@
         <fillField selector="{{AdminProductContentSection.shortDescriptionTextArea}}" userInput="This is the short description" stepKey="fillShortDescription"/>
 
         <!--save the product-->
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
 
         <!--Edit content-->
@@ -61,7 +61,7 @@
         <fillField selector="{{AdminProductContentSection.shortDescriptionTextArea}}" userInput="EDIT ~ This is the short description ~ EDIT" stepKey="editShortDescription"/>
 
         <!--save the product-->
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButtonAfterEdit"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButtonAfterEdit"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShownAgain"/>
 
         <!--Checking content admin-->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml
index 2396bea2768a7..977ceaf5c6cb8 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSimpleSetEditRelatedProductsTest.xml
@@ -61,7 +61,7 @@
         </actionGroup>
 
         <!--Save the product-->
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
 
         <!--Add another related product-->
@@ -73,7 +73,7 @@
         <click selector="{{AdminProductFormRelatedUpSellCrossSellSection.removeRelatedProduct($$simpleProduct0.sku$$)}}" stepKey="removeRelatedProduct"/>
 
         <!--Save the product-->
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButtonAfterEdit"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButtonAfterEdit"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShownAgain"/>
 
         <!--See related product in admin-->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml
index 71e827a64ae2d..bc1bfb5af9a3f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminSortingByWebsitesTest.xml
@@ -62,8 +62,7 @@
         <uncheckOption selector="{{ProductInWebsitesSection.website(_defaultWebsite.name)}}" stepKey="deselectMainWebsite"/>
         <checkOption selector="{{ProductInWebsitesSection.website(customWebsite.name)}}" stepKey="selectWebsite"/>
 
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForProductPageToSaveAgain"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSave"/>
         <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessageAgain"/>
 
         <!--Navigate To Product Grid To Check Website Sorting-->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/NewProductsListWidgetSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/NewProductsListWidgetSimpleProductTest.xml
index 9ee56c02c7710..12819335c6d14 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/NewProductsListWidgetSimpleProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/NewProductsListWidgetSimpleProductTest.xml
@@ -32,7 +32,7 @@
         <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="100" stepKey="fillProductQuantity"/>
         <fillField selector="{{AdminProductFormSection.setProductAsNewFrom}}" userInput="01/1/2000" stepKey="fillProductNewFrom"/>
         <fillField selector="{{AdminProductFormSection.setProductAsNewTo}}" userInput="01/1/2099" stepKey="fillProductNewTo"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveProduct"/>
 
         <!-- If PageCache is enabled, Cache clearing happens here via merge  -->
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/NewProductsListWidgetVirtualProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/NewProductsListWidgetVirtualProductTest.xml
index a4e0d8708eb49..0ea88409ad482 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/NewProductsListWidgetVirtualProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/NewProductsListWidgetVirtualProductTest.xml
@@ -35,7 +35,7 @@
         <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="100" stepKey="fillProductQuantity"/>
         <fillField selector="{{AdminProductFormSection.setProductAsNewFrom}}" userInput="01/1/2000" stepKey="fillProductNewFrom"/>
         <fillField selector="{{AdminProductFormSection.setProductAsNewTo}}" userInput="01/1/2099" stepKey="fillProductNewTo"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveProduct"/>
 
         <!-- If PageCache is enabled, Cache clearing happens here, via merge -->
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
index b206a33ebde88..4e90b9bf482a1 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
@@ -88,15 +88,13 @@
         <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice('Radio Option', '2')}}" userInput="7" stepKey="fillOptionValuePrice3"/>
 
         <!--Save the product with custom options -->
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
-        <waitForLoadingMaskToDisappear stepKey="waitProductPageSave"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
         <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeProductSavedMessage"/>
 
         <!-- Add this product to second website -->
         <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="openProductInWebsitesSection1"/>
         <click selector="{{ProductInWebsitesSection.website('Second Website')}}" stepKey="selectSecondWebsite"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForProductPagetoSaveAgain"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSave"/>
         <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessageAgain"/>
 
         <click selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" stepKey="openCustomOptionsSection2"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml
index 767e0c88b7af2..613e6d0894e76 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductCustomOptionsDifferentStoreViewsTest.xml
@@ -103,7 +103,7 @@
         <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle('Custom Options 1', '1')}}" userInput="option2" stepKey="fillOptionValueTitle2"/>
         <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValuePrice('Custom Options 1', '1')}}" userInput="50" stepKey="fillOptionValuePrice2"/>
         <selectOption selector="{{AdminProductCustomizableOptionsSection.clickSelectPriceType('Custom Options 1', '1')}}" userInput="percent" stepKey="clickSelectPriceType"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton1"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton1"/>
 
         <!-- Switcher to Store FR-->
         <actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="switchToStoreFR">
@@ -127,7 +127,7 @@
         <click selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitleByIndex('1')}}" stepKey="clickHiddenRequireMessage"/>
         <uncheckOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitleByIndex('1')}}" stepKey="uncheckUseDefaultOptionValueTitle2"/>
         <fillField selector="{{AdminProductCustomizableOptionsSection.fillOptionValueTitle('FR Custom Options 1', '1')}}" userInput="FR option2" stepKey="fillOptionValueTitle4"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton2"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton2"/>
 
         <!-- Login Customer Storefront -->
 
@@ -304,7 +304,7 @@
 
         <waitForPageLoad time="30" stepKey="waitForPageLoad19"/>
         <checkOption selector="{{AdminProductCustomizableOptionsSection.useDefaultOptionTitleByIndex('1')}}" stepKey="checkUseDefaultOptionValueTitle2"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton3"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton3"/>
 
         <!--Go to Product Page-->
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/TieredPricingAndQuantityIncrementsWorkWithDecimalinventoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/TieredPricingAndQuantityIncrementsWorkWithDecimalinventoryTest.xml
index 26cebae318cd9..8ce3b55ff94ef 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/TieredPricingAndQuantityIncrementsWorkWithDecimalinventoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/TieredPricingAndQuantityIncrementsWorkWithDecimalinventoryTest.xml
@@ -50,7 +50,7 @@
         <fillField selector="{{AdminProductFormAdvancedPricingSection.productTierPriceQtyInput('0')}}" userInput="0.5" stepKey="fillProductTierPriceQty"/>
         <!--Step4. Close *Advanced Pricing* (Click on button *Done*). Save *prod1* (Click on button *Save*)-->
         <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickOnDoneButton2"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickOnSaveButton"/>
 
         <!--The code should be uncommented after fix MAGETWO-96016-->
         <!--<click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingLink2"/>-->
@@ -70,7 +70,7 @@
         <fillField selector="{{AdminProductFormAdvancedInventorySection.qtyIncrements}}" userInput=".5" stepKey="fillQtyIncrements"/>
         <!--Step6. Close *Advanced Inventory* (Click on button *Done*). Save *prod1* (Click on button *Save*) -->
         <click selector="{{AdminProductFormAdvancedInventorySection.doneButton}}" stepKey="clickOnDoneButton3"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton2"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickOnSaveButton2"/>
         <!--Step7. Open *Customer view* (Go to *Store Front*). Open *prod1* page (Find via search and click on product name) -->
         <amOnPage url="{{StorefrontHomePage.url}}$$createPreReqSimpleProduct.custom_attributes[url_key]$$.html" stepKey="amOnProductPage"/>
         <!--Step8. Fill *1.5* in *Qty*. Click on button *Add to Cart*-->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnProductTest.xml
index 1e4adedfc168d..c4a6d20326041 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnProductTest.xml
@@ -50,7 +50,7 @@
         <see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertImageBtn}}" userInput="Insert Image..." stepKey="seeInsertImage2"/>
         <dontSee selector="{{TinyMCESection.InsertWidgetBtn}}" stepKey="insertWidget2" />
         <dontSee selector="{{TinyMCESection.InsertVariableBtn}}" stepKey="insertVariable2" />
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveProduct"/>
         <!-- Go to storefront product page, assert product content -->
         <amOnPage url="{{_defaultProduct.name}}.html" stepKey="navigateToProductPage"/>
         <waitForPageLoad stepKey="waitForPageLoad2"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductNameMinicartOnCheckoutPageDifferentStoreViewsTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductNameMinicartOnCheckoutPageDifferentStoreViewsTest.xml
index 37a7bfff60eb1..f20d0b790edfa 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductNameMinicartOnCheckoutPageDifferentStoreViewsTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductNameMinicartOnCheckoutPageDifferentStoreViewsTest.xml
@@ -53,7 +53,7 @@
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <click selector="{{AdminProductFormSection.productNameUseDefault}}" stepKey="uncheckUseDefault"/>
         <fillField selector="{{AdminProductFormSection.productName}}" userInput="$$createProduct.name$$-new" stepKey="fillProductName"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveProduct"/>
 
         <!--Add product to cart-->
         <amOnPage url="{{StorefrontProductPage.url($$createProduct.name$$)}}" stepKey="amOnSimpleProductPage"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAssertNoticeThatExistingSkuAutomaticallyChangedWhenSavingProductWithSameSkuTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAssertNoticeThatExistingSkuAutomaticallyChangedWhenSavingProductWithSameSkuTest.xml
index 6e26d73f3a36f..85ef4e7546b46 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAssertNoticeThatExistingSkuAutomaticallyChangedWhenSavingProductWithSameSkuTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminAssertNoticeThatExistingSkuAutomaticallyChangedWhenSavingProductWithSameSkuTest.xml
@@ -64,7 +64,7 @@
 
         <!-- Save product -->
         <waitForElementVisible selector="{{AdminProductFormActionSection.saveButton}}" stepKey="waitForSaveBtnVisible"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProductAgain"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveProductAgain"/>
         <waitForElementVisible selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="waitPopUpVisible"/>
         <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmPopup"/>
 
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml
index dc8c09864d0ab..49cff29f68cbb 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml
@@ -101,7 +101,7 @@
         <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="waitForNextPageOpened3"/>
         <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="generateProducts"/>
         <waitForElementVisible selector="{{AdminProductFormActionSection.saveButton}}" stepKey="waitForSaveButtonVisible"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveProduct"/>
         <waitForElementVisible selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="waitForPopUpVisible"/>
         <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmInPopup"/>
         <dontSeeElement selector="{{AdminMessagesSection.success}}" stepKey="dontSeeSaveProductMessage"/>
@@ -119,7 +119,7 @@
 
         <!--Click on "Save"-->
         <waitForElementVisible selector="{{AdminProductFormActionSection.saveButton}}" stepKey="waitForSaveBtnVisible"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProductAgain"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveProductAgain"/>
 
         <!--Click on "Confirm". Product is saved, success message appears -->
         <waitForElementVisible selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="waitPopUpVisible"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest/AdminCreateConfigurableProductAfterGettingIncorrectSKUMessageTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest/AdminCreateConfigurableProductAfterGettingIncorrectSKUMessageTest.xml
index d53cc5f34b967..5a79efa652291 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest/AdminCreateConfigurableProductAfterGettingIncorrectSKUMessageTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductCreateTest/AdminCreateConfigurableProductAfterGettingIncorrectSKUMessageTest.xml
@@ -53,11 +53,11 @@
         <waitForPageLoad stepKey="waitForGenerateConfigure"/>
         <grabValueFrom selector="{{AdminProductFormConfigurationsSection.firstSKUInConfigurableProductsGrid}}" stepKey="grabTextFromContent"/>
         <fillField stepKey="fillMoreThan64Symbols" selector="{{AdminProductFormConfigurationsSection.firstSKUInConfigurableProductsGrid}}" userInput="01234567890123456789012345678901234567890123456789012345678901234"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct1"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveProduct1"/>
         <conditionalClick selector="{{AdminChooseAffectedAttributeSetPopup.closePopUp}}" dependentSelector="{{AdminChooseAffectedAttributeSetPopup.closePopUp}}" visible="true" stepKey="clickOnCloseInPopup"/>
         <see stepKey="seeErrorMessage" userInput="Please enter less or equal than 64 symbols."/>
         <fillField stepKey="fillCorrectSKU" selector="{{AdminProductFormConfigurationsSection.firstSKUInConfigurableProductsGrid}}" userInput="$grabTextFromContent"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct2"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveProduct2"/>
         <conditionalClick selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" dependentSelector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" visible="true" stepKey="clickOnConfirmInPopup"/>
         <see userInput="You saved the product." stepKey="seeSaveConfirmation"/>
         <actionGroup ref="AdminOpenProductAttributePageActionGroup" stepKey="goToProductAttributes"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductLongSkuTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductLongSkuTest.xml
index 10cdcea2855d6..66908af4b05cf 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductLongSkuTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductLongSkuTest.xml
@@ -71,7 +71,7 @@
         </actionGroup>
 
          <!--See SKU length errors in Current Variations grid-->
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProductFail"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveProductFail"/>
         <seeInCurrentUrl url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'configurable')}}" stepKey="seeRemainOnCreateProductPage"/>
         <see selector="{{AdminProductFormConfigurationsSection.variationsSkuInputErrorByRow('1')}}" userInput="Please enter less or equal than 64 symbols." stepKey="seeSkuTooLongError1"/>
         <see selector="{{AdminProductFormConfigurationsSection.variationsSkuInputErrorByRow('2')}}" userInput="Please enter less or equal than 64 symbols." stepKey="seeSkuTooLongError2"/>
@@ -79,7 +79,7 @@
         <fillField selector="{{AdminProductFormConfigurationsSection.variationsSkuInputByRow('1')}}" userInput="LongSku-$$getConfigAttributeOption1.label$$" stepKey="fixConfigurationSku1"/>
         <fillField selector="{{AdminProductFormConfigurationsSection.variationsSkuInputByRow('2')}}" userInput="LongSku-$$getConfigAttributeOption2.label$$" stepKey="fixConfigurationSku2"/>
         <!--Save product successfully-->
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProductSuccess"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveProductSuccess"/>
         <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessage"/>
 
          <!--Assert configurations on the product edit pag-->
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest/AdminConfigurableProductChildrenOutOfStockTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest/AdminConfigurableProductChildrenOutOfStockTest.xml
index 8d2f80ef262fd..9b57fdca1e2d5 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest/AdminConfigurableProductChildrenOutOfStockTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest/AdminConfigurableProductChildrenOutOfStockTest.xml
@@ -105,7 +105,7 @@
 
         <!-- Edit the quantity of the simple first product as 0 -->
         <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="0" stepKey="fillProductQuantity"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveProduct"/>
 
         <!-- Check to make sure that the configurable product shows up as in stock -->
         <amOnPage url="/{{ApiConfigurableProduct.urlKey}}2.html" stepKey="goToConfigProductPage2"/>
@@ -125,7 +125,7 @@
 
         <!-- Edit the quantity of the second simple product as 0 -->
         <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="0" stepKey="fillProductQuantity2"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct2"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveProduct2"/>
 
         <!-- Check to make sure that the configurable product shows up as out of stock -->
         <amOnPage url="/{{ApiConfigurableProduct.urlKey}}2.html" stepKey="goToConfigProductPage3"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest/AdminConfigurableProductOutOfStockAndDeleteCombinationTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest/AdminConfigurableProductOutOfStockAndDeleteCombinationTest.xml
index 3121725c23fe9..5c3dc85e9172b 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest/AdminConfigurableProductOutOfStockAndDeleteCombinationTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductOutOfStockTest/AdminConfigurableProductOutOfStockAndDeleteCombinationTest.xml
@@ -114,7 +114,7 @@
 
         <!-- Edit the quantity of the second simple product as 0 -->
         <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="0" stepKey="fillProductQuantity2"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct2"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveProduct2"/>
 
         <!-- Check to make sure that the configurable product shows up as out of stock -->
         <amOnPage url="/{{ApiConfigurableProduct.urlKey}}2.html" stepKey="goToConfigProductPage3"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest/AdminConfigurableProductAddConfigurationTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest/AdminConfigurableProductAddConfigurationTest.xml
index 589f20d0d544c..854cfb98607a7 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest/AdminConfigurableProductAddConfigurationTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest/AdminConfigurableProductAddConfigurationTest.xml
@@ -51,7 +51,7 @@
         <fillField selector="{{AdminCreateProductConfigurationsPanel.quantity}}" userInput="42" stepKey="enterAttributeQuantity"/>
         <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton3"/>
         <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton4"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveProduct"/>
 
         <!-- Verify that the added option is present in the storefront -->
         <amOnPage url="{{StorefrontProductPage.url(_defaultProduct.urlKey)}}" stepKey="amOnStorefrontPage"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest/AdminConfigurableProductDisableAnOptionTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest/AdminConfigurableProductDisableAnOptionTest.xml
index 1eb3df993dd1c..345b21246f30f 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest/AdminConfigurableProductDisableAnOptionTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest/AdminConfigurableProductDisableAnOptionTest.xml
@@ -88,8 +88,7 @@
         <waitForPageLoad stepKey="wait2"/>
         <click selector="{{AdminProductFormConfigurationsSection.actionsBtn('1')}}" stepKey="clickToExpandActions"/>
         <click selector="{{AdminProductFormConfigurationsSection.disableProductBtn}}" stepKey="clickDisable"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
-        <waitForPageLoad stepKey="wait3"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSave"/>
 
         <!--check storefront for one option-->
         <amOnPage url="$$createConfigProduct.sku$$.html" stepKey="amOnStorefront2"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest/AdminConfigurableProductRemoveAnOptionTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest/AdminConfigurableProductRemoveAnOptionTest.xml
index 00b17fda944f1..ec0ed623d2b0c 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest/AdminConfigurableProductRemoveAnOptionTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest/AdminConfigurableProductRemoveAnOptionTest.xml
@@ -92,8 +92,7 @@
         <!--remove an option-->
         <click selector="{{AdminProductFormConfigurationsSection.actionsBtn('1')}}" stepKey="clickToExpandActions"/>
         <click selector="{{AdminProductFormConfigurationsSection.removeProductBtn}}" stepKey="clickRemove"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
-        <waitForPageLoad stepKey="wait3"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSave"/>
 
         <!--check admin for one option-->
         <dontSee selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="$$createConfigChildProduct1.name$$" stepKey="dontSeeOption1Admin"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest/AdminConfigurableProductRemoveConfigurationTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest/AdminConfigurableProductRemoveConfigurationTest.xml
index a4051adfe5d28..75fbaa7f43887 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest/AdminConfigurableProductRemoveConfigurationTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductUpdateTest/AdminConfigurableProductRemoveConfigurationTest.xml
@@ -52,7 +52,7 @@
         <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton2"/>
         <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton3"/>
         <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton4"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveProduct"/>
 
         <!-- Verify that the removed option is not present in the storefront -->
         <amOnPage url="{{StorefrontProductPage.url(_defaultProduct.urlKey)}}" stepKey="amOnStorefrontPage"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml
index a34dfd06ce844..bb6508ab2e300 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml
@@ -113,8 +113,7 @@
         </actionGroup>
         <waitForPageLoad stepKey="waitEditPage"/>
         <click selector="{{AdminProductFormSection.enableProductLabel}}" stepKey="disableProductForAllStoreView"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton2"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForProductPageSave1" />
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton2"/>
         <dontSeeCheckboxIsChecked selector="{{AdminProductFormSection.productStatus}}" stepKey="dontSeeCheckboxEnableProductIsChecked"/>
 
         <!-- Disable each of the child products for All Store views -->
@@ -127,8 +126,7 @@
         <!-- Add product to second website -->
         <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="openProductInWebsitesSection1"/>
         <click selector="{{ProductInWebsitesSection.website('Second Website')}}" stepKey="selectSecondWebsite"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSave"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForProductPageSave"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSave"/>
         <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessage"/>
 
         <!-- switch to the second store view -->
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NewProductsListWidgetConfigurableProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NewProductsListWidgetConfigurableProductTest.xml
index 372aa03e4e152..7f1034db062df 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NewProductsListWidgetConfigurableProductTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NewProductsListWidgetConfigurableProductTest.xml
@@ -84,7 +84,7 @@
         <waitForPageLoad stepKey="waitForEditPage"/>
         <fillField selector="{{AdminProductFormSection.setProductAsNewFrom}}" userInput="01/1/2000" stepKey="fillProductNewFrom"/>
         <fillField selector="{{AdminProductFormSection.setProductAsNewTo}}" userInput="01/1/2099" stepKey="fillProductNewTo"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveProduct"/>
 
         <!-- If PageCache is enabled, Cache clearing happens here, via merge -->
 
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml
index a8856288b422a..f89dcf1ad70ae 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml
@@ -42,8 +42,7 @@
             <argument name="product" value="$$createConfigProduct$$"/>
         </actionGroup>
         <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="100" stepKey="changeProductQuantity"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveChanges"/>
-        <waitForPageLoad stepKey="waitProductGridToBeLoaded"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveChanges"/>
 
         <amOnPage url="$$createConfigProduct.sku$$.html" stepKey="navigateToProductPage"/>
         <waitForPageLoad stepKey="waitForProductPage"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml
index 77579c4d90ad5..3462cb7a05fc8 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml
@@ -126,7 +126,7 @@
             <!-- Edit the attribute for the first simple product -->
             <selectOption stepKey="editSelectAttribute" selector="{{ModifyAttributes.nthExistingAttribute($$createConfigProductAttributeSelect.default_frontend_label$$)}}" userInput="$$createConfigProductAttributeSelectOption1.option[store_labels][0][label]$$"/>
             <scrollToTopOfPage stepKey="scrollToTop"/>
-            <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+            <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveProduct"/>
             <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertSaveMessageSuccess"/>
         </before>
 
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductWithFileCustomOptionTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductWithFileCustomOptionTest.xml
index bbd5dbd8068f7..d9ad32df872f7 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductWithFileCustomOptionTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductWithFileCustomOptionTest.xml
@@ -37,7 +37,7 @@
         </actionGroup>
         <!--Add custom option to configurable product-->
         <actionGroup ref="AddProductCustomOptionFileActionGroup" stepKey="addCustomOptionToProduct"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveProduct"/>
 
         <!--Go to storefront-->
         <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToHomePage"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVerifyConfigurableProductLayeredNavigationTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVerifyConfigurableProductLayeredNavigationTest.xml
index 7acece767760d..ffd0a117e8962 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVerifyConfigurableProductLayeredNavigationTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontVerifyConfigurableProductLayeredNavigationTest.xml
@@ -134,8 +134,7 @@
         <waitForPageLoad stepKey="waitForProductPageToLoad"/>
         <scrollTo selector="{{AdminProductFormSection.productQuantity}}" stepKey="scrollToProductQuantity"/>
         <selectOption selector="{{AdminProductFormSection.productStockStatus}}" userInput="Out of Stock" stepKey="disableProduct"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}"  stepKey="clickOnSaveButton"/>
-        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickOnSaveButton"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
 
         <!--Run re-index task-->
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/NewProductsListWidgetDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/NewProductsListWidgetDownloadableProductTest.xml
index 55c673146021d..fb89d91486aad 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/NewProductsListWidgetDownloadableProductTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/NewProductsListWidgetDownloadableProductTest.xml
@@ -49,7 +49,7 @@
         <actionGroup ref="AddDownloadableProductLinkWithMaxDownloadsActionGroup" stepKey="addDownloadableLinkWithMaxDownloads">
             <argument name="link" value="downloadableLinkWithMaxDownloads"/>
         </actionGroup>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveProduct"/>
 
         <!-- If PageCache is enabled, Cache clearing happens here, via merge -->
 
diff --git a/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticsearchSearchInvalidValueTest.xml b/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticsearchSearchInvalidValueTest.xml
index 15aa599b93956..308ac3afa25e5 100644
--- a/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticsearchSearchInvalidValueTest.xml
+++ b/app/code/Magento/Elasticsearch6/Test/Mftf/Test/StorefrontElasticsearchSearchInvalidValueTest.xml
@@ -76,7 +76,7 @@
             <argument name="categoryName" value="$$createCategory.name$$"/>
         </actionGroup>
         <fillField selector="{{AdminProductFormSection.attributeRequiredInput(textProductAttribute.attribute_code)}}" userInput="searchable" stepKey="fillTheAttributeRequiredInputField"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButton"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveButton"/>
         <!-- TODO: REMOVE AFTER FIX MC-21717 -->
         <magentoCLI command="indexer:reindex" stepKey="reindex"/>
         <magentoCLI command="cache:flush eav" stepKey="flushCache"/>
diff --git a/app/code/Magento/GroupedProduct/Test/Mftf/Test/NewProductsListWidgetGroupedProductTest.xml b/app/code/Magento/GroupedProduct/Test/Mftf/Test/NewProductsListWidgetGroupedProductTest.xml
index d563796b21da9..9ee50e6f9ef7b 100644
--- a/app/code/Magento/GroupedProduct/Test/Mftf/Test/NewProductsListWidgetGroupedProductTest.xml
+++ b/app/code/Magento/GroupedProduct/Test/Mftf/Test/NewProductsListWidgetGroupedProductTest.xml
@@ -58,7 +58,7 @@
         <checkOption selector="{{AdminAddProductsToGroupPanel.nThCheckbox('0')}}" stepKey="checkFilterResult1"/>
         <checkOption selector="{{AdminAddProductsToGroupPanel.nThCheckbox('1')}}" stepKey="checkFilterResult2"/>
         <click selector="{{AdminAddProductsToGroupPanel.addSelectedProducts}}" stepKey="clickAddSelectedGroupProducts"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickSaveProduct"/>
 
         <!-- If PageCache is enabled, Cache clearing happens here, via merge -->
 
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Test/YoutubeVideoWindowOnProductPageTest.xml b/app/code/Magento/ProductVideo/Test/Mftf/Test/YoutubeVideoWindowOnProductPageTest.xml
index 3032f5208dd59..ca3cf264279a5 100644
--- a/app/code/Magento/ProductVideo/Test/Mftf/Test/YoutubeVideoWindowOnProductPageTest.xml
+++ b/app/code/Magento/ProductVideo/Test/Mftf/Test/YoutubeVideoWindowOnProductPageTest.xml
@@ -51,8 +51,7 @@
         <actionGroup ref="AssertProductVideoAdminProductPageActionGroup" stepKey="assertProductVideoAdminProductPage" after="addProductVideo"/>
 
         <!-- Save the product -->
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveFirstProduct"/>
-        <waitForPageLoad stepKey="waitForFirstProductSaved"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveFirstProduct"/>
 
         <!-- Assert product video in storefront product page -->
         <amOnPage url="$$createProduct.name$$.html" stepKey="goToStorefrontCategoryPage"/>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchProductWithFileCustomOptionTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchProductWithFileCustomOptionTest.xml
index 1b77e773ef283..7a9f570a1078a 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchProductWithFileCustomOptionTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontSwatchProductWithFileCustomOptionTest.xml
@@ -45,7 +45,7 @@
         <actionGroup ref="AddVisualSwatchToProductActionGroup" stepKey="addSwatchToProduct"/>
         <!--Add custom option to configurable product-->
         <actionGroup ref="AddProductCustomOptionFileActionGroup" stepKey="addCustomOptionToProduct"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveProduct"/>
 
         <!--Go to storefront-->
         <amOnPage url="" stepKey="goToHomePage"/>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml
index eed4dc8d4767e..8322acccaf3a4 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml
@@ -67,7 +67,7 @@
         <click selector="{{AdminProductFormChangeStoreSection.acceptButton}}" stepKey="acceptStoreSwitchingForProduct1"/>
         <click selector="{{AdminProductFormSection.visibilityUseDefault}}" stepKey="uncheckVisibilityUseDefaultValueForProduct1"/>
         <selectOption userInput="Not Visible Individually" selector="{{AdminProductFormSection.visibility}}" stepKey="makeProductNotVisibleOnSecondaryStoreView"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveEditedProductForProduct1"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveEditedProductForProduct1"/>
         <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForProduct2">
             <argument name="product" value="$$secondProduct$$"/>
         </actionGroup>
@@ -82,7 +82,7 @@
         <click selector="{{AdminProductFormChangeStoreSection.acceptButton}}" stepKey="acceptStoreSwitchingForProduct2"/>
         <click selector="{{AdminProductFormSection.visibilityUseDefault}}" stepKey="uncheckVisibilityUseDefaultValueForProduct2"/>
         <selectOption userInput="Not Visible Individually" selector="{{AdminProductFormSection.visibility}}" stepKey="makeProductNotVisibleOnDefaultStoreView"/>
-        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveEditedProductForProduct2"/>
+        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveEditedProductForProduct2"/>
 
         <!-- Sign in as customer -->
         <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">

From 653a7431f7d7bd561e6c52c50c99d16ecaf3aaae Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 15 Jul 2020 13:00:07 +0300
Subject: [PATCH 0865/1718] use action group for assertion

---
 ...CreateSimpleProductSwitchToVirtualTest.xml |  6 ++++-
 ...CreateVirtualProductSwitchToSimpleTest.xml |  6 ++++-
 ...roductTypeSwitchingToSimpleProductTest.xml | 12 ++++++++--
 ...TypeSwitchingToDownloadableProductTest.xml | 12 ++++++++--
 .../Test/Mftf/Test/EndToEndB2CAdminTest.xml   | 18 +++++++++++---
 .../AdminConfigurableProductSearchTest.xml    |  6 ++++-
 ...eConfigurableProductSwitchToSimpleTest.xml |  6 ++++-
 ...ConfigurableProductSwitchToVirtualTest.xml |  6 ++++-
 ...oadableProductSwitchToConfigurableTest.xml |  6 ++++-
 ...eSimpleProductSwitchToConfigurableTest.xml |  6 ++++-
 ...VirtualProductSwitchToConfigurableTest.xml |  6 ++++-
 ...onfigurableProductBasedOnParentSkuTest.xml | 12 ++++++++--
 ...ctWithTwoOptionsAssignedToCategoryTest.xml |  6 ++++-
 ...woOptionsWithoutAssignedToCategoryTest.xml |  6 ++++-
 ...TypeSwitchingToConfigurableProductTest.xml | 24 +++++++++++++++----
 .../ProductsQtyReturnAfterOrderCancelTest.xml |  6 ++++-
 ...eDownloadableProductSwitchToSimpleTest.xml |  6 ++++-
 ...TypeSwitchingToDownloadableProductTest.xml | 12 ++++++++--
 18 files changed, 135 insertions(+), 27 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateSimpleProductSwitchToVirtualTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateSimpleProductSwitchToVirtualTest.xml
index 65e67020e4532..3c7900f37d36f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateSimpleProductSwitchToVirtualTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateSimpleProductSwitchToVirtualTest.xml
@@ -54,7 +54,11 @@
         <actionGroup ref="FilterProductGridByNameActionGroup" stepKey="searchForProduct">
             <argument name="product" value="_defaultProduct"/>
         </actionGroup>
-        <see selector="{{AdminProductGridSection.productGridCell('1', 'Type')}}" userInput="Virtual Product" stepKey="seeProductTypeInGrid"/>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeProductTypeInGrid">
+            <argument name="row" value="1"/>
+            <argument name="column" value="Type"/>
+            <argument name="value" value="Virtual Product"/>
+        </actionGroup>
         <actionGroup ref="AssertProductInStorefrontProductPageActionGroup" stepKey="AssertProductInStorefrontProductPage">
             <argument name="product" value="_defaultProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateVirtualProductSwitchToSimpleTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateVirtualProductSwitchToSimpleTest.xml
index f79072582035b..7191f1971b319 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateVirtualProductSwitchToSimpleTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateVirtualProductSwitchToSimpleTest.xml
@@ -25,6 +25,10 @@
         <actionGroup ref="FillMainProductFormActionGroup" stepKey="fillProductForm">
             <argument name="product" value="_defaultProduct"/>
         </actionGroup>
-        <see selector="{{AdminProductGridSection.productGridCell('1', 'Type')}}" userInput="Simple Product" stepKey="seeProductTypeInGrid"/>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeProductTypeInGrid">
+            <argument name="row" value="1"/>
+            <argument name="column" value="Type"/>
+            <argument name="value" value="Simple Product"/>
+        </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminDownloadableProductTypeSwitchingToSimpleProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminDownloadableProductTypeSwitchingToSimpleProductTest.xml
index 9d82edd0fb50c..6d7de64b47434 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminDownloadableProductTypeSwitchingToSimpleProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminDownloadableProductTypeSwitchingToSimpleProductTest.xml
@@ -33,8 +33,16 @@
         <actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterSimpleProductGridBySku">
             <argument name="sku" value="$$createProduct.sku$$"/>
         </actionGroup>
-        <see selector="{{AdminProductGridSection.productGridCell('1', 'Name')}}" userInput="$$createProduct.name$$" stepKey="seeSimpleProductNameInGrid"/>
-        <see selector="{{AdminProductGridSection.productGridCell('1', 'Type')}}" userInput="Simple Product" stepKey="seeSimpleProductTypeInGrid"/>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeSimpleProductNameInGrid">
+            <argument name="row" value="1"/>
+            <argument name="column" value="Name"/>
+            <argument name="value" value="$$createProduct.name$$"/>
+        </actionGroup>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeSimpleProductTypeInGrid">
+            <argument name="row" value="1"/>
+            <argument name="column" value="Type"/>
+            <argument name="value" value="Simple Product"/>
+        </actionGroup>
         <actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearSimpleProductFilters"/>
         <!--Assert simple product on storefront-->
         <comment userInput="Assert simple product on storefront" stepKey="commentAssertSimpleProductOnStorefront"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminVirtualProductTypeSwitchingToDownloadableProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminVirtualProductTypeSwitchingToDownloadableProductTest.xml
index 12d654508d7d7..de99933c78933 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminVirtualProductTypeSwitchingToDownloadableProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminVirtualProductTypeSwitchingToDownloadableProductTest.xml
@@ -53,8 +53,16 @@
         <actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGridBySku">
             <argument name="sku" value="$$createProduct.sku$$"/>
         </actionGroup>
-        <see selector="{{AdminProductGridSection.productGridCell('1', 'Name')}}" userInput="$$createProduct.name$$" stepKey="seeDownloadableProductNameInGrid"/>
-        <see selector="{{AdminProductGridSection.productGridCell('1', 'Type')}}" userInput="Downloadable Product" stepKey="seeDownloadableProductTypeInGrid"/>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeDownloadableProductNameInGrid">
+            <argument name="row" value="1"/>
+            <argument name="column" value="Name"/>
+            <argument name="value" value="$$createProduct.name$$"/>
+        </actionGroup>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeDownloadableProductTypeInGrid">
+            <argument name="row" value="1"/>
+            <argument name="column" value="Type"/>
+            <argument name="value" value="Downloadable Product"/>
+        </actionGroup>
         <actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearDownloadableProductFilters"/>
         <!--Assert downloadable product on storefront-->
         <comment userInput="Assert downloadable product on storefront" stepKey="commentAssertDownloadableProductOnStorefront"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml
index 5c3f79694e79a..20fe4f99008cd 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml
@@ -82,7 +82,11 @@
             <argument name="keyword" value="SimpleProduct.name"/>
         </actionGroup>
         <seeNumberOfElements selector="{{AdminProductGridSection.productGridRows}}" userInput="1" stepKey="seeOnlyOneProductInGrid"/>
-        <see selector="{{AdminProductGridSection.productGridCell('1', 'Name')}}" userInput="{{SimpleProduct.name}}" stepKey="seeOnlySimpleProductInGrid"/>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeOnlySimpleProductInGrid">
+            <argument name="row" value="1"/>
+            <argument name="column" value="Name"/>
+            <argument name="value" value="{{SimpleProduct.name}}"/>
+        </actionGroup>
 
         <!--Paging works-->
         <actionGroup ref="ResetProductGridToDefaultViewActionGroup" stepKey="setProductGridToDefaultPagination"/>
@@ -108,7 +112,11 @@
             <argument name="product" value="GroupedProduct"/>
         </actionGroup>
         <seeNumberOfElements selector="{{AdminProductGridSection.productGridRows}}" userInput="1" stepKey="seeOneMatchingSkuInProductGrid"/>
-        <see selector="{{AdminProductGridSection.productGridCell('1','SKU')}}" userInput="{{GroupedProduct.sku}}" stepKey="seeProductInFilteredGridSku"/>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeProductInFilteredGridSku">
+            <argument name="row" value="1"/>
+            <argument name="column" value="SKU"/>
+            <argument name="value" value="{{GroupedProduct.sku}}"/>
+        </actionGroup>
         <!--Filter by price-->
         <actionGroup ref="FilterProductGridByPriceRangeActionGroup" stepKey="filterProductGridByPrice">
             <argument name="filter" value="PriceFilterRange"/>
@@ -197,7 +205,11 @@
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterProductGridToCheckWeightColumn">
             <argument name="product" value="SimpleProduct"/>
         </actionGroup>
-        <see selector="{{AdminProductGridSection.productGridCell('1','Weight')}}" userInput="{{SimpleProduct.weight}}" stepKey="seeCorrectProductWeightInGrid"/>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeCorrectProductWeightInGrid">
+            <argument name="row" value="1"/>
+            <argument name="column" value="Weight"/>
+            <argument name="value" value="{{SimpleProduct.weight}}"/>
+        </actionGroup>
         <!--END Admin uses product grid-->
 
         <!--Admin creates category-->
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductSearchTest/AdminConfigurableProductSearchTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductSearchTest/AdminConfigurableProductSearchTest.xml
index 6d9015b5d1cbf..9e64e01e58ea5 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductSearchTest/AdminConfigurableProductSearchTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminConfigurableProductSearchTest/AdminConfigurableProductSearchTest.xml
@@ -85,7 +85,11 @@
         </actionGroup>
         <waitForPageLoad stepKey="wait2"/>
         <seeNumberOfElements selector="{{AdminProductGridSection.productGridRows}}" userInput="1" stepKey="seeOneResult"/>
-        <see selector="{{AdminProductGridSection.productGridCell('1', 'Name')}}" userInput="{{ApiConfigurableProduct.name}}" stepKey="seeInGrid"/>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeInGrid">
+            <argument name="row" value="1"/>
+            <argument name="column" value="Name"/>
+            <argument name="value" value="{{ApiConfigurableProduct.name}}"/>
+        </actionGroup>
         <see selector="{{AdminProductGridFilterSection.enabledFilters}}" userInput="{{ApiConfigurableProduct.name}}" stepKey="seeInActiveFilters"/>
     </test>
 </tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateConfigurableProductSwitchToSimpleTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateConfigurableProductSwitchToSimpleTest.xml
index 98bd5a0fed4ed..ebefab1f6650a 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateConfigurableProductSwitchToSimpleTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateConfigurableProductSwitchToSimpleTest.xml
@@ -24,6 +24,10 @@
         <actionGroup ref="FillMainProductFormActionGroup" stepKey="fillProductForm">
             <argument name="product" value="_defaultProduct"/>
         </actionGroup>
-        <see selector="{{AdminProductGridSection.productGridCell('1', 'Type')}}" userInput="Simple Product" stepKey="seeProductTypeInGrid"/>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeProductTypeInGrid">
+            <argument name="row" value="1"/>
+            <argument name="column" value="Type"/>
+            <argument name="value" value="Simple Product"/>
+        </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateConfigurableProductSwitchToVirtualTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateConfigurableProductSwitchToVirtualTest.xml
index 756cdfd5d5d6f..a0ad8475b7d41 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateConfigurableProductSwitchToVirtualTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateConfigurableProductSwitchToVirtualTest.xml
@@ -21,6 +21,10 @@
         <actionGroup ref="GoToSpecifiedCreateProductPageActionGroup" stepKey="openProductFillForm">
             <argument name="productType" value="configurable"/>
         </actionGroup>
-        <see selector="{{AdminProductGridSection.productGridCell('1', 'Type')}}" userInput="Virtual Product" stepKey="seeProductTypeInGrid"/>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeProductTypeInGrid">
+            <argument name="row" value="1"/>
+            <argument name="column" value="Type"/>
+            <argument name="value" value="Virtual Product"/>
+        </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateDownloadableProductSwitchToConfigurableTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateDownloadableProductSwitchToConfigurableTest.xml
index db5c824341c57..dc3608ec827df 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateDownloadableProductSwitchToConfigurableTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateDownloadableProductSwitchToConfigurableTest.xml
@@ -67,7 +67,11 @@
         <actionGroup ref="FilterProductGridByNameActionGroup" stepKey="searchForProduct">
             <argument name="product" value="_defaultProduct"/>
         </actionGroup>
-        <see selector="{{AdminProductGridSection.productGridCell('2', 'Type')}}" userInput="Configurable Product" stepKey="seeProductTypeInGrid"/>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeProductTypeInGrid">
+            <argument name="row" value="2"/>
+            <argument name="column" value="Type"/>
+            <argument name="value" value="Configurable Product"/>
+        </actionGroup>
         <actionGroup ref="AssertProductInStorefrontProductPageActionGroup" stepKey="assertProductInStorefrontProductPage">
             <argument name="product" value="_defaultProduct"/>
         </actionGroup>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateSimpleProductSwitchToConfigurableTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateSimpleProductSwitchToConfigurableTest.xml
index cbfa1cc2b8bd6..bf7d97df75bb0 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateSimpleProductSwitchToConfigurableTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateSimpleProductSwitchToConfigurableTest.xml
@@ -40,7 +40,11 @@
             <argument name="attributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
         </actionGroup>
         <actionGroup ref="SaveConfiguredProductActionGroup" stepKey="saveProductForm"/>
-        <see selector="{{AdminProductGridSection.productGridCell('2', 'Type')}}" userInput="Configurable Product" stepKey="seeProductTypeInGrid"/>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeProductTypeInGrid">
+            <argument name="row" value="2"/>
+            <argument name="column" value="Type"/>
+            <argument name="value" value="Configurable Product"/>
+        </actionGroup>
         <!-- Verify product on store front -->
         <comment userInput="Verify product on store front" stepKey="commentVerifyProductGrid"/>
         <actionGroup ref="VerifyOptionInProductStorefrontActionGroup" stepKey="verifyConfigurableOption" after="AssertProductInStorefrontProductPage">
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateVirtualProductSwitchToConfigurableTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateVirtualProductSwitchToConfigurableTest.xml
index cfeb95afc4924..b1df023e7deec 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateVirtualProductSwitchToConfigurableTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateVirtualProductSwitchToConfigurableTest.xml
@@ -38,7 +38,11 @@
             <argument name="attributeCode" value="$$createConfigProductAttribute.attribute_code$$"/>
         </actionGroup>
         <actionGroup ref="SaveConfiguredProductActionGroup" stepKey="saveProductForm"/>
-        <see selector="{{AdminProductGridSection.productGridCell('2', 'Type')}}" userInput="Configurable Product" stepKey="seeProductTypeInGrid"/>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeProductTypeInGrid">
+            <argument name="row" value="2"/>
+            <argument name="column" value="Type"/>
+            <argument name="value" value="Configurable Product"/>
+        </actionGroup>
         <actionGroup ref="VerifyOptionInProductStorefrontActionGroup" stepKey="verifyConfigurableOption" after="AssertProductInStorefrontProductPage">
             <argument name="attributeCode" value="$createConfigProductAttribute.default_frontend_label$"/>
             <argument name="optionName" value="$createConfigProductAttributeOption1.option[store_labels][1][label]$"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductBasedOnParentSkuTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductBasedOnParentSkuTest.xml
index abe4ce5e46661..314e902e09f26 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductBasedOnParentSkuTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductBasedOnParentSkuTest.xml
@@ -72,10 +72,18 @@
         <actionGroup ref="FilterProductGridByName2ActionGroup" stepKey="filterFirstProductByNameInGrid">
             <argument name="name" value="{{colorConfigurableProductAttribute1.name}}"/>
         </actionGroup>
-        <see selector="{{AdminProductGridSection.productGridCell('1', 'SKU')}}" userInput="{{ApiConfigurableProduct.sku}}-{{colorConfigurableProductAttribute1.name}}"  stepKey="seeFirstProductSkuInGrid"/>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeFirstProductSkuInGrid">
+            <argument name="row" value="1"/>
+            <argument name="column" value="SKU"/>
+            <argument name="value" value="{{ApiConfigurableProduct.sku}}-{{colorConfigurableProductAttribute1.name}}"/>
+        </actionGroup>
         <actionGroup ref="FilterProductGridByName2ActionGroup" stepKey="filterSecondProductByNameInGrid">
             <argument name="name" value="{{colorConfigurableProductAttribute2.name}}"/>
         </actionGroup>
-        <see selector="{{AdminProductGridSection.productGridCell('1', 'SKU')}}" userInput="{{ApiConfigurableProduct.sku}}-{{colorConfigurableProductAttribute2.name}}"  stepKey="seeSecondProductSkuInGrid"/>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeSecondProductSkuInGrid">
+            <argument name="row" value="1"/>
+            <argument name="column" value="SKU"/>
+            <argument name="value" value="{{ApiConfigurableProduct.sku}}-{{colorConfigurableProductAttribute2.name}}"/>
+        </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsAssignedToCategoryTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsAssignedToCategoryTest.xml
index f2a8e78523758..debe7d5bd0140 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsAssignedToCategoryTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsAssignedToCategoryTest.xml
@@ -102,7 +102,11 @@
         <actionGroup ref="FilterProductGridBySkuAndNameActionGroup" stepKey="findCreatedConfigurableProduct">
             <argument name="product" value="ApiConfigurableProduct"/>
         </actionGroup>
-        <see selector="{{AdminProductGridSection.productGridCell('1', 'Type')}}" userInput="{{ApiConfigurableProduct.type_id}}" stepKey="seeProductTypeInGrid"/>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeProductTypeInGrid">
+            <argument name="row" value="1"/>
+            <argument name="column" value="Type"/>
+            <argument name="value" value="{{ApiConfigurableProduct.type_id}}"/>
+        </actionGroup>
         <click selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="clickClearFiltersAfter"/>
 
         <!-- Flash cache -->
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsWithoutAssignedToCategoryTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsWithoutAssignedToCategoryTest.xml
index 273e37089973b..0f66d32f1b3df 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsWithoutAssignedToCategoryTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTwoOptionsWithoutAssignedToCategoryTest.xml
@@ -92,7 +92,11 @@
         <actionGroup ref="FilterProductGridBySkuAndNameActionGroup" stepKey="findCreatedConfigurableProduct">
             <argument name="product" value="ApiConfigurableProduct"/>
         </actionGroup>
-        <see selector="{{AdminProductGridSection.productGridCell('1', 'Type')}}" userInput="{{ApiConfigurableProduct.type_id}}"  stepKey="seeProductTypeInGrid"/>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeProductTypeInGrid">
+            <argument name="row" value="1"/>
+            <argument name="column" value="Type"/>
+            <argument name="value" value="{{ApiConfigurableProduct.type_id}}"/>
+        </actionGroup>
         <click selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="clickClearFiltersAfter"/>
 
         <!-- Flash cache -->
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminVirtualProductTypeSwitchingToConfigurableProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminVirtualProductTypeSwitchingToConfigurableProductTest.xml
index 90a396b970c3a..e986ea38f0fe1 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminVirtualProductTypeSwitchingToConfigurableProductTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminVirtualProductTypeSwitchingToConfigurableProductTest.xml
@@ -64,10 +64,26 @@
         <actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGridBySkuForConfigurable">
             <argument name="sku" value="$$createProduct.sku$$"/>
         </actionGroup>
-        <see selector="{{AdminProductGridSection.productGridCell('1', 'Name')}}" userInput="$$createProduct.name$$" stepKey="seeConfigurableProductNameInGrid"/>
-        <see selector="{{AdminProductGridSection.productGridCell('1', 'Type')}}" userInput="Configurable Product" stepKey="seeConfigurableProductTypeInGrid"/>
-        <see selector="{{AdminProductGridSection.productGridCell('2', 'Name')}}" userInput="$$createProduct.name$$-option1" stepKey="seeConfigurableProductNameInGrid1"/>
-        <see selector="{{AdminProductGridSection.productGridCell('3', 'Name')}}" userInput="$$createProduct.name$$-option2" stepKey="seeConfigurableProductNameInGrid2"/>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeConfigurableProductNameInGrid">
+            <argument name="row" value="1"/>
+            <argument name="column" value="Name"/>
+            <argument name="value" value="$$createProduct.name$$"/>
+        </actionGroup>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeConfigurableProductTypeInGrid">
+            <argument name="row" value="1"/>
+            <argument name="column" value="Type"/>
+            <argument name="value" value="Configurable Product"/>
+        </actionGroup>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeConfigurableProductNameInGrid1">
+            <argument name="row" value="2"/>
+            <argument name="column" value="Name"/>
+            <argument name="value" value="$$createProduct.name$$-option1"/>
+        </actionGroup>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeConfigurableProductNameInGrid2">
+            <argument name="row" value="3"/>
+            <argument name="column" value="Name"/>
+            <argument name="value" value="$$createProduct.name$$-option2"/>
+        </actionGroup>
         <actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearConfigurableProductFilters"/>
         <!--Assert configurable product on storefront-->
         <comment userInput="Assert configurable product on storefront" stepKey="commentAssertConfigurableProductOnStorefront"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml
index a8856288b422a..cefc471054d36 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ProductsQtyReturnAfterOrderCancelTest.xml
@@ -93,7 +93,11 @@
         <actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGridBySku">
             <argument name="sku" value="$$createConfigProduct.sku$$"/>
         </actionGroup>
-        <see selector="{{AdminProductGridSection.productGridCell('1', 'Quantity')}}" userInput="99" stepKey="seeProductSkuInGrid"/>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeProductSkuInGrid">
+            <argument name="row" value="1"/>
+            <argument name="column" value="Quantity"/>
+            <argument name="value" value="99"/>
+        </actionGroup>
         <actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearProductFilters"/>
         <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
     </test>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductSwitchToSimpleTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductSwitchToSimpleTest.xml
index d3933ae4fae7d..bfa0c77280f42 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductSwitchToSimpleTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductSwitchToSimpleTest.xml
@@ -26,6 +26,10 @@
         <actionGroup ref="FillMainProductFormActionGroup" stepKey="fillProductForm">
             <argument name="product" value="_defaultProduct"/>
         </actionGroup>
-        <see selector="{{AdminProductGridSection.productGridCell('1', 'Type')}}" userInput="Simple Product"  stepKey="seeProductTypeInGrid"/>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeProductTypeInGrid">
+            <argument name="row" value="1"/>
+            <argument name="column" value="Type"/>
+            <argument name="value" value="Simple Product"/>
+        </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminSimpleProductTypeSwitchingToDownloadableProductTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminSimpleProductTypeSwitchingToDownloadableProductTest.xml
index aa94de681de1d..0f03a6a47c795 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminSimpleProductTypeSwitchingToDownloadableProductTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminSimpleProductTypeSwitchingToDownloadableProductTest.xml
@@ -53,8 +53,16 @@
         <actionGroup ref="FilterProductGridBySku2ActionGroup" stepKey="filterProductGridBySku">
             <argument name="sku" value="$$createProduct.sku$$"/>
         </actionGroup>
-        <see selector="{{AdminProductGridSection.productGridCell('1', 'Name')}}" userInput="$$createProduct.name$$" stepKey="seeDownloadableProductNameInGrid"/>
-        <see selector="{{AdminProductGridSection.productGridCell('1', 'Type')}}" userInput="Downloadable Product" stepKey="seeDownloadableProductTypeInGrid"/>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeDownloadableProductNameInGrid">
+            <argument name="row" value="1"/>
+            <argument name="column" value="Name"/>
+            <argument name="value" value="$$createProduct.name$$"/>
+        </actionGroup>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="seeDownloadableProductTypeInGrid">
+            <argument name="row" value="1"/>
+            <argument name="column" value="Type"/>
+            <argument name="value" value="Downloadable Product"/>
+        </actionGroup>
         <actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearDownloadableProductFilters"/>
         <!--Assert downloadable product on storefront-->
         <comment userInput="Assert downloadable product on storefront" stepKey="commentAssertDownloadableProductOnStorefront"/>

From c47a9989439c34cbc1b1d2865ea092a357b9ac14 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 15 Jul 2020 13:23:50 +0300
Subject: [PATCH 0866/1718] Add metadata TO the test image

---
 dev/tests/acceptance/tests/_data/magento3.jpg | Bin 30858 -> 34986 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev/tests/acceptance/tests/_data/magento3.jpg b/dev/tests/acceptance/tests/_data/magento3.jpg
index 79ed12ec0aea4c68e1086e54668464b2b82c009d..6dc8cd69e41c1ed0fcdbd38370c3b5b90d6c3ded 100644
GIT binary patch
delta 4173
zcmcha&u`;I6vv<4EW0XN36{OE<X~wJMxex#$<n1(l2w0D5kwH85!{emdy<+uc9cvN
zw-?`FwbDvy{(_$O#+d{E21ob<5O7B-Z*0d+sV8jG6t_v<JimFL@4T63$uIs=UY)7Y
z#V;4X!dsv1HTOVK0mk?T7r!a~C!yN`Xtm%20JsNlD39O{S_*!?R^H3(Z<Y69E%xJN
zg#v!VL;Q5qcTzvj_`!uj90PEQzv4nloGXeAN+>bOhDoVLE9MhwRtdm;ymc4D3WQea
zcx{?mDUJ)7O~!A>HpVHt;|H1j`I(Z;Rn#?@d>`8nFs3~@i(?8;kuaHn8VP_HoKImD
zLe7;-?dNJ@s}q3pwbcJN&cZ8CcAoD;QZWgxX!^Ugzte2u{C#^6G3E~s1Ag&4y!sM<
z103|VYMH>t+s#%%lnvlz5zDHAT2$}AqqfUErUf01A2O|Hb(zlt%@sybeHZSg9$`Q1
zF~_yKmglj-Nsn>MvA9)KpTa#Ml59{~RHGWaNh?oim7q96ifRbjE*shdx6j?c&*k9x
zxc}!N=Y7*K{9)O0f&*5zgPsvueWOw)2GpK~eak*#TsvT0*RSh;{PeS~xlUdG=A#yA
z^>^5z`|0U`?Vm<pwC&R)d(+XMHP&mP8TR@@sTTG;e`tnvJ<e{TE!>8##UcEtt~bR>
zO;eoHb`W@4g_a4?G0DK`m|yMgr73V!*Hf{h(WpGCmV-gpsBCU-8iX1Vr6mk04NrV-
zg(ZLZ7*nikagy0Oh@{p*aLntvzOJRY9Xm_iKOT5-V#hX^$9lLcL##!`z;v2cb8OSO
ztg3J&h^@%u@hBO3uE=b9mfx-GVaZ_~>)7LZV^&Gt&esf~&vTQ+@n9=STr;ktg__~<
z!FSB&jVP0{ZFR3GX{0CVO75x5M&8l75}6Frq_K)AGOY&}=Xi#n3Qh|ntAzaY=g?<s
zkl=7<<LYDujRODm_q#uB&}`eU9RKWg+yu$SXFhY+;%sNY@Y`vK{wopu--z1N2VU}U
zs2TY)t_fd6H#Swi;?Rncj!nd3oS8@zVpEkHB}y}qHRE3~Vl#!S6*z9^Wd5|7m~1)G
zY*!?EgT0GgY-G=Z<WyqE+{P7UNkt>v`gIL*$zLJ+8bzM_2K)smH{h>?@}K-$rX>74
z$PMZ*SyUcH5{m9+`HNAO<*$k|pMU!l<VzsS)?czB2}Kf(?xpw(Q<mbdkTQq=zfk0m
zrRpzPj+`QyfbPZl%TN~Qua+X=BV_UQOLEEGbC<F*{#=S&+_wBy-ktT!H#_Fz>)Z%m
K+kRA^hyMVD%oGv;

delta 14
VcmZ2Ak*Vt=Bh&vIo0SAQDgZJF26zAf


From 183f10540613272caa63c213c9bcc58568c757c7 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Wed, 15 Jul 2020 13:33:03 +0300
Subject: [PATCH 0867/1718] MC-35836: If is_in_stock is set to 1 in the CSV
 file, products with Qty=0 are displayed on the frontend

---
 .../Model/Import/Product.php                  |  3 ++
 .../Model/Import/ProductTest.php              | 53 +++++++++++++++++++
 .../_files/products_to_import_zero_qty.csv    |  4 ++
 3 files changed, 60 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_zero_qty.csv

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 189bfa61f2c42..4430676bdd3d1 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -3079,6 +3079,9 @@ private function formatStockDataForRow(array $rowData): array
         );
 
         if ($this->stockConfiguration->isQty($this->skuProcessor->getNewSku($sku)['type_id'])) {
+            if (isset($rowData['qty']) && $rowData['qty'] == 0) {
+                $row['is_in_stock'] = 0;
+            }
             $stockItemDo->setData($row);
             $row['is_in_stock'] = $row['is_in_stock'] ?? $this->stockStateProvider->verifyStock($stockItemDo);
             if ($this->stockStateProvider->verifyNotification($stockItemDo)) {
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 d3f012bb0852f..4502501da4f4f 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
@@ -295,6 +295,59 @@ public function testSaveStockItemQty()
         unset($stockItems, $stockItem);
     }
 
+    /**
+     * Test that is_in_stock set to 0 when item quantity is 0
+     *
+     * @magentoDataFixture Magento/Catalog/_files/multiple_products.php
+     * @magentoAppIsolation enabled
+     *
+     * @return void
+     */
+    public function testSaveIsInStockByZeroQty(): void
+    {
+        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Catalog\Api\ProductRepositoryInterface::class
+        );
+        $id1 = $productRepository->get('simple1')->getId();
+        $id2 = $productRepository->get('simple2')->getId();
+        $id3 = $productRepository->get('simple3')->getId();
+        $existingProductIds = [$id1, $id2, $id3];
+
+        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create(\Magento\Framework\Filesystem::class);
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+        $source = $this->objectManager->create(
+            \Magento\ImportExport\Model\Import\Source\Csv::class,
+            [
+                'file' => __DIR__ . '/_files/products_to_import_zero_qty.csv',
+                'directory' => $directory
+            ]
+        );
+        $errors = $this->_model->setParameters(
+            ['behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND, 'entity' => 'catalog_product']
+        )->setSource(
+            $source
+        )->validateData();
+
+        $this->assertTrue($errors->getErrorsCount() == 0);
+
+        $this->_model->importData();
+
+        /** @var $stockItmBeforeImport \Magento\CatalogInventory\Model\Stock\Item */
+        foreach ($existingProductIds as $productId) {
+            /** @var $stockRegistry StockRegistry */
+            $stockRegistry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+                StockRegistry::class
+            );
+
+            $stockItemAfterImport = $stockRegistry->getStockItem($productId, 1);
+
+            $this->assertEquals(0, $stockItemAfterImport->getIsInStock());
+            unset($stockItemAfterImport);
+        }
+    }
+
     /**
      * Test if stock state properly changed after import
      *
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_zero_qty.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_zero_qty.csv
new file mode 100644
index 0000000000000..632d60cf7daa0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_import_zero_qty.csv
@@ -0,0 +1,4 @@
+sku,qty,is_in_stock
+simple1,0,1
+simple2,0,1
+simple3,0,1

From 27c16fdf90e96a73fffe868927d3f6c8603180a6 Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Wed, 15 Jul 2020 14:13:48 +0300
Subject: [PATCH 0868/1718] MC-35853: Table doesn't exist exception appears
 after deleting store view

---
 .../SalesSequence/Model/Sequence/DeleteByStore.php        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/SalesSequence/Model/Sequence/DeleteByStore.php b/app/code/Magento/SalesSequence/Model/Sequence/DeleteByStore.php
index e86cc8b1b2e6d..d0c516b47577b 100644
--- a/app/code/Magento/SalesSequence/Model/Sequence/DeleteByStore.php
+++ b/app/code/Magento/SalesSequence/Model/Sequence/DeleteByStore.php
@@ -58,7 +58,7 @@ public function execute($storeId): void
         $metadataIds = $this->getMetadataIdsByStoreId($storeId);
         $profileIds = $this->getProfileIdsByMetadataIds($metadataIds);
 
-        $this->appResource->getConnection()->delete(
+        $this->appResource->getConnection('sales')->delete(
             $this->appResource->getTableName('sales_sequence_profile'),
             ['profile_id IN (?)' => $profileIds]
         );
@@ -70,7 +70,7 @@ public function execute($storeId): void
                 continue;
             }
 
-            $this->appResource->getConnection()->dropTable(
+            $this->appResource->getConnection('sales')->dropTable(
                 $metadata->getSequenceTable()
             );
             $this->resourceMetadata->delete($metadata);
@@ -85,7 +85,7 @@ public function execute($storeId): void
      */
     private function getMetadataIdsByStoreId($storeId)
     {
-        $connection = $this->appResource->getConnection();
+        $connection = $this->appResource->getConnection('sales');
         $bind = ['store_id' => $storeId];
         $select = $connection->select()->from(
             $this->appResource->getTableName('sales_sequence_meta'),
@@ -105,7 +105,7 @@ private function getMetadataIdsByStoreId($storeId)
      */
     private function getProfileIdsByMetadataIds(array $metadataIds)
     {
-        $connection = $this->appResource->getConnection();
+        $connection = $this->appResource->getConnection('sales');
         $select = $connection->select()
             ->from(
                 $this->appResource->getTableName('sales_sequence_profile'),

From b5350988e7e54abcb8b55a36354954d6572f7518 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 15 Jul 2020 14:24:09 +0300
Subject: [PATCH 0869/1718] Write metadata to the GIF and PNG format

---
 dev/tests/acceptance/tests/_data/gif.gif | Bin 218595 -> 222919 bytes
 dev/tests/acceptance/tests/_data/png.png | Bin 12857 -> 14982 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev/tests/acceptance/tests/_data/gif.gif b/dev/tests/acceptance/tests/_data/gif.gif
index 0b082504ab982c33858bcf303d912e860a123590..f0937bc1328299a924b4b16ce699eb26695ecceb 100644
GIT binary patch
delta 4678
zcmchb&2QsG6u^~~Q$!_pg%F1#=H{SP>%?>yG&ruH*+rFzsM;*-N{hg2PtsxiC3^zt
z$w(Zyg7Rm;odXAsNJ#t@T)6FjfS5P_nmBfwI4zOd&b)c={oa?y+5P+H-9P@?{qeJo
z^76Oe6-4cU^3zvuexV#09es}HZr~DTqPgpM5uOhe)ApYe%-0}R6(m&Hi-B_Dnp1-D
z!#SOdecwTS?V#6FxRcPH;IrYQ)CJ#hz`yri;YXdtz1Ci=C>@j@+SWk1U@X9@8q7lH
zzz?UYZK=c|F7a5T_7D0hw?jy`Eo_s>3TeQo?|}#j(1#8an`GxuaEu+(n+}xuzD*|P
z%wdW#EKE`CPY}Bx2*UT6k0>m36{2=%;#h1_&pHpNjD~2U+4HZ7mB2+LADPpoNQ@M)
z<eG;WCm@&D)SQ}*L&8fat!*-MNj2G|UPTlV5+Y!fIb_pHjOjVILJew=;gYzdil%+N
zBlVT=p%^HO?^>_Nu;hL0rG11gKK30yJP%BZ7=2wWi=f>?HZ&O-Q<r=i(kb;!$IyCO
zZ@>3oU(?1~A0KM?-Ck<GqMA90@hP1X=gE-!@gf+V2lwAkjmjsPO=9x2FwyR7vWaw(
zn>>z4c<j3{wo5IEmu8}RI?t_;@Zc_dRxtqi7>bfCW2#z_JP3Jv7Pz(hhSZsWQ+$pJ
z()Q$gsYkgCLs^eQ!hhRU#Xoot8c?m?L2E?kFFt6!Di02$lWcHcDFp>vEbg2<x9#qM
zYaW4^PvP=CP#b|>oP0vODZ4Plz^q7NSPJ3i)aIIE8p}dZjD?VoKA$L4+<E*_S&`)~
z&q(AuGthhNQD*RY6}lyHuKuJrF#3mwYUaC;KNOd267SO*ZCPI3Z@BPZlg5v~Uc}(-
zjgo7f?{P9<FltpZrmH0#$RQW`A-sEx#mm-PUrL&(I8z<@Hl18vO^|fzQ@Jap60tLq
z%<A6a&(_^L#aoR>HyVjF-~KpHb2P$364Gyo{V4QZ1h1RG3?nkW49Gx%0?$H=2z8_j
z-`Mu88C)nQLu2tzyZer=uE=?YnKtzzW_lI@?O)p6qfA?pLp`9J%dx->1r-IUM10on
zc604QUMQbPK-BKWnX)9WtYq?7@oxzHyMmg3<4EpFo=(#be_+@6K*4V3BlB;MBE?>U
z$b3m_+hvJT?`|vp+LW#MH$Yi~f2)*?zY5u^{+Zj--&IOULE1LwZ$goPrR8<}o1v7T
z(l+7WHbnp{A=l+Eg}UCdl2UKlkiQ|NA^*lGSMvV{3PN>|hV`#WsE$&j&c#jmn^T(b
zZ<12W?=;E3)?3}d6{$R{v)NqU(U0c*U*|6fL&W3%KlH8g{prpRr#mhF)Bg2zXJ>Kt
EA1vDmV*mgE

delta 466
zcmX?pmiO^$-U(q`O7C~?S5nAKu~nLwAW^SmZ>L~WVO5b^kegbPs8ErclUHn2VXKsw
zlAn}n1!RMS^_3LBN=mYAl^j753K6~m3eNdOsS2ig#=6M{hK34eW_pGure<b_ItoSx
zhDQ1ZKxC$CXkuk*W@Tiq00l}w+lo@stb$zJz;;bM$Hu5M@v1hHlHKGFOfq~*K${>=
z$Str{ntYK(M7$!gK;KZ$0OSUkjIS?5Zt_bGZhn|}aY;~W8dQ80hm<f#yuix2C^fMp
zzbGU>KL;rHhFw+!Ebi-T<(XGpl9-pA>gfWMaOTp0OSt4Gm*%GCm4GEab82XS91S!J
zsK+I>D6=dz#jPkmR{?CFRVK12J)9s@AQCCardV@oI4J1@jnM~r-X*m-xhS)sBr`t`
tCIk!*5EC8|K#qMyL1J=tYKcN>9x$$ol$uRM+D$|lftYE#i3s!LAOJ|wlNta3

diff --git a/dev/tests/acceptance/tests/_data/png.png b/dev/tests/acceptance/tests/_data/png.png
index c83255dcf558da67d6c4b359f8e949e11abd9795..4ec47267e81253ecc25e23fe6ba6506e848e7033 100644
GIT binary patch
delta 2161
zcmbtV&yU+g6dq>-RI5^ng%iEF>cI#|Jeg$|GD=dlNfD7qsk$jFH@x;FJ6->hJ<)pi
zP)j{*Zzzp~#4&#X0*MRaz@NjBe}DsT#*SleQ?)A+C7yZnz3+YV-t){K&c$qgJAL~n
zK0XwOqpztQcumU*j#xACLL@((J4tBSCrs!^Y|8zv@z0-s89H~m#&>%oJPP~ln16L1
zv4ismWBdHXZac=E-gYOUK;SW9>51q1F-^LL;-xT_X4B9WM4WVubm&=AM(O>8PsTyu
z>Mhd5*Z`Kunb1drFLMr<b&X>oLTZ|)r>D)+-DVI?%~reJHZd^?X#k=TpZUT{8h(5m
z7`AoAF<`MB@lf!<*CnTQ6wE}|Ft&9`oq{IEE~vv<<SJsvHkr#j=8M>DHCra|>3YYp
zsk5e&rYy!?SExxgbGc-uuH{d=M$&ND#G1Ln=#`ZO6I~oL-AiHjz6f+K)6g-cK$mC4
zYLYW|%$Gw;HSz4|3A3}{YPa{SX+=p-@<M<L^-5;XW2wWfspYyXI+LYwEMZlk*(7IG
zDoP=x0>OpLu9}Ilbkb!GQkjG+<X{yp(^bmo8`c}j&7jqaf<yiDrib=7<r0(|=jE1D
z+7H|yI)L|p^;#W;D4S$gDA+@uF!yl4p=Dxdwch^T7diU!O2s90zhC>1JyP~5trR|w
zV;1!TPd4UNlYU@F48$D=qEz7&^j8~A?WP*$e<VAEZ~?>&i;Pzi9;U1HQrZh2I<N%m
zM-2X*9>D}R@P31kF=^4y2;Ifa&v$Xh+zf}eU+wEPEs}0H6QD-~pR9YNqFAn!w8|;{
zCgM;JOCB+@M_#hY>M7$R76<N3;vV~4^q|`5Ci@#|-z*)@-p#pAtgs{;U=&iDLT+W2
zU!C3@xWdW3NYf~A_~h(Wt{w9dX5*HiLZ4=*Je>Dtac#h)xOkWkw@n1sO85G&4}ZIL
zgQVJ$9S$d>5&9TzsB7q&b_3O5bPImIwu83dslgX%AELL^7@@g#vl#!ZeUxLsOC!qn
z1Hdh7@2`EIb5zfLe}^Y3HBqXLt;?sD1fe<nAaM4S?Mm@JB}8AfD?;xA<Q+iNG1(>a
ztyOUC+j+ehKbgO$#(>kF&UcFO#S2aPrl_vfw$S225$yoz$HfZ;s>9oW7K`<GxeC_8
zc&V*-x2$F3+5)z{mD~RXS@78;yJBl+uO9jYw<yM_c-}qe4~IaoK4tzM51vZO;r$1L
JU+(?z>_77UaYFzA

delta 22
dcmZoG-I+2$dGirA9wROW22WQ%mvv4FO#of{2ZI0r


From 680ca2b76e5f64c1b629052930fe9663ca01e7a1 Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Wed, 15 Jul 2020 14:41:57 +0300
Subject: [PATCH 0870/1718] Added testCaseId to MFTF test.

---
 .../Test/Mftf/Test/AdminCatalogEmailToFriendSettingsTest.xml     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminCatalogEmailToFriendSettingsTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminCatalogEmailToFriendSettingsTest.xml
index 79150854c5939..559c2d13218d1 100644
--- a/app/code/Magento/Backend/Test/Mftf/Test/AdminCatalogEmailToFriendSettingsTest.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminCatalogEmailToFriendSettingsTest.xml
@@ -15,6 +15,7 @@
             <title value="Admin should be able to manage settings of Email To A Friend Functionality"/>
             <description value="Admin should be able to enable Email To A Friend functionality in Magento Admin backend and see additional options"/>
             <group value="backend"/>
+            <testCaseId value="MC-35895"/>
         </annotations>
 
         <before>

From eaaea7284f8dcb09b57d716cf5383a7845e0c6de Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 15 Jul 2020 15:30:04 +0300
Subject: [PATCH 0871/1718] Generetae thumbnails only if image have bigger size
 then defined in configuration, to aviod strechet images

---
 app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
index f0a232bdccccc..3b7223a114adf 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
@@ -629,7 +629,12 @@ public function resizeFile($source, $keepRatio = true)
         $image = $this->_imageFactory->create();
         $image->open($source);
         $image->keepAspectRatio($keepRatio);
-        $image->resize($this->_resizeParameters['width'], $this->_resizeParameters['height']);
+        list($imageWidth, $imageHeight) = getimagesize($source);
+        
+        $image->resize(
+            $this->_resizeParameters['width'] > $imageWidth ? $imageWidth : $this->_resizeParameters['width'],
+            $this->_resizeParameters['height'] > $imageHeight ? $imageHeight : $this->_resizeParameters['height']
+        );
         $dest = $targetDir . '/' . $this->ioFile->getPathInfo($source)['basename'];
         $image->save($dest);
         if ($this->_directory->isFile($this->_directory->getRelativePath($dest))) {

From 16bb99ba160617fd836772da2ea9d329ad0dd721 Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Wed, 15 Jul 2020 15:44:39 +0300
Subject: [PATCH 0872/1718] MC-34265: [Magento Cloud] Re:Cache expires daily

---
 .../CatalogRule/Cron/DailyCatalogUpdate.php   | 27 +++++-
 .../Model/Indexer/PartialIndex.php            | 97 +++++++++++++++++++
 app/code/Magento/CatalogRule/etc/mview.xml    |  1 +
 3 files changed, 120 insertions(+), 5 deletions(-)
 create mode 100644 app/code/Magento/CatalogRule/Model/Indexer/PartialIndex.php

diff --git a/app/code/Magento/CatalogRule/Cron/DailyCatalogUpdate.php b/app/code/Magento/CatalogRule/Cron/DailyCatalogUpdate.php
index 7f584fb1154e0..116a4529a8e60 100644
--- a/app/code/Magento/CatalogRule/Cron/DailyCatalogUpdate.php
+++ b/app/code/Magento/CatalogRule/Cron/DailyCatalogUpdate.php
@@ -6,19 +6,34 @@
 
 namespace Magento\CatalogRule\Cron;
 
+use Magento\CatalogRule\Model\Indexer\PartialIndex;
+use Magento\CatalogRule\Model\Indexer\Rule\RuleProductProcessor;
+
+/**
+ * Daily update catalog price rule by cron
+ */
 class DailyCatalogUpdate
 {
     /**
-     * @var \Magento\CatalogRule\Model\Indexer\Rule\RuleProductProcessor
+     * @var RuleProductProcessor
      */
     protected $ruleProductProcessor;
 
     /**
-     * @param \Magento\CatalogRule\Model\Indexer\Rule\RuleProductProcessor $ruleProductProcessor
+     * @var PartialIndex
      */
-    public function __construct(\Magento\CatalogRule\Model\Indexer\Rule\RuleProductProcessor $ruleProductProcessor)
-    {
+    private $partialIndex;
+
+    /**
+     * @param RuleProductProcessor $ruleProductProcessor
+     * @param PartialIndex $partialIndex
+     */
+    public function __construct(
+        RuleProductProcessor $ruleProductProcessor,
+        PartialIndex $partialIndex
+    ) {
         $this->ruleProductProcessor = $ruleProductProcessor;
+        $this->partialIndex = $partialIndex;
     }
 
     /**
@@ -31,6 +46,8 @@ public function __construct(\Magento\CatalogRule\Model\Indexer\Rule\RuleProductP
      */
     public function execute()
     {
-        $this->ruleProductProcessor->markIndexerAsInvalid();
+        $this->ruleProductProcessor->isIndexerScheduled()
+            ? $this->partialIndex->partialUpdateCatalogRuleProductPrice()
+            : $this->ruleProductProcessor->markIndexerAsInvalid();
     }
 }
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/PartialIndex.php b/app/code/Magento/CatalogRule/Model/Indexer/PartialIndex.php
new file mode 100644
index 0000000000000..12a77f81826d6
--- /dev/null
+++ b/app/code/Magento/CatalogRule/Model/Indexer/PartialIndex.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogRule\Model\Indexer;
+
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\App\ResourceConnection;
+
+/**
+ * Catalog rule partial index
+ *
+ * This class triggers the dependent index "catalog_product_price",
+ * and the cache is cleared only for the matched products for partial indexing.
+ */
+class PartialIndex
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resource;
+
+    /**
+     * @var AdapterInterface
+     */
+    private $connection;
+
+    /**
+     * @var IndexBuilder
+     */
+    private $indexBuilder;
+
+    /**
+     * @param ResourceConnection $resource
+     * @param IndexBuilder $indexBuilder
+     */
+    public function __construct(
+        ResourceConnection $resource,
+        IndexBuilder $indexBuilder
+    ) {
+        $this->resource = $resource;
+        $this->connection = $resource->getConnection();
+        $this->indexBuilder = $indexBuilder;
+    }
+
+    /**
+     * Synchronization replica table with original table "catalogrule_product_price"
+     *
+     * Used replica table for correctly working MySQL trigger
+     *
+     * @return void
+     */
+    public function partialUpdateCatalogRuleProductPrice(): void
+    {
+        $this->indexBuilder->reindexFull();
+        $indexTableName = $this->resource->getTableName('catalogrule_product_price');
+        $select = $this->connection->select()->from(
+            ['crp' => $indexTableName],
+            'product_id'
+        );
+        $selectFields = $this->connection->select()->from(
+            ['crp' => $indexTableName],
+            [
+                'rule_date',
+                'customer_group_id',
+                'product_id',
+                'rule_price',
+                'website_id',
+                'latest_start_date',
+                'earliest_end_date',
+            ]
+        );
+        $where = ['product_id' .' NOT IN (?)' => $select];
+        //remove products that are no longer used in indexing
+        $this->connection->delete($this->resource->getTableName('catalogrule_product_price_replica'), $where);
+        //add updated products to indexing
+        $this->connection->query(
+            $this->connection->insertFromSelect(
+                $selectFields,
+                $this->resource->getTableName('catalogrule_product_price_replica'),
+                [
+                    'rule_date',
+                    'customer_group_id',
+                    'product_id',
+                    'rule_price',
+                    'website_id',
+                    'latest_start_date',
+                    'earliest_end_date',
+                ],
+                AdapterInterface::INSERT_ON_DUPLICATE
+            )
+        );
+    }
+}
diff --git a/app/code/Magento/CatalogRule/etc/mview.xml b/app/code/Magento/CatalogRule/etc/mview.xml
index 9e5a1c866a842..9f793d5c8c393 100644
--- a/app/code/Magento/CatalogRule/etc/mview.xml
+++ b/app/code/Magento/CatalogRule/etc/mview.xml
@@ -26,6 +26,7 @@
     <view id="catalog_product_price" class="Magento\Catalog\Model\Indexer\Product\Price" group="indexer">
         <subscriptions>
             <table name="catalogrule_product_price" entity_column="product_id" />
+            <table name="catalogrule_product_price_replica" entity_column="product_id" />
         </subscriptions>
     </view>
 </config>

From 97b6b503e9a24c25a17d51668ba96b7acc63b354 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 15 Jul 2020 16:41:28 +0300
Subject: [PATCH 0873/1718] Cover changes with integration tests

---
 .../Cms/Model/Wysiwyg/Images/StorageTest.php  | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php b/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php
index 5685f9f140a6d..8ff0246f717b1 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php
@@ -295,6 +295,58 @@ public function testGetThumbnailUrl(string $directory, string $filename, string
         $this->storage->deleteFile($path);
     }
 
+    /**
+     * Verify thumbnail generation for diferent sizes
+     *
+     * @param array $sizes
+     * @param bool $resized
+     * @dataProvider getThumbnailsSizes
+     */
+    public function testResizeFile(array $sizes, bool $resized): void
+    {
+        $root = $this->storage->getCmsWysiwygImages()->getStorageRoot();
+        $path = $root . '/' . 'testfile.png';
+        $this->generateImage($path, $sizes['width'], $sizes['height']);
+        $this->storage->resizeFile($path);
+
+        $thumbPath =   $this->storage->getThumbnailPath($path);
+        list($imageWidth, $imageHeight) = getimagesize($thumbPath);
+
+        $this->assertEquals(
+            $resized ? $this->storage->getResizeWidth() : $sizes['width'],
+            $imageWidth
+        );
+        $this->assertLessThanOrEqual(
+            $resized ? $this->storage->getResizeHeight() : $sizes['height'],
+            $imageHeight
+        );
+
+        $this->storage->deleteFile($path);
+    }
+
+    /**
+     * Provide sizes for resizeFile test
+     */
+    public function getThumbnailsSizes(): array
+    {
+        return [
+            [
+                [
+                    'width' => 1024,
+                    'height' => 768,
+                ],
+               true
+            ],
+            [
+                [
+                    'width' => 20,
+                    'height' => 20,
+                ],
+                false
+            ]
+        ];
+    }
+
     /**
      * Provide scenarios for testing getThumbnailUrl()
      *

From 6bbf4d7fdcbd4caee0766b9be1f5d332f194e856 Mon Sep 17 00:00:00 2001
From: Konstantin Dubovik <konstantin.dubovik@guidance.com>
Date: Wed, 15 Jul 2020 16:55:17 +0300
Subject: [PATCH 0874/1718] Add MFTF test for customer checkout with quote
 referencing non-existent customer group

---
 ...tomerUsingNonExistentCustomerGroupTest.xml | 115 ++++++++++++++++++
 1 file changed, 115 insertions(+)
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNonExistentCustomerGroupTest.xml

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNonExistentCustomerGroupTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNonExistentCustomerGroupTest.xml
new file mode 100644
index 0000000000000..13f82a4b72417
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNonExistentCustomerGroupTest.xml
@@ -0,0 +1,115 @@
+<?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="OnePageCheckoutAsCustomerUsingNonExistentCustomerGroupTest">
+        <annotations>
+            <features value="OnePageCheckout"/>
+            <stories value="OnePageCheckout within Offline Payment Methods"/>
+            <title value="OnePageCheckout as a customer with non-existent customer group assigned to the quote"/>
+            <description value="Checkout as a customer with non-existent customer group assigned to the quote"/>
+            <severity value="AVERAGE"/>
+            <group value="checkout"/>
+        </annotations>
+        <before>
+            <!-- Create Simple Product -->
+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct">
+                <field key="price">560</field>
+            </createData>
+
+            <!-- Create customer group -->
+            <createData entity="CustomCustomerGroup" stepKey="createCustomerGroup"/>
+
+            <!-- Create customer and assign it to the customer group created on the previous step -->
+            <createData entity="Simple_US_Customer_Multiple_Addresses" stepKey="createCustomer">
+                <field key="group_id">$$createCustomerGroup.id$$</field>
+            </createData>
+        </before>
+        <after>
+            <!-- Admin log out -->
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+
+            <!-- Customer log out -->
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
+
+            <!-- Delete created product -->
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+
+            <!-- Delete customer -->
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+        </after>
+
+        <!-- Login as customer -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
+            <argument name="Customer" value="$$createCustomer$$"/>
+        </actionGroup>
+
+        <!-- Add Simple Product to cart -->
+        <amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.custom_attributes[url_key]$$)}}" stepKey="navigateToSimpleProductPage"/>
+        <waitForPageLoad stepKey="waitForSimpleProductPageLoad"/>
+        <actionGroup ref="AddToCartFromStorefrontProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage">
+            <argument name="productName" value="$$createSimpleProduct.name$$"/>
+        </actionGroup>
+
+        <!-- Delete customer group -->
+        <deleteData createDataKey="createCustomerGroup" stepKey="deleteCustomerGroup"/>
+
+        <!-- Go to shopping cart -->
+        <actionGroup ref="ClickViewAndEditCartFromMiniCartActionGroup" stepKey="goToShoppingCartFromMinicart"/>
+        <actionGroup ref="FillShippingZipForm" stepKey="fillShippingZipForm">
+            <argument name="address" value="US_Address_CA"/>
+        </actionGroup>
+        <click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout"/>
+        <waitForPageLoad stepKey="waitForProceedToCheckout"/>
+
+        <!-- Check that error does not appear and shipping methods are available to select -->
+        <dontSee selector="{{CheckoutCartMessageSection.errorMessage}}" userInput="No such entity with id = $$createCustomerGroup.id$$" stepKey="assertErrorMessage"/>
+        <dontSee selector="{{CheckoutShippingMethodsSection.noQuotesMsg}}" userInput="Sorry, no quotes are available for this order at this time" stepKey="assertNoQuotesMessage"/>
+
+        <!-- Fill customer address data -->
+        <waitForElementVisible selector="{{CheckoutShippingSection.shipHereButton(UK_Not_Default_Address.street[0])}}" stepKey="waitForShipHereVisible"/>
+        <!-- Change address -->
+        <click selector="{{CheckoutShippingSection.shipHereButton(UK_Not_Default_Address.street[0])}}" stepKey="clickShipHere"/>
+
+        <!-- Click next button to open payment section -->
+        <click selector="{{CheckoutShippingGuestInfoSection.next}}" stepKey="clickNext"/>
+        <waitForPageLoad stepKey="waitForShipmentPageLoad"/>
+
+        <!-- Select payment solution -->
+        <checkOption selector="{{CheckoutPaymentSection.billingAddressNotSameCheckbox}}" stepKey="selectPaymentSolution" />
+
+        <!-- Check order summary in checkout -->
+        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" stepKey="waitForPaymentSectionLoaded"/>
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrderButton"/>
+        <seeElement selector="{{CheckoutSuccessMainSection.success}}" stepKey="orderIsSuccessfullyPlaced"/>
+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
+
+        <!-- Login as admin -->
+        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+
+        <!-- Open created order in backend -->
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrders"/>
+        <waitForPageLoad stepKey="waitForOrdersPageLoad"/>
+        <actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrderGridById">
+            <argument name="orderId" value="$grabOrderNumber"/>
+        </actionGroup>
+
+        <!-- Assert order total -->
+        <scrollTo selector="{{AdminOrderTotalSection.grandTotal}}" stepKey="scrollToOrderTotalSection"/>
+        <see selector="{{AdminOrderTotalSection.grandTotal}}" userInput="$565.00" stepKey="checkOrderTotalInBackend"/>
+
+        <!-- Assert order addresses -->
+        <see selector="{{AdminShipmentAddressInformationSection.billingAddress}}" userInput="{{UK_Not_Default_Address.street[0]}}" stepKey="seeBillingAddressStreet"/>
+        <see selector="{{AdminShipmentAddressInformationSection.billingAddress}}" userInput="{{UK_Not_Default_Address.city}}" stepKey="seeBillingAddressCity"/>
+        <see selector="{{AdminShipmentAddressInformationSection.billingAddress}}" userInput="{{UK_Not_Default_Address.postcode}}" stepKey="seeBillingAddressPostcode"/>
+        <see selector="{{AdminShipmentAddressInformationSection.shippingAddress}}" userInput="{{UK_Not_Default_Address.street[0]}}" stepKey="seeShippingAddressStreet"/>
+        <see selector="{{AdminShipmentAddressInformationSection.shippingAddress}}" userInput="{{UK_Not_Default_Address.city}}" stepKey="seeShippingAddressCity"/>
+        <see selector="{{AdminShipmentAddressInformationSection.shippingAddress}}" userInput="{{UK_Not_Default_Address.postcode}}" stepKey="seeShippingAddressPostcode"/>
+    </test>
+</tests>

From ee050882032f474bd54ffae30bb5a00944480623 Mon Sep 17 00:00:00 2001
From: Anusha Vattam <avattam@adobe.com>
Date: Wed, 15 Jul 2020 10:03:43 -0500
Subject: [PATCH 0875/1718] MC-35653:MyAccount :: Order Details :: Payments
 Methods, shipping address, billing address by Order Number

- Added new chnages for order payments and addressess
---
 .../SalesGraphQl/Model/Order/OrderAddress.php | 169 ++++++++++++++++++
 .../OrderPayments.php}                        |   6 +-
 .../Model/Resolver/CustomerOrders.php         |  48 +++--
 .../SalesItem/ExtractOrderAddressDetails.php  |  78 --------
 app/code/Magento/SalesGraphQl/composer.json   |   1 +
 5 files changed, 195 insertions(+), 107 deletions(-)
 create mode 100644 app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php
 rename app/code/Magento/SalesGraphQl/Model/{SalesItem/ExtractOrderPaymentDetails.php => Order/OrderPayments.php} (88%)
 delete mode 100644 app/code/Magento/SalesGraphQl/Model/SalesItem/ExtractOrderAddressDetails.php

diff --git a/app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php b/app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php
new file mode 100644
index 0000000000000..cbfd4240ac053
--- /dev/null
+++ b/app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php
@@ -0,0 +1,169 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesGraphQl\Model\Order;
+
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddress;
+use Magento\CustomerGraphQl\Model\Customer\ExtractCustomerData;
+use Magento\Sales\Api\Data\OrderInterface;
+
+/**
+ * Class to get the order address details
+ */
+class OrderAddress
+{
+    /**
+     * @var GetCustomerAddress
+     */
+    private $getCustomerAddress;
+
+    /**
+     * @var ExtractCustomerData
+     */
+    private $extractCustomerData;
+
+    /**
+     * @param GetCustomerAddress $getCustomerAddress
+     * @param ExtractCustomerData $extractCustomerData
+     */
+    public function __construct(
+        GetCustomerAddress $getCustomerAddress,
+        ExtractCustomerData $extractCustomerData
+    ) {
+        $this->getCustomerAddress = $getCustomerAddress;
+        $this->extractCustomerData = $extractCustomerData;
+    }
+
+    /**
+     * Get the order Shipping address
+     *
+     * @param OrderInterface $order
+     * @param array $addressIds
+     * @return array
+     */
+    public function getShippingAddress(
+        OrderInterface $order,
+        array $addressIds
+    ): array {
+        $shippingAddress = [];
+        $orderAddresses = $order->getAddresses();
+        foreach ($orderAddresses as $orderAddress) {
+            $addressType = $orderAddress->getDataByKey("address_type");
+            if ($addressType === 'shipping') {
+                $customerAddressId = (int)$orderAddress->getDataByKey('customer_address_id');
+                if (in_array($customerAddressId, $addressIds)) {
+                    $customerData = $this->getCustomerAddress->execute(
+                        $customerAddressId,
+                        (int)$order->getCustomerId()
+                    );
+                    $shippingAddress = $this->extractOrderAddress($customerData);
+                } else {
+                    $shippingAddress = $this->curateCustomerOrderAddress($order, $addressType);
+                }
+            }
+        }
+        return $shippingAddress;
+    }
+
+    /**
+     * Get the order billing address
+     *
+     * @param OrderInterface $order
+     * @param array $addressIds
+     * @return array
+     */
+    public function getBillingAddress(
+        OrderInterface $order,
+        array $addressIds
+    ): array {
+        $billingAddress = [];
+        $orderAddresses = $order->getAddresses();
+        foreach ($orderAddresses as $orderAddress) {
+            $addressType = $orderAddress->getDataByKey("address_type");
+            if ($addressType === 'billing') {
+                $customerAddressId = (int)$orderAddress->getDataByKey('customer_address_id');
+                if (in_array($customerAddressId, $addressIds)) {
+                    $customerData = $this->getCustomerAddress->execute(
+                        $customerAddressId,
+                        (int)$order->getCustomerId()
+                    );
+                    $billingAddress = $this->extractOrderAddress($customerData);
+                } else {
+                    $billingAddress = $this->curateCustomerOrderAddress($order, $addressType);
+                }
+            }
+        }
+        return $billingAddress;
+    }
+
+    /**
+     * Customer Order address data formatter
+     *
+     * @param OrderInterface $order
+     * @param string $addressType
+     * @return array
+     */
+    private function curateCustomerOrderAddress(
+        OrderInterface $order,
+        string $addressType
+    ): array {
+        $orderAddressFields = [];
+        $orderAddressData = [];
+        $orderAddresses = $order->getAddresses();
+        foreach ($orderAddresses as $orderAddress) {
+            if ($addressType === $orderAddress->getDataByKey("address_type")) {
+                $orderAddressData = $orderAddress->getData();
+                $orderAddressFields = [
+                    'id' => $orderAddress->getDataByKey('entity_id'),
+                    'street' => [$street = $orderAddress->getDataByKey('street')],
+                    'country_code' => $orderAddress->getDataByKey('country_id'),
+                    'region' => [
+                        'region' => $orderAddress->getDataByKey('region'),
+                        'region_id' => $orderAddress->getDataByKey('region_id'),
+                        'region_code' => $orderAddress->getDataByKey('region')
+                    ],
+                    'default_billing' => 0,
+                    'default_shipping' => 0,
+                    'extension_attributes' => [],
+                ];
+            }
+        }
+        return array_merge($orderAddressData, $orderAddressFields);
+    }
+
+    private function extractOrderAddress(AddressInterface $customerData)
+    {
+        return [
+            'id' => $customerData->getId(),
+            'firstname' => $customerData->getFirstname(),
+            'lastname' => $customerData->getLastname(),
+            'middlename' => $customerData->getMiddlename(),
+            'postcode' => $customerData->getPostcode(),
+            'prefix' => $customerData->getFirstname(),
+            'suffix' => $customerData->getFirstname(),
+            'street' => $customerData->getStreet(),
+            'country_code' => $customerData->getCountryId(),
+            'city' => $customerData->getCity(),
+            'company' => $customerData->getCompany(),
+            'fax' => $customerData->getFax(),
+            'telephone' => $customerData->getTelephone(),
+            'vat_id' => $customerData->getVatId(),
+            'default_billing' => $customerData->isDefaultBilling() ?? 0,
+            'default_shipping' => $customerData->isDefaultShipping() ?? 0,
+            'region_id' => $customerData->getRegion()->getRegionId(),
+            'extension_attributes' => [
+                $customerData->getExtensionAttributes()
+                ],
+            'region' => [
+                'region' => $customerData->getRegion()->getRegion(),
+                'region_id' => $customerData->getRegion()->getRegionId(),
+                'region_code' => $customerData->getRegion()->getRegionCode()
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/SalesGraphQl/Model/SalesItem/ExtractOrderPaymentDetails.php b/app/code/Magento/SalesGraphQl/Model/Order/OrderPayments.php
similarity index 88%
rename from app/code/Magento/SalesGraphQl/Model/SalesItem/ExtractOrderPaymentDetails.php
rename to app/code/Magento/SalesGraphQl/Model/Order/OrderPayments.php
index c5815eb2d7d9d..91a40834bf009 100644
--- a/app/code/Magento/SalesGraphQl/Model/SalesItem/ExtractOrderPaymentDetails.php
+++ b/app/code/Magento/SalesGraphQl/Model/Order/OrderPayments.php
@@ -5,20 +5,20 @@
  */
 declare(strict_types=1);
 
-namespace Magento\SalesGraphQl\Model\SalesItem;
+namespace Magento\SalesGraphQl\Model\Order;
 
 use Magento\Sales\Api\Data\OrderInterface;
 
 /**
  * Class to extract the order payment details
  */
-class ExtractOrderPaymentDetails
+class OrderPayments
 {
     /**
      * @param OrderInterface $orderModel
      * @return array
      */
-    public function getOrderPaymentMethodDetails(OrderInterface $orderModel): array
+    public function getOrderPaymentMethod(OrderInterface $orderModel): array
     {
         $orderPayment = $orderModel->getPayment();
         $additionalInformationCcType = $orderPayment->getCcType();
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders.php b/app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders.php
index 75019710bf302..a17eba8e8bd39 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders.php
@@ -16,9 +16,9 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\SalesGraphQl\Model\Order\OrderAddress;
+use Magento\SalesGraphQl\Model\Order\OrderPayments;
 use Magento\SalesGraphQl\Model\Resolver\CustomerOrders\Query\OrderFilter;
-use Magento\SalesGraphQl\Model\SalesItem\ExtractOrderAddressDetails;
-use Magento\SalesGraphQl\Model\SalesItem\ExtractOrderPaymentDetails;
 use Magento\Store\Api\Data\StoreInterface;
 
 /**
@@ -32,14 +32,14 @@ class CustomerOrders implements ResolverInterface
     private $searchCriteriaBuilder;
 
     /**
-     * @var ExtractOrderAddressDetails
+     * @var OrderAddress
      */
-    private $extractOrderAddressDetails;
+    private $orderAddress;
 
     /**
-     * @var ExtractOrderPaymentDetails
+     * @var OrderPayments
      */
-    private $extractOrderPaymentDetails;
+    private $orderPayments;
 
     /**
      * @var OrderRepositoryInterface
@@ -53,21 +53,21 @@ class CustomerOrders implements ResolverInterface
 
     /**
      * @param OrderRepositoryInterface $orderRepository
-     * @param ExtractOrderAddressDetails $extractOrderAddressDetails
-     * @param ExtractOrderPaymentDetails $extractOrderPaymentDetails
+     * @param OrderAddress $orderAddress
+     * @param OrderPayments $orderPayments
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param OrderFilter $orderFilter
      */
     public function __construct(
         OrderRepositoryInterface $orderRepository,
-        ExtractOrderAddressDetails $extractOrderAddressDetails,
-        ExtractOrderPaymentDetails $extractOrderPaymentDetails,
+        OrderAddress $orderAddress,
+        OrderPayments $orderPayments,
         SearchCriteriaBuilder $searchCriteriaBuilder,
         OrderFilter $orderFilter
     ) {
         $this->orderRepository = $orderRepository;
-        $this->extractOrderAddressDetails = $extractOrderAddressDetails;
-        $this->extractOrderPaymentDetails = $extractOrderPaymentDetails;
+        $this->orderAddress = $orderAddress;
+        $this->orderPayments = $orderPayments;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
         $this->orderFilter = $orderFilter;
     }
@@ -96,13 +96,9 @@ public function resolve(
         $store = $context->getExtensionAttributes()->getStore();
         $customerModel = $value['model'];
         $address = $customerModel->getAddresses();
-        $addressArrayData = [];
-        foreach ($address as $key => $addressArray) {
-            $addressArrayData[$key] = $addressArray;
-            foreach ($addressArray as $addressData) {
-                $shipping = $addressData->isDefaultshipping();
-                $billing = $addressData->isDefaultBilling();
-            }
+        $addressIds = [];
+        foreach ($address as $key => $addressData) {
+            $addressIds[$key] = (int)$addressData->getId();
         }
 
         try {
@@ -114,7 +110,7 @@ public function resolve(
 
         return [
             'total_count' => $searchResult->getTotalCount(),
-            'items' => $this->formatOrdersArray($searchResult->getItems(), $address),
+            'items' => $this->formatOrdersArray($searchResult->getItems(), $addressIds),
             'page_info' => [
                 'page_size' => $searchResult->getPageSize(),
                 'current_page' => $searchResult->getCurPage(),
@@ -127,14 +123,15 @@ public function resolve(
      * Format order models for graphql schema
      *
      * @param OrderInterface[] $orderModels
-     * @param array $address
+     * @param array $addressIds
      * @return array
      */
-    private function formatOrdersArray(array $orderModels, array $address)
+    private function formatOrdersArray(array $orderModels, array $addressIds)
     {
         $ordersArray = [];
 
         foreach ($orderModels as $orderModel) {
+
             $ordersArray[] = [
                 'created_at' => $orderModel->getCreatedAt(),
                 'grand_total' => $orderModel->getGrandTotal(),
@@ -145,9 +142,9 @@ private function formatOrdersArray(array $orderModels, array $address)
                 'order_number' => $orderModel->getIncrementId(),
                 'status' => $orderModel->getStatusLabel(),
                 'shipping_method' => $orderModel->getShippingDescription(),
-                'billing_address' => $this->extractOrderAddressDetails->getBillingAddressDetails($orderModel),
-                'shipping_address' => $this->extractOrderAddressDetails->getShippingAddressDetails($orderModel),
-                'payment_methods' => $this->extractOrderPaymentDetails->getOrderPaymentMethodDetails($orderModel),
+                'shipping_address' => $this->orderAddress->getShippingAddress($orderModel, $addressIds),
+                'billing_address' => $this->orderAddress->getBillingAddress($orderModel, $addressIds),
+                'payment_methods' => $this->orderPayments->getOrderPaymentMethod($orderModel),
                 'model' => $orderModel,
             ];
         }
@@ -176,4 +173,3 @@ private function getSearchResult(array $args, int $userId, int $storeId)
         return $this->orderRepository->getList($this->searchCriteriaBuilder->create());
     }
 }
-
diff --git a/app/code/Magento/SalesGraphQl/Model/SalesItem/ExtractOrderAddressDetails.php b/app/code/Magento/SalesGraphQl/Model/SalesItem/ExtractOrderAddressDetails.php
deleted file mode 100644
index ceffd46990299..0000000000000
--- a/app/code/Magento/SalesGraphQl/Model/SalesItem/ExtractOrderAddressDetails.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\SalesGraphQl\Model\SalesItem;
-
-use Magento\Sales\Api\Data\OrderInterface;
-
-/**
- * Class to extract the order address details
- */
-class ExtractOrderAddressDetails
-{
-    /**
-     * Get Shipping address details
-     *
-     * @param OrderInterface $order
-     * @return array
-     */
-    public function getShippingAddressDetails(
-        OrderInterface $order
-    ): array {
-        $shippingAddressFields = [];
-        $shippingAddressData = [];
-        $orderAddresses = $order->getAddresses();
-        foreach ($orderAddresses as $orderAddress) {
-            $addressType = $orderAddress->getDataByKey("address_type");
-            if ($addressType === 'shipping') {
-                $shippingAddressData = $orderAddress->getData();
-                $shippingAddressFields = [
-                    'id' => $orderAddress->getDataByKey('entity_id'),
-                    'street' => $orderAddress->getDataByKey('street'),
-                    'country_code' => $orderAddress->getDataByKey('country_id'),
-                    'region' => [
-                        'region' => $orderAddress->getDataByKey('region'),
-                        'region_id' => $orderAddress->getDataByKey('region_id'),
-                        'region_code' => $orderAddress->getDataByKey('region')
-                    ],
-                ];
-            }
-        }
-        return array_merge($shippingAddressData, $shippingAddressFields);
-    }
-
-    /**
-     * Get Billing address details
-     *
-     * @param OrderInterface $order
-     * @return array
-     */
-    public function getBillingAddressDetails(
-        OrderInterface $order
-    ): array {
-        $billingAddressFields = [];
-        $billingAddressFieldsData = [];
-        $orderAddresses = $order->getAddresses();
-        foreach ($orderAddresses as $orderAddress) {
-            $addressType = $orderAddress->getDataByKey("address_type");
-            if ($addressType === 'billing') {
-                $billingAddressFieldsData = $orderAddress->getData();
-                $billingAddressFields = [
-                    'id' => $orderAddress->getDataByKey('entity_id'),
-                    'street' => $orderAddress->getDataByKey('street'),
-                    'country_code' => $orderAddress->getDataByKey('country_id'),
-                    'region' => [
-                        'region' => $orderAddress->getDataByKey('region'),
-                        'region_id' => $orderAddress->getDataByKey('region_id'),
-                        'region_code' => $orderAddress->getDataByKey('region')
-                    ],
-                ];
-            }
-        }
-        return array_merge($billingAddressFieldsData, $billingAddressFields);
-    }
-}
diff --git a/app/code/Magento/SalesGraphQl/composer.json b/app/code/Magento/SalesGraphQl/composer.json
index 9fd6e76220df3..1b4e3328636c5 100644
--- a/app/code/Magento/SalesGraphQl/composer.json
+++ b/app/code/Magento/SalesGraphQl/composer.json
@@ -8,6 +8,7 @@
         "magento/module-sales": "*",
         "magento/module-store": "*",
         "magento/module-catalog": "*",
+        "magento/module-customer-graphql": "*",
         "magento/module-graph-ql": "*"
     },
     "suggest": {

From 049a5753a77ead97e5b2df25c7c4006655c82170 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 15 Jul 2020 18:24:36 +0300
Subject: [PATCH 0876/1718] Refactor to pass unit tests

---
 .../Cms/Model/Wysiwyg/Images/Storage.php      | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
index 3b7223a114adf..098a7170a430a 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
@@ -628,13 +628,22 @@ public function resizeFile($source, $keepRatio = true)
         }
         $image = $this->_imageFactory->create();
         $image->open($source);
+
         $image->keepAspectRatio($keepRatio);
-        list($imageWidth, $imageHeight) = getimagesize($source);
+
+        list($imageWidth, $imageHeight) = @getimagesize($source);
         
-        $image->resize(
-            $this->_resizeParameters['width'] > $imageWidth ? $imageWidth : $this->_resizeParameters['width'],
-            $this->_resizeParameters['height'] > $imageHeight ? $imageHeight : $this->_resizeParameters['height']
-        );
+        if ($imageWidth && $imageHeight) {
+            $configWidth = $this->_resizeParameters['width'];
+            $configHeight = $this->_resizeParameters['height'];
+            $imageWidth = $configWidth > $imageWidth ? $imageWidth : $this->_resizeParameters['width'];
+            $imageHeight = $configHeight > $imageHeight ? $imageHeight : $this->_resizeParameters['height'];
+        } else {
+            $imageWidth = $this->_resizeParameters['width'];
+            $imageHeight = $this->_resizeParameters['height'];
+        }
+        
+        $image->resize($imageWidth, $imageHeight);
         $dest = $targetDir . '/' . $this->ioFile->getPathInfo($source)['basename'];
         $image->save($dest);
         if ($this->_directory->isFile($this->_directory->getRelativePath($dest))) {

From fce4c289cb224327433c4cfad463133bdfbdc034 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 15 Jul 2020 18:34:14 +0300
Subject: [PATCH 0877/1718] Small improvements

---
 app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
index 098a7170a430a..471e52cd82119 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
@@ -636,8 +636,8 @@ public function resizeFile($source, $keepRatio = true)
         if ($imageWidth && $imageHeight) {
             $configWidth = $this->_resizeParameters['width'];
             $configHeight = $this->_resizeParameters['height'];
-            $imageWidth = $configWidth > $imageWidth ? $imageWidth : $this->_resizeParameters['width'];
-            $imageHeight = $configHeight > $imageHeight ? $imageHeight : $this->_resizeParameters['height'];
+            $imageWidth = $configWidth > $imageWidth ? $imageWidth : $configWidth;
+            $imageHeight = $configHeight > $imageHeight ? $imageHeight : $configHeight;
         } else {
             $imageWidth = $this->_resizeParameters['width'];
             $imageHeight = $this->_resizeParameters['height'];

From c8aa304d523e86f1825e5ca1cfc0f3912b9c37aa Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 15 Jul 2020 18:52:39 +0300
Subject: [PATCH 0878/1718] Use actionGroup for asserting product sku

---
 .../Test/AdminAddInStockProductToTheCartTest.xml |  4 +++-
 ...eProductPriceWithDisabledChildProductTest.xml |  8 ++++++--
 ...stomProductAttributeWithDropdownFieldTest.xml |  4 +++-
 ...CreateProductAttributeFromProductPageTest.xml |  4 +++-
 ...VirtualProductOutOfStockWithTierPriceTest.xml |  4 +++-
 ...ithCustomOptionsSuiteAndImportOptionsTest.xml |  4 +++-
 ...reateVirtualProductWithoutManageStockTest.xml |  4 +++-
 .../AdminDeleteConfigurableChildProductsTest.xml |  8 ++++++--
 .../AdminUpdateSimpleProductTieredPriceTest.xml  |  4 +++-
 ...uctWithRegularPriceInStockEnabledFlatTest.xml |  4 +++-
 ...PriceInStockVisibleInCatalogAndSearchTest.xml |  4 +++-
 ...gularPriceInStockVisibleInCatalogOnlyTest.xml |  4 +++-
 ...egularPriceInStockVisibleInSearchOnlyTest.xml |  4 +++-
 ...hRegularPriceInStockWithCustomOptionsTest.xml |  4 +++-
 ...mpleProductWithRegularPriceOutOfStockTest.xml |  4 +++-
 ...ularPriceInStockVisibleInCategoryOnlyTest.xml |  4 +++-
 ...kWithCustomOptionsVisibleInSearchOnlyTest.xml |  4 +++-
 ...eOutOfStockVisibleInCategoryAndSearchTest.xml |  4 +++-
 ...rPriceOutOfStockVisibleInCategoryOnlyTest.xml |  4 +++-
 ...larPriceOutOfStockVisibleInSearchOnlyTest.xml |  4 +++-
 ...riceInStockVisibleInCategoryAndSearchTest.xml |  4 +++-
 ...eOutOfStockVisibleInCategoryAndSearchTest.xml |  4 +++-
 ...TierPriceInStockVisibleInCategoryOnlyTest.xml |  4 +++-
 ...eOutOfStockVisibleInCategoryAndSearchTest.xml |  4 +++-
 .../StorefrontProductNameWithDoubleQuoteTest.xml |  4 +++-
 ...StorefrontProductNameWithHTMLEntitiesTest.xml |  4 +++-
 .../Test/AdminDeleteCatalogPriceRuleTest.xml     | 16 ++++++++++++----
 ...henUpdatingProductThroughImportingCSVTest.xml |  4 +++-
 28 files changed, 99 insertions(+), 33 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml
index a41d0836a2ded..cde9501ca7cc9 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml
@@ -74,7 +74,9 @@
         <waitForPageLoad stepKey="waitForProductFrontPageToLoad"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{SimpleProduct.name}}" stepKey="seeProductNameInStoreFront"/>
         <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{SimpleProduct.price}}" stepKey="seeProductPriceInStoreFront"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{SimpleProduct.sku}}" stepKey="seeProductSkuInStoreFront"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeProductSkuInStoreFront">
+            <argument name="productSku" value="{{SimpleProduct.sku}}"/>
+        </actionGroup>
         <see selector="{{StorefrontProductInfoMainSection.productStockStatus}}" userInput="In Stock" stepKey="seeProductStatusInStoreFront"/>
         <!--Add Product to the cart-->
         <fillField selector="{{StorefrontProductPageSection.qtyInput}}" userInput="1" stepKey="fillProductQuantity"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckConfigurableProductPriceWithDisabledChildProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckConfigurableProductPriceWithDisabledChildProductTest.xml
index 39351539d14a6..ea75a71681eb7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckConfigurableProductPriceWithDisabledChildProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckConfigurableProductPriceWithDisabledChildProductTest.xml
@@ -131,7 +131,9 @@
         <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="seeCategoryInFrontPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createConfigProduct.name$$" stepKey="seeProductNameInStoreFront"/>
         <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$$createConfigChildProduct1.price$$" stepKey="seeInitialPriceInStoreFront"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="$$createConfigProduct.sku$$" stepKey="seeProductSkuInStoreFront"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeProductSkuInStoreFront">
+            <argument name="productSku" value="$$createConfigProduct.sku$$"/>
+        </actionGroup>
         <see selector="{{StorefrontProductInfoMainSection.productStockStatus}}" userInput="In Stock" stepKey="seeProductStatusInStoreFront"/>
 
         <!-- Verify First Child Product attribute option is displayed -->
@@ -168,7 +170,9 @@
         <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="seeCategoryInFrontPage1"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createConfigProduct.name$$" stepKey="seeProductNameInStoreFront1"/>
         <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$$createConfigChildProduct2.price$$" stepKey="seeUpdatedProductPriceInStoreFront"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="$$createConfigProduct.sku$$" stepKey="seeProductSkuInStoreFront1"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeProductSkuInStoreFront1">
+            <argument name="productSku" value="$$createConfigProduct.sku$$"/>
+        </actionGroup>
         <see selector="{{StorefrontProductInfoMainSection.productStockStatus}}" userInput="In Stock" stepKey="seeProductStatusInStoreFront1"/>
 
         <!-- Verify product Attribute Option1 is not displayed  -->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml
index 19df6e29f36a2..fcad4664439aa 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCustomProductAttributeWithDropdownFieldTest.xml
@@ -124,7 +124,9 @@
         <waitForPageLoad  stepKey="waitForProductToLoad1"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createConfigProduct.name$$" stepKey="seeProductNameInStoreFront"/>
         <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$$createConfigProduct.price$$" stepKey="seeProductPriceInStoreFront"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="$$createConfigProduct.sku$$" stepKey="seeProductSkuInStoreFront"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeProductSkuInStoreFront">
+            <argument name="productSku" value="$$createConfigProduct.sku$$"/>
+        </actionGroup>
         <scrollTo selector="{{StorefrontProductMoreInformationSection.moreInformation}}" stepKey="scrollToMoreInformation"/>
         <see selector="{{StorefrontProductMoreInformationSection.attributeLabel}}"  userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="seeAttributeLabel"/>
         <see selector="{{StorefrontProductMoreInformationSection.attributeValue}}"  userInput="{{ProductAttributeOption8.value}}" stepKey="seeAttributeValue"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml
index 7154b7b27650d..8566fc9211457 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateProductAttributeFromProductPageTest.xml
@@ -119,7 +119,9 @@
         <waitForPageLoad  stepKey="waitForProductToLoad1"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{SimpleProduct.name}}" stepKey="seeProductNameInStoreFront"/>
         <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{SimpleProduct.price}}" stepKey="seeProductPriceInStoreFront"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{SimpleProduct.sku}}" stepKey="seeProductSkuInStoreFront"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeProductSkuInStoreFront">
+            <argument name="productSku" value="{{SimpleProduct.sku}}"/>
+        </actionGroup>
         <scrollTo selector="{{StorefrontProductMoreInformationSection.moreInformation}}" stepKey="scrollToMoreInformation"/>
         <see selector="{{StorefrontProductMoreInformationSection.attributeLabel}}"  userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="seeAttributeLabel"/>
         <see selector="{{StorefrontProductMoreInformationSection.attributeValue}}"  userInput="{{ProductAttributeOption8.value}}" stepKey="seeAttributeValue"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml
index 9747ae6314b7d..53be55755116f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductOutOfStockWithTierPriceTest.xml
@@ -71,7 +71,9 @@
         <amOnPage url="{{StorefrontProductPage.url(virtualProductOutOfStock.urlKey)}}" stepKey="goToProductPage"/>
         <waitForPageLoad stepKey="waitForStoreFrontProductPageToLoad"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{virtualProductOutOfStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{virtualProductOutOfStock.sku}}" stepKey="seeVirtualProductSku"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeVirtualProductSku">
+            <argument name="productSku" value="{{virtualProductOutOfStock.sku}}"/>
+        </actionGroup>
 
         <!--  Verify customer see product tier price on product page -->
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productTierPriceByForTextLabel('1', tierPriceOnDefault.qty_0)}}" stepKey="firstTierPriceText"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
index f119c995d3a61..f21d35c95292e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithCustomOptionsSuiteAndImportOptionsTest.xml
@@ -131,7 +131,9 @@
 
         <!-- Verify we see created virtual product with custom options suite and import options on the storefront page -->
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{virtualProductCustomImportOptions.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{virtualProductCustomImportOptions.sku}}" stepKey="seeVirtualProductSku"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeVirtualProductSku">
+            <argument name="productSku" value="{{virtualProductCustomImportOptions.sku}}"/>
+        </actionGroup>
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
         <assertEquals stepKey="assertStockAvailableOnProductPage">
             <expectedResult type="string">{{virtualProductCustomImportOptions.storefrontStatus}}</expectedResult>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml
index 14f228375bfaa..685c38ab2cee4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml
@@ -61,7 +61,9 @@
         <amOnPage url="{{StorefrontProductPage.url(virtualProductWithoutManageStock.urlKey)}}" stepKey="goToProductPage"/>
         <waitForPageLoad stepKey="waitForStoreFrontPageToLoad"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{virtualProductWithoutManageStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{virtualProductWithoutManageStock.sku}}" stepKey="seeVirtualProductSku"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeVirtualProductSku">
+            <argument name="productSku" value="{{virtualProductWithoutManageStock.sku}}"/>
+        </actionGroup>
 
         <!-- Verify customer see product special price on the storefront page -->
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.specialPriceAmount}}" stepKey="specialPriceAmount"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteConfigurableChildProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteConfigurableChildProductsTest.xml
index 7748d4bf4db6f..bf0d5d99a23bb 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteConfigurableChildProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteConfigurableChildProductsTest.xml
@@ -93,7 +93,9 @@
         <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="seeCategoryInFrontPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createConfigProduct.name$$" stepKey="seeProductNameInStoreFront"/>
         <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$$createConfigProduct.price$$" stepKey="seeProductPriceInStoreFront"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="$$createConfigProduct.sku$$" stepKey="seeProductSkuInStoreFront"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeProductSkuInStoreFront">
+            <argument name="productSku" value="$$createConfigProduct.sku$$"/>
+        </actionGroup>
         <see selector="{{StorefrontProductInfoMainSection.productStockStatus}}" userInput="In Stock" stepKey="seeProductStatusInStoreFront"/>
         <see selector="{{StorefrontProductInfoMainSection.productAttributeTitle1}}" userInput="$$createConfigProductAttribute.default_value$$" stepKey="seeProductAttributeLabel"/>
         <seeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" stepKey="seeProductAttributeOptions"/>
@@ -116,7 +118,9 @@
         <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategory.name$$)}}" stepKey="seeCategoryInFrontPage1"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createConfigProduct.name$$" stepKey="seeProductNameInStoreFront1"/>
         <dontSee selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$$createConfigProduct.price$$" stepKey="dontSeeProductPriceInStoreFront"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="$$createConfigProduct.sku$$" stepKey="seeProductSkuInStoreFront1"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeProductSkuInStoreFront1">
+            <argument name="productSku" value="$$createConfigProduct.sku$$"/>
+        </actionGroup>
         <see selector="{{StorefrontProductInfoMainSection.productStockStatus}}" userInput="OUT OF STOCK" stepKey="seeProductStatusInStoreFront1"/>
         <dontSee selector="{{StorefrontProductInfoMainSection.productAttributeTitle1}}" userInput="$$createConfigProductAttribute.default_value$$" stepKey="dontSeeProductAttributeLabel"/>
         <dontSeeElement selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" stepKey="dontSeeProductAttributeOptions"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml
index 522f0c712754f..0c9bd9b1155c4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductTieredPriceTest.xml
@@ -123,7 +123,9 @@
         <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{simpleProductTierPrice300InStock.name}}" stepKey="seeSimpleProductNameOnStoreFrontPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{simpleProductTierPrice300InStock.price}}" stepKey="seeSimpleProductPriceOnStoreFrontPage"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{simpleProductTierPrice300InStock.sku}}" stepKey="seeProductSku"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeProductSku">
+            <argument name="productSku" value="{{simpleProductTierPrice300InStock.sku}}"/>
+        </actionGroup>
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
         <assertEquals stepKey="assertStockAvailableOnProductPage">
             <expectedResult type="string">{{simpleProductTierPrice300InStock.storefrontStatus}}</expectedResult>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest.xml
index 9819ba61c21b7..a5e31f14a4449 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest.xml
@@ -117,7 +117,9 @@
         <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{simpleProductEnabledFlat.name}}" stepKey="seeSimpleProductNameOnStoreFrontPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{simpleProductEnabledFlat.price}}" stepKey="seeSimpleProductPriceOnStoreFrontPage"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{simpleProductEnabledFlat.sku}}" stepKey="seeSimpleProductSkuOnStoreFrontPage"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeSimpleProductSkuOnStoreFrontPage">
+            <argument name="productSku" value="{{simpleProductEnabledFlat.sku}}"/>
+        </actionGroup>
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
         <assertEquals stepKey="assertStockAvailableOnProductPage">
             <expectedResult type="string">{{simpleProductEnabledFlat.storefrontStatus}}</expectedResult>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml
index 2a260c606c71f..c3d46c929af92 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml
@@ -105,7 +105,9 @@
         <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{simpleProductRegularPrice245InStock.name}}" stepKey="seeSimpleProductNameOnStoreFrontPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{simpleProductRegularPrice245InStock.price}}" stepKey="seeSimpleProductPriceOnStoreFrontPage"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{simpleProductRegularPrice245InStock.sku}}" stepKey="seeSimpleProductSkuOnStoreFrontPage"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeSimpleProductSkuOnStoreFrontPage">
+            <argument name="productSku" value="{{simpleProductRegularPrice245InStock.sku}}"/>
+        </actionGroup>
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
         <assertEquals stepKey="assertStockAvailableOnProductPage">
             <expectedResult type="string">{{simpleProductRegularPrice245InStock.storefrontStatus}}</expectedResult>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml
index db7d0f7adbec6..e2fd5baf33639 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogOnlyTest.xml
@@ -105,7 +105,9 @@
         <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{simpleProductRegularPrice32501InStock.name}}" stepKey="seeSimpleProductNameOnStoreFrontPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{simpleProductRegularPrice32501InStock.price}}" stepKey="seeSimpleProductPriceOnStoreFrontPage"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{simpleProductRegularPrice32501InStock.sku}}" stepKey="seeProductSku"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeProductSku">
+            <argument name="productSku" value="{{simpleProductRegularPrice32501InStock.sku}}"/>
+        </actionGroup>
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
         <assertEquals stepKey="assertStockAvailableOnProductPage">
             <expectedResult type="string">{{simpleProductRegularPrice32501InStock.storefrontStatus}}</expectedResult>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInSearchOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInSearchOnlyTest.xml
index 0a892b004f150..07e85ed34fd89 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInSearchOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInSearchOnlyTest.xml
@@ -102,7 +102,9 @@
         <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{simpleProductRegularPrice325InStock.name}}" stepKey="seeSimpleProductNameOnStoreFrontPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{simpleProductRegularPrice325InStock.price}}" stepKey="seeSimpleProductPriceOnStoreFrontPage"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{simpleProductRegularPrice325InStock.sku}}" stepKey="seeProductSku"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeProductSku">
+            <argument name="productSku" value="{{simpleProductRegularPrice325InStock.sku}}"/>
+        </actionGroup>
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
         <assertEquals stepKey="assertStockAvailableOnProductPage">
             <expectedResult type="string">{{simpleProductRegularPrice325InStock.storefrontStatus}}</expectedResult>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml
index 48b223b1b0567..25c5d87d221a6 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockWithCustomOptionsTest.xml
@@ -122,7 +122,9 @@
         <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{simpleProductRegularPriceCustomOptions.name}}" stepKey="seeSimpleProductNameOnStoreFrontPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{simpleProductRegularPriceCustomOptions.price}}" stepKey="seeSimpleProductPriceOnStoreFrontPage"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{simpleProductRegularPriceCustomOptions.sku}}" stepKey="seeSimpleProductSkuOnStoreFrontPage"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeSimpleProductSkuOnStoreFrontPage">
+            <argument name="productSku" value="{{simpleProductRegularPriceCustomOptions.sku}}"/>
+        </actionGroup>
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
         <assertEquals stepKey="assertStockAvailableOnProductPage">
             <expectedResult type="string">{{simpleProductRegularPriceCustomOptions.storefrontStatus}}</expectedResult>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceOutOfStockTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceOutOfStockTest.xml
index 98096f2702e12..2fdb87f7a69c3 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceOutOfStockTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceOutOfStockTest.xml
@@ -100,7 +100,9 @@
         <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{simpleProductRegularPrice32503OutOfStock.name}}" stepKey="seeSimpleProductNameOnStoreFrontPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{simpleProductRegularPrice32503OutOfStock.price}}" stepKey="seeSimpleProductPriceOnStoreFrontPage"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{simpleProductRegularPrice32503OutOfStock.sku}}" stepKey="seeSimpleProductSkuOnStoreFrontPage"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeSimpleProductSkuOnStoreFrontPage">
+            <argument name="productSku" value="{{simpleProductRegularPrice32503OutOfStock.sku}}"/>
+        </actionGroup>
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
         <assertEquals stepKey="assertStockAvailableOnProductPage">
             <expectedResult type="string">{{simpleProductRegularPrice32503OutOfStock.storefrontStatus}}</expectedResult>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
index f77138c6e2b8a..d7d1ca1e4d3e6 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
@@ -138,7 +138,9 @@
         <waitForPageLoad stepKey="waitForStoreFrontProductPageToLoad"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualProductRegularPrice.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{updateVirtualProductRegularPrice.price}}" stepKey="seeVirtualProductPriceOnStoreFrontPage"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualProductRegularPrice.sku}}" stepKey="seeVirtualProductSku"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeVirtualProductSku">
+            <argument name="productSku" value="{{updateVirtualProductRegularPrice.sku}}"/>
+        </actionGroup>
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.tierPriceText}}" stepKey="tierPriceText"/>
         <assertEquals stepKey="assertTierPriceTextOnProductPage">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
index 1bc66cca8d5fa..331dcac59192d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
@@ -217,7 +217,9 @@
         <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualProductRegularPriceInStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{updateVirtualProductRegularPriceInStock.price}}" stepKey="seeVirtualProductPriceOnStoreFrontPage"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualProductRegularPriceInStock.sku}}" stepKey="seeVirtualProductSku"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeVirtualProductSku">
+            <argument name="productSku" value="{{updateVirtualProductRegularPriceInStock.sku}}"/>
+        </actionGroup>
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
         <assertEquals stepKey="assertStockAvailableOnProductPage">
             <expectedResult type="string">{{updateVirtualProductRegularPriceInStock.storefrontStatus}}</expectedResult>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml
index 8316d71f7b7da..cdace32da2583 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml
@@ -86,7 +86,9 @@
         <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.price}}" stepKey="seeVirtualProductPriceOnStoreFrontPage"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.sku}}" stepKey="seeVirtualProductSku"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeVirtualProductSku">
+            <argument name="productSku" value="{{updateVirtualProductRegularPrice5OutOfStock.sku}}"/>
+        </actionGroup>
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
         <assertEquals stepKey="assertStockAvailableOnProductPage">
             <expectedResult type="string">{{updateVirtualProductRegularPrice5OutOfStock.storefrontStatus}}</expectedResult>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
index 6e346f38a2836..1cae80e447e7c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
@@ -106,7 +106,9 @@
         <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.price}}" stepKey="seeVirtualProductPriceOnStoreFrontPage"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualProductRegularPrice5OutOfStock.sku}}" stepKey="seeVirtualProductSku"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeVirtualProductSku">
+            <argument name="productSku" value="{{updateVirtualProductRegularPrice5OutOfStock.sku}}"/>
+        </actionGroup>
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
         <assertEquals stepKey="assertStockAvailableOnProductPage">
             <expectedResult type="string">{{updateVirtualProductRegularPrice5OutOfStock.storefrontStatus}}</expectedResult>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml
index 57cf6f6e45d97..a87e113354fd8 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml
@@ -84,7 +84,9 @@
         <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.price}}" stepKey="seeVirtualProductPriceOnStoreFrontPage"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualProductRegularPrice99OutOfStock.sku}}" stepKey="seeVirtualProductSku"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeVirtualProductSku">
+            <argument name="productSku" value="{{updateVirtualProductRegularPrice99OutOfStock.sku}}"/>
+        </actionGroup>
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
         <assertEquals stepKey="assertStockAvailableOnProductPage">
             <expectedResult type="string">{{updateVirtualProductRegularPrice99OutOfStock.storefrontStatus}}</expectedResult>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml
index d1aa7a31ed297..6abc8ef83bf32 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml
@@ -123,7 +123,9 @@
         <amOnPage url="{{StorefrontProductPage.url(updateVirtualProductSpecialPrice.urlKey)}}" stepKey="goToProductStorefrontPage"/>
         <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualProductSpecialPrice.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualProductSpecialPrice.sku}}" stepKey="seeVirtualProductSku"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeVirtualProductSku">
+            <argument name="productSku" value="{{updateVirtualProductSpecialPrice.sku}}"/>
+        </actionGroup>
         <!-- Verify customer see virtual product special price on the storefront page -->
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.specialPriceAmount}}" stepKey="specialPriceAmount"/>
         <assertEquals stepKey="assertSpecialPriceTextOnProductPage">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml
index ba8ccbe932bfa..2d32b7e47bd9b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml
@@ -108,7 +108,9 @@
         <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.price}}" stepKey="seeVirtualProductPriceOnStoreFrontPage"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualProductSpecialPriceOutOfStock.sku}}" stepKey="seeVirtualProductSku"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeVirtualProductSku">
+            <argument name="productSku" value="{{updateVirtualProductSpecialPriceOutOfStock.sku}}"/>
+        </actionGroup>
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
         <assertEquals stepKey="assertStockAvailableOnProductPage">
             <expectedResult type="string">{{updateVirtualProductSpecialPriceOutOfStock.storefrontStatus}}</expectedResult>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
index e43b04bb5e08b..a0909966f6b2c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
@@ -124,7 +124,9 @@
         <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualProductWithTierPriceInStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{updateVirtualProductWithTierPriceInStock.price}}" stepKey="seeVirtualProductPriceOnStoreFrontPage"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualProductWithTierPriceInStock.sku}}" stepKey="seeVirtualProductSku"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeVirtualProductSku">
+            <argument name="productSku" value="{{updateVirtualProductWithTierPriceInStock.sku}}"/>
+        </actionGroup>
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
         <assertEquals stepKey="assertStockAvailableOnProductPage">
             <expectedResult type="string">{{updateVirtualProductWithTierPriceInStock.storefrontStatus}}</expectedResult>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
index 52d8c08294e86..3b798df57ea5d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
@@ -124,7 +124,9 @@
         <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{updateVirtualTierPriceOutOfStock.name}}" stepKey="seeVirtualProductNameOnStoreFrontPage"/>
         <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="{{updateVirtualTierPriceOutOfStock.price}}" stepKey="seeVirtualProductPriceOnStoreFrontPage"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{updateVirtualTierPriceOutOfStock.sku}}" stepKey="seeVirtualProductSku"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeVirtualProductSku">
+            <argument name="productSku" value="{{updateVirtualTierPriceOutOfStock.sku}}"/>
+        </actionGroup>
         <grabTextFrom selector="{{StorefrontProductInfoMainSection.productStockStatus}}" stepKey="productStockAvailableStatus"/>
         <assertEquals stepKey="assertStockAvailableOnProductPage">
             <expectedResult type="string">{{updateVirtualTierPriceOutOfStock.storefrontStatus}}</expectedResult>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest/StorefrontProductNameWithDoubleQuoteTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest/StorefrontProductNameWithDoubleQuoteTest.xml
index bcd5d7b851db3..f7014dd57c20b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest/StorefrontProductNameWithDoubleQuoteTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest/StorefrontProductNameWithDoubleQuoteTest.xml
@@ -52,7 +52,9 @@
         <click selector="{{StorefrontCategoryProductSection.ProductTitleByName(SimpleProductNameWithDoubleQuote.name)}}" stepKey="clickProductToGoProductPage"/>
         <waitForPageLoad stepKey="waitForProductDisplayPageLoad"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{SimpleProductNameWithDoubleQuote.name}}" stepKey="seeCorrectName"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{SimpleProductNameWithDoubleQuote.sku}}" stepKey="seeCorrectSku"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeCorrectSku">
+            <argument name="productSku" value="{{SimpleProductNameWithDoubleQuote.sku}}"/>
+        </actionGroup>
         <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="${{SimpleProductNameWithDoubleQuote.price}}" stepKey="seeCorrectPrice"/>
         <seeElement selector="{{StorefrontProductInfoMainSection.productImageSrc(ProductImage.fileName)}}" stepKey="seeCorrectImage"/>
         <see selector="{{StorefrontProductInfoMainSection.stock}}" userInput="In Stock" stepKey="seeInStock"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest/StorefrontProductNameWithHTMLEntitiesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest/StorefrontProductNameWithHTMLEntitiesTest.xml
index bd2c22c90318a..3326bbf7a5f68 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest/StorefrontProductNameWithHTMLEntitiesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuoteTest/StorefrontProductNameWithHTMLEntitiesTest.xml
@@ -46,7 +46,9 @@
         <waitForPageLoad stepKey="waitForProductDisplayPageLoad2"/>
 
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{productWithHTMLEntityOne.name}}" stepKey="seeCorrectName"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{productWithHTMLEntityOne.sku}}" stepKey="seeCorrectSku"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeCorrectSku">
+            <argument name="productSku" value="{{productWithHTMLEntityOne.sku}}"/>
+        </actionGroup>
         <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="${{productWithHTMLEntityOne.price}}" stepKey="seeCorrectPrice"/>
 
         <!--Veriy the breadcrumbs on Product Display page-->
diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml
index 69508490774dd..370c996ecb790 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminDeleteCatalogPriceRuleTest.xml
@@ -61,13 +61,17 @@
         <!-- Verify that the simple product page shows the discount -->
         <amOnPage url="$$createSimpleProduct.custom_attributes[url_key]$$.html" stepKey="goToSimpleProductPage1"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createSimpleProduct.name$$" stepKey="seeCorrectName1"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="$$createSimpleProduct.sku$$" stepKey="seeCorrectSku1"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeCorrectSku1">
+            <argument name="productSku" value="$$createSimpleProduct.sku$$"/>
+        </actionGroup>
         <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$110.70" stepKey="seeCorrectPrice1"/>
 
         <!-- Verify that the configurable product page the catalog price rule discount -->
         <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="goToConfigurableProductPage1"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{_defaultProduct.name}}" stepKey="seeCorrectName2"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{_defaultProduct.sku}}" stepKey="seeCorrectSku2"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeCorrectSku2">
+            <argument name="productSku" value="{{_defaultProduct.sku}}"/>
+        </actionGroup>
         <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$0.90" stepKey="seeCorrectPrice2"/>
 
         <!-- Delete the rule -->
@@ -92,13 +96,17 @@
         <!-- Verify that the simple product page shows the original price -->
         <amOnPage url="$$createSimpleProduct.custom_attributes[url_key]$$.html" stepKey="goToSimpleProductPage2"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createSimpleProduct.name$$" stepKey="seeCorrectName3"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="$$createSimpleProduct.sku$$" stepKey="seeCorrectSku3"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeCorrectSku3">
+            <argument name="productSku" value="$$createSimpleProduct.sku$$"/>
+        </actionGroup>
         <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$123.00" stepKey="seeCorrectPrice3"/>
 
         <!-- Verify that the configurable product page shows the original price -->
         <amOnPage url="{{_defaultProduct.urlKey}}.html" stepKey="goToConfigurableProductPage2"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="{{_defaultProduct.name}}" stepKey="seeCorrectName4"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="{{_defaultProduct.sku}}" stepKey="seeCorrectSku4"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="seeCorrectSku4">
+            <argument name="productSku" value="{{_defaultProduct.sku}}"/>
+        </actionGroup>
         <see selector="{{StorefrontProductInfoMainSection.productPrice}}" userInput="$1.00" stepKey="seeCorrectPrice4"/>
     </test>
 </tests>
diff --git a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminURLKeyWorksWhenUpdatingProductThroughImportingCSVTest.xml b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminURLKeyWorksWhenUpdatingProductThroughImportingCSVTest.xml
index 99622caf0697e..fe5f4358bfca3 100644
--- a/app/code/Magento/ImportExport/Test/Mftf/Test/AdminURLKeyWorksWhenUpdatingProductThroughImportingCSVTest.xml
+++ b/app/code/Magento/ImportExport/Test/Mftf/Test/AdminURLKeyWorksWhenUpdatingProductThroughImportingCSVTest.xml
@@ -44,6 +44,8 @@
         <waitForPageLoad stepKey="waitForProductPageLoad"/>
         <seeInCurrentUrl url="{{StorefrontProductPage.url('simpleprod')}}" stepKey="seeUpdatedUrl"/>
         <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="$$createProduct.name$$" stepKey="assertProductName"/>
-        <see selector="{{StorefrontProductInfoMainSection.productSku}}" userInput="$$createProduct.sku$$" stepKey="assertProductSku"/>
+        <actionGroup ref="StorefrontAssertProductSkuOnProductPageActionGroup" stepKey="assertProductSku">
+            <argument name="productSku" value="$$createProduct.sku$$"/>
+        </actionGroup>
     </test>
 </tests>

From 968f93b3bac2c9e29d062bc9ed4dc151a048b0f4 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 15 Jul 2020 19:25:19 +0300
Subject: [PATCH 0879/1718] use actionGroup to go to AdminSystemStorePage.url

---
 ...nCreateRootCategoryAndSubcategoriesTest.xml |  6 ++----
 ...ProductsImageInCaseOfMultipleStoresTest.xml |  3 +--
 ...inDeleteRootCategoryAssignedToStoreTest.xml |  3 +--
 ...ssUpdateProductStatusStoreViewScopeTest.xml |  3 +--
 ...minMultipleWebsitesUseDefaultValuesTest.xml |  3 +--
 ...oryAndCheckDefaultUrlKeyOnStoreViewTest.xml |  3 +--
 .../Test/Mftf/Test/DeleteCategoriesTest.xml    |  3 +--
 ...oductWithCustomOptionsSecondWebsiteTest.xml |  3 +--
 ...ableProductPriceAdditionalStoreViewTest.xml |  2 +-
 ...dCountriesRestrictionApplyOnBackendTest.xml |  2 +-
 .../AdminSystemStoreOpenPageActionGroup.xml    | 18 ++++++++++++++++++
 .../Mftf/Test/AdminCreateStoreViewTest.xml     |  2 +-
 12 files changed, 30 insertions(+), 21 deletions(-)
 create mode 100644 app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSystemStoreOpenPageActionGroup.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryAndSubcategoriesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryAndSubcategoriesTest.xml
index 40ca511e1f7bc..1202052c492fc 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryAndSubcategoriesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryAndSubcategoriesTest.xml
@@ -21,8 +21,7 @@
         <!--Delete all created data during the test execution and assign Default Root Category to Store-->
         <after>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin2"/>
-            <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnPageAdminSystemStore"/>
-            <waitForPageLoad stepKey="waitForPageAdminSystemStoreLoad" />
+            <actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="amOnPageAdminSystemStore"/>
             <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="clickOnResetButton"/>
             <waitForPageLoad  time="10" stepKey="waitForPageAdminStoresGridLoadAfterResetButton"/>
             <fillField selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" userInput="Main Website Store"  stepKey="fillFieldOnWebsiteStore"/>
@@ -58,8 +57,7 @@
             <argument name="categoryEntity" value="SubCategoryWithParent"/>
         </actionGroup>
         <!--Assign new created root category to store-->
-        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnPageAdminSystemStore"/>
-        <waitForPageLoad stepKey="waitForPageAdminSystemStoreLoad" />
+        <actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="amOnPageAdminSystemStore"/>
         <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="clickOnResetButton"/>
         <waitForPageLoad  time="10" stepKey="waitForPageAdminStoresGridLoadAfterResetButton"/>
         <fillField selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" userInput="Main Website Store"  stepKey="fillFieldOnWebsiteStore"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductsImageInCaseOfMultipleStoresTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductsImageInCaseOfMultipleStoresTest.xml
index e0375728f316f..5d82829b66c00 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductsImageInCaseOfMultipleStoresTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteProductsImageInCaseOfMultipleStoresTest.xml
@@ -74,8 +74,7 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!--Grab new store view code-->
-        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="navigateToNewWebsitePage"/>
-        <waitForPageLoad stepKey="waitForStoresPageLoad"/>
+        <actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="navigateToNewWebsitePage"/>
         <fillField userInput="{{NewWebSiteData.name}}" selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="fillSearchWebsiteField"/>
         <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
         <click selector="{{AdminStoresGridSection.storeNameInFirstRow}}" stepKey="clickFirstRow"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryAssignedToStoreTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryAssignedToStoreTest.xml
index 2fa91604e1776..72c6fa55e0535 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryAssignedToStoreTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeleteRootCategoryAssignedToStoreTest.xml
@@ -29,8 +29,7 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
-        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-        <waitForPageLoad stepKey="waitForSystemStorePage"/>
+        <actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="amOnAdminSystemStorePage"/>
         <click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>
         <fillField userInput="{{customStore.name}}" selector="{{AdminNewStoreGroupSection.storeGrpNameTextField}}" stepKey="fillStoreName"/>
         <fillField userInput="{{customStore.code}}" selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" stepKey="fillStoreCode"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest/AdminMassUpdateProductStatusStoreViewScopeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest/AdminMassUpdateProductStatusStoreViewScopeTest.xml
index 54921d3fc2dda..fc1f5e3c72b9c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest/AdminMassUpdateProductStatusStoreViewScopeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductStatusStoreViewScopeTest/AdminMassUpdateProductStatusStoreViewScopeTest.xml
@@ -36,8 +36,7 @@
             </actionGroup>
 
             <!--Create Store view -->
-            <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-            <waitForPageLoad stepKey="waitForSystemStorePage"/>
+            <actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="amOnAdminSystemStorePage"/>
             <click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="createStoreViewButton"/>
             <waitForPageLoad stepKey="waitForProductPageLoad"/>
             <waitForElementVisible selector="//legend[contains(., 'Store View Information')]" stepKey="waitForNewStorePageToOpen"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml
index c1cfcf7ebe10f..de1aa25feac20 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMultipleWebsitesUseDefaultValuesTest.xml
@@ -36,8 +36,7 @@
         </actionGroup>
 
         <!--Create Store view -->
-        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-        <waitForPageLoad stepKey="waitForSystemStorePage"/>
+        <actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="amOnAdminSystemStorePage"/>
         <click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="createStoreViewButton"/>
         <waitForPageLoad stepKey="waitForProductPageLoad"/>
         <waitForElementVisible selector="//legend[contains(., 'Store View Information')]" stepKey="waitForNewStorePageToOpen"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml
index e0e517defdeac..d3f30ae021439 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateCategoryAndCheckDefaultUrlKeyOnStoreViewTest.xml
@@ -33,8 +33,7 @@
         </after>
 
         <!--Open Store Page -->
-        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-        <waitForPageLoad stepKey="waitForSystemStorePage"/>
+        <actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="amOnAdminSystemStorePage"/>
 
         <!--Create Custom Store -->
         <click selector="{{AdminStoresMainActionsSection.createStoreButton}}" stepKey="selectCreateStore"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/DeleteCategoriesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/DeleteCategoriesTest.xml
index ce9ff3af18607..25fee9350d9e8 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/DeleteCategoriesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/DeleteCategoriesTest.xml
@@ -56,8 +56,7 @@
             <argument name="parentCategory" value="$$createNewRootCategoryA.name$$"/>
         </actionGroup>
         <!-- Change root category for Main Website Store. -->
-        <amOnPage stepKey="s1" url="{{AdminSystemStorePage.url}}"/>
-        <waitForPageLoad stepKey="waitForPageAdminSystemStoreLoad" />
+        <actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="s1"/>
         <click stepKey="s2" selector="{{AdminStoresGridSection.resetButton}}"/>
         <waitForPageLoad stepKey="waitForPageAdminStoresGridLoadAfterResetButton" time="10"/>
         <fillField stepKey="s4" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" userInput="Main Website Store"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
index b206a33ebde88..7586ebb1118b1 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/SaveProductWithCustomOptionsSecondWebsiteTest.xml
@@ -34,8 +34,7 @@
             </actionGroup>
 
             <!--Create Store view -->
-            <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
-            <waitForPageLoad stepKey="waitForAdminSystemStorePage"/>
+            <actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="amOnAdminSystemStorePage"/>
             <click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="createStoreViewButton"/>
             <waitForPageLoad stepKey="waitForProductPageLoad"/>
             <selectOption userInput="Second Store" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreGroup"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml
index a34dfd06ce844..d3f0c40f52868 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/ConfigurableProductPriceAdditionalStoreViewTest.xml
@@ -94,7 +94,7 @@
         </actionGroup>
 
         <!--Create Store view -->
-        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
+        <actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="amOnAdminSystemStorePage"/>
         <click selector="{{AdminStoresMainActionsSection.createStoreViewButton}}" stepKey="createStoreViewButton"/>
         <waitForPageLoad stepKey="waitForProductPageLoad"/>
         <selectOption userInput="Second Store" selector="{{AdminNewStoreSection.storeGrpDropdown}}" stepKey="selectStoreGroup"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml
index 60caaf64f05b7..9bf18772405e3 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml
@@ -26,7 +26,7 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
             <!--Create new website,store and store view-->
             <comment userInput="Create new website,store and store view" stepKey="createWebsite"/>
-            <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="goToAdminSystemStorePage"/>
+            <actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="goToAdminSystemStorePage"/>
             <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="adminCreateNewWebsite">
                 <argument name="newWebsiteName" value="{{NewWebSiteData.name}}"/>
                 <argument name="websiteCode" value="{{NewWebSiteData.code}}"/>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSystemStoreOpenPageActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSystemStoreOpenPageActionGroup.xml
new file mode 100644
index 0000000000000..7e898cd1d8f78
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminSystemStoreOpenPageActionGroup.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="AdminSystemStoreOpenPageActionGroup">
+        <annotations>
+            <description>Go to admin system store page.</description>
+        </annotations>
+        <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="navigateToSystemStore"/>
+        <waitForPageLoad stepKey="waitForPageAdminSystemStoreLoad" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewTest.xml
index 4171aa6f08915..9de820baa93bf 100644
--- a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewTest.xml
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewTest.xml
@@ -33,7 +33,7 @@
             </after>
 
             <!--Filter grid and see created store view-->
-            <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="navigateToStoresIndex"/>
+            <actionGroup ref="AdminSystemStoreOpenPageActionGroup" stepKey="navigateToStoresIndex"/>
             <click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
             <fillField selector="{{AdminStoresGridSection.storeFilterTextField}}" userInput="{{customStore.name}}" stepKey="fillStoreViewFilterField"/>
             <click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearch"/>

From 2765164f13afc40279a474a2f255a84ae3d2bf47 Mon Sep 17 00:00:00 2001
From: Sathish <srsathish92@gmail.com>
Date: Wed, 15 Jul 2020 09:39:45 +0530
Subject: [PATCH 0880/1718] Fix #28270 Showed tier price for pre selected
 config swatch via cart

---
 app/code/Magento/Swatches/view/base/web/js/swatch-renderer.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Swatches/view/base/web/js/swatch-renderer.js b/app/code/Magento/Swatches/view/base/web/js/swatch-renderer.js
index ad5926d451e88..84389083447ae 100644
--- a/app/code/Magento/Swatches/view/base/web/js/swatch-renderer.js
+++ b/app/code/Magento/Swatches/view/base/web/js/swatch-renderer.js
@@ -311,6 +311,7 @@ define([
             if ($(this.element).attr('data-rendered')) {
                 return;
             }
+
             $(this.element).attr('data-rendered', true);
 
             if (_.isEmpty(this.options.jsonConfig.images)) {
@@ -320,6 +321,8 @@ define([
                 this._debouncedLoadProductMedia = _.debounce(this._LoadProductMedia.bind(this), 500);
             }
 
+            this.options.tierPriceTemplate = $(this.options.tierPriceTemplateSelector).html();
+
             if (this.options.jsonConfig !== '' && this.options.jsonSwatchConfig !== '') {
                 // store unsorted attributes
                 this.options.jsonConfig.mappedAttributes = _.clone(this.options.jsonConfig.attributes);
@@ -330,7 +333,6 @@ define([
             } else {
                 console.log('SwatchRenderer: No input data received');
             }
-            this.options.tierPriceTemplate = $(this.options.tierPriceTemplateSelector).html();
         },
 
         /**

From ee09909ab5282ca7a8d6d05e133e77af27e67691 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Wed, 15 Jul 2020 13:01:01 -0500
Subject: [PATCH 0881/1718] MC-32014: Remove google-shopping-ads module from
 core in 2.4.1

---
 .../Magento/Framework/Mview/OldViews.php       | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/lib/internal/Magento/Framework/Mview/OldViews.php b/lib/internal/Magento/Framework/Mview/OldViews.php
index 8b78eda2fd774..816ca9bad27cd 100644
--- a/lib/internal/Magento/Framework/Mview/OldViews.php
+++ b/lib/internal/Magento/Framework/Mview/OldViews.php
@@ -61,9 +61,11 @@ public function unsubscribe(): void
         }
 
         // Unsubscribe old views that still have triggers in db
-        $triggerTableNames = $this->getTriggerTableNames();
+        $triggerTableNames = $this->getTableNamesWithTriggers();
         foreach ($triggerTableNames as $tableName) {
-            $this->createViewByTableName($tableName)->unsubscribe();
+            $view = $this->createViewByTableName($tableName);
+            $view->unsubscribe();
+            $view->getState()->delete();
         }
 
         // Re-subscribe mviews
@@ -74,11 +76,11 @@ public function unsubscribe(): void
     }
 
     /**
-      * Retrieve trigger table name list
-      *
-      * @return array
-      */
-    private function getTriggerTableNames(): array
+     * Retrieve list of table names that have triggers
+     *
+     * @return array
+     */
+    private function getTableNamesWithTriggers(): array
     {
         $connection = $this->resource->getConnection();
         $dbName = $this->resource->getSchemaName(ResourceConnection::DEFAULT_CONNECTION);
@@ -106,11 +108,11 @@ private function createViewByTableName(string $tableName): ViewInterface
             'subscription_model' => null
         ];
         $data['data'] = [
-            'id' => '0',
             'subscriptions' => $subscription,
         ];
 
         $view = $this->viewFactory->create($data);
+        $view->setId('old_view');
         $view->getState()->setMode(StateInterface::MODE_ENABLED);
 
         return $view;

From 2c9ba2e73d791e3f84798862ae19bd75eb15b229 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 15 Jul 2020 21:30:37 +0300
Subject: [PATCH 0882/1718] Refactoring

---
 .../Cms/Model/Wysiwyg/Images/Storage.php      | 35 +++++++++++++------
 .../Cms/Model/Wysiwyg/Images/StorageTest.php  |  6 ++--
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
index 471e52cd82119..41c5fcc52d850 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
@@ -631,17 +631,7 @@ public function resizeFile($source, $keepRatio = true)
 
         $image->keepAspectRatio($keepRatio);
 
-        list($imageWidth, $imageHeight) = @getimagesize($source);
-        
-        if ($imageWidth && $imageHeight) {
-            $configWidth = $this->_resizeParameters['width'];
-            $configHeight = $this->_resizeParameters['height'];
-            $imageWidth = $configWidth > $imageWidth ? $imageWidth : $configWidth;
-            $imageHeight = $configHeight > $imageHeight ? $imageHeight : $configHeight;
-        } else {
-            $imageWidth = $this->_resizeParameters['width'];
-            $imageHeight = $this->_resizeParameters['height'];
-        }
+        list($imageWidth, $imageHeight) = $this->getResizedParams($source);
         
         $image->resize($imageWidth, $imageHeight);
         $dest = $targetDir . '/' . $this->ioFile->getPathInfo($source)['basename'];
@@ -652,6 +642,29 @@ public function resizeFile($source, $keepRatio = true)
         return false;
     }
 
+    /**
+     * Return width height for the image resizing.
+     *
+     * @param string $source
+     */
+    private function getResizedParams(string $source): array
+    {
+        $configWidth = $this->_resizeParameters['width'];
+        $configHeight = $this->_resizeParameters['height'];
+
+        //phpcs:ignore Generic.PHP.NoSilencedErrors
+        list($imageWidth, $imageHeight) = @getimagesize($source);
+     
+        if ($imageWidth && $imageHeight) {
+            $imageWidth = $configWidth > $imageWidth ? $imageWidth : $configWidth;
+            $imageHeight = $configHeight > $imageHeight ? $imageHeight : $configHeight;
+        } else {
+            return [$configWidth, $configHeight];
+        }
+
+        return  [$imageWidth, $imageHeight];
+    }
+    
     /**
      * Resize images on the fly in controller action
      *
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php b/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php
index 8ff0246f717b1..a68a546c20bc6 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php
@@ -167,7 +167,9 @@ public function testUploadFile(): void
     public function testUploadFileWithExcludedDirPath(): void
     {
         $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
-        $this->expectExceptionMessage('We can\'t upload the file to current folder right now. Please try another folder.');
+        $this->expectExceptionMessage(
+            'We can\'t upload the file to current folder right now. Please try another folder.'
+        );
 
         $fileName = 'magento_small_image.jpg';
         $tmpDirectory = $this->filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::SYS_TMP);
@@ -335,7 +337,7 @@ public function getThumbnailsSizes(): array
                     'width' => 1024,
                     'height' => 768,
                 ],
-               true
+                true
             ],
             [
                 [

From a09575753af8f028c00cf5758a022efb8f1ca5c4 Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Wed, 15 Jul 2020 16:12:51 -0500
Subject: [PATCH 0883/1718] Fixing field description.

---
 .../Magento/BundleGraphQl/etc/schema.graphqls    |  2 +-
 .../Magento/CatalogGraphQl/etc/schema.graphqls   | 16 ++++++++--------
 .../etc/schema.graphqls                          |  2 +-
 .../DownloadableGraphQl/etc/schema.graphqls      |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/BundleGraphQl/etc/schema.graphqls b/app/code/Magento/BundleGraphQl/etc/schema.graphqls
index cba5c3f2fb55e..5f5d48e1ae45c 100644
--- a/app/code/Magento/BundleGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/BundleGraphQl/etc/schema.graphqls
@@ -66,7 +66,7 @@ type BundleItemOption @doc(description: "BundleItemOption defines characteristic
     price_type: PriceTypeEnum @doc(description: "One of FIXED, PERCENT, or DYNAMIC.")
     can_change_quantity: Boolean @doc(description: "Indicates whether the customer can change the number of items for this option.")
     product: ProductInterface @doc(description: "Contains details about this product option.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product")
-    uid: ID! @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Options\\BundleItemOptionUid") # A Base64 string that encodes option details.
+    uid: ID! @doc(description: "A string that encodes option details.") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Options\\BundleItemOptionUid") # A Base64 string that encodes option details.
 }
 
 type BundleProduct implements ProductInterface, PhysicalProductInterface, CustomizableProductInterface @doc(description: "BundleProduct defines basic features of a bundle product and contains multiple BundleItems.") {
diff --git a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
index 9515dae501cd8..268c6f9e1147e 100644
--- a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
@@ -132,7 +132,7 @@ type CustomizableAreaValue @doc(description: "CustomizableAreaValue defines the
     price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC.")
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     max_characters: Int @doc(description: "The maximum number of characters that can be entered for this customizable option.")
-    uid: ID! @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueUid") # A Base64 string that encodes option details.
+    uid: ID! @doc(description: "A string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueUid") # A Base64 string that encodes option details.
 }
 
 type CategoryTree implements CategoryInterface @doc(description: "Category Tree implementation.") {
@@ -154,7 +154,7 @@ type CustomizableDateValue @doc(description: "CustomizableDateValue defines the
     price: Float @doc(description: "The price assigned to this option.")
     price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC.")
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
-    uid: ID! @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueUid") # A Base64 string that encodes option details.
+    uid: ID! @doc(description: "A string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueUid") # A Base64 string that encodes option details.
 }
 
 type CustomizableDropDownOption implements CustomizableOptionInterface @doc(description: "CustomizableDropDownOption contains information about a drop down menu that is defined as part of a customizable option.") {
@@ -168,7 +168,7 @@ type CustomizableDropDownValue @doc(description: "CustomizableDropDownValue defi
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     title: String @doc(description: "The display name for this option.")
     sort_order: Int @doc(description: "The order in which the option is displayed.")
-    uid: ID! @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueUid") # A Base64 string that encodes option details.
+    uid: ID! @doc(description: "A string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueUid") # A Base64 string that encodes option details.
 }
 
 type CustomizableMultipleOption implements CustomizableOptionInterface @doc(description: "CustomizableMultipleOption contains information about a multiselect that is defined as part of a customizable option.") {
@@ -182,7 +182,7 @@ type CustomizableMultipleValue @doc(description: "CustomizableMultipleValue defi
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     title: String @doc(description: "The display name for this option.")
     sort_order: Int @doc(description: "The order in which the option is displayed.")
-    uid: ID! @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueUid")
+    uid: ID! @doc(description: "A string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueUid")
 }
 
 type CustomizableFieldOption implements CustomizableOptionInterface @doc(description: "CustomizableFieldOption contains information about a text field that is defined as part of a customizable option.") {
@@ -195,7 +195,7 @@ type CustomizableFieldValue @doc(description: "CustomizableFieldValue defines th
     price_type: PriceTypeEnum @doc(description: "FIXED, PERCENT, or DYNAMIC.")
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     max_characters: Int @doc(description: "The maximum number of characters that can be entered for this customizable option.")
-    uid: ID! @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueUid") # A Base64 string that encodes option details.
+    uid: ID! @doc(description: "A string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueUid") # A Base64 string that encodes option details.
 }
 
 type CustomizableFileOption implements CustomizableOptionInterface @doc(description: "CustomizableFileOption contains information about a file picker that is defined as part of a customizable option.") {
@@ -210,7 +210,7 @@ type CustomizableFileValue @doc(description: "CustomizableFileValue defines the
     file_extension: String @doc(description: "The file extension to accept.")
     image_size_x: Int @doc(description: "The maximum width of an image.")
     image_size_y: Int @doc(description: "The maximum height of an image.")
-    uid: ID! @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueUid") # A Base64 string that encodes option details.
+    uid: ID! @doc(description: "A string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableEnteredOptionValueUid") # A Base64 string that encodes option details.
 }
 
 interface MediaGalleryInterface @doc(description: "Contains basic information about a product image or video.") @typeResolver(class: "Magento\\CatalogGraphQl\\Model\\MediaGalleryTypeResolver") {
@@ -280,7 +280,7 @@ type CustomizableRadioValue @doc(description: "CustomizableRadioValue defines th
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     title: String @doc(description: "The display name for this option.")
     sort_order: Int @doc(description: "The order in which the radio button is displayed.")
-    uid: ID! @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueUid") # A Base64 string that encodes option details.
+    uid: ID! @doc(description: "A string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueUid") # A Base64 string that encodes option details.
 }
 
 type CustomizableCheckboxOption implements CustomizableOptionInterface @doc(description: "CustomizableCheckbbixOption contains information about a set of checkbox values that are defined as part of a customizable option.") {
@@ -294,7 +294,7 @@ type CustomizableCheckboxValue @doc(description: "CustomizableCheckboxValue defi
     sku: String @doc(description: "The Stock Keeping Unit for this option.")
     title: String @doc(description: "The display name for this option.")
     sort_order: Int @doc(description: "The order in which the checkbox value is displayed.")
-    uid: ID! @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueUid") # A Base64 string that encodes option details.
+    uid: ID! @doc(description: "A string that encodes option details.") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\Product\\CustomizableSelectedOptionValueUid") # A Base64 string that encodes option details.
 }
 
 type VirtualProduct implements ProductInterface, CustomizableProductInterface @doc(description: "A virtual product is non-tangible product that does not require shipping and is not kept in inventory.") {
diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
index b3262726b81ed..d3a9372d51a86 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
@@ -18,7 +18,7 @@ type ConfigurableAttributeOption @doc(description: "ConfigurableAttributeOption
     label: String @doc(description: "A string that describes the configurable attribute option")
     code: String @doc(description: "The ID assigned to the attribute")
     value_index: Int @doc(description: "A unique index number assigned to the configurable product option")
-    uid: ID! @doc(description: "An encoded string that encodes option details.") @resolver(class: "Magento\\ConfigurableProductGraphQl\\Model\\Resolver\\Variant\\Attributes\\ConfigurableAttributeUid") # A Base64 string that encodes option details.
+    uid: ID! @doc(description: "A string that encodes option details.") @resolver(class: "Magento\\ConfigurableProductGraphQl\\Model\\Resolver\\Variant\\Attributes\\ConfigurableAttributeUid") # A Base64 string that encodes option details.
 }
 
 type ConfigurableProductOptions @doc(description: "ConfigurableProductOptions defines configurable attributes for the specified product") {
diff --git a/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls b/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
index dde950e860988..5863e62e81b1b 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: "An encoded 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") # A Base64 string that encodes option details.
 }
 
 type DownloadableProductSamples @doc(description: "DownloadableProductSamples defines characteristics of a downloadable product") {

From a890636fa555b704e98dc99a778fc61c2e078442 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 16 Jul 2020 10:27:22 +0300
Subject: [PATCH 0884/1718] Code review suggestion

---
 app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
index 41c5fcc52d850..504d7df68609f 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
@@ -646,6 +646,7 @@ public function resizeFile($source, $keepRatio = true)
      * Return width height for the image resizing.
      *
      * @param string $source
+     * @return array
      */
     private function getResizedParams(string $source): array
     {
@@ -658,11 +659,10 @@ private function getResizedParams(string $source): array
         if ($imageWidth && $imageHeight) {
             $imageWidth = $configWidth > $imageWidth ? $imageWidth : $configWidth;
             $imageHeight = $configHeight > $imageHeight ? $imageHeight : $configHeight;
-        } else {
-            return [$configWidth, $configHeight];
-        }
 
-        return  [$imageWidth, $imageHeight];
+            return  [$imageWidth, $imageHeight];
+        }
+        return [$configWidth, $configHeight];
     }
     
     /**

From ad2649c0a55247a1a0cba55b4b34a3420c0b7d82 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Thu, 16 Jul 2020 10:43:25 +0300
Subject: [PATCH 0885/1718] MC-35407: Advance Reporting generated csv files are
 not properly escaped which causes reports to fail on MBI side.

---
 .../Magento/Analytics/Model/ReportWriter.php  | 21 +++++++++--
 .../Test/Unit/Model/ReportWriterTest.php      | 36 +++++++++++--------
 2 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/app/code/Magento/Analytics/Model/ReportWriter.php b/app/code/Magento/Analytics/Model/ReportWriter.php
index 7128658947908..d5bd36d068d20 100644
--- a/app/code/Magento/Analytics/Model/ReportWriter.php
+++ b/app/code/Magento/Analytics/Model/ReportWriter.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Analytics\Model;
 
 use Magento\Analytics\ReportXml\DB\ReportValidator;
@@ -10,7 +12,6 @@
 
 /**
  * Writes reports in files in csv format
- * @inheritdoc
  */
 class ReportWriter implements ReportWriterInterface
 {
@@ -54,7 +55,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function write(WriteInterface $directory, $path)
     {
@@ -81,7 +82,7 @@ public function write(WriteInterface $directory, $path)
                     $headers = array_keys($row);
                     $stream->writeCsv($headers);
                 }
-                $stream->writeCsv($row);
+                $stream->writeCsv($this->prepareRow($row));
             }
             $stream->unlock();
             $stream->close();
@@ -98,4 +99,18 @@ public function write(WriteInterface $directory, $path)
 
         return true;
     }
+
+    /**
+     * Replace wrong symbols in row
+     *
+     * @param array $row
+     * @return array
+     */
+    private function prepareRow(array $row): array
+    {
+        $row = preg_replace('/(?<!\\\\)"/', '\\"', $row);
+        $row = preg_replace('/[\\\\]+/', '\\', $row);
+
+        return $row;
+    }
 }
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/ReportWriterTest.php b/app/code/Magento/Analytics/Test/Unit/Model/ReportWriterTest.php
index b68e26f98a397..8fb135fb4d9ed 100644
--- a/app/code/Magento/Analytics/Test/Unit/Model/ReportWriterTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/Model/ReportWriterTest.php
@@ -12,7 +12,8 @@
 use Magento\Analytics\Model\ReportWriter;
 use Magento\Analytics\ReportXml\DB\ReportValidator;
 use Magento\Analytics\ReportXml\ReportProvider;
-use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\Filesystem\Directory\WriteInterface as DirectoryWriteInterface;
+use Magento\Framework\Filesystem\File\WriteInterface as FileWriteInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -48,7 +49,7 @@ class ReportWriterTest extends TestCase
     private $objectManagerHelper;
 
     /**
-     * @var WriteInterface|MockObject
+     * @var DirectoryWriteInterface|MockObject
      */
     private $directoryMock;
 
@@ -82,7 +83,7 @@ protected function setUp(): void
         $this->reportValidatorMock = $this->createMock(ReportValidator::class);
         $this->providerFactoryMock = $this->createMock(ProviderFactory::class);
         $this->reportProviderMock = $this->createMock(ReportProvider::class);
-        $this->directoryMock = $this->getMockBuilder(WriteInterface::class)
+        $this->directoryMock = $this->getMockBuilder(DirectoryWriteInterface::class)
             ->getMockForAbstractClass();
         $this->objectManagerHelper = new ObjectManagerHelper($this);
 
@@ -98,16 +99,15 @@ protected function setUp(): void
 
     /**
      * @param array $configData
+     * @param array $fileData
+     * @param array $expectedFileData
      * @return void
      *
      * @dataProvider configDataProvider
      */
-    public function testWrite(array $configData)
+    public function testWrite(array $configData, array $fileData, array $expectedFileData): void
     {
         $errors = [];
-        $fileData = [
-            ['number' => 1, 'type' => 'Shoes Usual']
-        ];
         $this->configInterfaceMock
             ->expects($this->once())
             ->method('get')
@@ -126,7 +126,7 @@ public function testWrite(array $configData)
             ->with($parameterName ?: null)
             ->willReturn($fileData);
         $errorStreamMock = $this->getMockBuilder(
-            \Magento\Framework\Filesystem\File\WriteInterface::class
+            FileWriteInterface::class
         )->getMockForAbstractClass();
         $errorStreamMock
             ->expects($this->once())
@@ -136,8 +136,8 @@ public function testWrite(array $configData)
             ->expects($this->exactly(2))
             ->method('writeCsv')
             ->withConsecutive(
-                [array_keys($fileData[0])],
-                [$fileData[0]]
+                [array_keys($expectedFileData[0])],
+                [$expectedFileData[0]]
             );
         $errorStreamMock->expects($this->once())->method('unlock');
         $errorStreamMock->expects($this->once())->method('close');
@@ -164,12 +164,12 @@ public function testWrite(array $configData)
      *
      * @dataProvider configDataProvider
      */
-    public function testWriteErrorFile($configData)
+    public function testWriteErrorFile(array $configData): void
     {
         $errors = ['orders', 'SQL Error: test'];
         $this->configInterfaceMock->expects($this->once())->method('get')->willReturn([$configData]);
         $errorStreamMock = $this->getMockBuilder(
-            \Magento\Framework\Filesystem\File\WriteInterface::class
+            FileWriteInterface::class
         )->getMockForAbstractClass();
         $errorStreamMock->expects($this->once())->method('lock');
         $errorStreamMock->expects($this->once())->method('writeCsv')->with($errors);
@@ -184,7 +184,7 @@ public function testWriteErrorFile($configData)
     /**
      * @return void
      */
-    public function testWriteEmptyReports()
+    public function testWriteEmptyReports(): void
     {
         $this->configInterfaceMock->expects($this->once())->method('get')->willReturn([]);
         $this->reportValidatorMock->expects($this->never())->method('validate');
@@ -195,11 +195,11 @@ public function testWriteEmptyReports()
     /**
      * @return array
      */
-    public function configDataProvider()
+    public function configDataProvider(): array
     {
         return [
             'reportProvider' => [
-                [
+                'configData' => [
                     'providers' => [
                         [
                             'name' => $this->providerName,
@@ -209,6 +209,12 @@ public function configDataProvider()
                             ],
                         ]
                     ]
+                ],
+                'fileData' => [
+                    ['number' => 1, 'type' => 'Shoes\"" Usual\\\\"']
+                ],
+                'expectedFileData' => [
+                    ['number' => 1, 'type' => 'Shoes\"\" Usual\\"']
                 ]
             ],
         ];

From fadb3c520747d3f0886bef85c7a1f101c2a3adbb Mon Sep 17 00:00:00 2001
From: ameysar <andrii.meysar@transoftgroup.com>
Date: Thu, 16 Jul 2020 11:00:04 +0300
Subject: [PATCH 0886/1718] MC-35845: [2.4][MFTF] Flaky Test:
 StoreFrontCheckCustomerInfoCreatedByGuestTest

---
 ...ontCheckCustomerInfoCreatedByGuestTest.xml |  5 +-
 ...tomerInfoOnOrderPageCreatedByGuestTest.xml | 63 +++++++++++++++++++
 2 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCustomerInfoOnOrderPageCreatedByGuestTest.xml

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
index bd81a1cfab604..b854be12a8524 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontCheckCustomerInfoCreatedByGuestTest.xml
@@ -12,12 +12,15 @@
         <annotations>
             <features value="Checkout"/>
             <stories value="Check customer information created by guest"/>
-            <title value="Check Customer Information Created By Guest"/>
+            <title value="Deprecated. Check Customer Information Created By Guest"/>
             <description value="Check customer information after placing the order as the guest who created an account"/>
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-95932"/>
             <useCaseId value="MAGETWO-95820"/>
             <group value="checkout"/>
+            <skip>
+                <issueId value="DEPRECATED">Use StorefrontCheckCustomerInfoOnOrderPageCreatedByGuestTest instead.</issueId>
+            </skip>
         </annotations>
 
         <before>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCustomerInfoOnOrderPageCreatedByGuestTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCustomerInfoOnOrderPageCreatedByGuestTest.xml
new file mode 100644
index 0000000000000..fa75a280e69f1
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCustomerInfoOnOrderPageCreatedByGuestTest.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="StorefrontCheckCustomerInfoOnOrderPageCreatedByGuestTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Check customer information created by guest"/>
+            <title value="Check Customer Information Created By Guest"/>
+            <description value="Check customer information after placing the order as the guest who created an account"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-28550"/>
+            <useCaseId value="MAGETWO-95820"/>
+            <group value="checkout"/>
+        </annotations>
+
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrdersGridFilter"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
+        </after>
+
+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductPage">
+            <argument name="productUrl" value="$createProduct.custom_attributes[url_key]$"/>
+        </actionGroup>
+        <actionGroup ref="AddToCartFromStorefrontProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage">
+            <argument name="productName" value="$createProduct.name$"/>
+        </actionGroup>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="fillShippingSectionAsGuest">
+            <argument name="customerVar" value="CustomerEntityOne"/>
+            <argument name="customerAddressVar" value="CustomerAddressSimple"/>
+        </actionGroup>
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="placeOrder">
+            <argument name="orderNumberMessage" value="CONST.successGuestCheckoutOrderNumberMessage"/>
+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage"/>
+        </actionGroup>
+        <grabTextFrom selector="{{CheckoutSuccessRegisterSection.orderNumber}}" stepKey="grabOrderNumber"/>
+        <actionGroup ref="StorefrontRegisterCustomerFromOrderSuccessPage" stepKey="createCustomerAfterPlaceOrder">
+            <argument name="customer" value="CustomerEntityOne"/>
+        </actionGroup>
+        <actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrdersGridById">
+            <argument name="orderId" value="{$grabOrderNumber}"/>
+        </actionGroup>
+        <see userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminShipmentOrderInformationSection.customerName}}" stepKey="seeCustomerName"/>
+    </test>
+</tests>

From ebefd612eb5a9457da0509f48c0ba39ae30a513c Mon Sep 17 00:00:00 2001
From: Paul <psparrow@comwrap.com>
Date: Thu, 16 Jul 2020 11:06:22 +0300
Subject: [PATCH 0887/1718] improvements-to-message-queue-consumer-processes:
 Fixed resolving "sleep" value during executing
 Magento\Framework\MessageQueue\CallbackInvoker::invoke() method.

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

diff --git a/lib/internal/Magento/Framework/MessageQueue/CallbackInvoker.php b/lib/internal/Magento/Framework/MessageQueue/CallbackInvoker.php
index 609a8f9727720..ce9bb69859bf9 100644
--- a/lib/internal/Magento/Framework/MessageQueue/CallbackInvoker.php
+++ b/lib/internal/Magento/Framework/MessageQueue/CallbackInvoker.php
@@ -70,7 +70,7 @@ public function invoke(
         $sleep = null
     ) {
         $this->poisonPillVersion = $this->poisonPillRead->getLatestVersion();
-        $sleep = (int) $sleep ?? 1;
+        $sleep = (int) $sleep ?: 1;
         $maxIdleTime = $maxIdleTime ? (int) $maxIdleTime : PHP_INT_MAX;
         for ($i = $maxNumberOfMessages; $i > 0; $i--) {
             $idleStartTime = microtime(true);

From 794fd6d87abbbc55e303b384939242620121ee28 Mon Sep 17 00:00:00 2001
From: Mykhailo Matiola <mykhailo.matiola@transoftgroup.com>
Date: Thu, 16 Jul 2020 11:20:06 +0300
Subject: [PATCH 0888/1718] MC-35424: Added test framework classes into exclude
 list

---
 .../TestFramework/Workaround/Cleanup/StaticProperties.php       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php b/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
index 4af90d5038f36..aed6c53c22702 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Workaround/Cleanup/StaticProperties.php
@@ -46,6 +46,8 @@ class StaticProperties
         \Magento\TestFramework\Annotation\AppIsolation::class,
         \Magento\TestFramework\Workaround\Cleanup\StaticProperties::class,
         \Magento\Framework\Phrase::class,
+        \Magento\TestFramework\Workaround\Override\Fixture\ResolverInterface::class,
+        \Magento\TestFramework\Workaround\Override\ConfigInterface::class,
     ];
 
     private const CACHE_NAME = 'integration_test_static_properties';

From a3e9fea451c76359a10bf84df95f506f3e1fded3 Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Thu, 16 Jul 2020 17:07:46 +0800
Subject: [PATCH 0889/1718] magento/adobe-stock-integration#1391:
 SaveAssetsKeywordsInterface to delete obsolete keywords - Add method to
 delete keywords which has no relation to assets

---
 .../Keyword/SaveAssetsKeywords.php            | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetsKeywords.php b/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetsKeywords.php
index a97c5f602c5c7..bc5ebf6159814 100644
--- a/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetsKeywords.php
+++ b/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetsKeywords.php
@@ -21,6 +21,7 @@
 class SaveAssetsKeywords implements SaveAssetsKeywordsInterface
 {
     private const TABLE_KEYWORD = 'media_gallery_keyword';
+    private const TABLE_ASSET_KEYWORD = 'media_gallery_asset_keyword';
     private const ID = 'id';
     private const KEYWORD = 'keyword';
 
@@ -71,6 +72,8 @@ public function execute(array $assetKeywords): void
             }
         }
 
+        $this->deleteObsoleteKeywords();
+
         if (!empty($failedAssetIds)) {
             throw new CouldNotSaveException(
                 __('Could not save keywords for asset ids: %ids', ['ids' => implode(' ,', $failedAssetIds)])
@@ -125,4 +128,60 @@ private function getKeywordIds(array $keywords): array
 
         return $connection->fetchCol($select);
     }
+
+    /**
+     * Delete keywords which has
+     * no relation to any asset
+     *
+     * @return void
+     */
+    private function deleteObsoleteKeywords(): void
+    {
+        $connection = $this->resourceConnection->getConnection();
+        $select = $connection->select()
+            ->from(
+                ['k' => self::TABLE_KEYWORD],
+                ['k.id']
+            )
+            ->joinLeft(
+                ['ak' => self::TABLE_ASSET_KEYWORD],
+                'k.id = ak.keyword_id'
+            )
+            ->where('ak.asset_id IS NULL');
+
+        $obsoleteKeywords = $connection->fetchCol($select);
+
+        if (!empty($obsoleteKeywords)) {
+            try {
+                $this->deleteKeywordsByIds($obsoleteKeywords);
+            } catch (\Exception $exception) {
+                $this->logger->critical($exception);
+            }
+        }
+    }
+
+    /**
+     * Delete keywords by ids
+     *
+     * @param array $keywordIds
+     * @return  void
+     */
+    private function deleteKeywordsByIds(array $keywordIds): void
+    {
+        $connection  = $this->resourceConnection->getConnection();
+
+        $whereConditions = [
+            $connection->prepareSqlCondition(
+                self::ID,
+                ['in' => [$keywordIds]]
+            ),
+        ];
+
+        $connection->delete(
+            $connection->getTableName(
+                self::TABLE_KEYWORD
+            ),
+            $whereConditions
+        );
+    }
 }

From cb7373789c8adf4edfee73a861d7dceca168db4d Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Thu, 16 Jul 2020 12:36:42 +0300
Subject: [PATCH 0890/1718] MC-35853: Table doesn't exist exception appears
 after deleting store view

---
 .../SalesSequence/Test/Unit/Model/Sequence/DeleteByStoreTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/SalesSequence/Test/Unit/Model/Sequence/DeleteByStoreTest.php b/app/code/Magento/SalesSequence/Test/Unit/Model/Sequence/DeleteByStoreTest.php
index 57093c8851c89..29d60ef7e6aa5 100644
--- a/app/code/Magento/SalesSequence/Test/Unit/Model/Sequence/DeleteByStoreTest.php
+++ b/app/code/Magento/SalesSequence/Test/Unit/Model/Sequence/DeleteByStoreTest.php
@@ -110,6 +110,7 @@ static function ($tableName) {
                 }
             );
         $this->resourceMock->method('getConnection')
+            ->with('sales')
             ->willReturn($this->connectionMock);
         $this->connectionMock
             ->method('select')

From 831fb5b47645dc91eaf940114a40c8ae2d19f0ae Mon Sep 17 00:00:00 2001
From: Marjan Petkovski <petkovski.marjan@gmail.com>
Date: Thu, 16 Jul 2020 12:18:58 +0200
Subject: [PATCH 0891/1718] magento/magento2#26121: special price & tier price
 are coming in base currency

Move price transform to PriceTiers
---
 .../Model/Product/Price/TierPriceBuilder.php  | 209 ------------------
 .../Catalog/Model/Product/Type/Price.php      |  39 ++--
 .../Unit/Model/Product/Type/PriceTest.php     |  23 +-
 .../Model/Resolver/PriceTiers.php             |  12 +-
 .../Model/Import/AdvancedPricingTest.php      |  16 +-
 5 files changed, 45 insertions(+), 254 deletions(-)
 delete mode 100644 app/code/Magento/Catalog/Model/Product/Price/TierPriceBuilder.php

diff --git a/app/code/Magento/Catalog/Model/Product/Price/TierPriceBuilder.php b/app/code/Magento/Catalog/Model/Product/Price/TierPriceBuilder.php
deleted file mode 100644
index 3284263e65032..0000000000000
--- a/app/code/Magento/Catalog/Model/Product/Price/TierPriceBuilder.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Catalog\Model\Product\Price;
-
-use Magento\Catalog\Api\Data\ProductTierPriceInterface;
-use Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory;
-use Magento\Catalog\Api\Data\ProductTierPriceExtensionFactory;
-use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\Pricing\PriceCurrencyInterface;
-use Magento\Store\Model\ScopeInterface;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Catalog\Api\Data\ProductAttributeInterface;
-
-/**
- * Builds ProductTierPriceInterface objects
- */
-class TierPriceBuilder
-{
-    /**
-     * @var int
-     */
-    private $websiteId;
-
-    /**
-     * @var ProductTierPriceInterfaceFactory
-     */
-    private $tierPriceFactory;
-
-    /**
-     * @var ProductTierPriceExtensionFactory
-     */
-    private $tierPriceExtensionFactory;
-
-    /**
-     * @var ScopeConfigInterface
-     */
-    private $config;
-
-    /**
-     * @var StoreManagerInterface
-     */
-    private $storeManager;
-
-    /**
-     * @var PriceCurrencyInterface
-     */
-    private $priceCurrency;
-
-    /**
-     * @param ProductTierPriceInterfaceFactory $tierPriceFactory
-     * @param ProductTierPriceExtensionFactory $tierPriceExtensionFactory
-     * @param ScopeConfigInterface $config
-     * @param StoreManagerInterface $storeManager
-     * @param PriceCurrencyInterface $priceCurrency
-     */
-    public function __construct(
-        ProductTierPriceInterfaceFactory $tierPriceFactory,
-        ProductTierPriceExtensionFactory $tierPriceExtensionFactory,
-        ScopeConfigInterface $config,
-        StoreManagerInterface $storeManager,
-        PriceCurrencyInterface $priceCurrency
-    ) {
-        $this->tierPriceFactory = $tierPriceFactory;
-        $this->tierPriceExtensionFactory = $tierPriceExtensionFactory;
-        $this->config = $config;
-        $this->storeManager = $storeManager;
-        $this->priceCurrency = $priceCurrency;
-
-        $this->setWebsiteId();
-    }
-
-    /**
-     * Gets list of product tier prices
-     *
-     * @param ProductInterface $product
-     * @return ProductTierPriceInterface[]
-     */
-    public function getTierPrices($product)
-    {
-        /** @var array $tierPricesRaw */
-        $tierPricesRaw = $this->loadData($product);
-
-        return $this->buildTierPriceObjects($tierPricesRaw);
-    }
-
-    /**
-     * Get tier data for a product
-     *
-     * @param ProductInterface $product
-     * @return array
-     */
-    private function loadData(ProductInterface $product): array
-    {
-        $tierData = $product->getData(ProductAttributeInterface::CODE_TIER_PRICE);
-
-        if ($tierData === null) {
-            $attribute = $product->getResource()->getAttribute(ProductAttributeInterface::CODE_TIER_PRICE);
-            if ($attribute) {
-                $attribute->getBackend()->afterLoad($product);
-                $tierData = $product->getData(ProductAttributeInterface::CODE_TIER_PRICE);
-            }
-        }
-
-        if ($tierData === null || !is_array($tierData)) {
-            return [];
-        }
-
-        return $tierData;
-    }
-
-    /**
-     * Transform the raw tier data into array of ProductTierPriceInterface objects
-     *
-     * @param array $tierPricesRaw
-     * @return ProductTierPriceInterface[]
-     */
-    private function buildTierPriceObjects(array $tierPricesRaw): array
-    {
-        $prices = [];
-
-        foreach ($tierPricesRaw as $tierPriceRaw) {
-            $prices[] = $this->createTierPriceObjectFromRawData($tierPriceRaw);
-        }
-
-        return $prices;
-    }
-
-    /**
-     * Transform the raw tier price data into ProductTierPriceInterface object
-     *
-     * @param array $tierPriceRaw
-     * @return ProductTierPriceInterface
-     */
-    private function createTierPriceObjectFromRawData(array $tierPriceRaw): ProductTierPriceInterface
-    {
-        /** @var ProductTierPriceInterface $tierPrice */
-        $tierPrice = $this->tierPriceFactory->create()
-            ->setExtensionAttributes($this->tierPriceExtensionFactory->create());
-
-        $tierPrice->setCustomerGroupId(
-            isset($tierPriceRaw['cust_group']) ? $tierPriceRaw['cust_group'] : ''
-        );
-        $tierPrice->setValue(
-            $this->getPriceValue($tierPriceRaw)
-        );
-        $tierPrice->setQty(
-            isset($tierPriceRaw['price_qty']) ? $tierPriceRaw['price_qty'] : ''
-        );
-        $tierPrice->getExtensionAttributes()->setWebsiteId(
-            isset($tierPriceRaw['website_id']) ? $tierPriceRaw['website_id'] : $this->websiteId
-        );
-        if (isset($tierPriceRaw['percentage_value'])) {
-            $tierPrice->getExtensionAttributes()->setPercentageValue(
-                $tierPriceRaw['percentage_value']
-            );
-        }
-
-        return $tierPrice;
-    }
-
-    /**
-     * Get price value
-     *
-     * @param array $tierPriceRaw
-     * @return float
-     */
-    private function getPriceValue(array $tierPriceRaw): float
-    {
-        $valueInDefaultCurrency = $this->extractPriceValue($tierPriceRaw);
-        $valueInStoreCurrency = $this->priceCurrency->convertAndRound($valueInDefaultCurrency);
-
-        return $valueInStoreCurrency;
-    }
-
-    /**
-     * Extract float price value from raw data
-     *
-     * @param array $tierPriceRaw
-     * @return float
-     */
-    private function extractPriceValue(array $tierPriceRaw): float
-    {
-        if (isset($tierPriceRaw['website_price'])) {
-            return (float)$tierPriceRaw['website_price'];
-        }
-
-        return (float)$tierPriceRaw['price'];
-    }
-
-    /**
-     * Find and set the website id
-     */
-    private function setWebsiteId()
-    {
-        $websiteId = 0;
-        $value = $this->config->getValue('catalog/price/scope', ScopeInterface::SCOPE_WEBSITE);
-        if ($value != 0) {
-            $websiteId = $this->storeManager->getWebsite()->getId();
-        }
-
-        $this->websiteId = $websiteId;
-    }
-}
diff --git a/app/code/Magento/Catalog/Model/Product/Type/Price.php b/app/code/Magento/Catalog/Model/Product/Type/Price.php
index c07f7c40785e7..e702965270639 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/Price.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/Price.php
@@ -8,7 +8,6 @@
 namespace Magento\Catalog\Model\Product\Type;
 
 use Magento\Catalog\Model\Product;
-use Magento\Catalog\Model\Product\Price\TierPriceBuilder;
 use Magento\Customer\Api\GroupManagementInterface;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Store\Model\Store;
@@ -94,11 +93,6 @@ class Price
      */
     private $tierPriceExtensionFactory;
 
-    /**
-     * @var TierPriceBuilder
-     */
-    private $tierPriceBuilder;
-
     /**
      * Constructor
      *
@@ -109,10 +103,9 @@ class Price
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param PriceCurrencyInterface $priceCurrency
      * @param GroupManagementInterface $groupManagement
-     * @param \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory $tierPriceFactory @deprecated
+     * @param \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory $tierPriceFactory
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
-     * @param ProductTierPriceExtensionFactory|null $tierPriceExtensionFactory @deprecated
-     * @param TierPriceBuilder $tierPriceBuilder
+     * @param ProductTierPriceExtensionFactory|null $tierPriceExtensionFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -125,8 +118,7 @@ public function __construct(
         GroupManagementInterface $groupManagement,
         \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory $tierPriceFactory,
         \Magento\Framework\App\Config\ScopeConfigInterface $config,
-        ProductTierPriceExtensionFactory $tierPriceExtensionFactory = null,
-        ?TierPriceBuilder $tierPriceBuilder = null
+        ProductTierPriceExtensionFactory $tierPriceExtensionFactory = null
     ) {
         $this->_ruleFactory = $ruleFactory;
         $this->_storeManager = $storeManager;
@@ -139,8 +131,6 @@ public function __construct(
         $this->config = $config;
         $this->tierPriceExtensionFactory = $tierPriceExtensionFactory ?: ObjectManager::getInstance()
             ->get(ProductTierPriceExtensionFactory::class);
-        $this->tierPriceBuilder = $tierPriceBuilder ?: ObjectManager::getInstance()
-            ->get(TierPriceBuilder::class);
     }
 
     /**
@@ -379,7 +369,28 @@ protected function getAllCustomerGroupsId()
      */
     public function getTierPrices($product)
     {
-        return $this->tierPriceBuilder->getTierPrices($product);
+        $prices = [];
+        $tierPrices = $this->getExistingPrices($product, 'tier_price');
+        foreach ($tierPrices as $price) {
+            /** @var \Magento\Catalog\Api\Data\ProductTierPriceInterface $tierPrice */
+            $tierPrice = $this->tierPriceFactory->create()
+                ->setExtensionAttributes($this->tierPriceExtensionFactory->create());
+            $tierPrice->setCustomerGroupId($price['cust_group']);
+            if (array_key_exists('website_price', $price)) {
+                $value = $price['website_price'];
+            } else {
+                $value = $price['price'];
+            }
+            $tierPrice->setValue($value);
+            $tierPrice->setQty($price['price_qty']);
+            if (isset($price['percentage_value'])) {
+                $tierPrice->getExtensionAttributes()->setPercentageValue($price['percentage_value']);
+            }
+            $websiteId = isset($price['website_id']) ? $price['website_id'] : $this->getWebsiteForPriceScope();
+            $tierPrice->getExtensionAttributes()->setWebsiteId($websiteId);
+            $prices[] = $tierPrice;
+        }
+        return $prices;
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php
index 1ced98e7ec482..09ad8bb41de7c 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php
@@ -12,13 +12,11 @@
 use Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\TierPrice;
-use Magento\Catalog\Model\Product\Price\TierPriceBuilder;
 use Magento\Catalog\Model\Product\Type\Price;
 use Magento\Customer\Api\GroupManagementInterface;
 use Magento\Customer\Model\Data\Group;
 use Magento\Customer\Model\GroupManagement;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Model\Website;
@@ -71,8 +69,6 @@ class PriceTest extends TestCase
 
     private $tierPriceExtensionFactoryMock;
 
-    private $priceCurrencyMock;
-
     protected function setUp(): void
     {
         $this->objectManagerHelper = new ObjectManagerHelper($this);
@@ -117,18 +113,6 @@ protected function setUp(): void
             ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->priceCurrencyMock = $this->getMockBuilder(PriceCurrencyInterface::class)
-            ->getMockForAbstractClass();
-        $tierPriceBuilder = $this->objectManagerHelper->getObject(
-            TierPriceBuilder::class,
-            [
-                'tierPriceFactory' => $this->tpFactory,
-                'tierPriceExtensionFactory' => $this->tierPriceExtensionFactoryMock,
-                'config' => $this->scopeConfigMock,
-                'storeManager' => $storeMangerMock,
-                'priceCurrency' => $this->priceCurrencyMock,
-            ]
-        );
         $this->model = $this->objectManagerHelper->getObject(
             Price::class,
             [
@@ -136,8 +120,7 @@ protected function setUp(): void
                 'config' => $this->scopeConfigMock,
                 'storeManager' => $storeMangerMock,
                 'groupManagement' => $this->groupManagementMock,
-                'tierPriceExtensionFactory' => $this->tierPriceExtensionFactoryMock,
-                'tierPriceBuilder' => $tierPriceBuilder
+                'tierPriceExtensionFactory' => $this->tierPriceExtensionFactoryMock
             ]
         );
     }
@@ -251,10 +234,6 @@ function () {
         $this->tierPriceExtensionFactoryMock->expects($this->any())
             ->method('create')
             ->willReturn($tierPriceExtensionMock);
-        $this->priceCurrencyMock->expects($this->any())->method('convertAndRound')
-            ->will(
-                $this->onConsecutiveCalls(10, 20)
-            );
 
         // test with the data retrieved as a REST object
         $tpRests = $this->model->getTierPrices($this->product);
diff --git a/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/PriceTiers.php b/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/PriceTiers.php
index 4e75139c1a882..e78224ba0af38 100644
--- a/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/PriceTiers.php
+++ b/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/PriceTiers.php
@@ -12,6 +12,7 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\CatalogCustomerGraphQl\Model\Resolver\Product\Price\Tiers;
 use Magento\CatalogCustomerGraphQl\Model\Resolver\Product\Price\TiersFactory;
 use Magento\CatalogCustomerGraphQl\Model\Resolver\Customer\GetCustomerGroup;
@@ -60,25 +61,33 @@ class PriceTiers implements ResolverInterface
      */
     private $priceProviderPool;
 
+    /**
+     * @var PriceCurrencyInterface
+     */
+    private $priceCurrency;
+
     /**
      * @param ValueFactory $valueFactory
      * @param TiersFactory $tiersFactory
      * @param GetCustomerGroup $getCustomerGroup
      * @param Discount $discount
      * @param PriceProviderPool $priceProviderPool
+     * @param PriceCurrencyInterface $priceCurrency
      */
     public function __construct(
         ValueFactory $valueFactory,
         TiersFactory $tiersFactory,
         GetCustomerGroup $getCustomerGroup,
         Discount $discount,
-        PriceProviderPool $priceProviderPool
+        PriceProviderPool $priceProviderPool,
+        PriceCurrencyInterface $priceCurrency
     ) {
         $this->valueFactory = $valueFactory;
         $this->tiersFactory = $tiersFactory;
         $this->getCustomerGroup = $getCustomerGroup;
         $this->discount = $discount;
         $this->priceProviderPool = $priceProviderPool;
+        $this->priceCurrency = $priceCurrency;
     }
 
     /**
@@ -130,6 +139,7 @@ private function formatProductTierPrices(array $tierPrices, float $productPrice,
         $tiers = [];
 
         foreach ($tierPrices as $tierPrice) {
+            $tierPrice->setValue($this->priceCurrency->convertAndRound($tierPrice->getValue()));
             $percentValue = $tierPrice->getExtensionAttributes()->getPercentageValue();
             if ($percentValue && is_numeric($percentValue)) {
                 $discount = $this->discount->getDiscountByPercent($productPrice, (float)$percentValue);
diff --git a/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricingTest.php b/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricingTest.php
index 5c15e0a6658e1..747b990ce632e 100644
--- a/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricingTest.php
+++ b/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricingTest.php
@@ -46,25 +46,25 @@ protected function setUp(): void
             'AdvancedPricingSimple 1' => [
                 [
                     'customer_group_id' => \Magento\Customer\Model\Group::CUST_GROUP_ALL,
-                    'value'             => 300.00,
+                    'value'             => '300.000000',
                     'qty'               => '10.0000',
                     'percentage_value'  => null
                 ],
                 [
                     'customer_group_id' => '1',
-                    'value'             => 11.00,
+                    'value'             => '11.000000',
                     'qty'               => '11.0000',
                     'percentage_value'  => null
                 ],
                 [
                     'customer_group_id' => '3',
-                    'value'             => 14.00,
+                    'value'             => '14.000000',
                     'qty'               => '14.0000',
                     'percentage_value'  => null
                 ],
                 [
                     'customer_group_id' => \Magento\Customer\Model\Group::CUST_GROUP_ALL,
-                    'value'             => 160.50,
+                    'value'             => 160.5,
                     'qty'               => '20.0000',
                     'percentage_value'  => '50.00'
                 ]
@@ -72,25 +72,25 @@ protected function setUp(): void
             'AdvancedPricingSimple 2' => [
                 [
                     'customer_group_id' => \Magento\Customer\Model\Group::CUST_GROUP_ALL,
-                    'value'             => 1000000.00,
+                    'value'             => '1000000.000000',
                     'qty'               => '100.0000',
                     'percentage_value'  => null
                 ],
                 [
                     'customer_group_id' => '0',
-                    'value'             => 12.00,
+                    'value'             => '12.000000',
                     'qty'               => '12.0000',
                     'percentage_value'  => null
                 ],
                 [
                     'customer_group_id' => '2',
-                    'value'             => 13.00,
+                    'value'             => '13.000000',
                     'qty'               => '13.0000',
                     'percentage_value'  => null
                 ],
                 [
                     'customer_group_id' => \Magento\Customer\Model\Group::CUST_GROUP_ALL,
-                    'value'             => 327.00,
+                    'value'             => 327.0,
                     'qty'               => '200.0000',
                     'percentage_value'  => '50.00'
                 ]

From da400fbe6edf1e0cb45a7eb4adc7b9b6ad186384 Mon Sep 17 00:00:00 2001
From: Anton Evers <evers@adobe.com>
Date: Mon, 29 Jun 2020 18:38:58 +0200
Subject: [PATCH 0892/1718] Deploy all used locales

`bin/magento setup:static-content:deploy --language=all` currently only
deploys en_US, instead of the requested "all". In the process repair
the language argument in the deployment command.

Remove DB dependency and deploy theme specific languages

Add deployment config for Admin locale generation

Reduce object coupling by introducing a new class

Fix code sniffer errors

add unit tests

Suppress PHPMD.CouplingBetweenObjects

resolve static test issues and Semantic Version Checker issue

resolve static test results
---
 .../Magento/Deploy/Package/LocaleResolver.php | 208 ++++++++++++++++
 .../Magento/Deploy/Package/PackagePool.php    |  21 +-
 .../Test/Unit/Package/LocaleResolverTest.php  | 227 ++++++++++++++++++
 .../Command/DeployStaticContentCommand.php    |  16 +-
 4 files changed, 461 insertions(+), 11 deletions(-)
 create mode 100644 app/code/Magento/Deploy/Package/LocaleResolver.php
 create mode 100644 app/code/Magento/Deploy/Test/Unit/Package/LocaleResolverTest.php

diff --git a/app/code/Magento/Deploy/Package/LocaleResolver.php b/app/code/Magento/Deploy/Package/LocaleResolver.php
new file mode 100644
index 0000000000000..d9909edf31284
--- /dev/null
+++ b/app/code/Magento/Deploy/Package/LocaleResolver.php
@@ -0,0 +1,208 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Deploy\Package;
+
+use InvalidArgumentException;
+use Magento\Framework\App\Area;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\AppInterface;
+use Magento\Framework\Config\ConfigOptionsListConstants;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Validator\Locale;
+use Magento\Store\Model\Config\StoreView;
+use Magento\User\Api\Data\UserInterface;
+use Magento\User\Model\ResourceModel\User\Collection as UserCollection;
+use Magento\User\Model\ResourceModel\User\CollectionFactory as UserCollectionFactory;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Deployment Package Locale Resolver class
+ */
+class LocaleResolver
+{
+    /**
+     * Parameter to force deploying certain languages for the admin, without any users having configured them yet.
+     */
+    const ADMIN_LOCALES_FOR_DEPLOY = 'admin_locales_for_deploy';
+
+    /**
+     * @var StoreView
+     */
+    private $storeView;
+
+    /**
+     * @var UserCollectionFactory
+     */
+    private $userCollFactory;
+
+    /**
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
+    /**
+     * @var Locale
+     */
+    private $locale;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var array|null
+     */
+    private $usedStoreLocales;
+
+    /**
+     * @var array|null
+     */
+    private $usedAdminLocales;
+
+    /**
+     * LocaleResolver constructor.
+     *
+     * @param StoreView $storeView
+     * @param UserCollectionFactory $userCollectionFactory
+     * @param DeploymentConfig $deploymentConfig
+     * @param Locale $locale
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        StoreView $storeView,
+        UserCollectionFactory $userCollectionFactory,
+        DeploymentConfig $deploymentConfig,
+        Locale $locale,
+        LoggerInterface $logger
+    ) {
+        $this->storeView = $storeView;
+        $this->userCollFactory = $userCollectionFactory;
+        $this->deploymentConfig = $deploymentConfig;
+        $this->locale = $locale;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Get locales that are used for a given theme.
+     * If it is a frontend theme, return supported frontend languages.
+     * If it is an adminhtml theme, return languages that admin users have configured together with deployment config.
+     *
+     * @param Package $package
+     *
+     * @return array
+     */
+    public function getUsedPackageLocales(Package $package): array
+    {
+        switch ($package->getArea()) {
+            case Area::AREA_ADMINHTML:
+                $locales = $this->getUsedAdminLocales();
+                break;
+            case Area::AREA_FRONTEND:
+                $locales = $this->getUsedStoreLocales();
+                break;
+            default:
+                $locales = array_merge($this->getUsedAdminLocales(), $this->getUsedStoreLocales());
+        }
+        return $this->validateLocales($locales);
+    }
+
+    /**
+     * Get used admin user locales, en_US is always included by default.
+     *
+     * @return array
+     */
+    private function getUsedAdminLocales(): array
+    {
+        if ($this->usedAdminLocales === null) {
+            $deploymentConfig = $this->getDeploymentAdminLocales();
+            $this->usedAdminLocales = array_merge([AppInterface::DISTRO_LOCALE_CODE], $deploymentConfig);
+
+            if (!$this->isDbConnectionAvailable()) {
+                return $this->usedAdminLocales;
+            }
+
+            /** @var UserCollection $userCollection */
+            $userCollection = $this->userCollFactory->create();
+            /** @var UserInterface $adminUser */
+            foreach ($userCollection as $adminUser) {
+                $this->usedAdminLocales[] = $adminUser->getInterfaceLocale();
+            }
+        }
+        return $this->usedAdminLocales;
+    }
+
+    /**
+     * Get used store locales.
+     *
+     * @return array
+     */
+    private function getUsedStoreLocales(): array
+    {
+        if ($this->usedStoreLocales === null) {
+            $this->usedStoreLocales = $this->isDbConnectionAvailable()
+                ? $this->storeView->retrieveLocales()
+                : [AppInterface::DISTRO_LOCALE_CODE];
+        }
+        return $this->usedStoreLocales;
+    }
+
+    /**
+     * Strip out duplicates and break on invalid locale codes.
+     *
+     * @param array $usedLocales
+     *
+     * @return array
+     * @throws InvalidArgumentException if unknown locale is provided by the store configuration
+     */
+    private function validateLocales(array $usedLocales): array
+    {
+        return array_map(
+            function ($locale) {
+                if (!$this->locale->isValid($locale)) {
+                    throw new InvalidArgumentException(
+                        $locale . ' argument has invalid value, run info:language:list for list of available locales'
+                    );
+                }
+
+                return $locale;
+            },
+            array_unique($usedLocales)
+        );
+    }
+
+    /**
+     * Check if a database connection is already set up.
+     *
+     * @return bool
+     */
+    private function isDbConnectionAvailable(): bool
+    {
+        try {
+            $connections = $this->deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTIONS, []);
+        } catch (LocalizedException $exception) {
+            $this->logger->critical($exception);
+        }
+        return !empty($connections);
+    }
+
+    /**
+     * Retrieve deployment configuration for admin locales that have to be deployed.
+     *
+     * @return array|mixed|string|null
+     */
+    private function getDeploymentAdminLocales(): array
+    {
+        try {
+            return $this->deploymentConfig
+                ->get(self::ADMIN_LOCALES_FOR_DEPLOY, []);
+        } catch (LocalizedException $exception) {
+            return [];
+        }
+    }
+}
diff --git a/app/code/Magento/Deploy/Package/PackagePool.php b/app/code/Magento/Deploy/Package/PackagePool.php
index 9057f50fb3c91..f31af8f9e081f 100644
--- a/app/code/Magento/Deploy/Package/PackagePool.php
+++ b/app/code/Magento/Deploy/Package/PackagePool.php
@@ -7,7 +7,7 @@
 
 use Magento\Deploy\Collector\Collector;
 use Magento\Deploy\Console\DeployStaticOptions as Options;
-use Magento\Framework\AppInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\View\Design\ThemeInterface;
 use Magento\Framework\View\Design\Theme\ListInterface;
 
@@ -41,22 +41,30 @@ class PackagePool
      */
     private $collected = false;
 
+    /**
+     * @var LocaleResolver|null
+     */
+    private $localeResolver;
+
     /**
      * PackagePool constructor
      *
      * @param Collector $collector
      * @param ListInterface $themeCollection
      * @param PackageFactory $packageFactory
+     * @param LocaleResolver|null $localeResolver
      */
     public function __construct(
         Collector $collector,
         ListInterface $themeCollection,
-        PackageFactory $packageFactory
+        PackageFactory $packageFactory,
+        ?LocaleResolver $localeResolver = null
     ) {
         $this->collector = $collector;
         $themeCollection->clear()->resetConstraints();
         $this->themes = $themeCollection->getItems();
         $this->packageFactory = $packageFactory;
+        $this->localeResolver = $localeResolver ?: ObjectManager::getInstance()->get(LocaleResolver::class);
     }
 
     /**
@@ -221,17 +229,18 @@ private function ensurePackagesForRequiredLocales(array $options)
     private function ensureRequiredLocales(array $options)
     {
         if (empty($options[Options::LANGUAGE]) || $options[Options::LANGUAGE][0] === 'all') {
-            $forcedLocales = [AppInterface::DISTRO_LOCALE_CODE];
+            $forcedLocales = [];
         } else {
             $forcedLocales = $options[Options::LANGUAGE];
         }
 
-        $resultPackages = $this->packages;
-        foreach ($resultPackages as $package) {
+        foreach ($this->packages as $package) {
             if ($package->getTheme() === Package::BASE_THEME) {
                 continue;
             }
-            foreach ($forcedLocales as $locale) {
+
+            $locales = $forcedLocales ?: $this->localeResolver->getUsedPackageLocales($package);
+            foreach ($locales as $locale) {
                 $this->ensurePackage([
                     'area' => $package->getArea(),
                     'theme' => $package->getTheme(),
diff --git a/app/code/Magento/Deploy/Test/Unit/Package/LocaleResolverTest.php b/app/code/Magento/Deploy/Test/Unit/Package/LocaleResolverTest.php
new file mode 100644
index 0000000000000..3c911d4c0c533
--- /dev/null
+++ b/app/code/Magento/Deploy/Test/Unit/Package/LocaleResolverTest.php
@@ -0,0 +1,227 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Deploy\Test\Unit\Package;
+
+use Magento\Deploy\Package\LocaleResolver;
+use Magento\Deploy\Package\Package;
+use Magento\Framework\App\Area;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\AppInterface;
+use Magento\Framework\Validator\Locale;
+use Magento\Store\Model\Config\StoreView;
+use Magento\User\Api\Data\UserInterface;
+use Magento\User\Model\ResourceModel\User\Collection;
+use Magento\User\Model\ResourceModel\User\CollectionFactory;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Deployment Package LocaleResolver class unit tests
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class LocaleResolverTest extends TestCase
+{
+    /**
+     * @var LocaleResolver
+     */
+    private $localeResolver;
+
+    /**
+     * @var Package|MockObject
+     */
+    private $package;
+
+    /**
+     * @var StoreView|MockObject
+     */
+    private $storeView;
+
+    /**
+     * @var CollectionFactory|MockObject
+     */
+    private $userCollectionFactory;
+
+    /**
+     * @var DeploymentConfig|MockObject
+     */
+    private $deploymentConfig;
+
+    /**
+     * @var Locale|MockObject
+     */
+    private $locale;
+
+    /**
+     * @var MockObject|LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var Collection|MockObject
+     */
+    private $userCollection;
+
+    /**
+     * @var UserInterface|MockObject
+     */
+    private $adminUser;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->package = $this->createMock(Package::class);
+        $this->storeView = $this->createMock(StoreView::class);
+        $this->adminUser = $this->getMockForAbstractClass(UserInterface::class);
+        $this->userCollection = $this->createMock(Collection::class);
+        $this->userCollectionFactory = $this->createMock(CollectionFactory::class);
+        $this->userCollectionFactory->method('create')->willReturn($this->userCollection);
+        $this->deploymentConfig = $this->createMock(DeploymentConfig::class);
+        $this->locale = $this->createMock(Locale::class);
+        $this->logger = $this->getMockForAbstractClass(
+            LoggerInterface::class,
+            ['critical'],
+            '',
+            false
+        );
+        $this->localeResolver = new LocaleResolver(
+            $this->storeView,
+            $this->userCollectionFactory,
+            $this->deploymentConfig,
+            $this->locale,
+            $this->logger
+        );
+    }
+
+    /**
+     * Test Get Used Package Locales when there is no DB connection set up yet
+     * Should only return en_US by default
+     */
+    public function testGetUsedPackageLocalesNoDb()
+    {
+        $this->package->expects(static::exactly(1))->method('getArea')->willReturn(Area::AREA_FRONTEND);
+        $this->deploymentConfig->expects(static::exactly(1))->method('get')->willReturn([]);
+        $this->storeView->expects(static::exactly(0))->method('retrieveLocales');
+        $this->userCollectionFactory->expects(static::exactly(0))->method('create');
+        $this->locale->method('isValid')->willReturn(true);
+
+        $locales = $this->localeResolver->getUsedPackageLocales($this->package);
+        static::assertEquals(
+            [AppInterface::DISTRO_LOCALE_CODE],
+            $locales
+        );
+    }
+
+    /**
+     * Test Get Used Package Locales when there is no DB connection set up yet
+     * Should only return en_US by default
+     */
+    public function testGetUsedPackageLocalesNoDbWithDeployment()
+    {
+        $this->package->expects(static::exactly(1))->method('getArea')->willReturn(Area::AREA_ADMINHTML);
+        $this->deploymentConfig->expects(static::exactly(2))->method('get')->willReturn(['zh_SG'], []);
+        $this->storeView->expects(static::exactly(0))->method('retrieveLocales');
+        $this->userCollectionFactory->expects(static::exactly(0))->method('create');
+        $this->locale->method('isValid')->willReturn(true);
+
+        $locales = $this->localeResolver->getUsedPackageLocales($this->package);
+        static::assertEquals(
+            [AppInterface::DISTRO_LOCALE_CODE, 'zh_SG'],
+            $locales
+        );
+    }
+
+    /**
+     * Test Get Used Package Locales when there is no DB connection set up yet
+     * Should only return en_US by default
+     */
+    public function testGetUsedPackageLocalesIllegalLocale()
+    {
+        $this->package->expects(static::exactly(1))->method('getArea')->willReturn(Area::AREA_ADMINHTML);
+        $this->deploymentConfig->expects(static::exactly(2))->method('get')->willReturn(['en_DE'], []);
+        $this->storeView->expects(static::exactly(0))->method('retrieveLocales');
+        $this->userCollectionFactory->expects(static::exactly(0))->method('create');
+        $this->locale->method('isValid')->willReturn(true, false);
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage(
+            'en_DE argument has invalid value, run info:language:list for list of available locales'
+        );
+        $this->localeResolver->getUsedPackageLocales($this->package);
+    }
+
+    /**
+     * Test Get Used Package Locales for a frontend theme
+     * Should return used frontend languages
+     */
+    public function testGetUsedPackageLocalesFrontend()
+    {
+        $this->package->expects(static::exactly(1))->method('getArea')->willReturn(Area::AREA_FRONTEND);
+        $this->deploymentConfig->expects(static::exactly(1))->method('get')->willReturn(['default' => []]);
+        $this->storeView->expects(static::exactly(1))->method('retrieveLocales')->willReturn(['de_DE', 'en_GB']);
+        $this->userCollectionFactory->expects(static::exactly(0))->method('create');
+        $this->locale->method('isValid')->willReturn(true);
+
+        $locales = $this->localeResolver->getUsedPackageLocales($this->package);
+        static::assertEquals(
+            ['de_DE', 'en_GB'],
+            $locales
+        );
+    }
+
+    /**
+     * Test Get Used Package Locales for an admin theme
+     * Should return used admin languages, admin deployment configuration languages and en_US by default
+     */
+    public function testGetUsedPackageLocalesAdmin()
+    {
+        $this->package->expects(static::exactly(1))->method('getArea')->willReturn(Area::AREA_ADMINHTML);
+        $this->deploymentConfig->expects(static::exactly(2))->method('get')->willReturn(['de_AT'], ['default' => []]);
+        $this->storeView->expects(static::exactly(0))->method('retrieveLocales');
+        $this->userCollectionFactory->expects(static::exactly(1))->method('create');
+        $this->locale->method('isValid')->willReturn(true);
+        $this->adminUser->expects(static::exactly(2))->method('getInterfaceLocale')->willReturn('nl_NL', 'fr_FR');
+        $this->userCollection->method('getIterator')->willReturn(new \ArrayIterator([
+            $this->adminUser,
+            $this->adminUser,
+        ]));
+
+        $locales = $this->localeResolver->getUsedPackageLocales($this->package);
+        static::assertEquals(
+            [AppInterface::DISTRO_LOCALE_CODE, 'de_AT', 'nl_NL', 'fr_FR'],
+            $locales
+        );
+    }
+
+    /**
+     * Test Get Used Package Locales for a theme that is neither frontend nor admin (hypothetical)
+     * Should return both used admin and used frontend languages, plus en_US by default
+     */
+    public function testGetUsedPackageLocalesDefault()
+    {
+        $this->package->expects(static::exactly(1))->method('getArea')->willReturn(Area::AREA_GLOBAL);
+        $this->deploymentConfig->expects(static::exactly(3))->method('get')
+            ->willReturn(['de_AT'], ['default' => []], ['default' => []]);
+        $this->storeView->expects(static::exactly(1))->method('retrieveLocales')->willReturn(['en_IE', 'fr_LU']);
+        $this->userCollectionFactory->expects(static::exactly(1))->method('create');
+        $this->locale->method('isValid')->willReturn(true);
+        $this->adminUser->expects(static::exactly(2))->method('getInterfaceLocale')->willReturn('nl_NL', 'fr_FR');
+        $this->userCollection->method('getIterator')->willReturn(new \ArrayIterator([
+            $this->adminUser,
+            $this->adminUser,
+        ]));
+
+        $locales = $this->localeResolver->getUsedPackageLocales($this->package);
+        static::assertEquals(
+            [AppInterface::DISTRO_LOCALE_CODE, 'de_AT', 'nl_NL', 'fr_FR', 'en_IE', 'fr_LU'],
+            $locales
+        );
+    }
+}
diff --git a/setup/src/Magento/Setup/Console/Command/DeployStaticContentCommand.php b/setup/src/Magento/Setup/Console/Command/DeployStaticContentCommand.php
index 6a4231259a1ca..c6facffb7c653 100644
--- a/setup/src/Magento/Setup/Console/Command/DeployStaticContentCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/DeployStaticContentCommand.php
@@ -20,14 +20,14 @@
 use Magento\Deploy\Service\DeployStaticContent;
 
 /**
- * Deploy static content command
+ * Command to Deploy Static Content
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class DeployStaticContentCommand extends Command
 {
     /**
-     * Default language value
+     * Default language value. Always used for adminhtml, fallback if no frontend locale is supplied.
      */
     const DEFAULT_LANGUAGE_VALUE = 'en_US';
 
@@ -82,7 +82,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @throws \InvalidArgumentException
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -96,7 +96,10 @@ protected function configure()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     *
      * @throws \InvalidArgumentException
      * @throws LocalizedException
      */
@@ -119,7 +122,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $this->inputValidator->validate($input);
 
         $options = $input->getOptions();
-        $options[Options::LANGUAGE] = $input->getArgument(Options::LANGUAGES_ARGUMENT) ?: ['all'];
+        $languageOption = $options[Options::LANGUAGE] ?: ['all'];
+        $options[Options::LANGUAGE] = $input->getArgument(Options::LANGUAGES_ARGUMENT) ?: $languageOption;
         $refreshOnly = isset($options[Options::REFRESH_CONTENT_VERSION_ONLY])
             && $options[Options::REFRESH_CONTENT_VERSION_ONLY];
 
@@ -161,6 +165,8 @@ private function mockCache()
     }
 
     /**
+     * Retrieve application state
+     *
      * @return State
      */
     private function getAppState()

From a3c1ff4ef65e8757a309bf9fd3aff1217bd9488b Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Thu, 16 Jul 2020 15:04:09 +0300
Subject: [PATCH 0893/1718] MC-35608: Issue in saving a custom product
 attribute

---
 .../Adminhtml/Product/Attribute/Validate.php  | 68 ++++++++++++-------
 .../Product/Attribute/ValidateTest.php        | 67 +++++++++++++++++-
 2 files changed, 108 insertions(+), 27 deletions(-)

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
index dcb7074c0d036..a2be7db7e62be 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php
@@ -3,17 +3,27 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Catalog\Controller\Adminhtml\Product\Attribute;
 
+use Magento\Backend\App\Action\Context;
 use Magento\Catalog\Controller\Adminhtml\Product\Attribute as AttributeAction;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\Eav\Model\Entity\Attribute\Set;
 use Magento\Eav\Model\Validator\Attribute\Code as AttributeCodeValidator;
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Cache\FrontendInterface;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\DataObject;
 use Magento\Framework\Escaper;
+use Magento\Framework\Registry;
 use Magento\Framework\Serialize\Serializer\FormData;
+use Magento\Framework\View\LayoutFactory;
+use Magento\Framework\View\Result\PageFactory;
 
 /**
  * Product attribute validate controller.
@@ -25,12 +35,12 @@ class Validate extends AttributeAction implements HttpGetActionInterface, HttpPo
     const DEFAULT_MESSAGE_KEY = 'message';
 
     /**
-     * @var \Magento\Framework\Controller\Result\JsonFactory
+     * @var JsonFactory
      */
     protected $resultJsonFactory;
 
     /**
-     * @var \Magento\Framework\View\LayoutFactory
+     * @var LayoutFactory
      */
     protected $layoutFactory;
 
@@ -57,12 +67,12 @@ class Validate extends AttributeAction implements HttpGetActionInterface, HttpPo
     /**
      * Constructor
      *
-     * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\Framework\Cache\FrontendInterface $attributeLabelCache
-     * @param \Magento\Framework\Registry $coreRegistry
-     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
-     * @param \Magento\Framework\View\LayoutFactory $layoutFactory
+     * @param Context $context
+     * @param FrontendInterface $attributeLabelCache
+     * @param Registry $coreRegistry
+     * @param PageFactory $resultPageFactory
+     * @param JsonFactory $resultJsonFactory
+     * @param LayoutFactory $layoutFactory
      * @param array $multipleAttributeList
      * @param FormData|null $formDataSerializer
      * @param AttributeCodeValidator|null $attributeCodeValidator
@@ -70,12 +80,12 @@ class Validate extends AttributeAction implements HttpGetActionInterface, HttpPo
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
-        \Magento\Backend\App\Action\Context $context,
-        \Magento\Framework\Cache\FrontendInterface $attributeLabelCache,
-        \Magento\Framework\Registry $coreRegistry,
-        \Magento\Framework\View\Result\PageFactory $resultPageFactory,
-        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory,
-        \Magento\Framework\View\LayoutFactory $layoutFactory,
+        Context $context,
+        FrontendInterface $attributeLabelCache,
+        Registry $coreRegistry,
+        PageFactory $resultPageFactory,
+        JsonFactory $resultJsonFactory,
+        LayoutFactory $layoutFactory,
         array $multipleAttributeList = [],
         FormData $formDataSerializer = null,
         AttributeCodeValidator $attributeCodeValidator = null,
@@ -96,7 +106,7 @@ public function __construct(
     /**
      * @inheritdoc
      *
-     * @return \Magento\Framework\Controller\ResultInterface
+     * @return ResultInterface
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
@@ -118,14 +128,22 @@ public function execute()
 
         $attributeCode = $this->getRequest()->getParam('attribute_code');
         $frontendLabel = $this->getRequest()->getParam('frontend_label');
-        $attributeCode = $attributeCode ?: $this->generateCode($frontendLabel[0]);
         $attributeId = $this->getRequest()->getParam('attribute_id');
-        $attribute = $this->_objectManager->create(
-            \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
-        )->loadByCode(
-            $this->_entityTypeId,
-            $attributeCode
-        );
+
+        if ($attributeId) {
+            $attribute = $this->_objectManager->create(
+                Attribute::class
+            )->load($attributeId);
+            $attributeCode = $attribute->getAttributeCode();
+        } else {
+            $attributeCode = $attributeCode ?: $this->generateCode($frontendLabel[0]);
+            $attribute = $this->_objectManager->create(
+                Attribute::class
+            )->loadByCode(
+                $this->_entityTypeId,
+                $attributeCode
+            );
+        }
 
         if ($attribute->getId() && !$attributeId || $attributeCode === 'product_type' || $attributeCode === 'type_id') {
             $message = strlen($this->getRequest()->getParam('attribute_code'))
@@ -145,8 +163,8 @@ public function execute()
 
         if ($this->getRequest()->has('new_attribute_set_name')) {
             $setName = $this->getRequest()->getParam('new_attribute_set_name');
-            /** @var $attributeSet \Magento\Eav\Model\Entity\Attribute\Set */
-            $attributeSet = $this->_objectManager->create(\Magento\Eav\Model\Entity\Attribute\Set::class);
+            /** @var $attributeSet Set */
+            $attributeSet = $this->_objectManager->create(Set::class);
             $attributeSet->setEntityTypeId($this->_entityTypeId)->load($setName, 'attribute_set_name');
             if ($attributeSet->getId()) {
                 $setName = $this->escaper->escapeHtml($setName);
@@ -252,7 +270,7 @@ private function checkUniqueOption(DataObject $response, array $options = null)
     private function checkEmptyOption(DataObject $response, array $optionsForCheck = null)
     {
         foreach ($optionsForCheck as $optionValues) {
-            if (isset($optionValues[0]) && trim($optionValues[0]) == '') {
+            if (isset($optionValues[0]) && trim((string)$optionValues[0]) == '') {
                 $this->setMessageToResponse($response, [__("The value of Admin scope can't be empty.")]);
                 $response->setError(true);
             }
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/ValidateTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/ValidateTest.php
index 122089332f89b..371dac9a64b89 100644
--- a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/ValidateTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Attribute/ValidateTest.php
@@ -153,7 +153,7 @@ public function testExecute()
             ->willReturnMap(
                 [
                     [Attribute::class, [], $this->attributeMock],
-                    [\Magento\Eav\Model\Entity\Attribute\Set::class, [], $this->attributeSetMock]
+                    [AttributeSet::class, [], $this->attributeSetMock]
                 ]
             );
         $this->attributeMock->expects($this->once())
@@ -188,6 +188,69 @@ public function testExecute()
         $this->assertInstanceOf(ResultJson::class, $this->getModel()->execute());
     }
 
+    /**
+     * Test that editing existing attribute loads attribute by id
+     *
+     * @return void
+     * @throws NotFoundException
+     */
+    public function testExecuteEditExisting(): void
+    {
+        $serializedOptions = '{"key":"value"}';
+        $this->requestMock->expects($this->any())
+            ->method('getParam')
+            ->willReturnMap(
+                [
+                    ['frontend_label', null, 'test_frontend_label'],
+                    ['attribute_id', null, 10],
+                    ['attribute_code', null, 'test_attribute_code'],
+                    ['new_attribute_set_name', null, 'test_attribute_set_name'],
+                    ['serialized_options', '[]', $serializedOptions],
+                ]
+            );
+        $this->objectManagerMock->expects($this->exactly(2))
+            ->method('create')
+            ->willReturnMap(
+                [
+                    [Attribute::class, [], $this->attributeMock],
+                    [AttributeSet::class, [], $this->attributeSetMock]
+                ]
+            );
+        $this->attributeMock->expects($this->once())
+            ->method('load')
+            ->willReturnSelf();
+        $this->attributeMock->expects($this->once())
+            ->method('getAttributeCode')
+            ->willReturn('test_attribute_code');
+
+        $this->attributeCodeValidatorMock->expects($this->once())
+            ->method('isValid')
+            ->with('test_attribute_code')
+            ->willReturn(true);
+
+        $this->requestMock->expects($this->once())
+            ->method('has')
+            ->with('new_attribute_set_name')
+            ->willReturn(true);
+        $this->attributeSetMock->expects($this->once())
+            ->method('setEntityTypeId')
+            ->willReturnSelf();
+        $this->attributeSetMock->expects($this->once())
+            ->method('load')
+            ->willReturnSelf();
+        $this->attributeSetMock->expects($this->once())
+            ->method('getId')
+            ->willReturn(false);
+        $this->resultJsonFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->resultJson);
+        $this->resultJson->expects($this->once())
+            ->method('setJsonData')
+            ->willReturnSelf();
+
+        $this->assertInstanceOf(ResultJson::class, $this->getModel()->execute());
+    }
+
     /**
      * @dataProvider provideUniqueData
      * @param        array   $options
@@ -605,7 +668,7 @@ public function testExecuteWithOptionsDataError()
             ->willReturnMap(
                 [
                     [Attribute::class, [], $this->attributeMock],
-                    [\Magento\Eav\Model\Entity\Attribute\Set::class, [], $this->attributeSetMock]
+                    [AttributeSet::class, [], $this->attributeSetMock]
                 ]
             );
 

From 3f7c8db04076af023a0ece77c1e11d6aa8c4b671 Mon Sep 17 00:00:00 2001
From: Rowena Santos <rowena.santos@acidgreen.com.au>
Date: Thu, 16 Jul 2020 20:38:06 +0800
Subject: [PATCH 0894/1718] magento/partners-magento2b2b#137: Add Company to
 Customers Now Online grid - Added MFTF action group to CE > UI admin grid

---
 .../AdminAddColumnToAdminGridActionGroup.xml  | 23 +++++++++++++++++++
 ...nActionDropDownForAdminGridActionGroup.xml | 19 +++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminAddColumnToAdminGridActionGroup.xml
 create mode 100644 app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminOpenColumnActionDropDownForAdminGridActionGroup.xml

diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminAddColumnToAdminGridActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminAddColumnToAdminGridActionGroup.xml
new file mode 100644
index 0000000000000..3cf2dfcf6daed
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminAddColumnToAdminGridActionGroup.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="AdminAddColumnToAdminGridActionGroup">
+        <annotations>
+            <description value="Adds column to admin grid"/>
+        </annotations>
+        <arguments>
+            <argument name="columnName" defaultValue="Email" type="string"/>
+        </arguments>
+        <waitForElementVisible selector="{{AdminDataGridHeaderSection.columnCheckbox(columnName)}}" stepKey="verifyAdminGridColumnControlsForSelectedColumnVisible"/>
+        <click selector="{{AdminDataGridHeaderSection.columnCheckbox(columnName)}}" stepKey="clickForAdminGridControlForSelectedColumn"/>
+        <waitForElementVisible selector="{{AdminGridHeaders.headerByName(columnName)}}" stepKey="waitForAdminGridColumnHeaderForSelectedColumn"/>
+        <click selector="{{AdminGridColumnsControls.columns}}" stepKey="reOpenAdminGridColumnControlsColumn"/>
+        <waitForElementNotVisible selector="{{AdminGridColumnsControls.columnName(columnName)}}" stepKey="verifyAdminGridColumnControlsForSelectedColumnNotVisible"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminOpenColumnActionDropDownForAdminGridActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminOpenColumnActionDropDownForAdminGridActionGroup.xml
new file mode 100644
index 0000000000000..3e14518253a5f
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminOpenColumnActionDropDownForAdminGridActionGroup.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="AdminOpenColumnActionDropDownForAdminGridActionGroup">
+        <annotations>
+            <description>Opens column action drop down for admin grid</description>
+        </annotations>
+
+        <waitForElementVisible selector="{{AdminGridColumnsControls.columns}}" stepKey="waitForAdminGridColumnControlsColumn"/>
+        <click selector="{{AdminGridColumnsControls.columns}}" stepKey="clickAdminGridColumnControlsColumn"/>
+    </actionGroup>
+</actionGroups>

From 091b98d4b6eb0fbef46f32a73c0e258bd9ae78dd Mon Sep 17 00:00:00 2001
From: Rowena Santos <rowena.santos@acidgreen.com.au>
Date: Thu, 16 Jul 2020 21:00:04 +0800
Subject: [PATCH 0895/1718] magento/partners-magento2b2b#137: Add Company to
 Customers Now Online grid - Added MFTF action group, page  and  section to CE
 > Customer module

---
 ...avigateToCustomerOnlinePageActionGroup.xml | 19 +++++++++++++++++++
 .../Mftf/Page/AdminCustomersNowOnlinePage.xml | 14 ++++++++++++++
 .../AdminCustomersNowOnlineGridSection.xml    | 15 +++++++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminNavigateToCustomerOnlinePageActionGroup.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/Page/AdminCustomersNowOnlinePage.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/Section/AdminCustomersNowOnlineGridSection.xml

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminNavigateToCustomerOnlinePageActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminNavigateToCustomerOnlinePageActionGroup.xml
new file mode 100644
index 0000000000000..dd048c2636cd4
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminNavigateToCustomerOnlinePageActionGroup.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="AdminNavigateToCustomerOnlinePageActionGroup">
+        <annotations>
+            <description>Goes to the Admin Customer Online page.</description>
+        </annotations>
+
+        <amOnPage url="{{AdminCustomersNowOnlinePage.url}}" stepKey="openCustomersOnlineGridPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomersNowOnlinePage.xml b/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomersNowOnlinePage.xml
new file mode 100644
index 0000000000000..158ffabd7dd24
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Page/AdminCustomersNowOnlinePage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminCustomersNowOnlinePage" url="/customer/online/" area="admin" module="Magento_Customer">
+        <section name="AdminCustomersNowOnlineGridSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomersNowOnlineGridSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomersNowOnlineGridSection.xml
new file mode 100644
index 0000000000000..c29b556977d42
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomersNowOnlineGridSection.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="AdminCustomersNowOnlineGridSection">
+        <element name="columnTitle" type="text" selector=".admin__action-dropdown-menu-content label[title='{{column}}']" parameterized="true"/>
+    </section>
+</sections>
+

From 3afc1db762b9d0d0fc6ff5ec1fb763b0c523ab06 Mon Sep 17 00:00:00 2001
From: Anusha Vattam <avattam@adobe.com>
Date: Thu, 16 Jul 2020 11:35:47 -0500
Subject: [PATCH 0896/1718] MC-35653:MyAccount :: Order Details :: Payments
 Methods, shipping address, billing address by Order Number

- Schema changes and related implementation changes are added
---
 .../SalesGraphQl/Model/Order/OrderAddress.php | 147 +++++-------------
 .../Model/Resolver/CustomerOrders.php         |  16 +-
 .../Magento/SalesGraphQl/etc/schema.graphqls  |  22 ++-
 3 files changed, 61 insertions(+), 124 deletions(-)

diff --git a/app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php b/app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php
index cbfd4240ac053..477425805aee7 100644
--- a/app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php
+++ b/app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php
@@ -7,64 +7,32 @@
 
 namespace Magento\SalesGraphQl\Model\Order;
 
-use Magento\Customer\Api\Data\AddressInterface;
-use Magento\CustomerGraphQl\Model\Customer\Address\GetCustomerAddress;
-use Magento\CustomerGraphQl\Model\Customer\ExtractCustomerData;
+use Magento\Quote\Model\Quote\Address;
 use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Model\Order\Address as SalesOrderAddress;
 
 /**
- * Class to get the order address details
+ * Class to fetch the order address details
  */
 class OrderAddress
 {
-    /**
-     * @var GetCustomerAddress
-     */
-    private $getCustomerAddress;
-
-    /**
-     * @var ExtractCustomerData
-     */
-    private $extractCustomerData;
-
-    /**
-     * @param GetCustomerAddress $getCustomerAddress
-     * @param ExtractCustomerData $extractCustomerData
-     */
-    public function __construct(
-        GetCustomerAddress $getCustomerAddress,
-        ExtractCustomerData $extractCustomerData
-    ) {
-        $this->getCustomerAddress = $getCustomerAddress;
-        $this->extractCustomerData = $extractCustomerData;
-    }
-
     /**
      * Get the order Shipping address
      *
      * @param OrderInterface $order
-     * @param array $addressIds
      * @return array
      */
-    public function getShippingAddress(
-        OrderInterface $order,
-        array $addressIds
+    public function getOrderShippingAddress(
+        OrderInterface $order
     ): array {
         $shippingAddress = [];
         $orderAddresses = $order->getAddresses();
         foreach ($orderAddresses as $orderAddress) {
-            $addressType = $orderAddress->getDataByKey("address_type");
-            if ($addressType === 'shipping') {
-                $customerAddressId = (int)$orderAddress->getDataByKey('customer_address_id');
-                if (in_array($customerAddressId, $addressIds)) {
-                    $customerData = $this->getCustomerAddress->execute(
-                        $customerAddressId,
-                        (int)$order->getCustomerId()
-                    );
-                    $shippingAddress = $this->extractOrderAddress($customerData);
-                } else {
-                    $shippingAddress = $this->curateCustomerOrderAddress($order, $addressType);
-                }
+            if ($orderAddress->getDataByKey("address_type") === address::TYPE_SHIPPING) {
+                $shippingAddress = $this->OrderAddressDataFormatter(
+                    $orderAddress,
+                    address::TYPE_SHIPPING
+                );
             }
         }
         return $shippingAddress;
@@ -74,28 +42,19 @@ public function getShippingAddress(
      * Get the order billing address
      *
      * @param OrderInterface $order
-     * @param array $addressIds
      * @return array
      */
-    public function getBillingAddress(
-        OrderInterface $order,
-        array $addressIds
+    public function getOrderBillingAddress(
+        OrderInterface $order
     ): array {
         $billingAddress = [];
         $orderAddresses = $order->getAddresses();
         foreach ($orderAddresses as $orderAddress) {
-            $addressType = $orderAddress->getDataByKey("address_type");
-            if ($addressType === 'billing') {
-                $customerAddressId = (int)$orderAddress->getDataByKey('customer_address_id');
-                if (in_array($customerAddressId, $addressIds)) {
-                    $customerData = $this->getCustomerAddress->execute(
-                        $customerAddressId,
-                        (int)$order->getCustomerId()
-                    );
-                    $billingAddress = $this->extractOrderAddress($customerData);
-                } else {
-                    $billingAddress = $this->curateCustomerOrderAddress($order, $addressType);
-                }
+            if ($orderAddress->getDataByKey("address_type") === address::TYPE_BILLING) {
+                $billingAddress = $this->OrderAddressDataFormatter(
+                    $orderAddress,
+                    address::TYPE_BILLING
+                );
             }
         }
         return $billingAddress;
@@ -104,66 +63,34 @@ public function getBillingAddress(
     /**
      * Customer Order address data formatter
      *
-     * @param OrderInterface $order
+     * @param SalesOrderAddress $orderAddress
      * @param string $addressType
      * @return array
      */
-    private function curateCustomerOrderAddress(
-        OrderInterface $order,
+    private function OrderAddressDataFormatter(
+        SalesOrderAddress $orderAddress,
         string $addressType
     ): array {
-        $orderAddressFields = [];
         $orderAddressData = [];
-        $orderAddresses = $order->getAddresses();
-        foreach ($orderAddresses as $orderAddress) {
-            if ($addressType === $orderAddress->getDataByKey("address_type")) {
-                $orderAddressData = $orderAddress->getData();
-                $orderAddressFields = [
-                    'id' => $orderAddress->getDataByKey('entity_id'),
-                    'street' => [$street = $orderAddress->getDataByKey('street')],
+        if ($addressType === $orderAddress->getDataByKey("address_type")) {
+            $orderAddressData = [
+                    'firstname' => $orderAddress->getDataByKey('firstname'),
+                    'lastname' => $orderAddress->getDataByKey('lastname'),
+                    'middlename' => $orderAddress->getDataByKey('middlename'),
+                    'postcode' => $orderAddress->getDataByKey('postcode'),
+                    'prefix' => $orderAddress->getDataByKey('prefix'),
+                    'suffix' => $orderAddress->getDataByKey('suffix'),
+                    'city' => $orderAddress->getDataByKey('city'),
+                    'company' => $orderAddress->getDataByKey('company'),
+                    'fax' => $orderAddress->getDataByKey('fax'),
+                    'telephone' => $orderAddress->getDataByKey('telephone'),
+                    'vat_id' => $orderAddress->getDataByKey('vat_id'),
+                    'street' => explode("\n", $orderAddress->getDataByKey('street')),
                     'country_code' => $orderAddress->getDataByKey('country_id'),
-                    'region' => [
-                        'region' => $orderAddress->getDataByKey('region'),
-                        'region_id' => $orderAddress->getDataByKey('region_id'),
-                        'region_code' => $orderAddress->getDataByKey('region')
-                    ],
-                    'default_billing' => 0,
-                    'default_shipping' => 0,
-                    'extension_attributes' => [],
+                    'region' => $orderAddress->getDataByKey('region'),
+                    'region_id' => $orderAddress->getDataByKey('region_id')
                 ];
-            }
         }
-        return array_merge($orderAddressData, $orderAddressFields);
-    }
-
-    private function extractOrderAddress(AddressInterface $customerData)
-    {
-        return [
-            'id' => $customerData->getId(),
-            'firstname' => $customerData->getFirstname(),
-            'lastname' => $customerData->getLastname(),
-            'middlename' => $customerData->getMiddlename(),
-            'postcode' => $customerData->getPostcode(),
-            'prefix' => $customerData->getFirstname(),
-            'suffix' => $customerData->getFirstname(),
-            'street' => $customerData->getStreet(),
-            'country_code' => $customerData->getCountryId(),
-            'city' => $customerData->getCity(),
-            'company' => $customerData->getCompany(),
-            'fax' => $customerData->getFax(),
-            'telephone' => $customerData->getTelephone(),
-            'vat_id' => $customerData->getVatId(),
-            'default_billing' => $customerData->isDefaultBilling() ?? 0,
-            'default_shipping' => $customerData->isDefaultShipping() ?? 0,
-            'region_id' => $customerData->getRegion()->getRegionId(),
-            'extension_attributes' => [
-                $customerData->getExtensionAttributes()
-                ],
-            'region' => [
-                'region' => $customerData->getRegion()->getRegion(),
-                'region_id' => $customerData->getRegion()->getRegionId(),
-                'region_code' => $customerData->getRegion()->getRegionCode()
-            ],
-        ];
+        return $orderAddressData;
     }
 }
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders.php b/app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders.php
index a17eba8e8bd39..08ff97d94e4f1 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders.php
@@ -94,13 +94,6 @@ public function resolve(
         $userId = $context->getUserId();
         /** @var StoreInterface $store */
         $store = $context->getExtensionAttributes()->getStore();
-        $customerModel = $value['model'];
-        $address = $customerModel->getAddresses();
-        $addressIds = [];
-        foreach ($address as $key => $addressData) {
-            $addressIds[$key] = (int)$addressData->getId();
-        }
-
         try {
             $searchResult = $this->getSearchResult($args, (int)$userId, (int)$store->getId());
             $maxPages = (int)ceil($searchResult->getTotalCount() / $searchResult->getPageSize());
@@ -110,7 +103,7 @@ public function resolve(
 
         return [
             'total_count' => $searchResult->getTotalCount(),
-            'items' => $this->formatOrdersArray($searchResult->getItems(), $addressIds),
+            'items' => $this->formatOrdersArray($searchResult->getItems()),
             'page_info' => [
                 'page_size' => $searchResult->getPageSize(),
                 'current_page' => $searchResult->getCurPage(),
@@ -123,10 +116,9 @@ public function resolve(
      * Format order models for graphql schema
      *
      * @param OrderInterface[] $orderModels
-     * @param array $addressIds
      * @return array
      */
-    private function formatOrdersArray(array $orderModels, array $addressIds)
+    private function formatOrdersArray(array $orderModels)
     {
         $ordersArray = [];
 
@@ -142,8 +134,8 @@ private function formatOrdersArray(array $orderModels, array $addressIds)
                 'order_number' => $orderModel->getIncrementId(),
                 'status' => $orderModel->getStatusLabel(),
                 'shipping_method' => $orderModel->getShippingDescription(),
-                'shipping_address' => $this->orderAddress->getShippingAddress($orderModel, $addressIds),
-                'billing_address' => $this->orderAddress->getBillingAddress($orderModel, $addressIds),
+                'shipping_address' => $this->orderAddress->getOrderShippingAddress($orderModel),
+                'billing_address' => $this->orderAddress->getOrderBillingAddress($orderModel),
                 'payment_methods' => $this->orderPayments->getOrderPaymentMethod($orderModel),
                 'model' => $orderModel,
             ];
diff --git a/app/code/Magento/SalesGraphQl/etc/schema.graphqls b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
index 099a3ffb959c4..e40e0d931ceb6 100644
--- a/app/code/Magento/SalesGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
@@ -48,8 +48,8 @@ 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")
     payment_methods: [PaymentMethod] @doc(description: "Payment details for the order")
-    shipping_address: CustomerAddress @doc(description: "The shipping address for the order")
-    billing_address: CustomerAddress @doc(description: "The billing address 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")
     shipping_method: String @doc(description: "The delivery method for the order")
     comments: [CommentItem] @doc(description: "Comments about the order")
@@ -59,6 +59,24 @@ type CustomerOrder @doc(description: "Contains details about each of the custome
     grand_total: Float  @deprecated(reason: "Use the totals.grand_total attribute instead")
 }
 
+type OrderAddress @doc(description: "OrderAddress contains detailed information about the order billing and shipping addresses"){
+    firstname: String! @doc(description: "The first name of the person associated with the shipping/billing address on the order")
+    lastname: String! @doc(description: "The family name of the person associated with the shipping/billing address on the order")
+    middlename: String @doc(description: "The middle name of the person associated with the shipping/billing address on the order")
+    region: String @doc(description: "The state or province name on the order")
+    region_id: ID @doc(description: "The unique ID for a pre-defined region on the order")
+    country_code: CountryCodeEnum @doc(description: "The customer's country on the order")
+    street: [String]! @doc(description: "An array of strings that define the street number and name on the order")
+    company: String @doc(description: "The customer's company on the order")
+    telephone: String! @doc(description: "The telephone number on the order")
+    fax: String @doc(description: "The fax number on the order")
+    postcode: String @doc(description: "The customer's order ZIP or postal code on the order")
+    city: String! @doc(description: "The city or town on the order")
+    prefix: String @doc(description: "An honorific, such as Dr., Mr., or Mrs. on the order")
+    suffix: String @doc(description: "A value such as Sr., Jr., or III on the order")
+    vat_id: String @doc(description: "The customer's Value-added tax (VAT) number (for corporate customers) on the order")
+}
+
 interface OrderItemInterface @doc(description: "Order item details") @typeResolver(class: "Magento\\SalesGraphQl\\Model\\OrderItemTypeResolver") {
     id: ID! @doc(description: "The unique identifier of the order item")
     product_name: String @doc(description: "The name of the base product")

From f205571f156e7f6b09736e685c9a6ba2b3b31f0c Mon Sep 17 00:00:00 2001
From: Anusha Vattam <avattam@adobe.com>
Date: Thu, 16 Jul 2020 11:40:41 -0500
Subject: [PATCH 0897/1718] MC-35653:MyAccount :: Order Details :: Payments
 Methods, shipping address, billing address by Order Number

- Removed added dependency on composer.json
---
 app/code/Magento/SalesGraphQl/composer.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/SalesGraphQl/composer.json b/app/code/Magento/SalesGraphQl/composer.json
index 83dc8fdc88174..f820b239d727d 100644
--- a/app/code/Magento/SalesGraphQl/composer.json
+++ b/app/code/Magento/SalesGraphQl/composer.json
@@ -8,7 +8,6 @@
         "magento/module-sales": "*",
         "magento/module-store": "*",
         "magento/module-catalog": "*",
-        "magento/module-customer-graphql": "*",
         "magento/module-tax": "*",
         "magento/module-quote": "*",
         "magento/module-graph-ql": "*"

From 11b1dcf055e705589bcf20b4557e62c4f0d89b2e Mon Sep 17 00:00:00 2001
From: Anusha Vattam <avattam@adobe.com>
Date: Thu, 16 Jul 2020 11:48:24 -0500
Subject: [PATCH 0898/1718] MC-35653:MyAccount :: Order Details :: Payments
 Methods, shipping address, billing address by Order Number

- Fixed some static issues
---
 app/code/Magento/SalesGraphQl/Model/Order/OrderPayments.php     | 2 +-
 app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders.php | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/code/Magento/SalesGraphQl/Model/Order/OrderPayments.php b/app/code/Magento/SalesGraphQl/Model/Order/OrderPayments.php
index 91a40834bf009..99f31793d64b5 100644
--- a/app/code/Magento/SalesGraphQl/Model/Order/OrderPayments.php
+++ b/app/code/Magento/SalesGraphQl/Model/Order/OrderPayments.php
@@ -10,7 +10,7 @@
 use Magento\Sales\Api\Data\OrderInterface;
 
 /**
- * Class to extract the order payment details
+ * Class to fetch the order payment details
  */
 class OrderPayments
 {
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders.php b/app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders.php
index 08ff97d94e4f1..8807dfa390ae8 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders.php
@@ -121,9 +121,7 @@ public function resolve(
     private function formatOrdersArray(array $orderModels)
     {
         $ordersArray = [];
-
         foreach ($orderModels as $orderModel) {
-
             $ordersArray[] = [
                 'created_at' => $orderModel->getCreatedAt(),
                 'grand_total' => $orderModel->getGrandTotal(),

From f61869381e4ba204a1a55c05b78782b0e348d94a Mon Sep 17 00:00:00 2001
From: Volodymyr Zaets <vzaets@magento.com>
Date: Thu, 16 Jul 2020 12:15:29 -0500
Subject: [PATCH 0899/1718] Release artifact preparation

---
 CHANGELOG.md | 775 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 775 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4661c4875737d..fc0f5b058862b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,778 @@
+2.4.0
+=============
+* GitHub issues:
+    * [#24229](https://github.com/magento/magento2/issues/24229) -- Unable to enable maintenance mode when env.php is read only (fixed in [magento/magento2#25790](https://github.com/magento/magento2/pull/25790))
+    * [#22416](https://github.com/magento/magento2/issues/22416) -- Coupling beetwen Magento_Checkout::js/view/shipping.js:validateShippingInformation() and layout definition or view.  (fixed in [magento/magento2#25541](https://github.com/magento/magento2/pull/25541))
+    * [#25739](https://github.com/magento/magento2/issues/25739) -- grunt clean does not clean generated folder (fixed in [magento/magento2#25765](https://github.com/magento/magento2/pull/25765))
+    * [#25654](https://github.com/magento/magento2/issues/25654) -- Magento OpenGraph meta description / title content bleeding (fixed in [magento/magento2#25655](https://github.com/magento/magento2/pull/25655))
+    * [#25731](https://github.com/magento/magento2/issues/25731) -- queue_consumer.xml doesn't allow numbers in handler class (fixed in [magento/magento2#25952](https://github.com/magento/magento2/pull/25952))
+    * [#25935](https://github.com/magento/magento2/issues/25935) -- Email address mismatch with text in iPad(768) view (fixed in [magento/magento2#25942](https://github.com/magento/magento2/pull/25942))
+    * [#25931](https://github.com/magento/magento2/issues/25931) -- Refresh Statistics: Updated At = Null should be display as "Never" instead of "undefined". (fixed in [magento/magento2#25932](https://github.com/magento/magento2/pull/25932))
+    * [#25925](https://github.com/magento/magento2/issues/25925) -- Dupplicate Records when sorting column in Content->Themes Grid (fixed in [magento/magento2#25926](https://github.com/magento/magento2/pull/25926))
+    * [#25917](https://github.com/magento/magento2/issues/25917) -- Admin confirm password input doesn't inherit needed styles (fixed in [magento/magento2#25918](https://github.com/magento/magento2/pull/25918))
+    * [#25911](https://github.com/magento/magento2/issues/25911) -- Category - Notice on incorrect price filter GET param (fixed in [magento/magento2#25912](https://github.com/magento/magento2/pull/25912))
+    * [#25893](https://github.com/magento/magento2/issues/25893) -- A "500 (Internal Server Error)" appears in Developer Console if Delete the image that is added to Page Content (fixed in [magento/magento2#25924](https://github.com/magento/magento2/pull/25924))
+    * [#25896](https://github.com/magento/magento2/issues/25896) -- Cannot create folder using only letters (fixed in [magento/magento2#25904](https://github.com/magento/magento2/pull/25904))
+    * [#24713](https://github.com/magento/magento2/issues/24713) -- Symbol of the Belarusian currency BYR is outdated (fixed in [magento/magento2#25723](https://github.com/magento/magento2/pull/25723))
+    * [#19805](https://github.com/magento/magento2/issues/19805) -- Sales order Address Information edit form layout design improvement. (fixed in [magento/magento2#25699](https://github.com/magento/magento2/pull/25699))
+    * [#23481](https://github.com/magento/magento2/issues/23481) -- Billing/Shipping Address edit form design update from order backend (fixed in [magento/magento2#25699](https://github.com/magento/magento2/pull/25699))
+    * [#25972](https://github.com/magento/magento2/issues/25972) -- Not required spacing in submenu on hover desktop (fixed in [magento/magento2#25973](https://github.com/magento/magento2/pull/25973))
+    * [#25586](https://github.com/magento/magento2/issues/25586) -- Mixins are not applied for advanced bundled modules (fixed in [magento/magento2#25587](https://github.com/magento/magento2/pull/25587))
+    * [#20379](https://github.com/magento/magento2/issues/20379) -- calendar icon not aligned inside the textbox in Add Design Change page (fixed in [magento/magento2#26063](https://github.com/magento/magento2/pull/26063))
+    * [#18687](https://github.com/magento/magento2/issues/18687) -- Left Side Back End Menu Design fix (fixed in [magento/magento2#26034](https://github.com/magento/magento2/pull/26034))
+    * [#24025](https://github.com/magento/magento2/issues/24025) -- Slow Performance of ProductMetadata::getVersion (fixed in [magento/magento2#26001](https://github.com/magento/magento2/pull/26001))
+    * [#100](https://github.com/magento/partners-magento2ee/issues/100) -- Users can see Negotiable Quotes from other Company (fixed in [magento/magento2#25940](https://github.com/magento/magento2/pull/25940) and [magento/partners-magento2ee#134](https://github.com/magento/partners-magento2ee/pull/134))
+    * [#24357](https://github.com/magento/magento2/issues/24357) -- Eav sort order by attribute option_id (fixed in [magento/magento2#24360](https://github.com/magento/magento2/pull/24360))
+    * [#25930](https://github.com/magento/magento2/issues/25930) -- Integration Success Message Text Overflow Issue in Admin (fixed in [magento/magento2#26011](https://github.com/magento/magento2/pull/26011))
+    * [#25433](https://github.com/magento/magento2/issues/25433) -- Close (X) not working when error come for qty (fixed in [magento/magento2#25759](https://github.com/magento/magento2/pull/25759))
+    * [#26155](https://github.com/magento/magento2/issues/26155) -- Table quote column customer_note uses wrong type (fixed in [magento/magento2#26160](https://github.com/magento/magento2/pull/26160))
+    * [#761](https://github.com/magento/magento2/issues/761) -- A more verbose message when the db is not up to date.   (fixed in [magento/magento2#25864](https://github.com/magento/magento2/pull/25864))
+    * [#25974](https://github.com/magento/magento2/issues/25974) -- Amount of characters on a 'Area' Customizable Option counted differently on backend/frontend (fixed in [magento/magento2#26033](https://github.com/magento/magento2/pull/26033))
+    * [#25674](https://github.com/magento/magento2/issues/25674) -- Elasticsearch version selections in admin are overly broad (fixed in [magento/magento2#25838](https://github.com/magento/magento2/pull/25838))
+    * [#13136](https://github.com/magento/magento2/issues/13136) -- Error in vendor/magento/module-shipping/Model/Config/Source/Allmethods.php - public function toOptionArray (fixed in [magento/magento2#25315](https://github.com/magento/magento2/pull/25315))
+    * [#22047](https://github.com/magento/magento2/issues/22047) -- Magento CRON Job Names are missing in NewRelic: "Transaction Names" (fixed in [magento/magento2#25957](https://github.com/magento/magento2/pull/25957))
+    * [#26164](https://github.com/magento/magento2/issues/26164) -- Underline should not display on hover for delete icon at shopping cart Internet explorer browser (fixed in [magento/magento2#26173](https://github.com/magento/magento2/pull/26173))
+    * [#24972](https://github.com/magento/magento2/issues/24972) -- Special Price class not added in configurable product page (fixed in [magento/magento2#26170](https://github.com/magento/magento2/pull/26170))
+    * [#25659](https://github.com/magento/magento2/issues/25659) -- Paypal Payments Pro IPN keeping payments marked as Pending Payment (fixed in [magento/magento2#25876](https://github.com/magento/magento2/pull/25876))
+    * [#18717](https://github.com/magento/magento2/issues/18717) -- UrlRewrite removes query string from url, if url has trailing slash (fixed in [magento/magento2#25603](https://github.com/magento/magento2/pull/25603))
+    * [#26176](https://github.com/magento/magento2/issues/26176) -- Footer Newsletter input field width is not identical in Internet Explorer/EDGE browser compared with chrome (fixed in [magento/magento2#26182](https://github.com/magento/magento2/pull/26182))
+    * [#25390](https://github.com/magento/magento2/issues/25390) -- UPS carrier model getting error when create plugin in to Magento 2.3.3 compatibility (fixed in [magento/magento2#26130](https://github.com/magento/magento2/pull/26130))
+    * [#26083](https://github.com/magento/magento2/issues/26083) -- Problem when trying to unset additional data in payment method. (fixed in [magento/magento2#26084](https://github.com/magento/magento2/pull/26084))
+    * [#26064](https://github.com/magento/magento2/issues/26064) -- Incorrect Error Message While Sharing Wish list more than Specified Email Address Value in Admin Configuration (fixed in [magento/magento2#26066](https://github.com/magento/magento2/pull/26066))
+    * [#14663](https://github.com/magento/magento2/issues/14663) -- Updating Customer through rest/all/V1/customers/:id resets group_id if group_id not passed in payload (fixed in [magento/magento2#25958](https://github.com/magento/magento2/pull/25958))
+    * [#20966](https://github.com/magento/magento2/issues/20966) -- Elastic Search 5 Indexing Performance Issue (fixed in [magento/magento2#25452](https://github.com/magento/magento2/pull/25452))
+    * [#21684](https://github.com/magento/magento2/issues/21684) -- Currency sign for "Layered Navigation Price Step" is not according to default settings (fixed in [magento/magento2#24815](https://github.com/magento/magento2/pull/24815))
+    * [#24468](https://github.com/magento/magento2/issues/24468) -- Export Coupon Code Grid redirect to DashBoard when create New Cart Price Rule (fixed in [magento/magento2#24471](https://github.com/magento/magento2/pull/24471))
+    * [#22856](https://github.com/magento/magento2/issues/22856) -- Catalog pricerules are not working with custom options as expected in Magento 2.3.0 product details page (fixed in [magento/magento2#22917](https://github.com/magento/magento2/pull/22917))
+    * [#14001](https://github.com/magento/magento2/issues/14001) -- M2.2.3 directory_country_region_name locale fix? 8bytes zh_Hans_CN(11bytes) ca_ES_VALENCIA(14bytes) (fixed in [magento/magento2#26268](https://github.com/magento/magento2/pull/26268))
+    * [#23521](https://github.com/magento/magento2/issues/23521) -- Unable to run \Magento\Downloadable\Test\Unit\Helper\DownloadTest without internet connection / dns resolution (fixed in [magento/magento2#26264](https://github.com/magento/magento2/pull/26264))
+    * [#25936](https://github.com/magento/magento2/issues/25936) -- Regular Price Label Alignment Issues in Frontend (fixed in [magento/magento2#26237](https://github.com/magento/magento2/pull/26237))
+    * [#26227](https://github.com/magento/magento2/issues/26227) -- Need some space between input and update button Minicart (fixed in [magento/magento2#26234](https://github.com/magento/magento2/pull/26234))
+    * [#26208](https://github.com/magento/magento2/issues/26208) -- Sorting issue for status column for Cache Management (fixed in [magento/magento2#26215](https://github.com/magento/magento2/pull/26215))
+    * [#26206](https://github.com/magento/magento2/issues/26206) -- Missing information about currently reindexed index on failure (fixed in [magento/magento2#26207](https://github.com/magento/magento2/pull/26207))
+    * [#26181](https://github.com/magento/magento2/issues/26181) -- Out of stock text is not aligned properly with add to cart button at list page in responsive   (fixed in [magento/magento2#26183](https://github.com/magento/magento2/pull/26183))
+    * [#26168](https://github.com/magento/magento2/issues/26168) -- Input Checkbox Alignment Issue at checkout page in Safari Browser (fixed in [magento/magento2#26169](https://github.com/magento/magento2/pull/26169))
+    * [#19093](https://github.com/magento/magento2/issues/19093) -- API: salesOrderItemRepository does not include gift message (fixed in [magento/magento2#25946](https://github.com/magento/magento2/pull/25946))
+    * [#23350](https://github.com/magento/magento2/issues/23350) -- Add support for catching throwables in App/Bootstrap (fixed in [magento/magento2#25250](https://github.com/magento/magento2/pull/25250))
+    * [#26289](https://github.com/magento/magento2/issues/26289) -- Jump Datepicker in  Catalog Price Rule (fixed in [magento/magento2#26290](https://github.com/magento/magento2/pull/26290))
+    * [#22964](https://github.com/magento/magento2/issues/22964) -- Unable to save any dates if the user interface locale is not english (US) in 2.3.1 (fixed in [magento/magento2#26270](https://github.com/magento/magento2/pull/26270))
+    * [#14913](https://github.com/magento/magento2/issues/14913) -- bookmark views become uneditable after deleting the first bookmark view. (fixed in [magento/magento2#26263](https://github.com/magento/magento2/pull/26263))
+    * [#26217](https://github.com/magento/magento2/issues/26217) -- Wrong fields selection while using fragments on GraphQL products query (fixed in [magento/magento2#26218](https://github.com/magento/magento2/pull/26218))
+    * [#23899](https://github.com/magento/magento2/issues/23899) -- system.xml file validation issue (fixed in [magento/magento2#25985](https://github.com/magento/magento2/pull/25985))
+    * [#14971](https://github.com/magento/magento2/issues/14971) -- Improper Handling of Pagination SEO (fixed in [magento/magento2#25337](https://github.com/magento/magento2/pull/25337))
+    * [#22988](https://github.com/magento/magento2/issues/22988) -- Wrong behavior of grid row and checkbox click (fixed in [magento/magento2#22990](https://github.com/magento/magento2/pull/22990))
+    * [#7065](https://github.com/magento/magento2/issues/7065) -- page.main.title is translating title (fixed in [magento/magento2#26269](https://github.com/magento/magento2/pull/26269))
+    * [#11209](https://github.com/magento/magento2/issues/11209) -- Wishlist Add grouped product Error (fixed in [magento/magento2#26258](https://github.com/magento/magento2/pull/26258))
+    * [#26235](https://github.com/magento/magento2/issues/26235) -- Both Menu spacing should be same (fixed in [magento/magento2#26238](https://github.com/magento/magento2/pull/26238))
+    * [#25130](https://github.com/magento/magento2/issues/25130) -- Issue with reorder when disabled reorder setting from admin (fixed in [magento/magento2#26051](https://github.com/magento/magento2/pull/26051))
+    * [#25881](https://github.com/magento/magento2/issues/25881) -- Admin panel is not accessible after limited permissions set to at least one admin account (fixed in [magento/magento2#25909](https://github.com/magento/magento2/pull/25909))
+    * [#25373](https://github.com/magento/magento2/issues/25373) -- The 'promotion' region of the minicart is never rendered (fixed in [magento/magento2#25375](https://github.com/magento/magento2/pull/25375))
+    * [#25278](https://github.com/magento/magento2/issues/25278) -- Incorrect @return type at getSourceModel in Eav\Attribute (fixed in [magento/magento2#25333](https://github.com/magento/magento2/pull/25333))
+    * [#25188](https://github.com/magento/magento2/issues/25188) -- Magento 2.3: Import fails if configurable attribute has an equal sign in its value (fixed in [magento/magento2#25194](https://github.com/magento/magento2/pull/25194))
+    * [#22304](https://github.com/magento/magento2/issues/22304) -- [Grouped product] Can´t add simple products to cart if one other is out of stock (fixed in [magento/magento2#24955](https://github.com/magento/magento2/pull/24955))
+    * [#26331](https://github.com/magento/magento2/issues/26331) -- [ MFTF ] Mess in ActionGroups: invalid names, multiple nodes. (fixed in [magento/partners-magento2ee#120](https://github.com/magento/partners-magento2ee/pull/120) and [magento/partners-magento2ee#108](https://github.com/magento/partners-magento2ee/pull/108) and [magento/partners-magento2ee#107](https://github.com/magento/partners-magento2ee/pull/107) and [magento/partners-magento2ee#106](https://github.com/magento/partners-magento2ee/pull/106) and [magento/partners-magento2ee#104](https://github.com/magento/partners-magento2ee/pull/104) and [magento/partners-magento2ee#105](https://github.com/magento/partners-magento2ee/pull/105) and [magento/partners-magento2ee#119](https://github.com/magento/partners-magento2ee/pull/119) and [magento/magento2#26323](https://github.com/magento/magento2/pull/26323) and [magento/magento2#26321](https://github.com/magento/magento2/pull/26321) and [magento/partners-magento2ee#111](https://github.com/magento/partners-magento2ee/pull/111) and [magento/magento2#26320](https://github.com/magento/magento2/pull/26320) and [magento/magento2#26319](https://github.com/magento/magento2/pull/26319) and [magento/partners-magento2ee#109](https://github.com/magento/partners-magento2ee/pull/109) and [magento/magento2#26322](https://github.com/magento/magento2/pull/26322) and [magento/partners-magento2ee#121](https://github.com/magento/partners-magento2ee/pull/121) and [magento/partners-magento2ee#117](https://github.com/magento/partners-magento2ee/pull/117) and [magento/partners-magento2ee#116](https://github.com/magento/partners-magento2ee/pull/116) and [magento/magento2#25828](https://github.com/magento/magento2/pull/25828) and [magento/magento2#26329](https://github.com/magento/magento2/pull/26329))
+    * [#22909](https://github.com/magento/partners-magento2ee/issues/22909) -- requirejs/domReady.js can severely delay rendering of content (fixed in [magento/magento2#23313](https://github.com/magento/magento2/pull/23313) and [magento/partners-magento2ee#50](https://github.com/magento/partners-magento2ee/pull/50))
+    * [#26396](https://github.com/magento/magento2/issues/26396) -- MFTF: Functional Tests are failing in Magento CI process (fixed in [magento/magento2#26407](https://github.com/magento/magento2/pull/26407) and [magento/magento2#26395](https://github.com/magento/magento2/pull/26395))
+    * [#26364](https://github.com/magento/magento2/issues/26364) -- Add to Compare link not showing in mobile view under 640px (fixed in [magento/magento2#26424](https://github.com/magento/magento2/pull/26424) and [magento/magento2#26365](https://github.com/magento/magento2/pull/26365))
+    * [#25968](https://github.com/magento/magento2/issues/25968) -- `getPrice()` returns a string when setting custom price in admin order (fixed in [magento/magento2#26313](https://github.com/magento/magento2/pull/26313))
+    * [#26612](https://github.com/magento/magento2/issues/26612) -- MFTF: StorefrontApplyPromoCodeDuringCheckoutTest is failing in CI process (fixed in [magento/magento2#26614](https://github.com/magento/magento2/pull/26614))
+    * [#26437](https://github.com/magento/magento2/issues/26437) -- Viewing customer shopping cart in admin shows all products in catalog when there is no active quote (fixed in [magento/magento2#26489](https://github.com/magento/magento2/pull/26489))
+    * [#26479](https://github.com/magento/magento2/issues/26479) -- Bug: AutoloaderRegistry::getAutoloader returns array (fixed in [magento/magento2#26480](https://github.com/magento/magento2/pull/26480))
+    * [#25162](https://github.com/magento/magento2/issues/25162) -- Message at Frontend has No HTML format (fixed in [magento/magento2#26455](https://github.com/magento/magento2/pull/26455))
+    * [#25761](https://github.com/magento/magento2/issues/25761) -- Site map doesn't include home page (fixed in [magento/magento2#26445](https://github.com/magento/magento2/pull/26445))
+    * [#18012](https://github.com/magento/magento2/issues/18012) -- Can not add string to underscore template using knockout (fixed in [magento/magento2#26435](https://github.com/magento/magento2/pull/26435))
+    * [#25300](https://github.com/magento/magento2/issues/25300) -- Mobile view issue on category page - Sort By label overlaps with Shop By button (fixed in [magento/magento2#26381](https://github.com/magento/magento2/pull/26381))
+    * [#26275](https://github.com/magento/magento2/issues/26275) -- Whitespace between label and required star on Checkout page (fixed in [magento/magento2#26285](https://github.com/magento/magento2/pull/26285))
+    * [#26065](https://github.com/magento/magento2/issues/26065) -- Performance of isSalable method check on configurable product (fixed in [magento/magento2#26071](https://github.com/magento/magento2/pull/26071))
+    * [#21014](https://github.com/magento/magento2/issues/21014) -- Gallery Thumbnail (left/right) Scroll Performance Android Chrome Sluggish and Unresponsive (fixed in [magento/magento2#25839](https://github.com/magento/magento2/pull/25839))
+    * [#10518](https://github.com/magento/magento2/issues/10518) -- Mobile product page image jumps (fixed in [magento/magento2#25385](https://github.com/magento/magento2/pull/25385))
+    * [#21717](https://github.com/magento/magento2/issues/21717) -- Product view page scrolls up randomly on mobile device (fixed in [magento/magento2#25385](https://github.com/magento/magento2/pull/25385))
+    * [#25962](https://github.com/magento/magento2/issues/25962) -- Radio alignment issue (fixed in [magento/magento2#25966](https://github.com/magento/magento2/pull/25966))
+    * [#9466](https://github.com/magento/magento2/issues/9466) -- Duplicating product copies product images couple of hundred times (fixed in [magento/magento2#25875](https://github.com/magento/magento2/pull/25875))
+    * [#17125](https://github.com/magento/magento2/issues/17125) -- x-magento-init initialisation not bound to happen in the right order. (fixed in [magento/magento2#25764](https://github.com/magento/magento2/pull/25764))
+    * [#26610](https://github.com/magento/magento2/issues/26610) -- MFTF: AdminAddingNewOptionsWithImagesAndPricesToConfigurableProductTest is failing in CI process (fixed in [magento/magento2#26611](https://github.com/magento/magento2/pull/26611))
+    * [#26240](https://github.com/magento/magento2/issues/26240) -- Minimum Advertised Price doesn't change for selected swatch option for configurable product (fixed in [magento/magento2#26241](https://github.com/magento/magento2/pull/26241) and [magento/magento2#26317](https://github.com/magento/magento2/pull/26317))
+    * [#17847](https://github.com/magento/magento2/issues/17847) -- Wrong State Title, Displaying Status Label Rather than State (fixed in [magento/magento2#26569](https://github.com/magento/magento2/pull/26569))
+    * [#21555](https://github.com/magento/magento2/issues/21555) -- Anonyomus classes in 2.3 (test data provider) (fixed in [magento/magento2#26533](https://github.com/magento/magento2/pull/26533))
+    * [#26532](https://github.com/magento/magento2/issues/26532) -- di:setup:compile fails with anonymous classes (fixed in [magento/magento2#26533](https://github.com/magento/magento2/pull/26533))
+    * [#26332](https://github.com/magento/magento2/issues/26332) -- BeforeOrderPaymentSaveObserver override payment insructions with wrong store view config (fixed in [magento/magento2#26399](https://github.com/magento/magento2/pull/26399))
+    * [#25591](https://github.com/magento/magento2/issues/25591) -- & character in SKUs is shown as &amp; in current variations list on configurable products  (fixed in [magento/magento2#26007](https://github.com/magento/magento2/pull/26007))
+    * [#13865](https://github.com/magento/magento2/issues/13865) -- Safari "Block all cookies" setting breaks JavaScript scripts (fixed in [magento/magento2#25324](https://github.com/magento/magento2/pull/25324))
+    * [#26375](https://github.com/magento/magento2/issues/26375) -- Switching billing address causes Javascript function text to render in front-end checkout payment section (fixed in [magento/magento2#26378](https://github.com/magento/magento2/pull/26378))
+    * [#25032](https://github.com/magento/magento2/issues/25032) -- Display some error "We can't update your Wish List right now." at wish list (fixed in [magento/magento2#25641](https://github.com/magento/magento2/pull/25641))
+    * [#8691](https://github.com/magento/magento2/issues/8691) -- Language pack inheritance order is incorrect (fixed in [magento/magento2#26420](https://github.com/magento/magento2/pull/26420))
+    * [#25195](https://github.com/magento/magento2/issues/25195) -- Issue with tier price 0 when saving product second time (fixed in [magento/magento2#26162](https://github.com/magento/magento2/pull/26162))
+    * [#26622](https://github.com/magento/magento2/issues/26622) -- Fixed cart discount calculated incorrectly when product first added to cart. (fixed in [magento/magento2#26623](https://github.com/magento/magento2/pull/26623))
+    * [#26543](https://github.com/magento/magento2/issues/26543) -- My Wish List Product not showing properly between >768px and <1023px (fixed in [magento/magento2#26546](https://github.com/magento/magento2/pull/26546))
+    * [#25268](https://github.com/magento/magento2/issues/25268) -- $order->getCustomer() returns NULL for registered customer (fixed in [magento/magento2#26423](https://github.com/magento/magento2/pull/26423))
+    * [#26338](https://github.com/magento/magento2/issues/26338) -- Code cleanup for module xml extra end tag removed (fixed in [magento/magento2#26339](https://github.com/magento/magento2/pull/26339))
+    * [#26760](https://github.com/magento/magento2/issues/26760) -- Validate html error when enable critical css (fixed in [magento/magento2#26764](https://github.com/magento/magento2/pull/26764))
+    * [#14885](https://github.com/magento/magento2/issues/14885) -- Refactoring: Code duplication EmailSender / ShipmentSender and so on (fixed in [magento/magento2#26714](https://github.com/magento/magento2/pull/26714))
+    * [#863](https://github.com/magento/magento2/issues/863) -- How to switch base,thumbnail images in magento 2 back end  (fixed in [magento/magento2#26502](https://github.com/magento/magento2/pull/26502))
+    * [#26276](https://github.com/magento/magento2/issues/26276) -- Checkout. Quote Address Street cloning issue (fixed in [magento/magento2#26279](https://github.com/magento/magento2/pull/26279))
+    * [#26245](https://github.com/magento/magento2/issues/26245) -- Magento does not send an email about a refunded grouped product (fixed in [magento/magento2#26246](https://github.com/magento/magento2/pull/26246))
+    * [#26141](https://github.com/magento/magento2/issues/26141) -- Modal Popup and Custom subTitle erased (fixed in [magento/magento2#26142](https://github.com/magento/magento2/pull/26142))
+    * [#25487](https://github.com/magento/magento2/issues/25487) -- Redis cache grows unilimmited (fixed in [magento/magento2#25488](https://github.com/magento/magento2/pull/25488))
+    * [#25245](https://github.com/magento/magento2/issues/25245) -- Warning when Search Terms page is opened by clicking option  at the footer (fixed in [magento/magento2#25246](https://github.com/magento/magento2/pull/25246))
+    * [#24842](https://github.com/magento/magento2/issues/24842) -- Unable to delete custom option file in admin order create (fixed in [magento/magento2#24843](https://github.com/magento/magento2/pull/24843))
+    * [#847](https://github.com/magento/magento2/issues/847) -- Use cursor: pointer for the product online switcher (fixed in [magento/magento2#25991](https://github.com/magento/magento2/pull/25991))
+    * [#26843](https://github.com/magento/magento2/issues/26843) -- es_US Spanish (United States ) Locale is not supported in Magento 2.3.4 (fixed in [magento/magento2#26857](https://github.com/magento/magento2/pull/26857))
+    * [#26054](https://github.com/magento/magento2/issues/26054) -- Do not duplicate SEO meta data when duplicating a product (fixed in [magento/magento2#26659](https://github.com/magento/magento2/pull/26659))
+    * [#26314](https://github.com/magento/magento2/issues/26314) -- Minimum Advertised Prices duplicates for all configurable products with price from selected swatch (fixed in [magento/magento2#26317](https://github.com/magento/magento2/pull/26317))
+    * [#24547](https://github.com/magento/magento2/issues/24547) -- Magento\Customer\Model\Account\Redirect::setRedirectCookie() not properly working (fixed in [magento/magento2#24612](https://github.com/magento/magento2/pull/24612))
+    * [#26675](https://github.com/magento/magento2/issues/26675) -- Date incorrect on pdf invoice (fixed in [magento/magento2#26701](https://github.com/magento/magento2/pull/26701))
+    * [#25675](https://github.com/magento/magento2/issues/25675) -- Unable add product to cart in Magento 2.3.3 backend when stock quantity is 1 - "The requested qty is not available" (fixed in [magento/magento2#26650](https://github.com/magento/magento2/pull/26650))
+    * [#26583](https://github.com/magento/magento2/issues/26583) -- Product Detail Page - Tier price (fixed & discount) save percentage displaying wrong calculation (fixed in [magento/magento2#26584](https://github.com/magento/magento2/pull/26584))
+    * [#25963](https://github.com/magento/magento2/issues/25963) -- Grid Export rendered data is not reflecting in the exported File, Displayed ID instead of Rendered Label (fixed in [magento/magento2#26523](https://github.com/magento/magento2/pull/26523))
+    * [#26416](https://github.com/magento/magento2/issues/26416) -- Compare Products section not showing in mobile view under 767px (fixed in [magento/magento2#26418](https://github.com/magento/magento2/pull/26418))
+    * [#25656](https://github.com/magento/magento2/issues/25656) -- M2.3.2 : Nullable getters in Service Contracts will throw a reflection error when used in the web API  (fixed in [magento/magento2#25806](https://github.com/magento/magento2/pull/25806))
+    * [#24971](https://github.com/magento/magento2/issues/24971) -- Incorrect @var reference in docBlock of a class member variable (fixed in [magento/magento2#24976](https://github.com/magento/magento2/pull/24976))
+    * [#14958](https://github.com/magento/magento2/issues/14958) -- sale_sequence_* records are not removed on store view deletion (fixed in [magento/magento2#22296](https://github.com/magento/magento2/pull/22296))
+    * [#26607](https://github.com/magento/partners-magento2ee/issues/26607) -- MFTF: AdminReorderWithCatalogPriceTest is failing in CI process (fixed in [magento/magento2#26608](https://github.com/magento/magento2/pull/26608) and [magento/partners-magento2ee#135](https://github.com/magento/partners-magento2ee/pull/135))
+    * [#25856](https://github.com/magento/magento2/issues/25856) -- Ordered Products Report not grouping by configurable products variations (fixed in [magento/magento2#25858](https://github.com/magento/magento2/pull/25858))
+    * [#26973](https://github.com/magento/magento2/issues/26973) -- Fatal error on calling ImageFactory::create() for product_page_image_large (fixed in [magento/magento2#26974](https://github.com/magento/magento2/pull/26974))
+    * [#26917](https://github.com/magento/magento2/issues/26917) -- Tax rate Zip/Post range and check box alignment issue (fixed in [magento/magento2#26932](https://github.com/magento/magento2/pull/26932))
+    * [#26838](https://github.com/magento/magento2/issues/26838) -- Low stock report showing disabled products (fixed in [magento/magento2#26862](https://github.com/magento/magento2/pull/26862))
+    * [#26229](https://github.com/magento/magento2/issues/26229) -- Active menu is not set when opening admin path Marketing > User Content > Pending Reviews (fixed in [magento/magento2#26230](https://github.com/magento/magento2/pull/26230))
+    * [#25910](https://github.com/magento/magento2/issues/25910) -- Choose drop down not close when open another for upload file for swatch (fixed in [magento/magento2#26090](https://github.com/magento/magento2/pull/26090))
+    * [#13269](https://github.com/magento/magento2/issues/13269) -- Magento Framework Escaper - Critical log with special symbols (fixed in [magento/magento2#25895](https://github.com/magento/magento2/pull/25895))
+    * [#25738](https://github.com/magento/magento2/issues/25738) -- DOMDocument::loadHTML(): Tag date invalid in Entity (fixed in [magento/magento2#25895](https://github.com/magento/magento2/pull/25895))
+    * [#572](https://github.com/magento/magento2/issues/572) -- How do I: Bug tracking for Magento 1 + ideas for Magento 2 (fixed in [magento/magento2#25349](https://github.com/magento/magento2/pull/25349))
+    * [#26800](https://github.com/magento/magento2/issues/26800) -- Undefined variable $type in Product-Link Management (fixed in [magento/magento2#26979](https://github.com/magento/magento2/pull/26979))
+    * [#13252](https://github.com/magento/magento2/issues/13252) -- Fetching customer entity through API will not return 'is_subscribed' extension attribute (fixed in [magento/magento2#25311](https://github.com/magento/magento2/pull/25311))
+    * [#27044](https://github.com/magento/magento2/issues/27044) -- BUG: Category Repository get()'s argument `store_id` does not work (fixed in [magento/magento2#27048](https://github.com/magento/magento2/pull/27048))
+    * [#27040](https://github.com/magento/magento2/issues/27040) -- Images no longer responsive (fixed in [magento/magento2#27041](https://github.com/magento/magento2/pull/27041))
+    * [#17933](https://github.com/magento/magento2/issues/17933) -- Bank Transer Payment Instuctions switch back to default (fixed in [magento/magento2#26765](https://github.com/magento/magento2/pull/26765))
+    * [#23755](https://github.com/magento/magento2/issues/23755) -- Store view switcher is wrong , when each store views have different url. (fixed in [magento/magento2#26548](https://github.com/magento/magento2/pull/26548))
+    * [#26384](https://github.com/magento/magento2/issues/26384) -- Store switcher redirects to homepage for multistore setup with different domains (fixed in [magento/magento2#26548](https://github.com/magento/magento2/pull/26548))
+    * [#25243](https://github.com/magento/magento2/issues/25243) -- Numerical placeholder count in Phrase starts with %1, however js code assumes 0% (fixed in [magento/magento2#25359](https://github.com/magento/magento2/pull/25359))
+    * [#23619](https://github.com/magento/magento2/issues/23619) -- Less compilation extend 'mixin' has no matches (fixed in [magento/magento2#24003](https://github.com/magento/magento2/pull/24003))
+    * [#27032](https://github.com/magento/magento2/issues/27032) -- Add image lazy loading (fixed in [magento/magento2#27033](https://github.com/magento/magento2/pull/27033))
+    * [#25834](https://github.com/magento/magento2/issues/25834) -- Discount fixed amount whole cart applied mutiple time when customer use Check Out with Multiple Addresses (fixed in [magento/magento2#26419](https://github.com/magento/magento2/pull/26419))
+    * [#26989](https://github.com/magento/magento2/issues/26989) -- MFTF: Use Magento Cron for reindexing after creating data (fixed in [magento/magento2#26990](https://github.com/magento/magento2/pull/26990))
+    * [#27027](https://github.com/magento/magento2/issues/27027) -- Admin date of birth doesn't factor in user locale set (fixed in [magento/magento2#27149](https://github.com/magento/magento2/pull/27149))
+    * [#973](https://github.com/magento/magento2/issues/973) -- [Question] Add jenkins-ci ant build.xml and tool configurations to repository (fixed in [magento/magento2#27138](https://github.com/magento/magento2/pull/27138))
+    * [#26758](https://github.com/magento/magento2/issues/26758) -- cms-page-specific layouts are not applied if FullActionName differs from page_view (fixed in [magento/magento2#27131](https://github.com/magento/magento2/pull/27131))
+    * [#26847](https://github.com/magento/magento2/issues/26847) -- Hitting enter on create folder in media gallery refreshes the page (fixed in [magento/magento2#27029](https://github.com/magento/magento2/pull/27029))
+    * [#27009](https://github.com/magento/magento2/issues/27009) -- Missing variable outside CATCH causing a double-fault in Renderer.php  (fixed in [magento/magento2#27026](https://github.com/magento/magento2/pull/27026))
+    * [#26992](https://github.com/magento/magento2/issues/26992) -- Add New ratings Is active and checkbox alignment issue (fixed in [magento/magento2#27014](https://github.com/magento/magento2/pull/27014))
+    * [#20309](https://github.com/magento/magento2/issues/20309) -- URL Rewrites redirect loop (fixed in [magento/magento2#26902](https://github.com/magento/magento2/pull/26902))
+    * [#26648](https://github.com/magento/magento2/issues/26648) -- Table bottom border color different then thead and tbody border color (fixed in [magento/magento2#26649](https://github.com/magento/magento2/pull/26649))
+    * [#26590](https://github.com/magento/magento2/issues/26590) -- Customer registration multiple form submit (fixed in [magento/magento2#26642](https://github.com/magento/magento2/pull/26642))
+    * [#24637](https://github.com/magento/magento2/issues/24637) -- Chinese input in tinymce 4 (fixed in [magento/magento2#25454](https://github.com/magento/magento2/pull/25454))
+    * [#22609](https://github.com/magento/magento2/issues/22609) -- Since Magento 2.3 the wysiwyg image uploader incorrectly uses pub/media as storage root. (fixed in [magento/magento2#24878](https://github.com/magento/magento2/pull/24878))
+    * [#24735](https://github.com/magento/magento2/issues/24735) -- Image in minicart is blurred on iPhone (fixed in [magento/magento2#24743](https://github.com/magento/magento2/pull/24743))
+    * [#14086](https://github.com/magento/magento2/issues/14086) -- Guest cart API ignoring cartId in url for some methods (fixed in [magento/magento2#27172](https://github.com/magento/magento2/pull/27172))
+    * [#25219](https://github.com/magento/magento2/issues/25219) -- Custom attributes of images generated by Block\Product\ImageFactory don't render correctly (fixed in [magento/magento2#26959](https://github.com/magento/magento2/pull/26959))
+    * [#26499](https://github.com/magento/magento2/issues/26499) -- Product url key is not transliterated anymore if already set (fixed in [magento/magento2#26506](https://github.com/magento/magento2/pull/26506))
+    * [#25669](https://github.com/magento/magento2/issues/25669) -- health_check.php fails if any database cache engine configured (fixed in [magento/magento2#25722](https://github.com/magento/magento2/pull/25722))
+    * [#20472](https://github.com/magento/magento2/issues/20472) -- Special Price shown without currency symbol in magento backoffice (fixed in [magento/magento2#27261](https://github.com/magento/magento2/pull/27261))
+    * [#20906](https://github.com/magento/magento2/issues/20906) -- Magento backend catalog "Cost" without currency symbol (fixed in [magento/magento2#27261](https://github.com/magento/magento2/pull/27261))
+    * [#21910](https://github.com/magento/magento2/issues/21910) -- Magento backend catalog "MSRP" without currency symbol (fixed in [magento/magento2#27261](https://github.com/magento/magento2/pull/27261))
+    * [#4112](https://github.com/magento/magento2/issues/4112) -- Wrong parent category url_key in URL (fixed in [magento/magento2#26784](https://github.com/magento/magento2/pull/26784))
+    * [#11615](https://github.com/magento/magento2/issues/11615) -- URL Rewrites vs multiple storeviews - a never ending battle (fixed in [magento/magento2#26784](https://github.com/magento/magento2/pull/26784))
+    * [#11616](https://github.com/magento/magento2/issues/11616) -- URL Rewrites vs multiple storeviews - too many rewrites are being generated (fixed in [magento/magento2#26784](https://github.com/magento/magento2/pull/26784))
+    * [#25124](https://github.com/magento/magento2/issues/25124) -- Magento 2.3 Wrong product url for anchor categories for multiple storeviews (fixed in [magento/magento2#26784](https://github.com/magento/magento2/pull/26784))
+    * [#26393](https://github.com/magento/magento2/issues/26393) -- Product category url rewrite missing storeview specific url_key (fixed in [magento/magento2#26784](https://github.com/magento/magento2/pull/26784))
+    * [#26345](https://github.com/magento/magento2/issues/26345) -- Reorder in Admin panel leads to report page in case of changed product custom option max characters (fixed in [magento/magento2#26348](https://github.com/magento/magento2/pull/26348))
+    * [#26117](https://github.com/magento/magento2/issues/26117) -- "Current user does not have an active cart" even when he actually has one (fixed in [magento/magento2#27187](https://github.com/magento/magento2/pull/27187))
+    * [#26825](https://github.com/magento/magento2/issues/26825) -- Adding/updating image using API will not create thumbnail for admin products grid (fixed in [magento/magento2#27170](https://github.com/magento/magento2/pull/27170))
+    * [#27117](https://github.com/magento/partners-magento2ee/issues/27117) -- MFTF: Test names are not following Best Practices (`Test` suffix) (fixed in [magento/magento2#27118](https://github.com/magento/magento2/pull/27118) and [magento/partners-magento2ee#151](https://github.com/magento/partners-magento2ee/pull/151))
+    * [#26683](https://github.com/magento/magento2/issues/26683) -- Unable to execute addSimpleProduct mutation while other items out of stock (fixed in [magento/magento2#27015](https://github.com/magento/magento2/pull/27015))
+    * [#26963](https://github.com/magento/magento2/issues/26963) -- Missing JS file (critical-css-loader) in Magento 2.3.4 (fixed in [magento/magento2#26987](https://github.com/magento/magento2/pull/26987))
+    * [#26473](https://github.com/magento/magento2/issues/26473) -- BUG: Wrong selected product image when query url param configurable product (fixed in [magento/magento2#26560](https://github.com/magento/magento2/pull/26560))
+    * [#26856](https://github.com/magento/magento2/issues/26856) -- Wrong gallery main image and active preview after updating for configurable products. (fixed in [magento/magento2#26560](https://github.com/magento/magento2/pull/26560))
+    * [#26858](https://github.com/magento/magento2/issues/26858) -- Wrong gallery behavior when query url param configurable product (fixed in [magento/magento2#26560](https://github.com/magento/magento2/pull/26560))
+    * [#22251](https://github.com/magento/magento2/issues/22251) -- Admin Order - Email is Now Required - Magento 2.2.6 (fixed in [magento/magento2#24479](https://github.com/magento/magento2/pull/24479))
+    * [#24704](https://github.com/magento/magento2/issues/24704) -- Saving CMS Page Title from REST web API makes content empty (fixed in [magento/magento2#27237](https://github.com/magento/magento2/pull/27237))
+    * [#26827](https://github.com/magento/magento2/issues/26827) -- 500 when creating new product after adding attribute via API and assigning to attribute set via UI (fixed in [magento/magento2#27191](https://github.com/magento/magento2/pull/27191))
+    * [#27124](https://github.com/magento/magento2/issues/27124) -- Share Wishlist Email: Image Logic Issue (fixed in [magento/magento2#27125](https://github.com/magento/magento2/pull/27125))
+    * [#27335](https://github.com/magento/magento2/issues/27335) -- My account Address Book Additional Address Entries table issue (fixed in [magento/magento2#27336](https://github.com/magento/magento2/pull/27336))
+    * [#14080](https://github.com/magento/magento2/issues/14080) -- Category path is the same as key producing duplicate URL issue (fixed in [magento/magento2#27304](https://github.com/magento/magento2/pull/27304))
+    * [#26708](https://github.com/magento/magento2/issues/26708) -- ORDER BY has two similar conditions (fixed in [magento/magento2#27263](https://github.com/magento/magento2/pull/27263))
+    * [#26745](https://github.com/magento/magento2/issues/26745) -- OrderPaymentInterface is missing setAdditionalInformation() (fixed in [magento/magento2#26748](https://github.com/magento/magento2/pull/26748))
+    * [#26335](https://github.com/magento/magento2/issues/26335) -- Update zendframework to laminas (fixed in [magento/magento2#26436](https://github.com/magento/magento2/pull/26436))
+    * [#186](https://github.com/magento/magento2/issues/186) -- Indexing product (on save) should be done after committing the transaction (fixed in [magento/magento2#26923](https://github.com/magento/magento2/pull/26923))
+    * [#26224](https://github.com/magento/magento2/issues/26224) -- Cache type without "instance" causes exception when disabling the module through "Cache Management" in the backend (fixed in [magento/magento2#27307](https://github.com/magento/magento2/pull/27307))
+    * [#25540](https://github.com/magento/magento2/issues/25540) -- Products are not displaying infront end after updating product via importing CSV. (fixed in [magento/magento2#25664](https://github.com/magento/magento2/pull/25664))
+    * [#22010](https://github.com/magento/magento2/issues/22010) -- 22010 -Updates AbstractExtensibleObject and AbstractExtensibleModel annotations (fixed in [magento/magento2#22011](https://github.com/magento/magento2/pull/22011))
+    * [#22363](https://github.com/magento/magento2/issues/22363) -- Layered navigation breaks HTML5 Validation (fixed in [magento/magento2#26055](https://github.com/magento/magento2/pull/26055))
+    * [#26884](https://github.com/magento/magento2/issues/26884) -- Customer address is duplicated after setBillingAddressOnCart GraphQL mutation. (fixed in [magento/magento2#27107](https://github.com/magento/magento2/pull/27107))
+    * [#26742](https://github.com/magento/magento2/issues/26742) -- graphql mutation setShippingMethodsOnCart get wrong data in available_shipping_methods. (fixed in [magento/magento2#27004](https://github.com/magento/magento2/pull/27004))
+    * [#13689](https://github.com/magento/magento2/issues/13689) -- Cannot create catagory's name with thai langauge (fixed in [magento/magento2#27412](https://github.com/magento/magento2/pull/27412))
+    * [#27370](https://github.com/magento/magento2/issues/27370) -- Internet explorer issue:Default billing/shipping address not showing (fixed in [magento/magento2#27383](https://github.com/magento/magento2/pull/27383))
+    * [#27086](https://github.com/magento/magento2/issues/27086) -- Report Value doesn't matching -  "Year-To-Date Starts" (fixed in [magento/magento2#27088](https://github.com/magento/magento2/pull/27088))
+    * [#22833](https://github.com/magento/magento2/issues/22833) -- Short-term admin accounts (fixed in [magento/magento2#22837](https://github.com/magento/magento2/pull/22837))
+    * [#6310](https://github.com/magento/magento2/issues/6310) -- Changing products 'this item has weight' using 'Update Attributes' is not possible (fixed in [magento/magento2#26075](https://github.com/magento/magento2/pull/26075))
+    * [#16315](https://github.com/magento/magento2/issues/16315) -- Product save with onthefly index ignores website assignments (fixed in [magento/magento2#27365](https://github.com/magento/magento2/pull/27365))
+    * [#26762](https://github.com/magento/magento2/issues/26762) -- undefined index db-ssl-verify (fixed in [magento/magento2#26763](https://github.com/magento/magento2/pull/26763))
+    * [#26652](https://github.com/magento/magento2/issues/26652) -- In the minicart edit and remove icon is not aligned. (fixed in [magento/magento2#27493](https://github.com/magento/magento2/pull/27493))
+    * [#1002](https://github.com/magento/magento2/issues/1002) -- Database Schema: Incorrect Unique Indexes (fixed in [magento/magento2#27399](https://github.com/magento/magento2/pull/27399))
+    * [#24990](https://github.com/magento/magento2/issues/24990) -- Admin Panel logo link is not directing to admin dashboard page (fixed in [magento/magento2#26100](https://github.com/magento/magento2/pull/26100))
+    * [#27500](https://github.com/magento/magento2/issues/27500) -- Unit Tests incompatible with PHPUnit 8 (fixed in [magento/magento2#27521](https://github.com/magento/magento2/pull/27521) and [magento/magento2#27519](https://github.com/magento/magento2/pull/27519) and [magento/magento2#27627](https://github.com/magento/magento2/pull/27627) and [magento/magento2#27522](https://github.com/magento/magento2/pull/27522))
+    * [#27496](https://github.com/magento/magento2/issues/27496) -- The store logo is missing when using the Magento_blank theme (fixed in [magento/magento2#27497](https://github.com/magento/magento2/pull/27497))
+    * [#27169](https://github.com/magento/magento2/issues/27169) -- Not able to update value with "use default checkbox" for Downloadable Product's Sample and Links Title. (fixed in [magento/magento2#27295](https://github.com/magento/magento2/pull/27295))
+    * [#27320](https://github.com/magento/magento2/issues/27320) -- MFTF: Functional Tests failing due to missing data in indexes (fixed in [magento/magento2#27322](https://github.com/magento/magento2/pull/27322) and [magento/magento2#27321](https://github.com/magento/magento2/pull/27321) and [magento/magento2#27323](https://github.com/magento/magento2/pull/27323))
+    * [#171](https://github.com/magento/partners-magento2ee/issues/171) -- CMS Page modifications are not being reported in Action Log (fixed in [magento/magento2#27597](https://github.com/magento/magento2/pull/27597) and [magento/partners-magento2ee#172](https://github.com/magento/partners-magento2ee/pull/172))
+    * [#13851](https://github.com/magento/magento2/issues/13851) -- Credit doesn't recognize amount after comma (fixed in [magento/magento2#27343](https://github.com/magento/magento2/pull/27343))
+    * [#26986](https://github.com/magento/magento2/issues/26986) -- REST API Pagination Does not work as expected (fixed in [magento/magento2#26988](https://github.com/magento/magento2/pull/26988))
+    * [#27638](https://github.com/magento/partners-magento2ee/issues/27638) -- PHPUnit Tests bundled with Magento fatal errors (fixed in [magento/magento2#27701](https://github.com/magento/magento2/pull/27701) and [magento/partners-magento2ee#178](https://github.com/magento/partners-magento2ee/pull/178))
+    * [#27506](https://github.com/magento/magento2/issues/27506) -- Viewport resizing on search input focus on iphone (fixed in [magento/magento2#27603](https://github.com/magento/magento2/pull/27603))
+    * [#27607](https://github.com/magento/magento2/issues/27607) -- Integration Tests: DOM Assertion class (fixed in [magento/magento2#27606](https://github.com/magento/magento2/pull/27606))
+    * [#27299](https://github.com/magento/magento2/issues/27299) -- Integration Tests: Consecutive `dispatch($uri)` on Test AbstractController fails (fixed in [magento/magento2#27300](https://github.com/magento/magento2/pull/27300))
+    * [#27920](https://github.com/magento/magento2/issues/27920) -- [2.3.5] Incorrect html structure after MC-30989 (fixed in [magento/magento2#27926](https://github.com/magento/magento2/pull/27926))
+    * [#25769](https://github.com/magento/magento2/issues/25769) -- Arabic invoice pdf issue Magento 2.3.0 showing as Arabic letters but not correct  (fixed in [magento/magento2#27887](https://github.com/magento/magento2/pull/27887))
+    * [#27874](https://github.com/magento/magento2/issues/27874) -- Vat Validation URL for EU Vat numbers changed. (Vies Service) (fixed in [magento/magento2#27886](https://github.com/magento/magento2/pull/27886))
+    * [#27089](https://github.com/magento/magento2/issues/27089) -- BUG: `getDefaultLimitPerPageValue` returns value that is not available (fixed in [magento/magento2#27093](https://github.com/magento/magento2/pull/27093))
+    * [#1270](https://github.com/magento/magento2/issues/1270) -- back button not working in edit order status (fixed in [magento/magento2#27976](https://github.com/magento/magento2/pull/27976))
+    * [#27897](https://github.com/magento/magento2/issues/27897) -- MFTF: Inconsistent case in Section name (fixed in [magento/magento2#27955](https://github.com/magento/magento2/pull/27955))
+    * [#27503](https://github.com/magento/magento2/issues/27503) -- MFTF: Acceptance tests break the naming convention (fixed in [magento/magento2#27515](https://github.com/magento/magento2/pull/27515))
+* GitHub pull requests:
+    * [magento/magento2#25905](https://github.com/magento/magento2/pull/25905) -- [Checkout] Cover DirectoryData by Unit Test (by @edenduong)
+    * [magento/magento2#25808](https://github.com/magento/magento2/pull/25808) -- No marginal white space validation added (by @ajithkumar-maragathavel)
+    * [magento/magento2#25790](https://github.com/magento/magento2/pull/25790) -- Don't disable FPC for maintenance, instead send "no cache" headers (by @Parakoopa)
+    * [magento/magento2#25774](https://github.com/magento/magento2/pull/25774) -- [Config] Giving the possibility to have a config dependency based on empty config value (by @eduard13)
+    * [magento/magento2#25604](https://github.com/magento/magento2/pull/25604) -- Moving Ui message.js hide speed and timeout into variables for easier… (by @edward-simpson)
+    * [magento/magento2#25541](https://github.com/magento/magento2/pull/25541) -- Removes hardcoded references to country selector component (by @krzksz)
+    * [magento/magento2#25939](https://github.com/magento/magento2/pull/25939) -- [ProductAlert] Cover Helper Data by Unit Test (by @edenduong)
+    * [magento/magento2#25928](https://github.com/magento/magento2/pull/25928) -- [Variable] Cover Variable Data Model by Unit Test (by @edenduong)
+    * [magento/magento2#25913](https://github.com/magento/magento2/pull/25913) -- [Backend] Covering the Backend Grid Decoding Helper by UnitTest (by @eduard13)
+    * [magento/magento2#25822](https://github.com/magento/magento2/pull/25822) -- MFTF: Extract Action Groups to separate files - magento/module-import-export (by @lbajsarowicz)
+    * [magento/magento2#25812](https://github.com/magento/magento2/pull/25812) -- MFTF: Extract Action Groups to separate files - magento/module-reports (by @lbajsarowicz)
+    * [magento/magento2#25803](https://github.com/magento/magento2/pull/25803) -- MFTF: Extract Action Groups to separate files - magento/module-shipping (by @lbajsarowicz)
+    * [magento/magento2#25791](https://github.com/magento/magento2/pull/25791) -- MFTF: Extract Action Groups to separate files - magento/module-widget (by @lbajsarowicz)
+    * [magento/magento2#25792](https://github.com/magento/magento2/pull/25792) -- MFTF: Extract Action Groups to separate files - magento/module-variable (by @lbajsarowicz)
+    * [magento/magento2#25765](https://github.com/magento/magento2/pull/25765) -- Magento#25739: fixed issue "grunt clean does not clean generated folder" (by @andrewbess)
+    * [magento/magento2#25655](https://github.com/magento/magento2/pull/25655) -- Add escaping on meta properties for open graph (by @NathMorgan)
+    * [magento/magento2#25952](https://github.com/magento/magento2/pull/25952) -- Resolve queue_consumer.xml doesn't allow numbers in handler class issue25731 (by @edenduong)
+    * [magento/magento2#25942](https://github.com/magento/magento2/pull/25942) -- Resolve Email address mismatch with text in iPad(768) view issue25935 (by @edenduong)
+    * [magento/magento2#25932](https://github.com/magento/magento2/pull/25932) -- Resolve Refresh Statistics: Updated At = Null should be display as "Never" instead of "undefined". issue25931 (by @edenduong)
+    * [magento/magento2#25926](https://github.com/magento/magento2/pull/25926) -- Resolve Duplicate Records when sorting column in Content->Themes Grid issue25925 (by @edenduong)
+    * [magento/magento2#25918](https://github.com/magento/magento2/pull/25918) -- [Ui] Adding admin class for password input type. (by @eduard13)
+    * [magento/magento2#25912](https://github.com/magento/magento2/pull/25912) -- Category filters - Fix notice on incorrect price param (by @ihor-sviziev)
+    * [magento/magento2#25995](https://github.com/magento/magento2/pull/25995) -- Updating wee -> weee in Magento_Weee README (by @MellenIO)
+    * [magento/magento2#25984](https://github.com/magento/magento2/pull/25984) -- [Customer] Cover CustomerData\Customer and CustomerData\JsLayoutDataProviderPool by Unit Test (by @edenduong)
+    * [magento/magento2#25982](https://github.com/magento/magento2/pull/25982) -- [Catalog] Cover Price Validation Result class by Unit Test (by @edenduong)
+    * [magento/magento2#25954](https://github.com/magento/magento2/pull/25954) -- Refactor: Add method hints to Tracking Status (by @lbajsarowicz)
+    * [magento/magento2#25924](https://github.com/magento/magento2/pull/25924) -- Resolve A "500 (Internal Server Error)" appears in Developer Console if Delete the image that is added to Page Content issue25893 (by @edenduong)
+    * [magento/magento2#25904](https://github.com/magento/magento2/pull/25904) -- Resolve issue 25896: Cannot create folder using only letters (by @edenduong)
+    * [magento/magento2#25723](https://github.com/magento/magento2/pull/25723) -- Fix #24713 - Symbol of the Belarusian currency BYR is outdated (by @Bartlomiejsz)
+    * [magento/magento2#25699](https://github.com/magento/magento2/pull/25699) -- magento/magento2#23481: Billing/Shipping Address edit form design update from order backend (by @alexey-rakitin)
+    * [magento/magento2#25262](https://github.com/magento/magento2/pull/25262) -- Allow autoplay for vimeo thumb click (by @philkun)
+    * [magento/magento2#26016](https://github.com/magento/magento2/pull/26016) -- [DownloadableImportExport] Cover Helper Data by Unit Test (by @edenduong)
+    * [magento/magento2#25997](https://github.com/magento/magento2/pull/25997) -- [Newsletter] Refactor code and Cover Model/Observer class by Unit Test (by @edenduong)
+    * [magento/magento2#25993](https://github.com/magento/magento2/pull/25993) -- [InstantPurchase] Cover Ui/CustomerAddressesFormatter and Ui/ShippingMethodFormatter by Unit Test (by @edenduong)
+    * [magento/magento2#25992](https://github.com/magento/magento2/pull/25992) -- Cover magento/magento2#25556 with jasmine test (by @Nazar65)
+    * [magento/magento2#25973](https://github.com/magento/magento2/pull/25973) -- [Removed spacing in submenu on hover desktop] (by @hitesh-wagento)
+    * [magento/magento2#25975](https://github.com/magento/magento2/pull/25975) -- phpdoc fix return type (by @maslii)
+    * [magento/magento2#25624](https://github.com/magento/magento2/pull/25624) -- Add right arrow to show some items have children (by @fredden)
+    * [magento/magento2#25114](https://github.com/magento/magento2/pull/25114) -- Added translate for strings and added missing node in existing translate attribute on xml. (by @sanganinamrata)
+    * [magento/magento2#25587](https://github.com/magento/magento2/pull/25587) -- Refactor JavaScript mixins module (by @krzksz)
+    * [magento/magento2#26069](https://github.com/magento/magento2/pull/26069) -- [CMS] Improving the test coverage for UrlBuilder ViewModel  (by @eduard13)
+    * [magento/magento2#26067](https://github.com/magento/magento2/pull/26067) -- [Msrp] Cover MsrpPriceCalculator by Unit Test (by @edenduong)
+    * [magento/magento2#26063](https://github.com/magento/magento2/pull/26063) -- [Theme] Reverting removed container class (by @eduard13)
+    * [magento/magento2#26057](https://github.com/magento/magento2/pull/26057) -- [Contact] covered Model Config by Unit Test (by @srsathish92)
+    * [magento/magento2#26050](https://github.com/magento/magento2/pull/26050) -- [Catalog] covered product ViewModel AddToCompareAvailability by Unit Test (by @srsathish92)
+    * [magento/magento2#26044](https://github.com/magento/magento2/pull/26044) -- Set empty value to color picker when input is reset to update preview (by @gperis)
+    * [magento/magento2#26045](https://github.com/magento/magento2/pull/26045) -- [Downloadable] Cover Helper Data by Unit Test (by @edenduong)
+    * [magento/magento2#26042](https://github.com/magento/magento2/pull/26042) -- [Catalog] Cover Component/FilterFactory by Unit Test (by @edenduong)
+    * [magento/magento2#26043](https://github.com/magento/magento2/pull/26043) -- [Persistent] Cover CustomerData by Unit Test (by @edenduong)
+    * [magento/magento2#26037](https://github.com/magento/magento2/pull/26037) -- Fixes phpcs  errors and warnings for Magento\Framework\View\Element (by @krisdante)
+    * [magento/magento2#26034](https://github.com/magento/magento2/pull/26034) -- MAGETWO-95866 Add horizontal scroll if elements extend menu's width (by @ptylek)
+    * [magento/magento2#26003](https://github.com/magento/magento2/pull/26003) -- [Directory] Cover action directory/json/countryRegion by Integration Test (by @edenduong)
+    * [magento/magento2#26001](https://github.com/magento/magento2/pull/26001) -- Fix caching Magento Metadata getVersion (by @luklewluk)
+    * [magento/magento2#25940](https://github.com/magento/magento2/pull/25940) -- Asynchronous operation validate (by @sedonik)
+    * [magento/magento2#25697](https://github.com/magento/magento2/pull/25697) -- [New Relic] Making system configs dependent by Enabled field (by @eduard13)
+    * [magento/magento2#25523](https://github.com/magento/magento2/pull/25523) -- Contact form > Adding ViewModel (by @rafaelstz)
+    * [magento/magento2#24360](https://github.com/magento/magento2/pull/24360) -- #24357 Eav sort order by attribute option_id (by @tnsezer)
+    * [magento/magento2#26060](https://github.com/magento/magento2/pull/26060) -- [Backend] Cover Dashboard Helper Data by Unit Test (by @edenduong)
+    * [magento/magento2#26059](https://github.com/magento/magento2/pull/26059) -- [Downloadable] Cover the Observer SetHasDownloadableProductsObserver by Unit Test (by @edenduong)
+    * [magento/magento2#26058](https://github.com/magento/magento2/pull/26058) -- Fixed typo: "reviwGrid" to "reviewGrid" (by @matheusgontijo)
+    * [magento/magento2#26011](https://github.com/magento/magento2/pull/26011) -- Fixed the issue 25930 (by @divyajyothi5321)
+    * [magento/magento2#26004](https://github.com/magento/magento2/pull/26004) -- [Backend] Cover action admin/dashboard/ajaxBlock by Integration Test (by @edenduong)
+    * [magento/magento2#25920](https://github.com/magento/magento2/pull/25920) -- Code refactor in Catalog ViewModel Breadcrumbs (by @srsathish92)
+    * [magento/magento2#26082](https://github.com/magento/magento2/pull/26082) -- [GiftMessage] Cover Observer SalesEventOrderItemToQuoteItemObserver by Unit Test (by @edenduong)
+    * [magento/magento2#26076](https://github.com/magento/magento2/pull/26076) -- [Search] Cover SynonymActions Column by Unit Test (by @edenduong)
+    * [magento/magento2#26068](https://github.com/magento/magento2/pull/26068) -- [GoogleAnalytics] covered Helper Data by Unit Test (by @srsathish92)
+    * [magento/magento2#26009](https://github.com/magento/magento2/pull/26009) -- Refactor: Add information about the path that is not allowed (by @lbajsarowicz)
+    * [magento/magento2#25759](https://github.com/magento/magento2/pull/25759) -- fixed issue 25433 (by @Ashna-Jahan)
+    * [magento/magento2#25854](https://github.com/magento/magento2/pull/25854) -- MFTF: Extract Action Groups to separate files - magento/module-catalog (by @lbajsarowicz)
+    * [magento/magento2#25846](https://github.com/magento/magento2/pull/25846) -- MFTF: Extract Action Groups to separate files - magento/module-catalog-import-export (by @lbajsarowicz)
+    * [magento/magento2#25845](https://github.com/magento/magento2/pull/25845) -- MFTF: Extract Action Groups to separate files - magento/module-catalog-inventory (by @lbajsarowicz)
+    * [magento/magento2#25844](https://github.com/magento/magento2/pull/25844) -- MFTF: Extract Action Groups to separate files - magento/module-catalog-rule (by @lbajsarowicz)
+    * [magento/magento2#25842](https://github.com/magento/magento2/pull/25842) -- MFTF: Extract Action Groups to separate files - magento/module-catalog-search (by @lbajsarowicz)
+    * [magento/magento2#25841](https://github.com/magento/magento2/pull/25841) -- MFTF: Extract Action Groups to separate files - magento/module-checkout (by @lbajsarowicz)
+    * [magento/magento2#25831](https://github.com/magento/magento2/pull/25831) -- MFTF: Extract Action Groups to separate files - magento/module-config (by @lbajsarowicz)
+    * [magento/magento2#25836](https://github.com/magento/magento2/pull/25836) -- MFTF: Extract Action Groups to separate files - magento/module-cms (by @lbajsarowicz)
+    * [magento/magento2#25830](https://github.com/magento/magento2/pull/25830) -- MFTF: Extract Action Groups to separate files - magento/module-configurable-product (by @lbajsarowicz)
+    * [magento/magento2#25829](https://github.com/magento/magento2/pull/25829) -- MFTF: Extract Action Groups to separate files - magento/module-currency-symbol (by @lbajsarowicz)
+    * [magento/magento2#25825](https://github.com/magento/magento2/pull/25825) -- MFTF: Extract Action Groups to separate files - magento/module-downloadable (by @lbajsarowicz)
+    * [magento/magento2#25823](https://github.com/magento/magento2/pull/25823) -- MFTF: Extract Action Groups to separate files - magento/module-email (by @lbajsarowicz)
+    * [magento/magento2#25821](https://github.com/magento/magento2/pull/25821) -- MFTF: Extract Action Groups to separate files - magento/module-grouped-product (by @lbajsarowicz)
+    * [magento/magento2#25819](https://github.com/magento/magento2/pull/25819) -- MFTF: Extract Action Groups to separate files - magento/module-multishipping (by @lbajsarowicz)
+    * [magento/magento2#25820](https://github.com/magento/magento2/pull/25820) -- MFTF: Extract Action Groups to separate files - magento/module-indexer (by @lbajsarowicz)
+    * [magento/magento2#25818](https://github.com/magento/magento2/pull/25818) -- MFTF: Extract Action Groups to separate files - magento/module-newsletter (by @lbajsarowicz)
+    * [magento/magento2#25817](https://github.com/magento/magento2/pull/25817) -- MFTF: Replace redundant Action Group with proper one - magento/module-page-cache (by @lbajsarowicz)
+    * [magento/magento2#25816](https://github.com/magento/magento2/pull/25816) -- MFTF: Extract Action Groups to separate files - magento/module-paypal (by @lbajsarowicz)
+    * [magento/magento2#25815](https://github.com/magento/magento2/pull/25815) -- MFTF: Extract Action Groups to separate files - magento/module-persistent (by @lbajsarowicz)
+    * [magento/magento2#25813](https://github.com/magento/magento2/pull/25813) -- MFTF: Extract Action Groups to separate files - magento/module-product-video (by @lbajsarowicz)
+    * [magento/magento2#25811](https://github.com/magento/magento2/pull/25811) -- MFTF: Extract Action Groups to separate files - magento/module-sales (by @lbajsarowicz)
+    * [magento/magento2#25807](https://github.com/magento/magento2/pull/25807) -- MFTF: Extract Action Groups to separate files - magento/module-sales-rule (by @lbajsarowicz)
+    * [magento/magento2#25804](https://github.com/magento/magento2/pull/25804) -- MFTF: Extract Action Groups to separate files - magento/module-search (by @lbajsarowicz)
+    * [magento/magento2#25802](https://github.com/magento/magento2/pull/25802) -- MFTF: Extract Action Groups to separate files - magento/module-store (by @lbajsarowicz)
+    * [magento/magento2#25800](https://github.com/magento/magento2/pull/25800) -- MFTF: Extract Action Groups to separate files - magento/module-swatches (by @lbajsarowicz)
+    * [magento/magento2#25799](https://github.com/magento/magento2/pull/25799) -- MFTF: Extract Action Groups to separate files - magento/module-tax (by @lbajsarowicz)
+    * [magento/magento2#25797](https://github.com/magento/magento2/pull/25797) -- MFTF: Extract Action Groups to separate files - magento/module-ui (by @lbajsarowicz)
+    * [magento/magento2#25794](https://github.com/magento/magento2/pull/25794) -- MFTF: Extract Action Groups to separate files - magento/module-url-rewrite (by @lbajsarowicz)
+    * [magento/magento2#25793](https://github.com/magento/magento2/pull/25793) -- MFTF: Extract Action Groups to separate files - magento/module-user (by @lbajsarowicz)
+    * [magento/magento2#25788](https://github.com/magento/magento2/pull/25788) -- MFTF: Extract Action Groups to separate files - magento/module-wishlist (by @lbajsarowicz)
+    * [magento/magento2#25787](https://github.com/magento/magento2/pull/25787) -- MFTF: Extract Action Groups to separate files - magento/module-bundle (by @lbajsarowicz)
+    * [magento/magento2#25784](https://github.com/magento/magento2/pull/25784) -- MFTF: Extract Action Groups to separate files - magento/module-braintree (by @lbajsarowicz)
+    * [magento/magento2#25783](https://github.com/magento/magento2/pull/25783) -- MFTF: Extract Action Groups to separate files - magento/module-backup (by @lbajsarowicz)
+    * [magento/magento2#26157](https://github.com/magento/magento2/pull/26157) -- Remove blank space at the end of label (by @gihovani)
+    * [magento/magento2#26160](https://github.com/magento/magento2/pull/26160) -- Changing the data type for quote column customer_note (by @ravi-chandra3197)
+    * [magento/magento2#26154](https://github.com/magento/magento2/pull/26154) -- [LayeredNavigation] Covering the ProductAttributeGridBuildObserver for LayeredNavigation … (by @eduard13)
+    * [magento/magento2#26150](https://github.com/magento/magento2/pull/26150) -- [CatalogInventory] Covering the InvalidatePriceIndexUponConfigChangeObserver for Catalog… (by @eduard13)
+    * [magento/magento2#26148](https://github.com/magento/magento2/pull/26148) -- [Bundle] Covering the SetAttributeTabBlockObserver for Bundles by Unit Test (by @eduard13)
+    * [magento/magento2#26140](https://github.com/magento/magento2/pull/26140) -- [ImportExport] Cover Export Source Model by Unit Test (by @edenduong)
+    * [magento/magento2#26136](https://github.com/magento/magento2/pull/26136) -- Code refactor, updated Unit Test with JsonHexTag Serializer (by @srsathish92)
+    * [magento/magento2#26128](https://github.com/magento/magento2/pull/26128) -- Refactor Magento Version module (+ Unit Tests) (by @lbajsarowicz)
+    * [magento/magento2#26127](https://github.com/magento/magento2/pull/26127) -- [Weee] Cover Weee Plugin by Unit Test (by @edenduong)
+    * [magento/magento2#26096](https://github.com/magento/magento2/pull/26096) -- [Checkout] Covering the ResetQuoteAddresses by Unit Test (by @eduard13)
+    * [magento/magento2#26028](https://github.com/magento/magento2/pull/26028) -- Refactor: Remove deprecated methods (by @andrewbess)
+    * [magento/magento2#25864](https://github.com/magento/magento2/pull/25864) -- Adobe stock integration Issue-761: Highlight the selected image in the grid (by @serhiyzhovnir)
+    * [magento/magento2#24849](https://github.com/magento/magento2/pull/24849) -- Simplify some conditional checks (by @DanielRuf)
+    * [magento/magento2#26131](https://github.com/magento/magento2/pull/26131) -- Reduce sleep time for Unit Test of Consumer to 0 seconds (by @lbajsarowicz)
+    * [magento/magento2#26126](https://github.com/magento/magento2/pull/26126) -- [WeeeGraphQl] Covering the FixedProductTax (by @lbajsarowicz)
+    * [magento/magento2#26129](https://github.com/magento/magento2/pull/26129) -- Refactor / Cleanup: `use` section does not need leading backslash (by @lbajsarowicz)
+    * [magento/magento2#26125](https://github.com/magento/magento2/pull/26125) -- [WishlistGraphQL] Covering the CustomerWishlistResolver (by @lbajsarowicz)
+    * [magento/magento2#26033](https://github.com/magento/magento2/pull/26033) -- Normalize new line symbols in Product Text Option (type=area) (by @Leone)
+    * [magento/magento2#25915](https://github.com/magento/magento2/pull/25915) --  Tests for: magento/magento2#24907, magento/magento2#25051, magento/magento2#25149, magento/magento2#24973, magento/magento2#25666. (by @p-bystritsky)
+    * [magento/magento2#25838](https://github.com/magento/magento2/pull/25838) -- [FIXES] #25674: Elasticsearch version selections in admin are overly … (by @mautz-et-tong)
+    * [magento/magento2#25315](https://github.com/magento/magento2/pull/25315) -- Error in vendor/magento/module-shipping/Model/Config/Source/Allmethod… (by @mrodespin)
+    * [magento/magento2#25957](https://github.com/magento/magento2/pull/25957) -- Add Cron Jobs names to New Relic transactions (by @lbajsarowicz)
+    * [magento/magento2#24103](https://github.com/magento/magento2/pull/24103) -- Refactor AdminNotification Render Blocks (by @DavidLambauer)
+    * [magento/magento2#26173](https://github.com/magento/magento2/pull/26173) -- Added Fix for 26164 (by @divyajyothi5321)
+    * [magento/magento2#26170](https://github.com/magento/magento2/pull/26170) -- Fixed Special Price class not added in configurable product page (by @ravi-chandra3197)
+    * [magento/magento2#25876](https://github.com/magento/magento2/pull/25876) -- Advance the order state to processing when a capture notification is received (by @azambon)
+    * [magento/magento2#25428](https://github.com/magento/magento2/pull/25428) -- Fixed model save and ObjectManager usage (by @drpayyne)
+    * [magento/magento2#25125](https://github.com/magento/magento2/pull/25125) -- Performance optimizations (by @andrey-legayev)
+    * [magento/magento2#26225](https://github.com/magento/magento2/pull/26225) -- Hotfix for Invalid date format in Functional and hotfix for failing Integration Tests (by @lbajsarowicz)
+    * [magento/magento2#25603](https://github.com/magento/magento2/pull/25603) -- Fix removing query string from url after redirect (by @arendarenko)
+    * [magento/magento2#26182](https://github.com/magento/magento2/pull/26182) -- Fix for footer newsletter input field length in IE/Edge (by @divyajyothi5321)
+    * [magento/magento2#26130](https://github.com/magento/magento2/pull/26130) -- Fix #25390 - UPS carrier model getting error when creating plugin in to Magento 2.3.3 compatibility (by @Bartlomiejsz)
+    * [magento/magento2#26084](https://github.com/magento/magento2/pull/26084) -- Fix  #26083 - problem with unsAdditionalInformation in \Magento\Payment\Model\Info (by @marcoaacoliveira)
+    * [magento/magento2#26066](https://github.com/magento/magento2/pull/26066) -- 26064 issuefix (by @divyajyothi5321)
+    * [magento/magento2#25958](https://github.com/magento/magento2/pull/25958) -- #14663 Updating Customer through rest/all/V1/customers/:id resets group_id if group_id not passed in payload (by @MaxRomanov4669)
+    * [magento/magento2#25479](https://github.com/magento/magento2/pull/25479) -- JSON fields support (by @akaplya)
+    * [magento/magento2#25640](https://github.com/magento/magento2/pull/25640) -- set correct pram like in BlockRepository implementation (by @torhoehn)
+    * [magento/magento2#25478](https://github.com/magento/magento2/pull/25478) -- Clearer PHPDocs comment for AbstractBlock and Escaper (by @edward-simpson)
+    * [magento/magento2#25452](https://github.com/magento/magento2/pull/25452) -- Elastic Search 5 Indexing Performance Issue with product mapper (by @behnamshayani)
+    * [magento/magento2#24815](https://github.com/magento/magento2/pull/24815) -- Fix #21684 - Currency sign for "Layered Navigation Price Step" is not according to default settings (by @Bartlomiejsz)
+    * [magento/magento2#24471](https://github.com/magento/magento2/pull/24471) -- Resolve Export Coupon Code Grid redirect to DashBoard when create New Cart Price Rule issue24468 (by @edenduong)
+    * [magento/magento2#22917](https://github.com/magento/magento2/pull/22917) -- magento/magento2#22856: Catalog price rules are not working with custom options as expected. (by @p-bystritsky)
+    * [magento/magento2#26274](https://github.com/magento/magento2/pull/26274) -- MFTF: Replace incorrect URLs in Tests and ActionGroups (by @lbajsarowicz)
+    * [magento/magento2#26273](https://github.com/magento/magento2/pull/26273) -- MFTF: Replace <amOnPage> with <actionGroup> for Admin log out (by @lbajsarowicz)
+    * [magento/magento2#26268](https://github.com/magento/magento2/pull/26268) -- Fix #14001 - M2.2.3 directory_country_region_name locale fix? 8bytes zh_Hans_CN(11bytes) ca_ES_VALENCIA(14bytes) (by @Bartlomiejsz)
+    * [magento/magento2#26264](https://github.com/magento/magento2/pull/26264) -- Issue 23521 (by @aleromano89)
+    * [magento/magento2#26259](https://github.com/magento/magento2/pull/26259) -- Fix invalid XML Schema location (by @lbajsarowicz)
+    * [magento/magento2#26237](https://github.com/magento/magento2/pull/26237) -- Added Fix for 25936 (by @divyajyothi5321)
+    * [magento/magento2#26234](https://github.com/magento/magento2/pull/26234) -- [Align some space between input and update button Minicart] (by @hitesh-wagento)
+    * [magento/magento2#26215](https://github.com/magento/magento2/pull/26215) -- Disabled the sorting option in status column on cache grid (by @srsathish92)
+    * [magento/magento2#26207](https://github.com/magento/magento2/pull/26207) -- #26206 Add information about currently reindexed index. (by @lbajsarowicz)
+    * [magento/magento2#26183](https://github.com/magento/magento2/pull/26183) -- Added Fix for - 26181 (by @divyajyothi5321)
+    * [magento/magento2#26169](https://github.com/magento/magento2/pull/26169) -- Added Fix for issue 26168 (by @divyajyothi5321)
+    * [magento/magento2#26029](https://github.com/magento/magento2/pull/26029) -- Fixed keyboard arrow keys behavior for number fields in AdobeStock grid (by @rogyar)
+    * [magento/magento2#25946](https://github.com/magento/magento2/pull/25946) -- Add plugin for SalesOrderItemRepository gift message (#19093) (by @lfolco)
+    * [magento/magento2#25250](https://github.com/magento/magento2/pull/25250) -- Implement catching for all Errors - ref Magento issue #23350 (by @miszyman)
+    * [magento/magento2#26290](https://github.com/magento/magento2/pull/26290) -- [Fixed Jump Datepicker issue in Catalog Price Rule] (by @hitesh-wagento)
+    * [magento/magento2#26270](https://github.com/magento/magento2/pull/26270) -- Fix #22964 (by @marcoaacoliveira)
+    * [magento/magento2#26263](https://github.com/magento/magento2/pull/26263) -- Fix #14913 - bookmark views become uneditable after deleting the first bookmark view (by @Bartlomiejsz)
+    * [magento/magento2#26251](https://github.com/magento/magento2/pull/26251) -- [Customer] Removing the delete buttons for default customer groups (by @eduard13)
+    * [magento/magento2#26218](https://github.com/magento/magento2/pull/26218) -- FIX issue#26217 - Wrong fields selection while using fragments on GraphQL (by @phoenix128)
+    * [magento/magento2#26048](https://github.com/magento/magento2/pull/26048) -- Fixed spelling and adjusted white spaces (by @pawankparmar)
+    * [magento/magento2#25985](https://github.com/magento/magento2/pull/25985) -- Fixed ability to save configuration in field without label (by @AndreyChorniy)
+    * [magento/magento2#25337](https://github.com/magento/magento2/pull/25337) -- #14971 Improper Handling of Pagination SEO (by @chickenland)
+    * [magento/magento2#22990](https://github.com/magento/magento2/pull/22990) -- [Catalog|Sales] Fix wrong behavior of grid row click event (by @Den4ik)
+    * [magento/magento2#26360](https://github.com/magento/magento2/pull/26360) -- System xml cleanup (by @Bartlomiejsz)
+    * [magento/magento2#26359](https://github.com/magento/magento2/pull/26359) -- Remove Filename Normalization in Delete Controller (by @pmclain)
+    * [magento/magento2#26354](https://github.com/magento/magento2/pull/26354) -- Make WYSIWYG configuration options depend on wysiwyg being enabled (by @Bartlomiejsz)
+    * [magento/magento2#26312](https://github.com/magento/magento2/pull/26312) -- magento/magento2#: Unit test for \Magento\Review\Observer\CatalogProductListCollectionAppendSummaryFieldsObserver (by @atwixfirster)
+    * [magento/magento2#26311](https://github.com/magento/magento2/pull/26311) -- [CurrencySymbol] Fixing the redirect after saving the currency symbols (by @eduard13)
+    * [magento/magento2#26305](https://github.com/magento/magento2/pull/26305) -- [GoogleAdWords] Conversion ID client validation (by @eduard13)
+    * [magento/magento2#26269](https://github.com/magento/magento2/pull/26269) -- Fix #7065 - page.main.title is translating title (by @Bartlomiejsz)
+    * [magento/magento2#26258](https://github.com/magento/magento2/pull/26258) -- #11209 Wishlist Add grouped product Error (by @MaxRomanov4669)
+    * [magento/magento2#26238](https://github.com/magento/magento2/pull/26238) -- [Correct both Menu spacing issue] (by @hitesh-wagento)
+    * [magento/magento2#26185](https://github.com/magento/magento2/pull/26185) -- Allow wishlist share when all items are out of stock (by @pmclain)
+    * [magento/magento2#26051](https://github.com/magento/magento2/pull/26051) -- Issue with reorder when disabled reorder setting from admin issue25130 (by @edenduong)
+    * [magento/magento2#25909](https://github.com/magento/magento2/pull/25909) -- Resolve Admin panel is not accessible after limited permissions set to at least one admin account issue25881 (by @edenduong)
+    * [magento/magento2#25718](https://github.com/magento/magento2/pull/25718) -- add the possibility to add display mode dependant layout handles (by @brosenberger)
+    * [magento/magento2#25716](https://github.com/magento/magento2/pull/25716) -- add check if attribute value is possible to be set as configurable option (by @brosenberger)
+    * [magento/magento2#25375](https://github.com/magento/magento2/pull/25375) -- Fix minicart promotion region not rendering #25373 (by @mattijv)
+    * [magento/magento2#25333](https://github.com/magento/magento2/pull/25333) -- Fixed issue magento#25278:Incorrect @return type at getSourceModel in… (by @mkalakailo)
+    * [magento/magento2#25194](https://github.com/magento/magento2/pull/25194) -- Limit the php explode to 2 to prevent extra '=' sign content in the a… (by @dhoang89)
+    * [magento/magento2#25083](https://github.com/magento/magento2/pull/25083) -- Cleanup search api di (by @thomas-kl1)
+    * [magento/magento2#24955](https://github.com/magento/magento2/pull/24955) -- Fix: add to cart grouped product when exists a sold out option (by @gihovani)
+    * [magento/magento2#23313](https://github.com/magento/magento2/pull/23313) -- Trigger page load listeners when no longer loading (by @johnhughes1984)
+    * [magento/magento2#26407](https://github.com/magento/magento2/pull/26407) -- MFTF: Set of fixes for failing Functional Tests (by @lbajsarowicz)
+    * [magento/magento2#26395](https://github.com/magento/magento2/pull/26395) -- HotFix: Failing Magento EE check on Layered Navigation (by @lbajsarowicz)
+    * [magento/magento2#26323](https://github.com/magento/magento2/pull/26323) -- MFTF: Extract Action Groups to separate files - magento/module-ui (by @lbajsarowicz)
+    * [magento/magento2#26321](https://github.com/magento/magento2/pull/26321) -- MFTF: Extract Action Groups to separate files - magento/module-shipping (by @lbajsarowicz)
+    * [magento/magento2#26320](https://github.com/magento/magento2/pull/26320) -- MFTF: Extract Action Groups to separate files - magento/module-sales (by @lbajsarowicz)
+    * [magento/magento2#26319](https://github.com/magento/magento2/pull/26319) -- MFTF: Extract Action Groups to separate files - magento/module-catalog (by @lbajsarowicz)
+    * [magento/magento2#26424](https://github.com/magento/magento2/pull/26424) -- Add to Compare link does not show in mobile view under 640px in blank theme (by @ptylek)
+    * [magento/magento2#26402](https://github.com/magento/magento2/pull/26402) -- magento/magento2#: Unit test for \Magento\AdminNotification\Observer\PredispatchAdminActionControllerObserver (by @atwixfirster)
+    * [magento/magento2#26365](https://github.com/magento/magento2/pull/26365) -- Add to Compare link not showing in mobile view under 640px (by @tejash-wagento)
+    * [magento/magento2#26313](https://github.com/magento/magento2/pull/26313) -- Issue-25968 - Added additional checking for returning needed variable… (by @AndreyChorniy)
+    * [magento/magento2#26495](https://github.com/magento/magento2/pull/26495) -- Fix confusing phpdoc in curl client (by @tdgroot)
+    * [magento/magento2#26464](https://github.com/magento/magento2/pull/26464) -- magento/magento2#: GraphQl. RevokeCustomerToken. Test coverage. (by @atwixfirster)
+    * [magento/magento2#26452](https://github.com/magento/magento2/pull/26452) -- magento/magento2#: GraphQl. DeletePaymentToken. Remove redundant validation logic. Test coverage. (by @atwixfirster)
+    * [magento/magento2#26322](https://github.com/magento/magento2/pull/26322) -- MFTF: Extract Action Groups to separate files for dev/tests (by @lbajsarowicz)
+    * [magento/magento2#26391](https://github.com/magento/magento2/pull/26391) -- MFTF: Add missing tests annotations (by @lbajsarowicz)
+    * [magento/magento2#26628](https://github.com/magento/magento2/pull/26628) -- Fixed #26513 (by @vikalps4)
+    * [magento/magento2#26614](https://github.com/magento/magento2/pull/26614) -- #26612 Fix failure on Coupon Apply procedure when loading mask still visible (by @lbajsarowicz)
+    * [magento/magento2#26558](https://github.com/magento/magento2/pull/26558) -- [Csp] Covering the model classes by Unit Tests (by @eduard13)
+    * [magento/magento2#26540](https://github.com/magento/magento2/pull/26540) -- Added action group for cms block duplication test (by @ajithkumar-maragathavel)
+    * [magento/magento2#26537](https://github.com/magento/magento2/pull/26537) -- Covered admin cms block creatation with MFTF test (by @ajithkumar-maragathavel)
+    * [magento/magento2#26512](https://github.com/magento/magento2/pull/26512) -- Extend exception message (by @oroskodias)
+    * [magento/magento2#26511](https://github.com/magento/magento2/pull/26511) -- Extend exception message (by @oroskodias)
+    * [magento/magento2#26509](https://github.com/magento/magento2/pull/26509) -- Update PHP Docs (by @oroskodias)
+    * [magento/magento2#26490](https://github.com/magento/magento2/pull/26490) -- Fixed type issue. Create unit test for customer data model (by @AndreyChorniy)
+    * [magento/magento2#26489](https://github.com/magento/magento2/pull/26489) -- Checked if quote object contains id before looking for quote items (by @rav-redchamps)
+    * [magento/magento2#26480](https://github.com/magento/magento2/pull/26480) -- Bugfix #26479 Exception when Autoloader was not registered properly (by @lbajsarowicz)
+    * [magento/magento2#26478](https://github.com/magento/magento2/pull/26478) -- Unit Test for Magento\Fedex\Plugin\Block\DataProviders\Tracking\ChangeTitle (by @karyna-tsymbal-atwix)
+    * [magento/magento2#26455](https://github.com/magento/magento2/pull/26455) -- 25162 fixed wrong format link (by @Usik2203)
+    * [magento/magento2#26445](https://github.com/magento/magento2/pull/26445) -- Fix #25761: Site map doesn't include home page (by @deepaksnair)
+    * [magento/magento2#26435](https://github.com/magento/magento2/pull/26435) -- #18012: added i18n wrapper to be used in underscore templates for translation (by @sergiy-v)
+    * [magento/magento2#26434](https://github.com/magento/magento2/pull/26434) -- Fix typo in sitemap product collection docblock (by @Tjitse-E)
+    * [magento/magento2#26381](https://github.com/magento/magento2/pull/26381) -- #25300 Mobile view issue on category page - Sort By label overlaps (by @akartavtsev)
+    * [magento/magento2#26327](https://github.com/magento/magento2/pull/26327) -- Fix the wrong behavior of validation scroll on the iPhone X (by @iGerchak)
+    * [magento/magento2#26285](https://github.com/magento/magento2/pull/26285) -- Remove extraneous whitespace - #26275 (by @DanielRuf)
+    * [magento/magento2#26071](https://github.com/magento/magento2/pull/26071) -- #26065 isSaleable cache and optimize result for configurable products (by @ilnytskyi)
+    * [magento/magento2#25994](https://github.com/magento/magento2/pull/25994) -- Extend exception messages (by @oroskodias)
+    * [magento/magento2#25839](https://github.com/magento/magento2/pull/25839) -- Fix gallery thumbs navigation scrolling (by @iGerchak)
+    * [magento/magento2#25385](https://github.com/magento/magento2/pull/25385) -- Prevent page scroll jumping when product gallery loads (by @krzksz)
+    * [magento/magento2#26355](https://github.com/magento/magento2/pull/26355) -- Performance: Getting rid of `array_merge` in loop (by @lbajsarowicz)
+    * [magento/magento2#26296](https://github.com/magento/magento2/pull/26296) -- Add Visual Code catalog generator (by @manuelcanepa)
+    * [magento/magento2#26000](https://github.com/magento/magento2/pull/26000) -- magento/magento2#: Remove unused “Default Email Domain” option and related to it code (by @atwixfirster)
+    * [magento/magento2#25966](https://github.com/magento/magento2/pull/25966) -- [Fixed Radio alignment issue] (by @hitesh-wagento)
+    * [magento/magento2#25875](https://github.com/magento/magento2/pull/25875) -- Prevent endless loop when duplicating product (by @JeroenVanLeusden)
+    * [magento/magento2#25764](https://github.com/magento/magento2/pull/25764) -- Cleanup, refactor and cover with tests section-config module (by @krzksz)
+    * [magento/magento2#24460](https://github.com/magento/magento2/pull/24460) -- Allow construction of products with custom_attributes in $data (by @Vinai)
+    * [magento/magento2#26634](https://github.com/magento/magento2/pull/26634) -- Xml fixes for Magento_AdvancedPricingImportExport module (by @sanganinamrata)
+    * [magento/magento2#26611](https://github.com/magento/magento2/pull/26611) -- #26610 Fix failing CI due to invalid variable handler (by @lbajsarowicz)
+    * [magento/magento2#26549](https://github.com/magento/magento2/pull/26549) -- [Fedex] covered Model/Source/Generic.php by unit test (by @srsathish92)
+    * [magento/magento2#26525](https://github.com/magento/magento2/pull/26525) -- Unit test for Magento\Reports\Observer\EventSaver (by @karyna-tsymbal-atwix)
+    * [magento/magento2#26487](https://github.com/magento/magento2/pull/26487) -- Unit test for Magento\Fedex\Plugin\Block\Tracking\PopupDeliveryDate (by @karyna-tsymbal-atwix)
+    * [magento/magento2#26439](https://github.com/magento/magento2/pull/26439) -- magento/magento2#: Unit test for \Magento\Bundle\Observer\InitOptionRendererObserver (by @atwixfirster)
+    * [magento/magento2#26429](https://github.com/magento/magento2/pull/26429) -- magento/magento2#: Unit test for \Magento\Bundle\Observer\AppendUpsellProductsObserver (by @atwixfirster)
+    * [magento/magento2#26241](https://github.com/magento/magento2/pull/26241) -- #26240: Fixed logic for getting option price index for selected swatch option (by @sergiy-v)
+    * [magento/magento2#26641](https://github.com/magento/magento2/pull/26641) -- Correct doc url added to README (by @rishatiwari)
+    * [magento/magento2#26579](https://github.com/magento/magento2/pull/26579) -- Unit test for Magento\Reports\Observer\CheckoutCartAddProductObserver (by @karyna-tsymbal-atwix)
+    * [magento/magento2#26574](https://github.com/magento/magento2/pull/26574) -- Cover Search Term Entity Redirect Works on Store Front by MFTF Test (by @DmitryTsymbal)
+    * [magento/magento2#26569](https://github.com/magento/magento2/pull/26569) -- 17847 Fixed wrong state title (by @Usik2203)
+    * [magento/magento2#26568](https://github.com/magento/magento2/pull/26568) -- Action group added for existing test (by @ajithkumar-maragathavel)
+    * [magento/magento2#26542](https://github.com/magento/magento2/pull/26542) -- Typo Mistake (by @mayankzalavadia)
+    * [magento/magento2#26533](https://github.com/magento/magento2/pull/26533) -- Github #26532: di:setup:compile fails with anonymous classes (by @joni-jones)
+    * [magento/magento2#26496](https://github.com/magento/magento2/pull/26496) -- [CurrencySymbol] Fixing the disabled currency inputs (by @eduard13)
+    * [magento/magento2#26476](https://github.com/magento/magento2/pull/26476) -- magento/magento2#: Remove a redundant call to DB for guest session (by @atwixfirster)
+    * [magento/magento2#26462](https://github.com/magento/magento2/pull/26462) -- Escape dollar sign for saving content into crontab (by @Erfans)
+    * [magento/magento2#26451](https://github.com/magento/magento2/pull/26451) -- Add frontend template hints status command (by @WaPoNe)
+    * [magento/magento2#26430](https://github.com/magento/magento2/pull/26430) -- Unit Test for Magento\Sitemap\Model\Config\Backend\Priority (by @karyna-tsymbal-atwix)
+    * [magento/magento2#26399](https://github.com/magento/magento2/pull/26399) -- Issue #26332 BeforeOrderPaymentSaveObserver override payment instructions (by @karyna-tsymbal-atwix)
+    * [magento/magento2#26213](https://github.com/magento/magento2/pull/26213) -- SEO: Do not follow links on filter options (by @paveq)
+    * [magento/magento2#26007](https://github.com/magento/magento2/pull/26007) -- #25591 & character in SKUs is shown as &amp; in current variations li… (by @KaushikChavda)
+    * [magento/magento2#25860](https://github.com/magento/magento2/pull/25860) -- Add mass action to invalidate indexes via admin (by @fredden)
+    * [magento/magento2#25851](https://github.com/magento/magento2/pull/25851) -- Fix SearchResult isCacheable performance (by @wigman)
+    * [magento/magento2#25742](https://github.com/magento/magento2/pull/25742) -- Http adapter curl missing delete method (by @jimuld)
+    * [magento/magento2#25324](https://github.com/magento/magento2/pull/25324) -- 13865 safari block cookies breaks javascript scripts (by @raulvOnestic91)
+    * [magento/magento2#24648](https://github.com/magento/magento2/pull/24648) -- reduce reset data actions on DeploymentConfig (by @georgebabarus)
+    * [magento/magento2#24485](https://github.com/magento/magento2/pull/24485) -- Fix return type of price currency format method (by @avstudnitz)
+    * [magento/magento2#26378](https://github.com/magento/magento2/pull/26378) -- 26375 braintree payment address issue (by @chris-pook)
+    * [magento/magento2#25641](https://github.com/magento/magento2/pull/25641) -- M2C-21768 Validate product quantity on Wishlist update (by @ptylek)
+    * [magento/magento2#25285](https://github.com/magento/magento2/pull/25285) -- Add lib wrapper for UUID validation. (by @nikolaevas)
+    * [magento/magento2#26420](https://github.com/magento/magento2/pull/26420) -- #8691: improved language pack inheritance order (by @sergiy-v)
+    * [magento/magento2#26413](https://github.com/magento/magento2/pull/26413) -- #895 Fix for Media Gallery buttons are shifted to the left (by @diazwatson)
+    * [magento/magento2#26162](https://github.com/magento/magento2/pull/26162) -- Fixed Issue with tier price 0 when saving product second time (by @ravi-chandra3197)
+    * [magento/magento2#26623](https://github.com/magento/magento2/pull/26623) -- #26622 - Check quote item for parentItem instead of parentItemId (by @aligent-lturner)
+    * [magento/magento2#26621](https://github.com/magento/magento2/pull/26621) -- Set of fixes introduced during #CoreReview 31.01.2020 (by @lbajsarowicz)
+    * [magento/magento2#26546](https://github.com/magento/magento2/pull/26546) -- [fixed My Wish List Product not showing properly between >768px and <… (by @hitesh-wagento)
+    * [magento/magento2#26423](https://github.com/magento/magento2/pull/26423) -- Update getCustomer method in order class (by @sertlab)
+    * [magento/magento2#26339](https://github.com/magento/magento2/pull/26339) -- Module xml extra end tag removed (by @tejash-wagento)
+    * [magento/magento2#24691](https://github.com/magento/magento2/pull/24691) -- Allows additional payment checks in payment method list (by @jensscherbl)
+    * [magento/magento2#26782](https://github.com/magento/magento2/pull/26782) -- Module_Cms MFTF test improvements (by @ajithkumar-maragathavel)
+    * [magento/magento2#26781](https://github.com/magento/magento2/pull/26781) -- Code hygeine in bundle option graphql resolver (by @moloughlin)
+    * [magento/magento2#26770](https://github.com/magento/magento2/pull/26770) -- Unit tests for Magento\Csp\Model\Mode\ConfigManager and Magento\Csp\Observer\Render (by @karyna-tsymbal-atwix)
+    * [magento/magento2#26764](https://github.com/magento/magento2/pull/26764) -- LoadCssAsync html format fixed for critical css  (by @srsathish92)
+    * [magento/magento2#26714](https://github.com/magento/magento2/pull/26714) -- Deprecated redundant class (by @drpayyne)
+    * [magento/magento2#26715](https://github.com/magento/magento2/pull/26715) -- Unit test for \Magento\Captcha\Observer\ResetAttemptForBackendObserver and ResetAttemptForFrontendObserver (by @karyna-tsymbal-atwix)
+    * [magento/magento2#26502](https://github.com/magento/magento2/pull/26502) -- {ASI} :- Error message to be cached for grid data storage component (by @konarshankar07)
+    * [magento/magento2#26279](https://github.com/magento/magento2/pull/26279) -- Fix issue #26276 with clonning quote billing address street (by @yutv)
+    * [magento/magento2#26246](https://github.com/magento/magento2/pull/26246) -- magento/magento2#26245: Magento does not send an email about a refunded grouped product (by @atwixfirster)
+    * [magento/magento2#26142](https://github.com/magento/magento2/pull/26142) -- Textarea patch 1 (by @textarea)
+    * [magento/magento2#25488](https://github.com/magento/magento2/pull/25488) -- Update composer dependency to fix Redis Key Expiery (by @toxix)
+    * [magento/magento2#25249](https://github.com/magento/magento2/pull/25249) -- upgrade method delete by ids to inject array skus (by @sarron93)
+    * [magento/magento2#25246](https://github.com/magento/magento2/pull/25246) -- Warning when Search Terms page is opened by clicking option at the footer  (by @vishalverma279)
+    * [magento/magento2#24843](https://github.com/magento/magento2/pull/24843) -- Issue #24842: Unable to delete custom option file in admin order create (by @adrian-martinez-interactiv4)
+    * [magento/magento2#26820](https://github.com/magento/magento2/pull/26820) -- [Theme] Covered Unit Test for \Magento\Theme\Controller\Result\JsFooterPlugin (by @srsathish92)
+    * [magento/magento2#26816](https://github.com/magento/magento2/pull/26816) -- Unit Test for \Magento\Directory\Block\Adminhtml\Frontend\Currency\Base (by @karyna-tsymbal-atwix)
+    * [magento/magento2#26771](https://github.com/magento/magento2/pull/26771) -- Removed unnecessary function argument (by @ajithkumar-maragathavel)
+    * [magento/magento2#26684](https://github.com/magento/magento2/pull/26684) -- Move additional dependencies from private getters to constructor - Magento_PageCache (by @Bartlomiejsz)
+    * [magento/magento2#26674](https://github.com/magento/magento2/pull/26674) -- Comment add in translate. (by @pratikhmehta)
+    * [magento/magento2#26342](https://github.com/magento/magento2/pull/26342) -- Remove extra space before semicolon and remove extra comma in php, phtml and js files (by @tejash-wagento)
+    * [magento/magento2#25991](https://github.com/magento/magento2/pull/25991) -- Fixed issue when the preview images navigation is triggered by moving the input filed cursor using arrow keys (by @drpayyne)
+    * [magento/magento2#26857](https://github.com/magento/magento2/pull/26857) -- Issue/26843: Fix es_US Spanish (United States ) Locale is not support… (by @vincent-le89)
+    * [magento/magento2#26846](https://github.com/magento/magento2/pull/26846) -- magento/magento2#: GraphQL. setPaymentMethodOnCart mutation. Extend list of required parameters for testSetPaymentMethodWithoutRequiredParameters (by @atwixfirster)
+    * [magento/magento2#26844](https://github.com/magento/magento2/pull/26844) -- Unit Tests for observers from Magento_Reports (by @karyna-tsymbal-atwix)
+    * [magento/magento2#26835](https://github.com/magento/magento2/pull/26835) -- Unit test for Magento\Downloadable\Model\Sample\DeleteHandler (by @karyna-tsymbal-atwix)
+    * [magento/magento2#26839](https://github.com/magento/magento2/pull/26839) -- Unit test for \Magento\MediaGallery\Plugin\Wysiwyg\Images\Storage (by @karyna-tsymbal-atwix)
+    * [magento/magento2#26769](https://github.com/magento/magento2/pull/26769) -- Fix return type in ResetAttemptForFrontendObserver and ResetAttemptForBackendObserver (by @karyna-tsymbal-atwix)
+    * [magento/magento2#26768](https://github.com/magento/magento2/pull/26768) -- Marginal space validation (by @ajithkumar-maragathavel)
+    * [magento/magento2#26712](https://github.com/magento/magento2/pull/26712) -- Unit test for \Magento\Captcha\Observer\CheckUserForgotPasswordBackendObserver (by @karyna-tsymbal-atwix)
+    * [magento/magento2#26688](https://github.com/magento/magento2/pull/26688) -- Use '===' operator to check if file was written. (by @vovayatsyuk)
+    * [magento/magento2#26659](https://github.com/magento/magento2/pull/26659) -- [26054-Do not duplicate SEO meta data when duplicating a product] (by @dasharath-wagento)
+    * [magento/magento2#26398](https://github.com/magento/magento2/pull/26398) -- Move additional dependencies from private getters to constructor - Magento_Captcha (by @Bartlomiejsz)
+    * [magento/magento2#26317](https://github.com/magento/magento2/pull/26317) -- #26314: fixed logic for updating map price for selected swatch (by @sergiy-v)
+    * [magento/magento2#24612](https://github.com/magento/magento2/pull/24612) -- Fix for the issue #24547 Magento\Customer\Model\Account\Redirect::setRedirectCookie() not properly working (by @sashas777)
+    * [magento/magento2#26904](https://github.com/magento/magento2/pull/26904) -- [Layout] Adding 'article' as an additional supported layout tag (by @eduard13)
+    * [magento/magento2#26899](https://github.com/magento/magento2/pull/26899) -- Unit test for Magento\Vault\Plugin\PaymentVaultAttributesLoad (by @karyna-tsymbal-atwix)
+    * [magento/magento2#26897](https://github.com/magento/magento2/pull/26897) -- Swatches options: eliminate objects instantiation since only their data needed (by @ilnytskyi)
+    * [magento/magento2#26894](https://github.com/magento/magento2/pull/26894) -- Unit test for Magento\GiftMessage\Model\Plugin\MergeQuoteItems (by @karyna-tsymbal-atwix)
+    * [magento/magento2#26878](https://github.com/magento/magento2/pull/26878) -- [NewRelicReporting] Covering the New Relic plugins by Unit Tests (by @eduard13)
+    * [magento/magento2#26869](https://github.com/magento/magento2/pull/26869) -- Update MockObject class in Widget module (by @hws47a)
+    * [magento/magento2#26868](https://github.com/magento/magento2/pull/26868) -- Update MockObject class in Wishlist module (by @hws47a)
+    * [magento/magento2#26863](https://github.com/magento/magento2/pull/26863) -- TierPriceBox toHtml method should be return with string (by @tufahu)
+    * [magento/magento2#26790](https://github.com/magento/magento2/pull/26790) -- Disabled flat: cast $attributeId as (int) in selects (by @ilnytskyi)
+    * [magento/magento2#26761](https://github.com/magento/magento2/pull/26761) -- [Analytics] Code refactor & covered unit test in Analytics/ReportXml/QueryFactory (by @srsathish92)
+    * [magento/magento2#26710](https://github.com/magento/magento2/pull/26710) -- [Customer] Fixing the code style for account edit template and Integration test (by @eduard13)
+    * [magento/magento2#26701](https://github.com/magento/magento2/pull/26701) -- Date incorrect on pdf invoice issue26675 (by @edenduong)
+    * [magento/magento2#26650](https://github.com/magento/magento2/pull/26650) -- issue-#25675 Added fix for #25675 issue to the 2.4 Magento version (by @molneek)
+    * [magento/magento2#26617](https://github.com/magento/magento2/pull/26617) -- Unit Test for Magento\LayeredNavigation\Observer\Edit\Tab\Front\ProductAttributeFormBuildFrontTabObserver (by @karyna-tsymbal-atwix)
+    * [magento/magento2#26584](https://github.com/magento/magento2/pull/26584) -- #26583 Tier pricing save percent showing logic updated in product detail page (by @srsathish92)
+    * [magento/magento2#26523](https://github.com/magento/magento2/pull/26523) -- [#25963] Fixed grids export: option labels are taken from grid filters and columns now. (by @novikor)
+    * [magento/magento2#26418](https://github.com/magento/magento2/pull/26418) -- [Fixed Compare Products section not showing in mobile view under 767px] (by @hitesh-wagento)
+    * [magento/magento2#25806](https://github.com/magento/magento2/pull/25806) -- Reflection: Fix null as first return type (by @Parakoopa)
+    * [magento/magento2#25626](https://github.com/magento/magento2/pull/25626) -- Fix translation retrieval (by @brosenberger)
+    * [magento/magento2#25426](https://github.com/magento/magento2/pull/25426) -- Ui: log exception correctly (by @bchatard)
+    * [magento/magento2#25417](https://github.com/magento/magento2/pull/25417) -- README > Improving the apresentation (by @rafaelstz)
+    * [magento/magento2#25321](https://github.com/magento/magento2/pull/25321) -- Changing input phone type to tel in Contact, Error Report and Customer widget pages (by @rafaelstz)
+    * [magento/magento2#24976](https://github.com/magento/magento2/pull/24976) -- Fix doc block for $queueIterator Magento\Framework\MessageQueue\Topology\Config (by @UncleTioma)
+    * [magento/magento2#22296](https://github.com/magento/magento2/pull/22296) -- Fix #14958 - remove sales sequence data on store view delete (by @Bartlomiejsz)
+    * [magento/magento2#26833](https://github.com/magento/magento2/pull/26833) -- magento/magento2#: GraphQL. MergeCarts mutation. Add additional API-functional test cases (by @atwixfirster)
+    * [magento/magento2#26608](https://github.com/magento/magento2/pull/26608) -- HOTFIX: #26607 Fix failing CI due to Functional Tests (by @lbajsarowicz)
+    * [magento/magento2#26772](https://github.com/magento/magento2/pull/26772) -- Clean up 'isset' coding style (by @GraysonChiang)
+    * [magento/magento2#25858](https://github.com/magento/magento2/pull/25858) -- FIX #25856 / Group Ordered Products report by SKU (by @lbajsarowicz)
+    * [magento/magento2#23570](https://github.com/magento/magento2/pull/23570) -- Improve: [UrlRewrite] Move grid implementation to ui components (by @Den4ik)
+    * [magento/magento2#26995](https://github.com/magento/magento2/pull/26995) -- Fix typo in description node. (by @BorisovskiP)
+    * [magento/magento2#26982](https://github.com/magento/magento2/pull/26982) -- Remove app/functions.php (by @Bartlomiejsz)
+    * [magento/magento2#26974](https://github.com/magento/magento2/pull/26974) -- Fix: #26973 Fatal error when Product Image size is not defined (by @lbajsarowicz)
+    * [magento/magento2#26947](https://github.com/magento/magento2/pull/26947) -- Unit test for AssignCouponDataAfterOrderCustomerAssignObserver (by @mmezhensky)
+    * [magento/magento2#26944](https://github.com/magento/magento2/pull/26944) -- Unit test for CatalogProductCompareClearObserver (by @mmezhensky)
+    * [magento/magento2#26932](https://github.com/magento/magento2/pull/26932) -- Fix #26917 Tax rate zip/post range check box alignment issue (by @srsathish92)
+    * [magento/magento2#26928](https://github.com/magento/magento2/pull/26928) -- Module_Cms MFTF test improvements (by @nandhini-nagaraj)
+    * [magento/magento2#26916](https://github.com/magento/magento2/pull/26916) -- Move cache cleanup operation on state modification operation (by @kandy)
+    * [magento/magento2#26912](https://github.com/magento/magento2/pull/26912) -- Unit test for ProductProcessUrlRewriteRemovingObserver (by @mmezhensky)
+    * [magento/magento2#26862](https://github.com/magento/magento2/pull/26862) -- Removed disabled products from low stock report grid (by @Mohamed-Asar)
+    * [magento/magento2#26821](https://github.com/magento/magento2/pull/26821) -- Reduce requirements for parameter in catalog product type factory (by @hws47a)
+    * [magento/magento2#26755](https://github.com/magento/magento2/pull/26755) -- Fix wrong type of argument appendSummaryFieldsToCollection (by @Usik2203)
+    * [magento/magento2#26697](https://github.com/magento/magento2/pull/26697) -- Update the product model custom option methods PHPdoc (by @hws47a)
+    * [magento/magento2#26586](https://github.com/magento/magento2/pull/26586) -- Improve exception message (by @oroskodias)
+    * [magento/magento2#26230](https://github.com/magento/magento2/pull/26230) -- Activated "Pending Reviews" menu item when merchant opens 'Pending Reviews' section (by @rav-redchamps)
+    * [magento/magento2#26090](https://github.com/magento/magento2/pull/26090) -- Fixed issue 25910 choose drop down not close when open another (by @Usik2203)
+    * [magento/magento2#25895](https://github.com/magento/magento2/pull/25895) -- Change tag name (by @AndreyChorniy)
+    * [magento/magento2#25349](https://github.com/magento/magento2/pull/25349) -- Fixed issue when escape key is pressed to close prompt (by @konarshankar07)
+    * [magento/magento2#25161](https://github.com/magento/magento2/pull/25161) -- fixed confusing grammar in the backend formatDate() function (by @princefishthrower)
+    * [magento/magento2#26979](https://github.com/magento/magento2/pull/26979) -- #26800 Fixed Undefined variable  in ProductLink/Management (by @srsathish92)
+    * [magento/magento2#26842](https://github.com/magento/magento2/pull/26842) -- Unit test for Magento\Catalog\Observer\SetSpecialPriceStartDate has added (by @mmezhensky)
+    * [magento/magento2#26615](https://github.com/magento/magento2/pull/26615) -- Add missing annotations to MFTF tests (by @sta1r)
+    * [magento/magento2#25828](https://github.com/magento/magento2/pull/25828) -- MFTF: Extract Action Groups to separate files - magento/module-customer (by @lbajsarowicz)
+    * [magento/magento2#25311](https://github.com/magento/magento2/pull/25311) -- Add afterGetList method in CustomerRepository plugin to retrieve is_s… (by @enriquei4)
+    * [magento/magento2#27054](https://github.com/magento/magento2/pull/27054) -- Cleanup ObjectManager usage - Magento_Authorization (by @Bartlomiejsz)
+    * [magento/magento2#27048](https://github.com/magento/magento2/pull/27048) -- #27044 Integration Test to cover `$storeId` on Category Repository `get()` (by @lbajsarowicz)
+    * [magento/magento2#27041](https://github.com/magento/magento2/pull/27041) -- FIX: responsiveness for images (by @GrimLink)
+    * [magento/magento2#27021](https://github.com/magento/magento2/pull/27021) -- Unit test for \Magento\MediaGallery\Plugin\Product\Gallery\Processor (by @karyna-tsymbal-atwix)
+    * [magento/magento2#27010](https://github.com/magento/magento2/pull/27010) -- Unit test for UpdateElementTypesObserver (by @mmezhensky)
+    * [magento/magento2#26779](https://github.com/magento/magento2/pull/26779) -- Fix failure for missing product on Storefront (by @lbajsarowicz)
+    * [magento/magento2#26765](https://github.com/magento/magento2/pull/26765) -- Fix #17933 - Bank Transfer Payment Instructions switch back to default (by @Bartlomiejsz)
+    * [magento/magento2#26548](https://github.com/magento/magento2/pull/26548) -- issue/26384 Fix store switcher when using different base url on stores (by @TobiasCodeNull)
+    * [magento/magento2#26329](https://github.com/magento/magento2/pull/26329) -- MFTF: Replace invalid ActionGroup for AdminLogin (by @lbajsarowicz)
+    * [magento/magento2#25359](https://github.com/magento/magento2/pull/25359) -- Fix #25243 (by @korostii)
+    * [magento/magento2#24003](https://github.com/magento/magento2/pull/24003) -- Fixes less compilation problems in the Magento/luma theme (by @hostep)
+    * [magento/magento2#27114](https://github.com/magento/magento2/pull/27114) -- magento/magento2#: Remove a redundant PHP5 directives from .htaccess (by @atwixfirster)
+    * [magento/magento2#27057](https://github.com/magento/magento2/pull/27057) -- Removed redundant method _beforeToHtml (by @Usik2203)
+    * [magento/magento2#27033](https://github.com/magento/magento2/pull/27033) -- Catalog image lazy load (by @tdgroot)
+    * [magento/magento2#26907](https://github.com/magento/magento2/pull/26907) -- Open separate page when click 'View' in CMS pages(Grid) (by @dominicfernando)
+    * [magento/magento2#26619](https://github.com/magento/magento2/pull/26619) -- Cover CartTotalRepositoryPlugin by unit test and correct docblock (by @mrtuvn)
+    * [magento/magento2#26778](https://github.com/magento/magento2/pull/26778) -- Eliminate the need for inheritance for action controllers. (by @lbajsarowicz)
+    * [magento/magento2#26990](https://github.com/magento/magento2/pull/26990) -- #26989 MFTF: Use <magentoCron> for reindex (by @lbajsarowicz)
+    * [magento/magento2#27196](https://github.com/magento/magento2/pull/27196) -- Remove @author annotation from Magento framework (by @diazwatson)
+    * [magento/magento2#27149](https://github.com/magento/magento2/pull/27149) -- 27027 added date format adjustment for 'validate-dob' rule (by @sergiy-v)
+    * [magento/magento2#27138](https://github.com/magento/magento2/pull/27138) -- Removed unnecessary tabindex property (by @drpayyne)
+    * [magento/magento2#27131](https://github.com/magento/magento2/pull/27131) -- 26758 improved cms page custom layout update logic (by @sergiy-v)
+    * [magento/magento2#27084](https://github.com/magento/magento2/pull/27084) -- Cleanup ObjectManager usage - Magento_CacheInvalidate (by @Bartlomiejsz)
+    * [magento/magento2#27083](https://github.com/magento/magento2/pull/27083) -- Cleanup ObjectManager usage - Magento_AsynchronousOperations (by @Bartlomiejsz)
+    * [magento/magento2#27082](https://github.com/magento/magento2/pull/27082) -- Cleanup ObjectManager usage - Magento_Analytics (by @Bartlomiejsz)
+    * [magento/magento2#27080](https://github.com/magento/magento2/pull/27080) -- Cleanup ObjectManager usage - Magento_EncryptionKey (by @Bartlomiejsz)
+    * [magento/magento2#27029](https://github.com/magento/magento2/pull/27029) -- #26847: Added 'enterKey' event handler to prompt widget (by @sergiy-v)
+    * [magento/magento2#27026](https://github.com/magento/magento2/pull/27026) -- Issue 27009: Fix error fire on catch when create new theme (by @vincent-le89)
+    * [magento/magento2#27014](https://github.com/magento/magento2/pull/27014) -- Fix #26992 Add new rating is active checkbox alignment issue (by @srsathish92)
+    * [magento/magento2#26964](https://github.com/magento/magento2/pull/26964) -- Cleanup ObjectManager usage - Magento_Elasticsearch (by @Bartlomiejsz)
+    * [magento/magento2#26939](https://github.com/magento/magento2/pull/26939) -- ObjectManager cleanup - Remove usage from AdminNotification module (by @ihor-sviziev)
+    * [magento/magento2#26902](https://github.com/magento/magento2/pull/26902) -- Fix #20309 - URL Rewrites redirect loop (by @Bartlomiejsz)
+    * [magento/magento2#26649](https://github.com/magento/magento2/pull/26649) -- table bottom color different then thead and tbody border color (by @tejash-wagento)
+    * [magento/magento2#26642](https://github.com/magento/magento2/pull/26642) -- MAG-251090-26590: Fixed Customer registration multiple form submit (by @princeCB)
+    * [magento/magento2#26563](https://github.com/magento/magento2/pull/26563) -- magento/magento2#: Test Coverage. API functional tests. removeItemFromCart (by @atwixfirster)
+    * [magento/magento2#25454](https://github.com/magento/magento2/pull/25454) -- TinyMCE4 hard to input double byte characters on chrome (by @HirokazuNishi)
+    * [magento/magento2#24878](https://github.com/magento/magento2/pull/24878) -- Create missing directories in imageuploader tree if they don't alread… (by @hostep)
+    * [magento/magento2#24743](https://github.com/magento/magento2/pull/24743) -- fix issue 24735 (by @dmdanilchenko)
+    * [magento/magento2#23742](https://github.com/magento/magento2/pull/23742) -- Add Header (h1 - h6) tags to layout xml htmlTags Allowed types (by @furan917)
+    * [magento/magento2#22442](https://github.com/magento/magento2/pull/22442) -- Add support for char element to dto factory (by @wardcapp)
+    * [magento/magento2#27172](https://github.com/magento/magento2/pull/27172) -- magento/magento2#14086: Guest cart API ignoring cartId in url for some methods (by @engcom-Charlie)
+    * [magento/magento2#27179](https://github.com/magento/magento2/pull/27179) -- improve Magento\Catalog\Model\ImageUploader error handler (by @fsw)
+    * [magento/magento2#27145](https://github.com/magento/magento2/pull/27145) -- Cleanup ObjectManager usage - Magento_WebapiAsync (by @Bartlomiejsz)
+    * [magento/magento2#26959](https://github.com/magento/magento2/pull/26959) -- Correctly escape custom product image attributes (by @alexander-aleman)
+    * [magento/magento2#26506](https://github.com/magento/magento2/pull/26506) -- #26499 Always transliterate product url key (by @DanieliMi)
+    * [magento/magento2#25722](https://github.com/magento/magento2/pull/25722) -- Magento#25669: fixed issue "health_check.php fails if any database cache engine configured" (by @andrewbess)
+    * [magento/magento2#27284](https://github.com/magento/magento2/pull/27284) -- Fix static test failures for class annotaions (by @ihor-sviziev)
+    * [magento/magento2#27281](https://github.com/magento/magento2/pull/27281) -- TYPO: Fix annoying typo in Quantity word (by @lbajsarowicz)
+    * [magento/magento2#27277](https://github.com/magento/magento2/pull/27277) -- MFTF: Rename and rewrite Test that fake expired session (by @lbajsarowicz)
+    * [magento/magento2#27274](https://github.com/magento/magento2/pull/27274) -- MFTF: Create Account tests (Success & Failure) with `extend` (by @lbajsarowicz)
+    * [magento/magento2#27261](https://github.com/magento/magento2/pull/27261) -- 20472 added product list price modifier (by @sergiy-v)
+    * [magento/magento2#27249](https://github.com/magento/magento2/pull/27249) -- Update Frontend Development Workflow type's comment to be clearer (by @navarr)
+    * [magento/magento2#26784](https://github.com/magento/magento2/pull/26784) -- [Forward Port PR-14344] Fix generating product URL rewrites for anchor categories (by @hostep)
+    * [magento/magento2#26746](https://github.com/magento/magento2/pull/26746) -- In System/Export controlers use MessageManager instead of throwing exceptions (by @pmarki)
+    * [magento/magento2#26348](https://github.com/magento/magento2/pull/26348) -- Fixed #26345 Reorder in Admin panel leads to report page in case of changed product custom option max characters (by @cedmudit)
+    * [magento/magento2#27187](https://github.com/magento/magento2/pull/27187) -- 26117: "Current user does not have an active cart" even when he actually has one (by @engcom-Charlie)
+    * [magento/magento2#27170](https://github.com/magento/magento2/pull/27170) -- 26825 add all image roles for first product entity (by @sergiy-v)
+    * [magento/magento2#25733](https://github.com/magento/magento2/pull/25733) -- Resolve Mass Delete Widget should have "Confirmation Modal" (by @edenduong)
+    * [magento/magento2#27118](https://github.com/magento/magento2/pull/27118) -- FIX #27117 Invalid functional Test names (by @lbajsarowicz)
+    * [magento/magento2#27266](https://github.com/magento/magento2/pull/27266) -- MFTF: Enable Persistent Shopping Cart. Assert Options (by @DmitryTsymbal)
+    * [magento/magento2#27255](https://github.com/magento/magento2/pull/27255) -- MFTF: Replace fragile test `AdminLoginTest` with `AdminLoginSuccessfulTest` (by @lbajsarowicz)
+    * [magento/magento2#27165](https://github.com/magento/magento2/pull/27165) -- [feature] Display category filter item in layered navigation based on the system configuration from admin area (by @vasilii-b)
+    * [magento/magento2#27015](https://github.com/magento/magento2/pull/27015) -- MC-26683: Removed get errors of cart allowing to add product to cart (by @AleksLi)
+    * [magento/magento2#26987](https://github.com/magento/magento2/pull/26987) -- Remove unused requirejs alias defined (by @mrtuvn)
+    * [magento/magento2#26560](https://github.com/magento/magento2/pull/26560) -- #26473: Improved logic for product image updating for configurable products (by @sergiy-v)
+    * [magento/magento2#25297](https://github.com/magento/magento2/pull/25297) -- Add 'schedule status' column to admin indexer grid (by @fredden)
+    * [magento/magento2#24479](https://github.com/magento/magento2/pull/24479) -- 22251 admin order email is now required 1 (by @solwininfotech)
+    * [magento/magento2#27273](https://github.com/magento/magento2/pull/27273) -- MFTF: Test isolation, consistent naming (backwards-compatible) (by @lbajsarowicz)
+    * [magento/magento2#27237](https://github.com/magento/magento2/pull/27237) -- magento/magento2#26749: Saving CMS Page Title from REST web API makes content empty (by @engcom-Charlie)
+    * [magento/magento2#27215](https://github.com/magento/magento2/pull/27215) -- Cleanup ObjectManager usage - Magento_Translation (by @Bartlomiejsz)
+    * [magento/magento2#27191](https://github.com/magento/magento2/pull/27191) -- 26827 Added improvements to product attribute repository (save method) (by @sergiy-v)
+    * [magento/magento2#27125](https://github.com/magento/magento2/pull/27125) -- #27124: Update wishlist image logic to match logic on wishlist page (by @mtbottens)
+    * [magento/magento2#26015](https://github.com/magento/magento2/pull/26015) -- Remove media gallery assets metadata when a directory removed (by @rogyar)
+    * [magento/magento2#25734](https://github.com/magento/magento2/pull/25734) -- Experius 2.3 patch catalog flat (by @lewisvoncken)
+    * [magento/magento2#23191](https://github.com/magento/magento2/pull/23191) -- Refactor addlinks to own class take 3 (follows #21658) (by @amenk)
+    * [magento/magento2#27336](https://github.com/magento/magento2/pull/27336) -- fixed My account Address Book Additional Address Entries table issue #27335 (by @abrarpathan19)
+    * [magento/magento2#27304](https://github.com/magento/magento2/pull/27304) -- FIX #14080 Added improvements to Category repository (save method) (by @sergiy-v)
+    * [magento/magento2#27298](https://github.com/magento/magento2/pull/27298) -- Implement ActionInterface for `cms/page/view` (by @lbajsarowicz)
+    * [magento/magento2#27292](https://github.com/magento/magento2/pull/27292) -- Magento_Bundle / Remove `cache:flush` and extract Tests to separate files (by @lbajsarowicz)
+    * [magento/magento2#27263](https://github.com/magento/magento2/pull/27263) -- #26708 Fix: ORDER BY has two similar conditions in the SQL query (by @vasilii-b)
+    * [magento/magento2#27214](https://github.com/magento/magento2/pull/27214) -- Mark AbstractAccount as DEPRECATED for Magento_Customer controllers (by @lbajsarowicz)
+    * [magento/magento2#27116](https://github.com/magento/magento2/pull/27116) -- Add Italy States (by @WaPoNe)
+    * [magento/magento2#26748](https://github.com/magento/magento2/pull/26748) -- magento#26745 add method setAdditionalInformation to OrderPaymentInte… (by @antoninobonumore)
+    * [magento/magento2#26923](https://github.com/magento/magento2/pull/26923) -- Improve dashboard charts - migrate to chart.js (by @Bartlomiejsz)
+    * [magento/magento2#27390](https://github.com/magento/magento2/pull/27390) -- magento/magento2: fixes PHPDocs for module Magento_reports (by @andrewbess)
+    * [magento/magento2#27375](https://github.com/magento/magento2/pull/27375) -- Updating link to Adobe CLA in contributing.md (by @filmaj)
+    * [magento/magento2#27353](https://github.com/magento/magento2/pull/27353) -- Add xml declaration for catalog_widget_product_list.xml file (by @Usik2203)
+    * [magento/magento2#27334](https://github.com/magento/magento2/pull/27334) -- MFTF: Customer Subscribes To Newsletter Subscription On StoreFront (by @DmitryTsymbal)
+    * [magento/magento2#27319](https://github.com/magento/magento2/pull/27319) -- Cleanup ObjectManager usage - Magento_Catalog ViewModel,Plugin (by @Bartlomiejsz)
+    * [magento/magento2#27307](https://github.com/magento/magento2/pull/27307) -- magento/magento2: Fixes for the schema cache.xsd (by @andrewbess)
+    * [magento/magento2#27276](https://github.com/magento/magento2/pull/27276) -- Add "Admin" prefix to Test and ActionGroup (by @lbajsarowicz)
+    * [magento/magento2#27000](https://github.com/magento/magento2/pull/27000) -- MFTF FIX: Remove Customer by e-mail does not filter by e-mail (by @lbajsarowicz)
+    * [magento/magento2#26538](https://github.com/magento/magento2/pull/26538) -- Refactor datetime class (by @Tjitse-E)
+    * [magento/magento2#25664](https://github.com/magento/magento2/pull/25664) -- magento/magento2#25540: Products are not displaying infront end after updating product via importing CSV. (by @p-bystritsky)
+    * [magento/magento2#22011](https://github.com/magento/magento2/pull/22011) -- magento/magento2#22010: Updates AbstractExtensibleObject and AbstractExtensibleModel annotations (by @atwixfirster)
+    * [magento/magento2#27378](https://github.com/magento/magento2/pull/27378) -- MFTF: Refactor `amOnPage` for Admin product edit page (by @lbajsarowicz)
+    * [magento/magento2#26055](https://github.com/magento/magento2/pull/26055) -- [Fixed] - HTML Validation issue Replace Attribute with data-* attribute (by @niravkrish)
+    * [magento/magento2#27412](https://github.com/magento/magento2/pull/27412) -- Added improvements to category url key validation logic (by @sergiy-v)
+    * [magento/magento2#27393](https://github.com/magento/magento2/pull/27393) -- Implement ActionInterface for /robots/index/index (by @Bartlomiejsz)
+    * [magento/magento2#27385](https://github.com/magento/magento2/pull/27385) -- Cleanup ObjectManager usage - Magento_SendFriend (by @Bartlomiejsz)
+    * [magento/magento2#27384](https://github.com/magento/magento2/pull/27384) -- Cleanup ObjectManager usage - Magento_Sitemap (by @Bartlomiejsz)
+    * [magento/magento2#27383](https://github.com/magento/magento2/pull/27383) -- #27370 Internet explorer issue:Default billing/shipping address not showing (by @vasilii-b)
+    * [magento/magento2#27381](https://github.com/magento/magento2/pull/27381) -- Implement ActionInterface for /captcha/refresh (by @lbajsarowicz)
+    * [magento/magento2#27360](https://github.com/magento/magento2/pull/27360) -- Move JS module initialization to separate tasks (by @krzksz)
+    * [magento/magento2#27088](https://github.com/magento/magento2/pull/27088) -- Fix Report date doesn't matching in configuration setting (by @Priya-V-Panchal)
+    * [magento/magento2#22837](https://github.com/magento/magento2/pull/22837) -- Short-term admin accounts #22833 (by @lfolco)
+    * [magento/magento2#26075](https://github.com/magento/magento2/pull/26075) -- Fix #6310 - Changing products 'this item has weight' using 'Update Attributes' is not possible (by @Bartlomiejsz)
+    * [magento/magento2#27388](https://github.com/magento/magento2/pull/27388) -- {ASI} :- Image size is not passed to image-uploader when inserting an image from new media gallery (by @konarshankar07)
+    * [magento/magento2#26999](https://github.com/magento/magento2/pull/26999) -- Fixed URL Rewrite addition/removal on product website add/remove (by @gwharton)
+    * [magento/magento2#27371](https://github.com/magento/magento2/pull/27371) -- [Admin] Do not allow HTML tags for the Product Attribute labels on save (by @vasilii-b)
+    * [magento/magento2#27509](https://github.com/magento/magento2/pull/27509) -- [MFTF] fixed test `AdminLoginWithRestrictPermissionTest` (by @engcom-Charlie)
+    * [magento/magento2#27462](https://github.com/magento/magento2/pull/27462) -- Implement ActionInterface for /search/term/popular (by @Bartlomiejsz)
+    * [magento/magento2#27427](https://github.com/magento/magento2/pull/27427) -- Implement ActionInterface for /swagger/ (by @lbajsarowicz)
+    * [magento/magento2#27425](https://github.com/magento/magento2/pull/27425) -- Implement ActionInterface for /version/ (by @lbajsarowicz)
+    * [magento/magento2#27413](https://github.com/magento/magento2/pull/27413) -- Add follow symlinks to support linked folders (by @Nazar65)
+    * [magento/magento2#27365](https://github.com/magento/magento2/pull/27365) -- Fix issue 16315: Product save with onthefly index ignores website assignments (by @tna274)
+    * [magento/magento2#27257](https://github.com/magento/magento2/pull/27257) -- Save Asynchronous Operations with one Batch improvement (by @nuzil)
+    * [magento/magento2#26763](https://github.com/magento/magento2/pull/26763) -- fix: prevent undefined index error - closes #26762 (by @DanielRuf)
+    * [magento/magento2#26736](https://github.com/magento/magento2/pull/26736) -- {ASI} : SortBy component added (by @konarshankar07)
+    * [magento/magento2#26618](https://github.com/magento/magento2/pull/26618) -- Correct docblock CartTotalRepository get method (by @mrtuvn)
+    * [magento/magento2#26417](https://github.com/magento/magento2/pull/26417) -- translate.js Not shows empty values  (by @ilnytskyi)
+    * [magento/magento2#27493](https://github.com/magento/magento2/pull/27493) -- Fix the minicart items actions alignment for tablet and desktop devices (by @vasilii-b)
+    * [magento/magento2#27492](https://github.com/magento/magento2/pull/27492) -- Fixed tests for Magento\Framework\Stdlib\DateTime\DateTime (by @andrewbess)
+    * [magento/magento2#27399](https://github.com/magento/magento2/pull/27399) -- Fixed the wrong behavior for a prompt modal when a user clicks on the modal overlay (by @serhiyzhovnir)
+    * [magento/magento2#26397](https://github.com/magento/magento2/pull/26397) -- Cleanup ObjectManager usage - Magento_Bundle (by @Bartlomiejsz)
+    * [magento/magento2#26100](https://github.com/magento/magento2/pull/26100) -- Fixed 24990: link doesn't redirect to dashboard (by @Usik2203)
+    * [magento/magento2#27545](https://github.com/magento/magento2/pull/27545) -- Fix XML Schema Location (by @sprankhub)
+    * [magento/magento2#27544](https://github.com/magento/magento2/pull/27544) -- Fix incorrect alignment element in login container theme blank (by @mrtuvn)
+    * [magento/magento2#27526](https://github.com/magento/magento2/pull/27526) -- [MFTF] using StorefrontOpenHomePageActionGroup for navigation to Home Page (by @Usik2203)
+    * [magento/magento2#27521](https://github.com/magento/magento2/pull/27521) -- PhpUnit 8 Migration - AdminNotification (by @ihor-sviziev)
+    * [magento/magento2#27497](https://github.com/magento/magento2/pull/27497) -- [bugfix] The store logo is missing when using the Magento_blank theme  (by @vasilii-b)
+    * [magento/magento2#27495](https://github.com/magento/magento2/pull/27495) -- Make the header switcher styles more flexible (by @vasilii-b)
+    * [magento/magento2#27463](https://github.com/magento/magento2/pull/27463) -- Implement ActionInterface for /checkout/sidebar/removeItem (by @Bartlomiejsz)
+    * [magento/magento2#27295](https://github.com/magento/magento2/pull/27295) -- Fix the error that is wrong link title of a downloadable product when enabling "Use Default Value" (by @tna274)
+    * [magento/magento2#26900](https://github.com/magento/magento2/pull/26900) -- Removed references to '%context%'  (dead code) (by @markshust)
+    * [magento/magento2#26801](https://github.com/magento/magento2/pull/26801) -- Prevent resizing an image if it was already resized before (by @hostep)
+    * [magento/magento2#27519](https://github.com/magento/magento2/pull/27519) -- PhpUnit 8 Migration - Framework & AdminAnalytics (by @ihor-sviziev)
+    * [magento/magento2#27322](https://github.com/magento/magento2/pull/27322) -- MFTF: Add `<magentoCron` instruction - Magento: Backend / Braintree / Captcha (by @lbajsarowicz)
+    * [magento/magento2#27321](https://github.com/magento/magento2/pull/27321) -- MFTF: Add `<magentoCron` instruction - Magento_Bundle (by @lbajsarowicz)
+    * [magento/magento2#27652](https://github.com/magento/magento2/pull/27652) -- Fix An error occurred during delete folder from a media gallery. (by @Nazar65)
+    * [magento/magento2#27627](https://github.com/magento/magento2/pull/27627) -- magento/magento2#27500 - Replace deprecated constructs from OfflinePa… (by @cristiano-pacheco)
+    * [magento/magento2#27597](https://github.com/magento/magento2/pull/27597) -- magento/partners-magento2ee#171  Cover reported Admin Log bug with MFTF tests (by @lbajsarowicz)
+    * [magento/magento2#27563](https://github.com/magento/magento2/pull/27563) -- [MFTF] Set correct url for CmsPageEditPage (by @Usik2203)
+    * [magento/magento2#27491](https://github.com/magento/magento2/pull/27491) -- Cleanup ObjectManager usage - Magento_Developer (by @Bartlomiejsz)
+    * [magento/magento2#27343](https://github.com/magento/magento2/pull/27343) -- 13851 Added improvements for credit memo total fields (by @sergiy-v)
+    * [magento/magento2#26988](https://github.com/magento/magento2/pull/26988) -- #26986 REST API Pagination issue (by @lbajsarowicz)
+    * [magento/magento2#26926](https://github.com/magento/magento2/pull/26926) -- Fix hard-code scope store string (by @mrtuvn)
+    * [magento/magento2#26036](https://github.com/magento/magento2/pull/26036) -- Fixes phpcs  errors and warnings for Magento\Framework\Image (by @krisdante)
+    * [magento/magento2#27671](https://github.com/magento/magento2/pull/27671) -- [MFTF] Use Action Group to click on minicart (by @Usik2203)
+    * [magento/magento2#27552](https://github.com/magento/magento2/pull/27552) -- Fix issue with loading mask on Admin Checkout (by @lbajsarowicz)
+    * [magento/magento2#27547](https://github.com/magento/magento2/pull/27547) -- Fix type hint for Select::where (by @marcusirgens)
+    * [magento/magento2#27676](https://github.com/magento/magento2/pull/27676) -- [MFTF] Added new actionGroup to click on first row on order grid (by @Usik2203)
+    * [magento/magento2#27522](https://github.com/magento/magento2/pull/27522) -- PhpUnit 8 Migration - Amqp (by @ihor-sviziev)
+    * [magento/magento2#27448](https://github.com/magento/magento2/pull/27448) -- Sitemap Observer Unit Test improvement: Expect email notification to send, and simplify setup a bit. (by @evktalo)
+    * [magento/magento2#27701](https://github.com/magento/magento2/pull/27701) -- #27638 Fix fatal errors in Unit Tests (by @lbajsarowicz)
+    * [magento/magento2#27689](https://github.com/magento/magento2/pull/27689) -- [MFTF] Using action group to go to admin category page (by @Usik2203)
+    * [magento/magento2#27685](https://github.com/magento/magento2/pull/27685) -- Removed a duplicate variable in Magento\QuoteGraphQl\Model\Resolver\Cart and in \Magento\QuoteGraphQl\Model\Resolver\SetBillingAddressOnCart (by @bgorski)
+    * [magento/magento2#27677](https://github.com/magento/magento2/pull/27677) -- [MFTF] Removed redundant ActionGroup (by @Usik2203)
+    * [magento/magento2#27603](https://github.com/magento/magento2/pull/27603) -- Fix zoom on search input #27506 (by @ptylek)
+    * [magento/magento2#27325](https://github.com/magento/magento2/pull/27325) -- MFTF: Fix failing CMS tests due to PageBuilder conflict (by @lbajsarowicz)
+    * [magento/magento2#27843](https://github.com/magento/magento2/pull/27843) -- [MFTF] Added assertion to AssertAdminSuccessLoginActionGroup (by @Usik2203)
+    * [magento/magento2#27841](https://github.com/magento/magento2/pull/27841) -- [MFTF] Remove redundant Index and Flush Cache action group (by @Usik2203)
+    * [magento/magento2#27692](https://github.com/magento/magento2/pull/27692) -- [MFTF] Use ActionGroup for checking category save success message. (by @Usik2203)
+    * [magento/magento2#27606](https://github.com/magento/magento2/pull/27606) -- Test coverage for PR #27589 (E-mail templates) (by @lbajsarowicz)
+    * [magento/magento2#26293](https://github.com/magento/magento2/pull/26293) -- Bugfix - Customer emails are not being sent from admin if customer is from store "0" (by @matheusgontijo)
+    * [magento/magento2#27846](https://github.com/magento/magento2/pull/27846) -- [MFTF] Use StorefrontOpenCartPageActionGroup to go to Checkout page (by @Usik2203)
+    * [magento/magento2#27300](https://github.com/magento/magento2/pull/27300) -- FIX #27299 Consecutive Requests in Integration Tests failing (by @lbajsarowicz)
+    * [magento/magento2#27499](https://github.com/magento/magento2/pull/27499) -- Updated MediaGallery modules and marked as API (by @sivaschenko)
+    * [magento/magento2#27536](https://github.com/magento/magento2/pull/27536) -- Introduced MediaContent and MediaContentApi modules (by @sivaschenko)
+    * [magento/magento2#27566](https://github.com/magento/magento2/pull/27566) -- Improve openDialog method initialization (by @Nazar65)
+    * [magento/magento2#27966](https://github.com/magento/magento2/pull/27966) -- Correct used in sections image pattern, minor fixes (by @Nazar65)
+    * [magento/magento2#27926](https://github.com/magento/magento2/pull/27926) -- Fixes incorrectly nested html in the product items list template. (by @hostep)
+    * [magento/magento2#27892](https://github.com/magento/magento2/pull/27892) -- Fixes unstable email integration tests (by @hostep)
+    * [magento/magento2#27887](https://github.com/magento/magento2/pull/27887) -- Fix Arabic and Hebrew in invoices (by @ihor-sviziev)
+    * [magento/magento2#27886](https://github.com/magento/magento2/pull/27886) -- Fixed #27874 Vat Validation URL for EU Vat numbers changed. (by @shikhamis11)
+    * [magento/magento2#27740](https://github.com/magento/magento2/pull/27740) -- Redirecting users to sales order history page (by @ajithkumar-maragathavel)
+    * [magento/magento2#27578](https://github.com/magento/magento2/pull/27578) -- Fix Magento Integrity Dependency test in case to be used not in scope of app/code isntallation. (by @swnsma)
+    * [magento/magento2#27323](https://github.com/magento/magento2/pull/27323) -- MFTF: Add `<magentoCron` instruction - CatalogImportExport / CatalogInventory / CatalogRule (by @lbajsarowicz)
+    * [magento/magento2#27093](https://github.com/magento/magento2/pull/27093) -- #27089 Fix issue with returning non-available default limit (by @lbajsarowicz)
+    * [magento/magento2#27994](https://github.com/magento/magento2/pull/27994) -- Refactoring of the plugin responsible for the image/directory delete functionality + adjust tests (by @coderimus)
+    * [magento/magento2#27976](https://github.com/magento/magento2/pull/27976) -- Can not create a subfolder with the same name as the main folder (by @engcom-Charlie)
+    * [magento/magento2#27964](https://github.com/magento/magento2/pull/27964) -- Deprecate AbstractAction and it's public methods (by @lbajsarowicz)
+    * [magento/magento2#27955](https://github.com/magento/magento2/pull/27955) -- compliance to StorefrontMinicartSection (by @engcom-Echo)
+    * [magento/magento2#27515](https://github.com/magento/magento2/pull/27515) -- #27503 : MFTF: Acceptance tests break the naming convention (Indexer + Backup) (by @konarshankar07)
+    * [magento/magento2#26886](https://github.com/magento/magento2/pull/26886) -- comments & validation added in cookie configuration (by @ajithkumar-maragathavel)
+
 2.3.3
 =============
 * GitHub issues:

From 6b16d94c61b2d621a7c4f908558f0ce1dc169728 Mon Sep 17 00:00:00 2001
From: Slava Mankivski <mankivsk@adobe.com>
Date: Thu, 16 Jul 2020 12:23:34 -0500
Subject: [PATCH 0900/1718] Fix static tests in MFTF

---
 ...erifyCheckboxIsDisabledCreatePermanentRedirectSetNoTest.xml | 1 +
 .../AdminCreateBuyXGetYFreeWithApplyShippingAmountTest.xml     | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminVerifyCheckboxIsDisabledCreatePermanentRedirectSetNoTest.xml b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminVerifyCheckboxIsDisabledCreatePermanentRedirectSetNoTest.xml
index 920ba679f4798..d529c6dd3ecc3 100644
--- a/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminVerifyCheckboxIsDisabledCreatePermanentRedirectSetNoTest.xml
+++ b/app/code/Magento/CatalogUrlRewrite/Test/Mftf/Test/AdminVerifyCheckboxIsDisabledCreatePermanentRedirectSetNoTest.xml
@@ -13,6 +13,7 @@
             <stories value="Url rewrites"/>
             <title value="Verify checkbox is disabled 'Create Permanent Redirect' set 'No'"/>
             <description value="Verify checkbox is disabled 'Create Permanent Redirect' set 'No' on category and product edit page."/>
+            <severity value="AVERAGE"/>
             <testCaseId value="MC-35589"/>
         </annotations>
         <before>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateBuyXGetYFreeWithApplyShippingAmountTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateBuyXGetYFreeWithApplyShippingAmountTest.xml
index 602e2a3544e96..c65aa9980666f 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateBuyXGetYFreeWithApplyShippingAmountTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateBuyXGetYFreeWithApplyShippingAmountTest.xml
@@ -10,8 +10,11 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminCreateBuyXGetYFreeWithApplyShippingAmountTest" extends="AdminCreateBuyXGetYFreeTest">
         <annotations>
+            <features value="SalesRule"/>
+            <stories value="Create cart price rule"/>
             <title value="Admin should be able to create a cart price rule of type Buy X get Y free enable 'Apply to Shipping Amount' "/>
             <description value="Use cart price rule of type Buy X get Y free with enable 'Apply to Shipping Amount'"/>
+            <severity value="MAJOR"/>
             <group value="SalesRule"/>
         </annotations>
 

From c792758b95d7cd22739b7aeacce44b5b581b83cc Mon Sep 17 00:00:00 2001
From: Anusha Vattam <avattam@adobe.com>
Date: Thu, 16 Jul 2020 15:59:16 -0500
Subject: [PATCH 0901/1718] MC-35653:MyAccount :: Order Details :: Payments
 Methods, shipping address, billing address by Order Number

- Fixed review comments
---
 .../SalesGraphQl/Model/Order/OrderAddress.php | 81 ++++++++-----------
 .../Model/Order/OrderPayments.php             | 16 +++-
 .../Magento/SalesGraphQl/etc/schema.graphqls  | 32 ++++----
 3 files changed, 63 insertions(+), 66 deletions(-)

diff --git a/app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php b/app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php
index 477425805aee7..e695ccb128eb3 100644
--- a/app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php
+++ b/app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php
@@ -8,8 +8,8 @@
 namespace Magento\SalesGraphQl\Model\Order;
 
 use Magento\Quote\Model\Quote\Address;
+use Magento\Sales\Api\Data\OrderAddressInterface;
 use Magento\Sales\Api\Data\OrderInterface;
-use Magento\Sales\Model\Order\Address as SalesOrderAddress;
 
 /**
  * Class to fetch the order address details
@@ -20,19 +20,16 @@ class OrderAddress
      * Get the order Shipping address
      *
      * @param OrderInterface $order
-     * @return array
+     * @return array|null
      */
     public function getOrderShippingAddress(
         OrderInterface $order
-    ): array {
-        $shippingAddress = [];
-        $orderAddresses = $order->getAddresses();
-        foreach ($orderAddresses as $orderAddress) {
-            if ($orderAddress->getDataByKey("address_type") === address::TYPE_SHIPPING) {
-                $shippingAddress = $this->OrderAddressDataFormatter(
-                    $orderAddress,
-                    address::TYPE_SHIPPING
-                );
+    ) {
+        $shippingAddress = null;
+        $orderShippingAddress = $order->getShippingAddress() ?? null;
+        if ($orderShippingAddress) {
+            if ($orderShippingAddress->getAddressType()  === ADDRESS::TYPE_SHIPPING) {
+                $shippingAddress = $this->OrderAddressDataFormatter($orderShippingAddress);
             }
         }
         return $shippingAddress;
@@ -42,19 +39,16 @@ public function getOrderShippingAddress(
      * Get the order billing address
      *
      * @param OrderInterface $order
-     * @return array
+     * @return array|null
      */
     public function getOrderBillingAddress(
         OrderInterface $order
-    ): array {
-        $billingAddress = [];
-        $orderAddresses = $order->getAddresses();
-        foreach ($orderAddresses as $orderAddress) {
-            if ($orderAddress->getDataByKey("address_type") === address::TYPE_BILLING) {
-                $billingAddress = $this->OrderAddressDataFormatter(
-                    $orderAddress,
-                    address::TYPE_BILLING
-                );
+    ) {
+        $billingAddress = null;
+        $orderBillingAddress = $order->getBillingAddress() ?? null;
+        if ($orderBillingAddress) {
+            if ($orderBillingAddress->getAddressType() === ADDRESS::TYPE_BILLING) {
+                $billingAddress = $this->OrderAddressDataFormatter($orderBillingAddress);
             }
         }
         return $billingAddress;
@@ -63,34 +57,29 @@ public function getOrderBillingAddress(
     /**
      * Customer Order address data formatter
      *
-     * @param SalesOrderAddress $orderAddress
-     * @param string $addressType
+     * @param OrderAddressInterface $orderAddress
      * @return array
      */
     private function OrderAddressDataFormatter(
-        SalesOrderAddress $orderAddress,
-        string $addressType
+        OrderAddressInterface $orderAddress
     ): array {
-        $orderAddressData = [];
-        if ($addressType === $orderAddress->getDataByKey("address_type")) {
-            $orderAddressData = [
-                    'firstname' => $orderAddress->getDataByKey('firstname'),
-                    'lastname' => $orderAddress->getDataByKey('lastname'),
-                    'middlename' => $orderAddress->getDataByKey('middlename'),
-                    'postcode' => $orderAddress->getDataByKey('postcode'),
-                    'prefix' => $orderAddress->getDataByKey('prefix'),
-                    'suffix' => $orderAddress->getDataByKey('suffix'),
-                    'city' => $orderAddress->getDataByKey('city'),
-                    'company' => $orderAddress->getDataByKey('company'),
-                    'fax' => $orderAddress->getDataByKey('fax'),
-                    'telephone' => $orderAddress->getDataByKey('telephone'),
-                    'vat_id' => $orderAddress->getDataByKey('vat_id'),
-                    'street' => explode("\n", $orderAddress->getDataByKey('street')),
-                    'country_code' => $orderAddress->getDataByKey('country_id'),
-                    'region' => $orderAddress->getDataByKey('region'),
-                    'region_id' => $orderAddress->getDataByKey('region_id')
-                ];
-        }
-        return $orderAddressData;
+        return
+            [
+                'firstname' => $orderAddress->getFirstname(),
+                'lastname' => $orderAddress->getLastname(),
+                'middlename' => $orderAddress->getMiddlename(),
+                'postcode' => $orderAddress->getPostcode(),
+                'prefix' => $orderAddress->getFirstname(),
+                'suffix' => $orderAddress->getFirstname(),
+                'street' => $orderAddress->getStreet(),
+                'country_code' => $orderAddress->getCountryId(),
+                'city' => $orderAddress->getCity(),
+                'company' => $orderAddress->getCompany(),
+                'fax' => $orderAddress->getFax(),
+                'telephone' => $orderAddress->getTelephone(),
+                'vat_id' => $orderAddress->getVatId(),
+                'region_id' => $orderAddress->getRegionId(),
+                'region' => $orderAddress->getRegion()
+            ];
     }
 }
diff --git a/app/code/Magento/SalesGraphQl/Model/Order/OrderPayments.php b/app/code/Magento/SalesGraphQl/Model/Order/OrderPayments.php
index 99f31793d64b5..84d1881ecaed8 100644
--- a/app/code/Magento/SalesGraphQl/Model/Order/OrderPayments.php
+++ b/app/code/Magento/SalesGraphQl/Model/Order/OrderPayments.php
@@ -21,9 +21,18 @@ class OrderPayments
     public function getOrderPaymentMethod(OrderInterface $orderModel): array
     {
         $orderPayment = $orderModel->getPayment();
+        $paymentAdditionalInfo =  $orderModel->getExtensionAttributes()->getPaymentAdditionalInfo();
+        $paymentAdditionalData = [];
+        foreach ($paymentAdditionalInfo as $key => $paymentAdditionalInfoDetails) {
+            $paymentAdditionalData[$key]['name'] = $paymentAdditionalInfoDetails->getKey();
+            $paymentAdditionalData[$key]['value'] = $paymentAdditionalInfoDetails->getValue();
+        }
         $additionalInformationCcType = $orderPayment->getCcType();
         $additionalInformationCcNumber = $orderPayment->getCcLast4();
-        if ($orderPayment->getMethod() === 'checkmo' || $orderPayment->getMethod() === 'free') {
+        if ($orderPayment->getMethod() === 'checkmo' || $orderPayment->getMethod() === 'free' ||
+            $orderPayment->getMethod() === 'purchaseorder' ||$orderPayment->getMethod() === 'cashondelivery' ||
+            $orderPayment->getMethod() === 'banktransfer'
+        ) {
             $additionalData = [];
         } else {
             $additionalData = [
@@ -40,11 +49,10 @@ public function getOrderPaymentMethod(OrderInterface $orderModel): array
 
         return [
             [
-                'name' => $orderPayment->getAdditionalInformation()['method_title'],
-                'type' => $orderPayment->getMethod(),
+                'name' => $orderPayment->getAdditionalInformation()['method_title'] ?? null,
+                'type' => $orderPayment->getMethod() ?? null,
                 'additional_data' => $additionalData
             ]
         ];
     }
 }
-
diff --git a/app/code/Magento/SalesGraphQl/etc/schema.graphqls b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
index e40e0d931ceb6..218619e0ced34 100644
--- a/app/code/Magento/SalesGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
@@ -59,22 +59,22 @@ type CustomerOrder @doc(description: "Contains details about each of the custome
     grand_total: Float  @deprecated(reason: "Use the totals.grand_total attribute instead")
 }
 
-type OrderAddress @doc(description: "OrderAddress contains detailed information about the order billing and shipping addresses"){
-    firstname: String! @doc(description: "The first name of the person associated with the shipping/billing address on the order")
-    lastname: String! @doc(description: "The family name of the person associated with the shipping/billing address on the order")
-    middlename: String @doc(description: "The middle name of the person associated with the shipping/billing address on the order")
-    region: String @doc(description: "The state or province name on the order")
-    region_id: ID @doc(description: "The unique ID for a pre-defined region on the order")
-    country_code: CountryCodeEnum @doc(description: "The customer's country on the order")
-    street: [String]! @doc(description: "An array of strings that define the street number and name on the order")
-    company: String @doc(description: "The customer's company on the order")
-    telephone: String! @doc(description: "The telephone number on the order")
-    fax: String @doc(description: "The fax number on the order")
-    postcode: String @doc(description: "The customer's order ZIP or postal code on the order")
-    city: String! @doc(description: "The city or town on the order")
-    prefix: String @doc(description: "An honorific, such as Dr., Mr., or Mrs. on the order")
-    suffix: String @doc(description: "A value such as Sr., Jr., or III on the order")
-    vat_id: String @doc(description: "The customer's Value-added tax (VAT) number (for corporate customers) on the order")
+type OrderAddress @doc(description: "OrderAddress contains detailed information about an order's billing and shipping addresses"){
+    firstname: String! @doc(description: "The first name of the person associated with the shipping/billing address")
+    lastname: String! @doc(description: "The family name of the person associated with the shipping/billing address")
+    middlename: String @doc(description: "The middle name of the person associated with the shipping/billing address")
+    region: String @doc(description: "The state or province name")
+    region_id: ID @doc(description: "The unique ID for a pre-defined region")
+    country_code: CountryCodeEnum @doc(description: "The customer's country")
+    street: [String!]! @doc(description: "An array of strings that define the street number and name")
+    company: String @doc(description: "The customer's company")
+    telephone: String! @doc(description: "The telephone number")
+    fax: String @doc(description: "The fax number")
+    postcode: String @doc(description: "The customer's order ZIP or postal code")
+    city: String! @doc(description: "The city or town")
+    prefix: String @doc(description: "An honorific, such as Dr., Mr., or Mrs.")
+    suffix: String @doc(description: "A value such as Sr., Jr., or III")
+    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") {

From 4148fc2c7442a3804b930074556462ed46c41fe2 Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Thu, 16 Jul 2020 16:20:01 -0500
Subject: [PATCH 0902/1718] MC-32014: Remove google-shopping-ads module from
 core in 2.4.1

---
 app/etc/di.xml                                |  3 ++
 .../Magento/Framework/Indexer/Config.php      | 29 +++++++++++++++++
 .../{OldViews.php => TriggerCleaner.php}      | 11 ++++---
 .../Mview/TriggerCleanerInterface.php         | 20 ++++++++++++
 .../Framework/Mview/View/State/Collection.php | 21 +++++++++++++
 setup/config/di.config.php                    | 31 +++++++++++++------
 setup/src/Magento/Setup/Model/Installer.php   | 10 +++---
 7 files changed, 106 insertions(+), 19 deletions(-)
 create mode 100644 lib/internal/Magento/Framework/Indexer/Config.php
 rename lib/internal/Magento/Framework/Mview/{OldViews.php => TriggerCleaner.php} (94%)
 create mode 100644 lib/internal/Magento/Framework/Mview/TriggerCleanerInterface.php
 create mode 100644 lib/internal/Magento/Framework/Mview/View/State/Collection.php

diff --git a/app/etc/di.xml b/app/etc/di.xml
index ba635d0662755..93f16b3cd69de 100644
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -209,6 +209,9 @@
     <preference for="Magento\Framework\MessageQueue\QueueFactoryInterface" type="Magento\Framework\MessageQueue\QueueFactory" />
     <preference for="Magento\Framework\Search\Request\IndexScopeResolverInterface" type="Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver"/>
     <preference for="Magento\Framework\HTTP\ClientInterface" type="Magento\Framework\HTTP\Client\Curl" />
+    <preference for="Magento\Framework\Mview\TriggerCleanerInterface" type="\Magento\Framework\Mview\TriggerCleaner"/>
+    <preference for="Magento\Framework\Indexer\ConfigInterface" type="\Magento\Framework\Indexer\Config"/>
+    <preference for="Magento\Framework\Mview\View\State\CollectionInterface" type="Magento\Framework\Mview\View\State\Collection" />
     <type name="Magento\Framework\Model\ResourceModel\Db\TransactionManager" shared="false" />
     <type name="Magento\Framework\Acl\Data\Cache">
         <arguments>
diff --git a/lib/internal/Magento/Framework/Indexer/Config.php b/lib/internal/Magento/Framework/Indexer/Config.php
new file mode 100644
index 0000000000000..97584379b7ab5
--- /dev/null
+++ b/lib/internal/Magento/Framework/Indexer/Config.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Indexer;
+
+/**
+ * Indexers configuration
+ */
+class Config implements ConfigInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function getIndexers()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getIndexer($indexerId)
+    {
+        return [];
+    }
+}
diff --git a/lib/internal/Magento/Framework/Mview/OldViews.php b/lib/internal/Magento/Framework/Mview/TriggerCleaner.php
similarity index 94%
rename from lib/internal/Magento/Framework/Mview/OldViews.php
rename to lib/internal/Magento/Framework/Mview/TriggerCleaner.php
index 816ca9bad27cd..de670e2b63fd2 100644
--- a/lib/internal/Magento/Framework/Mview/OldViews.php
+++ b/lib/internal/Magento/Framework/Mview/TriggerCleaner.php
@@ -14,7 +14,7 @@
 /**
  * Class for removing old triggers that were created by mview
  */
-class OldViews
+class TriggerCleaner implements TriggerCleanerInterface
 {
     /**
      * @var CollectionFactory
@@ -47,16 +47,16 @@ public function __construct(
     }
 
     /**
-     * Unsubscribe old views by existing triggers
+     * @inheritDoc
+     * @throws \Exception
      */
-    public function unsubscribe(): void
+    public function unsubscribe(): bool
     {
         $viewCollection = $this->viewCollectionFactory->create();
         $viewList = $viewCollection->getViewsByStateMode(StateInterface::MODE_ENABLED);
 
         // Unsubscribe mviews
         foreach ($viewList as $view) {
-            /** @var ViewInterface $view */
             $view->unsubscribe();
         }
 
@@ -70,9 +70,10 @@ public function unsubscribe(): void
 
         // Re-subscribe mviews
         foreach ($viewList as $view) {
-            /** @var ViewInterface $view */
             $view->subscribe();
         }
+
+        return true;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Mview/TriggerCleanerInterface.php b/lib/internal/Magento/Framework/Mview/TriggerCleanerInterface.php
new file mode 100644
index 0000000000000..5991a5f01c398
--- /dev/null
+++ b/lib/internal/Magento/Framework/Mview/TriggerCleanerInterface.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Mview;
+
+/**
+ * Service for processing of DB triggers
+ */
+interface TriggerCleanerInterface
+{
+    /**
+     * Remove the outdated trigger from the system
+     *
+     * @return bool
+     */
+    public function unsubscribe(): bool;
+}
diff --git a/lib/internal/Magento/Framework/Mview/View/State/Collection.php b/lib/internal/Magento/Framework/Mview/View/State/Collection.php
new file mode 100644
index 0000000000000..a992656895c72
--- /dev/null
+++ b/lib/internal/Magento/Framework/Mview/View/State/Collection.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Mview\View\State;
+
+/**
+ * View state collection
+ */
+class Collection implements CollectionInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function getItems()
+    {
+        return [];
+    }
+}
diff --git a/setup/config/di.config.php b/setup/config/di.config.php
index b9f2ebe2fa4e0..514ba46ea3192 100644
--- a/setup/config/di.config.php
+++ b/setup/config/di.config.php
@@ -4,20 +4,33 @@
  * See COPYING.txt for license details.
  */
 
+use Laminas\EventManager\EventManagerInterface;
+use Laminas\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\ServiceManager;
+use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Component\ComponentRegistrarInterface;
+use Magento\Framework\DB\Logger\Quiet;
+use Magento\Framework\DB\LoggerInterface;
+use Magento\Framework\Filesystem\DriverInterface;
+use Magento\Framework\Locale\Config;
+use Magento\Framework\Locale\ConfigInterface;
+use Magento\Framework\Mview\TriggerCleaner;
+use Magento\Framework\Mview\TriggerCleanerInterface;
+use Magento\Framework\Setup\Declaration\Schema\SchemaConfig;
+
 return [
     'di' => [
         'instance' => [
             'preference' => [
-                \Laminas\EventManager\EventManagerInterface::class => 'EventManager',
-                \Laminas\ServiceManager\ServiceLocatorInterface::class => \Laminas\ServiceManager\ServiceManager::class,
-                \Magento\Framework\DB\LoggerInterface::class => \Magento\Framework\DB\Logger\Quiet::class,
-                \Magento\Framework\Locale\ConfigInterface::class => \Magento\Framework\Locale\Config::class,
-                \Magento\Framework\Filesystem\DriverInterface::class =>
-                    \Magento\Framework\Filesystem\Driver\File::class,
-                \Magento\Framework\Component\ComponentRegistrarInterface::class =>
-                    \Magento\Framework\Component\ComponentRegistrar::class,
+                EventManagerInterface::class => 'EventManager',
+                ServiceLocatorInterface::class => ServiceManager::class,
+                LoggerInterface::class => Quiet::class,
+                ConfigInterface::class => Config::class,
+                DriverInterface::class => \Magento\Framework\Filesystem\Driver\File::class,
+                ComponentRegistrarInterface::class => ComponentRegistrar::class,
+                TriggerCleanerInterface::class => TriggerCleaner::class,
             ],
-            \Magento\Framework\Setup\Declaration\Schema\SchemaConfig::class => [
+            SchemaConfig::class => [
                 'parameters' => [
                     'connectionScopes' => [
                         'default',
diff --git a/setup/src/Magento/Setup/Model/Installer.php b/setup/src/Magento/Setup/Model/Installer.php
index 13a9eeaafd9ef..955d3b2dc1365 100644
--- a/setup/src/Magento/Setup/Model/Installer.php
+++ b/setup/src/Magento/Setup/Model/Installer.php
@@ -25,7 +25,7 @@
 use Magento\Framework\Model\ResourceModel\Db\Context;
 use Magento\Framework\Module\ModuleList\Loader as ModuleLoader;
 use Magento\Framework\Module\ModuleListInterface;
-use Magento\Framework\Mview\OldViews;
+use Magento\Framework\Mview\TriggerCleanerInterface;
 use Magento\Framework\Setup\Declaration\Schema\DryRunLogger;
 use Magento\Framework\Setup\FilePermissions;
 use Magento\Framework\Setup\InstallDataInterface;
@@ -249,9 +249,9 @@ class Installer
     private $patchApplierFactory;
 
     /**
-     * @var OldViews
+     * @var TriggerCleanerInterface
      */
-    private $oldViews;
+    private $triggerCleaner;
 
     /**
      * Constructor
@@ -326,7 +326,7 @@ public function __construct(
         $this->componentRegistrar = $componentRegistrar;
         $this->phpReadinessCheck = $phpReadinessCheck;
         $this->schemaPersistor = $this->objectManagerProvider->get()->get(SchemaPersistor::class);
-        $this->oldViews = $this->objectManagerProvider->get()->get(OldViews::class);
+        $this->triggerCleaner = $this->objectManagerProvider->get()->get(TriggerCleanerInterface::class);
     }
 
     /**
@@ -1659,6 +1659,6 @@ private function updateColumnType(
      */
     public function removeUnusedTriggers(): void
     {
-        $this->oldViews->unsubscribe();
+        $this->triggerCleaner->unsubscribe();
     }
 }

From 9de0cf28a4c1f7fd775a9c74b1fcafb65d052362 Mon Sep 17 00:00:00 2001
From: Volodymyr Zaets <vzaets@magento.com>
Date: Thu, 16 Jul 2020 18:41:20 -0500
Subject: [PATCH 0903/1718] Release artifact preparation

---
 CHANGELOG.md | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc0f5b058862b..462141ea4100d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -227,6 +227,26 @@
     * [#1270](https://github.com/magento/magento2/issues/1270) -- back button not working in edit order status (fixed in [magento/magento2#27976](https://github.com/magento/magento2/pull/27976))
     * [#27897](https://github.com/magento/magento2/issues/27897) -- MFTF: Inconsistent case in Section name (fixed in [magento/magento2#27955](https://github.com/magento/magento2/pull/27955))
     * [#27503](https://github.com/magento/magento2/issues/27503) -- MFTF: Acceptance tests break the naming convention (fixed in [magento/magento2#27515](https://github.com/magento/magento2/pull/27515))
+    * [#15](https://github.com/magento/magento2-login-as-customer/issues/15) -- Remove Login as Customer actions from admin grids (fixed in [magento/magento2-login-as-customer#23](https://github.com/magento/magento2-login-as-customer/pull/23))
+    * [#34](https://github.com/magento/magento2-login-as-customer/issues/34) -- Remove option to merge guest cart (fixed in [magento/magento2-login-as-customer#49](https://github.com/magento/magento2-login-as-customer/pull/49))
+    * [#110](https://github.com/magento/magento2-login-as-customer/issues/110) -- Need to add spinner/loader while Admin is logging in as Customer (fixed in [magento/magento2-login-as-customer#123](https://github.com/magento/magento2-login-as-customer/pull/123))
+    * [#159](https://github.com/magento/magento2-login-as-customer/issues/159) -- Error is shown on the page if customer is not sign out from account (fixed in [magento/magento2-login-as-customer#164](https://github.com/magento/magento2-login-as-customer/pull/164))
+    * [#102](https://github.com/magento/magento2-login-as-customer/issues/102) -- Admin user is logged into the default website if customer registered on second website (fixed in [magento/magento2-login-as-customer#148](https://github.com/magento/magento2-login-as-customer/pull/148))
+    * [#59](https://github.com/magento/magento2-login-as-customer/issues/59) -- Customer data not invalidated private content after logged in (fixed in [magento/magento2-login-as-customer#68](https://github.com/magento/magento2-login-as-customer/pull/68))
+    * [#33](https://github.com/magento/magento2-login-as-customer/issues/33) -- Update Readme.txt (fixed in [magento/magento2-login-as-customer#64](https://github.com/magento/magento2-login-as-customer/pull/64))
+    * [#60](https://github.com/magento/magento2-login-as-customer/issues/60) -- Customer data sometimes not being cleared when logging in as customer (fixed in [magento/magento2-login-as-customer#75](https://github.com/magento/magento2-login-as-customer/pull/75))
+    * [#73](https://github.com/magento/magento2-login-as-customer/issues/73) -- Page title is empty when admin login as customer (fixed in [magento/magento2-login-as-customer#92](https://github.com/magento/magento2-login-as-customer/pull/92))
+    * [#55](https://github.com/magento/magento2-login-as-customer/issues/55) -- [DEV] Need to update/change titles for ACL resource tree related to Login as Customer (fixed in [magento/magento2-login-as-customer#69](https://github.com/magento/magento2-login-as-customer/pull/69))
+    * [#8](https://github.com/magento/magento2-login-as-customer/issues/8) -- Merge initial module (fixed in [magento/magento2-login-as-customer#7](https://github.com/magento/magento2-login-as-customer/pull/7))
+    * [#122](https://github.com/magento/magento2-login-as-customer/issues/122) -- Issue 96 (fixed in [magento/magento2-login-as-customer#123](https://github.com/magento/magento2-login-as-customer/pull/123))
+    * [#71](https://github.com/magento/magento2-login-as-customer/issues/71) -- Login As Customer functionality is available when Login As Customer->Enable Extension=No (fixed in [magento/magento2-login-as-customer#121](https://github.com/magento/magento2-login-as-customer/pull/121))
+    * [#16](https://github.com/magento/magento2-login-as-customer/issues/16) -- All System Configuration settings should be on Global level (fixed in [magento/magento2-login-as-customer#120](https://github.com/magento/magento2-login-as-customer/pull/120))
+    * [#56](https://github.com/magento/magento2-login-as-customer/issues/56) -- [DEV] Confirmation pop-up window for "Login as Customer" if the setting "Store View To Log In" = "Manual Chooser" (fixed in [magento/magento2-login-as-customer#119](https://github.com/magento/magento2-login-as-customer/pull/119))
+    * [#100](https://github.com/magento/magento2-login-as-customer/issues/100) -- Moved all UI from LoginAsCustomer to new LoginAsCustomerUi module (fixed in [magento/magento2-login-as-customer#101](https://github.com/magento/magento2-login-as-customer/pull/101))
+    * [#97](https://github.com/magento/magento2-login-as-customer/issues/97) -- Refactor Magento\LoginAsCustomer\Model\Login Model (fixed in [magento/magento2-login-as-customer#99](https://github.com/magento/magento2-login-as-customer/pull/99))
+    * [#17](https://github.com/magento/magento2-login-as-customer/issues/17) -- Notification banner on storefront (fixed in [magento/magento2-login-as-customer#87](https://github.com/magento/magento2-login-as-customer/pull/87))
+    * [#10](https://github.com/magento/magento2-login-as-customer/issues/10) -- Controllers refactoring (fixed in [magento/magento2-login-as-customer#21](https://github.com/magento/magento2-login-as-customer/pull/21))
+
 * GitHub pull requests:
     * [magento/magento2#25905](https://github.com/magento/magento2/pull/25905) -- [Checkout] Cover DirectoryData by Unit Test (by @edenduong)
     * [magento/magento2#25808](https://github.com/magento/magento2/pull/25808) -- No marginal white space validation added (by @ajithkumar-maragathavel)
@@ -1184,6 +1204,25 @@
     * [magento/magento2#23917](https://github.com/magento/magento2/pull/23917) -- Resolve Missing Validation at some Payment Method Settings issue 23916 (by @edenduong)
     * [magento/magento2#23919](https://github.com/magento/magento2/pull/23919) -- class ApplyAttributesUpdate  should use \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE instead of fixing "bundle" (by @edenduong)
     * [magento/magento2#23933](https://github.com/magento/magento2/pull/23933) -- Fix display of decimal quantities for wishlist items (by @mfickers)
+    * [magento/magento2-login-as-customer#23](https://github.com/magento/magento2-login-as-customer/pull/23) -- Removed "Login As Customer" action from Orders & Customers grid (by @ihorvansach)
+    * [magento/magento2-login-as-customer#49](https://github.com/magento/magento2-login-as-customer/pull/49) -- 34 remove option to merge guest cart v2 (by @ihorvansach)
+    * [magento/magento2-login-as-customer#123](https://github.com/magento/magento2-login-as-customer/pull/123) -- Added spinner/loader while Admin is logging in as Customer (by @ihorvansach)
+    * [magento/magento2-login-as-customer#164](https://github.com/magento/magento2-login-as-customer/pull/164) -- Magento2 login as customer/issues/159 (by @ihorvansach)
+    * [magento/magento2-login-as-customer#148](https://github.com/magento/magento2-login-as-customer/pull/148) -- magento2-login-as-customer/issues/102 (by @ihorvansach)
+    * [magento/magento2-login-as-customer#68](https://github.com/magento/magento2-login-as-customer/pull/68) -- login-as-customer/issues/59: Customer data not invalidated private content after logged in (by @nntoan)
+    * [magento/magento2-login-as-customer#64](https://github.com/magento/magento2-login-as-customer/pull/64) -- Update readme installation instructions (by @barryvdh)
+    * [magento/magento2-login-as-customer#75](https://github.com/magento/magento2-login-as-customer/pull/75) -- Resolved login-as-customer/issues/60 (by @erfanimani)
+    * [magento/magento2-login-as-customer#92](https://github.com/magento/magento2-login-as-customer/pull/92) -- Page title is empty when admin login as customer (by @konarshankar07)
+    * [magento/magento2-login-as-customer#69](https://github.com/magento/magento2-login-as-customer/pull/69) -- Need to update/change titles for ACL resource tree related to Login as Customer (by @konarshankar07)
+    * [magento/magento2-login-as-customer#7](https://github.com/magento/magento2-login-as-customer/pull/7) -- Merge module code improvements (by @ihorvansach)
+    * [magento/magento2-login-as-customer#123](https://github.com/magento/magento2-login-as-customer/pull/123) -- Added spinner/loader while Admin is logging in as Customer (by @ihorvansach)
+    * [magento/magento2-login-as-customer#121](https://github.com/magento/magento2-login-as-customer/pull/121) -- Login As Customer functionality is available when Login As Customer is disabled [fixed] (by @ihorvansach)
+    * [magento/magento2-login-as-customer#120](https://github.com/magento/magento2-login-as-customer/pull/120) -- All System Configuration settings should be on Global level (by @ihorvansach)
+    * [magento/magento2-login-as-customer#119](https://github.com/magento/magento2-login-as-customer/pull/119) -- Confirmation pop-up window for "Login as Customer" (New Request) (by @ihorvansach)
+    * [magento/magento2-login-as-customer#101](https://github.com/magento/magento2-login-as-customer/pull/101) -- Moved all UI from LoginAsCustomer to new LoginAsCustomerUi module (by @ihorvansach)
+    * [magento/magento2-login-as-customer#99](https://github.com/magento/magento2-login-as-customer/pull/99) -- Moved code related to the shopping cart from LoginAsCustomer to LogiAsCustomerSales extension (by @ihorvansach)
+    * [magento/magento2-login-as-customer#87](https://github.com/magento/magento2-login-as-customer/pull/87) -- 17 Notification banner on storefront [fixed: The banner is not showing] (by @ihorvansach)
+    * [magento/magento2-login-as-customer#21](https://github.com/magento/magento2-login-as-customer/pull/21) -- Login As Customer Controllers refactoring (by @ihorvansach)
 
 2.3.2
 =============

From 7d23468710305c2d97a48352167c4c9b372fe7bd Mon Sep 17 00:00:00 2001
From: Volodymyr Zaets <vzaets@magento.com>
Date: Thu, 16 Jul 2020 18:45:48 -0500
Subject: [PATCH 0904/1718] Release artifact preparation

---
 CHANGELOG.md | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 462141ea4100d..2f6417854c9f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -792,6 +792,25 @@
     * [magento/magento2#27955](https://github.com/magento/magento2/pull/27955) -- compliance to StorefrontMinicartSection (by @engcom-Echo)
     * [magento/magento2#27515](https://github.com/magento/magento2/pull/27515) -- #27503 : MFTF: Acceptance tests break the naming convention (Indexer + Backup) (by @konarshankar07)
     * [magento/magento2#26886](https://github.com/magento/magento2/pull/26886) -- comments & validation added in cookie configuration (by @ajithkumar-maragathavel)
+    * [magento/magento2-login-as-customer#23](https://github.com/magento/magento2-login-as-customer/pull/23) -- Removed "Login As Customer" action from Orders & Customers grid (by @ihorvansach)
+    * [magento/magento2-login-as-customer#49](https://github.com/magento/magento2-login-as-customer/pull/49) -- 34 remove option to merge guest cart v2 (by @ihorvansach)
+    * [magento/magento2-login-as-customer#123](https://github.com/magento/magento2-login-as-customer/pull/123) -- Added spinner/loader while Admin is logging in as Customer (by @ihorvansach)
+    * [magento/magento2-login-as-customer#164](https://github.com/magento/magento2-login-as-customer/pull/164) -- Magento2 login as customer/issues/159 (by @ihorvansach)
+    * [magento/magento2-login-as-customer#148](https://github.com/magento/magento2-login-as-customer/pull/148) -- magento2-login-as-customer/issues/102 (by @ihorvansach)
+    * [magento/magento2-login-as-customer#68](https://github.com/magento/magento2-login-as-customer/pull/68) -- login-as-customer/issues/59: Customer data not invalidated private content after logged in (by @nntoan)
+    * [magento/magento2-login-as-customer#64](https://github.com/magento/magento2-login-as-customer/pull/64) -- Update readme installation instructions (by @barryvdh)
+    * [magento/magento2-login-as-customer#75](https://github.com/magento/magento2-login-as-customer/pull/75) -- Resolved login-as-customer/issues/60 (by @erfanimani)
+    * [magento/magento2-login-as-customer#92](https://github.com/magento/magento2-login-as-customer/pull/92) -- Page title is empty when admin login as customer (by @konarshankar07)
+    * [magento/magento2-login-as-customer#69](https://github.com/magento/magento2-login-as-customer/pull/69) -- Need to update/change titles for ACL resource tree related to Login as Customer (by @konarshankar07)
+    * [magento/magento2-login-as-customer#7](https://github.com/magento/magento2-login-as-customer/pull/7) -- Merge module code improvements (by @ihorvansach)
+    * [magento/magento2-login-as-customer#123](https://github.com/magento/magento2-login-as-customer/pull/123) -- Added spinner/loader while Admin is logging in as Customer (by @ihorvansach)
+    * [magento/magento2-login-as-customer#121](https://github.com/magento/magento2-login-as-customer/pull/121) -- Login As Customer functionality is available when Login As Customer is disabled [fixed] (by @ihorvansach)
+    * [magento/magento2-login-as-customer#120](https://github.com/magento/magento2-login-as-customer/pull/120) -- All System Configuration settings should be on Global level (by @ihorvansach)
+    * [magento/magento2-login-as-customer#119](https://github.com/magento/magento2-login-as-customer/pull/119) -- Confirmation pop-up window for "Login as Customer" (New Request) (by @ihorvansach)
+    * [magento/magento2-login-as-customer#101](https://github.com/magento/magento2-login-as-customer/pull/101) -- Moved all UI from LoginAsCustomer to new LoginAsCustomerUi module (by @ihorvansach)
+    * [magento/magento2-login-as-customer#99](https://github.com/magento/magento2-login-as-customer/pull/99) -- Moved code related to the shopping cart from LoginAsCustomer to LogiAsCustomerSales extension (by @ihorvansach)
+    * [magento/magento2-login-as-customer#87](https://github.com/magento/magento2-login-as-customer/pull/87) -- 17 Notification banner on storefront [fixed: The banner is not showing] (by @ihorvansach)
+    * [magento/magento2-login-as-customer#21](https://github.com/magento/magento2-login-as-customer/pull/21) -- Login As Customer Controllers refactoring (by @ihorvansach)
 
 2.3.3
 =============
@@ -1204,26 +1223,7 @@
     * [magento/magento2#23917](https://github.com/magento/magento2/pull/23917) -- Resolve Missing Validation at some Payment Method Settings issue 23916 (by @edenduong)
     * [magento/magento2#23919](https://github.com/magento/magento2/pull/23919) -- class ApplyAttributesUpdate  should use \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE instead of fixing "bundle" (by @edenduong)
     * [magento/magento2#23933](https://github.com/magento/magento2/pull/23933) -- Fix display of decimal quantities for wishlist items (by @mfickers)
-    * [magento/magento2-login-as-customer#23](https://github.com/magento/magento2-login-as-customer/pull/23) -- Removed "Login As Customer" action from Orders & Customers grid (by @ihorvansach)
-    * [magento/magento2-login-as-customer#49](https://github.com/magento/magento2-login-as-customer/pull/49) -- 34 remove option to merge guest cart v2 (by @ihorvansach)
-    * [magento/magento2-login-as-customer#123](https://github.com/magento/magento2-login-as-customer/pull/123) -- Added spinner/loader while Admin is logging in as Customer (by @ihorvansach)
-    * [magento/magento2-login-as-customer#164](https://github.com/magento/magento2-login-as-customer/pull/164) -- Magento2 login as customer/issues/159 (by @ihorvansach)
-    * [magento/magento2-login-as-customer#148](https://github.com/magento/magento2-login-as-customer/pull/148) -- magento2-login-as-customer/issues/102 (by @ihorvansach)
-    * [magento/magento2-login-as-customer#68](https://github.com/magento/magento2-login-as-customer/pull/68) -- login-as-customer/issues/59: Customer data not invalidated private content after logged in (by @nntoan)
-    * [magento/magento2-login-as-customer#64](https://github.com/magento/magento2-login-as-customer/pull/64) -- Update readme installation instructions (by @barryvdh)
-    * [magento/magento2-login-as-customer#75](https://github.com/magento/magento2-login-as-customer/pull/75) -- Resolved login-as-customer/issues/60 (by @erfanimani)
-    * [magento/magento2-login-as-customer#92](https://github.com/magento/magento2-login-as-customer/pull/92) -- Page title is empty when admin login as customer (by @konarshankar07)
-    * [magento/magento2-login-as-customer#69](https://github.com/magento/magento2-login-as-customer/pull/69) -- Need to update/change titles for ACL resource tree related to Login as Customer (by @konarshankar07)
-    * [magento/magento2-login-as-customer#7](https://github.com/magento/magento2-login-as-customer/pull/7) -- Merge module code improvements (by @ihorvansach)
-    * [magento/magento2-login-as-customer#123](https://github.com/magento/magento2-login-as-customer/pull/123) -- Added spinner/loader while Admin is logging in as Customer (by @ihorvansach)
-    * [magento/magento2-login-as-customer#121](https://github.com/magento/magento2-login-as-customer/pull/121) -- Login As Customer functionality is available when Login As Customer is disabled [fixed] (by @ihorvansach)
-    * [magento/magento2-login-as-customer#120](https://github.com/magento/magento2-login-as-customer/pull/120) -- All System Configuration settings should be on Global level (by @ihorvansach)
-    * [magento/magento2-login-as-customer#119](https://github.com/magento/magento2-login-as-customer/pull/119) -- Confirmation pop-up window for "Login as Customer" (New Request) (by @ihorvansach)
-    * [magento/magento2-login-as-customer#101](https://github.com/magento/magento2-login-as-customer/pull/101) -- Moved all UI from LoginAsCustomer to new LoginAsCustomerUi module (by @ihorvansach)
-    * [magento/magento2-login-as-customer#99](https://github.com/magento/magento2-login-as-customer/pull/99) -- Moved code related to the shopping cart from LoginAsCustomer to LogiAsCustomerSales extension (by @ihorvansach)
-    * [magento/magento2-login-as-customer#87](https://github.com/magento/magento2-login-as-customer/pull/87) -- 17 Notification banner on storefront [fixed: The banner is not showing] (by @ihorvansach)
-    * [magento/magento2-login-as-customer#21](https://github.com/magento/magento2-login-as-customer/pull/21) -- Login As Customer Controllers refactoring (by @ihorvansach)
-
+    
 2.3.2
 =============
 * GitHub issues:

From c5f1291bfd70249db5b060c6500031484ffa423d Mon Sep 17 00:00:00 2001
From: Volodymyr Zaets <vzaets@magento.com>
Date: Thu, 16 Jul 2020 18:47:03 -0500
Subject: [PATCH 0905/1718] Release artifact preparation

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f6417854c9f9..919f3f020088b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1223,7 +1223,7 @@
     * [magento/magento2#23917](https://github.com/magento/magento2/pull/23917) -- Resolve Missing Validation at some Payment Method Settings issue 23916 (by @edenduong)
     * [magento/magento2#23919](https://github.com/magento/magento2/pull/23919) -- class ApplyAttributesUpdate  should use \Magento\Catalog\Model\Product\Type::TYPE_BUNDLE instead of fixing "bundle" (by @edenduong)
     * [magento/magento2#23933](https://github.com/magento/magento2/pull/23933) -- Fix display of decimal quantities for wishlist items (by @mfickers)
-    
+
 2.3.2
 =============
 * GitHub issues:

From 11ab599a538cc3e613853d8561d5f5cb1c0a84c7 Mon Sep 17 00:00:00 2001
From: Anusha Vattam <avattam@adobe.com>
Date: Thu, 16 Jul 2020 20:04:06 -0500
Subject: [PATCH 0906/1718] MC-35653:MyAccount :: Order Details :: Payments
 Methods, shipping address, billing address by Order Number

- Added test assertions
---
 .../SalesGraphQl/Model/Order/OrderAddress.php | 17 ++--
 .../Model/Order/OrderPayments.php             | 32 +------
 .../Sales/RetrieveOrdersByOrderNumberTest.php | 87 +++++++++++++++++++
 3 files changed, 95 insertions(+), 41 deletions(-)

diff --git a/app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php b/app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php
index e695ccb128eb3..23ef25a81beae 100644
--- a/app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php
+++ b/app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php
@@ -7,12 +7,11 @@
 
 namespace Magento\SalesGraphQl\Model\Order;
 
-use Magento\Quote\Model\Quote\Address;
 use Magento\Sales\Api\Data\OrderAddressInterface;
 use Magento\Sales\Api\Data\OrderInterface;
 
 /**
- * Class to fetch the order address details
+ * Class to get the order address details
  */
 class OrderAddress
 {
@@ -26,11 +25,8 @@ public function getOrderShippingAddress(
         OrderInterface $order
     ) {
         $shippingAddress = null;
-        $orderShippingAddress = $order->getShippingAddress() ?? null;
-        if ($orderShippingAddress) {
-            if ($orderShippingAddress->getAddressType()  === ADDRESS::TYPE_SHIPPING) {
-                $shippingAddress = $this->OrderAddressDataFormatter($orderShippingAddress);
-            }
+        if ($order->getShippingAddress()) {
+            $shippingAddress = $this->OrderAddressDataFormatter($order->getShippingAddress());
         }
         return $shippingAddress;
     }
@@ -45,11 +41,8 @@ public function getOrderBillingAddress(
         OrderInterface $order
     ) {
         $billingAddress = null;
-        $orderBillingAddress = $order->getBillingAddress() ?? null;
-        if ($orderBillingAddress) {
-            if ($orderBillingAddress->getAddressType() === ADDRESS::TYPE_BILLING) {
-                $billingAddress = $this->OrderAddressDataFormatter($orderBillingAddress);
-            }
+        if ($order->getBillingAddress()) {
+            $billingAddress = $this->OrderAddressDataFormatter($order->getBillingAddress());
         }
         return $billingAddress;
     }
diff --git a/app/code/Magento/SalesGraphQl/Model/Order/OrderPayments.php b/app/code/Magento/SalesGraphQl/Model/Order/OrderPayments.php
index 84d1881ecaed8..90b262e479040 100644
--- a/app/code/Magento/SalesGraphQl/Model/Order/OrderPayments.php
+++ b/app/code/Magento/SalesGraphQl/Model/Order/OrderPayments.php
@@ -10,7 +10,7 @@
 use Magento\Sales\Api\Data\OrderInterface;
 
 /**
- * Class to fetch the order payment details
+ * Class to get the order payment details
  */
 class OrderPayments
 {
@@ -21,37 +21,11 @@ class OrderPayments
     public function getOrderPaymentMethod(OrderInterface $orderModel): array
     {
         $orderPayment = $orderModel->getPayment();
-        $paymentAdditionalInfo =  $orderModel->getExtensionAttributes()->getPaymentAdditionalInfo();
-        $paymentAdditionalData = [];
-        foreach ($paymentAdditionalInfo as $key => $paymentAdditionalInfoDetails) {
-            $paymentAdditionalData[$key]['name'] = $paymentAdditionalInfoDetails->getKey();
-            $paymentAdditionalData[$key]['value'] = $paymentAdditionalInfoDetails->getValue();
-        }
-        $additionalInformationCcType = $orderPayment->getCcType();
-        $additionalInformationCcNumber = $orderPayment->getCcLast4();
-        if ($orderPayment->getMethod() === 'checkmo' || $orderPayment->getMethod() === 'free' ||
-            $orderPayment->getMethod() === 'purchaseorder' ||$orderPayment->getMethod() === 'cashondelivery' ||
-            $orderPayment->getMethod() === 'banktransfer'
-        ) {
-            $additionalData = [];
-        } else {
-            $additionalData = [
-                [
-                    'name' => 'Credit Card Type',
-                    'value' => $additionalInformationCcType ?? null
-                ],
-                [
-                    'name' => 'Credit Card Number',
-                    'value' => $additionalInformationCcNumber ?? null
-                ]
-            ];
-        }
-
         return [
             [
-                'name' => $orderPayment->getAdditionalInformation()['method_title'] ?? null,
+                'name' => $orderPayment->getAdditionalInformation()['method_title'] ?? 'method_title',
                 'type' => $orderPayment->getMethod() ?? null,
-                'additional_data' => $additionalData
+                'additional_data' => []
             ]
         ];
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php
index ed7cda3b46ebc..4375e43f5c0e1 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php
@@ -63,6 +63,11 @@ public function testGetCustomerOrdersSimpleProductQuery()
       number
       status
       order_date
+      payment_methods{name type additional_data{ name value}}
+      shipping_address{firstname lastname city company country_code fax middlename postcode prefix street region
+      region_id suffix telephone vat_id}
+      billing_address{firstname lastname city company country_code fax middlename postcode prefix street region
+      region_id suffix telephone vat_id}
       items{
         quantity_ordered
         product_sku
@@ -105,6 +110,9 @@ public function testGetCustomerOrdersSimpleProductQuery()
         $customerOrderItemsInResponse = $response['customer']['orders']['items'][0];
         $this->assertArrayHasKey('items', $customerOrderItemsInResponse);
         $this->assertNotEmpty($customerOrderItemsInResponse['items']);
+        $this->assertNotEmpty($response["customer"]["orders"]["items"][0]["billing_address"]);
+        $this->assertNotEmpty($response["customer"]["orders"]["items"][0]["shipping_address"]);
+        $this->assertNotEmpty($response["customer"]["orders"]["items"][0]["payment_methods"]);
 
         $searchCriteria = $this->searchCriteriaBuilder->addFilter('increment_id', '100000002')
             ->create();
@@ -154,6 +162,9 @@ public function testCustomerOrdersSimpleProductWithTaxesAndDiscounts()
         $this->setPaymentMethod($cartId, $paymentMethod);
         $orderNumber = $this->placeOrder($cartId);
         $customerOrderResponse = $this->getCustomerOrderQuery($orderNumber);
+        $this->assertOrderBillingAddress($customerOrderResponse[0]["billing_address"]);
+        $this->assertOrderShippingAddress($customerOrderResponse[0]["shipping_address"]);
+        $this->assertOrderPaymentMethod($customerOrderResponse[0]["payment_methods"]);
         // Asserting discounts on order item level
         $this->assertEquals(4, $customerOrderResponse[0]['items'][0]['discounts'][0]['amount']['value']);
         $this->assertEquals('USD', $customerOrderResponse[0]['items'][0]['discounts'][0]['amount']['currency']);
@@ -166,6 +177,77 @@ public function testCustomerOrdersSimpleProductWithTaxesAndDiscounts()
         $this->deleteOrder();
     }
 
+    /**
+     * Check order billing address
+     *
+     * @param array $customerOrderBillingAddress
+     */
+    private function assertOrderBillingAddress(array $customerOrderBillingAddress): void
+    {
+        $assertionMap = [
+            'firstname' => 'John',
+            'lastname' => 'Smith',
+            'city' => 'Texas City',
+            'company' => 'Test company',
+            'country_code' => 'US',
+            'postcode' => '78717',
+            'prefix' => 'John',
+            'region' => 'Texas',
+            'region_id' => '57',
+            'street' => [
+                0 => 'test street 1',
+                1 => 'test street 2',
+            ],
+            'suffix' => 'John',
+            'telephone' => '5123456677'
+        ];
+        $this->assertResponseFields($customerOrderBillingAddress, $assertionMap);
+    }
+
+    /**
+     * Check order shipping address
+     *
+     * @param array $customerOrderShippingAddress
+     */
+    private function assertOrderShippingAddress(array $customerOrderShippingAddress): void
+    {
+        $assertionMap = [
+            'firstname' => 'test shipFirst',
+            'lastname' => 'test shipLast',
+            'city' => 'Montgomery',
+            'company' => 'test company',
+            'country_code' => 'US',
+            'postcode' => '36013',
+            'prefix' => 'test shipFirst',
+            'street' => [
+                0 => 'test street 1',
+                1 => 'test street 2',
+            ],
+            'region_id' => '1',
+            'region' => 'Alabama',
+            'suffix' => 'test shipFirst',
+            'telephone' => '3347665522'
+        ];
+        $this->assertResponseFields($customerOrderShippingAddress, $assertionMap);
+    }
+
+    /**
+     * Check order payment method
+     *
+     * @param array $customerOrderPaymentMethod
+     */
+    private function assertOrderPaymentMethod(array $customerOrderPaymentMethod): void
+    {
+        $assertionMap = [
+            [
+                'name' => 'Check / Money order',
+                'type' => 'checkmo',
+                'additional_data' => []
+            ]
+        ];
+        $this->assertResponseFields($customerOrderPaymentMethod, $assertionMap);
+    }
+
     /**
      * @param array $customerOrderItemTotal
      */
@@ -1218,6 +1300,11 @@ private function getCustomerOrderQuery($orderNumber): array
            number
            order_date
            status
+           payment_methods{name type additional_data{ name value}}
+           shipping_address{firstname lastname city company country_code fax middlename postcode prefix street region
+           region_id suffix telephone vat_id}
+           billing_address{firstname lastname city company country_code fax middlename postcode prefix street region
+           region_id suffix telephone vat_id}
            items{product_name product_sku quantity_ordered discounts {amount{value currency} label}}
            total {
              base_grand_total{value currency}

From 46dc1b04e1ee5aa9974dd9790f051fc790f0ce06 Mon Sep 17 00:00:00 2001
From: Anusha Vattam <avattam@adobe.com>
Date: Thu, 16 Jul 2020 22:54:07 -0500
Subject: [PATCH 0907/1718] MC-35653:MyAccount :: Order Details :: Payments
 Methods, shipping address, billing address by Order Number

- Added static fixes
---
 app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php  | 6 +++---
 app/code/Magento/SalesGraphQl/Model/Order/OrderPayments.php | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php b/app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php
index 23ef25a81beae..01b191618dc96 100644
--- a/app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php
+++ b/app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php
@@ -26,7 +26,7 @@ public function getOrderShippingAddress(
     ) {
         $shippingAddress = null;
         if ($order->getShippingAddress()) {
-            $shippingAddress = $this->OrderAddressDataFormatter($order->getShippingAddress());
+            $shippingAddress = $this->orderAddressDataFormatter($order->getShippingAddress());
         }
         return $shippingAddress;
     }
@@ -42,7 +42,7 @@ public function getOrderBillingAddress(
     ) {
         $billingAddress = null;
         if ($order->getBillingAddress()) {
-            $billingAddress = $this->OrderAddressDataFormatter($order->getBillingAddress());
+            $billingAddress = $this->orderAddressDataFormatter($order->getBillingAddress());
         }
         return $billingAddress;
     }
@@ -53,7 +53,7 @@ public function getOrderBillingAddress(
      * @param OrderAddressInterface $orderAddress
      * @return array
      */
-    private function OrderAddressDataFormatter(
+    private function orderAddressDataFormatter(
         OrderAddressInterface $orderAddress
     ): array {
         return
diff --git a/app/code/Magento/SalesGraphQl/Model/Order/OrderPayments.php b/app/code/Magento/SalesGraphQl/Model/Order/OrderPayments.php
index 90b262e479040..53ca478b4e241 100644
--- a/app/code/Magento/SalesGraphQl/Model/Order/OrderPayments.php
+++ b/app/code/Magento/SalesGraphQl/Model/Order/OrderPayments.php
@@ -15,6 +15,8 @@
 class OrderPayments
 {
     /**
+     * Get the order payment method
+     *
      * @param OrderInterface $orderModel
      * @return array
      */

From 2746def44173003698165993f3404a6bdb1d1238 Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Fri, 17 Jul 2020 10:26:55 +0300
Subject: [PATCH 0908/1718] MC-35095: Search results in Unknown modifier error

---
 .../ValueTransformer/TextTransformer.php      |  2 +-
 .../ValueTransformer/TextTransformerTest.php  | 66 +++++++++++++++++++
 2 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/ValueTransformer/TextTransformerTest.php

diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/TextTransformer.php b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/TextTransformer.php
index 68bec2580f621..3de88ff9f0307 100644
--- a/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/TextTransformer.php
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Query/ValueTransformer/TextTransformer.php
@@ -57,7 +57,7 @@ public function transform(string $value): string
      */
     private function escape(string $value): string
     {
-        $pattern = '/(\+|-|&&|\|\||!|\(|\)|\{|}|\[|]|\^|"|~|\*|\?|:|\\\)/';
+        $pattern = '/(\+|-|&&|\|\||!|\(|\)|\{|}|\[|]|\^|"|~|\/|\*|\?|:|\\\)/';
         $replace = '\\\$1';
 
         return preg_replace($pattern, $replace, $value);
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/ValueTransformer/TextTransformerTest.php b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/ValueTransformer/TextTransformerTest.php
new file mode 100644
index 0000000000000..66c0ce624fbfd
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/SearchAdapter/Query/ValueTransformer/TextTransformerTest.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Test\Unit\SearchAdapter\Query\ValueTransformer;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer\TextTransformer;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test value transformer
+ */
+class TextTransformerTest extends TestCase
+{
+    /**
+     * @var TextTransformer
+     */
+    protected $model;
+
+    /**
+     * Setup method
+     * @return void
+     */
+    public function setUp(): void
+    {
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $objectManagerHelper->getObject(
+            TextTransformer::class,
+            [
+                '$preprocessors' => [],
+            ]
+        );
+    }
+
+    /**
+     * Test transform value
+     *
+     * @param string $value
+     * @param string $expected
+     * @return void
+     * @dataProvider valuesDataProvider
+     */
+    public function testTransform(string $value, string $expected): void
+    {
+        $result = $this->model->transform($value);
+        $this->assertEquals($expected, $result);
+    }
+
+    /**
+     * Values data provider
+     *
+     * @return array
+     */
+    public function valuesDataProvider(): array
+    {
+        return [
+            ['Laptop^camera{microphone}', 'Laptop\^camera\{microphone\}'],
+            ['Birthday 25-Pack w/ Greatest of All Time Cupcake', 'Birthday 25\-Pack w\/ Greatest of All Time Cupcake'],
+            ['Retro vinyl record ~d123 *star', 'Retro vinyl record \~d123 \*star'],
+        ];
+    }
+}

From 44a650422ffebb6a33c92988c341e324f2d6f5b3 Mon Sep 17 00:00:00 2001
From: Dmitry Tsymbal <d.tsymbal@atwix.com>
Date: Fri, 17 Jul 2020 11:22:52 +0300
Subject: [PATCH 0909/1718] Severity adding

---
 .../Test/Mftf/Test/AdminCatalogEmailToFriendSettingsTest.xml     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminCatalogEmailToFriendSettingsTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminCatalogEmailToFriendSettingsTest.xml
index 79150854c5939..6aa5b103b8017 100644
--- a/app/code/Magento/Backend/Test/Mftf/Test/AdminCatalogEmailToFriendSettingsTest.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminCatalogEmailToFriendSettingsTest.xml
@@ -15,6 +15,7 @@
             <title value="Admin should be able to manage settings of Email To A Friend Functionality"/>
             <description value="Admin should be able to enable Email To A Friend functionality in Magento Admin backend and see additional options"/>
             <group value="backend"/>
+            <severity value="MINOR"></severity>
         </annotations>
 
         <before>

From f83763ee3c8e93e1956590bdfc8bd41e6374e588 Mon Sep 17 00:00:00 2001
From: Marjan Petkovski <petkovski.marjan@gmail.com>
Date: Fri, 17 Jul 2020 11:41:30 +0200
Subject: [PATCH 0910/1718] magento/magento2#26121: special price & tier price
 are coming in base currency

Adjustments to api-functional test
---
 .../CatalogCustomer/PriceTiersTest.php        | 123 +++++-------------
 ...t_with_tier_prices_for_multiple_groups.php |  71 ++++++++++
 ...er_prices_for_multiple_groups_rollback.php |  10 ++
 3 files changed, 110 insertions(+), 94 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_with_tier_prices_for_multiple_groups.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_with_tier_prices_for_multiple_groups_rollback.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCustomer/PriceTiersTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCustomer/PriceTiersTest.php
index 90c7c88075ba5..4831e028adec1 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCustomer/PriceTiersTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCustomer/PriceTiersTest.php
@@ -7,25 +7,28 @@
 
 namespace Magento\GraphQl\CatalogCustomer;
 
-use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory;
-use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Catalog\Model\Product;
-use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\GraphQl\GetCustomerAuthenticationHeader;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 use Magento\Store\Api\StoreRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
 
 class PriceTiersTest extends GraphQlAbstract
 {
     /**
-     * @var \Magento\TestFramework\ObjectManager
+     * @var ObjectManager
      */
     private $objectManager;
 
+    /**
+     * @var GetCustomerAuthenticationHeader
+     */
+    private $getCustomerAuthenticationHeader;
+
     protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
+        $this->getCustomerAuthenticationHeader = $this->objectManager->get(GetCustomerAuthenticationHeader::class);
     }
 
     /**
@@ -33,7 +36,6 @@ protected function setUp(): void
      */
     public function testAllGroups()
     {
-        /** @var string $productSku */
         $productSku = 'simple';
         /** @var string $query */
         $query = $this->getProductSearchQuery($productSku);
@@ -41,89 +43,51 @@ public function testAllGroups()
         $response = $this->graphQlQuery($query);
 
         $itemTiers = $response['products']['items'][0]['price_tiers'];
-        $this->assertEquals(5, sizeof($itemTiers));
+        $this->assertCount(5, $itemTiers);
         $this->assertEquals(8, $this->getValueForQuantity(2, $itemTiers));
         $this->assertEquals(5, $this->getValueForQuantity(3, $itemTiers));
         $this->assertEquals(6, $this->getValueForQuantity(3.2, $itemTiers));
     }
 
     /**
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/simple_product_with_tier_prices_for_multiple_groups.php
      */
     public function testLoggedInCustomer()
     {
-        /** @var string $productSku */
         $productSku = 'simple';
-        /** @var ProductRepositoryInterface $productRepository */
-        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
-        /** @var Product $product */
-        $product = $productRepository->get($productSku, false, null, true);
-        $tierPriceData =[
-            [
-                'customer_group_id' => 1,
-                'percentage_value'=> null,
-                'qty'=> 2,
-                'value'=> 9
-            ],
-            [
-                'customer_group_id' => 1,
-                'percentage_value'=> null,
-                'qty'=> 3,
-                'value'=> 8.25
-            ],
-            [
-                'customer_group_id' => 1,
-                'percentage_value'=> null,
-                'qty'=> 5,
-                'value'=> 7
-            ],
-            [
-                'customer_group_id' => 2,
-                'percentage_value'=> null,
-                'qty'=> 3,
-                'value'=> 8
-            ]
-        ];
-
-        $this->saveTierPrices($product, $tierPriceData);
         /** @var string $query */
-
         $query = $this->getProductSearchQuery($productSku);
         $response = $this->graphQlQuery(
             $query,
             [],
             '',
-            $this->getHeaderAuthorization('customer@example.com', 'password')
+            $this->getCustomerAuthenticationHeader->execute('customer@example.com', 'password')
         );
 
         $itemTiers = $response['products']['items'][0]['price_tiers'];
-        $this->assertEquals(3, sizeof($itemTiers));
-        $this->assertEquals(9, $this->getValueForQuantity(2, $itemTiers));
+        $this->assertCount(3, $itemTiers);
+        $this->assertEquals(9.25, $this->getValueForQuantity(2, $itemTiers));
         $this->assertEquals(8.25, $this->getValueForQuantity(3, $itemTiers));
-        $this->assertEquals(7, $this->getValueForQuantity(5, $itemTiers));
+        $this->assertEquals(7.25, $this->getValueForQuantity(5, $itemTiers));
     }
 
     /**
      * @magentoApiDataFixture Magento/Store/_files/second_store_with_second_currency.php
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoApiDataFixture Magento/Catalog/_files/simple_product_with_tier_prices_for_multiple_groups.php
      */
     public function testSecondStoreViewWithCurrencyRate()
     {
-        /** @var string $storeViewCode */
         $storeViewCode = 'fixture_second_store';
-        /** @var StoreRepositoryInterface $storeRepository */
         $storeRepository = $this->objectManager->get(StoreRepositoryInterface::class);
-        /** @var float $rate */
         $rate = $storeRepository->get($storeViewCode)->getCurrentCurrencyRate();
-        /** @var string $productSku */
         $productSku = 'simple';
         /** @var string $query */
         $query = $this->getProductSearchQuery($productSku);
         /** @var array $headers */
         $headers = array_merge(
-            $this->getHeaderAuthorization('customer@example.com', 'password'),
+            $this->getCustomerAuthenticationHeader->execute('customer@example.com', 'password'),
             $this->getHeaderStore($storeViewCode)
         );
 
@@ -135,17 +99,20 @@ public function testSecondStoreViewWithCurrencyRate()
         );
 
         $itemTiers = $response['products']['items'][0]['price_tiers'];
-        $this->assertEquals(2, sizeof($itemTiers));
-        $this->assertEquals(round(8 * $rate, 2), $this->getValueForQuantity(2, $itemTiers));
-        $this->assertEquals(round(5 * $rate, 2), $this->getValueForQuantity(5, $itemTiers));
+        $this->assertCount(3, $itemTiers);
+        $this->assertEquals(round(9.25 * $rate, 2), $this->getValueForQuantity(2, $itemTiers));
+        $this->assertEquals(round(8.25 * $rate, 2), $this->getValueForQuantity(3, $itemTiers));
+        $this->assertEquals(round(7.25 * $rate, 2), $this->getValueForQuantity(5, $itemTiers));
     }
 
     /**
+     * Get the tier price value for the given product quantity
+     *
      * @param float $quantity
      * @param array $tiers
      * @return float
      */
-    private function getValueForQuantity(float $quantity, array $tiers)
+    private function getValueForQuantity(float $quantity, array $tiers): float
     {
         $filteredResult = array_values(array_filter($tiers, function ($tier) use ($quantity) {
             if ((float)$tier['quantity'] == $quantity) {
@@ -157,29 +124,8 @@ private function getValueForQuantity(float $quantity, array $tiers)
     }
 
     /**
-     * @param ProductInterface $product
-     * @param array $tierPriceData
-     */
-    private function saveTierPrices(ProductInterface $product, array $tierPriceData)
-    {
-        /** @var array $tierPrices */
-        $tierPrices = [];
-        /** @var ProductTierPriceInterfaceFactory $tierPriceFactory */
-        $tierPriceFactory = $this->objectManager->get(ProductTierPriceInterfaceFactory::class);
-
-        foreach ($tierPriceData as $tierPrice) {
-            $tierPrices[] = $tierPriceFactory->create(
-                [
-                    'data' => $tierPrice
-                ]
-            );
-        }
-
-        $product->setTierPrices($tierPrices);
-        $product->save();
-    }
-
-    /**
+     * Get a query which user filter for product sku and returns price_tiers
+     *
      * @param string $productSku
      * @return string
      */
@@ -187,7 +133,7 @@ private function getProductSearchQuery(string $productSku): string
     {
         return <<<QUERY
 {
-  products(search: "{$productSku}") {
+  products(filter: {sku: {eq: "{$productSku}"}}) {
     items {
       price_tiers {
      	final_price {
@@ -207,19 +153,8 @@ private function getProductSearchQuery(string $productSku): string
     }
 
     /**
-     * @param string $username
-     * @param string $password
-     * @return array
-     */
-    private function getHeaderAuthorization(string $username, string $password): array
-    {
-        $customerToken = $this->objectManager->get(CustomerTokenServiceInterface::class)
-            ->createCustomerAccessToken($username, $password);
-
-        return ['Authorization' => 'Bearer ' . $customerToken];
-    }
-
-    /**
+     * Get array that would be used in request header
+     *
      * @param string $storeViewCode
      * @return array
      */
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_with_tier_prices_for_multiple_groups.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_with_tier_prices_for_multiple_groups.php
new file mode 100644
index 0000000000000..36550b1696ced
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_with_tier_prices_for_multiple_groups.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory;
+use Magento\Catalog\Api\Data\ProductTierPriceExtensionFactory;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/product_simple.php');
+
+$objectManager = Bootstrap::getObjectManager();
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+$tierPriceFactory = $objectManager->get(ProductTierPriceInterfaceFactory::class);
+$tpExtensionAttributesFactory = $objectManager->get(ProductTierPriceExtensionFactory::class);
+$product = $productRepository->get('simple', false, null, true);
+$adminWebsite = $objectManager->get(WebsiteRepositoryInterface::class)->get('admin');
+$tierPriceExtensionAttributes = $tpExtensionAttributesFactory->create()->setWebsiteId($adminWebsite->getId());
+$pricesForCustomerGroupsInput = [
+    [
+        'customer_group_id' => 1,
+        'percentage_value'=> null,
+        'qty'=> 2,
+        'value'=> 9.25
+    ],
+    [
+        'customer_group_id' => 1,
+        'percentage_value'=> null,
+        'qty'=> 3,
+        'value'=> 8.25
+    ],
+    [
+        'customer_group_id' => 1,
+        'percentage_value'=> null,
+        'qty'=> 5,
+        'value'=> 7.25
+    ],
+    [
+        'customer_group_id' => 2,
+        'percentage_value'=> null,
+        'qty'=> 2,
+        'value'=> 9
+    ],
+    [
+        'customer_group_id' => 2,
+        'percentage_value'=> null,
+        'qty'=> 3,
+        'value'=> 8
+    ],
+    [
+        'customer_group_id' => 2,
+        'percentage_value'=> null,
+        'qty'=> 5,
+        'value'=> 7
+    ]
+];
+$productTierPrices = [];
+foreach ($pricesForCustomerGroupsInput as $price) {
+    $productTierPrices[] = $tierPriceFactory->create(
+        [
+            'data' => $price
+        ]
+    )->setExtensionAttributes($tierPriceExtensionAttributes);
+}
+$product->setTierPrices($productTierPrices);
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_with_tier_prices_for_multiple_groups_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_with_tier_prices_for_multiple_groups_rollback.php
new file mode 100644
index 0000000000000..328c1e229da5c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_with_tier_prices_for_multiple_groups_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/Catalog/_files/product_simple_rollback.php');

From 20cd3d0b64b8cb3ebc3468295109b72b43ed8202 Mon Sep 17 00:00:00 2001
From: Marjan Petkovski <petkovski.marjan@gmail.com>
Date: Fri, 17 Jul 2020 11:45:37 +0200
Subject: [PATCH 0911/1718] magento/magento2#26121: special price & tier price
 are coming in base currency

Adjustments to api-functional test
---
 .../Magento/GraphQl/CatalogCustomer/PriceTiersTest.php        | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCustomer/PriceTiersTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCustomer/PriceTiersTest.php
index 4831e028adec1..a3f98c4cd81ba 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCustomer/PriceTiersTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCustomer/PriceTiersTest.php
@@ -37,7 +37,6 @@ protected function setUp(): void
     public function testAllGroups()
     {
         $productSku = 'simple';
-        /** @var string $query */
         $query = $this->getProductSearchQuery($productSku);
 
         $response = $this->graphQlQuery($query);
@@ -56,7 +55,6 @@ public function testAllGroups()
     public function testLoggedInCustomer()
     {
         $productSku = 'simple';
-        /** @var string $query */
         $query = $this->getProductSearchQuery($productSku);
         $response = $this->graphQlQuery(
             $query,
@@ -83,9 +81,7 @@ public function testSecondStoreViewWithCurrencyRate()
         $storeRepository = $this->objectManager->get(StoreRepositoryInterface::class);
         $rate = $storeRepository->get($storeViewCode)->getCurrentCurrencyRate();
         $productSku = 'simple';
-        /** @var string $query */
         $query = $this->getProductSearchQuery($productSku);
-        /** @var array $headers */
         $headers = array_merge(
             $this->getCustomerAuthenticationHeader->execute('customer@example.com', 'password'),
             $this->getHeaderStore($storeViewCode)

From 9d80fa3b65e2d2365522f376b6436bceebe4673c Mon Sep 17 00:00:00 2001
From: Marjan Petkovski <petkovski.marjan@gmail.com>
Date: Fri, 17 Jul 2020 11:52:51 +0200
Subject: [PATCH 0912/1718] magento/magento2#26121: special price & tier price
 are coming in base currency

Adjustments to api-functional test
---
 .../CatalogCustomer/SpecialPriceTest.php      | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCustomer/SpecialPriceTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCustomer/SpecialPriceTest.php
index 3e8c6fdb3e26b..931bb3f3c5d32 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCustomer/SpecialPriceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogCustomer/SpecialPriceTest.php
@@ -10,11 +10,12 @@
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 use Magento\Store\Api\StoreRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
 
 class SpecialPriceTest extends GraphQlAbstract
 {
     /**
-     * @var \Magento\TestFramework\ObjectManager
+     * @var ObjectManager
      */
     private $objectManager;
 
@@ -28,14 +29,11 @@ protected function setUp(): void
      */
     public function testSpecialPrice()
     {
-        /** @var string $productSku */
         $productSku = 'simple';
-        /** @var string $query */
         $query = $this->getProductSearchQuery($productSku);
 
         $response = $this->graphQlQuery($query);
 
-        /** @var float $specialPrice */
         $specialPrice = (float)$response['products']['items'][0]['special_price'];
         $this->assertEquals(5.99, $specialPrice);
     }
@@ -46,17 +44,11 @@ public function testSpecialPrice()
      */
     public function testSpecialPriceWithCurrencyRate()
     {
-        /** @var string $storeViewCode */
         $storeViewCode = 'fixture_second_store';
-        /** @var StoreRepositoryInterface $storeRepository */
         $storeRepository = $this->objectManager->get(StoreRepositoryInterface::class);
-        /** @var float $rate */
         $rate = $storeRepository->get($storeViewCode)->getCurrentCurrencyRate();
-        /** @var string $productSku */
         $productSku = 'simple';
-        /** @var string $query */
         $query = $this->getProductSearchQuery($productSku);
-        /** @var array $headers */
         $headers = $this->getHeaderStore($storeViewCode);
 
         $response = $this->graphQlQuery(
@@ -66,12 +58,13 @@ public function testSpecialPriceWithCurrencyRate()
             $headers
         );
 
-        /** @var float $specialPrice */
         $specialPrice = (float)$response['products']['items'][0]['special_price'];
         $this->assertEquals(round(5.99 * $rate, 2), $specialPrice);
     }
 
     /**
+     * Get a query which user filter for product sku and returns special_price
+     *
      * @param string $productSku
      * @return string
      */
@@ -79,7 +72,7 @@ private function getProductSearchQuery(string $productSku): string
     {
         return <<<QUERY
 {
-  products(search: "{$productSku}") {
+  products(filter: {sku: {eq: "{$productSku}"}}) {
     items {
       special_price
     }
@@ -89,6 +82,8 @@ private function getProductSearchQuery(string $productSku): string
     }
 
     /**
+     * Get array that would be used in request header
+     *
      * @param string $storeViewCode
      * @return array
      */

From 193765d016180d1cf6bcadf904d741f483f0f1ba Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Fri, 17 Jul 2020 11:05:41 +0100
Subject: [PATCH 0913/1718] Implemented suggestions

---
 .../Composite/GetAssetIdsByContentField.php   | 10 +--
 .../GetAssetIdsByCategoryStore.php            | 71 +++++--------------
 2 files changed, 24 insertions(+), 57 deletions(-)

diff --git a/app/code/Magento/MediaContentApi/Model/Composite/GetAssetIdsByContentField.php b/app/code/Magento/MediaContentApi/Model/Composite/GetAssetIdsByContentField.php
index 7130bee56d90a..61df8504b4c77 100644
--- a/app/code/Magento/MediaContentApi/Model/Composite/GetAssetIdsByContentField.php
+++ b/app/code/Magento/MediaContentApi/Model/Composite/GetAssetIdsByContentField.php
@@ -17,7 +17,7 @@
 class GetAssetIdsByContentField implements GetAssetIdsByContentFieldApiInterface
 {
     /**
-     * @var GetAssetIdsByContentFieldInterface[]
+     * @var array
      */
     private $fieldHandlers;
 
@@ -26,7 +26,7 @@ class GetAssetIdsByContentField implements GetAssetIdsByContentFieldApiInterface
      *
      * @param array $fieldHandlers
      */
-    public function __construct($fieldHandlers = [])
+    public function __construct(array $fieldHandlers = [])
     {
         $this->fieldHandlers = $fieldHandlers;
     }
@@ -40,10 +40,10 @@ public function execute(string $field, string $value): array
             throw new InvalidArgumentException(__('The field argument is invalid.'));
         }
         $ids = [];
-        /** @var GetAssetIdsByContentFieldInterface $fieldHandlers */
-        foreach ($this->fieldHandlers[$field] as $fieldHandlers) {
+        /** @var GetAssetIdsByContentFieldInterface $fieldHandler */
+        foreach ($this->fieldHandlers[$field] as $fieldHandler) {
             // phpcs:ignore Magento2.Performance.ForeachArrayMerge
-            $ids = array_merge($ids, $fieldHandlers->execute($value));
+            $ids = array_merge($ids, $fieldHandler->execute($value));
         }
         return array_unique($ids);
     }
diff --git a/app/code/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByCategoryStore.php b/app/code/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByCategoryStore.php
index c427b49309c30..4b9e3d1265a21 100644
--- a/app/code/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByCategoryStore.php
+++ b/app/code/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByCategoryStore.php
@@ -8,6 +8,7 @@
 namespace Magento\MediaContentCatalog\Model\ResourceModel;
 
 use Magento\Catalog\Api\CategoryManagementInterface;
+use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\MediaContentApi\Model\GetAssetIdsByContentFieldInterface;
@@ -22,6 +23,7 @@ class GetAssetIdsByCategoryStore implements GetAssetIdsByContentFieldInterface
     private const TABLE_CONTENT_ASSET = 'media_content_asset';
     private const TABLE_CATALOG_CATEGORY = 'catalog_category_entity';
     private const ENTITY_TYPE = 'catalog_category';
+    private const ID_COLUMN = 'entity_id';
 
     /**
      * @var ResourceConnection
@@ -38,21 +40,29 @@ class GetAssetIdsByCategoryStore implements GetAssetIdsByContentFieldInterface
      */
     private $storeGroupRepository;
 
+    /**
+     * @var CategoryRepositoryInterface
+     */
+    private $categoryRepository;
+
     /**
      * GetAssetIdsByCategoryStore constructor.
      *
      * @param ResourceConnection $resource
      * @param StoreRepositoryInterface $storeRepository
      * @param GroupRepositoryInterface $storeGroupRepository
+     * @param CategoryRepositoryInterface $categoryRepository
      */
     public function __construct(
         ResourceConnection $resource,
         StoreRepositoryInterface $storeRepository,
-        GroupRepositoryInterface $storeGroupRepository
+        GroupRepositoryInterface $storeGroupRepository,
+        CategoryRepositoryInterface $categoryRepository
     ) {
         $this->connection = $resource;
         $this->storeRepository = $storeRepository;
         $this->storeGroupRepository = $storeGroupRepository;
+        $this->categoryRepository = $categoryRepository;
     }
 
     /**
@@ -62,66 +72,23 @@ public function execute(string $value): array
     {
         $storeView = $this->storeRepository->getById($value);
         $storeGroup = $this->storeGroupRepository->get($storeView->getStoreGroupId());
-        $categoryIds = $this->getCategoryIdsByRootCategory((int) $storeGroup->getRootCategoryId());
+        $rootCategory = $this->categoryRepository->get($storeGroup->getRootCategoryId());
+
         $sql = $this->connection->getConnection()->select()->from(
             ['asset_content_table' => $this->connection->getTableName(self::TABLE_CONTENT_ASSET)],
             ['asset_id']
+        )->joinInner(
+            ['category_table' => $this->connection->getTableName(self::TABLE_CATALOG_CATEGORY)],
+            'asset_content_table.entity_id = category_table.' . self::ID_COLUMN,
+            []
         )->where(
             'entity_type = ?',
             self::ENTITY_TYPE
         )->where(
-            'entity_id IN (?)',
-            $categoryIds
+            'path LIKE ?',
+            $rootCategory->getPath() . '%'
         );
 
         return $this->connection->getConnection()->fetchCol($sql);
     }
-
-    /**
-     * This function returns an array of category ids that have content and are under the root parameter
-     *
-     * @param int $rootCategoryId
-     * @return array
-     */
-    private function getCategoryIdsByRootCategory(int $rootCategoryId): array
-    {
-        $result = $this->getCategoryIdsAndPath();
-
-        $result = array_filter($result, function ($item) use ($rootCategoryId) {
-            $pathArray = explode('/', $item['path']);
-            $isInPath = false;
-            foreach ($pathArray as $id) {
-                if ($id == $rootCategoryId) {
-                    $isInPath = true;
-                }
-            }
-            return  $isInPath;
-        });
-
-        return array_map(function ($item) {
-            return $item['entity_id'];
-        }, $result);
-    }
-
-    /**
-     * This function returns an array of category_id and path of categories that have content
-     *
-     * @return array
-     */
-    private function getCategoryIdsAndPath(): array
-    {
-        $contentCategoriesSql = $this->connection->getConnection()->select()->from(
-            ['asset_content_table' => $this->connection->getTableName(self::TABLE_CONTENT_ASSET)],
-            ['entity_id']
-        )->where(
-            'entity_type = ?',
-            self::ENTITY_TYPE
-        )->joinInner(
-            ['category_table' => $this->connection->getTableName(self::TABLE_CATALOG_CATEGORY)],
-            'asset_content_table.entity_id = category_table.entity_id',
-            ['path']
-        );
-
-        return $this->connection->getConnection()->fetchAll($contentCategoriesSql);
-    }
 }

From f33150df886f8cf5a243259620ad852edc70a070 Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Fri, 17 Jul 2020 13:23:12 +0300
Subject: [PATCH 0914/1718] minor change mftf

---
 .../AdminCreateCreditMemoWithZeroPriceCheckOrderStatusTest.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithZeroPriceCheckOrderStatusTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithZeroPriceCheckOrderStatusTest.xml
index 6e715c1fdf483..8b8789d488b9c 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithZeroPriceCheckOrderStatusTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithZeroPriceCheckOrderStatusTest.xml
@@ -10,8 +10,10 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminCreateCreditMemoWithZeroPriceCheckOrderStatusTest">
         <annotations>
+            <stories value="Github issue: #22762 Credit Memo with Zero Total: Order Status 'Complete' and not 'Closed'"/>
             <title value="Create Credit Memo with zero total."/>
             <description value="Assert order status after create CreditMemo with zero total."/>
+            <severity value="MAJOR"/>
             <group value="sales"/>
             <testCaseId value="MC-35848"/>
         </annotations>
@@ -22,7 +24,6 @@
             <createData entity="SimpleProduct_zero" stepKey="createProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
-
             <createData entity="FreeShippinMethodConfig" stepKey="enableFreeShipping"/>
         </before>
         <after>

From 7c2511aa47b5addaa49a335c8c93ee61f572ab88 Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Fri, 17 Jul 2020 19:52:52 +0800
Subject: [PATCH 0915/1718] magento/adobe-stock-integration#1391:
 SaveAssetsKeywordsInterface to delete obsolete keywords - Revised behaviour
 to delete obsolete asset keyword link based on updated arguments

---
 .../Keyword/SaveAssetsKeywords.php            | 107 ++++++++++--------
 1 file changed, 58 insertions(+), 49 deletions(-)

diff --git a/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetsKeywords.php b/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetsKeywords.php
index bc5ebf6159814..a822fafaeaa1b 100644
--- a/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetsKeywords.php
+++ b/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetsKeywords.php
@@ -11,7 +11,9 @@
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Adapter\Pdo\Mysql;
 use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\MediaGalleryApi\Api\Data\KeywordInterface;
+use Magento\MediaGalleryApi\Api\GetAssetsKeywordsInterface;
 use Magento\MediaGalleryApi\Api\SaveAssetsKeywordsInterface;
 use Psr\Log\LoggerInterface;
 
@@ -35,6 +37,11 @@ class SaveAssetsKeywords implements SaveAssetsKeywordsInterface
      */
     private $saveAssetLinks;
 
+    /**
+     * @var GetAssetsKeywordsInterface
+     */
+    private $getAssetsKeywordsInterface;
+
     /**
      * @var LoggerInterface
      */
@@ -45,15 +52,18 @@ class SaveAssetsKeywords implements SaveAssetsKeywordsInterface
      *
      * @param ResourceConnection $resourceConnection
      * @param SaveAssetLinks $saveAssetLinks
+     * @param GetAssetsKeywordsInterface $getAssetsKeywordsInterface
      * @param LoggerInterface $logger
      */
     public function __construct(
         ResourceConnection $resourceConnection,
         SaveAssetLinks $saveAssetLinks,
+        GetAssetsKeywordsInterface $getAssetsKeywordsInterface,
         LoggerInterface $logger
     ) {
         $this->resourceConnection = $resourceConnection;
         $this->saveAssetLinks = $saveAssetLinks;
+        $this->getAssetsKeywordsInterface = $getAssetsKeywordsInterface;
         $this->logger = $logger;
     }
 
@@ -72,8 +82,6 @@ public function execute(array $assetKeywords): void
             }
         }
 
-        $this->deleteObsoleteKeywords();
-
         if (!empty($failedAssetIds)) {
             throw new CouldNotSaveException(
                 __('Could not save keywords for asset ids: %ids', ['ids' => implode(' ,', $failedAssetIds)])
@@ -86,6 +94,7 @@ public function execute(array $assetKeywords): void
      *
      * @param KeywordInterface[] $keywords
      * @param int $assetId
+     * @throws CouldNotDeleteException
      * @throws CouldNotSaveException
      * @throws \Zend_Db_Exception
      */
@@ -100,6 +109,8 @@ private function saveAssetKeywords(array $keywords, int $assetId): void
             return;
         }
 
+        $this->deleteObsoleteAssetKeywords($data, $assetId);
+
         /** @var Mysql $connection */
         $connection = $this->resourceConnection->getConnection();
         $connection->insertArray(
@@ -130,58 +141,56 @@ private function getKeywordIds(array $keywords): array
     }
 
     /**
-     * Delete keywords which has
-     * no relation to any asset
+     * Deletes obsolete asset keywords links
      *
-     * @return void
+     * @param array $newKeywords
+     * @param int $assetId
+     * @throws CouldNotDeleteException
      */
-    private function deleteObsoleteKeywords(): void
+    private function deleteObsoleteAssetKeywords(array $newKeywords, int $assetId): void
     {
-        $connection = $this->resourceConnection->getConnection();
-        $select = $connection->select()
-            ->from(
-                ['k' => self::TABLE_KEYWORD],
-                ['k.id']
-            )
-            ->joinLeft(
-                ['ak' => self::TABLE_ASSET_KEYWORD],
-                'k.id = ak.keyword_id'
-            )
-            ->where('ak.asset_id IS NULL');
-
-        $obsoleteKeywords = $connection->fetchCol($select);
-
-        if (!empty($obsoleteKeywords)) {
-            try {
-                $this->deleteKeywordsByIds($obsoleteKeywords);
-            } catch (\Exception $exception) {
-                $this->logger->critical($exception);
+        $oldKeywordData = $this->getAssetsKeywordsInterface->execute([$assetId]);
+
+        if (empty($newKeywords) || empty($oldKeywordData)) {
+            return;
+        }
+
+        $oldKeywordData = $this->getAssetsKeywordsInterface->execute([$assetId]);
+        $oldKeywords = $oldKeywordData[$assetId]->getKeywords();
+
+        foreach ($oldKeywords as $oldKeyword) {
+            if (!in_array($oldKeyword->getKeyword(), $newKeywords)) {
+                $obsoleteKeywords[] = $oldKeyword->getKeyword();
             }
         }
-    }
 
-    /**
-     * Delete keywords by ids
-     *
-     * @param array $keywordIds
-     * @return  void
-     */
-    private function deleteKeywordsByIds(array $keywordIds): void
-    {
-        $connection  = $this->resourceConnection->getConnection();
-
-        $whereConditions = [
-            $connection->prepareSqlCondition(
-                self::ID,
-                ['in' => [$keywordIds]]
-            ),
-        ];
-
-        $connection->delete(
-            $connection->getTableName(
-                self::TABLE_KEYWORD
-            ),
-            $whereConditions
-        );
+        if (empty($obsoleteKeywords)) {
+            return;
+        }
+
+        $obsoleteKeywordIds = $this->getKeywordIds($obsoleteKeywords);
+
+        try {
+            /** @var Mysql $connection */
+            $connection  = $this->resourceConnection->getConnection();
+            $connection->delete(
+                $connection->getTableName(
+                    self::TABLE_ASSET_KEYWORD
+                ),
+                [
+                    'keyword_id in (?)' => $obsoleteKeywordIds,
+                    'asset_id = ?' => $assetId
+                ]
+            );
+        } catch (\Exception $exception) {
+            $this->logger->critical($exception);
+            $failedAssetId = $assetId;
+        }
+
+        if (!empty($failedAssetId)) {
+            throw new CouldNotDeleteException(
+                __('Could not delete obsolete keyword relation for asset id: %id', ['id' => $assetId])
+            );
+        }
     }
 }

From 5dbcd2c5bede48d0ad322f502adbf97a1b6da98d Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Fri, 17 Jul 2020 15:13:46 +0300
Subject: [PATCH 0916/1718] MC-35891: Automate MC-28963 tests

---
 .../Catalog/Test/Mftf/Data/ProductData.xml    |   4 +
 .../Data/ConfigurableProductOptionData.xml    |  19 +
 .../Test/Mftf/Data/ConfigData.xml             |  20 +
 ...OptionsAreShownInLayeredNavigationTest.xml | 397 ++++++++++++++++++
 4 files changed, 440 insertions(+)
 create mode 100644 app/code/Magento/LayeredNavigation/Test/Mftf/Data/ConfigData.xml
 create mode 100644 app/code/Magento/LayeredNavigation/Test/Mftf/Test/StorefrontAllAttributeOptionsAreShownInLayeredNavigationTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index 7aabedbf1c3f7..e5b38533747f9 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -284,6 +284,10 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
     </entity>
+    <entity name="ApiSimpleProductWithCategory" type="product2" extends="ApiSimpleOne">
+        <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
+        <requiredEntity type="custom_attribute">CustomAttributeCategoryIds</requiredEntity>
+    </entity>
     <entity name="ApiSimpleProductWithShortSKU" type="product2" extends="ApiSimpleOne">
         <data key="sku" unique="suffix">pr</data>
     </entity>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductOptionData.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductOptionData.xml
index a1a499f33eda0..c827b9998450a 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductOptionData.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Data/ConfigurableProductOptionData.xml
@@ -26,4 +26,23 @@
         <requiredEntity type="ValueIndex">ValueIndex2</requiredEntity>
         <requiredEntity type="ValueIndex">ValueIndex3</requiredEntity>
     </entity>
+    <entity name="ConfigurableProduct15Options" type="ConfigurableProductOption">
+        <var key="attribute_id" entityKey="attribute_id" entityType="ProductAttribute" />
+        <data key="label">option</data>
+        <requiredEntity type="ValueIndex">ValueIndex1</requiredEntity>
+        <requiredEntity type="ValueIndex">ValueIndex1</requiredEntity>
+        <requiredEntity type="ValueIndex">ValueIndex1</requiredEntity>
+        <requiredEntity type="ValueIndex">ValueIndex1</requiredEntity>
+        <requiredEntity type="ValueIndex">ValueIndex1</requiredEntity>
+        <requiredEntity type="ValueIndex">ValueIndex1</requiredEntity>
+        <requiredEntity type="ValueIndex">ValueIndex1</requiredEntity>
+        <requiredEntity type="ValueIndex">ValueIndex1</requiredEntity>
+        <requiredEntity type="ValueIndex">ValueIndex1</requiredEntity>
+        <requiredEntity type="ValueIndex">ValueIndex1</requiredEntity>
+        <requiredEntity type="ValueIndex">ValueIndex1</requiredEntity>
+        <requiredEntity type="ValueIndex">ValueIndex1</requiredEntity>
+        <requiredEntity type="ValueIndex">ValueIndex1</requiredEntity>
+        <requiredEntity type="ValueIndex">ValueIndex1</requiredEntity>
+        <requiredEntity type="ValueIndex">ValueIndex1</requiredEntity>
+    </entity>
 </entities>
diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/Data/ConfigData.xml b/app/code/Magento/LayeredNavigation/Test/Mftf/Data/ConfigData.xml
new file mode 100644
index 0000000000000..a745397403cd2
--- /dev/null
+++ b/app/code/Magento/LayeredNavigation/Test/Mftf/Data/ConfigData.xml
@@ -0,0 +1,20 @@
+<?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="DisplayProductCountDefaultValue">
+        <data key="path">catalog/layered_navigation/display_product_count</data>
+        <data key="value">1</data>
+    </entity>
+    <entity name="PriceNavigationStepCalculationDefaultValue">
+        <data key="path">catalog/layered_navigation/price_range_calculation</data>
+        <data key="value">auto</data>
+    </entity>
+
+</entities>
diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/Test/StorefrontAllAttributeOptionsAreShownInLayeredNavigationTest.xml b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/StorefrontAllAttributeOptionsAreShownInLayeredNavigationTest.xml
new file mode 100644
index 0000000000000..4f547120f14d2
--- /dev/null
+++ b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/StorefrontAllAttributeOptionsAreShownInLayeredNavigationTest.xml
@@ -0,0 +1,397 @@
+<?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="StorefrontAllAttributeOptionsAreShownInLayeredNavigationTest">
+        <annotations>
+            <features value="Layered Navigation"/>
+            <stories value="Product attributes in Layered Navigation"/>
+            <title value="Limitation of displayed attribute options number in layered navigation with ElasticSearch"/>
+            <description value="All attribute options are shown in Layered navigation"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-28963"/>
+            <group value="LayeredNavigation"/>
+            <group value="SearchEngineElasticsearch"/>
+        </annotations>
+
+        <before>
+            <magentoCLI command="config:set {{DisplayProductCountDefaultValue.path}} {{DisplayProductCountDefaultValue.value}}" stepKey="enableDisplayProductCount"/>
+            <magentoCLI command="config:set {{PriceNavigationStepCalculationDefaultValue.path}} {{PriceNavigationStepCalculationDefaultValue.value}}" stepKey="setPriceNavigationStepCalculationDefaultValue"/>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <!-- Create an attribute -->
+            <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
+            <!--Create 15 attribute options-->
+            <createData entity="productAttributeOption" stepKey="createConfigProductAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption" stepKey="createConfigProductAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption" stepKey="createConfigProductAttributeOption3">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption" stepKey="createConfigProductAttributeOption4">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption" stepKey="createConfigProductAttributeOption5">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption" stepKey="createConfigProductAttributeOption6">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption" stepKey="createConfigProductAttributeOption7">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption" stepKey="createConfigProductAttributeOption8">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption" stepKey="createConfigProductAttributeOption9">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption" stepKey="createConfigProductAttributeOption10">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption" stepKey="createConfigProductAttributeOption11">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption" stepKey="createConfigProductAttributeOption12">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption" stepKey="createConfigProductAttributeOption13">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption" stepKey="createConfigProductAttributeOption14">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <createData entity="productAttributeOption" stepKey="createConfigProductAttributeOption15">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+            <!--Cet Created options data-->
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="3" stepKey="getConfigAttributeOption3">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="4" stepKey="getConfigAttributeOption4">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="5" stepKey="getConfigAttributeOption5">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="6" stepKey="getConfigAttributeOption6">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="7" stepKey="getConfigAttributeOption7">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="8" stepKey="getConfigAttributeOption8">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="9" stepKey="getConfigAttributeOption9">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="10" stepKey="getConfigAttributeOption10">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="11" stepKey="getConfigAttributeOption11">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="12" stepKey="getConfigAttributeOption12">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="13" stepKey="getConfigAttributeOption13">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="14" stepKey="getConfigAttributeOption14">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="15" stepKey="getConfigAttributeOption15">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </getData>
+
+            <!-- Add attribute to attribute set-->
+            <createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+            </createData>
+
+            <!-- Create Configurable product -->
+            <createData entity="BaseConfigurableProduct" stepKey="createConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <!-- Create simple products and set them created attribute value -->
+            <createData entity="ApiSimpleProductWithCategory" stepKey="createConfigChildProduct1">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProductWithCategory" stepKey="createConfigChildProduct2">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProductWithCategory" stepKey="createConfigChildProduct3">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption3"/>
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProductWithCategory" stepKey="createConfigChildProduct4">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption4"/>
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProductWithCategory" stepKey="createConfigChildProduct5">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption5"/>
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProductWithCategory" stepKey="createConfigChildProduct6">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption6"/>
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProductWithCategory" stepKey="createConfigChildProduct7">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption7"/>
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProductWithCategory" stepKey="createConfigChildProduct8">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption8"/>
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProductWithCategory" stepKey="createConfigChildProduct9">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption9"/>
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProductWithCategory" stepKey="createConfigChildProduct10">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption10"/>
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProductWithCategory" stepKey="createConfigChildProduct11">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption11"/>
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProductWithCategory" stepKey="createConfigChildProduct12">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption12"/>
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProductWithCategory" stepKey="createConfigChildProduct13">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption13"/>
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProductWithCategory" stepKey="createConfigChildProduct14">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption14"/>
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiSimpleProductWithCategory" stepKey="createConfigChildProduct15">
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption15"/>
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <!-- Create the configurable product -->
+            <createData entity="ConfigurableProduct15Options" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigProductAttribute"/>
+                <requiredEntity createDataKey="getConfigAttributeOption1"/>
+                <requiredEntity createDataKey="getConfigAttributeOption2"/>
+                <requiredEntity createDataKey="getConfigAttributeOption3"/>
+                <requiredEntity createDataKey="getConfigAttributeOption4"/>
+                <requiredEntity createDataKey="getConfigAttributeOption5"/>
+                <requiredEntity createDataKey="getConfigAttributeOption6"/>
+                <requiredEntity createDataKey="getConfigAttributeOption7"/>
+                <requiredEntity createDataKey="getConfigAttributeOption8"/>
+                <requiredEntity createDataKey="getConfigAttributeOption9"/>
+                <requiredEntity createDataKey="getConfigAttributeOption10"/>
+                <requiredEntity createDataKey="getConfigAttributeOption11"/>
+                <requiredEntity createDataKey="getConfigAttributeOption12"/>
+                <requiredEntity createDataKey="getConfigAttributeOption13"/>
+                <requiredEntity createDataKey="getConfigAttributeOption14"/>
+                <requiredEntity createDataKey="getConfigAttributeOption15"/>
+            </createData>
+
+            <!-- Add simple products to the configurable product -->
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct1"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct2"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild3">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct3"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild4">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct4"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild5">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct5"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild6">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct6"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild7">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct7"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild8">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct8"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild9">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct9"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild10">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct10"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild11">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct11"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild12">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct12"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild13">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct13"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild14">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct14"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild15">
+                <requiredEntity createDataKey="createConfigProduct"/>
+                <requiredEntity createDataKey="createConfigChildProduct15"/>
+            </createData>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
+            <deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
+            <deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
+            <deleteData createDataKey="createConfigChildProduct3" stepKey="deleteConfigChildProduct3"/>
+            <deleteData createDataKey="createConfigChildProduct4" stepKey="deleteConfigChildProduct4"/>
+            <deleteData createDataKey="createConfigChildProduct5" stepKey="deleteConfigChildProduct5"/>
+            <deleteData createDataKey="createConfigChildProduct6" stepKey="deleteConfigChildProduct6"/>
+            <deleteData createDataKey="createConfigChildProduct7" stepKey="deleteConfigChildProduct7"/>
+            <deleteData createDataKey="createConfigChildProduct8" stepKey="deleteConfigChildProduct8"/>
+            <deleteData createDataKey="createConfigChildProduct9" stepKey="deleteConfigChildProduct9"/>
+            <deleteData createDataKey="createConfigChildProduct10" stepKey="deleteConfigChildProduct10"/>
+            <deleteData createDataKey="createConfigChildProduct11" stepKey="deleteConfigChildProduct11"/>
+            <deleteData createDataKey="createConfigChildProduct12" stepKey="deleteConfigChildProduct12"/>
+            <deleteData createDataKey="createConfigChildProduct13" stepKey="deleteConfigChildProduct13"/>
+            <deleteData createDataKey="createConfigChildProduct14" stepKey="deleteConfigChildProduct14"/>
+            <deleteData createDataKey="createConfigChildProduct15" stepKey="deleteConfigChildProduct15"/>
+            <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteAttribute"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value="catalogsearch_fulltext"/>
+            </actionGroup>
+        </after>
+
+        <actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="openCategory">
+            <argument name="category" value="$createCategory$"/>
+        </actionGroup>
+        <!--Check filtration options for created attribute. All attribute options should be displayed -->
+        <actionGroup ref="AssertStorefrontAttributeOptionPresentInLayeredNavigationActionGroup" stepKey="assertAttributeOption1PresentInLayeredNavigation">
+            <argument name="attributeLabel" value="$createConfigProductAttribute.attribute[frontend_labels][0][label]$"/>
+            <argument name="attributeOptionLabel" value="$getConfigAttributeOption1.label$"/>
+            <argument name="attributeOptionPosition" value="1"/>
+        </actionGroup>
+        <actionGroup ref="AssertStorefrontAttributeOptionPresentInLayeredNavigationActionGroup" stepKey="assertAttributeOption2PresentInLayeredNavigation">
+            <argument name="attributeLabel" value="$createConfigProductAttribute.attribute[frontend_labels][0][label]$"/>
+            <argument name="attributeOptionLabel" value="$getConfigAttributeOption2.label$"/>
+            <argument name="attributeOptionPosition" value="2"/>
+        </actionGroup>
+        <actionGroup ref="AssertStorefrontAttributeOptionPresentInLayeredNavigationActionGroup" stepKey="assertAttributeOption3PresentInLayeredNavigation">
+            <argument name="attributeLabel" value="$createConfigProductAttribute.attribute[frontend_labels][0][label]$"/>
+            <argument name="attributeOptionLabel" value="$getConfigAttributeOption3.label$"/>
+            <argument name="attributeOptionPosition" value="3"/>
+        </actionGroup>
+        <actionGroup ref="AssertStorefrontAttributeOptionPresentInLayeredNavigationActionGroup" stepKey="assertAttributeOption4PresentInLayeredNavigation">
+            <argument name="attributeLabel" value="$createConfigProductAttribute.attribute[frontend_labels][0][label]$"/>
+            <argument name="attributeOptionLabel" value="$getConfigAttributeOption4.label$"/>
+            <argument name="attributeOptionPosition" value="4"/>
+        </actionGroup>
+        <actionGroup ref="AssertStorefrontAttributeOptionPresentInLayeredNavigationActionGroup" stepKey="assertAttributeOption5PresentInLayeredNavigation">
+            <argument name="attributeLabel" value="$createConfigProductAttribute.attribute[frontend_labels][0][label]$"/>
+            <argument name="attributeOptionLabel" value="$getConfigAttributeOption5.label$"/>
+            <argument name="attributeOptionPosition" value="5"/>
+        </actionGroup>
+        <actionGroup ref="AssertStorefrontAttributeOptionPresentInLayeredNavigationActionGroup" stepKey="assertAttributeOption6PresentInLayeredNavigation">
+            <argument name="attributeLabel" value="$createConfigProductAttribute.attribute[frontend_labels][0][label]$"/>
+            <argument name="attributeOptionLabel" value="$getConfigAttributeOption6.label$"/>
+            <argument name="attributeOptionPosition" value="6"/>
+        </actionGroup>
+        <actionGroup ref="AssertStorefrontAttributeOptionPresentInLayeredNavigationActionGroup" stepKey="assertAttributeOption7PresentInLayeredNavigation">
+            <argument name="attributeLabel" value="$createConfigProductAttribute.attribute[frontend_labels][0][label]$"/>
+            <argument name="attributeOptionLabel" value="$getConfigAttributeOption7.label$"/>
+            <argument name="attributeOptionPosition" value="7"/>
+        </actionGroup>
+        <actionGroup ref="AssertStorefrontAttributeOptionPresentInLayeredNavigationActionGroup" stepKey="assertAttributeOption8PresentInLayeredNavigation">
+            <argument name="attributeLabel" value="$createConfigProductAttribute.attribute[frontend_labels][0][label]$"/>
+            <argument name="attributeOptionLabel" value="$getConfigAttributeOption8.label$"/>
+            <argument name="attributeOptionPosition" value="8"/>
+        </actionGroup>
+        <actionGroup ref="AssertStorefrontAttributeOptionPresentInLayeredNavigationActionGroup" stepKey="assertAttributeOption9PresentInLayeredNavigation">
+            <argument name="attributeLabel" value="$createConfigProductAttribute.attribute[frontend_labels][0][label]$"/>
+            <argument name="attributeOptionLabel" value="$getConfigAttributeOption9.label$"/>
+            <argument name="attributeOptionPosition" value="9"/>
+        </actionGroup>
+        <actionGroup ref="AssertStorefrontAttributeOptionPresentInLayeredNavigationActionGroup" stepKey="assertAttributeOption10PresentInLayeredNavigation">
+            <argument name="attributeLabel" value="$createConfigProductAttribute.attribute[frontend_labels][0][label]$"/>
+            <argument name="attributeOptionLabel" value="$getConfigAttributeOption10.label$"/>
+            <argument name="attributeOptionPosition" value="10"/>
+        </actionGroup>
+        <actionGroup ref="AssertStorefrontAttributeOptionPresentInLayeredNavigationActionGroup" stepKey="assertAttributeOption11PresentInLayeredNavigation">
+            <argument name="attributeLabel" value="$createConfigProductAttribute.attribute[frontend_labels][0][label]$"/>
+            <argument name="attributeOptionLabel" value="$getConfigAttributeOption11.label$"/>
+            <argument name="attributeOptionPosition" value="11"/>
+        </actionGroup>
+        <actionGroup ref="AssertStorefrontAttributeOptionPresentInLayeredNavigationActionGroup" stepKey="assertAttributeOption12PresentInLayeredNavigation">
+            <argument name="attributeLabel" value="$createConfigProductAttribute.attribute[frontend_labels][0][label]$"/>
+            <argument name="attributeOptionLabel" value="$getConfigAttributeOption12.label$"/>
+            <argument name="attributeOptionPosition" value="12"/>
+        </actionGroup>
+        <actionGroup ref="AssertStorefrontAttributeOptionPresentInLayeredNavigationActionGroup" stepKey="assertAttributeOption13PresentInLayeredNavigation">
+            <argument name="attributeLabel" value="$createConfigProductAttribute.attribute[frontend_labels][0][label]$"/>
+            <argument name="attributeOptionLabel" value="$getConfigAttributeOption13.label$"/>
+            <argument name="attributeOptionPosition" value="13"/>
+        </actionGroup>
+        <actionGroup ref="AssertStorefrontAttributeOptionPresentInLayeredNavigationActionGroup" stepKey="assertAttributeOption14PresentInLayeredNavigation">
+            <argument name="attributeLabel" value="$createConfigProductAttribute.attribute[frontend_labels][0][label]$"/>
+            <argument name="attributeOptionLabel" value="$getConfigAttributeOption14.label$"/>
+            <argument name="attributeOptionPosition" value="14"/>
+        </actionGroup>
+        <actionGroup ref="AssertStorefrontAttributeOptionPresentInLayeredNavigationActionGroup" stepKey="assertAttributeOption15PresentInLayeredNavigation">
+            <argument name="attributeLabel" value="$createConfigProductAttribute.attribute[frontend_labels][0][label]$"/>
+            <argument name="attributeOptionLabel" value="$getConfigAttributeOption15.label$"/>
+            <argument name="attributeOptionPosition" value="15"/>
+        </actionGroup>
+    </test>
+</tests>

From 095dcc631d8e84ece779f7d4490e4a980fb61360 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Fri, 17 Jul 2020 14:05:24 +0100
Subject: [PATCH 0917/1718] Added try to cover case when root category doesnt
 exists

---
 .../ResourceModel/GetAssetIdsByCategoryStore.php      | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByCategoryStore.php b/app/code/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByCategoryStore.php
index 4b9e3d1265a21..232577b77c802 100644
--- a/app/code/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByCategoryStore.php
+++ b/app/code/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByCategoryStore.php
@@ -11,6 +11,7 @@
 use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\MediaContentApi\Model\GetAssetIdsByContentFieldInterface;
 use Magento\Store\Api\GroupRepositoryInterface;
 use Magento\Store\Api\StoreRepositoryInterface;
@@ -70,9 +71,13 @@ public function __construct(
      */
     public function execute(string $value): array
     {
-        $storeView = $this->storeRepository->getById($value);
-        $storeGroup = $this->storeGroupRepository->get($storeView->getStoreGroupId());
-        $rootCategory = $this->categoryRepository->get($storeGroup->getRootCategoryId());
+        try {
+            $storeView = $this->storeRepository->getById($value);
+            $storeGroup = $this->storeGroupRepository->get($storeView->getStoreGroupId());
+            $rootCategory = $this->categoryRepository->get($storeGroup->getRootCategoryId());
+        } catch (NoSuchEntityException $exception) {
+            return [];
+        }
 
         $sql = $this->connection->getConnection()->select()->from(
             ['asset_content_table' => $this->connection->getTableName(self::TABLE_CONTENT_ASSET)],

From 32080f7ef6abc560efb87c1a7c93568bb5579442 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Fri, 17 Jul 2020 16:33:56 +0300
Subject: [PATCH 0918/1718] MFTF tests updates.

---
 ...rConfigNotAvailableDirectlyActionGroup.xml |  4 +-
 ...nAsCustomerConfigNotVisibleActionGroup.xml |  4 +-
 ...ertLoginAsCustomerLogRecordActionGroup.xml |  2 +-
 ...minFilterLoginAsCustomerLogActionGroup.xml |  2 +-
 ...ustomerAbsentOnCustomerPageActionGroup.xml |  4 +-
 ...AsCustomerAbsentOnOrderPageActionGroup.xml |  4 +-
 ...inAsCustomerLogAbsentInMenuActionGroup.xml |  2 +-
 ...CustomerLogPageNotAvailableActionGroup.xml |  2 +-
 ...stomerLoginFromCustomerPageActionGroup.xml |  2 +-
 ...romCustomerPageManualChooseActionGroup.xml |  2 +-
 ...sCustomerLoginFromOrderPageActionGroup.xml |  2 +-
 ...AdminOpenLoginAsCustomerLogActionGroup.xml |  4 +-
 ...nLoginAsCustomerLogFromMenuActionGroup.xml |  4 +-
 .../Test/Mftf/Data/AdminMenuData.xml          |  4 +-
 .../LoginAsCustomer/Test/Mftf/README.md       |  4 +-
 .../Mftf/Section/AdminCustomerGridSection.xml |  2 +-
 .../Mftf/Section/AdminOrdersGridSection.xml   |  2 +-
 ...gUserAccessToLoginAsCustomerButtonTest.xml |  2 +-
 ...hangUserAccessToLoginAsCustomerLogTest.xml |  2 +-
 ...oginAsCustomerAddProductToWishlistTest.xml |  6 +-
 .../AdminLoginAsCustomerAutoDetectionTest.xml |  4 +-
 ...nAsCustomerDirectlyToCustomWebsiteTest.xml |  6 +-
 ...oginAsCustomerEditCustomersAddressTest.xml |  6 +-
 ...gNotShownIfLoginAsCustomerDisabledTest.xml | 10 +--
 .../Test/AdminLoginAsCustomerLoggingTest.xml  |  6 +-
 ...CustomerManualChooseStoreCodeInUrlTest.xml |  2 +-
 .../AdminLoginAsCustomerManualChooseTest.xml  |  4 +-
 .../AdminLoginAsCustomerPlaceOrderTest.xml    |  4 +-
 .../Test/AdminLoginAsCustomerReorderTest.xml  |  2 +-
 ...ginAsCustomerSubscribeToNewsletterTest.xml |  6 +-
 ...inLoginAsCustomerUserSingleSessionTest.xml | 68 +++++++++++++++++++
 ...minNoAccessToLoginAsCustomerButtonTest.xml |  6 +-
 ...INotShownIfLoginAsCustomerDisabledTest.xml |  6 +-
 ...minUIShownIfLoginAsCustomerEnabledTest.xml |  6 +-
 ...tLoginAsCustomerNotificationBannerTest.xml |  4 +-
 35 files changed, 134 insertions(+), 66 deletions(-)
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserSingleSessionTest.xml

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigNotAvailableDirectlyActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigNotAvailableDirectlyActionGroup.xml
index be66dceb8f161..7e032b168f062 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigNotAvailableDirectlyActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigNotAvailableDirectlyActionGroup.xml
@@ -10,12 +10,12 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminAssertLoginAsCustomerConfigNotAvailableDirectlyActionGroup">
         <annotations>
-            <description>Verify Login As Customer config section is not available by direct url.</description>
+            <description>Verify Login as Customer config section is not available by direct url.</description>
         </annotations>
 
         <amOnPage url="{{AdminLoginAsCustomerConfigPage.url}}" stepKey="navigateToLoginAsCustomerConfigSection"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <seeInCurrentUrl url="admin/system_config/index" stepKey="seeRedirectToConfigIndexPage"/>
-        <dontSee userInput="Login As Customer" stepKey="dontSeeLoginAsCustomer"/>
+        <dontSee userInput="Login as Customer" stepKey="dontSeeLoginAsCustomer"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigNotVisibleActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigNotVisibleActionGroup.xml
index 94fdea4b11b16..875869d9928a4 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigNotVisibleActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigNotVisibleActionGroup.xml
@@ -10,10 +10,10 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminAssertLoginAsCustomerConfigNotVisibleActionGroup">
         <annotations>
-            <description>Verify no Login As Customer config section available.</description>
+            <description>Verify no Login as Customer config section available.</description>
         </annotations>
 
         <!-- TODO: update -->
-        <dontSee userInput="Login As Customer" stepKey="dontSeeLoginAsCustomerItem"/>
+        <dontSee userInput="Login as Customer" stepKey="dontSeeLoginAsCustomerItem"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerLogRecordActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerLogRecordActionGroup.xml
index ced0b51466bd5..da47864e28eac 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerLogRecordActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerLogRecordActionGroup.xml
@@ -10,7 +10,7 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminAssertLoginAsCustomerLogRecordActionGroup">
         <annotations>
-            <description>Assert Login As Customer Log record is correct.</description>
+            <description>Assert Login as Customer Log record is correct.</description>
         </annotations>
         <arguments>
             <argument name="rowNumber" type="string"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminFilterLoginAsCustomerLogActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminFilterLoginAsCustomerLogActionGroup.xml
index 18bfe790d29a5..17eb351bf8f1b 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminFilterLoginAsCustomerLogActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminFilterLoginAsCustomerLogActionGroup.xml
@@ -10,7 +10,7 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminFilterLoginAsCustomerLogActionGroup">
         <annotations>
-            <description>Filter Login As Customer Log records.</description>
+            <description>Filter Login as Customer Log records.</description>
         </annotations>
         <arguments>
             <argument name="adminId" type="string"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerPageActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerPageActionGroup.xml
index 28a8b483f094f..e56d898fa9197 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerPageActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnCustomerPageActionGroup.xml
@@ -10,7 +10,7 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminLoginAsCustomerAbsentOnCustomerPageActionGroup">
         <annotations>
-            <description>Verify Login As Customer Login action is absent on Customer page.</description>
+            <description>Verify Login as Customer Login action is absent on Customer page.</description>
         </annotations>
         <arguments>
             <argument name="customerId" type="string"/>
@@ -18,6 +18,6 @@
 
         <amOnPage url="{{AdminEditCustomerPage.url(customerId)}}" stepKey="gotoCustomerPage"/>
         <waitForPageLoad stepKey="waitForCustomerPageLoad"/>
-        <dontSee userInput="Login As Customer" stepKey="dontSeeLoginAsCustomer"/>
+        <dontSee userInput="Login as Customer" stepKey="dontSeeLoginAsCustomer"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderPageActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderPageActionGroup.xml
index 746580546fbf3..1119f6b05fac3 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderPageActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerAbsentOnOrderPageActionGroup.xml
@@ -10,7 +10,7 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminLoginAsCustomerAbsentOnOrderPageActionGroup">
         <annotations>
-            <description>Verify Login As Customer Login action is absent on Order page.</description>
+            <description>Verify Login as Customer Login action is absent on Order page.</description>
         </annotations>
         <arguments>
             <argument name="orderId" type="string"/>
@@ -18,6 +18,6 @@
 
         <amOnPage url="{{AdminOrderPage.url(orderId)}}" stepKey="gotoOrderPage"/>
         <waitForPageLoad stepKey="waitForOrderPageLoad"/>
-        <dontSee userInput="Login As Customer" stepKey="dontSeeLoginAsCustomer"/>
+        <dontSee userInput="Login as Customer" stepKey="dontSeeLoginAsCustomer"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogAbsentInMenuActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogAbsentInMenuActionGroup.xml
index 4f475c9793624..beb0f4cba973c 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogAbsentInMenuActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogAbsentInMenuActionGroup.xml
@@ -10,7 +10,7 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminLoginAsCustomerLogAbsentInMenuActionGroup">
         <annotations>
-            <description>Verify Login As Customer is absent in admin menu.</description>
+            <description>Verify Login as Customer is absent in admin menu.</description>
         </annotations>
 
         <click selector="{{AdminMenuSection.menuItem(AdminMenuCustomers.dataUiId)}}"
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogPageNotAvailableActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogPageNotAvailableActionGroup.xml
index 0efab2c1368c2..939ff73199a63 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogPageNotAvailableActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLogPageNotAvailableActionGroup.xml
@@ -10,7 +10,7 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminLoginAsCustomerLogPageNotAvailableActionGroup">
         <annotations>
-            <description>Verify Login As Customer is not available by direct url.</description>
+            <description>Verify Login as Customer is not available by direct url.</description>
         </annotations>
 
         <amOnPage url="{{AdminLoginAsCustomerLogPage.url}}" stepKey="openAdminLoginAsCustomerLogPage"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageActionGroup.xml
index 0aa12d21e4772..599a6f8f9e270 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageActionGroup.xml
@@ -10,7 +10,7 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminLoginAsCustomerLoginFromCustomerPageActionGroup">
         <annotations>
-            <description>Verify Login As Customer Login action is works properly from Customer page.</description>
+            <description>Verify Login as Customer Login action is works properly from Customer page.</description>
         </annotations>
         <arguments>
             <argument name="customerId" type="string"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup.xml
index e09fd270712d7..8db34a05252ee 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup.xml
@@ -10,7 +10,7 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup">
         <annotations>
-            <description>Verify Login As Customer Login action is works properly from Customer page with manual Store View choose.</description>
+            <description>Verify Login as Customer Login action is works properly from Customer page with manual Store View choose.</description>
         </annotations>
         <arguments>
             <argument name="customerId" type="string"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageActionGroup.xml
index 5be590d78361e..a478f8e9d18cd 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageActionGroup.xml
@@ -10,7 +10,7 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminLoginAsCustomerLoginFromOrderPageActionGroup">
         <annotations>
-            <description>Verify Login As Customer Login action is works properly from Order grid page.</description>
+            <description>Verify Login as Customer Login action is works properly from Order grid page.</description>
         </annotations>
         <arguments>
             <argument name="orderId" type="string"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminOpenLoginAsCustomerLogActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminOpenLoginAsCustomerLogActionGroup.xml
index 6cd47e474439a..9130ba5b05c51 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminOpenLoginAsCustomerLogActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminOpenLoginAsCustomerLogActionGroup.xml
@@ -10,11 +10,11 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminOpenLoginAsCustomerLogActionGroup">
         <annotations>
-            <description>Navigate to Login As Customer Log page.</description>
+            <description>Navigate to Login as Customer Log page.</description>
         </annotations>
 
         <amOnPage url="{{AdminLoginAsCustomerLogPage.url}}" stepKey="gotoLoginAsCustomerLogPage"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
-        <see userInput="Login As Customer Log" stepKey="titleIsVisible"/>
+        <see userInput="Login as Customer Log" stepKey="titleIsVisible"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminOpenLoginAsCustomerLogFromMenuActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminOpenLoginAsCustomerLogFromMenuActionGroup.xml
index 0cc6722a1bbc1..b1a99d67afe4f 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminOpenLoginAsCustomerLogFromMenuActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminOpenLoginAsCustomerLogFromMenuActionGroup.xml
@@ -10,7 +10,7 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminOpenLoginAsCustomerLogFromMenuActionGroup">
         <annotations>
-            <description>Navigate to Login As Customer Log from Menu.</description>
+            <description>Navigate to Login as Customer Log from Menu.</description>
         </annotations>
 
         <click selector="{{AdminMenuSection.menuItem(AdminMenuCustomers.dataUiId)}}"
@@ -18,7 +18,7 @@
         <click selector="{{AdminMenuSection.menuItem(AdminMenuLoginAsCustomer.dataUiId)}}"
                stepKey="openLoginAsCustomerLog"/>
         <waitForPageLoad stepKey="waitForLoginAsCustomerLog"/>
-        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Login As Customer Log"
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Login as Customer Log"
              stepKey="seeForLoginAsCustomerLog"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/AdminMenuData.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/AdminMenuData.xml
index e326fa1e1d225..38779dd987c65 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/AdminMenuData.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/AdminMenuData.xml
@@ -9,8 +9,8 @@
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="AdminMenuLoginAsCustomer">
-        <data key="pageTitle">Login As Customer Log</data>
-        <data key="title">Login As Customer Log</data>
+        <data key="pageTitle">Login as Customer Log</data>
+        <data key="title">Login as Customer Log</data>
         <data key="dataUiId">magento-loginascustomer-login-log</data>
     </entity>
 </entities>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/README.md b/app/code/Magento/LoginAsCustomer/Test/Mftf/README.md
index 5069a2cb278f6..1d574fc35cdab 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/README.md
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/README.md
@@ -1,3 +1,3 @@
-# Integration Functional Tests
+# Functional Tests
 
-The Functional Test Module for **Magento Login As Customer** module.
+The Functional Tests for **Magento Login as Customer** module.
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminCustomerGridSection.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminCustomerGridSection.xml
index e7b38bf9f9c94..4d7c49644957d 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminCustomerGridSection.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminCustomerGridSection.xml
@@ -9,7 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCustomerGridSection">
-        <element name="customerLoginAsCustomerLinkByEmail" type="text" selector="//tr[contains(@class, 'data-row') and td/div[text()='{{customerEmail}}']]//a[@class='action-menu-item'][text() = 'Login As Customer']" parameterized="true" timeout="30"/>
+        <element name="customerLoginAsCustomerLinkByEmail" type="text" selector="//tr[contains(@class, 'data-row') and td/div[text()='{{customerEmail}}']]//a[@class='action-menu-item'][text() = 'Login as Customer']" parameterized="true" timeout="30"/>
     </section>
 </sections>
 
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminOrdersGridSection.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminOrdersGridSection.xml
index ac2dc8ef8c421..34c4a14e81bb5 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminOrdersGridSection.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminOrdersGridSection.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="AdminOrdersGridSection">
-        <element name="loginAsCustomerLink" type="text" selector="//td/div[contains(.,'{{orderId}}')]/../..//a[@class='action-menu-item'][text() = 'Login As Customer']" parameterized="true"/>
+        <element name="loginAsCustomerLink" type="text" selector="//td/div[contains(.,'{{orderId}}')]/../..//a[@class='action-menu-item'][text() = 'Login as Customer']" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerButtonTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerButtonTest.xml
index e2079d85f6267..9ebeae23d47a8 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerButtonTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerButtonTest.xml
@@ -10,7 +10,7 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminChangUserAccessToLoginAsCustomerButtonTest">
         <annotations>
-            <features value="Login As Customer"/>
+            <features value="Login as Customer"/>
             <stories value="Permissions and ACl"/>
             <title value="Change admin user's access to 'Login as Customer Button'"/>
             <description
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerLogTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerLogTest.xml
index 255c6978d6e55..c0aa3740309a6 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerLogTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerLogTest.xml
@@ -10,7 +10,7 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminChangUserAccessToLoginAsCustomerLogTest">
         <annotations>
-            <features value="Login As Customer"/>
+            <features value="Login as Customer"/>
             <stories value="Permissions and ACl"/>
             <title value="Change admin user's access to 'Login as Customer Log'"/>
             <description
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAddProductToWishlistTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAddProductToWishlistTest.xml
index 17480d0f84c7b..8ab3fe8ce3bc3 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAddProductToWishlistTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAddProductToWishlistTest.xml
@@ -10,11 +10,11 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminLoginAsCustomerAddProductToWishlistTest">
         <annotations>
-            <features value="Login As Customer"/>
+            <features value="Login as Customer"/>
             <stories value="Added product to wish-list"/>
             <title value="Admin user login as customer and add products to customer's wish-list"/>
             <description
-                value="Verify that Admin can add products to customer's wish-list using Login As Customer functionality"/>
+                value="Verify that Admin can add products to customer's wish-list using Login as Customer functionality"/>
             <severity value="AVERAGE"/>
             <group value="login_as_customer"/>
         </annotations>
@@ -41,7 +41,7 @@
             <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
         </after>
 
-        <!-- Admin Login As Customer from Customer page -->
+        <!-- Admin Login as Customer from Customer page -->
         <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup"
                      stepKey="loginAsCustomerFromCustomerPage">
             <argument name="customerId" value="$$createCustomer.id$$"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml
index 2ea3cb5ec341b..42d53113e20f4 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml
@@ -10,7 +10,7 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminLoginAsCustomerAutoDetectionTest">
         <annotations>
-            <features value="Login As Customer"/>
+            <features value="Login as Customer"/>
             <stories value="Select Store View 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"/>
@@ -46,7 +46,7 @@
             <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
         </after>
 
-        <!-- Login As Customer from Customer page -->
+        <!-- Login as Customer from Customer page -->
         <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup"
                      stepKey="loginAsCustomerFromCustomerPage">
             <argument name="customerId" value="$$createCustomer.id$$"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerDirectlyToCustomWebsiteTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerDirectlyToCustomWebsiteTest.xml
index 8c7724a5f6ce6..e5a5a6f9a9738 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerDirectlyToCustomWebsiteTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerDirectlyToCustomWebsiteTest.xml
@@ -10,8 +10,8 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminLoginAsCustomerDirectlyToCustomWebsiteTest">
         <annotations>
-            <features value="Login As Customer"/>
-            <stories value="Login As Customer into additional website"/>
+            <features value="Login as Customer"/>
+            <stories value="Login as Customer into additional website"/>
             <title value="Admin user directly login into customer account on custom website"/>
             <description
                 value="Verify admin user can directly login into customer account on custom website using 'Login as customer' functionality"/>
@@ -63,7 +63,7 @@
             <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
         </after>
 
-        <!-- Login As Customer from Customer page -->
+        <!-- Login as Customer from Customer page -->
         <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="OpenEditCustomerFrom">
             <argument name="customer" value="Simple_US_Customer"/>
         </actionGroup>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerEditCustomersAddressTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerEditCustomersAddressTest.xml
index 35373d78f194b..38a8798d401bb 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerEditCustomersAddressTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerEditCustomersAddressTest.xml
@@ -10,11 +10,11 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminLoginAsCustomerEditCustomersAddressTest">
         <annotations>
-            <features value="Login As Customer"/>
+            <features value="Login as Customer"/>
             <stories value="Edit Customer addresses"/>
             <title value="Admin user login as customer and edit customer's address"/>
             <description
-                value="Verify Admin can access customer's personal cabinet and change his default shipping and billing addresses using Login As Customer functionality"/>
+                value="Verify Admin can access customer's personal cabinet and change his default shipping and billing addresses using Login as Customer functionality"/>
             <severity value="CRITICAL"/>
             <group value="login_as_customer"/>
         </annotations>
@@ -35,7 +35,7 @@
             <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
         </after>
 
-        <!-- Login As Customer Login from Customer page -->
+        <!-- Login as Customer Login from Customer page -->
         <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup"
                      stepKey="loginAsCustomerFromCustomerPage">
             <argument name="customerId" value="$$createCustomer.id$$"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLogNotShownIfLoginAsCustomerDisabledTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLogNotShownIfLoginAsCustomerDisabledTest.xml
index bcd824707a1cd..4ef72d949065d 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLogNotShownIfLoginAsCustomerDisabledTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLogNotShownIfLoginAsCustomerDisabledTest.xml
@@ -10,10 +10,10 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminLoginAsCustomerLogNotShownIfLoginAsCustomerDisabledTest">
         <annotations>
-            <features value="Login As Customer"/>
+            <features value="Login as Customer"/>
             <stories value="Availability of UI elements if module enable/disable"/>
-            <title value="'Login As Customer Log' not shown if 'Login as customer' functionality is disabled"/>
-            <description value="Verify that 'Login As Customer Log' not shown if 'Login as customer' functionality is disabled"/>
+            <title value="'Login as Customer Log' not shown if 'Login as customer' functionality is disabled"/>
+            <description value="Verify that 'Login as Customer Log' not shown if 'Login as customer' functionality is disabled"/>
             <severity value="CRITICAL"/>
             <group value="login_as_customer"/>
         </annotations>
@@ -25,10 +25,10 @@
         <after>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
-        <!-- Verify Login As Customer Log is absent in admin menu -->
+        <!-- Verify Login as Customer Log is absent in admin menu -->
         <actionGroup ref="AdminLoginAsCustomerLogAbsentInMenuActionGroup" stepKey="verifyLoginAsCustomerLogAbsentInMenu"/>
 
-        <!-- Verify Login As Customer Log is not available by direct url -->
+        <!-- Verify Login as Customer Log is not available by direct url -->
         <actionGroup ref="AdminLoginAsCustomerLogPageNotAvailableActionGroup" stepKey="verifyLoginAsCustomerLogNotAvailable"/>
     </test>
 </tests>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingTest.xml
index 6d6dcc1377434..bf2556b30967b 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingTest.xml
@@ -10,10 +10,10 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminLoginAsCustomerLoggingTest">
         <annotations>
-            <features value="Login As Customer"/>
+            <features value="Login as Customer"/>
             <!-- TODO: change "stories" value -->
             <stories value="Place order and reorder"/>
-            <title value="Using 'Login As Customer' is logged properly"/>
+            <title value="Using 'Login as Customer' is logged properly"/>
             <description
                 value="Verify that 'Login as customer Log' record information about using 'Login as Customer' functionality properly"/>
             <severity value="MAJOR"/>
@@ -80,7 +80,7 @@
         </actionGroup>
         <actionGroup ref="StorefrontSignOutAndCloseTabActionGroup" stepKey="signOutSecondCustomerNewAdmin"/>
 
-        <!-- Navigate to Login As Customer Log page -->
+        <!-- Navigate to Login as Customer Log page -->
         <actionGroup ref="AdminOpenLoginAsCustomerLogActionGroup" stepKey="gotoLoginAsCustomerLog"/>
 
         <!-- Perform assertions -->
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseStoreCodeInUrlTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseStoreCodeInUrlTest.xml
index 3b78459301398..27aee2061f204 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseStoreCodeInUrlTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseStoreCodeInUrlTest.xml
@@ -10,7 +10,7 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminLoginAsCustomerManualChooseStoreCodeInUrlTest" extends="AdminLoginAsCustomerManualChooseTest">
         <annotations>
-            <features value="Login As Customer"/>
+            <features value="Login as Customer"/>
             <stories value="Select Store View 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"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
index 028ef0526b0c5..acae07d1cda11 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
@@ -10,7 +10,7 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminLoginAsCustomerManualChooseTest">
         <annotations>
-            <features value="Login As Customer"/>
+            <features value="Login as Customer"/>
             <stories value="Select Store View 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"/>
@@ -45,7 +45,7 @@
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
         </after>
 
-        <!-- Login As Customer from Customer page -->
+        <!-- Login as Customer from Customer page -->
         <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup"
                      stepKey="loginAsCustomerFromCustomerPage">
             <argument name="customerId" value="$$createCustomer.id$$"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml
index b5c8817141438..a4994d5c041d2 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml
@@ -10,7 +10,7 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminLoginAsCustomerPlaceOrderTest">
         <annotations>
-            <features value="Login As Customer"/>
+            <features value="Login as Customer"/>
             <stories value="Place order and reorder"/>
             <title value="Admin user login as customer and place order"/>
             <description
@@ -62,7 +62,7 @@
             <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
         </after>
 
-        <!-- Login As Customer from Customer page -->
+        <!-- Login as Customer from Customer page -->
         <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup"
                      stepKey="loginAsCustomerFromCustomerPage">
             <argument name="customerId" value="$$createCustomer.id$$"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerReorderTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerReorderTest.xml
index 13c052df8209e..16e0b94112562 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerReorderTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerReorderTest.xml
@@ -10,7 +10,7 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminLoginAsCustomerReorderTest">
         <annotations>
-            <features value="Login As Customer"/>
+            <features value="Login as Customer"/>
             <stories value="Place order and reorder"/>
             <title value="Admin user login as customer and reorder existing order"/>
             <description
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSubscribeToNewsletterTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSubscribeToNewsletterTest.xml
index 60a6fe7963043..44409471821db 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSubscribeToNewsletterTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSubscribeToNewsletterTest.xml
@@ -10,11 +10,11 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminLoginAsCustomerSubscribeToNewsletterTest">
         <annotations>
-            <features value="Login As Customer"/>
+            <features value="Login as Customer"/>
             <stories value="Subscribe to newsletter"/>
             <title value="Admin user login as customer and make subscription to newsletter"/>
             <description
-                value="Verify that Admin can subscribe to newsletter using Login As Customer functionality"/>
+                value="Verify that Admin can subscribe to newsletter using Login as Customer functionality"/>
             <severity value="AVERAGE"/>
             <group value="login_as_customer"/>
         </annotations>
@@ -34,7 +34,7 @@
             <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
         </after>
 
-        <!-- Admin Login As Customer from Customer page -->
+        <!-- Admin Login as Customer from Customer page -->
         <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup"
                      stepKey="lLoginAsCustomerFromCustomerPage">
             <argument name="customerId" value="$$createCustomer.id$$"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserSingleSessionTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserSingleSessionTest.xml
new file mode 100644
index 0000000000000..ad83476beeeda
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserSingleSessionTest.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="AdminLoginAsCustomerUserSingleSessionTest">
+        <annotations>
+            <features value="Login фs Customer"/>
+            <stories value="Destroy impersonated customer sessions on admin logout"/>
+            <title value="Admin users can have only one 'Login as Customer' session at a time"/>
+            <description
+                value="Verify Admin users can have only one 'Login as Customer' session at a time"/>
+            <severity value="MAJOR"/>
+            <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" stepKey="enableLoginAsCustomer"/>
+            <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0"
+                        stepKey="enableLoginAsCustomerAutoDetection"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
+            <createData entity="Simple_US_Customer" stepKey="createFirstCustomer"/>
+            <createData entity="Simple_US_CA_Customer" stepKey="createSecondCustomer"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDefaultUser"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createFirstCustomer" stepKey="deleteFirstCustomer"/>
+            <deleteData createDataKey="createSecondCustomer" stepKey="deleteSecondCustomer"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAfter"/>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0"
+                        stepKey="disableLoginAsCustomer"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
+        </after>
+
+        <!-- Login into First Customer account -->
+        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup"
+                     stepKey="loginAsFirstCustomer">
+            <argument name="customerId" value="$$createFirstCustomer.id$$"/>
+        </actionGroup>
+
+        <!-- Assert correctly logged in as First Customer -->
+        <actionGroup ref="StorefrontAssertLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromFirstCustomerPage">
+            <argument name="customerFullName" value="$$createFirstCustomer.firstname$$ $$createFirstCustomer.lastname$$"/>
+            <argument name="customerEmail" value="$$createFirstCustomer.email$$"/>
+        </actionGroup>
+
+        <!-- Login into Second Customer account -->
+        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup"
+                     stepKey="loginAsSecondCustomer">
+            <argument name="customerId" value="$$createSecondCustomer.id$$"/>
+        </actionGroup>
+
+        <!-- Assert correctly logged in as Second Customer -->
+        <actionGroup ref="StorefrontAssertLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromSecondCustomerPage">
+            <argument name="customerFullName" value="$$createSecondCustomer.firstname$$ $$createSecondCustomer.lastname$$"/>
+            <argument name="customerEmail" value="$$createSecondCustomer.email$$"/>
+        </actionGroup>
+
+        <actionGroup ref="StorefrontSignOutAndCloseTabActionGroup" stepKey="signOutSecondCustomer"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerButtonTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerButtonTest.xml
index 5bacca897b66a..52f5d7c51dcd1 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerButtonTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerButtonTest.xml
@@ -10,7 +10,7 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminNoAccessToLoginAsCustomerButtonTest">
         <annotations>
-            <features value="Login As Customer"/>
+            <features value="Login as Customer"/>
             <stories value="Permissions and ACl"/>
             <title value="User does not have access to 'Login as customer' button"/>
             <description value="Login into Magento Admin panel as user that does not have access to 'Login as customer' button"/>
@@ -77,7 +77,7 @@
             <argument name="password" value="{{NewAdminUser.password}}"/>
         </actionGroup>
 
-        <!-- Verify Login As Customer Login action is absent on Customer page -->
+        <!-- Verify Login as Customer Login action is absent on Customer page -->
         <actionGroup ref="AdminLoginAsCustomerAbsentOnCustomerPageActionGroup" stepKey="verifyLoginAsCustomerAbsentOnCustomerPage">
             <argument name="customerId" value="$createCustomer.id$"/>
         </actionGroup>
@@ -89,7 +89,7 @@
         </actionGroup>
         <grabTextFrom selector="{{AdminOrderDetailsInformationSection.orderId}}" stepKey="grabOrderId"/>
 
-        <!-- Verify Login As Customer Login action is absent on Order page -->
+        <!-- Verify Login as Customer Login action is absent on Order page -->
         <actionGroup ref="AdminLoginAsCustomerAbsentOnOrderPageActionGroup" stepKey="verifyLoginAsCustomerAbsentOnOrderPage">
             <argument name="orderId" value="{$grabOrderId}"/>
         </actionGroup>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUINotShownIfLoginAsCustomerDisabledTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUINotShownIfLoginAsCustomerDisabledTest.xml
index a39b66a67aae1..19a84ecadc72b 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUINotShownIfLoginAsCustomerDisabledTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUINotShownIfLoginAsCustomerDisabledTest.xml
@@ -10,7 +10,7 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminUINotShownIfLoginAsCustomerDisabledTest">
         <annotations>
-            <features value="Login As Customer"/>
+            <features value="Login as Customer"/>
             <stories value="Availability of UI elements if module enable/disable"/>
             <title value="UI elements are not shown if 'Login as customer' functionality is disabled"/>
             <description value="Verify that UI elements are not shown if 'Login as customer' functionality is disabled"/>
@@ -34,7 +34,7 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
-        <!-- Verify Login As Customer Login action is absent on Customer page -->
+        <!-- Verify Login as Customer Login action is absent on Customer page -->
         <actionGroup ref="AdminLoginAsCustomerAbsentOnCustomerPageActionGroup" stepKey="verifyLoginAsCustomerAbsentOnCustomerPage">
             <argument name="customerId" value="$createCustomer.id$"/>
         </actionGroup>
@@ -46,7 +46,7 @@
         </actionGroup>
         <grabTextFrom selector="{{AdminOrderDetailsInformationSection.orderId}}" stepKey="grabOrderId"/>
 
-        <!-- Verify Login As Customer Login action is absent on Order page -->
+        <!-- Verify Login as Customer Login action is absent on Order page -->
         <actionGroup ref="AdminLoginAsCustomerAbsentOnOrderPageActionGroup" stepKey="verifyLoginAsCustomerAbsentOnOrderPage">
             <argument name="orderId" value="{$grabOrderId}"/>
         </actionGroup>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml
index 8170051dd2c32..2bf364b29ba8d 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml
@@ -10,7 +10,7 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminUIShownIfLoginAsCustomerEnabledTest">
         <annotations>
-            <features value="Login As Customer"/>
+            <features value="Login as Customer"/>
             <stories value="Availability of UI elements if module enable/disable"/>
             <title value="UI elements are shown if 'Login as customer' functionality is enabled"/>
             <description
@@ -42,7 +42,7 @@
             <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
         </after>
 
-        <!-- Verify Login As Customer Login action works correctly from Customer page -->
+        <!-- Verify Login as Customer Login action works correctly from Customer page -->
         <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup"
                      stepKey="verifyLoginAsCustomerWorksOnCustomerPage">
             <argument name="customerId" value="$$createCustomer.id$$"/>
@@ -64,7 +64,7 @@
             <argument name="orderId" value="$grabOrderId"/>
         </actionGroup>
 
-        <!-- Verify Login As Customer Login action works correctly from Order page -->
+        <!-- Verify Login as Customer Login action works correctly from Order page -->
         <actionGroup ref="AdminLoginAsCustomerLoginFromOrderPageActionGroup"
                      stepKey="verifyLoginAsCustomerWorksOnOrderPage">
             <argument name="orderId" value="$grabOrderId"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerNotificationBannerTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerNotificationBannerTest.xml
index ec47c2127a94d..d953c493562c6 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerNotificationBannerTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerNotificationBannerTest.xml
@@ -10,7 +10,7 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="StorefrontLoginAsCustomerNotificationBannerTest">
         <annotations>
-            <features value="Login As Customer"/>
+            <features value="Login as Customer"/>
             <stories value="Availability of UI elements if module enable/disable"/>
             <title value="Notification Banner is present on Storefront page"/>
             <description
@@ -35,7 +35,7 @@
             <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
         </after>
 
-        <!-- Login As Customer from Customer page -->
+        <!-- Login as Customer from Customer page -->
         <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup"
                      stepKey="loginAsCustomerFromCustomerPage">
             <argument name="customerId" value="$$createCustomer.id$$"/>

From 674248236e8c449f800ccc43e24fafe81902132c Mon Sep 17 00:00:00 2001
From: Anusha Vattam <avattam@adobe.com>
Date: Fri, 17 Jul 2020 13:13:41 -0500
Subject: [PATCH 0919/1718] MC-35653:MyAccount :: Order Details :: Payments
 Methods, shipping address, billing address by Order Number

- Added changes from review
---
 .../SalesGraphQl/Model/Order/OrderAddress.php |   4 +-
 .../Model/Order/OrderPayments.php             |   4 +-
 .../Sales/RetrieveOrdersByOrderNumberTest.php | 102 ++++++++++++++++--
 3 files changed, 95 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php b/app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php
index 01b191618dc96..dfeaf7c06ec54 100644
--- a/app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php
+++ b/app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php
@@ -23,7 +23,7 @@ class OrderAddress
      */
     public function getOrderShippingAddress(
         OrderInterface $order
-    ) {
+    ): ?array {
         $shippingAddress = null;
         if ($order->getShippingAddress()) {
             $shippingAddress = $this->orderAddressDataFormatter($order->getShippingAddress());
@@ -39,7 +39,7 @@ public function getOrderShippingAddress(
      */
     public function getOrderBillingAddress(
         OrderInterface $order
-    ) {
+    ): ?array {
         $billingAddress = null;
         if ($order->getBillingAddress()) {
             $billingAddress = $this->orderAddressDataFormatter($order->getBillingAddress());
diff --git a/app/code/Magento/SalesGraphQl/Model/Order/OrderPayments.php b/app/code/Magento/SalesGraphQl/Model/Order/OrderPayments.php
index 53ca478b4e241..ab110f23aaa28 100644
--- a/app/code/Magento/SalesGraphQl/Model/Order/OrderPayments.php
+++ b/app/code/Magento/SalesGraphQl/Model/Order/OrderPayments.php
@@ -25,8 +25,8 @@ public function getOrderPaymentMethod(OrderInterface $orderModel): array
         $orderPayment = $orderModel->getPayment();
         return [
             [
-                'name' => $orderPayment->getAdditionalInformation()['method_title'] ?? 'method_title',
-                'type' => $orderPayment->getMethod() ?? null,
+                'name' => $orderPayment->getAdditionalInformation()['method_title'] ?? ' ',
+                'type' => $orderPayment->getMethod(),
                 'additional_data' => []
             ]
         ];
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php
index 4375e43f5c0e1..c7df1142ae0f0 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php
@@ -63,11 +63,51 @@ public function testGetCustomerOrdersSimpleProductQuery()
       number
       status
       order_date
-      payment_methods{name type additional_data{ name value}}
-      shipping_address{firstname lastname city company country_code fax middlename postcode prefix street region
-      region_id suffix telephone vat_id}
-      billing_address{firstname lastname city company country_code fax middlename postcode prefix street region
-      region_id suffix telephone vat_id}
+      payment_methods
+      {
+        name
+        type
+        additional_data
+        {
+         name
+         value
+         }
+      }
+      shipping_address {
+          firstname
+          lastname
+          city
+          company
+          country_code
+          fax
+          middlename
+          postcode
+          prefix
+          street
+          region
+          region_id
+          suffix
+          telephone
+          vat_id
+        }
+        billing_address
+        {
+          firstname
+          lastname
+          city
+          company
+          country_code
+          fax
+          middlename
+          postcode
+          prefix
+          region
+          region_id
+          street
+          suffix
+          telephone
+          vat_id
+        }
       items{
         quantity_ordered
         product_sku
@@ -1300,12 +1340,52 @@ private function getCustomerOrderQuery($orderNumber): array
            number
            order_date
            status
-           payment_methods{name type additional_data{ name value}}
-           shipping_address{firstname lastname city company country_code fax middlename postcode prefix street region
-           region_id suffix telephone vat_id}
-           billing_address{firstname lastname city company country_code fax middlename postcode prefix street region
-           region_id suffix telephone vat_id}
-           items{product_name product_sku quantity_ordered discounts {amount{value currency} label}}
+           payment_methods
+           {
+            name
+            type
+            additional_data
+            {
+            name
+            value
+            }
+            }
+         shipping_address {
+          firstname
+          lastname
+          city
+          company
+          country_code
+          fax
+          middlename
+          postcode
+          prefix
+          street
+          region
+          region_id
+          suffix
+          telephone
+          vat_id
+        }
+        billing_address
+        {
+          firstname
+          lastname
+          city
+          company
+          country_code
+          fax
+          middlename
+          postcode
+          prefix
+          region
+          region_id
+          street
+          suffix
+          telephone
+          vat_id
+        }
+        items{product_name product_sku quantity_ordered discounts {amount{value currency} label}}
            total {
              base_grand_total{value currency}
              grand_total{value currency}

From 324cced3357e091ee5505bb931bad550b1541b15 Mon Sep 17 00:00:00 2001
From: Anusha Vattam <avattam@adobe.com>
Date: Fri, 17 Jul 2020 15:26:10 -0500
Subject: [PATCH 0920/1718] MC-35653:MyAccount :: Order Details :: Payments
 Methods, shipping address, billing address by Order Number

- Fixed new review comments
---
 .../Model/Order/OrderPayments.php             |   2 +-
 .../Sales/RetrieveOrdersByOrderNumberTest.php | 196 +++++++-----------
 2 files changed, 73 insertions(+), 125 deletions(-)

diff --git a/app/code/Magento/SalesGraphQl/Model/Order/OrderPayments.php b/app/code/Magento/SalesGraphQl/Model/Order/OrderPayments.php
index ab110f23aaa28..991f36663448b 100644
--- a/app/code/Magento/SalesGraphQl/Model/Order/OrderPayments.php
+++ b/app/code/Magento/SalesGraphQl/Model/Order/OrderPayments.php
@@ -25,7 +25,7 @@ public function getOrderPaymentMethod(OrderInterface $orderModel): array
         $orderPayment = $orderModel->getPayment();
         return [
             [
-                'name' => $orderPayment->getAdditionalInformation()['method_title'] ?? ' ',
+                'name' => $orderPayment->getAdditionalInformation()['method_title'] ?? '',
                 'type' => $orderPayment->getMethod(),
                 'additional_data' => []
             ]
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php
index c7df1142ae0f0..f25a6ddededda 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php
@@ -74,40 +74,11 @@ public function testGetCustomerOrdersSimpleProductQuery()
          }
       }
       shipping_address {
-          firstname
-          lastname
-          city
-          company
-          country_code
-          fax
-          middlename
-          postcode
-          prefix
-          street
-          region
-          region_id
-          suffix
-          telephone
-          vat_id
-        }
-        billing_address
-        {
-          firstname
-          lastname
-          city
-          company
-          country_code
-          fax
-          middlename
-          postcode
-          prefix
-          region
-          region_id
-          street
-          suffix
-          telephone
-          vat_id
-        }
+         ... address
+      }
+      billing_address {
+      ... address
+      }
       items{
         quantity_ordered
         product_sku
@@ -133,6 +104,24 @@ public function testGetCustomerOrdersSimpleProductQuery()
    }
  }
 }
+
+fragment address on OrderAddress {
+          firstname
+          lastname
+          city
+          company
+          country_code
+          fax
+          middlename
+          postcode
+          prefix
+          street
+          region
+          region_id
+          suffix
+          telephone
+          vat_id
+        }
 QUERY;
 
         $currentEmail = 'customer@example.com';
@@ -202,29 +191,7 @@ public function testCustomerOrdersSimpleProductWithTaxesAndDiscounts()
         $this->setPaymentMethod($cartId, $paymentMethod);
         $orderNumber = $this->placeOrder($cartId);
         $customerOrderResponse = $this->getCustomerOrderQuery($orderNumber);
-        $this->assertOrderBillingAddress($customerOrderResponse[0]["billing_address"]);
-        $this->assertOrderShippingAddress($customerOrderResponse[0]["shipping_address"]);
-        $this->assertOrderPaymentMethod($customerOrderResponse[0]["payment_methods"]);
-        // Asserting discounts on order item level
-        $this->assertEquals(4, $customerOrderResponse[0]['items'][0]['discounts'][0]['amount']['value']);
-        $this->assertEquals('USD', $customerOrderResponse[0]['items'][0]['discounts'][0]['amount']['currency']);
-        $this->assertEquals(
-            'Discount Label for 10% off',
-            $customerOrderResponse[0]['items'][0]['discounts'][0]['label']
-        );
-        $customerOrderItem = $customerOrderResponse[0];
-        $this->assertTotalsWithTaxesAndDiscounts($customerOrderItem['total']);
-        $this->deleteOrder();
-    }
-
-    /**
-     * Check order billing address
-     *
-     * @param array $customerOrderBillingAddress
-     */
-    private function assertOrderBillingAddress(array $customerOrderBillingAddress): void
-    {
-        $assertionMap = [
+        $billingAssertionMap = [
             'firstname' => 'John',
             'lastname' => 'Smith',
             'city' => 'Texas City',
@@ -241,17 +208,8 @@ private function assertOrderBillingAddress(array $customerOrderBillingAddress):
             'suffix' => 'John',
             'telephone' => '5123456677'
         ];
-        $this->assertResponseFields($customerOrderBillingAddress, $assertionMap);
-    }
-
-    /**
-     * Check order shipping address
-     *
-     * @param array $customerOrderShippingAddress
-     */
-    private function assertOrderShippingAddress(array $customerOrderShippingAddress): void
-    {
-        $assertionMap = [
+        $this->assertResponseFields($customerOrderResponse[0]["billing_address"], $billingAssertionMap);
+        $shippingAssertionMap = [
             'firstname' => 'test shipFirst',
             'lastname' => 'test shipLast',
             'city' => 'Montgomery',
@@ -268,24 +226,25 @@ private function assertOrderShippingAddress(array $customerOrderShippingAddress)
             'suffix' => 'test shipFirst',
             'telephone' => '3347665522'
         ];
-        $this->assertResponseFields($customerOrderShippingAddress, $assertionMap);
-    }
-
-    /**
-     * Check order payment method
-     *
-     * @param array $customerOrderPaymentMethod
-     */
-    private function assertOrderPaymentMethod(array $customerOrderPaymentMethod): void
-    {
-        $assertionMap = [
+        $this->assertResponseFields($customerOrderResponse[0]["shipping_address"], $shippingAssertionMap);
+        $paymentMethodAssertionMap = [
             [
                 'name' => 'Check / Money order',
                 'type' => 'checkmo',
                 'additional_data' => []
             ]
         ];
-        $this->assertResponseFields($customerOrderPaymentMethod, $assertionMap);
+        $this->assertResponseFields($customerOrderResponse[0]["payment_methods"], $paymentMethodAssertionMap);
+        // Asserting discounts on order item level
+        $this->assertEquals(4, $customerOrderResponse[0]['items'][0]['discounts'][0]['amount']['value']);
+        $this->assertEquals('USD', $customerOrderResponse[0]['items'][0]['discounts'][0]['amount']['currency']);
+        $this->assertEquals(
+            'Discount Label for 10% off',
+            $customerOrderResponse[0]['items'][0]['discounts'][0]['label']
+        );
+        $customerOrderItem = $customerOrderResponse[0];
+        $this->assertTotalsWithTaxesAndDiscounts($customerOrderItem['total']);
+        $this->deleteOrder();
     }
 
     /**
@@ -1342,50 +1301,21 @@ private function getCustomerOrderQuery($orderNumber): array
            status
            payment_methods
            {
-            name
-            type
-            additional_data
-            {
-            name
-            value
-            }
-            }
-         shipping_address {
-          firstname
-          lastname
-          city
-          company
-          country_code
-          fax
-          middlename
-          postcode
-          prefix
-          street
-          region
-          region_id
-          suffix
-          telephone
-          vat_id
-        }
-        billing_address
-        {
-          firstname
-          lastname
-          city
-          company
-          country_code
-          fax
-          middlename
-          postcode
-          prefix
-          region
-          region_id
-          street
-          suffix
-          telephone
-          vat_id
-        }
-        items{product_name product_sku quantity_ordered discounts {amount{value currency} label}}
+             name
+             type
+             additional_data
+             {
+              name
+              value
+              }
+           }
+           shipping_address {
+           ... address
+           }
+           billing_address {
+           ... address
+           }
+           items{product_name product_sku quantity_ordered discounts {amount{value currency} label}}
            total {
              base_grand_total{value currency}
              grand_total{value currency}
@@ -1408,6 +1338,24 @@ private function getCustomerOrderQuery($orderNumber): array
        }
      }
    }
+
+   fragment address on OrderAddress {
+          firstname
+          lastname
+          city
+          company
+          country_code
+          fax
+          middlename
+          postcode
+          prefix
+          street
+          region
+          region_id
+          suffix
+          telephone
+          vat_id
+        }
 QUERY;
         $currentEmail = 'customer@example.com';
         $currentPassword = 'password';

From f5f6b5957488d87bac8e8ffa08c60b84ea294338 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Sun, 19 Jul 2020 14:59:19 +0200
Subject: [PATCH 0921/1718] Fixed error handling issues

---
 .../Quote/Model/Cart/AddProductsToCart.php    | 20 ++++++++++---------
 .../Model/Resolver/AddProductsToCart.php      |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php b/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
index 4e1cf53aeec69..18d27a29b8ae1 100644
--- a/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
+++ b/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
@@ -36,6 +36,7 @@ class AddProductsToCart
      * List of error messages and codes.
      */
     private const MESSAGE_CODES = [
+        'Could not find a product with SKU' => self::ERROR_PRODUCT_NOT_FOUND,
         'The required options you selected are not available' => self::ERROR_NOT_SALABLE,
         'Product that you are trying to add is not available' => self::ERROR_NOT_SALABLE,
         'This product is out of stock' => self::ERROR_NOT_SALABLE,
@@ -128,13 +129,18 @@ private function addItemToCart(CartInterface $cart, Data\CartItem $cartItem, int
     {
         $sku = $cartItem->getSku();
 
+        if ($cartItem->getQuantity() <= 0) {
+            $this->addError(__('The product quantity should be greater than 0')->render());
+
+            return;
+        }
+
         try {
             $product = $this->productRepository->get($sku, false, null, true);
         } catch (NoSuchEntityException $e) {
             $this->addError(
                 __('Could not find a product with SKU "%sku"', ['sku' => $sku])->render(),
-                $cartItemPosition,
-                self::ERROR_PRODUCT_NOT_FOUND
+                $cartItemPosition
             );
 
             return;
@@ -144,10 +150,7 @@ private function addItemToCart(CartInterface $cart, Data\CartItem $cartItem, int
             $result = $cart->addProduct($product, $this->requestBuilder->build($cartItem));
         } catch (\Throwable $e) {
             $this->addError(
-                __(
-                    'Could not add the product with SKU %sku to the shopping cart: %message',
-                    ['sku' => $sku, 'message' => $e->getMessage()]
-                )->render(),
+                __($e->getMessage())->render(),
                 $cartItemPosition
             );
             return;
@@ -166,14 +169,13 @@ private function addItemToCart(CartInterface $cart, Data\CartItem $cartItem, int
      *
      * @param string $message
      * @param int $cartItemPosition
-     * @param string|null $code
      * @return void
      */
-    private function addError(string $message, int $cartItemPosition = 0, string $code = ''): void
+    private function addError(string $message, int $cartItemPosition = 0): void
     {
         $this->errors[] = new Data\Error(
             $message,
-            $code ?? $this->getErrorCode($message),
+            $this->getErrorCode($message),
             $cartItemPosition
         );
     }
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/AddProductsToCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/AddProductsToCart.php
index b8213cab61bba..de89f3c062e95 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/AddProductsToCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/AddProductsToCart.php
@@ -83,7 +83,7 @@ function (Error $error) {
                     return [
                         'code' => $error->getCode(),
                         'message' => $error->getMessage(),
-                        'path' => $error->getCartItemPosition()
+                        'path' => [$error->getCartItemPosition()]
                     ];
                 },
                 $addProductsToCartOutput->getErrors()

From 8176ad5acc5b317005b90426ac10a5060b18e415 Mon Sep 17 00:00:00 2001
From: Eden <eden@magestore.com>
Date: Sun, 19 Jul 2020 21:20:44 +0700
Subject: [PATCH 0922/1718] Field "Number of Symbols" in CAPTCHA settings has
 missing range validation issue29198

---
 app/code/Magento/Captcha/etc/adminhtml/system.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Captcha/etc/adminhtml/system.xml b/app/code/Magento/Captcha/etc/adminhtml/system.xml
index ac4197c976ea0..bc3874989435c 100644
--- a/app/code/Magento/Captcha/etc/adminhtml/system.xml
+++ b/app/code/Magento/Captcha/etc/adminhtml/system.xml
@@ -57,7 +57,7 @@
                     <depends>
                         <field id="enable">1</field>
                     </depends>
-                    <frontend_class>required-entry</frontend_class>
+                    <frontend_class>required-entry validate-range range-1-8</frontend_class>
                 </field>
                 <field id="symbols" translate="label comment" type="text" sortOrder="8" showInDefault="1" canRestore="1">
                     <label>Symbols Used in CAPTCHA</label>

From 30caed7f38f900904753d7248a1d79a4220232fc Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Sun, 19 Jul 2020 18:55:59 +0200
Subject: [PATCH 0923/1718] Reduce class complexity by quick refactor

---
 .../Model/Product/TierPriceManagement.php     | 72 ++++++++++++++-----
 1 file changed, 55 insertions(+), 17 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php b/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php
index 16bdec2533fe6..1af1c3042fbcd 100644
--- a/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php
@@ -12,11 +12,12 @@
 use Magento\Customer\Api\GroupRepositoryInterface;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\TemporaryStateExceptionInterface;
+use Magento\Store\Api\Data\WebsiteInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
- * Product tier price management
- *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class TierPriceManagement implements \Magento\Catalog\Api\ProductTierPriceManagementInterface
@@ -100,7 +101,7 @@ public function add($sku, $customerGroupId, $price, $qty)
         $product = $this->productRepository->get($sku, ['edit_mode' => true]);
         $tierPrices = $product->getData('tier_price');
         $websiteIdentifier = 0;
-        $value = $this->config->getValue('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE);
+        $value = $this->config->getValue('catalog/price/scope', ScopeInterface::SCOPE_WEBSITE);
         if ($value != 0) {
             $websiteIdentifier = $this->storeManager->getWebsite()->getId();
         }
@@ -160,9 +161,8 @@ public function remove($sku, $customerGroupId, $qty)
     {
         $product = $this->productRepository->get($sku, ['edit_mode' => true]);
         $websiteIdentifier = 0;
-        $value = $this->config->getValue('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE);
-        if ($value != 0) {
-            $websiteIdentifier = $this->storeManager->getWebsite()->getId();
+        if ($this->getPriceScopeConfig() !== 0) {
+            $websiteIdentifier = $this->getCurrentWebsite()->getId();
         }
         $this->priceModifier->removeTierPrice($product, $customerGroupId, $qty, $websiteIdentifier);
         return true;
@@ -175,23 +175,17 @@ public function getList($sku, $customerGroupId)
     {
         $product = $this->productRepository->get($sku, ['edit_mode' => true]);
 
-        $priceKey = 'website_price';
-        $value = $this->config->getValue('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE);
-        if ($value == 0) {
-            $priceKey = 'price';
-        }
-
-        $cgi = ($customerGroupId === 'all'
+        $cgi = $customerGroupId === 'all'
             ? $this->groupManagement->getAllCustomersGroup()->getId()
-            : $customerGroupId);
+            : $customerGroupId;
 
         $prices = [];
         $tierPrices = $product->getData('tier_price');
         if ($tierPrices !== null) {
+            $priceKey = $this->getPriceKey();
+
             foreach ($tierPrices as $price) {
-                if ((is_numeric($customerGroupId) && (int) $price['cust_group'] === (int) $customerGroupId)
-                    || ($customerGroupId === 'all' && $price['all_groups'])
-                ) {
+                if ($this->isCustomerGroupApplicable($customerGroupId, $price)) {
                     /** @var \Magento\Catalog\Api\Data\ProductTierPriceInterface $tierPrice */
                     $tierPrice = $this->priceFactory->create();
                     $tierPrice->setValue($price[$priceKey])
@@ -203,4 +197,48 @@ public function getList($sku, $customerGroupId)
         }
         return $prices;
     }
+
+    /**
+     * Returns attribute code (key) that contains price
+     *
+     * @return string
+     */
+    private function getPriceKey(): string
+    {
+        return $this->getPriceScopeConfig() === 0 ? 'price' : 'website_price';
+    }
+
+    /**
+     * Returns whether Price is applicable for provided Customer Group
+     *
+     * @param string $customerGroupId
+     * @param array $priceArray
+     * @return bool
+     */
+    private function isCustomerGroupApplicable(string $customerGroupId, array $priceArray): bool
+    {
+        return ($customerGroupId === 'all' && $priceArray['all_groups'])
+            || (is_numeric($customerGroupId) && (int)$priceArray['cust_group'] === (int)$customerGroupId);
+    }
+
+    /**
+     * Returns current Price Scope configuration value
+     *
+     * @return string
+     */
+    private function getPriceScopeConfig(): string
+    {
+        return (int)$this->config->getValue('catalog/price/scope', ScopeInterface::SCOPE_WEBSITE);
+    }
+
+    /**
+     * Returns current Website object
+     *
+     * @return WebsiteInterface
+     * @throws LocalizedException
+     */
+    private function getCurrentWebsite(): WebsiteInterface
+    {
+        return $this->storeManager->getWebsite();
+    }
 }

From d81d26224481bd25ac1522af41a4aed1065a2ecb Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Mon, 20 Jul 2020 13:31:16 +0800
Subject: [PATCH 0924/1718] magento/adobe-stock-integration#1391:
 SaveAssetsKeywordsInterface to delete obsolete keywords - Move and improve
 logic for saving and deleting obsolete asset keyword links

---
 .../ResourceModel/Keyword/SaveAssetLinks.php  | 130 ++++++++++++++++--
 .../Keyword/SaveAssetsKeywords.php            |  68 ---------
 2 files changed, 118 insertions(+), 80 deletions(-)

diff --git a/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetLinks.php b/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetLinks.php
index 3437cc1c519e8..1708532569763 100644
--- a/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetLinks.php
+++ b/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetLinks.php
@@ -10,8 +10,10 @@
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Adapter\Pdo\Mysql;
+use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\MediaGalleryApi\Api\Data\KeywordInterface;
+use Magento\MediaGalleryApi\Api\GetAssetsKeywordsInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -28,25 +30,33 @@ class SaveAssetLinks
      */
     private $resourceConnection;
 
+    /**
+     * @var GetAssetsKeywordsInterface
+     */
+    private $getAssetsKeywordsInterface;
+
     /**
      * @var LoggerInterface
      */
     private $logger;
 
     /**
+     * @param GetAssetsKeywordsInterface $getAssetsKeywordsInterface
      * @param ResourceConnection $resourceConnection
      * @param LoggerInterface $logger
      */
     public function __construct(
+        GetAssetsKeywordsInterface $getAssetsKeywordsInterface,
         ResourceConnection $resourceConnection,
         LoggerInterface $logger
     ) {
+        $this->getAssetsKeywordsInterface = $getAssetsKeywordsInterface;
         $this->resourceConnection = $resourceConnection;
         $this->logger = $logger;
     }
 
     /**
-     * Save asset keywords links
+     * Process insert and deletion of asset keywords links
      *
      * @param int $assetId
      * @param KeywordInterface[] $keywordIds
@@ -56,27 +66,123 @@ public function __construct(
     public function execute(int $assetId, array $keywordIds): void
     {
         try {
-            $values = [];
-            foreach ($keywordIds as $keywordId) {
-                $values[] = [$assetId, $keywordId];
+            $this->deleteAssetKeywords($assetId, $keywordIds);
+            $this->insertAssetKeywords($assetId, $keywordIds);
+        } catch (\Exception $exception) {
+            $this->logger->critical($exception);
+            throw new CouldNotSaveException(
+                __('Could not process asset keyword links'),
+                $exception
+            );
+        }
+    }
+
+    /**
+     * Save new asset keyword links
+     *
+     * @param int $assetId
+     * @param array $keywordIds
+     * @throws CouldNotSaveException
+     */
+    private function insertAssetKeywords(int $assetId, array $keywordIds): void
+    {
+        try {
+            if (!empty($keywordIds)) {
+                $values = [];
+                $keywordsToInsert = array_diff($keywordIds, $this->getCurrentKeywords($assetId));
+
+                foreach ($keywordsToInsert as $keywordId) {
+                    $values[] = [$assetId, $keywordId];
+                }
+
+                if (!empty($values)) {
+                    /** @var Mysql $connection */
+                    $connection = $this->resourceConnection->getConnection();
+                    $connection->insertArray(
+                        $this->resourceConnection->getTableName(self::TABLE_ASSET_KEYWORD),
+                        [self::FIELD_ASSET_ID, self::FIELD_KEYWORD_ID],
+                        $values,
+                        AdapterInterface::INSERT_IGNORE
+                    );
+                }
             }
+        } catch (\Exception $exception) {
+            $this->logger->critical($exception);
+            throw new CouldNotSaveException(
+                __('Could not save asset keyword links'),
+                $exception
+            );
+        }
+    }
 
-            if (!empty($values)) {
+    /**
+     * Delete obsolete asset keyword links
+     *
+     * @param int $assetId
+     * @param array $keywords
+     * @throws CouldNotDeleteException
+     */
+    private function deleteAssetKeywords(int $assetId, array $keywords): void
+    {
+        try {
+            $obsoleteKeywordIds = array_diff($this->getCurrentKeywords($assetId), $keywords);
+
+            if (!empty($obsoleteKeywordIds)) {
                 /** @var Mysql $connection */
                 $connection = $this->resourceConnection->getConnection();
-                $connection->insertArray(
-                    $this->resourceConnection->getTableName(self::TABLE_ASSET_KEYWORD),
-                    [self::FIELD_ASSET_ID, self::FIELD_KEYWORD_ID],
-                    $values,
-                    AdapterInterface::INSERT_IGNORE
+                $connection->delete(
+                    $connection->getTableName(
+                        self::TABLE_ASSET_KEYWORD
+                    ),
+                    [
+                        self::FIELD_KEYWORD_ID . ' in (?)' => $obsoleteKeywordIds,
+                        self::FIELD_ASSET_ID . ' = ?' => $assetId
+                    ]
                 );
             }
         } catch (\Exception $exception) {
             $this->logger->critical($exception);
-            throw new CouldNotSaveException(
-                __('Could not save asset keyword links'),
+            throw new CouldNotDeleteException(
+                __('Could not delete obsolete asset keyword links'),
                 $exception
             );
         }
     }
+
+    /**
+     * Get current keyword data of an asset
+     *
+     * @param int $assetId
+     * @return array
+     */
+    private function getCurrentKeywords(int $assetId): array
+    {
+        $currentKeywordsData = $this->getAssetsKeywordsInterface->execute([$assetId]);
+
+        if (!empty($currentKeywordsData)) {
+            $currentKeywords = $this->getKeywordIdsFromKeywordData(
+                $currentKeywordsData[$assetId]->getKeywords()
+            );
+
+            return $currentKeywords;
+        }
+
+        return [];
+    }
+
+    /**
+     * Get keyword ids from keyword data
+     *
+     * @param array $keywordsData
+     * @return array
+     */
+    private function getKeywordIdsFromKeywordData(array $keywordsData): array
+    {
+        return array_map(
+            function (KeywordInterface $keyword): int {
+                return $keyword->getId();
+            },
+            $keywordsData
+        );
+    }
 }
diff --git a/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetsKeywords.php b/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetsKeywords.php
index a822fafaeaa1b..a97c5f602c5c7 100644
--- a/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetsKeywords.php
+++ b/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetsKeywords.php
@@ -11,9 +11,7 @@
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Adapter\Pdo\Mysql;
 use Magento\Framework\Exception\CouldNotSaveException;
-use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\MediaGalleryApi\Api\Data\KeywordInterface;
-use Magento\MediaGalleryApi\Api\GetAssetsKeywordsInterface;
 use Magento\MediaGalleryApi\Api\SaveAssetsKeywordsInterface;
 use Psr\Log\LoggerInterface;
 
@@ -23,7 +21,6 @@
 class SaveAssetsKeywords implements SaveAssetsKeywordsInterface
 {
     private const TABLE_KEYWORD = 'media_gallery_keyword';
-    private const TABLE_ASSET_KEYWORD = 'media_gallery_asset_keyword';
     private const ID = 'id';
     private const KEYWORD = 'keyword';
 
@@ -37,11 +34,6 @@ class SaveAssetsKeywords implements SaveAssetsKeywordsInterface
      */
     private $saveAssetLinks;
 
-    /**
-     * @var GetAssetsKeywordsInterface
-     */
-    private $getAssetsKeywordsInterface;
-
     /**
      * @var LoggerInterface
      */
@@ -52,18 +44,15 @@ class SaveAssetsKeywords implements SaveAssetsKeywordsInterface
      *
      * @param ResourceConnection $resourceConnection
      * @param SaveAssetLinks $saveAssetLinks
-     * @param GetAssetsKeywordsInterface $getAssetsKeywordsInterface
      * @param LoggerInterface $logger
      */
     public function __construct(
         ResourceConnection $resourceConnection,
         SaveAssetLinks $saveAssetLinks,
-        GetAssetsKeywordsInterface $getAssetsKeywordsInterface,
         LoggerInterface $logger
     ) {
         $this->resourceConnection = $resourceConnection;
         $this->saveAssetLinks = $saveAssetLinks;
-        $this->getAssetsKeywordsInterface = $getAssetsKeywordsInterface;
         $this->logger = $logger;
     }
 
@@ -94,7 +83,6 @@ public function execute(array $assetKeywords): void
      *
      * @param KeywordInterface[] $keywords
      * @param int $assetId
-     * @throws CouldNotDeleteException
      * @throws CouldNotSaveException
      * @throws \Zend_Db_Exception
      */
@@ -109,8 +97,6 @@ private function saveAssetKeywords(array $keywords, int $assetId): void
             return;
         }
 
-        $this->deleteObsoleteAssetKeywords($data, $assetId);
-
         /** @var Mysql $connection */
         $connection = $this->resourceConnection->getConnection();
         $connection->insertArray(
@@ -139,58 +125,4 @@ private function getKeywordIds(array $keywords): array
 
         return $connection->fetchCol($select);
     }
-
-    /**
-     * Deletes obsolete asset keywords links
-     *
-     * @param array $newKeywords
-     * @param int $assetId
-     * @throws CouldNotDeleteException
-     */
-    private function deleteObsoleteAssetKeywords(array $newKeywords, int $assetId): void
-    {
-        $oldKeywordData = $this->getAssetsKeywordsInterface->execute([$assetId]);
-
-        if (empty($newKeywords) || empty($oldKeywordData)) {
-            return;
-        }
-
-        $oldKeywordData = $this->getAssetsKeywordsInterface->execute([$assetId]);
-        $oldKeywords = $oldKeywordData[$assetId]->getKeywords();
-
-        foreach ($oldKeywords as $oldKeyword) {
-            if (!in_array($oldKeyword->getKeyword(), $newKeywords)) {
-                $obsoleteKeywords[] = $oldKeyword->getKeyword();
-            }
-        }
-
-        if (empty($obsoleteKeywords)) {
-            return;
-        }
-
-        $obsoleteKeywordIds = $this->getKeywordIds($obsoleteKeywords);
-
-        try {
-            /** @var Mysql $connection */
-            $connection  = $this->resourceConnection->getConnection();
-            $connection->delete(
-                $connection->getTableName(
-                    self::TABLE_ASSET_KEYWORD
-                ),
-                [
-                    'keyword_id in (?)' => $obsoleteKeywordIds,
-                    'asset_id = ?' => $assetId
-                ]
-            );
-        } catch (\Exception $exception) {
-            $this->logger->critical($exception);
-            $failedAssetId = $assetId;
-        }
-
-        if (!empty($failedAssetId)) {
-            throw new CouldNotDeleteException(
-                __('Could not delete obsolete keyword relation for asset id: %id', ['id' => $assetId])
-            );
-        }
-    }
 }

From bbe90292dfa3f550c3ba31fcb10a0cc422938be0 Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Mon, 20 Jul 2020 09:41:53 +0300
Subject: [PATCH 0925/1718] MC-35212: Unable to save "No layout updates" for
 category

---
 .../Plugin/SetPageLayoutDefaultValue.php      | 34 ++++++++-
 .../adminhtml/ui_component/category_form.xml  |  2 +-
 .../Model/Category/DataProviderTest.php       | 73 +++++++++++++++++--
 3 files changed, 99 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Plugin/SetPageLayoutDefaultValue.php b/app/code/Magento/Catalog/Model/Plugin/SetPageLayoutDefaultValue.php
index b812de1dfc2ae..640a6539f0041 100644
--- a/app/code/Magento/Catalog/Model/Plugin/SetPageLayoutDefaultValue.php
+++ b/app/code/Magento/Catalog/Model/Plugin/SetPageLayoutDefaultValue.php
@@ -11,7 +11,10 @@
 namespace Magento\Catalog\Model\Plugin;
 
 use Magento\Catalog\Model\Category\DataProvider;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Sets the default value for Category Design Layout if provided
@@ -21,11 +24,28 @@ class SetPageLayoutDefaultValue
     private $defaultValue;
 
     /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     * @param StoreManagerInterface $storeManager
      * @param string $defaultValue
      */
-    public function __construct(string $defaultValue = "")
-    {
+    public function __construct(
+        ScopeConfigInterface $scopeConfig,
+        StoreManagerInterface $storeManager,
+        string $defaultValue = ""
+    ) {
         $this->defaultValue = $defaultValue;
+        $this->scopeConfig = $scopeConfig;
+        $this->storeManager = $storeManager;
     }
 
     /**
@@ -42,7 +62,15 @@ public function afterGetDefaultMetaData(DataProvider $subject, array $result): a
         $currentCategory = $subject->getCurrentCategory();
 
         if ($currentCategory && !$currentCategory->getId() && array_key_exists('page_layout', $result)) {
-            $result['page_layout']['default'] = $this->defaultValue ?: null;
+            $defaultAdminValue = $this->scopeConfig->getValue(
+                'web/default_layouts/default_category_layout',
+                ScopeInterface::SCOPE_STORE,
+                $this->storeManager->getStore()->getId()
+            );
+
+            $defaultValue = $defaultAdminValue ?: $this->defaultValue;
+
+            $result['page_layout']['default'] = $defaultValue ?: null;
         }
 
         return $result;
diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml
index d3689a0db1306..6e941821e9505 100644
--- a/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml
@@ -470,7 +470,7 @@
                 </imports>
             </settings>
         </field>
-        <field name="page_layout" sortOrder="190" formElement="select" component="Magento_Catalog/js/components/use-parent-settings/select" class="Magento\Catalog\Ui\Component\Form\Field\Category\PageLayout">
+        <field name="page_layout" sortOrder="190" formElement="select" component="Magento_Catalog/js/components/use-parent-settings/select">
             <settings>
                 <dataType>string</dataType>
                 <label translate="true">Layout</label>
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/DataProviderTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/DataProviderTest.php
index f9237e89817f1..09d9bdb8ac969 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/DataProviderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/DataProviderTest.php
@@ -3,15 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Model\Category;
 
+use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\Category\Attribute\Backend\LayoutUpdate;
+use Magento\Catalog\Model\CategoryFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Catalog\Model\CategoryLayoutUpdateManager;
 use Magento\TestFramework\Helper\Bootstrap;
-use Magento\Framework\Registry;
 use PHPUnit\Framework\TestCase;
-use Magento\Catalog\Model\Category;
-use Magento\Catalog\Model\CategoryFactory;
-use Magento\Catalog\Model\Category\Attribute\Backend\LayoutUpdate;
 
 /**
  * @magentoDbIsolation enabled
@@ -40,6 +45,16 @@ class DataProviderTest extends TestCase
      */
     private $fakeFiles;
 
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * Create subject instance.
      *
@@ -58,7 +73,7 @@ private function createDataProvider(): DataProvider
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     protected function setUp(): void
     {
@@ -68,12 +83,14 @@ protected function setUp(): void
         $this->registry = $objectManager->get(Registry::class);
         $this->categoryFactory = $objectManager->get(CategoryFactory::class);
         $this->fakeFiles = $objectManager->get(CategoryLayoutUpdateManager::class);
+        $this->scopeConfig = $objectManager->get(ScopeConfigInterface::class);
+        $this->storeManager = $objectManager->get(StoreManagerInterface::class);
     }
 
     /**
      * @return void
      */
-    public function testGetMetaRequiredAttributes()
+    public function testGetMetaRequiredAttributes(): void
     {
         $requiredAttributes = [
             'general' => ['name'],
@@ -221,4 +238,48 @@ public function testCustomLayoutMeta(): void
         sort($list);
         $this->assertEquals($expectedList, $list);
     }
+
+    /**
+     * Check if existing category page layout will remain unaffected by category page layout default value setting
+     *
+     * @return void
+     */
+    public function testExistingCategoryLayoutUnaffectedByDefaults(): void
+    {
+        /** @var Category $category */
+        $category = $this->categoryFactory->create();
+        $category->load(2);
+
+        $this->registry->register('category', $category);
+        $meta = $this->dataProvider->getMeta();
+        $categoryPageLayout = $meta["design"]["children"]["page_layout"]["arguments"]["data"]["config"]["default"];
+        $this->registry->unregister('category');
+
+        $this->assertNull($categoryPageLayout);
+    }
+
+    /**
+     * Check if category page layout default value setting will apply to the new category during it's creation
+     *
+     * @throws NoSuchEntityException
+     */
+    public function testNewCategoryLayoutMatchesDefault(): void
+    {
+        $categoryDefaultPageLayout = $this->scopeConfig->getValue(
+            'web/default_layouts/default_category_layout',
+            ScopeInterface::SCOPE_STORE,
+            $this->storeManager->getStore()->getId()
+        );
+
+        /** @var Category $category */
+        $category = $this->categoryFactory->create();
+        $category->setName('Net Test Category');
+
+        $this->registry->register('category', $category);
+        $meta = $this->dataProvider->getMeta();
+        $categoryPageLayout = $meta["design"]["children"]["page_layout"]["arguments"]["data"]["config"]["default"];
+        $this->registry->unregister('category');
+
+        $this->assertEquals($categoryDefaultPageLayout, $categoryPageLayout);
+    }
 }

From 87d109465d6ce8437286313f0a41a9e6d7843985 Mon Sep 17 00:00:00 2001
From: Sathish <srsathish92@gmail.com>
Date: Mon, 20 Jul 2020 12:22:46 +0530
Subject: [PATCH 0926/1718] #28947 Fix scope reset on new synonym form

---
 .../view/adminhtml/ui_component/search_synonyms_form.xml      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Search/view/adminhtml/ui_component/search_synonyms_form.xml b/app/code/Magento/Search/view/adminhtml/ui_component/search_synonyms_form.xml
index b084a0ad16aaa..cf2b0704dc15b 100644
--- a/app/code/Magento/Search/view/adminhtml/ui_component/search_synonyms_form.xml
+++ b/app/code/Magento/Search/view/adminhtml/ui_component/search_synonyms_form.xml
@@ -63,14 +63,14 @@
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
                     <item name="source" xsi:type="string">block</item>
-                    <item name="default" xsi:type="number">0</item>
+                    <item name="default" xsi:type="string">0:0</item>
                 </item>
             </argument>
             <settings>
                 <validation>
                     <rule name="required-entry" xsi:type="boolean">true</rule>
                 </validation>
-                <dataType>int</dataType>
+                <dataType>text</dataType>
                 <tooltip>
                     <link>https://docs.magento.com/m2/ce/user_guide/stores/websites-stores-views.html</link>
                     <description translate="true">You can adjust the scope of this synonym group by selecting an option from the list.</description>

From c3f9f3d733dc56624fb95e1b07f7916966b7f212 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Mon, 20 Jul 2020 10:10:48 +0300
Subject: [PATCH 0927/1718] MC-35573: Share Wish List | Getting error while
 user wants to add shared items in cart

---
 app/code/Magento/Wishlist/Controller/Shared/Cart.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Wishlist/Controller/Shared/Cart.php b/app/code/Magento/Wishlist/Controller/Shared/Cart.php
index 38f100602972a..c0a394ce9d762 100644
--- a/app/code/Magento/Wishlist/Controller/Shared/Cart.php
+++ b/app/code/Magento/Wishlist/Controller/Shared/Cart.php
@@ -3,13 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Wishlist\Controller\Shared;
 
 use Magento\Catalog\Model\Product\Exception as ProductException;
 use Magento\Checkout\Helper\Cart as CartHelper;
 use Magento\Checkout\Model\Cart as CustomerCart;
+use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\Action\Context as ActionContext;
-use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Controller\Result\Redirect;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Escaper;
 use Magento\Framework\Exception\LocalizedException;
@@ -23,7 +27,7 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Cart extends \Magento\Framework\App\Action\Action implements HttpGetActionInterface
+class Cart extends Action implements HttpPostActionInterface
 {
     /**
      * @var CustomerCart
@@ -80,7 +84,7 @@ public function __construct(
      * If Product has required options - redirect
      * to product view page with message about needed defined required options
      *
-     * @return \Magento\Framework\Controller\Result\Redirect
+     * @return Redirect
      */
     public function execute()
     {
@@ -120,7 +124,7 @@ public function execute()
         } catch (\Exception $e) {
             $this->messageManager->addExceptionMessage($e, __('We can\'t add the item to the cart right now.'));
         }
-        /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
+        /** @var Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         $resultRedirect->setUrl($redirectUrl);
         return $resultRedirect;

From ae9bacea311944ccd62f5dce6986c64b1e50de27 Mon Sep 17 00:00:00 2001
From: Rowena Santos <rowena.santos@acidgreen.com.au>
Date: Mon, 20 Jul 2020 15:25:46 +0800
Subject: [PATCH 0928/1718] magento/partners-magento2b2b#137: Add Company to
 Customers Now Online grid - Updated MFTF as per reviewer change request

---
 ...merInCustomersNowOnlineGridActionGroup.xml | 22 +++++++++++++++++++
 .../AdminCustomersNowOnlineGridSection.xml    |  1 +
 .../AdminAddColumnToAdminGridActionGroup.xml  |  4 +++-
 ...nActionDropDownForAdminGridActionGroup.xml | 19 ----------------
 4 files changed, 26 insertions(+), 20 deletions(-)
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerInCustomersNowOnlineGridActionGroup.xml
 delete mode 100644 app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminOpenColumnActionDropDownForAdminGridActionGroup.xml

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerInCustomersNowOnlineGridActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerInCustomersNowOnlineGridActionGroup.xml
new file mode 100644
index 0000000000000..05ccc6e67c697
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminAssertCustomerInCustomersNowOnlineGridActionGroup.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">
+    <!--Assert company in customers now online grid row -->
+    <actionGroup name="AdminAssertCustomerInCustomersNowOnlineGridActionGroup">
+        <annotations>
+            <description>Validates that the provided Customer is present and correct in the Customer now online grid page.</description>
+        </annotations>
+        <arguments>
+            <argument name="text" type="string"/>
+            <argument name="columnName" type="string"/>
+        </arguments>
+        <waitForText selector="{{AdminCustomersNowOnlineGridSection.gridCell('1', columnName)}}" userInput="{{text}}"  stepKey="waitForCustomesrNowOnline"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomersNowOnlineGridSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomersNowOnlineGridSection.xml
index c29b556977d42..a4b67c950fe7b 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomersNowOnlineGridSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomersNowOnlineGridSection.xml
@@ -10,6 +10,7 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCustomersNowOnlineGridSection">
         <element name="columnTitle" type="text" selector=".admin__action-dropdown-menu-content label[title='{{column}}']" parameterized="true"/>
+        <element name="gridCell" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{column}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>
     </section>
 </sections>
 
diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminAddColumnToAdminGridActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminAddColumnToAdminGridActionGroup.xml
index 3cf2dfcf6daed..25cc4b5c17d92 100644
--- a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminAddColumnToAdminGridActionGroup.xml
+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminAddColumnToAdminGridActionGroup.xml
@@ -14,10 +14,12 @@
         <arguments>
             <argument name="columnName" defaultValue="Email" type="string"/>
         </arguments>
+        <waitForElementVisible selector="{{AdminGridColumnsControls.columns}}" stepKey="waitForAdminGridColumnControlsColumn"/>
+        <click selector="{{AdminGridColumnsControls.columns}}" stepKey="clickAdminGridColumnControlsColumn"/>
         <waitForElementVisible selector="{{AdminDataGridHeaderSection.columnCheckbox(columnName)}}" stepKey="verifyAdminGridColumnControlsForSelectedColumnVisible"/>
         <click selector="{{AdminDataGridHeaderSection.columnCheckbox(columnName)}}" stepKey="clickForAdminGridControlForSelectedColumn"/>
         <waitForElementVisible selector="{{AdminGridHeaders.headerByName(columnName)}}" stepKey="waitForAdminGridColumnHeaderForSelectedColumn"/>
-        <click selector="{{AdminGridColumnsControls.columns}}" stepKey="reOpenAdminGridColumnControlsColumn"/>
+        <click selector="{{AdminGridColumnsControls.columns}}" stepKey="closeAdminGridColumnControls"/>
         <waitForElementNotVisible selector="{{AdminGridColumnsControls.columnName(columnName)}}" stepKey="verifyAdminGridColumnControlsForSelectedColumnNotVisible"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminOpenColumnActionDropDownForAdminGridActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminOpenColumnActionDropDownForAdminGridActionGroup.xml
deleted file mode 100644
index 3e14518253a5f..0000000000000
--- a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminOpenColumnActionDropDownForAdminGridActionGroup.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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="AdminOpenColumnActionDropDownForAdminGridActionGroup">
-        <annotations>
-            <description>Opens column action drop down for admin grid</description>
-        </annotations>
-
-        <waitForElementVisible selector="{{AdminGridColumnsControls.columns}}" stepKey="waitForAdminGridColumnControlsColumn"/>
-        <click selector="{{AdminGridColumnsControls.columns}}" stepKey="clickAdminGridColumnControlsColumn"/>
-    </actionGroup>
-</actionGroups>

From c899815846aab642ed05e4f21aecc41367490cb3 Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Wed, 15 Jul 2020 10:30:11 +0300
Subject: [PATCH 0929/1718] added fill 'customerAddressId' for newly created
 customer

---
 .../Quote/Model/CustomerManagement.php        | 54 ++++++++---
 .../Unit/Model/CustomerManagementTest.php     |  2 +-
 .../Quote/Model/CustomerManagementTest.php    | 91 +++++++++++++++++++
 3 files changed, 134 insertions(+), 13 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Quote/Model/CustomerManagementTest.php

diff --git a/app/code/Magento/Quote/Model/CustomerManagement.php b/app/code/Magento/Quote/Model/CustomerManagement.php
index 86725bd6211c7..3607cf7f9be63 100644
--- a/app/code/Magento/Quote/Model/CustomerManagement.php
+++ b/app/code/Magento/Quote/Model/CustomerManagement.php
@@ -3,14 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Quote\Model;
 
-use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository;
 use Magento\Customer\Api\AccountManagementInterface as AccountManagement;
 use Magento\Customer\Api\AddressRepositoryInterface as CustomerAddressRepository;
-use Magento\Quote\Model\Quote as QuoteEntity;
+use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository;
+use Magento\Customer\Model\AddressFactory;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Validator\Exception as ValidatorException;
+use Magento\Framework\Validator\Factory as ValidatorFactory;
+use Magento\Quote\Model\Quote as QuoteEntity;
 
 /**
  * Class Customer
@@ -33,12 +37,12 @@ class CustomerManagement
     protected $accountManagement;
 
     /**
-     * @var \Magento\Framework\Validator\Factory
+     * @var ValidatorFactory
      */
     private $validatorFactory;
 
     /**
-     * @var \Magento\Customer\Model\AddressFactory
+     * @var AddressFactory
      */
     private $addressFactory;
 
@@ -47,23 +51,23 @@ class CustomerManagement
      * @param CustomerRepository $customerRepository
      * @param CustomerAddressRepository $customerAddressRepository
      * @param AccountManagement $accountManagement
-     * @param \Magento\Framework\Validator\Factory|null $validatorFactory
-     * @param \Magento\Customer\Model\AddressFactory|null $addressFactory
+     * @param ValidatorFactory|null $validatorFactory
+     * @param AddressFactory|null $addressFactory
      */
     public function __construct(
         CustomerRepository $customerRepository,
         CustomerAddressRepository $customerAddressRepository,
         AccountManagement $accountManagement,
-        \Magento\Framework\Validator\Factory $validatorFactory = null,
-        \Magento\Customer\Model\AddressFactory $addressFactory = null
+        ValidatorFactory $validatorFactory = null,
+        AddressFactory $addressFactory = null
     ) {
         $this->customerRepository = $customerRepository;
         $this->customerAddressRepository = $customerAddressRepository;
         $this->accountManagement = $accountManagement;
         $this->validatorFactory = $validatorFactory ?: ObjectManager::getInstance()
-            ->get(\Magento\Framework\Validator\Factory::class);
+            ->get(ValidatorFactory::class);
         $this->addressFactory = $addressFactory ?: ObjectManager::getInstance()
-            ->get(\Magento\Customer\Model\AddressFactory::class);
+            ->get(AddressFactory::class);
     }
 
     /**
@@ -82,6 +86,7 @@ public function populateCustomerInfo(QuoteEntity $quote)
                 $quote->getPasswordHash()
             );
             $quote->setCustomer($customer);
+            $this->fillCustomerAddressId($quote);
         }
         if (!$quote->getBillingAddress()->getId() && $customer->getDefaultBilling()) {
             $quote->getBillingAddress()->importCustomerAddressData(
@@ -100,11 +105,36 @@ public function populateCustomerInfo(QuoteEntity $quote)
         }
     }
 
+    /**
+     * Filling 'CustomerAddressId' in quote for a newly created customer.
+     *
+     * @param QuoteEntity $quote
+     * @return void
+     */
+    private function fillCustomerAddressId(QuoteEntity $quote): void
+    {
+        $customer = $quote->getCustomer();
+
+        $customer->getDefaultBilling() ?
+            $quote->getBillingAddress()->setCustomerAddressId($customer->getDefaultBilling()) :
+            $quote->getBillingAddress()->setCustomerAddressId(0);
+
+        if ($customer->getDefaultShipping() || $customer->getDefaultBilling()) {
+            if ($quote->getShippingAddress()->getSameAsBilling()) {
+                $quote->getShippingAddress()->setCustomerAddressId($customer->getDefaultBilling());
+            } else {
+                $quote->getShippingAddress()->setCustomerAddressId($customer->getDefaultShipping());
+            }
+        } else {
+            $quote->getShippingAddress()->setCustomerAddressId(0);
+        }
+    }
+
     /**
      * Validate Quote Addresses
      *
      * @param Quote $quote
-     * @throws \Magento\Framework\Validator\Exception
+     * @throws ValidatorException
      * @return void
      */
     public function validateAddresses(QuoteEntity $quote)
@@ -126,7 +156,7 @@ public function validateAddresses(QuoteEntity $quote)
                 $addressModel = $this->addressFactory->create();
                 $addressModel->updateData($address);
                 if (!$validator->isValid($addressModel)) {
-                    throw new \Magento\Framework\Validator\Exception(
+                    throw new ValidatorException(
                         null,
                         null,
                         $validator->getMessages()
diff --git a/app/code/Magento/Quote/Test/Unit/Model/CustomerManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/CustomerManagementTest.php
index 956598d17b4d6..26d6aea049915 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/CustomerManagementTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/CustomerManagementTest.php
@@ -147,7 +147,7 @@ protected function setUp(): void
 
     public function testPopulateCustomerInfo()
     {
-        $this->quoteMock->expects($this->once())
+        $this->quoteMock->expects($this->atLeastOnce())
             ->method('getCustomer')
             ->willReturn($this->customerMock);
         $this->customerMock->expects($this->atLeastOnce())
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/CustomerManagementTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/CustomerManagementTest.php
new file mode 100644
index 0000000000000..a34bfa382d427
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/CustomerManagementTest.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model;
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap as BootstrapHelper;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @magentoDbIsolation disabled
+ * @magentoAppArea adminhtml
+ */
+class CustomerManagementTest extends TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var CustomerManagement
+     */
+    private $customerManagemet;
+
+    /**
+     * @var CustomerInterface
+     */
+    private $customer;
+
+    protected function setUp(): void
+    {
+        $this->objectManager = BootstrapHelper::getObjectManager();
+        $this->customerManagemet = $this->objectManager->create(CustomerManagement::class);
+        $this->customer = $this->objectManager->create(CustomerInterface::class);
+    }
+
+    protected function tearDown(): void
+    {
+        /** @var CustomerRepositoryInterface $customerRepository */
+        $customerRepository = $this->objectManager->create(CustomerRepositoryInterface::class);
+        $customer = $customerRepository->get('john1.doe001@test.com');
+        $customerRepository->delete($customer);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Sales/_files/quote.php
+     */
+    public function testCustomerAddressIdQuote(): void
+    {
+        $reservedOrderId = 'test01';
+
+        $this->customer->setEmail('john1.doe001@test.com')
+        ->setFirstname('doe')
+        ->setLastname('john');
+
+        $quote = $this->getQuote($reservedOrderId)->setCustomer($this->customer);
+        $this->customerManagemet->populateCustomerInfo($quote);
+        self::assertNotNull($quote->getBillingAddress()->getCustomerAddressId());
+        self::assertNotNull($quote->getShippingAddress()->getCustomerAddressId());
+    }
+
+    /**
+     * Gets quote by reserved order ID.
+     *
+     * @param string $reservedOrderId
+     * @return Quote
+     */
+    private function getQuote(string $reservedOrderId): Quote
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', $reservedOrderId)
+            ->create();
+
+        /** @var CartRepositoryInterface $quoteRepository */
+        $quoteRepository = $this->objectManager->get(CartRepositoryInterface::class);
+        $items = $quoteRepository->getList($searchCriteria)
+            ->getItems();
+
+        return array_pop($items);
+    }
+}

From 82d60a3c1f7b08702f3701485d92411e4a309138 Mon Sep 17 00:00:00 2001
From: Wout Kramer <wout.kramer@mediact.nl>
Date: Mon, 20 Jul 2020 11:36:23 +0200
Subject: [PATCH 0930/1718] Use static font name instead of variable when
 loading fonts, because changing the variable's value (e.g. in a child theme)
 can result in loading open sans under a wrong name

---
 .../Magento/blank/web/css/source/_typography.less         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/design/frontend/Magento/blank/web/css/source/_typography.less b/app/design/frontend/Magento/blank/web/css/source/_typography.less
index 6807c0f692af8..02ccd90d4655d 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_typography.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_typography.less
@@ -9,7 +9,7 @@
 
 & when (@media-common = true) {
     .lib-font-face(
-        @family-name: @font-family-name__base,
+        @family-name: 'Open Sans',
         @font-path: '@{baseDir}fonts/opensans/light/opensans-300',
         @font-weight: 300,
         @font-style: normal,
@@ -17,7 +17,7 @@
     );
 
     .lib-font-face(
-        @family-name: @font-family-name__base,
+        @family-name: 'Open Sans',
         @font-path: '@{baseDir}fonts/opensans/regular/opensans-400',
         @font-weight: 400,
         @font-style: normal,
@@ -25,7 +25,7 @@
     );
 
     .lib-font-face(
-        @family-name: @font-family-name__base,
+        @family-name: 'Open Sans',
         @font-path: '@{baseDir}fonts/opensans/semibold/opensans-600',
         @font-weight: 600,
         @font-style: normal,
@@ -33,7 +33,7 @@
     );
 
     .lib-font-face(
-        @family-name: @font-family-name__base,
+        @family-name: 'Open Sans',
         @font-path: '@{baseDir}fonts/opensans/bold/opensans-700',
         @font-weight: 700,
         @font-style: normal,

From befe730ec54a2140db522da8ac9290c42df4a939 Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Mon, 20 Jul 2020 13:27:03 +0300
Subject: [PATCH 0931/1718] MC-35081: Customer Address import issue - Region ID
 setting to NULL

---
 .../Model/Import/Address.php                  |   9 +-
 .../Model/Import/AddressTest.php              | 234 +++++++++++++++---
 2 files changed, 206 insertions(+), 37 deletions(-)

diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Address.php b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
index a5947f48bea5f..7aa4dd9c11c2b 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/Address.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
@@ -667,8 +667,6 @@ protected function _prepareDataForUpdate(array $rowData): array
                 $defaults[$table][$customerId][$attributeCode] = $addressId;
             }
         }
-        // let's try to find region ID
-        $entityRow[self::COLUMN_REGION_ID] = null;
 
         if (!empty($entityRow[self::COLUMN_REGION]) && !empty($entityRow[self::COLUMN_COUNTRY_ID])) {
             $entityRow[self::COLUMN_REGION_ID] = $this->getCountryRegionId(
@@ -679,6 +677,8 @@ protected function _prepareDataForUpdate(array $rowData): array
             $entityRow[self::COLUMN_REGION] = $entityRow[self::COLUMN_REGION_ID] !== null
                 ? $this->_regions[$entityRow[self::COLUMN_REGION_ID]]
                 : $entityRow[self::COLUMN_REGION];
+        } elseif ($newAddress) {
+            $entityRow[self::COLUMN_REGION_ID] = null;
         }
         if ($newAddress) {
             $entityRowNew = $entityRow;
@@ -908,7 +908,7 @@ protected function _validateRowForUpdate(array $rowData, $rowNumber)
                     }
                 }
 
-                if (isset($rowData[self::COLUMN_COUNTRY_ID])) {
+                if (!empty($rowData[self::COLUMN_COUNTRY_ID])) {
                     if (isset($rowData[self::COLUMN_POSTCODE])
                         && !$this->postcodeValidator->isValid(
                             $rowData[self::COLUMN_COUNTRY_ID],
@@ -918,8 +918,7 @@ protected function _validateRowForUpdate(array $rowData, $rowNumber)
                         $this->addRowError(self::ERROR_VALUE_IS_REQUIRED, $rowNumber, self::COLUMN_POSTCODE);
                     }
 
-                    if (isset($rowData[self::COLUMN_REGION])
-                        && !empty($rowData[self::COLUMN_REGION])
+                    if (!empty($rowData[self::COLUMN_REGION])
                         && count($this->getCountryRegions($rowData[self::COLUMN_COUNTRY_ID])) > 0
                         && null === $this->getCountryRegionId(
                             $rowData[self::COLUMN_COUNTRY_ID],
diff --git a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/AddressTest.php b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/AddressTest.php
index 832aabe6b6a78..0a5e6cdfe21bd 100644
--- a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/AddressTest.php
+++ b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/AddressTest.php
@@ -9,30 +9,41 @@
  */
 namespace Magento\CustomerImportExport\Model\Import;
 
+use Magento\Catalog\Model\ResourceModel\Product;
 use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Model\AddressRegistry;
+use Magento\Customer\Model\Indexer\Processor;
+use Magento\Customer\Model\ResourceModel\Address\Collection;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
+use Magento\Framework\Registry;
+use Magento\Framework\Stdlib\DateTime;
 use Magento\ImportExport\Model\Import as ImportModel;
 use Magento\ImportExport\Model\Import\Adapter as ImportAdapter;
+use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
 use Magento\ImportExport\Model\Import\Source\Csv;
+use Magento\ImportExport\Model\ResourceModel\Helper;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Framework\Indexer\StateInterface;
+use Magento\TestFramework\ObjectManager;
+use PHPUnit\Framework\TestCase;
 use ReflectionClass;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class AddressTest extends \PHPUnit\Framework\TestCase
+class AddressTest extends TestCase
 {
     /**
      * Tested class name
      *
      * @var string
      */
-    protected $_testClassName = \Magento\CustomerImportExport\Model\Import\Address::class;
+    protected $_testClassName = Address::class;
 
     /**
      * Fixture key from fixture
@@ -92,7 +103,7 @@ class AddressTest extends \PHPUnit\Framework\TestCase
     protected $customerResource;
 
     /**
-     * @var \Magento\Customer\Model\Indexer\Processor
+     * @var Processor
      */
     private $indexerProcessor;
 
@@ -101,7 +112,7 @@ class AddressTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp(): void
     {
-        /** @var \Magento\Catalog\Model\ResourceModel\Product $productResource */
+        /** @var Product $productResource */
         $this->customerResource = Bootstrap::getObjectManager()->get(
             \Magento\Customer\Model\ResourceModel\Customer::class
         );
@@ -109,7 +120,7 @@ protected function setUp(): void
             $this->_testClassName
         );
         $this->indexerProcessor = Bootstrap::getObjectManager()->create(
-            \Magento\Customer\Model\Indexer\Processor::class
+            Processor::class
         );
     }
 
@@ -140,10 +151,10 @@ public function testSaveAddressEntities()
      */
     protected function _addTestAddress(Address $entityAdapter)
     {
-        /** @var $objectManager \Magento\TestFramework\ObjectManager */
+        /** @var $objectManager ObjectManager */
         $objectManager = Bootstrap::getObjectManager();
 
-        $customers = $objectManager->get(\Magento\Framework\Registry::class)->registry($this->_fixtureKey);
+        $customers = $objectManager->get(Registry::class)->registry($this->_fixtureKey);
         /** @var $customer \Magento\Customer\Model\Customer */
         $customer = reset($customers);
         $customerId = $customer->getId();
@@ -153,14 +164,14 @@ protected function _addTestAddress(Address $entityAdapter)
             \Magento\Customer\Model\Address::class
         );
         $tableName = $addressModel->getResource()->getEntityTable();
-        $addressId = $objectManager->get(\Magento\ImportExport\Model\ResourceModel\Helper::class)
+        $addressId = $objectManager->get(Helper::class)
             ->getNextAutoincrement($tableName);
 
         $newEntityData = [
             'entity_id' => $addressId,
             'parent_id' => $customerId,
-            'created_at' => (new \DateTime())->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT),
-            'updated_at' => (new \DateTime())->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT),
+            'created_at' => (new \DateTime())->format(DateTime::DATETIME_PHP_FORMAT),
+            'updated_at' => (new \DateTime())->format(DateTime::DATETIME_PHP_FORMAT),
         ];
 
         // invoke _saveAddressEntities
@@ -223,11 +234,11 @@ public function testSaveAddressAttributes()
      */
     public function testSaveCustomerDefaults()
     {
-        /** @var $objectManager \Magento\TestFramework\ObjectManager */
+        /** @var $objectManager ObjectManager */
         $objectManager = Bootstrap::getObjectManager();
 
         // get not default address
-        $customers = $objectManager->get(\Magento\Framework\Registry::class)->registry($this->_fixtureKey);
+        $customers = $objectManager->get(Registry::class)->registry($this->_fixtureKey);
         /** @var $notDefaultAddress \Magento\Customer\Model\Address */
         $notDefaultAddress = null;
         /** @var $addressCustomer \Magento\Customer\Model\Customer */
@@ -300,7 +311,7 @@ public function testImportDataAddUpdate()
         // set fixture CSV file
         $sourceFile = __DIR__ . '/_files/address_import_update.csv';
 
-        /** @var $objectManager \Magento\TestFramework\ObjectManager */
+        /** @var $objectManager ObjectManager */
         $objectManager = Bootstrap::getObjectManager();
         $filesystem = $objectManager->create(Filesystem::class);
 
@@ -328,7 +339,7 @@ public function testImportDataAddUpdate()
 
         // get addresses
         $addressCollection = Bootstrap::getObjectManager()->create(
-            \Magento\Customer\Model\ResourceModel\Address\Collection::class
+            Collection::class
         );
         $addressCollection->addAttributeToSelect($requiredAttributes);
         $addresses = [];
@@ -399,7 +410,7 @@ public function testImportDataDelete()
         // set fixture CSV file
         $sourceFile = __DIR__ . '/_files/address_import_delete.csv';
 
-        /** @var $objectManager \Magento\TestFramework\ObjectManager */
+        /** @var $objectManager ObjectManager */
         $objectManager = Bootstrap::getObjectManager();
         $filesystem = $objectManager->create(Filesystem::class);
         $directoryWrite = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
@@ -415,9 +426,9 @@ public function testImportDataDelete()
         $keyAttribute = 'postcode';
 
         // get addresses
-        /** @var $addressCollection \Magento\Customer\Model\ResourceModel\Address\Collection */
+        /** @var $addressCollection Collection */
         $addressCollection = Bootstrap::getObjectManager()->create(
-            \Magento\Customer\Model\ResourceModel\Address\Collection::class
+            Collection::class
         );
         $addressCollection->addAttributeToSelect($keyAttribute);
         $addresses = [];
@@ -442,7 +453,7 @@ public function testImportDataDelete()
      */
     public function testDifferentOptions(): void
     {
-        /** @var $objectManager \Magento\TestFramework\ObjectManager */
+        /** @var $objectManager ObjectManager */
         $objectManager = Bootstrap::getObjectManager();
         /** @var Filesystem $filesystem */
         $filesystem = $objectManager->create(Filesystem::class);
@@ -472,9 +483,10 @@ public function testDifferentOptions(): void
     public function testCustomerIndexer(): void
     {
         $file = __DIR__ . '/_files/address_import_update.csv';
-        $filesystem = Bootstrap::getObjectManager()->create(Filesystem::class);
+        $filesystem = Bootstrap::getObjectManager()
+            ->create(Filesystem::class);
         $directoryWrite = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
-        $source = new \Magento\ImportExport\Model\Import\Source\Csv($file, $directoryWrite);
+        $source = new Csv($file, $directoryWrite);
         $this->_entityAdapter
             ->setParameters(['behavior' => ImportModel::BEHAVIOR_ADD_UPDATE])
             ->setSource($source)
@@ -492,23 +504,15 @@ public function testCustomerIndexer(): void
     /**
      * Test import address with region for a country that does not have regions defined
      *
+     * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/Customer/_files/import_export/customer_with_addresses.php
      */
     public function testImportAddressWithOptionalRegion()
     {
-        $objectManager = Bootstrap::getObjectManager();
-        $customerRepository = $objectManager->get(CustomerRepositoryInterface::class);
-        $customer = $customerRepository->get('BetsyParker@example.com');
+        $customer = $this->getCustomer('BetsyParker@example.com');
         $file = __DIR__ . '/_files/import_uk_address.csv';
-        $filesystem = Bootstrap::getObjectManager()->create(Filesystem::class);
-        $directoryWrite = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
-        $source = new Csv($file, $directoryWrite);
-        $errors = $this->_entityAdapter
-            ->setParameters(['behavior' => ImportModel::BEHAVIOR_ADD_UPDATE])
-            ->setSource($source)
-            ->validateData();
-        $this->assertEmpty($errors->getAllErrors(), 'Import validation failed');
-        $this->_entityAdapter->importData();
+        $errors = $this->doImport($file);
+        $this->assertImportValidationPassed($errors);
         $address = $this->getAddresses(
             [
                 'parent_id' => $customer->getId(),
@@ -520,6 +524,55 @@ public function testImportAddressWithOptionalRegion()
         $this->assertEquals('Liverpool', $address[0]->getRegion()->getRegion());
     }
 
+    /**
+     * Test update first name and last name
+     *
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Customer/_files/import_export/customer_with_addresses.php
+     */
+    public function testUpdateFirstAndLastName()
+    {
+        $customer = $this->getCustomer('BetsyParker@example.com');
+        $addresses = $this->getAddresses(
+            [
+                'parent_id' => $customer->getId(),
+            ]
+        );
+        $this->assertCount(1, $addresses);
+        $address = $addresses[0];
+        $row = [
+            '_website' => 'base',
+            '_email' => $customer->getEmail(),
+            '_entity_id' => $address->getId(),
+            'firstname' => 'Mark',
+            'lastname' => 'Antony',
+        ];
+        $file = $this->generateImportFile([$row]);
+        $errors = $this->doImport($file);
+        $this->assertImportValidationPassed($errors);
+        $objectManager = Bootstrap::getObjectManager();
+        //clear cache
+        $objectManager->get(AddressRegistry::class)->remove($address->getId());
+        $addresses = $this->getAddresses(
+            [
+                'parent_id' => $customer->getId(),
+                'entity_id' => $address->getId(),
+            ]
+        );
+        $this->assertCount(1, $addresses);
+        $updatedAddress = $addresses[0];
+        //assert that firstname and lastname were updated
+        $this->assertEquals($row['firstname'], $updatedAddress->getFirstname());
+        $this->assertEquals($row['lastname'], $updatedAddress->getLastname());
+        //assert other values have not changed
+        $this->assertEquals($address->getStreet(), $updatedAddress->getStreet());
+        $this->assertEquals($address->getCity(), $updatedAddress->getCity());
+        $this->assertEquals($address->getCountryId(), $updatedAddress->getCountryId());
+        $this->assertEquals($address->getPostcode(), $updatedAddress->getPostcode());
+        $this->assertEquals($address->getTelephone(), $updatedAddress->getTelephone());
+        $this->assertEquals($address->getRegionId(), $updatedAddress->getRegionId());
+    }
+
     /**
      * Get Addresses by filter
      *
@@ -538,4 +591,121 @@ private function getAddresses(array $filter): array
         }
         return $repository->getList($searchCriteriaBuilder->create())->getItems();
     }
+
+    /**
+     * @param string $email
+     * @return CustomerInterface
+     */
+    private function getCustomer(string $email): CustomerInterface
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $customerRepository = $objectManager->get(CustomerRepositoryInterface::class);
+        return $customerRepository->get($email);
+    }
+
+    /**
+     * @param string $file
+     * @param string $behavior
+     * @param bool $validateOnly
+     * @return ProcessingErrorAggregatorInterface
+     */
+    private function doImport(
+        string $file,
+        string $behavior = ImportModel::BEHAVIOR_ADD_UPDATE,
+        bool $validateOnly = false
+    ): ProcessingErrorAggregatorInterface {
+        $objectManager = Bootstrap::getObjectManager();
+        /** @var Filesystem $filesystem */
+        $filesystem = $objectManager->create(Filesystem::class);
+        $directoryWrite = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+        $source = ImportAdapter::findAdapterFor($file, $directoryWrite);
+        $errors = $this->_entityAdapter
+            ->setParameters(['behavior' => $behavior])
+            ->setSource($source)
+            ->validateData();
+        if (!$validateOnly && !$errors->getAllErrors()) {
+            $this->_entityAdapter->importData();
+        }
+        return $errors;
+    }
+
+    /**
+     * @param array $data
+     * @return string
+     */
+    private function generateImportFile(array $data): string
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        /** @var Filesystem $filesystem */
+        $filesystem = $objectManager->get(Filesystem::class);
+        $tmpDir = $filesystem->getDirectoryWrite(DirectoryList::TMP);
+        $tmpFilename = uniqid('test_import_address_') . '.csv';
+        $stream = $tmpDir->openFile($tmpFilename, 'w+');
+        $stream->lock();
+        $stream->writeCsv($this->getFields());
+        $emptyRow = array_fill_keys($this->getFields(), '');
+        foreach ($data as $row) {
+            $row = array_replace($emptyRow, $row);
+            $stream->writeCsv($row);
+        }
+        $stream->unlock();
+        $stream->close();
+        return $tmpDir->getAbsolutePath($tmpFilename);
+    }
+
+    /**
+     * @param ProcessingErrorAggregatorInterface $errors
+     */
+    private function assertImportValidationPassed(ProcessingErrorAggregatorInterface $errors): void
+    {
+        if ($errors->getAllErrors()) {
+            $messages = [];
+            $messages[] = 'Import validation failed';
+            $messages[] = '';
+            foreach ($errors->getAllErrors() as $error) {
+                $messages[] = sprintf(
+                    '%s: #%d [%s] %s: %s',
+                    strtoupper($error->getErrorLevel()),
+                    $error->getRowNumber(),
+                    $error->getErrorCode(),
+                    $error->getErrorMessage(),
+                    $error->getErrorDescription()
+                );
+            }
+            $this->fail(implode("\n", $messages));
+        }
+    }
+
+    /**
+     * @return array
+     */
+    private function getFields(): array
+    {
+        return [
+            '_website',
+            '_email',
+            '_entity_id',
+            'city',
+            'company',
+            'country_id',
+            'fax',
+            'firstname',
+            'lastname',
+            'middlename',
+            'postcode',
+            'prefix',
+            'region',
+            'region_id',
+            'street',
+            'suffix',
+            'telephone',
+            'vat_id',
+            'vat_is_valid',
+            'vat_request_date',
+            'vat_request_id',
+            'vat_request_success',
+            '_address_default_billing_',
+            '_address_default_shipping_',
+        ];
+    }
 }

From 3d3c5c4e44f4c6896700a97dfa36ae7bdfa34e6b Mon Sep 17 00:00:00 2001
From: Vadim Malesh <51680850+engcom-Charlie@users.noreply.github.com>
Date: Mon, 20 Jul 2020 13:58:07 +0300
Subject: [PATCH 0932/1718] add testCaseId

---
 .../Mftf/Test/AdminSystemNotificationToolbarBlockAclTest.xml     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationToolbarBlockAclTest.xml b/app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationToolbarBlockAclTest.xml
index 74e595c601f32..c174d1faed31a 100644
--- a/app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationToolbarBlockAclTest.xml
+++ b/app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationToolbarBlockAclTest.xml
@@ -14,6 +14,7 @@
             <title value="Admin system notification toolbar block acl test"/>
             <description value="Admin should not see system notification toolbar block if acl not restricted"/>
             <severity value="MAJOR"/>
+            <testCaseId value="MC-36011"/>
             <group value="menu"/>
         </annotations>
         <before>

From c5e4aa5acfcdfb37a950c338bae970831ee67ab4 Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Mon, 20 Jul 2020 14:09:35 +0300
Subject: [PATCH 0933/1718] MFTF test.

---
 ...rtItemEditParametersProductActionGroup.xml |  18 +++
 ...SwatchesTextOptionToTheCartActionGroup.xml |  31 +++++
 ...oductSwatchUpdateCartItemTierPriceTest.xml | 113 ++++++++++++++++++
 3 files changed, 162 insertions(+)
 create mode 100644 app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StrorefrontUpdateCartItemEditParametersProductActionGroup.xml
 create mode 100644 app/code/Magento/Swatches/Test/Mftf/ActionGroup/StorefrontAddProductWithSwatchesTextOptionToTheCartActionGroup.xml
 create mode 100644 app/code/Magento/Swatches/Test/Mftf/Test/StorefrontConfigurableProductSwatchUpdateCartItemTierPriceTest.xml

diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StrorefrontUpdateCartItemEditParametersProductActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StrorefrontUpdateCartItemEditParametersProductActionGroup.xml
new file mode 100644
index 0000000000000..17a13ab7a9a12
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StrorefrontUpdateCartItemEditParametersProductActionGroup.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="StrorefrontUpdateCartItemEditParametersProductActionGroup">
+        <arguments>
+            <argument name="rowNumber" type="string" defaultValue="1"/>
+        </arguments>
+        <click selector="{{CheckoutCartProductSection.nthEditButton(rowNumber)}}" stepKey="clickEditConfigurableProductButton"/>
+        <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Swatches/Test/Mftf/ActionGroup/StorefrontAddProductWithSwatchesTextOptionToTheCartActionGroup.xml b/app/code/Magento/Swatches/Test/Mftf/ActionGroup/StorefrontAddProductWithSwatchesTextOptionToTheCartActionGroup.xml
new file mode 100644
index 0000000000000..cc1b8fc4249bf
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/ActionGroup/StorefrontAddProductWithSwatchesTextOptionToTheCartActionGroup.xml
@@ -0,0 +1,31 @@
+<?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">
+    <!-- Add Configurable Product with Swatch attribute to the cart -->
+    <actionGroup name="StorefrontAddProductWithSwatchesTextOptionToTheCartActionGroup">
+        <annotations>
+            <description>Select Product product option. Fills in the provided Product Quantity. Clicks on Add To Cart. Validates that the Success Message is present.</description>
+        </annotations>
+        <arguments>
+            <argument name="product"/>
+            <argument name="productOption" type="string"/>
+            <argument name="productQty" type="string" />
+        </arguments>
+
+        <waitForPageLoad stepKey="waitForStorefrontProductPageLoad"/>
+        <click selector="{{StorefrontProductInfoMainSection.swatchOptionByLabel(productOption)}}" stepKey="clickSwatchOption"/>
+        <fillField selector="{{StorefrontProductPageSection.qtyInput}}" userInput="{{productQty}}" stepKey="fillProduct1Quantity"/>
+        <click selector="{{StorefrontProductPageSection.addToCartBtn}}" stepKey="clickOnAddToCartButton"/>
+        <waitForPageLoad stepKey="waitForProductToAddInCart"/>
+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
+        <seeElement selector="{{StorefrontProductPageSection.successMsg}}" stepKey="seeSuccessSaveMessage"/>
+
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontConfigurableProductSwatchUpdateCartItemTierPriceTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontConfigurableProductSwatchUpdateCartItemTierPriceTest.xml
new file mode 100644
index 0000000000000..ca68fcf329796
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontConfigurableProductSwatchUpdateCartItemTierPriceTest.xml
@@ -0,0 +1,113 @@
+<?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="StorefrontConfigurableProductSwatchUpdateCartItemTierPriceTest">
+        <annotations>
+            <features value="Swatches"/>
+            <stories value="Configurable product with swatch attribute"/>
+            <title value="Swatch option should show the tier price on product page when Cart Item edited."/>
+            <description value="Configurable product with swatch attribute should show the tier price on product page when added Cart Item."/>
+            <severity value="CRITICAL"/>
+            <group value="Swatches"/>
+        </annotations>
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiConfigurableProduct" stepKey="createConfigurableProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createConfigurableProduct" stepKey="deleteConfigurableProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="DeleteProductAttributeActionGroup" stepKey="deleteColorAttribute">
+                <argument name="ProductAttribute" value="ProductColorAttribute"/>
+            </actionGroup>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
+        </after>
+
+        <actionGroup ref="AddTextSwatchToProductActionGroup" stepKey="addColorAttribute">
+            <argument name="attributeName" value="{{ProductColorAttribute.frontend_label}}"/>
+            <argument name="attributeCode" value="{{ProductColorAttribute.attribute_code}}"/>
+            <argument name="option1" value="Black"/>
+            <argument name="option2" value="White"/>
+            <argument name="option3" value="Blue"/>
+        </actionGroup>
+
+        <amOnPage url="{{AdminProductEditPage.url($createConfigurableProduct.id$)}}" stepKey="goToConfigurableProduct"/>
+
+        <actionGroup ref="GenerateConfigurationsByAttributeCodeActionGroup" stepKey="createProductConfigurations">
+            <argument name="attributeCode" value="{{ProductColorAttribute.attribute_code}}"/>
+        </actionGroup>
+        <actionGroup ref="SaveConfigurableProductAddToCurrentAttributeSetActionGroup" stepKey="saveConfigurableProduct"/>
+
+        <actionGroup ref="FilterAndSelectProductActionGroup" stepKey="filterProduct">
+            <argument name="productSku" value="$$createConfigurableProduct.sku$$-White"/>
+        </actionGroup>
+        <actionGroup ref="ProductSetAdvancedPricingActionGroup" stepKey="addTierPriceToSimpleProduct">
+            <argument name="group" value="ALL GROUPS"/>
+            <argument name="quantity" value="5"/>
+            <argument name="price" value="Discount"/>
+            <argument name="amount" value="50"/>
+        </actionGroup>
+        <actionGroup ref="SaveProductFormActionGroup" stepKey="saveSimpleProduct"/>
+
+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openConfigurableProductPage">
+            <argument name="productUrl" value="$createConfigurableProduct.custom_attributes[url_key]$"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForConfigurableProductPage"/>
+
+        <actionGroup ref="StorefrontSelectSwatchOptionOnProductPageActionGroup" stepKey="selectWhiteOption">
+            <argument name="optionName" value="White"/>
+        </actionGroup>
+
+        <actionGroup ref="AssertStorefrontProductDetailPageTierPriceActionGroup" stepKey="assertProductTierPriceText">
+            <argument name="tierProductPriceDiscountQuantity" value="5"/>
+            <argument name="productPriceWithAppliedTierPriceDiscount" value="61.50"/>
+            <argument name="productSavedPricePercent" value="50"/>
+        </actionGroup>
+
+        <actionGroup ref="StorefrontAddProductWithSwatchesTextOptionToTheCartActionGroup" stepKey="addConfigurableProductToTheCart">
+            <argument name="productQty" value="1"/>
+            <argument name="product" value="ApiConfigurableProduct"/>
+            <argument name="productOption" value="Blue"/>
+        </actionGroup>
+
+        <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="openShoppingCartPage"/>
+
+        <actionGroup ref="StorefrontUpdateCartItemEditParametersProductActionGroup" stepKey="updateCartItem">
+            <argument name="rowNumber" value="1"/>
+        </actionGroup>
+
+        <actionGroup ref="StorefrontSelectSwatchOptionOnProductPageActionGroup" stepKey="selectWhiteOption2">
+            <argument name="optionName" value="White"/>
+        </actionGroup>
+
+        <actionGroup ref="AssertStorefrontProductDetailPageTierPriceActionGroup" stepKey="assertProductTierPriceText2">
+            <argument name="tierProductPriceDiscountQuantity" value="5"/>
+            <argument name="productPriceWithAppliedTierPriceDiscount" value="61.50"/>
+            <argument name="productSavedPricePercent" value="50"/>
+        </actionGroup>
+
+        <actionGroup ref="StorefrontSelectSwatchOptionOnProductPageActionGroup" stepKey="selectWhiteOption3">
+            <argument name="optionName" value="Blue"/>
+        </actionGroup>
+
+        <dontSee selector="{{StorefrontProductInfoMainSection.tierPriceText}}" stepKey="dontSeeTierPriceForOption"/>
+
+        <actionGroup ref="StorefrontAddProductWithSwatchesTextOptionToTheCartActionGroup" stepKey="addUpdatedConfigurableProductToTheCart">
+            <argument name="productQty" value="10"/>
+            <argument name="product" value="ApiConfigurableProduct"/>
+            <argument name="productOption" value="White"/>
+        </actionGroup>
+
+        <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="openShoppingCartPage2"/>
+
+    </test>
+</tests>

From 13f5caebd21773d2b476096f82dda7abc9dcfe5e Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Mon, 20 Jul 2020 14:09:52 +0300
Subject: [PATCH 0934/1718] MFTF test.

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

diff --git a/app/code/Magento/Swatches/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Swatches/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
index a4bff2227ffbb..811d3af735321 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -16,6 +16,7 @@
         <element name="nthSwatchOptionText" type="button" selector="div.swatch-option.text:nth-of-type({{n}})" parameterized="true"/>
         <element name="productSwatch" type="button" selector="//div[@class='swatch-option'][@aria-label='{{var1}}']" parameterized="true"/>
         <element name="visualSwatchOption" type="button" selector=".swatch-option[data-option-tooltip-value='#{{visualSwatchOption}}']" parameterized="true"/>
+        <element name="visualSwatchOptionText" type="button" selector=".swatch-option.text[data-option-tooltip-value='{{visualSwatchOptionText}}']" parameterized="true"/>
         <element name="swatchOptionTooltip" type="block" selector="div.swatch-option-tooltip"/>
         <element name="swatchAttributeSelectedOption" type="text" selector="#product-options-wrapper .swatch-option.selected"/>
     </section>

From fe0be1ddd881d6d645b01adb0280ffd6f3538e64 Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Mon, 20 Jul 2020 20:37:49 +0800
Subject: [PATCH 0935/1718] magento/adobe-stock-integration#1391:
 SaveAssetsKeywordsInterface to delete obsolete keywords - Code enhancement
 for SavedAssetLinks logic and updated AssetKeywordsTest

---
 .../ResourceModel/Keyword/SaveAssetLinks.php  | 53 ++++++++++---------
 .../Model/ResourceModel/AssetKeywordsTest.php | 29 ++++++++++
 2 files changed, 56 insertions(+), 26 deletions(-)

diff --git a/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetLinks.php b/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetLinks.php
index 1708532569763..f18daae030385 100644
--- a/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetLinks.php
+++ b/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetLinks.php
@@ -33,7 +33,7 @@ class SaveAssetLinks
     /**
      * @var GetAssetsKeywordsInterface
      */
-    private $getAssetsKeywordsInterface;
+    private $getAssetsKeywords;
 
     /**
      * @var LoggerInterface
@@ -41,16 +41,16 @@ class SaveAssetLinks
     private $logger;
 
     /**
-     * @param GetAssetsKeywordsInterface $getAssetsKeywordsInterface
+     * @param GetAssetsKeywordsInterface $getAssetsKeywords
      * @param ResourceConnection $resourceConnection
      * @param LoggerInterface $logger
      */
     public function __construct(
-        GetAssetsKeywordsInterface $getAssetsKeywordsInterface,
+        GetAssetsKeywordsInterface $getAssetsKeywords,
         ResourceConnection $resourceConnection,
         LoggerInterface $logger
     ) {
-        $this->getAssetsKeywordsInterface = $getAssetsKeywordsInterface;
+        $this->getAssetsKeywords = $getAssetsKeywords;
         $this->resourceConnection = $resourceConnection;
         $this->logger = $logger;
     }
@@ -66,8 +66,14 @@ public function __construct(
     public function execute(int $assetId, array $keywordIds): void
     {
         try {
-            $this->deleteAssetKeywords($assetId, $keywordIds);
-            $this->insertAssetKeywords($assetId, $keywordIds);
+            $currentKeywordIds = $this->getCurrentKeywordIds($assetId);
+
+            $obsoleteKeywordIds = array_diff($currentKeywordIds, $keywordIds);
+            $newKeywordIds = array_diff($keywordIds, $currentKeywordIds);
+
+            $this->deleteAssetKeywords($assetId, $obsoleteKeywordIds);
+            $this->insertAssetKeywords($assetId, $newKeywordIds);
+
         } catch (\Exception $exception) {
             $this->logger->critical($exception);
             throw new CouldNotSaveException(
@@ -81,7 +87,7 @@ public function execute(int $assetId, array $keywordIds): void
      * Save new asset keyword links
      *
      * @param int $assetId
-     * @param array $keywordIds
+     * @param int[] $keywordIds
      * @throws CouldNotSaveException
      */
     private function insertAssetKeywords(int $assetId, array $keywordIds): void
@@ -89,9 +95,8 @@ private function insertAssetKeywords(int $assetId, array $keywordIds): void
         try {
             if (!empty($keywordIds)) {
                 $values = [];
-                $keywordsToInsert = array_diff($keywordIds, $this->getCurrentKeywords($assetId));
 
-                foreach ($keywordsToInsert as $keywordId) {
+                foreach ($keywordIds as $keywordId) {
                     $values[] = [$assetId, $keywordId];
                 }
 
@@ -119,14 +124,12 @@ private function insertAssetKeywords(int $assetId, array $keywordIds): void
      * Delete obsolete asset keyword links
      *
      * @param int $assetId
-     * @param array $keywords
+     * @param int[] $obsoleteKeywordIds
      * @throws CouldNotDeleteException
      */
-    private function deleteAssetKeywords(int $assetId, array $keywords): void
+    private function deleteAssetKeywords(int $assetId, array $obsoleteKeywordIds): void
     {
         try {
-            $obsoleteKeywordIds = array_diff($this->getCurrentKeywords($assetId), $keywords);
-
             if (!empty($obsoleteKeywordIds)) {
                 /** @var Mysql $connection */
                 $connection = $this->resourceConnection->getConnection();
@@ -150,31 +153,29 @@ private function deleteAssetKeywords(int $assetId, array $keywords): void
     }
 
     /**
-     * Get current keyword data of an asset
+     * Get current keyword ids of an asset
      *
      * @param int $assetId
-     * @return array
+     * @return int[]
      */
-    private function getCurrentKeywords(int $assetId): array
+    private function getCurrentKeywordIds(int $assetId): array
     {
-        $currentKeywordsData = $this->getAssetsKeywordsInterface->execute([$assetId]);
+        $currentKeywordsData = $this->getAssetsKeywords->execute([$assetId]);
 
-        if (!empty($currentKeywordsData)) {
-            $currentKeywords = $this->getKeywordIdsFromKeywordData(
-                $currentKeywordsData[$assetId]->getKeywords()
-            );
-
-            return $currentKeywords;
+        if (empty($currentKeywordsData)) {
+            return [];
         }
 
-        return [];
+        return $this->getKeywordIdsFromKeywordData(
+            $currentKeywordsData[$assetId]->getKeywords()
+        );
     }
 
     /**
      * Get keyword ids from keyword data
      *
-     * @param array $keywordsData
-     * @return array
+     * @param KeywordInterface[] $keywordsData
+     * @return int[]
      */
     private function getKeywordIdsFromKeywordData(array $keywordsData): array
     {
diff --git a/dev/tests/integration/testsuite/Magento/MediaGallery/Model/ResourceModel/AssetKeywordsTest.php b/dev/tests/integration/testsuite/Magento/MediaGallery/Model/ResourceModel/AssetKeywordsTest.php
index beb146b0b816f..76d8cb6bdd1a9 100644
--- a/dev/tests/integration/testsuite/Magento/MediaGallery/Model/ResourceModel/AssetKeywordsTest.php
+++ b/dev/tests/integration/testsuite/Magento/MediaGallery/Model/ResourceModel/AssetKeywordsTest.php
@@ -72,6 +72,7 @@ protected function setUp(): void
     public function testSaveAndGetKeywords(array $keywords): void
     {
         $keywords = ['pear', 'plum'];
+        $updatedKeywords = ['pear', 'apple','orange'];
 
         $loadedAssets = $this->getAssetsByPath->execute([self::FIXTURE_ASSET_PATH]);
         $this->assertCount(1, $loadedAssets);
@@ -105,6 +106,34 @@ public function testSaveAndGetKeywords(array $keywords): void
         sort($keywords);
 
         $this->assertEquals($keywords, $loadedKeywordStrings);
+
+        $updatedAssetKeywords = $this->assetsKeywordsFactory->create(
+            [
+                'assetId' => $loadedAsset->getId(),
+                'keywords' => $this->getKeywords($updatedKeywords)
+            ]
+        );
+        $this->saveAssetsKeywords->execute([$updatedAssetKeywords]);
+        $updatedLoadedAssetKeywords = $this->getAssetsKeywords->execute([$loadedAsset->getId()]);
+
+        $this->assertCount(1, $updatedLoadedAssetKeywords);
+
+        /** @var AssetKeywordsInterface $updatedLoadedAssetKeywords */
+        $updatedLoadedAssetKeywords = current($updatedLoadedAssetKeywords);
+
+        $updatedLoadedKeywords = $updatedLoadedAssetKeywords->getKeywords();
+
+        $this->assertEquals(count($updatedKeywords), count($updatedLoadedKeywords));
+
+        $updatedLoadedKeywordStrings = [];
+        foreach ($updatedLoadedKeywords as $updatedLoadedKeywordObject) {
+            $updatedLoadedKeywordStrings[] = $updatedLoadedKeywordObject->getKeyword();
+        }
+
+        sort($updatedLoadedKeywordStrings);
+        sort($updatedKeywords);
+
+        $this->assertEquals($updatedKeywords, $updatedLoadedKeywordStrings);
     }
 
     /**

From 35a469beacb48a35c6e225d78cfb642ee63f6a1a Mon Sep 17 00:00:00 2001
From: John Carlo Octabio <johncarlo@abovethefray.io>
Date: Mon, 20 Jul 2020 20:43:57 +0800
Subject: [PATCH 0936/1718] magento/magento2#108: Clear Shopping Cart - Updated
 MFTF for code review changes

---
 ...outClearShoppingCartEnabledActionGroup.xml | 24 -----
 ...OpenSalesCheckoutConfigPageActionGroup.xml |  3 +
 ...arShoppingCartConfigurationActionGroup.xml | 23 +++++
 ...StorefrontClearShoppingCartActionGroup.xml | 27 ++++++
 .../Checkout/Test/Mftf/Data/ConfigData.xml    |  2 +
 .../Section/AdminCheckoutConfigSection.xml    |  4 +-
 .../Section/CheckoutCartProductSection.xml    |  2 +
 ...outRequisitionConfirmationModalSection.xml | 14 ---
 ...pingCartEnableDisableConfigurationTest.xml | 91 +++++++++++++++++++
 ...rShoppingCartWithConfirmationModalTest.xml | 81 -----------------
 10 files changed, 150 insertions(+), 121 deletions(-)
 delete mode 100644 app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminCheckoutClearShoppingCartEnabledActionGroup.xml
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminSelectClearShoppingCartConfigurationActionGroup.xml
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontClearShoppingCartActionGroup.xml
 delete mode 100644 app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutRequisitionConfirmationModalSection.xml
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/Test/ClearShoppingCartEnableDisableConfigurationTest.xml
 delete mode 100644 app/code/Magento/Checkout/Test/Mftf/Test/StorefrontClearShoppingCartWithConfirmationModalTest.xml

diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminCheckoutClearShoppingCartEnabledActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminCheckoutClearShoppingCartEnabledActionGroup.xml
deleted file mode 100644
index 2a7de87054888..0000000000000
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminCheckoutClearShoppingCartEnabledActionGroup.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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="AdminCheckoutClearShoppingCartEnabledActionGroup">
-        <annotations>
-            <description>Enable/disable display of clear shopping cart button on the cart page via checkout cart configuration.</description>
-        </annotations>
-        <arguments>
-            <argument name="value" type="string" defaultValue="Yes"/>
-        </arguments>
-        <scrollTo selector="{{AdminCheckoutConfigSection.clearShoppingCartEnabled}}" x="0" y="-100" stepKey="scrollToClearShoppingCartEnabled"/>
-        <uncheckOption selector="{{AdminCheckoutConfigSection.clearShoppingCartEnabledInherit}}" stepKey="uncheckUseSystem"/>
-        <selectOption selector="{{AdminCheckoutConfigSection.clearShoppingCartEnabled}}" userInput="{{value}}" stepKey="fillClearShoppingCartEnabled"/>
-        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSave"/>
-        <seeElement selector="{{AdminMessagesSection.success}}" stepKey="seeSuccessMessage"/>
-    </actionGroup>
-</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminOpenSalesCheckoutConfigPageActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminOpenSalesCheckoutConfigPageActionGroup.xml
index cf1e2c51fb980..4e76e3113bdb8 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminOpenSalesCheckoutConfigPageActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminOpenSalesCheckoutConfigPageActionGroup.xml
@@ -8,6 +8,9 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminOpenSalesCheckoutConfigPageActionGroup">
+        <annotations>
+            <description>Goes to the Store Configuration > Sales > Checkout configuration page in admin.</description>
+        </annotations>
         <arguments>
             <argument name="tabGroupAnchor" type="string" defaultValue=""/>
         </arguments>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminSelectClearShoppingCartConfigurationActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminSelectClearShoppingCartConfigurationActionGroup.xml
new file mode 100644
index 0000000000000..7d9cc0ca90d4e
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/AdminSelectClearShoppingCartConfigurationActionGroup.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="AdminSelectClearShoppingCartConfigurationActionGroup">
+        <annotations>
+            <description>Enable/Disable clear shopping cart store configuration using UI.</description>
+        </annotations>
+        <arguments>
+            <argument name="value" type="string" defaultValue="{{EnableClearShoppingCart.textValue}}"/>
+        </arguments>
+        <waitForElementVisible selector="{{AdminCheckoutConfigSection.clearShoppingCartEnabledInherit}}" stepKey="waitForClearShoppingCartEnabledInherit" />
+        <uncheckOption selector="{{AdminCheckoutConfigSection.clearShoppingCartEnabledInherit}}" stepKey="uncheckUseSystem" />
+        <waitForElementVisible selector="{{AdminCheckoutConfigSection.clearShoppingCartEnabled}}" stepKey="waitForClearShoppingCartEnabled" />
+        <selectOption selector="{{AdminCheckoutConfigSection.clearShoppingCartEnabled}}" userInput="{{value}}" stepKey="fillClearShoppingCartEnabled" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontClearShoppingCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontClearShoppingCartActionGroup.xml
new file mode 100644
index 0000000000000..2582cba5a6871
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontClearShoppingCartActionGroup.xml
@@ -0,0 +1,27 @@
+<?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="StorefrontClearShoppingCartActionGroup">
+        <annotations>
+            <description>Clicks the Clear Shopping Cart button on the storefront on the shopping cart page and verifies shopping cart gets emptied.</description>
+        </annotations>
+
+        <waitForElementVisible selector="{{CheckoutCartProductSection.emptyCartButton}}" stepKey="waitForEmptyCartButton"/>
+        <click selector="{{CheckoutCartProductSection.emptyCartButton}}" stepKey="clickEmptyCartButton"/>
+        <waitForElementVisible selector="{{CheckoutCartProductSection.modalMessage}}" stepKey="waitForModalMessage"/>
+        <waitForText selector="{{CheckoutCartProductSection.modalMessage}}" userInput="Are you sure you want to remove all items from your shopping cart?" stepKey="waitForTextModalMessage"/>
+        <waitForElementVisible selector="{{CheckoutCartProductSection.modalConfirmButton}}" stepKey="waitForModalConfirmButton"/>
+        <click selector="{{CheckoutCartProductSection.modalConfirmButton}}" stepKey="clickModalConfirmButton"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <seeCurrentUrlEquals url="{{_ENV.MAGENTO_BASE_URL}}checkout/cart" stepKey="seeCurrentUrlEqualsCartPage"/>
+        <waitForText selector="{{CheckoutCartMessageSection.emptyCartMessage}}" userInput="You have no items in your shopping cart." stepKey="waitForEmptyCartMessage"/>
+
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Data/ConfigData.xml b/app/code/Magento/Checkout/Test/Mftf/Data/ConfigData.xml
index bf488617c7d1d..9ab8a64c9ab88 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Data/ConfigData.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Data/ConfigData.xml
@@ -105,10 +105,12 @@
         <data key="path">checkout/cart/enable_clear_shopping_cart</data>
         <data key="label">Display clear shopping cart button on the cart page</data>
         <data key="value">1</data>
+        <data key="textValue">Yes</data>
     </entity>
     <entity name="DisableClearShoppingCart">
         <data key="path">checkout/cart/enable_clear_shopping_cart</data>
         <data key="label">Do not display clear shopping cart button on the cart page</data>
         <data key="value">0</data>
+        <data key="textValue">No</data>
     </entity>
 </entities>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/AdminCheckoutConfigSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/AdminCheckoutConfigSection.xml
index afb0910025628..72cba8349ec0b 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/AdminCheckoutConfigSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/AdminCheckoutConfigSection.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="AdminCheckoutConfigSection">
-        <element name="clearShoppingCartEnabled" type="select" selector="#checkout_cart_enable_clear_shopping_cart"/>
-        <element name="clearShoppingCartEnabledInherit" type="select" selector="#checkout_cart_enable_clear_shopping_cart_inherit"/>
+        <element name="clearShoppingCartEnabled" type="select" selector="#checkout_cart_enable_clear_shopping_cart" timeout="30"/>
+        <element name="clearShoppingCartEnabledInherit" type="select" selector="#checkout_cart_enable_clear_shopping_cart_inherit" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
index a531f85c81304..293d70df8c8e6 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
@@ -49,6 +49,8 @@
         <element name="checkoutCartSubtotal" type="text" selector="//td[@class='col subtotal']//span[@class='price']"/>
         <element name="emptyCart" selector=".cart-empty" type="text"/>
         <element name="emptyCartButton" selector="#empty_cart_button" type="button"/>
+        <element name="modalMessage" type="text" selector=".modal-popup.confirm._show .modal-content" timeout="30"/>
+        <element name="modalConfirmButton" type="button" selector=".modal-popup.confirm._show .action-accept" timeout="30"/>
         <!-- Required attention section -->
         <element name="removeProductBySku" type="button" selector="//div[contains(., '{{sku}}')]/ancestor::tbody//button" parameterized="true" timeout="30"/>
         <element name="failedItemBySku" type="block" selector="//div[contains(.,'{{sku}}')]/ancestor::tbody" parameterized="true" timeout="30"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutRequisitionConfirmationModalSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutRequisitionConfirmationModalSection.xml
deleted file mode 100644
index 4d814cfe4e04b..0000000000000
--- a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutRequisitionConfirmationModalSection.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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="StorefrontCheckoutRequisitionConfirmationModalSection">
-        <element name="confirm" type="button" selector=".modal-popup.confirm .action-accept"/>
-        <element name="cancel" type="button" selector=".modal-popup.confirm .action-dismiss"/>
-    </section>
-</sections>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/ClearShoppingCartEnableDisableConfigurationTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/ClearShoppingCartEnableDisableConfigurationTest.xml
new file mode 100644
index 0000000000000..5e2690e619436
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/ClearShoppingCartEnableDisableConfigurationTest.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="ClearShoppingCartEnableDisableConfigurationTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Shopping Cart"/>
+            <title value="Enable and Disable Clear Shopping Cart Configuration"/>
+            <description value="Verify that disabling the clear shopping cart store configuration will remove the clear shopping cart configuration button from the storefront's shopping cart page. Verify that enabling the configuration will add the button to the page and that the button functions as expected"/>
+            <group value="shoppingCart"/>
+        </annotations>
+        <before>
+            <!-- Create simple products and category -->
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createProduct1">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="createProduct2">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct1" stepKey="deleteProduct1"/>
+            <deleteData createDataKey="createProduct2" stepKey="deleteProduct2"/>
+
+            <!-- Disable clear shopping cart -->
+            <magentoCLI command="config:set {{DisableClearShoppingCart.path}} {{DisableClearShoppingCart.value}}" stepKey="disableClearShoppingCart"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+
+        <!-- Navigate to sales checkout cart configuration -->
+        <actionGroup ref="AdminOpenSalesCheckoutConfigPageActionGroup" stepKey="openSalesCheckoutCartConfig1">
+            <argument name="tabGroupAnchor" value="#checkout_cart-link"/>
+        </actionGroup>
+
+        <!-- Enable clear shopping cart button -->
+        <actionGroup ref="AdminSelectClearShoppingCartConfigurationActionGroup" stepKey="enableClearShoppingCartButton"/>
+        <actionGroup ref="SaveStoreConfigurationActionGroup" stepKey="saveStoreConfiguration1"/>
+        <actionGroup ref="CliCacheCleanActionGroup" stepKey="cliCacheClean1">
+            <argument name="tags" value=""/>
+        </actionGroup>
+
+        <!-- Open product 1 and add to cart -->
+        <actionGroup ref="StorefrontOpenProductEntityPageActionGroup" stepKey="openProduct1Page1">
+            <argument name="product" value="$$createProduct1$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAddToTheCartActionGroup" stepKey="product1AddToCart"/>
+
+        <!-- Open product 2 and add to cart -->
+        <actionGroup ref="StorefrontOpenProductEntityPageActionGroup" stepKey="openProduct2Page">
+            <argument name="product" value="$$createProduct2$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAddToTheCartActionGroup" stepKey="product2AddToCart"/>
+
+        <!-- Go to shopping cart page -->
+        <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="openShoppingCartPage1"/>
+
+        <!-- Clear shopping cart -->
+        <actionGroup ref="StorefrontClearShoppingCartActionGroup" stepKey="clearShoppingCart"/>
+        <actionGroup ref="AssertMiniCartEmptyActionGroup" stepKey="assertMiniCartEmpty"/>
+
+        <!-- Return to Admin to disable clear shopping cart -->
+        <actionGroup ref="AdminOpenSalesCheckoutConfigPageActionGroup" stepKey="openSalesCheckoutCartConfig2"/>
+        <actionGroup ref="AdminSelectClearShoppingCartConfigurationActionGroup" stepKey="disableClearShoppingCartButton">
+            <argument name="value" value="{{DisableClearShoppingCart.textValue}}"/>
+        </actionGroup>
+        <actionGroup ref="SaveStoreConfigurationActionGroup" stepKey="saveStoreConfiguration2"/>
+        <actionGroup ref="CliCacheCleanActionGroup" stepKey="cliCacheClean2">
+            <argument name="tags" value=""/>
+        </actionGroup>
+
+        <!-- Open product 1 page and add to cart -->
+        <actionGroup ref="StorefrontOpenProductEntityPageActionGroup" stepKey="openProduct1Page2">
+            <argument name="product" value="$$createProduct1$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAddToTheCartActionGroup" stepKey="product1AddToCart2"/>
+
+        <!-- Go to shopping cart and assert clear shopping cart button is not rendered in UI -->
+        <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="openShoppingCartPage2"/>
+        <dontSeeElementInDOM selector="{{CheckoutCartProductSection.emptyCartButton}}" stepKey="dontSeeElementEmptyCartButton"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontClearShoppingCartWithConfirmationModalTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontClearShoppingCartWithConfirmationModalTest.xml
deleted file mode 100644
index c6c76e737633c..0000000000000
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontClearShoppingCartWithConfirmationModalTest.xml
+++ /dev/null
@@ -1,81 +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="StorefrontClearShoppingCartWithConfirmationModalTest">
-        <annotations>
-            <features value="Checkout"/>
-            <stories value="Shopping Cart"/>
-            <title value="Show clear shopping cart button with confirmation modal"/>
-            <description value="Show clear shopping cart button on shopping cart page based on checkout shopping cart stores configuration"/>
-            <group value="shoppingCart"/>
-        </annotations>
-        <before>
-            <!-- Create simple product and category -->
-            <createData entity="_defaultCategory" stepKey="createCategory"/>
-            <createData entity="SimpleProduct" stepKey="createProduct">
-                <requiredEntity createDataKey="createCategory"/>
-            </createData>
-        </before>
-        <after>
-            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-
-            <!-- Disable clear shopping cart -->
-            <magentoCLI command="config:set {{DisableClearShoppingCart.path}} {{DisableClearShoppingCart.value}}" stepKey="disableClearShoppingCart"/>
-        </after>
-
-        <!-- Add the newly created product to the shopping cart -->
-        <actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addToCartFromStorefrontProductPage">
-            <argument name="product" value="$$createProduct$$"/>
-        </actionGroup>
-
-        <!-- Go to the shopping cart -->
-        <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="amOnPageShoppingCart"/>
-
-        <!-- Assert that clear shopping cart button is not rendered on the cart page -->
-        <dontSeeElement selector="{{CheckoutCartProductSection.emptyCartButton}}" stepKey="dontSeeClearShoppingCartButton"/>
-
-        <!-- Open new tab and login as Admin -->
-        <openNewTab stepKey="openNewTab"/>
-        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-
-        <!-- Navigate to sales checkout cart configuration -->
-        <actionGroup ref="AdminOpenSalesCheckoutConfigPageActionGroup" stepKey="openCheckoutCartConfig">
-            <argument name="tabGroupAnchor" value="#checkout_cart-link"/>
-        </actionGroup>
-
-        <!-- Enable clear shopping cart button -->
-        <actionGroup ref="AdminCheckoutClearShoppingCartEnabledActionGroup" stepKey="enableClearShoppingCartButton"/>
-
-        <!-- Flush cache -->
-        <magentoCLI command="cache:flush" stepKey="cacheFlush"/>
-
-        <!-- Switch back to the Cart page tab and refresh the page -->
-        <switchToPreviousTab stepKey="switchToPreviousTab"/>
-        <reloadPage stepKey="refreshPage"/>
-        <waitForPageLoad stepKey="waitForPageReload"/>
-
-        <!-- Assert that empty cart button is rendered on the cart page -->
-        <waitForElementVisible selector="{{CheckoutCartProductSection.emptyCartButton}}" stepKey="waitForClearShoppingCartButton"/>
-        <seeElement selector="{{CheckoutCartProductSection.emptyCartButton}}" stepKey="SeeClearShoppingCartButton"/>
-
-        <!-- Click clear shopping cart button -->
-        <click selector="{{CheckoutCartProductSection.emptyCartButton}}" stepKey="clickClearShoppingCartButton"/>
-
-        <!-- Show confirmation modal -->
-        <waitForElementVisible selector=".modal-popup.confirm" stepKey="waitForRequisitionConfirmationModal"/>
-        <seeElement selector=".modal-popup.confirm" stepKey="seeRequisitionConfirmationModal"/>
-
-        <!-- Confirm modal -->
-        <click selector="{{StorefrontCheckoutRequisitionConfirmationModalSection.confirm}}" stepKey="clickOkRequisitionConfirmationModal"/>
-        <waitForPageLoad stepKey="waitForEmptyShoppingCartPageLoad"/>
-        <waitForText userInput="You have no items in your shopping cart." stepKey="waitForEmptyShoppingCartText"/>
-        <see userInput="You have no items in your shopping cart." stepKey="seeEmptyCartMessage"/>
-    </test>
-</tests>

From adfea2a94dea9739f25c887b32fa4813cb8ffdc3 Mon Sep 17 00:00:00 2001
From: John Carlo Octabio <johncarlo@abovethefray.io>
Date: Mon, 20 Jul 2020 20:50:32 +0800
Subject: [PATCH 0937/1718] magento/magento2#108: Clear Shopping Cart - Updated
 config scope to website, removed showInStore configurable level

---
 app/code/Magento/Checkout/ViewModel/Cart.php       | 2 +-
 app/code/Magento/Checkout/etc/adminhtml/system.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Checkout/ViewModel/Cart.php b/app/code/Magento/Checkout/ViewModel/Cart.php
index e160fc1923b63..2bdfe504d4627 100644
--- a/app/code/Magento/Checkout/ViewModel/Cart.php
+++ b/app/code/Magento/Checkout/ViewModel/Cart.php
@@ -43,7 +43,7 @@ public function isClearShoppingCartEnabled()
     {
         return (bool) $this->_scopeConfig->getValue(
             self::XPATH_CONFIG_ENABLE_CLEAR_SHOPPING_CART,
-            ScopeInterface::SCOPE_STORE
+            ScopeInterface::SCOPE_WEBSITE
         );
     }
 }
diff --git a/app/code/Magento/Checkout/etc/adminhtml/system.xml b/app/code/Magento/Checkout/etc/adminhtml/system.xml
index 7cb1d09417e30..b56566a043c3e 100644
--- a/app/code/Magento/Checkout/etc/adminhtml/system.xml
+++ b/app/code/Magento/Checkout/etc/adminhtml/system.xml
@@ -48,7 +48,7 @@
                     <label>Show Cross-sell Items in the Shopping Cart</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="enable_clear_shopping_cart" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <field id="enable_clear_shopping_cart" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" canRestore="1">
                     <label>Enable Clear Shopping Cart</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>

From af4f6ecb68a14b3c065b6977861ae1a27a4bfb4e Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Mon, 20 Jul 2020 13:08:57 +0300
Subject: [PATCH 0938/1718] MFTF tests updates.

---
 ...ntAssertOnCustomerLoginPageActionGroup.xml |  18 ++++
 ...oginAsCustomerMultishippingLoggingTest.xml | 102 ++++++++++++++++++
 .../AdminLoginAsCustomerUserLogoutTest.xml    |  58 ++++++++++
 ...inLoginAsCustomerUserSingleSessionTest.xml |   2 +-
 4 files changed, 179 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAssertOnCustomerLoginPageActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerMultishippingLoggingTest.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserLogoutTest.xml

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAssertOnCustomerLoginPageActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAssertOnCustomerLoginPageActionGroup.xml
new file mode 100644
index 0000000000000..830d021380b16
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontAssertOnCustomerLoginPageActionGroup.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="StorefrontAssertOnCustomerLoginPageActionGroup">
+        <annotations>
+            <description>Assert on the Storefront Customer Sign-In page.</description>
+        </annotations>
+
+        <seeInCurrentUrl url="{{StorefrontCustomerSignInPage.url}}" stepKey="seeOnSignInPage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerMultishippingLoggingTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerMultishippingLoggingTest.xml
new file mode 100644
index 0000000000000..8e5c121fed157
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerMultishippingLoggingTest.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="AdminLoginAsCustomerMultishippingLoggingTest">
+        <annotations>
+            <features value="Login as Customer"/>
+            <stories value="Place order and reorder"/>
+            <title value="Admin User login as Customer and place Order with Multiple Addresses"/>
+            <description value="Verify that Admin user can place Order with Multiple Addresses using 'Login as customer' functionality "/>
+            <severity value="MAJOR"/>
+            <group value="login_as_customer"/>
+            <group value="multishipping"/>
+            <skip>
+                <issueId value="https://github.com/magento/magento2-login-as-customer/pull/192"/>
+            </skip>
+        </annotations>
+
+        <before>
+            <magentoCLI command="config:set {{EnableFreeShippingMethod.path}} {{EnableFreeShippingMethod.value}}" stepKey="enableFreeShipping"/>
+            <magentoCLI command="config:set {{EnableFlatRateShippingMethod.path}} {{EnableFlatRateShippingMethod.value}}" stepKey="enableFlatRateShipping"/>
+            <magentoCLI command="config:set {{EnableCheckMoneyOrderPaymentMethod.path}} {{EnableCheckMoneyOrderPaymentMethod.value}}" stepKey="enableCheckMoneyOrderPaymentMethod"/>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
+                        stepKey="enableLoginAsCustomer"/>
+            <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0"
+                        stepKey="enableLoginAsCustomerAutoDetection"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
+            <createData entity="SimpleProduct2" stepKey="createProduct1"/>
+            <createData entity="SimpleProduct2" stepKey="createProduct2"/>
+            <createData entity="Simple_US_Customer_Two_Addresses" stepKey="createCustomer"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createProduct1" stepKey="deleteProduct1"/>
+            <deleteData createDataKey="createProduct2" stepKey="deleteProduct2"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearAllOrdersGridFilters"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
+            <magentoCLI command="config:set {{DisableFreeShippingMethod.path}} {{DisableFreeShippingMethod.value}}" stepKey="disableFreeShipping"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
+        </after>
+
+        <!-- Login as Customer from Customer page -->
+        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup"
+                     stepKey="loginAsCustomerFromCustomerPage">
+            <argument name="customerId" value="$$createCustomer.id$$"/>
+        </actionGroup>
+        <!-- Add Products to Cart -->
+        <actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addSimpleProduct1ToCart">
+            <argument name="product" value="$$createProduct1$$"/>
+        </actionGroup>
+        <actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addSimpleProduct2ToCart">
+            <argument name="product" value="$$createProduct2$$"/>
+        </actionGroup>
+
+        <!-- Place Order -->
+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openCart"/>
+        <actionGroup ref="CheckingWithMultipleAddressesActionGroup" stepKey="checkoutWithMultipleAddresses"/>
+        <waitForPageLoad stepKey="waitForShippingInfoPageLoad"/>
+        <actionGroup ref="SelectMultiShippingInfoActionGroup" stepKey="checkoutWithMultipleShipping"/>
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
+        <actionGroup ref="SelectBillingInfoActionGroup" stepKey="checkoutWithPaymentMethod"/>
+        <waitForPageLoad stepKey="waitForReviewOrderPageLoad"/>
+        <actionGroup ref="ReviewOrderForMultiShipmentActionGroup" stepKey="reviewOrderForMultiShipment">
+            <argument name="totalNameForFirstOrder" value="Shipping &amp; Handling"/>
+            <argument name="totalPositionForFirstOrder" value="1"/>
+            <argument name="totalNameForSecondOrder" value="Shipping &amp; Handling"/>
+            <argument name="totalPositionForSecondOrder" value="2"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForPlaceOrderPageLoad"/>
+        <actionGroup ref="StorefrontPlaceOrderForMultipleAddressesActionGroup" stepKey="placeOrder">
+            <argument name="firstOrderPosition" value="1"/>
+            <argument name="secondOrderPosition" value="2"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
+
+        <!-- Assert Storefront Order page contains message about Order created by a Store Administrator -->
+        <actionGroup ref="StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyStorefrontMessageFirstOrder">
+            <argument name="orderId" value="{$getFirstOrderIdPlaceOrder}"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyStorefrontMessageSecondOrder">
+            <argument name="orderId" value="{$getSecondOrderIdPlaceOrder}"/>
+        </actionGroup>
+
+        <!-- Assert Admin Order page contains message about Order created by a Store Administrator -->
+        <actionGroup ref="AdminAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageFirstOrder">
+            <argument name="orderId" value="{$getFirstOrderIdPlaceOrder}"/>
+            <argument name="adminUserFullName" value="Magento User"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageSecondOrder">
+            <argument name="orderId" value="{$getSecondOrderIdPlaceOrder}"/>
+            <argument name="adminUserFullName" value="Magento User"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserLogoutTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserLogoutTest.xml
new file mode 100644
index 0000000000000..4f484e73d580b
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserLogoutTest.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="AdminLoginAsCustomerUserLogoutTest">
+        <annotations>
+            <features value="Login as Customer"/>
+            <stories value="Destroy impersonated customer sessions on admin logout"/>
+            <title
+                value="Login as Customer sessions are ended/invalidated when the related admin session is logged out."/>
+            <description
+                value="Verify Login as Customer session is ended/invalidated when the related admin session is logged out."/>
+            <severity value="MAJOR"/>
+            <group value="login_as_customer"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
+                        stepKey="enableLoginAsCustomer"/>
+            <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0"
+                        stepKey="enableLoginAsCustomerAutoDetection"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDefaultUser"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAfter"/>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0"
+                        stepKey="disableLoginAsCustomer"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
+        </after>
+
+        <!-- Login into Customer account -->
+        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup"
+                     stepKey="loginAsCustomer">
+            <argument name="customerId" value="$$createCustomer.id$$"/>
+        </actionGroup>
+
+        <!-- Assert correctly logged in as Customer -->
+        <actionGroup ref="StorefrontAssertLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromCustomerPage">
+            <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
+            <argument name="customerEmail" value="$$createCustomer.email$$"/>
+        </actionGroup>
+
+        <!-- End Admin session -->
+        <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
+
+        <!-- Assert Customer session invalidated -->
+        <actionGroup ref="StorefrontOpenMyAccountPageActionGroup" stepKey="openCustomerAccountPage"/>
+        <actionGroup ref="StorefrontAssertOnCustomerLoginPageActionGroup" stepKey="AssertOnCustomerLoginPage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserSingleSessionTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserSingleSessionTest.xml
index ad83476beeeda..e4cd48d8e868e 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserSingleSessionTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserSingleSessionTest.xml
@@ -10,7 +10,7 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminLoginAsCustomerUserSingleSessionTest">
         <annotations>
-            <features value="Login фs Customer"/>
+            <features value="Login as Customer"/>
             <stories value="Destroy impersonated customer sessions on admin logout"/>
             <title value="Admin users can have only one 'Login as Customer' session at a time"/>
             <description

From a24b11fd8799e4ffb9ea452f821befb30cdc7577 Mon Sep 17 00:00:00 2001
From: Peter Dohogne <pdohogne@magento.com>
Date: Mon, 20 Jul 2020 09:12:19 -0500
Subject: [PATCH 0939/1718] MC-34399: Removing upgrade script

---
 .../pre_composer_update_2.3.php               | 419 ------------------
 1 file changed, 419 deletions(-)
 delete mode 100644 dev/tools/UpgradeScripts/pre_composer_update_2.3.php

diff --git a/dev/tools/UpgradeScripts/pre_composer_update_2.3.php b/dev/tools/UpgradeScripts/pre_composer_update_2.3.php
deleted file mode 100644
index e6f1ddb31c4a3..0000000000000
--- a/dev/tools/UpgradeScripts/pre_composer_update_2.3.php
+++ /dev/null
@@ -1,419 +0,0 @@
-#!/usr/bin/php
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-$_scriptName = basename(__FILE__);
-
-define(
-    'SYNOPSIS',
-<<<SYNOPSIS
-Updates Magento with 2.3 requirements that can't be done by `composer update` or `bin/magento setup:upgrade`. 
-Run this script after upgrading to PHP 7.1/7.2 and before running `composer update` or `bin/magento setup:upgrade`.
-
-Steps included:
- - Require new version of the metapackage
- - Update "require-dev" section
- - Add "Laminas\\Mvc\\Controller\\": "setup/src/Zend/Mvc/Controller/" to composer.json "autoload":"psr-4" section
- - Update Magento/Updater if it's installed
- - Update name, version, and description fields in the root composer.json 
-
-Usage: php -f $_scriptName -- --root='</path/to/magento/root/>' [--composer='</path/to/composer/executable>'] 
-           [--edition='<community|enterprise>'] [--repo='<composer_repo_url>'] [--version='<version_constraint>']
-           [--help]
-
-Required:
- --root='</path/to/magento/root/>'
-    Path to the Magento installation root directory
-
-Optional:
- --composer='</path/to/composer/executable>'
-    Path to the composer executable
-    - Default: The composer found in the system PATH
-    
- --edition='<community|enterprise>'
-    Target Magento edition for the update.  Open Source = 'community', Commerce = 'enterprise'
-    - Default: The edition currently required in composer.json
-    
- --repo='<composer_repo_url>'
-    The Magento repository url to use to pull the new packages
-    - Default: The Magento repository configured in composer.json
-    
- --version='<version_constraint>'
-    A composer version constraint for allowable 2.3 packages. Versions other than 2.3 are not handled by this script
-    See https://getcomposer.org/doc/articles/versions.md#writing-version-constraints for more information.
-    - Default: The latest 2.3 version available in the Magento repository
-
- --help
-    Display this message
-SYNOPSIS
-);
-
-$opts = getopt('', [
-    'root:',
-    'composer:',
-    'edition:',
-    'repo:',
-    'version:',
-    'help'
-]);
-
-// Log levels available for use with output() function
-define('INFO', 0);
-define('WARN', 1);
-define('ERROR', 2);
-
-if (isset($opts['help'])) {
-    output(SYNOPSIS);
-    exit(0);
-}
-
-try {
-    if (version_compare(PHP_VERSION, '7.1', '<') || version_compare(PHP_VERSION, '7.3', '>=')) {
-        preg_match('/^\d+\.\d+\.\d+/',PHP_VERSION, $matches);
-        $phpVersion = $matches[0];
-        throw new Exception("Invalid PHP version '$phpVersion'. Magento 2.3 requires PHP 7.1 or 7.2");
-    }
-
-    /**** Populate and Validate Settings ****/
-
-    if (empty($opts['root']) || !is_dir($opts['root'])) {
-        throw new BadMethodCallException('Existing Magento root directory must be supplied with --root');
-    }
-    $rootDir = $opts['root'];
-
-    $composerFile = "$rootDir/composer.json";
-    if (!file_exists($composerFile)) {
-        throw new InvalidArgumentException("Supplied Magento root directory '$rootDir' does not contain composer.json");
-    }
-
-    $composerData = json_decode(file_get_contents($composerFile), true);
-
-    $metapackageMatcher = '/^magento\/product\-(?<edition>community|enterprise)\-edition$/';
-    foreach (array_keys($composerData['require']) as $requiredPackage) {
-        if (preg_match($metapackageMatcher, $requiredPackage, $matches)) {
-            $edition = $matches['edition'];
-            break;
-        }
-    }
-    if (empty($edition)) {
-        throw new InvalidArgumentException("No Magento metapackage found in $composerFile");
-    }
-
-    // Override composer.json edition if one is passed to the script
-    if (!empty($opts['edition'])) {
-        $edition = $opts['edition'];
-    }
-    $edition = strtolower($edition);
-
-    if ($edition !== 'community' && $edition !== 'enterprise') {
-        throw new InvalidArgumentException("Only 'community' and 'enterprise' editions allowed; '$edition' given");
-    }
-
-    $composerExec = (!empty($opts['composer']) ? $opts['composer'] : 'composer');
-    if (basename($composerExec, '.phar') != 'composer') {
-        throw new InvalidArgumentException("'$composerExec' is not a composer executable");
-    }
-
-    // Use 'command -v' to check if composer is executable
-    exec("command -v $composerExec", $out, $composerFailed);
-    if ($composerFailed) {
-        if ($composerExec == 'composer') {
-            $message = 'Composer executable is not available in the system PATH';
-        }
-        else {
-            $message = "Invalid composer executable '$composerExec'";
-        }
-        throw new InvalidArgumentException($message);
-    }
-
-    // The composer command uses the Magento root as the working directory so this script can be run from anywhere
-    $composerExec = "$composerExec --working-dir='$rootDir'";
-
-    // Set the version constraint to any 2.3 package if not specified
-    $constraint = !empty($opts['version']) ? $opts['version'] : '2.3.*';
-
-    // Composer package names
-    $project = "magento/project-$edition-edition";
-    $metapackage = "magento/product-$edition-edition";
-
-    // Get the list of potential Magento repositories to search for the update package
-    $mageUrls = [];
-    $authFailed = [];
-    if (!empty($opts['repo'])) {
-        $mageUrls[] = $opts['repo'];
-    }
-    else {
-        foreach ($composerData['repositories'] as $label => $repo) {
-            if (is_string($label) && strpos(strtolower($label), 'mage') !== false || strpos($repo['url'], '.mage') !== false) {
-                $mageUrls[] = $repo['url'];
-            }
-        }
-
-        if (count($mageUrls) == 0) {
-            throw new InvalidArgumentException('No Magento repository urls found in composer.json');
-        }
-    }
-
-    $tempDir = findUnusedFilename($rootDir, 'temp_project');
-    $projectConstraint = "$project='$constraint'";
-    $version = null;
-    $description = null;
-
-    output("**** Searching for a matching version of $project ****");
-
-    // Try to retrieve a 2.3 package from each Magento repository until one is found
-    foreach ($mageUrls as $repoUrl) {
-        try {
-            output("\\nChecking $repoUrl");
-            deleteFilepath($tempDir);
-            runComposer("create-project --repository=$repoUrl $projectConstraint $tempDir --no-install");
-
-            // Make sure the downloaded package is 2.3
-            $newComposer = json_decode(file_get_contents("$tempDir/composer.json"), true);
-            $version = $newComposer['version'];
-            $description = $newComposer['description'];
-
-            if (strpos($version, '2.3.') !== 0) {
-                throw new InvalidArgumentException("Bad 2.3 version constraint '$constraint'; version $version found");
-            }
-
-            // If no errors occurred, set this as the correct repo, forget errors from previous repos, and move forward
-            output("\\n**** Found compatible $project version: $version ****");
-            $repo = $repoUrl;
-            unset($exception);
-            break;
-        }
-        catch (Exception $e) {
-            // If this repository doesn't have a valid package, save the error but continue checking any others
-            output("Failed to find a valid 2.3 $project package on $repoUrl", WARN);
-            $exception = $e;
-        }
-    }
-
-    // If a valid project package hasn't been found, throw the last error
-    if (isset($exception)) {
-        throw $exception;
-    }
-
-    output("\\n**** Executing Updates ****");
-
-    $composerBackup = findUnusedFilename($rootDir, 'composer.json.bak');
-    output("\\nBacking up $composerFile to $composerBackup");
-    copy($composerFile, $composerBackup);
-
-    // Add the repository to composer.json if needed without overwriting any existing ones
-    $repoUrls = array_map(function ($r) { return $r['url']; }, $composerData['repositories']);
-    if (!in_array($repo, $repoUrls)) {
-        $repoLabels = array_map('strtolower',array_keys($composerData['repositories']));
-        $newLabel = 'magento';
-        if (in_array($newLabel, $repoLabels)) {
-            $count = count($repoLabels);
-            for ($i = 1; $i <= $count; $i++) {
-                if (!in_array("$newLabel-$i", $repoLabels)) {
-                    $newLabel = "$newLabel-$i";
-                    break;
-                }
-            }
-        }
-        output("\\nAdding $repo to composer repositories under label '$newLabel'");
-        runComposer("config repositories.$newLabel composer $repo");
-    }
-
-    output("\\nUpdating Magento metapackage requirement to $metapackage=$version");
-    if ($edition == 'enterprise') {
-        // Community -> Enterprise upgrades need to remove the community edition metapackage
-        runComposer('remove magento/product-community-edition --no-update');
-        output('');
-    }
-    runComposer("require $metapackage=$version --no-update");
-
-    output('\nUpdating "require-dev" section of composer.json');
-    runComposer('require --dev ' .
-        'allure-framework/allure-phpunit:~1.2.0 ' .
-        'friendsofphp/php-cs-fixer:~2.14.0 ' .
-        'lusitanian/oauth:~0.8.10 ' .
-        'magento/magento-coding-standard:~3.0.0 ' .
-        'magento/magento2-functional-testing-framework:~2.4.3 ' .
-        'pdepend/pdepend:2.5.2 ' .
-        'phpmd/phpmd:@stable ' .
-        'phpunit/phpunit:~6.5.0 ' .
-        'sebastian/phpcpd:~3.0.0 ' .
-        'squizlabs/php_codesniffer:3.4.0 ' .
-        '--sort-packages --no-update');
-    output('');
-    runComposer('remove --dev sjparkinson/static-review fabpot/php-cs-fixer --no-update');
-
-    output('\nAdding "Zend\\\\Mvc\\\\Controller\\\\": "setup/src/Zend/Mvc/Controller/" to "autoload": "psr-4"');
-    $composerData['autoload']['psr-4']['Laminas\\Mvc\\Controller\\'] = 'setup/src/Zend/Mvc/Controller/';
-
-    if (preg_match('/^magento\/project\-(community|enterprise)\-edition$/', $composerData['name'])) {
-        output('\nUpdating project name, version, and description');
-        $composerData['name'] = $project;
-        $composerData['version'] = $version;
-        $composerData['description'] = $description;
-    }
-
-    file_put_contents($composerFile, json_encode($composerData, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT));
-
-    // Update Magento/Updater if it's installed
-    $updateDir = "$rootDir/update";
-    if (file_exists($updateDir)) {
-        $updateBackup = findUnusedFilename($rootDir, 'update.bak');
-        output("\\nBacking up Magento/Updater directory $updateDir to $updateBackup");
-        rename($updateDir, $updateBackup);
-        output('\nUpdating Magento/Updater');
-        rename("$tempDir/update", $updateDir);
-    }
-
-    // Remove temp project directory that was used for repo/version validation and new source for Magento/Updater
-    deleteFilepath($tempDir);
-
-    output("\\n**** Script Complete! $composerFile updated to Magento version $version ****");
-    if (count($authFailed) > 0) {
-        output('Repository authentication failures occurred!', WARN);
-        output(' * Failed authentication could result in incorrect package versions', WARN);
-        output(' * To resolve, add credentials for the repositories to auth.json', WARN);
-        output(' * URL(s) failing authentication: ' . join(', ', array_keys($authFailed)), WARN);
-    }
-} catch (Exception $e) {
-    if ($e->getPrevious()) {
-        $e = $e->getPrevious();
-    }
-
-    try {
-        output($e->getMessage(), ERROR, get_class($e));
-        output('Script failed! See usage information with --help', ERROR);
-
-        if (isset($composerBackup) && file_exists($composerBackup)) {
-            output("Resetting $composerFile backup");
-            deleteFilepath($composerFile);
-            rename($composerBackup, $composerFile);
-        }
-        if (isset($updateBackup) && file_exists($updateBackup)) {
-            output("Resetting $updateDir backup");
-            deleteFilepath($updateDir);
-            rename($updateBackup, $updateDir);
-        }
-        if (isset($tempDir) && file_exists($tempDir)) {
-            output('Removing temporary project directory');
-            deleteFilepath($tempDir);
-        }
-    }
-    catch (Exception $e2) {
-        output($e2->getMessage(), ERROR, get_class($e2));
-        output('Backup restoration or directory cleanup failed', ERROR);
-    }
-
-    exit($e->getCode() == 0 ? 1 : $e->getCode());
-}
-
-/**
- * Gets a variant of a filename that doesn't already exist so we don't overwrite anything
- *
- * @param string $dir
- * @param string $filename
- * @return string
- */
-function findUnusedFilename($dir, $filename) {
-    $unique = "$dir/$filename";
-    if (file_exists($unique)) {
-        $unique = tempnam($dir, "$filename.");
-        unlink($unique);
-    }
-    return $unique;
-}
-
-/**
- * Execute a composer command, reload $composerData afterwards, and check for repo authentication warnings
- *
- * @param string $command
- * @return array Command output split by lines
- * @throws RuntimeException
- */
-function runComposer($command)
-{
-    global $composerExec, $composerData, $composerFile, $authFailed;
-    $command = "$composerExec $command --no-interaction";
-    output(" Running command:\\n  $command");
-    exec("$command 2>&1", $lines, $exitCode);
-    $output = '    ' . join('\n    ', $lines);
-
-    // Reload composer object from the updated composer.json
-    $composerData = json_decode(file_get_contents($composerFile), true);
-
-    if (0 !== $exitCode) {
-        $output = "Error encountered running command:\\n $command\\n$output";
-        throw new RuntimeException($output, $exitCode);
-    }
-    output($output);
-
-    if (strpos($output, 'URL required authentication.') !== false) {
-        preg_match("/'(https?:\/\/)?(?<url>[^\/']+)(\/[^']*)?' URL required authentication/", $output, $matches);
-        $authUrl = $matches['url'];
-        $authFailed[$authUrl] = 1;
-        output("Repository authentication failed; make sure '$authUrl' exists in auth.json", WARN);
-    }
-
-    return $lines;
-}
-
-/**
- * Deletes a file or a directory and all its contents
- *
- * @param string $path
- * @throws Exception
- */
-function deleteFilepath($path) {
-    if (!file_exists($path)) {
-        return;
-    }
-    if (is_dir($path)) {
-        $files = array_diff(scandir($path), array('..', '.'));
-        foreach ($files as $file) {
-            deleteFilepath("$path/$file");
-        }
-        rmdir($path);
-    }
-    else {
-        unlink($path);
-    }
-    if (file_exists($path)) {
-        throw new Exception("Failed to delete $path");
-    }
-}
-
-/**
- * Logs the given text with \n newline replacement and log level formatting
- *
- * @param string $string Text to log
- * @param int $level One of INFO, WARN, or ERROR
- * @param string $label Optional message label; defaults to WARNING for $level = WARN and ERROR for $level = ERROR
- */
-function output($string, $level = INFO, $label = '') {
-    $string = str_replace('\n', PHP_EOL, $string);
-
-    if (!empty($label)) {
-        $label = "$label: ";
-    }
-    else if ($level == WARN) {
-        $label = 'WARNING: ';
-    }
-    else if ($level == ERROR) {
-        $label = 'ERROR: ';
-    }
-    $string = "$label$string";
-
-    if ($level == WARN) {
-        error_log($string);
-    }
-    elseif ($level == ERROR) {
-        error_log(PHP_EOL . $string);
-    }
-    else {
-        echo $string . PHP_EOL;
-    }
-}

From 52fb7a7aa911ad491a9e8c23f979e8582e31cbb8 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Mon, 20 Jul 2020 17:59:08 +0200
Subject: [PATCH 0940/1718] Error handling performance improvements

---
 .../Quote/Model/Cart/AddProductsToCart.php    | 25 +++++++------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php b/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
index 18d27a29b8ae1..a9bc48994b380 100644
--- a/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
+++ b/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
@@ -38,7 +38,7 @@ class AddProductsToCart
     private const MESSAGE_CODES = [
         'Could not find a product with SKU' => self::ERROR_PRODUCT_NOT_FOUND,
         'The required options you selected are not available' => self::ERROR_NOT_SALABLE,
-        'Product that you are trying to add is not available' => self::ERROR_NOT_SALABLE,
+        'Product that you are trying to add is not available.' => self::ERROR_NOT_SALABLE,
         'This product is out of stock' => self::ERROR_NOT_SALABLE,
         'There are no source items' => self::ERROR_NOT_SALABLE,
         'The fewest you may purchase is' => self::ERROR_INSUFFICIENT_STOCK,
@@ -102,8 +102,8 @@ public function execute(string $maskedCartId, array $cartItems): AddProductsToCa
         $cartId = $this->maskedQuoteIdToQuoteId->execute($maskedCartId);
         $cart = $this->cartRepository->get($cartId);
 
-        foreach ($cartItems as $n => $cartItem) {
-            $this->addItemToCart($cart, $cartItem, $n);
+        foreach ($cartItems as $cartItemPosition => $cartItem) {
+            $this->addItemToCart($cart, $cartItem, $cartItemPosition);
         }
         if ($cart->getData('has_error')) {
             $errors = $cart->getErrors();
@@ -190,21 +190,14 @@ private function addError(string $message, int $cartItemPosition = 0): void
      */
     private function getErrorCode(string $message): string
     {
-        $code = self::ERROR_UNDEFINED;
-
-        $matchedCodes = array_filter(
-            self::MESSAGE_CODES,
-            function ($key) use ($message) {
-                return false !== strpos($message, $key);
-            },
-            ARRAY_FILTER_USE_KEY
-        );
-
-        if (!empty($matchedCodes)) {
-            $code = current($matchedCodes);
+        foreach (self::MESSAGE_CODES as $codeMessage => $code) {
+            if (false !== stripos($codeMessage, $message)) {
+                return $code;
+            }
         }
 
-        return $code;
+        /* If no code was matched, return the default one */
+        return self::ERROR_UNDEFINED;
     }
 
     /**

From 83bce6711e99ab4795a5dd190b998f67c2ae8875 Mon Sep 17 00:00:00 2001
From: Anusha Vattam <avattam@adobe.com>
Date: Mon, 20 Jul 2020 11:32:36 -0500
Subject: [PATCH 0941/1718] MC-35653:MyAccount :: Order Details :: Payments
 Methods, shipping address, billing address by Order Number

- Added review comment on naming change
---
 app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php b/app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php
index dfeaf7c06ec54..4dcdeb0d95373 100644
--- a/app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php
+++ b/app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php
@@ -26,7 +26,7 @@ public function getOrderShippingAddress(
     ): ?array {
         $shippingAddress = null;
         if ($order->getShippingAddress()) {
-            $shippingAddress = $this->orderAddressDataFormatter($order->getShippingAddress());
+            $shippingAddress = $this->formatAddressData($order->getShippingAddress());
         }
         return $shippingAddress;
     }
@@ -42,7 +42,7 @@ public function getOrderBillingAddress(
     ): ?array {
         $billingAddress = null;
         if ($order->getBillingAddress()) {
-            $billingAddress = $this->orderAddressDataFormatter($order->getBillingAddress());
+            $billingAddress = $this->formatAddressData($order->getBillingAddress());
         }
         return $billingAddress;
     }
@@ -53,7 +53,7 @@ public function getOrderBillingAddress(
      * @param OrderAddressInterface $orderAddress
      * @return array
      */
-    private function orderAddressDataFormatter(
+    private function formatAddressData(
         OrderAddressInterface $orderAddress
     ): array {
         return

From 19af792cb315a6f3a84270b80d4f93fe6814a13a Mon Sep 17 00:00:00 2001
From: mage2-team <mage2-team@magento.com>
Date: Mon, 20 Jul 2020 09:52:17 -0700
Subject: [PATCH 0942/1718] COMOPS-1042: 2.4.0 packaging

 (build 2.4.0.080)
---
 app/code/Magento/AdminAnalytics/composer.json |  13 +-
 .../Magento/AdminNotification/composer.json   |  15 +-
 .../AdvancedPricingImportExport/composer.json |  19 +-
 app/code/Magento/AdvancedSearch/composer.json |  19 +-
 app/code/Magento/Amqp/composer.json           |   9 +-
 app/code/Magento/AmqpStore/composer.json      |  13 +-
 app/code/Magento/Analytics/composer.json      |  13 +-
 .../AsynchronousOperations/composer.json      |  19 +-
 app/code/Magento/Authorization/composer.json  |   7 +-
 app/code/Magento/Backend/composer.json        |  39 +-
 app/code/Magento/Backup/composer.json         |  11 +-
 app/code/Magento/Bundle/composer.json         |  41 +-
 app/code/Magento/BundleGraphQl/composer.json  |  17 +-
 .../Magento/BundleImportExport/composer.json  |  17 +-
 .../Magento/CacheInvalidate/composer.json     |   7 +-
 app/code/Magento/Captcha/composer.json        |  13 +-
 .../Magento/CardinalCommerce/composer.json    |  11 +-
 app/code/Magento/Catalog/composer.json        |  61 +-
 .../Magento/CatalogAnalytics/composer.json    |   9 +-
 .../Magento/CatalogCmsGraphQl/composer.json   |  15 +-
 .../CatalogCustomerGraphQl/composer.json      |  13 +-
 app/code/Magento/CatalogGraphQl/composer.json |  25 +-
 .../Magento/CatalogImportExport/composer.json |  25 +-
 .../Magento/CatalogInventory/composer.json    |  19 +-
 .../CatalogInventoryGraphQl/composer.json     |  11 +-
 app/code/Magento/CatalogRule/composer.json    |  23 +-
 .../CatalogRuleConfigurable/composer.json     |  13 +-
 .../Magento/CatalogRuleGraphQl/composer.json  |   7 +-
 app/code/Magento/CatalogSearch/composer.json  |  29 +-
 .../Magento/CatalogUrlRewrite/composer.json   |  23 +-
 .../CatalogUrlRewriteGraphQl/composer.json    |  15 +-
 app/code/Magento/CatalogWidget/composer.json  |  23 +-
 app/code/Magento/Checkout/composer.json       |  43 +-
 .../Magento/CheckoutAgreements/composer.json  |  13 +-
 .../CheckoutAgreementsGraphQl/composer.json   |  11 +-
 app/code/Magento/Cms/composer.json            |  25 +-
 app/code/Magento/CmsGraphQl/composer.json     |  17 +-
 app/code/Magento/CmsUrlRewrite/composer.json  |  11 +-
 .../CmsUrlRewriteGraphQl/composer.json        |  15 +-
 app/code/Magento/Config/composer.json         |  19 +-
 .../ConfigurableImportExport/composer.json    |  17 +-
 .../Magento/ConfigurableProduct/composer.json |  41 +-
 .../ConfigurableProductGraphQl/composer.json  |  15 +-
 .../ConfigurableProductSales/composer.json    |  13 +-
 app/code/Magento/Contact/composer.json        |  13 +-
 app/code/Magento/Cookie/composer.json         |   9 +-
 app/code/Magento/Cron/composer.json           |   9 +-
 app/code/Magento/Csp/composer.json            |   7 +-
 app/code/Magento/CurrencySymbol/composer.json |  15 +-
 app/code/Magento/Customer/composer.json       |  45 +-
 .../Magento/CustomerAnalytics/composer.json   |   9 +-
 .../CustomerDownloadableGraphQl/composer.json |  11 +-
 .../Magento/CustomerGraphQl/composer.json     |  21 +-
 .../CustomerImportExport/composer.json        |  17 +-
 app/code/Magento/Deploy/composer.json         |  13 +-
 app/code/Magento/Developer/composer.json      |   9 +-
 app/code/Magento/Dhl/composer.json            |  25 +-
 app/code/Magento/Directory/composer.json      |  11 +-
 .../Magento/DirectoryGraphQl/composer.json    |  11 +-
 app/code/Magento/Downloadable/composer.json   |  39 +-
 .../Magento/DownloadableGraphQl/composer.json |  15 +-
 .../DownloadableImportExport/composer.json    |  17 +-
 app/code/Magento/Eav/composer.json            |  15 +-
 app/code/Magento/EavGraphQl/composer.json     |   9 +-
 app/code/Magento/Elasticsearch/composer.json  |  23 +-
 app/code/Magento/Elasticsearch6/composer.json |  15 +-
 app/code/Magento/Elasticsearch7/composer.json |  15 +-
 app/code/Magento/Email/composer.json          |  25 +-
 app/code/Magento/EncryptionKey/composer.json  |   9 +-
 app/code/Magento/Fedex/composer.json          |  21 +-
 app/code/Magento/GiftMessage/composer.json    |  25 +-
 app/code/Magento/GoogleAdwords/composer.json  |   9 +-
 .../Magento/GoogleAnalytics/composer.json     |  13 +-
 .../Magento/GoogleOptimizer/composer.json     |  17 +-
 app/code/Magento/GraphQl/composer.json        |  11 +-
 app/code/Magento/GraphQlCache/composer.json   |   9 +-
 .../GroupedCatalogInventory/composer.json     |  11 +-
 .../Magento/GroupedImportExport/composer.json |  15 +-
 app/code/Magento/GroupedProduct/composer.json |  33 +-
 .../GroupedProductGraphQl/composer.json       |  11 +-
 app/code/Magento/ImportExport/composer.json   |  17 +-
 app/code/Magento/Indexer/composer.json        |   7 +-
 .../Magento/InstantPurchase/composer.json     |  19 +-
 app/code/Magento/Integration/composer.json    |  19 +-
 .../Magento/LayeredNavigation/composer.json   |   9 +-
 .../Magento/LoginAsCustomer/composer.json     |  15 +-
 .../LoginAsCustomerAdminUi/composer.json      |  21 +-
 .../Magento/LoginAsCustomerApi/composer.json  |   9 +-
 .../LoginAsCustomerFrontendUi/composer.json   |  15 +-
 .../Magento/LoginAsCustomerLog/composer.json  |  21 +-
 .../LoginAsCustomerPageCache/composer.json    |  15 +-
 .../LoginAsCustomerQuote/composer.json        |  13 +-
 .../LoginAsCustomerSales/composer.json        |  13 +-
 app/code/Magento/Marketplace/composer.json    |   7 +-
 app/code/Magento/MediaContent/composer.json   |   9 +-
 .../Magento/MediaContentApi/composer.json     |   7 +-
 .../Magento/MediaContentCatalog/composer.json |  11 +-
 .../Magento/MediaContentCms/composer.json     |   9 +-
 app/code/Magento/MediaGallery/composer.json   |   9 +-
 .../Magento/MediaGalleryApi/composer.json     |   5 +-
 .../Magento/MediaGalleryCatalog/composer.json |   9 +-
 app/code/Magento/MediaStorage/composer.json   |  21 +-
 app/code/Magento/MessageQueue/composer.json   |   7 +-
 app/code/Magento/Msrp/composer.json           |  19 +-
 .../MsrpConfigurableProduct/composer.json     |  11 +-
 .../Magento/MsrpGroupedProduct/composer.json  |  11 +-
 app/code/Magento/Multishipping/composer.json  |  23 +-
 app/code/Magento/MysqlMq/composer.json        |   9 +-
 .../Magento/NewRelicReporting/composer.json   |  17 +-
 app/code/Magento/Newsletter/composer.json     |  23 +-
 .../Magento/OfflinePayments/composer.json     |  11 +-
 .../Magento/OfflineShipping/composer.json     |  27 +-
 app/code/Magento/PageCache/composer.json      |  11 +-
 app/code/Magento/Payment/composer.json        |  19 +-
 app/code/Magento/Paypal/composer.json         |  39 +-
 app/code/Magento/PaypalCaptcha/composer.json  |  13 +-
 app/code/Magento/PaypalGraphQl/composer.json  |  21 +-
 app/code/Magento/Persistent/composer.json     |  17 +-
 app/code/Magento/ProductAlert/composer.json   |  17 +-
 app/code/Magento/ProductVideo/composer.json   |  19 +-
 app/code/Magento/Quote/composer.json          |  35 +-
 app/code/Magento/QuoteAnalytics/composer.json |   9 +-
 app/code/Magento/QuoteGraphQl/composer.json   |  25 +-
 .../RelatedProductGraphQl/composer.json       |  11 +-
 .../Magento/ReleaseNotification/composer.json |  13 +-
 app/code/Magento/Reports/composer.json        |  37 +-
 app/code/Magento/RequireJs/composer.json      |   5 +-
 app/code/Magento/Review/composer.json         |  25 +-
 .../Magento/ReviewAnalytics/composer.json     |   9 +-
 app/code/Magento/Robots/composer.json         |   9 +-
 app/code/Magento/Rss/composer.json            |  11 +-
 app/code/Magento/Rule/composer.json           |  13 +-
 app/code/Magento/Sales/composer.json          |  55 +-
 app/code/Magento/SalesAnalytics/composer.json |   9 +-
 app/code/Magento/SalesGraphQl/composer.json   |   9 +-
 app/code/Magento/SalesInventory/composer.json |  13 +-
 app/code/Magento/SalesRule/composer.json      |  45 +-
 app/code/Magento/SalesSequence/composer.json  |   5 +-
 app/code/Magento/SampleData/composer.json     |   7 +-
 app/code/Magento/Search/composer.json         |  15 +-
 app/code/Magento/Security/composer.json       |  13 +-
 app/code/Magento/SendFriend/composer.json     |  17 +-
 .../Magento/SendFriendGraphQl/composer.json   |  11 +-
 app/code/Magento/Shipping/composer.json       |  37 +-
 app/code/Magento/Sitemap/composer.json        |  25 +-
 app/code/Magento/Store/composer.json          |  23 +-
 app/code/Magento/StoreGraphQl/composer.json   |   9 +-
 app/code/Magento/Swagger/composer.json        |   5 +-
 app/code/Magento/SwaggerWebapi/composer.json  |   7 +-
 .../Magento/SwaggerWebapiAsync/composer.json  |   9 +-
 app/code/Magento/Swatches/composer.json       |  29 +-
 .../Magento/SwatchesGraphQl/composer.json     |  11 +-
 .../SwatchesLayeredNavigation/composer.json   |   5 +-
 app/code/Magento/Tax/composer.json            |  35 +-
 app/code/Magento/TaxGraphQl/composer.json     |   9 +-
 .../Magento/TaxImportExport/composer.json     |  15 +-
 app/code/Magento/Theme/composer.json          |  31 +-
 app/code/Magento/ThemeGraphQl/composer.json   |   7 +-
 app/code/Magento/Tinymce3/composer.json       |  15 +-
 app/code/Magento/Translation/composer.json    |  15 +-
 app/code/Magento/Ui/composer.json             |  17 +-
 app/code/Magento/Ups/composer.json            |  21 +-
 app/code/Magento/UrlRewrite/composer.json     |  19 +-
 .../Magento/UrlRewriteGraphQl/composer.json   |   9 +-
 app/code/Magento/User/composer.json           |  19 +-
 app/code/Magento/Usps/composer.json           |  21 +-
 app/code/Magento/Variable/composer.json       |  13 +-
 app/code/Magento/Vault/composer.json          |  19 +-
 app/code/Magento/VaultGraphQl/composer.json   |   9 +-
 app/code/Magento/Version/composer.json        |   5 +-
 app/code/Magento/Webapi/composer.json         |  17 +-
 app/code/Magento/WebapiAsync/composer.json    |  15 +-
 app/code/Magento/WebapiSecurity/composer.json |   7 +-
 app/code/Magento/Weee/composer.json           |  31 +-
 app/code/Magento/WeeeGraphQl/composer.json    |  13 +-
 app/code/Magento/Widget/composer.json         |  21 +-
 app/code/Magento/Wishlist/composer.json       |  39 +-
 .../Magento/WishlistAnalytics/composer.json   |   9 +-
 .../Magento/WishlistGraphQl/composer.json     |  11 +-
 .../adminhtml/Magento/backend/composer.json   |   5 +-
 .../frontend/Magento/blank/composer.json      |   5 +-
 .../frontend/Magento/luma/composer.json       |   7 +-
 app/i18n/Magento/de_DE/composer.json          |   5 +-
 app/i18n/Magento/en_US/composer.json          |   5 +-
 app/i18n/Magento/es_ES/composer.json          |   5 +-
 app/i18n/Magento/fr_FR/composer.json          |   5 +-
 app/i18n/Magento/nl_NL/composer.json          |   5 +-
 app/i18n/Magento/pt_BR/composer.json          |   5 +-
 app/i18n/Magento/zh_Hans_CN/composer.json     |   5 +-
 composer.json                                 | 389 ++++----
 composer.lock                                 | 861 ++++++++++--------
 .../Magento/Framework/Amqp/composer.json      |   5 +-
 .../Magento/Framework/Bulk/composer.json      |   5 +-
 .../Framework/MessageQueue/composer.json      |   5 +-
 lib/internal/Magento/Framework/composer.json  |   3 +-
 195 files changed, 2327 insertions(+), 2006 deletions(-)

diff --git a/app/code/Magento/AdminAnalytics/composer.json b/app/code/Magento/AdminAnalytics/composer.json
index cf60b1d88ae55..5f92f9d706fd4 100644
--- a/app/code/Magento/AdminAnalytics/composer.json
+++ b/app/code/Magento/AdminAnalytics/composer.json
@@ -6,11 +6,11 @@
     },
     "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": [
@@ -24,5 +24,6 @@
         "psr-4": {
             "Magento\\AdminAnalytics\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json
index d421fc869621b..b579f61dbc900 100644
--- a/app/code/Magento/AdminNotification/composer.json
+++ b/app/code/Magento/AdminNotification/composer.json
@@ -7,12 +7,12 @@
     "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": [
@@ -26,5 +26,6 @@
         "psr-4": {
             "Magento\\AdminNotification\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/AdvancedPricingImportExport/composer.json b/app/code/Magento/AdvancedPricingImportExport/composer.json
index ea6a39fba2c3d..9954b6484ad42 100644
--- a/app/code/Magento/AdvancedPricingImportExport/composer.json
+++ b/app/code/Magento/AdvancedPricingImportExport/composer.json
@@ -6,14 +6,14 @@
     },
     "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": [
@@ -27,5 +27,6 @@
         "psr-4": {
             "Magento\\AdvancedPricingImportExport\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/AdvancedSearch/composer.json b/app/code/Magento/AdvancedSearch/composer.json
index 720309b619e43..c90d97312d7a7 100644
--- a/app/code/Magento/AdvancedSearch/composer.json
+++ b/app/code/Magento/AdvancedSearch/composer.json
@@ -5,14 +5,14 @@
         "sort-packages": true
     },
     "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",
@@ -27,5 +27,6 @@
         "psr-4": {
             "Magento\\AdvancedSearch\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Amqp/composer.json b/app/code/Magento/Amqp/composer.json
index 9e7a035112b04..e35a4b9307b3e 100644
--- a/app/code/Magento/Amqp/composer.json
+++ b/app/code/Magento/Amqp/composer.json
@@ -5,9 +5,9 @@
         "sort-packages": true
     },
     "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",
@@ -22,5 +22,6 @@
         "psr-4": {
             "Magento\\Amqp\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/AmqpStore/composer.json b/app/code/Magento/AmqpStore/composer.json
index 70a10810ece21..f361806fb50ca 100644
--- a/app/code/Magento/AmqpStore/composer.json
+++ b/app/code/Magento/AmqpStore/composer.json
@@ -5,14 +5,14 @@
         "sort-packages": true
     },
     "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": [
@@ -26,5 +26,6 @@
         "psr-4": {
             "Magento\\AmqpStore\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Analytics/composer.json b/app/code/Magento/Analytics/composer.json
index 84f8af066bf11..5824ce3e240b4 100644
--- a/app/code/Magento/Analytics/composer.json
+++ b/app/code/Magento/Analytics/composer.json
@@ -3,11 +3,11 @@
     "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": "*"
+        "magento/module-backend": "102.0.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-integration": "100.4.*",
+        "magento/module-store": "101.1.*",
+        "magento/framework": "103.0.*"
     },
     "type": "magento2-module",
     "license": [
@@ -21,5 +21,6 @@
         "psr-4": {
             "Magento\\Analytics\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/AsynchronousOperations/composer.json b/app/code/Magento/AsynchronousOperations/composer.json
index b5de631418e72..ec4c221c239cc 100644
--- a/app/code/Magento/AsynchronousOperations/composer.json
+++ b/app/code/Magento/AsynchronousOperations/composer.json
@@ -5,17 +5,17 @@
         "sort-packages": true
     },
     "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-logging": "*"
+        "magento/module-admin-notification": "100.4.*",
+        "magento/module-logging": "101.2.*"
     },
     "type": "magento2-module",
     "license": [
@@ -29,5 +29,6 @@
         "psr-4": {
             "Magento\\AsynchronousOperations\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Authorization/composer.json b/app/code/Magento/Authorization/composer.json
index 401444404ca3e..4a586a3d24e9c 100644
--- a/app/code/Magento/Authorization/composer.json
+++ b/app/code/Magento/Authorization/composer.json
@@ -6,8 +6,8 @@
     },
     "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": [
@@ -21,5 +21,6 @@
         "psr-4": {
             "Magento\\Authorization\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json
index ee5491057d861..623c58c9827f4 100644
--- a/app/code/Magento/Backend/composer.json
+++ b/app/code/Magento/Backend/composer.json
@@ -6,26 +6,26 @@
     },
     "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": [
@@ -39,5 +39,6 @@
         "psr-4": {
             "Magento\\Backend\\": ""
         }
-    }
+    },
+    "version": "102.0.0"
 }
diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json
index 9a5904beda550..1cb489eef2f3a 100644
--- a/app/code/Magento/Backup/composer.json
+++ b/app/code/Magento/Backup/composer.json
@@ -6,10 +6,10 @@
     },
     "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": [
@@ -23,5 +23,6 @@
         "psr-4": {
             "Magento\\Backup\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Bundle/composer.json b/app/code/Magento/Bundle/composer.json
index 1b5ca24ee098c..9cd1e7e331502 100644
--- a/app/code/Magento/Bundle/composer.json
+++ b/app/code/Magento/Bundle/composer.json
@@ -6,27 +6,27 @@
     },
     "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": [
@@ -40,5 +40,6 @@
         "psr-4": {
             "Magento\\Bundle\\": ""
         }
-    }
+    },
+    "version": "101.0.0"
 }
diff --git a/app/code/Magento/BundleGraphQl/composer.json b/app/code/Magento/BundleGraphQl/composer.json
index cb49ab78588b3..47d8fcc1aeb88 100644
--- a/app/code/Magento/BundleGraphQl/composer.json
+++ b/app/code/Magento/BundleGraphQl/composer.json
@@ -4,13 +4,13 @@
     "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/framework": "*"
+        "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/framework": "103.0.*"
     },
     "license": [
         "OSL-3.0",
@@ -23,5 +23,6 @@
         "psr-4": {
             "Magento\\BundleGraphQl\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/BundleImportExport/composer.json b/app/code/Magento/BundleImportExport/composer.json
index faca3eac9a721..7fcc00b096ed4 100644
--- a/app/code/Magento/BundleImportExport/composer.json
+++ b/app/code/Magento/BundleImportExport/composer.json
@@ -6,13 +6,13 @@
     },
     "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": [
@@ -26,5 +26,6 @@
         "psr-4": {
             "Magento\\BundleImportExport\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/CacheInvalidate/composer.json b/app/code/Magento/CacheInvalidate/composer.json
index 7801554c890e1..e3f021f24d1a1 100644
--- a/app/code/Magento/CacheInvalidate/composer.json
+++ b/app/code/Magento/CacheInvalidate/composer.json
@@ -6,8 +6,8 @@
     },
     "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": [
@@ -21,5 +21,6 @@
         "psr-4": {
             "Magento\\CacheInvalidate\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json
index a6ee83d3f0924..c45119bff4b7a 100644
--- a/app/code/Magento/Captcha/composer.json
+++ b/app/code/Magento/Captcha/composer.json
@@ -6,11 +6,11 @@
     },
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-checkout": "*",
-        "magento/module-customer": "*",
-        "magento/module-store": "*",
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-checkout": "100.4.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-store": "101.1.*",
         "laminas/laminas-captcha": "^2.7.1",
         "laminas/laminas-db": "^2.8.2",
         "laminas/laminas-session": "^2.7.3"
@@ -27,5 +27,6 @@
         "psr-4": {
             "Magento\\Captcha\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/CardinalCommerce/composer.json b/app/code/Magento/CardinalCommerce/composer.json
index 8b2989ef915e1..c2fcc19baa926 100644
--- a/app/code/Magento/CardinalCommerce/composer.json
+++ b/app/code/Magento/CardinalCommerce/composer.json
@@ -6,10 +6,10 @@
     },
     "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": [
@@ -23,5 +23,6 @@
         "psr-4": {
             "Magento\\CardinalCommerce\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json
index 6dde1d76e5e81..85f33c5c85c6c 100644
--- a/app/code/Magento/Catalog/composer.json
+++ b/app/code/Magento/Catalog/composer.json
@@ -6,37 +6,37 @@
     },
     "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": [
@@ -50,5 +50,6 @@
         "psr-4": {
             "Magento\\Catalog\\": ""
         }
-    }
+    },
+    "version": "104.0.0"
 }
diff --git a/app/code/Magento/CatalogAnalytics/composer.json b/app/code/Magento/CatalogAnalytics/composer.json
index 43fb4c8a6f433..581331b83207c 100644
--- a/app/code/Magento/CatalogAnalytics/composer.json
+++ b/app/code/Magento/CatalogAnalytics/composer.json
@@ -3,9 +3,9 @@
     "description": "N/A",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-catalog": "*",
-        "magento/module-analytics": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-analytics": "100.4.*"
     },
     "type": "magento2-module",
     "license": [
@@ -19,5 +19,6 @@
         "psr-4": {
             "Magento\\CatalogAnalytics\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/CatalogCmsGraphQl/composer.json b/app/code/Magento/CatalogCmsGraphQl/composer.json
index aa7a742f2f315..351f54f1f99b3 100644
--- a/app/code/Magento/CatalogCmsGraphQl/composer.json
+++ b/app/code/Magento/CatalogCmsGraphQl/composer.json
@@ -4,14 +4,14 @@
     "type": "magento2-module",
     "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",
@@ -24,5 +24,6 @@
         "psr-4": {
             "Magento\\CatalogCmsGraphQl\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/CatalogCustomerGraphQl/composer.json b/app/code/Magento/CatalogCustomerGraphQl/composer.json
index a7c887af0379b..eca6ebb34f5b3 100644
--- a/app/code/Magento/CatalogCustomerGraphQl/composer.json
+++ b/app/code/Magento/CatalogCustomerGraphQl/composer.json
@@ -4,11 +4,11 @@
     "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": "*"
+        "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.*"
     },
     "license": [
         "OSL-3.0",
@@ -21,5 +21,6 @@
         "psr-4": {
             "Magento\\CatalogCustomerGraphQl\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/CatalogGraphQl/composer.json b/app/code/Magento/CatalogGraphQl/composer.json
index d6e9bfa3c0505..ba8a843dfc8e9 100644
--- a/app/code/Magento/CatalogGraphQl/composer.json
+++ b/app/code/Magento/CatalogGraphQl/composer.json
@@ -4,19 +4,19 @@
     "type": "magento2-module",
     "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-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.*"
     },
     "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",
@@ -29,5 +29,6 @@
         "psr-4": {
             "Magento\\CatalogGraphQl\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/CatalogImportExport/composer.json b/app/code/Magento/CatalogImportExport/composer.json
index 92a6620827990..f95f9109bb931 100644
--- a/app/code/Magento/CatalogImportExport/composer.json
+++ b/app/code/Magento/CatalogImportExport/composer.json
@@ -7,17 +7,17 @@
     "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": [
@@ -31,5 +31,6 @@
         "psr-4": {
             "Magento\\CatalogImportExport\\": ""
         }
-    }
+    },
+    "version": "101.1.0"
 }
diff --git a/app/code/Magento/CatalogInventory/composer.json b/app/code/Magento/CatalogInventory/composer.json
index b810e6613aebb..4ad28b4988aeb 100644
--- a/app/code/Magento/CatalogInventory/composer.json
+++ b/app/code/Magento/CatalogInventory/composer.json
@@ -6,14 +6,14 @@
     },
     "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": [
@@ -28,5 +28,6 @@
             "Magento\\CatalogInventory\\": ""
         }
     },
-    "abandoned": "magento/inventory-composer-metapackage"
+    "abandoned": "magento/inventory-composer-metapackage",
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/CatalogInventoryGraphQl/composer.json b/app/code/Magento/CatalogInventoryGraphQl/composer.json
index d6d5b01091341..b042cf3eb076f 100644
--- a/app/code/Magento/CatalogInventoryGraphQl/composer.json
+++ b/app/code/Magento/CatalogInventoryGraphQl/composer.json
@@ -4,10 +4,10 @@
     "type": "magento2-module",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-store": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-inventory": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-inventory": "100.4.*"
     },
     "license": [
         "OSL-3.0",
@@ -20,5 +20,6 @@
         "psr-4": {
             "Magento\\CatalogInventoryGraphQl\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/CatalogRule/composer.json b/app/code/Magento/CatalogRule/composer.json
index 7c40ca8a9a33a..be32b3ae95375 100644
--- a/app/code/Magento/CatalogRule/composer.json
+++ b/app/code/Magento/CatalogRule/composer.json
@@ -6,18 +6,18 @@
     },
     "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": [
@@ -31,5 +31,6 @@
         "psr-4": {
             "Magento\\CatalogRule\\": ""
         }
-    }
+    },
+    "version": "101.2.0"
 }
diff --git a/app/code/Magento/CatalogRuleConfigurable/composer.json b/app/code/Magento/CatalogRuleConfigurable/composer.json
index 19274fbae146f..0048ace2cac55 100644
--- a/app/code/Magento/CatalogRuleConfigurable/composer.json
+++ b/app/code/Magento/CatalogRuleConfigurable/composer.json
@@ -6,14 +6,14 @@
     },
     "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": [
@@ -27,5 +27,6 @@
         "psr-4": {
             "Magento\\CatalogRuleConfigurable\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/CatalogRuleGraphQl/composer.json b/app/code/Magento/CatalogRuleGraphQl/composer.json
index c82d9bb20ddab..05f4b08b1f39f 100644
--- a/app/code/Magento/CatalogRuleGraphQl/composer.json
+++ b/app/code/Magento/CatalogRuleGraphQl/composer.json
@@ -4,10 +4,10 @@
     "type": "magento2-module",
     "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",
@@ -20,5 +20,6 @@
         "psr-4": {
             "Magento\\CatalogRuleGraphQl\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/CatalogSearch/composer.json b/app/code/Magento/CatalogSearch/composer.json
index 1efece402fd84..c962d07b4825a 100644
--- a/app/code/Magento/CatalogSearch/composer.json
+++ b/app/code/Magento/CatalogSearch/composer.json
@@ -6,21 +6,21 @@
     },
     "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": [
@@ -34,5 +34,6 @@
         "psr-4": {
             "Magento\\CatalogSearch\\": ""
         }
-    }
+    },
+    "version": "102.0.0"
 }
diff --git a/app/code/Magento/CatalogUrlRewrite/composer.json b/app/code/Magento/CatalogUrlRewrite/composer.json
index fe489bcf0a3a0..224cbae6e0dff 100644
--- a/app/code/Magento/CatalogUrlRewrite/composer.json
+++ b/app/code/Magento/CatalogUrlRewrite/composer.json
@@ -6,18 +6,18 @@
     },
     "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": [
@@ -31,5 +31,6 @@
         "psr-4": {
             "Magento\\CatalogUrlRewrite\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/CatalogUrlRewriteGraphQl/composer.json b/app/code/Magento/CatalogUrlRewriteGraphQl/composer.json
index 3b64d51b85568..2871803f795c7 100644
--- a/app/code/Magento/CatalogUrlRewriteGraphQl/composer.json
+++ b/app/code/Magento/CatalogUrlRewriteGraphQl/composer.json
@@ -4,14 +4,14 @@
     "type": "magento2-module",
     "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",
@@ -24,5 +24,6 @@
         "psr-4": {
             "Magento\\CatalogUrlRewriteGraphQl\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/CatalogWidget/composer.json b/app/code/Magento/CatalogWidget/composer.json
index 305fb3ec47ad6..b13b562084614 100644
--- a/app/code/Magento/CatalogWidget/composer.json
+++ b/app/code/Magento/CatalogWidget/composer.json
@@ -6,16 +6,16 @@
     },
     "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": [
@@ -29,5 +29,6 @@
         "psr-4": {
             "Magento\\CatalogWidget\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Checkout/composer.json b/app/code/Magento/Checkout/composer.json
index 2b4fce7dc011a..e976fbc08267f 100644
--- a/app/code/Magento/Checkout/composer.json
+++ b/app/code/Magento/Checkout/composer.json
@@ -6,28 +6,28 @@
     },
     "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/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.*"
     },
     "suggest": {
-        "magento/module-cookie": "*"
+        "magento/module-cookie": "100.4.*"
     },
     "type": "magento2-module",
     "license": [
@@ -41,5 +41,6 @@
         "psr-4": {
             "Magento\\Checkout\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/CheckoutAgreements/composer.json b/app/code/Magento/CheckoutAgreements/composer.json
index 1741de53e8637..3028ac24b4cee 100644
--- a/app/code/Magento/CheckoutAgreements/composer.json
+++ b/app/code/Magento/CheckoutAgreements/composer.json
@@ -6,11 +6,11 @@
     },
     "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": [
@@ -24,5 +24,6 @@
         "psr-4": {
             "Magento\\CheckoutAgreements\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/CheckoutAgreementsGraphQl/composer.json b/app/code/Magento/CheckoutAgreementsGraphQl/composer.json
index 26b80a4457b4a..aa1592d4c3378 100644
--- a/app/code/Magento/CheckoutAgreementsGraphQl/composer.json
+++ b/app/code/Magento/CheckoutAgreementsGraphQl/composer.json
@@ -4,12 +4,12 @@
     "type": "magento2-module",
     "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",
@@ -22,5 +22,6 @@
         "psr-4": {
             "Magento\\CheckoutAgreementsGraphQl\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Cms/composer.json b/app/code/Magento/Cms/composer.json
index 8d69320102b5e..b47f5bc803048 100644
--- a/app/code/Magento/Cms/composer.json
+++ b/app/code/Magento/Cms/composer.json
@@ -6,19 +6,19 @@
     },
     "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": [
@@ -32,5 +32,6 @@
         "psr-4": {
             "Magento\\Cms\\": ""
         }
-    }
+    },
+    "version": "104.0.0"
 }
diff --git a/app/code/Magento/CmsGraphQl/composer.json b/app/code/Magento/CmsGraphQl/composer.json
index 0e4c849fe8344..22c1ad7f7c2f0 100644
--- a/app/code/Magento/CmsGraphQl/composer.json
+++ b/app/code/Magento/CmsGraphQl/composer.json
@@ -4,15 +4,15 @@
     "type": "magento2-module",
     "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",
@@ -25,5 +25,6 @@
         "psr-4": {
             "Magento\\CmsGraphQl\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/CmsUrlRewrite/composer.json b/app/code/Magento/CmsUrlRewrite/composer.json
index 80e150771975f..6f6a3f5916944 100644
--- a/app/code/Magento/CmsUrlRewrite/composer.json
+++ b/app/code/Magento/CmsUrlRewrite/composer.json
@@ -6,10 +6,10 @@
     },
     "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": [
@@ -23,5 +23,6 @@
         "psr-4": {
             "Magento\\CmsUrlRewrite\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/CmsUrlRewriteGraphQl/composer.json b/app/code/Magento/CmsUrlRewriteGraphQl/composer.json
index d8fbbb4c2e6fd..13d16d49f7a44 100644
--- a/app/code/Magento/CmsUrlRewriteGraphQl/composer.json
+++ b/app/code/Magento/CmsUrlRewriteGraphQl/composer.json
@@ -4,14 +4,14 @@
     "type": "magento2-module",
     "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",
@@ -24,5 +24,6 @@
         "psr-4": {
             "Magento\\CmsUrlRewriteGraphQl\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Config/composer.json b/app/code/Magento/Config/composer.json
index 63eca42a6ac48..b3ea162b34a4a 100644
--- a/app/code/Magento/Config/composer.json
+++ b/app/code/Magento/Config/composer.json
@@ -6,14 +6,14 @@
     },
     "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": [
@@ -27,5 +27,6 @@
         "psr-4": {
             "Magento\\Config\\": ""
         }
-    }
+    },
+    "version": "101.2.0"
 }
diff --git a/app/code/Magento/ConfigurableImportExport/composer.json b/app/code/Magento/ConfigurableImportExport/composer.json
index e27510166a421..707b02f1396e7 100644
--- a/app/code/Magento/ConfigurableImportExport/composer.json
+++ b/app/code/Magento/ConfigurableImportExport/composer.json
@@ -6,13 +6,13 @@
     },
     "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": [
@@ -26,5 +26,6 @@
         "psr-4": {
             "Magento\\ConfigurableImportExport\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/ConfigurableProduct/composer.json b/app/code/Magento/ConfigurableProduct/composer.json
index 7b1b1a18416f5..6b61f490707bb 100644
--- a/app/code/Magento/ConfigurableProduct/composer.json
+++ b/app/code/Magento/ConfigurableProduct/composer.json
@@ -6,27 +6,27 @@
     },
     "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": [
@@ -40,5 +40,6 @@
         "psr-4": {
             "Magento\\ConfigurableProduct\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/ConfigurableProductGraphQl/composer.json b/app/code/Magento/ConfigurableProductGraphQl/composer.json
index 76ec4ad3153e2..a69eace085a9f 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/composer.json
+++ b/app/code/Magento/ConfigurableProductGraphQl/composer.json
@@ -4,12 +4,12 @@
     "type": "magento2-module",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/module-catalog": "*",
-        "magento/module-configurable-product": "*",
-        "magento/module-catalog-graph-ql": "*",
-        "magento/module-quote": "*",
-        "magento/module-quote-graph-ql": "*",
-        "magento/framework": "*"
+        "magento/module-catalog": "104.0.*",
+        "magento/module-configurable-product": "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.*"
     },
     "license": [
         "OSL-3.0",
@@ -22,5 +22,6 @@
         "psr-4": {
             "Magento\\ConfigurableProductGraphQl\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/ConfigurableProductSales/composer.json b/app/code/Magento/ConfigurableProductSales/composer.json
index edac2b7782dcc..2ae309e0ecf23 100644
--- a/app/code/Magento/ConfigurableProductSales/composer.json
+++ b/app/code/Magento/ConfigurableProductSales/composer.json
@@ -6,13 +6,13 @@
     },
     "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": [
@@ -26,5 +26,6 @@
         "psr-4": {
             "Magento\\ConfigurableProductSales\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Contact/composer.json b/app/code/Magento/Contact/composer.json
index 1600c1e0c2543..93e6274919a81 100644
--- a/app/code/Magento/Contact/composer.json
+++ b/app/code/Magento/Contact/composer.json
@@ -6,11 +6,11 @@
     },
     "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": [
@@ -24,5 +24,6 @@
         "psr-4": {
             "Magento\\Contact\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Cookie/composer.json b/app/code/Magento/Cookie/composer.json
index 5a47a5c7993bf..075bd5a23f847 100644
--- a/app/code/Magento/Cookie/composer.json
+++ b/app/code/Magento/Cookie/composer.json
@@ -6,11 +6,11 @@
     },
     "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": [
@@ -24,5 +24,6 @@
         "psr-4": {
             "Magento\\Cookie\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Cron/composer.json b/app/code/Magento/Cron/composer.json
index 00da35140744b..bd2c0d4551a9b 100644
--- a/app/code/Magento/Cron/composer.json
+++ b/app/code/Magento/Cron/composer.json
@@ -6,11 +6,11 @@
     },
     "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": [
@@ -24,5 +24,6 @@
         "psr-4": {
             "Magento\\Cron\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Csp/composer.json b/app/code/Magento/Csp/composer.json
index 352735712b1b0..759819a637c4a 100644
--- a/app/code/Magento/Csp/composer.json
+++ b/app/code/Magento/Csp/composer.json
@@ -6,8 +6,8 @@
     },
     "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": [
@@ -21,5 +21,6 @@
         "psr-4": {
             "Magento\\Csp\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/CurrencySymbol/composer.json b/app/code/Magento/CurrencySymbol/composer.json
index 746cfa0ed033d..016207fd9ea9a 100644
--- a/app/code/Magento/CurrencySymbol/composer.json
+++ b/app/code/Magento/CurrencySymbol/composer.json
@@ -6,12 +6,12 @@
     },
     "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": [
@@ -25,5 +25,6 @@
         "psr-4": {
             "Magento\\CurrencySymbol\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Customer/composer.json b/app/code/Magento/Customer/composer.json
index db3108a78e9aa..ce8dd3d6c0bf9 100644
--- a/app/code/Magento/Customer/composer.json
+++ b/app/code/Magento/Customer/composer.json
@@ -6,29 +6,29 @@
     },
     "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": [
@@ -42,5 +42,6 @@
         "psr-4": {
             "Magento\\Customer\\": ""
         }
-    }
+    },
+    "version": "103.0.0"
 }
diff --git a/app/code/Magento/CustomerAnalytics/composer.json b/app/code/Magento/CustomerAnalytics/composer.json
index abd9e93d89583..4d9ce2a9a38de 100644
--- a/app/code/Magento/CustomerAnalytics/composer.json
+++ b/app/code/Magento/CustomerAnalytics/composer.json
@@ -3,9 +3,9 @@
     "description": "N/A",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-customer": "*",
-        "magento/module-analytics": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-analytics": "100.4.*"
     },
     "type": "magento2-module",
     "license": [
@@ -19,5 +19,6 @@
         "psr-4": {
             "Magento\\CustomerAnalytics\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/CustomerDownloadableGraphQl/composer.json b/app/code/Magento/CustomerDownloadableGraphQl/composer.json
index f7cdbb0dc86d6..4cb2b10e5f25c 100644
--- a/app/code/Magento/CustomerDownloadableGraphQl/composer.json
+++ b/app/code/Magento/CustomerDownloadableGraphQl/composer.json
@@ -4,12 +4,12 @@
     "type": "magento2-module",
     "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",
@@ -22,5 +22,6 @@
         "psr-4": {
             "Magento\\CustomerDownloadableGraphQl\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/CustomerGraphQl/composer.json b/app/code/Magento/CustomerGraphQl/composer.json
index 2ec396ca8ee92..8ae74e5cf803d 100644
--- a/app/code/Magento/CustomerGraphQl/composer.json
+++ b/app/code/Magento/CustomerGraphQl/composer.json
@@ -4,15 +4,15 @@
     "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": "*"
+        "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.*"
     },
     "license": [
         "OSL-3.0",
@@ -25,5 +25,6 @@
         "psr-4": {
             "Magento\\CustomerGraphQl\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/CustomerImportExport/composer.json b/app/code/Magento/CustomerImportExport/composer.json
index 8104ea01875a6..46a69480b7f71 100644
--- a/app/code/Magento/CustomerImportExport/composer.json
+++ b/app/code/Magento/CustomerImportExport/composer.json
@@ -6,13 +6,13 @@
     },
     "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": [
@@ -26,5 +26,6 @@
         "psr-4": {
             "Magento\\CustomerImportExport\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Deploy/composer.json b/app/code/Magento/Deploy/composer.json
index d8668dbb84874..2fe81eb47dc24 100644
--- a/app/code/Magento/Deploy/composer.json
+++ b/app/code/Magento/Deploy/composer.json
@@ -6,11 +6,11 @@
     },
     "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": [
@@ -25,5 +25,6 @@
         "psr-4": {
             "Magento\\Deploy\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Developer/composer.json b/app/code/Magento/Developer/composer.json
index c5c949ec45f62..ef65ea9e163f1 100644
--- a/app/code/Magento/Developer/composer.json
+++ b/app/code/Magento/Developer/composer.json
@@ -6,9 +6,9 @@
     },
     "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": [
@@ -22,5 +22,6 @@
         "psr-4": {
             "Magento\\Developer\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Dhl/composer.json b/app/code/Magento/Dhl/composer.json
index d81ae0d7b4969..85ec969695e81 100644
--- a/app/code/Magento/Dhl/composer.json
+++ b/app/code/Magento/Dhl/composer.json
@@ -7,19 +7,19 @@
     "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": [
@@ -33,5 +33,6 @@
         "psr-4": {
             "Magento\\Dhl\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Directory/composer.json b/app/code/Magento/Directory/composer.json
index e3646d38fe64d..bb3b89c00b579 100644
--- a/app/code/Magento/Directory/composer.json
+++ b/app/code/Magento/Directory/composer.json
@@ -7,10 +7,10 @@
     "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": [
@@ -24,5 +24,6 @@
         "psr-4": {
             "Magento\\Directory\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/DirectoryGraphQl/composer.json b/app/code/Magento/DirectoryGraphQl/composer.json
index ef473e1c43b94..946ba097e9a11 100644
--- a/app/code/Magento/DirectoryGraphQl/composer.json
+++ b/app/code/Magento/DirectoryGraphQl/composer.json
@@ -4,10 +4,10 @@
     "type": "magento2-module",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/module-directory": "*",
-        "magento/module-store": "*",
-        "magento/module-graph-ql": "*",
-        "magento/framework": "*"
+        "magento/module-directory": "100.4.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-graph-ql": "100.4.*",
+        "magento/framework": "103.0.*"
     },
     "license": [
         "OSL-3.0",
@@ -20,5 +20,6 @@
         "psr-4": {
             "Magento\\DirectoryGraphQl\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Downloadable/composer.json b/app/code/Magento/Downloadable/composer.json
index 992bdbd1e263c..ad42097868b74 100644
--- a/app/code/Magento/Downloadable/composer.json
+++ b/app/code/Magento/Downloadable/composer.json
@@ -6,26 +6,26 @@
     },
     "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": [
@@ -39,5 +39,6 @@
         "psr-4": {
             "Magento\\Downloadable\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/DownloadableGraphQl/composer.json b/app/code/Magento/DownloadableGraphQl/composer.json
index 185a50f77cc15..80bc7fa08694c 100644
--- a/app/code/Magento/DownloadableGraphQl/composer.json
+++ b/app/code/Magento/DownloadableGraphQl/composer.json
@@ -4,14 +4,14 @@
     "type": "magento2-module",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/module-catalog": "*",
-        "magento/module-downloadable": "*",
-        "magento/module-quote": "*",
-        "magento/module-quote-graph-ql": "*",
-        "magento/framework": "*"
+        "magento/module-catalog": "104.0.*",
+        "magento/module-downloadable": "100.4.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-quote-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",
@@ -24,5 +24,6 @@
         "psr-4": {
             "Magento\\DownloadableGraphQl\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/DownloadableImportExport/composer.json b/app/code/Magento/DownloadableImportExport/composer.json
index 6dd7043fc02a9..1a926bc97fcc9 100644
--- a/app/code/Magento/DownloadableImportExport/composer.json
+++ b/app/code/Magento/DownloadableImportExport/composer.json
@@ -6,13 +6,13 @@
     },
     "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": [
@@ -26,5 +26,6 @@
         "psr-4": {
             "Magento\\DownloadableImportExport\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Eav/composer.json b/app/code/Magento/Eav/composer.json
index 5636b0d05841c..56e75d533b29f 100644
--- a/app/code/Magento/Eav/composer.json
+++ b/app/code/Magento/Eav/composer.json
@@ -6,12 +6,12 @@
     },
     "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": [
@@ -25,5 +25,6 @@
         "psr-4": {
             "Magento\\Eav\\": ""
         }
-    }
+    },
+    "version": "102.1.0"
 }
diff --git a/app/code/Magento/EavGraphQl/composer.json b/app/code/Magento/EavGraphQl/composer.json
index ba4138f67cf62..29a6d4fbb7187 100644
--- a/app/code/Magento/EavGraphQl/composer.json
+++ b/app/code/Magento/EavGraphQl/composer.json
@@ -4,11 +4,11 @@
     "type": "magento2-module",
     "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",
@@ -21,5 +21,6 @@
         "psr-4": {
             "Magento\\EavGraphQl\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Elasticsearch/composer.json b/app/code/Magento/Elasticsearch/composer.json
index b79ae7bc5cc47..21ff9ca3b1aa1 100644
--- a/app/code/Magento/Elasticsearch/composer.json
+++ b/app/code/Magento/Elasticsearch/composer.json
@@ -3,19 +3,19 @@
     "description": "N/A",
     "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": [
@@ -29,5 +29,6 @@
         "psr-4": {
             "Magento\\Elasticsearch\\": ""
         }
-    }
+    },
+    "version": "101.0.0"
 }
diff --git a/app/code/Magento/Elasticsearch6/composer.json b/app/code/Magento/Elasticsearch6/composer.json
index 1ee92c0b0a3b3..0bcfee63b80f9 100644
--- a/app/code/Magento/Elasticsearch6/composer.json
+++ b/app/code/Magento/Elasticsearch6/composer.json
@@ -3,15 +3,15 @@
     "description": "N/A",
     "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": [
@@ -25,5 +25,6 @@
         "psr-4": {
             "Magento\\Elasticsearch6\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Elasticsearch7/composer.json b/app/code/Magento/Elasticsearch7/composer.json
index 1e59ceaebaf84..03aeedafe7b60 100644
--- a/app/code/Magento/Elasticsearch7/composer.json
+++ b/app/code/Magento/Elasticsearch7/composer.json
@@ -3,15 +3,15 @@
     "description": "N/A",
     "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": [
@@ -25,5 +25,6 @@
         "psr-4": {
             "Magento\\Elasticsearch7\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Email/composer.json b/app/code/Magento/Email/composer.json
index 334bbcf9d4617..faa72bacc8b80 100644
--- a/app/code/Magento/Email/composer.json
+++ b/app/code/Magento/Email/composer.json
@@ -6,19 +6,19 @@
     },
     "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": [
@@ -32,5 +32,6 @@
         "psr-4": {
             "Magento\\Email\\": ""
         }
-    }
+    },
+    "version": "101.1.0"
 }
diff --git a/app/code/Magento/EncryptionKey/composer.json b/app/code/Magento/EncryptionKey/composer.json
index 6677a5b181f83..ef05a0dfaad14 100644
--- a/app/code/Magento/EncryptionKey/composer.json
+++ b/app/code/Magento/EncryptionKey/composer.json
@@ -6,9 +6,9 @@
     },
     "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": [
@@ -22,5 +22,6 @@
         "psr-4": {
             "Magento\\EncryptionKey\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Fedex/composer.json b/app/code/Magento/Fedex/composer.json
index 575311e148457..97a1759102cf6 100644
--- a/app/code/Magento/Fedex/composer.json
+++ b/app/code/Magento/Fedex/composer.json
@@ -7,15 +7,15 @@
     "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": [
@@ -29,5 +29,6 @@
         "psr-4": {
             "Magento\\Fedex\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/GiftMessage/composer.json b/app/code/Magento/GiftMessage/composer.json
index cdf0533c3270d..f6af0767a4cf8 100644
--- a/app/code/Magento/GiftMessage/composer.json
+++ b/app/code/Magento/GiftMessage/composer.json
@@ -6,19 +6,19 @@
     },
     "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": [
@@ -32,5 +32,6 @@
         "psr-4": {
             "Magento\\GiftMessage\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/GoogleAdwords/composer.json b/app/code/Magento/GoogleAdwords/composer.json
index a37470115584f..98af74380cae9 100644
--- a/app/code/Magento/GoogleAdwords/composer.json
+++ b/app/code/Magento/GoogleAdwords/composer.json
@@ -6,9 +6,9 @@
     },
     "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": [
@@ -22,5 +22,6 @@
         "psr-4": {
             "Magento\\GoogleAdwords\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/GoogleAnalytics/composer.json b/app/code/Magento/GoogleAnalytics/composer.json
index 64d210c4f4811..ebae982ac3cf9 100644
--- a/app/code/Magento/GoogleAnalytics/composer.json
+++ b/app/code/Magento/GoogleAnalytics/composer.json
@@ -6,13 +6,13 @@
     },
     "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": [
@@ -26,5 +26,6 @@
         "psr-4": {
             "Magento\\GoogleAnalytics\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/GoogleOptimizer/composer.json b/app/code/Magento/GoogleOptimizer/composer.json
index 426526a922ec8..9938a1409c5f2 100644
--- a/app/code/Magento/GoogleOptimizer/composer.json
+++ b/app/code/Magento/GoogleOptimizer/composer.json
@@ -6,13 +6,13 @@
     },
     "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": [
@@ -26,5 +26,6 @@
         "psr-4": {
             "Magento\\GoogleOptimizer\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/GraphQl/composer.json b/app/code/Magento/GraphQl/composer.json
index 904d41c97953e..e52cfcb8f7332 100644
--- a/app/code/Magento/GraphQl/composer.json
+++ b/app/code/Magento/GraphQl/composer.json
@@ -4,12 +4,12 @@
     "type": "magento2-module",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/module-eav": "*",
-        "magento/framework": "*"
+        "magento/module-eav": "102.1.*",
+        "magento/framework": "103.0.*"
     },
     "suggest": {
-        "magento/module-webapi": "*",
-        "magento/module-graph-ql-cache": "*"
+        "magento/module-webapi": "100.4.*",
+        "magento/module-graph-ql-cache": "100.4.*"
     },
     "license": [
         "OSL-3.0",
@@ -22,5 +22,6 @@
         "psr-4": {
             "Magento\\GraphQl\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/GraphQlCache/composer.json b/app/code/Magento/GraphQlCache/composer.json
index 4cfdd0c4f660a..7edc82471b181 100644
--- a/app/code/Magento/GraphQlCache/composer.json
+++ b/app/code/Magento/GraphQlCache/composer.json
@@ -4,9 +4,9 @@
     "type": "magento2-module",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-page-cache": "*",
-        "magento/module-graph-ql": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-page-cache": "100.4.*",
+        "magento/module-graph-ql": "100.4.*"
     },
     "license": [
         "OSL-3.0",
@@ -19,5 +19,6 @@
         "psr-4": {
             "Magento\\GraphQlCache\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/GroupedCatalogInventory/composer.json b/app/code/Magento/GroupedCatalogInventory/composer.json
index 0d91d939494a8..db81d649ede37 100644
--- a/app/code/Magento/GroupedCatalogInventory/composer.json
+++ b/app/code/Magento/GroupedCatalogInventory/composer.json
@@ -6,10 +6,10 @@
     },
     "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": [
@@ -23,5 +23,6 @@
         "psr-4": {
             "Magento\\GroupedCatalogInventory\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/GroupedImportExport/composer.json b/app/code/Magento/GroupedImportExport/composer.json
index 8806058c2bfc8..527df378c3265 100644
--- a/app/code/Magento/GroupedImportExport/composer.json
+++ b/app/code/Magento/GroupedImportExport/composer.json
@@ -6,12 +6,12 @@
     },
     "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": [
@@ -25,5 +25,6 @@
         "psr-4": {
             "Magento\\GroupedImportExport\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/GroupedProduct/composer.json b/app/code/Magento/GroupedProduct/composer.json
index 554b0c239c8fb..b135e1fdaa254 100644
--- a/app/code/Magento/GroupedProduct/composer.json
+++ b/app/code/Magento/GroupedProduct/composer.json
@@ -6,23 +6,23 @@
     },
     "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": [
@@ -36,5 +36,6 @@
         "psr-4": {
             "Magento\\GroupedProduct\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/GroupedProductGraphQl/composer.json b/app/code/Magento/GroupedProductGraphQl/composer.json
index 5784acb5f5d04..e8d1400736077 100644
--- a/app/code/Magento/GroupedProductGraphQl/composer.json
+++ b/app/code/Magento/GroupedProductGraphQl/composer.json
@@ -4,10 +4,10 @@
     "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": "*"
+        "magento/module-grouped-product": "100.4.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-graph-ql": "100.4.*",
+        "magento/framework": "103.0.*"
     },
     "license": [
         "OSL-3.0",
@@ -20,5 +20,6 @@
         "psr-4": {
             "Magento\\GroupedProductGraphQl\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/ImportExport/composer.json b/app/code/Magento/ImportExport/composer.json
index 3be5c03dc2828..17ae89a722a91 100644
--- a/app/code/Magento/ImportExport/composer.json
+++ b/app/code/Magento/ImportExport/composer.json
@@ -7,13 +7,13 @@
     "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": [
@@ -27,5 +27,6 @@
         "psr-4": {
             "Magento\\ImportExport\\": ""
         }
-    }
+    },
+    "version": "101.0.0"
 }
diff --git a/app/code/Magento/Indexer/composer.json b/app/code/Magento/Indexer/composer.json
index 07d652e9fa2b5..73b5625e1cd3d 100644
--- a/app/code/Magento/Indexer/composer.json
+++ b/app/code/Magento/Indexer/composer.json
@@ -6,8 +6,8 @@
     },
     "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": [
@@ -21,5 +21,6 @@
         "psr-4": {
             "Magento\\Indexer\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/InstantPurchase/composer.json b/app/code/Magento/InstantPurchase/composer.json
index 0807926b755a0..90a18e86c853d 100644
--- a/app/code/Magento/InstantPurchase/composer.json
+++ b/app/code/Magento/InstantPurchase/composer.json
@@ -8,14 +8,14 @@
     ],
     "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": [
@@ -24,5 +24,6 @@
         "psr-4": {
             "Magento\\InstantPurchase\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Integration/composer.json b/app/code/Magento/Integration/composer.json
index c85e84284b43f..4e5f9615924ab 100644
--- a/app/code/Magento/Integration/composer.json
+++ b/app/code/Magento/Integration/composer.json
@@ -6,14 +6,14 @@
     },
     "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": [
@@ -27,5 +27,6 @@
         "psr-4": {
             "Magento\\Integration\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/LayeredNavigation/composer.json b/app/code/Magento/LayeredNavigation/composer.json
index fa3c90dbbd774..5f214d02c9258 100644
--- a/app/code/Magento/LayeredNavigation/composer.json
+++ b/app/code/Magento/LayeredNavigation/composer.json
@@ -6,9 +6,9 @@
     },
     "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": [
@@ -22,5 +22,6 @@
         "psr-4": {
             "Magento\\LayeredNavigation\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/LoginAsCustomer/composer.json b/app/code/Magento/LoginAsCustomer/composer.json
index ec81374528e7b..62e30db212828 100755
--- a/app/code/Magento/LoginAsCustomer/composer.json
+++ b/app/code/Magento/LoginAsCustomer/composer.json
@@ -3,12 +3,12 @@
     "description": "Allow for admin to enter a customer account",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-customer": "*",
-        "magento/module-login-as-customer-api": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-login-as-customer-api": "100.4.*"
     },
     "suggest": {
-        "magento/module-backend": "*"
+        "magento/module-backend": "102.0.*"
     },
     "type": "magento2-module",
     "license": [
@@ -16,9 +16,12 @@
         "AFL-3.0"
     ],
     "autoload": {
-        "files": [ "registration.php" ],
+        "files": [
+            "registration.php"
+        ],
         "psr-4": {
             "Magento\\LoginAsCustomer\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/composer.json b/app/code/Magento/LoginAsCustomerAdminUi/composer.json
index 8bbe0e2bd6c9e..16ed6072554d2 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/composer.json
+++ b/app/code/Magento/LoginAsCustomerAdminUi/composer.json
@@ -3,15 +3,15 @@
     "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-store": "*"
+        "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-store": "101.1.*"
     },
     "suggest": {
-        "magento/module-login-as-customer": "*"
+        "magento/module-login-as-customer": "100.4.*"
     },
     "type": "magento2-module",
     "license": [
@@ -19,9 +19,12 @@
         "AFL-3.0"
     ],
     "autoload": {
-        "files": [ "registration.php" ],
+        "files": [
+            "registration.php"
+        ],
         "psr-4": {
             "Magento\\LoginAsCustomerAdminUi\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/LoginAsCustomerApi/composer.json b/app/code/Magento/LoginAsCustomerApi/composer.json
index b48319b61398f..b9f3db0559462 100644
--- a/app/code/Magento/LoginAsCustomerApi/composer.json
+++ b/app/code/Magento/LoginAsCustomerApi/composer.json
@@ -3,7 +3,7 @@
     "description": "Allow for admin to enter a customer account",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*"
+        "magento/framework": "103.0.*"
     },
     "type": "magento2-module",
     "license": [
@@ -11,9 +11,12 @@
         "AFL-3.0"
     ],
     "autoload": {
-        "files": [ "registration.php" ],
+        "files": [
+            "registration.php"
+        ],
         "psr-4": {
             "Magento\\LoginAsCustomerApi\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/composer.json b/app/code/Magento/LoginAsCustomerFrontendUi/composer.json
index 279d8ae3ec79e..600f34c843a23 100644
--- a/app/code/Magento/LoginAsCustomerFrontendUi/composer.json
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/composer.json
@@ -3,10 +3,10 @@
     "description": "",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-login-as-customer-api": "*",
-        "magento/module-customer": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-login-as-customer-api": "100.4.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-store": "101.1.*"
     },
     "type": "magento2-module",
     "license": [
@@ -14,9 +14,12 @@
         "AFL-3.0"
     ],
     "autoload": {
-        "files": [ "registration.php" ],
+        "files": [
+            "registration.php"
+        ],
         "psr-4": {
             "Magento\\LoginAsCustomerFrontendUi\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/LoginAsCustomerLog/composer.json b/app/code/Magento/LoginAsCustomerLog/composer.json
index cf888f8cb1a59..3939888226045 100644
--- a/app/code/Magento/LoginAsCustomerLog/composer.json
+++ b/app/code/Magento/LoginAsCustomerLog/composer.json
@@ -3,15 +3,15 @@
     "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": "*"
+        "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": "*"
+        "magento/module-login-as-customer": "100.4.*"
     },
     "type": "magento2-module",
     "license": [
@@ -19,9 +19,12 @@
         "AFL-3.0"
     ],
     "autoload": {
-        "files": [ "registration.php" ],
+        "files": [
+            "registration.php"
+        ],
         "psr-4": {
             "Magento\\LoginAsCustomerLog\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/LoginAsCustomerPageCache/composer.json b/app/code/Magento/LoginAsCustomerPageCache/composer.json
index 195a08fc19d83..99ac2aacb05d8 100644
--- a/app/code/Magento/LoginAsCustomerPageCache/composer.json
+++ b/app/code/Magento/LoginAsCustomerPageCache/composer.json
@@ -3,12 +3,12 @@
     "description": "",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-customer": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-store": "101.1.*"
     },
     "suggest": {
-        "magento/module-page-cache": "*"
+        "magento/module-page-cache": "100.4.*"
     },
     "type": "magento2-module",
     "license": [
@@ -16,9 +16,12 @@
         "AFL-3.0"
     ],
     "autoload": {
-        "files": [ "registration.php" ],
+        "files": [
+            "registration.php"
+        ],
         "psr-4": {
             "Magento\\LoginAsCustomerPageCache\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/LoginAsCustomerQuote/composer.json b/app/code/Magento/LoginAsCustomerQuote/composer.json
index 556ffc0d3be43..c8d7d6d8006e7 100644
--- a/app/code/Magento/LoginAsCustomerQuote/composer.json
+++ b/app/code/Magento/LoginAsCustomerQuote/composer.json
@@ -3,13 +3,13 @@
     "description": "",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-checkout": "*",
-        "magento/module-customer": "*",
-        "magento/module-quote": "*"
+        "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": "*"
+        "magento/module-login-as-customer-api": "100.4.*"
     },
     "type": "magento2-module",
     "license": [
@@ -23,5 +23,6 @@
         "psr-4": {
             "Magento\\LoginAsCustomerQuote\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/LoginAsCustomerSales/composer.json b/app/code/Magento/LoginAsCustomerSales/composer.json
index 3965e8acf87d8..58a57d9f3ac71 100644
--- a/app/code/Magento/LoginAsCustomerSales/composer.json
+++ b/app/code/Magento/LoginAsCustomerSales/composer.json
@@ -3,13 +3,13 @@
     "description": "",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-customer": "*",
-        "magento/module-user": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-user": "101.2.*"
     },
     "suggest": {
-        "magento/module-sales": "*"
+        "magento/module-sales": "103.0.*"
     },
     "type": "magento2-module",
     "license": [
@@ -23,5 +23,6 @@
         "psr-4": {
             "Magento\\LoginAsCustomerSales\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Marketplace/composer.json b/app/code/Magento/Marketplace/composer.json
index 42bbcf151a17b..94827e2e2dd92 100644
--- a/app/code/Magento/Marketplace/composer.json
+++ b/app/code/Magento/Marketplace/composer.json
@@ -6,8 +6,8 @@
     },
     "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": [
@@ -21,5 +21,6 @@
         "psr-4": {
             "Magento\\Marketplace\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/MediaContent/composer.json b/app/code/Magento/MediaContent/composer.json
index 4dc2b3eba0f68..253ca2d50be1b 100644
--- a/app/code/Magento/MediaContent/composer.json
+++ b/app/code/Magento/MediaContent/composer.json
@@ -3,9 +3,9 @@
     "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": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-media-content-api": "100.4.*",
+        "magento/module-media-gallery-api": "101.0.*"
     },
     "type": "magento2-module",
     "license": [
@@ -19,5 +19,6 @@
         "psr-4": {
             "Magento\\MediaContent\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/MediaContentApi/composer.json b/app/code/Magento/MediaContentApi/composer.json
index fd1f2f9a0f265..35a6ea8034d73 100644
--- a/app/code/Magento/MediaContentApi/composer.json
+++ b/app/code/Magento/MediaContentApi/composer.json
@@ -3,8 +3,8 @@
     "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": "*"
+        "magento/module-media-gallery-api": "101.0.*",
+        "magento/framework": "103.0.*"
     },
     "type": "magento2-module",
     "license": [
@@ -18,5 +18,6 @@
         "psr-4": {
             "Magento\\MediaContentApi\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/MediaContentCatalog/composer.json b/app/code/Magento/MediaContentCatalog/composer.json
index 21e23e6b18bdc..042d7dd0c4ec0 100644
--- a/app/code/Magento/MediaContentCatalog/composer.json
+++ b/app/code/Magento/MediaContentCatalog/composer.json
@@ -3,10 +3,10 @@
     "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/framework": "*"
+        "magento/module-media-content-api": "100.4.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-eav": "102.1.*",
+        "magento/framework": "103.0.*"
     },
     "type": "magento2-module",
     "license": [
@@ -20,5 +20,6 @@
         "psr-4": {
             "Magento\\MediaContentCatalog\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/MediaContentCms/composer.json b/app/code/Magento/MediaContentCms/composer.json
index ea32fdd7a49fa..16880d72c1a92 100644
--- a/app/code/Magento/MediaContentCms/composer.json
+++ b/app/code/Magento/MediaContentCms/composer.json
@@ -3,9 +3,9 @@
     "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": "*"
+        "magento/module-media-content-api": "100.4.*",
+        "magento/module-cms": "104.0.*",
+        "magento/framework": "103.0.*"
     },
     "type": "magento2-module",
     "license": [
@@ -19,5 +19,6 @@
         "psr-4": {
             "Magento\\MediaContentCms\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/MediaGallery/composer.json b/app/code/Magento/MediaGallery/composer.json
index d430a174a9738..3664941f59615 100644
--- a/app/code/Magento/MediaGallery/composer.json
+++ b/app/code/Magento/MediaGallery/composer.json
@@ -3,9 +3,9 @@
     "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": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-media-gallery-api": "101.0.*",
+        "magento/module-cms": "104.0.*"
     },
     "type": "magento2-module",
     "license": [
@@ -19,5 +19,6 @@
         "psr-4": {
             "Magento\\MediaGallery\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/MediaGalleryApi/composer.json b/app/code/Magento/MediaGalleryApi/composer.json
index 8bea8ee95b55a..512459328707d 100644
--- a/app/code/Magento/MediaGalleryApi/composer.json
+++ b/app/code/Magento/MediaGalleryApi/composer.json
@@ -3,7 +3,7 @@
     "description": "Magento module responsible for media gallery asset attributes storage and management",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*"
+        "magento/framework": "103.0.*"
     },
     "type": "magento2-module",
     "license": [
@@ -17,5 +17,6 @@
         "psr-4": {
             "Magento\\MediaGalleryApi\\": ""
         }
-    }
+    },
+    "version": "101.0.0"
 }
diff --git a/app/code/Magento/MediaGalleryCatalog/composer.json b/app/code/Magento/MediaGalleryCatalog/composer.json
index 192d86684aa76..c83f6b8b2549f 100644
--- a/app/code/Magento/MediaGalleryCatalog/composer.json
+++ b/app/code/Magento/MediaGalleryCatalog/composer.json
@@ -3,9 +3,9 @@
     "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": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-media-gallery-api": "101.0.*",
+        "magento/module-catalog": "104.0.*"
     },
     "type": "magento2-module",
     "license": [
@@ -19,5 +19,6 @@
         "psr-4": {
             "Magento\\MediaGalleryCatalog\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/MediaStorage/composer.json b/app/code/Magento/MediaStorage/composer.json
index cb1057febb23e..390f398b2531c 100644
--- a/app/code/Magento/MediaStorage/composer.json
+++ b/app/code/Magento/MediaStorage/composer.json
@@ -6,15 +6,15 @@
     },
     "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": [
@@ -28,5 +28,6 @@
         "psr-4": {
             "Magento\\MediaStorage\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/MessageQueue/composer.json b/app/code/Magento/MessageQueue/composer.json
index 57603f0a73acc..56ad421b9b824 100644
--- a/app/code/Magento/MessageQueue/composer.json
+++ b/app/code/Magento/MessageQueue/composer.json
@@ -5,8 +5,8 @@
         "sort-packages": true
     },
     "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"
     },
@@ -22,5 +22,6 @@
         "psr-4": {
             "Magento\\MessageQueue\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Msrp/composer.json b/app/code/Magento/Msrp/composer.json
index 5c9d2e4cf58fa..d6a6e4576debf 100644
--- a/app/code/Magento/Msrp/composer.json
+++ b/app/code/Magento/Msrp/composer.json
@@ -6,16 +6,16 @@
     },
     "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": [
@@ -29,5 +29,6 @@
         "psr-4": {
             "Magento\\Msrp\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/MsrpConfigurableProduct/composer.json b/app/code/Magento/MsrpConfigurableProduct/composer.json
index 53d274a3c4006..40ce8895fb0ee 100644
--- a/app/code/Magento/MsrpConfigurableProduct/composer.json
+++ b/app/code/Magento/MsrpConfigurableProduct/composer.json
@@ -6,10 +6,10 @@
     },
     "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": [
@@ -23,5 +23,6 @@
         "psr-4": {
             "Magento\\MsrpConfigurableProduct\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/MsrpGroupedProduct/composer.json b/app/code/Magento/MsrpGroupedProduct/composer.json
index 5c426b5910ad7..18f8fa7b2658d 100644
--- a/app/code/Magento/MsrpGroupedProduct/composer.json
+++ b/app/code/Magento/MsrpGroupedProduct/composer.json
@@ -6,10 +6,10 @@
     },
     "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": [
@@ -23,5 +23,6 @@
         "psr-4": {
             "Magento\\MsrpGroupedProduct\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Multishipping/composer.json b/app/code/Magento/Multishipping/composer.json
index 85f60985fe1b0..e05bce8b3d6be 100644
--- a/app/code/Magento/Multishipping/composer.json
+++ b/app/code/Magento/Multishipping/composer.json
@@ -6,16 +6,16 @@
     },
     "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/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.*"
     },
     "type": "magento2-module",
     "license": [
@@ -29,5 +29,6 @@
         "psr-4": {
             "Magento\\Multishipping\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/MysqlMq/composer.json b/app/code/Magento/MysqlMq/composer.json
index 225b3a091a462..bdcde982e27ce 100644
--- a/app/code/Magento/MysqlMq/composer.json
+++ b/app/code/Magento/MysqlMq/composer.json
@@ -5,10 +5,10 @@
         "sort-packages": true
     },
     "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",
@@ -23,5 +23,6 @@
         "psr-4": {
             "Magento\\MysqlMq\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/NewRelicReporting/composer.json b/app/code/Magento/NewRelicReporting/composer.json
index ca4c72d5a3aad..de7153c41455f 100644
--- a/app/code/Magento/NewRelicReporting/composer.json
+++ b/app/code/Magento/NewRelicReporting/composer.json
@@ -6,14 +6,14 @@
     },
     "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": [
@@ -27,5 +27,6 @@
         "psr-4": {
             "Magento\\NewRelicReporting\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Newsletter/composer.json b/app/code/Magento/Newsletter/composer.json
index 790370c328644..5ca8cda80e8d8 100644
--- a/app/code/Magento/Newsletter/composer.json
+++ b/app/code/Magento/Newsletter/composer.json
@@ -6,16 +6,16 @@
     },
     "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": [
@@ -29,5 +29,6 @@
         "psr-4": {
             "Magento\\Newsletter\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/OfflinePayments/composer.json b/app/code/Magento/OfflinePayments/composer.json
index 56c7eb2778c48..1a98e9f83cb37 100644
--- a/app/code/Magento/OfflinePayments/composer.json
+++ b/app/code/Magento/OfflinePayments/composer.json
@@ -6,12 +6,12 @@
     },
     "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": [
@@ -25,5 +25,6 @@
         "psr-4": {
             "Magento\\OfflinePayments\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/OfflineShipping/composer.json b/app/code/Magento/OfflineShipping/composer.json
index 7cd6f05f8ad1c..be24eb428c588 100644
--- a/app/code/Magento/OfflineShipping/composer.json
+++ b/app/code/Magento/OfflineShipping/composer.json
@@ -6,20 +6,20 @@
     },
     "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": [
@@ -33,5 +33,6 @@
         "psr-4": {
             "Magento\\OfflineShipping\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/PageCache/composer.json b/app/code/Magento/PageCache/composer.json
index 506fd54886d92..9dd88e64d572f 100644
--- a/app/code/Magento/PageCache/composer.json
+++ b/app/code/Magento/PageCache/composer.json
@@ -6,10 +6,10 @@
     },
     "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": [
@@ -23,5 +23,6 @@
         "psr-4": {
             "Magento\\PageCache\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Payment/composer.json b/app/code/Magento/Payment/composer.json
index 72246c5698f80..9e0a9c5fb0ca6 100644
--- a/app/code/Magento/Payment/composer.json
+++ b/app/code/Magento/Payment/composer.json
@@ -6,14 +6,14 @@
     },
     "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": [
@@ -27,5 +27,6 @@
         "psr-4": {
             "Magento\\Payment\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Paypal/composer.json b/app/code/Magento/Paypal/composer.json
index 1b35fae2de1bc..510afa1852c86 100644
--- a/app/code/Magento/Paypal/composer.json
+++ b/app/code/Magento/Paypal/composer.json
@@ -7,26 +7,26 @@
     "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": [
@@ -40,5 +40,6 @@
         "psr-4": {
             "Magento\\Paypal\\": ""
         }
-    }
+    },
+    "version": "101.0.0"
 }
diff --git a/app/code/Magento/PaypalCaptcha/composer.json b/app/code/Magento/PaypalCaptcha/composer.json
index b88eb2f1a552e..7d3be0012a6f2 100644
--- a/app/code/Magento/PaypalCaptcha/composer.json
+++ b/app/code/Magento/PaypalCaptcha/composer.json
@@ -6,13 +6,13 @@
     },
     "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": [
@@ -26,5 +26,6 @@
         "psr-4": {
             "Magento\\PaypalCaptcha\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/PaypalGraphQl/composer.json b/app/code/Magento/PaypalGraphQl/composer.json
index 8d012be3492dd..e033e6f6994de 100644
--- a/app/code/Magento/PaypalGraphQl/composer.json
+++ b/app/code/Magento/PaypalGraphQl/composer.json
@@ -6,17 +6,17 @@
     },
     "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/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.*"
     },
     "suggest": {
-        "magento/module-graph-ql": "*"
+        "magento/module-graph-ql": "100.4.*"
     },
     "type": "magento2-module",
     "license": [
@@ -30,5 +30,6 @@
         "psr-4": {
             "Magento\\PaypalGraphQl\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Persistent/composer.json b/app/code/Magento/Persistent/composer.json
index 68fe5cb47c00e..67916942300a8 100644
--- a/app/code/Magento/Persistent/composer.json
+++ b/app/code/Magento/Persistent/composer.json
@@ -6,13 +6,13 @@
     },
     "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": [
@@ -26,5 +26,6 @@
         "psr-4": {
             "Magento\\Persistent\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/ProductAlert/composer.json b/app/code/Magento/ProductAlert/composer.json
index bfe2a43b373ce..5c856b6f50341 100644
--- a/app/code/Magento/ProductAlert/composer.json
+++ b/app/code/Magento/ProductAlert/composer.json
@@ -6,15 +6,15 @@
     },
     "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": [
@@ -28,5 +28,6 @@
         "psr-4": {
             "Magento\\ProductAlert\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/ProductVideo/composer.json b/app/code/Magento/ProductVideo/composer.json
index b7268338398a7..d98a21d2eace9 100644
--- a/app/code/Magento/ProductVideo/composer.json
+++ b/app/code/Magento/ProductVideo/composer.json
@@ -6,17 +6,17 @@
     },
     "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": [
@@ -30,5 +30,6 @@
         "psr-4": {
             "Magento\\ProductVideo\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Quote/composer.json b/app/code/Magento/Quote/composer.json
index 31312fae26e78..0014b209422bf 100644
--- a/app/code/Magento/Quote/composer.json
+++ b/app/code/Magento/Quote/composer.json
@@ -6,24 +6,24 @@
     },
     "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": [
@@ -37,5 +37,6 @@
         "psr-4": {
             "Magento\\Quote\\": ""
         }
-    }
+    },
+    "version": "101.2.0"
 }
diff --git a/app/code/Magento/QuoteAnalytics/composer.json b/app/code/Magento/QuoteAnalytics/composer.json
index 4bfb7172c4c83..b6b6ac017f180 100644
--- a/app/code/Magento/QuoteAnalytics/composer.json
+++ b/app/code/Magento/QuoteAnalytics/composer.json
@@ -3,9 +3,9 @@
     "description": "N/A",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-quote": "*",
-        "magento/module-analytics": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-analytics": "100.4.*"
     },
     "type": "magento2-module",
     "license": [
@@ -19,5 +19,6 @@
         "psr-4": {
             "Magento\\QuoteAnalytics\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/QuoteGraphQl/composer.json b/app/code/Magento/QuoteGraphQl/composer.json
index 0652d39b5f426..85ee29eebd0cc 100644
--- a/app/code/Magento/QuoteGraphQl/composer.json
+++ b/app/code/Magento/QuoteGraphQl/composer.json
@@ -4,19 +4,19 @@
     "type": "magento2-module",
     "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/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.*"
     },
     "suggest": {
-        "magento/module-graph-ql-cache": "*"
+        "magento/module-graph-ql-cache": "100.4.*"
     },
     "license": [
         "OSL-3.0",
@@ -29,5 +29,6 @@
         "psr-4": {
             "Magento\\QuoteGraphQl\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/RelatedProductGraphQl/composer.json b/app/code/Magento/RelatedProductGraphQl/composer.json
index 2cb851d56e58e..63188b5fd0817 100644
--- a/app/code/Magento/RelatedProductGraphQl/composer.json
+++ b/app/code/Magento/RelatedProductGraphQl/composer.json
@@ -4,12 +4,12 @@
     "type": "magento2-module",
     "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",
@@ -22,5 +22,6 @@
         "psr-4": {
             "Magento\\RelatedProductGraphQl\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/ReleaseNotification/composer.json b/app/code/Magento/ReleaseNotification/composer.json
index c2e347bc66ef0..10de55ad63375 100644
--- a/app/code/Magento/ReleaseNotification/composer.json
+++ b/app/code/Magento/ReleaseNotification/composer.json
@@ -3,13 +3,13 @@
     "description": "N/A",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/module-user": "*",
-        "magento/module-backend": "*",
-        "magento/module-ui": "*",
-        "magento/framework": "*"
+        "magento/module-user": "101.2.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-ui": "101.2.*",
+        "magento/framework": "103.0.*"
     },
     "suggest": {
-        "magento/module-config": "*"
+        "magento/module-config": "101.2.*"
     },
     "type": "magento2-module",
     "license": [
@@ -23,5 +23,6 @@
         "psr-4": {
             "Magento\\ReleaseNotification\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Reports/composer.json b/app/code/Magento/Reports/composer.json
index f1fe6c1e2c83a..97d6e8a476e03 100644
--- a/app/code/Magento/Reports/composer.json
+++ b/app/code/Magento/Reports/composer.json
@@ -6,23 +6,23 @@
     },
     "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": [
@@ -36,5 +36,6 @@
         "psr-4": {
             "Magento\\Reports\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/RequireJs/composer.json b/app/code/Magento/RequireJs/composer.json
index 9c3b84e88df53..1946df38f0af0 100644
--- a/app/code/Magento/RequireJs/composer.json
+++ b/app/code/Magento/RequireJs/composer.json
@@ -6,7 +6,7 @@
     },
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*"
+        "magento/framework": "103.0.*"
     },
     "type": "magento2-module",
     "license": [
@@ -20,5 +20,6 @@
         "psr-4": {
             "Magento\\RequireJs\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Review/composer.json b/app/code/Magento/Review/composer.json
index 5a428ae15fd67..7be475cb4e96f 100644
--- a/app/code/Magento/Review/composer.json
+++ b/app/code/Magento/Review/composer.json
@@ -6,19 +6,19 @@
     },
     "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": [
@@ -32,5 +32,6 @@
         "psr-4": {
             "Magento\\Review\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/ReviewAnalytics/composer.json b/app/code/Magento/ReviewAnalytics/composer.json
index d18ec43a93ac1..0a18612dba40d 100644
--- a/app/code/Magento/ReviewAnalytics/composer.json
+++ b/app/code/Magento/ReviewAnalytics/composer.json
@@ -3,9 +3,9 @@
     "description": "N/A",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-review": "*",
-        "magento/module-analytics": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-review": "100.4.*",
+        "magento/module-analytics": "100.4.*"
     },
     "type": "magento2-module",
     "license": [
@@ -19,5 +19,6 @@
         "psr-4": {
             "Magento\\ReviewAnalytics\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Robots/composer.json b/app/code/Magento/Robots/composer.json
index 2035010b0ce8b..775666fa64f6b 100644
--- a/app/code/Magento/Robots/composer.json
+++ b/app/code/Magento/Robots/composer.json
@@ -6,11 +6,11 @@
     },
     "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": [
@@ -24,5 +24,6 @@
         "psr-4": {
             "Magento\\Robots\\": ""
         }
-    }
+    },
+    "version": "101.1.0"
 }
diff --git a/app/code/Magento/Rss/composer.json b/app/code/Magento/Rss/composer.json
index bd845acc12f9a..f50ef0488081d 100644
--- a/app/code/Magento/Rss/composer.json
+++ b/app/code/Magento/Rss/composer.json
@@ -6,10 +6,10 @@
     },
     "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": [
@@ -23,5 +23,6 @@
         "psr-4": {
             "Magento\\Rss\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Rule/composer.json b/app/code/Magento/Rule/composer.json
index 0ab2b6780dcad..b516551b5f565 100644
--- a/app/code/Magento/Rule/composer.json
+++ b/app/code/Magento/Rule/composer.json
@@ -7,11 +7,11 @@
     "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": [
@@ -25,5 +25,6 @@
         "psr-4": {
             "Magento\\Rule\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Sales/composer.json b/app/code/Magento/Sales/composer.json
index 411ad3739d560..d15ecc4aa5a8c 100644
--- a/app/code/Magento/Sales/composer.json
+++ b/app/code/Magento/Sales/composer.json
@@ -6,34 +6,34 @@
     },
     "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": [
@@ -47,5 +47,6 @@
         "psr-4": {
             "Magento\\Sales\\": ""
         }
-    }
+    },
+    "version": "103.0.0"
 }
diff --git a/app/code/Magento/SalesAnalytics/composer.json b/app/code/Magento/SalesAnalytics/composer.json
index ca7926f2d8b5a..d273a21bfb1f1 100644
--- a/app/code/Magento/SalesAnalytics/composer.json
+++ b/app/code/Magento/SalesAnalytics/composer.json
@@ -3,9 +3,9 @@
     "description": "N/A",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-sales": "*",
-        "magento/module-analytics": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-analytics": "100.4.*"
     },
     "type": "magento2-module",
     "license": [
@@ -19,5 +19,6 @@
         "psr-4": {
             "Magento\\SalesAnalytics\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/SalesGraphQl/composer.json b/app/code/Magento/SalesGraphQl/composer.json
index 8e9d95836e189..c5d1c32861797 100644
--- a/app/code/Magento/SalesGraphQl/composer.json
+++ b/app/code/Magento/SalesGraphQl/composer.json
@@ -4,9 +4,9 @@
     "type": "magento2-module",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-sales": "*",
-        "magento/module-graph-ql": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-graph-ql": "100.4.*"
     },
     "license": [
         "OSL-3.0",
@@ -19,5 +19,6 @@
         "psr-4": {
             "Magento\\SalesGraphQl\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/SalesInventory/composer.json b/app/code/Magento/SalesInventory/composer.json
index 6a91b04a7c0d9..b3610ac242469 100644
--- a/app/code/Magento/SalesInventory/composer.json
+++ b/app/code/Magento/SalesInventory/composer.json
@@ -6,11 +6,11 @@
     },
     "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": [
@@ -24,5 +24,6 @@
         "psr-4": {
             "Magento\\SalesInventory\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/SalesRule/composer.json b/app/code/Magento/SalesRule/composer.json
index 572e191093275..40b42fcd1193b 100644
--- a/app/code/Magento/SalesRule/composer.json
+++ b/app/code/Magento/SalesRule/composer.json
@@ -6,29 +6,29 @@
     },
     "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": [
@@ -42,5 +42,6 @@
         "psr-4": {
             "Magento\\SalesRule\\": ""
         }
-    }
+    },
+    "version": "101.2.0"
 }
diff --git a/app/code/Magento/SalesSequence/composer.json b/app/code/Magento/SalesSequence/composer.json
index a0f9cb45cafc8..666fb0b39a1e2 100644
--- a/app/code/Magento/SalesSequence/composer.json
+++ b/app/code/Magento/SalesSequence/composer.json
@@ -6,7 +6,7 @@
     },
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*"
+        "magento/framework": "103.0.*"
     },
     "type": "magento2-module",
     "license": [
@@ -20,5 +20,6 @@
         "psr-4": {
             "Magento\\SalesSequence\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/SampleData/composer.json b/app/code/Magento/SampleData/composer.json
index 30efc94bc9274..175b0e15d1f04 100644
--- a/app/code/Magento/SampleData/composer.json
+++ b/app/code/Magento/SampleData/composer.json
@@ -6,10 +6,10 @@
     },
     "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": [
@@ -24,5 +24,6 @@
         "psr-4": {
             "Magento\\SampleData\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Search/composer.json b/app/code/Magento/Search/composer.json
index 3df1dc5935ad8..6ed6b07e49214 100644
--- a/app/code/Magento/Search/composer.json
+++ b/app/code/Magento/Search/composer.json
@@ -6,12 +6,12 @@
     },
     "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": [
@@ -25,5 +25,6 @@
         "psr-4": {
             "Magento\\Search\\": ""
         }
-    }
+    },
+    "version": "101.1.0"
 }
diff --git a/app/code/Magento/Security/composer.json b/app/code/Magento/Security/composer.json
index 4978f0c628f96..9e2388e26d72c 100644
--- a/app/code/Magento/Security/composer.json
+++ b/app/code/Magento/Security/composer.json
@@ -6,13 +6,13 @@
     },
     "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": [
@@ -26,5 +26,6 @@
         "psr-4": {
             "Magento\\Security\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/SendFriend/composer.json b/app/code/Magento/SendFriend/composer.json
index 17c908ab33e3e..444401c5ef64a 100644
--- a/app/code/Magento/SendFriend/composer.json
+++ b/app/code/Magento/SendFriend/composer.json
@@ -6,13 +6,13 @@
     },
     "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": [
@@ -26,5 +26,6 @@
         "psr-4": {
             "Magento\\SendFriend\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/SendFriendGraphQl/composer.json b/app/code/Magento/SendFriendGraphQl/composer.json
index 456780c1c1841..582bea663947e 100644
--- a/app/code/Magento/SendFriendGraphQl/composer.json
+++ b/app/code/Magento/SendFriendGraphQl/composer.json
@@ -4,10 +4,10 @@
     "type": "magento2-module",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-catalog": "*",
-        "magento/module-send-friend": "*",
-        "magento/module-graph-ql": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-send-friend": "100.4.*",
+        "magento/module-graph-ql": "100.4.*"
     },
     "license": [
         "OSL-3.0",
@@ -20,5 +20,6 @@
         "psr-4": {
             "Magento\\SendFriendGraphQl\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Shipping/composer.json b/app/code/Magento/Shipping/composer.json
index 5ea8430226ad8..08cbf729f8e22 100644
--- a/app/code/Magento/Shipping/composer.json
+++ b/app/code/Magento/Shipping/composer.json
@@ -7,25 +7,25 @@
     "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": [
@@ -39,5 +39,6 @@
         "psr-4": {
             "Magento\\Shipping\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Sitemap/composer.json b/app/code/Magento/Sitemap/composer.json
index 6a9f20ac8bddf..562016cd5f3a0 100644
--- a/app/code/Magento/Sitemap/composer.json
+++ b/app/code/Magento/Sitemap/composer.json
@@ -6,19 +6,19 @@
     },
     "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": [
@@ -32,5 +32,6 @@
         "psr-4": {
             "Magento\\Sitemap\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Store/composer.json b/app/code/Magento/Store/composer.json
index e6f7f0d5ac274..c45b1766a5873 100644
--- a/app/code/Magento/Store/composer.json
+++ b/app/code/Magento/Store/composer.json
@@ -6,18 +6,18 @@
     },
     "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": [
@@ -31,5 +31,6 @@
         "psr-4": {
             "Magento\\Store\\": ""
         }
-    }
+    },
+    "version": "101.1.0"
 }
diff --git a/app/code/Magento/StoreGraphQl/composer.json b/app/code/Magento/StoreGraphQl/composer.json
index a7cab5851a9ee..5b9c0f2161ebb 100644
--- a/app/code/Magento/StoreGraphQl/composer.json
+++ b/app/code/Magento/StoreGraphQl/composer.json
@@ -4,9 +4,9 @@
     "type": "magento2-module",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-store": "*",
-        "magento/module-graph-ql": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-graph-ql": "100.4.*"
     },
     "license": [
         "OSL-3.0",
@@ -19,5 +19,6 @@
         "psr-4": {
             "Magento\\StoreGraphQl\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Swagger/composer.json b/app/code/Magento/Swagger/composer.json
index 759e72350b0a6..fdcab3fe66c2e 100644
--- a/app/code/Magento/Swagger/composer.json
+++ b/app/code/Magento/Swagger/composer.json
@@ -6,7 +6,7 @@
     },
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*"
+        "magento/framework": "103.0.*"
     },
     "type": "magento2-module",
     "license": [
@@ -20,5 +20,6 @@
         "psr-4": {
             "Magento\\Swagger\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/SwaggerWebapi/composer.json b/app/code/Magento/SwaggerWebapi/composer.json
index 78021f7cb4ec5..63d369882ad87 100644
--- a/app/code/Magento/SwaggerWebapi/composer.json
+++ b/app/code/Magento/SwaggerWebapi/composer.json
@@ -6,8 +6,8 @@
     },
     "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": [
@@ -21,5 +21,6 @@
         "psr-4": {
             "Magento\\SwaggerWebapi\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/SwaggerWebapiAsync/composer.json b/app/code/Magento/SwaggerWebapiAsync/composer.json
index 283b2fe1f1758..99e11cdaf87b3 100644
--- a/app/code/Magento/SwaggerWebapiAsync/composer.json
+++ b/app/code/Magento/SwaggerWebapiAsync/composer.json
@@ -6,11 +6,11 @@
     },
     "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": [
@@ -24,5 +24,6 @@
         "psr-4": {
             "Magento\\SwaggerWebapiAsync\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Swatches/composer.json b/app/code/Magento/Swatches/composer.json
index 2c9b7a03ba011..6c7c2f1a66ae9 100644
--- a/app/code/Magento/Swatches/composer.json
+++ b/app/code/Magento/Swatches/composer.json
@@ -6,21 +6,21 @@
     },
     "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": [
@@ -34,5 +34,6 @@
         "psr-4": {
             "Magento\\Swatches\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/SwatchesGraphQl/composer.json b/app/code/Magento/SwatchesGraphQl/composer.json
index 383575302e6ae..961852580f2c2 100644
--- a/app/code/Magento/SwatchesGraphQl/composer.json
+++ b/app/code/Magento/SwatchesGraphQl/composer.json
@@ -4,12 +4,12 @@
     "type": "magento2-module",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-swatches": "*",
-        "magento/module-catalog": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-swatches": "100.4.*",
+        "magento/module-catalog": "104.0.*"
     },
     "suggest": {
-        "magento/module-catalog-graph-ql": "*"
+        "magento/module-catalog-graph-ql": "100.4.*"
     },
     "license": [
         "OSL-3.0",
@@ -22,5 +22,6 @@
         "psr-4": {
             "Magento\\SwatchesGraphQl\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/SwatchesLayeredNavigation/composer.json b/app/code/Magento/SwatchesLayeredNavigation/composer.json
index 3b987f8096f18..e6646efd43268 100644
--- a/app/code/Magento/SwatchesLayeredNavigation/composer.json
+++ b/app/code/Magento/SwatchesLayeredNavigation/composer.json
@@ -6,7 +6,7 @@
     },
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
+        "magento/framework": "103.0.*",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
@@ -21,5 +21,6 @@
         "psr-4": {
             "Magento\\SwatchesLayeredNavigation\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Tax/composer.json b/app/code/Magento/Tax/composer.json
index 2fe0597c85a63..ea43903ed8df6 100644
--- a/app/code/Magento/Tax/composer.json
+++ b/app/code/Magento/Tax/composer.json
@@ -6,24 +6,24 @@
     },
     "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": [
@@ -37,5 +37,6 @@
         "psr-4": {
             "Magento\\Tax\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/TaxGraphQl/composer.json b/app/code/Magento/TaxGraphQl/composer.json
index b97e414cacb67..058bfce1d5850 100644
--- a/app/code/Magento/TaxGraphQl/composer.json
+++ b/app/code/Magento/TaxGraphQl/composer.json
@@ -4,11 +4,11 @@
     "type": "magento2-module",
     "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",
@@ -21,5 +21,6 @@
         "psr-4": {
             "Magento\\TaxGraphQl\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/TaxImportExport/composer.json b/app/code/Magento/TaxImportExport/composer.json
index 01c069b4299c1..1905881740f8c 100644
--- a/app/code/Magento/TaxImportExport/composer.json
+++ b/app/code/Magento/TaxImportExport/composer.json
@@ -6,12 +6,12 @@
     },
     "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": [
@@ -25,5 +25,6 @@
         "psr-4": {
             "Magento\\TaxImportExport\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Theme/composer.json b/app/code/Magento/Theme/composer.json
index 63779c6f9bf5d..19776eb59ecd8 100644
--- a/app/code/Magento/Theme/composer.json
+++ b/app/code/Magento/Theme/composer.json
@@ -6,22 +6,22 @@
     },
     "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": [
@@ -35,5 +35,6 @@
         "psr-4": {
             "Magento\\Theme\\": ""
         }
-    }
+    },
+    "version": "101.1.0"
 }
diff --git a/app/code/Magento/ThemeGraphQl/composer.json b/app/code/Magento/ThemeGraphQl/composer.json
index cee740d449b37..e70b7bb533692 100644
--- a/app/code/Magento/ThemeGraphQl/composer.json
+++ b/app/code/Magento/ThemeGraphQl/composer.json
@@ -4,10 +4,10 @@
     "type": "magento2-module",
     "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",
@@ -20,5 +20,6 @@
         "psr-4": {
             "Magento\\ThemeGraphQl\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Tinymce3/composer.json b/app/code/Magento/Tinymce3/composer.json
index 0b8cf6824295e..c7c03f8e17ca7 100644
--- a/app/code/Magento/Tinymce3/composer.json
+++ b/app/code/Magento/Tinymce3/composer.json
@@ -3,14 +3,14 @@
     "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": "*"
+        "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": "*"
+        "magento/module-cms": "104.0.*"
     },
     "type": "magento2-module",
     "license": [
@@ -24,5 +24,6 @@
         "psr-4": {
             "Magento\\Tinymce3\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Translation/composer.json b/app/code/Magento/Translation/composer.json
index 7f67749fa88f4..ab1d258e36bec 100644
--- a/app/code/Magento/Translation/composer.json
+++ b/app/code/Magento/Translation/composer.json
@@ -6,14 +6,14 @@
     },
     "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": [
@@ -27,5 +27,6 @@
         "psr-4": {
             "Magento\\Translation\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Ui/composer.json b/app/code/Magento/Ui/composer.json
index b4aeda0fc1e6a..b122892074037 100644
--- a/app/code/Magento/Ui/composer.json
+++ b/app/code/Magento/Ui/composer.json
@@ -6,15 +6,15 @@
     },
     "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": [
@@ -28,5 +28,6 @@
         "psr-4": {
             "Magento\\Ui\\": ""
         }
-    }
+    },
+    "version": "101.2.0"
 }
diff --git a/app/code/Magento/Ups/composer.json b/app/code/Magento/Ups/composer.json
index fa8962f0af592..e26eb018ea688 100644
--- a/app/code/Magento/Ups/composer.json
+++ b/app/code/Magento/Ups/composer.json
@@ -6,17 +6,17 @@
     },
     "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": [
@@ -30,5 +30,6 @@
         "psr-4": {
             "Magento\\Ups\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/UrlRewrite/composer.json b/app/code/Magento/UrlRewrite/composer.json
index 44ca51e8bcbe2..96bdcfc7e9642 100644
--- a/app/code/Magento/UrlRewrite/composer.json
+++ b/app/code/Magento/UrlRewrite/composer.json
@@ -6,14 +6,14 @@
     },
     "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": [
@@ -27,5 +27,6 @@
         "psr-4": {
             "Magento\\UrlRewrite\\": ""
         }
-    }
+    },
+    "version": "102.0.0"
 }
diff --git a/app/code/Magento/UrlRewriteGraphQl/composer.json b/app/code/Magento/UrlRewriteGraphQl/composer.json
index 766ad3ab46ebd..adacea949b340 100644
--- a/app/code/Magento/UrlRewriteGraphQl/composer.json
+++ b/app/code/Magento/UrlRewriteGraphQl/composer.json
@@ -4,11 +4,11 @@
     "type": "magento2-module",
     "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",
@@ -21,5 +21,6 @@
         "psr-4": {
             "Magento\\UrlRewriteGraphQl\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/User/composer.json b/app/code/Magento/User/composer.json
index 6ba4be749cc7c..60119f505f6cc 100644
--- a/app/code/Magento/User/composer.json
+++ b/app/code/Magento/User/composer.json
@@ -6,14 +6,14 @@
     },
     "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": [
@@ -27,5 +27,6 @@
         "psr-4": {
             "Magento\\User\\": ""
         }
-    }
+    },
+    "version": "101.2.0"
 }
diff --git a/app/code/Magento/Usps/composer.json b/app/code/Magento/Usps/composer.json
index 3d5c0669c679d..fcd3a0babe913 100644
--- a/app/code/Magento/Usps/composer.json
+++ b/app/code/Magento/Usps/composer.json
@@ -7,15 +7,15 @@
     "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": [
@@ -29,5 +29,6 @@
         "psr-4": {
             "Magento\\Usps\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Variable/composer.json b/app/code/Magento/Variable/composer.json
index e6eed40a814db..283db7ec3a7f2 100644
--- a/app/code/Magento/Variable/composer.json
+++ b/app/code/Magento/Variable/composer.json
@@ -6,11 +6,11 @@
     },
     "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": [
@@ -24,5 +24,6 @@
         "psr-4": {
             "Magento\\Variable\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Vault/composer.json b/app/code/Magento/Vault/composer.json
index 31d5ceb906246..fbc12bee2a7f3 100644
--- a/app/code/Magento/Vault/composer.json
+++ b/app/code/Magento/Vault/composer.json
@@ -6,14 +6,14 @@
     },
     "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": [
@@ -27,5 +27,6 @@
         "psr-4": {
             "Magento\\Vault\\": ""
         }
-    }
+    },
+    "version": "101.2.0"
 }
diff --git a/app/code/Magento/VaultGraphQl/composer.json b/app/code/Magento/VaultGraphQl/composer.json
index aff9a700fbcad..d7f056178cfaf 100644
--- a/app/code/Magento/VaultGraphQl/composer.json
+++ b/app/code/Magento/VaultGraphQl/composer.json
@@ -4,9 +4,9 @@
     "type": "magento2-module",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-vault": "*",
-        "magento/module-graph-ql": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-vault": "101.2.*",
+        "magento/module-graph-ql": "100.4.*"
     },
     "license": [
         "OSL-3.0",
@@ -19,5 +19,6 @@
         "psr-4": {
             "Magento\\VaultGraphQl\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Version/composer.json b/app/code/Magento/Version/composer.json
index d2b2127446c21..397ffc6ae0c7f 100644
--- a/app/code/Magento/Version/composer.json
+++ b/app/code/Magento/Version/composer.json
@@ -6,7 +6,7 @@
     },
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*"
+        "magento/framework": "103.0.*"
     },
     "type": "magento2-module",
     "license": [
@@ -20,5 +20,6 @@
         "psr-4": {
             "Magento\\Version\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Webapi/composer.json b/app/code/Magento/Webapi/composer.json
index 11382cc318554..85418f5b1b28f 100644
--- a/app/code/Magento/Webapi/composer.json
+++ b/app/code/Magento/Webapi/composer.json
@@ -6,15 +6,15 @@
     },
     "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": [
@@ -28,5 +28,6 @@
         "psr-4": {
             "Magento\\Webapi\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/WebapiAsync/composer.json b/app/code/Magento/WebapiAsync/composer.json
index e0c6a96f1ffe6..4f7736cf9fb3b 100644
--- a/app/code/Magento/WebapiAsync/composer.json
+++ b/app/code/Magento/WebapiAsync/composer.json
@@ -6,14 +6,14 @@
     },
     "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": [
@@ -27,5 +27,6 @@
         "psr-4": {
             "Magento\\WebapiAsync\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/WebapiSecurity/composer.json b/app/code/Magento/WebapiSecurity/composer.json
index 5b48ed8644709..1b2d3c328e9d1 100644
--- a/app/code/Magento/WebapiSecurity/composer.json
+++ b/app/code/Magento/WebapiSecurity/composer.json
@@ -6,8 +6,8 @@
     },
     "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": [
@@ -21,5 +21,6 @@
         "psr-4": {
             "Magento\\WebapiSecurity\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Weee/composer.json b/app/code/Magento/Weee/composer.json
index 7024de0f595c7..ff85c42ac6267 100644
--- a/app/code/Magento/Weee/composer.json
+++ b/app/code/Magento/Weee/composer.json
@@ -6,22 +6,22 @@
     },
     "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": [
@@ -35,5 +35,6 @@
         "psr-4": {
             "Magento\\Weee\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/WeeeGraphQl/composer.json b/app/code/Magento/WeeeGraphQl/composer.json
index be7e50ab2fca1..33d16fb64a2db 100644
--- a/app/code/Magento/WeeeGraphQl/composer.json
+++ b/app/code/Magento/WeeeGraphQl/composer.json
@@ -4,13 +4,13 @@
     "type": "magento2-module",
     "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",
@@ -23,5 +23,6 @@
         "psr-4": {
             "Magento\\WeeeGraphQl\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/Widget/composer.json b/app/code/Magento/Widget/composer.json
index 2cf8429095ce7..a85b8f46fca0e 100644
--- a/app/code/Magento/Widget/composer.json
+++ b/app/code/Magento/Widget/composer.json
@@ -6,17 +6,17 @@
     },
     "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": [
@@ -30,5 +30,6 @@
         "psr-4": {
             "Magento\\Widget\\": ""
         }
-    }
+    },
+    "version": "101.2.0"
 }
diff --git a/app/code/Magento/Wishlist/composer.json b/app/code/Magento/Wishlist/composer.json
index b426ffe01cecc..0a347b9e5f027 100644
--- a/app/code/Magento/Wishlist/composer.json
+++ b/app/code/Magento/Wishlist/composer.json
@@ -6,26 +6,26 @@
     },
     "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": [
@@ -39,5 +39,6 @@
         "psr-4": {
             "Magento\\Wishlist\\": ""
         }
-    }
+    },
+    "version": "101.2.0"
 }
diff --git a/app/code/Magento/WishlistAnalytics/composer.json b/app/code/Magento/WishlistAnalytics/composer.json
index 309257f857ed2..9d072368bdd9d 100644
--- a/app/code/Magento/WishlistAnalytics/composer.json
+++ b/app/code/Magento/WishlistAnalytics/composer.json
@@ -3,9 +3,9 @@
     "description": "N/A",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-wishlist": "*",
-        "magento/module-analytics": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-wishlist": "101.2.*",
+        "magento/module-analytics": "100.4.*"
     },
     "type": "magento2-module",
     "license": [
@@ -19,5 +19,6 @@
         "psr-4": {
             "Magento\\WishlistAnalytics\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/code/Magento/WishlistGraphQl/composer.json b/app/code/Magento/WishlistGraphQl/composer.json
index 7a3fca599a4b3..e16f27d8cc788 100644
--- a/app/code/Magento/WishlistGraphQl/composer.json
+++ b/app/code/Magento/WishlistGraphQl/composer.json
@@ -4,10 +4,10 @@
     "type": "magento2-module",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-catalog-graph-ql": "*",
-        "magento/module-wishlist": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-catalog-graph-ql": "100.4.*",
+        "magento/module-wishlist": "101.2.*",
+        "magento/module-store": "101.1.*"
     },
     "license": [
         "OSL-3.0",
@@ -20,5 +20,6 @@
         "psr-4": {
             "Magento\\WishlistGraphQl\\": ""
         }
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/design/adminhtml/Magento/backend/composer.json b/app/design/adminhtml/Magento/backend/composer.json
index 249441be1753e..2e5c02976ab00 100644
--- a/app/design/adminhtml/Magento/backend/composer.json
+++ b/app/design/adminhtml/Magento/backend/composer.json
@@ -6,7 +6,7 @@
     },
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*"
+        "magento/framework": "103.0.*"
     },
     "type": "magento2-theme",
     "license": [
@@ -17,5 +17,6 @@
         "files": [
             "registration.php"
         ]
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/design/frontend/Magento/blank/composer.json b/app/design/frontend/Magento/blank/composer.json
index 066d0cd1cc9f2..d12350af15042 100644
--- a/app/design/frontend/Magento/blank/composer.json
+++ b/app/design/frontend/Magento/blank/composer.json
@@ -6,7 +6,7 @@
     },
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*"
+        "magento/framework": "103.0.*"
     },
     "type": "magento2-theme",
     "license": [
@@ -17,5 +17,6 @@
         "files": [
             "registration.php"
         ]
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/design/frontend/Magento/luma/composer.json b/app/design/frontend/Magento/luma/composer.json
index 16bed43fe8cbf..5083d423ab87b 100644
--- a/app/design/frontend/Magento/luma/composer.json
+++ b/app/design/frontend/Magento/luma/composer.json
@@ -6,8 +6,8 @@
     },
     "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": [
@@ -18,5 +18,6 @@
         "files": [
             "registration.php"
         ]
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/i18n/Magento/de_DE/composer.json b/app/i18n/Magento/de_DE/composer.json
index 5a488a3e32c2b..2bfbcd3db948f 100644
--- a/app/i18n/Magento/de_DE/composer.json
+++ b/app/i18n/Magento/de_DE/composer.json
@@ -9,12 +9,13 @@
         "sort-packages": true
     },
     "require": {
-        "magento/framework": "*"
+        "magento/framework": "103.0.*"
     },
     "type": "magento2-language",
     "autoload": {
         "files": [
             "registration.php"
         ]
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/i18n/Magento/en_US/composer.json b/app/i18n/Magento/en_US/composer.json
index 1108c70de28a6..a2d9d20863893 100644
--- a/app/i18n/Magento/en_US/composer.json
+++ b/app/i18n/Magento/en_US/composer.json
@@ -9,12 +9,13 @@
         "sort-packages": true
     },
     "require": {
-        "magento/framework": "*"
+        "magento/framework": "103.0.*"
     },
     "type": "magento2-language",
     "autoload": {
         "files": [
             "registration.php"
         ]
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/i18n/Magento/es_ES/composer.json b/app/i18n/Magento/es_ES/composer.json
index 5bc3cb5730adf..30f86b04042fd 100644
--- a/app/i18n/Magento/es_ES/composer.json
+++ b/app/i18n/Magento/es_ES/composer.json
@@ -9,12 +9,13 @@
         "sort-packages": true
     },
     "require": {
-        "magento/framework": "*"
+        "magento/framework": "103.0.*"
     },
     "type": "magento2-language",
     "autoload": {
         "files": [
             "registration.php"
         ]
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/i18n/Magento/fr_FR/composer.json b/app/i18n/Magento/fr_FR/composer.json
index 50c541308673b..4da78146736fc 100644
--- a/app/i18n/Magento/fr_FR/composer.json
+++ b/app/i18n/Magento/fr_FR/composer.json
@@ -9,12 +9,13 @@
         "sort-packages": true
     },
     "require": {
-        "magento/framework": "*"
+        "magento/framework": "103.0.*"
     },
     "type": "magento2-language",
     "autoload": {
         "files": [
             "registration.php"
         ]
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/i18n/Magento/nl_NL/composer.json b/app/i18n/Magento/nl_NL/composer.json
index a182e179d4103..3641101e66b5a 100644
--- a/app/i18n/Magento/nl_NL/composer.json
+++ b/app/i18n/Magento/nl_NL/composer.json
@@ -9,12 +9,13 @@
         "sort-packages": true
     },
     "require": {
-        "magento/framework": "*"
+        "magento/framework": "103.0.*"
     },
     "type": "magento2-language",
     "autoload": {
         "files": [
             "registration.php"
         ]
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/i18n/Magento/pt_BR/composer.json b/app/i18n/Magento/pt_BR/composer.json
index 46734cc09b363..0dc5c014eabd0 100644
--- a/app/i18n/Magento/pt_BR/composer.json
+++ b/app/i18n/Magento/pt_BR/composer.json
@@ -9,12 +9,13 @@
         "sort-packages": true
     },
     "require": {
-        "magento/framework": "*"
+        "magento/framework": "103.0.*"
     },
     "type": "magento2-language",
     "autoload": {
         "files": [
             "registration.php"
         ]
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/app/i18n/Magento/zh_Hans_CN/composer.json b/app/i18n/Magento/zh_Hans_CN/composer.json
index ce214ce649f56..eff1bfd2c3033 100644
--- a/app/i18n/Magento/zh_Hans_CN/composer.json
+++ b/app/i18n/Magento/zh_Hans_CN/composer.json
@@ -9,12 +9,13 @@
         "sort-packages": true
     },
     "require": {
-        "magento/framework": "*"
+        "magento/framework": "103.0.*"
     },
     "type": "magento2-language",
     "autoload": {
         "files": [
             "registration.php"
         ]
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/composer.json b/composer.json
index 816fad7068837..c2da7d52f1d19 100644
--- a/composer.json
+++ b/composer.json
@@ -101,205 +101,205 @@
         "ext-pcntl": "Need for run processes in parallel mode"
     },
     "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-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-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-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-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-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-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.0",
+        "magento/module-admin-notification": "100.4.0",
+        "magento/module-advanced-pricing-import-export": "100.4.0",
+        "magento/module-amqp": "100.4.0",
+        "magento/module-amqp-store": "100.4.0",
+        "magento/module-analytics": "100.4.0",
+        "magento/module-asynchronous-operations": "100.4.0",
+        "magento/module-authorization": "100.4.0",
+        "magento/module-advanced-search": "100.4.0",
+        "magento/module-backend": "102.0.0",
+        "magento/module-backup": "100.4.0",
+        "magento/module-bundle": "101.0.0",
+        "magento/module-bundle-graph-ql": "100.4.0",
+        "magento/module-bundle-import-export": "100.4.0",
+        "magento/module-cache-invalidate": "100.4.0",
+        "magento/module-captcha": "100.4.0",
+        "magento/module-cardinal-commerce": "100.4.0",
+        "magento/module-catalog": "104.0.0",
+        "magento/module-catalog-customer-graph-ql": "100.4.0",
+        "magento/module-catalog-analytics": "100.4.0",
+        "magento/module-catalog-import-export": "101.1.0",
+        "magento/module-catalog-inventory": "100.4.0",
+        "magento/module-catalog-inventory-graph-ql": "100.4.0",
+        "magento/module-catalog-rule": "101.2.0",
+        "magento/module-catalog-rule-graph-ql": "100.4.0",
+        "magento/module-catalog-rule-configurable": "100.4.0",
+        "magento/module-catalog-search": "102.0.0",
+        "magento/module-catalog-url-rewrite": "100.4.0",
+        "magento/module-catalog-widget": "100.4.0",
+        "magento/module-checkout": "100.4.0",
+        "magento/module-checkout-agreements": "100.4.0",
+        "magento/module-checkout-agreements-graph-ql": "100.4.0",
+        "magento/module-cms": "104.0.0",
+        "magento/module-cms-url-rewrite": "100.4.0",
+        "magento/module-config": "101.2.0",
+        "magento/module-configurable-import-export": "100.4.0",
+        "magento/module-configurable-product": "100.4.0",
+        "magento/module-configurable-product-sales": "100.4.0",
+        "magento/module-contact": "100.4.0",
+        "magento/module-cookie": "100.4.0",
+        "magento/module-cron": "100.4.0",
+        "magento/module-currency-symbol": "100.4.0",
+        "magento/module-customer": "103.0.0",
+        "magento/module-customer-analytics": "100.4.0",
+        "magento/module-customer-downloadable-graph-ql": "100.4.0",
+        "magento/module-customer-import-export": "100.4.0",
+        "magento/module-deploy": "100.4.0",
+        "magento/module-developer": "100.4.0",
+        "magento/module-dhl": "100.4.0",
+        "magento/module-directory": "100.4.0",
+        "magento/module-directory-graph-ql": "100.4.0",
+        "magento/module-downloadable": "100.4.0",
+        "magento/module-downloadable-graph-ql": "100.4.0",
+        "magento/module-downloadable-import-export": "100.4.0",
+        "magento/module-eav": "102.1.0",
+        "magento/module-elasticsearch": "101.0.0",
+        "magento/module-elasticsearch-6": "100.4.0",
+        "magento/module-elasticsearch-7": "100.4.0",
+        "magento/module-email": "101.1.0",
+        "magento/module-encryption-key": "100.4.0",
+        "magento/module-fedex": "100.4.0",
+        "magento/module-gift-message": "100.4.0",
+        "magento/module-google-adwords": "100.4.0",
+        "magento/module-google-analytics": "100.4.0",
+        "magento/module-google-optimizer": "100.4.0",
+        "magento/module-graph-ql": "100.4.0",
+        "magento/module-graph-ql-cache": "100.4.0",
+        "magento/module-catalog-graph-ql": "100.4.0",
+        "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.0",
+        "magento/module-customer-graph-ql": "100.4.0",
+        "magento/module-eav-graph-ql": "100.4.0",
+        "magento/module-swatches-graph-ql": "100.4.0",
+        "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.0",
+        "magento/module-grouped-catalog-inventory": "100.4.0",
+        "magento/module-grouped-product-graph-ql": "100.4.0",
+        "magento/module-import-export": "101.0.0",
+        "magento/module-indexer": "100.4.0",
+        "magento/module-instant-purchase": "100.4.0",
+        "magento/module-integration": "100.4.0",
+        "magento/module-layered-navigation": "100.4.0",
+        "magento/module-login-as-customer": "100.4.0",
+        "magento/module-login-as-customer-admin-ui": "100.4.0",
+        "magento/module-login-as-customer-api": "100.4.0",
+        "magento/module-login-as-customer-frontend-ui": "100.4.0",
+        "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.0",
+        "magento/module-login-as-customer-sales": "100.4.0",
+        "magento/module-media-content": "100.4.0",
+        "magento/module-media-content-api": "100.4.0",
+        "magento/module-media-content-catalog": "100.4.0",
+        "magento/module-media-content-cms": "100.4.0",
+        "magento/module-media-gallery": "100.4.0",
+        "magento/module-media-gallery-api": "101.0.0",
+        "magento/module-media-gallery-catalog": "100.4.0",
+        "magento/module-media-storage": "100.4.0",
+        "magento/module-message-queue": "100.4.0",
+        "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.0",
+        "magento/module-mysql-mq": "100.4.0",
+        "magento/module-new-relic-reporting": "100.4.0",
+        "magento/module-newsletter": "100.4.0",
+        "magento/module-offline-payments": "100.4.0",
+        "magento/module-offline-shipping": "100.4.0",
+        "magento/module-page-cache": "100.4.0",
+        "magento/module-payment": "100.4.0",
+        "magento/module-paypal": "101.0.0",
+        "magento/module-paypal-captcha": "100.4.0",
+        "magento/module-paypal-graph-ql": "100.4.0",
+        "magento/module-persistent": "100.4.0",
+        "magento/module-product-alert": "100.4.0",
+        "magento/module-product-video": "100.4.0",
+        "magento/module-quote": "101.2.0",
+        "magento/module-quote-analytics": "100.4.0",
+        "magento/module-quote-graph-ql": "100.4.0",
+        "magento/module-related-product-graph-ql": "100.4.0",
+        "magento/module-release-notification": "100.4.0",
+        "magento/module-reports": "100.4.0",
+        "magento/module-require-js": "100.4.0",
+        "magento/module-review": "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.0",
+        "magento/module-sales-analytics": "100.4.0",
+        "magento/module-sales-graph-ql": "100.4.0",
+        "magento/module-sales-inventory": "100.4.0",
+        "magento/module-sales-rule": "101.2.0",
+        "magento/module-sales-sequence": "100.4.0",
+        "magento/module-sample-data": "100.4.0",
+        "magento/module-search": "101.1.0",
+        "magento/module-security": "100.4.0",
+        "magento/module-send-friend": "100.4.0",
+        "magento/module-send-friend-graph-ql": "100.4.0",
+        "magento/module-shipping": "100.4.0",
+        "magento/module-sitemap": "100.4.0",
+        "magento/module-store": "101.1.0",
+        "magento/module-store-graph-ql": "100.4.0",
+        "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.0",
+        "magento/module-swatches-layered-navigation": "100.4.0",
+        "magento/module-tax": "100.4.0",
+        "magento/module-tax-import-export": "100.4.0",
+        "magento/module-theme": "101.1.0",
+        "magento/module-theme-graph-ql": "100.4.0",
+        "magento/module-translation": "100.4.0",
+        "magento/module-ui": "101.2.0",
+        "magento/module-ups": "100.4.0",
+        "magento/module-url-rewrite": "102.0.0",
+        "magento/module-user": "101.2.0",
+        "magento/module-usps": "100.4.0",
+        "magento/module-variable": "100.4.0",
+        "magento/module-vault": "101.2.0",
+        "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.0",
+        "magento/module-widget": "101.2.0",
+        "magento/module-wishlist": "101.2.0",
+        "magento/module-wishlist-graph-ql": "100.4.0",
+        "magento/module-wishlist-analytics": "100.4.0",
+        "magento/theme-adminhtml-backend": "100.4.0",
+        "magento/theme-frontend-blank": "100.4.0",
+        "magento/theme-frontend-luma": "100.4.0",
+        "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.0",
+        "magento/framework-amqp": "100.4.0",
+        "magento/framework-bulk": "101.0.0",
+        "magento/framework-message-queue": "100.4.0",
         "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.0",
+        "magento/module-csp": "100.4.0"
     },
     "conflict": {
         "gene/bluefoot": "*"
@@ -354,5 +354,6 @@
             "Magento\\PhpStan\\": "dev/tests/static/framework/Magento/PhpStan/"
         }
     },
-    "prefer-stable": true
+    "version": "2.4.0",
+    "minimum-stability": "stable"
 }
diff --git a/composer.lock b/composer.lock
index 04ecd43514636..ea3afb13cde3e 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": "0ebe9109f59c372f9962e2a51c35c829",
+    "content-hash": "74f566339c6207342f65f3f000595f70",
     "packages": [
         {
             "name": "colinmollenhour/cache-backend-file",
@@ -210,16 +210,16 @@
         },
         {
             "name": "composer/composer",
-            "version": "1.10.7",
+            "version": "1.10.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/composer.git",
-                "reference": "956608ea4f7de9e58c53dfb019d85ae62b193c39"
+                "reference": "83c3250093d5491600a822e176b107a945baf95a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/956608ea4f7de9e58c53dfb019d85ae62b193c39",
-                "reference": "956608ea4f7de9e58c53dfb019d85ae62b193c39",
+                "url": "https://api.github.com/repos/composer/composer/zipball/83c3250093d5491600a822e176b107a945baf95a",
+                "reference": "83c3250093d5491600a822e176b107a945baf95a",
                 "shasum": ""
             },
             "require": {
@@ -238,12 +238,11 @@
                 "symfony/process": "^2.7 || ^3.0 || ^4.0 || ^5.0"
             },
             "conflict": {
-                "symfony/console": "2.8.38",
-                "symfony/phpunit-bridge": "3.4.40"
+                "symfony/console": "2.8.38"
             },
             "require-dev": {
                 "phpspec/prophecy": "^1.10",
-                "symfony/phpunit-bridge": "^3.4"
+                "symfony/phpunit-bridge": "^4.2"
             },
             "suggest": {
                 "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
@@ -287,7 +286,7 @@
                 "dependency",
                 "package"
             ],
-            "time": "2020-06-03T08:03:56+00:00"
+            "time": "2020-07-16T10:57:00+00:00"
         },
         {
             "name": "composer/semver",
@@ -352,16 +351,16 @@
         },
         {
             "name": "composer/spdx-licenses",
-            "version": "1.5.3",
+            "version": "1.5.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/spdx-licenses.git",
-                "reference": "0c3e51e1880ca149682332770e25977c70cf9dae"
+                "reference": "6946f785871e2314c60b4524851f3702ea4f2223"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/0c3e51e1880ca149682332770e25977c70cf9dae",
-                "reference": "0c3e51e1880ca149682332770e25977c70cf9dae",
+                "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/6946f785871e2314c60b4524851f3702ea4f2223",
+                "reference": "6946f785871e2314c60b4524851f3702ea4f2223",
                 "shasum": ""
             },
             "require": {
@@ -408,7 +407,7 @@
                 "spdx",
                 "validator"
             ],
-            "time": "2020-02-14T07:44:31+00:00"
+            "time": "2020-07-15T15:35:07+00:00"
         },
         {
             "name": "composer/xdebug-handler",
@@ -652,16 +651,16 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "6.5.4",
+            "version": "6.5.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "a4a1b6930528a8f7ee03518e6442ec7a44155d9d"
+                "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/a4a1b6930528a8f7ee03518e6442ec7a44155d9d",
-                "reference": "a4a1b6930528a8f7ee03518e6442ec7a44155d9d",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
+                "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
                 "shasum": ""
             },
             "require": {
@@ -669,7 +668,7 @@
                 "guzzlehttp/promises": "^1.0",
                 "guzzlehttp/psr7": "^1.6.1",
                 "php": ">=5.5",
-                "symfony/polyfill-intl-idn": "1.17.0"
+                "symfony/polyfill-intl-idn": "^1.17.0"
             },
             "require-dev": {
                 "ext-curl": "*",
@@ -715,7 +714,7 @@
                 "rest",
                 "web service"
             ],
-            "time": "2020-05-25T19:35:05+00:00"
+            "time": "2020-06-16T21:01:06+00:00"
         },
         {
             "name": "guzzlehttp/promises",
@@ -1678,16 +1677,16 @@
         },
         {
             "name": "laminas/laminas-form",
-            "version": "2.14.5",
+            "version": "2.15.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-form.git",
-                "reference": "3e22e09751cf6ae031be87a44e092e7925ce5b7b"
+                "reference": "359cd372c565e18a17f32ccfeacdf21bba091ce2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-form/zipball/3e22e09751cf6ae031be87a44e092e7925ce5b7b",
-                "reference": "3e22e09751cf6ae031be87a44e092e7925ce5b7b",
+                "url": "https://api.github.com/repos/laminas/laminas-form/zipball/359cd372c565e18a17f32ccfeacdf21bba091ce2",
+                "reference": "359cd372c565e18a17f32ccfeacdf21bba091ce2",
                 "shasum": ""
             },
             "require": {
@@ -1730,8 +1729,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.14.x-dev",
-                    "dev-develop": "2.15.x-dev"
+                    "dev-master": "2.15.x-dev",
+                    "dev-develop": "2.16.x-dev"
                 },
                 "laminas": {
                     "component": "Laminas\\Form",
@@ -1756,20 +1755,20 @@
                 "form",
                 "laminas"
             ],
-            "time": "2020-03-29T12:46:16+00:00"
+            "time": "2020-07-14T13:53:27+00:00"
         },
         {
             "name": "laminas/laminas-http",
-            "version": "2.11.2",
+            "version": "2.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-http.git",
-                "reference": "8c66963b933c80da59433da56a44dfa979f3ec88"
+                "reference": "48bd06ffa3a6875e2b77d6852405eb7b1589d575"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-http/zipball/8c66963b933c80da59433da56a44dfa979f3ec88",
-                "reference": "8c66963b933c80da59433da56a44dfa979f3ec88",
+                "url": "https://api.github.com/repos/laminas/laminas-http/zipball/48bd06ffa3a6875e2b77d6852405eb7b1589d575",
+                "reference": "48bd06ffa3a6875e2b77d6852405eb7b1589d575",
                 "shasum": ""
             },
             "require": {
@@ -1781,7 +1780,7 @@
                 "php": "^5.6 || ^7.0"
             },
             "replace": {
-                "zendframework/zend-http": "self.version"
+                "zendframework/zend-http": "^2.11.2"
             },
             "require-dev": {
                 "laminas/laminas-coding-standard": "~1.0.0",
@@ -1794,8 +1793,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.11.x-dev",
-                    "dev-develop": "2.12.x-dev"
+                    "dev-master": "2.12.x-dev",
+                    "dev-develop": "2.13.x-dev"
                 }
             },
             "autoload": {
@@ -1814,7 +1813,7 @@
                 "http client",
                 "laminas"
             ],
-            "time": "2019-12-31T17:02:36+00:00"
+            "time": "2020-06-23T15:14:37+00:00"
         },
         {
             "name": "laminas/laminas-hydrator",
@@ -2200,16 +2199,16 @@
         },
         {
             "name": "laminas/laminas-mail",
-            "version": "2.10.1",
+            "version": "2.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-mail.git",
-                "reference": "cfe0711446c8d9c392e9fc664c9ccc180fa89005"
+                "reference": "4c5545637eea3dc745668ddff1028692ed004c4b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-mail/zipball/cfe0711446c8d9c392e9fc664c9ccc180fa89005",
-                "reference": "cfe0711446c8d9c392e9fc664c9ccc180fa89005",
+                "url": "https://api.github.com/repos/laminas/laminas-mail/zipball/4c5545637eea3dc745668ddff1028692ed004c4b",
+                "reference": "4c5545637eea3dc745668ddff1028692ed004c4b",
                 "shasum": ""
             },
             "require": {
@@ -2239,8 +2238,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.10.x-dev",
-                    "dev-develop": "2.11.x-dev"
+                    "dev-master": "2.11.x-dev",
+                    "dev-develop": "2.12.x-dev"
                 },
                 "laminas": {
                     "component": "Laminas\\Mail",
@@ -2262,7 +2261,7 @@
                 "laminas",
                 "mail"
             ],
-            "time": "2020-04-21T16:42:19+00:00"
+            "time": "2020-06-30T20:17:23+00:00"
         },
         {
             "name": "laminas/laminas-math",
@@ -3820,16 +3819,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "2.0.27",
+            "version": "2.0.28",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc"
+                "reference": "d1ca58cf33cb21046d702ae3a7b14fdacd9f3260"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc",
-                "reference": "34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/d1ca58cf33cb21046d702ae3a7b14fdacd9f3260",
+                "reference": "d1ca58cf33cb21046d702ae3a7b14fdacd9f3260",
                 "shasum": ""
             },
             "require": {
@@ -3908,7 +3907,7 @@
                 "x.509",
                 "x509"
             ],
-            "time": "2020-04-04T23:17:33+00:00"
+            "time": "2020-07-08T09:08:33+00:00"
         },
         {
             "name": "psr/container",
@@ -4275,16 +4274,16 @@
         },
         {
             "name": "seld/phar-utils",
-            "version": "1.1.0",
+            "version": "1.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/phar-utils.git",
-                "reference": "8800503d56b9867d43d9c303b9cbcc26016e82f0"
+                "reference": "8674b1d84ffb47cc59a101f5d5a3b61e87d23796"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/8800503d56b9867d43d9c303b9cbcc26016e82f0",
-                "reference": "8800503d56b9867d43d9c303b9cbcc26016e82f0",
+                "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/8674b1d84ffb47cc59a101f5d5a3b61e87d23796",
+                "reference": "8674b1d84ffb47cc59a101f5d5a3b61e87d23796",
                 "shasum": ""
             },
             "require": {
@@ -4315,11 +4314,11 @@
             "keywords": [
                 "phar"
             ],
-            "time": "2020-02-14T15:25:33+00:00"
+            "time": "2020-07-07T18:42:57+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v4.4.9",
+            "version": "v4.4.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
@@ -4396,7 +4395,7 @@
         },
         {
             "name": "symfony/css-selector",
-            "version": "v5.1.0",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
@@ -4449,7 +4448,7 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v4.4.9",
+            "version": "v4.4.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
@@ -4519,20 +4518,20 @@
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v1.1.7",
+            "version": "v1.1.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18"
+                "reference": "84e23fdcd2517bf37aecbd16967e83f0caee25a7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c43ab685673fb6c8d84220c77897b1d6cdbe1d18",
-                "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/84e23fdcd2517bf37aecbd16967e83f0caee25a7",
+                "reference": "84e23fdcd2517bf37aecbd16967e83f0caee25a7",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3"
+                "php": ">=7.1.3"
             },
             "suggest": {
                 "psr/event-dispatcher": "",
@@ -4542,6 +4541,10 @@
             "extra": {
                 "branch-alias": {
                     "dev-master": "1.1-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -4573,11 +4576,11 @@
                 "interoperability",
                 "standards"
             ],
-            "time": "2019-09-17T09:54:03+00:00"
+            "time": "2020-07-06T13:19:58+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v5.1.0",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
@@ -4627,7 +4630,7 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v5.1.0",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
@@ -4676,16 +4679,16 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.17.0",
+            "version": "v1.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9"
+                "reference": "1c302646f6efc070cd46856e600e5e0684d6b454"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
-                "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/1c302646f6efc070cd46856e600e5e0684d6b454",
+                "reference": "1c302646f6efc070cd46856e600e5e0684d6b454",
                 "shasum": ""
             },
             "require": {
@@ -4697,7 +4700,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.17-dev"
+                    "dev-master": "1.18-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -4730,25 +4737,26 @@
                 "polyfill",
                 "portable"
             ],
-            "time": "2020-05-12T16:14:59+00:00"
+            "time": "2020-07-14T12:35:20+00:00"
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.17.0",
+            "version": "v1.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a"
+                "reference": "bc6549d068d0160e0f10f7a5a23c7d1406b95ebe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3bff59ea7047e925be6b7f2059d60af31bb46d6a",
-                "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/bc6549d068d0160e0f10f7a5a23c7d1406b95ebe",
+                "reference": "bc6549d068d0160e0f10f7a5a23c7d1406b95ebe",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3",
-                "symfony/polyfill-mbstring": "^1.3",
+                "symfony/polyfill-intl-normalizer": "^1.10",
+                "symfony/polyfill-php70": "^1.10",
                 "symfony/polyfill-php72": "^1.10"
             },
             "suggest": {
@@ -4757,7 +4765,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.17-dev"
+                    "dev-master": "1.18-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -4777,6 +4789,10 @@
                     "name": "Laurent Bassin",
                     "email": "laurent@bassin.info"
                 },
+                {
+                    "name": "Trevor Rowbotham",
+                    "email": "trevor.rowbotham@pm.me"
+                },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
@@ -4792,20 +4808,87 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-05-12T16:47:27+00:00"
+            "time": "2020-07-14T12:35:20+00:00"
+        },
+        {
+            "name": "symfony/polyfill-intl-normalizer",
+            "version": "v1.18.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
+                "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e",
+                "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.18-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ],
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's Normalizer class and related functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "intl",
+                "normalizer",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2020-07-14T12:35:20+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.17.0",
+            "version": "v1.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "fa79b11539418b02fc5e1897267673ba2c19419c"
+                "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fa79b11539418b02fc5e1897267673ba2c19419c",
-                "reference": "fa79b11539418b02fc5e1897267673ba2c19419c",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/a6977d63bf9a0ad4c65cd352709e230876f9904a",
+                "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a",
                 "shasum": ""
             },
             "require": {
@@ -4817,7 +4900,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.17-dev"
+                    "dev-master": "1.18-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -4851,20 +4938,83 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-05-12T16:47:27+00:00"
+            "time": "2020-07-14T12:35:20+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php70",
+            "version": "v1.18.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php70.git",
+                "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/0dd93f2c578bdc9c72697eaa5f1dd25644e618d3",
+                "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3",
+                "shasum": ""
+            },
+            "require": {
+                "paragonie/random_compat": "~1.0|~2.0|~9.99",
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.18-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php70\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ],
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2020-07-14T12:35:20+00:00"
         },
         {
             "name": "symfony/polyfill-php72",
-            "version": "v1.17.0",
+            "version": "v1.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "f048e612a3905f34931127360bdd2def19a5e582"
+                "reference": "639447d008615574653fb3bc60d1986d7172eaae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/f048e612a3905f34931127360bdd2def19a5e582",
-                "reference": "f048e612a3905f34931127360bdd2def19a5e582",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/639447d008615574653fb3bc60d1986d7172eaae",
+                "reference": "639447d008615574653fb3bc60d1986d7172eaae",
                 "shasum": ""
             },
             "require": {
@@ -4873,7 +5023,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.17-dev"
+                    "dev-master": "1.18-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -4906,20 +5060,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-05-12T16:47:27+00:00"
+            "time": "2020-07-14T12:35:20+00:00"
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.17.0",
+            "version": "v1.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "a760d8964ff79ab9bf057613a5808284ec852ccc"
+                "reference": "fffa1a52a023e782cdcc221d781fe1ec8f87fcca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a760d8964ff79ab9bf057613a5808284ec852ccc",
-                "reference": "a760d8964ff79ab9bf057613a5808284ec852ccc",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fffa1a52a023e782cdcc221d781fe1ec8f87fcca",
+                "reference": "fffa1a52a023e782cdcc221d781fe1ec8f87fcca",
                 "shasum": ""
             },
             "require": {
@@ -4928,7 +5082,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.17-dev"
+                    "dev-master": "1.18-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -4964,20 +5122,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-05-12T16:47:27+00:00"
+            "time": "2020-07-14T12:35:20+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.17.0",
+            "version": "v1.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "5e30b2799bc1ad68f7feb62b60a73743589438dd"
+                "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/5e30b2799bc1ad68f7feb62b60a73743589438dd",
-                "reference": "5e30b2799bc1ad68f7feb62b60a73743589438dd",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/d87d5766cbf48d72388a9f6b85f280c8ad51f981",
+                "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981",
                 "shasum": ""
             },
             "require": {
@@ -4986,7 +5144,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.17-dev"
+                    "dev-master": "1.18-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -5026,11 +5188,11 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-05-12T16:47:27+00:00"
+            "time": "2020-07-14T12:35:20+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v4.4.9",
+            "version": "v4.4.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
@@ -5079,16 +5241,16 @@
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v2.1.2",
+            "version": "v2.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "66a8f0957a3ca54e4f724e49028ab19d75a8918b"
+                "reference": "58c7475e5457c5492c26cc740cc0ad7464be9442"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/66a8f0957a3ca54e4f724e49028ab19d75a8918b",
-                "reference": "66a8f0957a3ca54e4f724e49028ab19d75a8918b",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/58c7475e5457c5492c26cc740cc0ad7464be9442",
+                "reference": "58c7475e5457c5492c26cc740cc0ad7464be9442",
                 "shasum": ""
             },
             "require": {
@@ -5102,6 +5264,10 @@
             "extra": {
                 "branch-alias": {
                     "dev-master": "2.1-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -5133,7 +5299,7 @@
                 "interoperability",
                 "standards"
             ],
-            "time": "2020-05-20T17:43:50+00:00"
+            "time": "2020-07-06T13:23:11+00:00"
         },
         {
             "name": "tedivm/jshrink",
@@ -5282,16 +5448,16 @@
         },
         {
             "name": "webonyx/graphql-php",
-            "version": "v0.13.8",
+            "version": "v0.13.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webonyx/graphql-php.git",
-                "reference": "6829ae58f4c59121df1f86915fb9917a2ec595e8"
+                "reference": "d9a94fddcad0a35d4bced212b8a44ad1bc59bdf3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/6829ae58f4c59121df1f86915fb9917a2ec595e8",
-                "reference": "6829ae58f4c59121df1f86915fb9917a2ec595e8",
+                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/d9a94fddcad0a35d4bced212b8a44ad1bc59bdf3",
+                "reference": "d9a94fddcad0a35d4bced212b8a44ad1bc59bdf3",
                 "shasum": ""
             },
             "require": {
@@ -5330,7 +5496,7 @@
                 "api",
                 "graphql"
             ],
-            "time": "2019-08-25T10:32:47+00:00"
+            "time": "2020-07-02T05:49:25+00:00"
         },
         {
             "name": "wikimedia/less.php",
@@ -5551,16 +5717,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.141.0",
+            "version": "3.147.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "d57dbde176a7db7a6131bb5d325aff63515eabc3"
+                "reference": "e63974c002c0f6520da597d44a3f83ce46d7a612"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/d57dbde176a7db7a6131bb5d325aff63515eabc3",
-                "reference": "d57dbde176a7db7a6131bb5d325aff63515eabc3",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/e63974c002c0f6520da597d44a3f83ce46d7a612",
+                "reference": "e63974c002c0f6520da597d44a3f83ce46d7a612",
                 "shasum": ""
             },
             "require": {
@@ -5583,6 +5749,7 @@
                 "ext-pcntl": "*",
                 "ext-sockets": "*",
                 "nette/neon": "^2.3",
+                "paragonie/random_compat": ">= 2",
                 "phpunit/phpunit": "^4.8.35|^5.4.3",
                 "psr/cache": "^1.0",
                 "psr/simple-cache": "^1.0",
@@ -5631,7 +5798,7 @@
                 "s3",
                 "sdk"
             ],
-            "time": "2020-06-10T18:11:38+00:00"
+            "time": "2020-07-17T18:14:13+00:00"
         },
         {
             "name": "beberlei/assert",
@@ -6173,16 +6340,16 @@
         },
         {
             "name": "codeception/stub",
-            "version": "3.6.1",
+            "version": "3.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/Stub.git",
-                "reference": "a3ba01414cbee76a1bced9f9b6b169cc8d203880"
+                "reference": "468dd5fe659f131fc997f5196aad87512f9b1304"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Stub/zipball/a3ba01414cbee76a1bced9f9b6b169cc8d203880",
-                "reference": "a3ba01414cbee76a1bced9f9b6b169cc8d203880",
+                "url": "https://api.github.com/repos/Codeception/Stub/zipball/468dd5fe659f131fc997f5196aad87512f9b1304",
+                "reference": "468dd5fe659f131fc997f5196aad87512f9b1304",
                 "shasum": ""
             },
             "require": {
@@ -6199,7 +6366,7 @@
                 "MIT"
             ],
             "description": "Flexible Stub wrapper for PHPUnit's Mock Builder",
-            "time": "2020-02-07T18:42:28+00:00"
+            "time": "2020-07-03T15:54:43+00:00"
         },
         {
             "name": "csharpru/vault-php",
@@ -6424,16 +6591,16 @@
         },
         {
             "name": "doctrine/cache",
-            "version": "1.10.1",
+            "version": "1.10.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/cache.git",
-                "reference": "35a4a70cd94e09e2259dfae7488afc6b474ecbd3"
+                "reference": "13e3381b25847283a91948d04640543941309727"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/cache/zipball/35a4a70cd94e09e2259dfae7488afc6b474ecbd3",
-                "reference": "35a4a70cd94e09e2259dfae7488afc6b474ecbd3",
+                "url": "https://api.github.com/repos/doctrine/cache/zipball/13e3381b25847283a91948d04640543941309727",
+                "reference": "13e3381b25847283a91948d04640543941309727",
                 "shasum": ""
             },
             "require": {
@@ -6502,7 +6669,7 @@
                 "redis",
                 "xcache"
             ],
-            "time": "2020-05-27T16:24:54+00:00"
+            "time": "2020-07-07T18:54:01+00:00"
         },
         {
             "name": "doctrine/inflector",
@@ -6691,16 +6858,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v2.16.3",
+            "version": "v2.16.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-                "reference": "83baf823a33a1cbd5416c8626935cf3f843c10b0"
+                "reference": "1023c3458137ab052f6ff1e09621a721bfdeca13"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/83baf823a33a1cbd5416c8626935cf3f843c10b0",
-                "reference": "83baf823a33a1cbd5416c8626935cf3f843c10b0",
+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/1023c3458137ab052f6ff1e09621a721bfdeca13",
+                "reference": "1023c3458137ab052f6ff1e09621a721bfdeca13",
                 "shasum": ""
             },
             "require": {
@@ -6732,12 +6899,12 @@
                 "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.1",
                 "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.1",
                 "phpunitgoodpractices/traits": "^1.8",
-                "symfony/phpunit-bridge": "^4.3 || ^5.0",
+                "symfony/phpunit-bridge": "^5.1",
                 "symfony/yaml": "^3.0 || ^4.0 || ^5.0"
             },
             "suggest": {
                 "ext-dom": "For handling output formats in XML",
-                "ext-mbstring": "For handling non-UTF8 characters in cache signature.",
+                "ext-mbstring": "For handling non-UTF8 characters.",
                 "php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.",
                 "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.",
                 "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible."
@@ -6778,7 +6945,7 @@
                 }
             ],
             "description": "A tool to automatically fix PHP code style",
-            "time": "2020-04-15T18:51:10+00:00"
+            "time": "2020-06-27T23:57:46+00:00"
         },
         {
             "name": "jms/metadata",
@@ -7385,20 +7552,20 @@
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.9.5",
+            "version": "1.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef"
+                "reference": "969b211f9a51aa1f6c01d1d2aef56d3bd91598e5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/b2c28789e80a97badd14145fda39b545d83ca3ef",
-                "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/969b211f9a51aa1f6c01d1d2aef56d3bd91598e5",
+                "reference": "969b211f9a51aa1f6c01d1d2aef56d3bd91598e5",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": "^7.1 || ^8.0"
             },
             "replace": {
                 "myclabs/deep-copy": "self.version"
@@ -7429,7 +7596,7 @@
                 "object",
                 "object graph"
             ],
-            "time": "2020-01-17T21:11:47+00:00"
+            "time": "2020-06-29T13:22:24+00:00"
         },
         {
             "name": "paragonie/constant_time_encoding",
@@ -7866,25 +8033,25 @@
         },
         {
             "name": "phpdocumentor/reflection-common",
-            "version": "2.1.0",
+            "version": "2.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b"
+                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/6568f4687e5b41b054365f9ae03fcb1ed5f2069b",
-                "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
+                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.x-dev"
+                    "dev-2.x": "2.x-dev"
                 }
             },
             "autoload": {
@@ -7911,7 +8078,7 @@
                 "reflection",
                 "static analysis"
             ],
-            "time": "2020-04-27T09:25:28+00:00"
+            "time": "2020-06-27T09:03:43+00:00"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
@@ -7968,30 +8135,29 @@
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.1.0",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "7462d5f123dfc080dfdf26897032a6513644fc95"
+                "reference": "e878a14a65245fbe78f8080eba03b47c3b705651"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/7462d5f123dfc080dfdf26897032a6513644fc95",
-                "reference": "7462d5f123dfc080dfdf26897032a6513644fc95",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e878a14a65245fbe78f8080eba03b47c3b705651",
+                "reference": "e878a14a65245fbe78f8080eba03b47c3b705651",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2",
+                "php": "^7.2 || ^8.0",
                 "phpdocumentor/reflection-common": "^2.0"
             },
             "require-dev": {
-                "ext-tokenizer": "^7.2",
-                "mockery/mockery": "~1"
+                "ext-tokenizer": "*"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.x-dev"
+                    "dev-1.x": "1.x-dev"
                 }
             },
             "autoload": {
@@ -8010,7 +8176,7 @@
                 }
             ],
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
-            "time": "2020-02-18T18:59:58+00:00"
+            "time": "2020-06-27T10:12:23+00:00"
         },
         {
             "name": "phpmd/phpmd",
@@ -8139,33 +8305,33 @@
         },
         {
             "name": "phpspec/prophecy",
-            "version": "v1.10.3",
+            "version": "1.11.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "451c3cd1418cf640de218914901e51b064abb093"
+                "reference": "b20034be5efcdab4fb60ca3a29cba2949aead160"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/451c3cd1418cf640de218914901e51b064abb093",
-                "reference": "451c3cd1418cf640de218914901e51b064abb093",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/b20034be5efcdab4fb60ca3a29cba2949aead160",
+                "reference": "b20034be5efcdab4fb60ca3a29cba2949aead160",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0",
-                "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0",
-                "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0"
+                "doctrine/instantiator": "^1.2",
+                "php": "^7.2",
+                "phpdocumentor/reflection-docblock": "^5.0",
+                "sebastian/comparator": "^3.0 || ^4.0",
+                "sebastian/recursion-context": "^3.0 || ^4.0"
             },
             "require-dev": {
-                "phpspec/phpspec": "^2.5 || ^3.2",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
+                "phpspec/phpspec": "^6.0",
+                "phpunit/phpunit": "^8.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.10.x-dev"
+                    "dev-master": "1.11.x-dev"
                 }
             },
             "autoload": {
@@ -8198,7 +8364,7 @@
                 "spy",
                 "stub"
             ],
-            "time": "2020-03-05T15:02:03+00:00"
+            "time": "2020-07-08T12:44:21+00:00"
         },
         {
             "name": "phpstan/phpstan",
@@ -8308,20 +8474,20 @@
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "3.0.1",
+            "version": "3.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "4ac5b3e13df14829daa60a2eb4fdd2f2b7d33cf4"
+                "reference": "25fefc5b19835ca653877fe081644a3f8c1d915e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/4ac5b3e13df14829daa60a2eb4fdd2f2b7d33cf4",
-                "reference": "4ac5b3e13df14829daa60a2eb4fdd2f2b7d33cf4",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/25fefc5b19835ca653877fe081644a3f8c1d915e",
+                "reference": "25fefc5b19835ca653877fe081644a3f8c1d915e",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3"
+                "php": "^7.3 || ^8.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.0"
@@ -8354,24 +8520,24 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2020-04-18T05:02:12+00:00"
+            "time": "2020-07-11T05:18:21+00:00"
         },
         {
             "name": "phpunit/php-invoker",
-            "version": "3.0.0",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-invoker.git",
-                "reference": "7579d5a1ba7f3ac11c80004d205877911315ae7a"
+                "reference": "f6eedfed1085dd1f4c599629459a0277d25f9a66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/7579d5a1ba7f3ac11c80004d205877911315ae7a",
-                "reference": "7579d5a1ba7f3ac11c80004d205877911315ae7a",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/f6eedfed1085dd1f4c599629459a0277d25f9a66",
+                "reference": "f6eedfed1085dd1f4c599629459a0277d25f9a66",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3"
+                "php": "^7.3 || ^8.0"
             },
             "require-dev": {
                 "ext-pcntl": "*",
@@ -8407,24 +8573,27 @@
             "keywords": [
                 "process"
             ],
-            "time": "2020-02-07T06:06:11+00:00"
+            "time": "2020-06-26T11:53:53+00:00"
         },
         {
             "name": "phpunit/php-text-template",
-            "version": "2.0.0",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "526dc996cc0ebdfa428cd2dfccd79b7b53fee346"
+                "reference": "6ff9c8ea4d3212b88fcf74e25e516e2c51c99324"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/526dc996cc0ebdfa428cd2dfccd79b7b53fee346",
-                "reference": "526dc996cc0ebdfa428cd2dfccd79b7b53fee346",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/6ff9c8ea4d3212b88fcf74e25e516e2c51c99324",
+                "reference": "6ff9c8ea4d3212b88fcf74e25e516e2c51c99324",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3"
+                "php": "^7.3 || ^8.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.0"
             },
             "type": "library",
             "extra": {
@@ -8453,7 +8622,7 @@
             "keywords": [
                 "template"
             ],
-            "time": "2020-02-01T07:43:44+00:00"
+            "time": "2020-06-26T11:55:37+00:00"
         },
         {
             "name": "phpunit/php-timer",
@@ -8506,21 +8675,21 @@
         },
         {
             "name": "phpunit/php-token-stream",
-            "version": "4.0.1",
+            "version": "4.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "cdc0db5aed8fbfaf475fbd95bfd7bab83c7a779c"
+                "reference": "5672711b6b07b14d5ab694e700c62eeb82fcf374"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/cdc0db5aed8fbfaf475fbd95bfd7bab83c7a779c",
-                "reference": "cdc0db5aed8fbfaf475fbd95bfd7bab83c7a779c",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/5672711b6b07b14d5ab694e700c62eeb82fcf374",
+                "reference": "5672711b6b07b14d5ab694e700c62eeb82fcf374",
                 "shasum": ""
             },
             "require": {
                 "ext-tokenizer": "*",
-                "php": "^7.3"
+                "php": "^7.3 || ^8.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.0"
@@ -8551,7 +8720,7 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2020-05-06T09:56:31+00:00"
+            "time": "2020-06-27T06:36:25+00:00"
         },
         {
             "name": "phpunit/phpunit",
@@ -8737,20 +8906,20 @@
         },
         {
             "name": "sebastian/code-unit",
-            "version": "1.0.2",
+            "version": "1.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit.git",
-                "reference": "ac958085bc19fcd1d36425c781ef4cbb5b06e2a5"
+                "reference": "c1e2df332c905079980b119c4db103117e5e5c90"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/ac958085bc19fcd1d36425c781ef4cbb5b06e2a5",
-                "reference": "ac958085bc19fcd1d36425c781ef4cbb5b06e2a5",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/c1e2df332c905079980b119c4db103117e5e5c90",
+                "reference": "c1e2df332c905079980b119c4db103117e5e5c90",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3"
+                "php": "^7.3 || ^8.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.0"
@@ -8779,24 +8948,24 @@
             ],
             "description": "Collection of value objects that represent the PHP code units",
             "homepage": "https://github.com/sebastianbergmann/code-unit",
-            "time": "2020-04-30T05:58:10+00:00"
+            "time": "2020-06-26T12:50:45+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
-            "version": "2.0.0",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "5b5dbe0044085ac41df47e79d34911a15b96d82e"
+                "reference": "ee51f9bb0c6d8a43337055db3120829fa14da819"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/5b5dbe0044085ac41df47e79d34911a15b96d82e",
-                "reference": "5b5dbe0044085ac41df47e79d34911a15b96d82e",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ee51f9bb0c6d8a43337055db3120829fa14da819",
+                "reference": "ee51f9bb0c6d8a43337055db3120829fa14da819",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3"
+                "php": "^7.3 || ^8.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.0"
@@ -8824,24 +8993,24 @@
             ],
             "description": "Looks up which function or method a line of code belongs to",
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "time": "2020-02-07T06:20:13+00:00"
+            "time": "2020-06-26T12:04:00+00:00"
         },
         {
             "name": "sebastian/comparator",
-            "version": "4.0.0",
+            "version": "4.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "85b3435da967696ed618ff745f32be3ff4a2b8e8"
+                "reference": "dcc580eadfaa4e7f9d2cf9ae1922134ea962e14f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/85b3435da967696ed618ff745f32be3ff4a2b8e8",
-                "reference": "85b3435da967696ed618ff745f32be3ff4a2b8e8",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/dcc580eadfaa4e7f9d2cf9ae1922134ea962e14f",
+                "reference": "dcc580eadfaa4e7f9d2cf9ae1922134ea962e14f",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3",
+                "php": "^7.3 || ^8.0",
                 "sebastian/diff": "^4.0",
                 "sebastian/exporter": "^4.0"
             },
@@ -8888,24 +9057,24 @@
                 "compare",
                 "equality"
             ],
-            "time": "2020-02-07T06:08:51+00:00"
+            "time": "2020-06-26T12:05:46+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "4.0.1",
+            "version": "4.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "3e523c576f29dacecff309f35e4cc5a5c168e78a"
+                "reference": "1e90b4cf905a7d06c420b1d2e9d11a4dc8a13113"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3e523c576f29dacecff309f35e4cc5a5c168e78a",
-                "reference": "3e523c576f29dacecff309f35e4cc5a5c168e78a",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/1e90b4cf905a7d06c420b1d2e9d11a4dc8a13113",
+                "reference": "1e90b4cf905a7d06c420b1d2e9d11a4dc8a13113",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3"
+                "php": "^7.3 || ^8.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.0",
@@ -8944,24 +9113,24 @@
                 "unidiff",
                 "unified diff"
             ],
-            "time": "2020-05-08T05:01:12+00:00"
+            "time": "2020-06-30T04:46:02+00:00"
         },
         {
             "name": "sebastian/environment",
-            "version": "5.1.0",
+            "version": "5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "c753f04d68cd489b6973cf9b4e505e191af3b05c"
+                "reference": "0a757cab9d5b7ef49a619f1143e6c9c1bc0fe9d2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/c753f04d68cd489b6973cf9b4e505e191af3b05c",
-                "reference": "c753f04d68cd489b6973cf9b4e505e191af3b05c",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/0a757cab9d5b7ef49a619f1143e6c9c1bc0fe9d2",
+                "reference": "0a757cab9d5b7ef49a619f1143e6c9c1bc0fe9d2",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3"
+                "php": "^7.3 || ^8.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.0"
@@ -8997,29 +9166,29 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2020-04-14T13:36:52+00:00"
+            "time": "2020-06-26T12:07:24+00:00"
         },
         {
             "name": "sebastian/exporter",
-            "version": "4.0.0",
+            "version": "4.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "80c26562e964016538f832f305b2286e1ec29566"
+                "reference": "571d721db4aec847a0e59690b954af33ebf9f023"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/80c26562e964016538f832f305b2286e1ec29566",
-                "reference": "80c26562e964016538f832f305b2286e1ec29566",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/571d721db4aec847a0e59690b954af33ebf9f023",
+                "reference": "571d721db4aec847a0e59690b954af33ebf9f023",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3",
+                "php": "^7.3 || ^8.0",
                 "sebastian/recursion-context": "^4.0"
             },
             "require-dev": {
                 "ext-mbstring": "*",
-                "phpunit/phpunit": "^9.0"
+                "phpunit/phpunit": "^9.2"
             },
             "type": "library",
             "extra": {
@@ -9064,7 +9233,7 @@
                 "export",
                 "exporter"
             ],
-            "time": "2020-02-07T06:10:52+00:00"
+            "time": "2020-06-26T12:08:55+00:00"
         },
         {
             "name": "sebastian/finder-facade",
@@ -9168,20 +9337,20 @@
         },
         {
             "name": "sebastian/object-enumerator",
-            "version": "4.0.0",
+            "version": "4.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "e67516b175550abad905dc952f43285957ef4363"
+                "reference": "074fed2d0a6d08e1677dd8ce9d32aecb384917b8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67516b175550abad905dc952f43285957ef4363",
-                "reference": "e67516b175550abad905dc952f43285957ef4363",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/074fed2d0a6d08e1677dd8ce9d32aecb384917b8",
+                "reference": "074fed2d0a6d08e1677dd8ce9d32aecb384917b8",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3",
+                "php": "^7.3 || ^8.0",
                 "sebastian/object-reflector": "^2.0",
                 "sebastian/recursion-context": "^4.0"
             },
@@ -9211,24 +9380,24 @@
             ],
             "description": "Traverses array structures and object graphs to enumerate all referenced objects",
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-            "time": "2020-02-07T06:12:23+00:00"
+            "time": "2020-06-26T12:11:32+00:00"
         },
         {
             "name": "sebastian/object-reflector",
-            "version": "2.0.0",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-reflector.git",
-                "reference": "f4fd0835cabb0d4a6546d9fe291e5740037aa1e7"
+                "reference": "127a46f6b057441b201253526f81d5406d6c7840"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/f4fd0835cabb0d4a6546d9fe291e5740037aa1e7",
-                "reference": "f4fd0835cabb0d4a6546d9fe291e5740037aa1e7",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/127a46f6b057441b201253526f81d5406d6c7840",
+                "reference": "127a46f6b057441b201253526f81d5406d6c7840",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3"
+                "php": "^7.3 || ^8.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.0"
@@ -9256,7 +9425,7 @@
             ],
             "description": "Allows reflection of object attributes, including inherited and non-public ones",
             "homepage": "https://github.com/sebastianbergmann/object-reflector/",
-            "time": "2020-02-07T06:19:40+00:00"
+            "time": "2020-06-26T12:12:55+00:00"
         },
         {
             "name": "sebastian/phpcpd",
@@ -9311,20 +9480,20 @@
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "4.0.0",
+            "version": "4.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "cdd86616411fc3062368b720b0425de10bd3d579"
+                "reference": "062231bf61d2b9448c4fa5a7643b5e1829c11d63"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cdd86616411fc3062368b720b0425de10bd3d579",
-                "reference": "cdd86616411fc3062368b720b0425de10bd3d579",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/062231bf61d2b9448c4fa5a7643b5e1829c11d63",
+                "reference": "062231bf61d2b9448c4fa5a7643b5e1829c11d63",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3"
+                "php": "^7.3 || ^8.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.0"
@@ -9360,24 +9529,24 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2020-02-07T06:18:20+00:00"
+            "time": "2020-06-26T12:14:17+00:00"
         },
         {
             "name": "sebastian/resource-operations",
-            "version": "3.0.0",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "8c98bf0dfa1f9256d0468b9803a1e1df31b6fa98"
+                "reference": "0653718a5a629b065e91f774595267f8dc32e213"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/8c98bf0dfa1f9256d0468b9803a1e1df31b6fa98",
-                "reference": "8c98bf0dfa1f9256d0468b9803a1e1df31b6fa98",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0653718a5a629b065e91f774595267f8dc32e213",
+                "reference": "0653718a5a629b065e91f774595267f8dc32e213",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3"
+                "php": "^7.3 || ^8.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.0"
@@ -9405,24 +9574,24 @@
             ],
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "time": "2020-02-07T06:13:02+00:00"
+            "time": "2020-06-26T12:16:22+00:00"
         },
         {
             "name": "sebastian/type",
-            "version": "2.1.0",
+            "version": "2.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "bad49207c6f854e7a25cef0ea948ac8ebe3ef9d8"
+                "reference": "86991e2b33446cd96e648c18bcdb1e95afb2c05a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/bad49207c6f854e7a25cef0ea948ac8ebe3ef9d8",
-                "reference": "bad49207c6f854e7a25cef0ea948ac8ebe3ef9d8",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/86991e2b33446cd96e648c18bcdb1e95afb2c05a",
+                "reference": "86991e2b33446cd96e648c18bcdb1e95afb2c05a",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3"
+                "php": "^7.3 || ^8.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.2"
@@ -9430,7 +9599,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev"
+                    "dev-master": "2.2-dev"
                 }
             },
             "autoload": {
@@ -9451,24 +9620,24 @@
             ],
             "description": "Collection of value objects that represent the types of the PHP type system",
             "homepage": "https://github.com/sebastianbergmann/type",
-            "time": "2020-06-01T12:21:09+00:00"
+            "time": "2020-07-05T08:31:53+00:00"
         },
         {
             "name": "sebastian/version",
-            "version": "3.0.0",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "0411bde656dce64202b39c2f4473993a9081d39e"
+                "reference": "626586115d0ed31cb71483be55beb759b5af5a3c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/0411bde656dce64202b39c2f4473993a9081d39e",
-                "reference": "0411bde656dce64202b39c2f4473993a9081d39e",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/626586115d0ed31cb71483be55beb759b5af5a3c",
+                "reference": "626586115d0ed31cb71483be55beb759b5af5a3c",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3"
+                "php": "^7.3 || ^8.0"
             },
             "type": "library",
             "extra": {
@@ -9494,7 +9663,7 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2020-01-21T06:36:37+00:00"
+            "time": "2020-06-26T12:18:43+00:00"
         },
         {
             "name": "spomky-labs/otphp",
@@ -9620,7 +9789,7 @@
         },
         {
             "name": "symfony/config",
-            "version": "v5.1.0",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
@@ -9686,16 +9855,16 @@
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v5.1.0",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "6a6791e9584273b32eeb01790da4c7446d87a621"
+                "reference": "6508423eded583fc07e88a0172803e1a62f0310c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/6a6791e9584273b32eeb01790da4c7446d87a621",
-                "reference": "6a6791e9584273b32eeb01790da4c7446d87a621",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/6508423eded583fc07e88a0172803e1a62f0310c",
+                "reference": "6508423eded583fc07e88a0172803e1a62f0310c",
                 "shasum": ""
             },
             "require": {
@@ -9757,20 +9926,20 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
-            "time": "2020-05-30T20:35:19+00:00"
+            "time": "2020-06-12T08:11:32+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v2.1.2",
+            "version": "v2.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337"
+                "reference": "5e20b83385a77593259c9f8beb2c43cd03b2ac14"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337",
-                "reference": "dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5e20b83385a77593259c9f8beb2c43cd03b2ac14",
+                "reference": "5e20b83385a77593259c9f8beb2c43cd03b2ac14",
                 "shasum": ""
             },
             "require": {
@@ -9780,6 +9949,10 @@
             "extra": {
                 "branch-alias": {
                     "dev-master": "2.1-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -9803,20 +9976,20 @@
             ],
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
-            "time": "2020-05-27T08:34:37+00:00"
+            "time": "2020-06-06T08:49:21+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v5.1.0",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "e0d853bddc2b2cfb0d67b0b4496c03fffe1d37fa"
+                "reference": "f93055171b847915225bd5b0a5792888419d8d75"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e0d853bddc2b2cfb0d67b0b4496c03fffe1d37fa",
-                "reference": "e0d853bddc2b2cfb0d67b0b4496c03fffe1d37fa",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/f93055171b847915225bd5b0a5792888419d8d75",
+                "reference": "f93055171b847915225bd5b0a5792888419d8d75",
                 "shasum": ""
             },
             "require": {
@@ -9864,20 +10037,20 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2020-05-24T12:18:07+00:00"
+            "time": "2020-06-15T06:52:54+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v5.1.0",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "56261f89385f9d13cf843a5101ac72131190bc91"
+                "reference": "c0c418f05e727606e85b482a8591519c4712cf45"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/56261f89385f9d13cf843a5101ac72131190bc91",
-                "reference": "56261f89385f9d13cf843a5101ac72131190bc91",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/c0c418f05e727606e85b482a8591519c4712cf45",
+                "reference": "c0c418f05e727606e85b482a8591519c4712cf45",
                 "shasum": ""
             },
             "require": {
@@ -9927,11 +10100,11 @@
                 "mime",
                 "mime-type"
             ],
-            "time": "2020-05-25T12:33:44+00:00"
+            "time": "2020-06-09T15:07:35+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v5.1.0",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
@@ -9985,68 +10158,9 @@
             ],
             "time": "2020-05-23T13:08:13+00:00"
         },
-        {
-            "name": "symfony/polyfill-php70",
-            "version": "v1.17.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php70.git",
-                "reference": "82225c2d7d23d7e70515496d249c0152679b468e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/82225c2d7d23d7e70515496d249c0152679b468e",
-                "reference": "82225c2d7d23d7e70515496d249c0152679b468e",
-                "shasum": ""
-            },
-            "require": {
-                "paragonie/random_compat": "~1.0|~2.0|~9.99",
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.17-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php70\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ],
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2020-05-12T16:47:27+00:00"
-        },
         {
             "name": "symfony/stopwatch",
-            "version": "v5.1.0",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
@@ -10096,7 +10210,7 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v5.1.0",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
@@ -10159,16 +10273,16 @@
         },
         {
             "name": "thecodingmachine/safe",
-            "version": "v1.1.1",
+            "version": "v1.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thecodingmachine/safe.git",
-                "reference": "04f9ffae372a9816d4472dfb7bcf6126b623a9df"
+                "reference": "9f277171e296a3c8629c04ac93ec95ff0f208ccb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thecodingmachine/safe/zipball/04f9ffae372a9816d4472dfb7bcf6126b623a9df",
-                "reference": "04f9ffae372a9816d4472dfb7bcf6126b623a9df",
+                "url": "https://api.github.com/repos/thecodingmachine/safe/zipball/9f277171e296a3c8629c04ac93ec95ff0f208ccb",
+                "reference": "9f277171e296a3c8629c04ac93ec95ff0f208ccb",
                 "shasum": ""
             },
             "require": {
@@ -10288,7 +10402,7 @@
                 "MIT"
             ],
             "description": "PHP core functions that throw exceptions instead of returning FALSE on error",
-            "time": "2020-05-04T15:25:36+00:00"
+            "time": "2020-07-10T09:34:29+00:00"
         },
         {
             "name": "theseer/fdomdocument",
@@ -10332,23 +10446,23 @@
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.1.3",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9"
+                "reference": "75a63c33a8577608444246075ea0af0d052e452a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
-                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/75a63c33a8577608444246075ea0af0d052e452a",
+                "reference": "75a63c33a8577608444246075ea0af0d052e452a",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-tokenizer": "*",
                 "ext-xmlwriter": "*",
-                "php": "^7.0"
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "autoload": {
@@ -10368,25 +10482,25 @@
                 }
             ],
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
-            "time": "2019-06-13T22:48:21+00:00"
+            "time": "2020-07-12T23:59:07+00:00"
         },
         {
             "name": "vlucas/phpdotenv",
-            "version": "v2.6.5",
+            "version": "v2.6.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "2e977311ffb17b2f82028a9c36824647789c6365"
+                "reference": "e1d57f62db3db00d9139078cbedf262280701479"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2e977311ffb17b2f82028a9c36824647789c6365",
-                "reference": "2e977311ffb17b2f82028a9c36824647789c6365",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/e1d57f62db3db00d9139078cbedf262280701479",
+                "reference": "e1d57f62db3db00d9139078cbedf262280701479",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.3.9 || ^7.0 || ^8.0",
-                "symfony/polyfill-ctype": "^1.16"
+                "symfony/polyfill-ctype": "^1.17"
             },
             "require-dev": {
                 "ext-filter": "*",
@@ -10430,27 +10544,28 @@
                 "env",
                 "environment"
             ],
-            "time": "2020-06-02T14:06:52+00:00"
+            "time": "2020-07-14T17:54:18+00:00"
         },
         {
             "name": "webmozart/assert",
-            "version": "1.8.0",
+            "version": "1.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozart/assert.git",
-                "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6"
+                "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/ab2cb0b3b559010b75981b1bdce728da3ee90ad6",
-                "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389",
+                "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.3 || ^7.0",
+                "php": "^5.3.3 || ^7.0 || ^8.0",
                 "symfony/polyfill-ctype": "^1.8"
             },
             "conflict": {
+                "phpstan/phpstan": "<0.12.20",
                 "vimeo/psalm": "<3.9.1"
             },
             "require-dev": {
@@ -10478,7 +10593,7 @@
                 "check",
                 "validate"
             ],
-            "time": "2020-04-18T12:12:48+00:00"
+            "time": "2020-07-08T17:02:28+00:00"
         },
         {
             "name": "weew/helpers-array",
@@ -10521,7 +10636,7 @@
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": [],
-    "prefer-stable": true,
+    "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
         "php": "~7.3.0||~7.4.0",
diff --git a/lib/internal/Magento/Framework/Amqp/composer.json b/lib/internal/Magento/Framework/Amqp/composer.json
index fc65e37d12ecf..44846c23a48e4 100644
--- a/lib/internal/Magento/Framework/Amqp/composer.json
+++ b/lib/internal/Magento/Framework/Amqp/composer.json
@@ -10,7 +10,7 @@
         "AFL-3.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"
     },
@@ -21,5 +21,6 @@
         "files": [
             "registration.php"
         ]
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/lib/internal/Magento/Framework/Bulk/composer.json b/lib/internal/Magento/Framework/Bulk/composer.json
index b8e0992182169..cf6d64227ddf9 100644
--- a/lib/internal/Magento/Framework/Bulk/composer.json
+++ b/lib/internal/Magento/Framework/Bulk/composer.json
@@ -10,7 +10,7 @@
         "AFL-3.0"
     ],
     "require": {
-        "magento/framework": "*",
+        "magento/framework": "103.0.*",
         "php": "~7.3.0||~7.4.0"
     },
     "autoload": {
@@ -20,5 +20,6 @@
         "files": [
             "registration.php"
         ]
-    }
+    },
+    "version": "101.0.0"
 }
diff --git a/lib/internal/Magento/Framework/MessageQueue/composer.json b/lib/internal/Magento/Framework/MessageQueue/composer.json
index 056f1d40c39cf..889a6c37d0911 100644
--- a/lib/internal/Magento/Framework/MessageQueue/composer.json
+++ b/lib/internal/Magento/Framework/MessageQueue/composer.json
@@ -10,7 +10,7 @@
         "AFL-3.0"
     ],
     "require": {
-        "magento/framework": "*",
+        "magento/framework": "103.0.*",
         "php": "~7.3.0||~7.4.0"
     },
     "autoload": {
@@ -20,5 +20,6 @@
         "files": [
             "registration.php"
         ]
-    }
+    },
+    "version": "100.4.0"
 }
diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json
index dfc81189bf544..3bd1d83ff0338 100644
--- a/lib/internal/Magento/Framework/composer.json
+++ b/lib/internal/Magento/Framework/composer.json
@@ -59,5 +59,6 @@
         "files": [
             "registration.php"
         ]
-    }
+    },
+    "version": "103.0.0"
 }

From 2af87179617897d39c97dcddbfa89576cf95578d Mon Sep 17 00:00:00 2001
From: Nikita Sarychev <sarron80@yandex.ru>
Date: Mon, 20 Jul 2020 20:32:32 +0300
Subject: [PATCH 0943/1718] Update Price.php

---
 .../Magento/Backend/Block/Widget/Grid/Column/Filter/Price.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Price.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Price.php
index c6e271c3ec304..b8c12b434652d 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Price.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Price.php
@@ -194,11 +194,11 @@ public function getCondition()
         $rate = $this->_getRate($displayCurrency, $this->_getColumnCurrencyCode());
 
         if (isset($value['from'])) {
-            $value['from'] *= $rate;
+            $value['from'] = (float) $value['from'] * $rate;
         }
 
         if (isset($value['to'])) {
-            $value['to'] *= $rate;
+            $value['to'] = (float) $value['to'] * $rate;
         }
 
         $this->prepareRates($displayCurrency);

From 6729b6e01368248abc33300208eb292c95050203 Mon Sep 17 00:00:00 2001
From: magento-team <mage2-team@magento.com>
Date: Mon, 20 Jul 2020 10:37:42 -0700
Subject: [PATCH 0944/1718] Updated deprecation doc annotations

---
 .../Block/System/Messages.php                 |  2 +-
 .../Adminhtml/System/Message/ListAction.php   |  2 +-
 .../Model/Export/AdvancedPricing.php          |  4 +-
 .../Model/Client/ClientResolver.php           |  6 +--
 .../Connector/Http/ConverterInterface.php     |  5 ++
 .../Magento/Analytics/ReportXml/Query.php     |  1 -
 .../Api/BulkStatusInterface.php               |  3 ++
 .../Api/Data/AsyncResponseInterface.php       |  9 ++++
 .../Data/BulkOperationsStatusInterface.php    |  3 ++
 .../Api/Data/BulkSummaryInterface.php         |  2 +
 .../DetailedBulkOperationsStatusInterface.php |  3 ++
 .../Api/Data/ItemStatusInterface.php          | 11 ++++
 .../Data/OperationSearchResultsInterface.php  |  3 ++
 .../Data/SummaryOperationStatusInterface.php  |  5 ++
 .../Api/OperationRepositoryInterface.php      |  2 +
 .../Api/SaveMultipleOperationsInterface.php   |  2 +
 .../Model/ConfigInterface.php                 |  3 ++
 .../Operation/OperationRepository.php         |  2 +-
 .../Magento/Backend/App/AbstractAction.php    |  2 +-
 app/code/Magento/Backend/Block/Dashboard.php  |  2 +-
 .../Magento/Backend/Block/Dashboard/Graph.php |  2 +-
 .../Magento/Backend/Block/Dashboard/Grids.php |  1 +
 .../Backend/Block/Dashboard/Orders/Grid.php   |  1 +
 .../Magento/Backend/Block/Dashboard/Sales.php |  1 +
 .../Backend/Block/Dashboard/Totals.php        |  1 +
 .../Magento/Backend/Block/Media/Uploader.php  |  4 +-
 .../Magento/Backend/Block/Page/Footer.php     |  1 +
 .../Block/Page/System/Config/Robots/Reset.php |  2 +-
 .../Widget/Form/Element/ElementCreator.php    |  2 +-
 .../Backend/Block/Widget/Grid/Massaction.php  |  1 +
 .../Controller/Adminhtml/System/Store.php     |  2 +-
 .../Magento/Backend/Helper/Dashboard/Data.php |  2 +-
 app/code/Magento/Backend/Model/Url.php        |  1 +
 .../Ui/Component/Control/DeleteButton.php     |  2 +
 .../Ui/Component/Control/SaveSplitButton.php  |  2 +
 .../Component/Listing/Column/EditAction.php   |  2 +
 .../Backup/Controller/Adminhtml/Index.php     |  1 +
 app/code/Magento/Backup/Helper/Data.php       |  1 +
 app/code/Magento/Backup/Model/Db.php          |  2 +-
 .../Magento/Backup/Model/ResourceModel/Db.php |  1 +
 .../Backup/Model/ResourceModel/Helper.php     |  1 +
 .../Fieldset/Options/Type/Checkbox.php        |  1 +
 .../Composite/Fieldset/Options/Type/Multi.php |  1 +
 .../Bundle/Pricing/Price/ConfiguredPrice.php  |  1 +
 .../Model/Import/Product/Type/Bundle.php      |  2 +-
 .../Catalog/Api/BasePriceStorageInterface.php |  6 +--
 .../Api/CategoryListDeleteBySkuInterface.php  |  3 +-
 .../Catalog/Api/CategoryListInterface.php     |  4 +-
 .../Catalog/Api/CostStorageInterface.php      |  8 +--
 .../Catalog/Api/Data/BasePriceInterface.php   | 18 +++----
 .../Api/Data/CategoryLinkInterface.php        | 14 +++---
 .../Data/CategorySearchResultsInterface.php   |  6 +--
 .../Catalog/Api/Data/CostInterface.php        | 18 +++----
 .../Api/Data/EavAttributeInterface.php        |  6 +--
 .../Api/Data/PriceUpdateResultInterface.php   | 14 +++---
 .../Api/Data/ProductAttributeInterface.php    |  1 +
 .../Data/ProductFrontendActionInterface.php   | 26 +++++-----
 .../Data/ProductRender/ButtonInterface.php    | 18 +++----
 .../FormattedPriceInfoInterface.php           | 34 ++++++-------
 .../Api/Data/ProductRender/ImageInterface.php | 34 ++++++-------
 .../Data/ProductRender/PriceInfoInterface.php | 38 +++++++-------
 .../Api/Data/ProductRenderInterface.php       | 50 +++++++++----------
 .../Api/Data/SpecialPriceInterface.php        | 26 +++++-----
 .../Catalog/Api/Data/TierPriceInterface.php   | 30 +++++------
 .../Api/ProductRenderListInterface.php        |  4 +-
 .../ProductTierPriceManagementInterface.php   |  2 +-
 ...pedProductTierPriceManagementInterface.php |  8 +--
 .../Catalog/Api/SpecialPriceInterface.php     |  7 +--
 .../Api/SpecialPriceStorageInterface.php      |  8 +--
 .../Catalog/Api/TierPriceStorageInterface.php | 10 ++--
 .../Catalog/Block/Adminhtml/Product/Edit.php  |  2 +-
 .../Product/Edit/Tab/Ajax/Serializer.php      |  4 +-
 .../Adminhtml/Product/Edit/Tab/Crosssell.php  |  2 +-
 .../Adminhtml/Product/Edit/Tab/Related.php    |  2 +-
 .../Adminhtml/Product/Edit/Tab/Upsell.php     |  2 +-
 .../Catalog/Block/FrontendStorageManager.php  |  4 +-
 .../Catalog/Block/Product/AbstractProduct.php |  4 +-
 .../Block/Product/Compare/ListCompare.php     |  1 +
 .../Magento/Catalog/Block/Product/Context.php |  2 +-
 .../Magento/Catalog/Block/Product/Image.php   |  6 +--
 .../Catalog/Block/Product/ImageBuilder.php    |  2 +-
 .../Block/Product/ProductList/Toolbar.php     |  8 +--
 .../Magento/Catalog/Block/Product/View.php    |  2 +-
 .../Block/Product/View/AbstractView.php       |  2 +-
 .../Catalog/Block/Product/View/Attributes.php |  1 +
 .../Catalog/Block/Product/View/Details.php    |  2 +
 .../Product/View/Options/AbstractOptions.php  |  3 +-
 .../Catalog/Block/Ui/ProductViewCounter.php   |  4 +-
 .../Product/Initialization/Helper.php         |  2 +-
 app/code/Magento/Catalog/Helper/Data.php      |  2 +-
 app/code/Magento/Catalog/Helper/Image.php     |  4 +-
 .../Magento/Catalog/Model/AbstractModel.php   |  2 +-
 .../Attribute/Backend/Customlayoutupdate.php  |  3 +-
 app/code/Magento/Catalog/Model/Category.php   |  8 +--
 .../Category/Attribute/Source/Layout.php      |  2 +-
 .../Catalog/Model/Category/DataProvider.php   |  4 +-
 .../Magento/Catalog/Model/CategoryList.php    |  2 +-
 .../FrontendStorageConfigurationInterface.php |  4 +-
 .../Category/Product/AbstractAction.php       |  6 ++-
 .../Indexer/Product/Flat/TableBuilder.php     |  2 +-
 .../Indexer/Product/Price/AbstractAction.php  |  4 +-
 .../Indexer/Product/Price/Action/Full.php     |  2 +-
 .../Product/Price/UpdateIndexInterface.php    |  4 +-
 app/code/Magento/Catalog/Model/Product.php    | 31 ++++++------
 .../Model/Product/Attribute/Backend/Stock.php |  2 +-
 .../Attribute/Source/Countryofmanufacture.php |  2 +-
 .../Model/Product/Attribute/Source/Layout.php |  2 +-
 .../Item/ItemResolverInterface.php            |  2 +
 .../Magento/Catalog/Model/Product/Image.php   |  6 +--
 .../Magento/Catalog/Model/Product/Link.php    |  2 +-
 .../Magento/Catalog/Model/Product/Option.php  |  4 +-
 .../Model/Product/Option/Type/DefaultType.php |  3 +-
 .../Model/Product/Option/Type/File.php        |  4 +-
 .../Model/Product/Price/Validation/Result.php |  8 +--
 .../Model/Product/Type/AbstractType.php       |  4 +-
 .../Model/Product/Type/FrontSpecialPrice.php  |  4 +-
 .../Catalog/Model/Product/Type/Price.php      |  6 ++-
 .../Model/ProductIdLocatorInterface.php       |  4 +-
 .../Catalog/Model/ProductLink/Repository.php  |  8 +--
 .../Catalog/Model/ProductRepository.php       | 12 ++---
 .../ResourceModel/Category/Collection.php     |  1 +
 .../Model/ResourceModel/Category/Flat.php     |  2 +-
 .../Model/ResourceModel/Eav/Attribute.php     |  7 +--
 .../ResourceModel/Layer/Filter/Price.php      |  1 +
 .../Catalog/Model/ResourceModel/Product.php   | 14 +++---
 .../ResourceModel/Product/Collection.php      |  5 +-
 ...ositeProductBatchSizeAdjusterInterface.php |  4 +-
 .../Product/Indexer/Price/DefaultPrice.php    |  4 +-
 .../Backend/Catalog/Url/Rewrite/Suffix.php    |  4 +-
 .../Catalog/Pricing/Price/ConfiguredPrice.php |  2 +-
 .../Catalog/Pricing/Price/TierPrice.php       |  2 +-
 .../Ui/Component/Listing/Columns/Websites.php |  1 +
 .../Product/Form/Modifier/Alerts.php          |  2 -
 .../Product/Form/Modifier/Categories.php      |  2 +-
 .../Product/Form/Modifier/LayoutUpdate.php    |  1 -
 .../Product/Form/Modifier/TierPrice.php       |  6 +--
 .../Product/Listing/Collector/Image.php       |  2 +-
 .../Product/ProductDataProvider.php           |  1 +
 .../ProductRenderCollectorInterface.php       |  4 +-
 .../Resolver/Product/MediaGalleryEntries.php  |  2 +-
 .../Model/Export/Product.php                  |  3 +-
 .../Model/Import/Product.php                  | 11 ++--
 .../Model/Import/Product/LinkProcessor.php    |  2 +-
 .../Import/Product/Type/AbstractType.php      |  1 +
 .../Model/StockItemImporterInterface.php      |  2 +
 .../Api/Data/StockCollectionInterface.php     |  2 +-
 .../Api/Data/StockInterface.php               |  2 +-
 .../Api/Data/StockItemCollectionInterface.php |  2 +-
 .../Api/Data/StockItemInterface.php           |  2 +-
 .../Data/StockStatusCollectionInterface.php   |  2 +-
 .../Api/Data/StockStatusInterface.php         |  2 +-
 .../Api/RegisterProductSaleInterface.php      |  4 +-
 .../Api/RevertProductSaleInterface.php        |  4 +-
 .../Api/StockConfigurationInterface.php       |  2 +-
 .../Api/StockCriteriaInterface.php            |  2 +-
 .../Api/StockIndexInterface.php               |  2 +-
 .../Api/StockItemCriteriaInterface.php        |  2 +-
 .../Api/StockItemRepositoryInterface.php      |  2 +-
 .../Api/StockManagementInterface.php          |  2 +-
 .../Api/StockRegistryInterface.php            |  2 +-
 .../Api/StockRepositoryInterface.php          |  2 +-
 .../Api/StockStateInterface.php               |  2 +-
 .../Api/StockStatusCriteriaInterface.php      |  2 +-
 .../Api/StockStatusRepositoryInterface.php    |  2 +-
 .../Block/Adminhtml/Form/Field/Minsaleqty.php |  2 +-
 .../Block/Adminhtml/Form/Field/Stock.php      |  2 +-
 .../CatalogInventory/Block/Qtyincrements.php  |  2 +-
 .../Block/Stockqty/DefaultStockqty.php        |  2 +-
 .../Magento/CatalogInventory/Helper/Stock.php |  3 +-
 .../Model/Adminhtml/Stock/Item.php            |  2 +-
 .../Model/Quote/Item/QuantityValidator.php    |  2 +-
 .../Indexer/Stock/DefaultStock.php            |  2 +-
 .../Indexer/Stock/QueryProcessorInterface.php |  2 +-
 .../Indexer/Stock/StockInterface.php          |  2 +-
 .../ResourceModel/Indexer/StockFactory.php    |  2 +-
 .../Model/ResourceModel/Stock.php             |  6 +--
 .../Model/ResourceModel/Stock/Status.php      |  4 +-
 .../Model/Source/Backorders.php               |  2 +-
 .../CatalogInventory/Model/Source/Stock.php   |  3 +-
 .../Spi/StockRegistryProviderInterface.php    |  2 +-
 .../Model/Spi/StockStateProviderInterface.php |  2 +-
 .../Model/Indexer/IndexBuilder.php            | 18 +++----
 .../Magento/CatalogSearch/Model/Advanced.php  |  2 +-
 .../CatalogSearch/Model/Indexer/Fulltext.php  |  1 +
 .../Model/Indexer/Fulltext/Action/Full.php    | 30 +++++------
 .../Indexer/Scope/UnknownStateException.php   |  2 +-
 .../ResourceModel/Advanced/Collection.php     |  6 +++
 .../Model/ResourceModel/EngineProvider.php    |  2 +-
 .../Model/ResourceModel/Fulltext.php          |  3 +-
 .../ResourceModel/Fulltext/Collection.php     |  5 ++
 .../DefaultFilterStrategyApplyChecker.php     |  2 +-
 ...ultFilterStrategyApplyCheckerInterface.php |  2 +-
 .../Model/Search/ReaderPlugin.php             |  2 +-
 .../RequestGenerator/GeneratorResolver.php    |  2 +-
 .../CurrentUrlRewritesRegenerator.php         |  4 +-
 .../Model/CategoryUrlRewriteGenerator.php     |  2 +-
 .../Product/CurrentUrlRewritesRegenerator.php |  6 +--
 .../Model/ProductUrlRewriteGenerator.php      | 16 +++---
 .../Api/AgreementsValidatorInterface.php      |  1 +
 .../Api/Data/PaymentDetailsInterface.php      |  1 +
 .../Api/Data/ShippingInformationInterface.php |  1 +
 .../Api/Data/TotalsInformationInterface.php   |  1 +
 ...tPaymentInformationManagementInterface.php |  1 +
 ...ShippingInformationManagementInterface.php |  1 +
 ...stTotalsInformationManagementInterface.php |  1 +
 .../PaymentInformationManagementInterface.php |  1 +
 ...ShippingInformationManagementInterface.php |  1 +
 .../TotalsInformationManagementInterface.php  |  1 +
 app/code/Magento/Checkout/Block/Cart.php      |  3 +-
 .../Checkout/Block/Cart/Additional/Info.php   |  1 +
 .../Magento/Checkout/Block/Cart/Coupon.php    |  2 +
 .../Magento/Checkout/Block/Cart/Crosssell.php |  1 +
 app/code/Magento/Checkout/Block/Cart/Grid.php | 11 ++--
 .../Checkout/Block/Cart/Item/Configure.php    |  1 +
 .../Checkout/Block/Cart/Item/Renderer.php     |  1 +
 .../Block/Cart/Item/Renderer/Actions.php      |  1 +
 .../Block/Cart/Item/Renderer/Actions/Edit.php |  1 +
 .../Cart/Item/Renderer/Actions/Remove.php     |  1 +
 .../Magento/Checkout/Block/Cart/Shipping.php  |  1 +
 .../Magento/Checkout/Block/Cart/Sidebar.php   |  1 +
 .../Magento/Checkout/Block/Cart/Totals.php    |  1 +
 .../Block/Cart/ValidationMessages.php         |  1 +
 .../Block/Checkout/AttributeMerger.php        |  2 +-
 .../Checkout/LayoutProcessorInterface.php     |  1 +
 .../Checkout/Block/Item/Price/Renderer.php    |  1 +
 app/code/Magento/Checkout/Block/Onepage.php   |  1 +
 .../Checkout/Block/Onepage/Failure.php        |  1 +
 .../Magento/Checkout/Block/Onepage/Link.php   |  1 +
 .../Checkout/Block/Onepage/Success.php        |  1 +
 .../Checkout/Block/QuoteShortcutButtons.php   |  1 +
 .../Magento/Checkout/Block/Registration.php   |  1 +
 .../Checkout/Controller/Account/Create.php    |  2 +-
 .../Checkout/CustomerData/AbstractItem.php    |  1 +
 .../Checkout/CustomerData/ItemInterface.php   |  1 +
 app/code/Magento/Checkout/Exception.php       |  1 +
 app/code/Magento/Checkout/Model/Cart.php      |  1 +
 .../Checkout/Model/Cart/CartInterface.php     |  1 +
 .../Checkout/Model/Cart/ImageProvider.php     |  8 ++-
 .../Model/Cart/RequestInfoFilterComposite.php |  1 -
 .../Model/CompositeConfigProvider.php         |  1 +
 .../Model/ConfigProviderInterface.php         |  1 +
 .../GuestPaymentInformationManagement.php     |  2 +-
 .../Model/Layout/AbstractTotalsProcessor.php  |  1 +
 .../Model/PaymentInformationManagement.php    |  4 +-
 app/code/Magento/Checkout/Model/Session.php   |  1 +
 .../Model/Session/SuccessValidator.php        |  1 +
 .../Api/CheckoutAgreementsListInterface.php   |  2 +
 .../CheckoutAgreementsRepositoryInterface.php |  2 +-
 .../Block/Adminhtml/Agreement/Grid.php        |  2 +-
 .../Magento/Cms/Api/Data/PageInterface.php    |  8 +--
 .../Cms/Api/GetBlockByIdentifierInterface.php |  2 +
 .../Cms/Api/GetPageByIdentifierInterface.php  |  2 +
 .../GetUtilityPageIdentifiersInterface.php    |  2 +
 .../Adminhtml/Page/PostDataProcessor.php      |  2 +-
 .../Magento/Cms/Model/BlockRepository.php     |  2 +-
 .../Cms/Model/Page/Source/PageLayout.php      |  2 +-
 app/code/Magento/Cms/Model/PageRepository.php |  2 +-
 app/code/Magento/Cms/Model/Wysiwyg/Config.php |  4 +-
 .../Config/Source/EnvironmentConfigSource.php |  4 +-
 .../Source/InitialSnapshotConfigSource.php    |  4 +-
 .../Config/Block/System/Config/Edit.php       |  1 +
 .../Config/Block/System/Config/Form.php       |  4 +-
 .../Field/FieldArray/AbstractFieldArray.php   |  2 +-
 .../Form/Fieldset/Modules/DisableOutput.php   | 20 ++++----
 .../ConfigSet/ConfigSetProcessorFactory.php   |  4 +-
 .../ConfigSet/ConfigSetProcessorInterface.php |  4 +-
 .../Command/ConfigSet/DefaultProcessor.php    |  4 +-
 .../Command/ConfigSet/ProcessorFacade.php     |  7 +--
 .../Console/Command/ConfigSetCommand.php      |  6 +--
 .../Command/ConfigShow/ValueProcessor.php     |  4 +-
 .../Console/Command/ConfigShowCommand.php     |  6 +--
 .../Adminhtml/System/AbstractConfig.php       |  2 +-
 .../Adminhtml/System/ConfigSectionChecker.php |  2 +-
 .../Model/Config/Backend/Admin/Robots.php     |  2 +-
 .../Config/Model/Config/Backend/Baseurl.php   |  2 +-
 .../Model/Config/Backend/Currency/Allow.php   |  2 +-
 .../Model/Config/Export/ExcludeList.php       |  6 +--
 .../Magento/Config/Model/Config/Importer.php  |  6 +--
 .../Config/Model/Config/Parser/Comment.php    |  4 +-
 .../Config/Model/Config/PathValidator.php     |  4 +-
 .../Reader/Source/Deployed/DocumentRoot.php   |  6 +--
 .../Magento/Config/Model/Config/Structure.php |  4 +-
 .../Config/Structure/AbstractElement.php      |  4 +-
 .../ConcealInProductionConfigList.php         |  9 ++--
 .../Config/Structure/ElementInterface.php     |  2 +-
 .../ElementVisibility/ConcealInProduction.php |  5 +-
 .../ConcealInProductionWithoutScdOnDemand.php |  3 ++
 .../Structure/ElementVisibilityComposite.php  |  6 +--
 .../Structure/ElementVisibilityInterface.php  |  6 +--
 .../Config/StructureElementInterface.php      |  2 +
 .../Magento/Config/Model/Config/TypePool.php  |  6 +--
 .../Config/Model/PreparedValueFactory.php     |  4 +-
 .../Block/Cart/Item/Renderer/Configurable.php |  1 +
 .../Block/Product/View/Type/Configurable.php  | 10 ++--
 .../AttributeOptionProviderInterface.php      |  4 +-
 .../Model/LinkManagement.php                  |  2 +-
 .../Model/Product/Type/Configurable.php       |  4 +-
 .../Configurable/Attribute/Collection.php     |  3 +-
 .../Type/Configurable/Product/Collection.php  |  1 +
 .../Price/ConfigurablePriceResolver.php       |  4 +-
 app/code/Magento/Cookie/Helper/Cookie.php     |  2 +-
 .../Api/CustomerGroupConfigInterface.php      |  4 +-
 .../Block/Account/AuthenticationPopup.php     |  2 +-
 .../Block/Account/AuthorizationLink.php       |  2 +-
 .../Customer/Block/Account/Dashboard.php      |  2 +-
 .../Customer/Block/Account/Delimiter.php      |  4 +-
 .../Magento/Customer/Block/Account/Link.php   |  2 +-
 .../Customer/Block/Account/Navigation.php     |  4 +-
 .../Block/Account/SortLinkInterface.php       |  4 +-
 .../Magento/Customer/Block/Address/Book.php   |  8 +--
 .../Magento/Customer/Block/Address/Grid.php   |  9 ++++
 .../Block/Adminhtml/Edit/Tab/Cart.php         |  1 +
 .../Magento/Customer/Block/CustomerData.php   |  4 +-
 .../Customer/Block/CustomerScopeData.php      |  5 +-
 .../Customer/Controller/AbstractAccount.php   |  2 +-
 .../Customer/Controller/Account/Confirm.php   |  4 +-
 .../Controller/Account/CreatePost.php         |  2 +-
 .../Customer/Controller/Adminhtml/Index.php   | 16 +++---
 .../Controller/Adminhtml/Index/Cart.php       |  2 +-
 .../Controller/Adminhtml/Index/Save.php       |  4 +-
 .../Customer/Controller/Section/Load.php      |  2 +-
 .../Customer/CustomerData/SectionPool.php     |  1 +
 app/code/Magento/Customer/Helper/Address.php  |  4 +-
 .../Customer/Model/Account/Redirect.php       |  2 +-
 .../Customer/Model/AccountManagement.php      |  4 +-
 app/code/Magento/Customer/Model/Address.php   |  2 +-
 .../Model/Address/AbstractAddress.php         |  8 +--
 .../Model/Address/ValidatorInterface.php      |  2 +
 .../Model/AuthenticationInterface.php         |  5 ++
 .../Model/Checkout/ConfigProvider.php         |  2 +-
 .../Customer/Model/Config/Source/Group.php    |  4 +-
 .../Model/Config/Source/Group/Multiselect.php |  4 +-
 app/code/Magento/Customer/Model/Customer.php  |  5 +-
 .../Customer/Attribute/Backend/Password.php   |  4 +-
 .../Customer/Model/Customer/DataProvider.php  |  4 +-
 .../Customer/Source/GroupSourceInterface.php  |  2 +-
 .../Model/Group/RetrieverInterface.php        |  4 +-
 .../Customer/Model/Metadata/Form/File.php     |  2 +-
 app/code/Magento/Customer/Model/Options.php   |  2 +-
 .../Customer/Model/ResourceModel/Address.php  |  4 +-
 .../Address/Attribute/Source/Country.php      |  2 +-
 .../Model/ResourceModel/Address/Relation.php  |  2 +-
 .../Model/ResourceModel/AddressRepository.php |  4 +-
 .../ResourceModel/CustomerRepository.php      |  2 +-
 .../Model/ResourceModel/GroupRepository.php   |  6 +--
 .../Model/Import/Address.php                  |  8 +--
 .../Model/Import/Customer.php                 |  2 +
 .../ResourceModel/Import/Customer/Storage.php |  2 +-
 app/code/Magento/Dhl/Model/Carrier.php        |  4 +-
 app/code/Magento/Directory/Block/Data.php     |  2 +-
 .../Model/ResourceModel/Currency.php          |  2 +-
 .../Composite/Fieldset/Downloadable.php       |  2 +-
 .../Catalog/Product/Edit/Tab/Downloadable.php |  2 +-
 .../Product/Edit/Tab/Downloadable/Links.php   |  2 +-
 .../Product/Edit/Tab/Downloadable/Samples.php |  2 +-
 .../Downloadable/Product/Edit/Form.php        |  2 +-
 .../Downloadable/Model/Sample/Builder.php     |  1 +
 .../Data/AttributeDefaultValueInterface.php   |  6 +--
 .../Eav/Api/Data/AttributeInterface.php       |  1 +
 .../Eav/Block/Adminhtml/Attribute/Edit/Js.php |  2 +-
 .../Edit/Options/AbstractOptions.php          |  2 +-
 .../Adminhtml/Attribute/Grid/AbstractGrid.php |  2 +-
 .../Eav/Model/Attribute/GroupRepository.php   |  4 +-
 .../Magento/Eav/Model/AttributeRepository.php |  2 +-
 .../Eav/Model/AttributeSetRepository.php      |  4 +-
 app/code/Magento/Eav/Model/Config.php         |  8 +--
 .../Eav/Model/Entity/AbstractEntity.php       |  4 +-
 .../Entity/Attribute/AbstractAttribute.php    |  8 +--
 .../AttributeGroupAlreadyExistsException.php  |  2 +-
 .../Entity/Attribute/Backend/JsonEncoded.php  |  6 +--
 .../Eav/Model/Entity/Attribute/Set.php        |  2 +-
 .../Entity/Collection/AbstractCollection.php  |  1 +
 .../Model/ResourceModel/Entity/Attribute.php  |  1 +
 .../Eav/Model/ResourceModel/ReadHandler.php   |  2 +-
 .../Model/TypeLocator/ServiceClassLocator.php |  2 +-
 app/code/Magento/Eav/Setup/EavSetup.php       |  2 +-
 .../EavGraphQl/Model/Resolver/Query/Type.php  |  2 +
 .../Config/Elasticsearch5/TestConnection.php  |  2 +-
 .../FieldMapper/ProductFieldMapperProxy.php   |  2 -
 .../Model/Client/Elasticsearch.php            |  2 +-
 .../Elasticsearch5/SearchAdapter/Mapper.php   | 16 +++---
 .../SearchAdapter/Query/Builder.php           | 14 +++---
 .../FieldType/ConverterInterface.php          |  2 +
 .../Elasticsearch/Model/Adapter/FieldType.php |  5 +-
 .../Model/DataProvider/Suggestions.php        |  2 +-
 .../DefaultFilterStrategyApplyChecker.php     |  2 +-
 .../Elasticsearch/SearchAdapter/Mapper.php    |  2 +-
 .../Email/Block/Adminhtml/Template/Edit.php   |  2 +-
 .../Controller/Adminhtml/Email/Template.php   |  2 +-
 .../Magento/Email/Model/Template/Filter.php   |  8 +--
 .../GiftMessage/Block/Message/Inline.php      |  2 +-
 .../Magento/GoogleAdwords/Helper/Data.php     |  2 +
 .../Magento/GraphQl/Controller/GraphQl.php    |  6 ++-
 .../GraphQl/Model/Query/Resolver/Context.php  |  2 +-
 .../Order/Email/Items/CreditMemo/Grouped.php  |  2 +
 .../Api/Data/ExportInfoInterface.php          | 11 ++++
 .../Api/ExportManagementInterface.php         |  2 +
 .../Magento/ImportExport/Helper/Report.php    |  1 +
 .../Magento/ImportExport/Model/Export.php     |  2 +-
 .../ImportExport/Model/Export/Adapter/Csv.php |  1 +
 .../Magento/ImportExport/Model/History.php    |  1 +
 .../Magento/ImportExport/Model/Import.php     |  1 +
 .../Magento/InstantPurchase/Block/Button.php  |  3 ++
 .../BillingAddressChooserInterface.php        |  2 +
 .../Model/InstantPurchaseInterface.php        |  2 +
 .../Model/InstantPurchaseOption.php           |  6 +++
 .../Model/InstantPurchaseOptionFactory.php    |  3 ++
 .../PaymentTokenChooserInterface.php          |  2 +
 .../InstantPurchase/Model/PlaceOrder.php      |  2 +
 .../QuoteManagement/PaymentConfiguration.php  |  2 +
 .../Model/QuoteManagement/Purchase.php        |  2 +
 .../Model/QuoteManagement/QuoteCreation.php   |  2 +
 .../Model/QuoteManagement/QuoteFilling.php    |  2 +
 .../QuoteManagement/ShippingConfiguration.php |  2 +
 .../ShippingAddressChooserInterface.php       |  2 +
 ...DeferredShippingMethodChooserInterface.php |  2 +
 .../DeferredShippingMethodChooserPool.php     |  2 +
 .../ShippingMethodChooserInterface.php        |  2 +
 .../Model/Ui/CustomerAddressesFormatter.php   |  2 +
 .../Model/Ui/PaymentTokenFormatter.php        |  2 +
 .../Model/Ui/ShippingMethodFormatter.php      |  2 +
 .../AvailabilityCheckerInterface.php          |  2 +
 ...AdditionalInformationProviderInterface.php |  2 +
 .../PaymentTokenFormatterInterface.php        |  2 +
 .../StaticAdditionalInformationProvider.php   |  2 +
 .../StaticAvailabilityChecker.php             |  2 +
 .../LayeredNavigation/Block/Navigation.php    |  1 +
 .../Block/Adminhtml/ConfirmationPopup.php     |  3 ++
 .../Api/ConfigInterface.php                   |  4 ++
 .../Api/Data/AuthenticationDataInterface.php  |  4 ++
 ...GetAuthenticationDataBySecretInterface.php |  2 +
 ...sLoginAsCustomerSessionActiveInterface.php |  2 +
 .../Api/SaveAuthenticationDataInterface.php   |  2 +
 .../Api/Data/LogInterface.php                 | 15 ++++++
 .../Api/Data/LogSearchResultsInterface.php    |  3 ++
 .../Api/GetLogsListInterface.php              |  2 +
 .../Api/SaveLogsInterface.php                 |  2 +
 .../Api/Data/ContentAssetLinkInterface.php    |  5 ++
 .../Api/Data/ContentIdentityInterface.php     |  6 +++
 ...teContentAssetLinksByAssetIdsInterface.php |  2 +
 .../Api/DeleteContentAssetLinksInterface.php  |  2 +
 .../Api/ExtractAssetsFromContentInterface.php |  2 +
 .../GetAssetIdsByContentIdentityInterface.php |  2 +
 .../Api/GetContentByAssetIdsInterface.php     |  2 +
 .../Api/SaveContentAssetLinksInterface.php    |  2 +
 .../Model/GetEntityContentsInterface.php      |  2 +
 .../Asset/Command/DeleteByDirectoryPath.php   |  2 +-
 .../Model/Asset/Command/DeleteByPath.php      |  2 +-
 .../Model/Asset/Command/GetById.php           |  2 +-
 .../Model/Asset/Command/GetByPath.php         |  2 +-
 .../MediaGallery/Model/Asset/Command/Save.php |  2 +-
 .../Keyword/Command/GetAssetKeywords.php      |  2 +-
 .../Keyword/Command/SaveAssetKeywords.php     |  2 +-
 .../Api/CreateDirectoriesByPathsInterface.php |  2 +
 .../Api/Data/AssetInterface.php               | 13 +++++
 .../Api/Data/AssetKeywordsInterface.php       |  5 ++
 .../Api/Data/KeywordInterface.php             |  5 ++
 .../Api/DeleteAssetsByPathsInterface.php      |  2 +
 .../Api/DeleteDirectoriesByPathsInterface.php |  2 +
 .../Api/GetAssetsByIdsInterface.php           |  2 +
 .../Api/GetAssetsByPathsInterface.php         |  2 +
 .../Api/GetAssetsKeywordsInterface.php        |  2 +
 .../Api/SaveAssetsInterface.php               |  2 +
 .../Api/SaveAssetsKeywordsInterface.php       |  2 +
 .../DeleteByDirectoryPathInterface.php        |  2 +-
 .../Asset/Command/DeleteByPathInterface.php   |  2 +-
 .../Model/Asset/Command/GetByIdInterface.php  |  2 +-
 .../Asset/Command/GetByPathInterface.php      |  2 +-
 .../Model/Asset/Command/SaveInterface.php     |  2 +-
 .../Command/GetAssetKeywordsInterface.php     |  2 +-
 .../Command/SaveAssetKeywordsInterface.php    |  2 +-
 .../MediaStorage/Model/File/Uploader.php      |  1 +
 .../Multishipping/Block/Checkout/Overview.php |  3 +-
 .../Multishipping/Block/Checkout/Results.php  | 10 ++++
 .../Multishipping/PlaceOrderInterface.php     |  2 +
 .../Model/Queue/TransportBuilder.php          |  2 +-
 .../Model/ResourceModel/Queue/Collection.php  |  1 +
 .../Model/ResourceModel/Subscriber.php        |  6 ++-
 .../Magento/Newsletter/Model/Subscriber.php   | 17 ++++---
 .../Magento/Newsletter/Model/Template.php     |  2 +-
 .../OfflinePayments/Model/Purchaseorder.php   |  1 +
 .../Carrier/Tablerate/LocationDirectory.php   |  2 +-
 .../PageCacheState.php                        |  2 +-
 .../Payment/Block/Transparent/Redirect.php    |  3 ++
 .../ErrorMapper/ErrorMessageMapper.php        |  2 +
 .../ErrorMessageMapperInterface.php           |  2 +
 .../Gateway/Validator/ResultInterface.php     |  1 +
 .../Gateway/Validator/ValidatorComposite.php  |  1 +
 .../Magento/Payment/Model/Method/Adapter.php  |  2 +
 .../Payment/Model/Method/ConfigInterface.php  |  2 +-
 app/code/Magento/Payment/Model/MethodList.php |  2 +-
 .../Payment/Model/SaleOperationInterface.php  |  3 ++
 .../Paypal/Block/Adminhtml/Order/View.php     |  3 ++
 .../System/Config/Field/Enable/BmlApi.php     |  2 +-
 .../Adminhtml/System/Config/Fieldset/Hint.php |  2 +-
 .../Express/InContext/Minicart/Button.php     |  2 +-
 .../Magento/Paypal/Model/AbstractConfig.php   |  2 +-
 app/code/Magento/Paypal/Model/Api/Nvp.php     |  2 +-
 .../Quote/Model/BillingAddressManagement.php  |  2 +-
 .../Model/MaskedQuoteIdToQuoteIdInterface.php |  2 +
 app/code/Magento/Quote/Model/Quote.php        |  2 +-
 .../Magento/Quote/Model/Quote/Address.php     |  2 +-
 .../Quote/Model/Quote/Address/Item.php        |  1 +
 app/code/Magento/Quote/Model/Quote/Item.php   |  2 +-
 .../MinimumOrderAmount/ValidationMessage.php  |  2 +-
 .../Quote/Model/QuoteAddressValidator.php     |  2 +-
 .../Model/QuoteIdToMaskedQuoteIdInterface.php |  2 +
 .../Magento/Quote/Model/QuoteRepository.php   |  6 +--
 .../Quote/Model/ResourceModel/Quote.php       |  2 +-
 .../Quote/Model/ShippingMethodManagement.php  |  4 +-
 .../Resolver/SetPaymentAndPlaceOrder.php      |  2 +-
 .../Reports/Block/Adminhtml/Wishlist.php      |  2 +-
 .../Block/Product/Widget/Viewed/Item.php      |  2 +-
 .../Model/ResourceModel/Order/Collection.php  |  2 +-
 .../Product/Downloads/Collection.php          |  1 +
 .../Model/ResourceModel/Quote/Collection.php  |  1 +
 .../Review/Customer/Collection.php            |  1 +
 .../Review/Product/Collection.php             |  1 +
 .../Block/Adminhtml/Edit/Tab/Reviews.php      |  3 ++
 .../Magento/Review/Block/Customer/View.php    |  2 +-
 app/code/Magento/Review/Block/View.php        |  2 +-
 .../Review/Controller/Adminhtml/Rating.php    |  2 +-
 .../Review/Product/Collection.php             |  1 +
 app/code/Magento/Review/Model/Review.php      |  6 +--
 app/code/Magento/Robots/Block/Data.php        |  6 +--
 .../Magento/Robots/Model/Config/Value.php     |  6 +--
 .../Sales/Api/Data/OrderPaymentInterface.php  |  1 +
 .../Adminhtml/Order/Create/Items/Grid.php     |  2 +-
 .../Adminhtml/Order/Create/Sidebar/Cart.php   |  2 +
 .../Order/Creditmemo/Create/Adjustments.php   |  1 +
 .../Sales/Block/Adminhtml/Order/Totalbar.php  |  2 +-
 .../Sales/Block/Adminhtml/Order/View/Info.php |  2 +-
 .../Block/Order/Email/Creditmemo/Items.php    |  2 +
 .../Sales/Block/Order/Email/Invoice/Items.php |  2 +
 .../Magento/Sales/Block/Order/Email/Items.php |  1 +
 .../Block/Order/Email/Shipment/Items.php      |  2 +
 .../Magento/Sales/Block/Order/History.php     |  3 +-
 .../Sales/Block/Order/PrintShipment.php       |  4 +-
 app/code/Magento/Sales/Block/Order/Recent.php |  2 +-
 app/code/Magento/Sales/Block/Order/View.php   |  2 +-
 .../Adminhtml/Order/AbstractMassAction.php    |  2 +-
 .../Download/DownloadCustomOption.php         |  2 +-
 .../Magento/Sales/Model/AdminOrder/Create.php |  4 +-
 app/code/Magento/Sales/Model/Increment.php    |  2 +-
 app/code/Magento/Sales/Model/Order.php        |  6 ++-
 .../Magento/Sales/Model/Order/Address.php     |  1 +
 .../Sales/Model/Order/AddressRepository.php   |  2 +-
 app/code/Magento/Sales/Model/Order/Config.php |  3 +-
 .../Sales/Model/Order/CreditmemoFactory.php   |  2 +-
 .../Model/Order/CreditmemoRepository.php      |  2 +-
 .../Sales/Model/Order/CustomerManagement.php  |  8 +--
 .../Order/Email/Sender/ShipmentSender.php     |  2 +-
 .../Sales/Model/Order/InvoiceRepository.php   |  2 +-
 app/code/Magento/Sales/Model/Order/Item.php   |  2 +-
 .../Magento/Sales/Model/Order/Payment.php     |  2 +-
 .../Sales/Model/Order/Payment/Repository.php  |  2 +-
 .../Order/Payment/State/AuthorizeCommand.php  |  2 +-
 .../Order/Payment/State/CaptureCommand.php    |  2 +-
 .../Order/Payment/State/OrderCommand.php      |  2 +-
 .../RegisterCaptureNotificationCommand.php    |  2 +-
 .../Order/Payment/Transaction/Repository.php  |  2 +-
 .../Sales/Model/Order/ProductOption.php       |  2 +
 .../OrderedProductAvailabilityChecker.php     |  4 +-
 ...redProductAvailabilityCheckerInterface.php |  4 +-
 .../Sales/Model/Order/ShipmentFactory.php     |  1 +
 .../Sales/Model/Order/ShipmentRepository.php  |  2 +-
 .../Magento/Sales/Model/OrderRepository.php   |  2 +-
 .../Model/ResourceModel/AbstractGrid.php      |  2 +-
 .../Model/Order/ReturnProcessor.php           |  2 +
 .../SalesRule/Api/Data/CouponInterface.php    |  4 +-
 app/code/Magento/SalesRule/Model/Coupon.php   |  4 +-
 .../SalesRule/Model/CouponRepository.php      |  4 +-
 .../Model/Rule/Action/Discount/CartFixed.php  |  4 +-
 .../Model/Rule/Condition/Product/Combine.php  |  1 +
 .../SalesRule/Model/RuleRepository.php        |  4 +-
 .../Model/Service/CouponManagementService.php |  6 +--
 .../Magento/Search/Model/AdapterFactory.php   |  6 +--
 .../Model/ResourceModel/Query/Collection.php  |  1 +
 .../Search/Model/Search/PageSizeProvider.php  |  2 +
 app/code/Magento/SendFriend/Block/Send.php    |  1 +
 .../Model/Carrier/AbstractCarrier.php         |  3 +-
 .../Model/Carrier/AbstractCarrierOnline.php   |  3 +-
 .../Model/ShipmentProviderInterface.php       |  2 +
 app/code/Magento/Sitemap/Block/Robots.php     |  8 +--
 app/code/Magento/Sitemap/Helper/Data.php      | 24 ++++-----
 .../ItemProvider/ConfigReaderInterface.php    |  3 ++
 .../ItemProvider/ItemProviderInterface.php    |  2 +
 .../Model/ResourceModel/Catalog/Product.php   |  1 +
 .../Sitemap/Model/ResourceModel/Cms/Page.php  |  1 -
 app/code/Magento/Sitemap/Model/Sitemap.php    | 16 +++---
 .../Model/SitemapConfigReaderInterface.php    |  6 +++
 .../Sitemap/Model/SitemapItemInterface.php    |  6 +++
 .../Magento/Store/Api/Data/StoreInterface.php |  2 +
 .../Store/Api/StoreResolverInterface.php      |  2 +-
 .../Store/Controller/Store/SwitchAction.php   |  4 +-
 .../Config/Importer/Processor/Create.php      |  2 +-
 .../Store/Model/Config/Placeholder.php        |  4 +-
 app/code/Magento/Store/Model/Group.php        |  1 +
 app/code/Magento/Store/Model/Store.php        |  8 ++-
 .../Magento/Store/Model/StoreResolver.php     |  6 +--
 app/code/Magento/Store/Model/System/Store.php |  1 +
 .../Schema/InitializeStoresAndWebsites.php    |  2 +-
 .../Swagger/Api/Data/SchemaTypeInterface.php  |  3 ++
 app/code/Magento/Swagger/Block/Index.php      |  2 +
 .../Block/Product/Renderer/Configurable.php   |  5 +-
 .../Product/Renderer/Listing/Configurable.php |  2 +
 .../Swatches/Model/ResourceModel/Swatch.php   |  1 +
 .../Block/Adminhtml/Items/Price/Renderer.php  |  2 +-
 .../Model/System/Message/Notifications.php    |  6 +--
 app/code/Magento/Theme/Block/Html/Footer.php  |  1 +
 .../Magento/Theme/Block/Html/Header/Logo.php  |  2 +-
 .../System/Design/Theme/UploadJs.php          |  2 +-
 .../ResourceModel/Theme/Grid/Collection.php   |  2 +-
 .../Config/SearchRobots/ResetButton.php       |  4 +-
 .../Tinymce3/Model/Config/Gallery/Config.php  |  2 +-
 .../Model/Config/Source/Wysiwyg/Editor.php    |  2 +-
 .../Tinymce3/Model/Config/Variable/Config.php |  2 +-
 .../Tinymce3/Model/Config/Widget/Config.php   |  2 +-
 .../Config/Widget/PlaceholderImagesPool.php   |  2 +-
 .../Tinymce3/Model/Config/Wysiwyg/Config.php  |  2 +-
 app/code/Magento/Translation/Block/Js.php     |  1 +
 .../Magento/Ui/Block/Wysiwyg/ActiveEditor.php |  2 +
 .../Ui/Component/Form/Element/ColorPicker.php |  3 ++
 .../Ui/Component/Listing/Columns/Date.php     |  1 +
 .../Magento/Ui/Component/Wrapper/Block.php    |  2 +-
 .../Ui/Controller/Adminhtml/Bookmark/Save.php |  2 +-
 .../Ui/DataProvider/AbstractDataProvider.php  |  2 +-
 .../Modifier/WysiwygModifierInterface.php     |  3 ++
 .../Ui/DataProvider/SearchResultFactory.php   |  2 +
 app/code/Magento/Ui/Model/Bookmark.php        |  2 +-
 app/code/Magento/Ui/Model/Manager.php         |  2 +-
 .../ResourceModel/BookmarkRepository.php      |  4 +-
 app/code/Magento/Ups/Model/Carrier.php        |  4 +-
 .../UrlRewrite/Block/GridContainer.php        |  2 +-
 .../Exception/UrlAlreadyExistsException.php   |  4 +-
 .../UrlRewrite/Model/Storage/DbStorage.php    |  2 +-
 app/code/Magento/User/Block/User/Edit.php     |  6 +--
 .../Model/ResourceModel/User/Collection.php   |  1 +
 app/code/Magento/User/Model/User.php          | 10 ++--
 app/code/Magento/Usps/Model/Carrier.php       |  6 +--
 .../Api/Data/PaymentTokenFactoryInterface.php |  4 +-
 .../Api/Data/PaymentTokenInterfaceFactory.php |  2 +-
 .../Model/AbstractPaymentTokenFactory.php     |  2 +-
 .../Model/AccountPaymentTokenFactory.php      |  2 +-
 .../Vault/Model/CreditCardTokenFactory.php    |  2 +-
 .../Vault/Model/PaymentTokenFactory.php       |  4 +-
 .../Vault/Model/PaymentTokenRepository.php    |  4 +-
 .../Controller/Soap/Request/Handler.php       |  2 +-
 .../Magento/Webapi/Model/ConfigInterface.php  |  2 +
 .../WebapiAsync/Model/BulkServiceConfig.php   |  2 +
 .../WebapiAsync/Model/ServiceConfig.php       |  2 +
 .../Adminhtml/Widget/LoadOptions.php          |  2 +-
 .../Widget/Model/ResourceModel/Widget.php     |  2 +-
 .../Widget/Instance/Options/ThemeId.php       |  2 +-
 app/code/Magento/Widget/Model/Widget.php      |  4 +-
 .../Magento/Widget/Model/Widget/Instance.php  |  2 +
 .../Magento/Wishlist/Block/AbstractBlock.php  |  2 +-
 .../Wishlist/Block/Customer/Wishlist.php      |  2 +
 .../Customer/Wishlist/Item/Column/Actions.php |  2 +-
 .../Customer/Wishlist/Item/Column/Comment.php |  2 +-
 .../Customer/Wishlist/Item/Column/Edit.php    |  2 +-
 .../Customer/Wishlist/Item/Column/Image.php   |  1 +
 .../Customer/Wishlist/Item/Column/Info.php    |  2 +-
 .../Customer/Wishlist/Item/Column/Remove.php  |  2 +-
 app/code/Magento/Wishlist/Block/Link.php      |  2 +-
 .../Wishlist/Block/Share/Email/Items.php      |  1 +
 .../Model/ResourceModel/Item/Collection.php   |  1 +
 .../Magento/Wishlist/Observer/AddToCart.php   |  2 +-
 lib/internal/Magento/Framework/Acl.php        |  1 +
 .../Magento/Framework/Acl/AclResource.php     |  1 +
 .../Acl/AclResource/ProviderInterface.php     |  1 +
 .../Magento/Framework/Acl/Builder.php         |  3 +-
 .../Framework/Acl/Data/CacheInterface.php     |  2 +-
 .../Magento/Framework/Acl/LoaderInterface.php |  1 +
 .../Magento/Framework/Acl/RootResource.php    |  1 +
 .../Magento/Framework/Amqp/Config.php         |  9 ++--
 .../Framework/Amqp/ConnectionTypeResolver.php |  5 +-
 .../Magento/Framework/Amqp/Exchange.php       |  5 +-
 .../Framework/Amqp/ExchangeFactory.php        |  5 +-
 lib/internal/Magento/Framework/Amqp/Queue.php | 13 +++--
 .../Magento/Framework/Amqp/QueueFactory.php   |  5 +-
 .../Amqp/Topology/ArgumentProcessor.php       |  2 +-
 .../Api/AbstractExtensibleObject.php          |  3 +-
 .../Api/AbstractSimpleObjectBuilder.php       |  2 +-
 .../Framework/Api/AttributeInterface.php      |  1 +
 .../Api/CustomAttributesDataInterface.php     |  1 +
 .../Api/Data/ImageContentInterface.php        |  1 +
 .../Api/Data/VideoContentInterface.php        |  1 +
 .../Framework/Api/ExtensibleDataInterface.php |  1 +
 .../ExtensionAttribute/JoinDataInterface.php  |  1 +
 .../JoinProcessorInterface.php                |  1 +
 .../Api/ExtensionAttributesInterface.php      |  1 +
 lib/internal/Magento/Framework/Api/Filter.php |  1 +
 .../Magento/Framework/Api/FilterBuilder.php   |  1 +
 .../Api/ImageContentValidatorInterface.php    |  1 +
 .../Framework/Api/ImageProcessorInterface.php |  1 +
 .../Framework/Api/MetadataObjectInterface.php |  1 +
 .../Api/MetadataServiceInterface.php          |  1 +
 .../Magento/Framework/Api/Search/Document.php |  1 +
 .../Framework/Api/Search/FilterGroup.php      |  1 +
 .../Api/Search/FilterGroupBuilder.php         |  1 +
 .../Framework/Api/Search/SearchCriteria.php   |  1 +
 .../Api/Search/SearchCriteriaBuilder.php      |  1 +
 .../Api/Search/SearchCriteriaInterface.php    |  1 +
 .../Framework/Api/Search/SearchInterface.php  |  1 +
 .../Api/Search/SearchResultInterface.php      |  1 +
 .../FilterProcessor/CustomFilterInterface.php |  4 +-
 .../JoinProcessor/CustomJoinInterface.php     |  4 +-
 .../CollectionProcessorInterface.php          |  4 +-
 .../Framework/Api/SearchCriteriaInterface.php |  1 +
 .../Framework/Api/SearchResultsInterface.php  |  1 +
 .../Magento/Framework/Api/SortOrder.php       |  1 +
 .../Framework/Api/SortOrderBuilder.php        |  1 +
 .../Framework/App/Action/AbstractAction.php   |  2 +-
 .../Magento/Framework/App/Action/Action.php   |  3 +-
 .../Magento/Framework/App/Action/Context.php  |  1 +
 .../App/Action/HttpHeadActionInterface.php    |  2 +-
 .../Magento/Framework/App/ActionFactory.php   |  1 +
 .../Magento/Framework/App/ActionFlag.php      |  1 +
 .../Magento/Framework/App/ActionInterface.php |  1 +
 .../App/Area/FrontNameResolverFactory.php     |  1 +
 .../App/Area/FrontNameResolverInterface.php   |  1 +
 .../Magento/Framework/App/Bootstrap.php       |  1 +
 .../Magento/Framework/App/Cache/Manager.php   |  1 +
 .../Framework/App/Cache/StateInterface.php    |  1 +
 .../Framework/App/Cache/Type/FrontendPool.php |  1 +
 .../Framework/App/Cache/TypeListInterface.php |  1 +
 .../Magento/Framework/App/CacheInterface.php  |  1 +
 .../App/Config/Data/ProcessorInterface.php    |  1 +
 .../Framework/App/Config/DataInterface.php    |  1 +
 .../Magento/Framework/App/Config/Element.php  |  1 +
 .../App/Config/InitialConfigSource.php        |  2 +-
 .../Config/MutableScopeConfigInterface.php    |  1 +
 .../App/Config/ReinitableConfigInterface.php  |  1 +
 .../Framework/App/Config/Scope/Validator.php  |  2 +-
 .../App/Config/ScopeConfigInterface.php       |  1 +
 .../App/Config/Storage/WriterInterface.php    |  1 +
 .../Magento/Framework/App/Config/Value.php    |  2 +
 .../Magento/Framework/App/DocRootLocator.php  |  2 +-
 .../App/FrontControllerInterface.php          |  1 +
 .../Framework/App/Language/Dictionary.php     |  1 +
 .../Magento/Framework/App/ObjectManager.php   |  1 +
 .../App/ObjectManager/ConfigCache.php         |  2 +-
 .../App/ObjectManager/ConfigLoader.php        |  2 +-
 .../Framework/App/ObjectManagerFactory.php    |  3 +-
 .../App/PlainTextRequestInterface.php         |  4 +-
 .../App/ProductMetadataInterface.php          |  1 +
 .../Framework/App/ReinitableConfig.php        |  2 +-
 .../Request/PathInfoProcessorInterface.php    |  1 +
 .../Framework/App/RequestContentInterface.php |  2 +-
 .../Framework/App/RequestInterface.php        |  1 +
 .../Framework/App/RequestSafetyInterface.php  |  1 +
 .../Framework/App/ResourceConnection.php      |  2 +
 .../SourceProviderInterface.php               |  1 +
 .../Framework/App/Response/HttpInterface.php  | 17 ++++---
 .../Framework/App/ResponseInterface.php       |  1 +
 .../Magento/Framework/App/Route/Config.php    |  2 +-
 .../Framework/App/Route/ConfigInterface.php   |  1 +
 .../App/Rss/DataProviderInterface.php         |  1 +
 .../Magento/Framework/App/ScopeInterface.php  |  1 +
 lib/internal/Magento/Framework/App/State.php  |  3 +-
 .../Magento/Framework/App/StaticResource.php  |  2 +-
 .../Framework/App/TemplateTypesInterface.php  |  2 +-
 .../Magento/Framework/App/Utility/Files.php   |  2 +-
 .../Framework/App/View/Asset/Publisher.php    |  1 +
 .../Framework/App/View/Deployment/Version.php |  2 +-
 .../Magento/Framework/App/ViewInterface.php   |  3 +-
 .../Magento/Framework/AppInterface.php        |  1 +
 .../Framework/Archive/ArchiveInterface.php    |  1 +
 .../Authorization/PolicyInterface.php         |  1 +
 .../Authorization/RoleLocatorInterface.php    |  1 +
 .../Framework/AuthorizationInterface.php      |  1 +
 .../Framework/Backup/AbstractBackup.php       |  3 ++
 .../Framework/Backup/BackupException.php      |  1 +
 .../Framework/Backup/BackupInterface.php      |  3 +-
 lib/internal/Magento/Framework/Backup/Db.php  |  1 +
 .../Framework/Backup/Db/BackupDbInterface.php |  3 +-
 .../Framework/Backup/Db/BackupFactory.php     |  1 +
 .../Framework/Backup/Db/BackupInterface.php   |  3 +-
 .../Backup/Exception/CantLoadSnapshot.php     |  1 +
 .../Backup/Exception/FtpConnectionFailed.php  |  1 +
 .../Backup/Exception/FtpValidationFailed.php  |  1 +
 .../Backup/Exception/NotEnoughFreeSpace.php   |  1 +
 .../Backup/Exception/NotEnoughPermissions.php |  1 +
 .../Magento/Framework/Backup/Factory.php      |  1 +
 .../Magento/Framework/Backup/Filesystem.php   |  4 +-
 .../Filesystem/Rollback/AbstractRollback.php  |  1 +
 .../Backup/Filesystem/Rollback/Fs.php         |  2 +-
 .../Bulk/BulkManagementInterface.php          |  6 +--
 .../Framework/Bulk/BulkStatusInterface.php    | 10 ++--
 .../Framework/Bulk/BulkSummaryInterface.php   | 22 ++++----
 .../Framework/Bulk/OperationInterface.php     | 34 ++++++-------
 .../Bulk/OperationManagementInterface.php     |  4 +-
 .../Cache/Frontend/Decorator/TagScope.php     |  1 +
 .../Framework/Cache/FrontendInterface.php     |  1 +
 .../Code/Generator/DefinedClasses.php         |  2 +-
 .../Magento/Framework/Code/NameBuilder.php    |  1 +
 .../Code/Reader/SourceArgumentsReader.php     |  6 +--
 .../Config/Reader/XmlReader/Converter.php     |  2 +-
 .../Component/ComponentRegistrar.php          |  1 +
 .../Magento/Framework/Config/AbstractXml.php  |  1 +
 .../Framework/Config/CacheInterface.php       |  1 +
 .../Framework/Config/Composer/Package.php     |  1 +
 .../Config/ConfigOptionsListConstants.php     |  1 +
 .../Framework/Config/Converter/Dom/Flat.php   |  1 +
 .../Framework/Config/ConverterInterface.php   |  1 +
 .../Magento/Framework/Config/Data.php         |  1 +
 .../Framework/Config/Data/ConfigData.php      |  1 +
 .../Magento/Framework/Config/Data/Scoped.php  |  1 +
 .../Framework/Config/DataInterface.php        |  1 +
 lib/internal/Magento/Framework/Config/Dom.php |  3 +-
 .../Framework/Config/Dom/UrnResolver.php      |  1 +
 .../Config/Dom/ValidationException.php        |  1 +
 .../Config/Dom/ValidationSchemaException.php  |  2 +-
 .../Magento/Framework/Config/DomFactory.php   |  1 +
 .../Framework/Config/File/ConfigFilePool.php  |  7 +--
 .../Magento/Framework/Config/FileIterator.php |  1 +
 .../Framework/Config/FileIteratorFactory.php  |  1 +
 .../Magento/Framework/Config/FileResolver.php |  2 +-
 .../Config/FileResolverInterface.php          |  1 +
 .../Framework/Config/Reader/Filesystem.php    |  1 +
 .../Framework/Config/ReaderInterface.php      |  1 +
 .../Config/SchemaLocatorInterface.php         |  1 +
 .../Framework/Config/ScopeInterface.php       |  1 +
 .../Framework/Config/ScopeListInterface.php   |  1 +
 .../Magento/Framework/Config/Theme.php        |  1 +
 .../Config/ValidationStateInterface.php       |  1 +
 .../Magento/Framework/Config/View.php         |  1 +
 .../Console/CommandListInterface.php          |  1 +
 .../Framework/Controller/Result/Json.php      |  1 +
 .../Framework/Controller/Result/Redirect.php  |  1 +
 .../Controller/Result/RedirectFactory.php     |  1 +
 .../Framework/Controller/ResultFactory.php    |  1 +
 .../Framework/Controller/ResultInterface.php  |  1 +
 .../Instruction/MagentoImport.php             |  2 +-
 .../Magento/Framework/CurrencyInterface.php   |  1 +
 .../Framework/DB/Adapter/AdapterInterface.php |  1 +
 .../Framework/DB/Adapter/Pdo/Mysql.php        |  4 +-
 .../Magento/Framework/DB/Ddl/Table.php        |  1 +
 .../Magento/Framework/DB/Ddl/Trigger.php      |  1 +
 .../Framework/DB/Query/BatchRangeIterator.php |  2 +-
 .../Magento/Framework/DB/Query/Generator.php  |  2 +-
 lib/internal/Magento/Framework/DB/Select.php  |  1 +
 .../Magento/Framework/DB/SelectFactory.php    |  1 -
 .../DB/Sql/ColumnValueExpression.php          |  2 +-
 .../Framework/DB/TemporaryTableService.php    |  7 ++-
 lib/internal/Magento/Framework/DB/Tree.php    | 40 +++++++--------
 .../Magento/Framework/DB/Tree/Node.php        | 22 ++++----
 .../Magento/Framework/DB/Tree/NodeSet.php     | 18 +++----
 .../Framework/Data/AbstractSearchResult.php   |  2 +-
 .../Data/Argument/InterpreterInterface.php    |  1 +
 .../Magento/Framework/Data/Collection.php     |  1 +
 .../Framework/Data/Collection/AbstractDb.php  |  1 +
 .../Framework/Data/Collection/Filesystem.php  |  1 +
 lib/internal/Magento/Framework/Data/Form.php  |  1 +
 .../Data/Form/Element/AbstractElement.php     |  1 +
 .../Framework/Data/Form/Element/Fieldset.php  |  1 +
 .../Element/Renderer/RendererInterface.php    |  1 +
 .../Framework/Data/Form/Element/Select.php    |  1 +
 .../Data/Form/Filter/FilterInterface.php      |  1 +
 .../Magento/Framework/Data/Form/FormKey.php   |  1 +
 .../Framework/Data/Form/FormKey/Validator.php |  1 +
 .../Framework/Data/OptionSourceInterface.php  |  1 +
 lib/internal/Magento/Framework/Data/Tree.php  |  1 +
 .../Magento/Framework/Data/Tree/Node.php      |  1 +
 .../Framework/Data/Tree/Node/Collection.php   |  1 +
 .../Data/Wysiwyg/ConfigProviderInterface.php  |  2 +
 lib/internal/Magento/Framework/DataObject.php |  1 +
 .../Magento/Framework/DataObject/Copy.php     |  4 +-
 .../Magento/Framework/Encryption/Crypt.php    |  3 +-
 .../Encryption/EncryptorInterface.php         |  1 +
 .../Framework/Encryption/Helper/Security.php  |  1 +
 .../Magento/Framework/Encryption/UrlCoder.php |  1 +
 .../Framework/EntityManager/MetadataPool.php  |  1 -
 .../EntityManager/Operation/Create.php        |  2 +-
 lib/internal/Magento/Framework/Escaper.php    | 19 +++----
 lib/internal/Magento/Framework/Event.php      |  1 +
 .../Magento/Framework/Event/Observer.php      |  1 +
 .../Framework/Event/Observer/Collection.php   |  1 +
 .../Framework/Event/ObserverInterface.php     |  1 +
 .../Exception/AbstractAggregateException.php  |  2 +
 .../Exception/AggregateExceptionInterface.php |  2 +
 .../Exception/AlreadyExistsException.php      |  2 +-
 .../Exception/AuthenticationException.php     |  1 +
 .../Exception/AuthorizationException.php      |  1 +
 .../Framework/Exception/BulkException.php     |  3 ++
 .../Exception/CouldNotDeleteException.php     |  1 +
 .../Exception/CouldNotSaveException.php       |  1 +
 .../Framework/Exception/CronException.php     |  1 +
 .../Exception/EmailNotConfirmedException.php  |  1 +
 .../Exception/FileSystemException.php         |  1 +
 .../Framework/Exception/InputException.php    |  1 +
 .../Exception/IntegrationException.php        |  1 +
 .../InvalidEmailOrPasswordException.php       |  1 +
 .../Exception/LocalizedException.php          |  1 +
 .../Framework/Exception/MailException.php     |  1 +
 .../Exception/NoSuchEntityException.php       |  1 +
 .../Framework/Exception/NotFoundException.php |  1 +
 .../Framework/Exception/PaymentException.php  |  1 +
 .../Plugin/AuthenticationException.php        |  1 +
 .../RemoteServiceUnavailableException.php     |  1 +
 .../Exception/SerializationException.php      |  1 +
 .../Framework/Exception/SessionException.php  |  1 +
 .../Exception/State/ExpiredException.php      |  1 +
 .../Exception/State/InitException.php         |  1 +
 .../State/InputMismatchException.php          |  1 +
 .../State/InvalidTransitionException.php      |  1 +
 .../Exception/State/UserLockedException.php   |  1 +
 .../Framework/Exception/StateException.php    |  1 +
 .../TemporaryState/CouldNotSaveException.php  |  3 +-
 .../Exception/ValidatorException.php          |  1 +
 lib/internal/Magento/Framework/File/Csv.php   |  2 +-
 lib/internal/Magento/Framework/File/Size.php  |  1 +
 .../Magento/Framework/File/Uploader.php       |  4 +-
 lib/internal/Magento/Framework/Filesystem.php |  2 +
 .../Framework/Filesystem/Directory/Read.php   |  2 +
 .../Filesystem/Directory/ReadInterface.php    |  1 +
 .../Filesystem/Directory/WriteInterface.php   |  1 +
 .../Framework/Filesystem/DriverInterface.php  |  1 +
 .../Framework/Filesystem/File/ReadFactory.php |  1 +
 .../Filesystem/File/WriteFactory.php          |  1 +
 .../Filesystem/File/WriteInterface.php        |  1 +
 .../Framework/Filesystem/Io/IoInterface.php   |  1 +
 .../Framework/Filter/FilterManager.php        |  1 +
 .../Magento/Framework/Filter/Template.php     | 20 +++++---
 .../Magento/Framework/Filter/Truncate.php     |  2 +-
 .../Framework/HTTP/ClientInterface.php        |  1 +
 .../Framework/Image/Adapter/Config.php        |  4 +-
 .../Magento/Framework/Indexer/Action/Base.php | 20 ++++----
 .../Framework/Indexer/ActionInterface.php     |  1 +
 .../Indexer/BatchProviderInterface.php        |  6 +--
 .../Indexer/BatchSizeManagementInterface.php  |  4 +-
 .../Framework/Indexer/Config/Converter.php    |  2 +-
 .../Framework/Indexer/ConfigInterface.php     |  1 +
 .../Magento/Framework/Indexer/Dimension.php   |  3 ++
 .../Framework/Indexer/DimensionFactory.php    |  2 +
 .../Indexer/DimensionProviderInterface.php    |  2 +
 .../Indexer/DimensionalIndexerInterface.php   |  2 +
 .../Framework/Indexer/FieldsetInterface.php   |  1 +
 .../Framework/Indexer/FieldsetPool.php        |  1 +
 .../Framework/Indexer/HandlerInterface.php    |  1 +
 .../Magento/Framework/Indexer/HandlerPool.php |  1 +
 .../Framework/Indexer/IndexStructure.php      |  2 +-
 .../Indexer/IndexStructureInterface.php       |  1 +
 .../IndexTableRowSizeEstimatorInterface.php   |  4 +-
 .../Framework/Indexer/IndexerInterface.php    |  9 ++--
 .../Framework/Indexer/IndexerRegistry.php     |  1 +
 .../Indexer/SaveHandler/IndexerInterface.php  |  1 +
 .../Framework/Indexer/SaveHandlerFactory.php  |  1 +
 .../Framework/Indexer/StateInterface.php      |  1 +
 .../Framework/Interception/Config/Config.php  |  2 +-
 .../Interception/PluginList/PluginList.php    |  2 +-
 .../Magento/Framework/Json/Decoder.php        |  2 +-
 .../Framework/Json/DecoderInterface.php       |  3 +-
 .../Magento/Framework/Json/Encoder.php        |  2 +-
 .../Framework/Json/EncoderInterface.php       |  3 +-
 .../Magento/Framework/Json/Helper/Data.php    |  2 +-
 .../Framework/Locale/ConfigInterface.php      |  1 +
 .../Framework/Locale/CurrencyInterface.php    |  1 +
 .../Framework/Locale/FormatInterface.php      |  1 +
 .../Framework/Locale/ListsInterface.php       |  1 +
 .../Framework/Locale/ResolverInterface.php    |  1 +
 .../Framework/Lock/LockManagerInterface.php   |  4 ++
 .../Framework/Mail/MailMessageInterface.php   |  6 ++-
 .../Magento/Framework/Mail/Message.php        |  8 +--
 .../Framework/Mail/MessageInterface.php       |  7 +--
 .../Mail/Template/ConfigInterface.php         |  1 +
 .../Mail/Template/FactoryInterface.php        |  1 +
 .../Mail/Template/SenderResolverInterface.php |  1 +
 .../Mail/Template/TransportBuilder.php        |  4 +-
 .../Mail/Template/TransportBuilderByStore.php |  2 +-
 .../Framework/Mail/TemplateInterface.php      |  1 +
 .../Framework/Mail/TransportInterface.php     |  3 +-
 .../Magento/Framework/Math/Calculator.php     |  1 +
 .../Magento/Framework/Math/Division.php       |  1 +
 .../Framework/Math/FloatComparator.php        |  4 ++
 .../Magento/Framework/Math/Random.php         |  1 +
 .../Framework/Message/AbstractMessage.php     |  1 +
 .../Magento/Framework/Message/Collection.php  |  1 +
 .../Framework/Message/ManagerInterface.php    |  1 +
 .../Framework/Message/MessageInterface.php    |  1 +
 .../Framework/Message/PhraseFactory.php       |  2 +-
 .../Framework/MessageQueue/BatchConsumer.php  |  4 +-
 .../MessageQueue/Bulk/ExchangeFactory.php     |  7 ++-
 .../Bulk/ExchangeFactoryInterface.php         |  4 +-
 .../MessageQueue/Bulk/ExchangeInterface.php   |  4 +-
 .../RemoteServiceReader/Communication.php     |  2 +-
 .../RemoteServiceReader/MessageQueue.php      |  2 +-
 .../Code/Generator/RemoteServiceGenerator.php |  2 +-
 .../Magento/Framework/MessageQueue/Config.php |  2 +-
 .../Config/Consumer/ConfigReaderPlugin.php    |  2 +-
 .../Config/Publisher/ConfigReaderPlugin.php   |  2 +-
 .../MessageQueue/Config/Reader/Xml.php        |  2 +-
 .../Config/Reader/Xml/CompositeConverter.php  |  2 +-
 .../Reader/Xml/Converter/TopicConfig.php      |  2 +-
 .../Config/Reader/Xml/SchemaLocator.php       |  2 +-
 .../Config/Topology/ConfigReaderPlugin.php    |  2 +-
 .../MessageQueue/ConfigInterface.php          |  2 +-
 .../Framework/MessageQueue/Consumer.php       | 12 ++---
 .../MessageQueue/Consumer/ConfigInterface.php |  6 +--
 .../MessageQueue/ConsumerConfiguration.php    |  4 +-
 .../ConsumerConfigurationInterface.php        |  2 +-
 .../MessageQueue/ConsumerFactory.php          |  4 +-
 .../MessageQueue/ConsumerInterface.php        |  3 ++
 .../MessageQueue/EnvelopeInterface.php        |  4 ++
 .../MessageQueue/ExchangeFactory.php          |  7 ++-
 .../MessageQueue/ExchangeFactoryInterface.php |  4 +-
 .../MessageQueue/ExchangeInterface.php        |  3 ++
 .../MessageQueue/ExchangeRepository.php       |  2 +-
 .../Framework/MessageQueue/MessageEncoder.php |  2 +-
 .../MessageIdGeneratorInterface.php           |  4 +-
 .../MessageQueue/MessageLockException.php     |  2 +-
 .../MessageQueue/MessageValidator.php         |  2 +-
 .../Framework/MessageQueue/Publisher.php      |  4 +-
 .../Publisher/ConfigInterface.php             |  6 +--
 .../MessageQueue/PublisherInterface.php       |  3 ++
 .../Framework/MessageQueue/PublisherPool.php  | 13 +++--
 .../Framework/MessageQueue/QueueFactory.php   |  7 ++-
 .../MessageQueue/QueueFactoryInterface.php    |  4 +-
 .../Framework/MessageQueue/QueueInterface.php |  8 ++-
 .../MessageQueue/QueueRepository.php          |  2 +-
 .../Framework/MessageQueue/Rpc/Consumer.php   |  2 +-
 .../Framework/MessageQueue/Rpc/Publisher.php  |  4 +-
 .../MessageQueue/Topology/ConfigInterface.php |  8 +--
 .../Model/AbstractExtensibleModel.php         |  3 ++
 .../Magento/Framework/Model/AbstractModel.php | 11 ++--
 .../Model/ActionValidator/RemoveAction.php    |  1 +
 .../Magento/Framework/Model/Context.php       |  1 +
 .../Model/ResourceModel/AbstractResource.php  | 10 ++--
 .../Model/ResourceModel/Db/AbstractDb.php     |  1 +
 .../Db/Collection/AbstractCollection.php      |  1 +
 .../Db/ObjectRelationProcessor.php            |  1 +
 .../Db/TransactionManagerInterface.php        |  1 +
 .../Magento/Framework/Module/Dir/Reader.php   |  1 +
 .../Magento/Framework/Module/Manager.php      |  8 +--
 .../Framework/Module/ModuleResource.php       |  4 +-
 .../Framework/Module/Output/Config.php        | 10 ++--
 .../Module/Output/ConfigInterface.php         |  6 +--
 .../Framework/Module/Setup/Migration.php      |  3 +-
 .../Notification/MessageInterface.php         |  1 +
 .../Framework/Notification/MessageList.php    |  1 +
 .../Notification/NotifierInterface.php        |  1 +
 .../Framework/Notification/NotifierList.php   |  1 +
 .../Framework/Oauth/ConsumerInterface.php     |  1 +
 .../Magento/Framework/Oauth/Exception.php     |  1 +
 .../Oauth/NonceGeneratorInterface.php         |  1 +
 .../Framework/Oauth/OauthInputException.php   |  1 +
 .../Framework/Oauth/OauthInterface.php        |  1 +
 .../Oauth/TokenProviderInterface.php          |  1 +
 .../Code/Generator/Repository.php             |  3 +-
 .../Framework/ObjectManager/Config/Config.php |  2 +-
 .../ObjectManager/ContextInterface.php        |  1 +
 .../Framework/ObjectManagerInterface.php      |  1 +
 .../Framework/Option/ArrayInterface.php       |  2 +-
 lib/internal/Magento/Framework/Phrase.php     |  1 +
 .../Framework/Phrase/RendererInterface.php    |  1 +
 .../Adjustment/AdjustmentInterface.php        |  1 +
 .../Adjustment/CalculatorInterface.php        |  1 +
 .../Pricing/Adjustment/Collection.php         |  1 +
 .../Framework/Pricing/Adjustment/Pool.php     |  1 +
 .../Pricing/Amount/AmountFactory.php          |  1 +
 .../Pricing/Amount/AmountInterface.php        |  1 +
 .../Magento/Framework/Pricing/Helper/Data.php |  1 +
 .../Framework/Pricing/Price/AbstractPrice.php |  1 +
 .../Price/BasePriceProviderInterface.php      |  1 +
 .../Framework/Pricing/Price/Collection.php    |  1 +
 .../Magento/Framework/Pricing/Price/Pool.php  |  1 +
 .../Pricing/Price/PriceInterface.php          |  1 +
 .../Pricing/PriceCurrencyInterface.php        |  3 +-
 .../Framework/Pricing/PriceInfo/Base.php      |  1 +
 .../Framework/Pricing/PriceInfo/Factory.php   |  1 +
 .../Framework/Pricing/PriceInfoInterface.php  |  1 +
 .../Magento/Framework/Pricing/Render.php      |  1 +
 .../Render/AdjustmentRenderInterface.php      |  1 +
 .../Pricing/Render/AmountRenderInterface.php  |  1 +
 .../Render/PriceBoxRenderInterface.php        |  1 +
 .../Framework/Pricing/Render/RendererPool.php |  1 +
 .../Framework/Pricing/SaleableInterface.php   |  1 +
 lib/internal/Magento/Framework/Profiler.php   |  1 +
 .../Framework/Profiler/DriverInterface.php    |  1 +
 .../Reflection/DataObjectProcessor.php        |  1 +
 .../Framework/Reflection/MethodsMap.php       |  2 +-
 lib/internal/Magento/Framework/Registry.php   |  9 ++--
 .../Search/Adapter/Mysql/ConditionManager.php |  3 +-
 .../Search/Adapter/Mysql/TemporaryStorage.php |  3 +-
 .../Adapter/Mysql/TemporaryStorageFactory.php |  3 +-
 .../Framework/Search/Dynamic/Algorithm.php    |  1 +
 .../Search/Dynamic/Algorithm/Repository.php   |  1 +
 .../Search/Dynamic/DataProviderFactory.php    |  1 +
 .../Search/Dynamic/DataProviderInterface.php  |  1 +
 .../Search/Dynamic/EntityStorage.php          |  1 +
 .../Search/Dynamic/EntityStorageFactory.php   |  1 +
 .../Search/Dynamic/IntervalFactory.php        |  1 +
 .../Search/Dynamic/IntervalInterface.php      |  1 +
 .../Search/EngineResolverInterface.php        |  2 +
 .../Framework/Search/EntityMetadata.php       |  1 +
 .../Magento/Framework/Search/Request.php      |  4 +-
 .../Request/Aggregation/DynamicBucket.php     |  1 +
 .../Framework/Search/Request/Binder.php       |  1 +
 .../Search/Request/BucketInterface.php        |  1 +
 .../Framework/Search/Request/Builder.php      |  2 +
 .../Framework/Search/Request/Cleaner.php      |  1 +
 .../Framework/Search/Request/Dimension.php    |  1 +
 .../Search/Request/Filter/BoolExpression.php  |  1 +
 .../Framework/Search/Request/Filter/Range.php |  1 +
 .../Framework/Search/Request/Filter/Term.php  |  1 +
 .../Search/Request/Filter/Wildcard.php        |  1 +
 .../Search/Request/FilterInterface.php        |  1 +
 .../Framework/Search/Request/Mapper.php       |  1 +
 .../Search/Request/Query/BoolExpression.php   |  1 +
 .../Framework/Search/Request/Query/Filter.php |  1 +
 .../Framework/Search/Request/Query/Match.php  |  1 +
 .../Search/Request/QueryInterface.php         |  1 +
 .../Framework/Search/RequestInterface.php     |  1 +
 .../Framework/Search/Response/Aggregation.php |  1 +
 .../Search/Response/QueryResponse.php         |  4 +-
 .../Framework/Serialize/Serializer/Json.php   |  6 +--
 .../Serialize/Serializer/JsonHexTag.php       |  4 +-
 .../Serialize/SerializerInterface.php         |  6 +--
 .../Magento/Framework/Session/Generic.php     |  1 +
 .../Session/SessionManagerInterface.php       |  1 +
 .../Magento/Framework/Session/SidResolver.php |  6 +--
 .../Setup/Declaration/Schema/Diff/Diff.php    |  6 +++
 .../Schema/Dto/ElementInterface.php           |  4 ++
 .../Framework/Setup/InstallDataInterface.php  |  1 +
 .../Setup/InstallSchemaInterface.php          |  1 +
 .../Framework/Setup/LoggerInterface.php       |  1 +
 .../Setup/ModuleContextInterface.php          |  1 +
 .../Setup/ModuleDataSetupInterface.php        |  1 +
 .../Framework/Setup/SchemaSetupInterface.php  |  1 +
 .../Framework/Setup/SetupInterface.php        |  1 +
 .../Framework/Setup/UninstallInterface.php    |  1 +
 .../Framework/Setup/UpgradeDataInterface.php  |  1 +
 .../Setup/UpgradeSchemaInterface.php          |  1 +
 .../Shell/CommandRendererInterface.php        |  1 +
 .../Magento/Framework/ShellInterface.php      |  1 +
 .../Magento/Framework/Simplexml/Config.php    |  1 +
 .../Magento/Framework/Simplexml/Element.php   |  1 +
 .../Magento/Framework/Stdlib/ArrayUtils.php   |  5 +-
 .../Magento/Framework/Stdlib/BooleanUtils.php |  3 +-
 .../Stdlib/Cookie/CookieMetadata.php          |  1 +
 .../Stdlib/Cookie/CookieMetadataFactory.php   |  1 +
 .../Stdlib/Cookie/CookieReaderInterface.php   |  1 +
 .../Stdlib/Cookie/CookieScopeInterface.php    |  1 +
 .../CookieSizeLimitReachedException.php       |  1 +
 .../Stdlib/Cookie/FailureToSendException.php  |  1 +
 .../Stdlib/Cookie/PublicCookieMetadata.php    |  1 +
 .../Stdlib/Cookie/SensitiveCookieMetadata.php |  1 +
 .../Stdlib/CookieManagerInterface.php         |  1 +
 .../Magento/Framework/Stdlib/DateTime.php     |  5 +-
 .../Framework/Stdlib/DateTime/DateTime.php    |  1 +
 .../DateTime/DateTimeFormatterInterface.php   |  1 +
 .../Framework/Stdlib/DateTime/Filter/Date.php |  1 +
 .../Stdlib/DateTime/Filter/DateTime.php       |  1 +
 .../Stdlib/DateTime/Timezone/Validator.php    |  1 +
 .../Stdlib/DateTime/TimezoneInterface.php     |  1 +
 .../Magento/Framework/Stdlib/StringUtils.php  |  1 +
 lib/internal/Magento/Framework/Translate.php  |  4 +-
 .../Framework/Translate/AdapterInterface.php  |  1 +
 .../Translate/Inline/ConfigInterface.php      |  1 +
 .../Translate/Inline/ParserInterface.php      |  1 +
 .../Translate/Inline/StateInterface.php       |  1 +
 .../Framework/Translate/InlineInterface.php   |  1 +
 .../Framework/Translate/ResourceInterface.php |  1 +
 .../Framework/Unserialize/Unserialize.php     |  2 +-
 lib/internal/Magento/Framework/Url.php        |  6 +--
 .../Framework/Url/DecoderInterface.php        |  1 +
 .../Framework/Url/EncoderInterface.php        |  1 +
 .../Url/QueryParamsResolverInterface.php      |  1 +
 .../Framework/Url/RouteParamsResolver.php     |  2 +-
 .../Url/RouteParamsResolverInterface.php      |  1 +
 .../Magento/Framework/Url/ScopeInterface.php  |  1 +
 .../Framework/Url/ScopeResolverInterface.php  |  1 +
 .../Framework/Url/SecurityInfoInterface.php   |  1 +
 .../Magento/Framework/UrlInterface.php        |  1 +
 .../Validation/ValidationException.php        |  2 +
 .../Framework/Validation/ValidationResult.php |  3 ++
 lib/internal/Magento/Framework/Validator.php  |  1 +
 .../Framework/Validator/AbstractValidator.php |  1 +
 .../Framework/Validator/Constraint.php        |  1 +
 .../Framework/Validator/DataObject.php        |  1 +
 .../Magento/Framework/Validator/Exception.php |  1 +
 .../Validator/ValidatorInterface.php          |  1 +
 .../Framework/View/Asset/AssetInterface.php   |  3 +-
 .../Magento/Framework/View/Asset/Bundle.php   |  2 +-
 .../Framework/View/Asset/Bundle/Config.php    |  2 +-
 .../View/Asset/Bundle/ConfigInterface.php     |  2 +-
 .../Framework/View/Asset/Bundle/Manager.php   |  2 +-
 .../Framework/View/Asset/ConfigInterface.php  |  1 +
 .../View/Asset/ContentProcessorException.php  |  1 +
 .../Magento/Framework/View/Asset/File.php     |  3 +-
 .../View/Asset/File/FallbackContext.php       |  1 +
 .../View/Asset/File/NotFoundException.php     |  1 +
 .../View/Asset/GroupedCollection.php          |  1 +
 .../Framework/View/Asset/LocalInterface.php   |  1 +
 .../View/Asset/MergeStrategy/Checksum.php     |  2 +-
 .../Framework/View/Asset/Minification.php     |  1 +
 .../AlternativeSourceInterface.php            |  1 +
 .../View/Asset/PreProcessor/Chain.php         |  1 +
 .../View/Asset/PreProcessor/ChainFactory.php  |  1 +
 .../PreProcessor/ChainFactoryInterface.php    |  1 +
 .../View/Asset/PreProcessorInterface.php      |  1 +
 .../Framework/View/Asset/Repository.php       |  3 +-
 .../Magento/Framework/View/Asset/Source.php   |  2 +-
 .../Framework/View/ConfigInterface.php        |  1 +
 .../Magento/Framework/View/Context.php        |  1 +
 .../View/Design/Fallback/Rule/Theme.php       |  2 +-
 .../Design/Theme/FileProviderInterface.php    |  1 +
 .../View/Design/Theme/Label/ListInterface.php |  1 +
 .../View/Design/Theme/ListInterface.php       |  1 +
 .../Framework/View/Design/ThemeInterface.php  |  1 +
 .../Framework/View/Element/AbstractBlock.php  | 27 +++++-----
 .../View/Element/Block/ArgumentInterface.php  |  1 +
 .../Framework/View/Element/BlockFactory.php   |  1 +
 .../Framework/View/Element/BlockInterface.php |  1 +
 .../Framework/View/Element/Context.php        |  2 +
 .../Framework/View/Element/FormKey.php        |  1 +
 .../Framework/View/Element/Html/Calendar.php  |  1 +
 .../Framework/View/Element/Html/Link.php      |  1 +
 .../View/Element/Html/Link/Current.php        |  1 +
 .../Framework/View/Element/Html/Links.php     |  1 +
 .../Framework/View/Element/Js/Components.php  |  1 +
 .../Framework/View/Element/Js/Cookie.php      |  1 +
 .../Framework/View/Element/Messages.php       |  1 +
 .../View/Element/RendererInterface.php        |  1 +
 .../Framework/View/Element/RendererList.php   |  1 +
 .../Framework/View/Element/Template.php       |  1 +
 .../View/Element/Template/Context.php         |  1 +
 .../Magento/Framework/View/Element/Text.php   |  1 +
 .../Framework/View/Element/Text/ListText.php  |  1 +
 .../UiComponent/Config/ManagerInterface.php   |  2 +-
 .../Config/Provider/Component/Definition.php  |  2 +-
 .../UiComponent/Config/Provider/Template.php  |  2 +-
 .../DataProvider/DataProviderInterface.php    |  1 +
 .../UiComponent/DataProvider/FilterPool.php   |  1 +
 .../UiComponent/DataProvider/SearchResult.php |  2 +-
 .../View/Element/UiComponentFactory.php       |  3 +-
 .../View/Element/UiComponentInterface.php     |  1 +
 .../View/File/CollectorInterface.php          |  1 +
 .../Magento/Framework/View/FileSystem.php     |  1 +
 .../View/Layout/BuilderInterface.php          |  1 +
 .../Framework/View/Layout/Data/Structure.php  |  1 +
 .../Magento/Framework/View/Layout/Element.php |  1 +
 .../View/Layout/Generator/Context.php         |  1 +
 .../Framework/View/Layout/GeneratorPool.php   |  3 +-
 .../Framework/View/Layout/Reader/Block.php    |  2 +-
 .../Framework/View/Layout/Reader/Context.php  |  1 +
 .../View/Layout/ScheduledStructure.php        |  5 +-
 .../Framework/View/LayoutInterface.php        |  1 +
 .../Magento/Framework/View/Page/Config.php    |  3 ++
 .../Framework/View/Page/Config/Structure.php  |  5 +-
 .../Framework/View/Page/FaviconInterface.php  |  1 +
 .../Magento/Framework/View/Page/Title.php     |  1 +
 .../Framework/View/Render/RenderFactory.php   |  1 +
 .../Framework/View/RenderInterface.php        |  1 +
 .../Magento/Framework/View/Result/Layout.php  |  1 +
 .../Framework/View/Result/LayoutFactory.php   |  1 +
 .../Magento/Framework/View/Result/Page.php    |  1 +
 .../Framework/View/Result/PageFactory.php     |  1 +
 .../View/Template/Html/MinifierInterface.php  |  1 +
 .../Xhtml/CompilerInterface.php               |  1 +
 .../Framework/View/TemplateEnginePool.php     |  1 +
 .../Framework/View/Url/ConfigInterface.php    |  1 +
 .../Framework/View/Url/CssResolver.php        |  1 +
 .../Framework/Webapi/Authorization.php        |  1 -
 .../CustomAttributeTypeLocatorInterface.php   |  2 +-
 .../Framework/Webapi/ErrorProcessor.php       |  1 +
 .../Webapi/Rest/Request/Deserializer/Json.php |  2 +-
 .../Rest/Request/ParamOverriderInterface.php  |  1 +
 .../Rest/Response/RendererInterface.php       |  1 +
 .../Webapi/ServiceInputProcessor.php          |  1 +
 .../Webapi/ServiceOutputProcessor.php         |  1 +
 .../ServicePayloadConverterInterface.php      |  1 +
 1273 files changed, 2390 insertions(+), 1334 deletions(-)

diff --git a/app/code/Magento/AdminNotification/Block/System/Messages.php b/app/code/Magento/AdminNotification/Block/System/Messages.php
index c9b3a0b8844cc..c99a71a51e6ea 100644
--- a/app/code/Magento/AdminNotification/Block/System/Messages.php
+++ b/app/code/Magento/AdminNotification/Block/System/Messages.php
@@ -26,7 +26,7 @@ class Messages extends Template
 
     /**
      * @var JsonDataHelper
-     * @deprecated
+     * @deprecated 100.3.0
      */
     protected $jsonHelper;
 
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php
index d58a7ec31f77d..f3d3cd64ddc64 100644
--- a/app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php
+++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php
@@ -17,7 +17,7 @@ class ListAction extends \Magento\Backend\App\AbstractAction
 
     /**
      * @var \Magento\Framework\Json\Helper\Data
-     * @deprecated
+     * @deprecated 100.3.0
      */
     protected $jsonHelper;
 
diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php b/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php
index 39009e5c7b4e3..27e2713995653 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php
@@ -381,7 +381,7 @@ private function prepareExportData(
      * @param array $exportData
      * @return array
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @deprecated
+     * @deprecated 100.3.0
      * @see prepareExportData
      */
     protected function correctExportData($exportData)
@@ -510,7 +510,7 @@ private function fetchTierPrices(array $productIds): array
      * @return array|bool
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @deprecated
+     * @deprecated 100.3.0
      * @see fetchTierPrices
      */
     protected function getTierPrices(array $listSku, $table)
diff --git a/app/code/Magento/AdvancedSearch/Model/Client/ClientResolver.php b/app/code/Magento/AdvancedSearch/Model/Client/ClientResolver.php
index 84933c8584bb3..33e99a0a0d0ee 100644
--- a/app/code/Magento/AdvancedSearch/Model/Client/ClientResolver.php
+++ b/app/code/Magento/AdvancedSearch/Model/Client/ClientResolver.php
@@ -20,7 +20,7 @@ class ClientResolver
      *
      * @var ScopeConfigInterface
      * @since 100.1.0
-     * @deprecated since it is not used anymore
+     * @deprecated 100.3.0 since it is not used anymore
      */
     protected $scopeConfig;
 
@@ -56,14 +56,14 @@ class ClientResolver
      *
      * @var string
      * @since 100.1.0
-     * @deprecated since it is not used anymore
+     * @deprecated 100.3.0 since it is not used anymore
      */
     protected $path;
 
     /**
      * Config Scope
      * @since 100.1.0
-     * @deprecated since it is not used anymore
+     * @deprecated 100.3.0 since it is not used anymore
      */
     protected $scope;
 
diff --git a/app/code/Magento/Analytics/Model/Connector/Http/ConverterInterface.php b/app/code/Magento/Analytics/Model/Connector/Http/ConverterInterface.php
index ddd9fcba21109..f6abb0f1ab2d1 100644
--- a/app/code/Magento/Analytics/Model/Connector/Http/ConverterInterface.php
+++ b/app/code/Magento/Analytics/Model/Connector/Http/ConverterInterface.php
@@ -9,6 +9,7 @@
  * Represents converter interface for http request and response body.
  *
  * @api
+ * @since 100.2.0
  */
 interface ConverterInterface
 {
@@ -16,6 +17,7 @@ interface ConverterInterface
      * @param string $body
      *
      * @return array
+     * @since 100.2.0
      */
     public function fromBody($body);
 
@@ -23,16 +25,19 @@ public function fromBody($body);
      * @param array $data
      *
      * @return string
+     * @since 100.2.0
      */
     public function toBody(array $data);
 
     /**
      * @return string
+     * @since 100.2.0
      */
     public function getContentTypeHeader();
 
     /**
      * @return string
+     * @since 100.3.0
      */
     public function getContentMediaType(): string;
 }
diff --git a/app/code/Magento/Analytics/ReportXml/Query.php b/app/code/Magento/Analytics/ReportXml/Query.php
index edf5ed08ee55f..b7c31d4334e20 100644
--- a/app/code/Magento/Analytics/ReportXml/Query.php
+++ b/app/code/Magento/Analytics/ReportXml/Query.php
@@ -81,7 +81,6 @@ public function getConfig()
      * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
      * @return mixed data which can be serialized by <b>json_encode</b>,
      * which is a value of any type other than a resource.
-     * @since 5.4.0
      */
     public function jsonSerialize()
     {
diff --git a/app/code/Magento/AsynchronousOperations/Api/BulkStatusInterface.php b/app/code/Magento/AsynchronousOperations/Api/BulkStatusInterface.php
index 76410794900e2..b40fdf19d466f 100644
--- a/app/code/Magento/AsynchronousOperations/Api/BulkStatusInterface.php
+++ b/app/code/Magento/AsynchronousOperations/Api/BulkStatusInterface.php
@@ -14,6 +14,7 @@
  * Bulk summary data with list of operations items short data.
  *
  * @api
+ * @since 100.2.3
  */
 interface BulkStatusInterface extends \Magento\Framework\Bulk\BulkStatusInterface
 {
@@ -23,6 +24,7 @@ interface BulkStatusInterface extends \Magento\Framework\Bulk\BulkStatusInterfac
      * @param string $bulkUuid
      * @return \Magento\AsynchronousOperations\Api\Data\DetailedBulkOperationsStatusInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @since 100.2.3
      */
     public function getBulkDetailedStatus($bulkUuid);
 
@@ -32,6 +34,7 @@ public function getBulkDetailedStatus($bulkUuid);
      * @param string $bulkUuid
      * @return \Magento\AsynchronousOperations\Api\Data\BulkOperationsStatusInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @since 100.2.3
      */
     public function getBulkShortStatus($bulkUuid);
 }
diff --git a/app/code/Magento/AsynchronousOperations/Api/Data/AsyncResponseInterface.php b/app/code/Magento/AsynchronousOperations/Api/Data/AsyncResponseInterface.php
index c7edd5c8ff9cd..c0390e40899e8 100644
--- a/app/code/Magento/AsynchronousOperations/Api/Data/AsyncResponseInterface.php
+++ b/app/code/Magento/AsynchronousOperations/Api/Data/AsyncResponseInterface.php
@@ -13,6 +13,7 @@
  * Temporary data object to give response from webapi async router
  *
  * @api
+ * @since 100.2.3
  */
 interface AsyncResponseInterface
 {
@@ -24,6 +25,7 @@ interface AsyncResponseInterface
      * Gets the bulk uuid.
      *
      * @return string Bulk Uuid.
+     * @since 100.2.3
      */
     public function getBulkUuid();
 
@@ -32,6 +34,7 @@ public function getBulkUuid();
      *
      * @param string $bulkUuid
      * @return $this
+     * @since 100.2.3
      */
     public function setBulkUuid($bulkUuid);
 
@@ -39,6 +42,7 @@ public function setBulkUuid($bulkUuid);
      * Gets the list of request items with status data.
      *
      * @return \Magento\AsynchronousOperations\Api\Data\ItemStatusInterface[]
+     * @since 100.2.3
      */
     public function getRequestItems();
 
@@ -47,12 +51,14 @@ public function getRequestItems();
      *
      * @param \Magento\AsynchronousOperations\Api\Data\ItemStatusInterface[] $requestItems
      * @return $this
+     * @since 100.2.3
      */
     public function setRequestItems($requestItems);
 
     /**
      * @param bool $isErrors
      * @return $this
+     * @since 100.2.3
      */
     public function setErrors($isErrors = false);
 
@@ -60,6 +66,7 @@ public function setErrors($isErrors = false);
      * Is there errors during processing bulk
      *
      * @return boolean
+     * @since 100.2.3
      */
     public function isErrors();
 
@@ -67,6 +74,7 @@ public function isErrors();
      * Retrieve existing extension attributes object.
      *
      * @return \Magento\AsynchronousOperations\Api\Data\AsyncResponseExtensionInterface|null
+     * @since 100.2.3
      */
     public function getExtensionAttributes();
 
@@ -75,6 +83,7 @@ public function getExtensionAttributes();
      *
      * @param \Magento\AsynchronousOperations\Api\Data\AsyncResponseExtensionInterface $extensionAttributes
      * @return $this
+     * @since 100.2.3
      */
     public function setExtensionAttributes(
         \Magento\AsynchronousOperations\Api\Data\AsyncResponseExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/AsynchronousOperations/Api/Data/BulkOperationsStatusInterface.php b/app/code/Magento/AsynchronousOperations/Api/Data/BulkOperationsStatusInterface.php
index f8b7e389d387d..5fedf675e5579 100644
--- a/app/code/Magento/AsynchronousOperations/Api/Data/BulkOperationsStatusInterface.php
+++ b/app/code/Magento/AsynchronousOperations/Api/Data/BulkOperationsStatusInterface.php
@@ -14,6 +14,7 @@
  * Bulk summary data with list of operations items summary data.
  *
  * @api
+ * @since 100.2.3
  */
 interface BulkOperationsStatusInterface extends BulkSummaryInterface
 {
@@ -24,6 +25,7 @@ interface BulkOperationsStatusInterface extends BulkSummaryInterface
      * Retrieve list of operation with statuses (short data).
      *
      * @return \Magento\AsynchronousOperations\Api\Data\SummaryOperationStatusInterface[]
+     * @since 100.2.3
      */
     public function getOperationsList();
 
@@ -32,6 +34,7 @@ public function getOperationsList();
      *
      * @param \Magento\AsynchronousOperations\Api\Data\SummaryOperationStatusInterface[] $operationStatusList
      * @return $this
+     * @since 100.2.3
      */
     public function setOperationsList($operationStatusList);
 }
diff --git a/app/code/Magento/AsynchronousOperations/Api/Data/BulkSummaryInterface.php b/app/code/Magento/AsynchronousOperations/Api/Data/BulkSummaryInterface.php
index a433ec0953a83..5e2cff0b6da3d 100644
--- a/app/code/Magento/AsynchronousOperations/Api/Data/BulkSummaryInterface.php
+++ b/app/code/Magento/AsynchronousOperations/Api/Data/BulkSummaryInterface.php
@@ -38,6 +38,7 @@ public function setExtensionAttributes(
      * Get user type
      *
      * @return int
+     * @since 100.3.0
      */
     public function getUserType();
 
@@ -46,6 +47,7 @@ public function getUserType();
      *
      * @param int $userType
      * @return $this
+     * @since 100.3.0
      */
     public function setUserType($userType);
 }
diff --git a/app/code/Magento/AsynchronousOperations/Api/Data/DetailedBulkOperationsStatusInterface.php b/app/code/Magento/AsynchronousOperations/Api/Data/DetailedBulkOperationsStatusInterface.php
index 6e39177630857..62bead9f9956e 100644
--- a/app/code/Magento/AsynchronousOperations/Api/Data/DetailedBulkOperationsStatusInterface.php
+++ b/app/code/Magento/AsynchronousOperations/Api/Data/DetailedBulkOperationsStatusInterface.php
@@ -14,6 +14,7 @@
  * Bulk summary data with list of operations items full data.
  *
  * @api
+ * @since 100.2.3
  */
 interface DetailedBulkOperationsStatusInterface extends BulkSummaryInterface
 {
@@ -24,6 +25,7 @@ interface DetailedBulkOperationsStatusInterface extends BulkSummaryInterface
      * Retrieve operations list.
      *
      * @return \Magento\AsynchronousOperations\Api\Data\OperationInterface[]
+     * @since 100.2.3
      */
     public function getOperationsList();
 
@@ -32,6 +34,7 @@ public function getOperationsList();
      *
      * @param \Magento\AsynchronousOperations\Api\Data\OperationInterface[] $operationStatusList
      * @return $this
+     * @since 100.2.3
      */
     public function setOperationsList($operationStatusList);
 }
diff --git a/app/code/Magento/AsynchronousOperations/Api/Data/ItemStatusInterface.php b/app/code/Magento/AsynchronousOperations/Api/Data/ItemStatusInterface.php
index 3294078c2c1ea..8919e87c55bec 100644
--- a/app/code/Magento/AsynchronousOperations/Api/Data/ItemStatusInterface.php
+++ b/app/code/Magento/AsynchronousOperations/Api/Data/ItemStatusInterface.php
@@ -14,6 +14,7 @@
  * Indicate if entity param was Accepted|Rejected to bulk schedule
  *
  * @api
+ * @since 100.2.3
  */
 interface ItemStatusInterface
 {
@@ -30,6 +31,7 @@ interface ItemStatusInterface
      * Get entity Id.
      *
      * @return int
+     * @since 100.2.3
      */
     public function getId();
 
@@ -38,6 +40,7 @@ public function getId();
      *
      * @param int $entityId
      * @return $this
+     * @since 100.2.3
      */
     public function setId($entityId);
 
@@ -45,6 +48,7 @@ public function setId($entityId);
      * Get hash of entity data.
      *
      * @return string md5 hash of entity params array.
+     * @since 100.2.3
      */
     public function getDataHash();
 
@@ -53,6 +57,7 @@ public function getDataHash();
      *
      * @param string $hash md5 hash of entity params array.
      * @return $this
+     * @since 100.2.3
      */
     public function setDataHash($hash);
 
@@ -60,6 +65,7 @@ public function setDataHash($hash);
      * Get status.
      *
      * @return string accepted|rejected
+     * @since 100.2.3
      */
     public function getStatus();
 
@@ -68,6 +74,7 @@ public function getStatus();
      *
      * @param string $status accepted|rejected
      * @return $this
+     * @since 100.2.3
      */
     public function setStatus($status = self::STATUS_ACCEPTED);
 
@@ -75,6 +82,7 @@ public function setStatus($status = self::STATUS_ACCEPTED);
      * Get error information.
      *
      * @return string|null
+     * @since 100.2.3
      */
     public function getErrorMessage();
 
@@ -83,6 +91,7 @@ public function getErrorMessage();
      *
      * @param string|null|\Exception $error
      * @return $this
+     * @since 100.2.3
      */
     public function setErrorMessage($error = null);
 
@@ -90,6 +99,7 @@ public function setErrorMessage($error = null);
      * Get error code.
      *
      * @return int|null
+     * @since 100.2.3
      */
     public function getErrorCode();
 
@@ -98,6 +108,7 @@ public function getErrorCode();
      *
      * @param int|null|\Exception $errorCode Default: null
      * @return $this
+     * @since 100.2.3
      */
     public function setErrorCode($errorCode = null);
 }
diff --git a/app/code/Magento/AsynchronousOperations/Api/Data/OperationSearchResultsInterface.php b/app/code/Magento/AsynchronousOperations/Api/Data/OperationSearchResultsInterface.php
index c3d221b7ef4f8..f8e1457366777 100644
--- a/app/code/Magento/AsynchronousOperations/Api/Data/OperationSearchResultsInterface.php
+++ b/app/code/Magento/AsynchronousOperations/Api/Data/OperationSearchResultsInterface.php
@@ -13,6 +13,7 @@
  *
  * An bulk is a group of queue messages. An bulk operation item is a queue message.
  * @api
+ * @since 100.3.0
  */
 interface OperationSearchResultsInterface extends \Magento\Framework\Api\SearchResultsInterface
 {
@@ -20,6 +21,7 @@ interface OperationSearchResultsInterface extends \Magento\Framework\Api\SearchR
      * Get list of operations.
      *
      * @return \Magento\AsynchronousOperations\Api\Data\OperationInterface[]
+     * @since 100.3.0
      */
     public function getItems();
 
@@ -28,6 +30,7 @@ public function getItems();
      *
      * @param \Magento\AsynchronousOperations\Api\Data\OperationInterface[] $items
      * @return $this
+     * @since 100.3.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/AsynchronousOperations/Api/Data/SummaryOperationStatusInterface.php b/app/code/Magento/AsynchronousOperations/Api/Data/SummaryOperationStatusInterface.php
index 3b9f53b34162a..051dbd955c4a9 100644
--- a/app/code/Magento/AsynchronousOperations/Api/Data/SummaryOperationStatusInterface.php
+++ b/app/code/Magento/AsynchronousOperations/Api/Data/SummaryOperationStatusInterface.php
@@ -15,6 +15,7 @@
  * without serialized_data and result_serialized_data
  *
  * @api
+ * @since 100.2.3
  */
 interface SummaryOperationStatusInterface
 {
@@ -22,6 +23,7 @@ interface SummaryOperationStatusInterface
      * Operation id
      *
      * @return int
+     * @since 100.2.3
      */
     public function getId();
 
@@ -31,6 +33,7 @@ public function getId();
      * OPEN | COMPLETE | RETRIABLY_FAILED | NOT_RETRIABLY_FAILED
      *
      * @return int
+     * @since 100.2.3
      */
     public function getStatus();
 
@@ -38,6 +41,7 @@ public function getStatus();
      * Get result message
      *
      * @return string
+     * @since 100.2.3
      */
     public function getResultMessage();
 
@@ -45,6 +49,7 @@ public function getResultMessage();
      * Get error code
      *
      * @return int
+     * @since 100.2.3
      */
     public function getErrorCode();
 }
diff --git a/app/code/Magento/AsynchronousOperations/Api/OperationRepositoryInterface.php b/app/code/Magento/AsynchronousOperations/Api/OperationRepositoryInterface.php
index 17547321b827f..6cb6a93143918 100644
--- a/app/code/Magento/AsynchronousOperations/Api/OperationRepositoryInterface.php
+++ b/app/code/Magento/AsynchronousOperations/Api/OperationRepositoryInterface.php
@@ -13,6 +13,7 @@
  *
  * An bulk is a group of queue messages. An bulk operation item is a queue message.
  * @api
+ * @since 100.3.0
  */
 interface OperationRepositoryInterface
 {
@@ -21,6 +22,7 @@ interface OperationRepositoryInterface
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return \Magento\AsynchronousOperations\Api\Data\OperationSearchResultsInterface
+     * @since 100.3.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 }
diff --git a/app/code/Magento/AsynchronousOperations/Api/SaveMultipleOperationsInterface.php b/app/code/Magento/AsynchronousOperations/Api/SaveMultipleOperationsInterface.php
index 8563ab6541a0c..12abdc04bb165 100644
--- a/app/code/Magento/AsynchronousOperations/Api/SaveMultipleOperationsInterface.php
+++ b/app/code/Magento/AsynchronousOperations/Api/SaveMultipleOperationsInterface.php
@@ -14,6 +14,7 @@
  * Interface for saving multiple operations
  *
  * @api
+ * @since 100.4.0
  */
 interface SaveMultipleOperationsInterface
 {
@@ -22,6 +23,7 @@ interface SaveMultipleOperationsInterface
      *
      * @param OperationInterface[] $operations
      * @return void
+     * @since 100.4.0
      */
     public function execute(array $operations): void;
 }
diff --git a/app/code/Magento/AsynchronousOperations/Model/ConfigInterface.php b/app/code/Magento/AsynchronousOperations/Model/ConfigInterface.php
index de0f89a71650a..593ab52bbdf29 100644
--- a/app/code/Magento/AsynchronousOperations/Model/ConfigInterface.php
+++ b/app/code/Magento/AsynchronousOperations/Model/ConfigInterface.php
@@ -15,6 +15,7 @@
  * Class for accessing to Webapi_Async configuration.
  *
  * @api
+ * @since 100.2.3
  */
 interface ConfigInterface
 {
@@ -45,6 +46,7 @@ interface ConfigInterface
      * Get array of generated topics name and related to this topic service class and methods
      *
      * @return array
+     * @since 100.2.3
      */
     public function getServices();
 
@@ -55,6 +57,7 @@ public function getServices();
      * @param string $httpMethod GET|POST|PUT|DELETE
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
+     * @since 100.2.3
      */
     public function getTopicName($routeUrl, $httpMethod);
 }
diff --git a/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/OperationRepository.php b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/OperationRepository.php
index bbf8bde36e11d..6757b0c8f0a5c 100644
--- a/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/OperationRepository.php
+++ b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/OperationRepository.php
@@ -76,7 +76,7 @@ public function __construct(
      * @param string $operationId
      * @return OperationInterface
      * @throws LocalizedException
-     * @deprecated No longer used.
+     * @deprecated 100.4.0 No longer used.
      * @see create()
      */
     public function createByTopic($topicName, $entityParams, $groupId, $operationId)
diff --git a/app/code/Magento/Backend/App/AbstractAction.php b/app/code/Magento/Backend/App/AbstractAction.php
index c6d6c9fc5f8a8..0e0b34f168c05 100644
--- a/app/code/Magento/Backend/App/AbstractAction.php
+++ b/app/code/Magento/Backend/App/AbstractAction.php
@@ -21,7 +21,7 @@
 /**
  * Generic backend controller
  *
- * @deprecated Use \Magento\Framework\App\ActionInterface
+ * @deprecated 102.0.0 Use \Magento\Framework\App\ActionInterface
  *
  * phpcs:disable Magento2.Classes.AbstractApi
  * @api
diff --git a/app/code/Magento/Backend/Block/Dashboard.php b/app/code/Magento/Backend/Block/Dashboard.php
index 28d3eeae9a1c6..511e393610b1e 100644
--- a/app/code/Magento/Backend/Block/Dashboard.php
+++ b/app/code/Magento/Backend/Block/Dashboard.php
@@ -9,7 +9,7 @@
 
 /**
  * Class used to initialize layout for MBO Dashboard
- * @deprecated dashboard graphs were migrated to dynamic chart.js solution
+ * @deprecated 102.0.0 dashboard graphs were migrated to dynamic chart.js solution
  * @see dashboard in adminhtml_dashboard_index.xml
  *
  * @api
diff --git a/app/code/Magento/Backend/Block/Dashboard/Graph.php b/app/code/Magento/Backend/Block/Dashboard/Graph.php
index db95a64636c3a..7811ee948f763 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Graph.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Graph.php
@@ -77,7 +77,7 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
     /**
      * Google chart api data encoding
      *
-     * @deprecated since the Google Image Charts API not accessible from March 14, 2019
+     * @deprecated 101.0.2 since the Google Image Charts API not accessible from March 14, 2019
      * @var string
      */
     protected $_encoding = 'e';
diff --git a/app/code/Magento/Backend/Block/Dashboard/Grids.php b/app/code/Magento/Backend/Block/Dashboard/Grids.php
index f40aaaf33fed7..9820d8b868d86 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Grids.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Grids.php
@@ -15,6 +15,7 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @since 100.0.2
  */
 class Grids extends Tabs
 {
diff --git a/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php b/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php
index 8b3574e223236..dd21a215ea6fe 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php
@@ -16,6 +16,7 @@
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
+ * @since 100.0.2
  */
 class Grid extends \Magento\Backend\Block\Dashboard\Grid
 {
diff --git a/app/code/Magento/Backend/Block/Dashboard/Sales.php b/app/code/Magento/Backend/Block/Dashboard/Sales.php
index ebe0932c3fa3b..098580b1369e9 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Sales.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Sales.php
@@ -16,6 +16,7 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @since 100.0.2
  */
 class Sales extends Bar
 {
diff --git a/app/code/Magento/Backend/Block/Dashboard/Totals.php b/app/code/Magento/Backend/Block/Dashboard/Totals.php
index 7da109c2fb602..73e6bc1ab9e8a 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Totals.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Totals.php
@@ -17,6 +17,7 @@
 /**
  * Adminhtml dashboard totals bar
  * @api
+ * @since 100.0.2
  */
 class Totals extends Bar
 {
diff --git a/app/code/Magento/Backend/Block/Media/Uploader.php b/app/code/Magento/Backend/Block/Media/Uploader.php
index e95b6397cd244..40cc68e04bf51 100644
--- a/app/code/Magento/Backend/Block/Media/Uploader.php
+++ b/app/code/Magento/Backend/Block/Media/Uploader.php
@@ -46,7 +46,7 @@ class Uploader extends \Magento\Backend\Block\Widget
 
     /**
      * @var UploadConfigInterface
-     * @deprecated
+     * @deprecated 101.0.1
      * @see \Magento\Backend\Model\Image\UploadResizeConfigInterface
      */
     private $imageConfig;
@@ -120,6 +120,7 @@ public function getFileSizeService()
      * Get Image Upload Maximum Width Config.
      *
      * @return int
+     * @since 100.2.7
      */
     public function getImageUploadMaxWidth()
     {
@@ -130,6 +131,7 @@ public function getImageUploadMaxWidth()
      * Get Image Upload Maximum Height Config.
      *
      * @return int
+     * @since 100.2.7
      */
     public function getImageUploadMaxHeight()
     {
diff --git a/app/code/Magento/Backend/Block/Page/Footer.php b/app/code/Magento/Backend/Block/Page/Footer.php
index e0c173a4cbfec..610d28b0f53e3 100644
--- a/app/code/Magento/Backend/Block/Page/Footer.php
+++ b/app/code/Magento/Backend/Block/Page/Footer.php
@@ -60,6 +60,7 @@ public function getMagentoVersion()
 
     /**
      * @inheritdoc
+     * @since 101.0.0
      */
     protected function getCacheLifetime()
     {
diff --git a/app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php b/app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php
index 2abb987db0723..d290b89b2a6bc 100644
--- a/app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php
+++ b/app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php
@@ -11,7 +11,7 @@
 /**
  * "Reset to Defaults" button renderer
  *
- * @deprecated 100.2.0
+ * @deprecated 100.1.6
  * @author     Magento Core Team <core@magentocommerce.com>
  */
 class Reset extends \Magento\Config\Block\System\Config\Form\Field
diff --git a/app/code/Magento/Backend/Block/Widget/Form/Element/ElementCreator.php b/app/code/Magento/Backend/Block/Widget/Form/Element/ElementCreator.php
index b9cdd259796d0..1b89746b3a98a 100644
--- a/app/code/Magento/Backend/Block/Widget/Form/Element/ElementCreator.php
+++ b/app/code/Magento/Backend/Block/Widget/Form/Element/ElementCreator.php
@@ -14,7 +14,7 @@
 /**
  * Class ElementCreator
  *
- * @deprecated 100.3.0 in favour of UI component implementation
+ * @deprecated 101.0.1 in favour of UI component implementation
  * @package Magento\Backend\Block\Widget\Form\Element
  */
 class ElementCreator
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction.php b/app/code/Magento/Backend/Block/Widget/Grid/Massaction.php
index 662cbedaed8db..53e52fc7252b3 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Massaction.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Massaction.php
@@ -64,6 +64,7 @@ public function __construct(
      * @param array|DataObject $item
      *
      * @return $this
+     * @since 100.2.3
      */
     public function addItem($itemId, $item)
     {
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php
index a9be14b77b29c..7bef74862f029 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php
@@ -88,7 +88,7 @@ protected function createPage()
      *
      * @return bool
      *
-     * @deprecated Backup module is to be removed.
+     * @deprecated 100.2.7 Backup module is to be removed.
      */
     protected function _backupDatabase()
     {
diff --git a/app/code/Magento/Backend/Helper/Dashboard/Data.php b/app/code/Magento/Backend/Helper/Dashboard/Data.php
index f691d2b7cd4b9..39ea634320b41 100644
--- a/app/code/Magento/Backend/Helper/Dashboard/Data.php
+++ b/app/code/Magento/Backend/Helper/Dashboard/Data.php
@@ -88,7 +88,7 @@ public function countStores()
     /**
      * Prepare array with periods for dashboard graphs
      *
-     * @deprecated periods were moved to it's own class
+     * @deprecated 102.0.0 periods were moved to it's own class
      * @see Period::getDatePeriods()
      *
      * @return array
diff --git a/app/code/Magento/Backend/Model/Url.php b/app/code/Magento/Backend/Model/Url.php
index 97f82647d9445..8948961be8875 100644
--- a/app/code/Magento/Backend/Model/Url.php
+++ b/app/code/Magento/Backend/Model/Url.php
@@ -372,6 +372,7 @@ protected function _getMenu()
      *
      * @param mixed $scopeId
      * @return \Magento\Framework\UrlInterface
+     * @since 101.0.3
      */
     public function setScope($scopeId)
     {
diff --git a/app/code/Magento/Backend/Ui/Component/Control/DeleteButton.php b/app/code/Magento/Backend/Ui/Component/Control/DeleteButton.php
index 3f4f3669ab75b..d3c177fa907ab 100644
--- a/app/code/Magento/Backend/Ui/Component/Control/DeleteButton.php
+++ b/app/code/Magento/Backend/Ui/Component/Control/DeleteButton.php
@@ -17,6 +17,7 @@
  * Provide an ability to show confirmation message on click on the "Delete" button
  *
  * @api
+ * @since 101.0.0
  */
 class DeleteButton implements ButtonProviderInterface
 {
@@ -84,6 +85,7 @@ public function __construct(
 
     /**
      * {@inheritdoc}
+     * @since 101.0.0
      */
     public function getButtonData()
     {
diff --git a/app/code/Magento/Backend/Ui/Component/Control/SaveSplitButton.php b/app/code/Magento/Backend/Ui/Component/Control/SaveSplitButton.php
index 75d6bad06e239..f85264e532057 100644
--- a/app/code/Magento/Backend/Ui/Component/Control/SaveSplitButton.php
+++ b/app/code/Magento/Backend/Ui/Component/Control/SaveSplitButton.php
@@ -13,6 +13,7 @@
  * Provide an ability to show drop-down list with options clicking on the "Save" button
  *
  * @api
+ * @since 101.0.0
  */
 class SaveSplitButton implements ButtonProviderInterface
 {
@@ -31,6 +32,7 @@ public function __construct(string $targetName)
 
     /**
      * {@inheritdoc}
+     * @since 101.0.0
      */
     public function getButtonData()
     {
diff --git a/app/code/Magento/Backend/Ui/Component/Listing/Column/EditAction.php b/app/code/Magento/Backend/Ui/Component/Listing/Column/EditAction.php
index fb0aa6987f4d9..1769bd7b3bb64 100644
--- a/app/code/Magento/Backend/Ui/Component/Listing/Column/EditAction.php
+++ b/app/code/Magento/Backend/Ui/Component/Listing/Column/EditAction.php
@@ -14,6 +14,7 @@
  * Represents Edit link in grid for entity by its identifier field
  *
  * @api
+ * @since 101.0.0
  */
 class EditAction extends Column
 {
@@ -43,6 +44,7 @@ public function __construct(
     /**
      * @param array $dataSource
      * @return array
+     * @since 101.0.0
      */
     public function prepareDataSource(array $dataSource)
     {
diff --git a/app/code/Magento/Backup/Controller/Adminhtml/Index.php b/app/code/Magento/Backup/Controller/Adminhtml/Index.php
index b62963947d7bf..64052254f5233 100644
--- a/app/code/Magento/Backup/Controller/Adminhtml/Index.php
+++ b/app/code/Magento/Backup/Controller/Adminhtml/Index.php
@@ -87,6 +87,7 @@ public function __construct(
 
     /**
      * @inheritDoc
+     * @since 100.2.6
      */
     public function dispatch(\Magento\Framework\App\RequestInterface $request)
     {
diff --git a/app/code/Magento/Backup/Helper/Data.php b/app/code/Magento/Backup/Helper/Data.php
index c6df6a7366852..a29aa01e64d46 100644
--- a/app/code/Magento/Backup/Helper/Data.php
+++ b/app/code/Magento/Backup/Helper/Data.php
@@ -293,6 +293,7 @@ public function extractDataFromFilename($filename)
      * Is backup functionality enabled.
      *
      * @return bool
+     * @since 100.2.6
      */
     public function isEnabled(): bool
     {
diff --git a/app/code/Magento/Backup/Model/Db.php b/app/code/Magento/Backup/Model/Db.php
index 084b35448a823..0d117a7dff818 100644
--- a/app/code/Magento/Backup/Model/Db.php
+++ b/app/code/Magento/Backup/Model/Db.php
@@ -16,7 +16,7 @@
  *
  * @api
  * @since 100.0.2
- * @deprecated Backup module is to be removed.
+ * @deprecated 100.2.6 Backup module is to be removed.
  */
 class Db implements \Magento\Framework\Backup\Db\BackupDbInterface
 {
diff --git a/app/code/Magento/Backup/Model/ResourceModel/Db.php b/app/code/Magento/Backup/Model/ResourceModel/Db.php
index 6e7d6f9863f33..c38a7b3005e21 100644
--- a/app/code/Magento/Backup/Model/ResourceModel/Db.php
+++ b/app/code/Magento/Backup/Model/ResourceModel/Db.php
@@ -120,6 +120,7 @@ public function getTableForeignKeysSql($tableName = null)
      * @param string|null $tableName
      * @param bool $addDropIfExists
      * @return string
+     * @since 100.2.3
      */
     public function getTableTriggersSql($tableName = null, $addDropIfExists = true)
     {
diff --git a/app/code/Magento/Backup/Model/ResourceModel/Helper.php b/app/code/Magento/Backup/Model/ResourceModel/Helper.php
index dace56fd60688..b5a5faae1fde4 100644
--- a/app/code/Magento/Backup/Model/ResourceModel/Helper.php
+++ b/app/code/Magento/Backup/Model/ResourceModel/Helper.php
@@ -345,6 +345,7 @@ public function restoreTransactionIsolationLevel()
      * @param boolean $addDropIfExists
      * @param boolean $stripDefiner
      * @return string
+     * @since 100.2.3
      */
     public function getTableTriggersSql($tableName, $addDropIfExists = false, $stripDefiner = true)
     {
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php
index 85ddc9c207e8d..05a2a51c51213 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php
@@ -86,6 +86,7 @@ public function setValidationContainer($elementId, $containerId)
 
     /**
      * @inheritdoc
+     * @since 100.3.1
      */
     public function getSelectionPrice($selection)
     {
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php
index 0b33ad546c5d0..af3642995a6c4 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php
@@ -86,6 +86,7 @@ public function setValidationContainer($elementId, $containerId)
 
     /**
      * @inheritdoc
+     * @since 100.3.1
      */
     public function getSelectionPrice($selection)
     {
diff --git a/app/code/Magento/Bundle/Pricing/Price/ConfiguredPrice.php b/app/code/Magento/Bundle/Pricing/Price/ConfiguredPrice.php
index 11f7e2f3d1f15..4b5ec32bf61aa 100644
--- a/app/code/Magento/Bundle/Pricing/Price/ConfiguredPrice.php
+++ b/app/code/Magento/Bundle/Pricing/Price/ConfiguredPrice.php
@@ -18,6 +18,7 @@
 /**
  * Configured price model
  * @api
+ * @since 100.0.2
  */
 class ConfiguredPrice extends CatalogPrice\FinalPrice implements ConfiguredPriceInterface
 {
diff --git a/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php b/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php
index e6522054d9f94..49881f67f5c9a 100644
--- a/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php
+++ b/app/code/Magento/BundleImportExport/Model/Import/Product/Type/Bundle.php
@@ -339,7 +339,7 @@ protected function populateSelectionTemplate($selection, $optionId, $parentId, $
     /**
      * Deprecated method for retrieving mapping between skus and products.
      *
-     * @deprecated Misspelled method
+     * @deprecated 100.3.0 Misspelled method
      * @see retrieveProductsByCachedSkus
      */
     protected function retrieveProducsByCachedSkus()
diff --git a/app/code/Magento/Catalog/Api/BasePriceStorageInterface.php b/app/code/Magento/Catalog/Api/BasePriceStorageInterface.php
index 05e5106b287a0..2afa14d874e4b 100644
--- a/app/code/Magento/Catalog/Api/BasePriceStorageInterface.php
+++ b/app/code/Magento/Catalog/Api/BasePriceStorageInterface.php
@@ -9,7 +9,7 @@
 /**
  * Base prices storage.
  * @api
- * @since 101.1.0
+ * @since 102.0.0
  */
 interface BasePriceStorageInterface
 {
@@ -18,7 +18,7 @@ interface BasePriceStorageInterface
      *
      * @param string[] $skus
      * @return \Magento\Catalog\Api\Data\BasePriceInterface[]
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function get(array $skus);
 
@@ -33,7 +33,7 @@ public function get(array $skus);
      * @param \Magento\Catalog\Api\Data\BasePriceInterface[] $prices
      * @return \Magento\Catalog\Api\Data\PriceUpdateResultInterface[]
      * @throws \Magento\Framework\Exception\CouldNotSaveException
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function update(array $prices);
 }
diff --git a/app/code/Magento/Catalog/Api/CategoryListDeleteBySkuInterface.php b/app/code/Magento/Catalog/Api/CategoryListDeleteBySkuInterface.php
index 62eba5987c35d..08265d6583090 100644
--- a/app/code/Magento/Catalog/Api/CategoryListDeleteBySkuInterface.php
+++ b/app/code/Magento/Catalog/Api/CategoryListDeleteBySkuInterface.php
@@ -8,7 +8,7 @@
 
 /**
  * @api
- * @since 100.0.2
+ * @since 104.0.0
  */
 interface CategoryListDeleteBySkuInterface
 {
@@ -22,6 +22,7 @@ interface CategoryListDeleteBySkuInterface
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\InputException
+     * @since 104.0.0
      */
     public function deleteBySkus(int $categoryId, array $productSkuList): bool;
 }
diff --git a/app/code/Magento/Catalog/Api/CategoryListInterface.php b/app/code/Magento/Catalog/Api/CategoryListInterface.php
index 22a9da00eaffc..2f6cd1f38730a 100644
--- a/app/code/Magento/Catalog/Api/CategoryListInterface.php
+++ b/app/code/Magento/Catalog/Api/CategoryListInterface.php
@@ -7,7 +7,7 @@
 
 /**
  * @api
- * @since 101.1.0
+ * @since 102.0.0
  */
 interface CategoryListInterface
 {
@@ -16,7 +16,7 @@ interface CategoryListInterface
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return \Magento\Catalog\Api\Data\CategorySearchResultsInterface
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria);
 }
diff --git a/app/code/Magento/Catalog/Api/CostStorageInterface.php b/app/code/Magento/Catalog/Api/CostStorageInterface.php
index a52d290bd46d8..debb791a7b756 100644
--- a/app/code/Magento/Catalog/Api/CostStorageInterface.php
+++ b/app/code/Magento/Catalog/Api/CostStorageInterface.php
@@ -9,7 +9,7 @@
 /**
  * Product cost storage.
  * @api
- * @since 101.1.0
+ * @since 102.0.0
  */
 interface CostStorageInterface
 {
@@ -19,7 +19,7 @@ interface CostStorageInterface
      * @param string[] $skus
      * @return \Magento\Catalog\Api\Data\CostInterface[]
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function get(array $skus);
 
@@ -33,7 +33,7 @@ public function get(array $skus);
      *
      * @param \Magento\Catalog\Api\Data\CostInterface[] $prices
      * @return \Magento\Catalog\Api\Data\PriceUpdateResultInterface[]
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function update(array $prices);
 
@@ -45,7 +45,7 @@ public function update(array $prices);
      * @return bool Will return True if deleted.
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\CouldNotDeleteException
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function delete(array $skus);
 }
diff --git a/app/code/Magento/Catalog/Api/Data/BasePriceInterface.php b/app/code/Magento/Catalog/Api/Data/BasePriceInterface.php
index a527bbfe947ab..1bce067650313 100644
--- a/app/code/Magento/Catalog/Api/Data/BasePriceInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/BasePriceInterface.php
@@ -9,7 +9,7 @@
 /**
  * Price interface.
  * @api
- * @since 101.1.0
+ * @since 102.0.0
  */
 interface BasePriceInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -26,7 +26,7 @@ interface BasePriceInterface extends \Magento\Framework\Api\ExtensibleDataInterf
      *
      * @param float $price
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setPrice($price);
 
@@ -34,7 +34,7 @@ public function setPrice($price);
      * Get price.
      *
      * @return float
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getPrice();
 
@@ -43,7 +43,7 @@ public function getPrice();
      *
      * @param int $storeId
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setStoreId($storeId);
 
@@ -51,7 +51,7 @@ public function setStoreId($storeId);
      * Get store id.
      *
      * @return int
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getStoreId();
 
@@ -60,7 +60,7 @@ public function getStoreId();
      *
      * @param string $sku
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setSku($sku);
 
@@ -68,7 +68,7 @@ public function setSku($sku);
      * Get SKU.
      *
      * @return string
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getSku();
 
@@ -76,7 +76,7 @@ public function getSku();
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Catalog\Api\Data\BasePriceExtensionInterface|null
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getExtensionAttributes();
 
@@ -85,7 +85,7 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Catalog\Api\Data\BasePriceExtensionInterface $extensionAttributes
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\BasePriceExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Api/Data/CategoryLinkInterface.php b/app/code/Magento/Catalog/Api/Data/CategoryLinkInterface.php
index e9c0e04c4f746..c9ca57dc1eff1 100644
--- a/app/code/Magento/Catalog/Api/Data/CategoryLinkInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/CategoryLinkInterface.php
@@ -10,20 +10,20 @@
 
 /**
  * @api
- * @since 101.1.0
+ * @since 102.0.0
  */
 interface CategoryLinkInterface extends ExtensibleDataInterface
 {
     /**
      * @return int|null
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getPosition();
 
     /**
      * @param int $position
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setPosition($position);
 
@@ -31,7 +31,7 @@ public function setPosition($position);
      * Get category id
      *
      * @return string
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getCategoryId();
 
@@ -40,7 +40,7 @@ public function getCategoryId();
      *
      * @param string $categoryId
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setCategoryId($categoryId);
 
@@ -48,7 +48,7 @@ public function setCategoryId($categoryId);
      * Retrieve existing extension attributes object.
      *
      * @return \Magento\Catalog\Api\Data\CategoryLinkExtensionInterface|null
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getExtensionAttributes();
 
@@ -57,7 +57,7 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Catalog\Api\Data\CategoryLinkExtensionInterface $extensionAttributes
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\CategoryLinkExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Api/Data/CategorySearchResultsInterface.php b/app/code/Magento/Catalog/Api/Data/CategorySearchResultsInterface.php
index 38f3f89d6a0c5..0ed03c2d56519 100644
--- a/app/code/Magento/Catalog/Api/Data/CategorySearchResultsInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/CategorySearchResultsInterface.php
@@ -9,7 +9,7 @@
 
 /**
  * @api
- * @since 101.1.0
+ * @since 102.0.0
  */
 interface CategorySearchResultsInterface extends SearchResultsInterface
 {
@@ -17,7 +17,7 @@ interface CategorySearchResultsInterface extends SearchResultsInterface
      * Get categories
      *
      * @return \Magento\Catalog\Api\Data\CategoryInterface[]
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getItems();
 
@@ -26,7 +26,7 @@ public function getItems();
      *
      * @param \Magento\Catalog\Api\Data\CategoryInterface[] $items
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/Catalog/Api/Data/CostInterface.php b/app/code/Magento/Catalog/Api/Data/CostInterface.php
index a9966f56bafa3..ed5e8cd8a2bb2 100644
--- a/app/code/Magento/Catalog/Api/Data/CostInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/CostInterface.php
@@ -9,7 +9,7 @@
 /**
  * Cost interface.
  * @api
- * @since 101.1.0
+ * @since 102.0.0
  */
 interface CostInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -26,7 +26,7 @@ interface CostInterface extends \Magento\Framework\Api\ExtensibleDataInterface
      *
      * @param float $cost
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setCost($cost);
 
@@ -34,7 +34,7 @@ public function setCost($cost);
      * Get cost value.
      *
      * @return float
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getCost();
 
@@ -43,7 +43,7 @@ public function getCost();
      *
      * @param int $storeId
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setStoreId($storeId);
 
@@ -51,7 +51,7 @@ public function setStoreId($storeId);
      * Get store id.
      *
      * @return int
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getStoreId();
 
@@ -60,7 +60,7 @@ public function getStoreId();
      *
      * @param string $sku
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setSku($sku);
 
@@ -68,7 +68,7 @@ public function setSku($sku);
      * Get SKU.
      *
      * @return string
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getSku();
 
@@ -76,7 +76,7 @@ public function getSku();
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Catalog\Api\Data\CostExtensionInterface|null
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getExtensionAttributes();
 
@@ -85,7 +85,7 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Catalog\Api\Data\CostExtensionInterface $extensionAttributes
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\CostExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Api/Data/EavAttributeInterface.php b/app/code/Magento/Catalog/Api/Data/EavAttributeInterface.php
index dabd3234c6dab..08696156fa11a 100644
--- a/app/code/Magento/Catalog/Api/Data/EavAttributeInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/EavAttributeInterface.php
@@ -145,7 +145,7 @@ public function getIsFilterableInGrid();
      *
      * @param bool|null $isUsedInGrid
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setIsUsedInGrid($isUsedInGrid);
 
@@ -154,7 +154,7 @@ public function setIsUsedInGrid($isUsedInGrid);
      *
      * @param bool|null $isVisibleInGrid
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setIsVisibleInGrid($isVisibleInGrid);
 
@@ -163,7 +163,7 @@ public function setIsVisibleInGrid($isVisibleInGrid);
      *
      * @param bool|null $isFilterableInGrid
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setIsFilterableInGrid($isFilterableInGrid);
 
diff --git a/app/code/Magento/Catalog/Api/Data/PriceUpdateResultInterface.php b/app/code/Magento/Catalog/Api/Data/PriceUpdateResultInterface.php
index 426c5becc7a24..25bd9eeb438c9 100644
--- a/app/code/Magento/Catalog/Api/Data/PriceUpdateResultInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/PriceUpdateResultInterface.php
@@ -9,7 +9,7 @@
 /**
  * Interface returned in case of incorrect price passed to efficient price API.
  * @api
- * @since 101.1.0
+ * @since 102.0.0
  */
 interface PriceUpdateResultInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -24,7 +24,7 @@ interface PriceUpdateResultInterface extends \Magento\Framework\Api\ExtensibleDa
      * Get error message, that contains description of error occurred during price update.
      *
      * @return string
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getMessage();
 
@@ -33,7 +33,7 @@ public function getMessage();
      *
      * @param string $message
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setMessage($message);
 
@@ -41,7 +41,7 @@ public function setMessage($message);
      * Get parameters, that could be displayed in error message placeholders.
      *
      * @return string[]
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getParameters();
 
@@ -50,7 +50,7 @@ public function getParameters();
      *
      * @param string[] $parameters
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setParameters(array $parameters);
 
@@ -59,7 +59,7 @@ public function setParameters(array $parameters);
      * If extension attributes do not exist return null.
      *
      * @return \Magento\Catalog\Api\Data\PriceUpdateResultExtensionInterface|null
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getExtensionAttributes();
 
@@ -68,7 +68,7 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Catalog\Api\Data\PriceUpdateResultExtensionInterface $extensionAttributes
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\PriceUpdateResultExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Api/Data/ProductAttributeInterface.php b/app/code/Magento/Catalog/Api/Data/ProductAttributeInterface.php
index 590c23a0aa0b1..15fd17f41e158 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductAttributeInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductAttributeInterface.php
@@ -35,6 +35,7 @@ interface ProductAttributeInterface extends \Magento\Catalog\Api\Data\EavAttribu
 
     /**
      * @return \Magento\Eav\Api\Data\AttributeExtensionInterface|null
+     * @since 103.0.0
      */
     public function getExtensionAttributes();
 }
diff --git a/app/code/Magento/Catalog/Api/Data/ProductFrontendActionInterface.php b/app/code/Magento/Catalog/Api/Data/ProductFrontendActionInterface.php
index 9a6cfebc71fa0..610c457215853 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductFrontendActionInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductFrontendActionInterface.php
@@ -9,7 +9,7 @@
  * Represents Data Object for a Product Frontend Action like Product View or Comparison
  *
  * @api
- * @since 101.1.0
+ * @since 102.0.0
  */
 interface ProductFrontendActionInterface
 {
@@ -17,7 +17,7 @@ interface ProductFrontendActionInterface
      * Gets Identifier of a Product Frontend Action
      *
      * @return int
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getActionId();
 
@@ -26,7 +26,7 @@ public function getActionId();
      *
      * @param int $actionId
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setActionId($actionId);
 
@@ -34,7 +34,7 @@ public function setActionId($actionId);
      * Gets Identifier of Visitor who performs a Product Frontend Action
      *
      * @return int
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getVisitorId();
 
@@ -43,7 +43,7 @@ public function getVisitorId();
      *
      * @param int $visitorId
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setVisitorId($visitorId);
 
@@ -51,7 +51,7 @@ public function setVisitorId($visitorId);
      * Gets Identifier of Customer who performs a Product Frontend Action
      *
      * @return int
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getCustomerId();
 
@@ -60,7 +60,7 @@ public function getCustomerId();
      *
      * @param int $customerId
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setCustomerId($customerId);
 
@@ -68,7 +68,7 @@ public function setCustomerId($customerId);
      * Gets Identifier of Product a Product Frontend Action is performed on
      *
      * @return int
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getProductId();
 
@@ -77,7 +77,7 @@ public function getProductId();
      *
      * @param int $productId
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setProductId($productId);
 
@@ -85,7 +85,7 @@ public function setProductId($productId);
      * Gets Identifier of Type of a Product Frontend Action
      *
      * @return string
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getTypeId();
 
@@ -94,7 +94,7 @@ public function getTypeId();
      *
      * @param string $typeId
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setTypeId($typeId);
 
@@ -102,7 +102,7 @@ public function setTypeId($typeId);
      * Gets JS timestamp of a Product Frontend Action (in microseconds)
      *
      * @return int
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getAddedAt();
 
@@ -111,7 +111,7 @@ public function getAddedAt();
      *
      * @param int $addedAt
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setAddedAt($addedAt);
 }
diff --git a/app/code/Magento/Catalog/Api/Data/ProductRender/ButtonInterface.php b/app/code/Magento/Catalog/Api/Data/ProductRender/ButtonInterface.php
index e2f4dfa201593..592b47d216ae9 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductRender/ButtonInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductRender/ButtonInterface.php
@@ -14,7 +14,7 @@
  * This interface represents all manner of product buttons: add to cart, add to compare, etc...
  * The buttons describes by this interface should have interaction with backend
  * @api
- * @since 101.1.0
+ * @since 102.0.0
  */
 interface ButtonInterface extends ExtensibleDataInterface
 {
@@ -22,7 +22,7 @@ interface ButtonInterface extends ExtensibleDataInterface
      * @param string $postData Post data should be serialized (JSON/serialized) string
      * Post data can be empty
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setPostData($postData);
 
@@ -33,7 +33,7 @@ public function setPostData($postData);
      * to handle product action
      *
      * @return string
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getPostData();
 
@@ -44,7 +44,7 @@ public function getPostData();
      *
      * @param string $url
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setUrl($url);
 
@@ -52,7 +52,7 @@ public function setUrl($url);
      * Retrieve url, needed to add product to cart
      *
      * @return string
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getUrl();
 
@@ -62,7 +62,7 @@ public function getUrl();
      *
      * @param bool $requiredOptions
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setRequiredOptions($requiredOptions);
 
@@ -70,7 +70,7 @@ public function setRequiredOptions($requiredOptions);
      * Retrieve flag whether a product has options or not
      *
      * @return bool
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function hasRequiredOptions();
 
@@ -78,7 +78,7 @@ public function hasRequiredOptions();
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Catalog\Api\Data\ProductRender\ButtonExtensionInterface|null
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getExtensionAttributes();
 
@@ -87,7 +87,7 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Catalog\Api\Data\ProductRender\ButtonExtensionInterface $extensionAttributes
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\ProductRender\ButtonExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Api/Data/ProductRender/FormattedPriceInfoInterface.php b/app/code/Magento/Catalog/Api/Data/ProductRender/FormattedPriceInfoInterface.php
index d111de1b04b94..6022c5198769a 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductRender/FormattedPriceInfoInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductRender/FormattedPriceInfoInterface.php
@@ -15,7 +15,7 @@
  * Consider currency, rounding and html
  *
  * @api
- * @since 101.1.0
+ * @since 102.0.0
  */
 interface FormattedPriceInfoInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -23,7 +23,7 @@ interface FormattedPriceInfoInterface extends \Magento\Framework\Api\ExtensibleD
      * Retrieve html with final price
      *
      * @return string
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getFinalPrice();
 
@@ -34,7 +34,7 @@ public function getFinalPrice();
      *
      * @param string $finalPrice
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setFinalPrice($finalPrice);
 
@@ -44,7 +44,7 @@ public function setFinalPrice($finalPrice);
      * E.g. for product with custom options is price with the most expensive custom option
      *
      * @return string
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getMaxPrice();
 
@@ -53,7 +53,7 @@ public function getMaxPrice();
      *
      * @param string $maxPrice
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setMaxPrice($maxPrice);
 
@@ -63,7 +63,7 @@ public function setMaxPrice($maxPrice);
      * The minimal price is for example, the lowest price of all variations for complex product
      *
      * @return string
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getMinimalPrice();
 
@@ -74,7 +74,7 @@ public function getMinimalPrice();
      *
      * @param string $maxRegularPrice
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setMaxRegularPrice($maxRegularPrice);
 
@@ -82,7 +82,7 @@ public function setMaxRegularPrice($maxRegularPrice);
      * Retrieve max regular price
      *
      * @return string
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getMaxRegularPrice();
 
@@ -91,7 +91,7 @@ public function getMaxRegularPrice();
      *
      * @param string $minRegularPrice
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setMinimalRegularPrice($minRegularPrice);
 
@@ -99,7 +99,7 @@ public function setMinimalRegularPrice($minRegularPrice);
      * Retrieve minimal regular price
      *
      * @return string
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getMinimalRegularPrice();
 
@@ -110,7 +110,7 @@ public function getMinimalRegularPrice();
      *
      * @param string $specialPrice
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setSpecialPrice($specialPrice);
 
@@ -118,7 +118,7 @@ public function setSpecialPrice($specialPrice);
      * Retrieve special price
      *
      * @return string
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getSpecialPrice();
 
@@ -127,7 +127,7 @@ public function getSpecialPrice();
      *
      * @param string $minimalPrice
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setMinimalPrice($minimalPrice);
 
@@ -137,7 +137,7 @@ public function setMinimalPrice($minimalPrice);
      * Usually this price is corresponding to price in admin panel of product
      *
      * @return string
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getRegularPrice();
 
@@ -146,7 +146,7 @@ public function getRegularPrice();
      *
      * @param string $regularPrice
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setRegularPrice($regularPrice);
 
@@ -154,7 +154,7 @@ public function setRegularPrice($regularPrice);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Catalog\Api\Data\ProductRender\FormattedPriceInfoExtensionInterface|null
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getExtensionAttributes();
 
@@ -163,7 +163,7 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Catalog\Api\Data\ProductRender\FormattedPriceInfoExtensionInterface $extensionAttributes
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\ProductRender\FormattedPriceInfoExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Api/Data/ProductRender/ImageInterface.php b/app/code/Magento/Catalog/Api/Data/ProductRender/ImageInterface.php
index 45b070d2706dc..49789e5ce9ed7 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductRender/ImageInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductRender/ImageInterface.php
@@ -14,7 +14,7 @@
  * Represents physical characteristics of image, that can be used in product listing or product view
  *
  * @api
- * @since 101.1.0
+ * @since 102.0.0
  */
 interface ImageInterface extends ExtensibleDataInterface
 {
@@ -24,7 +24,7 @@ interface ImageInterface extends ExtensibleDataInterface
      *
      * @param string $url
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setUrl($url);
 
@@ -32,7 +32,7 @@ public function setUrl($url);
      * Retrieve image url
      *
      * @return string
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getUrl();
 
@@ -43,7 +43,7 @@ public function getUrl();
      * What size should this image have, etc...
      *
      * @return string
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getCode();
 
@@ -52,7 +52,7 @@ public function getCode();
      *
      * @param string $code
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setCode($code);
 
@@ -61,7 +61,7 @@ public function setCode($code);
      *
      * @param string $height
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setHeight($height);
 
@@ -69,7 +69,7 @@ public function setHeight($height);
      * Retrieve image height
      *
      * @return float
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getHeight();
 
@@ -77,7 +77,7 @@ public function getHeight();
      * Set image width in px
      *
      * @return float
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getWidth();
 
@@ -86,7 +86,7 @@ public function getWidth();
      *
      * @param string $width
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setWidth($width);
 
@@ -96,7 +96,7 @@ public function setWidth($width);
      * Image label is short description of this image
      *
      * @return string
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getLabel();
 
@@ -105,7 +105,7 @@ public function getLabel();
      *
      * @param string $label
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setLabel($label);
 
@@ -115,7 +115,7 @@ public function setLabel($label);
      * This width is image dimension, which represents the width, that can be used for performance improvements
      *
      * @return float
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getResizedWidth();
 
@@ -124,7 +124,7 @@ public function getResizedWidth();
      *
      * @param string $width
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setResizedWidth($width);
 
@@ -133,7 +133,7 @@ public function setResizedWidth($width);
      *
      * @param string $height
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setResizedHeight($height);
 
@@ -141,7 +141,7 @@ public function setResizedHeight($height);
      * Retrieve resize height
      *
      * @return float
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getResizedHeight();
 
@@ -149,7 +149,7 @@ public function getResizedHeight();
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Catalog\Api\Data\ProductRender\ImageExtensionInterface|null
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getExtensionAttributes();
 
@@ -158,7 +158,7 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Catalog\Api\Data\ProductRender\ImageExtensionInterface $extensionAttributes
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\ProductRender\ImageExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Api/Data/ProductRender/PriceInfoInterface.php b/app/code/Magento/Catalog/Api/Data/ProductRender/PriceInfoInterface.php
index 9768b3c08c8ab..0e9b1c53fcd14 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductRender/PriceInfoInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductRender/PriceInfoInterface.php
@@ -10,7 +10,7 @@
  * Price interface.
  *
  * @api
- * @since 101.1.0
+ * @since 102.0.0
  */
 interface PriceInfoInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -18,7 +18,7 @@ interface PriceInfoInterface extends \Magento\Framework\Api\ExtensibleDataInterf
      * Retrieve final price
      *
      * @return float
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getFinalPrice();
 
@@ -29,7 +29,7 @@ public function getFinalPrice();
      *
      * @param float $finalPrice
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setFinalPrice($finalPrice);
 
@@ -39,7 +39,7 @@ public function setFinalPrice($finalPrice);
      * E.g. for product with custom options is price with the most expensive custom option
      *
      * @return float
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getMaxPrice();
 
@@ -48,7 +48,7 @@ public function getMaxPrice();
      *
      * @param float $maxPrice
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setMaxPrice($maxPrice);
 
@@ -60,7 +60,7 @@ public function setMaxPrice($maxPrice);
      *
      * @param float $maxRegularPrice
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setMaxRegularPrice($maxRegularPrice);
 
@@ -68,7 +68,7 @@ public function setMaxRegularPrice($maxRegularPrice);
      * Retrieve max regular price
      *
      * @return float
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getMaxRegularPrice();
 
@@ -77,7 +77,7 @@ public function getMaxRegularPrice();
      *
      * @param float $minRegularPrice
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setMinimalRegularPrice($minRegularPrice);
 
@@ -85,7 +85,7 @@ public function setMinimalRegularPrice($minRegularPrice);
      * Retrieve minimal regular price
      *
      * @return float
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getMinimalRegularPrice();
 
@@ -96,7 +96,7 @@ public function getMinimalRegularPrice();
      *
      * @param float $specialPrice
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setSpecialPrice($specialPrice);
 
@@ -104,7 +104,7 @@ public function setSpecialPrice($specialPrice);
      * Retrieve special price
      *
      * @return float
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getSpecialPrice();
 
@@ -112,7 +112,7 @@ public function getSpecialPrice();
      * Retrieve minimal price
      *
      * @return float
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getMinimalPrice();
 
@@ -121,7 +121,7 @@ public function getMinimalPrice();
      *
      * @param float $minimalPrice
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setMinimalPrice($minimalPrice);
 
@@ -129,7 +129,7 @@ public function setMinimalPrice($minimalPrice);
      * Retrieve regular price
      *
      * @return float
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getRegularPrice();
 
@@ -140,7 +140,7 @@ public function getRegularPrice();
      *
      * @param float $regularPrice
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setRegularPrice($regularPrice);
 
@@ -148,7 +148,7 @@ public function setRegularPrice($regularPrice);
      * Retrieve dto with formatted prices
      *
      * @return \Magento\Catalog\Api\Data\ProductRender\FormattedPriceInfoInterface
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getFormattedPrices();
 
@@ -157,7 +157,7 @@ public function getFormattedPrices();
      *
      * @param FormattedPriceInfoInterface $formattedPriceInfo
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setFormattedPrices(FormattedPriceInfoInterface $formattedPriceInfo);
 
@@ -165,7 +165,7 @@ public function setFormattedPrices(FormattedPriceInfoInterface $formattedPriceIn
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Catalog\Api\Data\ProductRender\PriceInfoExtensionInterface|null
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getExtensionAttributes();
 
@@ -174,7 +174,7 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Catalog\Api\Data\ProductRender\PriceInfoExtensionInterface $extensionAttributes
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\ProductRender\PriceInfoExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Api/Data/ProductRenderInterface.php b/app/code/Magento/Catalog/Api/Data/ProductRenderInterface.php
index 166a1aba76b61..e1bd1a7899b67 100644
--- a/app/code/Magento/Catalog/Api/Data/ProductRenderInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/ProductRenderInterface.php
@@ -15,7 +15,7 @@
  * This information is put into part as Add To Cart or Add to Compare Data or Price Data
  *
  * @api
- * @since 101.1.0
+ * @since 102.0.0
  */
 interface ProductRenderInterface extends ExtensibleDataInterface
 {
@@ -23,7 +23,7 @@ interface ProductRenderInterface extends ExtensibleDataInterface
      * Provide information needed for render "Add To Cart" button on front
      *
      * @return \Magento\Catalog\Api\Data\ProductRender\ButtonInterface
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getAddToCartButton();
 
@@ -32,7 +32,7 @@ public function getAddToCartButton();
      *
      * @param ButtonInterface $cartAddToCartButton
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setAddToCartButton(ButtonInterface $cartAddToCartButton);
 
@@ -40,7 +40,7 @@ public function setAddToCartButton(ButtonInterface $cartAddToCartButton);
      * Provide information needed for render "Add To Compare" button on front
      *
      * @return \Magento\Catalog\Api\Data\ProductRender\ButtonInterface
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getAddToCompareButton();
 
@@ -49,7 +49,7 @@ public function getAddToCompareButton();
      *
      * @param ButtonInterface $compareButton
      * @return string
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setAddToCompareButton(ButtonInterface $compareButton);
 
@@ -59,7 +59,7 @@ public function setAddToCompareButton(ButtonInterface $compareButton);
      * Prices are represented in raw format and in current currency
      *
      * @return \Magento\Catalog\Api\Data\ProductRender\PriceInfoInterface
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getPriceInfo();
 
@@ -68,7 +68,7 @@ public function getPriceInfo();
      *
      * @param \Magento\Catalog\Api\Data\ProductRender\PriceInfoInterface $priceInfo
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setPriceInfo(PriceInfoInterface $priceInfo);
 
@@ -78,7 +78,7 @@ public function setPriceInfo(PriceInfoInterface $priceInfo);
      * Images can be separated by image codes
      *
      * @return \Magento\Catalog\Api\Data\ProductRender\ImageInterface[]
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getImages();
 
@@ -87,7 +87,7 @@ public function getImages();
      *
      * @param \Magento\Catalog\Api\Data\ProductRender\ImageInterface[] $images
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setImages(array $images);
 
@@ -95,7 +95,7 @@ public function setImages(array $images);
      * Provide product url
      *
      * @return string
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getUrl();
 
@@ -104,7 +104,7 @@ public function getUrl();
      *
      * @param string $url
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setUrl($url);
 
@@ -112,7 +112,7 @@ public function setUrl($url);
      * Provide product identifier
      *
      * @return int
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getId();
 
@@ -121,7 +121,7 @@ public function getId();
      *
      * @param int $id
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setId($id);
 
@@ -129,7 +129,7 @@ public function setId($id);
      * Provide product name
      *
      * @return string
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getName();
 
@@ -138,7 +138,7 @@ public function getName();
      *
      * @param string $name
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setName($name);
 
@@ -146,7 +146,7 @@ public function setName($name);
      * Provide product type. Such as bundle, grouped, simple, etc...
      *
      * @return string
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getType();
 
@@ -155,7 +155,7 @@ public function getType();
      *
      * @param string $productType
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setType($productType);
 
@@ -163,7 +163,7 @@ public function setType($productType);
      * Provide information about product saleability (In Stock)
      *
      * @return string
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getIsSalable();
 
@@ -175,7 +175,7 @@ public function getIsSalable();
      *
      * @param string $isSalable
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setIsSalable($isSalable);
 
@@ -186,7 +186,7 @@ public function setIsSalable($isSalable);
      * This setting affect store scope attributes
      *
      * @return int
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getStoreId();
 
@@ -195,7 +195,7 @@ public function getStoreId();
      *
      * @param int $storeId
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setStoreId($storeId);
 
@@ -205,7 +205,7 @@ public function setStoreId($storeId);
      * This setting affect formatted prices*
      *
      * @return string
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getCurrencyCode();
 
@@ -214,7 +214,7 @@ public function getCurrencyCode();
      *
      * @param string $currencyCode
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setCurrencyCode($currencyCode);
 
@@ -222,7 +222,7 @@ public function setCurrencyCode($currencyCode);
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Catalog\Api\Data\ProductRenderExtensionInterface
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getExtensionAttributes();
 
@@ -231,7 +231,7 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Catalog\Api\Data\ProductRenderExtensionInterface $extensionAttributes
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\ProductRenderExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Api/Data/SpecialPriceInterface.php b/app/code/Magento/Catalog/Api/Data/SpecialPriceInterface.php
index 62028ed788dd5..ec4feb5076238 100644
--- a/app/code/Magento/Catalog/Api/Data/SpecialPriceInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/SpecialPriceInterface.php
@@ -9,7 +9,7 @@
 /**
  * Product Special Price Interface is used to encapsulate data that can be processed by efficient price API.
  * @api
- * @since 101.1.0
+ * @since 102.0.0
  */
 interface SpecialPriceInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -28,7 +28,7 @@ interface SpecialPriceInterface extends \Magento\Framework\Api\ExtensibleDataInt
      *
      * @param float $price
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setPrice($price);
 
@@ -36,7 +36,7 @@ public function setPrice($price);
      * Get product special price value.
      *
      * @return float
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getPrice();
 
@@ -45,7 +45,7 @@ public function getPrice();
      *
      * @param int $storeId
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setStoreId($storeId);
 
@@ -53,7 +53,7 @@ public function setStoreId($storeId);
      * Get ID of store, that contains special price value.
      *
      * @return int
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getStoreId();
 
@@ -62,7 +62,7 @@ public function getStoreId();
      *
      * @param string $sku
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setSku($sku);
 
@@ -70,7 +70,7 @@ public function setSku($sku);
      * Get SKU of product, that contains special price value.
      *
      * @return string
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getSku();
 
@@ -79,7 +79,7 @@ public function getSku();
      *
      * @param string $datetime
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setPriceFrom($datetime);
 
@@ -87,7 +87,7 @@ public function setPriceFrom($datetime);
      * Get start date for special price in Y-m-d H:i:s format.
      *
      * @return string
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getPriceFrom();
 
@@ -96,7 +96,7 @@ public function getPriceFrom();
      *
      * @param string $datetime
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setPriceTo($datetime);
 
@@ -104,7 +104,7 @@ public function setPriceTo($datetime);
      * Get end date for special price in Y-m-d H:i:s format.
      *
      * @return string
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getPriceTo();
 
@@ -113,7 +113,7 @@ public function getPriceTo();
      * If extension attributes do not exist return null.
      *
      * @return \Magento\Catalog\Api\Data\SpecialPriceExtensionInterface|null
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getExtensionAttributes();
 
@@ -122,7 +122,7 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Catalog\Api\Data\SpecialPriceExtensionInterface $extensionAttributes
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\SpecialPriceExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Api/Data/TierPriceInterface.php b/app/code/Magento/Catalog/Api/Data/TierPriceInterface.php
index eaa1d22726d7c..dae43722bf42c 100644
--- a/app/code/Magento/Catalog/Api/Data/TierPriceInterface.php
+++ b/app/code/Magento/Catalog/Api/Data/TierPriceInterface.php
@@ -9,7 +9,7 @@
 /**
  * Tier price interface.
  * @api
- * @since 101.1.0
+ * @since 102.0.0
  */
 interface TierPriceInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -31,7 +31,7 @@ interface TierPriceInterface extends \Magento\Framework\Api\ExtensibleDataInterf
      *
      * @param float $price
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setPrice($price);
 
@@ -39,7 +39,7 @@ public function setPrice($price);
      * Get tier price.
      *
      * @return float
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getPrice();
 
@@ -48,7 +48,7 @@ public function getPrice();
      *
      * @param string $type
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setPriceType($type);
 
@@ -56,7 +56,7 @@ public function setPriceType($type);
      * Get tier price type.
      *
      * @return string
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getPriceType();
 
@@ -65,7 +65,7 @@ public function getPriceType();
      *
      * @param int $websiteId
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setWebsiteId($websiteId);
 
@@ -73,7 +73,7 @@ public function setWebsiteId($websiteId);
      * Get website id.
      *
      * @return int
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getWebsiteId();
 
@@ -82,7 +82,7 @@ public function getWebsiteId();
      *
      * @param string $sku
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setSku($sku);
 
@@ -90,7 +90,7 @@ public function setSku($sku);
      * Get SKU.
      *
      * @return string
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getSku();
 
@@ -99,7 +99,7 @@ public function getSku();
      *
      * @param string $group
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setCustomerGroup($group);
 
@@ -107,7 +107,7 @@ public function setCustomerGroup($group);
      * Get customer group.
      *
      * @return string
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getCustomerGroup();
 
@@ -116,7 +116,7 @@ public function getCustomerGroup();
      *
      * @param float $quantity
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setQuantity($quantity);
 
@@ -124,7 +124,7 @@ public function setQuantity($quantity);
      * Get quantity.
      *
      * @return float
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getQuantity();
 
@@ -132,7 +132,7 @@ public function getQuantity();
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\Catalog\Api\Data\TierPriceExtensionInterface|null
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getExtensionAttributes();
 
@@ -141,7 +141,7 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Catalog\Api\Data\TierPriceExtensionInterface $extensionAttributes
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setExtensionAttributes(
         \Magento\Catalog\Api\Data\TierPriceExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Catalog/Api/ProductRenderListInterface.php b/app/code/Magento/Catalog/Api/ProductRenderListInterface.php
index 954acd35a07db..ddd0f1406f68e 100644
--- a/app/code/Magento/Catalog/Api/ProductRenderListInterface.php
+++ b/app/code/Magento/Catalog/Api/ProductRenderListInterface.php
@@ -11,7 +11,7 @@
  * Interface which provides product renders information for products.
  *
  * @api
- * @since 101.1.0
+ * @since 102.0.0
  */
 interface ProductRenderListInterface
 {
@@ -26,7 +26,7 @@ interface ProductRenderListInterface
      * @param int $storeId
      * @param string $currencyCode
      * @return \Magento\Catalog\Api\Data\ProductRenderSearchResultsInterface
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria, $storeId, $currencyCode);
 }
diff --git a/app/code/Magento/Catalog/Api/ProductTierPriceManagementInterface.php b/app/code/Magento/Catalog/Api/ProductTierPriceManagementInterface.php
index a6c3e975bfd79..dcb17a6f467f8 100644
--- a/app/code/Magento/Catalog/Api/ProductTierPriceManagementInterface.php
+++ b/app/code/Magento/Catalog/Api/ProductTierPriceManagementInterface.php
@@ -8,7 +8,7 @@
 
 /**
  * @api
- * @deprecated 101.1.0 use ScopedProductTierPriceManagementInterface instead
+ * @deprecated 102.0.0 use ScopedProductTierPriceManagementInterface instead
  * @since 100.0.2
  */
 interface ProductTierPriceManagementInterface
diff --git a/app/code/Magento/Catalog/Api/ScopedProductTierPriceManagementInterface.php b/app/code/Magento/Catalog/Api/ScopedProductTierPriceManagementInterface.php
index 1a3d05de5bcd1..2b005bc685b23 100644
--- a/app/code/Magento/Catalog/Api/ScopedProductTierPriceManagementInterface.php
+++ b/app/code/Magento/Catalog/Api/ScopedProductTierPriceManagementInterface.php
@@ -8,7 +8,7 @@
 
 /**
  * @api
- * @since 101.1.0
+ * @since 102.0.0
  */
 interface ScopedProductTierPriceManagementInterface
 {
@@ -20,7 +20,7 @@ interface ScopedProductTierPriceManagementInterface
      * @return boolean
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\CouldNotSaveException
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function add($sku, \Magento\Catalog\Api\Data\ProductTierPriceInterface $tierPrice);
 
@@ -32,7 +32,7 @@ public function add($sku, \Magento\Catalog\Api\Data\ProductTierPriceInterface $t
      * @return boolean
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\CouldNotSaveException
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function remove($sku, \Magento\Catalog\Api\Data\ProductTierPriceInterface $tierPrice);
 
@@ -43,7 +43,7 @@ public function remove($sku, \Magento\Catalog\Api\Data\ProductTierPriceInterface
      * @param string $customerGroupId 'all' can be used to specify 'ALL GROUPS'
      * @return \Magento\Catalog\Api\Data\ProductTierPriceInterface[]
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getList($sku, $customerGroupId);
 }
diff --git a/app/code/Magento/Catalog/Api/SpecialPriceInterface.php b/app/code/Magento/Catalog/Api/SpecialPriceInterface.php
index 86dca59004132..543eab2263cbe 100644
--- a/app/code/Magento/Catalog/Api/SpecialPriceInterface.php
+++ b/app/code/Magento/Catalog/Api/SpecialPriceInterface.php
@@ -9,7 +9,7 @@
 /**
  * Special prices resource model.
  * @api
- * @since 101.1.0
+ * @since 102.0.0
  */
 interface SpecialPriceInterface
 {
@@ -30,6 +30,7 @@ interface SpecialPriceInterface
      *      'price_to' => (string) Special price to date value in UTC.
      * ]
      * @since 101.1.0
+     * @since 102.0.0
      */
     public function get(array $skus);
 
@@ -47,7 +48,7 @@ public function get(array $skus);
      *      ];
      * @return bool
      * @throws \Magento\Framework\Exception\CouldNotSaveException Thrown if error occurred during price save.
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function update(array $prices);
 
@@ -65,7 +66,7 @@ public function update(array $prices);
      *      ];
      * @return bool
      * @throws \Magento\Framework\Exception\CouldNotDeleteException Thrown if error occurred during price delete.
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function delete(array $prices);
 }
diff --git a/app/code/Magento/Catalog/Api/SpecialPriceStorageInterface.php b/app/code/Magento/Catalog/Api/SpecialPriceStorageInterface.php
index 2442af103a4e9..6c2d89b51278c 100644
--- a/app/code/Magento/Catalog/Api/SpecialPriceStorageInterface.php
+++ b/app/code/Magento/Catalog/Api/SpecialPriceStorageInterface.php
@@ -9,7 +9,7 @@
 /**
  * Special price storage presents efficient price API and is used to retrieve, update or delete special prices.
  * @api
- * @since 101.1.0
+ * @since 102.0.0
  */
 interface SpecialPriceStorageInterface
 {
@@ -19,7 +19,7 @@ interface SpecialPriceStorageInterface
      * @param string[] $skus
      * @return \Magento\Catalog\Api\Data\SpecialPriceInterface[]
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function get(array $skus);
 
@@ -33,7 +33,7 @@ public function get(array $skus);
      * @param \Magento\Catalog\Api\Data\SpecialPriceInterface[] $prices
      * @return \Magento\Catalog\Api\Data\PriceUpdateResultInterface[]
      * @throws \Magento\Framework\Exception\CouldNotSaveException
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function update(array $prices);
 
@@ -47,7 +47,7 @@ public function update(array $prices);
      * @param \Magento\Catalog\Api\Data\SpecialPriceInterface[] $prices
      * @return \Magento\Catalog\Api\Data\PriceUpdateResultInterface[]
      * @throws \Magento\Framework\Exception\CouldNotDeleteException
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function delete(array $prices);
 }
diff --git a/app/code/Magento/Catalog/Api/TierPriceStorageInterface.php b/app/code/Magento/Catalog/Api/TierPriceStorageInterface.php
index 584daa9864588..b9102fcfc075c 100644
--- a/app/code/Magento/Catalog/Api/TierPriceStorageInterface.php
+++ b/app/code/Magento/Catalog/Api/TierPriceStorageInterface.php
@@ -9,7 +9,7 @@
 /**
  * Tier prices storage.
  * @api
- * @since 101.1.0
+ * @since 102.0.0
  */
 interface TierPriceStorageInterface
 {
@@ -19,7 +19,7 @@ interface TierPriceStorageInterface
      * @param string[] $skus
      * @return \Magento\Catalog\Api\Data\TierPriceInterface[]
      * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function get(array $skus);
 
@@ -33,7 +33,7 @@ public function get(array $skus);
      *
      * @param \Magento\Catalog\Api\Data\TierPriceInterface[] $prices
      * @return \Magento\Catalog\Api\Data\PriceUpdateResultInterface[]
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function update(array $prices);
 
@@ -47,7 +47,7 @@ public function update(array $prices);
      *
      * @param \Magento\Catalog\Api\Data\TierPriceInterface[] $prices
      * @return \Magento\Catalog\Api\Data\PriceUpdateResultInterface[]
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function replace(array $prices);
 
@@ -61,7 +61,7 @@ public function replace(array $prices);
      *
      * @param \Magento\Catalog\Api\Data\TierPriceInterface[] $prices
      * @return \Magento\Catalog\Api\Data\PriceUpdateResultInterface[]
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function delete(array $prices);
 }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
index f4080104b40cd..822580801c4e4 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
@@ -293,7 +293,7 @@ public function getDuplicateUrl()
     /**
      * Retrieve product header
      *
-     * @deprecated 101.1.0
+     * @deprecated 102.0.0
      * @return string
      */
     public function getHeader()
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Ajax/Serializer.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Ajax/Serializer.php
index 3d131a6e08810..2962e63313cdc 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Ajax/Serializer.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Ajax/Serializer.php
@@ -10,7 +10,7 @@
 /**
  * Class Serializer
  * @package Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Ajax
- * @deprecated 101.1.0
+ * @deprecated 102.0.0
  */
 class Serializer extends \Magento\Framework\View\Element\Template
 {
@@ -47,7 +47,7 @@ public function _construct()
 
     /**
      * @return string
-     * @deprecated 101.1.0
+     * @deprecated 102.0.0
      */
     public function getProductsJSON()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
index e5ce59c550af1..40e7136da5bf6 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
@@ -15,7 +15,7 @@
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
- * @deprecated Not used since cross-sell products grid moved to UI components.
+ * @deprecated 103.0.1 Not used since cross-sell products grid moved to UI components.
  * @see \Magento\Catalog\Ui\DataProvider\Product\Related\CrossSellDataProvider
  */
 class Crosssell extends Extended
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
index 23b927598e8e7..c73ffe5764dfb 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
@@ -13,7 +13,7 @@
  *
  * @api
  * @since 100.0.2
- * @deprecated Not used since related products grid moved to UI components.
+ * @deprecated 103.0.1 Not used since related products grid moved to UI components.
  * @see \Magento\Catalog\Ui\DataProvider\Product\Related\RelatedDataProvider
  */
 class Related extends Extended
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
index 41ad72ca39e53..d196f82f8b48d 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
@@ -10,7 +10,7 @@
  *
  * @api
  * @since 100.0.2
- * @deprecated Not used since upsell products grid moved to UI components.
+ * @deprecated 103.0.1 Not used since upsell products grid moved to UI components.
  * @see \Magento\Catalog\Ui\DataProvider\Product\Related\CrossSellDataProvider
  */
 class Upsell extends \Magento\Backend\Block\Widget\Grid\Extended
diff --git a/app/code/Magento/Catalog/Block/FrontendStorageManager.php b/app/code/Magento/Catalog/Block/FrontendStorageManager.php
index 0c826b95cbb49..112058baf4e05 100644
--- a/app/code/Magento/Catalog/Block/FrontendStorageManager.php
+++ b/app/code/Magento/Catalog/Block/FrontendStorageManager.php
@@ -15,7 +15,7 @@
  * Provide information to frontend storage manager
  *
  * @api
- * @since 101.1.0
+ * @since 102.0.0
  */
 class FrontendStorageManager extends \Magento\Framework\View\Element\Template
 {
@@ -51,7 +51,7 @@ public function __construct(
      * in json format
      *
      * @return string
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getConfigurationJson()
     {
diff --git a/app/code/Magento/Catalog/Block/Product/AbstractProduct.php b/app/code/Magento/Catalog/Block/Product/AbstractProduct.php
index c8da0f70f73b6..26af19fb85bcb 100644
--- a/app/code/Magento/Catalog/Block/Product/AbstractProduct.php
+++ b/app/code/Magento/Catalog/Block/Product/AbstractProduct.php
@@ -8,7 +8,7 @@
 /**
  * Class AbstractProduct
  * @api
- * @deprecated 101.1.0
+ * @deprecated 102.0.0
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
@@ -99,7 +99,7 @@ class AbstractProduct extends \Magento\Framework\View\Element\Template
 
     /**
      * @var ImageBuilder
-     * @since 101.1.0
+     * @since 102.0.0
      */
     protected $imageBuilder;
 
diff --git a/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php b/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php
index 76f5dbd1bea88..772bc92e378f4 100644
--- a/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php
+++ b/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php
@@ -213,6 +213,7 @@ public function getProductAttributeValue($product, $attribute)
      *
      * @param \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute
      * @return bool
+     * @since 102.0.6
      */
     public function hasAttributeValueForProducts($attribute)
     {
diff --git a/app/code/Magento/Catalog/Block/Product/Context.php b/app/code/Magento/Catalog/Block/Product/Context.php
index db18eb2bc8a7d..36a3214cab079 100644
--- a/app/code/Magento/Catalog/Block/Product/Context.php
+++ b/app/code/Magento/Catalog/Block/Product/Context.php
@@ -18,7 +18,7 @@
  * As Magento moves from inheritance-based APIs all such classes will be deprecated together with
  * the classes they were introduced for.
  *
- * @deprecated 101.1.0
+ * @deprecated 102.0.0
  * @SuppressWarnings(PHPMD)
  */
 class Context extends \Magento\Framework\View\Element\Template\Context
diff --git a/app/code/Magento/Catalog/Block/Product/Image.php b/app/code/Magento/Catalog/Block/Product/Image.php
index ccc37029bedf7..8fc7ba483d980 100644
--- a/app/code/Magento/Catalog/Block/Product/Image.php
+++ b/app/code/Magento/Catalog/Block/Product/Image.php
@@ -21,19 +21,19 @@
 class Image extends \Magento\Framework\View\Element\Template
 {
     /**
-     * @deprecated Property isn't used
+     * @deprecated 102.0.5 Property isn't used
      * @var \Magento\Catalog\Helper\Image
      */
     protected $imageHelper;
 
     /**
-     * @deprecated Property isn't used
+     * @deprecated 102.0.5 Property isn't used
      * @var \Magento\Catalog\Model\Product
      */
     protected $product;
 
     /**
-     * @deprecated Property isn't used
+     * @deprecated 102.0.5 Property isn't used
      * @var array
      */
     protected $attributes = [];
diff --git a/app/code/Magento/Catalog/Block/Product/ImageBuilder.php b/app/code/Magento/Catalog/Block/Product/ImageBuilder.php
index 06d4fb39109d8..702410a530ea4 100644
--- a/app/code/Magento/Catalog/Block/Product/ImageBuilder.php
+++ b/app/code/Magento/Catalog/Block/Product/ImageBuilder.php
@@ -11,7 +11,7 @@
 use Magento\Catalog\Model\Product;
 
 /**
- * @deprecated
+ * @deprecated 103.0.0
  * @see ImageFactory
  */
 class ImageBuilder
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
index 48725331b27da..5b5a7cd2d342a 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
@@ -79,7 +79,7 @@ class Toolbar extends \Magento\Framework\View\Element\Template
 
     /**
      * @var bool $_paramsMemorizeAllowed
-     * @deprecated
+     * @deprecated 103.0.1
      */
     protected $_paramsMemorizeAllowed = true;
 
@@ -99,7 +99,7 @@ class Toolbar extends \Magento\Framework\View\Element\Template
      * Catalog session
      *
      * @var \Magento\Catalog\Model\Session
-     * @deprecated
+     * @deprecated 103.0.1
      */
     protected $_catalogSession;
 
@@ -188,7 +188,7 @@ public function __construct(
      * Disable list state params memorizing
      *
      * @return $this
-     * @deprecated
+     * @deprecated 103.0.1
      */
     public function disableParamsMemorizing()
     {
@@ -202,7 +202,7 @@ public function disableParamsMemorizing()
      * @param string $param parameter name
      * @param mixed $value parameter value
      * @return $this
-     * @deprecated
+     * @deprecated 103.0.1
      */
     protected function _memorizeParam($param, $value)
     {
diff --git a/app/code/Magento/Catalog/Block/Product/View.php b/app/code/Magento/Catalog/Block/Product/View.php
index 437171bcb4bc6..a25501d9ef150 100644
--- a/app/code/Magento/Catalog/Block/Product/View.php
+++ b/app/code/Magento/Catalog/Block/Product/View.php
@@ -30,7 +30,7 @@ class View extends AbstractProduct implements \Magento\Framework\DataObject\Iden
 
     /**
      * @var \Magento\Framework\Pricing\PriceCurrencyInterface
-     * @deprecated 101.1.0
+     * @deprecated 102.0.0
      */
     protected $priceCurrency;
 
diff --git a/app/code/Magento/Catalog/Block/Product/View/AbstractView.php b/app/code/Magento/Catalog/Block/Product/View/AbstractView.php
index ec16bc1d2334f..9c569725d98de 100644
--- a/app/code/Magento/Catalog/Block/Product/View/AbstractView.php
+++ b/app/code/Magento/Catalog/Block/Product/View/AbstractView.php
@@ -9,7 +9,7 @@
  * Product view abstract block
  *
  * @api
- * @deprecated 101.1.0
+ * @deprecated 102.0.0
  * @since 100.0.2
  */
 abstract class AbstractView extends \Magento\Catalog\Block\Product\AbstractProduct
diff --git a/app/code/Magento/Catalog/Block/Product/View/Attributes.php b/app/code/Magento/Catalog/Block/Product/View/Attributes.php
index 5b9777cbfd1e7..9fd840b264085 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Attributes.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Attributes.php
@@ -110,6 +110,7 @@ public function getAdditionalData(array $excludeAttr = [])
      * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute
      * @param array $excludeAttr
      * @return bool
+     * @since 103.0.0
      */
     protected function isVisibleOnFrontend(
         \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute,
diff --git a/app/code/Magento/Catalog/Block/Product/View/Details.php b/app/code/Magento/Catalog/Block/Product/View/Details.php
index 38925e9ae3cd7..67303d177e71e 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Details.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Details.php
@@ -14,6 +14,7 @@
  * Holds a group of blocks to show as tabs.
  *
  * @api
+ * @since 103.0.1
  */
 class Details extends \Magento\Framework\View\Element\Template
 {
@@ -25,6 +26,7 @@ class Details extends \Magento\Framework\View\Element\Template
      * @throws \Magento\Framework\Exception\LocalizedException
      *
      * @return array
+     * @since 103.0.1
      */
     public function getGroupSortedChildNames(string $groupName, string $callback): array
     {
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
index 030b6e1d2204c..1dcbf60db15c3 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php
@@ -112,6 +112,7 @@ public function getOption()
      * Retrieve formatted price
      *
      * @return string
+     * @since 102.0.6
      */
     public function getFormattedPrice()
     {
@@ -131,7 +132,7 @@ public function getFormattedPrice()
      *
      * @return string
      *
-     * @deprecated
+     * @deprecated 102.0.6
      * @see getFormattedPrice()
      */
     public function getFormatedPrice()
diff --git a/app/code/Magento/Catalog/Block/Ui/ProductViewCounter.php b/app/code/Magento/Catalog/Block/Ui/ProductViewCounter.php
index 6d96ba8e1880e..c5c08a0552f42 100644
--- a/app/code/Magento/Catalog/Block/Ui/ProductViewCounter.php
+++ b/app/code/Magento/Catalog/Block/Ui/ProductViewCounter.php
@@ -26,7 +26,7 @@
  * by customer on frontend and data to synchronize this tracks with backend
  *
  * @api
- * @since 101.1.0
+ * @since 102.0.0
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ProductViewCounter extends Template
@@ -122,7 +122,7 @@ public function __construct(
      * requests and will be flushed with full page cache
      *
      * @return string {JSON encoded data}
-     * @since 101.1.0
+     * @since 102.0.0
      * @throws \Magento\Framework\Exception\LocalizedException
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
index 2ae97223d6359..d948daed1c7d9 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
@@ -400,7 +400,7 @@ private function overwriteValue($optionId, $option, $overwriteOptions)
      * Get link resolver instance
      *
      * @return LinkResolver
-     * @deprecated 101.0.0
+     * @deprecated 102.0.0
      */
     private function getLinkResolver()
     {
diff --git a/app/code/Magento/Catalog/Helper/Data.php b/app/code/Magento/Catalog/Helper/Data.php
index 3e96763632830..3a55164aa33ef 100644
--- a/app/code/Magento/Catalog/Helper/Data.php
+++ b/app/code/Magento/Catalog/Helper/Data.php
@@ -451,7 +451,7 @@ public function isUsingStaticUrlsAllowed()
      * Check if the parsing of URL directives is allowed for the catalog
      *
      * @return bool
-     * @deprecated
+     * @deprecated 103.0.0
      * @see \Magento\Catalog\Helper\Output::isDirectivesExists
      */
     public function isUrlDirectivesParsingAllowed()
diff --git a/app/code/Magento/Catalog/Helper/Image.php b/app/code/Magento/Catalog/Helper/Image.php
index 110b798df9df9..a06266037d05c 100644
--- a/app/code/Magento/Catalog/Helper/Image.php
+++ b/app/code/Magento/Catalog/Helper/Image.php
@@ -297,7 +297,7 @@ public function resize($width, $height = null)
      *
      * @param int $quality
      * @return $this
-     * @deprecated
+     * @deprecated 103.0.1
      */
     public function setQuality($quality)
     {
@@ -446,7 +446,7 @@ public function placeholder($fileName)
      * @param null|string $placeholder
      * @return string
      *
-     * @deprecated 101.1.0 Returns only default placeholder.
+     * @deprecated 102.0.0 Returns only default placeholder.
      * Does not take into account custom placeholders set in Configuration.
      */
     public function getPlaceholder($placeholder = null)
diff --git a/app/code/Magento/Catalog/Model/AbstractModel.php b/app/code/Magento/Catalog/Model/AbstractModel.php
index 78a49cd1e8b14..851055c1bf810 100644
--- a/app/code/Magento/Catalog/Model/AbstractModel.php
+++ b/app/code/Magento/Catalog/Model/AbstractModel.php
@@ -223,7 +223,7 @@ public function unsetData($key = null)
      * Get collection instance
      *
      * @return \Magento\Catalog\Model\ResourceModel\Collection\AbstractCollection
-     * @deprecated 101.1.0 because collections should be used directly via factory
+     * @deprecated 102.0.0 because collections should be used directly via factory
      */
     public function getResourceCollection()
     {
diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php b/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
index b5aa5e2035100..c3c331ccf7ef6 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
@@ -22,7 +22,7 @@ class Customlayoutupdate extends AbstractBackend
 {
     /**
      * @var ValidatorFactory
-     * @deprecated Is not used anymore.
+     * @deprecated 103.0.4 Is not used anymore.
      */
     protected $_layoutUpdateValidatorFactory;
 
@@ -117,6 +117,7 @@ private function putValue(AbstractModel $object, ?string $value): void
      *
      * @param AbstractModel $object
      * @throws LocalizedException
+     * @since 103.0.4
      */
     public function beforeSave($object)
     {
diff --git a/app/code/Magento/Catalog/Model/Category.php b/app/code/Magento/Catalog/Model/Category.php
index 330debdc32469..12724b65a6ebf 100644
--- a/app/code/Magento/Catalog/Model/Category.php
+++ b/app/code/Magento/Catalog/Model/Category.php
@@ -98,6 +98,7 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
 
     /**
      * @var ResourceModel\Category
+     * @since 102.0.6
      */
     protected $_resource;
 
@@ -105,7 +106,7 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
      * URL rewrite model
      *
      * @var \Magento\UrlRewrite\Model\UrlRewrite
-     * @deprecated 101.1.0
+     * @deprecated 102.0.0
      */
     protected $_urlRewrite;
 
@@ -135,7 +136,7 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
     /**
      * Attributes are that part of interface
      *
-     * @deprecated
+     * @deprecated 103.0.0
      * @see CategoryInterface::ATTRIBUTES
      * @var array
      */
@@ -319,8 +320,9 @@ protected function getCustomAttributesCodes()
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Magento\Catalog\Model\ResourceModel\Category
-     * @deprecated because resource models should be used directly
+     * @deprecated 102.0.6 because resource models should be used directly
      * phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod
+     * @since 102.0.6
      */
     protected function _getResource()
     {
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php
index 20ea899a3d0d7..486263f3de5a6 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php
@@ -19,7 +19,7 @@ class Layout extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
 
     /**
      * @inheritdoc
-     * @deprecated since the cache is now handled by \Magento\Theme\Model\PageLayout\Config\Builder::$configFiles
+     * @deprecated 103.0.1 since the cache is now handled by \Magento\Theme\Model\PageLayout\Config\Builder::$configFiles
      */
     protected $_options = null;
 
diff --git a/app/code/Magento/Catalog/Model/Category/DataProvider.php b/app/code/Magento/Catalog/Model/Category/DataProvider.php
index d8c79c485e3e5..0a562a9a80c89 100644
--- a/app/code/Magento/Catalog/Model/Category/DataProvider.php
+++ b/app/code/Magento/Catalog/Model/Category/DataProvider.php
@@ -246,7 +246,7 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getMeta()
     {
@@ -495,7 +495,7 @@ protected function addUseConfigSettings($categoryData)
      * @param Category $category
      * @param array $categoryData
      * @return array
-     * @deprecated 101.1.0
+     * @deprecated 102.0.0
      * @since 101.0.0
      */
     protected function addUseDefaultSettings($category, $categoryData)
diff --git a/app/code/Magento/Catalog/Model/CategoryList.php b/app/code/Magento/Catalog/Model/CategoryList.php
index cc8920203526f..e7c755b379b91 100644
--- a/app/code/Magento/Catalog/Model/CategoryList.php
+++ b/app/code/Magento/Catalog/Model/CategoryList.php
@@ -97,7 +97,7 @@ public function getList(SearchCriteriaInterface $searchCriteria)
     /**
      * Retrieve collection processor
      *
-     * @deprecated 101.1.0
+     * @deprecated 102.0.0
      * @return CollectionProcessorInterface
      */
     private function getCollectionProcessor()
diff --git a/app/code/Magento/Catalog/Model/FrontendStorageConfigurationInterface.php b/app/code/Magento/Catalog/Model/FrontendStorageConfigurationInterface.php
index dac9e03e0b753..c61511d1ed49f 100644
--- a/app/code/Magento/Catalog/Model/FrontendStorageConfigurationInterface.php
+++ b/app/code/Magento/Catalog/Model/FrontendStorageConfigurationInterface.php
@@ -9,7 +9,7 @@
 /**
  * @api
  * Storage, which provide information for frontend storages, as product-storage, ids-storage
- * @since 101.1.0
+ * @since 102.0.0
  */
 interface FrontendStorageConfigurationInterface
 {
@@ -23,7 +23,7 @@ interface FrontendStorageConfigurationInterface
      * Prepare dynamic data which will be used in Storage Configuration (e.g. data from App/Config)
      *
      * @return array
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function get();
 }
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
index 178f4172ce6fa..6b6ad2bfc726a 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
@@ -109,6 +109,7 @@ abstract class AbstractAction
 
     /**
      * @var TableMaintainer
+     * @since 102.0.5
      */
     protected $tableMaintainer;
 
@@ -195,7 +196,7 @@ protected function getTable($table)
      * The name is switched between 'catalog_category_product_index' and 'catalog_category_product_index_replica'
      *
      * @return string
-     * @deprecated
+     * @deprecated 102.0.5
      */
     protected function getMainTable()
     {
@@ -206,7 +207,7 @@ protected function getMainTable()
      * Return temporary index table name
      *
      * @return string
-     * @deprecated
+     * @deprecated 102.0.5
      */
     protected function getMainTmpTable()
     {
@@ -220,6 +221,7 @@ protected function getMainTmpTable()
      *
      * @param int $storeId
      * @return string
+     * @since 102.0.5
      */
     protected function getIndexTable($storeId)
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
index c0722901e3b1c..0897ae0d74c0b 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
@@ -368,7 +368,7 @@ protected function _fillTemporaryTable(
      * Get Metadata Pool
      *
      * @return \Magento\Framework\EntityManager\MetadataPool
-     * @deprecated 101.1.0
+     * @deprecated 102.0.0
      */
     private function getMetadataPool()
     {
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 e9a907f0b5097..4846d32826cb9 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
@@ -154,7 +154,7 @@ abstract public function execute($ids);
      * @param array $processIds
      * @return \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @deprecated Used only for backward compatibility for indexer, which not support indexation by dimensions
+     * @deprecated 102.0.6 Used only for backward compatibility for indexer, which not support indexation by dimensions
      */
     protected function _syncData(array $processIds = [])
     {
@@ -422,7 +422,7 @@ private function deleteIndexData(array $entityIds)
      * @param null|array $parentIds
      * @param array $excludeIds
      * @return \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
-     * @deprecated Used only for backward compatibility for do not broke custom indexer implementation
+     * @deprecated 102.0.6 Used only for backward compatibility for do not broke custom indexer implementation
      * which do not work by dimensions.
      * For indexers, which support dimensions all composite products read data directly from main price indexer table
      * or replica table for partial or full reindex correspondingly.
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php
index b30c85cfc52f0..754022b573d62 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php
@@ -488,7 +488,7 @@ private function moveDataFromReplicaTableToReplicaTables(array $dimensions): voi
     /**
      * Retrieves the index table that should be used
      *
-     * @deprecated
+     * @deprecated 102.0.6
      */
     protected function getIndexTargetTable(): string
     {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/UpdateIndexInterface.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/UpdateIndexInterface.php
index 3d1809997bd61..091131508ef66 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/UpdateIndexInterface.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/UpdateIndexInterface.php
@@ -11,7 +11,7 @@
  * Defines strategy for updating price index
  *
  * @api
- * @since 101.1.0
+ * @since 102.0.0
  */
 interface UpdateIndexInterface
 {
@@ -21,7 +21,7 @@ interface UpdateIndexInterface
      * @param GroupInterface $group
      * @param bool $isGroupNew
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function update(GroupInterface $group, $isGroupNew);
 }
diff --git a/app/code/Magento/Catalog/Model/Product.php b/app/code/Magento/Catalog/Model/Product.php
index bc8d274fb6e63..39a9ce37faef8 100644
--- a/app/code/Magento/Catalog/Model/Product.php
+++ b/app/code/Magento/Catalog/Model/Product.php
@@ -122,6 +122,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
 
     /**
      * @var ResourceModel\Product
+     * @since 102.0.6
      */
     protected $_resource;
 
@@ -278,7 +279,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
 
     /**
      * @var \Magento\Catalog\Api\ProductAttributeRepositoryInterface
-     * @deprecated Not used anymore due to performance issue (loaded all product attributes)
+     * @deprecated 102.0.6 Not used anymore due to performance issue (loaded all product attributes)
      */
     protected $metadataService;
 
@@ -315,7 +316,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
     /**
      * List of attributes in ProductInterface
      *
-     * @deprecated
+     * @deprecated 103.0.0
      * @see ProductInterface::ATTRIBUTES
      * @var array
      */
@@ -493,7 +494,8 @@ protected function _construct()
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Magento\Catalog\Model\ResourceModel\Product
-     * @deprecated because resource models should be used directly
+     * @deprecated 102.0.6 because resource models should be used directly
+     * @since 102.0.6
      */
     protected function _getResource()
     {
@@ -640,7 +642,7 @@ public function getUpdatedAt()
      *
      * @param bool $calculate
      * @return void
-     * @deprecated
+     * @deprecated 102.0.4
      */
     public function setPriceCalculation($calculate = true)
     {
@@ -1168,6 +1170,7 @@ public function getTierPrice($qty = null)
      * Get formatted by currency product price
      *
      * @return  array|double
+     * @since 102.0.6
      */
     public function getFormattedPrice()
     {
@@ -1179,7 +1182,7 @@ public function getFormattedPrice()
      *
      * @return array|double
      *
-     * @deprecated
+     * @deprecated 102.0.6
      * @see getFormattedPrice()
      */
     public function getFormatedPrice()
@@ -2152,7 +2155,7 @@ public function reset()
     /**
      * Get cache tags associated with object id
      *
-     * @deprecated
+     * @deprecated 102.0.5
      * @see \Magento\Catalog\Model\Product::getIdentities
      * @return string[]
      */
@@ -2726,11 +2729,11 @@ public function setAssociatedProductIds(array $productIds)
      *
      * @return array|null
      *
-     * @deprecated 101.1.0 as Product model shouldn't be responsible for stock status
+     * @deprecated 102.0.0 as Product model shouldn't be responsible for stock status
      * @see StockItemInterface when you want to change the stock data
      * @see StockStatusInterface when you want to read the stock data for representation layer (storefront)
      * @see StockItemRepositoryInterface::save as extension point for customization of saving process
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getQuantityAndStockStatus()
     {
@@ -2743,11 +2746,11 @@ public function getQuantityAndStockStatus()
      * @param array $quantityAndStockStatusData
      * @return $this
      *
-     * @deprecated 101.1.0 as Product model shouldn't be responsible for stock status
+     * @deprecated 102.0.0 as Product model shouldn't be responsible for stock status
      * @see StockItemInterface when you want to change the stock data
      * @see StockStatusInterface when you want to read the stock data for representation layer (storefront)
      * @see StockItemRepositoryInterface::save as extension point for customization of saving process
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setQuantityAndStockStatus($quantityAndStockStatusData)
     {
@@ -2760,11 +2763,11 @@ public function setQuantityAndStockStatus($quantityAndStockStatusData)
      *
      * @return array|null
      *
-     * @deprecated 101.1.0 as Product model shouldn't be responsible for stock status
+     * @deprecated 102.0.0 as Product model shouldn't be responsible for stock status
      * @see StockItemInterface when you want to change the stock data
      * @see StockStatusInterface when you want to read the stock data for representation layer (storefront)
      * @see StockItemRepositoryInterface::save as extension point for customization of saving process
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getStockData()
     {
@@ -2777,11 +2780,11 @@ public function getStockData()
      * @param array $stockData
      * @return $this
      *
-     * @deprecated 101.1.0 as Product model shouldn't be responsible for stock status
+     * @deprecated 102.0.0 as Product model shouldn't be responsible for stock status
      * @see StockItemInterface when you want to change the stock data
      * @see StockStatusInterface when you want to read the stock data for representation layer (storefront)
      * @see StockItemRepositoryInterface::save as extension point for customization of saving process
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setStockData($stockData)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Stock.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Stock.php
index 994ff98dee217..713a0a35abec7 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Stock.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Stock.php
@@ -10,7 +10,7 @@
 /**
  * Quantity and Stock Status attribute processing
  *
- * @deprecated 101.1.0 as this attribute should be removed
+ * @deprecated 102.0.0 as this attribute should be removed
  * @see StockItemInterface when you want to change the stock data
  * @see StockStatusInterface when you want to read the stock data for representation layer (storefront)
  * @see StockItemRepositoryInterface::save as extension point for customization of saving process
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php
index bc362430089c4..c0a13aa8b934a 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php
@@ -82,7 +82,7 @@ public function getAllOptions()
      * Get serializer
      *
      * @return \Magento\Framework\Serialize\SerializerInterface
-     * @deprecated 101.1.0
+     * @deprecated 102.0.0
      */
     private function getSerializer()
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php
index dbc7535dccfa9..333e8021d30b5 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php
@@ -19,7 +19,7 @@ class Layout extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
 
     /**
      * @inheritdoc
-     * @deprecated since the cache is now handled by \Magento\Theme\Model\PageLayout\Config\Builder::$configFiles
+     * @deprecated 103.0.1 since the cache is now handled by \Magento\Theme\Model\PageLayout\Config\Builder::$configFiles
      */
     protected $_options = null;
 
diff --git a/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemResolverInterface.php b/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemResolverInterface.php
index 35c0a7835cb6c..b340e5dea5eb8 100644
--- a/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemResolverInterface.php
+++ b/app/code/Magento/Catalog/Model/Product/Configuration/Item/ItemResolverInterface.php
@@ -13,6 +13,7 @@
  * Resolves the product from a configured item.
  *
  * @api
+ * @since 102.0.7
  */
 interface ItemResolverInterface
 {
@@ -21,6 +22,7 @@ interface ItemResolverInterface
      *
      * @param ItemInterface $item
      * @return ProductInterface
+     * @since 102.0.7
      */
     public function getFinalProduct(ItemInterface $item) : ProductInterface;
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Image.php b/app/code/Magento/Catalog/Model/Product/Image.php
index a0be36c5a327c..3c60d81e9a4d8 100644
--- a/app/code/Magento/Catalog/Model/Product/Image.php
+++ b/app/code/Magento/Catalog/Model/Product/Image.php
@@ -45,7 +45,7 @@ class Image extends \Magento\Framework\Model\AbstractModel
      * Default quality value (for JPEG images only).
      *
      * @var int
-     * @deprecated use config setting with path self::XML_PATH_JPEG_QUALITY
+     * @deprecated 103.0.1 use config setting with path self::XML_PATH_JPEG_QUALITY
      */
     protected $_quality = null;
 
@@ -305,7 +305,7 @@ public function getHeight()
      *
      * @param int $quality
      * @return $this
-     * @deprecated use config setting with path self::XML_PATH_JPEG_QUALITY
+     * @deprecated 103.0.1 use config setting with path self::XML_PATH_JPEG_QUALITY
      */
     public function setQuality($quality)
     {
@@ -454,7 +454,7 @@ public function getBaseFile()
     /**
      * Get new file
      *
-     * @deprecated 101.1.0
+     * @deprecated 102.0.0
      * @return bool|string
      */
     public function getNewFile()
diff --git a/app/code/Magento/Catalog/Model/Product/Link.php b/app/code/Magento/Catalog/Model/Product/Link.php
index 5c07d3d32b257..f2b07bad8891c 100644
--- a/app/code/Magento/Catalog/Model/Product/Link.php
+++ b/app/code/Magento/Catalog/Model/Product/Link.php
@@ -58,7 +58,7 @@ class Link extends \Magento\Framework\Model\AbstractModel
 
     /**
      * @var \Magento\CatalogInventory\Helper\Stock
-     * @deprecated 101.0.1
+     * @deprecated 101.0.0
      */
     protected $stockHelper;
 
diff --git a/app/code/Magento/Catalog/Model/Product/Option.php b/app/code/Magento/Catalog/Model/Product/Option.php
index 3a0920fb1c530..e83982b8ce672 100644
--- a/app/code/Magento/Catalog/Model/Product/Option.php
+++ b/app/code/Magento/Catalog/Model/Product/Option.php
@@ -196,7 +196,7 @@ public function __construct(
      * Get resource instance
      *
      * @return \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     * @deprecated 101.1.0 because resource models should be used directly
+     * @deprecated 102.0.0 because resource models should be used directly
      */
     protected function _getResource()
     {
@@ -246,7 +246,7 @@ public function getValueById($valueId)
      *
      * @param string $type
      * @return bool
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function hasValues($type = null)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
index 7f9181e9181b6..16fdd4cdeeb1c 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
@@ -401,7 +401,7 @@ public function getProductOptions()
      * @param boolean $isPercent Price type - percent or fixed
      * @param float $basePrice For percent price type
      * @return float
-     * @deprecated 102.0.4 typo in method name
+     * @deprecated 102.0.6 typo in method name
      * @see _getChargeableOptionPrice
      */
     protected function _getChargableOptionPrice($price, $isPercent, $basePrice)
@@ -416,6 +416,7 @@ protected function _getChargableOptionPrice($price, $isPercent, $basePrice)
      * @param boolean $isPercent Price type - percent or fixed
      * @param float $basePrice For percent price type
      * @return float
+     * @since 102.0.6
      */
     protected function _getChargeableOptionPrice($price, $isPercent, $basePrice)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File.php
index 9f1eae207e116..f02c607c6296c 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/File.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/File.php
@@ -411,7 +411,7 @@ public function getPrintableOptionValue($optionValue)
      * @param string $optionValue Prepared for cart option value
      * @return string
      *
-     * @deprecated 101.1.0
+     * @deprecated 102.0.0
      */
     public function getEditableOptionValue($optionValue)
     {
@@ -435,7 +435,7 @@ public function getEditableOptionValue($optionValue)
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      *
-     * @deprecated 101.1.0
+     * @deprecated 102.0.0
      */
     public function parseOptionValue($optionValue, $productOptionValues)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Price/Validation/Result.php b/app/code/Magento/Catalog/Model/Product/Price/Validation/Result.php
index 3d4d9f607da48..6c5451e3ecfe0 100644
--- a/app/code/Magento/Catalog/Model/Product/Price/Validation/Result.php
+++ b/app/code/Magento/Catalog/Model/Product/Price/Validation/Result.php
@@ -10,7 +10,7 @@
  * Validation Result is used to aggregate errors that occurred during price update.
  *
  * @api
- * @since 101.1.0
+ * @since 102.0.0
  */
 class Result
 {
@@ -43,7 +43,7 @@ public function __construct(
      * @param array $parameters (optional). Placeholder values in ['placeholder key' => 'placeholder value'] format
      * for failure reason message.
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function addFailedItem($id, $message, array $parameters = [])
     {
@@ -57,7 +57,7 @@ public function addFailedItem($id, $message, array $parameters = [])
      * Get ids of rows, that contained errors during price update.
      *
      * @return int[]
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getFailedRowIds()
     {
@@ -68,7 +68,7 @@ public function getFailedRowIds()
      * Get price update errors, that occurred during price update.
      *
      * @return \Magento\Catalog\Api\Data\PriceUpdateResultInterface[]
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getFailedItems()
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
index e6804d9246faa..2ceb6df9779b2 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
@@ -167,7 +167,7 @@ abstract public function deleteTypeSpecificData(\Magento\Catalog\Model\Product $
      * Serializer interface instance.
      *
      * @var \Magento\Framework\Serialize\Serializer\Json
-     * @since 101.1.0
+     * @since 102.0.0
      */
     protected $serializer;
 
@@ -1106,7 +1106,7 @@ public function getAssociatedProducts($product)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return bool
-     * @since 101.1.0
+     * @since 101.0.11
      */
     public function isPossibleBuyFromList($product)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Type/FrontSpecialPrice.php b/app/code/Magento/Catalog/Model/Product/Type/FrontSpecialPrice.php
index dabfdb74f0118..a692ec5d463d0 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/FrontSpecialPrice.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/FrontSpecialPrice.php
@@ -18,7 +18,7 @@
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
- * @deprecated
+ * @deprecated 103.0.2
  * @see \Magento\Catalog\Model\Product\Type\Price
  */
 class FrontSpecialPrice extends Price
@@ -70,7 +70,7 @@ public function __construct(
     /**
      * @inheritdoc
      *
-     * @deprecated
+     * @deprecated 103.0.2
      */
     protected function _applySpecialPrice($product, $finalPrice)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Type/Price.php b/app/code/Magento/Catalog/Model/Product/Type/Price.php
index e702965270639..74a6c7f634f81 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/Price.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/Price.php
@@ -484,6 +484,7 @@ public function getTierPriceCount($product)
      * @param   Product $product
      *
      * @return  array|float
+     * @since 102.0.6
      */
     public function getFormattedTierPrice($qty, $product)
     {
@@ -509,7 +510,7 @@ public function getFormattedTierPrice($qty, $product)
      *
      * @return array|float
      *
-     * @deprecated
+     * @deprecated 102.0.6
      * @see getFormattedTierPrice()
      */
     public function getFormatedTierPrice($qty, $product)
@@ -522,6 +523,7 @@ public function getFormatedTierPrice($qty, $product)
      *
      * @param   Product $product
      * @return  array|float
+     * @since 102.0.6
      */
     public function getFormattedPrice($product)
     {
@@ -534,7 +536,7 @@ public function getFormattedPrice($product)
      * @param Product $product
      * @return array || float
      *
-     * @deprecated
+     * @deprecated 102.0.6
      * @see getFormattedPrice()
      */
     public function getFormatedPrice($product)
diff --git a/app/code/Magento/Catalog/Model/ProductIdLocatorInterface.php b/app/code/Magento/Catalog/Model/ProductIdLocatorInterface.php
index 91570b58b7328..521d53629d99c 100644
--- a/app/code/Magento/Catalog/Model/ProductIdLocatorInterface.php
+++ b/app/code/Magento/Catalog/Model/ProductIdLocatorInterface.php
@@ -8,7 +8,7 @@
 /**
  * Product ID locator provides all product IDs by SKU.
  * @api
- * @since 101.1.0
+ * @since 102.0.0
  */
 interface ProductIdLocatorInterface
 {
@@ -17,7 +17,7 @@ interface ProductIdLocatorInterface
      *
      * @param array $skus
      * @return array
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function retrieveProductIdsBySkus(array $skus);
 }
diff --git a/app/code/Magento/Catalog/Model/ProductLink/Repository.php b/app/code/Magento/Catalog/Model/ProductLink/Repository.php
index 960044efbc2ec..7a0b224a6153a 100644
--- a/app/code/Magento/Catalog/Model/ProductLink/Repository.php
+++ b/app/code/Magento/Catalog/Model/ProductLink/Repository.php
@@ -54,14 +54,14 @@ class Repository implements \Magento\Catalog\Api\ProductLinkRepositoryInterface
 
     /**
      * @var CollectionProvider
-     * @deprecated Not used anymore.
+     * @deprecated 103.0.4 Not used anymore.
      * @see query
      */
     protected $entityCollectionProvider;
 
     /**
      * @var LinksInitializer
-     * @deprecated Not used.
+     * @deprecated 103.0.4 Not used.
      */
     protected $linkInitializer;
 
@@ -77,14 +77,14 @@ class Repository implements \Magento\Catalog\Api\ProductLinkRepositoryInterface
 
     /**
      * @var ProductLinkInterfaceFactory
-     * @deprecated Not used anymore, search delegated.
+     * @deprecated 103.0.4 Not used anymore, search delegated.
      * @see getList()
      */
     protected $productLinkFactory;
 
     /**
      * @var ProductLinkExtensionFactory
-     * @deprecated Not used anymore, search delegated.
+     * @deprecated 103.0.4 Not used anymore, search delegated.
      * @see getList()
      */
     protected $productLinkExtensionFactory;
diff --git a/app/code/Magento/Catalog/Model/ProductRepository.php b/app/code/Magento/Catalog/Model/ProductRepository.php
index d656a0a9ac5b4..59a92656abf84 100644
--- a/app/code/Magento/Catalog/Model/ProductRepository.php
+++ b/app/code/Magento/Catalog/Model/ProductRepository.php
@@ -122,14 +122,14 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
     protected $fileSystem;
 
     /**
-     * @deprecated
+     * @deprecated 103.0.2
      *
      * @var ImageContentInterfaceFactory
      */
     protected $contentFactory;
 
     /**
-     * @deprecated
+     * @deprecated 103.0.2
      *
      * @var ImageProcessorInterface
      */
@@ -141,7 +141,7 @@ class ProductRepository implements \Magento\Catalog\Api\ProductRepositoryInterfa
     protected $extensionAttributesJoinProcessor;
 
     /**
-     * @deprecated
+     * @deprecated 103.0.2
      *
      * @var \Magento\Catalog\Model\Product\Gallery\Processor
      */
@@ -404,7 +404,7 @@ private function assignProductToWebsites(\Magento\Catalog\Model\Product $product
     /**
      * Process new gallery media entry.
      *
-     * @deprecated
+     * @deprecated 103.0.2
      * @see MediaGalleryProcessor::processNewMediaGalleryEntry()
      *
      * @param ProductInterface $product
@@ -669,7 +669,7 @@ private function addExtensionAttributes(Collection $collection) : Collection
     /**
      * Helper function that adds a FilterGroup to the collection.
      *
-     * @deprecated 101.1.0
+     * @deprecated 102.0.0
      * @param \Magento\Framework\Api\Search\FilterGroup $filterGroup
      * @param Collection $collection
      * @return void
@@ -728,7 +728,7 @@ private function getMediaGalleryProcessor()
     /**
      * Retrieve collection processor
      *
-     * @deprecated 101.1.0
+     * @deprecated 102.0.0
      * @return CollectionProcessorInterface
      */
     private function getCollectionProcessor()
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php
index 4711828d8f78d..351e3314c9fb4 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php
@@ -456,6 +456,7 @@ public function addRootLevelFilter()
      * Add navigation max depth filter
      *
      * @return $this
+     * @since 103.0.0
      */
     public function addNavigationMaxDepthFilter()
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php
index 05950531e2178..cd1b8c8924552 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php
@@ -69,7 +69,7 @@ class Flat extends \Magento\Indexer\Model\ResourceModel\AbstractResource
      * Category collection factory
      *
      * @var \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory
-     * @deprecated 100.0.12
+     * @deprecated 100.0.2
      */
     protected $_categoryCollectionFactory;
 
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php b/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
index e1c90017327cd..d1769ded93d29 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
@@ -258,6 +258,7 @@ public function afterSave()
      * Is attribute enabled for flat indexing
      *
      * @return bool
+     * @since 103.0.0
      */
     public function isEnabledInFlat()
     {
@@ -874,7 +875,7 @@ public function __wakeup()
 
     /**
      * @inheritdoc
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setIsUsedInGrid($isUsedInGrid)
     {
@@ -884,7 +885,7 @@ public function setIsUsedInGrid($isUsedInGrid)
 
     /**
      * @inheritdoc
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setIsVisibleInGrid($isVisibleInGrid)
     {
@@ -894,7 +895,7 @@ public function setIsVisibleInGrid($isVisibleInGrid)
 
     /**
      * @inheritdoc
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function setIsFilterableInGrid($isFilterableInGrid)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Price.php b/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Price.php
index 585da2af529a4..ab9f0e76854a6 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Price.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Layer/Filter/Price.php
@@ -410,6 +410,7 @@ protected function _construct()
     /**
      * {@inheritdoc}
      * @return string
+     * @since 102.0.6
      */
     public function getMainTable()
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product.php b/app/code/Magento/Catalog/Model/ResourceModel/Product.php
index c5587d3b25665..c3f1ee28b19fe 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product.php
@@ -180,7 +180,7 @@ public function getProductWebsiteTable()
     /**
      * Product Category table name getter
      *
-     * @deprecated 101.1.0
+     * @deprecated 102.0.0
      * @return string
      */
     public function getProductCategoryTable()
@@ -204,7 +204,7 @@ protected function _getDefaultAttributes()
     /**
      * Retrieve product website identifiers
      *
-     * @deprecated 101.1.0
+     * @deprecated 102.0.0
      * @param \Magento\Catalog\Model\Product|int $product
      * @return array
      */
@@ -379,7 +379,7 @@ public function delete($object)
     /**
      * Save product website relations
      *
-     * @deprecated 101.1.0
+     * @deprecated 102.0.0
      * @param \Magento\Catalog\Model\Product $product
      * @return $this
      */
@@ -408,7 +408,7 @@ protected function _saveWebsiteIds($product)
      * @param DataObject $object
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @deprecated 101.1.0
+     * @deprecated 102.0.0
      */
     protected function _saveCategories(DataObject $object)
     {
@@ -776,7 +776,7 @@ private function getEntityManager()
     /**
      * Retrieve ProductWebsiteLink instance.
      *
-     * @deprecated 101.1.0
+     * @deprecated 102.0.0
      * @return ProductWebsiteLink
      */
     private function getProductWebsiteLink()
@@ -787,7 +787,7 @@ private function getProductWebsiteLink()
     /**
      * Retrieve CategoryLink instance.
      *
-     * @deprecated 101.1.0
+     * @deprecated 102.0.0
      * @return Product\CategoryLink
      */
     private function getProductCategoryLink()
@@ -805,7 +805,7 @@ private function getProductCategoryLink()
      * Store id is required to correctly identify attribute value we are working with.
      *
      * @inheritdoc
-     * @since 101.1.0
+     * @since 102.0.0
      */
     protected function getAttributeRow($entity, $object, $attribute)
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
index 6e1efbc9db003..0cc3090100e8b 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
@@ -731,6 +731,7 @@ protected function _afterLoad()
      * Add Store ID to products from collection.
      *
      * @return $this
+     * @since 102.0.8
      */
     protected function prepareStoreId()
     {
@@ -2220,7 +2221,7 @@ public function addTierPriceData()
      *
      * @param int $customerGroupId
      * @return $this
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function addTierPriceDataByGroupId($customerGroupId)
     {
@@ -2400,7 +2401,7 @@ function ($item) use ($linkField) {
      * Get product entity metadata
      *
      * @return \Magento\Framework\EntityManager\EntityMetadataInterface
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function getProductEntityMetadata()
     {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductBatchSizeAdjusterInterface.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductBatchSizeAdjusterInterface.php
index c0e8858b4cfa8..2d282c5bf9741 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductBatchSizeAdjusterInterface.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductBatchSizeAdjusterInterface.php
@@ -9,7 +9,7 @@
 /**
  * Correct batch size according to number of composite related items.
  * @api
- * @since 101.1.0
+ * @since 102.0.0
  */
 interface CompositeProductBatchSizeAdjusterInterface
 {
@@ -18,7 +18,7 @@ interface CompositeProductBatchSizeAdjusterInterface
      *
      * @param int $batchSize
      * @return int
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function adjust($batchSize);
 }
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 b64cca4ff1b26..747b06266cce0 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
@@ -18,7 +18,7 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
- * @deprecated Not used anymore for price indexation. Class left for backward compatibility
+ * @deprecated 102.0.6 Not used anymore for price indexation. Class left for backward compatibility
  * @see DimensionalIndexerInterface
  */
 class DefaultPrice extends AbstractIndexer implements PriceInterface
@@ -240,7 +240,7 @@ protected function _getDefaultFinalPriceTable()
      * Prepare final price temporary index table
      *
      * @return $this
-     * @deprecated
+     * @deprecated 102.0.5
      * @see prepareFinalPriceTable()
      */
     protected function _prepareDefaultFinalPriceTable()
diff --git a/app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php b/app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php
index 0b49ef8796ce6..d398c9c14787f 100644
--- a/app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php
+++ b/app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php
@@ -98,7 +98,7 @@ public function __construct(
      * Get instance of ScopePool
      *
      * @return \Magento\Framework\App\Config
-     * @deprecated 101.1.0
+     * @deprecated 102.0.0
      */
     private function getAppConfig()
     {
@@ -140,7 +140,7 @@ public function afterSave()
 
     /**
      * {@inheritdoc}
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function afterDeleteCommit()
     {
diff --git a/app/code/Magento/Catalog/Pricing/Price/ConfiguredPrice.php b/app/code/Magento/Catalog/Pricing/Price/ConfiguredPrice.php
index 6ec282e45a1a0..c1af0b41741df 100644
--- a/app/code/Magento/Catalog/Pricing/Price/ConfiguredPrice.php
+++ b/app/code/Magento/Catalog/Pricing/Price/ConfiguredPrice.php
@@ -65,7 +65,7 @@ public function setItem(ItemInterface $item)
     /**
      * Get value of configured options.
      *
-     * @deprecated ConfiguredOptions::getItemOptionsValue is used instead
+     * @deprecated 102.0.4 ConfiguredOptions::getItemOptionsValue is used instead
      * @return float
      */
     protected function getOptionsValue(): float
diff --git a/app/code/Magento/Catalog/Pricing/Price/TierPrice.php b/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
index f250927889c29..1aa43a39af442 100644
--- a/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
+++ b/app/code/Magento/Catalog/Pricing/Price/TierPrice.php
@@ -29,7 +29,7 @@ class TierPrice extends AbstractPrice implements TierPriceInterface, BasePricePr
 
     /**
      * @var Session
-     * @deprecated 101.1.0
+     * @deprecated 102.0.0
      */
     protected $customerSession;
 
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..6b85ade0995a0 100644
--- a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
@@ -109,6 +109,7 @@ public function prepare()
      * Apply sorting.
      *
      * @return void
+     * @since 103.0.2
      */
     protected function applySorting()
     {
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Alerts.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Alerts.php
index 1f154d3204454..9b328e9bcc199 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Alerts.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Alerts.php
@@ -54,7 +54,6 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 101.0.0
      */
     public function modifyData(array $data)
     {
@@ -63,7 +62,6 @@ public function modifyData(array $data)
 
     /**
      * {@inheritdoc}
-     * @since 101.0.0
      */
     public function modifyMeta(array $meta)
     {
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php
index 7608173c8edfc..d58c4bacecf65 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php
@@ -48,7 +48,7 @@ class Categories extends AbstractModifier
 
     /**
      * @var array
-     * @deprecated 101.0.3
+     * @deprecated 101.0.0
      * @since 101.0.0
      */
     protected $categoriesTrees = [];
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/LayoutUpdate.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/LayoutUpdate.php
index 453be0c1a1582..a0935de84627a 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/LayoutUpdate.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/LayoutUpdate.php
@@ -50,7 +50,6 @@ private function extractLayoutUpdate(ProductInterface $product)
 
     /**
      * @inheritdoc
-     * @since 101.1.0
      */
     public function modifyData(array $data)
     {
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/TierPrice.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/TierPrice.php
index c64d3e2e4effb..e9e8229e581ba 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/TierPrice.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/TierPrice.php
@@ -18,7 +18,7 @@
  * Tier prices modifier adds price type option to tier prices.
  *
  * @api
- * @since 101.1.0
+ * @since 102.0.0
  */
 class TierPrice extends AbstractModifier
 {
@@ -46,7 +46,7 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function modifyData(array $data)
     {
@@ -56,7 +56,7 @@ public function modifyData(array $data)
     /**
      * Add tier price info to meta array.
      *
-     * @since 101.1.0
+     * @since 102.0.0
      * @param array $meta
      * @return array
      */
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Image.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Image.php
index d8f76c40e8fad..2324ca27ffaaf 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Image.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Listing/Collector/Image.php
@@ -54,7 +54,7 @@ class Image implements ProductRenderCollectorInterface
 
     /**
      * @var DesignInterface
-     * @deprecated 2.3.0 DesignLoader is used for design theme loading
+     * @deprecated 103.0.1 DesignLoader is used for design theme loading
      */
     private $design;
 
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductDataProvider.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductDataProvider.php
index a518afc576d61..b5d2bad1d348e 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductDataProvider.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductDataProvider.php
@@ -130,6 +130,7 @@ public function addFilter(\Magento\Framework\Api\Filter $filter)
 
     /**
      * @inheritdoc
+     * @since 103.0.0
      */
     public function getMeta()
     {
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorInterface.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorInterface.php
index 3f16e0a6617da..3ea21223816c1 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorInterface.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductRenderCollectorInterface.php
@@ -12,7 +12,7 @@
  * Allows to collect absolutely different product render information from different modules
  *
  * @api
- * @since 101.1.0
+ * @since 102.0.0
  */
 interface ProductRenderCollectorInterface
 {
@@ -22,7 +22,7 @@ interface ProductRenderCollectorInterface
      * @param ProductInterface $product
      * @param ProductRenderInterface $productRender
      * @return void
-     * @since 101.1.0
+     * @since 102.0.0
      */
     public function collect(ProductInterface $product, ProductRenderInterface $productRender);
 }
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/MediaGalleryEntries.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/MediaGalleryEntries.php
index e1338930afe5d..8843ad02320c6 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/MediaGalleryEntries.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/MediaGalleryEntries.php
@@ -18,7 +18,7 @@
  * @inheritdoc
  *
  * Format a product's media gallery information to conform to GraphQL schema representation
- * @deprecated
+ * @deprecated 100.3.3
  */
 class MediaGalleryEntries implements ResolverInterface
 {
diff --git a/app/code/Magento/CatalogImportExport/Model/Export/Product.php b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
index 530bf6b1a0057..bcd103c6d62ba 100644
--- a/app/code/Magento/CatalogImportExport/Model/Export/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
@@ -979,6 +979,7 @@ protected function getExportData()
      *
      * @return array Keys are product IDs, values arrays with keys as store IDs
      *               and values as store-specific versions of Product entity.
+     * @since 100.2.1
      */
     protected function loadCollection(): array
     {
@@ -1168,7 +1169,7 @@ protected function collectMultirawData()
      * @param \Magento\Catalog\Model\Product $item
      * @param int $storeId
      * @return bool
-     * @deprecated
+     * @deprecated 100.2.3
      */
     protected function hasMultiselectData($item, $storeId)
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index c5fcac99767bd..25bbecdce6d0f 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -225,7 +225,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
     /**
      * Links attribute name-to-link type ID.
      *
-     * @deprecated use DI for LinkProcessor class if you want to add additional types
+     * @deprecated 101.1.0 use DI for LinkProcessor class if you want to add additional types
      *
      * @var array
      */
@@ -554,7 +554,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
 
     /**
      * @var \Magento\CatalogInventory\Model\ResourceModel\Stock\ItemFactory
-     * @deprecated this variable isn't used anymore.
+     * @deprecated 101.0.0 this variable isn't used anymore.
      */
     protected $_stockResItemFac;
 
@@ -618,7 +618,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
 
     /**
      * @var array
-     * @deprecated 100.1.5
+     * @deprecated 100.0.3
      * @since 100.0.3
      */
     protected $productUrlKeys = [];
@@ -969,6 +969,7 @@ public function getMultipleValueSeparator()
      * Return empty attribute value constant
      *
      * @return string
+     * @since 101.0.0
      */
     public function getEmptyAttributeValueConstant()
     {
@@ -1289,7 +1290,7 @@ protected function _prepareRowForDb(array $rowData)
      *
      * Must be called after ALL products saving done.
      *
-     * @deprecated use linkProcessor Directly
+     * @deprecated 101.1.0 use linkProcessor Directly
      *
      * @return $this
      */
@@ -1473,7 +1474,7 @@ private function getNewSkuFieldsForSelect()
      *
      * @return void
      * @since 100.0.4
-     * @deprecated
+     * @deprecated 100.2.3
      */
     protected function initMediaGalleryResources()
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/LinkProcessor.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/LinkProcessor.php
index a45338c391a58..65064e867801d 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/LinkProcessor.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/LinkProcessor.php
@@ -110,7 +110,7 @@ public function saveLinks(
     /**
      * Add link types (exists for backwards compatibility)
      *
-     * @deprecated Use DI to inject to the constructor
+     * @deprecated 101.1.0 Use DI to inject to the constructor
      * @param array $nameToIds
      */
     public function addNameToIds(array $nameToIds): void
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 d87c3d8477556..6571b16c87565 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
@@ -33,6 +33,7 @@ abstract class AbstractType
      * Maintain a list of invisible attributes
      *
      * @var array
+     * @since 100.2.5
      */
     public static $invAttributesCache = [];
 
diff --git a/app/code/Magento/CatalogImportExport/Model/StockItemImporterInterface.php b/app/code/Magento/CatalogImportExport/Model/StockItemImporterInterface.php
index bc314d825ba3e..6ee0e536c0ae8 100644
--- a/app/code/Magento/CatalogImportExport/Model/StockItemImporterInterface.php
+++ b/app/code/Magento/CatalogImportExport/Model/StockItemImporterInterface.php
@@ -11,6 +11,7 @@
  * Interface StockItemImporterInterface
  *
  * @api
+ * @since 101.0.0
  */
 interface StockItemImporterInterface
 {
@@ -22,6 +23,7 @@ interface StockItemImporterInterface
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @throws \Magento\Framework\Exception\InputException
      * @throws \Magento\Framework\Validation\ValidationException
+     * @since 101.0.0
      */
     public function import(array $stockData);
 }
diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockCollectionInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockCollectionInterface.php
index 9ae22e5e1a364..07b8429ddf188 100644
--- a/app/code/Magento/CatalogInventory/Api/Data/StockCollectionInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/Data/StockCollectionInterface.php
@@ -16,7 +16,7 @@
  * @api
  * @since 100.0.2
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockInterface.php
index 087fae6e6568a..581081f2924ea 100644
--- a/app/code/Magento/CatalogInventory/Api/Data/StockInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/Data/StockInterface.php
@@ -12,7 +12,7 @@
  * @api
  * @since 100.0.2
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockItemCollectionInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockItemCollectionInterface.php
index 59a1f58b74c2c..2d5f980a57039 100644
--- a/app/code/Magento/CatalogInventory/Api/Data/StockItemCollectionInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/Data/StockItemCollectionInterface.php
@@ -16,7 +16,7 @@
  * @api
  * @since 100.0.2
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php
index e2e8a744c4bcd..759cc9883be9f 100644
--- a/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php
@@ -12,7 +12,7 @@
  * @api
  * @since 100.0.2
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockStatusCollectionInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockStatusCollectionInterface.php
index 1cc045745a0c1..a7d70a943d405 100644
--- a/app/code/Magento/CatalogInventory/Api/Data/StockStatusCollectionInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/Data/StockStatusCollectionInterface.php
@@ -12,7 +12,7 @@
  * @api
  * @since 100.0.2
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockStatusInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockStatusInterface.php
index 66b639fb088d1..35e56b0e3e7bb 100644
--- a/app/code/Magento/CatalogInventory/Api/Data/StockStatusInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/Data/StockStatusInterface.php
@@ -12,7 +12,7 @@
  * @api
  * @since 100.0.2
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
diff --git a/app/code/Magento/CatalogInventory/Api/RegisterProductSaleInterface.php b/app/code/Magento/CatalogInventory/Api/RegisterProductSaleInterface.php
index 6fd1e7466970d..ddb3fce22a853 100644
--- a/app/code/Magento/CatalogInventory/Api/RegisterProductSaleInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/RegisterProductSaleInterface.php
@@ -13,9 +13,10 @@
 /**
  * @api
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
+ * @since 100.3.0
  */
 interface RegisterProductSaleInterface
 {
@@ -29,6 +30,7 @@ interface RegisterProductSaleInterface
      * @param int $websiteId
      * @return StockItemInterface[]
      * @throws LocalizedException
+     * @since 100.3.0
      */
     public function registerProductsSale($items, $websiteId = null);
 }
diff --git a/app/code/Magento/CatalogInventory/Api/RevertProductSaleInterface.php b/app/code/Magento/CatalogInventory/Api/RevertProductSaleInterface.php
index 552e30da89235..83f7d73deaed9 100644
--- a/app/code/Magento/CatalogInventory/Api/RevertProductSaleInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/RevertProductSaleInterface.php
@@ -10,9 +10,10 @@
 /**
  * @api
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
+ * @since 100.3.0
  */
 interface RevertProductSaleInterface
 {
@@ -24,6 +25,7 @@ interface RevertProductSaleInterface
      * @param string[] $items
      * @param int $websiteId
      * @return bool
+     * @since 100.3.0
      */
     public function revertProductsSale($items, $websiteId = null);
 }
diff --git a/app/code/Magento/CatalogInventory/Api/StockConfigurationInterface.php b/app/code/Magento/CatalogInventory/Api/StockConfigurationInterface.php
index 5019e86b7af40..ab52580988c5e 100644
--- a/app/code/Magento/CatalogInventory/Api/StockConfigurationInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockConfigurationInterface.php
@@ -10,7 +10,7 @@
  * @api
  * @since 100.0.2
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
diff --git a/app/code/Magento/CatalogInventory/Api/StockCriteriaInterface.php b/app/code/Magento/CatalogInventory/Api/StockCriteriaInterface.php
index eb6fb2e812f2e..92f2290ec08ad 100644
--- a/app/code/Magento/CatalogInventory/Api/StockCriteriaInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockCriteriaInterface.php
@@ -10,7 +10,7 @@
  * @api
  * @since 100.0.2
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
diff --git a/app/code/Magento/CatalogInventory/Api/StockIndexInterface.php b/app/code/Magento/CatalogInventory/Api/StockIndexInterface.php
index 18bab6571c209..24dbaf5bb6d5f 100644
--- a/app/code/Magento/CatalogInventory/Api/StockIndexInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockIndexInterface.php
@@ -10,7 +10,7 @@
  * @api
  * @since 100.0.2
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
diff --git a/app/code/Magento/CatalogInventory/Api/StockItemCriteriaInterface.php b/app/code/Magento/CatalogInventory/Api/StockItemCriteriaInterface.php
index 1d2cabbb48a11..b72289ee09278 100644
--- a/app/code/Magento/CatalogInventory/Api/StockItemCriteriaInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockItemCriteriaInterface.php
@@ -10,7 +10,7 @@
  * @api
  * @since 100.0.2
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
diff --git a/app/code/Magento/CatalogInventory/Api/StockItemRepositoryInterface.php b/app/code/Magento/CatalogInventory/Api/StockItemRepositoryInterface.php
index eecf6cbe07632..4269569f9da1a 100644
--- a/app/code/Magento/CatalogInventory/Api/StockItemRepositoryInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockItemRepositoryInterface.php
@@ -10,7 +10,7 @@
  * @api
  * @since 100.0.2
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
diff --git a/app/code/Magento/CatalogInventory/Api/StockManagementInterface.php b/app/code/Magento/CatalogInventory/Api/StockManagementInterface.php
index 8796953e32fd0..3c1c7ea137c89 100644
--- a/app/code/Magento/CatalogInventory/Api/StockManagementInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockManagementInterface.php
@@ -10,7 +10,7 @@
  * @api
  * @since 100.0.2
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
diff --git a/app/code/Magento/CatalogInventory/Api/StockRegistryInterface.php b/app/code/Magento/CatalogInventory/Api/StockRegistryInterface.php
index 5478f90fb7d9f..bab5f9b457c45 100644
--- a/app/code/Magento/CatalogInventory/Api/StockRegistryInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockRegistryInterface.php
@@ -10,7 +10,7 @@
  * @api
  * @since 100.0.2
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
diff --git a/app/code/Magento/CatalogInventory/Api/StockRepositoryInterface.php b/app/code/Magento/CatalogInventory/Api/StockRepositoryInterface.php
index 3cfdf45506340..a7d64ec9eedb3 100644
--- a/app/code/Magento/CatalogInventory/Api/StockRepositoryInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockRepositoryInterface.php
@@ -10,7 +10,7 @@
  * @api
  * @since 100.0.2
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
diff --git a/app/code/Magento/CatalogInventory/Api/StockStateInterface.php b/app/code/Magento/CatalogInventory/Api/StockStateInterface.php
index 8be7f5be79f27..d404e885d78df 100644
--- a/app/code/Magento/CatalogInventory/Api/StockStateInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockStateInterface.php
@@ -10,7 +10,7 @@
  * @api
  * @since 100.0.2
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
diff --git a/app/code/Magento/CatalogInventory/Api/StockStatusCriteriaInterface.php b/app/code/Magento/CatalogInventory/Api/StockStatusCriteriaInterface.php
index 99ad7005d9da4..be1c9642826a7 100644
--- a/app/code/Magento/CatalogInventory/Api/StockStatusCriteriaInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockStatusCriteriaInterface.php
@@ -10,7 +10,7 @@
  * @api
  * @since 100.0.2
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
diff --git a/app/code/Magento/CatalogInventory/Api/StockStatusRepositoryInterface.php b/app/code/Magento/CatalogInventory/Api/StockStatusRepositoryInterface.php
index d29171f557f05..91efd55761335 100644
--- a/app/code/Magento/CatalogInventory/Api/StockStatusRepositoryInterface.php
+++ b/app/code/Magento/CatalogInventory/Api/StockStatusRepositoryInterface.php
@@ -10,7 +10,7 @@
  * @api
  * @since 100.0.2
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
diff --git a/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php b/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php
index ffcb758dcbd66..bc63114d99801 100644
--- a/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php
+++ b/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php
@@ -13,7 +13,7 @@
  * @api
  * @since 100.0.2
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
diff --git a/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Stock.php b/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Stock.php
index 5378801b6c24b..3c1a6e7982708 100644
--- a/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Stock.php
+++ b/app/code/Magento/CatalogInventory/Block/Adminhtml/Form/Field/Stock.php
@@ -15,7 +15,7 @@
  * @api
  * @since 100.0.2
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
diff --git a/app/code/Magento/CatalogInventory/Block/Qtyincrements.php b/app/code/Magento/CatalogInventory/Block/Qtyincrements.php
index a12b72cd0a971..dd8c987fe5da4 100644
--- a/app/code/Magento/CatalogInventory/Block/Qtyincrements.php
+++ b/app/code/Magento/CatalogInventory/Block/Qtyincrements.php
@@ -15,7 +15,7 @@
  * @api
  * @since 100.0.2
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
diff --git a/app/code/Magento/CatalogInventory/Block/Stockqty/DefaultStockqty.php b/app/code/Magento/CatalogInventory/Block/Stockqty/DefaultStockqty.php
index 5a3a3ca6ee983..c19dc5fb34bf6 100644
--- a/app/code/Magento/CatalogInventory/Block/Stockqty/DefaultStockqty.php
+++ b/app/code/Magento/CatalogInventory/Block/Stockqty/DefaultStockqty.php
@@ -12,7 +12,7 @@
  * @api
  * @since 100.0.2
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
diff --git a/app/code/Magento/CatalogInventory/Helper/Stock.php b/app/code/Magento/CatalogInventory/Helper/Stock.php
index 798ac4074c188..87a0e3c32ad09 100644
--- a/app/code/Magento/CatalogInventory/Helper/Stock.php
+++ b/app/code/Magento/CatalogInventory/Helper/Stock.php
@@ -19,9 +19,10 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
+ * @since 100.0.2
  */
 class Stock
 {
diff --git a/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
index 145b0d1454ae2..04e54acad5c0e 100644
--- a/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
+++ b/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
@@ -21,7 +21,7 @@
  * @api
  * @since 100.0.2
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
diff --git a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php
index e67568b80898e..2ccb726f2c625 100644
--- a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php
+++ b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php
@@ -26,7 +26,7 @@
  * @since 100.0.2
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php
index c5644060c689f..c151e5897abd5 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php
@@ -19,7 +19,7 @@
  * @api
  * @since 100.0.2
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/QueryProcessorInterface.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/QueryProcessorInterface.php
index 115002b237645..665ebf2db2f30 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/QueryProcessorInterface.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/QueryProcessorInterface.php
@@ -12,7 +12,7 @@
  * @api
  * @since 100.1.0
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/StockInterface.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/StockInterface.php
index 24ed496372817..9a1945d5aefac 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/StockInterface.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/StockInterface.php
@@ -10,7 +10,7 @@
  * @api
  * @since 100.0.2
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/StockFactory.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/StockFactory.php
index 0ee162e429f40..49e4889c8edee 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/StockFactory.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/StockFactory.php
@@ -13,7 +13,7 @@
  * @api
  * @since 100.0.2
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock.php
index 31b2ada809823..1f6f3a16ac617 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock.php
@@ -223,7 +223,7 @@ protected function _initConfig()
     /**
      * Set items out of stock basing on their quantities and config settings
      *
-     * @deprecated
+     * @deprecated 100.2.5
      * @see \Magento\CatalogInventory\Model\ResourceModel\Stock\Item::updateSetOutOfStock
      * @param string|int $website
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -260,7 +260,7 @@ public function updateSetOutOfStock($website = null)
     /**
      * Set items in stock basing on their quantities and config settings
      *
-     * @deprecated
+     * @deprecated 100.2.5
      * @see \Magento\CatalogInventory\Model\ResourceModel\Stock\Item::updateSetInStock
      * @param int|string $website
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -295,7 +295,7 @@ public function updateSetInStock($website)
     /**
      * Update items low stock date basing on their quantities and config settings
      *
-     * @deprecated
+     * @deprecated 100.2.5
      * @see \Magento\CatalogInventory\Model\ResourceModel\Stock\Item::updateLowStockDate
      * @param int|string $website
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php
index 402ce5f2f611e..25bc0a0ce899e 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php
@@ -14,9 +14,10 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
+ * @since 100.0.2
  */
 class Status extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
@@ -227,6 +228,7 @@ public function addStockStatusToSelect(\Magento\Framework\DB\Select $select, \Ma
      * @param \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
      * @param bool $isFilterInStock
      * @return \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
+     * @since 100.0.6
      */
     public function addStockDataToCollection($collection, $isFilterInStock)
     {
diff --git a/app/code/Magento/CatalogInventory/Model/Source/Backorders.php b/app/code/Magento/CatalogInventory/Model/Source/Backorders.php
index 0bffb9a9888cd..d28da4e5b3497 100644
--- a/app/code/Magento/CatalogInventory/Model/Source/Backorders.php
+++ b/app/code/Magento/CatalogInventory/Model/Source/Backorders.php
@@ -10,7 +10,7 @@
  * @api
  * @since 100.0.2
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
diff --git a/app/code/Magento/CatalogInventory/Model/Source/Stock.php b/app/code/Magento/CatalogInventory/Model/Source/Stock.php
index 9661fc83ce275..69e80658ecd74 100644
--- a/app/code/Magento/CatalogInventory/Model/Source/Stock.php
+++ b/app/code/Magento/CatalogInventory/Model/Source/Stock.php
@@ -12,7 +12,7 @@
  * @api
  * @since 100.0.2
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.0 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
@@ -38,6 +38,7 @@ public function getAllOptions()
      * @param string $dir
      *
      * @return $this
+     * @since 100.2.4
      */
     public function addValueSortToCollection($collection, $dir = \Magento\Framework\Data\Collection::SORT_ORDER_DESC)
     {
diff --git a/app/code/Magento/CatalogInventory/Model/Spi/StockRegistryProviderInterface.php b/app/code/Magento/CatalogInventory/Model/Spi/StockRegistryProviderInterface.php
index 0fa4b919c40fa..b2dfe532ffbe0 100644
--- a/app/code/Magento/CatalogInventory/Model/Spi/StockRegistryProviderInterface.php
+++ b/app/code/Magento/CatalogInventory/Model/Spi/StockRegistryProviderInterface.php
@@ -8,7 +8,7 @@
 /**
  * Interface StockRegistryProviderInterface
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.2 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
diff --git a/app/code/Magento/CatalogInventory/Model/Spi/StockStateProviderInterface.php b/app/code/Magento/CatalogInventory/Model/Spi/StockStateProviderInterface.php
index 30f703b5b928f..5bb78e1489b39 100644
--- a/app/code/Magento/CatalogInventory/Model/Spi/StockStateProviderInterface.php
+++ b/app/code/Magento/CatalogInventory/Model/Spi/StockStateProviderInterface.php
@@ -10,7 +10,7 @@
 /**
  * Interface StockStateProviderInterface
  *
- * @deprecated 2.3.0 Replaced with Multi Source Inventory
+ * @deprecated 100.3.2 Replaced with Multi Source Inventory
  * @link https://devdocs.magento.com/guides/v2.3/inventory/index.html
  * @link https://devdocs.magento.com/guides/v2.3/inventory/catalog-inventory-replacements.html
  */
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php b/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
index 1fc53c78985fb..df167d171e001 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
@@ -30,7 +30,7 @@ class IndexBuilder
 
     /**
      * @var \Magento\Framework\EntityManager\MetadataPool
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @since 100.1.0
      */
     protected $metadataPool;
@@ -41,7 +41,7 @@ class IndexBuilder
      * This array contain list of CatalogRuleGroupWebsite table columns
      *
      * @var array
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected $_catalogRuleGroupWebsiteColumnsList = ['rule_id', 'customer_group_id', 'website_id'];
 
@@ -446,7 +446,7 @@ private function assignProductToRule(Rule $rule, int $productEntityId, array $we
      * @param Product $product
      * @return $this
      * @throws \Exception
-     * @deprecated
+     * @deprecated 101.1.5
      * @see ReindexRuleProduct::execute
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -500,7 +500,7 @@ protected function getTable($tableName)
      *
      * @param Rule $rule
      * @return $this
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @see ReindexRuleProduct::execute
      */
     protected function updateRuleProductData(Rule $rule)
@@ -528,7 +528,7 @@ protected function updateRuleProductData(Rule $rule)
      * @param Product|null $product
      * @throws \Exception
      * @return $this
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @see ReindexRuleProductPrice::execute
      * @see ReindexRuleGroupWebsite::execute
      */
@@ -543,7 +543,7 @@ protected function applyAllRules(Product $product = null)
      * Update CatalogRuleGroupWebsite data
      *
      * @return $this
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @see ReindexRuleGroupWebsite::execute
      */
     protected function updateCatalogRuleGroupWebsiteData()
@@ -569,7 +569,7 @@ protected function deleteOldData()
      * @param array $ruleData
      * @param array $productData
      * @return float
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @see ProductPriceCalculator::calculate
      */
     protected function calcRuleProductPrice($ruleData, $productData = null)
@@ -584,7 +584,7 @@ protected function calcRuleProductPrice($ruleData, $productData = null)
      * @param Product|null $product
      * @return \Zend_Db_Statement_Interface
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @see RuleProductsSelectBuilder::build
      */
     protected function getRuleProductsStmt($websiteId, Product $product = null)
@@ -598,7 +598,7 @@ protected function getRuleProductsStmt($websiteId, Product $product = null)
      * @param array $arrData
      * @return $this
      * @throws \Exception
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @see RuleProductPricesPersistor::execute
      */
     protected function saveRuleProductPrices($arrData)
diff --git a/app/code/Magento/CatalogSearch/Model/Advanced.php b/app/code/Magento/CatalogSearch/Model/Advanced.php
index 8ce2e0140f528..5143762a07e08 100644
--- a/app/code/Magento/CatalogSearch/Model/Advanced.php
+++ b/app/code/Magento/CatalogSearch/Model/Advanced.php
@@ -67,7 +67,7 @@ class Advanced extends \Magento\Framework\Model\AbstractModel
     /**
      * Initialize dependencies
      *
-     * @deprecated
+     * @deprecated 101.0.2
      * @var Config
      */
     protected $_catalogConfig;
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php
index ca6ff0720023f..e226bdc6900e6 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php
@@ -126,6 +126,7 @@ public function execute($entityIds)
      * @inheritdoc
      *
      * @throws \InvalidArgumentException
+     * @since 101.0.0
      */
     public function executeByDimensions(array $dimensions, \Traversable $entityIds = null)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
index bd63e1e79989c..fa4d9fee415cf 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
@@ -41,7 +41,7 @@ class Full
      * Index values separator
      *
      * @var string
-     * @deprecated 100.1.6 Moved to \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider
+     * @deprecated 100.1.0 Moved to \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider
      * @see \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider::$separator
      */
     protected $separator = ' | ';
@@ -50,7 +50,7 @@ class Full
      * Array of \DateTime objects per store
      *
      * @var \DateTime[]
-     * @deprecated 100.1.6 Not used anymore
+     * @deprecated 100.1.0 Not used anymore
      */
     protected $dates = [];
 
@@ -58,7 +58,7 @@ class Full
      * Product Type Instances cache
      *
      * @var array
-     * @deprecated 100.1.6 Moved to \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider
+     * @deprecated 100.1.0 Moved to \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider
      * @see \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider::$productTypes
      */
     protected $productTypes = [];
@@ -67,7 +67,7 @@ class Full
      * Product Emulators cache
      *
      * @var array
-     * @deprecated 100.1.6 Moved to \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider
+     * @deprecated 100.1.0 Moved to \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider
      * @see \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider::$productEmulators
      */
     protected $productEmulators = [];
@@ -95,7 +95,7 @@ class Full
      * Catalog product type
      *
      * @var \Magento\Catalog\Model\Product\Type
-     * @deprecated 100.1.6 Moved to \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider
+     * @deprecated 100.1.0 Moved to \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider
      * @see \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider::$catalogProductType
      */
     protected $catalogProductType;
@@ -111,7 +111,7 @@ class Full
      * Core store config
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @deprecated 100.1.6 Not used anymore
+     * @deprecated 100.1.0 Not used anymore
      */
     protected $scopeConfig;
 
@@ -119,7 +119,7 @@ class Full
      * Store manager
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @deprecated 100.1.6 Moved to \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider
+     * @deprecated 100.1.0 Moved to \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider
      * @see \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider::$storeManager
      */
     protected $storeManager;
@@ -131,25 +131,25 @@ class Full
 
     /**
      * @var \Magento\Framework\Indexer\SaveHandler\IndexerInterface
-     * @deprecated 100.1.6 As part of self::cleanIndex()
+     * @deprecated 100.1.0 As part of self::cleanIndex()
      */
     protected $indexHandler;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @deprecated 100.1.6 Not used anymore
+     * @deprecated 100.1.0 Not used anymore
      */
     protected $dateTime;
 
     /**
      * @var \Magento\Framework\Locale\ResolverInterface
-     * @deprecated 100.1.6 Not used anymore
+     * @deprecated 100.1.0 Not used anymore
      */
     protected $localeResolver;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
-     * @deprecated 100.1.6 Not used anymore
+     * @deprecated 100.1.0 Not used anymore
      */
     protected $localeDate;
 
@@ -160,19 +160,19 @@ class Full
 
     /**
      * @var \Magento\CatalogSearch\Model\ResourceModel\Fulltext
-     * @deprecated 100.1.6 Not used anymore
+     * @deprecated 100.1.0 Not used anymore
      */
     protected $fulltextResource;
 
     /**
      * @var \Magento\Framework\Search\Request\Config
-     * @deprecated 100.1.6 As part of self::reindexAll()
+     * @deprecated 100.1.0 As part of self::reindexAll()
      */
     protected $searchRequestConfig;
 
     /**
      * @var \Magento\Framework\Search\Request\DimensionFactory
-     * @deprecated 100.1.6 As part of self::cleanIndex()
+     * @deprecated 100.1.0 As part of self::cleanIndex()
      */
     private $dimensionFactory;
 
@@ -301,7 +301,7 @@ protected function getTable($table)
     /**
      * Get parents IDs of product IDs to be re-indexed
      *
-     * @deprecated as it not used in the class anymore and duplicates another API method
+     * @deprecated 100.2.3 as it not used in the class anymore and duplicates another API method
      * @see \Magento\CatalogSearch\Model\ResourceModel\Fulltext::getRelationsByChild()
      *
      * @param int[] $entityIds
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/UnknownStateException.php b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/UnknownStateException.php
index 8722cd52b618a..c79d876c1127d 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Scope/UnknownStateException.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Scope/UnknownStateException.php
@@ -13,7 +13,7 @@
  *
  * @api
  * @since 100.2.0
- * @deprecated
+ * @deprecated 101.0.0
  * @see \Magento\ElasticSearch
  */
 class UnknownStateException extends LocalizedException
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
index 291fad1e16ebf..47160bff1d571 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
@@ -236,6 +236,7 @@ public function addFieldsToFilter($fields)
 
     /**
      * @inheritdoc
+     * @since 101.0.2
      */
     public function setOrder($attribute, $dir = Select::SQL_DESC)
     {
@@ -253,6 +254,7 @@ public function setOrder($attribute, $dir = Select::SQL_DESC)
 
     /**
      * @inheritdoc
+     * @since 101.0.2
      */
     public function addCategoryFilter(\Magento\Catalog\Model\Category $category)
     {
@@ -272,6 +274,7 @@ public function addCategoryFilter(\Magento\Catalog\Model\Category $category)
 
     /**
      * @inheritdoc
+     * @since 101.0.2
      */
     public function setVisibility($visibility)
     {
@@ -338,6 +341,7 @@ protected function _renderFiltersBefore()
 
     /**
      * @inheritDoc
+     * @since 101.0.4
      */
     public function clear()
     {
@@ -347,6 +351,7 @@ public function clear()
 
     /**
      * @inheritDoc
+     * @since 101.0.4
      */
     protected function _reset()
     {
@@ -356,6 +361,7 @@ protected function _reset()
 
     /**
      * @inheritdoc
+     * @since 101.0.4
      */
     public function _loadEntities($printQuery = false, $logQuery = false)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineProvider.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineProvider.php
index d1259159606d3..d0456ff011027 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/EngineProvider.php
@@ -29,7 +29,7 @@ class EngineProvider
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @deprecated since it is not used anymore
+     * @deprecated 101.0.0 since it is not used anymore
      */
     protected $scopeConfig;
 
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php
index 0835fb66f876a..3614cd9dbf3a9 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php
@@ -62,7 +62,7 @@ protected function _construct()
      * Reset search results
      *
      * @return $this
-     * @deprecated Not used anymore
+     * @deprecated 101.0.0 Not used anymore
      * @see Fulltext::resetSearchResultsByStore
      */
     public function resetSearchResults()
@@ -78,6 +78,7 @@ public function resetSearchResults()
      *
      * @param int $storeId
      * @return $this
+     * @since 101.0.0
      */
     public function resetSearchResultsByStore($storeId)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php
index e63ed1bd3d72f..06dcc69ef60f5 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php
@@ -337,6 +337,7 @@ public function addFieldToFilter($field, $condition = null)
 
     /**
      * @inheritDoc
+     * @since 101.0.4
      */
     public function clear()
     {
@@ -348,6 +349,7 @@ public function clear()
 
     /**
      * @inheritDoc
+     * @since 101.0.4
      */
     protected function _reset()
     {
@@ -359,6 +361,7 @@ protected function _reset()
 
     /**
      * @inheritdoc
+     * @since 101.0.4
      */
     public function _loadEntities($printQuery = false, $logQuery = false)
     {
@@ -429,6 +432,7 @@ public function setOrder($attribute, $dir = Select::SQL_DESC)
      * @param string $attribute
      * @param string $dir
      * @return $this
+     * @since 101.0.2
      */
     public function addAttributeToSort($attribute, $dir = self::SORT_ORDER_ASC)
     {
@@ -555,6 +559,7 @@ private function getSearchResultApplier(SearchResultInterface $searchResult): Se
 
     /**
      * @inheritdoc
+     * @since 100.2.3
      */
     protected function _beforeLoad()
     {
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/DefaultFilterStrategyApplyChecker.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/DefaultFilterStrategyApplyChecker.php
index b396437fc66c7..a7e9c237f58c3 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/DefaultFilterStrategyApplyChecker.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/DefaultFilterStrategyApplyChecker.php
@@ -8,7 +8,7 @@
 
 /**
  * This class add in backward compatibility purposes to check if need to apply old strategy for filter prepare process.
- * @deprecated
+ * @deprecated 101.0.2
  */
 class DefaultFilterStrategyApplyChecker implements DefaultFilterStrategyApplyCheckerInterface
 {
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/DefaultFilterStrategyApplyCheckerInterface.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/DefaultFilterStrategyApplyCheckerInterface.php
index a067767775393..d9e41af658089 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/DefaultFilterStrategyApplyCheckerInterface.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection/DefaultFilterStrategyApplyCheckerInterface.php
@@ -8,7 +8,7 @@
 
 /**
  * Added in backward compatibility purposes to check if need to apply old strategy for filter prepare process.
- * @deprecated
+ * @deprecated 101.0.2
  */
 interface DefaultFilterStrategyApplyCheckerInterface
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Search/ReaderPlugin.php b/app/code/Magento/CatalogSearch/Model/Search/ReaderPlugin.php
index 916e03f471493..2f6a402b20406 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/ReaderPlugin.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/ReaderPlugin.php
@@ -6,7 +6,7 @@
 namespace Magento\CatalogSearch\Model\Search;
 
 /**
- * @deprecated
+ * @deprecated 101.0.0
  * @see \Magento\ElasticSearch
  */
 class ReaderPlugin
diff --git a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/GeneratorResolver.php b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/GeneratorResolver.php
index 68ca546b81919..aa3bd1f149c16 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/GeneratorResolver.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/RequestGenerator/GeneratorResolver.php
@@ -9,7 +9,7 @@
 /**
  * @api
  * @since 100.1.6
- * @deprecated
+ * @deprecated 101.0.0
  * @see \Magento\ElasticSearch
  */
 class GeneratorResolver
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/CurrentUrlRewritesRegenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/CurrentUrlRewritesRegenerator.php
index f8d9ddf0c4ad9..5a339670bbb81 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Category/CurrentUrlRewritesRegenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Category/CurrentUrlRewritesRegenerator.php
@@ -27,13 +27,13 @@ class CurrentUrlRewritesRegenerator
 
     /**
      * @var \Magento\Catalog\Model\Category
-     * @deprecated 100.1.4
+     * @deprecated 100.1.0
      */
     protected $category;
 
     /**
      * @var \Magento\UrlRewrite\Model\UrlFinderInterface
-     * @deprecated 100.1.4
+     * @deprecated 100.1.0
      */
     protected $urlFinder;
 
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGenerator.php
index a86604672e2b4..d48bcd446fcfd 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGenerator.php
@@ -30,7 +30,7 @@ class CategoryUrlRewriteGenerator
 
     /**
      * @var \Magento\Catalog\Model\Category
-     * @deprecated 100.1.4
+     * @deprecated 100.1.0
      */
     protected $category;
 
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Product/CurrentUrlRewritesRegenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/Product/CurrentUrlRewritesRegenerator.php
index 42d3fd9cb40e1..628615803f6e8 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Product/CurrentUrlRewritesRegenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Product/CurrentUrlRewritesRegenerator.php
@@ -26,19 +26,19 @@ class CurrentUrlRewritesRegenerator
 {
     /**
      * @var Product
-     * @deprecated 100.1.4
+     * @deprecated 100.1.0
      */
     protected $product;
 
     /**
      * @var ObjectRegistry
-     * @deprecated 100.1.4
+     * @deprecated 100.1.0
      */
     protected $productCategories;
 
     /**
      * @var UrlFinderInterface
-     * @deprecated 100.1.4
+     * @deprecated 100.1.0
      */
     protected $urlFinder;
 
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGenerator.php
index 868c417b5ff52..f5e6ae9a6d615 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGenerator.php
@@ -26,49 +26,49 @@ class ProductUrlRewriteGenerator
     const ENTITY_TYPE = 'product';
 
     /**
-     * @deprecated 100.1.4
+     * @deprecated 100.1.0
      * @var \Magento\CatalogUrlRewrite\Service\V1\StoreViewService
      */
     protected $storeViewService;
 
     /**
      * @var \Magento\Catalog\Model\Product
-     * @deprecated 100.1.4
+     * @deprecated 100.1.0
      */
     protected $product;
 
     /**
-     * @deprecated 100.1.4
+     * @deprecated 100.1.0
      * @var \Magento\CatalogUrlRewrite\Model\Product\CurrentUrlRewritesRegenerator
      */
     protected $currentUrlRewritesRegenerator;
 
     /**
-     * @deprecated 100.1.4
+     * @deprecated 100.1.0
      * @var \Magento\CatalogUrlRewrite\Model\Product\CategoriesUrlRewriteGenerator
      */
     protected $categoriesUrlRewriteGenerator;
 
     /**
-     * @deprecated 100.1.4
+     * @deprecated 100.1.0
      * @var \Magento\CatalogUrlRewrite\Model\Product\CanonicalUrlRewriteGenerator
      */
     protected $canonicalUrlRewriteGenerator;
 
     /**
-     * @deprecated 100.1.4
+     * @deprecated 100.1.0
      * @var \Magento\CatalogUrlRewrite\Model\ObjectRegistryFactory
      */
     protected $objectRegistryFactory;
 
     /**
-     * @deprecated 100.1.4
+     * @deprecated 100.1.0
      * @var \Magento\CatalogUrlRewrite\Model\ObjectRegistry
      */
     protected $productCategories;
 
     /**
-     * @deprecated 100.1.4
+     * @deprecated 100.1.0
      * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
diff --git a/app/code/Magento/Checkout/Api/AgreementsValidatorInterface.php b/app/code/Magento/Checkout/Api/AgreementsValidatorInterface.php
index d97492f31a79d..22d4fdf502f7c 100644
--- a/app/code/Magento/Checkout/Api/AgreementsValidatorInterface.php
+++ b/app/code/Magento/Checkout/Api/AgreementsValidatorInterface.php
@@ -8,6 +8,7 @@
 /**
  * Interface AgreementsValidatorInterface
  * @api
+ * @since 100.0.2
  */
 interface AgreementsValidatorInterface
 {
diff --git a/app/code/Magento/Checkout/Api/Data/PaymentDetailsInterface.php b/app/code/Magento/Checkout/Api/Data/PaymentDetailsInterface.php
index cad1c100c7e5b..361c50cdcfe86 100644
--- a/app/code/Magento/Checkout/Api/Data/PaymentDetailsInterface.php
+++ b/app/code/Magento/Checkout/Api/Data/PaymentDetailsInterface.php
@@ -8,6 +8,7 @@
 /**
  * Interface PaymentDetailsInterface
  * @api
+ * @since 100.0.2
  */
 interface PaymentDetailsInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
diff --git a/app/code/Magento/Checkout/Api/Data/ShippingInformationInterface.php b/app/code/Magento/Checkout/Api/Data/ShippingInformationInterface.php
index e4032066a6f10..188d2987e5daf 100644
--- a/app/code/Magento/Checkout/Api/Data/ShippingInformationInterface.php
+++ b/app/code/Magento/Checkout/Api/Data/ShippingInformationInterface.php
@@ -8,6 +8,7 @@
 /**
  * Interface ShippingInformationInterface
  * @api
+ * @since 100.0.2
  */
 interface ShippingInformationInterface extends \Magento\Framework\Api\CustomAttributesDataInterface
 {
diff --git a/app/code/Magento/Checkout/Api/Data/TotalsInformationInterface.php b/app/code/Magento/Checkout/Api/Data/TotalsInformationInterface.php
index a9dd05856b72f..c8234bb560cba 100644
--- a/app/code/Magento/Checkout/Api/Data/TotalsInformationInterface.php
+++ b/app/code/Magento/Checkout/Api/Data/TotalsInformationInterface.php
@@ -8,6 +8,7 @@
 /**
  * Interface TotalsInformationInterface
  * @api
+ * @since 100.0.2
  */
 interface TotalsInformationInterface extends \Magento\Framework\Api\CustomAttributesDataInterface
 {
diff --git a/app/code/Magento/Checkout/Api/GuestPaymentInformationManagementInterface.php b/app/code/Magento/Checkout/Api/GuestPaymentInformationManagementInterface.php
index 63296081ab97c..80c2bb7752b73 100644
--- a/app/code/Magento/Checkout/Api/GuestPaymentInformationManagementInterface.php
+++ b/app/code/Magento/Checkout/Api/GuestPaymentInformationManagementInterface.php
@@ -8,6 +8,7 @@
 /**
  * Interface for managing guest payment information
  * @api
+ * @since 100.0.2
  */
 interface GuestPaymentInformationManagementInterface
 {
diff --git a/app/code/Magento/Checkout/Api/GuestShippingInformationManagementInterface.php b/app/code/Magento/Checkout/Api/GuestShippingInformationManagementInterface.php
index def7442ad4672..6ac5ec9442b6f 100644
--- a/app/code/Magento/Checkout/Api/GuestShippingInformationManagementInterface.php
+++ b/app/code/Magento/Checkout/Api/GuestShippingInformationManagementInterface.php
@@ -8,6 +8,7 @@
 /**
  * Interface for managing guest shipping address information
  * @api
+ * @since 100.0.2
  */
 interface GuestShippingInformationManagementInterface
 {
diff --git a/app/code/Magento/Checkout/Api/GuestTotalsInformationManagementInterface.php b/app/code/Magento/Checkout/Api/GuestTotalsInformationManagementInterface.php
index d2d7dfad609cb..c98d193534d36 100644
--- a/app/code/Magento/Checkout/Api/GuestTotalsInformationManagementInterface.php
+++ b/app/code/Magento/Checkout/Api/GuestTotalsInformationManagementInterface.php
@@ -8,6 +8,7 @@
 /**
  * Interface for guest quote totals calculation
  * @api
+ * @since 100.0.2
  */
 interface GuestTotalsInformationManagementInterface
 {
diff --git a/app/code/Magento/Checkout/Api/PaymentInformationManagementInterface.php b/app/code/Magento/Checkout/Api/PaymentInformationManagementInterface.php
index f80deca1acc5a..b025dc4c7c4a4 100644
--- a/app/code/Magento/Checkout/Api/PaymentInformationManagementInterface.php
+++ b/app/code/Magento/Checkout/Api/PaymentInformationManagementInterface.php
@@ -8,6 +8,7 @@
 /**
  * Interface for managing quote payment information
  * @api
+ * @since 100.0.2
  */
 interface PaymentInformationManagementInterface
 {
diff --git a/app/code/Magento/Checkout/Api/ShippingInformationManagementInterface.php b/app/code/Magento/Checkout/Api/ShippingInformationManagementInterface.php
index 0d22e1485c099..ee8fb42a581c0 100644
--- a/app/code/Magento/Checkout/Api/ShippingInformationManagementInterface.php
+++ b/app/code/Magento/Checkout/Api/ShippingInformationManagementInterface.php
@@ -8,6 +8,7 @@
 /**
  * Interface for managing customer shipping address information
  * @api
+ * @since 100.0.2
  */
 interface ShippingInformationManagementInterface
 {
diff --git a/app/code/Magento/Checkout/Api/TotalsInformationManagementInterface.php b/app/code/Magento/Checkout/Api/TotalsInformationManagementInterface.php
index 60fd254eb199e..f3ecf957f3e06 100644
--- a/app/code/Magento/Checkout/Api/TotalsInformationManagementInterface.php
+++ b/app/code/Magento/Checkout/Api/TotalsInformationManagementInterface.php
@@ -8,6 +8,7 @@
 /**
  * Interface for quote totals calculation
  * @api
+ * @since 100.0.2
  */
 interface TotalsInformationManagementInterface
 {
diff --git a/app/code/Magento/Checkout/Block/Cart.php b/app/code/Magento/Checkout/Block/Cart.php
index 7940c37917624..76bf917f02d8b 100644
--- a/app/code/Magento/Checkout/Block/Cart.php
+++ b/app/code/Magento/Checkout/Block/Cart.php
@@ -11,6 +11,7 @@
  * Shopping cart block
  *
  * @api
+ * @since 100.0.2
  */
 class Cart extends \Magento\Checkout\Block\Cart\AbstractCart
 {
@@ -239,7 +240,7 @@ public function getItemsCount()
      * Render pagination HTML
      *
      * @return string
-     * @since 100.2.0
+     * @since 100.1.7
      */
     public function getPagerHtml()
     {
diff --git a/app/code/Magento/Checkout/Block/Cart/Additional/Info.php b/app/code/Magento/Checkout/Block/Cart/Additional/Info.php
index 196992cbaf9c8..9bf8c8c8e9b51 100644
--- a/app/code/Magento/Checkout/Block/Cart/Additional/Info.php
+++ b/app/code/Magento/Checkout/Block/Cart/Additional/Info.php
@@ -8,6 +8,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class Info extends \Magento\Framework\View\Element\Template
 {
diff --git a/app/code/Magento/Checkout/Block/Cart/Coupon.php b/app/code/Magento/Checkout/Block/Cart/Coupon.php
index acf3c0922f3c9..98707e7e7c694 100644
--- a/app/code/Magento/Checkout/Block/Cart/Coupon.php
+++ b/app/code/Magento/Checkout/Block/Cart/Coupon.php
@@ -11,6 +11,7 @@
  * Block with apply-coupon form.
  *
  * @api
+ * @since 100.0.2
  */
 class Coupon extends \Magento\Checkout\Block\Cart\AbstractCart
 {
@@ -44,6 +45,7 @@ public function getCouponCode()
 
     /**
      * @inheritDoc
+     * @since 100.3.2
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/Checkout/Block/Cart/Crosssell.php b/app/code/Magento/Checkout/Block/Cart/Crosssell.php
index 06be50d05aefc..5e129a958b535 100644
--- a/app/code/Magento/Checkout/Block/Cart/Crosssell.php
+++ b/app/code/Magento/Checkout/Block/Cart/Crosssell.php
@@ -12,6 +12,7 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @since 100.0.2
  */
 class Crosssell extends \Magento\Catalog\Block\Product\AbstractProduct
 {
diff --git a/app/code/Magento/Checkout/Block/Cart/Grid.php b/app/code/Magento/Checkout/Block/Cart/Grid.php
index bfe4b6ceed9d0..db5d90ecddc16 100644
--- a/app/code/Magento/Checkout/Block/Cart/Grid.php
+++ b/app/code/Magento/Checkout/Block/Cart/Grid.php
@@ -13,7 +13,7 @@
  * custom_items weren't set to cart block
  *
  * @api
- * @since 100.2.0
+ * @since 100.1.7
  */
 class Grid extends \Magento\Checkout\Block\Cart
 {
@@ -56,7 +56,6 @@ class Grid extends \Magento\Checkout\Block\Cart
      * @param \Magento\Quote\Model\ResourceModel\Quote\Item\CollectionFactory $itemCollectionFactory
      * @param \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $joinProcessor
      * @param array $data
-     * @since 100.2.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -89,7 +88,7 @@ public function __construct(
      * Configuration path is Store->Configuration->Sales->Checkout->Shopping Cart->Number of items to display pager
      *
      * @return void
-     * @since 100.2.0
+     * @since 100.1.7
      */
     protected function _construct()
     {
@@ -103,7 +102,7 @@ protected function _construct()
 
     /**
      * {@inheritdoc}
-     * @since 100.2.0
+     * @since 100.1.7
      */
     protected function _prepareLayout()
     {
@@ -128,7 +127,7 @@ protected function _prepareLayout()
      * Prepare quote items collection for pager
      *
      * @return \Magento\Quote\Model\ResourceModel\Quote\Item\Collection
-     * @since 100.2.0
+     * @since 100.1.7
      */
     public function getItemsForGrid()
     {
@@ -147,7 +146,7 @@ public function getItemsForGrid()
 
     /**
      * {@inheritdoc}
-     * @since 100.2.0
+     * @since 100.1.7
      */
     public function getItems()
     {
diff --git a/app/code/Magento/Checkout/Block/Cart/Item/Configure.php b/app/code/Magento/Checkout/Block/Cart/Item/Configure.php
index 086518a312f71..c5c3af1d3c8c9 100644
--- a/app/code/Magento/Checkout/Block/Cart/Item/Configure.php
+++ b/app/code/Magento/Checkout/Block/Cart/Item/Configure.php
@@ -11,6 +11,7 @@
  *
  * @api
  * @module     Checkout
+ * @since 100.0.2
  */
 class Configure extends \Magento\Framework\View\Element\Template
 {
diff --git a/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php b/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
index c99c9041941b1..830191bd13c40 100644
--- a/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
+++ b/app/code/Magento/Checkout/Block/Cart/Item/Renderer.php
@@ -24,6 +24,7 @@
  * @method \Magento\Checkout\Block\Cart\Item\Renderer setDeleteUrl(string)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
+ * @since 100.0.2
  */
 class Renderer extends \Magento\Framework\View\Element\Template implements
     \Magento\Framework\DataObject\IdentityInterface
diff --git a/app/code/Magento/Checkout/Block/Cart/Item/Renderer/Actions.php b/app/code/Magento/Checkout/Block/Cart/Item/Renderer/Actions.php
index 3be4f76d8d67e..b2d4ef28347a5 100644
--- a/app/code/Magento/Checkout/Block/Cart/Item/Renderer/Actions.php
+++ b/app/code/Magento/Checkout/Block/Cart/Item/Renderer/Actions.php
@@ -11,6 +11,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class Actions extends Text
 {
diff --git a/app/code/Magento/Checkout/Block/Cart/Item/Renderer/Actions/Edit.php b/app/code/Magento/Checkout/Block/Cart/Item/Renderer/Actions/Edit.php
index 4542f19c4670a..fd34cdc4314f5 100644
--- a/app/code/Magento/Checkout/Block/Cart/Item/Renderer/Actions/Edit.php
+++ b/app/code/Magento/Checkout/Block/Cart/Item/Renderer/Actions/Edit.php
@@ -7,6 +7,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class Edit extends Generic
 {
diff --git a/app/code/Magento/Checkout/Block/Cart/Item/Renderer/Actions/Remove.php b/app/code/Magento/Checkout/Block/Cart/Item/Renderer/Actions/Remove.php
index d50eeb1b0a263..b52c7dc4c2131 100644
--- a/app/code/Magento/Checkout/Block/Cart/Item/Renderer/Actions/Remove.php
+++ b/app/code/Magento/Checkout/Block/Cart/Item/Renderer/Actions/Remove.php
@@ -10,6 +10,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class Remove extends Generic
 {
diff --git a/app/code/Magento/Checkout/Block/Cart/Shipping.php b/app/code/Magento/Checkout/Block/Cart/Shipping.php
index 712ee84afd232..749f64ed83a65 100644
--- a/app/code/Magento/Checkout/Block/Cart/Shipping.php
+++ b/app/code/Magento/Checkout/Block/Cart/Shipping.php
@@ -20,6 +20,7 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @since 100.0.2
  */
 class Shipping extends \Magento\Checkout\Block\Cart\AbstractCart
 {
diff --git a/app/code/Magento/Checkout/Block/Cart/Sidebar.php b/app/code/Magento/Checkout/Block/Cart/Sidebar.php
index 147782e501ae4..51f25a41971b1 100644
--- a/app/code/Magento/Checkout/Block/Cart/Sidebar.php
+++ b/app/code/Magento/Checkout/Block/Cart/Sidebar.php
@@ -11,6 +11,7 @@
  * Cart sidebar block
  *
  * @api
+ * @since 100.0.2
  */
 class Sidebar extends AbstractCart
 {
diff --git a/app/code/Magento/Checkout/Block/Cart/Totals.php b/app/code/Magento/Checkout/Block/Cart/Totals.php
index 131e5b157c77a..a0ca67f52d73f 100644
--- a/app/code/Magento/Checkout/Block/Cart/Totals.php
+++ b/app/code/Magento/Checkout/Block/Cart/Totals.php
@@ -14,6 +14,7 @@
  * Totals cart block.
  *
  * @api
+ * @since 100.0.2
  */
 class Totals extends \Magento\Checkout\Block\Cart\AbstractCart
 {
diff --git a/app/code/Magento/Checkout/Block/Cart/ValidationMessages.php b/app/code/Magento/Checkout/Block/Cart/ValidationMessages.php
index 0ec2982b83c01..1429eeb04995d 100644
--- a/app/code/Magento/Checkout/Block/Cart/ValidationMessages.php
+++ b/app/code/Magento/Checkout/Block/Cart/ValidationMessages.php
@@ -12,6 +12,7 @@
  * Shopping cart validation messages block
  *
  * @api
+ * @since 100.0.2
  */
 class ValidationMessages extends \Magento\Framework\View\Element\Messages
 {
diff --git a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
index 1dd1131cde1f1..43a8208a216a6 100644
--- a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
+++ b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php
@@ -397,7 +397,7 @@ protected function getFieldOptions($attributeCode, array $attributeConfig)
      *
      * @param array $countryOptions
      * @return array
-     * @deprecated 100.2.0
+     * @deprecated 100.1.7
      */
     protected function orderCountryOptions(array $countryOptions)
     {
diff --git a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessorInterface.php b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessorInterface.php
index ad14f2a45426d..31a744c7d4d48 100644
--- a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessorInterface.php
+++ b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessorInterface.php
@@ -13,6 +13,7 @@
  * @see \Magento\Checkout\Block\Onepage
  *
  * @api
+ * @since 100.0.2
  */
 interface LayoutProcessorInterface
 {
diff --git a/app/code/Magento/Checkout/Block/Item/Price/Renderer.php b/app/code/Magento/Checkout/Block/Item/Price/Renderer.php
index 2210b1cd9243e..b0f5a6b51a158 100644
--- a/app/code/Magento/Checkout/Block/Item/Price/Renderer.php
+++ b/app/code/Magento/Checkout/Block/Item/Price/Renderer.php
@@ -12,6 +12,7 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @since 100.0.2
  */
 class Renderer extends \Magento\Framework\View\Element\Template
 {
diff --git a/app/code/Magento/Checkout/Block/Onepage.php b/app/code/Magento/Checkout/Block/Onepage.php
index e01d5835b4cf0..c335b3909d5fd 100644
--- a/app/code/Magento/Checkout/Block/Onepage.php
+++ b/app/code/Magento/Checkout/Block/Onepage.php
@@ -9,6 +9,7 @@
  * Onepage checkout block
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @since 100.0.2
  */
 class Onepage extends \Magento\Framework\View\Element\Template
 {
diff --git a/app/code/Magento/Checkout/Block/Onepage/Failure.php b/app/code/Magento/Checkout/Block/Onepage/Failure.php
index 46e56d24a7fa0..70f445173567a 100644
--- a/app/code/Magento/Checkout/Block/Onepage/Failure.php
+++ b/app/code/Magento/Checkout/Block/Onepage/Failure.php
@@ -7,6 +7,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class Failure extends \Magento\Framework\View\Element\Template
 {
diff --git a/app/code/Magento/Checkout/Block/Onepage/Link.php b/app/code/Magento/Checkout/Block/Onepage/Link.php
index b8f3926baa58a..de26fe68287de 100644
--- a/app/code/Magento/Checkout/Block/Onepage/Link.php
+++ b/app/code/Magento/Checkout/Block/Onepage/Link.php
@@ -10,6 +10,7 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @since 100.0.2
  */
 class Link extends \Magento\Framework\View\Element\Template
 {
diff --git a/app/code/Magento/Checkout/Block/Onepage/Success.php b/app/code/Magento/Checkout/Block/Onepage/Success.php
index e7cfaf68cc789..f8e286ca14bc8 100644
--- a/app/code/Magento/Checkout/Block/Onepage/Success.php
+++ b/app/code/Magento/Checkout/Block/Onepage/Success.php
@@ -12,6 +12,7 @@
  * One page checkout success page
  *
  * @api
+ * @since 100.0.2
  */
 class Success extends \Magento\Framework\View\Element\Template
 {
diff --git a/app/code/Magento/Checkout/Block/QuoteShortcutButtons.php b/app/code/Magento/Checkout/Block/QuoteShortcutButtons.php
index 3b2f1604fae44..27910277617dd 100644
--- a/app/code/Magento/Checkout/Block/QuoteShortcutButtons.php
+++ b/app/code/Magento/Checkout/Block/QuoteShortcutButtons.php
@@ -11,6 +11,7 @@
  * Displays buttons on shopping cart page
  *
  * @api
+ * @since 100.0.2
  */
 class QuoteShortcutButtons extends \Magento\Catalog\Block\ShortcutButtons
 {
diff --git a/app/code/Magento/Checkout/Block/Registration.php b/app/code/Magento/Checkout/Block/Registration.php
index e880230f50a74..75bc3fa467ad6 100644
--- a/app/code/Magento/Checkout/Block/Registration.php
+++ b/app/code/Magento/Checkout/Block/Registration.php
@@ -9,6 +9,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class Registration extends \Magento\Framework\View\Element\Template
 {
diff --git a/app/code/Magento/Checkout/Controller/Account/Create.php b/app/code/Magento/Checkout/Controller/Account/Create.php
index dae0bb98be453..21706186d803d 100644
--- a/app/code/Magento/Checkout/Controller/Account/Create.php
+++ b/app/code/Magento/Checkout/Controller/Account/Create.php
@@ -10,7 +10,7 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
- * @deprecated
+ * @deprecated 100.2.5
  * @see DelegateCreate
  */
 class Create extends \Magento\Framework\App\Action\Action
diff --git a/app/code/Magento/Checkout/CustomerData/AbstractItem.php b/app/code/Magento/Checkout/CustomerData/AbstractItem.php
index 9c2e3a32ef901..e5ed511924a7b 100644
--- a/app/code/Magento/Checkout/CustomerData/AbstractItem.php
+++ b/app/code/Magento/Checkout/CustomerData/AbstractItem.php
@@ -12,6 +12,7 @@
  * Abstract item
  *
  * @api
+ * @since 100.0.2
  */
 abstract class AbstractItem implements ItemInterface
 {
diff --git a/app/code/Magento/Checkout/CustomerData/ItemInterface.php b/app/code/Magento/Checkout/CustomerData/ItemInterface.php
index fb8bd831f1ccd..fc8d954387b89 100644
--- a/app/code/Magento/Checkout/CustomerData/ItemInterface.php
+++ b/app/code/Magento/Checkout/CustomerData/ItemInterface.php
@@ -12,6 +12,7 @@
  * Item interface
  *
  * @api
+ * @since 100.0.2
  */
 interface ItemInterface
 {
diff --git a/app/code/Magento/Checkout/Exception.php b/app/code/Magento/Checkout/Exception.php
index 4957e6be9b5da..6297041e065aa 100644
--- a/app/code/Magento/Checkout/Exception.php
+++ b/app/code/Magento/Checkout/Exception.php
@@ -7,6 +7,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class Exception extends \Magento\Framework\Exception\LocalizedException
 {
diff --git a/app/code/Magento/Checkout/Model/Cart.php b/app/code/Magento/Checkout/Model/Cart.php
index cec99909dc999..b8bfb47f2c97a 100644
--- a/app/code/Magento/Checkout/Model/Cart.php
+++ b/app/code/Magento/Checkout/Model/Cart.php
@@ -20,6 +20,7 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @deprecated 100.1.0 Use \Magento\Quote\Model\Quote instead
  * @see \Magento\Quote\Api\Data\CartInterface
+ * @since 100.0.2
  */
 class Cart extends DataObject implements CartInterface
 {
diff --git a/app/code/Magento/Checkout/Model/Cart/CartInterface.php b/app/code/Magento/Checkout/Model/Cart/CartInterface.php
index 40aff1980e787..d8264e5535497 100644
--- a/app/code/Magento/Checkout/Model/Cart/CartInterface.php
+++ b/app/code/Magento/Checkout/Model/Cart/CartInterface.php
@@ -14,6 +14,7 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  * @deprecated 100.1.0 Use \Magento\Quote\Api\Data\CartInterface instead
  * @see \Magento\Quote\Api\Data\CartInterface
+ * @since 100.0.2
  */
 interface CartInterface
 {
diff --git a/app/code/Magento/Checkout/Model/Cart/ImageProvider.php b/app/code/Magento/Checkout/Model/Cart/ImageProvider.php
index cdadf3573c8ec..bc409357bf409 100644
--- a/app/code/Magento/Checkout/Model/Cart/ImageProvider.php
+++ b/app/code/Magento/Checkout/Model/Cart/ImageProvider.php
@@ -10,6 +10,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class ImageProvider
 {
@@ -20,12 +21,15 @@ class ImageProvider
 
     /**
      * @var \Magento\Checkout\CustomerData\ItemPoolInterface
-     * @deprecated No need for the pool as images are resolved in the default item implementation
+     * @deprecated 100.2.7 No need for the pool as images are resolved in the default item implementation
      * @see \Magento\Checkout\CustomerData\DefaultItem::getProductForThumbnail
      */
     protected $itemPool;
 
-    /** @var \Magento\Checkout\CustomerData\DefaultItem */
+    /**
+     * @var \Magento\Checkout\CustomerData\DefaultItem
+     * @since 100.2.7
+     */
     protected $customerDataItem;
 
     /**
diff --git a/app/code/Magento/Checkout/Model/Cart/RequestInfoFilterComposite.php b/app/code/Magento/Checkout/Model/Cart/RequestInfoFilterComposite.php
index f38e15dd628fd..ee68ef9d275b1 100644
--- a/app/code/Magento/Checkout/Model/Cart/RequestInfoFilterComposite.php
+++ b/app/code/Magento/Checkout/Model/Cart/RequestInfoFilterComposite.php
@@ -20,7 +20,6 @@ class RequestInfoFilterComposite implements RequestInfoFilterInterface
 
     /**
      * @param RequestInfoFilter[] $filters
-     * @since 100.1.2
      */
     public function __construct(
         $filters = []
diff --git a/app/code/Magento/Checkout/Model/CompositeConfigProvider.php b/app/code/Magento/Checkout/Model/CompositeConfigProvider.php
index 3577b1a145403..7c6d04f2947a0 100644
--- a/app/code/Magento/Checkout/Model/CompositeConfigProvider.php
+++ b/app/code/Magento/Checkout/Model/CompositeConfigProvider.php
@@ -10,6 +10,7 @@
  *
  * @see \Magento\Checkout\Model\ConfigProviderInterface
  * @api
+ * @since 100.0.2
  */
 class CompositeConfigProvider implements ConfigProviderInterface
 {
diff --git a/app/code/Magento/Checkout/Model/ConfigProviderInterface.php b/app/code/Magento/Checkout/Model/ConfigProviderInterface.php
index 9e15027e26927..58bbc02485642 100644
--- a/app/code/Magento/Checkout/Model/ConfigProviderInterface.php
+++ b/app/code/Magento/Checkout/Model/ConfigProviderInterface.php
@@ -8,6 +8,7 @@
 /**
  * Interface ConfigProviderInterface
  * @api
+ * @since 100.0.2
  */
 interface ConfigProviderInterface
 {
diff --git a/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php b/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
index 1d15a5dd7f176..8b8d2602fbfc7 100644
--- a/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
+++ b/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
@@ -152,7 +152,7 @@ public function getPaymentInformation($cartId)
      * Get logger instance
      *
      * @return \Psr\Log\LoggerInterface
-     * @deprecated 100.2.0
+     * @deprecated 100.1.8
      */
     private function getLogger()
     {
diff --git a/app/code/Magento/Checkout/Model/Layout/AbstractTotalsProcessor.php b/app/code/Magento/Checkout/Model/Layout/AbstractTotalsProcessor.php
index ca577ed714a6e..a670482cb98d6 100644
--- a/app/code/Magento/Checkout/Model/Layout/AbstractTotalsProcessor.php
+++ b/app/code/Magento/Checkout/Model/Layout/AbstractTotalsProcessor.php
@@ -17,6 +17,7 @@
  *
  * phpcs:disable Magento2.Classes.AbstractApi
  * @api
+ * @since 100.0.2
  */
 abstract class AbstractTotalsProcessor
 {
diff --git a/app/code/Magento/Checkout/Model/PaymentInformationManagement.php b/app/code/Magento/Checkout/Model/PaymentInformationManagement.php
index 1f7931d7d3e6a..2f68aba5ec6ae 100644
--- a/app/code/Magento/Checkout/Model/PaymentInformationManagement.php
+++ b/app/code/Magento/Checkout/Model/PaymentInformationManagement.php
@@ -17,7 +17,7 @@ class PaymentInformationManagement implements \Magento\Checkout\Api\PaymentInfor
 {
     /**
      * @var \Magento\Quote\Api\BillingAddressManagementInterface
-     * @deprecated 100.2.0 This call was substituted to eliminate extra quote::save call
+     * @deprecated 100.1.0 This call was substituted to eliminate extra quote::save call
      */
     protected $billingAddressManagement;
 
@@ -152,7 +152,7 @@ public function getPaymentInformation($cartId)
      * Get logger instance
      *
      * @return \Psr\Log\LoggerInterface
-     * @deprecated 100.2.0
+     * @deprecated 100.1.8
      */
     private function getLogger()
     {
diff --git a/app/code/Magento/Checkout/Model/Session.php b/app/code/Magento/Checkout/Model/Session.php
index 7af00f1df8e95..618f745e77105 100644
--- a/app/code/Magento/Checkout/Model/Session.php
+++ b/app/code/Magento/Checkout/Model/Session.php
@@ -20,6 +20,7 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @SuppressWarnings(PHPMD.TooManyFields)
+ * @since 100.0.2
  */
 class Session extends \Magento\Framework\Session\SessionManager
 {
diff --git a/app/code/Magento/Checkout/Model/Session/SuccessValidator.php b/app/code/Magento/Checkout/Model/Session/SuccessValidator.php
index 5858dcba8b902..6bfab606445fb 100644
--- a/app/code/Magento/Checkout/Model/Session/SuccessValidator.php
+++ b/app/code/Magento/Checkout/Model/Session/SuccessValidator.php
@@ -9,6 +9,7 @@
  * Test if checkout session valid for success action
  *
  * @api
+ * @since 100.0.2
  */
 class SuccessValidator
 {
diff --git a/app/code/Magento/CheckoutAgreements/Api/CheckoutAgreementsListInterface.php b/app/code/Magento/CheckoutAgreements/Api/CheckoutAgreementsListInterface.php
index b91701acef04d..a15191244a030 100644
--- a/app/code/Magento/CheckoutAgreements/Api/CheckoutAgreementsListInterface.php
+++ b/app/code/Magento/CheckoutAgreements/Api/CheckoutAgreementsListInterface.php
@@ -13,6 +13,7 @@
  * search filters without predefined limitations.
  *
  * @api
+ * @since 100.3.0
  */
 interface CheckoutAgreementsListInterface
 {
@@ -21,6 +22,7 @@ interface CheckoutAgreementsListInterface
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return \Magento\CheckoutAgreements\Api\Data\AgreementInterface[]
+     * @since 100.3.0
      */
     public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria) : array;
 }
diff --git a/app/code/Magento/CheckoutAgreements/Api/CheckoutAgreementsRepositoryInterface.php b/app/code/Magento/CheckoutAgreements/Api/CheckoutAgreementsRepositoryInterface.php
index 5822b8f082fef..7dc757395a478 100644
--- a/app/code/Magento/CheckoutAgreements/Api/CheckoutAgreementsRepositoryInterface.php
+++ b/app/code/Magento/CheckoutAgreements/Api/CheckoutAgreementsRepositoryInterface.php
@@ -25,7 +25,7 @@ public function get($id, $storeId = null);
      * Lists active checkout agreements.
      *
      * @return \Magento\CheckoutAgreements\Api\Data\AgreementInterface[]
-     * @deprecated
+     * @deprecated 100.3.0
      * @see \Magento\CheckoutAgreements\Api\CheckoutAgreementsListInterface::getList
      */
     public function getList();
diff --git a/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Grid.php b/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Grid.php
index 4a35a58a41ff9..21b318cd00f09 100644
--- a/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Grid.php
+++ b/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Grid.php
@@ -12,7 +12,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
     /**
      * @var \Magento\CheckoutAgreements\Model\ResourceModel\Agreement\CollectionFactory
-     * @deprecated
+     * @deprecated 100.2.2
      */
     protected $_collectionFactory;
 
diff --git a/app/code/Magento/Cms/Api/Data/PageInterface.php b/app/code/Magento/Cms/Api/Data/PageInterface.php
index 7a31ab1b9a94f..402c2ccd289e0 100644
--- a/app/code/Magento/Cms/Api/Data/PageInterface.php
+++ b/app/code/Magento/Cms/Api/Data/PageInterface.php
@@ -125,7 +125,7 @@ public function getSortOrder();
      * Get layout update xml
      *
      * @return string|null
-     * @deprecated Existing updates are applied, new are not accepted.
+     * @deprecated 103.0.4 Existing updates are applied, new are not accepted.
      */
     public function getLayoutUpdateXml();
 
@@ -146,7 +146,7 @@ public function getCustomRootTemplate();
     /**
      * Get custom layout update xml
      *
-     * @deprecated Existing updates are applied, new are not accepted.
+     * @deprecated 103.0.4 Existing updates are applied, new are not accepted.
      * @see \Magento\Cms\Model\Page\CustomLayout\Data\CustomLayoutSelectedInterface
      * @return string|null
      */
@@ -275,7 +275,7 @@ public function setSortOrder($sortOrder);
      *
      * @param string $layoutUpdateXml
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @deprecated Existing updates are applied, new are not accepted.
+     * @deprecated 103.0.4 Existing updates are applied, new are not accepted.
      */
     public function setLayoutUpdateXml($layoutUpdateXml);
 
@@ -300,7 +300,7 @@ public function setCustomRootTemplate($customRootTemplate);
      *
      * @param string $customLayoutUpdateXml
      * @return \Magento\Cms\Api\Data\PageInterface
-     * @deprecated Existing updates are applied, new are not accepted.
+     * @deprecated 103.0.4 Existing updates are applied, new are not accepted.
      * @see \Magento\Cms\Model\Page\CustomLayout\Data\CustomLayoutSelectedInterface
      */
     public function setCustomLayoutUpdateXml($customLayoutUpdateXml);
diff --git a/app/code/Magento/Cms/Api/GetBlockByIdentifierInterface.php b/app/code/Magento/Cms/Api/GetBlockByIdentifierInterface.php
index 7e8bbdc3e8d2f..70fadae42f327 100644
--- a/app/code/Magento/Cms/Api/GetBlockByIdentifierInterface.php
+++ b/app/code/Magento/Cms/Api/GetBlockByIdentifierInterface.php
@@ -8,6 +8,7 @@
 /**
  * Command to load the block data by specified identifier
  * @api
+ * @since 103.0.0
  */
 interface GetBlockByIdentifierInterface
 {
@@ -18,6 +19,7 @@ interface GetBlockByIdentifierInterface
      * @param int $storeId
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @return \Magento\Cms\Api\Data\BlockInterface
+     * @since 103.0.0
      */
     public function execute(string $identifier, int $storeId) : \Magento\Cms\Api\Data\BlockInterface;
 }
diff --git a/app/code/Magento/Cms/Api/GetPageByIdentifierInterface.php b/app/code/Magento/Cms/Api/GetPageByIdentifierInterface.php
index f432f678d3a12..8f47de5266321 100644
--- a/app/code/Magento/Cms/Api/GetPageByIdentifierInterface.php
+++ b/app/code/Magento/Cms/Api/GetPageByIdentifierInterface.php
@@ -8,6 +8,7 @@
 /**
  * Command to load the page data by specified identifier
  * @api
+ * @since 103.0.0
  */
 interface GetPageByIdentifierInterface
 {
@@ -18,6 +19,7 @@ interface GetPageByIdentifierInterface
      * @param int $storeId
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @return \Magento\Cms\Api\Data\PageInterface
+     * @since 103.0.0
      */
     public function execute(string $identifier, int $storeId) : \Magento\Cms\Api\Data\PageInterface;
 }
diff --git a/app/code/Magento/Cms/Api/GetUtilityPageIdentifiersInterface.php b/app/code/Magento/Cms/Api/GetUtilityPageIdentifiersInterface.php
index c6bf4c8404701..07c5f5c8a9e07 100644
--- a/app/code/Magento/Cms/Api/GetUtilityPageIdentifiersInterface.php
+++ b/app/code/Magento/Cms/Api/GetUtilityPageIdentifiersInterface.php
@@ -9,12 +9,14 @@
  * Utility Cms Pages
  *
  * @api
+ * @since 102.0.4
  */
 interface GetUtilityPageIdentifiersInterface
 {
     /**
      * Get List Page Identifiers
      * @return array
+     * @since 102.0.4
      */
     public function execute();
 }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php
index f1862026f0e35..71b620a1632ca 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php
@@ -79,7 +79,7 @@ public function filter($data)
      *
      * @param array $data
      * @return bool     Return FALSE if some item is invalid
-     * @deprecated
+     * @deprecated 103.0.2
      */
     public function validate($data)
     {
diff --git a/app/code/Magento/Cms/Model/BlockRepository.php b/app/code/Magento/Cms/Model/BlockRepository.php
index fa29cc9ff7631..d0df0d2b31caa 100644
--- a/app/code/Magento/Cms/Model/BlockRepository.php
+++ b/app/code/Magento/Cms/Model/BlockRepository.php
@@ -196,7 +196,7 @@ public function deleteById($blockId)
     /**
      * Retrieve collection processor
      *
-     * @deprecated 101.1.0
+     * @deprecated 102.0.0
      * @return CollectionProcessorInterface
      */
     private function getCollectionProcessor()
diff --git a/app/code/Magento/Cms/Model/Page/Source/PageLayout.php b/app/code/Magento/Cms/Model/Page/Source/PageLayout.php
index 23a452c0fe58c..3413aa7b0dd6c 100644
--- a/app/code/Magento/Cms/Model/Page/Source/PageLayout.php
+++ b/app/code/Magento/Cms/Model/Page/Source/PageLayout.php
@@ -20,7 +20,7 @@ class PageLayout implements OptionSourceInterface
 
     /**
      * @var array
-     * @deprecated since the cache is now handled by \Magento\Theme\Model\PageLayout\Config\Builder::$configFiles
+     * @deprecated 103.0.1 since the cache is now handled by \Magento\Theme\Model\PageLayout\Config\Builder::$configFiles
      */
     protected $options;
 
diff --git a/app/code/Magento/Cms/Model/PageRepository.php b/app/code/Magento/Cms/Model/PageRepository.php
index 2de44b6691274..0439fbcd2f799 100644
--- a/app/code/Magento/Cms/Model/PageRepository.php
+++ b/app/code/Magento/Cms/Model/PageRepository.php
@@ -256,7 +256,7 @@ public function deleteById($pageId)
     /**
      * Retrieve collection processor
      *
-     * @deprecated 101.1.0
+     * @deprecated 102.0.0
      * @return CollectionProcessorInterface
      */
     private function getCollectionProcessor()
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Config.php b/app/code/Magento/Cms/Model/Wysiwyg/Config.php
index 1da7b99c6d886..95f5971251f1c 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Config.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Config.php
@@ -61,14 +61,14 @@ class Config extends \Magento\Framework\DataObject implements ConfigInterface
 
     /**
      * @var \Magento\Variable\Model\Variable\Config
-     * @deprecated
+     * @deprecated 103.0.0
      * @see \Magento\Cms\Model\ConfigProvider::processVariableConfig
      */
     protected $_variableConfig;
 
     /**
      * @var \Magento\Widget\Model\Widget\Config
-     * @deprecated
+     * @deprecated 103.0.0
      * @see \Magento\Cms\Model\ConfigProvider::processWidgetConfig
      */
     protected $_widgetConfig;
diff --git a/app/code/Magento/Config/App/Config/Source/EnvironmentConfigSource.php b/app/code/Magento/Config/App/Config/Source/EnvironmentConfigSource.php
index d2b87b1ae2841..10f9af9268ae6 100644
--- a/app/code/Magento/Config/App/Config/Source/EnvironmentConfigSource.php
+++ b/app/code/Magento/Config/App/Config/Source/EnvironmentConfigSource.php
@@ -15,7 +15,7 @@
  * Class for retrieving configurations from environment variables.
  *
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 class EnvironmentConfigSource implements ConfigSourceInterface
 {
@@ -47,7 +47,7 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function get($path = '')
     {
diff --git a/app/code/Magento/Config/App/Config/Source/InitialSnapshotConfigSource.php b/app/code/Magento/Config/App/Config/Source/InitialSnapshotConfigSource.php
index 40978320797d4..a22639ec51641 100644
--- a/app/code/Magento/Config/App/Config/Source/InitialSnapshotConfigSource.php
+++ b/app/code/Magento/Config/App/Config/Source/InitialSnapshotConfigSource.php
@@ -12,7 +12,7 @@
 /**
  * The source with previously imported configuration.
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 class InitialSnapshotConfigSource implements ConfigSourceInterface
 {
@@ -45,7 +45,7 @@ public function __construct(FlagManager $flagManager, DataObjectFactory $dataObj
      * Snapshots are stored in flags.
      *
      * {@inheritdoc}
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function get($path = '')
     {
diff --git a/app/code/Magento/Config/Block/System/Config/Edit.php b/app/code/Magento/Config/Block/System/Config/Edit.php
index ba27cb33b20f0..7955f28f59f4e 100644
--- a/app/code/Magento/Config/Block/System/Config/Edit.php
+++ b/app/code/Magento/Config/Block/System/Config/Edit.php
@@ -121,6 +121,7 @@ public function getSaveUrl()
 
     /**
      * @return string
+     * @since 101.1.0
      */
     public function getConfigSearchParamsJson()
     {
diff --git a/app/code/Magento/Config/Block/System/Config/Form.php b/app/code/Magento/Config/Block/System/Config/Form.php
index 8378c058c1955..8e07ef8b45203 100644
--- a/app/code/Magento/Config/Block/System/Config/Form.php
+++ b/app/code/Magento/Config/Block/System/Config/Form.php
@@ -838,10 +838,10 @@ private function getAppConfigDataValue($path)
      * Gets instance of ElementVisibilityInterface.
      *
      * @return ElementVisibilityInterface
-     * @deprecated 100.2.0 Added to not break backward compatibility of the constructor signature
+     * @deprecated 101.0.0 Added to not break backward compatibility of the constructor signature
      *             by injecting the new dependency directly.
      *             The method can be removed in a future major release, when constructor signature can be changed.
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getElementVisibility()
     {
diff --git a/app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php b/app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php
index 3bb4632ee4517..cc6b7e4b441dc 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php
@@ -282,7 +282,7 @@ public function getColumns()
 
     /**
      * @return string
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getAddButtonLabel()
     {
diff --git a/app/code/Magento/Config/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php b/app/code/Magento/Config/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php
index 99fa7b5addee8..4c2e6873d9593 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php
@@ -10,7 +10,7 @@
  * on the store settings page.
  *
  * @method \Magento\Config\Block\System\Config\Form getForm()
- * @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
+ * @deprecated 101.0.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
  * version. Module output can still be enabled/disabled in configuration files. However, this functionality should
  * not be used in future development. Module design should explicitly state dependencies to avoid requiring output
  * disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
@@ -22,25 +22,25 @@ class DisableOutput extends \Magento\Config\Block\System\Config\Form\Fieldset
 {
     /**
      * @var \Magento\Framework\DataObject
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected $_dummyElement;
 
     /**
      * @var \Magento\Config\Block\System\Config\Form\Field
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected $_fieldRenderer;
 
     /**
      * @var array
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected $_values;
 
     /**
      * @var \Magento\Framework\Module\ModuleListInterface
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected $_moduleList;
 
@@ -64,7 +64,7 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
+     * @deprecated 101.0.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
      * version. Module output can still be enabled/disabled in configuration files. However, this functionality should
      * not be used in future development. Module design should explicitly state dependencies to avoid requiring output
      * disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
@@ -97,7 +97,7 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
     }
 
     /**
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @return \Magento\Framework\DataObject
      */
     protected function _getDummyElement()
@@ -109,7 +109,7 @@ protected function _getDummyElement()
     }
 
     /**
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @return \Magento\Config\Block\System\Config\Form\Field
      */
     protected function _getFieldRenderer()
@@ -123,7 +123,7 @@ protected function _getFieldRenderer()
     }
 
     /**
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @return array
      */
     protected function _getValues()
@@ -140,7 +140,7 @@ protected function _getValues()
     /**
      * @param \Magento\Framework\Data\Form\Element\Fieldset $fieldset
      * @param string $moduleName
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @return mixed
      */
     protected function _getFieldHtml($fieldset, $moduleName)
diff --git a/app/code/Magento/Config/Console/Command/ConfigSet/ConfigSetProcessorFactory.php b/app/code/Magento/Config/Console/Command/ConfigSet/ConfigSetProcessorFactory.php
index 1b287573a9285..e95797658bb33 100644
--- a/app/code/Magento/Config/Console/Command/ConfigSet/ConfigSetProcessorFactory.php
+++ b/app/code/Magento/Config/Console/Command/ConfigSet/ConfigSetProcessorFactory.php
@@ -17,7 +17,7 @@
  * @see ConfigSetCommand
  *
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 class ConfigSetProcessorFactory
 {
@@ -68,7 +68,7 @@ public function __construct(
      * @return ConfigSetProcessorInterface New processor instance
      * @throws ConfigurationMismatchException If processor type is not exists in processors array
      * or declared class has wrong implementation
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function create($processorName)
     {
diff --git a/app/code/Magento/Config/Console/Command/ConfigSet/ConfigSetProcessorInterface.php b/app/code/Magento/Config/Console/Command/ConfigSet/ConfigSetProcessorInterface.php
index 01aa03b188e62..0abebb604d36f 100644
--- a/app/code/Magento/Config/Console/Command/ConfigSet/ConfigSetProcessorInterface.php
+++ b/app/code/Magento/Config/Console/Command/ConfigSet/ConfigSetProcessorInterface.php
@@ -14,7 +14,7 @@
  * @see ConfigSetCommand
  *
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 interface ConfigSetProcessorInterface
 {
@@ -27,7 +27,7 @@ interface ConfigSetProcessorInterface
      * @param string $scopeCode The scope code
      * @return void
      * @throws CouldNotSaveException An exception on processing error
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function process($path, $value, $scope, $scopeCode);
 }
diff --git a/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php b/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
index c622a48b7f2c8..d49d65774d0d2 100644
--- a/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
+++ b/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
@@ -21,7 +21,7 @@
  *
  * @inheritdoc
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 class DefaultProcessor implements ConfigSetProcessorInterface
 {
@@ -76,7 +76,7 @@ public function __construct(
      * Requires installed application.
      *
      * @inheritdoc
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function process($path, $value, $scope, $scopeCode)
     {
diff --git a/app/code/Magento/Config/Console/Command/ConfigSet/ProcessorFacade.php b/app/code/Magento/Config/Console/Command/ConfigSet/ProcessorFacade.php
index fcd7c0d5335b1..aa33c96c7e0e2 100644
--- a/app/code/Magento/Config/Console/Command/ConfigSet/ProcessorFacade.php
+++ b/app/code/Magento/Config/Console/Command/ConfigSet/ProcessorFacade.php
@@ -24,7 +24,7 @@
  * @see ConfigSetCommand
  *
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 class ProcessorFacade
 {
@@ -99,8 +99,8 @@ public function __construct(
      * @param boolean $lock The lock flag
      * @return string Processor response message
      * @throws ValidatorException If some validation is wrong
-     * @since 100.2.0
-     * @deprecated
+     * @since 101.0.0
+     * @deprecated 101.0.4
      * @see processWithLockTarget()
      */
     public function process($path, $value, $scope, $scopeCode, $lock)
@@ -119,6 +119,7 @@ public function process($path, $value, $scope, $scopeCode, $lock)
      * @param string $lockTarget
      * @return string Processor response message
      * @throws ValidatorException If some validation is wrong
+     * @since 101.0.4
      */
     public function processWithLockTarget(
         $path,
diff --git a/app/code/Magento/Config/Console/Command/ConfigSetCommand.php b/app/code/Magento/Config/Console/Command/ConfigSetCommand.php
index 999d8e41af5bc..f278a07cc6806 100644
--- a/app/code/Magento/Config/Console/Command/ConfigSetCommand.php
+++ b/app/code/Magento/Config/Console/Command/ConfigSetCommand.php
@@ -24,7 +24,7 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @since 100.2.0
+ * @since 101.0.0
  */
 class ConfigSetCommand extends Command
 {
@@ -86,7 +86,7 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 100.2.0
+     * @since 101.0.0
      */
     protected function configure()
     {
@@ -141,7 +141,7 @@ protected function configure()
      *
      * @param InputInterface $input
      * @param OutputInterface $output
-     * @since 100.2.0
+     * @since 101.0.0
      * @return int|null
      */
     protected function execute(InputInterface $input, OutputInterface $output)
diff --git a/app/code/Magento/Config/Console/Command/ConfigShow/ValueProcessor.php b/app/code/Magento/Config/Console/Command/ConfigShow/ValueProcessor.php
index aeb57010e4969..2465eecec71dc 100644
--- a/app/code/Magento/Config/Console/Command/ConfigShow/ValueProcessor.php
+++ b/app/code/Magento/Config/Console/Command/ConfigShow/ValueProcessor.php
@@ -19,7 +19,7 @@
  * Class processes values using backend model which declared in system.xml.
  *
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 class ValueProcessor
 {
@@ -83,7 +83,7 @@ public function __construct(
      * @param string $value The value to process
      * @param string $path The configuration path for getting backend model. E.g. scope_id/group_id/field_id
      * @return string processed value result
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function process($scope, $scopeCode, $value, $path)
     {
diff --git a/app/code/Magento/Config/Console/Command/ConfigShowCommand.php b/app/code/Magento/Config/Console/Command/ConfigShowCommand.php
index 2d3dabdb24e67..50214d38d2d35 100644
--- a/app/code/Magento/Config/Console/Command/ConfigShowCommand.php
+++ b/app/code/Magento/Config/Console/Command/ConfigShowCommand.php
@@ -21,7 +21,7 @@
  * Command provides possibility to show saved system configuration.
  *
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 class ConfigShowCommand extends Command
 {
@@ -100,7 +100,7 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 100.2.0
+     * @since 101.0.0
      */
     protected function configure()
     {
@@ -137,7 +137,7 @@ protected function configure()
      * or scope/scope-code doesn't pass validation.
      *
      * {@inheritdoc}
-     * @since 100.2.0
+     * @since 101.0.0
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/AbstractConfig.php b/app/code/Magento/Config/Controller/Adminhtml/System/AbstractConfig.php
index 274ee3b8d2a6e..c644ec8eb15cc 100644
--- a/app/code/Magento/Config/Controller/Adminhtml/System/AbstractConfig.php
+++ b/app/code/Magento/Config/Controller/Adminhtml/System/AbstractConfig.php
@@ -31,7 +31,7 @@ abstract class AbstractConfig extends \Magento\Backend\App\AbstractAction
     protected $_configStructure;
 
     /**
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected $_sectionChecker;
 
diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/ConfigSectionChecker.php b/app/code/Magento/Config/Controller/Adminhtml/System/ConfigSectionChecker.php
index 0af19b83a5a3f..b656498e97dba 100644
--- a/app/code/Magento/Config/Controller/Adminhtml/System/ConfigSectionChecker.php
+++ b/app/code/Magento/Config/Controller/Adminhtml/System/ConfigSectionChecker.php
@@ -9,7 +9,7 @@
 use Magento\Framework\Exception\NotFoundException;
 
 /**
- * @deprecated 100.2.0 - unused class.
+ * @deprecated 101.0.0 - unused class.
  * @see \Magento\Config\Model\Config\Structure\Element\Section::isAllowed()
  */
 class ConfigSectionChecker
diff --git a/app/code/Magento/Config/Model/Config/Backend/Admin/Robots.php b/app/code/Magento/Config/Model/Config/Backend/Admin/Robots.php
index 7bbbafe826422..e6acd431be3d5 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Admin/Robots.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Admin/Robots.php
@@ -13,7 +13,7 @@
 use Magento\Framework\App\ObjectManager;
 
 /**
- * @deprecated 100.2.0 robots.txt file is no longer stored in filesystem. It generates as response on request.
+ * @deprecated 100.1.7 robots.txt file is no longer stored in filesystem. It generates as response on request.
  */
 class Robots extends \Magento\Framework\App\Config\Value
 {
diff --git a/app/code/Magento/Config/Model/Config/Backend/Baseurl.php b/app/code/Magento/Config/Model/Config/Backend/Baseurl.php
index a218d2b0d07e6..5e43e53f1b64f 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Baseurl.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Baseurl.php
@@ -231,7 +231,7 @@ public function afterSave()
     /**
      * Get URL Validator
      *
-     * @deprecated 100.2.0
+     * @deprecated 100.1.12
      * @return UrlValidator
      */
     private function getUrlValidator()
diff --git a/app/code/Magento/Config/Model/Config/Backend/Currency/Allow.php b/app/code/Magento/Config/Model/Config/Backend/Currency/Allow.php
index 7ff1d367c5e58..b0db20e2fb25a 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Currency/Allow.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Currency/Allow.php
@@ -81,7 +81,7 @@ public function afterSave()
 
     /**
      * @inheritdoc
-     * @since 100.2.0
+     * @since 101.0.0
      */
     protected function _getAllowedCurrencies()
     {
diff --git a/app/code/Magento/Config/Model/Config/Export/ExcludeList.php b/app/code/Magento/Config/Model/Config/Export/ExcludeList.php
index e556c42f66a99..e7efb5ac50b79 100644
--- a/app/code/Magento/Config/Model/Config/Export/ExcludeList.php
+++ b/app/code/Magento/Config/Model/Config/Export/ExcludeList.php
@@ -8,7 +8,7 @@
 /**
  * Class ExcludeList contains list of config fields which should be excluded from config export file.
  *
- * @deprecated 100.2.0 because in Magento since version 2.2.0 there are several
+ * @deprecated 101.0.0 because in Magento since version 2.2.0 there are several
  * types for configuration fields that require special processing.
  * @see \Magento\Config\Model\Config\TypePool
  */
@@ -32,7 +32,7 @@ public function __construct(array $configs = [])
      *
      * @param string $path
      * @return bool
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     public function isPresent($path)
     {
@@ -43,7 +43,7 @@ public function isPresent($path)
      * Retrieves all excluded field paths for export
      *
      * @return array
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     public function get()
     {
diff --git a/app/code/Magento/Config/Model/Config/Importer.php b/app/code/Magento/Config/Model/Config/Importer.php
index a54af2ead5048..a870b5f2403c3 100644
--- a/app/code/Magento/Config/Model/Config/Importer.php
+++ b/app/code/Magento/Config/Model/Config/Importer.php
@@ -23,7 +23,7 @@
  * {@inheritdoc}
  * @see \Magento\Deploy\Console\Command\App\ConfigImport\Importer
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 class Importer implements ImporterInterface
 {
@@ -103,7 +103,7 @@ public function __construct(
      * or current value is different from previously imported.
      *
      * {@inheritdoc}
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function import(array $data)
     {
@@ -145,7 +145,7 @@ public function import(array $data)
     /**
      * @inheritdoc
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getWarningMessages(array $data)
     {
diff --git a/app/code/Magento/Config/Model/Config/Parser/Comment.php b/app/code/Magento/Config/Model/Config/Parser/Comment.php
index b46b2308f8df5..4a749ba030d80 100644
--- a/app/code/Magento/Config/Model/Config/Parser/Comment.php
+++ b/app/code/Magento/Config/Model/Config/Parser/Comment.php
@@ -19,7 +19,7 @@
  * It is used to parse config paths from
  * comment section in provided configuration file.
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 class Comment implements CommentParserInterface
 {
@@ -84,7 +84,7 @@ public function __construct(
      * @param string $fileName the basename of file
      * @return array
      * @throws FileSystemException
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function execute($fileName)
     {
diff --git a/app/code/Magento/Config/Model/Config/PathValidator.php b/app/code/Magento/Config/Model/Config/PathValidator.php
index 68363bef69d91..bc4f863b7b05f 100644
--- a/app/code/Magento/Config/Model/Config/PathValidator.php
+++ b/app/code/Magento/Config/Model/Config/PathValidator.php
@@ -11,7 +11,7 @@
 /**
  * Validates the config path by config structure schema.
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 class PathValidator
 {
@@ -36,7 +36,7 @@ public function __construct(Structure $structure)
      * @param string $path The config path
      * @return true The result of validation
      * @throws ValidatorException If provided path is not valid
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function validate($path)
     {
diff --git a/app/code/Magento/Config/Model/Config/Reader/Source/Deployed/DocumentRoot.php b/app/code/Magento/Config/Model/Config/Reader/Source/Deployed/DocumentRoot.php
index 5f8dc3f7ab4a7..bf59c729790a7 100644
--- a/app/code/Magento/Config/Model/Config/Reader/Source/Deployed/DocumentRoot.php
+++ b/app/code/Magento/Config/Model/Config/Reader/Source/Deployed/DocumentRoot.php
@@ -14,7 +14,7 @@
  * Class DocumentRoot
  * @package Magento\Config\Model\Config\Reader\Source\Deployed
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 class DocumentRoot
 {
@@ -37,7 +37,7 @@ public function __construct(DeploymentConfig $config)
      * deployment configuration.
      *
      * @return string
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getPath()
     {
@@ -50,7 +50,7 @@ public function getPath()
      * likely be extended to control other areas).
      *
      * @return bool
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function isPub()
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure.php b/app/code/Magento/Config/Model/Config/Structure.php
index a16920f0dc527..437aca04ec577 100644
--- a/app/code/Magento/Config/Model/Config/Structure.php
+++ b/app/code/Magento/Config/Model/Config/Structure.php
@@ -185,7 +185,7 @@ public function getElement($path)
      *
      * @param string $path The configuration path
      * @return \Magento\Config\Model\Config\Structure\ElementInterface|null
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getElementByConfigPath($path)
     {
@@ -369,7 +369,7 @@ protected function _getGroupFieldPathsByAttribute(array $fields, $parentPath, $a
      * ```
      *
      * @return array An array of config path to config structure path map
-     * @since 100.2.0
+     * @since 100.1.12
      */
     public function getFieldPaths()
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/AbstractElement.php b/app/code/Magento/Config/Model/Config/Structure/AbstractElement.php
index c4a0cb5e886d9..8ce5c7f5f13d2 100644
--- a/app/code/Magento/Config/Model/Config/Structure/AbstractElement.php
+++ b/app/code/Magento/Config/Model/Config/Structure/AbstractElement.php
@@ -225,10 +225,10 @@ public function getPath($fieldPrefix = '')
      * Get instance of ElementVisibilityInterface.
      *
      * @return ElementVisibilityInterface
-     * @deprecated 100.2.0 Added to not break backward compatibility of the constructor signature
+     * @deprecated 101.0.0 Added to not break backward compatibility of the constructor signature
      *             by injecting the new dependency directly.
      *             The method can be removed in a future major release, when constructor signature can be changed.
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getElementVisibility()
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/ConcealInProductionConfigList.php b/app/code/Magento/Config/Model/Config/Structure/ConcealInProductionConfigList.php
index 252042a41cc1d..568adceda9430 100644
--- a/app/code/Magento/Config/Model/Config/Structure/ConcealInProductionConfigList.php
+++ b/app/code/Magento/Config/Model/Config/Structure/ConcealInProductionConfigList.php
@@ -11,8 +11,9 @@
  * Defines status of visibility of form elements on Stores > Settings > Configuration page
  * in Admin Panel in Production mode.
  * @api
- * @deprecated class location was changed
+ * @deprecated 101.0.6 class location was changed
  * @see \Magento\Config\Model\Config\Structure\ElementVisibility\ConcealInProduction
+ * @since 101.0.0
  */
 class ConcealInProductionConfigList implements ElementVisibilityInterface
 {
@@ -55,7 +56,8 @@ public function __construct(State $state, array $configs = [])
 
     /**
      * @inheritdoc
-     * @deprecated
+     * @deprecated 101.0.6
+     * @since 101.0.0
      */
     public function isHidden($path)
     {
@@ -68,7 +70,8 @@ public function isHidden($path)
 
     /**
      * @inheritdoc
-     * @deprecated
+     * @deprecated 101.0.6
+     * @since 101.0.0
      */
     public function isDisabled($path)
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/ElementInterface.php b/app/code/Magento/Config/Model/Config/Structure/ElementInterface.php
index 5ba6221601725..b29887219a258 100644
--- a/app/code/Magento/Config/Model/Config/Structure/ElementInterface.php
+++ b/app/code/Magento/Config/Model/Config/Structure/ElementInterface.php
@@ -10,7 +10,7 @@
 /**
  * @api
  * @since 100.0.2
- * @deprecated
+ * @deprecated 101.1.0
  * @see StructureElementInterface
  */
 interface ElementInterface
diff --git a/app/code/Magento/Config/Model/Config/Structure/ElementVisibility/ConcealInProduction.php b/app/code/Magento/Config/Model/Config/Structure/ElementVisibility/ConcealInProduction.php
index ec57d629e61da..c5a0b6127f122 100644
--- a/app/code/Magento/Config/Model/Config/Structure/ElementVisibility/ConcealInProduction.php
+++ b/app/code/Magento/Config/Model/Config/Structure/ElementVisibility/ConcealInProduction.php
@@ -16,6 +16,7 @@
  * Defines status of visibility of form elements on Stores > Settings > Configuration page
  * in Admin Panel in Production mode.
  * @api
+ * @since 101.0.6
  */
 class ConcealInProduction implements ElementVisibilityInterface
 {
@@ -80,7 +81,7 @@ public function __construct(State $state, array $configs = [], array $exemptions
 
     /**
      * @inheritdoc
-     * @since 100.2.0
+     * @since 101.0.6
      */
     public function isHidden($path)
     {
@@ -105,7 +106,7 @@ public function isHidden($path)
 
     /**
      * @inheritdoc
-     * @since 100.2.0
+     * @since 101.0.6
      */
     public function isDisabled($path)
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/ElementVisibility/ConcealInProductionWithoutScdOnDemand.php b/app/code/Magento/Config/Model/Config/Structure/ElementVisibility/ConcealInProductionWithoutScdOnDemand.php
index 29148a244dcc6..ee6be789232e8 100644
--- a/app/code/Magento/Config/Model/Config/Structure/ElementVisibility/ConcealInProductionWithoutScdOnDemand.php
+++ b/app/code/Magento/Config/Model/Config/Structure/ElementVisibility/ConcealInProductionWithoutScdOnDemand.php
@@ -18,6 +18,7 @@
  * @see \Magento\Config\Model\Config\Structure\ElementVisibility\ConcealInProduction
  *
  * @api
+ * @since 101.0.6
  */
 class ConcealInProductionWithoutScdOnDemand implements ElementVisibilityInterface
 {
@@ -50,6 +51,7 @@ public function __construct(
 
     /**
      * @inheritdoc
+     * @since 101.0.6
      */
     public function isHidden($path): bool
     {
@@ -61,6 +63,7 @@ public function isHidden($path): bool
 
     /**
      * @inheritdoc
+     * @since 101.0.6
      */
     public function isDisabled($path): bool
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/ElementVisibilityComposite.php b/app/code/Magento/Config/Model/Config/Structure/ElementVisibilityComposite.php
index 23074297e6323..e5b60c596d713 100644
--- a/app/code/Magento/Config/Model/Config/Structure/ElementVisibilityComposite.php
+++ b/app/code/Magento/Config/Model/Config/Structure/ElementVisibilityComposite.php
@@ -11,7 +11,7 @@
  * Contains list of classes which implement ElementVisibilityInterface for
  * checking of visibility of form elements on Stores > Settings > Configuration page in Admin Panel.
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 class ElementVisibilityComposite implements ElementVisibilityInterface
 {
@@ -49,7 +49,7 @@ public function __construct(array $visibility = [])
 
     /**
      * @inheritdoc
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function isHidden($path)
     {
@@ -64,7 +64,7 @@ public function isHidden($path)
 
     /**
      * @inheritdoc
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function isDisabled($path)
     {
diff --git a/app/code/Magento/Config/Model/Config/Structure/ElementVisibilityInterface.php b/app/code/Magento/Config/Model/Config/Structure/ElementVisibilityInterface.php
index 21dff52843765..a11a549eebc35 100644
--- a/app/code/Magento/Config/Model/Config/Structure/ElementVisibilityInterface.php
+++ b/app/code/Magento/Config/Model/Config/Structure/ElementVisibilityInterface.php
@@ -9,7 +9,7 @@
  * Checks visibility status of form elements on Stores > Settings > Configuration page in Admin Panel
  * by their paths in the system.xml structure.
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 interface ElementVisibilityInterface
 {
@@ -25,7 +25,7 @@ interface ElementVisibilityInterface
      *
      * @param string $path The path of form element in the system.xml structure
      * @return bool
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function isDisabled($path);
 
@@ -34,7 +34,7 @@ public function isDisabled($path);
      *
      * @param string $path The path of form element in the system.xml structure
      * @return bool
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function isHidden($path);
 }
diff --git a/app/code/Magento/Config/Model/Config/StructureElementInterface.php b/app/code/Magento/Config/Model/Config/StructureElementInterface.php
index 946d6e3c766a4..e1e855d37325b 100644
--- a/app/code/Magento/Config/Model/Config/StructureElementInterface.php
+++ b/app/code/Magento/Config/Model/Config/StructureElementInterface.php
@@ -7,6 +7,7 @@
 
 /**
  * @api
+ * @since 101.1.0
  */
 interface StructureElementInterface extends Structure\ElementInterface
 {
@@ -15,6 +16,7 @@ interface StructureElementInterface extends Structure\ElementInterface
      *
      * @param string $fieldPrefix
      * @return string
+     * @since 101.1.0
      */
     public function getPath($fieldPrefix = '');
 }
diff --git a/app/code/Magento/Config/Model/Config/TypePool.php b/app/code/Magento/Config/Model/Config/TypePool.php
index e41ff8e88a595..9080db81d1f55 100644
--- a/app/code/Magento/Config/Model/Config/TypePool.php
+++ b/app/code/Magento/Config/Model/Config/TypePool.php
@@ -13,7 +13,7 @@
  * Used when you need to know if the configuration path belongs to a certain type.
  * Participates in the mechanism for creating the configuration dump file.
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 class TypePool
 {
@@ -52,7 +52,7 @@ class TypePool
      * Checks if the configuration path is contained in exclude list.
      *
      * @var ExcludeList
-     * @deprecated 100.2.0 We use it only to support backward compatibility. If some configurations
+     * @deprecated 101.0.0 We use it only to support backward compatibility. If some configurations
      *             were set to this list before, we need to read them.
      *             It will be supported for next 2 minor releases or until a major release.
      *             TypePool should be used to mark configurations with types.
@@ -83,7 +83,7 @@ public function __construct(array $sensitive = [], array $environment = [], Excl
      * @param string $path Configuration field path. For example, 'contact/email/recipient_email'
      * @param string $type Type of configuration fields
      * @return bool True when the path belongs to requested type, false otherwise
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function isPresent($path, $type)
     {
diff --git a/app/code/Magento/Config/Model/PreparedValueFactory.php b/app/code/Magento/Config/Model/PreparedValueFactory.php
index 19d607ad3dc1a..c86c0a820e86c 100644
--- a/app/code/Magento/Config/Model/PreparedValueFactory.php
+++ b/app/code/Magento/Config/Model/PreparedValueFactory.php
@@ -21,7 +21,7 @@
  *
  * @see ValueInterface
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 class PreparedValueFactory
 {
@@ -92,7 +92,7 @@ public function __construct(
      * @return ValueInterface
      * @throws RuntimeException If Value can not be created
      * @see ValueInterface
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function create($path, $value, $scope, $scopeCode = null)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php
index 77110975401ff..a73e7e7277d34 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php
@@ -75,6 +75,7 @@ public function getIdentities()
      * Get price for exact simple product added to cart
      *
      * @inheritdoc
+     * @since 100.3.1
      */
     public function getProductPriceHtml(\Magento\Catalog\Model\Product $product)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
index 55c0c8f6ca4ce..636ff85d12e24 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
@@ -35,7 +35,7 @@ class Configurable extends \Magento\Catalog\Block\Product\View\AbstractView
     /**
      * Current customer
      *
-     * @deprecated 100.2.0, as unused property
+     * @deprecated 100.2.0 as unused property
      * @var CurrentCustomer
      */
     protected $currentCustomer;
@@ -134,7 +134,7 @@ public function __construct(
      * Get cache key informative items.
      *
      * @return array
-     * @since 100.2.0
+     * @since 100.1.10
      */
     public function getCacheKeyInfo()
     {
@@ -253,7 +253,7 @@ public function getJsonConfig()
      * Get product images for configurable variations
      *
      * @return array
-     * @since 100.2.0
+     * @since 100.1.10
      */
     protected function getOptionImages()
     {
@@ -332,7 +332,7 @@ protected function getOptionPrices()
     /**
      * Replace ',' on '.' for js
      *
-     * @deprecated 100.2.0 Will be removed in major release
+     * @deprecated 100.1.10 Will be removed in major release
      * @param float $price
      * @return string
      */
@@ -345,7 +345,7 @@ protected function _registerJsPrice($price)
      * Should we generate "As low as" block or not
      *
      * @return bool
-     * @since 100.2.0
+     * @since 100.1.10
      */
     public function showMinimalPrice()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/AttributeOptionProviderInterface.php b/app/code/Magento/ConfigurableProduct/Model/AttributeOptionProviderInterface.php
index ca289122a2126..e9e91485ea7a5 100644
--- a/app/code/Magento/ConfigurableProduct/Model/AttributeOptionProviderInterface.php
+++ b/app/code/Magento/ConfigurableProduct/Model/AttributeOptionProviderInterface.php
@@ -8,7 +8,7 @@
 /**
  * Interface to retrieve options for attribute
  * @api
- * @since 100.2.0
+ * @since 100.1.11
  */
 interface AttributeOptionProviderInterface
 {
@@ -18,7 +18,7 @@ interface AttributeOptionProviderInterface
      * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute
      * @param int $productId
      * @return array
-     * @since 100.2.0
+     * @since 100.1.11
      */
     public function getAttributeOptions(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute, $productId);
 }
diff --git a/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php b/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
index 890564fdb303c..c7217dc9df80a 100644
--- a/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
+++ b/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
@@ -199,7 +199,7 @@ public function removeChild($sku, $childSku)
      *
      * @return \Magento\ConfigurableProduct\Helper\Product\Options\Factory
      *
-     * @deprecated 100.1.2
+     * @deprecated 100.2.0
      */
     private function getOptionsFactory()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
index 1b3ecfb1d222a..c2ae381b345c6 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
@@ -106,6 +106,7 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
      * Local cache
      *
      * @var array
+     * @since 100.4.0
      */
     protected $isSaleableBySku = [];
 
@@ -591,6 +592,7 @@ protected function getGalleryReadHandler()
      *
      * @param  \Magento\Catalog\Model\Product $product
      * @return \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\Collection
+     * @since 100.4.0
      */
     protected function getLinkedProductCollection($product)
     {
@@ -1266,7 +1268,7 @@ private function getCatalogConfig()
 
     /**
      * @inheritdoc
-     * @since 100.2.0
+     * @since 100.1.11
      */
     public function isPossibleBuyFromList($product)
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php
index 57f701721a6f3..0ced38c4a6923 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php
@@ -41,7 +41,7 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Product instance
      *
      * @var \Magento\Catalog\Model\Product
-     * @deprecated Now collection supports fetching options for multiple products. This field will be set to first
+     * @deprecated 100.3.0 Now collection supports fetching options for multiple products. This field will be set to first
      * element of products array.
      */
     protected $_product;
@@ -174,6 +174,7 @@ public function getStoreId()
      *
      * @return $this
      * @throws \Exception
+     * @since 100.3.0
      */
     protected function _beforeLoad()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php
index b76954075bcde..ae591474cd13e 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php
@@ -74,6 +74,7 @@ public function setProductFilter($product)
      * Add parent ids to `in` filter before load.
      *
      * @return $this
+     * @since 100.3.0
      */
     protected function _renderFilters()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurablePriceResolver.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurablePriceResolver.php
index 5581fcc07b861..af9e6e7bdebcd 100644
--- a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurablePriceResolver.php
+++ b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurablePriceResolver.php
@@ -19,13 +19,13 @@ class ConfigurablePriceResolver implements PriceResolverInterface
 
     /**
      * @var PriceCurrencyInterface
-     * @deprecated 100.1.1
+     * @deprecated 100.0.2
      */
     protected $priceCurrency;
 
     /**
      * @var Configurable
-     * @deprecated 100.1.1
+     * @deprecated 100.0.2
      */
     protected $configurable;
 
diff --git a/app/code/Magento/Cookie/Helper/Cookie.php b/app/code/Magento/Cookie/Helper/Cookie.php
index 8bab596ab4c13..0e04e7ace2cea 100644
--- a/app/code/Magento/Cookie/Helper/Cookie.php
+++ b/app/code/Magento/Cookie/Helper/Cookie.php
@@ -80,7 +80,7 @@ public function isUserNotAllowSaveCookie()
      * Check if cookie restriction mode is enabled for this store
      *
      * @return bool
-     * @since 100.2.0
+     * @since 100.1.3
      */
     public function isCookieRestrictionModeEnabled()
     {
diff --git a/app/code/Magento/Customer/Api/CustomerGroupConfigInterface.php b/app/code/Magento/Customer/Api/CustomerGroupConfigInterface.php
index 6e118b2b40e76..ccbf06206aed7 100644
--- a/app/code/Magento/Customer/Api/CustomerGroupConfigInterface.php
+++ b/app/code/Magento/Customer/Api/CustomerGroupConfigInterface.php
@@ -9,7 +9,7 @@
  * Interface for system configuration operations for customer groups.
  *
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 interface CustomerGroupConfigInterface
 {
@@ -22,7 +22,7 @@ interface CustomerGroupConfigInterface
      * @throws \Exception
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function setDefaultCustomerGroup($id);
 }
diff --git a/app/code/Magento/Customer/Block/Account/AuthenticationPopup.php b/app/code/Magento/Customer/Block/Account/AuthenticationPopup.php
index 07e0704ee6e43..6695d7fd6d3e8 100644
--- a/app/code/Magento/Customer/Block/Account/AuthenticationPopup.php
+++ b/app/code/Magento/Customer/Block/Account/AuthenticationPopup.php
@@ -70,7 +70,7 @@ public function getConfig()
      * Added in scope of https://github.com/magento/magento2/pull/8617
      *
      * @return bool|string
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getSerializedConfig()
     {
diff --git a/app/code/Magento/Customer/Block/Account/AuthorizationLink.php b/app/code/Magento/Customer/Block/Account/AuthorizationLink.php
index ff9d56c8fc4cb..16ab9d26450b1 100644
--- a/app/code/Magento/Customer/Block/Account/AuthorizationLink.php
+++ b/app/code/Magento/Customer/Block/Account/AuthorizationLink.php
@@ -94,7 +94,7 @@ public function isLoggedIn()
 
     /**
      * {@inheritdoc}
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getSortOrder()
     {
diff --git a/app/code/Magento/Customer/Block/Account/Dashboard.php b/app/code/Magento/Customer/Block/Account/Dashboard.php
index 92537009175fd..7281c9fc7b78d 100644
--- a/app/code/Magento/Customer/Block/Account/Dashboard.php
+++ b/app/code/Magento/Customer/Block/Account/Dashboard.php
@@ -120,7 +120,7 @@ public function getAddressEditUrl($address)
      * Retrieve the Url for customer orders.
      *
      * @return string
-     * @deprecated Action does not exist
+     * @deprecated 102.0.3 Action does not exist
      */
     public function getOrdersUrl()
     {
diff --git a/app/code/Magento/Customer/Block/Account/Delimiter.php b/app/code/Magento/Customer/Block/Account/Delimiter.php
index 056a53e259c49..2bd93668cc438 100644
--- a/app/code/Magento/Customer/Block/Account/Delimiter.php
+++ b/app/code/Magento/Customer/Block/Account/Delimiter.php
@@ -10,13 +10,13 @@
  * Class for delimiter.
  *
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 class Delimiter extends \Magento\Framework\View\Element\Template implements SortLinkInterface
 {
     /**
      * {@inheritdoc}
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getSortOrder()
     {
diff --git a/app/code/Magento/Customer/Block/Account/Link.php b/app/code/Magento/Customer/Block/Account/Link.php
index ed29a10abc8b7..60ade7fe9207c 100644
--- a/app/code/Magento/Customer/Block/Account/Link.php
+++ b/app/code/Magento/Customer/Block/Account/Link.php
@@ -45,7 +45,7 @@ public function getHref()
 
     /**
      * {@inheritdoc}
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getSortOrder()
     {
diff --git a/app/code/Magento/Customer/Block/Account/Navigation.php b/app/code/Magento/Customer/Block/Account/Navigation.php
index 705acbcda4c6a..1d29932e79151 100644
--- a/app/code/Magento/Customer/Block/Account/Navigation.php
+++ b/app/code/Magento/Customer/Block/Account/Navigation.php
@@ -14,13 +14,13 @@
  * Class for sorting links in navigation panels.
  *
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 class Navigation extends Links
 {
     /**
      * {@inheritdoc}
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getLinks()
     {
diff --git a/app/code/Magento/Customer/Block/Account/SortLinkInterface.php b/app/code/Magento/Customer/Block/Account/SortLinkInterface.php
index 114bb02e1444c..5dc59aaf95854 100644
--- a/app/code/Magento/Customer/Block/Account/SortLinkInterface.php
+++ b/app/code/Magento/Customer/Block/Account/SortLinkInterface.php
@@ -9,7 +9,7 @@
 /**
  * Interface for sortable links.
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 interface SortLinkInterface
 {
@@ -23,7 +23,7 @@ interface SortLinkInterface
      * Get sort order for block.
      *
      * @return int
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getSortOrder();
 }
diff --git a/app/code/Magento/Customer/Block/Address/Book.php b/app/code/Magento/Customer/Block/Address/Book.php
index 04669446ffee9..f37ae21a9b83c 100644
--- a/app/code/Magento/Customer/Block/Address/Book.php
+++ b/app/code/Magento/Customer/Block/Address/Book.php
@@ -93,7 +93,7 @@ protected function _prepareLayout()
      * Generate and return "New Address" URL
      *
      * @return string
-     * @deprecated not used in this block
+     * @deprecated 102.0.1 not used in this block
      * @see \Magento\Customer\Block\Address\Grid::getAddAddressUrl
      */
     public function getAddAddressUrl()
@@ -118,7 +118,7 @@ public function getBackUrl()
      * Generate and return "Delete" URL
      *
      * @return string
-     * @deprecated not used in this block
+     * @deprecated 102.0.1 not used in this block
      * @see \Magento\Customer\Block\Address\Grid::getDeleteUrl
      */
     public function getDeleteUrl()
@@ -133,7 +133,7 @@ public function getDeleteUrl()
      *
      * @param int $addressId
      * @return string
-     * @deprecated not used in this block
+     * @deprecated 102.0.1 not used in this block
      * @see \Magento\Customer\Block\Address\Grid::getAddressEditUrl
      */
     public function getAddressEditUrl($addressId)
@@ -159,7 +159,7 @@ public function hasPrimaryAddress()
      *
      * @return \Magento\Customer\Api\Data\AddressInterface[]|bool
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @deprecated not used in this block
+     * @deprecated 102.0.1 not used in this block
      * @see \Magento\Customer\Block\Address\Grid::getAdditionalAddresses
      */
     public function getAdditionalAddresses()
diff --git a/app/code/Magento/Customer/Block/Address/Grid.php b/app/code/Magento/Customer/Block/Address/Grid.php
index 963efc648d94b..9053fd57154bb 100644
--- a/app/code/Magento/Customer/Block/Address/Grid.php
+++ b/app/code/Magento/Customer/Block/Address/Grid.php
@@ -15,6 +15,7 @@
  * Customer address grid
  *
  * @api
+ * @since 102.0.1
  */
 class Grid extends \Magento\Framework\View\Element\Template
 {
@@ -64,6 +65,7 @@ public function __construct(
      *
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
+     * @since 102.0.1
      */
     protected function _prepareLayout(): void
     {
@@ -75,6 +77,7 @@ protected function _prepareLayout(): void
      * Generate and return "New Address" URL
      *
      * @return string
+     * @since 102.0.1
      */
     public function getAddAddressUrl(): string
     {
@@ -85,6 +88,7 @@ public function getAddAddressUrl(): string
      * Generate and return "Delete" URL
      *
      * @return string
+     * @since 102.0.1
      */
     public function getDeleteUrl(): string
     {
@@ -98,6 +102,7 @@ public function getDeleteUrl(): string
      *
      * @param int $addressId
      * @return string
+     * @since 102.0.1
      */
     public function getAddressEditUrl($addressId): string
     {
@@ -112,6 +117,7 @@ public function getAddressEditUrl($addressId): string
      * @return \Magento\Customer\Api\Data\AddressInterface[]
      * @throws \Magento\Framework\Exception\LocalizedException
      * @throws NoSuchEntityException
+     * @since 102.0.1
      */
     public function getAdditionalAddresses(): array
     {
@@ -132,6 +138,7 @@ public function getAdditionalAddresses(): array
      * Return stored customer or get it from session
      *
      * @return \Magento\Customer\Api\Data\CustomerInterface
+     * @since 102.0.1
      */
     public function getCustomer(): \Magento\Customer\Api\Data\CustomerInterface
     {
@@ -148,6 +155,7 @@ public function getCustomer(): \Magento\Customer\Api\Data\CustomerInterface
      *
      * @param \Magento\Customer\Api\Data\AddressInterface $address
      * @return string
+     * @since 102.0.1
      */
     public function getStreetAddress(\Magento\Customer\Api\Data\AddressInterface $address): string
     {
@@ -165,6 +173,7 @@ public function getStreetAddress(\Magento\Customer\Api\Data\AddressInterface $ad
      *
      * @param string $countryCode
      * @return string
+     * @since 102.0.1
      */
     public function getCountryByCode(string $countryCode): string
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart.php
index 656a78d1165e3..799d6e3bc1263 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart.php
@@ -316,6 +316,7 @@ private function prepareWebsiteFilter(): void
 
     /**
      * @inheritDoc
+     * @since 103.0.0
      */
     public function getMainButtonsHtml()
     {
diff --git a/app/code/Magento/Customer/Block/CustomerData.php b/app/code/Magento/Customer/Block/CustomerData.php
index 98eb2d9f9ea40..bbc54cfa71c09 100644
--- a/app/code/Magento/Customer/Block/CustomerData.php
+++ b/app/code/Magento/Customer/Block/CustomerData.php
@@ -59,7 +59,7 @@ public function getCustomerDataUrl($route)
      * Once this period has expired the corresponding section must be invalidated and reloaded.
      *
      * @return int section lifetime in minutes
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getExpirableSectionLifetime()
     {
@@ -70,7 +70,7 @@ public function getExpirableSectionLifetime()
      * Retrieve the list of sections that can expire.
      *
      * @return array
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getExpirableSectionNames()
     {
diff --git a/app/code/Magento/Customer/Block/CustomerScopeData.php b/app/code/Magento/Customer/Block/CustomerScopeData.php
index f875386695b4b..63ff863f89ce3 100644
--- a/app/code/Magento/Customer/Block/CustomerScopeData.php
+++ b/app/code/Magento/Customer/Block/CustomerScopeData.php
@@ -15,7 +15,7 @@
  * with appropriate value in store front private cache.
  *
  * @api
- * @since 100.2.0
+ * @since 100.1.9
  */
 class CustomerScopeData extends \Magento\Framework\View\Element\Template
 {
@@ -54,7 +54,7 @@ public function __construct(
      * Can be used when necessary to obtain website id of the current customer.
      *
      * @return integer
-     * @since 100.2.0
+     * @since 100.1.9
      */
     public function getWebsiteId()
     {
@@ -67,6 +67,7 @@ public function getWebsiteId()
      * @param array $configuration
      * @return bool|string
      * @throws \InvalidArgumentException
+     * @since 102.0.0
      */
     public function encodeConfiguration(array $configuration)
     {
diff --git a/app/code/Magento/Customer/Controller/AbstractAccount.php b/app/code/Magento/Customer/Controller/AbstractAccount.php
index 4f2c80711d292..21357f0505f7d 100644
--- a/app/code/Magento/Customer/Controller/AbstractAccount.php
+++ b/app/code/Magento/Customer/Controller/AbstractAccount.php
@@ -12,7 +12,7 @@
  * AbstractAccount class is deprecated, in favour of Composition approach to build Controllers
  *
  * @SuppressWarnings(PHPMD.NumberOfChildren)
- * @deprecated
+ * @deprecated 103.0.0
  * @see \Magento\Customer\Controller\AccountInterface
  */
 abstract class AbstractAccount extends Action implements AccountInterface
diff --git a/app/code/Magento/Customer/Controller/Account/Confirm.php b/app/code/Magento/Customer/Controller/Account/Confirm.php
index a1ec3164a3c31..2fc6ed4d422fb 100644
--- a/app/code/Magento/Customer/Controller/Account/Confirm.php
+++ b/app/code/Magento/Customer/Controller/Account/Confirm.php
@@ -108,7 +108,7 @@ public function __construct(
     /**
      * Retrieve cookie manager
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @return \Magento\Framework\Stdlib\Cookie\PhpCookieManager
      */
     private function getCookieManager()
@@ -124,7 +124,7 @@ private function getCookieManager()
     /**
      * Retrieve cookie metadata factory
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @return \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory
      */
     private function getCookieMetadataFactory()
diff --git a/app/code/Magento/Customer/Controller/Account/CreatePost.php b/app/code/Magento/Customer/Controller/Account/CreatePost.php
index 4c1cfa94c5565..14c2ed43171f6 100644
--- a/app/code/Magento/Customer/Controller/Account/CreatePost.php
+++ b/app/code/Magento/Customer/Controller/Account/CreatePost.php
@@ -452,7 +452,7 @@ protected function checkPasswordConfirmation($password, $confirmation)
     /**
      * Retrieve success message
      *
-     * @deprecated
+     * @deprecated 102.0.4
      * @see getMessageManagerSuccessMessage()
      * @return string
      */
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index.php b/app/code/Magento/Customer/Controller/Adminhtml/Index.php
index ffae1e9f8bf1e..51dc39a2fc658 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index.php
@@ -35,7 +35,7 @@ abstract class Index extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Framework\Validator
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected $_validator;
 
@@ -53,13 +53,13 @@ abstract class Index extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Customer\Model\CustomerFactory
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected $_customerFactory = null;
 
     /**
      * @var \Magento\Customer\Model\AddressFactory
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected $_addressFactory = null;
 
@@ -85,7 +85,7 @@ abstract class Index extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Framework\Math\Random
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected $_random;
 
@@ -96,7 +96,7 @@ abstract class Index extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Framework\Api\ExtensibleDataObjectConverter
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected $_extensibleDataObjectConverter;
 
@@ -132,7 +132,7 @@ abstract class Index extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Framework\Reflection\DataObjectProcessor
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected $dataObjectProcessor;
 
@@ -143,7 +143,7 @@ abstract class Index extends \Magento\Backend\App\Action
 
     /**
      * @var \Magento\Framework\View\LayoutFactory
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected $layoutFactory;
 
@@ -306,7 +306,7 @@ protected function _addSessionErrorMessages($messages)
      * @param callable $singleAction A single action callable that takes a customer ID as input
      * @param int[] $customerIds Array of customer Ids to perform the action upon
      * @return int Number of customers successfully acted upon
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected function actUponMultipleCustomers(callable $singleAction, $customerIds)
     {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php
index 6528ac4c1f211..910f4e94b90b7 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php
@@ -42,7 +42,7 @@
  * Admin customer shopping cart controller
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @deprecated 100.2.0
+ * @deprecated 101.0.0
  */
 class Cart extends BaseAction implements HttpGetActionInterface, HttpPostActionInterface
 {
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
index a65bfa5d77f9e..2d4820f3c17c4 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php
@@ -243,7 +243,7 @@ protected function _extractData(
     /**
      * Saves default_billing and default_shipping flags for customer address
      *
-     * @deprecated must be removed because addresses are save separately for now
+     * @deprecated 102.0.1 must be removed because addresses are save separately for now
      * @param array $addressIdList
      * @param array $extractedCustomerData
      * @return array
@@ -286,7 +286,7 @@ protected function saveDefaultFlags(array $addressIdList, array & $extractedCust
     /**
      * Reformat customer addresses data to be compatible with customer service interface
      *
-     * @deprecated addresses are saved separately for now
+     * @deprecated 102.0.1 addresses are saved separately for now
      * @param array $extractedCustomerData
      * @return array
      */
diff --git a/app/code/Magento/Customer/Controller/Section/Load.php b/app/code/Magento/Customer/Controller/Section/Load.php
index 6c3aa06b9f022..e735366d0b8b8 100644
--- a/app/code/Magento/Customer/Controller/Section/Load.php
+++ b/app/code/Magento/Customer/Controller/Section/Load.php
@@ -23,7 +23,7 @@ class Load extends \Magento\Framework\App\Action\Action implements HttpGetAction
 
     /**
      * @var Identifier
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected $sectionIdentifier;
 
diff --git a/app/code/Magento/Customer/CustomerData/SectionPool.php b/app/code/Magento/Customer/CustomerData/SectionPool.php
index eef2854cf363e..28d79bf42ecd7 100644
--- a/app/code/Magento/Customer/CustomerData/SectionPool.php
+++ b/app/code/Magento/Customer/CustomerData/SectionPool.php
@@ -66,6 +66,7 @@ public function getSectionsData(array $sectionNames = null, $forceNewTimestamp =
      * Return array of section names.
      *
      * @return array
+     * @since 102.0.4
      */
     public function getSectionNames()
     {
diff --git a/app/code/Magento/Customer/Helper/Address.php b/app/code/Magento/Customer/Helper/Address.php
index 765c13b287704..74eee759b4abd 100644
--- a/app/code/Magento/Customer/Helper/Address.php
+++ b/app/code/Magento/Customer/Helper/Address.php
@@ -81,7 +81,7 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
     /**
      * @var CustomerMetadataInterface
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected $_customerMetadataService;
 
@@ -407,7 +407,7 @@ public function isVatAttributeVisible()
      * @return bool
      * @throws NoSuchEntityException
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function isAttributeVisible($code)
     {
diff --git a/app/code/Magento/Customer/Model/Account/Redirect.php b/app/code/Magento/Customer/Model/Account/Redirect.php
index 0389a380b36dc..9824be73f36b5 100644
--- a/app/code/Magento/Customer/Model/Account/Redirect.php
+++ b/app/code/Magento/Customer/Model/Account/Redirect.php
@@ -58,7 +58,7 @@ class Redirect
     protected $customerUrl;
 
     /**
-     * @deprecated 100.1.8
+     * @deprecated 100.0.2
      * @var UrlInterface
      */
     protected $url;
diff --git a/app/code/Magento/Customer/Model/AccountManagement.php b/app/code/Magento/Customer/Model/AccountManagement.php
index 106b7e6a582ba..d22a10145c7be 100644
--- a/app/code/Magento/Customer/Model/AccountManagement.php
+++ b/app/code/Magento/Customer/Model/AccountManagement.php
@@ -1375,7 +1375,7 @@ protected function sendEmailTemplate(
      *
      * @param CustomerInterface $customer
      * @return bool
-     * @deprecated
+     * @deprecated 101.0.4
      * @see AccountConfirmation::isConfirmationRequired
      */
     protected function isConfirmationRequired($customer)
@@ -1392,7 +1392,7 @@ protected function isConfirmationRequired($customer)
      *
      * @param CustomerInterface $customer
      * @return bool
-     * @deprecated
+     * @deprecated 101.0.4
      * @see AccountConfirmation::isConfirmationRequired
      */
     protected function canSkipConfirmation($customer)
diff --git a/app/code/Magento/Customer/Model/Address.php b/app/code/Magento/Customer/Model/Address.php
index ea9b103f42273..241abbb06f8a1 100644
--- a/app/code/Magento/Customer/Model/Address.php
+++ b/app/code/Magento/Customer/Model/Address.php
@@ -395,7 +395,7 @@ private function getAttributeList()
      * Retrieve attribute set id for customer address.
      *
      * @return int
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getAttributeSetId()
     {
diff --git a/app/code/Magento/Customer/Model/Address/AbstractAddress.php b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
index fb067decd0b37..8421fc92f8c4a 100644
--- a/app/code/Magento/Customer/Model/Address/AbstractAddress.php
+++ b/app/code/Magento/Customer/Model/Address/AbstractAddress.php
@@ -632,7 +632,7 @@ protected function _createCountryInstance()
      * Unset Region from address
      *
      * @return $this
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function unsRegion()
     {
@@ -644,7 +644,7 @@ public function unsRegion()
      *
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 100.2.0
+     * @since 101.0.0
      */
     protected function isCompanyRequired()
     {
@@ -656,7 +656,7 @@ protected function isCompanyRequired()
      *
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 100.2.0
+     * @since 101.0.0
      */
     protected function isTelephoneRequired()
     {
@@ -668,7 +668,7 @@ protected function isTelephoneRequired()
      *
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 100.2.0
+     * @since 101.0.0
      */
     protected function isFaxRequired()
     {
diff --git a/app/code/Magento/Customer/Model/Address/ValidatorInterface.php b/app/code/Magento/Customer/Model/Address/ValidatorInterface.php
index 8468f28e70e70..1bdfd77a19311 100644
--- a/app/code/Magento/Customer/Model/Address/ValidatorInterface.php
+++ b/app/code/Magento/Customer/Model/Address/ValidatorInterface.php
@@ -10,6 +10,7 @@
  * Interface for address validator.
  *
  * @api
+ * @since 102.0.0
  */
 interface ValidatorInterface
 {
@@ -19,6 +20,7 @@ interface ValidatorInterface
      *
      * @param AbstractAddress $address
      * @return array
+     * @since 102.0.0
      */
     public function validate(AbstractAddress $address);
 }
diff --git a/app/code/Magento/Customer/Model/AuthenticationInterface.php b/app/code/Magento/Customer/Model/AuthenticationInterface.php
index f2d213be2ccfe..3c4cae3089218 100644
--- a/app/code/Magento/Customer/Model/AuthenticationInterface.php
+++ b/app/code/Magento/Customer/Model/AuthenticationInterface.php
@@ -11,6 +11,7 @@
 /**
  * Interface \Magento\Customer\Model\AuthenticationInterface
  * @api
+ * @since 100.1.0
  */
 interface AuthenticationInterface
 {
@@ -19,6 +20,7 @@ interface AuthenticationInterface
      *
      * @param int $customerId
      * @return void
+     * @since 100.1.0
      */
     public function processAuthenticationFailure($customerId);
 
@@ -27,6 +29,7 @@ public function processAuthenticationFailure($customerId);
      *
      * @param int $customerId
      * @return void
+     * @since 100.1.0
      */
     public function unlock($customerId);
 
@@ -35,6 +38,7 @@ public function unlock($customerId);
      *
      * @param int $customerId
      * @return boolean
+     * @since 100.1.0
      */
     public function isLocked($customerId);
 
@@ -46,6 +50,7 @@ public function isLocked($customerId);
      * @return boolean
      * @throws InvalidEmailOrPasswordException
      * @throws UserLockedException
+     * @since 100.1.0
      */
     public function authenticate($customerId, $password);
 }
diff --git a/app/code/Magento/Customer/Model/Checkout/ConfigProvider.php b/app/code/Magento/Customer/Model/Checkout/ConfigProvider.php
index ef0b8b7163ad8..53c1b470a5175 100644
--- a/app/code/Magento/Customer/Model/Checkout/ConfigProvider.php
+++ b/app/code/Magento/Customer/Model/Checkout/ConfigProvider.php
@@ -26,7 +26,7 @@ class ConfigProvider implements ConfigProviderInterface
 
     /**
      * @var UrlInterface
-     * @deprecated
+     * @deprecated 101.0.4
      */
     protected $urlBuilder;
 
diff --git a/app/code/Magento/Customer/Model/Config/Source/Group.php b/app/code/Magento/Customer/Model/Config/Source/Group.php
index 7132b8ad4cedf..65b2e14019c40 100644
--- a/app/code/Magento/Customer/Model/Config/Source/Group.php
+++ b/app/code/Magento/Customer/Model/Config/Source/Group.php
@@ -17,13 +17,13 @@ class Group implements \Magento\Framework\Option\ArrayInterface
     protected $_options;
 
     /**
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @var GroupManagementInterface
      */
     protected $_groupManagement;
 
     /**
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @var \Magento\Framework\Convert\DataObject
      */
     protected $_converter;
diff --git a/app/code/Magento/Customer/Model/Config/Source/Group/Multiselect.php b/app/code/Magento/Customer/Model/Config/Source/Group/Multiselect.php
index bf1fae8d34bed..38f717b82ea35 100644
--- a/app/code/Magento/Customer/Model/Config/Source/Group/Multiselect.php
+++ b/app/code/Magento/Customer/Model/Config/Source/Group/Multiselect.php
@@ -19,13 +19,13 @@ class Multiselect implements \Magento\Framework\Option\ArrayInterface
     protected $_options;
 
     /**
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @var GroupManagementInterface
      */
     protected $_groupManagement;
 
     /**
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @var \Magento\Framework\Convert\DataObject
      */
     protected $_converter;
diff --git a/app/code/Magento/Customer/Model/Customer.php b/app/code/Magento/Customer/Model/Customer.php
index ea52994735c63..f90b67216254d 100644
--- a/app/code/Magento/Customer/Model/Customer.php
+++ b/app/code/Magento/Customer/Model/Customer.php
@@ -820,7 +820,7 @@ public function sendNewAccountEmail($type = 'registered', $backUrl = '', $storeI
      * Check if accounts confirmation is required in config
      *
      * @return bool
-     * @deprecated
+     * @deprecated 101.0.4
      * @see AccountConfirmation::isConfirmationRequired
      */
     public function isConfirmationRequired()
@@ -1000,6 +1000,7 @@ public function getSharedWebsiteIds()
      * Retrieve attribute set id for customer.
      *
      * @return int
+     * @since 102.0.1
      */
     public function getAttributeSetId()
     {
@@ -1197,7 +1198,7 @@ public function setIsReadonly($value)
      * Check whether confirmation may be skipped when registering using certain email address
      *
      * @return bool
-     * @deprecated
+     * @deprecated 101.0.4
      * @see AccountConfirmation::isConfirmationRequired
      */
     protected function canSkipConfirmation()
diff --git a/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Password.php b/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Password.php
index a74838a1a7812..184a9ea8ed7bc 100644
--- a/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Password.php
+++ b/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Password.php
@@ -9,7 +9,7 @@
 use Magento\Framework\Exception\LocalizedException;
 
 /**
- * @deprecated 100.2.0
+ * @deprecated 101.0.0
  * Customer password attribute backend
  */
 class Password extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
@@ -69,7 +69,7 @@ public function beforeSave($object)
     }
 
     /**
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @param \Magento\Framework\DataObject $object
      * @return bool
      */
diff --git a/app/code/Magento/Customer/Model/Customer/DataProvider.php b/app/code/Magento/Customer/Model/Customer/DataProvider.php
index 38e597e4e0fe7..ef32ad57886fe 100644
--- a/app/code/Magento/Customer/Model/Customer/DataProvider.php
+++ b/app/code/Magento/Customer/Model/Customer/DataProvider.php
@@ -33,7 +33,7 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
  *
- * @deprecated \Magento\Customer\Model\Customer\DataProviderWithDefaultAddresses is used instead
+ * @deprecated 102.0.1 \Magento\Customer\Model\Customer\DataProviderWithDefaultAddresses is used instead
  * @api
  * @since 100.0.2
  */
@@ -324,7 +324,7 @@ private function canShowAttribute(AbstractAttribute $customerAttribute): bool
      * Retrieve Country With Websites Source
      *
      * @return CountryWithWebsites
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     private function getCountryWithWebsiteSource()
     {
diff --git a/app/code/Magento/Customer/Model/Customer/Source/GroupSourceInterface.php b/app/code/Magento/Customer/Model/Customer/Source/GroupSourceInterface.php
index 26be387a02f9c..e7addc942811d 100644
--- a/app/code/Magento/Customer/Model/Customer/Source/GroupSourceInterface.php
+++ b/app/code/Magento/Customer/Model/Customer/Source/GroupSourceInterface.php
@@ -9,7 +9,7 @@
 
 /**
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 interface GroupSourceInterface extends OptionSourceInterface
 {
diff --git a/app/code/Magento/Customer/Model/Group/RetrieverInterface.php b/app/code/Magento/Customer/Model/Group/RetrieverInterface.php
index 7d2d47cae2f09..1b1e4efdb7c50 100644
--- a/app/code/Magento/Customer/Model/Group/RetrieverInterface.php
+++ b/app/code/Magento/Customer/Model/Group/RetrieverInterface.php
@@ -9,7 +9,7 @@
  * Interface for getting current customer group from session.
  *
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 interface RetrieverInterface
 {
@@ -17,7 +17,7 @@ interface RetrieverInterface
      * Retrieve customer group id.
      *
      * @return int
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getCustomerGroupId();
 }
diff --git a/app/code/Magento/Customer/Model/Metadata/Form/File.php b/app/code/Magento/Customer/Model/Metadata/Form/File.php
index 227e85ed98f91..1a1c48075fce5 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form/File.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form/File.php
@@ -57,7 +57,7 @@ class File extends AbstractData
 
     /**
      * @var FileProcessorFactory
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected $fileProcessorFactory;
 
diff --git a/app/code/Magento/Customer/Model/Options.php b/app/code/Magento/Customer/Model/Options.php
index 71e70f8e14208..c230353f2a284 100644
--- a/app/code/Magento/Customer/Model/Options.php
+++ b/app/code/Magento/Customer/Model/Options.php
@@ -74,7 +74,7 @@ public function getNameSuffixOptions($store = null)
      * @param bool $isOptional
      * @return array|bool
      *
-     * @deprecated
+     * @deprecated 101.0.4
      * @see prepareNamePrefixSuffixOptions()
      */
     protected function _prepareNamePrefixSuffixOptions($options, $isOptional = false)
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address.php b/app/code/Magento/Customer/Model/ResourceModel/Address.php
index 200eaabe6517d..8e44638e7aee8 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Address.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Address.php
@@ -126,7 +126,7 @@ public function delete($object)
     /**
      * Get instance of DeleteRelation class
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @return DeleteRelation
      */
     private function getDeleteRelation()
@@ -137,7 +137,7 @@ private function getDeleteRelation()
     /**
      * Get instance of CustomerRegistry class
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @return CustomerRegistry
      */
     private function getCustomerRegistry()
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Country.php b/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Country.php
index 37b3b1af0a42d..62339cc7b974f 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Country.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/Country.php
@@ -67,7 +67,7 @@ protected function _createCountriesCollection()
 
     /**
      * Retrieve Store Manager
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @return StoreManagerInterface
      */
     private function getStoreManager()
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address/Relation.php b/app/code/Magento/Customer/Model/ResourceModel/Address/Relation.php
index cf837e2924161..dd502abcafca9 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Address/Relation.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Address/Relation.php
@@ -142,7 +142,7 @@ private function updateCustomerRegistry(Customer $customer, array $changedAddres
     /**
      * Checks if address has chosen as default and has had an id
      *
-     * @deprecated Is not used anymore due to changes in logic of save of address.
+     * @deprecated 102.0.1 Is not used anymore due to changes in logic of save of address.
      *             If address was default and becomes not default than default address id for customer must be
      *             set to null
      * @param AbstractModel $object
diff --git a/app/code/Magento/Customer/Model/ResourceModel/AddressRepository.php b/app/code/Magento/Customer/Model/ResourceModel/AddressRepository.php
index 3fe61785de897..48828d58fca04 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/AddressRepository.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/AddressRepository.php
@@ -209,7 +209,7 @@ public function getList(SearchCriteriaInterface $searchCriteria)
     /**
      * Helper function that adds a FilterGroup to the collection.
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @param FilterGroup $filterGroup
      * @param Collection $collection
      * @return void
@@ -268,7 +268,7 @@ public function deleteById($addressId)
     /**
      * Retrieve collection processor
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @return CollectionProcessorInterface
      */
     private function getCollectionProcessor()
diff --git a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
index 0611a2df641e7..9820e162ac1c0 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
@@ -425,7 +425,7 @@ public function deleteById($customerId)
     /**
      * Helper function that adds a FilterGroup to the collection.
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @param FilterGroup $filterGroup
      * @param Collection $collection
      * @return void
diff --git a/app/code/Magento/Customer/Model/ResourceModel/GroupRepository.php b/app/code/Magento/Customer/Model/ResourceModel/GroupRepository.php
index 664f85f841e3f..10979cd9cc22a 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/GroupRepository.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/GroupRepository.php
@@ -220,7 +220,7 @@ public function getList(SearchCriteriaInterface $searchCriteria)
     /**
      * Helper function that adds a FilterGroup to the collection.
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @param FilterGroup $filterGroup
      * @param Collection $collection
      * @return void
@@ -243,7 +243,7 @@ protected function addFilterGroupToCollection(FilterGroup $filterGroup, Collecti
     /**
      * Translates a field name to a DB column name for use in collection queries.
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @param string $field a field name that should be translated to a DB column name.
      * @return string
      */
@@ -343,7 +343,7 @@ protected function _verifyTaxClassModel($taxClassId, $group)
     /**
      * Retrieve collection processor
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @return CollectionProcessorInterface
      */
     private function getCollectionProcessor()
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Address.php b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
index 09d76ec3fb71f..ec2a1220d02b0 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/Address.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
@@ -167,7 +167,7 @@ class Address extends AbstractCustomer
      * Array of region parameters
      *
      * @var array
-     * @deprecated field not in use
+     * @deprecated 100.3.4 field not in use
      */
     protected $_regionParameters;
 
@@ -197,19 +197,19 @@ class Address extends AbstractCustomer
 
     /**
      * @var \Magento\Eav\Model\Config
-     * @deprecated field not-in use
+     * @deprecated 100.3.4 field not-in use
      */
     protected $_eavConfig;
 
     /**
      * @var \Magento\Customer\Model\AddressFactory
-     * @deprecated not utilized anymore
+     * @deprecated 100.3.4 not utilized anymore
      */
     protected $_addressFactory;
 
     /**
      * @var \Magento\Framework\Stdlib\DateTime
-     * @deprecated the property isn't used
+     * @deprecated 100.3.4 the property isn't used
      */
     protected $dateTime;
 
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Customer.php b/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
index 8f5bb951ce737..5ebf242bd6ac4 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
@@ -367,6 +367,7 @@ protected function _getNextEntityId()
      * @param array|AbstractSource $rows
      *
      * @return void
+     * @since 100.2.3
      */
     public function prepareCustomerData($rows): void
     {
@@ -387,6 +388,7 @@ public function prepareCustomerData($rows): void
 
     /**
      * @inheritDoc
+     * @since 100.2.3
      */
     public function validateData()
     {
diff --git a/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Customer/Storage.php b/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Customer/Storage.php
index 11f326e6dfc8f..f08278af864e7 100644
--- a/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Customer/Storage.php
+++ b/app/code/Magento/CustomerImportExport/Model/ResourceModel/Import/Customer/Storage.php
@@ -130,7 +130,7 @@ public function addCustomerByArray(array $customer): Storage
     /**
      * Add customer to array
      *
-     * @deprecated @see addCustomerByArray
+     * @deprecated 100.3.0 @see addCustomerByArray
      * @param DataObject $customer
      * @return $this
      */
diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
index 6587b462099be..d9b89b23d3d69 100644
--- a/app/code/Magento/Dhl/Model/Carrier.php
+++ b/app/code/Magento/Dhl/Model/Carrier.php
@@ -1084,7 +1084,7 @@ function () use ($deferredResponses, $responseBodies) {
      *
      * @param string $request
      * @return string
-     * @deprecated Use asynchronous client.
+     * @deprecated 100.3.3 Use asynchronous client.
      * @see _getQuotes()
      */
     protected function _getQuotesFromServer($request)
@@ -1396,7 +1396,7 @@ protected function _doShipmentRequest(\Magento\Framework\DataObject $request)
      *
      * @param \Magento\Framework\DataObject $request
      * @return $this|\Magento\Framework\DataObject|boolean
-     * @deprecated
+     * @deprecated 100.2.3
      */
     public function proccessAdditionalValidation(\Magento\Framework\DataObject $request)
     {
diff --git a/app/code/Magento/Directory/Block/Data.php b/app/code/Magento/Directory/Block/Data.php
index 5d94eacf9de96..0424b824e4454 100644
--- a/app/code/Magento/Directory/Block/Data.php
+++ b/app/code/Magento/Directory/Block/Data.php
@@ -175,7 +175,7 @@ public function getRegionCollection()
      * Returns region html select
      *
      * @return string
-     * @deprecated
+     * @deprecated 100.3.3
      * @see getRegionSelect() method for more configurations
      */
     public function getRegionHtmlSelect()
diff --git a/app/code/Magento/Directory/Model/ResourceModel/Currency.php b/app/code/Magento/Directory/Model/ResourceModel/Currency.php
index 5db880c00343a..aec2da291f1b3 100644
--- a/app/code/Magento/Directory/Model/ResourceModel/Currency.php
+++ b/app/code/Magento/Directory/Model/ResourceModel/Currency.php
@@ -165,7 +165,7 @@ public function saveRates($rates)
      * @param string $path
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @deprecated because doesn't take into consideration scopes and system config values.
+     * @deprecated 100.2.3 because doesn't take into consideration scopes and system config values.
      * @see \Magento\Directory\Model\CurrencyConfig::getConfigCurrencies()
      */
     public function getConfigCurrencies($model, $path)
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php
index 973d52e865dc9..b3c906c1bb9ad 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php
@@ -11,7 +11,7 @@
  *
  * @api
  * @since 100.0.2
- * @deprecated
+ * @deprecated 100.3.1
  * @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Composite
  */
 class Downloadable extends \Magento\Downloadable\Block\Catalog\Product\Links
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
index 8fdf1d395308e..707e9788141c4 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
@@ -15,7 +15,7 @@
  * Adminhtml catalog product downloadable items tab and form
  *
  * @author      Magento Core Team <core@magentocommerce.com>
- * @deprecated
+ * @deprecated 100.3.1
  * @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Composite
  */
 class Downloadable extends Widget implements TabInterface
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
index e0026765f269b..5895f3a92c54c 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
@@ -11,7 +11,7 @@
  * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
- * @deprecated in favor of new class which adds grid links
+ * @deprecated 100.3.1 in favor of new class which adds grid links
  * @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Links
  */
 class Links extends \Magento\Backend\Block\Template
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
index 83a5a93405158..04210d54f38aa 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
@@ -10,7 +10,7 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  *
- * @deprecated because of new class which adds grids samples
+ * @deprecated 100.3.1 because of new class which adds grids samples
  * @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Samples
  */
 class Samples extends \Magento\Backend\Block\Widget
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Form.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Form.php
index fe430566d63ce..dbd236d5e8827 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Form.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Form.php
@@ -9,7 +9,7 @@
 /**
  * Class Form
  *
- * @deprecated since downloadable information rendering moved to UI components.
+ * @deprecated 100.3.1 since downloadable information rendering moved to UI components.
  * @see \Magento\Downloadable\Ui\DataProvider\Product\Form\Modifier\Composite
  * @package Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit
  */
diff --git a/app/code/Magento/Downloadable/Model/Sample/Builder.php b/app/code/Magento/Downloadable/Model/Sample/Builder.php
index ca1fab224f86f..163e641935db0 100644
--- a/app/code/Magento/Downloadable/Model/Sample/Builder.php
+++ b/app/code/Magento/Downloadable/Model/Sample/Builder.php
@@ -78,6 +78,7 @@ public function __construct(
      * @param array $data
      * @return $this
      * @since 100.1.0
+     * @since 100.1.0
      */
     public function setData(array $data)
     {
diff --git a/app/code/Magento/Eav/Api/Data/AttributeDefaultValueInterface.php b/app/code/Magento/Eav/Api/Data/AttributeDefaultValueInterface.php
index 56ae16c53402c..45022e25c5c31 100644
--- a/app/code/Magento/Eav/Api/Data/AttributeDefaultValueInterface.php
+++ b/app/code/Magento/Eav/Api/Data/AttributeDefaultValueInterface.php
@@ -11,7 +11,7 @@
  * Allows to manage attribute default value through interface
  * @api
  * @package Magento\Eav\Api\Data
- * @since 100.2.0
+ * @since 101.0.0
  */
 interface AttributeDefaultValueInterface
 {
@@ -20,13 +20,13 @@ interface AttributeDefaultValueInterface
     /**
      * @param string $defaultValue
      * @return \Magento\Framework\Api\MetadataObjectInterface
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function setDefaultValue($defaultValue);
 
     /**
      * @return string
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getDefaultValue();
 }
diff --git a/app/code/Magento/Eav/Api/Data/AttributeInterface.php b/app/code/Magento/Eav/Api/Data/AttributeInterface.php
index 55d6e58b64b71..d96c2329ec594 100644
--- a/app/code/Magento/Eav/Api/Data/AttributeInterface.php
+++ b/app/code/Magento/Eav/Api/Data/AttributeInterface.php
@@ -316,6 +316,7 @@ public function getExtensionAttributes();
      *
      * @param \Magento\Eav\Api\Data\AttributeExtensionInterface $extensionAttributes
      * @return $this
+     * @since 102.0.0
      */
     public function setExtensionAttributes(
         \Magento\Eav\Api\Data\AttributeExtensionInterface $extensionAttributes
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php
index 7dd6b0a19ec02..577dac5b0c28b 100644
--- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php
+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php
@@ -38,7 +38,7 @@ public function __construct(
     }
 
     /**
-     * @deprecated Misspelled method
+     * @deprecated 102.0.0 Misspelled method
      * @see getCompatibleInputTypes
      */
     public function getComaptibleInputTypes()
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/AbstractOptions.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/AbstractOptions.php
index 9b44b2c7395ac..70fd5b2914600 100644
--- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/AbstractOptions.php
+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/AbstractOptions.php
@@ -9,7 +9,7 @@
  * Attribute add/edit form options tab
  *
  * @api
- * @deprecated 100.2.0
+ * @deprecated 101.0.0
  * @since 100.0.2
  */
 abstract class AbstractOptions extends \Magento\Framework\View\Element\AbstractBlock
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Grid/AbstractGrid.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Grid/AbstractGrid.php
index 55c0583191492..839ee7584cf03 100644
--- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Grid/AbstractGrid.php
+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Grid/AbstractGrid.php
@@ -10,7 +10,7 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
- * @deprecated 100.2.0
+ * @deprecated 101.0.0
  * @since 100.0.2
  */
 abstract class AbstractGrid extends \Magento\Backend\Block\Widget\Grid\Extended
diff --git a/app/code/Magento/Eav/Model/Attribute/GroupRepository.php b/app/code/Magento/Eav/Model/Attribute/GroupRepository.php
index 07ca71d95eba5..f717a01a4384f 100644
--- a/app/code/Magento/Eav/Model/Attribute/GroupRepository.php
+++ b/app/code/Magento/Eav/Model/Attribute/GroupRepository.php
@@ -181,7 +181,7 @@ public function deleteById($groupId)
     /**
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return null|string
-     * @deprecated
+     * @deprecated 101.0.3
      */
     protected function retrieveAttributeSetIdFromSearchCriteria(
         \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
@@ -199,7 +199,7 @@ protected function retrieveAttributeSetIdFromSearchCriteria(
     /**
      * Retrieve collection processor
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @return CollectionProcessorInterface
      */
     private function getCollectionProcessor()
diff --git a/app/code/Magento/Eav/Model/AttributeRepository.php b/app/code/Magento/Eav/Model/AttributeRepository.php
index 337ae7334486e..bb307d5581121 100644
--- a/app/code/Magento/Eav/Model/AttributeRepository.php
+++ b/app/code/Magento/Eav/Model/AttributeRepository.php
@@ -208,7 +208,7 @@ public function deleteById($attributeId)
     /**
      * Retrieve collection processor
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @return CollectionProcessorInterface
      */
     private function getCollectionProcessor()
diff --git a/app/code/Magento/Eav/Model/AttributeSetRepository.php b/app/code/Magento/Eav/Model/AttributeSetRepository.php
index caab82da3910d..73e8749952812 100644
--- a/app/code/Magento/Eav/Model/AttributeSetRepository.php
+++ b/app/code/Magento/Eav/Model/AttributeSetRepository.php
@@ -126,7 +126,7 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
     /**
      * Retrieve entity type code from search criteria
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria
      * @return null|string
      */
@@ -188,7 +188,7 @@ public function deleteById($attributeSetId)
     /**
      * Retrieve collection processor
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @return CollectionProcessorInterface
      */
     private function getCollectionProcessor()
diff --git a/app/code/Magento/Eav/Model/Config.php b/app/code/Magento/Eav/Model/Config.php
index 718ef1a748590..ec099eb576425 100644
--- a/app/code/Magento/Eav/Model/Config.php
+++ b/app/code/Magento/Eav/Model/Config.php
@@ -509,12 +509,12 @@ protected function _initAttributes($entityType)
     /**
      * Get attributes by entity type
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @see \Magento\Eav\Model\Config::getEntityAttributes
      *
      * @param string $entityType
      * @return AbstractAttribute[]
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getAttributes($entityType)
     {
@@ -724,7 +724,7 @@ private function createAttribute($model)
     /**
      * Get codes of all entity type attributes
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @see \Magento\Eav\Model\Config::getEntityAttributes
      *
      * @param mixed $entityType
@@ -745,7 +745,7 @@ public function getEntityAttributeCodes($entityType, $object = null)
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getEntityAttributes($entityType, $object = null)
     {
diff --git a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
index a298aad6356c3..f2f767b4e41fa 100644
--- a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
+++ b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
@@ -1013,7 +1013,7 @@ public function load($object, $entityId, $attributes = [])
     /**
      * Loads attributes metadata.
      *
-     * @deprecated 100.2.0 Use self::loadAttributesForObject instead
+     * @deprecated 101.0.0 Use self::loadAttributesForObject instead
      * @param array|null $attributes
      * @return $this
      * @since 100.1.0
@@ -1991,7 +1991,7 @@ public function afterDelete(DataObject $object)
      * @param array $attributes
      * @param AbstractEntity|null $object
      * @return void
-     * @since 100.2.0
+     * @since 101.0.0
      */
     protected function loadAttributesForObject($attributes, $object = null)
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php b/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
index 7066a752fe2a2..af621e17f4249 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
@@ -130,7 +130,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
      * Serializer Instance.
      *
      * @var Json
-     * @since 100.2.0
+     * @since 101.0.0
      */
     protected $serializer;
 
@@ -219,10 +219,10 @@ public function __construct(
     /**
      * Get Serializer instance.
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      *
      * @return Json
-     * @since 100.2.0
+     * @since 101.0.0
      */
     protected function getSerializer()
     {
@@ -929,7 +929,7 @@ public function _getFlatColumnsDdlDefinition()
      *
      * Used in database compatible mode
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/AttributeGroupAlreadyExistsException.php b/app/code/Magento/Eav/Model/Entity/Attribute/AttributeGroupAlreadyExistsException.php
index fa50aa588b4ed..892018983cd1c 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/AttributeGroupAlreadyExistsException.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/AttributeGroupAlreadyExistsException.php
@@ -9,7 +9,7 @@
 
 /**
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 class AttributeGroupAlreadyExistsException extends AlreadyExistsException
 {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/JsonEncoded.php b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/JsonEncoded.php
index 156c0326f2b6f..b9fbb876dd6c3 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/JsonEncoded.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/JsonEncoded.php
@@ -11,7 +11,7 @@
  * Backend model for attribute that stores structures in json format
  *
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 class JsonEncoded extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
@@ -35,7 +35,7 @@ public function __construct(Json $jsonSerializer)
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function beforeSave($object)
     {
@@ -52,7 +52,7 @@ public function beforeSave($object)
      *
      * @param \Magento\Framework\DataObject $object
      * @return $this
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function afterLoad($object)
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Set.php b/app/code/Magento/Eav/Model/Entity/Attribute/Set.php
index c3725ac580dcf..71c090c359fd4 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Set.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Set.php
@@ -375,7 +375,7 @@ public function getDefaultGroupId($setId = null)
      * Get resource instance
      *
      * @return \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     * @deprecated 100.2.0 because resource models should be used directly
+     * @deprecated 101.0.0 because resource models should be used directly
      */
     protected function _getResource()
     {
diff --git a/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php b/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
index 1fc513ed0ea80..0e1e4f035fc14 100644
--- a/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
+++ b/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
@@ -1604,6 +1604,7 @@ protected function _reset()
      *
      * @param string $attributeCode
      * @return bool
+     * @since 102.0.0
      */
     public function isAttributeAdded($attributeCode) : bool
     {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php
index f980d2e11c2f5..637d4e17e852d 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php
@@ -205,6 +205,7 @@ protected function _beforeSave(AbstractModel $object)
      * @param AbstractModel $attribute
      * @return AbstractDb
      * @throws CouldNotDeleteException
+     * @since 102.0.2
      */
     protected function _beforeDelete(AbstractModel $attribute)
     {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php b/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php
index bf1405fa64122..1971eeeff3147 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php
@@ -71,7 +71,7 @@ public function __construct(
      * @param string $entityType
      * @return \Magento\Eav\Api\Data\AttributeInterface[]
      * @throws Exception if for unknown entity type
-     * @deprecated Not used anymore
+     * @deprecated 101.0.5 Not used anymore
      * @see ReadHandler::getEntityAttributes
      */
     protected function getAttributes($entityType)
diff --git a/app/code/Magento/Eav/Model/TypeLocator/ServiceClassLocator.php b/app/code/Magento/Eav/Model/TypeLocator/ServiceClassLocator.php
index a4225b550ab10..7ffcf689c4381 100644
--- a/app/code/Magento/Eav/Model/TypeLocator/ServiceClassLocator.php
+++ b/app/code/Magento/Eav/Model/TypeLocator/ServiceClassLocator.php
@@ -14,7 +14,7 @@
 
 /**
  * Class to find type based off of ServiceTypeToEntityTypeMap. This locator is introduced for backwards compatibility.
- * @deprecated
+ * @deprecated 102.0.0
  */
 class ServiceClassLocator implements CustomAttributeTypeLocatorInterface
 {
diff --git a/app/code/Magento/Eav/Setup/EavSetup.php b/app/code/Magento/Eav/Setup/EavSetup.php
index d440a84fc8e65..96c7b86a8682d 100644
--- a/app/code/Magento/Eav/Setup/EavSetup.php
+++ b/app/code/Magento/Eav/Setup/EavSetup.php
@@ -125,7 +125,7 @@ public function __construct(
     /**
      * Gets setup model.
      *
-     * @deprecated
+     * @deprecated 102.0.0
      * @return ModuleDataSetupInterface
      */
     public function getSetup()
diff --git a/app/code/Magento/EavGraphQl/Model/Resolver/Query/Type.php b/app/code/Magento/EavGraphQl/Model/Resolver/Query/Type.php
index ef21a26f1f62e..7ee87681dc630 100644
--- a/app/code/Magento/EavGraphQl/Model/Resolver/Query/Type.php
+++ b/app/code/Magento/EavGraphQl/Model/Resolver/Query/Type.php
@@ -15,6 +15,7 @@
  * Translate type names found by the custom type locator to GraphQL type names.
  *
  * @api
+ * @since 100.3.0
  */
 class Type
 {
@@ -55,6 +56,7 @@ public function __construct(
      * @param string $entityType
      * @return string
      * @throws GraphQlInputException
+     * @since 100.3.0
      */
     public function getType(string $attributeCode, string $entityType) : string
     {
diff --git a/app/code/Magento/Elasticsearch/Block/Adminhtml/System/Config/Elasticsearch5/TestConnection.php b/app/code/Magento/Elasticsearch/Block/Adminhtml/System/Config/Elasticsearch5/TestConnection.php
index 2b2da7522dfa6..41a5edc900af8 100644
--- a/app/code/Magento/Elasticsearch/Block/Adminhtml/System/Config/Elasticsearch5/TestConnection.php
+++ b/app/code/Magento/Elasticsearch/Block/Adminhtml/System/Config/Elasticsearch5/TestConnection.php
@@ -8,7 +8,7 @@
 /**
  * Elasticsearch 5x test connection block
  * @codeCoverageIgnore
- * @deprecated because of EOL for Elasticsearch5
+ * @deprecated 100.3.5 because of EOL for Elasticsearch5
  */
 class TestConnection extends \Magento\AdvancedSearch\Block\Adminhtml\System\Config\TestConnection
 {
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapperProxy.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapperProxy.php
index b912446acd63e..840a4e16e8ab2 100644
--- a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapperProxy.php
+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapperProxy.php
@@ -50,7 +50,6 @@ private function getProductFieldMapper()
      * @param string $attributeCode
      * @param array $context
      * @return string
-     * @since 100.1.0
      */
     public function getFieldName($attributeCode, $context = [])
     {
@@ -62,7 +61,6 @@ public function getFieldName($attributeCode, $context = [])
      *
      * @param array $context
      * @return array
-     * @since 100.1.0
      */
     public function getAllAttributesTypes($context = [])
     {
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php
index bd9a380230652..f0b91b0891f30 100644
--- a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php
+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php
@@ -11,7 +11,7 @@
 /**
  * Elasticsearch client
  *
- * @deprecated the Elasticsearch 5 doesn't supported due to EOL
+ * @deprecated 100.3.5 the Elasticsearch 5 doesn't supported due to EOL
  */
 class Elasticsearch implements ClientInterface
 {
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Mapper.php b/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Mapper.php
index abd27abdac8a7..9db1375f16c71 100644
--- a/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Mapper.php
+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Mapper.php
@@ -17,25 +17,25 @@
 /**
  * Mapper class
  * @api
- * @since 100.1.0
+ * @since 100.2.2
  */
 class Mapper
 {
     /**
      * @var QueryBuilder
-     * @since 100.1.0
+     * @since 100.2.2
      */
     protected $queryBuilder;
 
     /**
      * @var MatchQueryBuilder
-     * @since 100.1.0
+     * @since 100.2.2
      */
     protected $matchQueryBuilder;
 
     /**
      * @var FilterBuilder
-     * @since 100.1.0
+     * @since 100.2.2
      */
     protected $filterBuilder;
 
@@ -59,7 +59,7 @@ public function __construct(
      *
      * @param RequestInterface $request
      * @return array
-     * @since 100.1.0
+     * @since 100.2.2
      */
     public function buildQuery(RequestInterface $request)
     {
@@ -89,7 +89,7 @@ public function buildQuery(RequestInterface $request)
      * @param string $conditionType
      * @return array
      * @throws \InvalidArgumentException
-     * @since 100.1.0
+     * @since 100.2.2
      */
     protected function processQuery(
         RequestQueryInterface $requestQuery,
@@ -126,7 +126,7 @@ protected function processQuery(
      * @param BoolQuery $query
      * @param array $selectQuery
      * @return array
-     * @since 100.1.0
+     * @since 100.2.2
      */
     protected function processBoolQuery(
         BoolQuery $query,
@@ -160,7 +160,7 @@ protected function processBoolQuery(
      * @param array $selectQuery
      * @param string $conditionType
      * @return array
-     * @since 100.1.0
+     * @since 100.2.2
      */
     protected function processBoolQueryCondition(
         array $subQueryList,
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Query/Builder.php b/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Query/Builder.php
index b75621191dae7..ac99c91dcfac1 100644
--- a/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Query/Builder.php
+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/SearchAdapter/Query/Builder.php
@@ -18,31 +18,31 @@
  * Query builder for search adapter.
  *
  * @api
- * @since 100.1.0
+ * @since 100.2.2
  */
 class Builder
 {
     /**
      * @var Config
-     * @since 100.1.0
+     * @since 100.2.2
      */
     protected $clientConfig;
 
     /**
      * @var SearchIndexNameResolver
-     * @since 100.1.0
+     * @since 100.2.2
      */
     protected $searchIndexNameResolver;
 
     /**
      * @var AggregationBuilder
-     * @since 100.1.0
+     * @since 100.2.2
      */
     protected $aggregationBuilder;
 
     /**
      * @var ScopeResolverInterface
-     * @since 100.1.0
+     * @since 100.2.2
      */
     protected $scopeResolver;
 
@@ -77,7 +77,7 @@ public function __construct(
      *
      * @param RequestInterface $request
      * @return array
-     * @since 100.1.0
+     * @since 100.2.2
      */
     public function initQuery(RequestInterface $request)
     {
@@ -104,7 +104,7 @@ public function initQuery(RequestInterface $request)
      * @param RequestInterface $request
      * @param array $searchQuery
      * @return array
-     * @since 100.1.0
+     * @since 100.2.2
      */
     public function initAggregations(
         RequestInterface $request,
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/ConverterInterface.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/ConverterInterface.php
index 3e7c3e9b592bd..a1563f75e6607 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/ConverterInterface.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/FieldType/ConverterInterface.php
@@ -10,6 +10,7 @@
 /**
  * @api
  * Field type converter from internal data types to elastic service.
+ * @since 100.3.0
  */
 interface ConverterInterface
 {
@@ -28,6 +29,7 @@ interface ConverterInterface
      *
      * @param string $internalType
      * @return string
+     * @since 100.3.0
      */
     public function convert(string $internalType): string;
 }
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldType.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldType.php
index e7d8d0672aaf0..069bf6e2ab33a 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/FieldType.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldType.php
@@ -14,7 +14,7 @@
  * @api
  * @since 100.1.0
  *
- * @deprecated This class provide not full data about field type. Only basic rules apply in this class.
+ * @deprecated 100.3.0 This class provide not full data about field type. Only basic rules apply in this class.
  * @see ResolverInterface
  */
 class FieldType
@@ -37,11 +37,12 @@ class FieldType
     /**
      * Get field type.
      *
-     * @deprecated
+     * @deprecated 100.3.0
      * @see ResolverInterface::getFieldType
      *
      * @param AbstractAttribute $attribute
      * @return string
+     * @since 100.1.0
      */
     public function getFieldType($attribute)
     {
diff --git a/app/code/Magento/Elasticsearch/Model/DataProvider/Suggestions.php b/app/code/Magento/Elasticsearch/Model/DataProvider/Suggestions.php
index 54e9890e02e59..56cdebdfc2813 100644
--- a/app/code/Magento/Elasticsearch/Model/DataProvider/Suggestions.php
+++ b/app/code/Magento/Elasticsearch/Model/DataProvider/Suggestions.php
@@ -20,7 +20,7 @@
 /**
  * The implementation to provide suggestions mechanism for Elasticsearch5
  *
- * @deprecated because of EOL for Elasticsearch5
+ * @deprecated 100.3.5 because of EOL for Elasticsearch5
  * @see \Magento\Elasticsearch\Model\DataProvider\Base\Suggestions
  */
 class Suggestions implements SuggestedQueriesInterface
diff --git a/app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/DefaultFilterStrategyApplyChecker.php b/app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/DefaultFilterStrategyApplyChecker.php
index 21ff9a53e4f96..12887207e2c5e 100644
--- a/app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/DefaultFilterStrategyApplyChecker.php
+++ b/app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/DefaultFilterStrategyApplyChecker.php
@@ -10,7 +10,7 @@
 
 /**
  * This class add in backward compatibility purposes to check if need to apply old strategy for filter prepare process.
- * @deprecated
+ * @deprecated 100.3.2
  */
 class DefaultFilterStrategyApplyChecker implements DefaultFilterStrategyApplyCheckerInterface
 {
diff --git a/app/code/Magento/Elasticsearch/SearchAdapter/Mapper.php b/app/code/Magento/Elasticsearch/SearchAdapter/Mapper.php
index d76086ee2f809..1654e02558a83 100644
--- a/app/code/Magento/Elasticsearch/SearchAdapter/Mapper.php
+++ b/app/code/Magento/Elasticsearch/SearchAdapter/Mapper.php
@@ -19,7 +19,7 @@
  *
  * @api
  * @since 100.1.0
- * @deprecated because of EOL for Elasticsearch2
+ * @deprecated 100.3.5 because of EOL for Elasticsearch2
  */
 class Mapper extends Elasticsearch5Mapper
 {
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php b/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
index 112813c3b096c..7beb266508cc9 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
@@ -20,7 +20,7 @@ class Edit extends Widget implements ContainerInterface
 {
     /**
      * @var \Magento\Framework\Registry
-     * @deprecated since 2.3.0 in favor of stateful global objects elimination.
+     * @deprecated 101.0.0 since 2.3.0 in favor of stateful global objects elimination.
      */
     protected $_registryManager;
 
diff --git a/app/code/Magento/Email/Controller/Adminhtml/Email/Template.php b/app/code/Magento/Email/Controller/Adminhtml/Email/Template.php
index 50153b2bb6520..5af5230b0e33d 100644
--- a/app/code/Magento/Email/Controller/Adminhtml/Email/Template.php
+++ b/app/code/Magento/Email/Controller/Adminhtml/Email/Template.php
@@ -23,7 +23,7 @@ abstract class Template extends \Magento\Backend\App\Action
      * Core registry
      *
      * @var \Magento\Framework\Registry
-     * @deprecated since 2.3.0 in favor of stateful global objects elimination.
+     * @deprecated 101.0.0 since 2.3.0 in favor of stateful global objects elimination.
      */
     protected $_coreRegistry = null;
 
diff --git a/app/code/Magento/Email/Model/Template/Filter.php b/app/code/Magento/Email/Model/Template/Filter.php
index cd075a5115ff0..648e4ab8fc380 100644
--- a/app/code/Magento/Email/Model/Template/Filter.php
+++ b/app/code/Magento/Email/Model/Template/Filter.php
@@ -53,7 +53,7 @@ class Filter extends \Magento\Framework\Filter\Template
      * Modifier Callbacks
      *
      * @var array
-     * @deprecated Use the new Directive Processor interfaces
+     * @deprecated 101.0.4 Use the new Directive Processor interfaces
      */
     protected $_modifiers = ['nl2br' => ''];
 
@@ -665,7 +665,7 @@ public function varDirective($construction)
      * @param string $value
      * @param string $default assumed modifier if none present
      * @return array
-     * @deprecated Use the new FilterApplier or Directive Processor interfaces
+     * @deprecated 101.0.4 Use the new FilterApplier or Directive Processor interfaces
      */
     protected function explodeModifiers($value, $default = null)
     {
@@ -684,7 +684,7 @@ protected function explodeModifiers($value, $default = null)
      * @param string $value
      * @param string $modifiers
      * @return string
-     * @deprecated Use the new FilterApplier or Directive Processor interfaces
+     * @deprecated 101.0.4 Use the new FilterApplier or Directive Processor interfaces
      */
     protected function applyModifiers($value, $modifiers)
     {
@@ -712,7 +712,7 @@ protected function applyModifiers($value, $modifiers)
      * @param string $value
      * @param string $type
      * @return string
-     * @deprecated Use the new FilterApplier or Directive Processor interfaces
+     * @deprecated 101.0.4 Use the new FilterApplier or Directive Processor interfaces
      */
     public function modifierEscape($value, $type = 'html')
     {
diff --git a/app/code/Magento/GiftMessage/Block/Message/Inline.php b/app/code/Magento/GiftMessage/Block/Message/Inline.php
index 4a9311c1b4ba2..475f1c2b717ae 100644
--- a/app/code/Magento/GiftMessage/Block/Message/Inline.php
+++ b/app/code/Magento/GiftMessage/Block/Message/Inline.php
@@ -280,7 +280,7 @@ public function countItems()
     /**
      * Call method getItemsHasMessages
      *
-     * @deprecated Misspelled method
+     * @deprecated 100.2.4 Misspelled method
      * @see getItemsHasMessages
      */
     public function getItemsHasMesssages()
diff --git a/app/code/Magento/GoogleAdwords/Helper/Data.php b/app/code/Magento/GoogleAdwords/Helper/Data.php
index 0e95859193d42..e3b85822059d8 100644
--- a/app/code/Magento/GoogleAdwords/Helper/Data.php
+++ b/app/code/Magento/GoogleAdwords/Helper/Data.php
@@ -280,6 +280,7 @@ public function getConversionValue()
      * Get send order currency to Google Adwords
      *
      * @return boolean
+     * @since 100.3.0
      */
     public function hasSendConversionValueCurrency()
     {
@@ -293,6 +294,7 @@ public function hasSendConversionValueCurrency()
      * Get Google AdWords conversion value currency
      *
      * @return string|false
+     * @since 100.3.0
      */
     public function getConversionValueCurrency()
     {
diff --git a/app/code/Magento/GraphQl/Controller/GraphQl.php b/app/code/Magento/GraphQl/Controller/GraphQl.php
index 2d72fde91b031..34dbeaa2ed0a2 100644
--- a/app/code/Magento/GraphQl/Controller/GraphQl.php
+++ b/app/code/Magento/GraphQl/Controller/GraphQl.php
@@ -28,12 +28,13 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @since 100.3.0
  */
 class GraphQl implements FrontControllerInterface
 {
     /**
      * @var \Magento\Framework\Webapi\Response
-     * @deprecated
+     * @deprecated 100.3.2
      */
     private $response;
 
@@ -59,7 +60,7 @@ class GraphQl implements FrontControllerInterface
 
     /**
      * @var ContextInterface
-     * @deprecated $contextFactory is used for creating Context object
+     * @deprecated 100.3.3 $contextFactory is used for creating Context object
      */
     private $resolverContext;
 
@@ -133,6 +134,7 @@ public function __construct(
      *
      * @param RequestInterface $request
      * @return ResponseInterface
+     * @since 100.3.0
      */
     public function dispatch(RequestInterface $request) : ResponseInterface
     {
diff --git a/app/code/Magento/GraphQl/Model/Query/Resolver/Context.php b/app/code/Magento/GraphQl/Model/Query/Resolver/Context.php
index 2b8e3fabd6863..9403ccaf07099 100644
--- a/app/code/Magento/GraphQl/Model/Query/Resolver/Context.php
+++ b/app/code/Magento/GraphQl/Model/Query/Resolver/Context.php
@@ -12,7 +12,7 @@
 /**
  * Do not use this class. It was kept for backward compatibility.
  *
- * @deprecated \Magento\GraphQl\Model\Query\Context is used instead of this
+ * @deprecated 100.3.3 \Magento\GraphQl\Model\Query\Context is used instead of this
  */
 class Context extends \Magento\Framework\Model\AbstractExtensibleModel implements ContextInterface
 {
diff --git a/app/code/Magento/GroupedProduct/Block/Order/Email/Items/CreditMemo/Grouped.php b/app/code/Magento/GroupedProduct/Block/Order/Email/Items/CreditMemo/Grouped.php
index 6df890b3e94dc..2b4ee3a7d27da 100644
--- a/app/code/Magento/GroupedProduct/Block/Order/Email/Items/CreditMemo/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Block/Order/Email/Items/CreditMemo/Grouped.php
@@ -13,6 +13,7 @@
  * Class renders grouped product(s) in the CreditMemo email
  *
  * @api
+ * @since 100.4.0
  */
 class Grouped extends DefaultItems
 {
@@ -22,6 +23,7 @@ class Grouped extends DefaultItems
      * This method uses renderer for real product type
      *
      * @return string
+     * @since 100.4.0
      */
     protected function _toHtml()
     {
diff --git a/app/code/Magento/ImportExport/Api/Data/ExportInfoInterface.php b/app/code/Magento/ImportExport/Api/Data/ExportInfoInterface.php
index 01c41e35fc4eb..f670d97626725 100644
--- a/app/code/Magento/ImportExport/Api/Data/ExportInfoInterface.php
+++ b/app/code/Magento/ImportExport/Api/Data/ExportInfoInterface.php
@@ -10,6 +10,7 @@
 /**
  * Basic interface with data needed for export operation.
  * @api
+ * @since 100.3.2
  */
 interface ExportInfoInterface
 {
@@ -17,6 +18,7 @@ interface ExportInfoInterface
      * Return filename.
      *
      * @return string
+     * @since 100.3.2
      */
     public function getFileName();
 
@@ -25,6 +27,7 @@ public function getFileName();
      *
      * @param string $fileName
      * @return void
+     * @since 100.3.2
      */
     public function setFileName($fileName);
 
@@ -32,6 +35,7 @@ public function setFileName($fileName);
      * Override standard entity getter.
      *
      * @return string
+     * @since 100.3.2
      */
     public function getFileFormat();
 
@@ -40,6 +44,7 @@ public function getFileFormat();
      *
      * @param string $fileFormat
      * @return void
+     * @since 100.3.2
      */
     public function setFileFormat($fileFormat);
 
@@ -47,6 +52,7 @@ public function setFileFormat($fileFormat);
      * Return content type.
      *
      * @return string
+     * @since 100.3.2
      */
     public function getContentType();
 
@@ -55,6 +61,7 @@ public function getContentType();
      *
      * @param string $contentType
      * @return void
+     * @since 100.3.2
      */
     public function setContentType($contentType);
 
@@ -62,6 +69,7 @@ public function setContentType($contentType);
      * Returns entity.
      *
      * @return string
+     * @since 100.3.2
      */
     public function getEntity();
 
@@ -70,6 +78,7 @@ public function getEntity();
      *
      * @param string $entity
      * @return void
+     * @since 100.3.2
      */
     public function setEntity($entity);
 
@@ -77,6 +86,7 @@ public function setEntity($entity);
      * Returns export filter.
      *
      * @return string
+     * @since 100.3.2
      */
     public function getExportFilter();
 
@@ -85,6 +95,7 @@ public function getExportFilter();
      *
      * @param string $exportFilter
      * @return void
+     * @since 100.3.2
      */
     public function setExportFilter($exportFilter);
 }
diff --git a/app/code/Magento/ImportExport/Api/ExportManagementInterface.php b/app/code/Magento/ImportExport/Api/ExportManagementInterface.php
index 39bb89b43c838..0383b2a43b45e 100644
--- a/app/code/Magento/ImportExport/Api/ExportManagementInterface.php
+++ b/app/code/Magento/ImportExport/Api/ExportManagementInterface.php
@@ -12,6 +12,7 @@
 /**
  * Describes how to do export operation with data interface.
  * @api
+ * @since 100.3.2
  */
 interface ExportManagementInterface
 {
@@ -20,6 +21,7 @@ interface ExportManagementInterface
      *
      * @param ExportInfoInterface $exportInfo
      * @return string
+     * @since 100.3.2
      */
     public function export(ExportInfoInterface $exportInfo);
 }
diff --git a/app/code/Magento/ImportExport/Helper/Report.php b/app/code/Magento/ImportExport/Helper/Report.php
index 02bc4d8b8a047..29d1928d837d6 100644
--- a/app/code/Magento/ImportExport/Helper/Report.php
+++ b/app/code/Magento/ImportExport/Helper/Report.php
@@ -140,6 +140,7 @@ protected function getFilePath($filename)
      * Get csv delimiter from request.
      *
      * @return string
+     * @since 100.2.2
      */
     public function getDelimiter()
     {
diff --git a/app/code/Magento/ImportExport/Model/Export.php b/app/code/Magento/ImportExport/Model/Export.php
index 850ded7c8f256..3d7a190919525 100644
--- a/app/code/Magento/ImportExport/Model/Export.php
+++ b/app/code/Magento/ImportExport/Model/Export.php
@@ -13,7 +13,7 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
- * @deprecated
+ * @deprecated 100.3.2
  */
 class Export extends \Magento\ImportExport\Model\AbstractModel
 {
diff --git a/app/code/Magento/ImportExport/Model/Export/Adapter/Csv.php b/app/code/Magento/ImportExport/Model/Export/Adapter/Csv.php
index 09b17371ae4e8..580695d0db058 100644
--- a/app/code/Magento/ImportExport/Model/Export/Adapter/Csv.php
+++ b/app/code/Magento/ImportExport/Model/Export/Adapter/Csv.php
@@ -39,6 +39,7 @@ class Csv extends AbstractAdapter
 
     /**
      * Object destructor
+     * @since 100.3.5
      */
     public function __destruct()
     {
diff --git a/app/code/Magento/ImportExport/Model/History.php b/app/code/Magento/ImportExport/Model/History.php
index b85bf7da81a35..9a97367ba8453 100644
--- a/app/code/Magento/ImportExport/Model/History.php
+++ b/app/code/Magento/ImportExport/Model/History.php
@@ -44,6 +44,7 @@ class History extends \Magento\Framework\Model\AbstractModel
 
     /**
      * @var \Magento\Backend\Model\Auth\Session
+     * @since 100.3.1
      */
     protected $session;
 
diff --git a/app/code/Magento/ImportExport/Model/Import.php b/app/code/Magento/ImportExport/Model/Import.php
index cf20001882c0d..fba7c6860bbb5 100644
--- a/app/code/Magento/ImportExport/Model/Import.php
+++ b/app/code/Magento/ImportExport/Model/Import.php
@@ -614,6 +614,7 @@ public function uploadSource()
      *
      * @return Import\AbstractSource
      * @throws LocalizedException
+     * @since 100.2.7
      */
     public function uploadFileAndGetSource()
     {
diff --git a/app/code/Magento/InstantPurchase/Block/Button.php b/app/code/Magento/InstantPurchase/Block/Button.php
index e6ea50073ed48..d4f19918afaf3 100644
--- a/app/code/Magento/InstantPurchase/Block/Button.php
+++ b/app/code/Magento/InstantPurchase/Block/Button.php
@@ -13,6 +13,7 @@
  * Configuration for JavaScript instant purchase button component.
  *
  * @api
+ * @since 100.2.0
  */
 class Button extends Template
 {
@@ -40,6 +41,7 @@ public function __construct(
      * Checks if button enabled.
      *
      * @return bool
+     * @since 100.2.0
      */
     public function isEnabled(): bool
     {
@@ -48,6 +50,7 @@ public function isEnabled(): bool
 
     /**
      * @inheritdoc
+     * @since 100.2.0
      */
     public function getJsLayout(): string
     {
diff --git a/app/code/Magento/InstantPurchase/Model/BillingAddressChoose/BillingAddressChooserInterface.php b/app/code/Magento/InstantPurchase/Model/BillingAddressChoose/BillingAddressChooserInterface.php
index cfed97cfefd36..91eb91e2cd33c 100644
--- a/app/code/Magento/InstantPurchase/Model/BillingAddressChoose/BillingAddressChooserInterface.php
+++ b/app/code/Magento/InstantPurchase/Model/BillingAddressChoose/BillingAddressChooserInterface.php
@@ -12,12 +12,14 @@
  * Interface to choose billing address for a customer if available.
  *
  * @api
+ * @since 100.2.0
  */
 interface BillingAddressChooserInterface
 {
     /**
      * @param Customer $customer
      * @return Address|null
+     * @since 100.2.0
      */
     public function choose(Customer $customer);
 }
diff --git a/app/code/Magento/InstantPurchase/Model/InstantPurchaseInterface.php b/app/code/Magento/InstantPurchase/Model/InstantPurchaseInterface.php
index b205ccab5067d..24a9569128064 100644
--- a/app/code/Magento/InstantPurchase/Model/InstantPurchaseInterface.php
+++ b/app/code/Magento/InstantPurchase/Model/InstantPurchaseInterface.php
@@ -12,6 +12,7 @@
  * Interface for detecting customer option to make instant purchase in a store.
  *
  * @api
+ * @since 100.2.0
  */
 interface InstantPurchaseInterface
 {
@@ -21,6 +22,7 @@ interface InstantPurchaseInterface
      * @param Store $store
      * @param Customer $customer
      * @return InstantPurchaseOption
+     * @since 100.2.0
      */
     public function getOption(
         Store $store,
diff --git a/app/code/Magento/InstantPurchase/Model/InstantPurchaseOption.php b/app/code/Magento/InstantPurchase/Model/InstantPurchaseOption.php
index 0748c5818c857..11ab119d6e5a5 100644
--- a/app/code/Magento/InstantPurchase/Model/InstantPurchaseOption.php
+++ b/app/code/Magento/InstantPurchase/Model/InstantPurchaseOption.php
@@ -16,6 +16,7 @@
  * Option to make instant purchase.
  *
  * @api
+ * @since 100.2.0
  */
 class InstantPurchaseOption
 {
@@ -82,6 +83,7 @@ public function __construct(
      * Checks if option available
      *
      * @return bool
+     * @since 100.2.0
      */
     public function isAvailable(): bool
     {
@@ -98,6 +100,7 @@ public function isAvailable(): bool
      *
      * @return PaymentTokenInterface
      * @throws LocalizedException if payment token is not defined
+     * @since 100.2.0
      */
     public function getPaymentToken(): PaymentTokenInterface
     {
@@ -114,6 +117,7 @@ public function getPaymentToken(): PaymentTokenInterface
      *
      * @return Address
      * @throws LocalizedException if shipping address is not defined
+     * @since 100.2.0
      */
     public function getShippingAddress(): Address
     {
@@ -128,6 +132,7 @@ public function getShippingAddress(): Address
      *
      * @return Address
      * @throws LocalizedException if billing address is not defined
+     * @since 100.2.0
      */
     public function getBillingAddress(): Address
     {
@@ -142,6 +147,7 @@ public function getBillingAddress(): Address
      *
      * @return ShippingMethodInterface
      * @throws LocalizedException if shipping method is not defined
+     * @since 100.2.0
      */
     public function getShippingMethod(): ShippingMethodInterface
     {
diff --git a/app/code/Magento/InstantPurchase/Model/InstantPurchaseOptionFactory.php b/app/code/Magento/InstantPurchase/Model/InstantPurchaseOptionFactory.php
index bd5811578ab1c..6e9490c9edb69 100644
--- a/app/code/Magento/InstantPurchase/Model/InstantPurchaseOptionFactory.php
+++ b/app/code/Magento/InstantPurchase/Model/InstantPurchaseOptionFactory.php
@@ -14,6 +14,7 @@
  * Create instances of instant purchase option.
  *
  * @api
+ * @since 100.2.0
  */
 class InstantPurchaseOptionFactory
 {
@@ -39,6 +40,7 @@ public function __construct(ObjectManagerInterface $objectManager)
      * @param Address|null $billingAddress
      * @param ShippingMethodInterface|null $shippingMethod
      * @return InstantPurchaseOption
+     * @since 100.2.0
      */
     public function create(
         PaymentTokenInterface $paymentToken = null,
@@ -58,6 +60,7 @@ public function create(
      * Creates new empty instance (no option available).
      *
      * @return InstantPurchaseOption
+     * @since 100.2.0
      */
     public function createDisabledOption(): InstantPurchaseOption
     {
diff --git a/app/code/Magento/InstantPurchase/Model/PaymentMethodChoose/PaymentTokenChooserInterface.php b/app/code/Magento/InstantPurchase/Model/PaymentMethodChoose/PaymentTokenChooserInterface.php
index 2a4f1adeb4155..b96173081164c 100644
--- a/app/code/Magento/InstantPurchase/Model/PaymentMethodChoose/PaymentTokenChooserInterface.php
+++ b/app/code/Magento/InstantPurchase/Model/PaymentMethodChoose/PaymentTokenChooserInterface.php
@@ -13,6 +13,7 @@
  * Interface to choose one of the stored payment methods for a customer if available.
  *
  * @api
+ * @since 100.2.0
  */
 interface PaymentTokenChooserInterface
 {
@@ -20,6 +21,7 @@ interface PaymentTokenChooserInterface
      * @param Store $store
      * @param Customer $customer
      * @return PaymentTokenInterface|null
+     * @since 100.2.0
      */
     public function choose(Store $store, Customer $customer);
 }
diff --git a/app/code/Magento/InstantPurchase/Model/PlaceOrder.php b/app/code/Magento/InstantPurchase/Model/PlaceOrder.php
index 2ad56a8859cf3..bd30d19d6456b 100644
--- a/app/code/Magento/InstantPurchase/Model/PlaceOrder.php
+++ b/app/code/Magento/InstantPurchase/Model/PlaceOrder.php
@@ -21,6 +21,7 @@
  * Place an order using instant purchase option.
  *
  * @api
+ * @since 100.2.0
  */
 class PlaceOrder
 {
@@ -90,6 +91,7 @@ public function __construct(
      * @return int order identifier
      * @throws LocalizedException if order can not be placed.
      * @throws Throwable if unpredictable error occurred.
+     * @since 100.2.0
      */
     public function placeOrder(
         Store $store,
diff --git a/app/code/Magento/InstantPurchase/Model/QuoteManagement/PaymentConfiguration.php b/app/code/Magento/InstantPurchase/Model/QuoteManagement/PaymentConfiguration.php
index 9c8c44231e843..d1dfb11851500 100644
--- a/app/code/Magento/InstantPurchase/Model/QuoteManagement/PaymentConfiguration.php
+++ b/app/code/Magento/InstantPurchase/Model/QuoteManagement/PaymentConfiguration.php
@@ -15,6 +15,7 @@
  * Configure payment method for quote.
  *
  * @api May be used for pluginization.
+ * @since 100.2.0
  */
 class PaymentConfiguration
 {
@@ -42,6 +43,7 @@ public function __construct(
      * @param PaymentTokenInterface $paymentToken
      * @return Quote
      * @throws LocalizedException if payment method can not be configured for a quote.
+     * @since 100.2.0
      */
     public function configurePayment(
         Quote $quote,
diff --git a/app/code/Magento/InstantPurchase/Model/QuoteManagement/Purchase.php b/app/code/Magento/InstantPurchase/Model/QuoteManagement/Purchase.php
index b8220b4ca87eb..d05a4f2a1621a 100644
--- a/app/code/Magento/InstantPurchase/Model/QuoteManagement/Purchase.php
+++ b/app/code/Magento/InstantPurchase/Model/QuoteManagement/Purchase.php
@@ -14,6 +14,7 @@
  * Purchase products from quote.
  *
  * @api May be used for pluginization.
+ * @since 100.2.0
  */
 class Purchase
 {
@@ -46,6 +47,7 @@ public function __construct(
      * @param Quote $quote
      * @return int Order id
      * @throws LocalizedException if order can not be placed for a quote.
+     * @since 100.2.0
      */
     public function purchase(Quote $quote): int
     {
diff --git a/app/code/Magento/InstantPurchase/Model/QuoteManagement/QuoteCreation.php b/app/code/Magento/InstantPurchase/Model/QuoteManagement/QuoteCreation.php
index 993a64a3f0d7d..4db9c86f7184e 100644
--- a/app/code/Magento/InstantPurchase/Model/QuoteManagement/QuoteCreation.php
+++ b/app/code/Magento/InstantPurchase/Model/QuoteManagement/QuoteCreation.php
@@ -16,6 +16,7 @@
  * Create Quote for instance purchase.
  *
  * @api May be used for pluginization.
+ * @since 100.2.0
  */
 class QuoteCreation
 {
@@ -43,6 +44,7 @@ public function __construct(
      * @param Address $billingAddress
      * @return Quote
      * @throws LocalizedException if quote can not be created.
+     * @since 100.2.0
      */
     public function createQuote(
         Store $store,
diff --git a/app/code/Magento/InstantPurchase/Model/QuoteManagement/QuoteFilling.php b/app/code/Magento/InstantPurchase/Model/QuoteManagement/QuoteFilling.php
index 4afa964050fcd..727917f9e3406 100644
--- a/app/code/Magento/InstantPurchase/Model/QuoteManagement/QuoteFilling.php
+++ b/app/code/Magento/InstantPurchase/Model/QuoteManagement/QuoteFilling.php
@@ -14,6 +14,7 @@
  * Fill quote with products for instant purchase.
  *
  * @api May be used for pluginization.
+ * @since 100.2.0
  */
 class QuoteFilling
 {
@@ -25,6 +26,7 @@ class QuoteFilling
      * @param array $productRequest
      * @return Quote
      * @throws LocalizedException if product can not be added to quote.
+     * @since 100.2.0
      */
     public function fillQuote(
         Quote $quote,
diff --git a/app/code/Magento/InstantPurchase/Model/QuoteManagement/ShippingConfiguration.php b/app/code/Magento/InstantPurchase/Model/QuoteManagement/ShippingConfiguration.php
index 796fb924b31c9..772d6c6a033fa 100644
--- a/app/code/Magento/InstantPurchase/Model/QuoteManagement/ShippingConfiguration.php
+++ b/app/code/Magento/InstantPurchase/Model/QuoteManagement/ShippingConfiguration.php
@@ -16,6 +16,7 @@
  * Configure shipping method for instant purchase
  *
  * @api May be used for pluginization.
+ * @since 100.2.0
  */
 class ShippingConfiguration
 {
@@ -41,6 +42,7 @@ public function __construct(
      * @param ShippingMethodInterface $shippingMethod
      * @return Quote
      * @throws LocalizedException if shipping can not be configured for a quote.
+     * @since 100.2.0
      */
     public function configureShippingMethod(
         Quote $quote,
diff --git a/app/code/Magento/InstantPurchase/Model/ShippingAddressChoose/ShippingAddressChooserInterface.php b/app/code/Magento/InstantPurchase/Model/ShippingAddressChoose/ShippingAddressChooserInterface.php
index a65c8036a1e82..06f4358ecfa92 100644
--- a/app/code/Magento/InstantPurchase/Model/ShippingAddressChoose/ShippingAddressChooserInterface.php
+++ b/app/code/Magento/InstantPurchase/Model/ShippingAddressChoose/ShippingAddressChooserInterface.php
@@ -12,12 +12,14 @@
  * Interface to choose shipping address for a customer if available.
  *
  * @api
+ * @since 100.2.0
  */
 interface ShippingAddressChooserInterface
 {
     /**
      * @param Customer $customer
      * @return Address|null
+     * @since 100.2.0
      */
     public function choose(Customer $customer);
 }
diff --git a/app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/DeferredShippingMethodChooserInterface.php b/app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/DeferredShippingMethodChooserInterface.php
index 3339ca34ee29b..0476f2c690d4d 100644
--- a/app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/DeferredShippingMethodChooserInterface.php
+++ b/app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/DeferredShippingMethodChooserInterface.php
@@ -11,6 +11,7 @@
  * Provides mechanism to defer shipping method choose to the moment when quote is defined.
  *
  * @api
+ * @since 100.2.0
  */
 interface DeferredShippingMethodChooserInterface
 {
@@ -24,6 +25,7 @@ interface DeferredShippingMethodChooserInterface
      *
      * @param Address $address
      * @return string|null Quote shipping method code if available
+     * @since 100.2.0
      */
     public function choose(Address $address);
 }
diff --git a/app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/DeferredShippingMethodChooserPool.php b/app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/DeferredShippingMethodChooserPool.php
index ca0e9351967ad..6e2e8e562167c 100644
--- a/app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/DeferredShippingMethodChooserPool.php
+++ b/app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/DeferredShippingMethodChooserPool.php
@@ -10,6 +10,7 @@
  * Use deferred shipping method code as a key for a deferred chooser.
  *
  * @api
+ * @since 100.2.0
  */
 class DeferredShippingMethodChooserPool
 {
@@ -34,6 +35,7 @@ public function __construct(array $choosers)
     /**
      * @param string $type
      * @return DeferredShippingMethodChooserInterface
+     * @since 100.2.0
      */
     public function get($type) : DeferredShippingMethodChooserInterface
     {
diff --git a/app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/ShippingMethodChooserInterface.php b/app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/ShippingMethodChooserInterface.php
index c227ad793f255..dd3f9d0a6cd52 100644
--- a/app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/ShippingMethodChooserInterface.php
+++ b/app/code/Magento/InstantPurchase/Model/ShippingMethodChoose/ShippingMethodChooserInterface.php
@@ -20,12 +20,14 @@
  * DeferredShippingMethodChooserPool.
  *
  * @api
+ * @since 100.2.0
  */
 interface ShippingMethodChooserInterface
 {
     /**
      * @param Address $address
      * @return ShippingMethodInterface|null
+     * @since 100.2.0
      */
     public function choose(Address $address);
 }
diff --git a/app/code/Magento/InstantPurchase/Model/Ui/CustomerAddressesFormatter.php b/app/code/Magento/InstantPurchase/Model/Ui/CustomerAddressesFormatter.php
index 31c98143385a6..3b886fb03929e 100644
--- a/app/code/Magento/InstantPurchase/Model/Ui/CustomerAddressesFormatter.php
+++ b/app/code/Magento/InstantPurchase/Model/Ui/CustomerAddressesFormatter.php
@@ -11,6 +11,7 @@
  * Address string presentation.
  *
  * @api May be used for pluginization.
+ * @since 100.2.0
  */
 class CustomerAddressesFormatter
 {
@@ -19,6 +20,7 @@ class CustomerAddressesFormatter
      *
      * @param Address $address
      * @return string
+     * @since 100.2.0
      */
     public function format(Address $address): string
     {
diff --git a/app/code/Magento/InstantPurchase/Model/Ui/PaymentTokenFormatter.php b/app/code/Magento/InstantPurchase/Model/Ui/PaymentTokenFormatter.php
index 4c2a78e3a6024..16992ff6bf3f1 100644
--- a/app/code/Magento/InstantPurchase/Model/Ui/PaymentTokenFormatter.php
+++ b/app/code/Magento/InstantPurchase/Model/Ui/PaymentTokenFormatter.php
@@ -12,6 +12,7 @@
  * Payment token string presentation.
  *
  * @api May be used for pluginization.
+ * @since 100.2.0
  */
 class PaymentTokenFormatter
 {
@@ -34,6 +35,7 @@ public function __construct(IntegrationsManager $integrationsManager)
      *
      * @param PaymentTokenInterface $paymentToken
      * @return string
+     * @since 100.2.0
      */
     public function format(PaymentTokenInterface $paymentToken): string
     {
diff --git a/app/code/Magento/InstantPurchase/Model/Ui/ShippingMethodFormatter.php b/app/code/Magento/InstantPurchase/Model/Ui/ShippingMethodFormatter.php
index ec56b3e3dae02..eaefbe4c5f104 100644
--- a/app/code/Magento/InstantPurchase/Model/Ui/ShippingMethodFormatter.php
+++ b/app/code/Magento/InstantPurchase/Model/Ui/ShippingMethodFormatter.php
@@ -11,12 +11,14 @@
  * Ship[ping method string presentation.
  *
  * @api May be used for pluginization.
+ * @since 100.2.0
  */
 class ShippingMethodFormatter
 {
     /**
      * @param ShippingMethodInterface $shippingMethod
      * @return string
+     * @since 100.2.0
      */
     public function format(ShippingMethodInterface $shippingMethod) : string
     {
diff --git a/app/code/Magento/InstantPurchase/PaymentMethodIntegration/AvailabilityCheckerInterface.php b/app/code/Magento/InstantPurchase/PaymentMethodIntegration/AvailabilityCheckerInterface.php
index 825c6830b3aa6..7fe336b7a6a66 100644
--- a/app/code/Magento/InstantPurchase/PaymentMethodIntegration/AvailabilityCheckerInterface.php
+++ b/app/code/Magento/InstantPurchase/PaymentMethodIntegration/AvailabilityCheckerInterface.php
@@ -12,6 +12,7 @@
  * instant_purchase/available configuration option in vault payment config.
  *
  * @api
+ * @since 100.2.0
  */
 interface AvailabilityCheckerInterface
 {
@@ -19,6 +20,7 @@ interface AvailabilityCheckerInterface
      * Checks if payment method may be used for instant purchase.
      *
      * @return bool
+     * @since 100.2.0
      */
     public function isAvailable(): bool;
 }
diff --git a/app/code/Magento/InstantPurchase/PaymentMethodIntegration/PaymentAdditionalInformationProviderInterface.php b/app/code/Magento/InstantPurchase/PaymentMethodIntegration/PaymentAdditionalInformationProviderInterface.php
index 6f1e291a9a83b..9119b54329486 100644
--- a/app/code/Magento/InstantPurchase/PaymentMethodIntegration/PaymentAdditionalInformationProviderInterface.php
+++ b/app/code/Magento/InstantPurchase/PaymentMethodIntegration/PaymentAdditionalInformationProviderInterface.php
@@ -14,6 +14,7 @@
  * instant_purchase/additionalInformation configuration option in vault payment config.
  *
  * @api
+ * @since 100.2.0
  */
 interface PaymentAdditionalInformationProviderInterface
 {
@@ -22,6 +23,7 @@ interface PaymentAdditionalInformationProviderInterface
      *
      * @param PaymentTokenInterface $paymentToken
      * @return array
+     * @since 100.2.0
      */
     public function getAdditionalInformation(PaymentTokenInterface $paymentToken): array;
 }
diff --git a/app/code/Magento/InstantPurchase/PaymentMethodIntegration/PaymentTokenFormatterInterface.php b/app/code/Magento/InstantPurchase/PaymentMethodIntegration/PaymentTokenFormatterInterface.php
index 1ee583c45cf40..c6d31a86b622d 100644
--- a/app/code/Magento/InstantPurchase/PaymentMethodIntegration/PaymentTokenFormatterInterface.php
+++ b/app/code/Magento/InstantPurchase/PaymentMethodIntegration/PaymentTokenFormatterInterface.php
@@ -15,6 +15,7 @@
  * instant_purchase/tokenFormat configuration option in vault payment config.
  *
  * @api
+ * @since 100.2.0
  */
 interface PaymentTokenFormatterInterface
 {
@@ -23,6 +24,7 @@ interface PaymentTokenFormatterInterface
      *
      * @param PaymentTokenInterface $paymentToken
      * @return string
+     * @since 100.2.0
      */
     public function formatPaymentToken(PaymentTokenInterface $paymentToken): string;
 }
diff --git a/app/code/Magento/InstantPurchase/PaymentMethodIntegration/StaticAdditionalInformationProvider.php b/app/code/Magento/InstantPurchase/PaymentMethodIntegration/StaticAdditionalInformationProvider.php
index 56079823e9e91..0e788079794d6 100644
--- a/app/code/Magento/InstantPurchase/PaymentMethodIntegration/StaticAdditionalInformationProvider.php
+++ b/app/code/Magento/InstantPurchase/PaymentMethodIntegration/StaticAdditionalInformationProvider.php
@@ -11,6 +11,7 @@
  * Payment additional information provider that returns predefined value.
  *
  * @api
+ * @since 100.2.0
  */
 class StaticAdditionalInformationProvider implements PaymentAdditionalInformationProviderInterface
 {
@@ -30,6 +31,7 @@ public function __construct(array $value = [])
 
     /**
      * @inheritdoc
+     * @since 100.2.0
      */
     public function getAdditionalInformation(PaymentTokenInterface $paymentToken): array
     {
diff --git a/app/code/Magento/InstantPurchase/PaymentMethodIntegration/StaticAvailabilityChecker.php b/app/code/Magento/InstantPurchase/PaymentMethodIntegration/StaticAvailabilityChecker.php
index 02e24b78f741c..78f421db6aaa8 100644
--- a/app/code/Magento/InstantPurchase/PaymentMethodIntegration/StaticAvailabilityChecker.php
+++ b/app/code/Magento/InstantPurchase/PaymentMethodIntegration/StaticAvailabilityChecker.php
@@ -9,6 +9,7 @@
  * Availability checker with predefined result.
  *
  * @api
+ * @since 100.2.0
  */
 class StaticAvailabilityChecker implements AvailabilityCheckerInterface
 {
@@ -28,6 +29,7 @@ public function __construct(bool $value = true)
 
     /**
      * @inheritdoc
+     * @since 100.2.0
      */
     public function isAvailable(): bool
     {
diff --git a/app/code/Magento/LayeredNavigation/Block/Navigation.php b/app/code/Magento/LayeredNavigation/Block/Navigation.php
index e394fe7f6cf5b..85d3dd2a2a01d 100644
--- a/app/code/Magento/LayeredNavigation/Block/Navigation.php
+++ b/app/code/Magento/LayeredNavigation/Block/Navigation.php
@@ -76,6 +76,7 @@ protected function _prepareLayout()
 
     /**
      * @inheritdoc
+     * @since 100.3.4
      */
     protected function _beforeToHtml()
     {
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Block/Adminhtml/ConfirmationPopup.php b/app/code/Magento/LoginAsCustomerAdminUi/Block/Adminhtml/ConfirmationPopup.php
index e2d11b2c8cb80..ce5a5501fbe55 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/Block/Adminhtml/ConfirmationPopup.php
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Block/Adminhtml/ConfirmationPopup.php
@@ -16,6 +16,7 @@
  * Login confirmation pop-up
  *
  * @api
+ * @since 100.4.0
  */
 class ConfirmationPopup extends Template
 {
@@ -56,6 +57,7 @@ public function __construct(
 
     /**
      * @inheritdoc
+     * @since 100.4.0
      */
     public function getJsLayout()
     {
@@ -78,6 +80,7 @@ public function getJsLayout()
 
     /**
      * @inheritdoc
+     * @since 100.4.0
      */
     public function toHtml()
     {
diff --git a/app/code/Magento/LoginAsCustomerApi/Api/ConfigInterface.php b/app/code/Magento/LoginAsCustomerApi/Api/ConfigInterface.php
index aadcc8e1b566b..7048fa5a9e418 100644
--- a/app/code/Magento/LoginAsCustomerApi/Api/ConfigInterface.php
+++ b/app/code/Magento/LoginAsCustomerApi/Api/ConfigInterface.php
@@ -11,6 +11,7 @@
  * LoginAsCustomer config
  *
  * @api
+ * @since 100.4.0
  */
 interface ConfigInterface
 {
@@ -18,6 +19,7 @@ interface ConfigInterface
      * Check if Login as Customer extension is enabled
      *
      * @return bool
+     * @since 100.4.0
      */
     public function isEnabled(): bool;
 
@@ -25,6 +27,7 @@ public function isEnabled(): bool;
      * Check if store view manual choice is enabled
      *
      * @return bool
+     * @since 100.4.0
      */
     public function isStoreManualChoiceEnabled(): bool;
 
@@ -32,6 +35,7 @@ public function isStoreManualChoiceEnabled(): bool;
      * Get authentication data expiration time (in seconds)
      *
      * @return int
+     * @since 100.4.0
      */
     public function getAuthenticationDataExpirationTime(): int;
 }
diff --git a/app/code/Magento/LoginAsCustomerApi/Api/Data/AuthenticationDataInterface.php b/app/code/Magento/LoginAsCustomerApi/Api/Data/AuthenticationDataInterface.php
index f74f63c39f7ba..1126de140192a 100644
--- a/app/code/Magento/LoginAsCustomerApi/Api/Data/AuthenticationDataInterface.php
+++ b/app/code/Magento/LoginAsCustomerApi/Api/Data/AuthenticationDataInterface.php
@@ -13,6 +13,7 @@
  * Authentication data
  *
  * @api
+ * @since 100.4.0
  */
 interface AuthenticationDataInterface extends ExtensibleDataInterface
 {
@@ -20,6 +21,7 @@ interface AuthenticationDataInterface extends ExtensibleDataInterface
      * Get Customer Id
      *
      * @return int
+     * @since 100.4.0
      */
     public function getCustomerId(): int;
 
@@ -27,6 +29,7 @@ public function getCustomerId(): int;
      * Get Admin Id
      *
      * @return int
+     * @since 100.4.0
      */
     public function getAdminId(): int;
 
@@ -36,6 +39,7 @@ public function getAdminId(): int;
      * Fully qualified namespaces is needed for proper work of ccode generation
      *
      * @return \Magento\LoginAsCustomerApi\Api\Data\AuthenticationDataExtensionInterface|null
+     * @since 100.4.0
      */
     public function getExtensionAttributes(): ?AuthenticationDataExtensionInterface;
 }
diff --git a/app/code/Magento/LoginAsCustomerApi/Api/GetAuthenticationDataBySecretInterface.php b/app/code/Magento/LoginAsCustomerApi/Api/GetAuthenticationDataBySecretInterface.php
index 47e8d72b3b47e..b5c7405d05cdd 100644
--- a/app/code/Magento/LoginAsCustomerApi/Api/GetAuthenticationDataBySecretInterface.php
+++ b/app/code/Magento/LoginAsCustomerApi/Api/GetAuthenticationDataBySecretInterface.php
@@ -14,6 +14,7 @@
  * Get authentication data by secret
  *
  * @api
+ * @since 100.4.0
  */
 interface GetAuthenticationDataBySecretInterface
 {
@@ -23,6 +24,7 @@ interface GetAuthenticationDataBySecretInterface
      * @param string $secret
      * @return AuthenticationDataInterface
      * @throws LocalizedException
+     * @since 100.4.0
      */
     public function execute(string $secret): AuthenticationDataInterface;
 }
diff --git a/app/code/Magento/LoginAsCustomerApi/Api/IsLoginAsCustomerSessionActiveInterface.php b/app/code/Magento/LoginAsCustomerApi/Api/IsLoginAsCustomerSessionActiveInterface.php
index 30674375ed021..6e3688e586c7c 100644
--- a/app/code/Magento/LoginAsCustomerApi/Api/IsLoginAsCustomerSessionActiveInterface.php
+++ b/app/code/Magento/LoginAsCustomerApi/Api/IsLoginAsCustomerSessionActiveInterface.php
@@ -11,6 +11,7 @@
  * Check if Login as Customer session is still active.
  *
  * @api
+ * @since 100.4.0
  */
 interface IsLoginAsCustomerSessionActiveInterface
 {
@@ -20,6 +21,7 @@ interface IsLoginAsCustomerSessionActiveInterface
      * @param int $customerId
      * @param int $userId
      * @return bool
+     * @since 100.4.0
      */
     public function execute(int $customerId, int $userId): bool;
 }
diff --git a/app/code/Magento/LoginAsCustomerApi/Api/SaveAuthenticationDataInterface.php b/app/code/Magento/LoginAsCustomerApi/Api/SaveAuthenticationDataInterface.php
index 88d4cb8056cf6..1d828d7f802c0 100644
--- a/app/code/Magento/LoginAsCustomerApi/Api/SaveAuthenticationDataInterface.php
+++ b/app/code/Magento/LoginAsCustomerApi/Api/SaveAuthenticationDataInterface.php
@@ -14,6 +14,7 @@
  * Save authentication data. Return secret key
  *
  * @api
+ * @since 100.4.0
  */
 interface SaveAuthenticationDataInterface
 {
@@ -23,6 +24,7 @@ interface SaveAuthenticationDataInterface
      * @param Data\AuthenticationDataInterface $authenticationData
      * @return string
      * @throws LocalizedException
+     * @since 100.4.0
      */
     public function execute(AuthenticationDataInterface $authenticationData): string;
 }
diff --git a/app/code/Magento/LoginAsCustomerLog/Api/Data/LogInterface.php b/app/code/Magento/LoginAsCustomerLog/Api/Data/LogInterface.php
index 10d793d6c4c0b..7a058ecfc5df8 100644
--- a/app/code/Magento/LoginAsCustomerLog/Api/Data/LogInterface.php
+++ b/app/code/Magento/LoginAsCustomerLog/Api/Data/LogInterface.php
@@ -13,6 +13,7 @@
  * Data interface for login as customer log.
  *
  * @api
+ * @since 100.4.0
  */
 interface LogInterface extends ExtensibleDataInterface
 {
@@ -28,6 +29,7 @@ interface LogInterface extends ExtensibleDataInterface
      *
      * @param int $logId
      * @return void
+     * @since 100.4.0
      */
     public function setLogId(int $logId): void;
 
@@ -35,6 +37,7 @@ public function setLogId(int $logId): void;
      * Retrieve login as customer log id.
      *
      * @return null|int
+     * @since 100.4.0
      */
     public function getLogId(): ?int;
 
@@ -43,6 +46,7 @@ public function getLogId(): ?int;
      *
      * @param string $time
      * @return void
+     * @since 100.4.0
      */
     public function setTime(string $time): void;
 
@@ -50,6 +54,7 @@ public function setTime(string $time): void;
      * Retrieve login as customer log time.
      *
      * @return null|string
+     * @since 100.4.0
      */
     public function getTime(): ?string;
 
@@ -58,6 +63,7 @@ public function getTime(): ?string;
      *
      * @param int $userId
      * @return void
+     * @since 100.4.0
      */
     public function setUserId(int $userId): void;
 
@@ -65,6 +71,7 @@ public function setUserId(int $userId): void;
      * Retrieve login as customer log user id.
      *
      * @return null|int
+     * @since 100.4.0
      */
     public function getUserId(): ?int;
 
@@ -73,6 +80,7 @@ public function getUserId(): ?int;
      *
      * @param string $userName
      * @return void
+     * @since 100.4.0
      */
     public function setUserName(string $userName): void;
 
@@ -80,6 +88,7 @@ public function setUserName(string $userName): void;
      * Retrieve login as customer log user name.
      *
      * @return null|string
+     * @since 100.4.0
      */
     public function getUserName(): ?string;
 
@@ -88,6 +97,7 @@ public function getUserName(): ?string;
      *
      * @param int $customerId
      * @return void
+     * @since 100.4.0
      */
     public function setCustomerId(int $customerId): void;
 
@@ -95,6 +105,7 @@ public function setCustomerId(int $customerId): void;
      * Retrieve login as customer log customer id.
      *
      * @return null|int
+     * @since 100.4.0
      */
     public function getCustomerId(): ?int;
 
@@ -103,6 +114,7 @@ public function getCustomerId(): ?int;
      *
      * @param string $customerEmail
      * @return void
+     * @since 100.4.0
      */
     public function setCustomerEmail(string $customerEmail): void;
 
@@ -110,6 +122,7 @@ public function setCustomerEmail(string $customerEmail): void;
      * Retrieve login as customer log customer email.
      *
      * @return null|string
+     * @since 100.4.0
      */
     public function getCustomerEmail(): ?string;
 
@@ -118,6 +131,7 @@ public function getCustomerEmail(): ?string;
      *
      * @param \Magento\LoginAsCustomerLog\Api\Data\LogExtensionInterface $extensionAttributes
      * @return void
+     * @since 100.4.0
      */
     public function setExtensionAttributes(LogExtensionInterface $extensionAttributes): void;
 
@@ -125,6 +139,7 @@ public function setExtensionAttributes(LogExtensionInterface $extensionAttribute
      * Retrieve log extension attributes.
      *
      * @return \Magento\LoginAsCustomerLog\Api\Data\LogExtensionInterface
+     * @since 100.4.0
      */
     public function getExtensionAttributes(): LogExtensionInterface;
 }
diff --git a/app/code/Magento/LoginAsCustomerLog/Api/Data/LogSearchResultsInterface.php b/app/code/Magento/LoginAsCustomerLog/Api/Data/LogSearchResultsInterface.php
index 5b08d28af6335..0f6f06a3b3e43 100644
--- a/app/code/Magento/LoginAsCustomerLog/Api/Data/LogSearchResultsInterface.php
+++ b/app/code/Magento/LoginAsCustomerLog/Api/Data/LogSearchResultsInterface.php
@@ -13,6 +13,7 @@
  * Login as customer log entity search results interface.
  *
  * @api
+ * @since 100.4.0
  */
 interface LogSearchResultsInterface extends SearchResultsInterface
 {
@@ -20,6 +21,7 @@ interface LogSearchResultsInterface extends SearchResultsInterface
      * Get log list.
      *
      * @return \Magento\LoginAsCustomerLog\Api\Data\LogInterface[]
+     * @since 100.4.0
      */
     public function getItems();
 
@@ -28,6 +30,7 @@ public function getItems();
      *
      * @param \Magento\LoginAsCustomerLog\Api\Data\LogInterface[] $items
      * @return void
+     * @since 100.4.0
      */
     public function setItems(array $items);
 }
diff --git a/app/code/Magento/LoginAsCustomerLog/Api/GetLogsListInterface.php b/app/code/Magento/LoginAsCustomerLog/Api/GetLogsListInterface.php
index 4b5ee382c908a..58b232f26e656 100644
--- a/app/code/Magento/LoginAsCustomerLog/Api/GetLogsListInterface.php
+++ b/app/code/Magento/LoginAsCustomerLog/Api/GetLogsListInterface.php
@@ -14,6 +14,7 @@
  * Get login as customer log list considering search criteria.
  *
  * @api
+ * @since 100.4.0
  */
 interface GetLogsListInterface
 {
@@ -22,6 +23,7 @@ interface GetLogsListInterface
      *
      * @param SearchCriteriaInterface $searchCriteria
      * @return LogSearchResultsInterface
+     * @since 100.4.0
      */
     public function execute(SearchCriteriaInterface $searchCriteria): LogSearchResultsInterface;
 }
diff --git a/app/code/Magento/LoginAsCustomerLog/Api/SaveLogsInterface.php b/app/code/Magento/LoginAsCustomerLog/Api/SaveLogsInterface.php
index 67e1ece477727..0d76db641b421 100644
--- a/app/code/Magento/LoginAsCustomerLog/Api/SaveLogsInterface.php
+++ b/app/code/Magento/LoginAsCustomerLog/Api/SaveLogsInterface.php
@@ -11,6 +11,7 @@
  * Save login as custom logs entities.
  *
  * @api
+ * @since 100.4.0
  */
 interface SaveLogsInterface
 {
@@ -19,6 +20,7 @@ interface SaveLogsInterface
      *
      * @param \Magento\LoginAsCustomerLog\Api\Data\LogInterface[] $logs
      * @return void
+     * @since 100.4.0
      */
     public function execute(array $logs): void;
 }
diff --git a/app/code/Magento/MediaContentApi/Api/Data/ContentAssetLinkInterface.php b/app/code/Magento/MediaContentApi/Api/Data/ContentAssetLinkInterface.php
index 5ff490655d464..c438d90aeb4f0 100644
--- a/app/code/Magento/MediaContentApi/Api/Data/ContentAssetLinkInterface.php
+++ b/app/code/Magento/MediaContentApi/Api/Data/ContentAssetLinkInterface.php
@@ -14,6 +14,7 @@
 /**
  * Data interface representing the identificator of content. I.e. short description field of product entity with id 42
  * @api
+ * @since 100.4.0
  */
 interface ContentAssetLinkInterface extends ExtensibleDataInterface
 {
@@ -21,6 +22,7 @@ interface ContentAssetLinkInterface extends ExtensibleDataInterface
      * Return the object that represent content identity
      *
      * @return ContentIdentityInterface
+     * @since 100.4.0
      */
     public function getContentId(): ContentIdentityInterface;
 
@@ -28,6 +30,7 @@ public function getContentId(): ContentIdentityInterface;
      * Array of assets related to the content entity
      *
      * @return int
+     * @since 100.4.0
      */
     public function getAssetId(): int;
 
@@ -35,6 +38,7 @@ public function getAssetId(): int;
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\MediaContentApi\Api\Data\ContentAssetLinkExtensionInterface|null
+     * @since 100.4.0
      */
     public function getExtensionAttributes(): ?ContentAssetLinkExtensionInterface;
 
@@ -43,6 +47,7 @@ public function getExtensionAttributes(): ?ContentAssetLinkExtensionInterface;
      *
      * @param \Magento\MediaContentApi\Api\Data\ContentAssetLinkExtensionInterface|null $extensionAttributes
      * @return void
+     * @since 100.4.0
      */
     public function setExtensionAttributes(?ContentAssetLinkExtensionInterface $extensionAttributes): void;
 }
diff --git a/app/code/Magento/MediaContentApi/Api/Data/ContentIdentityInterface.php b/app/code/Magento/MediaContentApi/Api/Data/ContentIdentityInterface.php
index f1b701fe9d964..16851b657ab90 100644
--- a/app/code/Magento/MediaContentApi/Api/Data/ContentIdentityInterface.php
+++ b/app/code/Magento/MediaContentApi/Api/Data/ContentIdentityInterface.php
@@ -14,6 +14,7 @@
 /**
  * Data interface representing the identificator of content. I.e. short description field of product entity with id 42
  * @api
+ * @since 100.4.0
  */
 interface ContentIdentityInterface extends ExtensibleDataInterface
 {
@@ -21,6 +22,7 @@ interface ContentIdentityInterface extends ExtensibleDataInterface
      * Type of entity that can have a content with media. I.e. catalog_product or cms_page
      *
      * @return string
+     * @since 100.4.0
      */
     public function getEntityType(): string;
 
@@ -28,6 +30,7 @@ public function getEntityType(): string;
      * Id of the entity containing content with media
      *
      * @return string
+     * @since 100.4.0
      */
     public function getEntityId(): string;
 
@@ -35,6 +38,7 @@ public function getEntityId(): string;
      * Field of the entity where the content can be stored. I.e. short_description for product
      *
      * @return string
+     * @since 100.4.0
      */
     public function getField(): string;
 
@@ -42,6 +46,7 @@ public function getField(): string;
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\MediaContentApi\Api\Data\ContentIdentityExtensionInterface|null
+     * @since 100.4.0
      */
     public function getExtensionAttributes(): ?ContentIdentityExtensionInterface;
 
@@ -50,6 +55,7 @@ public function getExtensionAttributes(): ?ContentIdentityExtensionInterface;
      *
      * @param \Magento\MediaContentApi\Api\Data\ContentIdentityExtensionInterface|null $extensionAttributes
      * @return void
+     * @since 100.4.0
      */
     public function setExtensionAttributes(?ContentIdentityExtensionInterface $extensionAttributes): void;
 }
diff --git a/app/code/Magento/MediaContentApi/Api/DeleteContentAssetLinksByAssetIdsInterface.php b/app/code/Magento/MediaContentApi/Api/DeleteContentAssetLinksByAssetIdsInterface.php
index 8997e4b6e7e77..753dcc3ed7aae 100644
--- a/app/code/Magento/MediaContentApi/Api/DeleteContentAssetLinksByAssetIdsInterface.php
+++ b/app/code/Magento/MediaContentApi/Api/DeleteContentAssetLinksByAssetIdsInterface.php
@@ -13,6 +13,7 @@
 /**
  * Delete the relation between media asset and the piece of content. I.e media asset no longer part of the content
  * @api
+ * @since 100.4.0
  */
 interface DeleteContentAssetLinksByAssetIdsInterface
 {
@@ -21,6 +22,7 @@ interface DeleteContentAssetLinksByAssetIdsInterface
      *
      * @param int[] $assetIds
      * @throws \Magento\Framework\Exception\CouldNotDeleteException
+     * @since 100.4.0
      */
     public function execute(array $assetIds): void;
 }
diff --git a/app/code/Magento/MediaContentApi/Api/DeleteContentAssetLinksInterface.php b/app/code/Magento/MediaContentApi/Api/DeleteContentAssetLinksInterface.php
index 9c50793f51303..433db3923ceb4 100644
--- a/app/code/Magento/MediaContentApi/Api/DeleteContentAssetLinksInterface.php
+++ b/app/code/Magento/MediaContentApi/Api/DeleteContentAssetLinksInterface.php
@@ -13,6 +13,7 @@
 /**
  * Remove the relation between media asset and the piece of content. I.e media asset no longer part of the content
  * @api
+ * @since 100.4.0
  */
 interface DeleteContentAssetLinksInterface
 {
@@ -21,6 +22,7 @@ interface DeleteContentAssetLinksInterface
      *
      * @param ContentAssetLinkInterface[] $contentAssetLinks
      * @throws \Magento\Framework\Exception\CouldNotDeleteException
+     * @since 100.4.0
      */
     public function execute(array $contentAssetLinks): void;
 }
diff --git a/app/code/Magento/MediaContentApi/Api/ExtractAssetsFromContentInterface.php b/app/code/Magento/MediaContentApi/Api/ExtractAssetsFromContentInterface.php
index 4f95571f30ffd..06ac7a5bd0778 100644
--- a/app/code/Magento/MediaContentApi/Api/ExtractAssetsFromContentInterface.php
+++ b/app/code/Magento/MediaContentApi/Api/ExtractAssetsFromContentInterface.php
@@ -12,6 +12,7 @@
 /**
  * Parse the content string for references to media assets and return the list of identified media assets
  * @api
+ * @since 100.4.0
  */
 interface ExtractAssetsFromContentInterface
 {
@@ -20,6 +21,7 @@ interface ExtractAssetsFromContentInterface
      *
      * @param string $content
      * @return AssetInterface[]
+     * @since 100.4.0
      */
     public function execute(string $content): array;
 }
diff --git a/app/code/Magento/MediaContentApi/Api/GetAssetIdsByContentIdentityInterface.php b/app/code/Magento/MediaContentApi/Api/GetAssetIdsByContentIdentityInterface.php
index 4316a0d6ee33d..cca5127c3eb4a 100644
--- a/app/code/Magento/MediaContentApi/Api/GetAssetIdsByContentIdentityInterface.php
+++ b/app/code/Magento/MediaContentApi/Api/GetAssetIdsByContentIdentityInterface.php
@@ -13,6 +13,7 @@
 /**
  * Get media asset ids that are used in the piece of content identified by the specified content identity
  * @api
+ * @since 100.4.0
  */
 interface GetAssetIdsByContentIdentityInterface
 {
@@ -22,6 +23,7 @@ interface GetAssetIdsByContentIdentityInterface
      * @param ContentIdentityInterface $contentIdentity
      * @return int[]
      * @throws \Magento\Framework\Exception\IntegrationException
+     * @since 100.4.0
      */
     public function execute(ContentIdentityInterface $contentIdentity): array;
 }
diff --git a/app/code/Magento/MediaContentApi/Api/GetContentByAssetIdsInterface.php b/app/code/Magento/MediaContentApi/Api/GetContentByAssetIdsInterface.php
index cb117545c257e..93d5901044e36 100644
--- a/app/code/Magento/MediaContentApi/Api/GetContentByAssetIdsInterface.php
+++ b/app/code/Magento/MediaContentApi/Api/GetContentByAssetIdsInterface.php
@@ -13,6 +13,7 @@
 /**
  * Get list of content identifiers for pieces of content that include the specified media asset
  * @api
+ * @since 100.4.0
  */
 interface GetContentByAssetIdsInterface
 {
@@ -22,6 +23,7 @@ interface GetContentByAssetIdsInterface
      * @param int[] $assetIds
      * @return ContentIdentityInterface[]
      * @throws \Magento\Framework\Exception\IntegrationException
+     * @since 100.4.0
      */
     public function execute(array $assetIds): array;
 }
diff --git a/app/code/Magento/MediaContentApi/Api/SaveContentAssetLinksInterface.php b/app/code/Magento/MediaContentApi/Api/SaveContentAssetLinksInterface.php
index 1c86953ce6f84..8363a85ea83be 100644
--- a/app/code/Magento/MediaContentApi/Api/SaveContentAssetLinksInterface.php
+++ b/app/code/Magento/MediaContentApi/Api/SaveContentAssetLinksInterface.php
@@ -13,6 +13,7 @@
 /**
  * Save a media asset to content relation.
  * @api
+ * @since 100.4.0
  */
 interface SaveContentAssetLinksInterface
 {
@@ -21,6 +22,7 @@ interface SaveContentAssetLinksInterface
      *
      * @param ContentAssetLinkInterface[] $contentAssetLinks
      * @throws \Magento\Framework\Exception\CouldNotSaveException
+     * @since 100.4.0
      */
     public function execute(array $contentAssetLinks): void;
 }
diff --git a/app/code/Magento/MediaContentApi/Model/GetEntityContentsInterface.php b/app/code/Magento/MediaContentApi/Model/GetEntityContentsInterface.php
index c58d543a597b7..ac24a32d35475 100644
--- a/app/code/Magento/MediaContentApi/Model/GetEntityContentsInterface.php
+++ b/app/code/Magento/MediaContentApi/Model/GetEntityContentsInterface.php
@@ -12,6 +12,7 @@
 /**
  * Get Entity Contents.
  * @api
+ * @since 100.4.0
  */
 interface GetEntityContentsInterface
 {
@@ -20,6 +21,7 @@ interface GetEntityContentsInterface
      *
      * @param ContentIdentityInterface $contentIdentity
      * @return string[]
+     * @since 100.4.0
      */
     public function execute(ContentIdentityInterface $contentIdentity): array;
 }
diff --git a/app/code/Magento/MediaGallery/Model/Asset/Command/DeleteByDirectoryPath.php b/app/code/Magento/MediaGallery/Model/Asset/Command/DeleteByDirectoryPath.php
index 3abe4cb50f2ea..51e4b0c1cb24d 100644
--- a/app/code/Magento/MediaGallery/Model/Asset/Command/DeleteByDirectoryPath.php
+++ b/app/code/Magento/MediaGallery/Model/Asset/Command/DeleteByDirectoryPath.php
@@ -15,7 +15,7 @@
 
 /**
  * Remove asset(s) that correspond the provided directory path
- * @deprecated use \Magento\MediaGalleryApi\Api\DeleteAssetsByPathInterface instead
+ * @deprecated 100.4.0 use \Magento\MediaGalleryApi\Api\DeleteAssetsByPathInterface instead
  * @see \Magento\MediaGalleryApi\Api\DeleteAssetsByPathInterfac
  */
 class DeleteByDirectoryPath implements DeleteByDirectoryPathInterface
diff --git a/app/code/Magento/MediaGallery/Model/Asset/Command/DeleteByPath.php b/app/code/Magento/MediaGallery/Model/Asset/Command/DeleteByPath.php
index fc8e5d7c84bfd..898d31a304804 100644
--- a/app/code/Magento/MediaGallery/Model/Asset/Command/DeleteByPath.php
+++ b/app/code/Magento/MediaGallery/Model/Asset/Command/DeleteByPath.php
@@ -16,7 +16,7 @@
 /**
  * Delete media asset by path
  *
- * @deprecated use \Magento\MediaGalleryApi\Api\DeleteAssetsByPathInterface instead
+ * @deprecated 100.4.0 use \Magento\MediaGalleryApi\Api\DeleteAssetsByPathInterface instead
  * @see \Magento\MediaGalleryApi\Api\DeleteAssetsByPathInterface
  */
 class DeleteByPath implements DeleteByPathInterface
diff --git a/app/code/Magento/MediaGallery/Model/Asset/Command/GetById.php b/app/code/Magento/MediaGallery/Model/Asset/Command/GetById.php
index 71e2cb70663f3..81bcbb7fe28a8 100644
--- a/app/code/Magento/MediaGallery/Model/Asset/Command/GetById.php
+++ b/app/code/Magento/MediaGallery/Model/Asset/Command/GetById.php
@@ -17,7 +17,7 @@
 
 /**
  * Get media asset by id
- * @deprecated use \Magento\MediaGalleryApi\Api\GetAssetsByIdsInterface instead
+ * @deprecated 100.4.0 use \Magento\MediaGalleryApi\Api\GetAssetsByIdsInterface instead
  * @see \Magento\MediaGalleryApi\Api\GetAssetsByIdsInterface
  */
 class GetById implements GetByIdInterface
diff --git a/app/code/Magento/MediaGallery/Model/Asset/Command/GetByPath.php b/app/code/Magento/MediaGallery/Model/Asset/Command/GetByPath.php
index 02512a12f9d07..aabc3986a21d4 100644
--- a/app/code/Magento/MediaGallery/Model/Asset/Command/GetByPath.php
+++ b/app/code/Magento/MediaGallery/Model/Asset/Command/GetByPath.php
@@ -18,7 +18,7 @@
 /**
  * Provide media asset by path
  *
- * @deprecated use \Magento\MediaGalleryApi\Api\GetAssetsByPathsInterface instead
+ * @deprecated 100.4.0 use \Magento\MediaGalleryApi\Api\GetAssetsByPathsInterface instead
  * @see \Magento\MediaGalleryApi\Api\GetAssetsByPathsInterface
  */
 class GetByPath implements GetByPathInterface
diff --git a/app/code/Magento/MediaGallery/Model/Asset/Command/Save.php b/app/code/Magento/MediaGallery/Model/Asset/Command/Save.php
index 1710176c1b3af..ba8497fe49205 100644
--- a/app/code/Magento/MediaGallery/Model/Asset/Command/Save.php
+++ b/app/code/Magento/MediaGallery/Model/Asset/Command/Save.php
@@ -16,7 +16,7 @@
 /**
  * Save media asset
  *
- * @deprecated use \Magento\MediaGalleryApi\Api\SaveAssetsInterface instead
+ * @deprecated 100.4.0 use \Magento\MediaGalleryApi\Api\SaveAssetsInterface instead
  * @see \Magento\MediaGalleryApi\Api\SaveAssetsInterface
  */
 class Save implements SaveInterface
diff --git a/app/code/Magento/MediaGallery/Model/Keyword/Command/GetAssetKeywords.php b/app/code/Magento/MediaGallery/Model/Keyword/Command/GetAssetKeywords.php
index 4118fd1495dbb..a37eaa8fc11fa 100644
--- a/app/code/Magento/MediaGallery/Model/Keyword/Command/GetAssetKeywords.php
+++ b/app/code/Magento/MediaGallery/Model/Keyword/Command/GetAssetKeywords.php
@@ -16,7 +16,7 @@
 
 /**
  * Retrieve keywords for the media asset
- * @deprecated use \Magento\MediaGalleryApi\Api\GetAssetsByIdsInterface instead
+ * @deprecated 100.4.0 use \Magento\MediaGalleryApi\Api\GetAssetsByIdsInterface instead
  */
 class GetAssetKeywords implements GetAssetKeywordsInterface
 {
diff --git a/app/code/Magento/MediaGallery/Model/Keyword/Command/SaveAssetKeywords.php b/app/code/Magento/MediaGallery/Model/Keyword/Command/SaveAssetKeywords.php
index f21db25bac767..aa9f05af70b2f 100644
--- a/app/code/Magento/MediaGallery/Model/Keyword/Command/SaveAssetKeywords.php
+++ b/app/code/Magento/MediaGallery/Model/Keyword/Command/SaveAssetKeywords.php
@@ -18,7 +18,7 @@
 
 /**
  * Save media asset keywords to database
- * @deprecated use \Magento\MediaGalleryApi\Api\SaveAssetKeywordsInterface instead
+ * @deprecated 100.4.0 use \Magento\MediaGalleryApi\Api\SaveAssetKeywordsInterface instead
  */
 class SaveAssetKeywords implements SaveAssetKeywordsInterface
 {
diff --git a/app/code/Magento/MediaGalleryApi/Api/CreateDirectoriesByPathsInterface.php b/app/code/Magento/MediaGalleryApi/Api/CreateDirectoriesByPathsInterface.php
index a0a1ec891237f..20e57cfa2d138 100644
--- a/app/code/Magento/MediaGalleryApi/Api/CreateDirectoriesByPathsInterface.php
+++ b/app/code/Magento/MediaGalleryApi/Api/CreateDirectoriesByPathsInterface.php
@@ -10,6 +10,7 @@
 /**
  * Create folders by provided paths
  * @api
+ * @since 101.0.0
  */
 interface CreateDirectoriesByPathsInterface
 {
@@ -19,6 +20,7 @@ interface CreateDirectoriesByPathsInterface
      * @param string[] $paths
      * @return void
      * @throws \Magento\Framework\Exception\CouldNotSaveException
+     * @since 101.0.0
      */
     public function execute(array $paths): void;
 }
diff --git a/app/code/Magento/MediaGalleryApi/Api/Data/AssetInterface.php b/app/code/Magento/MediaGalleryApi/Api/Data/AssetInterface.php
index a747cb963baab..41d682ed1bc6b 100644
--- a/app/code/Magento/MediaGalleryApi/Api/Data/AssetInterface.php
+++ b/app/code/Magento/MediaGalleryApi/Api/Data/AssetInterface.php
@@ -14,6 +14,7 @@
  * Represents a media gallery asset which contains information about a media asset entity such
  * as path to the media storage, media asset title and its content type, etc.
  * @api
+ * @since 100.3.0
  */
 interface AssetInterface extends ExtensibleDataInterface
 {
@@ -21,6 +22,7 @@ interface AssetInterface extends ExtensibleDataInterface
      * Get ID
      *
      * @return int|null
+     * @since 100.3.0
      */
     public function getId(): ?int;
 
@@ -28,6 +30,7 @@ public function getId(): ?int;
      * Get Path
      *
      * @return string
+     * @since 100.3.0
      */
     public function getPath(): string;
 
@@ -35,6 +38,7 @@ public function getPath(): string;
      * Get title
      *
      * @return string|null
+     * @since 100.3.0
      */
     public function getTitle(): ?string;
 
@@ -49,6 +53,7 @@ public function getDescription(): ?string;
      * Get the name of the channel/stock/integration file was retrieved from. null if not identified.
      *
      * @return string|null
+     * @since 100.3.0
      */
     public function getSource(): ?string;
 
@@ -63,6 +68,7 @@ public function getHash(): ?string;
      * Get content type
      *
      * @return string
+     * @since 100.3.0
      */
     public function getContentType(): string;
 
@@ -70,6 +76,7 @@ public function getContentType(): string;
      * Retrieve full licensed asset's height
      *
      * @return int
+     * @since 100.3.0
      */
     public function getHeight(): int;
 
@@ -77,6 +84,7 @@ public function getHeight(): int;
      * Retrieve full licensed asset's width
      *
      * @return int
+     * @since 100.3.0
      */
     public function getWidth(): int;
 
@@ -84,6 +92,7 @@ public function getWidth(): int;
      * Retrieve asset file size in bytes
      *
      * @return int
+     * @since 101.0.0
      */
     public function getSize(): int;
 
@@ -91,6 +100,7 @@ public function getSize(): int;
      * Get created at
      *
      * @return string|null
+     * @since 100.3.0
      */
     public function getCreatedAt(): ?string;
 
@@ -98,6 +108,7 @@ public function getCreatedAt(): ?string;
      * Get updated at
      *
      * @return string|null
+     * @since 100.3.0
      */
     public function getUpdatedAt(): ?string;
 
@@ -105,6 +116,7 @@ public function getUpdatedAt(): ?string;
      * Retrieve existing extension attributes object or create a new one.
      *
      * @return \Magento\MediaGalleryApi\Api\Data\AssetExtensionInterface|null
+     * @since 100.3.0
      */
     public function getExtensionAttributes(): ?AssetExtensionInterface;
 
@@ -113,6 +125,7 @@ public function getExtensionAttributes(): ?AssetExtensionInterface;
      *
      * @param \Magento\MediaGalleryApi\Api\Data\AssetExtensionInterface|null $extensionAttributes
      * @return void
+     * @since 100.3.0
      */
     public function setExtensionAttributes(?AssetExtensionInterface $extensionAttributes): void;
 }
diff --git a/app/code/Magento/MediaGalleryApi/Api/Data/AssetKeywordsInterface.php b/app/code/Magento/MediaGalleryApi/Api/Data/AssetKeywordsInterface.php
index 1c18225470493..f303f723981d5 100644
--- a/app/code/Magento/MediaGalleryApi/Api/Data/AssetKeywordsInterface.php
+++ b/app/code/Magento/MediaGalleryApi/Api/Data/AssetKeywordsInterface.php
@@ -13,6 +13,7 @@
 /**
  * Interface for asset's keywords aggregation
  * @api
+ * @since 101.0.0
  */
 interface AssetKeywordsInterface extends ExtensibleDataInterface
 {
@@ -20,6 +21,7 @@ interface AssetKeywordsInterface extends ExtensibleDataInterface
      * Get ID
      *
      * @return int
+     * @since 101.0.0
      */
     public function getAssetId(): int;
 
@@ -27,6 +29,7 @@ public function getAssetId(): int;
      * Get the keyword
      *
      * @return KeywordInterface[]
+     * @since 101.0.0
      */
     public function getKeywords(): array;
 
@@ -34,6 +37,7 @@ public function getKeywords(): array;
      * Get extension attributes
      *
      * @return \Magento\MediaGalleryApi\Api\Data\AssetKeywordsExtensionInterface|null
+     * @since 101.0.0
      */
     public function getExtensionAttributes(): ?AssetKeywordsExtensionInterface;
 
@@ -42,6 +46,7 @@ public function getExtensionAttributes(): ?AssetKeywordsExtensionInterface;
      *
      * @param \Magento\MediaGalleryApi\Api\Data\AssetKeywordsExtensionInterface|null $extensionAttributes
      * @return void
+     * @since 101.0.0
      */
     public function setExtensionAttributes(?AssetKeywordsExtensionInterface $extensionAttributes): void;
 }
diff --git a/app/code/Magento/MediaGalleryApi/Api/Data/KeywordInterface.php b/app/code/Magento/MediaGalleryApi/Api/Data/KeywordInterface.php
index 3cba118e03a1a..3f3c583fc182c 100644
--- a/app/code/Magento/MediaGalleryApi/Api/Data/KeywordInterface.php
+++ b/app/code/Magento/MediaGalleryApi/Api/Data/KeywordInterface.php
@@ -13,6 +13,7 @@
 /**
  * Represents a media gallery keyword. This object contains information about a media asset keyword entity.
  * @api
+ * @since 100.3.0
  */
 interface KeywordInterface extends ExtensibleDataInterface
 {
@@ -20,6 +21,7 @@ interface KeywordInterface extends ExtensibleDataInterface
      * Get ID
      *
      * @return int|null
+     * @since 100.3.0
      */
     public function getId(): ?int;
 
@@ -27,6 +29,7 @@ public function getId(): ?int;
      * Get the keyword
      *
      * @return string
+     * @since 100.3.0
      */
     public function getKeyword(): string;
 
@@ -34,6 +37,7 @@ public function getKeyword(): string;
      * Get extension attributes
      *
      * @return \Magento\MediaGalleryApi\Api\Data\KeywordExtensionInterface|null
+     * @since 100.3.0
      */
     public function getExtensionAttributes(): ?KeywordExtensionInterface;
 
@@ -42,6 +46,7 @@ public function getExtensionAttributes(): ?KeywordExtensionInterface;
      *
      * @param \Magento\MediaGalleryApi\Api\Data\KeywordExtensionInterface|null $extensionAttributes
      * @return void
+     * @since 100.3.0
      */
     public function setExtensionAttributes(?KeywordExtensionInterface $extensionAttributes): void;
 }
diff --git a/app/code/Magento/MediaGalleryApi/Api/DeleteAssetsByPathsInterface.php b/app/code/Magento/MediaGalleryApi/Api/DeleteAssetsByPathsInterface.php
index 5370235a31b95..3e824bdaffd6f 100644
--- a/app/code/Magento/MediaGalleryApi/Api/DeleteAssetsByPathsInterface.php
+++ b/app/code/Magento/MediaGalleryApi/Api/DeleteAssetsByPathsInterface.php
@@ -11,6 +11,7 @@
 /**
  * Delete media assets by exact or directory paths
  * @api
+ * @since 101.0.0
  */
 interface DeleteAssetsByPathsInterface
 {
@@ -19,6 +20,7 @@ interface DeleteAssetsByPathsInterface
      *
      * @param string[] $paths
      * @return void
+     * @since 101.0.0
      */
     public function execute(array $paths): void;
 }
diff --git a/app/code/Magento/MediaGalleryApi/Api/DeleteDirectoriesByPathsInterface.php b/app/code/Magento/MediaGalleryApi/Api/DeleteDirectoriesByPathsInterface.php
index fe3be88fa0073..c3c1c0ad577a7 100644
--- a/app/code/Magento/MediaGalleryApi/Api/DeleteDirectoriesByPathsInterface.php
+++ b/app/code/Magento/MediaGalleryApi/Api/DeleteDirectoriesByPathsInterface.php
@@ -10,6 +10,7 @@
 /**
  * Delete folders by provided paths
  * @api
+ * @since 101.0.0
  */
 interface DeleteDirectoriesByPathsInterface
 {
@@ -19,6 +20,7 @@ interface DeleteDirectoriesByPathsInterface
      * @param string[] $paths
      * @return void
      * @throws \Magento\Framework\Exception\CouldNotDeleteException
+     * @since 101.0.0
      */
     public function execute(array $paths): void;
 }
diff --git a/app/code/Magento/MediaGalleryApi/Api/GetAssetsByIdsInterface.php b/app/code/Magento/MediaGalleryApi/Api/GetAssetsByIdsInterface.php
index 5df6722a190d4..0c0ea7c812ce9 100644
--- a/app/code/Magento/MediaGalleryApi/Api/GetAssetsByIdsInterface.php
+++ b/app/code/Magento/MediaGalleryApi/Api/GetAssetsByIdsInterface.php
@@ -11,6 +11,7 @@
 /**
  * Get media gallery assets by id attribute
  * @api
+ * @since 101.0.0
  */
 interface GetAssetsByIdsInterface
 {
@@ -20,6 +21,7 @@ interface GetAssetsByIdsInterface
      * @param int[] $ids
      * @return \Magento\MediaGalleryApi\Api\Data\AssetInterface[]
      * @throws \Magento\Framework\Exception\LocalizedException
+     * @since 101.0.0
      */
     public function execute(array $ids): array;
 }
diff --git a/app/code/Magento/MediaGalleryApi/Api/GetAssetsByPathsInterface.php b/app/code/Magento/MediaGalleryApi/Api/GetAssetsByPathsInterface.php
index dbaed6e0e9123..458d004fe74f8 100644
--- a/app/code/Magento/MediaGalleryApi/Api/GetAssetsByPathsInterface.php
+++ b/app/code/Magento/MediaGalleryApi/Api/GetAssetsByPathsInterface.php
@@ -10,6 +10,7 @@
 /**
  * Get media gallery assets by paths in media storage
  * @api
+ * @since 101.0.0
  */
 interface GetAssetsByPathsInterface
 {
@@ -19,6 +20,7 @@ interface GetAssetsByPathsInterface
      * @param string[] $paths
      * @return \Magento\MediaGalleryApi\Api\Data\AssetInterface[]
      * @throws \Magento\Framework\Exception\LocalizedException
+     * @since 101.0.0
      */
     public function execute(array $paths): array;
 }
diff --git a/app/code/Magento/MediaGalleryApi/Api/GetAssetsKeywordsInterface.php b/app/code/Magento/MediaGalleryApi/Api/GetAssetsKeywordsInterface.php
index 99b05291f32a0..317559e447b60 100644
--- a/app/code/Magento/MediaGalleryApi/Api/GetAssetsKeywordsInterface.php
+++ b/app/code/Magento/MediaGalleryApi/Api/GetAssetsKeywordsInterface.php
@@ -10,6 +10,7 @@
 /**
  * Get a media gallery asset keywords related to media gallery asset ids provided
  * @api
+ * @since 101.0.0
  */
 interface GetAssetsKeywordsInterface
 {
@@ -18,6 +19,7 @@ interface GetAssetsKeywordsInterface
      *
      * @param int[] $assetIds
      * @return \Magento\MediaGalleryApi\Api\Data\AssetKeywordsInterface[]
+     * @since 101.0.0
      */
     public function execute(array $assetIds): array;
 }
diff --git a/app/code/Magento/MediaGalleryApi/Api/SaveAssetsInterface.php b/app/code/Magento/MediaGalleryApi/Api/SaveAssetsInterface.php
index c63f7bd8c0818..823c858342a62 100644
--- a/app/code/Magento/MediaGalleryApi/Api/SaveAssetsInterface.php
+++ b/app/code/Magento/MediaGalleryApi/Api/SaveAssetsInterface.php
@@ -11,6 +11,7 @@
 /**
  * Save media gallery assets to the database
  * @api
+ * @since 101.0.0
  */
 interface SaveAssetsInterface
 {
@@ -20,6 +21,7 @@ interface SaveAssetsInterface
      * @param \Magento\MediaGalleryApi\Api\Data\AssetInterface[] $assets
      * @return void
      * @throws \Magento\Framework\Exception\CouldNotSaveException
+     * @since 101.0.0
      */
     public function execute(array $assets): void;
 }
diff --git a/app/code/Magento/MediaGalleryApi/Api/SaveAssetsKeywordsInterface.php b/app/code/Magento/MediaGalleryApi/Api/SaveAssetsKeywordsInterface.php
index 04efe7d32ccc1..714a4bc605423 100644
--- a/app/code/Magento/MediaGalleryApi/Api/SaveAssetsKeywordsInterface.php
+++ b/app/code/Magento/MediaGalleryApi/Api/SaveAssetsKeywordsInterface.php
@@ -10,6 +10,7 @@
 /**
  * Save keywords related to assets to the database
  * @api
+ * @since 101.0.0
  */
 interface SaveAssetsKeywordsInterface
 {
@@ -19,6 +20,7 @@ interface SaveAssetsKeywordsInterface
      * @param \Magento\MediaGalleryApi\Api\Data\AssetKeywordsInterface[] $assetKeywords
      * @return void
      * @throws \Magento\Framework\Exception\CouldNotSaveException
+     * @since 101.0.0
      */
     public function execute(array $assetKeywords): void;
 }
diff --git a/app/code/Magento/MediaGalleryApi/Model/Asset/Command/DeleteByDirectoryPathInterface.php b/app/code/Magento/MediaGalleryApi/Model/Asset/Command/DeleteByDirectoryPathInterface.php
index 79b209823aeb0..1ed46566cfb21 100644
--- a/app/code/Magento/MediaGalleryApi/Model/Asset/Command/DeleteByDirectoryPathInterface.php
+++ b/app/code/Magento/MediaGalleryApi/Model/Asset/Command/DeleteByDirectoryPathInterface.php
@@ -11,7 +11,7 @@
 /**
  * A command represents the media gallery assets delete action. A media gallery asset is filtered by directory
  * path value.
- * @deprecated use \Magento\MediaGalleryApi\Api\DeleteAssetsByPathsInterface instead
+ * @deprecated 101.0.0 use \Magento\MediaGalleryApi\Api\DeleteAssetsByPathsInterface instead
  * @see \Magento\MediaGalleryApi\Api\DeleteAssetsByPathsInterface
  */
 interface DeleteByDirectoryPathInterface
diff --git a/app/code/Magento/MediaGalleryApi/Model/Asset/Command/DeleteByPathInterface.php b/app/code/Magento/MediaGalleryApi/Model/Asset/Command/DeleteByPathInterface.php
index f33022e75d2fe..7a307a2940a0e 100644
--- a/app/code/Magento/MediaGalleryApi/Model/Asset/Command/DeleteByPathInterface.php
+++ b/app/code/Magento/MediaGalleryApi/Model/Asset/Command/DeleteByPathInterface.php
@@ -10,7 +10,7 @@
 
 /**
  * A command represents the media gallery asset delete action. A media gallery asset is filtered by path value.
- * @deprecated use \Magento\MediaGalleryApi\Api\DeleteAssetsByPathInterface instead
+ * @deprecated 101.0.0 use \Magento\MediaGalleryApi\Api\DeleteAssetsByPathInterface instead
  * @see \Magento\MediaGalleryApi\Api\DeleteAssetsByPathsInterface
  */
 interface DeleteByPathInterface
diff --git a/app/code/Magento/MediaGalleryApi/Model/Asset/Command/GetByIdInterface.php b/app/code/Magento/MediaGalleryApi/Model/Asset/Command/GetByIdInterface.php
index 65cc2e3eae109..db8fd7e2baa6c 100644
--- a/app/code/Magento/MediaGalleryApi/Model/Asset/Command/GetByIdInterface.php
+++ b/app/code/Magento/MediaGalleryApi/Model/Asset/Command/GetByIdInterface.php
@@ -10,7 +10,7 @@
 
 /**
  * A command represents the get media gallery asset by using media gallery asset id as a filter parameter.
- * @deprecated use \Magento\MediaGalleryApi\Api\GetAssetsByIdsInterface instead
+ * @deprecated 101.0.0 use \Magento\MediaGalleryApi\Api\GetAssetsByIdsInterface instead
  * @see \Magento\MediaGalleryApi\Api\GetAssetsByIdsInterface
  */
 interface GetByIdInterface
diff --git a/app/code/Magento/MediaGalleryApi/Model/Asset/Command/GetByPathInterface.php b/app/code/Magento/MediaGalleryApi/Model/Asset/Command/GetByPathInterface.php
index d8d5b6773fbbc..3163574336061 100644
--- a/app/code/Magento/MediaGalleryApi/Model/Asset/Command/GetByPathInterface.php
+++ b/app/code/Magento/MediaGalleryApi/Model/Asset/Command/GetByPathInterface.php
@@ -10,7 +10,7 @@
 
 /**
  * A command represents the get media gallery asset by using media gallery asset path as a filter parameter.
- * @deprecated use \Magento\MediaGalleryApi\Api\GetAssetsByPathInterface instead
+ * @deprecated 101.0.0 use \Magento\MediaGalleryApi\Api\GetAssetsByPathInterface instead
  * @see \Magento\MediaGalleryApi\Api\GetAssetsByPathsInterface
  */
 interface GetByPathInterface
diff --git a/app/code/Magento/MediaGalleryApi/Model/Asset/Command/SaveInterface.php b/app/code/Magento/MediaGalleryApi/Model/Asset/Command/SaveInterface.php
index 610ecf0cd22bf..f00486116b9be 100644
--- a/app/code/Magento/MediaGalleryApi/Model/Asset/Command/SaveInterface.php
+++ b/app/code/Magento/MediaGalleryApi/Model/Asset/Command/SaveInterface.php
@@ -12,7 +12,7 @@
 
 /**
  * A command which executes the media gallery asset save operation.
- * @deprecated use \Magento\MediaGalleryApi\Api\SaveAssetsInterface instead
+ * @deprecated 101.0.0 use \Magento\MediaGalleryApi\Api\SaveAssetsInterface instead
  * @see \Magento\MediaGalleryApi\Api\SaveAssetsInterface
  */
 interface SaveInterface
diff --git a/app/code/Magento/MediaGalleryApi/Model/Keyword/Command/GetAssetKeywordsInterface.php b/app/code/Magento/MediaGalleryApi/Model/Keyword/Command/GetAssetKeywordsInterface.php
index e42c370c1c6f7..acb18f268d167 100644
--- a/app/code/Magento/MediaGalleryApi/Model/Keyword/Command/GetAssetKeywordsInterface.php
+++ b/app/code/Magento/MediaGalleryApi/Model/Keyword/Command/GetAssetKeywordsInterface.php
@@ -9,7 +9,7 @@
 
 /**
  * A command represents functionality to get a media gallery asset keywords filtered by media gallery asset id.
- * @deprecated use \Magento\MediaGalleryApi\Api\GetAssetsKeywordsInterface instead
+ * @deprecated 101.0.0 use \Magento\MediaGalleryApi\Api\GetAssetsKeywordsInterface instead
  * @see \Magento\MediaGalleryApi\Api\GetAssetsKeywordsInterface
  */
 interface GetAssetKeywordsInterface
diff --git a/app/code/Magento/MediaGalleryApi/Model/Keyword/Command/SaveAssetKeywordsInterface.php b/app/code/Magento/MediaGalleryApi/Model/Keyword/Command/SaveAssetKeywordsInterface.php
index 824cbca178988..03cc76cc1760b 100644
--- a/app/code/Magento/MediaGalleryApi/Model/Keyword/Command/SaveAssetKeywordsInterface.php
+++ b/app/code/Magento/MediaGalleryApi/Model/Keyword/Command/SaveAssetKeywordsInterface.php
@@ -9,7 +9,7 @@
 
 /**
  * A command represents the media gallery asset keywords save operation.
- * @deprecated use \Magento\MediaGalleryApi\Api\SaveAssetsKeywordsInterface instead
+ * @deprecated 101.0.0 use \Magento\MediaGalleryApi\Api\SaveAssetsKeywordsInterface instead
  * @see \Magento\MediaGalleryApi\Api\SaveAssetsKeywordsInterface
  */
 interface SaveAssetKeywordsInterface
diff --git a/app/code/Magento/MediaStorage/Model/File/Uploader.php b/app/code/Magento/MediaStorage/Model/File/Uploader.php
index daa9116e5138d..173211dfac011 100644
--- a/app/code/Magento/MediaStorage/Model/File/Uploader.php
+++ b/app/code/Magento/MediaStorage/Model/File/Uploader.php
@@ -142,6 +142,7 @@ public function validateFile()
 
     /**
      * @inheritDoc
+     * @since 100.4.0
      */
     protected function _validateFile()
     {
diff --git a/app/code/Magento/Multishipping/Block/Checkout/Overview.php b/app/code/Magento/Multishipping/Block/Checkout/Overview.php
index 0251732a15732..1ea2dc2618778 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/Overview.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/Overview.php
@@ -400,7 +400,7 @@ public function getQuote()
      * Get billin address totals
      *
      * @return     mixed
-     * @deprecated
+     * @deprecated 100.2.3
      * typo in method name, see getBillingAddressTotals()
      */
     public function getBillinAddressTotals()
@@ -412,6 +412,7 @@ public function getBillinAddressTotals()
      * Get billing address totals
      *
      * @return mixed
+     * @since 100.2.3
      */
     public function getBillingAddressTotals()
     {
diff --git a/app/code/Magento/Multishipping/Block/Checkout/Results.php b/app/code/Magento/Multishipping/Block/Checkout/Results.php
index 35c050d5ff8c1..40cbce1990d00 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/Results.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/Results.php
@@ -21,6 +21,7 @@
  * Multi-shipping checkout results information
  *
  * @api
+ * @since 100.2.1
  */
 class Results extends Success
 {
@@ -66,6 +67,7 @@ public function __construct(
      * Returns shipping addresses from quote.
      *
      * @return array
+     * @since 100.2.1
      */
     public function getQuoteShippingAddresses(): array
     {
@@ -76,6 +78,7 @@ public function getQuoteShippingAddresses(): array
      * Returns all failed addresses from quote.
      *
      * @return array
+     * @since 100.2.1
      */
     public function getFailedAddresses(): array
     {
@@ -91,6 +94,7 @@ public function getFailedAddresses(): array
      *
      * @param int $orderId
      * @return OrderAddress|null
+     * @since 100.2.1
      */
     public function getOrderShippingAddress(int $orderId)
     {
@@ -101,6 +105,7 @@ public function getOrderShippingAddress(int $orderId)
      * Retrieve quote billing address.
      *
      * @return QuoteAddress
+     * @since 100.2.1
      */
     public function getQuoteBillingAddress(): QuoteAddress
     {
@@ -112,6 +117,7 @@ public function getQuoteBillingAddress(): QuoteAddress
      *
      * @param OrderAddress $address
      * @return string
+     * @since 100.2.1
      */
     public function formatOrderShippingAddress(OrderAddress $address): string
     {
@@ -123,6 +129,7 @@ public function formatOrderShippingAddress(OrderAddress $address): string
      *
      * @param QuoteAddress $address
      * @return string
+     * @since 100.2.1
      */
     public function formatQuoteShippingAddress(QuoteAddress $address): string
     {
@@ -134,6 +141,7 @@ public function formatQuoteShippingAddress(QuoteAddress $address): string
      *
      * @param QuoteAddress $address
      * @return bool
+     * @since 100.2.1
      */
     public function isShippingAddress(QuoteAddress $address): bool
     {
@@ -158,6 +166,7 @@ private function getAddressOneline(array $address): string
      *
      * @param QuoteAddress $address
      * @return string
+     * @since 100.2.1
      */
     public function getAddressError(QuoteAddress $address): string
     {
@@ -171,6 +180,7 @@ public function getAddressError(QuoteAddress $address): string
      *
      * @throws LocalizedException
      * @return Success
+     * @since 100.2.1
      */
     protected function _prepareLayout(): Success
     {
diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderInterface.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderInterface.php
index 5d384a5373d5e..85726a8dab0b5 100644
--- a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderInterface.php
+++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/PlaceOrderInterface.php
@@ -13,6 +13,7 @@
  * Place orders during multishipping checkout flow.
  *
  * @api
+ * @since 100.2.1
  */
 interface PlaceOrderInterface
 {
@@ -21,6 +22,7 @@ interface PlaceOrderInterface
      *
      * @param OrderInterface[] $orderList
      * @return array
+     * @since 100.2.1
      */
     public function place(array $orderList): array;
 }
diff --git a/app/code/Magento/Newsletter/Model/Queue/TransportBuilder.php b/app/code/Magento/Newsletter/Model/Queue/TransportBuilder.php
index aa3a2bcfe0f59..0f20a8379d04b 100644
--- a/app/code/Magento/Newsletter/Model/Queue/TransportBuilder.php
+++ b/app/code/Magento/Newsletter/Model/Queue/TransportBuilder.php
@@ -185,7 +185,7 @@ public function setReplyTo($email, $name = null)
      * @throws MailException
      * @see setFromByScope()
      *
-     * @deprecated This function sets the from address but does not provide
+     * @deprecated 100.3.3 This function sets the from address but does not provide
      * a way of setting the correct from addresses based on the scope.
      */
     public function setFrom($from)
diff --git a/app/code/Magento/Newsletter/Model/ResourceModel/Queue/Collection.php b/app/code/Magento/Newsletter/Model/ResourceModel/Queue/Collection.php
index 33c539fbba84f..2914a25ba7214 100644
--- a/app/code/Magento/Newsletter/Model/ResourceModel/Queue/Collection.php
+++ b/app/code/Magento/Newsletter/Model/ResourceModel/Queue/Collection.php
@@ -213,6 +213,7 @@ public function addSubscriberFilter($subscriberId)
      *
      * @param int $customerId
      * @return $this
+     * @since 100.4.0
      */
     public function addCustomerFilter(int $customerId): Collection
     {
diff --git a/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php b/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php
index 6391219e23c7e..b20e43574aeab 100644
--- a/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php
+++ b/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php
@@ -116,6 +116,7 @@ public function setMessagesScope($scope)
      * @param string $email
      * @param int $websiteId
      * @return array
+     * @since 100.4.0
      */
     public function loadBySubscriberEmail(string $email, int $websiteId): array
     {
@@ -140,6 +141,7 @@ public function loadBySubscriberEmail(string $email, int $websiteId): array
      * @param int $customerId
      * @param int $websiteId
      * @return array
+     * @since 100.4.0
      */
     public function loadByCustomerId(int $customerId, int $websiteId): array
     {
@@ -199,7 +201,7 @@ public function received(SubscriberModel $subscriber, \Magento\Newsletter\Model\
      *
      * @param string $subscriberEmail
      * @return array
-     * @deprecated The subscription should be loaded by website id
+     * @deprecated 100.4.0 The subscription should be loaded by website id
      * @see loadBySubscriberEmail
      */
     public function loadByEmail($subscriberEmail)
@@ -213,7 +215,7 @@ public function loadByEmail($subscriberEmail)
      *
      * @param CustomerInterface $customer
      * @return array
-     * @deprecated The subscription should be loaded by website id
+     * @deprecated 100.4.0 The subscription should be loaded by website id
      * @see loadByCustomerId
      */
     public function loadByCustomerData(CustomerInterface $customer)
diff --git a/app/code/Magento/Newsletter/Model/Subscriber.php b/app/code/Magento/Newsletter/Model/Subscriber.php
index 5c573f47aa0bf..c2d80f9000792 100644
--- a/app/code/Magento/Newsletter/Model/Subscriber.php
+++ b/app/code/Magento/Newsletter/Model/Subscriber.php
@@ -382,6 +382,7 @@ public function isSubscribed()
      * @param string $email
      * @param int $websiteId
      * @return $this
+     * @since 100.4.0
      */
     public function loadBySubscriberEmail(string $email, int $websiteId): Subscriber
     {
@@ -400,6 +401,7 @@ public function loadBySubscriberEmail(string $email, int $websiteId): Subscriber
      * @param int $customerId
      * @param int $websiteId
      * @return $this
+     * @since 100.4.0
      */
     public function loadByCustomer(int $customerId, int $websiteId): Subscriber
     {
@@ -588,6 +590,7 @@ public function getSubscriberFullName()
      * Set date of last changed status
      *
      * @return $this
+     * @since 100.2.1
      */
     public function beforeSave()
     {
@@ -603,7 +606,7 @@ public function beforeSave()
      *
      * @param string $subscriberEmail
      * @return $this
-     * @deprecated The subscription should be loaded by website id
+     * @deprecated 100.4.0 The subscription should be loaded by website id
      * @see loadBySubscriberEmail
      */
     public function loadByEmail($subscriberEmail)
@@ -619,7 +622,7 @@ public function loadByEmail($subscriberEmail)
      *
      * @param int $customerId
      * @return $this
-     * @deprecated The subscription should be loaded by website id
+     * @deprecated 100.4.0 The subscription should be loaded by website id
      * @see loadByCustomer
      */
     public function loadByCustomerId($customerId)
@@ -644,7 +647,7 @@ public function loadByCustomerId($customerId)
      *
      * @param string $email
      * @return int
-     * @deprecated The subscription should be updated by store id
+     * @deprecated 100.4.0 The subscription should be updated by store id
      * @see \Magento\Newsletter\Model\SubscriptionManager::subscribe
      */
     public function subscribe($email)
@@ -661,7 +664,7 @@ public function subscribe($email)
      *
      * @param int $customerId
      * @return $this
-     * @deprecated The subscription should be updated by store id
+     * @deprecated 100.4.0 The subscription should be updated by store id
      * @see \Magento\Newsletter\Model\SubscriptionManager::subscribeCustomer
      */
     public function subscribeCustomerById($customerId)
@@ -674,7 +677,7 @@ public function subscribeCustomerById($customerId)
      *
      * @param int $customerId
      * @return $this
-     * @deprecated The subscription should be updated by store id
+     * @deprecated 100.4.0 The subscription should be updated by store id
      * @see \Magento\Newsletter\Model\SubscriptionManager::unsubscribeCustomer
      */
     public function unsubscribeCustomerById($customerId)
@@ -687,7 +690,7 @@ public function unsubscribeCustomerById($customerId)
      *
      * @param int $customerId
      * @return $this
-     * @deprecated The subscription should be updated by store id
+     * @deprecated 100.4.0 The subscription should be updated by store id
      * @see \Magento\Newsletter\Model\SubscriptionManager::subscribeCustomer
      */
     public function updateSubscription($customerId)
@@ -703,7 +706,7 @@ public function updateSubscription($customerId)
      * @param int $customerId
      * @param bool $subscribe indicates whether the customer should be subscribed or unsubscribed
      * @return $this
-     * @deprecated The subscription should be updated by store id
+     * @deprecated 100.4.0 The subscription should be updated by store id
      * @see \Magento\Newsletter\Model\SubscriptionManager::subscribeCustomer
      */
     protected function _updateCustomerSubscription($customerId, $subscribe)
diff --git a/app/code/Magento/Newsletter/Model/Template.php b/app/code/Magento/Newsletter/Model/Template.php
index 88fbfb152d14f..58afd45b26f44 100644
--- a/app/code/Magento/Newsletter/Model/Template.php
+++ b/app/code/Magento/Newsletter/Model/Template.php
@@ -40,7 +40,7 @@ class Template extends \Magento\Email\Model\AbstractTemplate
     /**
      * Mail object
      *
-     * @deprecated Unused property
+     * @deprecated 100.3.0 Unused property
      *
      */
     protected $_mail;
diff --git a/app/code/Magento/OfflinePayments/Model/Purchaseorder.php b/app/code/Magento/OfflinePayments/Model/Purchaseorder.php
index 464142df5b996..fe30570aba50d 100644
--- a/app/code/Magento/OfflinePayments/Model/Purchaseorder.php
+++ b/app/code/Magento/OfflinePayments/Model/Purchaseorder.php
@@ -62,6 +62,7 @@ public function assignData(\Magento\Framework\DataObject $data)
      * @return $this
      * @throws LocalizedException
      * @api
+     * @since 100.2.3
      */
     public function validate()
     {
diff --git a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/LocationDirectory.php b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/LocationDirectory.php
index e015f7b54637d..bd75a1ffe698c 100644
--- a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/LocationDirectory.php
+++ b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate/LocationDirectory.php
@@ -155,7 +155,7 @@ protected function loadRegions()
      * @param int $countryId
      * @param string $regionCode
      * @return string
-     * @deprecated
+     * @deprecated 100.3.1
      */
     public function getRegionId($countryId, $regionCode)
     {
diff --git a/app/code/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance/PageCacheState.php b/app/code/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance/PageCacheState.php
index da6a71a0c2655..14b72e75d9473 100644
--- a/app/code/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance/PageCacheState.php
+++ b/app/code/Magento/PageCache/Observer/SwitchPageCacheOnMaintenance/PageCacheState.php
@@ -17,7 +17,7 @@
  *
  * Page Cache State Observer
  *
- * @deprecated Originally used by now removed observer SwitchPageCacheOnMaintenance
+ * @deprecated 100.4.0 Originally used by now removed observer SwitchPageCacheOnMaintenance
  */
 class PageCacheState
 {
diff --git a/app/code/Magento/Payment/Block/Transparent/Redirect.php b/app/code/Magento/Payment/Block/Transparent/Redirect.php
index 1be6dec4cc1d8..4b45b2d687d30 100644
--- a/app/code/Magento/Payment/Block/Transparent/Redirect.php
+++ b/app/code/Magento/Payment/Block/Transparent/Redirect.php
@@ -13,6 +13,7 @@
  * Redirect block for register specific params in layout
  *
  * @api
+ * @since 100.3.5
  */
 class Redirect extends Template
 {
@@ -44,6 +45,7 @@ public function __construct(
      * Returns url for redirect.
      *
      * @return string
+     * @since 100.3.5
      */
     public function getRedirectUrl(): string
     {
@@ -54,6 +56,7 @@ public function getRedirectUrl(): string
      * Returns params to be redirected.
      *
      * @return array
+     * @since 100.3.5
      */
     public function getPostParams(): array
     {
diff --git a/app/code/Magento/Payment/Gateway/ErrorMapper/ErrorMessageMapper.php b/app/code/Magento/Payment/Gateway/ErrorMapper/ErrorMessageMapper.php
index 2072615a39b92..8a9f08e83005e 100644
--- a/app/code/Magento/Payment/Gateway/ErrorMapper/ErrorMessageMapper.php
+++ b/app/code/Magento/Payment/Gateway/ErrorMapper/ErrorMessageMapper.php
@@ -17,6 +17,7 @@
  * In that case, this implementation can be extended via di.xml and configured with appropriate mappers.
  *
  * @api
+ * @since 100.2.2
  */
 class ErrorMessageMapper implements ErrorMessageMapperInterface
 {
@@ -35,6 +36,7 @@ public function __construct(DataInterface $messageMapping)
 
     /**
      * @inheritdoc
+     * @since 100.2.2
      */
     public function getMessage(string $code)
     {
diff --git a/app/code/Magento/Payment/Gateway/ErrorMapper/ErrorMessageMapperInterface.php b/app/code/Magento/Payment/Gateway/ErrorMapper/ErrorMessageMapperInterface.php
index f09f49b7f8100..fc8c69902f373 100644
--- a/app/code/Magento/Payment/Gateway/ErrorMapper/ErrorMessageMapperInterface.php
+++ b/app/code/Magento/Payment/Gateway/ErrorMapper/ErrorMessageMapperInterface.php
@@ -13,6 +13,7 @@
  * Interface to provide customization for payment validation errors.
  *
  * @api
+ * @since 100.2.2
  */
 interface ErrorMessageMapperInterface
 {
@@ -22,6 +23,7 @@ interface ErrorMessageMapperInterface
      *
      * @param string $code
      * @return Phrase|null
+     * @since 100.2.2
      */
     public function getMessage(string $code);
 }
diff --git a/app/code/Magento/Payment/Gateway/Validator/ResultInterface.php b/app/code/Magento/Payment/Gateway/Validator/ResultInterface.php
index c1ad947e49c5b..9ed30b1c56cf4 100644
--- a/app/code/Magento/Payment/Gateway/Validator/ResultInterface.php
+++ b/app/code/Magento/Payment/Gateway/Validator/ResultInterface.php
@@ -33,6 +33,7 @@ public function getFailsDescription();
      * Returns list of error codes.
      *
      * @return string[]
+     * @since 100.3.0
      */
     public function getErrorCodes();
 }
diff --git a/app/code/Magento/Payment/Gateway/Validator/ValidatorComposite.php b/app/code/Magento/Payment/Gateway/Validator/ValidatorComposite.php
index f96c08a9605a8..8c8d13300849e 100644
--- a/app/code/Magento/Payment/Gateway/Validator/ValidatorComposite.php
+++ b/app/code/Magento/Payment/Gateway/Validator/ValidatorComposite.php
@@ -14,6 +14,7 @@
  * Compiles a result using the results of multiple validators
  *
  * @api
+ * @since 100.0.2
  */
 class ValidatorComposite extends AbstractValidator
 {
diff --git a/app/code/Magento/Payment/Model/Method/Adapter.php b/app/code/Magento/Payment/Model/Method/Adapter.php
index dba48efaae837..1a9831c47f5b1 100644
--- a/app/code/Magento/Payment/Model/Method/Adapter.php
+++ b/app/code/Magento/Payment/Model/Method/Adapter.php
@@ -668,6 +668,7 @@ public function getConfigPaymentAction()
 
     /**
      * @inheritdoc
+     * @since 100.4.0
      */
     public function canSale(): bool
     {
@@ -676,6 +677,7 @@ public function canSale(): bool
 
     /**
      * @inheritdoc
+     * @since 100.4.0
      */
     public function sale(InfoInterface $payment, float $amount)
     {
diff --git a/app/code/Magento/Payment/Model/Method/ConfigInterface.php b/app/code/Magento/Payment/Model/Method/ConfigInterface.php
index 06afde4657f26..7c74736cf2ef1 100644
--- a/app/code/Magento/Payment/Model/Method/ConfigInterface.php
+++ b/app/code/Magento/Payment/Model/Method/ConfigInterface.php
@@ -8,7 +8,7 @@
 /**
  * Interface for payment methods config
  *
- * @deprecated This interface has no semantic meaning and all it implementations has no joint points.
+ * @deprecated 100.3.0 This interface has no semantic meaning and all it implementations has no joint points.
  */
 interface ConfigInterface extends \Magento\Payment\Gateway\ConfigInterface
 {
diff --git a/app/code/Magento/Payment/Model/MethodList.php b/app/code/Magento/Payment/Model/MethodList.php
index 746306cbd0bbf..0700f25fcbee5 100644
--- a/app/code/Magento/Payment/Model/MethodList.php
+++ b/app/code/Magento/Payment/Model/MethodList.php
@@ -19,7 +19,7 @@ class MethodList
 {
     /**
      * @var \Magento\Payment\Helper\Data
-     * @deprecated 100.1.3 Do not use this property in case of inheritance.
+     * @deprecated 100.1.0 Do not use this property in case of inheritance.
      */
     protected $paymentHelper;
 
diff --git a/app/code/Magento/Payment/Model/SaleOperationInterface.php b/app/code/Magento/Payment/Model/SaleOperationInterface.php
index 384913a75ae26..da7dc5dfcb390 100644
--- a/app/code/Magento/Payment/Model/SaleOperationInterface.php
+++ b/app/code/Magento/Payment/Model/SaleOperationInterface.php
@@ -11,6 +11,7 @@
  * Responsible for support of `sale` payment operation via Magento payment provider gateway.
  *
  * @api
+ * @since 100.4.0
  */
 interface SaleOperationInterface
 {
@@ -18,6 +19,7 @@ interface SaleOperationInterface
      * Checks `sale` payment operation availability.
      *
      * @return bool
+     * @since 100.4.0
      */
     public function canSale(): bool;
 
@@ -27,6 +29,7 @@ public function canSale(): bool;
      * @param InfoInterface $payment
      * @param float $amount
      * @return void
+     * @since 100.4.0
      */
     public function sale(InfoInterface $payment, float $amount);
 }
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/Order/View.php b/app/code/Magento/Paypal/Block/Adminhtml/Order/View.php
index 0cbd82798a2c1..82f2b6ab577e0 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/Order/View.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/Order/View.php
@@ -19,6 +19,7 @@
 /**
  * Adminhtml sales order view.
  * @api
+ * @since 100.2.2
  */
 class View extends OrderView
 {
@@ -59,6 +60,7 @@ public function __construct(
      *
      * @return void
      * @throws LocalizedException
+     * @since 100.2.2
      */
     protected function _construct()
     {
@@ -97,6 +99,7 @@ private function getPaymentAuthorizationUrl(): string
      * @param Order $order
      * @return bool
      * @throws LocalizedException
+     * @since 100.2.2
      */
     public function canAuthorize(Order $order): bool
     {
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/BmlApi.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/BmlApi.php
index 88a33f19de2f4..76fa0856fd23c 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/BmlApi.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/BmlApi.php
@@ -7,7 +7,7 @@
 
 /**
  * Class Bml
- * @deprecated
+ * @deprecated 100.3.1
  * "Enable PayPal Credit" setting was removed. Please @see "Disable Funding Options"
  */
 class BmlApi extends AbstractEnable
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php
index 944b30f5792ae..567322fd89372 100644
--- a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php
+++ b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/Fieldset/Hint.php
@@ -17,7 +17,7 @@ class Hint extends Template implements RendererInterface
 {
     /**
      * @var string
-     * @deprecated 100.1.2
+     * @deprecated 100.1.0
      */
     protected $_template = 'Magento_Paypal::system/config/fieldset/hint.phtml';
 
diff --git a/app/code/Magento/Paypal/Block/Express/InContext/Minicart/Button.php b/app/code/Magento/Paypal/Block/Express/InContext/Minicart/Button.php
index 8d1e04c1397fc..6b4071120b511 100644
--- a/app/code/Magento/Paypal/Block/Express/InContext/Minicart/Button.php
+++ b/app/code/Magento/Paypal/Block/Express/InContext/Minicart/Button.php
@@ -16,7 +16,7 @@
 
 /**
  * Class Button
- * @deprecated @see \Magento\Paypal\Block\Express\InContext\Minicart\SmartButton
+ * @deprecated 100.3.1 @see \Magento\Paypal\Block\Express\InContext\Minicart\SmartButton
  */
 class Button extends Template implements ShortcutInterface
 {
diff --git a/app/code/Magento/Paypal/Model/AbstractConfig.php b/app/code/Magento/Paypal/Model/AbstractConfig.php
index cf7e8009dab65..6fc3ac7a7732d 100644
--- a/app/code/Magento/Paypal/Model/AbstractConfig.php
+++ b/app/code/Magento/Paypal/Model/AbstractConfig.php
@@ -229,7 +229,7 @@ public function shouldUseUnilateralPayments()
     /**
      * Check whether WPP API credentials are available for this method
      *
-     * @deprecated
+     * @deprecated 100.3.1
      * @return bool
      */
     public function isWppApiAvailabe()
diff --git a/app/code/Magento/Paypal/Model/Api/Nvp.php b/app/code/Magento/Paypal/Model/Api/Nvp.php
index 9e4f7693f4bfb..7d247eed7397d 100644
--- a/app/code/Magento/Paypal/Model/Api/Nvp.php
+++ b/app/code/Magento/Paypal/Model/Api/Nvp.php
@@ -1465,7 +1465,7 @@ protected function _exportLineItems(array &$request, $i = 0)
      *
      * @param array $data
      * @return void
-     * @deprecated 100.2.2 typo in method name
+     * @deprecated 100.2.4 typo in method name
      * @see _exportAddresses
      */
     protected function _exportAddressses($data)
diff --git a/app/code/Magento/Quote/Model/BillingAddressManagement.php b/app/code/Magento/Quote/Model/BillingAddressManagement.php
index bc055e71c662e..6f8a44dff464c 100644
--- a/app/code/Magento/Quote/Model/BillingAddressManagement.php
+++ b/app/code/Magento/Quote/Model/BillingAddressManagement.php
@@ -103,7 +103,7 @@ public function get($cartId)
      * Get shipping address assignment
      *
      * @return \Magento\Quote\Model\ShippingAddressAssignment
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     private function getShippingAddressAssignment()
     {
diff --git a/app/code/Magento/Quote/Model/MaskedQuoteIdToQuoteIdInterface.php b/app/code/Magento/Quote/Model/MaskedQuoteIdToQuoteIdInterface.php
index 152d575e059c8..5cdcca5349c1b 100644
--- a/app/code/Magento/Quote/Model/MaskedQuoteIdToQuoteIdInterface.php
+++ b/app/code/Magento/Quote/Model/MaskedQuoteIdToQuoteIdInterface.php
@@ -12,6 +12,7 @@
 /**
  * Converts masked quote id to the quote id (entity id)
  * @api
+ * @since 101.1.0
  */
 interface MaskedQuoteIdToQuoteIdInterface
 {
@@ -19,6 +20,7 @@ interface MaskedQuoteIdToQuoteIdInterface
      * @param string $maskedQuoteId
      * @return int
      * @throws NoSuchEntityException
+     * @since 101.1.0
      */
     public function execute(string $maskedQuoteId): int;
 }
diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
index c7d40c82bbcc2..8b51c9e1bd774 100644
--- a/app/code/Magento/Quote/Model/Quote.php
+++ b/app/code/Magento/Quote/Model/Quote.php
@@ -873,7 +873,7 @@ public function beforeSave()
      * Loading quote data by customer
      *
      * @param \Magento\Customer\Model\Customer|int $customer
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @return $this
      */
     public function loadByCustomer($customer)
diff --git a/app/code/Magento/Quote/Model/Quote/Address.php b/app/code/Magento/Quote/Model/Quote/Address.php
index 39148f990b714..a7b5178765010 100644
--- a/app/code/Magento/Quote/Model/Quote/Address.php
+++ b/app/code/Magento/Quote/Model/Quote/Address.php
@@ -238,7 +238,7 @@ class Address extends AbstractAddress implements
 
     /**
      * @var RateFactory
-     * @since 100.2.0
+     * @since 101.0.0
      */
     protected $_addressRateFactory;
 
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Item.php b/app/code/Magento/Quote/Model/Quote/Address/Item.php
index ade4f9270b68f..bbf74d5a28935 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Item.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Item.php
@@ -199,6 +199,7 @@ public function importQuoteItem(\Magento\Quote\Model\Quote\Item $quoteItem)
 
     /**
      * @inheritdoc
+     * @since 101.1.1
      */
     public function getOptionByCode($code)
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Item.php b/app/code/Magento/Quote/Model/Quote/Item.php
index 2e4a9c7ded683..22554380ca61e 100644
--- a/app/code/Magento/Quote/Model/Quote/Item.php
+++ b/app/code/Magento/Quote/Model/Quote/Item.php
@@ -173,7 +173,7 @@ class Item extends \Magento\Quote\Model\Quote\Item\AbstractItem implements \Mage
 
     /**
      * @var \Magento\CatalogInventory\Api\StockRegistryInterface
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected $stockRegistry;
 
diff --git a/app/code/Magento/Quote/Model/Quote/Validator/MinimumOrderAmount/ValidationMessage.php b/app/code/Magento/Quote/Model/Quote/Validator/MinimumOrderAmount/ValidationMessage.php
index 38bfcbf1d30ca..78aa31d7d9527 100644
--- a/app/code/Magento/Quote/Model/Quote/Validator/MinimumOrderAmount/ValidationMessage.php
+++ b/app/code/Magento/Quote/Model/Quote/Validator/MinimumOrderAmount/ValidationMessage.php
@@ -19,7 +19,7 @@ class ValidationMessage
 
     /**
      * @var \Magento\Framework\Locale\CurrencyInterface
-     * @deprecated since 101.0.0
+     * @deprecated 101.0.3 since 101.0.0
      */
     private $currency;
 
diff --git a/app/code/Magento/Quote/Model/QuoteAddressValidator.php b/app/code/Magento/Quote/Model/QuoteAddressValidator.php
index e7750f5879de5..f0bc12f7b3a36 100644
--- a/app/code/Magento/Quote/Model/QuoteAddressValidator.php
+++ b/app/code/Magento/Quote/Model/QuoteAddressValidator.php
@@ -31,7 +31,7 @@ class QuoteAddressValidator
     protected $customerRepository;
 
     /**
-     * @deprecated This class is not a part of HTML presentation layer and should not use sessions.
+     * @deprecated 101.1.1 This class is not a part of HTML presentation layer and should not use sessions.
      */
     protected $customerSession;
 
diff --git a/app/code/Magento/Quote/Model/QuoteIdToMaskedQuoteIdInterface.php b/app/code/Magento/Quote/Model/QuoteIdToMaskedQuoteIdInterface.php
index 4d2a8ce877d8c..2a73a648889fb 100644
--- a/app/code/Magento/Quote/Model/QuoteIdToMaskedQuoteIdInterface.php
+++ b/app/code/Magento/Quote/Model/QuoteIdToMaskedQuoteIdInterface.php
@@ -12,6 +12,7 @@
 /**
  * Converts quote id to the masked quote id
  * @api
+ * @since 101.1.0
  */
 interface QuoteIdToMaskedQuoteIdInterface
 {
@@ -19,6 +20,7 @@ interface QuoteIdToMaskedQuoteIdInterface
      * @param int $quoteId
      * @return string
      * @throws NoSuchEntityException
+     * @since 101.1.0
      */
     public function execute(int $quoteId): string;
 }
diff --git a/app/code/Magento/Quote/Model/QuoteRepository.php b/app/code/Magento/Quote/Model/QuoteRepository.php
index ccfd3df5fafa3..0dd2b00a596ea 100644
--- a/app/code/Magento/Quote/Model/QuoteRepository.php
+++ b/app/code/Magento/Quote/Model/QuoteRepository.php
@@ -43,7 +43,7 @@ class QuoteRepository implements CartRepositoryInterface
 
     /**
      * @var QuoteFactory
-     * @deprecated
+     * @deprecated 101.1.2
      */
     protected $quoteFactory;
 
@@ -54,7 +54,7 @@ class QuoteRepository implements CartRepositoryInterface
 
     /**
      * @var QuoteCollection
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected $quoteCollection;
 
@@ -261,7 +261,7 @@ public function getList(SearchCriteriaInterface $searchCriteria)
      * @param FilterGroup $filterGroup The filter group.
      * @param QuoteCollection $collection The quote collection.
      * @return void
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @throws InputException The specified filter group or quote collection does not exist.
      */
     protected function addFilterGroupToCollection(FilterGroup $filterGroup, QuoteCollection $collection)
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote.php b/app/code/Magento/Quote/Model/ResourceModel/Quote.php
index 48945dacd1738..8c0829b4712f4 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote.php
@@ -257,7 +257,7 @@ public function subtractProductFromQuotes($product)
      *
      * @param \Magento\Catalog\Model\Product $product
      *
-     * @deprecated 101.0.1
+     * @deprecated 101.0.3
      * @see \Magento\Quote\Model\ResourceModel\Quote::subtractProductFromQuotes
      *
      * @return $this
diff --git a/app/code/Magento/Quote/Model/ShippingMethodManagement.php b/app/code/Magento/Quote/Model/ShippingMethodManagement.php
index d9fa37c0185a9..dab4fa98607a0 100644
--- a/app/code/Magento/Quote/Model/ShippingMethodManagement.php
+++ b/app/code/Magento/Quote/Model/ShippingMethodManagement.php
@@ -286,7 +286,7 @@ public function estimateByAddressId($cartId, $addressId)
      * @param ExtensibleDataInterface|null $address
      * @return ShippingMethodInterface[] An array of shipping methods.
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @deprecated 100.2.0
+     * @deprecated 100.1.6
      */
     protected function getEstimatedRates(
         Quote $quote,
@@ -366,7 +366,7 @@ private function extractAddressData($address)
      * Gets the data object processor
      *
      * @return DataObjectProcessor
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     private function getDataObjectProcessor()
     {
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentAndPlaceOrder.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentAndPlaceOrder.php
index dd4ce8fe7f7a6..e4ad4542ab251 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentAndPlaceOrder.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentAndPlaceOrder.php
@@ -22,7 +22,7 @@
 /**
  * Resolver for setting payment method and placing order
  *
- * @deprecated Should use setPaymentMethodOnCart and placeOrder mutations in single request.
+ * @deprecated 100.3.4 Should use setPaymentMethodOnCart and placeOrder mutations in single request.
  * @see \Magento\QuoteGraphQl\Model\Resolver\SetPaymentMethodOnCart
  * @see \Magento\QuoteGraphQl\Model\Resolver\PlaceOrder
  */
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php b/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php
index dd42874b55795..257eb481e1923 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Wishlist.php
@@ -9,7 +9,7 @@
 /**
  * Adminhtml wishlist report page content block
  *
- * @deprecated
+ * @deprecated 100.3.3
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Wishlist extends \Magento\Backend\Block\Template
diff --git a/app/code/Magento/Reports/Block/Product/Widget/Viewed/Item.php b/app/code/Magento/Reports/Block/Product/Widget/Viewed/Item.php
index 12959f083d376..1e3eb12331bde 100644
--- a/app/code/Magento/Reports/Block/Product/Widget/Viewed/Item.php
+++ b/app/code/Magento/Reports/Block/Product/Widget/Viewed/Item.php
@@ -8,7 +8,7 @@
 /**
  * Reports Recently Viewed Products Widget
  *
- * @deprecated
+ * @deprecated 100.3.3
  * @author     Magento Core Team <core@magentocommerce.com>
  */
 class Item extends \Magento\Catalog\Block\Product\AbstractProduct implements \Magento\Widget\Block\BlockInterface
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
index 0a74c23fad991..44571550459c2 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
@@ -818,7 +818,7 @@ public function addSumAvgTotals($storeId = 0)
      * @param string $baseSubtotalCanceled
      * @param string $baseDiscountCanceled
      * @return string
-     * @deprecated
+     * @deprecated 100.3.2
      * @see getTotalsExpressionWithDiscountRefunded
      */
     protected function getTotalsExpression(
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Product/Downloads/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Product/Downloads/Collection.php
index d194526858cde..ed3e4e8c4446d 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Product/Downloads/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Product/Downloads/Collection.php
@@ -100,6 +100,7 @@ public function addFieldToFilter($field, $condition = null)
 
     /**
      * @inheritDoc
+     * @since 100.3.2
      */
     public function getSelectCountSql()
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Quote/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Quote/Collection.php
index c1c6fb2eaed88..b69ea94aac9bb 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Quote/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Quote/Collection.php
@@ -58,6 +58,7 @@ public function __construct(
      * @param array $storeIds
      * @param bool $withAdmin
      * @return $this
+     * @since 100.3.1
      */
     public function addStoreFilter(array $storeIds, $withAdmin = true)
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Review/Customer/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Review/Customer/Collection.php
index f37bd6c6a7bd2..1ee47f3cd7bbb 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Review/Customer/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Review/Customer/Collection.php
@@ -113,6 +113,7 @@ protected function _joinCustomers()
      *
      * Additional processing of 'customer_name' field is required, as it is a concat field, which can not be aliased.
      * @see _joinCustomers
+     * @since 100.2.2
      */
     public function addFieldToFilter($field, $condition = null)
     {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Review/Product/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Review/Product/Collection.php
index 6f7738a8273bb..69221af3322f0 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Review/Product/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Review/Product/Collection.php
@@ -106,6 +106,7 @@ public function addAttributeToSort($attribute, $dir = self::SORT_ORDER_ASC)
      * @param array|null $condition
      * @param string $joinType
      * @return $this|\Magento\Catalog\Model\ResourceModel\Product\Collection
+     * @since 100.3.5
      */
     public function addAttributeToFilter($attribute, $condition = null, $joinType = 'inner')
     {
diff --git a/app/code/Magento/Review/Block/Adminhtml/Edit/Tab/Reviews.php b/app/code/Magento/Review/Block/Adminhtml/Edit/Tab/Reviews.php
index 15d41fad0a595..bf3c0e5b82ccb 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Edit/Tab/Reviews.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Edit/Tab/Reviews.php
@@ -13,6 +13,7 @@
  * Review tab in adminhtml area.
  *
  * @api
+ * @since 100.4.0
  */
 class Reviews extends Grid
 {
@@ -20,6 +21,7 @@ class Reviews extends Grid
      * Hide grid mass action elements.
      *
      * @return Reviews
+     * @since 100.4.0
      */
     protected function _prepareMassaction()
     {
@@ -30,6 +32,7 @@ protected function _prepareMassaction()
      * Determine ajax url for grid refresh
      *
      * @return string
+     * @since 100.4.0
      */
     public function getGridUrl()
     {
diff --git a/app/code/Magento/Review/Block/Customer/View.php b/app/code/Magento/Review/Block/Customer/View.php
index da5aff1f4d2f8..bb322f17b6ce9 100644
--- a/app/code/Magento/Review/Block/Customer/View.php
+++ b/app/code/Magento/Review/Block/Customer/View.php
@@ -161,7 +161,7 @@ public function getRating()
     /**
      * Get rating summary
      *
-     * @deprecated
+     * @deprecated 100.3.3
      * @return array
      */
     public function getRatingSummary()
diff --git a/app/code/Magento/Review/Block/View.php b/app/code/Magento/Review/Block/View.php
index 82a5f37f9b6bf..fcfa11faa169d 100644
--- a/app/code/Magento/Review/Block/View.php
+++ b/app/code/Magento/Review/Block/View.php
@@ -119,7 +119,7 @@ public function getRating()
     /**
      * Retrieve rating summary for current product
      *
-     * @deprecated
+     * @deprecated 100.3.3
      * @return string
      */
     public function getRatingSummary()
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Rating.php b/app/code/Magento/Review/Controller/Adminhtml/Rating.php
index 02649661154af..672c3ed327941 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Rating.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Rating.php
@@ -41,7 +41,7 @@ public function __construct(
     }
 
     /**
-     * @deprecated Misspelled method
+     * @deprecated 100.3.0 Misspelled method
      * @see initEntityId
      */
     protected function initEnityId()
diff --git a/app/code/Magento/Review/Model/ResourceModel/Review/Product/Collection.php b/app/code/Magento/Review/Model/ResourceModel/Review/Product/Collection.php
index ab264ef1b6179..1fb7e7df2461f 100644
--- a/app/code/Magento/Review/Model/ResourceModel/Review/Product/Collection.php
+++ b/app/code/Magento/Review/Model/ResourceModel/Review/Product/Collection.php
@@ -553,6 +553,7 @@ protected function _afterLoad()
      * Not add store ids to items
      *
      * @return $this
+     * @since 100.2.8
      */
     protected function prepareStoreId()
     {
diff --git a/app/code/Magento/Review/Model/Review.php b/app/code/Magento/Review/Model/Review.php
index 0c581f570ef0c..f2e0997ea8878 100644
--- a/app/code/Magento/Review/Model/Review.php
+++ b/app/code/Magento/Review/Model/Review.php
@@ -101,7 +101,7 @@ class Review extends \Magento\Framework\Model\AbstractModel implements IdentityI
     /**
      * Review model summary
      *
-     * @deprecated Summary factory injected as separate property
+     * @deprecated 100.3.3 Summary factory injected as separate property
      * @var \Magento\Review\Model\Review\Summary
      */
     protected $_reviewSummary;
@@ -216,7 +216,7 @@ public function aggregate()
     /**
      * Get entity summary
      *
-     * @deprecated
+     * @deprecated 100.3.3
      * @param Product $product
      * @param int $storeId
      * @return void
@@ -306,7 +306,7 @@ public function afterDeleteCommit()
     /**
      * Append review summary data object to product collection
      *
-     * @deprecated
+     * @deprecated 100.3.3
      * @param ProductCollection $collection
      * @return $this
      * @throws \Magento\Framework\Exception\NoSuchEntityException
diff --git a/app/code/Magento/Robots/Block/Data.php b/app/code/Magento/Robots/Block/Data.php
index 460225d3ed71c..9a28f91de19d9 100644
--- a/app/code/Magento/Robots/Block/Data.php
+++ b/app/code/Magento/Robots/Block/Data.php
@@ -19,7 +19,7 @@
  * Prepares base content for robots.txt and implements Page Cache functionality.
  *
  * @api
- * @since 100.2.0
+ * @since 100.1.0
  */
 class Data extends AbstractBlock implements IdentityInterface
 {
@@ -60,7 +60,7 @@ public function __construct(
      * Retrieve base content for robots.txt file
      *
      * @return string
-     * @since 100.2.0
+     * @since 100.1.0
      */
     protected function _toHtml()
     {
@@ -71,7 +71,7 @@ protected function _toHtml()
      * Get unique page cache identities
      *
      * @return array
-     * @since 100.2.0
+     * @since 100.1.0
      */
     public function getIdentities()
     {
diff --git a/app/code/Magento/Robots/Model/Config/Value.php b/app/code/Magento/Robots/Model/Config/Value.php
index 16a5a486e1078..ab955dadbe33d 100644
--- a/app/code/Magento/Robots/Model/Config/Value.php
+++ b/app/code/Magento/Robots/Model/Config/Value.php
@@ -23,7 +23,7 @@
  * Required to implement Page Cache functionality.
  *
  * @api
- * @since 100.2.0
+ * @since 100.1.0
  */
 class Value extends ConfigValue implements IdentityInterface
 {
@@ -35,7 +35,7 @@ class Value extends ConfigValue implements IdentityInterface
     /**
      * @inheritdoc
      *
-     * @since 100.2.0
+     * @since 100.1.0
      */
     protected $_cacheTag = [self::CACHE_TAG];
 
@@ -86,7 +86,7 @@ public function __construct(
      * Get unique page cache identities
      *
      * @return array
-     * @since 100.2.0
+     * @since 100.1.0
      */
     public function getIdentities()
     {
diff --git a/app/code/Magento/Sales/Api/Data/OrderPaymentInterface.php b/app/code/Magento/Sales/Api/Data/OrderPaymentInterface.php
index ac400206b8a2f..8f9ab43313968 100644
--- a/app/code/Magento/Sales/Api/Data/OrderPaymentInterface.php
+++ b/app/code/Magento/Sales/Api/Data/OrderPaymentInterface.php
@@ -1047,6 +1047,7 @@ public function setCcTransId($id);
      *
      * @param string[] $additionalInformation
      * @return $this
+     * @since 102.1.0
      */
     public function setAdditionalInformation($additionalInformation);
 
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php
index 9adfd0407a9ba..8ec07f9765204 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php
@@ -433,7 +433,7 @@ protected function _getTierPriceInfo($prices)
      * @param Item $item
      * @return string
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     public function getCustomOptions(Item $item)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php
index a927b7177294a..77765b242001f 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php
@@ -66,6 +66,7 @@ public function getItemCollection()
 
     /**
      * @inheritdoc
+     * @since 102.0.1
      */
     public function getItemPrice(Product $product)
     {
@@ -150,6 +151,7 @@ private function getCartItemCustomPrice(Product $product): ?float
 
     /**
      * @inheritdoc
+     * @since 102.0.4
      */
     public function getItemCount()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php
index a7649fecaf2bb..781fb3b7501b5 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/Create/Adjustments.php
@@ -76,6 +76,7 @@ public function initTotals()
      * @param null|float $value
      *
      * @return string
+     * @since 102.1.0
      */
     public function formatValue($value)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Totalbar.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Totalbar.php
index c4ce48d162c2c..33e5250d27d26 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Totalbar.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Totalbar.php
@@ -8,7 +8,7 @@
 /**
  * Adminhtml creditmemo bar
  *
- * @deprecated
+ * @deprecated 101.0.6
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Info.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Info.php
index 598a3e226a879..22f61d3583faa 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Info.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Info.php
@@ -305,7 +305,7 @@ public function getFormattedAddress(Address $address)
 
     /**
      * @inheritdoc
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getChildHtml($alias = '', $useCache = true)
     {
diff --git a/app/code/Magento/Sales/Block/Order/Email/Creditmemo/Items.php b/app/code/Magento/Sales/Block/Order/Email/Creditmemo/Items.php
index 0a1e87e5e0a27..bfb668a674095 100644
--- a/app/code/Magento/Sales/Block/Order/Email/Creditmemo/Items.php
+++ b/app/code/Magento/Sales/Block/Order/Email/Creditmemo/Items.php
@@ -71,6 +71,7 @@ protected function _prepareItem(\Magento\Framework\View\Element\AbstractBlock $r
      * For legacy custom email templates it can pass as an object.
      *
      * @return OrderInterface|null
+     * @since 102.1.0
      */
     public function getOrder()
     {
@@ -96,6 +97,7 @@ public function getOrder()
      * For legacy custom email templates it can pass as an object.
      *
      * @return CreditmemoInterface|null
+     * @since 102.1.0
      */
     public function getCreditmemo()
     {
diff --git a/app/code/Magento/Sales/Block/Order/Email/Invoice/Items.php b/app/code/Magento/Sales/Block/Order/Email/Invoice/Items.php
index cc2b197ab0eb2..7b5389a54e878 100644
--- a/app/code/Magento/Sales/Block/Order/Email/Invoice/Items.php
+++ b/app/code/Magento/Sales/Block/Order/Email/Invoice/Items.php
@@ -71,6 +71,7 @@ protected function _prepareItem(\Magento\Framework\View\Element\AbstractBlock $r
      * For legacy custom email templates it can pass as an object.
      *
      * @return OrderInterface|null
+     * @since 102.1.0
      */
     public function getOrder()
     {
@@ -96,6 +97,7 @@ public function getOrder()
      * For legacy custom email templates it can pass as an object.
      *
      * @return InvoiceInterface|null
+     * @since 102.1.0
      */
     public function getInvoice()
     {
diff --git a/app/code/Magento/Sales/Block/Order/Email/Items.php b/app/code/Magento/Sales/Block/Order/Email/Items.php
index e11981285f04f..8a7256d1f1175 100644
--- a/app/code/Magento/Sales/Block/Order/Email/Items.php
+++ b/app/code/Magento/Sales/Block/Order/Email/Items.php
@@ -52,6 +52,7 @@ public function __construct(
      * For legacy custom email templates it can pass as an object.
      *
      * @return OrderInterface|null
+     * @since 102.1.0
      */
     public function getOrder()
     {
diff --git a/app/code/Magento/Sales/Block/Order/Email/Shipment/Items.php b/app/code/Magento/Sales/Block/Order/Email/Shipment/Items.php
index 1f9b353180fd9..db7fa6b03715a 100644
--- a/app/code/Magento/Sales/Block/Order/Email/Shipment/Items.php
+++ b/app/code/Magento/Sales/Block/Order/Email/Shipment/Items.php
@@ -71,6 +71,7 @@ protected function _prepareItem(\Magento\Framework\View\Element\AbstractBlock $r
      * For legacy custom email templates it can pass as an object.
      *
      * @return OrderInterface|null
+     * @since 102.1.0
      */
     public function getOrder()
     {
@@ -96,6 +97,7 @@ public function getOrder()
      * For legacy custom email templates it can pass as an object.
      *
      * @return ShipmentInterface|null
+     * @since 102.1.0
      */
     public function getShipment()
     {
diff --git a/app/code/Magento/Sales/Block/Order/History.php b/app/code/Magento/Sales/Block/Order/History.php
index 09300424212fe..98b1ccfc5b2e8 100644
--- a/app/code/Magento/Sales/Block/Order/History.php
+++ b/app/code/Magento/Sales/Block/Order/History.php
@@ -158,7 +158,7 @@ public function getViewUrl($order)
      *
      * @param object $order
      * @return string
-     * @deprecated Action does not exist
+     * @deprecated 102.0.3 Action does not exist
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function getTrackUrl($order)
@@ -193,6 +193,7 @@ public function getBackUrl()
      * Get message for no orders.
      *
      * @return \Magento\Framework\Phrase
+     * @since 102.1.0
      */
     public function getEmptyOrdersMessage()
     {
diff --git a/app/code/Magento/Sales/Block/Order/PrintShipment.php b/app/code/Magento/Sales/Block/Order/PrintShipment.php
index 0006a38f0f1ce..039bf2c79e78b 100644
--- a/app/code/Magento/Sales/Block/Order/PrintShipment.php
+++ b/app/code/Magento/Sales/Block/Order/PrintShipment.php
@@ -88,7 +88,7 @@ public function getOrder()
      * Disable pager for printing page
      *
      * @return bool
-     * @since 100.2.0
+     * @since 100.1.9
      */
     public function isPagerDisplayed()
     {
@@ -99,7 +99,7 @@ public function isPagerDisplayed()
      * Get order items
      *
      * @return \Magento\Framework\DataObject[]
-     * @since 100.2.0
+     * @since 100.1.9
      */
     public function getItems()
     {
diff --git a/app/code/Magento/Sales/Block/Order/Recent.php b/app/code/Magento/Sales/Block/Order/Recent.php
index 79119c1851347..934f1b5efdcdd 100644
--- a/app/code/Magento/Sales/Block/Order/Recent.php
+++ b/app/code/Magento/Sales/Block/Order/Recent.php
@@ -120,7 +120,7 @@ public function getViewUrl($order)
      *
      * @param object $order
      * @return string
-     * @deprecated Action does not exist
+     * @deprecated 102.0.3 Action does not exist
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function getTrackUrl($order)
diff --git a/app/code/Magento/Sales/Block/Order/View.php b/app/code/Magento/Sales/Block/Order/View.php
index 03d1340e0f690..eef13fd47bf94 100644
--- a/app/code/Magento/Sales/Block/Order/View.php
+++ b/app/code/Magento/Sales/Block/Order/View.php
@@ -29,7 +29,7 @@ class View extends \Magento\Framework\View\Element\Template
 
     /**
      * @var \Magento\Framework\App\Http\Context
-     * @since 100.2.0
+     * @since 101.0.0
      */
     protected $httpContext;
 
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php
index c6b45f282debc..1f75008897102 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php
@@ -14,7 +14,7 @@
 
 /**
  * Class AbstractMassStatus
- * @deprecated 100.2.0
+ * @deprecated 101.0.0
  * Never extend from this action. Implement mass-action logic in the "execute" method of your controller.
  */
 abstract class AbstractMassAction extends \Magento\Backend\App\Action
diff --git a/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php b/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
index fc4e238d47c99..069b2783076d9 100644
--- a/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
+++ b/app/code/Magento/Sales/Controller/Download/DownloadCustomOption.php
@@ -33,7 +33,7 @@ class DownloadCustomOption extends \Magento\Framework\App\Action\Action implemen
 
     /**
      * @var \Magento\Framework\Unserialize\Unserialize
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected $unserialize;
 
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
index 67a533ea88550..a8178cbfe249f 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/Create.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -1151,7 +1151,7 @@ public function updateQuoteItems($items)
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected function _parseOptions(\Magento\Quote\Model\Quote\Item $item, $additionalOptions)
     {
@@ -1221,7 +1221,7 @@ protected function _parseOptions(\Magento\Quote\Model\Quote\Item $item, $additio
      * @param array $options
      * @return $this
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected function _assignOptionsToItem(\Magento\Quote\Model\Quote\Item $item, $options)
     {
diff --git a/app/code/Magento/Sales/Model/Increment.php b/app/code/Magento/Sales/Model/Increment.php
index 75ff1ee044a95..813b3dcc40a7a 100644
--- a/app/code/Magento/Sales/Model/Increment.php
+++ b/app/code/Magento/Sales/Model/Increment.php
@@ -9,7 +9,7 @@
 
 /**
  * Class Increment
- * @deprecated 100.2.0
+ * @deprecated 101.0.0
  */
 class Increment
 {
diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
index 598b204a33097..46b296d7f8964 100644
--- a/app/code/Magento/Sales/Model/Order.php
+++ b/app/code/Magento/Sales/Model/Order.php
@@ -193,7 +193,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
 
     /**
      * @var \Magento\Catalog\Api\ProductRepositoryInterface
-     * @deprecated 100.1.7 Remove unused dependency.
+     * @deprecated 100.1.0 Remove unused dependency.
      */
     protected $productRepository;
 
@@ -1076,6 +1076,7 @@ public function setState($state)
      * Retrieve frontend label of order status
      *
      * @return string
+     * @since 102.0.1
      */
     public function getFrontendStatusLabel()
     {
@@ -1115,7 +1116,7 @@ public function addStatusToHistory($status, $comment = '', $isCustomerNotified =
      * @param string $comment
      * @param bool|string $status
      * @return OrderStatusHistoryInterface
-     * @deprecated
+     * @deprecated 101.0.5
      * @see addCommentToStatusHistory
      */
     public function addStatusHistoryComment($comment, $status = false)
@@ -1132,6 +1133,7 @@ public function addStatusHistoryComment($comment, $status = false)
      * @param bool|string $status
      * @param bool $isVisibleOnFront
      * @return OrderStatusHistoryInterface
+     * @since 101.0.5
      */
     public function addCommentToStatusHistory($comment, $status = false, $isVisibleOnFront = false)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Address.php b/app/code/Magento/Sales/Model/Order/Address.php
index 9b8f4e79c23fa..0fd4555238ed5 100644
--- a/app/code/Magento/Sales/Model/Order/Address.php
+++ b/app/code/Magento/Sales/Model/Order/Address.php
@@ -732,6 +732,7 @@ public function setExtensionAttributes(\Magento\Sales\Api\Data\OrderAddressExten
 
     /**
      * @inheritdoc
+     * @since 102.0.3
      */
     public function beforeSave()
     {
diff --git a/app/code/Magento/Sales/Model/Order/AddressRepository.php b/app/code/Magento/Sales/Model/Order/AddressRepository.php
index deeeb16b7714c..1a700826dbc3f 100644
--- a/app/code/Magento/Sales/Model/Order/AddressRepository.php
+++ b/app/code/Magento/Sales/Model/Order/AddressRepository.php
@@ -240,7 +240,7 @@ public function create()
     /**
      * Retrieve collection processor
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @return CollectionProcessorInterface
      */
     private function getCollectionProcessor()
diff --git a/app/code/Magento/Sales/Model/Order/Config.php b/app/code/Magento/Sales/Model/Order/Config.php
index 92681f3ecf181..32b9298be2b5f 100644
--- a/app/code/Magento/Sales/Model/Order/Config.php
+++ b/app/code/Magento/Sales/Model/Order/Config.php
@@ -157,6 +157,7 @@ public function getStatusLabel($code)
      *
      * @param string|null $code
      * @return string|null
+     * @since 102.0.1
      */
     public function getStatusFrontendLabel(?string $code): ?string
     {
@@ -307,7 +308,7 @@ protected function _getStatuses($visibility)
      * @param string $state
      * @param string $status
      * @return \Magento\Framework\Phrase|string
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getStateLabelByStateAndStatus($state, $status)
     {
diff --git a/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php b/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
index 8138e193e7978..26706c6e76e31 100644
--- a/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
+++ b/app/code/Magento/Sales/Model/Order/CreditmemoFactory.php
@@ -32,7 +32,7 @@ class CreditmemoFactory
 
     /**
      * @var \Magento\Framework\Unserialize\Unserialize
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected $unserialize;
 
diff --git a/app/code/Magento/Sales/Model/Order/CreditmemoRepository.php b/app/code/Magento/Sales/Model/Order/CreditmemoRepository.php
index ce4a0aa5b3e3a..269ee313c09df 100644
--- a/app/code/Magento/Sales/Model/Order/CreditmemoRepository.php
+++ b/app/code/Magento/Sales/Model/Order/CreditmemoRepository.php
@@ -151,7 +151,7 @@ public function save(\Magento\Sales\Api\Data\CreditmemoInterface $entity)
     /**
      * Retrieve collection processor
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @return CollectionProcessorInterface
      */
     private function getCollectionProcessor()
diff --git a/app/code/Magento/Sales/Model/Order/CustomerManagement.php b/app/code/Magento/Sales/Model/Order/CustomerManagement.php
index ae3f940dbb2ba..50c7f88af546b 100644
--- a/app/code/Magento/Sales/Model/Order/CustomerManagement.php
+++ b/app/code/Magento/Sales/Model/Order/CustomerManagement.php
@@ -27,17 +27,17 @@ class CustomerManagement implements \Magento\Sales\Api\OrderCustomerManagementIn
     protected $accountManagement;
 
     /**
-     * @deprecated
+     * @deprecated 101.0.4
      */
     protected $customerFactory;
 
     /**
-     * @deprecated
+     * @deprecated 101.0.4
      */
     protected $addressFactory;
 
     /**
-     * @deprecated
+     * @deprecated 101.0.4
      */
     protected $regionFactory;
 
@@ -47,7 +47,7 @@ class CustomerManagement implements \Magento\Sales\Api\OrderCustomerManagementIn
     protected $orderRepository;
 
     /**
-     * @deprecated
+     * @deprecated 101.0.4
      */
     protected $objectCopyService;
 
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
index 4c8e1744ac0e0..49aef3de7fecb 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentSender.php
@@ -19,7 +19,7 @@
 /**
  * Sends order shipment email to the customer.
  *
- * @deprecated since this class works only with the concrete model and no data interface
+ * @deprecated 102.1.0 since this class works only with the concrete model and no data interface
  * @see \Magento\Sales\Model\Order\Shipment\Sender\EmailSender
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
diff --git a/app/code/Magento/Sales/Model/Order/InvoiceRepository.php b/app/code/Magento/Sales/Model/Order/InvoiceRepository.php
index 2244a86260c2f..ac1a782367ab3 100644
--- a/app/code/Magento/Sales/Model/Order/InvoiceRepository.php
+++ b/app/code/Magento/Sales/Model/Order/InvoiceRepository.php
@@ -145,7 +145,7 @@ public function save(\Magento\Sales\Api\Data\InvoiceInterface $entity)
     /**
      * Retrieve collection processor
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @return CollectionProcessorInterface
      */
     private function getCollectionProcessor()
diff --git a/app/code/Magento/Sales/Model/Order/Item.php b/app/code/Magento/Sales/Model/Order/Item.php
index ba01090e5abff..bc55b2229770d 100644
--- a/app/code/Magento/Sales/Model/Order/Item.php
+++ b/app/code/Magento/Sales/Model/Order/Item.php
@@ -2409,7 +2409,7 @@ public function setExtensionAttributes(\Magento\Sales\Api\Data\OrderItemExtensio
      * Check if it is possible to process item after cancellation
      *
      * @return bool
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function isProcessingAvailable()
     {
diff --git a/app/code/Magento/Sales/Model/Order/Payment.php b/app/code/Magento/Sales/Model/Order/Payment.php
index 3076c6dfd2ba7..6a2a77b52927a 100644
--- a/app/code/Magento/Sales/Model/Order/Payment.php
+++ b/app/code/Magento/Sales/Model/Order/Payment.php
@@ -1494,7 +1494,7 @@ protected function _getInvoiceForTransactionId($transactionId)
     /**
      * Get order state resolver instance.
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @return OrderStateResolverInterface
      */
     private function getOrderStateResolver()
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Repository.php b/app/code/Magento/Sales/Model/Order/Payment/Repository.php
index 4353f6b1cc391..27686ffb46c9d 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Repository.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Repository.php
@@ -131,7 +131,7 @@ public function create()
     /**
      * Retrieve collection processor
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @return CollectionProcessorInterface
      */
     private function getCollectionProcessor()
diff --git a/app/code/Magento/Sales/Model/Order/Payment/State/AuthorizeCommand.php b/app/code/Magento/Sales/Model/Order/Payment/State/AuthorizeCommand.php
index 89731b5130605..d17f3b51f3934 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/State/AuthorizeCommand.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/State/AuthorizeCommand.php
@@ -90,7 +90,7 @@ private function getNotificationMessage(OrderPaymentInterface $payment): ?string
      * @param string $status
      * @param string $state
      * @return void
-     * @deprecated 100.2.0 Replaced by a StatusResolver class call.
+     * @deprecated 100.1.9 Replaced by a StatusResolver class call.
      */
     protected function setOrderStateAndStatus(Order $order, $status, $state)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Payment/State/CaptureCommand.php b/app/code/Magento/Sales/Model/Order/Payment/State/CaptureCommand.php
index f57e1933a7e5a..79b329cd486e5 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/State/CaptureCommand.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/State/CaptureCommand.php
@@ -74,7 +74,7 @@ public function execute(OrderPaymentInterface $payment, $amount, OrderInterface
      * @param string $status
      * @param string $state
      * @return void
-     * @deprecated 100.2.0 Replaced by a StatusResolver class call.
+     * @deprecated 100.1.9 Replaced by a StatusResolver class call.
      */
     protected function setOrderStateAndStatus(Order $order, $status, $state)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Payment/State/OrderCommand.php b/app/code/Magento/Sales/Model/Order/Payment/State/OrderCommand.php
index 2a7e7145f6886..d6acd82613c0a 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/State/OrderCommand.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/State/OrderCommand.php
@@ -61,7 +61,7 @@ public function execute(OrderPaymentInterface $payment, $amount, OrderInterface
     }
 
     /**
-     * @deprecated 100.2.0 Replaced by a StatusResolver class call.
+     * @deprecated 100.1.9 Replaced by a StatusResolver class call.
      *
      * @param Order $order
      * @param string $status
diff --git a/app/code/Magento/Sales/Model/Order/Payment/State/RegisterCaptureNotificationCommand.php b/app/code/Magento/Sales/Model/Order/Payment/State/RegisterCaptureNotificationCommand.php
index 2551092a64e9a..ff375c995a183 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/State/RegisterCaptureNotificationCommand.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/State/RegisterCaptureNotificationCommand.php
@@ -73,7 +73,7 @@ public function execute(OrderPaymentInterface $payment, $amount, OrderInterface
     /**
      * Sets the state and status of the order
      *
-     * @deprecated 100.2.0 Replaced by a StatusResolver class call.
+     * @deprecated 100.1.9 Replaced by a StatusResolver class call.
      *
      * @param Order $order
      * @param string $status
diff --git a/app/code/Magento/Sales/Model/Order/Payment/Transaction/Repository.php b/app/code/Magento/Sales/Model/Order/Payment/Transaction/Repository.php
index a602fe54363ed..30af4e07a42bf 100644
--- a/app/code/Magento/Sales/Model/Order/Payment/Transaction/Repository.php
+++ b/app/code/Magento/Sales/Model/Order/Payment/Transaction/Repository.php
@@ -233,7 +233,7 @@ public function create()
     /**
      * Retrieve collection processor
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @return CollectionProcessorInterface
      */
     private function getCollectionProcessor()
diff --git a/app/code/Magento/Sales/Model/Order/ProductOption.php b/app/code/Magento/Sales/Model/Order/ProductOption.php
index 9a4f847b135e7..3d0b5433d7a4f 100644
--- a/app/code/Magento/Sales/Model/Order/ProductOption.php
+++ b/app/code/Magento/Sales/Model/Order/ProductOption.php
@@ -17,6 +17,7 @@
  * Adds product option to the order item according to product options processors pool.
  *
  * @api
+ * @since 102.0.1
  */
 class ProductOption
 {
@@ -54,6 +55,7 @@ public function __construct(
      * Adds product option to the order item.
      *
      * @param OrderItemInterface $orderItem
+     * @since 102.0.1
      */
     public function add(OrderItemInterface $orderItem): void
     {
diff --git a/app/code/Magento/Sales/Model/Order/Reorder/OrderedProductAvailabilityChecker.php b/app/code/Magento/Sales/Model/Order/Reorder/OrderedProductAvailabilityChecker.php
index dd70c6b5481df..e4f2ff0d57035 100644
--- a/app/code/Magento/Sales/Model/Order/Reorder/OrderedProductAvailabilityChecker.php
+++ b/app/code/Magento/Sales/Model/Order/Reorder/OrderedProductAvailabilityChecker.php
@@ -16,7 +16,7 @@
  * of the array $productAvailabilityChecks(constructor argument). A product type should be a key for the new element.
  *
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 class OrderedProductAvailabilityChecker implements OrderedProductAvailabilityCheckerInterface
 {
@@ -36,7 +36,7 @@ public function __construct(array $productAvailabilityChecks)
 
     /**
      * @inheritdoc
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function isAvailable(Item $item)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Reorder/OrderedProductAvailabilityCheckerInterface.php b/app/code/Magento/Sales/Model/Order/Reorder/OrderedProductAvailabilityCheckerInterface.php
index 989bd482ed4e8..59f7dfc63b095 100644
--- a/app/code/Magento/Sales/Model/Order/Reorder/OrderedProductAvailabilityCheckerInterface.php
+++ b/app/code/Magento/Sales/Model/Order/Reorder/OrderedProductAvailabilityCheckerInterface.php
@@ -9,7 +9,7 @@
 
 /**
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 interface OrderedProductAvailabilityCheckerInterface
 {
@@ -19,7 +19,7 @@ interface OrderedProductAvailabilityCheckerInterface
      *
      * @param Item $item
      * @return bool
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function isAvailable(Item $item);
 }
diff --git a/app/code/Magento/Sales/Model/Order/ShipmentFactory.php b/app/code/Magento/Sales/Model/Order/ShipmentFactory.php
index 21b42abeb293d..3cd318ea67adb 100644
--- a/app/code/Magento/Sales/Model/Order/ShipmentFactory.php
+++ b/app/code/Magento/Sales/Model/Order/ShipmentFactory.php
@@ -12,6 +12,7 @@
  * Factory class for @see \Magento\Sales\Api\Data\ShipmentInterface
  *
  * @api
+ * @since 100.0.2
  */
 class ShipmentFactory
 {
diff --git a/app/code/Magento/Sales/Model/Order/ShipmentRepository.php b/app/code/Magento/Sales/Model/Order/ShipmentRepository.php
index 0b86bec895b75..ad73b22e94555 100644
--- a/app/code/Magento/Sales/Model/Order/ShipmentRepository.php
+++ b/app/code/Magento/Sales/Model/Order/ShipmentRepository.php
@@ -166,7 +166,7 @@ public function create()
     /**
      * Retrieve collection processor
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @return CollectionProcessorInterface
      */
     private function getCollectionProcessor()
diff --git a/app/code/Magento/Sales/Model/OrderRepository.php b/app/code/Magento/Sales/Model/OrderRepository.php
index f93de4c32d888..ecd4e7babb1e3 100644
--- a/app/code/Magento/Sales/Model/OrderRepository.php
+++ b/app/code/Magento/Sales/Model/OrderRepository.php
@@ -317,7 +317,7 @@ private function getShippingAssignmentBuilderDependency()
      * @param \Magento\Framework\Api\Search\FilterGroup $filterGroup
      * @param \Magento\Sales\Api\Data\OrderSearchResultInterface $searchResult
      * @return void
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @throws \Magento\Framework\Exception\InputException
      */
     protected function addFilterGroupToCollection(
diff --git a/app/code/Magento/Sales/Model/ResourceModel/AbstractGrid.php b/app/code/Magento/Sales/Model/ResourceModel/AbstractGrid.php
index 25c15449a9fb4..444fc589748ab 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/AbstractGrid.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/AbstractGrid.php
@@ -90,7 +90,7 @@ public function purge($value, $field = null)
      *
      * @param string $default
      * @return string
-     * @deprecated 100.2.0 this method is not used in abstract model but only in single child so
+     * @deprecated 101.0.0 this method is not used in abstract model but only in single child so
      * this deprecation is a part of cleaning abstract classes.
      * @see \Magento\Sales\Model\ResourceModel\Provider\UpdatedIdListProvider
      */
diff --git a/app/code/Magento/SalesInventory/Model/Order/ReturnProcessor.php b/app/code/Magento/SalesInventory/Model/Order/ReturnProcessor.php
index 3f2ba38fa5a55..2739226c5fb5a 100644
--- a/app/code/Magento/SalesInventory/Model/Order/ReturnProcessor.php
+++ b/app/code/Magento/SalesInventory/Model/Order/ReturnProcessor.php
@@ -12,6 +12,7 @@
  * Class ReturnProcessor
  *
  * @api
+ * @since 100.0.0
  */
 class ReturnProcessor
 {
@@ -68,6 +69,7 @@ public function __construct(
      * @param array $returnToStockItems
      * @param bool $isAutoReturn
      * @return void
+     * @since 100.0.0
      */
     public function execute(
         CreditmemoInterface $creditmemo,
diff --git a/app/code/Magento/SalesRule/Api/Data/CouponInterface.php b/app/code/Magento/SalesRule/Api/Data/CouponInterface.php
index bd44ea829fe66..2ab731f2f7974 100644
--- a/app/code/Magento/SalesRule/Api/Data/CouponInterface.php
+++ b/app/code/Magento/SalesRule/Api/Data/CouponInterface.php
@@ -110,7 +110,7 @@ public function setTimesUsed($timesUsed);
      * Get expiration date
      *
      * @return string|null
-     * @deprecated Coupon expiration must follow sales rule expiration date.
+     * @deprecated 101.1.3 Coupon expiration must follow sales rule expiration date.
      */
     public function getExpirationDate();
 
@@ -119,7 +119,7 @@ public function getExpirationDate();
      *
      * @param string $expirationDate
      * @return $this
-     * @deprecated Coupon expiration must follow sales rule expiration date.
+     * @deprecated 101.1.3 Coupon expiration must follow sales rule expiration date.
      */
     public function setExpirationDate($expirationDate);
 
diff --git a/app/code/Magento/SalesRule/Model/Coupon.php b/app/code/Magento/SalesRule/Model/Coupon.php
index a8c77c6ceeec8..070ce89c1d474 100644
--- a/app/code/Magento/SalesRule/Model/Coupon.php
+++ b/app/code/Magento/SalesRule/Model/Coupon.php
@@ -207,7 +207,7 @@ public function setTimesUsed($timesUsed)
      * Get expiration date
      *
      * @return string|null
-     * @deprecated Coupon expiration must follow sales rule expiration date.
+     * @deprecated 101.1.3 Coupon expiration must follow sales rule expiration date.
      */
     public function getExpirationDate()
     {
@@ -219,7 +219,7 @@ public function getExpirationDate()
      *
      * @param string $expirationDate
      * @return $this
-     * @deprecated Coupon expiration must follow sales rule expiration date.
+     * @deprecated 101.1.3 Coupon expiration must follow sales rule expiration date.
      */
     public function setExpirationDate($expirationDate)
     {
diff --git a/app/code/Magento/SalesRule/Model/CouponRepository.php b/app/code/Magento/SalesRule/Model/CouponRepository.php
index 4c557832fa8d6..f32fbc3d12134 100644
--- a/app/code/Magento/SalesRule/Model/CouponRepository.php
+++ b/app/code/Magento/SalesRule/Model/CouponRepository.php
@@ -197,7 +197,7 @@ public function deleteById($couponId)
      *
      * @param FilterGroup $filterGroup
      * @param Collection $collection
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @return void
      */
     protected function addFilterGroupToCollection(
@@ -219,7 +219,7 @@ protected function addFilterGroupToCollection(
     /**
      * Retrieve collection processor
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @return CollectionProcessorInterface
      */
     private function getCollectionProcessor()
diff --git a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CartFixed.php b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CartFixed.php
index e44200614fa00..46790f92540aa 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CartFixed.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Action/Discount/CartFixed.php
@@ -118,7 +118,7 @@ public function calculate($rule, $item, $qty)
     /**
      * Set information about usage cart fixed rule by quote address
      *
-     * @deprecated should be removed as it is not longer used
+     * @deprecated 101.2.0 should be removed as it is not longer used
      * @param int $ruleId
      * @param int $itemId
      * @return void
@@ -131,7 +131,7 @@ protected function setCartFixedRuleUsedForAddress($ruleId, $itemId)
     /**
      * Retrieve information about usage cart fixed rule by quote address
      *
-     * @deprecated should be removed as it is not longer used
+     * @deprecated 101.2.0 should be removed as it is not longer used
      * @param int $ruleId
      * @return int|null
      */
diff --git a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Combine.php b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Combine.php
index 6ade7a064e849..35e7e62144611 100644
--- a/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Combine.php
+++ b/app/code/Magento/SalesRule/Model/Rule/Condition/Product/Combine.php
@@ -89,6 +89,7 @@ public function collectValidatedAttributes($productCollection)
 
     /**
      * @inheritdoc
+     * @since 101.0.6
      */
     protected function _isValid($entity)
     {
diff --git a/app/code/Magento/SalesRule/Model/RuleRepository.php b/app/code/Magento/SalesRule/Model/RuleRepository.php
index 2cff0d64dba01..2016ae0dde1c7 100644
--- a/app/code/Magento/SalesRule/Model/RuleRepository.php
+++ b/app/code/Magento/SalesRule/Model/RuleRepository.php
@@ -184,7 +184,7 @@ public function deleteById($id)
      *
      * @param FilterGroup $filterGroup
      * @param Collection $collection
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @return void
      */
     protected function addFilterGroupToCollection(
@@ -206,7 +206,7 @@ protected function addFilterGroupToCollection(
     /**
      * Retrieve collection processor
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @return CollectionProcessorInterface
      */
     private function getCollectionProcessor()
diff --git a/app/code/Magento/SalesRule/Model/Service/CouponManagementService.php b/app/code/Magento/SalesRule/Model/Service/CouponManagementService.php
index b698190997d7e..7f355a62c4631 100644
--- a/app/code/Magento/SalesRule/Model/Service/CouponManagementService.php
+++ b/app/code/Magento/SalesRule/Model/Service/CouponManagementService.php
@@ -19,7 +19,7 @@ class CouponManagementService implements \Magento\SalesRule\Api\CouponManagement
 {
     /**
      * @var \Magento\SalesRule\Model\CouponFactory
-     * @deprecated
+     * @deprecated 101.1.2
      */
     protected $couponFactory;
 
@@ -30,7 +30,7 @@ class CouponManagementService implements \Magento\SalesRule\Api\CouponManagement
 
     /**
      * @var \Magento\SalesRule\Model\ResourceModel\Coupon\CollectionFactory
-     * @deprecated
+     * @deprecated 101.1.2
      */
     protected $collectionFactory;
 
@@ -41,7 +41,7 @@ class CouponManagementService implements \Magento\SalesRule\Api\CouponManagement
 
     /**
      * @var \Magento\SalesRule\Model\Spi\CouponResourceInterface
-     * @deprecated
+     * @deprecated 101.1.2
      */
     protected $resourceModel;
 
diff --git a/app/code/Magento/Search/Model/AdapterFactory.php b/app/code/Magento/Search/Model/AdapterFactory.php
index 917603ce57dc3..f6d2013bd4886 100644
--- a/app/code/Magento/Search/Model/AdapterFactory.php
+++ b/app/code/Magento/Search/Model/AdapterFactory.php
@@ -17,7 +17,7 @@ class AdapterFactory
      * Scope configuration
      *
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @deprecated since it is not used anymore
+     * @deprecated 101.0.0 since it is not used anymore
      */
     protected $scopeConfig;
 
@@ -32,13 +32,13 @@ class AdapterFactory
      * Config path
      *
      * @var string
-     * @deprecated since it is not used anymore
+     * @deprecated 101.0.0 since it is not used anymore
      */
     protected $path;
 
     /**
      * Config Scope
-     * @deprecated since it is not used anymore
+     * @deprecated 101.0.0 since it is not used anymore
      */
     protected $scope;
 
diff --git a/app/code/Magento/Search/Model/ResourceModel/Query/Collection.php b/app/code/Magento/Search/Model/ResourceModel/Query/Collection.php
index 2fc71fc6a6d73..8d3db36e35dec 100644
--- a/app/code/Magento/Search/Model/ResourceModel/Query/Collection.php
+++ b/app/code/Magento/Search/Model/ResourceModel/Query/Collection.php
@@ -168,6 +168,7 @@ public function setPopularQueryFilter($storeIds = null)
      * @param int $storeId
      * @param int $maxCountCacheableSearchTerms
      * @return bool
+     * @since 101.1.0
      */
     public function isTopSearchResult(string $term, int $storeId, int $maxCountCacheableSearchTerms):bool
     {
diff --git a/app/code/Magento/Search/Model/Search/PageSizeProvider.php b/app/code/Magento/Search/Model/Search/PageSizeProvider.php
index 5572bac6addc3..ae2a8ca954d63 100644
--- a/app/code/Magento/Search/Model/Search/PageSizeProvider.php
+++ b/app/code/Magento/Search/Model/Search/PageSizeProvider.php
@@ -10,6 +10,7 @@
 /**
  * Returns max  page size by search engine name
  * @api
+ * @since 101.0.0
  */
 class PageSizeProvider
 {
@@ -39,6 +40,7 @@ public function __construct(
      * Returns max_page_size depends on engine
      *
      * @return integer
+     * @since 101.0.0
      */
     public function getMaxPageSize() : int
     {
diff --git a/app/code/Magento/SendFriend/Block/Send.php b/app/code/Magento/SendFriend/Block/Send.php
index 1c4b550361359..6f2154ba29f47 100644
--- a/app/code/Magento/SendFriend/Block/Send.php
+++ b/app/code/Magento/SendFriend/Block/Send.php
@@ -228,6 +228,7 @@ public function canSend()
 
     /**
      * @inheritdoc
+     * @since 100.3.1
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
index 76555ce8a6d8c..0965c4a472c25 100644
--- a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
+++ b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
@@ -332,6 +332,7 @@ public function checkAvailableShipCountries(\Magento\Framework\DataObject $reque
      * @param \Magento\Framework\DataObject $request
      * @return $this|bool|\Magento\Framework\DataObject
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @since 100.2.6
      */
     public function processAdditionalValidation(\Magento\Framework\DataObject $request)
     {
@@ -343,7 +344,7 @@ public function processAdditionalValidation(\Magento\Framework\DataObject $reque
      *
      * @param \Magento\Framework\DataObject $request
      * @return $this|bool|\Magento\Framework\DataObject
-     * @deprecated
+     * @deprecated 100.2.6
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function proccessAdditionalValidation(\Magento\Framework\DataObject $request)
diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
index 27047ae46bf1f..c2238ff1a3809 100644
--- a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
+++ b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
@@ -303,7 +303,7 @@ public function getAllItems(RateRequest $request)
      *
      * @param \Magento\Framework\DataObject $request
      * @return $this|bool|\Magento\Framework\DataObject
-     * @deprecated
+     * @deprecated 100.2.6
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -319,6 +319,7 @@ public function proccessAdditionalValidation(\Magento\Framework\DataObject $requ
      * @return $this|bool|\Magento\Framework\DataObject
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @since 100.2.6
      */
     public function processAdditionalValidation(\Magento\Framework\DataObject $request)
     {
diff --git a/app/code/Magento/Shipping/Model/ShipmentProviderInterface.php b/app/code/Magento/Shipping/Model/ShipmentProviderInterface.php
index 4ff9ba0008340..546afdca5028b 100644
--- a/app/code/Magento/Shipping/Model/ShipmentProviderInterface.php
+++ b/app/code/Magento/Shipping/Model/ShipmentProviderInterface.php
@@ -11,6 +11,7 @@
  * Provide shipment items data.
  *
  * @api
+ * @since 100.3.0
  */
 interface ShipmentProviderInterface
 {
@@ -18,6 +19,7 @@ interface ShipmentProviderInterface
      * Retrieve shipment items.
      *
      * @return array
+     * @since 100.3.0
      */
     public function getShipmentData(): array;
 }
diff --git a/app/code/Magento/Sitemap/Block/Robots.php b/app/code/Magento/Sitemap/Block/Robots.php
index ac99b2ab1cd4a..2beb31bd06570 100644
--- a/app/code/Magento/Sitemap/Block/Robots.php
+++ b/app/code/Magento/Sitemap/Block/Robots.php
@@ -18,7 +18,7 @@
  * Prepares sitemap links to add to the robots.txt file
  *
  * @api
- * @since 100.2.0
+ * @since 100.1.5
  */
 class Robots extends AbstractBlock implements IdentityInterface
 {
@@ -70,7 +70,7 @@ public function __construct(
      * and adds links for this sitemap files into result data.
      *
      * @return string
-     * @since 100.2.0
+     * @since 100.1.5
      */
     protected function _toHtml()
     {
@@ -102,7 +102,7 @@ protected function _toHtml()
      *
      * @param int[] $storeIds
      * @return array
-     * @since 100.2.0
+     * @since 100.1.5
      */
     protected function getSitemapLinks(array $storeIds)
     {
@@ -128,7 +128,7 @@ protected function getSitemapLinks(array $storeIds)
      * Get unique page cache identities
      *
      * @return array
-     * @since 100.2.0
+     * @since 100.1.5
      */
     public function getIdentities()
     {
diff --git a/app/code/Magento/Sitemap/Helper/Data.php b/app/code/Magento/Sitemap/Helper/Data.php
index 44661bbef888e..118aeff28a14f 100644
--- a/app/code/Magento/Sitemap/Helper/Data.php
+++ b/app/code/Magento/Sitemap/Helper/Data.php
@@ -12,7 +12,7 @@
 use Magento\Store\Model\ScopeInterface;
 
 /**
- * @deprecated
+ * @deprecated 100.3.0
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -70,7 +70,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      *
      * @param int $storeId
      * @return int
-     * @deprecated
+     * @deprecated 100.3.0
      * @see SitemapConfigReader::getMaximumLinesNumber()
      */
     public function getMaximumLinesNumber($storeId)
@@ -87,7 +87,7 @@ public function getMaximumLinesNumber($storeId)
      *
      * @param int $storeId
      * @return int
-     * @deprecated
+     * @deprecated 100.3.0
      * @see SitemapConfigReader::getMaximumFileSize()
      */
     public function getMaximumFileSize($storeId)
@@ -104,7 +104,7 @@ public function getMaximumFileSize($storeId)
      *
      * @param int $storeId
      * @return string
-     * @deprecated
+     * @deprecated 100.3.0
      * @see CategoryConfigReader::getChangeFrequency()
      */
     public function getCategoryChangefreq($storeId)
@@ -121,7 +121,7 @@ public function getCategoryChangefreq($storeId)
      *
      * @param int $storeId
      * @return string
-     * @deprecated
+     * @deprecated 100.3.0
      * @see ProductConfigReader::getChangeFrequency()
      */
     public function getProductChangefreq($storeId)
@@ -138,7 +138,7 @@ public function getProductChangefreq($storeId)
      *
      * @param int $storeId
      * @return string
-     * @deprecated
+     * @deprecated 100.3.0
      * @see CmsPageConfigReader::getChangeFrequency()
      */
     public function getPageChangefreq($storeId)
@@ -155,7 +155,7 @@ public function getPageChangefreq($storeId)
      *
      * @param int $storeId
      * @return string
-     * @deprecated
+     * @deprecated 100.3.0
      * @see CategoryConfigReader::getPriority()
      */
     public function getCategoryPriority($storeId)
@@ -172,7 +172,7 @@ public function getCategoryPriority($storeId)
      *
      * @param int $storeId
      * @return string
-     * @deprecated
+     * @deprecated 100.3.0
      * @see ProductConfigReader::getPriority()
      */
     public function getProductPriority($storeId)
@@ -189,7 +189,7 @@ public function getProductPriority($storeId)
      *
      * @param int $storeId
      * @return string
-     * @deprecated
+     * @deprecated 100.3.0
      * @see CmsPageConfigReader::getPriority()
      */
     public function getPagePriority($storeId)
@@ -206,7 +206,7 @@ public function getPagePriority($storeId)
      *
      * @param int $storeId
      * @return int
-     * @deprecated
+     * @deprecated 100.3.0
      * @see SitemapConfigReader::getEnableSubmissionRobots()
      */
     public function getEnableSubmissionRobots($storeId)
@@ -223,7 +223,7 @@ public function getEnableSubmissionRobots($storeId)
      *
      * @param int $storeId
      * @return string
-     * @deprecated
+     * @deprecated 100.3.0
      * @see SitemapConfigReader::getProductImageIncludePolicy()
      */
     public function getProductImageIncludePolicy($storeId)
@@ -239,7 +239,7 @@ public function getProductImageIncludePolicy($storeId)
      * Get list valid paths for generate a sitemap XML file
      *
      * @return string[]
-     * @deprecated
+     * @deprecated 100.3.0
      * @see SitemapConfigReader::getValidPaths()
      */
     public function getValidPaths()
diff --git a/app/code/Magento/Sitemap/Model/ItemProvider/ConfigReaderInterface.php b/app/code/Magento/Sitemap/Model/ItemProvider/ConfigReaderInterface.php
index 1e8b545728a04..6c8ff087aeb60 100644
--- a/app/code/Magento/Sitemap/Model/ItemProvider/ConfigReaderInterface.php
+++ b/app/code/Magento/Sitemap/Model/ItemProvider/ConfigReaderInterface.php
@@ -10,6 +10,7 @@
  * Item resolver config reader interface
  *
  * @api
+ * @since 100.3.0
  */
 interface ConfigReaderInterface
 {
@@ -18,6 +19,7 @@ interface ConfigReaderInterface
      *
      * @param int $storeId
      * @return string
+     * @since 100.3.0
      */
     public function getPriority($storeId);
 
@@ -26,6 +28,7 @@ public function getPriority($storeId);
      *
      * @param int $storeId
      * @return string
+     * @since 100.3.0
      */
     public function getChangeFrequency($storeId);
 }
diff --git a/app/code/Magento/Sitemap/Model/ItemProvider/ItemProviderInterface.php b/app/code/Magento/Sitemap/Model/ItemProvider/ItemProviderInterface.php
index 89ad2afdd01a2..da56f86b7237c 100644
--- a/app/code/Magento/Sitemap/Model/ItemProvider/ItemProviderInterface.php
+++ b/app/code/Magento/Sitemap/Model/ItemProvider/ItemProviderInterface.php
@@ -11,6 +11,7 @@
  * Sitemap item provider interface
  *
  * @api
+ * @since 100.3.0
  */
 interface ItemProviderInterface
 {
@@ -19,6 +20,7 @@ interface ItemProviderInterface
      *
      * @param int $storeId
      * @return SitemapItemInterface[]
+     * @since 100.3.0
      */
     public function getItems($storeId);
 }
diff --git a/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php b/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php
index 8b2154e6ee47a..dc15819b087b2 100644
--- a/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php
+++ b/app/code/Magento/Sitemap/Model/ResourceModel/Catalog/Product.php
@@ -474,6 +474,7 @@ protected function _getMediaConfig()
      *
      * @param \Magento\Framework\DB\Select $select
      * @return \Magento\Framework\DB\Select
+     * @since 100.2.1
      */
     public function prepareSelectStatement(\Magento\Framework\DB\Select $select)
     {
diff --git a/app/code/Magento/Sitemap/Model/ResourceModel/Cms/Page.php b/app/code/Magento/Sitemap/Model/ResourceModel/Cms/Page.php
index 01addd0c19666..92cbcbd500e8a 100644
--- a/app/code/Magento/Sitemap/Model/ResourceModel/Cms/Page.php
+++ b/app/code/Magento/Sitemap/Model/ResourceModel/Cms/Page.php
@@ -38,7 +38,6 @@ class Page extends AbstractDb
 
     /**
      * @var GetUtilityPageIdentifiersInterface
-     * @since 100.2.0
      */
     private $getUtilityPageIdentifiers;
 
diff --git a/app/code/Magento/Sitemap/Model/Sitemap.php b/app/code/Magento/Sitemap/Model/Sitemap.php
index ea5659cf909ff..e58559101c2d2 100644
--- a/app/code/Magento/Sitemap/Model/Sitemap.php
+++ b/app/code/Magento/Sitemap/Model/Sitemap.php
@@ -160,7 +160,7 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel implements \Magento
     /**
      * @inheritdoc
      *
-     * @since 100.2.0
+     * @since 100.1.5
      */
     protected $_cacheTag = [Value::CACHE_TAG];
 
@@ -297,8 +297,9 @@ protected function _getStream()
      *
      * @param DataObject $sitemapItem
      * @return $this
-     * @deprecated 100.2.0
+     * @deprecated 100.3.0
      * @see ItemProviderInterface
+     * @since 100.2.0
      */
     public function addSitemapItem(DataObject $sitemapItem)
     {
@@ -311,8 +312,9 @@ public function addSitemapItem(DataObject $sitemapItem)
      * Collect all sitemap items
      *
      * @return void
-     * @deprecated 100.2.0
+     * @deprecated 100.3.0
      * @see ItemProviderInterface
+     * @since 100.2.0
      */
     public function collectSitemapItems()
     {
@@ -709,7 +711,7 @@ protected function _getUrl($url, $type = UrlInterface::URL_TYPE_LINK)
      *
      * @param string $url
      * @return string
-     * @deprecated No longer used, as we're generating product image URLs inside collection instead
+     * @deprecated 100.2.0 No longer used, as we're generating product image URLs inside collection instead
      * @see \Magento\Sitemap\Model\ResourceModel\Catalog\Product::_loadProductImages()
      */
     protected function _getMediaUrl($url)
@@ -793,7 +795,7 @@ public function getSitemapUrl($sitemapPath, $sitemapFileName)
      * Check is enabled submission to robots.txt
      *
      * @return bool
-     * @deprecated Because the robots.txt file is not generated anymore,
+     * @deprecated 100.1.5 Because the robots.txt file is not generated anymore,
      *             this method is not needed and will be removed in major release.
      */
     protected function _isEnabledSubmissionRobots()
@@ -807,7 +809,7 @@ protected function _isEnabledSubmissionRobots()
      *
      * @param string $sitemapFileName
      * @return void
-     * @deprecated Because the robots.txt file is not generated anymore,
+     * @deprecated 100.1.5 Because the robots.txt file is not generated anymore,
      *             this method is not needed and will be removed in major release.
      */
     protected function _addSitemapToRobotsTxt($sitemapFileName)
@@ -877,7 +879,7 @@ private function mapToSitemapItem()
      * Get unique page cache identities
      *
      * @return array
-     * @since 100.2.0
+     * @since 100.1.5
      */
     public function getIdentities()
     {
diff --git a/app/code/Magento/Sitemap/Model/SitemapConfigReaderInterface.php b/app/code/Magento/Sitemap/Model/SitemapConfigReaderInterface.php
index f094b8856ab14..f11b54c5842f8 100644
--- a/app/code/Magento/Sitemap/Model/SitemapConfigReaderInterface.php
+++ b/app/code/Magento/Sitemap/Model/SitemapConfigReaderInterface.php
@@ -10,6 +10,7 @@
  * Sitemap config reader interface
  *
  * @api
+ * @since 100.3.0
  */
 interface SitemapConfigReaderInterface
 {
@@ -18,6 +19,7 @@ interface SitemapConfigReaderInterface
      *
      * @param int $storeId
      * @return int
+     * @since 100.3.0
      */
     public function getEnableSubmissionRobots($storeId);
 
@@ -26,6 +28,7 @@ public function getEnableSubmissionRobots($storeId);
      *
      * @param int $storeId
      * @return int
+     * @since 100.3.0
      */
     public function getMaximumFileSize($storeId);
 
@@ -34,6 +37,7 @@ public function getMaximumFileSize($storeId);
      *
      * @param int $storeId
      * @return int
+     * @since 100.3.0
      */
     public function getMaximumLinesNumber($storeId);
 
@@ -42,6 +46,7 @@ public function getMaximumLinesNumber($storeId);
      *
      * @param int $storeId
      * @return string
+     * @since 100.3.0
      */
     public function getProductImageIncludePolicy($storeId);
 
@@ -49,6 +54,7 @@ public function getProductImageIncludePolicy($storeId);
      * Get list valid paths for generate a sitemap XML file
      *
      * @return string[]
+     * @since 100.3.0
      */
     public function getValidPaths();
 }
diff --git a/app/code/Magento/Sitemap/Model/SitemapItemInterface.php b/app/code/Magento/Sitemap/Model/SitemapItemInterface.php
index afd95768a2c84..94f19c5726b13 100644
--- a/app/code/Magento/Sitemap/Model/SitemapItemInterface.php
+++ b/app/code/Magento/Sitemap/Model/SitemapItemInterface.php
@@ -10,6 +10,7 @@
  * Representation of sitemap item
  *
  * @api
+ * @since 100.3.0
  */
 interface SitemapItemInterface
 {
@@ -18,6 +19,7 @@ interface SitemapItemInterface
      * Get url
      *
      * @return string
+     * @since 100.3.0
      */
     public function getUrl();
 
@@ -25,6 +27,7 @@ public function getUrl();
      * Get priority
      *
      * @return string
+     * @since 100.3.0
      */
     public function getPriority();
 
@@ -32,6 +35,7 @@ public function getPriority();
      * Get change frequency
      *
      * @return string
+     * @since 100.3.0
      */
     public function getChangeFrequency();
 
@@ -39,6 +43,7 @@ public function getChangeFrequency();
      * Get images
      *
      * @return array|null
+     * @since 100.3.0
      */
     public function getImages();
 
@@ -46,6 +51,7 @@ public function getImages();
      * Get last update date
      *
      * @return string|null
+     * @since 100.3.0
      */
     public function getUpdatedAt();
 }
diff --git a/app/code/Magento/Store/Api/Data/StoreInterface.php b/app/code/Magento/Store/Api/Data/StoreInterface.php
index 0f724a23fc096..527a7038e261a 100644
--- a/app/code/Magento/Store/Api/Data/StoreInterface.php
+++ b/app/code/Magento/Store/Api/Data/StoreInterface.php
@@ -69,11 +69,13 @@ public function getStoreGroupId();
     /**
      * @param int $isActive
      * @return $this
+     * @since 101.0.0
      */
     public function setIsActive($isActive);
 
     /**
      * @return int
+     * @since 101.0.0
      */
     public function getIsActive();
 
diff --git a/app/code/Magento/Store/Api/StoreResolverInterface.php b/app/code/Magento/Store/Api/StoreResolverInterface.php
index 7c32e321fa6c4..d03d68d213135 100644
--- a/app/code/Magento/Store/Api/StoreResolverInterface.php
+++ b/app/code/Magento/Store/Api/StoreResolverInterface.php
@@ -8,7 +8,7 @@
 /**
  * Store resolver interface
  *
- * @deprecated
+ * @deprecated 101.0.0
  * @see \Magento\Store\Model\StoreManagerInterface
  */
 interface StoreResolverInterface
diff --git a/app/code/Magento/Store/Controller/Store/SwitchAction.php b/app/code/Magento/Store/Controller/Store/SwitchAction.php
index 41acb1605ec7c..bea7dbbaaa5fb 100644
--- a/app/code/Magento/Store/Controller/Store/SwitchAction.php
+++ b/app/code/Magento/Store/Controller/Store/SwitchAction.php
@@ -36,7 +36,7 @@ class SwitchAction extends Action implements HttpGetActionInterface, HttpPostAct
 
     /**
      * @var HttpContext
-     * @deprecated
+     * @deprecated 100.2.5
      */
     protected $httpContext;
 
@@ -47,7 +47,7 @@ class SwitchAction extends Action implements HttpGetActionInterface, HttpPostAct
 
     /**
      * @var StoreManagerInterface
-     * @deprecated
+     * @deprecated 100.2.5
      */
     protected $storeManager;
 
diff --git a/app/code/Magento/Store/Model/Config/Importer/Processor/Create.php b/app/code/Magento/Store/Model/Config/Importer/Processor/Create.php
index 317e4bf43e42c..2cbd4aeb20d4d 100644
--- a/app/code/Magento/Store/Model/Config/Importer/Processor/Create.php
+++ b/app/code/Magento/Store/Model/Config/Importer/Processor/Create.php
@@ -51,7 +51,7 @@ class Create implements ProcessorInterface
     /**
      * The event manager.
      *
-     * @deprecated logic moved inside of "afterSave" method
+     * @deprecated 100.2.5 logic moved inside of "afterSave" method
      *             \Magento\Store\Model\Website::afterSave
      *             \Magento\Store\Model\Group::afterSave
      *             \Magento\Store\Model\Store::afterSave
diff --git a/app/code/Magento/Store/Model/Config/Placeholder.php b/app/code/Magento/Store/Model/Config/Placeholder.php
index be84c7f444c44..e04dc81c1359e 100644
--- a/app/code/Magento/Store/Model/Config/Placeholder.php
+++ b/app/code/Magento/Store/Model/Config/Placeholder.php
@@ -84,7 +84,7 @@ public function process(array $data = [])
     /**
      * Process array data recursively
      *
-     * @deprecated This method isn't used in process() implementation anymore
+     * @deprecated 101.0.4 This method isn't used in process() implementation anymore
      *
      * @param array &$data
      * @param string $path
@@ -178,7 +178,7 @@ protected function _getValue($path, array $data)
     /**
      * Set array value by path
      *
-     * @deprecated This method isn't used in process() implementation anymore
+     * @deprecated 101.0.4 This method isn't used in process() implementation anymore
      *
      * @param array &$container
      * @param string $path
diff --git a/app/code/Magento/Store/Model/Group.php b/app/code/Magento/Store/Model/Group.php
index 4cd7bc93d3334..7f1e71c422251 100644
--- a/app/code/Magento/Store/Model/Group.php
+++ b/app/code/Magento/Store/Model/Group.php
@@ -454,6 +454,7 @@ public function afterDelete()
 
     /**
      * @inheritdoc
+     * @since 100.2.5
      */
     public function afterSave()
     {
diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php
index 5187bb8776632..7bcb3282ba552 100644
--- a/app/code/Magento/Store/Model/Store.php
+++ b/app/code/Magento/Store/Model/Store.php
@@ -208,7 +208,7 @@ class Store extends AbstractExtensibleModel implements
      * Flag that shows that backend URLs are secure
      *
      * @var boolean|null
-     * @deprecated unused protected property
+     * @deprecated 101.0.0 unused protected property
      */
     protected $_isAdminSecure = null;
 
@@ -278,7 +278,7 @@ class Store extends AbstractExtensibleModel implements
 
     /**
      * @var \Magento\Framework\Session\SidResolverInterface
-     * @deprecated Not used anymore.
+     * @deprecated 101.0.5 Not used anymore.
      */
     protected $_sidResolver;
 
@@ -1134,6 +1134,7 @@ public function setStoreGroupId($storeGroupId)
 
     /**
      * @inheritdoc
+     * @since 101.0.0
      */
     public function getIsActive()
     {
@@ -1142,6 +1143,7 @@ public function getIsActive()
 
     /**
      * @inheritdoc
+     * @since 101.0.0
      */
     public function setIsActive($isActive)
     {
@@ -1389,6 +1391,7 @@ public function getStorePath()
 
     /**
      * @inheritdoc
+     * @since 100.1.0
      */
     public function getScopeType()
     {
@@ -1397,6 +1400,7 @@ public function getScopeType()
 
     /**
      * @inheritdoc
+     * @since 100.1.0
      */
     public function getScopeTypeName()
     {
diff --git a/app/code/Magento/Store/Model/StoreResolver.php b/app/code/Magento/Store/Model/StoreResolver.php
index aafdd15138981..2a950b699abe7 100644
--- a/app/code/Magento/Store/Model/StoreResolver.php
+++ b/app/code/Magento/Store/Model/StoreResolver.php
@@ -28,12 +28,12 @@ class StoreResolver implements \Magento\Store\Api\StoreResolverInterface
     protected $storeCookieManager;
 
     /**
-     * @deprecated
+     * @deprecated 101.0.0
      */
     protected $cache;
 
     /**
-     * @deprecated
+     * @deprecated 101.0.0
      */
     protected $readerList;
 
@@ -142,7 +142,7 @@ protected function getStoresData() : array
      * Read stores data. First element is allowed store ids, second is default store id
      *
      * @return array
-     * @deprecated
+     * @deprecated 101.0.0
      * @see \Magento\Store\Model\StoreResolver::getStoresData
      */
     protected function readStoresData() : array
diff --git a/app/code/Magento/Store/Model/System/Store.php b/app/code/Magento/Store/Model/System/Store.php
index d13781b8c146b..a56cdcc37dd54 100644
--- a/app/code/Magento/Store/Model/System/Store.php
+++ b/app/code/Magento/Store/Model/System/Store.php
@@ -229,6 +229,7 @@ public function getStoresStructure($isAll = false, $storeIds = [], $groupIds = [
      * @param array $groupIds
      * @param array $websiteIds
      * @return array Format: array(array('value' => '<value>', 'label' => '<label>'), ...)
+     * @since 101.1.0
      */
     public function getStoreOptionsTree($isAll = false, $storeIds = [], $groupIds = [], $websiteIds = []): array
     {
diff --git a/app/code/Magento/Store/Setup/Patch/Schema/InitializeStoresAndWebsites.php b/app/code/Magento/Store/Setup/Patch/Schema/InitializeStoresAndWebsites.php
index 05e46e04b5c96..dc1932bdd8943 100644
--- a/app/code/Magento/Store/Setup/Patch/Schema/InitializeStoresAndWebsites.php
+++ b/app/code/Magento/Store/Setup/Patch/Schema/InitializeStoresAndWebsites.php
@@ -142,7 +142,7 @@ public function apply()
     /**
      * Get default category.
      *
-     * @deprecated 100.1.0
+     * @deprecated 101.0.0
      * @return DefaultCategory
      */
     private function getDefaultCategory()
diff --git a/app/code/Magento/Swagger/Api/Data/SchemaTypeInterface.php b/app/code/Magento/Swagger/Api/Data/SchemaTypeInterface.php
index f1bc6fcc105dc..f7167f6494312 100644
--- a/app/code/Magento/Swagger/Api/Data/SchemaTypeInterface.php
+++ b/app/code/Magento/Swagger/Api/Data/SchemaTypeInterface.php
@@ -14,6 +14,7 @@
  * Swagger Schema Type.
  *
  * @api
+ * @since 100.2.4
  */
 interface SchemaTypeInterface extends ArgumentInterface
 {
@@ -21,6 +22,7 @@ interface SchemaTypeInterface extends ArgumentInterface
      * Retrieve the available types of Swagger schema.
      *
      * @return string
+     * @since 100.2.4
      */
     public function getCode();
 
@@ -29,6 +31,7 @@ public function getCode();
      *
      * @param  string|null $store
      * @return string
+     * @since 100.2.4
      */
     public function getSchemaUrlPath($store = null);
 }
diff --git a/app/code/Magento/Swagger/Block/Index.php b/app/code/Magento/Swagger/Block/Index.php
index 549495190ef34..8eecfbb24935d 100644
--- a/app/code/Magento/Swagger/Block/Index.php
+++ b/app/code/Magento/Swagger/Block/Index.php
@@ -17,6 +17,7 @@
  * @method SchemaTypeInterface[] getSchemaTypes()
  * @method bool hasSchemaTypes()
  * @method string getDefaultSchemaTypeCode()
+ * @since 100.2.1
  */
 class Index extends Template
 {
@@ -53,6 +54,7 @@ private function getSchemaType()
 
     /**
      * @return string|null
+     * @since 100.2.1
      */
     public function getSchemaUrl()
     {
diff --git a/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php b/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php
index a2cae7f7b5a20..32df3daf4599b 100644
--- a/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php
+++ b/app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php
@@ -81,7 +81,7 @@ class Configurable extends \Magento\ConfigurableProduct\Block\Product\View\Type\
     /**
      * Indicate if product has one or more Swatch attributes
      *
-     * @deprecated 100.1.5 unused
+     * @deprecated 100.1.0 unused
      *
      * @var boolean
      */
@@ -250,7 +250,7 @@ protected function getSwatchAttributesData()
     /**
      * Init isProductHasSwatchAttribute.
      *
-     * @deprecated 100.1.5 Method isProductHasSwatchAttribute() is used instead of this.
+     * @deprecated 100.2.0 Method isProductHasSwatchAttribute() is used instead of this.
      *
      * @codeCoverageIgnore
      * @return void
@@ -510,6 +510,7 @@ public function getIdentities()
      * Get Swatch image size config data.
      *
      * @return string
+     * @since 100.2.5
      */
     public function getJsonSwatchSizeConfig()
     {
diff --git a/app/code/Magento/Swatches/Block/Product/Renderer/Listing/Configurable.php b/app/code/Magento/Swatches/Block/Product/Renderer/Listing/Configurable.php
index 6e0a1e8d01360..e9b813003a09b 100644
--- a/app/code/Magento/Swatches/Block/Product/Renderer/Listing/Configurable.php
+++ b/app/code/Magento/Swatches/Block/Product/Renderer/Listing/Configurable.php
@@ -158,6 +158,7 @@ public function getJsonConfig()
      * Composes configuration for js price format
      *
      * @return string
+     * @since 100.2.3
      */
     public function getPriceFormatJson()
     {
@@ -168,6 +169,7 @@ public function getPriceFormatJson()
      * Composes configuration for js price
      *
      * @return string
+     * @since 100.2.3
      */
     public function getPricesJson()
     {
diff --git a/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php b/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php
index 9ad62265be21f..121d85ecc181d 100644
--- a/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php
+++ b/app/code/Magento/Swatches/Model/ResourceModel/Swatch.php
@@ -47,6 +47,7 @@ public function saveDefaultSwatchOption($id, $defaultValue)
      * @param array $optionIDs
      * @param int $type
      * @throws \Magento\Framework\Exception\LocalizedException
+     * @since 100.2.4
      */
     public function clearSwatchOptionByOptionIdAndType($optionIDs, $type = null)
     {
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Items/Price/Renderer.php b/app/code/Magento/Tax/Block/Adminhtml/Items/Price/Renderer.php
index 376adba63db62..a1f538e0b0c70 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Items/Price/Renderer.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Items/Price/Renderer.php
@@ -22,7 +22,7 @@ class Renderer extends \Magento\Backend\Block\Template
 {
     /**
      * @var \Magento\Tax\Helper\Data
-     * @deprecated
+     * @deprecated 100.3.0
      * Marked as deprecated as it is unused.
      */
     protected $taxHelper;
diff --git a/app/code/Magento/Tax/Model/System/Message/Notifications.php b/app/code/Magento/Tax/Model/System/Message/Notifications.php
index ca59ab9eec3bf..163054d9e9394 100644
--- a/app/code/Magento/Tax/Model/System/Message/Notifications.php
+++ b/app/code/Magento/Tax/Model/System/Message/Notifications.php
@@ -16,7 +16,7 @@ class Notifications implements \Magento\Framework\Notification\MessageInterface
      * Store manager object
      *
      * @var \Magento\Store\Model\StoreManagerInterface
-     * @deprecated 100.1.3
+     * @deprecated 100.1.0
      */
     protected $storeManager;
 
@@ -36,7 +36,7 @@ class Notifications implements \Magento\Framework\Notification\MessageInterface
      * Stores with invalid display settings
      *
      * @var array
-     * @deprecated 100.1.3
+     * @deprecated 100.1.0
      * @see \Magento\Tax\Model\System\Message\Notification\RoundingErrors
      */
     protected $storesWithInvalidDisplaySettings;
@@ -45,7 +45,7 @@ class Notifications implements \Magento\Framework\Notification\MessageInterface
      * Websites with invalid discount settings
      *
      * @var array
-     * @deprecated 100.1.3
+     * @deprecated 100.1.0
      * @see \Magento\Tax\Model\System\Message\Notification\DiscountErrors
      */
     protected $storesWithInvalidDiscountSettings;
diff --git a/app/code/Magento/Theme/Block/Html/Footer.php b/app/code/Magento/Theme/Block/Html/Footer.php
index cdb350336f38f..7f9b9cf86a809 100644
--- a/app/code/Magento/Theme/Block/Html/Footer.php
+++ b/app/code/Magento/Theme/Block/Html/Footer.php
@@ -127,6 +127,7 @@ public function getIdentities()
      * Get block cache life time
      *
      * @return int
+     * @since 100.2.4
      */
     protected function getCacheLifetime()
     {
diff --git a/app/code/Magento/Theme/Block/Html/Header/Logo.php b/app/code/Magento/Theme/Block/Html/Header/Logo.php
index 626a771b4e309..792ee95de4995 100644
--- a/app/code/Magento/Theme/Block/Html/Header/Logo.php
+++ b/app/code/Magento/Theme/Block/Html/Header/Logo.php
@@ -43,7 +43,7 @@ public function __construct(
     /**
      * Check if current url is url for home page
      *
-     * @deprecated This function is no longer used. It was previously used by
+     * @deprecated 101.0.1 This function is no longer used. It was previously used by
      * Magento/Theme/view/frontend/templates/html/header/logo.phtml
      * to check if the logo should be clickable on the homepage.
      *
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadJs.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadJs.php
index fc396615e71e7..fb2ceb0a91fc9 100644
--- a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadJs.php
+++ b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/UploadJs.php
@@ -11,7 +11,7 @@
 
 /**
  * Class UploadJs
- * @deprecated
+ * @deprecated 101.0.0
  */
 class UploadJs extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme implements HttpGetActionInterface
 {
diff --git a/app/code/Magento/Theme/Model/ResourceModel/Theme/Grid/Collection.php b/app/code/Magento/Theme/Model/ResourceModel/Theme/Grid/Collection.php
index c4a7bb11a78f7..4ee6880c8190d 100644
--- a/app/code/Magento/Theme/Model/ResourceModel/Theme/Grid/Collection.php
+++ b/app/code/Magento/Theme/Model/ResourceModel/Theme/Grid/Collection.php
@@ -7,7 +7,7 @@
 
 /**
  * Theme grid collection
- * @deprecated
+ * @deprecated 101.0.0
  * @see \Magento\Theme\Ui\Component\Theme\DataProvider\SearchResult
  */
 class Collection extends \Magento\Theme\Model\ResourceModel\Theme\Collection
diff --git a/app/code/Magento/Theme/Ui/Component/Design/Config/SearchRobots/ResetButton.php b/app/code/Magento/Theme/Ui/Component/Design/Config/SearchRobots/ResetButton.php
index 4b71fc6faba15..f0e668d10c3a6 100644
--- a/app/code/Magento/Theme/Ui/Component/Design/Config/SearchRobots/ResetButton.php
+++ b/app/code/Magento/Theme/Ui/Component/Design/Config/SearchRobots/ResetButton.php
@@ -14,7 +14,7 @@
  * ResetButton field instance
  *
  * @api
- * @since 100.2.0
+ * @since 100.1.9
  */
 class ResetButton extends Field
 {
@@ -66,7 +66,7 @@ private function getRobotsDefaultCustomInstructions()
      *
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @since 100.2.0
+     * @since 100.1.9
      */
     public function prepare()
     {
diff --git a/app/code/Magento/Tinymce3/Model/Config/Gallery/Config.php b/app/code/Magento/Tinymce3/Model/Config/Gallery/Config.php
index e59aa2934e4ed..e525bf62cc3a3 100644
--- a/app/code/Magento/Tinymce3/Model/Config/Gallery/Config.php
+++ b/app/code/Magento/Tinymce3/Model/Config/Gallery/Config.php
@@ -12,7 +12,7 @@
 /**
  * Class Config adds information about required configurations to display media gallery of tinymce3 editor
  *
- * @deprecated use \Magento\Cms\Model\Wysiwyg\DefaultConfigProvider instead
+ * @deprecated 100.3.0 use \Magento\Cms\Model\Wysiwyg\DefaultConfigProvider instead
  */
 class Config implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
 {
diff --git a/app/code/Magento/Tinymce3/Model/Config/Source/Wysiwyg/Editor.php b/app/code/Magento/Tinymce3/Model/Config/Source/Wysiwyg/Editor.php
index 00f1a82698381..96a3d42d15f36 100644
--- a/app/code/Magento/Tinymce3/Model/Config/Source/Wysiwyg/Editor.php
+++ b/app/code/Magento/Tinymce3/Model/Config/Source/Wysiwyg/Editor.php
@@ -9,7 +9,7 @@
 
 /**
  * Class Editor provides configuration value for TinyMCE3 editor
- * @deprecated use as configuration value tinymce4 path: mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter
+ * @deprecated 100.3.0 use as configuration value tinymce4 path: mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter
  */
 class Editor
 {
diff --git a/app/code/Magento/Tinymce3/Model/Config/Variable/Config.php b/app/code/Magento/Tinymce3/Model/Config/Variable/Config.php
index 2d016a5101abe..97aab0f38c4ee 100644
--- a/app/code/Magento/Tinymce3/Model/Config/Variable/Config.php
+++ b/app/code/Magento/Tinymce3/Model/Config/Variable/Config.php
@@ -9,7 +9,7 @@
 
 /**
  * Class Config adds variable plugin information required for tinymce3 editor
- * @deprecated use \Magento\Variable\Model\Variable\ConfigProvider instead
+ * @deprecated 100.3.0 use \Magento\Variable\Model\Variable\ConfigProvider instead
  */
 class Config implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
 {
diff --git a/app/code/Magento/Tinymce3/Model/Config/Widget/Config.php b/app/code/Magento/Tinymce3/Model/Config/Widget/Config.php
index de548df4bc9f3..fcb8235495d47 100644
--- a/app/code/Magento/Tinymce3/Model/Config/Widget/Config.php
+++ b/app/code/Magento/Tinymce3/Model/Config/Widget/Config.php
@@ -9,7 +9,7 @@
 
 /**
  * Class Config adds widget plugin information required for tinymce3 editor
- * @deprecated use \Magento\Widget\Model\Widget\Config instead
+ * @deprecated 100.3.0 use \Magento\Widget\Model\Widget\Config instead
  */
 class Config implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
 {
diff --git a/app/code/Magento/Tinymce3/Model/Config/Widget/PlaceholderImagesPool.php b/app/code/Magento/Tinymce3/Model/Config/Widget/PlaceholderImagesPool.php
index 1ab3de708dd26..7004beea70f1c 100644
--- a/app/code/Magento/Tinymce3/Model/Config/Widget/PlaceholderImagesPool.php
+++ b/app/code/Magento/Tinymce3/Model/Config/Widget/PlaceholderImagesPool.php
@@ -8,7 +8,7 @@
 
 /**
  * Class PlaceholderImages provide ability to override placeholder images for Widgets
- * @deprecated
+ * @deprecated 100.3.0
  */
 class PlaceholderImagesPool
 {
diff --git a/app/code/Magento/Tinymce3/Model/Config/Wysiwyg/Config.php b/app/code/Magento/Tinymce3/Model/Config/Wysiwyg/Config.php
index f3dc4c8591cbd..c70ad28a114df 100644
--- a/app/code/Magento/Tinymce3/Model/Config/Wysiwyg/Config.php
+++ b/app/code/Magento/Tinymce3/Model/Config/Wysiwyg/Config.php
@@ -9,7 +9,7 @@
 
 /**
  * Class Config adds information about required css files for tinymce3 editor
- * @deprecated use \Magento\Cms\Model\Wysiwyg\DefaultConfigProvider instead
+ * @deprecated 100.3.0 use \Magento\Cms\Model\Wysiwyg\DefaultConfigProvider instead
  */
 class Config implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
 {
diff --git a/app/code/Magento/Translation/Block/Js.php b/app/code/Magento/Translation/Block/Js.php
index db26feb8067ff..e193e675885c2 100644
--- a/app/code/Magento/Translation/Block/Js.php
+++ b/app/code/Magento/Translation/Block/Js.php
@@ -78,6 +78,7 @@ public function getTranslationFilePath()
      * Gets current version of the translation file.
      *
      * @return string
+     * @since 100.3.0
      */
     public function getTranslationFileVersion()
     {
diff --git a/app/code/Magento/Ui/Block/Wysiwyg/ActiveEditor.php b/app/code/Magento/Ui/Block/Wysiwyg/ActiveEditor.php
index b6077b7b1625d..462e4a4695ef0 100644
--- a/app/code/Magento/Ui/Block/Wysiwyg/ActiveEditor.php
+++ b/app/code/Magento/Ui/Block/Wysiwyg/ActiveEditor.php
@@ -13,6 +13,7 @@
  * ActiveEditor block
  *
  * @api
+ * @since 101.1.0
  */
 class ActiveEditor extends \Magento\Framework\View\Element\Template
 {
@@ -50,6 +51,7 @@ public function __construct(
      * Get active wysiwyg adapter path
      *
      * @return string
+     * @since 101.1.0
      */
     public function getWysiwygAdapterPath()
     {
diff --git a/app/code/Magento/Ui/Component/Form/Element/ColorPicker.php b/app/code/Magento/Ui/Component/Form/Element/ColorPicker.php
index b1925b4641d0b..23188363cc1d1 100644
--- a/app/code/Magento/Ui/Component/Form/Element/ColorPicker.php
+++ b/app/code/Magento/Ui/Component/Form/Element/ColorPicker.php
@@ -17,6 +17,7 @@
  * Prepares Color Picker UI component with mode and format
  *
  * @api
+ * @since 101.1.0
  */
 class ColorPicker extends AbstractElement
 {
@@ -54,6 +55,7 @@ public function __construct(
      * Get component name
      *
      * @return string
+     * @since 101.1.0
      */
     public function getComponentName(): string
     {
@@ -64,6 +66,7 @@ public function getComponentName(): string
      * Prepare component configuration
      *
      * @return void
+     * @since 101.1.0
      */
     public function prepare() : void
     {
diff --git a/app/code/Magento/Ui/Component/Listing/Columns/Date.php b/app/code/Magento/Ui/Component/Listing/Columns/Date.php
index f0b3ee4334d4f..d141499718a76 100644
--- a/app/code/Magento/Ui/Component/Listing/Columns/Date.php
+++ b/app/code/Magento/Ui/Component/Listing/Columns/Date.php
@@ -77,6 +77,7 @@ public function __construct(
 
     /**
      * @inheritdoc
+     * @since 101.1.1
      */
     public function prepare()
     {
diff --git a/app/code/Magento/Ui/Component/Wrapper/Block.php b/app/code/Magento/Ui/Component/Wrapper/Block.php
index a4e5bbf213062..0380a447e0cb9 100644
--- a/app/code/Magento/Ui/Component/Wrapper/Block.php
+++ b/app/code/Magento/Ui/Component/Wrapper/Block.php
@@ -11,7 +11,7 @@
 use Magento\Framework\View\Element\UiComponent\BlockWrapperInterface;
 
 /**
- * @deprecated 100.2.0
+ * @deprecated 101.0.0
  */
 class Block extends AbstractComponent implements BlockWrapperInterface
 {
diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php b/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php
index b45880c1ce726..803495439d65e 100644
--- a/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php
+++ b/app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php
@@ -54,7 +54,7 @@ class Save extends AbstractAction implements HttpPostActionInterface
 
     /**
      * @var DecoderInterface
-     * @deprecated
+     * @deprecated 101.1.0
      */
     protected $jsonDecoder;
 
diff --git a/app/code/Magento/Ui/DataProvider/AbstractDataProvider.php b/app/code/Magento/Ui/DataProvider/AbstractDataProvider.php
index abbc79859a038..6e4e488619e86 100644
--- a/app/code/Magento/Ui/DataProvider/AbstractDataProvider.php
+++ b/app/code/Magento/Ui/DataProvider/AbstractDataProvider.php
@@ -297,7 +297,7 @@ public function setConfigData($config)
      * Retrieve all ids from collection
      *
      * @return int[]
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getAllIds()
     {
diff --git a/app/code/Magento/Ui/DataProvider/Modifier/WysiwygModifierInterface.php b/app/code/Magento/Ui/DataProvider/Modifier/WysiwygModifierInterface.php
index 6336d8f8fb828..c2926a64a7a13 100644
--- a/app/code/Magento/Ui/DataProvider/Modifier/WysiwygModifierInterface.php
+++ b/app/code/Magento/Ui/DataProvider/Modifier/WysiwygModifierInterface.php
@@ -7,6 +7,7 @@
 
 /**
  * @api
+ * @since 101.1.0
  */
 interface WysiwygModifierInterface
 {
@@ -15,12 +16,14 @@ interface WysiwygModifierInterface
      * For example tmce3 or tmce4
      *
      * @return array
+     * @since 101.1.0
      */
     public function getEditorName();
 
     /**
      * @param array $meta
      * @return array
+     * @since 101.1.0
      */
     public function modifyMeta(array $meta);
 }
diff --git a/app/code/Magento/Ui/DataProvider/SearchResultFactory.php b/app/code/Magento/Ui/DataProvider/SearchResultFactory.php
index f2ed0677d4cd9..83d06c7cf5fc1 100644
--- a/app/code/Magento/Ui/DataProvider/SearchResultFactory.php
+++ b/app/code/Magento/Ui/DataProvider/SearchResultFactory.php
@@ -17,6 +17,7 @@
  * Allows to use Repositories (instead of Collections) in UI Components Data providers
  *
  * @api
+ * @since 101.1.0
  */
 class SearchResultFactory
 {
@@ -64,6 +65,7 @@ public function __construct(
      * @param SearchCriteriaInterface SearchCriteriaInterface $searchCriteria
      * @param string $idFieldName
      * @return SearchResultInterface
+     * @since 101.1.0
      */
     public function create(
         array $items,
diff --git a/app/code/Magento/Ui/Model/Bookmark.php b/app/code/Magento/Ui/Model/Bookmark.php
index b404e8d3b475f..2cb5666063067 100644
--- a/app/code/Magento/Ui/Model/Bookmark.php
+++ b/app/code/Magento/Ui/Model/Bookmark.php
@@ -23,7 +23,7 @@ class Bookmark extends AbstractExtensibleModel implements BookmarkInterface
 {
     /**
      * @var DecoderInterface
-     * @deprecated
+     * @deprecated 101.1.0
      */
     protected $jsonDecoder;
 
diff --git a/app/code/Magento/Ui/Model/Manager.php b/app/code/Magento/Ui/Model/Manager.php
index 1bacdc80a5c5e..357a41285e275 100644
--- a/app/code/Magento/Ui/Model/Manager.php
+++ b/app/code/Magento/Ui/Model/Manager.php
@@ -24,7 +24,7 @@
 /**
  * @inheritdoc
  *
- * @deprecated 100.2.0
+ * @deprecated 101.0.0
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Manager implements ManagerInterface
diff --git a/app/code/Magento/Ui/Model/ResourceModel/BookmarkRepository.php b/app/code/Magento/Ui/Model/ResourceModel/BookmarkRepository.php
index 3e738baa404c8..f773daaaf50c4 100644
--- a/app/code/Magento/Ui/Model/ResourceModel/BookmarkRepository.php
+++ b/app/code/Magento/Ui/Model/ResourceModel/BookmarkRepository.php
@@ -162,7 +162,7 @@ public function deleteById($bookmarkId)
      * @param FilterGroup $filterGroup
      * @param Collection $collection
      * @return void
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @throws \Magento\Framework\Exception\InputException
      */
     protected function addFilterGroupToCollection(FilterGroup $filterGroup, Collection $collection)
@@ -176,7 +176,7 @@ protected function addFilterGroupToCollection(FilterGroup $filterGroup, Collecti
     /**
      * Retrieve collection processor
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @return CollectionProcessorInterface
      */
     private function getCollectionProcessor()
diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
index 5b333e2dc2d5c..3b77183c68398 100644
--- a/app/code/Magento/Ups/Model/Carrier.php
+++ b/app/code/Magento/Ups/Model/Carrier.php
@@ -1566,7 +1566,7 @@ protected function _formShipmentRequest(DataObject $request)
      *
      * @param Element $shipmentConfirmResponse
      * @return DataObject
-     * @deprecated New asynchronous methods introduced.
+     * @deprecated 100.3.3 New asynchronous methods introduced.
      * @see requestToShipment
      */
     protected function _sendShipmentAcceptRequest(Element $shipmentConfirmResponse)
@@ -1752,7 +1752,7 @@ private function requestShipments(array $quoteIds): array
      *
      * @param DataObject $request
      * @return DataObject
-     * @deprecated New asynchronous methods introduced.
+     * @deprecated 100.3.3 New asynchronous methods introduced.
      * @see requestToShipment
      */
     protected function _doShipmentRequest(DataObject $request)
diff --git a/app/code/Magento/UrlRewrite/Block/GridContainer.php b/app/code/Magento/UrlRewrite/Block/GridContainer.php
index 1a3a6e89fa854..066b76ed610e0 100644
--- a/app/code/Magento/UrlRewrite/Block/GridContainer.php
+++ b/app/code/Magento/UrlRewrite/Block/GridContainer.php
@@ -10,7 +10,7 @@
  * Url rewrite grid container class
  *
  * @api
- * @deprecated Moved to UI component implementation
+ * @deprecated 102.0.0 Moved to UI component implementation
  * @since 100.0.2
  */
 class GridContainer extends \Magento\Backend\Block\Widget\Grid\Container
diff --git a/app/code/Magento/UrlRewrite/Model/Exception/UrlAlreadyExistsException.php b/app/code/Magento/UrlRewrite/Model/Exception/UrlAlreadyExistsException.php
index 906ba1f625477..12620edf460d2 100644
--- a/app/code/Magento/UrlRewrite/Model/Exception/UrlAlreadyExistsException.php
+++ b/app/code/Magento/UrlRewrite/Model/Exception/UrlAlreadyExistsException.php
@@ -11,7 +11,7 @@
  * Exception for already created url.
  *
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 class UrlAlreadyExistsException extends \Magento\Framework\Exception\AlreadyExistsException
 {
@@ -39,7 +39,7 @@ public function __construct(Phrase $phrase = null, \Exception $cause = null, $co
      * Get URLs
      *
      * @return array
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getUrls()
     {
diff --git a/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php b/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
index f187408d45a9d..9a62ed211d2b1 100644
--- a/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
+++ b/app/code/Magento/UrlRewrite/Model/Storage/DbStorage.php
@@ -353,7 +353,7 @@ protected function insertMultiple($data): void
      *
      * @param      UrlRewrite[] $urls
      * @return     array
-     * @deprecated Not used anymore.
+     * @deprecated 101.0.3 Not used anymore.
      */
     protected function createFilterDataBasedOnUrls($urls): array
     {
diff --git a/app/code/Magento/User/Block/User/Edit.php b/app/code/Magento/User/Block/User/Edit.php
index 6e036cf20fa25..233fe1e0cfee5 100644
--- a/app/code/Magento/User/Block/User/Edit.php
+++ b/app/code/Magento/User/Block/User/Edit.php
@@ -87,7 +87,7 @@ protected function _construct()
      * - click "Delete User" at top left part of the page;
      *
      * @return \Magento\Framework\Phrase
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getDeleteMessage()
     {
@@ -100,7 +100,7 @@ public function getDeleteMessage()
      * Magento\User\Controller\Adminhtml\User\Delete
      *
      * @return string
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getDeleteUrl()
     {
@@ -113,7 +113,7 @@ public function getDeleteUrl()
      * to create a new user account OR to edit the previously created user account
      *
      * @return int
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getObjectId()
     {
diff --git a/app/code/Magento/User/Model/ResourceModel/User/Collection.php b/app/code/Magento/User/Model/ResourceModel/User/Collection.php
index 7683adae84365..422afb47f0a0e 100644
--- a/app/code/Magento/User/Model/ResourceModel/User/Collection.php
+++ b/app/code/Magento/User/Model/ResourceModel/User/Collection.php
@@ -27,6 +27,7 @@ protected function _construct()
      * Collection Init Select
      *
      * @return $this
+     * @since 101.1.0
      */
     protected function _initSelect()
     {
diff --git a/app/code/Magento/User/Model/User.php b/app/code/Magento/User/Model/User.php
index 00d2aa140a991..61af14d943615 100644
--- a/app/code/Magento/User/Model/User.php
+++ b/app/code/Magento/User/Model/User.php
@@ -120,12 +120,12 @@ class User extends AbstractModel implements StorageInterface, UserInterface
     protected $_encryptor;
 
     /**
-     * @deprecated
+     * @deprecated 101.1.0
      */
     protected $_transportBuilder;
 
     /**
-     * @deprecated
+     * @deprecated 101.1.0
      */
     protected $_storeManager;
 
@@ -145,7 +145,7 @@ class User extends AbstractModel implements StorageInterface, UserInterface
     private $notificator;
 
     /**
-     * @deprecated
+     * @deprecated 101.1.0
      */
     private $deploymentConfig;
 
@@ -451,7 +451,7 @@ public function roleUserExists()
      *
      * @return $this
      * @throws NotificationExceptionInterface
-     * @deprecated
+     * @deprecated 101.1.0
      * @see NotificatorInterface::sendForgotPassword()
      */
     public function sendPasswordResetConfirmationEmail()
@@ -529,7 +529,7 @@ protected function createChangesDescriptionString()
      * @throws NotificationExceptionInterface
      * @return $this
      * @since 100.1.0
-     * @deprecated
+     * @deprecated 101.1.0
      * @see NotificatorInterface::sendUpdated()
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
diff --git a/app/code/Magento/Usps/Model/Carrier.php b/app/code/Magento/Usps/Model/Carrier.php
index 1c8ff0ce9efa9..85e0cf2f6999a 100644
--- a/app/code/Magento/Usps/Model/Carrier.php
+++ b/app/code/Magento/Usps/Model/Carrier.php
@@ -1470,7 +1470,7 @@ protected function _filterServiceName($name)
      *
      * @param \Magento\Framework\DataObject $request
      * @return string
-     * @deprecated This method should not be used anymore.
+     * @deprecated 100.2.1 This method should not be used anymore.
      * @see \Magento\Usps\Model\Carrier::_doShipmentRequest method doc block.
      */
     protected function _formUsExpressShipmentRequest(\Magento\Framework\DataObject $request)
@@ -1647,7 +1647,7 @@ protected function _convertPoundOunces($weightInPounds)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @deprecated Should not be used anymore.
+     * @deprecated 100.2.1 Should not be used anymore.
      * @see \Magento\Usps\Model\Carrier::_doShipmentRequest doc block.
      */
     protected function _formIntlShipmentRequest(\Magento\Framework\DataObject $request)
@@ -1902,7 +1902,7 @@ protected function _formIntlShipmentRequest(\Magento\Framework\DataObject $reque
      * @param \Magento\Framework\DataObject $request
      * @return \Magento\Framework\DataObject
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @deprecated This method must not be used anymore. Starting from 23.02.2018 USPS elimates API usage for
+     * @deprecated 100.2.1 This method must not be used anymore. Starting from 23.02.2018 USPS elimates API usage for
      * free shipping labels generating.
      */
     protected function _doShipmentRequest(\Magento\Framework\DataObject $request)
diff --git a/app/code/Magento/Vault/Api/Data/PaymentTokenFactoryInterface.php b/app/code/Magento/Vault/Api/Data/PaymentTokenFactoryInterface.php
index bb6343691f726..94d14dc14228c 100644
--- a/app/code/Magento/Vault/Api/Data/PaymentTokenFactoryInterface.php
+++ b/app/code/Magento/Vault/Api/Data/PaymentTokenFactoryInterface.php
@@ -9,7 +9,7 @@
 /**
  * Interface PaymentTokenFactoryInterface
  * @api
- * @since 100.3.0
+ * @since 101.0.0
  */
 interface PaymentTokenFactoryInterface
 {
@@ -24,7 +24,7 @@ interface PaymentTokenFactoryInterface
      * Create payment token entity
      * @param $type string|null
      * @return PaymentTokenInterface
-     * @since 100.3.0
+     * @since 101.0.0
      */
     public function create($type = null);
 }
diff --git a/app/code/Magento/Vault/Api/Data/PaymentTokenInterfaceFactory.php b/app/code/Magento/Vault/Api/Data/PaymentTokenInterfaceFactory.php
index 1a854ec814844..501e516841b6e 100644
--- a/app/code/Magento/Vault/Api/Data/PaymentTokenInterfaceFactory.php
+++ b/app/code/Magento/Vault/Api/Data/PaymentTokenInterfaceFactory.php
@@ -8,7 +8,7 @@
 
 /**
  * Interface PaymentTokenInterfaceFactory
- * @deprecated 100.3.0
+ * @deprecated 101.0.0
  * @see PaymentTokenFactoryInterface
  * @codingStandardsIgnoreStart
  */
diff --git a/app/code/Magento/Vault/Model/AbstractPaymentTokenFactory.php b/app/code/Magento/Vault/Model/AbstractPaymentTokenFactory.php
index d568a91c0421b..ab1e2ccd783d5 100644
--- a/app/code/Magento/Vault/Model/AbstractPaymentTokenFactory.php
+++ b/app/code/Magento/Vault/Model/AbstractPaymentTokenFactory.php
@@ -12,7 +12,7 @@
 
 /**
  * Class AbstractPaymentTokenFactory
- * @deprecated 100.3.0
+ * @deprecated 101.0.0
  * @see PaymentTokenFactoryInterface
  */
 abstract class AbstractPaymentTokenFactory implements PaymentTokenInterfaceFactory
diff --git a/app/code/Magento/Vault/Model/AccountPaymentTokenFactory.php b/app/code/Magento/Vault/Model/AccountPaymentTokenFactory.php
index 8fb060b41a24f..e9178ccaf50a8 100644
--- a/app/code/Magento/Vault/Model/AccountPaymentTokenFactory.php
+++ b/app/code/Magento/Vault/Model/AccountPaymentTokenFactory.php
@@ -7,7 +7,7 @@
 
 /**
  * Class AccountPaymentTokenFactory
- * @deprecated 100.3.0
+ * @deprecated 101.0.0
  * @see PaymentTokenFactoryInterface
  */
 class AccountPaymentTokenFactory extends AbstractPaymentTokenFactory
diff --git a/app/code/Magento/Vault/Model/CreditCardTokenFactory.php b/app/code/Magento/Vault/Model/CreditCardTokenFactory.php
index 735dc7c706f62..b0015e3f78316 100644
--- a/app/code/Magento/Vault/Model/CreditCardTokenFactory.php
+++ b/app/code/Magento/Vault/Model/CreditCardTokenFactory.php
@@ -7,7 +7,7 @@
 
 /**
  * Class CreditCardTokenFactory
- * @deprecated 100.3.0
+ * @deprecated 101.0.0
  * @see PaymentTokenFactoryInterface
  */
 class CreditCardTokenFactory extends AbstractPaymentTokenFactory
diff --git a/app/code/Magento/Vault/Model/PaymentTokenFactory.php b/app/code/Magento/Vault/Model/PaymentTokenFactory.php
index 6249fa4944a2c..cee838d622749 100644
--- a/app/code/Magento/Vault/Model/PaymentTokenFactory.php
+++ b/app/code/Magento/Vault/Model/PaymentTokenFactory.php
@@ -13,7 +13,7 @@
 /**
  * PaymentTokenFactory class
  * @api
- * @since 100.3.0
+ * @since 101.0.0
  */
 class PaymentTokenFactory implements PaymentTokenFactoryInterface
 {
@@ -42,7 +42,7 @@ public function __construct(ObjectManagerInterface $objectManager, array $tokenT
      * Create payment token entity
      * @param $type string
      * @return PaymentTokenInterface
-     * @since 100.3.0
+     * @since 101.0.0
      */
     public function create($type = null)
     {
diff --git a/app/code/Magento/Vault/Model/PaymentTokenRepository.php b/app/code/Magento/Vault/Model/PaymentTokenRepository.php
index 2ccd6181b9b81..46d7b6d2e80fe 100644
--- a/app/code/Magento/Vault/Model/PaymentTokenRepository.php
+++ b/app/code/Magento/Vault/Model/PaymentTokenRepository.php
@@ -158,7 +158,7 @@ public function save(Data\PaymentTokenInterface $paymentToken)
      * @param FilterGroup $filterGroup
      * @param Collection $collection
      * @return void
-     * @deprecated 100.3.0
+     * @deprecated 101.0.0
      * @throws \Magento\Framework\Exception\InputException
      */
     protected function addFilterGroupToCollection(FilterGroup $filterGroup, Collection $collection)
@@ -172,7 +172,7 @@ protected function addFilterGroupToCollection(FilterGroup $filterGroup, Collecti
     /**
      * Retrieve collection processor
      *
-     * @deprecated 100.3.0
+     * @deprecated 101.0.0
      * @return CollectionProcessorInterface
      */
     private function getCollectionProcessor()
diff --git a/app/code/Magento/Webapi/Controller/Soap/Request/Handler.php b/app/code/Magento/Webapi/Controller/Soap/Request/Handler.php
index 5e50cdee794ce..a01c5054f9b5f 100644
--- a/app/code/Magento/Webapi/Controller/Soap/Request/Handler.php
+++ b/app/code/Magento/Webapi/Controller/Soap/Request/Handler.php
@@ -179,7 +179,7 @@ private function prepareOperationInput(string $serviceClass, array $methodMetada
      * @param string $serviceMethod
      * @param array $arguments
      * @return array
-     * @deprecated
+     * @deprecated 100.3.2
      * @see Handler::prepareOperationInput()
      */
     protected function _prepareRequestData($serviceClass, $serviceMethod, $arguments)
diff --git a/app/code/Magento/Webapi/Model/ConfigInterface.php b/app/code/Magento/Webapi/Model/ConfigInterface.php
index 338c18795595f..a0467fb840ccb 100644
--- a/app/code/Magento/Webapi/Model/ConfigInterface.php
+++ b/app/code/Magento/Webapi/Model/ConfigInterface.php
@@ -12,6 +12,7 @@
  * This class gives access to consolidated web API configuration from <Module_Name>/etc/webapi.xml files.
  *
  * @api
+ * @since 100.2.4
  */
 interface ConfigInterface
 {
@@ -19,6 +20,7 @@ interface ConfigInterface
      * Return services loaded from cache if enabled or from files merged previously
      *
      * @return array
+     * @since 100.2.4
      */
     public function getServices();
 }
diff --git a/app/code/Magento/WebapiAsync/Model/BulkServiceConfig.php b/app/code/Magento/WebapiAsync/Model/BulkServiceConfig.php
index a0499087c35b9..febe7cba0b7fc 100644
--- a/app/code/Magento/WebapiAsync/Model/BulkServiceConfig.php
+++ b/app/code/Magento/WebapiAsync/Model/BulkServiceConfig.php
@@ -15,6 +15,7 @@
 
 /**
  * @api
+ * @since 100.2.0
  */
 class BulkServiceConfig implements \Magento\Webapi\Model\ConfigInterface
 {
@@ -58,6 +59,7 @@ public function __construct(
      * Return services loaded from cache if enabled or from files merged previously
      *
      * @return array
+     * @since 100.2.0
      */
     public function getServices()
     {
diff --git a/app/code/Magento/WebapiAsync/Model/ServiceConfig.php b/app/code/Magento/WebapiAsync/Model/ServiceConfig.php
index 4c085935090bd..8387b2dc53118 100644
--- a/app/code/Magento/WebapiAsync/Model/ServiceConfig.php
+++ b/app/code/Magento/WebapiAsync/Model/ServiceConfig.php
@@ -17,6 +17,7 @@
  * This class gives access to consolidated web API configuration from <Module_Name>/etc/webapi_async.xml files.
  *
  * @api
+ * @since 100.2.0
  */
 class ServiceConfig
 {
@@ -63,6 +64,7 @@ public function __construct(
      * Return services loaded from cache if enabled or from files merged previously
      *
      * @return array
+     * @since 100.2.0
      */
     public function getServices()
     {
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/LoadOptions.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/LoadOptions.php
index 03d9d10311382..fe96cbecb425a 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/LoadOptions.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/LoadOptions.php
@@ -60,7 +60,7 @@ public function execute()
 
     /**
      * @return \Magento\Widget\Helper\Conditions
-     * @deprecated 100.1.4
+     * @deprecated 101.0.0
      */
     private function getConditionsHelper()
     {
diff --git a/app/code/Magento/Widget/Model/ResourceModel/Widget.php b/app/code/Magento/Widget/Model/ResourceModel/Widget.php
index 8d78bb5a56800..4ed77b48f297d 100644
--- a/app/code/Magento/Widget/Model/ResourceModel/Widget.php
+++ b/app/code/Magento/Widget/Model/ResourceModel/Widget.php
@@ -9,7 +9,7 @@
 /**
  * Resource model for widget.
  *
- * @deprecated 100.2.0 Data from this table was moved to xml(widget.xml).
+ * @deprecated 101.0.0 Data from this table was moved to xml(widget.xml).
  */
 class Widget extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
diff --git a/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/ThemeId.php b/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/ThemeId.php
index 8e5d8d63840fb..0532c57f0306d 100644
--- a/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/ThemeId.php
+++ b/app/code/Magento/Widget/Model/ResourceModel/Widget/Instance/Options/ThemeId.php
@@ -9,7 +9,7 @@
 /**
  * Widget Instance Theme Id Options
  *
- * @deprecated 100.2.0 created new class that correctly loads theme options and whose name follows naming convention
+ * @deprecated 100.1.7 created new class that correctly loads theme options and whose name follows naming convention
  * @see \Magento\Widget\Model\ResourceModel\Widget\Instance\Options\Themes
  */
 class ThemeId implements \Magento\Framework\Option\ArrayInterface
diff --git a/app/code/Magento/Widget/Model/Widget.php b/app/code/Magento/Widget/Model/Widget.php
index d07e84186b2c9..195c3f397ff18 100644
--- a/app/code/Magento/Widget/Model/Widget.php
+++ b/app/code/Magento/Widget/Model/Widget.php
@@ -88,7 +88,7 @@ public function __construct(
      *
      * @return \Magento\Framework\Math\Random
      *
-     * @deprecated 100.1.0
+     * @deprecated 100.0.10
      */
     private function getMathRandom()
     {
@@ -127,7 +127,7 @@ public function getWidgetByClassType($type)
      * @param string $type Widget type
      * @return null|\Magento\Framework\Simplexml\Element
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     public function getConfigAsXml($type)
     {
diff --git a/app/code/Magento/Widget/Model/Widget/Instance.php b/app/code/Magento/Widget/Model/Widget/Instance.php
index 4ca126e659e09..7f4e3ae8610ba 100644
--- a/app/code/Magento/Widget/Model/Widget/Instance.php
+++ b/app/code/Magento/Widget/Model/Widget/Instance.php
@@ -99,11 +99,13 @@ class Instance extends \Magento\Framework\Model\AbstractModel
 
     /**
      * @var \Magento\Catalog\Model\Product\Type
+     * @since 101.0.4
      */
     protected $_productType;
 
     /**
      * @var \Magento\Widget\Model\Config\Reader
+     * @since 101.0.4
      */
     protected $_reader;
 
diff --git a/app/code/Magento/Wishlist/Block/AbstractBlock.php b/app/code/Magento/Wishlist/Block/AbstractBlock.php
index 981a0da1d241f..5f4a7c8f3814b 100644
--- a/app/code/Magento/Wishlist/Block/AbstractBlock.php
+++ b/app/code/Magento/Wishlist/Block/AbstractBlock.php
@@ -231,7 +231,7 @@ public function hasDescription($item)
      * Retrieve formatted Date
      *
      * @param string $date
-     * @deprecated
+     * @deprecated 101.1.1
      * @return string
      */
     public function getFormatedDate($date)
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
index d02f2229401c1..bc94f53a7625a 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist.php
@@ -31,6 +31,7 @@ class Wishlist extends \Magento\Wishlist\Block\AbstractBlock
 
     /**
      * @var  \Magento\Wishlist\Model\ResourceModel\Item\Collection
+     * @since 101.1.1
      */
     protected $_collection;
 
@@ -101,6 +102,7 @@ private function paginateCollection()
      * Retrieve Wishlist Product Items collection
      *
      * @return \Magento\Wishlist\Model\ResourceModel\Item\Collection
+     * @since 101.1.1
      */
     public function getWishlistItems()
     {
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php
index 40882ae00dae1..db92a10907d39 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Actions.php
@@ -13,7 +13,7 @@
  * Model for item column in customer wishlist.
  *
  * @api
- * @deprecated
+ * @deprecated 101.1.2
  * @since 100.0.2
  */
 class Actions extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
index 53f67626e956d..57d182dee4e1c 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Comment.php
@@ -13,7 +13,7 @@
  * Wishlist block customer item cart column.
  *
  * @api
- * @deprecated
+ * @deprecated 101.1.2
  * @since 100.0.2
  */
 class Comment extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php
index c4c786961694b..f41146051ae96 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Edit.php
@@ -13,7 +13,7 @@
  * Edit item in customer wishlist table.
  *
  * @api
- * @deprecated
+ * @deprecated 101.1.2
  * @since 100.0.2
  */
 class Edit extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php
index 5595d189b15eb..c578e9d1c5d22 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Image.php
@@ -53,6 +53,7 @@ public function __construct(
      * Identify the product from which thumbnail should be taken.
      *
      * @return \Magento\Catalog\Model\Product
+     * @since 101.0.5
      */
     public function getProductForThumbnail(\Magento\Wishlist\Model\Item $item) : \Magento\Catalog\Model\Product
     {
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php
index b7eaf53fc23b5..092ede9ceb016 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Info.php
@@ -13,7 +13,7 @@
  * Wishlist block customer item cart column.
  *
  * @api
- * @deprecated
+ * @deprecated 101.1.2
  * @since 100.0.2
  */
 class Info extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
index 09f5014edead6..472cd3cc70f09 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Wishlist/Item/Column/Remove.php
@@ -13,7 +13,7 @@
  * Delete item column in customer wishlist table
  *
  * @api
- * @deprecated
+ * @deprecated 101.1.2
  * @since 100.0.2
  */
 class Remove extends \Magento\Wishlist\Block\Customer\Wishlist\Item\Column
diff --git a/app/code/Magento/Wishlist/Block/Link.php b/app/code/Magento/Wishlist/Block/Link.php
index 2d78852f0fd32..c410a1254edee 100644
--- a/app/code/Magento/Wishlist/Block/Link.php
+++ b/app/code/Magento/Wishlist/Block/Link.php
@@ -75,7 +75,7 @@ public function getLabel()
 
     /**
      * {@inheritdoc}
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getSortOrder()
     {
diff --git a/app/code/Magento/Wishlist/Block/Share/Email/Items.php b/app/code/Magento/Wishlist/Block/Share/Email/Items.php
index 130c7cb136afb..077f8ce3c4930 100644
--- a/app/code/Magento/Wishlist/Block/Share/Email/Items.php
+++ b/app/code/Magento/Wishlist/Block/Share/Email/Items.php
@@ -59,6 +59,7 @@ public function __construct(
      * @param Item $item
      *
      * @return Product
+     * @since 101.2.0
      */
     public function getProductForThumbnail(Item $item): Product
     {
diff --git a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php
index 61d444f786ca8..92592e8417c64 100644
--- a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php
+++ b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php
@@ -352,6 +352,7 @@ protected function _assignProducts()
 
     /**
      * @inheritdoc
+     * @since 101.1.3
      */
     protected function _renderFiltersBefore()
     {
diff --git a/app/code/Magento/Wishlist/Observer/AddToCart.php b/app/code/Magento/Wishlist/Observer/AddToCart.php
index 1ab24d87efbf7..e31a8993670c6 100644
--- a/app/code/Magento/Wishlist/Observer/AddToCart.php
+++ b/app/code/Magento/Wishlist/Observer/AddToCart.php
@@ -15,7 +15,7 @@
 
 /**
  * Class AddToCart
- * @deprecated 100.2.0
+ * @deprecated 101.0.0
  * @package Magento\Wishlist\Observer
  */
 class AddToCart implements ObserverInterface
diff --git a/lib/internal/Magento/Framework/Acl.php b/lib/internal/Magento/Framework/Acl.php
index 86b28f7e2ceb4..8c80bf94e3f2a 100644
--- a/lib/internal/Magento/Framework/Acl.php
+++ b/lib/internal/Magento/Framework/Acl.php
@@ -9,6 +9,7 @@
  * ACL. Can be queried for relations between roles and resources.
  *
  * @api
+ * @since 100.0.2
  */
 class Acl extends \Zend_Acl
 {
diff --git a/lib/internal/Magento/Framework/Acl/AclResource.php b/lib/internal/Magento/Framework/Acl/AclResource.php
index 585b4b5d8514b..47a85a069329e 100644
--- a/lib/internal/Magento/Framework/Acl/AclResource.php
+++ b/lib/internal/Magento/Framework/Acl/AclResource.php
@@ -11,6 +11,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class AclResource extends \Zend_Acl_Resource
 {
diff --git a/lib/internal/Magento/Framework/Acl/AclResource/ProviderInterface.php b/lib/internal/Magento/Framework/Acl/AclResource/ProviderInterface.php
index 34f85f3641ccd..c11fb7fcd56ed 100644
--- a/lib/internal/Magento/Framework/Acl/AclResource/ProviderInterface.php
+++ b/lib/internal/Magento/Framework/Acl/AclResource/ProviderInterface.php
@@ -9,6 +9,7 @@
  * Acl resources provider interface
  *
  * @api
+ * @since 100.0.2
  */
 interface ProviderInterface
 {
diff --git a/lib/internal/Magento/Framework/Acl/Builder.php b/lib/internal/Magento/Framework/Acl/Builder.php
index 50e4f0b7b5ca9..03adaca0589ce 100644
--- a/lib/internal/Magento/Framework/Acl/Builder.php
+++ b/lib/internal/Magento/Framework/Acl/Builder.php
@@ -11,6 +11,7 @@
  * On consequent requests, ACL object is deserialized from cache.
  *
  * @api
+ * @since 100.0.2
  */
 class Builder
 {
@@ -77,7 +78,7 @@ public function getAcl()
      * Remove cached ACL instance.
      *
      * @return $this
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function resetRuntimeAcl()
     {
diff --git a/lib/internal/Magento/Framework/Acl/Data/CacheInterface.php b/lib/internal/Magento/Framework/Acl/Data/CacheInterface.php
index bd6ce6d2c2095..e0a1617fd226d 100644
--- a/lib/internal/Magento/Framework/Acl/Data/CacheInterface.php
+++ b/lib/internal/Magento/Framework/Acl/Data/CacheInterface.php
@@ -10,7 +10,7 @@
  * Interface for caching ACL data
  *
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 interface CacheInterface extends \Magento\Framework\Cache\FrontendInterface
 {
diff --git a/lib/internal/Magento/Framework/Acl/LoaderInterface.php b/lib/internal/Magento/Framework/Acl/LoaderInterface.php
index 920186fc2121a..a61fcbdc24255 100644
--- a/lib/internal/Magento/Framework/Acl/LoaderInterface.php
+++ b/lib/internal/Magento/Framework/Acl/LoaderInterface.php
@@ -12,6 +12,7 @@
  * with data (roles/rules/resources) persisted in external storage.
  *
  * @api
+ * @since 100.0.2
  */
 interface LoaderInterface
 {
diff --git a/lib/internal/Magento/Framework/Acl/RootResource.php b/lib/internal/Magento/Framework/Acl/RootResource.php
index 326416c346563..9247784e94414 100644
--- a/lib/internal/Magento/Framework/Acl/RootResource.php
+++ b/lib/internal/Magento/Framework/Acl/RootResource.php
@@ -9,6 +9,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class RootResource
 {
diff --git a/lib/internal/Magento/Framework/Amqp/Config.php b/lib/internal/Magento/Framework/Amqp/Config.php
index 684c5cd38b1e4..44e033f4a7b80 100644
--- a/lib/internal/Magento/Framework/Amqp/Config.php
+++ b/lib/internal/Magento/Framework/Amqp/Config.php
@@ -16,7 +16,7 @@
  * Reads the Amqp config in the deployed environment configuration
  *
  * @api
- * @since 100.0.0
+ * @since 103.0.0
  */
 class Config
 {
@@ -96,7 +96,6 @@ class Config
      * @param DeploymentConfig $config
      * @param string $connectionName
      * @param ConnectionFactory|null $connectionFactory
-     * @since 100.0.0
      */
     public function __construct(
         DeploymentConfig $config,
@@ -113,7 +112,7 @@ public function __construct(
      * Destructor
      *
      * @return void
-     * @since 100.0.0
+     * @since 103.0.0
      */
     public function __destruct()
     {
@@ -126,7 +125,7 @@ public function __destruct()
      * @param string $key
      * @return string
      * @throws \LogicException
-     * @since 100.0.0
+     * @since 103.0.0
      */
     public function getValue($key)
     {
@@ -162,7 +161,7 @@ private function createConnection(): AbstractConnection
      *
      * @return AMQPChannel
      * @throws \LogicException
-     * @since 100.0.0
+     * @since 103.0.0
      */
     public function getChannel()
     {
diff --git a/lib/internal/Magento/Framework/Amqp/ConnectionTypeResolver.php b/lib/internal/Magento/Framework/Amqp/ConnectionTypeResolver.php
index 9b600278144f0..54fa80f59c292 100644
--- a/lib/internal/Magento/Framework/Amqp/ConnectionTypeResolver.php
+++ b/lib/internal/Magento/Framework/Amqp/ConnectionTypeResolver.php
@@ -12,7 +12,7 @@
  * Amqp connection type resolver.
  *
  * @api
- * @since 100.0.0
+ * @since 103.0.0
  */
 class ConnectionTypeResolver implements ConnectionTypeResolverInterface
 {
@@ -27,7 +27,6 @@ class ConnectionTypeResolver implements ConnectionTypeResolverInterface
      * Initialize dependencies.
      *
      * @param DeploymentConfig $deploymentConfig
-     * @since 100.0.0
      */
     public function __construct(DeploymentConfig $deploymentConfig)
     {
@@ -42,7 +41,7 @@ public function __construct(DeploymentConfig $deploymentConfig)
 
     /**
      * {@inheritdoc}
-     * @since 100.0.0
+     * @since 103.0.0
      */
     public function getConnectionType($connectionName)
     {
diff --git a/lib/internal/Magento/Framework/Amqp/Exchange.php b/lib/internal/Magento/Framework/Amqp/Exchange.php
index e57fa09b83d1b..56fb25debc9bc 100644
--- a/lib/internal/Magento/Framework/Amqp/Exchange.php
+++ b/lib/internal/Magento/Framework/Amqp/Exchange.php
@@ -18,7 +18,7 @@
  * Class message exchange.
  *
  * @api
- * @since 100.0.0
+ * @since 103.0.0
  */
 class Exchange implements ExchangeInterface
 {
@@ -57,7 +57,6 @@ class Exchange implements ExchangeInterface
      * @param ResponseQueueNameBuilder $responseQueueNameBuilder
      * @param CommunicationConfigInterface $communicationConfig
      * @param int $rpcConnectionTimeout
-     * @since 100.0.0
      */
     public function __construct(
         Config $amqpConfig,
@@ -75,7 +74,7 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 100.0.0
+     * @since 103.0.0
      */
     public function enqueue($topic, EnvelopeInterface $envelope)
     {
diff --git a/lib/internal/Magento/Framework/Amqp/ExchangeFactory.php b/lib/internal/Magento/Framework/Amqp/ExchangeFactory.php
index 5291b3ab59794..1474d45dd5363 100644
--- a/lib/internal/Magento/Framework/Amqp/ExchangeFactory.php
+++ b/lib/internal/Magento/Framework/Amqp/ExchangeFactory.php
@@ -9,7 +9,7 @@
  * Factory class for @see \Magento\Framework\Amqp\Exchange
  *
  * @api
- * @since 100.0.0
+ * @since 103.0.0
  */
 class ExchangeFactory implements \Magento\Framework\MessageQueue\ExchangeFactoryInterface
 {
@@ -38,7 +38,6 @@ class ExchangeFactory implements \Magento\Framework\MessageQueue\ExchangeFactory
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param ConfigPool $configPool
      * @param string $instanceName
-     * @since 100.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -52,7 +51,7 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 100.0.0
+     * @since 103.0.0
      */
     public function create($connectionName, array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/Amqp/Queue.php b/lib/internal/Magento/Framework/Amqp/Queue.php
index ff5bae5017fb9..84689c294af0c 100644
--- a/lib/internal/Magento/Framework/Amqp/Queue.php
+++ b/lib/internal/Magento/Framework/Amqp/Queue.php
@@ -17,7 +17,7 @@
  * Class Queue
  *
  * @api
- * @since 100.0.0
+ * @since 103.0.0
  */
 class Queue implements QueueInterface
 {
@@ -48,7 +48,6 @@ class Queue implements QueueInterface
      * @param EnvelopeFactory $envelopeFactory
      * @param string $queueName
      * @param LoggerInterface $logger
-     * @since 100.0.0
      */
     public function __construct(
         Config $amqpConfig,
@@ -64,7 +63,7 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 100.0.0
+     * @since 103.0.0
      */
     public function dequeue()
     {
@@ -99,7 +98,7 @@ public function dequeue()
 
     /**
      * @inheritdoc
-     * @since 100.0.0
+     * @since 103.0.0
      */
     public function acknowledge(EnvelopeInterface $envelope)
     {
@@ -120,7 +119,7 @@ public function acknowledge(EnvelopeInterface $envelope)
 
     /**
      * @inheritdoc
-     * @since 100.0.0
+     * @since 103.0.0
      */
     public function subscribe($callback)
     {
@@ -154,7 +153,7 @@ public function subscribe($callback)
 
     /**
      * @inheritdoc
-     * @since 100.0.0
+     * @since 103.0.0
      */
     public function reject(EnvelopeInterface $envelope, $requeue = true, $rejectionMessage = null)
     {
@@ -173,7 +172,7 @@ public function reject(EnvelopeInterface $envelope, $requeue = true, $rejectionM
 
     /**
      * @inheritdoc
-     * @since 100.0.0
+     * @since 103.0.0
      */
     public function push(EnvelopeInterface $envelope)
     {
diff --git a/lib/internal/Magento/Framework/Amqp/QueueFactory.php b/lib/internal/Magento/Framework/Amqp/QueueFactory.php
index 9f1635a87977b..9fe8a3551823a 100644
--- a/lib/internal/Magento/Framework/Amqp/QueueFactory.php
+++ b/lib/internal/Magento/Framework/Amqp/QueueFactory.php
@@ -9,7 +9,7 @@
  * Factory class for @see \Magento\Framework\Amqp\Queue
  *
  * @api
- * @since 100.0.0
+ * @since 103.0.0
  */
 class QueueFactory implements \Magento\Framework\MessageQueue\QueueFactoryInterface
 {
@@ -38,7 +38,6 @@ class QueueFactory implements \Magento\Framework\MessageQueue\QueueFactoryInterf
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param ConfigPool $configPool
      * @param string $instanceName
-     * @since 100.0.0
      */
     public function __construct(
         \Magento\Framework\ObjectManagerInterface $objectManager,
@@ -52,7 +51,7 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 100.0.0
+     * @since 103.0.0
      */
     public function create($queueName, $connectionName)
     {
diff --git a/lib/internal/Magento/Framework/Amqp/Topology/ArgumentProcessor.php b/lib/internal/Magento/Framework/Amqp/Topology/ArgumentProcessor.php
index caa5db4e7ef5c..d5aaf1769eae4 100644
--- a/lib/internal/Magento/Framework/Amqp/Topology/ArgumentProcessor.php
+++ b/lib/internal/Magento/Framework/Amqp/Topology/ArgumentProcessor.php
@@ -6,7 +6,7 @@
 namespace Magento\Framework\Amqp\Topology;
 
 /**
- * @deprecated 100.0.0
+ * @deprecated 103.0.0
  * see: https://github.com/php-amqplib/php-amqplib/issues/405
  */
 trait ArgumentProcessor
diff --git a/lib/internal/Magento/Framework/Api/AbstractExtensibleObject.php b/lib/internal/Magento/Framework/Api/AbstractExtensibleObject.php
index 902709bbedcd3..ae92ee9d934f0 100644
--- a/lib/internal/Magento/Framework/Api/AbstractExtensibleObject.php
+++ b/lib/internal/Magento/Framework/Api/AbstractExtensibleObject.php
@@ -13,8 +13,9 @@
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * phpcs:disable Magento2.Classes.AbstractApi
  * @api
- * @deprecated
+ * @deprecated 103.0.0
  * @see \Magento\Framework\Model\AbstractExtensibleModel
+ * @since 100.0.2
  */
 abstract class AbstractExtensibleObject extends AbstractSimpleObject implements CustomAttributesDataInterface
 {
diff --git a/lib/internal/Magento/Framework/Api/AbstractSimpleObjectBuilder.php b/lib/internal/Magento/Framework/Api/AbstractSimpleObjectBuilder.php
index 029a78bf0ddf7..35f115634ccda 100644
--- a/lib/internal/Magento/Framework/Api/AbstractSimpleObjectBuilder.php
+++ b/lib/internal/Magento/Framework/Api/AbstractSimpleObjectBuilder.php
@@ -9,7 +9,7 @@
 
 /**
  * Base Builder Class for simple data Objects
- * @deprecated Every builder should have their own implementation of \Magento\Framework\Api\SimpleBuilderInterface
+ * @deprecated 103.0.0 Every builder should have their own implementation of \Magento\Framework\Api\SimpleBuilderInterface
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  */
 abstract class AbstractSimpleObjectBuilder implements SimpleBuilderInterface
diff --git a/lib/internal/Magento/Framework/Api/AttributeInterface.php b/lib/internal/Magento/Framework/Api/AttributeInterface.php
index d208d861d4d2e..5324ddb499fd5 100644
--- a/lib/internal/Magento/Framework/Api/AttributeInterface.php
+++ b/lib/internal/Magento/Framework/Api/AttributeInterface.php
@@ -10,6 +10,7 @@
  * Interface for custom attribute value.
  *
  * @api
+ * @since 100.0.2
  */
 interface AttributeInterface
 {
diff --git a/lib/internal/Magento/Framework/Api/CustomAttributesDataInterface.php b/lib/internal/Magento/Framework/Api/CustomAttributesDataInterface.php
index 3019f84abb15a..d6567db27fc10 100644
--- a/lib/internal/Magento/Framework/Api/CustomAttributesDataInterface.php
+++ b/lib/internal/Magento/Framework/Api/CustomAttributesDataInterface.php
@@ -10,6 +10,7 @@
  * Interface for entities which can be extended with custom attributes.
  *
  * @api
+ * @since 100.0.2
  */
 interface CustomAttributesDataInterface extends ExtensibleDataInterface
 {
diff --git a/lib/internal/Magento/Framework/Api/Data/ImageContentInterface.php b/lib/internal/Magento/Framework/Api/Data/ImageContentInterface.php
index abd770dd12f14..06467be9522cc 100644
--- a/lib/internal/Magento/Framework/Api/Data/ImageContentInterface.php
+++ b/lib/internal/Magento/Framework/Api/Data/ImageContentInterface.php
@@ -10,6 +10,7 @@
  * Image Content data interface
  *
  * @api
+ * @since 100.0.2
  */
 interface ImageContentInterface
 {
diff --git a/lib/internal/Magento/Framework/Api/Data/VideoContentInterface.php b/lib/internal/Magento/Framework/Api/Data/VideoContentInterface.php
index 7b1ea05cf939c..6c8f796ee8655 100644
--- a/lib/internal/Magento/Framework/Api/Data/VideoContentInterface.php
+++ b/lib/internal/Magento/Framework/Api/Data/VideoContentInterface.php
@@ -12,6 +12,7 @@
  * Video Content data interface
  *
  * @api
+ * @since 100.0.2
  */
 interface VideoContentInterface extends ExtensibleDataInterface
 {
diff --git a/lib/internal/Magento/Framework/Api/ExtensibleDataInterface.php b/lib/internal/Magento/Framework/Api/ExtensibleDataInterface.php
index affe86992f273..38cc075559804 100644
--- a/lib/internal/Magento/Framework/Api/ExtensibleDataInterface.php
+++ b/lib/internal/Magento/Framework/Api/ExtensibleDataInterface.php
@@ -10,6 +10,7 @@
  * Interface for entities which can be extended with extension attributes.
  *
  * @api
+ * @since 100.0.2
  */
 interface ExtensibleDataInterface
 {
diff --git a/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinDataInterface.php b/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinDataInterface.php
index a0a2f649900fb..3bcd0c2fec29d 100644
--- a/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinDataInterface.php
+++ b/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinDataInterface.php
@@ -10,6 +10,7 @@
  * Interface of data holder for extension attribute joins.
  *
  * @api
+ * @since 100.0.2
  */
 interface JoinDataInterface
 {
diff --git a/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinProcessorInterface.php b/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinProcessorInterface.php
index 1eaeaef24f419..7fb44aa337cc7 100644
--- a/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinProcessorInterface.php
+++ b/lib/internal/Magento/Framework/Api/ExtensionAttribute/JoinProcessorInterface.php
@@ -12,6 +12,7 @@
  * Join processor allows to join extension attributes during collections loading.
  *
  * @api
+ * @since 100.0.2
  */
 interface JoinProcessorInterface
 {
diff --git a/lib/internal/Magento/Framework/Api/ExtensionAttributesInterface.php b/lib/internal/Magento/Framework/Api/ExtensionAttributesInterface.php
index 5578ed0137a62..b808fb5a22a38 100644
--- a/lib/internal/Magento/Framework/Api/ExtensionAttributesInterface.php
+++ b/lib/internal/Magento/Framework/Api/ExtensionAttributesInterface.php
@@ -10,6 +10,7 @@
  * Marker interface for all extension attributes interfaces.
  *
  * @api
+ * @since 100.0.2
  */
 interface ExtensionAttributesInterface
 {
diff --git a/lib/internal/Magento/Framework/Api/Filter.php b/lib/internal/Magento/Framework/Api/Filter.php
index 03af29a00ad67..7e99a0038bd78 100644
--- a/lib/internal/Magento/Framework/Api/Filter.php
+++ b/lib/internal/Magento/Framework/Api/Filter.php
@@ -13,6 +13,7 @@
  *
  * @api
  * @codeCoverageIgnore
+ * @since 100.0.2
  */
 class Filter extends AbstractSimpleObject
 {
diff --git a/lib/internal/Magento/Framework/Api/FilterBuilder.php b/lib/internal/Magento/Framework/Api/FilterBuilder.php
index 056cc07657deb..c1e7fee39390a 100644
--- a/lib/internal/Magento/Framework/Api/FilterBuilder.php
+++ b/lib/internal/Magento/Framework/Api/FilterBuilder.php
@@ -11,6 +11,7 @@
  *
  * @api
  * @method Filter create()
+ * @since 100.0.2
  */
 class FilterBuilder extends AbstractSimpleObjectBuilder
 {
diff --git a/lib/internal/Magento/Framework/Api/ImageContentValidatorInterface.php b/lib/internal/Magento/Framework/Api/ImageContentValidatorInterface.php
index 686e47f7a933f..eecd7dbe8f19b 100644
--- a/lib/internal/Magento/Framework/Api/ImageContentValidatorInterface.php
+++ b/lib/internal/Magento/Framework/Api/ImageContentValidatorInterface.php
@@ -13,6 +13,7 @@
  * Image content validation interface
  *
  * @api
+ * @since 100.0.2
  */
 interface ImageContentValidatorInterface
 {
diff --git a/lib/internal/Magento/Framework/Api/ImageProcessorInterface.php b/lib/internal/Magento/Framework/Api/ImageProcessorInterface.php
index 676e89974fe09..38e66fc9a1feb 100644
--- a/lib/internal/Magento/Framework/Api/ImageProcessorInterface.php
+++ b/lib/internal/Magento/Framework/Api/ImageProcessorInterface.php
@@ -13,6 +13,7 @@
  * Interface ImageProcessorInterface
  *
  * @api
+ * @since 100.0.2
  */
 interface ImageProcessorInterface
 {
diff --git a/lib/internal/Magento/Framework/Api/MetadataObjectInterface.php b/lib/internal/Magento/Framework/Api/MetadataObjectInterface.php
index 64593d87f2a2d..a4a48fcbf7bb0 100644
--- a/lib/internal/Magento/Framework/Api/MetadataObjectInterface.php
+++ b/lib/internal/Magento/Framework/Api/MetadataObjectInterface.php
@@ -10,6 +10,7 @@
  * Provides metadata about an attribute.
  *
  * @api
+ * @since 100.0.2
  */
 interface MetadataObjectInterface
 {
diff --git a/lib/internal/Magento/Framework/Api/MetadataServiceInterface.php b/lib/internal/Magento/Framework/Api/MetadataServiceInterface.php
index c6c3492420922..8993d7bc0003d 100644
--- a/lib/internal/Magento/Framework/Api/MetadataServiceInterface.php
+++ b/lib/internal/Magento/Framework/Api/MetadataServiceInterface.php
@@ -10,6 +10,7 @@
  * MetadataService returns custom attribute metadata for a given class or interface it implements
  *
  * @api
+ * @since 100.0.2
  */
 interface MetadataServiceInterface
 {
diff --git a/lib/internal/Magento/Framework/Api/Search/Document.php b/lib/internal/Magento/Framework/Api/Search/Document.php
index 7454fa7974ece..c1edec9860f67 100644
--- a/lib/internal/Magento/Framework/Api/Search/Document.php
+++ b/lib/internal/Magento/Framework/Api/Search/Document.php
@@ -9,6 +9,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class Document extends AbstractSimpleObject implements DocumentInterface, \IteratorAggregate
 {
diff --git a/lib/internal/Magento/Framework/Api/Search/FilterGroup.php b/lib/internal/Magento/Framework/Api/Search/FilterGroup.php
index aef3df998a550..a8057d6d0d8b0 100644
--- a/lib/internal/Magento/Framework/Api/Search/FilterGroup.php
+++ b/lib/internal/Magento/Framework/Api/Search/FilterGroup.php
@@ -12,6 +12,7 @@
  * Groups two or more filters together using a logical OR
  *
  * @api
+ * @since 100.0.2
  */
 class FilterGroup extends AbstractSimpleObject
 {
diff --git a/lib/internal/Magento/Framework/Api/Search/FilterGroupBuilder.php b/lib/internal/Magento/Framework/Api/Search/FilterGroupBuilder.php
index cfde284524482..64bb7431819b0 100644
--- a/lib/internal/Magento/Framework/Api/Search/FilterGroupBuilder.php
+++ b/lib/internal/Magento/Framework/Api/Search/FilterGroupBuilder.php
@@ -14,6 +14,7 @@
  * Builder for FilterGroup Data.
  *
  * @api
+ * @since 100.0.2
  */
 class FilterGroupBuilder extends AbstractSimpleObjectBuilder
 {
diff --git a/lib/internal/Magento/Framework/Api/Search/SearchCriteria.php b/lib/internal/Magento/Framework/Api/Search/SearchCriteria.php
index 964e506120167..728b32ebfd06e 100644
--- a/lib/internal/Magento/Framework/Api/Search/SearchCriteria.php
+++ b/lib/internal/Magento/Framework/Api/Search/SearchCriteria.php
@@ -10,6 +10,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class SearchCriteria extends BaseSearchCriteria implements SearchCriteriaInterface
 {
diff --git a/lib/internal/Magento/Framework/Api/Search/SearchCriteriaBuilder.php b/lib/internal/Magento/Framework/Api/Search/SearchCriteriaBuilder.php
index 918a16a255729..ba443f116f652 100644
--- a/lib/internal/Magento/Framework/Api/Search/SearchCriteriaBuilder.php
+++ b/lib/internal/Magento/Framework/Api/Search/SearchCriteriaBuilder.php
@@ -14,6 +14,7 @@
  * Builder for SearchCriteria Service Data Object
  *
  * @api
+ * @since 100.0.2
  */
 class SearchCriteriaBuilder extends AbstractSimpleObjectBuilder
 {
diff --git a/lib/internal/Magento/Framework/Api/Search/SearchCriteriaInterface.php b/lib/internal/Magento/Framework/Api/Search/SearchCriteriaInterface.php
index 6dda50569ca03..a61a33260fc5c 100644
--- a/lib/internal/Magento/Framework/Api/Search/SearchCriteriaInterface.php
+++ b/lib/internal/Magento/Framework/Api/Search/SearchCriteriaInterface.php
@@ -12,6 +12,7 @@
  *
  * @api
  * @package Magento\Framework\Api\Search
+ * @since 100.0.2
  */
 interface SearchCriteriaInterface extends BaseSearchCriteriaInterface
 {
diff --git a/lib/internal/Magento/Framework/Api/Search/SearchInterface.php b/lib/internal/Magento/Framework/Api/Search/SearchInterface.php
index 9793e005b70b5..0b161b04561e8 100644
--- a/lib/internal/Magento/Framework/Api/Search/SearchInterface.php
+++ b/lib/internal/Magento/Framework/Api/Search/SearchInterface.php
@@ -9,6 +9,7 @@
  * Search API for all requests
  *
  * @api
+ * @since 100.0.2
  */
 interface SearchInterface
 {
diff --git a/lib/internal/Magento/Framework/Api/Search/SearchResultInterface.php b/lib/internal/Magento/Framework/Api/Search/SearchResultInterface.php
index 792401124b96e..92941d9a9c025 100644
--- a/lib/internal/Magento/Framework/Api/Search/SearchResultInterface.php
+++ b/lib/internal/Magento/Framework/Api/Search/SearchResultInterface.php
@@ -11,6 +11,7 @@
  * Interface SearchResultInterface
  *
  * @api
+ * @since 100.0.2
  */
 interface SearchResultInterface extends SearchResultsInterface
 {
diff --git a/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/FilterProcessor/CustomFilterInterface.php b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/FilterProcessor/CustomFilterInterface.php
index c068970c93b12..a076348262a61 100644
--- a/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/FilterProcessor/CustomFilterInterface.php
+++ b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/FilterProcessor/CustomFilterInterface.php
@@ -10,7 +10,7 @@
 
 /**
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 interface CustomFilterInterface
 {
@@ -20,7 +20,7 @@ interface CustomFilterInterface
      * @param Filter $filter
      * @param AbstractDb $collection
      * @return bool Whether the filter was applied
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function apply(Filter $filter, AbstractDb $collection);
 }
diff --git a/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/JoinProcessor/CustomJoinInterface.php b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/JoinProcessor/CustomJoinInterface.php
index 4ca55b6a1a72d..0fd4f077af984 100644
--- a/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/JoinProcessor/CustomJoinInterface.php
+++ b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/JoinProcessor/CustomJoinInterface.php
@@ -9,7 +9,7 @@
 
 /**
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 interface CustomJoinInterface
 {
@@ -18,7 +18,7 @@ interface CustomJoinInterface
      *
      * @param AbstractDb $collection
      * @return bool
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function apply(AbstractDb $collection);
 }
diff --git a/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessorInterface.php b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessorInterface.php
index 722e1b96254d0..a87a92d8d9dfa 100644
--- a/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessorInterface.php
+++ b/lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessorInterface.php
@@ -10,7 +10,7 @@
 
 /**
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 interface CollectionProcessorInterface
 {
@@ -21,7 +21,7 @@ interface CollectionProcessorInterface
      * @param AbstractDb $collection
      * @throws \InvalidArgumentException
      * @return void
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function process(SearchCriteriaInterface $searchCriteria, AbstractDb $collection);
 }
diff --git a/lib/internal/Magento/Framework/Api/SearchCriteriaInterface.php b/lib/internal/Magento/Framework/Api/SearchCriteriaInterface.php
index ae4057ae9c21e..45397b6a195c2 100644
--- a/lib/internal/Magento/Framework/Api/SearchCriteriaInterface.php
+++ b/lib/internal/Magento/Framework/Api/SearchCriteriaInterface.php
@@ -10,6 +10,7 @@
  * Search criteria interface.
  *
  * @api
+ * @since 100.0.2
  */
 interface SearchCriteriaInterface
 {
diff --git a/lib/internal/Magento/Framework/Api/SearchResultsInterface.php b/lib/internal/Magento/Framework/Api/SearchResultsInterface.php
index ba72685a80f49..c29f1134e0706 100644
--- a/lib/internal/Magento/Framework/Api/SearchResultsInterface.php
+++ b/lib/internal/Magento/Framework/Api/SearchResultsInterface.php
@@ -11,6 +11,7 @@
  * Search results interface.
  *
  * @api
+ * @since 100.0.2
  */
 interface SearchResultsInterface
 {
diff --git a/lib/internal/Magento/Framework/Api/SortOrder.php b/lib/internal/Magento/Framework/Api/SortOrder.php
index 67897ea22570d..b2da7d180395d 100644
--- a/lib/internal/Magento/Framework/Api/SortOrder.php
+++ b/lib/internal/Magento/Framework/Api/SortOrder.php
@@ -13,6 +13,7 @@
  * Data object for sort order.
  *
  * @api
+ * @since 100.0.2
  */
 class SortOrder extends AbstractSimpleObject
 {
diff --git a/lib/internal/Magento/Framework/Api/SortOrderBuilder.php b/lib/internal/Magento/Framework/Api/SortOrderBuilder.php
index 6960440d4d522..6b3365ae5bf9c 100644
--- a/lib/internal/Magento/Framework/Api/SortOrderBuilder.php
+++ b/lib/internal/Magento/Framework/Api/SortOrderBuilder.php
@@ -11,6 +11,7 @@
  * @method SortOrder create()
  *
  * @api
+ * @since 100.0.2
  */
 class SortOrderBuilder extends AbstractSimpleObjectBuilder
 {
diff --git a/lib/internal/Magento/Framework/App/Action/AbstractAction.php b/lib/internal/Magento/Framework/App/Action/AbstractAction.php
index 27f8838f9b165..f4c11203f2760 100644
--- a/lib/internal/Magento/Framework/App/Action/AbstractAction.php
+++ b/lib/internal/Magento/Framework/App/Action/AbstractAction.php
@@ -11,7 +11,7 @@
 /**
  * Abstract redirect/forward action class
  *
- * @deprecated Inheritance in controllers should be avoided in favor of composition
+ * @deprecated 103.0.0 Inheritance in controllers should be avoided in favor of composition
  * @see \Magento\Framework\App\ActionInterface
  */
 abstract class AbstractAction implements \Magento\Framework\App\ActionInterface
diff --git a/lib/internal/Magento/Framework/App/Action/Action.php b/lib/internal/Magento/Framework/App/Action/Action.php
index 9d9b26313d7c6..b06c9799ddc04 100644
--- a/lib/internal/Magento/Framework/App/Action/Action.php
+++ b/lib/internal/Magento/Framework/App/Action/Action.php
@@ -23,13 +23,14 @@
  * It contains standard action behavior (event dispatching, flag checks)
  * Action classes that do not extend from this class will lose this behavior and might not function correctly
  *
- * @deprecated Inheritance in controllers should be avoided in favor of composition
+ * @deprecated 103.0.0 Inheritance in controllers should be avoided in favor of composition
  * @see \Magento\Framework\App\ActionInterface
  *
  * phpcs:disable Magento2.Classes.AbstractApi
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.NumberOfChildren)
+ * @since 100.0.2
  */
 abstract class Action extends AbstractAction
 {
diff --git a/lib/internal/Magento/Framework/App/Action/Context.php b/lib/internal/Magento/Framework/App/Action/Context.php
index 5f5f013f454f2..1d2f04a23035b 100644
--- a/lib/internal/Magento/Framework/App/Action/Context.php
+++ b/lib/internal/Magento/Framework/App/Action/Context.php
@@ -19,6 +19,7 @@
  * the classes they were introduced for.
  *
  * @api
+ * @since 100.0.2
  */
 class Context implements \Magento\Framework\ObjectManager\ContextInterface
 {
diff --git a/lib/internal/Magento/Framework/App/Action/HttpHeadActionInterface.php b/lib/internal/Magento/Framework/App/Action/HttpHeadActionInterface.php
index 389bd8089967b..6d85e0b80ee55 100644
--- a/lib/internal/Magento/Framework/App/Action/HttpHeadActionInterface.php
+++ b/lib/internal/Magento/Framework/App/Action/HttpHeadActionInterface.php
@@ -13,7 +13,7 @@
 /**
  * Marker for actions processing HEAD requests.
  *
- * @deprecated Both GET and HEAD requests map to HttpGetActionInterface
+ * @deprecated 102.0.2 Both GET and HEAD requests map to HttpGetActionInterface
  */
 interface HttpHeadActionInterface extends ActionInterface
 {
diff --git a/lib/internal/Magento/Framework/App/ActionFactory.php b/lib/internal/Magento/Framework/App/ActionFactory.php
index 94f5ef36eb9c9..4edf022e43509 100644
--- a/lib/internal/Magento/Framework/App/ActionFactory.php
+++ b/lib/internal/Magento/Framework/App/ActionFactory.php
@@ -10,6 +10,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class ActionFactory
 {
diff --git a/lib/internal/Magento/Framework/App/ActionFlag.php b/lib/internal/Magento/Framework/App/ActionFlag.php
index 55201504c968f..3d6c2756595ad 100644
--- a/lib/internal/Magento/Framework/App/ActionFlag.php
+++ b/lib/internal/Magento/Framework/App/ActionFlag.php
@@ -13,6 +13,7 @@
  * Please use plugins to prevent action dispatching instead.
  *
  * @api
+ * @since 100.0.2
  */
 class ActionFlag
 {
diff --git a/lib/internal/Magento/Framework/App/ActionInterface.php b/lib/internal/Magento/Framework/App/ActionInterface.php
index 1501abe9eb956..12e87ad9f4f96 100644
--- a/lib/internal/Magento/Framework/App/ActionInterface.php
+++ b/lib/internal/Magento/Framework/App/ActionInterface.php
@@ -9,6 +9,7 @@
  * Magento application action controller type. Every action controller in Application should implement this interface.
  *
  * @api
+ * @since 100.0.2
  */
 interface ActionInterface
 {
diff --git a/lib/internal/Magento/Framework/App/Area/FrontNameResolverFactory.php b/lib/internal/Magento/Framework/App/Area/FrontNameResolverFactory.php
index 6a4f79dfefe82..fb46ec621b4f8 100644
--- a/lib/internal/Magento/Framework/App/Area/FrontNameResolverFactory.php
+++ b/lib/internal/Magento/Framework/App/Area/FrontNameResolverFactory.php
@@ -12,6 +12,7 @@
  * Keeping it for backward compatibility
  *
  * @api
+ * @since 100.0.2
  */
 class FrontNameResolverFactory
 {
diff --git a/lib/internal/Magento/Framework/App/Area/FrontNameResolverInterface.php b/lib/internal/Magento/Framework/App/Area/FrontNameResolverInterface.php
index fcdee6276c63c..960c933042e62 100644
--- a/lib/internal/Magento/Framework/App/Area/FrontNameResolverInterface.php
+++ b/lib/internal/Magento/Framework/App/Area/FrontNameResolverInterface.php
@@ -17,6 +17,7 @@
  * for areas with dynamic front names.
  *
  * @api
+ * @since 100.0.2
  */
 interface FrontNameResolverInterface
 {
diff --git a/lib/internal/Magento/Framework/App/Bootstrap.php b/lib/internal/Magento/Framework/App/Bootstrap.php
index 500eebcf9a7a7..93d5535d0e10e 100644
--- a/lib/internal/Magento/Framework/App/Bootstrap.php
+++ b/lib/internal/Magento/Framework/App/Bootstrap.php
@@ -23,6 +23,7 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @since 100.0.2
  */
 class Bootstrap
 {
diff --git a/lib/internal/Magento/Framework/App/Cache/Manager.php b/lib/internal/Magento/Framework/App/Cache/Manager.php
index 7ac53d5d6e070..b3531f6e0d163 100644
--- a/lib/internal/Magento/Framework/App/Cache/Manager.php
+++ b/lib/internal/Magento/Framework/App/Cache/Manager.php
@@ -12,6 +12,7 @@
  * Cache status manager
  *
  * @api
+ * @since 100.0.2
  */
 class Manager
 {
diff --git a/lib/internal/Magento/Framework/App/Cache/StateInterface.php b/lib/internal/Magento/Framework/App/Cache/StateInterface.php
index c9f6db3dd8899..1f0b2fa6e00d5 100644
--- a/lib/internal/Magento/Framework/App/Cache/StateInterface.php
+++ b/lib/internal/Magento/Framework/App/Cache/StateInterface.php
@@ -7,6 +7,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 interface StateInterface
 {
diff --git a/lib/internal/Magento/Framework/App/Cache/Type/FrontendPool.php b/lib/internal/Magento/Framework/App/Cache/Type/FrontendPool.php
index 596fd833ab1ed..b89ba7067d725 100644
--- a/lib/internal/Magento/Framework/App/Cache/Type/FrontendPool.php
+++ b/lib/internal/Magento/Framework/App/Cache/Type/FrontendPool.php
@@ -12,6 +12,7 @@
  * In-memory readonly pool of cache front-ends with enforced access control, specific to cache types
  *
  * @api
+ * @since 100.0.2
  */
 class FrontendPool
 {
diff --git a/lib/internal/Magento/Framework/App/Cache/TypeListInterface.php b/lib/internal/Magento/Framework/App/Cache/TypeListInterface.php
index 8f18f5b57d6cc..c379133e94a3b 100644
--- a/lib/internal/Magento/Framework/App/Cache/TypeListInterface.php
+++ b/lib/internal/Magento/Framework/App/Cache/TypeListInterface.php
@@ -7,6 +7,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 interface TypeListInterface
 {
diff --git a/lib/internal/Magento/Framework/App/CacheInterface.php b/lib/internal/Magento/Framework/App/CacheInterface.php
index 374fb3cf68936..9052d93191929 100644
--- a/lib/internal/Magento/Framework/App/CacheInterface.php
+++ b/lib/internal/Magento/Framework/App/CacheInterface.php
@@ -10,6 +10,7 @@
  * System cache model interface
  *
  * @api
+ * @since 100.0.2
  */
 interface CacheInterface
 {
diff --git a/lib/internal/Magento/Framework/App/Config/Data/ProcessorInterface.php b/lib/internal/Magento/Framework/App/Config/Data/ProcessorInterface.php
index 83ff73ab387a9..7d0b53cf1bc12 100644
--- a/lib/internal/Magento/Framework/App/Config/Data/ProcessorInterface.php
+++ b/lib/internal/Magento/Framework/App/Config/Data/ProcessorInterface.php
@@ -9,6 +9,7 @@
  * Processes data from admin store configuration fields
  *
  * @api
+ * @since 100.0.2
  */
 interface ProcessorInterface
 {
diff --git a/lib/internal/Magento/Framework/App/Config/DataInterface.php b/lib/internal/Magento/Framework/App/Config/DataInterface.php
index 6495bbf0bc4da..e267e7311be1a 100644
--- a/lib/internal/Magento/Framework/App/Config/DataInterface.php
+++ b/lib/internal/Magento/Framework/App/Config/DataInterface.php
@@ -9,6 +9,7 @@
  * Configuration data storage
  *
  * @api
+ * @since 100.0.2
  */
 interface DataInterface
 {
diff --git a/lib/internal/Magento/Framework/App/Config/Element.php b/lib/internal/Magento/Framework/App/Config/Element.php
index e5b4a5c384513..d714783847dc5 100644
--- a/lib/internal/Magento/Framework/App/Config/Element.php
+++ b/lib/internal/Magento/Framework/App/Config/Element.php
@@ -11,6 +11,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class Element extends \Magento\Framework\Simplexml\Element
 {
diff --git a/lib/internal/Magento/Framework/App/Config/InitialConfigSource.php b/lib/internal/Magento/Framework/App/Config/InitialConfigSource.php
index 50a250f9c6591..79305e651eeaa 100644
--- a/lib/internal/Magento/Framework/App/Config/InitialConfigSource.php
+++ b/lib/internal/Magento/Framework/App/Config/InitialConfigSource.php
@@ -25,7 +25,7 @@ class InitialConfigSource implements ConfigSourceInterface
 
     /**
      * @var string
-     * @deprecated 100.2.0 Initial configs can not be separated since 2.2.0 version
+     * @deprecated 101.0.0 Initial configs can not be separated since 2.2.0 version
      */
     private $fileKey;
 
diff --git a/lib/internal/Magento/Framework/App/Config/MutableScopeConfigInterface.php b/lib/internal/Magento/Framework/App/Config/MutableScopeConfigInterface.php
index 32d081b853f40..15c7530e80373 100644
--- a/lib/internal/Magento/Framework/App/Config/MutableScopeConfigInterface.php
+++ b/lib/internal/Magento/Framework/App/Config/MutableScopeConfigInterface.php
@@ -10,6 +10,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 interface MutableScopeConfigInterface extends \Magento\Framework\App\Config\ScopeConfigInterface
 {
diff --git a/lib/internal/Magento/Framework/App/Config/ReinitableConfigInterface.php b/lib/internal/Magento/Framework/App/Config/ReinitableConfigInterface.php
index 7974f97ef1ffc..f180a4ce401b1 100644
--- a/lib/internal/Magento/Framework/App/Config/ReinitableConfigInterface.php
+++ b/lib/internal/Magento/Framework/App/Config/ReinitableConfigInterface.php
@@ -10,6 +10,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 interface ReinitableConfigInterface extends \Magento\Framework\App\Config\MutableScopeConfigInterface
 {
diff --git a/lib/internal/Magento/Framework/App/Config/Scope/Validator.php b/lib/internal/Magento/Framework/App/Config/Scope/Validator.php
index 9c0f60286e093..df9807ac55c79 100644
--- a/lib/internal/Magento/Framework/App/Config/Scope/Validator.php
+++ b/lib/internal/Magento/Framework/App/Config/Scope/Validator.php
@@ -15,7 +15,7 @@
 use Magento\Framework\Phrase;
 
 /**
- * @deprecated 100.2.0 Added in order to avoid backward incompatibility because class was moved to another directory.
+ * @deprecated 101.0.0 Added in order to avoid backward incompatibility because class was moved to another directory.
  * @see \Magento\Framework\App\Scope\Validator
  */
 class Validator implements ValidatorInterface
diff --git a/lib/internal/Magento/Framework/App/Config/ScopeConfigInterface.php b/lib/internal/Magento/Framework/App/Config/ScopeConfigInterface.php
index 122e6801ed187..cdac6f3552eea 100644
--- a/lib/internal/Magento/Framework/App/Config/ScopeConfigInterface.php
+++ b/lib/internal/Magento/Framework/App/Config/ScopeConfigInterface.php
@@ -10,6 +10,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 interface ScopeConfigInterface
 {
diff --git a/lib/internal/Magento/Framework/App/Config/Storage/WriterInterface.php b/lib/internal/Magento/Framework/App/Config/Storage/WriterInterface.php
index 35b24692bd228..c1e20cf332023 100644
--- a/lib/internal/Magento/Framework/App/Config/Storage/WriterInterface.php
+++ b/lib/internal/Magento/Framework/App/Config/Storage/WriterInterface.php
@@ -12,6 +12,7 @@
 /**
  * Interface \Magento\Framework\App\Config\Storage\WriterInterface
  * @api
+ * @since 100.0.2
  */
 interface WriterInterface
 {
diff --git a/lib/internal/Magento/Framework/App/Config/Value.php b/lib/internal/Magento/Framework/App/Config/Value.php
index 6fde4dded4695..c18da34f86a26 100644
--- a/lib/internal/Magento/Framework/App/Config/Value.php
+++ b/lib/internal/Magento/Framework/App/Config/Value.php
@@ -24,6 +24,7 @@
  * @api
  *
  * @SuppressWarnings(PHPMD.NumberOfChildren)
+ * @since 100.0.2
  */
 class Value extends \Magento\Framework\Model\AbstractModel implements \Magento\Framework\App\Config\ValueInterface
 {
@@ -134,6 +135,7 @@ public function afterSave()
      * {@inheritdoc}. In addition, it sets status 'invalidate' for config caches
      *
      * @return $this
+     * @since 100.1.0
      */
     public function afterDelete()
     {
diff --git a/lib/internal/Magento/Framework/App/DocRootLocator.php b/lib/internal/Magento/Framework/App/DocRootLocator.php
index d73baf8e4e742..698001044bdf3 100644
--- a/lib/internal/Magento/Framework/App/DocRootLocator.php
+++ b/lib/internal/Magento/Framework/App/DocRootLocator.php
@@ -22,7 +22,7 @@ class DocRootLocator
     private $request;
 
     /**
-     * @deprecated
+     * @deprecated 102.0.2
      * @var ReadFactory
      */
     private $readFactory;
diff --git a/lib/internal/Magento/Framework/App/FrontControllerInterface.php b/lib/internal/Magento/Framework/App/FrontControllerInterface.php
index afd3091097d19..712f3876355c1 100644
--- a/lib/internal/Magento/Framework/App/FrontControllerInterface.php
+++ b/lib/internal/Magento/Framework/App/FrontControllerInterface.php
@@ -11,6 +11,7 @@
  * Every application area has own front controller.
  *
  * @api
+ * @since 100.0.2
  */
 interface FrontControllerInterface
 {
diff --git a/lib/internal/Magento/Framework/App/Language/Dictionary.php b/lib/internal/Magento/Framework/App/Language/Dictionary.php
index b4a6fdc1b5ce3..42e3f7f55018e 100644
--- a/lib/internal/Magento/Framework/App/Language/Dictionary.php
+++ b/lib/internal/Magento/Framework/App/Language/Dictionary.php
@@ -13,6 +13,7 @@
  * A service for reading language package dictionaries
  *
  * @api
+ * @since 100.0.2
  */
 class Dictionary
 {
diff --git a/lib/internal/Magento/Framework/App/ObjectManager.php b/lib/internal/Magento/Framework/App/ObjectManager.php
index 1cc1745c3a57f..f18102a1dbc78 100644
--- a/lib/internal/Magento/Framework/App/ObjectManager.php
+++ b/lib/internal/Magento/Framework/App/ObjectManager.php
@@ -15,6 +15,7 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @since 100.0.2
  */
 class ObjectManager extends \Magento\Framework\ObjectManager\ObjectManager
 {
diff --git a/lib/internal/Magento/Framework/App/ObjectManager/ConfigCache.php b/lib/internal/Magento/Framework/App/ObjectManager/ConfigCache.php
index 0df11cb3cb6e1..846dd6011c732 100644
--- a/lib/internal/Magento/Framework/App/ObjectManager/ConfigCache.php
+++ b/lib/internal/Magento/Framework/App/ObjectManager/ConfigCache.php
@@ -68,7 +68,7 @@ public function save(array $config, $key)
      * Get serializer
      *
      * @return SerializerInterface
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     private function getSerializer()
     {
diff --git a/lib/internal/Magento/Framework/App/ObjectManager/ConfigLoader.php b/lib/internal/Magento/Framework/App/ObjectManager/ConfigLoader.php
index 6abf2aca8d641..1d73bdf4a9956 100644
--- a/lib/internal/Magento/Framework/App/ObjectManager/ConfigLoader.php
+++ b/lib/internal/Magento/Framework/App/ObjectManager/ConfigLoader.php
@@ -86,7 +86,7 @@ public function load($area)
      * Get serializer
      *
      * @return SerializerInterface
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     private function getSerializer()
     {
diff --git a/lib/internal/Magento/Framework/App/ObjectManagerFactory.php b/lib/internal/Magento/Framework/App/ObjectManagerFactory.php
index b781a92b4714a..0c468a767ded2 100644
--- a/lib/internal/Magento/Framework/App/ObjectManagerFactory.php
+++ b/lib/internal/Magento/Framework/App/ObjectManagerFactory.php
@@ -19,6 +19,7 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @since 100.0.2
  */
 class ObjectManagerFactory
 {
@@ -294,7 +295,7 @@ protected function _loadPrimaryConfig(DirectoryList $directoryList, $driverPool,
      * @param \Magento\Framework\ObjectManager\Config\Config $diConfig
      * @param \Magento\Framework\ObjectManager\DefinitionInterface $definitions
      * @return \Magento\Framework\Interception\PluginList\PluginList
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     protected function _createPluginList(
diff --git a/lib/internal/Magento/Framework/App/PlainTextRequestInterface.php b/lib/internal/Magento/Framework/App/PlainTextRequestInterface.php
index c986a2309888a..fbcabd15adba8 100644
--- a/lib/internal/Magento/Framework/App/PlainTextRequestInterface.php
+++ b/lib/internal/Magento/Framework/App/PlainTextRequestInterface.php
@@ -13,7 +13,7 @@
  * To read already parsed request data use \Magento\Framework\App\RequestInterface.
  *
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 interface PlainTextRequestInterface
 {
@@ -21,7 +21,7 @@ interface PlainTextRequestInterface
      * Returns textual representation of request to Magento.
      *
      * @return string
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getContent();
 }
diff --git a/lib/internal/Magento/Framework/App/ProductMetadataInterface.php b/lib/internal/Magento/Framework/App/ProductMetadataInterface.php
index 4d55092d45e03..a62b06077a842 100644
--- a/lib/internal/Magento/Framework/App/ProductMetadataInterface.php
+++ b/lib/internal/Magento/Framework/App/ProductMetadataInterface.php
@@ -9,6 +9,7 @@
  * Magento application product metadata
  *
  * @api
+ * @since 100.0.2
  */
 interface ProductMetadataInterface
 {
diff --git a/lib/internal/Magento/Framework/App/ReinitableConfig.php b/lib/internal/Magento/Framework/App/ReinitableConfig.php
index 70bc82229995d..09ba71a279636 100644
--- a/lib/internal/Magento/Framework/App/ReinitableConfig.php
+++ b/lib/internal/Magento/Framework/App/ReinitableConfig.php
@@ -9,7 +9,7 @@
 
 /**
  * @inheritdoc
- * @deprecated 100.2.0
+ * @deprecated 101.0.0
  */
 class ReinitableConfig extends MutableScopeConfig implements ReinitableConfigInterface
 {
diff --git a/lib/internal/Magento/Framework/App/Request/PathInfoProcessorInterface.php b/lib/internal/Magento/Framework/App/Request/PathInfoProcessorInterface.php
index 60d867cb4388f..3c2896569c199 100644
--- a/lib/internal/Magento/Framework/App/Request/PathInfoProcessorInterface.php
+++ b/lib/internal/Magento/Framework/App/Request/PathInfoProcessorInterface.php
@@ -9,6 +9,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 interface PathInfoProcessorInterface
 {
diff --git a/lib/internal/Magento/Framework/App/RequestContentInterface.php b/lib/internal/Magento/Framework/App/RequestContentInterface.php
index 90848f34ccd66..29e26e0702163 100644
--- a/lib/internal/Magento/Framework/App/RequestContentInterface.php
+++ b/lib/internal/Magento/Framework/App/RequestContentInterface.php
@@ -11,7 +11,7 @@
  * Direct usage of RequestInterface and PlainTextRequestInterface is preferable.
  *
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 interface RequestContentInterface extends RequestInterface, PlainTextRequestInterface
 {
diff --git a/lib/internal/Magento/Framework/App/RequestInterface.php b/lib/internal/Magento/Framework/App/RequestInterface.php
index 7abcc9208af5c..a830d46978b84 100644
--- a/lib/internal/Magento/Framework/App/RequestInterface.php
+++ b/lib/internal/Magento/Framework/App/RequestInterface.php
@@ -9,6 +9,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 interface RequestInterface
 {
diff --git a/lib/internal/Magento/Framework/App/RequestSafetyInterface.php b/lib/internal/Magento/Framework/App/RequestSafetyInterface.php
index f56ff9aaf8ab5..56d6312a60c7c 100644
--- a/lib/internal/Magento/Framework/App/RequestSafetyInterface.php
+++ b/lib/internal/Magento/Framework/App/RequestSafetyInterface.php
@@ -10,6 +10,7 @@
  * Request safety check. Can be used to identify if current application request is safe (does not modify state) or not.
  *
  * @api
+ * @since 100.0.2
  */
 interface RequestSafetyInterface
 {
diff --git a/lib/internal/Magento/Framework/App/ResourceConnection.php b/lib/internal/Magento/Framework/App/ResourceConnection.php
index b543cc970f640..50ebab048c7ae 100644
--- a/lib/internal/Magento/Framework/App/ResourceConnection.php
+++ b/lib/internal/Magento/Framework/App/ResourceConnection.php
@@ -15,6 +15,7 @@
  * This class provides access to all these connections.
  *
  * @api
+ * @since 100.0.2
  */
 class ResourceConnection
 {
@@ -298,6 +299,7 @@ public function getFkName($priTableName, $priColumnName, $refTableName, $refColu
      *
      * @param string $resourceName
      * @return string
+     * @since 102.0.0
      */
     public function getSchemaName($resourceName)
     {
diff --git a/lib/internal/Magento/Framework/App/ResourceConnection/SourceProviderInterface.php b/lib/internal/Magento/Framework/App/ResourceConnection/SourceProviderInterface.php
index f8ff407d4507e..0a67b4cac9785 100644
--- a/lib/internal/Magento/Framework/App/ResourceConnection/SourceProviderInterface.php
+++ b/lib/internal/Magento/Framework/App/ResourceConnection/SourceProviderInterface.php
@@ -7,6 +7,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 interface SourceProviderInterface extends \Traversable
 {
diff --git a/lib/internal/Magento/Framework/App/Response/HttpInterface.php b/lib/internal/Magento/Framework/App/Response/HttpInterface.php
index 17825aeb88d65..f18978b4fcaf0 100644
--- a/lib/internal/Magento/Framework/App/Response/HttpInterface.php
+++ b/lib/internal/Magento/Framework/App/Response/HttpInterface.php
@@ -9,6 +9,7 @@
  * HTTP response interface
  *
  * @api
+ * @since 100.0.2
  */
 interface HttpInterface extends \Magento\Framework\App\ResponseInterface
 {
@@ -24,7 +25,7 @@ public function setHttpResponseCode($code);
      * Get HTTP response code
      *
      * @return int
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getHttpResponseCode();
 
@@ -37,7 +38,7 @@ public function getHttpResponseCode();
      * @param string $value
      * @param boolean $replace
      * @return self
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function setHeader($name, $value, $replace = false);
 
@@ -49,7 +50,7 @@ public function setHeader($name, $value, $replace = false);
      *
      * @param string $name
      * @return \Laminas\Http\Header\HeaderInterface|bool
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getHeader($name);
 
@@ -58,7 +59,7 @@ public function getHeader($name);
      *
      * @param string $name
      * @return self
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function clearHeader($name);
 
@@ -76,7 +77,7 @@ public function clearHeader($name);
      * @param null|int|string $version
      * @param null|string $phrase
      * @return self
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function setStatusHeader($httpCode, $version = null, $phrase = null);
 
@@ -85,7 +86,7 @@ public function setStatusHeader($httpCode, $version = null, $phrase = null);
      *
      * @param string $value
      * @return self
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function appendBody($value);
 
@@ -96,7 +97,7 @@ public function appendBody($value);
      *
      * @param string $value
      * @return self
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function setBody($value);
 
@@ -108,7 +109,7 @@ public function setBody($value);
      * @param string $url
      * @param int $code
      * @return self
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function setRedirect($url, $code = 302);
 }
diff --git a/lib/internal/Magento/Framework/App/ResponseInterface.php b/lib/internal/Magento/Framework/App/ResponseInterface.php
index f55e2cbaa2c1c..98633720d3ba4 100644
--- a/lib/internal/Magento/Framework/App/ResponseInterface.php
+++ b/lib/internal/Magento/Framework/App/ResponseInterface.php
@@ -9,6 +9,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 interface ResponseInterface
 {
diff --git a/lib/internal/Magento/Framework/App/Route/Config.php b/lib/internal/Magento/Framework/App/Route/Config.php
index b8bcd75482d28..787fe6363aa07 100644
--- a/lib/internal/Magento/Framework/App/Route/Config.php
+++ b/lib/internal/Magento/Framework/App/Route/Config.php
@@ -153,7 +153,7 @@ public function getModulesByFrontName($frontName, $scope = null)
      * Get serializer
      *
      * @return \Magento\Framework\Serialize\SerializerInterface
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     private function getSerializer()
     {
diff --git a/lib/internal/Magento/Framework/App/Route/ConfigInterface.php b/lib/internal/Magento/Framework/App/Route/ConfigInterface.php
index 88b1c42261fc7..26d1a6bf30ac0 100644
--- a/lib/internal/Magento/Framework/App/Route/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/App/Route/ConfigInterface.php
@@ -9,6 +9,7 @@
  * Routes configuration interface
  *
  * @api
+ * @since 100.0.2
  */
 interface ConfigInterface
 {
diff --git a/lib/internal/Magento/Framework/App/Rss/DataProviderInterface.php b/lib/internal/Magento/Framework/App/Rss/DataProviderInterface.php
index 2c61c855945f2..4c20469ea9f59 100644
--- a/lib/internal/Magento/Framework/App/Rss/DataProviderInterface.php
+++ b/lib/internal/Magento/Framework/App/Rss/DataProviderInterface.php
@@ -7,6 +7,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 interface DataProviderInterface
 {
diff --git a/lib/internal/Magento/Framework/App/ScopeInterface.php b/lib/internal/Magento/Framework/App/ScopeInterface.php
index 5821bf2aafa2a..81de45c5d9240 100644
--- a/lib/internal/Magento/Framework/App/ScopeInterface.php
+++ b/lib/internal/Magento/Framework/App/ScopeInterface.php
@@ -7,6 +7,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 interface ScopeInterface
 {
diff --git a/lib/internal/Magento/Framework/App/State.php b/lib/internal/Magento/Framework/App/State.php
index 5d6ebaa2cc070..bc2b85b37442b 100644
--- a/lib/internal/Magento/Framework/App/State.php
+++ b/lib/internal/Magento/Framework/App/State.php
@@ -12,6 +12,7 @@
  * Note: Area code communication and emulation will be removed from this class.
  *
  * @api
+ * @since 100.0.2
  */
 class State
 {
@@ -219,7 +220,7 @@ private function checkAreaCode($areaCode)
      * Get Instance of AreaList
      *
      * @return AreaList
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     private function getAreaListInstance()
     {
diff --git a/lib/internal/Magento/Framework/App/StaticResource.php b/lib/internal/Magento/Framework/App/StaticResource.php
index 86b2b15d3c446..321ded57c0885 100644
--- a/lib/internal/Magento/Framework/App/StaticResource.php
+++ b/lib/internal/Magento/Framework/App/StaticResource.php
@@ -215,7 +215,7 @@ private function getFilesystem()
      * Retrieves LoggerInterface instance
      *
      * @return LoggerInterface
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     private function getLogger()
     {
diff --git a/lib/internal/Magento/Framework/App/TemplateTypesInterface.php b/lib/internal/Magento/Framework/App/TemplateTypesInterface.php
index bc12d4d7e1ba5..37ae5e5431b92 100644
--- a/lib/internal/Magento/Framework/App/TemplateTypesInterface.php
+++ b/lib/internal/Magento/Framework/App/TemplateTypesInterface.php
@@ -8,7 +8,7 @@
 /**
  * Template Types interface
  *
- * @deprecated 100.2.0 because of incorrect location
+ * @deprecated 101.0.0 because of incorrect location
  */
 interface TemplateTypesInterface
 {
diff --git a/lib/internal/Magento/Framework/App/Utility/Files.php b/lib/internal/Magento/Framework/App/Utility/Files.php
index 901bbbde3dc9f..44a04e1b60746 100644
--- a/lib/internal/Magento/Framework/App/Utility/Files.php
+++ b/lib/internal/Magento/Framework/App/Utility/Files.php
@@ -1020,7 +1020,7 @@ protected function _accumulateFilesByPatterns(array $patterns, $filePattern, arr
     /**
      * Parse meta-info of a static file in module
      *
-     * @deprecated Replaced with method accumulateStaticFiles()
+     * @deprecated 102.0.4 Replaced with method accumulateStaticFiles()
      *
      * @param string $file
      * @return array
diff --git a/lib/internal/Magento/Framework/App/View/Asset/Publisher.php b/lib/internal/Magento/Framework/App/View/Asset/Publisher.php
index 0af5a8199ab88..ea50f96615139 100644
--- a/lib/internal/Magento/Framework/App/View/Asset/Publisher.php
+++ b/lib/internal/Magento/Framework/App/View/Asset/Publisher.php
@@ -14,6 +14,7 @@
  * A publishing service for view assets
  *
  * @api
+ * @since 100.0.2
  */
 class Publisher
 {
diff --git a/lib/internal/Magento/Framework/App/View/Deployment/Version.php b/lib/internal/Magento/Framework/App/View/Deployment/Version.php
index 67f6d3c1ed779..e86e51eaf83d3 100644
--- a/lib/internal/Magento/Framework/App/View/Deployment/Version.php
+++ b/lib/internal/Magento/Framework/App/View/Deployment/Version.php
@@ -109,7 +109,7 @@ private function generateVersion()
      * Get logger
      *
      * @return LoggerInterface
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     private function getLogger()
     {
diff --git a/lib/internal/Magento/Framework/App/ViewInterface.php b/lib/internal/Magento/Framework/App/ViewInterface.php
index a659cd371a9a4..6a61154ce8b40 100644
--- a/lib/internal/Magento/Framework/App/ViewInterface.php
+++ b/lib/internal/Magento/Framework/App/ViewInterface.php
@@ -10,8 +10,9 @@
  * Later replaced with Magento\Framework\View\Result component
  *
  * @api
- * @deprecated 100.2.0
+ * @deprecated 101.0.0
  * @see \Magento\Framework\View\Result\Layout
+ * @since 100.0.2
  */
 interface ViewInterface
 {
diff --git a/lib/internal/Magento/Framework/AppInterface.php b/lib/internal/Magento/Framework/AppInterface.php
index 25a0a9e785daa..e0397f8544536 100644
--- a/lib/internal/Magento/Framework/AppInterface.php
+++ b/lib/internal/Magento/Framework/AppInterface.php
@@ -14,6 +14,7 @@
  * Implementations of this interface should implement application type specific initialization.
  *
  * @api
+ * @since 100.0.2
  */
 interface AppInterface
 {
diff --git a/lib/internal/Magento/Framework/Archive/ArchiveInterface.php b/lib/internal/Magento/Framework/Archive/ArchiveInterface.php
index 69a524107f1e0..c6e85b558b24e 100644
--- a/lib/internal/Magento/Framework/Archive/ArchiveInterface.php
+++ b/lib/internal/Magento/Framework/Archive/ArchiveInterface.php
@@ -13,6 +13,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 interface ArchiveInterface
 {
diff --git a/lib/internal/Magento/Framework/Authorization/PolicyInterface.php b/lib/internal/Magento/Framework/Authorization/PolicyInterface.php
index 0d9a5d3af74c9..0afcc5c80e596 100644
--- a/lib/internal/Magento/Framework/Authorization/PolicyInterface.php
+++ b/lib/internal/Magento/Framework/Authorization/PolicyInterface.php
@@ -9,6 +9,7 @@
  * Responsible for internal authorization decision making based on provided role, resource and privilege
  *
  * @api
+ * @since 100.0.2
  */
 interface PolicyInterface
 {
diff --git a/lib/internal/Magento/Framework/Authorization/RoleLocatorInterface.php b/lib/internal/Magento/Framework/Authorization/RoleLocatorInterface.php
index b273f2274df34..29b8cbdc377d4 100644
--- a/lib/internal/Magento/Framework/Authorization/RoleLocatorInterface.php
+++ b/lib/internal/Magento/Framework/Authorization/RoleLocatorInterface.php
@@ -11,6 +11,7 @@
  * Should be implemented by application developer that uses \Magento\Framework\Authorization component.
  *
  * @api
+ * @since 100.0.2
  */
 interface RoleLocatorInterface
 {
diff --git a/lib/internal/Magento/Framework/AuthorizationInterface.php b/lib/internal/Magento/Framework/AuthorizationInterface.php
index 6077e2740b75c..65f0755a48a5c 100644
--- a/lib/internal/Magento/Framework/AuthorizationInterface.php
+++ b/lib/internal/Magento/Framework/AuthorizationInterface.php
@@ -9,6 +9,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 interface AuthorizationInterface
 {
diff --git a/lib/internal/Magento/Framework/Backup/AbstractBackup.php b/lib/internal/Magento/Framework/Backup/AbstractBackup.php
index 66bcdbf16a54b..a46f7d629f6f1 100644
--- a/lib/internal/Magento/Framework/Backup/AbstractBackup.php
+++ b/lib/internal/Magento/Framework/Backup/AbstractBackup.php
@@ -12,6 +12,7 @@
  * Class to work with archives
  *
  * @api
+ * @since 100.0.2
  */
 abstract class AbstractBackup implements BackupInterface, SourceFileInterface
 {
@@ -311,6 +312,7 @@ protected function _filterName($name)
      * Check if keep files of backup
      *
      * @return bool
+     * @since 102.0.0
      */
     public function keepSourceFile()
     {
@@ -322,6 +324,7 @@ public function keepSourceFile()
      *
      * @param bool $keepSourceFile
      * @return $this
+     * @since 102.0.0
      */
     public function setKeepSourceFile(bool $keepSourceFile)
     {
diff --git a/lib/internal/Magento/Framework/Backup/BackupException.php b/lib/internal/Magento/Framework/Backup/BackupException.php
index 7694c084c10a7..6fef1d92ddbfe 100644
--- a/lib/internal/Magento/Framework/Backup/BackupException.php
+++ b/lib/internal/Magento/Framework/Backup/BackupException.php
@@ -8,6 +8,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class BackupException extends \Magento\Framework\Exception\LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Backup/BackupInterface.php b/lib/internal/Magento/Framework/Backup/BackupInterface.php
index 16aada9689c11..e16eef51d25a9 100644
--- a/lib/internal/Magento/Framework/Backup/BackupInterface.php
+++ b/lib/internal/Magento/Framework/Backup/BackupInterface.php
@@ -14,7 +14,8 @@
 /**
  * @api
  *
- * @deprecated Backups should be done using other means.
+ * @deprecated 101.0.7 Backups should be done using other means.
+ * @since 100.0.2
  */
 interface BackupInterface
 {
diff --git a/lib/internal/Magento/Framework/Backup/Db.php b/lib/internal/Magento/Framework/Backup/Db.php
index d3b72f30d8cb3..b7e0edf7c4f47 100644
--- a/lib/internal/Magento/Framework/Backup/Db.php
+++ b/lib/internal/Magento/Framework/Backup/Db.php
@@ -14,6 +14,7 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @api
+ * @since 100.0.2
  */
 class Db extends AbstractBackup
 {
diff --git a/lib/internal/Magento/Framework/Backup/Db/BackupDbInterface.php b/lib/internal/Magento/Framework/Backup/Db/BackupDbInterface.php
index a019ccac06b66..78ace64e4fe68 100644
--- a/lib/internal/Magento/Framework/Backup/Db/BackupDbInterface.php
+++ b/lib/internal/Magento/Framework/Backup/Db/BackupDbInterface.php
@@ -8,7 +8,8 @@
 /**
  * @api
  *
- * @deprecated Backups should be done using other means.
+ * @deprecated 101.0.7 Backups should be done using other means.
+ * @since 100.0.2
  */
 interface BackupDbInterface
 {
diff --git a/lib/internal/Magento/Framework/Backup/Db/BackupFactory.php b/lib/internal/Magento/Framework/Backup/Db/BackupFactory.php
index d1c9c3df1e9aa..a9e1cdd133f75 100644
--- a/lib/internal/Magento/Framework/Backup/Db/BackupFactory.php
+++ b/lib/internal/Magento/Framework/Backup/Db/BackupFactory.php
@@ -10,6 +10,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class BackupFactory
 {
diff --git a/lib/internal/Magento/Framework/Backup/Db/BackupInterface.php b/lib/internal/Magento/Framework/Backup/Db/BackupInterface.php
index ae5879290eb20..78940f93e33c9 100644
--- a/lib/internal/Magento/Framework/Backup/Db/BackupInterface.php
+++ b/lib/internal/Magento/Framework/Backup/Db/BackupInterface.php
@@ -8,7 +8,8 @@
 /**
  * @api
  *
- * @deprecated Backups should be done using other means.
+ * @deprecated 101.0.7 Backups should be done using other means.
+ * @since 100.0.2
  */
 interface BackupInterface
 {
diff --git a/lib/internal/Magento/Framework/Backup/Exception/CantLoadSnapshot.php b/lib/internal/Magento/Framework/Backup/Exception/CantLoadSnapshot.php
index 45d1cc21b06da..b351bc85a613b 100644
--- a/lib/internal/Magento/Framework/Backup/Exception/CantLoadSnapshot.php
+++ b/lib/internal/Magento/Framework/Backup/Exception/CantLoadSnapshot.php
@@ -8,6 +8,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class CantLoadSnapshot extends \Magento\Framework\Backup\BackupException
 {
diff --git a/lib/internal/Magento/Framework/Backup/Exception/FtpConnectionFailed.php b/lib/internal/Magento/Framework/Backup/Exception/FtpConnectionFailed.php
index 9b722da10a1bd..311de25343eb7 100644
--- a/lib/internal/Magento/Framework/Backup/Exception/FtpConnectionFailed.php
+++ b/lib/internal/Magento/Framework/Backup/Exception/FtpConnectionFailed.php
@@ -8,6 +8,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class FtpConnectionFailed extends \Magento\Framework\Backup\BackupException
 {
diff --git a/lib/internal/Magento/Framework/Backup/Exception/FtpValidationFailed.php b/lib/internal/Magento/Framework/Backup/Exception/FtpValidationFailed.php
index 53af4bfd3061b..1b197576b32c2 100644
--- a/lib/internal/Magento/Framework/Backup/Exception/FtpValidationFailed.php
+++ b/lib/internal/Magento/Framework/Backup/Exception/FtpValidationFailed.php
@@ -8,6 +8,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class FtpValidationFailed extends \Magento\Framework\Backup\BackupException
 {
diff --git a/lib/internal/Magento/Framework/Backup/Exception/NotEnoughFreeSpace.php b/lib/internal/Magento/Framework/Backup/Exception/NotEnoughFreeSpace.php
index b373134d2e9a6..48cedca5aecbb 100644
--- a/lib/internal/Magento/Framework/Backup/Exception/NotEnoughFreeSpace.php
+++ b/lib/internal/Magento/Framework/Backup/Exception/NotEnoughFreeSpace.php
@@ -8,6 +8,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class NotEnoughFreeSpace extends \Magento\Framework\Backup\BackupException
 {
diff --git a/lib/internal/Magento/Framework/Backup/Exception/NotEnoughPermissions.php b/lib/internal/Magento/Framework/Backup/Exception/NotEnoughPermissions.php
index ba7e80a503f4f..df89932680029 100644
--- a/lib/internal/Magento/Framework/Backup/Exception/NotEnoughPermissions.php
+++ b/lib/internal/Magento/Framework/Backup/Exception/NotEnoughPermissions.php
@@ -8,6 +8,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class NotEnoughPermissions extends \Magento\Framework\Backup\BackupException
 {
diff --git a/lib/internal/Magento/Framework/Backup/Factory.php b/lib/internal/Magento/Framework/Backup/Factory.php
index effa796a2a074..1692cc168d5f2 100644
--- a/lib/internal/Magento/Framework/Backup/Factory.php
+++ b/lib/internal/Magento/Framework/Backup/Factory.php
@@ -15,6 +15,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class Factory
 {
diff --git a/lib/internal/Magento/Framework/Backup/Filesystem.php b/lib/internal/Magento/Framework/Backup/Filesystem.php
index f3946444cec20..72996cdd28fda 100644
--- a/lib/internal/Magento/Framework/Backup/Filesystem.php
+++ b/lib/internal/Magento/Framework/Backup/Filesystem.php
@@ -317,7 +317,7 @@ protected function _getTarTmpPath()
 
     /**
      * @return Ftp
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected function getRollBackFtp()
     {
@@ -333,7 +333,7 @@ protected function getRollBackFtp()
 
     /**
      * @return Fs
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected function getRollBackFs()
     {
diff --git a/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/AbstractRollback.php b/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/AbstractRollback.php
index 8c8c21a8405b6..976c07ef986e0 100644
--- a/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/AbstractRollback.php
+++ b/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/AbstractRollback.php
@@ -11,6 +11,7 @@
  * Filesystem rollback workers abstract class
  *
  * @api
+ * @since 100.0.2
  */
 abstract class AbstractRollback
 {
diff --git a/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Fs.php b/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Fs.php
index 4820b83ceb7a8..b8eca279fdf22 100644
--- a/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Fs.php
+++ b/lib/internal/Magento/Framework/Backup/Filesystem/Rollback/Fs.php
@@ -97,7 +97,7 @@ public function run()
      * Get file system helper instance
      *
      * @return Helper
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     private function getFsHelper()
     {
diff --git a/lib/internal/Magento/Framework/Bulk/BulkManagementInterface.php b/lib/internal/Magento/Framework/Bulk/BulkManagementInterface.php
index 9cfb2b1c97a4d..d2d247bdb271c 100644
--- a/lib/internal/Magento/Framework/Bulk/BulkManagementInterface.php
+++ b/lib/internal/Magento/Framework/Bulk/BulkManagementInterface.php
@@ -8,7 +8,7 @@
 /**
  * Interface BulkManagementInterface
  * @api
- * @since 100.2.0
+ * @since 103.0.0
  */
 interface BulkManagementInterface
 {
@@ -20,7 +20,7 @@ interface BulkManagementInterface
      * @param string $description
      * @param int $userId
      * @return boolean
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function scheduleBulk($bulkUuid, array $operations, $description, $userId = null);
 
@@ -29,7 +29,7 @@ public function scheduleBulk($bulkUuid, array $operations, $description, $userId
      *
      * @param string $bulkId
      * @return boolean
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function deleteBulk($bulkId);
 }
diff --git a/lib/internal/Magento/Framework/Bulk/BulkStatusInterface.php b/lib/internal/Magento/Framework/Bulk/BulkStatusInterface.php
index 0f1deb0ceeeaf..45352af9c5c8c 100644
--- a/lib/internal/Magento/Framework/Bulk/BulkStatusInterface.php
+++ b/lib/internal/Magento/Framework/Bulk/BulkStatusInterface.php
@@ -8,7 +8,7 @@
 /**
  * Interface BulkStatusInterface
  * @api
- * @since 100.2.0
+ * @since 103.0.0
  */
 interface BulkStatusInterface
 {
@@ -18,7 +18,7 @@ interface BulkStatusInterface
      * @param string $bulkUuid
      * @param int|null $failureType
      * @return \Magento\Framework\Bulk\OperationInterface[]
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function getFailedOperationsByBulkId($bulkUuid, $failureType = null);
 
@@ -28,7 +28,7 @@ public function getFailedOperationsByBulkId($bulkUuid, $failureType = null);
      * @param string $bulkUuid
      * @param int $status
      * @return int
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function getOperationsCountByBulkIdAndStatus($bulkUuid, $status);
 
@@ -37,7 +37,7 @@ public function getOperationsCountByBulkIdAndStatus($bulkUuid, $status);
      *
      * @param int $userId
      * @return BulkSummaryInterface[]
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function getBulksByUser($userId);
 
@@ -49,7 +49,7 @@ public function getBulksByUser($userId);
      *
      * @param string $bulkUuid
      * @return int NOT_STARTED | IN_PROGRESS | FINISHED_SUCCESFULLY | FINISHED_WITH_FAILURE
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function getBulkStatus($bulkUuid);
 }
diff --git a/lib/internal/Magento/Framework/Bulk/BulkSummaryInterface.php b/lib/internal/Magento/Framework/Bulk/BulkSummaryInterface.php
index 69e9b71ca00c3..f06ea9289cf6f 100644
--- a/lib/internal/Magento/Framework/Bulk/BulkSummaryInterface.php
+++ b/lib/internal/Magento/Framework/Bulk/BulkSummaryInterface.php
@@ -8,7 +8,7 @@
 /**
  * Interface BulkSummaryInterface
  * @api
- * @since 100.2.0
+ * @since 103.0.0
  */
 interface BulkSummaryInterface
 {
@@ -35,7 +35,7 @@ interface BulkSummaryInterface
      * Get bulk uuid
      *
      * @return string
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function getBulkId();
 
@@ -44,7 +44,7 @@ public function getBulkId();
      *
      * @param string $bulkUuid
      * @return $this
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function setBulkId($bulkUuid);
 
@@ -52,7 +52,7 @@ public function setBulkId($bulkUuid);
      * Get bulk description
      *
      * @return string
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function getDescription();
 
@@ -61,7 +61,7 @@ public function getDescription();
      *
      * @param string $description
      * @return $this
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function setDescription($description);
 
@@ -69,7 +69,7 @@ public function setDescription($description);
      * Get bulk scheduled time
      *
      * @return string
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function getStartTime();
 
@@ -78,7 +78,7 @@ public function getStartTime();
      *
      * @param string $timestamp
      * @return $this
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function setStartTime($timestamp);
 
@@ -86,7 +86,7 @@ public function setStartTime($timestamp);
      * Get user id
      *
      * @return int
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function getUserId();
 
@@ -95,7 +95,7 @@ public function getUserId();
      *
      * @param int $userId
      * @return $this
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function setUserId($userId);
 
@@ -103,7 +103,7 @@ public function setUserId($userId);
      * Get total number of operations scheduled in scope of this bulk
      *
      * @return int
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function getOperationCount();
 
@@ -112,7 +112,7 @@ public function getOperationCount();
      *
      * @param int $operationCount
      * @return $this
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function setOperationCount($operationCount);
 }
diff --git a/lib/internal/Magento/Framework/Bulk/OperationInterface.php b/lib/internal/Magento/Framework/Bulk/OperationInterface.php
index c9672a031c2dd..a621106be3806 100644
--- a/lib/internal/Magento/Framework/Bulk/OperationInterface.php
+++ b/lib/internal/Magento/Framework/Bulk/OperationInterface.php
@@ -8,7 +8,7 @@
 /**
  * Interface OperationInterface
  * @api
- * @since 100.2.0
+ * @since 103.0.0
  */
 interface OperationInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
@@ -39,7 +39,7 @@ interface OperationInterface extends \Magento\Framework\Api\ExtensibleDataInterf
      * Operation id
      *
      * @return int
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function getId();
 
@@ -48,7 +48,7 @@ public function getId();
      *
      * @param int $id
      * @return $this
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function setId($id);
 
@@ -56,7 +56,7 @@ public function setId($id);
      * Get bulk uuid
      *
      * @return string
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function getBulkUuid();
 
@@ -65,7 +65,7 @@ public function getBulkUuid();
      *
      * @param string $bulkId
      * @return $this
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function setBulkUuid($bulkId);
 
@@ -73,7 +73,7 @@ public function setBulkUuid($bulkId);
      * Message Queue Topic
      *
      * @return string
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function getTopicName();
 
@@ -82,7 +82,7 @@ public function getTopicName();
      *
      * @param string $topic
      * @return $this
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function setTopicName($topic);
 
@@ -90,7 +90,7 @@ public function setTopicName($topic);
      * Serialized Data
      *
      * @return string
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function getSerializedData();
 
@@ -99,7 +99,7 @@ public function getSerializedData();
      *
      * @param string $serializedData
      * @return $this
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function setSerializedData($serializedData);
 
@@ -107,7 +107,7 @@ public function setSerializedData($serializedData);
      * Result serialized Data
      *
      * @return string
-     * @since 100.3.0
+     * @since 103.0.0
      */
     public function getResultSerializedData();
 
@@ -116,7 +116,7 @@ public function getResultSerializedData();
      *
      * @param string $resultSerializedData
      * @return $this
-     * @since 100.3.0
+     * @since 103.0.0
      */
     public function setResultSerializedData($resultSerializedData);
 
@@ -126,7 +126,7 @@ public function setResultSerializedData($resultSerializedData);
      * OPEN | COMPLETE | RETRIABLY_FAILED | NOT_RETRIABLY_FAILED
      *
      * @return int
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function getStatus();
 
@@ -135,7 +135,7 @@ public function getStatus();
      *
      * @param int $status
      * @return $this
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function setStatus($status);
 
@@ -143,7 +143,7 @@ public function setStatus($status);
      * Get result message
      *
      * @return string
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function getResultMessage();
 
@@ -152,7 +152,7 @@ public function getResultMessage();
      *
      * @param string $resultMessage
      * @return $this
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function setResultMessage($resultMessage);
 
@@ -160,7 +160,7 @@ public function setResultMessage($resultMessage);
      * Get error code
      *
      * @return int
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function getErrorCode();
 
@@ -169,7 +169,7 @@ public function getErrorCode();
      *
      * @param int $errorCode
      * @return $this
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function setErrorCode($errorCode);
 }
diff --git a/lib/internal/Magento/Framework/Bulk/OperationManagementInterface.php b/lib/internal/Magento/Framework/Bulk/OperationManagementInterface.php
index 886bd45aeaed0..4c603f3c5f76e 100644
--- a/lib/internal/Magento/Framework/Bulk/OperationManagementInterface.php
+++ b/lib/internal/Magento/Framework/Bulk/OperationManagementInterface.php
@@ -9,7 +9,7 @@
 /**
  * Interface OperationManagementInterface
  * @api
- * @since 100.2.0
+ * @since 103.0.0
  */
 interface OperationManagementInterface
 {
@@ -23,7 +23,7 @@ interface OperationManagementInterface
      * @param string|null $message property to update Result Message
      * @param string|null $data serialized data object of failed message
      * @return boolean
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function changeOperationStatus($bulkUuid, $operationKey, $status, $errorCode = null, $message = null, $data = null); // @codingStandardsIgnoreLine
 }
diff --git a/lib/internal/Magento/Framework/Cache/Frontend/Decorator/TagScope.php b/lib/internal/Magento/Framework/Cache/Frontend/Decorator/TagScope.php
index c837544a75f0f..1c5f04364b087 100644
--- a/lib/internal/Magento/Framework/Cache/Frontend/Decorator/TagScope.php
+++ b/lib/internal/Magento/Framework/Cache/Frontend/Decorator/TagScope.php
@@ -10,6 +10,7 @@
  * Cache frontend decorator that limits the cleaning scope within a tag
  *
  * @api
+ * @since 100.0.2
  */
 class TagScope extends \Magento\Framework\Cache\Frontend\Decorator\Bare
 {
diff --git a/lib/internal/Magento/Framework/Cache/FrontendInterface.php b/lib/internal/Magento/Framework/Cache/FrontendInterface.php
index d81d7fbe1c7cc..c57c97238bddd 100644
--- a/lib/internal/Magento/Framework/Cache/FrontendInterface.php
+++ b/lib/internal/Magento/Framework/Cache/FrontendInterface.php
@@ -9,6 +9,7 @@
  * Interface of a cache frontend - an ultimate publicly available interface to an actual cache storage
  *
  * @api
+ * @since 100.0.2
  */
 interface FrontendInterface
 {
diff --git a/lib/internal/Magento/Framework/Code/Generator/DefinedClasses.php b/lib/internal/Magento/Framework/Code/Generator/DefinedClasses.php
index 363c6f59b17ea..e0ae472ba20cb 100644
--- a/lib/internal/Magento/Framework/Code/Generator/DefinedClasses.php
+++ b/lib/internal/Magento/Framework/Code/Generator/DefinedClasses.php
@@ -40,7 +40,7 @@ public function isClassLoadableFromMemory($className)
      *
      * @param string $className
      * @return bool
-     * @deprecated
+     * @deprecated 102.0.0
      */
     public function isClassLoadableFromDisc($className)
     {
diff --git a/lib/internal/Magento/Framework/Code/NameBuilder.php b/lib/internal/Magento/Framework/Code/NameBuilder.php
index 993235054e490..8ceac1c569766 100644
--- a/lib/internal/Magento/Framework/Code/NameBuilder.php
+++ b/lib/internal/Magento/Framework/Code/NameBuilder.php
@@ -9,6 +9,7 @@
  * Builds namespace with classname out of the parts.
  *
  * @api
+ * @since 100.0.2
  */
 class NameBuilder
 {
diff --git a/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php b/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php
index 31243f6ad98f9..840cc2a3e943c 100644
--- a/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php
+++ b/lib/internal/Magento/Framework/Code/Reader/SourceArgumentsReader.php
@@ -87,7 +87,7 @@ public function getConstructorArgumentTypes(
      * @param string $argument
      * @param array $availableNamespaces
      * @return string
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @see getConstructorArgumentTypes
      */
     protected function resolveNamespaces($argument, $availableNamespaces)
@@ -102,7 +102,7 @@ protected function resolveNamespaces($argument, $availableNamespaces)
      * @param string $token
      * @return string
      *
-     * @deprecated Not used anymore.
+     * @deprecated 102.0.0 Not used anymore.
      */
     protected function removeToken($argument, $token)
     {
@@ -118,7 +118,7 @@ protected function removeToken($argument, $token)
      *
      * @param array $file
      * @return array
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @see getConstructorArgumentTypes
      */
     protected function getImportedNamespaces(array $file)
diff --git a/lib/internal/Magento/Framework/Communication/Config/Reader/XmlReader/Converter.php b/lib/internal/Magento/Framework/Communication/Config/Reader/XmlReader/Converter.php
index b79ba49a24ddd..3f69c3258d0b9 100644
--- a/lib/internal/Magento/Framework/Communication/Config/Reader/XmlReader/Converter.php
+++ b/lib/internal/Magento/Framework/Communication/Config/Reader/XmlReader/Converter.php
@@ -62,7 +62,7 @@ public function __construct(
      * The getter function to get the new ConfigParser dependency.
      *
      * @return \Magento\Framework\Communication\Config\ConfigParser
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     private function getConfigParser()
     {
diff --git a/lib/internal/Magento/Framework/Component/ComponentRegistrar.php b/lib/internal/Magento/Framework/Component/ComponentRegistrar.php
index bd20582875ce0..7fea9a4e98b67 100644
--- a/lib/internal/Magento/Framework/Component/ComponentRegistrar.php
+++ b/lib/internal/Magento/Framework/Component/ComponentRegistrar.php
@@ -9,6 +9,7 @@
  * Provides ability to statically register components.
  *
  * @api
+ * @since 100.0.2
  */
 class ComponentRegistrar implements ComponentRegistrarInterface
 {
diff --git a/lib/internal/Magento/Framework/Config/AbstractXml.php b/lib/internal/Magento/Framework/Config/AbstractXml.php
index caead98147bf5..35ce8348c4fc0 100644
--- a/lib/internal/Magento/Framework/Config/AbstractXml.php
+++ b/lib/internal/Magento/Framework/Config/AbstractXml.php
@@ -11,6 +11,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 abstract class AbstractXml
 {
diff --git a/lib/internal/Magento/Framework/Config/CacheInterface.php b/lib/internal/Magento/Framework/Config/CacheInterface.php
index 7064dcfca0547..5d28cf7563a80 100644
--- a/lib/internal/Magento/Framework/Config/CacheInterface.php
+++ b/lib/internal/Magento/Framework/Config/CacheInterface.php
@@ -11,6 +11,7 @@
  * Config cache interface.
  *
  * @api
+ * @since 100.0.2
  */
 interface CacheInterface extends \Magento\Framework\Cache\FrontendInterface
 {
diff --git a/lib/internal/Magento/Framework/Config/Composer/Package.php b/lib/internal/Magento/Framework/Config/Composer/Package.php
index a8ff6ac724c3f..bc0b195297980 100644
--- a/lib/internal/Magento/Framework/Config/Composer/Package.php
+++ b/lib/internal/Magento/Framework/Config/Composer/Package.php
@@ -9,6 +9,7 @@
 /**
  * A model that represents composer package
  * @api
+ * @since 100.0.2
  */
 class Package
 {
diff --git a/lib/internal/Magento/Framework/Config/ConfigOptionsListConstants.php b/lib/internal/Magento/Framework/Config/ConfigOptionsListConstants.php
index 775611c63a9f7..96999187bd6cb 100644
--- a/lib/internal/Magento/Framework/Config/ConfigOptionsListConstants.php
+++ b/lib/internal/Magento/Framework/Config/ConfigOptionsListConstants.php
@@ -11,6 +11,7 @@
 /**
  * Deployment configuration options constant storage
  * @api
+ * @since 100.0.2
  */
 class ConfigOptionsListConstants
 {
diff --git a/lib/internal/Magento/Framework/Config/Converter/Dom/Flat.php b/lib/internal/Magento/Framework/Config/Converter/Dom/Flat.php
index 7f64705a6bde0..d989f03b44f4d 100644
--- a/lib/internal/Magento/Framework/Config/Converter/Dom/Flat.php
+++ b/lib/internal/Magento/Framework/Config/Converter/Dom/Flat.php
@@ -11,6 +11,7 @@
  * Universal converter of any XML data to an array representation with no data loss
  *
  * @api
+ * @since 100.0.2
  */
 class Flat
 {
diff --git a/lib/internal/Magento/Framework/Config/ConverterInterface.php b/lib/internal/Magento/Framework/Config/ConverterInterface.php
index 4e299e31fb206..ed4b811253c40 100644
--- a/lib/internal/Magento/Framework/Config/ConverterInterface.php
+++ b/lib/internal/Magento/Framework/Config/ConverterInterface.php
@@ -9,6 +9,7 @@
  * Config DOM-to-array converter interface.
  *
  * @api
+ * @since 100.0.2
  */
 interface ConverterInterface
 {
diff --git a/lib/internal/Magento/Framework/Config/Data.php b/lib/internal/Magento/Framework/Config/Data.php
index 2ae8eb378064a..cc11b32c410ba 100644
--- a/lib/internal/Magento/Framework/Config/Data.php
+++ b/lib/internal/Magento/Framework/Config/Data.php
@@ -13,6 +13,7 @@
  *
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @api
+ * @since 100.0.2
  */
 class Data implements \Magento\Framework\Config\DataInterface
 {
diff --git a/lib/internal/Magento/Framework/Config/Data/ConfigData.php b/lib/internal/Magento/Framework/Config/Data/ConfigData.php
index b6ea96e36ec56..1c3d2524efa57 100644
--- a/lib/internal/Magento/Framework/Config/Data/ConfigData.php
+++ b/lib/internal/Magento/Framework/Config/Data/ConfigData.php
@@ -9,6 +9,7 @@
 /**
  * Data transfer object to store config data for config options
  * @api
+ * @since 100.0.2
  */
 class ConfigData
 {
diff --git a/lib/internal/Magento/Framework/Config/Data/Scoped.php b/lib/internal/Magento/Framework/Config/Data/Scoped.php
index 9806d89fd5737..e453e8397a9a5 100644
--- a/lib/internal/Magento/Framework/Config/Data/Scoped.php
+++ b/lib/internal/Magento/Framework/Config/Data/Scoped.php
@@ -11,6 +11,7 @@
 /**
  * Provides scoped configuration
  * @api
+ * @since 100.0.2
  */
 class Scoped extends \Magento\Framework\Config\Data
 {
diff --git a/lib/internal/Magento/Framework/Config/DataInterface.php b/lib/internal/Magento/Framework/Config/DataInterface.php
index f0fbedae5a500..0418915a2dadb 100644
--- a/lib/internal/Magento/Framework/Config/DataInterface.php
+++ b/lib/internal/Magento/Framework/Config/DataInterface.php
@@ -9,6 +9,7 @@
  * Config data interface.
  *
  * @api
+ * @since 100.0.2
  */
 interface DataInterface
 {
diff --git a/lib/internal/Magento/Framework/Config/Dom.php b/lib/internal/Magento/Framework/Config/Dom.php
index e36f9615db26b..227eec631a8fe 100644
--- a/lib/internal/Magento/Framework/Config/Dom.php
+++ b/lib/internal/Magento/Framework/Config/Dom.php
@@ -18,6 +18,7 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
+ * @since 100.0.2
  */
 class Dom
 {
@@ -83,7 +84,6 @@ class Dom
 
     /**
      * @var array
-     * @since 2.2.0
      */
     private static $resolvedSchemaPaths = [];
 
@@ -122,7 +122,6 @@ public function __construct(
      *
      * @param string $errorFormat
      * @return string[]
-     * @since 2.1.0
      */
     private static function getXmlErrors($errorFormat)
     {
diff --git a/lib/internal/Magento/Framework/Config/Dom/UrnResolver.php b/lib/internal/Magento/Framework/Config/Dom/UrnResolver.php
index 41c83c940ca04..44ebe82422aba 100644
--- a/lib/internal/Magento/Framework/Config/Dom/UrnResolver.php
+++ b/lib/internal/Magento/Framework/Config/Dom/UrnResolver.php
@@ -16,6 +16,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class UrnResolver
 {
diff --git a/lib/internal/Magento/Framework/Config/Dom/ValidationException.php b/lib/internal/Magento/Framework/Config/Dom/ValidationException.php
index 3c74a80bdfab1..1c77e510841eb 100644
--- a/lib/internal/Magento/Framework/Config/Dom/ValidationException.php
+++ b/lib/internal/Magento/Framework/Config/Dom/ValidationException.php
@@ -11,6 +11,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class ValidationException extends \InvalidArgumentException
 {
diff --git a/lib/internal/Magento/Framework/Config/Dom/ValidationSchemaException.php b/lib/internal/Magento/Framework/Config/Dom/ValidationSchemaException.php
index d65cfa9a2ec9b..81548c31f6ba3 100644
--- a/lib/internal/Magento/Framework/Config/Dom/ValidationSchemaException.php
+++ b/lib/internal/Magento/Framework/Config/Dom/ValidationSchemaException.php
@@ -13,7 +13,7 @@
 
 /**
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 class ValidationSchemaException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Config/DomFactory.php b/lib/internal/Magento/Framework/Config/DomFactory.php
index 542ebd642c71d..f079674a50b9e 100644
--- a/lib/internal/Magento/Framework/Config/DomFactory.php
+++ b/lib/internal/Magento/Framework/Config/DomFactory.php
@@ -8,6 +8,7 @@
 /**
  * Magento configuration DOM factory
  * @api
+ * @since 100.0.2
  */
 class DomFactory
 {
diff --git a/lib/internal/Magento/Framework/Config/File/ConfigFilePool.php b/lib/internal/Magento/Framework/Config/File/ConfigFilePool.php
index ffc32a300ccfe..c9fa5e3ddc606 100644
--- a/lib/internal/Magento/Framework/Config/File/ConfigFilePool.php
+++ b/lib/internal/Magento/Framework/Config/File/ConfigFilePool.php
@@ -9,6 +9,7 @@
 /**
  * Stores file key to file name config
  * @api
+ * @since 100.0.2
  */
 class ConfigFilePool
 {
@@ -39,7 +40,7 @@ class ConfigFilePool
      * Initial files for configuration
      *
      * @var array
-     * @deprecated 100.2.0 Magento does not support custom config file pools since 2.2.0 version
+     * @deprecated 101.0.0 Magento does not support custom config file pools since 2.2.0 version
      */
     private $initialConfigFiles = [
         self::DIST => [
@@ -91,7 +92,7 @@ public function getPath($fileKey)
      * Returns application initial config files.
      *
      * @return array
-     * @deprecated 100.2.0 Magento does not support custom config file pools since 2.2.0 version
+     * @deprecated 101.0.0 Magento does not support custom config file pools since 2.2.0 version
      * @since 100.1.3
      */
     public function getInitialFilePools()
@@ -104,7 +105,7 @@ public function getInitialFilePools()
      *
      * @param string $pool
      * @return array
-     * @deprecated 100.2.0 Magento does not support custom config file pools since 2.2.0 version
+     * @deprecated 101.0.0 Magento does not support custom config file pools since 2.2.0 version
      * @since 100.1.3
      */
     public function getPathsByPool($pool)
diff --git a/lib/internal/Magento/Framework/Config/FileIterator.php b/lib/internal/Magento/Framework/Config/FileIterator.php
index 0de1d8ae528f9..7cf1f34b6deb6 100644
--- a/lib/internal/Magento/Framework/Config/FileIterator.php
+++ b/lib/internal/Magento/Framework/Config/FileIterator.php
@@ -12,6 +12,7 @@
 /**
  * Class FileIterator
  * @api
+ * @since 100.0.2
  */
 class FileIterator implements \Iterator, \Countable
 {
diff --git a/lib/internal/Magento/Framework/Config/FileIteratorFactory.php b/lib/internal/Magento/Framework/Config/FileIteratorFactory.php
index 15d0edd57ded8..337a6110096b9 100644
--- a/lib/internal/Magento/Framework/Config/FileIteratorFactory.php
+++ b/lib/internal/Magento/Framework/Config/FileIteratorFactory.php
@@ -8,6 +8,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class FileIteratorFactory
 {
diff --git a/lib/internal/Magento/Framework/Config/FileResolver.php b/lib/internal/Magento/Framework/Config/FileResolver.php
index 30967a8fa0014..959537d76ab91 100644
--- a/lib/internal/Magento/Framework/Config/FileResolver.php
+++ b/lib/internal/Magento/Framework/Config/FileResolver.php
@@ -55,7 +55,7 @@ class FileResolver implements \Magento\Framework\Config\FileResolverInterface, D
 
     /**
      * @var DirectoryList
-     * @deprecated Unused class property
+     * @deprecated 102.0.0 Unused class property
      */
     private $directoryList;
 
diff --git a/lib/internal/Magento/Framework/Config/FileResolverInterface.php b/lib/internal/Magento/Framework/Config/FileResolverInterface.php
index a83f1da03e123..95bf7f5249561 100644
--- a/lib/internal/Magento/Framework/Config/FileResolverInterface.php
+++ b/lib/internal/Magento/Framework/Config/FileResolverInterface.php
@@ -9,6 +9,7 @@
  * File resolver interface.
  *
  * @api
+ * @since 100.0.2
  */
 interface FileResolverInterface
 {
diff --git a/lib/internal/Magento/Framework/Config/Reader/Filesystem.php b/lib/internal/Magento/Framework/Config/Reader/Filesystem.php
index e2008b95c3b61..b05269b33689d 100644
--- a/lib/internal/Magento/Framework/Config/Reader/Filesystem.php
+++ b/lib/internal/Magento/Framework/Config/Reader/Filesystem.php
@@ -12,6 +12,7 @@
 /**
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @api
+ * @since 100.0.2
  */
 class Filesystem implements \Magento\Framework\Config\ReaderInterface
 {
diff --git a/lib/internal/Magento/Framework/Config/ReaderInterface.php b/lib/internal/Magento/Framework/Config/ReaderInterface.php
index d85ed2030a262..97883d21489b5 100644
--- a/lib/internal/Magento/Framework/Config/ReaderInterface.php
+++ b/lib/internal/Magento/Framework/Config/ReaderInterface.php
@@ -11,6 +11,7 @@
  * Config reader interface.
  *
  * @api
+ * @since 100.0.2
  */
 interface ReaderInterface
 {
diff --git a/lib/internal/Magento/Framework/Config/SchemaLocatorInterface.php b/lib/internal/Magento/Framework/Config/SchemaLocatorInterface.php
index 242f3d62a5f2a..985614051b665 100644
--- a/lib/internal/Magento/Framework/Config/SchemaLocatorInterface.php
+++ b/lib/internal/Magento/Framework/Config/SchemaLocatorInterface.php
@@ -11,6 +11,7 @@
  * Config schema locator interface.
  *
  * @api
+ * @since 100.0.2
  */
 interface SchemaLocatorInterface
 {
diff --git a/lib/internal/Magento/Framework/Config/ScopeInterface.php b/lib/internal/Magento/Framework/Config/ScopeInterface.php
index 052d97eebc166..bd6bc92cdea48 100644
--- a/lib/internal/Magento/Framework/Config/ScopeInterface.php
+++ b/lib/internal/Magento/Framework/Config/ScopeInterface.php
@@ -9,6 +9,7 @@
  * Config scope interface.
  *
  * @api
+ * @since 100.0.2
  */
 interface ScopeInterface
 {
diff --git a/lib/internal/Magento/Framework/Config/ScopeListInterface.php b/lib/internal/Magento/Framework/Config/ScopeListInterface.php
index c45938db93d41..47526c8ca0a86 100644
--- a/lib/internal/Magento/Framework/Config/ScopeListInterface.php
+++ b/lib/internal/Magento/Framework/Config/ScopeListInterface.php
@@ -9,6 +9,7 @@
  * Config scope list interface.
  *
  * @api
+ * @since 100.0.2
  */
 interface ScopeListInterface
 {
diff --git a/lib/internal/Magento/Framework/Config/Theme.php b/lib/internal/Magento/Framework/Config/Theme.php
index 812e61483b77b..a5e216d335ae4 100644
--- a/lib/internal/Magento/Framework/Config/Theme.php
+++ b/lib/internal/Magento/Framework/Config/Theme.php
@@ -11,6 +11,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class Theme
 {
diff --git a/lib/internal/Magento/Framework/Config/ValidationStateInterface.php b/lib/internal/Magento/Framework/Config/ValidationStateInterface.php
index 20869d20b9dc1..6d1199adda5e2 100644
--- a/lib/internal/Magento/Framework/Config/ValidationStateInterface.php
+++ b/lib/internal/Magento/Framework/Config/ValidationStateInterface.php
@@ -9,6 +9,7 @@
  * Config validation state interface.
  *
  * @api
+ * @since 100.0.2
  */
 interface ValidationStateInterface
 {
diff --git a/lib/internal/Magento/Framework/Config/View.php b/lib/internal/Magento/Framework/Config/View.php
index 05863caeec2b6..1f15c71e5ddce 100644
--- a/lib/internal/Magento/Framework/Config/View.php
+++ b/lib/internal/Magento/Framework/Config/View.php
@@ -9,6 +9,7 @@
  * View configuration files handler
  *
  * @api
+ * @since 100.0.2
  */
 class View extends \Magento\Framework\Config\Reader\Filesystem
 {
diff --git a/lib/internal/Magento/Framework/Console/CommandListInterface.php b/lib/internal/Magento/Framework/Console/CommandListInterface.php
index 1547b5b671bfd..104d22cd735bf 100644
--- a/lib/internal/Magento/Framework/Console/CommandListInterface.php
+++ b/lib/internal/Magento/Framework/Console/CommandListInterface.php
@@ -8,6 +8,7 @@
 /**
  * Contains a list of Console commands
  * @api
+ * @since 100.0.2
  */
 interface CommandListInterface
 {
diff --git a/lib/internal/Magento/Framework/Controller/Result/Json.php b/lib/internal/Magento/Framework/Controller/Result/Json.php
index f46d0875c4250..a40cbf8f78200 100644
--- a/lib/internal/Magento/Framework/Controller/Result/Json.php
+++ b/lib/internal/Magento/Framework/Controller/Result/Json.php
@@ -15,6 +15,7 @@
  * Actual for controller actions that serve ajax requests
  *
  * @api
+ * @since 100.0.2
  */
 class Json extends AbstractResult
 {
diff --git a/lib/internal/Magento/Framework/Controller/Result/Redirect.php b/lib/internal/Magento/Framework/Controller/Result/Redirect.php
index 120b18d873cff..02daae818b120 100644
--- a/lib/internal/Magento/Framework/Controller/Result/Redirect.php
+++ b/lib/internal/Magento/Framework/Controller/Result/Redirect.php
@@ -17,6 +17,7 @@
  * so this is a result object that implements all necessary properties of a HTTP redirect
  *
  * @api
+ * @since 100.0.2
  */
 class Redirect extends AbstractResult
 {
diff --git a/lib/internal/Magento/Framework/Controller/Result/RedirectFactory.php b/lib/internal/Magento/Framework/Controller/Result/RedirectFactory.php
index 0e622b1cc5e1a..797fcea4186dc 100644
--- a/lib/internal/Magento/Framework/Controller/Result/RedirectFactory.php
+++ b/lib/internal/Magento/Framework/Controller/Result/RedirectFactory.php
@@ -9,6 +9,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class RedirectFactory
 {
diff --git a/lib/internal/Magento/Framework/Controller/ResultFactory.php b/lib/internal/Magento/Framework/Controller/ResultFactory.php
index bb7ab1c8b6c85..88efcdf8d3386 100644
--- a/lib/internal/Magento/Framework/Controller/ResultFactory.php
+++ b/lib/internal/Magento/Framework/Controller/ResultFactory.php
@@ -12,6 +12,7 @@
  * Result Factory
  *
  * @api
+ * @since 100.0.2
  */
 class ResultFactory
 {
diff --git a/lib/internal/Magento/Framework/Controller/ResultInterface.php b/lib/internal/Magento/Framework/Controller/ResultInterface.php
index f20f32078a9b5..3fe42ae07f566 100644
--- a/lib/internal/Magento/Framework/Controller/ResultInterface.php
+++ b/lib/internal/Magento/Framework/Controller/ResultInterface.php
@@ -14,6 +14,7 @@
  * and be able to set it to the HTTP response
  *
  * @api
+ * @since 100.0.2
  */
 interface ResultInterface
 {
diff --git a/lib/internal/Magento/Framework/Css/PreProcessor/Instruction/MagentoImport.php b/lib/internal/Magento/Framework/Css/PreProcessor/Instruction/MagentoImport.php
index db30eb4844edb..4187650938bf9 100644
--- a/lib/internal/Magento/Framework/Css/PreProcessor/Instruction/MagentoImport.php
+++ b/lib/internal/Magento/Framework/Css/PreProcessor/Instruction/MagentoImport.php
@@ -48,7 +48,7 @@ class MagentoImport implements PreProcessorInterface
 
     /**
      * @var \Magento\Framework\View\Design\Theme\ListInterface
-     * @deprecated 100.1.1
+     * @deprecated 100.0.2
      */
     protected $themeList;
 
diff --git a/lib/internal/Magento/Framework/CurrencyInterface.php b/lib/internal/Magento/Framework/CurrencyInterface.php
index ca042bda849aa..8ddaae5459c78 100644
--- a/lib/internal/Magento/Framework/CurrencyInterface.php
+++ b/lib/internal/Magento/Framework/CurrencyInterface.php
@@ -7,6 +7,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 interface CurrencyInterface
 {
diff --git a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
index 5e061100c4216..d4c6108295809 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
@@ -12,6 +12,7 @@
  * Magento Database Adapter Interface
  *
  * @api
+ * @since 100.0.2
  */
 interface AdapterInterface
 {
diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
index 7db91c06d9649..24ac8fe7f4b52 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -639,7 +639,7 @@ public function query($sql, $bind = [])
      * @throws Zend_Db_Adapter_Exception To re-throw \PDOException.
      * @throws LocalizedException In case multiple queries are attempted at once, to protect from SQL injection
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     public function multiQuery($sql, $bind = [])
     {
@@ -3816,7 +3816,7 @@ protected function _getInsertSqlQuery($tableName, array $columns, array $values,
      * @param array $columns
      * @param array $values
      * @return string
-     * @since 100.2.0
+     * @since 101.0.0
      */
     protected function _getReplaceSqlQuery($tableName, array $columns, array $values)
     {
diff --git a/lib/internal/Magento/Framework/DB/Ddl/Table.php b/lib/internal/Magento/Framework/DB/Ddl/Table.php
index 9d343806d66b3..e812b49f49d23 100644
--- a/lib/internal/Magento/Framework/DB/Ddl/Table.php
+++ b/lib/internal/Magento/Framework/DB/Ddl/Table.php
@@ -11,6 +11,7 @@
  * Data Definition for table
  *
  * @api
+ * @since 100.0.2
  */
 class Table
 {
diff --git a/lib/internal/Magento/Framework/DB/Ddl/Trigger.php b/lib/internal/Magento/Framework/DB/Ddl/Trigger.php
index 94427c3d9c39d..1fd58be46d6c7 100644
--- a/lib/internal/Magento/Framework/DB/Ddl/Trigger.php
+++ b/lib/internal/Magento/Framework/DB/Ddl/Trigger.php
@@ -7,6 +7,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class Trigger
 {
diff --git a/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php b/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php
index 2fee8d55fb673..21192dc1a2dd4 100644
--- a/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php
+++ b/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php
@@ -35,7 +35,7 @@ class BatchRangeIterator implements BatchIteratorInterface
 
     /**
      * @var string
-     * @deprecated unused class property
+     * @deprecated 102.0.0 unused class property
      */
     private $rangeFieldAlias;
 
diff --git a/lib/internal/Magento/Framework/DB/Query/Generator.php b/lib/internal/Magento/Framework/DB/Query/Generator.php
index 0538aec760bd7..af119b16780ee 100644
--- a/lib/internal/Magento/Framework/DB/Query/Generator.php
+++ b/lib/internal/Magento/Framework/DB/Query/Generator.php
@@ -134,7 +134,7 @@ public function generate(
      * @return BatchIteratorInterface
      * @throws LocalizedException Throws if incorrect "FROM" part in \Select exists
      * @see \Magento\Framework\DB\Query\Generator
-     * @deprecated 100.2.0 This is a temporary solution which is made due to the fact that we
+     * @deprecated 100.1.8 This is a temporary solution which is made due to the fact that we
      *             can't change method generate() in version 2.1 due to a backwards incompatibility.
      *             In 2.2 version need to use original method generate() with additional parameter.
      */
diff --git a/lib/internal/Magento/Framework/DB/Select.php b/lib/internal/Magento/Framework/DB/Select.php
index 075aa6b24faa7..7d2799cf50679 100644
--- a/lib/internal/Magento/Framework/DB/Select.php
+++ b/lib/internal/Magento/Framework/DB/Select.php
@@ -28,6 +28,7 @@
  * @method \Magento\Framework\DB\Select distinct($flag = true)
  * @method \Magento\Framework\DB\Select reset($part = null)
  * @method \Magento\Framework\DB\Select columns($cols = '*', $correlationName = null)
+ * @since 100.0.2
  */
 class Select extends \Zend_Db_Select
 {
diff --git a/lib/internal/Magento/Framework/DB/SelectFactory.php b/lib/internal/Magento/Framework/DB/SelectFactory.php
index 3c64e78839c4d..306e649addff8 100644
--- a/lib/internal/Magento/Framework/DB/SelectFactory.php
+++ b/lib/internal/Magento/Framework/DB/SelectFactory.php
@@ -32,7 +32,6 @@ class SelectFactory
     /**
      * @param SelectRenderer $selectRenderer
      * @param array $parts
-     * @since 100.1.0
      */
     public function __construct(
         SelectRenderer $selectRenderer,
diff --git a/lib/internal/Magento/Framework/DB/Sql/ColumnValueExpression.php b/lib/internal/Magento/Framework/DB/Sql/ColumnValueExpression.php
index cf033dbe297f2..b51da7c47936b 100644
--- a/lib/internal/Magento/Framework/DB/Sql/ColumnValueExpression.php
+++ b/lib/internal/Magento/Framework/DB/Sql/ColumnValueExpression.php
@@ -10,7 +10,7 @@
  *
  * Just a wrapper over Expression for implementing the specific type of expression.
  * @api
- * @since 100.2.0
+ * @since 100.1.8
  */
 class ColumnValueExpression extends Expression
 {
diff --git a/lib/internal/Magento/Framework/DB/TemporaryTableService.php b/lib/internal/Magento/Framework/DB/TemporaryTableService.php
index 881ebbe5c85ad..750b65217e50f 100644
--- a/lib/internal/Magento/Framework/DB/TemporaryTableService.php
+++ b/lib/internal/Magento/Framework/DB/TemporaryTableService.php
@@ -12,7 +12,7 @@
  * Use this class to create an index with that you want to query later for quick data access
  *
  * @api
- * @since 100.2.0
+ * @since 100.1.8
  */
 class TemporaryTableService
 {
@@ -43,7 +43,6 @@ class TemporaryTableService
      * @param \Magento\Framework\Math\Random $random
      * @param string[] $allowedIndexMethods
      * @param string[] $allowedEngines
-     * @since 100.2.0
      */
     public function __construct(
         \Magento\Framework\Math\Random $random,
@@ -79,7 +78,7 @@ public function __construct(
      * @param string $dbEngine
      * @return string
      * @throws \InvalidArgumentException
-     * @since 100.2.0
+     * @since 100.1.8
      */
     public function createFromSelect(
         Select $select,
@@ -150,7 +149,7 @@ public function createFromSelect(
      *
      * @param string $name
      * @return bool
-     * @since 100.2.0
+     * @since 100.1.8
      */
     public function dropTable($name)
     {
diff --git a/lib/internal/Magento/Framework/DB/Tree.php b/lib/internal/Magento/Framework/DB/Tree.php
index 1aeaf122131f6..6fbd014213bc8 100644
--- a/lib/internal/Magento/Framework/DB/Tree.php
+++ b/lib/internal/Magento/Framework/DB/Tree.php
@@ -18,7 +18,7 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * phpcs:ignoreFile
  *
- * @deprecated Not used anymore.
+ * @deprecated 102.0.0 Not used anymore.
  */
 class Tree
 {
@@ -82,7 +82,7 @@ class Tree
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      *
-     * @deprecated Not used anymore.
+     * @deprecated 102.0.0 Not used anymore.
      */
     public function __construct($config = [])
     {
@@ -156,7 +156,7 @@ public function __construct($config = [])
      * @param string $name
      * @return $this
      *
-     * @deprecated Not used anymore.
+     * @deprecated 102.0.0 Not used anymore.
      */
     public function setIdField($name)
     {
@@ -170,7 +170,7 @@ public function setIdField($name)
      * @param string $name
      * @return $this
      *
-     * @deprecated Not used anymore.
+     * @deprecated 102.0.0 Not used anymore.
      */
     public function setLeftField($name)
     {
@@ -184,7 +184,7 @@ public function setLeftField($name)
      * @param string $name
      * @return $this
      *
-     * @deprecated Not used anymore.
+     * @deprecated 102.0.0 Not used anymore.
      */
     public function setRightField($name)
     {
@@ -198,7 +198,7 @@ public function setRightField($name)
      * @param string $name
      * @return $this
      *
-     * @deprecated Not used anymore.
+     * @deprecated 102.0.0 Not used anymore.
      */
     public function setLevelField($name)
     {
@@ -212,7 +212,7 @@ public function setLevelField($name)
      * @param string $name
      * @return $this
      *
-     * @deprecated Not used anymore.
+     * @deprecated 102.0.0 Not used anymore.
      */
     public function setPidField($name)
     {
@@ -226,7 +226,7 @@ public function setPidField($name)
      * @param string $name
      * @return $this
      *
-     * @deprecated Not used anymore.
+     * @deprecated 102.0.0 Not used anymore.
      */
     public function setTable($name)
     {
@@ -237,7 +237,7 @@ public function setTable($name)
     /**
      * @return array
      *
-     * @deprecated Not used anymore.
+     * @deprecated 102.0.0 Not used anymore.
      */
     public function getKeys()
     {
@@ -256,7 +256,7 @@ public function getKeys()
      * @param array $data
      * @return string
      *
-     * @deprecated Not used anymore.
+     * @deprecated 102.0.0 Not used anymore.
      */
     public function clear($data = [])
     {
@@ -283,7 +283,7 @@ public function clear($data = [])
      * @param string|int $nodeId
      * @return array
      *
-     * @deprecated Not used anymore.
+     * @deprecated 102.0.0 Not used anymore.
      */
     public function getNodeInfo($nodeId)
     {
@@ -303,7 +303,7 @@ public function getNodeInfo($nodeId)
      * @param array $data
      * @return false|string
      *
-     * @deprecated Not used anymore.
+     * @deprecated 102.0.0 Not used anymore.
      */
     public function appendChild($nodeId, $data)
     {
@@ -371,7 +371,7 @@ public function appendChild($nodeId, $data)
     /**
      * @return array
      *
-     * @deprecated Not used anymore.
+     * @deprecated 102.0.0 Not used anymore.
      */
     public function checkNodes()
     {
@@ -403,7 +403,7 @@ public function checkNodes()
      * @param string|int $nodeId
      * @return bool|Node|void
      *
-     * @deprecated Not used anymore.
+     * @deprecated 102.0.0 Not used anymore.
      */
     public function removeNode($nodeId)
     {
@@ -479,7 +479,7 @@ public function removeNode($nodeId)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      *
-     * @deprecated Not used anymore.
+     * @deprecated 102.0.0 Not used anymore.
      */
     public function moveNode($eId, $pId, $aId = 0)
     {
@@ -815,7 +815,7 @@ public function moveNode($eId, $pId, $aId = 0)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      *
-     * @deprecated Not used anymore.
+     * @deprecated 102.0.0 Not used anymore.
      */
     public function moveNodes($eId, $pId, $aId = 0)
     {
@@ -1015,7 +1015,7 @@ public function moveNodes($eId, $pId, $aId = 0)
      * @param string $fields
      * @return void
      *
-     * @deprecated Not used anymore.
+     * @deprecated 102.0.0 Not used anymore.
      */
     public function addTable($tableName, $joinCondition, $fields = '*')
     {
@@ -1026,7 +1026,7 @@ public function addTable($tableName, $joinCondition, $fields = '*')
      * @param Select $select
      * @return void
      *
-     * @deprecated Not used anymore.
+     * @deprecated 102.0.0 Not used anymore.
      */
     protected function _addExtTablesToSelect(Select &$select)
     {
@@ -1041,7 +1041,7 @@ protected function _addExtTablesToSelect(Select &$select)
      * @param int $endLevel
      * @return NodeSet
      *
-     * @deprecated Not used anymore.
+     * @deprecated 102.0.0 Not used anymore.
      */
     public function getChildren($nodeId, $startLevel = 0, $endLevel = 0)
     {
@@ -1088,7 +1088,7 @@ public function getChildren($nodeId, $startLevel = 0, $endLevel = 0)
      * @param string|int $nodeId
      * @return Node
      *
-     * @deprecated Not used anymore.
+     * @deprecated 102.0.0 Not used anymore.
      */
     public function getNode($nodeId)
     {
diff --git a/lib/internal/Magento/Framework/DB/Tree/Node.php b/lib/internal/Magento/Framework/DB/Tree/Node.php
index eb954a696e21e..507a09476abba 100644
--- a/lib/internal/Magento/Framework/DB/Tree/Node.php
+++ b/lib/internal/Magento/Framework/DB/Tree/Node.php
@@ -11,7 +11,7 @@
 /**
  * @SuppressWarnings(PHPMD.UnusedPrivateField)
  *
- * @deprecated Not used anymore.
+ * @deprecated 102.0.0 Not used anymore.
  */
 class Node
 {
@@ -53,14 +53,14 @@ class Node
     /**
      * @var bool
      *
-     * @deprecated
+     * @deprecated 102.0.0
      */
     public $hasChild = false;
 
     /**
      * @var float|int
      *
-     * @deprecated
+     * @deprecated 102.0.0
      */
     public $numChild = 0;
 
@@ -69,7 +69,7 @@ class Node
      * @param array $keys
      * @throws LocalizedException
      *
-     * @deprecated
+     * @deprecated 102.0.0
      */
     public function __construct($nodeData, $keys)
     {
@@ -103,7 +103,7 @@ public function __construct($nodeData, $keys)
      * @param string $name
      * @return null|array
      *
-     * @deprecated
+     * @deprecated 102.0.0
      */
     public function getData($name)
     {
@@ -117,7 +117,7 @@ public function getData($name)
     /**
      * @return int
      *
-     * @deprecated
+     * @deprecated 102.0.0
      */
     public function getLevel()
     {
@@ -127,7 +127,7 @@ public function getLevel()
     /**
      * @return int
      *
-     * @deprecated
+     * @deprecated 102.0.0
      */
     public function getLeft()
     {
@@ -137,7 +137,7 @@ public function getLeft()
     /**
      * @return int
      *
-     * @deprecated
+     * @deprecated 102.0.0
      */
     public function getRight()
     {
@@ -147,7 +147,7 @@ public function getRight()
     /**
      * @return string|int
      *
-     * @deprecated
+     * @deprecated 102.0.0
      */
     public function getPid()
     {
@@ -157,7 +157,7 @@ public function getPid()
     /**
      * @return string|int
      *
-     * @deprecated
+     * @deprecated 102.0.0
      */
     public function getId()
     {
@@ -169,7 +169,7 @@ public function getId()
      *
      * @return bool
      *
-     * @deprecated
+     * @deprecated 102.0.0
      */
     public function isParent()
     {
diff --git a/lib/internal/Magento/Framework/DB/Tree/NodeSet.php b/lib/internal/Magento/Framework/DB/Tree/NodeSet.php
index 75e677b77ae45..e861a90f7cd0d 100644
--- a/lib/internal/Magento/Framework/DB/Tree/NodeSet.php
+++ b/lib/internal/Magento/Framework/DB/Tree/NodeSet.php
@@ -8,7 +8,7 @@
 /**
  * TODO implements iterators
  *
- * @deprecated Not used anymore.
+ * @deprecated 102.0.0 Not used anymore.
  */
 class NodeSet implements \Iterator, \Countable
 {
@@ -35,7 +35,7 @@ class NodeSet implements \Iterator, \Countable
     /**
      * Constructor
      *
-     * @deprecated
+     * @deprecated 102.0.0
      */
     public function __construct()
     {
@@ -49,7 +49,7 @@ public function __construct()
      * @param Node $node
      * @return int
      *
-     * @deprecated
+     * @deprecated 102.0.0
      */
     public function addNode(Node $node)
     {
@@ -61,7 +61,7 @@ public function addNode(Node $node)
     /**
      * @return int
      *
-     * @deprecated
+     * @deprecated 102.0.0
      */
     public function count()
     {
@@ -71,7 +71,7 @@ public function count()
     /**
      * @return bool
      *
-     * @deprecated
+     * @deprecated 102.0.0
      */
     public function valid()
     {
@@ -81,7 +81,7 @@ public function valid()
     /**
      * @return false|int
      *
-     * @deprecated
+     * @deprecated 102.0.0
      */
     public function next()
     {
@@ -95,7 +95,7 @@ public function next()
     /**
      * @return int
      *
-     * @deprecated
+     * @deprecated 102.0.0
      */
     public function key()
     {
@@ -105,7 +105,7 @@ public function key()
     /**
      * @return Node
      *
-     * @deprecated
+     * @deprecated 102.0.0
      */
     public function current()
     {
@@ -115,7 +115,7 @@ public function current()
     /**
      * @return void
      *
-     * @deprecated
+     * @deprecated 102.0.0
      */
     public function rewind()
     {
diff --git a/lib/internal/Magento/Framework/Data/AbstractSearchResult.php b/lib/internal/Magento/Framework/Data/AbstractSearchResult.php
index f9272683005ce..05c8e39f52465 100644
--- a/lib/internal/Magento/Framework/Data/AbstractSearchResult.php
+++ b/lib/internal/Magento/Framework/Data/AbstractSearchResult.php
@@ -64,7 +64,7 @@ abstract class AbstractSearchResult extends AbstractDataObject implements Search
     
     /**
      * @var \Magento\Framework\DB\Select
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected $select;
 
diff --git a/lib/internal/Magento/Framework/Data/Argument/InterpreterInterface.php b/lib/internal/Magento/Framework/Data/Argument/InterpreterInterface.php
index 2deabdf9829ae..178efc3b23463 100644
--- a/lib/internal/Magento/Framework/Data/Argument/InterpreterInterface.php
+++ b/lib/internal/Magento/Framework/Data/Argument/InterpreterInterface.php
@@ -9,6 +9,7 @@
  * Interface that encapsulates complexity of expression computation
  *
  * @api
+ * @since 100.0.2
  */
 interface InterpreterInterface
 {
diff --git a/lib/internal/Magento/Framework/Data/Collection.php b/lib/internal/Magento/Framework/Data/Collection.php
index 7c9cf02ac6a47..51a066f2660dd 100644
--- a/lib/internal/Magento/Framework/Data/Collection.php
+++ b/lib/internal/Magento/Framework/Data/Collection.php
@@ -18,6 +18,7 @@
  * TODO: Refactor use of \Magento\Framework\Option\ArrayInterface in library.
  *
  * @api
+ * @since 100.0.2
  */
 class Collection implements \IteratorAggregate, \Countable, ArrayInterface, CollectionDataSourceInterface
 {
diff --git a/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php b/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php
index 8a22c9a1ce4fc..b829f063ac2de 100644
--- a/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php
+++ b/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php
@@ -19,6 +19,7 @@
  * phpcs:disable Magento2.Classes.AbstractApi
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @since 100.0.2
  */
 abstract class AbstractDb extends \Magento\Framework\Data\Collection
 {
diff --git a/lib/internal/Magento/Framework/Data/Collection/Filesystem.php b/lib/internal/Magento/Framework/Data/Collection/Filesystem.php
index 629b992b32cfd..6103a7df5bf0d 100644
--- a/lib/internal/Magento/Framework/Data/Collection/Filesystem.php
+++ b/lib/internal/Magento/Framework/Data/Collection/Filesystem.php
@@ -25,6 +25,7 @@
  * At least one target directory must be set
  *
  * @api
+ * @since 100.0.2
  */
 class Filesystem extends \Magento\Framework\Data\Collection
 {
diff --git a/lib/internal/Magento/Framework/Data/Form.php b/lib/internal/Magento/Framework/Data/Form.php
index abeda0c17542e..a9cdfbf5f9ae7 100644
--- a/lib/internal/Magento/Framework/Data/Form.php
+++ b/lib/internal/Magento/Framework/Data/Form.php
@@ -16,6 +16,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class Form extends \Magento\Framework\Data\Form\AbstractForm
 {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
index fc1f2dd890cab..33f2c215b63bb 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/AbstractElement.php
@@ -20,6 +20,7 @@
  * @api
  * @author     Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.NumberOfChildren)
+ * @since 100.0.2
  */
 abstract class AbstractElement extends AbstractForm
 {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Fieldset.php b/lib/internal/Magento/Framework/Data/Form/Element/Fieldset.php
index 90482ab55fc71..d2c44c0f112a6 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Fieldset.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Fieldset.php
@@ -13,6 +13,7 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @since 100.0.2
  */
 class Fieldset extends AbstractElement
 {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Renderer/RendererInterface.php b/lib/internal/Magento/Framework/Data/Form/Element/Renderer/RendererInterface.php
index 6cd22e0f50d5e..18a0d30ba3a6d 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Renderer/RendererInterface.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Renderer/RendererInterface.php
@@ -13,6 +13,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 interface RendererInterface
 {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Select.php b/lib/internal/Magento/Framework/Data/Form/Element/Select.php
index c9529af80124f..e0563c6fa75ad 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Select.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Select.php
@@ -15,6 +15,7 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @since 100.0.2
  */
 class Select extends AbstractElement
 {
diff --git a/lib/internal/Magento/Framework/Data/Form/Filter/FilterInterface.php b/lib/internal/Magento/Framework/Data/Form/Filter/FilterInterface.php
index f7205fd6946a2..a9bf479cfce05 100644
--- a/lib/internal/Magento/Framework/Data/Form/Filter/FilterInterface.php
+++ b/lib/internal/Magento/Framework/Data/Form/Filter/FilterInterface.php
@@ -13,6 +13,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 interface FilterInterface
 {
diff --git a/lib/internal/Magento/Framework/Data/Form/FormKey.php b/lib/internal/Magento/Framework/Data/Form/FormKey.php
index 355460902eee6..2f8c6724f7a2e 100644
--- a/lib/internal/Magento/Framework/Data/Form/FormKey.php
+++ b/lib/internal/Magento/Framework/Data/Form/FormKey.php
@@ -13,6 +13,7 @@
  * @api
  *
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ * @since 100.0.2
  */
 class FormKey
 {
diff --git a/lib/internal/Magento/Framework/Data/Form/FormKey/Validator.php b/lib/internal/Magento/Framework/Data/Form/FormKey/Validator.php
index 225ff1fd140a9..a99692ed31609 100644
--- a/lib/internal/Magento/Framework/Data/Form/FormKey/Validator.php
+++ b/lib/internal/Magento/Framework/Data/Form/FormKey/Validator.php
@@ -9,6 +9,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class Validator
 {
diff --git a/lib/internal/Magento/Framework/Data/OptionSourceInterface.php b/lib/internal/Magento/Framework/Data/OptionSourceInterface.php
index aac9a266c7957..6d0955f294072 100644
--- a/lib/internal/Magento/Framework/Data/OptionSourceInterface.php
+++ b/lib/internal/Magento/Framework/Data/OptionSourceInterface.php
@@ -9,6 +9,7 @@
  * Source of option values in a form of value-label pairs
  *
  * @api
+ * @since 100.0.2
  */
 interface OptionSourceInterface
 {
diff --git a/lib/internal/Magento/Framework/Data/Tree.php b/lib/internal/Magento/Framework/Data/Tree.php
index b458338184885..14197eb20c00c 100644
--- a/lib/internal/Magento/Framework/Data/Tree.php
+++ b/lib/internal/Magento/Framework/Data/Tree.php
@@ -13,6 +13,7 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @since 100.0.2
  */
 class Tree
 {
diff --git a/lib/internal/Magento/Framework/Data/Tree/Node.php b/lib/internal/Magento/Framework/Data/Tree/Node.php
index f1901b71f21e6..ac0ac57e72969 100644
--- a/lib/internal/Magento/Framework/Data/Tree/Node.php
+++ b/lib/internal/Magento/Framework/Data/Tree/Node.php
@@ -13,6 +13,7 @@
  *
  * @api
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @since 100.0.2
  */
 class Node extends \Magento\Framework\DataObject
 {
diff --git a/lib/internal/Magento/Framework/Data/Tree/Node/Collection.php b/lib/internal/Magento/Framework/Data/Tree/Node/Collection.php
index 94990c0340a83..cf6529988eb44 100644
--- a/lib/internal/Magento/Framework/Data/Tree/Node/Collection.php
+++ b/lib/internal/Magento/Framework/Data/Tree/Node/Collection.php
@@ -16,6 +16,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class Collection implements \ArrayAccess, \IteratorAggregate, \Countable
 {
diff --git a/lib/internal/Magento/Framework/Data/Wysiwyg/ConfigProviderInterface.php b/lib/internal/Magento/Framework/Data/Wysiwyg/ConfigProviderInterface.php
index dc1dabd42d9e8..07fbd302ac573 100644
--- a/lib/internal/Magento/Framework/Data/Wysiwyg/ConfigProviderInterface.php
+++ b/lib/internal/Magento/Framework/Data/Wysiwyg/ConfigProviderInterface.php
@@ -10,12 +10,14 @@
 /**
  * Interface ConfigProviderInterface
  * @api
+ * @since 102.0.0
  */
 interface ConfigProviderInterface
 {
     /**
      * @param \Magento\Framework\DataObject $config
      * @return \Magento\Framework\DataObject
+     * @since 102.0.0
      */
     public function getConfig(\Magento\Framework\DataObject $config) : \Magento\Framework\DataObject;
 }
diff --git a/lib/internal/Magento/Framework/DataObject.php b/lib/internal/Magento/Framework/DataObject.php
index 6ecbca133e22a..11452c49fa162 100644
--- a/lib/internal/Magento/Framework/DataObject.php
+++ b/lib/internal/Magento/Framework/DataObject.php
@@ -10,6 +10,7 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.NumberOfChildren)
+ * @since 100.0.2
  */
 class DataObject implements \ArrayAccess
 {
diff --git a/lib/internal/Magento/Framework/DataObject/Copy.php b/lib/internal/Magento/Framework/DataObject/Copy.php
index e8bc194a1d983..7a400ac449577 100644
--- a/lib/internal/Magento/Framework/DataObject/Copy.php
+++ b/lib/internal/Magento/Framework/DataObject/Copy.php
@@ -268,7 +268,7 @@ protected function _setFieldsetFieldValue($target, $targetCode, $value)
      * @return mixed
      * @throws \InvalidArgumentException
      *
-     * @deprecated
+     * @deprecated 102.0.3
      * @see \Magento\Framework\DataObject\Copy::getAttributeValueFromExtensibleObject
      */
     protected function getAttributeValueFromExtensibleDataObject($source, $code)
@@ -325,7 +325,7 @@ private function getAttributeValueFromExtensibleObject(ExtensibleDataInterface $
      * @return void
      * @throws \InvalidArgumentException
      *
-     * @deprecated
+     * @deprecated 102.0.3
      * @see \Magento\Framework\DataObject\Copy::setAttributeValueFromExtensibleObject
      */
     protected function setAttributeValueFromExtensibleDataObject(ExtensibleDataInterface $target, $code, $value)
diff --git a/lib/internal/Magento/Framework/Encryption/Crypt.php b/lib/internal/Magento/Framework/Encryption/Crypt.php
index 930cfa7a44f68..55f4d1a31f53d 100644
--- a/lib/internal/Magento/Framework/Encryption/Crypt.php
+++ b/lib/internal/Magento/Framework/Encryption/Crypt.php
@@ -12,7 +12,8 @@
  * Class encapsulates cryptographic algorithm
  *
  * @api
- * @deprecated
+ * @deprecated 102.0.0
+ * @since 100.0.2
  */
 class Crypt
 {
diff --git a/lib/internal/Magento/Framework/Encryption/EncryptorInterface.php b/lib/internal/Magento/Framework/Encryption/EncryptorInterface.php
index 778cfcb897e0b..61d546daf3796 100644
--- a/lib/internal/Magento/Framework/Encryption/EncryptorInterface.php
+++ b/lib/internal/Magento/Framework/Encryption/EncryptorInterface.php
@@ -9,6 +9,7 @@
  * Encryptor interface
  *
  * @api
+ * @since 100.0.2
  */
 interface EncryptorInterface
 {
diff --git a/lib/internal/Magento/Framework/Encryption/Helper/Security.php b/lib/internal/Magento/Framework/Encryption/Helper/Security.php
index 0320468b35f02..52597c6a028b4 100644
--- a/lib/internal/Magento/Framework/Encryption/Helper/Security.php
+++ b/lib/internal/Magento/Framework/Encryption/Helper/Security.php
@@ -12,6 +12,7 @@
  * Class implements compareString from Laminas\Crypt
  *
  * @api
+ * @since 100.0.2
  */
 class Security
 {
diff --git a/lib/internal/Magento/Framework/Encryption/UrlCoder.php b/lib/internal/Magento/Framework/Encryption/UrlCoder.php
index 12e3bb27b6724..f63e64bb66e6c 100644
--- a/lib/internal/Magento/Framework/Encryption/UrlCoder.php
+++ b/lib/internal/Magento/Framework/Encryption/UrlCoder.php
@@ -8,6 +8,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class UrlCoder
 {
diff --git a/lib/internal/Magento/Framework/EntityManager/MetadataPool.php b/lib/internal/Magento/Framework/EntityManager/MetadataPool.php
index dc295b97c1d28..d787daf3d1181 100644
--- a/lib/internal/Magento/Framework/EntityManager/MetadataPool.php
+++ b/lib/internal/Magento/Framework/EntityManager/MetadataPool.php
@@ -46,7 +46,6 @@ class MetadataPool
      * @param ObjectManagerInterface $objectManager
      * @param SequenceFactory $sequenceFactory
      * @param array $metadata
-     * @since 100.1.0
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/Create.php b/lib/internal/Magento/Framework/EntityManager/Operation/Create.php
index ae9001be9e34f..a24ec39a2156d 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/Create.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/Create.php
@@ -142,7 +142,7 @@ public function execute($entity, $arguments = [])
     /**
      * @return SequenceApplier
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     private function getSequenceApplier()
     {
diff --git a/lib/internal/Magento/Framework/Escaper.php b/lib/internal/Magento/Framework/Escaper.php
index 6af03a868cc49..9c67d2e891345 100644
--- a/lib/internal/Magento/Framework/Escaper.php
+++ b/lib/internal/Magento/Framework/Escaper.php
@@ -10,6 +10,7 @@
  * Magento escape methods
  *
  * @api
+ * @since 100.0.2
  */
 class Escaper
 {
@@ -252,7 +253,7 @@ private function escapeAttributeValue($name, $value)
      * @param string $string
      * @param boolean $escapeSingleQuote
      * @return string
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function escapeHtmlAttr($string, $escapeSingleQuote = true)
     {
@@ -278,7 +279,7 @@ public function escapeUrl($string)
      *
      * @param string $string
      * @return string
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function encodeUrlParam($string)
     {
@@ -290,7 +291,7 @@ public function encodeUrlParam($string)
      *
      * @param string $string
      * @return string
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function escapeJs($string)
     {
@@ -317,7 +318,7 @@ function ($matches) {
      *
      * @param string $string
      * @return string
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function escapeCss($string)
     {
@@ -330,7 +331,7 @@ public function escapeCss($string)
      * @param string|string[]|array $data
      * @param string $quote
      * @return string|array
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     public function escapeJsQuote($data, $quote = '\'')
     {
@@ -350,7 +351,7 @@ public function escapeJsQuote($data, $quote = '\'')
      *
      * @param string $data
      * @return string
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     public function escapeXssInUrl($data)
     {
@@ -398,7 +399,7 @@ private function escapeScriptIdentifiers(string $data): string
      * @param string $data
      * @param bool $addSlashes
      * @return string
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     public function escapeQuote($data, $addSlashes = false)
     {
@@ -412,7 +413,7 @@ public function escapeQuote($data, $addSlashes = false)
      * Get escaper
      *
      * @return \Magento\Framework\ZendEscaper
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     private function getEscaper()
     {
@@ -427,7 +428,7 @@ private function getEscaper()
      * Get logger
      *
      * @return \Psr\Log\LoggerInterface
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     private function getLogger()
     {
diff --git a/lib/internal/Magento/Framework/Event.php b/lib/internal/Magento/Framework/Event.php
index c7b15a8eb0722..9df9c315ccad8 100644
--- a/lib/internal/Magento/Framework/Event.php
+++ b/lib/internal/Magento/Framework/Event.php
@@ -13,6 +13,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class Event extends \Magento\Framework\DataObject
 {
diff --git a/lib/internal/Magento/Framework/Event/Observer.php b/lib/internal/Magento/Framework/Event/Observer.php
index 4b5dc47795e6c..f3d954d641dfd 100644
--- a/lib/internal/Magento/Framework/Event/Observer.php
+++ b/lib/internal/Magento/Framework/Event/Observer.php
@@ -9,6 +9,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class Observer extends \Magento\Framework\DataObject
 {
diff --git a/lib/internal/Magento/Framework/Event/Observer/Collection.php b/lib/internal/Magento/Framework/Event/Observer/Collection.php
index c108d422cc9ca..595ee8f70da3a 100644
--- a/lib/internal/Magento/Framework/Event/Observer/Collection.php
+++ b/lib/internal/Magento/Framework/Event/Observer/Collection.php
@@ -13,6 +13,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class Collection
 {
diff --git a/lib/internal/Magento/Framework/Event/ObserverInterface.php b/lib/internal/Magento/Framework/Event/ObserverInterface.php
index e7c9b770ea1f5..e07de37c0e15b 100644
--- a/lib/internal/Magento/Framework/Event/ObserverInterface.php
+++ b/lib/internal/Magento/Framework/Event/ObserverInterface.php
@@ -11,6 +11,7 @@
  * Interface \Magento\Framework\Event\ObserverInterface
  *
  * @api
+ * @since 100.0.2
  */
 interface ObserverInterface
 {
diff --git a/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php b/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php
index ff142c5319006..7cc968789e4e2 100644
--- a/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php
+++ b/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php
@@ -10,6 +10,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 abstract class AbstractAggregateException extends LocalizedException implements AggregateExceptionInterface
 {
@@ -81,6 +82,7 @@ public function addError(Phrase $phrase)
     /**
      * @param LocalizedException $exception
      * @return $this
+     * @since 101.0.6
      */
     public function addException(LocalizedException $exception)
     {
diff --git a/lib/internal/Magento/Framework/Exception/AggregateExceptionInterface.php b/lib/internal/Magento/Framework/Exception/AggregateExceptionInterface.php
index d7b6f6fce3f8f..d1a9846b9cc3c 100644
--- a/lib/internal/Magento/Framework/Exception/AggregateExceptionInterface.php
+++ b/lib/internal/Magento/Framework/Exception/AggregateExceptionInterface.php
@@ -10,6 +10,7 @@
  * not mandating to inherit from AbstractAggregateException class
  *
  * @api
+ * @since 101.0.7
  */
 interface AggregateExceptionInterface
 {
@@ -20,6 +21,7 @@ interface AggregateExceptionInterface
      * @see the \Magento\Framework\Webapi\Exception which receives $errors as a set of Localized Exceptions
      *
      * @return LocalizedException[]
+     * @since 101.0.7
      */
     public function getErrors();
 }
diff --git a/lib/internal/Magento/Framework/Exception/AlreadyExistsException.php b/lib/internal/Magento/Framework/Exception/AlreadyExistsException.php
index eaef391521979..e64f147a13ea7 100644
--- a/lib/internal/Magento/Framework/Exception/AlreadyExistsException.php
+++ b/lib/internal/Magento/Framework/Exception/AlreadyExistsException.php
@@ -9,6 +9,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class AlreadyExistsException extends LocalizedException
 {
@@ -16,7 +17,6 @@ class AlreadyExistsException extends LocalizedException
      * @param Phrase $phrase
      * @param \Exception $cause
      * @param int $code
-     * @since 100.2.0
      */
     public function __construct(Phrase $phrase = null, \Exception $cause = null, $code = 0)
     {
diff --git a/lib/internal/Magento/Framework/Exception/AuthenticationException.php b/lib/internal/Magento/Framework/Exception/AuthenticationException.php
index 9b20dea99ccf9..b16c1f5841c3d 100644
--- a/lib/internal/Magento/Framework/Exception/AuthenticationException.php
+++ b/lib/internal/Magento/Framework/Exception/AuthenticationException.php
@@ -9,6 +9,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class AuthenticationException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Exception/AuthorizationException.php b/lib/internal/Magento/Framework/Exception/AuthorizationException.php
index ed310117d6717..9cc6b4d8094bc 100644
--- a/lib/internal/Magento/Framework/Exception/AuthorizationException.php
+++ b/lib/internal/Magento/Framework/Exception/AuthorizationException.php
@@ -10,6 +10,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class AuthorizationException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Exception/BulkException.php b/lib/internal/Magento/Framework/Exception/BulkException.php
index 168e910e0d375..a7ec480341542 100644
--- a/lib/internal/Magento/Framework/Exception/BulkException.php
+++ b/lib/internal/Magento/Framework/Exception/BulkException.php
@@ -12,6 +12,7 @@
  * Exception thrown while processing bulk of entities
  *
  * @api
+ * @since 101.0.7
  */
 class BulkException extends AbstractAggregateException
 {
@@ -42,6 +43,7 @@ public function __construct(Phrase $phrase = null, \Exception $cause = null, $co
      * Add data
      *
      * @param array $data
+     * @since 101.0.7
      */
     public function addData($data)
     {
@@ -52,6 +54,7 @@ public function addData($data)
      * Retrieve data
      *
      * @return array
+     * @since 101.0.7
      */
     public function getData()
     {
diff --git a/lib/internal/Magento/Framework/Exception/CouldNotDeleteException.php b/lib/internal/Magento/Framework/Exception/CouldNotDeleteException.php
index af8e4c3c0ec57..d22a9168e1d01 100644
--- a/lib/internal/Magento/Framework/Exception/CouldNotDeleteException.php
+++ b/lib/internal/Magento/Framework/Exception/CouldNotDeleteException.php
@@ -7,6 +7,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class CouldNotDeleteException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Exception/CouldNotSaveException.php b/lib/internal/Magento/Framework/Exception/CouldNotSaveException.php
index ea265864afd24..b0480c49d2940 100644
--- a/lib/internal/Magento/Framework/Exception/CouldNotSaveException.php
+++ b/lib/internal/Magento/Framework/Exception/CouldNotSaveException.php
@@ -8,6 +8,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class CouldNotSaveException extends AbstractAggregateException
 {
diff --git a/lib/internal/Magento/Framework/Exception/CronException.php b/lib/internal/Magento/Framework/Exception/CronException.php
index 22d23526a6558..feff3f3cb95a4 100644
--- a/lib/internal/Magento/Framework/Exception/CronException.php
+++ b/lib/internal/Magento/Framework/Exception/CronException.php
@@ -7,6 +7,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class CronException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Exception/EmailNotConfirmedException.php b/lib/internal/Magento/Framework/Exception/EmailNotConfirmedException.php
index 330f34fb565ce..1a114f19d731e 100644
--- a/lib/internal/Magento/Framework/Exception/EmailNotConfirmedException.php
+++ b/lib/internal/Magento/Framework/Exception/EmailNotConfirmedException.php
@@ -7,6 +7,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class EmailNotConfirmedException extends AuthenticationException
 {
diff --git a/lib/internal/Magento/Framework/Exception/FileSystemException.php b/lib/internal/Magento/Framework/Exception/FileSystemException.php
index 6c85314b6f2a6..81078ae7cd31c 100644
--- a/lib/internal/Magento/Framework/Exception/FileSystemException.php
+++ b/lib/internal/Magento/Framework/Exception/FileSystemException.php
@@ -9,6 +9,7 @@
  * Magento filesystem exception
  *
  * @api
+ * @since 100.0.2
  */
 class FileSystemException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Exception/InputException.php b/lib/internal/Magento/Framework/Exception/InputException.php
index 7b1815dc0d1bb..f85baf4c9b0b9 100644
--- a/lib/internal/Magento/Framework/Exception/InputException.php
+++ b/lib/internal/Magento/Framework/Exception/InputException.php
@@ -12,6 +12,7 @@
  * Exception to be thrown when there is an issue with the Input to a function call.
  *
  * @api
+ * @since 100.0.2
  */
 class InputException extends AbstractAggregateException
 {
diff --git a/lib/internal/Magento/Framework/Exception/IntegrationException.php b/lib/internal/Magento/Framework/Exception/IntegrationException.php
index 9adf9c740f0e2..56db6caecacf2 100644
--- a/lib/internal/Magento/Framework/Exception/IntegrationException.php
+++ b/lib/internal/Magento/Framework/Exception/IntegrationException.php
@@ -7,6 +7,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class IntegrationException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Exception/InvalidEmailOrPasswordException.php b/lib/internal/Magento/Framework/Exception/InvalidEmailOrPasswordException.php
index ba5b7d94f5328..38e69f0476b77 100644
--- a/lib/internal/Magento/Framework/Exception/InvalidEmailOrPasswordException.php
+++ b/lib/internal/Magento/Framework/Exception/InvalidEmailOrPasswordException.php
@@ -7,6 +7,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class InvalidEmailOrPasswordException extends AuthenticationException
 {
diff --git a/lib/internal/Magento/Framework/Exception/LocalizedException.php b/lib/internal/Magento/Framework/Exception/LocalizedException.php
index 977c69db77bbc..b279fe65906a3 100644
--- a/lib/internal/Magento/Framework/Exception/LocalizedException.php
+++ b/lib/internal/Magento/Framework/Exception/LocalizedException.php
@@ -14,6 +14,7 @@
  * Localized exception
  *
  * @api
+ * @since 100.0.2
  */
 class LocalizedException extends \Exception
 {
diff --git a/lib/internal/Magento/Framework/Exception/MailException.php b/lib/internal/Magento/Framework/Exception/MailException.php
index 1475ba04257c9..708f03adbe7b0 100644
--- a/lib/internal/Magento/Framework/Exception/MailException.php
+++ b/lib/internal/Magento/Framework/Exception/MailException.php
@@ -9,6 +9,7 @@
  * Magento mail exception
  *
  * @api
+ * @since 100.0.2
  */
 class MailException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Exception/NoSuchEntityException.php b/lib/internal/Magento/Framework/Exception/NoSuchEntityException.php
index 42b30d45e4c72..f39fef57ed568 100644
--- a/lib/internal/Magento/Framework/Exception/NoSuchEntityException.php
+++ b/lib/internal/Magento/Framework/Exception/NoSuchEntityException.php
@@ -11,6 +11,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class NoSuchEntityException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Exception/NotFoundException.php b/lib/internal/Magento/Framework/Exception/NotFoundException.php
index 40e02e70fa37c..cfc02f4f516d6 100644
--- a/lib/internal/Magento/Framework/Exception/NotFoundException.php
+++ b/lib/internal/Magento/Framework/Exception/NotFoundException.php
@@ -7,6 +7,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class NotFoundException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Exception/PaymentException.php b/lib/internal/Magento/Framework/Exception/PaymentException.php
index 83b189d020ee3..fb52401229ba4 100644
--- a/lib/internal/Magento/Framework/Exception/PaymentException.php
+++ b/lib/internal/Magento/Framework/Exception/PaymentException.php
@@ -7,6 +7,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class PaymentException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Exception/Plugin/AuthenticationException.php b/lib/internal/Magento/Framework/Exception/Plugin/AuthenticationException.php
index 2a5564181d43f..4d559a548eff6 100644
--- a/lib/internal/Magento/Framework/Exception/Plugin/AuthenticationException.php
+++ b/lib/internal/Magento/Framework/Exception/Plugin/AuthenticationException.php
@@ -7,6 +7,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class AuthenticationException extends \Magento\Framework\Exception\AuthenticationException
 {
diff --git a/lib/internal/Magento/Framework/Exception/RemoteServiceUnavailableException.php b/lib/internal/Magento/Framework/Exception/RemoteServiceUnavailableException.php
index a9af31b003333..50f01473b9dc9 100644
--- a/lib/internal/Magento/Framework/Exception/RemoteServiceUnavailableException.php
+++ b/lib/internal/Magento/Framework/Exception/RemoteServiceUnavailableException.php
@@ -7,6 +7,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class RemoteServiceUnavailableException extends AuthenticationException
 {
diff --git a/lib/internal/Magento/Framework/Exception/SerializationException.php b/lib/internal/Magento/Framework/Exception/SerializationException.php
index bae56b487975c..cbb40de6578f0 100644
--- a/lib/internal/Magento/Framework/Exception/SerializationException.php
+++ b/lib/internal/Magento/Framework/Exception/SerializationException.php
@@ -12,6 +12,7 @@
  * Serialization Exception
  *
  * @api
+ * @since 100.0.2
  */
 class SerializationException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Exception/SessionException.php b/lib/internal/Magento/Framework/Exception/SessionException.php
index b3af3ea5b5bb0..0127e3fa551e6 100644
--- a/lib/internal/Magento/Framework/Exception/SessionException.php
+++ b/lib/internal/Magento/Framework/Exception/SessionException.php
@@ -9,6 +9,7 @@
  * Session exception
  *
  * @api
+ * @since 100.0.2
  */
 class SessionException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Exception/State/ExpiredException.php b/lib/internal/Magento/Framework/Exception/State/ExpiredException.php
index 29748b52c8351..9f127b2d1fa29 100644
--- a/lib/internal/Magento/Framework/Exception/State/ExpiredException.php
+++ b/lib/internal/Magento/Framework/Exception/State/ExpiredException.php
@@ -11,6 +11,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class ExpiredException extends StateException
 {
diff --git a/lib/internal/Magento/Framework/Exception/State/InitException.php b/lib/internal/Magento/Framework/Exception/State/InitException.php
index 9ca7de26c58d7..ad2e6ef283deb 100644
--- a/lib/internal/Magento/Framework/Exception/State/InitException.php
+++ b/lib/internal/Magento/Framework/Exception/State/InitException.php
@@ -11,6 +11,7 @@
  * An exception that indicates application initialization error
  *
  * @api
+ * @since 100.0.2
  */
 class InitException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Exception/State/InputMismatchException.php b/lib/internal/Magento/Framework/Exception/State/InputMismatchException.php
index 752ebcf4804b1..efc8e1b4afe3e 100644
--- a/lib/internal/Magento/Framework/Exception/State/InputMismatchException.php
+++ b/lib/internal/Magento/Framework/Exception/State/InputMismatchException.php
@@ -11,6 +11,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class InputMismatchException extends StateException
 {
diff --git a/lib/internal/Magento/Framework/Exception/State/InvalidTransitionException.php b/lib/internal/Magento/Framework/Exception/State/InvalidTransitionException.php
index 2667d1745767e..c66163e87c9c1 100644
--- a/lib/internal/Magento/Framework/Exception/State/InvalidTransitionException.php
+++ b/lib/internal/Magento/Framework/Exception/State/InvalidTransitionException.php
@@ -11,6 +11,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class InvalidTransitionException extends StateException
 {
diff --git a/lib/internal/Magento/Framework/Exception/State/UserLockedException.php b/lib/internal/Magento/Framework/Exception/State/UserLockedException.php
index fa39556f6eecc..63e81f987f776 100644
--- a/lib/internal/Magento/Framework/Exception/State/UserLockedException.php
+++ b/lib/internal/Magento/Framework/Exception/State/UserLockedException.php
@@ -9,6 +9,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class UserLockedException extends AuthenticationException
 {
diff --git a/lib/internal/Magento/Framework/Exception/StateException.php b/lib/internal/Magento/Framework/Exception/StateException.php
index 580ef6fabe2fa..ed80b9c2df35b 100644
--- a/lib/internal/Magento/Framework/Exception/StateException.php
+++ b/lib/internal/Magento/Framework/Exception/StateException.php
@@ -9,6 +9,7 @@
  * State Exception
  *
  * @api
+ * @since 100.0.2
  */
 class StateException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Exception/TemporaryState/CouldNotSaveException.php b/lib/internal/Magento/Framework/Exception/TemporaryState/CouldNotSaveException.php
index 894b5be3f0bd1..4c59205b24519 100644
--- a/lib/internal/Magento/Framework/Exception/TemporaryState/CouldNotSaveException.php
+++ b/lib/internal/Magento/Framework/Exception/TemporaryState/CouldNotSaveException.php
@@ -13,7 +13,7 @@
  * CouldNotSaveException caused by recoverable error
  *
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 class CouldNotSaveException extends LocalizedCouldNotSaveException implements TemporaryStateExceptionInterface
 {
@@ -23,7 +23,6 @@ class CouldNotSaveException extends LocalizedCouldNotSaveException implements Te
      * @param Phrase $phrase The Exception message to throw.
      * @param \Exception $previous [optional] The previous exception used for the exception chaining.
      * @param int $code [optional] The Exception code.
-     * @since 100.2.0
      */
     public function __construct(Phrase $phrase, \Exception $previous = null, $code = 0)
     {
diff --git a/lib/internal/Magento/Framework/Exception/ValidatorException.php b/lib/internal/Magento/Framework/Exception/ValidatorException.php
index 1066fe268df44..9dbb994c111f9 100644
--- a/lib/internal/Magento/Framework/Exception/ValidatorException.php
+++ b/lib/internal/Magento/Framework/Exception/ValidatorException.php
@@ -7,6 +7,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class ValidatorException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/File/Csv.php b/lib/internal/Magento/Framework/File/Csv.php
index 571ad6b21efa7..1b1decdb5327c 100644
--- a/lib/internal/Magento/Framework/File/Csv.php
+++ b/lib/internal/Magento/Framework/File/Csv.php
@@ -130,7 +130,7 @@ public function getDataPairs($file, $keyIndex = 0, $valueIndex = 1)
      * @param array $data
      * @return $this
      * @throws \Magento\Framework\Exception\FileSystemException
-     * @deprecated
+     * @deprecated 102.0.0
      * @see appendData
      */
     public function saveData($file, $data)
diff --git a/lib/internal/Magento/Framework/File/Size.php b/lib/internal/Magento/Framework/File/Size.php
index c5a51ec1760e7..52cf572186f9f 100644
--- a/lib/internal/Magento/Framework/File/Size.php
+++ b/lib/internal/Magento/Framework/File/Size.php
@@ -11,6 +11,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class Size
 {
diff --git a/lib/internal/Magento/Framework/File/Uploader.php b/lib/internal/Magento/Framework/File/Uploader.php
index f9b41709ec7c8..c0126acf70041 100644
--- a/lib/internal/Magento/Framework/File/Uploader.php
+++ b/lib/internal/Magento/Framework/File/Uploader.php
@@ -18,6 +18,7 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  *
  * @api
+ * @since 100.0.2
  */
 class Uploader
 {
@@ -701,7 +702,7 @@ public static function getNewFileName($destinationFile)
      *
      * @param string $fileName
      * @return string
-     * @deprecated
+     * @deprecated 101.0.4
      */
     public static function getDispretionPath($fileName)
     {
@@ -713,6 +714,7 @@ public static function getDispretionPath($fileName)
      *
      * @param string $fileName
      * @return string
+     * @since 101.0.4
      */
     public static function getDispersionPath($fileName)
     {
diff --git a/lib/internal/Magento/Framework/Filesystem.php b/lib/internal/Magento/Framework/Filesystem.php
index 01877fe17a716..1f65bd6885fcd 100644
--- a/lib/internal/Magento/Framework/Filesystem.php
+++ b/lib/internal/Magento/Framework/Filesystem.php
@@ -11,6 +11,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class Filesystem
 {
@@ -78,6 +79,7 @@ public function getDirectoryRead($directoryCode, $driverCode = DriverPool::FILE)
      *
      * @return \Magento\Framework\Filesystem\Directory\ReadInterface
      *
+     * @since 102.0.0
      */
     public function getDirectoryReadByPath($path, $driverCode = DriverPool::FILE)
     {
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/Read.php b/lib/internal/Magento/Framework/Filesystem/Directory/Read.php
index e23eadd57d866..d16fab37818b0 100644
--- a/lib/internal/Magento/Framework/Filesystem/Directory/Read.php
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/Read.php
@@ -11,6 +11,7 @@
 /**
  * Filesystem directory instance for read operations
  * @api
+ * @since 100.0.2
  */
 class Read implements ReadInterface
 {
@@ -67,6 +68,7 @@ public function __construct(
      * @throws ValidatorException
      *
      * @return void
+     * @since 101.0.7
      */
     protected function validatePath(
         ?string $path,
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/ReadInterface.php b/lib/internal/Magento/Framework/Filesystem/Directory/ReadInterface.php
index 85d41b6932629..513f925a8c8fc 100644
--- a/lib/internal/Magento/Framework/Filesystem/Directory/ReadInterface.php
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/ReadInterface.php
@@ -8,6 +8,7 @@
 /**
  * Interface \Magento\Framework\Filesystem\Directory\ReadInterface
  * @api
+ * @since 100.0.2
  */
 interface ReadInterface
 {
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/WriteInterface.php b/lib/internal/Magento/Framework/Filesystem/Directory/WriteInterface.php
index 186cbcb81bff2..5b0fd74a422c9 100644
--- a/lib/internal/Magento/Framework/Filesystem/Directory/WriteInterface.php
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/WriteInterface.php
@@ -8,6 +8,7 @@
 /**
  * Interface \Magento\Framework\Filesystem\Directory\WriteInterface
  * @api
+ * @since 100.0.2
  */
 interface WriteInterface extends ReadInterface
 {
diff --git a/lib/internal/Magento/Framework/Filesystem/DriverInterface.php b/lib/internal/Magento/Framework/Filesystem/DriverInterface.php
index 39be808875141..afea4d3bc7b07 100644
--- a/lib/internal/Magento/Framework/Filesystem/DriverInterface.php
+++ b/lib/internal/Magento/Framework/Filesystem/DriverInterface.php
@@ -13,6 +13,7 @@
  * Class Driver
  *
  * @api
+ * @since 100.0.2
  */
 interface DriverInterface
 {
diff --git a/lib/internal/Magento/Framework/Filesystem/File/ReadFactory.php b/lib/internal/Magento/Framework/Filesystem/File/ReadFactory.php
index 5d9badf42073f..e46b00bc5c74f 100644
--- a/lib/internal/Magento/Framework/Filesystem/File/ReadFactory.php
+++ b/lib/internal/Magento/Framework/Filesystem/File/ReadFactory.php
@@ -11,6 +11,7 @@
 /**
  * Opens a file for reading
  * @api
+ * @since 100.0.2
  */
 class ReadFactory
 {
diff --git a/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php b/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php
index af2a43ceaedc3..7a9596586f56a 100644
--- a/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php
+++ b/lib/internal/Magento/Framework/Filesystem/File/WriteFactory.php
@@ -11,6 +11,7 @@
 /**
  * Opens a file for reading and/or writing
  * @api
+ * @since 100.0.2
  */
 class WriteFactory extends ReadFactory
 {
diff --git a/lib/internal/Magento/Framework/Filesystem/File/WriteInterface.php b/lib/internal/Magento/Framework/Filesystem/File/WriteInterface.php
index ecf554de808cc..87e5f5afc95b4 100644
--- a/lib/internal/Magento/Framework/Filesystem/File/WriteInterface.php
+++ b/lib/internal/Magento/Framework/Filesystem/File/WriteInterface.php
@@ -7,6 +7,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 interface WriteInterface extends ReadInterface
 {
diff --git a/lib/internal/Magento/Framework/Filesystem/Io/IoInterface.php b/lib/internal/Magento/Framework/Filesystem/Io/IoInterface.php
index 93c85ebafe727..477da422def57 100644
--- a/lib/internal/Magento/Framework/Filesystem/Io/IoInterface.php
+++ b/lib/internal/Magento/Framework/Filesystem/Io/IoInterface.php
@@ -8,6 +8,7 @@
 /**
  * Input/output client interface
  * @api
+ * @since 100.0.2
  */
 interface IoInterface
 {
diff --git a/lib/internal/Magento/Framework/Filter/FilterManager.php b/lib/internal/Magento/Framework/Filter/FilterManager.php
index ca5d998af833f..1729dee2487ab 100644
--- a/lib/internal/Magento/Framework/Filter/FilterManager.php
+++ b/lib/internal/Magento/Framework/Filter/FilterManager.php
@@ -26,6 +26,7 @@
  * @method string decrypt(string $value, $params = array())
  * @method string translit(string $value)
  * @method string translitUrl(string $value)
+ * @since 100.0.2
  */
 class FilterManager
 {
diff --git a/lib/internal/Magento/Framework/Filter/Template.php b/lib/internal/Magento/Framework/Filter/Template.php
index ca597a7056566..be4c7eb750083 100644
--- a/lib/internal/Magento/Framework/Filter/Template.php
+++ b/lib/internal/Magento/Framework/Filter/Template.php
@@ -23,6 +23,7 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @since 100.0.2
  */
 class Template implements \Zend_Filter_Interface
 {
@@ -244,7 +245,7 @@ protected function resetAfterFilterCallbacks()
      *
      * @param string[] $construction
      * @return string
-     * @deprecated Use the directive interfaces instead
+     * @deprecated 102.0.4 Use the directive interfaces instead
      */
     public function varDirective($construction)
     {
@@ -259,7 +260,8 @@ public function varDirective($construction)
      *
      * @param string[] $construction
      * @return string
-     * @deprecated Use the directive interfaces instead
+     * @deprecated 102.0.4 Use the directive interfaces instead
+     * @since 102.0.4
      */
     public function forDirective($construction)
     {
@@ -283,7 +285,7 @@ public function forDirective($construction)
      *
      * @param string[] $construction
      * @return mixed
-     * @deprecated Use the directive interfaces instead
+     * @deprecated 102.0.4 Use the directive interfaces instead
      */
     public function templateDirective($construction)
     {
@@ -298,7 +300,7 @@ public function templateDirective($construction)
      *
      * @param string[] $construction
      * @return string
-     * @deprecated Use the directive interfaces instead
+     * @deprecated 102.0.4 Use the directive interfaces instead
      */
     public function dependDirective($construction)
     {
@@ -315,7 +317,7 @@ public function dependDirective($construction)
      *
      * @param string[] $construction
      * @return string
-     * @deprecated Use the directive interfaces instead
+     * @deprecated 102.0.4 Use the directive interfaces instead
      */
     public function ifDirective($construction)
     {
@@ -332,7 +334,7 @@ public function ifDirective($construction)
      *
      * @param string $value raw parameters
      * @return array
-     * @deprecated Use the directive interfaces instead
+     * @deprecated 102.0.4 Use the directive interfaces instead
      */
     protected function getParameters($value)
     {
@@ -353,7 +355,7 @@ protected function getParameters($value)
      * @param string $value raw parameters
      * @param string $default default value
      * @return string
-     * @deprecated Use \Magento\Framework\Filter\VariableResolverInterface instead
+     * @deprecated 102.0.4 Use \Magento\Framework\Filter\VariableResolverInterface instead
      */
     protected function getVariable($value, $default = '{no_value_defined}')
     {
@@ -369,7 +371,7 @@ protected function getVariable($value, $default = '{no_value_defined}')
      *
      * @param array $stack
      * @return array
-     * @deprecated Use new directive processor interfaces
+     * @deprecated 102.0.4 Use new directive processor interfaces
      */
     protected function getStackArgs($stack)
     {
@@ -396,6 +398,7 @@ protected function getStackArgs($stack)
      *
      * @param bool $strictMode Enable strict parsing of directives
      * @return bool The previous mode from before the change
+     * @since 102.0.4
      */
     public function setStrictMode(bool $strictMode): bool
     {
@@ -409,6 +412,7 @@ public function setStrictMode(bool $strictMode): bool
      * Return if the template is rendered with strict directive processing
      *
      * @return bool
+     * @since 102.0.4
      */
     public function isStrictMode(): bool
     {
diff --git a/lib/internal/Magento/Framework/Filter/Truncate.php b/lib/internal/Magento/Framework/Filter/Truncate.php
index a4dd35b302705..d56f574bac019 100644
--- a/lib/internal/Magento/Framework/Filter/Truncate.php
+++ b/lib/internal/Magento/Framework/Filter/Truncate.php
@@ -11,7 +11,7 @@
  * Truncate a string to a certain length if necessary, appending the $etc string.
  * $remainder will contain the string that has been replaced with $etc.
  *
- * @deprecated
+ * @deprecated 101.0.7
  * @see \Magento\Framework\Filter\TruncateFilter
  */
 class Truncate implements \Zend_Filter_Interface
diff --git a/lib/internal/Magento/Framework/HTTP/ClientInterface.php b/lib/internal/Magento/Framework/HTTP/ClientInterface.php
index e2e4a89af8fba..3a3aac1546698 100644
--- a/lib/internal/Magento/Framework/HTTP/ClientInterface.php
+++ b/lib/internal/Magento/Framework/HTTP/ClientInterface.php
@@ -10,6 +10,7 @@
  * Interface for HTTP clients
  *
  * @api
+ * @since 100.0.2
  */
 interface ClientInterface
 {
diff --git a/lib/internal/Magento/Framework/Image/Adapter/Config.php b/lib/internal/Magento/Framework/Image/Adapter/Config.php
index d4a28b4efc600..8926f5a0a9fa7 100644
--- a/lib/internal/Magento/Framework/Image/Adapter/Config.php
+++ b/lib/internal/Magento/Framework/Image/Adapter/Config.php
@@ -65,7 +65,7 @@ public function getAdapters()
      * Get Maximum Image Width resolution in pixels. For image resizing on client side.
      *
      * @return int
-     * @deprecated
+     * @deprecated 102.0.1
      * @see \Magento\Backend\Model\Image\UploadResizeConfigInterface::getMaxHeight()
      */
     public function getMaxWidth(): int
@@ -77,7 +77,7 @@ public function getMaxWidth(): int
      * Get Maximum Image Height resolution in pixels. For image resizing on client side.
      *
      * @return int
-     * @deprecated
+     * @deprecated 102.0.1
      * @see \Magento\Backend\Model\Image\UploadResizeConfigInterface::getMaxHeight()
      */
     public function getMaxHeight(): int
diff --git a/lib/internal/Magento/Framework/Indexer/Action/Base.php b/lib/internal/Magento/Framework/Indexer/Action/Base.php
index 636335192cbc5..b454d49578772 100644
--- a/lib/internal/Magento/Framework/Indexer/Action/Base.php
+++ b/lib/internal/Magento/Framework/Indexer/Action/Base.php
@@ -37,13 +37,13 @@ class Base implements ActionInterface
 
     /**
      * @var AdapterInterface
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected $connection;
 
     /**
      * @var SourceProviderInterface[]
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected $sources;
 
@@ -54,7 +54,7 @@ class Base implements ActionInterface
 
     /**
      * @var HandlerInterface[]
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected $handlers;
 
@@ -65,7 +65,7 @@ class Base implements ActionInterface
 
     /**
      * @var array
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected $columnTypesMap = [
         'varchar'    => ['type' => Table::TYPE_TEXT, 'size' => 255],
@@ -75,13 +75,13 @@ class Base implements ActionInterface
 
     /**
      * @var array
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected $filterColumns;
 
     /**
      * @var array
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected $searchColumns;
 
@@ -102,7 +102,7 @@ class Base implements ActionInterface
 
     /**
      * @var String
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected $string;
 
@@ -113,13 +113,13 @@ class Base implements ActionInterface
 
     /**
      * @var array
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected $filterable = [];
 
     /**
      * @var array
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected $searchable = [];
 
@@ -353,7 +353,7 @@ protected function prepareFields()
      * @param array $field
      * @return void
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected function saveFieldByType($field)
     {
diff --git a/lib/internal/Magento/Framework/Indexer/ActionInterface.php b/lib/internal/Magento/Framework/Indexer/ActionInterface.php
index 68a10e23e1d60..f4e59182c3c51 100644
--- a/lib/internal/Magento/Framework/Indexer/ActionInterface.php
+++ b/lib/internal/Magento/Framework/Indexer/ActionInterface.php
@@ -7,6 +7,7 @@
 
 /**
  * @api Implement custom Action Interface
+ * @since 100.0.2
  */
 interface ActionInterface
 {
diff --git a/lib/internal/Magento/Framework/Indexer/BatchProviderInterface.php b/lib/internal/Magento/Framework/Indexer/BatchProviderInterface.php
index c318638e7e6ab..e8babffbbea78 100644
--- a/lib/internal/Magento/Framework/Indexer/BatchProviderInterface.php
+++ b/lib/internal/Magento/Framework/Indexer/BatchProviderInterface.php
@@ -15,7 +15,7 @@
  * and process them one by one in order to reduce memory consumption and improve overall performance.
  *
  * @api retrieve Batches when implementing custom Indexer\Action
- * @since 100.2.0
+ * @since 101.0.0
  */
 interface BatchProviderInterface
 {
@@ -27,7 +27,7 @@ interface BatchProviderInterface
      * @param string $linkField field that is used as a record identifier.
      * @param int $batchSize size of the single range.
      * @return \Generator generator that produces entity ID ranges in the format of ['from' => ..., 'to' => ...]
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getBatches(AdapterInterface $adapter, $tableName, $linkField, $batchSize);
 
@@ -38,7 +38,7 @@ public function getBatches(AdapterInterface $adapter, $tableName, $linkField, $b
      * @param Select $select
      * @param array $batch
      * @return array
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getBatchIds(AdapterInterface $connection, Select $select, array $batch);
 }
diff --git a/lib/internal/Magento/Framework/Indexer/BatchSizeManagementInterface.php b/lib/internal/Magento/Framework/Indexer/BatchSizeManagementInterface.php
index b953afcd9e7e8..880d6feb3476f 100644
--- a/lib/internal/Magento/Framework/Indexer/BatchSizeManagementInterface.php
+++ b/lib/internal/Magento/Framework/Indexer/BatchSizeManagementInterface.php
@@ -10,7 +10,7 @@
 /**
  * Batch size manager can be used to ensure that MEMORY table has enough memory for data in batch.
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 interface BatchSizeManagementInterface
 {
@@ -20,7 +20,7 @@ interface BatchSizeManagementInterface
      * @param AdapterInterface $adapter database adapter.
      * @param int $batchSize
      * @return void
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function ensureBatchSize(\Magento\Framework\DB\Adapter\AdapterInterface $adapter, $batchSize);
 }
diff --git a/lib/internal/Magento/Framework/Indexer/Config/Converter.php b/lib/internal/Magento/Framework/Indexer/Config/Converter.php
index 7f76b6e4295c5..f012f2b6d6101 100644
--- a/lib/internal/Magento/Framework/Indexer/Config/Converter.php
+++ b/lib/internal/Magento/Framework/Indexer/Config/Converter.php
@@ -238,7 +238,7 @@ protected function convertField(\DOMElement $node, $data)
      *
      * @param \DOMNode $node
      * @return string
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected function getTranslatedNodeValue(\DOMNode $node)
     {
diff --git a/lib/internal/Magento/Framework/Indexer/ConfigInterface.php b/lib/internal/Magento/Framework/Indexer/ConfigInterface.php
index 1769676e8ab42..14c771b5b69d3 100644
--- a/lib/internal/Magento/Framework/Indexer/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/Indexer/ConfigInterface.php
@@ -9,6 +9,7 @@
  * Indexer(s) configuration
  *
  * @api
+ * @since 100.0.2
  */
 interface ConfigInterface
 {
diff --git a/lib/internal/Magento/Framework/Indexer/Dimension.php b/lib/internal/Magento/Framework/Indexer/Dimension.php
index dacc8d7f524f5..3a484ed17dfdc 100644
--- a/lib/internal/Magento/Framework/Indexer/Dimension.php
+++ b/lib/internal/Magento/Framework/Indexer/Dimension.php
@@ -11,6 +11,7 @@
  * Index Dimension object
  *
  * @api
+ * @since 101.0.6
  */
 class Dimension
 {
@@ -38,6 +39,7 @@ public function __construct(string $name, string $value)
      * Get dimension name
      *
      * @return string
+     * @since 101.0.6
      */
     public function getName(): string
     {
@@ -48,6 +50,7 @@ public function getName(): string
      * Get dimension value
      *
      * @return string
+     * @since 101.0.6
      */
     public function getValue(): string
     {
diff --git a/lib/internal/Magento/Framework/Indexer/DimensionFactory.php b/lib/internal/Magento/Framework/Indexer/DimensionFactory.php
index 8eaeff5628d60..c5bcab73a1058 100644
--- a/lib/internal/Magento/Framework/Indexer/DimensionFactory.php
+++ b/lib/internal/Magento/Framework/Indexer/DimensionFactory.php
@@ -13,6 +13,7 @@
  * Dimension Factory
  *
  * @api
+ * @since 101.0.6
  */
 class DimensionFactory
 {
@@ -33,6 +34,7 @@ public function __construct(ObjectManagerInterface $objectManager)
      * @param string $name
      * @param string $value
      * @return Dimension
+     * @since 101.0.6
      */
     public function create(string $name, string $value): Dimension
     {
diff --git a/lib/internal/Magento/Framework/Indexer/DimensionProviderInterface.php b/lib/internal/Magento/Framework/Indexer/DimensionProviderInterface.php
index ea4f56eb48d41..bd53fc36d3b44 100644
--- a/lib/internal/Magento/Framework/Indexer/DimensionProviderInterface.php
+++ b/lib/internal/Magento/Framework/Indexer/DimensionProviderInterface.php
@@ -10,12 +10,14 @@
 /**
  * @api
  * Provide a list of dimensions
+ * @since 101.0.6
  */
 interface DimensionProviderInterface extends \IteratorAggregate
 {
     /**
      * Get Dimension Iterator. Returns yielded value of \Magento\Framework\Indexer\Dimension
      * @return \Traversable|\Magento\Framework\Indexer\Dimension[]
+     * @since 101.0.6
      */
     public function getIterator(): \Traversable;
 }
diff --git a/lib/internal/Magento/Framework/Indexer/DimensionalIndexerInterface.php b/lib/internal/Magento/Framework/Indexer/DimensionalIndexerInterface.php
index 43c4e7a7fd70b..acf1d598e89c5 100644
--- a/lib/internal/Magento/Framework/Indexer/DimensionalIndexerInterface.php
+++ b/lib/internal/Magento/Framework/Indexer/DimensionalIndexerInterface.php
@@ -10,6 +10,7 @@
 /**
  * @api
  * Run indexer by dimensions
+ * @since 101.0.6
  */
 interface DimensionalIndexerInterface
 {
@@ -20,6 +21,7 @@ interface DimensionalIndexerInterface
      * @param \Magento\Framework\Indexer\Dimension[] $dimensions
      * @param \Traversable $entityIds
      * @return void
+     * @since 101.0.6
      */
     public function executeByDimensions(array $dimensions, \Traversable $entityIds);
 }
diff --git a/lib/internal/Magento/Framework/Indexer/FieldsetInterface.php b/lib/internal/Magento/Framework/Indexer/FieldsetInterface.php
index 0ce1e8763ac96..85c5f698e1bb8 100644
--- a/lib/internal/Magento/Framework/Indexer/FieldsetInterface.php
+++ b/lib/internal/Magento/Framework/Indexer/FieldsetInterface.php
@@ -7,6 +7,7 @@
 
 /**
  * @api Implement custom Fieldset
+ * @since 100.0.2
  */
 interface FieldsetInterface
 {
diff --git a/lib/internal/Magento/Framework/Indexer/FieldsetPool.php b/lib/internal/Magento/Framework/Indexer/FieldsetPool.php
index 747db5d2cc00f..742e15f1f43bf 100644
--- a/lib/internal/Magento/Framework/Indexer/FieldsetPool.php
+++ b/lib/internal/Magento/Framework/Indexer/FieldsetPool.php
@@ -9,6 +9,7 @@
 
 /**
  * @api Retrieve Fieldset when implementing custom Indexer\Action
+ * @since 100.0.2
  */
 class FieldsetPool
 {
diff --git a/lib/internal/Magento/Framework/Indexer/HandlerInterface.php b/lib/internal/Magento/Framework/Indexer/HandlerInterface.php
index 5c1e9ea5a2569..8bb725a293f0c 100644
--- a/lib/internal/Magento/Framework/Indexer/HandlerInterface.php
+++ b/lib/internal/Magento/Framework/Indexer/HandlerInterface.php
@@ -9,6 +9,7 @@
 
 /**
  * @api Implement custom Handler
+ * @since 100.0.2
  */
 interface HandlerInterface
 {
diff --git a/lib/internal/Magento/Framework/Indexer/HandlerPool.php b/lib/internal/Magento/Framework/Indexer/HandlerPool.php
index ed7abf19bad47..c4e3fdb0e7c2f 100644
--- a/lib/internal/Magento/Framework/Indexer/HandlerPool.php
+++ b/lib/internal/Magento/Framework/Indexer/HandlerPool.php
@@ -10,6 +10,7 @@
 
 /**
  * @api Instantiate save handler when implementing custom Indexer\Action
+ * @since 100.0.2
  */
 class HandlerPool
 {
diff --git a/lib/internal/Magento/Framework/Indexer/IndexStructure.php b/lib/internal/Magento/Framework/Indexer/IndexStructure.php
index a39de2d5b8a62..2fd5bfa0bd955 100644
--- a/lib/internal/Magento/Framework/Indexer/IndexStructure.php
+++ b/lib/internal/Magento/Framework/Indexer/IndexStructure.php
@@ -16,7 +16,7 @@
 /**
  * Full text search index structure.
  *
- * @deprecated
+ * @deprecated 102.0.0
  * @see \Magento\ElasticSearch
  */
 class IndexStructure implements IndexStructureInterface
diff --git a/lib/internal/Magento/Framework/Indexer/IndexStructureInterface.php b/lib/internal/Magento/Framework/Indexer/IndexStructureInterface.php
index f4c518bdfea7a..f8cc53d676af8 100644
--- a/lib/internal/Magento/Framework/Indexer/IndexStructureInterface.php
+++ b/lib/internal/Magento/Framework/Indexer/IndexStructureInterface.php
@@ -11,6 +11,7 @@
  * Indexer structure (schema) handler
  *
  * @api
+ * @since 100.0.2
  */
 interface IndexStructureInterface
 {
diff --git a/lib/internal/Magento/Framework/Indexer/IndexTableRowSizeEstimatorInterface.php b/lib/internal/Magento/Framework/Indexer/IndexTableRowSizeEstimatorInterface.php
index a0a8fcf18146f..537b144df9dd2 100644
--- a/lib/internal/Magento/Framework/Indexer/IndexTableRowSizeEstimatorInterface.php
+++ b/lib/internal/Magento/Framework/Indexer/IndexTableRowSizeEstimatorInterface.php
@@ -9,7 +9,7 @@
 /**
  * Calculate memory size for entity according different dimensions.
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 interface IndexTableRowSizeEstimatorInterface
 {
@@ -17,7 +17,7 @@ interface IndexTableRowSizeEstimatorInterface
      * Calculate memory size for entity row.
      *
      * @return float
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function estimateRowSize();
 }
diff --git a/lib/internal/Magento/Framework/Indexer/IndexerInterface.php b/lib/internal/Magento/Framework/Indexer/IndexerInterface.php
index bf572b94ccc94..597266a05fd3f 100644
--- a/lib/internal/Magento/Framework/Indexer/IndexerInterface.php
+++ b/lib/internal/Magento/Framework/Indexer/IndexerInterface.php
@@ -9,8 +9,9 @@
  * Indexer
  *
  * @api
- * @deprecated Facade will be split
+ * @deprecated 102.0.0 Facade will be split
  * @see \Magento\Framework\Indexer\ActionInterface
+ * @since 100.0.2
  */
 interface IndexerInterface
 {
@@ -163,7 +164,7 @@ public function getLatestUpdated();
      *
      * @return void
      * @throws \Exception
-     * @deprecated
+     * @deprecated 102.0.0
      * @see \Magento\Framework\Indexer\ActionInterface::executeFull
      */
     public function reindexAll();
@@ -173,7 +174,7 @@ public function reindexAll();
      *
      * @param int $id
      * @return void
-     * @deprecated
+     * @deprecated 102.0.0
      * @see \Magento\Framework\Indexer\ActionInterface::executeList
      */
     public function reindexRow($id);
@@ -183,7 +184,7 @@ public function reindexRow($id);
      *
      * @param int[] $ids
      * @return void
-     * @deprecated
+     * @deprecated 102.0.0
      * @see \Magento\Framework\Indexer\ActionInterface::executeList
      */
     public function reindexList($ids);
diff --git a/lib/internal/Magento/Framework/Indexer/IndexerRegistry.php b/lib/internal/Magento/Framework/Indexer/IndexerRegistry.php
index 5867565e0ccd5..bdc8479671f2e 100644
--- a/lib/internal/Magento/Framework/Indexer/IndexerRegistry.php
+++ b/lib/internal/Magento/Framework/Indexer/IndexerRegistry.php
@@ -7,6 +7,7 @@
 
 /**
  * @api Retrieve indexer by id, for example when indexer need to be invalidated
+ * @since 100.0.2
  */
 class IndexerRegistry
 {
diff --git a/lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerInterface.php b/lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerInterface.php
index e03404d3eb8f6..a3111f9966ee2 100644
--- a/lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerInterface.php
+++ b/lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerInterface.php
@@ -15,6 +15,7 @@
  * Indexer persistence handler
  *
  * @api
+ * @since 100.0.2
  */
 interface IndexerInterface
 {
diff --git a/lib/internal/Magento/Framework/Indexer/SaveHandlerFactory.php b/lib/internal/Magento/Framework/Indexer/SaveHandlerFactory.php
index 80231dd7aa290..9e1ee9a375e36 100644
--- a/lib/internal/Magento/Framework/Indexer/SaveHandlerFactory.php
+++ b/lib/internal/Magento/Framework/Indexer/SaveHandlerFactory.php
@@ -10,6 +10,7 @@
 
 /**
  * @api Instantiate save handler when implementing custom Indexer\Action
+ * @since 100.0.2
  */
 class SaveHandlerFactory
 {
diff --git a/lib/internal/Magento/Framework/Indexer/StateInterface.php b/lib/internal/Magento/Framework/Indexer/StateInterface.php
index 124b8ab50b4b8..332b3227ffc88 100644
--- a/lib/internal/Magento/Framework/Indexer/StateInterface.php
+++ b/lib/internal/Magento/Framework/Indexer/StateInterface.php
@@ -7,6 +7,7 @@
 
 /**
  * @api Retrieve status of the Indexer
+ * @since 100.0.2
  */
 interface StateInterface
 {
diff --git a/lib/internal/Magento/Framework/Interception/Config/Config.php b/lib/internal/Magento/Framework/Interception/Config/Config.php
index abf2a6d9d57b7..cb14e0f148e3e 100644
--- a/lib/internal/Magento/Framework/Interception/Config/Config.php
+++ b/lib/internal/Magento/Framework/Interception/Config/Config.php
@@ -37,7 +37,7 @@ class Config implements \Magento\Framework\Interception\ConfigInterface
 
     /**
      * Cache
-     * @deprecated
+     * @deprecated 102.0.1
      * @var \Magento\Framework\Cache\FrontendInterface
      */
     protected $_cache;
diff --git a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
index bf1372dc007a1..98591a968fd73 100644
--- a/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
+++ b/lib/internal/Magento/Framework/Interception/PluginList/PluginList.php
@@ -399,7 +399,7 @@ private function filterPlugins(array &$plugins)
      * Get logger
      *
      * @return \Psr\Log\LoggerInterface
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     private function getLogger()
     {
diff --git a/lib/internal/Magento/Framework/Json/Decoder.php b/lib/internal/Magento/Framework/Json/Decoder.php
index 57e160cac7bbf..fbc99a036daa9 100644
--- a/lib/internal/Magento/Framework/Json/Decoder.php
+++ b/lib/internal/Magento/Framework/Json/Decoder.php
@@ -6,7 +6,7 @@
 namespace Magento\Framework\Json;
 
 /**
- * @deprecated 100.2.0 @see \Magento\Framework\Serialize\Serializer\Json::unserialize
+ * @deprecated 101.0.0 @see \Magento\Framework\Serialize\Serializer\Json::unserialize
  */
 class Decoder implements DecoderInterface
 {
diff --git a/lib/internal/Magento/Framework/Json/DecoderInterface.php b/lib/internal/Magento/Framework/Json/DecoderInterface.php
index 9aa630fd9ca0c..baef2154ea618 100644
--- a/lib/internal/Magento/Framework/Json/DecoderInterface.php
+++ b/lib/internal/Magento/Framework/Json/DecoderInterface.php
@@ -10,7 +10,8 @@
  *
  * @api
  *
- * @deprecated 100.2.0 @see \Magento\Framework\Serialize\Serializer\Json::unserialize
+ * @deprecated 101.0.0 @see \Magento\Framework\Serialize\Serializer\Json::unserialize
+ * @since 100.0.2
  */
 interface DecoderInterface
 {
diff --git a/lib/internal/Magento/Framework/Json/Encoder.php b/lib/internal/Magento/Framework/Json/Encoder.php
index 35d259781d67a..0c53edeb6ae00 100644
--- a/lib/internal/Magento/Framework/Json/Encoder.php
+++ b/lib/internal/Magento/Framework/Json/Encoder.php
@@ -6,7 +6,7 @@
 namespace Magento\Framework\Json;
 
 /**
- * @deprecated 100.2.0 @see \Magento\Framework\Serialize\Serializer\Json::serialize
+ * @deprecated 101.0.0 @see \Magento\Framework\Serialize\Serializer\Json::serialize
  */
 class Encoder implements EncoderInterface
 {
diff --git a/lib/internal/Magento/Framework/Json/EncoderInterface.php b/lib/internal/Magento/Framework/Json/EncoderInterface.php
index 9fb720d11fea3..59ea0f47d556c 100644
--- a/lib/internal/Magento/Framework/Json/EncoderInterface.php
+++ b/lib/internal/Magento/Framework/Json/EncoderInterface.php
@@ -10,7 +10,8 @@
  *
  * @api
  *
- * @deprecated 100.2.0 @see \Magento\Framework\Serialize\Serializer\Json::serialize
+ * @deprecated 101.0.0 @see \Magento\Framework\Serialize\Serializer\Json::serialize
+ * @since 100.0.2
  */
 interface EncoderInterface
 {
diff --git a/lib/internal/Magento/Framework/Json/Helper/Data.php b/lib/internal/Magento/Framework/Json/Helper/Data.php
index 67589d00eb99d..a1f2e01a2e92e 100644
--- a/lib/internal/Magento/Framework/Json/Helper/Data.php
+++ b/lib/internal/Magento/Framework/Json/Helper/Data.php
@@ -8,7 +8,7 @@
 /**
  * Json data helper
  *
- * @deprecated 100.2.0 @see \Magento\Framework\Serialize\Serializer\Json
+ * @deprecated 101.0.0 @see \Magento\Framework\Serialize\Serializer\Json
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
diff --git a/lib/internal/Magento/Framework/Locale/ConfigInterface.php b/lib/internal/Magento/Framework/Locale/ConfigInterface.php
index e5f8bc00e5466..a4ee02c323b19 100644
--- a/lib/internal/Magento/Framework/Locale/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/Locale/ConfigInterface.php
@@ -9,6 +9,7 @@
  * Provides access to locale-related config information
  *
  * @api
+ * @since 100.0.2
  */
 interface ConfigInterface
 {
diff --git a/lib/internal/Magento/Framework/Locale/CurrencyInterface.php b/lib/internal/Magento/Framework/Locale/CurrencyInterface.php
index e52ac551f54ec..e36a905a6c473 100644
--- a/lib/internal/Magento/Framework/Locale/CurrencyInterface.php
+++ b/lib/internal/Magento/Framework/Locale/CurrencyInterface.php
@@ -9,6 +9,7 @@
  * Provides access to currency config information
  *
  * @api
+ * @since 100.0.2
  */
 interface CurrencyInterface
 {
diff --git a/lib/internal/Magento/Framework/Locale/FormatInterface.php b/lib/internal/Magento/Framework/Locale/FormatInterface.php
index 1312c8841c23b..1a15b2610be54 100644
--- a/lib/internal/Magento/Framework/Locale/FormatInterface.php
+++ b/lib/internal/Magento/Framework/Locale/FormatInterface.php
@@ -7,6 +7,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 interface FormatInterface
 {
diff --git a/lib/internal/Magento/Framework/Locale/ListsInterface.php b/lib/internal/Magento/Framework/Locale/ListsInterface.php
index 22e9bf00ebce7..c7d509e20546a 100644
--- a/lib/internal/Magento/Framework/Locale/ListsInterface.php
+++ b/lib/internal/Magento/Framework/Locale/ListsInterface.php
@@ -7,6 +7,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 interface ListsInterface extends OptionInterface
 {
diff --git a/lib/internal/Magento/Framework/Locale/ResolverInterface.php b/lib/internal/Magento/Framework/Locale/ResolverInterface.php
index 22ec8fb70304c..70d397ddf3cc1 100644
--- a/lib/internal/Magento/Framework/Locale/ResolverInterface.php
+++ b/lib/internal/Magento/Framework/Locale/ResolverInterface.php
@@ -9,6 +9,7 @@
  * Manages locale config information
  *
  * @api
+ * @since 100.0.2
  */
 interface ResolverInterface
 {
diff --git a/lib/internal/Magento/Framework/Lock/LockManagerInterface.php b/lib/internal/Magento/Framework/Lock/LockManagerInterface.php
index 76cc8506eb182..81f721fac9036 100644
--- a/lib/internal/Magento/Framework/Lock/LockManagerInterface.php
+++ b/lib/internal/Magento/Framework/Lock/LockManagerInterface.php
@@ -11,6 +11,7 @@
  * Interface of a lock manager
  *
  * @api
+ * @since 101.0.5
  */
 interface LockManagerInterface
 {
@@ -21,6 +22,7 @@ interface LockManagerInterface
      * @param int $timeout How long to wait lock acquisition in seconds, negative value means infinite timeout
      * @return bool
      * @api
+     * @since 101.0.5
      */
     public function lock(string $name, int $timeout = -1): bool;
 
@@ -30,6 +32,7 @@ public function lock(string $name, int $timeout = -1): bool;
      * @param string $name lock name
      * @return bool
      * @api
+     * @since 101.0.5
      */
     public function unlock(string $name): bool;
 
@@ -39,6 +42,7 @@ public function unlock(string $name): bool;
      * @param string $name lock name
      * @return bool
      * @api
+     * @since 101.0.5
      */
     public function isLocked(string $name): bool;
 }
diff --git a/lib/internal/Magento/Framework/Mail/MailMessageInterface.php b/lib/internal/Magento/Framework/Mail/MailMessageInterface.php
index 5179e6057c4c9..e5f7d355afa6c 100644
--- a/lib/internal/Magento/Framework/Mail/MailMessageInterface.php
+++ b/lib/internal/Magento/Framework/Mail/MailMessageInterface.php
@@ -9,8 +9,9 @@
  * Mail Message interface
  *
  * @api
- * @deprecated
+ * @deprecated 102.0.4
  * @see \Magento\Framework\Mail\EmailMessageInterface
+ * @since 101.0.8
  */
 interface MailMessageInterface extends MessageInterface
 {
@@ -19,6 +20,7 @@ interface MailMessageInterface extends MessageInterface
      *
      * @param string $html
      * @return $this
+     * @since 101.0.8
      */
     public function setBodyHtml($html);
 
@@ -27,6 +29,7 @@ public function setBodyHtml($html);
      *
      * @param string $text
      * @return $this
+     * @since 101.0.8
      */
     public function setBodyText($text);
 
@@ -34,6 +37,7 @@ public function setBodyText($text);
      * Get message source code.
      *
      * @return string
+     * @since 101.0.8
      */
     public function getRawMessage();
 }
diff --git a/lib/internal/Magento/Framework/Mail/Message.php b/lib/internal/Magento/Framework/Mail/Message.php
index b140676466e5f..66ed5927b6833 100644
--- a/lib/internal/Magento/Framework/Mail/Message.php
+++ b/lib/internal/Magento/Framework/Mail/Message.php
@@ -11,7 +11,7 @@
 /**
  * Class Message for email transportation
  *
- * @deprecated a new message implementation was added
+ * @deprecated 102.0.4 a new message implementation was added
  * @see \Magento\Framework\Mail\EmailMessage
  */
 class Message implements MailMessageInterface
@@ -42,7 +42,7 @@ public function __construct($charset = 'utf-8')
     /**
      * @inheritdoc
      *
-     * @deprecated
+     * @deprecated 101.0.8
      * @see \Magento\Framework\Mail\Message::setBodyText
      * @see \Magento\Framework\Mail\Message::setBodyHtml
      */
@@ -55,7 +55,7 @@ public function setMessageType($type)
     /**
      * @inheritdoc
      *
-     * @deprecated
+     * @deprecated 101.0.8
      * @see \Magento\Framework\Mail\Message::setBodyText
      * @see \Magento\Framework\Mail\Message::setBodyHtml
      */
@@ -96,7 +96,7 @@ public function getBody()
     /**
      * @inheritdoc
      *
-     * @deprecated This function is missing the from name. The
+     * @deprecated 102.0.1 This function is missing the from name. The
      * setFromAddress() function sets both from address and from name.
      * @see setFromAddress()
      */
diff --git a/lib/internal/Magento/Framework/Mail/MessageInterface.php b/lib/internal/Magento/Framework/Mail/MessageInterface.php
index c0d3afed81e39..904c723e8bf08 100644
--- a/lib/internal/Magento/Framework/Mail/MessageInterface.php
+++ b/lib/internal/Magento/Framework/Mail/MessageInterface.php
@@ -9,8 +9,9 @@
  * Mail Message interface
  *
  * @api
- * @deprecated in favor of MailMessageInterface to avoid temporal coupling (setMessageType + setBody)
+ * @deprecated 102.0.0 in favor of MailMessageInterface to avoid temporal coupling (setMessageType + setBody)
  * @see \Magento\Framework\Mail\MailMessageInterface
+ * @since 100.0.2
  */
 interface MessageInterface
 {
@@ -46,7 +47,7 @@ public function getSubject();
      * @param mixed $body
      * @return $this
      *
-     * @deprecated
+     * @deprecated 102.0.0
      * @see \Magento\Framework\Mail\MailMessageInterface::setBodyHtml
      * @see \Magento\Framework\Mail\MailMessageInterface::setBodyText()
      */
@@ -105,7 +106,7 @@ public function setReplyTo($replyToAddress);
      * @param string $type
      * @return $this
      *
-     * @deprecated
+     * @deprecated 102.0.0
      * @see \Magento\Framework\Mail\MailMessageInterface::setBodyHtml
      * @see \Magento\Framework\Mail\MailMessageInterface::getBodyHtml
      * @see \Magento\Framework\Mail\MailMessageInterface::setBodyText()
diff --git a/lib/internal/Magento/Framework/Mail/Template/ConfigInterface.php b/lib/internal/Magento/Framework/Mail/Template/ConfigInterface.php
index b4e6cb46045fe..bac90dcbae5e0 100644
--- a/lib/internal/Magento/Framework/Mail/Template/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/Mail/Template/ConfigInterface.php
@@ -9,6 +9,7 @@
  * High-level interface for mail templates data that hides format from the client code
  *
  * @api
+ * @since 100.0.2
  */
 interface ConfigInterface
 {
diff --git a/lib/internal/Magento/Framework/Mail/Template/FactoryInterface.php b/lib/internal/Magento/Framework/Mail/Template/FactoryInterface.php
index 4e88a9897e4a2..2c0f99e4ac1f1 100644
--- a/lib/internal/Magento/Framework/Mail/Template/FactoryInterface.php
+++ b/lib/internal/Magento/Framework/Mail/Template/FactoryInterface.php
@@ -9,6 +9,7 @@
  * Mail Template Factory interface
  *
  * @api
+ * @since 100.0.2
  */
 interface FactoryInterface
 {
diff --git a/lib/internal/Magento/Framework/Mail/Template/SenderResolverInterface.php b/lib/internal/Magento/Framework/Mail/Template/SenderResolverInterface.php
index 89fcb7478bdf5..f283fe54819ac 100644
--- a/lib/internal/Magento/Framework/Mail/Template/SenderResolverInterface.php
+++ b/lib/internal/Magento/Framework/Mail/Template/SenderResolverInterface.php
@@ -9,6 +9,7 @@
  * Mail Sender Resolver interface
  *
  * @api
+ * @since 100.0.2
  */
 interface SenderResolverInterface
 {
diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
index 830d9b0f722e4..c0ca54cf228b8 100644
--- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilder.php
@@ -32,6 +32,7 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @since 100.0.2
  */
 class TransportBuilder
 {
@@ -243,7 +244,7 @@ public function setReplyTo($email, $name = null)
      * @throws InvalidArgumentException
      * @see setFromByScope()
      *
-     * @deprecated This function sets the from address but does not provide
+     * @deprecated 102.0.1 This function sets the from address but does not provide
      * a way of setting the correct from addresses based on the scope.
      */
     public function setFrom($from)
@@ -260,6 +261,7 @@ public function setFrom($from)
      * @return $this
      * @throws InvalidArgumentException
      * @throws MailException
+     * @since 102.0.1
      */
     public function setFromByScope($from, $scopeId = null)
     {
diff --git a/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php b/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
index 85b1b181d4f9e..416fbb1ecb1dd 100644
--- a/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
+++ b/lib/internal/Magento/Framework/Mail/Template/TransportBuilderByStore.php
@@ -11,7 +11,7 @@
 /**
  * Class TransportBuilderByStore
  *
- * @deprecated The ability to set From address based on store is now available
+ * @deprecated 102.0.1 The ability to set From address based on store is now available
  * in the \Magento\Framework\Mail\Template\TransportBuilder class
  * @see \Magento\Framework\Mail\Template\TransportBuilder::setFromByStore
  */
diff --git a/lib/internal/Magento/Framework/Mail/TemplateInterface.php b/lib/internal/Magento/Framework/Mail/TemplateInterface.php
index ad13772876ea1..b1062aec92bee 100644
--- a/lib/internal/Magento/Framework/Mail/TemplateInterface.php
+++ b/lib/internal/Magento/Framework/Mail/TemplateInterface.php
@@ -9,6 +9,7 @@
  * Mail Template interface
  *
  * @api
+ * @since 100.0.2
  */
 interface TemplateInterface extends \Magento\Framework\App\TemplateTypesInterface
 {
diff --git a/lib/internal/Magento/Framework/Mail/TransportInterface.php b/lib/internal/Magento/Framework/Mail/TransportInterface.php
index cccfad885838e..dd65439243ba3 100644
--- a/lib/internal/Magento/Framework/Mail/TransportInterface.php
+++ b/lib/internal/Magento/Framework/Mail/TransportInterface.php
@@ -9,6 +9,7 @@
  * Mail Transport interface
  *
  * @api
+ * @since 100.0.2
  */
 interface TransportInterface
 {
@@ -24,7 +25,7 @@ public function sendMessage();
      * Get message
      *
      * @return \Magento\Framework\Mail\MessageInterface
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getMessage();
 }
diff --git a/lib/internal/Magento/Framework/Math/Calculator.php b/lib/internal/Magento/Framework/Math/Calculator.php
index c09f90d4be4da..a8971f964a668 100644
--- a/lib/internal/Magento/Framework/Math/Calculator.php
+++ b/lib/internal/Magento/Framework/Math/Calculator.php
@@ -9,6 +9,7 @@
  * Calculations Library
  *
  * @api
+ * @since 100.0.2
  */
 class Calculator
 {
diff --git a/lib/internal/Magento/Framework/Math/Division.php b/lib/internal/Magento/Framework/Math/Division.php
index 820a11b80dea9..c69bc4379e77f 100644
--- a/lib/internal/Magento/Framework/Math/Division.php
+++ b/lib/internal/Magento/Framework/Math/Division.php
@@ -9,6 +9,7 @@
  * Division library
  *
  * @api
+ * @since 100.0.2
  */
 class Division
 {
diff --git a/lib/internal/Magento/Framework/Math/FloatComparator.php b/lib/internal/Magento/Framework/Math/FloatComparator.php
index 4053404369956..affec441e89fd 100644
--- a/lib/internal/Magento/Framework/Math/FloatComparator.php
+++ b/lib/internal/Magento/Framework/Math/FloatComparator.php
@@ -11,6 +11,7 @@
  * Contains methods to compare float digits.
  *
  * @api
+ * @since 101.0.6
  */
 class FloatComparator
 {
@@ -27,6 +28,7 @@ class FloatComparator
      * @param float $a
      * @param float $b
      * @return bool
+     * @since 101.0.6
      */
     public function equal(float $a, float $b): bool
     {
@@ -39,6 +41,7 @@ public function equal(float $a, float $b): bool
      * @param float $a
      * @param float $b
      * @return bool
+     * @since 101.0.6
      */
     public function greaterThan(float $a, float $b): bool
     {
@@ -51,6 +54,7 @@ public function greaterThan(float $a, float $b): bool
      * @param float $a
      * @param float $b
      * @return bool
+     * @since 101.0.6
      */
     public function greaterThanOrEqual(float $a, float $b): bool
     {
diff --git a/lib/internal/Magento/Framework/Math/Random.php b/lib/internal/Magento/Framework/Math/Random.php
index c2059e1935a80..8adb602e00479 100644
--- a/lib/internal/Magento/Framework/Math/Random.php
+++ b/lib/internal/Magento/Framework/Math/Random.php
@@ -12,6 +12,7 @@
  * Random data generator
  *
  * @api
+ * @since 100.0.2
  */
 class Random
 {
diff --git a/lib/internal/Magento/Framework/Message/AbstractMessage.php b/lib/internal/Magento/Framework/Message/AbstractMessage.php
index 85789bca9047c..c7f0b283d1dd9 100644
--- a/lib/internal/Magento/Framework/Message/AbstractMessage.php
+++ b/lib/internal/Magento/Framework/Message/AbstractMessage.php
@@ -9,6 +9,7 @@
  * Abstract message model
  *
  * @api
+ * @since 100.0.2
  */
 abstract class AbstractMessage implements MessageInterface
 {
diff --git a/lib/internal/Magento/Framework/Message/Collection.php b/lib/internal/Magento/Framework/Message/Collection.php
index 32e84fc28f5a0..dfcb06dd6f291 100644
--- a/lib/internal/Magento/Framework/Message/Collection.php
+++ b/lib/internal/Magento/Framework/Message/Collection.php
@@ -9,6 +9,7 @@
  * Messages collection
  *
  * @api
+ * @since 100.0.2
  */
 class Collection
 {
diff --git a/lib/internal/Magento/Framework/Message/ManagerInterface.php b/lib/internal/Magento/Framework/Message/ManagerInterface.php
index 360444fa897ac..29063a4deecbd 100644
--- a/lib/internal/Magento/Framework/Message/ManagerInterface.php
+++ b/lib/internal/Magento/Framework/Message/ManagerInterface.php
@@ -9,6 +9,7 @@
  * Adds different types of messages to the session, and allows access to existing messages.
  *
  * @api
+ * @since 100.0.2
  */
 interface ManagerInterface
 {
diff --git a/lib/internal/Magento/Framework/Message/MessageInterface.php b/lib/internal/Magento/Framework/Message/MessageInterface.php
index 2dad284152990..5a52b9b2fe649 100644
--- a/lib/internal/Magento/Framework/Message/MessageInterface.php
+++ b/lib/internal/Magento/Framework/Message/MessageInterface.php
@@ -9,6 +9,7 @@
  * Represent a message with a type, content text, and an isSticky attribute to prevent message from being cleared.
  *
  * @api
+ * @since 100.0.2
  */
 interface MessageInterface
 {
diff --git a/lib/internal/Magento/Framework/Message/PhraseFactory.php b/lib/internal/Magento/Framework/Message/PhraseFactory.php
index 2cfa324f40dbe..7efc83a811549 100644
--- a/lib/internal/Magento/Framework/Message/PhraseFactory.php
+++ b/lib/internal/Magento/Framework/Message/PhraseFactory.php
@@ -9,7 +9,7 @@
 
 /**
  * Factory to combine several messages into one
- * @deprecated 100.2.0
+ * @deprecated 101.0.0
  */
 class PhraseFactory
 {
diff --git a/lib/internal/Magento/Framework/MessageQueue/BatchConsumer.php b/lib/internal/Magento/Framework/MessageQueue/BatchConsumer.php
index 3dac6070e669f..e838744100a2d 100644
--- a/lib/internal/Magento/Framework/MessageQueue/BatchConsumer.php
+++ b/lib/internal/Magento/Framework/MessageQueue/BatchConsumer.php
@@ -275,7 +275,7 @@ private function lockMessages(array $messages)
      *
      * @return ConsumerConfig
      *
-     * @deprecated 100.2.0
+     * @deprecated 103.0.0
      */
     private function getConsumerConfig()
     {
@@ -292,7 +292,7 @@ private function getConsumerConfig()
      *
      * @return MessageController
      *
-     * @deprecated 100.1.0
+     * @deprecated 103.0.0
      */
     private function getMessageController()
     {
diff --git a/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeFactory.php b/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeFactory.php
index 47775ac857b07..d55b893f31ca7 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeFactory.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeFactory.php
@@ -9,7 +9,7 @@
  * Factory class for @see \Magento\Framework\MessageQueue\ExchangeInterface
  *
  * @api
- * @since 100.2.0
+ * @since 103.0.0
  */
 class ExchangeFactory implements ExchangeFactoryInterface
 {
@@ -27,7 +27,7 @@ class ExchangeFactory implements ExchangeFactoryInterface
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 100.2.0
+     * @since 103.0.0
      */
     protected $objectManager = null;
 
@@ -37,7 +37,6 @@ class ExchangeFactory implements ExchangeFactoryInterface
      * @param \Magento\Framework\MessageQueue\ConnectionTypeResolver $connectionTypeResolver
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param ExchangeFactoryInterface[] $exchangeFactories
-     * @since 100.2.0
      */
     public function __construct(
         \Magento\Framework\MessageQueue\ConnectionTypeResolver $connectionTypeResolver,
@@ -51,7 +50,7 @@ public function __construct(
 
     /**
      * @inheritdoc
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function create($connectionName, array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeFactoryInterface.php b/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeFactoryInterface.php
index dc691e632c9ed..d407be435332d 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeFactoryInterface.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeFactoryInterface.php
@@ -9,7 +9,7 @@
  * Factory class for @see \Magento\Framework\MessageQueue\Bulk\ExchangeInterface
  *
  * @api
- * @since 100.2.0
+ * @since 103.0.0
  */
 interface ExchangeFactoryInterface
 {
@@ -21,7 +21,7 @@ interface ExchangeFactoryInterface
      * @return ExchangeInterface
      * @throws \LogicException If exchange is not defined for the specified connection type
      *                          or it doesn't implement ExchangeInterface
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function create($connectionName, array $data = []);
 }
diff --git a/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeInterface.php b/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeInterface.php
index 08b64689c2940..a361d893d8d68 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeInterface.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Bulk/ExchangeInterface.php
@@ -9,7 +9,7 @@
  * Interface for bulk exchange.
  *
  * @api
- * @since 100.2.0
+ * @since 103.0.0
  */
 interface ExchangeInterface
 {
@@ -19,7 +19,7 @@ interface ExchangeInterface
      * @param string $topic
      * @param \Magento\Framework\MessageQueue\EnvelopeInterface[] $envelopes
      * @return mixed
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function enqueue($topic, array $envelopes);
 }
diff --git a/lib/internal/Magento/Framework/MessageQueue/Code/Generator/Config/RemoteServiceReader/Communication.php b/lib/internal/Magento/Framework/MessageQueue/Code/Generator/Config/RemoteServiceReader/Communication.php
index 6219dbf29b14c..ec8344ac69820 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Code/Generator/Config/RemoteServiceReader/Communication.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Code/Generator/Config/RemoteServiceReader/Communication.php
@@ -96,7 +96,7 @@ public function read($scope = null)
      * @param string $methodName
      * @return string
      *
-     * @deprecated 100.2.0
+     * @deprecated 103.0.0
      * @see \Magento\Framework\Communication\Config\ReflectionGenerator::generateTopicName
      */
     public function generateTopicName($typeName, $methodName)
diff --git a/lib/internal/Magento/Framework/MessageQueue/Code/Generator/Config/RemoteServiceReader/MessageQueue.php b/lib/internal/Magento/Framework/MessageQueue/Code/Generator/Config/RemoteServiceReader/MessageQueue.php
index 9412e1c2384f0..da361f08ee598 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Code/Generator/Config/RemoteServiceReader/MessageQueue.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Code/Generator/Config/RemoteServiceReader/MessageQueue.php
@@ -11,7 +11,7 @@
 /**
  * Remote service configuration reader.
  *
- * @deprecated 100.2.0
+ * @deprecated 103.0.0
  */
 class MessageQueue implements \Magento\Framework\Config\ReaderInterface
 {
diff --git a/lib/internal/Magento/Framework/MessageQueue/Code/Generator/RemoteServiceGenerator.php b/lib/internal/Magento/Framework/MessageQueue/Code/Generator/RemoteServiceGenerator.php
index 9dc0a9d0205f8..b68a242b50722 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Code/Generator/RemoteServiceGenerator.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Code/Generator/RemoteServiceGenerator.php
@@ -229,7 +229,7 @@ protected function validateResultClassName()
      *
      * @return ReflectionGenerator
      *
-     * @deprecated 100.2.0
+     * @deprecated 103.0.0
      */
     private function getReflectionGenerator()
     {
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config.php b/lib/internal/Magento/Framework/MessageQueue/Config.php
index 9a925e1417c12..9260a4afe951e 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Config.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Config.php
@@ -12,7 +12,7 @@
 /**
  * Queue configuration.
  *
- * @deprecated 100.2.0
+ * @deprecated 103.0.0
  */
 class Config implements ConfigInterface
 {
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Consumer/ConfigReaderPlugin.php b/lib/internal/Magento/Framework/MessageQueue/Config/Consumer/ConfigReaderPlugin.php
index c791baf4deb66..dd2448eb12561 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Config/Consumer/ConfigReaderPlugin.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Consumer/ConfigReaderPlugin.php
@@ -11,7 +11,7 @@
 /**
  * Plugin which provides access to consumers declared in queue config using consumer config interface.
  *
- * @deprecated 100.2.0
+ * @deprecated 103.0.0
  */
 class ConfigReaderPlugin
 {
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Publisher/ConfigReaderPlugin.php b/lib/internal/Magento/Framework/MessageQueue/Config/Publisher/ConfigReaderPlugin.php
index 78b82a67069bf..c1a4c9c6836e8 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Config/Publisher/ConfigReaderPlugin.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Publisher/ConfigReaderPlugin.php
@@ -11,7 +11,7 @@
 /**
  * Plugin which provides access to publishers declared in queue config using publisher config interface.
  *
- * @deprecated 100.2.0
+ * @deprecated 103.0.0
  */
 class ConfigReaderPlugin
 {
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml.php b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml.php
index 16efacf628d57..e09c3e411453b 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml.php
@@ -9,7 +9,7 @@
 /**
  * MessageQueue configuration filesystem loader. Loads all publisher configuration from XML file
  *
- * @deprecated 100.2.0
+ * @deprecated 103.0.0
  */
 class Xml extends \Magento\Framework\Config\Reader\Filesystem
 {
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/CompositeConverter.php b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/CompositeConverter.php
index 0184f720b3b4e..cffc4816a12d9 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/CompositeConverter.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/CompositeConverter.php
@@ -11,7 +11,7 @@
 /**
  * Converts MessageQueue config from \DOMDocument to array
  *
- * @deprecated 100.2.0
+ * @deprecated 103.0.0
  */
 class CompositeConverter implements ConverterInterface
 {
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/Converter/TopicConfig.php b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/Converter/TopicConfig.php
index e33d6ab5b1fb8..8b0d31f5abcc3 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/Converter/TopicConfig.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/Converter/TopicConfig.php
@@ -15,7 +15,7 @@
 /**
  * Converts MessageQueue config from \DOMDocument to array
  *
- * @deprecated 100.2.0
+ * @deprecated 103.0.0
  */
 class TopicConfig implements \Magento\Framework\Config\ConverterInterface
 {
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/SchemaLocator.php b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/SchemaLocator.php
index 613d564942e2f..37b4b34aec350 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/SchemaLocator.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Reader/Xml/SchemaLocator.php
@@ -9,7 +9,7 @@
 /**
  * Schema locator for Publishers
  *
- * @deprecated 100.2.0
+ * @deprecated 103.0.0
  */
 class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
 {
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Topology/ConfigReaderPlugin.php b/lib/internal/Magento/Framework/MessageQueue/Config/Topology/ConfigReaderPlugin.php
index b5f8d179961c6..2ee587bd78fb3 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Config/Topology/ConfigReaderPlugin.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Topology/ConfigReaderPlugin.php
@@ -10,7 +10,7 @@
 /**
  * Plugin which provides access to topology declared in queue config using topology config interface.
  *
- * @deprecated 100.2.0
+ * @deprecated 103.0.0
  */
 class ConfigReaderPlugin
 {
diff --git a/lib/internal/Magento/Framework/MessageQueue/ConfigInterface.php b/lib/internal/Magento/Framework/MessageQueue/ConfigInterface.php
index a88b5dedbd269..99259dcac6b4c 100644
--- a/lib/internal/Magento/Framework/MessageQueue/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/MessageQueue/ConfigInterface.php
@@ -9,7 +9,7 @@
 use Magento\Framework\Exception\LocalizedException;
 
 /**
- * @deprecated 100.2.0
+ * @deprecated 103.0.0
  */
 interface ConfigInterface
 {
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer.php b/lib/internal/Magento/Framework/MessageQueue/Consumer.php
index 8f65a2d8c5ed2..9c42a11cbb387 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Consumer.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer.php
@@ -240,7 +240,7 @@ private function getTransactionCallback(QueueInterface $queue)
      *
      * @return ConsumerConfig
      *
-     * @deprecated 100.2.0
+     * @deprecated 103.0.0
      */
     private function getConsumerConfig()
     {
@@ -255,7 +255,7 @@ private function getConsumerConfig()
      *
      * @return CommunicationConfig
      *
-     * @deprecated 100.2.0
+     * @deprecated 103.0.0
      */
     private function getCommunicationConfig()
     {
@@ -271,7 +271,7 @@ private function getCommunicationConfig()
      *
      * @return QueueRepository
      *
-     * @deprecated 100.2.0
+     * @deprecated 103.0.0
      */
     private function getQueueRepository()
     {
@@ -286,7 +286,7 @@ private function getQueueRepository()
      *
      * @return MessageController
      *
-     * @deprecated 100.1.0
+     * @deprecated 103.0.0
      */
     private function getMessageController()
     {
@@ -302,7 +302,7 @@ private function getMessageController()
      *
      * @return MessageValidator
      *
-     * @deprecated 100.2.0
+     * @deprecated 103.0.0
      */
     private function getMessageValidator()
     {
@@ -318,7 +318,7 @@ private function getMessageValidator()
      *
      * @return EnvelopeFactory
      *
-     * @deprecated 100.2.0
+     * @deprecated 103.0.0
      */
     private function getEnvelopeFactory()
     {
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/ConfigInterface.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/ConfigInterface.php
index 344b5ef1d580c..f0e2be9e37aa3 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Consumer/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/ConfigInterface.php
@@ -12,7 +12,7 @@
  * Consumer config interface provides access data declared in etc/queue_consumer.xml
  *
  * @api
- * @since 100.2.0
+ * @since 103.0.0
  */
 interface ConfigInterface
 {
@@ -23,7 +23,7 @@ interface ConfigInterface
      * @return ConsumerConfigItemInterface
      * @throws LocalizedException
      * @throws \LogicException
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function getConsumer($name);
 
@@ -32,7 +32,7 @@ public function getConsumer($name);
      *
      * @return ConsumerConfigItemInterface[]
      * @throws \LogicException
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function getConsumers();
 }
diff --git a/lib/internal/Magento/Framework/MessageQueue/ConsumerConfiguration.php b/lib/internal/Magento/Framework/MessageQueue/ConsumerConfiguration.php
index 09cd5dcb8d909..70c4632092f67 100644
--- a/lib/internal/Magento/Framework/MessageQueue/ConsumerConfiguration.php
+++ b/lib/internal/Magento/Framework/MessageQueue/ConsumerConfiguration.php
@@ -174,7 +174,7 @@ private function getData($key)
      *
      * @return ConsumerConfig
      *
-     * @deprecated 100.2.0
+     * @deprecated 103.0.0
      */
     private function getConsumerConfig()
     {
@@ -189,7 +189,7 @@ private function getConsumerConfig()
      *
      * @return CommunicationConfig
      *
-     * @deprecated 100.2.0
+     * @deprecated 103.0.0
      */
     private function getCommunicationConfig()
     {
diff --git a/lib/internal/Magento/Framework/MessageQueue/ConsumerConfigurationInterface.php b/lib/internal/Magento/Framework/MessageQueue/ConsumerConfigurationInterface.php
index b825949ddb019..cd5e2015caf0b 100644
--- a/lib/internal/Magento/Framework/MessageQueue/ConsumerConfigurationInterface.php
+++ b/lib/internal/Magento/Framework/MessageQueue/ConsumerConfigurationInterface.php
@@ -42,7 +42,7 @@ public function getQueueName();
      * Get consumer type sync|async.
      *
      * @return string
-     * @deprecated 100.2.0
+     * @deprecated 103.0.0
      * @see \Magento\Framework\Communication\ConfigInterface::getTopic
      * @throws \LogicException
      */
diff --git a/lib/internal/Magento/Framework/MessageQueue/ConsumerFactory.php b/lib/internal/Magento/Framework/MessageQueue/ConsumerFactory.php
index 7d9f210b4a698..6632971cd4305 100644
--- a/lib/internal/Magento/Framework/MessageQueue/ConsumerFactory.php
+++ b/lib/internal/Magento/Framework/MessageQueue/ConsumerFactory.php
@@ -122,7 +122,7 @@ private function createConsumerConfiguration($consumerConfigItem)
      *
      * @return ConsumerConfig
      *
-     * @deprecated 100.2.0
+     * @deprecated 103.0.0
      */
     private function getConsumerConfig()
     {
@@ -137,7 +137,7 @@ private function getConsumerConfig()
      *
      * @return CommunicationConfig
      *
-     * @deprecated 100.2.0
+     * @deprecated 103.0.0
      */
     private function getCommunicationConfig()
     {
diff --git a/lib/internal/Magento/Framework/MessageQueue/ConsumerInterface.php b/lib/internal/Magento/Framework/MessageQueue/ConsumerInterface.php
index ca45da7eca8ff..bb28a1a5d5ea7 100644
--- a/lib/internal/Magento/Framework/MessageQueue/ConsumerInterface.php
+++ b/lib/internal/Magento/Framework/MessageQueue/ConsumerInterface.php
@@ -9,6 +9,8 @@
  * Consumers will connect to a queue, read messages, and invoke a method to process the message contents.
  *
  * @api
+ * @since 103.0.0
+ * @since 100.0.2
  */
 interface ConsumerInterface
 {
@@ -18,6 +20,7 @@ interface ConsumerInterface
      * @param int|null $maxNumberOfMessages if not specified - process all queued incoming messages and terminate,
      *      otherwise terminate execution after processing the specified number of messages
      * @return void
+     * @since 103.0.0
      */
     public function process($maxNumberOfMessages = null);
 }
diff --git a/lib/internal/Magento/Framework/MessageQueue/EnvelopeInterface.php b/lib/internal/Magento/Framework/MessageQueue/EnvelopeInterface.php
index 07f12d1856317..d564636f54a95 100644
--- a/lib/internal/Magento/Framework/MessageQueue/EnvelopeInterface.php
+++ b/lib/internal/Magento/Framework/MessageQueue/EnvelopeInterface.php
@@ -7,6 +7,8 @@
 
 /**
  * @api
+ * @since 103.0.0
+ * @since 100.0.2
  */
 interface EnvelopeInterface
 {
@@ -14,6 +16,7 @@ interface EnvelopeInterface
      * Binary representation of message
      *
      * @return string
+     * @since 103.0.0
      */
     public function getBody();
 
@@ -21,6 +24,7 @@ public function getBody();
      * Message metadata
      *
      * @return array
+     * @since 103.0.0
      */
     public function getProperties();
 }
diff --git a/lib/internal/Magento/Framework/MessageQueue/ExchangeFactory.php b/lib/internal/Magento/Framework/MessageQueue/ExchangeFactory.php
index ca1ef769af90f..28e411c6dbbee 100644
--- a/lib/internal/Magento/Framework/MessageQueue/ExchangeFactory.php
+++ b/lib/internal/Magento/Framework/MessageQueue/ExchangeFactory.php
@@ -9,7 +9,7 @@
  * Factory class for @see \Magento\Framework\MessageQueue\ExchangeInterface
  *
  * @api
- * @since 100.2.0
+ * @since 103.0.0
  */
 class ExchangeFactory implements ExchangeFactoryInterface
 {
@@ -27,7 +27,7 @@ class ExchangeFactory implements ExchangeFactoryInterface
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 100.2.0
+     * @since 103.0.0
      */
     protected $objectManager = null;
 
@@ -37,7 +37,6 @@ class ExchangeFactory implements ExchangeFactoryInterface
      * @param ConnectionTypeResolver $connectionTypeResolver
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param ExchangeFactoryInterface[] $exchangeFactories
-     * @since 100.2.0
      */
     public function __construct(
         ConnectionTypeResolver $connectionTypeResolver,
@@ -51,7 +50,7 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function create($connectionName, array $data = [])
     {
diff --git a/lib/internal/Magento/Framework/MessageQueue/ExchangeFactoryInterface.php b/lib/internal/Magento/Framework/MessageQueue/ExchangeFactoryInterface.php
index 1e70b0266fc4f..4b29c5e25b361 100644
--- a/lib/internal/Magento/Framework/MessageQueue/ExchangeFactoryInterface.php
+++ b/lib/internal/Magento/Framework/MessageQueue/ExchangeFactoryInterface.php
@@ -9,7 +9,7 @@
  * Factory class for @see \Magento\Framework\MessageQueue\ExchangeInterface
  *
  * @api
- * @since 100.2.0
+ * @since 103.0.0
  */
 interface ExchangeFactoryInterface
 {
@@ -19,7 +19,7 @@ interface ExchangeFactoryInterface
      * @param string $connectionName
      * @param array $data
      * @return ExchangeInterface
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function create($connectionName, array $data = []);
 }
diff --git a/lib/internal/Magento/Framework/MessageQueue/ExchangeInterface.php b/lib/internal/Magento/Framework/MessageQueue/ExchangeInterface.php
index bb36332ae25b1..4495b210f0613 100644
--- a/lib/internal/Magento/Framework/MessageQueue/ExchangeInterface.php
+++ b/lib/internal/Magento/Framework/MessageQueue/ExchangeInterface.php
@@ -9,6 +9,8 @@
  * Interface message Exchange
  *
  * @api
+ * @since 103.0.0
+ * @since 100.0.2
  */
 interface ExchangeInterface
 {
@@ -18,6 +20,7 @@ interface ExchangeInterface
      * @param string $topic
      * @param EnvelopeInterface $envelope
      * @return mixed
+     * @since 103.0.0
      */
     public function enqueue($topic, EnvelopeInterface $envelope);
 }
diff --git a/lib/internal/Magento/Framework/MessageQueue/ExchangeRepository.php b/lib/internal/Magento/Framework/MessageQueue/ExchangeRepository.php
index 1f26e5d785c1a..cf17c765b49cf 100644
--- a/lib/internal/Magento/Framework/MessageQueue/ExchangeRepository.php
+++ b/lib/internal/Magento/Framework/MessageQueue/ExchangeRepository.php
@@ -53,7 +53,7 @@ public function getByConnectionName($connectionName)
      * Get exchange factory.
      *
      * @return ExchangeFactoryInterface
-     * @deprecated 100.2.0
+     * @deprecated 103.0.0
      */
     private function getExchangeFactory()
     {
diff --git a/lib/internal/Magento/Framework/MessageQueue/MessageEncoder.php b/lib/internal/Magento/Framework/MessageQueue/MessageEncoder.php
index 91ad24eaeb978..e8f8e6e3f7118 100644
--- a/lib/internal/Magento/Framework/MessageQueue/MessageEncoder.php
+++ b/lib/internal/Magento/Framework/MessageQueue/MessageEncoder.php
@@ -219,7 +219,7 @@ protected function getConverter($direction)
      *
      * @return CommunicationConfig
      *
-     * @deprecated 100.2.0
+     * @deprecated 103.0.0
      */
     private function getCommunicationConfig()
     {
diff --git a/lib/internal/Magento/Framework/MessageQueue/MessageIdGeneratorInterface.php b/lib/internal/Magento/Framework/MessageQueue/MessageIdGeneratorInterface.php
index 727db7d34761a..3d88c111d1b90 100644
--- a/lib/internal/Magento/Framework/MessageQueue/MessageIdGeneratorInterface.php
+++ b/lib/internal/Magento/Framework/MessageQueue/MessageIdGeneratorInterface.php
@@ -9,7 +9,7 @@
  * Used to generate unique id for queue message.
  *
  * @api
- * @since 100.2.0
+ * @since 103.0.0
  */
 interface MessageIdGeneratorInterface
 {
@@ -18,7 +18,7 @@ interface MessageIdGeneratorInterface
      *
      * @param string $topicName
      * @return string
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function generate($topicName);
 }
diff --git a/lib/internal/Magento/Framework/MessageQueue/MessageLockException.php b/lib/internal/Magento/Framework/MessageQueue/MessageLockException.php
index 4ea462f7e1a8e..ac622aa6cffef 100644
--- a/lib/internal/Magento/Framework/MessageQueue/MessageLockException.php
+++ b/lib/internal/Magento/Framework/MessageQueue/MessageLockException.php
@@ -11,7 +11,7 @@
  * Class MessageLockException to be thrown when a message being processed is already in the lock table.
  *
  * @api
- * @since 100.1.0
+ * @since 103.0.0
  */
 class MessageLockException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/MessageQueue/MessageValidator.php b/lib/internal/Magento/Framework/MessageQueue/MessageValidator.php
index 7c1a947623e9f..45ce351ed97bb 100644
--- a/lib/internal/Magento/Framework/MessageQueue/MessageValidator.php
+++ b/lib/internal/Magento/Framework/MessageQueue/MessageValidator.php
@@ -191,7 +191,7 @@ private function getRealType($message)
      *
      * @return CommunicationConfig
      *
-     * @deprecated 100.2.0
+     * @deprecated 103.0.0
      */
     private function getCommunicationConfig()
     {
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher.php b/lib/internal/Magento/Framework/MessageQueue/Publisher.php
index 8fe77abe69136..78d8c0f1bcafa 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Publisher.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher.php
@@ -109,7 +109,7 @@ private function isAmqpConfigured()
      *
      * @return PublisherConfig
      *
-     * @deprecated 100.2.0
+     * @deprecated 103.0.0
      */
     private function getPublisherConfig()
     {
@@ -124,7 +124,7 @@ private function getPublisherConfig()
      *
      * @return AmqpConfig
      *
-     * @deprecated
+     * @deprecated 100.2.0 103.0.0
      */
     private function getAmqpConfig()
     {
diff --git a/lib/internal/Magento/Framework/MessageQueue/Publisher/ConfigInterface.php b/lib/internal/Magento/Framework/MessageQueue/Publisher/ConfigInterface.php
index 7b5586b28a273..a10b7930c6eae 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Publisher/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Publisher/ConfigInterface.php
@@ -12,7 +12,7 @@
  * Publisher config interface provides access data declared in etc/queue_publisher.xml
  *
  * @api
- * @since 100.2.0
+ * @since 103.0.0
  */
 interface ConfigInterface
 {
@@ -23,7 +23,7 @@ interface ConfigInterface
      * @return PublisherConfigItemInterface
      * @throws LocalizedException
      * @throws \LogicException
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function getPublisher($topic);
 
@@ -32,7 +32,7 @@ public function getPublisher($topic);
      *
      * @return PublisherConfigItemInterface[]
      * @throws \LogicException
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function getPublishers();
 }
diff --git a/lib/internal/Magento/Framework/MessageQueue/PublisherInterface.php b/lib/internal/Magento/Framework/MessageQueue/PublisherInterface.php
index 1aee963b1bd47..9f33b5b39d2ad 100644
--- a/lib/internal/Magento/Framework/MessageQueue/PublisherInterface.php
+++ b/lib/internal/Magento/Framework/MessageQueue/PublisherInterface.php
@@ -9,6 +9,8 @@
  * Producer to publish messages via a specific transport to a specific queue or exchange.
  *
  * @api
+ * @since 103.0.0
+ * @since 100.0.2
  */
 interface PublisherInterface
 {
@@ -19,6 +21,7 @@ interface PublisherInterface
      * @param array|object $data
      * @return null|mixed
      * @throws \InvalidArgumentException If message is not formed properly
+     * @since 103.0.0
      */
     public function publish($topicName, $data);
 }
diff --git a/lib/internal/Magento/Framework/MessageQueue/PublisherPool.php b/lib/internal/Magento/Framework/MessageQueue/PublisherPool.php
index 2c1e4e64c7d71..4a289d8f0a320 100644
--- a/lib/internal/Magento/Framework/MessageQueue/PublisherPool.php
+++ b/lib/internal/Magento/Framework/MessageQueue/PublisherPool.php
@@ -14,7 +14,7 @@
  * Publishers pool.
  *
  * @api
- * @since 100.1.0
+ * @since 103.0.0
  */
 class PublisherPool implements PublisherInterface, BulkPublisherInterface
 {
@@ -35,7 +35,7 @@ class PublisherPool implements PublisherInterface, BulkPublisherInterface
      * Publisher objects pool.
      *
      * @var \Magento\Framework\MessageQueue\PublisherInterface[]
-     * @since 100.1.0
+     * @since 103.0.0
      */
     protected $publishers = [];
 
@@ -43,7 +43,7 @@ class PublisherPool implements PublisherInterface, BulkPublisherInterface
      * Communication config.
      *
      * @var CommunicationConfig
-     * @since 100.1.0
+     * @since 103.0.0
      */
     protected $communicationConfig;
 
@@ -65,7 +65,6 @@ class PublisherPool implements PublisherInterface, BulkPublisherInterface
      * @param string[] $publishers
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @since 100.1.0
      */
     public function __construct(
         CommunicationConfig $communicationConfig,
@@ -78,7 +77,7 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 100.1.0
+     * @since 103.0.0
      */
     public function publish($topicName, $data)
     {
@@ -163,7 +162,7 @@ private function getPublisherForConnectionNameAndType($type, $connectionName)
      *
      * @return PublisherConfig
      *
-     * @deprecated 100.2.0
+     * @deprecated 103.0.0
      */
     private function getPublisherConfig()
     {
@@ -178,7 +177,7 @@ private function getPublisherConfig()
      *
      * @return ConnectionTypeResolver
      *
-     * @deprecated 100.2.0
+     * @deprecated 103.0.0
      */
     private function getConnectionTypeResolver()
     {
diff --git a/lib/internal/Magento/Framework/MessageQueue/QueueFactory.php b/lib/internal/Magento/Framework/MessageQueue/QueueFactory.php
index eb734df06a59f..3e1fe8f04ba6c 100644
--- a/lib/internal/Magento/Framework/MessageQueue/QueueFactory.php
+++ b/lib/internal/Magento/Framework/MessageQueue/QueueFactory.php
@@ -9,7 +9,7 @@
  * Factory class for @see \Magento\Framework\MessageQueue\Queuenterface
  *
  * @api
- * @since 100.2.0
+ * @since 103.0.0
  */
 class QueueFactory implements QueueFactoryInterface
 {
@@ -27,7 +27,7 @@ class QueueFactory implements QueueFactoryInterface
      * Object Manager instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
-     * @since 100.2.0
+     * @since 103.0.0
      */
     protected $objectManager = null;
 
@@ -37,7 +37,6 @@ class QueueFactory implements QueueFactoryInterface
      * @param ConnectionTypeResolver $connectionTypeResolver
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
      * @param QueueFactoryInterface[] $queueFactories
-     * @since 100.2.0
      */
     public function __construct(
         ConnectionTypeResolver $connectionTypeResolver,
@@ -51,7 +50,7 @@ public function __construct(
 
     /**
      * {@inheritdoc}
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function create($queueName, $connectionName)
     {
diff --git a/lib/internal/Magento/Framework/MessageQueue/QueueFactoryInterface.php b/lib/internal/Magento/Framework/MessageQueue/QueueFactoryInterface.php
index 697db9296b5b0..4ca7bc6ecae87 100644
--- a/lib/internal/Magento/Framework/MessageQueue/QueueFactoryInterface.php
+++ b/lib/internal/Magento/Framework/MessageQueue/QueueFactoryInterface.php
@@ -9,7 +9,7 @@
  * Factory class for @see \Magento\Framework\MessageQueue\QueueInterface
  *
  * @api
- * @since 100.2.0
+ * @since 103.0.0
  */
 interface QueueFactoryInterface
 {
@@ -19,7 +19,7 @@ interface QueueFactoryInterface
      * @param string $queueName
      * @param string $connectionName
      * @return QueueInterface
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function create($queueName, $connectionName);
 }
diff --git a/lib/internal/Magento/Framework/MessageQueue/QueueInterface.php b/lib/internal/Magento/Framework/MessageQueue/QueueInterface.php
index 1b3814b8e857a..db64e83047c03 100644
--- a/lib/internal/Magento/Framework/MessageQueue/QueueInterface.php
+++ b/lib/internal/Magento/Framework/MessageQueue/QueueInterface.php
@@ -9,6 +9,8 @@
  * Interface for interaction with message queue.
  *
  * @api
+ * @since 103.0.0
+ * @since 100.0.2
  */
 interface QueueInterface
 {
@@ -16,6 +18,7 @@ interface QueueInterface
      * Get message from queue
      *
      * @return EnvelopeInterface
+     * @since 103.0.0
      */
     public function dequeue();
 
@@ -24,6 +27,7 @@ public function dequeue();
      *
      * @param EnvelopeInterface $envelope
      * @return void
+     * @since 103.0.0
      */
     public function acknowledge(EnvelopeInterface $envelope);
 
@@ -32,6 +36,7 @@ public function acknowledge(EnvelopeInterface $envelope);
      *
      * @param callable|array $callback
      * @return void
+     * @since 103.0.0
      */
     public function subscribe($callback);
 
@@ -42,6 +47,7 @@ public function subscribe($callback);
      * @param bool $requeue
      * @param string $rejectionMessage
      * @return void
+     * @since 103.0.0
      */
     public function reject(EnvelopeInterface $envelope, $requeue = true, $rejectionMessage = null);
 
@@ -50,7 +56,7 @@ public function reject(EnvelopeInterface $envelope, $requeue = true, $rejectionM
      *
      * @param EnvelopeInterface $envelope
      * @return void
-     * @since 100.1.0
+     * @since 103.0.0
      */
     public function push(EnvelopeInterface $envelope);
 }
diff --git a/lib/internal/Magento/Framework/MessageQueue/QueueRepository.php b/lib/internal/Magento/Framework/MessageQueue/QueueRepository.php
index 5d04003c9ade0..e28d44a9b5d2b 100644
--- a/lib/internal/Magento/Framework/MessageQueue/QueueRepository.php
+++ b/lib/internal/Magento/Framework/MessageQueue/QueueRepository.php
@@ -57,7 +57,7 @@ public function get($connectionName, $queueName)
      * Get queue factory.
      *
      * @return QueueFactoryInterface
-     * @deprecated 100.2.0
+     * @deprecated 103.0.0
      */
     private function getQueueFactory()
     {
diff --git a/lib/internal/Magento/Framework/MessageQueue/Rpc/Consumer.php b/lib/internal/Magento/Framework/MessageQueue/Rpc/Consumer.php
index 10ef24c462808..46534eb55f613 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Rpc/Consumer.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Rpc/Consumer.php
@@ -9,7 +9,7 @@
 /**
  * A MessageQueue Consumer to handle receiving, processing and replying to an RPC message.
  *
- * @deprecated 100.2.0
+ * @deprecated 103.0.0
  */
 class Consumer extends \Magento\Framework\MessageQueue\Consumer
 {
diff --git a/lib/internal/Magento/Framework/MessageQueue/Rpc/Publisher.php b/lib/internal/Magento/Framework/MessageQueue/Rpc/Publisher.php
index 89b987cbb4405..90b2763471ee0 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Rpc/Publisher.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Rpc/Publisher.php
@@ -107,7 +107,7 @@ public function publish($topicName, $data)
      *
      * @return ResponseQueueNameBuilder
      *
-     * @deprecated 100.2.0
+     * @deprecated 103.0.0
      */
     private function getResponseQueueNameBuilder()
     {
@@ -123,7 +123,7 @@ private function getResponseQueueNameBuilder()
      *
      * @return PublisherConfig
      *
-     * @deprecated 100.2.0
+     * @deprecated 103.0.0
      */
     private function getPublisherConfig()
     {
diff --git a/lib/internal/Magento/Framework/MessageQueue/Topology/ConfigInterface.php b/lib/internal/Magento/Framework/MessageQueue/Topology/ConfigInterface.php
index 81d056999b573..b7b15ecd07112 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Topology/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Topology/ConfigInterface.php
@@ -13,7 +13,7 @@
  * Topology config interface provides access data declared in etc/queue_topology.xml
  *
  * @api
- * @since 100.2.0
+ * @since 103.0.0
  */
 interface ConfigInterface
 {
@@ -25,7 +25,7 @@ interface ConfigInterface
      * @return ExchangeConfigItemInterface
      * @throws LocalizedException
      * @throws \LogicException
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function getExchange($name, $connection);
 
@@ -34,7 +34,7 @@ public function getExchange($name, $connection);
      *
      * @return ExchangeConfigItemInterface[]
      * @throws \LogicException
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function getExchanges();
 
@@ -43,7 +43,7 @@ public function getExchanges();
      *
      * @return QueueConfigItemInterface[]
      * @throws \LogicException
-     * @since 100.2.0
+     * @since 103.0.0
      */
     public function getQueues();
 }
diff --git a/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php b/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php
index 5484103cc27ef..306159f8d22d5 100644
--- a/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php
+++ b/lib/internal/Magento/Framework/Model/AbstractExtensibleModel.php
@@ -17,6 +17,7 @@
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * phpcs:disable Magento2.Classes.AbstractApi
  * @api
+ * @since 100.0.2
  */
 abstract class AbstractExtensibleModel extends AbstractModel implements
     \Magento\Framework\Api\CustomAttributesDataInterface
@@ -387,6 +388,7 @@ private function populateExtensionAttributes(array $extensionAttributesData = []
 
     /**
      * @inheritdoc
+     * @since 100.0.11
      */
     public function __sleep()
     {
@@ -395,6 +397,7 @@ public function __sleep()
 
     /**
      * @inheritdoc
+     * @since 100.0.11
      */
     public function __wakeup()
     {
diff --git a/lib/internal/Magento/Framework/Model/AbstractModel.php b/lib/internal/Magento/Framework/Model/AbstractModel.php
index 8018c6176390f..b6473f8b0ab3c 100644
--- a/lib/internal/Magento/Framework/Model/AbstractModel.php
+++ b/lib/internal/Magento/Framework/Model/AbstractModel.php
@@ -15,6 +15,7 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @SuppressWarnings(PHPMD.TooManyFields)
+ * @since 100.0.2
  */
 abstract class AbstractModel extends \Magento\Framework\DataObject
 {
@@ -467,7 +468,7 @@ protected function _setResourceModel($resourceName, $collectionName = null)
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     * @deprecated because resource models should be used directly
+     * @deprecated 101.0.0 because resource models should be used directly
      */
     protected function _getResource()
     {
@@ -496,7 +497,7 @@ public function getResourceName()
      * @TODO MAGETWO-23541: Incorrect dependencies between Model\AbstractModel and Data\Collection\Db from Framework
      * @throws \Magento\Framework\Exception\LocalizedException
      * @return \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
-     * @deprecated because collections should be used directly via factory
+     * @deprecated 101.0.0 because collections should be used directly via factory
      */
     public function getResourceCollection()
     {
@@ -517,7 +518,7 @@ public function getResourceCollection()
      *
      * @TODO MAGETWO-23541: Incorrect dependencies between Model\AbstractModel and Data\Collection\Db from Framework
      * @return \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
-     * @deprecated because collections should be used directly via factory
+     * @deprecated 101.0.0 because collections should be used directly via factory
      */
     public function getCollection()
     {
@@ -587,7 +588,7 @@ protected function _afterLoad()
      * @param string $identifier
      * @param string|null $field
      * @return void
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function beforeLoad($identifier, $field = null)
     {
@@ -895,7 +896,7 @@ public function afterDeleteCommit()
      * Retrieve model resource
      *
      * @return \Magento\Framework\Model\ResourceModel\Db\AbstractDb
-     * @deprecated because resource models should be used directly
+     * @deprecated 101.0.0 because resource models should be used directly
      */
     public function getResource()
     {
diff --git a/lib/internal/Magento/Framework/Model/ActionValidator/RemoveAction.php b/lib/internal/Magento/Framework/Model/ActionValidator/RemoveAction.php
index 430bb6f65f295..e6b492b0a04fc 100644
--- a/lib/internal/Magento/Framework/Model/ActionValidator/RemoveAction.php
+++ b/lib/internal/Magento/Framework/Model/ActionValidator/RemoveAction.php
@@ -12,6 +12,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class RemoveAction
 {
diff --git a/lib/internal/Magento/Framework/Model/Context.php b/lib/internal/Magento/Framework/Model/Context.php
index 910a0d48a5e9c..301398a67f6de 100644
--- a/lib/internal/Magento/Framework/Model/Context.php
+++ b/lib/internal/Magento/Framework/Model/Context.php
@@ -19,6 +19,7 @@
  * the classes they were introduced for.
  *
  * @api
+ * @since 100.0.2
  */
 class Context implements \Magento\Framework\ObjectManager\ContextInterface
 {
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/AbstractResource.php b/lib/internal/Magento/Framework/Model/ResourceModel/AbstractResource.php
index 255e6d94d741f..71e87d4cb6d87 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/AbstractResource.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/AbstractResource.php
@@ -14,17 +14,19 @@
  * Abstract resource model
  *
  * @api
+ * @since 100.0.2
  */
 abstract class AbstractResource
 {
     /**
      * @var Json
-     * @since 100.2.0
+     * @since 101.0.0
      */
     protected $serializer;
 
     /**
      * @var \Psr\Log\LoggerInterface
+     * @since 102.0.0
      */
     protected $_logger;
 
@@ -247,8 +249,8 @@ protected function _getColumnsForEntityLoad(\Magento\Framework\Model\AbstractMod
      * Get serializer
      *
      * @return Json
-     * @deprecated 100.2.0
-     * @since 100.2.0
+     * @deprecated 101.0.0
+     * @since 101.0.0
      */
     protected function getSerializer()
     {
@@ -262,7 +264,7 @@ protected function getSerializer()
      * Get logger
      *
      * @return \Psr\Log\LoggerInterface
-     * @deprecated
+     * @deprecated 101.0.1
      */
     private function getLogger()
     {
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/AbstractDb.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/AbstractDb.php
index 626fc42a80778..33427a219f9c1 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/AbstractDb.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/AbstractDb.php
@@ -20,6 +20,7 @@
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * phpcs:disable Magento2.Classes.AbstractApi
  * @api
+ * @since 100.0.2
  */
 abstract class AbstractDb extends AbstractResource
 {
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractCollection.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractCollection.php
index cba5f133f53c8..b63291394e1d1 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractCollection.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/Collection/AbstractCollection.php
@@ -15,6 +15,7 @@
  * phpcs:disable Magento2.Classes.AbstractApi
  * @api
  * @SuppressWarnings(PHPMD.NumberOfChildren)
+ * @since 100.0.2
  */
 abstract class AbstractCollection extends AbstractDb implements SourceProviderInterface
 {
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/ObjectRelationProcessor.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/ObjectRelationProcessor.php
index e899cc56f4548..0851c48d50036 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/ObjectRelationProcessor.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/ObjectRelationProcessor.php
@@ -10,6 +10,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class ObjectRelationProcessor
 {
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/TransactionManagerInterface.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/TransactionManagerInterface.php
index 166789196cfa6..81ef2b1b5fa18 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/TransactionManagerInterface.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/TransactionManagerInterface.php
@@ -9,6 +9,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 interface TransactionManagerInterface
 {
diff --git a/lib/internal/Magento/Framework/Module/Dir/Reader.php b/lib/internal/Magento/Framework/Module/Dir/Reader.php
index 141a291ea6818..42d97235d578e 100644
--- a/lib/internal/Magento/Framework/Module/Dir/Reader.php
+++ b/lib/internal/Magento/Framework/Module/Dir/Reader.php
@@ -15,6 +15,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class Reader
 {
diff --git a/lib/internal/Magento/Framework/Module/Manager.php b/lib/internal/Magento/Framework/Module/Manager.php
index b47349631a033..73ea68ac367c3 100644
--- a/lib/internal/Magento/Framework/Module/Manager.php
+++ b/lib/internal/Magento/Framework/Module/Manager.php
@@ -23,7 +23,7 @@ class Manager
 {
     /**
      * @var Output\ConfigInterface
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     private $outputConfig;
 
@@ -34,7 +34,7 @@ class Manager
 
     /**
      * @var array
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     private $outputConfigPaths;
 
@@ -69,7 +69,7 @@ public function isEnabled($moduleName)
      *
      * @param string $moduleName Fully-qualified module name
      * @return boolean
-     * @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
+     * @deprecated 101.0.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
      * version. Module output can still be enabled/disabled in configuration files. However, this functionality should
      * not be used in future development. Module design should explicitly state dependencies to avoid requiring output
      * disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
@@ -87,7 +87,7 @@ public function isOutputEnabled($moduleName)
      *
      * @param string $moduleName Fully-qualified module name
      * @return boolean
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected function _isCustomOutputConfigEnabled($moduleName)
     {
diff --git a/lib/internal/Magento/Framework/Module/ModuleResource.php b/lib/internal/Magento/Framework/Module/ModuleResource.php
index b453ea4cba095..f7f212b829997 100644
--- a/lib/internal/Magento/Framework/Module/ModuleResource.php
+++ b/lib/internal/Magento/Framework/Module/ModuleResource.php
@@ -11,7 +11,7 @@
 /**
  * Resource Model
  *
- * @deprecated Declarative schema and data patches replace old functionality and setup_module table
+ * @deprecated 102.0.0 Declarative schema and data patches replace old functionality and setup_module table
  * So all resources related to this table, will be deprecated since 2.3.0
  */
 class ModuleResource extends AbstractDb implements ResourceInterface
@@ -141,7 +141,7 @@ public function setDataVersion($moduleName, $version)
     /**
      * Flush all class cache
      *
-     * @deprecated This method was added as temporary solution, to increase modularity:
+     * @deprecated 102.0.0 This method was added as temporary solution, to increase modularity:
      * Because before new modules appears in resource only on next bootstrap
      * @return void
      */
diff --git a/lib/internal/Magento/Framework/Module/Output/Config.php b/lib/internal/Magento/Framework/Module/Output/Config.php
index 48afc97dc5336..765998fcdb568 100644
--- a/lib/internal/Magento/Framework/Module/Output/Config.php
+++ b/lib/internal/Magento/Framework/Module/Output/Config.php
@@ -8,7 +8,7 @@
 namespace Magento\Framework\Module\Output;
 
 /**
- * @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
+ * @deprecated 101.0.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
  * version. Module output can still be enabled/disabled in configuration files. However, this functionality should
  * not be used in future development. Module design should explicitly state dependencies to avoid requiring output
  * disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
@@ -24,13 +24,13 @@ class Config implements \Magento\Framework\Module\Output\ConfigInterface
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected $_scopeConfig;
 
     /**
      * @var string
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     protected $_storeType;
 
@@ -50,7 +50,7 @@ public function __construct(
      * Whether a module is enabled in the configuration or not
      *
      * @param string $moduleName Fully-qualified module name
-     * @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
+     * @deprecated 101.0.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
      * version. Module output can still be enabled/disabled in configuration files. However, this functionality should
      * not be used in future development. Module design should explicitly state dependencies to avoid requiring output
      * disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
@@ -66,7 +66,7 @@ public function isEnabled($moduleName)
      * Retrieve module enabled specific path
      *
      * @param string $path Fully-qualified config path
-     * @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
+     * @deprecated 101.0.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
      * version. Module output can still be enabled/disabled in configuration files. However, this functionality should
      * not be used in future development. Module design should explicitly state dependencies to avoid requiring output
      * disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
diff --git a/lib/internal/Magento/Framework/Module/Output/ConfigInterface.php b/lib/internal/Magento/Framework/Module/Output/ConfigInterface.php
index 6813691b9c906..b657e742ee2f0 100644
--- a/lib/internal/Magento/Framework/Module/Output/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/Module/Output/ConfigInterface.php
@@ -6,7 +6,7 @@
 namespace Magento\Framework\Module\Output;
 
 /**
- * @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
+ * @deprecated 101.0.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
  * version. Module output can still be enabled/disabled in configuration files.
  */
 interface ConfigInterface
@@ -15,7 +15,7 @@ interface ConfigInterface
      * Whether a module is enabled in the configuration or not
      *
      * @param string $moduleName Fully-qualified module name
-     * @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
+     * @deprecated 101.0.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
      * version. Module output can still be enabled/disabled in configuration files. However, this functionality should
      * not be used in future development. Module design should explicitly state dependencies to avoid requiring output
      * disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
@@ -28,7 +28,7 @@ public function isEnabled($moduleName);
      * Retrieve module enabled specific path
      *
      * @param string $path Fully-qualified config path
-     * @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
+     * @deprecated 101.0.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
      * version. Module output can still be enabled/disabled in configuration files. However, this functionality should
      * not be used in future development. Module design should explicitly state dependencies to avoid requiring output
      * disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
diff --git a/lib/internal/Magento/Framework/Module/Setup/Migration.php b/lib/internal/Magento/Framework/Module/Setup/Migration.php
index 1de26b5c9234a..551ea3305337a 100644
--- a/lib/internal/Magento/Framework/Module/Setup/Migration.php
+++ b/lib/internal/Magento/Framework/Module/Setup/Migration.php
@@ -15,6 +15,7 @@
  * @api
  * @SuppressWarnings(PHPMD.ExcessiveParameterList)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @since 100.0.2
  */
 class Migration
 {
@@ -703,7 +704,7 @@ public function getCompositeModules()
      * @return string|int|float|bool|array|null
      * @throws \InvalidArgumentException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @deprecated
+     * @deprecated 101.0.1
      * @see \Magento\Framework\Module\Setup\Migration::jsonDecode
      */
     protected function _jsonDecode($encodedValue, $objectDecodeType = 1)
diff --git a/lib/internal/Magento/Framework/Notification/MessageInterface.php b/lib/internal/Magento/Framework/Notification/MessageInterface.php
index a1694b042d9db..b768c0daed11b 100644
--- a/lib/internal/Magento/Framework/Notification/MessageInterface.php
+++ b/lib/internal/Magento/Framework/Notification/MessageInterface.php
@@ -14,6 +14,7 @@
  * Interface MessageInterface
  *
  * @api
+ * @since 100.0.2
  */
 interface MessageInterface
 {
diff --git a/lib/internal/Magento/Framework/Notification/MessageList.php b/lib/internal/Magento/Framework/Notification/MessageList.php
index ac753b48c8944..62ac8e083bfd1 100644
--- a/lib/internal/Magento/Framework/Notification/MessageList.php
+++ b/lib/internal/Magento/Framework/Notification/MessageList.php
@@ -11,6 +11,7 @@
  *
  * Class MessageList
  * @api
+ * @since 100.0.2
  */
 class MessageList
 {
diff --git a/lib/internal/Magento/Framework/Notification/NotifierInterface.php b/lib/internal/Magento/Framework/Notification/NotifierInterface.php
index 0e34e69a94541..862298663a9c6 100644
--- a/lib/internal/Magento/Framework/Notification/NotifierInterface.php
+++ b/lib/internal/Magento/Framework/Notification/NotifierInterface.php
@@ -12,6 +12,7 @@
  * Interface NotifierInterface
  *
  * @api
+ * @since 100.0.2
  */
 interface NotifierInterface
 {
diff --git a/lib/internal/Magento/Framework/Notification/NotifierList.php b/lib/internal/Magento/Framework/Notification/NotifierList.php
index e436e21cae5fc..2b2f9f5faf8a8 100644
--- a/lib/internal/Magento/Framework/Notification/NotifierList.php
+++ b/lib/internal/Magento/Framework/Notification/NotifierList.php
@@ -10,6 +10,7 @@
  * List of registered system notifiers
  * @api
  *
+ * @since 100.0.2
  */
 class NotifierList
 {
diff --git a/lib/internal/Magento/Framework/Oauth/ConsumerInterface.php b/lib/internal/Magento/Framework/Oauth/ConsumerInterface.php
index ae416b01eae94..3945233ca2b5d 100644
--- a/lib/internal/Magento/Framework/Oauth/ConsumerInterface.php
+++ b/lib/internal/Magento/Framework/Oauth/ConsumerInterface.php
@@ -9,6 +9,7 @@
  * Oauth consumer interface.
  *
  * @api
+ * @since 100.0.2
  */
 interface ConsumerInterface
 {
diff --git a/lib/internal/Magento/Framework/Oauth/Exception.php b/lib/internal/Magento/Framework/Oauth/Exception.php
index 6e6753654fdd2..eaf1fd065ab01 100644
--- a/lib/internal/Magento/Framework/Oauth/Exception.php
+++ b/lib/internal/Magento/Framework/Oauth/Exception.php
@@ -11,6 +11,7 @@
  * OAuth Exception
  *
  * @api
+ * @since 100.0.2
  */
 class Exception extends AuthenticationException
 {
diff --git a/lib/internal/Magento/Framework/Oauth/NonceGeneratorInterface.php b/lib/internal/Magento/Framework/Oauth/NonceGeneratorInterface.php
index ca364aa95abeb..79dd527afc570 100644
--- a/lib/internal/Magento/Framework/Oauth/NonceGeneratorInterface.php
+++ b/lib/internal/Magento/Framework/Oauth/NonceGeneratorInterface.php
@@ -11,6 +11,7 @@
  * A method for generating a current timestamp is also provided by this interface.
  *
  * @api
+ * @since 100.0.2
  */
 interface NonceGeneratorInterface
 {
diff --git a/lib/internal/Magento/Framework/Oauth/OauthInputException.php b/lib/internal/Magento/Framework/Oauth/OauthInputException.php
index 1c526dd220f25..52ff15bbb75d5 100644
--- a/lib/internal/Magento/Framework/Oauth/OauthInputException.php
+++ b/lib/internal/Magento/Framework/Oauth/OauthInputException.php
@@ -10,6 +10,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class OauthInputException extends InputException
 {
diff --git a/lib/internal/Magento/Framework/Oauth/OauthInterface.php b/lib/internal/Magento/Framework/Oauth/OauthInterface.php
index 4f68eabaf69dc..8528e682ab4c8 100644
--- a/lib/internal/Magento/Framework/Oauth/OauthInterface.php
+++ b/lib/internal/Magento/Framework/Oauth/OauthInterface.php
@@ -11,6 +11,7 @@
  * token requests. A method is also included for generating an OAuth header that can be used in an HTTP request.
  *
  * @api
+ * @since 100.0.2
  */
 interface OauthInterface
 {
diff --git a/lib/internal/Magento/Framework/Oauth/TokenProviderInterface.php b/lib/internal/Magento/Framework/Oauth/TokenProviderInterface.php
index 7f4bc6a320173..7b07b1550745a 100644
--- a/lib/internal/Magento/Framework/Oauth/TokenProviderInterface.php
+++ b/lib/internal/Magento/Framework/Oauth/TokenProviderInterface.php
@@ -11,6 +11,7 @@
  * provided to help clients manipulating tokens validate and acquire the associated token consumer.
  *
  * @api
+ * @since 100.0.2
  */
 interface TokenProviderInterface
 {
diff --git a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php
index 24ac714507d8e..645e3fd7eff78 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Repository.php
@@ -16,8 +16,7 @@
 
 /**
  * Class Repository
- * @since 2.0.0
- * @deprecated 2.2.0 As current implementation breaks Repository contract. Not removed from codebase to prevent
+ * @deprecated 101.0.0 As current implementation breaks Repository contract. Not removed from codebase to prevent
  * possible backward incompatibilities if this functionality being used by 3rd party developers.
  */
 class Repository extends \Magento\Framework\Code\Generator\EntityAbstract
diff --git a/lib/internal/Magento/Framework/ObjectManager/Config/Config.php b/lib/internal/Magento/Framework/ObjectManager/Config/Config.php
index b45a2f8bcf0ba..72b5902337b0d 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Config/Config.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Config/Config.php
@@ -336,7 +336,7 @@ public function getPreferences()
      * Get serializer
      *
      * @return \Magento\Framework\Serialize\SerializerInterface
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     private function getSerializer()
     {
diff --git a/lib/internal/Magento/Framework/ObjectManager/ContextInterface.php b/lib/internal/Magento/Framework/ObjectManager/ContextInterface.php
index 323f092e7cf52..742917ead47fc 100644
--- a/lib/internal/Magento/Framework/ObjectManager/ContextInterface.php
+++ b/lib/internal/Magento/Framework/ObjectManager/ContextInterface.php
@@ -17,6 +17,7 @@
  * the classes they were introduced for.
  *
  * @api
+ * @since 100.0.2
  */
 interface ContextInterface
 {
diff --git a/lib/internal/Magento/Framework/ObjectManagerInterface.php b/lib/internal/Magento/Framework/ObjectManagerInterface.php
index 68e7056bc413b..6b165595f0f2c 100644
--- a/lib/internal/Magento/Framework/ObjectManagerInterface.php
+++ b/lib/internal/Magento/Framework/ObjectManagerInterface.php
@@ -7,6 +7,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 interface ObjectManagerInterface
 {
diff --git a/lib/internal/Magento/Framework/Option/ArrayInterface.php b/lib/internal/Magento/Framework/Option/ArrayInterface.php
index 054d9059b02f8..3c813545bc2c5 100644
--- a/lib/internal/Magento/Framework/Option/ArrayInterface.php
+++ b/lib/internal/Magento/Framework/Option/ArrayInterface.php
@@ -8,7 +8,7 @@
 /**
  * Array marker interface
  *
- * @deprecated please use \Magento\Framework\Data\OptionSourceInterface instead.
+ * @deprecated 102.0.1 please use \Magento\Framework\Data\OptionSourceInterface instead.
  * @see \Magento\Framework\Data\OptionSourceInterface
  */
 interface ArrayInterface extends \Magento\Framework\Data\OptionSourceInterface
diff --git a/lib/internal/Magento/Framework/Phrase.php b/lib/internal/Magento/Framework/Phrase.php
index da1eb2a2b3d98..3034dfc30a9e2 100644
--- a/lib/internal/Magento/Framework/Phrase.php
+++ b/lib/internal/Magento/Framework/Phrase.php
@@ -12,6 +12,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class Phrase implements \JsonSerializable
 {
diff --git a/lib/internal/Magento/Framework/Phrase/RendererInterface.php b/lib/internal/Magento/Framework/Phrase/RendererInterface.php
index e3e314696f3d1..fa8a8fcae7ae8 100644
--- a/lib/internal/Magento/Framework/Phrase/RendererInterface.php
+++ b/lib/internal/Magento/Framework/Phrase/RendererInterface.php
@@ -11,6 +11,7 @@
  * Translated phrase renderer
  *
  * @api
+ * @since 100.0.2
  */
 interface RendererInterface
 {
diff --git a/lib/internal/Magento/Framework/Pricing/Adjustment/AdjustmentInterface.php b/lib/internal/Magento/Framework/Pricing/Adjustment/AdjustmentInterface.php
index 9dff304ea3407..2ca6bd07d16e0 100644
--- a/lib/internal/Magento/Framework/Pricing/Adjustment/AdjustmentInterface.php
+++ b/lib/internal/Magento/Framework/Pricing/Adjustment/AdjustmentInterface.php
@@ -12,6 +12,7 @@
  * Interface AdjustmentInterface
  *
  * @api
+ * @since 100.0.2
  */
 interface AdjustmentInterface
 {
diff --git a/lib/internal/Magento/Framework/Pricing/Adjustment/CalculatorInterface.php b/lib/internal/Magento/Framework/Pricing/Adjustment/CalculatorInterface.php
index ea622c2a1cba6..2c182632407ab 100644
--- a/lib/internal/Magento/Framework/Pricing/Adjustment/CalculatorInterface.php
+++ b/lib/internal/Magento/Framework/Pricing/Adjustment/CalculatorInterface.php
@@ -12,6 +12,7 @@
  * Calculator interface
  *
  * @api
+ * @since 100.0.2
  */
 interface CalculatorInterface
 {
diff --git a/lib/internal/Magento/Framework/Pricing/Adjustment/Collection.php b/lib/internal/Magento/Framework/Pricing/Adjustment/Collection.php
index c7ab4b6e796c2..96e4d52e6b41d 100644
--- a/lib/internal/Magento/Framework/Pricing/Adjustment/Collection.php
+++ b/lib/internal/Magento/Framework/Pricing/Adjustment/Collection.php
@@ -10,6 +10,7 @@
  * Adjustment collection model
  *
  * @api
+ * @since 100.0.2
  */
 class Collection
 {
diff --git a/lib/internal/Magento/Framework/Pricing/Adjustment/Pool.php b/lib/internal/Magento/Framework/Pricing/Adjustment/Pool.php
index d064e05b0b671..4d1e213a9ff6a 100644
--- a/lib/internal/Magento/Framework/Pricing/Adjustment/Pool.php
+++ b/lib/internal/Magento/Framework/Pricing/Adjustment/Pool.php
@@ -12,6 +12,7 @@
  * Global adjustment pool model
  *
  * @api
+ * @since 100.0.2
  */
 class Pool
 {
diff --git a/lib/internal/Magento/Framework/Pricing/Amount/AmountFactory.php b/lib/internal/Magento/Framework/Pricing/Amount/AmountFactory.php
index a8340ee097f58..93da79d8588cb 100644
--- a/lib/internal/Magento/Framework/Pricing/Amount/AmountFactory.php
+++ b/lib/internal/Magento/Framework/Pricing/Amount/AmountFactory.php
@@ -10,6 +10,7 @@
  * Class AmountFactory
  *
  * @api
+ * @since 100.0.2
  */
 class AmountFactory
 {
diff --git a/lib/internal/Magento/Framework/Pricing/Amount/AmountInterface.php b/lib/internal/Magento/Framework/Pricing/Amount/AmountInterface.php
index a625e340395cc..45240315aa126 100644
--- a/lib/internal/Magento/Framework/Pricing/Amount/AmountInterface.php
+++ b/lib/internal/Magento/Framework/Pricing/Amount/AmountInterface.php
@@ -10,6 +10,7 @@
  * Amount interface, the amount values are in display currency
  *
  * @api
+ * @since 100.0.2
  */
 interface AmountInterface
 {
diff --git a/lib/internal/Magento/Framework/Pricing/Helper/Data.php b/lib/internal/Magento/Framework/Pricing/Helper/Data.php
index bc56bddea8ece..39852074300be 100644
--- a/lib/internal/Magento/Framework/Pricing/Helper/Data.php
+++ b/lib/internal/Magento/Framework/Pricing/Helper/Data.php
@@ -11,6 +11,7 @@
  * Pricing data helper
  *
  * @api
+ * @since 100.0.2
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
diff --git a/lib/internal/Magento/Framework/Pricing/Price/AbstractPrice.php b/lib/internal/Magento/Framework/Pricing/Price/AbstractPrice.php
index 8c49385f7e60f..89470cf24cbb6 100644
--- a/lib/internal/Magento/Framework/Pricing/Price/AbstractPrice.php
+++ b/lib/internal/Magento/Framework/Pricing/Price/AbstractPrice.php
@@ -16,6 +16,7 @@
  * Should be the base for creating any Price type class
  *
  * @api
+ * @since 100.0.2
  */
 abstract class AbstractPrice implements PriceInterface
 {
diff --git a/lib/internal/Magento/Framework/Pricing/Price/BasePriceProviderInterface.php b/lib/internal/Magento/Framework/Pricing/Price/BasePriceProviderInterface.php
index eb5c6d9064e21..b6367fa46c161 100644
--- a/lib/internal/Magento/Framework/Pricing/Price/BasePriceProviderInterface.php
+++ b/lib/internal/Magento/Framework/Pricing/Price/BasePriceProviderInterface.php
@@ -10,6 +10,7 @@
  * Interface BasePriceProviderInterface
  *
  * @api
+ * @since 100.0.2
  */
 interface BasePriceProviderInterface
 {
diff --git a/lib/internal/Magento/Framework/Pricing/Price/Collection.php b/lib/internal/Magento/Framework/Pricing/Price/Collection.php
index 200c3a50aff89..eedb910c56b92 100644
--- a/lib/internal/Magento/Framework/Pricing/Price/Collection.php
+++ b/lib/internal/Magento/Framework/Pricing/Price/Collection.php
@@ -12,6 +12,7 @@
  * Class Collection
  *
  * @api
+ * @since 100.0.2
  */
 class Collection implements \Iterator
 {
diff --git a/lib/internal/Magento/Framework/Pricing/Price/Pool.php b/lib/internal/Magento/Framework/Pricing/Price/Pool.php
index dfdd0c52681e1..a1c7d416b2259 100644
--- a/lib/internal/Magento/Framework/Pricing/Price/Pool.php
+++ b/lib/internal/Magento/Framework/Pricing/Price/Pool.php
@@ -10,6 +10,7 @@
  * Class Pool
  *
  * @api
+ * @since 100.0.2
  */
 class Pool implements \Iterator, \ArrayAccess
 {
diff --git a/lib/internal/Magento/Framework/Pricing/Price/PriceInterface.php b/lib/internal/Magento/Framework/Pricing/Price/PriceInterface.php
index 7953940287eb2..2b3bd86d04b2b 100644
--- a/lib/internal/Magento/Framework/Pricing/Price/PriceInterface.php
+++ b/lib/internal/Magento/Framework/Pricing/Price/PriceInterface.php
@@ -12,6 +12,7 @@
  * Catalog price interface
  *
  * @api
+ * @since 100.0.2
  */
 interface PriceInterface
 {
diff --git a/lib/internal/Magento/Framework/Pricing/PriceCurrencyInterface.php b/lib/internal/Magento/Framework/Pricing/PriceCurrencyInterface.php
index ab3d26f3e0c6c..aea2aacef5edf 100644
--- a/lib/internal/Magento/Framework/Pricing/PriceCurrencyInterface.php
+++ b/lib/internal/Magento/Framework/Pricing/PriceCurrencyInterface.php
@@ -10,6 +10,7 @@
  * Interface PriceCurrencyInterface
  *
  * @api
+ * @since 100.0.2
  */
 interface PriceCurrencyInterface
 {
@@ -75,7 +76,7 @@ public function convertAndFormat(
     /**
      * Round price
      *
-     * @deprecated
+     * @deprecated 102.0.1
      * @param float $price
      * @return float
      */
diff --git a/lib/internal/Magento/Framework/Pricing/PriceInfo/Base.php b/lib/internal/Magento/Framework/Pricing/PriceInfo/Base.php
index ac8c301e24a5c..31b343c74e272 100644
--- a/lib/internal/Magento/Framework/Pricing/PriceInfo/Base.php
+++ b/lib/internal/Magento/Framework/Pricing/PriceInfo/Base.php
@@ -17,6 +17,7 @@
  * Price info base model
  *
  * @api
+ * @since 100.0.2
  */
 class Base implements PriceInfoInterface
 {
diff --git a/lib/internal/Magento/Framework/Pricing/PriceInfo/Factory.php b/lib/internal/Magento/Framework/Pricing/PriceInfo/Factory.php
index e3e4af56f6095..8739520016764 100644
--- a/lib/internal/Magento/Framework/Pricing/PriceInfo/Factory.php
+++ b/lib/internal/Magento/Framework/Pricing/PriceInfo/Factory.php
@@ -16,6 +16,7 @@
  * Price info model factory
  *
  * @api
+ * @since 100.0.2
  */
 class Factory
 {
diff --git a/lib/internal/Magento/Framework/Pricing/PriceInfoInterface.php b/lib/internal/Magento/Framework/Pricing/PriceInfoInterface.php
index 259a8a4d8c2d1..80620008c77ae 100644
--- a/lib/internal/Magento/Framework/Pricing/PriceInfoInterface.php
+++ b/lib/internal/Magento/Framework/Pricing/PriceInfoInterface.php
@@ -13,6 +13,7 @@
  * Price info model interface
  *
  * @api
+ * @since 100.0.2
  */
 interface PriceInfoInterface
 {
diff --git a/lib/internal/Magento/Framework/Pricing/Render.php b/lib/internal/Magento/Framework/Pricing/Render.php
index 2159fcaeaa121..0784a09191380 100644
--- a/lib/internal/Magento/Framework/Pricing/Render.php
+++ b/lib/internal/Magento/Framework/Pricing/Render.php
@@ -19,6 +19,7 @@
  * @method string getPriceRenderHandle()
  *
  * @api
+ * @since 100.0.2
  */
 class Render extends AbstractBlock
 {
diff --git a/lib/internal/Magento/Framework/Pricing/Render/AdjustmentRenderInterface.php b/lib/internal/Magento/Framework/Pricing/Render/AdjustmentRenderInterface.php
index 3be51eb83b911..a9bfb84bcaded 100644
--- a/lib/internal/Magento/Framework/Pricing/Render/AdjustmentRenderInterface.php
+++ b/lib/internal/Magento/Framework/Pricing/Render/AdjustmentRenderInterface.php
@@ -13,6 +13,7 @@
  * Adjustment render interface
  *
  * @api
+ * @since 100.0.2
  */
 interface AdjustmentRenderInterface
 {
diff --git a/lib/internal/Magento/Framework/Pricing/Render/AmountRenderInterface.php b/lib/internal/Magento/Framework/Pricing/Render/AmountRenderInterface.php
index 724593e269944..38acbe37e71db 100644
--- a/lib/internal/Magento/Framework/Pricing/Render/AmountRenderInterface.php
+++ b/lib/internal/Magento/Framework/Pricing/Render/AmountRenderInterface.php
@@ -14,6 +14,7 @@
  * Price amount renderer interface
  *
  * @api
+ * @since 100.0.2
  */
 interface AmountRenderInterface
 {
diff --git a/lib/internal/Magento/Framework/Pricing/Render/PriceBoxRenderInterface.php b/lib/internal/Magento/Framework/Pricing/Render/PriceBoxRenderInterface.php
index 9c23c594a89fb..68a246a36c8dc 100644
--- a/lib/internal/Magento/Framework/Pricing/Render/PriceBoxRenderInterface.php
+++ b/lib/internal/Magento/Framework/Pricing/Render/PriceBoxRenderInterface.php
@@ -14,6 +14,7 @@
  * Price box render interface
  *
  * @api
+ * @since 100.0.2
  */
 interface PriceBoxRenderInterface
 {
diff --git a/lib/internal/Magento/Framework/Pricing/Render/RendererPool.php b/lib/internal/Magento/Framework/Pricing/Render/RendererPool.php
index 73efef2e477be..a32273f51c8f4 100644
--- a/lib/internal/Magento/Framework/Pricing/Render/RendererPool.php
+++ b/lib/internal/Magento/Framework/Pricing/Render/RendererPool.php
@@ -13,6 +13,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class RendererPool extends AbstractBlock
 {
diff --git a/lib/internal/Magento/Framework/Pricing/SaleableInterface.php b/lib/internal/Magento/Framework/Pricing/SaleableInterface.php
index 240012c0b18e1..9d7959ff80fea 100644
--- a/lib/internal/Magento/Framework/Pricing/SaleableInterface.php
+++ b/lib/internal/Magento/Framework/Pricing/SaleableInterface.php
@@ -10,6 +10,7 @@
  * Interface SaleableInterface
  *
  * @api
+ * @since 100.0.2
  */
 interface SaleableInterface
 {
diff --git a/lib/internal/Magento/Framework/Profiler.php b/lib/internal/Magento/Framework/Profiler.php
index eaf0a732f98c0..4fafc68a568db 100644
--- a/lib/internal/Magento/Framework/Profiler.php
+++ b/lib/internal/Magento/Framework/Profiler.php
@@ -12,6 +12,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class Profiler
 {
diff --git a/lib/internal/Magento/Framework/Profiler/DriverInterface.php b/lib/internal/Magento/Framework/Profiler/DriverInterface.php
index fe6393b3a43e3..4230b69dab917 100644
--- a/lib/internal/Magento/Framework/Profiler/DriverInterface.php
+++ b/lib/internal/Magento/Framework/Profiler/DriverInterface.php
@@ -11,6 +11,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 interface DriverInterface
 {
diff --git a/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php b/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
index 2f3caf08c534e..43b8cc22ebf2c 100644
--- a/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
+++ b/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
@@ -12,6 +12,7 @@
  * Data object processor for array serialization using class reflection
  *
  * @api
+ * @since 100.0.2
  */
 class DataObjectProcessor
 {
diff --git a/lib/internal/Magento/Framework/Reflection/MethodsMap.php b/lib/internal/Magento/Framework/Reflection/MethodsMap.php
index c4a738ac28caa..0b5ab78a504da 100644
--- a/lib/internal/Magento/Framework/Reflection/MethodsMap.php
+++ b/lib/internal/Magento/Framework/Reflection/MethodsMap.php
@@ -239,7 +239,7 @@ public function isMethodReturnValueRequired($type, $methodName)
      * Get serializer
      *
      * @return \Magento\Framework\Serialize\SerializerInterface
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     private function getSerializer()
     {
diff --git a/lib/internal/Magento/Framework/Registry.php b/lib/internal/Magento/Framework/Registry.php
index d1bc227437d5f..e798b28e1e1b2 100644
--- a/lib/internal/Magento/Framework/Registry.php
+++ b/lib/internal/Magento/Framework/Registry.php
@@ -12,7 +12,8 @@
  * It's usage should be avoid. Use service classes or data providers instead.
  *
  * @api
- * @deprecated
+ * @deprecated 102.0.0
+ * @since 100.0.2
  */
 class Registry
 {
@@ -29,7 +30,7 @@ class Registry
      * @param string $key
      * @return mixed
      *
-     * @deprecated
+     * @deprecated 102.0.0
      */
     public function registry($key)
     {
@@ -48,7 +49,7 @@ public function registry($key)
      * @return void
      * @throws \RuntimeException
      *
-     * @deprecated
+     * @deprecated 102.0.0
      */
     public function register($key, $value, $graceful = false)
     {
@@ -67,7 +68,7 @@ public function register($key, $value, $graceful = false)
      * @param string $key
      * @return void
      *
-     * @deprecated
+     * @deprecated 102.0.0
      */
     public function unregister($key)
     {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ConditionManager.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ConditionManager.php
index e56559563c35a..8dffc679b5c7f 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/ConditionManager.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/ConditionManager.php
@@ -12,8 +12,9 @@
  * MySQL search condition manager
  *
  * @api
- * @deprecated
+ * @deprecated 102.0.0
  * @see \Magento\ElasticSearch
+ * @since 100.0.2
  */
 class ConditionManager
 {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorage.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorage.php
index 7f8ef8c422b92..1d29f055a464b 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorage.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorage.php
@@ -16,8 +16,9 @@
  * MySQL search temporary storage.
  *
  * @api
- * @deprecated
+ * @deprecated 102.0.0
  * @see \Magento\ElasticSearch
+ * @since 100.0.2
  */
 class TemporaryStorage
 {
diff --git a/lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorageFactory.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorageFactory.php
index 208f6b39b9eb4..f1fc487a91ca0 100644
--- a/lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorageFactory.php
+++ b/lib/internal/Magento/Framework/Search/Adapter/Mysql/TemporaryStorageFactory.php
@@ -12,8 +12,9 @@
  *
  * @codeCoverageIgnore
  * @api
- * @deprecated
+ * @deprecated 102.0.0
  * @see \Magento\ElasticSearch
+ * @since 100.0.2
  */
 class TemporaryStorageFactory
 {
diff --git a/lib/internal/Magento/Framework/Search/Dynamic/Algorithm.php b/lib/internal/Magento/Framework/Search/Dynamic/Algorithm.php
index ffe24fa324cee..baee7221a7f17 100644
--- a/lib/internal/Magento/Framework/Search/Dynamic/Algorithm.php
+++ b/lib/internal/Magento/Framework/Search/Dynamic/Algorithm.php
@@ -10,6 +10,7 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @api
+ * @since 100.0.2
  */
 class Algorithm
 {
diff --git a/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Repository.php b/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Repository.php
index c2d7e4025b3b3..bfba3130c6ae8 100644
--- a/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Repository.php
+++ b/lib/internal/Magento/Framework/Search/Dynamic/Algorithm/Repository.php
@@ -11,6 +11,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class Repository
 {
diff --git a/lib/internal/Magento/Framework/Search/Dynamic/DataProviderFactory.php b/lib/internal/Magento/Framework/Search/Dynamic/DataProviderFactory.php
index 6c3a59152a9a1..ccfd5ec01dee3 100644
--- a/lib/internal/Magento/Framework/Search/Dynamic/DataProviderFactory.php
+++ b/lib/internal/Magento/Framework/Search/Dynamic/DataProviderFactory.php
@@ -10,6 +10,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class DataProviderFactory
 {
diff --git a/lib/internal/Magento/Framework/Search/Dynamic/DataProviderInterface.php b/lib/internal/Magento/Framework/Search/Dynamic/DataProviderInterface.php
index fa360134663d6..374facf486ad9 100644
--- a/lib/internal/Magento/Framework/Search/Dynamic/DataProviderInterface.php
+++ b/lib/internal/Magento/Framework/Search/Dynamic/DataProviderInterface.php
@@ -11,6 +11,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 interface DataProviderInterface
 {
diff --git a/lib/internal/Magento/Framework/Search/Dynamic/EntityStorage.php b/lib/internal/Magento/Framework/Search/Dynamic/EntityStorage.php
index e32096704025f..7500ab622b65b 100644
--- a/lib/internal/Magento/Framework/Search/Dynamic/EntityStorage.php
+++ b/lib/internal/Magento/Framework/Search/Dynamic/EntityStorage.php
@@ -8,6 +8,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class EntityStorage
 {
diff --git a/lib/internal/Magento/Framework/Search/Dynamic/EntityStorageFactory.php b/lib/internal/Magento/Framework/Search/Dynamic/EntityStorageFactory.php
index 96e6b0113d1a7..6b7a4cd9a6df6 100644
--- a/lib/internal/Magento/Framework/Search/Dynamic/EntityStorageFactory.php
+++ b/lib/internal/Magento/Framework/Search/Dynamic/EntityStorageFactory.php
@@ -10,6 +10,7 @@
 /**
  * EntityStorage Factory
  * @api
+ * @since 100.0.2
  */
 class EntityStorageFactory
 {
diff --git a/lib/internal/Magento/Framework/Search/Dynamic/IntervalFactory.php b/lib/internal/Magento/Framework/Search/Dynamic/IntervalFactory.php
index 90e66d1e7330c..261a52c27e850 100644
--- a/lib/internal/Magento/Framework/Search/Dynamic/IntervalFactory.php
+++ b/lib/internal/Magento/Framework/Search/Dynamic/IntervalFactory.php
@@ -10,6 +10,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class IntervalFactory
 {
diff --git a/lib/internal/Magento/Framework/Search/Dynamic/IntervalInterface.php b/lib/internal/Magento/Framework/Search/Dynamic/IntervalInterface.php
index 547166eb175ba..f80cac17d8dc6 100644
--- a/lib/internal/Magento/Framework/Search/Dynamic/IntervalInterface.php
+++ b/lib/internal/Magento/Framework/Search/Dynamic/IntervalInterface.php
@@ -7,6 +7,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 interface IntervalInterface
 {
diff --git a/lib/internal/Magento/Framework/Search/EngineResolverInterface.php b/lib/internal/Magento/Framework/Search/EngineResolverInterface.php
index 57ba210121bc4..47dfa6659cc25 100644
--- a/lib/internal/Magento/Framework/Search/EngineResolverInterface.php
+++ b/lib/internal/Magento/Framework/Search/EngineResolverInterface.php
@@ -7,6 +7,7 @@
 
 /**
  * @api
+ * @since 102.0.0
  */
 interface EngineResolverInterface
 {
@@ -16,6 +17,7 @@ interface EngineResolverInterface
      * It returns string identifier of Search Engine that is currently chosen in configuration
      *
      * @return string
+     * @since 102.0.0
      */
     public function getCurrentSearchEngine();
 }
diff --git a/lib/internal/Magento/Framework/Search/EntityMetadata.php b/lib/internal/Magento/Framework/Search/EntityMetadata.php
index 8d25921813df3..9449396942c5a 100644
--- a/lib/internal/Magento/Framework/Search/EntityMetadata.php
+++ b/lib/internal/Magento/Framework/Search/EntityMetadata.php
@@ -9,6 +9,7 @@
 /**
  * Entity metadata
  * @api
+ * @since 100.0.2
  */
 class EntityMetadata
 {
diff --git a/lib/internal/Magento/Framework/Search/Request.php b/lib/internal/Magento/Framework/Search/Request.php
index 264d4929dde56..54d9f12fcb82f 100644
--- a/lib/internal/Magento/Framework/Search/Request.php
+++ b/lib/internal/Magento/Framework/Search/Request.php
@@ -14,6 +14,7 @@
  *
  * @codeCoverageIgnore
  * @api
+ * @since 100.0.2
  */
 class Request implements RequestInterface
 {
@@ -151,8 +152,9 @@ public function getSize()
      * It must be move to different interface.
      * Scope to split Search request interface on two different 'Search' and 'Fulltext Search' contains in MC-16461.
      *
-     * @deprecated
+     * @deprecated 102.0.2
      * @return array
+     * @since 102.0.2
      */
     public function getSort()
     {
diff --git a/lib/internal/Magento/Framework/Search/Request/Aggregation/DynamicBucket.php b/lib/internal/Magento/Framework/Search/Request/Aggregation/DynamicBucket.php
index dfa28911ca4ce..8f691b695a017 100644
--- a/lib/internal/Magento/Framework/Search/Request/Aggregation/DynamicBucket.php
+++ b/lib/internal/Magento/Framework/Search/Request/Aggregation/DynamicBucket.php
@@ -10,6 +10,7 @@
 /**
  * Dynamic Buckets
  * @api
+ * @since 100.0.2
  */
 class DynamicBucket implements BucketInterface
 {
diff --git a/lib/internal/Magento/Framework/Search/Request/Binder.php b/lib/internal/Magento/Framework/Search/Request/Binder.php
index 9df1ee87eb869..5016c1c11926c 100644
--- a/lib/internal/Magento/Framework/Search/Request/Binder.php
+++ b/lib/internal/Magento/Framework/Search/Request/Binder.php
@@ -9,6 +9,7 @@
  * Data binder for search request.
  *
  * @api
+ * @since 100.0.2
  */
 class Binder
 {
diff --git a/lib/internal/Magento/Framework/Search/Request/BucketInterface.php b/lib/internal/Magento/Framework/Search/Request/BucketInterface.php
index 8da797e5a9767..1512a8a68cf78 100644
--- a/lib/internal/Magento/Framework/Search/Request/BucketInterface.php
+++ b/lib/internal/Magento/Framework/Search/Request/BucketInterface.php
@@ -9,6 +9,7 @@
  * Aggregation Bucket Interface
  *
  * @api
+ * @since 100.0.2
  */
 interface BucketInterface
 {
diff --git a/lib/internal/Magento/Framework/Search/Request/Builder.php b/lib/internal/Magento/Framework/Search/Request/Builder.php
index 0cf959b657c76..b3e1a7f2e309b 100644
--- a/lib/internal/Magento/Framework/Search/Request/Builder.php
+++ b/lib/internal/Magento/Framework/Search/Request/Builder.php
@@ -16,6 +16,7 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @since 100.0.2
  */
 class Builder
 {
@@ -104,6 +105,7 @@ public function setFrom($from)
      *
      * @param \Magento\Framework\Api\SortOrder[] $sort
      * @return $this
+     * @since 102.0.2
      */
     public function setSort($sort)
     {
diff --git a/lib/internal/Magento/Framework/Search/Request/Cleaner.php b/lib/internal/Magento/Framework/Search/Request/Cleaner.php
index c015f90751a23..59eeea47fe278 100644
--- a/lib/internal/Magento/Framework/Search/Request/Cleaner.php
+++ b/lib/internal/Magento/Framework/Search/Request/Cleaner.php
@@ -12,6 +12,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class Cleaner
 {
diff --git a/lib/internal/Magento/Framework/Search/Request/Dimension.php b/lib/internal/Magento/Framework/Search/Request/Dimension.php
index bc60af8c16959..6df1974cc61cc 100644
--- a/lib/internal/Magento/Framework/Search/Request/Dimension.php
+++ b/lib/internal/Magento/Framework/Search/Request/Dimension.php
@@ -10,6 +10,7 @@
 /**
  * Search Request Dimension
  * @api
+ * @since 100.0.2
  */
 class Dimension extends AbstractKeyValuePair
 {
diff --git a/lib/internal/Magento/Framework/Search/Request/Filter/BoolExpression.php b/lib/internal/Magento/Framework/Search/Request/Filter/BoolExpression.php
index 5a1d2ad528237..6b0304ae37758 100644
--- a/lib/internal/Magento/Framework/Search/Request/Filter/BoolExpression.php
+++ b/lib/internal/Magento/Framework/Search/Request/Filter/BoolExpression.php
@@ -10,6 +10,7 @@
 /**
  * Bool Filter
  * @api
+ * @since 100.0.2
  */
 class BoolExpression implements FilterInterface
 {
diff --git a/lib/internal/Magento/Framework/Search/Request/Filter/Range.php b/lib/internal/Magento/Framework/Search/Request/Filter/Range.php
index 1be0c690483ab..981c92203b864 100644
--- a/lib/internal/Magento/Framework/Search/Request/Filter/Range.php
+++ b/lib/internal/Magento/Framework/Search/Request/Filter/Range.php
@@ -11,6 +11,7 @@
  * Range Filter
  * @SuppressWarnings(PHPMD.ShortVariable)
  * @api
+ * @since 100.0.2
  */
 class Range implements FilterInterface
 {
diff --git a/lib/internal/Magento/Framework/Search/Request/Filter/Term.php b/lib/internal/Magento/Framework/Search/Request/Filter/Term.php
index 5560c92164db4..50fd658c6760b 100644
--- a/lib/internal/Magento/Framework/Search/Request/Filter/Term.php
+++ b/lib/internal/Magento/Framework/Search/Request/Filter/Term.php
@@ -11,6 +11,7 @@
 /**
  * Term Filter
  * @api
+ * @since 100.0.2
  */
 class Term extends AbstractKeyValuePair implements FilterInterface
 {
diff --git a/lib/internal/Magento/Framework/Search/Request/Filter/Wildcard.php b/lib/internal/Magento/Framework/Search/Request/Filter/Wildcard.php
index 60b5463132003..d1b487d498935 100644
--- a/lib/internal/Magento/Framework/Search/Request/Filter/Wildcard.php
+++ b/lib/internal/Magento/Framework/Search/Request/Filter/Wildcard.php
@@ -11,6 +11,7 @@
 /**
  * Wildcard Filter
  * @api
+ * @since 100.0.2
  */
 class Wildcard extends AbstractKeyValuePair implements FilterInterface
 {
diff --git a/lib/internal/Magento/Framework/Search/Request/FilterInterface.php b/lib/internal/Magento/Framework/Search/Request/FilterInterface.php
index 14fdd2929b15d..928f4121a84cd 100644
--- a/lib/internal/Magento/Framework/Search/Request/FilterInterface.php
+++ b/lib/internal/Magento/Framework/Search/Request/FilterInterface.php
@@ -9,6 +9,7 @@
  * Filter Interface
  *
  * @api
+ * @since 100.0.2
  */
 interface FilterInterface
 {
diff --git a/lib/internal/Magento/Framework/Search/Request/Mapper.php b/lib/internal/Magento/Framework/Search/Request/Mapper.php
index 7586444d4b197..3cbcc618c4438 100644
--- a/lib/internal/Magento/Framework/Search/Request/Mapper.php
+++ b/lib/internal/Magento/Framework/Search/Request/Mapper.php
@@ -13,6 +13,7 @@
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
+ * @since 100.0.2
  */
 class Mapper
 {
diff --git a/lib/internal/Magento/Framework/Search/Request/Query/BoolExpression.php b/lib/internal/Magento/Framework/Search/Request/Query/BoolExpression.php
index 1ac3ba6c09b3b..c47a020b80580 100644
--- a/lib/internal/Magento/Framework/Search/Request/Query/BoolExpression.php
+++ b/lib/internal/Magento/Framework/Search/Request/Query/BoolExpression.php
@@ -10,6 +10,7 @@
 /**
  * Bool Query
  * @api
+ * @since 100.0.2
  */
 class BoolExpression implements QueryInterface
 {
diff --git a/lib/internal/Magento/Framework/Search/Request/Query/Filter.php b/lib/internal/Magento/Framework/Search/Request/Query/Filter.php
index 7de25175793e4..850dbfd40a1fe 100644
--- a/lib/internal/Magento/Framework/Search/Request/Query/Filter.php
+++ b/lib/internal/Magento/Framework/Search/Request/Query/Filter.php
@@ -10,6 +10,7 @@
 /**
  * Term Query
  * @api
+ * @since 100.0.2
  */
 class Filter implements QueryInterface
 {
diff --git a/lib/internal/Magento/Framework/Search/Request/Query/Match.php b/lib/internal/Magento/Framework/Search/Request/Query/Match.php
index a1f884dbc106e..8fbd5244780bc 100644
--- a/lib/internal/Magento/Framework/Search/Request/Query/Match.php
+++ b/lib/internal/Magento/Framework/Search/Request/Query/Match.php
@@ -10,6 +10,7 @@
 /**
  * Match Query
  * @api
+ * @since 100.0.2
  */
 class Match implements QueryInterface
 {
diff --git a/lib/internal/Magento/Framework/Search/Request/QueryInterface.php b/lib/internal/Magento/Framework/Search/Request/QueryInterface.php
index e7cf56172cbaf..bf8a9582f5808 100644
--- a/lib/internal/Magento/Framework/Search/Request/QueryInterface.php
+++ b/lib/internal/Magento/Framework/Search/Request/QueryInterface.php
@@ -9,6 +9,7 @@
  * Query Interface
  *
  * @api
+ * @since 100.0.2
  */
 interface QueryInterface
 {
diff --git a/lib/internal/Magento/Framework/Search/RequestInterface.php b/lib/internal/Magento/Framework/Search/RequestInterface.php
index 16df80f755c07..d5879ce0dc22e 100644
--- a/lib/internal/Magento/Framework/Search/RequestInterface.php
+++ b/lib/internal/Magento/Framework/Search/RequestInterface.php
@@ -13,6 +13,7 @@
  * Search Request
  *
  * @api
+ * @since 100.0.2
  */
 interface RequestInterface
 {
diff --git a/lib/internal/Magento/Framework/Search/Response/Aggregation.php b/lib/internal/Magento/Framework/Search/Response/Aggregation.php
index ea72597c53034..7ebe052b65ba8 100644
--- a/lib/internal/Magento/Framework/Search/Response/Aggregation.php
+++ b/lib/internal/Magento/Framework/Search/Response/Aggregation.php
@@ -11,6 +11,7 @@
 /**
  * Faceted data
  * @api
+ * @since 100.0.2
  */
 class Aggregation implements AggregationInterface, \IteratorAggregate
 {
diff --git a/lib/internal/Magento/Framework/Search/Response/QueryResponse.php b/lib/internal/Magento/Framework/Search/Response/QueryResponse.php
index 00b1ed2149bec..d7d0a8d03b28c 100644
--- a/lib/internal/Magento/Framework/Search/Response/QueryResponse.php
+++ b/lib/internal/Magento/Framework/Search/Response/QueryResponse.php
@@ -12,6 +12,7 @@
 /**
  * Search Response
  * @api
+ * @since 100.0.2
  */
 class QueryResponse implements ResponseInterface
 {
@@ -80,9 +81,10 @@ public function getAggregations()
      * It must be move to different interface.
      * Scope to split Search response interface on two different 'Search' and 'Fulltext Search' contains in MC-16461.
      *
-     * @deprecated
+     * @deprecated 102.0.2
      *
      * @return int
+     * @since 102.0.2
      */
     public function getTotal(): int
     {
diff --git a/lib/internal/Magento/Framework/Serialize/Serializer/Json.php b/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
index 7ce9756ff243d..d5a5aec9259dd 100644
--- a/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
+++ b/lib/internal/Magento/Framework/Serialize/Serializer/Json.php
@@ -11,13 +11,13 @@
  * Serialize data to JSON, unserialize JSON encoded data
  *
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 class Json implements SerializerInterface
 {
     /**
      * @inheritDoc
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function serialize($data)
     {
@@ -30,7 +30,7 @@ public function serialize($data)
 
     /**
      * @inheritDoc
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function unserialize($string)
     {
diff --git a/lib/internal/Magento/Framework/Serialize/Serializer/JsonHexTag.php b/lib/internal/Magento/Framework/Serialize/Serializer/JsonHexTag.php
index 4a5406ff3fd99..dc63a726481ae 100644
--- a/lib/internal/Magento/Framework/Serialize/Serializer/JsonHexTag.php
+++ b/lib/internal/Magento/Framework/Serialize/Serializer/JsonHexTag.php
@@ -16,13 +16,13 @@
  * unserialize JSON encoded data
  *
  * @api
- * @since 100.2.0
+ * @since 102.0.1
  */
 class JsonHexTag extends Json implements SerializerInterface
 {
     /**
      * @inheritDoc
-     * @since 100.2.0
+     * @since 102.0.1
      */
     public function serialize($data): string
     {
diff --git a/lib/internal/Magento/Framework/Serialize/SerializerInterface.php b/lib/internal/Magento/Framework/Serialize/SerializerInterface.php
index 8b448f3ba246b..24ace0c38b84e 100644
--- a/lib/internal/Magento/Framework/Serialize/SerializerInterface.php
+++ b/lib/internal/Magento/Framework/Serialize/SerializerInterface.php
@@ -9,7 +9,7 @@
  * Interface for serializing
  *
  * @api
- * @since 100.2.0
+ * @since 101.0.0
  */
 interface SerializerInterface
 {
@@ -19,7 +19,7 @@ interface SerializerInterface
      * @param string|int|float|bool|array|null $data
      * @return string|bool
      * @throws \InvalidArgumentException
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function serialize($data);
 
@@ -29,7 +29,7 @@ public function serialize($data);
      * @param string $string
      * @return string|int|float|bool|array|null
      * @throws \InvalidArgumentException
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function unserialize($string);
 }
diff --git a/lib/internal/Magento/Framework/Session/Generic.php b/lib/internal/Magento/Framework/Session/Generic.php
index 8cd358dd56416..794ce7a64e88b 100644
--- a/lib/internal/Magento/Framework/Session/Generic.php
+++ b/lib/internal/Magento/Framework/Session/Generic.php
@@ -7,6 +7,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class Generic extends SessionManager
 {
diff --git a/lib/internal/Magento/Framework/Session/SessionManagerInterface.php b/lib/internal/Magento/Framework/Session/SessionManagerInterface.php
index 93fac2947eb61..70976a6269d18 100644
--- a/lib/internal/Magento/Framework/Session/SessionManagerInterface.php
+++ b/lib/internal/Magento/Framework/Session/SessionManagerInterface.php
@@ -11,6 +11,7 @@
  * Session Manager Interface
  *
  * @api
+ * @since 100.0.2
  */
 interface SessionManagerInterface
 {
diff --git a/lib/internal/Magento/Framework/Session/SidResolver.php b/lib/internal/Magento/Framework/Session/SidResolver.php
index 3455ccf5cab2d..4052f039a2f93 100644
--- a/lib/internal/Magento/Framework/Session/SidResolver.php
+++ b/lib/internal/Magento/Framework/Session/SidResolver.php
@@ -12,7 +12,7 @@
 /**
  * Resolves SID by processing request parameters.
  *
- * @deprecated 2.3.3 SIDs in URLs are no longer used
+ * @deprecated 102.0.2 SIDs in URLs are no longer used
  */
 class SidResolver implements SidResolverInterface
 {
@@ -28,13 +28,13 @@ class SidResolver implements SidResolverInterface
 
     /**
      * @var \Magento\Framework\UrlInterface
-     * @deprecated Not used anymore.
+     * @deprecated 102.0.5 Not used anymore.
      */
     protected $urlBuilder;
 
     /**
      * @var \Magento\Framework\App\RequestInterface
-     * @deprecated Not used anymore.
+     * @deprecated 102.0.5 Not used anymore.
      */
     protected $request;
 
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/Diff.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/Diff.php
index 0e857567689c4..578b3c62be573 100644
--- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/Diff.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Diff/Diff.php
@@ -23,6 +23,7 @@
  *  - new (Should be changed to)
  *  - old ()
  * @api
+ * @since 102.0.0
  */
 class Diff implements DiffInterface
 {
@@ -40,6 +41,7 @@ class Diff implements DiffInterface
      * This changes created only for debug reasons.
      *
      * @var array
+     * @since 102.0.0
      */
     public $debugChanges;
 
@@ -100,6 +102,7 @@ public function __construct(
      * All changes are sorted because there are dependencies between tables, like foreign keys.
      *
      * @inheritdoc
+     * @since 102.0.0
      */
     public function getAll()
     {
@@ -115,6 +118,7 @@ public function getAll()
      * @param string $table
      * @param string $operation
      * @return ElementHistory[]
+     * @since 102.0.0
      */
     public function getChange($table, $operation)
     {
@@ -159,6 +163,7 @@ private function getWhiteListTables()
      * @param  ElementInterface | Table $object
      * @param string $operation
      * @return bool
+     * @since 102.0.0
      */
     public function canBeRegistered(ElementInterface $object, $operation): bool
     {
@@ -202,6 +207,7 @@ private function isElementHaveAutoGeneratedName(ElementInterface $element): bool
      *
      * @param TableElementInterface $dtoObject
      * @inheritdoc
+     * @since 102.0.0
      */
     public function register(
         ElementInterface $dtoObject,
diff --git a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/ElementInterface.php b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/ElementInterface.php
index 43c4c5d9d516a..168b8c0861ad7 100644
--- a/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/ElementInterface.php
+++ b/lib/internal/Magento/Framework/Setup/Declaration/Schema/Dto/ElementInterface.php
@@ -11,6 +11,7 @@
  * Is parent interface for all various schema structural elements:
  * table, column, constraint, index.
  * @api
+ * @since 102.0.0
  */
 interface ElementInterface
 {
@@ -18,6 +19,7 @@ interface ElementInterface
      * Return name of structural element.
      *
      * @return string
+     * @since 102.0.0
      */
     public function getName();
 
@@ -25,6 +27,7 @@ public function getName();
      * Retrieve element low level type: varchar, char, foreign key, etc..
      *
      * @return string
+     * @since 102.0.0
      */
     public function getType();
 
@@ -36,6 +39,7 @@ public function getType();
      * And in order to distinguish this types of elements we use this method.
      *
      * @return string
+     * @since 102.0.0
      */
     public function getElementType();
 }
diff --git a/lib/internal/Magento/Framework/Setup/InstallDataInterface.php b/lib/internal/Magento/Framework/Setup/InstallDataInterface.php
index 68e08f658faaf..085f989a8bb82 100644
--- a/lib/internal/Magento/Framework/Setup/InstallDataInterface.php
+++ b/lib/internal/Magento/Framework/Setup/InstallDataInterface.php
@@ -9,6 +9,7 @@
  * Interface for data installs of a module
  *
  * @api
+ * @since 100.0.2
  */
 interface InstallDataInterface
 {
diff --git a/lib/internal/Magento/Framework/Setup/InstallSchemaInterface.php b/lib/internal/Magento/Framework/Setup/InstallSchemaInterface.php
index abb0017b85e93..878f3e3e1a152 100644
--- a/lib/internal/Magento/Framework/Setup/InstallSchemaInterface.php
+++ b/lib/internal/Magento/Framework/Setup/InstallSchemaInterface.php
@@ -9,6 +9,7 @@
  * Interface for DB schema installs of a module
  *
  * @api
+ * @since 100.0.2
  */
 interface InstallSchemaInterface
 {
diff --git a/lib/internal/Magento/Framework/Setup/LoggerInterface.php b/lib/internal/Magento/Framework/Setup/LoggerInterface.php
index 8f82cf8001127..169c2acfe9bf5 100644
--- a/lib/internal/Magento/Framework/Setup/LoggerInterface.php
+++ b/lib/internal/Magento/Framework/Setup/LoggerInterface.php
@@ -10,6 +10,7 @@
  * Interface to Log Message in Setup
  *
  * @api
+ * @since 100.0.2
  */
 interface LoggerInterface
 {
diff --git a/lib/internal/Magento/Framework/Setup/ModuleContextInterface.php b/lib/internal/Magento/Framework/Setup/ModuleContextInterface.php
index 45c59f08bc691..d5d0b4e1efe59 100644
--- a/lib/internal/Magento/Framework/Setup/ModuleContextInterface.php
+++ b/lib/internal/Magento/Framework/Setup/ModuleContextInterface.php
@@ -8,6 +8,7 @@
 /**
  * Context of a module being installed/updated: version, user data, etc.
  * @api
+ * @since 100.0.2
  */
 interface ModuleContextInterface
 {
diff --git a/lib/internal/Magento/Framework/Setup/ModuleDataSetupInterface.php b/lib/internal/Magento/Framework/Setup/ModuleDataSetupInterface.php
index bcf50e6ff9851..2bc55d13d2277 100644
--- a/lib/internal/Magento/Framework/Setup/ModuleDataSetupInterface.php
+++ b/lib/internal/Magento/Framework/Setup/ModuleDataSetupInterface.php
@@ -9,6 +9,7 @@
  * DB data resource interface for a module
  *
  * @api
+ * @since 100.0.2
  */
 interface ModuleDataSetupInterface extends SetupInterface
 {
diff --git a/lib/internal/Magento/Framework/Setup/SchemaSetupInterface.php b/lib/internal/Magento/Framework/Setup/SchemaSetupInterface.php
index 48900c5cdc029..dd73c79069b1a 100644
--- a/lib/internal/Magento/Framework/Setup/SchemaSetupInterface.php
+++ b/lib/internal/Magento/Framework/Setup/SchemaSetupInterface.php
@@ -8,6 +8,7 @@
 /**
  * DB schema resource interface
  * @api
+ * @since 100.0.2
  */
 interface SchemaSetupInterface extends SetupInterface
 {
diff --git a/lib/internal/Magento/Framework/Setup/SetupInterface.php b/lib/internal/Magento/Framework/Setup/SetupInterface.php
index 58d0387007045..434a3234ee318 100644
--- a/lib/internal/Magento/Framework/Setup/SetupInterface.php
+++ b/lib/internal/Magento/Framework/Setup/SetupInterface.php
@@ -9,6 +9,7 @@
  * DB resource interface
  *
  * @api
+ * @since 100.0.2
  */
 interface SetupInterface
 {
diff --git a/lib/internal/Magento/Framework/Setup/UninstallInterface.php b/lib/internal/Magento/Framework/Setup/UninstallInterface.php
index 28e8104610559..72a2a9a37348a 100644
--- a/lib/internal/Magento/Framework/Setup/UninstallInterface.php
+++ b/lib/internal/Magento/Framework/Setup/UninstallInterface.php
@@ -9,6 +9,7 @@
  * Interface for handling data removal during module uninstall
  *
  * @api
+ * @since 100.0.2
  */
 interface UninstallInterface
 {
diff --git a/lib/internal/Magento/Framework/Setup/UpgradeDataInterface.php b/lib/internal/Magento/Framework/Setup/UpgradeDataInterface.php
index f700157cab98e..93d94cce0dd99 100644
--- a/lib/internal/Magento/Framework/Setup/UpgradeDataInterface.php
+++ b/lib/internal/Magento/Framework/Setup/UpgradeDataInterface.php
@@ -9,6 +9,7 @@
  * Interface for data upgrades of a module
  *
  * @api
+ * @since 100.0.2
  */
 interface UpgradeDataInterface
 {
diff --git a/lib/internal/Magento/Framework/Setup/UpgradeSchemaInterface.php b/lib/internal/Magento/Framework/Setup/UpgradeSchemaInterface.php
index 22c3b2110ec69..d7a3d56e55164 100644
--- a/lib/internal/Magento/Framework/Setup/UpgradeSchemaInterface.php
+++ b/lib/internal/Magento/Framework/Setup/UpgradeSchemaInterface.php
@@ -9,6 +9,7 @@
  * Interface for DB schema upgrades of a module
  *
  * @api
+ * @since 100.0.2
  */
 interface UpgradeSchemaInterface
 {
diff --git a/lib/internal/Magento/Framework/Shell/CommandRendererInterface.php b/lib/internal/Magento/Framework/Shell/CommandRendererInterface.php
index 7460aaea74819..5632e32b790fe 100644
--- a/lib/internal/Magento/Framework/Shell/CommandRendererInterface.php
+++ b/lib/internal/Magento/Framework/Shell/CommandRendererInterface.php
@@ -9,6 +9,7 @@
  * Shell command renderer
  *
  * @api
+ * @since 100.0.2
  */
 interface CommandRendererInterface
 {
diff --git a/lib/internal/Magento/Framework/ShellInterface.php b/lib/internal/Magento/Framework/ShellInterface.php
index 96607b8a072af..3c51916f06a23 100644
--- a/lib/internal/Magento/Framework/ShellInterface.php
+++ b/lib/internal/Magento/Framework/ShellInterface.php
@@ -9,6 +9,7 @@
  * Shell command line wrapper encapsulates command execution and arguments escaping
  *
  * @api
+ * @since 100.0.2
  */
 interface ShellInterface
 {
diff --git a/lib/internal/Magento/Framework/Simplexml/Config.php b/lib/internal/Magento/Framework/Simplexml/Config.php
index 0d8711c5011c0..9f403e3451dcc 100644
--- a/lib/internal/Magento/Framework/Simplexml/Config.php
+++ b/lib/internal/Magento/Framework/Simplexml/Config.php
@@ -9,6 +9,7 @@
  * Base class for simplexml based configurations
  *
  * @api
+ * @since 100.0.2
  */
 class Config
 {
diff --git a/lib/internal/Magento/Framework/Simplexml/Element.php b/lib/internal/Magento/Framework/Simplexml/Element.php
index 15602965de0a8..268eb8cd636e3 100644
--- a/lib/internal/Magento/Framework/Simplexml/Element.php
+++ b/lib/internal/Magento/Framework/Simplexml/Element.php
@@ -10,6 +10,7 @@
  * Extends SimpleXML to add valuable functionality to \SimpleXMLElement class
  *
  * @api
+ * @since 100.0.2
  */
 class Element extends \SimpleXMLElement
 {
diff --git a/lib/internal/Magento/Framework/Stdlib/ArrayUtils.php b/lib/internal/Magento/Framework/Stdlib/ArrayUtils.php
index bd822a4942ba9..56243ae6b24cf 100644
--- a/lib/internal/Magento/Framework/Stdlib/ArrayUtils.php
+++ b/lib/internal/Magento/Framework/Stdlib/ArrayUtils.php
@@ -9,6 +9,7 @@
  * Class ArrayUtils
  *
  * @api
+ * @since 100.0.2
  */
 class ArrayUtils
 {
@@ -150,7 +151,7 @@ private function _decorateArrayObject($element, $key, $value, $isSkipped)
      * @param string $path The leading path
      * @param string $separator The path parts separator
      * @return array
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function flatten(array $data, $path = '', $separator = '/')
     {
@@ -181,7 +182,7 @@ public function flatten(array $data, $path = '', $separator = '/')
      * @param array $originalArray The array to compare from
      * @param array $newArray The array to compare with
      * @return array Diff array
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function recursiveDiff(array $originalArray, array $newArray)
     {
diff --git a/lib/internal/Magento/Framework/Stdlib/BooleanUtils.php b/lib/internal/Magento/Framework/Stdlib/BooleanUtils.php
index 83cf1a839f0ef..f55bc79ad6505 100644
--- a/lib/internal/Magento/Framework/Stdlib/BooleanUtils.php
+++ b/lib/internal/Magento/Framework/Stdlib/BooleanUtils.php
@@ -9,6 +9,7 @@
  * Utility methods for the boolean data type
  *
  * @api
+ * @since 100.0.2
  */
 class BooleanUtils
 {
@@ -71,7 +72,7 @@ public function toBoolean($value)
      *
      * @param mixed $value
      * @return mixed
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function convert($value)
     {
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php
index 2b4cddf242113..112408bfddfdd 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php
@@ -8,6 +8,7 @@
 /**
  * Class CookieMetadata
  * @api
+ * @since 100.0.2
  */
 class CookieMetadata
 {
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadataFactory.php b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadataFactory.php
index b60df1264863d..706c19e1e731a 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadataFactory.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadataFactory.php
@@ -11,6 +11,7 @@
 /**
  * CookieMetadataFactory is used to construct SensitiveCookieMetadata and PublicCookieMetadata objects.
  * @api
+ * @since 100.0.2
  */
 class CookieMetadataFactory
 {
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieReaderInterface.php b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieReaderInterface.php
index 121c168483a6e..5b7c54159aed6 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieReaderInterface.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieReaderInterface.php
@@ -9,6 +9,7 @@
 /**
  * CookieReaderInterface provides the ability to read cookies sent in a request.
  * @api
+ * @since 100.0.2
  */
 interface CookieReaderInterface
 {
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieScopeInterface.php b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieScopeInterface.php
index b2870309ae5a5..d355579b4b07a 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieScopeInterface.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieScopeInterface.php
@@ -8,6 +8,7 @@
 /**
  * CookieScope is used to store default scope metadata.
  * @api
+ * @since 100.0.2
  */
 interface CookieScopeInterface
 {
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieSizeLimitReachedException.php b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieSizeLimitReachedException.php
index fabd3bbe2b0be..a74a4983cb5b8 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieSizeLimitReachedException.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieSizeLimitReachedException.php
@@ -15,6 +15,7 @@
  * set for the domain.
  *
  * @api
+ * @since 100.0.2
  */
 class CookieSizeLimitReachedException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/FailureToSendException.php b/lib/internal/Magento/Framework/Stdlib/Cookie/FailureToSendException.php
index 681d6b43c3d04..ee9e798d258d7 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/FailureToSendException.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/FailureToSendException.php
@@ -12,6 +12,7 @@
  * impossible to send any cookie information back to the client.
  *
  * @api
+ * @since 100.0.2
  */
 class FailureToSendException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/PublicCookieMetadata.php b/lib/internal/Magento/Framework/Stdlib/Cookie/PublicCookieMetadata.php
index ef40ea94a6d08..14af3651834ad 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/PublicCookieMetadata.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/PublicCookieMetadata.php
@@ -10,6 +10,7 @@
  * Class PublicCookieMetadata
  *
  * @api
+ * @since 100.0.2
  */
 class PublicCookieMetadata extends CookieMetadata
 {
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/SensitiveCookieMetadata.php b/lib/internal/Magento/Framework/Stdlib/Cookie/SensitiveCookieMetadata.php
index aab8e93160c8d..ed09481ab464e 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/SensitiveCookieMetadata.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/SensitiveCookieMetadata.php
@@ -15,6 +15,7 @@
  * as path and domain are only data to be exposed by SensitiveCookieMetadata
  *
  * @api
+ * @since 100.0.2
  */
 class SensitiveCookieMetadata extends CookieMetadata
 {
diff --git a/lib/internal/Magento/Framework/Stdlib/CookieManagerInterface.php b/lib/internal/Magento/Framework/Stdlib/CookieManagerInterface.php
index d4d37d656ebcf..fc357d26d8c36 100644
--- a/lib/internal/Magento/Framework/Stdlib/CookieManagerInterface.php
+++ b/lib/internal/Magento/Framework/Stdlib/CookieManagerInterface.php
@@ -22,6 +22,7 @@
  * about how the cookie should be stored and whether JavaScript can access the cookie.
  *
  * @api
+ * @since 100.0.2
  */
 interface CookieManagerInterface extends CookieReaderInterface
 {
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime.php b/lib/internal/Magento/Framework/Stdlib/DateTime.php
index 36db84860b373..2b828f4ba1d4e 100644
--- a/lib/internal/Magento/Framework/Stdlib/DateTime.php
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime.php
@@ -10,6 +10,7 @@
  * Internal dates
  *
  * @api
+ * @since 100.0.2
  */
 class DateTime
 {
@@ -79,7 +80,7 @@ public function isEmptyDate($date)
      * @param int $time
      * @return string The given time in given format
      *
-     * @deprecated
+     * @deprecated 101.0.1
      * @see Use Intl library for datetime handling: http://php.net/manual/en/book.intl.php
      *
      * @codeCoverageIgnore
@@ -95,7 +96,7 @@ public function gmDate($format, $time)
      * @param string $timeStr
      * @return int
      *
-     * @deprecated
+     * @deprecated 101.0.1
      * @see Use Intl library for datetime handling: http://php.net/manual/en/book.intl.php
      *
      * @codeCoverageIgnore
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/DateTime.php b/lib/internal/Magento/Framework/Stdlib/DateTime/DateTime.php
index 646908f99693c..99f3a76b46d7d 100644
--- a/lib/internal/Magento/Framework/Stdlib/DateTime/DateTime.php
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/DateTime.php
@@ -10,6 +10,7 @@
  * Date conversion model
  *
  * @api
+ * @since 100.0.2
  */
 class DateTime
 {
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/DateTimeFormatterInterface.php b/lib/internal/Magento/Framework/Stdlib/DateTime/DateTimeFormatterInterface.php
index a2d18215385fc..c1ec2695be114 100644
--- a/lib/internal/Magento/Framework/Stdlib/DateTime/DateTimeFormatterInterface.php
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/DateTimeFormatterInterface.php
@@ -7,6 +7,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 interface DateTimeFormatterInterface
 {
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/Filter/Date.php b/lib/internal/Magento/Framework/Stdlib/DateTime/Filter/Date.php
index 1138dc2e60887..59920f1861072 100644
--- a/lib/internal/Magento/Framework/Stdlib/DateTime/Filter/Date.php
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/Filter/Date.php
@@ -11,6 +11,7 @@
  * Date filter. Converts date from localized to internal format.
  *
  * @api
+ * @since 100.0.2
  */
 class Date implements \Zend_Filter_Interface
 {
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/Filter/DateTime.php b/lib/internal/Magento/Framework/Stdlib/DateTime/Filter/DateTime.php
index 0f2e81e6a9faf..05e9042a06a54 100644
--- a/lib/internal/Magento/Framework/Stdlib/DateTime/Filter/DateTime.php
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/Filter/DateTime.php
@@ -9,6 +9,7 @@
  * Date/Time filter. Converts datetime from localized to internal format.
  *
  * @api
+ * @since 100.0.2
  */
 class DateTime extends Date
 {
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone/Validator.php b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone/Validator.php
index 43cc83a702f6c..363fa54794bb4 100644
--- a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone/Validator.php
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone/Validator.php
@@ -11,6 +11,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class Validator
 {
diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php b/lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php
index d1ac24c84be9a..0ff6de9266c8a 100644
--- a/lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/TimezoneInterface.php
@@ -11,6 +11,7 @@
 /**
  * Timezone Interface
  * @api
+ * @since 100.0.2
  */
 interface TimezoneInterface
 {
diff --git a/lib/internal/Magento/Framework/Stdlib/StringUtils.php b/lib/internal/Magento/Framework/Stdlib/StringUtils.php
index 35decd7dab0a0..3e3072ee58677 100644
--- a/lib/internal/Magento/Framework/Stdlib/StringUtils.php
+++ b/lib/internal/Magento/Framework/Stdlib/StringUtils.php
@@ -9,6 +9,7 @@
  * Magento methods to work with string
  *
  * @api
+ * @since 100.0.2
  */
 class StringUtils
 {
diff --git a/lib/internal/Magento/Framework/Translate.php b/lib/internal/Magento/Framework/Translate.php
index e992482609a87..18675e19a4a96 100644
--- a/lib/internal/Magento/Framework/Translate.php
+++ b/lib/internal/Magento/Framework/Translate.php
@@ -461,7 +461,7 @@ private function getThemeTranslationFilesList($locale): array
      * @param string $locale
      * @return string
      *
-     * @deprecated
+     * @deprecated 102.0.1
      *
      * @see \Magento\Framework\Translate::getThemeTranslationFilesList
      */
@@ -589,7 +589,7 @@ protected function _saveCache()
      * Get serializer
      *
      * @return \Magento\Framework\Serialize\SerializerInterface
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     private function getSerializer()
     {
diff --git a/lib/internal/Magento/Framework/Translate/AdapterInterface.php b/lib/internal/Magento/Framework/Translate/AdapterInterface.php
index bcd08a0b27c29..96591d3d32d53 100644
--- a/lib/internal/Magento/Framework/Translate/AdapterInterface.php
+++ b/lib/internal/Magento/Framework/Translate/AdapterInterface.php
@@ -10,6 +10,7 @@
  * Magento translate adapter interface
  *
  * @api
+ * @since 100.0.2
  */
 interface AdapterInterface
 {
diff --git a/lib/internal/Magento/Framework/Translate/Inline/ConfigInterface.php b/lib/internal/Magento/Framework/Translate/Inline/ConfigInterface.php
index 02ab3e92d1d16..dc78b0b49d26f 100644
--- a/lib/internal/Magento/Framework/Translate/Inline/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/Translate/Inline/ConfigInterface.php
@@ -9,6 +9,7 @@
  * Inline Translation config interface
  *
  * @api
+ * @since 100.0.2
  */
 interface ConfigInterface
 {
diff --git a/lib/internal/Magento/Framework/Translate/Inline/ParserInterface.php b/lib/internal/Magento/Framework/Translate/Inline/ParserInterface.php
index 4c3bfc1a1964b..78093d99729b7 100644
--- a/lib/internal/Magento/Framework/Translate/Inline/ParserInterface.php
+++ b/lib/internal/Magento/Framework/Translate/Inline/ParserInterface.php
@@ -9,6 +9,7 @@
  * Processes the content with the inline translation replacement so the inline translate JavaScript code will work.
  *
  * @api
+ * @since 100.0.2
  */
 interface ParserInterface
 {
diff --git a/lib/internal/Magento/Framework/Translate/Inline/StateInterface.php b/lib/internal/Magento/Framework/Translate/Inline/StateInterface.php
index cf56616ac4a99..e0994713a0219 100644
--- a/lib/internal/Magento/Framework/Translate/Inline/StateInterface.php
+++ b/lib/internal/Magento/Framework/Translate/Inline/StateInterface.php
@@ -10,6 +10,7 @@
  * Controls and represents the  state of the inline translation processing.
  *
  * @api
+ * @since 100.0.2
  */
 interface StateInterface
 {
diff --git a/lib/internal/Magento/Framework/Translate/InlineInterface.php b/lib/internal/Magento/Framework/Translate/InlineInterface.php
index 4669a536eedbf..2c8ac78bffcf0 100644
--- a/lib/internal/Magento/Framework/Translate/InlineInterface.php
+++ b/lib/internal/Magento/Framework/Translate/InlineInterface.php
@@ -9,6 +9,7 @@
  * Inline translation interface
  *
  * @api
+ * @since 100.0.2
  */
 interface InlineInterface
 {
diff --git a/lib/internal/Magento/Framework/Translate/ResourceInterface.php b/lib/internal/Magento/Framework/Translate/ResourceInterface.php
index 51e2f430c7281..44a600a04deeb 100644
--- a/lib/internal/Magento/Framework/Translate/ResourceInterface.php
+++ b/lib/internal/Magento/Framework/Translate/ResourceInterface.php
@@ -9,6 +9,7 @@
  * Returns the translation resource data.
  *
  * @api
+ * @since 100.0.2
  */
 interface ResourceInterface
 {
diff --git a/lib/internal/Magento/Framework/Unserialize/Unserialize.php b/lib/internal/Magento/Framework/Unserialize/Unserialize.php
index 56c3bb0d16864..7611e6c12b6d8 100644
--- a/lib/internal/Magento/Framework/Unserialize/Unserialize.php
+++ b/lib/internal/Magento/Framework/Unserialize/Unserialize.php
@@ -10,7 +10,7 @@
 use Magento\Framework\Serialize\Serializer\Serialize;
 
 /**
- * @deprecated 100.2.0
+ * @deprecated 101.0.0
  */
 class Unserialize
 {
diff --git a/lib/internal/Magento/Framework/Url.php b/lib/internal/Magento/Framework/Url.php
index efd65cd26e37a..1d00b732c5795 100644
--- a/lib/internal/Magento/Framework/Url.php
+++ b/lib/internal/Magento/Framework/Url.php
@@ -1007,7 +1007,7 @@ public function getRebuiltUrl($url)
      *
      * @param string $value
      * @return string
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     public function escape($value)
     {
@@ -1154,7 +1154,7 @@ protected function getRouteParamsResolver()
      * Gets URL modifier.
      *
      * @return \Magento\Framework\Url\ModifierInterface
-     * @deprecated 100.1.0
+     * @deprecated 101.0.0
      */
     private function getUrlModifier()
     {
@@ -1171,7 +1171,7 @@ private function getUrlModifier()
      * Get escaper
      *
      * @return Escaper
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     private function getEscaper()
     {
diff --git a/lib/internal/Magento/Framework/Url/DecoderInterface.php b/lib/internal/Magento/Framework/Url/DecoderInterface.php
index 523a402c1dc84..7a9f971202450 100644
--- a/lib/internal/Magento/Framework/Url/DecoderInterface.php
+++ b/lib/internal/Magento/Framework/Url/DecoderInterface.php
@@ -9,6 +9,7 @@
  * Base64 decoder for URLs
  *
  * @api
+ * @since 100.0.2
  */
 interface DecoderInterface
 {
diff --git a/lib/internal/Magento/Framework/Url/EncoderInterface.php b/lib/internal/Magento/Framework/Url/EncoderInterface.php
index 9e5a999755063..02afdfcaefe9b 100644
--- a/lib/internal/Magento/Framework/Url/EncoderInterface.php
+++ b/lib/internal/Magento/Framework/Url/EncoderInterface.php
@@ -9,6 +9,7 @@
  * Base64 encoder for URLs
  *
  * @api
+ * @since 100.0.2
  */
 interface EncoderInterface
 {
diff --git a/lib/internal/Magento/Framework/Url/QueryParamsResolverInterface.php b/lib/internal/Magento/Framework/Url/QueryParamsResolverInterface.php
index c9bd2412cad9c..1e7e8dff25456 100644
--- a/lib/internal/Magento/Framework/Url/QueryParamsResolverInterface.php
+++ b/lib/internal/Magento/Framework/Url/QueryParamsResolverInterface.php
@@ -9,6 +9,7 @@
  * Resolves query parameters in a URL.
  *
  * @api
+ * @since 100.0.2
  */
 interface QueryParamsResolverInterface
 {
diff --git a/lib/internal/Magento/Framework/Url/RouteParamsResolver.php b/lib/internal/Magento/Framework/Url/RouteParamsResolver.php
index b46ba00d48023..eac9005e68548 100644
--- a/lib/internal/Magento/Framework/Url/RouteParamsResolver.php
+++ b/lib/internal/Magento/Framework/Url/RouteParamsResolver.php
@@ -154,7 +154,7 @@ public function getRouteParam($key)
      * Get escaper
      *
      * @return \Magento\Framework\Escaper
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     private function getEscaper()
     {
diff --git a/lib/internal/Magento/Framework/Url/RouteParamsResolverInterface.php b/lib/internal/Magento/Framework/Url/RouteParamsResolverInterface.php
index 349f3d8359f7d..22d9aac7a2c32 100644
--- a/lib/internal/Magento/Framework/Url/RouteParamsResolverInterface.php
+++ b/lib/internal/Magento/Framework/Url/RouteParamsResolverInterface.php
@@ -9,6 +9,7 @@
  * Route parameters resolver.
  *
  * @api
+ * @since 100.0.2
  */
 interface RouteParamsResolverInterface
 {
diff --git a/lib/internal/Magento/Framework/Url/ScopeInterface.php b/lib/internal/Magento/Framework/Url/ScopeInterface.php
index 821ae1814e9a3..648a33ca7b870 100644
--- a/lib/internal/Magento/Framework/Url/ScopeInterface.php
+++ b/lib/internal/Magento/Framework/Url/ScopeInterface.php
@@ -10,6 +10,7 @@
  * determine scope based on URLs.
  *
  * @api
+ * @since 100.0.2
  */
 interface ScopeInterface extends \Magento\Framework\App\ScopeInterface
 {
diff --git a/lib/internal/Magento/Framework/Url/ScopeResolverInterface.php b/lib/internal/Magento/Framework/Url/ScopeResolverInterface.php
index 961ad6ecff8b5..b6861e1153f21 100644
--- a/lib/internal/Magento/Framework/Url/ScopeResolverInterface.php
+++ b/lib/internal/Magento/Framework/Url/ScopeResolverInterface.php
@@ -9,6 +9,7 @@
  * This ScopeResolverInterface adds the ability to get the Magento area the code is executing in.
  *
  * @api
+ * @since 100.0.2
  */
 interface ScopeResolverInterface extends \Magento\Framework\App\ScopeResolverInterface
 {
diff --git a/lib/internal/Magento/Framework/Url/SecurityInfoInterface.php b/lib/internal/Magento/Framework/Url/SecurityInfoInterface.php
index c3cdab91d325f..8029538fbaeb4 100644
--- a/lib/internal/Magento/Framework/Url/SecurityInfoInterface.php
+++ b/lib/internal/Magento/Framework/Url/SecurityInfoInterface.php
@@ -9,6 +9,7 @@
  * URL security information. Answers whether URL is secured.
  *
  * @api
+ * @since 100.0.2
  */
 interface SecurityInfoInterface
 {
diff --git a/lib/internal/Magento/Framework/UrlInterface.php b/lib/internal/Magento/Framework/UrlInterface.php
index c1fbbfc8407d3..b25d6ab1a0b85 100644
--- a/lib/internal/Magento/Framework/UrlInterface.php
+++ b/lib/internal/Magento/Framework/UrlInterface.php
@@ -7,6 +7,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 interface UrlInterface
 {
diff --git a/lib/internal/Magento/Framework/Validation/ValidationException.php b/lib/internal/Magento/Framework/Validation/ValidationException.php
index 4f94bd8af80b5..ee98d08ae47f8 100644
--- a/lib/internal/Magento/Framework/Validation/ValidationException.php
+++ b/lib/internal/Magento/Framework/Validation/ValidationException.php
@@ -17,6 +17,7 @@
  * to support Multi-Error response.
  *
  * @api
+ * @since 101.0.7
  */
 class ValidationException extends LocalizedException implements AggregateExceptionInterface
 {
@@ -43,6 +44,7 @@ public function __construct(
 
     /**
      * @inheritdoc
+     * @since 101.0.7
      */
     public function getErrors(): array
     {
diff --git a/lib/internal/Magento/Framework/Validation/ValidationResult.php b/lib/internal/Magento/Framework/Validation/ValidationResult.php
index 60ff7ba5a4700..9e9cad26536fb 100644
--- a/lib/internal/Magento/Framework/Validation/ValidationResult.php
+++ b/lib/internal/Magento/Framework/Validation/ValidationResult.php
@@ -12,6 +12,7 @@
  * ValidationResult represents a container storing all the validation errors that happened during the entity validation.
  *
  * @api
+ * @since 101.0.7
  */
 class ValidationResult
 {
@@ -30,6 +31,7 @@ public function __construct(array $errors)
 
     /**
      * @return bool
+     * @since 101.0.7
      */
     public function isValid(): bool
     {
@@ -38,6 +40,7 @@ public function isValid(): bool
 
     /**
      * @return array
+     * @since 101.0.7
      */
     public function getErrors(): array
     {
diff --git a/lib/internal/Magento/Framework/Validator.php b/lib/internal/Magento/Framework/Validator.php
index e15a1399a96a4..b42e486d00483 100644
--- a/lib/internal/Magento/Framework/Validator.php
+++ b/lib/internal/Magento/Framework/Validator.php
@@ -10,6 +10,7 @@
  * Validator class that represents chain of validators.
  *
  * @api
+ * @since 100.0.2
  */
 class Validator extends \Magento\Framework\Validator\AbstractValidator
 {
diff --git a/lib/internal/Magento/Framework/Validator/AbstractValidator.php b/lib/internal/Magento/Framework/Validator/AbstractValidator.php
index db636516aacab..ade9fa230fbb8 100644
--- a/lib/internal/Magento/Framework/Validator/AbstractValidator.php
+++ b/lib/internal/Magento/Framework/Validator/AbstractValidator.php
@@ -9,6 +9,7 @@
  * Abstract validator class.
  *
  * @api
+ * @since 100.0.2
  */
 abstract class AbstractValidator implements \Magento\Framework\Validator\ValidatorInterface
 {
diff --git a/lib/internal/Magento/Framework/Validator/Constraint.php b/lib/internal/Magento/Framework/Validator/Constraint.php
index d9be3c3d7ff9f..3326d42b7d24f 100644
--- a/lib/internal/Magento/Framework/Validator/Constraint.php
+++ b/lib/internal/Magento/Framework/Validator/Constraint.php
@@ -9,6 +9,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class Constraint extends \Magento\Framework\Validator\AbstractValidator
 {
diff --git a/lib/internal/Magento/Framework/Validator/DataObject.php b/lib/internal/Magento/Framework/Validator/DataObject.php
index 7348550ab3880..d4f4bbb45e7ec 100644
--- a/lib/internal/Magento/Framework/Validator/DataObject.php
+++ b/lib/internal/Magento/Framework/Validator/DataObject.php
@@ -12,6 +12,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class DataObject implements \Zend_Validate_Interface
 {
diff --git a/lib/internal/Magento/Framework/Validator/Exception.php b/lib/internal/Magento/Framework/Validator/Exception.php
index 370f66c424b01..837886e0ce9c9 100644
--- a/lib/internal/Magento/Framework/Validator/Exception.php
+++ b/lib/internal/Magento/Framework/Validator/Exception.php
@@ -16,6 +16,7 @@
  * Exception to be thrown when data validation fails
  *
  * @api
+ * @since 100.0.2
  */
 class Exception extends InputException
 {
diff --git a/lib/internal/Magento/Framework/Validator/ValidatorInterface.php b/lib/internal/Magento/Framework/Validator/ValidatorInterface.php
index 92fb6395c1e4a..001582bd5b867 100644
--- a/lib/internal/Magento/Framework/Validator/ValidatorInterface.php
+++ b/lib/internal/Magento/Framework/Validator/ValidatorInterface.php
@@ -9,6 +9,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 interface ValidatorInterface extends \Zend_Validate_Interface
 {
diff --git a/lib/internal/Magento/Framework/View/Asset/AssetInterface.php b/lib/internal/Magento/Framework/View/Asset/AssetInterface.php
index 60dc997b9d6da..6b7c47816c6a8 100644
--- a/lib/internal/Magento/Framework/View/Asset/AssetInterface.php
+++ b/lib/internal/Magento/Framework/View/Asset/AssetInterface.php
@@ -9,6 +9,7 @@
  * An abstraction for static view file (or resource) that may be embedded to a web page
  *
  * @api
+ * @since 100.0.2
  */
 interface AssetInterface
 {
@@ -30,7 +31,7 @@ public function getContentType();
      * Retrieve source content type
      *
      * @return string
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getSourceContentType();
 }
diff --git a/lib/internal/Magento/Framework/View/Asset/Bundle.php b/lib/internal/Magento/Framework/View/Asset/Bundle.php
index 80f35f9d57075..5d918982412b7 100644
--- a/lib/internal/Magento/Framework/View/Asset/Bundle.php
+++ b/lib/internal/Magento/Framework/View/Asset/Bundle.php
@@ -13,7 +13,7 @@
 
 /**
  * Bundle model
- * @deprecated 100.2.0
+ * @deprecated 101.0.0
  * @see \Magento\Deploy\Package\Bundle
  */
 class Bundle
diff --git a/lib/internal/Magento/Framework/View/Asset/Bundle/Config.php b/lib/internal/Magento/Framework/View/Asset/Bundle/Config.php
index 8c529e9a2bc1c..ede43c789416f 100644
--- a/lib/internal/Magento/Framework/View/Asset/Bundle/Config.php
+++ b/lib/internal/Magento/Framework/View/Asset/Bundle/Config.php
@@ -15,7 +15,7 @@
 
 /**
  * Class Config
- * @deprecated 100.2.0
+ * @deprecated 101.0.0
  * @see \Magento\Deploy\Config\BundleConfig
  */
 class Config implements Bundle\ConfigInterface
diff --git a/lib/internal/Magento/Framework/View/Asset/Bundle/ConfigInterface.php b/lib/internal/Magento/Framework/View/Asset/Bundle/ConfigInterface.php
index bea542aef2ea8..3acb49337a2e0 100644
--- a/lib/internal/Magento/Framework/View/Asset/Bundle/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/View/Asset/Bundle/ConfigInterface.php
@@ -10,7 +10,7 @@
 
 /**
  * Interface ConfigInterface
- * @deprecated 100.2.0
+ * @deprecated 101.0.0
  * @see \Magento\Deploy\Config\BundleConfig
  */
 interface ConfigInterface
diff --git a/lib/internal/Magento/Framework/View/Asset/Bundle/Manager.php b/lib/internal/Magento/Framework/View/Asset/Bundle/Manager.php
index ee1368c0e6230..490c04004365d 100644
--- a/lib/internal/Magento/Framework/View/Asset/Bundle/Manager.php
+++ b/lib/internal/Magento/Framework/View/Asset/Bundle/Manager.php
@@ -15,7 +15,7 @@
 /**
  * BundleService model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @deprecated 100.2.0
+ * @deprecated 101.0.0
  * @see \Magento\Deploy\Service\Bundle
  */
 class Manager
diff --git a/lib/internal/Magento/Framework/View/Asset/ConfigInterface.php b/lib/internal/Magento/Framework/View/Asset/ConfigInterface.php
index 21357911e4597..1b817acf84aeb 100644
--- a/lib/internal/Magento/Framework/View/Asset/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/View/Asset/ConfigInterface.php
@@ -9,6 +9,7 @@
  * View asset configuration interface
  *
  * @api
+ * @since 100.0.2
  */
 interface ConfigInterface
 {
diff --git a/lib/internal/Magento/Framework/View/Asset/ContentProcessorException.php b/lib/internal/Magento/Framework/View/Asset/ContentProcessorException.php
index 86daba29e5be8..481968f7da360 100644
--- a/lib/internal/Magento/Framework/View/Asset/ContentProcessorException.php
+++ b/lib/internal/Magento/Framework/View/Asset/ContentProcessorException.php
@@ -9,6 +9,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class ContentProcessorException extends LocalizedException
 {
diff --git a/lib/internal/Magento/Framework/View/Asset/File.php b/lib/internal/Magento/Framework/View/Asset/File.php
index 2dd50224f78fa..7a3276b251a5a 100644
--- a/lib/internal/Magento/Framework/View/Asset/File.php
+++ b/lib/internal/Magento/Framework/View/Asset/File.php
@@ -12,6 +12,7 @@
  * This class is a value object with lazy loading of some of its data (content, physical file path)
  *
  * @api
+ * @since 100.0.2
  */
 class File implements MergeableInterface
 {
@@ -166,7 +167,7 @@ public function getSourceFile()
      * Get source content type
      *
      * @return string
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function getSourceContentType()
     {
diff --git a/lib/internal/Magento/Framework/View/Asset/File/FallbackContext.php b/lib/internal/Magento/Framework/View/Asset/File/FallbackContext.php
index 5f83358336ab6..ba6564cd7abb7 100644
--- a/lib/internal/Magento/Framework/View/Asset/File/FallbackContext.php
+++ b/lib/internal/Magento/Framework/View/Asset/File/FallbackContext.php
@@ -12,6 +12,7 @@
  * An advanced context that contains information necessary for view files fallback system
  *
  * @api
+ * @since 100.0.2
  */
 class FallbackContext extends Context
 {
diff --git a/lib/internal/Magento/Framework/View/Asset/File/NotFoundException.php b/lib/internal/Magento/Framework/View/Asset/File/NotFoundException.php
index 93b88834edff9..ddecc9330617d 100644
--- a/lib/internal/Magento/Framework/View/Asset/File/NotFoundException.php
+++ b/lib/internal/Magento/Framework/View/Asset/File/NotFoundException.php
@@ -12,6 +12,7 @@
  * Use this exception when file has not been found
  *
  * @api
+ * @since 100.0.2
  */
 class NotFoundException extends \LogicException
 {
diff --git a/lib/internal/Magento/Framework/View/Asset/GroupedCollection.php b/lib/internal/Magento/Framework/View/Asset/GroupedCollection.php
index a0942599480b4..a574b272a2876 100644
--- a/lib/internal/Magento/Framework/View/Asset/GroupedCollection.php
+++ b/lib/internal/Magento/Framework/View/Asset/GroupedCollection.php
@@ -9,6 +9,7 @@
  * List of page assets that combines into groups ones having the same properties
  *
  * @api
+ * @since 100.0.2
  */
 class GroupedCollection extends Collection
 {
diff --git a/lib/internal/Magento/Framework/View/Asset/LocalInterface.php b/lib/internal/Magento/Framework/View/Asset/LocalInterface.php
index fd7d1ea473ecd..2bb53bcaa86b2 100644
--- a/lib/internal/Magento/Framework/View/Asset/LocalInterface.php
+++ b/lib/internal/Magento/Framework/View/Asset/LocalInterface.php
@@ -8,6 +8,7 @@
 /**
  * Interface of an asset with locally accessible source file
  * @api
+ * @since 100.0.2
  */
 interface LocalInterface extends AssetInterface
 {
diff --git a/lib/internal/Magento/Framework/View/Asset/MergeStrategy/Checksum.php b/lib/internal/Magento/Framework/View/Asset/MergeStrategy/Checksum.php
index 7c7e8864151c0..c15fedeb8d799 100644
--- a/lib/internal/Magento/Framework/View/Asset/MergeStrategy/Checksum.php
+++ b/lib/internal/Magento/Framework/View/Asset/MergeStrategy/Checksum.php
@@ -45,7 +45,7 @@ public function __construct(
     }
 
     /**
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @return Source
      */
     private function getAssetSource()
diff --git a/lib/internal/Magento/Framework/View/Asset/Minification.php b/lib/internal/Magento/Framework/View/Asset/Minification.php
index 40ac4dd1f3ba3..b0a42fbd373da 100644
--- a/lib/internal/Magento/Framework/View/Asset/Minification.php
+++ b/lib/internal/Magento/Framework/View/Asset/Minification.php
@@ -11,6 +11,7 @@
 /**
  * Helper class for static files minification related processes.
  * @api
+ * @since 100.0.2
  */
 class Minification
 {
diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessor/AlternativeSourceInterface.php b/lib/internal/Magento/Framework/View/Asset/PreProcessor/AlternativeSourceInterface.php
index 750c77e651dff..d208786673e04 100644
--- a/lib/internal/Magento/Framework/View/Asset/PreProcessor/AlternativeSourceInterface.php
+++ b/lib/internal/Magento/Framework/View/Asset/PreProcessor/AlternativeSourceInterface.php
@@ -11,6 +11,7 @@
  * Interface AlternativeSourceInterface
  *
  * @api
+ * @since 100.0.2
  */
 interface AlternativeSourceInterface extends PreProcessorInterface
 {
diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessor/Chain.php b/lib/internal/Magento/Framework/View/Asset/PreProcessor/Chain.php
index 4fc31c22cb2de..80ce1321ef91e 100644
--- a/lib/internal/Magento/Framework/View/Asset/PreProcessor/Chain.php
+++ b/lib/internal/Magento/Framework/View/Asset/PreProcessor/Chain.php
@@ -13,6 +13,7 @@
  * Encapsulates complexity of all necessary context and parameters
  *
  * @api
+ * @since 100.0.2
  */
 class Chain
 {
diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessor/ChainFactory.php b/lib/internal/Magento/Framework/View/Asset/PreProcessor/ChainFactory.php
index 51957cdf4c789..70baf7622b138 100644
--- a/lib/internal/Magento/Framework/View/Asset/PreProcessor/ChainFactory.php
+++ b/lib/internal/Magento/Framework/View/Asset/PreProcessor/ChainFactory.php
@@ -11,6 +11,7 @@
  * Factory for @see \Magento\Framework\View\Asset\PreProcessor\Chain
  * @codeCoverageIgnore
  * @api
+ * @since 100.0.2
  */
 class ChainFactory implements ChainFactoryInterface
 {
diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessor/ChainFactoryInterface.php b/lib/internal/Magento/Framework/View/Asset/PreProcessor/ChainFactoryInterface.php
index d81bc69158db9..10ae2f6d479b2 100644
--- a/lib/internal/Magento/Framework/View/Asset/PreProcessor/ChainFactoryInterface.php
+++ b/lib/internal/Magento/Framework/View/Asset/PreProcessor/ChainFactoryInterface.php
@@ -9,6 +9,7 @@
  * Interface ChainFactoryInterface
  *
  * @api
+ * @since 100.0.2
  */
 interface ChainFactoryInterface
 {
diff --git a/lib/internal/Magento/Framework/View/Asset/PreProcessorInterface.php b/lib/internal/Magento/Framework/View/Asset/PreProcessorInterface.php
index 419b6cd8f612f..35c9aa6a18a41 100644
--- a/lib/internal/Magento/Framework/View/Asset/PreProcessorInterface.php
+++ b/lib/internal/Magento/Framework/View/Asset/PreProcessorInterface.php
@@ -9,6 +9,7 @@
  * An interface for "preprocessing" asset contents
  *
  * @api
+ * @since 100.0.2
  */
 interface PreProcessorInterface
 {
diff --git a/lib/internal/Magento/Framework/View/Asset/Repository.php b/lib/internal/Magento/Framework/View/Asset/Repository.php
index 15b9a7130180a..6ec4d1219af63 100644
--- a/lib/internal/Magento/Framework/View/Asset/Repository.php
+++ b/lib/internal/Magento/Framework/View/Asset/Repository.php
@@ -17,6 +17,7 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @api
+ * @since 100.0.2
  */
 class Repository
 {
@@ -37,7 +38,7 @@ class Repository
 
     /**
      * @var \Magento\Framework\View\Design\Theme\ListInterface
-     * @deprecated 100.1.1
+     * @deprecated 100.0.2
      */
     private $themeList;
 
diff --git a/lib/internal/Magento/Framework/View/Asset/Source.php b/lib/internal/Magento/Framework/View/Asset/Source.php
index 4afe1be4490bc..dc98a257500c2 100644
--- a/lib/internal/Magento/Framework/View/Asset/Source.php
+++ b/lib/internal/Magento/Framework/View/Asset/Source.php
@@ -47,7 +47,7 @@ class Source
 
     /**
      * @var \Magento\Framework\View\Design\Theme\ListInterface
-     * @deprecated 100.1.1
+     * @deprecated 100.0.2
      */
     private $themeList;
 
diff --git a/lib/internal/Magento/Framework/View/ConfigInterface.php b/lib/internal/Magento/Framework/View/ConfigInterface.php
index 1b81f10f49d5a..e2a82d97ca1e8 100644
--- a/lib/internal/Magento/Framework/View/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/View/ConfigInterface.php
@@ -9,6 +9,7 @@
  * Config Interface
  *
  * @api
+ * @since 100.0.2
  */
 interface ConfigInterface
 {
diff --git a/lib/internal/Magento/Framework/View/Context.php b/lib/internal/Magento/Framework/View/Context.php
index 508d63d158bd7..8503c48d135c2 100644
--- a/lib/internal/Magento/Framework/View/Context.php
+++ b/lib/internal/Magento/Framework/View/Context.php
@@ -28,6 +28,7 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
+ * @since 100.0.2
  */
 class Context
 {
diff --git a/lib/internal/Magento/Framework/View/Design/Fallback/Rule/Theme.php b/lib/internal/Magento/Framework/View/Design/Fallback/Rule/Theme.php
index b1e0e117e6efd..543eb3727d7a3 100644
--- a/lib/internal/Magento/Framework/View/Design/Fallback/Rule/Theme.php
+++ b/lib/internal/Magento/Framework/View/Design/Fallback/Rule/Theme.php
@@ -108,7 +108,7 @@ private function getThemePubStaticDir(ThemeInterface $theme, $params = [])
      * Get DirectoryList instance
      * @return DirectoryList
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     private function getDirectoryList()
     {
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/FileProviderInterface.php b/lib/internal/Magento/Framework/View/Design/Theme/FileProviderInterface.php
index bf431b085a106..19337ba60f5a5 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/FileProviderInterface.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/FileProviderInterface.php
@@ -9,6 +9,7 @@
  * Theme files provider
  *
  * @api
+ * @since 100.0.2
  */
 interface FileProviderInterface
 {
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Label/ListInterface.php b/lib/internal/Magento/Framework/View/Design/Theme/Label/ListInterface.php
index 7003ee17dd763..5f8e8be4cf812 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/Label/ListInterface.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/Label/ListInterface.php
@@ -9,6 +9,7 @@
  * Label list interface
  *
  * @api
+ * @since 100.0.2
  */
 interface ListInterface
 {
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/ListInterface.php b/lib/internal/Magento/Framework/View/Design/Theme/ListInterface.php
index b3556a578db6a..c68f2fc23f3a8 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/ListInterface.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/ListInterface.php
@@ -9,6 +9,7 @@
  * Theme list interface
  *
  * @api
+ * @since 100.0.2
  */
 interface ListInterface
 {
diff --git a/lib/internal/Magento/Framework/View/Design/ThemeInterface.php b/lib/internal/Magento/Framework/View/Design/ThemeInterface.php
index adcd29db708c9..fc1c5d8a22a47 100644
--- a/lib/internal/Magento/Framework/View/Design/ThemeInterface.php
+++ b/lib/internal/Magento/Framework/View/Design/ThemeInterface.php
@@ -9,6 +9,7 @@
  * Interface ThemeInterface
  *
  * @api
+ * @since 100.0.2
  */
 interface ThemeInterface
 {
diff --git a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
index 95ff209dd4571..8034e1592a232 100644
--- a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
+++ b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
@@ -24,6 +24,7 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.NumberOfChildren)
+ * @since 100.0.2
  */
 abstract class AbstractBlock extends \Magento\Framework\DataObject implements BlockInterface
 {
@@ -55,7 +56,7 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
      * SID Resolver
      *
      * @var \Magento\Framework\Session\SidResolverInterface
-     * @deprecated Not used anymore.
+     * @deprecated 102.0.5 Not used anymore.
      */
     protected $_sidResolver;
 
@@ -176,7 +177,7 @@ abstract class AbstractBlock extends \Magento\Framework\DataObject implements Bl
 
     /**
      * @var \Magento\Framework\App\CacheInterface
-     * @since 100.2.0
+     * @since 101.0.0
      */
     protected $_cache;
 
@@ -893,7 +894,7 @@ public static function extractModuleName($className)
      * @param string|array $data
      * @param array|null $allowedTags
      * @return string
-     * @deprecated Use $escaper directly in templates and in blocks.
+     * @deprecated 103.0.0 Use $escaper directly in templates and in blocks.
      */
     public function escapeHtml($data, $allowedTags = null)
     {
@@ -905,8 +906,8 @@ public function escapeHtml($data, $allowedTags = null)
      *
      * @param string $string
      * @return string
-     * @since 100.2.0
-     * @deprecated Use $escaper directly in templates and in blocks.
+     * @since 101.0.0
+     * @deprecated 103.0.0 Use $escaper directly in templates and in blocks.
      */
     public function escapeJs($string)
     {
@@ -919,8 +920,8 @@ public function escapeJs($string)
      * @param string $string
      * @param boolean $escapeSingleQuote
      * @return string
-     * @since 100.2.0
-     * @deprecated Use $escaper directly in templates and in blocks.
+     * @since 101.0.0
+     * @deprecated 103.0.0 Use $escaper directly in templates and in blocks.
      */
     public function escapeHtmlAttr($string, $escapeSingleQuote = true)
     {
@@ -932,8 +933,8 @@ public function escapeHtmlAttr($string, $escapeSingleQuote = true)
      *
      * @param string $string
      * @return string
-     * @since 100.2.0
-     * @deprecated Use $escaper directly in templates and in blocks.
+     * @since 101.0.0
+     * @deprecated 103.0.0 Use $escaper directly in templates and in blocks.
      */
     public function escapeCss($string)
     {
@@ -961,7 +962,7 @@ public function stripTags($data, $allowableTags = null, $allowHtmlEntities = fal
      *
      * @param string $string
      * @return string
-     * @deprecated Use $escaper directly in templates and in blocks.
+     * @deprecated 103.0.0 Use $escaper directly in templates and in blocks.
      */
     public function escapeUrl($string)
     {
@@ -973,7 +974,7 @@ public function escapeUrl($string)
      *
      * @param string $data
      * @return string
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     public function escapeXssInUrl($data)
     {
@@ -988,7 +989,7 @@ public function escapeXssInUrl($data)
      * @param string $data
      * @param bool $addSlashes
      * @return string
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     public function escapeQuote($data, $addSlashes = false)
     {
@@ -1002,7 +1003,7 @@ public function escapeQuote($data, $addSlashes = false)
      * @param string $quote
      *
      * @return string|array
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     public function escapeJsQuote($data, $quote = '\'')
     {
diff --git a/lib/internal/Magento/Framework/View/Element/Block/ArgumentInterface.php b/lib/internal/Magento/Framework/View/Element/Block/ArgumentInterface.php
index 29b5557c9fcb1..00992d28f4df1 100644
--- a/lib/internal/Magento/Framework/View/Element/Block/ArgumentInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/Block/ArgumentInterface.php
@@ -10,6 +10,7 @@
  * All objects that are injected to block arguments should implement this interface.
  *
  * @api
+ * @since 101.0.0
  */
 interface ArgumentInterface
 {
diff --git a/lib/internal/Magento/Framework/View/Element/BlockFactory.php b/lib/internal/Magento/Framework/View/Element/BlockFactory.php
index d691af8d98f53..f159a9f202928 100644
--- a/lib/internal/Magento/Framework/View/Element/BlockFactory.php
+++ b/lib/internal/Magento/Framework/View/Element/BlockFactory.php
@@ -11,6 +11,7 @@
  * Creates Blocks
  *
  * @api
+ * @since 100.0.2
  */
 class BlockFactory
 {
diff --git a/lib/internal/Magento/Framework/View/Element/BlockInterface.php b/lib/internal/Magento/Framework/View/Element/BlockInterface.php
index 1b4326694df97..565fdcc68188b 100644
--- a/lib/internal/Magento/Framework/View/Element/BlockInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/BlockInterface.php
@@ -11,6 +11,7 @@
  * Used to present information to user
  *
  * @api
+ * @since 100.0.2
  */
 interface BlockInterface
 {
diff --git a/lib/internal/Magento/Framework/View/Element/Context.php b/lib/internal/Magento/Framework/View/Element/Context.php
index 0f8123745e7e8..ce804e2ace255 100644
--- a/lib/internal/Magento/Framework/View/Element/Context.php
+++ b/lib/internal/Magento/Framework/View/Element/Context.php
@@ -22,6 +22,7 @@
  * @SuppressWarnings(PHPMD)
  *
  * @api
+ * @since 100.0.2
  */
 class Context implements \Magento\Framework\ObjectManager\ContextInterface
 {
@@ -379,6 +380,7 @@ public function getLocaleDate()
      * Lock guarded cache loader.
      *
      * @return LockGuardedCacheLoader
+     * @since 102.0.2
      */
     public function getLockGuardedCacheLoader()
     {
diff --git a/lib/internal/Magento/Framework/View/Element/FormKey.php b/lib/internal/Magento/Framework/View/Element/FormKey.php
index e6ecd20435ce8..be661f47cf8e2 100644
--- a/lib/internal/Magento/Framework/View/Element/FormKey.php
+++ b/lib/internal/Magento/Framework/View/Element/FormKey.php
@@ -13,6 +13,7 @@
  * Element with FormKey
  *
  * @api
+ * @since 100.0.2
  */
 class FormKey extends \Magento\Framework\View\Element\AbstractBlock
 {
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Calendar.php b/lib/internal/Magento/Framework/View/Element/Html/Calendar.php
index 0e17626160bd6..884488d77a74f 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Calendar.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Calendar.php
@@ -13,6 +13,7 @@
  * Prepares localization data for calendar
  *
  * @api
+ * @since 100.0.2
  */
 class Calendar extends \Magento\Framework\View\Element\Template
 {
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Link.php b/lib/internal/Magento/Framework/View/Element/Html/Link.php
index ab0d44b16fe42..d45bcd373e7a5 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Link.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Link.php
@@ -19,6 +19,7 @@
  * @method string getTitle()
  *
  * @api
+ * @since 100.0.2
  */
 class Link extends \Magento\Framework\View\Element\Template
 {
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php b/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php
index 3bd0677c6a443..f3439549275e2 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php
@@ -20,6 +20,7 @@
  * @method null|array                      getAttributes()
  * @method null|bool                       getCurrent()
  * @method \Magento\Framework\View\Element\Html\Link\Current setCurrent(bool $value)
+ * @since 100.0.2
  */
 class Current extends Template
 {
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Links.php b/lib/internal/Magento/Framework/View/Element/Html/Links.php
index 472e24d7f2bfa..8bca55fcbb61d 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Links.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Links.php
@@ -9,6 +9,7 @@
  * Links list block
  *
  * @api
+ * @since 100.0.2
  */
 class Links extends \Magento\Framework\View\Element\Template
 {
diff --git a/lib/internal/Magento/Framework/View/Element/Js/Components.php b/lib/internal/Magento/Framework/View/Element/Js/Components.php
index 8e33ca5581960..6b5eb78f9994a 100644
--- a/lib/internal/Magento/Framework/View/Element/Js/Components.php
+++ b/lib/internal/Magento/Framework/View/Element/Js/Components.php
@@ -12,6 +12,7 @@
  * Block for Components
  *
  * @api
+ * @since 100.0.2
  */
 class Components extends Template
 {
diff --git a/lib/internal/Magento/Framework/View/Element/Js/Cookie.php b/lib/internal/Magento/Framework/View/Element/Js/Cookie.php
index b37a9387c07f6..220318bf5392e 100644
--- a/lib/internal/Magento/Framework/View/Element/Js/Cookie.php
+++ b/lib/internal/Magento/Framework/View/Element/Js/Cookie.php
@@ -13,6 +13,7 @@
  * Block passes configuration for cookies set by JS
  *
  * @api
+ * @since 100.0.2
  */
 class Cookie extends Template
 {
diff --git a/lib/internal/Magento/Framework/View/Element/Messages.php b/lib/internal/Magento/Framework/View/Element/Messages.php
index 409e678d4e30a..0af9a915966bf 100644
--- a/lib/internal/Magento/Framework/View/Element/Messages.php
+++ b/lib/internal/Magento/Framework/View/Element/Messages.php
@@ -11,6 +11,7 @@
  * Class Messages
  *
  * @api
+ * @since 100.0.2
  */
 class Messages extends Template
 {
diff --git a/lib/internal/Magento/Framework/View/Element/RendererInterface.php b/lib/internal/Magento/Framework/View/Element/RendererInterface.php
index e9be81b7f9d20..4137739c08757 100644
--- a/lib/internal/Magento/Framework/View/Element/RendererInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/RendererInterface.php
@@ -9,6 +9,7 @@
  * Magento Block interface
  *
  * @api
+ * @since 100.0.2
  */
 interface RendererInterface
 {
diff --git a/lib/internal/Magento/Framework/View/Element/RendererList.php b/lib/internal/Magento/Framework/View/Element/RendererList.php
index eba78867d7725..a0beb59b14fd9 100644
--- a/lib/internal/Magento/Framework/View/Element/RendererList.php
+++ b/lib/internal/Magento/Framework/View/Element/RendererList.php
@@ -9,6 +9,7 @@
  * Get renderer by code
  *
  * @api
+ * @since 100.0.2
  */
 class RendererList extends AbstractBlock
 {
diff --git a/lib/internal/Magento/Framework/View/Element/Template.php b/lib/internal/Magento/Framework/View/Element/Template.php
index 99c876b440665..53355203213fa 100644
--- a/lib/internal/Magento/Framework/View/Element/Template.php
+++ b/lib/internal/Magento/Framework/View/Element/Template.php
@@ -28,6 +28,7 @@
  * @api
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @since 100.0.2
  */
 class Template extends AbstractBlock
 {
diff --git a/lib/internal/Magento/Framework/View/Element/Template/Context.php b/lib/internal/Magento/Framework/View/Element/Template/Context.php
index 4538fb33a9726..48c91ae29bfa9 100644
--- a/lib/internal/Magento/Framework/View/Element/Template/Context.php
+++ b/lib/internal/Magento/Framework/View/Element/Template/Context.php
@@ -20,6 +20,7 @@
  *
  * @api
  * @SuppressWarnings(PHPMD)
+ * @since 100.0.2
  */
 class Context extends \Magento\Framework\View\Element\Context
 {
diff --git a/lib/internal/Magento/Framework/View/Element/Text.php b/lib/internal/Magento/Framework/View/Element/Text.php
index 687317576c358..b1197006349da 100644
--- a/lib/internal/Magento/Framework/View/Element/Text.php
+++ b/lib/internal/Magento/Framework/View/Element/Text.php
@@ -9,6 +9,7 @@
  * Class Text
  *
  * @api
+ * @since 100.0.2
  */
 class Text extends \Magento\Framework\View\Element\AbstractBlock
 {
diff --git a/lib/internal/Magento/Framework/View/Element/Text/ListText.php b/lib/internal/Magento/Framework/View/Element/Text/ListText.php
index a18ed78967139..d1892b3e11bd7 100644
--- a/lib/internal/Magento/Framework/View/Element/Text/ListText.php
+++ b/lib/internal/Magento/Framework/View/Element/Text/ListText.php
@@ -11,6 +11,7 @@
  * Class ListText
  *
  * @api
+ * @since 100.0.2
  */
 class ListText extends \Magento\Framework\View\Element\Text
 {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/ManagerInterface.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/ManagerInterface.php
index a66233f99f4d5..525e9ecb52b20 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/ManagerInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/ManagerInterface.php
@@ -7,7 +7,7 @@
 
 /**
  * Interface ManagerInterface
- * @deprecated 100.2.0
+ * @deprecated 101.0.0
  */
 interface ManagerInterface
 {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/Provider/Component/Definition.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/Provider/Component/Definition.php
index 6fd041d582495..56c945ab4fd28 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/Provider/Component/Definition.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/Provider/Component/Definition.php
@@ -114,7 +114,7 @@ protected function prepareComponentData(array $componentsData)
      * Get serializer
      *
      * @return \Magento\Framework\Serialize\SerializerInterface
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     private function getSerializer()
     {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/Provider/Template.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/Provider/Template.php
index 59da9bc8aa5b1..074e18738c3b8 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/Provider/Template.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/Provider/Template.php
@@ -117,7 +117,7 @@ public function getTemplate($template)
      * Get serializer
      *
      * @return \Magento\Framework\Serialize\SerializerInterface
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      */
     private function getSerializer()
     {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/DataProviderInterface.php b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/DataProviderInterface.php
index 9f3121f4e495d..d939a01648f6b 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/DataProviderInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/DataProviderInterface.php
@@ -11,6 +11,7 @@
  * Interface DataProviderInterface
  *
  * @api
+ * @since 100.0.2
  */
 interface DataProviderInterface
 {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FilterPool.php b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FilterPool.php
index 2c0b16f27df8b..2e22199773e90 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FilterPool.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/FilterPool.php
@@ -14,6 +14,7 @@
  * Filter poll apply filters from search criteria
  *
  * @api
+ * @since 100.0.2
  */
 class FilterPool
 {
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/SearchResult.php b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/SearchResult.php
index e1aa6a0605dab..32334e89c5876 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/SearchResult.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponent/DataProvider/SearchResult.php
@@ -95,7 +95,7 @@ public function __construct(
     }
 
     /**
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @return ResourceConnection
      */
     private function getResourceConnection()
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponentFactory.php b/lib/internal/Magento/Framework/View/Element/UiComponentFactory.php
index 16c06fe3abf3a..5e1bc93b9c033 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponentFactory.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponentFactory.php
@@ -25,6 +25,7 @@
  *
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @since 100.0.2
  */
 class UiComponentFactory extends DataObject
 {
@@ -50,7 +51,7 @@ class UiComponentFactory extends DataObject
     /**
      * UI component manager
      *
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @var ManagerInterface
      */
     protected $componentManager;
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponentInterface.php b/lib/internal/Magento/Framework/View/Element/UiComponentInterface.php
index 3ae2627881101..19f06fd6b2ba4 100644
--- a/lib/internal/Magento/Framework/View/Element/UiComponentInterface.php
+++ b/lib/internal/Magento/Framework/View/Element/UiComponentInterface.php
@@ -11,6 +11,7 @@
  * Interface UiComponentInterface
  *
  * @api
+ * @since 100.0.2
  */
 interface UiComponentInterface extends BlockInterface
 {
diff --git a/lib/internal/Magento/Framework/View/File/CollectorInterface.php b/lib/internal/Magento/Framework/View/File/CollectorInterface.php
index 31554d2a79238..dec8d6ea093b6 100644
--- a/lib/internal/Magento/Framework/View/File/CollectorInterface.php
+++ b/lib/internal/Magento/Framework/View/File/CollectorInterface.php
@@ -11,6 +11,7 @@
  * Interface of locating view files in the file system
  *
  * @api
+ * @since 100.0.2
  */
 interface CollectorInterface
 {
diff --git a/lib/internal/Magento/Framework/View/FileSystem.php b/lib/internal/Magento/Framework/View/FileSystem.php
index db269345eab98..687b6adcb0f8e 100644
--- a/lib/internal/Magento/Framework/View/FileSystem.php
+++ b/lib/internal/Magento/Framework/View/FileSystem.php
@@ -9,6 +9,7 @@
  * Model that finds file paths by their fileId
  *
  * @api
+ * @since 100.0.2
  */
 class FileSystem
 {
diff --git a/lib/internal/Magento/Framework/View/Layout/BuilderInterface.php b/lib/internal/Magento/Framework/View/Layout/BuilderInterface.php
index f579a539a12a9..1d28952aaa0f7 100644
--- a/lib/internal/Magento/Framework/View/Layout/BuilderInterface.php
+++ b/lib/internal/Magento/Framework/View/Layout/BuilderInterface.php
@@ -11,6 +11,7 @@
  * Interface BuilderInterface
  *
  * @api
+ * @since 100.0.2
  */
 interface BuilderInterface
 {
diff --git a/lib/internal/Magento/Framework/View/Layout/Data/Structure.php b/lib/internal/Magento/Framework/View/Layout/Data/Structure.php
index d9aa739fb04f9..3ec5f8b50c7da 100644
--- a/lib/internal/Magento/Framework/View/Layout/Data/Structure.php
+++ b/lib/internal/Magento/Framework/View/Layout/Data/Structure.php
@@ -12,6 +12,7 @@
  * An associative data structure, that features "nested set" parent-child relations
  *
  * @api
+ * @since 100.0.2
  */
 class Structure extends DataStructure
 {
diff --git a/lib/internal/Magento/Framework/View/Layout/Element.php b/lib/internal/Magento/Framework/View/Layout/Element.php
index 203af4bf1553c..f8ce682dcded2 100644
--- a/lib/internal/Magento/Framework/View/Layout/Element.php
+++ b/lib/internal/Magento/Framework/View/Layout/Element.php
@@ -9,6 +9,7 @@
  * Class Element
  *
  * @api
+ * @since 100.0.2
  */
 class Element extends \Magento\Framework\Simplexml\Element
 {
diff --git a/lib/internal/Magento/Framework/View/Layout/Generator/Context.php b/lib/internal/Magento/Framework/View/Layout/Generator/Context.php
index 951724b062829..606372d366722 100644
--- a/lib/internal/Magento/Framework/View/Layout/Generator/Context.php
+++ b/lib/internal/Magento/Framework/View/Layout/Generator/Context.php
@@ -10,6 +10,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class Context
 {
diff --git a/lib/internal/Magento/Framework/View/Layout/GeneratorPool.php b/lib/internal/Magento/Framework/View/Layout/GeneratorPool.php
index a585eda37df68..333afcf3bf408 100644
--- a/lib/internal/Magento/Framework/View/Layout/GeneratorPool.php
+++ b/lib/internal/Magento/Framework/View/Layout/GeneratorPool.php
@@ -10,6 +10,7 @@
 /**
  * Pool of generators for structural elements
  * @api
+ * @since 100.0.2
  */
 class GeneratorPool
 {
@@ -238,7 +239,7 @@ protected function moveElementInStructure(
      * @param array $data
      *
      * @return bool
-     * @since 100.2.0
+     * @since 101.0.0
      */
     protected function visibilityConditionsExistsIn(array $data)
     {
diff --git a/lib/internal/Magento/Framework/View/Layout/Reader/Block.php b/lib/internal/Magento/Framework/View/Layout/Reader/Block.php
index b287b517a454c..c24cda37defdb 100644
--- a/lib/internal/Magento/Framework/View/Layout/Reader/Block.php
+++ b/lib/internal/Magento/Framework/View/Layout/Reader/Block.php
@@ -81,7 +81,7 @@ class Block implements Layout\ReaderInterface
     private $conditionReader;
 
     /**
-     * @deprecated 100.2.0
+     * @deprecated 101.0.0
      * @var string
      */
     private $deprecatedAttributeAcl = 'acl';
diff --git a/lib/internal/Magento/Framework/View/Layout/Reader/Context.php b/lib/internal/Magento/Framework/View/Layout/Reader/Context.php
index 806c779186dc0..f9ca09478d600 100644
--- a/lib/internal/Magento/Framework/View/Layout/Reader/Context.php
+++ b/lib/internal/Magento/Framework/View/Layout/Reader/Context.php
@@ -10,6 +10,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class Context
 {
diff --git a/lib/internal/Magento/Framework/View/Layout/ScheduledStructure.php b/lib/internal/Magento/Framework/View/Layout/ScheduledStructure.php
index 3193e10282fd4..aae2e9a68fe3c 100644
--- a/lib/internal/Magento/Framework/View/Layout/ScheduledStructure.php
+++ b/lib/internal/Magento/Framework/View/Layout/ScheduledStructure.php
@@ -9,6 +9,7 @@
  * Layout structure model
  *
  * @api
+ * @since 100.0.2
  */
 class ScheduledStructure
 {
@@ -489,7 +490,7 @@ public function flushScheduledStructure()
      * Reformat 'Layout scheduled structure' to array.
      *
      * @return array
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function __toArray()
     {
@@ -506,7 +507,7 @@ public function __toArray()
      *
      * @param array $data
      * @return void
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function populateWithArray(array $data)
     {
diff --git a/lib/internal/Magento/Framework/View/LayoutInterface.php b/lib/internal/Magento/Framework/View/LayoutInterface.php
index a8ad5e28de2d6..3a63b5ccc9ea3 100644
--- a/lib/internal/Magento/Framework/View/LayoutInterface.php
+++ b/lib/internal/Magento/Framework/View/LayoutInterface.php
@@ -8,6 +8,7 @@
 /**
  * Interface LayoutInterface
  * @api
+ * @since 100.0.2
  */
 interface LayoutInterface
 {
diff --git a/lib/internal/Magento/Framework/View/Page/Config.php b/lib/internal/Magento/Framework/View/Page/Config.php
index 44f4038860cda..ea71e49615e47 100644
--- a/lib/internal/Magento/Framework/View/Page/Config.php
+++ b/lib/internal/Magento/Framework/View/Page/Config.php
@@ -26,6 +26,7 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  *
  * @api
+ * @since 100.0.2
  */
 class Config
 {
@@ -384,6 +385,7 @@ public function getDescription()
      * Set meta title
      *
      * @param string $title
+     * @since 101.0.6
      */
     public function setMetaTitle($title)
     {
@@ -394,6 +396,7 @@ public function setMetaTitle($title)
      * Retrieve meta title
      *
      * @return string
+     * @since 101.0.6
      */
     public function getMetaTitle()
     {
diff --git a/lib/internal/Magento/Framework/View/Page/Config/Structure.php b/lib/internal/Magento/Framework/View/Page/Config/Structure.php
index 1a181952ed990..78e3cf9f58c85 100644
--- a/lib/internal/Magento/Framework/View/Page/Config/Structure.php
+++ b/lib/internal/Magento/Framework/View/Page/Config/Structure.php
@@ -10,6 +10,7 @@
  * Page config structure model
  *
  * @api
+ * @since 100.0.2
  */
 class Structure
 {
@@ -216,7 +217,7 @@ public function getAssets()
      * Reformat 'Page config structure' to array.
      *
      * @return array
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function __toArray()
     {
@@ -233,7 +234,7 @@ public function __toArray()
      *
      * @param array $data
      * @return void
-     * @since 100.2.0
+     * @since 101.0.0
      */
     public function populateWithArray(array $data)
     {
diff --git a/lib/internal/Magento/Framework/View/Page/FaviconInterface.php b/lib/internal/Magento/Framework/View/Page/FaviconInterface.php
index d7286029c466c..a28506e3f5906 100644
--- a/lib/internal/Magento/Framework/View/Page/FaviconInterface.php
+++ b/lib/internal/Magento/Framework/View/Page/FaviconInterface.php
@@ -9,6 +9,7 @@
  * Favicon interface
  *
  * @api
+ * @since 100.0.2
  */
 interface FaviconInterface
 {
diff --git a/lib/internal/Magento/Framework/View/Page/Title.php b/lib/internal/Magento/Framework/View/Page/Title.php
index b0c8b155c878e..17bc4cea1cc92 100644
--- a/lib/internal/Magento/Framework/View/Page/Title.php
+++ b/lib/internal/Magento/Framework/View/Page/Title.php
@@ -12,6 +12,7 @@
  * Page title
  *
  * @api
+ * @since 100.0.2
  */
 class Title
 {
diff --git a/lib/internal/Magento/Framework/View/Render/RenderFactory.php b/lib/internal/Magento/Framework/View/Render/RenderFactory.php
index 3f90bc2e8f2bb..d150ede9a5b78 100644
--- a/lib/internal/Magento/Framework/View/Render/RenderFactory.php
+++ b/lib/internal/Magento/Framework/View/Render/RenderFactory.php
@@ -12,6 +12,7 @@
  * Class RenderFactory
  *
  * @api
+ * @since 100.0.2
  */
 class RenderFactory
 {
diff --git a/lib/internal/Magento/Framework/View/RenderInterface.php b/lib/internal/Magento/Framework/View/RenderInterface.php
index 041893f81232a..5f456dd1987eb 100644
--- a/lib/internal/Magento/Framework/View/RenderInterface.php
+++ b/lib/internal/Magento/Framework/View/RenderInterface.php
@@ -9,6 +9,7 @@
  * Interface RenderInterface
  *
  * @api
+ * @since 100.0.2
  */
 interface RenderInterface
 {
diff --git a/lib/internal/Magento/Framework/View/Result/Layout.php b/lib/internal/Magento/Framework/View/Result/Layout.php
index 83e0a991cb959..2b08ddf69e372 100644
--- a/lib/internal/Magento/Framework/View/Result/Layout.php
+++ b/lib/internal/Magento/Framework/View/Result/Layout.php
@@ -19,6 +19,7 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  *
  * @api
+ * @since 100.0.2
  */
 class Layout extends AbstractResult
 {
diff --git a/lib/internal/Magento/Framework/View/Result/LayoutFactory.php b/lib/internal/Magento/Framework/View/Result/LayoutFactory.php
index 4104e19686244..4b857ad3cf66b 100644
--- a/lib/internal/Magento/Framework/View/Result/LayoutFactory.php
+++ b/lib/internal/Magento/Framework/View/Result/LayoutFactory.php
@@ -10,6 +10,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class LayoutFactory
 {
diff --git a/lib/internal/Magento/Framework/View/Result/Page.php b/lib/internal/Magento/Framework/View/Result/Page.php
index 39cca1a111906..14a83a8320330 100644
--- a/lib/internal/Magento/Framework/View/Result/Page.php
+++ b/lib/internal/Magento/Framework/View/Result/Page.php
@@ -25,6 +25,7 @@
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
  *
  * @api
+ * @since 100.0.2
  */
 class Page extends Layout
 {
diff --git a/lib/internal/Magento/Framework/View/Result/PageFactory.php b/lib/internal/Magento/Framework/View/Result/PageFactory.php
index ef234ca4d4429..4de4c097d16a2 100644
--- a/lib/internal/Magento/Framework/View/Result/PageFactory.php
+++ b/lib/internal/Magento/Framework/View/Result/PageFactory.php
@@ -14,6 +14,7 @@
  * which is by convention is determined from the controller action class
  *
  * @api
+ * @since 100.0.2
  */
 class PageFactory
 {
diff --git a/lib/internal/Magento/Framework/View/Template/Html/MinifierInterface.php b/lib/internal/Magento/Framework/View/Template/Html/MinifierInterface.php
index edd8caeb914b3..98fe13ab3a12c 100644
--- a/lib/internal/Magento/Framework/View/Template/Html/MinifierInterface.php
+++ b/lib/internal/Magento/Framework/View/Template/Html/MinifierInterface.php
@@ -10,6 +10,7 @@
  * HTML minifier
  *
  * @api
+ * @since 100.0.2
  */
 interface MinifierInterface
 {
diff --git a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/CompilerInterface.php b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/CompilerInterface.php
index 565bb7c92324c..8228013df40a4 100644
--- a/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/CompilerInterface.php
+++ b/lib/internal/Magento/Framework/View/TemplateEngine/Xhtml/CompilerInterface.php
@@ -11,6 +11,7 @@
  * Interface CompilerInterface
  *
  * @api
+ * @since 100.0.2
  */
 interface CompilerInterface
 {
diff --git a/lib/internal/Magento/Framework/View/TemplateEnginePool.php b/lib/internal/Magento/Framework/View/TemplateEnginePool.php
index 1aec127a17bd1..0f8d2032af879 100644
--- a/lib/internal/Magento/Framework/View/TemplateEnginePool.php
+++ b/lib/internal/Magento/Framework/View/TemplateEnginePool.php
@@ -7,6 +7,7 @@
 
 /**
  * @api
+ * @since 100.0.2
  */
 class TemplateEnginePool
 {
diff --git a/lib/internal/Magento/Framework/View/Url/ConfigInterface.php b/lib/internal/Magento/Framework/View/Url/ConfigInterface.php
index d1076abdb0ec5..4cc0d86e619f2 100644
--- a/lib/internal/Magento/Framework/View/Url/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/View/Url/ConfigInterface.php
@@ -8,6 +8,7 @@
 /**
  * Url Config Interface
  * @api
+ * @since 100.0.2
  */
 interface ConfigInterface
 {
diff --git a/lib/internal/Magento/Framework/View/Url/CssResolver.php b/lib/internal/Magento/Framework/View/Url/CssResolver.php
index 8c73e2ab9bcf9..60f03d063c4a8 100644
--- a/lib/internal/Magento/Framework/View/Url/CssResolver.php
+++ b/lib/internal/Magento/Framework/View/Url/CssResolver.php
@@ -11,6 +11,7 @@
  * CSS URLs resolver class.
  * This utility class provides a set of methods to work with CSS files.
  * @api
+ * @since 100.0.2
  */
 class CssResolver
 {
diff --git a/lib/internal/Magento/Framework/Webapi/Authorization.php b/lib/internal/Magento/Framework/Webapi/Authorization.php
index 03ee07d48b323..a1907dc46ab11 100644
--- a/lib/internal/Magento/Framework/Webapi/Authorization.php
+++ b/lib/internal/Magento/Framework/Webapi/Authorization.php
@@ -23,7 +23,6 @@ class Authorization
      * Initialize dependencies.
      *
      * @param \Magento\Framework\AuthorizationInterface $authorization
-     * @since 100.1.0
      */
     public function __construct(\Magento\Framework\AuthorizationInterface $authorization)
     {
diff --git a/lib/internal/Magento/Framework/Webapi/CustomAttributeTypeLocatorInterface.php b/lib/internal/Magento/Framework/Webapi/CustomAttributeTypeLocatorInterface.php
index 25d78672eef87..ac183bc3b1871 100644
--- a/lib/internal/Magento/Framework/Webapi/CustomAttributeTypeLocatorInterface.php
+++ b/lib/internal/Magento/Framework/Webapi/CustomAttributeTypeLocatorInterface.php
@@ -24,7 +24,7 @@ public function getType($attributeCode, $entityType);
      * Get list of all Data Interface corresponding to complex custom attribute types
      *
      * @return string[] array of Data Interface class names
-     * @deprecated
+     * @deprecated 102.0.0
      * @see \Magento\Framework\Webapi\CustomAttribute\ServiceTypeListInterface::getDataTypes()
      */
     public function getAllServiceDataInterfaces();
diff --git a/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php b/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php
index f9b6a32fc5673..3737d86d2b1f6 100644
--- a/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php
+++ b/lib/internal/Magento/Framework/Webapi/ErrorProcessor.php
@@ -24,6 +24,7 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
+ * @since 100.0.2
  */
 class ErrorProcessor
 {
diff --git a/lib/internal/Magento/Framework/Webapi/Rest/Request/Deserializer/Json.php b/lib/internal/Magento/Framework/Webapi/Rest/Request/Deserializer/Json.php
index c2e7c324d1282..2673df519b064 100644
--- a/lib/internal/Magento/Framework/Webapi/Rest/Request/Deserializer/Json.php
+++ b/lib/internal/Magento/Framework/Webapi/Rest/Request/Deserializer/Json.php
@@ -14,7 +14,7 @@ class Json implements \Magento\Framework\Webapi\Rest\Request\DeserializerInterfa
 {
     /**
      * @var \Magento\Framework\Json\Decoder
-     * @deprecated
+     * @deprecated 101.0.0
      */
     protected $decoder;
 
diff --git a/lib/internal/Magento/Framework/Webapi/Rest/Request/ParamOverriderInterface.php b/lib/internal/Magento/Framework/Webapi/Rest/Request/ParamOverriderInterface.php
index 828022353e4fa..bc171b84ba3d9 100644
--- a/lib/internal/Magento/Framework/Webapi/Rest/Request/ParamOverriderInterface.php
+++ b/lib/internal/Magento/Framework/Webapi/Rest/Request/ParamOverriderInterface.php
@@ -27,6 +27,7 @@
  * adding to the parameter list for ParamsOverrider's dependency injection configuration.
  *
  * @api
+ * @since 100.0.2
  */
 interface ParamOverriderInterface
 {
diff --git a/lib/internal/Magento/Framework/Webapi/Rest/Response/RendererInterface.php b/lib/internal/Magento/Framework/Webapi/Rest/Response/RendererInterface.php
index 9d905ce599779..4edbe4e6a5377 100644
--- a/lib/internal/Magento/Framework/Webapi/Rest/Response/RendererInterface.php
+++ b/lib/internal/Magento/Framework/Webapi/Rest/Response/RendererInterface.php
@@ -11,6 +11,7 @@
  * Renderer interface allows REST response data rendering in a specific format (e.g. Json or Xml)
  *
  * @api
+ * @since 100.0.2
  */
 interface RendererInterface
 {
diff --git a/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php b/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
index 902e67bf015b7..c8955aa2a6998 100644
--- a/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
+++ b/lib/internal/Magento/Framework/Webapi/ServiceInputProcessor.php
@@ -28,6 +28,7 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
+ * @since 100.0.2
  */
 class ServiceInputProcessor implements ServicePayloadConverterInterface
 {
diff --git a/lib/internal/Magento/Framework/Webapi/ServiceOutputProcessor.php b/lib/internal/Magento/Framework/Webapi/ServiceOutputProcessor.php
index 25eacb00c23ae..8319a0398a825 100644
--- a/lib/internal/Magento/Framework/Webapi/ServiceOutputProcessor.php
+++ b/lib/internal/Magento/Framework/Webapi/ServiceOutputProcessor.php
@@ -17,6 +17,7 @@
  * Data object converter
  *
  * @api
+ * @since 100.0.2
  */
 class ServiceOutputProcessor implements ServicePayloadConverterInterface
 {
diff --git a/lib/internal/Magento/Framework/Webapi/ServicePayloadConverterInterface.php b/lib/internal/Magento/Framework/Webapi/ServicePayloadConverterInterface.php
index 30f93efdb9ef9..da4fe0ad08143 100644
--- a/lib/internal/Magento/Framework/Webapi/ServicePayloadConverterInterface.php
+++ b/lib/internal/Magento/Framework/Webapi/ServicePayloadConverterInterface.php
@@ -11,6 +11,7 @@
  * Interface for data conversion based on data type.
  *
  * @api
+ * @since 100.0.2
  */
 interface ServicePayloadConverterInterface
 {

From 15433c43cf0a0691745bdeae79e600f6e4d8050f Mon Sep 17 00:00:00 2001
From: Volodymyr Zaets <vzaets@magento.com>
Date: Mon, 20 Jul 2020 21:41:27 -0500
Subject: [PATCH 0945/1718] Revert "COMOPS-1042: 2.4.0 packaging"

This reverts commit 19af792cb315a6f3a84270b80d4f93fe6814a13a.
---
 app/code/Magento/AdminAnalytics/composer.json |  13 +-
 .../Magento/AdminNotification/composer.json   |  15 +-
 .../AdvancedPricingImportExport/composer.json |  19 +-
 app/code/Magento/AdvancedSearch/composer.json |  19 +-
 app/code/Magento/Amqp/composer.json           |   9 +-
 app/code/Magento/AmqpStore/composer.json      |  13 +-
 app/code/Magento/Analytics/composer.json      |  13 +-
 .../AsynchronousOperations/composer.json      |  19 +-
 app/code/Magento/Authorization/composer.json  |   7 +-
 app/code/Magento/Backend/composer.json        |  39 +-
 app/code/Magento/Backup/composer.json         |  11 +-
 app/code/Magento/Bundle/composer.json         |  41 +-
 app/code/Magento/BundleGraphQl/composer.json  |  17 +-
 .../Magento/BundleImportExport/composer.json  |  17 +-
 .../Magento/CacheInvalidate/composer.json     |   7 +-
 app/code/Magento/Captcha/composer.json        |  13 +-
 .../Magento/CardinalCommerce/composer.json    |  11 +-
 app/code/Magento/Catalog/composer.json        |  61 +-
 .../Magento/CatalogAnalytics/composer.json    |   9 +-
 .../Magento/CatalogCmsGraphQl/composer.json   |  15 +-
 .../CatalogCustomerGraphQl/composer.json      |  13 +-
 app/code/Magento/CatalogGraphQl/composer.json |  25 +-
 .../Magento/CatalogImportExport/composer.json |  25 +-
 .../Magento/CatalogInventory/composer.json    |  19 +-
 .../CatalogInventoryGraphQl/composer.json     |  11 +-
 app/code/Magento/CatalogRule/composer.json    |  23 +-
 .../CatalogRuleConfigurable/composer.json     |  13 +-
 .../Magento/CatalogRuleGraphQl/composer.json  |   7 +-
 app/code/Magento/CatalogSearch/composer.json  |  29 +-
 .../Magento/CatalogUrlRewrite/composer.json   |  23 +-
 .../CatalogUrlRewriteGraphQl/composer.json    |  15 +-
 app/code/Magento/CatalogWidget/composer.json  |  23 +-
 app/code/Magento/Checkout/composer.json       |  43 +-
 .../Magento/CheckoutAgreements/composer.json  |  13 +-
 .../CheckoutAgreementsGraphQl/composer.json   |  11 +-
 app/code/Magento/Cms/composer.json            |  25 +-
 app/code/Magento/CmsGraphQl/composer.json     |  17 +-
 app/code/Magento/CmsUrlRewrite/composer.json  |  11 +-
 .../CmsUrlRewriteGraphQl/composer.json        |  15 +-
 app/code/Magento/Config/composer.json         |  19 +-
 .../ConfigurableImportExport/composer.json    |  17 +-
 .../Magento/ConfigurableProduct/composer.json |  41 +-
 .../ConfigurableProductGraphQl/composer.json  |  15 +-
 .../ConfigurableProductSales/composer.json    |  13 +-
 app/code/Magento/Contact/composer.json        |  13 +-
 app/code/Magento/Cookie/composer.json         |   9 +-
 app/code/Magento/Cron/composer.json           |   9 +-
 app/code/Magento/Csp/composer.json            |   7 +-
 app/code/Magento/CurrencySymbol/composer.json |  15 +-
 app/code/Magento/Customer/composer.json       |  45 +-
 .../Magento/CustomerAnalytics/composer.json   |   9 +-
 .../CustomerDownloadableGraphQl/composer.json |  11 +-
 .../Magento/CustomerGraphQl/composer.json     |  21 +-
 .../CustomerImportExport/composer.json        |  17 +-
 app/code/Magento/Deploy/composer.json         |  13 +-
 app/code/Magento/Developer/composer.json      |   9 +-
 app/code/Magento/Dhl/composer.json            |  25 +-
 app/code/Magento/Directory/composer.json      |  11 +-
 .../Magento/DirectoryGraphQl/composer.json    |  11 +-
 app/code/Magento/Downloadable/composer.json   |  39 +-
 .../Magento/DownloadableGraphQl/composer.json |  15 +-
 .../DownloadableImportExport/composer.json    |  17 +-
 app/code/Magento/Eav/composer.json            |  15 +-
 app/code/Magento/EavGraphQl/composer.json     |   9 +-
 app/code/Magento/Elasticsearch/composer.json  |  23 +-
 app/code/Magento/Elasticsearch6/composer.json |  15 +-
 app/code/Magento/Elasticsearch7/composer.json |  15 +-
 app/code/Magento/Email/composer.json          |  25 +-
 app/code/Magento/EncryptionKey/composer.json  |   9 +-
 app/code/Magento/Fedex/composer.json          |  21 +-
 app/code/Magento/GiftMessage/composer.json    |  25 +-
 app/code/Magento/GoogleAdwords/composer.json  |   9 +-
 .../Magento/GoogleAnalytics/composer.json     |  13 +-
 .../Magento/GoogleOptimizer/composer.json     |  17 +-
 app/code/Magento/GraphQl/composer.json        |  11 +-
 app/code/Magento/GraphQlCache/composer.json   |   9 +-
 .../GroupedCatalogInventory/composer.json     |  11 +-
 .../Magento/GroupedImportExport/composer.json |  15 +-
 app/code/Magento/GroupedProduct/composer.json |  33 +-
 .../GroupedProductGraphQl/composer.json       |  11 +-
 app/code/Magento/ImportExport/composer.json   |  17 +-
 app/code/Magento/Indexer/composer.json        |   7 +-
 .../Magento/InstantPurchase/composer.json     |  19 +-
 app/code/Magento/Integration/composer.json    |  19 +-
 .../Magento/LayeredNavigation/composer.json   |   9 +-
 .../Magento/LoginAsCustomer/composer.json     |  15 +-
 .../LoginAsCustomerAdminUi/composer.json      |  21 +-
 .../Magento/LoginAsCustomerApi/composer.json  |   9 +-
 .../LoginAsCustomerFrontendUi/composer.json   |  15 +-
 .../Magento/LoginAsCustomerLog/composer.json  |  21 +-
 .../LoginAsCustomerPageCache/composer.json    |  15 +-
 .../LoginAsCustomerQuote/composer.json        |  13 +-
 .../LoginAsCustomerSales/composer.json        |  13 +-
 app/code/Magento/Marketplace/composer.json    |   7 +-
 app/code/Magento/MediaContent/composer.json   |   9 +-
 .../Magento/MediaContentApi/composer.json     |   7 +-
 .../Magento/MediaContentCatalog/composer.json |  11 +-
 .../Magento/MediaContentCms/composer.json     |   9 +-
 app/code/Magento/MediaGallery/composer.json   |   9 +-
 .../Magento/MediaGalleryApi/composer.json     |   5 +-
 .../Magento/MediaGalleryCatalog/composer.json |   9 +-
 app/code/Magento/MediaStorage/composer.json   |  21 +-
 app/code/Magento/MessageQueue/composer.json   |   7 +-
 app/code/Magento/Msrp/composer.json           |  19 +-
 .../MsrpConfigurableProduct/composer.json     |  11 +-
 .../Magento/MsrpGroupedProduct/composer.json  |  11 +-
 app/code/Magento/Multishipping/composer.json  |  23 +-
 app/code/Magento/MysqlMq/composer.json        |   9 +-
 .../Magento/NewRelicReporting/composer.json   |  17 +-
 app/code/Magento/Newsletter/composer.json     |  23 +-
 .../Magento/OfflinePayments/composer.json     |  11 +-
 .../Magento/OfflineShipping/composer.json     |  27 +-
 app/code/Magento/PageCache/composer.json      |  11 +-
 app/code/Magento/Payment/composer.json        |  19 +-
 app/code/Magento/Paypal/composer.json         |  39 +-
 app/code/Magento/PaypalCaptcha/composer.json  |  13 +-
 app/code/Magento/PaypalGraphQl/composer.json  |  21 +-
 app/code/Magento/Persistent/composer.json     |  17 +-
 app/code/Magento/ProductAlert/composer.json   |  17 +-
 app/code/Magento/ProductVideo/composer.json   |  19 +-
 app/code/Magento/Quote/composer.json          |  35 +-
 app/code/Magento/QuoteAnalytics/composer.json |   9 +-
 app/code/Magento/QuoteGraphQl/composer.json   |  25 +-
 .../RelatedProductGraphQl/composer.json       |  11 +-
 .../Magento/ReleaseNotification/composer.json |  13 +-
 app/code/Magento/Reports/composer.json        |  37 +-
 app/code/Magento/RequireJs/composer.json      |   5 +-
 app/code/Magento/Review/composer.json         |  25 +-
 .../Magento/ReviewAnalytics/composer.json     |   9 +-
 app/code/Magento/Robots/composer.json         |   9 +-
 app/code/Magento/Rss/composer.json            |  11 +-
 app/code/Magento/Rule/composer.json           |  13 +-
 app/code/Magento/Sales/composer.json          |  55 +-
 app/code/Magento/SalesAnalytics/composer.json |   9 +-
 app/code/Magento/SalesGraphQl/composer.json   |   9 +-
 app/code/Magento/SalesInventory/composer.json |  13 +-
 app/code/Magento/SalesRule/composer.json      |  45 +-
 app/code/Magento/SalesSequence/composer.json  |   5 +-
 app/code/Magento/SampleData/composer.json     |   7 +-
 app/code/Magento/Search/composer.json         |  15 +-
 app/code/Magento/Security/composer.json       |  13 +-
 app/code/Magento/SendFriend/composer.json     |  17 +-
 .../Magento/SendFriendGraphQl/composer.json   |  11 +-
 app/code/Magento/Shipping/composer.json       |  37 +-
 app/code/Magento/Sitemap/composer.json        |  25 +-
 app/code/Magento/Store/composer.json          |  23 +-
 app/code/Magento/StoreGraphQl/composer.json   |   9 +-
 app/code/Magento/Swagger/composer.json        |   5 +-
 app/code/Magento/SwaggerWebapi/composer.json  |   7 +-
 .../Magento/SwaggerWebapiAsync/composer.json  |   9 +-
 app/code/Magento/Swatches/composer.json       |  29 +-
 .../Magento/SwatchesGraphQl/composer.json     |  11 +-
 .../SwatchesLayeredNavigation/composer.json   |   5 +-
 app/code/Magento/Tax/composer.json            |  35 +-
 app/code/Magento/TaxGraphQl/composer.json     |   9 +-
 .../Magento/TaxImportExport/composer.json     |  15 +-
 app/code/Magento/Theme/composer.json          |  31 +-
 app/code/Magento/ThemeGraphQl/composer.json   |   7 +-
 app/code/Magento/Tinymce3/composer.json       |  15 +-
 app/code/Magento/Translation/composer.json    |  15 +-
 app/code/Magento/Ui/composer.json             |  17 +-
 app/code/Magento/Ups/composer.json            |  21 +-
 app/code/Magento/UrlRewrite/composer.json     |  19 +-
 .../Magento/UrlRewriteGraphQl/composer.json   |   9 +-
 app/code/Magento/User/composer.json           |  19 +-
 app/code/Magento/Usps/composer.json           |  21 +-
 app/code/Magento/Variable/composer.json       |  13 +-
 app/code/Magento/Vault/composer.json          |  19 +-
 app/code/Magento/VaultGraphQl/composer.json   |   9 +-
 app/code/Magento/Version/composer.json        |   5 +-
 app/code/Magento/Webapi/composer.json         |  17 +-
 app/code/Magento/WebapiAsync/composer.json    |  15 +-
 app/code/Magento/WebapiSecurity/composer.json |   7 +-
 app/code/Magento/Weee/composer.json           |  31 +-
 app/code/Magento/WeeeGraphQl/composer.json    |  13 +-
 app/code/Magento/Widget/composer.json         |  21 +-
 app/code/Magento/Wishlist/composer.json       |  39 +-
 .../Magento/WishlistAnalytics/composer.json   |   9 +-
 .../Magento/WishlistGraphQl/composer.json     |  11 +-
 .../adminhtml/Magento/backend/composer.json   |   5 +-
 .../frontend/Magento/blank/composer.json      |   5 +-
 .../frontend/Magento/luma/composer.json       |   7 +-
 app/i18n/Magento/de_DE/composer.json          |   5 +-
 app/i18n/Magento/en_US/composer.json          |   5 +-
 app/i18n/Magento/es_ES/composer.json          |   5 +-
 app/i18n/Magento/fr_FR/composer.json          |   5 +-
 app/i18n/Magento/nl_NL/composer.json          |   5 +-
 app/i18n/Magento/pt_BR/composer.json          |   5 +-
 app/i18n/Magento/zh_Hans_CN/composer.json     |   5 +-
 composer.json                                 | 389 ++++----
 composer.lock                                 | 861 ++++++++----------
 .../Magento/Framework/Amqp/composer.json      |   5 +-
 .../Magento/Framework/Bulk/composer.json      |   5 +-
 .../Framework/MessageQueue/composer.json      |   5 +-
 lib/internal/Magento/Framework/composer.json  |   3 +-
 195 files changed, 2006 insertions(+), 2327 deletions(-)

diff --git a/app/code/Magento/AdminAnalytics/composer.json b/app/code/Magento/AdminAnalytics/composer.json
index 5f92f9d706fd4..cf60b1d88ae55 100644
--- a/app/code/Magento/AdminAnalytics/composer.json
+++ b/app/code/Magento/AdminAnalytics/composer.json
@@ -6,11 +6,11 @@
     },
     "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": [
@@ -24,6 +24,5 @@
         "psr-4": {
             "Magento\\AdminAnalytics\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json
index b579f61dbc900..d421fc869621b 100644
--- a/app/code/Magento/AdminNotification/composer.json
+++ b/app/code/Magento/AdminNotification/composer.json
@@ -7,12 +7,12 @@
     "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": [
@@ -26,6 +26,5 @@
         "psr-4": {
             "Magento\\AdminNotification\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/AdvancedPricingImportExport/composer.json b/app/code/Magento/AdvancedPricingImportExport/composer.json
index 9954b6484ad42..ea6a39fba2c3d 100644
--- a/app/code/Magento/AdvancedPricingImportExport/composer.json
+++ b/app/code/Magento/AdvancedPricingImportExport/composer.json
@@ -6,14 +6,14 @@
     },
     "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": [
@@ -27,6 +27,5 @@
         "psr-4": {
             "Magento\\AdvancedPricingImportExport\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/AdvancedSearch/composer.json b/app/code/Magento/AdvancedSearch/composer.json
index c90d97312d7a7..720309b619e43 100644
--- a/app/code/Magento/AdvancedSearch/composer.json
+++ b/app/code/Magento/AdvancedSearch/composer.json
@@ -5,14 +5,14 @@
         "sort-packages": true
     },
     "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",
@@ -27,6 +27,5 @@
         "psr-4": {
             "Magento\\AdvancedSearch\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Amqp/composer.json b/app/code/Magento/Amqp/composer.json
index e35a4b9307b3e..9e7a035112b04 100644
--- a/app/code/Magento/Amqp/composer.json
+++ b/app/code/Magento/Amqp/composer.json
@@ -5,9 +5,9 @@
         "sort-packages": true
     },
     "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",
@@ -22,6 +22,5 @@
         "psr-4": {
             "Magento\\Amqp\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/AmqpStore/composer.json b/app/code/Magento/AmqpStore/composer.json
index f361806fb50ca..70a10810ece21 100644
--- a/app/code/Magento/AmqpStore/composer.json
+++ b/app/code/Magento/AmqpStore/composer.json
@@ -5,14 +5,14 @@
         "sort-packages": true
     },
     "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": [
@@ -26,6 +26,5 @@
         "psr-4": {
             "Magento\\AmqpStore\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Analytics/composer.json b/app/code/Magento/Analytics/composer.json
index 5824ce3e240b4..84f8af066bf11 100644
--- a/app/code/Magento/Analytics/composer.json
+++ b/app/code/Magento/Analytics/composer.json
@@ -3,11 +3,11 @@
     "description": "N/A",
     "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.*"
+        "magento/module-backend": "*",
+        "magento/module-config": "*",
+        "magento/module-integration": "*",
+        "magento/module-store": "*",
+        "magento/framework": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -21,6 +21,5 @@
         "psr-4": {
             "Magento\\Analytics\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/AsynchronousOperations/composer.json b/app/code/Magento/AsynchronousOperations/composer.json
index ec4c221c239cc..b5de631418e72 100644
--- a/app/code/Magento/AsynchronousOperations/composer.json
+++ b/app/code/Magento/AsynchronousOperations/composer.json
@@ -5,17 +5,17 @@
         "sort-packages": true
     },
     "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-logging": "101.2.*"
+        "magento/module-admin-notification": "*",
+        "magento/module-logging": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -29,6 +29,5 @@
         "psr-4": {
             "Magento\\AsynchronousOperations\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Authorization/composer.json b/app/code/Magento/Authorization/composer.json
index 4a586a3d24e9c..401444404ca3e 100644
--- a/app/code/Magento/Authorization/composer.json
+++ b/app/code/Magento/Authorization/composer.json
@@ -6,8 +6,8 @@
     },
     "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": [
@@ -21,6 +21,5 @@
         "psr-4": {
             "Magento\\Authorization\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json
index 623c58c9827f4..ee5491057d861 100644
--- a/app/code/Magento/Backend/composer.json
+++ b/app/code/Magento/Backend/composer.json
@@ -6,26 +6,26 @@
     },
     "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": [
@@ -39,6 +39,5 @@
         "psr-4": {
             "Magento\\Backend\\": ""
         }
-    },
-    "version": "102.0.0"
+    }
 }
diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json
index 1cb489eef2f3a..9a5904beda550 100644
--- a/app/code/Magento/Backup/composer.json
+++ b/app/code/Magento/Backup/composer.json
@@ -6,10 +6,10 @@
     },
     "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": [
@@ -23,6 +23,5 @@
         "psr-4": {
             "Magento\\Backup\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Bundle/composer.json b/app/code/Magento/Bundle/composer.json
index 9cd1e7e331502..1b5ca24ee098c 100644
--- a/app/code/Magento/Bundle/composer.json
+++ b/app/code/Magento/Bundle/composer.json
@@ -6,27 +6,27 @@
     },
     "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": [
@@ -40,6 +40,5 @@
         "psr-4": {
             "Magento\\Bundle\\": ""
         }
-    },
-    "version": "101.0.0"
+    }
 }
diff --git a/app/code/Magento/BundleGraphQl/composer.json b/app/code/Magento/BundleGraphQl/composer.json
index 47d8fcc1aeb88..cb49ab78588b3 100644
--- a/app/code/Magento/BundleGraphQl/composer.json
+++ b/app/code/Magento/BundleGraphQl/composer.json
@@ -4,13 +4,13 @@
     "type": "magento2-module",
     "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/framework": "103.0.*"
+        "magento/module-catalog": "*",
+        "magento/module-bundle": "*",
+        "magento/module-catalog-graph-ql": "*",
+        "magento/module-quote": "*",
+        "magento/module-quote-graph-ql": "*",
+        "magento/module-store": "*",
+        "magento/framework": "*"
     },
     "license": [
         "OSL-3.0",
@@ -23,6 +23,5 @@
         "psr-4": {
             "Magento\\BundleGraphQl\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/BundleImportExport/composer.json b/app/code/Magento/BundleImportExport/composer.json
index 7fcc00b096ed4..faca3eac9a721 100644
--- a/app/code/Magento/BundleImportExport/composer.json
+++ b/app/code/Magento/BundleImportExport/composer.json
@@ -6,13 +6,13 @@
     },
     "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": [
@@ -26,6 +26,5 @@
         "psr-4": {
             "Magento\\BundleImportExport\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/CacheInvalidate/composer.json b/app/code/Magento/CacheInvalidate/composer.json
index e3f021f24d1a1..7801554c890e1 100644
--- a/app/code/Magento/CacheInvalidate/composer.json
+++ b/app/code/Magento/CacheInvalidate/composer.json
@@ -6,8 +6,8 @@
     },
     "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": [
@@ -21,6 +21,5 @@
         "psr-4": {
             "Magento\\CacheInvalidate\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json
index c45119bff4b7a..a6ee83d3f0924 100644
--- a/app/code/Magento/Captcha/composer.json
+++ b/app/code/Magento/Captcha/composer.json
@@ -6,11 +6,11 @@
     },
     "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/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-checkout": "*",
+        "magento/module-customer": "*",
+        "magento/module-store": "*",
         "laminas/laminas-captcha": "^2.7.1",
         "laminas/laminas-db": "^2.8.2",
         "laminas/laminas-session": "^2.7.3"
@@ -27,6 +27,5 @@
         "psr-4": {
             "Magento\\Captcha\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/CardinalCommerce/composer.json b/app/code/Magento/CardinalCommerce/composer.json
index c2fcc19baa926..8b2989ef915e1 100644
--- a/app/code/Magento/CardinalCommerce/composer.json
+++ b/app/code/Magento/CardinalCommerce/composer.json
@@ -6,10 +6,10 @@
     },
     "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": [
@@ -23,6 +23,5 @@
         "psr-4": {
             "Magento\\CardinalCommerce\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json
index 85f33c5c85c6c..6dde1d76e5e81 100644
--- a/app/code/Magento/Catalog/composer.json
+++ b/app/code/Magento/Catalog/composer.json
@@ -6,37 +6,37 @@
     },
     "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": [
@@ -50,6 +50,5 @@
         "psr-4": {
             "Magento\\Catalog\\": ""
         }
-    },
-    "version": "104.0.0"
+    }
 }
diff --git a/app/code/Magento/CatalogAnalytics/composer.json b/app/code/Magento/CatalogAnalytics/composer.json
index 581331b83207c..43fb4c8a6f433 100644
--- a/app/code/Magento/CatalogAnalytics/composer.json
+++ b/app/code/Magento/CatalogAnalytics/composer.json
@@ -3,9 +3,9 @@
     "description": "N/A",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-analytics": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-analytics": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -19,6 +19,5 @@
         "psr-4": {
             "Magento\\CatalogAnalytics\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/CatalogCmsGraphQl/composer.json b/app/code/Magento/CatalogCmsGraphQl/composer.json
index 351f54f1f99b3..aa7a742f2f315 100644
--- a/app/code/Magento/CatalogCmsGraphQl/composer.json
+++ b/app/code/Magento/CatalogCmsGraphQl/composer.json
@@ -4,14 +4,14 @@
     "type": "magento2-module",
     "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",
@@ -24,6 +24,5 @@
         "psr-4": {
             "Magento\\CatalogCmsGraphQl\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/CatalogCustomerGraphQl/composer.json b/app/code/Magento/CatalogCustomerGraphQl/composer.json
index eca6ebb34f5b3..a7c887af0379b 100644
--- a/app/code/Magento/CatalogCustomerGraphQl/composer.json
+++ b/app/code/Magento/CatalogCustomerGraphQl/composer.json
@@ -4,11 +4,11 @@
     "type": "magento2-module",
     "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.*"
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-customer": "*",
+        "magento/module-catalog-graph-ql": "*",
+        "magento/module-store": "*"
     },
     "license": [
         "OSL-3.0",
@@ -21,6 +21,5 @@
         "psr-4": {
             "Magento\\CatalogCustomerGraphQl\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/CatalogGraphQl/composer.json b/app/code/Magento/CatalogGraphQl/composer.json
index ba8a843dfc8e9..d6e9bfa3c0505 100644
--- a/app/code/Magento/CatalogGraphQl/composer.json
+++ b/app/code/Magento/CatalogGraphQl/composer.json
@@ -4,19 +4,19 @@
     "type": "magento2-module",
     "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-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": "*"
     },
     "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",
@@ -29,6 +29,5 @@
         "psr-4": {
             "Magento\\CatalogGraphQl\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/CatalogImportExport/composer.json b/app/code/Magento/CatalogImportExport/composer.json
index f95f9109bb931..92a6620827990 100644
--- a/app/code/Magento/CatalogImportExport/composer.json
+++ b/app/code/Magento/CatalogImportExport/composer.json
@@ -7,17 +7,17 @@
     "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": [
@@ -31,6 +31,5 @@
         "psr-4": {
             "Magento\\CatalogImportExport\\": ""
         }
-    },
-    "version": "101.1.0"
+    }
 }
diff --git a/app/code/Magento/CatalogInventory/composer.json b/app/code/Magento/CatalogInventory/composer.json
index 4ad28b4988aeb..b810e6613aebb 100644
--- a/app/code/Magento/CatalogInventory/composer.json
+++ b/app/code/Magento/CatalogInventory/composer.json
@@ -6,14 +6,14 @@
     },
     "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": [
@@ -28,6 +28,5 @@
             "Magento\\CatalogInventory\\": ""
         }
     },
-    "abandoned": "magento/inventory-composer-metapackage",
-    "version": "100.4.0"
+    "abandoned": "magento/inventory-composer-metapackage"
 }
diff --git a/app/code/Magento/CatalogInventoryGraphQl/composer.json b/app/code/Magento/CatalogInventoryGraphQl/composer.json
index b042cf3eb076f..d6d5b01091341 100644
--- a/app/code/Magento/CatalogInventoryGraphQl/composer.json
+++ b/app/code/Magento/CatalogInventoryGraphQl/composer.json
@@ -4,10 +4,10 @@
     "type": "magento2-module",
     "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.*"
+        "magento/framework": "*",
+        "magento/module-store": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*"
     },
     "license": [
         "OSL-3.0",
@@ -20,6 +20,5 @@
         "psr-4": {
             "Magento\\CatalogInventoryGraphQl\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/CatalogRule/composer.json b/app/code/Magento/CatalogRule/composer.json
index be32b3ae95375..7c40ca8a9a33a 100644
--- a/app/code/Magento/CatalogRule/composer.json
+++ b/app/code/Magento/CatalogRule/composer.json
@@ -6,18 +6,18 @@
     },
     "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": [
@@ -31,6 +31,5 @@
         "psr-4": {
             "Magento\\CatalogRule\\": ""
         }
-    },
-    "version": "101.2.0"
+    }
 }
diff --git a/app/code/Magento/CatalogRuleConfigurable/composer.json b/app/code/Magento/CatalogRuleConfigurable/composer.json
index 0048ace2cac55..19274fbae146f 100644
--- a/app/code/Magento/CatalogRuleConfigurable/composer.json
+++ b/app/code/Magento/CatalogRuleConfigurable/composer.json
@@ -6,14 +6,14 @@
     },
     "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": [
@@ -27,6 +27,5 @@
         "psr-4": {
             "Magento\\CatalogRuleConfigurable\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/CatalogRuleGraphQl/composer.json b/app/code/Magento/CatalogRuleGraphQl/composer.json
index 05f4b08b1f39f..c82d9bb20ddab 100644
--- a/app/code/Magento/CatalogRuleGraphQl/composer.json
+++ b/app/code/Magento/CatalogRuleGraphQl/composer.json
@@ -4,10 +4,10 @@
     "type": "magento2-module",
     "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",
@@ -20,6 +20,5 @@
         "psr-4": {
             "Magento\\CatalogRuleGraphQl\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/CatalogSearch/composer.json b/app/code/Magento/CatalogSearch/composer.json
index c962d07b4825a..1efece402fd84 100644
--- a/app/code/Magento/CatalogSearch/composer.json
+++ b/app/code/Magento/CatalogSearch/composer.json
@@ -6,21 +6,21 @@
     },
     "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": [
@@ -34,6 +34,5 @@
         "psr-4": {
             "Magento\\CatalogSearch\\": ""
         }
-    },
-    "version": "102.0.0"
+    }
 }
diff --git a/app/code/Magento/CatalogUrlRewrite/composer.json b/app/code/Magento/CatalogUrlRewrite/composer.json
index 224cbae6e0dff..fe489bcf0a3a0 100644
--- a/app/code/Magento/CatalogUrlRewrite/composer.json
+++ b/app/code/Magento/CatalogUrlRewrite/composer.json
@@ -6,18 +6,18 @@
     },
     "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": [
@@ -31,6 +31,5 @@
         "psr-4": {
             "Magento\\CatalogUrlRewrite\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/CatalogUrlRewriteGraphQl/composer.json b/app/code/Magento/CatalogUrlRewriteGraphQl/composer.json
index 2871803f795c7..3b64d51b85568 100644
--- a/app/code/Magento/CatalogUrlRewriteGraphQl/composer.json
+++ b/app/code/Magento/CatalogUrlRewriteGraphQl/composer.json
@@ -4,14 +4,14 @@
     "type": "magento2-module",
     "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",
@@ -24,6 +24,5 @@
         "psr-4": {
             "Magento\\CatalogUrlRewriteGraphQl\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/CatalogWidget/composer.json b/app/code/Magento/CatalogWidget/composer.json
index b13b562084614..305fb3ec47ad6 100644
--- a/app/code/Magento/CatalogWidget/composer.json
+++ b/app/code/Magento/CatalogWidget/composer.json
@@ -6,16 +6,16 @@
     },
     "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": [
@@ -29,6 +29,5 @@
         "psr-4": {
             "Magento\\CatalogWidget\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Checkout/composer.json b/app/code/Magento/Checkout/composer.json
index e976fbc08267f..2b4fce7dc011a 100644
--- a/app/code/Magento/Checkout/composer.json
+++ b/app/code/Magento/Checkout/composer.json
@@ -6,28 +6,28 @@
     },
     "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/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": "*"
     },
     "suggest": {
-        "magento/module-cookie": "100.4.*"
+        "magento/module-cookie": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -41,6 +41,5 @@
         "psr-4": {
             "Magento\\Checkout\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/CheckoutAgreements/composer.json b/app/code/Magento/CheckoutAgreements/composer.json
index 3028ac24b4cee..1741de53e8637 100644
--- a/app/code/Magento/CheckoutAgreements/composer.json
+++ b/app/code/Magento/CheckoutAgreements/composer.json
@@ -6,11 +6,11 @@
     },
     "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": [
@@ -24,6 +24,5 @@
         "psr-4": {
             "Magento\\CheckoutAgreements\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/CheckoutAgreementsGraphQl/composer.json b/app/code/Magento/CheckoutAgreementsGraphQl/composer.json
index aa1592d4c3378..26b80a4457b4a 100644
--- a/app/code/Magento/CheckoutAgreementsGraphQl/composer.json
+++ b/app/code/Magento/CheckoutAgreementsGraphQl/composer.json
@@ -4,12 +4,12 @@
     "type": "magento2-module",
     "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",
@@ -22,6 +22,5 @@
         "psr-4": {
             "Magento\\CheckoutAgreementsGraphQl\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Cms/composer.json b/app/code/Magento/Cms/composer.json
index b47f5bc803048..8d69320102b5e 100644
--- a/app/code/Magento/Cms/composer.json
+++ b/app/code/Magento/Cms/composer.json
@@ -6,19 +6,19 @@
     },
     "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": [
@@ -32,6 +32,5 @@
         "psr-4": {
             "Magento\\Cms\\": ""
         }
-    },
-    "version": "104.0.0"
+    }
 }
diff --git a/app/code/Magento/CmsGraphQl/composer.json b/app/code/Magento/CmsGraphQl/composer.json
index 22c1ad7f7c2f0..0e4c849fe8344 100644
--- a/app/code/Magento/CmsGraphQl/composer.json
+++ b/app/code/Magento/CmsGraphQl/composer.json
@@ -4,15 +4,15 @@
     "type": "magento2-module",
     "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",
@@ -25,6 +25,5 @@
         "psr-4": {
             "Magento\\CmsGraphQl\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/CmsUrlRewrite/composer.json b/app/code/Magento/CmsUrlRewrite/composer.json
index 6f6a3f5916944..80e150771975f 100644
--- a/app/code/Magento/CmsUrlRewrite/composer.json
+++ b/app/code/Magento/CmsUrlRewrite/composer.json
@@ -6,10 +6,10 @@
     },
     "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": [
@@ -23,6 +23,5 @@
         "psr-4": {
             "Magento\\CmsUrlRewrite\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/CmsUrlRewriteGraphQl/composer.json b/app/code/Magento/CmsUrlRewriteGraphQl/composer.json
index 13d16d49f7a44..d8fbbb4c2e6fd 100644
--- a/app/code/Magento/CmsUrlRewriteGraphQl/composer.json
+++ b/app/code/Magento/CmsUrlRewriteGraphQl/composer.json
@@ -4,14 +4,14 @@
     "type": "magento2-module",
     "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",
@@ -24,6 +24,5 @@
         "psr-4": {
             "Magento\\CmsUrlRewriteGraphQl\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Config/composer.json b/app/code/Magento/Config/composer.json
index b3ea162b34a4a..63eca42a6ac48 100644
--- a/app/code/Magento/Config/composer.json
+++ b/app/code/Magento/Config/composer.json
@@ -6,14 +6,14 @@
     },
     "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": [
@@ -27,6 +27,5 @@
         "psr-4": {
             "Magento\\Config\\": ""
         }
-    },
-    "version": "101.2.0"
+    }
 }
diff --git a/app/code/Magento/ConfigurableImportExport/composer.json b/app/code/Magento/ConfigurableImportExport/composer.json
index 707b02f1396e7..e27510166a421 100644
--- a/app/code/Magento/ConfigurableImportExport/composer.json
+++ b/app/code/Magento/ConfigurableImportExport/composer.json
@@ -6,13 +6,13 @@
     },
     "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": [
@@ -26,6 +26,5 @@
         "psr-4": {
             "Magento\\ConfigurableImportExport\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/ConfigurableProduct/composer.json b/app/code/Magento/ConfigurableProduct/composer.json
index 6b61f490707bb..7b1b1a18416f5 100644
--- a/app/code/Magento/ConfigurableProduct/composer.json
+++ b/app/code/Magento/ConfigurableProduct/composer.json
@@ -6,27 +6,27 @@
     },
     "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": [
@@ -40,6 +40,5 @@
         "psr-4": {
             "Magento\\ConfigurableProduct\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/ConfigurableProductGraphQl/composer.json b/app/code/Magento/ConfigurableProductGraphQl/composer.json
index a69eace085a9f..76ec4ad3153e2 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/composer.json
+++ b/app/code/Magento/ConfigurableProductGraphQl/composer.json
@@ -4,12 +4,12 @@
     "type": "magento2-module",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-configurable-product": "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.*"
+        "magento/module-catalog": "*",
+        "magento/module-configurable-product": "*",
+        "magento/module-catalog-graph-ql": "*",
+        "magento/module-quote": "*",
+        "magento/module-quote-graph-ql": "*",
+        "magento/framework": "*"
     },
     "license": [
         "OSL-3.0",
@@ -22,6 +22,5 @@
         "psr-4": {
             "Magento\\ConfigurableProductGraphQl\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/ConfigurableProductSales/composer.json b/app/code/Magento/ConfigurableProductSales/composer.json
index 2ae309e0ecf23..edac2b7782dcc 100644
--- a/app/code/Magento/ConfigurableProductSales/composer.json
+++ b/app/code/Magento/ConfigurableProductSales/composer.json
@@ -6,13 +6,13 @@
     },
     "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": [
@@ -26,6 +26,5 @@
         "psr-4": {
             "Magento\\ConfigurableProductSales\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Contact/composer.json b/app/code/Magento/Contact/composer.json
index 93e6274919a81..1600c1e0c2543 100644
--- a/app/code/Magento/Contact/composer.json
+++ b/app/code/Magento/Contact/composer.json
@@ -6,11 +6,11 @@
     },
     "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": [
@@ -24,6 +24,5 @@
         "psr-4": {
             "Magento\\Contact\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Cookie/composer.json b/app/code/Magento/Cookie/composer.json
index 075bd5a23f847..5a47a5c7993bf 100644
--- a/app/code/Magento/Cookie/composer.json
+++ b/app/code/Magento/Cookie/composer.json
@@ -6,11 +6,11 @@
     },
     "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": [
@@ -24,6 +24,5 @@
         "psr-4": {
             "Magento\\Cookie\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Cron/composer.json b/app/code/Magento/Cron/composer.json
index bd2c0d4551a9b..00da35140744b 100644
--- a/app/code/Magento/Cron/composer.json
+++ b/app/code/Magento/Cron/composer.json
@@ -6,11 +6,11 @@
     },
     "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": [
@@ -24,6 +24,5 @@
         "psr-4": {
             "Magento\\Cron\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Csp/composer.json b/app/code/Magento/Csp/composer.json
index 759819a637c4a..352735712b1b0 100644
--- a/app/code/Magento/Csp/composer.json
+++ b/app/code/Magento/Csp/composer.json
@@ -6,8 +6,8 @@
     },
     "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": [
@@ -21,6 +21,5 @@
         "psr-4": {
             "Magento\\Csp\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/CurrencySymbol/composer.json b/app/code/Magento/CurrencySymbol/composer.json
index 016207fd9ea9a..746cfa0ed033d 100644
--- a/app/code/Magento/CurrencySymbol/composer.json
+++ b/app/code/Magento/CurrencySymbol/composer.json
@@ -6,12 +6,12 @@
     },
     "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": [
@@ -25,6 +25,5 @@
         "psr-4": {
             "Magento\\CurrencySymbol\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Customer/composer.json b/app/code/Magento/Customer/composer.json
index ce8dd3d6c0bf9..db3108a78e9aa 100644
--- a/app/code/Magento/Customer/composer.json
+++ b/app/code/Magento/Customer/composer.json
@@ -6,29 +6,29 @@
     },
     "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": [
@@ -42,6 +42,5 @@
         "psr-4": {
             "Magento\\Customer\\": ""
         }
-    },
-    "version": "103.0.0"
+    }
 }
diff --git a/app/code/Magento/CustomerAnalytics/composer.json b/app/code/Magento/CustomerAnalytics/composer.json
index 4d9ce2a9a38de..abd9e93d89583 100644
--- a/app/code/Magento/CustomerAnalytics/composer.json
+++ b/app/code/Magento/CustomerAnalytics/composer.json
@@ -3,9 +3,9 @@
     "description": "N/A",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-analytics": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-customer": "*",
+        "magento/module-analytics": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -19,6 +19,5 @@
         "psr-4": {
             "Magento\\CustomerAnalytics\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/CustomerDownloadableGraphQl/composer.json b/app/code/Magento/CustomerDownloadableGraphQl/composer.json
index 4cb2b10e5f25c..f7cdbb0dc86d6 100644
--- a/app/code/Magento/CustomerDownloadableGraphQl/composer.json
+++ b/app/code/Magento/CustomerDownloadableGraphQl/composer.json
@@ -4,12 +4,12 @@
     "type": "magento2-module",
     "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",
@@ -22,6 +22,5 @@
         "psr-4": {
             "Magento\\CustomerDownloadableGraphQl\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/CustomerGraphQl/composer.json b/app/code/Magento/CustomerGraphQl/composer.json
index 8ae74e5cf803d..2ec396ca8ee92 100644
--- a/app/code/Magento/CustomerGraphQl/composer.json
+++ b/app/code/Magento/CustomerGraphQl/composer.json
@@ -4,15 +4,15 @@
     "type": "magento2-module",
     "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.*"
+        "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",
@@ -25,6 +25,5 @@
         "psr-4": {
             "Magento\\CustomerGraphQl\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/CustomerImportExport/composer.json b/app/code/Magento/CustomerImportExport/composer.json
index 46a69480b7f71..8104ea01875a6 100644
--- a/app/code/Magento/CustomerImportExport/composer.json
+++ b/app/code/Magento/CustomerImportExport/composer.json
@@ -6,13 +6,13 @@
     },
     "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": [
@@ -26,6 +26,5 @@
         "psr-4": {
             "Magento\\CustomerImportExport\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Deploy/composer.json b/app/code/Magento/Deploy/composer.json
index 2fe81eb47dc24..d8668dbb84874 100644
--- a/app/code/Magento/Deploy/composer.json
+++ b/app/code/Magento/Deploy/composer.json
@@ -6,11 +6,11 @@
     },
     "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": [
@@ -25,6 +25,5 @@
         "psr-4": {
             "Magento\\Deploy\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Developer/composer.json b/app/code/Magento/Developer/composer.json
index ef65ea9e163f1..c5c949ec45f62 100644
--- a/app/code/Magento/Developer/composer.json
+++ b/app/code/Magento/Developer/composer.json
@@ -6,9 +6,9 @@
     },
     "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": [
@@ -22,6 +22,5 @@
         "psr-4": {
             "Magento\\Developer\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Dhl/composer.json b/app/code/Magento/Dhl/composer.json
index 85ec969695e81..d81ae0d7b4969 100644
--- a/app/code/Magento/Dhl/composer.json
+++ b/app/code/Magento/Dhl/composer.json
@@ -7,19 +7,19 @@
     "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": [
@@ -33,6 +33,5 @@
         "psr-4": {
             "Magento\\Dhl\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Directory/composer.json b/app/code/Magento/Directory/composer.json
index bb3b89c00b579..e3646d38fe64d 100644
--- a/app/code/Magento/Directory/composer.json
+++ b/app/code/Magento/Directory/composer.json
@@ -7,10 +7,10 @@
     "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": [
@@ -24,6 +24,5 @@
         "psr-4": {
             "Magento\\Directory\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/DirectoryGraphQl/composer.json b/app/code/Magento/DirectoryGraphQl/composer.json
index 946ba097e9a11..ef473e1c43b94 100644
--- a/app/code/Magento/DirectoryGraphQl/composer.json
+++ b/app/code/Magento/DirectoryGraphQl/composer.json
@@ -4,10 +4,10 @@
     "type": "magento2-module",
     "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.*"
+        "magento/module-directory": "*",
+        "magento/module-store": "*",
+        "magento/module-graph-ql": "*",
+        "magento/framework": "*"
     },
     "license": [
         "OSL-3.0",
@@ -20,6 +20,5 @@
         "psr-4": {
             "Magento\\DirectoryGraphQl\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Downloadable/composer.json b/app/code/Magento/Downloadable/composer.json
index ad42097868b74..992bdbd1e263c 100644
--- a/app/code/Magento/Downloadable/composer.json
+++ b/app/code/Magento/Downloadable/composer.json
@@ -6,26 +6,26 @@
     },
     "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": [
@@ -39,6 +39,5 @@
         "psr-4": {
             "Magento\\Downloadable\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/DownloadableGraphQl/composer.json b/app/code/Magento/DownloadableGraphQl/composer.json
index 80bc7fa08694c..185a50f77cc15 100644
--- a/app/code/Magento/DownloadableGraphQl/composer.json
+++ b/app/code/Magento/DownloadableGraphQl/composer.json
@@ -4,14 +4,14 @@
     "type": "magento2-module",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-downloadable": "100.4.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-quote-graph-ql": "100.4.*",
-        "magento/framework": "103.0.*"
+        "magento/module-catalog": "*",
+        "magento/module-downloadable": "*",
+        "magento/module-quote": "*",
+        "magento/module-quote-graph-ql": "*",
+        "magento/framework": "*"
     },
     "suggest": {
-        "magento/module-catalog-graph-ql": "100.4.*"
+        "magento/module-catalog-graph-ql": "*"
     },
     "license": [
         "OSL-3.0",
@@ -24,6 +24,5 @@
         "psr-4": {
             "Magento\\DownloadableGraphQl\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/DownloadableImportExport/composer.json b/app/code/Magento/DownloadableImportExport/composer.json
index 1a926bc97fcc9..6dd7043fc02a9 100644
--- a/app/code/Magento/DownloadableImportExport/composer.json
+++ b/app/code/Magento/DownloadableImportExport/composer.json
@@ -6,13 +6,13 @@
     },
     "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": [
@@ -26,6 +26,5 @@
         "psr-4": {
             "Magento\\DownloadableImportExport\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Eav/composer.json b/app/code/Magento/Eav/composer.json
index 56e75d533b29f..5636b0d05841c 100644
--- a/app/code/Magento/Eav/composer.json
+++ b/app/code/Magento/Eav/composer.json
@@ -6,12 +6,12 @@
     },
     "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": [
@@ -25,6 +25,5 @@
         "psr-4": {
             "Magento\\Eav\\": ""
         }
-    },
-    "version": "102.1.0"
+    }
 }
diff --git a/app/code/Magento/EavGraphQl/composer.json b/app/code/Magento/EavGraphQl/composer.json
index 29a6d4fbb7187..ba4138f67cf62 100644
--- a/app/code/Magento/EavGraphQl/composer.json
+++ b/app/code/Magento/EavGraphQl/composer.json
@@ -4,11 +4,11 @@
     "type": "magento2-module",
     "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",
@@ -21,6 +21,5 @@
         "psr-4": {
             "Magento\\EavGraphQl\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Elasticsearch/composer.json b/app/code/Magento/Elasticsearch/composer.json
index 21ff9ca3b1aa1..b79ae7bc5cc47 100644
--- a/app/code/Magento/Elasticsearch/composer.json
+++ b/app/code/Magento/Elasticsearch/composer.json
@@ -3,19 +3,19 @@
     "description": "N/A",
     "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": [
@@ -29,6 +29,5 @@
         "psr-4": {
             "Magento\\Elasticsearch\\": ""
         }
-    },
-    "version": "101.0.0"
+    }
 }
diff --git a/app/code/Magento/Elasticsearch6/composer.json b/app/code/Magento/Elasticsearch6/composer.json
index 0bcfee63b80f9..1ee92c0b0a3b3 100644
--- a/app/code/Magento/Elasticsearch6/composer.json
+++ b/app/code/Magento/Elasticsearch6/composer.json
@@ -3,15 +3,15 @@
     "description": "N/A",
     "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": [
@@ -25,6 +25,5 @@
         "psr-4": {
             "Magento\\Elasticsearch6\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Elasticsearch7/composer.json b/app/code/Magento/Elasticsearch7/composer.json
index 03aeedafe7b60..1e59ceaebaf84 100644
--- a/app/code/Magento/Elasticsearch7/composer.json
+++ b/app/code/Magento/Elasticsearch7/composer.json
@@ -3,15 +3,15 @@
     "description": "N/A",
     "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": [
@@ -25,6 +25,5 @@
         "psr-4": {
             "Magento\\Elasticsearch7\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Email/composer.json b/app/code/Magento/Email/composer.json
index faa72bacc8b80..334bbcf9d4617 100644
--- a/app/code/Magento/Email/composer.json
+++ b/app/code/Magento/Email/composer.json
@@ -6,19 +6,19 @@
     },
     "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": [
@@ -32,6 +32,5 @@
         "psr-4": {
             "Magento\\Email\\": ""
         }
-    },
-    "version": "101.1.0"
+    }
 }
diff --git a/app/code/Magento/EncryptionKey/composer.json b/app/code/Magento/EncryptionKey/composer.json
index ef05a0dfaad14..6677a5b181f83 100644
--- a/app/code/Magento/EncryptionKey/composer.json
+++ b/app/code/Magento/EncryptionKey/composer.json
@@ -6,9 +6,9 @@
     },
     "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": [
@@ -22,6 +22,5 @@
         "psr-4": {
             "Magento\\EncryptionKey\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Fedex/composer.json b/app/code/Magento/Fedex/composer.json
index 97a1759102cf6..575311e148457 100644
--- a/app/code/Magento/Fedex/composer.json
+++ b/app/code/Magento/Fedex/composer.json
@@ -7,15 +7,15 @@
     "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": [
@@ -29,6 +29,5 @@
         "psr-4": {
             "Magento\\Fedex\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/GiftMessage/composer.json b/app/code/Magento/GiftMessage/composer.json
index f6af0767a4cf8..cdf0533c3270d 100644
--- a/app/code/Magento/GiftMessage/composer.json
+++ b/app/code/Magento/GiftMessage/composer.json
@@ -6,19 +6,19 @@
     },
     "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": [
@@ -32,6 +32,5 @@
         "psr-4": {
             "Magento\\GiftMessage\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/GoogleAdwords/composer.json b/app/code/Magento/GoogleAdwords/composer.json
index 98af74380cae9..a37470115584f 100644
--- a/app/code/Magento/GoogleAdwords/composer.json
+++ b/app/code/Magento/GoogleAdwords/composer.json
@@ -6,9 +6,9 @@
     },
     "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": [
@@ -22,6 +22,5 @@
         "psr-4": {
             "Magento\\GoogleAdwords\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/GoogleAnalytics/composer.json b/app/code/Magento/GoogleAnalytics/composer.json
index ebae982ac3cf9..64d210c4f4811 100644
--- a/app/code/Magento/GoogleAnalytics/composer.json
+++ b/app/code/Magento/GoogleAnalytics/composer.json
@@ -6,13 +6,13 @@
     },
     "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": [
@@ -26,6 +26,5 @@
         "psr-4": {
             "Magento\\GoogleAnalytics\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/GoogleOptimizer/composer.json b/app/code/Magento/GoogleOptimizer/composer.json
index 9938a1409c5f2..426526a922ec8 100644
--- a/app/code/Magento/GoogleOptimizer/composer.json
+++ b/app/code/Magento/GoogleOptimizer/composer.json
@@ -6,13 +6,13 @@
     },
     "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": [
@@ -26,6 +26,5 @@
         "psr-4": {
             "Magento\\GoogleOptimizer\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/GraphQl/composer.json b/app/code/Magento/GraphQl/composer.json
index e52cfcb8f7332..904d41c97953e 100644
--- a/app/code/Magento/GraphQl/composer.json
+++ b/app/code/Magento/GraphQl/composer.json
@@ -4,12 +4,12 @@
     "type": "magento2-module",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/module-eav": "102.1.*",
-        "magento/framework": "103.0.*"
+        "magento/module-eav": "*",
+        "magento/framework": "*"
     },
     "suggest": {
-        "magento/module-webapi": "100.4.*",
-        "magento/module-graph-ql-cache": "100.4.*"
+        "magento/module-webapi": "*",
+        "magento/module-graph-ql-cache": "*"
     },
     "license": [
         "OSL-3.0",
@@ -22,6 +22,5 @@
         "psr-4": {
             "Magento\\GraphQl\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/GraphQlCache/composer.json b/app/code/Magento/GraphQlCache/composer.json
index 7edc82471b181..4cfdd0c4f660a 100644
--- a/app/code/Magento/GraphQlCache/composer.json
+++ b/app/code/Magento/GraphQlCache/composer.json
@@ -4,9 +4,9 @@
     "type": "magento2-module",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-page-cache": "100.4.*",
-        "magento/module-graph-ql": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-page-cache": "*",
+        "magento/module-graph-ql": "*"
     },
     "license": [
         "OSL-3.0",
@@ -19,6 +19,5 @@
         "psr-4": {
             "Magento\\GraphQlCache\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/GroupedCatalogInventory/composer.json b/app/code/Magento/GroupedCatalogInventory/composer.json
index db81d649ede37..0d91d939494a8 100644
--- a/app/code/Magento/GroupedCatalogInventory/composer.json
+++ b/app/code/Magento/GroupedCatalogInventory/composer.json
@@ -6,10 +6,10 @@
     },
     "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": [
@@ -23,6 +23,5 @@
         "psr-4": {
             "Magento\\GroupedCatalogInventory\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/GroupedImportExport/composer.json b/app/code/Magento/GroupedImportExport/composer.json
index 527df378c3265..8806058c2bfc8 100644
--- a/app/code/Magento/GroupedImportExport/composer.json
+++ b/app/code/Magento/GroupedImportExport/composer.json
@@ -6,12 +6,12 @@
     },
     "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": [
@@ -25,6 +25,5 @@
         "psr-4": {
             "Magento\\GroupedImportExport\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/GroupedProduct/composer.json b/app/code/Magento/GroupedProduct/composer.json
index b135e1fdaa254..554b0c239c8fb 100644
--- a/app/code/Magento/GroupedProduct/composer.json
+++ b/app/code/Magento/GroupedProduct/composer.json
@@ -6,23 +6,23 @@
     },
     "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": [
@@ -36,6 +36,5 @@
         "psr-4": {
             "Magento\\GroupedProduct\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/GroupedProductGraphQl/composer.json b/app/code/Magento/GroupedProductGraphQl/composer.json
index e8d1400736077..5784acb5f5d04 100644
--- a/app/code/Magento/GroupedProductGraphQl/composer.json
+++ b/app/code/Magento/GroupedProductGraphQl/composer.json
@@ -4,10 +4,10 @@
     "type": "magento2-module",
     "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.*"
+        "magento/module-grouped-product": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-graph-ql": "*",
+        "magento/framework": "*"
     },
     "license": [
         "OSL-3.0",
@@ -20,6 +20,5 @@
         "psr-4": {
             "Magento\\GroupedProductGraphQl\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/ImportExport/composer.json b/app/code/Magento/ImportExport/composer.json
index 17ae89a722a91..3be5c03dc2828 100644
--- a/app/code/Magento/ImportExport/composer.json
+++ b/app/code/Magento/ImportExport/composer.json
@@ -7,13 +7,13 @@
     "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": [
@@ -27,6 +27,5 @@
         "psr-4": {
             "Magento\\ImportExport\\": ""
         }
-    },
-    "version": "101.0.0"
+    }
 }
diff --git a/app/code/Magento/Indexer/composer.json b/app/code/Magento/Indexer/composer.json
index 73b5625e1cd3d..07d652e9fa2b5 100644
--- a/app/code/Magento/Indexer/composer.json
+++ b/app/code/Magento/Indexer/composer.json
@@ -6,8 +6,8 @@
     },
     "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": [
@@ -21,6 +21,5 @@
         "psr-4": {
             "Magento\\Indexer\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/InstantPurchase/composer.json b/app/code/Magento/InstantPurchase/composer.json
index 90a18e86c853d..0807926b755a0 100644
--- a/app/code/Magento/InstantPurchase/composer.json
+++ b/app/code/Magento/InstantPurchase/composer.json
@@ -8,14 +8,14 @@
     ],
     "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": [
@@ -24,6 +24,5 @@
         "psr-4": {
             "Magento\\InstantPurchase\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Integration/composer.json b/app/code/Magento/Integration/composer.json
index 4e5f9615924ab..c85e84284b43f 100644
--- a/app/code/Magento/Integration/composer.json
+++ b/app/code/Magento/Integration/composer.json
@@ -6,14 +6,14 @@
     },
     "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": [
@@ -27,6 +27,5 @@
         "psr-4": {
             "Magento\\Integration\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/LayeredNavigation/composer.json b/app/code/Magento/LayeredNavigation/composer.json
index 5f214d02c9258..fa3c90dbbd774 100644
--- a/app/code/Magento/LayeredNavigation/composer.json
+++ b/app/code/Magento/LayeredNavigation/composer.json
@@ -6,9 +6,9 @@
     },
     "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": [
@@ -22,6 +22,5 @@
         "psr-4": {
             "Magento\\LayeredNavigation\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/LoginAsCustomer/composer.json b/app/code/Magento/LoginAsCustomer/composer.json
index 62e30db212828..ec81374528e7b 100755
--- a/app/code/Magento/LoginAsCustomer/composer.json
+++ b/app/code/Magento/LoginAsCustomer/composer.json
@@ -3,12 +3,12 @@
     "description": "Allow for admin to enter a customer account",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-login-as-customer-api": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-customer": "*",
+        "magento/module-login-as-customer-api": "*"
     },
     "suggest": {
-        "magento/module-backend": "102.0.*"
+        "magento/module-backend": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -16,12 +16,9 @@
         "AFL-3.0"
     ],
     "autoload": {
-        "files": [
-            "registration.php"
-        ],
+        "files": [ "registration.php" ],
         "psr-4": {
             "Magento\\LoginAsCustomer\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/composer.json b/app/code/Magento/LoginAsCustomerAdminUi/composer.json
index 16ed6072554d2..8bbe0e2bd6c9e 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/composer.json
+++ b/app/code/Magento/LoginAsCustomerAdminUi/composer.json
@@ -3,15 +3,15 @@
     "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-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-store": "*"
     },
     "suggest": {
-        "magento/module-login-as-customer": "100.4.*"
+        "magento/module-login-as-customer": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -19,12 +19,9 @@
         "AFL-3.0"
     ],
     "autoload": {
-        "files": [
-            "registration.php"
-        ],
+        "files": [ "registration.php" ],
         "psr-4": {
             "Magento\\LoginAsCustomerAdminUi\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/LoginAsCustomerApi/composer.json b/app/code/Magento/LoginAsCustomerApi/composer.json
index b9f3db0559462..b48319b61398f 100644
--- a/app/code/Magento/LoginAsCustomerApi/composer.json
+++ b/app/code/Magento/LoginAsCustomerApi/composer.json
@@ -3,7 +3,7 @@
     "description": "Allow for admin to enter a customer account",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -11,12 +11,9 @@
         "AFL-3.0"
     ],
     "autoload": {
-        "files": [
-            "registration.php"
-        ],
+        "files": [ "registration.php" ],
         "psr-4": {
             "Magento\\LoginAsCustomerApi\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/composer.json b/app/code/Magento/LoginAsCustomerFrontendUi/composer.json
index 600f34c843a23..279d8ae3ec79e 100644
--- a/app/code/Magento/LoginAsCustomerFrontendUi/composer.json
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/composer.json
@@ -3,10 +3,10 @@
     "description": "",
     "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.*"
+        "magento/framework": "*",
+        "magento/module-login-as-customer-api": "*",
+        "magento/module-customer": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -14,12 +14,9 @@
         "AFL-3.0"
     ],
     "autoload": {
-        "files": [
-            "registration.php"
-        ],
+        "files": [ "registration.php" ],
         "psr-4": {
             "Magento\\LoginAsCustomerFrontendUi\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/LoginAsCustomerLog/composer.json b/app/code/Magento/LoginAsCustomerLog/composer.json
index 3939888226045..cf888f8cb1a59 100644
--- a/app/code/Magento/LoginAsCustomerLog/composer.json
+++ b/app/code/Magento/LoginAsCustomerLog/composer.json
@@ -3,15 +3,15 @@
     "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": [
@@ -19,12 +19,9 @@
         "AFL-3.0"
     ],
     "autoload": {
-        "files": [
-            "registration.php"
-        ],
+        "files": [ "registration.php" ],
         "psr-4": {
             "Magento\\LoginAsCustomerLog\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/LoginAsCustomerPageCache/composer.json b/app/code/Magento/LoginAsCustomerPageCache/composer.json
index 99ac2aacb05d8..195a08fc19d83 100644
--- a/app/code/Magento/LoginAsCustomerPageCache/composer.json
+++ b/app/code/Magento/LoginAsCustomerPageCache/composer.json
@@ -3,12 +3,12 @@
     "description": "",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-customer": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-page-cache": "100.4.*"
+        "magento/module-page-cache": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -16,12 +16,9 @@
         "AFL-3.0"
     ],
     "autoload": {
-        "files": [
-            "registration.php"
-        ],
+        "files": [ "registration.php" ],
         "psr-4": {
             "Magento\\LoginAsCustomerPageCache\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/LoginAsCustomerQuote/composer.json b/app/code/Magento/LoginAsCustomerQuote/composer.json
index c8d7d6d8006e7..556ffc0d3be43 100644
--- a/app/code/Magento/LoginAsCustomerQuote/composer.json
+++ b/app/code/Magento/LoginAsCustomerQuote/composer.json
@@ -3,13 +3,13 @@
     "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": [
@@ -23,6 +23,5 @@
         "psr-4": {
             "Magento\\LoginAsCustomerQuote\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/LoginAsCustomerSales/composer.json b/app/code/Magento/LoginAsCustomerSales/composer.json
index 58a57d9f3ac71..3965e8acf87d8 100644
--- a/app/code/Magento/LoginAsCustomerSales/composer.json
+++ b/app/code/Magento/LoginAsCustomerSales/composer.json
@@ -3,13 +3,13 @@
     "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-user": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-customer": "*",
+        "magento/module-user": "*"
     },
     "suggest": {
-        "magento/module-sales": "103.0.*"
+        "magento/module-sales": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -23,6 +23,5 @@
         "psr-4": {
             "Magento\\LoginAsCustomerSales\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Marketplace/composer.json b/app/code/Magento/Marketplace/composer.json
index 94827e2e2dd92..42bbcf151a17b 100644
--- a/app/code/Magento/Marketplace/composer.json
+++ b/app/code/Magento/Marketplace/composer.json
@@ -6,8 +6,8 @@
     },
     "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": [
@@ -21,6 +21,5 @@
         "psr-4": {
             "Magento\\Marketplace\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/MediaContent/composer.json b/app/code/Magento/MediaContent/composer.json
index 253ca2d50be1b..4dc2b3eba0f68 100644
--- a/app/code/Magento/MediaContent/composer.json
+++ b/app/code/Magento/MediaContent/composer.json
@@ -3,9 +3,9 @@
     "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": "103.0.*",
-        "magento/module-media-content-api": "100.4.*",
-        "magento/module-media-gallery-api": "101.0.*"
+        "magento/framework": "*",
+        "magento/module-media-content-api": "*",
+        "magento/module-media-gallery-api": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -19,6 +19,5 @@
         "psr-4": {
             "Magento\\MediaContent\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/MediaContentApi/composer.json b/app/code/Magento/MediaContentApi/composer.json
index 35a6ea8034d73..fd1f2f9a0f265 100644
--- a/app/code/Magento/MediaContentApi/composer.json
+++ b/app/code/Magento/MediaContentApi/composer.json
@@ -3,8 +3,8 @@
     "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": "101.0.*",
-        "magento/framework": "103.0.*"
+        "magento/module-media-gallery-api": "*",
+        "magento/framework": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -18,6 +18,5 @@
         "psr-4": {
             "Magento\\MediaContentApi\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/MediaContentCatalog/composer.json b/app/code/Magento/MediaContentCatalog/composer.json
index 042d7dd0c4ec0..21e23e6b18bdc 100644
--- a/app/code/Magento/MediaContentCatalog/composer.json
+++ b/app/code/Magento/MediaContentCatalog/composer.json
@@ -3,10 +3,10 @@
     "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": "100.4.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-eav": "102.1.*",
-        "magento/framework": "103.0.*"
+        "magento/module-media-content-api": "*",
+        "magento/module-catalog": "*",
+        "magento/module-eav": "*",
+        "magento/framework": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -20,6 +20,5 @@
         "psr-4": {
             "Magento\\MediaContentCatalog\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/MediaContentCms/composer.json b/app/code/Magento/MediaContentCms/composer.json
index 16880d72c1a92..ea32fdd7a49fa 100644
--- a/app/code/Magento/MediaContentCms/composer.json
+++ b/app/code/Magento/MediaContentCms/composer.json
@@ -3,9 +3,9 @@
     "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": "100.4.*",
-        "magento/module-cms": "104.0.*",
-        "magento/framework": "103.0.*"
+        "magento/module-media-content-api": "*",
+        "magento/module-cms": "*",
+        "magento/framework": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -19,6 +19,5 @@
         "psr-4": {
             "Magento\\MediaContentCms\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/MediaGallery/composer.json b/app/code/Magento/MediaGallery/composer.json
index 3664941f59615..d430a174a9738 100644
--- a/app/code/Magento/MediaGallery/composer.json
+++ b/app/code/Magento/MediaGallery/composer.json
@@ -3,9 +3,9 @@
     "description": "Magento module responsible for media handling",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-media-gallery-api": "101.0.*",
-        "magento/module-cms": "104.0.*"
+        "magento/framework": "*",
+        "magento/module-media-gallery-api": "*",
+        "magento/module-cms": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -19,6 +19,5 @@
         "psr-4": {
             "Magento\\MediaGallery\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/MediaGalleryApi/composer.json b/app/code/Magento/MediaGalleryApi/composer.json
index 512459328707d..8bea8ee95b55a 100644
--- a/app/code/Magento/MediaGalleryApi/composer.json
+++ b/app/code/Magento/MediaGalleryApi/composer.json
@@ -3,7 +3,7 @@
     "description": "Magento module responsible for media gallery asset attributes storage and management",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -17,6 +17,5 @@
         "psr-4": {
             "Magento\\MediaGalleryApi\\": ""
         }
-    },
-    "version": "101.0.0"
+    }
 }
diff --git a/app/code/Magento/MediaGalleryCatalog/composer.json b/app/code/Magento/MediaGalleryCatalog/composer.json
index c83f6b8b2549f..192d86684aa76 100644
--- a/app/code/Magento/MediaGalleryCatalog/composer.json
+++ b/app/code/Magento/MediaGalleryCatalog/composer.json
@@ -3,9 +3,9 @@
     "description": "Magento module responsible for catalog gallery processor delete operation handling",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-media-gallery-api": "101.0.*",
-        "magento/module-catalog": "104.0.*"
+        "magento/framework": "*",
+        "magento/module-media-gallery-api": "*",
+        "magento/module-catalog": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -19,6 +19,5 @@
         "psr-4": {
             "Magento\\MediaGalleryCatalog\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/MediaStorage/composer.json b/app/code/Magento/MediaStorage/composer.json
index 390f398b2531c..cb1057febb23e 100644
--- a/app/code/Magento/MediaStorage/composer.json
+++ b/app/code/Magento/MediaStorage/composer.json
@@ -6,15 +6,15 @@
     },
     "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": [
@@ -28,6 +28,5 @@
         "psr-4": {
             "Magento\\MediaStorage\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/MessageQueue/composer.json b/app/code/Magento/MessageQueue/composer.json
index 56ad421b9b824..57603f0a73acc 100644
--- a/app/code/Magento/MessageQueue/composer.json
+++ b/app/code/Magento/MessageQueue/composer.json
@@ -5,8 +5,8 @@
         "sort-packages": true
     },
     "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"
     },
@@ -22,6 +22,5 @@
         "psr-4": {
             "Magento\\MessageQueue\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Msrp/composer.json b/app/code/Magento/Msrp/composer.json
index d6a6e4576debf..5c9d2e4cf58fa 100644
--- a/app/code/Magento/Msrp/composer.json
+++ b/app/code/Magento/Msrp/composer.json
@@ -6,16 +6,16 @@
     },
     "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": [
@@ -29,6 +29,5 @@
         "psr-4": {
             "Magento\\Msrp\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/MsrpConfigurableProduct/composer.json b/app/code/Magento/MsrpConfigurableProduct/composer.json
index 40ce8895fb0ee..53d274a3c4006 100644
--- a/app/code/Magento/MsrpConfigurableProduct/composer.json
+++ b/app/code/Magento/MsrpConfigurableProduct/composer.json
@@ -6,10 +6,10 @@
     },
     "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": [
@@ -23,6 +23,5 @@
         "psr-4": {
             "Magento\\MsrpConfigurableProduct\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/MsrpGroupedProduct/composer.json b/app/code/Magento/MsrpGroupedProduct/composer.json
index 18f8fa7b2658d..5c426b5910ad7 100644
--- a/app/code/Magento/MsrpGroupedProduct/composer.json
+++ b/app/code/Magento/MsrpGroupedProduct/composer.json
@@ -6,10 +6,10 @@
     },
     "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": [
@@ -23,6 +23,5 @@
         "psr-4": {
             "Magento\\MsrpGroupedProduct\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Multishipping/composer.json b/app/code/Magento/Multishipping/composer.json
index e05bce8b3d6be..85f60985fe1b0 100644
--- a/app/code/Magento/Multishipping/composer.json
+++ b/app/code/Magento/Multishipping/composer.json
@@ -6,16 +6,16 @@
     },
     "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/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": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -29,6 +29,5 @@
         "psr-4": {
             "Magento\\Multishipping\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/MysqlMq/composer.json b/app/code/Magento/MysqlMq/composer.json
index bdcde982e27ce..225b3a091a462 100644
--- a/app/code/Magento/MysqlMq/composer.json
+++ b/app/code/Magento/MysqlMq/composer.json
@@ -5,10 +5,10 @@
         "sort-packages": true
     },
     "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",
@@ -23,6 +23,5 @@
         "psr-4": {
             "Magento\\MysqlMq\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/NewRelicReporting/composer.json b/app/code/Magento/NewRelicReporting/composer.json
index de7153c41455f..ca4c72d5a3aad 100644
--- a/app/code/Magento/NewRelicReporting/composer.json
+++ b/app/code/Magento/NewRelicReporting/composer.json
@@ -6,14 +6,14 @@
     },
     "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": [
@@ -27,6 +27,5 @@
         "psr-4": {
             "Magento\\NewRelicReporting\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Newsletter/composer.json b/app/code/Magento/Newsletter/composer.json
index 5ca8cda80e8d8..790370c328644 100644
--- a/app/code/Magento/Newsletter/composer.json
+++ b/app/code/Magento/Newsletter/composer.json
@@ -6,16 +6,16 @@
     },
     "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": [
@@ -29,6 +29,5 @@
         "psr-4": {
             "Magento\\Newsletter\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/OfflinePayments/composer.json b/app/code/Magento/OfflinePayments/composer.json
index 1a98e9f83cb37..56c7eb2778c48 100644
--- a/app/code/Magento/OfflinePayments/composer.json
+++ b/app/code/Magento/OfflinePayments/composer.json
@@ -6,12 +6,12 @@
     },
     "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": [
@@ -25,6 +25,5 @@
         "psr-4": {
             "Magento\\OfflinePayments\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/OfflineShipping/composer.json b/app/code/Magento/OfflineShipping/composer.json
index be24eb428c588..7cd6f05f8ad1c 100644
--- a/app/code/Magento/OfflineShipping/composer.json
+++ b/app/code/Magento/OfflineShipping/composer.json
@@ -6,20 +6,20 @@
     },
     "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": [
@@ -33,6 +33,5 @@
         "psr-4": {
             "Magento\\OfflineShipping\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/PageCache/composer.json b/app/code/Magento/PageCache/composer.json
index 9dd88e64d572f..506fd54886d92 100644
--- a/app/code/Magento/PageCache/composer.json
+++ b/app/code/Magento/PageCache/composer.json
@@ -6,10 +6,10 @@
     },
     "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": [
@@ -23,6 +23,5 @@
         "psr-4": {
             "Magento\\PageCache\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Payment/composer.json b/app/code/Magento/Payment/composer.json
index 9e0a9c5fb0ca6..72246c5698f80 100644
--- a/app/code/Magento/Payment/composer.json
+++ b/app/code/Magento/Payment/composer.json
@@ -6,14 +6,14 @@
     },
     "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": [
@@ -27,6 +27,5 @@
         "psr-4": {
             "Magento\\Payment\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Paypal/composer.json b/app/code/Magento/Paypal/composer.json
index 510afa1852c86..1b35fae2de1bc 100644
--- a/app/code/Magento/Paypal/composer.json
+++ b/app/code/Magento/Paypal/composer.json
@@ -7,26 +7,26 @@
     "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": [
@@ -40,6 +40,5 @@
         "psr-4": {
             "Magento\\Paypal\\": ""
         }
-    },
-    "version": "101.0.0"
+    }
 }
diff --git a/app/code/Magento/PaypalCaptcha/composer.json b/app/code/Magento/PaypalCaptcha/composer.json
index 7d3be0012a6f2..b88eb2f1a552e 100644
--- a/app/code/Magento/PaypalCaptcha/composer.json
+++ b/app/code/Magento/PaypalCaptcha/composer.json
@@ -6,13 +6,13 @@
     },
     "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": [
@@ -26,6 +26,5 @@
         "psr-4": {
             "Magento\\PaypalCaptcha\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/PaypalGraphQl/composer.json b/app/code/Magento/PaypalGraphQl/composer.json
index e033e6f6994de..8d012be3492dd 100644
--- a/app/code/Magento/PaypalGraphQl/composer.json
+++ b/app/code/Magento/PaypalGraphQl/composer.json
@@ -6,17 +6,17 @@
     },
     "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/framework": "*",
+        "magento/module-quote": "*",
+        "magento/module-checkout": "*",
+        "magento/module-paypal": "*",
+        "magento/module-quote-graph-ql": "*",
+        "magento/module-sales": "*",
+        "magento/module-payment": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-graph-ql": "100.4.*"
+        "magento/module-graph-ql": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -30,6 +30,5 @@
         "psr-4": {
             "Magento\\PaypalGraphQl\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Persistent/composer.json b/app/code/Magento/Persistent/composer.json
index 67916942300a8..68fe5cb47c00e 100644
--- a/app/code/Magento/Persistent/composer.json
+++ b/app/code/Magento/Persistent/composer.json
@@ -6,13 +6,13 @@
     },
     "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": [
@@ -26,6 +26,5 @@
         "psr-4": {
             "Magento\\Persistent\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/ProductAlert/composer.json b/app/code/Magento/ProductAlert/composer.json
index 5c856b6f50341..bfe2a43b373ce 100644
--- a/app/code/Magento/ProductAlert/composer.json
+++ b/app/code/Magento/ProductAlert/composer.json
@@ -6,15 +6,15 @@
     },
     "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": [
@@ -28,6 +28,5 @@
         "psr-4": {
             "Magento\\ProductAlert\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/ProductVideo/composer.json b/app/code/Magento/ProductVideo/composer.json
index d98a21d2eace9..b7268338398a7 100644
--- a/app/code/Magento/ProductVideo/composer.json
+++ b/app/code/Magento/ProductVideo/composer.json
@@ -6,17 +6,17 @@
     },
     "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": [
@@ -30,6 +30,5 @@
         "psr-4": {
             "Magento\\ProductVideo\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Quote/composer.json b/app/code/Magento/Quote/composer.json
index 0014b209422bf..31312fae26e78 100644
--- a/app/code/Magento/Quote/composer.json
+++ b/app/code/Magento/Quote/composer.json
@@ -6,24 +6,24 @@
     },
     "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": [
@@ -37,6 +37,5 @@
         "psr-4": {
             "Magento\\Quote\\": ""
         }
-    },
-    "version": "101.2.0"
+    }
 }
diff --git a/app/code/Magento/QuoteAnalytics/composer.json b/app/code/Magento/QuoteAnalytics/composer.json
index b6b6ac017f180..4bfb7172c4c83 100644
--- a/app/code/Magento/QuoteAnalytics/composer.json
+++ b/app/code/Magento/QuoteAnalytics/composer.json
@@ -3,9 +3,9 @@
     "description": "N/A",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-analytics": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-quote": "*",
+        "magento/module-analytics": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -19,6 +19,5 @@
         "psr-4": {
             "Magento\\QuoteAnalytics\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/QuoteGraphQl/composer.json b/app/code/Magento/QuoteGraphQl/composer.json
index 85ee29eebd0cc..0652d39b5f426 100644
--- a/app/code/Magento/QuoteGraphQl/composer.json
+++ b/app/code/Magento/QuoteGraphQl/composer.json
@@ -4,19 +4,19 @@
     "type": "magento2-module",
     "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/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": "*"
     },
     "suggest": {
-        "magento/module-graph-ql-cache": "100.4.*"
+        "magento/module-graph-ql-cache": "*"
     },
     "license": [
         "OSL-3.0",
@@ -29,6 +29,5 @@
         "psr-4": {
             "Magento\\QuoteGraphQl\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/RelatedProductGraphQl/composer.json b/app/code/Magento/RelatedProductGraphQl/composer.json
index 63188b5fd0817..2cb851d56e58e 100644
--- a/app/code/Magento/RelatedProductGraphQl/composer.json
+++ b/app/code/Magento/RelatedProductGraphQl/composer.json
@@ -4,12 +4,12 @@
     "type": "magento2-module",
     "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",
@@ -22,6 +22,5 @@
         "psr-4": {
             "Magento\\RelatedProductGraphQl\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/ReleaseNotification/composer.json b/app/code/Magento/ReleaseNotification/composer.json
index 10de55ad63375..c2e347bc66ef0 100644
--- a/app/code/Magento/ReleaseNotification/composer.json
+++ b/app/code/Magento/ReleaseNotification/composer.json
@@ -3,13 +3,13 @@
     "description": "N/A",
     "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": [
@@ -23,6 +23,5 @@
         "psr-4": {
             "Magento\\ReleaseNotification\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Reports/composer.json b/app/code/Magento/Reports/composer.json
index 97d6e8a476e03..f1fe6c1e2c83a 100644
--- a/app/code/Magento/Reports/composer.json
+++ b/app/code/Magento/Reports/composer.json
@@ -6,23 +6,23 @@
     },
     "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": [
@@ -36,6 +36,5 @@
         "psr-4": {
             "Magento\\Reports\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/RequireJs/composer.json b/app/code/Magento/RequireJs/composer.json
index 1946df38f0af0..9c3b84e88df53 100644
--- a/app/code/Magento/RequireJs/composer.json
+++ b/app/code/Magento/RequireJs/composer.json
@@ -6,7 +6,7 @@
     },
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -20,6 +20,5 @@
         "psr-4": {
             "Magento\\RequireJs\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Review/composer.json b/app/code/Magento/Review/composer.json
index 7be475cb4e96f..5a428ae15fd67 100644
--- a/app/code/Magento/Review/composer.json
+++ b/app/code/Magento/Review/composer.json
@@ -6,19 +6,19 @@
     },
     "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": [
@@ -32,6 +32,5 @@
         "psr-4": {
             "Magento\\Review\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/ReviewAnalytics/composer.json b/app/code/Magento/ReviewAnalytics/composer.json
index 0a18612dba40d..d18ec43a93ac1 100644
--- a/app/code/Magento/ReviewAnalytics/composer.json
+++ b/app/code/Magento/ReviewAnalytics/composer.json
@@ -3,9 +3,9 @@
     "description": "N/A",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-review": "100.4.*",
-        "magento/module-analytics": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-review": "*",
+        "magento/module-analytics": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -19,6 +19,5 @@
         "psr-4": {
             "Magento\\ReviewAnalytics\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Robots/composer.json b/app/code/Magento/Robots/composer.json
index 775666fa64f6b..2035010b0ce8b 100644
--- a/app/code/Magento/Robots/composer.json
+++ b/app/code/Magento/Robots/composer.json
@@ -6,11 +6,11 @@
     },
     "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": [
@@ -24,6 +24,5 @@
         "psr-4": {
             "Magento\\Robots\\": ""
         }
-    },
-    "version": "101.1.0"
+    }
 }
diff --git a/app/code/Magento/Rss/composer.json b/app/code/Magento/Rss/composer.json
index f50ef0488081d..bd845acc12f9a 100644
--- a/app/code/Magento/Rss/composer.json
+++ b/app/code/Magento/Rss/composer.json
@@ -6,10 +6,10 @@
     },
     "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": [
@@ -23,6 +23,5 @@
         "psr-4": {
             "Magento\\Rss\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Rule/composer.json b/app/code/Magento/Rule/composer.json
index b516551b5f565..0ab2b6780dcad 100644
--- a/app/code/Magento/Rule/composer.json
+++ b/app/code/Magento/Rule/composer.json
@@ -7,11 +7,11 @@
     "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": [
@@ -25,6 +25,5 @@
         "psr-4": {
             "Magento\\Rule\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Sales/composer.json b/app/code/Magento/Sales/composer.json
index d15ecc4aa5a8c..411ad3739d560 100644
--- a/app/code/Magento/Sales/composer.json
+++ b/app/code/Magento/Sales/composer.json
@@ -6,34 +6,34 @@
     },
     "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": [
@@ -47,6 +47,5 @@
         "psr-4": {
             "Magento\\Sales\\": ""
         }
-    },
-    "version": "103.0.0"
+    }
 }
diff --git a/app/code/Magento/SalesAnalytics/composer.json b/app/code/Magento/SalesAnalytics/composer.json
index d273a21bfb1f1..ca7926f2d8b5a 100644
--- a/app/code/Magento/SalesAnalytics/composer.json
+++ b/app/code/Magento/SalesAnalytics/composer.json
@@ -3,9 +3,9 @@
     "description": "N/A",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-analytics": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-sales": "*",
+        "magento/module-analytics": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -19,6 +19,5 @@
         "psr-4": {
             "Magento\\SalesAnalytics\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/SalesGraphQl/composer.json b/app/code/Magento/SalesGraphQl/composer.json
index c5d1c32861797..8e9d95836e189 100644
--- a/app/code/Magento/SalesGraphQl/composer.json
+++ b/app/code/Magento/SalesGraphQl/composer.json
@@ -4,9 +4,9 @@
     "type": "magento2-module",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-graph-ql": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-sales": "*",
+        "magento/module-graph-ql": "*"
     },
     "license": [
         "OSL-3.0",
@@ -19,6 +19,5 @@
         "psr-4": {
             "Magento\\SalesGraphQl\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/SalesInventory/composer.json b/app/code/Magento/SalesInventory/composer.json
index b3610ac242469..6a91b04a7c0d9 100644
--- a/app/code/Magento/SalesInventory/composer.json
+++ b/app/code/Magento/SalesInventory/composer.json
@@ -6,11 +6,11 @@
     },
     "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": [
@@ -24,6 +24,5 @@
         "psr-4": {
             "Magento\\SalesInventory\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/SalesRule/composer.json b/app/code/Magento/SalesRule/composer.json
index 40b42fcd1193b..572e191093275 100644
--- a/app/code/Magento/SalesRule/composer.json
+++ b/app/code/Magento/SalesRule/composer.json
@@ -6,29 +6,29 @@
     },
     "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": [
@@ -42,6 +42,5 @@
         "psr-4": {
             "Magento\\SalesRule\\": ""
         }
-    },
-    "version": "101.2.0"
+    }
 }
diff --git a/app/code/Magento/SalesSequence/composer.json b/app/code/Magento/SalesSequence/composer.json
index 666fb0b39a1e2..a0f9cb45cafc8 100644
--- a/app/code/Magento/SalesSequence/composer.json
+++ b/app/code/Magento/SalesSequence/composer.json
@@ -6,7 +6,7 @@
     },
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -20,6 +20,5 @@
         "psr-4": {
             "Magento\\SalesSequence\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/SampleData/composer.json b/app/code/Magento/SampleData/composer.json
index 175b0e15d1f04..30efc94bc9274 100644
--- a/app/code/Magento/SampleData/composer.json
+++ b/app/code/Magento/SampleData/composer.json
@@ -6,10 +6,10 @@
     },
     "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": [
@@ -24,6 +24,5 @@
         "psr-4": {
             "Magento\\SampleData\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Search/composer.json b/app/code/Magento/Search/composer.json
index 6ed6b07e49214..3df1dc5935ad8 100644
--- a/app/code/Magento/Search/composer.json
+++ b/app/code/Magento/Search/composer.json
@@ -6,12 +6,12 @@
     },
     "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": [
@@ -25,6 +25,5 @@
         "psr-4": {
             "Magento\\Search\\": ""
         }
-    },
-    "version": "101.1.0"
+    }
 }
diff --git a/app/code/Magento/Security/composer.json b/app/code/Magento/Security/composer.json
index 9e2388e26d72c..4978f0c628f96 100644
--- a/app/code/Magento/Security/composer.json
+++ b/app/code/Magento/Security/composer.json
@@ -6,13 +6,13 @@
     },
     "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": [
@@ -26,6 +26,5 @@
         "psr-4": {
             "Magento\\Security\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/SendFriend/composer.json b/app/code/Magento/SendFriend/composer.json
index 444401c5ef64a..17c908ab33e3e 100644
--- a/app/code/Magento/SendFriend/composer.json
+++ b/app/code/Magento/SendFriend/composer.json
@@ -6,13 +6,13 @@
     },
     "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": [
@@ -26,6 +26,5 @@
         "psr-4": {
             "Magento\\SendFriend\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/SendFriendGraphQl/composer.json b/app/code/Magento/SendFriendGraphQl/composer.json
index 582bea663947e..456780c1c1841 100644
--- a/app/code/Magento/SendFriendGraphQl/composer.json
+++ b/app/code/Magento/SendFriendGraphQl/composer.json
@@ -4,10 +4,10 @@
     "type": "magento2-module",
     "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.*"
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-send-friend": "*",
+        "magento/module-graph-ql": "*"
     },
     "license": [
         "OSL-3.0",
@@ -20,6 +20,5 @@
         "psr-4": {
             "Magento\\SendFriendGraphQl\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Shipping/composer.json b/app/code/Magento/Shipping/composer.json
index 08cbf729f8e22..5ea8430226ad8 100644
--- a/app/code/Magento/Shipping/composer.json
+++ b/app/code/Magento/Shipping/composer.json
@@ -7,25 +7,25 @@
     "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": [
@@ -39,6 +39,5 @@
         "psr-4": {
             "Magento\\Shipping\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Sitemap/composer.json b/app/code/Magento/Sitemap/composer.json
index 562016cd5f3a0..6a9f20ac8bddf 100644
--- a/app/code/Magento/Sitemap/composer.json
+++ b/app/code/Magento/Sitemap/composer.json
@@ -6,19 +6,19 @@
     },
     "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": [
@@ -32,6 +32,5 @@
         "psr-4": {
             "Magento\\Sitemap\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Store/composer.json b/app/code/Magento/Store/composer.json
index c45b1766a5873..e6f7f0d5ac274 100644
--- a/app/code/Magento/Store/composer.json
+++ b/app/code/Magento/Store/composer.json
@@ -6,18 +6,18 @@
     },
     "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": [
@@ -31,6 +31,5 @@
         "psr-4": {
             "Magento\\Store\\": ""
         }
-    },
-    "version": "101.1.0"
+    }
 }
diff --git a/app/code/Magento/StoreGraphQl/composer.json b/app/code/Magento/StoreGraphQl/composer.json
index 5b9c0f2161ebb..a7cab5851a9ee 100644
--- a/app/code/Magento/StoreGraphQl/composer.json
+++ b/app/code/Magento/StoreGraphQl/composer.json
@@ -4,9 +4,9 @@
     "type": "magento2-module",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-graph-ql": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-store": "*",
+        "magento/module-graph-ql": "*"
     },
     "license": [
         "OSL-3.0",
@@ -19,6 +19,5 @@
         "psr-4": {
             "Magento\\StoreGraphQl\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Swagger/composer.json b/app/code/Magento/Swagger/composer.json
index fdcab3fe66c2e..759e72350b0a6 100644
--- a/app/code/Magento/Swagger/composer.json
+++ b/app/code/Magento/Swagger/composer.json
@@ -6,7 +6,7 @@
     },
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -20,6 +20,5 @@
         "psr-4": {
             "Magento\\Swagger\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/SwaggerWebapi/composer.json b/app/code/Magento/SwaggerWebapi/composer.json
index 63d369882ad87..78021f7cb4ec5 100644
--- a/app/code/Magento/SwaggerWebapi/composer.json
+++ b/app/code/Magento/SwaggerWebapi/composer.json
@@ -6,8 +6,8 @@
     },
     "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": [
@@ -21,6 +21,5 @@
         "psr-4": {
             "Magento\\SwaggerWebapi\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/SwaggerWebapiAsync/composer.json b/app/code/Magento/SwaggerWebapiAsync/composer.json
index 99e11cdaf87b3..283b2fe1f1758 100644
--- a/app/code/Magento/SwaggerWebapiAsync/composer.json
+++ b/app/code/Magento/SwaggerWebapiAsync/composer.json
@@ -6,11 +6,11 @@
     },
     "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": [
@@ -24,6 +24,5 @@
         "psr-4": {
             "Magento\\SwaggerWebapiAsync\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Swatches/composer.json b/app/code/Magento/Swatches/composer.json
index 6c7c2f1a66ae9..2c9b7a03ba011 100644
--- a/app/code/Magento/Swatches/composer.json
+++ b/app/code/Magento/Swatches/composer.json
@@ -6,21 +6,21 @@
     },
     "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": [
@@ -34,6 +34,5 @@
         "psr-4": {
             "Magento\\Swatches\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/SwatchesGraphQl/composer.json b/app/code/Magento/SwatchesGraphQl/composer.json
index 961852580f2c2..383575302e6ae 100644
--- a/app/code/Magento/SwatchesGraphQl/composer.json
+++ b/app/code/Magento/SwatchesGraphQl/composer.json
@@ -4,12 +4,12 @@
     "type": "magento2-module",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-swatches": "100.4.*",
-        "magento/module-catalog": "104.0.*"
+        "magento/framework": "*",
+        "magento/module-swatches": "*",
+        "magento/module-catalog": "*"
     },
     "suggest": {
-        "magento/module-catalog-graph-ql": "100.4.*"
+        "magento/module-catalog-graph-ql": "*"
     },
     "license": [
         "OSL-3.0",
@@ -22,6 +22,5 @@
         "psr-4": {
             "Magento\\SwatchesGraphQl\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/SwatchesLayeredNavigation/composer.json b/app/code/Magento/SwatchesLayeredNavigation/composer.json
index e6646efd43268..3b987f8096f18 100644
--- a/app/code/Magento/SwatchesLayeredNavigation/composer.json
+++ b/app/code/Magento/SwatchesLayeredNavigation/composer.json
@@ -6,7 +6,7 @@
     },
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
+        "magento/framework": "*",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
@@ -21,6 +21,5 @@
         "psr-4": {
             "Magento\\SwatchesLayeredNavigation\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Tax/composer.json b/app/code/Magento/Tax/composer.json
index ea43903ed8df6..2fe0597c85a63 100644
--- a/app/code/Magento/Tax/composer.json
+++ b/app/code/Magento/Tax/composer.json
@@ -6,24 +6,24 @@
     },
     "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": [
@@ -37,6 +37,5 @@
         "psr-4": {
             "Magento\\Tax\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/TaxGraphQl/composer.json b/app/code/Magento/TaxGraphQl/composer.json
index 058bfce1d5850..b97e414cacb67 100644
--- a/app/code/Magento/TaxGraphQl/composer.json
+++ b/app/code/Magento/TaxGraphQl/composer.json
@@ -4,11 +4,11 @@
     "type": "magento2-module",
     "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",
@@ -21,6 +21,5 @@
         "psr-4": {
             "Magento\\TaxGraphQl\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/TaxImportExport/composer.json b/app/code/Magento/TaxImportExport/composer.json
index 1905881740f8c..01c069b4299c1 100644
--- a/app/code/Magento/TaxImportExport/composer.json
+++ b/app/code/Magento/TaxImportExport/composer.json
@@ -6,12 +6,12 @@
     },
     "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": [
@@ -25,6 +25,5 @@
         "psr-4": {
             "Magento\\TaxImportExport\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Theme/composer.json b/app/code/Magento/Theme/composer.json
index 19776eb59ecd8..63779c6f9bf5d 100644
--- a/app/code/Magento/Theme/composer.json
+++ b/app/code/Magento/Theme/composer.json
@@ -6,22 +6,22 @@
     },
     "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": [
@@ -35,6 +35,5 @@
         "psr-4": {
             "Magento\\Theme\\": ""
         }
-    },
-    "version": "101.1.0"
+    }
 }
diff --git a/app/code/Magento/ThemeGraphQl/composer.json b/app/code/Magento/ThemeGraphQl/composer.json
index e70b7bb533692..cee740d449b37 100644
--- a/app/code/Magento/ThemeGraphQl/composer.json
+++ b/app/code/Magento/ThemeGraphQl/composer.json
@@ -4,10 +4,10 @@
     "type": "magento2-module",
     "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",
@@ -20,6 +20,5 @@
         "psr-4": {
             "Magento\\ThemeGraphQl\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Tinymce3/composer.json b/app/code/Magento/Tinymce3/composer.json
index c7c03f8e17ca7..0b8cf6824295e 100644
--- a/app/code/Magento/Tinymce3/composer.json
+++ b/app/code/Magento/Tinymce3/composer.json
@@ -3,14 +3,14 @@
     "description": "N/A",
     "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": [
@@ -24,6 +24,5 @@
         "psr-4": {
             "Magento\\Tinymce3\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Translation/composer.json b/app/code/Magento/Translation/composer.json
index ab1d258e36bec..7f67749fa88f4 100644
--- a/app/code/Magento/Translation/composer.json
+++ b/app/code/Magento/Translation/composer.json
@@ -6,14 +6,14 @@
     },
     "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": [
@@ -27,6 +27,5 @@
         "psr-4": {
             "Magento\\Translation\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Ui/composer.json b/app/code/Magento/Ui/composer.json
index b122892074037..b4aeda0fc1e6a 100644
--- a/app/code/Magento/Ui/composer.json
+++ b/app/code/Magento/Ui/composer.json
@@ -6,15 +6,15 @@
     },
     "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": [
@@ -28,6 +28,5 @@
         "psr-4": {
             "Magento\\Ui\\": ""
         }
-    },
-    "version": "101.2.0"
+    }
 }
diff --git a/app/code/Magento/Ups/composer.json b/app/code/Magento/Ups/composer.json
index e26eb018ea688..fa8962f0af592 100644
--- a/app/code/Magento/Ups/composer.json
+++ b/app/code/Magento/Ups/composer.json
@@ -6,17 +6,17 @@
     },
     "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": [
@@ -30,6 +30,5 @@
         "psr-4": {
             "Magento\\Ups\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/UrlRewrite/composer.json b/app/code/Magento/UrlRewrite/composer.json
index 96bdcfc7e9642..44ca51e8bcbe2 100644
--- a/app/code/Magento/UrlRewrite/composer.json
+++ b/app/code/Magento/UrlRewrite/composer.json
@@ -6,14 +6,14 @@
     },
     "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": [
@@ -27,6 +27,5 @@
         "psr-4": {
             "Magento\\UrlRewrite\\": ""
         }
-    },
-    "version": "102.0.0"
+    }
 }
diff --git a/app/code/Magento/UrlRewriteGraphQl/composer.json b/app/code/Magento/UrlRewriteGraphQl/composer.json
index adacea949b340..766ad3ab46ebd 100644
--- a/app/code/Magento/UrlRewriteGraphQl/composer.json
+++ b/app/code/Magento/UrlRewriteGraphQl/composer.json
@@ -4,11 +4,11 @@
     "type": "magento2-module",
     "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",
@@ -21,6 +21,5 @@
         "psr-4": {
             "Magento\\UrlRewriteGraphQl\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/User/composer.json b/app/code/Magento/User/composer.json
index 60119f505f6cc..6ba4be749cc7c 100644
--- a/app/code/Magento/User/composer.json
+++ b/app/code/Magento/User/composer.json
@@ -6,14 +6,14 @@
     },
     "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": [
@@ -27,6 +27,5 @@
         "psr-4": {
             "Magento\\User\\": ""
         }
-    },
-    "version": "101.2.0"
+    }
 }
diff --git a/app/code/Magento/Usps/composer.json b/app/code/Magento/Usps/composer.json
index fcd3a0babe913..3d5c0669c679d 100644
--- a/app/code/Magento/Usps/composer.json
+++ b/app/code/Magento/Usps/composer.json
@@ -7,15 +7,15 @@
     "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": [
@@ -29,6 +29,5 @@
         "psr-4": {
             "Magento\\Usps\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Variable/composer.json b/app/code/Magento/Variable/composer.json
index 283db7ec3a7f2..e6eed40a814db 100644
--- a/app/code/Magento/Variable/composer.json
+++ b/app/code/Magento/Variable/composer.json
@@ -6,11 +6,11 @@
     },
     "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": [
@@ -24,6 +24,5 @@
         "psr-4": {
             "Magento\\Variable\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Vault/composer.json b/app/code/Magento/Vault/composer.json
index fbc12bee2a7f3..31d5ceb906246 100644
--- a/app/code/Magento/Vault/composer.json
+++ b/app/code/Magento/Vault/composer.json
@@ -6,14 +6,14 @@
     },
     "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": [
@@ -27,6 +27,5 @@
         "psr-4": {
             "Magento\\Vault\\": ""
         }
-    },
-    "version": "101.2.0"
+    }
 }
diff --git a/app/code/Magento/VaultGraphQl/composer.json b/app/code/Magento/VaultGraphQl/composer.json
index d7f056178cfaf..aff9a700fbcad 100644
--- a/app/code/Magento/VaultGraphQl/composer.json
+++ b/app/code/Magento/VaultGraphQl/composer.json
@@ -4,9 +4,9 @@
     "type": "magento2-module",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-vault": "101.2.*",
-        "magento/module-graph-ql": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-vault": "*",
+        "magento/module-graph-ql": "*"
     },
     "license": [
         "OSL-3.0",
@@ -19,6 +19,5 @@
         "psr-4": {
             "Magento\\VaultGraphQl\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Version/composer.json b/app/code/Magento/Version/composer.json
index 397ffc6ae0c7f..d2b2127446c21 100644
--- a/app/code/Magento/Version/composer.json
+++ b/app/code/Magento/Version/composer.json
@@ -6,7 +6,7 @@
     },
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -20,6 +20,5 @@
         "psr-4": {
             "Magento\\Version\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Webapi/composer.json b/app/code/Magento/Webapi/composer.json
index 85418f5b1b28f..11382cc318554 100644
--- a/app/code/Magento/Webapi/composer.json
+++ b/app/code/Magento/Webapi/composer.json
@@ -6,15 +6,15 @@
     },
     "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": [
@@ -28,6 +28,5 @@
         "psr-4": {
             "Magento\\Webapi\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/WebapiAsync/composer.json b/app/code/Magento/WebapiAsync/composer.json
index 4f7736cf9fb3b..e0c6a96f1ffe6 100644
--- a/app/code/Magento/WebapiAsync/composer.json
+++ b/app/code/Magento/WebapiAsync/composer.json
@@ -6,14 +6,14 @@
     },
     "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": [
@@ -27,6 +27,5 @@
         "psr-4": {
             "Magento\\WebapiAsync\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/WebapiSecurity/composer.json b/app/code/Magento/WebapiSecurity/composer.json
index 1b2d3c328e9d1..5b48ed8644709 100644
--- a/app/code/Magento/WebapiSecurity/composer.json
+++ b/app/code/Magento/WebapiSecurity/composer.json
@@ -6,8 +6,8 @@
     },
     "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": [
@@ -21,6 +21,5 @@
         "psr-4": {
             "Magento\\WebapiSecurity\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Weee/composer.json b/app/code/Magento/Weee/composer.json
index ff85c42ac6267..7024de0f595c7 100644
--- a/app/code/Magento/Weee/composer.json
+++ b/app/code/Magento/Weee/composer.json
@@ -6,22 +6,22 @@
     },
     "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": [
@@ -35,6 +35,5 @@
         "psr-4": {
             "Magento\\Weee\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/WeeeGraphQl/composer.json b/app/code/Magento/WeeeGraphQl/composer.json
index 33d16fb64a2db..be7e50ab2fca1 100644
--- a/app/code/Magento/WeeeGraphQl/composer.json
+++ b/app/code/Magento/WeeeGraphQl/composer.json
@@ -4,13 +4,13 @@
     "type": "magento2-module",
     "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",
@@ -23,6 +23,5 @@
         "psr-4": {
             "Magento\\WeeeGraphQl\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/Widget/composer.json b/app/code/Magento/Widget/composer.json
index a85b8f46fca0e..2cf8429095ce7 100644
--- a/app/code/Magento/Widget/composer.json
+++ b/app/code/Magento/Widget/composer.json
@@ -6,17 +6,17 @@
     },
     "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": [
@@ -30,6 +30,5 @@
         "psr-4": {
             "Magento\\Widget\\": ""
         }
-    },
-    "version": "101.2.0"
+    }
 }
diff --git a/app/code/Magento/Wishlist/composer.json b/app/code/Magento/Wishlist/composer.json
index 0a347b9e5f027..b426ffe01cecc 100644
--- a/app/code/Magento/Wishlist/composer.json
+++ b/app/code/Magento/Wishlist/composer.json
@@ -6,26 +6,26 @@
     },
     "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": [
@@ -39,6 +39,5 @@
         "psr-4": {
             "Magento\\Wishlist\\": ""
         }
-    },
-    "version": "101.2.0"
+    }
 }
diff --git a/app/code/Magento/WishlistAnalytics/composer.json b/app/code/Magento/WishlistAnalytics/composer.json
index 9d072368bdd9d..309257f857ed2 100644
--- a/app/code/Magento/WishlistAnalytics/composer.json
+++ b/app/code/Magento/WishlistAnalytics/composer.json
@@ -3,9 +3,9 @@
     "description": "N/A",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-wishlist": "101.2.*",
-        "magento/module-analytics": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-wishlist": "*",
+        "magento/module-analytics": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -19,6 +19,5 @@
         "psr-4": {
             "Magento\\WishlistAnalytics\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/code/Magento/WishlistGraphQl/composer.json b/app/code/Magento/WishlistGraphQl/composer.json
index e16f27d8cc788..7a3fca599a4b3 100644
--- a/app/code/Magento/WishlistGraphQl/composer.json
+++ b/app/code/Magento/WishlistGraphQl/composer.json
@@ -4,10 +4,10 @@
     "type": "magento2-module",
     "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.*"
+        "magento/framework": "*",
+        "magento/module-catalog-graph-ql": "*",
+        "magento/module-wishlist": "*",
+        "magento/module-store": "*"
     },
     "license": [
         "OSL-3.0",
@@ -20,6 +20,5 @@
         "psr-4": {
             "Magento\\WishlistGraphQl\\": ""
         }
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/design/adminhtml/Magento/backend/composer.json b/app/design/adminhtml/Magento/backend/composer.json
index 2e5c02976ab00..249441be1753e 100644
--- a/app/design/adminhtml/Magento/backend/composer.json
+++ b/app/design/adminhtml/Magento/backend/composer.json
@@ -6,7 +6,7 @@
     },
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
     "type": "magento2-theme",
     "license": [
@@ -17,6 +17,5 @@
         "files": [
             "registration.php"
         ]
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/design/frontend/Magento/blank/composer.json b/app/design/frontend/Magento/blank/composer.json
index d12350af15042..066d0cd1cc9f2 100644
--- a/app/design/frontend/Magento/blank/composer.json
+++ b/app/design/frontend/Magento/blank/composer.json
@@ -6,7 +6,7 @@
     },
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
     "type": "magento2-theme",
     "license": [
@@ -17,6 +17,5 @@
         "files": [
             "registration.php"
         ]
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/design/frontend/Magento/luma/composer.json b/app/design/frontend/Magento/luma/composer.json
index 5083d423ab87b..16bed43fe8cbf 100644
--- a/app/design/frontend/Magento/luma/composer.json
+++ b/app/design/frontend/Magento/luma/composer.json
@@ -6,8 +6,8 @@
     },
     "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": [
@@ -18,6 +18,5 @@
         "files": [
             "registration.php"
         ]
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/i18n/Magento/de_DE/composer.json b/app/i18n/Magento/de_DE/composer.json
index 2bfbcd3db948f..5a488a3e32c2b 100644
--- a/app/i18n/Magento/de_DE/composer.json
+++ b/app/i18n/Magento/de_DE/composer.json
@@ -9,13 +9,12 @@
         "sort-packages": true
     },
     "require": {
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
     "type": "magento2-language",
     "autoload": {
         "files": [
             "registration.php"
         ]
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/i18n/Magento/en_US/composer.json b/app/i18n/Magento/en_US/composer.json
index a2d9d20863893..1108c70de28a6 100644
--- a/app/i18n/Magento/en_US/composer.json
+++ b/app/i18n/Magento/en_US/composer.json
@@ -9,13 +9,12 @@
         "sort-packages": true
     },
     "require": {
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
     "type": "magento2-language",
     "autoload": {
         "files": [
             "registration.php"
         ]
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/i18n/Magento/es_ES/composer.json b/app/i18n/Magento/es_ES/composer.json
index 30f86b04042fd..5bc3cb5730adf 100644
--- a/app/i18n/Magento/es_ES/composer.json
+++ b/app/i18n/Magento/es_ES/composer.json
@@ -9,13 +9,12 @@
         "sort-packages": true
     },
     "require": {
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
     "type": "magento2-language",
     "autoload": {
         "files": [
             "registration.php"
         ]
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/i18n/Magento/fr_FR/composer.json b/app/i18n/Magento/fr_FR/composer.json
index 4da78146736fc..50c541308673b 100644
--- a/app/i18n/Magento/fr_FR/composer.json
+++ b/app/i18n/Magento/fr_FR/composer.json
@@ -9,13 +9,12 @@
         "sort-packages": true
     },
     "require": {
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
     "type": "magento2-language",
     "autoload": {
         "files": [
             "registration.php"
         ]
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/i18n/Magento/nl_NL/composer.json b/app/i18n/Magento/nl_NL/composer.json
index 3641101e66b5a..a182e179d4103 100644
--- a/app/i18n/Magento/nl_NL/composer.json
+++ b/app/i18n/Magento/nl_NL/composer.json
@@ -9,13 +9,12 @@
         "sort-packages": true
     },
     "require": {
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
     "type": "magento2-language",
     "autoload": {
         "files": [
             "registration.php"
         ]
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/i18n/Magento/pt_BR/composer.json b/app/i18n/Magento/pt_BR/composer.json
index 0dc5c014eabd0..46734cc09b363 100644
--- a/app/i18n/Magento/pt_BR/composer.json
+++ b/app/i18n/Magento/pt_BR/composer.json
@@ -9,13 +9,12 @@
         "sort-packages": true
     },
     "require": {
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
     "type": "magento2-language",
     "autoload": {
         "files": [
             "registration.php"
         ]
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/app/i18n/Magento/zh_Hans_CN/composer.json b/app/i18n/Magento/zh_Hans_CN/composer.json
index eff1bfd2c3033..ce214ce649f56 100644
--- a/app/i18n/Magento/zh_Hans_CN/composer.json
+++ b/app/i18n/Magento/zh_Hans_CN/composer.json
@@ -9,13 +9,12 @@
         "sort-packages": true
     },
     "require": {
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
     "type": "magento2-language",
     "autoload": {
         "files": [
             "registration.php"
         ]
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/composer.json b/composer.json
index c2da7d52f1d19..816fad7068837 100644
--- a/composer.json
+++ b/composer.json
@@ -101,205 +101,205 @@
         "ext-pcntl": "Need for run processes in parallel mode"
     },
     "replace": {
-        "magento/module-marketplace": "100.4.0",
-        "magento/module-admin-analytics": "100.4.0",
-        "magento/module-admin-notification": "100.4.0",
-        "magento/module-advanced-pricing-import-export": "100.4.0",
-        "magento/module-amqp": "100.4.0",
-        "magento/module-amqp-store": "100.4.0",
-        "magento/module-analytics": "100.4.0",
-        "magento/module-asynchronous-operations": "100.4.0",
-        "magento/module-authorization": "100.4.0",
-        "magento/module-advanced-search": "100.4.0",
-        "magento/module-backend": "102.0.0",
-        "magento/module-backup": "100.4.0",
-        "magento/module-bundle": "101.0.0",
-        "magento/module-bundle-graph-ql": "100.4.0",
-        "magento/module-bundle-import-export": "100.4.0",
-        "magento/module-cache-invalidate": "100.4.0",
-        "magento/module-captcha": "100.4.0",
-        "magento/module-cardinal-commerce": "100.4.0",
-        "magento/module-catalog": "104.0.0",
-        "magento/module-catalog-customer-graph-ql": "100.4.0",
-        "magento/module-catalog-analytics": "100.4.0",
-        "magento/module-catalog-import-export": "101.1.0",
-        "magento/module-catalog-inventory": "100.4.0",
-        "magento/module-catalog-inventory-graph-ql": "100.4.0",
-        "magento/module-catalog-rule": "101.2.0",
-        "magento/module-catalog-rule-graph-ql": "100.4.0",
-        "magento/module-catalog-rule-configurable": "100.4.0",
-        "magento/module-catalog-search": "102.0.0",
-        "magento/module-catalog-url-rewrite": "100.4.0",
-        "magento/module-catalog-widget": "100.4.0",
-        "magento/module-checkout": "100.4.0",
-        "magento/module-checkout-agreements": "100.4.0",
-        "magento/module-checkout-agreements-graph-ql": "100.4.0",
-        "magento/module-cms": "104.0.0",
-        "magento/module-cms-url-rewrite": "100.4.0",
-        "magento/module-config": "101.2.0",
-        "magento/module-configurable-import-export": "100.4.0",
-        "magento/module-configurable-product": "100.4.0",
-        "magento/module-configurable-product-sales": "100.4.0",
-        "magento/module-contact": "100.4.0",
-        "magento/module-cookie": "100.4.0",
-        "magento/module-cron": "100.4.0",
-        "magento/module-currency-symbol": "100.4.0",
-        "magento/module-customer": "103.0.0",
-        "magento/module-customer-analytics": "100.4.0",
-        "magento/module-customer-downloadable-graph-ql": "100.4.0",
-        "magento/module-customer-import-export": "100.4.0",
-        "magento/module-deploy": "100.4.0",
-        "magento/module-developer": "100.4.0",
-        "magento/module-dhl": "100.4.0",
-        "magento/module-directory": "100.4.0",
-        "magento/module-directory-graph-ql": "100.4.0",
-        "magento/module-downloadable": "100.4.0",
-        "magento/module-downloadable-graph-ql": "100.4.0",
-        "magento/module-downloadable-import-export": "100.4.0",
-        "magento/module-eav": "102.1.0",
-        "magento/module-elasticsearch": "101.0.0",
-        "magento/module-elasticsearch-6": "100.4.0",
-        "magento/module-elasticsearch-7": "100.4.0",
-        "magento/module-email": "101.1.0",
-        "magento/module-encryption-key": "100.4.0",
-        "magento/module-fedex": "100.4.0",
-        "magento/module-gift-message": "100.4.0",
-        "magento/module-google-adwords": "100.4.0",
-        "magento/module-google-analytics": "100.4.0",
-        "magento/module-google-optimizer": "100.4.0",
-        "magento/module-graph-ql": "100.4.0",
-        "magento/module-graph-ql-cache": "100.4.0",
-        "magento/module-catalog-graph-ql": "100.4.0",
-        "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.0",
-        "magento/module-customer-graph-ql": "100.4.0",
-        "magento/module-eav-graph-ql": "100.4.0",
-        "magento/module-swatches-graph-ql": "100.4.0",
-        "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.0",
-        "magento/module-grouped-catalog-inventory": "100.4.0",
-        "magento/module-grouped-product-graph-ql": "100.4.0",
-        "magento/module-import-export": "101.0.0",
-        "magento/module-indexer": "100.4.0",
-        "magento/module-instant-purchase": "100.4.0",
-        "magento/module-integration": "100.4.0",
-        "magento/module-layered-navigation": "100.4.0",
-        "magento/module-login-as-customer": "100.4.0",
-        "magento/module-login-as-customer-admin-ui": "100.4.0",
-        "magento/module-login-as-customer-api": "100.4.0",
-        "magento/module-login-as-customer-frontend-ui": "100.4.0",
-        "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.0",
-        "magento/module-login-as-customer-sales": "100.4.0",
-        "magento/module-media-content": "100.4.0",
-        "magento/module-media-content-api": "100.4.0",
-        "magento/module-media-content-catalog": "100.4.0",
-        "magento/module-media-content-cms": "100.4.0",
-        "magento/module-media-gallery": "100.4.0",
-        "magento/module-media-gallery-api": "101.0.0",
-        "magento/module-media-gallery-catalog": "100.4.0",
-        "magento/module-media-storage": "100.4.0",
-        "magento/module-message-queue": "100.4.0",
-        "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.0",
-        "magento/module-mysql-mq": "100.4.0",
-        "magento/module-new-relic-reporting": "100.4.0",
-        "magento/module-newsletter": "100.4.0",
-        "magento/module-offline-payments": "100.4.0",
-        "magento/module-offline-shipping": "100.4.0",
-        "magento/module-page-cache": "100.4.0",
-        "magento/module-payment": "100.4.0",
-        "magento/module-paypal": "101.0.0",
-        "magento/module-paypal-captcha": "100.4.0",
-        "magento/module-paypal-graph-ql": "100.4.0",
-        "magento/module-persistent": "100.4.0",
-        "magento/module-product-alert": "100.4.0",
-        "magento/module-product-video": "100.4.0",
-        "magento/module-quote": "101.2.0",
-        "magento/module-quote-analytics": "100.4.0",
-        "magento/module-quote-graph-ql": "100.4.0",
-        "magento/module-related-product-graph-ql": "100.4.0",
-        "magento/module-release-notification": "100.4.0",
-        "magento/module-reports": "100.4.0",
-        "magento/module-require-js": "100.4.0",
-        "magento/module-review": "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.0",
-        "magento/module-sales-analytics": "100.4.0",
-        "magento/module-sales-graph-ql": "100.4.0",
-        "magento/module-sales-inventory": "100.4.0",
-        "magento/module-sales-rule": "101.2.0",
-        "magento/module-sales-sequence": "100.4.0",
-        "magento/module-sample-data": "100.4.0",
-        "magento/module-search": "101.1.0",
-        "magento/module-security": "100.4.0",
-        "magento/module-send-friend": "100.4.0",
-        "magento/module-send-friend-graph-ql": "100.4.0",
-        "magento/module-shipping": "100.4.0",
-        "magento/module-sitemap": "100.4.0",
-        "magento/module-store": "101.1.0",
-        "magento/module-store-graph-ql": "100.4.0",
-        "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.0",
-        "magento/module-swatches-layered-navigation": "100.4.0",
-        "magento/module-tax": "100.4.0",
-        "magento/module-tax-import-export": "100.4.0",
-        "magento/module-theme": "101.1.0",
-        "magento/module-theme-graph-ql": "100.4.0",
-        "magento/module-translation": "100.4.0",
-        "magento/module-ui": "101.2.0",
-        "magento/module-ups": "100.4.0",
-        "magento/module-url-rewrite": "102.0.0",
-        "magento/module-user": "101.2.0",
-        "magento/module-usps": "100.4.0",
-        "magento/module-variable": "100.4.0",
-        "magento/module-vault": "101.2.0",
-        "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.0",
-        "magento/module-widget": "101.2.0",
-        "magento/module-wishlist": "101.2.0",
-        "magento/module-wishlist-graph-ql": "100.4.0",
-        "magento/module-wishlist-analytics": "100.4.0",
-        "magento/theme-adminhtml-backend": "100.4.0",
-        "magento/theme-frontend-blank": "100.4.0",
-        "magento/theme-frontend-luma": "100.4.0",
-        "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.0",
-        "magento/framework-amqp": "100.4.0",
-        "magento/framework-bulk": "101.0.0",
-        "magento/framework-message-queue": "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-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-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-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-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-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-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.0",
-        "magento/module-csp": "100.4.0"
+        "magento/module-tinymce-3": "*",
+        "magento/module-csp": "*"
     },
     "conflict": {
         "gene/bluefoot": "*"
@@ -354,6 +354,5 @@
             "Magento\\PhpStan\\": "dev/tests/static/framework/Magento/PhpStan/"
         }
     },
-    "version": "2.4.0",
-    "minimum-stability": "stable"
+    "prefer-stable": true
 }
diff --git a/composer.lock b/composer.lock
index ea3afb13cde3e..04ecd43514636 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": "74f566339c6207342f65f3f000595f70",
+    "content-hash": "0ebe9109f59c372f9962e2a51c35c829",
     "packages": [
         {
             "name": "colinmollenhour/cache-backend-file",
@@ -210,16 +210,16 @@
         },
         {
             "name": "composer/composer",
-            "version": "1.10.9",
+            "version": "1.10.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/composer.git",
-                "reference": "83c3250093d5491600a822e176b107a945baf95a"
+                "reference": "956608ea4f7de9e58c53dfb019d85ae62b193c39"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/83c3250093d5491600a822e176b107a945baf95a",
-                "reference": "83c3250093d5491600a822e176b107a945baf95a",
+                "url": "https://api.github.com/repos/composer/composer/zipball/956608ea4f7de9e58c53dfb019d85ae62b193c39",
+                "reference": "956608ea4f7de9e58c53dfb019d85ae62b193c39",
                 "shasum": ""
             },
             "require": {
@@ -238,11 +238,12 @@
                 "symfony/process": "^2.7 || ^3.0 || ^4.0 || ^5.0"
             },
             "conflict": {
-                "symfony/console": "2.8.38"
+                "symfony/console": "2.8.38",
+                "symfony/phpunit-bridge": "3.4.40"
             },
             "require-dev": {
                 "phpspec/prophecy": "^1.10",
-                "symfony/phpunit-bridge": "^4.2"
+                "symfony/phpunit-bridge": "^3.4"
             },
             "suggest": {
                 "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
@@ -286,7 +287,7 @@
                 "dependency",
                 "package"
             ],
-            "time": "2020-07-16T10:57:00+00:00"
+            "time": "2020-06-03T08:03:56+00:00"
         },
         {
             "name": "composer/semver",
@@ -351,16 +352,16 @@
         },
         {
             "name": "composer/spdx-licenses",
-            "version": "1.5.4",
+            "version": "1.5.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/spdx-licenses.git",
-                "reference": "6946f785871e2314c60b4524851f3702ea4f2223"
+                "reference": "0c3e51e1880ca149682332770e25977c70cf9dae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/6946f785871e2314c60b4524851f3702ea4f2223",
-                "reference": "6946f785871e2314c60b4524851f3702ea4f2223",
+                "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/0c3e51e1880ca149682332770e25977c70cf9dae",
+                "reference": "0c3e51e1880ca149682332770e25977c70cf9dae",
                 "shasum": ""
             },
             "require": {
@@ -407,7 +408,7 @@
                 "spdx",
                 "validator"
             ],
-            "time": "2020-07-15T15:35:07+00:00"
+            "time": "2020-02-14T07:44:31+00:00"
         },
         {
             "name": "composer/xdebug-handler",
@@ -651,16 +652,16 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "6.5.5",
+            "version": "6.5.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e"
+                "reference": "a4a1b6930528a8f7ee03518e6442ec7a44155d9d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
-                "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/a4a1b6930528a8f7ee03518e6442ec7a44155d9d",
+                "reference": "a4a1b6930528a8f7ee03518e6442ec7a44155d9d",
                 "shasum": ""
             },
             "require": {
@@ -668,7 +669,7 @@
                 "guzzlehttp/promises": "^1.0",
                 "guzzlehttp/psr7": "^1.6.1",
                 "php": ">=5.5",
-                "symfony/polyfill-intl-idn": "^1.17.0"
+                "symfony/polyfill-intl-idn": "1.17.0"
             },
             "require-dev": {
                 "ext-curl": "*",
@@ -714,7 +715,7 @@
                 "rest",
                 "web service"
             ],
-            "time": "2020-06-16T21:01:06+00:00"
+            "time": "2020-05-25T19:35:05+00:00"
         },
         {
             "name": "guzzlehttp/promises",
@@ -1677,16 +1678,16 @@
         },
         {
             "name": "laminas/laminas-form",
-            "version": "2.15.0",
+            "version": "2.14.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-form.git",
-                "reference": "359cd372c565e18a17f32ccfeacdf21bba091ce2"
+                "reference": "3e22e09751cf6ae031be87a44e092e7925ce5b7b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-form/zipball/359cd372c565e18a17f32ccfeacdf21bba091ce2",
-                "reference": "359cd372c565e18a17f32ccfeacdf21bba091ce2",
+                "url": "https://api.github.com/repos/laminas/laminas-form/zipball/3e22e09751cf6ae031be87a44e092e7925ce5b7b",
+                "reference": "3e22e09751cf6ae031be87a44e092e7925ce5b7b",
                 "shasum": ""
             },
             "require": {
@@ -1729,8 +1730,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.15.x-dev",
-                    "dev-develop": "2.16.x-dev"
+                    "dev-master": "2.14.x-dev",
+                    "dev-develop": "2.15.x-dev"
                 },
                 "laminas": {
                     "component": "Laminas\\Form",
@@ -1755,20 +1756,20 @@
                 "form",
                 "laminas"
             ],
-            "time": "2020-07-14T13:53:27+00:00"
+            "time": "2020-03-29T12:46:16+00:00"
         },
         {
             "name": "laminas/laminas-http",
-            "version": "2.12.0",
+            "version": "2.11.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-http.git",
-                "reference": "48bd06ffa3a6875e2b77d6852405eb7b1589d575"
+                "reference": "8c66963b933c80da59433da56a44dfa979f3ec88"
             },
             "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/8c66963b933c80da59433da56a44dfa979f3ec88",
+                "reference": "8c66963b933c80da59433da56a44dfa979f3ec88",
                 "shasum": ""
             },
             "require": {
@@ -1780,7 +1781,7 @@
                 "php": "^5.6 || ^7.0"
             },
             "replace": {
-                "zendframework/zend-http": "^2.11.2"
+                "zendframework/zend-http": "self.version"
             },
             "require-dev": {
                 "laminas/laminas-coding-standard": "~1.0.0",
@@ -1793,8 +1794,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.12.x-dev",
-                    "dev-develop": "2.13.x-dev"
+                    "dev-master": "2.11.x-dev",
+                    "dev-develop": "2.12.x-dev"
                 }
             },
             "autoload": {
@@ -1813,7 +1814,7 @@
                 "http client",
                 "laminas"
             ],
-            "time": "2020-06-23T15:14:37+00:00"
+            "time": "2019-12-31T17:02:36+00:00"
         },
         {
             "name": "laminas/laminas-hydrator",
@@ -2199,16 +2200,16 @@
         },
         {
             "name": "laminas/laminas-mail",
-            "version": "2.11.0",
+            "version": "2.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-mail.git",
-                "reference": "4c5545637eea3dc745668ddff1028692ed004c4b"
+                "reference": "cfe0711446c8d9c392e9fc664c9ccc180fa89005"
             },
             "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/cfe0711446c8d9c392e9fc664c9ccc180fa89005",
+                "reference": "cfe0711446c8d9c392e9fc664c9ccc180fa89005",
                 "shasum": ""
             },
             "require": {
@@ -2238,8 +2239,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.11.x-dev",
-                    "dev-develop": "2.12.x-dev"
+                    "dev-master": "2.10.x-dev",
+                    "dev-develop": "2.11.x-dev"
                 },
                 "laminas": {
                     "component": "Laminas\\Mail",
@@ -2261,7 +2262,7 @@
                 "laminas",
                 "mail"
             ],
-            "time": "2020-06-30T20:17:23+00:00"
+            "time": "2020-04-21T16:42:19+00:00"
         },
         {
             "name": "laminas/laminas-math",
@@ -3819,16 +3820,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "2.0.28",
+            "version": "2.0.27",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "d1ca58cf33cb21046d702ae3a7b14fdacd9f3260"
+                "reference": "34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/d1ca58cf33cb21046d702ae3a7b14fdacd9f3260",
-                "reference": "d1ca58cf33cb21046d702ae3a7b14fdacd9f3260",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc",
+                "reference": "34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc",
                 "shasum": ""
             },
             "require": {
@@ -3907,7 +3908,7 @@
                 "x.509",
                 "x509"
             ],
-            "time": "2020-07-08T09:08:33+00:00"
+            "time": "2020-04-04T23:17:33+00:00"
         },
         {
             "name": "psr/container",
@@ -4274,16 +4275,16 @@
         },
         {
             "name": "seld/phar-utils",
-            "version": "1.1.1",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/phar-utils.git",
-                "reference": "8674b1d84ffb47cc59a101f5d5a3b61e87d23796"
+                "reference": "8800503d56b9867d43d9c303b9cbcc26016e82f0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/8674b1d84ffb47cc59a101f5d5a3b61e87d23796",
-                "reference": "8674b1d84ffb47cc59a101f5d5a3b61e87d23796",
+                "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/8800503d56b9867d43d9c303b9cbcc26016e82f0",
+                "reference": "8800503d56b9867d43d9c303b9cbcc26016e82f0",
                 "shasum": ""
             },
             "require": {
@@ -4314,11 +4315,11 @@
             "keywords": [
                 "phar"
             ],
-            "time": "2020-07-07T18:42:57+00:00"
+            "time": "2020-02-14T15:25:33+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v4.4.10",
+            "version": "v4.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
@@ -4395,7 +4396,7 @@
         },
         {
             "name": "symfony/css-selector",
-            "version": "v5.1.2",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
@@ -4448,7 +4449,7 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v4.4.10",
+            "version": "v4.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
@@ -4518,20 +4519,20 @@
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v1.1.9",
+            "version": "v1.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "84e23fdcd2517bf37aecbd16967e83f0caee25a7"
+                "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/84e23fdcd2517bf37aecbd16967e83f0caee25a7",
-                "reference": "84e23fdcd2517bf37aecbd16967e83f0caee25a7",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c43ab685673fb6c8d84220c77897b1d6cdbe1d18",
+                "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1.3"
+                "php": "^7.1.3"
             },
             "suggest": {
                 "psr/event-dispatcher": "",
@@ -4541,10 +4542,6 @@
             "extra": {
                 "branch-alias": {
                     "dev-master": "1.1-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -4576,11 +4573,11 @@
                 "interoperability",
                 "standards"
             ],
-            "time": "2020-07-06T13:19:58+00:00"
+            "time": "2019-09-17T09:54:03+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v5.1.2",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
@@ -4630,7 +4627,7 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v5.1.2",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
@@ -4679,16 +4676,16 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.18.0",
+            "version": "v1.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "1c302646f6efc070cd46856e600e5e0684d6b454"
+                "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9"
             },
             "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/e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
+                "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
                 "shasum": ""
             },
             "require": {
@@ -4700,11 +4697,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "dev-master": "1.17-dev"
                 }
             },
             "autoload": {
@@ -4737,26 +4730,25 @@
                 "polyfill",
                 "portable"
             ],
-            "time": "2020-07-14T12:35:20+00:00"
+            "time": "2020-05-12T16:14:59+00:00"
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.18.0",
+            "version": "v1.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "bc6549d068d0160e0f10f7a5a23c7d1406b95ebe"
+                "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a"
             },
             "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/3bff59ea7047e925be6b7f2059d60af31bb46d6a",
+                "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3",
-                "symfony/polyfill-intl-normalizer": "^1.10",
-                "symfony/polyfill-php70": "^1.10",
+                "symfony/polyfill-mbstring": "^1.3",
                 "symfony/polyfill-php72": "^1.10"
             },
             "suggest": {
@@ -4765,11 +4757,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "dev-master": "1.17-dev"
                 }
             },
             "autoload": {
@@ -4789,10 +4777,6 @@
                     "name": "Laurent Bassin",
                     "email": "laurent@bassin.info"
                 },
-                {
-                    "name": "Trevor Rowbotham",
-                    "email": "trevor.rowbotham@pm.me"
-                },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
@@ -4808,87 +4792,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-07-14T12:35:20+00:00"
-        },
-        {
-            "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.18.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e",
-                "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "suggest": {
-                "ext-intl": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.18-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ],
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for intl's Normalizer class and related functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "intl",
-                "normalizer",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2020-07-14T12:35:20+00:00"
+            "time": "2020-05-12T16:47:27+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.18.0",
+            "version": "v1.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a"
+                "reference": "fa79b11539418b02fc5e1897267673ba2c19419c"
             },
             "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/fa79b11539418b02fc5e1897267673ba2c19419c",
+                "reference": "fa79b11539418b02fc5e1897267673ba2c19419c",
                 "shasum": ""
             },
             "require": {
@@ -4900,11 +4817,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "dev-master": "1.17-dev"
                 }
             },
             "autoload": {
@@ -4938,83 +4851,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-07-14T12:35:20+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php70",
-            "version": "v1.18.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php70.git",
-                "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/0dd93f2c578bdc9c72697eaa5f1dd25644e618d3",
-                "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3",
-                "shasum": ""
-            },
-            "require": {
-                "paragonie/random_compat": "~1.0|~2.0|~9.99",
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.18-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php70\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ],
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2020-07-14T12:35:20+00:00"
+            "time": "2020-05-12T16:47:27+00:00"
         },
         {
             "name": "symfony/polyfill-php72",
-            "version": "v1.18.0",
+            "version": "v1.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "639447d008615574653fb3bc60d1986d7172eaae"
+                "reference": "f048e612a3905f34931127360bdd2def19a5e582"
             },
             "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/f048e612a3905f34931127360bdd2def19a5e582",
+                "reference": "f048e612a3905f34931127360bdd2def19a5e582",
                 "shasum": ""
             },
             "require": {
@@ -5023,11 +4873,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "dev-master": "1.17-dev"
                 }
             },
             "autoload": {
@@ -5060,20 +4906,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-07-14T12:35:20+00:00"
+            "time": "2020-05-12T16:47:27+00:00"
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.18.0",
+            "version": "v1.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "fffa1a52a023e782cdcc221d781fe1ec8f87fcca"
+                "reference": "a760d8964ff79ab9bf057613a5808284ec852ccc"
             },
             "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/a760d8964ff79ab9bf057613a5808284ec852ccc",
+                "reference": "a760d8964ff79ab9bf057613a5808284ec852ccc",
                 "shasum": ""
             },
             "require": {
@@ -5082,11 +4928,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "dev-master": "1.17-dev"
                 }
             },
             "autoload": {
@@ -5122,20 +4964,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-07-14T12:35:20+00:00"
+            "time": "2020-05-12T16:47:27+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.18.0",
+            "version": "v1.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981"
+                "reference": "5e30b2799bc1ad68f7feb62b60a73743589438dd"
             },
             "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/5e30b2799bc1ad68f7feb62b60a73743589438dd",
+                "reference": "5e30b2799bc1ad68f7feb62b60a73743589438dd",
                 "shasum": ""
             },
             "require": {
@@ -5144,11 +4986,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "dev-master": "1.17-dev"
                 }
             },
             "autoload": {
@@ -5188,11 +5026,11 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-07-14T12:35:20+00:00"
+            "time": "2020-05-12T16:47:27+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v4.4.10",
+            "version": "v4.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
@@ -5241,16 +5079,16 @@
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v2.1.3",
+            "version": "v2.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "58c7475e5457c5492c26cc740cc0ad7464be9442"
+                "reference": "66a8f0957a3ca54e4f724e49028ab19d75a8918b"
             },
             "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/66a8f0957a3ca54e4f724e49028ab19d75a8918b",
+                "reference": "66a8f0957a3ca54e4f724e49028ab19d75a8918b",
                 "shasum": ""
             },
             "require": {
@@ -5264,10 +5102,6 @@
             "extra": {
                 "branch-alias": {
                     "dev-master": "2.1-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -5299,7 +5133,7 @@
                 "interoperability",
                 "standards"
             ],
-            "time": "2020-07-06T13:23:11+00:00"
+            "time": "2020-05-20T17:43:50+00:00"
         },
         {
             "name": "tedivm/jshrink",
@@ -5448,16 +5282,16 @@
         },
         {
             "name": "webonyx/graphql-php",
-            "version": "v0.13.9",
+            "version": "v0.13.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webonyx/graphql-php.git",
-                "reference": "d9a94fddcad0a35d4bced212b8a44ad1bc59bdf3"
+                "reference": "6829ae58f4c59121df1f86915fb9917a2ec595e8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/d9a94fddcad0a35d4bced212b8a44ad1bc59bdf3",
-                "reference": "d9a94fddcad0a35d4bced212b8a44ad1bc59bdf3",
+                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/6829ae58f4c59121df1f86915fb9917a2ec595e8",
+                "reference": "6829ae58f4c59121df1f86915fb9917a2ec595e8",
                 "shasum": ""
             },
             "require": {
@@ -5496,7 +5330,7 @@
                 "api",
                 "graphql"
             ],
-            "time": "2020-07-02T05:49:25+00:00"
+            "time": "2019-08-25T10:32:47+00:00"
         },
         {
             "name": "wikimedia/less.php",
@@ -5717,16 +5551,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.147.0",
+            "version": "3.141.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "e63974c002c0f6520da597d44a3f83ce46d7a612"
+                "reference": "d57dbde176a7db7a6131bb5d325aff63515eabc3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/e63974c002c0f6520da597d44a3f83ce46d7a612",
-                "reference": "e63974c002c0f6520da597d44a3f83ce46d7a612",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/d57dbde176a7db7a6131bb5d325aff63515eabc3",
+                "reference": "d57dbde176a7db7a6131bb5d325aff63515eabc3",
                 "shasum": ""
             },
             "require": {
@@ -5749,7 +5583,6 @@
                 "ext-pcntl": "*",
                 "ext-sockets": "*",
                 "nette/neon": "^2.3",
-                "paragonie/random_compat": ">= 2",
                 "phpunit/phpunit": "^4.8.35|^5.4.3",
                 "psr/cache": "^1.0",
                 "psr/simple-cache": "^1.0",
@@ -5798,7 +5631,7 @@
                 "s3",
                 "sdk"
             ],
-            "time": "2020-07-17T18:14:13+00:00"
+            "time": "2020-06-10T18:11:38+00:00"
         },
         {
             "name": "beberlei/assert",
@@ -6340,16 +6173,16 @@
         },
         {
             "name": "codeception/stub",
-            "version": "3.7.0",
+            "version": "3.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/Stub.git",
-                "reference": "468dd5fe659f131fc997f5196aad87512f9b1304"
+                "reference": "a3ba01414cbee76a1bced9f9b6b169cc8d203880"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Stub/zipball/468dd5fe659f131fc997f5196aad87512f9b1304",
-                "reference": "468dd5fe659f131fc997f5196aad87512f9b1304",
+                "url": "https://api.github.com/repos/Codeception/Stub/zipball/a3ba01414cbee76a1bced9f9b6b169cc8d203880",
+                "reference": "a3ba01414cbee76a1bced9f9b6b169cc8d203880",
                 "shasum": ""
             },
             "require": {
@@ -6366,7 +6199,7 @@
                 "MIT"
             ],
             "description": "Flexible Stub wrapper for PHPUnit's Mock Builder",
-            "time": "2020-07-03T15:54:43+00:00"
+            "time": "2020-02-07T18:42:28+00:00"
         },
         {
             "name": "csharpru/vault-php",
@@ -6591,16 +6424,16 @@
         },
         {
             "name": "doctrine/cache",
-            "version": "1.10.2",
+            "version": "1.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/cache.git",
-                "reference": "13e3381b25847283a91948d04640543941309727"
+                "reference": "35a4a70cd94e09e2259dfae7488afc6b474ecbd3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/cache/zipball/13e3381b25847283a91948d04640543941309727",
-                "reference": "13e3381b25847283a91948d04640543941309727",
+                "url": "https://api.github.com/repos/doctrine/cache/zipball/35a4a70cd94e09e2259dfae7488afc6b474ecbd3",
+                "reference": "35a4a70cd94e09e2259dfae7488afc6b474ecbd3",
                 "shasum": ""
             },
             "require": {
@@ -6669,7 +6502,7 @@
                 "redis",
                 "xcache"
             ],
-            "time": "2020-07-07T18:54:01+00:00"
+            "time": "2020-05-27T16:24:54+00:00"
         },
         {
             "name": "doctrine/inflector",
@@ -6858,16 +6691,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v2.16.4",
+            "version": "v2.16.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-                "reference": "1023c3458137ab052f6ff1e09621a721bfdeca13"
+                "reference": "83baf823a33a1cbd5416c8626935cf3f843c10b0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/1023c3458137ab052f6ff1e09621a721bfdeca13",
-                "reference": "1023c3458137ab052f6ff1e09621a721bfdeca13",
+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/83baf823a33a1cbd5416c8626935cf3f843c10b0",
+                "reference": "83baf823a33a1cbd5416c8626935cf3f843c10b0",
                 "shasum": ""
             },
             "require": {
@@ -6899,12 +6732,12 @@
                 "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.1",
                 "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.1",
                 "phpunitgoodpractices/traits": "^1.8",
-                "symfony/phpunit-bridge": "^5.1",
+                "symfony/phpunit-bridge": "^4.3 || ^5.0",
                 "symfony/yaml": "^3.0 || ^4.0 || ^5.0"
             },
             "suggest": {
                 "ext-dom": "For handling output formats in XML",
-                "ext-mbstring": "For handling non-UTF8 characters.",
+                "ext-mbstring": "For handling non-UTF8 characters in cache signature.",
                 "php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.",
                 "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.",
                 "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible."
@@ -6945,7 +6778,7 @@
                 }
             ],
             "description": "A tool to automatically fix PHP code style",
-            "time": "2020-06-27T23:57:46+00:00"
+            "time": "2020-04-15T18:51:10+00:00"
         },
         {
             "name": "jms/metadata",
@@ -7552,20 +7385,20 @@
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.10.1",
+            "version": "1.9.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "969b211f9a51aa1f6c01d1d2aef56d3bd91598e5"
+                "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/969b211f9a51aa1f6c01d1d2aef56d3bd91598e5",
-                "reference": "969b211f9a51aa1f6c01d1d2aef56d3bd91598e5",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/b2c28789e80a97badd14145fda39b545d83ca3ef",
+                "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1 || ^8.0"
+                "php": "^7.1"
             },
             "replace": {
                 "myclabs/deep-copy": "self.version"
@@ -7596,7 +7429,7 @@
                 "object",
                 "object graph"
             ],
-            "time": "2020-06-29T13:22:24+00:00"
+            "time": "2020-01-17T21:11:47+00:00"
         },
         {
             "name": "paragonie/constant_time_encoding",
@@ -8033,25 +7866,25 @@
         },
         {
             "name": "phpdocumentor/reflection-common",
-            "version": "2.2.0",
+            "version": "2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
+                "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
-                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/6568f4687e5b41b054365f9ae03fcb1ed5f2069b",
+                "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2 || ^8.0"
+                "php": ">=7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-2.x": "2.x-dev"
+                    "dev-master": "2.x-dev"
                 }
             },
             "autoload": {
@@ -8078,7 +7911,7 @@
                 "reflection",
                 "static analysis"
             ],
-            "time": "2020-06-27T09:03:43+00:00"
+            "time": "2020-04-27T09:25:28+00:00"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
@@ -8135,29 +7968,30 @@
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.3.0",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "e878a14a65245fbe78f8080eba03b47c3b705651"
+                "reference": "7462d5f123dfc080dfdf26897032a6513644fc95"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e878a14a65245fbe78f8080eba03b47c3b705651",
-                "reference": "e878a14a65245fbe78f8080eba03b47c3b705651",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/7462d5f123dfc080dfdf26897032a6513644fc95",
+                "reference": "7462d5f123dfc080dfdf26897032a6513644fc95",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2 || ^8.0",
+                "php": "^7.2",
                 "phpdocumentor/reflection-common": "^2.0"
             },
             "require-dev": {
-                "ext-tokenizer": "*"
+                "ext-tokenizer": "^7.2",
+                "mockery/mockery": "~1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-1.x": "1.x-dev"
+                    "dev-master": "1.x-dev"
                 }
             },
             "autoload": {
@@ -8176,7 +8010,7 @@
                 }
             ],
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
-            "time": "2020-06-27T10:12:23+00:00"
+            "time": "2020-02-18T18:59:58+00:00"
         },
         {
             "name": "phpmd/phpmd",
@@ -8305,33 +8139,33 @@
         },
         {
             "name": "phpspec/prophecy",
-            "version": "1.11.1",
+            "version": "v1.10.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "b20034be5efcdab4fb60ca3a29cba2949aead160"
+                "reference": "451c3cd1418cf640de218914901e51b064abb093"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/b20034be5efcdab4fb60ca3a29cba2949aead160",
-                "reference": "b20034be5efcdab4fb60ca3a29cba2949aead160",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/451c3cd1418cf640de218914901e51b064abb093",
+                "reference": "451c3cd1418cf640de218914901e51b064abb093",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.2",
-                "php": "^7.2",
-                "phpdocumentor/reflection-docblock": "^5.0",
-                "sebastian/comparator": "^3.0 || ^4.0",
-                "sebastian/recursion-context": "^3.0 || ^4.0"
+                "doctrine/instantiator": "^1.0.2",
+                "php": "^5.3|^7.0",
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0",
+                "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0",
+                "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0"
             },
             "require-dev": {
-                "phpspec/phpspec": "^6.0",
-                "phpunit/phpunit": "^8.0"
+                "phpspec/phpspec": "^2.5 || ^3.2",
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.11.x-dev"
+                    "dev-master": "1.10.x-dev"
                 }
             },
             "autoload": {
@@ -8364,7 +8198,7 @@
                 "spy",
                 "stub"
             ],
-            "time": "2020-07-08T12:44:21+00:00"
+            "time": "2020-03-05T15:02:03+00:00"
         },
         {
             "name": "phpstan/phpstan",
@@ -8474,20 +8308,20 @@
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "3.0.4",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "25fefc5b19835ca653877fe081644a3f8c1d915e"
+                "reference": "4ac5b3e13df14829daa60a2eb4fdd2f2b7d33cf4"
             },
             "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/4ac5b3e13df14829daa60a2eb4fdd2f2b7d33cf4",
+                "reference": "4ac5b3e13df14829daa60a2eb4fdd2f2b7d33cf4",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8.0"
+                "php": "^7.3"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.0"
@@ -8520,24 +8354,24 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2020-07-11T05:18:21+00:00"
+            "time": "2020-04-18T05:02:12+00:00"
         },
         {
             "name": "phpunit/php-invoker",
-            "version": "3.0.2",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-invoker.git",
-                "reference": "f6eedfed1085dd1f4c599629459a0277d25f9a66"
+                "reference": "7579d5a1ba7f3ac11c80004d205877911315ae7a"
             },
             "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/7579d5a1ba7f3ac11c80004d205877911315ae7a",
+                "reference": "7579d5a1ba7f3ac11c80004d205877911315ae7a",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8.0"
+                "php": "^7.3"
             },
             "require-dev": {
                 "ext-pcntl": "*",
@@ -8573,27 +8407,24 @@
             "keywords": [
                 "process"
             ],
-            "time": "2020-06-26T11:53:53+00:00"
+            "time": "2020-02-07T06:06:11+00:00"
         },
         {
             "name": "phpunit/php-text-template",
-            "version": "2.0.2",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "6ff9c8ea4d3212b88fcf74e25e516e2c51c99324"
+                "reference": "526dc996cc0ebdfa428cd2dfccd79b7b53fee346"
             },
             "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/526dc996cc0ebdfa428cd2dfccd79b7b53fee346",
+                "reference": "526dc996cc0ebdfa428cd2dfccd79b7b53fee346",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.0"
+                "php": "^7.3"
             },
             "type": "library",
             "extra": {
@@ -8622,7 +8453,7 @@
             "keywords": [
                 "template"
             ],
-            "time": "2020-06-26T11:55:37+00:00"
+            "time": "2020-02-01T07:43:44+00:00"
         },
         {
             "name": "phpunit/php-timer",
@@ -8675,21 +8506,21 @@
         },
         {
             "name": "phpunit/php-token-stream",
-            "version": "4.0.3",
+            "version": "4.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "5672711b6b07b14d5ab694e700c62eeb82fcf374"
+                "reference": "cdc0db5aed8fbfaf475fbd95bfd7bab83c7a779c"
             },
             "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/cdc0db5aed8fbfaf475fbd95bfd7bab83c7a779c",
+                "reference": "cdc0db5aed8fbfaf475fbd95bfd7bab83c7a779c",
                 "shasum": ""
             },
             "require": {
                 "ext-tokenizer": "*",
-                "php": "^7.3 || ^8.0"
+                "php": "^7.3"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.0"
@@ -8720,7 +8551,7 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2020-06-27T06:36:25+00:00"
+            "time": "2020-05-06T09:56:31+00:00"
         },
         {
             "name": "phpunit/phpunit",
@@ -8906,20 +8737,20 @@
         },
         {
             "name": "sebastian/code-unit",
-            "version": "1.0.5",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit.git",
-                "reference": "c1e2df332c905079980b119c4db103117e5e5c90"
+                "reference": "ac958085bc19fcd1d36425c781ef4cbb5b06e2a5"
             },
             "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/ac958085bc19fcd1d36425c781ef4cbb5b06e2a5",
+                "reference": "ac958085bc19fcd1d36425c781ef4cbb5b06e2a5",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8.0"
+                "php": "^7.3"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.0"
@@ -8948,24 +8779,24 @@
             ],
             "description": "Collection of value objects that represent the PHP code units",
             "homepage": "https://github.com/sebastianbergmann/code-unit",
-            "time": "2020-06-26T12:50:45+00:00"
+            "time": "2020-04-30T05:58:10+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
-            "version": "2.0.2",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "ee51f9bb0c6d8a43337055db3120829fa14da819"
+                "reference": "5b5dbe0044085ac41df47e79d34911a15b96d82e"
             },
             "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/5b5dbe0044085ac41df47e79d34911a15b96d82e",
+                "reference": "5b5dbe0044085ac41df47e79d34911a15b96d82e",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8.0"
+                "php": "^7.3"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.0"
@@ -8993,24 +8824,24 @@
             ],
             "description": "Looks up which function or method a line of code belongs to",
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "time": "2020-06-26T12:04:00+00:00"
+            "time": "2020-02-07T06:20:13+00:00"
         },
         {
             "name": "sebastian/comparator",
-            "version": "4.0.3",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "dcc580eadfaa4e7f9d2cf9ae1922134ea962e14f"
+                "reference": "85b3435da967696ed618ff745f32be3ff4a2b8e8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/dcc580eadfaa4e7f9d2cf9ae1922134ea962e14f",
-                "reference": "dcc580eadfaa4e7f9d2cf9ae1922134ea962e14f",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/85b3435da967696ed618ff745f32be3ff4a2b8e8",
+                "reference": "85b3435da967696ed618ff745f32be3ff4a2b8e8",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8.0",
+                "php": "^7.3",
                 "sebastian/diff": "^4.0",
                 "sebastian/exporter": "^4.0"
             },
@@ -9057,24 +8888,24 @@
                 "compare",
                 "equality"
             ],
-            "time": "2020-06-26T12:05:46+00:00"
+            "time": "2020-02-07T06:08:51+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "4.0.2",
+            "version": "4.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "1e90b4cf905a7d06c420b1d2e9d11a4dc8a13113"
+                "reference": "3e523c576f29dacecff309f35e4cc5a5c168e78a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/1e90b4cf905a7d06c420b1d2e9d11a4dc8a13113",
-                "reference": "1e90b4cf905a7d06c420b1d2e9d11a4dc8a13113",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3e523c576f29dacecff309f35e4cc5a5c168e78a",
+                "reference": "3e523c576f29dacecff309f35e4cc5a5c168e78a",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8.0"
+                "php": "^7.3"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.0",
@@ -9113,24 +8944,24 @@
                 "unidiff",
                 "unified diff"
             ],
-            "time": "2020-06-30T04:46:02+00:00"
+            "time": "2020-05-08T05:01:12+00:00"
         },
         {
             "name": "sebastian/environment",
-            "version": "5.1.2",
+            "version": "5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "0a757cab9d5b7ef49a619f1143e6c9c1bc0fe9d2"
+                "reference": "c753f04d68cd489b6973cf9b4e505e191af3b05c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/0a757cab9d5b7ef49a619f1143e6c9c1bc0fe9d2",
-                "reference": "0a757cab9d5b7ef49a619f1143e6c9c1bc0fe9d2",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/c753f04d68cd489b6973cf9b4e505e191af3b05c",
+                "reference": "c753f04d68cd489b6973cf9b4e505e191af3b05c",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8.0"
+                "php": "^7.3"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.0"
@@ -9166,29 +8997,29 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2020-06-26T12:07:24+00:00"
+            "time": "2020-04-14T13:36:52+00:00"
         },
         {
             "name": "sebastian/exporter",
-            "version": "4.0.2",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "571d721db4aec847a0e59690b954af33ebf9f023"
+                "reference": "80c26562e964016538f832f305b2286e1ec29566"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/571d721db4aec847a0e59690b954af33ebf9f023",
-                "reference": "571d721db4aec847a0e59690b954af33ebf9f023",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/80c26562e964016538f832f305b2286e1ec29566",
+                "reference": "80c26562e964016538f832f305b2286e1ec29566",
                 "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.0"
             },
             "type": "library",
             "extra": {
@@ -9233,7 +9064,7 @@
                 "export",
                 "exporter"
             ],
-            "time": "2020-06-26T12:08:55+00:00"
+            "time": "2020-02-07T06:10:52+00:00"
         },
         {
             "name": "sebastian/finder-facade",
@@ -9337,20 +9168,20 @@
         },
         {
             "name": "sebastian/object-enumerator",
-            "version": "4.0.2",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "074fed2d0a6d08e1677dd8ce9d32aecb384917b8"
+                "reference": "e67516b175550abad905dc952f43285957ef4363"
             },
             "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/e67516b175550abad905dc952f43285957ef4363",
+                "reference": "e67516b175550abad905dc952f43285957ef4363",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8.0",
+                "php": "^7.3",
                 "sebastian/object-reflector": "^2.0",
                 "sebastian/recursion-context": "^4.0"
             },
@@ -9380,24 +9211,24 @@
             ],
             "description": "Traverses array structures and object graphs to enumerate all referenced objects",
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-            "time": "2020-06-26T12:11:32+00:00"
+            "time": "2020-02-07T06:12:23+00:00"
         },
         {
             "name": "sebastian/object-reflector",
-            "version": "2.0.2",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-reflector.git",
-                "reference": "127a46f6b057441b201253526f81d5406d6c7840"
+                "reference": "f4fd0835cabb0d4a6546d9fe291e5740037aa1e7"
             },
             "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/f4fd0835cabb0d4a6546d9fe291e5740037aa1e7",
+                "reference": "f4fd0835cabb0d4a6546d9fe291e5740037aa1e7",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8.0"
+                "php": "^7.3"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.0"
@@ -9425,7 +9256,7 @@
             ],
             "description": "Allows reflection of object attributes, including inherited and non-public ones",
             "homepage": "https://github.com/sebastianbergmann/object-reflector/",
-            "time": "2020-06-26T12:12:55+00:00"
+            "time": "2020-02-07T06:19:40+00:00"
         },
         {
             "name": "sebastian/phpcpd",
@@ -9480,20 +9311,20 @@
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "4.0.2",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "062231bf61d2b9448c4fa5a7643b5e1829c11d63"
+                "reference": "cdd86616411fc3062368b720b0425de10bd3d579"
             },
             "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/cdd86616411fc3062368b720b0425de10bd3d579",
+                "reference": "cdd86616411fc3062368b720b0425de10bd3d579",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8.0"
+                "php": "^7.3"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.0"
@@ -9529,24 +9360,24 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2020-06-26T12:14:17+00:00"
+            "time": "2020-02-07T06:18:20+00:00"
         },
         {
             "name": "sebastian/resource-operations",
-            "version": "3.0.2",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "0653718a5a629b065e91f774595267f8dc32e213"
+                "reference": "8c98bf0dfa1f9256d0468b9803a1e1df31b6fa98"
             },
             "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/8c98bf0dfa1f9256d0468b9803a1e1df31b6fa98",
+                "reference": "8c98bf0dfa1f9256d0468b9803a1e1df31b6fa98",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8.0"
+                "php": "^7.3"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.0"
@@ -9574,24 +9405,24 @@
             ],
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "time": "2020-06-26T12:16:22+00:00"
+            "time": "2020-02-07T06:13:02+00:00"
         },
         {
             "name": "sebastian/type",
-            "version": "2.2.1",
+            "version": "2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "86991e2b33446cd96e648c18bcdb1e95afb2c05a"
+                "reference": "bad49207c6f854e7a25cef0ea948ac8ebe3ef9d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/86991e2b33446cd96e648c18bcdb1e95afb2c05a",
-                "reference": "86991e2b33446cd96e648c18bcdb1e95afb2c05a",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/bad49207c6f854e7a25cef0ea948ac8ebe3ef9d8",
+                "reference": "bad49207c6f854e7a25cef0ea948ac8ebe3ef9d8",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8.0"
+                "php": "^7.3"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.2"
@@ -9599,7 +9430,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.2-dev"
+                    "dev-master": "2.1-dev"
                 }
             },
             "autoload": {
@@ -9620,24 +9451,24 @@
             ],
             "description": "Collection of value objects that represent the types of the PHP type system",
             "homepage": "https://github.com/sebastianbergmann/type",
-            "time": "2020-07-05T08:31:53+00:00"
+            "time": "2020-06-01T12:21:09+00:00"
         },
         {
             "name": "sebastian/version",
-            "version": "3.0.1",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "626586115d0ed31cb71483be55beb759b5af5a3c"
+                "reference": "0411bde656dce64202b39c2f4473993a9081d39e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/626586115d0ed31cb71483be55beb759b5af5a3c",
-                "reference": "626586115d0ed31cb71483be55beb759b5af5a3c",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/0411bde656dce64202b39c2f4473993a9081d39e",
+                "reference": "0411bde656dce64202b39c2f4473993a9081d39e",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8.0"
+                "php": "^7.3"
             },
             "type": "library",
             "extra": {
@@ -9663,7 +9494,7 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2020-06-26T12:18:43+00:00"
+            "time": "2020-01-21T06:36:37+00:00"
         },
         {
             "name": "spomky-labs/otphp",
@@ -9789,7 +9620,7 @@
         },
         {
             "name": "symfony/config",
-            "version": "v5.1.2",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
@@ -9855,16 +9686,16 @@
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v5.1.2",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "6508423eded583fc07e88a0172803e1a62f0310c"
+                "reference": "6a6791e9584273b32eeb01790da4c7446d87a621"
             },
             "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/6a6791e9584273b32eeb01790da4c7446d87a621",
+                "reference": "6a6791e9584273b32eeb01790da4c7446d87a621",
                 "shasum": ""
             },
             "require": {
@@ -9926,20 +9757,20 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
-            "time": "2020-06-12T08:11:32+00:00"
+            "time": "2020-05-30T20:35:19+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v2.1.3",
+            "version": "v2.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "5e20b83385a77593259c9f8beb2c43cd03b2ac14"
+                "reference": "dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337"
             },
             "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/dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337",
+                "reference": "dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337",
                 "shasum": ""
             },
             "require": {
@@ -9949,10 +9780,6 @@
             "extra": {
                 "branch-alias": {
                     "dev-master": "2.1-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -9976,20 +9803,20 @@
             ],
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
-            "time": "2020-06-06T08:49:21+00:00"
+            "time": "2020-05-27T08:34:37+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v5.1.2",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "f93055171b847915225bd5b0a5792888419d8d75"
+                "reference": "e0d853bddc2b2cfb0d67b0b4496c03fffe1d37fa"
             },
             "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/e0d853bddc2b2cfb0d67b0b4496c03fffe1d37fa",
+                "reference": "e0d853bddc2b2cfb0d67b0b4496c03fffe1d37fa",
                 "shasum": ""
             },
             "require": {
@@ -10037,20 +9864,20 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2020-06-15T06:52:54+00:00"
+            "time": "2020-05-24T12:18:07+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v5.1.2",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "c0c418f05e727606e85b482a8591519c4712cf45"
+                "reference": "56261f89385f9d13cf843a5101ac72131190bc91"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/c0c418f05e727606e85b482a8591519c4712cf45",
-                "reference": "c0c418f05e727606e85b482a8591519c4712cf45",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/56261f89385f9d13cf843a5101ac72131190bc91",
+                "reference": "56261f89385f9d13cf843a5101ac72131190bc91",
                 "shasum": ""
             },
             "require": {
@@ -10100,11 +9927,11 @@
                 "mime",
                 "mime-type"
             ],
-            "time": "2020-06-09T15:07:35+00:00"
+            "time": "2020-05-25T12:33:44+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v5.1.2",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
@@ -10158,9 +9985,68 @@
             ],
             "time": "2020-05-23T13:08:13+00:00"
         },
+        {
+            "name": "symfony/polyfill-php70",
+            "version": "v1.17.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php70.git",
+                "reference": "82225c2d7d23d7e70515496d249c0152679b468e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/82225c2d7d23d7e70515496d249c0152679b468e",
+                "reference": "82225c2d7d23d7e70515496d249c0152679b468e",
+                "shasum": ""
+            },
+            "require": {
+                "paragonie/random_compat": "~1.0|~2.0|~9.99",
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.17-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php70\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ],
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2020-05-12T16:47:27+00:00"
+        },
         {
             "name": "symfony/stopwatch",
-            "version": "v5.1.2",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
@@ -10210,7 +10096,7 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v5.1.2",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
@@ -10273,16 +10159,16 @@
         },
         {
             "name": "thecodingmachine/safe",
-            "version": "v1.1.3",
+            "version": "v1.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thecodingmachine/safe.git",
-                "reference": "9f277171e296a3c8629c04ac93ec95ff0f208ccb"
+                "reference": "04f9ffae372a9816d4472dfb7bcf6126b623a9df"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thecodingmachine/safe/zipball/9f277171e296a3c8629c04ac93ec95ff0f208ccb",
-                "reference": "9f277171e296a3c8629c04ac93ec95ff0f208ccb",
+                "url": "https://api.github.com/repos/thecodingmachine/safe/zipball/04f9ffae372a9816d4472dfb7bcf6126b623a9df",
+                "reference": "04f9ffae372a9816d4472dfb7bcf6126b623a9df",
                 "shasum": ""
             },
             "require": {
@@ -10402,7 +10288,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-05-04T15:25:36+00:00"
         },
         {
             "name": "theseer/fdomdocument",
@@ -10446,23 +10332,23 @@
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.2.0",
+            "version": "1.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "75a63c33a8577608444246075ea0af0d052e452a"
+                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/75a63c33a8577608444246075ea0af0d052e452a",
-                "reference": "75a63c33a8577608444246075ea0af0d052e452a",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
+                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-tokenizer": "*",
                 "ext-xmlwriter": "*",
-                "php": "^7.2 || ^8.0"
+                "php": "^7.0"
             },
             "type": "library",
             "autoload": {
@@ -10482,25 +10368,25 @@
                 }
             ],
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
-            "time": "2020-07-12T23:59:07+00:00"
+            "time": "2019-06-13T22:48:21+00:00"
         },
         {
             "name": "vlucas/phpdotenv",
-            "version": "v2.6.6",
+            "version": "v2.6.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "e1d57f62db3db00d9139078cbedf262280701479"
+                "reference": "2e977311ffb17b2f82028a9c36824647789c6365"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/e1d57f62db3db00d9139078cbedf262280701479",
-                "reference": "e1d57f62db3db00d9139078cbedf262280701479",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2e977311ffb17b2f82028a9c36824647789c6365",
+                "reference": "2e977311ffb17b2f82028a9c36824647789c6365",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.3.9 || ^7.0 || ^8.0",
-                "symfony/polyfill-ctype": "^1.17"
+                "symfony/polyfill-ctype": "^1.16"
             },
             "require-dev": {
                 "ext-filter": "*",
@@ -10544,28 +10430,27 @@
                 "env",
                 "environment"
             ],
-            "time": "2020-07-14T17:54:18+00:00"
+            "time": "2020-06-02T14:06:52+00:00"
         },
         {
             "name": "webmozart/assert",
-            "version": "1.9.1",
+            "version": "1.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozart/assert.git",
-                "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389"
+                "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389",
-                "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/ab2cb0b3b559010b75981b1bdce728da3ee90ad6",
+                "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.3 || ^7.0 || ^8.0",
+                "php": "^5.3.3 || ^7.0",
                 "symfony/polyfill-ctype": "^1.8"
             },
             "conflict": {
-                "phpstan/phpstan": "<0.12.20",
                 "vimeo/psalm": "<3.9.1"
             },
             "require-dev": {
@@ -10593,7 +10478,7 @@
                 "check",
                 "validate"
             ],
-            "time": "2020-07-08T17:02:28+00:00"
+            "time": "2020-04-18T12:12:48+00:00"
         },
         {
             "name": "weew/helpers-array",
@@ -10636,7 +10521,7 @@
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": [],
-    "prefer-stable": false,
+    "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
         "php": "~7.3.0||~7.4.0",
diff --git a/lib/internal/Magento/Framework/Amqp/composer.json b/lib/internal/Magento/Framework/Amqp/composer.json
index 44846c23a48e4..fc65e37d12ecf 100644
--- a/lib/internal/Magento/Framework/Amqp/composer.json
+++ b/lib/internal/Magento/Framework/Amqp/composer.json
@@ -10,7 +10,7 @@
         "AFL-3.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"
     },
@@ -21,6 +21,5 @@
         "files": [
             "registration.php"
         ]
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/lib/internal/Magento/Framework/Bulk/composer.json b/lib/internal/Magento/Framework/Bulk/composer.json
index cf6d64227ddf9..b8e0992182169 100644
--- a/lib/internal/Magento/Framework/Bulk/composer.json
+++ b/lib/internal/Magento/Framework/Bulk/composer.json
@@ -10,7 +10,7 @@
         "AFL-3.0"
     ],
     "require": {
-        "magento/framework": "103.0.*",
+        "magento/framework": "*",
         "php": "~7.3.0||~7.4.0"
     },
     "autoload": {
@@ -20,6 +20,5 @@
         "files": [
             "registration.php"
         ]
-    },
-    "version": "101.0.0"
+    }
 }
diff --git a/lib/internal/Magento/Framework/MessageQueue/composer.json b/lib/internal/Magento/Framework/MessageQueue/composer.json
index 889a6c37d0911..056f1d40c39cf 100644
--- a/lib/internal/Magento/Framework/MessageQueue/composer.json
+++ b/lib/internal/Magento/Framework/MessageQueue/composer.json
@@ -10,7 +10,7 @@
         "AFL-3.0"
     ],
     "require": {
-        "magento/framework": "103.0.*",
+        "magento/framework": "*",
         "php": "~7.3.0||~7.4.0"
     },
     "autoload": {
@@ -20,6 +20,5 @@
         "files": [
             "registration.php"
         ]
-    },
-    "version": "100.4.0"
+    }
 }
diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json
index 3bd1d83ff0338..dfc81189bf544 100644
--- a/lib/internal/Magento/Framework/composer.json
+++ b/lib/internal/Magento/Framework/composer.json
@@ -59,6 +59,5 @@
         "files": [
             "registration.php"
         ]
-    },
-    "version": "103.0.0"
+    }
 }

From 1604844765deaa8229cf61107fcef307ab65e8c6 Mon Sep 17 00:00:00 2001
From: Anusha Vattam <avattam@adobe.com>
Date: Mon, 20 Jul 2020 23:22:22 -0500
Subject: [PATCH 0946/1718] MC-35653:MyAccount :: Order Details :: Payments
 Methods, shipping address, billing address by Order Number

- Added suffix and prefix changes on address
---
 app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php b/app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php
index 4dcdeb0d95373..08e67ee29cbdd 100644
--- a/app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php
+++ b/app/code/Magento/SalesGraphQl/Model/Order/OrderAddress.php
@@ -62,8 +62,8 @@ private function formatAddressData(
                 'lastname' => $orderAddress->getLastname(),
                 'middlename' => $orderAddress->getMiddlename(),
                 'postcode' => $orderAddress->getPostcode(),
-                'prefix' => $orderAddress->getFirstname(),
-                'suffix' => $orderAddress->getFirstname(),
+                'prefix' => $orderAddress->getPrefix(),
+                'suffix' => $orderAddress->getSuffix(),
                 'street' => $orderAddress->getStreet(),
                 'country_code' => $orderAddress->getCountryId(),
                 'city' => $orderAddress->getCity(),

From 659071cd533f4d7a61256a899828c2dfc54ac171 Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Tue, 21 Jul 2020 15:49:55 +0800
Subject: [PATCH 0947/1718] magento/adobe-stock-integration#1391:
 SaveAssetsKeywordsInterface to delete obsolete keywords - integration test
 refactor

---
 .../Model/ResourceModel/AssetKeywordsTest.php | 92 +++++++++----------
 1 file changed, 41 insertions(+), 51 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/MediaGallery/Model/ResourceModel/AssetKeywordsTest.php b/dev/tests/integration/testsuite/Magento/MediaGallery/Model/ResourceModel/AssetKeywordsTest.php
index 76d8cb6bdd1a9..fcfd2911d9327 100644
--- a/dev/tests/integration/testsuite/Magento/MediaGallery/Model/ResourceModel/AssetKeywordsTest.php
+++ b/dev/tests/integration/testsuite/Magento/MediaGallery/Model/ResourceModel/AssetKeywordsTest.php
@@ -66,74 +66,57 @@ protected function setUp(): void
      *
      * @magentoDataFixture Magento/MediaGallery/_files/media_asset.php
      * @dataProvider keywordsProvider
-     * @param array $keywords
+     * @param array|null $keywords
+     * @param array|null $updatedKeywords
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    public function testSaveAndGetKeywords(array $keywords): void
+    public function testSaveAndGetKeywords(array $keywords = [], array $updatedKeywords = []): void
     {
-        $keywords = ['pear', 'plum'];
-        $updatedKeywords = ['pear', 'apple','orange'];
-
         $loadedAssets = $this->getAssetsByPath->execute([self::FIXTURE_ASSET_PATH]);
         $this->assertCount(1, $loadedAssets);
         $loadedAsset = current($loadedAssets);
 
+        $this->updateAssetKeywords($loadedAsset->getId(), $keywords);
+        $this->updateAssetKeywords($loadedAsset->getId(), $updatedKeywords);
+    }
+
+    /**
+     * Update Asset keywords
+     *
+     * @param int $assetId
+     * @param array|null $keywords
+     */
+    private function updateAssetKeywords(int $assetId, array $keywords = []): void
+    {
         $assetKeywords = $this->assetsKeywordsFactory->create(
             [
-                'assetId' => $loadedAsset->getId(),
+                'assetId' => $assetId,
                 'keywords' => $this->getKeywords($keywords)
             ]
         );
 
         $this->saveAssetsKeywords->execute([$assetKeywords]);
-        $loadedAssetKeywords = $this->getAssetsKeywords->execute([$loadedAsset->getId()]);
-
-        $this->assertCount(1, $loadedAssetKeywords);
-
-        /** @var AssetKeywordsInterface $loadedAssetKeyword */
-        $loadedAssetKeyword = current($loadedAssetKeywords);
-
-        $loadedKeywords = $loadedAssetKeyword->getKeywords();
+        $loadedAssetKeywords = $this->getAssetsKeywords->execute([$assetId]);
 
-        $this->assertEquals(count($keywords), count($loadedKeywords));
+        if (!empty($keywords)) {
+            $this->assertCount(1, $loadedAssetKeywords);
+            /** @var AssetKeywordsInterface $loadedAssetKeyword */
+            $loadedAssetKeyword = current($loadedAssetKeywords);
 
-        $loadedKeywordStrings = [];
-        foreach ($loadedKeywords as $loadedKeywordObject) {
-            $loadedKeywordStrings[] = $loadedKeywordObject->getKeyword();
-        }
-
-        sort($loadedKeywordStrings);
-        sort($keywords);
-
-        $this->assertEquals($keywords, $loadedKeywordStrings);
-
-        $updatedAssetKeywords = $this->assetsKeywordsFactory->create(
-            [
-                'assetId' => $loadedAsset->getId(),
-                'keywords' => $this->getKeywords($updatedKeywords)
-            ]
-        );
-        $this->saveAssetsKeywords->execute([$updatedAssetKeywords]);
-        $updatedLoadedAssetKeywords = $this->getAssetsKeywords->execute([$loadedAsset->getId()]);
-
-        $this->assertCount(1, $updatedLoadedAssetKeywords);
+            $loadedKeywords = $loadedAssetKeyword->getKeywords();
 
-        /** @var AssetKeywordsInterface $updatedLoadedAssetKeywords */
-        $updatedLoadedAssetKeywords = current($updatedLoadedAssetKeywords);
+            $this->assertEquals(count($keywords), count($loadedKeywords));
 
-        $updatedLoadedKeywords = $updatedLoadedAssetKeywords->getKeywords();
+            $loadedKeywordStrings = [];
+            foreach ($loadedKeywords as $loadedKeywordObject) {
+                $loadedKeywordStrings[] = $loadedKeywordObject->getKeyword();
+            }
 
-        $this->assertEquals(count($updatedKeywords), count($updatedLoadedKeywords));
+            sort($loadedKeywordStrings);
+            sort($keywords);
 
-        $updatedLoadedKeywordStrings = [];
-        foreach ($updatedLoadedKeywords as $updatedLoadedKeywordObject) {
-            $updatedLoadedKeywordStrings[] = $updatedLoadedKeywordObject->getKeyword();
+            $this->assertEquals($keywords, $loadedKeywordStrings);
         }
-
-        sort($updatedLoadedKeywordStrings);
-        sort($updatedKeywords);
-
-        $this->assertEquals($updatedKeywords, $updatedLoadedKeywordStrings);
     }
 
     /**
@@ -144,10 +127,17 @@ public function testSaveAndGetKeywords(array $keywords): void
     public function keywordsProvider(): array
     {
         return [
-            [['one-keyword']],
-            [['кириллица']],
-            [['plum', 'pear']],
-            [[]]
+            [['one-keyword'],['plum','orange']],
+            [['кириллица'],[]],
+            [[],['plum']],
+            [['plum', 'pear'],['plum','pear']],
+            [['plum', 'pear'],['plum','orange']],
+            [['plum', 'pear','grape'],['plum','orange']],
+            [['plum', 'pear','grape'],['mango']],
+            [['plum', 'pear','grape'],['orange']],
+            [['plum', 'pear','grape'],[]],
+            [['plum', 'pear'],['plum', 'pear','grape','mango','orange']],
+            [[],[]]
         ];
     }
 

From 35307490cccdc279037f56f381488fc23ad83b3d Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Tue, 21 Jul 2020 15:06:26 +0300
Subject: [PATCH 0948/1718] MC-35891: Automate MC-28963 tests

---
 .../Magento/Catalog/Test/Mftf/Data/ProductData.xml   |  1 -
 .../LayeredNavigation/Test/Mftf/Data/ConfigData.xml  |  1 -
 ...tributeOptionsAreShownInLayeredNavigationTest.xml | 12 ++++++------
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index e5b38533747f9..3faf79416a032 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -285,7 +285,6 @@
         <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
     </entity>
     <entity name="ApiSimpleProductWithCategory" type="product2" extends="ApiSimpleOne">
-        <requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
         <requiredEntity type="custom_attribute">CustomAttributeCategoryIds</requiredEntity>
     </entity>
     <entity name="ApiSimpleProductWithShortSKU" type="product2" extends="ApiSimpleOne">
diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/Data/ConfigData.xml b/app/code/Magento/LayeredNavigation/Test/Mftf/Data/ConfigData.xml
index a745397403cd2..85eb8830dffca 100644
--- a/app/code/Magento/LayeredNavigation/Test/Mftf/Data/ConfigData.xml
+++ b/app/code/Magento/LayeredNavigation/Test/Mftf/Data/ConfigData.xml
@@ -16,5 +16,4 @@
         <data key="path">catalog/layered_navigation/price_range_calculation</data>
         <data key="value">auto</data>
     </entity>
-
 </entities>
diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/Test/StorefrontAllAttributeOptionsAreShownInLayeredNavigationTest.xml b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/StorefrontAllAttributeOptionsAreShownInLayeredNavigationTest.xml
index 4f547120f14d2..cb7e683605a68 100644
--- a/app/code/Magento/LayeredNavigation/Test/Mftf/Test/StorefrontAllAttributeOptionsAreShownInLayeredNavigationTest.xml
+++ b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/StorefrontAllAttributeOptionsAreShownInLayeredNavigationTest.xml
@@ -10,17 +10,19 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="StorefrontAllAttributeOptionsAreShownInLayeredNavigationTest">
         <annotations>
-            <features value="Layered Navigation"/>
+            <features value="LayeredNavigation"/>
             <stories value="Product attributes in Layered Navigation"/>
             <title value="Limitation of displayed attribute options number in layered navigation with ElasticSearch"/>
             <description value="All attribute options are shown in Layered navigation"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MC-28963"/>
-            <group value="LayeredNavigation"/>
+            <group value="layeredNavigation"/>
+            <group value="catalog"/>
             <group value="SearchEngineElasticsearch"/>
         </annotations>
 
         <before>
+            <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
             <magentoCLI command="config:set {{DisplayProductCountDefaultValue.path}} {{DisplayProductCountDefaultValue.value}}" stepKey="enableDisplayProductCount"/>
             <magentoCLI command="config:set {{PriceNavigationStepCalculationDefaultValue.path}} {{PriceNavigationStepCalculationDefaultValue.value}}" stepKey="setPriceNavigationStepCalculationDefaultValue"/>
             <createData entity="ApiCategory" stepKey="createCategory"/>
@@ -72,7 +74,7 @@
             <createData entity="productAttributeOption" stepKey="createConfigProductAttributeOption15">
                 <requiredEntity createDataKey="createConfigProductAttribute"/>
             </createData>
-            <!--Cet Created options data-->
+            <!--Get Created options data-->
             <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
                 <requiredEntity createDataKey="createConfigProductAttribute"/>
             </getData>
@@ -309,9 +311,7 @@
             <deleteData createDataKey="createConfigChildProduct14" stepKey="deleteConfigChildProduct14"/>
             <deleteData createDataKey="createConfigChildProduct15" stepKey="deleteConfigChildProduct15"/>
             <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteAttribute"/>
-            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
-                <argument name="indices" value="catalogsearch_fulltext"/>
-            </actionGroup>
+            <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
         </after>
 
         <actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="openCategory">

From e5be53f628f6170324572132bf66742b6fb63115 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Tue, 21 Jul 2020 15:19:41 +0300
Subject: [PATCH 0949/1718] remove filtering by unique value

---
 app/code/Magento/Customer/Model/Options.php          |  5 ++---
 .../testsuite/Magento/Customer/Model/OptionsTest.php | 12 ++++++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Customer/Model/Options.php b/app/code/Magento/Customer/Model/Options.php
index bc093502fb4fc..7496c2c0bc0bf 100644
--- a/app/code/Magento/Customer/Model/Options.php
+++ b/app/code/Magento/Customer/Model/Options.php
@@ -101,12 +101,11 @@ private function prepareNamePrefixSuffixOptions($options, $isOptional = false)
         $result = [];
         $options = explode(';', $options);
         foreach ($options as $value) {
-            $value = $this->escaper->escapeHtml(trim($value)) ?: ' ';
-            $result[$value] = $value;
+            $result[] = $this->escaper->escapeHtml(trim($value)) ?: ' ';
         }
 
         if ($isOptional && trim(current($options))) {
-            $result = array_merge([' ' => ' '], $result);
+            $result = array_merge([' '], $result);
         }
 
         return $result;
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/OptionsTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/OptionsTest.php
index 5deda0803fff0..879707edd9224 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/OptionsTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/OptionsTest.php
@@ -102,9 +102,11 @@ public function optionsDataProvider(): array
         $optionPrefixName = 'prefix';
         $optionSuffixName = 'suffix';
         $optionValues = 'v1;v2';
+        $expectedValues = ['v1', 'v2'];
         $optionValuesWithBlank = ';v1;v2';
-        $expectedValuesWithBlank = [' ' => ' ', 'v1' => 'v1', 'v2' => 'v2'];
-        $expectedValues = ['v1' => 'v1', 'v2' => 'v2'];
+        $expectedValuesWithBlank = [' ', 'v1', 'v2'];
+        $optionValuesWithTwoBlank = ';v1;v2;';
+        $expectedValuesTwoBlank = [' ', 'v1', 'v2', ' '];
 
         return [
             'prefix_required_with_blank_option' => [
@@ -119,6 +121,12 @@ public function optionsDataProvider(): array
                 [self::XML_PATH_PREFIX_OPTIONS => $optionValues],
                 $expectedValues,
             ],
+            'prefix_required_with_two_blank_option' => [
+                $optionPrefixName,
+                [self::XML_PATH_PREFIX_SHOW => Nooptreq::VALUE_REQUIRED],
+                [self::XML_PATH_PREFIX_OPTIONS => $optionValuesWithTwoBlank],
+                $expectedValuesTwoBlank,
+            ],
             'prefix_optional' => [
                 $optionPrefixName,
                 [self::XML_PATH_PREFIX_SHOW => Nooptreq::VALUE_OPTIONAL],

From 7d0d91d54f65e9e13b876588f4a606f6eb92b7f8 Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Tue, 21 Jul 2020 15:48:12 +0300
Subject: [PATCH 0950/1718] Correction for MFTF test.

---
 ...torefrontUpdateCartItemEditParametersProductActionGroup.xml} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/{StrorefrontUpdateCartItemEditParametersProductActionGroup.xml => StorefrontUpdateCartItemEditParametersProductActionGroup.xml} (88%)

diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StrorefrontUpdateCartItemEditParametersProductActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontUpdateCartItemEditParametersProductActionGroup.xml
similarity index 88%
rename from app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StrorefrontUpdateCartItemEditParametersProductActionGroup.xml
rename to app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontUpdateCartItemEditParametersProductActionGroup.xml
index 17a13ab7a9a12..595cfa7c77409 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StrorefrontUpdateCartItemEditParametersProductActionGroup.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontUpdateCartItemEditParametersProductActionGroup.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="StrorefrontUpdateCartItemEditParametersProductActionGroup">
+    <actionGroup name="StorefrontUpdateCartItemEditParametersProductActionGroup">
         <arguments>
             <argument name="rowNumber" type="string" defaultValue="1"/>
         </arguments>

From cea922aab3e156e5cc55195f4de181a4f650bd04 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Tue, 21 Jul 2020 07:50:26 -0500
Subject: [PATCH 0951/1718] MC-32014: Remove google-shopping-ads module from
 core in 2.4.1

---
 lib/internal/Magento/Framework/Mview/View/Collection.php | 6 +++++-
 setup/src/Magento/Setup/Model/Installer.php              | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Mview/View/Collection.php b/lib/internal/Magento/Framework/Mview/View/Collection.php
index 91276bb376049..573bbf798d49e 100644
--- a/lib/internal/Magento/Framework/Mview/View/Collection.php
+++ b/lib/internal/Magento/Framework/Mview/View/Collection.php
@@ -93,7 +93,11 @@ private function getOrderedViewIds()
         /** @var IndexerInterface $indexer */
         foreach (array_keys($this->indexerConfig->getIndexers()) as $indexerId) {
             $indexer = $this->_entityFactory->create(IndexerInterface::class);
-            $orderedViewIds[] = $indexer->load($indexerId)->getViewId();
+            $viewId = $indexer->load($indexerId)->getViewId();
+            $view = $this->config->getView($viewId);
+            if (!empty($view) && !empty($view['view_id']) && $view['view_id'] === $viewId) {
+                $orderedViewIds[] = $viewId;
+            }
         }
         $orderedViewIds = array_filter($orderedViewIds);
         $orderedViewIds += array_diff(array_keys($this->config->getViews()), $orderedViewIds);
diff --git a/setup/src/Magento/Setup/Model/Installer.php b/setup/src/Magento/Setup/Model/Installer.php
index 955d3b2dc1365..ad94f2e62b819 100644
--- a/setup/src/Magento/Setup/Model/Installer.php
+++ b/setup/src/Magento/Setup/Model/Installer.php
@@ -1660,5 +1660,6 @@ private function updateColumnType(
     public function removeUnusedTriggers(): void
     {
         $this->triggerCleaner->unsubscribe();
+        $this->cleanCaches();
     }
 }

From 22c74f99a4a746e3545ae3dc7ae22780e883a474 Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Tue, 21 Jul 2020 16:33:44 +0300
Subject: [PATCH 0952/1718] Added testCaseId fot MFTF test.

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

diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontConfigurableProductSwatchUpdateCartItemTierPriceTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontConfigurableProductSwatchUpdateCartItemTierPriceTest.xml
index ca68fcf329796..e89d3157e4624 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontConfigurableProductSwatchUpdateCartItemTierPriceTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontConfigurableProductSwatchUpdateCartItemTierPriceTest.xml
@@ -14,6 +14,7 @@
             <title value="Swatch option should show the tier price on product page when Cart Item edited."/>
             <description value="Configurable product with swatch attribute should show the tier price on product page when added Cart Item."/>
             <severity value="CRITICAL"/>
+            <testCaseId value="MC-36047"/>
             <group value="Swatches"/>
         </annotations>
         <before>

From b65a28791d169a11f1d88a07004e27fba69f4100 Mon Sep 17 00:00:00 2001
From: John Carlo Octabio <johncarlo@abovethefray.io>
Date: Tue, 21 Jul 2020 21:49:36 +0800
Subject: [PATCH 0953/1718] magento/magento2#108: Clear Shopping Cart - Added
 integration test for isClearShoppingCartEnabled method, added timeout for
 MFTF emptyCartButton element

---
 .../Section/CheckoutCartProductSection.xml    |   2 +-
 app/code/Magento/Checkout/ViewModel/Cart.php  |   4 +-
 .../Magento/Checkout/ViewModel/CartTest.php   | 126 ++++++++++++++++++
 3 files changed, 129 insertions(+), 3 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/ViewModel/CartTest.php

diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
index 293d70df8c8e6..84f9a7930d40b 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
@@ -48,7 +48,7 @@
         <element name="checkoutCartProductPrice" type="text" selector="//td[@class='col price']//span[@class='price']"/>
         <element name="checkoutCartSubtotal" type="text" selector="//td[@class='col subtotal']//span[@class='price']"/>
         <element name="emptyCart" selector=".cart-empty" type="text"/>
-        <element name="emptyCartButton" selector="#empty_cart_button" type="button"/>
+        <element name="emptyCartButton" type="button" selector="#empty_cart_button" timeout="30"/>
         <element name="modalMessage" type="text" selector=".modal-popup.confirm._show .modal-content" timeout="30"/>
         <element name="modalConfirmButton" type="button" selector=".modal-popup.confirm._show .action-accept" timeout="30"/>
         <!-- Required attention section -->
diff --git a/app/code/Magento/Checkout/ViewModel/Cart.php b/app/code/Magento/Checkout/ViewModel/Cart.php
index 2bdfe504d4627..21fe090249a92 100644
--- a/app/code/Magento/Checkout/ViewModel/Cart.php
+++ b/app/code/Magento/Checkout/ViewModel/Cart.php
@@ -16,7 +16,7 @@ class Cart implements ArgumentInterface
     /**
      * Config settings path to enable clear shopping cart button
      */
-    private const XPATH_CONFIG_ENABLE_CLEAR_SHOPPING_CART = 'checkout/cart/enable_clear_shopping_cart';
+    public const XPATH_CONFIG_ENABLE_CLEAR_SHOPPING_CART = 'checkout/cart/enable_clear_shopping_cart';
 
     /**
      * @var ScopeConfigInterface
@@ -41,7 +41,7 @@ public function __construct(
      */
     public function isClearShoppingCartEnabled()
     {
-        return (bool) $this->_scopeConfig->getValue(
+        return (bool)$this->_scopeConfig->getValue(
             self::XPATH_CONFIG_ENABLE_CLEAR_SHOPPING_CART,
             ScopeInterface::SCOPE_WEBSITE
         );
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/ViewModel/CartTest.php b/dev/tests/integration/testsuite/Magento/Checkout/ViewModel/CartTest.php
new file mode 100644
index 0000000000000..52040a503c37a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/ViewModel/CartTest.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Checkout\ViewModel;
+
+use Magento\Framework\App\Config\MutableScopeConfigInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for clear shopping cart config
+ *
+ * @package Magento\Checkout\ViewModel
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class CartTest extends TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var Cart
+     */
+    private $cart;
+
+    /**
+     * @var MutableScopeConfigInterface
+     */
+    private $mutableScopeConfig;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        $objectManager = $this->objectManager = Bootstrap::getObjectManager();
+        $this->cart = $objectManager->get(Cart::class);
+        $this->mutableScopeConfig = $objectManager->get(MutableScopeConfigInterface::class);
+        $this->storeManager = $objectManager->get(StoreManagerInterface::class);
+    }
+
+    /**
+     * @magentoAppArea frontend
+     * @magentoDataFixture Magento/Store/_files/second_website_with_two_stores.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testConfigClearShoppingCartEnabledWithWebsiteScopes()
+    {
+        // Assert not active by default
+        $this->assertFalse($this->cart->isClearShoppingCartEnabled());
+
+        // Enable Clear Shopping Cart in default website scope
+        $this->setClearShoppingCartEnabled(
+            true,
+            ScopeInterface::SCOPE_WEBSITE
+        );
+
+        // Assert now active in default website scope
+        $this->assertTrue($this->cart->isClearShoppingCartEnabled());
+
+        $defaultStore = $this->storeManager->getStore();
+        $defaultWebsite = $defaultStore->getWebsite();
+        $defaultWebsiteCode = $defaultWebsite->getCode();
+
+        $secondStore = $this->storeManager->getStore('fixture_second_store');
+        $secondWebsite = $secondStore->getWebsite();
+        $secondWebsiteCode = $secondWebsite->getCode();
+
+        // Change current store context to that of second website
+        $this->storeManager->setCurrentStore($secondStore);
+
+        // Assert not active by default in second website
+        $this->assertFalse($this->cart->isClearShoppingCartEnabled());
+
+        // Enable Clear Shopping Cart in second website scope
+        $this->setClearShoppingCartEnabled(
+            true,
+            ScopeInterface::SCOPE_WEBSITE,
+            $secondWebsiteCode
+        );
+
+        // Assert now active in second website scope
+        $this->assertTrue($this->cart->isClearShoppingCartEnabled());
+
+        // Disable Clear Shopping Cart in default website scope
+        $this->setClearShoppingCartEnabled(
+            false,
+            ScopeInterface::SCOPE_WEBSITE,
+            $defaultWebsiteCode
+        );
+
+        // Assert still active in second website
+        $this->assertTrue($this->cart->isClearShoppingCartEnabled());
+    }
+
+    /**
+     * Set purchase order enabled status.
+     *
+     * @param bool $isActive
+     * @param string $scope
+     * @param string|null $scopeCode
+     */
+    private function setClearShoppingCartEnabled(bool $isActive, string $scope, $scopeCode = null)
+    {
+        $this->mutableScopeConfig->setValue(
+            'checkout/cart/enable_clear_shopping_cart',
+            $isActive ? '1' : '0',
+            $scope,
+            $scopeCode
+        );
+    }
+}

From 85fd2700d238e7228a7f33787022af657d8b3817 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Tue, 21 Jul 2020 16:38:39 +0200
Subject: [PATCH 0954/1718] Fixing the case when an error message appears twice

---
 app/code/Magento/Quote/Model/Cart/AddProductsToCart.php | 4 +++-
 app/code/Magento/QuoteGraphQl/etc/schema.graphqls       | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php b/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
index a9bc48994b380..26df021e6325b 100644
--- a/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
+++ b/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
@@ -39,7 +39,7 @@ class AddProductsToCart
         'Could not find a product with SKU' => self::ERROR_PRODUCT_NOT_FOUND,
         'The required options you selected are not available' => self::ERROR_NOT_SALABLE,
         'Product that you are trying to add is not available.' => self::ERROR_NOT_SALABLE,
-        'This product is out of stock' => self::ERROR_NOT_SALABLE,
+        'This product is out of stock' => self::ERROR_INSUFFICIENT_STOCK,
         'There are no source items' => self::ERROR_NOT_SALABLE,
         'The fewest you may purchase is' => self::ERROR_INSUFFICIENT_STOCK,
         'The most you may purchase is' => self::ERROR_INSUFFICIENT_STOCK,
@@ -153,6 +153,8 @@ private function addItemToCart(CartInterface $cart, Data\CartItem $cartItem, int
                 __($e->getMessage())->render(),
                 $cartItemPosition
             );
+            $cart->setHasError(false);
+
             return;
         }
 
diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
index 636f1ed1e4002..7dae2987125e9 100644
--- a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -320,7 +320,7 @@ type SetGuestEmailOnCartOutput {
 }
 
 input EnteredOptionInput {
-    id: String! @doc(description: "base64 encoded option ID")
+    id: ID! @doc(description: "base64 encoded option ID")
     value: String!
 }
 

From 5498e7613e51288184f1c1e5a6368544efa4b7bb Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Tue, 21 Jul 2020 17:59:52 +0300
Subject: [PATCH 0955/1718] composer.lock update.

---
 composer.lock | 1751 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 1220 insertions(+), 531 deletions(-)

diff --git a/composer.lock b/composer.lock
index 370602b87ae09..97ab2b12512c2 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": "0ebe9109f59c372f9962e2a51c35c829",
+    "content-hash": "a8f3bda109a177996d409f39acfbfd9f",
     "packages": [
         {
             "name": "colinmollenhour/cache-backend-file",
@@ -206,20 +206,30 @@
                 "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"
         },
         {
             "name": "composer/composer",
-            "version": "1.10.7",
+            "version": "1.10.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/composer.git",
-                "reference": "956608ea4f7de9e58c53dfb019d85ae62b193c39"
+                "reference": "83c3250093d5491600a822e176b107a945baf95a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/956608ea4f7de9e58c53dfb019d85ae62b193c39",
-                "reference": "956608ea4f7de9e58c53dfb019d85ae62b193c39",
+                "url": "https://api.github.com/repos/composer/composer/zipball/83c3250093d5491600a822e176b107a945baf95a",
+                "reference": "83c3250093d5491600a822e176b107a945baf95a",
                 "shasum": ""
             },
             "require": {
@@ -238,12 +248,11 @@
                 "symfony/process": "^2.7 || ^3.0 || ^4.0 || ^5.0"
             },
             "conflict": {
-                "symfony/console": "2.8.38",
-                "symfony/phpunit-bridge": "3.4.40"
+                "symfony/console": "2.8.38"
             },
             "require-dev": {
                 "phpspec/prophecy": "^1.10",
-                "symfony/phpunit-bridge": "^3.4"
+                "symfony/phpunit-bridge": "^4.2"
             },
             "suggest": {
                 "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
@@ -287,7 +296,21 @@
                 "dependency",
                 "package"
             ],
-            "time": "2020-06-03T08:03:56+00:00"
+            "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"
         },
         {
             "name": "composer/semver",
@@ -352,16 +375,16 @@
         },
         {
             "name": "composer/spdx-licenses",
-            "version": "1.5.3",
+            "version": "1.5.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/spdx-licenses.git",
-                "reference": "0c3e51e1880ca149682332770e25977c70cf9dae"
+                "reference": "6946f785871e2314c60b4524851f3702ea4f2223"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/0c3e51e1880ca149682332770e25977c70cf9dae",
-                "reference": "0c3e51e1880ca149682332770e25977c70cf9dae",
+                "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/6946f785871e2314c60b4524851f3702ea4f2223",
+                "reference": "6946f785871e2314c60b4524851f3702ea4f2223",
                 "shasum": ""
             },
             "require": {
@@ -408,7 +431,21 @@
                 "spdx",
                 "validator"
             ],
-            "time": "2020-02-14T07:44:31+00:00"
+            "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",
@@ -452,6 +489,20 @@
                 "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"
         },
         {
@@ -652,16 +703,16 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "6.5.4",
+            "version": "6.5.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "a4a1b6930528a8f7ee03518e6442ec7a44155d9d"
+                "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/a4a1b6930528a8f7ee03518e6442ec7a44155d9d",
-                "reference": "a4a1b6930528a8f7ee03518e6442ec7a44155d9d",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
+                "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
                 "shasum": ""
             },
             "require": {
@@ -669,7 +720,7 @@
                 "guzzlehttp/promises": "^1.0",
                 "guzzlehttp/psr7": "^1.6.1",
                 "php": ">=5.5",
-                "symfony/polyfill-intl-idn": "1.17.0"
+                "symfony/polyfill-intl-idn": "^1.17.0"
             },
             "require-dev": {
                 "ext-curl": "*",
@@ -715,7 +766,7 @@
                 "rest",
                 "web service"
             ],
-            "time": "2020-05-25T19:35:05+00:00"
+            "time": "2020-06-16T21:01:06+00:00"
         },
         {
             "name": "guzzlehttp/promises",
@@ -1305,6 +1356,12 @@
                 "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"
         },
         {
@@ -1678,16 +1735,16 @@
         },
         {
             "name": "laminas/laminas-form",
-            "version": "2.14.5",
+            "version": "2.15.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-form.git",
-                "reference": "3e22e09751cf6ae031be87a44e092e7925ce5b7b"
+                "reference": "359cd372c565e18a17f32ccfeacdf21bba091ce2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-form/zipball/3e22e09751cf6ae031be87a44e092e7925ce5b7b",
-                "reference": "3e22e09751cf6ae031be87a44e092e7925ce5b7b",
+                "url": "https://api.github.com/repos/laminas/laminas-form/zipball/359cd372c565e18a17f32ccfeacdf21bba091ce2",
+                "reference": "359cd372c565e18a17f32ccfeacdf21bba091ce2",
                 "shasum": ""
             },
             "require": {
@@ -1730,8 +1787,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.14.x-dev",
-                    "dev-develop": "2.15.x-dev"
+                    "dev-master": "2.15.x-dev",
+                    "dev-develop": "2.16.x-dev"
                 },
                 "laminas": {
                     "component": "Laminas\\Form",
@@ -1756,20 +1813,26 @@
                 "form",
                 "laminas"
             ],
-            "time": "2020-03-29T12:46:16+00:00"
+            "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.11.2",
+            "version": "2.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-http.git",
-                "reference": "8c66963b933c80da59433da56a44dfa979f3ec88"
+                "reference": "48bd06ffa3a6875e2b77d6852405eb7b1589d575"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-http/zipball/8c66963b933c80da59433da56a44dfa979f3ec88",
-                "reference": "8c66963b933c80da59433da56a44dfa979f3ec88",
+                "url": "https://api.github.com/repos/laminas/laminas-http/zipball/48bd06ffa3a6875e2b77d6852405eb7b1589d575",
+                "reference": "48bd06ffa3a6875e2b77d6852405eb7b1589d575",
                 "shasum": ""
             },
             "require": {
@@ -1781,7 +1844,7 @@
                 "php": "^5.6 || ^7.0"
             },
             "replace": {
-                "zendframework/zend-http": "self.version"
+                "zendframework/zend-http": "^2.11.2"
             },
             "require-dev": {
                 "laminas/laminas-coding-standard": "~1.0.0",
@@ -1794,8 +1857,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.11.x-dev",
-                    "dev-develop": "2.12.x-dev"
+                    "dev-master": "2.12.x-dev",
+                    "dev-develop": "2.13.x-dev"
                 }
             },
             "autoload": {
@@ -1814,7 +1877,13 @@
                 "http client",
                 "laminas"
             ],
-            "time": "2019-12-31T17:02:36+00:00"
+            "funding": [
+                {
+                    "url": "https://funding.communitybridge.org/projects/laminas-project",
+                    "type": "community_bridge"
+                }
+            ],
+            "time": "2020-06-23T15:14:37+00:00"
         },
         {
             "name": "laminas/laminas-hydrator",
@@ -2200,16 +2269,16 @@
         },
         {
             "name": "laminas/laminas-mail",
-            "version": "2.10.1",
+            "version": "2.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-mail.git",
-                "reference": "cfe0711446c8d9c392e9fc664c9ccc180fa89005"
+                "reference": "4c5545637eea3dc745668ddff1028692ed004c4b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-mail/zipball/cfe0711446c8d9c392e9fc664c9ccc180fa89005",
-                "reference": "cfe0711446c8d9c392e9fc664c9ccc180fa89005",
+                "url": "https://api.github.com/repos/laminas/laminas-mail/zipball/4c5545637eea3dc745668ddff1028692ed004c4b",
+                "reference": "4c5545637eea3dc745668ddff1028692ed004c4b",
                 "shasum": ""
             },
             "require": {
@@ -2239,8 +2308,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.10.x-dev",
-                    "dev-develop": "2.11.x-dev"
+                    "dev-master": "2.11.x-dev",
+                    "dev-develop": "2.12.x-dev"
                 },
                 "laminas": {
                     "component": "Laminas\\Mail",
@@ -2262,7 +2331,13 @@
                 "laminas",
                 "mail"
             ],
-            "time": "2020-04-21T16:42:19+00:00"
+            "funding": [
+                {
+                    "url": "https://funding.communitybridge.org/projects/laminas-project",
+                    "type": "community_bridge"
+                }
+            ],
+            "time": "2020-06-30T20:17:23+00:00"
         },
         {
             "name": "laminas/laminas-math",
@@ -3254,6 +3329,12 @@
                 "laminas",
                 "zf"
             ],
+            "funding": [
+                {
+                    "url": "https://funding.communitybridge.org/projects/laminas-project",
+                    "type": "community_bridge"
+                }
+            ],
             "time": "2020-05-20T16:45:56+00:00"
         },
         {
@@ -3493,6 +3574,16 @@
                 "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"
         },
         {
@@ -3820,16 +3911,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "2.0.27",
+            "version": "2.0.28",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc"
+                "reference": "d1ca58cf33cb21046d702ae3a7b14fdacd9f3260"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc",
-                "reference": "34620af4df7d1988d8f0d7e91f6c8a3bf931d8dc",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/d1ca58cf33cb21046d702ae3a7b14fdacd9f3260",
+                "reference": "d1ca58cf33cb21046d702ae3a7b14fdacd9f3260",
                 "shasum": ""
             },
             "require": {
@@ -3908,7 +3999,21 @@
                 "x.509",
                 "x509"
             ],
-            "time": "2020-04-04T23:17:33+00:00"
+            "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"
         },
         {
             "name": "psr/container",
@@ -4271,20 +4376,30 @@
                 "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"
         },
         {
             "name": "seld/phar-utils",
-            "version": "1.1.0",
+            "version": "1.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/phar-utils.git",
-                "reference": "8800503d56b9867d43d9c303b9cbcc26016e82f0"
+                "reference": "8674b1d84ffb47cc59a101f5d5a3b61e87d23796"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/8800503d56b9867d43d9c303b9cbcc26016e82f0",
-                "reference": "8800503d56b9867d43d9c303b9cbcc26016e82f0",
+                "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/8674b1d84ffb47cc59a101f5d5a3b61e87d23796",
+                "reference": "8674b1d84ffb47cc59a101f5d5a3b61e87d23796",
                 "shasum": ""
             },
             "require": {
@@ -4315,11 +4430,11 @@
             "keywords": [
                 "phar"
             ],
-            "time": "2020-02-14T15:25:33+00:00"
+            "time": "2020-07-07T18:42:57+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v4.4.9",
+            "version": "v4.4.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
@@ -4392,11 +4507,25 @@
             ],
             "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"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v5.1.0",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
@@ -4445,11 +4574,25 @@
             ],
             "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.9",
+            "version": "v4.4.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
@@ -4515,24 +4658,38 @@
             ],
             "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"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v1.1.7",
+            "version": "v1.1.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18"
+                "reference": "84e23fdcd2517bf37aecbd16967e83f0caee25a7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c43ab685673fb6c8d84220c77897b1d6cdbe1d18",
-                "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/84e23fdcd2517bf37aecbd16967e83f0caee25a7",
+                "reference": "84e23fdcd2517bf37aecbd16967e83f0caee25a7",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3"
+                "php": ">=7.1.3"
             },
             "suggest": {
                 "psr/event-dispatcher": "",
@@ -4542,6 +4699,10 @@
             "extra": {
                 "branch-alias": {
                     "dev-master": "1.1-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -4573,11 +4734,25 @@
                 "interoperability",
                 "standards"
             ],
-            "time": "2019-09-17T09:54:03+00:00"
+            "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.0",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
@@ -4623,11 +4798,25 @@
             ],
             "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"
         },
         {
             "name": "symfony/finder",
-            "version": "v5.1.0",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
@@ -4672,20 +4861,34 @@
             ],
             "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"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.17.0",
+            "version": "v1.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9"
+                "reference": "1c302646f6efc070cd46856e600e5e0684d6b454"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
-                "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/1c302646f6efc070cd46856e600e5e0684d6b454",
+                "reference": "1c302646f6efc070cd46856e600e5e0684d6b454",
                 "shasum": ""
             },
             "require": {
@@ -4697,7 +4900,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.17-dev"
+                    "dev-master": "1.18-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -4730,25 +4937,40 @@
                 "polyfill",
                 "portable"
             ],
-            "time": "2020-05-12T16:14:59+00:00"
+            "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"
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.17.0",
+            "version": "v1.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a"
+                "reference": "bc6549d068d0160e0f10f7a5a23c7d1406b95ebe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3bff59ea7047e925be6b7f2059d60af31bb46d6a",
-                "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/bc6549d068d0160e0f10f7a5a23c7d1406b95ebe",
+                "reference": "bc6549d068d0160e0f10f7a5a23c7d1406b95ebe",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3",
-                "symfony/polyfill-mbstring": "^1.3",
+                "symfony/polyfill-intl-normalizer": "^1.10",
+                "symfony/polyfill-php70": "^1.10",
                 "symfony/polyfill-php72": "^1.10"
             },
             "suggest": {
@@ -4757,7 +4979,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.17-dev"
+                    "dev-master": "1.18-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -4777,6 +5003,10 @@
                     "name": "Laurent Bassin",
                     "email": "laurent@bassin.info"
                 },
+                {
+                    "name": "Trevor Rowbotham",
+                    "email": "trevor.rowbotham@pm.me"
+                },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
@@ -4792,40 +5022,61 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-05-12T16:47:27+00:00"
+            "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"
         },
         {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.17.0",
+            "name": "symfony/polyfill-intl-normalizer",
+            "version": "v1.18.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "fa79b11539418b02fc5e1897267673ba2c19419c"
+                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
+                "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fa79b11539418b02fc5e1897267673ba2c19419c",
-                "reference": "fa79b11539418b02fc5e1897267673ba2c19419c",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e",
+                "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
             "suggest": {
-                "ext-mbstring": "For best performance"
+                "ext-intl": "For best performance"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.17-dev"
+                    "dev-master": "1.18-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
+                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
                 },
                 "files": [
                     "bootstrap.php"
+                ],
+                "classmap": [
+                    "Resources/stubs"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -4842,43 +5093,65 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill for the Mbstring extension",
+            "description": "Symfony polyfill for intl's Normalizer class and related functions",
             "homepage": "https://symfony.com",
             "keywords": [
                 "compatibility",
-                "mbstring",
+                "intl",
+                "normalizer",
                 "polyfill",
                 "portable",
                 "shim"
             ],
-            "time": "2020-05-12T16:47:27+00:00"
+            "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"
         },
         {
-            "name": "symfony/polyfill-php72",
-            "version": "v1.17.0",
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.18.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "f048e612a3905f34931127360bdd2def19a5e582"
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/f048e612a3905f34931127360bdd2def19a5e582",
-                "reference": "f048e612a3905f34931127360bdd2def19a5e582",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/a6977d63bf9a0ad4c65cd352709e230876f9904a",
+                "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.17-dev"
+                    "dev-master": "1.18-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Polyfill\\Php72\\": ""
+                    "Symfony\\Polyfill\\Mbstring\\": ""
                 },
                 "files": [
                     "bootstrap.php"
@@ -4898,42 +5171,62 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
+            "description": "Symfony polyfill for the Mbstring extension",
             "homepage": "https://symfony.com",
             "keywords": [
                 "compatibility",
+                "mbstring",
                 "polyfill",
                 "portable",
                 "shim"
             ],
-            "time": "2020-05-12T16:47:27+00:00"
+            "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"
         },
         {
-            "name": "symfony/polyfill-php73",
-            "version": "v1.17.0",
+            "name": "symfony/polyfill-php70",
+            "version": "v1.18.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "a760d8964ff79ab9bf057613a5808284ec852ccc"
+                "url": "https://github.com/symfony/polyfill-php70.git",
+                "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a760d8964ff79ab9bf057613a5808284ec852ccc",
-                "reference": "a760d8964ff79ab9bf057613a5808284ec852ccc",
+                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/0dd93f2c578bdc9c72697eaa5f1dd25644e618d3",
+                "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3",
                 "shasum": ""
             },
             "require": {
+                "paragonie/random_compat": "~1.0|~2.0|~9.99",
                 "php": ">=5.3.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.17-dev"
+                    "dev-master": "1.18-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Polyfill\\Php73\\": ""
+                    "Symfony\\Polyfill\\Php70\\": ""
                 },
                 "files": [
                     "bootstrap.php"
@@ -4956,7 +5249,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions",
+            "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
             "homepage": "https://symfony.com",
             "keywords": [
                 "compatibility",
@@ -4964,40 +5257,55 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-05-12T16:47:27+00:00"
+            "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"
         },
         {
-            "name": "symfony/polyfill-php80",
-            "version": "v1.17.0",
+            "name": "symfony/polyfill-php72",
+            "version": "v1.18.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "5e30b2799bc1ad68f7feb62b60a73743589438dd"
+                "url": "https://github.com/symfony/polyfill-php72.git",
+                "reference": "639447d008615574653fb3bc60d1986d7172eaae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/5e30b2799bc1ad68f7feb62b60a73743589438dd",
-                "reference": "5e30b2799bc1ad68f7feb62b60a73743589438dd",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/639447d008615574653fb3bc60d1986d7172eaae",
+                "reference": "639447d008615574653fb3bc60d1986d7172eaae",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0.8"
+                "php": ">=5.3.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.17-dev"
+                    "dev-master": "1.18-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Polyfill\\Php80\\": ""
+                    "Symfony\\Polyfill\\Php72\\": ""
                 },
                 "files": [
                     "bootstrap.php"
-                ],
-                "classmap": [
-                    "Resources/stubs"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -5005,10 +5313,6 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Ion Bazan",
-                    "email": "ion.bazan@gmail.com"
-                },
                 {
                     "name": "Nicolas Grekas",
                     "email": "p@tchwork.com"
@@ -5018,7 +5322,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
+            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
             "homepage": "https://symfony.com",
             "keywords": [
                 "compatibility",
@@ -5026,37 +5330,58 @@
                 "portable",
                 "shim"
             ],
-            "time": "2020-05-12T16:47:27+00:00"
+            "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"
         },
         {
-            "name": "symfony/process",
-            "version": "v4.4.9",
+            "name": "symfony/polyfill-php73",
+            "version": "v1.18.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/process.git",
-                "reference": "c714958428a85c86ab97e3a0c96db4c4f381b7f5"
+                "url": "https://github.com/symfony/polyfill-php73.git",
+                "reference": "fffa1a52a023e782cdcc221d781fe1ec8f87fcca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/c714958428a85c86ab97e3a0c96db4c4f381b7f5",
-                "reference": "c714958428a85c86ab97e3a0c96db4c4f381b7f5",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fffa1a52a023e782cdcc221d781fe1ec8f87fcca",
+                "reference": "fffa1a52a023e782cdcc221d781fe1ec8f87fcca",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3"
+                "php": ">=5.3.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.4-dev"
+                    "dev-master": "1.18-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Component\\Process\\": ""
+                    "Symfony\\Polyfill\\Php73\\": ""
                 },
-                "exclude-from-classmap": [
-                    "/Tests/"
+                "files": [
+                    "bootstrap.php"
+                ],
+                "classmap": [
+                    "Resources/stubs"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -5065,30 +5390,193 @@
             ],
             "authors": [
                 {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
                 },
                 {
                     "name": "Symfony Community",
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony Process Component",
+            "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions",
             "homepage": "https://symfony.com",
-            "time": "2020-05-30T20:06:45+00:00"
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "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"
         },
         {
-            "name": "symfony/service-contracts",
-            "version": "v2.1.2",
+            "name": "symfony/polyfill-php80",
+            "version": "v1.18.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "66a8f0957a3ca54e4f724e49028ab19d75a8918b"
+                "url": "https://github.com/symfony/polyfill-php80.git",
+                "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/66a8f0957a3ca54e4f724e49028ab19d75a8918b",
-                "reference": "66a8f0957a3ca54e4f724e49028ab19d75a8918b",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/d87d5766cbf48d72388a9f6b85f280c8ad51f981",
+                "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0.8"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.18-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ],
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ion Bazan",
+                    "email": "ion.bazan@gmail.com"
+                },
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "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"
+        },
+        {
+            "name": "symfony/process",
+            "version": "v4.4.10",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/process.git",
+                "reference": "c714958428a85c86ab97e3a0c96db4c4f381b7f5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/process/zipball/c714958428a85c86ab97e3a0c96db4c4f381b7f5",
+                "reference": "c714958428a85c86ab97e3a0c96db4c4f381b7f5",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Process\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "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"
+        },
+        {
+            "name": "symfony/service-contracts",
+            "version": "v2.1.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/service-contracts.git",
+                "reference": "58c7475e5457c5492c26cc740cc0ad7464be9442"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/58c7475e5457c5492c26cc740cc0ad7464be9442",
+                "reference": "58c7475e5457c5492c26cc740cc0ad7464be9442",
                 "shasum": ""
             },
             "require": {
@@ -5102,6 +5590,10 @@
             "extra": {
                 "branch-alias": {
                     "dev-master": "2.1-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -5133,7 +5625,21 @@
                 "interoperability",
                 "standards"
             ],
-            "time": "2020-05-20T17:43:50+00:00"
+            "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"
         },
         {
             "name": "tedivm/jshrink",
@@ -5282,16 +5788,16 @@
         },
         {
             "name": "webonyx/graphql-php",
-            "version": "v0.13.8",
+            "version": "v0.13.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webonyx/graphql-php.git",
-                "reference": "6829ae58f4c59121df1f86915fb9917a2ec595e8"
+                "reference": "d9a94fddcad0a35d4bced212b8a44ad1bc59bdf3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/6829ae58f4c59121df1f86915fb9917a2ec595e8",
-                "reference": "6829ae58f4c59121df1f86915fb9917a2ec595e8",
+                "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/d9a94fddcad0a35d4bced212b8a44ad1bc59bdf3",
+                "reference": "d9a94fddcad0a35d4bced212b8a44ad1bc59bdf3",
                 "shasum": ""
             },
             "require": {
@@ -5330,7 +5836,13 @@
                 "api",
                 "graphql"
             ],
-            "time": "2019-08-25T10:32:47+00:00"
+            "funding": [
+                {
+                    "url": "https://opencollective.com/webonyx-graphql-php",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2020-07-02T05:49:25+00:00"
         },
         {
             "name": "wikimedia/less.php",
@@ -5551,16 +6063,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.141.0",
+            "version": "3.147.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "d57dbde176a7db7a6131bb5d325aff63515eabc3"
+                "reference": "8a561a4a1645ccdd06413a4f2defe55d35e0eecc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/d57dbde176a7db7a6131bb5d325aff63515eabc3",
-                "reference": "d57dbde176a7db7a6131bb5d325aff63515eabc3",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/8a561a4a1645ccdd06413a4f2defe55d35e0eecc",
+                "reference": "8a561a4a1645ccdd06413a4f2defe55d35e0eecc",
                 "shasum": ""
             },
             "require": {
@@ -5583,6 +6095,7 @@
                 "ext-pcntl": "*",
                 "ext-sockets": "*",
                 "nette/neon": "^2.3",
+                "paragonie/random_compat": ">= 2",
                 "phpunit/phpunit": "^4.8.35|^5.4.3",
                 "psr/cache": "^1.0",
                 "psr/simple-cache": "^1.0",
@@ -5631,7 +6144,7 @@
                 "s3",
                 "sdk"
             ],
-            "time": "2020-06-10T18:11:38+00:00"
+            "time": "2020-07-20T18:18:31+00:00"
         },
         {
             "name": "beberlei/assert",
@@ -5930,6 +6443,12 @@
                 "functional testing",
                 "unit testing"
             ],
+            "funding": [
+                {
+                    "url": "https://opencollective.com/codeception",
+                    "type": "open_collective"
+                }
+            ],
             "time": "2020-06-07T16:31:51+00:00"
         },
         {
@@ -6173,16 +6692,16 @@
         },
         {
             "name": "codeception/stub",
-            "version": "3.6.1",
+            "version": "3.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/Stub.git",
-                "reference": "a3ba01414cbee76a1bced9f9b6b169cc8d203880"
+                "reference": "468dd5fe659f131fc997f5196aad87512f9b1304"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Stub/zipball/a3ba01414cbee76a1bced9f9b6b169cc8d203880",
-                "reference": "a3ba01414cbee76a1bced9f9b6b169cc8d203880",
+                "url": "https://api.github.com/repos/Codeception/Stub/zipball/468dd5fe659f131fc997f5196aad87512f9b1304",
+                "reference": "468dd5fe659f131fc997f5196aad87512f9b1304",
                 "shasum": ""
             },
             "require": {
@@ -6199,7 +6718,7 @@
                 "MIT"
             ],
             "description": "Flexible Stub wrapper for PHPUnit's Mock Builder",
-            "time": "2020-02-07T18:42:28+00:00"
+            "time": "2020-07-03T15:54:43+00:00"
         },
         {
             "name": "csharpru/vault-php",
@@ -6424,16 +6943,16 @@
         },
         {
             "name": "doctrine/cache",
-            "version": "1.10.1",
+            "version": "1.10.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/cache.git",
-                "reference": "35a4a70cd94e09e2259dfae7488afc6b474ecbd3"
+                "reference": "13e3381b25847283a91948d04640543941309727"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/cache/zipball/35a4a70cd94e09e2259dfae7488afc6b474ecbd3",
-                "reference": "35a4a70cd94e09e2259dfae7488afc6b474ecbd3",
+                "url": "https://api.github.com/repos/doctrine/cache/zipball/13e3381b25847283a91948d04640543941309727",
+                "reference": "13e3381b25847283a91948d04640543941309727",
                 "shasum": ""
             },
             "require": {
@@ -6502,7 +7021,21 @@
                 "redis",
                 "xcache"
             ],
-            "time": "2020-05-27T16:24:54+00:00"
+            "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"
         },
         {
             "name": "doctrine/inflector",
@@ -6625,6 +7158,20 @@
                 "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"
         },
         {
@@ -6687,20 +7234,34 @@
                 "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"
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v2.16.3",
+            "version": "v2.16.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-                "reference": "83baf823a33a1cbd5416c8626935cf3f843c10b0"
+                "reference": "1023c3458137ab052f6ff1e09621a721bfdeca13"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/83baf823a33a1cbd5416c8626935cf3f843c10b0",
-                "reference": "83baf823a33a1cbd5416c8626935cf3f843c10b0",
+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/1023c3458137ab052f6ff1e09621a721bfdeca13",
+                "reference": "1023c3458137ab052f6ff1e09621a721bfdeca13",
                 "shasum": ""
             },
             "require": {
@@ -6732,12 +7293,12 @@
                 "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.1",
                 "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.1",
                 "phpunitgoodpractices/traits": "^1.8",
-                "symfony/phpunit-bridge": "^4.3 || ^5.0",
+                "symfony/phpunit-bridge": "^5.1",
                 "symfony/yaml": "^3.0 || ^4.0 || ^5.0"
             },
             "suggest": {
                 "ext-dom": "For handling output formats in XML",
-                "ext-mbstring": "For handling non-UTF8 characters in cache signature.",
+                "ext-mbstring": "For handling non-UTF8 characters.",
                 "php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.",
                 "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.",
                 "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible."
@@ -6778,7 +7339,13 @@
                 }
             ],
             "description": "A tool to automatically fix PHP code style",
-            "time": "2020-04-15T18:51:10+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/keradus",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-27T23:57:46+00:00"
         },
         {
             "name": "jms/metadata",
@@ -7036,6 +7603,12 @@
                 "sftp",
                 "storage"
             ],
+            "funding": [
+                {
+                    "url": "https://offset.earth/frankdejonge",
+                    "type": "other"
+                }
+            ],
             "time": "2020-05-18T15:13:39+00:00"
         },
         {
@@ -7385,20 +7958,20 @@
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.9.5",
+            "version": "1.10.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef"
+                "reference": "969b211f9a51aa1f6c01d1d2aef56d3bd91598e5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/b2c28789e80a97badd14145fda39b545d83ca3ef",
-                "reference": "b2c28789e80a97badd14145fda39b545d83ca3ef",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/969b211f9a51aa1f6c01d1d2aef56d3bd91598e5",
+                "reference": "969b211f9a51aa1f6c01d1d2aef56d3bd91598e5",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1"
+                "php": "^7.1 || ^8.0"
             },
             "replace": {
                 "myclabs/deep-copy": "self.version"
@@ -7429,7 +8002,13 @@
                 "object",
                 "object graph"
             ],
-            "time": "2020-01-17T21:11:47+00:00"
+            "funding": [
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-06-29T13:22:24+00:00"
         },
         {
             "name": "paragonie/constant_time_encoding",
@@ -7866,25 +8445,25 @@
         },
         {
             "name": "phpdocumentor/reflection-common",
-            "version": "2.1.0",
+            "version": "2.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b"
+                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/6568f4687e5b41b054365f9ae03fcb1ed5f2069b",
-                "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
+                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.x-dev"
+                    "dev-2.x": "2.x-dev"
                 }
             },
             "autoload": {
@@ -7911,32 +8490,31 @@
                 "reflection",
                 "static analysis"
             ],
-            "time": "2020-04-27T09:25:28+00:00"
+            "time": "2020-06-27T09:03:43+00:00"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "5.1.0",
+            "version": "5.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e"
+                "reference": "3170448f5769fe19f456173d833734e0ff1b84df"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e",
-                "reference": "cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/3170448f5769fe19f456173d833734e0ff1b84df",
+                "reference": "3170448f5769fe19f456173d833734e0ff1b84df",
                 "shasum": ""
             },
             "require": {
-                "ext-filter": "^7.1",
-                "php": "^7.2",
-                "phpdocumentor/reflection-common": "^2.0",
-                "phpdocumentor/type-resolver": "^1.0",
-                "webmozart/assert": "^1"
+                "ext-filter": "*",
+                "php": "^7.2 || ^8.0",
+                "phpdocumentor/reflection-common": "^2.2",
+                "phpdocumentor/type-resolver": "^1.3",
+                "webmozart/assert": "^1.9.1"
             },
             "require-dev": {
-                "doctrine/instantiator": "^1",
-                "mockery/mockery": "^1"
+                "mockery/mockery": "~1.3.2"
             },
             "type": "library",
             "extra": {
@@ -7964,34 +8542,33 @@
                 }
             ],
             "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-02-22T12:28:44+00:00"
+            "time": "2020-07-20T20:05:34+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.1.0",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "7462d5f123dfc080dfdf26897032a6513644fc95"
+                "reference": "e878a14a65245fbe78f8080eba03b47c3b705651"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/7462d5f123dfc080dfdf26897032a6513644fc95",
-                "reference": "7462d5f123dfc080dfdf26897032a6513644fc95",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e878a14a65245fbe78f8080eba03b47c3b705651",
+                "reference": "e878a14a65245fbe78f8080eba03b47c3b705651",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2",
+                "php": "^7.2 || ^8.0",
                 "phpdocumentor/reflection-common": "^2.0"
             },
             "require-dev": {
-                "ext-tokenizer": "^7.2",
-                "mockery/mockery": "~1"
+                "ext-tokenizer": "*"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.x-dev"
+                    "dev-1.x": "1.x-dev"
                 }
             },
             "autoload": {
@@ -8010,7 +8587,7 @@
                 }
             ],
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
-            "time": "2020-02-18T18:59:58+00:00"
+            "time": "2020-06-27T10:12:23+00:00"
         },
         {
             "name": "phpmd/phpmd",
@@ -8084,24 +8661,24 @@
         },
         {
             "name": "phpoption/phpoption",
-            "version": "1.7.4",
+            "version": "1.7.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/schmittjoh/php-option.git",
-                "reference": "b2ada2ad5d8a32b89088b8adc31ecd2e3a13baf3"
+                "reference": "994ecccd8f3283ecf5ac33254543eb0ac946d525"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/b2ada2ad5d8a32b89088b8adc31ecd2e3a13baf3",
-                "reference": "b2ada2ad5d8a32b89088b8adc31ecd2e3a13baf3",
+                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/994ecccd8f3283ecf5ac33254543eb0ac946d525",
+                "reference": "994ecccd8f3283ecf5ac33254543eb0ac946d525",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.5.9 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.3",
-                "phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0 || ^7.0"
+                "bamarni/composer-bin-plugin": "^1.4.1",
+                "phpunit/phpunit": "^4.8.35 || ^5.7.27 || ^6.5.6 || ^7.0 || ^8.0 || ^9.0"
             },
             "type": "library",
             "extra": {
@@ -8135,37 +8712,47 @@
                 "php",
                 "type"
             ],
-            "time": "2020-06-07T10:40:07+00:00"
+            "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": "v1.10.3",
+            "version": "1.11.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "451c3cd1418cf640de218914901e51b064abb093"
+                "reference": "b20034be5efcdab4fb60ca3a29cba2949aead160"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/451c3cd1418cf640de218914901e51b064abb093",
-                "reference": "451c3cd1418cf640de218914901e51b064abb093",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/b20034be5efcdab4fb60ca3a29cba2949aead160",
+                "reference": "b20034be5efcdab4fb60ca3a29cba2949aead160",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0",
-                "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0",
-                "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0"
+                "doctrine/instantiator": "^1.2",
+                "php": "^7.2",
+                "phpdocumentor/reflection-docblock": "^5.0",
+                "sebastian/comparator": "^3.0 || ^4.0",
+                "sebastian/recursion-context": "^3.0 || ^4.0"
             },
             "require-dev": {
-                "phpspec/phpspec": "^2.5 || ^3.2",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
+                "phpspec/phpspec": "^6.0",
+                "phpunit/phpunit": "^8.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.10.x-dev"
+                    "dev-master": "1.11.x-dev"
                 }
             },
             "autoload": {
@@ -8198,7 +8785,7 @@
                 "spy",
                 "stub"
             ],
-            "time": "2020-03-05T15:02:03+00:00"
+            "time": "2020-07-08T12:44:21+00:00"
         },
         {
             "name": "phpstan/phpstan",
@@ -8240,6 +8827,20 @@
                 "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"
         },
         {
@@ -8304,24 +8905,30 @@
                 "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.1",
+            "version": "3.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "4ac5b3e13df14829daa60a2eb4fdd2f2b7d33cf4"
+                "reference": "25fefc5b19835ca653877fe081644a3f8c1d915e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/4ac5b3e13df14829daa60a2eb4fdd2f2b7d33cf4",
-                "reference": "4ac5b3e13df14829daa60a2eb4fdd2f2b7d33cf4",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/25fefc5b19835ca653877fe081644a3f8c1d915e",
+                "reference": "25fefc5b19835ca653877fe081644a3f8c1d915e",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3"
+                "php": "^7.3 || ^8.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.0"
@@ -8354,24 +8961,30 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2020-04-18T05:02:12+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-07-11T05:18:21+00:00"
         },
         {
             "name": "phpunit/php-invoker",
-            "version": "3.0.0",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-invoker.git",
-                "reference": "7579d5a1ba7f3ac11c80004d205877911315ae7a"
+                "reference": "f6eedfed1085dd1f4c599629459a0277d25f9a66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/7579d5a1ba7f3ac11c80004d205877911315ae7a",
-                "reference": "7579d5a1ba7f3ac11c80004d205877911315ae7a",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/f6eedfed1085dd1f4c599629459a0277d25f9a66",
+                "reference": "f6eedfed1085dd1f4c599629459a0277d25f9a66",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3"
+                "php": "^7.3 || ^8.0"
             },
             "require-dev": {
                 "ext-pcntl": "*",
@@ -8407,24 +9020,33 @@
             "keywords": [
                 "process"
             ],
-            "time": "2020-02-07T06:06:11+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-26T11:53:53+00:00"
         },
         {
             "name": "phpunit/php-text-template",
-            "version": "2.0.0",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "526dc996cc0ebdfa428cd2dfccd79b7b53fee346"
+                "reference": "6ff9c8ea4d3212b88fcf74e25e516e2c51c99324"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/526dc996cc0ebdfa428cd2dfccd79b7b53fee346",
-                "reference": "526dc996cc0ebdfa428cd2dfccd79b7b53fee346",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/6ff9c8ea4d3212b88fcf74e25e516e2c51c99324",
+                "reference": "6ff9c8ea4d3212b88fcf74e25e516e2c51c99324",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3"
+                "php": "^7.3 || ^8.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.0"
             },
             "type": "library",
             "extra": {
@@ -8453,7 +9075,13 @@
             "keywords": [
                 "template"
             ],
-            "time": "2020-02-01T07:43:44+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-26T11:55:37+00:00"
         },
         {
             "name": "phpunit/php-timer",
@@ -8502,25 +9130,31 @@
             "keywords": [
                 "timer"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-04-20T06:00:37+00:00"
         },
         {
             "name": "phpunit/php-token-stream",
-            "version": "4.0.1",
+            "version": "4.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "cdc0db5aed8fbfaf475fbd95bfd7bab83c7a779c"
+                "reference": "5672711b6b07b14d5ab694e700c62eeb82fcf374"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/cdc0db5aed8fbfaf475fbd95bfd7bab83c7a779c",
-                "reference": "cdc0db5aed8fbfaf475fbd95bfd7bab83c7a779c",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/5672711b6b07b14d5ab694e700c62eeb82fcf374",
+                "reference": "5672711b6b07b14d5ab694e700c62eeb82fcf374",
                 "shasum": ""
             },
             "require": {
                 "ext-tokenizer": "*",
-                "php": "^7.3"
+                "php": "^7.3 || ^8.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.0"
@@ -8551,7 +9185,13 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2020-05-06T09:56:31+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-27T06:36:25+00:00"
         },
         {
             "name": "phpunit/phpunit",
@@ -8639,6 +9279,16 @@
                 "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"
         },
         {
@@ -8737,20 +9387,20 @@
         },
         {
             "name": "sebastian/code-unit",
-            "version": "1.0.2",
+            "version": "1.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit.git",
-                "reference": "ac958085bc19fcd1d36425c781ef4cbb5b06e2a5"
+                "reference": "c1e2df332c905079980b119c4db103117e5e5c90"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/ac958085bc19fcd1d36425c781ef4cbb5b06e2a5",
-                "reference": "ac958085bc19fcd1d36425c781ef4cbb5b06e2a5",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/c1e2df332c905079980b119c4db103117e5e5c90",
+                "reference": "c1e2df332c905079980b119c4db103117e5e5c90",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3"
+                "php": "^7.3 || ^8.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.0"
@@ -8779,24 +9429,30 @@
             ],
             "description": "Collection of value objects that represent the PHP code units",
             "homepage": "https://github.com/sebastianbergmann/code-unit",
-            "time": "2020-04-30T05:58:10+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-26T12:50:45+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
-            "version": "2.0.0",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "5b5dbe0044085ac41df47e79d34911a15b96d82e"
+                "reference": "ee51f9bb0c6d8a43337055db3120829fa14da819"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/5b5dbe0044085ac41df47e79d34911a15b96d82e",
-                "reference": "5b5dbe0044085ac41df47e79d34911a15b96d82e",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ee51f9bb0c6d8a43337055db3120829fa14da819",
+                "reference": "ee51f9bb0c6d8a43337055db3120829fa14da819",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3"
+                "php": "^7.3 || ^8.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.0"
@@ -8824,24 +9480,30 @@
             ],
             "description": "Looks up which function or method a line of code belongs to",
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "time": "2020-02-07T06:20:13+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-26T12:04:00+00:00"
         },
         {
             "name": "sebastian/comparator",
-            "version": "4.0.0",
+            "version": "4.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "85b3435da967696ed618ff745f32be3ff4a2b8e8"
+                "reference": "dcc580eadfaa4e7f9d2cf9ae1922134ea962e14f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/85b3435da967696ed618ff745f32be3ff4a2b8e8",
-                "reference": "85b3435da967696ed618ff745f32be3ff4a2b8e8",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/dcc580eadfaa4e7f9d2cf9ae1922134ea962e14f",
+                "reference": "dcc580eadfaa4e7f9d2cf9ae1922134ea962e14f",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3",
+                "php": "^7.3 || ^8.0",
                 "sebastian/diff": "^4.0",
                 "sebastian/exporter": "^4.0"
             },
@@ -8888,24 +9550,30 @@
                 "compare",
                 "equality"
             ],
-            "time": "2020-02-07T06:08:51+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-26T12:05:46+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "4.0.1",
+            "version": "4.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "3e523c576f29dacecff309f35e4cc5a5c168e78a"
+                "reference": "1e90b4cf905a7d06c420b1d2e9d11a4dc8a13113"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3e523c576f29dacecff309f35e4cc5a5c168e78a",
-                "reference": "3e523c576f29dacecff309f35e4cc5a5c168e78a",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/1e90b4cf905a7d06c420b1d2e9d11a4dc8a13113",
+                "reference": "1e90b4cf905a7d06c420b1d2e9d11a4dc8a13113",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3"
+                "php": "^7.3 || ^8.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.0",
@@ -8944,24 +9612,30 @@
                 "unidiff",
                 "unified diff"
             ],
-            "time": "2020-05-08T05:01:12+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-30T04:46:02+00:00"
         },
         {
             "name": "sebastian/environment",
-            "version": "5.1.0",
+            "version": "5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "c753f04d68cd489b6973cf9b4e505e191af3b05c"
+                "reference": "0a757cab9d5b7ef49a619f1143e6c9c1bc0fe9d2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/c753f04d68cd489b6973cf9b4e505e191af3b05c",
-                "reference": "c753f04d68cd489b6973cf9b4e505e191af3b05c",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/0a757cab9d5b7ef49a619f1143e6c9c1bc0fe9d2",
+                "reference": "0a757cab9d5b7ef49a619f1143e6c9c1bc0fe9d2",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3"
+                "php": "^7.3 || ^8.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.0"
@@ -8997,29 +9671,35 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2020-04-14T13:36:52+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-26T12:07:24+00:00"
         },
         {
             "name": "sebastian/exporter",
-            "version": "4.0.0",
+            "version": "4.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "80c26562e964016538f832f305b2286e1ec29566"
+                "reference": "571d721db4aec847a0e59690b954af33ebf9f023"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/80c26562e964016538f832f305b2286e1ec29566",
-                "reference": "80c26562e964016538f832f305b2286e1ec29566",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/571d721db4aec847a0e59690b954af33ebf9f023",
+                "reference": "571d721db4aec847a0e59690b954af33ebf9f023",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3",
+                "php": "^7.3 || ^8.0",
                 "sebastian/recursion-context": "^4.0"
             },
             "require-dev": {
                 "ext-mbstring": "*",
-                "phpunit/phpunit": "^9.0"
+                "phpunit/phpunit": "^9.2"
             },
             "type": "library",
             "extra": {
@@ -9064,7 +9744,13 @@
                 "export",
                 "exporter"
             ],
-            "time": "2020-02-07T06:10:52+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-26T12:08:55+00:00"
         },
         {
             "name": "sebastian/finder-facade",
@@ -9168,20 +9854,20 @@
         },
         {
             "name": "sebastian/object-enumerator",
-            "version": "4.0.0",
+            "version": "4.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "e67516b175550abad905dc952f43285957ef4363"
+                "reference": "074fed2d0a6d08e1677dd8ce9d32aecb384917b8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67516b175550abad905dc952f43285957ef4363",
-                "reference": "e67516b175550abad905dc952f43285957ef4363",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/074fed2d0a6d08e1677dd8ce9d32aecb384917b8",
+                "reference": "074fed2d0a6d08e1677dd8ce9d32aecb384917b8",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3",
+                "php": "^7.3 || ^8.0",
                 "sebastian/object-reflector": "^2.0",
                 "sebastian/recursion-context": "^4.0"
             },
@@ -9211,24 +9897,30 @@
             ],
             "description": "Traverses array structures and object graphs to enumerate all referenced objects",
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-            "time": "2020-02-07T06:12:23+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-26T12:11:32+00:00"
         },
         {
             "name": "sebastian/object-reflector",
-            "version": "2.0.0",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-reflector.git",
-                "reference": "f4fd0835cabb0d4a6546d9fe291e5740037aa1e7"
+                "reference": "127a46f6b057441b201253526f81d5406d6c7840"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/f4fd0835cabb0d4a6546d9fe291e5740037aa1e7",
-                "reference": "f4fd0835cabb0d4a6546d9fe291e5740037aa1e7",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/127a46f6b057441b201253526f81d5406d6c7840",
+                "reference": "127a46f6b057441b201253526f81d5406d6c7840",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3"
+                "php": "^7.3 || ^8.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.0"
@@ -9256,7 +9948,13 @@
             ],
             "description": "Allows reflection of object attributes, including inherited and non-public ones",
             "homepage": "https://github.com/sebastianbergmann/object-reflector/",
-            "time": "2020-02-07T06:19:40+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-26T12:12:55+00:00"
         },
         {
             "name": "sebastian/phpcpd",
@@ -9311,20 +10009,20 @@
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "4.0.0",
+            "version": "4.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "cdd86616411fc3062368b720b0425de10bd3d579"
+                "reference": "062231bf61d2b9448c4fa5a7643b5e1829c11d63"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cdd86616411fc3062368b720b0425de10bd3d579",
-                "reference": "cdd86616411fc3062368b720b0425de10bd3d579",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/062231bf61d2b9448c4fa5a7643b5e1829c11d63",
+                "reference": "062231bf61d2b9448c4fa5a7643b5e1829c11d63",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3"
+                "php": "^7.3 || ^8.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.0"
@@ -9360,24 +10058,30 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2020-02-07T06:18:20+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-26T12:14:17+00:00"
         },
         {
             "name": "sebastian/resource-operations",
-            "version": "3.0.0",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "8c98bf0dfa1f9256d0468b9803a1e1df31b6fa98"
+                "reference": "0653718a5a629b065e91f774595267f8dc32e213"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/8c98bf0dfa1f9256d0468b9803a1e1df31b6fa98",
-                "reference": "8c98bf0dfa1f9256d0468b9803a1e1df31b6fa98",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0653718a5a629b065e91f774595267f8dc32e213",
+                "reference": "0653718a5a629b065e91f774595267f8dc32e213",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3"
+                "php": "^7.3 || ^8.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.0"
@@ -9405,24 +10109,30 @@
             ],
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "time": "2020-02-07T06:13:02+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-26T12:16:22+00:00"
         },
         {
             "name": "sebastian/type",
-            "version": "2.1.0",
+            "version": "2.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "bad49207c6f854e7a25cef0ea948ac8ebe3ef9d8"
+                "reference": "86991e2b33446cd96e648c18bcdb1e95afb2c05a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/bad49207c6f854e7a25cef0ea948ac8ebe3ef9d8",
-                "reference": "bad49207c6f854e7a25cef0ea948ac8ebe3ef9d8",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/86991e2b33446cd96e648c18bcdb1e95afb2c05a",
+                "reference": "86991e2b33446cd96e648c18bcdb1e95afb2c05a",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3"
+                "php": "^7.3 || ^8.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.2"
@@ -9430,7 +10140,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev"
+                    "dev-master": "2.2-dev"
                 }
             },
             "autoload": {
@@ -9451,24 +10161,30 @@
             ],
             "description": "Collection of value objects that represent the types of the PHP type system",
             "homepage": "https://github.com/sebastianbergmann/type",
-            "time": "2020-06-01T12:21:09+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-07-05T08:31:53+00:00"
         },
         {
             "name": "sebastian/version",
-            "version": "3.0.0",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "0411bde656dce64202b39c2f4473993a9081d39e"
+                "reference": "626586115d0ed31cb71483be55beb759b5af5a3c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/0411bde656dce64202b39c2f4473993a9081d39e",
-                "reference": "0411bde656dce64202b39c2f4473993a9081d39e",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/626586115d0ed31cb71483be55beb759b5af5a3c",
+                "reference": "626586115d0ed31cb71483be55beb759b5af5a3c",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3"
+                "php": "^7.3 || ^8.0"
             },
             "type": "library",
             "extra": {
@@ -9494,7 +10210,13 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2020-01-21T06:36:37+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-06-26T12:18:43+00:00"
         },
         {
             "name": "spomky-labs/otphp",
@@ -9620,7 +10342,7 @@
         },
         {
             "name": "symfony/config",
-            "version": "v5.1.0",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
@@ -9682,20 +10404,34 @@
             ],
             "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"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v5.1.0",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "6a6791e9584273b32eeb01790da4c7446d87a621"
+                "reference": "6508423eded583fc07e88a0172803e1a62f0310c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/6a6791e9584273b32eeb01790da4c7446d87a621",
-                "reference": "6a6791e9584273b32eeb01790da4c7446d87a621",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/6508423eded583fc07e88a0172803e1a62f0310c",
+                "reference": "6508423eded583fc07e88a0172803e1a62f0310c",
                 "shasum": ""
             },
             "require": {
@@ -9757,66 +10493,34 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
-            "time": "2020-05-30T20:35:19+00:00"
-        },
-        {
-            "name": "symfony/deprecation-contracts",
-            "version": "v2.1.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337",
-                "reference": "dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.1-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "function.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
+            "funding": [
                 {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
                 },
                 {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
                 }
             ],
-            "description": "A generic function and convention to trigger deprecation notices",
-            "homepage": "https://symfony.com",
-            "time": "2020-05-27T08:34:37+00:00"
+            "time": "2020-06-12T08:11:32+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v2.1.2",
+            "version": "v2.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337"
+                "reference": "5e20b83385a77593259c9f8beb2c43cd03b2ac14"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337",
-                "reference": "dd99cb3a0aff6cadd2a8d7d7ed72c2161e218337",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5e20b83385a77593259c9f8beb2c43cd03b2ac14",
+                "reference": "5e20b83385a77593259c9f8beb2c43cd03b2ac14",
                 "shasum": ""
             },
             "require": {
@@ -9826,6 +10530,10 @@
             "extra": {
                 "branch-alias": {
                     "dev-master": "2.1-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -9849,20 +10557,34 @@
             ],
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
-            "time": "2020-05-27T08:34:37+00:00"
+            "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"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v5.1.0",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "e0d853bddc2b2cfb0d67b0b4496c03fffe1d37fa"
+                "reference": "f93055171b847915225bd5b0a5792888419d8d75"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e0d853bddc2b2cfb0d67b0b4496c03fffe1d37fa",
-                "reference": "e0d853bddc2b2cfb0d67b0b4496c03fffe1d37fa",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/f93055171b847915225bd5b0a5792888419d8d75",
+                "reference": "f93055171b847915225bd5b0a5792888419d8d75",
                 "shasum": ""
             },
             "require": {
@@ -9910,20 +10632,34 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2020-05-24T12:18:07+00:00"
+            "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"
         },
         {
             "name": "symfony/mime",
-            "version": "v5.1.0",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "56261f89385f9d13cf843a5101ac72131190bc91"
+                "reference": "c0c418f05e727606e85b482a8591519c4712cf45"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/56261f89385f9d13cf843a5101ac72131190bc91",
-                "reference": "56261f89385f9d13cf843a5101ac72131190bc91",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/c0c418f05e727606e85b482a8591519c4712cf45",
+                "reference": "c0c418f05e727606e85b482a8591519c4712cf45",
                 "shasum": ""
             },
             "require": {
@@ -9973,11 +10709,25 @@
                 "mime",
                 "mime-type"
             ],
-            "time": "2020-05-25T12:33:44+00:00"
+            "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"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v5.1.0",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
@@ -10029,132 +10779,25 @@
                 "configuration",
                 "options"
             ],
-            "time": "2020-05-23T13:08:13+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php70",
-            "version": "v1.17.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php70.git",
-                "reference": "82225c2d7d23d7e70515496d249c0152679b468e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/82225c2d7d23d7e70515496d249c0152679b468e",
-                "reference": "82225c2d7d23d7e70515496d249c0152679b468e",
-                "shasum": ""
-            },
-            "require": {
-                "paragonie/random_compat": "~1.0|~2.0|~9.99",
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.17-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php70\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ],
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2020-05-12T16:47:27+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php80",
-            "version": "v1.17.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "5e30b2799bc1ad68f7feb62b60a73743589438dd"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/5e30b2799bc1ad68f7feb62b60a73743589438dd",
-                "reference": "5e30b2799bc1ad68f7feb62b60a73743589438dd",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.0.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.17-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php80\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ],
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
+            "funding": [
                 {
-                    "name": "Ion Bazan",
-                    "email": "ion.bazan@gmail.com"
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
                 },
                 {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
                 },
                 {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
                 }
             ],
-            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2020-05-12T16:47:27+00:00"
+            "time": "2020-05-23T13:08:13+00:00"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v5.1.0",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
@@ -10200,11 +10843,25 @@
             ],
             "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.0",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
@@ -10263,20 +10920,34 @@
             ],
             "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"
         },
         {
             "name": "thecodingmachine/safe",
-            "version": "v1.1.1",
+            "version": "v1.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thecodingmachine/safe.git",
-                "reference": "04f9ffae372a9816d4472dfb7bcf6126b623a9df"
+                "reference": "9f277171e296a3c8629c04ac93ec95ff0f208ccb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thecodingmachine/safe/zipball/04f9ffae372a9816d4472dfb7bcf6126b623a9df",
-                "reference": "04f9ffae372a9816d4472dfb7bcf6126b623a9df",
+                "url": "https://api.github.com/repos/thecodingmachine/safe/zipball/9f277171e296a3c8629c04ac93ec95ff0f208ccb",
+                "reference": "9f277171e296a3c8629c04ac93ec95ff0f208ccb",
                 "shasum": ""
             },
             "require": {
@@ -10396,7 +11067,7 @@
                 "MIT"
             ],
             "description": "PHP core functions that throw exceptions instead of returning FALSE on error",
-            "time": "2020-05-04T15:25:36+00:00"
+            "time": "2020-07-10T09:34:29+00:00"
         },
         {
             "name": "theseer/fdomdocument",
@@ -10440,23 +11111,23 @@
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.1.3",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9"
+                "reference": "75a63c33a8577608444246075ea0af0d052e452a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
-                "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/75a63c33a8577608444246075ea0af0d052e452a",
+                "reference": "75a63c33a8577608444246075ea0af0d052e452a",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-tokenizer": "*",
                 "ext-xmlwriter": "*",
-                "php": "^7.0"
+                "php": "^7.2 || ^8.0"
             },
             "type": "library",
             "autoload": {
@@ -10476,25 +11147,31 @@
                 }
             ],
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
-            "time": "2019-06-13T22:48:21+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/theseer",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-07-12T23:59:07+00:00"
         },
         {
             "name": "vlucas/phpdotenv",
-            "version": "v2.6.5",
+            "version": "v2.6.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "2e977311ffb17b2f82028a9c36824647789c6365"
+                "reference": "e1d57f62db3db00d9139078cbedf262280701479"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2e977311ffb17b2f82028a9c36824647789c6365",
-                "reference": "2e977311ffb17b2f82028a9c36824647789c6365",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/e1d57f62db3db00d9139078cbedf262280701479",
+                "reference": "e1d57f62db3db00d9139078cbedf262280701479",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.3.9 || ^7.0 || ^8.0",
-                "symfony/polyfill-ctype": "^1.16"
+                "symfony/polyfill-ctype": "^1.17"
             },
             "require-dev": {
                 "ext-filter": "*",
@@ -10538,27 +11215,38 @@
                 "env",
                 "environment"
             ],
-            "time": "2020-06-02T14:06:52+00:00"
+            "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"
         },
         {
             "name": "webmozart/assert",
-            "version": "1.8.0",
+            "version": "1.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozart/assert.git",
-                "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6"
+                "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/ab2cb0b3b559010b75981b1bdce728da3ee90ad6",
-                "reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389",
+                "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.3 || ^7.0",
+                "php": "^5.3.3 || ^7.0 || ^8.0",
                 "symfony/polyfill-ctype": "^1.8"
             },
             "conflict": {
+                "phpstan/phpstan": "<0.12.20",
                 "vimeo/psalm": "<3.9.1"
             },
             "require-dev": {
@@ -10586,7 +11274,7 @@
                 "check",
                 "validate"
             ],
-            "time": "2020-04-18T12:12:48+00:00"
+            "time": "2020-07-08T17:02:28+00:00"
         },
         {
             "name": "weew/helpers-array",
@@ -10650,5 +11338,6 @@
         "ext-zip": "*",
         "lib-libxml": "*"
     },
-    "platform-dev": []
+    "platform-dev": [],
+    "plugin-api-version": "1.1.0"
 }

From 41c318b08b31dbb36600e779876a6f9ae1147d52 Mon Sep 17 00:00:00 2001
From: Vitalii Zabaznov <vzabaznov@magento.com>
Date: Tue, 21 Jul 2020 10:14:35 -0500
Subject: [PATCH 0956/1718] MC-35885: Process public PR with bin/magento
 improvements

---
 .../Magento/Framework/Module/ModuleList.php      | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/internal/Magento/Framework/Module/ModuleList.php b/lib/internal/Magento/Framework/Module/ModuleList.php
index b3cf433bbaf45..20cf0bc773156 100644
--- a/lib/internal/Magento/Framework/Module/ModuleList.php
+++ b/lib/internal/Magento/Framework/Module/ModuleList.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Config\ConfigOptionsListConstants;
+use Magento\Framework\Module\ModuleList\Loader;
 
 /**
  * A list of modules in the Magento application
@@ -26,7 +27,7 @@ class ModuleList implements ModuleListInterface
     /**
      * Loader of module information from source code
      *
-     * @var ModuleList\Loader
+     * @var Loader
      */
     private $loader;
 
@@ -50,9 +51,9 @@ class ModuleList implements ModuleListInterface
      * Constructor
      *
      * @param DeploymentConfig $config
-     * @param ModuleList\Loader $loader
+     * @param Loader $loader
      */
-    public function __construct(DeploymentConfig $config, ModuleList\Loader $loader)
+    public function __construct(DeploymentConfig $config, Loader $loader)
     {
         $this->config = $config;
         $this->loader = $loader;
@@ -98,10 +99,17 @@ public function getOne($name)
     public function getNames()
     {
         $this->loadConfigData();
+
+        $modulesList = array_keys($this->loader->load());
+
         if (!$this->configData) {
             return [];
         }
-        $result = array_keys(array_filter($this->configData));
+
+        $modulesInConfig = array_keys(array_filter($this->configData));
+
+        $result = array_intersect($modulesInConfig, $modulesList);
+
         return $result;
     }
 

From 71fccde0b91489c6178b05cd0a835c07c0e3011e Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Tue, 21 Jul 2020 10:50:45 -0500
Subject: [PATCH 0957/1718] MC-20638: MyAccount :: Order Details :: Shipping
 Details by Order Number

- WIP refactoring
---
 .../Shipment/BundleShipmentItemFormatter.php  |  34 +++
 .../Resolver/Order/Item}/BundleOptions.php    |   5 +-
 .../Magento/BundleGraphQl/etc/graphql/di.xml  |  28 +++
 .../Magento/BundleGraphQl/etc/schema.graphqls |  26 ++
 ...oiceItemInterfaceTypeResolverComposite.php |  58 -----
 .../Model/InvoiceItemTypeResolver.php         |  26 +-
 .../{Resolver => }/OrderItem/DataProvider.php |   2 +-
 .../OrderItem/OptionsProcessor.php            |   2 +-
 ...rderItemInterfaceTypeResolverComposite.php |  58 -----
 .../Model/OrderItemTypeResolver.php           |  21 +-
 .../Resolver/{ => Invoice}/InvoiceItems.php   |   2 +-
 .../Resolver/{ => Invoice}/InvoiceTotal.php   |   2 +-
 .../SalesGraphQl/Model/Resolver/OrderItem.php |   2 +-
 .../Model/Resolver/OrderItems.php             |   2 +-
 .../Resolver/OrderShipment/ShipmentItems.php  |  56 -----
 .../Model/Resolver/Shipment/ShipmentItems.php |  50 ++++
 .../ShipmentTracking.php                      |   2 +-
 .../{OrderShipments.php => Shipments.php}     |   2 +-
 .../Shipment/Item/FormatterInterface.php      |  26 ++
 .../Shipment/Item/ShipmentItemFormatter.php   |  34 +++
 .../Model/Shipment/ItemProvider.php           |  63 +++++
 .../Model/ShipmentItemTypeResolver.php        |  45 ++++
 .../Magento/SalesGraphQl/etc/graphql/di.xml   |  27 +-
 .../Magento/SalesGraphQl/etc/schema.graphqls  |  46 +---
 .../CustomerOrders/OrderShipmentsTest.php     | 235 ++++++++++++++++++
 ...stomer_place_order_with_bundle_product.php | 233 +++++++++++++++++
 .../_files/customer_with_uk_address.php       |   8 +-
 ...customer_order_with_multiple_shipments.php |  35 +++
 ...order_with_multiple_shipments_rollback.php |   9 +
 .../customer_order_with_simple_shipment.php   |  72 ++++++
 ...er_order_with_simple_shipment_rollback.php |   9 +
 .../customer_order_with_ups_shipping.php      |  56 +++++
 ...tomer_order_with_ups_shipping_rollback.php |   9 +
 .../_files/customer_order_with_two_items.php  |   2 +
 .../testsuite/Magento/Sales/_files/order.php  |   1 +
 .../_files/order_with_bundle_and_shipment.php | 114 +++++++++
 ...rder_with_bundle_and_shipment_rollback.php |  10 +
 .../order_with_different_types_of_product.php |   4 +
 38 files changed, 1175 insertions(+), 241 deletions(-)
 create mode 100644 app/code/Magento/BundleGraphQl/Model/Order/Shipment/BundleShipmentItemFormatter.php
 rename app/code/Magento/{SalesGraphQl/Model/Resolver => BundleGraphQl/Model/Resolver/Order/Item}/BundleOptions.php (95%)
 delete mode 100644 app/code/Magento/SalesGraphQl/Model/InvoiceItemInterfaceTypeResolverComposite.php
 rename app/code/Magento/SalesGraphQl/Model/{Resolver => }/OrderItem/DataProvider.php (99%)
 rename app/code/Magento/SalesGraphQl/Model/{Resolver => }/OrderItem/OptionsProcessor.php (97%)
 delete mode 100644 app/code/Magento/SalesGraphQl/Model/OrderItemInterfaceTypeResolverComposite.php
 rename app/code/Magento/SalesGraphQl/Model/Resolver/{ => Invoice}/InvoiceItems.php (98%)
 rename app/code/Magento/SalesGraphQl/Model/Resolver/{ => Invoice}/InvoiceTotal.php (97%)
 delete mode 100644 app/code/Magento/SalesGraphQl/Model/Resolver/OrderShipment/ShipmentItems.php
 create mode 100644 app/code/Magento/SalesGraphQl/Model/Resolver/Shipment/ShipmentItems.php
 rename app/code/Magento/SalesGraphQl/Model/Resolver/{OrderShipment => Shipment}/ShipmentTracking.php (95%)
 rename app/code/Magento/SalesGraphQl/Model/Resolver/{OrderShipments.php => Shipments.php} (97%)
 create mode 100644 app/code/Magento/SalesGraphQl/Model/Shipment/Item/FormatterInterface.php
 create mode 100644 app/code/Magento/SalesGraphQl/Model/Shipment/Item/ShipmentItemFormatter.php
 create mode 100644 app/code/Magento/SalesGraphQl/Model/Shipment/ItemProvider.php
 create mode 100644 app/code/Magento/SalesGraphQl/Model/ShipmentItemTypeResolver.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CustomerOrders/OrderShipmentsTest.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/_files/customer_place_order_with_bundle_product.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_multiple_shipments.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_multiple_shipments_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_simple_shipment.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_simple_shipment_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle_and_shipment.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle_and_shipment_rollback.php

diff --git a/app/code/Magento/BundleGraphQl/Model/Order/Shipment/BundleShipmentItemFormatter.php b/app/code/Magento/BundleGraphQl/Model/Order/Shipment/BundleShipmentItemFormatter.php
new file mode 100644
index 0000000000000..8a73192ddab71
--- /dev/null
+++ b/app/code/Magento/BundleGraphQl/Model/Order/Shipment/BundleShipmentItemFormatter.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\BundleGraphQl\Model\Order\Shipment;
+
+use Magento\Catalog\Model\Product\Type\AbstractType;
+use Magento\Sales\Api\Data\ShipmentInterface;
+use Magento\Sales\Api\Data\ShipmentItemInterface;
+use Magento\SalesGraphQl\Model\Shipment\Item\FormatterInterface;
+
+class BundleShipmentItemFormatter implements FormatterInterface
+{
+    private $itemFormatter;
+
+    public function __construct(FormatterInterface $itemFormatter)
+    {
+        $this->itemFormatter = $itemFormatter;
+    }
+
+    public function formatShipmentItem(ShipmentInterface $shipment, ShipmentItemInterface $item): ?array
+    {
+        $orderItem = $item->getOrderItem();
+        $shippingType = $orderItem->getProductOptions()['shipment_type'] ?? null;
+        if ($shippingType == AbstractType::SHIPMENT_SEPARATELY && !$orderItem->getParentItemId()) {
+            //When bundle items are shipped separately the children are treated as their own items
+            return null;
+        }
+        return $this->itemFormatter->formatShipmentItem($shipment, $item);
+    }
+}
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/BundleOptions.php b/app/code/Magento/BundleGraphQl/Model/Resolver/Order/Item/BundleOptions.php
similarity index 95%
rename from app/code/Magento/SalesGraphQl/Model/Resolver/BundleOptions.php
rename to app/code/Magento/BundleGraphQl/Model/Resolver/Order/Item/BundleOptions.php
index 0d27197e255ca..de83f9fc1e170 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/BundleOptions.php
+++ b/app/code/Magento/BundleGraphQl/Model/Resolver/Order/Item/BundleOptions.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\SalesGraphQl\Model\Resolver;
+namespace Magento\BundleGraphQl\Model\Resolver\Order\Item;
 
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
@@ -15,6 +15,7 @@
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Sales\Api\Data\InvoiceItemInterface;
 use Magento\Sales\Api\Data\OrderItemInterface;
+use Magento\Sales\Api\Data\ShipmentItemInterface;
 
 /**
  * Resolve bundle options items for order item
@@ -59,7 +60,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
                 $item = $value['model'];
                 return $this->getBundleOptions($item, $value);
             }
-            if ($value['model'] instanceof InvoiceItemInterface) {
+            if ($value['model'] instanceof InvoiceItemInterface || $value['model'] instanceof ShipmentItemInterface) {
                 /** @var InvoiceItemInterface $item */
                 $item = $value['model'];
                 // Have to pass down order and item to map to avoid refetching all data
diff --git a/app/code/Magento/BundleGraphQl/etc/graphql/di.xml b/app/code/Magento/BundleGraphQl/etc/graphql/di.xml
index b847a6672e046..361120c103d44 100644
--- a/app/code/Magento/BundleGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/BundleGraphQl/etc/graphql/di.xml
@@ -65,4 +65,32 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\SalesGraphQl\Model\OrderItemTypeResolver">
+        <arguments>
+            <argument name="productTypeMap" xsi:type="array">
+                <item name="bundle" xsi:type="string">BundleOrderItem</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\SalesGraphQl\Model\InvoiceItemTypeResolver">
+        <arguments>
+            <argument name="productTypeMap" xsi:type="array">
+                <item name="bundle" xsi:type="string">BundleInvoiceItem</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\SalesGraphQl\Model\ShipmentItemTypeResolver">
+        <arguments>
+            <argument name="productTypeMap" xsi:type="array">
+                <item name="bundle" xsi:type="string">BundleShipmentItem</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\SalesGraphQl\Model\Shipment\ItemProvider">
+        <arguments>
+            <argument name="formatters" xsi:type="array">
+                <item name="bundle" xsi:type="object">Magento\BundleGraphQl\Model\Order\Shipment\BundleShipmentItemFormatter\Proxy</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/BundleGraphQl/etc/schema.graphqls b/app/code/Magento/BundleGraphQl/etc/schema.graphqls
index 0eff0e086180e..3f549298a0a92 100644
--- a/app/code/Magento/BundleGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/BundleGraphQl/etc/schema.graphqls
@@ -86,3 +86,29 @@ enum ShipBundleItemsEnum @doc(description: "This enumeration defines whether bun
     TOGETHER
     SEPARATELY
 }
+
+type BundleOrderItem implements OrderItemInterface {
+    bundle_options: [ItemSelectedBundleOption] @doc(description: "A list of bundle options that are assigned to the bundle product") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Order\\Item\\BundleOptions")
+}
+
+type BundleInvoiceItem implements InvoiceItemInterface{
+    bundle_options: [ItemSelectedBundleOption] @doc(description: "A list of bundle options that are assigned to the bundle product") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Order\\Item\\BundleOptions")
+}
+
+type BundleShipmentItem implements ShipmentItemInterface {
+    bundle_options: [ItemSelectedBundleOption] @doc(description: "A list of bundle options that are assigned to the bundle product") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Order\\Item\\BundleOptions")
+}
+
+type ItemSelectedBundleOption @doc(description: "A list of options of the selected bundle product") {
+    id: ID! @doc(description: "The unique identifier of the option")
+    label: String! @doc(description: "The label of the option")
+    values: [ItemSelectedBundleOptionValue] @doc(description: "A list of products that represent the values of the parent option")
+}
+
+type ItemSelectedBundleOptionValue @doc(description: "A list of values for the selected bundle product") {
+    id: ID! @doc(description: "The unique identifier of the value")
+    product_name: String! @doc(description: "The name of the child bundle product")
+    product_sku: String! @doc(description: "The SKU of the child bundle product")
+    quantity: Float! @doc(description: "Indicates how many of this bundle product were ordered")
+    price: Money! @doc(description: "The price of the child bundle product")
+}
diff --git a/app/code/Magento/SalesGraphQl/Model/InvoiceItemInterfaceTypeResolverComposite.php b/app/code/Magento/SalesGraphQl/Model/InvoiceItemInterfaceTypeResolverComposite.php
deleted file mode 100644
index 5b3c2aee1cecf..0000000000000
--- a/app/code/Magento/SalesGraphQl/Model/InvoiceItemInterfaceTypeResolverComposite.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\SalesGraphQl\Model;
-
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
-
-/**
- *  Composite class to resolve invoice item type
- */
-class InvoiceItemInterfaceTypeResolverComposite implements TypeResolverInterface
-{
-    /**
-     * @var TypeResolverInterface[]
-     */
-    private $invoiceItemTypeResolvers = [];
-
-    /**
-     * @param TypeResolverInterface[] $invoiceItemTypeResolvers
-     */
-    public function __construct(array $invoiceItemTypeResolvers = [])
-    {
-        $this->invoiceItemTypeResolvers = $invoiceItemTypeResolvers;
-    }
-
-    /**
-     * Resolve item type of an invoice through composite resolvers
-     *
-     * @param array $data
-     * @return string
-     * @throws GraphQlInputException
-     */
-    public function resolveType(array $data): string
-    {
-        $resolvedType = null;
-
-        foreach ($this->invoiceItemTypeResolvers as $invoiceItemTypeResolver) {
-            if (!isset($data['product_type'])) {
-                throw new GraphQlInputException(
-                    __('Missing key %1 in sales item data', ['product_type'])
-                );
-            }
-            $resolvedType = $invoiceItemTypeResolver->resolveType($data);
-            if (!empty($resolvedType)) {
-                return $resolvedType;
-            }
-        }
-
-        throw new GraphQlInputException(
-            __('Concrete type for %1 not implemented', ['InvoiceItemInterface'])
-        );
-    }
-}
diff --git a/app/code/Magento/SalesGraphQl/Model/InvoiceItemTypeResolver.php b/app/code/Magento/SalesGraphQl/Model/InvoiceItemTypeResolver.php
index 4c2dcdf7f29ba..2e1b991e91775 100644
--- a/app/code/Magento/SalesGraphQl/Model/InvoiceItemTypeResolver.php
+++ b/app/code/Magento/SalesGraphQl/Model/InvoiceItemTypeResolver.php
@@ -8,22 +8,36 @@
 namespace Magento\SalesGraphQl\Model;
 
 use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 
 /**
- * Leaf for composite class to resolve invoice item type
+ * Resolve concrete type for InvoiceItemInterface
  */
 class InvoiceItemTypeResolver implements TypeResolverInterface
 {
+    /**
+     * @var array
+     */
+    private $productTypeMap;
+
+    public function __construct($productTypeMap = [])
+    {
+        $this->productTypeMap = $productTypeMap;
+    }
+
     /**
      * @inheritDoc
      */
     public function resolveType(array $data): string
     {
-        if (isset($data['product_type'])) {
-            if ($data['product_type'] == 'bundle') {
-                return 'BundleInvoiceItem';
-            }
+        if (!isset($data['product_type'])) {
+            throw new GraphQlInputException(
+                __('Missing key %1 in sales item data', ['product_type'])
+            );
+        }
+        if (isset($this->productTypeMap[$data['product_type']])) {
+            return $this->productTypeMap[$data['product_type']];
         }
-        return 'InvoiceItem';
+        return $this->productTypeMap['default'];
     }
 }
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderItem/DataProvider.php b/app/code/Magento/SalesGraphQl/Model/OrderItem/DataProvider.php
similarity index 99%
rename from app/code/Magento/SalesGraphQl/Model/Resolver/OrderItem/DataProvider.php
rename to app/code/Magento/SalesGraphQl/Model/OrderItem/DataProvider.php
index 20cdd7313b8ad..a69d9bf58ee8d 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderItem/DataProvider.php
+++ b/app/code/Magento/SalesGraphQl/Model/OrderItem/DataProvider.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\SalesGraphQl\Model\Resolver\OrderItem;
+namespace Magento\SalesGraphQl\Model\OrderItem;
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderItem/OptionsProcessor.php b/app/code/Magento/SalesGraphQl/Model/OrderItem/OptionsProcessor.php
similarity index 97%
rename from app/code/Magento/SalesGraphQl/Model/Resolver/OrderItem/OptionsProcessor.php
rename to app/code/Magento/SalesGraphQl/Model/OrderItem/OptionsProcessor.php
index e168f185d39a4..83b7e0cc46d96 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderItem/OptionsProcessor.php
+++ b/app/code/Magento/SalesGraphQl/Model/OrderItem/OptionsProcessor.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\SalesGraphQl\Model\Resolver\OrderItem;
+namespace Magento\SalesGraphQl\Model\OrderItem;
 
 use Magento\Sales\Api\Data\OrderItemInterface;
 
diff --git a/app/code/Magento/SalesGraphQl/Model/OrderItemInterfaceTypeResolverComposite.php b/app/code/Magento/SalesGraphQl/Model/OrderItemInterfaceTypeResolverComposite.php
deleted file mode 100644
index ed7b133ce1bb8..0000000000000
--- a/app/code/Magento/SalesGraphQl/Model/OrderItemInterfaceTypeResolverComposite.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\SalesGraphQl\Model;
-
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
-
-/**
- * Composite class to resolve order item type
- */
-class OrderItemInterfaceTypeResolverComposite implements TypeResolverInterface
-{
-    /**
-     * TypeResolverInterface[]
-     */
-    private $orderItemTypeResolvers = [];
-
-    /**
-     * @param TypeResolverInterface[] $orderItemTypeResolvers
-     */
-    public function __construct(array $orderItemTypeResolvers = [])
-    {
-        $this->orderItemTypeResolvers = $orderItemTypeResolvers;
-    }
-
-    /**
-     * Resolve item type of an order through composite resolvers
-     *
-     * @param array $data
-     * @return string
-     * @throws GraphQlInputException
-     */
-    public function resolveType(array $data) : string
-    {
-        $resolvedType = null;
-
-        foreach ($this->orderItemTypeResolvers as $orderItemTypeResolver) {
-            if (!isset($data['product_type'])) {
-                throw new GraphQlInputException(
-                    __('Missing key %1 in sales item data', ['product_type'])
-                );
-            }
-            $resolvedType = $orderItemTypeResolver->resolveType($data);
-            if (!empty($resolvedType)) {
-                return $resolvedType;
-            }
-        }
-
-        throw new GraphQlInputException(
-            __('Concrete type for %1 not implemented', ['OrderItemInterface'])
-        );
-    }
-}
diff --git a/app/code/Magento/SalesGraphQl/Model/OrderItemTypeResolver.php b/app/code/Magento/SalesGraphQl/Model/OrderItemTypeResolver.php
index 8e1b495406b54..a5360572c54e9 100644
--- a/app/code/Magento/SalesGraphQl/Model/OrderItemTypeResolver.php
+++ b/app/code/Magento/SalesGraphQl/Model/OrderItemTypeResolver.php
@@ -7,23 +7,32 @@
 
 namespace Magento\SalesGraphQl\Model;
 
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
 
 /**
- * Leaf for composite class to resolve order item type
+ * Resolve concrete type for OrderItemInterface
  */
 class OrderItemTypeResolver implements TypeResolverInterface
 {
+    private $productTypeMap;
+
+    public function __construct(array $productTypeMap = []){
+        $this->productTypeMap = $productTypeMap;
+    }
+
     /**
      * @inheritDoc
      */
     public function resolveType(array $data): string
     {
-        if (isset($data['product_type'])) {
-            if ($data['product_type'] == 'bundle') {
-                return 'BundleOrderItem';
-            }
+        if (!isset($data['product_type'])) {
+            throw new GraphQlInputException(__('Missing key %1 in sales item data', ['product_type']));
         }
-        return 'OrderItem';
+        if (isset($this->productTypeMap[$data['product_type']])) {
+            return $this->productTypeMap[$data['product_type']];
+        }
+
+        return $this->productTypeMap['default'];
     }
 }
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceItems.php b/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceItems.php
similarity index 98%
rename from app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceItems.php
rename to app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceItems.php
index bac9ea5480580..b3fb24ed3afae 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceItems.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceItems.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\SalesGraphQl\Model\Resolver;
+namespace Magento\SalesGraphQl\Model\Resolver\Invoice;
 
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceTotal.php b/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceTotal.php
similarity index 97%
rename from app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceTotal.php
rename to app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceTotal.php
index 45752c5f807b8..78e53e03fa11f 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceTotal.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceTotal.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\SalesGraphQl\Model\Resolver;
+namespace Magento\SalesGraphQl\Model\Resolver\Invoice;
 
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderItem.php b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderItem.php
index 116066f12bc28..d7819277e56db 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderItem.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderItem.php
@@ -12,7 +12,7 @@
 use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\SalesGraphQl\Model\Resolver\OrderItem\DataProvider as OrderItemProvider;
+use Magento\SalesGraphQl\Model\OrderItem\DataProvider as OrderItemProvider;
 
 /**
  * Resolve a single order item
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderItems.php b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderItems.php
index 29e03afa9b59a..f0e768c513cd3 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderItems.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderItems.php
@@ -15,7 +15,7 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\GraphQl\Model\Query\ContextInterface;
 use Magento\Sales\Api\Data\OrderInterface;
-use Magento\SalesGraphQl\Model\Resolver\OrderItem\DataProvider as OrderItemProvider;
+use Magento\SalesGraphQl\Model\OrderItem\DataProvider as OrderItemProvider;
 
 /**
  * Resolve order items for order
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderShipment/ShipmentItems.php b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderShipment/ShipmentItems.php
deleted file mode 100644
index 49e55584c5fa6..0000000000000
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderShipment/ShipmentItems.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\SalesGraphQl\Model\Resolver\OrderShipment;
-
-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\Api\Data\OrderInterface;
-use Magento\Sales\Api\Data\ShipmentInterface;
-use Magento\SalesGraphQl\Model\SalesItem\SalesItemFactory;
-use function base64_encode;
-
-/**
- * Resolve items included in shipment
- */
-class ShipmentItems implements ResolverInterface
-{
-    /**
-     * @inheritDoc
-     */
-    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-    {
-        if (!isset($value['model']) && !($value['model'] instanceof ShipmentInterface)) {
-            throw new LocalizedException(__('"model" value should be specified'));
-        }
-        if (!isset($value['order']) && !($value['order'] instanceof OrderInterface)) {
-            throw new LocalizedException(__('"order" value should be specified'));
-        }
-        /** @var ShipmentInterface $shipment */
-        $shipment = $value['model'];
-        $order = $value['order'];
-
-        $shipmentItems = [];
-        foreach ($shipment->getItems() as $item) {
-            $shipmentItems[] = [
-                'id' => base64_encode($item->getEntityId()),
-                'product_name' => $item->getName(),
-                'product_sku' => $item->getSku(),
-                'product_sale_price' => [
-                    'value' => $item->getPrice(),
-                    'currency' => $order->getOrderCurrencyCode()
-                ],
-                'quantity_shipped' => $item->getQty(),
-                'model' => $item,
-            ];
-        }
-
-        return $shipmentItems;
-    }
-}
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/Shipment/ShipmentItems.php b/app/code/Magento/SalesGraphQl/Model/Resolver/Shipment/ShipmentItems.php
new file mode 100644
index 0000000000000..a011bddc5cb6c
--- /dev/null
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/Shipment/ShipmentItems.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesGraphQl\Model\Resolver\Shipment;
+
+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\Api\Data\OrderInterface;
+use Magento\Sales\Api\Data\ShipmentInterface;
+use Magento\SalesGraphQl\Model\Shipment\ItemProvider;
+
+/**
+ * Resolve items included in shipment
+ */
+class ShipmentItems implements ResolverInterface
+{
+    /**
+     * @var ItemProvider
+     */
+    private $shipmentItemProvider;
+
+    /**
+     * @param ItemProvider $shipmentItemProvider
+     */
+    public function __construct(ItemProvider $shipmentItemProvider)
+    {
+        $this->shipmentItemProvider = $shipmentItemProvider;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (!($value['model'] ?? null) instanceof ShipmentInterface) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        /** @var ShipmentInterface $shipment */
+        $shipment = $value['model'];
+
+        return $this->shipmentItemProvider->getItemData($shipment);
+    }
+}
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderShipment/ShipmentTracking.php b/app/code/Magento/SalesGraphQl/Model/Resolver/Shipment/ShipmentTracking.php
similarity index 95%
rename from app/code/Magento/SalesGraphQl/Model/Resolver/OrderShipment/ShipmentTracking.php
rename to app/code/Magento/SalesGraphQl/Model/Resolver/Shipment/ShipmentTracking.php
index 0f77dd2fd2567..e6ef0b8442852 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderShipment/ShipmentTracking.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/Shipment/ShipmentTracking.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\SalesGraphQl\Model\Resolver\OrderShipment;
+namespace Magento\SalesGraphQl\Model\Resolver\Shipment;
 
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderShipments.php b/app/code/Magento/SalesGraphQl/Model/Resolver/Shipments.php
similarity index 97%
rename from app/code/Magento/SalesGraphQl/Model/Resolver/OrderShipments.php
rename to app/code/Magento/SalesGraphQl/Model/Resolver/Shipments.php
index 1fb2cd084da44..8d70c5d8f3e99 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderShipments.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/Shipments.php
@@ -18,7 +18,7 @@
 /**
  * Resolve shipment information for order
  */
-class OrderShipments implements ResolverInterface
+class Shipments implements ResolverInterface
 {
     /**
      * @inheritDoc
diff --git a/app/code/Magento/SalesGraphQl/Model/Shipment/Item/FormatterInterface.php b/app/code/Magento/SalesGraphQl/Model/Shipment/Item/FormatterInterface.php
new file mode 100644
index 0000000000000..61ea89b5a81e6
--- /dev/null
+++ b/app/code/Magento/SalesGraphQl/Model/Shipment/Item/FormatterInterface.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesGraphQl\Model\Shipment\Item;
+
+use Magento\Sales\Api\Data\ShipmentInterface;
+use Magento\Sales\Api\Data\ShipmentItemInterface;
+
+/**
+ * Format shipment items for GraphQl output
+ */
+interface FormatterInterface
+{
+    /**
+     * Format a shipment item for GraphQl
+     *
+     * @param ShipmentInterface $shipment
+     * @param ShipmentItemInterface $item
+     * @return array|null
+     */
+    public function formatShipmentItem(ShipmentInterface $shipment, ShipmentItemInterface $item): ?array;
+}
diff --git a/app/code/Magento/SalesGraphQl/Model/Shipment/Item/ShipmentItemFormatter.php b/app/code/Magento/SalesGraphQl/Model/Shipment/Item/ShipmentItemFormatter.php
new file mode 100644
index 0000000000000..edb33e04fc5d0
--- /dev/null
+++ b/app/code/Magento/SalesGraphQl/Model/Shipment/Item/ShipmentItemFormatter.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesGraphQl\Model\Shipment\Item;
+
+use Magento\Sales\Api\Data\ShipmentInterface;
+use Magento\Sales\Api\Data\ShipmentItemInterface;
+
+class ShipmentItemFormatter implements FormatterInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function formatShipmentItem(ShipmentInterface $shipment, ShipmentItemInterface $item): ?array
+    {
+        $order = $shipment->getOrder();
+        return [
+            'id' => base64_encode($item->getEntityId()),
+            'product_name' => $item->getName(),
+            'product_sku' => $item->getSku(),
+            'product_sale_price' => [
+                'value' => $item->getPrice(),
+                'currency' => $order->getOrderCurrencyCode()
+            ],
+            'product_type' => $item->getOrderItem()->getProductType(),
+            'quantity_shipped' => $item->getQty(),
+            'model' => $item,
+        ];
+    }
+}
diff --git a/app/code/Magento/SalesGraphQl/Model/Shipment/ItemProvider.php b/app/code/Magento/SalesGraphQl/Model/Shipment/ItemProvider.php
new file mode 100644
index 0000000000000..8e4beb4f1ac21
--- /dev/null
+++ b/app/code/Magento/SalesGraphQl/Model/Shipment/ItemProvider.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesGraphQl\Model\Shipment;
+
+use Magento\Sales\Api\Data\ShipmentInterface;
+use Magento\Sales\Api\Data\ShipmentItemInterface;
+use Magento\SalesGraphQl\Model\Shipment\Item\FormatterInterface;
+
+/**
+ * Get shipment item data
+ */
+class ItemProvider
+{
+    /**
+     * @var FormatterInterface[]
+     */
+    private $formatters;
+
+    /**
+     * @param FormatterInterface[] $formatters
+     */
+    public function __construct(array $formatters = [])
+    {
+        $this->formatters = $formatters;
+    }
+
+    /**
+     * Get item data for shipment
+     *
+     * @param ShipmentInterface $shipment
+     * @return array
+     */
+    public function getItemData(ShipmentInterface $shipment): array
+    {
+        $shipmentItems = [];
+
+        foreach ($shipment->getItems() as $shipmentItem) {
+            $formattedItem = $this->formatItem($shipment, $shipmentItem);
+            if ($formattedItem) {
+                $shipmentItems[] = $formattedItem;
+            }
+        }
+        return $shipmentItems;
+    }
+
+    /**
+     * @param ShipmentInterface $shipment
+     * @param ShipmentItemInterface $shipmentItem
+     * @return array|null
+     */
+    private function formatItem(ShipmentInterface $shipment, ShipmentItemInterface $shipmentItem): ?array
+    {
+        $orderItem = $shipmentItem->getOrderItem();
+        $formatter = $this->formatters[$orderItem->getProductType()] ?? $this->formatters['default'];
+
+        return $formatter->formatShipmentItem($shipment, $shipmentItem);
+    }
+}
diff --git a/app/code/Magento/SalesGraphQl/Model/ShipmentItemTypeResolver.php b/app/code/Magento/SalesGraphQl/Model/ShipmentItemTypeResolver.php
new file mode 100644
index 0000000000000..1f05ed8c8d68d
--- /dev/null
+++ b/app/code/Magento/SalesGraphQl/Model/ShipmentItemTypeResolver.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesGraphQl\Model;
+
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
+
+/**
+ * Resolve concrete type of ShipmentItemInterface
+ */
+class ShipmentItemTypeResolver implements TypeResolverInterface
+{
+    /**
+     * @var array
+     */
+    private $productTypeMap;
+
+    /**
+     * @param array $productTypeMap
+     */
+    public function __construct(array $productTypeMap = [])
+    {
+        $this->productTypeMap = $productTypeMap;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function resolveType(array $data): string
+    {
+        if (!isset($data['product_type'])) {
+            throw new GraphQlInputException(__('Missing key %1 in sales item data', ['product_type']));
+        }
+        if (isset($this->productTypeMap[$data['product_type']])) {
+            return $this->productTypeMap[$data['product_type']];
+        }
+
+        return $this->productTypeMap['default'];
+    }
+}
diff --git a/app/code/Magento/SalesGraphQl/etc/graphql/di.xml b/app/code/Magento/SalesGraphQl/etc/graphql/di.xml
index 5bba224ff2fad..06997c51c81f7 100644
--- a/app/code/Magento/SalesGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/SalesGraphQl/etc/graphql/di.xml
@@ -6,17 +6,32 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\SalesGraphQl\Model\OrderItemInterfaceTypeResolverComposite">
+    <type name="Magento\SalesGraphQl\Model\OrderItemTypeResolver">
         <arguments>
-            <argument name="orderItemTypeResolvers" xsi:type="array">
-                <item name="order_catalog_item_type_resolver" xsi:type="object">Magento\SalesGraphQl\Model\OrderItemTypeResolver</item>
+            <argument name="productTypeMap" xsi:type="array">
+                <item name="default" xsi:type="string">OrderItem</item>
             </argument>
         </arguments>
     </type>
-    <type name="Magento\SalesGraphQl\Model\InvoiceItemInterfaceTypeResolverComposite">
+    <type name="Magento\SalesGraphQl\Model\InvoiceItemTypeResolver">
         <arguments>
-            <argument name="invoiceItemTypeResolvers" xsi:type="array">
-                <item name="invoice_catalog_item_type_resolver" xsi:type="object">Magento\SalesGraphQl\Model\InvoiceItemTypeResolver</item>
+            <argument name="productTypeMap" xsi:type="array">
+                <item name="default" xsi:type="string">InvoiceItem</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\SalesGraphQl\Model\ShipmentItemTypeResolver">
+        <arguments>
+            <argument name="productTypeMap" xsi:type="array">
+                <item name="default" xsi:type="string">ShipmentItem</item>
+            </argument>
+        </arguments>
+    </type>
+    <preference for="Magento\SalesGraphQl\Model\Shipment\Item\FormatterInterface" type="Magento\SalesGraphQl\Model\Shipment\Item\ShipmentItemFormatter"/>
+    <type name="Magento\SalesGraphQl\Model\Shipment\ItemProvider">
+        <arguments>
+            <argument name="formatters" xsi:type="array">
+                <item name="default" xsi:type="object">Magento\SalesGraphQl\Model\Shipment\Item\ShipmentItemFormatter\Proxy</item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/SalesGraphQl/etc/schema.graphqls b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
index 5a45de52e6acd..dd93da16cc90d 100644
--- a/app/code/Magento/SalesGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
@@ -46,7 +46,7 @@ type CustomerOrder @doc(description: "Contains details about each of the custome
     items: [OrderItemInterface] @doc(description: "An array containing the items purchased in this order") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\OrderItems")
     total: OrderTotal @doc(description: "Contains details about the calculated totals for this order") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\OrderTotal")
     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\\OrderShipments")
+    shipments: [OrderShipment] @doc(description: "A list of shipments for the order") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\Shipments")
     payment_methods: [PaymentMethod] @doc(description: "Payment details for the order")
     shipping_address: CustomerAddress @doc(description: "The shipping address for the order")
     billing_address: CustomerAddress @doc(description: "The billing address for the order")
@@ -64,7 +64,7 @@ interface OrderItemInterface @doc(description: "Order item details") @typeResolv
     product_name: String @doc(description: "The name of the base product")
     product_sku: String! @doc(description: "The SKU of the base product")
     product_url_key: String @doc(description: "URL key of the base product")
-    product_type: String @doc(description: "The type of product, such as simple, configurable, or bundle")
+    product_type: String @doc(description: "The type of product, such as simple, configurable, etc.")
     status: String @doc(description: "The status of the order item")
     product_sale_price: Money! @doc(description: "The sale price of the base product, including selected options")
     discounts: [Discount] @doc(description: "The final discount information for the product")
@@ -81,24 +81,6 @@ interface OrderItemInterface @doc(description: "Order item details") @typeResolv
 type OrderItem implements OrderItemInterface {
 }
 
-type BundleOrderItem implements OrderItemInterface {
-    bundle_options: [ItemSelectedBundleOption] @doc(description: "A list of bundle options that are assigned to the bundle product") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\BundleOptions")
-}
-
-type ItemSelectedBundleOption @doc(description: "A list of options of the selected bundle product") {
-    id: ID! @doc(description: "The unique identifier of the option")
-    label: String! @doc(description: "The label of the option")
-    values: [ItemSelectedBundleOptionValue] @doc(description: "A list of products that represent the values of the parent option")
-}
-
-type ItemSelectedBundleOptionValue @doc(description: "A list of values for the selected bundle product") {
-    id: ID! @doc(description: "The unique identifier of the value")
-    product_name: String! @doc(description: "The name of the child bundle product")
-    product_sku: String! @doc(description: "The SKU of the child bundle product")
-    quantity: Float! @doc(description: "Indicates how many of this bundle product were ordered")
-    price: Money! @doc(description: "The price of the child bundle product")
-}
-
 type OrderItemOption @doc(description: "Represents order item options like selected or entered") {
     id: String! @doc(description: "The name of the option")
     value: String! @doc(description: "The value of the option")
@@ -124,8 +106,8 @@ type OrderTotal @doc(description: "Contains details about the sales total amount
 type Invoice @doc(description: "Invoice details") {
     id: ID! @doc(description: "The ID of the invoice, used for API purposes")
     number: String! @doc(description: "Sequential invoice number")
-    total: InvoiceTotal @doc(description: "Invoice total amount details") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\InvoiceTotal")
-    items: [InvoiceItemInterface] @doc(description: "Invoiced product details") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\InvoiceItems")
+    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")
 }
 
@@ -142,10 +124,6 @@ interface InvoiceItemInterface @doc(description: "Invoice item details") @typeRe
 type InvoiceItem implements InvoiceItemInterface {
 }
 
-type BundleInvoiceItem implements InvoiceItemInterface{
-    bundle_options: [ItemSelectedBundleOption] @doc(description: "A list of bundle options that are assigned to the bundle product") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\BundleOptions")
-}
-
 type InvoiceTotal @doc(description: "Contains price details from an invoice"){
     subtotal: Money! @doc(description: "The subtotal of the invoice, excluding shipping, discounts, and taxes")
     discounts: [Discount] @doc(description: "The applied discounts to the invoice")
@@ -168,8 +146,8 @@ type ShippingHandling @doc(description: "The Shipping handling details") {
 type OrderShipment @doc(description: "Order shipment details") {
     id: ID! @doc(description: "The unique ID of the shipment")
     number: String! @doc(description: "The sequential credit shipment number")
-    tracking: [ShipmentTracking] @doc(description: "Contains shipment tracking details")
-    items: [ShipmentItemInterface] @doc(description: "Contains items included in the shipment") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\OrderShipment\\ShipmentItems")
+    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")
 }
 
@@ -178,7 +156,7 @@ type CommentItem @doc(description: "Comment item details") {
     message: String! @doc(description: "The text of the message")
 }
 
-interface ShipmentItemInterface @doc(description: "Order shipment item details") @typeResolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\ShipmentItemTypeResolver"){
+interface ShipmentItemInterface @doc(description: "Order shipment item details") @typeResolver(class: "Magento\\SalesGraphQl\\Model\\ShipmentItemTypeResolver"){
     id: ID! @doc(description: "Shipment item unique identifier")
     order_item: OrderItemInterface @doc(description: "Associated order item") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\OrderItem")
     product_name: String @doc(description: "Name of the base product")
@@ -190,16 +168,6 @@ interface ShipmentItemInterface @doc(description: "Order shipment item details")
 type ShipmentItem implements ShipmentItemInterface {
 }
 
-type BundleShipmentItem implements ShipmentItemInterface {
-    bundle_options: [ShipmentItemSelectedBundleOptions] @doc(description: "A list of bundle options that are assigned to the bundle product") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\BundleOptions")
-}
-
-type ShipmentItemSelectedBundleOptions {
-    id: ID! @doc(description: "The unique identifier of the option")
-    label: String! @doc(description: "The label of the option")
-    items: [ShipmentItemInterface] @doc(description: "A list of products that represent the values of the parent option") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\BundleOptions\\SelectedBundleOptionLineItems")
-}
-
 type ShipmentTracking @doc(description: "Order shipment tracking details") {
     title: String! @doc(description: "The shipment tracking title")
     carrier: String! @doc(description: "The shipping carrier for the order delivery")
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CustomerOrders/OrderShipmentsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CustomerOrders/OrderShipmentsTest.php
new file mode 100644
index 0000000000000..12884abd2fd65
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CustomerOrders/OrderShipmentsTest.php
@@ -0,0 +1,235 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\GraphQl\GetCustomerAuthenticationHeader;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Shipment;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Sales\Model\ResourceModel\Order\Collection as OrderCollection;
+
+class OrderShipmentsTest extends GraphQlAbstract
+{
+    /**
+     * @var GetCustomerAuthenticationHeader
+     */
+    private $getCustomerAuthHeader;
+
+    private $orderRepository;
+
+    private $registry;
+
+    protected function setUp(): void
+    {
+        $this->getCustomerAuthHeader = Bootstrap::getObjectManager()->get(GetCustomerAuthenticationHeader::class);
+        $this->orderRepository = Bootstrap::getObjectManager()->get(OrderRepositoryInterface::class);
+        $this->registry = Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+    }
+
+    protected function tearDown(): void
+    {
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', true);
+
+        /** @var $order \Magento\Sales\Model\Order */
+        $orderCollection = Bootstrap::getObjectManager()->create(OrderCollection::class);
+        foreach ($orderCollection as $order) {
+            $this->orderRepository->delete($order);
+        }
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', false);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/GraphQl/Sales/_files/customer_order_with_simple_shipment.php
+     */
+    public function testGetOrderShipment()
+    {
+        $query = $this->getQuery('100000555');
+        $authHeader = $this->getCustomerAuthHeader->execute('customer_uk_address@test.com', 'password');
+        $orderModel = $this->fetchOrderModel('100000555');
+
+        $result = $this->graphQlQuery($query, [], '', $authHeader);
+        $this->assertArrayNotHasKey('errors', $result);
+        $this->assertCount(1, $result['customer']['orders']['items']);
+
+        $order = $result['customer']['orders']['items'][0];
+        $this->assertEquals('Flat Rate', $order['carrier']);
+        $this->assertEquals('Flat Rate - Fixed', $order['shipping_method']);
+        $this->assertArrayHasKey('shipments', $order);
+        /** @var Shipment $orderShipmentModel */
+        $orderShipmentModel = $orderModel->getShipmentsCollection()->getFirstItem();
+        $shipment = $order['shipments'][0];
+        $this->assertEquals(base64_encode($orderShipmentModel->getIncrementId()), $shipment['id']);
+        $this->assertEquals($orderShipmentModel->getIncrementId(), $shipment['number']);
+        //Check Tracking
+        $this->assertCount(1, $shipment['tracking']);
+        $tracking = $shipment['tracking'][0];
+        $this->assertEquals('ups', $tracking['carrier']);
+        $this->assertEquals('United Parcel Service', $tracking['title']);
+        $this->assertEquals('1234567890', $tracking['number']);
+        //Check Items
+        $this->assertCount(2, $shipment['items']);
+        foreach ($orderShipmentModel->getItems() as $expectedItem) {
+            $sku = $expectedItem->getSku();
+            $findItem = array_filter($shipment['items'], function ($item) use ($sku) {
+                return $item['product_sku'] === $sku;
+            });
+            $this->assertCount(1, $findItem);
+            $actualItem = reset($findItem);
+            $expectedEncodedId = base64_encode($expectedItem->getEntityId());
+            $this->assertEquals($expectedEncodedId, $actualItem['id']);
+            $this->assertEquals($expectedItem->getSku(), $actualItem['product_sku']);
+            $this->assertEquals($expectedItem->getName(), $actualItem['product_name']);
+            $this->assertEquals($expectedItem->getPrice(), $actualItem['product_sale_price']['value']);
+            $this->assertEquals('USD', $actualItem['product_sale_price']['currency']);
+            $this->assertEquals('1', $actualItem['quantity_shipped']);
+            //Check correct order_item
+            $this->assertNotEmpty($actualItem['order_item']);
+            $this->assertEquals($expectedItem->getSku(), $actualItem['order_item']['product_sku']);
+        }
+        //Check comments
+        $this->assertCount(1, $shipment['comments']);
+        $this->assertEquals('This comment is visible to the customer', $shipment['comments'][0]['message']);
+        $this->assertNotEmpty($shipment['comments'][0]['timestamp']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/GraphQl/Sales/_files/customer_order_with_multiple_shipments.php
+     */
+    public function testGetOrderShipmentsMultiple()
+    {
+        $query = $this->getQuery('100000555');
+        $authHeader = $this->getCustomerAuthHeader->execute('customer_uk_address@test.com', 'password');
+
+        $result = $this->graphQlQuery($query, [], '', $authHeader);
+        $this->assertArrayNotHasKey('errors', $result);
+        $order = $result['customer']['orders']['items'][0];
+        $shipments = $order['shipments'];
+        $this->assertCount(2, $shipments);
+        $this->assertEquals('0000000098', $shipments[0]['number']);
+        $this->assertCount(1, $shipments[0]['items']);
+        $this->assertEquals('0000000099', $shipments[1]['number']);
+        $this->assertCount(1, $shipments[1]['items']);
+    }
+
+    /**
+     * @magentoConfigFixture default_store carriers/ups/active 1
+     * @magentoApiDataFixture Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping.php
+     */
+    public function testOrderShipmentWithUpsCarrier()
+    {
+        $query = $this->getQuery('100000001');
+        $authHeader = $this->getCustomerAuthHeader->execute('customer@example.com', 'password');
+
+        $result = $this->graphQlQuery($query, [], '', $authHeader);
+
+        $this->assertArrayNotHasKey('errors', $result);
+        $this->assertEquals('UPS Next Day Air', $result['customer']['orders']['items'][0]['shipping_method']);
+        $this->assertEquals('United Parcel Service', $result['customer']['orders']['items'][0]['carrier']);
+
+        $shipments = $result['customer']['orders']['items'][0]['shipments'];
+        $this->assertCount(2, $shipments);
+    }
+
+    /**
+     * @magentoConfigFixture default_store carriers/ups/active 1
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Bundle/_files/bundle_product_two_dropdown_options.php
+     */
+    public function testOrderShipmentDifferentProductTypes()
+    {
+        //Place order with bundled product
+        require __DIR__ . '/../_files/customer_place_order_with_bundle_product.php';
+        $result = $this->graphQlQuery(
+            $this->getQuery(),
+            [],
+            '',
+            $this->getCustomerAuthHeader->execute('customer@example.com', 'password')
+        );
+
+        $this->assertArrayNotHasKey('errors', $result);
+
+        $shipments = $result['customer']['orders']['items'][0]['shipments'];
+    }
+
+
+    private function getQuery(string $orderId = null)
+    {
+        $filter = $orderId ? "(filter:{number:{eq:\"$orderId\"}})" : "";
+        $query = <<<QUERY
+{
+  customer $filter{
+    orders {
+      items {
+        number
+        status
+        items {
+          product_sku
+        }
+        carrier
+        shipping_method
+        shipments {
+          id
+          number
+          tracking {
+            title
+            carrier
+            number
+          }
+          items {
+            id
+            order_item {
+              id
+              product_sku
+            }
+            product_name
+            product_sku
+            product_sale_price {
+              value
+              currency
+            }
+            ... on BundleShipmentItem {
+                bundle_options {
+                    id
+                    label
+                    values {
+                        id
+                        product_name
+                        product_sku
+                        quantity
+                        price {
+                            value
+                        }
+                    }
+                }
+            }
+            quantity_shipped
+          }
+          comments {
+            timestamp
+            message
+          }
+        }
+      }
+    }
+  }
+}
+QUERY;
+
+        return $query;
+    }
+
+    private function fetchOrderModel(string $orderNumber): Order
+    {
+        /** @var Order $order */
+        $order = Bootstrap::getObjectManager()->get(Order::class);
+        $order->loadByIncrementId($orderNumber);
+        return $order;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/_files/customer_place_order_with_bundle_product.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/_files/customer_place_order_with_bundle_product.php
new file mode 100644
index 0000000000000..d61046e5d9bc5
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/_files/customer_place_order_with_bundle_product.php
@@ -0,0 +1,233 @@
+<?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\GraphQl\GetCustomerAuthenticationHeader;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQl\Client;
+
+//Customer and product should be created using @magentoApiDataFixture annotations in test
+
+$customerAuthHeader = Bootstrap::getObjectManager()->get(GetCustomerAuthenticationHeader::class);
+$productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
+$bundleSku = 'bundle-product-two-dropdown-options';
+$auth = $customerAuthHeader->execute('customer@example.com', 'password');
+$headers = [
+    sprintf('%s: %s', array_keys($auth)[0], $auth[array_keys($auth)[0]])
+];
+
+/** @var Client $graphQlClient */
+$graphQlClient = Bootstrap::getObjectManager()->get(Client::class);
+
+//Create empty cart
+$createEmptyCart = <<<QUERY
+mutation {
+  createEmptyCart
+}
+QUERY;
+$result = $graphQlClient->post($createEmptyCart, [], '', $headers);
+$cartId = $result['createEmptyCart'];
+
+//Add bundle product
+$qty = 2;
+/** @var Product $bundleProduct */
+$bundleProduct = $productRepository->get($bundleSku);
+/** @var $typeInstance \Magento\Bundle\Model\Product\Type */
+$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:"{$cartId}"
+    cart_items:[
+      {
+        data:{
+          sku:"{$bundleSku}"
+          quantity:{$qty}
+        }
+        bundle_options:[
+          {
+            id:{$optionId1}
+            quantity:1
+            value:["{$selectionId1}"]
+          }
+          {
+            id:$optionId2
+            quantity:2
+            value:["{$selectionId2}"]
+          }
+        ]
+      }
+    ]
+  }) {
+    cart {
+      items {quantity product {sku}}
+      }
+    }
+}
+QUERY;
+$result = $graphQlClient->post($addProduct, [], '', $headers);
+
+//Set billing Address
+$setBillingAddress = <<<QUERY
+mutation {
+  setBillingAddressOnCart(
+    input: {
+      cart_id: "{$cartId}"
+      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;
+$result = $graphQlClient->post($setBillingAddress, [], '', $headers);
+
+//Set shipping address
+$setShippingAddress = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$cartId"
+      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 = $graphQlClient->post($setShippingAddress, [], '', $headers);
+$shippingMethod = $result['setShippingAddressesOnCart']['cart']['shipping_addresses'][0]['available_shipping_methods'][0];
+
+//Set shipping method
+$setShippingMethod = <<<QUERY
+mutation {
+  setShippingMethodsOnCart(input:  {
+    cart_id: "{$cartId}",
+    shipping_methods: [
+      {
+         carrier_code: "{$shippingMethod['carrier_code']}"
+         method_code: "{$shippingMethod['method_code']}"
+      }
+    ]
+  }) {
+    cart {
+      available_payment_methods {
+        code
+        title
+      }
+    }
+  }
+}
+QUERY;
+$result = $graphQlClient->post($setShippingMethod, [], '', $headers);
+$paymentMethod = $result['setShippingMethodsOnCart']['cart']['available_payment_methods'][0];
+
+//Set payment method
+$setPaymentMethod = <<<QUERY
+mutation {
+  setPaymentMethodOnCart(
+    input: {
+      cart_id: "{$cartId}"
+      payment_method: {
+        code: "{$paymentMethod['code']}"
+      }
+    }
+  ) {
+    cart {
+      selected_payment_method {
+        code
+      }
+    }
+  }
+}
+QUERY;
+$result = $graphQlClient->post($setPaymentMethod, [], '', $headers);
+
+//Place order
+$placeOrder = <<<QUERY
+mutation {
+  placeOrder(
+    input: {
+      cart_id: "{$cartId}"
+    }
+  ) {
+    order {
+      order_number
+    }
+  }
+}
+QUERY;
+$result = $graphQlClient->post($placeOrder, [], '', $headers);
+
+
+    /**
+     * @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(Collection::class);
+//        //$orderCollection = $this->orderCollectionFactory->create();
+//        foreach ($orderCollection as $order) {
+//            $this->orderRepository->delete($order);
+//        }
+//        $registry->unregister('isSecureArea');
+//        $registry->register('isSecureArea', false);
+//    }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_uk_address.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_uk_address.php
index a7ad0bb82719f..c024d18e40942 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_uk_address.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_with_uk_address.php
@@ -11,9 +11,10 @@
 use Magento\Customer\Api\Data\AddressInterface;
 use Magento\Customer\Model\Address;
 use Magento\Customer\Model\AddressFactory;
+use Magento\Customer\Model\AddressRegistry;
 use Magento\Customer\Model\CustomerFactory;
 use Magento\Customer\Model\CustomerRegistry;
-use Magento\Customer\Model\AddressRegistry;
+use Magento\Framework\Encryption\EncryptorInterface;
 use Magento\Store\Api\WebsiteRepositoryInterface;
 use Magento\Store\Model\Website;
 use Magento\Store\Model\WebsiteRepository;
@@ -31,6 +32,9 @@
 $websiteRepository = $objectManager->create(WebsiteRepositoryInterface::class);
 /** @var Website $mainWebsite */
 $mainWebsite = $websiteRepository->get('base');
+/** @var EncryptorInterface $encryptor */
+$encryptor = $objectManager->get(EncryptorInterface::class);
+
 $customer->setWebsiteId($mainWebsite->getId())
     ->setEmail('customer_uk_address@test.com')
     ->setPassword('password')
@@ -67,7 +71,7 @@
 );
 $customer->addAddress($customerAddress);
 $customer->isObjectNew(true);
-$customerDataModel = $customerRepository->save($customer->getDataModel());
+$customerDataModel = $customerRepository->save($customer->getDataModel(), $encryptor->hash('password'));
 $addressId = $customerDataModel->getAddresses()[0]->getId();
 $customerDataModel->setDefaultShipping($addressId);
 $customerDataModel->setDefaultBilling($addressId);
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_multiple_shipments.php b/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_multiple_shipments.php
new file mode 100644
index 0000000000000..def622b8f5025
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_multiple_shipments.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Shipment;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+use Magento\Sales\Model\Order\ShipmentFactory;
+use Magento\Framework\DB\Transaction;
+
+Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/customer_order_with_two_items.php');
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Transaction $transaction */
+$transaction = $objectManager->create(Transaction::class);
+
+/** @var Order $order */
+$order = $objectManager->create(Order::class)->loadByIncrementId('100000555');
+
+$items = [];
+$shipmentIds = ['0000000098', '0000000099'];
+$i = 0;
+foreach ($order->getItems() as $orderItem) {
+    $items[$orderItem->getId()] = $orderItem->getQtyOrdered();
+    /** @var Shipment $shipment */
+    $shipment = $objectManager->get(ShipmentFactory::class)->create($order, $items);
+    $shipment->setIncrementId($shipmentIds[$i]);
+    $shipment->register();
+
+    $transaction->addObject($shipment)->addObject($order)->save();
+    $i++;
+}
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_multiple_shipments_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_multiple_shipments_rollback.php
new file mode 100644
index 0000000000000..5fc01f2ecc073
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_multiple_shipments_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/customer_order_with_two_items_rollback.php');
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_simple_shipment.php b/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_simple_shipment.php
new file mode 100644
index 0000000000000..edd1269442e25
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_simple_shipment.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Sales\Model\Order;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+use Magento\Sales\Api\ShipmentCommentRepositoryInterface;
+use Magento\Sales\Model\Order\Shipment\Comment;
+use Magento\Sales\Model\Order\ShipmentFactory;
+use Magento\Sales\Model\Order\Shipment\Track;
+use Magento\Framework\DB\Transaction;
+use Magento\Sales\Api\ShipmentTrackRepositoryInterface;
+
+Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/customer_order_with_two_items.php');
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Transaction $transaction */
+$transaction = $objectManager->create(Transaction::class);
+
+/** @var Order $order */
+$order = $objectManager->create(Order::class)->loadByIncrementId('100000555');
+
+$items = [];
+foreach ($order->getItems() as $orderItem) {
+    $items[$orderItem->getId()] = $orderItem->getQtyOrdered();
+}
+$shipment = $objectManager->get(ShipmentFactory::class)->create($order, $items);
+$shipment->register();
+
+$transaction->addObject($shipment)->addObject($order)->save();
+
+//Add shipment comments
+$shipmentCommentRepository = $objectManager->get(ShipmentCommentRepositoryInterface::class);
+$comments = [
+    [
+        'comment' => 'This comment is visible to the customer',
+        'is_visible_on_front' => 1,
+        'is_customer_notified' => 1,
+    ],
+    [
+        'comment' => 'This comment should not be visible to the customer',
+        'is_visible_on_front' => 0,
+        'is_customer_notified' => 0,
+    ],
+];
+
+foreach ($comments as $commentData) {
+    /** @var Comment $comment */
+    $comment = $objectManager->create(Comment::class);
+    $comment->setParentId($shipment->getId());
+    $comment->setComment($commentData['comment']);
+    $comment->setIsVisibleOnFront($commentData['is_visible_on_front']);
+    $comment->setIsCustomerNotified($commentData['is_customer_notified']);
+    $shipmentCommentRepository->save($comment);
+}
+
+//Add tracking
+/** @var ShipmentTrackRepositoryInterface $shipmentTrackRepository */
+$shipmentTrackRepository = $objectManager->get(ShipmentTrackRepositoryInterface::class);
+/** @var Track $track */
+$track = $objectManager->create(Track::class);
+$track->setOrderId($order->getId());
+$track->setParentId($shipment->getId());
+$track->setTitle('United Parcel Service');
+$track->setCarrierCode('ups');
+$track->setTrackNumber('1234567890');
+$shipmentTrackRepository->save($track);
+
+
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_simple_shipment_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_simple_shipment_rollback.php
new file mode 100644
index 0000000000000..5fc01f2ecc073
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_simple_shipment_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/customer_order_with_two_items_rollback.php');
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping.php b/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping.php
new file mode 100644
index 0000000000000..c6396710a515f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Sales\Api\Data\ShipmentItemCreationInterface;
+use Magento\Sales\Api\Data\ShipmentTrackCreationInterface;
+use Magento\Sales\Api\ShipOrderInterface;
+use Magento\Sales\Model\Order;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/order_with_different_types_of_product.php');
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var ShipOrderInterface $shipOrder */
+$shipOrder = $objectManager->create(ShipOrderInterface::class);
+/** @var Order $order */
+$order = $objectManager->create(Order::class)->loadByIncrementId('100000001');
+//Set the shipping method
+$order->setShippingDescription('UPS Next Day Air');
+$order->setShippingMethod('ups_01');
+$order->save();
+
+//Create Shipment with UPS tracking and some items
+$shipmentItems = [];
+foreach ($order->getItems() as $orderItem) {
+    if (count($shipmentItems) === 2) {
+        break;
+    }
+    /** @var ShipmentItemCreationInterface $shipmentItem */
+    $shipmentItem = $objectManager->create(ShipmentItemCreationInterface::class);
+    $shipmentItem->setOrderItemId($orderItem->getItemId());
+    $shipmentItem->setQty($orderItem->getQtyOrdered());
+    $shipmentItems[] = $shipmentItem;
+}
+/** @var ShipmentTrackCreationInterface $track */
+$track = $objectManager->create(ShipmentTrackCreationInterface::class);
+$track->setCarrierCode('ups');
+$track->setTitle('United Parcel Service');
+$track->setTrackNumber('987654321');
+$shipOrder->execute($order->getEntityId(), $shipmentItems, false, false, null, [$track]);
+
+//Create second Shipment
+$shipmentItems = [];
+foreach ($order->getItems() as $orderItem) {
+    if ($orderItem->getQtyShipped() === 0) {
+        /** @var ShipmentItemCreationInterface $shipmentItem */
+        $shipmentItem = $objectManager->create(ShipmentItemCreationInterface::class);
+        $shipmentItem->setOrderItemId($orderItem->getItemId());
+        $shipmentItem->setQty($orderItem->getQtyOrdered());
+        $shipmentItems[] = $shipmentItem;
+    }
+}
+$shipOrder->execute($order->getEntityId(), $shipmentItems);
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping_rollback.php
new file mode 100644
index 0000000000000..6d7c5bd6b6465
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping_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_different_types_of_product_rollback.php');
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/customer_order_with_two_items.php b/dev/tests/integration/testsuite/Magento/Sales/_files/customer_order_with_two_items.php
index 7cebee082e99f..288b8c75d09c8 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/customer_order_with_two_items.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/customer_order_with_two_items.php
@@ -98,12 +98,14 @@
     ->setBaseSubtotal(20)
     ->setBaseShippingAmount(10)
     ->setBaseGrandTotal(30)
+    ->setOrderCurrencyCode('USD')
     ->setCustomerIsGuest(false)
     ->setCustomerEmail($customerDataModel->getEmail())
     ->setCustomerId($customerDataModel->getId())
     ->setBillingAddress($billingAddress)
     ->setShippingAddress($shippingAddress)
     ->setShippingDescription('Flat Rate - Fixed')
+    ->setShippingMethod('flatrate_flatrate')
     ->setStoreId($mainWebsite->getDefaultStore()->getId())
     ->addItem($firstOrderItem)
     ->addItem($secondOrderItem)
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
index 4140ce1c81f20..4b21abfb6ef91 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
@@ -61,6 +61,7 @@
     ->setGrandTotal(100)
     ->setBaseSubtotal(100)
     ->setBaseGrandTotal(100)
+    ->setOrderCurrencyCode('USD')
     ->setCustomerIsGuest(true)
     ->setCustomerEmail('customer@null.com')
     ->setBillingAddress($billingAddress)
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle_and_shipment.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle_and_shipment.php
new file mode 100644
index 0000000000000..be1b6b29a776b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle_and_shipment.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Sales\Api\Data\OrderInterfaceFactory;
+use Magento\Sales\Api\Data\OrderItemInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Item;
+use Magento\Sales\Model\Order\ShipmentFactory;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+use Magento\Framework\DB\Transaction;
+
+Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/order_with_customer.php');
+
+$objectManager = ObjectManager::getInstance();
+/** @var Order $order */
+$order = $objectManager->get(OrderInterfaceFactory::class)->create()->loadByIncrementId('100000001');
+
+$orderItems = [
+    [
+        OrderItemInterface::SKU => 'bundle_1',
+        OrderItemInterface::NAME => 'bundle_1',
+        OrderItemInterface::PRODUCT_ID => 2,
+        OrderItemInterface::BASE_PRICE => 100,
+        OrderItemInterface::ORDER_ID => $order->getId(),
+        OrderItemInterface::QTY_ORDERED => 2,
+        OrderItemInterface::PRICE => 100,
+        OrderItemInterface::ROW_TOTAL => 102,
+        OrderItemInterface::PRODUCT_TYPE => 'bundle',
+        'product_options' => [
+            'product_calculations' => 0,
+            'shipment_type' => 0,
+            "bundle_options"=> [
+                "1" => [
+                    "option_id"=> "1",
+                    "label" => "Bundle Option 1",
+                    "value" => [
+                        [
+                            "title" => "bundle_simple_1",
+                            "qty" => 1,
+                            "price" => 10
+                        ]
+                    ]
+                ],
+            ],
+        ],
+        'children' => [
+            [
+                OrderItemInterface::SKU => 'bundle_simple_1',
+                OrderItemInterface::NAME => 'bundle_simple_1',
+                OrderItemInterface::PRODUCT_ID => 13,
+                OrderItemInterface::ORDER_ID => $order->getId(),
+                OrderItemInterface::QTY_ORDERED => 10,
+                OrderItemInterface::BASE_PRICE => 90,
+                OrderItemInterface::PRICE => 90,
+                OrderItemInterface::ROW_TOTAL => 92,
+                OrderItemInterface::PRODUCT_TYPE => 'simple',
+                'product_options' => [
+                    'bundle_selection_attributes' => '{"qty":5}',
+                ],
+            ],
+        ],
+    ],
+];
+
+if (!function_exists('saveOrderItems')) {
+    /**
+     * Save Order Items.
+     *
+     * @param array $orderItems
+     * @param Order $order
+     * @param Item|null $parentOrderItem [optional]
+     * @return void
+     */
+    function saveOrderItems(array $orderItems, Order $order, $parentOrderItem = null)
+    {
+        $objectManager = ObjectManager::getInstance();
+
+        foreach ($orderItems as $orderItemData) {
+            /** @var Item $orderItem */
+            $orderItem = $objectManager->create(Item::class);
+            if (null !== $parentOrderItem) {
+                $orderItemData['parent_item'] = $parentOrderItem;
+            }
+            $orderItem->setData($orderItemData);
+            $order->addItem($orderItem);
+
+            if (isset($orderItemData['children'])) {
+                saveOrderItems($orderItemData['children'], $order, $orderItem);
+            }
+        }
+    }
+}
+
+saveOrderItems($orderItems, $order);
+/** @var OrderRepositoryInterface $orderRepository */
+$orderRepository = $objectManager->get(OrderRepositoryInterface::class);
+$order = $orderRepository->save($order);
+
+$shipmentItems = [];
+foreach ($order->getItems() as $orderItem) {
+    $shipmentItems[$orderItem->getId()] = $orderItem->getQtyOrdered();
+}
+$shipment = $objectManager->get(ShipmentFactory::class)->create($order, $shipmentItems);
+$shipment->register();
+
+/** @var Transaction $transaction */
+$transaction = $objectManager->create(Transaction::class);
+$transaction->addObject($shipment)->addObject($order)->save();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle_and_shipment_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle_and_shipment_rollback.php
new file mode 100644
index 0000000000000..07d468289f5b4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle_and_shipment_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/Sales/_files/order_rollback.php');
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_different_types_of_product.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_different_types_of_product.php
index cefe464cbba09..7065eba4bbb92 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_different_types_of_product.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_different_types_of_product.php
@@ -87,6 +87,8 @@
 /** @var \Magento\Sales\Model\Order\Item $orderItem */
 $orderConfigurableItem = $objectManager->create(\Magento\Sales\Model\Order\Item::class);
 $orderConfigurableItem->setProductId($configurableProduct->getId())->setQtyOrdered($qtyOrdered);
+$orderConfigurableItem->setSku($configurableProduct->getSku());
+$orderConfigurableItem->setName($configurableProduct->getName());
 $orderConfigurableItem->setBasePrice($configurableProduct->getPrice());
 $orderConfigurableItem->setPrice($configurableProduct->getPrice());
 $orderConfigurableItem->setRowTotal($configurableProduct->getPrice());
@@ -184,6 +186,8 @@
 /** @var \Magento\Sales\Model\Order\Item $orderItem */
 $orderBundleItem = $objectManager->create(\Magento\Sales\Model\Order\Item::class);
 $orderBundleItem->setProductId($bundleProduct->getId());
+$orderBundleItem->setSku($bundleProduct->getSku());
+$orderBundleItem->setName($bundleProduct->getName());
 $orderBundleItem->setQtyOrdered(1);
 $orderBundleItem->setBasePrice($bundleProduct->getPrice());
 $orderBundleItem->setPrice($bundleProduct->getPrice());

From b166cf57b72cd50c0485a9f4cc5fa0203f26b2c0 Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Wed, 22 Jul 2020 00:41:33 +0800
Subject: [PATCH 0958/1718] magento/adobe-stock-integration#1391:
 SaveAssetsKeywordsInterface to delete obsolete keywords - Enhancements,
 Revision on integration test and fix unit test failure

---
 .../ResourceModel/Keyword/SaveAssetLinks.php  | 65 +++++++++----------
 .../Keyword/SaveAssetLinksTest.php            |  9 +++
 .../Model/ResourceModel/AssetKeywordsTest.php | 40 +++++++-----
 3 files changed, 61 insertions(+), 53 deletions(-)

diff --git a/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetLinks.php b/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetLinks.php
index f18daae030385..a1b057cee5d0d 100644
--- a/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetLinks.php
+++ b/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetLinks.php
@@ -88,35 +88,29 @@ public function execute(int $assetId, array $keywordIds): void
      *
      * @param int $assetId
      * @param int[] $keywordIds
-     * @throws CouldNotSaveException
      */
     private function insertAssetKeywords(int $assetId, array $keywordIds): void
     {
+        if (empty($keywordIds)) {
+            return;
+        }
         try {
-            if (!empty($keywordIds)) {
-                $values = [];
-
-                foreach ($keywordIds as $keywordId) {
-                    $values[] = [$assetId, $keywordId];
-                }
-
-                if (!empty($values)) {
-                    /** @var Mysql $connection */
-                    $connection = $this->resourceConnection->getConnection();
-                    $connection->insertArray(
-                        $this->resourceConnection->getTableName(self::TABLE_ASSET_KEYWORD),
-                        [self::FIELD_ASSET_ID, self::FIELD_KEYWORD_ID],
-                        $values,
-                        AdapterInterface::INSERT_IGNORE
-                    );
-                }
+            $values = [];
+
+            foreach ($keywordIds as $keywordId) {
+                $values[] = [$assetId, $keywordId];
             }
+
+            /** @var Mysql $connection */
+            $connection = $this->resourceConnection->getConnection();
+            $connection->insertArray(
+                $this->resourceConnection->getTableName(self::TABLE_ASSET_KEYWORD),
+                [self::FIELD_ASSET_ID, self::FIELD_KEYWORD_ID],
+                $values,
+                AdapterInterface::INSERT_IGNORE
+            );
         } catch (\Exception $exception) {
             $this->logger->critical($exception);
-            throw new CouldNotSaveException(
-                __('Could not save asset keyword links'),
-                $exception
-            );
         }
     }
 
@@ -129,20 +123,21 @@ private function insertAssetKeywords(int $assetId, array $keywordIds): void
      */
     private function deleteAssetKeywords(int $assetId, array $obsoleteKeywordIds): void
     {
+        if (empty($obsoleteKeywordIds)) {
+            return;
+        }
         try {
-            if (!empty($obsoleteKeywordIds)) {
-                /** @var Mysql $connection */
-                $connection = $this->resourceConnection->getConnection();
-                $connection->delete(
-                    $connection->getTableName(
-                        self::TABLE_ASSET_KEYWORD
-                    ),
-                    [
-                        self::FIELD_KEYWORD_ID . ' in (?)' => $obsoleteKeywordIds,
-                        self::FIELD_ASSET_ID . ' = ?' => $assetId
-                    ]
-                );
-            }
+            /** @var Mysql $connection */
+            $connection = $this->resourceConnection->getConnection();
+            $connection->delete(
+                $connection->getTableName(
+                    self::TABLE_ASSET_KEYWORD
+                ),
+                [
+                    self::FIELD_KEYWORD_ID . ' in (?)' => $obsoleteKeywordIds,
+                    self::FIELD_ASSET_ID . ' = ?' => $assetId
+                ]
+            );
         } catch (\Exception $exception) {
             $this->logger->critical($exception);
             throw new CouldNotDeleteException(
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 95fdac5bdafa5..0bc81fbedaa19 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
@@ -11,6 +11,7 @@
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\MediaGallery\Model\ResourceModel\Keyword\SaveAssetLinks;
+use Magento\MediaGalleryApi\Api\GetAssetsKeywordsInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
@@ -32,6 +33,11 @@ class SaveAssetLinksTest extends TestCase
      */
     private $resourceConnectionMock;
 
+    /**
+     * @var GetAssetsKeywordsInterface
+     */
+    private $getAssetsKeywords;
+
     /**
      * @var LoggerInterface|MockObject
      */
@@ -44,9 +50,11 @@ protected function setUp(): void
     {
         $this->connectionMock = $this->getMockForAbstractClass(AdapterInterface::class);
         $this->resourceConnectionMock = $this->createMock(ResourceConnection::class);
+        $this->getAssetsKeywords = $this->getMockForAbstractClass(GetAssetsKeywordsInterface::class);
         $this->loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
 
         $this->sut = new SaveAssetLinks(
+            $this->getAssetsKeywords,
             $this->resourceConnectionMock,
             $this->loggerMock
         );
@@ -60,6 +68,7 @@ protected function setUp(): void
      * @param int $assetId
      * @param array $keywordIds
      * @param array $values
+     * @throws CouldNotSaveException
      */
     public function testAssetKeywordsSave(int $assetId, array $keywordIds, array $values): void
     {
diff --git a/dev/tests/integration/testsuite/Magento/MediaGallery/Model/ResourceModel/AssetKeywordsTest.php b/dev/tests/integration/testsuite/Magento/MediaGallery/Model/ResourceModel/AssetKeywordsTest.php
index fcfd2911d9327..53711c0074a64 100644
--- a/dev/tests/integration/testsuite/Magento/MediaGallery/Model/ResourceModel/AssetKeywordsTest.php
+++ b/dev/tests/integration/testsuite/Magento/MediaGallery/Model/ResourceModel/AssetKeywordsTest.php
@@ -8,9 +8,9 @@
 namespace Magento\MediaGallery\Model\ResourceModel;
 
 use Behat\Gherkin\Keywords\KeywordsInterface;
-use Magento\MediaGalleryApi\Api\Data\KeywordInterfaceFactory;
-use Magento\MediaGalleryApi\Api\Data\AssetKeywordsInterfaceFactory;
 use Magento\MediaGalleryApi\Api\Data\AssetKeywordsInterface;
+use Magento\MediaGalleryApi\Api\Data\AssetKeywordsInterfaceFactory;
+use Magento\MediaGalleryApi\Api\Data\KeywordInterfaceFactory;
 use Magento\MediaGalleryApi\Api\GetAssetsByPathsInterface;
 use Magento\MediaGalleryApi\Api\GetAssetsKeywordsInterface;
 use Magento\MediaGalleryApi\Api\SaveAssetsKeywordsInterface;
@@ -66,8 +66,8 @@ protected function setUp(): void
      *
      * @magentoDataFixture Magento/MediaGallery/_files/media_asset.php
      * @dataProvider keywordsProvider
-     * @param array|null $keywords
-     * @param array|null $updatedKeywords
+     * @param string[] $keywords
+     * @param string[] $updatedKeywords
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function testSaveAndGetKeywords(array $keywords = [], array $updatedKeywords = []): void
@@ -77,16 +77,17 @@ public function testSaveAndGetKeywords(array $keywords = [], array $updatedKeywo
         $loadedAsset = current($loadedAssets);
 
         $this->updateAssetKeywords($loadedAsset->getId(), $keywords);
-        $this->updateAssetKeywords($loadedAsset->getId(), $updatedKeywords);
+        $this->updateAssetKeywords($loadedAsset->getId(), $updatedKeywords, $keywords);
     }
 
     /**
      * Update Asset keywords
      *
      * @param int $assetId
-     * @param array|null $keywords
+     * @param string[] $keywords
+     * @param string[] $currentKeywords
      */
-    private function updateAssetKeywords(int $assetId, array $keywords = []): void
+    private function updateAssetKeywords(int $assetId, array $keywords = [], array $currentKeywords = []): void
     {
         $assetKeywords = $this->assetsKeywordsFactory->create(
             [
@@ -98,25 +99,28 @@ private function updateAssetKeywords(int $assetId, array $keywords = []): void
         $this->saveAssetsKeywords->execute([$assetKeywords]);
         $loadedAssetKeywords = $this->getAssetsKeywords->execute([$assetId]);
 
-        if (!empty($keywords)) {
-            $this->assertCount(1, $loadedAssetKeywords);
-            /** @var AssetKeywordsInterface $loadedAssetKeyword */
-            $loadedAssetKeyword = current($loadedAssetKeywords);
+        $currentKeywords = empty($keywords) ? $currentKeywords : $keywords;
+        $expectedCount = !empty($currentKeywords) ? 1 : 0;
+
+        $this->assertCount($expectedCount, $loadedAssetKeywords);
+        /** @var AssetKeywordsInterface $loadedAssetKeyword */
+        $loadedAssetKeyword = current($loadedAssetKeywords);
 
-            $loadedKeywords = $loadedAssetKeyword->getKeywords();
+        $loadedKeywords = !empty($loadedAssetKeyword) ? $loadedAssetKeyword->getKeywords() : [];
 
-            $this->assertEquals(count($keywords), count($loadedKeywords));
+        $this->assertEquals(count($currentKeywords), count($loadedKeywords));
 
-            $loadedKeywordStrings = [];
+        $loadedKeywordStrings = [];
+        if (!empty($loadedKeywords)) {
             foreach ($loadedKeywords as $loadedKeywordObject) {
                 $loadedKeywordStrings[] = $loadedKeywordObject->getKeyword();
             }
+        }
 
-            sort($loadedKeywordStrings);
-            sort($keywords);
+        sort($loadedKeywordStrings);
+        sort($currentKeywords);
 
-            $this->assertEquals($keywords, $loadedKeywordStrings);
-        }
+        $this->assertEquals($currentKeywords, $loadedKeywordStrings);
     }
 
     /**

From a00482d2bb667284b025341256b704cdd4c3316c Mon Sep 17 00:00:00 2001
From: Vitalii Zabaznov <vzabaznov@magento.com>
Date: Tue, 21 Jul 2020 12:27:10 -0500
Subject: [PATCH 0959/1718] MC-35885: Process public PR with bin/magento
 improvements

---
 .../Framework/Module/Test/Unit/DependencyCheckerTest.php     | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/internal/Magento/Framework/Module/Test/Unit/DependencyCheckerTest.php b/lib/internal/Magento/Framework/Module/Test/Unit/DependencyCheckerTest.php
index aafafaf378f01..dfe255f90f01a 100644
--- a/lib/internal/Magento/Framework/Module/Test/Unit/DependencyCheckerTest.php
+++ b/lib/internal/Magento/Framework/Module/Test/Unit/DependencyCheckerTest.php
@@ -27,11 +27,6 @@ class DependencyCheckerTest extends TestCase
      */
     private $packageInfoMock;
 
-    /**
-     * @var PackageInfoFactory|MockObject
-     */
-    private $packageInfoFactoryMock;
-
     /**
      * @var ModuleList|MockObject
      */

From 96693833ddb3797da6ca8b0bad1ff458322f22cb Mon Sep 17 00:00:00 2001
From: Anusha Vattam <avattam@adobe.com>
Date: Tue, 21 Jul 2020 12:49:47 -0500
Subject: [PATCH 0960/1718] MC-35653:MyAccount :: Order Details :: Payments
 Methods, shipping address, billing address by Order Number

- Added static fix changes on address
---
 .../Sales/RetrieveOrdersByOrderNumberTest.php | 183 +++++++++---------
 1 file changed, 94 insertions(+), 89 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php
index f25a6ddededda..d0caa90731887 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php
@@ -50,89 +50,8 @@ protected function setUp():void
      */
     public function testGetCustomerOrdersSimpleProductQuery()
     {
-        $query =
-            <<<QUERY
-{
-  customer
-  {
-   orders(filter:{number:{eq:"100000002"}}){
-    total_count
-    items
-    {
-      id
-      number
-      status
-      order_date
-      payment_methods
-      {
-        name
-        type
-        additional_data
-        {
-         name
-         value
-         }
-      }
-      shipping_address {
-         ... address
-      }
-      billing_address {
-      ... address
-      }
-      items{
-        quantity_ordered
-        product_sku
-        product_name
-        product_sale_price{currency value}
-      }
-      total {
-                    base_grand_total {
-                        value
-                        currency
-                    }
-                    grand_total {
-                        value
-                        currency
-                    }
-                    subtotal {
-                        value
-                        currency
-                    }
-
-                }
-    }
-   }
- }
-}
-
-fragment address on OrderAddress {
-          firstname
-          lastname
-          city
-          company
-          country_code
-          fax
-          middlename
-          postcode
-          prefix
-          street
-          region
-          region_id
-          suffix
-          telephone
-          vat_id
-        }
-QUERY;
-
-        $currentEmail = 'customer@example.com';
-        $currentPassword = 'password';
-        $response = $this->graphQlQuery(
-            $query,
-            [],
-            '',
-            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
-        );
-
+        $orderNumber = '100000002';
+        $response = $this->getCustomerOrderQueryOnSimpleProducts($orderNumber);
         $this->assertArrayHasKey('orders', $response['customer']);
         $this->assertArrayHasKey('items', $response['customer']['orders']);
         $this->assertNotEmpty($response['customer']['orders']['items']);
@@ -198,14 +117,12 @@ public function testCustomerOrdersSimpleProductWithTaxesAndDiscounts()
             'company' => 'Test company',
             'country_code' => 'US',
             'postcode' => '78717',
-            'prefix' => 'John',
             'region' => 'Texas',
             'region_id' => '57',
             'street' => [
                 0 => 'test street 1',
                 1 => 'test street 2',
             ],
-            'suffix' => 'John',
             'telephone' => '5123456677'
         ];
         $this->assertResponseFields($customerOrderResponse[0]["billing_address"], $billingAssertionMap);
@@ -216,14 +133,12 @@ public function testCustomerOrdersSimpleProductWithTaxesAndDiscounts()
             'company' => 'test company',
             'country_code' => 'US',
             'postcode' => '36013',
-            'prefix' => 'test shipFirst',
             'street' => [
                 0 => 'test street 1',
                 1 => 'test street 2',
             ],
             'region_id' => '1',
             'region' => 'Alabama',
-            'suffix' => 'test shipFirst',
             'telephone' => '3347665522'
         ];
         $this->assertResponseFields($customerOrderResponse[0]["shipping_address"], $shippingAssertionMap);
@@ -1348,11 +1263,9 @@ private function getCustomerOrderQuery($orderNumber): array
           fax
           middlename
           postcode
-          prefix
           street
           region
           region_id
-          suffix
           telephone
           vat_id
         }
@@ -1371,6 +1284,98 @@ private function getCustomerOrderQuery($orderNumber): array
         return $response['customer']['orders']['items'];
     }
 
+    /**
+     * Get customer order query
+     *
+     * @param string $orderNumber
+     * @return array
+     */
+    private function getCustomerOrderQueryOnSimpleProducts($orderNumber): array
+    {
+        $query =
+            <<<QUERY
+{
+  customer
+  {
+   orders(filter:{number:{eq:"{$orderNumber}"}}) {
+    total_count
+    items
+    {
+      id
+      number
+      status
+      order_date
+      payment_methods
+      {
+        name
+        type
+        additional_data
+        {
+         name
+         value
+         }
+      }
+      shipping_address {
+         ... address
+      }
+      billing_address {
+      ... address
+      }
+      items{
+        quantity_ordered
+        product_sku
+        product_name
+        product_sale_price{currency value}
+      }
+      total {
+             base_grand_total {
+                        value
+                        currency
+                    }
+                    grand_total {
+                        value
+                        currency
+                    }
+                    subtotal {
+                        value
+                        currency
+                    }
+                }
+    }
+   }
+ }
+}
+
+fragment address on OrderAddress {
+          firstname
+          lastname
+          city
+          company
+          country_code
+          fax
+          middlename
+          postcode
+          street
+          region
+          region_id
+          telephone
+          vat_id
+        }
+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']);
+        return $response;
+    }
+
     /**
      * Clean up orders
      *

From 7bd1c29721580a9368a5ddadb12e896058ee452d Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Tue, 21 Jul 2020 13:51:53 -0500
Subject: [PATCH 0961/1718] MC-20639: MyAccount :: Order Details :: Refund
 (creditMemo) Details by Order Number

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

diff --git a/app/code/Magento/SalesGraphQl/etc/schema.graphqls b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
index 8f898caf829ed..d90665d101491 100644
--- a/app/code/Magento/SalesGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
@@ -203,7 +203,7 @@ type PaymentMethod @doc(description: "Contains details about the payment method
 type CreditMemo @doc(description: "Credit memo details") {
     id: ID! @doc(description: "The unique ID of the credit memo, used for API purposes")
     number: String! @doc(description: "The sequential credit memo number")
-    items: [CreditMemoItem] @doc(description: "An array containing details about refunded items") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\CreditMemo\\CreditMemoItems")
+    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")
 }
@@ -220,7 +220,7 @@ interface CreditMemoItemInterface @doc(description: "Credit memo item details")
 type CreditMemoItem implements CreditMemoItemInterface {
 }
 
-type BundleCreditMemoItem implements CreditMemoIntemInterface {
+type BundleCreditMemoItem implements CreditMemoItemInterface {
     bundle_options: [ItemSelectedBundleOption] @doc(description: "A list of bundle options that are assigned to the bundle product")
 }
 

From d9099231abd515f1fa8ba9a64b7cfa575db23f8e Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Tue, 21 Jul 2020 14:30:08 -0500
Subject: [PATCH 0962/1718] MC-32014: Remove google-shopping-ads module from
 core in 2.4.1

---
 app/etc/di.xml                                |   3 -
 dev/tests/integration/bin/magento             |   8 +-
 .../TestFramework/Console/CliProxy.php        | 123 ++++++++++++++++++
 .../etc/di/preferences/cli/ce.php             |   9 ++
 .../TestFramework/Deploy/CliCommand.php       |  62 ++++++---
 .../Mview/DummyTriggerCleaner.php             |  24 ++++
 .../setup-integration/framework/bootstrap.php |  10 +-
 .../Magento/Framework/Indexer/Config.php      |  29 -----
 .../Framework/Mview/TriggerCleaner.php        |   8 +-
 .../Mview/TriggerCleanerInterface.php         |  20 ---
 .../Framework/Mview/View/State/Collection.php |  21 ---
 setup/config/di.config.php                    |   3 -
 setup/src/Magento/Setup/Model/Installer.php   |  89 +++++++++----
 13 files changed, 285 insertions(+), 124 deletions(-)
 create mode 100644 dev/tests/integration/framework/Magento/TestFramework/Console/CliProxy.php
 create mode 100644 dev/tests/setup-integration/etc/di/preferences/cli/ce.php
 create mode 100644 dev/tests/setup-integration/framework/Magento/TestFramework/Mview/DummyTriggerCleaner.php
 delete mode 100644 lib/internal/Magento/Framework/Indexer/Config.php
 delete mode 100644 lib/internal/Magento/Framework/Mview/TriggerCleanerInterface.php
 delete mode 100644 lib/internal/Magento/Framework/Mview/View/State/Collection.php

diff --git a/app/etc/di.xml b/app/etc/di.xml
index 93f16b3cd69de..ba635d0662755 100644
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -209,9 +209,6 @@
     <preference for="Magento\Framework\MessageQueue\QueueFactoryInterface" type="Magento\Framework\MessageQueue\QueueFactory" />
     <preference for="Magento\Framework\Search\Request\IndexScopeResolverInterface" type="Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver"/>
     <preference for="Magento\Framework\HTTP\ClientInterface" type="Magento\Framework\HTTP\Client\Curl" />
-    <preference for="Magento\Framework\Mview\TriggerCleanerInterface" type="\Magento\Framework\Mview\TriggerCleaner"/>
-    <preference for="Magento\Framework\Indexer\ConfigInterface" type="\Magento\Framework\Indexer\Config"/>
-    <preference for="Magento\Framework\Mview\View\State\CollectionInterface" type="Magento\Framework\Mview\View\State\Collection" />
     <type name="Magento\Framework\Model\ResourceModel\Db\TransactionManager" shared="false" />
     <type name="Magento\Framework\Acl\Data\Cache">
         <arguments>
diff --git a/dev/tests/integration/bin/magento b/dev/tests/integration/bin/magento
index 303fbfb217d2b..4a86eaee01e83 100755
--- a/dev/tests/integration/bin/magento
+++ b/dev/tests/integration/bin/magento
@@ -5,6 +5,9 @@
  * See COPYING.txt for license details.
  */
 
+use Magento\Framework\Console\Cli;
+use Magento\TestFramework\Console\CliProxy;
+
 if (PHP_SAPI !== 'cli') {
     echo 'bin/magento must be run as a CLI application';
     exit(1);
@@ -21,7 +24,8 @@ if (isset($_SERVER['INTEGRATION_TEST_PARAMS'])) {
 }
 
 try {
-    require $_SERVER['MAGE_DIRS']['base']['path'] . '/app/bootstrap.php';
+    require $_SERVER['INTEGRATION_TESTS_CLI_AUTOLOADER'] ??
+        ($_SERVER['MAGE_DIRS']['base']['path'] . '/app/bootstrap.php');
 } catch (\Exception $e) {
     echo 'Autoload error: ' . $e->getMessage();
     exit(1);
@@ -29,7 +33,7 @@ try {
 try {
     $handler = new \Magento\Framework\App\ErrorHandler();
     set_error_handler([$handler, 'handler']);
-    $application = new Magento\Framework\Console\Cli('Magento CLI');
+    $application = new CliProxy('Magento CLI');
     $application->run();
 } catch (\Exception $e) {
     while ($e) {
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Console/CliProxy.php b/dev/tests/integration/framework/Magento/TestFramework/Console/CliProxy.php
new file mode 100644
index 0000000000000..d47931f4734ab
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Console/CliProxy.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Console;
+
+use Magento\Framework\Console\Cli;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\ObjectManagerInterface;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class CliProxy implements \Magento\Framework\ObjectManager\NoninterceptableInterface
+{
+    /**
+     * @var Cli
+     */
+    private $subject;
+
+    /**
+     * @param string $name
+     * @param string $version
+     * @throws \ReflectionException
+     * @throws LocalizedException
+     */
+    public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN')
+    {
+        $this->subject = new Cli($name, $version);
+        $this->injectDiConfiguration($this->subject);
+    }
+
+    /**
+     * Runs the current application.
+     *
+     * @see \Magento\Framework\Console\Cli::doRun
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return int|null
+     * @throws \Exception
+     */
+    public function doRun(InputInterface $input, OutputInterface $output)
+    {
+        return $this->getSubject()->doRun($input, $output);
+    }
+
+    /**
+     * Runs the current application.
+     *
+     * @see \Symfony\Component\Console\Application::run
+     * @param InputInterface|null $input
+     * @param OutputInterface|null $output
+     * @return int
+     * @throws \Exception
+     */
+    public function run(InputInterface $input = null, OutputInterface $output = null)
+    {
+        return $this->getSubject()->run($input, $output);
+    }
+
+    /**
+     * Get subject
+     *
+     * @return Cli
+     */
+    private function getSubject(): Cli
+    {
+        return $this->subject;
+    }
+
+    /**
+     * Inject additional DI configuration
+     *
+     * @param Cli $cli
+     * @return bool
+     * @throws LocalizedException
+     * @throws \ReflectionException
+     */
+    private function injectDiConfiguration(Cli $cli): bool
+    {
+        $diPreferences = $this->getDiPreferences();
+        if ($diPreferences) {
+            $object = new \ReflectionObject($cli);
+
+            $attribute = $object->getProperty('objectManager');
+            $attribute->setAccessible(true);
+
+            /** @var ObjectManagerInterface $objectManager */
+            $objectManager = $attribute->getValue($cli);
+            $objectManager->configure($diPreferences);
+
+            $attribute->setAccessible(false);
+        }
+
+        return true;
+    }
+
+    /**
+     * Get additional DI preferences
+     *
+     * @return array|array[]
+     * @throws LocalizedException
+     * @SuppressWarnings(PHPMD.Superglobals)
+     */
+    private function getDiPreferences(): array
+    {
+        $diPreferences = [];
+        $diPreferencesPath = $_SERVER['TESTS_BASE_DIR'] . '/etc/di/preferences/cli/';
+
+        $preferenceFiles = glob($diPreferencesPath . '*.php');
+
+        foreach ($preferenceFiles as $file) {
+            if (!is_readable($file)) {
+                throw new LocalizedException(__("'%1' is not readable file.", $file));
+            }
+            $diPreferences = array_replace($diPreferences, include $file);
+        }
+
+        return $diPreferences ? ['preferences' => $diPreferences] : $diPreferences;
+    }
+}
diff --git a/dev/tests/setup-integration/etc/di/preferences/cli/ce.php b/dev/tests/setup-integration/etc/di/preferences/cli/ce.php
new file mode 100644
index 0000000000000..b5605d98206f3
--- /dev/null
+++ b/dev/tests/setup-integration/etc/di/preferences/cli/ce.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+return [
+    '\Magento\Framework\Mview\TriggerCleaner' => '\Magento\TestFramework\Mview\DummyTriggerCleaner',
+];
diff --git a/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/CliCommand.php b/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/CliCommand.php
index 10a839df83a5e..9507e50d71638 100644
--- a/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/CliCommand.php
+++ b/dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/CliCommand.php
@@ -6,17 +6,20 @@
 namespace Magento\TestFramework\Deploy;
 
 use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Shell;
 use Magento\Framework\Shell\CommandRenderer;
 use Magento\Setup\Console\Command\InstallCommand;
 
 /**
  * The purpose of this class is enable/disable module and upgrade commands execution.
+ *
+ * @SuppressWarnings(PHPMD.TooManyPublicMethods)
  */
 class CliCommand
 {
     /**
-     * @var \Magento\Framework\Shell
+     * @var Shell
      */
     private $shell;
 
@@ -36,10 +39,7 @@ class CliCommand
     private $deploymentConfig;
 
     /**
-     * ShellCommand constructor.
-     *
-     * @param    TestModuleManager $testEnv
-     * @param DeploymentConfig $deploymentConfig
+     * @param TestModuleManager $testEnv
      * @internal param Shell $shell
      */
     public function __construct(
@@ -53,8 +53,9 @@ public function __construct(
     /**
      * Copy Test module files and execute enable module command.
      *
-     * @param  string $moduleName
+     * @param string $moduleName
      * @return string
+     * @throws LocalizedException
      */
     public function introduceModule($moduleName)
     {
@@ -65,13 +66,14 @@ public function introduceModule($moduleName)
     /**
      * Execute enable module command.
      *
-     * @param  string $moduleName
+     * @param string $moduleName
      * @return string
+     * @throws LocalizedException
      */
     public function enableModule($moduleName)
     {
         $initParams = $this->parametersHolder->getInitParams();
-        $enableModuleCommand = 'php -f ' . BP . '/bin/magento module:enable ' . $moduleName
+        $enableModuleCommand = $this->getCliScriptCommand() . ' module:enable ' . $moduleName
             . ' -n -vvv --magento-init-params="' . $initParams['magento-init-params'] . '"';
         return $this->shell->execute($enableModuleCommand);
     }
@@ -81,11 +83,12 @@ public function enableModule($moduleName)
      *
      * @param array $installParams
      * @return string
+     * @throws LocalizedException
      */
     public function upgrade($installParams = [])
     {
         $initParams = $this->parametersHolder->getInitParams();
-        $upgradeCommand = 'php -f ' . BP . '/bin/magento setup:upgrade -vvv -n --magento-init-params="'
+        $upgradeCommand = $this->getCliScriptCommandWithDI() . 'setup:upgrade -vvv -n --magento-init-params="'
             . $initParams['magento-init-params'] . '"';
         $installParams = $this->toCliArguments($installParams);
         $upgradeCommand .= ' ' . implode(" ", array_keys($installParams));
@@ -96,13 +99,14 @@ public function upgrade($installParams = [])
     /**
      * Execute disable module command.
      *
-     * @param  string $moduleName
+     * @param string $moduleName
      * @return string
+     * @throws LocalizedException
      */
     public function disableModule($moduleName)
     {
         $initParams = $this->parametersHolder->getInitParams();
-        $disableModuleCommand = 'php -f ' . BP . '/bin/magento module:disable '. $moduleName
+        $disableModuleCommand = $this->getCliScriptCommand() . ' module:disable ' . $moduleName
             . ' -vvv --magento-init-params="' . $initParams['magento-init-params'] . '"';
         return $this->shell->execute($disableModuleCommand);
     }
@@ -111,6 +115,7 @@ public function disableModule($moduleName)
      * Split quote db configuration.
      *
      * @return void
+     * @throws LocalizedException
      */
     public function splitQuote()
     {
@@ -118,7 +123,7 @@ public function splitQuote()
         $installParams = $this->toCliArguments(
             $this->parametersHolder->getDbData('checkout')
         );
-        $command = 'php -f ' . BP . '/bin/magento setup:db-schema:split-quote ' .
+        $command = $this->getCliScriptCommand() . ' setup:db-schema:split-quote ' .
             implode(" ", array_keys($installParams)) .
             ' -vvv --magento-init-params="' .
             $initParams['magento-init-params'] . '"';
@@ -130,6 +135,7 @@ public function splitQuote()
      * Split sales db configuration.
      *
      * @return void
+     * @throws LocalizedException
      */
     public function splitSales()
     {
@@ -137,7 +143,7 @@ public function splitSales()
         $installParams = $this->toCliArguments(
             $this->parametersHolder->getDbData('sales')
         );
-        $command = 'php -f ' . BP . '/bin/magento setup:db-schema:split-sales ' .
+        $command = $this->getCliScriptCommand() . ' setup:db-schema:split-sales ' .
             implode(" ", array_keys($installParams)) .
             ' -vvv --magento-init-params="' .
             $initParams['magento-init-params'] . '"';
@@ -151,7 +157,7 @@ public function splitSales()
     public function cacheClean()
     {
         $initParams = $this->parametersHolder->getInitParams();
-        $command = 'php -f ' . BP . '/bin/magento cache:clean ' .
+        $command = $this->getCliScriptCommand() . ' cache:clean ' .
             ' -vvv --magento-init-params=' .
             $initParams['magento-init-params'];
 
@@ -162,11 +168,12 @@ public function cacheClean()
      * Uninstall module
      *
      * @param string $moduleName
+     * @throws LocalizedException
      */
     public function uninstallModule($moduleName)
     {
         $initParams = $this->parametersHolder->getInitParams();
-        $command = 'php -f ' . BP . '/bin/magento module:uninstall ' . $moduleName . ' --remove-data ' .
+        $command = $this->getCliScriptCommand() . ' module:uninstall ' . $moduleName . ' --remove-data ' .
             ' -vvv --non-composer --magento-init-params="' .
             $initParams['magento-init-params'] . '"';
 
@@ -240,4 +247,29 @@ public function afterInstall()
             ->get(DeploymentConfig::class);
         $this->deploymentConfig->resetData();
     }
+
+    /**
+     * Get custom magento-cli command with additional DI configuration
+     *
+     * @return string
+     */
+    private function getCliScriptCommandWithDI(): string
+    {
+        $params['MAGE_DIRS']['base']['path'] = BP;
+        $params['INTEGRATION_TESTS_CLI_AUTOLOADER'] = TESTS_BASE_DIR . '/framework/autoload.php';
+        $params['TESTS_BASE_DIR'] = TESTS_BASE_DIR;
+        return 'INTEGRATION_TEST_PARAMS="' . urldecode(http_build_query($params)) . '"'
+        . ' ' . PHP_BINARY . ' -f ' . INTEGRATION_TESTS_BASE_DIR
+        . '/bin/magento ';
+    }
+
+    /**
+     * Get basic magento-cli command
+     *
+     * @return string
+     */
+    private function getCliScriptCommand()
+    {
+        return PHP_BINARY . ' -f ' . BP . '/bin/magento ';
+    }
 }
diff --git a/dev/tests/setup-integration/framework/Magento/TestFramework/Mview/DummyTriggerCleaner.php b/dev/tests/setup-integration/framework/Magento/TestFramework/Mview/DummyTriggerCleaner.php
new file mode 100644
index 0000000000000..1a7108150eb24
--- /dev/null
+++ b/dev/tests/setup-integration/framework/Magento/TestFramework/Mview/DummyTriggerCleaner.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Mview;
+
+/**
+ * Stub for \Magento\Framework\Mview\TriggerCleaner
+ */
+class DummyTriggerCleaner
+{
+    /**
+     * Remove the outdated trigger from the system
+     *
+     * @return bool
+     */
+    public function removeTriggers(): bool
+    {
+        return true;
+    }
+}
diff --git a/dev/tests/setup-integration/framework/bootstrap.php b/dev/tests/setup-integration/framework/bootstrap.php
index 01f60a3376ff8..f10f430f2f401 100644
--- a/dev/tests/setup-integration/framework/bootstrap.php
+++ b/dev/tests/setup-integration/framework/bootstrap.php
@@ -3,8 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-use Magento\Framework\Autoload\AutoloaderRegistry;
+
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Autoload\AutoloaderRegistry;
 
 require_once __DIR__ . '/../../../../app/bootstrap.php';
 require_once __DIR__ . '/autoload.php';
@@ -13,7 +14,7 @@
 
 $testsBaseDir = dirname(__DIR__);
 $integrationTestsDir = realpath("{$testsBaseDir}/../integration");
-$fixtureBaseDir = $integrationTestsDir. '/testsuite';
+$fixtureBaseDir = $integrationTestsDir . '/testsuite';
 
 if (!defined('TESTS_BASE_DIR')) {
     define('TESTS_BASE_DIR', $testsBaseDir);
@@ -30,8 +31,11 @@
 if (!defined('MAGENTO_MODULES_PATH')) {
     define('MAGENTO_MODULES_PATH', __DIR__ . '/../../../../app/code/Magento/');
 }
-$settings = new \Magento\TestFramework\Bootstrap\Settings($testsBaseDir, get_defined_constants());
 
+if (!defined('INTEGRATION_TESTS_BASE_DIR')) {
+    define('INTEGRATION_TESTS_BASE_DIR', $integrationTestsDir);
+}
+$settings = new \Magento\TestFramework\Bootstrap\Settings($testsBaseDir, get_defined_constants());
 
 try {
     setCustomErrorHandler();
diff --git a/lib/internal/Magento/Framework/Indexer/Config.php b/lib/internal/Magento/Framework/Indexer/Config.php
deleted file mode 100644
index 97584379b7ab5..0000000000000
--- a/lib/internal/Magento/Framework/Indexer/Config.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\Indexer;
-
-/**
- * Indexers configuration
- */
-class Config implements ConfigInterface
-{
-    /**
-     * @inheritDoc
-     */
-    public function getIndexers()
-    {
-        return [];
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getIndexer($indexerId)
-    {
-        return [];
-    }
-}
diff --git a/lib/internal/Magento/Framework/Mview/TriggerCleaner.php b/lib/internal/Magento/Framework/Mview/TriggerCleaner.php
index de670e2b63fd2..0c28acd9b9e03 100644
--- a/lib/internal/Magento/Framework/Mview/TriggerCleaner.php
+++ b/lib/internal/Magento/Framework/Mview/TriggerCleaner.php
@@ -14,7 +14,7 @@
 /**
  * Class for removing old triggers that were created by mview
  */
-class TriggerCleaner implements TriggerCleanerInterface
+class TriggerCleaner
 {
     /**
      * @var CollectionFactory
@@ -47,10 +47,12 @@ public function __construct(
     }
 
     /**
-     * @inheritDoc
+     * Remove the outdated trigger from the system
+     *
+     * @return bool
      * @throws \Exception
      */
-    public function unsubscribe(): bool
+    public function removeTriggers(): bool
     {
         $viewCollection = $this->viewCollectionFactory->create();
         $viewList = $viewCollection->getViewsByStateMode(StateInterface::MODE_ENABLED);
diff --git a/lib/internal/Magento/Framework/Mview/TriggerCleanerInterface.php b/lib/internal/Magento/Framework/Mview/TriggerCleanerInterface.php
deleted file mode 100644
index 5991a5f01c398..0000000000000
--- a/lib/internal/Magento/Framework/Mview/TriggerCleanerInterface.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\Mview;
-
-/**
- * Service for processing of DB triggers
- */
-interface TriggerCleanerInterface
-{
-    /**
-     * Remove the outdated trigger from the system
-     *
-     * @return bool
-     */
-    public function unsubscribe(): bool;
-}
diff --git a/lib/internal/Magento/Framework/Mview/View/State/Collection.php b/lib/internal/Magento/Framework/Mview/View/State/Collection.php
deleted file mode 100644
index a992656895c72..0000000000000
--- a/lib/internal/Magento/Framework/Mview/View/State/Collection.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Framework\Mview\View\State;
-
-/**
- * View state collection
- */
-class Collection implements CollectionInterface
-{
-    /**
-     * @inheritDoc
-     */
-    public function getItems()
-    {
-        return [];
-    }
-}
diff --git a/setup/config/di.config.php b/setup/config/di.config.php
index 514ba46ea3192..ccbf3b51fe1c2 100644
--- a/setup/config/di.config.php
+++ b/setup/config/di.config.php
@@ -14,8 +14,6 @@
 use Magento\Framework\Filesystem\DriverInterface;
 use Magento\Framework\Locale\Config;
 use Magento\Framework\Locale\ConfigInterface;
-use Magento\Framework\Mview\TriggerCleaner;
-use Magento\Framework\Mview\TriggerCleanerInterface;
 use Magento\Framework\Setup\Declaration\Schema\SchemaConfig;
 
 return [
@@ -28,7 +26,6 @@
                 ConfigInterface::class => Config::class,
                 DriverInterface::class => \Magento\Framework\Filesystem\Driver\File::class,
                 ComponentRegistrarInterface::class => ComponentRegistrar::class,
-                TriggerCleanerInterface::class => TriggerCleaner::class,
             ],
             SchemaConfig::class => [
                 'parameters' => [
diff --git a/setup/src/Magento/Setup/Model/Installer.php b/setup/src/Magento/Setup/Model/Installer.php
index ad94f2e62b819..35d0ac457b31c 100644
--- a/setup/src/Magento/Setup/Model/Installer.php
+++ b/setup/src/Magento/Setup/Model/Installer.php
@@ -7,6 +7,7 @@
 namespace Magento\Setup\Model;
 
 use Magento\Backend\Setup\ConfigOptionsList as BackendConfigOptionsList;
+use Magento\Framework\App\Cache\Manager;
 use Magento\Framework\App\Cache\Type\Block as BlockCache;
 use Magento\Framework\App\Cache\Type\Layout as LayoutCache;
 use Magento\Framework\App\DeploymentConfig\Reader;
@@ -21,11 +22,13 @@
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Adapter\Pdo\Mysql;
 use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\RuntimeException;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Model\ResourceModel\Db\Context;
 use Magento\Framework\Module\ModuleList\Loader as ModuleLoader;
 use Magento\Framework\Module\ModuleListInterface;
-use Magento\Framework\Mview\TriggerCleanerInterface;
+use Magento\Framework\Mview\TriggerCleaner;
 use Magento\Framework\Setup\Declaration\Schema\DryRunLogger;
 use Magento\Framework\Setup\FilePermissions;
 use Magento\Framework\Setup\InstallDataInterface;
@@ -34,20 +37,22 @@
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\Patch\PatchApplier;
 use Magento\Framework\Setup\Patch\PatchApplierFactory;
+use Magento\Framework\Setup\SampleData\State;
 use Magento\Framework\Setup\SchemaPersistor;
 use Magento\Framework\Setup\SchemaSetupInterface;
 use Magento\Framework\Setup\UpgradeDataInterface;
 use Magento\Framework\Setup\UpgradeSchemaInterface;
+use Magento\Framework\Validation\ValidationException;
 use Magento\PageCache\Model\Cache\Type as PageCache;
 use Magento\Setup\Console\Command\InstallCommand;
 use Magento\Setup\Controller\ResponseTypeInterface;
+use Magento\Setup\Exception;
 use Magento\Setup\Model\ConfigModel as SetupConfigModel;
 use Magento\Setup\Module\ConnectionFactory;
 use Magento\Setup\Module\DataSetupFactory;
 use Magento\Setup\Module\SetupFactory;
 use Magento\Setup\Validator\DbValidator;
 use Magento\Store\Model\Store;
-use Magento\Framework\App\Cache\Manager;
 
 /**
  * Class Installer contains the logic to install Magento application.
@@ -217,7 +222,7 @@ class Installer
     private $dataSetupFactory;
 
     /**
-     * @var \Magento\Framework\Setup\SampleData\State
+     * @var State
      */
     protected $sampleDataState;
 
@@ -249,7 +254,7 @@ class Installer
     private $patchApplierFactory;
 
     /**
-     * @var TriggerCleanerInterface
+     * @var TriggerCleaner
      */
     private $triggerCleaner;
 
@@ -274,10 +279,10 @@ class Installer
      * @param DbValidator $dbValidator
      * @param SetupFactory $setupFactory
      * @param DataSetupFactory $dataSetupFactory
-     * @param \Magento\Framework\Setup\SampleData\State $sampleDataState
+     * @param State $sampleDataState
      * @param ComponentRegistrar $componentRegistrar
      * @param PhpReadinessCheck $phpReadinessCheck
-     * @throws \Magento\Setup\Exception
+     * @throws Exception
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -299,7 +304,7 @@ public function __construct(
         DbValidator $dbValidator,
         SetupFactory $setupFactory,
         DataSetupFactory $dataSetupFactory,
-        \Magento\Framework\Setup\SampleData\State $sampleDataState,
+        State $sampleDataState,
         ComponentRegistrar $componentRegistrar,
         PhpReadinessCheck $phpReadinessCheck
     ) {
@@ -326,7 +331,7 @@ public function __construct(
         $this->componentRegistrar = $componentRegistrar;
         $this->phpReadinessCheck = $phpReadinessCheck;
         $this->schemaPersistor = $this->objectManagerProvider->get()->get(SchemaPersistor::class);
-        $this->triggerCleaner = $this->objectManagerProvider->get()->get(TriggerCleanerInterface::class);
+        $this->triggerCleaner = $this->objectManagerProvider->get()->get(TriggerCleaner::class);
     }
 
     /**
@@ -334,7 +339,9 @@ public function __construct(
      *
      * @param \ArrayObject|array $request
      * @return void
-     * @throws \LogicException
+     * @throws FileSystemException
+     * @throws LocalizedException
+     * @throws RuntimeException
      */
     public function install($request)
     {
@@ -398,6 +405,7 @@ public function install($request)
      * Get declaration installer. For upgrade process it must be created after deployment config update.
      *
      * @return DeclarationInstaller
+     * @throws Exception
      */
     private function getDeclarationInstaller()
     {
@@ -414,6 +422,7 @@ private function getDeclarationInstaller()
      *
      * @return void
      * @SuppressWarnings(PHPMD.UnusedPrivateMethod) Called by install() via callback.
+     * @throws FileSystemException
      */
     private function writeInstallationDate()
     {
@@ -429,7 +438,9 @@ private function writeInstallationDate()
      * @param \ArrayObject|array $request
      * @param bool $dryRun
      * @return array
-     * @throws \LogicException
+     * @throws FileSystemException
+     * @throws LocalizedException
+     * @throws RuntimeException
      */
     private function createModulesConfig($request, $dryRun = false)
     {
@@ -555,6 +566,9 @@ public function checkApplicationFilePermissions()
      *
      * @param \ArrayObject|array $data
      * @return void
+     * @throws FileSystemException
+     * @throws LocalizedException
+     * @throws RuntimeException
      */
     public function installDeploymentConfig($data)
     {
@@ -575,6 +589,7 @@ public function installDeploymentConfig($data)
      *
      * @param SchemaSetupInterface $setup
      * @return void
+     * @throws \Zend_Db_Exception
      */
     private function setupModuleRegistry(SchemaSetupInterface $setup)
     {
@@ -673,6 +688,7 @@ private function setupSessionTable(
      * @param SchemaSetupInterface $setup
      * @param AdapterInterface $connection
      * @return void
+     * @throws \Zend_Db_Exception
      */
     private function setupCacheTable(
         SchemaSetupInterface $setup,
@@ -727,6 +743,7 @@ private function setupCacheTable(
      * @param SchemaSetupInterface $setup
      * @param AdapterInterface $connection
      * @return void
+     * @throws \Zend_Db_Exception
      */
     private function setupCacheTagTable(
         SchemaSetupInterface $setup,
@@ -763,6 +780,7 @@ private function setupCacheTagTable(
      * @param SchemaSetupInterface $setup
      * @param AdapterInterface $connection
      * @return void
+     * @throws \Zend_Db_Exception
      */
     private function setupFlagTable(
         SchemaSetupInterface $setup,
@@ -819,6 +837,7 @@ private function setupFlagTable(
      *
      * @param array $request
      * @return void
+     * @throws Exception
      */
     public function declarativeInstallSchema(array $request)
     {
@@ -852,6 +871,9 @@ private function cleanMemoryTables(SchemaSetupInterface $setup)
      *
      * @param array $request
      * @return void
+     * @throws Exception
+     * @throws \Magento\Framework\Setup\Exception
+     * @throws \Zend_Db_Exception
      */
     public function installSchema(array $request)
     {
@@ -898,6 +920,8 @@ private function convertationOfOldScriptsIsAllowed(array $request)
      *
      * @param array $request
      * @return void
+     * @throws Exception
+     * @throws \Magento\Framework\Setup\Exception
      */
     public function installDataFixtures(array $request = [])
     {
@@ -963,7 +987,7 @@ private function throwExceptionForNotWritablePaths(array $paths)
      * @param array $request
      * @return void
      * @throws \Magento\Framework\Setup\Exception
-     * @throws \Magento\Setup\Exception
+     * @throws Exception
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
@@ -971,7 +995,7 @@ private function throwExceptionForNotWritablePaths(array $paths)
     private function handleDBSchemaData($setup, $type, array $request)
     {
         if (!($type === 'schema' || $type === 'data')) {
-            throw  new \Magento\Setup\Exception("Unsupported operation type $type is requested");
+            throw  new Exception("Unsupported operation type $type is requested");
         }
         $resource = new \Magento\Framework\Module\ModuleResource($this->context);
         $verType = $type . '-version';
@@ -1085,13 +1109,15 @@ private function handleDBSchemaData($setup, $type, array $request)
      * Assert DbConfigExists
      *
      * @return void
-     * @throws \Magento\Setup\Exception
+     * @throws Exception
+     * @throws FileSystemException
+     * @throws RuntimeException
      */
     private function assertDbConfigExists()
     {
         $config = $this->deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT);
         if (!$config) {
-            throw new \Magento\Setup\Exception(
+            throw new Exception(
                 "Can't run this operation: configuration for DB connection is absent."
             );
         }
@@ -1114,6 +1140,8 @@ private function isDryRun(array $request)
      *
      * @param \ArrayObject|array $data
      * @return void
+     * @throws Exception
+     * @throws LocalizedException
      */
     public function installUserConfig($data)
     {
@@ -1143,8 +1171,8 @@ public function installUserConfig($data)
      *
      * @param \ArrayObject|array $data
      * @return void
-     * @throws \Magento\Framework\Validation\ValidationException
-     * @throws \Magento\Setup\Exception
+     * @throws ValidationException
+     * @throws Exception
      */
     public function installSearchConfiguration($data)
     {
@@ -1159,13 +1187,13 @@ public function installSearchConfiguration($data)
      * @param string $className
      * @param string $interfaceName
      * @return mixed|null
-     * @throws \Magento\Setup\Exception
+     * @throws Exception
      */
     protected function createSchemaDataHandler($className, $interfaceName)
     {
         if (class_exists($className)) {
             if (!is_subclass_of($className, $interfaceName) && $className !== $interfaceName) {
-                throw  new \Magento\Setup\Exception($className . ' must implement \\' . $interfaceName);
+                throw  new Exception($className . ' must implement \\' . $interfaceName);
             } else {
                 return $this->objectManagerProvider->get()->create($className);
             }
@@ -1222,6 +1250,9 @@ private function installOrderIncrementPrefix($orderIncrementPrefix)
      *
      * @param \ArrayObject|array $data
      * @return void
+     * @throws Exception
+     * @throws FileSystemException
+     * @throws RuntimeException
      */
     public function installAdminUser($data)
     {
@@ -1245,13 +1276,13 @@ public function installAdminUser($data)
      *
      * @param bool $keepGeneratedFiles Cleanup generated classes and view files and reset ObjectManager
      * @return void
-     * @throws \Magento\Setup\Exception
+     * @throws Exception
      */
     public function updateModulesSequence($keepGeneratedFiles = false)
     {
         $config = $this->deploymentConfig->get(ConfigOptionsListConstants::KEY_MODULES);
         if (!$config) {
-            throw new \Magento\Setup\Exception(
+            throw new Exception(
                 "Can't run this operation: deployment configuration is absent."
                 . " Run 'magento setup:config:set --help' for options."
             );
@@ -1316,6 +1347,7 @@ public function uninstall()
      * @param bool $isEnabled
      * @param array $types
      * @return void
+     * @throws Exception
      */
     private function updateCaches($isEnabled, $types = [])
     {
@@ -1350,6 +1382,7 @@ function (string $key) use ($types) {
      * @return void
      *
      * @SuppressWarnings(PHPMD.UnusedPrivateMethod) Called by install() via callback.
+     * @throws Exception
      */
     private function cleanCaches()
     {
@@ -1425,6 +1458,7 @@ public function cleanupDb()
      * Removes deployment configuration
      *
      * @return void
+     * @throws FileSystemException
      */
     private function deleteDeploymentConfig()
     {
@@ -1449,6 +1483,9 @@ private function deleteDeploymentConfig()
      * Validates that MySQL is accessible and MySQL version is supported
      *
      * @return void
+     * @throws Exception
+     * @throws FileSystemException
+     * @throws RuntimeException
      */
     private function assertDbAccessible()
     {
@@ -1511,7 +1548,7 @@ private function assertDbAccessible()
      * @param string $moduleName
      * @param string $type
      * @return InstallSchemaInterface | UpgradeSchemaInterface | InstallDataInterface | UpgradeDataInterface | null
-     * @throws \Magento\Setup\Exception
+     * @throws Exception
      */
     private function getSchemaDataHandler($moduleName, $type)
     {
@@ -1542,7 +1579,7 @@ private function getSchemaDataHandler($moduleName, $type)
                 $interface = self::DATA_INSTALL;
                 break;
             default:
-                throw new \Magento\Setup\Exception("$className does not exist");
+                throw new Exception("$className does not exist");
         }
 
         return $this->createSchemaDataHandler($className, $interface);
@@ -1554,7 +1591,7 @@ private function getSchemaDataHandler($moduleName, $type)
      * @param \Magento\Framework\Module\ModuleResource $resource
      * @param string $type
      * @return ModuleContext[]
-     * @throws \Magento\Setup\Exception
+     * @throws Exception
      */
     private function generateListOfModuleContext($resource, $type)
     {
@@ -1565,7 +1602,7 @@ private function generateListOfModuleContext($resource, $type)
             } elseif ($type === 'data-version') {
                 $dbVer = $resource->getDataVersion($moduleName);
             } else {
-                throw  new \Magento\Setup\Exception("Unsupported version type $type is requested");
+                throw  new Exception("Unsupported version type $type is requested");
             }
             if ($dbVer !== false) {
                 $moduleContextList[$moduleName] = new ModuleContext($dbVer);
@@ -1656,10 +1693,12 @@ private function updateColumnType(
 
     /**
      * Remove unused triggers from db
+     *
+     * @throws \Exception
      */
     public function removeUnusedTriggers(): void
     {
-        $this->triggerCleaner->unsubscribe();
+        $this->triggerCleaner->removeTriggers();
         $this->cleanCaches();
     }
 }

From a825293e8d7a6a28eef0af32e89c46e402aa05ef Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@magento.com>
Date: Tue, 21 Jul 2020 19:49:11 -0500
Subject: [PATCH 0963/1718] MC-35985: Enable new consumer configuration
 settings on current consumers

---
 .../Magento/MessageQueue/Model/Cron/ConsumersRunner.php     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner.php b/app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner.php
index d907eee15de14..694abe6ebd2e4 100644
--- a/app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner.php
+++ b/app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner.php
@@ -176,7 +176,11 @@ private function canBeRun(ConsumerConfigItemInterface $consumerConfig, array $al
             return false;
         }
 
-        if ($consumerConfig->getOnlySpawnWhenMessageAvailable()) {
+        $onlySpawnWhenMessageAvailable = (bool)$this->deploymentConfig->get(
+            'queue/only_spawn_when_message_available',
+            0
+        );
+        if ($onlySpawnWhenMessageAvailable || $consumerConfig->getOnlySpawnWhenMessageAvailable()) {
             try {
                 return $this->checkIsAvailableMessages->execute(
                     $connectionName,

From f095ce2878dbe1e7d6f9c1f648be67b51177c8f3 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Tue, 21 Jul 2020 20:37:50 -0500
Subject: [PATCH 0964/1718] MC-20639: MyAccount :: Order Details :: Refund
 (creditMemo) Details by Order Number

---
 .../Magento/SalesGraphQl/etc/schema.graphqls  |  4 +--
 .../TestCase/GraphQlAbstract.php              |  5 ++++
 .../Magento/GraphQl/Sales/CreditmemoTest.php  | 11 ++++++--
 .../customer_creditmemo_with_two_items.php    | 25 +++++++++++++------
 4 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/SalesGraphQl/etc/schema.graphqls b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
index d90665d101491..19c6657e815a6 100644
--- a/app/code/Magento/SalesGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
@@ -47,7 +47,7 @@ type CustomerOrder @doc(description: "Contains details about each of the custome
     total: OrderTotal @doc(description: "Contains details about the calculated totals for this order") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\OrderTotal")
     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")
-    credit_memos: [CreditMemo] @doc(description: "A list of credit memos") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\CreditMemos")
+    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")
     shipping_address: CustomerAddress @doc(description: "The shipping address for the order")
     billing_address: CustomerAddress @doc(description: "The billing address for the order")
@@ -203,7 +203,7 @@ type PaymentMethod @doc(description: "Contains details about the payment method
 type CreditMemo @doc(description: "Credit memo details") {
     id: ID! @doc(description: "The unique ID of the credit memo, used for API purposes")
     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")
+    items: [CreditMemoItem] @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")
 }
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
index 94eb5ddec8604..3de18a932f2cd 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
@@ -171,6 +171,11 @@ protected function assertResponseFields($actualResponse, $assertionMap)
                 $expectedValue,
                 "Value of '{$responseField}' field must not be NULL"
             );
+            self::assertArrayHasKey(
+                $responseField,
+                $actualResponse,
+                "Response array does not contain key '{$responseField}'"
+            );
             self::assertEquals(
                 $expectedValue,
                 $actualResponse[$responseField],
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
index 54b186c610994..4726c7b797509 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
@@ -46,6 +46,9 @@ public function testCreditMemoForLoggedInCustomerQuery(): void
     orders {
         items {
             credit_memos {
+                comments {
+                    message
+                }
                 items {
                     product_name
                     product_sku
@@ -86,6 +89,10 @@ public function testCreditMemoForLoggedInCustomerQuery(): void
 
         $expectedCreditMemoData = [
             [
+                'comments' => [
+                    ['message' => 'some_comment'],
+                    ['message' => 'some_other_comment']
+                ],
                 'items' => [
                     [
                         'product_name' => 'Simple Related Product',
@@ -121,9 +128,9 @@ public function testCreditMemoForLoggedInCustomerQuery(): void
             ]
         ];
 
-        $actualData = $response['customer']['orders']['items'][1];
+        $firstOrderItem = current($response['customer']['orders']['items'] ?? []);
 
-        $creditMemos = $actualData['credit_memos'];
+        $creditMemos = $firstOrderItem['credit_memos'] ?? [];
         $this->assertResponseFields($creditMemos, $expectedCreditMemoData);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/customer_creditmemo_with_two_items.php b/dev/tests/integration/testsuite/Magento/Sales/_files/customer_creditmemo_with_two_items.php
index 79207bfca94e7..02dd5f5533b6b 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/customer_creditmemo_with_two_items.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/customer_creditmemo_with_two_items.php
@@ -6,21 +6,30 @@
  */
 
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+use Magento\Sales\Api\Data\OrderInterfaceFactory;
+use Magento\Sales\Model\Order\CreditmemoFactory;
+use Magento\Sales\Model\Service\CreditmemoService;
+use Magento\Sales\Model\Order;
+use Magento\TestFramework\Helper\Bootstrap;
 
 Resolver::getInstance()->requireDataFixture(
     'Magento/Sales/_files/customer_invoice_with_two_products_and_custom_options.php'
 );
 
-$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$objectManager = Bootstrap::getObjectManager();
 
-/** @var \Magento\Sales\Model\Order\CreditmemoFactory $creditMemoFactory */
-$creditMemoFactory = $objectManager->create(\Magento\Sales\Model\Order\CreditmemoFactory::class);
-/** @var \Magento\Sales\Model\Service\CreditmemoService $creditMemoService */
-$creditMemoService = $objectManager->create(\Magento\Sales\Model\Service\CreditmemoService::class);
-/** @var \Magento\Sales\Api\OrderRepositoryInterface $orderRepository */
-$orderRepository = $objectManager->create(\Magento\Sales\Api\OrderRepositoryInterface::class);
+/** @var CreditmemoFactory $creditMemoFactory */
+$creditMemoFactory = $objectManager->create(CreditmemoFactory::class);
+/** @var CreditmemoService $creditMemoService */
+$creditMemoService = $objectManager->create(CreditmemoService::class);
 
-$creditMemo = $creditMemoFactory->createByOrder($orderRepository->get(2));
+/** @var Order $order */
+$order = $objectManager->get(OrderInterfaceFactory::class)->create()->loadByIncrementId('100000001');
+
+$creditMemo = $creditMemoFactory->createByOrder($order);
 $creditMemo->setAdjustment(1.23);
+$creditMemo->addComment('some_comment', false, true);
+$creditMemo->addComment('some_other_comment', false, true);
+$creditMemo->addComment('not_visible', false, false);
 
 $creditMemoService->refund($creditMemo);

From ef69e498d393781a37dff8ef486fcd39c993f654 Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Tue, 21 Jul 2020 23:06:03 -0500
Subject: [PATCH 0965/1718] MC-34573: Update TinyMCE

- Updated Tinymce4 library to version 4.9.10
---
 lib/web/tiny_mce_4/plugins/help/plugin.min.js             | 2 +-
 lib/web/tiny_mce_4/plugins/image/plugin.min.js            | 2 +-
 lib/web/tiny_mce_4/plugins/imagetools/plugin.min.js       | 2 +-
 lib/web/tiny_mce_4/plugins/lists/plugin.min.js            | 2 +-
 lib/web/tiny_mce_4/plugins/media/plugin.min.js            | 2 +-
 lib/web/tiny_mce_4/plugins/paste/plugin.min.js            | 2 +-
 lib/web/tiny_mce_4/plugins/table/plugin.min.js            | 2 +-
 lib/web/tiny_mce_4/plugins/textpattern/plugin.min.js      | 2 +-
 lib/web/tiny_mce_4/plugins/visualchars/plugin.min.js      | 2 +-
 lib/web/tiny_mce_4/plugins/wordcount/plugin.min.js        | 2 +-
 lib/web/tiny_mce_4/skins/lightgray/content.inline.min.css | 2 +-
 lib/web/tiny_mce_4/skins/lightgray/content.min.css        | 2 +-
 lib/web/tiny_mce_4/themes/inlite/theme.min.js             | 2 +-
 lib/web/tiny_mce_4/themes/mobile/theme.min.js             | 2 +-
 lib/web/tiny_mce_4/themes/modern/theme.min.js             | 2 +-
 lib/web/tiny_mce_4/tinymce.min.js                         | 4 ++--
 16 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/lib/web/tiny_mce_4/plugins/help/plugin.min.js b/lib/web/tiny_mce_4/plugins/help/plugin.min.js
index a71ff52f547dc..67cde482ab9bf 100644
--- a/lib/web/tiny_mce_4/plugins/help/plugin.min.js
+++ b/lib/web/tiny_mce_4/plugins/help/plugin.min.js
@@ -1 +1 @@
-!function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager"),t=function(e){return function(){return e}};function l(r){for(var o=[],e=1;e<arguments.length;e++)o[e-1]=arguments[e];return function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n=o.concat(e);return r.apply(null,n)}}var n,r,o,a,i,c,u=t(!1),s=t(!0),m=u,f=s,d=function(){return p},p=(a={fold:function(e,t){return e()},is:m,isSome:m,isNone:f,getOr:o=function(e){return e},getOrThunk:r=function(e){return e()},getOrDie:function(e){throw new Error(e||"error: getOrDie called on none.")},getOrNull:function(){return null},getOrUndefined:function(){return undefined},or:o,orThunk:r,map:d,ap:d,each:function(){},bind:d,flatten:d,exists:m,forall:f,filter:d,equals:n=function(e){return e.isNone()},equals_:n,toArray:function(){return[]},toString:t("none()")},Object.freeze&&Object.freeze(a),a),y=function(n){var e=function(){return n},t=function(){return o},r=function(e){return e(n)},o={fold:function(e,t){return t(n)},is:function(e){return n===e},isSome:f,isNone:m,getOr:e,getOrThunk:e,getOrDie:e,getOrNull:e,getOrUndefined:e,or:t,orThunk:t,map:function(e){return y(e(n))},ap:function(e){return e.fold(d,function(e){return y(e(n))})},each:function(e){e(n)},bind:r,flatten:e,exists:r,forall:r,filter:function(e){return e(n)?o:p},equals:function(e){return e.is(n)},equals_:function(e,t){return e.fold(m,function(e){return t(n,e)})},toArray:function(){return[n]},toString:function(){return"some("+n+")"}};return o},h={some:y,none:d,from:function(e){return null===e||e===undefined?p:y(e)}},g=(i="function",function(e){return function(e){if(null===e)return"null";var t=typeof e;return"object"===t&&(Array.prototype.isPrototypeOf(e)||e.constructor&&"Array"===e.constructor.name)?"array":"object"===t&&(String.prototype.isPrototypeOf(e)||e.constructor&&"String"===e.constructor.name)?"string":t}(e)===i}),k=(Array.prototype.slice,(c=Array.prototype.indexOf)===undefined?function(e,t){return x(e,t)}:function(e,t){return c.call(e,t)}),v=function(e,t){return-1<k(e,t)},b=function(e,t){for(var n=e.length,r=new Array(n),o=0;o<n;o++){var a=e[o];r[o]=t(a,o,e)}return r},x=function(e,t){for(var n=0,r=e.length;n<r;++n)if(e[n]===t)return n;return-1},A=(g(Array.from)&&Array.from,tinymce.util.Tools.resolve("tinymce.util.I18n")),C=tinymce.util.Tools.resolve("tinymce.Env"),w=C.mac?"\u2318":"Ctrl",S=C.mac?"Ctrl + Alt":"Shift + Alt",O={shortcuts:[{shortcut:w+" + B",action:"Bold"},{shortcut:w+" + I",action:"Italic"},{shortcut:w+" + U",action:"Underline"},{shortcut:w+" + A",action:"Select all"},{shortcut:w+" + Y or "+w+" + Shift + Z",action:"Redo"},{shortcut:w+" + Z",action:"Undo"},{shortcut:S+" + 1",action:"Header 1"},{shortcut:S+" + 2",action:"Header 2"},{shortcut:S+" + 3",action:"Header 3"},{shortcut:S+" + 4",action:"Header 4"},{shortcut:S+" + 5",action:"Header 5"},{shortcut:S+" + 6",action:"Header 6"},{shortcut:S+" + 7",action:"Paragraph"},{shortcut:S+" + 8",action:"Div"},{shortcut:S+" + 9",action:"Address"},{shortcut:"Alt + F9",action:"Focus to menubar"},{shortcut:"Alt + F10",action:"Focus to toolbar"},{shortcut:"Alt + F11",action:"Focus to element path"},{shortcut:"Ctrl + F9",action:"Focus to contextual toolbar"},{shortcut:w+" + K",action:"Insert link (if link plugin activated)"},{shortcut:w+" + S",action:"Save (if save plugin activated)"},{shortcut:w+" + F",action:"Find (if searchreplace plugin activated)"}]},T=function(){var e=b(O.shortcuts,function(e){return'<tr data-mce-tabstop="1" tabindex="-1" aria-label="Action: '+(t=e).action+", Shortcut: "+t.shortcut.replace(/Ctrl/g,"Control")+'"><td>'+A.translate(e.action)+"</td><td>"+e.shortcut+"</td></tr>";var t}).join("");return{title:"Handy Shortcuts",type:"container",style:"overflow-y: auto; overflow-x: hidden; max-height: 250px",items:[{type:"container",html:'<div><table class="mce-table-striped"><thead><th>'+A.translate("Action")+"</th><th>"+A.translate("Shortcut")+"</th></thead>"+e+"</table></div>"}]}},P=Object.keys,_=[{key:"advlist",name:"Advanced List"},{key:"anchor",name:"Anchor"},{key:"autolink",name:"Autolink"},{key:"autoresize",name:"Autoresize"},{key:"autosave",name:"Autosave"},{key:"bbcode",name:"BBCode"},{key:"charmap",name:"Character Map"},{key:"code",name:"Code"},{key:"codesample",name:"Code Sample"},{key:"colorpicker",name:"Color Picker"},{key:"compat3x",name:"3.x Compatibility"},{key:"contextmenu",name:"Context Menu"},{key:"directionality",name:"Directionality"},{key:"emoticons",name:"Emoticons"},{key:"fullpage",name:"Full Page"},{key:"fullscreen",name:"Full Screen"},{key:"help",name:"Help"},{key:"hr",name:"Horizontal Rule"},{key:"image",name:"Image"},{key:"imagetools",name:"Image Tools"},{key:"importcss",name:"Import CSS"},{key:"insertdatetime",name:"Insert Date/Time"},{key:"legacyoutput",name:"Legacy Output"},{key:"link",name:"Link"},{key:"lists",name:"Lists"},{key:"media",name:"Media"},{key:"nonbreaking",name:"Nonbreaking"},{key:"noneditable",name:"Noneditable"},{key:"pagebreak",name:"Page Break"},{key:"paste",name:"Paste"},{key:"preview",name:"Preview"},{key:"print",name:"Print"},{key:"save",name:"Save"},{key:"searchreplace",name:"Search and Replace"},{key:"spellchecker",name:"Spell Checker"},{key:"tabfocus",name:"Tab Focus"},{key:"table",name:"Table"},{key:"template",name:"Template"},{key:"textcolor",name:"Text Color"},{key:"textpattern",name:"Text Pattern"},{key:"toc",name:"Table of Contents"},{key:"visualblocks",name:"Visual Blocks"},{key:"visualchars",name:"Visual Characters"},{key:"wordcount",name:"Word Count"}],H=l(function(e,o){return e.replace(/\$\{([^{}]*)\}/g,function(e,t){var n,r=o[t];return"string"==(n=typeof r)||"number"===n?r.toString():e})},'<a href="${url}" target="_blank" rel="noopener">${name}</a>'),F=function(t,n){return function(e,t){for(var n=0,r=e.length;n<r;n++){var o=e[n];if(t(o,n,e))return h.some(o)}return h.none()}(_,function(e){return e.key===n}).fold(function(){var e=t.plugins[n].getMetadata;return"function"==typeof e?H(e()):n},function(e){return H({name:e.name,url:"https://www.tinymce.com/docs/plugins/"+e.key})})},M=function(t){var e,n,r,o=(r=P((e=t).plugins),e.settings.forced_plugins===undefined?r:function(e,t){for(var n=[],r=0,o=e.length;r<o;r++){var a=e[r];t(a,r,e)&&n.push(a)}return n}(r,(n=l(v,e.settings.forced_plugins),function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return!n.apply(null,e)}))),a=b(o,function(e){return"<li>"+F(t,e)+"</li>"}),i=a.length,c=a.join("");return"<p><b>"+A.translate(["Plugins installed ({0}):",i])+"</b></p><ul>"+c+"</ul>"},E=function(e){return{title:"Plugins",type:"container",style:"overflow-y: auto; overflow-x: hidden;",layout:"flex",padding:10,spacing:10,items:[(t=e,{type:"container",html:'<div style="overflow-y: auto; overflow-x: hidden; max-height: 230px; height: 230px;" data-mce-tabstop="1" tabindex="-1">'+M(t)+"</div>",flex:1}),{type:"container",html:'<div style="padding: 10px; background: #e3e7f4; height: 100%;" data-mce-tabstop="1" tabindex="-1"><p><b>'+A.translate("Premium plugins:")+'</b></p><ul><li>PowerPaste</li><li>Spell Checker Pro</li><li>Accessibility Checker</li><li>Advanced Code Editor</li><li>Enhanced Media Embed</li><li>Link Checker</li></ul><br /><p style="float: right;"><a href="https://www.tinymce.com/pricing/?utm_campaign=editor_referral&utm_medium=help_dialog&utm_source=tinymce" target="_blank">'+A.translate("Learn more...")+"</a></p></div>",flex:1}]};var t},I=tinymce.util.Tools.resolve("tinymce.EditorManager"),j=function(){var e,t,n='<a href="https://www.tinymce.com/docs/changelog/?utm_campaign=editor_referral&utm_medium=help_dialog&utm_source=tinymce" target="_blank">TinyMCE '+(e=I.majorVersion,t=I.minorVersion,0===e.indexOf("@")?"X.X.X":e+"."+t)+"</a>";return[{type:"label",html:A.translate(["You are using {0}",n])},{type:"spacer",flex:1},{text:"Close",onclick:function(){this.parent().parent().close()}}]},L=function(e,t){return function(){e.windowManager.open({title:"Help",bodyType:"tabpanel",layout:"flex",body:[T(),E(e)],buttons:j(),onPostRender:function(){this.getEl("title").innerHTML='<img src="'+t+'/img/logo.png" alt="TinyMCE Logo" style="display: inline-block; width: 200px; height: 50px">'}})}},B=function(e,t){e.addCommand("mceHelp",L(e,t))},N=function(e,t){e.addButton("help",{icon:"help",onclick:L(e,t)}),e.addMenuItem("help",{text:"Help",icon:"help",context:"help",onclick:L(e,t)})};e.add("help",function(e,t){N(e,t),B(e,t),e.shortcuts.add("Alt+0","Open help dialog","mceHelp")})}();
\ No newline at end of file
+!function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager"),t=function(){},a=function(e){return function(){return e}};function l(r){for(var o=[],e=1;e<arguments.length;e++)o[e-1]=arguments[e];return function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n=o.concat(e);return r.apply(null,n)}}var n,r,o,i,c,u=a(!1),s=a(!0),m=function(){return d},d=(n=function(e){return e.isNone()},i={fold:function(e,t){return e()},is:u,isSome:u,isNone:s,getOr:o=function(e){return e},getOrThunk:r=function(e){return e()},getOrDie:function(e){throw new Error(e||"error: getOrDie called on none.")},getOrNull:a(null),getOrUndefined:a(undefined),or:o,orThunk:r,map:m,each:t,bind:m,exists:u,forall:s,filter:m,equals:n,equals_:n,toArray:function(){return[]},toString:a("none()")},Object.freeze&&Object.freeze(i),i),f=function(n){var e=a(n),t=function(){return o},r=function(e){return e(n)},o={fold:function(e,t){return t(n)},is:function(e){return n===e},isSome:s,isNone:u,getOr:e,getOrThunk:e,getOrDie:e,getOrNull:e,getOrUndefined:e,or:t,orThunk:t,map:function(e){return f(e(n))},each:function(e){e(n)},bind:r,exists:r,forall:r,filter:function(e){return e(n)?o:d},toArray:function(){return[n]},toString:function(){return"some("+n+")"},equals:function(e){return e.is(n)},equals_:function(e,t){return e.fold(u,function(e){return t(n,e)})}};return o},p={some:f,none:m,from:function(e){return null===e||e===undefined?d:f(e)}},y=(c="function",function(e){return function(e){if(null===e)return"null";var t=typeof e;return"object"===t&&(Array.prototype.isPrototypeOf(e)||e.constructor&&"Array"===e.constructor.name)?"array":"object"===t&&(String.prototype.isPrototypeOf(e)||e.constructor&&"String"===e.constructor.name)?"string":t}(e)===c}),h=(Array.prototype.slice,Array.prototype.indexOf),g=function(e,t){return n=e,r=t,-1<h.call(n,r);var n,r},k=function(e,t){for(var n=e.length,r=new Array(n),o=0;o<n;o++){var a=e[o];r[o]=t(a,o)}return r},v=(y(Array.from)&&Array.from,tinymce.util.Tools.resolve("tinymce.util.I18n")),b=tinymce.util.Tools.resolve("tinymce.Env"),x=b.mac?"\u2318":"Ctrl",A=b.mac?"Ctrl + Alt":"Shift + Alt",C={shortcuts:[{shortcut:x+" + B",action:"Bold"},{shortcut:x+" + I",action:"Italic"},{shortcut:x+" + U",action:"Underline"},{shortcut:x+" + A",action:"Select all"},{shortcut:x+" + Y or "+x+" + Shift + Z",action:"Redo"},{shortcut:x+" + Z",action:"Undo"},{shortcut:A+" + 1",action:"Header 1"},{shortcut:A+" + 2",action:"Header 2"},{shortcut:A+" + 3",action:"Header 3"},{shortcut:A+" + 4",action:"Header 4"},{shortcut:A+" + 5",action:"Header 5"},{shortcut:A+" + 6",action:"Header 6"},{shortcut:A+" + 7",action:"Paragraph"},{shortcut:A+" + 8",action:"Div"},{shortcut:A+" + 9",action:"Address"},{shortcut:"Alt + F9",action:"Focus to menubar"},{shortcut:"Alt + F10",action:"Focus to toolbar"},{shortcut:"Alt + F11",action:"Focus to element path"},{shortcut:"Ctrl + F9",action:"Focus to contextual toolbar"},{shortcut:x+" + K",action:"Insert link (if link plugin activated)"},{shortcut:x+" + S",action:"Save (if save plugin activated)"},{shortcut:x+" + F",action:"Find (if searchreplace plugin activated)"}]},w=function(){var e=k(C.shortcuts,function(e){return'<tr data-mce-tabstop="1" tabindex="-1" aria-label="Action: '+(t=e).action+", Shortcut: "+t.shortcut.replace(/Ctrl/g,"Control")+'"><td>'+v.translate(e.action)+"</td><td>"+e.shortcut+"</td></tr>";var t}).join("");return{title:"Handy Shortcuts",type:"container",style:"overflow-y: auto; overflow-x: hidden; max-height: 250px",items:[{type:"container",html:'<div><table class="mce-table-striped"><thead><th>'+v.translate("Action")+"</th><th>"+v.translate("Shortcut")+"</th></thead>"+e+"</table></div>"}]}},S=Object.keys,O=[{key:"advlist",name:"Advanced List"},{key:"anchor",name:"Anchor"},{key:"autolink",name:"Autolink"},{key:"autoresize",name:"Autoresize"},{key:"autosave",name:"Autosave"},{key:"bbcode",name:"BBCode"},{key:"charmap",name:"Character Map"},{key:"code",name:"Code"},{key:"codesample",name:"Code Sample"},{key:"colorpicker",name:"Color Picker"},{key:"compat3x",name:"3.x Compatibility"},{key:"contextmenu",name:"Context Menu"},{key:"directionality",name:"Directionality"},{key:"emoticons",name:"Emoticons"},{key:"fullpage",name:"Full Page"},{key:"fullscreen",name:"Full Screen"},{key:"help",name:"Help"},{key:"hr",name:"Horizontal Rule"},{key:"image",name:"Image"},{key:"imagetools",name:"Image Tools"},{key:"importcss",name:"Import CSS"},{key:"insertdatetime",name:"Insert Date/Time"},{key:"legacyoutput",name:"Legacy Output"},{key:"link",name:"Link"},{key:"lists",name:"Lists"},{key:"media",name:"Media"},{key:"nonbreaking",name:"Nonbreaking"},{key:"noneditable",name:"Noneditable"},{key:"pagebreak",name:"Page Break"},{key:"paste",name:"Paste"},{key:"preview",name:"Preview"},{key:"print",name:"Print"},{key:"save",name:"Save"},{key:"searchreplace",name:"Search and Replace"},{key:"spellchecker",name:"Spell Checker"},{key:"tabfocus",name:"Tab Focus"},{key:"table",name:"Table"},{key:"template",name:"Template"},{key:"textcolor",name:"Text Color"},{key:"textpattern",name:"Text Pattern"},{key:"toc",name:"Table of Contents"},{key:"visualblocks",name:"Visual Blocks"},{key:"visualchars",name:"Visual Characters"},{key:"wordcount",name:"Word Count"}],T=l(function(e,o){return e.replace(/\$\{([^{}]*)\}/g,function(e,t){var n,r=o[t];return"string"==(n=typeof r)||"number"===n?r.toString():e})},'<a href="${url}" target="_blank" rel="noopener">${name}</a>'),P=function(t,n){return function(e,t){for(var n=0,r=e.length;n<r;n++){var o=e[n];if(t(o,n))return p.some(o)}return p.none()}(O,function(e){return e.key===n}).fold(function(){var e=t.plugins[n].getMetadata;return"function"==typeof e?T(e()):n},function(e){return T({name:e.name,url:"https://www.tinymce.com/docs/plugins/"+e.key})})},_=function(t){var e,n,r,o=(r=S((e=t).plugins),e.settings.forced_plugins===undefined?r:function(e,t){for(var n=[],r=0,o=e.length;r<o;r++){var a=e[r];t(a,r)&&n.push(a)}return n}(r,(n=l(g,e.settings.forced_plugins),function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return!n.apply(null,e)}))),a=k(o,function(e){return"<li>"+P(t,e)+"</li>"}),i=a.length,c=a.join("");return"<p><b>"+v.translate(["Plugins installed ({0}):",i])+"</b></p><ul>"+c+"</ul>"},H=function(e){return{title:"Plugins",type:"container",style:"overflow-y: auto; overflow-x: hidden;",layout:"flex",padding:10,spacing:10,items:[(t=e,{type:"container",html:'<div style="overflow-y: auto; overflow-x: hidden; max-height: 230px; height: 230px;" data-mce-tabstop="1" tabindex="-1">'+_(t)+"</div>",flex:1}),{type:"container",html:'<div style="padding: 10px; background: #e3e7f4; height: 100%;" data-mce-tabstop="1" tabindex="-1"><p><b>'+v.translate("Premium plugins:")+'</b></p><ul><li>PowerPaste</li><li>Spell Checker Pro</li><li>Accessibility Checker</li><li>Advanced Code Editor</li><li>Enhanced Media Embed</li><li>Link Checker</li></ul><br /><p style="float: right;"><a href="https://www.tinymce.com/pricing/?utm_campaign=editor_referral&utm_medium=help_dialog&utm_source=tinymce" target="_blank">'+v.translate("Learn more...")+"</a></p></div>",flex:1}]};var t},F=tinymce.util.Tools.resolve("tinymce.EditorManager"),M=function(){var e,t,n='<a href="https://www.tinymce.com/docs/changelog/?utm_campaign=editor_referral&utm_medium=help_dialog&utm_source=tinymce" target="_blank">TinyMCE '+(e=F.majorVersion,t=F.minorVersion,0===e.indexOf("@")?"X.X.X":e+"."+t)+"</a>";return[{type:"label",html:v.translate(["You are using {0}",n])},{type:"spacer",flex:1},{text:"Close",onclick:function(){this.parent().parent().close()}}]},E=function(e,t){return function(){e.windowManager.open({title:"Help",bodyType:"tabpanel",layout:"flex",body:[w(),H(e)],buttons:M(),onPostRender:function(){this.getEl("title").innerHTML='<img src="'+t+'/img/logo.png" alt="TinyMCE Logo" style="display: inline-block; width: 200px; height: 50px">'}})}},I=function(e,t){e.addCommand("mceHelp",E(e,t))},j=function(e,t){e.addButton("help",{icon:"help",onclick:E(e,t)}),e.addMenuItem("help",{text:"Help",icon:"help",context:"help",onclick:E(e,t)})};e.add("help",function(e,t){j(e,t),I(e,t),e.shortcuts.add("Alt+0","Open help dialog","mceHelp")})}();
\ No newline at end of file
diff --git a/lib/web/tiny_mce_4/plugins/image/plugin.min.js b/lib/web/tiny_mce_4/plugins/image/plugin.min.js
index d4764ad6251f5..23473aa76db46 100644
--- a/lib/web/tiny_mce_4/plugins/image/plugin.min.js
+++ b/lib/web/tiny_mce_4/plugins/image/plugin.min.js
@@ -1 +1 @@
-!function(l){"use strict";var i,e=tinymce.util.Tools.resolve("tinymce.PluginManager"),d=function(e){return!1!==e.settings.image_dimensions},u=function(e){return!0===e.settings.image_advtab},m=function(e){return e.getParam("image_prepend_url","")},n=function(e){return e.getParam("image_class_list")},r=function(e){return!1!==e.settings.image_description},a=function(e){return!0===e.settings.image_title},o=function(e){return!0===e.settings.image_caption},c=function(e){return e.getParam("image_list",!1)},s=function(e){return e.getParam("images_upload_url",!1)},g=function(e){return e.getParam("images_upload_handler",!1)},f=function(e){return e.getParam("images_upload_url")},p=function(e){return e.getParam("images_upload_handler")},h=function(e){return e.getParam("images_upload_base_path")},v=function(e){return e.getParam("images_upload_credentials")},b="undefined"!=typeof l.window?l.window:Function("return this;")(),y=function(e,t){return function(e,t){for(var n=t!==undefined&&null!==t?t:b,r=0;r<e.length&&n!==undefined&&null!==n;++r)n=n[e[r]];return n}(e.split("."),t)},x={getOrDie:function(e,t){var n=y(e,t);if(n===undefined||null===n)throw e+" not available on this browser";return n}},w=tinymce.util.Tools.resolve("tinymce.util.Promise"),C=tinymce.util.Tools.resolve("tinymce.util.Tools"),S=tinymce.util.Tools.resolve("tinymce.util.XHR"),N=function(e,t){return Math.max(parseInt(e,10),parseInt(t,10))},_=function(e,n){var r=l.document.createElement("img");function t(e,t){r.parentNode&&r.parentNode.removeChild(r),n({width:e,height:t})}r.onload=function(){t(N(r.width,r.clientWidth),N(r.height,r.clientHeight))},r.onerror=function(){t(0,0)};var a=r.style;a.visibility="hidden",a.position="fixed",a.bottom=a.left="0px",a.width=a.height="auto",l.document.body.appendChild(r),r.src=e},T=function(e,a,t){return function n(e,r){return r=r||[],C.each(e,function(e){var t={text:e.text||e.title};e.menu?t.menu=n(e.menu):(t.value=e.value,a(t)),r.push(t)}),r}(e,t||[])},A=function(e){return e&&(e=e.replace(/px$/,"")),e},R=function(e){return 0<e.length&&/^[0-9]+$/.test(e)&&(e+="px"),e},I=function(e){if(e.margin){var t=e.margin.split(" ");switch(t.length){case 1:e["margin-top"]=e["margin-top"]||t[0],e["margin-right"]=e["margin-right"]||t[0],e["margin-bottom"]=e["margin-bottom"]||t[0],e["margin-left"]=e["margin-left"]||t[0];break;case 2:e["margin-top"]=e["margin-top"]||t[0],e["margin-right"]=e["margin-right"]||t[1],e["margin-bottom"]=e["margin-bottom"]||t[0],e["margin-left"]=e["margin-left"]||t[1];break;case 3:e["margin-top"]=e["margin-top"]||t[0],e["margin-right"]=e["margin-right"]||t[1],e["margin-bottom"]=e["margin-bottom"]||t[2],e["margin-left"]=e["margin-left"]||t[1];break;case 4:e["margin-top"]=e["margin-top"]||t[0],e["margin-right"]=e["margin-right"]||t[1],e["margin-bottom"]=e["margin-bottom"]||t[2],e["margin-left"]=e["margin-left"]||t[3]}delete e.margin}return e},t=function(e,t){var n=c(e);"string"==typeof n?S.send({url:n,success:function(e){t(JSON.parse(e))}}):"function"==typeof n?n(t):t(n)},O=function(e,t,n){function r(){n.onload=n.onerror=null,e.selection&&(e.selection.select(n),e.nodeChanged())}n.onload=function(){t.width||t.height||!d(e)||e.dom.setAttribs(n,{width:n.clientWidth,height:n.clientHeight}),r()},n.onerror=r},L=function(r){return new w(function(e,t){var n=new(x.getOrDie("FileReader"));n.onload=function(){e(n.result)},n.onerror=function(){t(n.error.message)},n.readAsDataURL(r)})},P=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),U=Object.prototype.hasOwnProperty,E=(i=function(e,t){return t},function(){for(var e=new Array(arguments.length),t=0;t<e.length;t++)e[t]=arguments[t];if(0===e.length)throw new Error("Can't merge zero objects");for(var n={},r=0;r<e.length;r++){var a=e[r];for(var o in a)U.call(a,o)&&(n[o]=i(n[o],a[o]))}return n}),k=P.DOM,M=function(e){return e.style.marginLeft&&e.style.marginRight&&e.style.marginLeft===e.style.marginRight?A(e.style.marginLeft):""},D=function(e){return e.style.marginTop&&e.style.marginBottom&&e.style.marginTop===e.style.marginBottom?A(e.style.marginTop):""},z=function(e){return e.style.borderWidth?A(e.style.borderWidth):""},B=function(e,t){return e.hasAttribute(t)?e.getAttribute(t):""},H=function(e,t){return e.style[t]?e.style[t]:""},j=function(e){return null!==e.parentNode&&"FIGURE"===e.parentNode.nodeName},F=function(e,t,n){e.setAttribute(t,n)},W=function(e){var t,n,r,a;j(e)?(a=(r=e).parentNode,k.insertAfter(r,a),k.remove(a)):(t=e,n=k.create("figure",{"class":"image"}),k.insertAfter(n,t),n.appendChild(t),n.appendChild(k.create("figcaption",{contentEditable:!0},"Caption")),n.contentEditable="false")},J=function(e,t){var n=e.getAttribute("style"),r=t(null!==n?n:"");0<r.length?(e.setAttribute("style",r),e.setAttribute("data-mce-style",r)):e.removeAttribute("style")},V=function(e,r){return function(e,t,n){e.style[t]?(e.style[t]=R(n),J(e,r)):F(e,t,n)}},G=function(e,t){return e.style[t]?A(e.style[t]):B(e,t)},$=function(e,t){var n=R(t);e.style.marginLeft=n,e.style.marginRight=n},X=function(e,t){var n=R(t);e.style.marginTop=n,e.style.marginBottom=n},q=function(e,t){var n=R(t);e.style.borderWidth=n},K=function(e,t){e.style.borderStyle=t},Q=function(e){return"FIGURE"===e.nodeName},Y=function(e,t){var n=l.document.createElement("img");return F(n,"style",t.style),(M(n)||""!==t.hspace)&&$(n,t.hspace),(D(n)||""!==t.vspace)&&X(n,t.vspace),(z(n)||""!==t.border)&&q(n,t.border),(H(n,"borderStyle")||""!==t.borderStyle)&&K(n,t.borderStyle),e(n.getAttribute("style"))},Z=function(e,t){return{src:B(t,"src"),alt:B(t,"alt"),title:B(t,"title"),width:G(t,"width"),height:G(t,"height"),"class":B(t,"class"),style:e(B(t,"style")),caption:j(t),hspace:M(t),vspace:D(t),border:z(t),borderStyle:H(t,"borderStyle")}},ee=function(e,t,n,r,a){n[r]!==t[r]&&a(e,r,n[r])},te=function(r,a){return function(e,t,n){r(e,n),J(e,a)}},ne=function(e,t,n){var r=Z(e,n);ee(n,r,t,"caption",function(e,t,n){return W(e)}),ee(n,r,t,"src",F),ee(n,r,t,"alt",F),ee(n,r,t,"title",F),ee(n,r,t,"width",V(0,e)),ee(n,r,t,"height",V(0,e)),ee(n,r,t,"class",F),ee(n,r,t,"style",te(function(e,t){return F(e,"style",t)},e)),ee(n,r,t,"hspace",te($,e)),ee(n,r,t,"vspace",te(X,e)),ee(n,r,t,"border",te(q,e)),ee(n,r,t,"borderStyle",te(K,e))},re=function(e,t){var n=e.dom.styles.parse(t),r=I(n),a=e.dom.styles.parse(e.dom.styles.serialize(r));return e.dom.styles.serialize(a)},ae=function(e){var t=e.selection.getNode(),n=e.dom.getParent(t,"figure.image");return n?e.dom.select("img",n)[0]:t&&("IMG"!==t.nodeName||t.getAttribute("data-mce-object")||t.getAttribute("data-mce-placeholder"))?null:t},oe=function(t,e){var n=t.dom,r=n.getParent(e.parentNode,function(e){return t.schema.getTextBlockElements()[e.nodeName]},t.getBody());return r?n.split(r,e):e},ie=function(t){var e=ae(t);return e?Z(function(e){return re(t,e)},e):{src:"",alt:"",title:"",width:"",height:"","class":"",style:"",caption:!1,hspace:"",vspace:"",border:"",borderStyle:""}},le=function(t,e){var n=function(e,t){var n=l.document.createElement("img");if(ne(e,E(t,{caption:!1}),n),F(n,"alt",t.alt),t.caption){var r=k.create("figure",{"class":"image"});return r.appendChild(n),r.appendChild(k.create("figcaption",{contentEditable:!0},"Caption")),r.contentEditable="false",r}return n}(function(e){return re(t,e)},e);t.dom.setAttrib(n,"data-mce-id","__mcenew"),t.focus(),t.selection.setContent(n.outerHTML);var r=t.dom.select('*[data-mce-id="__mcenew"]')[0];if(t.dom.setAttrib(r,"data-mce-id",null),Q(r)){var a=oe(t,r);t.selection.select(a)}else t.selection.select(r)},ue=function(e,t){var n=ae(e);n?t.src?function(t,e){var n,r=ae(t);if(ne(function(e){return re(t,e)},e,r),n=r,t.dom.setAttrib(n,"src",n.getAttribute("src")),Q(r.parentNode)){var a=r.parentNode;oe(t,a),t.selection.select(r.parentNode)}else t.selection.select(r),O(t,e,r)}(e,t):function(e,t){if(t){var n=e.dom.is(t.parentNode,"figure.image")?t.parentNode:t;e.dom.remove(n),e.focus(),e.nodeChanged(),e.dom.isEmpty(e.getBody())&&(e.setContent(""),e.selection.setCursorLocation())}}(e,n):t.src&&le(e,t)},ce=function(n,r){r.find("#style").each(function(e){var t=Y(function(e){return re(n,e)},E({src:"",alt:"",title:"",width:"",height:"","class":"",style:"",caption:!1,hspace:"",vspace:"",border:"",borderStyle:""},r.toJSON()));e.value(t)})},se=function(t){return{title:"Advanced",type:"form",pack:"start",items:[{label:"Style",name:"style",type:"textbox",onchange:(o=t,function(e){var t=o.dom,n=e.control.rootControl;if(u(o)){var r=n.toJSON(),a=t.parseStyle(r.style);n.find("#vspace").value(""),n.find("#hspace").value(""),((a=I(a))["margin-top"]&&a["margin-bottom"]||a["margin-right"]&&a["margin-left"])&&(a["margin-top"]===a["margin-bottom"]?n.find("#vspace").value(A(a["margin-top"])):n.find("#vspace").value(""),a["margin-right"]===a["margin-left"]?n.find("#hspace").value(A(a["margin-right"])):n.find("#hspace").value("")),a["border-width"]?n.find("#border").value(A(a["border-width"])):n.find("#border").value(""),a["border-style"]?n.find("#borderStyle").value(a["border-style"]):n.find("#borderStyle").value(""),n.find("#style").value(t.serializeStyle(t.parseStyle(t.serializeStyle(a))))}})},{type:"form",layout:"grid",packV:"start",columns:2,padding:0,defaults:{type:"textbox",maxWidth:50,onchange:function(e){ce(t,e.control.rootControl)}},items:[{label:"Vertical space",name:"vspace"},{label:"Border width",name:"border"},{label:"Horizontal space",name:"hspace"},{label:"Border style",type:"listbox",name:"borderStyle",width:90,maxWidth:90,onselect:function(e){ce(t,e.control.rootControl)},values:[{text:"Select...",value:""},{text:"Solid",value:"solid"},{text:"Dotted",value:"dotted"},{text:"Dashed",value:"dashed"},{text:"Double",value:"double"},{text:"Groove",value:"groove"},{text:"Ridge",value:"ridge"},{text:"Inset",value:"inset"},{text:"Outset",value:"outset"},{text:"None",value:"none"},{text:"Hidden",value:"hidden"}]}]}]};var o},de=function(e,t){e.state.set("oldVal",e.value()),t.state.set("oldVal",t.value())},me=function(e,t){var n=e.find("#width")[0],r=e.find("#height")[0],a=e.find("#constrain")[0];n&&r&&a&&t(n,r,a.checked())},ge=function(e,t,n){var r=e.state.get("oldVal"),a=t.state.get("oldVal"),o=e.value(),i=t.value();n&&r&&a&&o&&i&&(o!==r?(i=Math.round(o/r*i),isNaN(i)||t.value(i)):(o=Math.round(i/a*o),isNaN(o)||e.value(o))),de(e,t)},fe=function(e){me(e,ge)},pe=function(){var e=function(e){fe(e.control.rootControl)};return{type:"container",label:"Dimensions",layout:"flex",align:"center",spacing:5,items:[{name:"width",type:"textbox",maxLength:5,size:5,onchange:e,ariaLabel:"Width"},{type:"label",text:"x"},{name:"height",type:"textbox",maxLength:5,size:5,onchange:e,ariaLabel:"Height"},{name:"constrain",type:"checkbox",checked:!0,text:"Constrain proportions"}]}},he=function(e){me(e,de)},ve=fe,be=function(e){e.meta=e.control.rootControl.toJSON()},ye=function(s,e){var t=[{name:"src",type:"filepicker",filetype:"image",label:"Source",autofocus:!0,onchange:function(e){var t,n,r,a,o,i,l,u,c;n=s,i=(t=e).meta||{},l=t.control,u=l.rootControl,(c=u.find("#image-list")[0])&&c.value(n.convertURL(l.value(),"src")),C.each(i,function(e,t){u.find("#"+t).value(e)}),i.width||i.height||(r=n.convertURL(l.value(),"src"),a=m(n),o=new RegExp("^(?:[a-z]+:)?//","i"),a&&!o.test(r)&&r.substring(0,a.length)!==a&&(r=a+r),l.value(r),_(n.documentBaseURI.toAbsolute(l.value()),function(e){e.width&&e.height&&d(n)&&(u.find("#width").value(e.width),u.find("#height").value(e.height),he(u))}))},onbeforecall:be},e];return r(s)&&t.push({name:"alt",type:"textbox",label:"Image description"}),a(s)&&t.push({name:"title",type:"textbox",label:"Image Title"}),d(s)&&t.push(pe()),n(s)&&t.push({name:"class",type:"listbox",label:"Class",values:T(n(s),function(e){e.value&&(e.textStyle=function(){return s.formatter.getCssText({inline:"img",classes:[e.value]})})})}),o(s)&&t.push({name:"caption",type:"checkbox",label:"Caption"}),t},xe=function(e,t){return{title:"General",type:"form",items:ye(e,t)}},we=ye,Ce=function(){return x.getOrDie("URL")},Se=function(e){return Ce().createObjectURL(e)},Ne=function(e){Ce().revokeObjectURL(e)},_e=tinymce.util.Tools.resolve("tinymce.ui.Factory"),Te=function(){};function Ae(i){var t=function(e,r,a,t){var o,n;(o=new(x.getOrDie("XMLHttpRequest"))).open("POST",i.url),o.withCredentials=i.credentials,o.upload.onprogress=function(e){t(e.loaded/e.total*100)},o.onerror=function(){a("Image upload failed due to a XHR Transport error. Code: "+o.status)},o.onload=function(){var e,t,n;o.status<200||300<=o.status?a("HTTP Error: "+o.status):(e=JSON.parse(o.responseText))&&"string"==typeof e.location?r((t=i.basePath,n=e.location,t?t.replace(/\/$/,"")+"/"+n.replace(/^\//,""):n)):a("Invalid JSON: "+o.responseText)},(n=new l.FormData).append("file",e.blob(),e.filename()),o.send(n)};return i=C.extend({credentials:!1,handler:t},i),{upload:function(e){return i.url||i.handler!==t?(r=e,a=i.handler,new w(function(e,t){try{a(r,e,t,Te)}catch(n){t(n.message)}})):w.reject("Upload url missing from the settings.");var r,a}}}var Re=function(u){return function(e){var t=_e.get("Throbber"),n=e.control.rootControl,r=new t(n.getEl()),a=e.control.value(),o=Se(a),i=Ae({url:f(u),basePath:h(u),credentials:v(u),handler:p(u)}),l=function(){r.hide(),Ne(o)};return r.show(),L(a).then(function(e){var t=u.editorUpload.blobCache.create({blob:a,blobUri:o,name:a.name?a.name.replace(/\.[^\.]+$/,""):null,base64:e.split(",")[1]});return i.upload(t).then(function(e){var t=n.find("#src");return t.value(e),n.find("tabpanel")[0].activateTab(0),t.fire("change"),l(),e})})["catch"](function(e){u.windowManager.alert(e),l()})}},Ie=".jpg,.jpeg,.png,.gif",Oe=function(e){return{title:"Upload",type:"form",layout:"flex",direction:"column",align:"stretch",padding:"20 20 20 20",items:[{type:"container",layout:"flex",direction:"column",align:"center",spacing:10,items:[{text:"Browse for an image",type:"browsebutton",accept:Ie,onchange:Re(e)},{text:"OR",type:"label"}]},{text:"Drop an image here",type:"dropzone",accept:Ie,height:100,onchange:Re(e)}]}};function Le(r){for(var a=[],e=1;e<arguments.length;e++)a[e-1]=arguments[e];return function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n=a.concat(e);return r.apply(null,n)}}var Pe=function(t,e){var n=e.control.getRoot();ve(n),t.undoManager.transact(function(){var e=E(ie(t),n.toJSON());ue(t,e)}),t.editorUpload.uploadImagesAuto()};function Ue(o){function e(e){var n,t,r=ie(o);if(e&&(t={type:"listbox",label:"Image list",name:"image-list",values:T(e,function(e){e.value=o.convertURL(e.value||e.url,"src")},[{text:"None",value:""}]),value:r.src&&o.convertURL(r.src,"src"),onselect:function(e){var t=n.find("#alt");(!t.value()||e.lastControl&&t.value()===e.lastControl.text())&&t.value(e.control.text()),n.find("#src").value(e.control.value()).fire("change")},onPostRender:function(){t=this}}),u(o)||s(o)||g(o)){var a=[xe(o,t)];u(o)&&a.push(se(o)),(s(o)||g(o))&&a.push(Oe(o)),n=o.windowManager.open({title:"Insert/edit image",data:r,bodyType:"tabpanel",body:a,onSubmit:Le(Pe,o)})}else n=o.windowManager.open({title:"Insert/edit image",data:r,body:we(o,t),onSubmit:Le(Pe,o)});he(n)}return{open:function(){t(o,e)}}}var Ee=function(e){e.addCommand("mceImage",Ue(e).open)},ke=function(o){return function(e){for(var t,n,r=e.length,a=function(e){e.attr("contenteditable",o?"true":null)};r--;)t=e[r],(n=t.attr("class"))&&/\bimage\b/.test(n)&&(t.attr("contenteditable",o?"false":null),C.each(t.getAll("figcaption"),a))}},Me=function(e){e.on("preInit",function(){e.parser.addNodeFilter("figure",ke(!0)),e.serializer.addNodeFilter("figure",ke(!1))})},De=function(e){e.addButton("image",{icon:"image",tooltip:"Insert/edit image",onclick:Ue(e).open,stateSelector:"img:not([data-mce-object],[data-mce-placeholder]),figure.image"}),e.addMenuItem("image",{icon:"image",text:"Image",onclick:Ue(e).open,context:"insert",prependToContext:!0})};e.add("image",function(e){Me(e),De(e),Ee(e)})}(window);
\ No newline at end of file
+!function(l){"use strict";var i,e=tinymce.util.Tools.resolve("tinymce.PluginManager"),d=function(e){return!1!==e.settings.image_dimensions},u=function(e){return!0===e.settings.image_advtab},m=function(e){return e.getParam("image_prepend_url","")},n=function(e){return e.getParam("image_class_list")},r=function(e){return!1!==e.settings.image_description},a=function(e){return!0===e.settings.image_title},o=function(e){return!0===e.settings.image_caption},c=function(e){return e.getParam("image_list",!1)},s=function(e){return e.getParam("images_upload_url",!1)},g=function(e){return e.getParam("images_upload_handler",!1)},f=function(e){return e.getParam("images_upload_url")},p=function(e){return e.getParam("images_upload_handler")},h=function(e){return e.getParam("images_upload_base_path")},v=function(e){return e.getParam("images_upload_credentials")},b="undefined"!=typeof l.window?l.window:Function("return this;")(),y=function(e,t){return function(e,t){for(var n=t!==undefined&&null!==t?t:b,r=0;r<e.length&&n!==undefined&&null!==n;++r)n=n[e[r]];return n}(e.split("."),t)},x={getOrDie:function(e,t){var n=y(e,t);if(n===undefined||null===n)throw new Error(e+" not available on this browser");return n}},w=tinymce.util.Tools.resolve("tinymce.util.Promise"),C=tinymce.util.Tools.resolve("tinymce.util.Tools"),S=tinymce.util.Tools.resolve("tinymce.util.XHR"),N=function(e,t){return Math.max(parseInt(e,10),parseInt(t,10))},_=function(e,n){var r=l.document.createElement("img");function t(e,t){r.parentNode&&r.parentNode.removeChild(r),n({width:e,height:t})}r.onload=function(){t(N(r.width,r.clientWidth),N(r.height,r.clientHeight))},r.onerror=function(){t(0,0)};var a=r.style;a.visibility="hidden",a.position="fixed",a.bottom=a.left="0px",a.width=a.height="auto",l.document.body.appendChild(r),r.src=e},T=function(e,a,t){return function n(e,r){return r=r||[],C.each(e,function(e){var t={text:e.text||e.title};e.menu?t.menu=n(e.menu):(t.value=e.value,a(t)),r.push(t)}),r}(e,t||[])},A=function(e){return e&&(e=e.replace(/px$/,"")),e},R=function(e){return 0<e.length&&/^[0-9]+$/.test(e)&&(e+="px"),e},I=function(e){if(e.margin){var t=e.margin.split(" ");switch(t.length){case 1:e["margin-top"]=e["margin-top"]||t[0],e["margin-right"]=e["margin-right"]||t[0],e["margin-bottom"]=e["margin-bottom"]||t[0],e["margin-left"]=e["margin-left"]||t[0];break;case 2:e["margin-top"]=e["margin-top"]||t[0],e["margin-right"]=e["margin-right"]||t[1],e["margin-bottom"]=e["margin-bottom"]||t[0],e["margin-left"]=e["margin-left"]||t[1];break;case 3:e["margin-top"]=e["margin-top"]||t[0],e["margin-right"]=e["margin-right"]||t[1],e["margin-bottom"]=e["margin-bottom"]||t[2],e["margin-left"]=e["margin-left"]||t[1];break;case 4:e["margin-top"]=e["margin-top"]||t[0],e["margin-right"]=e["margin-right"]||t[1],e["margin-bottom"]=e["margin-bottom"]||t[2],e["margin-left"]=e["margin-left"]||t[3]}delete e.margin}return e},t=function(e,t){var n=c(e);"string"==typeof n?S.send({url:n,success:function(e){t(JSON.parse(e))}}):"function"==typeof n?n(t):t(n)},O=function(e,t,n){function r(){n.onload=n.onerror=null,e.selection&&(e.selection.select(n),e.nodeChanged())}n.onload=function(){t.width||t.height||!d(e)||e.dom.setAttribs(n,{width:n.clientWidth,height:n.clientHeight}),r()},n.onerror=r},L=function(r){return new w(function(e,t){var n=new(x.getOrDie("FileReader"));n.onload=function(){e(n.result)},n.onerror=function(){t(n.error.message)},n.readAsDataURL(r)})},P=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),U=Object.prototype.hasOwnProperty,E=(i=function(e,t){return t},function(){for(var e=new Array(arguments.length),t=0;t<e.length;t++)e[t]=arguments[t];if(0===e.length)throw new Error("Can't merge zero objects");for(var n={},r=0;r<e.length;r++){var a=e[r];for(var o in a)U.call(a,o)&&(n[o]=i(n[o],a[o]))}return n}),k=P.DOM,M=function(e){return e.style.marginLeft&&e.style.marginRight&&e.style.marginLeft===e.style.marginRight?A(e.style.marginLeft):""},D=function(e){return e.style.marginTop&&e.style.marginBottom&&e.style.marginTop===e.style.marginBottom?A(e.style.marginTop):""},z=function(e){return e.style.borderWidth?A(e.style.borderWidth):""},B=function(e,t){return e.hasAttribute(t)?e.getAttribute(t):""},H=function(e,t){return e.style[t]?e.style[t]:""},j=function(e){return null!==e.parentNode&&"FIGURE"===e.parentNode.nodeName},F=function(e,t,n){e.setAttribute(t,n)},W=function(e){var t,n,r,a;j(e)?(a=(r=e).parentNode,k.insertAfter(r,a),k.remove(a)):(t=e,n=k.create("figure",{"class":"image"}),k.insertAfter(n,t),n.appendChild(t),n.appendChild(k.create("figcaption",{contentEditable:!0},"Caption")),n.contentEditable="false")},J=function(e,t){var n=e.getAttribute("style"),r=t(null!==n?n:"");0<r.length?(e.setAttribute("style",r),e.setAttribute("data-mce-style",r)):e.removeAttribute("style")},V=function(e,r){return function(e,t,n){e.style[t]?(e.style[t]=R(n),J(e,r)):F(e,t,n)}},G=function(e,t){return e.style[t]?A(e.style[t]):B(e,t)},$=function(e,t){var n=R(t);e.style.marginLeft=n,e.style.marginRight=n},X=function(e,t){var n=R(t);e.style.marginTop=n,e.style.marginBottom=n},q=function(e,t){var n=R(t);e.style.borderWidth=n},K=function(e,t){e.style.borderStyle=t},Q=function(e){return"FIGURE"===e.nodeName},Y=function(e,t){var n=l.document.createElement("img");return F(n,"style",t.style),(M(n)||""!==t.hspace)&&$(n,t.hspace),(D(n)||""!==t.vspace)&&X(n,t.vspace),(z(n)||""!==t.border)&&q(n,t.border),(H(n,"borderStyle")||""!==t.borderStyle)&&K(n,t.borderStyle),e(n.getAttribute("style"))},Z=function(e,t){return{src:B(t,"src"),alt:B(t,"alt"),title:B(t,"title"),width:G(t,"width"),height:G(t,"height"),"class":B(t,"class"),style:e(B(t,"style")),caption:j(t),hspace:M(t),vspace:D(t),border:z(t),borderStyle:H(t,"borderStyle")}},ee=function(e,t,n,r,a){n[r]!==t[r]&&a(e,r,n[r])},te=function(r,a){return function(e,t,n){r(e,n),J(e,a)}},ne=function(e,t,n){var r=Z(e,n);ee(n,r,t,"caption",function(e,t,n){return W(e)}),ee(n,r,t,"src",F),ee(n,r,t,"alt",F),ee(n,r,t,"title",F),ee(n,r,t,"width",V(0,e)),ee(n,r,t,"height",V(0,e)),ee(n,r,t,"class",F),ee(n,r,t,"style",te(function(e,t){return F(e,"style",t)},e)),ee(n,r,t,"hspace",te($,e)),ee(n,r,t,"vspace",te(X,e)),ee(n,r,t,"border",te(q,e)),ee(n,r,t,"borderStyle",te(K,e))},re=function(e,t){var n=e.dom.styles.parse(t),r=I(n),a=e.dom.styles.parse(e.dom.styles.serialize(r));return e.dom.styles.serialize(a)},ae=function(e){var t=e.selection.getNode(),n=e.dom.getParent(t,"figure.image");return n?e.dom.select("img",n)[0]:t&&("IMG"!==t.nodeName||t.getAttribute("data-mce-object")||t.getAttribute("data-mce-placeholder"))?null:t},oe=function(t,e){var n=t.dom,r=n.getParent(e.parentNode,function(e){return t.schema.getTextBlockElements()[e.nodeName]},t.getBody());return r?n.split(r,e):e},ie=function(t){var e=ae(t);return e?Z(function(e){return re(t,e)},e):{src:"",alt:"",title:"",width:"",height:"","class":"",style:"",caption:!1,hspace:"",vspace:"",border:"",borderStyle:""}},le=function(t,e){var n=function(e,t){var n=l.document.createElement("img");if(ne(e,E(t,{caption:!1}),n),F(n,"alt",t.alt),t.caption){var r=k.create("figure",{"class":"image"});return r.appendChild(n),r.appendChild(k.create("figcaption",{contentEditable:!0},"Caption")),r.contentEditable="false",r}return n}(function(e){return re(t,e)},e);t.dom.setAttrib(n,"data-mce-id","__mcenew"),t.focus(),t.selection.setContent(n.outerHTML);var r=t.dom.select('*[data-mce-id="__mcenew"]')[0];if(t.dom.setAttrib(r,"data-mce-id",null),Q(r)){var a=oe(t,r);t.selection.select(a)}else t.selection.select(r)},ue=function(e,t){var n=ae(e);n?t.src?function(t,e){var n,r=ae(t);if(ne(function(e){return re(t,e)},e,r),n=r,t.dom.setAttrib(n,"src",n.getAttribute("src")),Q(r.parentNode)){var a=r.parentNode;oe(t,a),t.selection.select(r.parentNode)}else t.selection.select(r),O(t,e,r)}(e,t):function(e,t){if(t){var n=e.dom.is(t.parentNode,"figure.image")?t.parentNode:t;e.dom.remove(n),e.focus(),e.nodeChanged(),e.dom.isEmpty(e.getBody())&&(e.setContent(""),e.selection.setCursorLocation())}}(e,n):t.src&&le(e,t)},ce=function(n,r){r.find("#style").each(function(e){var t=Y(function(e){return re(n,e)},E({src:"",alt:"",title:"",width:"",height:"","class":"",style:"",caption:!1,hspace:"",vspace:"",border:"",borderStyle:""},r.toJSON()));e.value(t)})},se=function(t){return{title:"Advanced",type:"form",pack:"start",items:[{label:"Style",name:"style",type:"textbox",onchange:(o=t,function(e){var t=o.dom,n=e.control.rootControl;if(u(o)){var r=n.toJSON(),a=t.parseStyle(r.style);n.find("#vspace").value(""),n.find("#hspace").value(""),((a=I(a))["margin-top"]&&a["margin-bottom"]||a["margin-right"]&&a["margin-left"])&&(a["margin-top"]===a["margin-bottom"]?n.find("#vspace").value(A(a["margin-top"])):n.find("#vspace").value(""),a["margin-right"]===a["margin-left"]?n.find("#hspace").value(A(a["margin-right"])):n.find("#hspace").value("")),a["border-width"]?n.find("#border").value(A(a["border-width"])):n.find("#border").value(""),a["border-style"]?n.find("#borderStyle").value(a["border-style"]):n.find("#borderStyle").value(""),n.find("#style").value(t.serializeStyle(t.parseStyle(t.serializeStyle(a))))}})},{type:"form",layout:"grid",packV:"start",columns:2,padding:0,defaults:{type:"textbox",maxWidth:50,onchange:function(e){ce(t,e.control.rootControl)}},items:[{label:"Vertical space",name:"vspace"},{label:"Border width",name:"border"},{label:"Horizontal space",name:"hspace"},{label:"Border style",type:"listbox",name:"borderStyle",width:90,maxWidth:90,onselect:function(e){ce(t,e.control.rootControl)},values:[{text:"Select...",value:""},{text:"Solid",value:"solid"},{text:"Dotted",value:"dotted"},{text:"Dashed",value:"dashed"},{text:"Double",value:"double"},{text:"Groove",value:"groove"},{text:"Ridge",value:"ridge"},{text:"Inset",value:"inset"},{text:"Outset",value:"outset"},{text:"None",value:"none"},{text:"Hidden",value:"hidden"}]}]}]};var o},de=function(e,t){e.state.set("oldVal",e.value()),t.state.set("oldVal",t.value())},me=function(e,t){var n=e.find("#width")[0],r=e.find("#height")[0],a=e.find("#constrain")[0];n&&r&&a&&t(n,r,a.checked())},ge=function(e,t,n){var r=e.state.get("oldVal"),a=t.state.get("oldVal"),o=e.value(),i=t.value();n&&r&&a&&o&&i&&(o!==r?(i=Math.round(o/r*i),isNaN(i)||t.value(i)):(o=Math.round(i/a*o),isNaN(o)||e.value(o))),de(e,t)},fe=function(e){me(e,ge)},pe=function(){var e=function(e){fe(e.control.rootControl)};return{type:"container",label:"Dimensions",layout:"flex",align:"center",spacing:5,items:[{name:"width",type:"textbox",maxLength:5,size:5,onchange:e,ariaLabel:"Width"},{type:"label",text:"x"},{name:"height",type:"textbox",maxLength:5,size:5,onchange:e,ariaLabel:"Height"},{name:"constrain",type:"checkbox",checked:!0,text:"Constrain proportions"}]}},he=function(e){me(e,de)},ve=fe,be=function(e){e.meta=e.control.rootControl.toJSON()},ye=function(s,e){var t=[{name:"src",type:"filepicker",filetype:"image",label:"Source",autofocus:!0,onchange:function(e){var t,n,r,a,o,i,l,u,c;n=s,i=(t=e).meta||{},l=t.control,u=l.rootControl,(c=u.find("#image-list")[0])&&c.value(n.convertURL(l.value(),"src")),C.each(i,function(e,t){u.find("#"+t).value(e)}),i.width||i.height||(r=n.convertURL(l.value(),"src"),a=m(n),o=new RegExp("^(?:[a-z]+:)?//","i"),a&&!o.test(r)&&r.substring(0,a.length)!==a&&(r=a+r),l.value(r),_(n.documentBaseURI.toAbsolute(l.value()),function(e){e.width&&e.height&&d(n)&&(u.find("#width").value(e.width),u.find("#height").value(e.height),he(u))}))},onbeforecall:be},e];return r(s)&&t.push({name:"alt",type:"textbox",label:"Image description"}),a(s)&&t.push({name:"title",type:"textbox",label:"Image Title"}),d(s)&&t.push(pe()),n(s)&&t.push({name:"class",type:"listbox",label:"Class",values:T(n(s),function(e){e.value&&(e.textStyle=function(){return s.formatter.getCssText({inline:"img",classes:[e.value]})})})}),o(s)&&t.push({name:"caption",type:"checkbox",label:"Caption"}),t},xe=function(e,t){return{title:"General",type:"form",items:ye(e,t)}},we=ye,Ce=function(){return x.getOrDie("URL")},Se=function(e){return Ce().createObjectURL(e)},Ne=function(e){Ce().revokeObjectURL(e)},_e=tinymce.util.Tools.resolve("tinymce.ui.Factory"),Te=function(){};function Ae(i){var t=function(e,r,a,t){var o,n;(o=new(x.getOrDie("XMLHttpRequest"))).open("POST",i.url),o.withCredentials=i.credentials,o.upload.onprogress=function(e){t(e.loaded/e.total*100)},o.onerror=function(){a("Image upload failed due to a XHR Transport error. Code: "+o.status)},o.onload=function(){var e,t,n;o.status<200||300<=o.status?a("HTTP Error: "+o.status):(e=JSON.parse(o.responseText))&&"string"==typeof e.location?r((t=i.basePath,n=e.location,t?t.replace(/\/$/,"")+"/"+n.replace(/^\//,""):n)):a("Invalid JSON: "+o.responseText)},(n=new l.FormData).append("file",e.blob(),e.filename()),o.send(n)};return i=C.extend({credentials:!1,handler:t},i),{upload:function(e){return i.url||i.handler!==t?(r=e,a=i.handler,new w(function(e,t){try{a(r,e,t,Te)}catch(n){t(n.message)}})):w.reject("Upload url missing from the settings.");var r,a}}}var Re=function(u){return function(e){var t=_e.get("Throbber"),n=e.control.rootControl,r=new t(n.getEl()),a=e.control.value(),o=Se(a),i=Ae({url:f(u),basePath:h(u),credentials:v(u),handler:p(u)}),l=function(){r.hide(),Ne(o)};return r.show(),L(a).then(function(e){var t=u.editorUpload.blobCache.create({blob:a,blobUri:o,name:a.name?a.name.replace(/\.[^\.]+$/,""):null,base64:e.split(",")[1]});return i.upload(t).then(function(e){var t=n.find("#src");return t.value(e),n.find("tabpanel")[0].activateTab(0),t.fire("change"),l(),e})})["catch"](function(e){u.windowManager.alert(e),l()})}},Ie=".jpg,.jpeg,.png,.gif",Oe=function(e){return{title:"Upload",type:"form",layout:"flex",direction:"column",align:"stretch",padding:"20 20 20 20",items:[{type:"container",layout:"flex",direction:"column",align:"center",spacing:10,items:[{text:"Browse for an image",type:"browsebutton",accept:Ie,onchange:Re(e)},{text:"OR",type:"label"}]},{text:"Drop an image here",type:"dropzone",accept:Ie,height:100,onchange:Re(e)}]}};function Le(r){for(var a=[],e=1;e<arguments.length;e++)a[e-1]=arguments[e];return function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n=a.concat(e);return r.apply(null,n)}}var Pe=function(t,e){var n=e.control.getRoot();ve(n),t.undoManager.transact(function(){var e=E(ie(t),n.toJSON());ue(t,e)}),t.editorUpload.uploadImagesAuto()};function Ue(o){function e(e){var n,t,r=ie(o);if(e&&(t={type:"listbox",label:"Image list",name:"image-list",values:T(e,function(e){e.value=o.convertURL(e.value||e.url,"src")},[{text:"None",value:""}]),value:r.src&&o.convertURL(r.src,"src"),onselect:function(e){var t=n.find("#alt");(!t.value()||e.lastControl&&t.value()===e.lastControl.text())&&t.value(e.control.text()),n.find("#src").value(e.control.value()).fire("change")},onPostRender:function(){t=this}}),u(o)||s(o)||g(o)){var a=[xe(o,t)];u(o)&&a.push(se(o)),(s(o)||g(o))&&a.push(Oe(o)),n=o.windowManager.open({title:"Insert/edit image",data:r,bodyType:"tabpanel",body:a,onSubmit:Le(Pe,o)})}else n=o.windowManager.open({title:"Insert/edit image",data:r,body:we(o,t),onSubmit:Le(Pe,o)});he(n)}return{open:function(){t(o,e)}}}var Ee=function(e){e.addCommand("mceImage",Ue(e).open)},ke=function(o){return function(e){for(var t,n,r=e.length,a=function(e){e.attr("contenteditable",o?"true":null)};r--;)t=e[r],(n=t.attr("class"))&&/\bimage\b/.test(n)&&(t.attr("contenteditable",o?"false":null),C.each(t.getAll("figcaption"),a))}},Me=function(e){e.on("preInit",function(){e.parser.addNodeFilter("figure",ke(!0)),e.serializer.addNodeFilter("figure",ke(!1))})},De=function(e){e.addButton("image",{icon:"image",tooltip:"Insert/edit image",onclick:Ue(e).open,stateSelector:"img:not([data-mce-object],[data-mce-placeholder]),figure.image"}),e.addMenuItem("image",{icon:"image",text:"Image",onclick:Ue(e).open,context:"insert",prependToContext:!0})};e.add("image",function(e){Me(e),De(e),Ee(e)})}(window);
\ No newline at end of file
diff --git a/lib/web/tiny_mce_4/plugins/imagetools/plugin.min.js b/lib/web/tiny_mce_4/plugins/imagetools/plugin.min.js
index c1551224be187..f1b6a11104b2b 100644
--- a/lib/web/tiny_mce_4/plugins/imagetools/plugin.min.js
+++ b/lib/web/tiny_mce_4/plugins/imagetools/plugin.min.js
@@ -1 +1 @@
-!function(s){"use strict";var r=function(t){var e=t,n=function(){return e};return{get:n,set:function(t){e=t},clone:function(){return r(n())}}},t=tinymce.util.Tools.resolve("tinymce.PluginManager"),G=tinymce.util.Tools.resolve("tinymce.util.Tools"),i=function(t){return function(){return t}};function a(r){for(var o=[],t=1;t<arguments.length;t++)o[t-1]=arguments[t];return function(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e];var n=o.concat(t);return r.apply(null,n)}}var e,n,o,u,c=i(!1),l=i(!0),f=c,d=l,h=function(){return p},p=(u={fold:function(t,e){return t()},is:f,isSome:f,isNone:d,getOr:o=function(t){return t},getOrThunk:n=function(t){return t()},getOrDie:function(t){throw new Error(t||"error: getOrDie called on none.")},getOrNull:function(){return null},getOrUndefined:function(){return undefined},or:o,orThunk:n,map:h,ap:h,each:function(){},bind:h,flatten:h,exists:f,forall:d,filter:h,equals:e=function(t){return t.isNone()},equals_:e,toArray:function(){return[]},toString:i("none()")},Object.freeze&&Object.freeze(u),u),m=function(n){var t=function(){return n},e=function(){return o},r=function(t){return t(n)},o={fold:function(t,e){return e(n)},is:function(t){return n===t},isSome:d,isNone:f,getOr:t,getOrThunk:t,getOrDie:t,getOrNull:t,getOrUndefined:t,or:e,orThunk:e,map:function(t){return m(t(n))},ap:function(t){return t.fold(h,function(t){return m(t(n))})},each:function(t){t(n)},bind:r,flatten:t,exists:r,forall:r,filter:function(t){return t(n)?o:p},equals:function(t){return t.is(n)},equals_:function(t,e){return t.fold(f,function(t){return e(n,t)})},toArray:function(){return[n]},toString:function(){return"some("+n+")"}};return o},y={some:m,none:h,from:function(t){return null===t||t===undefined?p:m(t)}},g="undefined"!=typeof s.window?s.window:Function("return this;")(),v=function(t,e){return function(t,e){for(var n=e!==undefined&&null!==e?e:g,r=0;r<t.length&&n!==undefined&&null!==n;++r)n=n[t[r]];return n}(t.split("."),e)},w={getOrDie:function(t,e){var n=v(t,e);if(n===undefined||null===n)throw t+" not available on this browser";return n}};function b(){return new(w.getOrDie("FileReader"))}var x={atob:function(t){return w.getOrDie("atob")(t)},requestAnimationFrame:function(t){w.getOrDie("requestAnimationFrame")(t)}};function k(t,e){return M(s.document.createElement("canvas"),t,e)}function R(t){var e=k(t.width,t.height);return I(e).drawImage(t,0,0),e}function I(t){return t.getContext("2d")}function M(t,e,n){return t.width=e,t.height=n,t}function T(t){return t.naturalWidth||t.width}function O(t){return t.naturalHeight||t.height}var U=window.Promise?window.Promise:function(){var i=function(t){if("object"!=typeof this)throw new TypeError("Promises must be constructed via new");if("function"!=typeof t)throw new TypeError("not a function");this._state=null,this._value=null,this._deferreds=[],f(t,r(o,this),r(u,this))},t=i.immediateFn||"function"==typeof window.setImmediate&&window.setImmediate||function(t){s.setTimeout(t,1)};function r(t,e){return function(){return t.apply(e,arguments)}}var n=Array.isArray||function(t){return"[object Array]"===Object.prototype.toString.call(t)};function a(r){var o=this;null!==this._state?t(function(){var t=o._state?r.onFulfilled:r.onRejected;if(null!==t){var e;try{e=t(o._value)}catch(n){return void r.reject(n)}r.resolve(e)}else(o._state?r.resolve:r.reject)(o._value)}):this._deferreds.push(r)}function o(t){try{if(t===this)throw new TypeError("A promise cannot be resolved with itself.");if(t&&("object"==typeof t||"function"==typeof t)){var e=t.then;if("function"==typeof e)return void f(r(e,t),r(o,this),r(u,this))}this._state=!0,this._value=t,c.call(this)}catch(n){u.call(this,n)}}function u(t){this._state=!1,this._value=t,c.call(this)}function c(){for(var t=0,e=this._deferreds;t<e.length;t++){var n=e[t];a.call(this,n)}this._deferreds=[]}function l(t,e,n,r){this.onFulfilled="function"==typeof t?t:null,this.onRejected="function"==typeof e?e:null,this.resolve=n,this.reject=r}function f(t,e,n){var r=!1;try{t(function(t){r||(r=!0,e(t))},function(t){r||(r=!0,n(t))})}catch(o){if(r)return;r=!0,n(o)}}return i.prototype["catch"]=function(t){return this.then(null,t)},i.prototype.then=function(n,r){var o=this;return new i(function(t,e){a.call(o,new l(n,r,t,e))})},i.all=function(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e];var c=Array.prototype.slice.call(1===t.length&&n(t[0])?t[0]:t);return new i(function(o,i){if(0===c.length)return o([]);var a=c.length;function u(e,t){try{if(t&&("object"==typeof t||"function"==typeof t)){var n=t.then;if("function"==typeof n)return void n.call(t,function(t){u(e,t)},i)}c[e]=t,0==--a&&o(c)}catch(r){i(r)}}for(var t=0;t<c.length;t++)u(t,c[t])})},i.resolve=function(e){return e&&"object"==typeof e&&e.constructor===i?e:new i(function(t){t(e)})},i.reject=function(n){return new i(function(t,e){e(n)})},i.race=function(o){return new i(function(t,e){for(var n=0,r=o;n<r.length;n++)r[n].then(t,e)})},i}();function C(t){var r,e=t.src;return 0===e.indexOf("data:")?E(e):(r=e,new U(function(t,n){var e=new s.XMLHttpRequest;e.open("GET",r,!0),e.responseType="blob",e.onload=function(){200===this.status&&t(this.response)},e.onerror=function(){var t,e=this;n(0===this.status?((t=new Error("No access to download image")).code=18,t.name="SecurityError",t):new Error("Error "+e.status+" downloading image"))},e.send()}))}function A(u){return new U(function(t,e){var n=s.URL.createObjectURL(u),r=new s.Image,o=function(){r.removeEventListener("load",i),r.removeEventListener("error",a)};function i(){o(),t(r)}function a(){o(),e("Unable to load data of type "+u.type+": "+n)}r.addEventListener("load",i),r.addEventListener("error",a),r.src=n,r.complete&&i()})}function _(t){var e=t.split(","),n=/data:([^;]+)/.exec(e[0]);if(!n)return y.none();for(var r,o,i,a=n[1],u=e[1],c=x.atob(u),l=c.length,f=Math.ceil(l/1024),s=new Array(f),d=0;d<f;++d){for(var h=1024*d,p=Math.min(h+1024,l),m=new Array(p-h),g=h,v=0;g<p;++v,++g)m[v]=c[g].charCodeAt(0);s[d]=(r=m,new(w.getOrDie("Uint8Array"))(r))}return y.some((o=s,i={type:a},new(w.getOrDie("Blob"))(o,i)))}function E(n){return new U(function(t,e){_(n).fold(function(){e("uri is not base64: "+n)},t)})}function j(t,r,o){return r=r||"image/png",s.HTMLCanvasElement.prototype.toBlob?new U(function(e,n){t.toBlob(function(t){t?e(t):n()},r,o)}):E(t.toDataURL(r,o))}function z(t){return A(t).then(function(t){var e;e=t,s.URL.revokeObjectURL(e.src);var n=k(T(t),O(t));return I(n).drawImage(t,0,0),n})}function D(t,e,n){var r=e.type;function o(r,o){return t.then(function(t){return n=o,e=(e=r)||"image/png",t.toDataURL(e,n);var e,n})}return{getType:i(r),toBlob:function(){return U.resolve(e)},toDataURL:function(){return n},toBase64:function(){return n.split(",")[1]},toAdjustedBlob:function(e,n){return t.then(function(t){return j(t,e,n)})},toAdjustedDataURL:o,toAdjustedBase64:function(t,e){return o(t,e).then(function(t){return t.split(",")[1]})},toCanvas:function(){return t.then(R)}}}function L(e){return(n=e,new U(function(t){var e=b();e.onloadend=function(){t(e.result)},e.readAsDataURL(n)})).then(function(t){return D(z(e),e,t)});var n}function B(e,t){return j(e,t).then(function(t){return D(U.resolve(e),t,e.toDataURL())})}function S(t,e,n){var r="string"==typeof t?parseFloat(t):t;return n<r?r=n:r<e&&(r=e),r}var P=[0,.01,.02,.04,.05,.06,.07,.08,.1,.11,.12,.14,.15,.16,.17,.18,.2,.21,.22,.24,.25,.27,.28,.3,.32,.34,.36,.38,.4,.42,.44,.46,.48,.5,.53,.56,.59,.62,.65,.68,.71,.74,.77,.8,.83,.86,.89,.92,.95,.98,1,1.06,1.12,1.18,1.24,1.3,1.36,1.42,1.48,1.54,1.6,1.66,1.72,1.78,1.84,1.9,1.96,2,2.12,2.25,2.37,2.5,2.62,2.75,2.87,3,3.2,3.4,3.6,3.8,4,4.3,4.7,4.9,5,5.5,6,6.5,6.8,7,7.3,7.5,7.8,8,8.4,8.7,9,9.4,9.6,9.8,10];function H(t,e){for(var n,r=[],o=new Array(25),i=0;i<5;i++){for(var a=0;a<5;a++)r[a]=e[a+5*i];for(a=0;a<5;a++){for(var u=n=0;u<5;u++)n+=t[a+5*u]*r[u];o[a+5*i]=n}}return o}function F(t,n){return n=S(n,0,1),t.map(function(t,e){return e%6==0?t=1-(1-t)*n:t*=n,S(t,0,1)})}function V(a,u){return a.toCanvas().then(function(t){return e=t,n=a.getType(),r=u,o=I(e),i=function(t,e){for(var n,r,o,i,a=t.data,u=e[0],c=e[1],l=e[2],f=e[3],s=e[4],d=e[5],h=e[6],p=e[7],m=e[8],g=e[9],v=e[10],y=e[11],w=e[12],b=e[13],x=e[14],k=e[15],R=e[16],I=e[17],M=e[18],T=e[19],O=0;O<a.length;O+=4)n=a[O],r=a[O+1],o=a[O+2],i=a[O+3],a[O]=n*u+r*c+o*l+i*f+s,a[O+1]=n*d+r*h+o*p+i*m+g,a[O+2]=n*v+r*y+o*w+i*b+x,a[O+3]=n*k+r*R+o*I+i*M+T;return t}(o.getImageData(0,0,e.width,e.height),r),o.putImageData(i,0,0),B(e,n);var e,n,r,o,i})}function W(u,c){return u.toCanvas().then(function(t){return e=t,n=u.getType(),r=c,o=I(e),i=o.getImageData(0,0,e.width,e.height),a=o.getImageData(0,0,e.width,e.height),a=function(t,e,n){function r(t,e,n){return n<t?t=n:t<e&&(t=e),t}for(var o=Math.round(Math.sqrt(n.length)),i=Math.floor(o/2),a=t.data,u=e.data,c=t.width,l=t.height,f=0;f<l;f++)for(var s=0;s<c;s++){for(var d=0,h=0,p=0,m=0;m<o;m++)for(var g=0;g<o;g++){var v=r(s+g-i,0,c-1),y=r(f+m-i,0,l-1),w=4*(y*c+v),b=n[m*o+g];d+=a[w]*b,h+=a[w+1]*b,p+=a[w+2]*b}var x=4*(f*c+s);u[x]=r(d,0,255),u[x+1]=r(h,0,255),u[x+2]=r(p,0,255)}return e}(i,a,r),o.putImageData(a,0,0),B(e,n);var e,n,r,o,i,a})}function N(u){return function(e,n){return e.toCanvas().then(function(t){return function(t,e,n){for(var r=I(t),o=new Array(256),i=0;i<o.length;i++)o[i]=u(i,n);var a=function(t,e){for(var n=t.data,r=0;r<n.length;r+=4)n[r]=e[n[r]],n[r+1]=e[n[r+1]],n[r+2]=e[n[r+2]];return t}(r.getImageData(0,0,t.width,t.height),o);return r.putImageData(a,0,0),B(t,e)}(t,e.getType(),n)})}}function q(n){return function(t,e){return V(t,n([1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1],e))}}function $(e){return function(t){return W(t,e)}}var X,Y=(X=[-1,0,0,0,255,0,-1,0,0,255,0,0,-1,0,255,0,0,0,1,0,0,0,0,0,1],function(t){return V(t,X)}),K=q(function(t,e){return H(t,[1,0,0,0,e=S(255*e,-255,255),0,1,0,0,e,0,0,1,0,e,0,0,0,1,0,0,0,0,0,1])}),J=q(function(t,e){e=S(e,-180,180)/180*Math.PI;var n=Math.cos(e),r=Math.sin(e),o=.213,i=.715,a=.072;return H(t,[o+.787*n+r*-o,i+n*-i+r*-i,a+n*-a+.928*r,0,0,o+n*-o+.143*r,i+n*(1-i)+.14*r,a+n*-a+-.283*r,0,0,o+n*-o+-.787*r,i+n*-i+r*i,a+.928*n+r*a,0,0,0,0,0,1,0,0,0,0,0,1])}),Z=q(function(t,e){var n=1+(0<(e=S(e,-1,1))?3*e:e);return H(t,[.3086*(1-n)+n,.6094*(1-n),.082*(1-n),0,0,.3086*(1-n),.6094*(1-n)+n,.082*(1-n),0,0,.3086*(1-n),.6094*(1-n),.082*(1-n)+n,0,0,0,0,0,1,0,0,0,0,0,1])}),Q=q(function(t,e){var n;return e=S(e,-1,1),H(t,[(n=(e*=100)<0?127+e/100*127:127*(n=0==(n=e%1)?P[e]:P[Math.floor(e)]*(1-n)+P[Math.floor(e)+1]*n)+127)/127,0,0,0,.5*(127-n),0,n/127,0,0,.5*(127-n),0,0,n/127,0,.5*(127-n),0,0,0,1,0,0,0,0,0,1])}),tt=q(function(t,e){return H(t,F([.33,.34,.33,0,0,.33,.34,.33,0,0,.33,.34,.33,0,0,0,0,0,1,0,0,0,0,0,1],e=S(e,0,1)))}),et=q(function(t,e){return H(t,F([.393,.769,.189,0,0,.349,.686,.168,0,0,.272,.534,.131,0,0,0,0,0,1,0,0,0,0,0,1],e=S(e,0,1)))}),nt=function(t,e,n,r){return V(t,(o=n,i=r,H([1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1],[S(e,0,2),0,0,0,0,0,o=S(o,0,2),0,0,0,0,0,i=S(i,0,2),0,0,0,0,0,1,0,0,0,0,0,1])));var o,i},rt=$([0,-1,0,-1,5,-1,0,-1,0]),ot=$([-2,-1,0,-1,1,1,0,1,2]),it=N(function(t,e){return 255*Math.pow(t/255,1-e)}),at=N(function(t,e){return 255*(1-Math.exp(-t/255*e))});function ut(t,e,n){var r=T(t),o=O(t),i=e/r,a=n/o,u=!1;(i<.5||2<i)&&(i=i<.5?.5:2,u=!0),(a<.5||2<a)&&(a=a<.5?.5:2,u=!0);var c,l,f,s=(c=t,l=i,f=a,new U(function(t){var e=T(c),n=O(c),r=Math.floor(e*l),o=Math.floor(n*f),i=k(r,o),a=I(i);a.drawImage(c,0,0,e,n,0,0,r,o),t(i)}));return u?s.then(function(t){return ut(t,e,n)}):s}function ct(c,l){return c.toCanvas().then(function(t){return e=t,n=c.getType(),r=l,o=k(e.width,e.height),i=I(o),90!==(r=r<(u=a=0)?360+r:r)&&270!==r||M(o,o.height,o.width),90!==r&&180!==r||(a=o.width),270!==r&&180!==r||(u=o.height),i.translate(a,u),i.rotate(r*Math.PI/180),i.drawImage(e,0,0),B(o,n);var e,n,r,o,i,a,u})}function lt(a,u){return a.toCanvas().then(function(t){return e=t,n=a.getType(),r=u,o=k(e.width,e.height),i=I(o),"v"===r?(i.scale(1,-1),i.drawImage(e,0,-o.height)):(i.scale(-1,1),i.drawImage(e,-o.width,0)),B(o,n);var e,n,r,o,i})}function ft(a,u,c,l,f){return a.toCanvas().then(function(t){return e=t,n=a.getType(),r=u,o=c,I(i=k(l,f)).drawImage(e,-r,-o),B(i,n);var e,n,r,o,i})}var st=function(t){return Y(t)},dt=function(t){return rt(t)},ht=function(t){return ot(t)},pt=function(t,e){return it(t,e)},mt=function(t,e){return at(t,e)},gt=function(t,e,n,r){return nt(t,e,n,r)},vt=function(t,e){return K(t,e)},yt=function(t,e){return J(t,e)},wt=function(t,e){return Z(t,e)},bt=function(t,e){return Q(t,e)},xt=function(t,e){return tt(t,e)},kt=function(t,e){return et(t,e)},Rt=function(t,e){return lt(t,e)},It=function(t,e,n,r,o){return ft(t,e,n,r,o)},Mt=function(t,e,n){return o=e,i=n,(r=t).toCanvas().then(function(t){return ut(t,o,i).then(function(t){return B(t,r.getType())})});var r,o,i},Tt=function(t,e){return ct(t,e)},Ot=function(t){return L(t)},Ut=function(){return w.getOrDie("URL")},Ct={createObjectURL:function(t){return Ut().createObjectURL(t)},revokeObjectURL:function(t){Ut().revokeObjectURL(t)}},At=tinymce.util.Tools.resolve("tinymce.util.Delay"),_t=tinymce.util.Tools.resolve("tinymce.util.Promise"),Et=tinymce.util.Tools.resolve("tinymce.util.URI"),jt=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),zt=tinymce.util.Tools.resolve("tinymce.ui.Factory"),Dt=tinymce.util.Tools.resolve("tinymce.geom.Rect"),Lt=function(n){return new _t(function(t){var e=function(){n.removeEventListener("load",e),t(n)};n.complete?t(n):n.addEventListener("load",e)})},Bt=tinymce.util.Tools.resolve("tinymce.dom.DomQuery"),St=tinymce.util.Tools.resolve("tinymce.util.Observable"),Pt=tinymce.util.Tools.resolve("tinymce.util.VK"),Ht=0,Ft={create:function(t){return new(zt.get("Control").extend({Defaults:{classes:"imagepanel"},selection:function(t){return arguments.length?(this.state.set("rect",t),this):this.state.get("rect")},imageSize:function(){var t=this.state.get("viewRect");return{w:t.w,h:t.h}},toggleCropRect:function(t){this.state.set("cropEnabled",t)},imageSrc:function(t){var o=this,i=new s.Image;i.src=t,Lt(i).then(function(){var t,e,n=o.state.get("viewRect");if((e=o.$el.find("img"))[0])e.replaceWith(i);else{var r=s.document.createElement("div");r.className="mce-imagepanel-bg",o.getEl().appendChild(r),o.getEl().appendChild(i)}t={x:0,y:0,w:i.naturalWidth,h:i.naturalHeight},o.state.set("viewRect",t),o.state.set("rect",Dt.inflate(t,-20,-20)),n&&n.w===t.w&&n.h===t.h||o.zoomFit(),o.repaintImage(),o.fire("load")})},zoom:function(t){return arguments.length?(this.state.set("zoom",t),this):this.state.get("zoom")},postRender:function(){return this.imageSrc(this.settings.imageSrc),this._super()},zoomFit:function(){var t,e,n,r,o,i;t=this.$el.find("img"),e=this.getEl().clientWidth,n=this.getEl().clientHeight,r=t[0].naturalWidth,o=t[0].naturalHeight,1<=(i=Math.min((e-10)/r,(n-10)/o))&&(i=1),this.zoom(i)},repaintImage:function(){var t,e,n,r,o,i,a,u,c,l,f;f=this.getEl(),c=this.zoom(),l=this.state.get("rect"),a=this.$el.find("img"),u=this.$el.find(".mce-imagepanel-bg"),o=f.offsetWidth,i=f.offsetHeight,n=a[0].naturalWidth*c,r=a[0].naturalHeight*c,t=Math.max(0,o/2-n/2),e=Math.max(0,i/2-r/2),a.css({left:t,top:e,width:n,height:r}),u.css({left:t,top:e,width:n,height:r}),this.cropRect&&(this.cropRect.setRect({x:l.x*c+t,y:l.y*c+e,w:l.w*c,h:l.h*c}),this.cropRect.setClampRect({x:t,y:e,w:n,h:r}),this.cropRect.setViewPortRect({x:0,y:0,w:o,h:i}))},bindStates:function(){var r=this;function n(t){r.cropRect=function(l,n,f,r,o){var s,a,t,i,e="mce-",u=e+"crid-"+Ht++;function d(t,e){return{x:e.x-t.x,y:e.y-t.y,w:e.w,h:e.h}}function c(t,e,n,r){var o,i,a,u,c;o=e.x,i=e.y,a=e.w,u=e.h,o+=n*t.deltaX,i+=r*t.deltaY,(a+=n*t.deltaW)<20&&(a=20),(u+=r*t.deltaH)<20&&(u=20),c=l=Dt.clamp({x:o,y:i,w:a,h:u},f,"move"===t.name),c=d(f,c),s.fire("updateRect",{rect:c}),m(c)}function h(e){function t(t,e){e.h<0&&(e.h=0),e.w<0&&(e.w=0),Bt("#"+u+"-"+t,r).css({left:e.x,top:e.y,width:e.w,height:e.h})}G.each(a,function(t){Bt("#"+u+"-"+t.name,r).css({left:e.w*t.xMul+e.x,top:e.h*t.yMul+e.y})}),t("top",{x:n.x,y:n.y,w:n.w,h:e.y-n.y}),t("right",{x:e.x+e.w,y:e.y,w:n.w-e.x-e.w+n.x,h:e.h}),t("bottom",{x:n.x,y:e.y+e.h,w:n.w,h:n.h-e.y-e.h+n.y}),t("left",{x:n.x,y:e.y,w:e.x-n.x,h:e.h}),t("move",e)}function p(t){h(l=t)}function m(t){var e,n;p((e=f,{x:(n=t).x+e.x,y:n.y+e.y,w:n.w,h:n.h}))}return a=[{name:"move",xMul:0,yMul:0,deltaX:1,deltaY:1,deltaW:0,deltaH:0,label:"Crop Mask"},{name:"nw",xMul:0,yMul:0,deltaX:1,deltaY:1,deltaW:-1,deltaH:-1,label:"Top Left Crop Handle"},{name:"ne",xMul:1,yMul:0,deltaX:0,deltaY:1,deltaW:1,deltaH:-1,label:"Top Right Crop Handle"},{name:"sw",xMul:0,yMul:1,deltaX:1,deltaY:0,deltaW:-1,deltaH:1,label:"Bottom Left Crop Handle"},{name:"se",xMul:1,yMul:1,deltaX:0,deltaY:0,deltaW:1,deltaH:1,label:"Bottom Right Crop Handle"}],i=["top","right","bottom","left"],Bt('<div id="'+u+'" class="'+e+'croprect-container" role="grid" aria-dropeffect="execute">').appendTo(r),G.each(i,function(t){Bt("#"+u,r).append('<div id="'+u+"-"+t+'"class="'+e+'croprect-block" style="display: none" data-mce-bogus="all">')}),G.each(a,function(t){Bt("#"+u,r).append('<div id="'+u+"-"+t.name+'" class="'+e+"croprect-handle "+e+"croprect-handle-"+t.name+'"style="display: none" data-mce-bogus="all" role="gridcell" tabindex="-1" aria-label="'+t.label+'" aria-grabbed="false">')}),t=G.map(a,function(e){var n;return new(zt.get("DragHelper"))(u,{document:r.ownerDocument,handle:u+"-"+e.name,start:function(){n=l},drag:function(t){c(e,n,t.deltaX,t.deltaY)}})}),h(l),Bt(r).on("focusin focusout",function(t){Bt(t.target).attr("aria-grabbed","focus"===t.type)}),Bt(r).on("keydown",function(e){var i;function t(t,e,n,r,o){t.stopPropagation(),t.preventDefault(),c(i,n,r,o)}switch(G.each(a,function(t){if(e.target.id===u+"-"+t.name)return i=t,!1}),e.keyCode){case Pt.LEFT:t(e,0,l,-10,0);break;case Pt.RIGHT:t(e,0,l,10,0);break;case Pt.UP:t(e,0,l,0,-10);break;case Pt.DOWN:t(e,0,l,0,10);break;case Pt.ENTER:case Pt.SPACEBAR:e.preventDefault(),o()}}),s=G.extend({toggleVisibility:function(t){var e;e=G.map(a,function(t){return"#"+u+"-"+t.name}).concat(G.map(i,function(t){return"#"+u+"-"+t})).join(","),t?Bt(e,r).show():Bt(e,r).hide()},setClampRect:function(t){f=t,h(l)},setRect:p,getInnerRect:function(){return d(f,l)},setInnerRect:m,setViewPortRect:function(t){n=t,h(l)},destroy:function(){G.each(t,function(t){t.destroy()}),t=[]}},St)}(t,r.state.get("viewRect"),r.state.get("viewRect"),r.getEl(),function(){r.fire("crop")}),r.cropRect.on("updateRect",function(t){var e=t.rect,n=r.zoom();e={x:Math.round(e.x/n),y:Math.round(e.y/n),w:Math.round(e.w/n),h:Math.round(e.h/n)},r.state.set("rect",e)}),r.on("remove",r.cropRect.destroy)}r.state.on("change:cropEnabled",function(t){r.cropRect.toggleVisibility(t.value),r.repaintImage()}),r.state.on("change:zoom",function(){r.repaintImage()}),r.state.on("change:rect",function(t){var e=t.value;r.cropRect||n(e),r.cropRect.setRect(e)})}}))(t)}};function Vt(t){return{blob:t,url:Ct.createObjectURL(t)}}function Wt(t){t&&Ct.revokeObjectURL(t.url)}function Nt(t){G.each(t,Wt)}function qt(i,a,t,e){var u,n,r,c,o,l,f,s,d,h,p,m,g,v,y,w,b,x,k,R,I,M,T,O,U,C,A,_=function(){var n=[],r=-1;function t(){return 0<r}function e(){return-1!==r&&r<n.length-1}return{data:n,add:function(t){var e;return e=n.splice(++r),n.push(t),{state:t,removed:e}},undo:function(){if(t())return n[--r]},redo:function(){if(e())return n[++r]},canUndo:t,canRedo:e}}(),E=function(t){return i.rtl?t.reverse():t};function j(t){var e,n,r,o;e=u.find("#w")[0],n=u.find("#h")[0],r=parseInt(e.value(),10),o=parseInt(n.value(),10),u.find("#constrain")[0].checked()&&O&&U&&r&&o&&("w"===t.control.settings.name?(o=Math.round(r*C),n.value(o)):(r=Math.round(o*A),e.value(r))),O=r,U=o}function z(t){return Math.round(100*t)+"%"}function D(){u.find("#undo").disabled(!_.canUndo()),u.find("#redo").disabled(!_.canRedo()),u.statusbar.find("#save").disabled(!_.canUndo())}function L(){u.find("#undo").disabled(!0),u.find("#redo").disabled(!0)}function B(t){t&&s.imageSrc(t.url)}function S(e){return function(){var t=G.grep(T,function(t){return t.settings.name!==e});G.each(t,function(t){t.hide()}),e.show(),e.focus()}}function P(t){B(c=Vt(t))}function H(t){B(a=Vt(t)),Nt(_.add(a).removed),D()}function F(){var e=s.selection();Ot(a.blob).then(function(t){It(t,e.x,e.y,e.w,e.h).then($).then(function(t){H(t),W()})})}var V=function(e){var n=[].slice.call(arguments,1);return function(){Ot((c||a).blob).then(function(t){e.apply(this,[t].concat(n)).then($).then(P)})}};function W(){B(a),Wt(c),S(n)(),D()}function N(){c?(H(c.blob),W()):function t(e,n){c?n():setTimeout(function(){0<e--?t(e,n):i.windowManager.alert("Error: failed to apply image operation.")},10)}(100,N)}function q(t){return zt.create("Form",{layout:"flex",direction:"row",labelGap:5,border:"0 0 1 0",align:"center",pack:"center",padding:"0 10 0 10",spacing:5,flex:0,minHeight:60,defaults:{classes:"imagetool",type:"button"},items:t})}var $=function(t){return t.toBlob()};function X(t,e){return q(E([{text:"Back",onclick:W},{type:"spacer",flex:1},{text:"Apply",subtype:"primary",onclick:N}])).hide().on("show",function(){L(),Ot(a.blob).then(function(t){return e(t)}).then($).then(function(t){var e=Vt(t);B(e),Wt(c),c=e})})}function Y(t,n,e,r,o){return q(E([{text:"Back",onclick:W},{type:"spacer",flex:1},{type:"slider",flex:1,ondragend:function(t){var e;e=t.value,Ot(a.blob).then(function(t){return n(t,e)}).then($).then(function(t){var e=Vt(t);B(e),Wt(c),c=e})},minValue:i.rtl?o:r,maxValue:i.rtl?r:o,value:e,previewFilter:z},{type:"spacer",flex:1},{text:"Apply",subtype:"primary",onclick:N}])).hide().on("show",function(){this.find("slider").value(e),L()})}o=q(E([{text:"Back",onclick:W},{type:"spacer",flex:1},{text:"Apply",subtype:"primary",onclick:F}])).hide().on("show hide",function(t){s.toggleCropRect("show"===t.type)}).on("show",L),l=q(E([{text:"Back",onclick:W},{type:"spacer",flex:1},{type:"textbox",name:"w",label:"Width",size:4,onkeyup:j},{type:"textbox",name:"h",label:"Height",size:4,onkeyup:j},{type:"checkbox",name:"constrain",text:"Constrain proportions",checked:!0,onchange:function(t){!0===t.control.value()&&(C=U/O,A=O/U)}},{type:"spacer",flex:1},{text:"Apply",subtype:"primary",onclick:"submit"}])).hide().on("submit",function(t){var e=parseInt(u.find("#w").value(),10),n=parseInt(u.find("#h").value(),10);t.preventDefault(),function(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];var r=[].slice.call(arguments,1);return function(){Ot(a.blob).then(function(t){e.apply(this,[t].concat(r)).then($).then(H)})}}(Mt,e,n)(),W()}).on("show",L),f=q(E([{text:"Back",onclick:W},{type:"spacer",flex:1},{icon:"fliph",tooltip:"Flip horizontally",onclick:V(Rt,"h")},{icon:"flipv",tooltip:"Flip vertically",onclick:V(Rt,"v")},{icon:"rotateleft",tooltip:"Rotate counterclockwise",onclick:V(Tt,-90)},{icon:"rotateright",tooltip:"Rotate clockwise",onclick:V(Tt,90)},{type:"spacer",flex:1},{text:"Apply",subtype:"primary",onclick:N}])).hide().on("show",L),p=X(0,st),k=X(0,dt),R=X(0,ht),m=Y(0,vt,0,-1,1),g=Y(0,yt,180,0,360),v=Y(0,wt,0,-1,1),y=Y(0,bt,0,-1,1),w=Y(0,xt,0,0,1),b=Y(0,kt,0,0,1),x=function(t,o){function e(){var e,n,r;e=u.find("#r")[0].value(),n=u.find("#g")[0].value(),r=u.find("#b")[0].value(),Ot(a.blob).then(function(t){return o(t,e,n,r)}).then($).then(function(t){var e=Vt(t);B(e),Wt(c),c=e})}var n=i.rtl?2:0,r=i.rtl?0:2;return q(E([{text:"Back",onclick:W},{type:"spacer",flex:1},{type:"slider",label:"R",name:"r",minValue:n,value:1,maxValue:r,ondragend:e,previewFilter:z},{type:"slider",label:"G",name:"g",minValue:n,value:1,maxValue:r,ondragend:e,previewFilter:z},{type:"slider",label:"B",name:"b",minValue:n,value:1,maxValue:r,ondragend:e,previewFilter:z},{type:"spacer",flex:1},{text:"Apply",subtype:"primary",onclick:N}])).hide().on("show",function(){u.find("#r,#g,#b").value(1),L()})}(0,gt),I=Y(0,pt,0,-1,1),M=Y(0,mt,1,0,2),r=q(E([{text:"Back",onclick:W},{type:"spacer",flex:1},{text:"hue",icon:"hue",onclick:S(g)},{text:"saturate",icon:"saturate",onclick:S(v)},{text:"sepia",icon:"sepia",onclick:S(b)},{text:"emboss",icon:"emboss",onclick:S(R)},{text:"exposure",icon:"exposure",onclick:S(M)},{type:"spacer",flex:1}])).hide(),n=q(E([{tooltip:"Crop",icon:"crop",onclick:S(o)},{tooltip:"Resize",icon:"resize2",onclick:S(l)},{tooltip:"Orientation",icon:"orientation",onclick:S(f)},{tooltip:"Brightness",icon:"sun",onclick:S(m)},{tooltip:"Sharpen",icon:"sharpen",onclick:S(k)},{tooltip:"Contrast",icon:"contrast",onclick:S(y)},{tooltip:"Color levels",icon:"drop",onclick:S(x)},{tooltip:"Gamma",icon:"gamma",onclick:S(I)},{tooltip:"Invert",icon:"invert",onclick:S(p)}])),s=Ft.create({flex:1,imageSrc:a.url}),d=zt.create("Container",{layout:"flex",direction:"column",pack:"start",border:"0 1 0 0",padding:5,spacing:5,items:[{type:"button",icon:"undo",tooltip:"Undo",name:"undo",onclick:function(){B(a=_.undo()),D()}},{type:"button",icon:"redo",tooltip:"Redo",name:"redo",onclick:function(){B(a=_.redo()),D()}},{type:"button",icon:"zoomin",tooltip:"Zoom in",onclick:function(){var t=s.zoom();t<2&&(t+=.1),s.zoom(t)}},{type:"button",icon:"zoomout",tooltip:"Zoom out",onclick:function(){var t=s.zoom();.1<t&&(t-=.1),s.zoom(t)}}]}),h=zt.create("Container",{type:"container",layout:"flex",direction:"row",align:"stretch",flex:1,items:E([d,s])}),T=[n,o,l,f,r,p,m,g,v,y,w,b,x,k,R,I,M],(u=i.windowManager.open({layout:"flex",direction:"column",align:"stretch",minWidth:Math.min(jt.DOM.getViewPort().w,800),minHeight:Math.min(jt.DOM.getViewPort().h,650),title:"Edit image",items:T.concat([h]),buttons:E([{text:"Save",name:"save",subtype:"primary",onclick:function(){t(a.blob),u.close()}},{text:"Cancel",onclick:"close"}])})).on("close",function(){e(),Nt(_.data),c=_=null}),_.add(a),D(),s.on("load",function(){O=s.imageSize().w,U=s.imageSize().h,C=U/O,A=O/U,u.find("#w").value(O),u.find("#h").value(U)}),s.on("crop",F)}var $t,Xt={edit:function(r,t){return new _t(function(e,n){return t.toBlob().then(function(t){qt(r,Vt(t),e,n)})})}},Yt={getImageSize:function(t){var e,n;function r(t){return/^[0-9\.]+px$/.test(t)}return e=t.style.width,n=t.style.height,e||n?r(e)&&r(n)?{w:parseInt(e,10),h:parseInt(n,10)}:null:(e=t.width,n=t.height,e&&n?{w:parseInt(e,10),h:parseInt(n,10)}:null)},setImageSize:function(t,e){var n,r;e&&(n=t.style.width,r=t.style.height,(n||r)&&(t.style.width=e.w+"px",t.style.height=e.h+"px",t.removeAttribute("data-mce-style")),n=t.width,r=t.height,(n||r)&&(t.setAttribute("width",e.w),t.setAttribute("height",e.h)))},getNaturalImageSize:function(t){return{w:t.naturalWidth,h:t.naturalHeight}}},Gt=($t="function",function(t){return function(t){if(null===t)return"null";var e=typeof t;return"object"===e&&(Array.prototype.isPrototypeOf(t)||t.constructor&&"Array"===t.constructor.name)?"array":"object"===e&&(String.prototype.isPrototypeOf(t)||t.constructor&&"String"===t.constructor.name)?"string":e}(t)===$t}),Kt=(Array.prototype.slice,function(t,e){for(var n=0,r=t.length;n<r;n++){var o=t[n];if(e(o,n,t))return y.some(o)}return y.none()});Gt(Array.from)&&Array.from;var Jt=function(t){return null!==t&&t!==undefined},Zt=function(t,e){var n;return n=e.reduce(function(t,e){return Jt(t)?t[e]:undefined},t),Jt(n)?n:null},Qt=function(e){return new _t(function(n){var t=b();t.onload=function(t){var e=t.target;n(e.result)},t.readAsText(e)})},te=function(e,r,o){return new _t(function(t){var n;(n=new(w.getOrDie("XMLHttpRequest"))).onreadystatechange=function(){4===n.readyState&&t({status:n.status,blob:this.response})},n.open("GET",e,!0),n.withCredentials=o,G.each(r,function(t,e){n.setRequestHeader(e,t)}),n.responseType="blob",n.send()})},ee=function(t){var e;try{e=JSON.parse(t)}catch(n){}return e},ne=[{code:404,message:"Could not find Image Proxy"},{code:403,message:"Rejected request"},{code:0,message:"Incorrect Image Proxy URL"}],re=[{type:"key_missing",message:"The request did not include an api key."},{type:"key_not_found",message:"The provided api key could not be found."},{type:"domain_not_trusted",message:"The api key is not valid for the request origins."}],oe=function(e){return"ImageProxy HTTP error: "+Kt(ne,function(t){return e===t.code}).fold(i("Unknown ImageProxy error"),function(t){return t.message})},ie=function(t){var e=oe(t);return _t.reject(e)},ae=function(e){return Kt(re,function(t){return t.type===e}).fold(i("Unknown service error"),function(t){return t.message})},ue=function(t,e){return Qt(e).then(function(t){var e,n,r=(e=ee(t),"ImageProxy Service error: "+((n=Zt(e,["error","type"]))?ae(n):"Invalid JSON in service error message"));return _t.reject(r)})},ce=function(t,e){return 400===(n=t)||403===n||500===n?ue(0,e):ie(t);var n},le=ie,fe=function(t,e){var n,r,o,i={"Content-Type":"application/json;charset=UTF-8","tiny-api-key":e};return te((n=t,r=e,o=-1===n.indexOf("?")?"?":"&",/[?&]apiKey=/.test(n)||!r?n:n+o+"apiKey="+encodeURIComponent(r)),i,!1).then(function(t){return t.status<200||300<=t.status?ce(t.status,t.blob):_t.resolve(t.blob)})},se=function(t,e,n){return e?fe(t,e):te(t,{},n).then(function(t){return t.status<200||300<=t.status?le(t.status):_t.resolve(t.blob)})},de=0,he=function(t,e){t.notificationManager.open({text:e,type:"error"})},pe=function(t){return t.selection.getNode()},me=function(t,e){var n=e.src;return 0===n.indexOf("data:")||0===n.indexOf("blob:")||new Et(n).host===t.documentBaseURI.host},ge=function(t,e){return-1!==G.inArray(t.getParam("imagetools_cors_hosts",[],"string[]"),new Et(e.src).host)},ve=function(t,e){var n,r,o,i,a=e.src;return ge(t,e)?se(e.src,null,(r=t,o=e,-1!==G.inArray(r.getParam("imagetools_credentials_hosts",[],"string[]"),new Et(o.src).host))):me(t,e)?C(e):(a=t.getParam("imagetools_proxy"),a+=(-1===a.indexOf("?")?"?":"&")+"url="+encodeURIComponent(e.src),n=(i=t).getParam("api_key",i.getParam("imagetools_api_key","","string"),"string"),se(a,n,!1))},ye=function(t){var e;return(e=t.editorUpload.blobCache.getByUri(pe(t).src))?_t.resolve(e.blob()):ve(t,pe(t))},we=function(t){clearTimeout(t.get())},be=function(c,l,f,s,d){return l.toBlob().then(function(t){var e,n,r,o,i,a,u;return r=c.editorUpload.blobCache,e=(i=pe(c)).src,c.getParam("images_reuse_filename",!1,"boolean")&&((o=r.getByUri(e))?(e=o.uri(),n=o.name()):(a=c,n=(u=e.match(/\/([^\/\?]+)?\.(?:jpeg|jpg|png|gif)(?:\?|$)/i))?a.dom.encode(u[1]):null)),o=r.create({id:"imagetools"+de++,blob:t,base64:l.toBase64(),uri:e,name:n}),r.add(o),c.undoManager.transact(function(){c.$(i).on("load",function t(){var e,n,r;c.$(i).off("load",t),c.nodeChanged(),f?c.editorUpload.uploadImagesAuto():(we(s),e=c,n=s,r=At.setEditorTimeout(e,function(){e.editorUpload.uploadImagesAuto()},e.getParam("images_upload_timeout",3e4,"number")),n.set(r))}),d&&c.$(i).attr({width:d.w,height:d.h}),c.$(i).attr({src:o.blobUri()}).removeAttr("data-mce-src")}),o})},xe=function(e,n,t,r){return function(){return e._scanForImages().then(a(ye,e)).then(Ot).then(t).then(function(t){return be(e,t,!1,n,r)},function(t){he(e,t)})}},ke=function(n,r,o){return function(){var t=Yt.getImageSize(pe(n)),e=t?{w:t.h,h:t.w}:null;return xe(n,r,function(t){return Tt(t,o)},e)()}},Re=function(t,e,n){return function(){return xe(t,e,function(t){return Rt(t,n)})()}},Ie=function(e,r){return function(){var o=pe(e),i=Yt.getNaturalImageSize(o),n=function(r){return new _t(function(n){var t;(t=r,A(t)).then(function(t){var e=Yt.getNaturalImageSize(t);i.w===e.w&&i.h===e.h||Yt.getImageSize(o)&&Yt.setImageSize(o,e),Ct.revokeObjectURL(t.src),n(r)})})};ye(e).then(Ot).then(a(function(e,t){return Xt.edit(e,t).then(n).then(Ot).then(function(t){return be(e,t,!0,r)},function(){})},e),function(t){he(e,t)})}},Me=function(t,e){return t.dom.is(e,"img:not([data-mce-object],[data-mce-placeholder])")&&(me(t,e)||ge(t,e)||t.settings.imagetools_proxy)},Te=we,Oe=function(n,t){G.each({mceImageRotateLeft:ke(n,t,-90),mceImageRotateRight:ke(n,t,90),mceImageFlipVertical:Re(n,t,"v"),mceImageFlipHorizontal:Re(n,t,"h"),mceEditImage:Ie(n,t)},function(t,e){n.addCommand(e,t)})},Ue=function(n,r,o){n.on("NodeChange",function(t){var e=o.get();e&&e.src!==t.element.src&&(Te(r),n.editorUpload.uploadImagesAuto(),o.set(null)),Me(n,t.element)&&o.set(t.element)})},Ce=function(t){t.addButton("rotateleft",{title:"Rotate counterclockwise",cmd:"mceImageRotateLeft"}),t.addButton("rotateright",{title:"Rotate clockwise",cmd:"mceImageRotateRight"}),t.addButton("flipv",{title:"Flip vertically",cmd:"mceImageFlipVertical"}),t.addButton("fliph",{title:"Flip horizontally",cmd:"mceImageFlipHorizontal"}),t.addButton("editimage",{title:"Edit image",cmd:"mceEditImage"}),t.addButton("imageoptions",{title:"Image options",icon:"options",cmd:"mceImage"})},Ae=function(t){t.addContextToolbar(a(Me,t),t.getParam("imagetools_toolbar","rotateleft rotateright | flipv fliph | crop editimage imageoptions"))};t.add("imagetools",function(t){var e=r(0),n=r(null);Oe(t,e),Ce(t),Ae(t),Ue(t,e,n)})}(window);
\ No newline at end of file
+!function(m){"use strict";var r=function(t){var e=t,n=function(){return e};return{get:n,set:function(t){e=t},clone:function(){return r(n())}}},t=tinymce.util.Tools.resolve("tinymce.PluginManager"),G=tinymce.util.Tools.resolve("tinymce.util.Tools"),e=function(){},i=function(t){return function(){return t}};function a(r){for(var o=[],t=1;t<arguments.length;t++)o[t-1]=arguments[t];return function(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e];var n=o.concat(t);return r.apply(null,n)}}var n,o,c,u,l=i(!1),f=i(!0),s=function(){return d},d=(n=function(t){return t.isNone()},u={fold:function(t,e){return t()},is:l,isSome:l,isNone:f,getOr:c=function(t){return t},getOrThunk:o=function(t){return t()},getOrDie:function(t){throw new Error(t||"error: getOrDie called on none.")},getOrNull:i(null),getOrUndefined:i(undefined),or:c,orThunk:o,map:s,each:e,bind:s,exists:l,forall:f,filter:s,equals:n,equals_:n,toArray:function(){return[]},toString:i("none()")},Object.freeze&&Object.freeze(u),u),h=function(n){var t=i(n),e=function(){return o},r=function(t){return t(n)},o={fold:function(t,e){return e(n)},is:function(t){return n===t},isSome:f,isNone:l,getOr:t,getOrThunk:t,getOrDie:t,getOrNull:t,getOrUndefined:t,or:e,orThunk:e,map:function(t){return h(t(n))},each:function(t){t(n)},bind:r,exists:r,forall:r,filter:function(t){return t(n)?o:d},toArray:function(){return[n]},toString:function(){return"some("+n+")"},equals:function(t){return t.is(n)},equals_:function(t,e){return t.fold(l,function(t){return e(n,t)})}};return o},g={some:h,none:s,from:function(t){return null===t||t===undefined?d:h(t)}};function p(t,e){return w(m.document.createElement("canvas"),t,e)}function v(t){var e=p(t.width,t.height);return y(e).drawImage(t,0,0),e}function y(t){return t.getContext("2d")}function w(t,e,n){return t.width=e,t.height=n,t}function b(t){return t.naturalWidth||t.width}function x(t){return t.naturalHeight||t.height}var k=window.Promise?window.Promise:function(){var i=function(t){if("object"!=typeof this)throw new TypeError("Promises must be constructed via new");if("function"!=typeof t)throw new TypeError("not a function");this._state=null,this._value=null,this._deferreds=[],f(t,r(o,this),r(c,this))},t=i.immediateFn||"function"==typeof window.setImmediate&&window.setImmediate||function(t){m.setTimeout(t,1)};function r(t,e){return function(){return t.apply(e,arguments)}}var n=Array.isArray||function(t){return"[object Array]"===Object.prototype.toString.call(t)};function a(r){var o=this;null!==this._state?t(function(){var t=o._state?r.onFulfilled:r.onRejected;if(null!==t){var e;try{e=t(o._value)}catch(n){return void r.reject(n)}r.resolve(e)}else(o._state?r.resolve:r.reject)(o._value)}):this._deferreds.push(r)}function o(t){try{if(t===this)throw new TypeError("A promise cannot be resolved with itself.");if(t&&("object"==typeof t||"function"==typeof t)){var e=t.then;if("function"==typeof e)return void f(r(e,t),r(o,this),r(c,this))}this._state=!0,this._value=t,u.call(this)}catch(n){c.call(this,n)}}function c(t){this._state=!1,this._value=t,u.call(this)}function u(){for(var t=0,e=this._deferreds;t<e.length;t++){var n=e[t];a.call(this,n)}this._deferreds=[]}function l(t,e,n,r){this.onFulfilled="function"==typeof t?t:null,this.onRejected="function"==typeof e?e:null,this.resolve=n,this.reject=r}function f(t,e,n){var r=!1;try{t(function(t){r||(r=!0,e(t))},function(t){r||(r=!0,n(t))})}catch(o){if(r)return;r=!0,n(o)}}return i.prototype["catch"]=function(t){return this.then(null,t)},i.prototype.then=function(n,r){var o=this;return new i(function(t,e){a.call(o,new l(n,r,t,e))})},i.all=function(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e];var u=Array.prototype.slice.call(1===t.length&&n(t[0])?t[0]:t);return new i(function(o,i){if(0===u.length)return o([]);var a=u.length;function c(e,t){try{if(t&&("object"==typeof t||"function"==typeof t)){var n=t.then;if("function"==typeof n)return void n.call(t,function(t){c(e,t)},i)}u[e]=t,0==--a&&o(u)}catch(r){i(r)}}for(var t=0;t<u.length;t++)c(t,u[t])})},i.resolve=function(e){return e&&"object"==typeof e&&e.constructor===i?e:new i(function(t){t(e)})},i.reject=function(n){return new i(function(t,e){e(n)})},i.race=function(o){return new i(function(t,e){for(var n=0,r=o;n<r.length;n++)r[n].then(t,e)})},i}();function R(t){var r,e=t.src;return 0===e.indexOf("data:")?M(e):(r=e,new k(function(t,n){var e=new m.XMLHttpRequest;e.open("GET",r,!0),e.responseType="blob",e.onload=function(){200===this.status&&t(this.response)},e.onerror=function(){var t,e=this;n(0===this.status?((t=new Error("No access to download image")).code=18,t.name="SecurityError",t):new Error("Error "+e.status+" downloading image"))},e.send()}))}function I(c){return new k(function(t,e){var n=m.URL.createObjectURL(c),r=new m.Image,o=function(){r.removeEventListener("load",i),r.removeEventListener("error",a)};function i(){o(),t(r)}function a(){o(),e("Unable to load data of type "+c.type+": "+n)}r.addEventListener("load",i),r.addEventListener("error",a),r.src=n,r.complete&&i()})}function M(n){return new k(function(t,e){(function(t){var e=t.split(","),n=/data:([^;]+)/.exec(e[0]);if(!n)return g.none();for(var r=n[1],o=e[1],i=m.atob(o),a=i.length,c=Math.ceil(a/1024),u=new Array(c),l=0;l<c;++l){for(var f=1024*l,s=Math.min(f+1024,a),d=new Array(s-f),h=f,p=0;h<s;++p,++h)d[p]=i[h].charCodeAt(0);u[l]=new Uint8Array(d)}return g.some(new m.Blob(u,{type:r}))})(n).fold(function(){e("uri is not base64: "+n)},t)})}function T(t,r,o){return r=r||"image/png",m.HTMLCanvasElement.prototype.toBlob?new k(function(e,n){t.toBlob(function(t){t?e(t):n()},r,o)}):M(t.toDataURL(r,o))}function U(t){return I(t).then(function(t){var e;e=t,m.URL.revokeObjectURL(e.src);var n=p(b(t),x(t));return y(n).drawImage(t,0,0),n})}function C(t,e,n){var r=e.type;function o(r,o){return t.then(function(t){return n=o,e=(e=r)||"image/png",t.toDataURL(e,n);var e,n})}return{getType:i(r),toBlob:function(){return k.resolve(e)},toDataURL:function(){return n},toBase64:function(){return n.split(",")[1]},toAdjustedBlob:function(e,n){return t.then(function(t){return T(t,e,n)})},toAdjustedDataURL:o,toAdjustedBase64:function(t,e){return o(t,e).then(function(t){return t.split(",")[1]})},toCanvas:function(){return t.then(v)}}}function A(e){return(n=e,new k(function(t){var e=new m.FileReader;e.onloadend=function(){t(e.result)},e.readAsDataURL(n)})).then(function(t){return C(U(e),e,t)});var n}function E(e,t){return T(e,t).then(function(t){return C(k.resolve(e),t,e.toDataURL())})}function O(t,e,n){var r="string"==typeof t?parseFloat(t):t;return n<r?r=n:r<e&&(r=e),r}var _=[0,.01,.02,.04,.05,.06,.07,.08,.1,.11,.12,.14,.15,.16,.17,.18,.2,.21,.22,.24,.25,.27,.28,.3,.32,.34,.36,.38,.4,.42,.44,.46,.48,.5,.53,.56,.59,.62,.65,.68,.71,.74,.77,.8,.83,.86,.89,.92,.95,.98,1,1.06,1.12,1.18,1.24,1.3,1.36,1.42,1.48,1.54,1.6,1.66,1.72,1.78,1.84,1.9,1.96,2,2.12,2.25,2.37,2.5,2.62,2.75,2.87,3,3.2,3.4,3.6,3.8,4,4.3,4.7,4.9,5,5.5,6,6.5,6.8,7,7.3,7.5,7.8,8,8.4,8.7,9,9.4,9.6,9.8,10];function j(t,e){for(var n,r=[],o=new Array(25),i=0;i<5;i++){for(var a=0;a<5;a++)r[a]=e[a+5*i];for(a=0;a<5;a++){for(var c=n=0;c<5;c++)n+=t[a+5*c]*r[c];o[a+5*i]=n}}return o}function z(t,n){return n=O(n,0,1),t.map(function(t,e){return e%6==0?t=1-(1-t)*n:t*=n,O(t,0,1)})}function L(a,c){return a.toCanvas().then(function(t){return e=t,n=a.getType(),r=c,o=y(e),i=function(t,e){for(var n,r,o,i,a=t.data,c=e[0],u=e[1],l=e[2],f=e[3],s=e[4],d=e[5],h=e[6],p=e[7],m=e[8],g=e[9],v=e[10],y=e[11],w=e[12],b=e[13],x=e[14],k=e[15],R=e[16],I=e[17],M=e[18],T=e[19],U=0;U<a.length;U+=4)n=a[U],r=a[U+1],o=a[U+2],i=a[U+3],a[U]=n*c+r*u+o*l+i*f+s,a[U+1]=n*d+r*h+o*p+i*m+g,a[U+2]=n*v+r*y+o*w+i*b+x,a[U+3]=n*k+r*R+o*I+i*M+T;return t}(o.getImageData(0,0,e.width,e.height),r),o.putImageData(i,0,0),E(e,n);var e,n,r,o,i})}function B(c,u){return c.toCanvas().then(function(t){return e=t,n=c.getType(),r=u,o=y(e),i=o.getImageData(0,0,e.width,e.height),a=o.getImageData(0,0,e.width,e.height),a=function(t,e,n){function r(t,e,n){return n<t?t=n:t<e&&(t=e),t}for(var o=Math.round(Math.sqrt(n.length)),i=Math.floor(o/2),a=t.data,c=e.data,u=t.width,l=t.height,f=0;f<l;f++)for(var s=0;s<u;s++){for(var d=0,h=0,p=0,m=0;m<o;m++)for(var g=0;g<o;g++){var v=r(s+g-i,0,u-1),y=r(f+m-i,0,l-1),w=4*(y*u+v),b=n[m*o+g];d+=a[w]*b,h+=a[w+1]*b,p+=a[w+2]*b}var x=4*(f*u+s);c[x]=r(d,0,255),c[x+1]=r(h,0,255),c[x+2]=r(p,0,255)}return e}(i,a,r),o.putImageData(a,0,0),E(e,n);var e,n,r,o,i,a})}function S(c){return function(e,n){return e.toCanvas().then(function(t){return function(t,e,n){for(var r=y(t),o=new Array(256),i=0;i<o.length;i++)o[i]=c(i,n);var a=function(t,e){for(var n=t.data,r=0;r<n.length;r+=4)n[r]=e[n[r]],n[r+1]=e[n[r+1]],n[r+2]=e[n[r+2]];return t}(r.getImageData(0,0,t.width,t.height),o);return r.putImageData(a,0,0),E(t,e)}(t,e.getType(),n)})}}function P(n){return function(t,e){return L(t,n([1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1],e))}}function H(e){return function(t){return B(t,e)}}var D,F=(D=[-1,0,0,0,255,0,-1,0,0,255,0,0,-1,0,255,0,0,0,1,0,0,0,0,0,1],function(t){return L(t,D)}),V=P(function(t,e){return j(t,[1,0,0,0,e=O(255*e,-255,255),0,1,0,0,e,0,0,1,0,e,0,0,0,1,0,0,0,0,0,1])}),W=P(function(t,e){e=O(e,-180,180)/180*Math.PI;var n=Math.cos(e),r=Math.sin(e),o=.213,i=.715,a=.072;return j(t,[o+.787*n+r*-o,i+n*-i+r*-i,a+n*-a+.928*r,0,0,o+n*-o+.143*r,i+n*(1-i)+.14*r,a+n*-a+-.283*r,0,0,o+n*-o+-.787*r,i+n*-i+r*i,a+.928*n+r*a,0,0,0,0,0,1,0,0,0,0,0,1])}),N=P(function(t,e){var n=1+(0<(e=O(e,-1,1))?3*e:e);return j(t,[.3086*(1-n)+n,.6094*(1-n),.082*(1-n),0,0,.3086*(1-n),.6094*(1-n)+n,.082*(1-n),0,0,.3086*(1-n),.6094*(1-n),.082*(1-n)+n,0,0,0,0,0,1,0,0,0,0,0,1])}),q=P(function(t,e){var n;return e=O(e,-1,1),j(t,[(n=(e*=100)<0?127+e/100*127:127*(n=0==(n=e%1)?_[e]:_[Math.floor(e)]*(1-n)+_[Math.floor(e)+1]*n)+127)/127,0,0,0,.5*(127-n),0,n/127,0,0,.5*(127-n),0,0,n/127,0,.5*(127-n),0,0,0,1,0,0,0,0,0,1])}),$=P(function(t,e){return j(t,z([.33,.34,.33,0,0,.33,.34,.33,0,0,.33,.34,.33,0,0,0,0,0,1,0,0,0,0,0,1],e=O(e,0,1)))}),X=P(function(t,e){return j(t,z([.393,.769,.189,0,0,.349,.686,.168,0,0,.272,.534,.131,0,0,0,0,0,1,0,0,0,0,0,1],e=O(e,0,1)))}),Y=function(t,e,n,r){return L(t,(o=n,i=r,j([1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1],[O(e,0,2),0,0,0,0,0,o=O(o,0,2),0,0,0,0,0,i=O(i,0,2),0,0,0,0,0,1,0,0,0,0,0,1])));var o,i},K=H([0,-1,0,-1,5,-1,0,-1,0]),J=H([-2,-1,0,-1,1,1,0,1,2]),Z=S(function(t,e){return 255*Math.pow(t/255,1-e)}),Q=S(function(t,e){return 255*(1-Math.exp(-t/255*e))});function tt(t,e,n){var r=b(t),o=x(t),i=e/r,a=n/o,c=!1;(i<.5||2<i)&&(i=i<.5?.5:2,c=!0),(a<.5||2<a)&&(a=a<.5?.5:2,c=!0);var u,l,f,s=(u=t,l=i,f=a,new k(function(t){var e=b(u),n=x(u),r=Math.floor(e*l),o=Math.floor(n*f),i=p(r,o),a=y(i);a.drawImage(u,0,0,e,n,0,0,r,o),t(i)}));return c?s.then(function(t){return tt(t,e,n)}):s}function et(u,l){return u.toCanvas().then(function(t){return e=t,n=u.getType(),r=l,o=p(e.width,e.height),i=y(o),90!==(r=r<(c=a=0)?360+r:r)&&270!==r||w(o,o.height,o.width),90!==r&&180!==r||(a=o.width),270!==r&&180!==r||(c=o.height),i.translate(a,c),i.rotate(r*Math.PI/180),i.drawImage(e,0,0),E(o,n);var e,n,r,o,i,a,c})}function nt(a,c){return a.toCanvas().then(function(t){return e=t,n=a.getType(),r=c,o=p(e.width,e.height),i=y(o),"v"===r?(i.scale(1,-1),i.drawImage(e,0,-o.height)):(i.scale(-1,1),i.drawImage(e,-o.width,0)),E(o,n);var e,n,r,o,i})}function rt(a,c,u,l,f){return a.toCanvas().then(function(t){return e=t,n=a.getType(),r=c,o=u,y(i=p(l,f)).drawImage(e,-r,-o),E(i,n);var e,n,r,o,i})}var ot=function(t){return F(t)},it=function(t){return K(t)},at=function(t){return J(t)},ct=function(t,e){return Z(t,e)},ut=function(t,e){return Q(t,e)},lt=function(t,e,n,r){return Y(t,e,n,r)},ft=function(t,e){return V(t,e)},st=function(t,e){return W(t,e)},dt=function(t,e){return N(t,e)},ht=function(t,e){return q(t,e)},pt=function(t,e){return $(t,e)},mt=function(t,e){return X(t,e)},gt=function(t,e){return nt(t,e)},vt=function(t,e,n,r,o){return rt(t,e,n,r,o)},yt=function(t,e,n){return o=e,i=n,(r=t).toCanvas().then(function(t){return tt(t,o,i).then(function(t){return E(t,r.getType())})});var r,o,i},wt=function(t,e){return et(t,e)},bt=function(t){return A(t)},xt="undefined"!=typeof m.window?m.window:Function("return this;")(),kt=function(t,e){return function(t,e){for(var n=e!==undefined&&null!==e?e:xt,r=0;r<t.length&&n!==undefined&&null!==n;++r)n=n[t[r]];return n}(t.split("."),e)},Rt=function(t,e){var n=kt(t,e);if(n===undefined||null===n)throw new Error(t+" not available on this browser");return n},It=function(){return Rt("URL")},Mt={createObjectURL:function(t){return It().createObjectURL(t)},revokeObjectURL:function(t){It().revokeObjectURL(t)}},Tt=tinymce.util.Tools.resolve("tinymce.util.Delay"),Ut=tinymce.util.Tools.resolve("tinymce.util.Promise"),Ct=tinymce.util.Tools.resolve("tinymce.util.URI"),At=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),Et=tinymce.util.Tools.resolve("tinymce.ui.Factory"),Ot=tinymce.util.Tools.resolve("tinymce.geom.Rect"),_t=function(n){return new Ut(function(t){var e=function(){n.removeEventListener("load",e),t(n)};n.complete?t(n):n.addEventListener("load",e)})},jt=tinymce.util.Tools.resolve("tinymce.dom.DomQuery"),zt=tinymce.util.Tools.resolve("tinymce.util.Observable"),Lt=tinymce.util.Tools.resolve("tinymce.util.VK"),Bt=0,St={create:function(t){return new(Et.get("Control").extend({Defaults:{classes:"imagepanel"},selection:function(t){return arguments.length?(this.state.set("rect",t),this):this.state.get("rect")},imageSize:function(){var t=this.state.get("viewRect");return{w:t.w,h:t.h}},toggleCropRect:function(t){this.state.set("cropEnabled",t)},imageSrc:function(t){var o=this,i=new m.Image;i.src=t,_t(i).then(function(){var t,e,n=o.state.get("viewRect");if((e=o.$el.find("img"))[0])e.replaceWith(i);else{var r=m.document.createElement("div");r.className="mce-imagepanel-bg",o.getEl().appendChild(r),o.getEl().appendChild(i)}t={x:0,y:0,w:i.naturalWidth,h:i.naturalHeight},o.state.set("viewRect",t),o.state.set("rect",Ot.inflate(t,-20,-20)),n&&n.w===t.w&&n.h===t.h||o.zoomFit(),o.repaintImage(),o.fire("load")})},zoom:function(t){return arguments.length?(this.state.set("zoom",t),this):this.state.get("zoom")},postRender:function(){return this.imageSrc(this.settings.imageSrc),this._super()},zoomFit:function(){var t,e,n,r,o,i;t=this.$el.find("img"),e=this.getEl().clientWidth,n=this.getEl().clientHeight,r=t[0].naturalWidth,o=t[0].naturalHeight,1<=(i=Math.min((e-10)/r,(n-10)/o))&&(i=1),this.zoom(i)},repaintImage:function(){var t,e,n,r,o,i,a,c,u,l,f;f=this.getEl(),u=this.zoom(),l=this.state.get("rect"),a=this.$el.find("img"),c=this.$el.find(".mce-imagepanel-bg"),o=f.offsetWidth,i=f.offsetHeight,n=a[0].naturalWidth*u,r=a[0].naturalHeight*u,t=Math.max(0,o/2-n/2),e=Math.max(0,i/2-r/2),a.css({left:t,top:e,width:n,height:r}),c.css({left:t,top:e,width:n,height:r}),this.cropRect&&(this.cropRect.setRect({x:l.x*u+t,y:l.y*u+e,w:l.w*u,h:l.h*u}),this.cropRect.setClampRect({x:t,y:e,w:n,h:r}),this.cropRect.setViewPortRect({x:0,y:0,w:o,h:i}))},bindStates:function(){var r=this;function n(t){r.cropRect=function(l,n,f,r,o){var s,a,t,i,e="mce-",c=e+"crid-"+Bt++;function d(t,e){return{x:e.x-t.x,y:e.y-t.y,w:e.w,h:e.h}}function u(t,e,n,r){var o,i,a,c,u;o=e.x,i=e.y,a=e.w,c=e.h,o+=n*t.deltaX,i+=r*t.deltaY,(a+=n*t.deltaW)<20&&(a=20),(c+=r*t.deltaH)<20&&(c=20),u=l=Ot.clamp({x:o,y:i,w:a,h:c},f,"move"===t.name),u=d(f,u),s.fire("updateRect",{rect:u}),m(u)}function h(e){function t(t,e){e.h<0&&(e.h=0),e.w<0&&(e.w=0),jt("#"+c+"-"+t,r).css({left:e.x,top:e.y,width:e.w,height:e.h})}G.each(a,function(t){jt("#"+c+"-"+t.name,r).css({left:e.w*t.xMul+e.x,top:e.h*t.yMul+e.y})}),t("top",{x:n.x,y:n.y,w:n.w,h:e.y-n.y}),t("right",{x:e.x+e.w,y:e.y,w:n.w-e.x-e.w+n.x,h:e.h}),t("bottom",{x:n.x,y:e.y+e.h,w:n.w,h:n.h-e.y-e.h+n.y}),t("left",{x:n.x,y:e.y,w:e.x-n.x,h:e.h}),t("move",e)}function p(t){h(l=t)}function m(t){var e,n;p((e=f,{x:(n=t).x+e.x,y:n.y+e.y,w:n.w,h:n.h}))}return a=[{name:"move",xMul:0,yMul:0,deltaX:1,deltaY:1,deltaW:0,deltaH:0,label:"Crop Mask"},{name:"nw",xMul:0,yMul:0,deltaX:1,deltaY:1,deltaW:-1,deltaH:-1,label:"Top Left Crop Handle"},{name:"ne",xMul:1,yMul:0,deltaX:0,deltaY:1,deltaW:1,deltaH:-1,label:"Top Right Crop Handle"},{name:"sw",xMul:0,yMul:1,deltaX:1,deltaY:0,deltaW:-1,deltaH:1,label:"Bottom Left Crop Handle"},{name:"se",xMul:1,yMul:1,deltaX:0,deltaY:0,deltaW:1,deltaH:1,label:"Bottom Right Crop Handle"}],i=["top","right","bottom","left"],jt('<div id="'+c+'" class="'+e+'croprect-container" role="grid" aria-dropeffect="execute">').appendTo(r),G.each(i,function(t){jt("#"+c,r).append('<div id="'+c+"-"+t+'"class="'+e+'croprect-block" style="display: none" data-mce-bogus="all">')}),G.each(a,function(t){jt("#"+c,r).append('<div id="'+c+"-"+t.name+'" class="'+e+"croprect-handle "+e+"croprect-handle-"+t.name+'"style="display: none" data-mce-bogus="all" role="gridcell" tabindex="-1" aria-label="'+t.label+'" aria-grabbed="false">')}),t=G.map(a,function(e){var n;return new(Et.get("DragHelper"))(c,{document:r.ownerDocument,handle:c+"-"+e.name,start:function(){n=l},drag:function(t){u(e,n,t.deltaX,t.deltaY)}})}),h(l),jt(r).on("focusin focusout",function(t){jt(t.target).attr("aria-grabbed","focus"===t.type)}),jt(r).on("keydown",function(e){var i;function t(t,e,n,r,o){t.stopPropagation(),t.preventDefault(),u(i,n,r,o)}switch(G.each(a,function(t){if(e.target.id===c+"-"+t.name)return i=t,!1}),e.keyCode){case Lt.LEFT:t(e,0,l,-10,0);break;case Lt.RIGHT:t(e,0,l,10,0);break;case Lt.UP:t(e,0,l,0,-10);break;case Lt.DOWN:t(e,0,l,0,10);break;case Lt.ENTER:case Lt.SPACEBAR:e.preventDefault(),o()}}),s=G.extend({toggleVisibility:function(t){var e;e=G.map(a,function(t){return"#"+c+"-"+t.name}).concat(G.map(i,function(t){return"#"+c+"-"+t})).join(","),t?jt(e,r).show():jt(e,r).hide()},setClampRect:function(t){f=t,h(l)},setRect:p,getInnerRect:function(){return d(f,l)},setInnerRect:m,setViewPortRect:function(t){n=t,h(l)},destroy:function(){G.each(t,function(t){t.destroy()}),t=[]}},zt)}(t,r.state.get("viewRect"),r.state.get("viewRect"),r.getEl(),function(){r.fire("crop")}),r.cropRect.on("updateRect",function(t){var e=t.rect,n=r.zoom();e={x:Math.round(e.x/n),y:Math.round(e.y/n),w:Math.round(e.w/n),h:Math.round(e.h/n)},r.state.set("rect",e)}),r.on("remove",r.cropRect.destroy)}r.state.on("change:cropEnabled",function(t){r.cropRect.toggleVisibility(t.value),r.repaintImage()}),r.state.on("change:zoom",function(){r.repaintImage()}),r.state.on("change:rect",function(t){var e=t.value;r.cropRect||n(e),r.cropRect.setRect(e)})}}))(t)}};function Pt(t){return{blob:t,url:Mt.createObjectURL(t)}}function Ht(t){t&&Mt.revokeObjectURL(t.url)}function Dt(t){G.each(t,Ht)}function Ft(i,a,t,e){var c,n,r,u,o,l,f,s,d,h,p,m,g,v,y,w,b,x,k,R,I,M,T,U,C,A,E,O=function(){var n=[],r=-1;function t(){return 0<r}function e(){return-1!==r&&r<n.length-1}return{data:n,add:function(t){var e;return e=n.splice(++r),n.push(t),{state:t,removed:e}},undo:function(){if(t())return n[--r]},redo:function(){if(e())return n[++r]},canUndo:t,canRedo:e}}(),_=function(t){return i.rtl?t.reverse():t};function j(t){var e,n,r,o;e=c.find("#w")[0],n=c.find("#h")[0],r=parseInt(e.value(),10),o=parseInt(n.value(),10),c.find("#constrain")[0].checked()&&U&&C&&r&&o&&("w"===t.control.settings.name?(o=Math.round(r*A),n.value(o)):(r=Math.round(o*E),e.value(r))),U=r,C=o}function z(t){return Math.round(100*t)+"%"}function L(){c.find("#undo").disabled(!O.canUndo()),c.find("#redo").disabled(!O.canRedo()),c.statusbar.find("#save").disabled(!O.canUndo())}function B(){c.find("#undo").disabled(!0),c.find("#redo").disabled(!0)}function S(t){t&&s.imageSrc(t.url)}function P(e){return function(){var t=G.grep(T,function(t){return t.settings.name!==e});G.each(t,function(t){t.hide()}),e.show(),e.focus()}}function H(t){S(u=Pt(t))}function D(t){S(a=Pt(t)),Dt(O.add(a).removed),L()}function F(){var e=s.selection();bt(a.blob).then(function(t){vt(t,e.x,e.y,e.w,e.h).then($).then(function(t){D(t),W()})})}var V=function(e){var n=[].slice.call(arguments,1);return function(){bt((u||a).blob).then(function(t){e.apply(this,[t].concat(n)).then($).then(H)})}};function W(){S(a),Ht(u),P(n)(),L()}function N(){u?(D(u.blob),W()):function t(e,n){u?n():setTimeout(function(){0<e--?t(e,n):i.windowManager.alert("Error: failed to apply image operation.")},10)}(100,N)}function q(t){return Et.create("Form",{layout:"flex",direction:"row",labelGap:5,border:"0 0 1 0",align:"center",pack:"center",padding:"0 10 0 10",spacing:5,flex:0,minHeight:60,defaults:{classes:"imagetool",type:"button"},items:t})}var $=function(t){return t.toBlob()};function X(t,e){return q(_([{text:"Back",onclick:W},{type:"spacer",flex:1},{text:"Apply",subtype:"primary",onclick:N}])).hide().on("show",function(){B(),bt(a.blob).then(function(t){return e(t)}).then($).then(function(t){var e=Pt(t);S(e),Ht(u),u=e})})}function Y(t,n,e,r,o){return q(_([{text:"Back",onclick:W},{type:"spacer",flex:1},{type:"slider",flex:1,ondragend:function(t){var e;e=t.value,bt(a.blob).then(function(t){return n(t,e)}).then($).then(function(t){var e=Pt(t);S(e),Ht(u),u=e})},minValue:i.rtl?o:r,maxValue:i.rtl?r:o,value:e,previewFilter:z},{type:"spacer",flex:1},{text:"Apply",subtype:"primary",onclick:N}])).hide().on("show",function(){this.find("slider").value(e),B()})}o=q(_([{text:"Back",onclick:W},{type:"spacer",flex:1},{text:"Apply",subtype:"primary",onclick:F}])).hide().on("show hide",function(t){s.toggleCropRect("show"===t.type)}).on("show",B),l=q(_([{text:"Back",onclick:W},{type:"spacer",flex:1},{type:"textbox",name:"w",label:"Width",size:4,onkeyup:j},{type:"textbox",name:"h",label:"Height",size:4,onkeyup:j},{type:"checkbox",name:"constrain",text:"Constrain proportions",checked:!0,onchange:function(t){!0===t.control.value()&&(A=C/U,E=U/C)}},{type:"spacer",flex:1},{text:"Apply",subtype:"primary",onclick:"submit"}])).hide().on("submit",function(t){var e=parseInt(c.find("#w").value(),10),n=parseInt(c.find("#h").value(),10);t.preventDefault(),function(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];var r=[].slice.call(arguments,1);return function(){bt(a.blob).then(function(t){e.apply(this,[t].concat(r)).then($).then(D)})}}(yt,e,n)(),W()}).on("show",B),f=q(_([{text:"Back",onclick:W},{type:"spacer",flex:1},{icon:"fliph",tooltip:"Flip horizontally",onclick:V(gt,"h")},{icon:"flipv",tooltip:"Flip vertically",onclick:V(gt,"v")},{icon:"rotateleft",tooltip:"Rotate counterclockwise",onclick:V(wt,-90)},{icon:"rotateright",tooltip:"Rotate clockwise",onclick:V(wt,90)},{type:"spacer",flex:1},{text:"Apply",subtype:"primary",onclick:N}])).hide().on("show",B),p=X(0,ot),k=X(0,it),R=X(0,at),m=Y(0,ft,0,-1,1),g=Y(0,st,180,0,360),v=Y(0,dt,0,-1,1),y=Y(0,ht,0,-1,1),w=Y(0,pt,0,0,1),b=Y(0,mt,0,0,1),x=function(t,o){function e(){var e,n,r;e=c.find("#r")[0].value(),n=c.find("#g")[0].value(),r=c.find("#b")[0].value(),bt(a.blob).then(function(t){return o(t,e,n,r)}).then($).then(function(t){var e=Pt(t);S(e),Ht(u),u=e})}var n=i.rtl?2:0,r=i.rtl?0:2;return q(_([{text:"Back",onclick:W},{type:"spacer",flex:1},{type:"slider",label:"R",name:"r",minValue:n,value:1,maxValue:r,ondragend:e,previewFilter:z},{type:"slider",label:"G",name:"g",minValue:n,value:1,maxValue:r,ondragend:e,previewFilter:z},{type:"slider",label:"B",name:"b",minValue:n,value:1,maxValue:r,ondragend:e,previewFilter:z},{type:"spacer",flex:1},{text:"Apply",subtype:"primary",onclick:N}])).hide().on("show",function(){c.find("#r,#g,#b").value(1),B()})}(0,lt),I=Y(0,ct,0,-1,1),M=Y(0,ut,1,0,2),r=q(_([{text:"Back",onclick:W},{type:"spacer",flex:1},{text:"hue",icon:"hue",onclick:P(g)},{text:"saturate",icon:"saturate",onclick:P(v)},{text:"sepia",icon:"sepia",onclick:P(b)},{text:"emboss",icon:"emboss",onclick:P(R)},{text:"exposure",icon:"exposure",onclick:P(M)},{type:"spacer",flex:1}])).hide(),n=q(_([{tooltip:"Crop",icon:"crop",onclick:P(o)},{tooltip:"Resize",icon:"resize2",onclick:P(l)},{tooltip:"Orientation",icon:"orientation",onclick:P(f)},{tooltip:"Brightness",icon:"sun",onclick:P(m)},{tooltip:"Sharpen",icon:"sharpen",onclick:P(k)},{tooltip:"Contrast",icon:"contrast",onclick:P(y)},{tooltip:"Color levels",icon:"drop",onclick:P(x)},{tooltip:"Gamma",icon:"gamma",onclick:P(I)},{tooltip:"Invert",icon:"invert",onclick:P(p)}])),s=St.create({flex:1,imageSrc:a.url}),d=Et.create("Container",{layout:"flex",direction:"column",pack:"start",border:"0 1 0 0",padding:5,spacing:5,items:[{type:"button",icon:"undo",tooltip:"Undo",name:"undo",onclick:function(){S(a=O.undo()),L()}},{type:"button",icon:"redo",tooltip:"Redo",name:"redo",onclick:function(){S(a=O.redo()),L()}},{type:"button",icon:"zoomin",tooltip:"Zoom in",onclick:function(){var t=s.zoom();t<2&&(t+=.1),s.zoom(t)}},{type:"button",icon:"zoomout",tooltip:"Zoom out",onclick:function(){var t=s.zoom();.1<t&&(t-=.1),s.zoom(t)}}]}),h=Et.create("Container",{type:"container",layout:"flex",direction:"row",align:"stretch",flex:1,items:_([d,s])}),T=[n,o,l,f,r,p,m,g,v,y,w,b,x,k,R,I,M],(c=i.windowManager.open({layout:"flex",direction:"column",align:"stretch",minWidth:Math.min(At.DOM.getViewPort().w,800),minHeight:Math.min(At.DOM.getViewPort().h,650),title:"Edit image",items:T.concat([h]),buttons:_([{text:"Save",name:"save",subtype:"primary",onclick:function(){t(a.blob),c.close()}},{text:"Cancel",onclick:"close"}])})).on("close",function(){e(),Dt(O.data),u=O=null}),O.add(a),L(),s.on("load",function(){U=s.imageSize().w,C=s.imageSize().h,A=C/U,E=U/C,c.find("#w").value(U),c.find("#h").value(C)}),s.on("crop",F)}var Vt,Wt={edit:function(r,t){return new Ut(function(e,n){return t.toBlob().then(function(t){Ft(r,Pt(t),e,n)})})}},Nt={getImageSize:function(t){var e,n;function r(t){return/^[0-9\.]+px$/.test(t)}return e=t.style.width,n=t.style.height,e||n?r(e)&&r(n)?{w:parseInt(e,10),h:parseInt(n,10)}:null:(e=t.width,n=t.height,e&&n?{w:parseInt(e,10),h:parseInt(n,10)}:null)},setImageSize:function(t,e){var n,r;e&&(n=t.style.width,r=t.style.height,(n||r)&&(t.style.width=e.w+"px",t.style.height=e.h+"px",t.removeAttribute("data-mce-style")),n=t.width,r=t.height,(n||r)&&(t.setAttribute("width",e.w),t.setAttribute("height",e.h)))},getNaturalImageSize:function(t){return{w:t.naturalWidth,h:t.naturalHeight}}},qt=(Vt="function",function(t){return function(t){if(null===t)return"null";var e=typeof t;return"object"===e&&(Array.prototype.isPrototypeOf(t)||t.constructor&&"Array"===t.constructor.name)?"array":"object"===e&&(String.prototype.isPrototypeOf(t)||t.constructor&&"String"===t.constructor.name)?"string":e}(t)===Vt}),$t=(Array.prototype.slice,function(t,e){for(var n=0,r=t.length;n<r;n++){var o=t[n];if(e(o,n))return g.some(o)}return g.none()});qt(Array.from)&&Array.from;var Xt=function(t){return null!==t&&t!==undefined},Yt=function(t,e){var n;return n=e.reduce(function(t,e){return Xt(t)?t[e]:undefined},t),Xt(n)?n:null},Gt=function(e){return new Ut(function(n){var t=new(Rt("FileReader"));t.onload=function(t){var e=t.target;n(e.result)},t.readAsText(e)})},Kt=function(e,r,o){return new Ut(function(t){var n;(n=new(Rt("XMLHttpRequest"))).onreadystatechange=function(){4===n.readyState&&t({status:n.status,blob:this.response})},n.open("GET",e,!0),n.withCredentials=o,G.each(r,function(t,e){n.setRequestHeader(e,t)}),n.responseType="blob",n.send()})},Jt=function(t){var e;try{e=JSON.parse(t)}catch(n){}return e},Zt=[{code:404,message:"Could not find Image Proxy"},{code:403,message:"Rejected request"},{code:0,message:"Incorrect Image Proxy URL"}],Qt=[{type:"key_missing",message:"The request did not include an api key."},{type:"key_not_found",message:"The provided api key could not be found."},{type:"domain_not_trusted",message:"The api key is not valid for the request origins."}],te=function(e){return"ImageProxy HTTP error: "+$t(Zt,function(t){return e===t.code}).fold(i("Unknown ImageProxy error"),function(t){return t.message})},ee=function(t){var e=te(t);return Ut.reject(e)},ne=function(e){return $t(Qt,function(t){return t.type===e}).fold(i("Unknown service error"),function(t){return t.message})},re=function(t,e){return Gt(e).then(function(t){var e,n,r=(e=Jt(t),"ImageProxy Service error: "+((n=Yt(e,["error","type"]))?ne(n):"Invalid JSON in service error message"));return Ut.reject(r)})},oe=function(t,e){return 400===(n=t)||403===n||500===n?re(0,e):ee(t);var n},ie=ee,ae=function(t,e){var n,r,o,i={"Content-Type":"application/json;charset=UTF-8","tiny-api-key":e};return Kt((n=t,r=e,o=-1===n.indexOf("?")?"?":"&",/[?&]apiKey=/.test(n)||!r?n:n+o+"apiKey="+encodeURIComponent(r)),i,!1).then(function(t){return t.status<200||300<=t.status?oe(t.status,t.blob):Ut.resolve(t.blob)})},ce=function(t,e,n){return e?ae(t,e):Kt(t,{},n).then(function(t){return t.status<200||300<=t.status?ie(t.status):Ut.resolve(t.blob)})},ue=0,le=function(t,e){t.notificationManager.open({text:e,type:"error"})},fe=function(t){return t.selection.getNode()},se=function(t,e){var n=e.src;return 0===n.indexOf("data:")||0===n.indexOf("blob:")||new Ct(n).host===t.documentBaseURI.host},de=function(t,e){return-1!==G.inArray(t.getParam("imagetools_cors_hosts",[],"string[]"),new Ct(e.src).host)},he=function(t,e){var n,r,o,i,a=e.src;return de(t,e)?ce(e.src,null,(r=t,o=e,-1!==G.inArray(r.getParam("imagetools_credentials_hosts",[],"string[]"),new Ct(o.src).host))):se(t,e)?R(e):(a=t.getParam("imagetools_proxy"),a+=(-1===a.indexOf("?")?"?":"&")+"url="+encodeURIComponent(e.src),n=(i=t).getParam("api_key",i.getParam("imagetools_api_key","","string"),"string"),ce(a,n,!1))},pe=function(t){var e;return(e=t.editorUpload.blobCache.getByUri(fe(t).src))?Ut.resolve(e.blob()):he(t,fe(t))},me=function(t){clearTimeout(t.get())},ge=function(u,l,f,s,d){return l.toBlob().then(function(t){var e,n,r,o,i,a,c;return r=u.editorUpload.blobCache,e=(i=fe(u)).src,u.getParam("images_reuse_filename",!1,"boolean")&&((o=r.getByUri(e))?(e=o.uri(),n=o.name()):(a=u,n=(c=e.match(/\/([^\/\?]+)?\.(?:jpeg|jpg|png|gif)(?:\?|$)/i))?a.dom.encode(c[1]):null)),o=r.create({id:"imagetools"+ue++,blob:t,base64:l.toBase64(),uri:e,name:n}),r.add(o),u.undoManager.transact(function(){u.$(i).on("load",function t(){var e,n,r;u.$(i).off("load",t),u.nodeChanged(),f?u.editorUpload.uploadImagesAuto():(me(s),e=u,n=s,r=Tt.setEditorTimeout(e,function(){e.editorUpload.uploadImagesAuto()},e.getParam("images_upload_timeout",3e4,"number")),n.set(r))}),d&&u.$(i).attr({width:d.w,height:d.h}),u.$(i).attr({src:o.blobUri()}).removeAttr("data-mce-src")}),o})},ve=function(e,n,t,r){return function(){return e._scanForImages().then(a(pe,e)).then(bt).then(t).then(function(t){return ge(e,t,!1,n,r)},function(t){le(e,t)})}},ye=function(n,r,o){return function(){var t=Nt.getImageSize(fe(n)),e=t?{w:t.h,h:t.w}:null;return ve(n,r,function(t){return wt(t,o)},e)()}},we=function(t,e,n){return function(){return ve(t,e,function(t){return gt(t,n)})()}},be=function(e,r){return function(){var o=fe(e),i=Nt.getNaturalImageSize(o),n=function(r){return new Ut(function(n){var t;(t=r,I(t)).then(function(t){var e=Nt.getNaturalImageSize(t);i.w===e.w&&i.h===e.h||Nt.getImageSize(o)&&Nt.setImageSize(o,e),Mt.revokeObjectURL(t.src),n(r)})})};pe(e).then(bt).then(a(function(e,t){return Wt.edit(e,t).then(n).then(bt).then(function(t){return ge(e,t,!0,r)},function(){})},e),function(t){le(e,t)})}},xe=function(t,e){return t.dom.is(e,"img:not([data-mce-object],[data-mce-placeholder])")&&(se(t,e)||de(t,e)||t.settings.imagetools_proxy)},ke=me,Re=function(n,t){G.each({mceImageRotateLeft:ye(n,t,-90),mceImageRotateRight:ye(n,t,90),mceImageFlipVertical:we(n,t,"v"),mceImageFlipHorizontal:we(n,t,"h"),mceEditImage:be(n,t)},function(t,e){n.addCommand(e,t)})},Ie=function(n,r,o){n.on("NodeChange",function(t){var e=o.get();e&&e.src!==t.element.src&&(ke(r),n.editorUpload.uploadImagesAuto(),o.set(null)),xe(n,t.element)&&o.set(t.element)})},Me=function(t){t.addButton("rotateleft",{title:"Rotate counterclockwise",cmd:"mceImageRotateLeft"}),t.addButton("rotateright",{title:"Rotate clockwise",cmd:"mceImageRotateRight"}),t.addButton("flipv",{title:"Flip vertically",cmd:"mceImageFlipVertical"}),t.addButton("fliph",{title:"Flip horizontally",cmd:"mceImageFlipHorizontal"}),t.addButton("editimage",{title:"Edit image",cmd:"mceEditImage"}),t.addButton("imageoptions",{title:"Image options",icon:"options",cmd:"mceImage"})},Te=function(t){t.addContextToolbar(a(xe,t),t.getParam("imagetools_toolbar","rotateleft rotateright | flipv fliph | crop editimage imageoptions"))};t.add("imagetools",function(t){var e=r(0),n=r(null);Re(t,e),Me(t),Te(t),Ie(t,e,n)})}(window);
\ No newline at end of file
diff --git a/lib/web/tiny_mce_4/plugins/lists/plugin.min.js b/lib/web/tiny_mce_4/plugins/lists/plugin.min.js
index aee814e9e6bff..d92fc6df35bdf 100644
--- a/lib/web/tiny_mce_4/plugins/lists/plugin.min.js
+++ b/lib/web/tiny_mce_4/plugins/lists/plugin.min.js
@@ -1 +1 @@
-!function(u){"use strict";var e,n,t,r,o,i,a,s,c=tinymce.util.Tools.resolve("tinymce.PluginManager"),f=tinymce.util.Tools.resolve("tinymce.dom.RangeUtils"),d=tinymce.util.Tools.resolve("tinymce.dom.TreeWalker"),l=tinymce.util.Tools.resolve("tinymce.util.VK"),p=tinymce.util.Tools.resolve("tinymce.dom.BookmarkManager"),v=tinymce.util.Tools.resolve("tinymce.util.Tools"),m=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),g=function(e){return e&&"BR"===e.nodeName},h=function(e){return e&&3===e.nodeType},y=function(e){return e&&/^(OL|UL|DL)$/.test(e.nodeName)},N=function(e){return e&&/^(OL|UL)$/.test(e.nodeName)},S=function(e){return e&&/^(DT|DD)$/.test(e.nodeName)},C=function(e){return e&&/^(LI|DT|DD)$/.test(e.nodeName)},O=function(e){return e&&/^(TH|TD)$/.test(e.nodeName)},b=g,T=function(e,n){return n&&!!e.schema.getTextBlockElements()[n.nodeName]},D=function(e,n){return e&&e.nodeName in n},L=function(e,n){return!!g(n)&&!(!e.isBlock(n.nextSibling)||g(n.previousSibling))},E=function(e,n,t){var r=e.isEmpty(n);return!(t&&0<e.select("span[data-mce-type=bookmark]",n).length)&&r},w=function(e,n){return e.isChildOf(n,e.getRoot())},k=function(e,n){if(h(e))return{container:e,offset:n};var t=f.getNode(e,n);return h(t)?{container:t,offset:n>=e.childNodes.length?t.data.length:0}:t.previousSibling&&h(t.previousSibling)?{container:t.previousSibling,offset:t.previousSibling.data.length}:t.nextSibling&&h(t.nextSibling)?{container:t.nextSibling,offset:0}:{container:e,offset:n}},A=function(e){var n=e.cloneRange(),t=k(e.startContainer,e.startOffset);n.setStart(t.container,t.offset);var r=k(e.endContainer,e.endOffset);return n.setEnd(r.container,r.offset),n},x=m.DOM,R=function(o){var i={},e=function(e){var n,t,r;t=o[e?"startContainer":"endContainer"],r=o[e?"startOffset":"endOffset"],1===t.nodeType&&(n=x.create("span",{"data-mce-type":"bookmark"}),t.hasChildNodes()?(r=Math.min(r,t.childNodes.length-1),e?t.insertBefore(n,t.childNodes[r]):x.insertAfter(n,t.childNodes[r])):t.appendChild(n),t=n,r=0),i[e?"startContainer":"endContainer"]=t,i[e?"startOffset":"endOffset"]=r};return e(!0),o.collapsed||e(),i},I=function(o){function e(e){var n,t,r;n=r=o[e?"startContainer":"endContainer"],t=o[e?"startOffset":"endOffset"],n&&(1===n.nodeType&&(t=function(e){for(var n=e.parentNode.firstChild,t=0;n;){if(n===e)return t;1===n.nodeType&&"bookmark"===n.getAttribute("data-mce-type")||t++,n=n.nextSibling}return-1}(n),n=n.parentNode,x.remove(r),!n.hasChildNodes()&&x.isBlock(n)&&n.appendChild(x.create("br"))),o[e?"startContainer":"endContainer"]=n,o[e?"startOffset":"endOffset"]=t)}e(!0),e();var n=x.createRng();return n.setStart(o.startContainer,o.startOffset),o.endContainer&&n.setEnd(o.endContainer,o.endOffset),A(n)},_=function(e){return function(){return e}},B=function(t){return function(){for(var e=[],n=0;n<arguments.length;n++)e[n]=arguments[n];return!t.apply(null,e)}},P=_(!1),M=_(!0),U=P,F=M,j=function(){return H},H=(r={fold:function(e,n){return e()},is:U,isSome:U,isNone:F,getOr:t=function(e){return e},getOrThunk:n=function(e){return e()},getOrDie:function(e){throw new Error(e||"error: getOrDie called on none.")},getOrNull:function(){return null},getOrUndefined:function(){return undefined},or:t,orThunk:n,map:j,ap:j,each:function(){},bind:j,flatten:j,exists:U,forall:F,filter:j,equals:e=function(e){return e.isNone()},equals_:e,toArray:function(){return[]},toString:_("none()")},Object.freeze&&Object.freeze(r),r),$=function(t){var e=function(){return t},n=function(){return o},r=function(e){return e(t)},o={fold:function(e,n){return n(t)},is:function(e){return t===e},isSome:F,isNone:U,getOr:e,getOrThunk:e,getOrDie:e,getOrNull:e,getOrUndefined:e,or:n,orThunk:n,map:function(e){return $(e(t))},ap:function(e){return e.fold(j,function(e){return $(e(t))})},each:function(e){e(t)},bind:r,flatten:e,exists:r,forall:r,filter:function(e){return e(t)?o:H},equals:function(e){return e.is(t)},equals_:function(e,n){return e.fold(U,function(e){return n(t,e)})},toArray:function(){return[t]},toString:function(){return"some("+t+")"}};return o},q={some:$,none:j,from:function(e){return null===e||e===undefined?H:$(e)}},W=function(n){return function(e){return function(e){if(null===e)return"null";var n=typeof e;return"object"===n&&(Array.prototype.isPrototypeOf(e)||e.constructor&&"Array"===e.constructor.name)?"array":"object"===n&&(String.prototype.isPrototypeOf(e)||e.constructor&&"String"===e.constructor.name)?"string":n}(e)===n}},V=W("string"),z=W("boolean"),K=W("function"),X=W("number"),Q=Array.prototype.slice,Y=function(e,n){for(var t=e.length,r=new Array(t),o=0;o<t;o++){var i=e[o];r[o]=n(i,o,e)}return r},G=function(e,n){for(var t=0,r=e.length;t<r;t++)n(e[t],t,e)},J=function(e,n){for(var t=[],r=0,o=e.length;r<o;r++){var i=e[r];n(i,r,e)&&t.push(i)}return t},Z=function(e,n,t){return G(e,function(e){t=n(t,e)}),t},ee=function(e,n){for(var t=0,r=e.length;t<r;t++){var o=e[t];if(n(o,t,e))return q.some(o)}return q.none()},ne=Array.prototype.push,te=function(e,n){return function(e){for(var n=[],t=0,r=e.length;t<r;++t){if(!Array.prototype.isPrototypeOf(e[t]))throw new Error("Arr.flatten item "+t+" was not an array, input: "+e);ne.apply(n,e[t])}return n}(Y(e,n))},re=function(e){return 0===e.length?q.none():q.some(e[0])},oe=function(e){return 0===e.length?q.none():q.some(e[e.length-1])},ie=(K(Array.from)&&Array.from,"undefined"!=typeof u.window?u.window:Function("return this;")()),ue=function(e,n){return function(e,n){for(var t=n!==undefined&&null!==n?n:ie,r=0;r<e.length&&t!==undefined&&null!==t;++r)t=t[e[r]];return t}(e.split("."),n)},ae=function(e,n){var t=ue(e,n);if(t===undefined||null===t)throw e+" not available on this browser";return t},se=function(e){var n,t=ue("ownerDocument.defaultView",e);return(n=t,ae("HTMLElement",n)).prototype.isPrototypeOf(e)},ce=tinymce.util.Tools.resolve("tinymce.dom.DomQuery"),fe=function(e){var n=e.selection.getStart(!0);return e.dom.getParent(n,"OL,UL,DL",le(e,n))},de=function(e){var t,n,r,o=e.selection.getSelectedBlocks();return v.grep((t=e,n=o,r=v.map(n,function(e){var n=t.dom.getParent(e,"li,dd,dt",le(t,e));return n||e}),ce.unique(r)),function(e){return C(e)})},le=function(e,n){var t=e.dom.getParents(n,"TD,TH");return 0<t.length?t[0]:e.getBody()},me=function(e,n){var t=e.dom.getParents(n,"ol,ul",le(e,n));return oe(t)},ge=function(n,e){var t=Y(e,function(e){return me(n,e).getOr(e)});return ce.unique(t)},pe={isList:function(e){var n=fe(e);return se(n)},getParentList:fe,getSelectedSubLists:function(e){var n,t,r,o=fe(e),i=e.selection.getSelectedBlocks();return r=i,(t=o)&&1===r.length&&r[0]===t?(n=o,v.grep(n.querySelectorAll("ol,ul,dl"),function(e){return y(e)})):v.grep(i,function(e){return y(e)&&o!==e})},getSelectedListItems:de,getClosestListRootElm:le,getSelectedDlItems:function(e){return J(de(e),S)},getSelectedListRoots:function(e){var n,t,r,o=(t=me(n=e,n.selection.getStart()),r=J(n.selection.getSelectedBlocks(),N),t.toArray().concat(r));return ge(e,o)}},ve=function(e){if(null===e||e===undefined)throw new Error("Node cannot be null or undefined");return{dom:_(e)}},he={fromHtml:function(e,n){var t=(n||u.document).createElement("div");if(t.innerHTML=e,!t.hasChildNodes()||1<t.childNodes.length)throw u.console.error("HTML does not have a single root node",e),new Error("HTML must have a single root node");return ve(t.childNodes[0])},fromTag:function(e,n){var t=(n||u.document).createElement(e);return ve(t)},fromText:function(e,n){var t=(n||u.document).createTextNode(e);return ve(t)},fromDom:ve,fromPoint:function(e,n,t){var r=e.dom();return q.from(r.elementFromPoint(n,t)).map(ve)}},ye=function(e,n){for(var t=[],r=0;r<e.length;r++){var o=e[r];if(!o.isSome())return q.none();t.push(o.getOrDie())}return q.some(n.apply(null,t))},Ne=Object.keys,Se=function(){return ae("Node")},Ce=function(e,n,t){return 0!=(e.compareDocumentPosition(n)&t)},Oe=function(e,n){return Ce(e,n,Se().DOCUMENT_POSITION_CONTAINED_BY)},be=function(e,n){var t=function(e,n){for(var t=0;t<e.length;t++){var r=e[t];if(r.test(n))return r}return undefined}(e,n);if(!t)return{major:0,minor:0};var r=function(e){return Number(n.replace(t,"$"+e))};return De(r(1),r(2))},Te=function(){return De(0,0)},De=function(e,n){return{major:e,minor:n}},Le={nu:De,detect:function(e,n){var t=String(n).toLowerCase();return 0===e.length?Te():be(e,t)},unknown:Te},Ee="Firefox",we=function(e,n){return function(){return n===e}},ke=function(e){var n=e.current;return{current:n,version:e.version,isEdge:we("Edge",n),isChrome:we("Chrome",n),isIE:we("IE",n),isOpera:we("Opera",n),isFirefox:we(Ee,n),isSafari:we("Safari",n)}},Ae={unknown:function(){return ke({current:undefined,version:Le.unknown()})},nu:ke,edge:_("Edge"),chrome:_("Chrome"),ie:_("IE"),opera:_("Opera"),firefox:_(Ee),safari:_("Safari")},xe="Windows",Re="Android",Ie="Solaris",_e="FreeBSD",Be=function(e,n){return function(){return n===e}},Pe=function(e){var n=e.current;return{current:n,version:e.version,isWindows:Be(xe,n),isiOS:Be("iOS",n),isAndroid:Be(Re,n),isOSX:Be("OSX",n),isLinux:Be("Linux",n),isSolaris:Be(Ie,n),isFreeBSD:Be(_e,n)}},Me={unknown:function(){return Pe({current:undefined,version:Le.unknown()})},nu:Pe,windows:_(xe),ios:_("iOS"),android:_(Re),linux:_("Linux"),osx:_("OSX"),solaris:_(Ie),freebsd:_(_e)},Ue=function(e,n){var t=String(n).toLowerCase();return ee(e,function(e){return e.search(t)})},Fe=function(e,t){return Ue(e,t).map(function(e){var n=Le.detect(e.versionRegexes,t);return{current:e.name,version:n}})},je=function(e,t){return Ue(e,t).map(function(e){var n=Le.detect(e.versionRegexes,t);return{current:e.name,version:n}})},He=function(e,n){return-1!==e.indexOf(n)},$e=/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,qe=function(n){return function(e){return He(e,n)}},We=[{name:"Edge",versionRegexes:[/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],search:function(e){return He(e,"edge/")&&He(e,"chrome")&&He(e,"safari")&&He(e,"applewebkit")}},{name:"Chrome",versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/,$e],search:function(e){return He(e,"chrome")&&!He(e,"chromeframe")}},{name:"IE",versionRegexes:[/.*?msie\ ?([0-9]+)\.([0-9]+).*/,/.*?rv:([0-9]+)\.([0-9]+).*/],search:function(e){return He(e,"msie")||He(e,"trident")}},{name:"Opera",versionRegexes:[$e,/.*?opera\/([0-9]+)\.([0-9]+).*/],search:qe("opera")},{name:"Firefox",versionRegexes:[/.*?firefox\/\ ?([0-9]+)\.([0-9]+).*/],search:qe("firefox")},{name:"Safari",versionRegexes:[$e,/.*?cpu os ([0-9]+)_([0-9]+).*/],search:function(e){return(He(e,"safari")||He(e,"mobile/"))&&He(e,"applewebkit")}}],Ve=[{name:"Windows",search:qe("win"),versionRegexes:[/.*?windows\ nt\ ?([0-9]+)\.([0-9]+).*/]},{name:"iOS",search:function(e){return He(e,"iphone")||He(e,"ipad")},versionRegexes:[/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,/.*cpu os ([0-9]+)_([0-9]+).*/,/.*cpu iphone os ([0-9]+)_([0-9]+).*/]},{name:"Android",search:qe("android"),versionRegexes:[/.*?android\ ?([0-9]+)\.([0-9]+).*/]},{name:"OSX",search:qe("os x"),versionRegexes:[/.*?os\ x\ ?([0-9]+)_([0-9]+).*/]},{name:"Linux",search:qe("linux"),versionRegexes:[]},{name:"Solaris",search:qe("sunos"),versionRegexes:[]},{name:"FreeBSD",search:qe("freebsd"),versionRegexes:[]}],ze={browsers:_(We),oses:_(Ve)},Ke=function(e){var n,t,r,o,i,u,a,s,c,f,d,l=ze.browsers(),m=ze.oses(),g=Fe(l,e).fold(Ae.unknown,Ae.nu),p=je(m,e).fold(Me.unknown,Me.nu);return{browser:g,os:p,deviceType:(t=g,r=e,o=(n=p).isiOS()&&!0===/ipad/i.test(r),i=n.isiOS()&&!o,u=n.isAndroid()&&3===n.version.major,a=n.isAndroid()&&4===n.version.major,s=o||u||a&&!0===/mobile/i.test(r),c=n.isiOS()||n.isAndroid(),f=c&&!s,d=t.isSafari()&&n.isiOS()&&!1===/safari/i.test(r),{isiPad:_(o),isiPhone:_(i),isTablet:_(s),isPhone:_(f),isTouch:_(c),isAndroid:n.isAndroid,isiOS:n.isiOS,isWebView:_(d)})}},Xe={detect:(o=function(){var e=u.navigator.userAgent;return Ke(e)},a=!1,function(){for(var e=[],n=0;n<arguments.length;n++)e[n]=arguments[n];return a||(a=!0,i=o.apply(null,e)),i})},Qe=(u.Node.ATTRIBUTE_NODE,u.Node.CDATA_SECTION_NODE,u.Node.COMMENT_NODE,u.Node.DOCUMENT_NODE,u.Node.DOCUMENT_TYPE_NODE,u.Node.DOCUMENT_FRAGMENT_NODE,u.Node.ELEMENT_NODE),Ye=(u.Node.TEXT_NODE,u.Node.PROCESSING_INSTRUCTION_NODE,u.Node.ENTITY_REFERENCE_NODE,u.Node.ENTITY_NODE,u.Node.NOTATION_NODE,Qe),Ge=function(e,n){return e.dom()===n.dom()},Je=Xe.detect().browser.isIE()?function(e,n){return Oe(e.dom(),n.dom())}:function(e,n){var t=e.dom(),r=n.dom();return t!==r&&t.contains(r)},Ze=function(e,n){var t=e.dom();if(t.nodeType!==Ye)return!1;if(t.matches!==undefined)return t.matches(n);if(t.msMatchesSelector!==undefined)return t.msMatchesSelector(n);if(t.webkitMatchesSelector!==undefined)return t.webkitMatchesSelector(n);if(t.mozMatchesSelector!==undefined)return t.mozMatchesSelector(n);throw new Error("Browser lacks native selectors")},en=function(e){var n=e.dom();return q.from(n.parentNode).map(he.fromDom)},nn=function(e){var n=e.dom();return Y(n.childNodes,he.fromDom)},tn=function(e,n){var t=e.dom().childNodes;return q.from(t[n]).map(he.fromDom)},rn=function(e){return tn(e,0)},on=function(e){return tn(e,e.dom().childNodes.length-1)},un=(function(){for(var e=[],n=0;n<arguments.length;n++)e[n]=arguments[n]}("element","offset"),function(n,t){en(n).each(function(e){e.dom().insertBefore(t.dom(),n.dom())})}),an=function(e,n){e.dom().appendChild(n.dom())},sn=function(n,e){G(e,function(e){an(n,e)})},cn=function(e){var n=e.dom();null!==n.parentNode&&n.parentNode.removeChild(n)},fn=function(e){return e.dom().nodeName.toLowerCase()},dn=function(e,n){var t=e.dom();!function(e,n){for(var t=Ne(e),r=0,o=t.length;r<o;r++){var i=t[r];n(e[i],i,e)}}(n,function(e,n){!function(e,n,t){if(!(V(t)||z(t)||X(t)))throw u.console.error("Invalid call to Attr.set. Key ",n,":: Value ",t,":: Element ",e),new Error("Attribute value was not simple");e.setAttribute(n,t+"")}(t,n,e)})},ln=function(e){return Z(e.dom().attributes,function(e,n){return e[n.name]=n.value,e},{})},mn=function(e,n,t){if(!V(t))throw u.console.error("Invalid call to CSS.set. Property ",n,":: Value ",t,":: Element ",e),new Error("CSS value must be a string: "+t);var r;(r=e).style!==undefined&&K(r.style.getPropertyValue)&&e.style.setProperty(n,t)},gn=function(e){return n=e,t=!0,he.fromDom(n.dom().cloneNode(t));var n,t},pn=function(e,n){var t,r,o,i,u=(t=e,r=n,o=he.fromTag(r),i=ln(t),dn(o,i),o);un(e,u);var a=nn(e);return sn(u,a),cn(e),u},vn=function(e,n){an(e.item,n.list)},hn=function(f,e,d){var n=e.slice(0,d.depth);return oe(n).each(function(e){var n,t,r,o,i,u,a,s,c=(n=f,t=d.itemAttributes,r=d.content,o=he.fromTag("li",n),dn(o,t),sn(o,r),o);u=c,an((i=e).list,u),i.item=u,s=d,fn((a=e).list)!==s.listType&&(a.list=pn(a.list,s.listType)),dn(a.list,s.listAttributes)}),n},yn=function(e,n,t){var r,o=function(e,n,t){for(var r,o,i,u=[],a=0;a<t;a++)u.push((r=e,o=n.listType,i={list:he.fromTag(o,r),item:he.fromTag("li",r)},an(i.list,i.item),i));return u}(e,t,t.depth-n.length);return function(e){for(var n=1;n<e.length;n++)vn(e[n-1],e[n])}(o),function(e,n){for(var t=0;t<e.length-1;t++)r=e[t].item,o="list-style-type",i="none",u=r.dom(),mn(u,o,i);var r,o,i,u;oe(e).each(function(e){dn(e.list,n.listAttributes),dn(e.item,n.itemAttributes),sn(e.item,n.content)})}(o,t),r=o,ye([oe(n),re(r)],vn),n.concat(o)},Nn=function(e){return Ze(e,"OL,UL")},Sn=function(e){return rn(e).map(Nn).getOr(!1)},Cn=function(e){return 0<e.depth},On=function(e){return e.isSelected},bn=function(e){var n=nn(e),t=on(e).map(Nn).getOr(!1)?n.slice(0,-1):n;return Y(t,gn)},Tn=Object.prototype.hasOwnProperty,Dn=(s=function(e,n){return n},function(){for(var e=new Array(arguments.length),n=0;n<e.length;n++)e[n]=arguments[n];if(0===e.length)throw new Error("Can't merge zero objects");for(var t={},r=0;r<e.length;r++){var o=e[r];for(var i in o)Tn.call(o,i)&&(t[i]=s(t[i],o[i]))}return t}),Ln=function(n){G(n,function(r,e){(function(e,n){for(var t=e[n].depth,r=n-1;0<=r;r--){if(e[r].depth===t)return q.some(e[r]);if(e[r].depth<t)break}return q.none()})(n,e).each(function(e){var n,t;t=e,(n=r).listType=t.listType,n.listAttributes=Dn({},t.listAttributes)})})},En=function(e){var n=e,t=function(){return n};return{get:t,set:function(e){n=e},clone:function(){return En(t())}}},wn=function(i,u,a,s){return rn(s).filter(Nn).fold(function(){u.each(function(e){Ge(e.start,s)&&a.set(!0)});var n,t,r,e=(n=s,t=i,r=a.get(),en(n).map(function(e){return{depth:t,isSelected:r,content:bn(n),itemAttributes:ln(n),listAttributes:ln(e),listType:fn(e)}}));u.each(function(e){Ge(e.end,s)&&a.set(!1)});var o=on(s).filter(Nn).map(function(e){return kn(i,u,a,e)}).getOr([]);return e.toArray().concat(o)},function(e){return kn(i,u,a,e)})},kn=function(n,t,r,e){return te(nn(e),function(e){return(Nn(e)?kn:wn)(n+1,t,r,e)})},An=tinymce.util.Tools.resolve("tinymce.Env"),xn=function(e,n){var t,r,o,i,u=e.dom,a=e.schema.getBlockElements(),s=u.createFragment();if(e.settings.forced_root_block&&(o=e.settings.forced_root_block),o&&((r=u.create(o)).tagName===e.settings.forced_root_block&&u.setAttribs(r,e.settings.forced_root_block_attrs),D(n.firstChild,a)||s.appendChild(r)),n)for(;t=n.firstChild;){var c=t.nodeName;i||"SPAN"===c&&"bookmark"===t.getAttribute("data-mce-type")||(i=!0),D(t,a)?(s.appendChild(t),r=null):o?(r||(r=u.create(o),s.appendChild(r)),r.appendChild(t)):s.appendChild(t)}return e.settings.forced_root_block?i||An.ie&&!(10<An.ie)||r.appendChild(u.create("br",{"data-mce-bogus":"1"})):s.appendChild(u.create("br")),s},Rn=function(i,e){return Y(e,function(e){var n,t,r,o=(n=e.content,r=(t||u.document).createDocumentFragment(),G(n,function(e){r.appendChild(e.dom())}),he.fromDom(r));return he.fromDom(xn(i,o.dom()))})},In=function(e,n){return Ln(n),(t=e.contentDocument,r=n,o=Z(r,function(e,n){return n.depth>e.length?yn(t,e,n):hn(t,e,n)},[]),re(o).map(function(e){return e.list})).toArray();var t,r,o},_n=function(e){var n,t,r=Y(pe.getSelectedListItems(e),he.fromDom);return ye([ee(r,B(Sn)),ee((n=r,t=Q.call(n,0),t.reverse(),t),B(Sn))],function(e,n){return{start:e,end:n}})},Bn=function(a,e,s){var n,t,r,o=(n=e,t=_n(a),r=En(!1),Y(n,function(e){return{sourceList:e,entries:kn(0,t,r,e)}}));G(o,function(e){var n,t,r,o,i,u;n=e.entries,t=s,G(J(n,On),function(e){return function(e,n){switch(e){case"Indent":n.depth++;break;case"Outdent":n.depth--;break;case"Flatten":n.depth=0}}(t,e)}),r=e.sourceList,i=a,u=e.entries,o=te(function(e,n){if(0===e.length)return[];for(var t=n(e[0]),r=[],o=[],i=0,u=e.length;i<u;i++){var a=e[i],s=n(a);s!==t&&(r.push(o),o=[]),t=s,o.push(a)}return 0!==o.length&&r.push(o),r}(u,Cn),function(e){return re(e).map(Cn).getOr(!1)?In(i,e):Rn(i,e)}),G(o,function(e){un(r,e)}),cn(e.sourceList)})},Pn=m.DOM,Mn=function(e,n,t){var r,o,i,u,a,s;for(i=Pn.select('span[data-mce-type="bookmark"]',n),a=xn(e,t),(r=Pn.createRng()).setStartAfter(t),r.setEndAfter(n),u=(o=r.extractContents()).firstChild;u;u=u.firstChild)if("LI"===u.nodeName&&e.dom.isEmpty(u)){Pn.remove(u);break}e.dom.isEmpty(o)||Pn.insertAfter(o,n),Pn.insertAfter(a,n),E(e.dom,t.parentNode)&&(s=t.parentNode,v.each(i,function(e){s.parentNode.insertBefore(e,t.parentNode)}),Pn.remove(s)),Pn.remove(t),E(e.dom,n)&&Pn.remove(n)},Un=function(e){Ze(e,"DT")&&pn(e,"DD")},Fn=function(r,e,n){G(n,"Indent"===e?Un:function(e){return n=r,void(Ze(t=e,"DD")?pn(t,"DT"):Ze(t,"DT")&&en(t).each(function(e){return Mn(n,e.dom(),t.dom())}));var n,t})},jn=function(e,n){var t=Y(pe.getSelectedListRoots(e),he.fromDom),r=Y(pe.getSelectedDlItems(e),he.fromDom),o=!1;if(t.length||r.length){var i=e.selection.getBookmark();Bn(e,t,n),Fn(e,n,r),e.selection.moveToBookmark(i),e.selection.setRng(A(e.selection.getRng())),e.nodeChanged(),o=!0}return o},Hn=function(e){return jn(e,"Indent")},$n=function(e){return jn(e,"Outdent")},qn=function(e){return jn(e,"Flatten")},Wn=function(t,e){v.each(e,function(e,n){t.setAttribute(n,e)})},Vn=function(e,n,t){var r,o,i,u,a,s,c;r=e,o=n,u=(i=t)["list-style-type"]?i["list-style-type"]:null,r.setStyle(o,"list-style-type",u),a=e,Wn(s=n,(c=t)["list-attributes"]),v.each(a.select("li",s),function(e){Wn(e,c["list-item-attributes"])})},zn=function(e,n,t,r){var o,i;for(o=n[t?"startContainer":"endContainer"],i=n[t?"startOffset":"endOffset"],1===o.nodeType&&(o=o.childNodes[Math.min(i,o.childNodes.length-1)]||o),!t&&b(o.nextSibling)&&(o=o.nextSibling);o.parentNode!==r;){if(T(e,o))return o;if(/^(TD|TH)$/.test(o.parentNode.nodeName))return o;o=o.parentNode}return o},Kn=function(f,d,l){void 0===l&&(l={});var e,n=f.selection.getRng(!0),m="LI",t=pe.getClosestListRootElm(f,f.selection.getStart(!0)),g=f.dom;"false"!==g.getContentEditable(f.selection.getNode())&&("DL"===(d=d.toUpperCase())&&(m="DT"),e=R(n),v.each(function(t,e,r){for(var o,i=[],u=t.dom,n=zn(t,e,!0,r),a=zn(t,e,!1,r),s=[],c=n;c&&(s.push(c),c!==a);c=c.nextSibling);return v.each(s,function(e){if(T(t,e))return i.push(e),void(o=null);if(u.isBlock(e)||b(e))return b(e)&&u.remove(e),void(o=null);var n=e.nextSibling;p.isBookmarkNode(e)&&(T(t,n)||!n&&e.parentNode===r)?o=null:(o||(o=u.create("p"),e.parentNode.insertBefore(o,e),i.push(o)),o.appendChild(e))}),i}(f,n,t),function(e){var n,t,r,o,i,u,a,s,c;(t=e.previousSibling)&&y(t)&&t.nodeName===d&&(r=t,o=l,i=g.getStyle(r,"list-style-type"),u=o?o["list-style-type"]:"",i===(u=null===u?"":u))?(n=t,e=g.rename(e,m),t.appendChild(e)):(n=g.create(d),e.parentNode.insertBefore(n,e),n.appendChild(e),e=g.rename(e,m)),a=g,s=e,c=["margin","margin-right","margin-bottom","margin-left","margin-top","padding","padding-right","padding-bottom","padding-left","padding-top"],v.each(c,function(e){var n;return a.setStyle(s,((n={})[e]="",n))}),Vn(g,n,l),Qn(f.dom,n)}),f.selection.setRng(I(e)))},Xn=function(e,n,t){return s=t,(a=n)&&s&&y(a)&&a.nodeName===s.nodeName&&(i=n,u=t,(o=e).getStyle(i,"list-style-type",!0)===o.getStyle(u,"list-style-type",!0))&&(r=t,n.className===r.className);var r,o,i,u,a,s},Qn=function(e,n){var t,r;if(t=n.nextSibling,Xn(e,n,t)){for(;r=t.firstChild;)n.appendChild(r);e.remove(t)}if(t=n.previousSibling,Xn(e,n,t)){for(;r=t.lastChild;)n.insertBefore(r,n.firstChild);e.remove(t)}},Yn=function(n,e,t,r,o){if(e.nodeName!==r||Gn(o)){var i=R(n.selection.getRng(!0));v.each([e].concat(t),function(e){!function(e,n,t,r){if(n.nodeName!==t){var o=e.rename(n,t);Vn(e,o,r)}else Vn(e,n,r)}(n.dom,e,r,o)}),n.selection.setRng(I(i))}else qn(n)},Gn=function(e){return"list-style-type"in e},Jn={toggleList:function(e,n,t){var r=pe.getParentList(e),o=pe.getSelectedSubLists(e);t=t||{},r&&0<o.length?Yn(e,r,o,n,t):function(e,n,t,r){if(n!==e.getBody())if(n)if(n.nodeName!==t||Gn(r)){var o=R(e.selection.getRng(!0));Vn(e.dom,n,r),Qn(e.dom,e.dom.rename(n,t)),e.selection.setRng(I(o))}else qn(e);else Kn(e,t,r)}(e,r,n,t)},mergeWithAdjacentLists:Qn},Zn=m.DOM,et=function(e,n){var t,r=n.parentNode;"LI"===r.nodeName&&r.firstChild===n&&((t=r.previousSibling)&&"LI"===t.nodeName?(t.appendChild(n),E(e,r)&&Zn.remove(r)):Zn.setStyle(r,"listStyleType","none")),y(r)&&(t=r.previousSibling)&&"LI"===t.nodeName&&t.appendChild(n)},nt=function(n,e){v.each(v.grep(n.select("ol,ul",e)),function(e){et(n,e)})},tt=function(e,n,t,r){var o,i,u=n.startContainer,a=n.startOffset;if(3===u.nodeType&&(t?a<u.data.length:0<a))return u;for(o=e.schema.getNonEmptyElements(),1===u.nodeType&&(u=f.getNode(u,a)),i=new d(u,r),t&&L(e.dom,u)&&i.next();u=i[t?"next":"prev2"]();){if("LI"===u.nodeName&&!u.hasChildNodes())return u;if(o[u.nodeName])return u;if(3===u.nodeType&&0<u.data.length)return u}},rt=function(e,n){var t=n.childNodes;return 1===t.length&&!y(t[0])&&e.isBlock(t[0])},ot=function(e,n,t){var r,o,i,u;if(o=rt(e,t)?t.firstChild:t,rt(i=e,u=n)&&i.remove(u.firstChild,!0),!E(e,n,!0))for(;r=n.firstChild;)o.appendChild(r)},it=function(n,e,t){var r,o,i=e.parentNode;if(w(n,e)&&w(n,t)){y(t.lastChild)&&(o=t.lastChild),i===t.lastChild&&b(i.previousSibling)&&n.remove(i.previousSibling),(r=t.lastChild)&&b(r)&&e.hasChildNodes()&&n.remove(r),E(n,t,!0)&&n.$(t).empty(),ot(n,e,t),o&&t.appendChild(o);var u=Je(he.fromDom(t),he.fromDom(e))?n.getParents(e,y,t):[];n.remove(e),G(u,function(e){E(n,e)&&e!==n.getRoot()&&n.remove(e)})}},ut=function(e,n,t,r){var o,i,u,a=e.dom;if(a.isEmpty(r))i=t,u=r,(o=e).dom.$(u).empty(),it(o.dom,i,u),o.selection.setCursorLocation(u);else{var s=R(n);it(a,t,r),e.selection.setRng(I(s))}},at=function(e,n){var t,r,o,i=e.dom,u=e.selection,a=u.getStart(),s=pe.getClosestListRootElm(e,a),c=i.getParent(u.getStart(),"LI",s);if(c){if((t=c.parentNode)===e.getBody()&&E(i,t))return!0;if(r=A(u.getRng(!0)),(o=i.getParent(tt(e,r,n,s),"LI",s))&&o!==c)return n?ut(e,r,o,c):function(e,n,t,r){var o=R(n);it(e.dom,t,r);var i=I(o);e.selection.setRng(i)}(e,r,c,o),!0;if(!o&&!n)return qn(e),!0}return!1},st=function(e,n){return at(e,n)||function(o,i){var u=o.dom,e=o.selection.getStart(),a=pe.getClosestListRootElm(o,e),s=u.getParent(e,u.isBlock,a);if(s&&u.isEmpty(s)){var n=A(o.selection.getRng(!0)),c=u.getParent(tt(o,n,i,a),"LI",a);if(c)return o.undoManager.transact(function(){var e,n,t,r;n=s,t=a,r=(e=u).getParent(n.parentNode,e.isBlock,t),e.remove(n),r&&e.isEmpty(r)&&e.remove(r),Jn.mergeWithAdjacentLists(u,c.parentNode),o.selection.select(c,!0),o.selection.collapse(i)}),!0}return!1}(e,n)},ct=function(e,n){return e.selection.isCollapsed()?st(e,n):(r=(t=e).selection.getStart(),o=pe.getClosestListRootElm(t,r),!!(t.dom.getParent(r,"LI,DT,DD",o)||0<pe.getSelectedListItems(t).length)&&(t.undoManager.transact(function(){t.execCommand("Delete"),nt(t.dom,t.getBody())}),!0));var t,r,o},ft=function(n){n.on("keydown",function(e){e.keyCode===l.BACKSPACE?ct(n,!1)&&e.preventDefault():e.keyCode===l.DELETE&&ct(n,!0)&&e.preventDefault()})},dt=ct,lt=function(n){return{backspaceDelete:function(e){dt(n,e)}}},mt=function(n,t){return function(){var e=n.dom.getParent(n.selection.getStart(),"UL,OL,DL");return e&&e.nodeName===t}},gt=function(t){t.on("BeforeExecCommand",function(e){var n=e.command.toLowerCase();"indent"===n?Hn(t):"outdent"===n&&$n(t)}),t.addCommand("InsertUnorderedList",function(e,n){Jn.toggleList(t,"UL",n)}),t.addCommand("InsertOrderedList",function(e,n){Jn.toggleList(t,"OL",n)}),t.addCommand("InsertDefinitionList",function(e,n){Jn.toggleList(t,"DL",n)}),t.addCommand("RemoveList",function(){qn(t)}),t.addQueryStateHandler("InsertUnorderedList",mt(t,"UL")),t.addQueryStateHandler("InsertOrderedList",mt(t,"OL")),t.addQueryStateHandler("InsertDefinitionList",mt(t,"DL"))},pt=function(e){return e.getParam("lists_indent_on_tab",!0)},vt=function(e){var n;pt(e)&&(n=e).on("keydown",function(e){e.keyCode!==l.TAB||l.metaKeyPressed(e)||n.undoManager.transact(function(){(e.shiftKey?$n(n):Hn(n))&&e.preventDefault()})}),ft(e)},ht=function(n,i){return function(e){var o=e.control;n.on("NodeChange",function(e){var n=function(e,n){for(var t=0;t<e.length;t++)if(n(e[t]))return t;return-1}(e.parents,O),t=-1!==n?e.parents.slice(0,n):e.parents,r=v.grep(t,y);o.active(0<r.length&&r[0].nodeName===i)})}},yt=function(e){var n,t,r;t="advlist",r=(n=e).settings.plugins?n.settings.plugins:"",-1===v.inArray(r.split(/[ ,]/),t)&&(e.addButton("numlist",{active:!1,title:"Numbered list",cmd:"InsertOrderedList",onPostRender:ht(e,"OL")}),e.addButton("bullist",{active:!1,title:"Bullet list",cmd:"InsertUnorderedList",onPostRender:ht(e,"UL")})),e.addButton("indent",{icon:"indent",title:"Increase indent",cmd:"Indent"})};c.add("lists",function(e){return vt(e),yt(e),gt(e),lt(e)})}(window);
\ No newline at end of file
+!function(u){"use strict";var e,n,t,r,o,i,s,a,c,f=tinymce.util.Tools.resolve("tinymce.PluginManager"),d=tinymce.util.Tools.resolve("tinymce.dom.RangeUtils"),l=tinymce.util.Tools.resolve("tinymce.dom.TreeWalker"),m=tinymce.util.Tools.resolve("tinymce.util.VK"),p=tinymce.util.Tools.resolve("tinymce.dom.BookmarkManager"),v=tinymce.util.Tools.resolve("tinymce.util.Tools"),g=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),h=function(e){return e&&"BR"===e.nodeName},y=function(e){return e&&3===e.nodeType},N=function(e){return e&&/^(OL|UL|DL)$/.test(e.nodeName)},S=function(e){return e&&/^(OL|UL)$/.test(e.nodeName)},C=function(e){return e&&/^(DT|DD)$/.test(e.nodeName)},O=function(e){return e&&/^(LI|DT|DD)$/.test(e.nodeName)},b=function(e){return e&&/^(TH|TD)$/.test(e.nodeName)},T=h,E=function(e,n){return n&&!!e.schema.getTextBlockElements()[n.nodeName]},L=function(e,n){return e&&e.nodeName in n},D=function(e,n){return!!h(n)&&!(!e.isBlock(n.nextSibling)||h(n.previousSibling))},w=function(e,n,t){var r=e.isEmpty(n);return!(t&&0<e.select("span[data-mce-type=bookmark]",n).length)&&r},k=function(e,n){return e.isChildOf(n,e.getRoot())},A=function(e,n){if(y(e))return{container:e,offset:n};var t=d.getNode(e,n);return y(t)?{container:t,offset:n>=e.childNodes.length?t.data.length:0}:t.previousSibling&&y(t.previousSibling)?{container:t.previousSibling,offset:t.previousSibling.data.length}:t.nextSibling&&y(t.nextSibling)?{container:t.nextSibling,offset:0}:{container:e,offset:n}},x=function(e){var n=e.cloneRange(),t=A(e.startContainer,e.startOffset);n.setStart(t.container,t.offset);var r=A(e.endContainer,e.endOffset);return n.setEnd(r.container,r.offset),n},R=g.DOM,I=function(o){var i={},e=function(e){var n,t,r;t=o[e?"startContainer":"endContainer"],r=o[e?"startOffset":"endOffset"],1===t.nodeType&&(n=R.create("span",{"data-mce-type":"bookmark"}),t.hasChildNodes()?(r=Math.min(r,t.childNodes.length-1),e?t.insertBefore(n,t.childNodes[r]):R.insertAfter(n,t.childNodes[r])):t.appendChild(n),t=n,r=0),i[e?"startContainer":"endContainer"]=t,i[e?"startOffset":"endOffset"]=r};return e(!0),o.collapsed||e(),i},_=function(o){function e(e){var n,t,r;n=r=o[e?"startContainer":"endContainer"],t=o[e?"startOffset":"endOffset"],n&&(1===n.nodeType&&(t=function(e){for(var n=e.parentNode.firstChild,t=0;n;){if(n===e)return t;1===n.nodeType&&"bookmark"===n.getAttribute("data-mce-type")||t++,n=n.nextSibling}return-1}(n),n=n.parentNode,R.remove(r),!n.hasChildNodes()&&R.isBlock(n)&&n.appendChild(R.create("br"))),o[e?"startContainer":"endContainer"]=n,o[e?"startOffset":"endOffset"]=t)}e(!0),e();var n=R.createRng();return n.setStart(o.startContainer,o.startOffset),o.endContainer&&n.setEnd(o.endContainer,o.endOffset),x(n)},B=function(){},P=function(e){return function(){return e}},M=function(t){return function(){for(var e=[],n=0;n<arguments.length;n++)e[n]=arguments[n];return!t.apply(null,e)}},U=P(!1),F=P(!0),j=function(){return H},H=(e=function(e){return e.isNone()},r={fold:function(e,n){return e()},is:U,isSome:U,isNone:F,getOr:t=function(e){return e},getOrThunk:n=function(e){return e()},getOrDie:function(e){throw new Error(e||"error: getOrDie called on none.")},getOrNull:P(null),getOrUndefined:P(undefined),or:t,orThunk:n,map:j,each:B,bind:j,exists:U,forall:F,filter:j,equals:e,equals_:e,toArray:function(){return[]},toString:P("none()")},Object.freeze&&Object.freeze(r),r),$=function(t){var e=P(t),n=function(){return o},r=function(e){return e(t)},o={fold:function(e,n){return n(t)},is:function(e){return t===e},isSome:F,isNone:U,getOr:e,getOrThunk:e,getOrDie:e,getOrNull:e,getOrUndefined:e,or:n,orThunk:n,map:function(e){return $(e(t))},each:function(e){e(t)},bind:r,exists:r,forall:r,filter:function(e){return e(t)?o:H},toArray:function(){return[t]},toString:function(){return"some("+t+")"},equals:function(e){return e.is(t)},equals_:function(e,n){return e.fold(U,function(e){return n(t,e)})}};return o},q={some:$,none:j,from:function(e){return null===e||e===undefined?H:$(e)}},W=function(n){return function(e){return function(e){if(null===e)return"null";var n=typeof e;return"object"===n&&(Array.prototype.isPrototypeOf(e)||e.constructor&&"Array"===e.constructor.name)?"array":"object"===n&&(String.prototype.isPrototypeOf(e)||e.constructor&&"String"===e.constructor.name)?"string":n}(e)===n}},V=W("string"),z=W("array"),K=W("boolean"),X=W("function"),Q=W("number"),Y=Array.prototype.slice,G=Array.prototype.push,J=function(e,n){for(var t=e.length,r=new Array(t),o=0;o<t;o++){var i=e[o];r[o]=n(i,o)}return r},Z=function(e,n){for(var t=0,r=e.length;t<r;t++)n(e[t],t)},ee=function(e,n){for(var t=[],r=0,o=e.length;r<o;r++){var i=e[r];n(i,r)&&t.push(i)}return t},ne=function(e,n,t){return Z(e,function(e){t=n(t,e)}),t},te=function(e,n){for(var t=0,r=e.length;t<r;t++){var o=e[t];if(n(o,t))return q.some(o)}return q.none()},re=function(e,n){return function(e){for(var n=[],t=0,r=e.length;t<r;++t){if(!z(e[t]))throw new Error("Arr.flatten item "+t+" was not an array, input: "+e);G.apply(n,e[t])}return n}(J(e,n))},oe=function(e){return 0===e.length?q.none():q.some(e[0])},ie=function(e){return 0===e.length?q.none():q.some(e[e.length-1])},ue=(X(Array.from)&&Array.from,"undefined"!=typeof u.window?u.window:Function("return this;")()),se=function(e,n){return function(e,n){for(var t=n!==undefined&&null!==n?n:ue,r=0;r<e.length&&t!==undefined&&null!==t;++r)t=t[e[r]];return t}(e.split("."),n)},ae=function(e,n){var t=se(e,n);if(t===undefined||null===t)throw new Error(e+" not available on this browser");return t},ce=function(e){var n,t=se("ownerDocument.defaultView",e);return(n=t,ae("HTMLElement",n)).prototype.isPrototypeOf(e)},fe=tinymce.util.Tools.resolve("tinymce.dom.DomQuery"),de=function(e){var n=e.selection.getStart(!0);return e.dom.getParent(n,"OL,UL,DL",me(e,n))},le=function(e){var t,n,r,o=e.selection.getSelectedBlocks();return v.grep((t=e,n=o,r=v.map(n,function(e){var n=t.dom.getParent(e,"li,dd,dt",me(t,e));return n||e}),fe.unique(r)),function(e){return O(e)})},me=function(e,n){var t=e.dom.getParents(n,"TD,TH");return 0<t.length?t[0]:e.getBody()},ge=function(e,n){var t=e.dom.getParents(n,"ol,ul",me(e,n));return ie(t)},pe=function(n,e){var t=J(e,function(e){return ge(n,e).getOr(e)});return fe.unique(t)},ve={isList:function(e){var n=de(e);return ce(n)},getParentList:de,getSelectedSubLists:function(e){var n,t,r,o=de(e),i=e.selection.getSelectedBlocks();return r=i,(t=o)&&1===r.length&&r[0]===t?(n=o,v.grep(n.querySelectorAll("ol,ul,dl"),function(e){return N(e)})):v.grep(i,function(e){return N(e)&&o!==e})},getSelectedListItems:le,getClosestListRootElm:me,getSelectedDlItems:function(e){return ee(le(e),C)},getSelectedListRoots:function(e){var n,t,r,o=(t=ge(n=e,n.selection.getStart()),r=ee(n.selection.getSelectedBlocks(),S),t.toArray().concat(r));return pe(e,o)}},he=function(e){if(null===e||e===undefined)throw new Error("Node cannot be null or undefined");return{dom:P(e)}},ye={fromHtml:function(e,n){var t=(n||u.document).createElement("div");if(t.innerHTML=e,!t.hasChildNodes()||1<t.childNodes.length)throw u.console.error("HTML does not have a single root node",e),new Error("HTML must have a single root node");return he(t.childNodes[0])},fromTag:function(e,n){var t=(n||u.document).createElement(e);return he(t)},fromText:function(e,n){var t=(n||u.document).createTextNode(e);return he(t)},fromDom:he,fromPoint:function(e,n,t){var r=e.dom();return q.from(r.elementFromPoint(n,t)).map(he)}},Ne=function(e,n,t){return e.isSome()&&n.isSome()?q.some(t(e.getOrDie(),n.getOrDie())):q.none()},Se=Object.keys,Ce=function(){return ae("Node")},Oe=function(e,n,t){return 0!=(e.compareDocumentPosition(n)&t)},be=function(e,n){return Oe(e,n,Ce().DOCUMENT_POSITION_CONTAINED_BY)},Te=function(e,n){var t=function(e,n){for(var t=0;t<e.length;t++){var r=e[t];if(r.test(n))return r}return undefined}(e,n);if(!t)return{major:0,minor:0};var r=function(e){return Number(n.replace(t,"$"+e))};return Le(r(1),r(2))},Ee=function(){return Le(0,0)},Le=function(e,n){return{major:e,minor:n}},De={nu:Le,detect:function(e,n){var t=String(n).toLowerCase();return 0===e.length?Ee():Te(e,t)},unknown:Ee},we="Firefox",ke=function(e,n){return function(){return n===e}},Ae=function(e){var n=e.current;return{current:n,version:e.version,isEdge:ke("Edge",n),isChrome:ke("Chrome",n),isIE:ke("IE",n),isOpera:ke("Opera",n),isFirefox:ke(we,n),isSafari:ke("Safari",n)}},xe={unknown:function(){return Ae({current:undefined,version:De.unknown()})},nu:Ae,edge:P("Edge"),chrome:P("Chrome"),ie:P("IE"),opera:P("Opera"),firefox:P(we),safari:P("Safari")},Re="Windows",Ie="Android",_e="Solaris",Be="FreeBSD",Pe=function(e,n){return function(){return n===e}},Me=function(e){var n=e.current;return{current:n,version:e.version,isWindows:Pe(Re,n),isiOS:Pe("iOS",n),isAndroid:Pe(Ie,n),isOSX:Pe("OSX",n),isLinux:Pe("Linux",n),isSolaris:Pe(_e,n),isFreeBSD:Pe(Be,n)}},Ue={unknown:function(){return Me({current:undefined,version:De.unknown()})},nu:Me,windows:P(Re),ios:P("iOS"),android:P(Ie),linux:P("Linux"),osx:P("OSX"),solaris:P(_e),freebsd:P(Be)},Fe=function(e,n){var t=String(n).toLowerCase();return te(e,function(e){return e.search(t)})},je=function(e,t){return Fe(e,t).map(function(e){var n=De.detect(e.versionRegexes,t);return{current:e.name,version:n}})},He=function(e,t){return Fe(e,t).map(function(e){var n=De.detect(e.versionRegexes,t);return{current:e.name,version:n}})},$e=function(e,n){return-1!==e.indexOf(n)},qe=/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,We=function(n){return function(e){return $e(e,n)}},Ve=[{name:"Edge",versionRegexes:[/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],search:function(e){return $e(e,"edge/")&&$e(e,"chrome")&&$e(e,"safari")&&$e(e,"applewebkit")}},{name:"Chrome",versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/,qe],search:function(e){return $e(e,"chrome")&&!$e(e,"chromeframe")}},{name:"IE",versionRegexes:[/.*?msie\ ?([0-9]+)\.([0-9]+).*/,/.*?rv:([0-9]+)\.([0-9]+).*/],search:function(e){return $e(e,"msie")||$e(e,"trident")}},{name:"Opera",versionRegexes:[qe,/.*?opera\/([0-9]+)\.([0-9]+).*/],search:We("opera")},{name:"Firefox",versionRegexes:[/.*?firefox\/\ ?([0-9]+)\.([0-9]+).*/],search:We("firefox")},{name:"Safari",versionRegexes:[qe,/.*?cpu os ([0-9]+)_([0-9]+).*/],search:function(e){return($e(e,"safari")||$e(e,"mobile/"))&&$e(e,"applewebkit")}}],ze=[{name:"Windows",search:We("win"),versionRegexes:[/.*?windows\ nt\ ?([0-9]+)\.([0-9]+).*/]},{name:"iOS",search:function(e){return $e(e,"iphone")||$e(e,"ipad")},versionRegexes:[/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,/.*cpu os ([0-9]+)_([0-9]+).*/,/.*cpu iphone os ([0-9]+)_([0-9]+).*/]},{name:"Android",search:We("android"),versionRegexes:[/.*?android\ ?([0-9]+)\.([0-9]+).*/]},{name:"OSX",search:We("os x"),versionRegexes:[/.*?os\ x\ ?([0-9]+)_([0-9]+).*/]},{name:"Linux",search:We("linux"),versionRegexes:[]},{name:"Solaris",search:We("sunos"),versionRegexes:[]},{name:"FreeBSD",search:We("freebsd"),versionRegexes:[]}],Ke={browsers:P(Ve),oses:P(ze)},Xe=function(e){var n,t,r,o,i,u,s,a,c,f,d,l=Ke.browsers(),m=Ke.oses(),g=je(l,e).fold(xe.unknown,xe.nu),p=He(m,e).fold(Ue.unknown,Ue.nu);return{browser:g,os:p,deviceType:(t=g,r=e,o=(n=p).isiOS()&&!0===/ipad/i.test(r),i=n.isiOS()&&!o,u=n.isAndroid()&&3===n.version.major,s=n.isAndroid()&&4===n.version.major,a=o||u||s&&!0===/mobile/i.test(r),c=n.isiOS()||n.isAndroid(),f=c&&!a,d=t.isSafari()&&n.isiOS()&&!1===/safari/i.test(r),{isiPad:P(o),isiPhone:P(i),isTablet:P(a),isPhone:P(f),isTouch:P(c),isAndroid:n.isAndroid,isiOS:n.isiOS,isWebView:P(d)})}},Qe={detect:(o=function(){var e=u.navigator.userAgent;return Xe(e)},s=!1,function(){for(var e=[],n=0;n<arguments.length;n++)e[n]=arguments[n];return s||(s=!0,i=o.apply(null,e)),i})},Ye=(u.Node.ATTRIBUTE_NODE,u.Node.CDATA_SECTION_NODE,u.Node.COMMENT_NODE,u.Node.DOCUMENT_NODE,u.Node.DOCUMENT_TYPE_NODE,u.Node.DOCUMENT_FRAGMENT_NODE,u.Node.ELEMENT_NODE),Ge=(u.Node.TEXT_NODE,u.Node.PROCESSING_INSTRUCTION_NODE,u.Node.ENTITY_REFERENCE_NODE,u.Node.ENTITY_NODE,u.Node.NOTATION_NODE,Ye),Je=function(e,n){return e.dom()===n.dom()},Ze=Qe.detect().browser.isIE()?function(e,n){return be(e.dom(),n.dom())}:function(e,n){var t=e.dom(),r=n.dom();return t!==r&&t.contains(r)},en=function(e,n){var t=e.dom();if(t.nodeType!==Ge)return!1;var r=t;if(r.matches!==undefined)return r.matches(n);if(r.msMatchesSelector!==undefined)return r.msMatchesSelector(n);if(r.webkitMatchesSelector!==undefined)return r.webkitMatchesSelector(n);if(r.mozMatchesSelector!==undefined)return r.mozMatchesSelector(n);throw new Error("Browser lacks native selectors")},nn=function(e){return q.from(e.dom().parentNode).map(ye.fromDom)},tn=function(e){return J(e.dom().childNodes,ye.fromDom)},rn=function(e,n){var t=e.dom().childNodes;return q.from(t[n]).map(ye.fromDom)},on=function(e){return rn(e,0)},un=function(e){return rn(e,e.dom().childNodes.length-1)},sn=(function(){for(var e=[],n=0;n<arguments.length;n++)e[n]=arguments[n]}("element","offset"),function(n,t){nn(n).each(function(e){e.dom().insertBefore(t.dom(),n.dom())})}),an=function(e,n){e.dom().appendChild(n.dom())},cn=function(n,e){Z(e,function(e){an(n,e)})},fn=function(e){var n=e.dom();null!==n.parentNode&&n.parentNode.removeChild(n)},dn=function(e){return e.dom().nodeName.toLowerCase()},ln=(a=Ye,function(e){return e.dom().nodeType===a}),mn=function(e,n){var t=e.dom();!function(e,n){for(var t=Se(e),r=0,o=t.length;r<o;r++){var i=t[r];n(e[i],i)}}(n,function(e,n){!function(e,n,t){if(!(V(t)||K(t)||Q(t)))throw u.console.error("Invalid call to Attr.set. Key ",n,":: Value ",t,":: Element ",e),new Error("Attribute value was not simple");e.setAttribute(n,t+"")}(t,n,e)})},gn=function(e){return ne(e.dom().attributes,function(e,n){return e[n.name]=n.value,e},{})},pn=function(e,n,t){if(!V(t))throw u.console.error("Invalid call to CSS.set. Property ",n,":: Value ",t,":: Element ",e),new Error("CSS value must be a string: "+t);var r;(r=e).style!==undefined&&X(r.style.getPropertyValue)&&e.style.setProperty(n,t)},vn=function(e){return n=e,t=!0,ye.fromDom(n.dom().cloneNode(t));var n,t},hn=function(e,n){var t,r,o,i,u=(t=e,r=n,o=ye.fromTag(r),i=gn(t),mn(o,i),o);sn(e,u);var s=tn(e);return cn(u,s),fn(e),u},yn=function(e,n){an(e.item,n.list)},Nn=function(f,e,d){var n=e.slice(0,d.depth);return ie(n).each(function(e){var n,t,r,o,i,u,s,a,c=(n=f,t=d.itemAttributes,r=d.content,o=ye.fromTag("li",n),mn(o,t),cn(o,r),o);u=c,an((i=e).list,u),i.item=u,a=d,dn((s=e).list)!==a.listType&&(s.list=hn(s.list,a.listType)),mn(s.list,a.listAttributes)}),n},Sn=function(e,n,t){var r,o=function(e,n,t){for(var r,o,i,u=[],s=0;s<t;s++)u.push((r=e,o=n.listType,i={list:ye.fromTag(o,r),item:ye.fromTag("li",r)},an(i.list,i.item),i));return u}(e,t,t.depth-n.length);return function(e){for(var n=1;n<e.length;n++)yn(e[n-1],e[n])}(o),function(e,n){for(var t=0;t<e.length-1;t++)r=e[t].item,o="list-style-type",i="none",u=r.dom(),pn(u,o,i);var r,o,i,u;ie(e).each(function(e){mn(e.list,n.listAttributes),mn(e.item,n.itemAttributes),cn(e.item,n.content)})}(o,t),r=o,Ne(ie(n),oe(r),yn),n.concat(o)},Cn=function(e){return en(e,"OL,UL")},On=function(e){return on(e).map(Cn).getOr(!1)},bn=function(e){return 0<e.depth},Tn=function(e){return e.isSelected},En=function(e){var n=tn(e),t=un(e).map(Cn).getOr(!1)?n.slice(0,-1):n;return J(t,vn)},Ln=Object.prototype.hasOwnProperty,Dn=(c=function(e,n){return n},function(){for(var e=new Array(arguments.length),n=0;n<e.length;n++)e[n]=arguments[n];if(0===e.length)throw new Error("Can't merge zero objects");for(var t={},r=0;r<e.length;r++){var o=e[r];for(var i in o)Ln.call(o,i)&&(t[i]=c(t[i],o[i]))}return t}),wn=function(n){Z(n,function(r,e){(function(e,n){for(var t=e[n].depth,r=n-1;0<=r;r--){if(e[r].depth===t)return q.some(e[r]);if(e[r].depth<t)break}return q.none()})(n,e).each(function(e){var n,t;t=e,(n=r).listType=t.listType,n.listAttributes=Dn({},t.listAttributes)})})},kn=function(e){var n=e,t=function(){return n};return{get:t,set:function(e){n=e},clone:function(){return kn(t())}}},An=function(i,u,s,a){return on(a).filter(Cn).fold(function(){u.each(function(e){Je(e.start,a)&&s.set(!0)});var n,t,r,e=(n=a,t=i,r=s.get(),nn(n).filter(ln).map(function(e){return{depth:t,isSelected:r,content:En(n),itemAttributes:gn(n),listAttributes:gn(e),listType:dn(e)}}));u.each(function(e){Je(e.end,a)&&s.set(!1)});var o=un(a).filter(Cn).map(function(e){return xn(i,u,s,e)}).getOr([]);return e.toArray().concat(o)},function(e){return xn(i,u,s,e)})},xn=function(n,t,r,e){return re(tn(e),function(e){return(Cn(e)?xn:An)(n+1,t,r,e)})},Rn=tinymce.util.Tools.resolve("tinymce.Env"),In=function(e,n){var t,r,o,i,u=e.dom,s=e.schema.getBlockElements(),a=u.createFragment();if(e.settings.forced_root_block&&(o=e.settings.forced_root_block),o&&((r=u.create(o)).tagName===e.settings.forced_root_block&&u.setAttribs(r,e.settings.forced_root_block_attrs),L(n.firstChild,s)||a.appendChild(r)),n)for(;t=n.firstChild;){var c=t.nodeName;i||"SPAN"===c&&"bookmark"===t.getAttribute("data-mce-type")||(i=!0),L(t,s)?(a.appendChild(t),r=null):o?(r||(r=u.create(o),a.appendChild(r)),r.appendChild(t)):a.appendChild(t)}return e.settings.forced_root_block?i||Rn.ie&&!(10<Rn.ie)||r.appendChild(u.create("br",{"data-mce-bogus":"1"})):a.appendChild(u.create("br")),a},_n=function(i,e){return J(e,function(e){var n,t,r,o=(n=e.content,r=(t||u.document).createDocumentFragment(),Z(n,function(e){r.appendChild(e.dom())}),ye.fromDom(r));return ye.fromDom(In(i,o.dom()))})},Bn=function(e,n){return wn(n),(t=e.contentDocument,r=n,o=ne(r,function(e,n){return n.depth>e.length?Sn(t,e,n):Nn(t,e,n)},[]),oe(o).map(function(e){return e.list})).toArray();var t,r,o},Pn=function(e){var n,t,r=J(ve.getSelectedListItems(e),ye.fromDom);return Ne(te(r,M(On)),te((n=r,(t=Y.call(n,0)).reverse(),t),M(On)),function(e,n){return{start:e,end:n}})},Mn=function(s,e,a){var n,t,r,o=(n=e,t=Pn(s),r=kn(!1),J(n,function(e){return{sourceList:e,entries:xn(0,t,r,e)}}));Z(o,function(e){var n,t,r,o,i,u;n=e.entries,t=a,Z(ee(n,Tn),function(e){return function(e,n){switch(e){case"Indent":n.depth++;break;case"Outdent":n.depth--;break;case"Flatten":n.depth=0}}(t,e)}),r=e.sourceList,i=s,u=e.entries,o=re(function(e,n){if(0===e.length)return[];for(var t=n(e[0]),r=[],o=[],i=0,u=e.length;i<u;i++){var s=e[i],a=n(s);a!==t&&(r.push(o),o=[]),t=a,o.push(s)}return 0!==o.length&&r.push(o),r}(u,bn),function(e){return oe(e).map(bn).getOr(!1)?Bn(i,e):_n(i,e)}),Z(o,function(e){sn(r,e)}),fn(e.sourceList)})},Un=g.DOM,Fn=function(e,n,t){var r,o,i,u,s,a;for(i=Un.select('span[data-mce-type="bookmark"]',n),s=In(e,t),(r=Un.createRng()).setStartAfter(t),r.setEndAfter(n),u=(o=r.extractContents()).firstChild;u;u=u.firstChild)if("LI"===u.nodeName&&e.dom.isEmpty(u)){Un.remove(u);break}e.dom.isEmpty(o)||Un.insertAfter(o,n),Un.insertAfter(s,n),w(e.dom,t.parentNode)&&(a=t.parentNode,v.each(i,function(e){a.parentNode.insertBefore(e,t.parentNode)}),Un.remove(a)),Un.remove(t),w(e.dom,n)&&Un.remove(n)},jn=function(e){en(e,"dt")&&hn(e,"dd")},Hn=function(r,e,n){Z(n,"Indent"===e?jn:function(e){return n=r,void(en(t=e,"dd")?hn(t,"dt"):en(t,"dt")&&nn(t).each(function(e){return Fn(n,e.dom(),t.dom())}));var n,t})},$n=function(e,n){var t=J(ve.getSelectedListRoots(e),ye.fromDom),r=J(ve.getSelectedDlItems(e),ye.fromDom),o=!1;if(t.length||r.length){var i=e.selection.getBookmark();Mn(e,t,n),Hn(e,n,r),e.selection.moveToBookmark(i),e.selection.setRng(x(e.selection.getRng())),e.nodeChanged(),o=!0}return o},qn=function(e){return $n(e,"Indent")},Wn=function(e){return $n(e,"Outdent")},Vn=function(e){return $n(e,"Flatten")},zn=function(t,e){v.each(e,function(e,n){t.setAttribute(n,e)})},Kn=function(e,n,t){var r,o,i,u,s,a,c;r=e,o=n,u=(i=t)["list-style-type"]?i["list-style-type"]:null,r.setStyle(o,"list-style-type",u),s=e,zn(a=n,(c=t)["list-attributes"]),v.each(s.select("li",a),function(e){zn(e,c["list-item-attributes"])})},Xn=function(e,n,t,r){var o,i;for(o=n[t?"startContainer":"endContainer"],i=n[t?"startOffset":"endOffset"],1===o.nodeType&&(o=o.childNodes[Math.min(i,o.childNodes.length-1)]||o),!t&&T(o.nextSibling)&&(o=o.nextSibling);o.parentNode!==r;){if(E(e,o))return o;if(/^(TD|TH)$/.test(o.parentNode.nodeName))return o;o=o.parentNode}return o},Qn=function(f,d,l){void 0===l&&(l={});var e,n=f.selection.getRng(!0),m="LI",t=ve.getClosestListRootElm(f,f.selection.getStart(!0)),g=f.dom;"false"!==g.getContentEditable(f.selection.getNode())&&("DL"===(d=d.toUpperCase())&&(m="DT"),e=I(n),v.each(function(t,e,r){for(var o,i=[],u=t.dom,n=Xn(t,e,!0,r),s=Xn(t,e,!1,r),a=[],c=n;c&&(a.push(c),c!==s);c=c.nextSibling);return v.each(a,function(e){if(E(t,e))return i.push(e),void(o=null);if(u.isBlock(e)||T(e))return T(e)&&u.remove(e),void(o=null);var n=e.nextSibling;p.isBookmarkNode(e)&&(E(t,n)||!n&&e.parentNode===r)?o=null:(o||(o=u.create("p"),e.parentNode.insertBefore(o,e),i.push(o)),o.appendChild(e))}),i}(f,n,t),function(e){var n,t,r,o,i,u,s,a,c;(t=e.previousSibling)&&N(t)&&t.nodeName===d&&(r=t,o=l,i=g.getStyle(r,"list-style-type"),u=o?o["list-style-type"]:"",i===(u=null===u?"":u))?(n=t,e=g.rename(e,m),t.appendChild(e)):(n=g.create(d),e.parentNode.insertBefore(n,e),n.appendChild(e),e=g.rename(e,m)),s=g,a=e,c=["margin","margin-right","margin-bottom","margin-left","margin-top","padding","padding-right","padding-bottom","padding-left","padding-top"],v.each(c,function(e){var n;return s.setStyle(a,((n={})[e]="",n))}),Kn(g,n,l),Gn(f.dom,n)}),f.selection.setRng(_(e)))},Yn=function(e,n,t){return a=t,(s=n)&&a&&N(s)&&s.nodeName===a.nodeName&&(i=n,u=t,(o=e).getStyle(i,"list-style-type",!0)===o.getStyle(u,"list-style-type",!0))&&(r=t,n.className===r.className);var r,o,i,u,s,a},Gn=function(e,n){var t,r;if(t=n.nextSibling,Yn(e,n,t)){for(;r=t.firstChild;)n.appendChild(r);e.remove(t)}if(t=n.previousSibling,Yn(e,n,t)){for(;r=t.lastChild;)n.insertBefore(r,n.firstChild);e.remove(t)}},Jn=function(n,e,t,r,o){if(e.nodeName!==r||Zn(o)){var i=I(n.selection.getRng(!0));v.each([e].concat(t),function(e){!function(e,n,t,r){if(n.nodeName!==t){var o=e.rename(n,t);Kn(e,o,r)}else Kn(e,n,r)}(n.dom,e,r,o)}),n.selection.setRng(_(i))}else Vn(n)},Zn=function(e){return"list-style-type"in e},et={toggleList:function(e,n,t){var r=ve.getParentList(e),o=ve.getSelectedSubLists(e);t=t||{},r&&0<o.length?Jn(e,r,o,n,t):function(e,n,t,r){if(n!==e.getBody())if(n)if(n.nodeName!==t||Zn(r)){var o=I(e.selection.getRng(!0));Kn(e.dom,n,r),Gn(e.dom,e.dom.rename(n,t)),e.selection.setRng(_(o))}else Vn(e);else Qn(e,t,r)}(e,r,n,t)},mergeWithAdjacentLists:Gn},nt=g.DOM,tt=function(e,n){var t,r=n.parentNode;"LI"===r.nodeName&&r.firstChild===n&&((t=r.previousSibling)&&"LI"===t.nodeName?(t.appendChild(n),w(e,r)&&nt.remove(r)):nt.setStyle(r,"listStyleType","none")),N(r)&&(t=r.previousSibling)&&"LI"===t.nodeName&&t.appendChild(n)},rt=function(n,e){v.each(v.grep(n.select("ol,ul",e)),function(e){tt(n,e)})},ot=function(e,n,t,r){var o,i,u=n.startContainer,s=n.startOffset;if(3===u.nodeType&&(t?s<u.data.length:0<s))return u;for(o=e.schema.getNonEmptyElements(),1===u.nodeType&&(u=d.getNode(u,s)),i=new l(u,r),t&&D(e.dom,u)&&i.next();u=i[t?"next":"prev2"]();){if("LI"===u.nodeName&&!u.hasChildNodes())return u;if(o[u.nodeName])return u;if(3===u.nodeType&&0<u.data.length)return u}},it=function(e,n){var t=n.childNodes;return 1===t.length&&!N(t[0])&&e.isBlock(t[0])},ut=function(e,n,t){var r,o,i,u;if(o=it(e,t)?t.firstChild:t,it(i=e,u=n)&&i.remove(u.firstChild,!0),!w(e,n,!0))for(;r=n.firstChild;)o.appendChild(r)},st=function(n,e,t){var r,o,i=e.parentNode;if(k(n,e)&&k(n,t)){N(t.lastChild)&&(o=t.lastChild),i===t.lastChild&&T(i.previousSibling)&&n.remove(i.previousSibling),(r=t.lastChild)&&T(r)&&e.hasChildNodes()&&n.remove(r),w(n,t,!0)&&n.$(t).empty(),ut(n,e,t),o&&t.appendChild(o);var u=Ze(ye.fromDom(t),ye.fromDom(e))?n.getParents(e,N,t):[];n.remove(e),Z(u,function(e){w(n,e)&&e!==n.getRoot()&&n.remove(e)})}},at=function(e,n,t,r){var o,i,u,s=e.dom;if(s.isEmpty(r))i=t,u=r,(o=e).dom.$(u).empty(),st(o.dom,i,u),o.selection.setCursorLocation(u);else{var a=I(n);st(s,t,r),e.selection.setRng(_(a))}},ct=function(e,n){var t,r,o,i=e.dom,u=e.selection,s=u.getStart(),a=ve.getClosestListRootElm(e,s),c=i.getParent(u.getStart(),"LI",a);if(c){if((t=c.parentNode)===e.getBody()&&w(i,t))return!0;if(r=x(u.getRng(!0)),(o=i.getParent(ot(e,r,n,a),"LI",a))&&o!==c)return n?at(e,r,o,c):function(e,n,t,r){var o=I(n);st(e.dom,t,r);var i=_(o);e.selection.setRng(i)}(e,r,c,o),!0;if(!o&&!n)return Vn(e),!0}return!1},ft=function(e,n){return ct(e,n)||function(o,i){var u=o.dom,e=o.selection.getStart(),s=ve.getClosestListRootElm(o,e),a=u.getParent(e,u.isBlock,s);if(a&&u.isEmpty(a)){var n=x(o.selection.getRng(!0)),c=u.getParent(ot(o,n,i,s),"LI",s);if(c)return o.undoManager.transact(function(){var e,n,t,r;n=a,t=s,r=(e=u).getParent(n.parentNode,e.isBlock,t),e.remove(n),r&&e.isEmpty(r)&&e.remove(r),et.mergeWithAdjacentLists(u,c.parentNode),o.selection.select(c,!0),o.selection.collapse(i)}),!0}return!1}(e,n)},dt=function(e,n){return e.selection.isCollapsed()?ft(e,n):(r=(t=e).selection.getStart(),o=ve.getClosestListRootElm(t,r),!!(t.dom.getParent(r,"LI,DT,DD",o)||0<ve.getSelectedListItems(t).length)&&(t.undoManager.transact(function(){t.execCommand("Delete"),rt(t.dom,t.getBody())}),!0));var t,r,o},lt=function(n){n.on("keydown",function(e){e.keyCode===m.BACKSPACE?dt(n,!1)&&e.preventDefault():e.keyCode===m.DELETE&&dt(n,!0)&&e.preventDefault()})},mt=dt,gt=function(n){return{backspaceDelete:function(e){mt(n,e)}}},pt=function(n,t){return function(){var e=n.dom.getParent(n.selection.getStart(),"UL,OL,DL");return e&&e.nodeName===t}},vt=function(t){t.on("BeforeExecCommand",function(e){var n=e.command.toLowerCase();"indent"===n?qn(t):"outdent"===n&&Wn(t)}),t.addCommand("InsertUnorderedList",function(e,n){et.toggleList(t,"UL",n)}),t.addCommand("InsertOrderedList",function(e,n){et.toggleList(t,"OL",n)}),t.addCommand("InsertDefinitionList",function(e,n){et.toggleList(t,"DL",n)}),t.addCommand("RemoveList",function(){Vn(t)}),t.addQueryStateHandler("InsertUnorderedList",pt(t,"UL")),t.addQueryStateHandler("InsertOrderedList",pt(t,"OL")),t.addQueryStateHandler("InsertDefinitionList",pt(t,"DL"))},ht=function(e){return e.getParam("lists_indent_on_tab",!0)},yt=function(e){var n;ht(e)&&(n=e).on("keydown",function(e){e.keyCode!==m.TAB||m.metaKeyPressed(e)||n.undoManager.transact(function(){(e.shiftKey?Wn(n):qn(n))&&e.preventDefault()})}),lt(e)},Nt=function(n,i){return function(e){var o=e.control;n.on("NodeChange",function(e){var n=function(e,n){for(var t=0;t<e.length;t++)if(n(e[t]))return t;return-1}(e.parents,b),t=-1!==n?e.parents.slice(0,n):e.parents,r=v.grep(t,N);o.active(0<r.length&&r[0].nodeName===i)})}},St=function(e){var n,t,r;t="advlist",r=(n=e).settings.plugins?n.settings.plugins:"",-1===v.inArray(r.split(/[ ,]/),t)&&(e.addButton("numlist",{active:!1,title:"Numbered list",cmd:"InsertOrderedList",onPostRender:Nt(e,"OL")}),e.addButton("bullist",{active:!1,title:"Bullet list",cmd:"InsertUnorderedList",onPostRender:Nt(e,"UL")})),e.addButton("indent",{icon:"indent",title:"Increase indent",cmd:"Indent"})};f.add("lists",function(e){return yt(e),St(e),vt(e),gt(e)})}(window);
\ No newline at end of file
diff --git a/lib/web/tiny_mce_4/plugins/media/plugin.min.js b/lib/web/tiny_mce_4/plugins/media/plugin.min.js
index 0dd06ba6816d9..e78d8efc11915 100644
--- a/lib/web/tiny_mce_4/plugins/media/plugin.min.js
+++ b/lib/web/tiny_mce_4/plugins/media/plugin.min.js
@@ -1 +1 @@
-!function(){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager"),o=tinymce.util.Tools.resolve("tinymce.Env"),v=tinymce.util.Tools.resolve("tinymce.util.Tools"),w=function(e){return e.getParam("media_scripts")},b=function(e){return e.getParam("audio_template_callback")},y=function(e){return e.getParam("video_template_callback")},n=function(e){return e.getParam("media_live_embeds",!0)},t=function(e){return e.getParam("media_filter_html",!0)},s=function(e){return e.getParam("media_url_resolver")},m=function(e){return e.getParam("media_alt_source",!0)},d=function(e){return e.getParam("media_poster",!0)},h=function(e){return e.getParam("media_dimensions",!0)},p=tinymce.util.Tools.resolve("tinymce.html.SaxParser"),r=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),x=function(e,t){if(e)for(var r=0;r<e.length;r++)if(-1!==t.indexOf(e[r].filter))return e[r]},i=function(t){return function(e){return e?e.style[t].replace(/px$/,""):""}},a=function(i){return function(e,t){var r;e&&(e.style[i]=/^[0-9.]+$/.test(r=t)?r+"px":r)}},f={getMaxWidth:i("maxWidth"),getMaxHeight:i("maxHeight"),setMaxWidth:a("maxWidth"),setMaxHeight:a("maxHeight")},u=r.DOM,l=function(e){return u.getAttrib(e,"data-ephox-embed-iri")},j=function(e,t){return c=t,s=u.createFragment(c),""!==l(s.firstChild)?(o=t,n=u.createFragment(o).firstChild,{type:"ephox-embed-iri",source1:l(n),source2:"",poster:"",width:f.getMaxWidth(n),height:f.getMaxHeight(n)}):(i=e,r=t,p({validate:(a={},!1),allow_conditional_comments:!0,special:"script,noscript",start:function(e,t){if(a.source1||"param"!==e||(a.source1=t.map.movie),"iframe"!==e&&"object"!==e&&"embed"!==e&&"video"!==e&&"audio"!==e||(a.type||(a.type=e),a=v.extend(t.map,a)),"script"===e){var r=x(i,t.map.src);if(!r)return;a={type:"script",source1:t.map.src,width:r.width,height:r.height}}"source"===e&&(a.source1?a.source2||(a.source2=t.map.src):a.source1=t.map.src),"img"!==e||a.poster||(a.poster=t.map.src)}}).parse(r),a.source1=a.source1||a.src||a.data,a.source2=a.source2||"",a.poster=a.poster||"",a);var i,r,a,o,n,c,s},g=tinymce.util.Tools.resolve("tinymce.util.Promise"),M=function(e){var t={mp3:"audio/mpeg",wav:"audio/wav",mp4:"video/mp4",webm:"video/webm",ogg:"video/ogg",swf:"application/x-shockwave-flash"}[e.toLowerCase().split(".").pop()];return t||""},_=tinymce.util.Tools.resolve("tinymce.html.Writer"),C=tinymce.util.Tools.resolve("tinymce.html.Schema"),S=r.DOM,F=function(e,t){var r,i,a,o;for(r in t)if(a=""+t[r],e.map[r])for(i=e.length;i--;)(o=e[i]).name===r&&(a?(e.map[r]=a,o.value=a):(delete e.map[r],e.splice(i,1)));else a&&(e.push({name:r,value:a}),e.map[r]=a)},k=function(e,t){var r,i,a=S.createFragment(e).firstChild;return f.setMaxWidth(a,t.width),f.setMaxHeight(a,t.height),r=a.outerHTML,i=_(),p(i).parse(r),i.getContent()},A=function(e,t,r){return u=e,l=S.createFragment(u),""!==S.getAttrib(l.firstChild,"data-ephox-embed-iri")?k(e,t):(i=e,a=t,o=r,c=_(),p({validate:!1,allow_conditional_comments:!(s=0),special:"script,noscript",comment:function(e){c.comment(e)},cdata:function(e){c.cdata(e)},text:function(e,t){c.text(e,t)},start:function(e,t,r){switch(e){case"video":case"object":case"embed":case"img":case"iframe":a.height!==undefined&&a.width!==undefined&&F(t,{width:a.width,height:a.height})}if(o)switch(e){case"video":F(t,{poster:a.poster,src:""}),a.source2&&F(t,{src:""});break;case"iframe":F(t,{src:a.source1});break;case"source":if(++s<=2&&(F(t,{src:a["source"+s],type:a["source"+s+"mime"]}),!a["source"+s]))return;break;case"img":if(!a.poster)return;n=!0}c.start(e,t,r)},end:function(e){if("video"===e&&o)for(var t=1;t<=2;t++)if(a["source"+t]){var r=[];r.map={},s<t&&(F(r,{src:a["source"+t],type:a["source"+t+"mime"]}),c.start("source",r,!0))}if(a.poster&&"object"===e&&o&&!n){var i=[];i.map={},F(i,{src:a.poster,width:a.width,height:a.height}),c.start("img",i,!0)}c.end(e)}},C({})).parse(i),c.getContent());var i,a,o,n,c,s,u,l},N=[{regex:/youtu\.be\/([\w\-_\?&=.]+)/i,type:"iframe",w:560,h:314,url:"//www.youtube.com/embed/$1",allowFullscreen:!0},{regex:/youtube\.com(.+)v=([^&]+)(&([a-z0-9&=\-_]+))?/i,type:"iframe",w:560,h:314,url:"//www.youtube.com/embed/$2?$4",allowFullscreen:!0},{regex:/youtube.com\/embed\/([a-z0-9\?&=\-_]+)/i,type:"iframe",w:560,h:314,url:"//www.youtube.com/embed/$1",allowFullscreen:!0},{regex:/vimeo\.com\/([0-9]+)/,type:"iframe",w:425,h:350,url:"//player.vimeo.com/video/$1?title=0&byline=0&portrait=0&color=8dc7dc",allowFullscreen:!0},{regex:/vimeo\.com\/(.*)\/([0-9]+)/,type:"iframe",w:425,h:350,url:"//player.vimeo.com/video/$2?title=0&amp;byline=0",allowFullscreen:!0},{regex:/maps\.google\.([a-z]{2,3})\/maps\/(.+)msid=(.+)/,type:"iframe",w:425,h:350,url:'//maps.google.com/maps/ms?msid=$2&output=embed"',allowFullscreen:!1},{regex:/dailymotion\.com\/video\/([^_]+)/,type:"iframe",w:480,h:270,url:"//www.dailymotion.com/embed/video/$1",allowFullscreen:!0},{regex:/dai\.ly\/([^_]+)/,type:"iframe",w:480,h:270,url:"//www.dailymotion.com/embed/video/$1",allowFullscreen:!0}],c=function(r,e){var i=v.extend({},e);if(!i.source1&&(v.extend(i,j(w(r),i.embed)),!i.source1))return"";i.source2||(i.source2=""),i.poster||(i.poster=""),i.source1=r.convertURL(i.source1,"source"),i.source2=r.convertURL(i.source2,"source"),i.source1mime=M(i.source1),i.source2mime=M(i.source2),i.poster=r.convertURL(i.poster,"poster");var t,a,o=(t=i.source1,0<(a=N.filter(function(e){return e.regex.test(t)})).length?v.extend({},a[0],{url:function(e,t){for(var r=e.regex.exec(t),i=e.url,a=function(e){i=i.replace("$"+e,function(){return r[e]?r[e]:""})},o=0;o<r.length;o++)a(o);return i.replace(/\?$/,"")}(a[0],t)}):null);if(o&&(i.source1=o.url,i.type=o.type,i.allowFullscreen=o.allowFullscreen,i.width=i.width||o.w,i.height=i.height||o.h),i.embed)return A(i.embed,i,!0);var n=x(w(r),i.source1);n&&(i.type="script",i.width=n.width,i.height=n.height);var c,s,u,l,m,d,h,p,f=b(r),g=y(r);return i.width=i.width||300,i.height=i.height||150,v.each(i,function(e,t){i[t]=r.dom.encode(e)}),"iframe"===i.type?(p=(h=i).allowFullscreen?' allowFullscreen="1"':"",'<iframe src="'+h.source1+'" width="'+h.width+'" height="'+h.height+'"'+p+"></iframe>"):"application/x-shockwave-flash"===i.source1mime?(d='<object data="'+(m=i).source1+'" width="'+m.width+'" height="'+m.height+'" type="application/x-shockwave-flash">',m.poster&&(d+='<img src="'+m.poster+'" width="'+m.width+'" height="'+m.height+'" />'),d+="</object>"):-1!==i.source1mime.indexOf("audio")?(u=i,(l=f)?l(u):'<audio controls="controls" src="'+u.source1+'">'+(u.source2?'\n<source src="'+u.source2+'"'+(u.source2mime?' type="'+u.source2mime+'"':"")+" />\n":"")+"</audio>"):"script"===i.type?'<script src="'+i.source1+'"><\/script>':(c=i,(s=g)?s(c):'<video width="'+c.width+'" height="'+c.height+'"'+(c.poster?' poster="'+c.poster+'"':"")+' controls="controls">\n<source src="'+c.source1+'"'+(c.source1mime?' type="'+c.source1mime+'"':"")+" />\n"+(c.source2?'<source src="'+c.source2+'"'+(c.source2mime?' type="'+c.source2mime+'"':"")+" />\n":"")+"</video>")},O={},P=function(t){return function(e){return c(t,e)}},T=function(e,t){var r,i,a,o,n,c=s(e);return c?(a=t,o=P(e),n=c,new g(function(t,e){var r=function(e){return e.html&&(O[a.source1]=e),t({url:a.source1,html:e.html?e.html:o(a)})};O[a.source1]?r(O[a.source1]):n({url:a.source1},r,e)})):(r=t,i=P(e),new g(function(e){e({html:i(r),url:r.source1})}))},$=function(e){return O.hasOwnProperty(e)},z=function(e,t){e.state.set("oldVal",e.value()),t.state.set("oldVal",t.value())},L=function(e,t){var r=e.find("#width")[0],i=e.find("#height")[0],a=e.find("#constrain")[0];r&&i&&a&&t(r,i,a.checked())},H=function(e,t,r){var i=e.state.get("oldVal"),a=t.state.get("oldVal"),o=e.value(),n=t.value();r&&i&&a&&o&&n&&(o!==i?(n=Math.round(o/i*n),isNaN(n)||t.value(n)):(o=Math.round(n/a*o),isNaN(o)||e.value(o))),z(e,t)},W=function(e){L(e,H)},J=function(e){var t=function(){e(function(e){W(e)})};return{type:"container",label:"Dimensions",layout:"flex",align:"center",spacing:5,items:[{name:"width",type:"textbox",maxLength:5,size:5,onchange:t,ariaLabel:"Width"},{type:"label",text:"x"},{name:"height",type:"textbox",maxLength:5,size:5,onchange:t,ariaLabel:"Height"},{name:"constrain",type:"checkbox",checked:!0,text:"Constrain proportions"}]}},R=function(e){L(e,z)},D=W,E=o.ie&&o.ie<=8?"onChange":"onInput",I=function(r){return function(e){var t=e&&e.msg?"Media embed handler error: "+e.msg:"Media embed handler threw unknown error.";r.notificationManager.open({type:"error",text:t})}},U=function(a,o){return function(e){var t=e.html,r=a.find("#embed")[0],i=v.extend(j(w(o),t),{source1:e.url});a.fromJSON(i),r&&(r.value(t),D(a))}},V=function(e,t){var r=e.dom.select("img[data-mce-object]");e.insertContent(t),function(e,t){var r,i,a=e.dom.select("img[data-mce-object]");for(r=0;r<t.length;r++)for(i=a.length-1;0<=i;i--)t[r]===a[i]&&a.splice(i,1);e.selection.select(a[0])}(e,r),e.nodeChanged()},B=function(i){var a,t,e,r,o,n=[{name:"source1",type:"filepicker",filetype:"media",size:40,autofocus:!0,label:"Source",onpaste:function(){setTimeout(function(){T(i,a.toJSON()).then(U(a,i))["catch"](I(i))},1)},onchange:function(e){var r,t;T(i,a.toJSON()).then(U(a,i))["catch"](I(i)),r=a,t=e.meta,v.each(t,function(e,t){r.find("#"+t).value(e)})},onbeforecall:function(e){e.meta=a.toJSON()}}],c=[];if(m(i)&&c.push({name:"source2",type:"filepicker",filetype:"media",size:40,label:"Alternative source"}),d(i)&&c.push({name:"poster",type:"filepicker",filetype:"image",size:40,label:"Poster"}),h(i)){var s=J(function(e){e(a),t=a.toJSON(),a.find("#embed").value(A(t.embed,t))});n.push(s)}r=(e=i).selection.getNode(),o=r.getAttribute("data-ephox-embed-iri"),t=o?{source1:o,"data-ephox-embed-iri":o,width:f.getMaxWidth(r),height:f.getMaxHeight(r)}:r.getAttribute("data-mce-object")?j(w(e),e.serializer.serialize(r,{selection:!0})):{};var u={id:"mcemediasource",type:"textbox",flex:1,name:"embed",value:function(e){var t=e.selection.getNode();if(t.getAttribute("data-mce-object")||t.getAttribute("data-ephox-embed-iri"))return e.selection.getContent()}(i),multiline:!0,rows:5,label:"Source"};u[E]=function(){t=v.extend({},j(w(i),this.value())),this.parent().parent().fromJSON(t)};var l=[{title:"General",type:"form",items:n},{title:"Embed",type:"container",layout:"flex",direction:"column",align:"stretch",padding:10,spacing:10,items:[{type:"label",text:"Paste your embed code below:",forId:"mcemediasource"},u]}];0<c.length&&l.push({title:"Advanced",type:"form",items:c}),a=i.windowManager.open({title:"Insert/edit media",data:t,bodyType:"tabpanel",body:l,onSubmit:function(){var t,e;D(a),t=i,(e=a.toJSON()).embed=A(e.embed,e),e.embed&&$(e.source1)?V(t,e.embed):T(t,e).then(function(e){V(t,e.html)})["catch"](I(t))}}),R(a)},G=function(e){return{showDialog:function(){B(e)}}},q=function(e){e.addCommand("mceMedia",function(){B(e)})},K=tinymce.util.Tools.resolve("tinymce.html.Node"),Q=function(a,e){if(!1===t(a))return e;var o,n=_();return p({validate:!1,allow_conditional_comments:!1,special:"script,noscript",comment:function(e){n.comment(e)},cdata:function(e){n.cdata(e)},text:function(e,t){n.text(e,t)},start:function(e,t,r){if(o=!0,"script"!==e&&"noscript"!==e){for(var i=0;i<t.length;i++){if(0===t[i].name.indexOf("on"))return;"style"===t[i].name&&(t[i].value=a.dom.serializeStyle(a.dom.parseStyle(t[i].value),e))}n.start(e,t,r),o=!1}},end:function(e){o||n.end(e)}},C({})).parse(e),n.getContent()},X=function(e,t){var r,i=t.name;return(r=new K("img",1)).shortEnded=!0,Z(e,t,r),r.attr({width:t.attr("width")||"300",height:t.attr("height")||("audio"===i?"30":"150"),style:t.attr("style"),src:o.transparentSrc,"data-mce-object":i,"class":"mce-object mce-object-"+i}),r},Y=function(e,t){var r,i,a,o=t.name;return(r=new K("span",1)).attr({contentEditable:"false",style:t.attr("style"),"data-mce-object":o,"class":"mce-preview-object mce-object-"+o}),Z(e,t,r),(i=new K(o,1)).attr({src:t.attr("src"),allowfullscreen:t.attr("allowfullscreen"),style:t.attr("style"),"class":t.attr("class"),width:t.attr("width"),height:t.attr("height"),frameborder:"0"}),(a=new K("span",1)).attr("class","mce-shim"),r.append(i),r.append(a),r},Z=function(e,t,r){var i,a,o,n,c;for(n=(o=t.attributes).length;n--;)i=o[n].name,a=o[n].value,"width"!==i&&"height"!==i&&"style"!==i&&("data"!==i&&"src"!==i||(a=e.convertURL(a,i)),r.attr("data-mce-p-"+i,a));(c=t.firstChild&&t.firstChild.value)&&(r.attr("data-mce-html",escape(Q(e,c))),r.firstChild=null)},ee=function(e){for(;e=e.parent;)if(e.attr("data-ephox-embed-iri"))return!0;return!1},te=function(a){return function(e){for(var t,r,i=e.length;i--;)(t=e[i]).parent&&(t.parent.attr("data-mce-object")||("script"!==t.name||(r=x(w(a),t.attr("src"))))&&(r&&(r.width&&t.attr("width",r.width.toString()),r.height&&t.attr("height",r.height.toString())),"iframe"===t.name&&n(a)&&o.ceFalse?ee(t)||t.replace(Y(a,t)):ee(t)||t.replace(X(a,t))))}},re=function(d){d.on("preInit",function(){var t=d.schema.getSpecialElements();v.each("video audio iframe object".split(" "),function(e){t[e]=new RegExp("</"+e+"[^>]*>","gi")});var r=d.schema.getBoolAttrs();v.each("webkitallowfullscreen mozallowfullscreen allowfullscreen".split(" "),function(e){r[e]={}}),d.parser.addNodeFilter("iframe,video,audio,object,embed,script",te(d)),d.serializer.addAttributeFilter("data-mce-object",function(e,t){for(var r,i,a,o,n,c,s,u,l=e.length;l--;)if((r=e[l]).parent){for(s=r.attr(t),i=new K(s,1),"audio"!==s&&"script"!==s&&((u=r.attr("class"))&&-1!==u.indexOf("mce-preview-object")?i.attr({width:r.firstChild.attr("width"),height:r.firstChild.attr("height")}):i.attr({width:r.attr("width"),height:r.attr("height")})),i.attr({style:r.attr("style")}),a=(o=r.attributes).length;a--;){var m=o[a].name;0===m.indexOf("data-mce-p-")&&i.attr(m.substr(11),o[a].value)}"script"===s&&i.attr("type","text/javascript"),(n=r.attr("data-mce-html"))&&((c=new K("#text",3)).raw=!0,c.value=Q(d,unescape(n)),i.append(c)),r.replace(i)}})}),d.on("setContent",function(){d.$("span.mce-preview-object").each(function(e,t){var r=d.$(t);0===r.find("span.mce-shim",t).length&&r.append('<span class="mce-shim"></span>')})})},ie=function(e){e.on("ResolveName",function(e){var t;1===e.target.nodeType&&(t=e.target.getAttribute("data-mce-object"))&&(e.name=t)})},ae=function(t){t.on("click keyup",function(){var e=t.selection.getNode();e&&t.dom.hasClass(e,"mce-preview-object")&&t.dom.getAttrib(e,"data-mce-selected")&&e.setAttribute("data-mce-selected","2")}),t.on("ObjectSelected",function(e){var t=e.target.getAttribute("data-mce-object");"audio"!==t&&"script"!==t||e.preventDefault()}),t.on("objectResized",function(e){var t,r=e.target;r.getAttribute("data-mce-object")&&(t=r.getAttribute("data-mce-html"))&&(t=unescape(t),r.setAttribute("data-mce-html",escape(A(t,{width:e.width,height:e.height}))))})},oe=function(e){e.addButton("media",{tooltip:"Insert/edit media",cmd:"mceMedia",stateSelector:["img[data-mce-object]","span[data-mce-object]","div[data-ephox-embed-iri]"]}),e.addMenuItem("media",{icon:"media",text:"Media",cmd:"mceMedia",context:"insert",prependToContext:!0})};e.add("media",function(e){return q(e),oe(e),ie(e),re(e),ae(e),G(e)})}();
\ No newline at end of file
+!function(){"use strict";var e,t,r,n,i=tinymce.util.Tools.resolve("tinymce.PluginManager"),o=tinymce.util.Tools.resolve("tinymce.Env"),v=tinymce.util.Tools.resolve("tinymce.util.Tools"),w=function(e){return e.getParam("media_scripts")},b=function(e){return e.getParam("audio_template_callback")},y=function(e){return e.getParam("video_template_callback")},a=function(e){return e.getParam("media_live_embeds",!0)},u=function(e){return e.getParam("media_filter_html",!0)},s=function(e){return e.getParam("media_url_resolver")},m=function(e){return e.getParam("media_alt_source",!0)},d=function(e){return e.getParam("media_poster",!0)},h=function(e){return e.getParam("media_dimensions",!0)},f=function(e){var t=e,r=function(){return t};return{get:r,set:function(e){t=e},clone:function(){return f(r())}}},c=function(){},l=function(e){return function(){return e}},p=l(!1),g=l(!0),x=function(){return O},O=(e=function(e){return e.isNone()},n={fold:function(e,t){return e()},is:p,isSome:p,isNone:g,getOr:r=function(e){return e},getOrThunk:t=function(e){return e()},getOrDie:function(e){throw new Error(e||"error: getOrDie called on none.")},getOrNull:l(null),getOrUndefined:l(undefined),or:r,orThunk:t,map:x,each:c,bind:x,exists:p,forall:g,filter:x,equals:e,equals_:e,toArray:function(){return[]},toString:l("none()")},Object.freeze&&Object.freeze(n),n),j=function(r){var e=l(r),t=function(){return i},n=function(e){return e(r)},i={fold:function(e,t){return t(r)},is:function(e){return r===e},isSome:g,isNone:p,getOr:e,getOrThunk:e,getOrDie:e,getOrNull:e,getOrUndefined:e,or:t,orThunk:t,map:function(e){return j(e(r))},each:function(e){e(r)},bind:n,exists:n,forall:n,filter:function(e){return e(r)?i:O},toArray:function(){return[r]},toString:function(){return"some("+r+")"},equals:function(e){return e.is(r)},equals_:function(e,t){return e.fold(p,function(e){return t(r,e)})}};return i},_=x,S=function(e){return null===e||e===undefined?O:j(e)},k=Object.hasOwnProperty,N=function(e,t){return M(e,t)?S(e[t]):_()},M=function(e,t){return k.call(e,t)},T=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),z=tinymce.util.Tools.resolve("tinymce.html.SaxParser"),A=function(e,t){if(e)for(var r=0;r<e.length;r++)if(-1!==t.indexOf(e[r].filter))return e[r]},C=T.DOM,$=function(e){return e.replace(/px$/,"")},P=function(a,e){var c=f(!1),u={};return z({validate:!1,allow_conditional_comments:!0,special:"script,noscript",start:function(e,t){if(c.get());else if(M(t.map,"data-ephox-embed-iri"))c.set(!0),i=(n=t).map.style,o=i?C.parseStyle(i):{},u={type:"ephox-embed-iri",source1:n.map["data-ephox-embed-iri"],source2:"",poster:"",width:N(o,"max-width").map($).getOr(""),height:N(o,"max-height").map($).getOr("")};else{if(u.source1||"param"!==e||(u.source1=t.map.movie),"iframe"!==e&&"object"!==e&&"embed"!==e&&"video"!==e&&"audio"!==e||(u.type||(u.type=e),u=v.extend(t.map,u)),"script"===e){var r=A(a,t.map.src);if(!r)return;u={type:"script",source1:t.map.src,width:r.width,height:r.height}}"source"===e&&(u.source1?u.source2||(u.source2=t.map.src):u.source1=t.map.src),"img"!==e||u.poster||(u.poster=t.map.src)}var n,i,o}}).parse(e),u.source1=u.source1||u.src||u.data,u.source2=u.source2||"",u.poster=u.poster||"",u},F=tinymce.util.Tools.resolve("tinymce.util.Promise"),D=function(e){var t={mp3:"audio/mpeg",wav:"audio/wav",mp4:"video/mp4",webm:"video/webm",ogg:"video/ogg",swf:"application/x-shockwave-flash"}[e.toLowerCase().split(".").pop()];return t||""},L=tinymce.util.Tools.resolve("tinymce.html.Schema"),E=tinymce.util.Tools.resolve("tinymce.html.Writer"),J=T.DOM,R=function(e){return/^[0-9.]+$/.test(e)?e+"px":e},U=function(e,t){for(var r in t){var n=""+t[r];if(e.map[r])for(var i=e.length;i--;){var o=e[i];o.name===r&&(n?(e.map[r]=n,o.value=n):(delete e.map[r],e.splice(i,1)))}else n&&(e.push({name:r,value:n}),e.map[r]=n)}},W=function(e,c,u){var s,l=E(),m=f(!1),d=0;return z({validate:!1,allow_conditional_comments:!0,special:"script,noscript",comment:function(e){l.comment(e)},cdata:function(e){l.cdata(e)},text:function(e,t){l.text(e,t)},start:function(e,t,r){if(m.get());else if(M(t.map,"data-ephox-embed-iri"))m.set(!0),n=c,o=(i=t).map.style,(a=o?J.parseStyle(o):{})["max-width"]=R(n.width),a["max-height"]=R(n.height),U(i,{style:J.serializeStyle(a)});else{switch(e){case"video":case"object":case"embed":case"img":case"iframe":c.height!==undefined&&c.width!==undefined&&U(t,{width:c.width,height:c.height})}if(u)switch(e){case"video":U(t,{poster:c.poster,src:""}),c.source2&&U(t,{src:""});break;case"iframe":U(t,{src:c.source1});break;case"source":if(++d<=2&&(U(t,{src:c["source"+d],type:c["source"+d+"mime"]}),!c["source"+d]))return;break;case"img":if(!c.poster)return;s=!0}}var n,i,o,a;l.start(e,t,r)},end:function(e){if(!m.get()){if("video"===e&&u)for(var t=1;t<=2;t++)if(c["source"+t]){var r=[];r.map={},d<t&&(U(r,{src:c["source"+t],type:c["source"+t+"mime"]}),l.start("source",r,!0))}if(c.poster&&"object"===e&&u&&!s){var n=[];n.map={},U(n,{src:c.poster,width:c.width,height:c.height}),l.start("img",n,!0)}}l.end(e)}},L({})).parse(e),l.getContent()},H=[{regex:/youtu\.be\/([\w\-_\?&=.]+)/i,type:"iframe",w:560,h:314,url:"//www.youtube.com/embed/$1",allowFullscreen:!0},{regex:/youtube\.com(.+)v=([^&]+)(&([a-z0-9&=\-_]+))?/i,type:"iframe",w:560,h:314,url:"//www.youtube.com/embed/$2?$4",allowFullscreen:!0},{regex:/youtube.com\/embed\/([a-z0-9\?&=\-_]+)/i,type:"iframe",w:560,h:314,url:"//www.youtube.com/embed/$1",allowFullscreen:!0},{regex:/vimeo\.com\/([0-9]+)/,type:"iframe",w:425,h:350,url:"//player.vimeo.com/video/$1?title=0&byline=0&portrait=0&color=8dc7dc",allowFullscreen:!0},{regex:/vimeo\.com\/(.*)\/([0-9]+)/,type:"iframe",w:425,h:350,url:"//player.vimeo.com/video/$2?title=0&amp;byline=0",allowFullscreen:!0},{regex:/maps\.google\.([a-z]{2,3})\/maps\/(.+)msid=(.+)/,type:"iframe",w:425,h:350,url:'//maps.google.com/maps/ms?msid=$2&output=embed"',allowFullscreen:!1},{regex:/dailymotion\.com\/video\/([^_]+)/,type:"iframe",w:480,h:270,url:"//www.dailymotion.com/embed/video/$1",allowFullscreen:!0},{regex:/dai\.ly\/([^_]+)/,type:"iframe",w:480,h:270,url:"//www.dailymotion.com/embed/video/$1",allowFullscreen:!0}],I=function(r,e){var n=v.extend({},e);if(!n.source1&&(v.extend(n,P(w(r),n.embed)),!n.source1))return"";n.source2||(n.source2=""),n.poster||(n.poster=""),n.source1=r.convertURL(n.source1,"source"),n.source2=r.convertURL(n.source2,"source"),n.source1mime=D(n.source1),n.source2mime=D(n.source2),n.poster=r.convertURL(n.poster,"poster");var t,i,o=(t=n.source1,0<(i=H.filter(function(e){return e.regex.test(t)})).length?v.extend({},i[0],{url:function(e,t){for(var r=e.regex.exec(t),n=e.url,i=function(e){n=n.replace("$"+e,function(){return r[e]?r[e]:""})},o=0;o<r.length;o++)i(o);return n.replace(/\?$/,"")}(i[0],t)}):null);if(o&&(n.source1=o.url,n.type=o.type,n.allowFullscreen=o.allowFullscreen,n.width=n.width||o.w,n.height=n.height||o.h),n.embed)return W(n.embed,n,!0);var a=A(w(r),n.source1);a&&(n.type="script",n.width=a.width,n.height=a.height);var c,u,s,l,m,d,h,f,p=b(r),g=y(r);return n.width=n.width||300,n.height=n.height||150,v.each(n,function(e,t){n[t]=r.dom.encode(e)}),"iframe"===n.type?(f=(h=n).allowFullscreen?' allowFullscreen="1"':"",'<iframe src="'+h.source1+'" width="'+h.width+'" height="'+h.height+'"'+f+"></iframe>"):"application/x-shockwave-flash"===n.source1mime?(d='<object data="'+(m=n).source1+'" width="'+m.width+'" height="'+m.height+'" type="application/x-shockwave-flash">',m.poster&&(d+='<img src="'+m.poster+'" width="'+m.width+'" height="'+m.height+'" />'),d+="</object>"):-1!==n.source1mime.indexOf("audio")?(s=n,(l=p)?l(s):'<audio controls="controls" src="'+s.source1+'">'+(s.source2?'\n<source src="'+s.source2+'"'+(s.source2mime?' type="'+s.source2mime+'"':"")+" />\n":"")+"</audio>"):"script"===n.type?'<script src="'+n.source1+'"><\/script>':(c=n,(u=g)?u(c):'<video width="'+c.width+'" height="'+c.height+'"'+(c.poster?' poster="'+c.poster+'"':"")+' controls="controls">\n<source src="'+c.source1+'"'+(c.source1mime?' type="'+c.source1mime+'"':"")+" />\n"+(c.source2?'<source src="'+c.source2+'"'+(c.source2mime?' type="'+c.source2mime+'"':"")+" />\n":"")+"</video>")},q={},V=function(t){return function(e){return I(t,e)}},B=function(e,t){var r,n,i,o,a,c=s(e);return c?(i=t,o=V(e),a=c,new F(function(t,e){var r=function(e){return e.html&&(q[i.source1]=e),t({url:i.source1,html:e.html?e.html:o(i)})};q[i.source1]?r(q[i.source1]):a({url:i.source1},r,e)})):(r=t,n=V(e),new F(function(e){e({html:n(r),url:r.source1})}))},G=function(e){return q.hasOwnProperty(e)},K=function(t){return function(e){return e?e.style[t].replace(/px$/,""):""}},Q=function(n){return function(e,t){var r;e&&(e.style[n]=/^[0-9.]+$/.test(r=t)?r+"px":r)}},X={getMaxWidth:K("maxWidth"),getMaxHeight:K("maxHeight"),setMaxWidth:Q("maxWidth"),setMaxHeight:Q("maxHeight")},Y=function(e,t){e.state.set("oldVal",e.value()),t.state.set("oldVal",t.value())},Z=function(e,t){var r=e.find("#width")[0],n=e.find("#height")[0],i=e.find("#constrain")[0];r&&n&&i&&t(r,n,i.checked())},ee=function(e,t,r){var n=e.state.get("oldVal"),i=t.state.get("oldVal"),o=e.value(),a=t.value();r&&n&&i&&o&&a&&(o!==n?(a=Math.round(o/n*a),isNaN(a)||t.value(a)):(o=Math.round(a/i*o),isNaN(o)||e.value(o))),Y(e,t)},te=function(e){Z(e,ee)},re=function(e){var t=function(){e(function(e){te(e)})};return{type:"container",label:"Dimensions",layout:"flex",align:"center",spacing:5,items:[{name:"width",type:"textbox",maxLength:5,size:5,onchange:t,ariaLabel:"Width"},{type:"label",text:"x"},{name:"height",type:"textbox",maxLength:5,size:5,onchange:t,ariaLabel:"Height"},{name:"constrain",type:"checkbox",checked:!0,text:"Constrain proportions"}]}},ne=function(e){Z(e,Y)},ie=te,oe=o.ie&&o.ie<=8?"onChange":"onInput",ae=function(r){return function(e){var t=e&&e.msg?"Media embed handler error: "+e.msg:"Media embed handler threw unknown error.";r.notificationManager.open({type:"error",text:t})}},ce=function(i,o){return function(e){var t=e.html,r=i.find("#embed")[0],n=v.extend(P(w(o),t),{source1:e.url});i.fromJSON(n),r&&(r.value(t),ie(i))}},ue=function(e,t){var r=e.dom.select("img[data-mce-object]");e.insertContent(t),function(e,t){var r,n,i=e.dom.select("img[data-mce-object]");for(r=0;r<t.length;r++)for(n=i.length-1;0<=n;n--)t[r]===i[n]&&i.splice(n,1);e.selection.select(i[0])}(e,r),e.nodeChanged()},se=function(n){var i,t,e,r,o,a=[{name:"source1",type:"filepicker",filetype:"media",size:40,autofocus:!0,label:"Source",onpaste:function(){setTimeout(function(){B(n,i.toJSON()).then(ce(i,n))["catch"](ae(n))},1)},onchange:function(e){var r,t;B(n,i.toJSON()).then(ce(i,n))["catch"](ae(n)),r=i,t=e.meta,v.each(t,function(e,t){r.find("#"+t).value(e)})},onbeforecall:function(e){e.meta=i.toJSON()}}],c=[];if(m(n)&&c.push({name:"source2",type:"filepicker",filetype:"media",size:40,label:"Alternative source"}),d(n)&&c.push({name:"poster",type:"filepicker",filetype:"image",size:40,label:"Poster"}),h(n)){var u=re(function(e){e(i),t=i.toJSON(),i.find("#embed").value(W(t.embed,t))});a.push(u)}r=(e=n).selection.getNode(),o=r.getAttribute("data-ephox-embed-iri"),t=o?{source1:o,"data-ephox-embed-iri":o,width:X.getMaxWidth(r),height:X.getMaxHeight(r)}:r.getAttribute("data-mce-object")?P(w(e),e.serializer.serialize(r,{selection:!0})):{};var s={id:"mcemediasource",type:"textbox",flex:1,name:"embed",value:function(e){var t=e.selection.getNode();if(t.getAttribute("data-mce-object")||t.getAttribute("data-ephox-embed-iri"))return e.selection.getContent()}(n),multiline:!0,rows:5,label:"Source"};s[oe]=function(){t=v.extend({},P(w(n),this.value())),this.parent().parent().fromJSON(t)};var l=[{title:"General",type:"form",items:a},{title:"Embed",type:"container",layout:"flex",direction:"column",align:"stretch",padding:10,spacing:10,items:[{type:"label",text:"Paste your embed code below:",forId:"mcemediasource"},s]}];0<c.length&&l.push({title:"Advanced",type:"form",items:c}),i=n.windowManager.open({title:"Insert/edit media",data:t,bodyType:"tabpanel",body:l,onSubmit:function(){var t,e;ie(i),t=n,(e=i.toJSON()).embed=W(e.embed,e),e.embed&&G(e.source1)?ue(t,e.embed):B(t,e).then(function(e){ue(t,e.html)})["catch"](ae(t))}}),ne(i)},le=function(e){return{showDialog:function(){se(e)}}},me=function(e){e.addCommand("mceMedia",function(){se(e)})},de=tinymce.util.Tools.resolve("tinymce.html.Node"),he=function(o,e){if(!1===u(o))return e;var a,c=E();return z({validate:!1,allow_conditional_comments:!1,special:"script,noscript",comment:function(e){c.comment(e)},cdata:function(e){c.cdata(e)},text:function(e,t){c.text(e,t)},start:function(e,t,r){if(a=!0,"script"!==e&&"noscript"!==e&&"svg"!==e){for(var n=t.length-1;0<=n;n--){var i=t[n].name;0===i.indexOf("on")&&(delete t.map[i],t.splice(n,1)),"style"===i&&(t[n].value=o.dom.serializeStyle(o.dom.parseStyle(t[n].value),e))}c.start(e,t,r),a=!1}},end:function(e){a||c.end(e)}},L({})).parse(e),c.getContent()},fe=function(e,t){var r,n=t.name;return(r=new de("img",1)).shortEnded=!0,ge(e,t,r),r.attr({width:t.attr("width")||"300",height:t.attr("height")||("audio"===n?"30":"150"),style:t.attr("style"),src:o.transparentSrc,"data-mce-object":n,"class":"mce-object mce-object-"+n}),r},pe=function(e,t){var r,n,i,o=t.name;return(r=new de("span",1)).attr({contentEditable:"false",style:t.attr("style"),"data-mce-object":o,"class":"mce-preview-object mce-object-"+o}),ge(e,t,r),(n=new de(o,1)).attr({src:t.attr("src"),allowfullscreen:t.attr("allowfullscreen"),style:t.attr("style"),"class":t.attr("class"),width:t.attr("width"),height:t.attr("height"),frameborder:"0"}),(i=new de("span",1)).attr("class","mce-shim"),r.append(n),r.append(i),r},ge=function(e,t,r){var n,i,o,a,c;for(a=(o=t.attributes).length;a--;)n=o[a].name,i=o[a].value,"width"!==n&&"height"!==n&&"style"!==n&&("data"!==n&&"src"!==n||(i=e.convertURL(i,n)),r.attr("data-mce-p-"+n,i));(c=t.firstChild&&t.firstChild.value)&&(r.attr("data-mce-html",escape(he(e,c))),r.firstChild=null)},ve=function(e){for(;e=e.parent;)if(e.attr("data-ephox-embed-iri"))return!0;return!1},we=function(i){return function(e){for(var t,r,n=e.length;n--;)(t=e[n]).parent&&(t.parent.attr("data-mce-object")||("script"!==t.name||(r=A(w(i),t.attr("src"))))&&(r&&(r.width&&t.attr("width",r.width.toString()),r.height&&t.attr("height",r.height.toString())),"iframe"===t.name&&a(i)&&o.ceFalse?ve(t)||t.replace(pe(i,t)):ve(t)||t.replace(fe(i,t))))}},be=function(d){d.on("preInit",function(){var t=d.schema.getSpecialElements();v.each("video audio iframe object".split(" "),function(e){t[e]=new RegExp("</"+e+"[^>]*>","gi")});var r=d.schema.getBoolAttrs();v.each("webkitallowfullscreen mozallowfullscreen allowfullscreen".split(" "),function(e){r[e]={}}),d.parser.addNodeFilter("iframe,video,audio,object,embed,script",we(d)),d.serializer.addAttributeFilter("data-mce-object",function(e,t){for(var r,n,i,o,a,c,u,s,l=e.length;l--;)if((r=e[l]).parent){for(u=r.attr(t),n=new de(u,1),"audio"!==u&&"script"!==u&&((s=r.attr("class"))&&-1!==s.indexOf("mce-preview-object")?n.attr({width:r.firstChild.attr("width"),height:r.firstChild.attr("height")}):n.attr({width:r.attr("width"),height:r.attr("height")})),n.attr({style:r.attr("style")}),i=(o=r.attributes).length;i--;){var m=o[i].name;0===m.indexOf("data-mce-p-")&&n.attr(m.substr(11),o[i].value)}"script"===u&&n.attr("type","text/javascript"),(a=r.attr("data-mce-html"))&&((c=new de("#text",3)).raw=!0,c.value=he(d,unescape(a)),n.append(c)),r.replace(n)}})}),d.on("setContent",function(){d.$("span.mce-preview-object").each(function(e,t){var r=d.$(t);0===r.find("span.mce-shim",t).length&&r.append('<span class="mce-shim"></span>')})})},ye=function(e){e.on("ResolveName",function(e){var t;1===e.target.nodeType&&(t=e.target.getAttribute("data-mce-object"))&&(e.name=t)})},xe=function(t){t.on("click keyup",function(){var e=t.selection.getNode();e&&t.dom.hasClass(e,"mce-preview-object")&&t.dom.getAttrib(e,"data-mce-selected")&&e.setAttribute("data-mce-selected","2")}),t.on("ObjectSelected",function(e){var t=e.target.getAttribute("data-mce-object");"audio"!==t&&"script"!==t||e.preventDefault()}),t.on("objectResized",function(e){var t,r=e.target;r.getAttribute("data-mce-object")&&(t=r.getAttribute("data-mce-html"))&&(t=unescape(t),r.setAttribute("data-mce-html",escape(W(t,{width:e.width,height:e.height}))))})},Oe=function(e){e.addButton("media",{tooltip:"Insert/edit media",cmd:"mceMedia",stateSelector:["img[data-mce-object]","span[data-mce-object]","div[data-ephox-embed-iri]"]}),e.addMenuItem("media",{icon:"media",text:"Media",cmd:"mceMedia",context:"insert",prependToContext:!0})};i.add("media",function(e){return me(e),Oe(e),ye(e),be(e),xe(e),le(e)})}();
\ No newline at end of file
diff --git a/lib/web/tiny_mce_4/plugins/paste/plugin.min.js b/lib/web/tiny_mce_4/plugins/paste/plugin.min.js
index 279f24c890308..db2393e70f0bf 100644
--- a/lib/web/tiny_mce_4/plugins/paste/plugin.min.js
+++ b/lib/web/tiny_mce_4/plugins/paste/plugin.min.js
@@ -1 +1 @@
-!function(v){"use strict";var g=function(t){var e=t,n=function(){return e};return{get:n,set:function(t){e=t},clone:function(){return g(n())}}},e=tinymce.util.Tools.resolve("tinymce.PluginManager"),a=function(t){return!(!/(^|[ ,])powerpaste([, ]|$)/.test(t.settings.plugins)||!e.get("powerpaste")||("undefined"!=typeof v.window.console&&v.window.console.log&&v.window.console.log("PowerPaste is incompatible with Paste plugin! Remove 'paste' from the 'plugins' option."),0))},s=function(t,e){return{clipboard:t,quirks:e}},f=function(t,e,n,r){return t.fire("PastePreProcess",{content:e,internal:n,wordContent:r})},d=function(t,e,n,r){return t.fire("PastePostProcess",{node:e,internal:n,wordContent:r})},u=function(t,e){return t.fire("PastePlainTextToggle",{state:e})},n=function(t,e){return t.fire("paste",{ieFake:e})},m={shouldPlainTextInform:function(t){return t.getParam("paste_plaintext_inform",!0)},shouldBlockDrop:function(t){return t.getParam("paste_block_drop",!1)},shouldPasteDataImages:function(t){return t.getParam("paste_data_images",!1)},shouldFilterDrop:function(t){return t.getParam("paste_filter_drop",!0)},getPreProcess:function(t){return t.getParam("paste_preprocess")},getPostProcess:function(t){return t.getParam("paste_postprocess")},getWebkitStyles:function(t){return t.getParam("paste_webkit_styles")},shouldRemoveWebKitStyles:function(t){return t.getParam("paste_remove_styles_if_webkit",!0)},shouldMergeFormats:function(t){return t.getParam("paste_merge_formats",!0)},isSmartPasteEnabled:function(t){return t.getParam("smart_paste",!0)},isPasteAsTextEnabled:function(t){return t.getParam("paste_as_text",!1)},getRetainStyleProps:function(t){return t.getParam("paste_retain_style_properties")},getWordValidElements:function(t){return t.getParam("paste_word_valid_elements","-strong/b,-em/i,-u,-span,-p,-ol,-ul,-li,-h1,-h2,-h3,-h4,-h5,-h6,-p/div,-a[href|name],sub,sup,strike,br,del,table[width],tr,td[colspan|rowspan|width],th[colspan|rowspan|width],thead,tfoot,tbody")},shouldConvertWordFakeLists:function(t){return t.getParam("paste_convert_word_fake_lists",!0)},shouldUseDefaultFilters:function(t){return t.getParam("paste_enable_default_filters",!0)}},r=function(t,e,n){var r,o,i;"text"===e.pasteFormat.get()?(e.pasteFormat.set("html"),u(t,!1)):(e.pasteFormat.set("text"),u(t,!0),i=t,!1===n.get()&&m.shouldPlainTextInform(i)&&(o="Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.",(r=t).notificationManager.open({text:r.translate(o),type:"info"}),n.set(!0))),t.focus()},l=function(t,n,e){t.addCommand("mceTogglePlainTextPaste",function(){r(t,n,e)}),t.addCommand("mceInsertClipboardContent",function(t,e){e.content&&n.pasteHtml(e.content,e.internal),e.text&&n.pasteText(e.text)})},p=tinymce.util.Tools.resolve("tinymce.Env"),h=tinymce.util.Tools.resolve("tinymce.util.Delay"),y=tinymce.util.Tools.resolve("tinymce.util.Tools"),o=tinymce.util.Tools.resolve("tinymce.util.VK"),t="x-tinymce/html",i="\x3c!-- "+t+" --\x3e",c=function(t){return i+t},b=function(t){return t.replace(i,"")},x=function(t){return-1!==t.indexOf(i)},P=function(){return t},w=tinymce.util.Tools.resolve("tinymce.html.Entities"),_=function(t){return t.replace(/\r?\n/g,"<br>")},T=function(t,e,n){var r=t.split(/\n\n/),o=function(t,e){var n,r=[],o="<"+t;if("object"==typeof e){for(n in e)e.hasOwnProperty(n)&&r.push(n+'="'+w.encodeAllRaw(e[n])+'"');r.length&&(o+=" "+r.join(" "))}return o+">"}(e,n),i="</"+e+">",a=y.map(r,function(t){return t.split(/\n/).join("<br />")});return 1===a.length?a[0]:y.map(a,function(t){return o+t+i}).join("")},D=function(t){return!/<(?:\/?(?!(?:div|p|br|span)>)\w+|(?:(?!(?:span style="white-space:\s?pre;?">)|br\s?\/>))\w+\s[^>]+)>/i.test(t)},C=function(t,e,n){return e?T(t,e,n):_(t)},k=tinymce.util.Tools.resolve("tinymce.html.DomParser"),S=tinymce.util.Tools.resolve("tinymce.html.Node"),O=tinymce.util.Tools.resolve("tinymce.html.Schema"),R=tinymce.util.Tools.resolve("tinymce.html.Serializer");function F(e,t){return y.each(t,function(t){e=t.constructor===RegExp?e.replace(t,""):e.replace(t[0],t[1])}),e}var E={filter:F,innerText:function(e){var n=O(),r=k({},n),o="",i=n.getShortEndedElements(),a=y.makeMap("script noscript style textarea video audio iframe object"," "),s=n.getBlockElements();return e=F(e,[/<!\[[^\]]+\]>/g]),function t(e){var n=e.name,r=e;if("br"!==n){if("wbr"!==n)if(i[n]&&(o+=" "),a[n])o+=" ";else{if(3===e.type&&(o+=e.value),!e.shortEnded&&(e=e.firstChild))for(;t(e),e=e.next;);s[n]&&r.next&&(o+="\n","p"===n&&(o+="\n"))}}else o+="\n"}(r.parse(e)),o},trimHtml:function(t){return t=F(t,[/^[\s\S]*<body[^>]*>\s*|\s*<\/body[^>]*>[\s\S]*$/gi,/<!--StartFragment-->|<!--EndFragment-->/g,[/( ?)<span class="Apple-converted-space">\u00a0<\/span>( ?)/g,function(t,e,n){return e||n?"\xa0":" "}],/<br class="Apple-interchange-newline">/g,/<br>$/i])},createIdGenerator:function(t){var e=0;return function(){return t+e++}},isMsEdge:function(){return-1!==v.navigator.userAgent.indexOf(" Edge/")}};function A(e){var n,t;return t=[/^[IVXLMCD]{1,2}\.[ \u00a0]/,/^[ivxlmcd]{1,2}\.[ \u00a0]/,/^[a-z]{1,2}[\.\)][ \u00a0]/,/^[A-Z]{1,2}[\.\)][ \u00a0]/,/^[0-9]+\.[ \u00a0]/,/^[\u3007\u4e00\u4e8c\u4e09\u56db\u4e94\u516d\u4e03\u516b\u4e5d]+\.[ \u00a0]/,/^[\u58f1\u5f10\u53c2\u56db\u4f0d\u516d\u4e03\u516b\u4e5d\u62fe]+\.[ \u00a0]/],e=e.replace(/^[\u00a0 ]+/,""),y.each(t,function(t){if(t.test(e))return!(n=!0)}),n}function I(t){var i,a,s=1;function n(t){var e="";if(3===t.type)return t.value;if(t=t.firstChild)for(;e+=n(t),t=t.next;);return e}function u(t,e){if(3===t.type&&e.test(t.value))return t.value=t.value.replace(e,""),!1;if(t=t.firstChild)do{if(!u(t,e))return!1}while(t=t.next);return!0}function e(e,n,r){var o=e._listLevel||s;o!==s&&(o<s?i&&(i=i.parent.parent):(a=i,i=null)),i&&i.name===n?i.append(e):(a=a||i,i=new S(n,1),1<r&&i.attr("start",""+r),e.wrap(i)),e.name="li",s<o&&a&&a.lastChild.append(i),s=o,function t(e){if(e._listIgnore)e.remove();else if(e=e.firstChild)for(;t(e),e=e.next;);}(e),u(e,/^\u00a0+/),u(e,/^\s*([\u2022\u00b7\u00a7\u25CF]|\w+\.)/),u(e,/^\u00a0+/)}for(var r=[],o=t.firstChild;null!=o;)if(r.push(o),null!==(o=o.walk()))for(;void 0!==o&&o.parent!==t;)o=o.walk();for(var l=0;l<r.length;l++)if("p"===(t=r[l]).name&&t.firstChild){var c=n(t);if(/^[\s\u00a0]*[\u2022\u00b7\u00a7\u25CF]\s*/.test(c)){e(t,"ul");continue}if(A(c)){var f=/([0-9]+)\./.exec(c),d=1;f&&(d=parseInt(f[1],10)),e(t,"ol",d);continue}if(t._listLevel){e(t,"ul",1);continue}i=null}else a=i,i=null}function M(n,r,o,i){var a,s={},t=n.dom.parseStyle(i);return y.each(t,function(t,e){switch(e){case"mso-list":(a=/\w+ \w+([0-9]+)/i.exec(i))&&(o._listLevel=parseInt(a[1],10)),/Ignore/i.test(t)&&o.firstChild&&(o._listIgnore=!0,o.firstChild._listIgnore=!0);break;case"horiz-align":e="text-align";break;case"vert-align":e="vertical-align";break;case"font-color":case"mso-foreground":e="color";break;case"mso-background":case"mso-highlight":e="background";break;case"font-weight":case"font-style":return void("normal"!==t&&(s[e]=t));case"mso-element":if(/^(comment|comment-list)$/i.test(t))return void o.remove()}0!==e.indexOf("mso-comment")?0!==e.indexOf("mso-")&&("all"===m.getRetainStyleProps(n)||r&&r[e])&&(s[e]=t):o.remove()}),/(bold)/i.test(s["font-weight"])&&(delete s["font-weight"],o.wrap(new S("b",1))),/(italic)/i.test(s["font-style"])&&(delete s["font-style"],o.wrap(new S("i",1))),(s=n.dom.serializeStyle(s,o.name))||null}var B,H,j,L,N,$={preProcess:function(t,e){return m.shouldUseDefaultFilters(t)?function(r,t){var e,o;(e=m.getRetainStyleProps(r))&&(o=y.makeMap(e.split(/[, ]/))),t=E.filter(t,[/<br class="?Apple-interchange-newline"?>/gi,/<b[^>]+id="?docs-internal-[^>]*>/gi,/<!--[\s\S]+?-->/gi,/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,[/<(\/?)s>/gi,"<$1strike>"],[/&nbsp;/gi,"\xa0"],[/<span\s+style\s*=\s*"\s*mso-spacerun\s*:\s*yes\s*;?\s*"\s*>([\s\u00a0]*)<\/span>/gi,function(t,e){return 0<e.length?e.replace(/./," ").slice(Math.floor(e.length/2)).split("").join("\xa0"):""}]]);var n=m.getWordValidElements(r),i=O({valid_elements:n,valid_children:"-li[p]"});y.each(i.elements,function(t){t.attributes["class"]||(t.attributes["class"]={},t.attributesOrder.push("class")),t.attributes.style||(t.attributes.style={},t.attributesOrder.push("style"))});var a=k({},i);a.addAttributeFilter("style",function(t){for(var e,n=t.length;n--;)(e=t[n]).attr("style",M(r,o,e,e.attr("style"))),"span"===e.name&&e.parent&&!e.attributes.length&&e.unwrap()}),a.addAttributeFilter("class",function(t){for(var e,n,r=t.length;r--;)n=(e=t[r]).attr("class"),/^(MsoCommentReference|MsoCommentText|msoDel)$/i.test(n)&&e.remove(),e.attr("class",null)}),a.addNodeFilter("del",function(t){for(var e=t.length;e--;)t[e].remove()}),a.addNodeFilter("a",function(t){for(var e,n,r,o=t.length;o--;)if(n=(e=t[o]).attr("href"),r=e.attr("name"),n&&-1!==n.indexOf("#_msocom_"))e.remove();else if(n&&0===n.indexOf("file://")&&(n=n.split("#")[1])&&(n="#"+n),n||r){if(r&&!/^_?(?:toc|edn|ftn)/i.test(r)){e.unwrap();continue}e.attr({href:n,name:r})}else e.unwrap()});var s=a.parse(t);return m.shouldConvertWordFakeLists(r)&&I(s),t=R({validate:r.settings.validate},i).serialize(s)}(t,e):e},isWordContent:function(t){return/<font face="Times New Roman"|class="?Mso|style="[^"]*\bmso-|style='[^'']*\bmso-|w:WordDocument/i.test(t)||/class="OutlineElement/.test(t)||/id="?docs\-internal\-guid\-/.test(t)}},W=function(t,e){return{content:t,cancelled:e}},z=function(t,e,n,r){var o,i,a,s,u,l,c=f(t,e,n,r);return t.hasEventListeners("PastePostProcess")&&!c.isDefaultPrevented()?(o=t,i=c.content,a=n,s=r,u=o.dom.create("div",{style:"display:none"},i),l=d(o,u,a,s),W(l.node.innerHTML,l.isDefaultPrevented())):W(c.content,c.isDefaultPrevented())},U=function(t,e,n){var r=$.isWordContent(e),o=r?$.preProcess(t,e):e;return z(t,o,n,r)},V=function(t,e){var n,r;return t.insertContent((n=e,r=t.dom.create("body",{},n),y.each(r.querySelectorAll("meta"),function(t){return t.parentNode.removeChild(t)}),r.innerHTML),{merge:m.shouldMergeFormats(t),paste:!0}),!0},q=function(t){return/^https?:\/\/[\w\?\-\/+=.&%@~#]+$/i.test(t)},K=function(t){return q(t)&&/.(gif|jpe?g|png)$/.test(t)},G=function(t,e,n){return!(!1!==t.selection.isCollapsed()||!q(e)||(o=e,i=n,(r=t).undoManager.extra(function(){i(r,o)},function(){r.execCommand("mceInsertLink",!1,o)}),0));var r,o,i},X=function(t,e,n){return!!K(e)&&(o=e,i=n,(r=t).undoManager.extra(function(){i(r,o)},function(){r.insertContent('<img src="'+o+'">')}),!0);var r,o,i},Y=function(t,e){var n,r;!1===m.isSmartPasteEnabled(t)?V(t,e):(n=t,r=e,y.each([G,X,V],function(t){return!0!==t(n,r,V)}))},Z=function(t){return function(){return t}},J=Z(!1),Q=Z(!0),tt=J,et=Q,nt=function(){return rt},rt=(L={fold:function(t,e){return t()},is:tt,isSome:tt,isNone:et,getOr:j=function(t){return t},getOrThunk:H=function(t){return t()},getOrDie:function(t){throw new Error(t||"error: getOrDie called on none.")},getOrNull:function(){return null},getOrUndefined:function(){return undefined},or:j,orThunk:H,map:nt,ap:nt,each:function(){},bind:nt,flatten:nt,exists:tt,forall:et,filter:nt,equals:B=function(t){return t.isNone()},equals_:B,toArray:function(){return[]},toString:Z("none()")},Object.freeze&&Object.freeze(L),L),ot=function(n){var t=function(){return n},e=function(){return o},r=function(t){return t(n)},o={fold:function(t,e){return e(n)},is:function(t){return n===t},isSome:et,isNone:tt,getOr:t,getOrThunk:t,getOrDie:t,getOrNull:t,getOrUndefined:t,or:e,orThunk:e,map:function(t){return ot(t(n))},ap:function(t){return t.fold(nt,function(t){return ot(t(n))})},each:function(t){t(n)},bind:r,flatten:t,exists:r,forall:r,filter:function(t){return t(n)?o:rt},equals:function(t){return t.is(n)},equals_:function(t,e){return t.fold(tt,function(t){return e(n,t)})},toArray:function(){return[n]},toString:function(){return"some("+n+")"}};return o},it={some:ot,none:nt,from:function(t){return null===t||t===undefined?rt:ot(t)}},at=(N="function",function(t){return function(t){if(null===t)return"null";var e=typeof t;return"object"===e&&(Array.prototype.isPrototypeOf(t)||t.constructor&&"Array"===t.constructor.name)?"array":"object"===e&&(String.prototype.isPrototypeOf(t)||t.constructor&&"String"===t.constructor.name)?"string":e}(t)===N}),st=Array.prototype.slice,ut=function(t,e){for(var n=t.length,r=new Array(n),o=0;o<n;o++){var i=t[o];r[o]=e(i,o,t)}return r},lt=function(t,e){for(var n=0,r=t.length;n<r;n++)e(t[n],n,t)},ct=at(Array.from)?Array.from:function(t){return st.call(t)},ft=function(t){var n=it.none(),e=[],r=function(t){o()?a(t):e.push(t)},o=function(){return n.isSome()},i=function(t){lt(t,a)},a=function(e){n.each(function(t){v.setTimeout(function(){e(t)},0)})};return t(function(t){n=it.some(t),i(e),e=[]}),{get:r,map:function(n){return ft(function(e){r(function(t){e(n(t))})})},isReady:o}},dt={nu:ft,pure:function(e){return ft(function(t){t(e)})}},mt=function(e){var t=function(t){var r;e((r=t,function(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e];var n=this;v.setTimeout(function(){r.apply(n,t)},0)}))},n=function(){return dt.nu(t)};return{map:function(r){return mt(function(n){t(function(t){var e=r(t);n(e)})})},bind:function(n){return mt(function(e){t(function(t){n(t).get(e)})})},anonBind:function(n){return mt(function(e){t(function(t){n.get(e)})})},toLazy:n,toCached:function(){var e=null;return mt(function(t){null===e&&(e=n()),e.get(t)})},get:t}},gt={nu:mt,pure:function(e){return mt(function(t){t(e)})}},pt=function(a,t){return t(function(r){var o=[],i=0;0===a.length?r([]):lt(a,function(t,e){var n;t.get((n=e,function(t){o[n]=t,++i>=a.length&&r(o)}))})})},vt=function(t,e){var n=ut(t,e);return pt(n,gt.nu)},ht=function(t,e,n){var r=n||x(e),o=U(t,b(e),r);!1===o.cancelled&&Y(t,o.content)},yt=function(t,e){e=t.dom.encode(e).replace(/\r\n/g,"\n"),e=C(e,t.settings.forced_root_block,t.settings.forced_root_block_attrs),ht(t,e,!1)},bt=function(t){var e={};if(t){if(t.getData){var n=t.getData("Text");n&&0<n.length&&-1===n.indexOf("data:text/mce-internal,")&&(e["text/plain"]=n)}if(t.types)for(var r=0;r<t.types.length;r++){var o=t.types[r];try{e[o]=t.getData(o)}catch(i){e[o]=""}}}return e},xt=function(t,e){return e in t&&0<t[e].length},Pt=function(t){return xt(t,"text/html")||xt(t,"text/plain")},wt=E.createIdGenerator("mceclip"),_t=function(e,t,n){var r,o,i,a,s="paste"===t.type?t.clipboardData:t.dataTransfer;if(e.settings.paste_data_images&&s){var u=(i=(o=s).items?ut(ct(o.items),function(t){return t.getAsFile()}):[],a=o.files?ct(o.files):[],function(t,e){for(var n=[],r=0,o=t.length;r<o;r++){var i=t[r];e(i,r,t)&&n.push(i)}return n}(0<i.length?i:a,function(t){return/^image\/(jpeg|png|gif|bmp)$/.test(t.type)}));if(0<u.length)return t.preventDefault(),(r=u,vt(r,function(r){return gt.nu(function(t){var e=r.getAsFile?r.getAsFile():r,n=new window.FileReader;n.onload=function(){t({blob:e,uri:n.result})},n.readAsDataURL(e)})})).get(function(t){n&&e.selection.setRng(n),lt(t,function(t){!function(t,e){var n,r,o,i,a,s,u,l=(n=e.uri,-1!==(r=n.indexOf(","))?n.substr(r+1):null),c=wt(),f=t.settings.images_reuse_filename&&e.blob.name?(o=t,i=e.blob.name,(a=i.match(/([\s\S]+?)\.(?:jpeg|jpg|png|gif)$/i))?o.dom.encode(a[1]):null):c,d=new v.Image;if(d.src=e.uri,s=t.settings,u=d,!s.images_dataimg_filter||s.images_dataimg_filter(u)){var m,g=t.editorUpload.blobCache,p=void 0;(m=g.findFirst(function(t){return t.base64()===l}))?p=m:(p=g.create(c,e.blob,l,f),g.add(p)),ht(t,'<img src="'+p.blobUri()+'">',!1)}else ht(t,'<img src="'+e.uri+'">',!1)}(e,t)})}),!0}return!1},Tt=function(t){return o.metaKeyPressed(t)&&86===t.keyCode||t.shiftKey&&45===t.keyCode},Dt=function(u,l,c){var e,f,d=(e=g(it.none()),{clear:function(){e.set(it.none())},set:function(t){e.set(it.some(t))},isSet:function(){return e.get().isSome()},on:function(t){e.get().each(t)}});function m(t,e,n,r){var o,i;xt(t,"text/html")?o=t["text/html"]:(o=l.getHtml(),r=r||x(o),l.isDefaultContent(o)&&(n=!0)),o=E.trimHtml(o),l.remove(),i=!1===r&&D(o),o.length&&!i||(n=!0),n&&(o=xt(t,"text/plain")&&i?t["text/plain"]:E.innerText(o)),l.isDefaultContent(o)?e||u.windowManager.alert("Please use Ctrl+V/Cmd+V keyboard shortcuts to paste contents."):n?yt(u,o):ht(u,o,r)}u.on("keydown",function(t){function e(t){Tt(t)&&!t.isDefaultPrevented()&&l.remove()}if(Tt(t)&&!t.isDefaultPrevented()){if((f=t.shiftKey&&86===t.keyCode)&&p.webkit&&-1!==v.navigator.userAgent.indexOf("Version/"))return;if(t.stopImmediatePropagation(),d.set(t),window.setTimeout(function(){d.clear()},100),p.ie&&f)return t.preventDefault(),void n(u,!0);l.remove(),l.create(),u.once("keyup",e),u.once("paste",function(){u.off("keyup",e)})}}),u.on("paste",function(t){var e,n,r,o=d.isSet(),i=(e=u,n=bt(t.clipboardData||e.getDoc().dataTransfer),E.isMsEdge()?y.extend(n,{"text/html":""}):n),a="text"===c.get()||f,s=xt(i,P());f=!1,t.isDefaultPrevented()||(r=t.clipboardData,-1!==v.navigator.userAgent.indexOf("Android")&&r&&r.items&&0===r.items.length)?l.remove():Pt(i)||!_t(u,t,l.getLastRng()||u.selection.getRng())?(o||t.preventDefault(),!p.ie||o&&!t.ieFake||xt(i,"text/html")||(l.create(),u.dom.bind(l.getEl(),"paste",function(t){t.stopPropagation()}),u.getDoc().execCommand("Paste",!1,null),i["text/html"]=l.getHtml()),xt(i,"text/html")?(t.preventDefault(),s||(s=x(i["text/html"])),m(i,o,a,s)):h.setEditorTimeout(u,function(){m(i,o,a,s)},0)):l.remove()})},Ct=function(t){return p.ie&&t.inline?v.document.body:t.getBody()},kt=function(e,t,n){var r;Ct(r=e)!==r.getBody()&&e.dom.bind(t,"paste keyup",function(t){Rt(e,n)||e.fire("paste")})},St=function(t){return t.dom.get("mcepastebin")},Ot=function(t,e){return e===t},Rt=function(t,e){var n,r=St(t);return(n=r)&&"mcepastebin"===n.id&&Ot(e,r.innerHTML)},Ft=function(a){var s=g(null),u="%MCEPASTEBIN%";return{create:function(){return e=s,n=u,o=(t=a).dom,i=t.getBody(),e.set(t.selection.getRng()),r=t.dom.add(Ct(t),"div",{id:"mcepastebin","class":"mce-pastebin",contentEditable:!0,"data-mce-bogus":"all",style:"position: fixed; top: 50%; width: 10px; height: 10px; overflow: hidden; opacity: 0"},n),(p.ie||p.gecko)&&o.setStyle(r,"left","rtl"===o.getStyle(i,"direction",!0)?65535:-65535),o.bind(r,"beforedeactivate focusin focusout",function(t){t.stopPropagation()}),kt(t,r,n),r.focus(),void t.selection.select(r,!0);var t,e,n,r,o,i},remove:function(){return function(t,e){if(St(t)){for(var n=void 0,r=e.get();n=t.dom.get("mcepastebin");)t.dom.remove(n),t.dom.unbind(n);r&&t.selection.setRng(r)}e.set(null)}(a,s)},getEl:function(){return St(a)},getHtml:function(){return function(n){var e,t,r,o,i,a=function(t,e){t.appendChild(e),n.dom.remove(e,!0)};for(t=y.grep(Ct(n).childNodes,function(t){return"mcepastebin"===t.id}),e=t.shift(),y.each(t,function(t){a(e,t)}),r=(o=n.dom.select("div[id=mcepastebin]",e)).length-1;0<=r;r--)i=n.dom.create("div"),e.insertBefore(i,o[r]),a(i,o[r]);return e?e.innerHTML:""}(a)},getLastRng:function(){return s.get()},isDefault:function(){return Rt(a,u)},isDefaultContent:function(t){return Ot(u,t)}}},Et=function(n,t){var e=Ft(n);return n.on("preInit",function(){return Dt(a=n,e,t),void a.parser.addNodeFilter("img",function(t,e,n){var r,o=function(t){t.attr("data-mce-object")||s===p.transparentSrc||t.remove()};if(!a.settings.paste_data_images&&(r=n).data&&!0===r.data.paste)for(var i=t.length;i--;)(s=t[i].attributes.map.src)&&(0===s.indexOf("webkit-fake-url")?o(t[i]):a.settings.allow_html_data_urls||0!==s.indexOf("data:")||o(t[i]))});var a,s}),{pasteFormat:t,pasteHtml:function(t,e){return ht(n,t,e)},pasteText:function(t){return yt(n,t)},pasteImageData:function(t,e){return _t(n,t,e)},getDataTransferItems:bt,hasHtmlOrText:Pt,hasContentType:xt}},At=function(){},It=function(t,e,n){if(r=t,!1!==p.iOS||r===undefined||"function"!=typeof r.setData||!0===E.isMsEdge())return!1;try{return t.clearData(),t.setData("text/html",e),t.setData("text/plain",n),t.setData(P(),e),!0}catch(o){return!1}var r},Mt=function(t,e,n,r){It(t.clipboardData,e.html,e.text)?(t.preventDefault(),r()):n(e.html,r)},Bt=function(s){return function(t,e){var n=c(t),r=s.dom.create("div",{contenteditable:"false","data-mce-bogus":"all"}),o=s.dom.create("div",{contenteditable:"true"},n);s.dom.setStyles(r,{position:"fixed",top:"0",left:"-3000px",width:"1000px",overflow:"hidden"}),r.appendChild(o),s.dom.add(s.getBody(),r);var i=s.selection.getRng();o.focus();var a=s.dom.createRng();a.selectNodeContents(o),s.selection.setRng(a),setTimeout(function(){s.selection.setRng(i),r.parentNode.removeChild(r),e()},0)}},Ht=function(t){return{html:t.selection.getContent({contextual:!0}),text:t.selection.getContent({format:"text"})}},jt=function(t){return!t.selection.isCollapsed()||!!(e=t).dom.getParent(e.selection.getStart(),"td[data-mce-selected],th[data-mce-selected]",e.getBody());var e},Lt=function(t){var e,n;t.on("cut",(e=t,function(t){jt(e)&&Mt(t,Ht(e),Bt(e),function(){setTimeout(function(){e.execCommand("Delete")},0)})})),t.on("copy",(n=t,function(t){jt(n)&&Mt(t,Ht(n),Bt(n),At)}))},Nt=tinymce.util.Tools.resolve("tinymce.dom.RangeUtils"),$t=function(t,e){return Nt.getCaretRangeFromPoint(e.clientX,e.clientY,t.getDoc())},Wt=function(t,e){t.focus(),t.selection.setRng(e)},zt=function(a,s,u){m.shouldBlockDrop(a)&&a.on("dragend dragover draggesture dragdrop drop drag",function(t){t.preventDefault(),t.stopPropagation()}),m.shouldPasteDataImages(a)||a.on("drop",function(t){var e=t.dataTransfer;e&&e.files&&0<e.files.length&&t.preventDefault()}),a.on("drop",function(t){var e,n;if(n=$t(a,t),!t.isDefaultPrevented()&&!u.get()){e=s.getDataTransferItems(t.dataTransfer);var r,o=s.hasContentType(e,P());if((s.hasHtmlOrText(e)&&(!(r=e["text/plain"])||0!==r.indexOf("file://"))||!s.pasteImageData(t,n))&&n&&m.shouldFilterDrop(a)){var i=e["mce-internal"]||e["text/html"]||e["text/plain"];i&&(t.preventDefault(),h.setEditorTimeout(a,function(){a.undoManager.transact(function(){e["mce-internal"]&&a.execCommand("Delete"),Wt(a,n),i=E.trimHtml(i),e["text/html"]?s.pasteHtml(i,o):s.pasteText(i)})}))}}}),a.on("dragstart",function(t){u.set(!0)}),a.on("dragover dragend",function(t){m.shouldPasteDataImages(a)&&!1===u.get()&&(t.preventDefault(),Wt(a,$t(a,t))),"dragend"===t.type&&u.set(!1)})},Ut=function(t){var e=t.plugins.paste,n=m.getPreProcess(t);n&&t.on("PastePreProcess",function(t){n.call(e,e,t)});var r=m.getPostProcess(t);r&&t.on("PastePostProcess",function(t){r.call(e,e,t)})};function Vt(e,n){e.on("PastePreProcess",function(t){t.content=n(e,t.content,t.internal,t.wordContent)})}function qt(t,e){if(!$.isWordContent(e))return e;var n=[];y.each(t.schema.getBlockElements(),function(t,e){n.push(e)});var r=new RegExp("(?:<br>&nbsp;[\\s\\r\\n]+|<br>)*(<\\/?("+n.join("|")+")[^>]*>)(?:<br>&nbsp;[\\s\\r\\n]+|<br>)*","g");return e=E.filter(e,[[r,"$1"]]),e=E.filter(e,[[/<br><br>/g,"<BR><BR>"],[/<br>/g," "],[/<BR><BR>/g,"<br>"]])}function Kt(t,e,n,r){if(r||n)return e;var l,o=m.getWebkitStyles(t);if(!1===m.shouldRemoveWebKitStyles(t)||"all"===o)return e;if(o&&(l=o.split(/[, ]/)),l){var c=t.dom,f=t.selection.getNode();e=e.replace(/(<[^>]+) style="([^"]*)"([^>]*>)/gi,function(t,e,n,r){var o=c.parseStyle(c.decode(n)),i={};if("none"===l)return e+r;for(var a=0;a<l.length;a++){var s=o[l[a]],u=c.getStyle(f,l[a],!0);/color/.test(l[a])&&(s=c.toHex(s),u=c.toHex(u)),u!==s&&(i[l[a]]=s)}return(i=c.serializeStyle(i,"span"))?e+' style="'+i+'"'+r:e+r})}else e=e.replace(/(<[^>]+) style="([^"]*)"([^>]*>)/gi,"$1$3");return e=e.replace(/(<[^>]+) data-mce-style="([^"]+)"([^>]*>)/gi,function(t,e,n,r){return e+' style="'+n+'"'+r})}function Gt(n,t){n.$("a",t).find("font,u").each(function(t,e){n.dom.remove(e,!0)})}var Xt=function(t){var e,n;p.webkit&&Vt(t,Kt),p.ie&&(Vt(t,qt),n=Gt,(e=t).on("PastePostProcess",function(t){n(e,t.node)}))},Yt=function(t,e,n){var r=n.control;r.active("text"===e.pasteFormat.get()),t.on("PastePlainTextToggle",function(t){r.active(t.state)})},Zt=function(t,e){var n=function(r){for(var o=[],t=1;t<arguments.length;t++)o[t-1]=arguments[t];return function(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e];var n=o.concat(t);return r.apply(null,n)}}(Yt,t,e);t.addButton("pastetext",{active:!1,icon:"pastetext",tooltip:"Paste as text",cmd:"mceTogglePlainTextPaste",onPostRender:n}),t.addMenuItem("pastetext",{text:"Paste as text",selectable:!0,active:e.pasteFormat,cmd:"mceTogglePlainTextPaste",onPostRender:n})};e.add("paste",function(t){if(!1===a(t)){var e=g(!1),n=g(!1),r=g(m.isPasteAsTextEnabled(t)?"text":"html"),o=Et(t,r),i=Xt(t);return Zt(t,o),l(t,o,e),Ut(t),Lt(t),zt(t,o,n),s(o,i)}})}(window);
\ No newline at end of file
+!function(v){"use strict";var p=function(t){var e=t,n=function(){return e};return{get:n,set:function(t){e=t},clone:function(){return p(n())}}},e=tinymce.util.Tools.resolve("tinymce.PluginManager"),a=function(t){return!(!/(^|[ ,])powerpaste([, ]|$)/.test(t.settings.plugins)||!e.get("powerpaste")||("undefined"!=typeof v.window.console&&v.window.console.log&&v.window.console.log("PowerPaste is incompatible with Paste plugin! Remove 'paste' from the 'plugins' option."),0))},u=function(t,e){return{clipboard:t,quirks:e}},d=function(t,e,n,r){return t.fire("PastePreProcess",{content:e,internal:n,wordContent:r})},m=function(t,e,n,r){return t.fire("PastePostProcess",{node:e,internal:n,wordContent:r})},s=function(t,e){return t.fire("PastePlainTextToggle",{state:e})},n=function(t,e){return t.fire("paste",{ieFake:e})},g={shouldPlainTextInform:function(t){return t.getParam("paste_plaintext_inform",!0)},shouldBlockDrop:function(t){return t.getParam("paste_block_drop",!1)},shouldPasteDataImages:function(t){return t.getParam("paste_data_images",!1)},shouldFilterDrop:function(t){return t.getParam("paste_filter_drop",!0)},getPreProcess:function(t){return t.getParam("paste_preprocess")},getPostProcess:function(t){return t.getParam("paste_postprocess")},getWebkitStyles:function(t){return t.getParam("paste_webkit_styles")},shouldRemoveWebKitStyles:function(t){return t.getParam("paste_remove_styles_if_webkit",!0)},shouldMergeFormats:function(t){return t.getParam("paste_merge_formats",!0)},isSmartPasteEnabled:function(t){return t.getParam("smart_paste",!0)},isPasteAsTextEnabled:function(t){return t.getParam("paste_as_text",!1)},getRetainStyleProps:function(t){return t.getParam("paste_retain_style_properties")},getWordValidElements:function(t){return t.getParam("paste_word_valid_elements","-strong/b,-em/i,-u,-span,-p,-ol,-ul,-li,-h1,-h2,-h3,-h4,-h5,-h6,-p/div,-a[href|name],sub,sup,strike,br,del,table[width],tr,td[colspan|rowspan|width],th[colspan|rowspan|width],thead,tfoot,tbody")},shouldConvertWordFakeLists:function(t){return t.getParam("paste_convert_word_fake_lists",!0)},shouldUseDefaultFilters:function(t){return t.getParam("paste_enable_default_filters",!0)}},r=function(t,e,n){var r,o,i;"text"===e.pasteFormat.get()?(e.pasteFormat.set("html"),s(t,!1)):(e.pasteFormat.set("text"),s(t,!0),i=t,!1===n.get()&&g.shouldPlainTextInform(i)&&(o="Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.",(r=t).notificationManager.open({text:r.translate(o),type:"info"}),n.set(!0))),t.focus()},c=function(t,n,e){t.addCommand("mceTogglePlainTextPaste",function(){r(t,n,e)}),t.addCommand("mceInsertClipboardContent",function(t,e){e.content&&n.pasteHtml(e.content,e.internal),e.text&&n.pasteText(e.text)})},h=tinymce.util.Tools.resolve("tinymce.Env"),y=tinymce.util.Tools.resolve("tinymce.util.Delay"),b=tinymce.util.Tools.resolve("tinymce.util.Tools"),o=tinymce.util.Tools.resolve("tinymce.util.VK"),t="x-tinymce/html",i="\x3c!-- "+t+" --\x3e",l=function(t){return i+t},f=function(t){return t.replace(i,"")},w=function(t){return-1!==t.indexOf(i)},x=function(){return t},_=tinymce.util.Tools.resolve("tinymce.html.Entities"),P=function(t){return t.replace(/\r?\n/g,"<br>")},T=function(t,e,n){var r=t.split(/\n\n/),o=function(t,e){var n,r=[],o="<"+t;if("object"==typeof e){for(n in e)e.hasOwnProperty(n)&&r.push(n+'="'+_.encodeAllRaw(e[n])+'"');r.length&&(o+=" "+r.join(" "))}return o+">"}(e,n),i="</"+e+">",a=b.map(r,function(t){return t.split(/\n/).join("<br />")});return 1===a.length?a[0]:b.map(a,function(t){return o+t+i}).join("")},D=function(t){return!/<(?:\/?(?!(?:div|p|br|span)>)\w+|(?:(?!(?:span style="white-space:\s?pre;?">)|br\s?\/>))\w+\s[^>]+)>/i.test(t)},C=function(t,e,n){return e?T(t,e,n):P(t)},k=tinymce.util.Tools.resolve("tinymce.html.DomParser"),F=tinymce.util.Tools.resolve("tinymce.html.Serializer"),E=tinymce.util.Tools.resolve("tinymce.html.Node"),R=tinymce.util.Tools.resolve("tinymce.html.Schema");function I(e,t){return b.each(t,function(t){e=t.constructor===RegExp?e.replace(t,""):e.replace(t[0],t[1])}),e}var O={filter:I,innerText:function(e){var n=R(),r=k({},n),o="",i=n.getShortEndedElements(),a=b.makeMap("script noscript style textarea video audio iframe object"," "),u=n.getBlockElements();return e=I(e,[/<!\[[^\]]+\]>/g]),function t(e){var n=e.name,r=e;if("br"!==n){if("wbr"!==n)if(i[n]&&(o+=" "),a[n])o+=" ";else{if(3===e.type&&(o+=e.value),!e.shortEnded&&(e=e.firstChild))for(;t(e),e=e.next;);u[n]&&r.next&&(o+="\n","p"===n&&(o+="\n"))}}else o+="\n"}(r.parse(e)),o},trimHtml:function(t){return t=I(t,[/^[\s\S]*<body[^>]*>\s*|\s*<\/body[^>]*>[\s\S]*$/gi,/<!--StartFragment-->|<!--EndFragment-->/g,[/( ?)<span class="Apple-converted-space">\u00a0<\/span>( ?)/g,function(t,e,n){return e||n?"\xa0":" "}],/<br class="Apple-interchange-newline">/g,/<br>$/i])},createIdGenerator:function(t){var e=0;return function(){return t+e++}},isMsEdge:function(){return-1!==v.navigator.userAgent.indexOf(" Edge/")}};function S(e){var n,t;return t=[/^[IVXLMCD]{1,2}\.[ \u00a0]/,/^[ivxlmcd]{1,2}\.[ \u00a0]/,/^[a-z]{1,2}[\.\)][ \u00a0]/,/^[A-Z]{1,2}[\.\)][ \u00a0]/,/^[0-9]+\.[ \u00a0]/,/^[\u3007\u4e00\u4e8c\u4e09\u56db\u4e94\u516d\u4e03\u516b\u4e5d]+\.[ \u00a0]/,/^[\u58f1\u5f10\u53c2\u56db\u4f0d\u516d\u4e03\u516b\u4e5d\u62fe]+\.[ \u00a0]/],e=e.replace(/^[\u00a0 ]+/,""),b.each(t,function(t){if(t.test(e))return!(n=!0)}),n}function A(t){var i,a,u=1;function n(t){var e="";if(3===t.type)return t.value;if(t=t.firstChild)for(;e+=n(t),t=t.next;);return e}function s(t,e){if(3===t.type&&e.test(t.value))return t.value=t.value.replace(e,""),!1;if(t=t.firstChild)do{if(!s(t,e))return!1}while(t=t.next);return!0}function e(e,n,r){var o=e._listLevel||u;o!==u&&(o<u?i&&(i=i.parent.parent):(a=i,i=null)),i&&i.name===n?i.append(e):(a=a||i,i=new E(n,1),1<r&&i.attr("start",""+r),e.wrap(i)),e.name="li",u<o&&a&&a.lastChild.append(i),u=o,function t(e){if(e._listIgnore)e.remove();else if(e=e.firstChild)for(;t(e),e=e.next;);}(e),s(e,/^\u00a0+/),s(e,/^\s*([\u2022\u00b7\u00a7\u25CF]|\w+\.)/),s(e,/^\u00a0+/)}for(var r=[],o=t.firstChild;null!=o;)if(r.push(o),null!==(o=o.walk()))for(;void 0!==o&&o.parent!==t;)o=o.walk();for(var c=0;c<r.length;c++)if("p"===(t=r[c]).name&&t.firstChild){var l=n(t);if(/^[\s\u00a0]*[\u2022\u00b7\u00a7\u25CF]\s*/.test(l)){e(t,"ul");continue}if(S(l)){var f=/([0-9]+)\./.exec(l),d=1;f&&(d=parseInt(f[1],10)),e(t,"ol",d);continue}if(t._listLevel){e(t,"ul",1);continue}i=null}else a=i,i=null}function j(n,r,o,i){var a,u={},t=n.dom.parseStyle(i);return b.each(t,function(t,e){switch(e){case"mso-list":(a=/\w+ \w+([0-9]+)/i.exec(i))&&(o._listLevel=parseInt(a[1],10)),/Ignore/i.test(t)&&o.firstChild&&(o._listIgnore=!0,o.firstChild._listIgnore=!0);break;case"horiz-align":e="text-align";break;case"vert-align":e="vertical-align";break;case"font-color":case"mso-foreground":e="color";break;case"mso-background":case"mso-highlight":e="background";break;case"font-weight":case"font-style":return void("normal"!==t&&(u[e]=t));case"mso-element":if(/^(comment|comment-list)$/i.test(t))return void o.remove()}0!==e.indexOf("mso-comment")?0!==e.indexOf("mso-")&&("all"===g.getRetainStyleProps(n)||r&&r[e])&&(u[e]=t):o.remove()}),/(bold)/i.test(u["font-weight"])&&(delete u["font-weight"],o.wrap(new E("b",1))),/(italic)/i.test(u["font-style"])&&(delete u["font-style"],o.wrap(new E("i",1))),(u=n.dom.serializeStyle(u,o.name))||null}var M,L,N,B,H,$,W,U,z,V={preProcess:function(t,e){return g.shouldUseDefaultFilters(t)?function(r,t){var e,o;(e=g.getRetainStyleProps(r))&&(o=b.makeMap(e.split(/[, ]/))),t=O.filter(t,[/<br class="?Apple-interchange-newline"?>/gi,/<b[^>]+id="?docs-internal-[^>]*>/gi,/<!--[\s\S]+?-->/gi,/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,[/<(\/?)s>/gi,"<$1strike>"],[/&nbsp;/gi,"\xa0"],[/<span\s+style\s*=\s*"\s*mso-spacerun\s*:\s*yes\s*;?\s*"\s*>([\s\u00a0]*)<\/span>/gi,function(t,e){return 0<e.length?e.replace(/./," ").slice(Math.floor(e.length/2)).split("").join("\xa0"):""}]]);var n=g.getWordValidElements(r),i=R({valid_elements:n,valid_children:"-li[p]"});b.each(i.elements,function(t){t.attributes["class"]||(t.attributes["class"]={},t.attributesOrder.push("class")),t.attributes.style||(t.attributes.style={},t.attributesOrder.push("style"))});var a=k({},i);a.addAttributeFilter("style",function(t){for(var e,n=t.length;n--;)(e=t[n]).attr("style",j(r,o,e,e.attr("style"))),"span"===e.name&&e.parent&&!e.attributes.length&&e.unwrap()}),a.addAttributeFilter("class",function(t){for(var e,n,r=t.length;r--;)n=(e=t[r]).attr("class"),/^(MsoCommentReference|MsoCommentText|msoDel)$/i.test(n)&&e.remove(),e.attr("class",null)}),a.addNodeFilter("del",function(t){for(var e=t.length;e--;)t[e].remove()}),a.addNodeFilter("a",function(t){for(var e,n,r,o=t.length;o--;)if(n=(e=t[o]).attr("href"),r=e.attr("name"),n&&-1!==n.indexOf("#_msocom_"))e.remove();else if(n&&0===n.indexOf("file://")&&(n=n.split("#")[1])&&(n="#"+n),n||r){if(r&&!/^_?(?:toc|edn|ftn)/i.test(r)){e.unwrap();continue}e.attr({href:n,name:r})}else e.unwrap()});var u=a.parse(t);return g.shouldConvertWordFakeLists(r)&&A(u),t=F({validate:r.settings.validate},i).serialize(u)}(t,e):e},isWordContent:function(t){return/<font face="Times New Roman"|class="?Mso|style="[^"]*\bmso-|style='[^'']*\bmso-|w:WordDocument/i.test(t)||/class="OutlineElement/.test(t)||/id="?docs\-internal\-guid\-/.test(t)}},K=function(t,e){return{content:t,cancelled:e}},q=function(t,e,n,r){var o,i,a,u,s,c,l=d(t,e,n,r),f=function(t,e){var n=k({},t.schema);n.addNodeFilter("meta",function(t){b.each(t,function(t){return t.remove()})});var r=n.parse(e,{forced_root_block:!1,isRootContent:!0});return F({validate:t.settings.validate},t.schema).serialize(r)}(t,l.content);return t.hasEventListeners("PastePostProcess")&&!l.isDefaultPrevented()?(i=f,a=n,u=r,s=(o=t).dom.create("div",{style:"display:none"},i),c=m(o,s,a,u),K(c.node.innerHTML,c.isDefaultPrevented())):K(f,l.isDefaultPrevented())},G=function(t,e,n){var r=V.isWordContent(e),o=r?V.preProcess(t,e):e;return q(t,o,n,r)},X=function(t,e){return t.insertContent(e,{merge:g.shouldMergeFormats(t),paste:!0}),!0},Y=function(t){return/^https?:\/\/[\w\?\-\/+=.&%@~#]+$/i.test(t)},Z=function(t){return Y(t)&&/.(gif|jpe?g|png)$/.test(t)},J=function(t,e,n){return!(!1!==t.selection.isCollapsed()||!Y(e)||(o=e,i=n,(r=t).undoManager.extra(function(){i(r,o)},function(){r.execCommand("mceInsertLink",!1,o)}),0));var r,o,i},Q=function(t,e,n){return!!Z(e)&&(o=e,i=n,(r=t).undoManager.extra(function(){i(r,o)},function(){r.insertContent('<img src="'+o+'">')}),!0);var r,o,i},tt=function(t,e){var n,r;!1===g.isSmartPasteEnabled(t)?X(t,e):(n=t,r=e,b.each([J,Q,X],function(t){return!0!==t(n,r,X)}))},et=function(){},nt=function(t){return function(){return t}},rt=nt(!1),ot=nt(!0),it=function(){return at},at=(M=function(t){return t.isNone()},B={fold:function(t,e){return t()},is:rt,isSome:rt,isNone:ot,getOr:N=function(t){return t},getOrThunk:L=function(t){return t()},getOrDie:function(t){throw new Error(t||"error: getOrDie called on none.")},getOrNull:nt(null),getOrUndefined:nt(undefined),or:N,orThunk:L,map:it,each:et,bind:it,exists:rt,forall:ot,filter:it,equals:M,equals_:M,toArray:function(){return[]},toString:nt("none()")},Object.freeze&&Object.freeze(B),B),ut=function(n){var t=nt(n),e=function(){return o},r=function(t){return t(n)},o={fold:function(t,e){return e(n)},is:function(t){return n===t},isSome:ot,isNone:rt,getOr:t,getOrThunk:t,getOrDie:t,getOrNull:t,getOrUndefined:t,or:e,orThunk:e,map:function(t){return ut(t(n))},each:function(t){t(n)},bind:r,exists:r,forall:r,filter:function(t){return t(n)?o:at},toArray:function(){return[n]},toString:function(){return"some("+n+")"},equals:function(t){return t.is(n)},equals_:function(t,e){return t.fold(rt,function(t){return e(n,t)})}};return o},st={some:ut,none:it,from:function(t){return null===t||t===undefined?at:ut(t)}},ct=(H="function",function(t){return function(t){if(null===t)return"null";var e=typeof t;return"object"===e&&(Array.prototype.isPrototypeOf(t)||t.constructor&&"Array"===t.constructor.name)?"array":"object"===e&&(String.prototype.isPrototypeOf(t)||t.constructor&&"String"===t.constructor.name)?"string":e}(t)===H}),lt=Array.prototype.slice,ft=function(t,e){for(var n=t.length,r=new Array(n),o=0;o<n;o++){var i=t[o];r[o]=e(i,o)}return r},dt=function(t,e){for(var n=0,r=t.length;n<r;n++)e(t[n],n)},mt=ct(Array.from)?Array.from:function(t){return lt.call(t)},pt={},gt={exports:pt};$=undefined,W=pt,U=gt,z=undefined,function(t){"object"==typeof W&&void 0!==U?U.exports=t():"function"==typeof $&&$.amd?$([],t):("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).EphoxContactWrapper=t()}(function(){return function i(a,u,s){function c(e,t){if(!u[e]){if(!a[e]){var n="function"==typeof z&&z;if(!t&&n)return n(e,!0);if(l)return l(e,!0);var r=new Error("Cannot find module '"+e+"'");throw r.code="MODULE_NOT_FOUND",r}var o=u[e]={exports:{}};a[e][0].call(o.exports,function(t){return c(a[e][1][t]||t)},o,o.exports,i,a,u,s)}return u[e].exports}for(var l="function"==typeof z&&z,t=0;t<s.length;t++)c(s[t]);return c}({1:[function(t,e,n){var r,o,i=e.exports={};function a(){throw new Error("setTimeout has not been defined")}function u(){throw new Error("clearTimeout has not been defined")}function s(t){if(r===setTimeout)return setTimeout(t,0);if((r===a||!r)&&setTimeout)return r=setTimeout,setTimeout(t,0);try{return r(t,0)}catch(e){try{return r.call(null,t,0)}catch(e){return r.call(this,t,0)}}}!function(){try{r="function"==typeof setTimeout?setTimeout:a}catch(t){r=a}try{o="function"==typeof clearTimeout?clearTimeout:u}catch(t){o=u}}();var c,l=[],f=!1,d=-1;function m(){f&&c&&(f=!1,c.length?l=c.concat(l):d=-1,l.length&&p())}function p(){if(!f){var t=s(m);f=!0;for(var e=l.length;e;){for(c=l,l=[];++d<e;)c&&c[d].run();d=-1,e=l.length}c=null,f=!1,function(t){if(o===clearTimeout)return clearTimeout(t);if((o===u||!o)&&clearTimeout)return o=clearTimeout,clearTimeout(t);try{o(t)}catch(e){try{return o.call(null,t)}catch(e){return o.call(this,t)}}}(t)}}function g(t,e){this.fun=t,this.array=e}function v(){}i.nextTick=function(t){var e=new Array(arguments.length-1);if(1<arguments.length)for(var n=1;n<arguments.length;n++)e[n-1]=arguments[n];l.push(new g(t,e)),1!==l.length||f||s(p)},g.prototype.run=function(){this.fun.apply(null,this.array)},i.title="browser",i.browser=!0,i.env={},i.argv=[],i.version="",i.versions={},i.on=v,i.addListener=v,i.once=v,i.off=v,i.removeListener=v,i.removeAllListeners=v,i.emit=v,i.prependListener=v,i.prependOnceListener=v,i.listeners=function(t){return[]},i.binding=function(t){throw new Error("process.binding is not supported")},i.cwd=function(){return"/"},i.chdir=function(t){throw new Error("process.chdir is not supported")},i.umask=function(){return 0}},{}],2:[function(t,f,e){(function(n){!function(t){var e=setTimeout;function r(){}function a(t){if("object"!=typeof this)throw new TypeError("Promises must be constructed via new");if("function"!=typeof t)throw new TypeError("not a function");this._state=0,this._handled=!1,this._value=undefined,this._deferreds=[],l(t,this)}function o(r,o){for(;3===r._state;)r=r._value;0!==r._state?(r._handled=!0,a._immediateFn(function(){var t=1===r._state?o.onFulfilled:o.onRejected;if(null!==t){var e;try{e=t(r._value)}catch(n){return void u(o.promise,n)}i(o.promise,e)}else(1===r._state?i:u)(o.promise,r._value)})):r._deferreds.push(o)}function i(t,e){try{if(e===t)throw new TypeError("A promise cannot be resolved with itself.");if(e&&("object"==typeof e||"function"==typeof e)){var n=e.then;if(e instanceof a)return t._state=3,t._value=e,void s(t);if("function"==typeof n)return void l((r=n,o=e,function(){r.apply(o,arguments)}),t)}t._state=1,t._value=e,s(t)}catch(i){u(t,i)}var r,o}function u(t,e){t._state=2,t._value=e,s(t)}function s(t){2===t._state&&0===t._deferreds.length&&a._immediateFn(function(){t._handled||a._unhandledRejectionFn(t._value)});for(var e=0,n=t._deferreds.length;e<n;e++)o(t,t._deferreds[e]);t._deferreds=null}function c(t,e,n){this.onFulfilled="function"==typeof t?t:null,this.onRejected="function"==typeof e?e:null,this.promise=n}function l(t,e){var n=!1;try{t(function(t){n||(n=!0,i(e,t))},function(t){n||(n=!0,u(e,t))})}catch(r){if(n)return;n=!0,u(e,r)}}a.prototype["catch"]=function(t){return this.then(null,t)},a.prototype.then=function(t,e){var n=new this.constructor(r);return o(this,new c(t,e,n)),n},a.all=function(t){var s=Array.prototype.slice.call(t);return new a(function(o,i){if(0===s.length)return o([]);var a=s.length;function u(e,t){try{if(t&&("object"==typeof t||"function"==typeof t)){var n=t.then;if("function"==typeof n)return void n.call(t,function(t){u(e,t)},i)}s[e]=t,0==--a&&o(s)}catch(r){i(r)}}for(var t=0;t<s.length;t++)u(t,s[t])})},a.resolve=function(e){return e&&"object"==typeof e&&e.constructor===a?e:new a(function(t){t(e)})},a.reject=function(n){return new a(function(t,e){e(n)})},a.race=function(o){return new a(function(t,e){for(var n=0,r=o.length;n<r;n++)o[n].then(t,e)})},a._immediateFn="function"==typeof n?function(t){n(t)}:function(t){e(t,0)},a._unhandledRejectionFn=function(t){"undefined"!=typeof console&&console&&console.warn("Possible Unhandled Promise Rejection:",t)},a._setImmediateFn=function(t){a._immediateFn=t},a._setUnhandledRejectionFn=function(t){a._unhandledRejectionFn=t},void 0!==f&&f.exports?f.exports=a:t.Promise||(t.Promise=a)}(this)}).call(this,t("timers").setImmediate)},{timers:3}],3:[function(s,t,c){(function(t,e){var r=s("process/browser.js").nextTick,n=Function.prototype.apply,o=Array.prototype.slice,i={},a=0;function u(t,e){this._id=t,this._clearFn=e}c.setTimeout=function(){return new u(n.call(setTimeout,window,arguments),clearTimeout)},c.setInterval=function(){return new u(n.call(setInterval,window,arguments),clearInterval)},c.clearTimeout=c.clearInterval=function(t){t.close()},u.prototype.unref=u.prototype.ref=function(){},u.prototype.close=function(){this._clearFn.call(window,this._id)},c.enroll=function(t,e){clearTimeout(t._idleTimeoutId),t._idleTimeout=e},c.unenroll=function(t){clearTimeout(t._idleTimeoutId),t._idleTimeout=-1},c._unrefActive=c.active=function(t){clearTimeout(t._idleTimeoutId);var e=t._idleTimeout;0<=e&&(t._idleTimeoutId=setTimeout(function(){t._onTimeout&&t._onTimeout()},e))},c.setImmediate="function"==typeof t?t:function(t){var e=a++,n=!(arguments.length<2)&&o.call(arguments,1);return i[e]=!0,r(function(){i[e]&&(n?t.apply(null,n):t.call(null),c.clearImmediate(e))}),e},c.clearImmediate="function"==typeof e?e:function(t){delete i[t]}}).call(this,s("timers").setImmediate,s("timers").clearImmediate)},{"process/browser.js":1,timers:3}],4:[function(t,e,n){var r=t("promise-polyfill"),o="undefined"!=typeof window?window:Function("return this;")();e.exports={boltExport:o.Promise||r}},{"promise-polyfill":2}]},{},[4])(4)});var vt=gt.exports.boltExport,ht=function(t){var n=st.none(),e=[],r=function(t){o()?a(t):e.push(t)},o=function(){return n.isSome()},i=function(t){dt(t,a)},a=function(e){n.each(function(t){v.setTimeout(function(){e(t)},0)})};return t(function(t){n=st.some(t),i(e),e=[]}),{get:r,map:function(n){return ht(function(e){r(function(t){e(n(t))})})},isReady:o}},yt={nu:ht,pure:function(e){return ht(function(t){t(e)})}},bt=function(t){v.setTimeout(function(){throw t},0)},wt=function(n){var t=function(t){n().then(t,bt)};return{map:function(t){return wt(function(){return n().then(t)})},bind:function(e){return wt(function(){return n().then(function(t){return e(t).toPromise()})})},anonBind:function(t){return wt(function(){return n().then(function(){return t.toPromise()})})},toLazy:function(){return yt.nu(t)},toCached:function(){var t=null;return wt(function(){return null===t&&(t=n()),t})},toPromise:n,get:t}},xt=function(t){return wt(function(){return new vt(t)})},_t=function(a,t){return t(function(r){var o=[],i=0;0===a.length?r([]):dt(a,function(t,e){var n;t.get((n=e,function(t){o[n]=t,++i>=a.length&&r(o)}))})})},Pt=function(t,e){return n=ft(t,e),_t(n,xt);var n},Tt=function(t,e,n){var r=n||w(e),o=G(t,f(e),r);!1===o.cancelled&&tt(t,o.content)},Dt=function(t,e){e=t.dom.encode(e).replace(/\r\n/g,"\n"),e=C(e,t.settings.forced_root_block,t.settings.forced_root_block_attrs),Tt(t,e,!1)},Ct=function(t){var e={};if(t){if(t.getData){var n=t.getData("Text");n&&0<n.length&&-1===n.indexOf("data:text/mce-internal,")&&(e["text/plain"]=n)}if(t.types)for(var r=0;r<t.types.length;r++){var o=t.types[r];try{e[o]=t.getData(o)}catch(i){e[o]=""}}}return e},kt=function(t,e){return e in t&&0<t[e].length},Ft=function(t){return kt(t,"text/html")||kt(t,"text/plain")},Et=O.createIdGenerator("mceclip"),Rt=function(e,t,n){var r,o,i,a,u="paste"===t.type?t.clipboardData:t.dataTransfer;if(e.settings.paste_data_images&&u){var s=(i=(o=u).items?ft(mt(o.items),function(t){return t.getAsFile()}):[],a=o.files?mt(o.files):[],function(t,e){for(var n=[],r=0,o=t.length;r<o;r++){var i=t[r];e(i,r)&&n.push(i)}return n}(0<i.length?i:a,function(t){return/^image\/(jpeg|png|gif|bmp)$/.test(t.type)}));if(0<s.length)return t.preventDefault(),(r=s,Pt(r,function(r){return xt(function(t){var e=r.getAsFile?r.getAsFile():r,n=new window.FileReader;n.onload=function(){t({blob:e,uri:n.result})},n.readAsDataURL(e)})})).get(function(t){n&&e.selection.setRng(n),dt(t,function(t){!function(t,e){var n,r,o,i,a,u,s,c=(n=e.uri,-1!==(r=n.indexOf(","))?n.substr(r+1):null),l=Et(),f=t.settings.images_reuse_filename&&e.blob.name?(o=t,i=e.blob.name,(a=i.match(/([\s\S]+?)\.(?:jpeg|jpg|png|gif)$/i))?o.dom.encode(a[1]):null):l,d=new v.Image;if(d.src=e.uri,u=t.settings,s=d,!u.images_dataimg_filter||u.images_dataimg_filter(s)){var m,p=t.editorUpload.blobCache,g=void 0;(m=p.findFirst(function(t){return t.base64()===c}))?g=m:(g=p.create(l,e.blob,c,f),p.add(g)),Tt(t,'<img src="'+g.blobUri()+'">',!1)}else Tt(t,'<img src="'+e.uri+'">',!1)}(e,t)})}),!0}return!1},It=function(t){return o.metaKeyPressed(t)&&86===t.keyCode||t.shiftKey&&45===t.keyCode},Ot=function(s,c,l){var e,f,d=(e=p(st.none()),{clear:function(){e.set(st.none())},set:function(t){e.set(st.some(t))},isSet:function(){return e.get().isSome()},on:function(t){e.get().each(t)}});function m(t,e,n,r){var o,i;kt(t,"text/html")?o=t["text/html"]:(o=c.getHtml(),r=r||w(o),c.isDefaultContent(o)&&(n=!0)),o=O.trimHtml(o),c.remove(),i=!1===r&&D(o),o.length&&!i||(n=!0),n&&(o=kt(t,"text/plain")&&i?t["text/plain"]:O.innerText(o)),c.isDefaultContent(o)?e||s.windowManager.alert("Please use Ctrl+V/Cmd+V keyboard shortcuts to paste contents."):n?Dt(s,o):Tt(s,o,r)}s.on("keydown",function(t){function e(t){It(t)&&!t.isDefaultPrevented()&&c.remove()}if(It(t)&&!t.isDefaultPrevented()){if((f=t.shiftKey&&86===t.keyCode)&&h.webkit&&-1!==v.navigator.userAgent.indexOf("Version/"))return;if(t.stopImmediatePropagation(),d.set(t),window.setTimeout(function(){d.clear()},100),h.ie&&f)return t.preventDefault(),void n(s,!0);c.remove(),c.create(),s.once("keyup",e),s.once("paste",function(){s.off("keyup",e)})}}),s.on("paste",function(t){var e,n,r,o=d.isSet(),i=(e=s,n=Ct(t.clipboardData||e.getDoc().dataTransfer),O.isMsEdge()?b.extend(n,{"text/html":""}):n),a="text"===l.get()||f,u=kt(i,x());f=!1,t.isDefaultPrevented()||(r=t.clipboardData,-1!==v.navigator.userAgent.indexOf("Android")&&r&&r.items&&0===r.items.length)?c.remove():Ft(i)||!Rt(s,t,c.getLastRng()||s.selection.getRng())?(o||t.preventDefault(),!h.ie||o&&!t.ieFake||kt(i,"text/html")||(c.create(),s.dom.bind(c.getEl(),"paste",function(t){t.stopPropagation()}),s.getDoc().execCommand("Paste",!1,null),i["text/html"]=c.getHtml()),kt(i,"text/html")?(t.preventDefault(),u||(u=w(i["text/html"])),m(i,o,a,u)):y.setEditorTimeout(s,function(){m(i,o,a,u)},0)):c.remove()})},St=function(t){return h.ie&&t.inline?v.document.body:t.getBody()},At=function(e,t,n){var r;St(r=e)!==r.getBody()&&e.dom.bind(t,"paste keyup",function(t){Lt(e,n)||e.fire("paste")})},jt=function(t){return t.dom.get("mcepastebin")},Mt=function(t,e){return e===t},Lt=function(t,e){var n,r=jt(t);return(n=r)&&"mcepastebin"===n.id&&Mt(e,r.innerHTML)},Nt=function(a){var u=p(null),s="%MCEPASTEBIN%";return{create:function(){return e=u,n=s,o=(t=a).dom,i=t.getBody(),e.set(t.selection.getRng()),r=t.dom.add(St(t),"div",{id:"mcepastebin","class":"mce-pastebin",contentEditable:!0,"data-mce-bogus":"all",style:"position: fixed; top: 50%; width: 10px; height: 10px; overflow: hidden; opacity: 0"},n),(h.ie||h.gecko)&&o.setStyle(r,"left","rtl"===o.getStyle(i,"direction",!0)?65535:-65535),o.bind(r,"beforedeactivate focusin focusout",function(t){t.stopPropagation()}),At(t,r,n),r.focus(),void t.selection.select(r,!0);var t,e,n,r,o,i},remove:function(){return function(t,e){if(jt(t)){for(var n=void 0,r=e.get();n=t.dom.get("mcepastebin");)t.dom.remove(n),t.dom.unbind(n);r&&t.selection.setRng(r)}e.set(null)}(a,u)},getEl:function(){return jt(a)},getHtml:function(){return function(n){var e,t,r,o,i,a=function(t,e){t.appendChild(e),n.dom.remove(e,!0)};for(t=b.grep(St(n).childNodes,function(t){return"mcepastebin"===t.id}),e=t.shift(),b.each(t,function(t){a(e,t)}),r=(o=n.dom.select("div[id=mcepastebin]",e)).length-1;0<=r;r--)i=n.dom.create("div"),e.insertBefore(i,o[r]),a(i,o[r]);return e?e.innerHTML:""}(a)},getLastRng:function(){return u.get()},isDefault:function(){return Lt(a,s)},isDefaultContent:function(t){return Mt(s,t)}}},Bt=function(n,t){var e=Nt(n);return n.on("preInit",function(){return Ot(a=n,e,t),void a.parser.addNodeFilter("img",function(t,e,n){var r,o=function(t){t.attr("data-mce-object")||u===h.transparentSrc||t.remove()};if(!a.settings.paste_data_images&&(r=n).data&&!0===r.data.paste)for(var i=t.length;i--;)(u=t[i].attributes.map.src)&&(0===u.indexOf("webkit-fake-url")?o(t[i]):a.settings.allow_html_data_urls||0!==u.indexOf("data:")||o(t[i]))});var a,u}),{pasteFormat:t,pasteHtml:function(t,e){return Tt(n,t,e)},pasteText:function(t){return Dt(n,t)},pasteImageData:function(t,e){return Rt(n,t,e)},getDataTransferItems:Ct,hasHtmlOrText:Ft,hasContentType:kt}},Ht=function(){},$t=function(t,e,n){if(r=t,!1!==h.iOS||r===undefined||"function"!=typeof r.setData||!0===O.isMsEdge())return!1;try{return t.clearData(),t.setData("text/html",e),t.setData("text/plain",n),t.setData(x(),e),!0}catch(o){return!1}var r},Wt=function(t,e,n,r){$t(t.clipboardData,e.html,e.text)?(t.preventDefault(),r()):n(e.html,r)},Ut=function(u){return function(t,e){var n=l(t),r=u.dom.create("div",{contenteditable:"false","data-mce-bogus":"all"}),o=u.dom.create("div",{contenteditable:"true"},n);u.dom.setStyles(r,{position:"fixed",top:"0",left:"-3000px",width:"1000px",overflow:"hidden"}),r.appendChild(o),u.dom.add(u.getBody(),r);var i=u.selection.getRng();o.focus();var a=u.dom.createRng();a.selectNodeContents(o),u.selection.setRng(a),setTimeout(function(){u.selection.setRng(i),r.parentNode.removeChild(r),e()},0)}},zt=function(t){return{html:t.selection.getContent({contextual:!0}),text:t.selection.getContent({format:"text"})}},Vt=function(t){return!t.selection.isCollapsed()||!!(e=t).dom.getParent(e.selection.getStart(),"td[data-mce-selected],th[data-mce-selected]",e.getBody());var e},Kt=function(t){var e,n;t.on("cut",(e=t,function(t){Vt(e)&&Wt(t,zt(e),Ut(e),function(){setTimeout(function(){e.execCommand("Delete")},0)})})),t.on("copy",(n=t,function(t){Vt(n)&&Wt(t,zt(n),Ut(n),Ht)}))},qt=tinymce.util.Tools.resolve("tinymce.dom.RangeUtils"),Gt=function(t,e){return qt.getCaretRangeFromPoint(e.clientX,e.clientY,t.getDoc())},Xt=function(t,e){t.focus(),t.selection.setRng(e)},Yt=function(a,u,s){g.shouldBlockDrop(a)&&a.on("dragend dragover draggesture dragdrop drop drag",function(t){t.preventDefault(),t.stopPropagation()}),g.shouldPasteDataImages(a)||a.on("drop",function(t){var e=t.dataTransfer;e&&e.files&&0<e.files.length&&t.preventDefault()}),a.on("drop",function(t){var e,n;if(n=Gt(a,t),!t.isDefaultPrevented()&&!s.get()){e=u.getDataTransferItems(t.dataTransfer);var r,o=u.hasContentType(e,x());if((u.hasHtmlOrText(e)&&(!(r=e["text/plain"])||0!==r.indexOf("file://"))||!u.pasteImageData(t,n))&&n&&g.shouldFilterDrop(a)){var i=e["mce-internal"]||e["text/html"]||e["text/plain"];i&&(t.preventDefault(),y.setEditorTimeout(a,function(){a.undoManager.transact(function(){e["mce-internal"]&&a.execCommand("Delete"),Xt(a,n),i=O.trimHtml(i),e["text/html"]?u.pasteHtml(i,o):u.pasteText(i)})}))}}}),a.on("dragstart",function(t){s.set(!0)}),a.on("dragover dragend",function(t){g.shouldPasteDataImages(a)&&!1===s.get()&&(t.preventDefault(),Xt(a,Gt(a,t))),"dragend"===t.type&&s.set(!1)})},Zt=function(t){var e=t.plugins.paste,n=g.getPreProcess(t);n&&t.on("PastePreProcess",function(t){n.call(e,e,t)});var r=g.getPostProcess(t);r&&t.on("PastePostProcess",function(t){r.call(e,e,t)})};function Jt(e,n){e.on("PastePreProcess",function(t){t.content=n(e,t.content,t.internal,t.wordContent)})}function Qt(t,e){if(!V.isWordContent(e))return e;var n=[];b.each(t.schema.getBlockElements(),function(t,e){n.push(e)});var r=new RegExp("(?:<br>&nbsp;[\\s\\r\\n]+|<br>)*(<\\/?("+n.join("|")+")[^>]*>)(?:<br>&nbsp;[\\s\\r\\n]+|<br>)*","g");return e=O.filter(e,[[r,"$1"]]),e=O.filter(e,[[/<br><br>/g,"<BR><BR>"],[/<br>/g," "],[/<BR><BR>/g,"<br>"]])}function te(t,e,n,r){if(r||n)return e;var c,o=g.getWebkitStyles(t);if(!1===g.shouldRemoveWebKitStyles(t)||"all"===o)return e;if(o&&(c=o.split(/[, ]/)),c){var l=t.dom,f=t.selection.getNode();e=e.replace(/(<[^>]+) style="([^"]*)"([^>]*>)/gi,function(t,e,n,r){var o=l.parseStyle(l.decode(n)),i={};if("none"===c)return e+r;for(var a=0;a<c.length;a++){var u=o[c[a]],s=l.getStyle(f,c[a],!0);/color/.test(c[a])&&(u=l.toHex(u),s=l.toHex(s)),s!==u&&(i[c[a]]=u)}return(i=l.serializeStyle(i,"span"))?e+' style="'+i+'"'+r:e+r})}else e=e.replace(/(<[^>]+) style="([^"]*)"([^>]*>)/gi,"$1$3");return e=e.replace(/(<[^>]+) data-mce-style="([^"]+)"([^>]*>)/gi,function(t,e,n,r){return e+' style="'+n+'"'+r})}function ee(n,t){n.$("a",t).find("font,u").each(function(t,e){n.dom.remove(e,!0)})}var ne=function(t){var e,n;h.webkit&&Jt(t,te),h.ie&&(Jt(t,Qt),n=ee,(e=t).on("PastePostProcess",function(t){n(e,t.node)}))},re=function(t,e,n){var r=n.control;r.active("text"===e.pasteFormat.get()),t.on("PastePlainTextToggle",function(t){r.active(t.state)})},oe=function(t,e){var n=function(r){for(var o=[],t=1;t<arguments.length;t++)o[t-1]=arguments[t];return function(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e];var n=o.concat(t);return r.apply(null,n)}}(re,t,e);t.addButton("pastetext",{active:!1,icon:"pastetext",tooltip:"Paste as text",cmd:"mceTogglePlainTextPaste",onPostRender:n}),t.addMenuItem("pastetext",{text:"Paste as text",selectable:!0,active:e.pasteFormat,cmd:"mceTogglePlainTextPaste",onPostRender:n})};e.add("paste",function(t){if(!1===a(t)){var e=p(!1),n=p(!1),r=p(g.isPasteAsTextEnabled(t)?"text":"html"),o=Bt(t,r),i=ne(t);return oe(t,o),c(t,o,e),Zt(t),Kt(t),Yt(t,o,n),u(o,i)}})}(window);
\ No newline at end of file
diff --git a/lib/web/tiny_mce_4/plugins/table/plugin.min.js b/lib/web/tiny_mce_4/plugins/table/plugin.min.js
index bdafd838616df..80d078b4e2a6b 100644
--- a/lib/web/tiny_mce_4/plugins/table/plugin.min.js
+++ b/lib/web/tiny_mce_4/plugins/table/plugin.min.js
@@ -1 +1 @@
-!function(m){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager"),y=function(){},x=function(n,r){return function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return n(r.apply(null,e))}},C=function(e){return function(){return e}},o=function(e){return e};function b(r){for(var o=[],e=1;e<arguments.length;e++)o[e-1]=arguments[e];return function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n=o.concat(e);return r.apply(null,n)}}var t,n,r,i,u,g=function(n){return function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return!n.apply(null,e)}},c=function(e){return e()},f=C(!1),a=C(!0),l=f,s=a,d=function(){return h},h=(i={fold:function(e,t){return e()},is:l,isSome:l,isNone:s,getOr:r=function(e){return e},getOrThunk:n=function(e){return e()},getOrDie:function(e){throw new Error(e||"error: getOrDie called on none.")},getOrNull:function(){return null},getOrUndefined:function(){return undefined},or:r,orThunk:n,map:d,ap:d,each:function(){},bind:d,flatten:d,exists:l,forall:s,filter:d,equals:t=function(e){return e.isNone()},equals_:t,toArray:function(){return[]},toString:C("none()")},Object.freeze&&Object.freeze(i),i),p=function(n){var e=function(){return n},t=function(){return o},r=function(e){return e(n)},o={fold:function(e,t){return t(n)},is:function(e){return n===e},isSome:s,isNone:l,getOr:e,getOrThunk:e,getOrDie:e,getOrNull:e,getOrUndefined:e,or:t,orThunk:t,map:function(e){return p(e(n))},ap:function(e){return e.fold(d,function(e){return p(e(n))})},each:function(e){e(n)},bind:r,flatten:e,exists:r,forall:r,filter:function(e){return e(n)?o:h},equals:function(e){return e.is(n)},equals_:function(e,t){return e.fold(l,function(e){return t(n,e)})},toArray:function(){return[n]},toString:function(){return"some("+n+")"}};return o},S={some:p,none:d,from:function(e){return null===e||e===undefined?h:p(e)}},v=function(t){return function(e){return function(e){if(null===e)return"null";var t=typeof e;return"object"===t&&(Array.prototype.isPrototypeOf(e)||e.constructor&&"Array"===e.constructor.name)?"array":"object"===t&&(String.prototype.isPrototypeOf(e)||e.constructor&&"String"===e.constructor.name)?"string":t}(e)===t}},w=v("string"),R=v("array"),T=v("boolean"),D=v("function"),O=v("number"),E=Array.prototype.slice,N=(u=Array.prototype.indexOf)===undefined?function(e,t){return j(e,t)}:function(e,t){return u.call(e,t)},k=function(e,t){return-1<N(e,t)},A=function(e,t){return L(e,t).isSome()},P=function(e,t){for(var n=e.length,r=new Array(n),o=0;o<n;o++){var i=e[o];r[o]=t(i,o,e)}return r},I=function(e,t){for(var n=0,r=e.length;n<r;n++)t(e[n],n,e)},B=function(e,t){for(var n=[],r=0,o=e.length;r<o;r++){var i=e[r];t(i,r,e)&&n.push(i)}return n},W=function(e,t,n){return function(e,t){for(var n=e.length-1;0<=n;n--)t(e[n],n,e)}(e,function(e){n=t(n,e)}),n},M=function(e,t,n){return I(e,function(e){n=t(n,e)}),n},_=function(e,t){for(var n=0,r=e.length;n<r;n++){var o=e[n];if(t(o,n,e))return S.some(o)}return S.none()},L=function(e,t){for(var n=0,r=e.length;n<r;n++)if(t(e[n],n,e))return S.some(n);return S.none()},j=function(e,t){for(var n=0,r=e.length;n<r;++n)if(e[n]===t)return n;return-1},F=Array.prototype.push,z=function(e){for(var t=[],n=0,r=e.length;n<r;++n){if(!Array.prototype.isPrototypeOf(e[n]))throw new Error("Arr.flatten item "+n+" was not an array, input: "+e);F.apply(t,e[n])}return t},H=function(e,t){var n=P(e,t);return z(n)},U=function(e,t){for(var n=0,r=e.length;n<r;++n)if(!0!==t(e[n],n,e))return!1;return!0},q=function(e){var t=E.call(e,0);return t.reverse(),t},V=(D(Array.from)&&Array.from,Object.keys),G=function(e,t){for(var n=V(e),r=0,o=n.length;r<o;r++){var i=n[r];t(e[i],i,e)}},Y=function(e,r){return X(e,function(e,t,n){return{k:t,v:r(e,t,n)}})},X=function(r,o){var i={};return G(r,function(e,t){var n=o(e,t,r);i[n.k]=n.v}),i},K=function(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e];return function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];if(t.length!==n.length)throw new Error('Wrong number of arguments to struct. Expected "['+t.length+']", got '+n.length+" arguments");var r={};return I(t,function(e,t){r[e]=C(n[t])}),r}},J=function(e){return e.slice(0).sort()},$=function(e,t){throw new Error("All required keys ("+J(e).join(", ")+") were not specified. Specified keys were: "+J(t).join(", ")+".")},Q=function(e){throw new Error("Unsupported keys for object: "+J(e).join(", "))},Z=function(t,e){if(!R(e))throw new Error("The "+t+" fields must be an array. Was: "+e+".");I(e,function(e){if(!w(e))throw new Error("The value "+e+" in the "+t+" fields was not a string.")})},ee=function(e){var n=J(e);_(n,function(e,t){return t<n.length-1&&e===n[t+1]}).each(function(e){throw new Error("The field: "+e+" occurs more than once in the combined fields: ["+n.join(", ")+"].")})},te=function(o,i){var u=o.concat(i);if(0===u.length)throw new Error("You must specify at least one required or optional field.");return Z("required",o),Z("optional",i),ee(u),function(t){var n=V(t);U(o,function(e){return k(n,e)})||$(o,n);var e=B(n,function(e){return!k(u,e)});0<e.length&&Q(e);var r={};return I(o,function(e){r[e]=C(t[e])}),I(i,function(e){r[e]=C(Object.prototype.hasOwnProperty.call(t,e)?S.some(t[e]):S.none())}),r}},ne=(m.Node.ATTRIBUTE_NODE,m.Node.CDATA_SECTION_NODE,m.Node.COMMENT_NODE),re=m.Node.DOCUMENT_NODE,oe=(m.Node.DOCUMENT_TYPE_NODE,m.Node.DOCUMENT_FRAGMENT_NODE,m.Node.ELEMENT_NODE),ie=m.Node.TEXT_NODE,ue=(m.Node.PROCESSING_INSTRUCTION_NODE,m.Node.ENTITY_REFERENCE_NODE,m.Node.ENTITY_NODE,m.Node.NOTATION_NODE,function(e){return e.dom().nodeName.toLowerCase()}),ae=function(e){return e.dom().nodeType},ce=function(t){return function(e){return ae(e)===t}},le=function(e){return ae(e)===ne||"#comment"===ue(e)},fe=ce(oe),se=ce(ie),de=ce(re),me=function(e,t,n){if(!(w(n)||T(n)||O(n)))throw m.console.error("Invalid call to Attr.set. Key ",t,":: Value ",n,":: Element ",e),new Error("Attribute value was not simple");e.setAttribute(t,n+"")},ge=function(e,t,n){me(e.dom(),t,n)},he=function(e,t){var n=e.dom();G(t,function(e,t){me(n,t,e)})},pe=function(e,t){var n=e.dom().getAttribute(t);return null===n?undefined:n},ve=function(e,t){var n=e.dom();return!(!n||!n.hasAttribute)&&n.hasAttribute(t)},be=function(e,t){e.dom().removeAttribute(t)},we=function(e){return M(e.dom().attributes,function(e,t){return e[t.name]=t.value,e},{})},ye=function(e,t){return-1!==e.indexOf(t)},xe=function(e){return e.style!==undefined&&D(e.style.getPropertyValue)},Ce=function(n){var r,o=!1;return function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return o||(o=!0,r=n.apply(null,e)),r}},Se=function(e){if(null===e||e===undefined)throw new Error("Node cannot be null or undefined");return{dom:C(e)}},Re={fromHtml:function(e,t){var n=(t||m.document).createElement("div");if(n.innerHTML=e,!n.hasChildNodes()||1<n.childNodes.length)throw m.console.error("HTML does not have a single root node",e),new Error("HTML must have a single root node");return Se(n.childNodes[0])},fromTag:function(e,t){var n=(t||m.document).createElement(e);return Se(n)},fromText:function(e,t){var n=(t||m.document).createTextNode(e);return Se(n)},fromDom:Se,fromPoint:function(e,t,n){var r=e.dom();return S.from(r.elementFromPoint(t,n)).map(Se)}},Te=function(e){var t=se(e)?e.dom().parentNode:e.dom();return t!==undefined&&null!==t&&t.ownerDocument.body.contains(t)},De=Ce(function(){return Oe(Re.fromDom(m.document))}),Oe=function(e){var t=e.dom().body;if(null===t||t===undefined)throw new Error("Body is not available yet");return Re.fromDom(t)},Ee=function(e,t,n){if(!w(n))throw m.console.error("Invalid call to CSS.set. Property ",t,":: Value ",n,":: Element ",e),new Error("CSS value must be a string: "+n);xe(e)&&e.style.setProperty(t,n)},Ne=function(e,t,n){var r=e.dom();Ee(r,t,n)},ke=function(e,t){var n=e.dom();G(t,function(e,t){Ee(n,t,e)})},Ae=function(e,t){var n=e.dom(),r=m.window.getComputedStyle(n).getPropertyValue(t),o=""!==r||Te(e)?r:Pe(n,t);return null===o?undefined:o},Pe=function(e,t){return xe(e)?e.style.getPropertyValue(t):""},Ie=function(e,t){var n=e.dom(),r=Pe(n,t);return S.from(r).filter(function(e){return 0<e.length})},Be=function(e,t){var n,r,o=e.dom();r=t,xe(n=o)&&n.style.removeProperty(r),ve(e,"style")&&""===pe(e,"style").replace(/^\s+|\s+$/g,"")&&be(e,"style")},We="undefined"!=typeof m.window?m.window:Function("return this;")(),Me=function(e,t){return function(e,t){for(var n=t!==undefined&&null!==t?t:We,r=0;r<e.length&&n!==undefined&&null!==n;++r)n=n[e[r]];return n}(e.split("."),t)},_e=function(e,t){var n=Me(e,t);if(n===undefined||null===n)throw e+" not available on this browser";return n},Le=function(){return _e("Node")},je=function(e,t,n){return 0!=(e.compareDocumentPosition(t)&n)},Fe=function(e,t){return je(e,t,Le().DOCUMENT_POSITION_CONTAINED_BY)},ze=function(e,t){var n=function(e,t){for(var n=0;n<e.length;n++){var r=e[n];if(r.test(t))return r}return undefined}(e,t);if(!n)return{major:0,minor:0};var r=function(e){return Number(t.replace(n,"$"+e))};return Ue(r(1),r(2))},He=function(){return Ue(0,0)},Ue=function(e,t){return{major:e,minor:t}},qe={nu:Ue,detect:function(e,t){var n=String(t).toLowerCase();return 0===e.length?He():ze(e,n)},unknown:He},Ve="Firefox",Ge=function(e,t){return function(){return t===e}},Ye=function(e){var t=e.current;return{current:t,version:e.version,isEdge:Ge("Edge",t),isChrome:Ge("Chrome",t),isIE:Ge("IE",t),isOpera:Ge("Opera",t),isFirefox:Ge(Ve,t),isSafari:Ge("Safari",t)}},Xe={unknown:function(){return Ye({current:undefined,version:qe.unknown()})},nu:Ye,edge:C("Edge"),chrome:C("Chrome"),ie:C("IE"),opera:C("Opera"),firefox:C(Ve),safari:C("Safari")},Ke="Windows",Je="Android",$e="Solaris",Qe="FreeBSD",Ze=function(e,t){return function(){return t===e}},et=function(e){var t=e.current;return{current:t,version:e.version,isWindows:Ze(Ke,t),isiOS:Ze("iOS",t),isAndroid:Ze(Je,t),isOSX:Ze("OSX",t),isLinux:Ze("Linux",t),isSolaris:Ze($e,t),isFreeBSD:Ze(Qe,t)}},tt={unknown:function(){return et({current:undefined,version:qe.unknown()})},nu:et,windows:C(Ke),ios:C("iOS"),android:C(Je),linux:C("Linux"),osx:C("OSX"),solaris:C($e),freebsd:C(Qe)},nt=function(e,t){var n=String(t).toLowerCase();return _(e,function(e){return e.search(n)})},rt=function(e,n){return nt(e,n).map(function(e){var t=qe.detect(e.versionRegexes,n);return{current:e.name,version:t}})},ot=function(e,n){return nt(e,n).map(function(e){var t=qe.detect(e.versionRegexes,n);return{current:e.name,version:t}})},it=/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,ut=function(t){return function(e){return ye(e,t)}},at=[{name:"Edge",versionRegexes:[/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],search:function(e){return ye(e,"edge/")&&ye(e,"chrome")&&ye(e,"safari")&&ye(e,"applewebkit")}},{name:"Chrome",versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/,it],search:function(e){return ye(e,"chrome")&&!ye(e,"chromeframe")}},{name:"IE",versionRegexes:[/.*?msie\ ?([0-9]+)\.([0-9]+).*/,/.*?rv:([0-9]+)\.([0-9]+).*/],search:function(e){return ye(e,"msie")||ye(e,"trident")}},{name:"Opera",versionRegexes:[it,/.*?opera\/([0-9]+)\.([0-9]+).*/],search:ut("opera")},{name:"Firefox",versionRegexes:[/.*?firefox\/\ ?([0-9]+)\.([0-9]+).*/],search:ut("firefox")},{name:"Safari",versionRegexes:[it,/.*?cpu os ([0-9]+)_([0-9]+).*/],search:function(e){return(ye(e,"safari")||ye(e,"mobile/"))&&ye(e,"applewebkit")}}],ct=[{name:"Windows",search:ut("win"),versionRegexes:[/.*?windows\ nt\ ?([0-9]+)\.([0-9]+).*/]},{name:"iOS",search:function(e){return ye(e,"iphone")||ye(e,"ipad")},versionRegexes:[/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,/.*cpu os ([0-9]+)_([0-9]+).*/,/.*cpu iphone os ([0-9]+)_([0-9]+).*/]},{name:"Android",search:ut("android"),versionRegexes:[/.*?android\ ?([0-9]+)\.([0-9]+).*/]},{name:"OSX",search:ut("os x"),versionRegexes:[/.*?os\ x\ ?([0-9]+)_([0-9]+).*/]},{name:"Linux",search:ut("linux"),versionRegexes:[]},{name:"Solaris",search:ut("sunos"),versionRegexes:[]},{name:"FreeBSD",search:ut("freebsd"),versionRegexes:[]}],lt={browsers:C(at),oses:C(ct)},ft=function(e){var t,n,r,o,i,u,a,c,l,f,s,d=lt.browsers(),m=lt.oses(),g=rt(d,e).fold(Xe.unknown,Xe.nu),h=ot(m,e).fold(tt.unknown,tt.nu);return{browser:g,os:h,deviceType:(n=g,r=e,o=(t=h).isiOS()&&!0===/ipad/i.test(r),i=t.isiOS()&&!o,u=t.isAndroid()&&3===t.version.major,a=t.isAndroid()&&4===t.version.major,c=o||u||a&&!0===/mobile/i.test(r),l=t.isiOS()||t.isAndroid(),f=l&&!c,s=n.isSafari()&&t.isiOS()&&!1===/safari/i.test(r),{isiPad:C(o),isiPhone:C(i),isTablet:C(c),isPhone:C(f),isTouch:C(l),isAndroid:t.isAndroid,isiOS:t.isiOS,isWebView:C(s)})}},st={detect:Ce(function(){var e=m.navigator.userAgent;return ft(e)})},dt=oe,mt=re,gt=function(e,t){var n=e.dom();if(n.nodeType!==dt)return!1;if(n.matches!==undefined)return n.matches(t);if(n.msMatchesSelector!==undefined)return n.msMatchesSelector(t);if(n.webkitMatchesSelector!==undefined)return n.webkitMatchesSelector(t);if(n.mozMatchesSelector!==undefined)return n.mozMatchesSelector(t);throw new Error("Browser lacks native selectors")},ht=function(e){return e.nodeType!==dt&&e.nodeType!==mt||0===e.childElementCount},pt=function(e,t){return e.dom()===t.dom()},vt=st.detect().browser.isIE()?function(e,t){return Fe(e.dom(),t.dom())}:function(e,t){var n=e.dom(),r=t.dom();return n!==r&&n.contains(r)},bt=gt,wt=function(e){return Re.fromDom(e.dom().ownerDocument)},yt=function(e){var t=e.dom();return S.from(t.parentNode).map(Re.fromDom)},xt=function(e,t){for(var n=D(t)?t:C(!1),r=e.dom(),o=[];null!==r.parentNode&&r.parentNode!==undefined;){var i=r.parentNode,u=Re.fromDom(i);if(o.push(u),!0===n(u))break;r=i}return o},Ct=function(e){var t=e.dom();return S.from(t.previousSibling).map(Re.fromDom)},St=function(e){var t=e.dom();return S.from(t.nextSibling).map(Re.fromDom)},Rt=function(e){var t=e.dom();return P(t.childNodes,Re.fromDom)},Tt=function(e,t){var n=e.dom().childNodes;return S.from(n[t]).map(Re.fromDom)},Dt=(K("element","offset"),function(t,n){yt(t).each(function(e){e.dom().insertBefore(n.dom(),t.dom())})}),Ot=function(e,t){St(e).fold(function(){yt(e).each(function(e){Nt(e,t)})},function(e){Dt(e,t)})},Et=function(t,n){Tt(t,0).fold(function(){Nt(t,n)},function(e){t.dom().insertBefore(n.dom(),e.dom())})},Nt=function(e,t){e.dom().appendChild(t.dom())},kt=function(e,t){Dt(e,t),Nt(t,e)},At=function(r,o){I(o,function(e,t){var n=0===t?r:o[t-1];Ot(n,e)})},Pt=function(t,e){I(e,function(e){Nt(t,e)})},It=function(e){e.dom().textContent="",I(Rt(e),function(e){Bt(e)})},Bt=function(e){var t=e.dom();null!==t.parentNode&&t.parentNode.removeChild(t)},Wt=function(e){var t,n=Rt(e);0<n.length&&(t=e,I(n,function(e){Dt(t,e)})),Bt(e)},Mt=(K("width","height"),K("width","height"),K("rows","columns")),_t=K("row","column"),Lt=(K("x","y"),K("element","rowspan","colspan")),jt=K("element","rowspan","colspan","isNew"),Ft=K("element","rowspan","colspan","row","column"),zt=K("element","cells","section"),Ht=K("element","isNew"),Ut=K("element","cells","section","isNew"),qt=K("cells","section"),Vt=K("details","section"),Gt=K("startRow","startCol","finishRow","finishCol"),Yt=function(e,t){var n=[];return I(Rt(e),function(e){t(e)&&(n=n.concat([e])),n=n.concat(Yt(e,t))}),n},Xt=function(e,t,n){return r=function(e){return gt(e,t)},B(xt(e,n),r);var r},Kt=function(e,t){return n=function(e){return gt(e,t)},B(Rt(e),n);var n},Jt=function(e,t){return n=t,o=(r=e)===undefined?m.document:r.dom(),ht(o)?[]:P(o.querySelectorAll(n),Re.fromDom);var n,r,o};function $t(e,t,n,r,o){return e(n,r)?S.some(n):D(o)&&o(n)?S.none():t(n,r,o)}var Qt,Zt,en,tn,nn,rn=function(e,t,n){for(var r=e.dom(),o=D(n)?n:C(!1);r.parentNode;){r=r.parentNode;var i=Re.fromDom(r);if(t(i))return S.some(i);if(o(i))break}return S.none()},on=function(e,t,n){return rn(e,function(e){return gt(e,t)},n)},un=function(e,t){return n=function(e){return gt(e,t)},_(e.dom().childNodes,x(n,Re.fromDom)).map(Re.fromDom);var n},an=function(e,t){return n=t,o=(r=e)===undefined?m.document:r.dom(),ht(o)?S.none():S.from(o.querySelector(n)).map(Re.fromDom);var n,r,o},cn=function(e,t,n){return $t(gt,on,e,t,n)},ln=function(e,t,n){return H(Rt(e),function(e){return gt(e,t)?n(e)?[e]:[]:ln(e,t,n)})},fn={firstLayer:function(e,t){return ln(e,t,C(!0))},filterFirstLayer:ln},sn=function(e,t,n){return void 0===n&&(n=f),n(t)?S.none():k(e,ue(t))?S.some(t):on(t,e.join(","),function(e){return gt(e,"table")||n(e)})},dn=function(t,e){return yt(e).map(function(e){return Kt(e,t)})},mn=b(dn,"th,td"),gn=b(dn,"tr"),hn=function(e,t){return parseInt(pe(e,t),10)},pn={cell:function(e,t){return sn(["td","th"],e,t)},firstCell:function(e){return an(e,"th,td")},cells:function(e){return fn.firstLayer(e,"th,td")},neighbourCells:mn,table:function(e,t){return cn(e,"table",t)},row:function(e,t){return sn(["tr"],e,t)},rows:function(e){return fn.firstLayer(e,"tr")},notCell:function(e,t){return sn(["caption","tr","tbody","tfoot","thead"],e,t)},neighbourRows:gn,attr:hn,grid:function(e,t,n){var r=hn(e,t),o=hn(e,n);return Mt(r,o)}},vn=function(e){var t=pn.rows(e);return P(t,function(e){var t=e,n=yt(t).map(function(e){var t=ue(e);return"tfoot"===t||"thead"===t||"tbody"===t?t:"tbody"}).getOr("tbody"),r=P(pn.cells(e),function(e){var t=ve(e,"rowspan")?parseInt(pe(e,"rowspan"),10):1,n=ve(e,"colspan")?parseInt(pe(e,"colspan"),10):1;return Lt(e,t,n)});return zt(t,r,n)})},bn=function(e,n){return P(e,function(e){var t=P(pn.cells(e),function(e){var t=ve(e,"rowspan")?parseInt(pe(e,"rowspan"),10):1,n=ve(e,"colspan")?parseInt(pe(e,"colspan"),10):1;return Lt(e,t,n)});return zt(e,t,n.section())})},wn=function(e,t){return e+","+t},yn=function(e,t){var n=H(e.all(),function(e){return e.cells()});return B(n,t)},xn={generate:function(e){var l={},t=[],n=e.length,f=0;I(e,function(e,a){var c=[];I(e.cells(),function(e){for(var t=0;l[wn(a,t)]!==undefined;)t++;for(var n=Ft(e.element(),e.rowspan(),e.colspan(),a,t),r=0;r<e.colspan();r++)for(var o=0;o<e.rowspan();o++){var i=t+r,u=wn(a+o,i);l[u]=n,f=Math.max(f,i+1)}c.push(n)}),t.push(zt(e.element(),c,e.section()))});var r=Mt(n,f);return{grid:C(r),access:C(l),all:C(t)}},getAt:function(e,t,n){var r=e.access()[wn(t,n)];return r!==undefined?S.some(r):S.none()},findItem:function(e,t,n){var r=yn(e,function(e){return n(t,e.element())});return 0<r.length?S.some(r[0]):S.none()},filterItems:yn,justCells:function(e){var t=P(e.all(),function(e){return e.cells()});return z(t)}},Cn=K("minRow","minCol","maxRow","maxCol"),Sn=function(e,t){var n,i,r,u,a,c,l,o,f,s,d=function(e){return gt(e.element(),t)},m=vn(e),g=xn.generate(m),h=(i=d,r=(n=g).grid().columns(),u=n.grid().rows(),a=r,l=c=0,G(n.access(),function(e){if(i(e)){var t=e.row(),n=t+e.rowspan()-1,r=e.column(),o=r+e.colspan()-1;t<u?u=t:c<n&&(c=n),r<a?a=r:l<o&&(l=o)}}),Cn(u,a,c,l)),p="th:not("+t+"),td:not("+t+")",v=fn.filterFirstLayer(e,"th,td",function(e){return gt(e,p)});return I(v,Bt),function(e,t,n,r){for(var o,i,u,a=t.grid().columns(),c=t.grid().rows(),l=0;l<c;l++)for(var f=!1,s=0;s<a;s++)l<n.minRow()||l>n.maxRow()||s<n.minCol()||s>n.maxCol()||(xn.getAt(t,l,s).filter(r).isNone()?(o=f,i=e[l].element(),u=Re.fromTag("td"),Nt(u,Re.fromTag("br")),(o?Nt:Et)(i,u)):f=!0)}(m,g,h,d),o=e,f=h,s=B(fn.firstLayer(o,"tr"),function(e){return 0===e.dom().childElementCount}),I(s,Bt),f.minCol()!==f.maxCol()&&f.minRow()!==f.maxRow()||I(fn.firstLayer(o,"th,td"),function(e){be(e,"rowspan"),be(e,"colspan")}),be(o,"width"),be(o,"height"),Be(o,"width"),Be(o,"height"),e},Rn=(Qt=se,Zt="text",en=function(e){return Qt(e)?S.from(e.dom().nodeValue):S.none()},tn=st.detect().browser,{get:function(e){if(!Qt(e))throw new Error("Can only get "+Zt+" value of a "+Zt+" node");return nn(e).getOr("")},getOption:nn=tn.isIE()&&10===tn.version.major?function(e){try{return en(e)}catch(t){return S.none()}}:en,set:function(e,t){if(!Qt(e))throw new Error("Can only set raw "+Zt+" value of a "+Zt+" node");e.dom().nodeValue=t}}),Tn=function(e){return Rn.get(e)},Dn=function(e){return Rn.getOption(e)},On=function(e,t){Rn.set(e,t)},En=function(e){return"img"===ue(e)?1:Dn(e).fold(function(){return Rt(e).length},function(e){return e.length})},Nn=["img","br"],kn=function(e){return Dn(e).filter(function(e){return 0!==e.trim().length||-1<e.indexOf("\xa0")}).isSome()||k(Nn,ue(e))},An=function(e){return r=kn,(o=function(e){for(var t=0;t<e.childNodes.length;t++){if(r(Re.fromDom(e.childNodes[t])))return S.some(Re.fromDom(e.childNodes[t]));var n=o(e.childNodes[t]);if(n.isSome())return n}return S.none()})(e.dom());var r,o},Pn=function(e){return In(e,kn)},In=function(e,i){var u=function(e){for(var t=Rt(e),n=t.length-1;0<=n;n--){var r=t[n];if(i(r))return S.some(r);var o=u(r);if(o.isSome())return o}return S.none()};return u(e)},Bn=function(e,t){return Re.fromDom(e.dom().cloneNode(t))},Wn=function(e){return Bn(e,!1)},Mn=function(e){return Bn(e,!0)},_n=function(e,t){var n,r,o,i,u=(n=e,r=t,o=Re.fromTag(r),i=we(n),he(o,i),o),a=Rt(Mn(e));return Pt(u,a),u},Ln=function(){var e=Re.fromTag("td");return Nt(e,Re.fromTag("br")),e},jn=function(e,t,n){var r=_n(e,t);return G(n,function(e,t){null===e?be(r,t):ge(r,t,e)}),r},Fn=function(e){return e},zn=function(e){return function(){return Re.fromTag("tr",e.dom())}},Hn=function(d,e,m){return{row:zn(e),cell:function(e){var r,o,i,t,n,u,a,c=wt(e.element()),l=Re.fromTag(ue(e.element()),c.dom()),f=m.getOr(["strong","em","b","i","span","font","h1","h2","h3","h4","h5","h6","p","div"]),s=0<f.length?(r=e.element(),o=l,i=f,An(r).map(function(e){var t=i.join(","),n=Xt(e,t,function(e){return pt(e,r)});return W(n,function(e,t){var n=Wn(t);return be(n,"contenteditable"),Nt(e,n),n},o)}).getOr(o)):l;return Nt(s,Re.fromTag("br")),t=e.element(),n=l,u=t.dom(),a=n.dom(),xe(u)&&xe(a)&&(a.style.cssText=u.style.cssText),Be(l,"height"),1!==e.colspan()&&Be(e.element(),"width"),d(e.element(),l),l},replace:jn,gap:Ln}},Un=function(e){return{row:zn(e),cell:Ln,replace:Fn,gap:Ln}},qn=function(e,t){return t.column()>=e.startCol()&&t.column()+t.colspan()-1<=e.finishCol()&&t.row()>=e.startRow()&&t.row()+t.rowspan()-1<=e.finishRow()},Vn=function(e,t){var n=t.column(),r=t.column()+t.colspan()-1,o=t.row(),i=t.row()+t.rowspan()-1;return n<=e.finishCol()&&r>=e.startCol()&&o<=e.finishRow()&&i>=e.startRow()},Gn=function(e,t){for(var n=!0,r=b(qn,t),o=t.startRow();o<=t.finishRow();o++)for(var i=t.startCol();i<=t.finishCol();i++)n=n&&xn.getAt(e,o,i).exists(r);return n?S.some(t):S.none()},Yn=function(e,t,n){var r=xn.findItem(e,t,pt),o=xn.findItem(e,n,pt);return r.bind(function(r){return o.map(function(e){return t=r,n=e,Gt(Math.min(t.row(),n.row()),Math.min(t.column(),n.column()),Math.max(t.row()+t.rowspan()-1,n.row()+n.rowspan()-1),Math.max(t.column()+t.colspan()-1,n.column()+n.colspan()-1));var t,n})})},Xn=Yn,Kn=function(t,e,n){return Yn(t,e,n).bind(function(e){return Gn(t,e)})},Jn=function(r,e,o,i){return xn.findItem(r,e,pt).bind(function(e){var t=0<o?e.row()+e.rowspan()-1:e.row(),n=0<i?e.column()+e.colspan()-1:e.column();return xn.getAt(r,t+o,n+i).map(function(e){return e.element()})})},$n=function(n,e,t){return Xn(n,e,t).map(function(e){var t=xn.filterItems(n,b(Vn,e));return P(t,function(e){return e.element()})})},Qn=function(e,t){return xn.findItem(e,t,function(e,t){return vt(t,e)}).map(function(e){return e.element()})},Zn=function(e){var t=vn(e);return xn.generate(t)},er=function(n,r,o){return pn.table(n).bind(function(e){var t=Zn(e);return Jn(t,n,r,o)})},tr=function(e,t,n){var r=Zn(e);return $n(r,t,n)},nr=function(e,t,n,r,o){var i=Zn(e),u=pt(e,n)?S.some(t):Qn(i,t),a=pt(e,o)?S.some(r):Qn(i,r);return u.bind(function(t){return a.bind(function(e){return $n(i,t,e)})})},rr=function(e,t,n){var r=Zn(e);return Kn(r,t,n)},or=["body","p","div","article","aside","figcaption","figure","footer","header","nav","section","ol","ul","li","table","thead","tbody","tfoot","caption","tr","td","th","h1","h2","h3","h4","h5","h6","blockquote","pre","address"];function ir(){return{up:C({selector:on,closest:cn,predicate:rn,all:xt}),down:C({selector:Jt,predicate:Yt}),styles:C({get:Ae,getRaw:Ie,set:Ne,remove:Be}),attrs:C({get:pe,set:ge,remove:be,copyTo:function(e,t){var n=we(e);he(t,n)}}),insert:C({before:Dt,after:Ot,afterAll:At,append:Nt,appendAll:Pt,prepend:Et,wrap:kt}),remove:C({unwrap:Wt,remove:Bt}),create:C({nu:Re.fromTag,clone:function(e){return Re.fromDom(e.dom().cloneNode(!1))},text:Re.fromText}),query:C({comparePosition:function(e,t){return e.dom().compareDocumentPosition(t.dom())},prevSibling:Ct,nextSibling:St}),property:C({children:Rt,name:ue,parent:yt,document:function(e){return e.dom().ownerDocument},isText:se,isComment:le,isElement:fe,getText:Tn,setText:On,isBoundary:function(e){return!!fe(e)&&("body"===ue(e)||k(or,ue(e)))},isEmptyTag:function(e){return!!fe(e)&&k(["br","img","hr","input"],ue(e))}}),eq:pt,is:bt}}var ur=K("left","right"),ar=K("first","second","splits"),cr=function(e,t,n){var r=e.property().children(t);return L(r,b(e.eq,n)).map(function(e){return{before:C(r.slice(0,e)),after:C(r.slice(e+1))}})},lr=function(r,o,e,t){var n=o(r,e);return W(t,function(e,t){var n=o(r,t);return fr(r,e,n)},n)},fr=function(t,e,n){return e.bind(function(e){return n.filter(b(t.eq,e))})},sr=function(e,t){return b(e.eq,t)},dr=function(t,e,n,r){void 0===r&&(r=f);var o=[e].concat(t.up().all(e)),i=[n].concat(t.up().all(n)),u=function(t){return L(t,r).fold(function(){return t},function(e){return t.slice(0,e+1)})},a=u(o),c=u(i),l=_(a,function(e){return A(c,sr(t,e))});return{firstpath:C(a),secondpath:C(c),shared:C(l)}},mr={sharedOne:function(e,t,n){return 0<n.length?lr(e,t,(r=n)[0],r.slice(1)):S.none();var r},subset:function(t,e,n){var r=dr(t,e,n);return r.shared().bind(function(e){return function(o,i,e,t){var u=o.property().children(i);if(o.eq(i,e[0]))return S.some([e[0]]);if(o.eq(i,t[0]))return S.some([t[0]]);var n=function(e){var t=q(e),n=L(t,sr(o,i)).getOr(-1),r=n<t.length-1?t[n+1]:t[n];return L(u,sr(o,r))},r=n(e),a=n(t);return r.bind(function(r){return a.map(function(e){var t=Math.min(r,e),n=Math.max(r,e);return u.slice(t,n+1)})})}(t,e,r.firstpath(),r.secondpath())})},ancestors:dr,breakToLeft:function(n,r,o){return cr(n,r,o).map(function(e){var t=n.create().clone(r);return n.insert().appendAll(t,e.before().concat([o])),n.insert().appendAll(r,e.after()),n.insert().before(r,t),ur(t,r)})},breakToRight:function(n,r,e){return cr(n,r,e).map(function(e){var t=n.create().clone(r);return n.insert().appendAll(t,e.after()),n.insert().after(r,t),ur(r,t)})},breakPath:function(i,e,u,a){var c=function(e,t,o){var n=ar(e,S.none(),o);return u(e)?ar(e,t,o):i.property().parent(e).bind(function(r){return a(i,r,e).map(function(e){var t=[{first:e.left,second:e.right}],n=u(r)?r:e.left();return c(n,S.some(e.right()),o.concat(t))})}).getOr(n)};return c(e,S.none(),[])}},gr=ir(),hr={sharedOne:function(n,e){return mr.sharedOne(gr,function(e,t){return n(t)},e)},subset:function(e,t){return mr.subset(gr,e,t)},ancestors:function(e,t,n){return mr.ancestors(gr,e,t,n)},breakToLeft:function(e,t){return mr.breakToLeft(gr,e,t)},breakToRight:function(e,t){return mr.breakToRight(gr,e,t)},breakPath:function(e,t,r){return mr.breakPath(gr,e,t,function(e,t,n){return r(t,n)})}},pr={create:te(["boxes","start","finish"],[])},vr=function(e){return on(e,"table")},br=function(a,c,r){var l=function(t){return function(e){return r!==undefined&&r(e)||pt(e,t)}};return pt(a,c)?S.some(pr.create({boxes:S.some([a]),start:a,finish:c})):vr(a).bind(function(u){return vr(c).bind(function(i){if(pt(u,i))return S.some(pr.create({boxes:tr(u,a,c),start:a,finish:c}));if(vt(u,i)){var e=0<(t=Xt(c,"td,th",l(u))).length?t[t.length-1]:c;return S.some(pr.create({boxes:nr(u,a,u,c,i),start:a,finish:e}))}if(vt(i,u)){var t,n=0<(t=Xt(a,"td,th",l(i))).length?t[t.length-1]:a;return S.some(pr.create({boxes:nr(i,a,u,c,i),start:a,finish:n}))}return hr.ancestors(a,c).shared().bind(function(e){return cn(e,"table",r).bind(function(e){var t=Xt(c,"td,th",l(e)),n=0<t.length?t[t.length-1]:c,r=Xt(a,"td,th",l(e)),o=0<r.length?r[r.length-1]:a;return S.some(pr.create({boxes:nr(e,a,u,c,i),start:o,finish:n}))})})})})},wr=br,yr=function(e,t){var n=Jt(e,t);return 0<n.length?S.some(n):S.none()},xr=function(e,t,n,r,o){return(i=e,u=o,_(i,function(e){return gt(e,u)})).bind(function(e){return er(e,t,n).bind(function(e){return n=r,on(t=e,"table").bind(function(e){return an(e,n).bind(function(e){return br(e,t).bind(function(t){return t.boxes().map(function(e){return{boxes:C(e),start:C(t.start()),finish:C(t.finish())}})})})});var t,n})});var i,u},Cr=function(e,t,r){return an(e,t).bind(function(n){return an(e,r).bind(function(t){return hr.sharedOne(vr,[n,t]).map(function(e){return{first:C(n),last:C(t),table:C(e)}})})})},Sr=function(e,t){return yr(e,t)},Rr=function(o,e,t){return Cr(o,e,t).bind(function(n){var e=function(e){return pt(o,e)},t=on(n.first(),"thead,tfoot,tbody,table",e),r=on(n.last(),"thead,tfoot,tbody,table",e);return t.bind(function(t){return r.bind(function(e){return pt(t,e)?rr(n.table(),n.first(),n.last()):S.none()})})})},Tr="data-mce-selected",Dr="data-mce-first-selected",Or="data-mce-last-selected",Er={selected:C(Tr),selectedSelector:C("td[data-mce-selected],th[data-mce-selected]"),attributeSelector:C("[data-mce-selected]"),firstSelected:C(Dr),firstSelectedSelector:C("td[data-mce-first-selected],th[data-mce-first-selected]"),lastSelected:C(Or),lastSelectedSelector:C("td[data-mce-last-selected],th[data-mce-last-selected]")},Nr=function(u){if(!R(u))throw new Error("cases must be an array");if(0===u.length)throw new Error("there must be at least one case");var a=[],n={};return I(u,function(e,r){var t=V(e);if(1!==t.length)throw new Error("one and only one name per case");var o=t[0],i=e[o];if(n[o]!==undefined)throw new Error("duplicate key detected:"+o);if("cata"===o)throw new Error("cannot have a case named cata (sorry)");if(!R(i))throw new Error("case arguments must be an array");a.push(o),n[o]=function(){var e=arguments.length;if(e!==i.length)throw new Error("Wrong number of arguments to case "+o+". Expected "+i.length+" ("+i+"), got "+e);for(var n=new Array(e),t=0;t<n.length;t++)n[t]=arguments[t];return{fold:function(){if(arguments.length!==u.length)throw new Error("Wrong number of arguments to fold. Expected "+u.length+", got "+arguments.length);return arguments[r].apply(null,n)},match:function(e){var t=V(e);if(a.length!==t.length)throw new Error("Wrong number of arguments to match. Expected: "+a.join(",")+"\nActual: "+t.join(","));if(!U(a,function(e){return k(t,e)}))throw new Error("Not all branches were specified when using match. Specified: "+t.join(", ")+"\nRequired: "+a.join(", "));return e[o].apply(null,n)},log:function(e){m.console.log(e,{constructors:a,constructor:o,params:n})}}}}),n},kr=Nr([{none:[]},{multiple:["elements"]},{single:["selection"]}]),Ar={cata:function(e,t,n,r){return e.fold(t,n,r)},none:kr.none,multiple:kr.multiple,single:kr.single},Pr=function(e,t){return Ar.cata(t.get(),C([]),o,C([e]))},Ir=function(n,e){return Ar.cata(e.get(),S.none,function(t,e){return 0===t.length?S.none():Rr(n,Er.firstSelectedSelector(),Er.lastSelectedSelector()).bind(function(e){return 1<t.length?S.some({bounds:C(e),cells:C(t)}):S.none()})},S.none)},Br=function(e,t){var n=Pr(e,t);return 0<n.length&&U(n,function(e){return ve(e,"rowspan")&&1<parseInt(pe(e,"rowspan"),10)||ve(e,"colspan")&&1<parseInt(pe(e,"colspan"),10)})?S.some(n):S.none()},Wr=Pr,Mr=function(e){return{element:C(e),mergable:S.none,unmergable:S.none,selection:C([e])}},_r=K("element","clipboard","generators"),Lr={noMenu:Mr,forMenu:function(e,t,n){return{element:C(n),mergable:C(Ir(t,e)),unmergable:C(Br(n,e)),selection:C(Wr(n,e))}},notCell:function(e){return Mr(e)},paste:_r,pasteRows:function(e,t,n,r,o){return{element:C(n),mergable:S.none,unmergable:S.none,selection:C(Wr(n,e)),clipboard:C(r),generators:C(o)}}},jr=function(f,e,s,d){f.on("BeforeGetContent",function(n){!0===n.selection&&Ar.cata(e.get(),y,function(e){var t;n.preventDefault(),(t=e,pn.table(t[0]).map(Mn).map(function(e){return[Sn(e,Er.attributeSelector())]})).each(function(e){var t;n.content="text"===n.format?P(e,function(e){return e.dom().innerText}).join(""):(t=f,P(e,function(e){return t.selection.serializer.serialize(e.dom(),{})}).join(""))})},y)}),f.on("BeforeSetContent",function(l){!0===l.selection&&!0===l.paste&&S.from(f.dom.getParent(f.selection.getStart(),"th,td")).each(function(e){var c=Re.fromDom(e);pn.table(c).each(function(t){var e,n,r,o=B((e=l.content,(r=(n||m.document).createElement("div")).innerHTML=e,Rt(Re.fromDom(r))),function(e){return"meta"!==ue(e)});if(1===o.length&&"table"===ue(o[0])){l.preventDefault();var i=Re.fromDom(f.getDoc()),u=Un(i),a=Lr.paste(c,o[0],u);s.pasteCells(t,a).each(function(e){f.selection.setRng(e),f.focus(),d.clear(t)})}})})})};function Fr(r,o){var e=function(e){var t=o(e);if(t<=0||null===t){var n=Ae(e,r);return parseFloat(n)||0}return t},i=function(o,e){return M(e,function(e,t){var n=Ae(o,t),r=n===undefined?0:parseInt(n,10);return isNaN(r)?e:e+r},0)};return{set:function(e,t){if(!O(t)&&!t.match(/^[0-9]+$/))throw new Error(r+".set accepts only positive integer values. Value was "+t);var n=e.dom();xe(n)&&(n.style[r]=t+"px")},get:e,getOuter:e,aggregate:i,max:function(e,t,n){var r=i(e,n);return r<t?t-r:0}}}var zr=Fr("height",function(e){var t=e.dom();return Te(e)?t.getBoundingClientRect().height:t.offsetHeight}),Hr=function(e){return zr.get(e)},Ur=function(e){return zr.getOuter(e)},qr=Fr("width",function(e){return e.dom().offsetWidth}),Vr=function(e){return qr.get(e)},Gr=function(e){return qr.getOuter(e)},Yr=st.detect(),Xr=function(e,t,n){return r=Ae(e,t),o=n,i=parseFloat(r),isNaN(i)?o:i;var r,o,i},Kr=function(e){return Yr.browser.isIE()||Yr.browser.isEdge()?(n=Xr(t=e,"padding-top",0),r=Xr(t,"padding-bottom",0),o=Xr(t,"border-top-width",0),i=Xr(t,"border-bottom-width",0),u=t.dom().getBoundingClientRect().height,"border-box"===Ae(t,"box-sizing")?u:u-n-r-(o+i)):Xr(e,"height",Hr(e));var t,n,r,o,i,u},Jr=/(\d+(\.\d+)?)(\w|%)*/,$r=/(\d+(\.\d+)?)%/,Qr=/(\d+(\.\d+)?)px|em/,Zr=function(e,t){Ne(e,"height",t+"px")},eo=function(e,t,n,r){var o,i,u,a,c,l,f,s,d,m=parseInt(e,10);return s=l="%",d=(f=e).length-l.length,""!==s&&(f.length<s.length||f.substr(d,d+s.length)!==s)||"table"===ue(t)?m:(o=t,i=m,u=n,a=r,c=pn.table(o).map(function(e){var t=u(e);return Math.floor(i/100*t)}).getOr(i),a(o,c),c)},to=function(e){var t,n=Ie(t=e,"height").getOrThunk(function(){return Kr(t)+"px"});return n?eo(n,e,Hr,Zr):Hr(e)},no=function(e,t){return ve(e,t)?parseInt(pe(e,t),10):1},ro=function(e){return Ie(e,"width").fold(function(){return S.from(pe(e,"width"))},function(e){return S.some(e)})},oo=function(e,t){return e/t.pixelWidth()*100},io={percentageBasedSizeRegex:C($r),pixelBasedSizeRegex:C(Qr),setPixelWidth:function(e,t){Ne(e,"width",t+"px")},setPercentageWidth:function(e,t){Ne(e,"width",t+"%")},setHeight:Zr,getPixelWidth:function(t,n){return ro(t).fold(function(){return Vr(t)},function(e){return function(e,t,n){var r=Qr.exec(t);if(null!==r)return parseInt(r[1],10);var o=$r.exec(t);if(null!==o){var i=parseFloat(o[1]);return i/100*n.pixelWidth()}return Vr(e)}(t,e,n)})},getPercentageWidth:function(t,n){return ro(t).fold(function(){var e=Vr(t);return oo(e,n)},function(e){return function(e,t,n){var r=$r.exec(t);if(null!==r)return parseFloat(r[1]);var o=Vr(e);return oo(o,n)}(t,e,n)})},getGenericWidth:function(e){return ro(e).bind(function(e){var t=Jr.exec(e);return null!==t?S.some({width:C(parseFloat(t[1])),unit:C(t[3])}):S.none()})},setGenericWidth:function(e,t,n){Ne(e,"width",t+n)},getHeight:function(e){return n="rowspan",to(t=e)/no(t,n);var t,n},getRawWidth:ro},uo=function(n,r){io.getGenericWidth(n).each(function(e){var t=e.width()/2;io.setGenericWidth(n,t,e.unit()),io.setGenericWidth(r,t,e.unit())})},ao=function(n,r){return{left:C(n),top:C(r),translate:function(e,t){return ao(n+e,r+t)}}},co=ao,lo=function(e,t){return e!==undefined?e:t!==undefined?t:0},fo=function(e){var t,n,r=e.dom().ownerDocument,o=r.body,i=(t=Re.fromDom(r),(n=t.dom())===n.window&&t instanceof m.Window?t:de(t)?n.defaultView||n.parentWindow:null),u=r.documentElement,a=lo(i.pageYOffset,u.scrollTop),c=lo(i.pageXOffset,u.scrollLeft),l=lo(u.clientTop,o.clientTop),f=lo(u.clientLeft,o.clientLeft);return so(e).translate(c-f,a-l)},so=function(e){var t,n,r,o=e.dom(),i=o.ownerDocument,u=i.body,a=Re.fromDom(i.documentElement);return u===o?co(u.offsetLeft,u.offsetTop):(t=e,n=a||Re.fromDom(m.document.documentElement),rn(t,b(pt,n)).isSome()?(r=o.getBoundingClientRect(),co(r.left,r.top)):co(0,0))},mo=K("row","y"),go=K("col","x"),ho=function(e){return fo(e).left()+Gr(e)},po=function(e){return fo(e).left()},vo=function(e,t){return go(e,po(t))},bo=function(e,t){return go(e,ho(t))},wo=function(e){return fo(e).top()},yo=function(e,t){return mo(e,wo(t))},xo=function(e,t){return mo(e,wo(t)+Ur(t))},Co=function(n,t,r){if(0===r.length)return[];var e=P(r.slice(1),function(e,t){return e.map(function(e){return n(t,e)})}),o=r[r.length-1].map(function(e){return t(r.length-1,e)});return e.concat([o])},So={height:{delta:o,positions:function(e){return Co(yo,xo,e)},edge:wo},rtl:{delta:function(e){return-e},edge:ho,positions:function(e){return Co(bo,vo,e)}},ltr:{delta:o,edge:po,positions:function(e){return Co(vo,bo,e)}}},Ro={ltr:So.ltr,rtl:So.rtl};function To(t){var n=function(e){return t(e).isRtl()?Ro.rtl:Ro.ltr};return{delta:function(e,t){return n(t).delta(e,t)},edge:function(e){return n(e).edge(e)},positions:function(e,t){return n(t).positions(e,t)}}}var Do=function(e){var t=vn(e);return xn.generate(t).grid()},Oo=function(){return(Oo=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var o in t=arguments[n])Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);return e}).apply(this,arguments)},Eo=function(e){for(var t=[],n=function(e){t.push(e)},r=0;r<e.length;r++)e[r].each(n);return t},No=function(e,t){for(var n=0;n<e.length;n++){var r=t(e[n],n);if(r.isSome())return r}return S.none()},ko=function(e,t,n,r){n===r?be(e,t):ge(e,t,n)},Ao=function(o,e){var i=[],u=[],t=function(e,t){0<e.length?function(e,t){var n=un(o,t).getOrThunk(function(){var e=Re.fromTag(t,wt(o).dom());return Nt(o,e),e});It(n);var r=P(e,function(e){e.isNew()&&i.push(e.element());var t=e.element();return It(t),I(e.cells(),function(e){e.isNew()&&u.push(e.element()),ko(e.element(),"colspan",e.colspan(),1),ko(e.element(),"rowspan",e.rowspan(),1),Nt(t,e.element())}),t});Pt(n,r)}(e,t):un(o,t).each(Bt)},n=[],r=[],a=[];return I(e,function(e){switch(e.section()){case"thead":n.push(e);break;case"tbody":r.push(e);break;case"tfoot":a.push(e)}}),t(n,"thead"),t(r,"tbody"),t(a,"tfoot"),{newRows:C(i),newCells:C(u)}},Po=function(e){return P(e,function(e){var n=Wn(e.element());return I(e.cells(),function(e){var t=Mn(e.element());ko(t,"colspan",e.colspan(),1),ko(t,"rowspan",e.rowspan(),1),Nt(n,t)}),n})},Io=function(e,t){var n=pe(e,t);return n===undefined||""===n?[]:n.split(" ")},Bo=function(e){return e.dom().classList!==undefined},Wo=function(e,t){return o=t,i=Io(n=e,r="class").concat([o]),ge(n,r,i.join(" ")),!0;var n,r,o,i},Mo=function(e,t){return o=t,0<(i=B(Io(n=e,r="class"),function(e){return e!==o})).length?ge(n,r,i.join(" ")):be(n,r),!1;var n,r,o,i},_o=function(e,t){Bo(e)?e.dom().classList.add(t):Wo(e,t)},Lo=function(e){0===(Bo(e)?e.dom().classList:Io(e,"class")).length&&be(e,"class")},jo=function(e,t){return Bo(e)&&e.dom().classList.contains(t)},Fo=function(e,t){for(var n=[],r=e;r<t;r++)n.push(r);return n},zo=function(t,n){if(n<0||n>=t.length-1)return S.none();var e=t[n].fold(function(){var e=q(t.slice(0,n));return No(e,function(e,t){return e.map(function(e){return{value:e,delta:t+1}})})},function(e){return S.some({value:e,delta:0})}),r=t[n+1].fold(function(){var e=t.slice(n+1);return No(e,function(e,t){return e.map(function(e){return{value:e,delta:t+1}})})},function(e){return S.some({value:e,delta:1})});return e.bind(function(n){return r.map(function(e){var t=e.delta+n.delta;return Math.abs(e.value-n.value)/t})})},Ho=function(e,t,n){var r=e();return _(r,t).orThunk(function(){return S.from(r[0]).orThunk(n)}).map(function(e){return e.element()})},Uo=function(n){var e=n.grid(),t=Fo(0,e.columns()),r=Fo(0,e.rows());return P(t,function(t){return Ho(function(){return H(r,function(e){return xn.getAt(n,e,t).filter(function(e){return e.column()===t}).fold(C([]),function(e){return[e]})})},function(e){return 1===e.colspan()},function(){return xn.getAt(n,0,t)})})},qo=function(n){var e=n.grid(),t=Fo(0,e.rows()),r=Fo(0,e.columns());return P(t,function(t){return Ho(function(){return H(r,function(e){return xn.getAt(n,t,e).filter(function(e){return e.row()===t}).fold(C([]),function(e){return[e]})})},function(e){return 1===e.rowspan()},function(){return xn.getAt(n,t,0)})})},Vo=function(e){var t=e.replace(/\./g,"-");return{resolve:function(e){return t+"-"+e}}},Go={resolve:Vo("ephox-snooker").resolve},Yo=function(e,t,n,r,o){var i=Re.fromTag("div");return ke(i,{position:"absolute",left:t-r/2+"px",top:n+"px",height:o+"px",width:r+"px"}),he(i,{"data-column":e,role:"presentation"}),i},Xo=function(e,t,n,r,o){var i=Re.fromTag("div");return ke(i,{position:"absolute",left:t+"px",top:n-o/2+"px",height:o+"px",width:r+"px"}),he(i,{"data-row":e,role:"presentation"}),i},Ko=Go.resolve("resizer-bar"),Jo=Go.resolve("resizer-rows"),$o=Go.resolve("resizer-cols"),Qo=function(e){var t=Jt(e.parent(),"."+Ko);I(t,Bt)},Zo=function(n,e,r){var o=n.origin();I(e,function(e,t){e.each(function(e){var t=r(o,e);_o(t,Ko),Nt(n.parent(),t)})})},ei=function(e,t,n,r,o,i){var u,a,c,l,f=fo(t),s=0<n.length?o.positions(n,t):[];u=e,a=s,c=f,l=Gr(t),Zo(u,a,function(e,t){var n=Xo(t.row(),c.left()-e.left(),t.y()-e.top(),l,7);return _o(n,Jo),n});var d,m,g,h,p=0<r.length?i.positions(r,t):[];d=e,m=p,g=f,h=Ur(t),Zo(d,m,function(e,t){var n=Yo(t.col(),t.x()-e.left(),g.top()-e.top(),7,h);return _o(n,$o),n})},ti=function(e,t){var n=Jt(e.parent(),"."+Ko);I(n,t)},ni=function(e,t,n,r){Qo(e);var o=vn(t),i=xn.generate(o),u=qo(i),a=Uo(i);ei(e,t,u,a,n,r)},ri=function(e){ti(e,function(e){Ne(e,"display","none")})},oi=function(e){ti(e,function(e){Ne(e,"display","block")})},ii=Qo,ui=function(e){return jo(e,Jo)},ai=function(e){return jo(e,$o)},ci=function(e,t){return qt(t,e.section())},li=function(e,t){return e.cells()[t]},fi={addCell:function(e,t,n){var r=e.cells(),o=r.slice(0,t),i=r.slice(t),u=o.concat([n]).concat(i);return ci(e,u)},setCells:ci,mutateCell:function(e,t,n){e.cells()[t]=n},getCell:li,getCellElement:function(e,t){return li(e,t).element()},mapCells:function(e,t){var n=e.cells(),r=P(n,t);return qt(r,e.section())},cellLength:function(e){return e.cells().length}},si=function(e,t){if(0===e.length)return 0;var n=e[0];return L(e,function(e){return!t(n.element(),e.element())}).fold(function(){return e.length},function(e){return e})},di=function(e,t,n,r){var o,i,u,a,c=(o=e,i=t,o[i]).cells().slice(n),l=si(c,r),f=(u=e,a=n,P(u,function(e){return fi.getCell(e,a)})).slice(t),s=si(f,r);return{colspan:C(l),rowspan:C(s)}},mi=function(o,i){var u=P(o,function(e,t){return P(e.cells(),function(e,t){return!1})});return P(o,function(e,r){var t=H(e.cells(),function(e,t){if(!1===u[r][t]){var n=di(o,r,t,i);return function(e,t,n,r){for(var o=e;o<e+n;o++)for(var i=t;i<t+r;i++)u[o][i]=!0}(r,t,n.rowspan(),n.colspan()),[jt(e.element(),n.rowspan(),n.colspan(),e.isNew())]}return[]});return Vt(t,e.section())})},gi=function(e,t,n){for(var r=[],o=0;o<e.grid().rows();o++){for(var i=[],u=0;u<e.grid().columns();u++){var a=xn.getAt(e,o,u).map(function(e){return Ht(e.element(),n)}).getOrThunk(function(){return Ht(t.gap(),!0)});i.push(a)}var c=qt(i,e.all()[o].section());r.push(c)}return r},hi=function(e,r){return P(e,function(e){var t,n=(t=e.details(),No(t,function(e){return yt(e.element()).map(function(e){var t=yt(e).isNone();return Ht(e,t)})}).getOrThunk(function(){return Ht(r.row(),!0)}));return Ut(n.element(),e.details(),e.section(),n.isNew())})},pi=function(e,t){var n=mi(e,pt);return hi(n,t)},vi=function(e,t){var n=z(P(e.all(),function(e){return e.cells()}));return _(n,function(e){return pt(t,e.element())})},bi=function(a,c,l,f,s){return function(n,r,e,o,i){var t=vn(r),u=xn.generate(t);return c(u,e).map(function(e){var t=gi(u,o,!1),n=a(t,e,pt,s(o)),r=pi(n.grid(),o);return{grid:C(r),cursor:n.cursor}}).fold(function(){return S.none()},function(e){var t=Ao(r,e.grid());return l(r,e.grid(),i),f(r),ni(n,r,So.height,i),S.some({cursor:e.cursor,newRows:t.newRows,newCells:t.newCells})})}},wi=function(t,e){return pn.cell(e.element()).bind(function(e){return vi(t,e)})},yi=function(t,e){var n=P(e.selection(),function(e){return pn.cell(e).bind(function(e){return vi(t,e)})}),r=Eo(n);return 0<r.length?S.some({cells:r,generators:e.generators,clipboard:e.clipboard}):S.none()},xi=function(t,e){var n=P(e.selection(),function(e){return pn.cell(e).bind(function(e){return vi(t,e)})}),r=Eo(n);return 0<r.length?S.some(r):S.none()},Ci=function(n){return{is:function(e){return n===e},isValue:a,isError:f,getOr:C(n),getOrThunk:C(n),getOrDie:C(n),or:function(e){return Ci(n)},orThunk:function(e){return Ci(n)},fold:function(e,t){return t(n)},map:function(e){return Ci(e(n))},mapError:function(e){return Ci(n)},each:function(e){e(n)},bind:function(e){return e(n)},exists:function(e){return e(n)},forall:function(e){return e(n)},toOption:function(){return S.some(n)}}},Si=function(n){return{is:f,isValue:f,isError:a,getOr:o,getOrThunk:function(e){return e()},getOrDie:function(){return e=String(n),function(){throw new Error(e)}();var e},or:function(e){return e},orThunk:function(e){return e()},fold:function(e,t){return e(n)},map:function(e){return Si(n)},mapError:function(e){return Si(e(n))},each:y,bind:function(e){return Si(n)},exists:f,forall:a,toOption:S.none}},Ri={value:Ci,error:Si,fromOption:function(e,t){return e.fold(function(){return Si(t)},Ci)}},Ti=function(e,t){return P(e,function(){return Ht(t.cell(),!0)})},Di=function(t,e,n){return t.concat(function(e,t){for(var n=[],r=0;r<e;r++)n.push(t(r));return n}(e,function(e){return fi.setCells(t[t.length-1],Ti(t[t.length-1].cells(),n))}))},Oi=function(e,t,n){return P(e,function(e){return fi.setCells(e,e.cells().concat(Ti(Fo(0,t),n)))})},Ei=function(e,t,n){if(e.row()>=t.length||e.column()>fi.cellLength(t[0]))return Ri.error("invalid start address out of table bounds, row: "+e.row()+", column: "+e.column());var r=t.slice(e.row()),o=r[0].cells().slice(e.column()),i=fi.cellLength(n[0]),u=n.length;return Ri.value({rowDelta:C(r.length-u),colDelta:C(o.length-i)})},Ni=function(e,t){var n=fi.cellLength(e[0]),r=fi.cellLength(t[0]);return{rowDelta:C(0),colDelta:C(n-r)}},ki=function(e,t,n){var r=t.colDelta()<0?Oi:o;return(t.rowDelta()<0?Di:o)(r(e,Math.abs(t.colDelta()),n),Math.abs(t.rowDelta()),n)},Ai=function(e,t,n,r){if(0===e.length)return e;for(var o=t.startRow();o<=t.finishRow();o++)for(var i=t.startCol();i<=t.finishCol();i++)fi.mutateCell(e[o],i,Ht(r(),!1));return e},Pi=function(e,t,n,r){for(var o=!0,i=0;i<e.length;i++)for(var u=0;u<fi.cellLength(e[0]);u++){var a=n(fi.getCellElement(e[i],u),t);!0===a&&!1===o?fi.mutateCell(e[i],u,Ht(r(),!0)):!0===a&&(o=!1)}return e},Ii=function(i,n,u,a){if(0<n&&n<i.length){var e=i[n-1].cells(),t=(r=u,M(e,function(e,t){return A(e,function(e){return r(e.element(),t.element())})?e:e.concat([t])},[]));I(t,function(r){for(var o=S.none(),e=function(n){for(var e=function(t){var e=i[n].cells()[t];u(e.element(),r.element())&&(o.isNone()&&(o=S.some(a())),o.each(function(e){fi.mutateCell(i[n],t,Ht(e,!0))}))},t=0;t<fi.cellLength(i[0]);t++)e(t)},t=n;t<i.length;t++)e(t)})}var r;return i},Bi=function(n,r,o,i,u){return Ei(n,r,o).map(function(e){var t=ki(r,e,i);return function(e,t,n,r,o){for(var i,u,a,c,l,f=e.row(),s=e.column(),d=f+n.length,m=s+fi.cellLength(n[0]),g=f;g<d;g++)for(var h=s;h<m;h++){i=t,u=g,a=h,l=c=void 0,c=b(o,fi.getCell(i[u],a).element()),l=i[u],1<i.length&&1<fi.cellLength(l)&&(0<a&&c(fi.getCellElement(l,a-1))||a<l.cells().length-1&&c(fi.getCellElement(l,a+1))||0<u&&c(fi.getCellElement(i[u-1],a))||u<i.length-1&&c(fi.getCellElement(i[u+1],a)))&&Pi(t,fi.getCellElement(t[g],h),o,r.cell);var p=fi.getCellElement(n[g-f],h-s),v=r.replace(p);fi.mutateCell(t[g],h,Ht(v,!0))}return t}(n,t,o,i,u)})},Wi=function(e,t,n,r,o){Ii(t,e,o,r.cell);var i=Ni(n,t),u=ki(n,i,r),a=Ni(t,u),c=ki(t,a,r);return c.slice(0,e).concat(u).concat(c.slice(e,c.length))},Mi=function(n,r,e,o,i){var t=n.slice(0,r),u=n.slice(r),a=fi.mapCells(n[e],function(e,t){return 0<r&&r<n.length&&o(fi.getCellElement(n[r-1],t),fi.getCellElement(n[r],t))?fi.getCell(n[r],t):Ht(i(e.element(),o),!0)});return t.concat([a]).concat(u)},_i=function(e,n,r,o,i){return P(e,function(e){var t=0<n&&n<fi.cellLength(e)&&o(fi.getCellElement(e,n-1),fi.getCellElement(e,n))?fi.getCell(e,n):Ht(i(fi.getCellElement(e,r),o),!0);return fi.addCell(e,n,t)})},Li=function(e,r,o,i,u){var a=o+1;return P(e,function(e,t){var n=t===r?Ht(u(fi.getCellElement(e,o),i),!0):fi.getCell(e,o);return fi.addCell(e,a,n)})},ji=function(e,t,n,r,o){var i=t+1,u=e.slice(0,i),a=e.slice(i),c=fi.mapCells(e[t],function(e,t){return t===n?Ht(o(e.element(),r),!0):e});return u.concat([c]).concat(a)},Fi=function(e,t,n){return e.slice(0,t).concat(e.slice(n+1))},zi=function(e,n,r){var t=P(e,function(e){var t=e.cells().slice(0,n).concat(e.cells().slice(r+1));return qt(t,e.section())});return B(t,function(e){return 0<e.cells().length})},Hi=function(e,n,r,o){return P(e,function(e){return fi.mapCells(e,function(e){return t=e,A(n,function(e){return r(t.element(),e.element())})?Ht(o(e.element(),r),!0):e;var t})})},Ui=function(e,t,n,r){return fi.getCellElement(e[t],n)!==undefined&&0<t&&r(fi.getCellElement(e[t-1],n),fi.getCellElement(e[t],n))},qi=function(e,t,n){return 0<t&&n(fi.getCellElement(e,t-1),fi.getCellElement(e,t))},Vi=function(n,r,o,e){var t=H(n,function(e,t){return Ui(n,t,r,o)||qi(e,r,o)?[]:[fi.getCell(e,r)]});return Hi(n,t,o,e)},Gi=function(n,r,o,e){var i=n[r],t=H(i.cells(),function(e,t){return Ui(n,r,t,o)||qi(i,t,o)?[]:[e]});return Hi(n,t,o,e)},Yi=Nr([{none:[]},{only:["index"]},{left:["index","next"]},{middle:["prev","index","next"]},{right:["prev","index"]}]),Xi=Oo({},Yi),Ki=function(e,t,i,u){var n,r,a=e.slice(0),o=(r=t,0===(n=e).length?Xi.none():1===n.length?Xi.only(0):0===r?Xi.left(0,1):r===n.length-1?Xi.right(r-1,r):0<r&&r<n.length-1?Xi.middle(r-1,r,r+1):Xi.none()),c=function(e){return P(e,C(0))},l=C(c(a)),f=function(e,t){if(0<=i){var n=Math.max(u.minCellWidth(),a[t]-i);return c(a.slice(0,e)).concat([i,n-a[t]]).concat(c(a.slice(t+1)))}var r=Math.max(u.minCellWidth(),a[e]+i),o=a[e]-r;return c(a.slice(0,e)).concat([r-a[e],o]).concat(c(a.slice(t+1)))},s=f;return o.fold(l,function(e){return u.singleColumnWidth(a[e],i)},s,function(e,t,n){return f(t,n)},function(e,t){if(0<=i)return c(a.slice(0,t)).concat([i]);var n=Math.max(u.minCellWidth(),a[t]+i);return c(a.slice(0,t)).concat([n-a[t]])})},Ji=function(e,t){return ve(e,t)&&1<parseInt(pe(e,t),10)},$i={hasColspan:function(e){return Ji(e,"colspan")},hasRowspan:function(e){return Ji(e,"rowspan")},minWidth:C(10),minHeight:C(10),getInt:function(e,t){return parseInt(Ae(e,t),10)}},Qi=function(e,t,n){return Ie(e,t).fold(function(){return n(e)+"px"},function(e){return e})},Zi=function(e,t){return Qi(e,"width",function(e){return io.getPixelWidth(e,t)})},eu=function(e){return Qi(e,"height",io.getHeight)},tu=function(e,t,n,r,o){var i=Uo(e),u=P(i,function(e){return e.map(t.edge)});return P(i,function(e,t){return e.filter(g($i.hasColspan)).fold(function(){var e=zo(u,t);return r(e)},function(e){return n(e,o)})})},nu=function(e){return e.map(function(e){return e+"px"}).getOr("")},ru=function(e,t,n,r){var o=qo(e),i=P(o,function(e){return e.map(t.edge)});return P(o,function(e,t){return e.filter(g($i.hasRowspan)).fold(function(){var e=zo(i,t);return r(e)},function(e){return n(e)})})},ou={getRawWidths:function(e,t,n){return tu(e,t,Zi,nu,n)},getPixelWidths:function(e,t,n){return tu(e,t,io.getPixelWidth,function(e){return e.getOrThunk(n.minCellWidth)},n)},getPercentageWidths:function(e,t,n){return tu(e,t,io.getPercentageWidth,function(e){return e.fold(function(){return n.minCellWidth()},function(e){return e/n.pixelWidth()*100})},n)},getPixelHeights:function(e,t){return ru(e,t,io.getHeight,function(e){return e.getOrThunk($i.minHeight)})},getRawHeights:function(e,t){return ru(e,t,eu,nu)}},iu=function(e,t,n){for(var r=0,o=e;o<t;o++)r+=n[o]!==undefined?n[o]:0;return r},uu=function(e,n){var t=xn.justCells(e);return P(t,function(e){var t=iu(e.column(),e.column()+e.colspan(),n);return{element:e.element,width:C(t),colspan:e.colspan}})},au=function(e,n){var t=xn.justCells(e);return P(t,function(e){var t=iu(e.row(),e.row()+e.rowspan(),n);return{element:e.element,height:C(t),rowspan:e.rowspan}})},cu=function(e,n){return P(e.all(),function(e,t){return{element:e.element,height:C(n[t])}})},lu=function(e){var t=o;return{width:C(e),pixelWidth:C(e),getWidths:ou.getPixelWidths,getCellDelta:t,singleColumnWidth:function(e,t){return[Math.max($i.minWidth(),e+t)-e]},minCellWidth:$i.minWidth,setElementWidth:io.setPixelWidth,setTableWidth:function(e,t,n){var r=W(t,function(e,t){return e+t},0);io.setPixelWidth(e,r)}}},fu=function(e,t){var n,r,o,i,u=io.percentageBasedSizeRegex().exec(t);if(null!==u)return n=u[1],r=e,o=parseFloat(n),i=Vr(r),{width:C(o),pixelWidth:C(i),getWidths:ou.getPercentageWidths,getCellDelta:function(e){return e/i*100},singleColumnWidth:function(e,t){return[100-e]},minCellWidth:function(){return $i.minWidth()/i*100},setElementWidth:io.setPercentageWidth,setTableWidth:function(e,t,n){var r=n/100*o;io.setPercentageWidth(e,o+r)}};var a=io.pixelBasedSizeRegex().exec(t);if(null!==a){var c=parseInt(a[1],10);return lu(c)}var l=Vr(e);return lu(l)},su=function(t){return io.getRawWidth(t).fold(function(){var e=Vr(t);return lu(e)},function(e){return fu(t,e)})},du=function(e){return xn.generate(e)},mu=function(e){var t=vn(e);return du(t)},gu=function(e,t,n,r){var o=su(e),i=o.getCellDelta(t),u=mu(e),a=o.getWidths(u,r,o),c=Ki(a,n,i,o),l=P(c,function(e,t){return e+a[t]}),f=uu(u,l);I(f,function(e){o.setElementWidth(e.element(),e.width())}),n===u.grid().columns()-1&&o.setTableWidth(e,l,i)},hu=function(e,n,r,t){var o=mu(e),i=ou.getPixelHeights(o,t),u=P(i,function(e,t){return r===t?Math.max(n+e,$i.minHeight()):e}),a=au(o,u),c=cu(o,u);I(c,function(e){io.setHeight(e.element(),e.height())}),I(a,function(e){io.setHeight(e.element(),e.height())});var l=W(u,function(e,t){return e+t},0);io.setHeight(e,l)},pu=function(e,t,n){var r=su(e),o=du(t),i=r.getWidths(o,n,r),u=uu(o,i);I(u,function(e){r.setElementWidth(e.element(),e.width())}),0<u.length&&r.setTableWidth(e,i,r.getCellDelta(0))},vu=function(e){var t=e,n=function(){return t};return{get:n,set:function(e){t=e},clone:function(){return vu(n())}}},bu=function(r,o,i){if(0===o.length)throw new Error("You must specify at least one required field.");return Z("required",o),ee(o),function(t){var n=V(t);U(o,function(e){return k(n,e)})||$(o,n),r(o,n);var e=B(o,function(e){return!i.validate(t[e],e)});return 0<e.length&&function(e,t){throw new Error("All values need to be of type: "+t+". Keys ("+J(e).join(", ")+") were not.")}(e,i.label),t}},wu=function(t,e){var n=B(e,function(e){return!k(t,e)});0<n.length&&Q(n)},yu=function(e){return bu(wu,e,{validate:D,label:"function"})},xu=yu(["cell","row","replace","gap"]),Cu=function(e){var t=ve(e,"colspan")?parseInt(pe(e,"colspan"),10):1,n=ve(e,"rowspan")?parseInt(pe(e,"rowspan"),10):1;return{element:C(e),colspan:C(t),rowspan:C(n)}},Su=function(r,o){void 0===o&&(o=Cu),xu(r);var n=vu(S.none()),i=function(e){var t,n=o(e);return t=n,r.cell(t)},u=function(e){var t=i(e);return n.get().isNone()&&n.set(S.some(t)),a=S.some({item:e,replacement:t}),t},a=S.none();return{getOrInit:function(t,n){return a.fold(function(){return u(t)},function(e){return n(t,e.item)?e.replacement:u(t)})},cursor:n.get}},Ru=function(a,c){return function(r){var o=vu(S.none());xu(r);var i=[],u=function(e){var t={scope:a},n=r.replace(e,c,t);return i.push({item:e,sub:n}),o.get().isNone()&&o.set(S.some(n)),n};return{replaceOrInit:function(t,n){return(r=t,o=n,_(i,function(e){return o(e.item,r)})).fold(function(){return u(t)},function(e){return n(t,e.item)?e.sub:u(t)});var r,o},cursor:o.get}}},Tu=function(n){xu(n);var e=vu(S.none());return{combine:function(t){return e.get().isNone()&&e.set(S.some(t)),function(){var e=n.cell({element:C(t),colspan:C(1),rowspan:C(1)});return Be(e,"width"),Be(t,"width"),e}},cursor:e.get}},Du=["body","p","div","article","aside","figcaption","figure","footer","header","nav","section","ol","ul","table","thead","tfoot","tbody","caption","tr","td","th","h1","h2","h3","h4","h5","h6","blockquote","pre","address"],Ou=function(e,t){var n=e.property().name(t);return k(Du,n)},Eu=function(e,t){return k(["br","img","hr","input"],e.property().name(t))},Nu=Ou,ku=function(e,t){var n=e.property().name(t);return k(["ol","ul"],n)},Au=Eu,Pu=ir(),Iu=function(e){return Nu(Pu,e)},Bu=function(e){return ku(Pu,e)},Wu=function(e){return Au(Pu,e)},Mu=function(e){var t,i=function(e){return"br"===ue(e)},n=function(o){return Pn(o).bind(function(n){var r=St(n).map(function(e){return!!Iu(e)||!!Wu(e)&&"img"!==ue(e)}).getOr(!1);return yt(n).map(function(e){return!0===r||"li"===ue(t=e)||rn(t,Bu).isSome()||i(n)||Iu(e)&&!pt(o,e)?[]:[Re.fromTag("br")];var t})}).getOr([])},r=0===(t=H(e,function(e){var t=Rt(e);return U(t,function(e){return i(e)||se(e)&&0===Tn(e).trim().length})?[]:t.concat(n(e))})).length?[Re.fromTag("br")]:t;It(e[0]),Pt(e[0],r)},_u=function(e){0===pn.cells(e).length&&Bt(e)},Lu=K("grid","cursor"),ju=function(e,t,n){return Fu(e,t,n).orThunk(function(){return Fu(e,0,0)})},Fu=function(e,t,n){return S.from(e[t]).bind(function(e){return S.from(e.cells()[n]).bind(function(e){return S.from(e.element())})})},zu=function(e,t,n){return Lu(e,Fu(e,t,n))},Hu=function(e){return M(e,function(e,t){return A(e,function(e){return e.row()===t.row()})?e:e.concat([t])},[]).sort(function(e,t){return e.row()-t.row()})},Uu=function(e){return M(e,function(e,t){return A(e,function(e){return e.column()===t.column()})?e:e.concat([t])},[]).sort(function(e,t){return e.column()-t.column()})},qu=function(e,t,n){var r=bn(e,n),o=xn.generate(r);return gi(o,t,!0)},Vu=pu,Gu={insertRowBefore:bi(function(e,t,n,r){var o=t.row(),i=t.row(),u=Mi(e,i,o,n,r.getOrInit);return zu(u,i,t.column())},wi,y,y,Su),insertRowsBefore:bi(function(e,t,n,r){var o=t[0].row(),i=t[0].row(),u=Hu(t),a=M(u,function(e,t){return Mi(e,i,o,n,r.getOrInit)},e);return zu(a,i,t[0].column())},xi,y,y,Su),insertRowAfter:bi(function(e,t,n,r){var o=t.row(),i=t.row()+t.rowspan(),u=Mi(e,i,o,n,r.getOrInit);return zu(u,i,t.column())},wi,y,y,Su),insertRowsAfter:bi(function(e,t,n,r){var o=Hu(t),i=o[o.length-1].row(),u=o[o.length-1].row()+o[o.length-1].rowspan(),a=M(o,function(e,t){return Mi(e,u,i,n,r.getOrInit)},e);return zu(a,u,t[0].column())},xi,y,y,Su),insertColumnBefore:bi(function(e,t,n,r){var o=t.column(),i=t.column(),u=_i(e,i,o,n,r.getOrInit);return zu(u,t.row(),i)},wi,Vu,y,Su),insertColumnsBefore:bi(function(e,t,n,r){var o=Uu(t),i=o[0].column(),u=o[0].column(),a=M(o,function(e,t){return _i(e,u,i,n,r.getOrInit)},e);return zu(a,t[0].row(),u)},xi,Vu,y,Su),insertColumnAfter:bi(function(e,t,n,r){var o=t.column(),i=t.column()+t.colspan(),u=_i(e,i,o,n,r.getOrInit);return zu(u,t.row(),i)},wi,Vu,y,Su),insertColumnsAfter:bi(function(e,t,n,r){var o=t[t.length-1].column(),i=t[t.length-1].column()+t[t.length-1].colspan(),u=Uu(t),a=M(u,function(e,t){return _i(e,i,o,n,r.getOrInit)},e);return zu(a,t[0].row(),i)},xi,Vu,y,Su),splitCellIntoColumns:bi(function(e,t,n,r){var o=Li(e,t.row(),t.column(),n,r.getOrInit);return zu(o,t.row(),t.column())},wi,Vu,y,Su),splitCellIntoRows:bi(function(e,t,n,r){var o=ji(e,t.row(),t.column(),n,r.getOrInit);return zu(o,t.row(),t.column())},wi,y,y,Su),eraseColumns:bi(function(e,t,n,r){var o=Uu(t),i=zi(e,o[0].column(),o[o.length-1].column()),u=ju(i,t[0].row(),t[0].column());return Lu(i,u)},xi,Vu,_u,Su),eraseRows:bi(function(e,t,n,r){var o=Hu(t),i=Fi(e,o[0].row(),o[o.length-1].row()),u=ju(i,t[0].row(),t[0].column());return Lu(i,u)},xi,y,_u,Su),makeColumnHeader:bi(function(e,t,n,r){var o=Vi(e,t.column(),n,r.replaceOrInit);return zu(o,t.row(),t.column())},wi,y,y,Ru("row","th")),unmakeColumnHeader:bi(function(e,t,n,r){var o=Vi(e,t.column(),n,r.replaceOrInit);return zu(o,t.row(),t.column())},wi,y,y,Ru(null,"td")),makeRowHeader:bi(function(e,t,n,r){var o=Gi(e,t.row(),n,r.replaceOrInit);return zu(o,t.row(),t.column())},wi,y,y,Ru("col","th")),unmakeRowHeader:bi(function(e,t,n,r){var o=Gi(e,t.row(),n,r.replaceOrInit);return zu(o,t.row(),t.column())},wi,y,y,Ru(null,"td")),mergeCells:bi(function(e,t,n,r){var o=t.cells();Mu(o);var i=Ai(e,t.bounds(),n,C(o[0]));return Lu(i,S.from(o[0]))},function(e,t){return t.mergable()},y,y,Tu),unmergeCells:bi(function(e,t,n,r){var o=W(t,function(e,t){return Pi(e,t,n,r.combine(t))},e);return Lu(o,S.from(t[0]))},function(e,t){return t.unmergable()},Vu,y,Tu),pasteCells:bi(function(e,n,t,r){var o,i,u,a,c=(o=n.clipboard(),i=n.generators(),u=vn(o),a=xn.generate(u),gi(a,i,!0)),l=_t(n.row(),n.column());return Bi(l,e,c,n.generators(),t).fold(function(){return Lu(e,S.some(n.element()))},function(e){var t=ju(e,n.row(),n.column());return Lu(e,t)})},function(t,n){return pn.cell(n.element()).bind(function(e){return vi(t,e).map(function(e){return Oo({},e,{generators:n.generators,clipboard:n.clipboard})})})},Vu,y,Su),pasteRowsBefore:bi(function(e,t,n,r){var o=e[t.cells[0].row()],i=t.cells[0].row(),u=qu(t.clipboard(),t.generators(),o),a=Wi(i,e,u,t.generators(),n),c=ju(a,t.cells[0].row(),t.cells[0].column());return Lu(a,c)},yi,y,y,Su),pasteRowsAfter:bi(function(e,t,n,r){var o=e[t.cells[0].row()],i=t.cells[t.cells.length-1].row()+t.cells[t.cells.length-1].rowspan(),u=qu(t.clipboard(),t.generators(),o),a=Wi(i,e,u,t.generators(),n),c=ju(a,t.cells[0].row(),t.cells[0].column());return Lu(a,c)},yi,y,y,Su)},Yu=function(e){return Re.fromDom(e.getBody())},Xu=function(e){return e.getBoundingClientRect().width},Ku=function(e){return e.getBoundingClientRect().height},Ju=function(t){return function(e){return pt(e,Yu(t))}},$u=function(e){return/^[0-9]+$/.test(e)&&(e+="px"),e},Qu=function(e){var t=Jt(e,"td[data-mce-style],th[data-mce-style]");be(e,"data-mce-style"),I(t,function(e){be(e,"data-mce-style")})},Zu={isRtl:C(!1)},ea={isRtl:C(!0)},ta={directionAt:function(e){return"rtl"==("rtl"===Ae(e,"direction")?"rtl":"ltr")?ea:Zu}},na=["tableprops","tabledelete","|","tableinsertrowbefore","tableinsertrowafter","tabledeleterow","|","tableinsertcolbefore","tableinsertcolafter","tabledeletecol"],ra={"border-collapse":"collapse",width:"100%"},oa={border:"1"},ia=function(e){return e.getParam("table_cell_advtab",!0,"boolean")},ua=function(e){return e.getParam("table_row_advtab",!0,"boolean")},aa=function(e){return e.getParam("table_advtab",!0,"boolean")},ca=function(e){return e.getParam("table_style_by_css",!1,"boolean")},la=function(e){return e.getParam("table_cell_class_list",[],"array")},fa=function(e){return e.getParam("table_row_class_list",[],"array")},sa=function(e){return e.getParam("table_class_list",[],"array")},da=function(e){return!1===e.getParam("table_responsive_width")},ma=function(e,t){return e.fire("newrow",{node:t})},ga=function(e,t){return e.fire("newcell",{node:t})},ha=function(e,t,n,r){e.fire("ObjectResizeStart",{target:t,width:n,height:r})},pa=function(e,t,n,r){e.fire("ObjectResized",{target:t,width:n,height:r})},va=function(f,e){var t,n=function(e){return"table"===ue(Yu(e))},s=(t=f.getParam("table_clone_elements"),w(t)?S.some(t.split(/[ ,]/)):Array.isArray(t)?S.some(t):S.none()),r=function(u,a,c,l){return function(e,t){Qu(e);var n=l(),r=Re.fromDom(f.getDoc()),o=To(ta.directionAt),i=Hn(c,r,s);return a(e)?u(n,e,t,i,o).bind(function(e){return I(e.newRows(),function(e){ma(f,e.dom())}),I(e.newCells(),function(e){ga(f,e.dom())}),e.cursor().map(function(e){var t=f.dom.createRng();return t.setStart(e.dom(),0),t.setEnd(e.dom(),0),t})}):S.none()}};return{deleteRow:r(Gu.eraseRows,function(e){var t=Do(e);return!1===n(f)||1<t.rows()},y,e),deleteColumn:r(Gu.eraseColumns,function(e){var t=Do(e);return!1===n(f)||1<t.columns()},y,e),insertRowsBefore:r(Gu.insertRowsBefore,a,y,e),insertRowsAfter:r(Gu.insertRowsAfter,a,y,e),insertColumnsBefore:r(Gu.insertColumnsBefore,a,uo,e),insertColumnsAfter:r(Gu.insertColumnsAfter,a,uo,e),mergeCells:r(Gu.mergeCells,a,y,e),unmergeCells:r(Gu.unmergeCells,a,y,e),pasteRowsBefore:r(Gu.pasteRowsBefore,a,y,e),pasteRowsAfter:r(Gu.pasteRowsAfter,a,y,e),pasteCells:r(Gu.pasteCells,a,y,e)}},ba=function(e,t,r){var n=vn(e),o=xn.generate(n);return xi(o,t).map(function(e){var t=gi(o,r,!1).slice(e[0].row(),e[e.length-1].row()+e[e.length-1].rowspan()),n=pi(t,r);return Po(n)})},wa=tinymce.util.Tools.resolve("tinymce.util.Tools"),ya=function(e,t,n){n&&e.formatter.apply("align"+n,{},t)},xa=function(e,t,n){n&&e.formatter.apply("valign"+n,{},t)},Ca=function(t,n){wa.each("left center right".split(" "),function(e){t.formatter.remove("align"+e,{},n)})},Sa=function(t,n){wa.each("top middle bottom".split(" "),function(e){t.formatter.remove("valign"+e,{},n)})},Ra=function(o,e,i){var t;return t=function(e,t){for(var n=0;n<t.length;n++){var r=o.getStyle(t[n],i);if(void 0===e&&(e=r),e!==r)return""}return e}(t,o.select("td,th",e))},Ta=function(e,t){var n=e.dom,r=t.control.rootControl,o=r.toJSON(),i=n.parseStyle(o.style);i["border-style"]=o.borderStyle,i["border-color"]=o.borderColor,i["background-color"]=o.backgroundColor,i.width=o.width?$u(o.width):"",i.height=o.height?$u(o.height):"",r.find("#style").value(n.serializeStyle(n.parseStyle(n.serializeStyle(i))))},Da=function(e,t){var n=e.dom,r=t.control.rootControl,o=r.toJSON(),i=n.parseStyle(o.style);r.find("#borderStyle").value(i["border-style"]||""),r.find("#borderColor").value(i["border-color"]||""),r.find("#backgroundColor").value(i["background-color"]||""),r.find("#width").value(i.width||""),r.find("#height").value(i.height||"")},Oa={createStyleForm:function(n){var e=function(){var e=n.getParam("color_picker_callback");if(e)return function(t){return e.call(n,function(e){t.control.value(e).fire("change")},t.control.value())}};return{title:"Advanced",type:"form",defaults:{onchange:b(Ta,n)},items:[{label:"Style",name:"style",type:"textbox",onchange:b(Da,n)},{type:"form",padding:0,formItemDefaults:{layout:"grid",alignH:["start","right"]},defaults:{size:7},items:[{label:"Border style",type:"listbox",name:"borderStyle",width:90,onselect:b(Ta,n),values:[{text:"Select...",value:""},{text:"Solid",value:"solid"},{text:"Dotted",value:"dotted"},{text:"Dashed",value:"dashed"},{text:"Double",value:"double"},{text:"Groove",value:"groove"},{text:"Ridge",value:"ridge"},{text:"Inset",value:"inset"},{text:"Outset",value:"outset"},{text:"None",value:"none"},{text:"Hidden",value:"hidden"}]},{label:"Border color",type:"colorbox",name:"borderColor",onaction:e()},{label:"Background color",type:"colorbox",name:"backgroundColor",onaction:e()}]}]}},buildListItems:function(e,r,t){var o=function(e,n){return n=n||[],wa.each(e,function(e){var t={text:e.text||e.title};e.menu?t.menu=o(e.menu):(t.value=e.value,r&&r(t)),n.push(t)}),n};return o(e,t||[])},updateStyleField:Ta,extractAdvancedStyles:function(e,t){var n=e.parseStyle(e.getAttrib(t,"style")),r={};return n["border-style"]&&(r.borderStyle=n["border-style"]),n["border-color"]&&(r.borderColor=n["border-color"]),n["background-color"]&&(r.backgroundColor=n["background-color"]),r.style=e.serializeStyle(n),r},updateAdvancedFields:Da,syncAdvancedStyleFields:function(e,t){t.control.rootControl.find("#style")[0].getEl().isEqualNode(m.document.activeElement)?Da(e,t):Ta(e,t)}},Ea=function(r,o,e){var i,u=r.dom;function a(e,t,n){(1===o.length||n)&&u.setAttrib(e,t,n)}function c(e,t,n){(1===o.length||n)&&u.setStyle(e,t,n)}ia(r)&&Oa.syncAdvancedStyleFields(r,e),i=e.control.rootControl.toJSON(),r.undoManager.transact(function(){wa.each(o,function(e){var t,n;a(e,"scope",i.scope),1===o.length?a(e,"style",i.style):(t=e,n=i.style,delete t.dataset.mceStyle,t.style.cssText+=";"+n),a(e,"class",i["class"]),c(e,"width",$u(i.width)),c(e,"height",$u(i.height)),i.type&&e.nodeName.toLowerCase()!==i.type&&(e=u.rename(e,i.type)),1===o.length&&(Ca(r,e),Sa(r,e)),i.align&&ya(r,e,i.align),i.valign&&xa(r,e,i.valign)}),r.focus()})},Na=function(t){var e,n,r,o=[];if(o=t.dom.select("td[data-mce-selected],th[data-mce-selected]"),e=t.dom.getParent(t.selection.getStart(),"td,th"),!o.length&&e&&o.push(e),e=e||o[0]){var i,u,a,c;1<o.length?n={width:"",height:"",scope:"","class":"",align:"",valign:"",style:"",type:e.nodeName.toLowerCase()}:(u=e,a=(i=t).dom,c={width:a.getStyle(u,"width")||a.getAttrib(u,"width"),height:a.getStyle(u,"height")||a.getAttrib(u,"height"),scope:a.getAttrib(u,"scope"),"class":a.getAttrib(u,"class"),type:u.nodeName.toLowerCase(),style:"",align:"",valign:""},wa.each("left center right".split(" "),function(e){i.formatter.matchNode(u,"align"+e)&&(c.align=e)}),wa.each("top middle bottom".split(" "),function(e){i.formatter.matchNode(u,"valign"+e)&&(c.valign=e)}),ia(i)&&wa.extend(c,Oa.extractAdvancedStyles(a,u)),n=c),0<la(t).length&&(r={name:"class",type:"listbox",label:"Class",values:Oa.buildListItems(la(t),function(e){e.value&&(e.textStyle=function(){return t.formatter.getCssText({block:"td",classes:[e.value]})})})});var l={type:"form",layout:"flex",direction:"column",labelGapCalc:"children",padding:0,items:[{type:"form",layout:"grid",columns:2,labelGapCalc:!1,padding:0,defaults:{type:"textbox",maxWidth:50},items:[{label:"Width",name:"width",onchange:b(Oa.updateStyleField,t)},{label:"Height",name:"height",onchange:b(Oa.updateStyleField,t)},{label:"Cell type",name:"type",type:"listbox",text:"None",minWidth:90,maxWidth:null,values:[{text:"Cell",value:"td"},{text:"Header cell",value:"th"}]},{label:"Scope",name:"scope",type:"listbox",text:"None",minWidth:90,maxWidth:null,values:[{text:"None",value:""},{text:"Row",value:"row"},{text:"Column",value:"col"},{text:"Row group",value:"rowgroup"},{text:"Column group",value:"colgroup"}]},{label:"H Align",name:"align",type:"listbox",text:"None",minWidth:90,maxWidth:null,values:[{text:"None",value:""},{text:"Left",value:"left"},{text:"Center",value:"center"},{text:"Right",value:"right"}]},{label:"V Align",name:"valign",type:"listbox",text:"None",minWidth:90,maxWidth:null,values:[{text:"None",value:""},{text:"Top",value:"top"},{text:"Middle",value:"middle"},{text:"Bottom",value:"bottom"}]}]},r]};ia(t)?t.windowManager.open({title:"Cell properties",bodyType:"tabpanel",data:n,body:[{title:"General",type:"form",items:l},Oa.createStyleForm(t)],onsubmit:b(Ea,t,o)}):t.windowManager.open({title:"Cell properties",data:n,body:l,onsubmit:b(Ea,t,o)})}};function ka(f,s,d,e){var m=f.dom;function g(e,t,n){(1===s.length||n)&&m.setAttrib(e,t,n)}ua(f)&&Oa.syncAdvancedStyleFields(f,e);var h=e.control.rootControl.toJSON();f.undoManager.transact(function(){wa.each(s,function(e){var t,n,r,o,i,u,a,c,l;g(e,"scope",h.scope),g(e,"style",h.style),g(e,"class",h["class"]),t=e,n="height",r=$u(h.height),(1===s.length||r)&&m.setStyle(t,n,r),h.type!==e.parentNode.nodeName.toLowerCase()&&(o=f.dom,i=e,u=h.type,a=o.getParent(i,"table"),c=i.parentNode,(l=o.select(u,a)[0])||(l=o.create(u),a.firstChild?"CAPTION"===a.firstChild.nodeName?o.insertAfter(l,a.firstChild):a.insertBefore(l,a.firstChild):a.appendChild(l)),l.appendChild(i),c.hasChildNodes()||o.remove(c)),h.align!==d.align&&(Ca(f,e),ya(f,e,h.align))}),f.focus()})}var Aa=function(t){var e,n,r,o,i,u,a,c,l,f,s=t.dom,d=[];e=s.getParent(t.selection.getStart(),"table"),n=s.getParent(t.selection.getStart(),"td,th"),wa.each(e.rows,function(t){wa.each(t.cells,function(e){if(s.getAttrib(e,"data-mce-selected")||e===n)return d.push(t),!1})}),(r=d[0])&&(1<d.length?i={height:"",scope:"",style:"","class":"",align:"",type:r.parentNode.nodeName.toLowerCase()}:(c=r,l=(a=t).dom,f={height:l.getStyle(c,"height")||l.getAttrib(c,"height"),scope:l.getAttrib(c,"scope"),"class":l.getAttrib(c,"class"),align:"",style:"",type:c.parentNode.nodeName.toLowerCase()},wa.each("left center right".split(" "),function(e){a.formatter.matchNode(c,"align"+e)&&(f.align=e)}),ua(a)&&wa.extend(f,Oa.extractAdvancedStyles(l,c)),i=f),0<fa(t).length&&(o={name:"class",type:"listbox",label:"Class",values:Oa.buildListItems(fa(t),function(e){e.value&&(e.textStyle=function(){return t.formatter.getCssText({block:"tr",classes:[e.value]})})})}),u={type:"form",columns:2,padding:0,defaults:{type:"textbox"},items:[{type:"listbox",name:"type",label:"Row type",text:"Header",maxWidth:null,values:[{text:"Header",value:"thead"},{text:"Body",value:"tbody"},{text:"Footer",value:"tfoot"}]},{type:"listbox",name:"align",label:"Alignment",text:"None",maxWidth:null,values:[{text:"None",value:""},{text:"Left",value:"left"},{text:"Center",value:"center"},{text:"Right",value:"right"}]},{label:"Height",name:"height"},o]},ua(t)?t.windowManager.open({title:"Row properties",data:i,bodyType:"tabpanel",body:[{title:"General",type:"form",items:u},Oa.createStyleForm(t)],onsubmit:b(ka,t,d,i)}):t.windowManager.open({title:"Row properties",data:i,body:u,onsubmit:b(ka,t,d,i)}))},Pa=tinymce.util.Tools.resolve("tinymce.Env"),Ia={styles:{"border-collapse":"collapse",width:"100%"},attributes:{border:"1"},percentages:!0},Ba=function(e,t,n,r,o){void 0===o&&(o=Ia);var i=Re.fromTag("table");ke(i,o.styles),he(i,o.attributes);var u=Re.fromTag("tbody");Nt(i,u);for(var a=[],c=0;c<e;c++){for(var l=Re.fromTag("tr"),f=0;f<t;f++){var s=c<n||f<r?Re.fromTag("th"):Re.fromTag("td");f<r&&ge(s,"scope","row"),c<n&&ge(s,"scope","col"),Nt(s,Re.fromTag("br")),o.percentages&&Ne(s,"width",100/t+"%"),Nt(l,s)}a.push(l)}return Pt(u,a),i},Wa=function(e,t){e.selection.select(t.dom(),!0),e.selection.collapse(!0)},Ma=function(r,e,t){var n,o,i=r.getParam("table_default_styles",ra,"object"),u={styles:i,attributes:(o=r,o.getParam("table_default_attributes",oa,"object")),percentages:(n=i.width,w(n)&&-1!==n.indexOf("%")&&!da(r))},a=Ba(t,e,0,0,u);ge(a,"data-mce-id","__mce");var c,l,f,s=(c=a,l=Re.fromTag("div"),f=Re.fromDom(c.dom().cloneNode(!0)),Nt(l,f),l.dom().innerHTML);return r.insertContent(s),an(Yu(r),'table[data-mce-id="__mce"]').map(function(e){var t,n;return da(r)&&Ne(e,"width",Ae(e,"width")),be(e,"data-mce-id"),t=r,I(Jt(e,"tr"),function(e){ma(t,e.dom()),I(Jt(e,"th,td"),function(e){ga(t,e.dom())})}),n=r,an(e,"td,th").each(b(Wa,n)),e.dom()}).getOr(null)};function _a(e,t,n,r){if("TD"===t.tagName||"TH"===t.tagName)e.setStyle(t,n,r);else if(t.children)for(var o=0;o<t.children.length;o++)_a(e,t.children[o],n,r)}var La,ja=function(e,t,n){var r,o,i=e.dom;aa(e)&&Oa.syncAdvancedStyleFields(e,n),!1===(o=n.control.rootControl.toJSON())["class"]&&delete o["class"],e.undoManager.transact(function(){t||(t=Ma(e,o.cols||1,o.rows||1)),function(e,t,n){var r,o=e.dom,i={},u={};if(i["class"]=n["class"],u.height=$u(n.height),o.getAttrib(t,"width")&&!ca(e)?i.width=(r=n.width)?r.replace(/px$/,""):"":u.width=$u(n.width),ca(e)?(u["border-width"]=$u(n.border),u["border-spacing"]=$u(n.cellspacing),wa.extend(i,{"data-mce-border-color":n.borderColor,"data-mce-cell-padding":n.cellpadding,"data-mce-border":n.border})):wa.extend(i,{border:n.border,cellpadding:n.cellpadding,cellspacing:n.cellspacing}),ca(e)&&t.children)for(var a=0;a<t.children.length;a++)_a(o,t.children[a],{"border-width":$u(n.border),"border-color":n.borderColor,padding:$u(n.cellpadding)});n.style?wa.extend(u,o.parseStyle(n.style)):u=wa.extend({},o.parseStyle(o.getAttrib(t,"style")),u),i.style=o.serializeStyle(u),o.setAttribs(t,i)}(e,t,o),(r=i.select("caption",t)[0])&&!o.caption&&i.remove(r),!r&&o.caption&&((r=i.create("caption")).innerHTML=Pa.ie?"\xa0":'<br data-mce-bogus="1"/>',t.insertBefore(r,t.firstChild)),Ca(e,t),o.align&&ya(e,t,o.align),e.focus(),e.addVisual()})},Fa=function(t,e){var n,r,o,i,u,a,c,l,f,s,d=t.dom,m={};!0===e?(n=d.getParent(t.selection.getStart(),"table"))&&(c=n,l=(a=t).dom,f={width:l.getStyle(c,"width")||l.getAttrib(c,"width"),height:l.getStyle(c,"height")||l.getAttrib(c,"height"),cellspacing:l.getStyle(c,"border-spacing")||l.getAttrib(c,"cellspacing"),cellpadding:l.getAttrib(c,"data-mce-cell-padding")||l.getAttrib(c,"cellpadding")||Ra(a.dom,c,"padding"),border:l.getAttrib(c,"data-mce-border")||l.getAttrib(c,"border")||Ra(a.dom,c,"border"),borderColor:l.getAttrib(c,"data-mce-border-color"),caption:!!l.select("caption",c)[0],"class":l.getAttrib(c,"class")},wa.each("left center right".split(" "),function(e){a.formatter.matchNode(c,"align"+e)&&(f.align=e)}),aa(a)&&wa.extend(f,Oa.extractAdvancedStyles(l,c)),m=f):(r={label:"Cols",name:"cols"},o={label:"Rows",name:"rows"}),0<sa(t).length&&(m["class"]&&(m["class"]=m["class"].replace(/\s*mce\-item\-table\s*/g,"")),i={name:"class",type:"listbox",label:"Class",values:Oa.buildListItems(sa(t),function(e){e.value&&(e.textStyle=function(){return t.formatter.getCssText({block:"table",classes:[e.value]})})})}),u={type:"form",layout:"flex",direction:"column",labelGapCalc:"children",padding:0,items:[{type:"form",labelGapCalc:!1,padding:0,layout:"grid",columns:2,defaults:{type:"textbox",maxWidth:50},items:(s=t,s.getParam("table_appearance_options",!0,"boolean")?[r,o,{label:"Width",name:"width",onchange:b(Oa.updateStyleField,t)},{label:"Height",name:"height",onchange:b(Oa.updateStyleField,t)},{label:"Cell spacing",name:"cellspacing"},{label:"Cell padding",name:"cellpadding"},{label:"Border",name:"border"},{label:"Caption",name:"caption",type:"checkbox"}]:[r,o,{label:"Width",name:"width",onchange:b(Oa.updateStyleField,t)},{label:"Height",name:"height",onchange:b(Oa.updateStyleField,t)}])},{label:"Alignment",name:"align",type:"listbox",text:"None",values:[{text:"None",value:""},{text:"Left",value:"left"},{text:"Center",value:"center"},{text:"Right",value:"right"}]},i]},aa(t)?t.windowManager.open({title:"Table properties",data:m,bodyType:"tabpanel",body:[{title:"General",type:"form",items:u},Oa.createStyleForm(t)],onsubmit:b(ja,t,n)}):t.windowManager.open({title:"Table properties",data:m,body:u,onsubmit:b(ja,t,n)})},za=wa.each,Ha=function(a,t,c,l,n){var r=Ju(a),e=function(e){return function(){return S.from(a.dom.getParent(a.selection.getStart(),e)).map(Re.fromDom)}},o=e("caption"),f=e("th,td"),s=function(e){return pn.table(e,r)},d=function(e){return{width:Xu(e.dom()),height:Xu(e.dom())}},i=function(n){f().each(function(t){s(t).each(function(i){var e=Lr.forMenu(l,i,t),u=d(i);n(i,e).each(function(e){var t,n,r,o;t=a,n=u,o=d(r=i),n.width===o.width&&n.height===o.height||(ha(t,r.dom(),n.width,n.height),pa(t,r.dom(),o.width,o.height)),a.selection.setRng(e),a.focus(),c.clear(i),Qu(i)})})})},u=function(e){return f().bind(function(o){return s(o).bind(function(e){var t=Re.fromDom(a.getDoc()),n=Lr.forMenu(l,e,o),r=Hn(y,t,S.none());return ba(e,n,r)})})},m=function(u){n.get().each(function(e){var i=P(e,function(e){return Mn(e)});f().each(function(o){s(o).each(function(t){var e=Re.fromDom(a.getDoc()),n=Un(e),r=Lr.pasteRows(l,t,o,i,n);u(t,r).each(function(e){a.selection.setRng(e),a.focus(),c.clear(t)})})})})};za({mceTableSplitCells:function(){i(t.unmergeCells)},mceTableMergeCells:function(){i(t.mergeCells)},mceTableInsertRowBefore:function(){i(t.insertRowsBefore)},mceTableInsertRowAfter:function(){i(t.insertRowsAfter)},mceTableInsertColBefore:function(){i(t.insertColumnsBefore)},mceTableInsertColAfter:function(){i(t.insertColumnsAfter)},mceTableDeleteCol:function(){i(t.deleteColumn)},mceTableDeleteRow:function(){i(t.deleteRow)},mceTableCutRow:function(e){n.set(u()),i(t.deleteRow)},mceTableCopyRow:function(e){n.set(u())},mceTablePasteRowBefore:function(e){m(t.pasteRowsBefore)},mceTablePasteRowAfter:function(e){m(t.pasteRowsAfter)},mceTableDelete:function(){f().orThunk(o).each(function(e){pn.table(e,r).filter(g(r)).each(function(e){var t=Re.fromText("");Ot(e,t),Bt(e);var n=a.dom.createRng();n.setStart(t.dom(),0),n.setEnd(t.dom(),0),a.selection.setRng(n)})})}},function(e,t){a.addCommand(t,e)}),za({mceInsertTable:b(Fa,a),mceTableProps:b(Fa,a,!0),mceTableRowProps:b(Aa,a),mceTableCellProps:b(Na,a)},function(n,e){a.addCommand(e,function(e,t){n(t)})})},Ua=function(e){var t=S.from(e.dom().documentElement).map(Re.fromDom).getOr(e);return{parent:C(t),view:C(e),origin:C(co(0,0))}},qa=function(e,t){return{parent:C(t),view:C(e),origin:C(co(0,0))}},Va=function(e){var r=K.apply(null,e),o=[];return{bind:function(e){if(e===undefined)throw new Error("Event bind error: undefined handler");o.push(e)},unbind:function(t){o=B(o,function(e){return e!==t})},trigger:function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n=r.apply(null,e);I(o,function(e){e(n)})}}},Ga={create:function(e){return{registry:Y(e,function(e){return{bind:e.bind,unbind:e.unbind}}),trigger:Y(e,function(e){return e.trigger})}}},Ya=function(m,g){return function(e){if(m(e)){var t,n,r,o,i,u,a,c=Re.fromDom(e.target),l=function(){e.stopPropagation()},f=function(){e.preventDefault()},s=x(f,l),d=(t=c,n=e.clientX,r=e.clientY,o=l,i=f,u=s,a=e,{target:C(t),x:C(n),y:C(r),stop:o,prevent:i,kill:u,raw:C(a)});g(d)}}},Xa=function(e,t,n,r){return o=e,i=t,u=!1,a=Ya(n,r),o.dom().addEventListener(i,a,u),{unbind:b(Ka,o,i,a,u)};var o,i,u,a},Ka=function(e,t,n,r){e.dom().removeEventListener(t,n,r)},Ja=C(!0),$a=function(e,t,n){return Xa(e,t,Ja,n)},Qa=Object.prototype.hasOwnProperty,Za=(La=function(e,t){return t},function(){for(var e=new Array(arguments.length),t=0;t<e.length;t++)e[t]=arguments[t];if(0===e.length)throw new Error("Can't merge zero objects");for(var n={},r=0;r<e.length;r++){var o=e[r];for(var i in o)Qa.call(o,i)&&(n[i]=La(n[i],o[i]))}return n}),ec={resolve:Vo("ephox-dragster").resolve},tc=yu(["compare","extract","mutate","sink"]),nc=yu(["element","start","stop","destroy"]),rc=yu(["forceDrop","drop","move","delayDrop"]),oc=tc({compare:function(e,t){return co(t.left()-e.left(),t.top()-e.top())},extract:function(e){return S.some(co(e.x(),e.y()))},sink:function(e,t){var n,r,o,i=(n=t,r=Za({layerClass:ec.resolve("blocker")},n),o=Re.fromTag("div"),ge(o,"role","presentation"),ke(o,{position:"fixed",left:"0px",top:"0px",width:"100%",height:"100%"}),_o(o,ec.resolve("blocker")),_o(o,r.layerClass),{element:function(){return o},destroy:function(){Bt(o)}}),u=$a(i.element(),"mousedown",e.forceDrop),a=$a(i.element(),"mouseup",e.drop),c=$a(i.element(),"mousemove",e.move),l=$a(i.element(),"mouseout",e.delayDrop);return nc({element:i.element,start:function(e){Nt(e,i.element())},stop:function(){Bt(i.element())},destroy:function(){i.destroy(),a.unbind(),c.unbind(),l.unbind(),u.unbind()}})},mutate:function(e,t){e.mutate(t.left(),t.top())}});function ic(){var i=S.none(),u=Ga.create({move:Va(["info"])});return{onEvent:function(e,o){o.extract(e).each(function(e){var t,n,r;(t=o,n=e,r=i.map(function(e){return t.compare(e,n)}),i=S.some(n),r).each(function(e){u.trigger.move(e)})})},reset:function(){i=S.none()},events:u.registry}}function uc(){var e={onEvent:y,reset:y},t=ic(),n=e;return{on:function(){n.reset(),n=t},off:function(){n.reset(),n=e},isOn:function(){return n===t},onEvent:function(e,t){n.onEvent(e,t)},events:t.events}}var ac=function(t,n,e){var r,o,i,u=!1,a=Ga.create({start:Va([]),stop:Va([])}),c=uc(),l=function(){d.stop(),c.isOn()&&(c.off(),a.trigger.stop())},f=(r=l,o=200,i=null,{cancel:function(){null!==i&&(m.clearTimeout(i),i=null)},throttle:function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];null!==i&&m.clearTimeout(i),i=m.setTimeout(function(){r.apply(null,e),i=null},o)}});c.events.move.bind(function(e){n.mutate(t,e.info())});var s=function(n){return function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];u&&n.apply(null,e)}},d=n.sink(rc({forceDrop:l,drop:s(l),move:s(function(e){f.cancel(),c.onEvent(e,n)}),delayDrop:s(f.throttle)}),e);return{element:d.element,go:function(e){d.start(e),c.on(),a.trigger.start()},on:function(){u=!0},off:function(){u=!1},destroy:function(){d.destroy()},events:a.registry}},cc=function(e,t){void 0===t&&(t={});var n=t.mode!==undefined?t.mode:oc;return ac(e,n,t)},lc=function(){var n,r=Ga.create({drag:Va(["xDelta","yDelta","target"])}),o=S.none(),e={mutate:function(e,t){n.trigger.drag(e,t)},events:(n=Ga.create({drag:Va(["xDelta","yDelta"])})).registry};return e.events.drag.bind(function(t){o.each(function(e){r.trigger.drag(t.xDelta(),t.yDelta(),e)})}),{assign:function(e){o=S.some(e)},get:function(){return o},mutate:e.mutate,events:r.registry}},fc=function(e){return"true"===pe(e,"contenteditable")},sc=Go.resolve("resizer-bar-dragging"),dc=function(o,t,i){var n=lc(),r=cc(n,{}),u=S.none(),e=function(e,t){return S.from(pe(e,t))};n.events.drag.bind(function(n){e(n.target(),"data-row").each(function(e){var t=$i.getInt(n.target(),"top");Ne(n.target(),"top",t+n.yDelta()+"px")}),e(n.target(),"data-column").each(function(e){var t=$i.getInt(n.target(),"left");Ne(n.target(),"left",t+n.xDelta()+"px")})});var a=function(e,t){return $i.getInt(e,t)-parseInt(pe(e,"data-initial-"+t),10)};r.events.stop.bind(function(){n.get().each(function(r){u.each(function(n){e(r,"data-row").each(function(e){var t=a(r,"top");be(r,"data-initial-top"),m.trigger.adjustHeight(n,t,parseInt(e,10))}),e(r,"data-column").each(function(e){var t=a(r,"left");be(r,"data-initial-left"),m.trigger.adjustWidth(n,t,parseInt(e,10))}),ni(o,n,i,t)})})});var c=function(e,t){m.trigger.startAdjust(),n.assign(e),ge(e,"data-initial-"+t,parseInt(Ae(e,t),10)),_o(e,sc),Ne(e,"opacity","0.2"),r.go(o.parent())},l=$a(o.parent(),"mousedown",function(e){ui(e.target())&&c(e.target(),"top"),ai(e.target())&&c(e.target(),"left")}),f=function(e){return pt(e,o.view())},s=function(e){return cn(e,"table",f).filter(function(e){return(t=e,n=f,cn(t,"[contenteditable]",n)).exists(fc);var t,n})},d=$a(o.view(),"mouseover",function(e){s(e.target()).fold(function(){Te(e.target())&&ii(o)},function(e){u=S.some(e),ni(o,e,i,t)})}),m=Ga.create({adjustHeight:Va(["table","delta","row"]),adjustWidth:Va(["table","delta","column"]),startAdjust:Va([])});return{destroy:function(){l.unbind(),d.unbind(),r.destroy(),ii(o)},refresh:function(e){ni(o,e,i,t)},on:r.on,off:r.off,hideBars:b(ri,o),showBars:b(oi,o),events:m.registry}},mc=function(e,t){return e.inline?qa(Yu(e),(n=Re.fromTag("div"),ke(n,{position:"static",height:"0",width:"0",padding:"0",margin:"0",border:"0"}),Nt(De(),n),n)):Ua(Re.fromDom(e.getDoc()));var n},gc=function(e,t){e.inline&&Bt(t.parent())},hc=function(c){var u,a,l=S.none(),f=S.none(),s=S.none(),d=/(\d+(\.\d+)?)%/,m=function(e){return"TABLE"===e.nodeName};return c.on("init",function(){var n,r,e,o,t,i=To(ta.directionAt),u=mc(c);if(s=S.some(u),("table"===(t=c.getParam("object_resizing",!0))||t)&&c.getParam("table_resize_bars",!0,"boolean")){var a=(e=dc(u,n=i,r=So.height),o=Ga.create({beforeResize:Va(["table"]),afterResize:Va(["table"]),startDrag:Va([])}),e.events.adjustHeight.bind(function(e){o.trigger.beforeResize(e.table());var t=r.delta(e.delta(),e.table());hu(e.table(),t,e.row(),r),o.trigger.afterResize(e.table())}),e.events.startAdjust.bind(function(e){o.trigger.startDrag()}),e.events.adjustWidth.bind(function(e){o.trigger.beforeResize(e.table());var t=n.delta(e.delta(),e.table());gu(e.table(),t,e.column(),n),o.trigger.afterResize(e.table())}),{on:e.on,off:e.off,hideBars:e.hideBars,showBars:e.showBars,destroy:e.destroy,events:o.registry});a.on(),a.events.startDrag.bind(function(e){l=S.some(c.selection.getRng())}),a.events.beforeResize.bind(function(e){var t=e.table().dom();ha(c,t,Xu(t),Ku(t))}),a.events.afterResize.bind(function(e){var t=e.table(),n=t.dom();Qu(t),l.each(function(e){c.selection.setRng(e),c.focus()}),pa(c,n,Xu(n),Ku(n)),c.undoManager.add()}),f=S.some(a)}}),c.on("ObjectResizeStart",function(e){var t,n=e.target;m(n)&&(u=e.width,t=n,a=c.dom.getStyle(t,"width")||c.dom.getAttrib(t,"width"))}),c.on("ObjectResized",function(e){var t=e.target;if(m(t)){var n=t;if(d.test(a)){var r=parseFloat(d.exec(a)[1]),o=e.width*r/u;c.dom.setStyle(n,"width",o+"%")}else{var i=[];wa.each(n.rows,function(e){wa.each(e.cells,function(e){var t=c.dom.getStyle(e,"width",!0);i.push({cell:e,width:t})})}),wa.each(i,function(e){c.dom.setStyle(e.cell,"width",e.width),c.dom.setAttrib(e.cell,"width",null)})}}}),{lazyResize:function(){return f},lazyWire:function(){return s.getOr(Ua(Re.fromDom(c.getBody())))},destroy:function(){f.each(function(e){e.destroy()}),s.each(function(e){gc(c,e)})}}},pc=Nr([{none:["current"]},{first:["current"]},{middle:["current","target"]},{last:["current"]}]),vc=Oo({},pc,{none:function(e){return void 0===e&&(e=undefined),pc.none(e)}}),bc=function(n,e){return pn.table(n,e).bind(function(e){var t=pn.cells(e);return L(t,function(e){return pt(n,e)}).map(function(e){return{index:C(e),all:C(t)}})})},wc=function(t,e){return bc(t,e).fold(function(){return vc.none(t)},function(e){return e.index()+1<e.all().length?vc.middle(t,e.all()[e.index()+1]):vc.last(t)})},yc=function(t,e){return bc(t,e).fold(function(){return vc.none()},function(e){return 0<=e.index()-1?vc.middle(t,e.all()[e.index()-1]):vc.first(t)})},xc={create:K("start","soffset","finish","foffset")},Cc=Nr([{before:["element"]},{on:["element","offset"]},{after:["element"]}]),Sc={before:Cc.before,on:Cc.on,after:Cc.after,cata:function(e,t,n,r){return e.fold(t,n,r)},getStart:function(e){return e.fold(o,o,o)}},Rc=Nr([{domRange:["rng"]},{relative:["startSitu","finishSitu"]},{exact:["start","soffset","finish","foffset"]}]),Tc={domRange:Rc.domRange,relative:Rc.relative,exact:Rc.exact,exactFromRange:function(e){return Rc.exact(e.start(),e.soffset(),e.finish(),e.foffset())},getWin:function(e){var t,n=e.match({domRange:function(e){return Re.fromDom(e.startContainer)},relative:function(e,t){return Sc.getStart(e)},exact:function(e,t,n,r){return e}});return t=n.dom().ownerDocument.defaultView,Re.fromDom(t)},range:xc.create},Dc=function(e,t){e.selectNodeContents(t.dom())},Oc=function(e,t,n){var r,o,i=e.document.createRange();return r=i,t.fold(function(e){r.setStartBefore(e.dom())},function(e,t){r.setStart(e.dom(),t)},function(e){r.setStartAfter(e.dom())}),o=i,n.fold(function(e){o.setEndBefore(e.dom())},function(e,t){o.setEnd(e.dom(),t)},function(e){o.setEndAfter(e.dom())}),i},Ec=function(e,t,n,r,o){var i=e.document.createRange();return i.setStart(t.dom(),n),i.setEnd(r.dom(),o),i},Nc=function(e){return{left:C(e.left),top:C(e.top),right:C(e.right),bottom:C(e.bottom),width:C(e.width),height:C(e.height)}},kc=Nr([{ltr:["start","soffset","finish","foffset"]},{rtl:["start","soffset","finish","foffset"]}]),Ac=function(e,t,n){return t(Re.fromDom(n.startContainer),n.startOffset,Re.fromDom(n.endContainer),n.endOffset)},Pc=function(e,t){var o,n,r,i=(o=e,t.match({domRange:function(e){return{ltr:C(e),rtl:S.none}},relative:function(e,t){return{ltr:Ce(function(){return Oc(o,e,t)}),rtl:Ce(function(){return S.some(Oc(o,t,e))})}},exact:function(e,t,n,r){return{ltr:Ce(function(){return Ec(o,e,t,n,r)}),rtl:Ce(function(){return S.some(Ec(o,n,r,e,t))})}}}));return(r=(n=i).ltr()).collapsed?n.rtl().filter(function(e){return!1===e.collapsed}).map(function(e){return kc.rtl(Re.fromDom(e.endContainer),e.endOffset,Re.fromDom(e.startContainer),e.startOffset)}).getOrThunk(function(){return Ac(0,kc.ltr,r)}):Ac(0,kc.ltr,r)},Ic=function(i,e){return Pc(i,e).match({ltr:function(e,t,n,r){var o=i.document.createRange();return o.setStart(e.dom(),t),o.setEnd(n.dom(),r),o},rtl:function(e,t,n,r){var o=i.document.createRange();return o.setStart(n.dom(),r),o.setEnd(e.dom(),t),o}})},Bc=function(e,t,n){return t>=e.left&&t<=e.right&&n>=e.top&&n<=e.bottom},Wc=function(n,r,e,t,o){var i=function(e){var t=n.dom().createRange();return t.setStart(r.dom(),e),t.collapse(!0),t},u=Tn(r).length,a=function(e,t,n,r,o){if(0===o)return 0;if(t===r)return o-1;for(var i=r,u=1;u<o;u++){var a=e(u),c=Math.abs(t-a.left);if(n<=a.bottom){if(n<a.top||i<c)return u-1;i=c}}return 0}(function(e){return i(e).getBoundingClientRect()},e,t,o.right,u);return i(a)},Mc=function(t,n,r,o){var e=t.dom().createRange();e.selectNode(n.dom());var i=e.getClientRects();return No(i,function(e){return Bc(e,r,o)?S.some(e):S.none()}).map(function(e){return Wc(t,n,r,o,e)})},_c=function(t,e,n,r){var o=t.dom().createRange(),i=Rt(e);return No(i,function(e){return o.selectNode(e.dom()),Bc(o.getBoundingClientRect(),n,r)?Lc(t,e,n,r):S.none()})},Lc=function(e,t,n,r){return(se(t)?Mc:_c)(e,t,n,r)},jc=function(e,t){return t-e.left<e.right-t},Fc=function(e,t,n){var r=e.dom().createRange();return r.selectNode(t.dom()),r.collapse(n),r},zc=function(t,e,n){var r=t.dom().createRange();r.selectNode(e.dom());var o=r.getBoundingClientRect(),i=jc(o,n);return(!0===i?An:Pn)(e).map(function(e){return Fc(t,e,i)})},Hc=function(e,t,n){var r=t.dom().getBoundingClientRect(),o=jc(r,n);return S.some(Fc(e,t,o))},Uc=function(e,t,n,r){var o=e.dom().createRange();o.selectNode(t.dom());var i=o.getBoundingClientRect();return function(e,t,n,r){var o=e.dom().createRange();o.selectNode(t.dom());var i=o.getBoundingClientRect(),u=Math.max(i.left,Math.min(i.right,n)),a=Math.max(i.top,Math.min(i.bottom,r));return Lc(e,t,u,a)}(e,t,Math.max(i.left,Math.min(i.right,n)),Math.max(i.top,Math.min(i.bottom,r)))},qc=document.caretPositionFromPoint?function(n,e,t){return S.from(n.dom().caretPositionFromPoint(e,t)).bind(function(e){if(null===e.offsetNode)return S.none();var t=n.dom().createRange();return t.setStart(e.offsetNode,e.offset),t.collapse(),S.some(t)})}:document.caretRangeFromPoint?function(e,t,n){return S.from(e.dom().caretRangeFromPoint(t,n))}:function(o,i,t){return Re.fromPoint(o,i,t).bind(function(r){var e=function(){return e=o,n=i,(0===Rt(t=r).length?Hc:zc)(e,t,n);var e,t,n};return 0===Rt(r).length?e():Uc(o,r,i,t).orThunk(e)})},Vc=function(e,t){var n=ue(e);return"input"===n?Sc.after(e):k(["br","img"],n)?0===t?Sc.before(e):Sc.after(e):Sc.on(e,t)},Gc=function(e,t){var n=e.fold(Sc.before,Vc,Sc.after),r=t.fold(Sc.before,Vc,Sc.after);return Tc.relative(n,r)},Yc=function(e,t,n,r){var o=Vc(e,t),i=Vc(n,r);return Tc.relative(o,i)},Xc=function(e,t,n,r){var o,i,u,a,c,l=(i=t,u=n,a=r,(c=wt(o=e).dom().createRange()).setStart(o.dom(),i),c.setEnd(u.dom(),a),c),f=pt(e,n)&&t===r;return l.collapsed&&!f},Kc=function(e,t){S.from(e.getSelection()).each(function(e){e.removeAllRanges(),e.addRange(t)})},Jc=function(e,t,n,r,o){var i=Ec(e,t,n,r,o);Kc(e,i)},$c=function(s,e){return Pc(s,e).match({ltr:function(e,t,n,r){Jc(s,e,t,n,r)},rtl:function(e,t,n,r){var o,i,u,a,c,l=s.getSelection();if(l.setBaseAndExtent)l.setBaseAndExtent(e.dom(),t,n.dom(),r);else if(l.extend)try{i=e,u=t,a=n,c=r,(o=l).collapse(i.dom(),u),o.extend(a.dom(),c)}catch(f){Jc(s,n,r,e,t)}else Jc(s,n,r,e,t)}})},Qc=function(e){var o=Tc.getWin(e).dom(),t=function(e,t,n,r){return Ec(o,e,t,n,r)},n=e.match({domRange:function(e){var t=Re.fromDom(e.startContainer),n=Re.fromDom(e.endContainer);return Yc(t,e.startOffset,n,e.endOffset)},relative:Gc,exact:Yc});return Pc(o,n).match({ltr:t,rtl:t})},Zc=function(e){var t=Re.fromDom(e.anchorNode),n=Re.fromDom(e.focusNode);return Xc(t,e.anchorOffset,n,e.focusOffset)?S.some(xc.create(t,e.anchorOffset,n,e.focusOffset)):function(e){if(0<e.rangeCount){var t=e.getRangeAt(0),n=e.getRangeAt(e.rangeCount-1);return S.some(xc.create(Re.fromDom(t.startContainer),t.startOffset,Re.fromDom(n.endContainer),n.endOffset))}return S.none()}(e)},el=function(e,t){var n,r,o=(n=t,r=e.document.createRange(),Dc(r,n),r);Kc(e,o)},tl=function(e){return(t=e,S.from(t.getSelection()).filter(function(e){return 0<e.rangeCount}).bind(Zc)).map(function(e){return Tc.exact(e.start(),e.soffset(),e.finish(),e.foffset())});var t},nl=function(e,t){var n,r,o,i=Ic(e,t);return r=(n=i).getClientRects(),0<(o=0<r.length?r[0]:n.getBoundingClientRect()).width||0<o.height?S.some(o).map(Nc):S.none()},rl=function(e,t,n){return r=e,o=t,i=n,u=Re.fromDom(r.document),qc(u,o,i).map(function(e){return xc.create(Re.fromDom(e.startContainer),e.startOffset,Re.fromDom(e.endContainer),e.endOffset)});var r,o,i,u},ol=tinymce.util.Tools.resolve("tinymce.util.VK"),il=function(e,t,n,r){return ll(e,t,wc(n),r)},ul=function(e,t,n,r){return ll(e,t,yc(n),r)},al=function(e,t){var n=Tc.exact(t,0,t,0);return Qc(n)},cl=function(e,t){var n,r=Jt(t,"tr");return(n=r,0===n.length?S.none():S.some(n[n.length-1])).bind(function(e){return an(e,"td,th").map(function(e){return al(0,e)})})},ll=function(r,e,t,o,n){return t.fold(S.none,S.none,function(e,t){return An(t).map(function(e){return al(0,e)})},function(n){return pn.table(n,e).bind(function(e){var t=Lr.noMenu(n);return r.undoManager.transact(function(){o.insertRowsAfter(e,t)}),cl(0,e)})})},fl=["table","li","dl"],sl=function(t,n,r,o){if(t.keyCode===ol.TAB){var i=Yu(n),u=function(e){var t=ue(e);return pt(e,i)||k(fl,t)},e=n.selection.getRng();if(e.collapsed){var a=Re.fromDom(e.startContainer);pn.cell(a,u).each(function(e){t.preventDefault(),(t.shiftKey?ul:il)(n,u,e,r,o).each(function(e){n.selection.setRng(e)})})}}},dl={create:K("selection","kill")},ml=function(e,t,n,r){return{start:C(Sc.on(e,t)),finish:C(Sc.on(n,r))}},gl={convertToRange:function(e,t){var n=Ic(e,t);return xc.create(Re.fromDom(n.startContainer),n.startOffset,Re.fromDom(n.endContainer),n.endOffset)},makeSitus:ml},hl=function(n,e,r,t,o){return pt(r,t)?S.none():wr(r,t,e).bind(function(e){var t=e.boxes().getOr([]);return 0<t.length?(o(n,t,e.start(),e.finish()),S.some(dl.create(S.some(gl.makeSitus(r,0,r,En(r))),!0))):S.none()})},pl={sync:function(n,r,e,t,o,i,u){return pt(e,o)&&t===i?S.none():cn(e,"td,th",r).bind(function(t){return cn(o,"td,th",r).bind(function(e){return hl(n,r,t,e,u)})})},detect:hl,update:function(e,t,n,r,o){return xr(r,e,t,o.firstSelectedSelector(),o.lastSelectedSelector()).map(function(e){return o.clear(n),o.selectRange(n,e.boxes(),e.start(),e.finish()),e.boxes()})}},vl=K("item","mode"),bl=function(e,t,n,r){return void 0===r&&(r=wl),e.property().parent(t).map(function(e){return vl(e,r)})},wl=function(e,t,n,r){return void 0===r&&(r=yl),n.sibling(e,t).map(function(e){return vl(e,r)})},yl=function(e,t,n,r){void 0===r&&(r=yl);var o=e.property().children(t);return n.first(o).map(function(e){return vl(e,r)})},xl=[{current:bl,next:wl,fallback:S.none()},{current:wl,next:yl,fallback:S.some(bl)},{current:yl,next:yl,fallback:S.some(wl)}],Cl=function(t,n,r,o,e){return void 0===e&&(e=xl),_(e,function(e){return e.current===r}).bind(function(e){return e.current(t,n,o,e.next).orThunk(function(){return e.fallback.bind(function(e){return Cl(t,n,e,o)})})})},Sl=function(){return{sibling:function(e,t){return e.query().prevSibling(t)},first:function(e){return 0<e.length?S.some(e[e.length-1]):S.none()}}},Rl=function(){return{sibling:function(e,t){return e.query().nextSibling(t)},first:function(e){return 0<e.length?S.some(e[0]):S.none()}}},Tl=function(t,e,n,r,o,i){return Cl(t,e,r,o).bind(function(e){return i(e.item())?S.none():n(e.item())?S.some(e.item()):Tl(t,e.item(),n,e.mode(),o,i)})},Dl=function(t){return function(e){return 0===t.property().children(e).length}},Ol=function(e,t,n,r){return Tl(e,t,n,wl,Sl(),r)},El=function(e,t,n,r){return Tl(e,t,n,wl,Rl(),r)},Nl=ir(),kl=function(e,t){return r=t,Ol(n=Nl,e,Dl(n),r);var n,r},Al=function(e,t){return r=t,El(n=Nl,e,Dl(n),r);var n,r},Pl=K("element","offset"),Il=(K("element","deltaOffset"),K("element","start","finish"),K("begin","end"),K("element","text"),Nr([{none:["message"]},{success:[]},{failedUp:["cell"]},{failedDown:["cell"]}])),Bl=function(e){return cn(e,"tr")},Wl=Oo({},Il,{verify:function(a,e,t,n,r,c,o){return cn(n,"td,th",o).bind(function(u){return cn(e,"td,th",o).map(function(i){return pt(u,i)?pt(n,u)&&En(u)===r?c(i):Il.none("in same cell"):hr.sharedOne(Bl,[u,i]).fold(function(){return t=i,n=u,r=(e=a).getRect(t),(o=e.getRect(n)).right>r.left&&o.left<r.right?Il.success():c(i);var e,t,n,r,o},function(e){return c(i)})})}).getOr(Il.none("default"))},cata:function(e,t,n,r,o){return e.fold(t,n,r,o)}}),Ml=(K("ancestor","descendants","element","index"),K("parent","children","element","index")),_l=function(e,t){return L(e,b(pt,t))},Ll=function(e){return"br"===ue(e)},jl=function(e,t,n){return t(e,n).bind(function(e){return se(e)&&0===Tn(e).trim().length?jl(e,t,n):S.some(e)})},Fl=function(t,e,n,r){return(o=e,i=n,Tt(o,i).filter(Ll).orThunk(function(){return Tt(o,i-1).filter(Ll)})).bind(function(e){return r.traverse(e).fold(function(){return jl(e,r.gather,t).map(r.relative)},function(e){return(r=e,yt(r).bind(function(t){var n=Rt(t);return _l(n,r).map(function(e){return Ml(t,n,r,e)})})).map(function(e){return Sc.on(e.parent(),e.index())});var r})});var o,i},zl=function(e,t,n,r){var o,i,u;return(Ll(t)?(o=e,i=t,(u=r).traverse(i).orThunk(function(){return jl(i,u.gather,o)}).map(u.relative)):Fl(e,t,n,r)).map(function(e){return{start:C(e),finish:C(e)}})},Hl=function(e){return Wl.cata(e,function(e){return S.none()},function(){return S.none()},function(e){return S.some(Pl(e,0))},function(e){return S.some(Pl(e,En(e)))})},Ul=te(["left","top","right","bottom"],[]),ql={nu:Ul,moveUp:function(e,t){return Ul({left:e.left(),top:e.top()-t,right:e.right(),bottom:e.bottom()-t})},moveDown:function(e,t){return Ul({left:e.left(),top:e.top()+t,right:e.right(),bottom:e.bottom()+t})},moveBottomTo:function(e,t){var n=e.bottom()-e.top();return Ul({left:e.left(),top:t-n,right:e.right(),bottom:t})},moveTopTo:function(e,t){var n=e.bottom()-e.top();return Ul({left:e.left(),top:t,right:e.right(),bottom:t+n})},getTop:function(e){return e.top()},getBottom:function(e){return e.bottom()},translate:function(e,t,n){return Ul({left:e.left()+t,top:e.top()+n,right:e.right()+t,bottom:e.bottom()+n})},toString:function(e){return"("+e.left()+", "+e.top()+") -> ("+e.right()+", "+e.bottom()+")"}},Vl=function(e){return ql.nu({left:e.left,top:e.top,right:e.right,bottom:e.bottom})},Gl=function(e,t){return S.some(e.getRect(t))},Yl=function(e,t,n){return fe(t)?Gl(e,t).map(Vl):se(t)?(r=e,o=t,i=n,0<=i&&i<En(o)?r.getRangedRect(o,i,o,i+1):0<i?r.getRangedRect(o,i-1,o,i):S.none()).map(Vl):S.none();var r,o,i},Xl=function(e,t){return fe(t)?Gl(e,t).map(Vl):se(t)?e.getRangedRect(t,0,t,En(t)).map(Vl):S.none()},Kl=Nr([{none:[]},{retry:["caret"]}]),Jl=function(t,e,r){return(n=e,o=Iu,$t(function(e){return o(e)},rn,n,o,i)).fold(C(!1),function(e){return Xl(t,e).exists(function(e){return n=e,(t=r).left()<n.left()||Math.abs(n.right()-t.left())<1||t.left()>n.right();var t,n})});var n,o,i},$l={point:ql.getTop,adjuster:function(e,t,n,r,o){var i=ql.moveUp(o,5);return Math.abs(n.top()-r.top())<1?Kl.retry(i):n.bottom()<o.top()?Kl.retry(i):n.bottom()===o.top()?Kl.retry(ql.moveUp(o,1)):Jl(e,t,o)?Kl.retry(ql.translate(i,5,0)):Kl.none()},move:ql.moveUp,gather:kl},Ql={point:ql.getBottom,adjuster:function(e,t,n,r,o){var i=ql.moveDown(o,5);return Math.abs(n.bottom()-r.bottom())<1?Kl.retry(i):n.top()>o.bottom()?Kl.retry(i):n.top()===o.bottom()?Kl.retry(ql.moveDown(o,1)):Jl(e,t,o)?Kl.retry(ql.translate(i,5,0)):Kl.none()},move:ql.moveDown,gather:Al},Zl=function(n,r,o,i,u){return 0===u?S.some(i):(c=n,l=i.left(),f=r.point(i),c.elementFromPoint(l,f).filter(function(e){return"table"===ue(e)}).isSome()?(t=i,a=u-1,Zl(n,e=r,o,e.move(t,5),a)):n.situsFromPoint(i.left(),r.point(i)).bind(function(e){return e.start().fold(S.none,function(t){return Xl(n,t).bind(function(e){return r.adjuster(n,t,e,o,i).fold(S.none,function(e){return Zl(n,r,o,e,u-1)})}).orThunk(function(){return S.some(i)})},S.none)}));var e,t,a,c,l,f},ef=function(t,n,e){var r,o,i,u=t.move(e,5),a=Zl(n,t,e,u,100).getOr(u);return(r=t,o=a,i=n,r.point(o)>i.getInnerHeight()?S.some(r.point(o)-i.getInnerHeight()):r.point(o)<0?S.some(-r.point(o)):S.none()).fold(function(){return n.situsFromPoint(a.left(),t.point(a))},function(e){return n.scrollBy(0,e),n.situsFromPoint(a.left(),t.point(a)-e)})},tf={tryUp:b(ef,$l),tryDown:b(ef,Ql),ieTryUp:function(e,t){return e.situsFromPoint(t.left(),t.top()-5)},ieTryDown:function(e,t){return e.situsFromPoint(t.left(),t.bottom()+5)},getJumpSize:C(5)},nf=st.detect(),rf=function(r,o,i,u,a,c){return 0===c?S.none():af(r,o,i,u,a).bind(function(e){var t=r.fromSitus(e),n=Wl.verify(r,i,u,t.finish(),t.foffset(),a.failure,o);return Wl.cata(n,function(){return S.none()},function(){return S.some(e)},function(e){return pt(i,e)&&0===u?of(r,i,u,ql.moveUp,a):rf(r,o,e,0,a,c-1)},function(e){return pt(i,e)&&u===En(e)?of(r,i,u,ql.moveDown,a):rf(r,o,e,En(e),a,c-1)})})},of=function(t,e,n,r,o){return Yl(t,e,n).bind(function(e){return uf(t,o,r(e,tf.getJumpSize()))})},uf=function(e,t,n){return nf.browser.isChrome()||nf.browser.isSafari()||nf.browser.isFirefox()||nf.browser.isEdge()?t.otherRetry(e,n):nf.browser.isIE()?t.ieRetry(e,n):S.none()},af=function(t,e,n,r,o){return Yl(t,n,r).bind(function(e){return uf(t,o,e)})},cf=function(t,n,r){return(o=t,i=n,u=r,o.getSelection().bind(function(r){return zl(i,r.finish(),r.foffset(),u).fold(function(){return S.some(Pl(r.finish(),r.foffset()))},function(e){var t=o.fromSitus(e),n=Wl.verify(o,r.finish(),r.foffset(),t.finish(),t.foffset(),u.failure,i);return Hl(n)})})).bind(function(e){return rf(t,n,e.element(),e.offset(),r,20).map(t.fromSitus)});var o,i,u},lf=st.detect(),ff=function(e,t){return rn(e,function(e){return yt(e).exists(function(e){return pt(e,t)})},n).isSome();var n},sf=function(t,r,o,e,i){return cn(e,"td,th",r).bind(function(n){return cn(n,"table",r).bind(function(e){return ff(i,e)?cf(t,r,o).bind(function(t){return cn(t.finish(),"td,th",r).map(function(e){return{start:C(n),finish:C(e),range:C(t)}})}):S.none()})})},df=function(e,t,n,r,o,i){return lf.browser.isIE()?S.none():i(r,t).orThunk(function(){return sf(e,t,n,r,o).map(function(e){var t=e.range();return dl.create(S.some(gl.makeSitus(t.start(),t.soffset(),t.finish(),t.foffset())),!0)})})},mf=function(e,t,n,r,o,i,u){return sf(e,n,r,o,i).bind(function(e){return pl.detect(t,n,e.start(),e.finish(),u)})},gf=function(e,u){return cn(e,"tr",u).bind(function(i){return cn(i,"table",u).bind(function(e){var t,n,r,o=Jt(e,"tr");return pt(i,o[0])?(t=e,n=function(e){return Pn(e).isSome()},r=u,Ol(Nl,t,n,r)).map(function(e){var t=En(e);return dl.create(S.some(gl.makeSitus(e,t,e,t)),!0)}):S.none()})})},hf=function(e,u){return cn(e,"tr",u).bind(function(i){return cn(i,"table",u).bind(function(e){var t,n,r,o=Jt(e,"tr");return pt(i,o[o.length-1])?(t=e,n=function(e){return An(e).isSome()},r=u,El(Nl,t,n,r)).map(function(e){return dl.create(S.some(gl.makeSitus(e,0,e,0)),!0)}):S.none()})})},pf=function(e,t){return cn(e,"td,th",t)},vf={down:{traverse:St,gather:Al,relative:Sc.before,otherRetry:tf.tryDown,ieRetry:tf.ieTryDown,failure:Wl.failedDown},up:{traverse:Ct,gather:kl,relative:Sc.before,otherRetry:tf.tryUp,ieRetry:tf.ieTryUp,failure:Wl.failedUp}},bf=function(t){return function(e){return e===t}},wf=bf(38),yf=bf(40),xf={ltr:{isBackward:bf(37),isForward:bf(39)},rtl:{isBackward:bf(39),isForward:bf(37)},isUp:wf,isDown:yf,isNavigation:function(e){return 37<=e&&e<=40}},Cf=(st.detect().browser.isSafari(),function(a){return{elementFromPoint:function(e,t){return Re.fromPoint(Re.fromDom(a.document),e,t)},getRect:function(e){return e.dom().getBoundingClientRect()},getRangedRect:function(e,t,n,r){var o=Tc.exact(e,t,n,r);return nl(a,o).map(function(e){return Y(e,c)})},getSelection:function(){return tl(a).map(function(e){return gl.convertToRange(a,e)})},fromSitus:function(e){var t=Tc.relative(e.start(),e.finish());return gl.convertToRange(a,t)},situsFromPoint:function(e,t){return rl(a,e,t).map(function(e){return ml(e.start(),e.soffset(),e.finish(),e.foffset())})},clearSelection:function(){a.getSelection().removeAllRanges()},setSelection:function(e){var t,n,r,o,i,u;t=a,n=e.start(),r=e.soffset(),o=e.finish(),i=e.foffset(),u=Yc(n,r,o,i),$c(t,u)},setRelativeSelection:function(e,t){var n,r;n=a,r=Gc(e,t),$c(n,r)},selectContents:function(e){el(a,e)},getInnerHeight:function(){return a.innerHeight},getScrollY:function(){var e,t,n,r;return(e=Re.fromDom(a.document),t=e!==undefined?e.dom():m.document,n=t.body.scrollLeft||t.documentElement.scrollLeft,r=t.body.scrollTop||t.documentElement.scrollTop,co(n,r)).top()},scrollBy:function(e,t){var n,r,o;n=e,r=t,((o=Re.fromDom(a.document))!==undefined?o.dom():m.document).defaultView.scrollBy(n,r)}}}),Sf=K("rows","cols"),Rf={mouse:function(e,t,n,r){var o,i,u,a,c,l,f=Cf(e),s=(o=f,i=t,u=n,a=r,c=S.none(),l=function(){c=S.none()},{mousedown:function(e){a.clear(i),c=pf(e.target(),u)},mouseover:function(e){c.each(function(r){a.clear(i),pf(e.target(),u).each(function(n){wr(r,n,u).each(function(e){var t=e.boxes().getOr([]);(1<t.length||1===t.length&&!pt(r,n))&&(a.selectRange(i,t,e.start(),e.finish()),o.selectContents(n))})})})},mouseup:function(e){c.each(l)}});return{mousedown:s.mousedown,mouseover:s.mouseover,mouseup:s.mouseup}},keyboard:function(e,l,f,s){var d=Cf(e),m=function(){return s.clear(l),S.none()};return{keydown:function(e,t,n,r,o,i){var u=e.raw(),a=u.which,c=!0===u.shiftKey;return yr(l,s.selectedSelector()).fold(function(){return xf.isDown(a)&&c?b(mf,d,l,f,vf.down,r,t,s.selectRange):xf.isUp(a)&&c?b(mf,d,l,f,vf.up,r,t,s.selectRange):xf.isDown(a)?b(df,d,f,vf.down,r,t,hf):xf.isUp(a)?b(df,d,f,vf.up,r,t,gf):S.none},function(t){var e=function(e){return function(){return No(e,function(e){return pl.update(e.rows(),e.cols(),l,t,s)}).fold(function(){return Cr(l,s.firstSelectedSelector(),s.lastSelectedSelector()).map(function(e){var t=xf.isDown(a)||i.isForward(a)?Sc.after:Sc.before;return d.setRelativeSelection(Sc.on(e.first(),0),t(e.table())),s.clear(l),dl.create(S.none(),!0)})},function(e){return S.some(dl.create(S.none(),!0))})}};return xf.isDown(a)&&c?e([Sf(1,0)]):xf.isUp(a)&&c?e([Sf(-1,0)]):i.isBackward(a)&&c?e([Sf(0,-1),Sf(-1,0)]):i.isForward(a)&&c?e([Sf(0,1),Sf(1,0)]):xf.isNavigation(a)&&!1===c?m:S.none})()},keyup:function(n,r,o,i,u){return yr(l,s.selectedSelector()).fold(function(){var e=n.raw(),t=e.which;return 0==(!0===e.shiftKey)?S.none():xf.isNavigation(t)?pl.sync(l,f,r,o,i,u,s.selectRange):S.none()},S.none)}}}},Tf=function(r,e){I(e,function(e){var t,n;n=e,Bo(t=r)?t.dom().classList.remove(n):Mo(t,n),Lo(t)})},Df={byClass:function(o){var t,n,i=(t=o.selected(),function(e){_o(e,t)}),r=(n=[o.selected(),o.lastSelected(),o.firstSelected()],function(e){Tf(e,n)}),u=function(e){var t=Jt(e,o.selectedSelector());I(t,r)};return{clear:u,selectRange:function(e,t,n,r){u(e),I(t,i),_o(n,o.firstSelected()),_o(r,o.lastSelected())},selectedSelector:o.selectedSelector,firstSelectedSelector:o.firstSelectedSelector,lastSelectedSelector:o.lastSelectedSelector}},byAttr:function(o){var n=function(e){be(e,o.selected()),be(e,o.firstSelected()),be(e,o.lastSelected())},i=function(e){ge(e,o.selected(),"1")},u=function(e){var t=Jt(e,o.selectedSelector());I(t,n)};return{clear:u,selectRange:function(e,t,n,r){u(e),I(t,i),ge(n,o.firstSelected(),"1"),ge(r,o.lastSelected(),"1")},selectedSelector:o.selectedSelector,firstSelectedSelector:o.firstSelectedSelector,lastSelectedSelector:o.lastSelectedSelector}}},Of=function(e){return!1===jo(Re.fromDom(e.target),"ephox-snooker-resizer-bar")};function Ef(h,p){var v=te(["mousedown","mouseover","mouseup","keyup","keydown"],[]),b=S.none(),w=Df.byAttr(Er);return h.on("init",function(e){var r=h.getWin(),o=Yu(h),t=Ju(h),n=Rf.mouse(r,o,t,w),a=Rf.keyboard(r,o,t,w),c=function(e,t){!0===e.raw().shiftKey&&(t.kill()&&e.kill(),t.selection().each(function(e){var t=Tc.relative(e.start(),e.finish()),n=Ic(r,t);h.selection.setRng(n)}))},i=function(e){var t=f(e);if(t.raw().shiftKey&&xf.isNavigation(t.raw().which)){var n=h.selection.getRng(),r=Re.fromDom(n.startContainer),o=Re.fromDom(n.endContainer);a.keyup(t,r,n.startOffset,o,n.endOffset).each(function(e){c(t,e)})}},u=function(e){var t=f(e);p().each(function(e){e.hideBars()});var n=h.selection.getRng(),r=Re.fromDom(h.selection.getStart()),o=Re.fromDom(n.startContainer),i=Re.fromDom(n.endContainer),u=ta.directionAt(r).isRtl()?xf.rtl:xf.ltr;a.keydown(t,o,n.startOffset,i,n.endOffset,u).each(function(e){c(t,e)}),p().each(function(e){e.showBars()})},l=function(e){return e.hasOwnProperty("x")&&e.hasOwnProperty("y")},f=function(e){var t=Re.fromDom(e.target),n=function(){e.stopPropagation()},r=function(){e.preventDefault()},o=x(r,n);return{target:C(t),x:C(l(e)?e.x:null),y:C(l(e)?e.y:null),stop:n,prevent:r,kill:o,raw:C(e)}},s=function(e){return 0===e.button},d=function(e){s(e)&&Of(e)&&n.mousedown(f(e))},m=function(e){var t;(t=e).buttons!==undefined&&0==(1&t.buttons)||!Of(e)||n.mouseover(f(e))},g=function(e){s(e)&&Of(e)&&n.mouseup(f(e))};h.on("mousedown",d),h.on("mouseover",m),h.on("mouseup",g),h.on("keyup",i),h.on("keydown",u),h.on("nodechange",function(){var e=h.selection,t=Re.fromDom(e.getStart()),n=Re.fromDom(e.getEnd());hr.sharedOne(pn.table,[t,n]).fold(function(){w.clear(o)},y)}),b=S.some(v({mousedown:d,mouseover:m,mouseup:g,keyup:i,keydown:u}))}),{clear:w.clear,destroy:function(){b.each(function(e){})}}}var Nf=wa.each,kf=function(t){var n=[];function e(e){return function(){t.execCommand(e)}}Nf("inserttable tableprops deletetable | cell row column".split(" "),function(e){"|"===e?n.push({text:"-"}):n.push(t.menuItems[e])}),t.addButton("table",{type:"menubutton",title:"Table",menu:n}),t.addButton("tableprops",{title:"Table properties",onclick:e("mceTableProps"),icon:"table"}),t.addButton("tabledelete",{title:"Delete table",onclick:e("mceTableDelete")}),t.addButton("tablecellprops",{title:"Cell properties",onclick:e("mceTableCellProps")}),t.addButton("tablemergecells",{title:"Merge cells",onclick:e("mceTableMergeCells")}),t.addButton("tablesplitcells",{title:"Split cell",onclick:e("mceTableSplitCells")}),t.addButton("tableinsertrowbefore",{title:"Insert row before",onclick:e("mceTableInsertRowBefore")}),t.addButton("tableinsertrowafter",{title:"Insert row after",onclick:e("mceTableInsertRowAfter")}),t.addButton("tabledeleterow",{title:"Delete row",onclick:e("mceTableDeleteRow")}),t.addButton("tablerowprops",{title:"Row properties",onclick:e("mceTableRowProps")}),t.addButton("tablecutrow",{title:"Cut row",onclick:e("mceTableCutRow")}),t.addButton("tablecopyrow",{title:"Copy row",onclick:e("mceTableCopyRow")}),t.addButton("tablepasterowbefore",{title:"Paste row before",onclick:e("mceTablePasteRowBefore")}),t.addButton("tablepasterowafter",{title:"Paste row after",onclick:e("mceTablePasteRowAfter")}),t.addButton("tableinsertcolbefore",{title:"Insert column before",onclick:e("mceTableInsertColBefore")}),t.addButton("tableinsertcolafter",{title:"Insert column after",onclick:e("mceTableInsertColAfter")}),t.addButton("tabledeletecol",{title:"Delete column",onclick:e("mceTableDeleteCol")})},Af=function(t){var e,n=""===(e=t.getParam("table_toolbar",na))||!1===e?[]:w(e)?e.split(/[ ,]/):R(e)?e:[];0<n.length&&t.addContextToolbar(function(e){return t.dom.is(e,"table")&&t.getBody().contains(e)},n.join(" "))},Pf=function(o,n){var r=S.none(),i=[],u=[],a=[],c=[],l=function(e){e.disabled(!0)},f=function(e){e.disabled(!1)},e=function(){var t=this;i.push(t),r.fold(function(){l(t)},function(e){f(t)})},t=function(){var t=this;u.push(t),r.fold(function(){l(t)},function(e){f(t)})};o.on("init",function(){o.on("nodechange",function(e){var t=S.from(o.dom.getParent(o.selection.getStart(),"th,td"));(r=t.bind(function(e){var t=Re.fromDom(e);return pn.table(t).map(function(e){return Lr.forMenu(n,e,t)})})).fold(function(){I(i,l),I(u,l),I(a,l),I(c,l)},function(t){I(i,f),I(u,f),I(a,function(e){e.disabled(t.mergable().isNone())}),I(c,function(e){e.disabled(t.unmergable().isNone())})})})});var s=function(e,t,n,r){var o,i,u,a,c,l=r.getEl().getElementsByTagName("table")[0],f=r.isRtl()||"tl-tr"===r.parent().rel;for(l.nextSibling.innerHTML=t+1+" x "+(n+1),f&&(t=9-t),i=0;i<10;i++)for(o=0;o<10;o++)a=l.rows[i].childNodes[o].firstChild,c=(f?t<=o:o<=t)&&i<=n,e.dom.toggleClass(a,"mce-active",c),c&&(u=a);return u.parentNode},d=!1===o.getParam("table_grid",!0,"boolean")?{text:"Table",icon:"table",context:"table",onclick:m("mceInsertTable")}:{text:"Table",icon:"table",context:"table",ariaHideMenu:!0,onclick:function(e){e.aria&&(this.parent().hideAll(),e.stopImmediatePropagation(),o.execCommand("mceInsertTable"))},onshow:function(){s(o,0,0,this.menu.items()[0])},onhide:function(){var e=this.menu.items()[0].getEl().getElementsByTagName("a");o.dom.removeClass(e,"mce-active"),o.dom.addClass(e[0],"mce-active")},menu:[{type:"container",html:function(){var e="";e='<table role="grid" class="mce-grid mce-grid-border" aria-readonly="true">';for(var t=0;t<10;t++){e+="<tr>";for(var n=0;n<10;n++)e+='<td role="gridcell" tabindex="-1"><a id="mcegrid'+(10*t+n)+'" href="#" data-mce-x="'+n+'" data-mce-y="'+t+'"></a></td>';e+="</tr>"}return e+="</table>",e+='<div class="mce-text-center" role="presentation">1 x 1</div>'}(),onPostRender:function(){this.lastX=this.lastY=0},onmousemove:function(e){var t,n,r=e.target;"A"===r.tagName.toUpperCase()&&(t=parseInt(r.getAttribute("data-mce-x"),10),n=parseInt(r.getAttribute("data-mce-y"),10),(this.isRtl()||"tl-tr"===this.parent().rel)&&(t=9-t),t===this.lastX&&n===this.lastY||(s(o,t,n,e.control),this.lastX=t,this.lastY=n))},onclick:function(e){var t=this;"A"===e.target.tagName.toUpperCase()&&(e.preventDefault(),e.stopPropagation(),t.parent().cancel(),o.undoManager.transact(function(){Ma(o,t.lastX+1,t.lastY+1)}),o.addVisual())}}]};function m(e){return function(){o.execCommand(e)}}var g={text:"Table properties",context:"table",onPostRender:e,onclick:m("mceTableProps")},h={text:"Delete table",context:"table",onPostRender:e,cmd:"mceTableDelete"},p={text:"Row",context:"table",menu:[{text:"Insert row before",onclick:m("mceTableInsertRowBefore"),onPostRender:t},{text:"Insert row after",onclick:m("mceTableInsertRowAfter"),onPostRender:t},{text:"Delete row",onclick:m("mceTableDeleteRow"),onPostRender:t},{text:"Row properties",onclick:m("mceTableRowProps"),onPostRender:t},{text:"-"},{text:"Cut row",onclick:m("mceTableCutRow"),onPostRender:t},{text:"Copy row",onclick:m("mceTableCopyRow"),onPostRender:t},{text:"Paste row before",onclick:m("mceTablePasteRowBefore"),onPostRender:t},{text:"Paste row after",onclick:m("mceTablePasteRowAfter"),onPostRender:t}]},v={text:"Column",context:"table",menu:[{text:"Insert column before",onclick:m("mceTableInsertColBefore"),onPostRender:t},{text:"Insert column after",onclick:m("mceTableInsertColAfter"),onPostRender:t},{text:"Delete column",onclick:m("mceTableDeleteCol"),onPostRender:t}]},b={separator:"before",text:"Cell",context:"table",menu:[{text:"Cell properties",onclick:m("mceTableCellProps"),onPostRender:t},{text:"Merge cells",onclick:m("mceTableMergeCells"),onPostRender:function(){var t=this;a.push(t),r.fold(function(){l(t)},function(e){t.disabled(e.mergable().isNone())})}},{text:"Split cell",onclick:m("mceTableSplitCells"),onPostRender:function(){var t=this;c.push(t),r.fold(function(){l(t)},function(e){t.disabled(e.unmergable().isNone())})}}]};o.addMenuItem("inserttable",d),o.addMenuItem("tableprops",g),o.addMenuItem("deletetable",h),o.addMenuItem("row",p),o.addMenuItem("column",v),o.addMenuItem("cell",b)},If=function(n,r){return{insertTable:function(e,t){return Ma(n,e,t)},setClipboardRows:function(e){return t=r,n=P(e,Re.fromDom),void t.set(S.from(n));var t,n},getClipboardRows:function(){return r.get().fold(function(){},function(e){return P(e,function(e){return e.dom()})})}}};e.add("table",function(t){var n,r=hc(t),e=Ef(t,r.lazyResize),o=va(t,r.lazyWire),i=(n=t,{get:function(){var e=Yu(n);return Sr(e,Er.selectedSelector()).fold(function(){return n.selection.getStart()===undefined?Ar.none():Ar.single(n.selection)},function(e){return Ar.multiple(e)})}}),u=vu(S.none());return Ha(t,o,e,i,u),jr(t,i,o,e),Pf(t,i),kf(t),Af(t),t.on("PreInit",function(){t.serializer.addTempAttr(Er.firstSelected()),t.serializer.addTempAttr(Er.lastSelected())}),t.getParam("table_tab_navigation",!0,"boolean")&&t.on("keydown",function(e){sl(e,t,o,r.lazyWire)}),t.on("remove",function(){r.destroy(),e.destroy()}),If(t,u)})}(window);
\ No newline at end of file
+!function(m){"use strict";var e=tinymce.util.Tools.resolve("tinymce.PluginManager"),y=function(){},x=function(n,r){return function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return n(r.apply(null,e))}},C=function(e){return function(){return e}},o=function(e){return e};function b(r){for(var o=[],e=1;e<arguments.length;e++)o[e-1]=arguments[e];return function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n=o.concat(e);return r.apply(null,n)}}var t,n,r,i,g=function(n){return function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return!n.apply(null,e)}},f=C(!1),u=C(!0),a=function(){return c},c=(t=function(e){return e.isNone()},i={fold:function(e,t){return e()},is:f,isSome:f,isNone:u,getOr:r=function(e){return e},getOrThunk:n=function(e){return e()},getOrDie:function(e){throw new Error(e||"error: getOrDie called on none.")},getOrNull:C(null),getOrUndefined:C(undefined),or:r,orThunk:n,map:a,each:y,bind:a,exists:f,forall:u,filter:a,equals:t,equals_:t,toArray:function(){return[]},toString:C("none()")},Object.freeze&&Object.freeze(i),i),l=function(n){var e=C(n),t=function(){return o},r=function(e){return e(n)},o={fold:function(e,t){return t(n)},is:function(e){return n===e},isSome:u,isNone:f,getOr:e,getOrThunk:e,getOrDie:e,getOrNull:e,getOrUndefined:e,or:t,orThunk:t,map:function(e){return l(e(n))},each:function(e){e(n)},bind:r,exists:r,forall:r,filter:function(e){return e(n)?o:c},toArray:function(){return[n]},toString:function(){return"some("+n+")"},equals:function(e){return e.is(n)},equals_:function(e,t){return e.fold(f,function(e){return t(n,e)})}};return o},R={some:l,none:a,from:function(e){return null===e||e===undefined?c:l(e)}},s=function(t){return function(e){return function(e){if(null===e)return"null";var t=typeof e;return"object"===t&&(Array.prototype.isPrototypeOf(e)||e.constructor&&"Array"===e.constructor.name)?"array":"object"===t&&(String.prototype.isPrototypeOf(e)||e.constructor&&"String"===e.constructor.name)?"string":t}(e)===t}},d=s("string"),h=s("array"),p=s("boolean"),v=s("function"),w=s("number"),S=Array.prototype.slice,T=Array.prototype.indexOf,D=Array.prototype.push,O=function(e,t){return n=e,r=t,-1<T.call(n,r);var n,r},N=function(e,t){for(var n=0,r=e.length;n<r;n++)if(t(e[n],n))return!0;return!1},E=function(e,t){for(var n=e.length,r=new Array(n),o=0;o<n;o++){var i=e[o];r[o]=t(i,o)}return r},k=function(e,t){for(var n=0,r=e.length;n<r;n++)t(e[n],n)},A=function(e,t){for(var n=[],r=0,o=e.length;r<o;r++){var i=e[r];t(i,r)&&n.push(i)}return n},P=function(e,t,n){return function(e,t){for(var n=e.length-1;0<=n;n--)t(e[n],n)}(e,function(e){n=t(n,e)}),n},I=function(e,t,n){return k(e,function(e){n=t(n,e)}),n},B=function(e,t){for(var n=0,r=e.length;n<r;n++){var o=e[n];if(t(o,n))return R.some(o)}return R.none()},W=function(e,t){for(var n=0,r=e.length;n<r;n++)if(t(e[n],n))return R.some(n);return R.none()},M=function(e){for(var t=[],n=0,r=e.length;n<r;++n){if(!h(e[n]))throw new Error("Arr.flatten item "+n+" was not an array, input: "+e);D.apply(t,e[n])}return t},_=function(e,t){var n=E(e,t);return M(n)},L=function(e,t){for(var n=0,r=e.length;n<r;++n)if(!0!==t(e[n],n))return!1;return!0},F=function(e){var t=S.call(e,0);return t.reverse(),t},j=(v(Array.from)&&Array.from,Object.keys),z=function(e,t){for(var n=j(e),r=0,o=n.length;r<o;r++){var i=n[r];t(e[i],i)}},H=function(e,n){return U(e,function(e,t){return{k:t,v:n(e,t)}})},U=function(e,r){var o={};return z(e,function(e,t){var n=r(e,t);o[n.k]=n.v}),o},q=function(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e];return function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];if(t.length!==n.length)throw new Error('Wrong number of arguments to struct. Expected "['+t.length+']", got '+n.length+" arguments");var r={};return k(t,function(e,t){r[e]=C(n[t])}),r}},V=function(e){return e.slice(0).sort()},G=function(e,t){throw new Error("All required keys ("+V(e).join(", ")+") were not specified. Specified keys were: "+V(t).join(", ")+".")},Y=function(e){throw new Error("Unsupported keys for object: "+V(e).join(", "))},X=function(t,e){if(!h(e))throw new Error("The "+t+" fields must be an array. Was: "+e+".");k(e,function(e){if(!d(e))throw new Error("The value "+e+" in the "+t+" fields was not a string.")})},K=function(e){var n=V(e);B(n,function(e,t){return t<n.length-1&&e===n[t+1]}).each(function(e){throw new Error("The field: "+e+" occurs more than once in the combined fields: ["+n.join(", ")+"].")})},J=function(o,i){var u=o.concat(i);if(0===u.length)throw new Error("You must specify at least one required or optional field.");return X("required",o),X("optional",i),K(u),function(t){var n=j(t);L(o,function(e){return O(n,e)})||G(o,n);var e=A(n,function(e){return!O(u,e)});0<e.length&&Y(e);var r={};return k(o,function(e){r[e]=C(t[e])}),k(i,function(e){r[e]=C(Object.prototype.hasOwnProperty.call(t,e)?R.some(t[e]):R.none())}),r}},$=(m.Node.ATTRIBUTE_NODE,m.Node.CDATA_SECTION_NODE,m.Node.COMMENT_NODE),Q=m.Node.DOCUMENT_NODE,Z=(m.Node.DOCUMENT_TYPE_NODE,m.Node.DOCUMENT_FRAGMENT_NODE,m.Node.ELEMENT_NODE),ee=m.Node.TEXT_NODE,te=(m.Node.PROCESSING_INSTRUCTION_NODE,m.Node.ENTITY_REFERENCE_NODE,m.Node.ENTITY_NODE,m.Node.NOTATION_NODE,"undefined"!=typeof m.window?m.window:Function("return this;")()),ne=function(e,t){return function(e,t){for(var n=t!==undefined&&null!==t?t:te,r=0;r<e.length&&n!==undefined&&null!==n;++r)n=n[e[r]];return n}(e.split("."),t)},re=function(e,t){var n=ne(e,t);if(n===undefined||null===n)throw new Error(e+" not available on this browser");return n},oe=function(e){return e.dom().nodeName.toLowerCase()},ie=function(e){return e.dom().nodeType},ue=function(t){return function(e){return ie(e)===t}},ae=function(e){return ie(e)===$||"#comment"===oe(e)},ce=ue(Z),le=ue(ee),fe=function(e,t,n){if(!(d(n)||p(n)||w(n)))throw m.console.error("Invalid call to Attr.set. Key ",t,":: Value ",n,":: Element ",e),new Error("Attribute value was not simple");e.setAttribute(t,n+"")},se=function(e,t,n){fe(e.dom(),t,n)},de=function(e,t){var n=e.dom();z(t,function(e,t){fe(n,t,e)})},me=function(e,t){var n=e.dom().getAttribute(t);return null===n?undefined:n},ge=function(e,t){var n=e.dom();return!(!n||!n.hasAttribute)&&n.hasAttribute(t)},he=function(e,t){e.dom().removeAttribute(t)},pe=function(e){return I(e.dom().attributes,function(e,t){return e[t.name]=t.value,e},{})},ve=function(e,t){return-1!==e.indexOf(t)},be=function(e){return e.style!==undefined&&v(e.style.getPropertyValue)},we=function(n){var r,o=!1;return function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return o||(o=!0,r=n.apply(null,e)),r}},ye=function(e){if(null===e||e===undefined)throw new Error("Node cannot be null or undefined");return{dom:C(e)}},xe={fromHtml:function(e,t){var n=(t||m.document).createElement("div");if(n.innerHTML=e,!n.hasChildNodes()||1<n.childNodes.length)throw m.console.error("HTML does not have a single root node",e),new Error("HTML must have a single root node");return ye(n.childNodes[0])},fromTag:function(e,t){var n=(t||m.document).createElement(e);return ye(n)},fromText:function(e,t){var n=(t||m.document).createTextNode(e);return ye(n)},fromDom:ye,fromPoint:function(e,t,n){var r=e.dom();return R.from(r.elementFromPoint(t,n)).map(ye)}},Ce=function(e){var t=le(e)?e.dom().parentNode:e.dom();return t!==undefined&&null!==t&&t.ownerDocument.body.contains(t)},Re=we(function(){return Se(xe.fromDom(m.document))}),Se=function(e){var t=e.dom().body;if(null===t||t===undefined)throw new Error("Body is not available yet");return xe.fromDom(t)},Te=function(e,t,n){if(!d(n))throw m.console.error("Invalid call to CSS.set. Property ",t,":: Value ",n,":: Element ",e),new Error("CSS value must be a string: "+n);be(e)&&e.style.setProperty(t,n)},De=function(e,t,n){var r=e.dom();Te(r,t,n)},Oe=function(e,t){var n=e.dom();z(t,function(e,t){Te(n,t,e)})},Ne=function(e,t){var n=e.dom(),r=m.window.getComputedStyle(n).getPropertyValue(t),o=""!==r||Ce(e)?r:Ee(n,t);return null===o?undefined:o},Ee=function(e,t){return be(e)?e.style.getPropertyValue(t):""},ke=function(e,t){var n=e.dom(),r=Ee(n,t);return R.from(r).filter(function(e){return 0<e.length})},Ae=function(e,t){var n,r,o=e.dom();r=t,be(n=o)&&n.style.removeProperty(r),ge(e,"style")&&""===me(e,"style").replace(/^\s+|\s+$/g,"")&&he(e,"style")},Pe=function(){return re("Node")},Ie=function(e,t,n){return 0!=(e.compareDocumentPosition(t)&n)},Be=function(e,t){return Ie(e,t,Pe().DOCUMENT_POSITION_CONTAINED_BY)},We=function(e,t){var n=function(e,t){for(var n=0;n<e.length;n++){var r=e[n];if(r.test(t))return r}return undefined}(e,t);if(!n)return{major:0,minor:0};var r=function(e){return Number(t.replace(n,"$"+e))};return _e(r(1),r(2))},Me=function(){return _e(0,0)},_e=function(e,t){return{major:e,minor:t}},Le={nu:_e,detect:function(e,t){var n=String(t).toLowerCase();return 0===e.length?Me():We(e,n)},unknown:Me},Fe="Firefox",je=function(e,t){return function(){return t===e}},ze=function(e){var t=e.current;return{current:t,version:e.version,isEdge:je("Edge",t),isChrome:je("Chrome",t),isIE:je("IE",t),isOpera:je("Opera",t),isFirefox:je(Fe,t),isSafari:je("Safari",t)}},He={unknown:function(){return ze({current:undefined,version:Le.unknown()})},nu:ze,edge:C("Edge"),chrome:C("Chrome"),ie:C("IE"),opera:C("Opera"),firefox:C(Fe),safari:C("Safari")},Ue="Windows",qe="Android",Ve="Solaris",Ge="FreeBSD",Ye=function(e,t){return function(){return t===e}},Xe=function(e){var t=e.current;return{current:t,version:e.version,isWindows:Ye(Ue,t),isiOS:Ye("iOS",t),isAndroid:Ye(qe,t),isOSX:Ye("OSX",t),isLinux:Ye("Linux",t),isSolaris:Ye(Ve,t),isFreeBSD:Ye(Ge,t)}},Ke={unknown:function(){return Xe({current:undefined,version:Le.unknown()})},nu:Xe,windows:C(Ue),ios:C("iOS"),android:C(qe),linux:C("Linux"),osx:C("OSX"),solaris:C(Ve),freebsd:C(Ge)},Je=function(e,t){var n=String(t).toLowerCase();return B(e,function(e){return e.search(n)})},$e=function(e,n){return Je(e,n).map(function(e){var t=Le.detect(e.versionRegexes,n);return{current:e.name,version:t}})},Qe=function(e,n){return Je(e,n).map(function(e){var t=Le.detect(e.versionRegexes,n);return{current:e.name,version:t}})},Ze=/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,et=function(t){return function(e){return ve(e,t)}},tt=[{name:"Edge",versionRegexes:[/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],search:function(e){return ve(e,"edge/")&&ve(e,"chrome")&&ve(e,"safari")&&ve(e,"applewebkit")}},{name:"Chrome",versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/,Ze],search:function(e){return ve(e,"chrome")&&!ve(e,"chromeframe")}},{name:"IE",versionRegexes:[/.*?msie\ ?([0-9]+)\.([0-9]+).*/,/.*?rv:([0-9]+)\.([0-9]+).*/],search:function(e){return ve(e,"msie")||ve(e,"trident")}},{name:"Opera",versionRegexes:[Ze,/.*?opera\/([0-9]+)\.([0-9]+).*/],search:et("opera")},{name:"Firefox",versionRegexes:[/.*?firefox\/\ ?([0-9]+)\.([0-9]+).*/],search:et("firefox")},{name:"Safari",versionRegexes:[Ze,/.*?cpu os ([0-9]+)_([0-9]+).*/],search:function(e){return(ve(e,"safari")||ve(e,"mobile/"))&&ve(e,"applewebkit")}}],nt=[{name:"Windows",search:et("win"),versionRegexes:[/.*?windows\ nt\ ?([0-9]+)\.([0-9]+).*/]},{name:"iOS",search:function(e){return ve(e,"iphone")||ve(e,"ipad")},versionRegexes:[/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,/.*cpu os ([0-9]+)_([0-9]+).*/,/.*cpu iphone os ([0-9]+)_([0-9]+).*/]},{name:"Android",search:et("android"),versionRegexes:[/.*?android\ ?([0-9]+)\.([0-9]+).*/]},{name:"OSX",search:et("os x"),versionRegexes:[/.*?os\ x\ ?([0-9]+)_([0-9]+).*/]},{name:"Linux",search:et("linux"),versionRegexes:[]},{name:"Solaris",search:et("sunos"),versionRegexes:[]},{name:"FreeBSD",search:et("freebsd"),versionRegexes:[]}],rt={browsers:C(tt),oses:C(nt)},ot=function(e){var t,n,r,o,i,u,a,c,l,f,s,d=rt.browsers(),m=rt.oses(),g=$e(d,e).fold(He.unknown,He.nu),h=Qe(m,e).fold(Ke.unknown,Ke.nu);return{browser:g,os:h,deviceType:(n=g,r=e,o=(t=h).isiOS()&&!0===/ipad/i.test(r),i=t.isiOS()&&!o,u=t.isAndroid()&&3===t.version.major,a=t.isAndroid()&&4===t.version.major,c=o||u||a&&!0===/mobile/i.test(r),l=t.isiOS()||t.isAndroid(),f=l&&!c,s=n.isSafari()&&t.isiOS()&&!1===/safari/i.test(r),{isiPad:C(o),isiPhone:C(i),isTablet:C(c),isPhone:C(f),isTouch:C(l),isAndroid:t.isAndroid,isiOS:t.isiOS,isWebView:C(s)})}},it={detect:we(function(){var e=m.navigator.userAgent;return ot(e)})},ut=Z,at=Q,ct=function(e,t){var n=e.dom();if(n.nodeType!==ut)return!1;var r=n;if(r.matches!==undefined)return r.matches(t);if(r.msMatchesSelector!==undefined)return r.msMatchesSelector(t);if(r.webkitMatchesSelector!==undefined)return r.webkitMatchesSelector(t);if(r.mozMatchesSelector!==undefined)return r.mozMatchesSelector(t);throw new Error("Browser lacks native selectors")},lt=function(e){return e.nodeType!==ut&&e.nodeType!==at||0===e.childElementCount},ft=function(e,t){return e.dom()===t.dom()},st=it.detect().browser.isIE()?function(e,t){return Be(e.dom(),t.dom())}:function(e,t){var n=e.dom(),r=t.dom();return n!==r&&n.contains(r)},dt=ct,mt=function(e){return xe.fromDom(e.dom().ownerDocument)},gt=function(e){return R.from(e.dom().parentNode).map(xe.fromDom)},ht=function(e,t){for(var n=v(t)?t:f,r=e.dom(),o=[];null!==r.parentNode&&r.parentNode!==undefined;){var i=r.parentNode,u=xe.fromDom(i);if(o.push(u),!0===n(u))break;r=i}return o},pt=function(e){return R.from(e.dom().previousSibling).map(xe.fromDom)},vt=function(e){return R.from(e.dom().nextSibling).map(xe.fromDom)},bt=function(e){return E(e.dom().childNodes,xe.fromDom)},wt=function(e,t){var n=e.dom().childNodes;return R.from(n[t]).map(xe.fromDom)},yt=(q("element","offset"),function(t,n){gt(t).each(function(e){e.dom().insertBefore(n.dom(),t.dom())})}),xt=function(e,t){vt(e).fold(function(){gt(e).each(function(e){Rt(e,t)})},function(e){yt(e,t)})},Ct=function(t,n){wt(t,0).fold(function(){Rt(t,n)},function(e){t.dom().insertBefore(n.dom(),e.dom())})},Rt=function(e,t){e.dom().appendChild(t.dom())},St=function(e,t){yt(e,t),Rt(t,e)},Tt=function(r,o){k(o,function(e,t){var n=0===t?r:o[t-1];xt(n,e)})},Dt=function(t,e){k(e,function(e){Rt(t,e)})},Ot=function(e){e.dom().textContent="",k(bt(e),function(e){Nt(e)})},Nt=function(e){var t=e.dom();null!==t.parentNode&&t.parentNode.removeChild(t)},Et=function(e){var t,n=bt(e);0<n.length&&(t=e,k(n,function(e){yt(t,e)})),Nt(e)},kt=(q("width","height"),q("width","height"),q("rows","columns")),At=q("row","column"),Pt=(q("x","y"),q("element","rowspan","colspan")),It=q("element","rowspan","colspan","isNew"),Bt=q("element","rowspan","colspan","row","column"),Wt=q("element","cells","section"),Mt=q("element","isNew"),_t=q("element","cells","section","isNew"),Lt=q("cells","section"),Ft=q("details","section"),jt=q("startRow","startCol","finishRow","finishCol"),zt=function(e,t){var n=[];return k(bt(e),function(e){t(e)&&(n=n.concat([e])),n=n.concat(zt(e,t))}),n},Ht=function(e,t,n){return r=function(e){return ct(e,t)},A(ht(e,n),r);var r},Ut=function(e,t){return n=function(e){return ct(e,t)},A(bt(e),n);var n},qt=function(e,t){return n=t,o=(r=e)===undefined?m.document:r.dom(),lt(o)?[]:E(o.querySelectorAll(n),xe.fromDom);var n,r,o};function Vt(e,t,n,r,o){return e(n,r)?R.some(n):v(o)&&o(n)?R.none():t(n,r,o)}var Gt,Yt,Xt,Kt=function(e,t,n){for(var r=e.dom(),o=v(n)?n:C(!1);r.parentNode;){r=r.parentNode;var i=xe.fromDom(r);if(t(i))return R.some(i);if(o(i))break}return R.none()},Jt=function(e,t,n){return Kt(e,function(e){return ct(e,t)},n)},$t=function(e,t){return n=function(e){return ct(e,t)},B(e.dom().childNodes,function(e){return n(xe.fromDom(e))}).map(xe.fromDom);var n},Qt=function(e,t){return n=t,o=(r=e)===undefined?m.document:r.dom(),lt(o)?R.none():R.from(o.querySelector(n)).map(xe.fromDom);var n,r,o},Zt=function(e,t,n){return Vt(ct,Jt,e,t,n)},en=function(e,t,n){return _(bt(e),function(e){return ct(e,t)?n(e)?[e]:[]:en(e,t,n)})},tn={firstLayer:function(e,t){return en(e,t,C(!0))},filterFirstLayer:en},nn=function(e,t,n){return void 0===n&&(n=f),n(t)?R.none():O(e,oe(t))?R.some(t):Jt(t,e.join(","),function(e){return ct(e,"table")||n(e)})},rn=function(t,e){return gt(e).map(function(e){return Ut(e,t)})},on=b(rn,"th,td"),un=b(rn,"tr"),an=function(e,t){return parseInt(me(e,t),10)},cn={cell:function(e,t){return nn(["td","th"],e,t)},firstCell:function(e){return Qt(e,"th,td")},cells:function(e){return tn.firstLayer(e,"th,td")},neighbourCells:on,table:function(e,t){return Zt(e,"table",t)},row:function(e,t){return nn(["tr"],e,t)},rows:function(e){return tn.firstLayer(e,"tr")},notCell:function(e,t){return nn(["caption","tr","tbody","tfoot","thead"],e,t)},neighbourRows:un,attr:an,grid:function(e,t,n){var r=an(e,t),o=an(e,n);return kt(r,o)}},ln=function(e){var t=cn.rows(e);return E(t,function(e){var t=e,n=gt(t).map(function(e){var t=oe(e);return"tfoot"===t||"thead"===t||"tbody"===t?t:"tbody"}).getOr("tbody"),r=E(cn.cells(e),function(e){var t=ge(e,"rowspan")?parseInt(me(e,"rowspan"),10):1,n=ge(e,"colspan")?parseInt(me(e,"colspan"),10):1;return Pt(e,t,n)});return Wt(t,r,n)})},fn=function(e,n){return E(e,function(e){var t=E(cn.cells(e),function(e){var t=ge(e,"rowspan")?parseInt(me(e,"rowspan"),10):1,n=ge(e,"colspan")?parseInt(me(e,"colspan"),10):1;return Pt(e,t,n)});return Wt(e,t,n.section())})},sn=function(e,t){return e+","+t},dn=function(e,t){var n=_(e.all(),function(e){return e.cells()});return A(n,t)},mn={generate:function(e){var l={},t=[],n=e.length,f=0;k(e,function(e,a){var c=[];k(e.cells(),function(e){for(var t=0;l[sn(a,t)]!==undefined;)t++;for(var n=Bt(e.element(),e.rowspan(),e.colspan(),a,t),r=0;r<e.colspan();r++)for(var o=0;o<e.rowspan();o++){var i=t+r,u=sn(a+o,i);l[u]=n,f=Math.max(f,i+1)}c.push(n)}),t.push(Wt(e.element(),c,e.section()))});var r=kt(n,f);return{grid:C(r),access:C(l),all:C(t)}},getAt:function(e,t,n){var r=e.access()[sn(t,n)];return r!==undefined?R.some(r):R.none()},findItem:function(e,t,n){var r=dn(e,function(e){return n(t,e.element())});return 0<r.length?R.some(r[0]):R.none()},filterItems:dn,justCells:function(e){var t=E(e.all(),function(e){return e.cells()});return M(t)}},gn=q("minRow","minCol","maxRow","maxCol"),hn=function(e,t){var n,i,r,u,a,c,l,o,f,s,d=function(e){return ct(e.element(),t)},m=ln(e),g=mn.generate(m),h=(i=d,r=(n=g).grid().columns(),u=n.grid().rows(),a=r,l=c=0,z(n.access(),function(e){if(i(e)){var t=e.row(),n=t+e.rowspan()-1,r=e.column(),o=r+e.colspan()-1;t<u?u=t:c<n&&(c=n),r<a?a=r:l<o&&(l=o)}}),gn(u,a,c,l)),p="th:not("+t+"),td:not("+t+")",v=tn.filterFirstLayer(e,"th,td",function(e){return ct(e,p)});return k(v,Nt),function(e,t,n,r){for(var o,i,u,a=t.grid().columns(),c=t.grid().rows(),l=0;l<c;l++)for(var f=!1,s=0;s<a;s++)l<n.minRow()||l>n.maxRow()||s<n.minCol()||s>n.maxCol()||(mn.getAt(t,l,s).filter(r).isNone()?(o=f,i=e[l].element(),u=xe.fromTag("td"),Rt(u,xe.fromTag("br")),(o?Rt:Ct)(i,u)):f=!0)}(m,g,h,d),o=e,f=h,s=A(tn.firstLayer(o,"tr"),function(e){return 0===e.dom().childElementCount}),k(s,Nt),f.minCol()!==f.maxCol()&&f.minRow()!==f.maxRow()||k(tn.firstLayer(o,"th,td"),function(e){he(e,"rowspan"),he(e,"colspan")}),he(o,"width"),he(o,"height"),Ae(o,"width"),Ae(o,"height"),e},pn=(Gt=le,Yt="text",{get:function(e){if(!Gt(e))throw new Error("Can only get "+Yt+" value of a "+Yt+" node");return Xt(e).getOr("")},getOption:Xt=function(e){return Gt(e)?R.from(e.dom().nodeValue):R.none()},set:function(e,t){if(!Gt(e))throw new Error("Can only set raw "+Yt+" value of a "+Yt+" node");e.dom().nodeValue=t}}),vn=function(e){return pn.get(e)},bn=function(e){return pn.getOption(e)},wn=function(e,t){pn.set(e,t)},yn=function(e){return"img"===oe(e)?1:bn(e).fold(function(){return bt(e).length},function(e){return e.length})},xn=["img","br"],Cn=function(e){return bn(e).filter(function(e){return 0!==e.trim().length||-1<e.indexOf("\xa0")}).isSome()||O(xn,oe(e))},Rn=function(e){return o=Cn,(i=function(e){for(var t=0;t<e.childNodes.length;t++){var n=xe.fromDom(e.childNodes[t]);if(o(n))return R.some(n);var r=i(e.childNodes[t]);if(r.isSome())return r}return R.none()})(e.dom());var o,i},Sn=function(e){return Tn(e,Cn)},Tn=function(e,i){var u=function(e){for(var t=bt(e),n=t.length-1;0<=n;n--){var r=t[n];if(i(r))return R.some(r);var o=u(r);if(o.isSome())return o}return R.none()};return u(e)},Dn=function(e,t){return xe.fromDom(e.dom().cloneNode(t))},On=function(e){return Dn(e,!1)},Nn=function(e){return Dn(e,!0)},En=function(e,t){var n,r,o,i,u=(n=e,r=t,o=xe.fromTag(r),i=pe(n),de(o,i),o),a=bt(Nn(e));return Dt(u,a),u},kn=function(){var e=xe.fromTag("td");return Rt(e,xe.fromTag("br")),e},An=function(e,t,n){var r=En(e,t);return z(n,function(e,t){null===e?he(r,t):se(r,t,e)}),r},Pn=function(e){return e},In=function(e){return function(){return xe.fromTag("tr",e.dom())}},Bn=function(d,e,m){return{row:In(e),cell:function(e){var r,o,i,t,n,u,a,c=mt(e.element()),l=xe.fromTag(oe(e.element()),c.dom()),f=m.getOr(["strong","em","b","i","span","font","h1","h2","h3","h4","h5","h6","p","div"]),s=0<f.length?(r=e.element(),o=l,i=f,Rn(r).map(function(e){var t=i.join(","),n=Ht(e,t,function(e){return ft(e,r)});return P(n,function(e,t){var n=On(t);return he(n,"contenteditable"),Rt(e,n),n},o)}).getOr(o)):l;return Rt(s,xe.fromTag("br")),t=e.element(),n=l,u=t.dom(),a=n.dom(),be(u)&&be(a)&&(a.style.cssText=u.style.cssText),Ae(l,"height"),1!==e.colspan()&&Ae(e.element(),"width"),d(e.element(),l),l},replace:An,gap:kn}},Wn=function(e){return{row:In(e),cell:kn,replace:Pn,gap:kn}},Mn=function(e,t){return t.column()>=e.startCol()&&t.column()+t.colspan()-1<=e.finishCol()&&t.row()>=e.startRow()&&t.row()+t.rowspan()-1<=e.finishRow()},_n=function(e,t){var n=t.column(),r=t.column()+t.colspan()-1,o=t.row(),i=t.row()+t.rowspan()-1;return n<=e.finishCol()&&r>=e.startCol()&&o<=e.finishRow()&&i>=e.startRow()},Ln=function(e,t){for(var n=!0,r=b(Mn,t),o=t.startRow();o<=t.finishRow();o++)for(var i=t.startCol();i<=t.finishCol();i++)n=n&&mn.getAt(e,o,i).exists(r);return n?R.some(t):R.none()},Fn=function(e,t,n){var r=mn.findItem(e,t,ft),o=mn.findItem(e,n,ft);return r.bind(function(r){return o.map(function(e){return t=r,n=e,jt(Math.min(t.row(),n.row()),Math.min(t.column(),n.column()),Math.max(t.row()+t.rowspan()-1,n.row()+n.rowspan()-1),Math.max(t.column()+t.colspan()-1,n.column()+n.colspan()-1));var t,n})})},jn=Fn,zn=function(t,e,n){return Fn(t,e,n).bind(function(e){return Ln(t,e)})},Hn=function(r,e,o,i){return mn.findItem(r,e,ft).bind(function(e){var t=0<o?e.row()+e.rowspan()-1:e.row(),n=0<i?e.column()+e.colspan()-1:e.column();return mn.getAt(r,t+o,n+i).map(function(e){return e.element()})})},Un=function(n,e,t){return jn(n,e,t).map(function(e){var t=mn.filterItems(n,b(_n,e));return E(t,function(e){return e.element()})})},qn=function(e,t){return mn.findItem(e,t,function(e,t){return st(t,e)}).map(function(e){return e.element()})},Vn=function(e){var t=ln(e);return mn.generate(t)},Gn=function(n,r,o){return cn.table(n).bind(function(e){var t=Vn(e);return Hn(t,n,r,o)})},Yn=function(e,t,n){var r=Vn(e);return Un(r,t,n)},Xn=function(e,t,n,r,o){var i=Vn(e),u=ft(e,n)?R.some(t):qn(i,t),a=ft(e,o)?R.some(r):qn(i,r);return u.bind(function(t){return a.bind(function(e){return Un(i,t,e)})})},Kn=function(e,t,n){var r=Vn(e);return zn(r,t,n)},Jn=["body","p","div","article","aside","figcaption","figure","footer","header","nav","section","ol","ul","li","table","thead","tbody","tfoot","caption","tr","td","th","h1","h2","h3","h4","h5","h6","blockquote","pre","address"];function $n(){return{up:C({selector:Jt,closest:Zt,predicate:Kt,all:ht}),down:C({selector:qt,predicate:zt}),styles:C({get:Ne,getRaw:ke,set:De,remove:Ae}),attrs:C({get:me,set:se,remove:he,copyTo:function(e,t){var n=pe(e);de(t,n)}}),insert:C({before:yt,after:xt,afterAll:Tt,append:Rt,appendAll:Dt,prepend:Ct,wrap:St}),remove:C({unwrap:Et,remove:Nt}),create:C({nu:xe.fromTag,clone:function(e){return xe.fromDom(e.dom().cloneNode(!1))},text:xe.fromText}),query:C({comparePosition:function(e,t){return e.dom().compareDocumentPosition(t.dom())},prevSibling:pt,nextSibling:vt}),property:C({children:bt,name:oe,parent:gt,document:function(e){return e.dom().ownerDocument},isText:le,isComment:ae,isElement:ce,getText:vn,setText:wn,isBoundary:function(e){return!!ce(e)&&("body"===oe(e)||O(Jn,oe(e)))},isEmptyTag:function(e){return!!ce(e)&&O(["br","img","hr","input"],oe(e))}}),eq:ft,is:dt}}var Qn=q("left","right"),Zn=q("first","second","splits"),er=function(e,t,n){var r=e.property().children(t);return W(r,b(e.eq,n)).map(function(e){return{before:C(r.slice(0,e)),after:C(r.slice(e+1))}})},tr=function(r,o,e,t){var n=o(r,e);return P(t,function(e,t){var n=o(r,t);return nr(r,e,n)},n)},nr=function(t,e,n){return e.bind(function(e){return n.filter(b(t.eq,e))})},rr=function(e,t){return b(e.eq,t)},or=function(t,e,n,r){void 0===r&&(r=f);var o=[e].concat(t.up().all(e)),i=[n].concat(t.up().all(n)),u=function(t){return W(t,r).fold(function(){return t},function(e){return t.slice(0,e+1)})},a=u(o),c=u(i),l=B(a,function(e){return N(c,rr(t,e))});return{firstpath:C(a),secondpath:C(c),shared:C(l)}},ir={sharedOne:function(e,t,n){return 0<n.length?tr(e,t,(r=n)[0],r.slice(1)):R.none();var r},subset:function(t,e,n){var r=or(t,e,n);return r.shared().bind(function(e){return function(o,i,e,t){var u=o.property().children(i);if(o.eq(i,e[0]))return R.some([e[0]]);if(o.eq(i,t[0]))return R.some([t[0]]);var n=function(e){var t=F(e),n=W(t,rr(o,i)).getOr(-1),r=n<t.length-1?t[n+1]:t[n];return W(u,rr(o,r))},r=n(e),a=n(t);return r.bind(function(r){return a.map(function(e){var t=Math.min(r,e),n=Math.max(r,e);return u.slice(t,n+1)})})}(t,e,r.firstpath(),r.secondpath())})},ancestors:or,breakToLeft:function(n,r,o){return er(n,r,o).map(function(e){var t=n.create().clone(r);return n.insert().appendAll(t,e.before().concat([o])),n.insert().appendAll(r,e.after()),n.insert().before(r,t),Qn(t,r)})},breakToRight:function(n,r,e){return er(n,r,e).map(function(e){var t=n.create().clone(r);return n.insert().appendAll(t,e.after()),n.insert().after(r,t),Qn(r,t)})},breakPath:function(i,e,u,a){var c=function(e,t,o){var n=Zn(e,R.none(),o);return u(e)?Zn(e,t,o):i.property().parent(e).bind(function(r){return a(i,r,e).map(function(e){var t=[{first:e.left,second:e.right}],n=u(r)?r:e.left();return c(n,R.some(e.right()),o.concat(t))})}).getOr(n)};return c(e,R.none(),[])}},ur=$n(),ar={sharedOne:function(n,e){return ir.sharedOne(ur,function(e,t){return n(t)},e)},subset:function(e,t){return ir.subset(ur,e,t)},ancestors:function(e,t,n){return ir.ancestors(ur,e,t,n)},breakToLeft:function(e,t){return ir.breakToLeft(ur,e,t)},breakToRight:function(e,t){return ir.breakToRight(ur,e,t)},breakPath:function(e,t,r){return ir.breakPath(ur,e,t,function(e,t,n){return r(t,n)})}},cr={create:J(["boxes","start","finish"],[])},lr=function(e){return Jt(e,"table")},fr=function(a,c,r){var l=function(t){return function(e){return r!==undefined&&r(e)||ft(e,t)}};return ft(a,c)?R.some(cr.create({boxes:R.some([a]),start:a,finish:c})):lr(a).bind(function(u){return lr(c).bind(function(i){if(ft(u,i))return R.some(cr.create({boxes:Yn(u,a,c),start:a,finish:c}));if(st(u,i)){var e=0<(t=Ht(c,"td,th",l(u))).length?t[t.length-1]:c;return R.some(cr.create({boxes:Xn(u,a,u,c,i),start:a,finish:e}))}if(st(i,u)){var t,n=0<(t=Ht(a,"td,th",l(i))).length?t[t.length-1]:a;return R.some(cr.create({boxes:Xn(i,a,u,c,i),start:a,finish:n}))}return ar.ancestors(a,c).shared().bind(function(e){return Zt(e,"table",r).bind(function(e){var t=Ht(c,"td,th",l(e)),n=0<t.length?t[t.length-1]:c,r=Ht(a,"td,th",l(e)),o=0<r.length?r[r.length-1]:a;return R.some(cr.create({boxes:Xn(e,a,u,c,i),start:o,finish:n}))})})})})},sr=fr,dr=function(e,t){var n=qt(e,t);return 0<n.length?R.some(n):R.none()},mr=function(e,t,n,r,o){return(i=e,u=o,B(i,function(e){return ct(e,u)})).bind(function(e){return Gn(e,t,n).bind(function(e){return n=r,Jt(t=e,"table").bind(function(e){return Qt(e,n).bind(function(e){return fr(e,t).bind(function(t){return t.boxes().map(function(e){return{boxes:C(e),start:C(t.start()),finish:C(t.finish())}})})})});var t,n})});var i,u},gr=function(e,t,r){return Qt(e,t).bind(function(n){return Qt(e,r).bind(function(t){return ar.sharedOne(lr,[n,t]).map(function(e){return{first:C(n),last:C(t),table:C(e)}})})})},hr=function(e,t){return dr(e,t)},pr=function(o,e,t){return gr(o,e,t).bind(function(n){var e=function(e){return ft(o,e)},t=Jt(n.first(),"thead,tfoot,tbody,table",e),r=Jt(n.last(),"thead,tfoot,tbody,table",e);return t.bind(function(t){return r.bind(function(e){return ft(t,e)?Kn(n.table(),n.first(),n.last()):R.none()})})})},vr="data-mce-selected",br="data-mce-first-selected",wr="data-mce-last-selected",yr={selected:C(vr),selectedSelector:C("td[data-mce-selected],th[data-mce-selected]"),attributeSelector:C("[data-mce-selected]"),firstSelected:C(br),firstSelectedSelector:C("td[data-mce-first-selected],th[data-mce-first-selected]"),lastSelected:C(wr),lastSelectedSelector:C("td[data-mce-last-selected],th[data-mce-last-selected]")},xr=function(u){if(!h(u))throw new Error("cases must be an array");if(0===u.length)throw new Error("there must be at least one case");var a=[],n={};return k(u,function(e,r){var t=j(e);if(1!==t.length)throw new Error("one and only one name per case");var o=t[0],i=e[o];if(n[o]!==undefined)throw new Error("duplicate key detected:"+o);if("cata"===o)throw new Error("cannot have a case named cata (sorry)");if(!h(i))throw new Error("case arguments must be an array");a.push(o),n[o]=function(){var e=arguments.length;if(e!==i.length)throw new Error("Wrong number of arguments to case "+o+". Expected "+i.length+" ("+i+"), got "+e);for(var n=new Array(e),t=0;t<n.length;t++)n[t]=arguments[t];return{fold:function(){if(arguments.length!==u.length)throw new Error("Wrong number of arguments to fold. Expected "+u.length+", got "+arguments.length);return arguments[r].apply(null,n)},match:function(e){var t=j(e);if(a.length!==t.length)throw new Error("Wrong number of arguments to match. Expected: "+a.join(",")+"\nActual: "+t.join(","));if(!L(a,function(e){return O(t,e)}))throw new Error("Not all branches were specified when using match. Specified: "+t.join(", ")+"\nRequired: "+a.join(", "));return e[o].apply(null,n)},log:function(e){m.console.log(e,{constructors:a,constructor:o,params:n})}}}}),n},Cr=xr([{none:[]},{multiple:["elements"]},{single:["selection"]}]),Rr={cata:function(e,t,n,r){return e.fold(t,n,r)},none:Cr.none,multiple:Cr.multiple,single:Cr.single},Sr=function(e,t){return Rr.cata(t.get(),C([]),o,C([e]))},Tr=function(n,e){return Rr.cata(e.get(),R.none,function(t,e){return 0===t.length?R.none():pr(n,yr.firstSelectedSelector(),yr.lastSelectedSelector()).bind(function(e){return 1<t.length?R.some({bounds:C(e),cells:C(t)}):R.none()})},R.none)},Dr=function(e,t){var n=Sr(e,t);return 0<n.length&&L(n,function(e){return ge(e,"rowspan")&&1<parseInt(me(e,"rowspan"),10)||ge(e,"colspan")&&1<parseInt(me(e,"colspan"),10)})?R.some(n):R.none()},Or=Sr,Nr=function(e){return{element:C(e),mergable:R.none,unmergable:R.none,selection:C([e])}},Er=q("element","clipboard","generators"),kr={noMenu:Nr,forMenu:function(e,t,n){return{element:C(n),mergable:C(Tr(t,e)),unmergable:C(Dr(n,e)),selection:C(Or(n,e))}},notCell:function(e){return Nr(e)},paste:Er,pasteRows:function(e,t,n,r,o){return{element:C(n),mergable:R.none,unmergable:R.none,selection:C(Or(n,e)),clipboard:C(r),generators:C(o)}}},Ar=function(f,e,s,d){f.on("BeforeGetContent",function(n){!0===n.selection&&Rr.cata(e.get(),y,function(e){var t;n.preventDefault(),(t=e,cn.table(t[0]).map(Nn).map(function(e){return[hn(e,yr.attributeSelector())]})).each(function(e){var t;n.content="text"===n.format?E(e,function(e){return e.dom().innerText}).join(""):(t=f,E(e,function(e){return t.selection.serializer.serialize(e.dom(),{})}).join(""))})},y)}),f.on("BeforeSetContent",function(l){!0===l.selection&&!0===l.paste&&R.from(f.dom.getParent(f.selection.getStart(),"th,td")).each(function(e){var c=xe.fromDom(e);cn.table(c).each(function(t){var e,n,r,o=A((e=l.content,(r=(n||m.document).createElement("div")).innerHTML=e,bt(xe.fromDom(r))),function(e){return"meta"!==oe(e)});if(1===o.length&&"table"===oe(o[0])){l.preventDefault();var i=xe.fromDom(f.getDoc()),u=Wn(i),a=kr.paste(c,o[0],u);s.pasteCells(t,a).each(function(e){f.selection.setRng(e),f.focus(),d.clear(t)})}})})})};function Pr(r,o){var e=function(e){var t=o(e);if(t<=0||null===t){var n=Ne(e,r);return parseFloat(n)||0}return t},i=function(o,e){return I(e,function(e,t){var n=Ne(o,t),r=n===undefined?0:parseInt(n,10);return isNaN(r)?e:e+r},0)};return{set:function(e,t){if(!w(t)&&!t.match(/^[0-9]+$/))throw new Error(r+".set accepts only positive integer values. Value was "+t);var n=e.dom();be(n)&&(n.style[r]=t+"px")},get:e,getOuter:e,aggregate:i,max:function(e,t,n){var r=i(e,n);return r<t?t-r:0}}}var Ir=Pr("height",function(e){var t=e.dom();return Ce(e)?t.getBoundingClientRect().height:t.offsetHeight}),Br=function(e){return Ir.get(e)},Wr=function(e){return Ir.getOuter(e)},Mr=Pr("width",function(e){return e.dom().offsetWidth}),_r=function(e){return Mr.get(e)},Lr=function(e){return Mr.getOuter(e)},Fr=it.detect(),jr=function(e,t,n){return r=Ne(e,t),o=n,i=parseFloat(r),isNaN(i)?o:i;var r,o,i},zr=function(e){return Fr.browser.isIE()||Fr.browser.isEdge()?(n=jr(t=e,"padding-top",0),r=jr(t,"padding-bottom",0),o=jr(t,"border-top-width",0),i=jr(t,"border-bottom-width",0),u=t.dom().getBoundingClientRect().height,"border-box"===Ne(t,"box-sizing")?u:u-n-r-(o+i)):jr(e,"height",Br(e));var t,n,r,o,i,u},Hr=/(\d+(\.\d+)?)(\w|%)*/,Ur=/(\d+(\.\d+)?)%/,qr=/(\d+(\.\d+)?)px|em/,Vr=function(e,t){De(e,"height",t+"px")},Gr=function(e,t,n,r){var o,i,u,a,c,l,f,s,d,m=parseInt(e,10);return s=l="%",d=(f=e).length-l.length,""!==s&&(f.length<s.length||f.substr(d,d+s.length)!==s)||"table"===oe(t)?m:(o=t,i=m,u=n,a=r,c=cn.table(o).map(function(e){var t=u(e);return Math.floor(i/100*t)}).getOr(i),a(o,c),c)},Yr=function(e){var t,n=ke(t=e,"height").getOrThunk(function(){return zr(t)+"px"});return n?Gr(n,e,Br,Vr):Br(e)},Xr=function(e,t){return ge(e,t)?parseInt(me(e,t),10):1},Kr=function(e){return ke(e,"width").fold(function(){return R.from(me(e,"width"))},function(e){return R.some(e)})},Jr=function(e,t){return e/t.pixelWidth()*100},$r={percentageBasedSizeRegex:C(Ur),pixelBasedSizeRegex:C(qr),setPixelWidth:function(e,t){De(e,"width",t+"px")},setPercentageWidth:function(e,t){De(e,"width",t+"%")},setHeight:Vr,getPixelWidth:function(t,n){return Kr(t).fold(function(){return _r(t)},function(e){return function(e,t,n){var r=qr.exec(t);if(null!==r)return parseInt(r[1],10);var o=Ur.exec(t);if(null!==o){var i=parseFloat(o[1]);return i/100*n.pixelWidth()}return _r(e)}(t,e,n)})},getPercentageWidth:function(t,n){return Kr(t).fold(function(){var e=_r(t);return Jr(e,n)},function(e){return function(e,t,n){var r=Ur.exec(t);if(null!==r)return parseFloat(r[1]);var o=_r(e);return Jr(o,n)}(t,e,n)})},getGenericWidth:function(e){return Kr(e).bind(function(e){var t=Hr.exec(e);return null!==t?R.some({width:C(parseFloat(t[1])),unit:C(t[3])}):R.none()})},setGenericWidth:function(e,t,n){De(e,"width",t+n)},getHeight:function(e){return n="rowspan",Yr(t=e)/Xr(t,n);var t,n},getRawWidth:Kr},Qr=function(n,r){$r.getGenericWidth(n).each(function(e){var t=e.width()/2;$r.setGenericWidth(n,t,e.unit()),$r.setGenericWidth(r,t,e.unit())})},Zr=function(n,r){return{left:C(n),top:C(r),translate:function(e,t){return Zr(n+e,r+t)}}},eo=Zr,to=function(e,t){return e!==undefined?e:t!==undefined?t:0},no=function(e){var t=e.dom().ownerDocument,n=t.body,r=t.defaultView,o=t.documentElement,i=to(r.pageYOffset,o.scrollTop),u=to(r.pageXOffset,o.scrollLeft),a=to(o.clientTop,n.clientTop),c=to(o.clientLeft,n.clientLeft);return ro(e).translate(u-c,i-a)},ro=function(e){var t,n=e.dom(),r=n.ownerDocument.body;return r===n?eo(r.offsetLeft,r.offsetTop):Ce(e)?(t=n.getBoundingClientRect(),eo(t.left,t.top)):eo(0,0)},oo=q("row","y"),io=q("col","x"),uo=function(e){return no(e).left()+Lr(e)},ao=function(e){return no(e).left()},co=function(e,t){return io(e,ao(t))},lo=function(e,t){return io(e,uo(t))},fo=function(e){return no(e).top()},so=function(e,t){return oo(e,fo(t))},mo=function(e,t){return oo(e,fo(t)+Wr(t))},go=function(n,t,r){if(0===r.length)return[];var e=E(r.slice(1),function(e,t){return e.map(function(e){return n(t,e)})}),o=r[r.length-1].map(function(e){return t(r.length-1,e)});return e.concat([o])},ho={height:{delta:o,positions:function(e){return go(so,mo,e)},edge:fo},rtl:{delta:function(e){return-e},edge:uo,positions:function(e){return go(lo,co,e)}},ltr:{delta:o,edge:ao,positions:function(e){return go(co,lo,e)}}},po={ltr:ho.ltr,rtl:ho.rtl};function vo(t){var n=function(e){return t(e).isRtl()?po.rtl:po.ltr};return{delta:function(e,t){return n(t).delta(e,t)},edge:function(e){return n(e).edge(e)},positions:function(e,t){return n(t).positions(e,t)}}}var bo=function(e){var t=ln(e);return mn.generate(t).grid()},wo=function(){return(wo=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var o in t=arguments[n])Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);return e}).apply(this,arguments)},yo=function(e){for(var t=[],n=function(e){t.push(e)},r=0;r<e.length;r++)e[r].each(n);return t},xo=function(e,t){for(var n=0;n<e.length;n++){var r=t(e[n],n);if(r.isSome())return r}return R.none()},Co=function(e,t,n,r){n===r?he(e,t):se(e,t,n)},Ro=function(o,e){var i=[],u=[],t=function(e,t){0<e.length?function(e,t){var n=$t(o,t).getOrThunk(function(){var e=xe.fromTag(t,mt(o).dom());return Rt(o,e),e});Ot(n);var r=E(e,function(e){e.isNew()&&i.push(e.element());var t=e.element();return Ot(t),k(e.cells(),function(e){e.isNew()&&u.push(e.element()),Co(e.element(),"colspan",e.colspan(),1),Co(e.element(),"rowspan",e.rowspan(),1),Rt(t,e.element())}),t});Dt(n,r)}(e,t):$t(o,t).each(Nt)},n=[],r=[],a=[];return k(e,function(e){switch(e.section()){case"thead":n.push(e);break;case"tbody":r.push(e);break;case"tfoot":a.push(e)}}),t(n,"thead"),t(r,"tbody"),t(a,"tfoot"),{newRows:C(i),newCells:C(u)}},So=function(e){return E(e,function(e){var n=On(e.element());return k(e.cells(),function(e){var t=Nn(e.element());Co(t,"colspan",e.colspan(),1),Co(t,"rowspan",e.rowspan(),1),Rt(n,t)}),n})},To=function(e,t){var n=me(e,t);return n===undefined||""===n?[]:n.split(" ")},Do=function(e){return e.dom().classList!==undefined},Oo=function(e,t){return o=t,i=To(n=e,r="class").concat([o]),se(n,r,i.join(" ")),!0;var n,r,o,i},No=function(e,t){return o=t,0<(i=A(To(n=e,r="class"),function(e){return e!==o})).length?se(n,r,i.join(" ")):he(n,r),!1;var n,r,o,i},Eo=function(e,t){Do(e)?e.dom().classList.add(t):Oo(e,t)},ko=function(e){0===(Do(e)?e.dom().classList:To(e,"class")).length&&he(e,"class")},Ao=function(e,t){return Do(e)&&e.dom().classList.contains(t)},Po=function(e,t){for(var n=[],r=e;r<t;r++)n.push(r);return n},Io=function(t,n){if(n<0||n>=t.length-1)return R.none();var e=t[n].fold(function(){var e=F(t.slice(0,n));return xo(e,function(e,t){return e.map(function(e){return{value:e,delta:t+1}})})},function(e){return R.some({value:e,delta:0})}),r=t[n+1].fold(function(){var e=t.slice(n+1);return xo(e,function(e,t){return e.map(function(e){return{value:e,delta:t+1}})})},function(e){return R.some({value:e,delta:1})});return e.bind(function(n){return r.map(function(e){var t=e.delta+n.delta;return Math.abs(e.value-n.value)/t})})},Bo=function(e,t,n){var r=e();return B(r,t).orThunk(function(){return R.from(r[0]).orThunk(n)}).map(function(e){return e.element()})},Wo=function(n){var e=n.grid(),t=Po(0,e.columns()),r=Po(0,e.rows());return E(t,function(t){return Bo(function(){return _(r,function(e){return mn.getAt(n,e,t).filter(function(e){return e.column()===t}).fold(C([]),function(e){return[e]})})},function(e){return 1===e.colspan()},function(){return mn.getAt(n,0,t)})})},Mo=function(n){var e=n.grid(),t=Po(0,e.rows()),r=Po(0,e.columns());return E(t,function(t){return Bo(function(){return _(r,function(e){return mn.getAt(n,t,e).filter(function(e){return e.row()===t}).fold(C([]),function(e){return[e]})})},function(e){return 1===e.rowspan()},function(){return mn.getAt(n,t,0)})})},_o=function(e){var t=e.replace(/\./g,"-");return{resolve:function(e){return t+"-"+e}}},Lo={resolve:_o("ephox-snooker").resolve},Fo=function(e,t,n,r,o){var i=xe.fromTag("div");return Oe(i,{position:"absolute",left:t-r/2+"px",top:n+"px",height:o+"px",width:r+"px"}),de(i,{"data-column":e,role:"presentation"}),i},jo=function(e,t,n,r,o){var i=xe.fromTag("div");return Oe(i,{position:"absolute",left:t+"px",top:n-o/2+"px",height:o+"px",width:r+"px"}),de(i,{"data-row":e,role:"presentation"}),i},zo=Lo.resolve("resizer-bar"),Ho=Lo.resolve("resizer-rows"),Uo=Lo.resolve("resizer-cols"),qo=function(e){var t=qt(e.parent(),"."+zo);k(t,Nt)},Vo=function(n,e,r){var o=n.origin();k(e,function(e,t){e.each(function(e){var t=r(o,e);Eo(t,zo),Rt(n.parent(),t)})})},Go=function(e,t,n,r,o,i){var u,a,c,l,f=no(t),s=0<n.length?o.positions(n,t):[];u=e,a=s,c=f,l=Lr(t),Vo(u,a,function(e,t){var n=jo(t.row(),c.left()-e.left(),t.y()-e.top(),l,7);return Eo(n,Ho),n});var d,m,g,h,p=0<r.length?i.positions(r,t):[];d=e,m=p,g=f,h=Wr(t),Vo(d,m,function(e,t){var n=Fo(t.col(),t.x()-e.left(),g.top()-e.top(),7,h);return Eo(n,Uo),n})},Yo=function(e,t){var n=qt(e.parent(),"."+zo);k(n,t)},Xo=function(e,t,n,r){qo(e);var o=ln(t),i=mn.generate(o),u=Mo(i),a=Wo(i);Go(e,t,u,a,n,r)},Ko=function(e){Yo(e,function(e){De(e,"display","none")})},Jo=function(e){Yo(e,function(e){De(e,"display","block")})},$o=qo,Qo=function(e){return Ao(e,Ho)},Zo=function(e){return Ao(e,Uo)},ei=function(e,t){return Lt(t,e.section())},ti=function(e,t){return e.cells()[t]},ni={addCell:function(e,t,n){var r=e.cells(),o=r.slice(0,t),i=r.slice(t),u=o.concat([n]).concat(i);return ei(e,u)},setCells:ei,mutateCell:function(e,t,n){e.cells()[t]=n},getCell:ti,getCellElement:function(e,t){return ti(e,t).element()},mapCells:function(e,t){var n=e.cells(),r=E(n,t);return Lt(r,e.section())},cellLength:function(e){return e.cells().length}},ri=function(e,t){if(0===e.length)return 0;var n=e[0];return W(e,function(e){return!t(n.element(),e.element())}).fold(function(){return e.length},function(e){return e})},oi=function(e,t,n,r){var o,i,u,a,c=(o=e,i=t,o[i]).cells().slice(n),l=ri(c,r),f=(u=e,a=n,E(u,function(e){return ni.getCell(e,a)})).slice(t),s=ri(f,r);return{colspan:C(l),rowspan:C(s)}},ii=function(o,i){var u=E(o,function(e,t){return E(e.cells(),function(e,t){return!1})});return E(o,function(e,r){var t=_(e.cells(),function(e,t){if(!1===u[r][t]){var n=oi(o,r,t,i);return function(e,t,n,r){for(var o=e;o<e+n;o++)for(var i=t;i<t+r;i++)u[o][i]=!0}(r,t,n.rowspan(),n.colspan()),[It(e.element(),n.rowspan(),n.colspan(),e.isNew())]}return[]});return Ft(t,e.section())})},ui=function(e,t,n){for(var r=[],o=0;o<e.grid().rows();o++){for(var i=[],u=0;u<e.grid().columns();u++){var a=mn.getAt(e,o,u).map(function(e){return Mt(e.element(),n)}).getOrThunk(function(){return Mt(t.gap(),!0)});i.push(a)}var c=Lt(i,e.all()[o].section());r.push(c)}return r},ai=function(e,r){return E(e,function(e){var t,n=(t=e.details(),xo(t,function(e){return gt(e.element()).map(function(e){var t=gt(e).isNone();return Mt(e,t)})}).getOrThunk(function(){return Mt(r.row(),!0)}));return _t(n.element(),e.details(),e.section(),n.isNew())})},ci=function(e,t){var n=ii(e,ft);return ai(n,t)},li=function(e,t){var n=M(E(e.all(),function(e){return e.cells()}));return B(n,function(e){return ft(t,e.element())})},fi=function(a,c,l,f,s){return function(n,r,e,o,i){var t=ln(r),u=mn.generate(t);return c(u,e).map(function(e){var t=ui(u,o,!1),n=a(t,e,ft,s(o)),r=ci(n.grid(),o);return{grid:C(r),cursor:n.cursor}}).fold(function(){return R.none()},function(e){var t=Ro(r,e.grid());return l(r,e.grid(),i),f(r),Xo(n,r,ho.height,i),R.some({cursor:e.cursor,newRows:t.newRows,newCells:t.newCells})})}},si=function(t,e){return cn.cell(e.element()).bind(function(e){return li(t,e)})},di=function(t,e){var n=E(e.selection(),function(e){return cn.cell(e).bind(function(e){return li(t,e)})}),r=yo(n);return 0<r.length?R.some({cells:r,generators:e.generators,clipboard:e.clipboard}):R.none()},mi=function(t,e){var n=E(e.selection(),function(e){return cn.cell(e).bind(function(e){return li(t,e)})}),r=yo(n);return 0<r.length?R.some(r):R.none()},gi=function(n){return{is:function(e){return n===e},isValue:u,isError:f,getOr:C(n),getOrThunk:C(n),getOrDie:C(n),or:function(e){return gi(n)},orThunk:function(e){return gi(n)},fold:function(e,t){return t(n)},map:function(e){return gi(e(n))},mapError:function(e){return gi(n)},each:function(e){e(n)},bind:function(e){return e(n)},exists:function(e){return e(n)},forall:function(e){return e(n)},toOption:function(){return R.some(n)}}},hi=function(n){return{is:f,isValue:f,isError:u,getOr:o,getOrThunk:function(e){return e()},getOrDie:function(){return e=String(n),function(){throw new Error(e)}();var e},or:function(e){return e},orThunk:function(e){return e()},fold:function(e,t){return e(n)},map:function(e){return hi(n)},mapError:function(e){return hi(e(n))},each:y,bind:function(e){return hi(n)},exists:f,forall:u,toOption:R.none}},pi={value:gi,error:hi,fromOption:function(e,t){return e.fold(function(){return hi(t)},gi)}},vi=function(e,t){return E(e,function(){return Mt(t.cell(),!0)})},bi=function(t,e,n){return t.concat(function(e,t){for(var n=[],r=0;r<e;r++)n.push(t(r));return n}(e,function(e){return ni.setCells(t[t.length-1],vi(t[t.length-1].cells(),n))}))},wi=function(e,t,n){return E(e,function(e){return ni.setCells(e,e.cells().concat(vi(Po(0,t),n)))})},yi=function(e,t,n){if(e.row()>=t.length||e.column()>ni.cellLength(t[0]))return pi.error("invalid start address out of table bounds, row: "+e.row()+", column: "+e.column());var r=t.slice(e.row()),o=r[0].cells().slice(e.column()),i=ni.cellLength(n[0]),u=n.length;return pi.value({rowDelta:C(r.length-u),colDelta:C(o.length-i)})},xi=function(e,t){var n=ni.cellLength(e[0]),r=ni.cellLength(t[0]);return{rowDelta:C(0),colDelta:C(n-r)}},Ci=function(e,t,n){var r=t.colDelta()<0?wi:o;return(t.rowDelta()<0?bi:o)(r(e,Math.abs(t.colDelta()),n),Math.abs(t.rowDelta()),n)},Ri=function(e,t,n,r){if(0===e.length)return e;for(var o=t.startRow();o<=t.finishRow();o++)for(var i=t.startCol();i<=t.finishCol();i++)ni.mutateCell(e[o],i,Mt(r(),!1));return e},Si=function(e,t,n,r){for(var o=!0,i=0;i<e.length;i++)for(var u=0;u<ni.cellLength(e[0]);u++){var a=n(ni.getCellElement(e[i],u),t);!0===a&&!1===o?ni.mutateCell(e[i],u,Mt(r(),!0)):!0===a&&(o=!1)}return e},Ti=function(i,n,u,a){if(0<n&&n<i.length){var e=i[n-1].cells(),t=(r=u,I(e,function(e,t){return N(e,function(e){return r(e.element(),t.element())})?e:e.concat([t])},[]));k(t,function(r){for(var o=R.none(),e=function(n){for(var e=function(t){var e=i[n].cells()[t];u(e.element(),r.element())&&(o.isNone()&&(o=R.some(a())),o.each(function(e){ni.mutateCell(i[n],t,Mt(e,!0))}))},t=0;t<ni.cellLength(i[0]);t++)e(t)},t=n;t<i.length;t++)e(t)})}var r;return i},Di=function(n,r,o,i,u){return yi(n,r,o).map(function(e){var t=Ci(r,e,i);return function(e,t,n,r,o){for(var i,u,a,c,l,f=e.row(),s=e.column(),d=f+n.length,m=s+ni.cellLength(n[0]),g=f;g<d;g++)for(var h=s;h<m;h++){i=t,u=g,a=h,l=c=void 0,c=b(o,ni.getCell(i[u],a).element()),l=i[u],1<i.length&&1<ni.cellLength(l)&&(0<a&&c(ni.getCellElement(l,a-1))||a<l.cells().length-1&&c(ni.getCellElement(l,a+1))||0<u&&c(ni.getCellElement(i[u-1],a))||u<i.length-1&&c(ni.getCellElement(i[u+1],a)))&&Si(t,ni.getCellElement(t[g],h),o,r.cell);var p=ni.getCellElement(n[g-f],h-s),v=r.replace(p);ni.mutateCell(t[g],h,Mt(v,!0))}return t}(n,t,o,i,u)})},Oi=function(e,t,n,r,o){Ti(t,e,o,r.cell);var i=xi(n,t),u=Ci(n,i,r),a=xi(t,u),c=Ci(t,a,r);return c.slice(0,e).concat(u).concat(c.slice(e,c.length))},Ni=function(n,r,e,o,i){var t=n.slice(0,r),u=n.slice(r),a=ni.mapCells(n[e],function(e,t){return 0<r&&r<n.length&&o(ni.getCellElement(n[r-1],t),ni.getCellElement(n[r],t))?ni.getCell(n[r],t):Mt(i(e.element(),o),!0)});return t.concat([a]).concat(u)},Ei=function(e,n,r,o,i){return E(e,function(e){var t=0<n&&n<ni.cellLength(e)&&o(ni.getCellElement(e,n-1),ni.getCellElement(e,n))?ni.getCell(e,n):Mt(i(ni.getCellElement(e,r),o),!0);return ni.addCell(e,n,t)})},ki=function(e,r,o,i,u){var a=o+1;return E(e,function(e,t){var n=t===r?Mt(u(ni.getCellElement(e,o),i),!0):ni.getCell(e,o);return ni.addCell(e,a,n)})},Ai=function(e,t,n,r,o){var i=t+1,u=e.slice(0,i),a=e.slice(i),c=ni.mapCells(e[t],function(e,t){return t===n?Mt(o(e.element(),r),!0):e});return u.concat([c]).concat(a)},Pi=function(e,t,n){return e.slice(0,t).concat(e.slice(n+1))},Ii=function(e,n,r){var t=E(e,function(e){var t=e.cells().slice(0,n).concat(e.cells().slice(r+1));return Lt(t,e.section())});return A(t,function(e){return 0<e.cells().length})},Bi=function(e,n,r,o){return E(e,function(e){return ni.mapCells(e,function(e){return t=e,N(n,function(e){return r(t.element(),e.element())})?Mt(o(e.element(),r),!0):e;var t})})},Wi=function(e,t,n,r){return ni.getCellElement(e[t],n)!==undefined&&0<t&&r(ni.getCellElement(e[t-1],n),ni.getCellElement(e[t],n))},Mi=function(e,t,n){return 0<t&&n(ni.getCellElement(e,t-1),ni.getCellElement(e,t))},_i=function(n,r,o,e){var t=_(n,function(e,t){return Wi(n,t,r,o)||Mi(e,r,o)?[]:[ni.getCell(e,r)]});return Bi(n,t,o,e)},Li=function(n,r,o,e){var i=n[r],t=_(i.cells(),function(e,t){return Wi(n,r,t,o)||Mi(i,t,o)?[]:[e]});return Bi(n,t,o,e)},Fi=xr([{none:[]},{only:["index"]},{left:["index","next"]},{middle:["prev","index","next"]},{right:["prev","index"]}]),ji=wo({},Fi),zi=function(e,t,i,u){var n,r,a=e.slice(0),o=(r=t,0===(n=e).length?ji.none():1===n.length?ji.only(0):0===r?ji.left(0,1):r===n.length-1?ji.right(r-1,r):0<r&&r<n.length-1?ji.middle(r-1,r,r+1):ji.none()),c=function(e){return E(e,C(0))},l=C(c(a)),f=function(e,t){if(0<=i){var n=Math.max(u.minCellWidth(),a[t]-i);return c(a.slice(0,e)).concat([i,n-a[t]]).concat(c(a.slice(t+1)))}var r=Math.max(u.minCellWidth(),a[e]+i),o=a[e]-r;return c(a.slice(0,e)).concat([r-a[e],o]).concat(c(a.slice(t+1)))},s=f;return o.fold(l,function(e){return u.singleColumnWidth(a[e],i)},s,function(e,t,n){return f(t,n)},function(e,t){if(0<=i)return c(a.slice(0,t)).concat([i]);var n=Math.max(u.minCellWidth(),a[t]+i);return c(a.slice(0,t)).concat([n-a[t]])})},Hi=function(e,t){return ge(e,t)&&1<parseInt(me(e,t),10)},Ui={hasColspan:function(e){return Hi(e,"colspan")},hasRowspan:function(e){return Hi(e,"rowspan")},minWidth:C(10),minHeight:C(10),getInt:function(e,t){return parseInt(Ne(e,t),10)}},qi=function(e,t,n){return ke(e,t).fold(function(){return n(e)+"px"},function(e){return e})},Vi=function(e,t){return qi(e,"width",function(e){return $r.getPixelWidth(e,t)})},Gi=function(e){return qi(e,"height",$r.getHeight)},Yi=function(e,t,n,r,o){var i=Wo(e),u=E(i,function(e){return e.map(t.edge)});return E(i,function(e,t){return e.filter(g(Ui.hasColspan)).fold(function(){var e=Io(u,t);return r(e)},function(e){return n(e,o)})})},Xi=function(e){return e.map(function(e){return e+"px"}).getOr("")},Ki=function(e,t,n,r){var o=Mo(e),i=E(o,function(e){return e.map(t.edge)});return E(o,function(e,t){return e.filter(g(Ui.hasRowspan)).fold(function(){var e=Io(i,t);return r(e)},function(e){return n(e)})})},Ji={getRawWidths:function(e,t,n){return Yi(e,t,Vi,Xi,n)},getPixelWidths:function(e,t,n){return Yi(e,t,$r.getPixelWidth,function(e){return e.getOrThunk(n.minCellWidth)},n)},getPercentageWidths:function(e,t,n){return Yi(e,t,$r.getPercentageWidth,function(e){return e.fold(function(){return n.minCellWidth()},function(e){return e/n.pixelWidth()*100})},n)},getPixelHeights:function(e,t){return Ki(e,t,$r.getHeight,function(e){return e.getOrThunk(Ui.minHeight)})},getRawHeights:function(e,t){return Ki(e,t,Gi,Xi)}},$i=function(e,t,n){for(var r=0,o=e;o<t;o++)r+=n[o]!==undefined?n[o]:0;return r},Qi=function(e,n){var t=mn.justCells(e);return E(t,function(e){var t=$i(e.column(),e.column()+e.colspan(),n);return{element:e.element,width:C(t),colspan:e.colspan}})},Zi=function(e,n){var t=mn.justCells(e);return E(t,function(e){var t=$i(e.row(),e.row()+e.rowspan(),n);return{element:e.element,height:C(t),rowspan:e.rowspan}})},eu=function(e,n){return E(e.all(),function(e,t){return{element:e.element,height:C(n[t])}})},tu=function(e){var t=o;return{width:C(e),pixelWidth:C(e),getWidths:Ji.getPixelWidths,getCellDelta:t,singleColumnWidth:function(e,t){return[Math.max(Ui.minWidth(),e+t)-e]},minCellWidth:Ui.minWidth,setElementWidth:$r.setPixelWidth,setTableWidth:function(e,t,n){var r=P(t,function(e,t){return e+t},0);$r.setPixelWidth(e,r)}}},nu=function(e,t){var n,r,o,i,u=$r.percentageBasedSizeRegex().exec(t);if(null!==u)return n=u[1],r=e,o=parseFloat(n),i=_r(r),{width:C(o),pixelWidth:C(i),getWidths:Ji.getPercentageWidths,getCellDelta:function(e){return e/i*100},singleColumnWidth:function(e,t){return[100-e]},minCellWidth:function(){return Ui.minWidth()/i*100},setElementWidth:$r.setPercentageWidth,setTableWidth:function(e,t,n){var r=n/100*o;$r.setPercentageWidth(e,o+r)}};var a=$r.pixelBasedSizeRegex().exec(t);if(null!==a){var c=parseInt(a[1],10);return tu(c)}var l=_r(e);return tu(l)},ru=function(t){return $r.getRawWidth(t).fold(function(){var e=_r(t);return tu(e)},function(e){return nu(t,e)})},ou=function(e){return mn.generate(e)},iu=function(e){var t=ln(e);return ou(t)},uu=function(e,t,n,r){var o=ru(e),i=o.getCellDelta(t),u=iu(e),a=o.getWidths(u,r,o),c=zi(a,n,i,o),l=E(c,function(e,t){return e+a[t]}),f=Qi(u,l);k(f,function(e){o.setElementWidth(e.element(),e.width())}),n===u.grid().columns()-1&&o.setTableWidth(e,l,i)},au=function(e,n,r,t){var o=iu(e),i=Ji.getPixelHeights(o,t),u=E(i,function(e,t){return r===t?Math.max(n+e,Ui.minHeight()):e}),a=Zi(o,u),c=eu(o,u);k(c,function(e){$r.setHeight(e.element(),e.height())}),k(a,function(e){$r.setHeight(e.element(),e.height())});var l=P(u,function(e,t){return e+t},0);$r.setHeight(e,l)},cu=function(e,t,n){var r=ru(e),o=ou(t),i=r.getWidths(o,n,r),u=Qi(o,i);k(u,function(e){r.setElementWidth(e.element(),e.width())}),0<u.length&&r.setTableWidth(e,i,r.getCellDelta(0))},lu=function(e){var t=e,n=function(){return t};return{get:n,set:function(e){t=e},clone:function(){return lu(n())}}},fu=function(r,o,i){if(0===o.length)throw new Error("You must specify at least one required field.");return X("required",o),K(o),function(t){var n=j(t);L(o,function(e){return O(n,e)})||G(o,n),r(o,n);var e=A(o,function(e){return!i.validate(t[e],e)});return 0<e.length&&function(e,t){throw new Error("All values need to be of type: "+t+". Keys ("+V(e).join(", ")+") were not.")}(e,i.label),t}},su=function(t,e){var n=A(e,function(e){return!O(t,e)});0<n.length&&Y(n)},du=function(e){return fu(su,e,{validate:v,label:"function"})},mu=du(["cell","row","replace","gap"]),gu=function(e){var t=ge(e,"colspan")?parseInt(me(e,"colspan"),10):1,n=ge(e,"rowspan")?parseInt(me(e,"rowspan"),10):1;return{element:C(e),colspan:C(t),rowspan:C(n)}},hu=function(r,o){void 0===o&&(o=gu),mu(r);var n=lu(R.none()),i=function(e){var t,n=o(e);return t=n,r.cell(t)},u=function(e){var t=i(e);return n.get().isNone()&&n.set(R.some(t)),a=R.some({item:e,replacement:t}),t},a=R.none();return{getOrInit:function(t,n){return a.fold(function(){return u(t)},function(e){return n(t,e.item)?e.replacement:u(t)})},cursor:n.get}},pu=function(a,c){return function(r){var o=lu(R.none());mu(r);var i=[],u=function(e){var t={scope:a},n=r.replace(e,c,t);return i.push({item:e,sub:n}),o.get().isNone()&&o.set(R.some(n)),n};return{replaceOrInit:function(t,n){return(r=t,o=n,B(i,function(e){return o(e.item,r)})).fold(function(){return u(t)},function(e){return n(t,e.item)?e.sub:u(t)});var r,o},cursor:o.get}}},vu=function(n){mu(n);var e=lu(R.none());return{combine:function(t){return e.get().isNone()&&e.set(R.some(t)),function(){var e=n.cell({element:C(t),colspan:C(1),rowspan:C(1)});return Ae(e,"width"),Ae(t,"width"),e}},cursor:e.get}},bu=["body","p","div","article","aside","figcaption","figure","footer","header","nav","section","ol","ul","table","thead","tfoot","tbody","caption","tr","td","th","h1","h2","h3","h4","h5","h6","blockquote","pre","address"],wu=function(e,t){var n=e.property().name(t);return O(bu,n)},yu=function(e,t){return O(["br","img","hr","input"],e.property().name(t))},xu=wu,Cu=function(e,t){var n=e.property().name(t);return O(["ol","ul"],n)},Ru=yu,Su=$n(),Tu=function(e){return xu(Su,e)},Du=function(e){return Cu(Su,e)},Ou=function(e){return Ru(Su,e)},Nu=function(e){var t,i=function(e){return"br"===oe(e)},n=function(o){return Sn(o).bind(function(n){var r=vt(n).map(function(e){return!!Tu(e)||!!Ou(e)&&"img"!==oe(e)}).getOr(!1);return gt(n).map(function(e){return!0===r||"li"===oe(t=e)||Kt(t,Du).isSome()||i(n)||Tu(e)&&!ft(o,e)?[]:[xe.fromTag("br")];var t})}).getOr([])},r=0===(t=_(e,function(e){var t=bt(e);return L(t,function(e){return i(e)||le(e)&&0===vn(e).trim().length})?[]:t.concat(n(e))})).length?[xe.fromTag("br")]:t;Ot(e[0]),Dt(e[0],r)},Eu=function(e){0===cn.cells(e).length&&Nt(e)},ku=q("grid","cursor"),Au=function(e,t,n){return Pu(e,t,n).orThunk(function(){return Pu(e,0,0)})},Pu=function(e,t,n){return R.from(e[t]).bind(function(e){return R.from(e.cells()[n]).bind(function(e){return R.from(e.element())})})},Iu=function(e,t,n){return ku(e,Pu(e,t,n))},Bu=function(e){return I(e,function(e,t){return N(e,function(e){return e.row()===t.row()})?e:e.concat([t])},[]).sort(function(e,t){return e.row()-t.row()})},Wu=function(e){return I(e,function(e,t){return N(e,function(e){return e.column()===t.column()})?e:e.concat([t])},[]).sort(function(e,t){return e.column()-t.column()})},Mu=function(e,t,n){var r=fn(e,n),o=mn.generate(r);return ui(o,t,!0)},_u=cu,Lu={insertRowBefore:fi(function(e,t,n,r){var o=t.row(),i=t.row(),u=Ni(e,i,o,n,r.getOrInit);return Iu(u,i,t.column())},si,y,y,hu),insertRowsBefore:fi(function(e,t,n,r){var o=t[0].row(),i=t[0].row(),u=Bu(t),a=I(u,function(e,t){return Ni(e,i,o,n,r.getOrInit)},e);return Iu(a,i,t[0].column())},mi,y,y,hu),insertRowAfter:fi(function(e,t,n,r){var o=t.row(),i=t.row()+t.rowspan(),u=Ni(e,i,o,n,r.getOrInit);return Iu(u,i,t.column())},si,y,y,hu),insertRowsAfter:fi(function(e,t,n,r){var o=Bu(t),i=o[o.length-1].row(),u=o[o.length-1].row()+o[o.length-1].rowspan(),a=I(o,function(e,t){return Ni(e,u,i,n,r.getOrInit)},e);return Iu(a,u,t[0].column())},mi,y,y,hu),insertColumnBefore:fi(function(e,t,n,r){var o=t.column(),i=t.column(),u=Ei(e,i,o,n,r.getOrInit);return Iu(u,t.row(),i)},si,_u,y,hu),insertColumnsBefore:fi(function(e,t,n,r){var o=Wu(t),i=o[0].column(),u=o[0].column(),a=I(o,function(e,t){return Ei(e,u,i,n,r.getOrInit)},e);return Iu(a,t[0].row(),u)},mi,_u,y,hu),insertColumnAfter:fi(function(e,t,n,r){var o=t.column(),i=t.column()+t.colspan(),u=Ei(e,i,o,n,r.getOrInit);return Iu(u,t.row(),i)},si,_u,y,hu),insertColumnsAfter:fi(function(e,t,n,r){var o=t[t.length-1].column(),i=t[t.length-1].column()+t[t.length-1].colspan(),u=Wu(t),a=I(u,function(e,t){return Ei(e,i,o,n,r.getOrInit)},e);return Iu(a,t[0].row(),i)},mi,_u,y,hu),splitCellIntoColumns:fi(function(e,t,n,r){var o=ki(e,t.row(),t.column(),n,r.getOrInit);return Iu(o,t.row(),t.column())},si,_u,y,hu),splitCellIntoRows:fi(function(e,t,n,r){var o=Ai(e,t.row(),t.column(),n,r.getOrInit);return Iu(o,t.row(),t.column())},si,y,y,hu),eraseColumns:fi(function(e,t,n,r){var o=Wu(t),i=Ii(e,o[0].column(),o[o.length-1].column()),u=Au(i,t[0].row(),t[0].column());return ku(i,u)},mi,_u,Eu,hu),eraseRows:fi(function(e,t,n,r){var o=Bu(t),i=Pi(e,o[0].row(),o[o.length-1].row()),u=Au(i,t[0].row(),t[0].column());return ku(i,u)},mi,y,Eu,hu),makeColumnHeader:fi(function(e,t,n,r){var o=_i(e,t.column(),n,r.replaceOrInit);return Iu(o,t.row(),t.column())},si,y,y,pu("row","th")),unmakeColumnHeader:fi(function(e,t,n,r){var o=_i(e,t.column(),n,r.replaceOrInit);return Iu(o,t.row(),t.column())},si,y,y,pu(null,"td")),makeRowHeader:fi(function(e,t,n,r){var o=Li(e,t.row(),n,r.replaceOrInit);return Iu(o,t.row(),t.column())},si,y,y,pu("col","th")),unmakeRowHeader:fi(function(e,t,n,r){var o=Li(e,t.row(),n,r.replaceOrInit);return Iu(o,t.row(),t.column())},si,y,y,pu(null,"td")),mergeCells:fi(function(e,t,n,r){var o=t.cells();Nu(o);var i=Ri(e,t.bounds(),n,C(o[0]));return ku(i,R.from(o[0]))},function(e,t){return t.mergable()},y,y,vu),unmergeCells:fi(function(e,t,n,r){var o=P(t,function(e,t){return Si(e,t,n,r.combine(t))},e);return ku(o,R.from(t[0]))},function(e,t){return t.unmergable()},_u,y,vu),pasteCells:fi(function(e,n,t,r){var o,i,u,a,c=(o=n.clipboard(),i=n.generators(),u=ln(o),a=mn.generate(u),ui(a,i,!0)),l=At(n.row(),n.column());return Di(l,e,c,n.generators(),t).fold(function(){return ku(e,R.some(n.element()))},function(e){var t=Au(e,n.row(),n.column());return ku(e,t)})},function(t,n){return cn.cell(n.element()).bind(function(e){return li(t,e).map(function(e){return wo(wo({},e),{generators:n.generators,clipboard:n.clipboard})})})},_u,y,hu),pasteRowsBefore:fi(function(e,t,n,r){var o=e[t.cells[0].row()],i=t.cells[0].row(),u=Mu(t.clipboard(),t.generators(),o),a=Oi(i,e,u,t.generators(),n),c=Au(a,t.cells[0].row(),t.cells[0].column());return ku(a,c)},di,y,y,hu),pasteRowsAfter:fi(function(e,t,n,r){var o=e[t.cells[0].row()],i=t.cells[t.cells.length-1].row()+t.cells[t.cells.length-1].rowspan(),u=Mu(t.clipboard(),t.generators(),o),a=Oi(i,e,u,t.generators(),n),c=Au(a,t.cells[0].row(),t.cells[0].column());return ku(a,c)},di,y,y,hu)},Fu=function(e){return xe.fromDom(e.getBody())},ju=function(e){return e.getBoundingClientRect().width},zu=function(e){return e.getBoundingClientRect().height},Hu=function(t){return function(e){return ft(e,Fu(t))}},Uu=function(e){return/^[0-9]+$/.test(e)&&(e+="px"),e},qu=function(e){var t=qt(e,"td[data-mce-style],th[data-mce-style]");he(e,"data-mce-style"),k(t,function(e){he(e,"data-mce-style")})},Vu={isRtl:C(!1)},Gu={isRtl:C(!0)},Yu={directionAt:function(e){return"rtl"==("rtl"===Ne(e,"direction")?"rtl":"ltr")?Gu:Vu}},Xu=["tableprops","tabledelete","|","tableinsertrowbefore","tableinsertrowafter","tabledeleterow","|","tableinsertcolbefore","tableinsertcolafter","tabledeletecol"],Ku={"border-collapse":"collapse",width:"100%"},Ju={border:"1"},$u=function(e){return e.getParam("table_cell_advtab",!0,"boolean")},Qu=function(e){return e.getParam("table_row_advtab",!0,"boolean")},Zu=function(e){return e.getParam("table_advtab",!0,"boolean")},ea=function(e){return e.getParam("table_style_by_css",!1,"boolean")},ta=function(e){return e.getParam("table_cell_class_list",[],"array")},na=function(e){return e.getParam("table_row_class_list",[],"array")},ra=function(e){return e.getParam("table_class_list",[],"array")},oa=function(e){return!1===e.getParam("table_responsive_width")},ia=function(e,t){return e.fire("newrow",{node:t})},ua=function(e,t){return e.fire("newcell",{node:t})},aa=function(e,t,n,r){e.fire("ObjectResizeStart",{target:t,width:n,height:r})},ca=function(e,t,n,r){e.fire("ObjectResized",{target:t,width:n,height:r})},la=function(f,e){var t,n=function(e){return"table"===oe(Fu(e))},s=(t=f.getParam("table_clone_elements"),d(t)?R.some(t.split(/[ ,]/)):Array.isArray(t)?R.some(t):R.none()),r=function(u,a,c,l){return function(e,t){qu(e);var n=l(),r=xe.fromDom(f.getDoc()),o=vo(Yu.directionAt),i=Bn(c,r,s);return a(e)?u(n,e,t,i,o).bind(function(e){return k(e.newRows(),function(e){ia(f,e.dom())}),k(e.newCells(),function(e){ua(f,e.dom())}),e.cursor().map(function(e){var t=f.dom.createRng();return t.setStart(e.dom(),0),t.setEnd(e.dom(),0),t})}):R.none()}};return{deleteRow:r(Lu.eraseRows,function(e){var t=bo(e);return!1===n(f)||1<t.rows()},y,e),deleteColumn:r(Lu.eraseColumns,function(e){var t=bo(e);return!1===n(f)||1<t.columns()},y,e),insertRowsBefore:r(Lu.insertRowsBefore,u,y,e),insertRowsAfter:r(Lu.insertRowsAfter,u,y,e),insertColumnsBefore:r(Lu.insertColumnsBefore,u,Qr,e),insertColumnsAfter:r(Lu.insertColumnsAfter,u,Qr,e),mergeCells:r(Lu.mergeCells,u,y,e),unmergeCells:r(Lu.unmergeCells,u,y,e),pasteRowsBefore:r(Lu.pasteRowsBefore,u,y,e),pasteRowsAfter:r(Lu.pasteRowsAfter,u,y,e),pasteCells:r(Lu.pasteCells,u,y,e)}},fa=function(e,t,r){var n=ln(e),o=mn.generate(n);return mi(o,t).map(function(e){var t=ui(o,r,!1).slice(e[0].row(),e[e.length-1].row()+e[e.length-1].rowspan()),n=ci(t,r);return So(n)})},sa=tinymce.util.Tools.resolve("tinymce.util.Tools"),da=function(e,t,n){n&&e.formatter.apply("align"+n,{},t)},ma=function(e,t,n){n&&e.formatter.apply("valign"+n,{},t)},ga=function(t,n){sa.each("left center right".split(" "),function(e){t.formatter.remove("align"+e,{},n)})},ha=function(t,n){sa.each("top middle bottom".split(" "),function(e){t.formatter.remove("valign"+e,{},n)})},pa=function(o,e,i){var t;return t=function(e,t){for(var n=0;n<t.length;n++){var r=o.getStyle(t[n],i);if(void 0===e&&(e=r),e!==r)return""}return e}(t,o.select("td,th",e))},va=function(e,t){var n=e.dom,r=t.control.rootControl,o=r.toJSON(),i=n.parseStyle(o.style);i["border-style"]=o.borderStyle,i["border-color"]=o.borderColor,i["background-color"]=o.backgroundColor,i.width=o.width?Uu(o.width):"",i.height=o.height?Uu(o.height):"",r.find("#style").value(n.serializeStyle(n.parseStyle(n.serializeStyle(i))))},ba=function(e,t){var n=e.dom,r=t.control.rootControl,o=r.toJSON(),i=n.parseStyle(o.style);r.find("#borderStyle").value(i["border-style"]||""),r.find("#borderColor").value(i["border-color"]||""),r.find("#backgroundColor").value(i["background-color"]||""),r.find("#width").value(i.width||""),r.find("#height").value(i.height||"")},wa={createStyleForm:function(n){var e=function(){var e=n.getParam("color_picker_callback");if(e)return function(t){return e.call(n,function(e){t.control.value(e).fire("change")},t.control.value())}};return{title:"Advanced",type:"form",defaults:{onchange:b(va,n)},items:[{label:"Style",name:"style",type:"textbox",onchange:b(ba,n)},{type:"form",padding:0,formItemDefaults:{layout:"grid",alignH:["start","right"]},defaults:{size:7},items:[{label:"Border style",type:"listbox",name:"borderStyle",width:90,onselect:b(va,n),values:[{text:"Select...",value:""},{text:"Solid",value:"solid"},{text:"Dotted",value:"dotted"},{text:"Dashed",value:"dashed"},{text:"Double",value:"double"},{text:"Groove",value:"groove"},{text:"Ridge",value:"ridge"},{text:"Inset",value:"inset"},{text:"Outset",value:"outset"},{text:"None",value:"none"},{text:"Hidden",value:"hidden"}]},{label:"Border color",type:"colorbox",name:"borderColor",onaction:e()},{label:"Background color",type:"colorbox",name:"backgroundColor",onaction:e()}]}]}},buildListItems:function(e,r,t){var o=function(e,n){return n=n||[],sa.each(e,function(e){var t={text:e.text||e.title};e.menu?t.menu=o(e.menu):(t.value=e.value,r&&r(t)),n.push(t)}),n};return o(e,t||[])},updateStyleField:va,extractAdvancedStyles:function(e,t){var n=e.parseStyle(e.getAttrib(t,"style")),r={};return n["border-style"]&&(r.borderStyle=n["border-style"]),n["border-color"]&&(r.borderColor=n["border-color"]),n["background-color"]&&(r.backgroundColor=n["background-color"]),r.style=e.serializeStyle(n),r},updateAdvancedFields:ba,syncAdvancedStyleFields:function(e,t){t.control.rootControl.find("#style")[0].getEl().isEqualNode(m.document.activeElement)?ba(e,t):va(e,t)}},ya=function(r,o,e){var i,u=r.dom;function a(e,t,n){(1===o.length||n)&&u.setAttrib(e,t,n)}function c(e,t,n){(1===o.length||n)&&u.setStyle(e,t,n)}$u(r)&&wa.syncAdvancedStyleFields(r,e),i=e.control.rootControl.toJSON(),r.undoManager.transact(function(){sa.each(o,function(e){var t,n;a(e,"scope",i.scope),1===o.length?a(e,"style",i.style):(t=e,n=i.style,delete t.dataset.mceStyle,t.style.cssText+=";"+n),a(e,"class",i["class"]),c(e,"width",Uu(i.width)),c(e,"height",Uu(i.height)),i.type&&e.nodeName.toLowerCase()!==i.type&&(e=u.rename(e,i.type)),1===o.length&&(ga(r,e),ha(r,e)),i.align&&da(r,e,i.align),i.valign&&ma(r,e,i.valign)}),r.focus()})},xa=function(t){var e,n,r,o=[];if(o=t.dom.select("td[data-mce-selected],th[data-mce-selected]"),e=t.dom.getParent(t.selection.getStart(),"td,th"),!o.length&&e&&o.push(e),e=e||o[0]){var i,u,a,c;1<o.length?n={width:"",height:"",scope:"","class":"",align:"",valign:"",style:"",type:e.nodeName.toLowerCase()}:(u=e,a=(i=t).dom,c={width:a.getStyle(u,"width")||a.getAttrib(u,"width"),height:a.getStyle(u,"height")||a.getAttrib(u,"height"),scope:a.getAttrib(u,"scope"),"class":a.getAttrib(u,"class"),type:u.nodeName.toLowerCase(),style:"",align:"",valign:""},sa.each("left center right".split(" "),function(e){i.formatter.matchNode(u,"align"+e)&&(c.align=e)}),sa.each("top middle bottom".split(" "),function(e){i.formatter.matchNode(u,"valign"+e)&&(c.valign=e)}),$u(i)&&sa.extend(c,wa.extractAdvancedStyles(a,u)),n=c),0<ta(t).length&&(r={name:"class",type:"listbox",label:"Class",values:wa.buildListItems(ta(t),function(e){e.value&&(e.textStyle=function(){return t.formatter.getCssText({block:"td",classes:[e.value]})})})});var l={type:"form",layout:"flex",direction:"column",labelGapCalc:"children",padding:0,items:[{type:"form",layout:"grid",columns:2,labelGapCalc:!1,padding:0,defaults:{type:"textbox",maxWidth:50},items:[{label:"Width",name:"width",onchange:b(wa.updateStyleField,t)},{label:"Height",name:"height",onchange:b(wa.updateStyleField,t)},{label:"Cell type",name:"type",type:"listbox",text:"None",minWidth:90,maxWidth:null,values:[{text:"Cell",value:"td"},{text:"Header cell",value:"th"}]},{label:"Scope",name:"scope",type:"listbox",text:"None",minWidth:90,maxWidth:null,values:[{text:"None",value:""},{text:"Row",value:"row"},{text:"Column",value:"col"},{text:"Row group",value:"rowgroup"},{text:"Column group",value:"colgroup"}]},{label:"H Align",name:"align",type:"listbox",text:"None",minWidth:90,maxWidth:null,values:[{text:"None",value:""},{text:"Left",value:"left"},{text:"Center",value:"center"},{text:"Right",value:"right"}]},{label:"V Align",name:"valign",type:"listbox",text:"None",minWidth:90,maxWidth:null,values:[{text:"None",value:""},{text:"Top",value:"top"},{text:"Middle",value:"middle"},{text:"Bottom",value:"bottom"}]}]},r]};$u(t)?t.windowManager.open({title:"Cell properties",bodyType:"tabpanel",data:n,body:[{title:"General",type:"form",items:l},wa.createStyleForm(t)],onsubmit:b(ya,t,o)}):t.windowManager.open({title:"Cell properties",data:n,body:l,onsubmit:b(ya,t,o)})}};function Ca(f,s,d,e){var m=f.dom;function g(e,t,n){(1===s.length||n)&&m.setAttrib(e,t,n)}Qu(f)&&wa.syncAdvancedStyleFields(f,e);var h=e.control.rootControl.toJSON();f.undoManager.transact(function(){sa.each(s,function(e){var t,n,r,o,i,u,a,c,l;g(e,"scope",h.scope),g(e,"style",h.style),g(e,"class",h["class"]),t=e,n="height",r=Uu(h.height),(1===s.length||r)&&m.setStyle(t,n,r),h.type!==e.parentNode.nodeName.toLowerCase()&&(o=f.dom,i=e,u=h.type,a=o.getParent(i,"table"),c=i.parentNode,(l=o.select(u,a)[0])||(l=o.create(u),a.firstChild?"CAPTION"===a.firstChild.nodeName?o.insertAfter(l,a.firstChild):a.insertBefore(l,a.firstChild):a.appendChild(l)),l.appendChild(i),c.hasChildNodes()||o.remove(c)),h.align!==d.align&&(ga(f,e),da(f,e,h.align))}),f.focus()})}var Ra=function(t){var e,n,r,o,i,u,a,c,l,f,s=t.dom,d=[];e=s.getParent(t.selection.getStart(),"table"),n=s.getParent(t.selection.getStart(),"td,th"),sa.each(e.rows,function(t){sa.each(t.cells,function(e){if(s.getAttrib(e,"data-mce-selected")||e===n)return d.push(t),!1})}),(r=d[0])&&(1<d.length?i={height:"",scope:"",style:"","class":"",align:"",type:r.parentNode.nodeName.toLowerCase()}:(c=r,l=(a=t).dom,f={height:l.getStyle(c,"height")||l.getAttrib(c,"height"),scope:l.getAttrib(c,"scope"),"class":l.getAttrib(c,"class"),align:"",style:"",type:c.parentNode.nodeName.toLowerCase()},sa.each("left center right".split(" "),function(e){a.formatter.matchNode(c,"align"+e)&&(f.align=e)}),Qu(a)&&sa.extend(f,wa.extractAdvancedStyles(l,c)),i=f),0<na(t).length&&(o={name:"class",type:"listbox",label:"Class",values:wa.buildListItems(na(t),function(e){e.value&&(e.textStyle=function(){return t.formatter.getCssText({block:"tr",classes:[e.value]})})})}),u={type:"form",columns:2,padding:0,defaults:{type:"textbox"},items:[{type:"listbox",name:"type",label:"Row type",text:"Header",maxWidth:null,values:[{text:"Header",value:"thead"},{text:"Body",value:"tbody"},{text:"Footer",value:"tfoot"}]},{type:"listbox",name:"align",label:"Alignment",text:"None",maxWidth:null,values:[{text:"None",value:""},{text:"Left",value:"left"},{text:"Center",value:"center"},{text:"Right",value:"right"}]},{label:"Height",name:"height"},o]},Qu(t)?t.windowManager.open({title:"Row properties",data:i,bodyType:"tabpanel",body:[{title:"General",type:"form",items:u},wa.createStyleForm(t)],onsubmit:b(Ca,t,d,i)}):t.windowManager.open({title:"Row properties",data:i,body:u,onsubmit:b(Ca,t,d,i)}))},Sa=tinymce.util.Tools.resolve("tinymce.Env"),Ta={styles:{"border-collapse":"collapse",width:"100%"},attributes:{border:"1"},percentages:!0},Da=function(e,t,n,r,o){void 0===o&&(o=Ta);var i=xe.fromTag("table");Oe(i,o.styles),de(i,o.attributes);var u=xe.fromTag("tbody");Rt(i,u);for(var a=[],c=0;c<e;c++){for(var l=xe.fromTag("tr"),f=0;f<t;f++){var s=c<n||f<r?xe.fromTag("th"):xe.fromTag("td");f<r&&se(s,"scope","row"),c<n&&se(s,"scope","col"),Rt(s,xe.fromTag("br")),o.percentages&&De(s,"width",100/t+"%"),Rt(l,s)}a.push(l)}return Dt(u,a),i},Oa=function(e,t){e.selection.select(t.dom(),!0),e.selection.collapse(!0)},Na=function(r,e,t){var n,o,i=r.getParam("table_default_styles",Ku,"object"),u={styles:i,attributes:(o=r,o.getParam("table_default_attributes",Ju,"object")),percentages:(n=i.width,d(n)&&-1!==n.indexOf("%")&&!oa(r))},a=Da(t,e,0,0,u);se(a,"data-mce-id","__mce");var c,l,f,s=(c=a,l=xe.fromTag("div"),f=xe.fromDom(c.dom().cloneNode(!0)),Rt(l,f),l.dom().innerHTML);return r.insertContent(s),Qt(Fu(r),'table[data-mce-id="__mce"]').map(function(e){var t,n;return oa(r)&&De(e,"width",Ne(e,"width")),he(e,"data-mce-id"),t=r,k(qt(e,"tr"),function(e){ia(t,e.dom()),k(qt(e,"th,td"),function(e){ua(t,e.dom())})}),n=r,Qt(e,"td,th").each(b(Oa,n)),e.dom()}).getOr(null)};function Ea(e,t,n,r){if("TD"===t.tagName||"TH"===t.tagName)e.setStyle(t,n,r);else if(t.children)for(var o=0;o<t.children.length;o++)Ea(e,t.children[o],n,r)}var ka,Aa=function(e,t,n){var r,o,i=e.dom;Zu(e)&&wa.syncAdvancedStyleFields(e,n),!1===(o=n.control.rootControl.toJSON())["class"]&&delete o["class"],e.undoManager.transact(function(){t||(t=Na(e,o.cols||1,o.rows||1)),function(e,t,n){var r,o=e.dom,i={},u={};if(i["class"]=n["class"],u.height=Uu(n.height),o.getAttrib(t,"width")&&!ea(e)?i.width=(r=n.width)?r.replace(/px$/,""):"":u.width=Uu(n.width),ea(e)?(u["border-width"]=Uu(n.border),u["border-spacing"]=Uu(n.cellspacing),sa.extend(i,{"data-mce-border-color":n.borderColor,"data-mce-cell-padding":n.cellpadding,"data-mce-border":n.border})):sa.extend(i,{border:n.border,cellpadding:n.cellpadding,cellspacing:n.cellspacing}),ea(e)&&t.children)for(var a=0;a<t.children.length;a++)Ea(o,t.children[a],{"border-width":Uu(n.border),"border-color":n.borderColor,padding:Uu(n.cellpadding)});n.style?sa.extend(u,o.parseStyle(n.style)):u=sa.extend({},o.parseStyle(o.getAttrib(t,"style")),u),i.style=o.serializeStyle(u),o.setAttribs(t,i)}(e,t,o),(r=i.select("caption",t)[0])&&!o.caption&&i.remove(r),!r&&o.caption&&((r=i.create("caption")).innerHTML=Sa.ie?"\xa0":'<br data-mce-bogus="1"/>',t.insertBefore(r,t.firstChild)),ga(e,t),o.align&&da(e,t,o.align),e.focus(),e.addVisual()})},Pa=function(t,e){var n,r,o,i,u,a,c,l,f,s,d=t.dom,m={};!0===e?(n=d.getParent(t.selection.getStart(),"table"))&&(c=n,l=(a=t).dom,f={width:l.getStyle(c,"width")||l.getAttrib(c,"width"),height:l.getStyle(c,"height")||l.getAttrib(c,"height"),cellspacing:l.getStyle(c,"border-spacing")||l.getAttrib(c,"cellspacing"),cellpadding:l.getAttrib(c,"data-mce-cell-padding")||l.getAttrib(c,"cellpadding")||pa(a.dom,c,"padding"),border:l.getAttrib(c,"data-mce-border")||l.getAttrib(c,"border")||pa(a.dom,c,"border"),borderColor:l.getAttrib(c,"data-mce-border-color"),caption:!!l.select("caption",c)[0],"class":l.getAttrib(c,"class")},sa.each("left center right".split(" "),function(e){a.formatter.matchNode(c,"align"+e)&&(f.align=e)}),Zu(a)&&sa.extend(f,wa.extractAdvancedStyles(l,c)),m=f):(r={label:"Cols",name:"cols"},o={label:"Rows",name:"rows"}),0<ra(t).length&&(m["class"]&&(m["class"]=m["class"].replace(/\s*mce\-item\-table\s*/g,"")),i={name:"class",type:"listbox",label:"Class",values:wa.buildListItems(ra(t),function(e){e.value&&(e.textStyle=function(){return t.formatter.getCssText({block:"table",classes:[e.value]})})})}),u={type:"form",layout:"flex",direction:"column",labelGapCalc:"children",padding:0,items:[{type:"form",labelGapCalc:!1,padding:0,layout:"grid",columns:2,defaults:{type:"textbox",maxWidth:50},items:(s=t,s.getParam("table_appearance_options",!0,"boolean")?[r,o,{label:"Width",name:"width",onchange:b(wa.updateStyleField,t)},{label:"Height",name:"height",onchange:b(wa.updateStyleField,t)},{label:"Cell spacing",name:"cellspacing"},{label:"Cell padding",name:"cellpadding"},{label:"Border",name:"border"},{label:"Caption",name:"caption",type:"checkbox"}]:[r,o,{label:"Width",name:"width",onchange:b(wa.updateStyleField,t)},{label:"Height",name:"height",onchange:b(wa.updateStyleField,t)}])},{label:"Alignment",name:"align",type:"listbox",text:"None",values:[{text:"None",value:""},{text:"Left",value:"left"},{text:"Center",value:"center"},{text:"Right",value:"right"}]},i]},Zu(t)?t.windowManager.open({title:"Table properties",data:m,bodyType:"tabpanel",body:[{title:"General",type:"form",items:u},wa.createStyleForm(t)],onsubmit:b(Aa,t,n)}):t.windowManager.open({title:"Table properties",data:m,body:u,onsubmit:b(Aa,t,n)})},Ia=sa.each,Ba=function(a,t,c,l,n){var r=Hu(a),e=function(e){return function(){return R.from(a.dom.getParent(a.selection.getStart(),e)).map(xe.fromDom)}},o=e("caption"),f=e("th,td"),s=function(e){return cn.table(e,r)},d=function(e){return{width:ju(e.dom()),height:ju(e.dom())}},i=function(n){f().each(function(t){s(t).each(function(i){var e=kr.forMenu(l,i,t),u=d(i);n(i,e).each(function(e){var t,n,r,o;t=a,n=u,o=d(r=i),n.width===o.width&&n.height===o.height||(aa(t,r.dom(),n.width,n.height),ca(t,r.dom(),o.width,o.height)),a.selection.setRng(e),a.focus(),c.clear(i),qu(i)})})})},u=function(e){return f().bind(function(o){return s(o).bind(function(e){var t=xe.fromDom(a.getDoc()),n=kr.forMenu(l,e,o),r=Bn(y,t,R.none());return fa(e,n,r)})})},m=function(u){n.get().each(function(e){var i=E(e,function(e){return Nn(e)});f().each(function(o){s(o).each(function(t){var e=xe.fromDom(a.getDoc()),n=Wn(e),r=kr.pasteRows(l,t,o,i,n);u(t,r).each(function(e){a.selection.setRng(e),a.focus(),c.clear(t)})})})})};Ia({mceTableSplitCells:function(){i(t.unmergeCells)},mceTableMergeCells:function(){i(t.mergeCells)},mceTableInsertRowBefore:function(){i(t.insertRowsBefore)},mceTableInsertRowAfter:function(){i(t.insertRowsAfter)},mceTableInsertColBefore:function(){i(t.insertColumnsBefore)},mceTableInsertColAfter:function(){i(t.insertColumnsAfter)},mceTableDeleteCol:function(){i(t.deleteColumn)},mceTableDeleteRow:function(){i(t.deleteRow)},mceTableCutRow:function(e){n.set(u()),i(t.deleteRow)},mceTableCopyRow:function(e){n.set(u())},mceTablePasteRowBefore:function(e){m(t.pasteRowsBefore)},mceTablePasteRowAfter:function(e){m(t.pasteRowsAfter)},mceTableDelete:function(){f().orThunk(o).each(function(e){cn.table(e,r).filter(g(r)).each(function(e){var t=xe.fromText("");xt(e,t),Nt(e);var n=a.dom.createRng();n.setStart(t.dom(),0),n.setEnd(t.dom(),0),a.selection.setRng(n)})})}},function(e,t){a.addCommand(t,e)}),Ia({mceInsertTable:b(Pa,a),mceTableProps:b(Pa,a,!0),mceTableRowProps:b(Ra,a),mceTableCellProps:b(xa,a)},function(n,e){a.addCommand(e,function(e,t){n(t)})})},Wa=function(e){var t=R.from(e.dom().documentElement).map(xe.fromDom).getOr(e);return{parent:C(t),view:C(e),origin:C(eo(0,0))}},Ma=function(e,t){return{parent:C(t),view:C(e),origin:C(eo(0,0))}},_a=function(e){var r=q.apply(null,e),o=[];return{bind:function(e){if(e===undefined)throw new Error("Event bind error: undefined handler");o.push(e)},unbind:function(t){o=A(o,function(e){return e!==t})},trigger:function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n=r.apply(null,e);k(o,function(e){e(n)})}}},La={create:function(e){return{registry:H(e,function(e){return{bind:e.bind,unbind:e.unbind}}),trigger:H(e,function(e){return e.trigger})}}},Fa=function(m,g){return function(e){if(m(e)){var t,n,r,o,i,u,a,c=xe.fromDom(e.target),l=function(){e.stopPropagation()},f=function(){e.preventDefault()},s=x(f,l),d=(t=c,n=e.clientX,r=e.clientY,o=l,i=f,u=s,a=e,{target:C(t),x:C(n),y:C(r),stop:o,prevent:i,kill:u,raw:C(a)});g(d)}}},ja=function(e,t,n,r){return o=e,i=t,u=!1,a=Fa(n,r),o.dom().addEventListener(i,a,u),{unbind:b(za,o,i,a,u)};var o,i,u,a},za=function(e,t,n,r){e.dom().removeEventListener(t,n,r)},Ha=C(!0),Ua=function(e,t,n){return ja(e,t,Ha,n)},qa=Object.prototype.hasOwnProperty,Va=(ka=function(e,t){return t},function(){for(var e=new Array(arguments.length),t=0;t<e.length;t++)e[t]=arguments[t];if(0===e.length)throw new Error("Can't merge zero objects");for(var n={},r=0;r<e.length;r++){var o=e[r];for(var i in o)qa.call(o,i)&&(n[i]=ka(n[i],o[i]))}return n}),Ga={resolve:_o("ephox-dragster").resolve},Ya=du(["compare","extract","mutate","sink"]),Xa=du(["element","start","stop","destroy"]),Ka=du(["forceDrop","drop","move","delayDrop"]),Ja=Ya({compare:function(e,t){return eo(t.left()-e.left(),t.top()-e.top())},extract:function(e){return R.some(eo(e.x(),e.y()))},sink:function(e,t){var n,r,o,i=(n=t,r=Va({layerClass:Ga.resolve("blocker")},n),o=xe.fromTag("div"),se(o,"role","presentation"),Oe(o,{position:"fixed",left:"0px",top:"0px",width:"100%",height:"100%"}),Eo(o,Ga.resolve("blocker")),Eo(o,r.layerClass),{element:function(){return o},destroy:function(){Nt(o)}}),u=Ua(i.element(),"mousedown",e.forceDrop),a=Ua(i.element(),"mouseup",e.drop),c=Ua(i.element(),"mousemove",e.move),l=Ua(i.element(),"mouseout",e.delayDrop);return Xa({element:i.element,start:function(e){Rt(e,i.element())},stop:function(){Nt(i.element())},destroy:function(){i.destroy(),a.unbind(),c.unbind(),l.unbind(),u.unbind()}})},mutate:function(e,t){e.mutate(t.left(),t.top())}});function $a(){var i=R.none(),u=La.create({move:_a(["info"])});return{onEvent:function(e,o){o.extract(e).each(function(e){var t,n,r;(t=o,n=e,r=i.map(function(e){return t.compare(e,n)}),i=R.some(n),r).each(function(e){u.trigger.move(e)})})},reset:function(){i=R.none()},events:u.registry}}function Qa(){var e={onEvent:y,reset:y},t=$a(),n=e;return{on:function(){n.reset(),n=t},off:function(){n.reset(),n=e},isOn:function(){return n===t},onEvent:function(e,t){n.onEvent(e,t)},events:t.events}}var Za=function(t,n,e){var r,o,i,u=!1,a=La.create({start:_a([]),stop:_a([])}),c=Qa(),l=function(){d.stop(),c.isOn()&&(c.off(),a.trigger.stop())},f=(r=l,o=200,i=null,{cancel:function(){null!==i&&(m.clearTimeout(i),i=null)},throttle:function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];null!==i&&m.clearTimeout(i),i=m.setTimeout(function(){r.apply(null,e),i=null},o)}});c.events.move.bind(function(e){n.mutate(t,e.info())});var s=function(n){return function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];u&&n.apply(null,e)}},d=n.sink(Ka({forceDrop:l,drop:s(l),move:s(function(e){f.cancel(),c.onEvent(e,n)}),delayDrop:s(f.throttle)}),e);return{element:d.element,go:function(e){d.start(e),c.on(),a.trigger.start()},on:function(){u=!0},off:function(){u=!1},destroy:function(){d.destroy()},events:a.registry}},ec=function(e,t){void 0===t&&(t={});var n=t.mode!==undefined?t.mode:Ja;return Za(e,n,t)},tc=function(){var n,r=La.create({drag:_a(["xDelta","yDelta","target"])}),o=R.none(),e={mutate:function(e,t){n.trigger.drag(e,t)},events:(n=La.create({drag:_a(["xDelta","yDelta"])})).registry};return e.events.drag.bind(function(t){o.each(function(e){r.trigger.drag(t.xDelta(),t.yDelta(),e)})}),{assign:function(e){o=R.some(e)},get:function(){return o},mutate:e.mutate,events:r.registry}},nc=function(e){return"true"===me(e,"contenteditable")},rc=Lo.resolve("resizer-bar-dragging"),oc=function(o,t,i){var n=tc(),r=ec(n,{}),u=R.none(),e=function(e,t){return R.from(me(e,t))};n.events.drag.bind(function(n){e(n.target(),"data-row").each(function(e){var t=Ui.getInt(n.target(),"top");De(n.target(),"top",t+n.yDelta()+"px")}),e(n.target(),"data-column").each(function(e){var t=Ui.getInt(n.target(),"left");De(n.target(),"left",t+n.xDelta()+"px")})});var a=function(e,t){return Ui.getInt(e,t)-parseInt(me(e,"data-initial-"+t),10)};r.events.stop.bind(function(){n.get().each(function(r){u.each(function(n){e(r,"data-row").each(function(e){var t=a(r,"top");he(r,"data-initial-top"),m.trigger.adjustHeight(n,t,parseInt(e,10))}),e(r,"data-column").each(function(e){var t=a(r,"left");he(r,"data-initial-left"),m.trigger.adjustWidth(n,t,parseInt(e,10))}),Xo(o,n,i,t)})})});var c=function(e,t){m.trigger.startAdjust(),n.assign(e),se(e,"data-initial-"+t,parseInt(Ne(e,t),10)),Eo(e,rc),De(e,"opacity","0.2"),r.go(o.parent())},l=Ua(o.parent(),"mousedown",function(e){Qo(e.target())&&c(e.target(),"top"),Zo(e.target())&&c(e.target(),"left")}),f=function(e){return ft(e,o.view())},s=function(e){return Zt(e,"table",f).filter(function(e){return(t=e,n=f,Zt(t,"[contenteditable]",n)).exists(nc);var t,n})},d=Ua(o.view(),"mouseover",function(e){s(e.target()).fold(function(){Ce(e.target())&&$o(o)},function(e){u=R.some(e),Xo(o,e,i,t)})}),m=La.create({adjustHeight:_a(["table","delta","row"]),adjustWidth:_a(["table","delta","column"]),startAdjust:_a([])});return{destroy:function(){l.unbind(),d.unbind(),r.destroy(),$o(o)},refresh:function(e){Xo(o,e,i,t)},on:r.on,off:r.off,hideBars:b(Ko,o),showBars:b(Jo,o),events:m.registry}},ic=function(e,n){var r=ho.height,t=oc(e,n,r),o=La.create({beforeResize:_a(["table"]),afterResize:_a(["table"]),startDrag:_a([])});return t.events.adjustHeight.bind(function(e){o.trigger.beforeResize(e.table());var t=r.delta(e.delta(),e.table());au(e.table(),t,e.row(),r),o.trigger.afterResize(e.table())}),t.events.startAdjust.bind(function(e){o.trigger.startDrag()}),t.events.adjustWidth.bind(function(e){o.trigger.beforeResize(e.table());var t=n.delta(e.delta(),e.table());uu(e.table(),t,e.column(),n),o.trigger.afterResize(e.table())}),{on:t.on,off:t.off,hideBars:t.hideBars,showBars:t.showBars,destroy:t.destroy,events:o.registry}},uc=function(e,t){return e.inline?Ma(Fu(e),(n=xe.fromTag("div"),Oe(n,{position:"static",height:"0",width:"0",padding:"0",margin:"0",border:"0"}),Rt(Re(),n),n)):Wa(xe.fromDom(e.getDoc()));var n},ac=function(e,t){e.inline&&Nt(t.parent())},cc=function(u){var a,c,o=R.none(),i=R.none(),l=R.none(),f=/(\d+(\.\d+)?)%/,s=function(e){return"TABLE"===e.nodeName};return u.on("init",function(){var e,t=vo(Yu.directionAt),n=uc(u);if(l=R.some(n),("table"===(e=u.getParam("object_resizing",!0))||e)&&u.getParam("table_resize_bars",!0,"boolean")){var r=ic(n,t);r.on(),r.events.startDrag.bind(function(e){o=R.some(u.selection.getRng())}),r.events.beforeResize.bind(function(e){var t=e.table().dom();aa(u,t,ju(t),zu(t))}),r.events.afterResize.bind(function(e){var t=e.table(),n=t.dom();qu(t),o.each(function(e){u.selection.setRng(e),u.focus()}),ca(u,n,ju(n),zu(n)),u.undoManager.add()}),i=R.some(r)}}),u.on("ObjectResizeStart",function(e){var t,n=e.target;s(n)&&(a=e.width,t=n,c=u.dom.getStyle(t,"width")||u.dom.getAttrib(t,"width"))}),u.on("ObjectResized",function(e){var t=e.target;if(s(t)){var n=t;if(f.test(c)){var r=parseFloat(f.exec(c)[1]),o=e.width*r/a;u.dom.setStyle(n,"width",o+"%")}else{var i=[];sa.each(n.rows,function(e){sa.each(e.cells,function(e){var t=u.dom.getStyle(e,"width",!0);i.push({cell:e,width:t})})}),sa.each(i,function(e){u.dom.setStyle(e.cell,"width",e.width),u.dom.setAttrib(e.cell,"width",null)})}}}),{lazyResize:function(){return i},lazyWire:function(){return l.getOr(Wa(xe.fromDom(u.getBody())))},destroy:function(){i.each(function(e){e.destroy()}),l.each(function(e){ac(u,e)})}}},lc=xr([{none:["current"]},{first:["current"]},{middle:["current","target"]},{last:["current"]}]),fc=wo(wo({},lc),{none:function(e){return void 0===e&&(e=undefined),lc.none(e)}}),sc=function(n,e){return cn.table(n,e).bind(function(e){var t=cn.cells(e);return W(t,function(e){return ft(n,e)}).map(function(e){return{index:C(e),all:C(t)}})})},dc=function(t,e){return sc(t,e).fold(function(){return fc.none(t)},function(e){return e.index()+1<e.all().length?fc.middle(t,e.all()[e.index()+1]):fc.last(t)})},mc=function(t,e){return sc(t,e).fold(function(){return fc.none()},function(e){return 0<=e.index()-1?fc.middle(t,e.all()[e.index()-1]):fc.first(t)})},gc={create:q("start","soffset","finish","foffset")},hc=xr([{before:["element"]},{on:["element","offset"]},{after:["element"]}]),pc={before:hc.before,on:hc.on,after:hc.after,cata:function(e,t,n,r){return e.fold(t,n,r)},getStart:function(e){return e.fold(o,o,o)}},vc=xr([{domRange:["rng"]},{relative:["startSitu","finishSitu"]},{exact:["start","soffset","finish","foffset"]}]),bc={domRange:vc.domRange,relative:vc.relative,exact:vc.exact,exactFromRange:function(e){return vc.exact(e.start(),e.soffset(),e.finish(),e.foffset())},getWin:function(e){var t,n=e.match({domRange:function(e){return xe.fromDom(e.startContainer)},relative:function(e,t){return pc.getStart(e)},exact:function(e,t,n,r){return e}});return t=n,xe.fromDom(t.dom().ownerDocument.defaultView)},range:gc.create},wc=function(e,t){e.selectNodeContents(t.dom())},yc=function(e,t,n){var r,o,i=e.document.createRange();return r=i,t.fold(function(e){r.setStartBefore(e.dom())},function(e,t){r.setStart(e.dom(),t)},function(e){r.setStartAfter(e.dom())}),o=i,n.fold(function(e){o.setEndBefore(e.dom())},function(e,t){o.setEnd(e.dom(),t)},function(e){o.setEndAfter(e.dom())}),i},xc=function(e,t,n,r,o){var i=e.document.createRange();return i.setStart(t.dom(),n),i.setEnd(r.dom(),o),i},Cc=function(e){return{left:C(e.left),top:C(e.top),right:C(e.right),bottom:C(e.bottom),width:C(e.width),height:C(e.height)}},Rc=xr([{ltr:["start","soffset","finish","foffset"]},{rtl:["start","soffset","finish","foffset"]}]),Sc=function(e,t,n){return t(xe.fromDom(n.startContainer),n.startOffset,xe.fromDom(n.endContainer),n.endOffset)},Tc=function(e,t){var o,n,r,i=(o=e,t.match({domRange:function(e){return{ltr:C(e),rtl:R.none}},relative:function(e,t){return{ltr:we(function(){return yc(o,e,t)}),rtl:we(function(){return R.some(yc(o,t,e))})}},exact:function(e,t,n,r){return{ltr:we(function(){return xc(o,e,t,n,r)}),rtl:we(function(){return R.some(xc(o,n,r,e,t))})}}}));return(r=(n=i).ltr()).collapsed?n.rtl().filter(function(e){return!1===e.collapsed}).map(function(e){return Rc.rtl(xe.fromDom(e.endContainer),e.endOffset,xe.fromDom(e.startContainer),e.startOffset)}).getOrThunk(function(){return Sc(0,Rc.ltr,r)}):Sc(0,Rc.ltr,r)},Dc=function(i,e){return Tc(i,e).match({ltr:function(e,t,n,r){var o=i.document.createRange();return o.setStart(e.dom(),t),o.setEnd(n.dom(),r),o},rtl:function(e,t,n,r){var o=i.document.createRange();return o.setStart(n.dom(),r),o.setEnd(e.dom(),t),o}})},Oc=function(e,t,n){return t>=e.left&&t<=e.right&&n>=e.top&&n<=e.bottom},Nc=function(n,r,e,t,o){var i=function(e){var t=n.dom().createRange();return t.setStart(r.dom(),e),t.collapse(!0),t},u=vn(r).length,a=function(e,t,n,r,o){if(0===o)return 0;if(t===r)return o-1;for(var i=r,u=1;u<o;u++){var a=e(u),c=Math.abs(t-a.left);if(n<=a.bottom){if(n<a.top||i<c)return u-1;i=c}}return 0}(function(e){return i(e).getBoundingClientRect()},e,t,o.right,u);return i(a)},Ec=function(e,t,n,r){return le(t)?function(t,n,r,o){var e=t.dom().createRange();e.selectNode(n.dom());var i=e.getClientRects();return xo(i,function(e){return Oc(e,r,o)?R.some(e):R.none()}).map(function(e){return Nc(t,n,r,o,e)})}(e,t,n,r):(i=t,u=n,a=r,c=(o=e).dom().createRange(),l=bt(i),xo(l,function(e){return c.selectNode(e.dom()),Oc(c.getBoundingClientRect(),u,a)?Ec(o,e,u,a):R.none()}));var o,i,u,a,c,l},kc=function(e,t){return t-e.left<e.right-t},Ac=function(e,t,n){var r=e.dom().createRange();return r.selectNode(t.dom()),r.collapse(n),r},Pc=function(t,e,n){var r=t.dom().createRange();r.selectNode(e.dom());var o=r.getBoundingClientRect(),i=kc(o,n);return(!0===i?Rn:Sn)(e).map(function(e){return Ac(t,e,i)})},Ic=function(e,t,n){var r=t.dom().getBoundingClientRect(),o=kc(r,n);return R.some(Ac(e,t,o))},Bc=function(e,t,n,r){var o=e.dom().createRange();o.selectNode(t.dom());var i=o.getBoundingClientRect();return function(e,t,n,r){var o=e.dom().createRange();o.selectNode(t.dom());var i=o.getBoundingClientRect(),u=Math.max(i.left,Math.min(i.right,n)),a=Math.max(i.top,Math.min(i.bottom,r));return Ec(e,t,u,a)}(e,t,Math.max(i.left,Math.min(i.right,n)),Math.max(i.top,Math.min(i.bottom,r)))},Wc=document.caretPositionFromPoint?function(n,e,t){return R.from(n.dom().caretPositionFromPoint(e,t)).bind(function(e){if(null===e.offsetNode)return R.none();var t=n.dom().createRange();return t.setStart(e.offsetNode,e.offset),t.collapse(),R.some(t)})}:document.caretRangeFromPoint?function(e,t,n){return R.from(e.dom().caretRangeFromPoint(t,n))}:function(o,i,t){return xe.fromPoint(o,i,t).bind(function(r){var e=function(){return e=o,n=i,(0===bt(t=r).length?Ic:Pc)(e,t,n);var e,t,n};return 0===bt(r).length?e():Bc(o,r,i,t).orThunk(e)})},Mc=function(e,t){var n=oe(e);return"input"===n?pc.after(e):O(["br","img"],n)?0===t?pc.before(e):pc.after(e):pc.on(e,t)},_c=function(e,t){var n=e.fold(pc.before,Mc,pc.after),r=t.fold(pc.before,Mc,pc.after);return bc.relative(n,r)},Lc=function(e,t,n,r){var o=Mc(e,t),i=Mc(n,r);return bc.relative(o,i)},Fc=function(e,t,n,r){var o,i,u,a,c,l=(i=t,u=n,a=r,(c=mt(o=e).dom().createRange()).setStart(o.dom(),i),c.setEnd(u.dom(),a),c),f=ft(e,n)&&t===r;return l.collapsed&&!f},jc=function(e,t){R.from(e.getSelection()).each(function(e){e.removeAllRanges(),e.addRange(t)})},zc=function(e,t,n,r,o){var i=xc(e,t,n,r,o);jc(e,i)},Hc=function(s,e){return Tc(s,e).match({ltr:function(e,t,n,r){zc(s,e,t,n,r)},rtl:function(e,t,n,r){var o,i,u,a,c,l=s.getSelection();if(l.setBaseAndExtent)l.setBaseAndExtent(e.dom(),t,n.dom(),r);else if(l.extend)try{i=e,u=t,a=n,c=r,(o=l).collapse(i.dom(),u),o.extend(a.dom(),c)}catch(f){zc(s,n,r,e,t)}else zc(s,n,r,e,t)}})},Uc=function(e){var o=bc.getWin(e).dom(),t=function(e,t,n,r){return xc(o,e,t,n,r)},n=e.match({domRange:function(e){var t=xe.fromDom(e.startContainer),n=xe.fromDom(e.endContainer);return Lc(t,e.startOffset,n,e.endOffset)},relative:_c,exact:Lc});return Tc(o,n).match({ltr:t,rtl:t})},qc=function(e){var t=xe.fromDom(e.anchorNode),n=xe.fromDom(e.focusNode);return Fc(t,e.anchorOffset,n,e.focusOffset)?R.some(gc.create(t,e.anchorOffset,n,e.focusOffset)):function(e){if(0<e.rangeCount){var t=e.getRangeAt(0),n=e.getRangeAt(e.rangeCount-1);return R.some(gc.create(xe.fromDom(t.startContainer),t.startOffset,xe.fromDom(n.endContainer),n.endOffset))}return R.none()}(e)},Vc=function(e,t){var n,r,o=(n=t,r=e.document.createRange(),wc(r,n),r);jc(e,o)},Gc=function(e){return(t=e,R.from(t.getSelection()).filter(function(e){return 0<e.rangeCount}).bind(qc)).map(function(e){return bc.exact(e.start(),e.soffset(),e.finish(),e.foffset())});var t},Yc=function(e,t){var n,r,o,i=Dc(e,t);return r=(n=i).getClientRects(),0<(o=0<r.length?r[0]:n.getBoundingClientRect()).width||0<o.height?R.some(o).map(Cc):R.none()},Xc=function(e,t,n){return r=e,o=t,i=n,u=xe.fromDom(r.document),Wc(u,o,i).map(function(e){return gc.create(xe.fromDom(e.startContainer),e.startOffset,xe.fromDom(e.endContainer),e.endOffset)});var r,o,i,u},Kc=tinymce.util.Tools.resolve("tinymce.util.VK"),Jc=function(e,t,n,r){return el(e,t,dc(n),r)},$c=function(e,t,n,r){return el(e,t,mc(n),r)},Qc=function(e,t){var n=bc.exact(t,0,t,0);return Uc(n)},Zc=function(e,t){var n,r=qt(t,"tr");return(n=r,0===n.length?R.none():R.some(n[n.length-1])).bind(function(e){return Qt(e,"td,th").map(function(e){return Qc(0,e)})})},el=function(r,e,t,o,n){return t.fold(R.none,R.none,function(e,t){return Rn(t).map(function(e){return Qc(0,e)})},function(n){return cn.table(n,e).bind(function(e){var t=kr.noMenu(n);return r.undoManager.transact(function(){o.insertRowsAfter(e,t)}),Zc(0,e)})})},tl=["table","li","dl"],nl=function(t,n,r,o){if(t.keyCode===Kc.TAB){var i=Fu(n),u=function(e){var t=oe(e);return ft(e,i)||O(tl,t)},e=n.selection.getRng();if(e.collapsed){var a=xe.fromDom(e.startContainer);cn.cell(a,u).each(function(e){t.preventDefault(),(t.shiftKey?$c:Jc)(n,u,e,r,o).each(function(e){n.selection.setRng(e)})})}}},rl={create:q("selection","kill")},ol=function(e,t,n,r){return{start:C(pc.on(e,t)),finish:C(pc.on(n,r))}},il={convertToRange:function(e,t){var n=Dc(e,t);return gc.create(xe.fromDom(n.startContainer),n.startOffset,xe.fromDom(n.endContainer),n.endOffset)},makeSitus:ol},ul=function(n,e,r,t,o){return ft(r,t)?R.none():sr(r,t,e).bind(function(e){var t=e.boxes().getOr([]);return 0<t.length?(o(n,t,e.start(),e.finish()),R.some(rl.create(R.some(il.makeSitus(r,0,r,yn(r))),!0))):R.none()})},al={sync:function(n,r,e,t,o,i,u){return ft(e,o)&&t===i?R.none():Zt(e,"td,th",r).bind(function(t){return Zt(o,"td,th",r).bind(function(e){return ul(n,r,t,e,u)})})},detect:ul,update:function(e,t,n,r,o){return mr(r,e,t,o.firstSelectedSelector(),o.lastSelectedSelector()).map(function(e){return o.clear(n),o.selectRange(n,e.boxes(),e.start(),e.finish()),e.boxes()})}},cl=q("item","mode"),ll=function(e,t,n,r){return void 0===r&&(r=fl),e.property().parent(t).map(function(e){return cl(e,r)})},fl=function(e,t,n,r){return void 0===r&&(r=sl),n.sibling(e,t).map(function(e){return cl(e,r)})},sl=function(e,t,n,r){void 0===r&&(r=sl);var o=e.property().children(t);return n.first(o).map(function(e){return cl(e,r)})},dl=[{current:ll,next:fl,fallback:R.none()},{current:fl,next:sl,fallback:R.some(ll)},{current:sl,next:sl,fallback:R.some(fl)}],ml=function(t,n,r,o,e){return void 0===e&&(e=dl),B(e,function(e){return e.current===r}).bind(function(e){return e.current(t,n,o,e.next).orThunk(function(){return e.fallback.bind(function(e){return ml(t,n,e,o)})})})},gl=function(){return{sibling:function(e,t){return e.query().prevSibling(t)},first:function(e){return 0<e.length?R.some(e[e.length-1]):R.none()}}},hl=function(){return{sibling:function(e,t){return e.query().nextSibling(t)},first:function(e){return 0<e.length?R.some(e[0]):R.none()}}},pl=function(t,e,n,r,o,i){return ml(t,e,r,o).bind(function(e){return i(e.item())?R.none():n(e.item())?R.some(e.item()):pl(t,e.item(),n,e.mode(),o,i)})},vl=function(t){return function(e){return 0===t.property().children(e).length}},bl=function(e,t,n,r){return pl(e,t,n,fl,gl(),r)},wl=function(e,t,n,r){return pl(e,t,n,fl,hl(),r)},yl=$n(),xl=function(e,t){return r=t,bl(n=yl,e,vl(n),r);var n,r},Cl=function(e,t){return r=t,wl(n=yl,e,vl(n),r);var n,r},Rl=q("element","offset"),Sl=(q("element","deltaOffset"),q("element","start","finish"),q("begin","end"),q("element","text"),xr([{none:["message"]},{success:[]},{failedUp:["cell"]},{failedDown:["cell"]}])),Tl=function(e){return Zt(e,"tr")},Dl=wo(wo({},Sl),{verify:function(a,e,t,n,r,c,o){return Zt(n,"td,th",o).bind(function(u){return Zt(e,"td,th",o).map(function(i){return ft(u,i)?ft(n,u)&&yn(u)===r?c(i):Sl.none("in same cell"):ar.sharedOne(Tl,[u,i]).fold(function(){return t=i,n=u,r=(e=a).getRect(t),(o=e.getRect(n)).right>r.left&&o.left<r.right?Sl.success():c(i);var e,t,n,r,o},function(e){return c(i)})})}).getOr(Sl.none("default"))},cata:function(e,t,n,r,o){return e.fold(t,n,r,o)}}),Ol=(q("ancestor","descendants","element","index"),q("parent","children","element","index")),Nl=function(e,t){return W(e,b(ft,t))},El=function(e){return"br"===oe(e)},kl=function(e,t,n){return t(e,n).bind(function(e){return le(e)&&0===vn(e).trim().length?kl(e,t,n):R.some(e)})},Al=function(t,e,n,r){return(o=e,i=n,wt(o,i).filter(El).orThunk(function(){return wt(o,i-1).filter(El)})).bind(function(e){return r.traverse(e).fold(function(){return kl(e,r.gather,t).map(r.relative)},function(e){return(r=e,gt(r).bind(function(t){var n=bt(t);return Nl(n,r).map(function(e){return Ol(t,n,r,e)})})).map(function(e){return pc.on(e.parent(),e.index())});var r})});var o,i},Pl=function(e,t,n,r){var o,i,u;return(El(t)?(o=e,i=t,(u=r).traverse(i).orThunk(function(){return kl(i,u.gather,o)}).map(u.relative)):Al(e,t,n,r)).map(function(e){return{start:C(e),finish:C(e)}})},Il=function(e){return Dl.cata(e,function(e){return R.none()},function(){return R.none()},function(e){return R.some(Rl(e,0))},function(e){return R.some(Rl(e,yn(e)))})},Bl=J(["left","top","right","bottom"],[]),Wl={nu:Bl,moveUp:function(e,t){return Bl({left:e.left(),top:e.top()-t,right:e.right(),bottom:e.bottom()-t})},moveDown:function(e,t){return Bl({left:e.left(),top:e.top()+t,right:e.right(),bottom:e.bottom()+t})},moveBottomTo:function(e,t){var n=e.bottom()-e.top();return Bl({left:e.left(),top:t-n,right:e.right(),bottom:t})},moveTopTo:function(e,t){var n=e.bottom()-e.top();return Bl({left:e.left(),top:t,right:e.right(),bottom:t+n})},getTop:function(e){return e.top()},getBottom:function(e){return e.bottom()},translate:function(e,t,n){return Bl({left:e.left()+t,top:e.top()+n,right:e.right()+t,bottom:e.bottom()+n})},toString:function(e){return"("+e.left()+", "+e.top()+") -> ("+e.right()+", "+e.bottom()+")"}},Ml=function(e){return Wl.nu({left:e.left,top:e.top,right:e.right,bottom:e.bottom})},_l=function(e,t){return R.some(e.getRect(t))},Ll=function(e,t,n){return ce(t)?_l(e,t).map(Ml):le(t)?(r=e,o=t,i=n,0<=i&&i<yn(o)?r.getRangedRect(o,i,o,i+1):0<i?r.getRangedRect(o,i-1,o,i):R.none()).map(Ml):R.none();var r,o,i},Fl=function(e,t){return ce(t)?_l(e,t).map(Ml):le(t)?e.getRangedRect(t,0,t,yn(t)).map(Ml):R.none()},jl=xr([{none:[]},{retry:["caret"]}]),zl=function(t,e,r){return(n=e,o=Tu,Vt(function(e,t){return t(e)},Kt,n,o,i)).fold(C(!1),function(e){return Fl(t,e).exists(function(e){return n=e,(t=r).left()<n.left()||Math.abs(n.right()-t.left())<1||t.left()>n.right();var t,n})});var n,o,i},Hl={point:Wl.getTop,adjuster:function(e,t,n,r,o){var i=Wl.moveUp(o,5);return Math.abs(n.top()-r.top())<1?jl.retry(i):n.bottom()<o.top()?jl.retry(i):n.bottom()===o.top()?jl.retry(Wl.moveUp(o,1)):zl(e,t,o)?jl.retry(Wl.translate(i,5,0)):jl.none()},move:Wl.moveUp,gather:xl},Ul={point:Wl.getBottom,adjuster:function(e,t,n,r,o){var i=Wl.moveDown(o,5);return Math.abs(n.bottom()-r.bottom())<1?jl.retry(i):n.top()>o.bottom()?jl.retry(i):n.top()===o.bottom()?jl.retry(Wl.moveDown(o,1)):zl(e,t,o)?jl.retry(Wl.translate(i,5,0)):jl.none()},move:Wl.moveDown,gather:Cl},ql=function(n,r,o,i,u){return 0===u?R.some(i):(c=n,l=i.left(),f=r.point(i),c.elementFromPoint(l,f).filter(function(e){return"table"===oe(e)}).isSome()?(t=i,a=u-1,ql(n,e=r,o,e.move(t,5),a)):n.situsFromPoint(i.left(),r.point(i)).bind(function(e){return e.start().fold(R.none,function(t){return Fl(n,t).bind(function(e){return r.adjuster(n,t,e,o,i).fold(R.none,function(e){return ql(n,r,o,e,u-1)})}).orThunk(function(){return R.some(i)})},R.none)}));var e,t,a,c,l,f},Vl=function(t,n,e){var r,o,i,u=t.move(e,5),a=ql(n,t,e,u,100).getOr(u);return(r=t,o=a,i=n,r.point(o)>i.getInnerHeight()?R.some(r.point(o)-i.getInnerHeight()):r.point(o)<0?R.some(-r.point(o)):R.none()).fold(function(){return n.situsFromPoint(a.left(),t.point(a))},function(e){return n.scrollBy(0,e),n.situsFromPoint(a.left(),t.point(a)-e)})},Gl={tryUp:b(Vl,Hl),tryDown:b(Vl,Ul),ieTryUp:function(e,t){return e.situsFromPoint(t.left(),t.top()-5)},ieTryDown:function(e,t){return e.situsFromPoint(t.left(),t.bottom()+5)},getJumpSize:C(5)},Yl=it.detect(),Xl=function(r,o,i,u,a,c){return 0===c?R.none():$l(r,o,i,u,a).bind(function(e){var t=r.fromSitus(e),n=Dl.verify(r,i,u,t.finish(),t.foffset(),a.failure,o);return Dl.cata(n,function(){return R.none()},function(){return R.some(e)},function(e){return ft(i,e)&&0===u?Kl(r,i,u,Wl.moveUp,a):Xl(r,o,e,0,a,c-1)},function(e){return ft(i,e)&&u===yn(e)?Kl(r,i,u,Wl.moveDown,a):Xl(r,o,e,yn(e),a,c-1)})})},Kl=function(t,e,n,r,o){return Ll(t,e,n).bind(function(e){return Jl(t,o,r(e,Gl.getJumpSize()))})},Jl=function(e,t,n){return Yl.browser.isChrome()||Yl.browser.isSafari()||Yl.browser.isFirefox()||Yl.browser.isEdge()?t.otherRetry(e,n):Yl.browser.isIE()?t.ieRetry(e,n):R.none()},$l=function(t,e,n,r,o){return Ll(t,n,r).bind(function(e){return Jl(t,o,e)})},Ql=function(t,n,r){return(o=t,i=n,u=r,o.getSelection().bind(function(r){return Pl(i,r.finish(),r.foffset(),u).fold(function(){return R.some(Rl(r.finish(),r.foffset()))},function(e){var t=o.fromSitus(e),n=Dl.verify(o,r.finish(),r.foffset(),t.finish(),t.foffset(),u.failure,i);return Il(n)})})).bind(function(e){return Xl(t,n,e.element(),e.offset(),r,20).map(t.fromSitus)});var o,i,u},Zl=it.detect(),ef=function(e,t){return Kt(e,function(e){return gt(e).exists(function(e){return ft(e,t)})},n).isSome();var n},tf=function(t,r,o,e,i){return Zt(e,"td,th",r).bind(function(n){return Zt(n,"table",r).bind(function(e){return ef(i,e)?Ql(t,r,o).bind(function(t){return Zt(t.finish(),"td,th",r).map(function(e){return{start:C(n),finish:C(e),range:C(t)}})}):R.none()})})},nf=function(e,t,n,r,o,i){return Zl.browser.isIE()?R.none():i(r,t).orThunk(function(){return tf(e,t,n,r,o).map(function(e){var t=e.range();return rl.create(R.some(il.makeSitus(t.start(),t.soffset(),t.finish(),t.foffset())),!0)})})},rf=function(e,t,n,r,o,i,u){return tf(e,n,r,o,i).bind(function(e){return al.detect(t,n,e.start(),e.finish(),u)})},of=function(e,u){return Zt(e,"tr",u).bind(function(i){return Zt(i,"table",u).bind(function(e){var t,n,r,o=qt(e,"tr");return ft(i,o[0])?(t=e,n=function(e){return Sn(e).isSome()},r=u,bl(yl,t,n,r)).map(function(e){var t=yn(e);return rl.create(R.some(il.makeSitus(e,t,e,t)),!0)}):R.none()})})},uf=function(e,u){return Zt(e,"tr",u).bind(function(i){return Zt(i,"table",u).bind(function(e){var t,n,r,o=qt(e,"tr");return ft(i,o[o.length-1])?(t=e,n=function(e){return Rn(e).isSome()},r=u,wl(yl,t,n,r)).map(function(e){return rl.create(R.some(il.makeSitus(e,0,e,0)),!0)}):R.none()})})},af=function(e,t){return Zt(e,"td,th",t)},cf={down:{traverse:vt,gather:Cl,relative:pc.before,otherRetry:Gl.tryDown,ieRetry:Gl.ieTryDown,failure:Dl.failedDown},up:{traverse:pt,gather:xl,relative:pc.before,otherRetry:Gl.tryUp,ieRetry:Gl.ieTryUp,failure:Dl.failedUp}},lf=function(t){return function(e){return e===t}},ff=lf(38),sf=lf(40),df={ltr:{isBackward:lf(37),isForward:lf(39)},rtl:{isBackward:lf(39),isForward:lf(37)},isUp:ff,isDown:sf,isNavigation:function(e){return 37<=e&&e<=40}},mf=function(e){return{left:e.left(),top:e.top(),right:e.right(),bottom:e.bottom(),width:e.width(),height:e.height()}},gf=(it.detect().browser.isSafari(),function(a){return{elementFromPoint:function(e,t){return xe.fromPoint(xe.fromDom(a.document),e,t)},getRect:function(e){return e.dom().getBoundingClientRect()},getRangedRect:function(e,t,n,r){var o=bc.exact(e,t,n,r);return Yc(a,o).map(mf)},getSelection:function(){return Gc(a).map(function(e){return il.convertToRange(a,e)})},fromSitus:function(e){var t=bc.relative(e.start(),e.finish());return il.convertToRange(a,t)},situsFromPoint:function(e,t){return Xc(a,e,t).map(function(e){return ol(e.start(),e.soffset(),e.finish(),e.foffset())})},clearSelection:function(){a.getSelection().removeAllRanges()},setSelection:function(e){var t,n,r,o,i,u;t=a,n=e.start(),r=e.soffset(),o=e.finish(),i=e.foffset(),u=Lc(n,r,o,i),Hc(t,u)},setRelativeSelection:function(e,t){var n,r;n=a,r=_c(e,t),Hc(n,r)},selectContents:function(e){Vc(a,e)},getInnerHeight:function(){return a.innerHeight},getScrollY:function(){var e,t,n,r;return(e=xe.fromDom(a.document),t=e!==undefined?e.dom():m.document,n=t.body.scrollLeft||t.documentElement.scrollLeft,r=t.body.scrollTop||t.documentElement.scrollTop,eo(n,r)).top()},scrollBy:function(e,t){var n,r,o;n=e,r=t,((o=xe.fromDom(a.document))!==undefined?o.dom():m.document).defaultView.scrollBy(n,r)}}}),hf=q("rows","cols"),pf={mouse:function(e,t,n,r){var o,i,u,a,c,l,f=gf(e),s=(o=f,i=t,u=n,a=r,c=R.none(),l=function(){c=R.none()},{mousedown:function(e){a.clear(i),c=af(e.target(),u)},mouseover:function(e){c.each(function(r){a.clear(i),af(e.target(),u).each(function(n){sr(r,n,u).each(function(e){var t=e.boxes().getOr([]);(1<t.length||1===t.length&&!ft(r,n))&&(a.selectRange(i,t,e.start(),e.finish()),o.selectContents(n))})})})},mouseup:function(e){c.each(l)}});return{mousedown:s.mousedown,mouseover:s.mouseover,mouseup:s.mouseup}},keyboard:function(e,l,f,s){var d=gf(e),m=function(){return s.clear(l),R.none()};return{keydown:function(e,t,n,r,o,i){var u=e.raw(),a=u.which,c=!0===u.shiftKey;return dr(l,s.selectedSelector()).fold(function(){return df.isDown(a)&&c?b(rf,d,l,f,cf.down,r,t,s.selectRange):df.isUp(a)&&c?b(rf,d,l,f,cf.up,r,t,s.selectRange):df.isDown(a)?b(nf,d,f,cf.down,r,t,uf):df.isUp(a)?b(nf,d,f,cf.up,r,t,of):R.none},function(t){var e=function(e){return function(){return xo(e,function(e){return al.update(e.rows(),e.cols(),l,t,s)}).fold(function(){return gr(l,s.firstSelectedSelector(),s.lastSelectedSelector()).map(function(e){var t=df.isDown(a)||i.isForward(a)?pc.after:pc.before;return d.setRelativeSelection(pc.on(e.first(),0),t(e.table())),s.clear(l),rl.create(R.none(),!0)})},function(e){return R.some(rl.create(R.none(),!0))})}};return df.isDown(a)&&c?e([hf(1,0)]):df.isUp(a)&&c?e([hf(-1,0)]):i.isBackward(a)&&c?e([hf(0,-1),hf(-1,0)]):i.isForward(a)&&c?e([hf(0,1),hf(1,0)]):df.isNavigation(a)&&!1===c?m:R.none})()},keyup:function(n,r,o,i,u){return dr(l,s.selectedSelector()).fold(function(){var e=n.raw(),t=e.which;return 0==(!0===e.shiftKey)?R.none():df.isNavigation(t)?al.sync(l,f,r,o,i,u,s.selectRange):R.none()},R.none)}}}},vf=function(r,e){k(e,function(e){var t,n;n=e,Do(t=r)?t.dom().classList.remove(n):No(t,n),ko(t)})},bf={byClass:function(o){var t,n,i=(t=o.selected(),function(e){Eo(e,t)}),r=(n=[o.selected(),o.lastSelected(),o.firstSelected()],function(e){vf(e,n)}),u=function(e){var t=qt(e,o.selectedSelector());k(t,r)};return{clear:u,selectRange:function(e,t,n,r){u(e),k(t,i),Eo(n,o.firstSelected()),Eo(r,o.lastSelected())},selectedSelector:o.selectedSelector,firstSelectedSelector:o.firstSelectedSelector,lastSelectedSelector:o.lastSelectedSelector}},byAttr:function(o){var n=function(e){he(e,o.selected()),he(e,o.firstSelected()),he(e,o.lastSelected())},i=function(e){se(e,o.selected(),"1")},u=function(e){var t=qt(e,o.selectedSelector());k(t,n)};return{clear:u,selectRange:function(e,t,n,r){u(e),k(t,i),se(n,o.firstSelected(),"1"),se(r,o.lastSelected(),"1")},selectedSelector:o.selectedSelector,firstSelectedSelector:o.firstSelectedSelector,lastSelectedSelector:o.lastSelectedSelector}}},wf=function(e){return!1===Ao(xe.fromDom(e.target),"ephox-snooker-resizer-bar")};function yf(h,p){var v=J(["mousedown","mouseover","mouseup","keyup","keydown"],[]),b=R.none(),w=bf.byAttr(yr);return h.on("init",function(e){var r=h.getWin(),o=Fu(h),t=Hu(h),n=pf.mouse(r,o,t,w),a=pf.keyboard(r,o,t,w),c=function(e,t){!0===e.raw().shiftKey&&(t.kill()&&e.kill(),t.selection().each(function(e){var t=bc.relative(e.start(),e.finish()),n=Dc(r,t);h.selection.setRng(n)}))},i=function(e){var t=f(e);if(t.raw().shiftKey&&df.isNavigation(t.raw().which)){var n=h.selection.getRng(),r=xe.fromDom(n.startContainer),o=xe.fromDom(n.endContainer);a.keyup(t,r,n.startOffset,o,n.endOffset).each(function(e){c(t,e)})}},u=function(e){var t=f(e);p().each(function(e){e.hideBars()});var n=h.selection.getRng(),r=xe.fromDom(h.selection.getStart()),o=xe.fromDom(n.startContainer),i=xe.fromDom(n.endContainer),u=Yu.directionAt(r).isRtl()?df.rtl:df.ltr;a.keydown(t,o,n.startOffset,i,n.endOffset,u).each(function(e){c(t,e)}),p().each(function(e){e.showBars()})},l=function(e){return e.hasOwnProperty("x")&&e.hasOwnProperty("y")},f=function(e){var t=xe.fromDom(e.target),n=function(){e.stopPropagation()},r=function(){e.preventDefault()},o=x(r,n);return{target:C(t),x:C(l(e)?e.x:null),y:C(l(e)?e.y:null),stop:n,prevent:r,kill:o,raw:C(e)}},s=function(e){return 0===e.button},d=function(e){s(e)&&wf(e)&&n.mousedown(f(e))},m=function(e){var t;((t=e).buttons===undefined||Sa.ie&&12<=Sa.ie&&0===t.buttons||0!=(1&t.buttons))&&wf(e)&&n.mouseover(f(e))},g=function(e){s(e)&&wf(e)&&n.mouseup(f(e))};h.on("mousedown",d),h.on("mouseover",m),h.on("mouseup",g),h.on("keyup",i),h.on("keydown",u),h.on("nodechange",function(){var e=h.selection,t=xe.fromDom(e.getStart()),n=xe.fromDom(e.getEnd());ar.sharedOne(cn.table,[t,n]).fold(function(){w.clear(o)},y)}),b=R.some(v({mousedown:d,mouseover:m,mouseup:g,keyup:i,keydown:u}))}),{clear:w.clear,destroy:function(){b.each(function(e){})}}}var xf=sa.each,Cf=function(t){var n=[];function e(e){return function(){t.execCommand(e)}}xf("inserttable tableprops deletetable | cell row column".split(" "),function(e){"|"===e?n.push({text:"-"}):n.push(t.menuItems[e])}),t.addButton("table",{type:"menubutton",title:"Table",menu:n}),t.addButton("tableprops",{title:"Table properties",onclick:e("mceTableProps"),icon:"table"}),t.addButton("tabledelete",{title:"Delete table",onclick:e("mceTableDelete")}),t.addButton("tablecellprops",{title:"Cell properties",onclick:e("mceTableCellProps")}),t.addButton("tablemergecells",{title:"Merge cells",onclick:e("mceTableMergeCells")}),t.addButton("tablesplitcells",{title:"Split cell",onclick:e("mceTableSplitCells")}),t.addButton("tableinsertrowbefore",{title:"Insert row before",onclick:e("mceTableInsertRowBefore")}),t.addButton("tableinsertrowafter",{title:"Insert row after",onclick:e("mceTableInsertRowAfter")}),t.addButton("tabledeleterow",{title:"Delete row",onclick:e("mceTableDeleteRow")}),t.addButton("tablerowprops",{title:"Row properties",onclick:e("mceTableRowProps")}),t.addButton("tablecutrow",{title:"Cut row",onclick:e("mceTableCutRow")}),t.addButton("tablecopyrow",{title:"Copy row",onclick:e("mceTableCopyRow")}),t.addButton("tablepasterowbefore",{title:"Paste row before",onclick:e("mceTablePasteRowBefore")}),t.addButton("tablepasterowafter",{title:"Paste row after",onclick:e("mceTablePasteRowAfter")}),t.addButton("tableinsertcolbefore",{title:"Insert column before",onclick:e("mceTableInsertColBefore")}),t.addButton("tableinsertcolafter",{title:"Insert column after",onclick:e("mceTableInsertColAfter")}),t.addButton("tabledeletecol",{title:"Delete column",onclick:e("mceTableDeleteCol")})},Rf=function(t){var e,n=""===(e=t.getParam("table_toolbar",Xu))||!1===e?[]:d(e)?e.split(/[ ,]/):h(e)?e:[];0<n.length&&t.addContextToolbar(function(e){return t.dom.is(e,"table")&&t.getBody().contains(e)},n.join(" "))},Sf=function(o,n){var r=R.none(),i=[],u=[],a=[],c=[],l=function(e){e.disabled(!0)},f=function(e){e.disabled(!1)},e=function(){var t=this;i.push(t),r.fold(function(){l(t)},function(e){f(t)})},t=function(){var t=this;u.push(t),r.fold(function(){l(t)},function(e){f(t)})};o.on("init",function(){o.on("nodechange",function(e){var t=R.from(o.dom.getParent(o.selection.getStart(),"th,td"));(r=t.bind(function(e){var t=xe.fromDom(e);return cn.table(t).map(function(e){return kr.forMenu(n,e,t)})})).fold(function(){k(i,l),k(u,l),k(a,l),k(c,l)},function(t){k(i,f),k(u,f),k(a,function(e){e.disabled(t.mergable().isNone())}),k(c,function(e){e.disabled(t.unmergable().isNone())})})})});var s=function(e,t,n,r){var o,i,u,a,c,l=r.getEl().getElementsByTagName("table")[0],f=r.isRtl()||"tl-tr"===r.parent().rel;for(l.nextSibling.innerHTML=t+1+" x "+(n+1),f&&(t=9-t),i=0;i<10;i++)for(o=0;o<10;o++)a=l.rows[i].childNodes[o].firstChild,c=(f?t<=o:o<=t)&&i<=n,e.dom.toggleClass(a,"mce-active",c),c&&(u=a);return u.parentNode},d=!1===o.getParam("table_grid",!0,"boolean")?{text:"Table",icon:"table",context:"table",onclick:m("mceInsertTable")}:{text:"Table",icon:"table",context:"table",ariaHideMenu:!0,onclick:function(e){e.aria&&(this.parent().hideAll(),e.stopImmediatePropagation(),o.execCommand("mceInsertTable"))},onshow:function(){s(o,0,0,this.menu.items()[0])},onhide:function(){var e=this.menu.items()[0].getEl().getElementsByTagName("a");o.dom.removeClass(e,"mce-active"),o.dom.addClass(e[0],"mce-active")},menu:[{type:"container",html:function(){var e="";e='<table role="grid" class="mce-grid mce-grid-border" aria-readonly="true">';for(var t=0;t<10;t++){e+="<tr>";for(var n=0;n<10;n++)e+='<td role="gridcell" tabindex="-1"><a id="mcegrid'+(10*t+n)+'" href="#" data-mce-x="'+n+'" data-mce-y="'+t+'"></a></td>';e+="</tr>"}return e+="</table>",e+='<div class="mce-text-center" role="presentation">1 x 1</div>'}(),onPostRender:function(){this.lastX=this.lastY=0},onmousemove:function(e){var t,n,r=e.target;"A"===r.tagName.toUpperCase()&&(t=parseInt(r.getAttribute("data-mce-x"),10),n=parseInt(r.getAttribute("data-mce-y"),10),(this.isRtl()||"tl-tr"===this.parent().rel)&&(t=9-t),t===this.lastX&&n===this.lastY||(s(o,t,n,e.control),this.lastX=t,this.lastY=n))},onclick:function(e){var t=this;"A"===e.target.tagName.toUpperCase()&&(e.preventDefault(),e.stopPropagation(),t.parent().cancel(),o.undoManager.transact(function(){Na(o,t.lastX+1,t.lastY+1)}),o.addVisual())}}]};function m(e){return function(){o.execCommand(e)}}var g={text:"Table properties",context:"table",onPostRender:e,onclick:m("mceTableProps")},h={text:"Delete table",context:"table",onPostRender:e,cmd:"mceTableDelete"},p={text:"Row",context:"table",menu:[{text:"Insert row before",onclick:m("mceTableInsertRowBefore"),onPostRender:t},{text:"Insert row after",onclick:m("mceTableInsertRowAfter"),onPostRender:t},{text:"Delete row",onclick:m("mceTableDeleteRow"),onPostRender:t},{text:"Row properties",onclick:m("mceTableRowProps"),onPostRender:t},{text:"-"},{text:"Cut row",onclick:m("mceTableCutRow"),onPostRender:t},{text:"Copy row",onclick:m("mceTableCopyRow"),onPostRender:t},{text:"Paste row before",onclick:m("mceTablePasteRowBefore"),onPostRender:t},{text:"Paste row after",onclick:m("mceTablePasteRowAfter"),onPostRender:t}]},v={text:"Column",context:"table",menu:[{text:"Insert column before",onclick:m("mceTableInsertColBefore"),onPostRender:t},{text:"Insert column after",onclick:m("mceTableInsertColAfter"),onPostRender:t},{text:"Delete column",onclick:m("mceTableDeleteCol"),onPostRender:t}]},b={separator:"before",text:"Cell",context:"table",menu:[{text:"Cell properties",onclick:m("mceTableCellProps"),onPostRender:t},{text:"Merge cells",onclick:m("mceTableMergeCells"),onPostRender:function(){var t=this;a.push(t),r.fold(function(){l(t)},function(e){t.disabled(e.mergable().isNone())})}},{text:"Split cell",onclick:m("mceTableSplitCells"),onPostRender:function(){var t=this;c.push(t),r.fold(function(){l(t)},function(e){t.disabled(e.unmergable().isNone())})}}]};o.addMenuItem("inserttable",d),o.addMenuItem("tableprops",g),o.addMenuItem("deletetable",h),o.addMenuItem("row",p),o.addMenuItem("column",v),o.addMenuItem("cell",b)},Tf=function(n,r){return{insertTable:function(e,t){return Na(n,e,t)},setClipboardRows:function(e){return t=r,n=E(e,xe.fromDom),void t.set(R.from(n));var t,n},getClipboardRows:function(){return r.get().fold(function(){},function(e){return E(e,function(e){return e.dom()})})}}};e.add("table",function(t){var n,r=cc(t),e=yf(t,r.lazyResize),o=la(t,r.lazyWire),i=(n=t,{get:function(){var e=Fu(n);return hr(e,yr.selectedSelector()).fold(function(){return n.selection.getStart()===undefined?Rr.none():Rr.single(n.selection)},function(e){return Rr.multiple(e)})}}),u=lu(R.none());return Ba(t,o,e,i,u),Ar(t,i,o,e),Sf(t,i),Cf(t),Rf(t),t.on("PreInit",function(){t.serializer.addTempAttr(yr.firstSelected()),t.serializer.addTempAttr(yr.lastSelected())}),t.getParam("table_tab_navigation",!0,"boolean")&&t.on("keydown",function(e){nl(e,t,o,r.lazyWire)}),t.on("remove",function(){r.destroy(),e.destroy()}),Tf(t,u)})}(window);
\ No newline at end of file
diff --git a/lib/web/tiny_mce_4/plugins/textpattern/plugin.min.js b/lib/web/tiny_mce_4/plugins/textpattern/plugin.min.js
index c6ce64d0c8574..03f872a74e3a6 100644
--- a/lib/web/tiny_mce_4/plugins/textpattern/plugin.min.js
+++ b/lib/web/tiny_mce_4/plugins/textpattern/plugin.min.js
@@ -1 +1 @@
-!function(l){"use strict";var t,n,e,r,a,o=function(t){var n=t,e=function(){return n};return{get:e,set:function(t){n=t},clone:function(){return o(e())}}},i=tinymce.util.Tools.resolve("tinymce.PluginManager"),f=function(t){return function(){return t}},u=f(!1),s=f(!0),c=u,d=s,g=function(){return m},m=(r={fold:function(t,n){return t()},is:c,isSome:c,isNone:d,getOr:e=function(t){return t},getOrThunk:n=function(t){return t()},getOrDie:function(t){throw new Error(t||"error: getOrDie called on none.")},getOrNull:function(){return null},getOrUndefined:function(){return undefined},or:e,orThunk:n,map:g,ap:g,each:function(){},bind:g,flatten:g,exists:c,forall:d,filter:g,equals:t=function(t){return t.isNone()},equals_:t,toArray:function(){return[]},toString:f("none()")},Object.freeze&&Object.freeze(r),r),h=function(e){var t=function(){return e},n=function(){return a},r=function(t){return t(e)},a={fold:function(t,n){return n(e)},is:function(t){return e===t},isSome:d,isNone:c,getOr:t,getOrThunk:t,getOrDie:t,getOrNull:t,getOrUndefined:t,or:n,orThunk:n,map:function(t){return h(t(e))},ap:function(t){return t.fold(g,function(t){return h(t(e))})},each:function(t){t(e)},bind:r,flatten:t,exists:r,forall:r,filter:function(t){return t(e)?a:m},equals:function(t){return t.is(e)},equals_:function(t,n){return t.fold(c,function(t){return n(e,t)})},toArray:function(){return[e]},toString:function(){return"some("+e+")"}};return a},p={some:h,none:g,from:function(t){return null===t||t===undefined?m:h(t)}},v=(a="function",function(t){return function(t){if(null===t)return"null";var n=typeof t;return"object"===n&&(Array.prototype.isPrototypeOf(t)||t.constructor&&"Array"===t.constructor.name)?"array":"object"===n&&(String.prototype.isPrototypeOf(t)||t.constructor&&"String"===t.constructor.name)?"string":n}(t)===a}),O=Array.prototype.slice,y=function(t,n){for(var e=[],r=0,a=t.length;r<a;r++){var o=t[r];n(o,r,t)&&e.push(o)}return e},P=(v(Array.from)&&Array.from,Object.hasOwnProperty),x=function(t,n){return P.call(t,n)},T=function(t){return x(t,"start")&&x(t,"end")},b=function(t){return!x(t,"end")&&!x(t,"replacement")},k=function(t){return x(t,"replacement")},C=function(t){return n=t,e=function(t,n){return t.start.length===n.start.length?0:t.start.length>n.start.length?-1:1},(r=O.call(n,0)).sort(e),r;var n,e,r},D=function(t){return{inlinePatterns:C(y(t,T)),blockPatterns:C(y(t,b)),replacementPatterns:y(t,k)}},S=function(n){return{setPatterns:function(t){n.set(D(t))},getPatterns:function(){return n.get().inlinePatterns.concat(n.get().blockPatterns,n.get().replacementPatterns)}}},A=[{start:"*",end:"*",format:"italic"},{start:"**",end:"**",format:"bold"},{start:"***",end:"***",format:["bold","italic"]},{start:"#",format:"h1"},{start:"##",format:"h2"},{start:"###",format:"h3"},{start:"####",format:"h4"},{start:"#####",format:"h5"},{start:"######",format:"h6"},{start:"1. ",cmd:"InsertOrderedList"},{start:"* ",cmd:"InsertUnorderedList"},{start:"- ",cmd:"InsertUnorderedList"}],N=function(t){var n,e,r=(n=t,e="textpattern_patterns",x(n,e)?p.from(n[e]):p.none()).getOr(A);return D(r)},R=tinymce.util.Tools.resolve("tinymce.util.Delay"),w=tinymce.util.Tools.resolve("tinymce.util.VK"),I=tinymce.util.Tools.resolve("tinymce.dom.TreeWalker"),j=tinymce.util.Tools.resolve("tinymce.util.Tools"),E=function(t,n){for(var e=0;e<t.length;e++){var r=t[e];if(0===n.indexOf(r.start)&&(!r.end||n.lastIndexOf(r.end)===n.length-r.end.length))return r}},q=function(t,n,e){if(!1!==n.collapsed){var r=n.startContainer,a=r.data,o=!0===e?1:0;if(3===r.nodeType){var i=function(t,n,e,r){var a,o,i,f,u,s;for(o=0;o<t.length;o++)if((a=t[o]).end!==undefined&&(f=a,u=e,s=r,n.substr(u-f.end.length-s,f.end.length)===f.end)&&0<e-r-(i=a).end.length-i.start.length)return a}(t,a,n.startOffset,o);if(i!==undefined){var f=a.lastIndexOf(i.end,n.startOffset-o),u=a.lastIndexOf(i.start,f-i.end.length);if(f=a.indexOf(i.end,u+i.start.length),-1!==u){var s=l.document.createRange();s.setStart(r,u),s.setEnd(r,f+i.end.length);var c=E(t,s.toString());if(!(i===undefined||c!==i||r.data.length<=i.start.length+i.end.length))return{pattern:i,startOffset:u,endOffset:f}}}}}},L=function(t){return t&&3===t.nodeType},M=function(t,n,e){var r=t.dom.createRng();r.setStart(n,e),r.setEnd(n,e),t.selection.setRng(r)},U=function(n,t,e){var r=n.selection.getRng();return p.from(q(t,r,e)).map(function(t){return function(a,o,i,f){var u=j.isArray(i.pattern.format)?i.pattern.format:[i.pattern.format];if(0!==j.grep(u,function(t){var n=a.formatter.get(t);return n&&n[0].inline}).length)return a.undoManager.transact(function(){var t,n,e,r;t=o,n=i.pattern,e=i.endOffset,r=i.startOffset,(t=0<r?t.splitText(r):t).splitText(e-r+n.end.length),t.deleteData(0,n.start.length),t.deleteData(t.data.length-n.end.length,n.end.length),o=t,f&&a.selection.setCursorLocation(o.nextSibling,1),u.forEach(function(t){a.formatter.apply(t,{},o)})}),o}(n,r.startContainer,t,e)})},_=function(s,t,c){var n=s.selection.getRng(),l=n.startContainer;n.collapsed&&L(l)&&function(t,n,e){for(var r=0;r<t.length;r++){var a=e.lastIndexOf(t[r].start,n);if(-1!==a)return p.some({pattern:t[r],startOffset:a})}return p.none()}(t,n.startOffset,l.data).each(function(t){var n,e,r,a,o,i,f,u=c?p.some((n=l,r=(e=t).startOffset+e.pattern.start.length,a=n.data.slice(r,r+1),n.deleteData(r,1),a)):p.none();o=s,f=t,(i=l).deleteData(f.startOffset,f.pattern.start.length),o.insertContent(f.pattern.replacement),p.from(i.nextSibling).filter(L).each(function(t){t.insertData(0,i.data),o.dom.remove(i)}),u.each(function(t){return function(t,n){var e=t.selection.getRng(),r=e.startContainer;if(L(r)){var a=e.startOffset;r.insertData(a,n),M(t,r,a+n.length)}else{var o=t.dom.doc.createTextNode(n);e.insertNode(o),M(t,o,o.length)}}(s,t)})})},z=function(t,n,e){for(var r=0;r<t.length;r++)if(e(t[r],n))return!0},K=function(t,n){var e,r,a,o;e=t,r=n.replacementPatterns,_(e,r,!1),a=t,o=n.inlinePatterns,U(a,o,!1).each(function(t){M(a,t,t.data.length)}),function(t,n){var e,r,a,o,i,f,u,s,c,l,d;if(e=t.selection,r=t.dom,e.isCollapsed()&&(u=r.getParent(e.getStart(),"p"))){for(c=new I(u,u);i=c.next();)if(L(i)){o=i;break}if(o){if(!(s=E(n,o.data)))return;if(a=(l=e.getRng(!0)).startContainer,d=l.startOffset,o===a&&(d=Math.max(0,d-s.start.length)),j.trim(o.data).length===s.start.length)return;s.format&&(f=t.formatter.get(s.format))&&f[0].block&&(o.deleteData(0,s.start.length),t.formatter.apply(s.format,{},o),l.setStart(a,d),l.collapse(!0),e.setRng(l)),s.cmd&&t.undoManager.transact(function(){o.deleteData(0,s.start.length),t.execCommand(s.cmd)})}}}(t,n.blockPatterns)},V=function(t,n){var e,r,a,o;e=t,r=n.replacementPatterns,_(e,r,!0),a=t,o=n.inlinePatterns,U(a,o,!0).each(function(t){var n=t.data.slice(-1);if(/[\u00a0 ]/.test(n)){t.deleteData(t.data.length-1,1);var e=a.dom.doc.createTextNode(n);a.dom.insertAfter(e,t.parentNode),M(a,e,1)}})},W=function(t,n){return z(t,n,function(t,n){return t.charCodeAt(0)===n.charCode})},B=function(t,n){return z(t,n,function(t,n){return t===n.keyCode&&!1===w.modifierPressed(n)})},F=function(n,e){var r=[",",".",";",":","!","?"],a=[32];n.on("keydown",function(t){13!==t.keyCode||w.modifierPressed(t)||K(n,e.get())},!0),n.on("keyup",function(t){B(a,t)&&V(n,e.get())}),n.on("keypress",function(t){W(r,t)&&R.setEditorTimeout(n,function(){V(n,e.get())})})};i.add("textpattern",function(t){var n=o(N(t.settings));return F(t,n),S(n)})}(window);
\ No newline at end of file
+!function(l){"use strict";var t,n,e,r,a,o=function(t){var n=t,e=function(){return n};return{get:e,set:function(t){n=t},clone:function(){return o(e())}}},i=tinymce.util.Tools.resolve("tinymce.PluginManager"),f=function(){},u=function(t){return function(){return t}},s=u(!1),c=u(!0),d=function(){return g},g=(t=function(t){return t.isNone()},r={fold:function(t,n){return t()},is:s,isSome:s,isNone:c,getOr:e=function(t){return t},getOrThunk:n=function(t){return t()},getOrDie:function(t){throw new Error(t||"error: getOrDie called on none.")},getOrNull:u(null),getOrUndefined:u(undefined),or:e,orThunk:n,map:d,each:f,bind:d,exists:s,forall:c,filter:d,equals:t,equals_:t,toArray:function(){return[]},toString:u("none()")},Object.freeze&&Object.freeze(r),r),m=function(e){var t=u(e),n=function(){return a},r=function(t){return t(e)},a={fold:function(t,n){return n(e)},is:function(t){return e===t},isSome:c,isNone:s,getOr:t,getOrThunk:t,getOrDie:t,getOrNull:t,getOrUndefined:t,or:n,orThunk:n,map:function(t){return m(t(e))},each:function(t){t(e)},bind:r,exists:r,forall:r,filter:function(t){return t(e)?a:g},toArray:function(){return[e]},toString:function(){return"some("+e+")"},equals:function(t){return t.is(e)},equals_:function(t,n){return t.fold(s,function(t){return n(e,t)})}};return a},h={some:m,none:d,from:function(t){return null===t||t===undefined?g:m(t)}},p=(a="function",function(t){return function(t){if(null===t)return"null";var n=typeof t;return"object"===n&&(Array.prototype.isPrototypeOf(t)||t.constructor&&"Array"===t.constructor.name)?"array":"object"===n&&(String.prototype.isPrototypeOf(t)||t.constructor&&"String"===t.constructor.name)?"string":n}(t)===a}),v=Array.prototype.slice,y=function(t,n){for(var e=[],r=0,a=t.length;r<a;r++){var o=t[r];n(o,r)&&e.push(o)}return e},O=(p(Array.from)&&Array.from,Object.hasOwnProperty),P=function(t,n){return O.call(t,n)},x=function(t){return P(t,"start")&&P(t,"end")},T=function(t){return!P(t,"end")&&!P(t,"replacement")},b=function(t){return P(t,"replacement")},k=function(t){return n=t,e=function(t,n){return t.start.length===n.start.length?0:t.start.length>n.start.length?-1:1},(r=v.call(n,0)).sort(e),r;var n,e,r},C=function(t){return{inlinePatterns:k(y(t,x)),blockPatterns:k(y(t,T)),replacementPatterns:y(t,b)}},D=function(n){return{setPatterns:function(t){n.set(C(t))},getPatterns:function(){return function(){for(var t=0,n=0,e=arguments.length;n<e;n++)t+=arguments[n].length;var r=Array(t),a=0;for(n=0;n<e;n++)for(var o=arguments[n],i=0,f=o.length;i<f;i++,a++)r[a]=o[i];return r}(n.get().inlinePatterns,n.get().blockPatterns,n.get().replacementPatterns)}}},S=[{start:"*",end:"*",format:"italic"},{start:"**",end:"**",format:"bold"},{start:"***",end:"***",format:["bold","italic"]},{start:"#",format:"h1"},{start:"##",format:"h2"},{start:"###",format:"h3"},{start:"####",format:"h4"},{start:"#####",format:"h5"},{start:"######",format:"h6"},{start:"1. ",cmd:"InsertOrderedList"},{start:"* ",cmd:"InsertUnorderedList"},{start:"- ",cmd:"InsertUnorderedList"}],A=function(t){var n,e,r=(n=t,e="textpattern_patterns",P(n,e)?h.from(n[e]):h.none()).getOr(S);return C(r)},N=tinymce.util.Tools.resolve("tinymce.util.Delay"),R=tinymce.util.Tools.resolve("tinymce.util.VK"),w=tinymce.util.Tools.resolve("tinymce.dom.TreeWalker"),I=tinymce.util.Tools.resolve("tinymce.util.Tools"),j=function(t,n){for(var e=0;e<t.length;e++){var r=t[e];if(0===n.indexOf(r.start)&&(!r.end||n.lastIndexOf(r.end)===n.length-r.end.length))return r}},E=function(t,n,e){if(!1!==n.collapsed){var r=n.startContainer,a=r.data,o=!0===e?1:0;if(3===r.nodeType){var i=function(t,n,e,r){var a,o,i,f,u,s;for(o=0;o<t.length;o++)if((a=t[o]).end!==undefined&&(f=a,u=e,s=r,n.substr(u-f.end.length-s,f.end.length)===f.end)&&0<e-r-(i=a).end.length-i.start.length)return a}(t,a,n.startOffset,o);if(i!==undefined){var f=a.lastIndexOf(i.end,n.startOffset-o),u=a.lastIndexOf(i.start,f-i.end.length);if(f=a.indexOf(i.end,u+i.start.length),-1!==u){var s=l.document.createRange();s.setStart(r,u),s.setEnd(r,f+i.end.length);var c=j(t,s.toString());if(!(i===undefined||c!==i||r.data.length<=i.start.length+i.end.length))return{pattern:i,startOffset:u,endOffset:f}}}}}},q=function(t){return t&&3===t.nodeType},L=function(t,n,e){var r=t.dom.createRng();r.setStart(n,e),r.setEnd(n,e),t.selection.setRng(r)},M=function(n,t,e){var r=n.selection.getRng();return h.from(E(t,r,e)).map(function(t){return function(a,o,i,f){var u=I.isArray(i.pattern.format)?i.pattern.format:[i.pattern.format];if(0!==I.grep(u,function(t){var n=a.formatter.get(t);return n&&n[0].inline}).length)return a.undoManager.transact(function(){var t,n,e,r;t=o,n=i.pattern,e=i.endOffset,r=i.startOffset,(t=0<r?t.splitText(r):t).splitText(e-r+n.end.length),t.deleteData(0,n.start.length),t.deleteData(t.data.length-n.end.length,n.end.length),o=t,f&&a.selection.setCursorLocation(o.nextSibling,1),u.forEach(function(t){a.formatter.apply(t,{},o)})}),o}(n,r.startContainer,t,e)})},U=function(s,t,c){var n=s.selection.getRng(),l=n.startContainer;n.collapsed&&q(l)&&function(t,n,e){for(var r=0;r<t.length;r++){var a=e.lastIndexOf(t[r].start,n);if(-1!==a)return h.some({pattern:t[r],startOffset:a})}return h.none()}(t,n.startOffset,l.data).each(function(t){var n,e,r,a,o,i,f,u=c?h.some((n=l,r=(e=t).startOffset+e.pattern.start.length,a=n.data.slice(r,r+1),n.deleteData(r,1),a)):h.none();o=s,f=t,(i=l).deleteData(f.startOffset,f.pattern.start.length),o.insertContent(f.pattern.replacement),h.from(i.nextSibling).filter(q).each(function(t){t.insertData(0,i.data),o.dom.remove(i)}),u.each(function(t){return function(t,n){var e=t.selection.getRng(),r=e.startContainer;if(q(r)){var a=e.startOffset;r.insertData(a,n),L(t,r,a+n.length)}else{var o=t.dom.doc.createTextNode(n);e.insertNode(o),L(t,o,o.length)}}(s,t)})})},_=function(t,n,e){for(var r=0;r<t.length;r++)if(e(t[r],n))return!0},z=function(t,n){var e,r,a,o;e=t,r=n.replacementPatterns,U(e,r,!1),a=t,o=n.inlinePatterns,M(a,o,!1).each(function(t){L(a,t,t.data.length)}),function(t,n){var e,r,a,o,i,f,u,s,c,l,d;if(e=t.selection,r=t.dom,e.isCollapsed()&&(u=r.getParent(e.getStart(),"p"))){for(c=new w(u,u);i=c.next();)if(q(i)){o=i;break}if(o){if(!(s=j(n,o.data)))return;if(a=(l=e.getRng(!0)).startContainer,d=l.startOffset,o===a&&(d=Math.max(0,d-s.start.length)),I.trim(o.data).length===s.start.length)return;s.format&&(f=t.formatter.get(s.format))&&f[0].block&&(o.deleteData(0,s.start.length),t.formatter.apply(s.format,{},o),l.setStart(a,d),l.collapse(!0),e.setRng(l)),s.cmd&&t.undoManager.transact(function(){o.deleteData(0,s.start.length),t.execCommand(s.cmd)})}}}(t,n.blockPatterns)},K=function(t,n){var e,r,a,o;e=t,r=n.replacementPatterns,U(e,r,!0),a=t,o=n.inlinePatterns,M(a,o,!0).each(function(t){var n=t.data.slice(-1);if(/[\u00a0 ]/.test(n)){t.deleteData(t.data.length-1,1);var e=a.dom.doc.createTextNode(n);a.dom.insertAfter(e,t.parentNode),L(a,e,1)}})},V=function(t,n){return _(t,n,function(t,n){return t.charCodeAt(0)===n.charCode})},W=function(t,n){return _(t,n,function(t,n){return t===n.keyCode&&!1===R.modifierPressed(n)})},B=function(n,e){var r=[",",".",";",":","!","?"],a=[32];n.on("keydown",function(t){13!==t.keyCode||R.modifierPressed(t)||z(n,e.get())},!0),n.on("keyup",function(t){W(a,t)&&K(n,e.get())}),n.on("keypress",function(t){V(r,t)&&N.setEditorTimeout(n,function(){K(n,e.get())})})};i.add("textpattern",function(t){var n=o(A(t.settings));return B(t,n),D(n)})}(window);
\ No newline at end of file
diff --git a/lib/web/tiny_mce_4/plugins/visualchars/plugin.min.js b/lib/web/tiny_mce_4/plugins/visualchars/plugin.min.js
index 40995b37f500b..0a193452ebfdc 100644
--- a/lib/web/tiny_mce_4/plugins/visualchars/plugin.min.js
+++ b/lib/web/tiny_mce_4/plugins/visualchars/plugin.min.js
@@ -1 +1 @@
-!function(r){"use strict";var n,e,t,o,u,i,c=function(n){var e=n,t=function(){return e};return{get:t,set:function(n){e=n},clone:function(){return c(t())}}},a=tinymce.util.Tools.resolve("tinymce.PluginManager"),f=function(n){return{isEnabled:function(){return n.get()}}},l=function(n,e){return n.fire("VisualChars",{state:e})},s={"\xa0":"nbsp","\xad":"shy"},d=function(n,e){var t,r="";for(t in n)r+=t;return new RegExp("["+r+"]",e?"g":"")},m=function(n){var e,t="";for(e in n)t&&(t+=","),t+="span.mce-"+n[e];return t},N={charMap:s,regExp:d(s),regExpGlobal:d(s,!0),selector:m(s),charMapToRegExp:d,charMapToSelector:m},g=function(n){return function(){return n}},E=g(!1),h=g(!0),v=E,T=h,p=function(){return O},O=(o={fold:function(n,e){return n()},is:v,isSome:v,isNone:T,getOr:t=function(n){return n},getOrThunk:e=function(n){return n()},getOrDie:function(n){throw new Error(n||"error: getOrDie called on none.")},getOrNull:function(){return null},getOrUndefined:function(){return undefined},or:t,orThunk:e,map:p,ap:p,each:function(){},bind:p,flatten:p,exists:v,forall:T,filter:p,equals:n=function(n){return n.isNone()},equals_:n,toArray:function(){return[]},toString:g("none()")},Object.freeze&&Object.freeze(o),o),y=function(t){var n=function(){return t},e=function(){return o},r=function(n){return n(t)},o={fold:function(n,e){return e(t)},is:function(n){return t===n},isSome:T,isNone:v,getOr:n,getOrThunk:n,getOrDie:n,getOrNull:n,getOrUndefined:n,or:e,orThunk:e,map:function(n){return y(n(t))},ap:function(n){return n.fold(p,function(n){return y(n(t))})},each:function(n){n(t)},bind:r,flatten:n,exists:r,forall:r,filter:function(n){return n(t)?o:O},equals:function(n){return n.is(t)},equals_:function(n,e){return n.fold(v,function(n){return e(t,n)})},toArray:function(){return[t]},toString:function(){return"some("+t+")"}};return o},D=function(n){return null===n||n===undefined?O:y(n)},_=(u="function",function(n){return function(n){if(null===n)return"null";var e=typeof n;return"object"===e&&(Array.prototype.isPrototypeOf(n)||n.constructor&&"Array"===n.constructor.name)?"array":"object"===e&&(String.prototype.isPrototypeOf(n)||n.constructor&&"String"===n.constructor.name)?"string":e}(n)===u}),C=(Array.prototype.slice,function(n,e){for(var t=0,r=n.length;t<r;t++)e(n[t],t,n)}),M=(_(Array.from)&&Array.from,function(n){if(null===n||n===undefined)throw new Error("Node cannot be null or undefined");return{dom:g(n)}}),b={fromHtml:function(n,e){var t=(e||r.document).createElement("div");if(t.innerHTML=n,!t.hasChildNodes()||1<t.childNodes.length)throw r.console.error("HTML does not have a single root node",n),new Error("HTML must have a single root node");return M(t.childNodes[0])},fromTag:function(n,e){var t=(e||r.document).createElement(n);return M(t)},fromText:function(n,e){var t=(e||r.document).createTextNode(n);return M(t)},fromDom:M,fromPoint:function(n,e,t){var r=n.dom();return D(r.elementFromPoint(e,t)).map(M)}},k=(r.Node.ATTRIBUTE_NODE,r.Node.CDATA_SECTION_NODE,r.Node.COMMENT_NODE,r.Node.DOCUMENT_NODE,r.Node.DOCUMENT_TYPE_NODE,r.Node.DOCUMENT_FRAGMENT_NODE,r.Node.ELEMENT_NODE,r.Node.TEXT_NODE),S=(r.Node.PROCESSING_INSTRUCTION_NODE,r.Node.ENTITY_REFERENCE_NODE,r.Node.ENTITY_NODE,r.Node.NOTATION_NODE,function(n){return n.dom().nodeValue}),w=(i=k,function(n){return n.dom().nodeType===i}),A=function(n){return'<span data-mce-bogus="1" class="mce-'+N.charMap[n]+'">'+n+"</span>"},x=function(n,e){var t=[],r=function(n,e){for(var t=n.length,r=new Array(t),o=0;o<t;o++){var u=n[o];r[o]=e(u,o,n)}return r}(n.dom().childNodes,b.fromDom);return C(r,function(n){e(n)&&(t=t.concat([n])),t=t.concat(x(n,e))}),t},P={isMatch:function(n){return w(n)&&S(n)!==undefined&&N.regExp.test(S(n))},filterDescendants:x,findParentElm:function(n,e){for(;n.parentNode;){if(n.parentNode===e)return n;n=n.parentNode}},replaceWithSpans:function(n){return n.replace(N.regExpGlobal,A)}},R=function(t,n){var r,o,e=P.filterDescendants(b.fromDom(n),P.isMatch);C(e,function(n){var e=P.replaceWithSpans(S(n));for(o=t.dom.create("div",null,e);r=o.lastChild;)t.dom.insertAfter(r,n.dom());t.dom.remove(n.dom())})},I=function(e,n){var t=e.dom.select(N.selector,n);C(t,function(n){e.dom.remove(n,1)})},B=R,U=I,V=function(n){var e=n.getBody(),t=n.selection.getBookmark(),r=P.findParentElm(n.selection.getNode(),e);r=r!==undefined?r:e,I(n,r),R(n,r),n.selection.moveToBookmark(t)},j=function(n,e){var t,r=n.getBody(),o=n.selection;e.set(!e.get()),l(n,e.get()),t=o.getBookmark(),!0===e.get()?B(n,r):U(n,r),o.moveToBookmark(t)},q=function(n,e){n.addCommand("mceVisualChars",function(){j(n,e)})},G=tinymce.util.Tools.resolve("tinymce.util.Delay"),H=function(e,t){var r=G.debounce(function(){V(e)},300);!1!==e.settings.forced_root_block&&e.on("keydown",function(n){!0===t.get()&&(13===n.keyCode?V(e):r())})},L=function(n){return n.getParam("visualchars_default_state",!1)},F=function(e,t){e.on("init",function(){var n=!L(e);t.set(n),j(e,t)})},Y=function(t){return function(n){var e=n.control;t.on("VisualChars",function(n){e.active(n.state)})}};a.add("visualchars",function(n){var e,t=c(!1);return q(n,t),(e=n).addButton("visualchars",{active:!1,title:"Show invisible characters",cmd:"mceVisualChars",onPostRender:Y(e)}),e.addMenuItem("visualchars",{text:"Show invisible characters",cmd:"mceVisualChars",onPostRender:Y(e),selectable:!0,context:"view",prependToContext:!0}),H(n,t),F(n,t),f(t)})}(window);
\ No newline at end of file
+!function(r){"use strict";var n,e,t,o,i,u,c=function(n){var e=n,t=function(){return e};return{get:t,set:function(n){e=n},clone:function(){return c(t())}}},a=tinymce.util.Tools.resolve("tinymce.PluginManager"),f=function(n){return{isEnabled:function(){return n.get()}}},d=function(n,e){return n.fire("VisualChars",{state:e})},s=function(){},l=function(n){return function(){return n}},m=l(!1),N=l(!0),g=function(){return E},E=(n=function(n){return n.isNone()},o={fold:function(n,e){return n()},is:m,isSome:m,isNone:N,getOr:t=function(n){return n},getOrThunk:e=function(n){return n()},getOrDie:function(n){throw new Error(n||"error: getOrDie called on none.")},getOrNull:l(null),getOrUndefined:l(undefined),or:t,orThunk:e,map:g,each:s,bind:g,exists:m,forall:N,filter:g,equals:n,equals_:n,toArray:function(){return[]},toString:l("none()")},Object.freeze&&Object.freeze(o),o),h=function(t){var n=l(t),e=function(){return o},r=function(n){return n(t)},o={fold:function(n,e){return e(t)},is:function(n){return t===n},isSome:N,isNone:m,getOr:n,getOrThunk:n,getOrDie:n,getOrNull:n,getOrUndefined:n,or:e,orThunk:e,map:function(n){return h(n(t))},each:function(n){n(t)},bind:r,exists:r,forall:r,filter:function(n){return n(t)?o:E},toArray:function(){return[t]},toString:function(){return"some("+t+")"},equals:function(n){return n.is(t)},equals_:function(n,e){return n.fold(m,function(n){return e(t,n)})}};return o},v=function(n){return null===n||n===undefined?E:h(n)},T=(i="function",function(n){return function(n){if(null===n)return"null";var e=typeof n;return"object"===e&&(Array.prototype.isPrototypeOf(n)||n.constructor&&"Array"===n.constructor.name)?"array":"object"===e&&(String.prototype.isPrototypeOf(n)||n.constructor&&"String"===n.constructor.name)?"string":e}(n)===i}),p=(Array.prototype.slice,function(n,e){for(var t=0,r=n.length;t<r;t++)e(n[t],t)}),O=(T(Array.from)&&Array.from,function(n){if(null===n||n===undefined)throw new Error("Node cannot be null or undefined");return{dom:l(n)}}),y={fromHtml:function(n,e){var t=(e||r.document).createElement("div");if(t.innerHTML=n,!t.hasChildNodes()||1<t.childNodes.length)throw r.console.error("HTML does not have a single root node",n),new Error("HTML must have a single root node");return O(t.childNodes[0])},fromTag:function(n,e){var t=(e||r.document).createElement(n);return O(t)},fromText:function(n,e){var t=(e||r.document).createTextNode(n);return O(t)},fromDom:O,fromPoint:function(n,e,t){var r=n.dom();return v(r.elementFromPoint(e,t)).map(O)}},D=(r.Node.ATTRIBUTE_NODE,r.Node.CDATA_SECTION_NODE,r.Node.COMMENT_NODE,r.Node.DOCUMENT_NODE,r.Node.DOCUMENT_TYPE_NODE,r.Node.DOCUMENT_FRAGMENT_NODE,r.Node.ELEMENT_NODE,r.Node.TEXT_NODE),_=(r.Node.PROCESSING_INSTRUCTION_NODE,r.Node.ENTITY_REFERENCE_NODE,r.Node.ENTITY_NODE,r.Node.NOTATION_NODE,"undefined"!=typeof r.window?r.window:Function("return this;")(),function(n){return n.dom().nodeValue}),C=(u=D,function(n){return n.dom().nodeType===u}),w={"\xa0":"nbsp","\xad":"shy"},M=function(n,e){var t,r="";for(t in n)r+=t;return new RegExp("["+r+"]",e?"g":"")},b=function(n){var e,t="";for(e in n)t&&(t+=","),t+="span.mce-"+n[e];return t},k={charMap:w,regExp:M(w),regExpGlobal:M(w,!0),selector:b(w),charMapToRegExp:M,charMapToSelector:b},S=function(n){return'<span data-mce-bogus="1" class="mce-'+k.charMap[n]+'">'+n+"</span>"},A=function(n,e){var t=[],r=function(n,e){for(var t=n.length,r=new Array(t),o=0;o<t;o++){var i=n[o];r[o]=e(i,o)}return r}(n.dom().childNodes,y.fromDom);return p(r,function(n){e(n)&&(t=t.concat([n])),t=t.concat(A(n,e))}),t},x={isMatch:function(n){var e=_(n);return C(n)&&e!==undefined&&k.regExp.test(e)},filterDescendants:A,findParentElm:function(n,e){for(;n.parentNode;){if(n.parentNode===e)return n;n=n.parentNode}},replaceWithSpans:function(n){return n.replace(k.regExpGlobal,S)}},P=function(t,n){var r,o,e=x.filterDescendants(y.fromDom(n),x.isMatch);p(e,function(n){var e=x.replaceWithSpans(t.dom.encode(_(n)));for(o=t.dom.create("div",null,e);r=o.lastChild;)t.dom.insertAfter(r,n.dom());t.dom.remove(n.dom())})},R=function(e,n){var t=e.dom.select(k.selector,n);p(t,function(n){e.dom.remove(n,1)})},I=P,B=R,U=function(n){var e=n.getBody(),t=n.selection.getBookmark(),r=x.findParentElm(n.selection.getNode(),e);r=r!==undefined?r:e,R(n,r),P(n,r),n.selection.moveToBookmark(t)},V=function(n,e){var t,r=n.getBody(),o=n.selection;e.set(!e.get()),d(n,e.get()),t=o.getBookmark(),!0===e.get()?I(n,r):B(n,r),o.moveToBookmark(t)},j=function(n,e){n.addCommand("mceVisualChars",function(){V(n,e)})},q=tinymce.util.Tools.resolve("tinymce.util.Delay"),F=function(e,t){var r=q.debounce(function(){U(e)},300);!1!==e.settings.forced_root_block&&e.on("keydown",function(n){!0===t.get()&&(13===n.keyCode?U(e):r())})},G=function(n){return n.getParam("visualchars_default_state",!1)},H=function(e,t){e.on("init",function(){var n=!G(e);t.set(n),V(e,t)})},L=function(t){return function(n){var e=n.control;t.on("VisualChars",function(n){e.active(n.state)})}};a.add("visualchars",function(n){var e,t=c(!1);return j(n,t),(e=n).addButton("visualchars",{active:!1,title:"Show invisible characters",cmd:"mceVisualChars",onPostRender:L(e)}),e.addMenuItem("visualchars",{text:"Show invisible characters",cmd:"mceVisualChars",onPostRender:L(e),selectable:!0,context:"view",prependToContext:!0}),F(n,t),H(n,t),f(t)})}(window);
\ No newline at end of file
diff --git a/lib/web/tiny_mce_4/plugins/wordcount/plugin.min.js b/lib/web/tiny_mce_4/plugins/wordcount/plugin.min.js
index 6d04a7b355c76..a05c4c1b88921 100644
--- a/lib/web/tiny_mce_4/plugins/wordcount/plugin.min.js
+++ b/lib/web/tiny_mce_4/plugins/wordcount/plugin.min.js
@@ -1 +1 @@
-!function(){"use strict";var e,n,t,r,o,u=tinymce.util.Tools.resolve("tinymce.PluginManager"),c=tinymce.util.Tools.resolve("tinymce.dom.TreeWalker"),i=tinymce.util.Tools.resolve("tinymce.Env"),E="[-'\\.\u2018\u2019\u2024\ufe52\uff07\uff0e]",T="[:\xb7\xb7\u05f4\u2027\ufe13\ufe55\uff1a]",a="[\xb1+*/,;;\u0589\u060c\u060d\u066c\u07f8\u2044\ufe10\ufe14\ufe50\ufe54\uff0c\uff1b]",f="[0-9\u0660-\u0669\u066b\u06f0-\u06f9\u07c0-\u07c9\u0966-\u096f\u09e6-\u09ef\u0a66-\u0a6f\u0ae6-\u0aef\u0b66-\u0b6f\u0be6-\u0bef\u0c66-\u0c6f\u0ce6-\u0cef\u0d66-\u0d6f\u0e50-\u0e59\u0ed0-\u0ed9\u0f20-\u0f29\u1040-\u1049\u1090-\u1099\u17e0-\u17e9\u1810-\u1819\u1946-\u194f\u19d0-\u19d9\u1a80-\u1a89\u1a90-\u1a99\u1b50-\u1b59\u1bb0-\u1bb9\u1c40-\u1c49\u1c50-\u1c59\ua620-\ua629\ua8d0-\ua8d9\ua900-\ua909\ua9d0-\ua9d9\uaa50-\uaa59\uabf0-\uabf9]",s="\\r",l="\\n",A="[\x0B\f\x85\u2028\u2029]",N="[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065f\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u0900-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962\u0963\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09cb-\u09cd\u09d7\u09e2\u09e3\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2\u0ae3\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0c01-\u0c03\u0c3e-\u0c44\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0c82\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d02\u0d03\u0d3e-\u0d44\u0d46-\u0d48\u0d4a-\u0d4d\u0d57\u0d62\u0d63\u0d82\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0df2\u0df3\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f3e\u0f3f\u0f71-\u0f84\u0f86\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102b-\u103e\u1056-\u1059\u105e-\u1060\u1062-\u1064\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f\u109a-\u109d\u135d-\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b6-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u192b\u1930-\u193b\u19b0-\u19c0\u19c8\u19c9\u1a17-\u1a1b\u1a55-\u1a5e\u1a60-\u1a7c\u1a7f\u1b00-\u1b04\u1b34-\u1b44\u1b6b-\u1b73\u1b80-\u1b82\u1ba1-\u1baa\u1be6-\u1bf3\u1c24-\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce8\u1ced\u1cf2\u1dc0-\u1de6\u1dfc-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua823-\ua827\ua880\ua881\ua8b4-\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua953\ua980-\ua983\ua9b3-\ua9c0\uaa29-\uaa36\uaa43\uaa4c\uaa4d\uaa7b\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe3-\uabea\uabec\uabed\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]",R="[\xad\u0600-\u0603\u06dd\u070f\u17b4\u17b5\u200e\u200f\u202a-\u202e\u2060-\u2064\u206a-\u206f\ufeff\ufff9-\ufffb]",d="[\u3031-\u3035\u309b\u309c\u30a0-\u30fa\u30fc-\u30ff\u31f0-\u31ff\u32d0-\u32fe\u3300-\u3357\uff66-\uff9d]",g="[=_\u203f\u2040\u2054\ufe33\ufe34\ufe4d-\ufe4f\uff3f\u2200-\u22ff<>]",p="[!-#%-*,-\\/:;?@\\[-\\]_{}\xa1\xab\xb7\xbb\xbf;\xb7\u055a-\u055f\u0589\u058a\u05be\u05c0\u05c3\u05c6\u05f3\u05f4\u0609\u060a\u060c\u060d\u061b\u061e\u061f\u066a-\u066d\u06d4\u0700-\u070d\u07f7-\u07f9\u0830-\u083e\u085e\u0964\u0965\u0970\u0df4\u0e4f\u0e5a\u0e5b\u0f04-\u0f12\u0f3a-\u0f3d\u0f85\u0fd0-\u0fd4\u0fd9\u0fda\u104a-\u104f\u10fb\u1361-\u1368\u1400\u166d\u166e\u169b\u169c\u16eb-\u16ed\u1735\u1736\u17d4-\u17d6\u17d8-\u17da\u1800-\u180a\u1944\u1945\u1a1e\u1a1f\u1aa0-\u1aa6\u1aa8-\u1aad\u1b5a-\u1b60\u1bfc-\u1bff\u1c3b-\u1c3f\u1c7e\u1c7f\u1cd3\u2010-\u2027\u2030-\u2043\u2045-\u2051\u2053-\u205e\u207d\u207e\u208d\u208e\u3008\u3009\u2768-\u2775\u27c5\u27c6\u27e6-\u27ef\u2983-\u2998\u29d8-\u29db\u29fc\u29fd\u2cf9-\u2cfc\u2cfe\u2cff\u2d70\u2e00-\u2e2e\u2e30\u2e31\u3001-\u3003\u3008-\u3011\u3014-\u301f\u3030\u303d\u30a0\u30fb\ua4fe\ua4ff\ua60d-\ua60f\ua673\ua67e\ua6f2-\ua6f7\ua874-\ua877\ua8ce\ua8cf\ua8f8-\ua8fa\ua92e\ua92f\ua95f\ua9c1-\ua9cd\ua9de\ua9df\uaa5c-\uaa5f\uaade\uaadf\uabeb\ufd3e\ufd3f\ufe10-\ufe19\ufe30-\ufe52\ufe54-\ufe61\ufe63\ufe68\ufe6a\ufe6b\uff01-\uff03\uff05-\uff0a\uff0c-\uff0f\uff1a\uff1b\uff1f\uff20\uff3b-\uff3d\uff3f\uff5b\uff5d\uff5f-\uff65]",M={characterIndices:{ALETTER:0,MIDNUMLET:1,MIDLETTER:2,MIDNUM:3,NUMERIC:4,CR:5,LF:6,NEWLINE:7,EXTEND:8,FORMAT:9,KATAKANA:10,EXTENDNUMLET:11,AT:12,OTHER:13},SETS:[new RegExp("[A-Za-z\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05d0-\u05ea\u05f0-\u05f3\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0977\u0979-\u097f\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c33\u0c35-\u0c39\u0c3d\u0c58\u0c59\u0c60\u0c61\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d60\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u10a0-\u10c5\u10d0-\u10fa\u10fc\u1100-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f4\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f0\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1820-\u1877\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191c\u1a00-\u1a16\u1b05-\u1b33\u1b45-\u1b4b\u1b83-\u1ba0\u1bae\u1baf\u1bc0-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1ce9-\u1cec\u1cee-\u1cf1\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2119-\u211d\u2124\u2126\u2128\u212a-\u212d\u212f-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u24b6-\u24e9\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cee\u2d00-\u2d25\u2d30-\u2d65\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u2e2f\u3005\u303b\u303c\u3105-\u312d\u3131-\u318e\u31a0-\u31ba\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua697\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua78e\ua790\ua791\ua7a0-\ua7a9\ua7fa-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uabc0-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uffa0-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc]"),new RegExp(E),new RegExp(T),new RegExp(a),new RegExp(f),new RegExp(s),new RegExp(l),new RegExp(A),new RegExp(N),new RegExp(R),new RegExp(d),new RegExp(g),new RegExp("@")],EMPTY_STRING:"",PUNCTUATION:new RegExp("^"+p+"$"),WHITESPACE:/^\s+$/},I=function(e){return function(){return e}},L=I(!1),m=I(!0),y=function(){return h},h=(r={fold:function(e,n){return e()},is:L,isSome:L,isNone:m,getOr:t=function(e){return e},getOrThunk:n=function(e){return e()},getOrDie:function(e){throw new Error(e||"error: getOrDie called on none.")},getOrNull:function(){return null},getOrUndefined:function(){return undefined},or:t,orThunk:n,map:y,ap:y,each:function(){},bind:y,flatten:y,exists:L,forall:m,filter:y,equals:e=function(e){return e.isNone()},equals_:e,toArray:function(){return[]},toString:I("none()")},Object.freeze&&Object.freeze(r),r),w=(o="function",function(e){return function(e){if(null===e)return"null";var n=typeof e;return"object"===n&&(Array.prototype.isPrototypeOf(e)||e.constructor&&"Array"===e.constructor.name)?"array":"object"===n&&(String.prototype.isPrototypeOf(e)||e.constructor&&"String"===e.constructor.name)?"string":n}(e)===o}),U=(Array.prototype.slice,w(Array.from)&&Array.from,M.SETS),v=M.characterIndices.OTHER,x=function(e){var n,t,r=v,o=U.length;for(n=0;n<o;++n)if((t=U[n])&&t.test(e)){r=n;break}return r},D=function(e){var t,r,n=(t=x,r={},function(e){if(r[e])return r[e];var n=t(e);return r[e]=n});return function(e,n){for(var t=e.length,r=new Array(t),o=0;o<t;o++){var u=e[o];r[o]=n(u,o,e)}return r}(e.split(""),n)},C=M.characterIndices,O=function(e,n){var t,r,o=e[n],u=e[n+1];return!(n<0||n>e.length-1&&0!==n||o===C.ALETTER&&u===C.ALETTER||(r=e[n+2],o===C.ALETTER&&(u===C.MIDLETTER||u===C.MIDNUMLET||u===C.AT)&&r===C.ALETTER||(t=e[n-1],(o===C.MIDLETTER||o===C.MIDNUMLET||u===C.AT)&&u===C.ALETTER&&t===C.ALETTER||!(o!==C.NUMERIC&&o!==C.ALETTER||u!==C.NUMERIC&&u!==C.ALETTER)||(o===C.MIDNUM||o===C.MIDNUMLET)&&u===C.NUMERIC&&t===C.NUMERIC||o===C.NUMERIC&&(u===C.MIDNUM||u===C.MIDNUMLET)&&r===C.NUMERIC||o===C.EXTEND||o===C.FORMAT||t===C.EXTEND||t===C.FORMAT||u===C.EXTEND||u===C.FORMAT||o===C.CR&&u===C.LF||o!==C.NEWLINE&&o!==C.CR&&o!==C.LF&&u!==C.NEWLINE&&u!==C.CR&&u!==C.LF&&(o===C.KATAKANA&&u===C.KATAKANA||u===C.EXTENDNUMLET&&(o===C.ALETTER||o===C.NUMERIC||o===C.KATAKANA||o===C.EXTENDNUMLET)||o===C.EXTENDNUMLET&&(u===C.ALETTER||u===C.NUMERIC||u===C.KATAKANA)||o===C.AT))))},b=M.EMPTY_STRING,S=M.WHITESPACE,K=M.PUNCTUATION,P=function(e,n,t){var r=function(e,n){var t;for(t=n;t<e.length;++t){var r=e.charAt(t);if(S.test(r))break}return t}(n,t+1),o=n.substring(t+1,r);return"://"===o.substr(0,3)?{word:e+o,index:r}:{word:e,index:t}},F=function(e,n){return function(e,n){var t,r,o,u,i=0,E=D(e),c=E.length,T=[],a=[];for(n||(n={}),n.ignoreCase&&(e=e.toLowerCase()),r=n.includePunctuation,o=n.includeWhitespace;i<c;++i)if(t=e.charAt(i),T.push(t),O(E,i)){if((T=T.join(b))&&(o||!S.test(T))&&(r||!K.test(T)))if("http"===(u=T)||"https"===u){var f=P(T,e,i);a.push(f.word),i=f.index}else a.push(T);T=[]}return a}(e.replace(/\ufeff/g,""),n)},W=function(e,n){return i.ie?function(e,n){for(var t,r=n.getBlockElements(),o=n.getShortEndedElements(),u=n.getWhiteSpaceElements(),i="",E=new c(e,e);e=E.next();)3===e.nodeType?i+=e.data:(r[(t=e).nodeName]||o[t.nodeName]||u[t.nodeName])&&(i+=" ");return i}(e,n):e.innerText},X=function(e){return F((n=e,n.removed?"":W(n.getBody(),n.schema))).length;var n},k=function(e){return{getCount:function(){return X(e)}}},j=tinymce.util.Tools.resolve("tinymce.util.Delay"),_=tinymce.util.Tools.resolve("tinymce.util.I18n"),H=function(t){var r=function(e){return _.translate(["{0} words",X(e)])},o=function(){t.theme.panel.find("#wordcount").text(r(t))};t.on("init",function(){var e=t.theme.panel&&t.theme.panel.find("#statusbar")[0],n=j.debounce(o,300);e&&j.setEditorTimeout(t,function(){e.insert({type:"label",name:"wordcount",text:r(t),classes:"wordcount",disabled:t.settings.readonly},0),t.on("setcontent beforeaddundo undo redo keyup",n)},0)})};u.add("wordcount",function(e){return H(e),k(e)})}();
\ No newline at end of file
+!function(){"use strict";var e,n,t,r,o,u=tinymce.util.Tools.resolve("tinymce.PluginManager"),c=tinymce.util.Tools.resolve("tinymce.dom.TreeWalker"),i=tinymce.util.Tools.resolve("tinymce.Env"),E="[-'\\.\u2018\u2019\u2024\ufe52\uff07\uff0e]",T="[:\xb7\xb7\u05f4\u2027\ufe13\ufe55\uff1a]",a="[\xb1+*/,;;\u0589\u060c\u060d\u066c\u07f8\u2044\ufe10\ufe14\ufe50\ufe54\uff0c\uff1b]",f="[0-9\u0660-\u0669\u066b\u06f0-\u06f9\u07c0-\u07c9\u0966-\u096f\u09e6-\u09ef\u0a66-\u0a6f\u0ae6-\u0aef\u0b66-\u0b6f\u0be6-\u0bef\u0c66-\u0c6f\u0ce6-\u0cef\u0d66-\u0d6f\u0e50-\u0e59\u0ed0-\u0ed9\u0f20-\u0f29\u1040-\u1049\u1090-\u1099\u17e0-\u17e9\u1810-\u1819\u1946-\u194f\u19d0-\u19d9\u1a80-\u1a89\u1a90-\u1a99\u1b50-\u1b59\u1bb0-\u1bb9\u1c40-\u1c49\u1c50-\u1c59\ua620-\ua629\ua8d0-\ua8d9\ua900-\ua909\ua9d0-\ua9d9\uaa50-\uaa59\uabf0-\uabf9]",s="\\r",l="\\n",A="[\x0B\f\x85\u2028\u2029]",N="[\u0300-\u036f\u0483-\u0489\u0591-\u05bd\u05bf\u05c1\u05c2\u05c4\u05c5\u05c7\u0610-\u061a\u064b-\u065f\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u0900-\u0903\u093a-\u093c\u093e-\u094f\u0951-\u0957\u0962\u0963\u0981-\u0983\u09bc\u09be-\u09c4\u09c7\u09c8\u09cb-\u09cd\u09d7\u09e2\u09e3\u0a01-\u0a03\u0a3c\u0a3e-\u0a42\u0a47\u0a48\u0a4b-\u0a4d\u0a51\u0a70\u0a71\u0a75\u0a81-\u0a83\u0abc\u0abe-\u0ac5\u0ac7-\u0ac9\u0acb-\u0acd\u0ae2\u0ae3\u0b01-\u0b03\u0b3c\u0b3e-\u0b44\u0b47\u0b48\u0b4b-\u0b4d\u0b56\u0b57\u0b62\u0b63\u0b82\u0bbe-\u0bc2\u0bc6-\u0bc8\u0bca-\u0bcd\u0bd7\u0c01-\u0c03\u0c3e-\u0c44\u0c46-\u0c48\u0c4a-\u0c4d\u0c55\u0c56\u0c62\u0c63\u0c82\u0c83\u0cbc\u0cbe-\u0cc4\u0cc6-\u0cc8\u0cca-\u0ccd\u0cd5\u0cd6\u0ce2\u0ce3\u0d02\u0d03\u0d3e-\u0d44\u0d46-\u0d48\u0d4a-\u0d4d\u0d57\u0d62\u0d63\u0d82\u0d83\u0dca\u0dcf-\u0dd4\u0dd6\u0dd8-\u0ddf\u0df2\u0df3\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb\u0ebc\u0ec8-\u0ecd\u0f18\u0f19\u0f35\u0f37\u0f39\u0f3e\u0f3f\u0f71-\u0f84\u0f86\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102b-\u103e\u1056-\u1059\u105e-\u1060\u1062-\u1064\u1067-\u106d\u1071-\u1074\u1082-\u108d\u108f\u109a-\u109d\u135d-\u135f\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17b6-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u192b\u1930-\u193b\u19b0-\u19c0\u19c8\u19c9\u1a17-\u1a1b\u1a55-\u1a5e\u1a60-\u1a7c\u1a7f\u1b00-\u1b04\u1b34-\u1b44\u1b6b-\u1b73\u1b80-\u1b82\u1ba1-\u1baa\u1be6-\u1bf3\u1c24-\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce8\u1ced\u1cf2\u1dc0-\u1de6\u1dfc-\u1dff\u200c\u200d\u20d0-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302f\u3099\u309a\ua66f-\ua672\ua67c\ua67d\ua6f0\ua6f1\ua802\ua806\ua80b\ua823-\ua827\ua880\ua881\ua8b4-\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua953\ua980-\ua983\ua9b3-\ua9c0\uaa29-\uaa36\uaa43\uaa4c\uaa4d\uaa7b\uaab0\uaab2-\uaab4\uaab7\uaab8\uaabe\uaabf\uaac1\uabe3-\uabea\uabec\uabed\ufb1e\ufe00-\ufe0f\ufe20-\ufe26\uff9e\uff9f]",R="[\xad\u0600-\u0603\u06dd\u070f\u17b4\u17b5\u200e\u200f\u202a-\u202e\u2060-\u2064\u206a-\u206f\ufeff\ufff9-\ufffb]",d="[\u3031-\u3035\u309b\u309c\u30a0-\u30fa\u30fc-\u30ff\u31f0-\u31ff\u32d0-\u32fe\u3300-\u3357\uff66-\uff9d]",g="[=_\u203f\u2040\u2054\ufe33\ufe34\ufe4d-\ufe4f\uff3f\u2200-\u22ff<>]",p="[!-#%-*,-\\/:;?@\\[-\\]_{}\xa1\xab\xb7\xbb\xbf;\xb7\u055a-\u055f\u0589\u058a\u05be\u05c0\u05c3\u05c6\u05f3\u05f4\u0609\u060a\u060c\u060d\u061b\u061e\u061f\u066a-\u066d\u06d4\u0700-\u070d\u07f7-\u07f9\u0830-\u083e\u085e\u0964\u0965\u0970\u0df4\u0e4f\u0e5a\u0e5b\u0f04-\u0f12\u0f3a-\u0f3d\u0f85\u0fd0-\u0fd4\u0fd9\u0fda\u104a-\u104f\u10fb\u1361-\u1368\u1400\u166d\u166e\u169b\u169c\u16eb-\u16ed\u1735\u1736\u17d4-\u17d6\u17d8-\u17da\u1800-\u180a\u1944\u1945\u1a1e\u1a1f\u1aa0-\u1aa6\u1aa8-\u1aad\u1b5a-\u1b60\u1bfc-\u1bff\u1c3b-\u1c3f\u1c7e\u1c7f\u1cd3\u2010-\u2027\u2030-\u2043\u2045-\u2051\u2053-\u205e\u207d\u207e\u208d\u208e\u3008\u3009\u2768-\u2775\u27c5\u27c6\u27e6-\u27ef\u2983-\u2998\u29d8-\u29db\u29fc\u29fd\u2cf9-\u2cfc\u2cfe\u2cff\u2d70\u2e00-\u2e2e\u2e30\u2e31\u3001-\u3003\u3008-\u3011\u3014-\u301f\u3030\u303d\u30a0\u30fb\ua4fe\ua4ff\ua60d-\ua60f\ua673\ua67e\ua6f2-\ua6f7\ua874-\ua877\ua8ce\ua8cf\ua8f8-\ua8fa\ua92e\ua92f\ua95f\ua9c1-\ua9cd\ua9de\ua9df\uaa5c-\uaa5f\uaade\uaadf\uabeb\ufd3e\ufd3f\ufe10-\ufe19\ufe30-\ufe52\ufe54-\ufe61\ufe63\ufe68\ufe6a\ufe6b\uff01-\uff03\uff05-\uff0a\uff0c-\uff0f\uff1a\uff1b\uff1f\uff20\uff3b-\uff3d\uff3f\uff5b\uff5d\uff5f-\uff65]",M={characterIndices:{ALETTER:0,MIDNUMLET:1,MIDLETTER:2,MIDNUM:3,NUMERIC:4,CR:5,LF:6,NEWLINE:7,EXTEND:8,FORMAT:9,KATAKANA:10,EXTENDNUMLET:11,AT:12,OTHER:13},SETS:[new RegExp("[A-Za-z\xaa\xb5\xba\xc0-\xd6\xd8-\xf6\xf8-\u02c1\u02c6-\u02d1\u02e0-\u02e4\u02ec\u02ee\u0370-\u0374\u0376\u0377\u037a-\u037d\u0386\u0388-\u038a\u038c\u038e-\u03a1\u03a3-\u03f5\u03f7-\u0481\u048a-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05d0-\u05ea\u05f0-\u05f3\u0620-\u064a\u066e\u066f\u0671-\u06d3\u06d5\u06e5\u06e6\u06ee\u06ef\u06fa-\u06fc\u06ff\u0710\u0712-\u072f\u074d-\u07a5\u07b1\u07ca-\u07ea\u07f4\u07f5\u07fa\u0800-\u0815\u081a\u0824\u0828\u0840-\u0858\u0904-\u0939\u093d\u0950\u0958-\u0961\u0971-\u0977\u0979-\u097f\u0985-\u098c\u098f\u0990\u0993-\u09a8\u09aa-\u09b0\u09b2\u09b6-\u09b9\u09bd\u09ce\u09dc\u09dd\u09df-\u09e1\u09f0\u09f1\u0a05-\u0a0a\u0a0f\u0a10\u0a13-\u0a28\u0a2a-\u0a30\u0a32\u0a33\u0a35\u0a36\u0a38\u0a39\u0a59-\u0a5c\u0a5e\u0a72-\u0a74\u0a85-\u0a8d\u0a8f-\u0a91\u0a93-\u0aa8\u0aaa-\u0ab0\u0ab2\u0ab3\u0ab5-\u0ab9\u0abd\u0ad0\u0ae0\u0ae1\u0b05-\u0b0c\u0b0f\u0b10\u0b13-\u0b28\u0b2a-\u0b30\u0b32\u0b33\u0b35-\u0b39\u0b3d\u0b5c\u0b5d\u0b5f-\u0b61\u0b71\u0b83\u0b85-\u0b8a\u0b8e-\u0b90\u0b92-\u0b95\u0b99\u0b9a\u0b9c\u0b9e\u0b9f\u0ba3\u0ba4\u0ba8-\u0baa\u0bae-\u0bb9\u0bd0\u0c05-\u0c0c\u0c0e-\u0c10\u0c12-\u0c28\u0c2a-\u0c33\u0c35-\u0c39\u0c3d\u0c58\u0c59\u0c60\u0c61\u0c85-\u0c8c\u0c8e-\u0c90\u0c92-\u0ca8\u0caa-\u0cb3\u0cb5-\u0cb9\u0cbd\u0cde\u0ce0\u0ce1\u0cf1\u0cf2\u0d05-\u0d0c\u0d0e-\u0d10\u0d12-\u0d3a\u0d3d\u0d4e\u0d60\u0d61\u0d7a-\u0d7f\u0d85-\u0d96\u0d9a-\u0db1\u0db3-\u0dbb\u0dbd\u0dc0-\u0dc6\u0f00\u0f40-\u0f47\u0f49-\u0f6c\u0f88-\u0f8c\u10a0-\u10c5\u10d0-\u10fa\u10fc\u1100-\u1248\u124a-\u124d\u1250-\u1256\u1258\u125a-\u125d\u1260-\u1288\u128a-\u128d\u1290-\u12b0\u12b2-\u12b5\u12b8-\u12be\u12c0\u12c2-\u12c5\u12c8-\u12d6\u12d8-\u1310\u1312-\u1315\u1318-\u135a\u1380-\u138f\u13a0-\u13f4\u1401-\u166c\u166f-\u167f\u1681-\u169a\u16a0-\u16ea\u16ee-\u16f0\u1700-\u170c\u170e-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176c\u176e-\u1770\u1820-\u1877\u1880-\u18a8\u18aa\u18b0-\u18f5\u1900-\u191c\u1a00-\u1a16\u1b05-\u1b33\u1b45-\u1b4b\u1b83-\u1ba0\u1bae\u1baf\u1bc0-\u1be5\u1c00-\u1c23\u1c4d-\u1c4f\u1c5a-\u1c7d\u1ce9-\u1cec\u1cee-\u1cf1\u1d00-\u1dbf\u1e00-\u1f15\u1f18-\u1f1d\u1f20-\u1f45\u1f48-\u1f4d\u1f50-\u1f57\u1f59\u1f5b\u1f5d\u1f5f-\u1f7d\u1f80-\u1fb4\u1fb6-\u1fbc\u1fbe\u1fc2-\u1fc4\u1fc6-\u1fcc\u1fd0-\u1fd3\u1fd6-\u1fdb\u1fe0-\u1fec\u1ff2-\u1ff4\u1ff6-\u1ffc\u2071\u207f\u2090-\u209c\u2102\u2107\u210a-\u2113\u2115\u2119-\u211d\u2124\u2126\u2128\u212a-\u212d\u212f-\u2139\u213c-\u213f\u2145-\u2149\u214e\u2160-\u2188\u24b6-\u24e9\u2c00-\u2c2e\u2c30-\u2c5e\u2c60-\u2ce4\u2ceb-\u2cee\u2d00-\u2d25\u2d30-\u2d65\u2d6f\u2d80-\u2d96\u2da0-\u2da6\u2da8-\u2dae\u2db0-\u2db6\u2db8-\u2dbe\u2dc0-\u2dc6\u2dc8-\u2dce\u2dd0-\u2dd6\u2dd8-\u2dde\u2e2f\u3005\u303b\u303c\u3105-\u312d\u3131-\u318e\u31a0-\u31ba\ua000-\ua48c\ua4d0-\ua4fd\ua500-\ua60c\ua610-\ua61f\ua62a\ua62b\ua640-\ua66e\ua67f-\ua697\ua6a0-\ua6ef\ua717-\ua71f\ua722-\ua788\ua78b-\ua78e\ua790\ua791\ua7a0-\ua7a9\ua7fa-\ua801\ua803-\ua805\ua807-\ua80a\ua80c-\ua822\ua840-\ua873\ua882-\ua8b3\ua8f2-\ua8f7\ua8fb\ua90a-\ua925\ua930-\ua946\ua960-\ua97c\ua984-\ua9b2\ua9cf\uaa00-\uaa28\uaa40-\uaa42\uaa44-\uaa4b\uab01-\uab06\uab09-\uab0e\uab11-\uab16\uab20-\uab26\uab28-\uab2e\uabc0-\uabe2\uac00-\ud7a3\ud7b0-\ud7c6\ud7cb-\ud7fb\ufb00-\ufb06\ufb13-\ufb17\ufb1d\ufb1f-\ufb28\ufb2a-\ufb36\ufb38-\ufb3c\ufb3e\ufb40\ufb41\ufb43\ufb44\ufb46-\ufbb1\ufbd3-\ufd3d\ufd50-\ufd8f\ufd92-\ufdc7\ufdf0-\ufdfb\ufe70-\ufe74\ufe76-\ufefc\uff21-\uff3a\uff41-\uff5a\uffa0-\uffbe\uffc2-\uffc7\uffca-\uffcf\uffd2-\uffd7\uffda-\uffdc]"),new RegExp(E),new RegExp(T),new RegExp(a),new RegExp(f),new RegExp(s),new RegExp(l),new RegExp(A),new RegExp(N),new RegExp(R),new RegExp(d),new RegExp(g),new RegExp("@")],EMPTY_STRING:"",PUNCTUATION:new RegExp("^"+p+"$"),WHITESPACE:/^\s+$/},I=function(){},L=function(e){return function(){return e}},m=L(!1),y=L(!0),h=function(){return w},w=(e=function(e){return e.isNone()},r={fold:function(e,n){return e()},is:m,isSome:m,isNone:y,getOr:t=function(e){return e},getOrThunk:n=function(e){return e()},getOrDie:function(e){throw new Error(e||"error: getOrDie called on none.")},getOrNull:L(null),getOrUndefined:L(undefined),or:t,orThunk:n,map:h,each:I,bind:h,exists:m,forall:y,filter:h,equals:e,equals_:e,toArray:function(){return[]},toString:L("none()")},Object.freeze&&Object.freeze(r),r),U=(o="function",function(e){return function(e){if(null===e)return"null";var n=typeof e;return"object"===n&&(Array.prototype.isPrototypeOf(e)||e.constructor&&"Array"===e.constructor.name)?"array":"object"===n&&(String.prototype.isPrototypeOf(e)||e.constructor&&"String"===e.constructor.name)?"string":n}(e)===o}),v=(Array.prototype.slice,U(Array.from)&&Array.from,M.SETS),x=M.characterIndices.OTHER,D=function(e){var n,t,r=x,o=v.length;for(n=0;n<o;++n)if((t=v[n])&&t.test(e)){r=n;break}return r},C=function(e){var t,r,n=(t=D,r={},function(e){if(r[e])return r[e];var n=t(e);return r[e]=n});return function(e,n){for(var t=e.length,r=new Array(t),o=0;o<t;o++){var u=e[o];r[o]=n(u,o)}return r}(e.split(""),n)},O=M.characterIndices,b=function(e,n){var t,r,o=e[n],u=e[n+1];return!(n<0||n>e.length-1&&0!==n||o===O.ALETTER&&u===O.ALETTER||(r=e[n+2],o===O.ALETTER&&(u===O.MIDLETTER||u===O.MIDNUMLET||u===O.AT)&&r===O.ALETTER||(t=e[n-1],(o===O.MIDLETTER||o===O.MIDNUMLET||u===O.AT)&&u===O.ALETTER&&t===O.ALETTER||!(o!==O.NUMERIC&&o!==O.ALETTER||u!==O.NUMERIC&&u!==O.ALETTER)||(o===O.MIDNUM||o===O.MIDNUMLET)&&u===O.NUMERIC&&t===O.NUMERIC||o===O.NUMERIC&&(u===O.MIDNUM||u===O.MIDNUMLET)&&r===O.NUMERIC||o===O.EXTEND||o===O.FORMAT||t===O.EXTEND||t===O.FORMAT||u===O.EXTEND||u===O.FORMAT||o===O.CR&&u===O.LF||o!==O.NEWLINE&&o!==O.CR&&o!==O.LF&&u!==O.NEWLINE&&u!==O.CR&&u!==O.LF&&(o===O.KATAKANA&&u===O.KATAKANA||u===O.EXTENDNUMLET&&(o===O.ALETTER||o===O.NUMERIC||o===O.KATAKANA||o===O.EXTENDNUMLET)||o===O.EXTENDNUMLET&&(u===O.ALETTER||u===O.NUMERIC||u===O.KATAKANA)||o===O.AT))))},S=M.EMPTY_STRING,K=M.WHITESPACE,P=M.PUNCTUATION,F=function(e,n,t){var r=function(e,n){var t;for(t=n;t<e.length;++t){var r=e.charAt(t);if(K.test(r))break}return t}(n,t+1),o=n.substring(t+1,r);return"://"===o.substr(0,3)?{word:e+o,index:r}:{word:e,index:t}},W=function(e,n){return function(e,n){var t,r,o,u,i=0,E=C(e),c=E.length,T=[],a=[];for(n||(n={}),n.ignoreCase&&(e=e.toLowerCase()),r=n.includePunctuation,o=n.includeWhitespace;i<c;++i)if(t=e.charAt(i),T.push(t),b(E,i)){if((T=T.join(S))&&(o||!K.test(T))&&(r||!P.test(T)))if("http"===(u=T)||"https"===u){var f=F(T,e,i);a.push(f.word),i=f.index}else a.push(T);T=[]}return a}(e.replace(/\ufeff/g,""),n)},X=function(e,n){return i.ie?function(e,n){for(var t,r=n.getBlockElements(),o=n.getShortEndedElements(),u=n.getWhiteSpaceElements(),i="",E=new c(e,e);e=E.next();)3===e.nodeType?i+=e.data:(r[(t=e).nodeName]||o[t.nodeName]||u[t.nodeName])&&(i+=" ");return i}(e,n):e.innerText},k=function(e){return W((n=e,n.removed?"":X(n.getBody(),n.schema))).length;var n},j=function(e){return{getCount:function(){return k(e)}}},_=tinymce.util.Tools.resolve("tinymce.util.Delay"),H=tinymce.util.Tools.resolve("tinymce.util.I18n"),z=function(t){var r=function(e){return H.translate(["{0} words",k(e)])},o=function(){t.theme.panel.find("#wordcount").text(r(t))};t.on("init",function(){var e=t.theme.panel&&t.theme.panel.find("#statusbar")[0],n=_.debounce(o,300);e&&_.setEditorTimeout(t,function(){e.insert({type:"label",name:"wordcount",text:r(t),classes:"wordcount",disabled:t.settings.readonly},0),t.on("setcontent beforeaddundo undo redo keyup",n)},0)})};u.add("wordcount",function(e){return z(e),j(e)})}();
\ No newline at end of file
diff --git a/lib/web/tiny_mce_4/skins/lightgray/content.inline.min.css b/lib/web/tiny_mce_4/skins/lightgray/content.inline.min.css
index e4a77ff459acd..aa3697c6f7603 100644
--- a/lib/web/tiny_mce_4/skins/lightgray/content.inline.min.css
+++ b/lib/web/tiny_mce_4/skins/lightgray/content.inline.min.css
@@ -1 +1 @@
-.word-wrap{word-wrap:break-word;-ms-word-break:break-all;word-break:break-all;word-break:break-word;-ms-hyphens:auto;-moz-hyphens:auto;-webkit-hyphens:auto;hyphens:auto}.mce-content-body .mce-reset{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:black;font-family:Arial;font-size:11px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;line-height:normal;font-weight:normal;text-align:left;-webkit-tap-highlight-color:transparent;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr;max-width:none}.mce-object{border:1px dotted #3A3A3A;background:#D5D5D5 url(img/object.gif) no-repeat center}.mce-preview-object{display:inline-block;position:relative;margin:0 2px 0 2px;line-height:0;border:1px solid gray}.mce-preview-object[data-mce-selected="2"] .mce-shim{display:none}.mce-preview-object .mce-shim{position:absolute;top:0;left:0;width:100%;height:100%;background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)}figure.align-left{float:left}figure.align-right{float:right}figure.image.align-center{display:table;margin-left:auto;margin-right:auto}figure.image{display:inline-block;border:1px solid gray;margin:0 2px 0 1px;background:#f5f2f0}figure.image img{margin:8px 8px 0 8px}figure.image figcaption{margin:6px 8px 6px 8px;text-align:center}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc li{list-style-type:none}.mce-pagebreak{cursor:default;display:block;border:0;width:100%;height:5px;border:1px dashed #666;margin-top:15px;page-break-before:always}@media print{.mce-pagebreak{border:0}}.mce-item-anchor{cursor:default;display:inline-block;-webkit-user-select:all;-webkit-user-modify:read-only;-moz-user-select:all;-moz-user-modify:read-only;user-select:all;user-modify:read-only;width:9px !important;height:9px !important;border:1px dotted #3A3A3A;background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-nbsp,.mce-shy{background:#AAA}.mce-shy::after{content:'-'}.mce-match-marker{background:#AAA;color:#fff}.mce-match-marker-selected{background:#3399ff;color:#fff}.mce-spellchecker-word{border-bottom:2px solid rgba(208,2,27,0.5);cursor:default}.mce-spellchecker-grammar{border-bottom:2px solid #008000;cursor:default}.mce-item-table,.mce-item-table td,.mce-item-table th,.mce-item-table caption{border:1px dashed #BBB}td[data-mce-selected],th[data-mce-selected]{background-color:#2276d2 !important}.mce-edit-focus{outline:1px dotted #333}.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus{outline:2px solid #2276d2}.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover{outline:2px solid #2276d2}.mce-content-body *[contentEditable=false][data-mce-selected]{outline:2px solid #2276d2}.mce-content-body.mce-content-readonly *[contentEditable=true]:focus,.mce-content-body.mce-content-readonly *[contentEditable=true]:hover{outline:none}.mce-content-body *[data-mce-selected="inline-boundary"]{background:#bfe6ff}.mce-content-body .mce-item-anchor[data-mce-selected]{background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-content-body hr{cursor:default}.mce-content-body table{-webkit-nbsp-mode:normal}.ephox-snooker-resizer-bar{background-color:#2276d2;opacity:0}.ephox-snooker-resizer-cols{cursor:col-resize}.ephox-snooker-resizer-rows{cursor:row-resize}.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging{opacity:.2}.mce-content-body{line-height:1.3}
\ No newline at end of file
+.word-wrap{word-wrap:break-word;-ms-word-break:break-all;word-break:break-all;word-break:break-word;-ms-hyphens:auto;-moz-hyphens:auto;-webkit-hyphens:auto;hyphens:auto}.mce-content-body .mce-reset{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:black;font-family:Arial;font-size:11px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;line-height:normal;font-weight:normal;text-align:left;-webkit-tap-highlight-color:transparent;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr;max-width:none}.mce-object{border:1px dotted #3A3A3A;background:#D5D5D5 url(img/object.gif) no-repeat center}.mce-preview-object{display:inline-block;position:relative;margin:0 2px 0 2px;line-height:0;border:1px solid gray}.mce-preview-object[data-mce-selected="2"] .mce-shim{display:none}.mce-preview-object .mce-shim{position:absolute;top:0;left:0;width:100%;height:100%;background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)}figure.align-left{float:left}figure.align-right{float:right}figure.image.align-center{display:table;margin-left:auto;margin-right:auto}figure.image{display:inline-block;border:1px solid gray;margin:0 2px 0 1px;background:#f5f2f0}figure.image img{margin:8px 8px 0 8px}figure.image figcaption{margin:6px 8px 6px 8px;text-align:center}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc li{list-style-type:none}.mce-pagebreak{cursor:default;display:block;border:0;width:100%;height:5px;border:1px dashed #666;margin-top:15px;page-break-before:always}@media print{.mce-pagebreak{border:0}}.mce-item-anchor{cursor:default;display:inline-block;-webkit-user-select:all;-webkit-user-modify:read-only;-moz-user-select:all;-moz-user-modify:read-only;user-select:all;user-modify:read-only;width:9px !important;height:9px !important;border:1px dotted #3A3A3A;background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-nbsp,.mce-shy{background:#AAA}.mce-shy::after{content:'-'}.mce-match-marker{background:#AAA;color:#fff}.mce-match-marker-selected{background:#3399ff;color:#fff}.mce-spellchecker-word{border-bottom:2px solid rgba(208,2,27,0.5);cursor:default}.mce-spellchecker-grammar{border-bottom:2px solid #008000;cursor:default}.mce-item-table,.mce-item-table td,.mce-item-table th,.mce-item-table caption{border:1px dashed #BBB}td[data-mce-selected],th[data-mce-selected]{background-color:#2276d2 !important}.mce-edit-focus{outline:1px dotted #333}.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus{outline:2px solid #2276d2}.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover{outline:2px solid #2276d2}.mce-content-body *[contentEditable=false][data-mce-selected]{outline:2px solid #2276d2}.mce-content-body.mce-content-readonly *[contentEditable=true]:focus,.mce-content-body.mce-content-readonly *[contentEditable=true]:hover{outline:none}.mce-content-body *[data-mce-selected="inline-boundary"]{background:#bfe6ff}.mce-content-body .mce-item-anchor[data-mce-selected]{background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-content-body hr{cursor:default}.mce-content-body table{-webkit-nbsp-mode:normal}.ephox-snooker-resizer-bar{background-color:#2276d2;opacity:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.ephox-snooker-resizer-cols{cursor:col-resize}.ephox-snooker-resizer-rows{cursor:row-resize}.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging{opacity:.2}.mce-content-body{line-height:1.3}
\ No newline at end of file
diff --git a/lib/web/tiny_mce_4/skins/lightgray/content.min.css b/lib/web/tiny_mce_4/skins/lightgray/content.min.css
index 1434177df569b..c04313684de9b 100644
--- a/lib/web/tiny_mce_4/skins/lightgray/content.min.css
+++ b/lib/web/tiny_mce_4/skins/lightgray/content.min.css
@@ -1 +1 @@
-body{background-color:#FFFFFF;color:#000000;font-family:Verdana,Arial,Helvetica,sans-serif;font-size:14px;line-height:1.3;scrollbar-3dlight-color:#F0F0EE;scrollbar-arrow-color:#676662;scrollbar-base-color:#F0F0EE;scrollbar-darkshadow-color:#DDDDDD;scrollbar-face-color:#E0E0DD;scrollbar-highlight-color:#F0F0EE;scrollbar-shadow-color:#F0F0EE;scrollbar-track-color:#F5F5F5}td,th{font-family:Verdana,Arial,Helvetica,sans-serif;font-size:14px}.word-wrap{word-wrap:break-word;-ms-word-break:break-all;word-break:break-all;word-break:break-word;-ms-hyphens:auto;-moz-hyphens:auto;-webkit-hyphens:auto;hyphens:auto}.mce-content-body .mce-reset{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:black;font-family:Arial;font-size:11px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;line-height:normal;font-weight:normal;text-align:left;-webkit-tap-highlight-color:transparent;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr;max-width:none}.mce-object{border:1px dotted #3A3A3A;background:#D5D5D5 url(img/object.gif) no-repeat center}.mce-preview-object{display:inline-block;position:relative;margin:0 2px 0 2px;line-height:0;border:1px solid gray}.mce-preview-object[data-mce-selected="2"] .mce-shim{display:none}.mce-preview-object .mce-shim{position:absolute;top:0;left:0;width:100%;height:100%;background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)}figure.align-left{float:left}figure.align-right{float:right}figure.image.align-center{display:table;margin-left:auto;margin-right:auto}figure.image{display:inline-block;border:1px solid gray;margin:0 2px 0 1px;background:#f5f2f0}figure.image img{margin:8px 8px 0 8px}figure.image figcaption{margin:6px 8px 6px 8px;text-align:center}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc li{list-style-type:none}.mce-pagebreak{cursor:default;display:block;border:0;width:100%;height:5px;border:1px dashed #666;margin-top:15px;page-break-before:always}@media print{.mce-pagebreak{border:0}}.mce-item-anchor{cursor:default;display:inline-block;-webkit-user-select:all;-webkit-user-modify:read-only;-moz-user-select:all;-moz-user-modify:read-only;user-select:all;user-modify:read-only;width:9px !important;height:9px !important;border:1px dotted #3A3A3A;background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-nbsp,.mce-shy{background:#AAA}.mce-shy::after{content:'-'}.mce-match-marker{background:#AAA;color:#fff}.mce-match-marker-selected{background:#3399ff;color:#fff}.mce-spellchecker-word{border-bottom:2px solid rgba(208,2,27,0.5);cursor:default}.mce-spellchecker-grammar{border-bottom:2px solid #008000;cursor:default}.mce-item-table,.mce-item-table td,.mce-item-table th,.mce-item-table caption{border:1px dashed #BBB}td[data-mce-selected],th[data-mce-selected]{background-color:#2276d2 !important}.mce-edit-focus{outline:1px dotted #333}.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus{outline:2px solid #2276d2}.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover{outline:2px solid #2276d2}.mce-content-body *[contentEditable=false][data-mce-selected]{outline:2px solid #2276d2}.mce-content-body.mce-content-readonly *[contentEditable=true]:focus,.mce-content-body.mce-content-readonly *[contentEditable=true]:hover{outline:none}.mce-content-body *[data-mce-selected="inline-boundary"]{background:#bfe6ff}.mce-content-body .mce-item-anchor[data-mce-selected]{background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-content-body hr{cursor:default}.mce-content-body table{-webkit-nbsp-mode:normal}.ephox-snooker-resizer-bar{background-color:#2276d2;opacity:0}.ephox-snooker-resizer-cols{cursor:col-resize}.ephox-snooker-resizer-rows{cursor:row-resize}.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging{opacity:.2}
\ No newline at end of file
+body{background-color:#FFFFFF;color:#000000;font-family:Verdana,Arial,Helvetica,sans-serif;font-size:14px;line-height:1.3;scrollbar-3dlight-color:#F0F0EE;scrollbar-arrow-color:#676662;scrollbar-base-color:#F0F0EE;scrollbar-darkshadow-color:#DDDDDD;scrollbar-face-color:#E0E0DD;scrollbar-highlight-color:#F0F0EE;scrollbar-shadow-color:#F0F0EE;scrollbar-track-color:#F5F5F5}td,th{font-family:Verdana,Arial,Helvetica,sans-serif;font-size:14px}.word-wrap{word-wrap:break-word;-ms-word-break:break-all;word-break:break-all;word-break:break-word;-ms-hyphens:auto;-moz-hyphens:auto;-webkit-hyphens:auto;hyphens:auto}.mce-content-body .mce-reset{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:black;font-family:Arial;font-size:11px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;line-height:normal;font-weight:normal;text-align:left;-webkit-tap-highlight-color:transparent;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr;max-width:none}.mce-object{border:1px dotted #3A3A3A;background:#D5D5D5 url(img/object.gif) no-repeat center}.mce-preview-object{display:inline-block;position:relative;margin:0 2px 0 2px;line-height:0;border:1px solid gray}.mce-preview-object[data-mce-selected="2"] .mce-shim{display:none}.mce-preview-object .mce-shim{position:absolute;top:0;left:0;width:100%;height:100%;background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)}figure.align-left{float:left}figure.align-right{float:right}figure.image.align-center{display:table;margin-left:auto;margin-right:auto}figure.image{display:inline-block;border:1px solid gray;margin:0 2px 0 1px;background:#f5f2f0}figure.image img{margin:8px 8px 0 8px}figure.image figcaption{margin:6px 8px 6px 8px;text-align:center}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc li{list-style-type:none}.mce-pagebreak{cursor:default;display:block;border:0;width:100%;height:5px;border:1px dashed #666;margin-top:15px;page-break-before:always}@media print{.mce-pagebreak{border:0}}.mce-item-anchor{cursor:default;display:inline-block;-webkit-user-select:all;-webkit-user-modify:read-only;-moz-user-select:all;-moz-user-modify:read-only;user-select:all;user-modify:read-only;width:9px !important;height:9px !important;border:1px dotted #3A3A3A;background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-nbsp,.mce-shy{background:#AAA}.mce-shy::after{content:'-'}.mce-match-marker{background:#AAA;color:#fff}.mce-match-marker-selected{background:#3399ff;color:#fff}.mce-spellchecker-word{border-bottom:2px solid rgba(208,2,27,0.5);cursor:default}.mce-spellchecker-grammar{border-bottom:2px solid #008000;cursor:default}.mce-item-table,.mce-item-table td,.mce-item-table th,.mce-item-table caption{border:1px dashed #BBB}td[data-mce-selected],th[data-mce-selected]{background-color:#2276d2 !important}.mce-edit-focus{outline:1px dotted #333}.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus{outline:2px solid #2276d2}.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover{outline:2px solid #2276d2}.mce-content-body *[contentEditable=false][data-mce-selected]{outline:2px solid #2276d2}.mce-content-body.mce-content-readonly *[contentEditable=true]:focus,.mce-content-body.mce-content-readonly *[contentEditable=true]:hover{outline:none}.mce-content-body *[data-mce-selected="inline-boundary"]{background:#bfe6ff}.mce-content-body .mce-item-anchor[data-mce-selected]{background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-content-body hr{cursor:default}.mce-content-body table{-webkit-nbsp-mode:normal}.ephox-snooker-resizer-bar{background-color:#2276d2;opacity:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.ephox-snooker-resizer-cols{cursor:col-resize}.ephox-snooker-resizer-rows{cursor:row-resize}.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging{opacity:.2}
\ No newline at end of file
diff --git a/lib/web/tiny_mce_4/themes/inlite/theme.min.js b/lib/web/tiny_mce_4/themes/inlite/theme.min.js
index 3fd22f2c19d71..8eba581ec3b99 100644
--- a/lib/web/tiny_mce_4/themes/inlite/theme.min.js
+++ b/lib/web/tiny_mce_4/themes/inlite/theme.min.js
@@ -1 +1 @@
-!function(_){"use strict";var u,t,e,n,i,r,o=tinymce.util.Tools.resolve("tinymce.ThemeManager"),h=tinymce.util.Tools.resolve("tinymce.Env"),v=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),c=tinymce.util.Tools.resolve("tinymce.util.Delay"),s=function(t){return t.reduce(function(t,e){return Array.isArray(e)?t.concat(s(e)):t.concat(e)},[])},a={flatten:s},l=function(t,e){for(var n=0;n<e.length;n++){var i=(0,e[n])(t);if(i)return i}return null},d=function(t,e){return{id:t,rect:e}},f=function(t){return{x:t.left,y:t.top,w:t.width,h:t.height}},m=function(t){return{left:t.x,top:t.y,width:t.w,height:t.h,right:t.x+t.w,bottom:t.y+t.h}},g=function(t){var e=v.DOM.getViewPort();return{x:t.x+e.x,y:t.y+e.y,w:t.w,h:t.h}},p=function(t){var e=t.getBoundingClientRect();return g({x:e.left,y:e.top,w:Math.max(t.clientWidth,t.offsetWidth),h:Math.max(t.clientHeight,t.offsetHeight)})},y=function(t,e){return p(e)},b=function(t){return p(t.getContentAreaContainer()||t.getBody())},x=function(t){var e=t.selection.getBoundingClientRect();return e?g(f(e)):null},w=function(n,i){return function(t){for(var e=0;e<i.length;e++)if(i[e].predicate(n))return d(i[e].id,y(t,n));return null}},R=function(i,r){return function(t){for(var e=0;e<i.length;e++)for(var n=0;n<r.length;n++)if(r[n].predicate(i[e]))return d(r[n].id,y(t,i[e]));return null}},C=tinymce.util.Tools.resolve("tinymce.util.Tools"),k=function(t,e){return{id:t,predicate:e}},E=function(t){return C.map(t,function(t){return k(t.id,t.predicate)})},H=function(e){return function(t){return t.selection.isCollapsed()?null:d(e,x(t))}},T=function(i,r){return function(t){var e,n=t.schema.getTextBlockElements();for(e=0;e<i.length;e++)if("TABLE"===i[e].nodeName)return null;for(e=0;e<i.length;e++)if(i[e].nodeName in n)return t.dom.isEmpty(i[e])?d(r,x(t)):null;return null}},S=function(t){t.fire("SkinLoaded")},M=function(t){return t.fire("BeforeRenderUI")},N=tinymce.util.Tools.resolve("tinymce.EditorManager"),O=function(e){return function(t){return typeof t===e}},P=function(t){return Array.isArray(t)},W=function(t){return O("string")(t)},D=function(t){return O("number")(t)},A=function(t){return O("boolean")(t)},B=function(t){return O("function")(t)},L=(O("object"),P),I=function(t,e){if(e(t))return!0;throw new Error("Default value doesn't match requested type.")},z=function(r){return function(t,e,n){var i=t.settings;return I(n,r),e in i&&r(i[e])?i[e]:n}},F={getStringOr:z(W),getBoolOr:z(A),getNumberOr:z(D),getHandlerOr:z(B),getToolbarItemsOr:(u=L,function(t,e,n){var i,r,o,s,a,l=e in t.settings?t.settings[e]:n;return I(n,u),r=n,L(i=l)?i:W(i)?"string"==typeof(s=i)?(a=/[ ,]/,s.split(a).filter(function(t){return 0<t.length})):s:A(i)?(o=r,!1===i?[]:o):r})},U=tinymce.util.Tools.resolve("tinymce.geom.Rect"),V=function(t,e){return{rect:t,position:e}},q=function(t,e){return{x:e.x,y:e.y,w:t.w,h:t.h}},Y=function(t,e,n,i,r){var o,s,a,l={x:i.x,y:i.y,w:i.w+(i.w<r.w+n.w?r.w:0),h:i.h+(i.h<r.h+n.h?r.h:0)};return o=U.findBestRelativePosition(r,n,l,t),n=U.clamp(n,l),o?(s=U.relativePosition(r,n,o),a=q(r,s),V(a,o)):(n=U.intersect(l,n))?((o=U.findBestRelativePosition(r,n,l,e))?(s=U.relativePosition(r,n,o),a=q(r,s)):a=q(r,n),V(a,o)):null},$=function(t,e,n){return Y(["cr-cl","cl-cr"],["bc-tc","bl-tl","br-tr"],t,e,n)},X=function(t,e,n){return Y(["tc-bc","bc-tc","tl-bl","bl-tl","tr-br","br-tr","cr-cl","cl-cr"],["bc-tc","bl-tl","br-tr","cr-cl"],t,e,n)},j=function(t,e,n,i){var r;return"function"==typeof t?(r=t({elementRect:m(e),contentAreaRect:m(n),panelRect:m(i)}),f(r)):i},J=function(t){return t.panelRect},G=function(t){return F.getToolbarItemsOr(t,"selection_toolbar",["bold","italic","|","quicklink","h2","h3","blockquote"])},K=function(t){return F.getToolbarItemsOr(t,"insert_toolbar",["quickimage","quicktable"])},Z=function(t){return F.getHandlerOr(t,"inline_toolbar_position_handler",J)},Q=function(t){var e,n,i,r,o=t.settings;return o.skin_url?(i=t,r=o.skin_url,i.documentBaseURI.toAbsolute(r)):(e=o.skin,n=N.baseURL+"/skins/",e?n+e:n+"lightgray")},tt=function(t){return!1===t.settings.skin},et=function(i,r){var t=Q(i),e=function(){var t,e,n;e=r,n=function(){t._skinLoaded=!0,S(t),e()},(t=i).initialized?n():t.on("init",n)};tt(i)?e():(v.DOM.styleSheetLoader.load(t+"/skin.min.css",e),i.contentCSS.push(t+"/content.inline.min.css"))},nt=function(t){var e,n,i,r,o=t.contextToolbars;return a.flatten([o||[],(e=t,n="img",i="image",r="alignleft aligncenter alignright",{predicate:function(t){return e.dom.is(t,n)},id:i,items:r})])},it=function(t,e){var n,i,r,o,s;return s=(o=t).selection.getNode(),i=o.dom.getParents(s,"*"),r=E(e),(n=l(t,[w(i[0],r),H("text"),T(i,"insert"),R(i,r)]))&&n.rect?n:null},rt=function(i,r){return function(){var t,e,n;i.removed||(n=i,_.document.activeElement!==n.getBody())||(t=nt(i),(e=it(i,t))?r.show(i,e.id,e.rect,t):r.hide())}},ot=function(t,e){var n,i,r,o,s,a=c.throttle(rt(t,e),0),l=c.throttle((r=rt(n=t,i=e),function(){n.removed||i.inForm()||r()}),0),u=(o=t,s=e,function(){var t=nt(o),e=it(o,t);e&&s.reposition(o,e.id,e.rect)});t.on("blur hide ObjectResizeStart",e.hide),t.on("click",a),t.on("nodeChange mouseup",l),t.on("ResizeEditor keyup",a),t.on("ResizeWindow",u),v.DOM.bind(h.container,"scroll",u),t.on("remove",function(){v.DOM.unbind(h.container,"scroll",u),e.remove()}),t.shortcuts.add("Alt+F10,F10","",e.focus)},st=function(t,e){return et(t,function(){var n,i;ot(t,e),i=e,(n=t).shortcuts.remove("meta+k"),n.shortcuts.add("meta+k","",function(){var t=nt(n),e=l(n,[H("quicklink")]);e&&i.show(n,e.id,e.rect,t)})}),{}},at=function(t,e){return t.inline?st(t,e):function(t){throw new Error(t)}("inlite theme only supports inline mode.")},lt=function(){},ut=function(t){return function(){return t}},ct=ut(!1),dt=ut(!0),ft=ct,ht=dt,mt=function(){return gt},gt=(i={fold:function(t,e){return t()},is:ft,isSome:ft,isNone:ht,getOr:n=function(t){return t},getOrThunk:e=function(t){return t()},getOrDie:function(t){throw new Error(t||"error: getOrDie called on none.")},getOrNull:function(){return null},getOrUndefined:function(){return undefined},or:n,orThunk:e,map:mt,ap:mt,each:function(){},bind:mt,flatten:mt,exists:ft,forall:ht,filter:mt,equals:t=function(t){return t.isNone()},equals_:t,toArray:function(){return[]},toString:ut("none()")},Object.freeze&&Object.freeze(i),i),pt=function(n){var t=function(){return n},e=function(){return r},i=function(t){return t(n)},r={fold:function(t,e){return e(n)},is:function(t){return n===t},isSome:ht,isNone:ft,getOr:t,getOrThunk:t,getOrDie:t,getOrNull:t,getOrUndefined:t,or:e,orThunk:e,map:function(t){return pt(t(n))},ap:function(t){return t.fold(mt,function(t){return pt(t(n))})},each:function(t){t(n)},bind:i,flatten:t,exists:i,forall:i,filter:function(t){return t(n)?r:gt},equals:function(t){return t.is(n)},equals_:function(t,e){return t.fold(ft,function(t){return e(n,t)})},toArray:function(){return[n]},toString:function(){return"some("+n+")"}};return r},vt={some:pt,none:mt,from:function(t){return null===t||t===undefined?gt:pt(t)}},yt=function(e){return function(t){return function(t){if(null===t)return"null";var e=typeof t;return"object"===e&&(Array.prototype.isPrototypeOf(t)||t.constructor&&"Array"===t.constructor.name)?"array":"object"===e&&(String.prototype.isPrototypeOf(t)||t.constructor&&"String"===t.constructor.name)?"string":e}(t)===e}},bt=yt("function"),xt=yt("number"),wt=(Array.prototype.slice,(r=Array.prototype.indexOf)===undefined?function(t,e){return Ht(t,e)}:function(t,e){return r.call(t,e)}),_t=function(t,e){return Et(t,e).isSome()},Rt=function(t,e){for(var n=t.length,i=new Array(n),r=0;r<n;r++){var o=t[r];i[r]=e(o,r,t)}return i},Ct=function(t,e){for(var n=0,i=t.length;n<i;n++)e(t[n],n,t)},kt=function(t,e){for(var n=[],i=0,r=t.length;i<r;i++){var o=t[i];e(o,i,t)&&n.push(o)}return n},Et=function(t,e){for(var n=0,i=t.length;n<i;n++)if(e(t[n],n,t))return vt.some(n);return vt.none()},Ht=function(t,e){for(var n=0,i=t.length;n<i;++n)if(t[n]===e)return n;return-1},Tt=Array.prototype.push,St=(bt(Array.from)&&Array.from,0),Mt={id:function(){return"mceu_"+St++},create:function(t,e,n){var i=_.document.createElement(t);return v.DOM.setAttribs(i,e),"string"==typeof n?i.innerHTML=n:C.each(n,function(t){t.nodeType&&i.appendChild(t)}),i},createFragment:function(t){return v.DOM.createFragment(t)},getWindowSize:function(){return v.DOM.getViewPort()},getSize:function(t){var e,n;if(t.getBoundingClientRect){var i=t.getBoundingClientRect();e=Math.max(i.width||i.right-i.left,t.offsetWidth),n=Math.max(i.height||i.bottom-i.bottom,t.offsetHeight)}else e=t.offsetWidth,n=t.offsetHeight;return{width:e,height:n}},getPos:function(t,e){return v.DOM.getPos(t,e||Mt.getContainer())},getContainer:function(){return h.container?h.container:_.document.body},getViewPort:function(t){return v.DOM.getViewPort(t)},get:function(t){return _.document.getElementById(t)},addClass:function(t,e){return v.DOM.addClass(t,e)},removeClass:function(t,e){return v.DOM.removeClass(t,e)},hasClass:function(t,e){return v.DOM.hasClass(t,e)},toggleClass:function(t,e,n){return v.DOM.toggleClass(t,e,n)},css:function(t,e,n){return v.DOM.setStyle(t,e,n)},getRuntimeStyle:function(t,e){return v.DOM.getStyle(t,e,!0)},on:function(t,e,n,i){return v.DOM.bind(t,e,n,i)},off:function(t,e,n){return v.DOM.unbind(t,e,n)},fire:function(t,e,n){return v.DOM.fire(t,e,n)},innerHtml:function(t,e){v.DOM.setHTML(t,e)}},Nt=tinymce.util.Tools.resolve("tinymce.dom.DomQuery"),Ot=tinymce.util.Tools.resolve("tinymce.util.Class"),Pt=tinymce.util.Tools.resolve("tinymce.util.EventDispatcher"),Wt=function(t){var e;if(t)return"number"==typeof t?{top:t=t||0,left:t,bottom:t,right:t}:(1===(e=(t=t.split(" ")).length)?t[1]=t[2]=t[3]=t[0]:2===e?(t[2]=t[0],t[3]=t[1]):3===e&&(t[3]=t[1]),{top:parseInt(t[0],10)||0,right:parseInt(t[1],10)||0,bottom:parseInt(t[2],10)||0,left:parseInt(t[3],10)||0})},Dt=function(i,t){function e(t){var e=parseFloat(function(t){var e=i.ownerDocument.defaultView;if(e){var n=e.getComputedStyle(i,null);return n?(t=t.replace(/[A-Z]/g,function(t){return"-"+t}),n.getPropertyValue(t)):null}return i.currentStyle[t]}(t));return isNaN(e)?0:e}return{top:e(t+"TopWidth"),right:e(t+"RightWidth"),bottom:e(t+"BottomWidth"),left:e(t+"LeftWidth")}};function At(){}function Bt(t){this.cls=[],this.cls._map={},this.onchange=t||At,this.prefix=""}C.extend(Bt.prototype,{add:function(t){return t&&!this.contains(t)&&(this.cls._map[t]=!0,this.cls.push(t),this._change()),this},remove:function(t){if(this.contains(t)){var e=void 0;for(e=0;e<this.cls.length&&this.cls[e]!==t;e++);this.cls.splice(e,1),delete this.cls._map[t],this._change()}return this},toggle:function(t,e){var n=this.contains(t);return n!==e&&(n?this.remove(t):this.add(t),this._change()),this},contains:function(t){return!!this.cls._map[t]},_change:function(){delete this.clsValue,this.onchange.call(this)}}),Bt.prototype.toString=function(){var t;if(this.clsValue)return this.clsValue;t="";for(var e=0;e<this.cls.length;e++)0<e&&(t+=" "),t+=this.prefix+this.cls[e];return t};var Lt,It,zt,Ft=/^([\w\\*]+)?(?:#([\w\-\\]+))?(?:\.([\w\\\.]+))?(?:\[\@?([\w\\]+)([\^\$\*!~]?=)([\w\\]+)\])?(?:\:(.+))?/i,Ut=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,Vt=/^\s*|\s*$/g,qt=Ot.extend({init:function(t){var o=this.match;function s(t,e,n){var i;function r(t){t&&e.push(t)}return r(function(e){if(e)return e=e.toLowerCase(),function(t){return"*"===e||t.type===e}}((i=Ft.exec(t.replace(Vt,"")))[1])),r(function(e){if(e)return function(t){return t._name===e}}(i[2])),r(function(n){if(n)return n=n.split("."),function(t){for(var e=n.length;e--;)if(!t.classes.contains(n[e]))return!1;return!0}}(i[3])),r(function(n,i,r){if(n)return function(t){var e=t[n]?t[n]():"";return i?"="===i?e===r:"*="===i?0<=e.indexOf(r):"~="===i?0<=(" "+e+" ").indexOf(" "+r+" "):"!="===i?e!==r:"^="===i?0===e.indexOf(r):"$="===i&&e.substr(e.length-r.length)===r:!!r}}(i[4],i[5],i[6])),r(function(i){var e;if(i)return(i=/(?:not\((.+)\))|(.+)/i.exec(i))[1]?(e=a(i[1],[]),function(t){return!o(t,e)}):(i=i[2],function(t,e,n){return"first"===i?0===e:"last"===i?e===n-1:"even"===i?e%2==0:"odd"===i?e%2==1:!!t[i]&&t[i]()})}(i[7])),e.pseudo=!!i[7],e.direct=n,e}function a(t,e){var n,i,r,o=[];do{if(Ut.exec(""),(i=Ut.exec(t))&&(t=i[3],o.push(i[1]),i[2])){n=i[3];break}}while(i);for(n&&a(n,e),t=[],r=0;r<o.length;r++)">"!==o[r]&&t.push(s(o[r],[],">"===o[r-1]));return e.push(t),e}this._selectors=a(t,[])},match:function(t,e){var n,i,r,o,s,a,l,u,c,d,f,h,m;for(n=0,i=(e=e||this._selectors).length;n<i;n++){for(m=t,h=0,r=(o=(s=e[n]).length)-1;0<=r;r--)for(u=s[r];m;){if(u.pseudo)for(c=d=(f=m.parent().items()).length;c--&&f[c]!==m;);for(a=0,l=u.length;a<l;a++)if(!u[a](m,c,d)){a=l+1;break}if(a===l){h++;break}if(r===o-1)break;m=m.parent()}if(h===o)return!0}return!1},find:function(t){var e,n,u=[],i=this._selectors;function c(t,e,n){var i,r,o,s,a,l=e[n];for(i=0,r=t.length;i<r;i++){for(a=t[i],o=0,s=l.length;o<s;o++)if(!l[o](a,i,r)){o=s+1;break}if(o===s)n===e.length-1?u.push(a):a.items&&c(a.items(),e,n+1);else if(l.direct)return;a.items&&c(a.items(),e,n)}}if(t.items){for(e=0,n=i.length;e<n;e++)c(t.items(),i[e],0);1<n&&(u=function(t){for(var e,n=[],i=t.length;i--;)(e=t[i]).__checked||(n.push(e),e.__checked=1);for(i=n.length;i--;)delete n[i].__checked;return n}(u))}return Lt||(Lt=qt.Collection),new Lt(u)}}),Yt=Array.prototype.push,$t=Array.prototype.slice;zt={length:0,init:function(t){t&&this.add(t)},add:function(t){return C.isArray(t)?Yt.apply(this,t):t instanceof It?this.add(t.toArray()):Yt.call(this,t),this},set:function(t){var e,n=this,i=n.length;for(n.length=0,n.add(t),e=n.length;e<i;e++)delete n[e];return n},filter:function(e){var t,n,i,r,o=[];for("string"==typeof e?(e=new qt(e),r=function(t){return e.match(t)}):r=e,t=0,n=this.length;t<n;t++)r(i=this[t])&&o.push(i);return new It(o)},slice:function(){return new It($t.apply(this,arguments))},eq:function(t){return-1===t?this.slice(t):this.slice(t,+t+1)},each:function(t){return C.each(this,t),this},toArray:function(){return C.toArray(this)},indexOf:function(t){for(var e=this.length;e--&&this[e]!==t;);return e},reverse:function(){return new It(C.toArray(this).reverse())},hasClass:function(t){return!!this[0]&&this[0].classes.contains(t)},prop:function(e,n){var t;return n!==undefined?(this.each(function(t){t[e]&&t[e](n)}),this):(t=this[0])&&t[e]?t[e]():void 0},exec:function(e){var n=C.toArray(arguments).slice(1);return this.each(function(t){t[e]&&t[e].apply(t,n)}),this},remove:function(){for(var t=this.length;t--;)this[t].remove();return this},addClass:function(e){return this.each(function(t){t.classes.add(e)})},removeClass:function(e){return this.each(function(t){t.classes.remove(e)})}},C.each("fire on off show hide append prepend before after reflow".split(" "),function(n){zt[n]=function(){var e=C.toArray(arguments);return this.each(function(t){n in t&&t[n].apply(t,e)}),this}}),C.each("text name disabled active selected checked visible parent value data".split(" "),function(e){zt[e]=function(t){return this.prop(e,t)}}),It=Ot.extend(zt);var Xt=qt.Collection=It,jt=function(t){this.create=t.create};jt.create=function(r,o){return new jt({create:function(e,n){var i,t=function(t){e.set(n,t.value)};return e.on("change:"+n,function(t){r.set(o,t.value)}),r.on("change:"+o,t),(i=e._bindings)||(i=e._bindings=[],e.on("destroy",function(){for(var t=i.length;t--;)i[t]()})),i.push(function(){r.off("change:"+o,t)}),r.get(o)}})};var Jt=tinymce.util.Tools.resolve("tinymce.util.Observable");function Gt(t){return 0<t.nodeType}var Kt,Zt,Qt=Ot.extend({Mixins:[Jt],init:function(t){var e,n;for(e in t=t||{})(n=t[e])instanceof jt&&(t[e]=n.create(this,e));this.data=t},set:function(e,n){var i,r,o=this.data[e];if(n instanceof jt&&(n=n.create(this,e)),"object"==typeof e){for(i in e)this.set(i,e[i]);return this}return function t(e,n){var i,r;if(e===n)return!0;if(null===e||null===n)return e===n;if("object"!=typeof e||"object"!=typeof n)return e===n;if(C.isArray(n)){if(e.length!==n.length)return!1;for(i=e.length;i--;)if(!t(e[i],n[i]))return!1}if(Gt(e)||Gt(n))return e===n;for(i in r={},n){if(!t(e[i],n[i]))return!1;r[i]=!0}for(i in e)if(!r[i]&&!t(e[i],n[i]))return!1;return!0}(o,n)||(this.data[e]=n,r={target:this,name:e,value:n,oldValue:o},this.fire("change:"+e,r),this.fire("change",r)),this},get:function(t){return this.data[t]},has:function(t){return t in this.data},bind:function(t){return jt.create(this,t)},destroy:function(){this.fire("destroy")}}),te={},ee={add:function(t){var e=t.parent();if(e){if(!e._layout||e._layout.isNative())return;te[e._id]||(te[e._id]=e),Kt||(Kt=!0,c.requestAnimationFrame(function(){var t,e;for(t in Kt=!1,te)(e=te[t]).state.get("rendered")&&e.reflow();te={}},_.document.body))}},remove:function(t){te[t._id]&&delete te[t._id]}},ne=function(t){return t?t.getRoot().uiContainer:null},ie={getUiContainerDelta:function(t){var e=ne(t);if(e&&"static"!==v.DOM.getStyle(e,"position",!0)){var n=v.DOM.getPos(e),i=e.scrollLeft-n.x,r=e.scrollTop-n.y;return vt.some({x:i,y:r})}return vt.none()},setUiContainer:function(t,e){var n=v.DOM.select(t.settings.ui_container)[0];e.getRoot().uiContainer=n},getUiContainer:ne,inheritUiContainer:function(t,e){return e.uiContainer=ne(t)}},re="onmousewheel"in _.document,oe=!1,se=0,ae={Statics:{classPrefix:"mce-"},isRtl:function(){return Zt.rtl},classPrefix:"mce-",init:function(e){var t,n,i=this;function r(t){var e;for(t=t.split(" "),e=0;e<t.length;e++)i.classes.add(t[e])}i.settings=e=C.extend({},i.Defaults,e),i._id=e.id||"mceu_"+se++,i._aria={role:e.role},i._elmCache={},i.$=Nt,i.state=new Qt({visible:!0,active:!1,disabled:!1,value:""}),i.data=new Qt(e.data),i.classes=new Bt(function(){i.state.get("rendered")&&(i.getEl().className=this.toString())}),i.classes.prefix=i.classPrefix,(t=e.classes)&&(i.Defaults&&(n=i.Defaults.classes)&&t!==n&&r(n),r(t)),C.each("title text name visible disabled active value".split(" "),function(t){t in e&&i[t](e[t])}),i.on("click",function(){if(i.disabled())return!1}),i.settings=e,i.borderBox=Wt(e.border),i.paddingBox=Wt(e.padding),i.marginBox=Wt(e.margin),e.hidden&&i.hide()},Properties:"parent,name",getContainerElm:function(){var t=ie.getUiContainer(this);return t||Mt.getContainer()},getParentCtrl:function(t){for(var e,n=this.getRoot().controlIdLookup;t&&n&&!(e=n[t.id]);)t=t.parentNode;return e},initLayoutRect:function(){var t,e,n,i,r,o,s,a,l,u,c=this,d=c.settings,f=c.getEl();t=c.borderBox=c.borderBox||Dt(f,"border"),c.paddingBox=c.paddingBox||Dt(f,"padding"),c.marginBox=c.marginBox||Dt(f,"margin"),u=Mt.getSize(f),a=d.minWidth,l=d.minHeight,r=a||u.width,o=l||u.height,n=d.width,i=d.height,s=void 0!==(s=d.autoResize)?s:!n&&!i,n=n||r,i=i||o;var h=t.left+t.right,m=t.top+t.bottom,g=d.maxWidth||65535,p=d.maxHeight||65535;return c._layoutRect=e={x:d.x||0,y:d.y||0,w:n,h:i,deltaW:h,deltaH:m,contentW:n-h,contentH:i-m,innerW:n-h,innerH:i-m,startMinWidth:a||0,startMinHeight:l||0,minW:Math.min(r,g),minH:Math.min(o,p),maxW:g,maxH:p,autoResize:s,scrollW:0},c._lastLayoutRect={},e},layoutRect:function(t){var e,n,i,r,o,s=this,a=s._layoutRect;return a||(a=s.initLayoutRect()),t?(i=a.deltaW,r=a.deltaH,t.x!==undefined&&(a.x=t.x),t.y!==undefined&&(a.y=t.y),t.minW!==undefined&&(a.minW=t.minW),t.minH!==undefined&&(a.minH=t.minH),(n=t.w)!==undefined&&(n=(n=n<a.minW?a.minW:n)>a.maxW?a.maxW:n,a.w=n,a.innerW=n-i),(n=t.h)!==undefined&&(n=(n=n<a.minH?a.minH:n)>a.maxH?a.maxH:n,a.h=n,a.innerH=n-r),(n=t.innerW)!==undefined&&(n=(n=n<a.minW-i?a.minW-i:n)>a.maxW-i?a.maxW-i:n,a.innerW=n,a.w=n+i),(n=t.innerH)!==undefined&&(n=(n=n<a.minH-r?a.minH-r:n)>a.maxH-r?a.maxH-r:n,a.innerH=n,a.h=n+r),t.contentW!==undefined&&(a.contentW=t.contentW),t.contentH!==undefined&&(a.contentH=t.contentH),(e=s._lastLayoutRect).x===a.x&&e.y===a.y&&e.w===a.w&&e.h===a.h||((o=Zt.repaintControls)&&o.map&&!o.map[s._id]&&(o.push(s),o.map[s._id]=!0),e.x=a.x,e.y=a.y,e.w=a.w,e.h=a.h),s):a},repaint:function(){var t,e,n,i,r,o,s,a,l,u,c=this;l=_.document.createRange?function(t){return t}:Math.round,t=c.getEl().style,i=c._layoutRect,a=c._lastRepaintRect||{},o=(r=c.borderBox).left+r.right,s=r.top+r.bottom,i.x!==a.x&&(t.left=l(i.x)+"px",a.x=i.x),i.y!==a.y&&(t.top=l(i.y)+"px",a.y=i.y),i.w!==a.w&&(u=l(i.w-o),t.width=(0<=u?u:0)+"px",a.w=i.w),i.h!==a.h&&(u=l(i.h-s),t.height=(0<=u?u:0)+"px",a.h=i.h),c._hasBody&&i.innerW!==a.innerW&&(u=l(i.innerW),(n=c.getEl("body"))&&((e=n.style).width=(0<=u?u:0)+"px"),a.innerW=i.innerW),c._hasBody&&i.innerH!==a.innerH&&(u=l(i.innerH),(n=n||c.getEl("body"))&&((e=e||n.style).height=(0<=u?u:0)+"px"),a.innerH=i.innerH),c._lastRepaintRect=a,c.fire("repaint",{},!1)},updateLayoutRect:function(){var t=this;t.parent()._lastRect=null,Mt.css(t.getEl(),{width:"",height:""}),t._layoutRect=t._lastRepaintRect=t._lastLayoutRect=null,t.initLayoutRect()},on:function(t,e){var n,i,r,o=this;return le(o).on(t,"string"!=typeof(n=e)?n:function(t){return i||o.parentsAndSelf().each(function(t){var e=t.settings.callbacks;if(e&&(i=e[n]))return r=t,!1}),i?i.call(r,t):(t.action=n,void this.fire("execute",t))}),o},off:function(t,e){return le(this).off(t,e),this},fire:function(t,e,n){if((e=e||{}).control||(e.control=this),e=le(this).fire(t,e),!1!==n&&this.parent)for(var i=this.parent();i&&!e.isPropagationStopped();)i.fire(t,e,!1),i=i.parent();return e},hasEventListeners:function(t){return le(this).has(t)},parents:function(t){var e,n=new Xt;for(e=this.parent();e;e=e.parent())n.add(e);return t&&(n=n.filter(t)),n},parentsAndSelf:function(t){return new Xt(this).add(this.parents(t))},next:function(){var t=this.parent().items();return t[t.indexOf(this)+1]},prev:function(){var t=this.parent().items();return t[t.indexOf(this)-1]},innerHtml:function(t){return this.$el.html(t),this},getEl:function(t){var e=t?this._id+"-"+t:this._id;return this._elmCache[e]||(this._elmCache[e]=Nt("#"+e)[0]),this._elmCache[e]},show:function(){return this.visible(!0)},hide:function(){return this.visible(!1)},focus:function(){try{this.getEl().focus()}catch(t){}return this},blur:function(){return this.getEl().blur(),this},aria:function(t,e){var n=this,i=n.getEl(n.ariaTarget);return void 0===e?n._aria[t]:(n._aria[t]=e,n.state.get("rendered")&&i.setAttribute("role"===t?t:"aria-"+t,e),n)},encode:function(t,e){return!1!==e&&(t=this.translate(t)),(t||"").replace(/[&<>"]/g,function(t){return"&#"+t.charCodeAt(0)+";"})},translate:function(t){return Zt.translate?Zt.translate(t):t},before:function(t){var e=this.parent();return e&&e.insert(t,e.items().indexOf(this),!0),this},after:function(t){var e=this.parent();return e&&e.insert(t,e.items().indexOf(this)),this},remove:function(){var e,t,n=this,i=n.getEl(),r=n.parent();if(n.items){var o=n.items().toArray();for(t=o.length;t--;)o[t].remove()}r&&r.items&&(e=[],r.items().each(function(t){t!==n&&e.push(t)}),r.items().set(e),r._lastRect=null),n._eventsRoot&&n._eventsRoot===n&&Nt(i).off();var s=n.getRoot().controlIdLookup;return s&&delete s[n._id],i&&i.parentNode&&i.parentNode.removeChild(i),n.state.set("rendered",!1),n.state.destroy(),n.fire("remove"),n},renderBefore:function(t){return Nt(t).before(this.renderHtml()),this.postRender(),this},renderTo:function(t){return Nt(t||this.getContainerElm()).append(this.renderHtml()),this.postRender(),this},preRender:function(){},render:function(){},renderHtml:function(){return'<div id="'+this._id+'" class="'+this.classes+'"></div>'},postRender:function(){var t,e,n,i,r,o=this,s=o.settings;for(i in o.$el=Nt(o.getEl()),o.state.set("rendered",!0),s)0===i.indexOf("on")&&o.on(i.substr(2),s[i]);if(o._eventsRoot){for(n=o.parent();!r&&n;n=n.parent())r=n._eventsRoot;if(r)for(i in r._nativeEvents)o._nativeEvents[i]=!0}ue(o),s.style&&(t=o.getEl())&&(t.setAttribute("style",s.style),t.style.cssText=s.style),o.settings.border&&(e=o.borderBox,o.$el.css({"border-top-width":e.top,"border-right-width":e.right,"border-bottom-width":e.bottom,"border-left-width":e.left}));var a=o.getRoot();for(var l in a.controlIdLookup||(a.controlIdLookup={}),(a.controlIdLookup[o._id]=o)._aria)o.aria(l,o._aria[l]);!1===o.state.get("visible")&&(o.getEl().style.display="none"),o.bindStates(),o.state.on("change:visible",function(t){var e,n=t.value;o.state.get("rendered")&&(o.getEl().style.display=!1===n?"none":"",o.getEl().getBoundingClientRect()),(e=o.parent())&&(e._lastRect=null),o.fire(n?"show":"hide"),ee.add(o)}),o.fire("postrender",{},!1)},bindStates:function(){},scrollIntoView:function(t){var e,n,i,r,o,s,a=this.getEl(),l=a.parentNode,u=function(t,e){var n,i,r=t;for(n=i=0;r&&r!==e&&r.nodeType;)n+=r.offsetLeft||0,i+=r.offsetTop||0,r=r.offsetParent;return{x:n,y:i}}(a,l);return e=u.x,n=u.y,i=a.offsetWidth,r=a.offsetHeight,o=l.clientWidth,s=l.clientHeight,"end"===t?(e-=o-i,n-=s-r):"center"===t&&(e-=o/2-i/2,n-=s/2-r/2),l.scrollLeft=e,l.scrollTop=n,this},getRoot:function(){for(var t,e=this,n=[];e;){if(e.rootControl){t=e.rootControl;break}n.push(e),e=(t=e).parent()}t||(t=this);for(var i=n.length;i--;)n[i].rootControl=t;return t},reflow:function(){ee.remove(this);var t=this.parent();return t&&t._layout&&!t._layout.isNative()&&t.reflow(),this}};function le(n){return n._eventDispatcher||(n._eventDispatcher=new Pt({scope:n,toggleEvent:function(t,e){e&&Pt.isNative(t)&&(n._nativeEvents||(n._nativeEvents={}),n._nativeEvents[t]=!0,n.state.get("rendered")&&ue(n))}})),n._eventDispatcher}function ue(a){var t,e,n,l,i,r;function o(t){var e=a.getParentCtrl(t.target);e&&e.fire(t.type,t)}function s(){var t=l._lastHoverCtrl;t&&(t.fire("mouseleave",{target:t.getEl()}),t.parents().each(function(t){t.fire("mouseleave",{target:t.getEl()})}),l._lastHoverCtrl=null)}function u(t){var e,n,i,r=a.getParentCtrl(t.target),o=l._lastHoverCtrl,s=0;if(r!==o){if((n=(l._lastHoverCtrl=r).parents().toArray().reverse()).push(r),o){for((i=o.parents().toArray().reverse()).push(o),s=0;s<i.length&&n[s]===i[s];s++);for(e=i.length-1;s<=e;e--)(o=i[e]).fire("mouseleave",{target:o.getEl()})}for(e=s;e<n.length;e++)(r=n[e]).fire("mouseenter",{target:r.getEl()})}}function c(t){t.preventDefault(),"mousewheel"===t.type?(t.deltaY=-.025*t.wheelDelta,t.wheelDeltaX&&(t.deltaX=-.025*t.wheelDeltaX)):(t.deltaX=0,t.deltaY=t.detail),t=a.fire("wheel",t)}if(i=a._nativeEvents){for((n=a.parents().toArray()).unshift(a),t=0,e=n.length;!l&&t<e;t++)l=n[t]._eventsRoot;for(l||(l=n[n.length-1]||a),a._eventsRoot=l,e=t,t=0;t<e;t++)n[t]._eventsRoot=l;var d=l._delegates;for(r in d||(d=l._delegates={}),i){if(!i)return!1;"wheel"!==r||oe?("mouseenter"===r||"mouseleave"===r?l._hasMouseEnter||(Nt(l.getEl()).on("mouseleave",s).on("mouseover",u),l._hasMouseEnter=1):d[r]||(Nt(l.getEl()).on(r,o),d[r]=!0),i[r]=!1):re?Nt(a.getEl()).on("mousewheel",c):Nt(a.getEl()).on("DOMMouseScroll",c)}}}C.each("text title visible disabled active value".split(" "),function(e){ae[e]=function(t){return 0===arguments.length?this.state.get(e):(void 0!==t&&this.state.set(e,t),this)}});var ce=Zt=Ot.extend(ae),de=function(t){return"static"===Mt.getRuntimeStyle(t,"position")},fe=function(t){return t.state.get("fixed")};function he(t,e,n){var i,r,o,s,a,l,u,c,d,f;return d=me(),o=(r=Mt.getPos(e,ie.getUiContainer(t))).x,s=r.y,fe(t)&&de(_.document.body)&&(o-=d.x,s-=d.y),i=t.getEl(),a=(f=Mt.getSize(i)).width,l=f.height,u=(f=Mt.getSize(e)).width,c=f.height,"b"===(n=(n||"").split(""))[0]&&(s+=c),"r"===n[1]&&(o+=u),"c"===n[0]&&(s+=Math.round(c/2)),"c"===n[1]&&(o+=Math.round(u/2)),"b"===n[3]&&(s-=l),"r"===n[4]&&(o-=a),"c"===n[3]&&(s-=Math.round(l/2)),"c"===n[4]&&(o-=Math.round(a/2)),{x:o,y:s,w:a,h:l}}var me=function(){var t=_.window;return{x:Math.max(t.pageXOffset,_.document.body.scrollLeft,_.document.documentElement.scrollLeft),y:Math.max(t.pageYOffset,_.document.body.scrollTop,_.document.documentElement.scrollTop),w:t.innerWidth||_.document.documentElement.clientWidth,h:t.innerHeight||_.document.documentElement.clientHeight}},ge=function(t){var e,n=ie.getUiContainer(t);return n&&!fe(t)?{x:0,y:0,w:(e=n).scrollWidth-1,h:e.scrollHeight-1}:me()},pe={testMoveRel:function(t,e){for(var n=ge(this),i=0;i<e.length;i++){var r=he(this,t,e[i]);if(fe(this)){if(0<r.x&&r.x+r.w<n.w&&0<r.y&&r.y+r.h<n.h)return e[i]}else if(r.x>n.x&&r.x+r.w<n.w+n.x&&r.y>n.y&&r.y+r.h<n.h+n.y)return e[i]}return e[0]},moveRel:function(t,e){"string"!=typeof e&&(e=this.testMoveRel(t,e));var n=he(this,t,e);return this.moveTo(n.x,n.y)},moveBy:function(t,e){var n=this.layoutRect();return this.moveTo(n.x+t,n.y+e),this},moveTo:function(t,e){var n=this;function i(t,e,n){return t<0?0:e<t+n&&(t=e-n)<0?0:t}if(n.settings.constrainToViewport){var r=ge(this),o=n.layoutRect();t=i(t,r.w+r.x,o.w),e=i(e,r.h+r.y,o.h)}var s=ie.getUiContainer(n);return s&&de(s)&&!fe(n)&&(t-=s.scrollLeft,e-=s.scrollTop),s&&(t+=1,e+=1),n.state.get("rendered")?n.layoutRect({x:t,y:e}).repaint():(n.settings.x=t,n.settings.y=e),n.fire("move",{x:t,y:e}),n}},ve=ce.extend({Mixins:[pe],Defaults:{classes:"widget tooltip tooltip-n"},renderHtml:function(){var t=this,e=t.classPrefix;return'<div id="'+t._id+'" class="'+t.classes+'" role="presentation"><div class="'+e+'tooltip-arrow"></div><div class="'+e+'tooltip-inner">'+t.encode(t.state.get("text"))+"</div></div>"},bindStates:function(){var e=this;return e.state.on("change:text",function(t){e.getEl().lastChild.innerHTML=e.encode(t.value)}),e._super()},repaint:function(){var t,e;t=this.getEl().style,e=this._layoutRect,t.left=e.x+"px",t.top=e.y+"px",t.zIndex=131070}}),ye=ce.extend({init:function(i){var r=this;r._super(i),i=r.settings,r.canFocus=!0,i.tooltip&&!1!==ye.tooltips&&(r.on("mouseenter",function(t){var e=r.tooltip().moveTo(-65535);if(t.control===r){var n=e.text(i.tooltip).show().testMoveRel(r.getEl(),["bc-tc","bc-tl","bc-tr"]);e.classes.toggle("tooltip-n","bc-tc"===n),e.classes.toggle("tooltip-nw","bc-tl"===n),e.classes.toggle("tooltip-ne","bc-tr"===n),e.moveRel(r.getEl(),n)}else e.hide()}),r.on("mouseleave mousedown click",function(){r.tooltip().remove(),r._tooltip=null})),r.aria("label",i.ariaLabel||i.tooltip)},tooltip:function(){return this._tooltip||(this._tooltip=new ve({type:"tooltip"}),ie.inheritUiContainer(this,this._tooltip),this._tooltip.renderTo()),this._tooltip},postRender:function(){var t=this,e=t.settings;t._super(),t.parent()||!e.width&&!e.height||(t.initLayoutRect(),t.repaint()),e.autofocus&&t.focus()},bindStates:function(){var e=this;function n(t){e.aria("disabled",t),e.classes.toggle("disabled",t)}function i(t){e.aria("pressed",t),e.classes.toggle("active",t)}return e.state.on("change:disabled",function(t){n(t.value)}),e.state.on("change:active",function(t){i(t.value)}),e.state.get("disabled")&&n(!0),e.state.get("active")&&i(!0),e._super()},remove:function(){this._super(),this._tooltip&&(this._tooltip.remove(),this._tooltip=null)}}),be=ye.extend({Defaults:{value:0},init:function(t){this._super(t),this.classes.add("progress"),this.settings.filter||(this.settings.filter=function(t){return Math.round(t)})},renderHtml:function(){var t=this._id,e=this.classPrefix;return'<div id="'+t+'" class="'+this.classes+'"><div class="'+e+'bar-container"><div class="'+e+'bar"></div></div><div class="'+e+'text">0%</div></div>'},postRender:function(){return this._super(),this.value(this.settings.value),this},bindStates:function(){var e=this;function n(t){t=e.settings.filter(t),e.getEl().lastChild.innerHTML=t+"%",e.getEl().firstChild.firstChild.style.width=t+"%"}return e.state.on("change:value",function(t){n(t.value)}),n(e.state.get("value")),e._super()}}),xe=function(t,e){t.getEl().lastChild.textContent=e+(t.progressBar?" "+t.progressBar.value()+"%":"")},we=ce.extend({Mixins:[pe],Defaults:{classes:"widget notification"},init:function(t){var e=this;e._super(t),e.maxWidth=t.maxWidth,t.text&&e.text(t.text),t.icon&&(e.icon=t.icon),t.color&&(e.color=t.color),t.type&&e.classes.add("notification-"+t.type),t.timeout&&(t.timeout<0||0<t.timeout)&&!t.closeButton?e.closeButton=!1:(e.classes.add("has-close"),e.closeButton=!0),t.progressBar&&(e.progressBar=new be),e.on("click",function(t){-1!==t.target.className.indexOf(e.classPrefix+"close")&&e.close()})},renderHtml:function(){var t,e=this,n=e.classPrefix,i="",r="",o="";return e.icon&&(i='<i class="'+n+"ico "+n+"i-"+e.icon+'"></i>'),t=' style="max-width: '+e.maxWidth+"px;"+(e.color?"background-color: "+e.color+';"':'"'),e.closeButton&&(r='<button type="button" class="'+n+'close" aria-hidden="true">\xd7</button>'),e.progressBar&&(o=e.progressBar.renderHtml()),'<div id="'+e._id+'" class="'+e.classes+'"'+t+' role="presentation">'+i+'<div class="'+n+'notification-inner">'+e.state.get("text")+"</div>"+o+r+'<div style="clip: rect(1px, 1px, 1px, 1px);height: 1px;overflow: hidden;position: absolute;width: 1px;" aria-live="assertive" aria-relevant="additions" aria-atomic="true"></div></div>'},postRender:function(){var t=this;return c.setTimeout(function(){t.$el.addClass(t.classPrefix+"in"),xe(t,t.state.get("text"))},100),t._super()},bindStates:function(){var e=this;return e.state.on("change:text",function(t){e.getEl().firstChild.innerHTML=t.value,xe(e,t.value)}),e.progressBar&&(e.progressBar.bindStates(),e.progressBar.state.on("change:value",function(t){xe(e,e.state.get("text"))})),e._super()},close:function(){return this.fire("close").isDefaultPrevented()||this.remove(),this},repaint:function(){var t,e;t=this.getEl().style,e=this._layoutRect,t.left=e.x+"px",t.top=e.y+"px",t.zIndex=65534}});function _e(o){var s=function(t){return t.inline?t.getElement():t.getContentAreaContainer()};return{open:function(t,e){var n,i=C.extend(t,{maxWidth:(n=s(o),Mt.getSize(n).width)}),r=new we(i);return 0<(r.args=i).timeout&&(r.timer=setTimeout(function(){r.close(),e()},i.timeout)),r.on("close",function(){e()}),r.renderTo(),r},close:function(t){t.close()},reposition:function(t){Ct(t,function(t){t.moveTo(0,0)}),function(n){if(0<n.length){var t=n.slice(0,1)[0],e=s(o);t.moveRel(e,"tc-tc"),Ct(n,function(t,e){0<e&&t.moveRel(n[e-1].getEl(),"bc-tc")})}}(t)},getArgs:function(t){return t.args}}}function Re(t){var e,n;if(t.changedTouches)for(e="screenX screenY pageX pageY clientX clientY".split(" "),n=0;n<e.length;n++)t[e[n]]=t.changedTouches[0][e[n]]}function Ce(t,h){var m,g,e,p,v,y,b,x=h.document||_.document;h=h||{};var w=x.getElementById(h.handle||t);e=function(t){var e,n,i,r,o,s,a,l,u,c,d,f=(e=x,u=Math.max,n=e.documentElement,i=e.body,r=u(n.scrollWidth,i.scrollWidth),o=u(n.clientWidth,i.clientWidth),s=u(n.offsetWidth,i.offsetWidth),a=u(n.scrollHeight,i.scrollHeight),l=u(n.clientHeight,i.clientHeight),{width:r<s?o:r,height:a<u(n.offsetHeight,i.offsetHeight)?l:a});Re(t),t.preventDefault(),g=t.button,c=w,y=t.screenX,b=t.screenY,d=_.window.getComputedStyle?_.window.getComputedStyle(c,null).getPropertyValue("cursor"):c.runtimeStyle.cursor,m=Nt("<div></div>").css({position:"absolute",top:0,left:0,width:f.width,height:f.height,zIndex:2147483647,opacity:1e-4,cursor:d}).appendTo(x.body),Nt(x).on("mousemove touchmove",v).on("mouseup touchend",p),h.start(t)},v=function(t){if(Re(t),t.button!==g)return p(t);t.deltaX=t.screenX-y,t.deltaY=t.screenY-b,t.preventDefault(),h.drag(t)},p=function(t){Re(t),Nt(x).off("mousemove touchmove",v).off("mouseup touchend",p),m.remove(),h.stop&&h.stop(t)},this.destroy=function(){Nt(w).off()},Nt(w).on("mousedown touchstart",e)}var ke=tinymce.util.Tools.resolve("tinymce.ui.Factory"),Ee=function(t){return!!t.getAttribute("data-mce-tabstop")};function He(t){var o,r,n=t.root;function i(t){return t&&1===t.nodeType}try{o=_.document.activeElement}catch(e){o=_.document.body}function s(t){return i(t=t||o)?t.getAttribute("role"):null}function a(t){for(var e,n=t||o;n=n.parentNode;)if(e=s(n))return e}function l(t){var e=o;if(i(e))return e.getAttribute("aria-"+t)}function u(t){var e=t.tagName.toUpperCase();return"INPUT"===e||"TEXTAREA"===e||"SELECT"===e}function c(e){var r=[];return function t(e){if(1===e.nodeType&&"none"!==e.style.display&&!e.disabled){var n;(u(n=e)&&!n.hidden||Ee(n)||/^(button|menuitem|checkbox|tab|menuitemcheckbox|option|gridcell|slider)$/.test(s(n)))&&r.push(e);for(var i=0;i<e.childNodes.length;i++)t(e.childNodes[i])}}(e||n.getEl()),r}function d(t){var e,n;(n=(t=t||r).parents().toArray()).unshift(t);for(var i=0;i<n.length&&!(e=n[i]).settings.ariaRoot;i++);return e}function f(t,e){return t<0?t=e.length-1:t>=e.length&&(t=0),e[t]&&e[t].focus(),t}function h(t,e){var n=-1,i=d();e=e||c(i.getEl());for(var r=0;r<e.length;r++)e[r]===o&&(n=r);n+=t,i.lastAriaIndex=f(n,e)}function m(){"tablist"===a()?h(-1,c(o.parentNode)):r.parent().submenu?y():h(-1)}function g(){var t=s(),e=a();"tablist"===e?h(1,c(o.parentNode)):"menuitem"===t&&"menu"===e&&l("haspopup")?b():h(1)}function p(){h(-1)}function v(){var t=s(),e=a();"menuitem"===t&&"menubar"===e?b():"button"===t&&l("haspopup")?b({key:"down"}):h(1)}function y(){r.fire("cancel")}function b(t){t=t||{},r.fire("click",{target:o,aria:t})}return r=n.getParentCtrl(o),n.on("keydown",function(t){function e(t,e){u(o)||Ee(o)||"slider"!==s(o)&&!1!==e(t)&&t.preventDefault()}if(!t.isDefaultPrevented())switch(t.keyCode){case 37:e(t,m);break;case 39:e(t,g);break;case 38:e(t,p);break;case 40:e(t,v);break;case 27:y();break;case 14:case 13:case 32:e(t,b);break;case 9:!function(t){if("tablist"===a()){var e=c(r.getEl("body"))[0];e&&e.focus()}else h(t.shiftKey?-1:1)}(t),t.preventDefault()}}),n.on("focusin",function(t){o=t.target,r=t.control}),{focusFirst:function(t){var e=d(t),n=c(e.getEl());e.settings.ariaRemember&&"lastAriaIndex"in e?f(e.lastAriaIndex,n):f(0,n)}}}var Te,Se,Me,Ne,Oe={},Pe=ce.extend({init:function(t){var e=this;e._super(t),(t=e.settings).fixed&&e.state.set("fixed",!0),e._items=new Xt,e.isRtl()&&e.classes.add("rtl"),e.bodyClasses=new Bt(function(){e.state.get("rendered")&&(e.getEl("body").className=this.toString())}),e.bodyClasses.prefix=e.classPrefix,e.classes.add("container"),e.bodyClasses.add("container-body"),t.containerCls&&e.classes.add(t.containerCls),e._layout=ke.create((t.layout||"")+"layout"),e.settings.items?e.add(e.settings.items):e.add(e.render()),e._hasBody=!0},items:function(){return this._items},find:function(t){return(t=Oe[t]=Oe[t]||new qt(t)).find(this)},add:function(t){return this.items().add(this.create(t)).parent(this),this},focus:function(t){var e,n,i,r=this;if(!t||!(n=r.keyboardNav||r.parents().eq(-1)[0].keyboardNav))return i=r.find("*"),r.statusbar&&i.add(r.statusbar.items()),i.each(function(t){if(t.settings.autofocus)return e=null,!1;t.canFocus&&(e=e||t)}),e&&e.focus(),r;n.focusFirst(r)},replace:function(t,e){for(var n,i=this.items(),r=i.length;r--;)if(i[r]===t){i[r]=e;break}0<=r&&((n=e.getEl())&&n.parentNode.removeChild(n),(n=t.getEl())&&n.parentNode.removeChild(n)),e.parent(this)},create:function(t){var e,n=this,i=[];return C.isArray(t)||(t=[t]),C.each(t,function(t){t&&(t instanceof ce||("string"==typeof t&&(t={type:t}),e=C.extend({},n.settings.defaults,t),t.type=e.type=e.type||t.type||n.settings.defaultType||(e.defaults?e.defaults.type:null),t=ke.create(e)),i.push(t))}),i},renderNew:function(){var i=this;return i.items().each(function(t,e){var n;t.parent(i),t.state.get("rendered")||((n=i.getEl("body")).hasChildNodes()&&e<=n.childNodes.length-1?Nt(n.childNodes[e]).before(t.renderHtml()):Nt(n).append(t.renderHtml()),t.postRender(),ee.add(t))}),i._layout.applyClasses(i.items().filter(":visible")),i._lastRect=null,i},append:function(t){return this.add(t).renderNew()},prepend:function(t){return this.items().set(this.create(t).concat(this.items().toArray())),this.renderNew()},insert:function(t,e,n){var i,r,o;return t=this.create(t),i=this.items(),!n&&e<i.length-1&&(e+=1),0<=e&&e<i.length&&(r=i.slice(0,e).toArray(),o=i.slice(e).toArray(),i.set(r.concat(t,o))),this.renderNew()},fromJSON:function(t){for(var e in t)this.find("#"+e).value(t[e]);return this},toJSON:function(){var i={};return this.find("*").each(function(t){var e=t.name(),n=t.value();e&&void 0!==n&&(i[e]=n)}),i},renderHtml:function(){var t=this,e=t._layout,n=this.settings.role;return t.preRender(),e.preRender(t),'<div id="'+t._id+'" class="'+t.classes+'"'+(n?' role="'+this.settings.role+'"':"")+'><div id="'+t._id+'-body" class="'+t.bodyClasses+'">'+(t.settings.html||"")+e.renderHtml(t)+"</div></div>"},postRender:function(){var t,e=this;return e.items().exec("postRender"),e._super(),e._layout.postRender(e),e.state.set("rendered",!0),e.settings.style&&e.$el.css(e.settings.style),e.settings.border&&(t=e.borderBox,e.$el.css({"border-top-width":t.top,"border-right-width":t.right,"border-bottom-width":t.bottom,"border-left-width":t.left})),e.parent()||(e.keyboardNav=He({root:e})),e},initLayoutRect:function(){var t=this._super();return this._layout.recalc(this),t},recalc:function(){var t=this,e=t._layoutRect,n=t._lastRect;if(!n||n.w!==e.w||n.h!==e.h)return t._layout.recalc(t),e=t.layoutRect(),t._lastRect={x:e.x,y:e.y,w:e.w,h:e.h},!0},reflow:function(){var t;if(ee.remove(this),this.visible()){for(ce.repaintControls=[],ce.repaintControls.map={},this.recalc(),t=ce.repaintControls.length;t--;)ce.repaintControls[t].repaint();"flow"!==this.settings.layout&&"stack"!==this.settings.layout&&this.repaint(),ce.repaintControls=[]}return this}}),We={init:function(){this.on("repaint",this.renderScroll)},renderScroll:function(){var p=this,v=2;function n(){var m,g,t;function e(t,e,n,i,r,o){var s,a,l,u,c,d,f,h;if(a=p.getEl("scroll"+t)){if(f=e.toLowerCase(),h=n.toLowerCase(),Nt(p.getEl("absend")).css(f,p.layoutRect()[i]-1),!r)return void Nt(a).css("display","none");Nt(a).css("display","block"),s=p.getEl("body"),l=p.getEl("scroll"+t+"t"),u=s["client"+n]-2*v,c=(u-=m&&g?a["client"+o]:0)/s["scroll"+n],(d={})[f]=s["offset"+e]+v,d[h]=u,Nt(a).css(d),(d={})[f]=s["scroll"+e]*c,d[h]=u*c,Nt(l).css(d)}}t=p.getEl("body"),m=t.scrollWidth>t.clientWidth,g=t.scrollHeight>t.clientHeight,e("h","Left","Width","contentW",m,"Height"),e("v","Top","Height","contentH",g,"Width")}p.settings.autoScroll&&(p._hasScroll||(p._hasScroll=!0,function(){function t(s,a,l,u,c){var d,t=p._id+"-scroll"+s,e=p.classPrefix;Nt(p.getEl()).append('<div id="'+t+'" class="'+e+"scrollbar "+e+"scrollbar-"+s+'"><div id="'+t+'t" class="'+e+'scrollbar-thumb"></div></div>'),p.draghelper=new Ce(t+"t",{start:function(){d=p.getEl("body")["scroll"+a],Nt("#"+t).addClass(e+"active")},drag:function(t){var e,n,i,r,o=p.layoutRect();n=o.contentW>o.innerW,i=o.contentH>o.innerH,r=p.getEl("body")["client"+l]-2*v,e=(r-=n&&i?p.getEl("scroll"+s)["client"+c]:0)/p.getEl("body")["scroll"+l],p.getEl("body")["scroll"+a]=d+t["delta"+u]/e},stop:function(){Nt("#"+t).removeClass(e+"active")}})}p.classes.add("scroll"),t("v","Top","Height","Y","Width"),t("h","Left","Width","X","Height")}(),p.on("wheel",function(t){var e=p.getEl("body");e.scrollLeft+=10*(t.deltaX||0),e.scrollTop+=10*t.deltaY,n()}),Nt(p.getEl("body")).on("scroll",n)),n())}},De=Pe.extend({Defaults:{layout:"fit",containerCls:"panel"},Mixins:[We],renderHtml:function(){var t=this,e=t._layout,n=t.settings.html;return t.preRender(),e.preRender(t),void 0===n?n='<div id="'+t._id+'-body" class="'+t.bodyClasses+'">'+e.renderHtml(t)+"</div>":("function"==typeof n&&(n=n.call(t)),t._hasBody=!1),'<div id="'+t._id+'" class="'+t.classes+'" hidefocus="1" tabindex="-1" role="group">'+(t._preBodyHtml||"")+n+"</div>"}}),Ae={resizeToContent:function(){this._layoutRect.autoResize=!0,this._lastRect=null,this.reflow()},resizeTo:function(t,e){if(t<=1||e<=1){var n=Mt.getWindowSize();t=t<=1?t*n.w:t,e=e<=1?e*n.h:e}return this._layoutRect.autoResize=!1,this.layoutRect({minW:t,minH:e,w:t,h:e}).reflow()},resizeBy:function(t,e){var n=this.layoutRect();return this.resizeTo(n.w+t,n.h+e)}},Be=[],Le=[];function Ie(t,e){for(;t;){if(t===e)return!0;t=t.parent()}}function ze(){Te||(Te=function(t){2!==t.button&&function(t){for(var e=Be.length;e--;){var n=Be[e],i=n.getParentCtrl(t.target);if(n.settings.autohide){if(i&&(Ie(i,n)||n.parent()===i))continue;(t=n.fire("autohide",{target:t.target})).isDefaultPrevented()||n.hide()}}}(t)},Nt(_.document).on("click touchstart",Te))}function Fe(r){var t=Mt.getViewPort().y;function e(t,e){for(var n,i=0;i<Be.length;i++)if(Be[i]!==r)for(n=Be[i].parent();n&&(n=n.parent());)n===r&&Be[i].fixed(t).moveBy(0,e).repaint()}r.settings.autofix&&(r.state.get("fixed")?r._autoFixY>t&&(r.fixed(!1).layoutRect({y:r._autoFixY}).repaint(),e(!1,r._autoFixY-t)):(r._autoFixY=r.layoutRect().y,r._autoFixY<t&&(r.fixed(!0).layoutRect({y:0}).repaint(),e(!0,t-r._autoFixY))))}function Ue(t,e){var n,i,r=Ve.zIndex||65535;if(t)Le.push(e);else for(n=Le.length;n--;)Le[n]===e&&Le.splice(n,1);if(Le.length)for(n=0;n<Le.length;n++)Le[n].modal&&(r++,i=Le[n]),Le[n].getEl().style.zIndex=r,Le[n].zIndex=r,r++;var o=Nt("#"+e.classPrefix+"modal-block",e.getContainerElm())[0];i?Nt(o).css("z-index",i.zIndex-1):o&&(o.parentNode.removeChild(o),Ne=!1),Ve.currentZIndex=r}var Ve=De.extend({Mixins:[pe,Ae],init:function(t){var i=this;i._super(t),(i._eventsRoot=i).classes.add("floatpanel"),t.autohide&&(ze(),function(){if(!Me){var t=_.document.documentElement,e=t.clientWidth,n=t.clientHeight;Me=function(){_.document.all&&e===t.clientWidth&&n===t.clientHeight||(e=t.clientWidth,n=t.clientHeight,Ve.hideAll())},Nt(_.window).on("resize",Me)}}(),Be.push(i)),t.autofix&&(Se||(Se=function(){var t;for(t=Be.length;t--;)Fe(Be[t])},Nt(_.window).on("scroll",Se)),i.on("move",function(){Fe(this)})),i.on("postrender show",function(t){if(t.control===i){var e,n=i.classPrefix;i.modal&&!Ne&&((e=Nt("#"+n+"modal-block",i.getContainerElm()))[0]||(e=Nt('<div id="'+n+'modal-block" class="'+n+"reset "+n+'fade"></div>').appendTo(i.getContainerElm())),c.setTimeout(function(){e.addClass(n+"in"),Nt(i.getEl()).addClass(n+"in")}),Ne=!0),Ue(!0,i)}}),i.on("show",function(){i.parents().each(function(t){if(t.state.get("fixed"))return i.fixed(!0),!1})}),t.popover&&(i._preBodyHtml='<div class="'+i.classPrefix+'arrow"></div>',i.classes.add("popover").add("bottom").add(i.isRtl()?"end":"start")),i.aria("label",t.ariaLabel),i.aria("labelledby",i._id),i.aria("describedby",i.describedBy||i._id+"-none")},fixed:function(t){var e=this;if(e.state.get("fixed")!==t){if(e.state.get("rendered")){var n=Mt.getViewPort();t?e.layoutRect().y-=n.y:e.layoutRect().y+=n.y}e.classes.toggle("fixed",t),e.state.set("fixed",t)}return e},show:function(){var t,e=this._super();for(t=Be.length;t--&&Be[t]!==this;);return-1===t&&Be.push(this),e},hide:function(){return qe(this),Ue(!1,this),this._super()},hideAll:function(){Ve.hideAll()},close:function(){return this.fire("close").isDefaultPrevented()||(this.remove(),Ue(!1,this)),this},remove:function(){qe(this),this._super()},postRender:function(){return this.settings.bodyRole&&this.getEl("body").setAttribute("role",this.settings.bodyRole),this._super()}});function qe(t){var e;for(e=Be.length;e--;)Be[e]===t&&Be.splice(e,1);for(e=Le.length;e--;)Le[e]===t&&Le.splice(e,1)}Ve.hideAll=function(){for(var t=Be.length;t--;){var e=Be[t];e&&e.settings.autohide&&(e.hide(),Be.splice(t,1))}};var Ye=[],$e="";function Xe(t){var e,n=Nt("meta[name=viewport]")[0];!1!==h.overrideViewPort&&(n||((n=_.document.createElement("meta")).setAttribute("name","viewport"),_.document.getElementsByTagName("head")[0].appendChild(n)),(e=n.getAttribute("content"))&&void 0!==$e&&($e=e),n.setAttribute("content",t?"width=device-width,initial-scale=1.0,user-scalable=0,minimum-scale=1.0,maximum-scale=1.0":$e))}function je(t,e){(function(){for(var t=0;t<Ye.length;t++)if(Ye[t]._fullscreen)return!0;return!1})()&&!1===e&&Nt([_.document.documentElement,_.document.body]).removeClass(t+"fullscreen")}var Je=Ve.extend({modal:!0,Defaults:{border:1,layout:"flex",containerCls:"panel",role:"dialog",callbacks:{submit:function(){this.fire("submit",{data:this.toJSON()})},close:function(){this.close()}}},init:function(t){var n=this;n._super(t),n.isRtl()&&n.classes.add("rtl"),n.classes.add("window"),n.bodyClasses.add("window-body"),n.state.set("fixed",!0),t.buttons&&(n.statusbar=new De({layout:"flex",border:"1 0 0 0",spacing:3,padding:10,align:"center",pack:n.isRtl()?"start":"end",defaults:{type:"button"},items:t.buttons}),n.statusbar.classes.add("foot"),n.statusbar.parent(n)),n.on("click",function(t){var e=n.classPrefix+"close";(Mt.hasClass(t.target,e)||Mt.hasClass(t.target.parentNode,e))&&n.close()}),n.on("cancel",function(){n.close()}),n.on("move",function(t){t.control===n&&Ve.hideAll()}),n.aria("describedby",n.describedBy||n._id+"-none"),n.aria("label",t.title),n._fullscreen=!1},recalc:function(){var t,e,n,i,r=this,o=r.statusbar;r._fullscreen&&(r.layoutRect(Mt.getWindowSize()),r.layoutRect().contentH=r.layoutRect().innerH),r._super(),t=r.layoutRect(),r.settings.title&&!r._fullscreen&&(e=t.headerW)>t.w&&(n=t.x-Math.max(0,e/2),r.layoutRect({w:e,x:n}),i=!0),o&&(o.layoutRect({w:r.layoutRect().innerW}).recalc(),(e=o.layoutRect().minW+t.deltaW)>t.w&&(n=t.x-Math.max(0,e-t.w),r.layoutRect({w:e,x:n}),i=!0)),i&&r.recalc()},initLayoutRect:function(){var t,e=this,n=e._super(),i=0;if(e.settings.title&&!e._fullscreen){t=e.getEl("head");var r=Mt.getSize(t);n.headerW=r.width,n.headerH=r.height,i+=n.headerH}e.statusbar&&(i+=e.statusbar.layoutRect().h),n.deltaH+=i,n.minH+=i,n.h+=i;var o=Mt.getWindowSize();return n.x=e.settings.x||Math.max(0,o.w/2-n.w/2),n.y=e.settings.y||Math.max(0,o.h/2-n.h/2),n},renderHtml:function(){var t=this,e=t._layout,n=t._id,i=t.classPrefix,r=t.settings,o="",s="",a=r.html;return t.preRender(),e.preRender(t),r.title&&(o='<div id="'+n+'-head" class="'+i+'window-head"><div id="'+n+'-title" class="'+i+'title">'+t.encode(r.title)+'</div><div id="'+n+'-dragh" class="'+i+'dragh"></div><button type="button" class="'+i+'close" aria-hidden="true"><i class="mce-ico mce-i-remove"></i></button></div>'),r.url&&(a='<iframe src="'+r.url+'" tabindex="-1"></iframe>'),void 0===a&&(a=e.renderHtml(t)),t.statusbar&&(s=t.statusbar.renderHtml()),'<div id="'+n+'" class="'+t.classes+'" hidefocus="1"><div class="'+t.classPrefix+'reset" role="application">'+o+'<div id="'+n+'-body" class="'+t.bodyClasses+'">'+a+"</div>"+s+"</div></div>"},fullscreen:function(t){var n,e,i=this,r=_.document.documentElement,o=i.classPrefix;if(t!==i._fullscreen)if(Nt(_.window).on("resize",function(){var t;if(i._fullscreen)if(n)i._timer||(i._timer=c.setTimeout(function(){var t=Mt.getWindowSize();i.moveTo(0,0).resizeTo(t.w,t.h),i._timer=0},50));else{t=(new Date).getTime();var e=Mt.getWindowSize();i.moveTo(0,0).resizeTo(e.w,e.h),50<(new Date).getTime()-t&&(n=!0)}}),e=i.layoutRect(),i._fullscreen=t){i._initial={x:e.x,y:e.y,w:e.w,h:e.h},i.borderBox=Wt("0"),i.getEl("head").style.display="none",e.deltaH-=e.headerH+2,Nt([r,_.document.body]).addClass(o+"fullscreen"),i.classes.add("fullscreen");var s=Mt.getWindowSize();i.moveTo(0,0).resizeTo(s.w,s.h)}else i.borderBox=Wt(i.settings.border),i.getEl("head").style.display="",e.deltaH+=e.headerH,Nt([r,_.document.body]).removeClass(o+"fullscreen"),i.classes.remove("fullscreen"),i.moveTo(i._initial.x,i._initial.y).resizeTo(i._initial.w,i._initial.h);return i.reflow()},postRender:function(){var e,n=this;setTimeout(function(){n.classes.add("in"),n.fire("open")},0),n._super(),n.statusbar&&n.statusbar.postRender(),n.focus(),this.dragHelper=new Ce(n._id+"-dragh",{start:function(){e={x:n.layoutRect().x,y:n.layoutRect().y}},drag:function(t){n.moveTo(e.x+t.deltaX,e.y+t.deltaY)}}),n.on("submit",function(t){t.isDefaultPrevented()||n.close()}),Ye.push(n),Xe(!0)},submit:function(){return this.fire("submit",{data:this.toJSON()})},remove:function(){var t,e=this;for(e.dragHelper.destroy(),e._super(),e.statusbar&&this.statusbar.remove(),je(e.classPrefix,!1),t=Ye.length;t--;)Ye[t]===e&&Ye.splice(t,1);Xe(0<Ye.length)},getContentWindow:function(){var t=this.getEl().getElementsByTagName("iframe")[0];return t?t.contentWindow:null}});!function(){if(!h.desktop){var n={w:_.window.innerWidth,h:_.window.innerHeight};c.setInterval(function(){var t=_.window.innerWidth,e=_.window.innerHeight;n.w===t&&n.h===e||(n={w:t,h:e},Nt(_.window).trigger("resize"))},100)}Nt(_.window).on("resize",function(){var t,e,n=Mt.getWindowSize();for(t=0;t<Ye.length;t++)e=Ye[t].layoutRect(),Ye[t].moveTo(Ye[t].settings.x||Math.max(0,n.w/2-e.w/2),Ye[t].settings.y||Math.max(0,n.h/2-e.h/2))})}();var Ge,Ke,Ze,Qe=Je.extend({init:function(t){t={border:1,padding:20,layout:"flex",pack:"center",align:"center",containerCls:"panel",autoScroll:!0,buttons:{type:"button",text:"Ok",action:"ok"},items:{type:"label",multiline:!0,maxWidth:500,maxHeight:200}},this._super(t)},Statics:{OK:1,OK_CANCEL:2,YES_NO:3,YES_NO_CANCEL:4,msgBox:function(t){var e,i=t.callback||function(){};function n(t,e,n){return{type:"button",text:t,subtype:n?"primary":"",onClick:function(t){t.control.parents()[1].close(),i(e)}}}switch(t.buttons){case Qe.OK_CANCEL:e=[n("Ok",!0,!0),n("Cancel",!1)];break;case Qe.YES_NO:case Qe.YES_NO_CANCEL:e=[n("Yes",1,!0),n("No",0)],t.buttons===Qe.YES_NO_CANCEL&&e.push(n("Cancel",-1));break;default:e=[n("Ok",!0,!0)]}return new Je({padding:20,x:t.x,y:t.y,minWidth:300,minHeight:100,layout:"flex",pack:"center",align:"center",buttons:e,title:t.title,role:"alertdialog",items:{type:"label",multiline:!0,maxWidth:500,maxHeight:200,text:t.text},onPostRender:function(){this.aria("describedby",this.items()[0]._id)},onClose:t.onClose,onCancel:function(){i(!1)}}).renderTo(_.document.body).reflow()},alert:function(t,e){return"string"==typeof t&&(t={text:t}),t.callback=e,Qe.msgBox(t)},confirm:function(t,e){return"string"==typeof t&&(t={text:t}),t.callback=e,t.buttons=Qe.OK_CANCEL,Qe.msgBox(t)}}}),tn=function(t,e){return{renderUI:function(){return at(t,e)},getNotificationManagerImpl:function(){return _e(t)},getWindowManagerImpl:function(){return{open:function(n,t,e){var i;return n.title=n.title||" ",n.url=n.url||n.file,n.url&&(n.width=parseInt(n.width||320,10),n.height=parseInt(n.height||240,10)),n.body&&(n.items={defaults:n.defaults,type:n.bodyType||"form",items:n.body,data:n.data,callbacks:n.commands}),n.url||n.buttons||(n.buttons=[{text:"Ok",subtype:"primary",onclick:function(){i.find("form")[0].submit()}},{text:"Cancel",onclick:function(){i.close()}}]),(i=new Je(n)).on("close",function(){e(i)}),n.data&&i.on("postRender",function(){this.find("*").each(function(t){var e=t.name();e in n.data&&t.value(n.data[e])})}),i.features=n||{},i.params=t||{},i=i.renderTo(_.document.body).reflow()},alert:function(t,e,n){var i;return(i=Qe.alert(t,function(){e()})).on("close",function(){n(i)}),i},confirm:function(t,e,n){var i;return(i=Qe.confirm(t,function(t){e(t)})).on("close",function(){n(i)}),i},close:function(t){t.close()},getParams:function(t){return t.params},setParams:function(t,e){t.params=e}}}}},en="undefined"!=typeof _.window?_.window:Function("return this;")(),nn=function(t,e){return function(t,e){for(var n=e!==undefined&&null!==e?e:en,i=0;i<t.length&&n!==undefined&&null!==n;++i)n=n[t[i]];return n}(t.split("."),e)},rn=function(t,e){var n=nn(t,e);if(n===undefined||null===n)throw t+" not available on this browser";return n},on=tinymce.util.Tools.resolve("tinymce.util.Promise"),sn=function(n){return new on(function(t){var e=new(rn("FileReader"));e.onloadend=function(){t(e.result.split(",")[1])},e.readAsDataURL(n)})},an=function(){return new on(function(e){var t;(t=_.document.createElement("input")).type="file",t.style.position="fixed",t.style.left=0,t.style.top=0,t.style.opacity=.001,_.document.body.appendChild(t),t.onchange=function(t){e(Array.prototype.slice.call(t.target.files))},t.click(),t.parentNode.removeChild(t)})},ln=0,un=function(t){return t+ln+++(e=function(){return Math.round(4294967295*Math.random()).toString(36)},"s"+Date.now().toString(36)+e()+e()+e());var e},cn=function(r,o){var s={};function t(t){var e,n,i;n=o[t?"startContainer":"endContainer"],i=o[t?"startOffset":"endOffset"],1===n.nodeType&&(e=r.create("span",{"data-mce-type":"bookmark"}),n.hasChildNodes()?(i=Math.min(i,n.childNodes.length-1),t?n.insertBefore(e,n.childNodes[i]):r.insertAfter(e,n.childNodes[i])):n.appendChild(e),n=e,i=0),s[t?"startContainer":"endContainer"]=n,s[t?"startOffset":"endOffset"]=i}return t(!0),o.collapsed||t(),s},dn=function(r,o){function t(t){var e,n,i;e=i=o[t?"startContainer":"endContainer"],n=o[t?"startOffset":"endOffset"],e&&(1===e.nodeType&&(n=function(t){for(var e=t.parentNode.firstChild,n=0;e;){if(e===t)return n;1===e.nodeType&&"bookmark"===e.getAttribute("data-mce-type")||n++,e=e.nextSibling}return-1}(e),e=e.parentNode,r.remove(i)),o[t?"startContainer":"endContainer"]=e,o[t?"startOffset":"endOffset"]=n)}t(!0),t();var e=r.createRng();return e.setStart(o.startContainer,o.startOffset),o.endContainer&&e.setEnd(o.endContainer,o.endOffset),e},fn=tinymce.util.Tools.resolve("tinymce.dom.TreeWalker"),hn=tinymce.util.Tools.resolve("tinymce.dom.RangeUtils"),mn=function(t){return"A"===t.nodeName&&t.hasAttribute("href")},gn=function(t){var e,n,i,r,o,s,a,l;return r=t.selection,o=t.dom,s=r.getRng(),a=o,l=hn.getNode(s.startContainer,s.startOffset),e=a.getParent(l,mn)||l,n=hn.getNode(s.endContainer,s.endOffset),i=t.getBody(),C.grep(function(t,e,n){var i,r,o=[];for(i=new fn(e,t),r=e;r&&(1===r.nodeType&&o.push(r),r!==n);r=i.next());return o}(i,e,n),mn)},pn=function(t){var e,n,i,r,o;n=gn(e=t),r=e.dom,o=e.selection,i=cn(r,o.getRng()),C.each(n,function(t){e.dom.remove(t,!0)}),o.setRng(dn(r,i))},vn=function(t){t.selection.collapse(!1)},yn=function(t){t.focus(),pn(t),vn(t)},bn=function(t,e){var n,i,r,o,s,a=t.dom.getParent(t.selection.getStart(),"a[href]");a?(o=a,s=e,(r=t).focus(),r.dom.setAttrib(o,"href",s),vn(r)):(i=e,(n=t).execCommand("mceInsertLink",!1,{href:i}),vn(n))},xn=function(t,e,n){var i,r,o;t.plugins.table?t.plugins.table.insertTable(e,n):(r=e,o=n,(i=t).undoManager.transact(function(){var t,e;i.insertContent(function(t,e){var n,i,r;for(r='<table data-mce-id="mce" style="width: 100%">',r+="<tbody>",i=0;i<e;i++){for(r+="<tr>",n=0;n<t;n++)r+="<td><br></td>";r+="</tr>"}return r+="</tbody>",r+="</table>"}(r,o)),(t=i.dom.select("*[data-mce-id]")[0]).removeAttribute("data-mce-id"),e=i.dom.select("td,th",t),i.selection.setCursorLocation(e[0],0)}))},wn=function(t,e){t.execCommand("FormatBlock",!1,e)},_n=function(t,e,n){var i,r;r=(i=t.editorUpload.blobCache).create(un("mceu"),n,e),i.add(r),t.insertContent(t.dom.createHTML("img",{src:r.blobUri()}))},Rn=function(t,e){0===e.trim().length?yn(t):bn(t,e)},Cn=yn,kn=function(n,t){n.addButton("quicklink",{icon:"link",tooltip:"Insert/Edit link",stateSelector:"a[href]",onclick:function(){t.showForm(n,"quicklink")}}),n.addButton("quickimage",{icon:"image",tooltip:"Insert image",onclick:function(){an().then(function(t){var e=t[0];sn(e).then(function(t){_n(n,t,e)})})}}),n.addButton("quicktable",{icon:"table",tooltip:"Insert table",onclick:function(){t.hide(),xn(n,2,2)}}),function(e){for(var t=function(t){return function(){wn(e,t)}},n=1;n<6;n++){var i="h"+n;e.addButton(i,{text:i.toUpperCase(),tooltip:"Heading "+n,stateSelector:i,onclick:t(i),onPostRender:function(){this.getEl().firstChild.firstChild.style.fontWeight="bold"}})}}(n)},En=function(){var t=h.container;if(t&&"static"!==v.DOM.getStyle(t,"position",!0)){var e=v.DOM.getPos(t),n=e.x-t.scrollLeft,i=e.y-t.scrollTop;return vt.some({x:n,y:i})}return vt.none()},Hn=function(t){return/^www\.|\.(com|org|edu|gov|uk|net|ca|de|jp|fr|au|us|ru|ch|it|nl|se|no|es|mil)$/i.test(t.trim())},Tn=function(t){return/^https?:\/\//.test(t.trim())},Sn=function(t,e){return!Tn(e)&&Hn(e)?(n=t,i=e,new on(function(e){n.windowManager.confirm("The URL you entered seems to be an external link. Do you want to add the required http:// prefix?",function(t){e(!0===t?"http://"+i:i)})})):on.resolve(e);var n,i},Mn=function(r,e){var t,n,i,o={};return t="quicklink",n={items:[{type:"button",name:"unlink",icon:"unlink",onclick:function(){r.focus(),Cn(r),e()},tooltip:"Remove link"},{type:"filepicker",name:"linkurl",placeholder:"Paste or type a link",filetype:"file",onchange:function(t){var e=t.meta;e&&e.attach&&(o={href:this.value(),attach:e.attach})}},{type:"button",icon:"checkmark",subtype:"primary",tooltip:"Ok",onclick:"submit"}],onshow:function(t){if(t.control===this){var e,n="";(e=r.dom.getParent(r.selection.getStart(),"a[href]"))&&(n=r.dom.getAttrib(e,"href")),this.fromJSON({linkurl:n}),i=this.find("#unlink"),e?i.show():i.hide(),this.find("#linkurl")[0].focus()}var i},onsubmit:function(t){Sn(r,t.data.linkurl).then(function(t){r.undoManager.transact(function(){t===o.href&&(o.attach(),o={}),Rn(r,t)}),e()})}},(i=ke.create(C.extend({type:"form",layout:"flex",direction:"row",padding:5,name:t,spacing:3},n))).on("show",function(){i.find("textbox").eq(0).each(function(t){t.focus()})}),i},Nn=function(n,t,e){var o,i,s=[];if(e)return C.each(L(i=e)?i:W(i)?i.split(/[ ,]/):[],function(t){if("|"===t)o=null;else if(n.buttons[t]){o||(o={type:"buttongroup",items:[]},s.push(o));var e=n.buttons[t];B(e)&&(e=e()),e.type=e.type||"button",(e=ke.create(e)).on("postRender",(i=n,r=e,function(){var e,t,n=(t=function(t,e){return{selector:t,handler:e}},(e=r).settings.stateSelector?t(e.settings.stateSelector,function(t){e.active(t)}):e.settings.disabledStateSelector?t(e.settings.disabledStateSelector,function(t){e.disabled(t)}):null);null!==n&&i.selection.selectorChanged(n.selector,n.handler)})),o.items.push(e)}var i,r}),ke.create({type:"toolbar",layout:"flow",name:t,items:s})},On=function(){var l,c,o=function(t){return 0<t.items().length},u=function(t,e){var n,i,r=(n=t,i=e,C.map(i,function(t){return Nn(n,t.id,t.items)})).concat([Nn(t,"text",G(t)),Nn(t,"insert",K(t)),Mn(t,p)]);return ke.create({type:"floatpanel",role:"dialog",classes:"tinymce tinymce-inline arrow",ariaLabel:"Inline toolbar",layout:"flex",direction:"column",align:"stretch",autohide:!1,autofix:!0,fixed:!0,border:1,items:C.grep(r,o),oncancel:function(){t.focus()}})},d=function(t){t&&t.show()},f=function(t,e){t.moveTo(e.x,e.y)},h=function(n,i){i=i?i.substr(0,2):"",C.each({t:"down",b:"up",c:"center"},function(t,e){n.classes.toggle("arrow-"+t,e===i.substr(0,1))}),"cr"===i?(n.classes.toggle("arrow-left",!0),n.classes.toggle("arrow-right",!1)):"cl"===i?(n.classes.toggle("arrow-left",!1),n.classes.toggle("arrow-right",!0)):C.each({l:"left",r:"right"},function(t,e){n.classes.toggle("arrow-"+t,e===i.substr(1,1))})},m=function(t,e){var n=t.items().filter("#"+e);return 0<n.length&&(n[0].show(),t.reflow(),!0)},g=function(t,e,n,i){var r,o,s,a;if(a=Z(n),r=b(n),o=v.DOM.getRect(t.getEl()),s="insert"===e?$(i,r,o):X(i,r,o)){var l=En().getOr({x:0,y:0}),u={x:s.rect.x-l.x,y:s.rect.y-l.y,w:s.rect.w,h:s.rect.h};return f(t,j(a,c=i,r,u)),h(t,s.position),!0}return!1},p=function(){l&&l.hide()};return{show:function(t,e,n,i){var r,o,s,a;l||(M(t),(l=u(t,i)).renderTo().reflow().moveTo(n.x,n.y),t.nodeChanged()),o=e,s=t,a=n,d(r=l),r.items().hide(),m(r,o)?!1===g(r,o,s,a)&&p():p()},showForm:function(t,e){if(l){if(l.items().hide(),!m(l,e))return void p();var n,i,r,o=void 0;d(l),l.items().hide(),m(l,e),r=Z(t),n=b(t),o=v.DOM.getRect(l.getEl()),(i=X(c,n,o))&&(o=i.rect,f(l,j(r,c,n,o)),h(l,i.position))}},reposition:function(t,e,n){l&&g(l,e,t,n)},inForm:function(){return l&&l.visible()&&0<l.items().filter("form:visible").length},hide:p,focus:function(){l&&l.find("toolbar:visible").eq(0).each(function(t){t.focus(!0)})},remove:function(){l&&(l.remove(),l=null)}}},Pn=Ot.extend({Defaults:{firstControlClass:"first",lastControlClass:"last"},init:function(t){this.settings=C.extend({},this.Defaults,t)},preRender:function(t){t.bodyClasses.add(this.settings.containerClass)},applyClasses:function(t){var e,n,i,r,o=this.settings;e=o.firstControlClass,n=o.lastControlClass,t.each(function(t){t.classes.remove(e).remove(n).add(o.controlClass),t.visible()&&(i||(i=t),r=t)}),i&&i.classes.add(e),r&&r.classes.add(n)},renderHtml:function(t){var e="";return this.applyClasses(t.items()),t.items().each(function(t){e+=t.renderHtml()}),e},recalc:function(){},postRender:function(){},isNative:function(){return!1}}),Wn=Pn.extend({Defaults:{containerClass:"abs-layout",controlClass:"abs-layout-item"},recalc:function(t){t.items().filter(":visible").each(function(t){var e=t.settings;t.layoutRect({x:e.x,y:e.y,w:e.w,h:e.h}),t.recalc&&t.recalc()})},renderHtml:function(t){return'<div id="'+t._id+'-absend" class="'+t.classPrefix+'abs-end"></div>'+this._super(t)}}),Dn=ye.extend({Defaults:{classes:"widget btn",role:"button"},init:function(t){var e,n=this;n._super(t),t=n.settings,e=n.settings.size,n.on("click mousedown",function(t){t.preventDefault()}),n.on("touchstart",function(t){n.fire("click",t),t.preventDefault()}),t.subtype&&n.classes.add(t.subtype),e&&n.classes.add("btn-"+e),t.icon&&n.icon(t.icon)},icon:function(t){return arguments.length?(this.state.set("icon",t),this):this.state.get("icon")},repaint:function(){var t,e=this.getEl().firstChild;e&&((t=e.style).width=t.height="100%"),this._super()},renderHtml:function(){var t,e,n=this,i=n._id,r=n.classPrefix,o=n.state.get("icon"),s=n.state.get("text"),a="",l=n.settings;return(t=l.image)?(o="none","string"!=typeof t&&(t=_.window.getSelection?t[0]:t[1]),t=" style=\"background-image: url('"+t+"')\""):t="",s&&(n.classes.add("btn-has-text"),a='<span class="'+r+'txt">'+n.encode(s)+"</span>"),o=o?r+"ico "+r+"i-"+o:"",e="boolean"==typeof l.active?' aria-pressed="'+l.active+'"':"",'<div id="'+i+'" class="'+n.classes+'" tabindex="-1"'+e+'><button id="'+i+'-button" role="presentation" type="button" tabindex="-1">'+(o?'<i class="'+o+'"'+t+"></i>":"")+a+"</button></div>"},bindStates:function(){var o=this,n=o.$,i=o.classPrefix+"txt";function s(t){var e=n("span."+i,o.getEl());t?(e[0]||(n("button:first",o.getEl()).append('<span class="'+i+'"></span>'),e=n("span."+i,o.getEl())),e.html(o.encode(t))):e.remove(),o.classes.toggle("btn-has-text",!!t)}return o.state.on("change:text",function(t){s(t.value)}),o.state.on("change:icon",function(t){var e=t.value,n=o.classPrefix;e=(o.settings.icon=e)?n+"ico "+n+"i-"+o.settings.icon:"";var i=o.getEl().firstChild,r=i.getElementsByTagName("i")[0];e?(r&&r===i.firstChild||(r=_.document.createElement("i"),i.insertBefore(r,i.firstChild)),r.className=e):r&&i.removeChild(r),s(o.state.get("text"))}),o._super()}}),An=Dn.extend({init:function(t){t=C.extend({text:"Browse...",multiple:!1,accept:null},t),this._super(t),this.classes.add("browsebutton"),t.multiple&&this.classes.add("multiple")},postRender:function(){var n=this,e=Mt.create("input",{type:"file",id:n._id+"-browse",accept:n.settings.accept});n._super(),Nt(e).on("change",function(t){var e=t.target.files;n.value=function(){return e.length?n.settings.multiple?e:e[0]:null},t.preventDefault(),e.length&&n.fire("change",t)}),Nt(e).on("click",function(t){t.stopPropagation()}),Nt(n.getEl("button")).on("click touchstart",function(t){t.stopPropagation(),e.click()}),n.getEl().appendChild(e)},remove:function(){Nt(this.getEl("button")).off(),Nt(this.getEl("input")).off(),this._super()}}),Bn=Pe.extend({Defaults:{defaultType:"button",role:"group"},renderHtml:function(){var t=this,e=t._layout;return t.classes.add("btn-group"),t.preRender(),e.preRender(t),'<div id="'+t._id+'" class="'+t.classes+'"><div id="'+t._id+'-body">'+(t.settings.html||"")+e.renderHtml(t)+"</div></div>"}}),Ln=ye.extend({Defaults:{classes:"checkbox",role:"checkbox",checked:!1},init:function(t){var e=this;e._super(t),e.on("click mousedown",function(t){t.preventDefault()}),e.on("click",function(t){t.preventDefault(),e.disabled()||e.checked(!e.checked())}),e.checked(e.settings.checked)},checked:function(t){return arguments.length?(this.state.set("checked",t),this):this.state.get("checked")},value:function(t){return arguments.length?this.checked(t):this.checked()},renderHtml:function(){var t=this,e=t._id,n=t.classPrefix;return'<div id="'+e+'" class="'+t.classes+'" unselectable="on" aria-labelledby="'+e+'-al" tabindex="-1"><i class="'+n+"ico "+n+'i-checkbox"></i><span id="'+e+'-al" class="'+n+'label">'+t.encode(t.state.get("text"))+"</span></div>"},bindStates:function(){var o=this;function e(t){o.classes.toggle("checked",t),o.aria("checked",t)}return o.state.on("change:text",function(t){o.getEl("al").firstChild.data=o.translate(t.value)}),o.state.on("change:checked change:value",function(t){o.fire("change"),e(t.value)}),o.state.on("change:icon",function(t){var e=t.value,n=o.classPrefix;if(void 0===e)return o.settings.icon;e=(o.settings.icon=e)?n+"ico "+n+"i-"+o.settings.icon:"";var i=o.getEl().firstChild,r=i.getElementsByTagName("i")[0];e?(r&&r===i.firstChild||(r=_.document.createElement("i"),i.insertBefore(r,i.firstChild)),r.className=e):r&&i.removeChild(r)}),o.state.get("checked")&&e(!0),o._super()}}),In=tinymce.util.Tools.resolve("tinymce.util.VK"),zn=ye.extend({init:function(i){var r=this;r._super(i),i=r.settings,r.classes.add("combobox"),r.subinput=!0,r.ariaTarget="inp",i.menu=i.menu||i.values,i.menu&&(i.icon="caret"),r.on("click",function(t){var e=t.target,n=r.getEl();if(Nt.contains(n,e)||e===n)for(;e&&e!==n;)e.id&&-1!==e.id.indexOf("-open")&&(r.fire("action"),i.menu&&(r.showMenu(),t.aria&&r.menu.items()[0].focus())),e=e.parentNode}),r.on("keydown",function(t){var e;13===t.keyCode&&"INPUT"===t.target.nodeName&&(t.preventDefault(),r.parents().reverse().each(function(t){if(t.toJSON)return e=t,!1}),r.fire("submit",{data:e.toJSON()}))}),r.on("keyup",function(t){if("INPUT"===t.target.nodeName){var e=r.state.get("value"),n=t.target.value;n!==e&&(r.state.set("value",n),r.fire("autocomplete",t))}}),r.on("mouseover",function(t){var e=r.tooltip().moveTo(-65535);if(r.statusLevel()&&-1!==t.target.className.indexOf(r.classPrefix+"status")){var n=r.statusMessage()||"Ok",i=e.text(n).show().testMoveRel(t.target,["bc-tc","bc-tl","bc-tr"]);e.classes.toggle("tooltip-n","bc-tc"===i),e.classes.toggle("tooltip-nw","bc-tl"===i),e.classes.toggle("tooltip-ne","bc-tr"===i),e.moveRel(t.target,i)}})},statusLevel:function(t){return 0<arguments.length&&this.state.set("statusLevel",t),this.state.get("statusLevel")},statusMessage:function(t){return 0<arguments.length&&this.state.set("statusMessage",t),this.state.get("statusMessage")},showMenu:function(){var t,e=this,n=e.settings;e.menu||((t=n.menu||[]).length?t={type:"menu",items:t}:t.type=t.type||"menu",e.menu=ke.create(t).parent(e).renderTo(e.getContainerElm()),e.fire("createmenu"),e.menu.reflow(),e.menu.on("cancel",function(t){t.control===e.menu&&e.focus()}),e.menu.on("show hide",function(t){t.control.items().each(function(t){t.active(t.value()===e.value())})}).fire("show"),e.menu.on("select",function(t){e.value(t.control.value())}),e.on("focusin",function(t){"INPUT"===t.target.tagName.toUpperCase()&&e.menu.hide()}),e.aria("expanded",!0)),e.menu.show(),e.menu.layoutRect({w:e.layoutRect().w}),e.menu.moveRel(e.getEl(),e.isRtl()?["br-tr","tr-br"]:["bl-tl","tl-bl"])},focus:function(){this.getEl("inp").focus()},repaint:function(){var t,e,n=this,i=n.getEl(),r=n.getEl("open"),o=n.layoutRect(),s=0,a=i.firstChild;n.statusLevel()&&"none"!==n.statusLevel()&&(s=parseInt(Mt.getRuntimeStyle(a,"padding-right"),10)-parseInt(Mt.getRuntimeStyle(a,"padding-left"),10)),t=r?o.w-Mt.getSize(r).width-10:o.w-10;var l=_.document;return l.all&&(!l.documentMode||l.documentMode<=8)&&(e=n.layoutRect().h-2+"px"),Nt(a).css({width:t-s,lineHeight:e}),n._super(),n},postRender:function(){var e=this;return Nt(this.getEl("inp")).on("change",function(t){e.state.set("value",t.target.value),e.fire("change",t)}),e._super()},renderHtml:function(){var t,e,n,i=this,r=i._id,o=i.settings,s=i.classPrefix,a=i.state.get("value")||"",l="",u="";return"spellcheck"in o&&(u+=' spellcheck="'+o.spellcheck+'"'),o.maxLength&&(u+=' maxlength="'+o.maxLength+'"'),o.size&&(u+=' size="'+o.size+'"'),o.subtype&&(u+=' type="'+o.subtype+'"'),n='<i id="'+r+'-status" class="mce-status mce-ico" style="display: none"></i>',i.disabled()&&(u+=' disabled="disabled"'),(t=o.icon)&&"caret"!==t&&(t=s+"ico "+s+"i-"+o.icon),e=i.state.get("text"),(t||e)&&(l='<div id="'+r+'-open" class="'+s+"btn "+s+'open" tabIndex="-1" role="button"><button id="'+r+'-action" type="button" hidefocus="1" tabindex="-1">'+("caret"!==t?'<i class="'+t+'"></i>':'<i class="'+s+'caret"></i>')+(e?(t?" ":"")+e:"")+"</button></div>",i.classes.add("has-open")),'<div id="'+r+'" class="'+i.classes+'"><input id="'+r+'-inp" class="'+s+'textbox" value="'+i.encode(a,!1)+'" hidefocus="1"'+u+' placeholder="'+i.encode(o.placeholder)+'" />'+n+l+"</div>"},value:function(t){return arguments.length?(this.state.set("value",t),this):(this.state.get("rendered")&&this.state.set("value",this.getEl("inp").value),this.state.get("value"))},showAutoComplete:function(t,i){var r=this;if(0!==t.length){r.menu?r.menu.items().remove():r.menu=ke.create({type:"menu",classes:"combobox-menu",layout:"flow"}).parent(r).renderTo(),C.each(t,function(t){var e,n;r.menu.add({text:t.title,url:t.previewUrl,match:i,classes:"menu-item-ellipsis",onclick:(e=t.value,n=t.title,function(){r.fire("selectitem",{title:n,value:e})})})}),r.menu.renderNew(),r.hideMenu(),r.menu.on("cancel",function(t){t.control.parent()===r.menu&&(t.stopPropagation(),r.focus(),r.hideMenu())}),r.menu.on("select",function(){r.focus()});var e=r.layoutRect().w;r.menu.layoutRect({w:e,minW:0,maxW:e}),r.menu.repaint(),r.menu.reflow(),r.menu.show(),r.menu.moveRel(r.getEl(),r.isRtl()?["br-tr","tr-br"]:["bl-tl","tl-bl"])}else r.hideMenu()},hideMenu:function(){this.menu&&this.menu.hide()},bindStates:function(){var r=this;r.state.on("change:value",function(t){r.getEl("inp").value!==t.value&&(r.getEl("inp").value=t.value)}),r.state.on("change:disabled",function(t){r.getEl("inp").disabled=t.value}),r.state.on("change:statusLevel",function(t){var e=r.getEl("status"),n=r.classPrefix,i=t.value;Mt.css(e,"display","none"===i?"none":""),Mt.toggleClass(e,n+"i-checkmark","ok"===i),Mt.toggleClass(e,n+"i-warning","warn"===i),Mt.toggleClass(e,n+"i-error","error"===i),r.classes.toggle("has-status","none"!==i),r.repaint()}),Mt.on(r.getEl("status"),"mouseleave",function(){r.tooltip().hide()}),r.on("cancel",function(t){r.menu&&r.menu.visible()&&(t.stopPropagation(),r.hideMenu())});var n=function(t,e){e&&0<e.items().length&&e.items().eq(t)[0].focus()};return r.on("keydown",function(t){var e=t.keyCode;"INPUT"===t.target.nodeName&&(e===In.DOWN?(t.preventDefault(),r.fire("autocomplete"),n(0,r.menu)):e===In.UP&&(t.preventDefault(),n(-1,r.menu)))}),r._super()},remove:function(){Nt(this.getEl("inp")).off(),this.menu&&this.menu.remove(),this._super()}}),Fn=zn.extend({init:function(t){var e=this;t.spellcheck=!1,t.onaction&&(t.icon="none"),e._super(t),e.classes.add("colorbox"),e.on("change keyup postrender",function(){e.repaintColor(e.value())})},repaintColor:function(t){var e=this.getEl("open"),n=e?e.getElementsByTagName("i")[0]:null;if(n)try{n.style.background=t}catch(i){}},bindStates:function(){var e=this;return e.state.on("change:value",function(t){e.state.get("rendered")&&e.repaintColor(t.value)}),e._super()}}),Un=Dn.extend({showPanel:function(){var e=this,t=e.settings;if(e.classes.add("opened"),e.panel)e.panel.show();else{var n=t.panel;n.type&&(n={layout:"grid",items:n}),n.role=n.role||"dialog",n.popover=!0,n.autohide=!0,n.ariaRoot=!0,e.panel=new Ve(n).on("hide",function(){e.classes.remove("opened")}).on("cancel",function(t){t.stopPropagation(),e.focus(),e.hidePanel()}).parent(e).renderTo(e.getContainerElm()),e.panel.fire("show"),e.panel.reflow()}var i=e.panel.testMoveRel(e.getEl(),t.popoverAlign||(e.isRtl()?["bc-tc","bc-tl","bc-tr"]:["bc-tc","bc-tr","bc-tl","tc-bc","tc-br","tc-bl"]));e.panel.classes.toggle("start","l"===i.substr(-1)),e.panel.classes.toggle("end","r"===i.substr(-1));var r="t"===i.substr(0,1);e.panel.classes.toggle("bottom",!r),e.panel.classes.toggle("top",r),e.panel.moveRel(e.getEl(),i)},hidePanel:function(){this.panel&&this.panel.hide()},postRender:function(){var e=this;return e.aria("haspopup",!0),e.on("click",function(t){t.control===e&&(e.panel&&e.panel.visible()?e.hidePanel():(e.showPanel(),e.panel.focus(!!t.aria)))}),e._super()},remove:function(){return this.panel&&(this.panel.remove(),this.panel=null),this._super()}}),Vn=v.DOM,qn=Un.extend({init:function(t){this._super(t),this.classes.add("splitbtn"),this.classes.add("colorbutton")},color:function(t){return t?(this._color=t,this.getEl("preview").style.backgroundColor=t,this):this._color},resetColor:function(){return this._color=null,this.getEl("preview").style.backgroundColor=null,this},renderHtml:function(){var t=this,e=t._id,n=t.classPrefix,i=t.state.get("text"),r=t.settings.icon?n+"ico "+n+"i-"+t.settings.icon:"",o=t.settings.image?" style=\"background-image: url('"+t.settings.image+"')\"":"",s="";return i&&(t.classes.add("btn-has-text"),s='<span class="'+n+'txt">'+t.encode(i)+"</span>"),'<div id="'+e+'" class="'+t.classes+'" role="button" tabindex="-1" aria-haspopup="true"><button role="presentation" hidefocus="1" type="button" tabindex="-1">'+(r?'<i class="'+r+'"'+o+"></i>":"")+'<span id="'+e+'-preview" class="'+n+'preview"></span>'+s+'</button><button type="button" class="'+n+'open" hidefocus="1" tabindex="-1"> <i class="'+n+'caret"></i></button></div>'},postRender:function(){var e=this,n=e.settings.onclick;return e.on("click",function(t){t.aria&&"down"===t.aria.key||t.control!==e||Vn.getParent(t.target,"."+e.classPrefix+"open")||(t.stopImmediatePropagation(),n.call(e,t))}),delete e.settings.onclick,e._super()}}),Yn=tinymce.util.Tools.resolve("tinymce.util.Color"),$n=ye.extend({Defaults:{classes:"widget colorpicker"},init:function(t){this._super(t)},postRender:function(){var n,i,r,o,s,a=this,l=a.color();function u(t,e){var n,i,r=Mt.getPos(t);return n=e.pageX-r.x,i=e.pageY-r.y,{x:n=Math.max(0,Math.min(n/t.clientWidth,1)),y:i=Math.max(0,Math.min(i/t.clientHeight,1))}}function c(t,e){var n=(360-t.h)/360;Mt.css(r,{top:100*n+"%"}),e||Mt.css(s,{left:t.s+"%",top:100-t.v+"%"}),o.style.background=Yn({s:100,v:100,h:t.h}).toHex(),a.color().parse({s:t.s,v:t.v,h:t.h})}function t(t){var e;e=u(o,t),n.s=100*e.x,n.v=100*(1-e.y),c(n),a.fire("change")}function e(t){var e;e=u(i,t),(n=l.toHsv()).h=360*(1-e.y),c(n,!0),a.fire("change")}i=a.getEl("h"),r=a.getEl("hp"),o=a.getEl("sv"),s=a.getEl("svp"),a._repaint=function(){c(n=l.toHsv())},a._super(),a._svdraghelper=new Ce(a._id+"-sv",{start:t,drag:t}),a._hdraghelper=new Ce(a._id+"-h",{start:e,drag:e}),a._repaint()},rgb:function(){return this.color().toRgb()},value:function(t){if(!arguments.length)return this.color().toHex();this.color().parse(t),this._rendered&&this._repaint()},color:function(){return this._color||(this._color=Yn()),this._color},renderHtml:function(){var t,e=this._id,o=this.classPrefix,s="#ff0000,#ff0080,#ff00ff,#8000ff,#0000ff,#0080ff,#00ffff,#00ff80,#00ff00,#80ff00,#ffff00,#ff8000,#ff0000";return t='<div id="'+e+'-h" class="'+o+'colorpicker-h" style="background: -ms-linear-gradient(top,'+s+");background: linear-gradient(to bottom,"+s+');">'+function(){var t,e,n,i,r="";for(n="filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=",t=0,e=(i=s.split(",")).length-1;t<e;t++)r+='<div class="'+o+'colorpicker-h-chunk" style="height:'+100/e+"%;"+n+i[t]+",endColorstr="+i[t+1]+");-ms-"+n+i[t]+",endColorstr="+i[t+1]+')"></div>';return r}()+'<div id="'+e+'-hp" class="'+o+'colorpicker-h-marker"></div></div>','<div id="'+e+'" class="'+this.classes+'"><div id="'+e+'-sv" class="'+o+'colorpicker-sv"><div class="'+o+'colorpicker-overlay1"><div class="'+o+'colorpicker-overlay2"><div id="'+e+'-svp" class="'+o+'colorpicker-selector1"><div class="'+o+'colorpicker-selector2"></div></div></div></div></div>'+t+"</div>"}}),Xn=ye.extend({init:function(t){t=C.extend({height:100,text:"Drop an image here",multiple:!1,accept:null},t),this._super(t),this.classes.add("dropzone"),t.multiple&&this.classes.add("multiple")},renderHtml:function(){var t,e,n=this.settings;return t={id:this._id,hidefocus:"1"},e=Mt.create("div",t,"<span>"+this.translate(n.text)+"</span>"),n.height&&Mt.css(e,"height",n.height+"px"),n.width&&Mt.css(e,"width",n.width+"px"),e.className=this.classes,e.outerHTML},postRender:function(){var i=this,t=function(t){t.preventDefault(),i.classes.toggle("dragenter"),i.getEl().className=i.classes};i._super(),i.$el.on("dragover",function(t){t.preventDefault()}),i.$el.on("dragenter",t),i.$el.on("dragleave",t),i.$el.on("drop",function(t){if(t.preventDefault(),!i.state.get("disabled")){var e=function(t){var e=i.settings.accept;if("string"!=typeof e)return t;var n=new RegExp("("+e.split(/\s*,\s*/).join("|")+")$","i");return C.grep(t,function(t){return n.test(t.name)})}(t.dataTransfer.files);i.value=function(){return e.length?i.settings.multiple?e:e[0]:null},e.length&&i.fire("change",t)}})},remove:function(){this.$el.off(),this._super()}}),jn=ye.extend({init:function(t){var n=this;t.delimiter||(t.delimiter="\xbb"),n._super(t),n.classes.add("path"),n.canFocus=!0,n.on("click",function(t){var e;(e=t.target.getAttribute("data-index"))&&n.fire("select",{value:n.row()[e],index:e})}),n.row(n.settings.row)},focus:function(){return this.getEl().firstChild.focus(),this},row:function(t){return arguments.length?(this.state.set("row",t),this):this.state.get("row")},renderHtml:function(){return'<div id="'+this._id+'" class="'+this.classes+'">'+this._getDataPathHtml(this.state.get("row"))+"</div>"},bindStates:function(){var e=this;return e.state.on("change:row",function(t){e.innerHtml(e._getDataPathHtml(t.value))}),e._super()},_getDataPathHtml:function(t){var e,n,i=t||[],r="",o=this.classPrefix;for(e=0,n=i.length;e<n;e++)r+=(0<e?'<div class="'+o+'divider" aria-hidden="true"> '+this.settings.delimiter+" </div>":"")+'<div role="button" class="'+o+"path-item"+(e===n-1?" "+o+"last":"")+'" data-index="'+e+'" tabindex="-1" id="'+this._id+"-"+e+'" aria-level="'+(e+1)+'">'+i[e].name+"</div>";return r||(r='<div class="'+o+'path-item">\xa0</div>'),r}}),Jn=jn.extend({postRender:function(){var o=this,s=o.settings.editor;function a(t){if(1===t.nodeType){if("BR"===t.nodeName||t.getAttribute("data-mce-bogus"))return!0;if("bookmark"===t.getAttribute("data-mce-type"))return!0}return!1}return!1!==s.settings.elementpath&&(o.on("select",function(t){s.focus(),s.selection.select(this.row()[t.index].element),s.nodeChanged()}),s.on("nodeChange",function(t){for(var e=[],n=t.parents,i=n.length;i--;)if(1===n[i].nodeType&&!a(n[i])){var r=s.fire("ResolveName",{name:n[i].nodeName.toLowerCase(),target:n[i]});if(r.isDefaultPrevented()||e.push({name:r.name,element:n[i]}),r.isPropagationStopped())break}o.row(e)})),o._super()}}),Gn=Pe.extend({Defaults:{layout:"flex",align:"center",defaults:{flex:1}},renderHtml:function(){var t=this,e=t._layout,n=t.classPrefix;return t.classes.add("formitem"),e.preRender(t),'<div id="'+t._id+'" class="'+t.classes+'" hidefocus="1" tabindex="-1">'+(t.settings.title?'<div id="'+t._id+'-title" class="'+n+'title">'+t.settings.title+"</div>":"")+'<div id="'+t._id+'-body" class="'+t.bodyClasses+'">'+(t.settings.html||"")+e.renderHtml(t)+"</div></div>"}}),Kn=Pe.extend({Defaults:{containerCls:"form",layout:"flex",direction:"column",align:"stretch",flex:1,padding:15,labelGap:30,spacing:10,callbacks:{submit:function(){this.submit()}}},preRender:function(){var i=this,t=i.items();i.settings.formItemDefaults||(i.settings.formItemDefaults={layout:"flex",autoResize:"overflow",defaults:{flex:1}}),t.each(function(t){var e,n=t.settings.label;n&&((e=new Gn(C.extend({items:{type:"label",id:t._id+"-l",text:n,flex:0,forId:t._id,disabled:t.disabled()}},i.settings.formItemDefaults))).type="formitem",t.aria("labelledby",t._id+"-l"),"undefined"==typeof t.settings.flex&&(t.settings.flex=1),i.replace(t,e),e.add(t))})},submit:function(){return this.fire("submit",{data:this.toJSON()})},postRender:function(){this._super(),this.fromJSON(this.settings.data)},bindStates:function(){var n=this;function t(){var t,e,i=0,r=[];if(!1!==n.settings.labelGapCalc)for(("children"===n.settings.labelGapCalc?n.find("formitem"):n.items()).filter("formitem").each(function(t){var e=t.items()[0],n=e.getEl().clientWidth;i=i<n?n:i,r.push(e)}),e=n.settings.labelGap||0,t=r.length;t--;)r[t].settings.minWidth=i+e}n._super(),n.on("show",t),t()}}),Zn=Kn.extend({Defaults:{containerCls:"fieldset",layout:"flex",direction:"column",align:"stretch",flex:1,padding:"25 15 5 15",labelGap:30,spacing:10,border:1},renderHtml:function(){var t=this,e=t._layout,n=t.classPrefix;return t.preRender(),e.preRender(t),'<fieldset id="'+t._id+'" class="'+t.classes+'" hidefocus="1" tabindex="-1">'+(t.settings.title?'<legend id="'+t._id+'-title" class="'+n+'fieldset-title">'+t.settings.title+"</legend>":"")+'<div id="'+t._id+'-body" class="'+t.bodyClasses+'">'+(t.settings.html||"")+e.renderHtml(t)+"</div></fieldset>"}}),Qn=0,ti=function(t){if(null===t||t===undefined)throw new Error("Node cannot be null or undefined");return{dom:ut(t)}},ei={fromHtml:function(t,e){var n=(e||_.document).createElement("div");if(n.innerHTML=t,!n.hasChildNodes()||1<n.childNodes.length)throw _.console.error("HTML does not have a single root node",t),new Error("HTML must have a single root node");return ti(n.childNodes[0])},fromTag:function(t,e){var n=(e||_.document).createElement(t);return ti(n)},fromText:function(t,e){var n=(e||_.document).createTextNode(t);return ti(n)},fromDom:ti,fromPoint:function(t,e,n){var i=t.dom();return vt.from(i.elementFromPoint(e,n)).map(ti)}},ni=(_.Node.ATTRIBUTE_NODE,_.Node.CDATA_SECTION_NODE,_.Node.COMMENT_NODE,_.Node.DOCUMENT_NODE),ii=(_.Node.DOCUMENT_TYPE_NODE,_.Node.DOCUMENT_FRAGMENT_NODE,_.Node.ELEMENT_NODE),ri=(_.Node.TEXT_NODE,_.Node.PROCESSING_INSTRUCTION_NODE,_.Node.ENTITY_REFERENCE_NODE,_.Node.ENTITY_NODE,_.Node.NOTATION_NODE,function(t,e){var n=function(t,e){for(var n=0;n<t.length;n++){var i=t[n];if(i.test(e))return i}return undefined}(t,e);if(!n)return{major:0,minor:0};var i=function(t){return Number(e.replace(n,"$"+t))};return si(i(1),i(2))}),oi=function(){return si(0,0)},si=function(t,e){return{major:t,minor:e}},ai={nu:si,detect:function(t,e){var n=String(e).toLowerCase();return 0===t.length?oi():ri(t,n)},unknown:oi},li="Firefox",ui=function(t,e){return function(){return e===t}},ci=function(t){var e=t.current;return{current:e,version:t.version,isEdge:ui("Edge",e),isChrome:ui("Chrome",e),isIE:ui("IE",e),isOpera:ui("Opera",e),isFirefox:ui(li,e),isSafari:ui("Safari",e)}},di={unknown:function(){return ci({current:undefined,version:ai.unknown()})},nu:ci,edge:ut("Edge"),chrome:ut("Chrome"),ie:ut("IE"),opera:ut("Opera"),firefox:ut(li),safari:ut("Safari")},fi="Windows",hi="Android",mi="Solaris",gi="FreeBSD",pi=function(t,e){return function(){return e===t}},vi=function(t){var e=t.current;return{current:e,version:t.version,isWindows:pi(fi,e),isiOS:pi("iOS",e),isAndroid:pi(hi,e),isOSX:pi("OSX",e),isLinux:pi("Linux",e),isSolaris:pi(mi,e),isFreeBSD:pi(gi,e)}},yi={unknown:function(){return vi({current:undefined,version:ai.unknown()})},nu:vi,windows:ut(fi),ios:ut("iOS"),android:ut(hi),linux:ut("Linux"),osx:ut("OSX"),solaris:ut(mi),freebsd:ut(gi)},bi=function(t,e){var n=String(e).toLowerCase();return function(t,e){for(var n=0,i=t.length;n<i;n++){var r=t[n];if(e(r,n,t))return vt.some(r)}return vt.none()}(t,function(t){return t.search(n)})},xi=function(t,n){return bi(t,n).map(function(t){var e=ai.detect(t.versionRegexes,n);return{current:t.name,version:e}})},wi=function(t,n){return bi(t,n).map(function(t){var e=ai.detect(t.versionRegexes,n);return{current:t.name,version:e}})},_i=function(t,e){return-1!==t.indexOf(e)},Ri=/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,Ci=function(e){return function(t){return _i(t,e)}},ki=[{name:"Edge",versionRegexes:[/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],search:function(t){return _i(t,"edge/")&&_i(t,"chrome")&&_i(t,"safari")&&_i(t,"applewebkit")}},{name:"Chrome",versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/,Ri],search:function(t){return _i(t,"chrome")&&!_i(t,"chromeframe")}},{name:"IE",versionRegexes:[/.*?msie\ ?([0-9]+)\.([0-9]+).*/,/.*?rv:([0-9]+)\.([0-9]+).*/],search:function(t){return _i(t,"msie")||_i(t,"trident")}},{name:"Opera",versionRegexes:[Ri,/.*?opera\/([0-9]+)\.([0-9]+).*/],search:Ci("opera")},{name:"Firefox",versionRegexes:[/.*?firefox\/\ ?([0-9]+)\.([0-9]+).*/],search:Ci("firefox")},{name:"Safari",versionRegexes:[Ri,/.*?cpu os ([0-9]+)_([0-9]+).*/],search:function(t){return(_i(t,"safari")||_i(t,"mobile/"))&&_i(t,"applewebkit")}}],Ei=[{name:"Windows",search:Ci("win"),versionRegexes:[/.*?windows\ nt\ ?([0-9]+)\.([0-9]+).*/]},{name:"iOS",search:function(t){return _i(t,"iphone")||_i(t,"ipad")},versionRegexes:[/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,/.*cpu os ([0-9]+)_([0-9]+).*/,/.*cpu iphone os ([0-9]+)_([0-9]+).*/]},{name:"Android",search:Ci("android"),versionRegexes:[/.*?android\ ?([0-9]+)\.([0-9]+).*/]},{name:"OSX",search:Ci("os x"),versionRegexes:[/.*?os\ x\ ?([0-9]+)_([0-9]+).*/]},{name:"Linux",search:Ci("linux"),versionRegexes:[]},{name:"Solaris",search:Ci("sunos"),versionRegexes:[]},{name:"FreeBSD",search:Ci("freebsd"),versionRegexes:[]}],Hi={browsers:ut(ki),oses:ut(Ei)},Ti=function(t){var e,n,i,r,o,s,a,l,u,c,d,f=Hi.browsers(),h=Hi.oses(),m=xi(f,t).fold(di.unknown,di.nu),g=wi(h,t).fold(yi.unknown,yi.nu);return{browser:m,os:g,deviceType:(n=m,i=t,r=(e=g).isiOS()&&!0===/ipad/i.test(i),o=e.isiOS()&&!r,s=e.isAndroid()&&3===e.version.major,a=e.isAndroid()&&4===e.version.major,l=r||s||a&&!0===/mobile/i.test(i),u=e.isiOS()||e.isAndroid(),c=u&&!l,d=n.isSafari()&&e.isiOS()&&!1===/safari/i.test(i),{isiPad:ut(r),isiPhone:ut(o),isTablet:ut(l),isPhone:ut(c),isTouch:ut(u),isAndroid:e.isAndroid,isiOS:e.isiOS,isWebView:ut(d)})}},Si=(Ze=!(Ge=function(){var t=_.navigator.userAgent;return Ti(t)}),function(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e];return Ze||(Ze=!0,Ke=Ge.apply(null,t)),Ke}),Mi=ii,Ni=ni,Oi=function(t){return t.nodeType!==Mi&&t.nodeType!==Ni||0===t.childElementCount},Pi=(Si().browser.isIE(),function(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e]}("element","offset"),C.trim),Wi=function(e){return function(t){if(t&&1===t.nodeType){if(t.contentEditable===e)return!0;if(t.getAttribute("data-mce-contenteditable")===e)return!0}return!1}},Di=Wi("true"),Ai=Wi("false"),Bi=function(t,e,n,i,r){return{type:t,title:e,url:n,level:i,attach:r}},Li=function(t){return t.innerText||t.textContent},Ii=function(t){return t.id?t.id:(e="h",n=(new Date).getTime(),e+"_"+Math.floor(1e9*Math.random())+ ++Qn+String(n));var e,n},zi=function(t){return(e=t)&&"A"===e.nodeName&&(e.id||e.name)&&Ui(t);var e},Fi=function(t){return t&&/^(H[1-6])$/.test(t.nodeName)},Ui=function(t){return function(t){for(;t=t.parentNode;){var e=t.contentEditable;if(e&&"inherit"!==e)return Di(t)}return!1}(t)&&!Ai(t)},Vi=function(t){return Fi(t)&&Ui(t)},qi=function(t){var e,n=Ii(t);return Bi("header",Li(t),"#"+n,Fi(e=t)?parseInt(e.nodeName.substr(1),10):0,function(){t.id=n})},Yi=function(t){var e=t.id||t.name,n=Li(t);return Bi("anchor",n||"#"+e,"#"+e,0,lt)},$i=function(t){var e,n,i,r,o,s;return e="h1,h2,h3,h4,h5,h6,a:not([href])",n=t,Rt((Si().browser.isIE(),function(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e]}("element","offset"),i=ei.fromDom(n),r=e,s=(o=i)===undefined?_.document:o.dom(),Oi(s)?[]:Rt(s.querySelectorAll(r),ei.fromDom)),function(t){return t.dom()})},Xi=function(t){return 0<Pi(t.title).length},ji=function(t){var e,n=$i(t);return kt((e=n,Rt(kt(e,Vi),qi)).concat(Rt(kt(n,zi),Yi)),Xi)},Ji={},Gi=function(t){return{title:t.title,value:{title:{raw:t.title},url:t.url,attach:t.attach}}},Ki=function(t,e){return{title:t,value:{title:t,url:e,attach:lt}}},Zi=function(t,e,n){var i=e in t?t[e]:n;return!1===i?null:i},Qi=function(t,i,r,e){var n,o,s,a,l,u,c={title:"-"},d=function(t){var e=t.hasOwnProperty(r)?t[r]:[],n=kt(e,function(t){return e=t,!_t(i,function(t){return t.url===e});var e});return C.map(n,function(t){return{title:t,value:{title:t,url:t,attach:lt}}})},f=function(e){var t,n=kt(i,function(t){return t.type===e});return t=n,C.map(t,Gi)};return!1===e.typeahead_urls?[]:"file"===r?(n=[er(t,d(Ji)),er(t,f("header")),er(t,(a=f("anchor"),l=Zi(e,"anchor_top","#top"),u=Zi(e,"anchor_bottom","#bottom"),null!==l&&a.unshift(Ki("<top>",l)),null!==u&&a.push(Ki("<bottom>",u)),a))],o=function(t,e){return 0===t.length||0===e.length?t.concat(e):t.concat(c,e)},s=[],Ct(n,function(t){s=o(s,t)}),s):er(t,d(Ji))},tr=function(t,e){var n,i,r,o=Ji[e];/^https?/.test(t)&&(o?(n=o,i=t,r=wt(n,i),-1===r?vt.none():vt.some(r)).isNone()&&(Ji[e]=o.slice(0,5).concat(t)):Ji[e]=[t])},er=function(t,e){var n=t.toLowerCase(),i=C.grep(e,function(t){return-1!==t.title.toLowerCase().indexOf(n)});return 1===i.length&&i[0].title===t?[]:i},nr=function(o,t,n){var i=t.filepicker_validator_handler;i&&o.state.on("change:value",function(t){var e;0!==(e=t.value).length?i({url:e,type:n},function(t){var e,n,i,r=(n=(e=t).status,i=e.message,"valid"===n?{status:"ok",message:i}:"unknown"===n?{status:"warn",message:i}:"invalid"===n?{status:"warn",message:i}:{status:"none",message:""});o.statusMessage(r.message),o.statusLevel(r.status)}):o.statusLevel("none")})},ir=zn.extend({Statics:{clearHistory:function(){Ji={}}},init:function(t){var e,n,i,r,o,s,a,l,u=this,c=window.tinymce?window.tinymce.activeEditor:N.activeEditor,d=c.settings,f=t.filetype;t.spellcheck=!1,(i=d.file_picker_types||d.file_browser_callback_types)&&(i=C.makeMap(i,/[, ]/)),i&&!i[f]||(!(n=d.file_picker_callback)||i&&!i[f]?!(n=d.file_browser_callback)||i&&!i[f]||(e=function(){n(u.getEl("inp").id,u.value(),f,window)}):e=function(){var t=u.fire("beforecall").meta;t=C.extend({filetype:f},t),n.call(c,function(t,e){u.value(t).fire("change",{meta:e})},u.value(),t)}),e&&(t.icon="browse",t.onaction=e),u._super(t),u.classes.add("filepicker"),r=u,o=d,s=c.getBody(),a=f,l=function(t){var e=ji(s),n=Qi(t,e,a,o);r.showAutoComplete(n,t)},r.on("autocomplete",function(){l(r.value())}),r.on("selectitem",function(t){var e=t.value;r.value(e.url);var n,i=(n=e.title).raw?n.raw:n;"image"===a?r.fire("change",{meta:{alt:i,attach:e.attach}}):r.fire("change",{meta:{text:i,attach:e.attach}}),r.focus()}),r.on("click",function(t){0===r.value().length&&"INPUT"===t.target.nodeName&&l("")}),r.on("PostRender",function(){r.getRoot().on("submit",function(t){t.isDefaultPrevented()||tr(r.value(),a)})}),nr(u,d,f)}}),rr=Wn.extend({recalc:function(t){var e=t.layoutRect(),n=t.paddingBox;t.items().filter(":visible").each(function(t){t.layoutRect({x:n.left,y:n.top,w:e.innerW-n.right-n.left,h:e.innerH-n.top-n.bottom}),t.recalc&&t.recalc()})}}),or=Wn.extend({recalc:function(t){var e,n,i,r,o,s,a,l,u,c,d,f,h,m,g,p,v,y,b,x,w,_,R,C,k,E,H,T,S,M,N,O,P,W,D,A,B,L=[],I=Math.max,z=Math.min;for(i=t.items().filter(":visible"),r=t.layoutRect(),o=t.paddingBox,s=t.settings,f=t.isRtl()?s.direction||"row-reversed":s.direction,a=s.align,l=t.isRtl()?s.pack||"end":s.pack,u=s.spacing||0,"row-reversed"!==f&&"column-reverse"!==f||(i=i.set(i.toArray().reverse()),f=f.split("-")[0]),"column"===f?(C="y",_="h",R="minH",k="maxH",H="innerH",E="top",T="deltaH",S="contentH",W="left",O="w",M="x",N="innerW",P="minW",D="right",A="deltaW",B="contentW"):(C="x",_="w",R="minW",k="maxW",H="innerW",E="left",T="deltaW",S="contentW",W="top",O="h",M="y",N="innerH",P="minH",D="bottom",A="deltaH",B="contentH"),d=r[H]-o[E]-o[E],w=c=0,e=0,n=i.length;e<n;e++)m=(h=i[e]).layoutRect(),d-=e<n-1?u:0,0<(g=h.settings.flex)&&(c+=g,m[k]&&L.push(h),m.flex=g),d-=m[R],w<(p=o[W]+m[P]+o[D])&&(w=p);if((b={})[R]=d<0?r[R]-d+r[T]:r[H]-d+r[T],b[P]=w+r[A],b[S]=r[H]-d,b[B]=w,b.minW=z(b.minW,r.maxW),b.minH=z(b.minH,r.maxH),b.minW=I(b.minW,r.startMinWidth),b.minH=I(b.minH,r.startMinHeight),!r.autoResize||b.minW===r.minW&&b.minH===r.minH){for(y=d/c,e=0,n=L.length;e<n;e++)(v=(m=(h=L[e]).layoutRect())[k])<(p=m[R]+m.flex*y)?(d-=m[k]-m[R],c-=m.flex,m.flex=0,m.maxFlexSize=v):m.maxFlexSize=0;for(y=d/c,x=o[E],b={},0===c&&("end"===l?x=d+o[E]:"center"===l?(x=Math.round(r[H]/2-(r[H]-d)/2)+o[E])<0&&(x=o[E]):"justify"===l&&(x=o[E],u=Math.floor(d/(i.length-1)))),b[M]=o[W],e=0,n=i.length;e<n;e++)p=(m=(h=i[e]).layoutRect()).maxFlexSize||m[R],"center"===a?b[M]=Math.round(r[N]/2-m[O]/2):"stretch"===a?(b[O]=I(m[P]||0,r[N]-o[W]-o[D]),b[M]=o[W]):"end"===a&&(b[M]=r[N]-m[O]-o.top),0<m.flex&&(p+=m.flex*y),b[_]=p,b[C]=x,h.layoutRect(b),h.recalc&&h.recalc(),x+=p+u}else if(b.w=b.minW,b.h=b.minH,t.layoutRect(b),this.recalc(t),null===t._lastRect){var F=t.parent();F&&(F._lastRect=null,F.recalc())}}}),sr=Pn.extend({Defaults:{containerClass:"flow-layout",controlClass:"flow-layout-item",endClass:"break"},recalc:function(t){t.items().filter(":visible").each(function(t){t.recalc&&t.recalc()})},isNative:function(){return!0}}),ar=function(t,e){return n=e,r=(i=t)===undefined?_.document:i.dom(),Oi(r)?vt.none():vt.from(r.querySelector(n)).map(ei.fromDom);var n,i,r},lr=function(t,e){return function(){t.execCommand("mceToggleFormat",!1,e)}},ur=function(t,e,n){var i=function(t){n(t,e)};t.formatter?t.formatter.formatChanged(e,i):t.on("init",function(){t.formatter.formatChanged(e,i)})},cr=function(t,n){return function(e){ur(t,n,function(t){e.control.active(t)})}},dr=function(i){var e=["alignleft","aligncenter","alignright","alignjustify"],r="alignleft",t=[{text:"Left",icon:"alignleft",onclick:lr(i,"alignleft")},{text:"Center",icon:"aligncenter",onclick:lr(i,"aligncenter")},{text:"Right",icon:"alignright",onclick:lr(i,"alignright")},{text:"Justify",icon:"alignjustify",onclick:lr(i,"alignjustify")}];i.addMenuItem("align",{text:"Align",menu:t}),i.addButton("align",{type:"menubutton",icon:r,menu:t,onShowMenu:function(t){var n=t.control.menu;C.each(e,function(e,t){n.items().eq(t).each(function(t){return t.active(i.formatter.match(e))})})},onPostRender:function(t){var n=t.control;C.each(e,function(e,t){ur(i,e,function(t){n.icon(r),t&&n.icon(e)})})}}),C.each({alignleft:["Align left","JustifyLeft"],aligncenter:["Align center","JustifyCenter"],alignright:["Align right","JustifyRight"],alignjustify:["Justify","JustifyFull"],alignnone:["No alignment","JustifyNone"]},function(t,e){i.addButton(e,{active:!1,tooltip:t[0],cmd:t[1],onPostRender:cr(i,e)})})},fr=function(t){return t?t.split(",")[0]:""},hr=function(l,u){return function(){var a=this;a.state.set("value",null),l.on("init nodeChange",function(t){var e,n,i,r,o=l.queryCommandValue("FontName"),s=(e=u,r=(n=o)?n.toLowerCase():"",C.each(e,function(t){t.value.toLowerCase()===r&&(i=t.value)}),C.each(e,function(t){i||fr(t.value).toLowerCase()!==fr(r).toLowerCase()||(i=t.value)}),i);a.value(s||null),!s&&o&&a.text(fr(o))})}},mr=function(n){n.addButton("fontselect",function(){var t,e=(t=function(t){for(var e=(t=t.replace(/;$/,"").split(";")).length;e--;)t[e]=t[e].split("=");return t}(n.settings.font_formats||"Andale Mono=andale mono,monospace;Arial=arial,helvetica,sans-serif;Arial Black=arial black,sans-serif;Book Antiqua=book antiqua,palatino,serif;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,palatino,serif;Helvetica=helvetica,arial,sans-serif;Impact=impact,sans-serif;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco,monospace;Times New Roman=times new roman,times,serif;Trebuchet MS=trebuchet ms,geneva,sans-serif;Verdana=verdana,geneva,sans-serif;Webdings=webdings;Wingdings=wingdings,zapf dingbats"),C.map(t,function(t){return{text:{raw:t[0]},value:t[1],textStyle:-1===t[1].indexOf("dings")?"font-family:"+t[1]:""}}));return{type:"listbox",text:"Font Family",tooltip:"Font Family",values:e,fixedWidth:!0,onPostRender:hr(n,e),onselect:function(t){t.control.settings.value&&n.execCommand("FontName",!1,t.control.settings.value)}}})},gr=function(t){mr(t)},pr=function(t,e){return/[0-9.]+px$/.test(t)?(n=72*parseInt(t,10)/96,i=e||0,r=Math.pow(10,i),Math.round(n*r)/r+"pt"):t;var n,i,r},vr=function(t,e,n){var i;return C.each(t,function(t){t.value===n?i=n:t.value===e&&(i=e)}),i},yr=function(n){n.addButton("fontsizeselect",function(){var t,s,a,e=(t=n.settings.fontsize_formats||"8pt 10pt 12pt 14pt 18pt 24pt 36pt",C.map(t.split(" "),function(t){var e=t,n=t,i=t.split("=");return 1<i.length&&(e=i[0],n=i[1]),{text:e,value:n}}));return{type:"listbox",text:"Font Sizes",tooltip:"Font Sizes",values:e,fixedWidth:!0,onPostRender:(s=n,a=e,function(){var o=this;s.on("init nodeChange",function(t){var e,n,i,r;if(e=s.queryCommandValue("FontSize"))for(i=3;!r&&0<=i;i--)n=pr(e,i),r=vr(a,n,e);o.value(r||null),r||o.text(n)})}),onclick:function(t){t.control.settings.value&&n.execCommand("FontSize",!1,t.control.settings.value)}}})},br=function(t){yr(t)},xr=function(n,t){var i=t.length;return C.each(t,function(t){t.menu&&(t.hidden=0===xr(n,t.menu));var e=t.format;e&&(t.hidden=!n.formatter.canApply(e)),t.hidden&&i--}),i},wr=function(n,t){var i=t.items().length;return t.items().each(function(t){t.menu&&t.visible(0<wr(n,t.menu)),!t.menu&&t.settings.menu&&t.visible(0<xr(n,t.settings.menu));var e=t.settings.format;e&&t.visible(n.formatter.canApply(e)),t.visible()||i--}),i},_r=function(t){var i,r,o,e,s,n,a,l,u=(r=0,o=[],e=[{title:"Headings",items:[{title:"Heading 1",format:"h1"},{title:"Heading 2",format:"h2"},{title:"Heading 3",format:"h3"},{title:"Heading 4",format:"h4"},{title:"Heading 5",format:"h5"},{title:"Heading 6",format:"h6"}]},{title:"Inline",items:[{title:"Bold",icon:"bold",format:"bold"},{title:"Italic",icon:"italic",format:"italic"},{title:"Underline",icon:"underline",format:"underline"},{title:"Strikethrough",icon:"strikethrough",format:"strikethrough"},{title:"Superscript",icon:"superscript",format:"superscript"},{title:"Subscript",icon:"subscript",format:"subscript"},{title:"Code",icon:"code",format:"code"}]},{title:"Blocks",items:[{title:"Paragraph",format:"p"},{title:"Blockquote",format:"blockquote"},{title:"Div",format:"div"},{title:"Pre",format:"pre"}]},{title:"Alignment",items:[{title:"Left",icon:"alignleft",format:"alignleft"},{title:"Center",icon:"aligncenter",format:"aligncenter"},{title:"Right",icon:"alignright",format:"alignright"},{title:"Justify",icon:"alignjustify",format:"alignjustify"}]}],s=function(t){var i=[];if(t)return C.each(t,function(t){var e={text:t.title,icon:t.icon};if(t.items)e.menu=s(t.items);else{var n=t.format||"custom"+r++;t.format||(t.name=n,o.push(t)),e.format=n,e.cmd=t.cmd}i.push(e)}),i},(i=t).on("init",function(){C.each(o,function(t){i.formatter.register(t.name,t)})}),{type:"menu",items:i.settings.style_formats_merge?i.settings.style_formats?s(e.concat(i.settings.style_formats)):s(e):s(i.settings.style_formats||e),onPostRender:function(t){i.fire("renderFormatsMenu",{control:t.control})},itemDefaults:{preview:!0,textStyle:function(){if(this.settings.format)return i.formatter.getCssText(this.settings.format)},onPostRender:function(){var n=this;n.parent().on("show",function(){var t,e;(t=n.settings.format)&&(n.disabled(!i.formatter.canApply(t)),n.active(i.formatter.match(t))),(e=n.settings.cmd)&&n.active(i.queryCommandState(e))})},onclick:function(){this.settings.format&&lr(i,this.settings.format)(),this.settings.cmd&&i.execCommand(this.settings.cmd)}}});n=u,t.addMenuItem("formats",{text:"Formats",menu:n}),l=u,(a=t).addButton("styleselect",{type:"menubutton",text:"Formats",menu:l,onShowMenu:function(){a.settings.style_formats_autohide&&wr(a,this.menu)}})},Rr=function(n,t){return function(){var r,o,s,e=[];return C.each(t,function(t){e.push({text:t[0],value:t[1],textStyle:function(){return n.formatter.getCssText(t[1])}})}),{type:"listbox",text:t[0][0],values:e,fixedWidth:!0,onselect:function(t){if(t.control){var e=t.control.value();lr(n,e)()}},onPostRender:(r=n,o=e,function(){var e=this;r.on("nodeChange",function(t){var n=r.formatter,i=null;C.each(t.parents,function(e){if(C.each(o,function(t){if(s?n.matchNode(e,s,{value:t.value})&&(i=t.value):n.matchNode(e,t.value)&&(i=t.value),i)return!1}),i)return!1}),e.value(i)})})}}},Cr=function(t){var e,n,i=function(t){for(var e=(t=t.replace(/;$/,"").split(";")).length;e--;)t[e]=t[e].split("=");return t}(t.settings.block_formats||"Paragraph=p;Heading 1=h1;Heading 2=h2;Heading 3=h3;Heading 4=h4;Heading 5=h5;Heading 6=h6;Preformatted=pre");t.addMenuItem("blockformats",{text:"Blocks",menu:(e=t,n=i,C.map(n,function(t){return{text:t[0],onclick:lr(e,t[1]),textStyle:function(){return e.formatter.getCssText(t[1])}}}))}),t.addButton("formatselect",Rr(t,i))},kr=function(e,t){var n,i;if("string"==typeof t)i=t.split(" ");else if(C.isArray(t))return function(t){for(var e=[],n=0,i=t.length;n<i;++n){if(!Array.prototype.isPrototypeOf(t[n]))throw new Error("Arr.flatten item "+n+" was not an array, input: "+t);Tt.apply(e,t[n])}return e}(C.map(t,function(t){return kr(e,t)}));return n=C.grep(i,function(t){return"|"===t||t in e.menuItems}),C.map(n,function(t){return"|"===t?{text:"-"}:e.menuItems[t]})},Er=function(t){return t&&"-"===t.text},Hr=function(t){var e=kt(t,function(t,e,n){return!Er(t)||!Er(n[e-1])});return kt(e,function(t,e,n){return!Er(t)||0<e&&e<n.length-1})},Tr=function(t){var e,n,i,r,o=t.settings.insert_button_items;return Hr(o?kr(t,o):(e=t,n="insert",i=[{text:"-"}],r=C.grep(e.menuItems,function(t){return t.context===n}),C.each(r,function(t){"before"===t.separator&&i.push({text:"|"}),t.prependToContext?i.unshift(t):i.push(t),"after"===t.separator&&i.push({text:"|"})}),i))},Sr=function(t){var e;(e=t).addButton("insert",{type:"menubutton",icon:"insert",menu:[],oncreatemenu:function(){this.menu.add(Tr(e)),this.menu.renderNew()}})},Mr=function(t){var n,i,r;n=t,C.each({bold:"Bold",italic:"Italic",underline:"Underline",strikethrough:"Strikethrough",subscript:"Subscript",superscript:"Superscript"},function(t,e){n.addButton(e,{active:!1,tooltip:t,onPostRender:cr(n,e),onclick:lr(n,e)})}),i=t,C.each({outdent:["Decrease indent","Outdent"],indent:["Increase indent","Indent"],cut:["Cut","Cut"],copy:["Copy","Copy"],paste:["Paste","Paste"],help:["Help","mceHelp"],selectall:["Select all","SelectAll"],visualaid:["Visual aids","mceToggleVisualAid"],newdocument:["New document","mceNewDocument"],removeformat:["Clear formatting","RemoveFormat"],remove:["Remove","Delete"]},function(t,e){i.addButton(e,{tooltip:t[0],cmd:t[1]})}),r=t,C.each({blockquote:["Blockquote","mceBlockQuote"],subscript:["Subscript","Subscript"],superscript:["Superscript","Superscript"]},function(t,e){r.addButton(e,{active:!1,tooltip:t[0],cmd:t[1],onPostRender:cr(r,e)})})},Nr=function(t){var n;Mr(t),n=t,C.each({bold:["Bold","Bold","Meta+B"],italic:["Italic","Italic","Meta+I"],underline:["Underline","Underline","Meta+U"],strikethrough:["Strikethrough","Strikethrough"],subscript:["Subscript","Subscript"],superscript:["Superscript","Superscript"],removeformat:["Clear formatting","RemoveFormat"],newdocument:["New document","mceNewDocument"],cut:["Cut","Cut","Meta+X"],copy:["Copy","Copy","Meta+C"],paste:["Paste","Paste","Meta+V"],selectall:["Select all","SelectAll","Meta+A"]},function(t,e){n.addMenuItem(e,{text:t[0],icon:e,shortcut:t[2],cmd:t[1]})}),n.addMenuItem("codeformat",{text:"Code",icon:"code",onclick:lr(n,"code")})},Or=function(n,i){return function(){var t=this,e=function(){var t="redo"===i?"hasRedo":"hasUndo";return!!n.undoManager&&n.undoManager[t]()};t.disabled(!e()),n.on("Undo Redo AddUndo TypingUndo ClearUndos SwitchMode",function(){t.disabled(n.readonly||!e())})}},Pr=function(t){var e,n;(e=t).addMenuItem("undo",{text:"Undo",icon:"undo",shortcut:"Meta+Z",onPostRender:Or(e,"undo"),cmd:"undo"}),e.addMenuItem("redo",{text:"Redo",icon:"redo",shortcut:"Meta+Y",onPostRender:Or(e,"redo"),cmd:"redo"}),(n=t).addButton("undo",{tooltip:"Undo",onPostRender:Or(n,"undo"),cmd:"undo"}),n.addButton("redo",{tooltip:"Redo",onPostRender:Or(n,"redo"),cmd:"redo"})},Wr=function(t){var e,n;(e=t).addMenuItem("visualaid",{text:"Visual aids",selectable:!0,onPostRender:(n=e,function(){var e=this;n.on("VisualAid",function(t){e.active(t.hasVisual)}),e.active(n.hasVisual)}),cmd:"mceToggleVisualAid"})},Dr={setup:function(t){var e;t.rtl&&(ce.rtl=!0),t.on("mousedown progressstate",function(){Ve.hideAll()}),(e=t).settings.ui_container&&(h.container=ar(ei.fromDom(_.document.body),e.settings.ui_container).fold(ut(null),function(t){return t.dom()})),ye.tooltips=!h.iOS,ce.translate=function(t){return N.translate(t)},Cr(t),dr(t),Nr(t),Pr(t),br(t),gr(t),_r(t),Wr(t),Sr(t)}},Ar=Wn.extend({recalc:function(t){var e,n,i,r,o,s,a,l,u,c,d,f,h,m,g,p,v,y,b,x,w,_,R,C,k,E,H,T,S=[],M=[];e=t.settings,r=t.items().filter(":visible"),o=t.layoutRect(),i=e.columns||Math.ceil(Math.sqrt(r.length)),n=Math.ceil(r.length/i),y=e.spacingH||e.spacing||0,b=e.spacingV||e.spacing||0,x=e.alignH||e.align,w=e.alignV||e.align,p=t.paddingBox,T="reverseRows"in e?e.reverseRows:t.isRtl(),x&&"string"==typeof x&&(x=[x]),w&&"string"==typeof w&&(w=[w]);for(d=0;d<i;d++)S.push(0);for(f=0;f<n;f++)M.push(0);for(f=0;f<n;f++)for(d=0;d<i&&(c=r[f*i+d]);d++)C=(u=c.layoutRect()).minW,k=u.minH,S[d]=C>S[d]?C:S[d],M[f]=k>M[f]?k:M[f];for(E=o.innerW-p.left-p.right,d=_=0;d<i;d++)_+=S[d]+(0<d?y:0),E-=(0<d?y:0)+S[d];for(H=o.innerH-p.top-p.bottom,f=R=0;f<n;f++)R+=M[f]+(0<f?b:0),H-=(0<f?b:0)+M[f];if(_+=p.left+p.right,R+=p.top+p.bottom,(l={}).minW=_+(o.w-o.innerW),l.minH=R+(o.h-o.innerH),l.contentW=l.minW-o.deltaW,l.contentH=l.minH-o.deltaH,l.minW=Math.min(l.minW,o.maxW),l.minH=Math.min(l.minH,o.maxH),l.minW=Math.max(l.minW,o.startMinWidth),l.minH=Math.max(l.minH,o.startMinHeight),!o.autoResize||l.minW===o.minW&&l.minH===o.minH){var N;o.autoResize&&((l=t.layoutRect(l)).contentW=l.minW-o.deltaW,l.contentH=l.minH-o.deltaH),N="start"===e.packV?0:0<H?Math.floor(H/n):0;var O=0,P=e.flexWidths;if(P)for(d=0;d<P.length;d++)O+=P[d];else O=i;var W=E/O;for(d=0;d<i;d++)S[d]+=P?P[d]*W:W;for(m=p.top,f=0;f<n;f++){for(h=p.left,a=M[f]+N,d=0;d<i&&(c=r[T?f*i+i-1-d:f*i+d]);d++)g=c.settings,u=c.layoutRect(),s=Math.max(S[d],u.startMinWidth),u.x=h,u.y=m,"center"===(v=g.alignH||(x?x[d]||x[0]:null))?u.x=h+s/2-u.w/2:"right"===v?u.x=h+s-u.w:"stretch"===v&&(u.w=s),"center"===(v=g.alignV||(w?w[d]||w[0]:null))?u.y=m+a/2-u.h/2:"bottom"===v?u.y=m+a-u.h:"stretch"===v&&(u.h=a),c.layoutRect(u),h+=s+y,c.recalc&&c.recalc();m+=a+b}}else if(l.w=l.minW,l.h=l.minH,t.layoutRect(l),this.recalc(t),null===t._lastRect){var D=t.parent();D&&(D._lastRect=null,D.recalc())}}}),Br=ye.extend({renderHtml:function(){var t=this;return t.classes.add("iframe"),t.canFocus=!1,'<iframe id="'+t._id+'" class="'+t.classes+'" tabindex="-1" src="'+(t.settings.url||"javascript:''")+'" frameborder="0"></iframe>'},src:function(t){this.getEl().src=t},html:function(t,e){var n=this,i=this.getEl().contentWindow.document.body;return i?(i.innerHTML=t,e&&e()):c.setTimeout(function(){n.html(t)}),this}}),Lr=ye.extend({init:function(t){this._super(t),this.classes.add("widget").add("infobox"),this.canFocus=!1},severity:function(t){this.classes.remove("error"),this.classes.remove("warning"),this.classes.remove("success"),this.classes.add(t)},help:function(t){this.state.set("help",t)},renderHtml:function(){var t=this,e=t.classPrefix;return'<div id="'+t._id+'" class="'+t.classes+'"><div id="'+t._id+'-body">'+t.encode(t.state.get("text"))+'<button role="button" tabindex="-1"><i class="'+e+"ico "+e+'i-help"></i></button></div></div>'},bindStates:function(){var e=this;return e.state.on("change:text",function(t){e.getEl("body").firstChild.data=e.encode(t.value),e.state.get("rendered")&&e.updateLayoutRect()}),e.state.on("change:help",function(t){e.classes.toggle("has-help",t.value),e.state.get("rendered")&&e.updateLayoutRect()}),e._super()}}),Ir=ye.extend({init:function(t){var e=this;e._super(t),e.classes.add("widget").add("label"),e.canFocus=!1,t.multiline&&e.classes.add("autoscroll"),t.strong&&e.classes.add("strong")},initLayoutRect:function(){var t=this,e=t._super();return t.settings.multiline&&(Mt.getSize(t.getEl()).width>e.maxW&&(e.minW=e.maxW,t.classes.add("multiline")),t.getEl().style.width=e.minW+"px",e.startMinH=e.h=e.minH=Math.min(e.maxH,Mt.getSize(t.getEl()).height)),e},repaint:function(){return this.settings.multiline||(this.getEl().style.lineHeight=this.layoutRect().h+"px"),this._super()},severity:function(t){this.classes.remove("error"),this.classes.remove("warning"),this.classes.remove("success"),this.classes.add(t)},renderHtml:function(){var t,e,n=this,i=n.settings.forId,r=n.settings.html?n.settings.html:n.encode(n.state.get("text"));return!i&&(e=n.settings.forName)&&(t=n.getRoot().find("#"+e)[0])&&(i=t._id),i?'<label id="'+n._id+'" class="'+n.classes+'"'+(i?' for="'+i+'"':"")+">"+r+"</label>":'<span id="'+n._id+'" class="'+n.classes+'">'+r+"</span>"},bindStates:function(){var e=this;return e.state.on("change:text",function(t){e.innerHtml(e.encode(t.value)),e.state.get("rendered")&&e.updateLayoutRect()}),e._super()}}),zr=Pe.extend({Defaults:{role:"toolbar",layout:"flow"},init:function(t){this._super(t),this.classes.add("toolbar")},postRender:function(){return this.items().each(function(t){t.classes.add("toolbar-item")}),this._super()}}),Fr=zr.extend({Defaults:{role:"menubar",containerCls:"menubar",ariaRoot:!0,defaults:{type:"menubutton"}}}),Ur=Dn.extend({init:function(t){var e=this;e._renderOpen=!0,e._super(t),t=e.settings,e.classes.add("menubtn"),t.fixedWidth&&e.classes.add("fixed-width"),e.aria("haspopup",!0),e.state.set("menu",t.menu||e.render())},showMenu:function(t){var e,n=this;if(n.menu&&n.menu.visible()&&!1!==t)return n.hideMenu();n.menu||(e=n.state.get("menu")||[],n.classes.add("opened"),e.length?e={type:"menu",animate:!0,items:e}:(e.type=e.type||"menu",e.animate=!0),e.renderTo?n.menu=e.parent(n).show().renderTo():n.menu=ke.create(e).parent(n).renderTo(),n.fire("createmenu"),n.menu.reflow(),n.menu.on("cancel",function(t){t.control.parent()===n.menu&&(t.stopPropagation(),n.focus(),n.hideMenu())}),n.menu.on("select",function(){n.focus()}),n.menu.on("show hide",function(t){"hide"===t.type&&t.control.parent()===n&&n.classes.remove("opened-under"),t.control===n.menu&&(n.activeMenu("show"===t.type),n.classes.toggle("opened","show"===t.type)),n.aria("expanded","show"===t.type)}).fire("show")),n.menu.show(),n.menu.layoutRect({w:n.layoutRect().w}),n.menu.repaint(),n.menu.moveRel(n.getEl(),n.isRtl()?["br-tr","tr-br"]:["bl-tl","tl-bl"]);var i=n.menu.layoutRect(),r=n.$el.offset().top+n.layoutRect().h;r>i.y&&r<i.y+i.h&&n.classes.add("opened-under"),n.fire("showmenu")},hideMenu:function(){this.menu&&(this.menu.items().each(function(t){t.hideMenu&&t.hideMenu()}),this.menu.hide())},activeMenu:function(t){this.classes.toggle("active",t)},renderHtml:function(){var t,e=this,n=e._id,i=e.classPrefix,r=e.settings.icon,o=e.state.get("text"),s="";return(t=e.settings.image)?(r="none","string"!=typeof t&&(t=_.window.getSelection?t[0]:t[1]),t=" style=\"background-image: url('"+t+"')\""):t="",o&&(e.classes.add("btn-has-text"),s='<span class="'+i+'txt">'+e.encode(o)+"</span>"),r=e.settings.icon?i+"ico "+i+"i-"+r:"",e.aria("role",e.parent()instanceof Fr?"menuitem":"button"),'<div id="'+n+'" class="'+e.classes+'" tabindex="-1" aria-labelledby="'+n+'"><button id="'+n+'-open" role="presentation" type="button" tabindex="-1">'+(r?'<i class="'+r+'"'+t+"></i>":"")+s+' <i class="'+i+'caret"></i></button></div>'},postRender:function(){var r=this;return r.on("click",function(t){t.control===r&&function(t,e){for(;t;){if(e===t)return!0;t=t.parentNode}return!1}(t.target,r.getEl())&&(r.focus(),r.showMenu(!t.aria),t.aria&&r.menu.items().filter(":visible")[0].focus())}),r.on("mouseenter",function(t){var e,n=t.control,i=r.parent();n&&i&&n instanceof Ur&&n.parent()===i&&(i.items().filter("MenuButton").each(function(t){t.hideMenu&&t!==n&&(t.menu&&t.menu.visible()&&(e=!0),t.hideMenu())}),e&&(n.focus(),n.showMenu()))}),r._super()},bindStates:function(){var t=this;return t.state.on("change:menu",function(){t.menu&&t.menu.remove(),t.menu=null}),t._super()},remove:function(){this._super(),this.menu&&this.menu.remove()}});function Vr(i,r){var o,s,a=this,l=ce.classPrefix;a.show=function(t,e){function n(){o&&(Nt(i).append('<div class="'+l+"throbber"+(r?" "+l+"throbber-inline":"")+'"></div>'),e&&e())}return a.hide(),o=!0,t?s=c.setTimeout(n,t):n(),a},a.hide=function(){var t=i.lastChild;return c.clearTimeout(s),t&&-1!==t.className.indexOf("throbber")&&t.parentNode.removeChild(t),o=!1,a}}var qr=Ve.extend({Defaults:{defaultType:"menuitem",border:1,layout:"stack",role:"application",bodyRole:"menu",ariaRoot:!0},init:function(t){if(t.autohide=!0,t.constrainToViewport=!0,"function"==typeof t.items&&(t.itemsFactory=t.items,t.items=[]),t.itemDefaults)for(var e=t.items,n=e.length;n--;)e[n]=C.extend({},t.itemDefaults,e[n]);this._super(t),this.classes.add("menu"),t.animate&&11!==h.ie&&this.classes.add("animate")},repaint:function(){return this.classes.toggle("menu-align",!0),this._super(),this.getEl().style.height="",this.getEl("body").style.height="",this},cancel:function(){this.hideAll(),this.fire("select")},load:function(){var e,n=this;function i(){n.throbber&&(n.throbber.hide(),n.throbber=null)}n.settings.itemsFactory&&(n.throbber||(n.throbber=new Vr(n.getEl("body"),!0),0===n.items().length?(n.throbber.show(),n.fire("loading")):n.throbber.show(100,function(){n.items().remove(),n.fire("loading")}),n.on("hide close",i)),n.requestTime=e=(new Date).getTime(),n.settings.itemsFactory(function(t){0!==t.length?n.requestTime===e&&(n.getEl().style.width="",n.getEl("body").style.width="",i(),n.items().remove(),n.getEl("body").innerHTML="",n.add(t),n.renderNew(),n.fire("loaded")):n.hide()}))},hideAll:function(){return this.find("menuitem").exec("hideMenu"),this._super()},preRender:function(){var n=this;return n.items().each(function(t){var e=t.settings;if(e.icon||e.image||e.selectable)return!(n._hasIcons=!0)}),n.settings.itemsFactory&&n.on("postrender",function(){n.settings.itemsFactory&&n.load()}),n.on("show hide",function(t){t.control===n&&("show"===t.type?c.setTimeout(function(){n.classes.add("in")},0):n.classes.remove("in"))}),n._super()}}),Yr=Ur.extend({init:function(i){var e,r,o,n,s=this;s._super(i),i=s.settings,s._values=e=i.values,e&&("undefined"!=typeof i.value&&function t(e){for(var n=0;n<e.length;n++){if(r=e[n].selected||i.value===e[n].value)return o=o||e[n].text,s.state.set("value",e[n].value),!0;if(e[n].menu&&t(e[n].menu))return!0}}(e),!r&&0<e.length&&(o=e[0].text,s.state.set("value",e[0].value)),s.state.set("menu",e)),s.state.set("text",i.text||o),s.classes.add("listbox"),s.on("select",function(t){var e=t.control;n&&(t.lastControl=n),i.multiple?e.active(!e.active()):s.value(t.control.value()),n=e})},value:function(n){return 0===arguments.length?this.state.get("value"):(void 0===n||(this.settings.values&&!function e(t){return _t(t,function(t){return t.menu?e(t.menu):t.value===n})}(this.settings.values)?null===n&&this.state.set("value",null):this.state.set("value",n)),this)},bindStates:function(){var i=this;return i.on("show",function(t){var e,n;e=t.control,n=i.value(),e instanceof qr&&e.items().each(function(t){t.hasMenus()||t.active(t.value()===n)})}),i.state.on("change:value",function(e){var n=function t(e,n){var i;if(e)for(var r=0;r<e.length;r++){if(e[r].value===n)return e[r];if(e[r].menu&&(i=t(e[r].menu,n)))return i}}(i.state.get("menu"),e.value);n?i.text(n.text):i.text(i.settings.text)}),i._super()}}),$r=ye.extend({Defaults:{border:0,role:"menuitem"},init:function(t){var e,n=this;n._super(t),t=n.settings,n.classes.add("menu-item"),t.menu&&n.classes.add("menu-item-expand"),t.preview&&n.classes.add("menu-item-preview"),"-"!==(e=n.state.get("text"))&&"|"!==e||(n.classes.add("menu-item-sep"),n.aria("role","separator"),n.state.set("text","-")),t.selectable&&(n.aria("role","menuitemcheckbox"),n.classes.add("menu-item-checkbox"),t.icon="selected"),t.preview||t.selectable||n.classes.add("menu-item-normal"),n.on("mousedown",function(t){t.preventDefault()}),t.menu&&!t.ariaHideMenu&&n.aria("haspopup",!0)},hasMenus:function(){return!!this.settings.menu},showMenu:function(){var e,n=this,t=n.settings,i=n.parent();if(i.items().each(function(t){t!==n&&t.hideMenu()}),t.menu){(e=n.menu)?e.show():((e=t.menu).length?e={type:"menu",items:e}:e.type=e.type||"menu",i.settings.itemDefaults&&(e.itemDefaults=i.settings.itemDefaults),(e=n.menu=ke.create(e).parent(n).renderTo()).reflow(),e.on("cancel",function(t){t.stopPropagation(),n.focus(),e.hide()}),e.on("show hide",function(t){t.control.items&&t.control.items().each(function(t){t.active(t.settings.selected)})}).fire("show"),e.on("hide",function(t){t.control===e&&n.classes.remove("selected")}),e.submenu=!0),e._parentMenu=i,e.classes.add("menu-sub");var r=e.testMoveRel(n.getEl(),n.isRtl()?["tl-tr","bl-br","tr-tl","br-bl"]:["tr-tl","br-bl","tl-tr","bl-br"]);e.moveRel(n.getEl(),r),r="menu-sub-"+(e.rel=r),e.classes.remove(e._lastRel).add(r),e._lastRel=r,n.classes.add("selected"),n.aria("expanded",!0)}},hideMenu:function(){var t=this;return t.menu&&(t.menu.items().each(function(t){t.hideMenu&&t.hideMenu()}),t.menu.hide(),t.aria("expanded",!1)),t},renderHtml:function(){var t,e=this,n=e._id,i=e.settings,r=e.classPrefix,o=e.state.get("text"),s=e.settings.icon,a="",l=i.shortcut,u=e.encode(i.url);function c(t){return t.replace(/[.*+?^${}()|[\]\\]/g,"\\$&")}function d(t){var e=i.match||"";return e?t.replace(new RegExp(c(e),"gi"),function(t){return"!mce~match["+t+"]mce~match!"}):t}function f(t){return t.replace(new RegExp(c("!mce~match["),"g"),"<b>").replace(new RegExp(c("]mce~match!"),"g"),"</b>")}return s&&e.parent().classes.add("menu-has-icons"),i.image&&(a=" style=\"background-image: url('"+i.image+"')\""),l&&(l=function(t){var e,n,i={};for(i=h.mac?{alt:"&#x2325;",ctrl:"&#x2318;",shift:"&#x21E7;",meta:"&#x2318;"}:{meta:"Ctrl"},t=t.split("+"),e=0;e<t.length;e++)(n=i[t[e].toLowerCase()])&&(t[e]=n);return t.join("+")}(l)),s=r+"ico "+r+"i-"+(e.settings.icon||"none"),t="-"!==o?'<i class="'+s+'"'+a+"></i>\xa0":"",o=f(e.encode(d(o))),u=f(e.encode(d(u))),'<div id="'+n+'" class="'+e.classes+'" tabindex="-1">'+t+("-"!==o?'<span id="'+n+'-text" class="'+r+'text">'+o+"</span>":"")+(l?'<div id="'+n+'-shortcut" class="'+r+'menu-shortcut">'+l+"</div>":"")+(i.menu?'<div class="'+r+'caret"></div>':"")+(u?'<div class="'+r+'menu-item-link">'+u+"</div>":"")+"</div>"},postRender:function(){var e=this,n=e.settings,t=n.textStyle;if("function"==typeof t&&(t=t.call(this)),t){var i=e.getEl("text");i&&(i.setAttribute("style",t),e._textStyle=t)}return e.on("mouseenter click",function(t){t.control===e&&(n.menu||"click"!==t.type?(e.showMenu(),t.aria&&e.menu.focus(!0)):(e.fire("select"),c.requestAnimationFrame(function(){e.parent().hideAll()})))}),e._super(),e},hover:function(){return this.parent().items().each(function(t){t.classes.remove("selected")}),this.classes.toggle("selected",!0),this},active:function(t){return function(t,e){var n=t._textStyle;if(n){var i=t.getEl("text");i.setAttribute("style",n),e&&(i.style.color="",i.style.backgroundColor="")}}(this,t),void 0!==t&&this.aria("checked",t),this._super(t)},remove:function(){this._super(),this.menu&&this.menu.remove()}}),Xr=Ln.extend({Defaults:{classes:"radio",role:"radio"}}),jr=ye.extend({renderHtml:function(){var t=this,e=t.classPrefix;return t.classes.add("resizehandle"),"both"===t.settings.direction&&t.classes.add("resizehandle-both"),t.canFocus=!1,'<div id="'+t._id+'" class="'+t.classes+'"><i class="'+e+"ico "+e+'i-resize"></i></div>'},postRender:function(){var e=this;e._super(),e.resizeDragHelper=new Ce(this._id,{start:function(){e.fire("ResizeStart")},drag:function(t){"both"!==e.settings.direction&&(t.deltaX=0),e.fire("Resize",t)},stop:function(){e.fire("ResizeEnd")}})},remove:function(){return this.resizeDragHelper&&this.resizeDragHelper.destroy(),this._super()}});function Jr(t){var e="";if(t)for(var n=0;n<t.length;n++)e+='<option value="'+t[n]+'">'+t[n]+"</option>";return e}var Gr=ye.extend({Defaults:{classes:"selectbox",role:"selectbox",options:[]},init:function(t){var n=this;n._super(t),n.settings.size&&(n.size=n.settings.size),n.settings.options&&(n._options=n.settings.options),n.on("keydown",function(t){var e;13===t.keyCode&&(t.preventDefault(),n.parents().reverse().each(function(t){if(t.toJSON)return e=t,!1}),n.fire("submit",{data:e.toJSON()}))})},options:function(t){return arguments.length?(this.state.set("options",t),this):this.state.get("options")},renderHtml:function(){var t,e=this,n="";return t=Jr(e._options),e.size&&(n=' size = "'+e.size+'"'),'<select id="'+e._id+'" class="'+e.classes+'"'+n+">"+t+"</select>"},bindStates:function(){var e=this;return e.state.on("change:options",function(t){e.getEl().innerHTML=Jr(t.value)}),e._super()}});function Kr(t,e,n){return t<e&&(t=e),n<t&&(t=n),t}function Zr(t,e,n){t.setAttribute("aria-"+e,n)}function Qr(t,e){var n,i,r,o,s;"v"===t.settings.orientation?(r="top",i="height",n="h"):(r="left",i="width",n="w"),s=t.getEl("handle"),o=((t.layoutRect()[n]||100)-Mt.getSize(s)[i])*((e-t._minValue)/(t._maxValue-t._minValue))+"px",s.style[r]=o,s.style.height=t.layoutRect().h+"px",Zr(s,"valuenow",e),Zr(s,"valuetext",""+t.settings.previewFilter(e)),Zr(s,"valuemin",t._minValue),Zr(s,"valuemax",t._maxValue)}var to=ye.extend({init:function(t){var e=this;t.previewFilter||(t.previewFilter=function(t){return Math.round(100*t)/100}),e._super(t),e.classes.add("slider"),"v"===t.orientation&&e.classes.add("vertical"),e._minValue=xt(t.minValue)?t.minValue:0,e._maxValue=xt(t.maxValue)?t.maxValue:100,e._initValue=e.state.get("value")},renderHtml:function(){var t=this._id,e=this.classPrefix;return'<div id="'+t+'" class="'+this.classes+'"><div id="'+t+'-handle" class="'+e+'slider-handle" role="slider" tabindex="-1"></div></div>'},reset:function(){this.value(this._initValue).repaint()},postRender:function(){var t,e,n,i,r,o,s,a,l,u,c,d,f,h,m=this;t=m._minValue,e=m._maxValue,"v"===m.settings.orientation?(n="screenY",i="top",r="height",o="h"):(n="screenX",i="left",r="width",o="w"),m._super(),function(o,s){function e(t){var e,n,i,r;e=Kr(e=(((e=m.value())+(r=n=o))/((i=s)-r)+.05*t)*(i-n)-n,o,s),m.value(e),m.fire("dragstart",{value:e}),m.fire("drag",{value:e}),m.fire("dragend",{value:e})}m.on("keydown",function(t){switch(t.keyCode){case 37:case 38:e(-1);break;case 39:case 40:e(1)}})}(t,e),s=t,a=e,l=m.getEl("handle"),m._dragHelper=new Ce(m._id,{handle:m._id+"-handle",start:function(t){u=t[n],c=parseInt(m.getEl("handle").style[i],10),d=(m.layoutRect()[o]||100)-Mt.getSize(l)[r],m.fire("dragstart",{value:h})},drag:function(t){var e=t[n]-u;f=Kr(c+e,0,d),l.style[i]=f+"px",h=s+f/d*(a-s),m.value(h),m.tooltip().text(""+m.settings.previewFilter(h)).show().moveRel(l,"bc tc"),m.fire("drag",{value:h})},stop:function(){m.tooltip().hide(),m.fire("dragend",{value:h})}})},repaint:function(){this._super(),Qr(this,this.value())},bindStates:function(){var e=this;return e.state.on("change:value",function(t){Qr(e,t.value)}),e._super()}}),eo=ye.extend({renderHtml:function(){return this.classes.add("spacer"),this.canFocus=!1,'<div id="'+this._id+'" class="'+this.classes+'"></div>'}}),no=Ur.extend({Defaults:{classes:"widget btn splitbtn",role:"button"},repaint:function(){var t,e,n=this.getEl(),i=this.layoutRect();return this._super(),t=n.firstChild,e=n.lastChild,Nt(t).css({width:i.w-Mt.getSize(e).width,height:i.h-2}),Nt(e).css({height:i.h-2}),this},activeMenu:function(t){Nt(this.getEl().lastChild).toggleClass(this.classPrefix+"active",t)},renderHtml:function(){var t,e,n=this,i=n._id,r=n.classPrefix,o=n.state.get("icon"),s=n.state.get("text"),a=n.settings,l="";return(t=a.image)?(o="none","string"!=typeof t&&(t=_.window.getSelection?t[0]:t[1]),t=" style=\"background-image: url('"+t+"')\""):t="",o=a.icon?r+"ico "+r+"i-"+o:"",s&&(n.classes.add("btn-has-text"),l='<span class="'+r+'txt">'+n.encode(s)+"</span>"),e="boolean"==typeof a.active?' aria-pressed="'+a.active+'"':"",'<div id="'+i+'" class="'+n.classes+'" role="button"'+e+' tabindex="-1"><button type="button" hidefocus="1" tabindex="-1">'+(o?'<i class="'+o+'"'+t+"></i>":"")+l+'</button><button type="button" class="'+r+'open" hidefocus="1" tabindex="-1">'+(n._menuBtnText?(o?"\xa0":"")+n._menuBtnText:"")+' <i class="'+r+'caret"></i></button></div>'},postRender:function(){var n=this.settings.onclick;return this.on("click",function(t){var e=t.target;if(t.control===this)for(;e;){if(t.aria&&"down"!==t.aria.key||"BUTTON"===e.nodeName&&-1===e.className.indexOf("open"))return t.stopImmediatePropagation(),void(n&&n.call(this,t));e=e.parentNode}}),delete this.settings.onclick,this._super()}}),io=sr.extend({Defaults:{containerClass:"stack-layout",controlClass:"stack-layout-item",endClass:"break"},isNative:function(){return!0}}),ro=De.extend({Defaults:{layout:"absolute",defaults:{type:"panel"}},activateTab:function(n){var t;this.activeTabId&&(t=this.getEl(this.activeTabId),Nt(t).removeClass(this.classPrefix+"active"),t.setAttribute("aria-selected","false")),this.activeTabId="t"+n,(t=this.getEl("t"+n)).setAttribute("aria-selected","true"),Nt(t).addClass(this.classPrefix+"active"),this.items()[n].show().fire("showtab"),this.reflow(),this.items().each(function(t,e){n!==e&&t.hide()})},renderHtml:function(){var i=this,t=i._layout,r="",o=i.classPrefix;return i.preRender(),t.preRender(i),i.items().each(function(t,e){var n=i._id+"-t"+e;t.aria("role","tabpanel"),t.aria("labelledby",n),r+='<div id="'+n+'" class="'+o+'tab" unselectable="on" role="tab" aria-controls="'+t._id+'" aria-selected="false" tabIndex="-1">'+i.encode(t.settings.title)+"</div>"}),'<div id="'+i._id+'" class="'+i.classes+'" hidefocus="1" tabindex="-1"><div id="'+i._id+'-head" class="'+o+'tabs" role="tablist">'+r+'</div><div id="'+i._id+'-body" class="'+i.bodyClasses+'">'+t.renderHtml(i)+"</div></div>"},postRender:function(){var i=this;i._super(),i.settings.activeTab=i.settings.activeTab||0,i.activateTab(i.settings.activeTab),this.on("click",function(t){var e=t.target.parentNode;if(e&&e.id===i._id+"-head")for(var n=e.childNodes.length;n--;)e.childNodes[n]===t.target&&i.activateTab(n)})},initLayoutRect:function(){var t,e,n,i=this;e=(e=Mt.getSize(i.getEl("head")).width)<0?0:e,n=0,i.items().each(function(t){e=Math.max(e,t.layoutRect().minW),n=Math.max(n,t.layoutRect().minH)}),i.items().each(function(t){t.settings.x=0,t.settings.y=0,t.settings.w=e,t.settings.h=n,t.layoutRect({x:0,y:0,w:e,h:n})});var r=Mt.getSize(i.getEl("head")).height;return i.settings.minWidth=e,i.settings.minHeight=n+r,(t=i._super()).deltaH+=r,t.innerH=t.h-t.deltaH,t}}),oo=ye.extend({init:function(t){var n=this;n._super(t),n.classes.add("textbox"),t.multiline?n.classes.add("multiline"):(n.on("keydown",function(t){var e;13===t.keyCode&&(t.preventDefault(),n.parents().reverse().each(function(t){if(t.toJSON)return e=t,!1}),n.fire("submit",{data:e.toJSON()}))}),n.on("keyup",function(t){n.state.set("value",t.target.value)}))},repaint:function(){var t,e,n,i,r,o=this,s=0;t=o.getEl().style,e=o._layoutRect,r=o._lastRepaintRect||{};var a=_.document;return!o.settings.multiline&&a.all&&(!a.documentMode||a.documentMode<=8)&&(t.lineHeight=e.h-s+"px"),i=(n=o.borderBox).left+n.right+8,s=n.top+n.bottom+(o.settings.multiline?8:0),e.x!==r.x&&(t.left=e.x+"px",r.x=e.x),e.y!==r.y&&(t.top=e.y+"px",r.y=e.y),e.w!==r.w&&(t.width=e.w-i+"px",r.w=e.w),e.h!==r.h&&(t.height=e.h-s+"px",r.h=e.h),o._lastRepaintRect=r,o.fire("repaint",{},!1),o},renderHtml:function(){var e,t,n=this,i=n.settings;return e={id:n._id,hidefocus:"1"},C.each(["rows","spellcheck","maxLength","size","readonly","min","max","step","list","pattern","placeholder","required","multiple"],function(t){e[t]=i[t]}),n.disabled()&&(e.disabled="disabled"),i.subtype&&(e.type=i.subtype),(t=Mt.create(i.multiline?"textarea":"input",e)).value=n.state.get("value"),t.className=n.classes.toString(),t.outerHTML},value:function(t){return arguments.length?(this.state.set("value",t),this):(this.state.get("rendered")&&this.state.set("value",this.getEl().value),this.state.get("value"))},postRender:function(){var e=this;e.getEl().value=e.state.get("value"),e._super(),e.$el.on("change",function(t){e.state.set("value",t.target.value),e.fire("change",t)})},bindStates:function(){var e=this;return e.state.on("change:value",function(t){e.getEl().value!==t.value&&(e.getEl().value=t.value)}),e.state.on("change:disabled",function(t){e.getEl().disabled=t.value}),e._super()},remove:function(){this.$el.off(),this._super()}}),so=function(){return{Selector:qt,Collection:Xt,ReflowQueue:ee,Control:ce,Factory:ke,KeyboardNavigation:He,Container:Pe,DragHelper:Ce,Scrollable:We,Panel:De,Movable:pe,Resizable:Ae,FloatPanel:Ve,Window:Je,MessageBox:Qe,Tooltip:ve,Widget:ye,Progress:be,Notification:we,Layout:Pn,AbsoluteLayout:Wn,Button:Dn,ButtonGroup:Bn,Checkbox:Ln,ComboBox:zn,ColorBox:Fn,PanelButton:Un,ColorButton:qn,ColorPicker:$n,Path:jn,ElementPath:Jn,FormItem:Gn,Form:Kn,FieldSet:Zn,FilePicker:ir,FitLayout:rr,FlexLayout:or,FlowLayout:sr,FormatControls:Dr,GridLayout:Ar,Iframe:Br,InfoBox:Lr,Label:Ir,Toolbar:zr,MenuBar:Fr,MenuButton:Ur,MenuItem:$r,Throbber:Vr,Menu:qr,ListBox:Yr,Radio:Xr,ResizeHandle:jr,SelectBox:Gr,Slider:to,Spacer:eo,SplitButton:no,StackLayout:io,TabPanel:ro,TextBox:oo,DropZone:Xn,BrowseButton:An}},ao=function(n){n.ui?C.each(so(),function(t,e){n.ui[e]=t}):n.ui=so()};C.each(so(),function(t,e){ke.add(e,t)}),ao(window.tinymce?window.tinymce:{}),o.add("inlite",function(t){var e=On();return Dr.setup(t),kn(t,e),tn(t,e)})}(window);
\ No newline at end of file
+!function(_){"use strict";var u,t,e,n,i,r=tinymce.util.Tools.resolve("tinymce.ThemeManager"),h=tinymce.util.Tools.resolve("tinymce.Env"),v=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),c=tinymce.util.Tools.resolve("tinymce.util.Delay"),o=function(t){return t.reduce(function(t,e){return Array.isArray(e)?t.concat(o(e)):t.concat(e)},[])},s={flatten:o},a=function(t,e){for(var n=0;n<e.length;n++){var i=(0,e[n])(t);if(i)return i}return null},l=function(t,e){return{id:t,rect:e}},d=function(t){return{x:t.left,y:t.top,w:t.width,h:t.height}},f=function(t){return{left:t.x,top:t.y,width:t.w,height:t.h,right:t.x+t.w,bottom:t.y+t.h}},m=function(t){var e=v.DOM.getViewPort();return{x:t.x+e.x,y:t.y+e.y,w:t.w,h:t.h}},g=function(t){var e=t.getBoundingClientRect();return m({x:e.left,y:e.top,w:Math.max(t.clientWidth,t.offsetWidth),h:Math.max(t.clientHeight,t.offsetHeight)})},p=function(t,e){return g(e)},b=function(t){return g(t.getContentAreaContainer()||t.getBody())},y=function(t){var e=t.selection.getBoundingClientRect();return e?m(d(e)):null},x=function(n,i){return function(t){for(var e=0;e<i.length;e++)if(i[e].predicate(n))return l(i[e].id,p(t,n));return null}},w=function(i,r){return function(t){for(var e=0;e<i.length;e++)for(var n=0;n<r.length;n++)if(r[n].predicate(i[e]))return l(r[n].id,p(t,i[e]));return null}},R=tinymce.util.Tools.resolve("tinymce.util.Tools"),C=function(t,e){return{id:t,predicate:e}},k=function(t){return R.map(t,function(t){return C(t.id,t.predicate)})},E=function(e){return function(t){return t.selection.isCollapsed()?null:l(e,y(t))}},H=function(i,r){return function(t){var e,n=t.schema.getTextBlockElements();for(e=0;e<i.length;e++)if("TABLE"===i[e].nodeName)return null;for(e=0;e<i.length;e++)if(i[e].nodeName in n)return t.dom.isEmpty(i[e])?l(r,y(t)):null;return null}},T=function(t){t.fire("SkinLoaded")},S=function(t){return t.fire("BeforeRenderUI")},M=tinymce.util.Tools.resolve("tinymce.EditorManager"),N=function(e){return function(t){return typeof t===e}},O=function(t){return Array.isArray(t)},W=function(t){return N("string")(t)},P=function(t){return N("number")(t)},D=function(t){return N("boolean")(t)},A=function(t){return N("function")(t)},B=(N("object"),O),L=function(t,e){if(e(t))return!0;throw new Error("Default value doesn't match requested type.")},I=function(r){return function(t,e,n){var i=t.settings;return L(n,r),e in i&&r(i[e])?i[e]:n}},z={getStringOr:I(W),getBoolOr:I(D),getNumberOr:I(P),getHandlerOr:I(A),getToolbarItemsOr:(u=B,function(t,e,n){var i,r,o,s,a,l=e in t.settings?t.settings[e]:n;return L(n,u),r=n,B(i=l)?i:W(i)?"string"==typeof(s=i)?(a=/[ ,]/,s.split(a).filter(function(t){return 0<t.length})):s:D(i)?(o=r,!1===i?[]:o):r})},F=tinymce.util.Tools.resolve("tinymce.geom.Rect"),U=function(t,e){return{rect:t,position:e}},V=function(t,e){return{x:e.x,y:e.y,w:t.w,h:t.h}},q=function(t,e,n,i,r){var o,s,a,l={x:i.x,y:i.y,w:i.w+(i.w<r.w+n.w?r.w:0),h:i.h+(i.h<r.h+n.h?r.h:0)};return o=F.findBestRelativePosition(r,n,l,t),n=F.clamp(n,l),o?(s=F.relativePosition(r,n,o),a=V(r,s),U(a,o)):(n=F.intersect(l,n))?((o=F.findBestRelativePosition(r,n,l,e))?(s=F.relativePosition(r,n,o),a=V(r,s)):a=V(r,n),U(a,o)):null},Y=function(t,e,n){return q(["cr-cl","cl-cr"],["bc-tc","bl-tl","br-tr"],t,e,n)},$=function(t,e,n){return q(["tc-bc","bc-tc","tl-bl","bl-tl","tr-br","br-tr","cr-cl","cl-cr"],["bc-tc","bl-tl","br-tr","cr-cl"],t,e,n)},X=function(t,e,n,i){var r;return"function"==typeof t?(r=t({elementRect:f(e),contentAreaRect:f(n),panelRect:f(i)}),d(r)):i},j=function(t){return t.panelRect},J=function(t){return z.getToolbarItemsOr(t,"selection_toolbar",["bold","italic","|","quicklink","h2","h3","blockquote"])},G=function(t){return z.getToolbarItemsOr(t,"insert_toolbar",["quickimage","quicktable"])},K=function(t){return z.getHandlerOr(t,"inline_toolbar_position_handler",j)},Z=function(t){var e,n,i,r,o=t.settings;return o.skin_url?(i=t,r=o.skin_url,i.documentBaseURI.toAbsolute(r)):(e=o.skin,n=M.baseURL+"/skins/",e?n+e:n+"lightgray")},Q=function(t){return!1===t.settings.skin},tt=function(i,r){var t=Z(i),e=function(){var t,e,n;e=r,n=function(){t._skinLoaded=!0,T(t),e()},(t=i).initialized?n():t.on("init",n)};Q(i)?e():(v.DOM.styleSheetLoader.load(t+"/skin.min.css",e),i.contentCSS.push(t+"/content.inline.min.css"))},et=function(t){var e,n,i,r,o=t.contextToolbars;return s.flatten([o||[],(e=t,n="img",i="image",r="alignleft aligncenter alignright",{predicate:function(t){return e.dom.is(t,n)},id:i,items:r})])},nt=function(t,e){var n,i,r,o,s;return s=(o=t).selection.getNode(),i=o.dom.getParents(s,"*"),r=k(e),(n=a(t,[x(i[0],r),E("text"),H(i,"insert"),w(i,r)]))&&n.rect?n:null},it=function(i,r){return function(){var t,e,n;i.removed||(n=i,_.document.activeElement!==n.getBody())||(t=et(i),(e=nt(i,t))?r.show(i,e.id,e.rect,t):r.hide())}},rt=function(t,e){var n,i,r,o,s,a=c.throttle(it(t,e),0),l=c.throttle((r=it(n=t,i=e),function(){n.removed||i.inForm()||r()}),0),u=(o=t,s=e,function(){var t=et(o),e=nt(o,t);e&&s.reposition(o,e.id,e.rect)});t.on("blur hide ObjectResizeStart",e.hide),t.on("click",a),t.on("nodeChange mouseup",l),t.on("ResizeEditor keyup",a),t.on("ResizeWindow",u),v.DOM.bind(h.container,"scroll",u),t.on("remove",function(){v.DOM.unbind(h.container,"scroll",u),e.remove()}),t.shortcuts.add("Alt+F10,F10","",e.focus)},ot=function(t,e){return tt(t,function(){var n,i;rt(t,e),i=e,(n=t).shortcuts.remove("meta+k"),n.shortcuts.add("meta+k","",function(){var t=et(n),e=a(n,[E("quicklink")]);e&&i.show(n,e.id,e.rect,t)})}),{}},st=function(t,e){return t.inline?ot(t,e):function(t){throw new Error(t)}("inlite theme only supports inline mode.")},at=function(){},lt=function(t){return function(){return t}},ut=lt(!1),ct=lt(!0),dt=function(){return ft},ft=(t=function(t){return t.isNone()},i={fold:function(t,e){return t()},is:ut,isSome:ut,isNone:ct,getOr:n=function(t){return t},getOrThunk:e=function(t){return t()},getOrDie:function(t){throw new Error(t||"error: getOrDie called on none.")},getOrNull:lt(null),getOrUndefined:lt(undefined),or:n,orThunk:e,map:dt,each:at,bind:dt,exists:ut,forall:ct,filter:dt,equals:t,equals_:t,toArray:function(){return[]},toString:lt("none()")},Object.freeze&&Object.freeze(i),i),ht=function(n){var t=lt(n),e=function(){return r},i=function(t){return t(n)},r={fold:function(t,e){return e(n)},is:function(t){return n===t},isSome:ct,isNone:ut,getOr:t,getOrThunk:t,getOrDie:t,getOrNull:t,getOrUndefined:t,or:e,orThunk:e,map:function(t){return ht(t(n))},each:function(t){t(n)},bind:i,exists:i,forall:i,filter:function(t){return t(n)?r:ft},toArray:function(){return[n]},toString:function(){return"some("+n+")"},equals:function(t){return t.is(n)},equals_:function(t,e){return t.fold(ut,function(t){return e(n,t)})}};return r},mt={some:ht,none:dt,from:function(t){return null===t||t===undefined?ft:ht(t)}},gt=function(e){return function(t){return function(t){if(null===t)return"null";var e=typeof t;return"object"===e&&(Array.prototype.isPrototypeOf(t)||t.constructor&&"Array"===t.constructor.name)?"array":"object"===e&&(String.prototype.isPrototypeOf(t)||t.constructor&&"String"===t.constructor.name)?"string":e}(t)===e}},pt=gt("array"),vt=gt("function"),bt=gt("number"),yt=(Array.prototype.slice,Array.prototype.indexOf),xt=Array.prototype.push,wt=function(t,e){var n,i,r=(n=t,i=e,yt.call(n,i));return-1===r?mt.none():mt.some(r)},_t=function(t,e){for(var n=0,i=t.length;n<i;n++)if(e(t[n],n))return!0;return!1},Rt=function(t,e){for(var n=t.length,i=new Array(n),r=0;r<n;r++){var o=t[r];i[r]=e(o,r)}return i},Ct=function(t,e){for(var n=0,i=t.length;n<i;n++)e(t[n],n)},kt=function(t,e){for(var n=[],i=0,r=t.length;i<r;i++){var o=t[i];e(o,i)&&n.push(o)}return n},Et=(vt(Array.from)&&Array.from,0),Ht={id:function(){return"mceu_"+Et++},create:function(t,e,n){var i=_.document.createElement(t);return v.DOM.setAttribs(i,e),"string"==typeof n?i.innerHTML=n:R.each(n,function(t){t.nodeType&&i.appendChild(t)}),i},createFragment:function(t){return v.DOM.createFragment(t)},getWindowSize:function(){return v.DOM.getViewPort()},getSize:function(t){var e,n;if(t.getBoundingClientRect){var i=t.getBoundingClientRect();e=Math.max(i.width||i.right-i.left,t.offsetWidth),n=Math.max(i.height||i.bottom-i.bottom,t.offsetHeight)}else e=t.offsetWidth,n=t.offsetHeight;return{width:e,height:n}},getPos:function(t,e){return v.DOM.getPos(t,e||Ht.getContainer())},getContainer:function(){return h.container?h.container:_.document.body},getViewPort:function(t){return v.DOM.getViewPort(t)},get:function(t){return _.document.getElementById(t)},addClass:function(t,e){return v.DOM.addClass(t,e)},removeClass:function(t,e){return v.DOM.removeClass(t,e)},hasClass:function(t,e){return v.DOM.hasClass(t,e)},toggleClass:function(t,e,n){return v.DOM.toggleClass(t,e,n)},css:function(t,e,n){return v.DOM.setStyle(t,e,n)},getRuntimeStyle:function(t,e){return v.DOM.getStyle(t,e,!0)},on:function(t,e,n,i){return v.DOM.bind(t,e,n,i)},off:function(t,e,n){return v.DOM.unbind(t,e,n)},fire:function(t,e,n){return v.DOM.fire(t,e,n)},innerHtml:function(t,e){v.DOM.setHTML(t,e)}},Tt=tinymce.util.Tools.resolve("tinymce.dom.DomQuery"),St=tinymce.util.Tools.resolve("tinymce.util.Class"),Mt=tinymce.util.Tools.resolve("tinymce.util.EventDispatcher"),Nt=function(t){var e;if(t)return"number"==typeof t?{top:t=t||0,left:t,bottom:t,right:t}:(1===(e=(t=t.split(" ")).length)?t[1]=t[2]=t[3]=t[0]:2===e?(t[2]=t[0],t[3]=t[1]):3===e&&(t[3]=t[1]),{top:parseInt(t[0],10)||0,right:parseInt(t[1],10)||0,bottom:parseInt(t[2],10)||0,left:parseInt(t[3],10)||0})},Ot=function(i,t){function e(t){var e=parseFloat(function(t){var e=i.ownerDocument.defaultView;if(e){var n=e.getComputedStyle(i,null);return n?(t=t.replace(/[A-Z]/g,function(t){return"-"+t}),n.getPropertyValue(t)):null}return i.currentStyle[t]}(t));return isNaN(e)?0:e}return{top:e(t+"TopWidth"),right:e(t+"RightWidth"),bottom:e(t+"BottomWidth"),left:e(t+"LeftWidth")}};function Wt(){}function Pt(t){this.cls=[],this.cls._map={},this.onchange=t||Wt,this.prefix=""}R.extend(Pt.prototype,{add:function(t){return t&&!this.contains(t)&&(this.cls._map[t]=!0,this.cls.push(t),this._change()),this},remove:function(t){if(this.contains(t)){var e=void 0;for(e=0;e<this.cls.length&&this.cls[e]!==t;e++);this.cls.splice(e,1),delete this.cls._map[t],this._change()}return this},toggle:function(t,e){var n=this.contains(t);return n!==e&&(n?this.remove(t):this.add(t),this._change()),this},contains:function(t){return!!this.cls._map[t]},_change:function(){delete this.clsValue,this.onchange.call(this)}}),Pt.prototype.toString=function(){var t;if(this.clsValue)return this.clsValue;t="";for(var e=0;e<this.cls.length;e++)0<e&&(t+=" "),t+=this.prefix+this.cls[e];return t};var Dt,At,Bt,Lt=/^([\w\\*]+)?(?:#([\w\-\\]+))?(?:\.([\w\\\.]+))?(?:\[\@?([\w\\]+)([\^\$\*!~]?=)([\w\\]+)\])?(?:\:(.+))?/i,It=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,zt=/^\s*|\s*$/g,Ft=St.extend({init:function(t){var o=this.match;function s(t,e,n){var i;function r(t){t&&e.push(t)}return r(function(e){if(e)return e=e.toLowerCase(),function(t){return"*"===e||t.type===e}}((i=Lt.exec(t.replace(zt,"")))[1])),r(function(e){if(e)return function(t){return t._name===e}}(i[2])),r(function(n){if(n)return n=n.split("."),function(t){for(var e=n.length;e--;)if(!t.classes.contains(n[e]))return!1;return!0}}(i[3])),r(function(n,i,r){if(n)return function(t){var e=t[n]?t[n]():"";return i?"="===i?e===r:"*="===i?0<=e.indexOf(r):"~="===i?0<=(" "+e+" ").indexOf(" "+r+" "):"!="===i?e!==r:"^="===i?0===e.indexOf(r):"$="===i&&e.substr(e.length-r.length)===r:!!r}}(i[4],i[5],i[6])),r(function(i){var e;if(i)return(i=/(?:not\((.+)\))|(.+)/i.exec(i))[1]?(e=a(i[1],[]),function(t){return!o(t,e)}):(i=i[2],function(t,e,n){return"first"===i?0===e:"last"===i?e===n-1:"even"===i?e%2==0:"odd"===i?e%2==1:!!t[i]&&t[i]()})}(i[7])),e.pseudo=!!i[7],e.direct=n,e}function a(t,e){var n,i,r,o=[];do{if(It.exec(""),(i=It.exec(t))&&(t=i[3],o.push(i[1]),i[2])){n=i[3];break}}while(i);for(n&&a(n,e),t=[],r=0;r<o.length;r++)">"!==o[r]&&t.push(s(o[r],[],">"===o[r-1]));return e.push(t),e}this._selectors=a(t,[])},match:function(t,e){var n,i,r,o,s,a,l,u,c,d,f,h,m;for(n=0,i=(e=e||this._selectors).length;n<i;n++){for(m=t,h=0,r=(o=(s=e[n]).length)-1;0<=r;r--)for(u=s[r];m;){if(u.pseudo)for(c=d=(f=m.parent().items()).length;c--&&f[c]!==m;);for(a=0,l=u.length;a<l;a++)if(!u[a](m,c,d)){a=l+1;break}if(a===l){h++;break}if(r===o-1)break;m=m.parent()}if(h===o)return!0}return!1},find:function(t){var e,n,u=[],i=this._selectors;function c(t,e,n){var i,r,o,s,a,l=e[n];for(i=0,r=t.length;i<r;i++){for(a=t[i],o=0,s=l.length;o<s;o++)if(!l[o](a,i,r)){o=s+1;break}if(o===s)n===e.length-1?u.push(a):a.items&&c(a.items(),e,n+1);else if(l.direct)return;a.items&&c(a.items(),e,n)}}if(t.items){for(e=0,n=i.length;e<n;e++)c(t.items(),i[e],0);1<n&&(u=function(t){for(var e,n=[],i=t.length;i--;)(e=t[i]).__checked||(n.push(e),e.__checked=1);for(i=n.length;i--;)delete n[i].__checked;return n}(u))}return Dt||(Dt=Ft.Collection),new Dt(u)}}),Ut=Array.prototype.push,Vt=Array.prototype.slice;Bt={length:0,init:function(t){t&&this.add(t)},add:function(t){return R.isArray(t)?Ut.apply(this,t):t instanceof At?this.add(t.toArray()):Ut.call(this,t),this},set:function(t){var e,n=this,i=n.length;for(n.length=0,n.add(t),e=n.length;e<i;e++)delete n[e];return n},filter:function(e){var t,n,i,r,o=[];for("string"==typeof e?(e=new Ft(e),r=function(t){return e.match(t)}):r=e,t=0,n=this.length;t<n;t++)r(i=this[t])&&o.push(i);return new At(o)},slice:function(){return new At(Vt.apply(this,arguments))},eq:function(t){return-1===t?this.slice(t):this.slice(t,+t+1)},each:function(t){return R.each(this,t),this},toArray:function(){return R.toArray(this)},indexOf:function(t){for(var e=this.length;e--&&this[e]!==t;);return e},reverse:function(){return new At(R.toArray(this).reverse())},hasClass:function(t){return!!this[0]&&this[0].classes.contains(t)},prop:function(e,n){var t;return n!==undefined?(this.each(function(t){t[e]&&t[e](n)}),this):(t=this[0])&&t[e]?t[e]():void 0},exec:function(e){var n=R.toArray(arguments).slice(1);return this.each(function(t){t[e]&&t[e].apply(t,n)}),this},remove:function(){for(var t=this.length;t--;)this[t].remove();return this},addClass:function(e){return this.each(function(t){t.classes.add(e)})},removeClass:function(e){return this.each(function(t){t.classes.remove(e)})}},R.each("fire on off show hide append prepend before after reflow".split(" "),function(n){Bt[n]=function(){var e=R.toArray(arguments);return this.each(function(t){n in t&&t[n].apply(t,e)}),this}}),R.each("text name disabled active selected checked visible parent value data".split(" "),function(e){Bt[e]=function(t){return this.prop(e,t)}}),At=St.extend(Bt);var qt=Ft.Collection=At,Yt=function(t){this.create=t.create};Yt.create=function(r,o){return new Yt({create:function(e,n){var i,t=function(t){e.set(n,t.value)};return e.on("change:"+n,function(t){r.set(o,t.value)}),r.on("change:"+o,t),(i=e._bindings)||(i=e._bindings=[],e.on("destroy",function(){for(var t=i.length;t--;)i[t]()})),i.push(function(){r.off("change:"+o,t)}),r.get(o)}})};var $t=tinymce.util.Tools.resolve("tinymce.util.Observable");function Xt(t){return 0<t.nodeType}var jt,Jt,Gt=St.extend({Mixins:[$t],init:function(t){var e,n;for(e in t=t||{})(n=t[e])instanceof Yt&&(t[e]=n.create(this,e));this.data=t},set:function(e,n){var i,r,o=this.data[e];if(n instanceof Yt&&(n=n.create(this,e)),"object"==typeof e){for(i in e)this.set(i,e[i]);return this}return function t(e,n){var i,r;if(e===n)return!0;if(null===e||null===n)return e===n;if("object"!=typeof e||"object"!=typeof n)return e===n;if(R.isArray(n)){if(e.length!==n.length)return!1;for(i=e.length;i--;)if(!t(e[i],n[i]))return!1}if(Xt(e)||Xt(n))return e===n;for(i in r={},n){if(!t(e[i],n[i]))return!1;r[i]=!0}for(i in e)if(!r[i]&&!t(e[i],n[i]))return!1;return!0}(o,n)||(this.data[e]=n,r={target:this,name:e,value:n,oldValue:o},this.fire("change:"+e,r),this.fire("change",r)),this},get:function(t){return this.data[t]},has:function(t){return t in this.data},bind:function(t){return Yt.create(this,t)},destroy:function(){this.fire("destroy")}}),Kt={},Zt={add:function(t){var e=t.parent();if(e){if(!e._layout||e._layout.isNative())return;Kt[e._id]||(Kt[e._id]=e),jt||(jt=!0,c.requestAnimationFrame(function(){var t,e;for(t in jt=!1,Kt)(e=Kt[t]).state.get("rendered")&&e.reflow();Kt={}},_.document.body))}},remove:function(t){Kt[t._id]&&delete Kt[t._id]}},Qt=function(t){return t?t.getRoot().uiContainer:null},te={getUiContainerDelta:function(t){var e=Qt(t);if(e&&"static"!==v.DOM.getStyle(e,"position",!0)){var n=v.DOM.getPos(e),i=e.scrollLeft-n.x,r=e.scrollTop-n.y;return mt.some({x:i,y:r})}return mt.none()},setUiContainer:function(t,e){var n=v.DOM.select(t.settings.ui_container)[0];e.getRoot().uiContainer=n},getUiContainer:Qt,inheritUiContainer:function(t,e){return e.uiContainer=Qt(t)}},ee="onmousewheel"in _.document,ne=!1,ie=0,re={Statics:{classPrefix:"mce-"},isRtl:function(){return Jt.rtl},classPrefix:"mce-",init:function(e){var t,n,i=this;function r(t){var e;for(t=t.split(" "),e=0;e<t.length;e++)i.classes.add(t[e])}i.settings=e=R.extend({},i.Defaults,e),i._id=e.id||"mceu_"+ie++,i._aria={role:e.role},i._elmCache={},i.$=Tt,i.state=new Gt({visible:!0,active:!1,disabled:!1,value:""}),i.data=new Gt(e.data),i.classes=new Pt(function(){i.state.get("rendered")&&(i.getEl().className=this.toString())}),i.classes.prefix=i.classPrefix,(t=e.classes)&&(i.Defaults&&(n=i.Defaults.classes)&&t!==n&&r(n),r(t)),R.each("title text name visible disabled active value".split(" "),function(t){t in e&&i[t](e[t])}),i.on("click",function(){if(i.disabled())return!1}),i.settings=e,i.borderBox=Nt(e.border),i.paddingBox=Nt(e.padding),i.marginBox=Nt(e.margin),e.hidden&&i.hide()},Properties:"parent,name",getContainerElm:function(){var t=te.getUiContainer(this);return t||Ht.getContainer()},getParentCtrl:function(t){for(var e,n=this.getRoot().controlIdLookup;t&&n&&!(e=n[t.id]);)t=t.parentNode;return e},initLayoutRect:function(){var t,e,n,i,r,o,s,a,l,u,c=this,d=c.settings,f=c.getEl();t=c.borderBox=c.borderBox||Ot(f,"border"),c.paddingBox=c.paddingBox||Ot(f,"padding"),c.marginBox=c.marginBox||Ot(f,"margin"),u=Ht.getSize(f),a=d.minWidth,l=d.minHeight,r=a||u.width,o=l||u.height,n=d.width,i=d.height,s=void 0!==(s=d.autoResize)?s:!n&&!i,n=n||r,i=i||o;var h=t.left+t.right,m=t.top+t.bottom,g=d.maxWidth||65535,p=d.maxHeight||65535;return c._layoutRect=e={x:d.x||0,y:d.y||0,w:n,h:i,deltaW:h,deltaH:m,contentW:n-h,contentH:i-m,innerW:n-h,innerH:i-m,startMinWidth:a||0,startMinHeight:l||0,minW:Math.min(r,g),minH:Math.min(o,p),maxW:g,maxH:p,autoResize:s,scrollW:0},c._lastLayoutRect={},e},layoutRect:function(t){var e,n,i,r,o,s=this,a=s._layoutRect;return a||(a=s.initLayoutRect()),t?(i=a.deltaW,r=a.deltaH,t.x!==undefined&&(a.x=t.x),t.y!==undefined&&(a.y=t.y),t.minW!==undefined&&(a.minW=t.minW),t.minH!==undefined&&(a.minH=t.minH),(n=t.w)!==undefined&&(n=(n=n<a.minW?a.minW:n)>a.maxW?a.maxW:n,a.w=n,a.innerW=n-i),(n=t.h)!==undefined&&(n=(n=n<a.minH?a.minH:n)>a.maxH?a.maxH:n,a.h=n,a.innerH=n-r),(n=t.innerW)!==undefined&&(n=(n=n<a.minW-i?a.minW-i:n)>a.maxW-i?a.maxW-i:n,a.innerW=n,a.w=n+i),(n=t.innerH)!==undefined&&(n=(n=n<a.minH-r?a.minH-r:n)>a.maxH-r?a.maxH-r:n,a.innerH=n,a.h=n+r),t.contentW!==undefined&&(a.contentW=t.contentW),t.contentH!==undefined&&(a.contentH=t.contentH),(e=s._lastLayoutRect).x===a.x&&e.y===a.y&&e.w===a.w&&e.h===a.h||((o=Jt.repaintControls)&&o.map&&!o.map[s._id]&&(o.push(s),o.map[s._id]=!0),e.x=a.x,e.y=a.y,e.w=a.w,e.h=a.h),s):a},repaint:function(){var t,e,n,i,r,o,s,a,l,u,c=this;l=_.document.createRange?function(t){return t}:Math.round,t=c.getEl().style,i=c._layoutRect,a=c._lastRepaintRect||{},o=(r=c.borderBox).left+r.right,s=r.top+r.bottom,i.x!==a.x&&(t.left=l(i.x)+"px",a.x=i.x),i.y!==a.y&&(t.top=l(i.y)+"px",a.y=i.y),i.w!==a.w&&(u=l(i.w-o),t.width=(0<=u?u:0)+"px",a.w=i.w),i.h!==a.h&&(u=l(i.h-s),t.height=(0<=u?u:0)+"px",a.h=i.h),c._hasBody&&i.innerW!==a.innerW&&(u=l(i.innerW),(n=c.getEl("body"))&&((e=n.style).width=(0<=u?u:0)+"px"),a.innerW=i.innerW),c._hasBody&&i.innerH!==a.innerH&&(u=l(i.innerH),(n=n||c.getEl("body"))&&((e=e||n.style).height=(0<=u?u:0)+"px"),a.innerH=i.innerH),c._lastRepaintRect=a,c.fire("repaint",{},!1)},updateLayoutRect:function(){var t=this;t.parent()._lastRect=null,Ht.css(t.getEl(),{width:"",height:""}),t._layoutRect=t._lastRepaintRect=t._lastLayoutRect=null,t.initLayoutRect()},on:function(t,e){var n,i,r,o=this;return oe(o).on(t,"string"!=typeof(n=e)?n:function(t){return i||o.parentsAndSelf().each(function(t){var e=t.settings.callbacks;if(e&&(i=e[n]))return r=t,!1}),i?i.call(r,t):(t.action=n,void this.fire("execute",t))}),o},off:function(t,e){return oe(this).off(t,e),this},fire:function(t,e,n){if((e=e||{}).control||(e.control=this),e=oe(this).fire(t,e),!1!==n&&this.parent)for(var i=this.parent();i&&!e.isPropagationStopped();)i.fire(t,e,!1),i=i.parent();return e},hasEventListeners:function(t){return oe(this).has(t)},parents:function(t){var e,n=new qt;for(e=this.parent();e;e=e.parent())n.add(e);return t&&(n=n.filter(t)),n},parentsAndSelf:function(t){return new qt(this).add(this.parents(t))},next:function(){var t=this.parent().items();return t[t.indexOf(this)+1]},prev:function(){var t=this.parent().items();return t[t.indexOf(this)-1]},innerHtml:function(t){return this.$el.html(t),this},getEl:function(t){var e=t?this._id+"-"+t:this._id;return this._elmCache[e]||(this._elmCache[e]=Tt("#"+e)[0]),this._elmCache[e]},show:function(){return this.visible(!0)},hide:function(){return this.visible(!1)},focus:function(){try{this.getEl().focus()}catch(t){}return this},blur:function(){return this.getEl().blur(),this},aria:function(t,e){var n=this,i=n.getEl(n.ariaTarget);return void 0===e?n._aria[t]:(n._aria[t]=e,n.state.get("rendered")&&i.setAttribute("role"===t?t:"aria-"+t,e),n)},encode:function(t,e){return!1!==e&&(t=this.translate(t)),(t||"").replace(/[&<>"]/g,function(t){return"&#"+t.charCodeAt(0)+";"})},translate:function(t){return Jt.translate?Jt.translate(t):t},before:function(t){var e=this.parent();return e&&e.insert(t,e.items().indexOf(this),!0),this},after:function(t){var e=this.parent();return e&&e.insert(t,e.items().indexOf(this)),this},remove:function(){var e,t,n=this,i=n.getEl(),r=n.parent();if(n.items){var o=n.items().toArray();for(t=o.length;t--;)o[t].remove()}r&&r.items&&(e=[],r.items().each(function(t){t!==n&&e.push(t)}),r.items().set(e),r._lastRect=null),n._eventsRoot&&n._eventsRoot===n&&Tt(i).off();var s=n.getRoot().controlIdLookup;return s&&delete s[n._id],i&&i.parentNode&&i.parentNode.removeChild(i),n.state.set("rendered",!1),n.state.destroy(),n.fire("remove"),n},renderBefore:function(t){return Tt(t).before(this.renderHtml()),this.postRender(),this},renderTo:function(t){return Tt(t||this.getContainerElm()).append(this.renderHtml()),this.postRender(),this},preRender:function(){},render:function(){},renderHtml:function(){return'<div id="'+this._id+'" class="'+this.classes+'"></div>'},postRender:function(){var t,e,n,i,r,o=this,s=o.settings;for(i in o.$el=Tt(o.getEl()),o.state.set("rendered",!0),s)0===i.indexOf("on")&&o.on(i.substr(2),s[i]);if(o._eventsRoot){for(n=o.parent();!r&&n;n=n.parent())r=n._eventsRoot;if(r)for(i in r._nativeEvents)o._nativeEvents[i]=!0}se(o),s.style&&(t=o.getEl())&&(t.setAttribute("style",s.style),t.style.cssText=s.style),o.settings.border&&(e=o.borderBox,o.$el.css({"border-top-width":e.top,"border-right-width":e.right,"border-bottom-width":e.bottom,"border-left-width":e.left}));var a=o.getRoot();for(var l in a.controlIdLookup||(a.controlIdLookup={}),(a.controlIdLookup[o._id]=o)._aria)o.aria(l,o._aria[l]);!1===o.state.get("visible")&&(o.getEl().style.display="none"),o.bindStates(),o.state.on("change:visible",function(t){var e,n=t.value;o.state.get("rendered")&&(o.getEl().style.display=!1===n?"none":"",o.getEl().getBoundingClientRect()),(e=o.parent())&&(e._lastRect=null),o.fire(n?"show":"hide"),Zt.add(o)}),o.fire("postrender",{},!1)},bindStates:function(){},scrollIntoView:function(t){var e,n,i,r,o,s,a=this.getEl(),l=a.parentNode,u=function(t,e){var n,i,r=t;for(n=i=0;r&&r!==e&&r.nodeType;)n+=r.offsetLeft||0,i+=r.offsetTop||0,r=r.offsetParent;return{x:n,y:i}}(a,l);return e=u.x,n=u.y,i=a.offsetWidth,r=a.offsetHeight,o=l.clientWidth,s=l.clientHeight,"end"===t?(e-=o-i,n-=s-r):"center"===t&&(e-=o/2-i/2,n-=s/2-r/2),l.scrollLeft=e,l.scrollTop=n,this},getRoot:function(){for(var t,e=this,n=[];e;){if(e.rootControl){t=e.rootControl;break}n.push(e),e=(t=e).parent()}t||(t=this);for(var i=n.length;i--;)n[i].rootControl=t;return t},reflow:function(){Zt.remove(this);var t=this.parent();return t&&t._layout&&!t._layout.isNative()&&t.reflow(),this}};function oe(n){return n._eventDispatcher||(n._eventDispatcher=new Mt({scope:n,toggleEvent:function(t,e){e&&Mt.isNative(t)&&(n._nativeEvents||(n._nativeEvents={}),n._nativeEvents[t]=!0,n.state.get("rendered")&&se(n))}})),n._eventDispatcher}function se(a){var t,e,n,l,i,r;function o(t){var e=a.getParentCtrl(t.target);e&&e.fire(t.type,t)}function s(){var t=l._lastHoverCtrl;t&&(t.fire("mouseleave",{target:t.getEl()}),t.parents().each(function(t){t.fire("mouseleave",{target:t.getEl()})}),l._lastHoverCtrl=null)}function u(t){var e,n,i,r=a.getParentCtrl(t.target),o=l._lastHoverCtrl,s=0;if(r!==o){if((n=(l._lastHoverCtrl=r).parents().toArray().reverse()).push(r),o){for((i=o.parents().toArray().reverse()).push(o),s=0;s<i.length&&n[s]===i[s];s++);for(e=i.length-1;s<=e;e--)(o=i[e]).fire("mouseleave",{target:o.getEl()})}for(e=s;e<n.length;e++)(r=n[e]).fire("mouseenter",{target:r.getEl()})}}function c(t){t.preventDefault(),"mousewheel"===t.type?(t.deltaY=-.025*t.wheelDelta,t.wheelDeltaX&&(t.deltaX=-.025*t.wheelDeltaX)):(t.deltaX=0,t.deltaY=t.detail),t=a.fire("wheel",t)}if(i=a._nativeEvents){for((n=a.parents().toArray()).unshift(a),t=0,e=n.length;!l&&t<e;t++)l=n[t]._eventsRoot;for(l||(l=n[n.length-1]||a),a._eventsRoot=l,e=t,t=0;t<e;t++)n[t]._eventsRoot=l;var d=l._delegates;for(r in d||(d=l._delegates={}),i){if(!i)return!1;"wheel"!==r||ne?("mouseenter"===r||"mouseleave"===r?l._hasMouseEnter||(Tt(l.getEl()).on("mouseleave",s).on("mouseover",u),l._hasMouseEnter=1):d[r]||(Tt(l.getEl()).on(r,o),d[r]=!0),i[r]=!1):ee?Tt(a.getEl()).on("mousewheel",c):Tt(a.getEl()).on("DOMMouseScroll",c)}}}R.each("text title visible disabled active value".split(" "),function(e){re[e]=function(t){return 0===arguments.length?this.state.get(e):(void 0!==t&&this.state.set(e,t),this)}});var ae=Jt=St.extend(re),le=function(t){return"static"===Ht.getRuntimeStyle(t,"position")},ue=function(t){return t.state.get("fixed")};function ce(t,e,n){var i,r,o,s,a,l,u,c,d,f;return d=de(),o=(r=Ht.getPos(e,te.getUiContainer(t))).x,s=r.y,ue(t)&&le(_.document.body)&&(o-=d.x,s-=d.y),i=t.getEl(),a=(f=Ht.getSize(i)).width,l=f.height,u=(f=Ht.getSize(e)).width,c=f.height,"b"===(n=(n||"").split(""))[0]&&(s+=c),"r"===n[1]&&(o+=u),"c"===n[0]&&(s+=Math.round(c/2)),"c"===n[1]&&(o+=Math.round(u/2)),"b"===n[3]&&(s-=l),"r"===n[4]&&(o-=a),"c"===n[3]&&(s-=Math.round(l/2)),"c"===n[4]&&(o-=Math.round(a/2)),{x:o,y:s,w:a,h:l}}var de=function(){var t=_.window;return{x:Math.max(t.pageXOffset,_.document.body.scrollLeft,_.document.documentElement.scrollLeft),y:Math.max(t.pageYOffset,_.document.body.scrollTop,_.document.documentElement.scrollTop),w:t.innerWidth||_.document.documentElement.clientWidth,h:t.innerHeight||_.document.documentElement.clientHeight}},fe=function(t){var e,n=te.getUiContainer(t);return n&&!ue(t)?{x:0,y:0,w:(e=n).scrollWidth-1,h:e.scrollHeight-1}:de()},he={testMoveRel:function(t,e){for(var n=fe(this),i=0;i<e.length;i++){var r=ce(this,t,e[i]);if(ue(this)){if(0<r.x&&r.x+r.w<n.w&&0<r.y&&r.y+r.h<n.h)return e[i]}else if(r.x>n.x&&r.x+r.w<n.w+n.x&&r.y>n.y&&r.y+r.h<n.h+n.y)return e[i]}return e[0]},moveRel:function(t,e){"string"!=typeof e&&(e=this.testMoveRel(t,e));var n=ce(this,t,e);return this.moveTo(n.x,n.y)},moveBy:function(t,e){var n=this.layoutRect();return this.moveTo(n.x+t,n.y+e),this},moveTo:function(t,e){var n=this;function i(t,e,n){return t<0?0:e<t+n&&(t=e-n)<0?0:t}if(n.settings.constrainToViewport){var r=fe(this),o=n.layoutRect();t=i(t,r.w+r.x,o.w),e=i(e,r.h+r.y,o.h)}var s=te.getUiContainer(n);return s&&le(s)&&!ue(n)&&(t-=s.scrollLeft,e-=s.scrollTop),s&&(t+=1,e+=1),n.state.get("rendered")?n.layoutRect({x:t,y:e}).repaint():(n.settings.x=t,n.settings.y=e),n.fire("move",{x:t,y:e}),n}},me=ae.extend({Mixins:[he],Defaults:{classes:"widget tooltip tooltip-n"},renderHtml:function(){var t=this,e=t.classPrefix;return'<div id="'+t._id+'" class="'+t.classes+'" role="presentation"><div class="'+e+'tooltip-arrow"></div><div class="'+e+'tooltip-inner">'+t.encode(t.state.get("text"))+"</div></div>"},bindStates:function(){var e=this;return e.state.on("change:text",function(t){e.getEl().lastChild.innerHTML=e.encode(t.value)}),e._super()},repaint:function(){var t,e;t=this.getEl().style,e=this._layoutRect,t.left=e.x+"px",t.top=e.y+"px",t.zIndex=131070}}),ge=ae.extend({init:function(i){var r=this;r._super(i),i=r.settings,r.canFocus=!0,i.tooltip&&!1!==ge.tooltips&&(r.on("mouseenter",function(t){var e=r.tooltip().moveTo(-65535);if(t.control===r){var n=e.text(i.tooltip).show().testMoveRel(r.getEl(),["bc-tc","bc-tl","bc-tr"]);e.classes.toggle("tooltip-n","bc-tc"===n),e.classes.toggle("tooltip-nw","bc-tl"===n),e.classes.toggle("tooltip-ne","bc-tr"===n),e.moveRel(r.getEl(),n)}else e.hide()}),r.on("mouseleave mousedown click",function(){r.tooltip().remove(),r._tooltip=null})),r.aria("label",i.ariaLabel||i.tooltip)},tooltip:function(){return this._tooltip||(this._tooltip=new me({type:"tooltip"}),te.inheritUiContainer(this,this._tooltip),this._tooltip.renderTo()),this._tooltip},postRender:function(){var t=this,e=t.settings;t._super(),t.parent()||!e.width&&!e.height||(t.initLayoutRect(),t.repaint()),e.autofocus&&t.focus()},bindStates:function(){var e=this;function n(t){e.aria("disabled",t),e.classes.toggle("disabled",t)}function i(t){e.aria("pressed",t),e.classes.toggle("active",t)}return e.state.on("change:disabled",function(t){n(t.value)}),e.state.on("change:active",function(t){i(t.value)}),e.state.get("disabled")&&n(!0),e.state.get("active")&&i(!0),e._super()},remove:function(){this._super(),this._tooltip&&(this._tooltip.remove(),this._tooltip=null)}}),pe=ge.extend({Defaults:{value:0},init:function(t){this._super(t),this.classes.add("progress"),this.settings.filter||(this.settings.filter=function(t){return Math.round(t)})},renderHtml:function(){var t=this._id,e=this.classPrefix;return'<div id="'+t+'" class="'+this.classes+'"><div class="'+e+'bar-container"><div class="'+e+'bar"></div></div><div class="'+e+'text">0%</div></div>'},postRender:function(){return this._super(),this.value(this.settings.value),this},bindStates:function(){var e=this;function n(t){t=e.settings.filter(t),e.getEl().lastChild.innerHTML=t+"%",e.getEl().firstChild.firstChild.style.width=t+"%"}return e.state.on("change:value",function(t){n(t.value)}),n(e.state.get("value")),e._super()}}),ve=function(t,e){t.getEl().lastChild.textContent=e+(t.progressBar?" "+t.progressBar.value()+"%":"")},be=ae.extend({Mixins:[he],Defaults:{classes:"widget notification"},init:function(t){var e=this;e._super(t),e.maxWidth=t.maxWidth,t.text&&e.text(t.text),t.icon&&(e.icon=t.icon),t.color&&(e.color=t.color),t.type&&e.classes.add("notification-"+t.type),t.timeout&&(t.timeout<0||0<t.timeout)&&!t.closeButton?e.closeButton=!1:(e.classes.add("has-close"),e.closeButton=!0),t.progressBar&&(e.progressBar=new pe),e.on("click",function(t){-1!==t.target.className.indexOf(e.classPrefix+"close")&&e.close()})},renderHtml:function(){var t,e=this,n=e.classPrefix,i="",r="",o="";return e.icon&&(i='<i class="'+n+"ico "+n+"i-"+e.icon+'"></i>'),t=' style="max-width: '+e.maxWidth+"px;"+(e.color?"background-color: "+e.color+';"':'"'),e.closeButton&&(r='<button type="button" class="'+n+'close" aria-hidden="true">\xd7</button>'),e.progressBar&&(o=e.progressBar.renderHtml()),'<div id="'+e._id+'" class="'+e.classes+'"'+t+' role="presentation">'+i+'<div class="'+n+'notification-inner">'+e.state.get("text")+"</div>"+o+r+'<div style="clip: rect(1px, 1px, 1px, 1px);height: 1px;overflow: hidden;position: absolute;width: 1px;" aria-live="assertive" aria-relevant="additions" aria-atomic="true"></div></div>'},postRender:function(){var t=this;return c.setTimeout(function(){t.$el.addClass(t.classPrefix+"in"),ve(t,t.state.get("text"))},100),t._super()},bindStates:function(){var e=this;return e.state.on("change:text",function(t){e.getEl().firstChild.innerHTML=t.value,ve(e,t.value)}),e.progressBar&&(e.progressBar.bindStates(),e.progressBar.state.on("change:value",function(t){ve(e,e.state.get("text"))})),e._super()},close:function(){return this.fire("close").isDefaultPrevented()||this.remove(),this},repaint:function(){var t,e;t=this.getEl().style,e=this._layoutRect,t.left=e.x+"px",t.top=e.y+"px",t.zIndex=65534}});function ye(o){var s=function(t){return t.inline?t.getElement():t.getContentAreaContainer()};return{open:function(t,e){var n,i=R.extend(t,{maxWidth:(n=s(o),Ht.getSize(n).width)}),r=new be(i);return 0<(r.args=i).timeout&&(r.timer=setTimeout(function(){r.close(),e()},i.timeout)),r.on("close",function(){e()}),r.renderTo(),r},close:function(t){t.close()},reposition:function(t){Ct(t,function(t){t.moveTo(0,0)}),function(n){if(0<n.length){var t=n.slice(0,1)[0],e=s(o);t.moveRel(e,"tc-tc"),Ct(n,function(t,e){0<e&&t.moveRel(n[e-1].getEl(),"bc-tc")})}}(t)},getArgs:function(t){return t.args}}}function xe(t){var e,n;if(t.changedTouches)for(e="screenX screenY pageX pageY clientX clientY".split(" "),n=0;n<e.length;n++)t[e[n]]=t.changedTouches[0][e[n]]}function we(t,h){var m,g,e,p,v,b,y,x=h.document||_.document;h=h||{};var w=x.getElementById(h.handle||t);e=function(t){var e,n,i,r,o,s,a,l,u,c,d,f=(e=x,u=Math.max,n=e.documentElement,i=e.body,r=u(n.scrollWidth,i.scrollWidth),o=u(n.clientWidth,i.clientWidth),s=u(n.offsetWidth,i.offsetWidth),a=u(n.scrollHeight,i.scrollHeight),l=u(n.clientHeight,i.clientHeight),{width:r<s?o:r,height:a<u(n.offsetHeight,i.offsetHeight)?l:a});xe(t),t.preventDefault(),g=t.button,c=w,b=t.screenX,y=t.screenY,d=_.window.getComputedStyle?_.window.getComputedStyle(c,null).getPropertyValue("cursor"):c.runtimeStyle.cursor,m=Tt("<div></div>").css({position:"absolute",top:0,left:0,width:f.width,height:f.height,zIndex:2147483647,opacity:1e-4,cursor:d}).appendTo(x.body),Tt(x).on("mousemove touchmove",v).on("mouseup touchend",p),h.start(t)},v=function(t){if(xe(t),t.button!==g)return p(t);t.deltaX=t.screenX-b,t.deltaY=t.screenY-y,t.preventDefault(),h.drag(t)},p=function(t){xe(t),Tt(x).off("mousemove touchmove",v).off("mouseup touchend",p),m.remove(),h.stop&&h.stop(t)},this.destroy=function(){Tt(w).off()},Tt(w).on("mousedown touchstart",e)}var _e=tinymce.util.Tools.resolve("tinymce.ui.Factory"),Re=function(t){return!!t.getAttribute("data-mce-tabstop")};function Ce(t){var o,r,n=t.root;function i(t){return t&&1===t.nodeType}try{o=_.document.activeElement}catch(e){o=_.document.body}function s(t){return i(t=t||o)?t.getAttribute("role"):null}function a(t){for(var e,n=t||o;n=n.parentNode;)if(e=s(n))return e}function l(t){var e=o;if(i(e))return e.getAttribute("aria-"+t)}function u(t){var e=t.tagName.toUpperCase();return"INPUT"===e||"TEXTAREA"===e||"SELECT"===e}function c(e){var r=[];return function t(e){if(1===e.nodeType&&"none"!==e.style.display&&!e.disabled){var n;(u(n=e)&&!n.hidden||Re(n)||/^(button|menuitem|checkbox|tab|menuitemcheckbox|option|gridcell|slider)$/.test(s(n)))&&r.push(e);for(var i=0;i<e.childNodes.length;i++)t(e.childNodes[i])}}(e||n.getEl()),r}function d(t){var e,n;(n=(t=t||r).parents().toArray()).unshift(t);for(var i=0;i<n.length&&!(e=n[i]).settings.ariaRoot;i++);return e}function f(t,e){return t<0?t=e.length-1:t>=e.length&&(t=0),e[t]&&e[t].focus(),t}function h(t,e){var n=-1,i=d();e=e||c(i.getEl());for(var r=0;r<e.length;r++)e[r]===o&&(n=r);n+=t,i.lastAriaIndex=f(n,e)}function m(){"tablist"===a()?h(-1,c(o.parentNode)):r.parent().submenu?b():h(-1)}function g(){var t=s(),e=a();"tablist"===e?h(1,c(o.parentNode)):"menuitem"===t&&"menu"===e&&l("haspopup")?y():h(1)}function p(){h(-1)}function v(){var t=s(),e=a();"menuitem"===t&&"menubar"===e?y():"button"===t&&l("haspopup")?y({key:"down"}):h(1)}function b(){r.fire("cancel")}function y(t){t=t||{},r.fire("click",{target:o,aria:t})}return r=n.getParentCtrl(o),n.on("keydown",function(t){function e(t,e){u(o)||Re(o)||"slider"!==s(o)&&!1!==e(t)&&t.preventDefault()}if(!t.isDefaultPrevented())switch(t.keyCode){case 37:e(t,m);break;case 39:e(t,g);break;case 38:e(t,p);break;case 40:e(t,v);break;case 27:b();break;case 14:case 13:case 32:e(t,y);break;case 9:!function(t){if("tablist"===a()){var e=c(r.getEl("body"))[0];e&&e.focus()}else h(t.shiftKey?-1:1)}(t),t.preventDefault()}}),n.on("focusin",function(t){o=t.target,r=t.control}),{focusFirst:function(t){var e=d(t),n=c(e.getEl());e.settings.ariaRemember&&"lastAriaIndex"in e?f(e.lastAriaIndex,n):f(0,n)}}}var ke,Ee,He,Te,Se={},Me=ae.extend({init:function(t){var e=this;e._super(t),(t=e.settings).fixed&&e.state.set("fixed",!0),e._items=new qt,e.isRtl()&&e.classes.add("rtl"),e.bodyClasses=new Pt(function(){e.state.get("rendered")&&(e.getEl("body").className=this.toString())}),e.bodyClasses.prefix=e.classPrefix,e.classes.add("container"),e.bodyClasses.add("container-body"),t.containerCls&&e.classes.add(t.containerCls),e._layout=_e.create((t.layout||"")+"layout"),e.settings.items?e.add(e.settings.items):e.add(e.render()),e._hasBody=!0},items:function(){return this._items},find:function(t){return(t=Se[t]=Se[t]||new Ft(t)).find(this)},add:function(t){return this.items().add(this.create(t)).parent(this),this},focus:function(t){var e,n,i,r=this;if(!t||!(n=r.keyboardNav||r.parents().eq(-1)[0].keyboardNav))return i=r.find("*"),r.statusbar&&i.add(r.statusbar.items()),i.each(function(t){if(t.settings.autofocus)return e=null,!1;t.canFocus&&(e=e||t)}),e&&e.focus(),r;n.focusFirst(r)},replace:function(t,e){for(var n,i=this.items(),r=i.length;r--;)if(i[r]===t){i[r]=e;break}0<=r&&((n=e.getEl())&&n.parentNode.removeChild(n),(n=t.getEl())&&n.parentNode.removeChild(n)),e.parent(this)},create:function(t){var e,n=this,i=[];return R.isArray(t)||(t=[t]),R.each(t,function(t){t&&(t instanceof ae||("string"==typeof t&&(t={type:t}),e=R.extend({},n.settings.defaults,t),t.type=e.type=e.type||t.type||n.settings.defaultType||(e.defaults?e.defaults.type:null),t=_e.create(e)),i.push(t))}),i},renderNew:function(){var i=this;return i.items().each(function(t,e){var n;t.parent(i),t.state.get("rendered")||((n=i.getEl("body")).hasChildNodes()&&e<=n.childNodes.length-1?Tt(n.childNodes[e]).before(t.renderHtml()):Tt(n).append(t.renderHtml()),t.postRender(),Zt.add(t))}),i._layout.applyClasses(i.items().filter(":visible")),i._lastRect=null,i},append:function(t){return this.add(t).renderNew()},prepend:function(t){return this.items().set(this.create(t).concat(this.items().toArray())),this.renderNew()},insert:function(t,e,n){var i,r,o;return t=this.create(t),i=this.items(),!n&&e<i.length-1&&(e+=1),0<=e&&e<i.length&&(r=i.slice(0,e).toArray(),o=i.slice(e).toArray(),i.set(r.concat(t,o))),this.renderNew()},fromJSON:function(t){for(var e in t)this.find("#"+e).value(t[e]);return this},toJSON:function(){var i={};return this.find("*").each(function(t){var e=t.name(),n=t.value();e&&void 0!==n&&(i[e]=n)}),i},renderHtml:function(){var t=this,e=t._layout,n=this.settings.role;return t.preRender(),e.preRender(t),'<div id="'+t._id+'" class="'+t.classes+'"'+(n?' role="'+this.settings.role+'"':"")+'><div id="'+t._id+'-body" class="'+t.bodyClasses+'">'+(t.settings.html||"")+e.renderHtml(t)+"</div></div>"},postRender:function(){var t,e=this;return e.items().exec("postRender"),e._super(),e._layout.postRender(e),e.state.set("rendered",!0),e.settings.style&&e.$el.css(e.settings.style),e.settings.border&&(t=e.borderBox,e.$el.css({"border-top-width":t.top,"border-right-width":t.right,"border-bottom-width":t.bottom,"border-left-width":t.left})),e.parent()||(e.keyboardNav=Ce({root:e})),e},initLayoutRect:function(){var t=this._super();return this._layout.recalc(this),t},recalc:function(){var t=this,e=t._layoutRect,n=t._lastRect;if(!n||n.w!==e.w||n.h!==e.h)return t._layout.recalc(t),e=t.layoutRect(),t._lastRect={x:e.x,y:e.y,w:e.w,h:e.h},!0},reflow:function(){var t;if(Zt.remove(this),this.visible()){for(ae.repaintControls=[],ae.repaintControls.map={},this.recalc(),t=ae.repaintControls.length;t--;)ae.repaintControls[t].repaint();"flow"!==this.settings.layout&&"stack"!==this.settings.layout&&this.repaint(),ae.repaintControls=[]}return this}}),Ne={init:function(){this.on("repaint",this.renderScroll)},renderScroll:function(){var p=this,v=2;function n(){var m,g,t;function e(t,e,n,i,r,o){var s,a,l,u,c,d,f,h;if(a=p.getEl("scroll"+t)){if(f=e.toLowerCase(),h=n.toLowerCase(),Tt(p.getEl("absend")).css(f,p.layoutRect()[i]-1),!r)return void Tt(a).css("display","none");Tt(a).css("display","block"),s=p.getEl("body"),l=p.getEl("scroll"+t+"t"),u=s["client"+n]-2*v,c=(u-=m&&g?a["client"+o]:0)/s["scroll"+n],(d={})[f]=s["offset"+e]+v,d[h]=u,Tt(a).css(d),(d={})[f]=s["scroll"+e]*c,d[h]=u*c,Tt(l).css(d)}}t=p.getEl("body"),m=t.scrollWidth>t.clientWidth,g=t.scrollHeight>t.clientHeight,e("h","Left","Width","contentW",m,"Height"),e("v","Top","Height","contentH",g,"Width")}p.settings.autoScroll&&(p._hasScroll||(p._hasScroll=!0,function(){function t(s,a,l,u,c){var d,t=p._id+"-scroll"+s,e=p.classPrefix;Tt(p.getEl()).append('<div id="'+t+'" class="'+e+"scrollbar "+e+"scrollbar-"+s+'"><div id="'+t+'t" class="'+e+'scrollbar-thumb"></div></div>'),p.draghelper=new we(t+"t",{start:function(){d=p.getEl("body")["scroll"+a],Tt("#"+t).addClass(e+"active")},drag:function(t){var e,n,i,r,o=p.layoutRect();n=o.contentW>o.innerW,i=o.contentH>o.innerH,r=p.getEl("body")["client"+l]-2*v,e=(r-=n&&i?p.getEl("scroll"+s)["client"+c]:0)/p.getEl("body")["scroll"+l],p.getEl("body")["scroll"+a]=d+t["delta"+u]/e},stop:function(){Tt("#"+t).removeClass(e+"active")}})}p.classes.add("scroll"),t("v","Top","Height","Y","Width"),t("h","Left","Width","X","Height")}(),p.on("wheel",function(t){var e=p.getEl("body");e.scrollLeft+=10*(t.deltaX||0),e.scrollTop+=10*t.deltaY,n()}),Tt(p.getEl("body")).on("scroll",n)),n())}},Oe=Me.extend({Defaults:{layout:"fit",containerCls:"panel"},Mixins:[Ne],renderHtml:function(){var t=this,e=t._layout,n=t.settings.html;return t.preRender(),e.preRender(t),void 0===n?n='<div id="'+t._id+'-body" class="'+t.bodyClasses+'">'+e.renderHtml(t)+"</div>":("function"==typeof n&&(n=n.call(t)),t._hasBody=!1),'<div id="'+t._id+'" class="'+t.classes+'" hidefocus="1" tabindex="-1" role="group">'+(t._preBodyHtml||"")+n+"</div>"}}),We={resizeToContent:function(){this._layoutRect.autoResize=!0,this._lastRect=null,this.reflow()},resizeTo:function(t,e){if(t<=1||e<=1){var n=Ht.getWindowSize();t=t<=1?t*n.w:t,e=e<=1?e*n.h:e}return this._layoutRect.autoResize=!1,this.layoutRect({minW:t,minH:e,w:t,h:e}).reflow()},resizeBy:function(t,e){var n=this.layoutRect();return this.resizeTo(n.w+t,n.h+e)}},Pe=[],De=[];function Ae(t,e){for(;t;){if(t===e)return!0;t=t.parent()}}function Be(){ke||(ke=function(t){2!==t.button&&function(t){for(var e=Pe.length;e--;){var n=Pe[e],i=n.getParentCtrl(t.target);if(n.settings.autohide){if(i&&(Ae(i,n)||n.parent()===i))continue;(t=n.fire("autohide",{target:t.target})).isDefaultPrevented()||n.hide()}}}(t)},Tt(_.document).on("click touchstart",ke))}function Le(r){var t=Ht.getViewPort().y;function e(t,e){for(var n,i=0;i<Pe.length;i++)if(Pe[i]!==r)for(n=Pe[i].parent();n&&(n=n.parent());)n===r&&Pe[i].fixed(t).moveBy(0,e).repaint()}r.settings.autofix&&(r.state.get("fixed")?r._autoFixY>t&&(r.fixed(!1).layoutRect({y:r._autoFixY}).repaint(),e(!1,r._autoFixY-t)):(r._autoFixY=r.layoutRect().y,r._autoFixY<t&&(r.fixed(!0).layoutRect({y:0}).repaint(),e(!0,t-r._autoFixY))))}function Ie(t,e){var n,i,r=ze.zIndex||65535;if(t)De.push(e);else for(n=De.length;n--;)De[n]===e&&De.splice(n,1);if(De.length)for(n=0;n<De.length;n++)De[n].modal&&(r++,i=De[n]),De[n].getEl().style.zIndex=r,De[n].zIndex=r,r++;var o=Tt("#"+e.classPrefix+"modal-block",e.getContainerElm())[0];i?Tt(o).css("z-index",i.zIndex-1):o&&(o.parentNode.removeChild(o),Te=!1),ze.currentZIndex=r}var ze=Oe.extend({Mixins:[he,We],init:function(t){var i=this;i._super(t),(i._eventsRoot=i).classes.add("floatpanel"),t.autohide&&(Be(),function(){if(!He){var t=_.document.documentElement,e=t.clientWidth,n=t.clientHeight;He=function(){_.document.all&&e===t.clientWidth&&n===t.clientHeight||(e=t.clientWidth,n=t.clientHeight,ze.hideAll())},Tt(_.window).on("resize",He)}}(),Pe.push(i)),t.autofix&&(Ee||(Ee=function(){var t;for(t=Pe.length;t--;)Le(Pe[t])},Tt(_.window).on("scroll",Ee)),i.on("move",function(){Le(this)})),i.on("postrender show",function(t){if(t.control===i){var e,n=i.classPrefix;i.modal&&!Te&&((e=Tt("#"+n+"modal-block",i.getContainerElm()))[0]||(e=Tt('<div id="'+n+'modal-block" class="'+n+"reset "+n+'fade"></div>').appendTo(i.getContainerElm())),c.setTimeout(function(){e.addClass(n+"in"),Tt(i.getEl()).addClass(n+"in")}),Te=!0),Ie(!0,i)}}),i.on("show",function(){i.parents().each(function(t){if(t.state.get("fixed"))return i.fixed(!0),!1})}),t.popover&&(i._preBodyHtml='<div class="'+i.classPrefix+'arrow"></div>',i.classes.add("popover").add("bottom").add(i.isRtl()?"end":"start")),i.aria("label",t.ariaLabel),i.aria("labelledby",i._id),i.aria("describedby",i.describedBy||i._id+"-none")},fixed:function(t){var e=this;if(e.state.get("fixed")!==t){if(e.state.get("rendered")){var n=Ht.getViewPort();t?e.layoutRect().y-=n.y:e.layoutRect().y+=n.y}e.classes.toggle("fixed",t),e.state.set("fixed",t)}return e},show:function(){var t,e=this._super();for(t=Pe.length;t--&&Pe[t]!==this;);return-1===t&&Pe.push(this),e},hide:function(){return Fe(this),Ie(!1,this),this._super()},hideAll:function(){ze.hideAll()},close:function(){return this.fire("close").isDefaultPrevented()||(this.remove(),Ie(!1,this)),this},remove:function(){Fe(this),this._super()},postRender:function(){return this.settings.bodyRole&&this.getEl("body").setAttribute("role",this.settings.bodyRole),this._super()}});function Fe(t){var e;for(e=Pe.length;e--;)Pe[e]===t&&Pe.splice(e,1);for(e=De.length;e--;)De[e]===t&&De.splice(e,1)}ze.hideAll=function(){for(var t=Pe.length;t--;){var e=Pe[t];e&&e.settings.autohide&&(e.hide(),Pe.splice(t,1))}};var Ue=[],Ve="";function qe(t){var e,n=Tt("meta[name=viewport]")[0];!1!==h.overrideViewPort&&(n||((n=_.document.createElement("meta")).setAttribute("name","viewport"),_.document.getElementsByTagName("head")[0].appendChild(n)),(e=n.getAttribute("content"))&&void 0!==Ve&&(Ve=e),n.setAttribute("content",t?"width=device-width,initial-scale=1.0,user-scalable=0,minimum-scale=1.0,maximum-scale=1.0":Ve))}function Ye(t,e){(function(){for(var t=0;t<Ue.length;t++)if(Ue[t]._fullscreen)return!0;return!1})()&&!1===e&&Tt([_.document.documentElement,_.document.body]).removeClass(t+"fullscreen")}var $e=ze.extend({modal:!0,Defaults:{border:1,layout:"flex",containerCls:"panel",role:"dialog",callbacks:{submit:function(){this.fire("submit",{data:this.toJSON()})},close:function(){this.close()}}},init:function(t){var n=this;n._super(t),n.isRtl()&&n.classes.add("rtl"),n.classes.add("window"),n.bodyClasses.add("window-body"),n.state.set("fixed",!0),t.buttons&&(n.statusbar=new Oe({layout:"flex",border:"1 0 0 0",spacing:3,padding:10,align:"center",pack:n.isRtl()?"start":"end",defaults:{type:"button"},items:t.buttons}),n.statusbar.classes.add("foot"),n.statusbar.parent(n)),n.on("click",function(t){var e=n.classPrefix+"close";(Ht.hasClass(t.target,e)||Ht.hasClass(t.target.parentNode,e))&&n.close()}),n.on("cancel",function(){n.close()}),n.on("move",function(t){t.control===n&&ze.hideAll()}),n.aria("describedby",n.describedBy||n._id+"-none"),n.aria("label",t.title),n._fullscreen=!1},recalc:function(){var t,e,n,i,r=this,o=r.statusbar;r._fullscreen&&(r.layoutRect(Ht.getWindowSize()),r.layoutRect().contentH=r.layoutRect().innerH),r._super(),t=r.layoutRect(),r.settings.title&&!r._fullscreen&&(e=t.headerW)>t.w&&(n=t.x-Math.max(0,e/2),r.layoutRect({w:e,x:n}),i=!0),o&&(o.layoutRect({w:r.layoutRect().innerW}).recalc(),(e=o.layoutRect().minW+t.deltaW)>t.w&&(n=t.x-Math.max(0,e-t.w),r.layoutRect({w:e,x:n}),i=!0)),i&&r.recalc()},initLayoutRect:function(){var t,e=this,n=e._super(),i=0;if(e.settings.title&&!e._fullscreen){t=e.getEl("head");var r=Ht.getSize(t);n.headerW=r.width,n.headerH=r.height,i+=n.headerH}e.statusbar&&(i+=e.statusbar.layoutRect().h),n.deltaH+=i,n.minH+=i,n.h+=i;var o=Ht.getWindowSize();return n.x=e.settings.x||Math.max(0,o.w/2-n.w/2),n.y=e.settings.y||Math.max(0,o.h/2-n.h/2),n},renderHtml:function(){var t=this,e=t._layout,n=t._id,i=t.classPrefix,r=t.settings,o="",s="",a=r.html;return t.preRender(),e.preRender(t),r.title&&(o='<div id="'+n+'-head" class="'+i+'window-head"><div id="'+n+'-title" class="'+i+'title">'+t.encode(r.title)+'</div><div id="'+n+'-dragh" class="'+i+'dragh"></div><button type="button" class="'+i+'close" aria-hidden="true"><i class="mce-ico mce-i-remove"></i></button></div>'),r.url&&(a='<iframe src="'+r.url+'" tabindex="-1"></iframe>'),void 0===a&&(a=e.renderHtml(t)),t.statusbar&&(s=t.statusbar.renderHtml()),'<div id="'+n+'" class="'+t.classes+'" hidefocus="1"><div class="'+t.classPrefix+'reset" role="application">'+o+'<div id="'+n+'-body" class="'+t.bodyClasses+'">'+a+"</div>"+s+"</div></div>"},fullscreen:function(t){var n,e,i=this,r=_.document.documentElement,o=i.classPrefix;if(t!==i._fullscreen)if(Tt(_.window).on("resize",function(){var t;if(i._fullscreen)if(n)i._timer||(i._timer=c.setTimeout(function(){var t=Ht.getWindowSize();i.moveTo(0,0).resizeTo(t.w,t.h),i._timer=0},50));else{t=(new Date).getTime();var e=Ht.getWindowSize();i.moveTo(0,0).resizeTo(e.w,e.h),50<(new Date).getTime()-t&&(n=!0)}}),e=i.layoutRect(),i._fullscreen=t){i._initial={x:e.x,y:e.y,w:e.w,h:e.h},i.borderBox=Nt("0"),i.getEl("head").style.display="none",e.deltaH-=e.headerH+2,Tt([r,_.document.body]).addClass(o+"fullscreen"),i.classes.add("fullscreen");var s=Ht.getWindowSize();i.moveTo(0,0).resizeTo(s.w,s.h)}else i.borderBox=Nt(i.settings.border),i.getEl("head").style.display="",e.deltaH+=e.headerH,Tt([r,_.document.body]).removeClass(o+"fullscreen"),i.classes.remove("fullscreen"),i.moveTo(i._initial.x,i._initial.y).resizeTo(i._initial.w,i._initial.h);return i.reflow()},postRender:function(){var e,n=this;setTimeout(function(){n.classes.add("in"),n.fire("open")},0),n._super(),n.statusbar&&n.statusbar.postRender(),n.focus(),this.dragHelper=new we(n._id+"-dragh",{start:function(){e={x:n.layoutRect().x,y:n.layoutRect().y}},drag:function(t){n.moveTo(e.x+t.deltaX,e.y+t.deltaY)}}),n.on("submit",function(t){t.isDefaultPrevented()||n.close()}),Ue.push(n),qe(!0)},submit:function(){return this.fire("submit",{data:this.toJSON()})},remove:function(){var t,e=this;for(e.dragHelper.destroy(),e._super(),e.statusbar&&this.statusbar.remove(),Ye(e.classPrefix,!1),t=Ue.length;t--;)Ue[t]===e&&Ue.splice(t,1);qe(0<Ue.length)},getContentWindow:function(){var t=this.getEl().getElementsByTagName("iframe")[0];return t?t.contentWindow:null}});!function(){if(!h.desktop){var n={w:_.window.innerWidth,h:_.window.innerHeight};c.setInterval(function(){var t=_.window.innerWidth,e=_.window.innerHeight;n.w===t&&n.h===e||(n={w:t,h:e},Tt(_.window).trigger("resize"))},100)}Tt(_.window).on("resize",function(){var t,e,n=Ht.getWindowSize();for(t=0;t<Ue.length;t++)e=Ue[t].layoutRect(),Ue[t].moveTo(Ue[t].settings.x||Math.max(0,n.w/2-e.w/2),Ue[t].settings.y||Math.max(0,n.h/2-e.h/2))})}();var Xe,je,Je,Ge=$e.extend({init:function(t){t={border:1,padding:20,layout:"flex",pack:"center",align:"center",containerCls:"panel",autoScroll:!0,buttons:{type:"button",text:"Ok",action:"ok"},items:{type:"label",multiline:!0,maxWidth:500,maxHeight:200}},this._super(t)},Statics:{OK:1,OK_CANCEL:2,YES_NO:3,YES_NO_CANCEL:4,msgBox:function(t){var e,i=t.callback||function(){};function n(t,e,n){return{type:"button",text:t,subtype:n?"primary":"",onClick:function(t){t.control.parents()[1].close(),i(e)}}}switch(t.buttons){case Ge.OK_CANCEL:e=[n("Ok",!0,!0),n("Cancel",!1)];break;case Ge.YES_NO:case Ge.YES_NO_CANCEL:e=[n("Yes",1,!0),n("No",0)],t.buttons===Ge.YES_NO_CANCEL&&e.push(n("Cancel",-1));break;default:e=[n("Ok",!0,!0)]}return new $e({padding:20,x:t.x,y:t.y,minWidth:300,minHeight:100,layout:"flex",pack:"center",align:"center",buttons:e,title:t.title,role:"alertdialog",items:{type:"label",multiline:!0,maxWidth:500,maxHeight:200,text:t.text},onPostRender:function(){this.aria("describedby",this.items()[0]._id)},onClose:t.onClose,onCancel:function(){i(!1)}}).renderTo(_.document.body).reflow()},alert:function(t,e){return"string"==typeof t&&(t={text:t}),t.callback=e,Ge.msgBox(t)},confirm:function(t,e){return"string"==typeof t&&(t={text:t}),t.callback=e,t.buttons=Ge.OK_CANCEL,Ge.msgBox(t)}}}),Ke=function(t,e){return{renderUI:function(){return st(t,e)},getNotificationManagerImpl:function(){return ye(t)},getWindowManagerImpl:function(){return{open:function(n,t,e){var i;return n.title=n.title||" ",n.url=n.url||n.file,n.url&&(n.width=parseInt(n.width||320,10),n.height=parseInt(n.height||240,10)),n.body&&(n.items={defaults:n.defaults,type:n.bodyType||"form",items:n.body,data:n.data,callbacks:n.commands}),n.url||n.buttons||(n.buttons=[{text:"Ok",subtype:"primary",onclick:function(){i.find("form")[0].submit()}},{text:"Cancel",onclick:function(){i.close()}}]),(i=new $e(n)).on("close",function(){e(i)}),n.data&&i.on("postRender",function(){this.find("*").each(function(t){var e=t.name();e in n.data&&t.value(n.data[e])})}),i.features=n||{},i.params=t||{},i=i.renderTo(_.document.body).reflow()},alert:function(t,e,n){var i;return(i=Ge.alert(t,function(){e()})).on("close",function(){n(i)}),i},confirm:function(t,e,n){var i;return(i=Ge.confirm(t,function(t){e(t)})).on("close",function(){n(i)}),i},close:function(t){t.close()},getParams:function(t){return t.params},setParams:function(t,e){t.params=e}}}}},Ze="undefined"!=typeof _.window?_.window:Function("return this;")(),Qe=function(t,e){return function(t,e){for(var n=e!==undefined&&null!==e?e:Ze,i=0;i<t.length&&n!==undefined&&null!==n;++i)n=n[t[i]];return n}(t.split("."),e)},tn=function(t,e){var n=Qe(t,e);if(n===undefined||null===n)throw new Error(t+" not available on this browser");return n},en=tinymce.util.Tools.resolve("tinymce.util.Promise"),nn=function(n){return new en(function(t){var e=new(tn("FileReader"));e.onloadend=function(){t(e.result.split(",")[1])},e.readAsDataURL(n)})},rn=function(){return new en(function(e){var t;(t=_.document.createElement("input")).type="file",t.style.position="fixed",t.style.left=0,t.style.top=0,t.style.opacity=.001,_.document.body.appendChild(t),t.onchange=function(t){e(Array.prototype.slice.call(t.target.files))},t.click(),t.parentNode.removeChild(t)})},on=0,sn=function(t){return t+on+++(e=function(){return Math.round(4294967295*Math.random()).toString(36)},"s"+Date.now().toString(36)+e()+e()+e());var e},an=function(r,o){var s={};function t(t){var e,n,i;n=o[t?"startContainer":"endContainer"],i=o[t?"startOffset":"endOffset"],1===n.nodeType&&(e=r.create("span",{"data-mce-type":"bookmark"}),n.hasChildNodes()?(i=Math.min(i,n.childNodes.length-1),t?n.insertBefore(e,n.childNodes[i]):r.insertAfter(e,n.childNodes[i])):n.appendChild(e),n=e,i=0),s[t?"startContainer":"endContainer"]=n,s[t?"startOffset":"endOffset"]=i}return t(!0),o.collapsed||t(),s},ln=function(r,o){function t(t){var e,n,i;e=i=o[t?"startContainer":"endContainer"],n=o[t?"startOffset":"endOffset"],e&&(1===e.nodeType&&(n=function(t){for(var e=t.parentNode.firstChild,n=0;e;){if(e===t)return n;1===e.nodeType&&"bookmark"===e.getAttribute("data-mce-type")||n++,e=e.nextSibling}return-1}(e),e=e.parentNode,r.remove(i)),o[t?"startContainer":"endContainer"]=e,o[t?"startOffset":"endOffset"]=n)}t(!0),t();var e=r.createRng();return e.setStart(o.startContainer,o.startOffset),o.endContainer&&e.setEnd(o.endContainer,o.endOffset),e},un=tinymce.util.Tools.resolve("tinymce.dom.TreeWalker"),cn=tinymce.util.Tools.resolve("tinymce.dom.RangeUtils"),dn=function(t){return"A"===t.nodeName&&t.hasAttribute("href")},fn=function(t){var e,n,i,r,o,s,a,l;return r=t.selection,o=t.dom,s=r.getRng(),a=o,l=cn.getNode(s.startContainer,s.startOffset),e=a.getParent(l,dn)||l,n=cn.getNode(s.endContainer,s.endOffset),i=t.getBody(),R.grep(function(t,e,n){var i,r,o=[];for(i=new un(e,t),r=e;r&&(1===r.nodeType&&o.push(r),r!==n);r=i.next());return o}(i,e,n),dn)},hn=function(t){var e,n,i,r,o;n=fn(e=t),r=e.dom,o=e.selection,i=an(r,o.getRng()),R.each(n,function(t){e.dom.remove(t,!0)}),o.setRng(ln(r,i))},mn=function(t){t.selection.collapse(!1)},gn=function(t){t.focus(),hn(t),mn(t)},pn=function(t,e){var n,i,r,o,s,a=t.dom.getParent(t.selection.getStart(),"a[href]");a?(o=a,s=e,(r=t).focus(),r.dom.setAttrib(o,"href",s),mn(r)):(i=e,(n=t).execCommand("mceInsertLink",!1,{href:i}),mn(n))},vn=function(t,e,n){var i,r,o;t.plugins.table?t.plugins.table.insertTable(e,n):(r=e,o=n,(i=t).undoManager.transact(function(){var t,e;i.insertContent(function(t,e){var n,i,r;for(r='<table data-mce-id="mce" style="width: 100%">',r+="<tbody>",i=0;i<e;i++){for(r+="<tr>",n=0;n<t;n++)r+="<td><br></td>";r+="</tr>"}return r+="</tbody>",r+="</table>"}(r,o)),(t=i.dom.select("*[data-mce-id]")[0]).removeAttribute("data-mce-id"),e=i.dom.select("td,th",t),i.selection.setCursorLocation(e[0],0)}))},bn=function(t,e){t.execCommand("FormatBlock",!1,e)},yn=function(t,e,n){var i,r;r=(i=t.editorUpload.blobCache).create(sn("mceu"),n,e),i.add(r),t.insertContent(t.dom.createHTML("img",{src:r.blobUri()}))},xn=function(t,e){0===e.trim().length?gn(t):pn(t,e)},wn=gn,_n=function(n,t){n.addButton("quicklink",{icon:"link",tooltip:"Insert/Edit link",stateSelector:"a[href]",onclick:function(){t.showForm(n,"quicklink")}}),n.addButton("quickimage",{icon:"image",tooltip:"Insert image",onclick:function(){rn().then(function(t){var e=t[0];nn(e).then(function(t){yn(n,t,e)})})}}),n.addButton("quicktable",{icon:"table",tooltip:"Insert table",onclick:function(){t.hide(),vn(n,2,2)}}),function(e){for(var t=function(t){return function(){bn(e,t)}},n=1;n<6;n++){var i="h"+n;e.addButton(i,{text:i.toUpperCase(),tooltip:"Heading "+n,stateSelector:i,onclick:t(i),onPostRender:function(){this.getEl().firstChild.firstChild.style.fontWeight="bold"}})}}(n)},Rn=function(){var t=h.container;if(t&&"static"!==v.DOM.getStyle(t,"position",!0)){var e=v.DOM.getPos(t),n=e.x-t.scrollLeft,i=e.y-t.scrollTop;return mt.some({x:n,y:i})}return mt.none()},Cn=function(t){return/^www\.|\.(com|org|edu|gov|uk|net|ca|de|jp|fr|au|us|ru|ch|it|nl|se|no|es|mil)$/i.test(t.trim())},kn=function(t){return/^https?:\/\//.test(t.trim())},En=function(t,e){return!kn(e)&&Cn(e)?(n=t,i=e,new en(function(e){n.windowManager.confirm("The URL you entered seems to be an external link. Do you want to add the required http:// prefix?",function(t){e(!0===t?"http://"+i:i)})})):en.resolve(e);var n,i},Hn=function(r,e){var t,n,i,o={};return t="quicklink",n={items:[{type:"button",name:"unlink",icon:"unlink",onclick:function(){r.focus(),wn(r),e()},tooltip:"Remove link"},{type:"filepicker",name:"linkurl",placeholder:"Paste or type a link",filetype:"file",onchange:function(t){var e=t.meta;e&&e.attach&&(o={href:this.value(),attach:e.attach})}},{type:"button",icon:"checkmark",subtype:"primary",tooltip:"Ok",onclick:"submit"}],onshow:function(t){if(t.control===this){var e,n="";(e=r.dom.getParent(r.selection.getStart(),"a[href]"))&&(n=r.dom.getAttrib(e,"href")),this.fromJSON({linkurl:n}),i=this.find("#unlink"),e?i.show():i.hide(),this.find("#linkurl")[0].focus()}var i},onsubmit:function(t){En(r,t.data.linkurl).then(function(t){r.undoManager.transact(function(){t===o.href&&(o.attach(),o={}),xn(r,t)}),e()})}},(i=_e.create(R.extend({type:"form",layout:"flex",direction:"row",padding:5,name:t,spacing:3},n))).on("show",function(){i.find("textbox").eq(0).each(function(t){t.focus()})}),i},Tn=function(n,t,e){var o,i,s=[];if(e)return R.each(B(i=e)?i:W(i)?i.split(/[ ,]/):[],function(t){if("|"===t)o=null;else if(n.buttons[t]){o||(o={type:"buttongroup",items:[]},s.push(o));var e=n.buttons[t];A(e)&&(e=e()),e.type=e.type||"button",(e=_e.create(e)).on("postRender",(i=n,r=e,function(){var e,t,n=(t=function(t,e){return{selector:t,handler:e}},(e=r).settings.stateSelector?t(e.settings.stateSelector,function(t){e.active(t)}):e.settings.disabledStateSelector?t(e.settings.disabledStateSelector,function(t){e.disabled(t)}):null);null!==n&&i.selection.selectorChanged(n.selector,n.handler)})),o.items.push(e)}var i,r}),_e.create({type:"toolbar",layout:"flow",name:t,items:s})},Sn=function(){var l,c,o=function(t){return 0<t.items().length},u=function(t,e){var n,i,r=(n=t,i=e,R.map(i,function(t){return Tn(n,t.id,t.items)})).concat([Tn(t,"text",J(t)),Tn(t,"insert",G(t)),Hn(t,p)]);return _e.create({type:"floatpanel",role:"dialog",classes:"tinymce tinymce-inline arrow",ariaLabel:"Inline toolbar",layout:"flex",direction:"column",align:"stretch",autohide:!1,autofix:!0,fixed:!0,border:1,items:R.grep(r,o),oncancel:function(){t.focus()}})},d=function(t){t&&t.show()},f=function(t,e){t.moveTo(e.x,e.y)},h=function(n,i){i=i?i.substr(0,2):"",R.each({t:"down",b:"up",c:"center"},function(t,e){n.classes.toggle("arrow-"+t,e===i.substr(0,1))}),"cr"===i?(n.classes.toggle("arrow-left",!0),n.classes.toggle("arrow-right",!1)):"cl"===i?(n.classes.toggle("arrow-left",!1),n.classes.toggle("arrow-right",!0)):R.each({l:"left",r:"right"},function(t,e){n.classes.toggle("arrow-"+t,e===i.substr(1,1))})},m=function(t,e){var n=t.items().filter("#"+e);return 0<n.length&&(n[0].show(),t.reflow(),!0)},g=function(t,e,n,i){var r,o,s,a;if(a=K(n),r=b(n),o=v.DOM.getRect(t.getEl()),s="insert"===e?Y(i,r,o):$(i,r,o)){var l=Rn().getOr({x:0,y:0}),u={x:s.rect.x-l.x,y:s.rect.y-l.y,w:s.rect.w,h:s.rect.h};return f(t,X(a,c=i,r,u)),h(t,s.position),!0}return!1},p=function(){l&&l.hide()};return{show:function(t,e,n,i){var r,o,s,a;l||(S(t),(l=u(t,i)).renderTo().reflow().moveTo(n.x,n.y),t.nodeChanged()),o=e,s=t,a=n,d(r=l),r.items().hide(),m(r,o)?!1===g(r,o,s,a)&&p():p()},showForm:function(t,e){if(l){if(l.items().hide(),!m(l,e))return void p();var n,i,r,o=void 0;d(l),l.items().hide(),m(l,e),r=K(t),n=b(t),o=v.DOM.getRect(l.getEl()),(i=$(c,n,o))&&(o=i.rect,f(l,X(r,c,n,o)),h(l,i.position))}},reposition:function(t,e,n){l&&g(l,e,t,n)},inForm:function(){return l&&l.visible()&&0<l.items().filter("form:visible").length},hide:p,focus:function(){l&&l.find("toolbar:visible").eq(0).each(function(t){t.focus(!0)})},remove:function(){l&&(l.remove(),l=null)}}},Mn=St.extend({Defaults:{firstControlClass:"first",lastControlClass:"last"},init:function(t){this.settings=R.extend({},this.Defaults,t)},preRender:function(t){t.bodyClasses.add(this.settings.containerClass)},applyClasses:function(t){var e,n,i,r,o=this.settings;e=o.firstControlClass,n=o.lastControlClass,t.each(function(t){t.classes.remove(e).remove(n).add(o.controlClass),t.visible()&&(i||(i=t),r=t)}),i&&i.classes.add(e),r&&r.classes.add(n)},renderHtml:function(t){var e="";return this.applyClasses(t.items()),t.items().each(function(t){e+=t.renderHtml()}),e},recalc:function(){},postRender:function(){},isNative:function(){return!1}}),Nn=Mn.extend({Defaults:{containerClass:"abs-layout",controlClass:"abs-layout-item"},recalc:function(t){t.items().filter(":visible").each(function(t){var e=t.settings;t.layoutRect({x:e.x,y:e.y,w:e.w,h:e.h}),t.recalc&&t.recalc()})},renderHtml:function(t){return'<div id="'+t._id+'-absend" class="'+t.classPrefix+'abs-end"></div>'+this._super(t)}}),On=ge.extend({Defaults:{classes:"widget btn",role:"button"},init:function(t){var e,n=this;n._super(t),t=n.settings,e=n.settings.size,n.on("click mousedown",function(t){t.preventDefault()}),n.on("touchstart",function(t){n.fire("click",t),t.preventDefault()}),t.subtype&&n.classes.add(t.subtype),e&&n.classes.add("btn-"+e),t.icon&&n.icon(t.icon)},icon:function(t){return arguments.length?(this.state.set("icon",t),this):this.state.get("icon")},repaint:function(){var t,e=this.getEl().firstChild;e&&((t=e.style).width=t.height="100%"),this._super()},renderHtml:function(){var t,e,n=this,i=n._id,r=n.classPrefix,o=n.state.get("icon"),s=n.state.get("text"),a="",l=n.settings;return(t=l.image)?(o="none","string"!=typeof t&&(t=_.window.getSelection?t[0]:t[1]),t=" style=\"background-image: url('"+t+"')\""):t="",s&&(n.classes.add("btn-has-text"),a='<span class="'+r+'txt">'+n.encode(s)+"</span>"),o=o?r+"ico "+r+"i-"+o:"",e="boolean"==typeof l.active?' aria-pressed="'+l.active+'"':"",'<div id="'+i+'" class="'+n.classes+'" tabindex="-1"'+e+'><button id="'+i+'-button" role="presentation" type="button" tabindex="-1">'+(o?'<i class="'+o+'"'+t+"></i>":"")+a+"</button></div>"},bindStates:function(){var o=this,n=o.$,i=o.classPrefix+"txt";function s(t){var e=n("span."+i,o.getEl());t?(e[0]||(n("button:first",o.getEl()).append('<span class="'+i+'"></span>'),e=n("span."+i,o.getEl())),e.html(o.encode(t))):e.remove(),o.classes.toggle("btn-has-text",!!t)}return o.state.on("change:text",function(t){s(t.value)}),o.state.on("change:icon",function(t){var e=t.value,n=o.classPrefix;e=(o.settings.icon=e)?n+"ico "+n+"i-"+o.settings.icon:"";var i=o.getEl().firstChild,r=i.getElementsByTagName("i")[0];e?(r&&r===i.firstChild||(r=_.document.createElement("i"),i.insertBefore(r,i.firstChild)),r.className=e):r&&i.removeChild(r),s(o.state.get("text"))}),o._super()}}),Wn=On.extend({init:function(t){t=R.extend({text:"Browse...",multiple:!1,accept:null},t),this._super(t),this.classes.add("browsebutton"),t.multiple&&this.classes.add("multiple")},postRender:function(){var n=this,e=Ht.create("input",{type:"file",id:n._id+"-browse",accept:n.settings.accept});n._super(),Tt(e).on("change",function(t){var e=t.target.files;n.value=function(){return e.length?n.settings.multiple?e:e[0]:null},t.preventDefault(),e.length&&n.fire("change",t)}),Tt(e).on("click",function(t){t.stopPropagation()}),Tt(n.getEl("button")).on("click touchstart",function(t){t.stopPropagation(),e.click(),t.preventDefault()}),n.getEl().appendChild(e)},remove:function(){Tt(this.getEl("button")).off(),Tt(this.getEl("input")).off(),this._super()}}),Pn=Me.extend({Defaults:{defaultType:"button",role:"group"},renderHtml:function(){var t=this,e=t._layout;return t.classes.add("btn-group"),t.preRender(),e.preRender(t),'<div id="'+t._id+'" class="'+t.classes+'"><div id="'+t._id+'-body">'+(t.settings.html||"")+e.renderHtml(t)+"</div></div>"}}),Dn=ge.extend({Defaults:{classes:"checkbox",role:"checkbox",checked:!1},init:function(t){var e=this;e._super(t),e.on("click mousedown",function(t){t.preventDefault()}),e.on("click",function(t){t.preventDefault(),e.disabled()||e.checked(!e.checked())}),e.checked(e.settings.checked)},checked:function(t){return arguments.length?(this.state.set("checked",t),this):this.state.get("checked")},value:function(t){return arguments.length?this.checked(t):this.checked()},renderHtml:function(){var t=this,e=t._id,n=t.classPrefix;return'<div id="'+e+'" class="'+t.classes+'" unselectable="on" aria-labelledby="'+e+'-al" tabindex="-1"><i class="'+n+"ico "+n+'i-checkbox"></i><span id="'+e+'-al" class="'+n+'label">'+t.encode(t.state.get("text"))+"</span></div>"},bindStates:function(){var o=this;function e(t){o.classes.toggle("checked",t),o.aria("checked",t)}return o.state.on("change:text",function(t){o.getEl("al").firstChild.data=o.translate(t.value)}),o.state.on("change:checked change:value",function(t){o.fire("change"),e(t.value)}),o.state.on("change:icon",function(t){var e=t.value,n=o.classPrefix;if(void 0===e)return o.settings.icon;e=(o.settings.icon=e)?n+"ico "+n+"i-"+o.settings.icon:"";var i=o.getEl().firstChild,r=i.getElementsByTagName("i")[0];e?(r&&r===i.firstChild||(r=_.document.createElement("i"),i.insertBefore(r,i.firstChild)),r.className=e):r&&i.removeChild(r)}),o.state.get("checked")&&e(!0),o._super()}}),An=tinymce.util.Tools.resolve("tinymce.util.VK"),Bn=ge.extend({init:function(i){var r=this;r._super(i),i=r.settings,r.classes.add("combobox"),r.subinput=!0,r.ariaTarget="inp",i.menu=i.menu||i.values,i.menu&&(i.icon="caret"),r.on("click",function(t){var e=t.target,n=r.getEl();if(Tt.contains(n,e)||e===n)for(;e&&e!==n;)e.id&&-1!==e.id.indexOf("-open")&&(r.fire("action"),i.menu&&(r.showMenu(),t.aria&&r.menu.items()[0].focus())),e=e.parentNode}),r.on("keydown",function(t){var e;13===t.keyCode&&"INPUT"===t.target.nodeName&&(t.preventDefault(),r.parents().reverse().each(function(t){if(t.toJSON)return e=t,!1}),r.fire("submit",{data:e.toJSON()}))}),r.on("keyup",function(t){if("INPUT"===t.target.nodeName){var e=r.state.get("value"),n=t.target.value;n!==e&&(r.state.set("value",n),r.fire("autocomplete",t))}}),r.on("mouseover",function(t){var e=r.tooltip().moveTo(-65535);if(r.statusLevel()&&-1!==t.target.className.indexOf(r.classPrefix+"status")){var n=r.statusMessage()||"Ok",i=e.text(n).show().testMoveRel(t.target,["bc-tc","bc-tl","bc-tr"]);e.classes.toggle("tooltip-n","bc-tc"===i),e.classes.toggle("tooltip-nw","bc-tl"===i),e.classes.toggle("tooltip-ne","bc-tr"===i),e.moveRel(t.target,i)}})},statusLevel:function(t){return 0<arguments.length&&this.state.set("statusLevel",t),this.state.get("statusLevel")},statusMessage:function(t){return 0<arguments.length&&this.state.set("statusMessage",t),this.state.get("statusMessage")},showMenu:function(){var t,e=this,n=e.settings;e.menu||((t=n.menu||[]).length?t={type:"menu",items:t}:t.type=t.type||"menu",e.menu=_e.create(t).parent(e).renderTo(e.getContainerElm()),e.fire("createmenu"),e.menu.reflow(),e.menu.on("cancel",function(t){t.control===e.menu&&e.focus()}),e.menu.on("show hide",function(t){t.control.items().each(function(t){t.active(t.value()===e.value())})}).fire("show"),e.menu.on("select",function(t){e.value(t.control.value())}),e.on("focusin",function(t){"INPUT"===t.target.tagName.toUpperCase()&&e.menu.hide()}),e.aria("expanded",!0)),e.menu.show(),e.menu.layoutRect({w:e.layoutRect().w}),e.menu.moveRel(e.getEl(),e.isRtl()?["br-tr","tr-br"]:["bl-tl","tl-bl"])},focus:function(){this.getEl("inp").focus()},repaint:function(){var t,e,n=this,i=n.getEl(),r=n.getEl("open"),o=n.layoutRect(),s=0,a=i.firstChild;n.statusLevel()&&"none"!==n.statusLevel()&&(s=parseInt(Ht.getRuntimeStyle(a,"padding-right"),10)-parseInt(Ht.getRuntimeStyle(a,"padding-left"),10)),t=r?o.w-Ht.getSize(r).width-10:o.w-10;var l=_.document;return l.all&&(!l.documentMode||l.documentMode<=8)&&(e=n.layoutRect().h-2+"px"),Tt(a).css({width:t-s,lineHeight:e}),n._super(),n},postRender:function(){var e=this;return Tt(this.getEl("inp")).on("change",function(t){e.state.set("value",t.target.value),e.fire("change",t)}),e._super()},renderHtml:function(){var t,e,n,i=this,r=i._id,o=i.settings,s=i.classPrefix,a=i.state.get("value")||"",l="",u="";return"spellcheck"in o&&(u+=' spellcheck="'+o.spellcheck+'"'),o.maxLength&&(u+=' maxlength="'+o.maxLength+'"'),o.size&&(u+=' size="'+o.size+'"'),o.subtype&&(u+=' type="'+o.subtype+'"'),n='<i id="'+r+'-status" class="mce-status mce-ico" style="display: none"></i>',i.disabled()&&(u+=' disabled="disabled"'),(t=o.icon)&&"caret"!==t&&(t=s+"ico "+s+"i-"+o.icon),e=i.state.get("text"),(t||e)&&(l='<div id="'+r+'-open" class="'+s+"btn "+s+'open" tabIndex="-1" role="button"><button id="'+r+'-action" type="button" hidefocus="1" tabindex="-1">'+("caret"!==t?'<i class="'+t+'"></i>':'<i class="'+s+'caret"></i>')+(e?(t?" ":"")+e:"")+"</button></div>",i.classes.add("has-open")),'<div id="'+r+'" class="'+i.classes+'"><input id="'+r+'-inp" class="'+s+'textbox" value="'+i.encode(a,!1)+'" hidefocus="1"'+u+' placeholder="'+i.encode(o.placeholder)+'" />'+n+l+"</div>"},value:function(t){return arguments.length?(this.state.set("value",t),this):(this.state.get("rendered")&&this.state.set("value",this.getEl("inp").value),this.state.get("value"))},showAutoComplete:function(t,i){var r=this;if(0!==t.length){r.menu?r.menu.items().remove():r.menu=_e.create({type:"menu",classes:"combobox-menu",layout:"flow"}).parent(r).renderTo(),R.each(t,function(t){var e,n;r.menu.add({text:t.title,url:t.previewUrl,match:i,classes:"menu-item-ellipsis",onclick:(e=t.value,n=t.title,function(){r.fire("selectitem",{title:n,value:e})})})}),r.menu.renderNew(),r.hideMenu(),r.menu.on("cancel",function(t){t.control.parent()===r.menu&&(t.stopPropagation(),r.focus(),r.hideMenu())}),r.menu.on("select",function(){r.focus()});var e=r.layoutRect().w;r.menu.layoutRect({w:e,minW:0,maxW:e}),r.menu.repaint(),r.menu.reflow(),r.menu.show(),r.menu.moveRel(r.getEl(),r.isRtl()?["br-tr","tr-br"]:["bl-tl","tl-bl"])}else r.hideMenu()},hideMenu:function(){this.menu&&this.menu.hide()},bindStates:function(){var r=this;r.state.on("change:value",function(t){r.getEl("inp").value!==t.value&&(r.getEl("inp").value=t.value)}),r.state.on("change:disabled",function(t){r.getEl("inp").disabled=t.value}),r.state.on("change:statusLevel",function(t){var e=r.getEl("status"),n=r.classPrefix,i=t.value;Ht.css(e,"display","none"===i?"none":""),Ht.toggleClass(e,n+"i-checkmark","ok"===i),Ht.toggleClass(e,n+"i-warning","warn"===i),Ht.toggleClass(e,n+"i-error","error"===i),r.classes.toggle("has-status","none"!==i),r.repaint()}),Ht.on(r.getEl("status"),"mouseleave",function(){r.tooltip().hide()}),r.on("cancel",function(t){r.menu&&r.menu.visible()&&(t.stopPropagation(),r.hideMenu())});var n=function(t,e){e&&0<e.items().length&&e.items().eq(t)[0].focus()};return r.on("keydown",function(t){var e=t.keyCode;"INPUT"===t.target.nodeName&&(e===An.DOWN?(t.preventDefault(),r.fire("autocomplete"),n(0,r.menu)):e===An.UP&&(t.preventDefault(),n(-1,r.menu)))}),r._super()},remove:function(){Tt(this.getEl("inp")).off(),this.menu&&this.menu.remove(),this._super()}}),Ln=Bn.extend({init:function(t){var e=this;t.spellcheck=!1,t.onaction&&(t.icon="none"),e._super(t),e.classes.add("colorbox"),e.on("change keyup postrender",function(){e.repaintColor(e.value())})},repaintColor:function(t){var e=this.getEl("open"),n=e?e.getElementsByTagName("i")[0]:null;if(n)try{n.style.background=t}catch(i){}},bindStates:function(){var e=this;return e.state.on("change:value",function(t){e.state.get("rendered")&&e.repaintColor(t.value)}),e._super()}}),In=On.extend({showPanel:function(){var e=this,t=e.settings;if(e.classes.add("opened"),e.panel)e.panel.show();else{var n=t.panel;n.type&&(n={layout:"grid",items:n}),n.role=n.role||"dialog",n.popover=!0,n.autohide=!0,n.ariaRoot=!0,e.panel=new ze(n).on("hide",function(){e.classes.remove("opened")}).on("cancel",function(t){t.stopPropagation(),e.focus(),e.hidePanel()}).parent(e).renderTo(e.getContainerElm()),e.panel.fire("show"),e.panel.reflow()}var i=e.panel.testMoveRel(e.getEl(),t.popoverAlign||(e.isRtl()?["bc-tc","bc-tl","bc-tr"]:["bc-tc","bc-tr","bc-tl","tc-bc","tc-br","tc-bl"]));e.panel.classes.toggle("start","l"===i.substr(-1)),e.panel.classes.toggle("end","r"===i.substr(-1));var r="t"===i.substr(0,1);e.panel.classes.toggle("bottom",!r),e.panel.classes.toggle("top",r),e.panel.moveRel(e.getEl(),i)},hidePanel:function(){this.panel&&this.panel.hide()},postRender:function(){var e=this;return e.aria("haspopup",!0),e.on("click",function(t){t.control===e&&(e.panel&&e.panel.visible()?e.hidePanel():(e.showPanel(),e.panel.focus(!!t.aria)))}),e._super()},remove:function(){return this.panel&&(this.panel.remove(),this.panel=null),this._super()}}),zn=v.DOM,Fn=In.extend({init:function(t){this._super(t),this.classes.add("splitbtn"),this.classes.add("colorbutton")},color:function(t){return t?(this._color=t,this.getEl("preview").style.backgroundColor=t,this):this._color},resetColor:function(){return this._color=null,this.getEl("preview").style.backgroundColor=null,this},renderHtml:function(){var t=this,e=t._id,n=t.classPrefix,i=t.state.get("text"),r=t.settings.icon?n+"ico "+n+"i-"+t.settings.icon:"",o=t.settings.image?" style=\"background-image: url('"+t.settings.image+"')\"":"",s="";return i&&(t.classes.add("btn-has-text"),s='<span class="'+n+'txt">'+t.encode(i)+"</span>"),'<div id="'+e+'" class="'+t.classes+'" role="button" tabindex="-1" aria-haspopup="true"><button role="presentation" hidefocus="1" type="button" tabindex="-1">'+(r?'<i class="'+r+'"'+o+"></i>":"")+'<span id="'+e+'-preview" class="'+n+'preview"></span>'+s+'</button><button type="button" class="'+n+'open" hidefocus="1" tabindex="-1"> <i class="'+n+'caret"></i></button></div>'},postRender:function(){var e=this,n=e.settings.onclick;return e.on("click",function(t){t.aria&&"down"===t.aria.key||t.control!==e||zn.getParent(t.target,"."+e.classPrefix+"open")||(t.stopImmediatePropagation(),n.call(e,t))}),delete e.settings.onclick,e._super()}}),Un=tinymce.util.Tools.resolve("tinymce.util.Color"),Vn=ge.extend({Defaults:{classes:"widget colorpicker"},init:function(t){this._super(t)},postRender:function(){var n,i,r,o,s,a=this,l=a.color();function u(t,e){var n,i,r=Ht.getPos(t);return n=e.pageX-r.x,i=e.pageY-r.y,{x:n=Math.max(0,Math.min(n/t.clientWidth,1)),y:i=Math.max(0,Math.min(i/t.clientHeight,1))}}function c(t,e){var n=(360-t.h)/360;Ht.css(r,{top:100*n+"%"}),e||Ht.css(s,{left:t.s+"%",top:100-t.v+"%"}),o.style.background=Un({s:100,v:100,h:t.h}).toHex(),a.color().parse({s:t.s,v:t.v,h:t.h})}function t(t){var e;e=u(o,t),n.s=100*e.x,n.v=100*(1-e.y),c(n),a.fire("change")}function e(t){var e;e=u(i,t),(n=l.toHsv()).h=360*(1-e.y),c(n,!0),a.fire("change")}i=a.getEl("h"),r=a.getEl("hp"),o=a.getEl("sv"),s=a.getEl("svp"),a._repaint=function(){c(n=l.toHsv())},a._super(),a._svdraghelper=new we(a._id+"-sv",{start:t,drag:t}),a._hdraghelper=new we(a._id+"-h",{start:e,drag:e}),a._repaint()},rgb:function(){return this.color().toRgb()},value:function(t){if(!arguments.length)return this.color().toHex();this.color().parse(t),this._rendered&&this._repaint()},color:function(){return this._color||(this._color=Un()),this._color},renderHtml:function(){var t,e=this._id,o=this.classPrefix,s="#ff0000,#ff0080,#ff00ff,#8000ff,#0000ff,#0080ff,#00ffff,#00ff80,#00ff00,#80ff00,#ffff00,#ff8000,#ff0000";return t='<div id="'+e+'-h" class="'+o+'colorpicker-h" style="background: -ms-linear-gradient(top,'+s+");background: linear-gradient(to bottom,"+s+');">'+function(){var t,e,n,i,r="";for(n="filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=",t=0,e=(i=s.split(",")).length-1;t<e;t++)r+='<div class="'+o+'colorpicker-h-chunk" style="height:'+100/e+"%;"+n+i[t]+",endColorstr="+i[t+1]+");-ms-"+n+i[t]+",endColorstr="+i[t+1]+')"></div>';return r}()+'<div id="'+e+'-hp" class="'+o+'colorpicker-h-marker"></div></div>','<div id="'+e+'" class="'+this.classes+'"><div id="'+e+'-sv" class="'+o+'colorpicker-sv"><div class="'+o+'colorpicker-overlay1"><div class="'+o+'colorpicker-overlay2"><div id="'+e+'-svp" class="'+o+'colorpicker-selector1"><div class="'+o+'colorpicker-selector2"></div></div></div></div></div>'+t+"</div>"}}),qn=ge.extend({init:function(t){t=R.extend({height:100,text:"Drop an image here",multiple:!1,accept:null},t),this._super(t),this.classes.add("dropzone"),t.multiple&&this.classes.add("multiple")},renderHtml:function(){var t,e,n=this.settings;return t={id:this._id,hidefocus:"1"},e=Ht.create("div",t,"<span>"+this.translate(n.text)+"</span>"),n.height&&Ht.css(e,"height",n.height+"px"),n.width&&Ht.css(e,"width",n.width+"px"),e.className=this.classes,e.outerHTML},postRender:function(){var i=this,t=function(t){t.preventDefault(),i.classes.toggle("dragenter"),i.getEl().className=i.classes};i._super(),i.$el.on("dragover",function(t){t.preventDefault()}),i.$el.on("dragenter",t),i.$el.on("dragleave",t),i.$el.on("drop",function(t){if(t.preventDefault(),!i.state.get("disabled")){var e=function(t){var e=i.settings.accept;if("string"!=typeof e)return t;var n=new RegExp("("+e.split(/\s*,\s*/).join("|")+")$","i");return R.grep(t,function(t){return n.test(t.name)})}(t.dataTransfer.files);i.value=function(){return e.length?i.settings.multiple?e:e[0]:null},e.length&&i.fire("change",t)}})},remove:function(){this.$el.off(),this._super()}}),Yn=ge.extend({init:function(t){var n=this;t.delimiter||(t.delimiter="\xbb"),n._super(t),n.classes.add("path"),n.canFocus=!0,n.on("click",function(t){var e;(e=t.target.getAttribute("data-index"))&&n.fire("select",{value:n.row()[e],index:e})}),n.row(n.settings.row)},focus:function(){return this.getEl().firstChild.focus(),this},row:function(t){return arguments.length?(this.state.set("row",t),this):this.state.get("row")},renderHtml:function(){return'<div id="'+this._id+'" class="'+this.classes+'">'+this._getDataPathHtml(this.state.get("row"))+"</div>"},bindStates:function(){var e=this;return e.state.on("change:row",function(t){e.innerHtml(e._getDataPathHtml(t.value))}),e._super()},_getDataPathHtml:function(t){var e,n,i=t||[],r="",o=this.classPrefix;for(e=0,n=i.length;e<n;e++)r+=(0<e?'<div class="'+o+'divider" aria-hidden="true"> '+this.settings.delimiter+" </div>":"")+'<div role="button" class="'+o+"path-item"+(e===n-1?" "+o+"last":"")+'" data-index="'+e+'" tabindex="-1" id="'+this._id+"-"+e+'" aria-level="'+(e+1)+'">'+i[e].name+"</div>";return r||(r='<div class="'+o+'path-item">\xa0</div>'),r}}),$n=Yn.extend({postRender:function(){var o=this,s=o.settings.editor;function a(t){if(1===t.nodeType){if("BR"===t.nodeName||t.getAttribute("data-mce-bogus"))return!0;if("bookmark"===t.getAttribute("data-mce-type"))return!0}return!1}return!1!==s.settings.elementpath&&(o.on("select",function(t){s.focus(),s.selection.select(this.row()[t.index].element),s.nodeChanged()}),s.on("nodeChange",function(t){for(var e=[],n=t.parents,i=n.length;i--;)if(1===n[i].nodeType&&!a(n[i])){var r=s.fire("ResolveName",{name:n[i].nodeName.toLowerCase(),target:n[i]});if(r.isDefaultPrevented()||e.push({name:r.name,element:n[i]}),r.isPropagationStopped())break}o.row(e)})),o._super()}}),Xn=Me.extend({Defaults:{layout:"flex",align:"center",defaults:{flex:1}},renderHtml:function(){var t=this,e=t._layout,n=t.classPrefix;return t.classes.add("formitem"),e.preRender(t),'<div id="'+t._id+'" class="'+t.classes+'" hidefocus="1" tabindex="-1">'+(t.settings.title?'<div id="'+t._id+'-title" class="'+n+'title">'+t.settings.title+"</div>":"")+'<div id="'+t._id+'-body" class="'+t.bodyClasses+'">'+(t.settings.html||"")+e.renderHtml(t)+"</div></div>"}}),jn=Me.extend({Defaults:{containerCls:"form",layout:"flex",direction:"column",align:"stretch",flex:1,padding:15,labelGap:30,spacing:10,callbacks:{submit:function(){this.submit()}}},preRender:function(){var i=this,t=i.items();i.settings.formItemDefaults||(i.settings.formItemDefaults={layout:"flex",autoResize:"overflow",defaults:{flex:1}}),t.each(function(t){var e,n=t.settings.label;n&&((e=new Xn(R.extend({items:{type:"label",id:t._id+"-l",text:n,flex:0,forId:t._id,disabled:t.disabled()}},i.settings.formItemDefaults))).type="formitem",t.aria("labelledby",t._id+"-l"),"undefined"==typeof t.settings.flex&&(t.settings.flex=1),i.replace(t,e),e.add(t))})},submit:function(){return this.fire("submit",{data:this.toJSON()})},postRender:function(){this._super(),this.fromJSON(this.settings.data)},bindStates:function(){var n=this;function t(){var t,e,i=0,r=[];if(!1!==n.settings.labelGapCalc)for(("children"===n.settings.labelGapCalc?n.find("formitem"):n.items()).filter("formitem").each(function(t){var e=t.items()[0],n=e.getEl().clientWidth;i=i<n?n:i,r.push(e)}),e=n.settings.labelGap||0,t=r.length;t--;)r[t].settings.minWidth=i+e}n._super(),n.on("show",t),t()}}),Jn=jn.extend({Defaults:{containerCls:"fieldset",layout:"flex",direction:"column",align:"stretch",flex:1,padding:"25 15 5 15",labelGap:30,spacing:10,border:1},renderHtml:function(){var t=this,e=t._layout,n=t.classPrefix;return t.preRender(),e.preRender(t),'<fieldset id="'+t._id+'" class="'+t.classes+'" hidefocus="1" tabindex="-1">'+(t.settings.title?'<legend id="'+t._id+'-title" class="'+n+'fieldset-title">'+t.settings.title+"</legend>":"")+'<div id="'+t._id+'-body" class="'+t.bodyClasses+'">'+(t.settings.html||"")+e.renderHtml(t)+"</div></fieldset>"}}),Gn=0,Kn=function(t){if(null===t||t===undefined)throw new Error("Node cannot be null or undefined");return{dom:lt(t)}},Zn={fromHtml:function(t,e){var n=(e||_.document).createElement("div");if(n.innerHTML=t,!n.hasChildNodes()||1<n.childNodes.length)throw _.console.error("HTML does not have a single root node",t),new Error("HTML must have a single root node");return Kn(n.childNodes[0])},fromTag:function(t,e){var n=(e||_.document).createElement(t);return Kn(n)},fromText:function(t,e){var n=(e||_.document).createTextNode(t);return Kn(n)},fromDom:Kn,fromPoint:function(t,e,n){var i=t.dom();return mt.from(i.elementFromPoint(e,n)).map(Kn)}},Qn=(_.Node.ATTRIBUTE_NODE,_.Node.CDATA_SECTION_NODE,_.Node.COMMENT_NODE,_.Node.DOCUMENT_NODE),ti=(_.Node.DOCUMENT_TYPE_NODE,_.Node.DOCUMENT_FRAGMENT_NODE,_.Node.ELEMENT_NODE),ei=(_.Node.TEXT_NODE,_.Node.PROCESSING_INSTRUCTION_NODE,_.Node.ENTITY_REFERENCE_NODE,_.Node.ENTITY_NODE,_.Node.NOTATION_NODE,function(t,e){var n=function(t,e){for(var n=0;n<t.length;n++){var i=t[n];if(i.test(e))return i}return undefined}(t,e);if(!n)return{major:0,minor:0};var i=function(t){return Number(e.replace(n,"$"+t))};return ii(i(1),i(2))}),ni=function(){return ii(0,0)},ii=function(t,e){return{major:t,minor:e}},ri={nu:ii,detect:function(t,e){var n=String(e).toLowerCase();return 0===t.length?ni():ei(t,n)},unknown:ni},oi="Firefox",si=function(t,e){return function(){return e===t}},ai=function(t){var e=t.current;return{current:e,version:t.version,isEdge:si("Edge",e),isChrome:si("Chrome",e),isIE:si("IE",e),isOpera:si("Opera",e),isFirefox:si(oi,e),isSafari:si("Safari",e)}},li={unknown:function(){return ai({current:undefined,version:ri.unknown()})},nu:ai,edge:lt("Edge"),chrome:lt("Chrome"),ie:lt("IE"),opera:lt("Opera"),firefox:lt(oi),safari:lt("Safari")},ui="Windows",ci="Android",di="Solaris",fi="FreeBSD",hi=function(t,e){return function(){return e===t}},mi=function(t){var e=t.current;return{current:e,version:t.version,isWindows:hi(ui,e),isiOS:hi("iOS",e),isAndroid:hi(ci,e),isOSX:hi("OSX",e),isLinux:hi("Linux",e),isSolaris:hi(di,e),isFreeBSD:hi(fi,e)}},gi={unknown:function(){return mi({current:undefined,version:ri.unknown()})},nu:mi,windows:lt(ui),ios:lt("iOS"),android:lt(ci),linux:lt("Linux"),osx:lt("OSX"),solaris:lt(di),freebsd:lt(fi)},pi=function(t,e){var n=String(e).toLowerCase();return function(t,e){for(var n=0,i=t.length;n<i;n++){var r=t[n];if(e(r,n))return mt.some(r)}return mt.none()}(t,function(t){return t.search(n)})},vi=function(t,n){return pi(t,n).map(function(t){var e=ri.detect(t.versionRegexes,n);return{current:t.name,version:e}})},bi=function(t,n){return pi(t,n).map(function(t){var e=ri.detect(t.versionRegexes,n);return{current:t.name,version:e}})},yi=function(t,e){return-1!==t.indexOf(e)},xi=/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,wi=function(e){return function(t){return yi(t,e)}},_i=[{name:"Edge",versionRegexes:[/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],search:function(t){return yi(t,"edge/")&&yi(t,"chrome")&&yi(t,"safari")&&yi(t,"applewebkit")}},{name:"Chrome",versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/,xi],search:function(t){return yi(t,"chrome")&&!yi(t,"chromeframe")}},{name:"IE",versionRegexes:[/.*?msie\ ?([0-9]+)\.([0-9]+).*/,/.*?rv:([0-9]+)\.([0-9]+).*/],search:function(t){return yi(t,"msie")||yi(t,"trident")}},{name:"Opera",versionRegexes:[xi,/.*?opera\/([0-9]+)\.([0-9]+).*/],search:wi("opera")},{name:"Firefox",versionRegexes:[/.*?firefox\/\ ?([0-9]+)\.([0-9]+).*/],search:wi("firefox")},{name:"Safari",versionRegexes:[xi,/.*?cpu os ([0-9]+)_([0-9]+).*/],search:function(t){return(yi(t,"safari")||yi(t,"mobile/"))&&yi(t,"applewebkit")}}],Ri=[{name:"Windows",search:wi("win"),versionRegexes:[/.*?windows\ nt\ ?([0-9]+)\.([0-9]+).*/]},{name:"iOS",search:function(t){return yi(t,"iphone")||yi(t,"ipad")},versionRegexes:[/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,/.*cpu os ([0-9]+)_([0-9]+).*/,/.*cpu iphone os ([0-9]+)_([0-9]+).*/]},{name:"Android",search:wi("android"),versionRegexes:[/.*?android\ ?([0-9]+)\.([0-9]+).*/]},{name:"OSX",search:wi("os x"),versionRegexes:[/.*?os\ x\ ?([0-9]+)_([0-9]+).*/]},{name:"Linux",search:wi("linux"),versionRegexes:[]},{name:"Solaris",search:wi("sunos"),versionRegexes:[]},{name:"FreeBSD",search:wi("freebsd"),versionRegexes:[]}],Ci={browsers:lt(_i),oses:lt(Ri)},ki=function(t){var e,n,i,r,o,s,a,l,u,c,d,f=Ci.browsers(),h=Ci.oses(),m=vi(f,t).fold(li.unknown,li.nu),g=bi(h,t).fold(gi.unknown,gi.nu);return{browser:m,os:g,deviceType:(n=m,i=t,r=(e=g).isiOS()&&!0===/ipad/i.test(i),o=e.isiOS()&&!r,s=e.isAndroid()&&3===e.version.major,a=e.isAndroid()&&4===e.version.major,l=r||s||a&&!0===/mobile/i.test(i),u=e.isiOS()||e.isAndroid(),c=u&&!l,d=n.isSafari()&&e.isiOS()&&!1===/safari/i.test(i),{isiPad:lt(r),isiPhone:lt(o),isTablet:lt(l),isPhone:lt(c),isTouch:lt(u),isAndroid:e.isAndroid,isiOS:e.isiOS,isWebView:lt(d)})}},Ei=(Je=!(Xe=function(){var t=_.navigator.userAgent;return ki(t)}),function(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e];return Je||(Je=!0,je=Xe.apply(null,t)),je}),Hi=ti,Ti=Qn,Si=function(t){return t.nodeType!==Hi&&t.nodeType!==Ti||0===t.childElementCount},Mi=(Ei().browser.isIE(),function(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e]}("element","offset"),R.trim),Ni=function(e){return function(t){if(t&&1===t.nodeType){if(t.contentEditable===e)return!0;if(t.getAttribute("data-mce-contenteditable")===e)return!0}return!1}},Oi=Ni("true"),Wi=Ni("false"),Pi=function(t,e,n,i,r){return{type:t,title:e,url:n,level:i,attach:r}},Di=function(t){return t.innerText||t.textContent},Ai=function(t){return t.id?t.id:(e="h",n=(new Date).getTime(),e+"_"+Math.floor(1e9*Math.random())+ ++Gn+String(n));var e,n},Bi=function(t){return(e=t)&&"A"===e.nodeName&&(e.id||e.name)&&Ii(t);var e},Li=function(t){return t&&/^(H[1-6])$/.test(t.nodeName)},Ii=function(t){return function(t){for(;t=t.parentNode;){var e=t.contentEditable;if(e&&"inherit"!==e)return Oi(t)}return!1}(t)&&!Wi(t)},zi=function(t){return Li(t)&&Ii(t)},Fi=function(t){var e,n=Ai(t);return Pi("header",Di(t),"#"+n,Li(e=t)?parseInt(e.nodeName.substr(1),10):0,function(){t.id=n})},Ui=function(t){var e=t.id||t.name,n=Di(t);return Pi("anchor",n||"#"+e,"#"+e,0,at)},Vi=function(t){var e,n,i,r,o,s;return e="h1,h2,h3,h4,h5,h6,a:not([href])",n=t,Rt((Ei().browser.isIE(),function(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e]}("element","offset"),i=Zn.fromDom(n),r=e,s=(o=i)===undefined?_.document:o.dom(),Si(s)?[]:Rt(s.querySelectorAll(r),Zn.fromDom)),function(t){return t.dom()})},qi=function(t){return 0<Mi(t.title).length},Yi=function(t){var e,n=Vi(t);return kt((e=n,Rt(kt(e,zi),Fi)).concat(Rt(kt(n,Bi),Ui)),qi)},$i={},Xi=function(t){return{title:t.title,value:{title:{raw:t.title},url:t.url,attach:t.attach}}},ji=function(t,e){return{title:t,value:{title:t,url:e,attach:at}}},Ji=function(t,e,n){var i=e in t?t[e]:n;return!1===i?null:i},Gi=function(t,i,r,e){var n,o,s,a,l,u,c={title:"-"},d=function(t){var e=t.hasOwnProperty(r)?t[r]:[],n=kt(e,function(t){return e=t,!_t(i,function(t){return t.url===e});var e});return R.map(n,function(t){return{title:t,value:{title:t,url:t,attach:at}}})},f=function(e){var t,n=kt(i,function(t){return t.type===e});return t=n,R.map(t,Xi)};return!1===e.typeahead_urls?[]:"file"===r?(n=[Ki(t,d($i)),Ki(t,f("header")),Ki(t,(a=f("anchor"),l=Ji(e,"anchor_top","#top"),u=Ji(e,"anchor_bottom","#bottom"),null!==l&&a.unshift(ji("<top>",l)),null!==u&&a.push(ji("<bottom>",u)),a))],o=function(t,e){return 0===t.length||0===e.length?t.concat(e):t.concat(c,e)},s=[],Ct(n,function(t){s=o(s,t)}),s):Ki(t,d($i))},Ki=function(t,e){var n=t.toLowerCase(),i=R.grep(e,function(t){return-1!==t.title.toLowerCase().indexOf(n)});return 1===i.length&&i[0].title===t?[]:i},Zi=function(r,i,o,s){var e=function(t){var e=Yi(o),n=Gi(t,e,s,i);r.showAutoComplete(n,t)};r.on("autocomplete",function(){e(r.value())}),r.on("selectitem",function(t){var e=t.value;r.value(e.url);var n,i=(n=e.title).raw?n.raw:n;"image"===s?r.fire("change",{meta:{alt:i,attach:e.attach}}):r.fire("change",{meta:{text:i,attach:e.attach}}),r.focus()}),r.on("click",function(t){0===r.value().length&&"INPUT"===t.target.nodeName&&e("")}),r.on("PostRender",function(){r.getRoot().on("submit",function(t){var e,n,i;t.isDefaultPrevented()||(e=r.value(),i=$i[n=s],/^https?/.test(e)&&(i?wt(i,e).isNone()&&($i[n]=i.slice(0,5).concat(e)):$i[n]=[e]))})})},Qi=function(o,t,n){var i=t.filepicker_validator_handler;i&&o.state.on("change:value",function(t){var e;0!==(e=t.value).length?i({url:e,type:n},function(t){var e,n,i,r=(n=(e=t).status,i=e.message,"valid"===n?{status:"ok",message:i}:"unknown"===n?{status:"warn",message:i}:"invalid"===n?{status:"warn",message:i}:{status:"none",message:""});o.statusMessage(r.message),o.statusLevel(r.status)}):o.statusLevel("none")})},tr=Bn.extend({Statics:{clearHistory:function(){$i={}}},init:function(t){var e,n,i,r=this,o=window.tinymce?window.tinymce.activeEditor:M.activeEditor,s=o.settings,a=t.filetype;t.spellcheck=!1,(i=s.file_picker_types||s.file_browser_callback_types)&&(i=R.makeMap(i,/[, ]/)),i&&!i[a]||(!(n=s.file_picker_callback)||i&&!i[a]?!(n=s.file_browser_callback)||i&&!i[a]||(e=function(){n(r.getEl("inp").id,r.value(),a,window)}):e=function(){var t=r.fire("beforecall").meta;t=R.extend({filetype:a},t),n.call(o,function(t,e){r.value(t).fire("change",{meta:e})},r.value(),t)}),e&&(t.icon="browse",t.onaction=e),r._super(t),r.classes.add("filepicker"),Zi(r,s,o.getBody(),a),Qi(r,s,a)}}),er=Nn.extend({recalc:function(t){var e=t.layoutRect(),n=t.paddingBox;t.items().filter(":visible").each(function(t){t.layoutRect({x:n.left,y:n.top,w:e.innerW-n.right-n.left,h:e.innerH-n.top-n.bottom}),t.recalc&&t.recalc()})}}),nr=Nn.extend({recalc:function(t){var e,n,i,r,o,s,a,l,u,c,d,f,h,m,g,p,v,b,y,x,w,_,R,C,k,E,H,T,S,M,N,O,W,P,D,A,B,L=[],I=Math.max,z=Math.min;for(i=t.items().filter(":visible"),r=t.layoutRect(),o=t.paddingBox,s=t.settings,f=t.isRtl()?s.direction||"row-reversed":s.direction,a=s.align,l=t.isRtl()?s.pack||"end":s.pack,u=s.spacing||0,"row-reversed"!==f&&"column-reverse"!==f||(i=i.set(i.toArray().reverse()),f=f.split("-")[0]),"column"===f?(C="y",_="h",R="minH",k="maxH",H="innerH",E="top",T="deltaH",S="contentH",P="left",O="w",M="x",N="innerW",W="minW",D="right",A="deltaW",B="contentW"):(C="x",_="w",R="minW",k="maxW",H="innerW",E="left",T="deltaW",S="contentW",P="top",O="h",M="y",N="innerH",W="minH",D="bottom",A="deltaH",B="contentH"),d=r[H]-o[E]-o[E],w=c=0,e=0,n=i.length;e<n;e++)m=(h=i[e]).layoutRect(),d-=e<n-1?u:0,0<(g=h.settings.flex)&&(c+=g,m[k]&&L.push(h),m.flex=g),d-=m[R],w<(p=o[P]+m[W]+o[D])&&(w=p);if((y={})[R]=d<0?r[R]-d+r[T]:r[H]-d+r[T],y[W]=w+r[A],y[S]=r[H]-d,y[B]=w,y.minW=z(y.minW,r.maxW),y.minH=z(y.minH,r.maxH),y.minW=I(y.minW,r.startMinWidth),y.minH=I(y.minH,r.startMinHeight),!r.autoResize||y.minW===r.minW&&y.minH===r.minH){for(b=d/c,e=0,n=L.length;e<n;e++)(v=(m=(h=L[e]).layoutRect())[k])<(p=m[R]+m.flex*b)?(d-=m[k]-m[R],c-=m.flex,m.flex=0,m.maxFlexSize=v):m.maxFlexSize=0;for(b=d/c,x=o[E],y={},0===c&&("end"===l?x=d+o[E]:"center"===l?(x=Math.round(r[H]/2-(r[H]-d)/2)+o[E])<0&&(x=o[E]):"justify"===l&&(x=o[E],u=Math.floor(d/(i.length-1)))),y[M]=o[P],e=0,n=i.length;e<n;e++)p=(m=(h=i[e]).layoutRect()).maxFlexSize||m[R],"center"===a?y[M]=Math.round(r[N]/2-m[O]/2):"stretch"===a?(y[O]=I(m[W]||0,r[N]-o[P]-o[D]),y[M]=o[P]):"end"===a&&(y[M]=r[N]-m[O]-o.top),0<m.flex&&(p+=m.flex*b),y[_]=p,y[C]=x,h.layoutRect(y),h.recalc&&h.recalc(),x+=p+u}else if(y.w=y.minW,y.h=y.minH,t.layoutRect(y),this.recalc(t),null===t._lastRect){var F=t.parent();F&&(F._lastRect=null,F.recalc())}}}),ir=Mn.extend({Defaults:{containerClass:"flow-layout",controlClass:"flow-layout-item",endClass:"break"},recalc:function(t){t.items().filter(":visible").each(function(t){t.recalc&&t.recalc()})},isNative:function(){return!0}}),rr=function(t,e){return n=e,r=(i=t)===undefined?_.document:i.dom(),Si(r)?mt.none():mt.from(r.querySelector(n)).map(Zn.fromDom);var n,i,r},or=function(t,e){return function(){t.execCommand("mceToggleFormat",!1,e)}},sr=function(t,e,n){var i=function(t){n(t,e)};t.formatter?t.formatter.formatChanged(e,i):t.on("init",function(){t.formatter.formatChanged(e,i)})},ar=function(t,n){return function(e){sr(t,n,function(t){e.control.active(t)})}},lr=function(i){var e=["alignleft","aligncenter","alignright","alignjustify"],r="alignleft",t=[{text:"Left",icon:"alignleft",onclick:or(i,"alignleft")},{text:"Center",icon:"aligncenter",onclick:or(i,"aligncenter")},{text:"Right",icon:"alignright",onclick:or(i,"alignright")},{text:"Justify",icon:"alignjustify",onclick:or(i,"alignjustify")}];i.addMenuItem("align",{text:"Align",menu:t}),i.addButton("align",{type:"menubutton",icon:r,menu:t,onShowMenu:function(t){var n=t.control.menu;R.each(e,function(e,t){n.items().eq(t).each(function(t){return t.active(i.formatter.match(e))})})},onPostRender:function(t){var n=t.control;R.each(e,function(e,t){sr(i,e,function(t){n.icon(r),t&&n.icon(e)})})}}),R.each({alignleft:["Align left","JustifyLeft"],aligncenter:["Align center","JustifyCenter"],alignright:["Align right","JustifyRight"],alignjustify:["Justify","JustifyFull"],alignnone:["No alignment","JustifyNone"]},function(t,e){i.addButton(e,{active:!1,tooltip:t[0],cmd:t[1],onPostRender:ar(i,e)})})},ur=function(t){return t?t.split(",")[0]:""},cr=function(l,u){return function(){var a=this;a.state.set("value",null),l.on("init nodeChange",function(t){var e,n,i,r,o=l.queryCommandValue("FontName"),s=(e=u,r=(n=o)?n.toLowerCase():"",R.each(e,function(t){t.value.toLowerCase()===r&&(i=t.value)}),R.each(e,function(t){i||ur(t.value).toLowerCase()!==ur(r).toLowerCase()||(i=t.value)}),i);a.value(s||null),!s&&o&&a.text(ur(o))})}},dr=function(n){n.addButton("fontselect",function(){var t,e=(t=function(t){for(var e=(t=t.replace(/;$/,"").split(";")).length;e--;)t[e]=t[e].split("=");return t}(n.settings.font_formats||"Andale Mono=andale mono,monospace;Arial=arial,helvetica,sans-serif;Arial Black=arial black,sans-serif;Book Antiqua=book antiqua,palatino,serif;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,palatino,serif;Helvetica=helvetica,arial,sans-serif;Impact=impact,sans-serif;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco,monospace;Times New Roman=times new roman,times,serif;Trebuchet MS=trebuchet ms,geneva,sans-serif;Verdana=verdana,geneva,sans-serif;Webdings=webdings;Wingdings=wingdings,zapf dingbats"),R.map(t,function(t){return{text:{raw:t[0]},value:t[1],textStyle:-1===t[1].indexOf("dings")?"font-family:"+t[1]:""}}));return{type:"listbox",text:"Font Family",tooltip:"Font Family",values:e,fixedWidth:!0,onPostRender:cr(n,e),onselect:function(t){t.control.settings.value&&n.execCommand("FontName",!1,t.control.settings.value)}}})},fr=function(t){dr(t)},hr=function(t,e){return/[0-9.]+px$/.test(t)?(n=72*parseInt(t,10)/96,i=e||0,r=Math.pow(10,i),Math.round(n*r)/r+"pt"):t;var n,i,r},mr=function(t,e,n){var i;return R.each(t,function(t){t.value===n?i=n:t.value===e&&(i=e)}),i},gr=function(n){n.addButton("fontsizeselect",function(){var t,s,a,e=(t=n.settings.fontsize_formats||"8pt 10pt 12pt 14pt 18pt 24pt 36pt",R.map(t.split(" "),function(t){var e=t,n=t,i=t.split("=");return 1<i.length&&(e=i[0],n=i[1]),{text:e,value:n}}));return{type:"listbox",text:"Font Sizes",tooltip:"Font Sizes",values:e,fixedWidth:!0,onPostRender:(s=n,a=e,function(){var o=this;s.on("init nodeChange",function(t){var e,n,i,r;if(e=s.queryCommandValue("FontSize"))for(i=3;!r&&0<=i;i--)n=hr(e,i),r=mr(a,n,e);o.value(r||null),r||o.text(n)})}),onclick:function(t){t.control.settings.value&&n.execCommand("FontSize",!1,t.control.settings.value)}}})},pr=function(t){gr(t)},vr=function(n,t){var i=t.length;return R.each(t,function(t){t.menu&&(t.hidden=0===vr(n,t.menu));var e=t.format;e&&(t.hidden=!n.formatter.canApply(e)),t.hidden&&i--}),i},br=function(n,t){var i=t.items().length;return t.items().each(function(t){t.menu&&t.visible(0<br(n,t.menu)),!t.menu&&t.settings.menu&&t.visible(0<vr(n,t.settings.menu));var e=t.settings.format;e&&t.visible(n.formatter.canApply(e)),t.visible()||i--}),i},yr=function(t){var i,r,o,e,s,n,a,l,u=(r=0,o=[],e=[{title:"Headings",items:[{title:"Heading 1",format:"h1"},{title:"Heading 2",format:"h2"},{title:"Heading 3",format:"h3"},{title:"Heading 4",format:"h4"},{title:"Heading 5",format:"h5"},{title:"Heading 6",format:"h6"}]},{title:"Inline",items:[{title:"Bold",icon:"bold",format:"bold"},{title:"Italic",icon:"italic",format:"italic"},{title:"Underline",icon:"underline",format:"underline"},{title:"Strikethrough",icon:"strikethrough",format:"strikethrough"},{title:"Superscript",icon:"superscript",format:"superscript"},{title:"Subscript",icon:"subscript",format:"subscript"},{title:"Code",icon:"code",format:"code"}]},{title:"Blocks",items:[{title:"Paragraph",format:"p"},{title:"Blockquote",format:"blockquote"},{title:"Div",format:"div"},{title:"Pre",format:"pre"}]},{title:"Alignment",items:[{title:"Left",icon:"alignleft",format:"alignleft"},{title:"Center",icon:"aligncenter",format:"aligncenter"},{title:"Right",icon:"alignright",format:"alignright"},{title:"Justify",icon:"alignjustify",format:"alignjustify"}]}],s=function(t){var i=[];if(t)return R.each(t,function(t){var e={text:t.title,icon:t.icon};if(t.items)e.menu=s(t.items);else{var n=t.format||"custom"+r++;t.format||(t.name=n,o.push(t)),e.format=n,e.cmd=t.cmd}i.push(e)}),i},(i=t).on("init",function(){R.each(o,function(t){i.formatter.register(t.name,t)})}),{type:"menu",items:i.settings.style_formats_merge?i.settings.style_formats?s(e.concat(i.settings.style_formats)):s(e):s(i.settings.style_formats||e),onPostRender:function(t){i.fire("renderFormatsMenu",{control:t.control})},itemDefaults:{preview:!0,textStyle:function(){if(this.settings.format)return i.formatter.getCssText(this.settings.format)},onPostRender:function(){var n=this;n.parent().on("show",function(){var t,e;(t=n.settings.format)&&(n.disabled(!i.formatter.canApply(t)),n.active(i.formatter.match(t))),(e=n.settings.cmd)&&n.active(i.queryCommandState(e))})},onclick:function(){this.settings.format&&or(i,this.settings.format)(),this.settings.cmd&&i.execCommand(this.settings.cmd)}}});n=u,t.addMenuItem("formats",{text:"Formats",menu:n}),l=u,(a=t).addButton("styleselect",{type:"menubutton",text:"Formats",menu:l,onShowMenu:function(){a.settings.style_formats_autohide&&br(a,this.menu)}})},xr=function(n,t){return function(){var r,o,s,e=[];return R.each(t,function(t){e.push({text:t[0],value:t[1],textStyle:function(){return n.formatter.getCssText(t[1])}})}),{type:"listbox",text:t[0][0],values:e,fixedWidth:!0,onselect:function(t){if(t.control){var e=t.control.value();or(n,e)()}},onPostRender:(r=n,o=e,function(){var e=this;r.on("nodeChange",function(t){var n=r.formatter,i=null;R.each(t.parents,function(e){if(R.each(o,function(t){if(s?n.matchNode(e,s,{value:t.value})&&(i=t.value):n.matchNode(e,t.value)&&(i=t.value),i)return!1}),i)return!1}),e.value(i)})})}}},wr=function(t){var e,n,i=function(t){for(var e=(t=t.replace(/;$/,"").split(";")).length;e--;)t[e]=t[e].split("=");return t}(t.settings.block_formats||"Paragraph=p;Heading 1=h1;Heading 2=h2;Heading 3=h3;Heading 4=h4;Heading 5=h5;Heading 6=h6;Preformatted=pre");t.addMenuItem("blockformats",{text:"Blocks",menu:(e=t,n=i,R.map(n,function(t){return{text:t[0],onclick:or(e,t[1]),textStyle:function(){return e.formatter.getCssText(t[1])}}}))}),t.addButton("formatselect",xr(t,i))},_r=function(e,t){var n,i;if("string"==typeof t)i=t.split(" ");else if(R.isArray(t))return function(t){for(var e=[],n=0,i=t.length;n<i;++n){if(!pt(t[n]))throw new Error("Arr.flatten item "+n+" was not an array, input: "+t);xt.apply(e,t[n])}return e}(R.map(t,function(t){return _r(e,t)}));return n=R.grep(i,function(t){return"|"===t||t in e.menuItems}),R.map(n,function(t){return"|"===t?{text:"-"}:e.menuItems[t]})},Rr=function(t){return t&&"-"===t.text},Cr=function(n){var i=kt(n,function(t,e){return!Rr(t)||!Rr(n[e-1])});return kt(i,function(t,e){return!Rr(t)||0<e&&e<i.length-1})},kr=function(t){var e,n,i,r,o=t.settings.insert_button_items;return Cr(o?_r(t,o):(e=t,n="insert",i=[{text:"-"}],r=R.grep(e.menuItems,function(t){return t.context===n}),R.each(r,function(t){"before"===t.separator&&i.push({text:"|"}),t.prependToContext?i.unshift(t):i.push(t),"after"===t.separator&&i.push({text:"|"})}),i))},Er=function(t){var e;(e=t).addButton("insert",{type:"menubutton",icon:"insert",menu:[],oncreatemenu:function(){this.menu.add(kr(e)),this.menu.renderNew()}})},Hr=function(t){var n,i,r;n=t,R.each({bold:"Bold",italic:"Italic",underline:"Underline",strikethrough:"Strikethrough",subscript:"Subscript",superscript:"Superscript"},function(t,e){n.addButton(e,{active:!1,tooltip:t,onPostRender:ar(n,e),onclick:or(n,e)})}),i=t,R.each({outdent:["Decrease indent","Outdent"],indent:["Increase indent","Indent"],cut:["Cut","Cut"],copy:["Copy","Copy"],paste:["Paste","Paste"],help:["Help","mceHelp"],selectall:["Select all","SelectAll"],visualaid:["Visual aids","mceToggleVisualAid"],newdocument:["New document","mceNewDocument"],removeformat:["Clear formatting","RemoveFormat"],remove:["Remove","Delete"]},function(t,e){i.addButton(e,{tooltip:t[0],cmd:t[1]})}),r=t,R.each({blockquote:["Blockquote","mceBlockQuote"],subscript:["Subscript","Subscript"],superscript:["Superscript","Superscript"]},function(t,e){r.addButton(e,{active:!1,tooltip:t[0],cmd:t[1],onPostRender:ar(r,e)})})},Tr=function(t){var n;Hr(t),n=t,R.each({bold:["Bold","Bold","Meta+B"],italic:["Italic","Italic","Meta+I"],underline:["Underline","Underline","Meta+U"],strikethrough:["Strikethrough","Strikethrough"],subscript:["Subscript","Subscript"],superscript:["Superscript","Superscript"],removeformat:["Clear formatting","RemoveFormat"],newdocument:["New document","mceNewDocument"],cut:["Cut","Cut","Meta+X"],copy:["Copy","Copy","Meta+C"],paste:["Paste","Paste","Meta+V"],selectall:["Select all","SelectAll","Meta+A"]},function(t,e){n.addMenuItem(e,{text:t[0],icon:e,shortcut:t[2],cmd:t[1]})}),n.addMenuItem("codeformat",{text:"Code",icon:"code",onclick:or(n,"code")})},Sr=function(n,i){return function(){var t=this,e=function(){var t="redo"===i?"hasRedo":"hasUndo";return!!n.undoManager&&n.undoManager[t]()};t.disabled(!e()),n.on("Undo Redo AddUndo TypingUndo ClearUndos SwitchMode",function(){t.disabled(n.readonly||!e())})}},Mr=function(t){var e,n;(e=t).addMenuItem("undo",{text:"Undo",icon:"undo",shortcut:"Meta+Z",onPostRender:Sr(e,"undo"),cmd:"undo"}),e.addMenuItem("redo",{text:"Redo",icon:"redo",shortcut:"Meta+Y",onPostRender:Sr(e,"redo"),cmd:"redo"}),(n=t).addButton("undo",{tooltip:"Undo",onPostRender:Sr(n,"undo"),cmd:"undo"}),n.addButton("redo",{tooltip:"Redo",onPostRender:Sr(n,"redo"),cmd:"redo"})},Nr=function(t){var e,n;(e=t).addMenuItem("visualaid",{text:"Visual aids",selectable:!0,onPostRender:(n=e,function(){var e=this;n.on("VisualAid",function(t){e.active(t.hasVisual)}),e.active(n.hasVisual)}),cmd:"mceToggleVisualAid"})},Or={setup:function(t){var e;t.rtl&&(ae.rtl=!0),t.on("mousedown progressstate",function(){ze.hideAll()}),(e=t).settings.ui_container&&(h.container=rr(Zn.fromDom(_.document.body),e.settings.ui_container).fold(lt(null),function(t){return t.dom()})),ge.tooltips=!h.iOS,ae.translate=function(t){return M.translate(t)},wr(t),lr(t),Tr(t),Mr(t),pr(t),fr(t),yr(t),Nr(t),Er(t)}},Wr=Nn.extend({recalc:function(t){var e,n,i,r,o,s,a,l,u,c,d,f,h,m,g,p,v,b,y,x,w,_,R,C,k,E,H,T,S=[],M=[];e=t.settings,r=t.items().filter(":visible"),o=t.layoutRect(),i=e.columns||Math.ceil(Math.sqrt(r.length)),n=Math.ceil(r.length/i),b=e.spacingH||e.spacing||0,y=e.spacingV||e.spacing||0,x=e.alignH||e.align,w=e.alignV||e.align,p=t.paddingBox,T="reverseRows"in e?e.reverseRows:t.isRtl(),x&&"string"==typeof x&&(x=[x]),w&&"string"==typeof w&&(w=[w]);for(d=0;d<i;d++)S.push(0);for(f=0;f<n;f++)M.push(0);for(f=0;f<n;f++)for(d=0;d<i&&(c=r[f*i+d]);d++)C=(u=c.layoutRect()).minW,k=u.minH,S[d]=C>S[d]?C:S[d],M[f]=k>M[f]?k:M[f];for(E=o.innerW-p.left-p.right,d=_=0;d<i;d++)_+=S[d]+(0<d?b:0),E-=(0<d?b:0)+S[d];for(H=o.innerH-p.top-p.bottom,f=R=0;f<n;f++)R+=M[f]+(0<f?y:0),H-=(0<f?y:0)+M[f];if(_+=p.left+p.right,R+=p.top+p.bottom,(l={}).minW=_+(o.w-o.innerW),l.minH=R+(o.h-o.innerH),l.contentW=l.minW-o.deltaW,l.contentH=l.minH-o.deltaH,l.minW=Math.min(l.minW,o.maxW),l.minH=Math.min(l.minH,o.maxH),l.minW=Math.max(l.minW,o.startMinWidth),l.minH=Math.max(l.minH,o.startMinHeight),!o.autoResize||l.minW===o.minW&&l.minH===o.minH){var N;o.autoResize&&((l=t.layoutRect(l)).contentW=l.minW-o.deltaW,l.contentH=l.minH-o.deltaH),N="start"===e.packV?0:0<H?Math.floor(H/n):0;var O=0,W=e.flexWidths;if(W)for(d=0;d<W.length;d++)O+=W[d];else O=i;var P=E/O;for(d=0;d<i;d++)S[d]+=W?W[d]*P:P;for(m=p.top,f=0;f<n;f++){for(h=p.left,a=M[f]+N,d=0;d<i&&(c=r[T?f*i+i-1-d:f*i+d]);d++)g=c.settings,u=c.layoutRect(),s=Math.max(S[d],u.startMinWidth),u.x=h,u.y=m,"center"===(v=g.alignH||(x?x[d]||x[0]:null))?u.x=h+s/2-u.w/2:"right"===v?u.x=h+s-u.w:"stretch"===v&&(u.w=s),"center"===(v=g.alignV||(w?w[d]||w[0]:null))?u.y=m+a/2-u.h/2:"bottom"===v?u.y=m+a-u.h:"stretch"===v&&(u.h=a),c.layoutRect(u),h+=s+b,c.recalc&&c.recalc();m+=a+y}}else if(l.w=l.minW,l.h=l.minH,t.layoutRect(l),this.recalc(t),null===t._lastRect){var D=t.parent();D&&(D._lastRect=null,D.recalc())}}}),Pr=ge.extend({renderHtml:function(){var t=this;return t.classes.add("iframe"),t.canFocus=!1,'<iframe id="'+t._id+'" class="'+t.classes+'" tabindex="-1" src="'+(t.settings.url||"javascript:''")+'" frameborder="0"></iframe>'},src:function(t){this.getEl().src=t},html:function(t,e){var n=this,i=this.getEl().contentWindow.document.body;return i?(i.innerHTML=t,e&&e()):c.setTimeout(function(){n.html(t)}),this}}),Dr=ge.extend({init:function(t){this._super(t),this.classes.add("widget").add("infobox"),this.canFocus=!1},severity:function(t){this.classes.remove("error"),this.classes.remove("warning"),this.classes.remove("success"),this.classes.add(t)},help:function(t){this.state.set("help",t)},renderHtml:function(){var t=this,e=t.classPrefix;return'<div id="'+t._id+'" class="'+t.classes+'"><div id="'+t._id+'-body">'+t.encode(t.state.get("text"))+'<button role="button" tabindex="-1"><i class="'+e+"ico "+e+'i-help"></i></button></div></div>'},bindStates:function(){var e=this;return e.state.on("change:text",function(t){e.getEl("body").firstChild.data=e.encode(t.value),e.state.get("rendered")&&e.updateLayoutRect()}),e.state.on("change:help",function(t){e.classes.toggle("has-help",t.value),e.state.get("rendered")&&e.updateLayoutRect()}),e._super()}}),Ar=ge.extend({init:function(t){var e=this;e._super(t),e.classes.add("widget").add("label"),e.canFocus=!1,t.multiline&&e.classes.add("autoscroll"),t.strong&&e.classes.add("strong")},initLayoutRect:function(){var t=this,e=t._super();return t.settings.multiline&&(Ht.getSize(t.getEl()).width>e.maxW&&(e.minW=e.maxW,t.classes.add("multiline")),t.getEl().style.width=e.minW+"px",e.startMinH=e.h=e.minH=Math.min(e.maxH,Ht.getSize(t.getEl()).height)),e},repaint:function(){return this.settings.multiline||(this.getEl().style.lineHeight=this.layoutRect().h+"px"),this._super()},severity:function(t){this.classes.remove("error"),this.classes.remove("warning"),this.classes.remove("success"),this.classes.add(t)},renderHtml:function(){var t,e,n=this,i=n.settings.forId,r=n.settings.html?n.settings.html:n.encode(n.state.get("text"));return!i&&(e=n.settings.forName)&&(t=n.getRoot().find("#"+e)[0])&&(i=t._id),i?'<label id="'+n._id+'" class="'+n.classes+'"'+(i?' for="'+i+'"':"")+">"+r+"</label>":'<span id="'+n._id+'" class="'+n.classes+'">'+r+"</span>"},bindStates:function(){var e=this;return e.state.on("change:text",function(t){e.innerHtml(e.encode(t.value)),e.state.get("rendered")&&e.updateLayoutRect()}),e._super()}}),Br=Me.extend({Defaults:{role:"toolbar",layout:"flow"},init:function(t){this._super(t),this.classes.add("toolbar")},postRender:function(){return this.items().each(function(t){t.classes.add("toolbar-item")}),this._super()}}),Lr=Br.extend({Defaults:{role:"menubar",containerCls:"menubar",ariaRoot:!0,defaults:{type:"menubutton"}}}),Ir=On.extend({init:function(t){var e=this;e._renderOpen=!0,e._super(t),t=e.settings,e.classes.add("menubtn"),t.fixedWidth&&e.classes.add("fixed-width"),e.aria("haspopup",!0),e.state.set("menu",t.menu||e.render())},showMenu:function(t){var e,n=this;if(n.menu&&n.menu.visible()&&!1!==t)return n.hideMenu();n.menu||(e=n.state.get("menu")||[],n.classes.add("opened"),e.length?e={type:"menu",animate:!0,items:e}:(e.type=e.type||"menu",e.animate=!0),e.renderTo?n.menu=e.parent(n).show().renderTo():n.menu=_e.create(e).parent(n).renderTo(),n.fire("createmenu"),n.menu.reflow(),n.menu.on("cancel",function(t){t.control.parent()===n.menu&&(t.stopPropagation(),n.focus(),n.hideMenu())}),n.menu.on("select",function(){n.focus()}),n.menu.on("show hide",function(t){"hide"===t.type&&t.control.parent()===n&&n.classes.remove("opened-under"),t.control===n.menu&&(n.activeMenu("show"===t.type),n.classes.toggle("opened","show"===t.type)),n.aria("expanded","show"===t.type)}).fire("show")),n.menu.show(),n.menu.layoutRect({w:n.layoutRect().w}),n.menu.repaint(),n.menu.moveRel(n.getEl(),n.isRtl()?["br-tr","tr-br"]:["bl-tl","tl-bl"]);var i=n.menu.layoutRect(),r=n.$el.offset().top+n.layoutRect().h;r>i.y&&r<i.y+i.h&&n.classes.add("opened-under"),n.fire("showmenu")},hideMenu:function(){this.menu&&(this.menu.items().each(function(t){t.hideMenu&&t.hideMenu()}),this.menu.hide())},activeMenu:function(t){this.classes.toggle("active",t)},renderHtml:function(){var t,e=this,n=e._id,i=e.classPrefix,r=e.settings.icon,o=e.state.get("text"),s="";return(t=e.settings.image)?(r="none","string"!=typeof t&&(t=_.window.getSelection?t[0]:t[1]),t=" style=\"background-image: url('"+t+"')\""):t="",o&&(e.classes.add("btn-has-text"),s='<span class="'+i+'txt">'+e.encode(o)+"</span>"),r=e.settings.icon?i+"ico "+i+"i-"+r:"",e.aria("role",e.parent()instanceof Lr?"menuitem":"button"),'<div id="'+n+'" class="'+e.classes+'" tabindex="-1" aria-labelledby="'+n+'"><button id="'+n+'-open" role="presentation" type="button" tabindex="-1">'+(r?'<i class="'+r+'"'+t+"></i>":"")+s+' <i class="'+i+'caret"></i></button></div>'},postRender:function(){var r=this;return r.on("click",function(t){t.control===r&&function(t,e){for(;t;){if(e===t)return!0;t=t.parentNode}return!1}(t.target,r.getEl())&&(r.focus(),r.showMenu(!t.aria),t.aria&&r.menu.items().filter(":visible")[0].focus())}),r.on("mouseenter",function(t){var e,n=t.control,i=r.parent();n&&i&&n instanceof Ir&&n.parent()===i&&(i.items().filter("MenuButton").each(function(t){t.hideMenu&&t!==n&&(t.menu&&t.menu.visible()&&(e=!0),t.hideMenu())}),e&&(n.focus(),n.showMenu()))}),r._super()},bindStates:function(){var t=this;return t.state.on("change:menu",function(){t.menu&&t.menu.remove(),t.menu=null}),t._super()},remove:function(){this._super(),this.menu&&this.menu.remove()}});function zr(i,r){var o,s,a=this,l=ae.classPrefix;a.show=function(t,e){function n(){o&&(Tt(i).append('<div class="'+l+"throbber"+(r?" "+l+"throbber-inline":"")+'"></div>'),e&&e())}return a.hide(),o=!0,t?s=c.setTimeout(n,t):n(),a},a.hide=function(){var t=i.lastChild;return c.clearTimeout(s),t&&-1!==t.className.indexOf("throbber")&&t.parentNode.removeChild(t),o=!1,a}}var Fr=ze.extend({Defaults:{defaultType:"menuitem",border:1,layout:"stack",role:"application",bodyRole:"menu",ariaRoot:!0},init:function(t){if(t.autohide=!0,t.constrainToViewport=!0,"function"==typeof t.items&&(t.itemsFactory=t.items,t.items=[]),t.itemDefaults)for(var e=t.items,n=e.length;n--;)e[n]=R.extend({},t.itemDefaults,e[n]);this._super(t),this.classes.add("menu"),t.animate&&11!==h.ie&&this.classes.add("animate")},repaint:function(){return this.classes.toggle("menu-align",!0),this._super(),this.getEl().style.height="",this.getEl("body").style.height="",this},cancel:function(){this.hideAll(),this.fire("select")},load:function(){var e,n=this;function i(){n.throbber&&(n.throbber.hide(),n.throbber=null)}n.settings.itemsFactory&&(n.throbber||(n.throbber=new zr(n.getEl("body"),!0),0===n.items().length?(n.throbber.show(),n.fire("loading")):n.throbber.show(100,function(){n.items().remove(),n.fire("loading")}),n.on("hide close",i)),n.requestTime=e=(new Date).getTime(),n.settings.itemsFactory(function(t){0!==t.length?n.requestTime===e&&(n.getEl().style.width="",n.getEl("body").style.width="",i(),n.items().remove(),n.getEl("body").innerHTML="",n.add(t),n.renderNew(),n.fire("loaded")):n.hide()}))},hideAll:function(){return this.find("menuitem").exec("hideMenu"),this._super()},preRender:function(){var n=this;return n.items().each(function(t){var e=t.settings;if(e.icon||e.image||e.selectable)return!(n._hasIcons=!0)}),n.settings.itemsFactory&&n.on("postrender",function(){n.settings.itemsFactory&&n.load()}),n.on("show hide",function(t){t.control===n&&("show"===t.type?c.setTimeout(function(){n.classes.add("in")},0):n.classes.remove("in"))}),n._super()}}),Ur=Ir.extend({init:function(i){var e,r,o,n,s=this;s._super(i),i=s.settings,s._values=e=i.values,e&&("undefined"!=typeof i.value&&function t(e){for(var n=0;n<e.length;n++){if(r=e[n].selected||i.value===e[n].value)return o=o||e[n].text,s.state.set("value",e[n].value),!0;if(e[n].menu&&t(e[n].menu))return!0}}(e),!r&&0<e.length&&(o=e[0].text,s.state.set("value",e[0].value)),s.state.set("menu",e)),s.state.set("text",i.text||o),s.classes.add("listbox"),s.on("select",function(t){var e=t.control;n&&(t.lastControl=n),i.multiple?e.active(!e.active()):s.value(t.control.value()),n=e})},value:function(n){return 0===arguments.length?this.state.get("value"):(void 0===n||(this.settings.values&&!function e(t){return _t(t,function(t){return t.menu?e(t.menu):t.value===n})}(this.settings.values)?null===n&&this.state.set("value",null):this.state.set("value",n)),this)},bindStates:function(){var i=this;return i.on("show",function(t){var e,n;e=t.control,n=i.value(),e instanceof Fr&&e.items().each(function(t){t.hasMenus()||t.active(t.value()===n)})}),i.state.on("change:value",function(e){var n=function t(e,n){var i;if(e)for(var r=0;r<e.length;r++){if(e[r].value===n)return e[r];if(e[r].menu&&(i=t(e[r].menu,n)))return i}}(i.state.get("menu"),e.value);n?i.text(n.text):i.text(i.settings.text)}),i._super()}}),Vr=ge.extend({Defaults:{border:0,role:"menuitem"},init:function(t){var e,n=this;n._super(t),t=n.settings,n.classes.add("menu-item"),t.menu&&n.classes.add("menu-item-expand"),t.preview&&n.classes.add("menu-item-preview"),"-"!==(e=n.state.get("text"))&&"|"!==e||(n.classes.add("menu-item-sep"),n.aria("role","separator"),n.state.set("text","-")),t.selectable&&(n.aria("role","menuitemcheckbox"),n.classes.add("menu-item-checkbox"),t.icon="selected"),t.preview||t.selectable||n.classes.add("menu-item-normal"),n.on("mousedown",function(t){t.preventDefault()}),t.menu&&!t.ariaHideMenu&&n.aria("haspopup",!0)},hasMenus:function(){return!!this.settings.menu},showMenu:function(){var e,n=this,t=n.settings,i=n.parent();if(i.items().each(function(t){t!==n&&t.hideMenu()}),t.menu){(e=n.menu)?e.show():((e=t.menu).length?e={type:"menu",items:e}:e.type=e.type||"menu",i.settings.itemDefaults&&(e.itemDefaults=i.settings.itemDefaults),(e=n.menu=_e.create(e).parent(n).renderTo()).reflow(),e.on("cancel",function(t){t.stopPropagation(),n.focus(),e.hide()}),e.on("show hide",function(t){t.control.items&&t.control.items().each(function(t){t.active(t.settings.selected)})}).fire("show"),e.on("hide",function(t){t.control===e&&n.classes.remove("selected")}),e.submenu=!0),e._parentMenu=i,e.classes.add("menu-sub");var r=e.testMoveRel(n.getEl(),n.isRtl()?["tl-tr","bl-br","tr-tl","br-bl"]:["tr-tl","br-bl","tl-tr","bl-br"]);e.moveRel(n.getEl(),r),r="menu-sub-"+(e.rel=r),e.classes.remove(e._lastRel).add(r),e._lastRel=r,n.classes.add("selected"),n.aria("expanded",!0)}},hideMenu:function(){var t=this;return t.menu&&(t.menu.items().each(function(t){t.hideMenu&&t.hideMenu()}),t.menu.hide(),t.aria("expanded",!1)),t},renderHtml:function(){var t,e=this,n=e._id,i=e.settings,r=e.classPrefix,o=e.state.get("text"),s=e.settings.icon,a="",l=i.shortcut,u=e.encode(i.url);function c(t){return t.replace(/[.*+?^${}()|[\]\\]/g,"\\$&")}function d(t){var e=i.match||"";return e?t.replace(new RegExp(c(e),"gi"),function(t){return"!mce~match["+t+"]mce~match!"}):t}function f(t){return t.replace(new RegExp(c("!mce~match["),"g"),"<b>").replace(new RegExp(c("]mce~match!"),"g"),"</b>")}return s&&e.parent().classes.add("menu-has-icons"),i.image&&(a=" style=\"background-image: url('"+i.image+"')\""),l&&(l=function(t){var e,n,i={};for(i=h.mac?{alt:"&#x2325;",ctrl:"&#x2318;",shift:"&#x21E7;",meta:"&#x2318;"}:{meta:"Ctrl"},t=t.split("+"),e=0;e<t.length;e++)(n=i[t[e].toLowerCase()])&&(t[e]=n);return t.join("+")}(l)),s=r+"ico "+r+"i-"+(e.settings.icon||"none"),t="-"!==o?'<i class="'+s+'"'+a+"></i>\xa0":"",o=f(e.encode(d(o))),u=f(e.encode(d(u))),'<div id="'+n+'" class="'+e.classes+'" tabindex="-1">'+t+("-"!==o?'<span id="'+n+'-text" class="'+r+'text">'+o+"</span>":"")+(l?'<div id="'+n+'-shortcut" class="'+r+'menu-shortcut">'+l+"</div>":"")+(i.menu?'<div class="'+r+'caret"></div>':"")+(u?'<div class="'+r+'menu-item-link">'+u+"</div>":"")+"</div>"},postRender:function(){var e=this,n=e.settings,t=n.textStyle;if("function"==typeof t&&(t=t.call(this)),t){var i=e.getEl("text");i&&(i.setAttribute("style",t),e._textStyle=t)}return e.on("mouseenter click",function(t){t.control===e&&(n.menu||"click"!==t.type?(e.showMenu(),t.aria&&e.menu.focus(!0)):(e.fire("select"),c.requestAnimationFrame(function(){e.parent().hideAll()})))}),e._super(),e},hover:function(){return this.parent().items().each(function(t){t.classes.remove("selected")}),this.classes.toggle("selected",!0),this},active:function(t){return function(t,e){var n=t._textStyle;if(n){var i=t.getEl("text");i.setAttribute("style",n),e&&(i.style.color="",i.style.backgroundColor="")}}(this,t),void 0!==t&&this.aria("checked",t),this._super(t)},remove:function(){this._super(),this.menu&&this.menu.remove()}}),qr=Dn.extend({Defaults:{classes:"radio",role:"radio"}}),Yr=ge.extend({renderHtml:function(){var t=this,e=t.classPrefix;return t.classes.add("resizehandle"),"both"===t.settings.direction&&t.classes.add("resizehandle-both"),t.canFocus=!1,'<div id="'+t._id+'" class="'+t.classes+'"><i class="'+e+"ico "+e+'i-resize"></i></div>'},postRender:function(){var e=this;e._super(),e.resizeDragHelper=new we(this._id,{start:function(){e.fire("ResizeStart")},drag:function(t){"both"!==e.settings.direction&&(t.deltaX=0),e.fire("Resize",t)},stop:function(){e.fire("ResizeEnd")}})},remove:function(){return this.resizeDragHelper&&this.resizeDragHelper.destroy(),this._super()}});function $r(t){var e="";if(t)for(var n=0;n<t.length;n++)e+='<option value="'+t[n]+'">'+t[n]+"</option>";return e}var Xr=ge.extend({Defaults:{classes:"selectbox",role:"selectbox",options:[]},init:function(t){var n=this;n._super(t),n.settings.size&&(n.size=n.settings.size),n.settings.options&&(n._options=n.settings.options),n.on("keydown",function(t){var e;13===t.keyCode&&(t.preventDefault(),n.parents().reverse().each(function(t){if(t.toJSON)return e=t,!1}),n.fire("submit",{data:e.toJSON()}))})},options:function(t){return arguments.length?(this.state.set("options",t),this):this.state.get("options")},renderHtml:function(){var t,e=this,n="";return t=$r(e._options),e.size&&(n=' size = "'+e.size+'"'),'<select id="'+e._id+'" class="'+e.classes+'"'+n+">"+t+"</select>"},bindStates:function(){var e=this;return e.state.on("change:options",function(t){e.getEl().innerHTML=$r(t.value)}),e._super()}});function jr(t,e,n){return t<e&&(t=e),n<t&&(t=n),t}function Jr(t,e,n){t.setAttribute("aria-"+e,n)}function Gr(t,e){var n,i,r,o,s;"v"===t.settings.orientation?(r="top",i="height",n="h"):(r="left",i="width",n="w"),s=t.getEl("handle"),o=((t.layoutRect()[n]||100)-Ht.getSize(s)[i])*((e-t._minValue)/(t._maxValue-t._minValue))+"px",s.style[r]=o,s.style.height=t.layoutRect().h+"px",Jr(s,"valuenow",e),Jr(s,"valuetext",""+t.settings.previewFilter(e)),Jr(s,"valuemin",t._minValue),Jr(s,"valuemax",t._maxValue)}var Kr=ge.extend({init:function(t){var e=this;t.previewFilter||(t.previewFilter=function(t){return Math.round(100*t)/100}),e._super(t),e.classes.add("slider"),"v"===t.orientation&&e.classes.add("vertical"),e._minValue=bt(t.minValue)?t.minValue:0,e._maxValue=bt(t.maxValue)?t.maxValue:100,e._initValue=e.state.get("value")},renderHtml:function(){var t=this._id,e=this.classPrefix;return'<div id="'+t+'" class="'+this.classes+'"><div id="'+t+'-handle" class="'+e+'slider-handle" role="slider" tabindex="-1"></div></div>'},reset:function(){this.value(this._initValue).repaint()},postRender:function(){var t,e,n,i,r,o,s,a,l,u,c,d,f,h,m=this;t=m._minValue,e=m._maxValue,"v"===m.settings.orientation?(n="screenY",i="top",r="height",o="h"):(n="screenX",i="left",r="width",o="w"),m._super(),function(o,s){function e(t){var e,n,i,r;e=jr(e=(((e=m.value())+(r=n=o))/((i=s)-r)+.05*t)*(i-n)-n,o,s),m.value(e),m.fire("dragstart",{value:e}),m.fire("drag",{value:e}),m.fire("dragend",{value:e})}m.on("keydown",function(t){switch(t.keyCode){case 37:case 38:e(-1);break;case 39:case 40:e(1)}})}(t,e),s=t,a=e,l=m.getEl("handle"),m._dragHelper=new we(m._id,{handle:m._id+"-handle",start:function(t){u=t[n],c=parseInt(m.getEl("handle").style[i],10),d=(m.layoutRect()[o]||100)-Ht.getSize(l)[r],m.fire("dragstart",{value:h})},drag:function(t){var e=t[n]-u;f=jr(c+e,0,d),l.style[i]=f+"px",h=s+f/d*(a-s),m.value(h),m.tooltip().text(""+m.settings.previewFilter(h)).show().moveRel(l,"bc tc"),m.fire("drag",{value:h})},stop:function(){m.tooltip().hide(),m.fire("dragend",{value:h})}})},repaint:function(){this._super(),Gr(this,this.value())},bindStates:function(){var e=this;return e.state.on("change:value",function(t){Gr(e,t.value)}),e._super()}}),Zr=ge.extend({renderHtml:function(){return this.classes.add("spacer"),this.canFocus=!1,'<div id="'+this._id+'" class="'+this.classes+'"></div>'}}),Qr=Ir.extend({Defaults:{classes:"widget btn splitbtn",role:"button"},repaint:function(){var t,e,n=this.getEl(),i=this.layoutRect();return this._super(),t=n.firstChild,e=n.lastChild,Tt(t).css({width:i.w-Ht.getSize(e).width,height:i.h-2}),Tt(e).css({height:i.h-2}),this},activeMenu:function(t){Tt(this.getEl().lastChild).toggleClass(this.classPrefix+"active",t)},renderHtml:function(){var t,e,n=this,i=n._id,r=n.classPrefix,o=n.state.get("icon"),s=n.state.get("text"),a=n.settings,l="";return(t=a.image)?(o="none","string"!=typeof t&&(t=_.window.getSelection?t[0]:t[1]),t=" style=\"background-image: url('"+t+"')\""):t="",o=a.icon?r+"ico "+r+"i-"+o:"",s&&(n.classes.add("btn-has-text"),l='<span class="'+r+'txt">'+n.encode(s)+"</span>"),e="boolean"==typeof a.active?' aria-pressed="'+a.active+'"':"",'<div id="'+i+'" class="'+n.classes+'" role="button"'+e+' tabindex="-1"><button type="button" hidefocus="1" tabindex="-1">'+(o?'<i class="'+o+'"'+t+"></i>":"")+l+'</button><button type="button" class="'+r+'open" hidefocus="1" tabindex="-1">'+(n._menuBtnText?(o?"\xa0":"")+n._menuBtnText:"")+' <i class="'+r+'caret"></i></button></div>'},postRender:function(){var n=this.settings.onclick;return this.on("click",function(t){var e=t.target;if(t.control===this)for(;e;){if(t.aria&&"down"!==t.aria.key||"BUTTON"===e.nodeName&&-1===e.className.indexOf("open"))return t.stopImmediatePropagation(),void(n&&n.call(this,t));e=e.parentNode}}),delete this.settings.onclick,this._super()}}),to=ir.extend({Defaults:{containerClass:"stack-layout",controlClass:"stack-layout-item",endClass:"break"},isNative:function(){return!0}}),eo=Oe.extend({Defaults:{layout:"absolute",defaults:{type:"panel"}},activateTab:function(n){var t;this.activeTabId&&(t=this.getEl(this.activeTabId),Tt(t).removeClass(this.classPrefix+"active"),t.setAttribute("aria-selected","false")),this.activeTabId="t"+n,(t=this.getEl("t"+n)).setAttribute("aria-selected","true"),Tt(t).addClass(this.classPrefix+"active"),this.items()[n].show().fire("showtab"),this.reflow(),this.items().each(function(t,e){n!==e&&t.hide()})},renderHtml:function(){var i=this,t=i._layout,r="",o=i.classPrefix;return i.preRender(),t.preRender(i),i.items().each(function(t,e){var n=i._id+"-t"+e;t.aria("role","tabpanel"),t.aria("labelledby",n),r+='<div id="'+n+'" class="'+o+'tab" unselectable="on" role="tab" aria-controls="'+t._id+'" aria-selected="false" tabIndex="-1">'+i.encode(t.settings.title)+"</div>"}),'<div id="'+i._id+'" class="'+i.classes+'" hidefocus="1" tabindex="-1"><div id="'+i._id+'-head" class="'+o+'tabs" role="tablist">'+r+'</div><div id="'+i._id+'-body" class="'+i.bodyClasses+'">'+t.renderHtml(i)+"</div></div>"},postRender:function(){var i=this;i._super(),i.settings.activeTab=i.settings.activeTab||0,i.activateTab(i.settings.activeTab),this.on("click",function(t){var e=t.target.parentNode;if(e&&e.id===i._id+"-head")for(var n=e.childNodes.length;n--;)e.childNodes[n]===t.target&&i.activateTab(n)})},initLayoutRect:function(){var t,e,n,i=this;e=(e=Ht.getSize(i.getEl("head")).width)<0?0:e,n=0,i.items().each(function(t){e=Math.max(e,t.layoutRect().minW),n=Math.max(n,t.layoutRect().minH)}),i.items().each(function(t){t.settings.x=0,t.settings.y=0,t.settings.w=e,t.settings.h=n,t.layoutRect({x:0,y:0,w:e,h:n})});var r=Ht.getSize(i.getEl("head")).height;return i.settings.minWidth=e,i.settings.minHeight=n+r,(t=i._super()).deltaH+=r,t.innerH=t.h-t.deltaH,t}}),no=ge.extend({init:function(t){var n=this;n._super(t),n.classes.add("textbox"),t.multiline?n.classes.add("multiline"):(n.on("keydown",function(t){var e;13===t.keyCode&&(t.preventDefault(),n.parents().reverse().each(function(t){if(t.toJSON)return e=t,!1}),n.fire("submit",{data:e.toJSON()}))}),n.on("keyup",function(t){n.state.set("value",t.target.value)}))},repaint:function(){var t,e,n,i,r,o=this,s=0;t=o.getEl().style,e=o._layoutRect,r=o._lastRepaintRect||{};var a=_.document;return!o.settings.multiline&&a.all&&(!a.documentMode||a.documentMode<=8)&&(t.lineHeight=e.h-s+"px"),i=(n=o.borderBox).left+n.right+8,s=n.top+n.bottom+(o.settings.multiline?8:0),e.x!==r.x&&(t.left=e.x+"px",r.x=e.x),e.y!==r.y&&(t.top=e.y+"px",r.y=e.y),e.w!==r.w&&(t.width=e.w-i+"px",r.w=e.w),e.h!==r.h&&(t.height=e.h-s+"px",r.h=e.h),o._lastRepaintRect=r,o.fire("repaint",{},!1),o},renderHtml:function(){var e,t,n=this,i=n.settings;return e={id:n._id,hidefocus:"1"},R.each(["rows","spellcheck","maxLength","size","readonly","min","max","step","list","pattern","placeholder","required","multiple"],function(t){e[t]=i[t]}),n.disabled()&&(e.disabled="disabled"),i.subtype&&(e.type=i.subtype),(t=Ht.create(i.multiline?"textarea":"input",e)).value=n.state.get("value"),t.className=n.classes.toString(),t.outerHTML},value:function(t){return arguments.length?(this.state.set("value",t),this):(this.state.get("rendered")&&this.state.set("value",this.getEl().value),this.state.get("value"))},postRender:function(){var e=this;e.getEl().value=e.state.get("value"),e._super(),e.$el.on("change",function(t){e.state.set("value",t.target.value),e.fire("change",t)})},bindStates:function(){var e=this;return e.state.on("change:value",function(t){e.getEl().value!==t.value&&(e.getEl().value=t.value)}),e.state.on("change:disabled",function(t){e.getEl().disabled=t.value}),e._super()},remove:function(){this.$el.off(),this._super()}}),io=function(){return{Selector:Ft,Collection:qt,ReflowQueue:Zt,Control:ae,Factory:_e,KeyboardNavigation:Ce,Container:Me,DragHelper:we,Scrollable:Ne,Panel:Oe,Movable:he,Resizable:We,FloatPanel:ze,Window:$e,MessageBox:Ge,Tooltip:me,Widget:ge,Progress:pe,Notification:be,Layout:Mn,AbsoluteLayout:Nn,Button:On,ButtonGroup:Pn,Checkbox:Dn,ComboBox:Bn,ColorBox:Ln,PanelButton:In,ColorButton:Fn,ColorPicker:Vn,Path:Yn,ElementPath:$n,FormItem:Xn,Form:jn,FieldSet:Jn,FilePicker:tr,FitLayout:er,FlexLayout:nr,FlowLayout:ir,FormatControls:Or,GridLayout:Wr,Iframe:Pr,InfoBox:Dr,Label:Ar,Toolbar:Br,MenuBar:Lr,MenuButton:Ir,MenuItem:Vr,Throbber:zr,Menu:Fr,ListBox:Ur,Radio:qr,ResizeHandle:Yr,SelectBox:Xr,Slider:Kr,Spacer:Zr,SplitButton:Qr,StackLayout:to,TabPanel:eo,TextBox:no,DropZone:qn,BrowseButton:Wn}},ro=function(n){n.ui?R.each(io(),function(t,e){n.ui[e]=t}):n.ui=io()};R.each(io(),function(t,e){_e.add(e,t)}),ro(window.tinymce?window.tinymce:{}),r.add("inlite",function(t){var e=Sn();return Or.setup(t),_n(t,e),Ke(t,e)})}(window);
\ No newline at end of file
diff --git a/lib/web/tiny_mce_4/themes/mobile/theme.min.js b/lib/web/tiny_mce_4/themes/mobile/theme.min.js
index 9c96eb5c90b65..1b566272f8fe1 100644
--- a/lib/web/tiny_mce_4/themes/mobile/theme.min.js
+++ b/lib/web/tiny_mce_4/themes/mobile/theme.min.js
@@ -1 +1 @@
-!function(v){"use strict";var I=function(){},p=function(t,r){return function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];return t(r.apply(null,n))}},M=function(n){return function(){return n}},h=function(n){return n};function l(r){for(var o=[],n=1;n<arguments.length;n++)o[n-1]=arguments[n];return function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];var t=o.concat(n);return r.apply(null,t)}}var n,e,t,r,o,i,u,c,w=function(t){return function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];return!t.apply(null,n)}},a=function(n){return function(){throw new Error(n)}},s=function(n){return n()},f=M(!1),d=M(!0),m=function(e){return function(n){return function(n){if(null===n)return"null";var e=typeof n;return"object"===e&&(Array.prototype.isPrototypeOf(n)||n.constructor&&"Array"===n.constructor.name)?"array":"object"===e&&(String.prototype.isPrototypeOf(n)||n.constructor&&"String"===n.constructor.name)?"string":e}(n)===e}},b=m("string"),g=m("object"),y=m("array"),x=m("boolean"),S=m("function"),O=m("number"),T=Object.prototype.hasOwnProperty,k=function(u){return function(){for(var n=new Array(arguments.length),e=0;e<n.length;e++)n[e]=arguments[e];if(0===n.length)throw new Error("Can't merge zero objects");for(var t={},r=0;r<n.length;r++){var o=n[r];for(var i in o)T.call(o,i)&&(t[i]=u(t[i],o[i]))}return t}},C=k(function(n,e){return g(n)&&g(e)?C(n,e):e}),E=k(function(n,e){return e}),D=f,A=d,B=function(){return R},R=(r={fold:function(n,e){return n()},is:D,isSome:D,isNone:A,getOr:t=function(n){return n},getOrThunk:e=function(n){return n()},getOrDie:function(n){throw new Error(n||"error: getOrDie called on none.")},getOrNull:function(){return null},getOrUndefined:function(){return undefined},or:t,orThunk:e,map:B,ap:B,each:function(){},bind:B,flatten:B,exists:D,forall:A,filter:B,equals:n=function(n){return n.isNone()},equals_:n,toArray:function(){return[]},toString:M("none()")},Object.freeze&&Object.freeze(r),r),F=function(t){var n=function(){return t},e=function(){return o},r=function(n){return n(t)},o={fold:function(n,e){return e(t)},is:function(n){return t===n},isSome:A,isNone:D,getOr:n,getOrThunk:n,getOrDie:n,getOrNull:n,getOrUndefined:n,or:e,orThunk:e,map:function(n){return F(n(t))},ap:function(n){return n.fold(B,function(n){return F(n(t))})},each:function(n){n(t)},bind:r,flatten:n,exists:r,forall:r,filter:function(n){return n(t)?o:R},equals:function(n){return n.is(t)},equals_:function(n,e){return n.fold(D,function(n){return e(t,n)})},toArray:function(){return[t]},toString:function(){return"some("+t+")"}};return o},V={some:F,none:B,from:function(n){return null===n||n===undefined?R:F(n)}},N=Object.keys,H=function(n,e){for(var t=N(n),r=0,o=t.length;r<o;r++){var i=t[r];e(n[i],i,n)}},z=function(n,r){return j(n,function(n,e,t){return{k:e,v:r(n,e,t)}})},j=function(r,o){var i={};return H(r,function(n,e){var t=o(n,e,r);i[t.k]=t.v}),i},L=function(n,t){var r=[];return H(n,function(n,e){r.push(t(n,e))}),r},P=M("touchstart"),$=M("touchmove"),W=M("touchend"),G=M("mousedown"),_=M("mousemove"),U=M("mouseup"),q=M("mouseover"),Y=M("keydown"),K=M("input"),X=M("change"),J=M("click"),Q=M("transitionend"),Z=M("selectstart"),nn=function(t){var r,o=!1;return function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];return o||(o=!0,r=t.apply(null,n)),r}},en=function(n,e){var t=function(n,e){for(var t=0;t<n.length;t++){var r=n[t];if(r.test(e))return r}return undefined}(n,e);if(!t)return{major:0,minor:0};var r=function(n){return Number(e.replace(t,"$"+n))};return rn(r(1),r(2))},tn=function(){return rn(0,0)},rn=function(n,e){return{major:n,minor:e}},on={nu:rn,detect:function(n,e){var t=String(e).toLowerCase();return 0===n.length?tn():en(n,t)},unknown:tn},un="Firefox",cn=function(n,e){return function(){return e===n}},an=function(n){var e=n.current;return{current:e,version:n.version,isEdge:cn("Edge",e),isChrome:cn("Chrome",e),isIE:cn("IE",e),isOpera:cn("Opera",e),isFirefox:cn(un,e),isSafari:cn("Safari",e)}},sn={unknown:function(){return an({current:undefined,version:on.unknown()})},nu:an,edge:M("Edge"),chrome:M("Chrome"),ie:M("IE"),opera:M("Opera"),firefox:M(un),safari:M("Safari")},fn="Windows",ln="Android",dn="Solaris",mn="FreeBSD",gn=function(n,e){return function(){return e===n}},vn=function(n){var e=n.current;return{current:e,version:n.version,isWindows:gn(fn,e),isiOS:gn("iOS",e),isAndroid:gn(ln,e),isOSX:gn("OSX",e),isLinux:gn("Linux",e),isSolaris:gn(dn,e),isFreeBSD:gn(mn,e)}},pn={unknown:function(){return vn({current:undefined,version:on.unknown()})},nu:vn,windows:M(fn),ios:M("iOS"),android:M(ln),linux:M("Linux"),osx:M("OSX"),solaris:M(dn),freebsd:M(mn)},hn=Array.prototype.slice,bn=(o=Array.prototype.indexOf)===undefined?function(n,e){return En(n,e)}:function(n,e){return o.call(n,e)},yn=function(n,e){return-1<bn(n,e)},xn=function(n,e){for(var t=n.length,r=new Array(t),o=0;o<t;o++){var i=n[o];r[o]=e(i,o,n)}return r},wn=function(n,e){for(var t=0,r=n.length;t<r;t++)e(n[t],t,n)},Sn=function(n,e){for(var t=[],r=0,o=n.length;r<o;r++){var i=n[r];e(i,r,n)&&t.push(i)}return t},On=function(n,e,t){return function(n,e){for(var t=n.length-1;0<=t;t--)e(n[t],t,n)}(n,function(n){t=e(t,n)}),t},Tn=function(n,e,t){return wn(n,function(n){t=e(t,n)}),t},kn=function(n,e){for(var t=0,r=n.length;t<r;t++){var o=n[t];if(e(o,t,n))return V.some(o)}return V.none()},Cn=function(n,e){for(var t=0,r=n.length;t<r;t++)if(e(n[t],t,n))return V.some(t);return V.none()},En=function(n,e){for(var t=0,r=n.length;t<r;++t)if(n[t]===e)return t;return-1},Dn=Array.prototype.push,In=function(n){for(var e=[],t=0,r=n.length;t<r;++t){if(!Array.prototype.isPrototypeOf(n[t]))throw new Error("Arr.flatten item "+t+" was not an array, input: "+n);Dn.apply(e,n[t])}return e},Mn=function(n,e){var t=xn(n,e);return In(t)},An=function(n,e){for(var t=0,r=n.length;t<r;++t)if(!0!==e(n[t],t,n))return!1;return!0},Bn=function(n){var e=hn.call(n,0);return e.reverse(),e},Rn=function(n){return[n]},Fn=(S(Array.from)&&Array.from,function(n,e){var t=String(e).toLowerCase();return kn(n,function(n){return n.search(t)})}),Vn=function(n,t){return Fn(n,t).map(function(n){var e=on.detect(n.versionRegexes,t);return{current:n.name,version:e}})},Nn=function(n,t){return Fn(n,t).map(function(n){var e=on.detect(n.versionRegexes,t);return{current:n.name,version:e}})},Hn=function(n,e){return-1!==n.indexOf(e)},zn=/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,jn=function(e){return function(n){return Hn(n,e)}},Ln=[{name:"Edge",versionRegexes:[/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],search:function(n){return Hn(n,"edge/")&&Hn(n,"chrome")&&Hn(n,"safari")&&Hn(n,"applewebkit")}},{name:"Chrome",versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/,zn],search:function(n){return Hn(n,"chrome")&&!Hn(n,"chromeframe")}},{name:"IE",versionRegexes:[/.*?msie\ ?([0-9]+)\.([0-9]+).*/,/.*?rv:([0-9]+)\.([0-9]+).*/],search:function(n){return Hn(n,"msie")||Hn(n,"trident")}},{name:"Opera",versionRegexes:[zn,/.*?opera\/([0-9]+)\.([0-9]+).*/],search:jn("opera")},{name:"Firefox",versionRegexes:[/.*?firefox\/\ ?([0-9]+)\.([0-9]+).*/],search:jn("firefox")},{name:"Safari",versionRegexes:[zn,/.*?cpu os ([0-9]+)_([0-9]+).*/],search:function(n){return(Hn(n,"safari")||Hn(n,"mobile/"))&&Hn(n,"applewebkit")}}],Pn=[{name:"Windows",search:jn("win"),versionRegexes:[/.*?windows\ nt\ ?([0-9]+)\.([0-9]+).*/]},{name:"iOS",search:function(n){return Hn(n,"iphone")||Hn(n,"ipad")},versionRegexes:[/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,/.*cpu os ([0-9]+)_([0-9]+).*/,/.*cpu iphone os ([0-9]+)_([0-9]+).*/]},{name:"Android",search:jn("android"),versionRegexes:[/.*?android\ ?([0-9]+)\.([0-9]+).*/]},{name:"OSX",search:jn("os x"),versionRegexes:[/.*?os\ x\ ?([0-9]+)_([0-9]+).*/]},{name:"Linux",search:jn("linux"),versionRegexes:[]},{name:"Solaris",search:jn("sunos"),versionRegexes:[]},{name:"FreeBSD",search:jn("freebsd"),versionRegexes:[]}],$n={browsers:M(Ln),oses:M(Pn)},Wn=function(n){var e,t,r,o,i,u,c,a,s,f,l,d=$n.browsers(),m=$n.oses(),g=Vn(d,n).fold(sn.unknown,sn.nu),v=Nn(m,n).fold(pn.unknown,pn.nu);return{browser:g,os:v,deviceType:(t=g,r=n,o=(e=v).isiOS()&&!0===/ipad/i.test(r),i=e.isiOS()&&!o,u=e.isAndroid()&&3===e.version.major,c=e.isAndroid()&&4===e.version.major,a=o||u||c&&!0===/mobile/i.test(r),s=e.isiOS()||e.isAndroid(),f=s&&!a,l=t.isSafari()&&e.isiOS()&&!1===/safari/i.test(r),{isiPad:M(o),isiPhone:M(i),isTablet:M(a),isPhone:M(f),isTouch:M(s),isAndroid:e.isAndroid,isiOS:e.isiOS,isWebView:M(l)})}},Gn={detect:nn(function(){var n=v.navigator.userAgent;return Wn(n)})},_n={tap:M("alloy.tap")},Un=M("alloy.focus"),qn=M("alloy.blur.post"),Yn=M("alloy.receive"),Kn=M("alloy.execute"),Xn=M("alloy.focus.item"),Jn=_n.tap,Qn=Gn.detect().deviceType.isTouch()?_n.tap:J,Zn=M("alloy.longpress"),ne=M("alloy.system.init"),ee=M("alloy.system.scroll"),te=M("alloy.system.attached"),re=M("alloy.system.detached"),oe=function(n,e){ae(n,n.element(),e,{})},ie=function(n,e,t){ae(n,n.element(),e,t)},ue=function(n){oe(n,Kn())},ce=function(n,e,t){ae(n,e,t,{})},ae=function(n,e,t,r){var o=C({target:e},r);n.getSystem().triggerEvent(t,e,z(o,M))},se=function(n){if(null===n||n===undefined)throw new Error("Node cannot be null or undefined");return{dom:M(n)}},fe={fromHtml:function(n,e){var t=(e||v.document).createElement("div");if(t.innerHTML=n,!t.hasChildNodes()||1<t.childNodes.length)throw v.console.error("HTML does not have a single root node",n),new Error("HTML must have a single root node");return se(t.childNodes[0])},fromTag:function(n,e){var t=(e||v.document).createElement(n);return se(t)},fromText:function(n,e){var t=(e||v.document).createTextNode(n);return se(t)},fromDom:se,fromPoint:function(n,e,t){var r=n.dom();return V.from(r.elementFromPoint(e,t)).map(se)}},le=(v.Node.ATTRIBUTE_NODE,v.Node.CDATA_SECTION_NODE,v.Node.COMMENT_NODE,v.Node.DOCUMENT_NODE),de=(v.Node.DOCUMENT_TYPE_NODE,v.Node.DOCUMENT_FRAGMENT_NODE,v.Node.ELEMENT_NODE),me=v.Node.TEXT_NODE,ge=(v.Node.PROCESSING_INSTRUCTION_NODE,v.Node.ENTITY_REFERENCE_NODE,v.Node.ENTITY_NODE,v.Node.NOTATION_NODE,function(n){return n.dom().nodeName.toLowerCase()}),ve=function(e){return function(n){return n.dom().nodeType===e}},pe=ve(de),he=ve(me),be=function(n){var e=he(n)?n.dom().parentNode:n.dom();return e!==undefined&&null!==e&&e.ownerDocument.body.contains(e)},ye=nn(function(){return xe(fe.fromDom(v.document))}),xe=function(n){var e=n.dom().body;if(null===e||e===undefined)throw new Error("Body is not available yet");return fe.fromDom(e)},we=function(){for(var e=[],n=0;n<arguments.length;n++)e[n]=arguments[n];return function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];if(e.length!==t.length)throw new Error('Wrong number of arguments to struct. Expected "['+e.length+']", got '+t.length+" arguments");var r={};return wn(e,function(n,e){r[n]=M(t[e])}),r}},Se=function(n){return n.slice(0).sort()},Oe=function(n,e){throw new Error("All required keys ("+Se(n).join(", ")+") were not specified. Specified keys were: "+Se(e).join(", ")+".")},Te=function(n){throw new Error("Unsupported keys for object: "+Se(n).join(", "))},ke=function(e,n){if(!y(n))throw new Error("The "+e+" fields must be an array. Was: "+n+".");wn(n,function(n){if(!b(n))throw new Error("The value "+n+" in the "+e+" fields was not a string.")})},Ce=function(n){var t=Se(n);kn(t,function(n,e){return e<t.length-1&&n===t[e+1]}).each(function(n){throw new Error("The field: "+n+" occurs more than once in the combined fields: ["+t.join(", ")+"].")})},Ee=function(o,i){var u=o.concat(i);if(0===u.length)throw new Error("You must specify at least one required or optional field.");return ke("required",o),ke("optional",i),Ce(u),function(e){var t=N(e);An(o,function(n){return yn(t,n)})||Oe(o,t);var n=Sn(t,function(n){return!yn(u,n)});0<n.length&&Te(n);var r={};return wn(o,function(n){r[n]=M(e[n])}),wn(i,function(n){r[n]=M(Object.prototype.hasOwnProperty.call(e,n)?V.some(e[n]):V.none())}),r}},De="undefined"!=typeof v.window?v.window:Function("return this;")(),Ie=function(n,e){return function(n,e){for(var t=e!==undefined&&null!==e?e:De,r=0;r<n.length&&t!==undefined&&null!==t;++r)t=t[n[r]];return t}(n.split("."),e)},Me={getOrDie:function(n,e){var t=Ie(n,e);if(t===undefined||null===t)throw n+" not available on this browser";return t}},Ae=de,Be=le,Re=function(n,e){var t=n.dom();if(t.nodeType!==Ae)return!1;if(t.matches!==undefined)return t.matches(e);if(t.msMatchesSelector!==undefined)return t.msMatchesSelector(e);if(t.webkitMatchesSelector!==undefined)return t.webkitMatchesSelector(e);if(t.mozMatchesSelector!==undefined)return t.mozMatchesSelector(e);throw new Error("Browser lacks native selectors")},Fe=function(n){return n.nodeType!==Ae&&n.nodeType!==Be||0===n.childElementCount},Ve=function(n,e){var t=e===undefined?v.document:e.dom();return Fe(t)?[]:xn(t.querySelectorAll(n),fe.fromDom)},Ne=function(n,e){var t=e===undefined?v.document:e.dom();return Fe(t)?V.none():V.from(t.querySelector(n)).map(fe.fromDom)},He=function(n,e){return n.dom()===e.dom()},ze=(Gn.detect().browser.isIE(),function(n){return fe.fromDom(n.dom().ownerDocument)}),je=function(n){var e=n.dom().ownerDocument.defaultView;return fe.fromDom(e)},Le=function(n){var e=n.dom();return V.from(e.parentNode).map(fe.fromDom)},Pe=function(n){var e=n.dom();return xn(e.childNodes,fe.fromDom)},$e=function(n){return e=0,t=n.dom().childNodes,V.from(t[e]).map(fe.fromDom);var e,t},We=(we("element","offset"),function(e,t){$e(e).fold(function(){Ge(e,t)},function(n){e.dom().insertBefore(t.dom(),n.dom())})}),Ge=function(n,e){n.dom().appendChild(e.dom())},_e=function(e,n){wn(n,function(n){Ge(e,n)})},Ue=function(n){n.dom().textContent="",wn(Pe(n),function(n){qe(n)})},qe=function(n){var e=n.dom();null!==e.parentNode&&e.parentNode.removeChild(e)},Ye=function(n){oe(n,re());var e=n.components();wn(e,Ye)},Ke=function(n){var e=n.components();wn(e,Ke),oe(n,te())},Xe=function(n,e){Je(n,e,Ge)},Je=function(n,e,t){n.getSystem().addToWorld(e),t(n.element(),e.element()),be(n.element())&&Ke(e),n.syncComponents()},Qe=function(n){Ye(n),qe(n.element()),n.getSystem().removeFromWorld(n)},Ze=function(e){var n=Le(e.element()).bind(function(n){return e.getSystem().getByDom(n).fold(V.none,V.some)});Qe(e),n.each(function(n){n.syncComponents()})},nt=function(t){return{is:function(n){return t===n},isValue:d,isError:f,getOr:M(t),getOrThunk:M(t),getOrDie:M(t),or:function(n){return nt(t)},orThunk:function(n){return nt(t)},fold:function(n,e){return e(t)},map:function(n){return nt(n(t))},mapError:function(n){return nt(t)},each:function(n){n(t)},bind:function(n){return n(t)},exists:function(n){return n(t)},forall:function(n){return n(t)},toOption:function(){return V.some(t)}}},et=function(t){return{is:f,isValue:f,isError:d,getOr:h,getOrThunk:function(n){return n()},getOrDie:function(){return a(String(t))()},or:function(n){return n},orThunk:function(n){return n()},fold:function(n,e){return n(t)},map:function(n){return et(t)},mapError:function(n){return et(n(t))},each:I,bind:function(n){return et(t)},exists:f,forall:d,toOption:V.none}},tt={value:nt,error:et,fromOption:function(n,e){return n.fold(function(){return et(e)},nt)}},rt=function(u){if(!y(u))throw new Error("cases must be an array");if(0===u.length)throw new Error("there must be at least one case");var c=[],t={};return wn(u,function(n,r){var e=N(n);if(1!==e.length)throw new Error("one and only one name per case");var o=e[0],i=n[o];if(t[o]!==undefined)throw new Error("duplicate key detected:"+o);if("cata"===o)throw new Error("cannot have a case named cata (sorry)");if(!y(i))throw new Error("case arguments must be an array");c.push(o),t[o]=function(){var n=arguments.length;if(n!==i.length)throw new Error("Wrong number of arguments to case "+o+". Expected "+i.length+" ("+i+"), got "+n);for(var t=new Array(n),e=0;e<t.length;e++)t[e]=arguments[e];return{fold:function(){if(arguments.length!==u.length)throw new Error("Wrong number of arguments to fold. Expected "+u.length+", got "+arguments.length);return arguments[r].apply(null,t)},match:function(n){var e=N(n);if(c.length!==e.length)throw new Error("Wrong number of arguments to match. Expected: "+c.join(",")+"\nActual: "+e.join(","));if(!An(c,function(n){return yn(e,n)}))throw new Error("Not all branches were specified when using match. Specified: "+e.join(", ")+"\nRequired: "+c.join(", "));return n[o].apply(null,t)},log:function(n){v.console.log(n,{constructors:c,constructor:o,params:t})}}}}),t},ot=rt([{strict:[]},{defaultedThunk:["fallbackThunk"]},{asOption:[]},{asDefaultedOptionThunk:["fallbackThunk"]},{mergeWithThunk:["baseThunk"]}]),it=function(n){return ot.defaultedThunk(M(n))},ut=ot.strict,ct=ot.asOption,at=ot.defaultedThunk,st=ot.mergeWithThunk,ft=(rt([{bothErrors:["error1","error2"]},{firstError:["error1","value2"]},{secondError:["value1","error2"]},{bothValues:["value1","value2"]}]),function(n){var e=[],t=[];return wn(n,function(n){n.fold(function(n){e.push(n)},function(n){t.push(n)})}),{errors:e,values:t}}),lt=function(n){return p(tt.error,In)(n)},dt=function(n,e){var t,r,o=ft(n);return 0<o.errors.length?lt(o.errors):(t=o.values,r=e,tt.value(C.apply(undefined,[r].concat(t))))},mt=function(n){var e=ft(n);return 0<e.errors.length?lt(e.errors):tt.value(e.values)},gt=function(e){return function(n){return n.hasOwnProperty(e)?V.from(n[e]):V.none()}},vt=function(n,e){return gt(e)(n)},pt=function(n,e){var t={};return t[n]=e,t},ht=function(n,e){return t=n,r={},wn(e,function(n){t[n]!==undefined&&t.hasOwnProperty(n)&&(r[n]=t[n])}),r;var t,r},bt=function(n,e){return t=e,r={},H(n,function(n,e){yn(t,e)||(r[e]=n)}),r;var t,r},yt=function(n){return gt(n)},xt=function(n,e){return t=n,r=e,function(n){return gt(t)(n).getOr(r)};var t,r},wt=function(n,e){return vt(n,e)},St=function(n,e){return pt(n,e)},Ot=function(n){return e={},wn(n,function(n){e[n.key]=n.value}),e;var e},Tt=function(n,e){return dt(n,e)},kt=function(n,e){return r=e,(t=n).hasOwnProperty(r)&&t[r]!==undefined&&null!==t[r];var t,r},Ct=rt([{setOf:["validator","valueType"]},{arrOf:["valueType"]},{objOf:["fields"]},{itemOf:["validator"]},{choiceOf:["key","branches"]},{thunk:["description"]},{func:["args","outputSchema"]}]),Et=rt([{field:["name","presence","type"]},{state:["name"]}]),Dt=function(){return Me.getOrDie("JSON")},It=function(n,e,t){return Dt().stringify(n,e,t)},Mt=function(n){return g(n)&&100<N(n).length?" removed due to size":It(n,null,2)},At=function(n,e){return tt.error([{path:n,getErrorInfo:e}])},Bt=rt([{field:["key","okey","presence","prop"]},{state:["okey","instantiator"]}]),Rt=function(t,r,o){return vt(r,o).fold(function(){return n=o,e=r,At(t,function(){return'Could not find valid *strict* value for "'+n+'" in '+Mt(e)});var n,e},tt.value)},Ft=function(n,e,t){var r=vt(n,e).fold(function(){return t(n)},h);return tt.value(r)},Vt=function(o,c,n,a){return n.fold(function(i,e,n,t){var r=function(n){return t.extract(o.concat([i]),a,n).map(function(n){return pt(e,a(n))})},u=function(n){return n.fold(function(){var n=pt(e,a(V.none()));return tt.value(n)},function(n){return t.extract(o.concat([i]),a,n).map(function(n){return pt(e,a(V.some(n)))})})};return n.fold(function(){return Rt(o,c,i).bind(r)},function(n){return Ft(c,i,n).bind(r)},function(){return(n=c,e=i,tt.value(vt(n,e))).bind(u);var n,e},function(n){return(e=c,t=i,r=n,o=vt(e,t).map(function(n){return!0===n?r(e):n}),tt.value(o)).bind(u);var e,t,r,o},function(n){var e=n(c);return Ft(c,i,M({})).map(function(n){return C(e,n)}).bind(r)})},function(n,e){var t=e(c);return tt.value(pt(n,a(t)))})},Nt=function(r){return{extract:function(t,n,e){return r(e,n).fold(function(n){return e=n,At(t,function(){return e});var e},tt.value)},toString:function(){return"val"},toDsl:function(){return Ct.itemOf(r)}}},Ht=function(n){var a=zt(n),s=On(n,function(e,n){return n.fold(function(n){return C(e,St(n,!0))},M(e))},{});return{extract:function(n,e,t){var r,o,i,u=x(t)?[]:(o=N(r=t),Sn(o,function(n){return kt(r,n)})),c=Sn(u,function(n){return!kt(s,n)});return 0===c.length?a.extract(n,e,t):(i=c,At(n,function(){return"There are unsupported fields: ["+i.join(", ")+"] specified"}))},toString:a.toString,toDsl:a.toDsl}},zt=function(c){return{extract:function(n,e,t){return r=n,o=t,i=e,u=xn(c,function(n){return Vt(r,o,n,i)}),dt(u,{});var r,o,i,u},toString:function(){return"obj{\n"+xn(c,function(n){return n.fold(function(n,e,t,r){return n+" -> "+r.toString()},function(n,e){return"state("+n+")"})}).join("\n")+"}"},toDsl:function(){return Ct.objOf(xn(c,function(n){return n.fold(function(n,e,t,r){return Et.field(n,t,r)},function(n,e){return Et.state(n)})}))}}},jt=function(t,i){var e=function(n,e){return(o=Nt(t),{extract:function(t,r,n){var e=xn(n,function(n,e){return o.extract(t.concat(["["+e+"]"]),r,n)});return mt(e)},toString:function(){return"array("+o.toString()+")"},toDsl:function(){return Ct.arrOf(o)}}).extract(n,h,e);var o};return{extract:function(t,r,o){var n=N(o);return e(t,n).bind(function(n){var e=xn(n,function(n){return Bt.field(n,n,ut(),i)});return zt(e).extract(t,r,o)})},toString:function(){return"setOf("+i.toString()+")"},toDsl:function(){return Ct.setOf(t,i)}}},Lt=M(Nt(tt.value)),Pt=Bt.state,$t=Bt.field,Wt=function(t,e,r,o,i){return wt(o,i).fold(function(){return n=o,e=i,At(t,function(){return'The chosen schema: "'+e+'" did not exist in branches: '+Mt(n)});var n,e},function(n){return zt(n).extract(t.concat(["branch: "+i]),e,r)})},Gt=function(o,i){return{extract:function(e,t,r){return wt(r,o).fold(function(){return n=o,At(e,function(){return'Choice schema did not contain choice key: "'+n+'"'});var n},function(n){return Wt(e,t,r,i,n)})},toString:function(){return"chooseOn("+o+"). Possible values: "+N(i)},toDsl:function(){return Ct.choiceOf(o,i)}}},_t=Nt(tt.value),Ut=function(n,e,t,r){return e.extract([n],t,r).fold(function(n){return tt.error({input:r,errors:n})},tt.value)},qt=function(n,e,t){return Ut(n,e,M,t)},Yt=function(n){return n.fold(function(n){throw new Error(Jt(n))},h)},Kt=function(n,e,t){return Yt(Ut(n,e,h,t))},Xt=function(n,e,t){return Yt(qt(n,e,t))},Jt=function(n){return"Errors: \n"+(e=n.errors,t=10<e.length?e.slice(0,10).concat([{path:[],getErrorInfo:function(){return"... (only showing first ten failures)"}}]):e,xn(t,function(n){return"Failed path: ("+n.path.join(" > ")+")\n"+n.getErrorInfo()}))+"\n\nInput object: "+Mt(n.input);var e,t},Qt=function(n,e){return Gt(n,e)},Zt=M(_t),nr=(i=S,u="function",Nt(function(n){var e=typeof n;return i(n)?tt.value(n):tt.error("Expected type: "+u+" but got: "+e)})),er=function(n){return $t(n,n,ut(),Lt())},tr=function(n,e){return $t(n,n,ut(),e)},rr=function(n){return tr(n,nr)},or=function(n,e){return $t(n,n,ut(),zt(e))},ir=function(n){return $t(n,n,ct(),Lt())},ur=function(n,e){return $t(n,n,ct(),zt(e))},cr=function(n,e){return $t(n,n,ct(),Ht(e))},ar=function(n,e){return $t(n,n,it(e),Lt())},sr=function(n,e,t){return $t(n,n,it(e),t)},fr=function(n,e){return Pt(n,e)},lr=function(n){if(!kt(n,"can")&&!kt(n,"abort")&&!kt(n,"run"))throw new Error("EventHandler defined by: "+It(n,null,2)+" does not have can, abort, or run!");return Kt("Extracting event.handler",Ht([ar("can",M(!0)),ar("abort",M(!1)),ar("run",I)]),n)},dr=function(t){var e,r,o,i,n=(e=t,r=function(n){return n.can},function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];return Tn(e,function(n,e){return n&&r(e).apply(undefined,t)},!0)}),u=(o=t,i=function(n){return n.abort},function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];return Tn(o,function(n,e){return n||i(e).apply(undefined,t)},!1)});return lr({can:n,abort:u,run:function(){for(var e=[],n=0;n<arguments.length;n++)e[n]=arguments[n];wn(t,function(n){n.run.apply(undefined,e)})}})},mr=function(n){return Ot(n)},gr=function(n,e){return{key:n,value:lr({abort:e})}},vr=function(n,e){return{key:n,value:lr({run:e})}},pr=function(n,e,t){return{key:n,value:lr({run:function(n){e.apply(undefined,[n].concat(t))}})}},hr=function(n){return function(r){return{key:n,value:lr({run:function(n,e){var t;t=e,He(n.element(),t.event().target())&&r(n,e)}})}}},br=function(n,e,t){var u,r,o=e.partUids()[t];return r=o,vr(u=n,function(n,i){n.getSystem().getByUid(r).each(function(n){var e,t,r,o;t=(e=n).element(),r=u,o=i,e.getSystem().triggerEvent(r,t,o.event())})})},yr=function(n){return vr(n,function(n,e){e.cut()})},xr=hr(te()),wr=hr(re()),Sr=hr(ne()),Or=(c=Kn(),function(n){return vr(c,n)}),Tr=function(n){return xn(n,function(n){return r=e="/*",o=(t=n).length-e.length,""!==r&&(t.length<r.length||t.substr(o,o+r.length)!==r)?n:n.substring(0,n.length-"/*".length);var e,t,r,o})},kr=function(n,e){var t=n.toString(),r=t.indexOf(")")+1,o=t.indexOf("("),i=t.substring(o+1,r-1).split(/,\s*/);return n.toFunctionAnnotation=function(){return{name:e,parameters:Tr(i)}},n},Cr=Ee(["tag"],["classes","attributes","styles","value","innerHtml","domChildren","defChildren"]),Er=function(n){return{tag:n.tag(),classes:n.classes().getOr([]),attributes:n.attributes().getOr({}),styles:n.styles().getOr({}),value:n.value().getOr("<none>"),innerHtml:n.innerHtml().getOr("<none>"),defChildren:n.defChildren().fold(function(){return"<none>"},function(n){return It(n,null,2)}),domChildren:n.domChildren().fold(function(){return"<none>"},function(n){return 0===n.length?"0 children, but still specified":String(n.length)})}},Dr=Ee([],["classes","attributes","styles","value","innerHtml","defChildren","domChildren"]),Ir=function(e,n,t){return n.fold(function(){return t.fold(function(){return{}},function(n){return St(e,n)})},function(n){return t.fold(function(){return St(e,n)},function(n){return St(e,n)})})},Mr=function(t,r,o){return Sr(function(n,e){o(n,t,r)})},Ar=function(n,e,t,r,o,i){var u,c,a=n,s=ur(e,[(u="config",c=n,$t(u,u,ct(),c))]);return Fr(a,s,e,t,r,o,i)},Br=function(o,i,u){var n,e,t,r,c,a;return n=function(t){for(var n=[],e=1;e<arguments.length;e++)n[e-1]=arguments[e];var r=[t].concat(n);return t.config({name:M(o)}).fold(function(){throw new Error("We could not find any behaviour configuration for: "+o+". Using API: "+u)},function(n){var e=Array.prototype.slice.call(r,1);return i.apply(undefined,[t,n.config,n.state].concat(e))})},e=u,t=i.toString(),r=t.indexOf(")")+1,c=t.indexOf("("),a=t.substring(c+1,r-1).split(/,\s*/),n.toFunctionAnnotation=function(){return{name:e,parameters:Tr(a.slice(0,1).concat(a.slice(3)))}},n},Rr=function(n){return{key:n,value:undefined}},Fr=function(t,n,r,o,e,i,u){var c=function(n){return kt(n,r)?n[r]():V.none()},a=z(e,function(n,e){return Br(r,n,e)}),s=z(i,function(n,e){return kr(n,e)}),f=C(s,a,{revoke:l(Rr,r),config:function(n){var e=Xt(r+"-config",t,n);return{key:r,value:{config:e,me:f,configAsRaw:nn(function(){return Kt(r+"-config",t,n)}),initialConfig:n,state:u}}},schema:function(){return n},exhibit:function(n,t){return c(n).bind(function(e){return wt(o,"exhibit").map(function(n){return n(t,e.config,e.state)})}).getOr(Dr({}))},name:function(){return r},handlers:function(n){return c(n).bind(function(e){return wt(o,"events").map(function(n){return n(e.config,e.state)})}).getOr({})}});return f},Vr=function(n,e){return Nr(n,e,{validate:S,label:"function"})},Nr=function(r,o,i){if(0===o.length)throw new Error("You must specify at least one required field.");return ke("required",o),Ce(o),function(e){var t=N(e);An(o,function(n){return yn(t,n)})||Oe(o,t),r(o,t);var n=Sn(o,function(n){return!i.validate(e[n],n)});return 0<n.length&&function(n,e){throw new Error("All values need to be of type: "+e+". Keys ("+Se(n).join(", ")+") were not.")}(n,i.label),e}},Hr=function(e,n){var t=Sn(n,function(n){return!yn(e,n)});0<t.length&&Te(t)},zr=I,jr=function(n){return Vr(Hr,n)},Lr={init:function(){return Pr({readState:function(){return"No State required"}})}},Pr=function(n){return Vr(zr,["readState"])(n),n},$r=function(n){return Ot(n)},Wr=Ht([er("fields"),er("name"),ar("active",{}),ar("apis",{}),ar("state",Lr),ar("extra",{})]),Gr=function(n){var e,t,r,o,i,u,c,a,s=Kt("Creating behaviour: "+n.name,Wr,n);return e=s.fields,t=s.name,r=s.active,o=s.apis,i=s.extra,u=s.state,c=Ht(e),a=ur(t,[cr("config",e)]),Fr(c,a,t,r,o,i,u)},_r=Ht([er("branchKey"),er("branches"),er("name"),ar("active",{}),ar("apis",{}),ar("state",Lr),ar("extra",{})]),Ur=M(undefined),qr=function(n,e,t){if(!(b(t)||x(t)||O(t)))throw v.console.error("Invalid call to Attr.set. Key ",e,":: Value ",t,":: Element ",n),new Error("Attribute value was not simple");n.setAttribute(e,t+"")},Yr=function(n,e,t){qr(n.dom(),e,t)},Kr=function(n,e){var t=n.dom();H(e,function(n,e){qr(t,e,n)})},Xr=function(n,e){var t=n.dom().getAttribute(e);return null===t?undefined:t},Jr=function(n,e){var t=n.dom();return!(!t||!t.hasAttribute)&&t.hasAttribute(e)},Qr=function(n,e){n.dom().removeAttribute(e)},Zr=function(n,e){var t=Xr(n,e);return t===undefined||""===t?[]:t.split(" ")},no=function(n){return n.dom().classList!==undefined},eo=function(n){return Zr(n,"class")},to=function(n,e){return o=e,i=Zr(t=n,r="class").concat([o]),Yr(t,r,i.join(" ")),!0;var t,r,o,i},ro=function(n,e){return o=e,0<(i=Sn(Zr(t=n,r="class"),function(n){return n!==o})).length?Yr(t,r,i.join(" ")):Qr(t,r),!1;var t,r,o,i},oo=function(n,e){no(n)?n.dom().classList.add(e):to(n,e)},io=function(n,e){var t;no(n)?n.dom().classList.remove(e):ro(n,e),0===(no(t=n)?t.dom().classList:eo(t)).length&&Qr(t,"class")},uo=function(n,e){return no(n)?n.dom().classList.toggle(e):(r=e,yn(eo(t=n),r)?ro(t,r):to(t,r));var t,r},co=function(n,e){return no(n)&&n.dom().classList.contains(e)},ao=function(n,e,t){io(n,t),oo(n,e)},so=Object.freeze({toAlpha:function(n,e,t){ao(n.element(),e.alpha(),e.omega())},toOmega:function(n,e,t){ao(n.element(),e.omega(),e.alpha())},isAlpha:function(n,e,t){return co(n.element(),e.alpha())},isOmega:function(n,e,t){return co(n.element(),e.omega())},clear:function(n,e,t){io(n.element(),e.alpha()),io(n.element(),e.omega())}}),fo=[er("alpha"),er("omega")],lo=Gr({fields:fo,name:"swapping",apis:so}),mo=function(n){var e=n,t=function(){return e};return{get:t,set:function(n){e=n},clone:function(){return mo(t())}}};function go(n,e,t,r,o){return n(t,r)?V.some(t):S(o)&&o(t)?V.none():e(t,r,o)}var vo=function(n,e,t){for(var r=n.dom(),o=S(t)?t:M(!1);r.parentNode;){r=r.parentNode;var i=fe.fromDom(r);if(e(i))return V.some(i);if(o(i))break}return V.none()},po=function(n,e,t){return go(function(n){return e(n)},vo,n,e,t)},ho=function(n,r){var o=function(n){for(var e=0;e<n.childNodes.length;e++){if(r(fe.fromDom(n.childNodes[e])))return V.some(fe.fromDom(n.childNodes[e]));var t=o(n.childNodes[e]);if(t.isSome())return t}return V.none()};return o(n.dom())},bo=function(n){n.dom().focus()},yo=function(n){n.dom().blur()},xo=function(n){var e=n!==undefined?n.dom():v.document;return V.from(e.activeElement).map(fe.fromDom)},wo=function(e){return xo(ze(e)).filter(function(n){return e.dom().contains(n.dom())})},So=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),Oo=tinymce.util.Tools.resolve("tinymce.ThemeManager"),To=function(n){var e=v.document.createElement("a");e.target="_blank",e.href=n.href,e.rel="noreferrer noopener";var t=v.document.createEvent("MouseEvents");t.initMouseEvent("click",!0,!0,v.window,0,0,0,0,0,!1,!1,!1,!1,0,null),v.document.body.appendChild(e),e.dispatchEvent(t),v.document.body.removeChild(e)},ko={formatChanged:M("formatChanged"),orientationChanged:M("orientationChanged"),dropupDismissed:M("dropupDismissed")},Co=function(n){return n.dom().innerHTML},Eo=function(n,e){var t,r,o=ze(n).dom(),i=fe.fromDom(o.createDocumentFragment()),u=(t=e,(r=(o||v.document).createElement("div")).innerHTML=t,Pe(fe.fromDom(r)));_e(i,u),Ue(n),Ge(n,i)},Do=function(n){return e=n,t=!1,fe.fromDom(e.dom().cloneNode(t));var e,t},Io=function(n){var e,t,r,o=Do(n);return e=o,t=fe.fromTag("div"),r=fe.fromDom(e.dom().cloneNode(!0)),Ge(t,r),Co(t)},Mo=function(n){return Io(n)},Ao=Object.freeze({events:function(c){return mr([vr(Yn(),function(o,i){var n,e,u=c.channels(),t=N(u),r=(n=t,(e=i).universal()?n:Sn(n,function(n){return yn(e.channels(),n)}));wn(r,function(n){var e=u[n](),t=e.schema(),r=Xt("channel["+n+"] data\nReceiver: "+Mo(o.element()),t,i.data());e.onReceive()(o,r)})})])}}),Bo=function(n){for(var e=[],t=function(n){e.push(n)},r=0;r<n.length;r++)n[r].each(t);return e},Ro=function(n,e){for(var t=0;t<n.length;t++){var r=e(n[t],t);if(r.isSome())return r}return V.none()},Fo="unknown",Vo=[],No=["alloy/data/Fields","alloy/debugging/Debugging"],Ho=function(){var n=new Error;if(n.stack!==undefined){var e=n.stack.split("\n");return kn(e,function(e){return 0<e.indexOf("alloy")&&!Cn(No,function(n){return-1<e.indexOf(n)}).isSome()}).getOr(Fo)}return Fo},zo={logEventCut:I,logEventStopped:I,logNoParent:I,logEventNoHandlers:I,logEventResponse:I,write:I},jo=function(n,e,t){var r,o="*"===Vo||yn(Vo,n)?(r=[],{logEventCut:function(n,e,t){r.push({outcome:"cut",target:e,purpose:t})},logEventStopped:function(n,e,t){r.push({outcome:"stopped",target:e,purpose:t})},logNoParent:function(n,e,t){r.push({outcome:"no-parent",target:e,purpose:t})},logEventNoHandlers:function(n,e){r.push({outcome:"no-handlers-left",target:e})},logEventResponse:function(n,e,t){r.push({outcome:"response",purpose:t,target:e})},write:function(){yn(["mousemove","mouseover","mouseout",ne()],n)||v.console.log(n,{event:n,target:e.dom(),sequence:xn(r,function(n){return yn(["cut","stopped","response"],n.outcome)?"{"+n.purpose+"} "+n.outcome+" at ("+Mo(n.target)+")":n.outcome})})}}):zo,i=t(o);return o.write(),i},Lo=M([er("menu"),er("selectedMenu")]),Po=M([er("item"),er("selectedItem")]),$o=(M(Ht(Po().concat(Lo()))),M(Ht(Po()))),Wo=or("initSize",[er("numColumns"),er("numRows")]),Go=function(n,e,t){var r;return Ho(),$t(e,e,t,(r=function(t){return tt.value(function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];return t.apply(undefined,n)})},Nt(function(n){return r(n)})))},_o=function(n){return Go(0,n,it(I))},Uo=function(n){return Go(0,n,it(V.none))},qo=function(n){return Go(0,n,ut())},Yo=function(n){return Go(0,n,ut())},Ko=function(n,e){return fr(n,M(e))},Xo=function(n){return fr(n,h)},Jo=M(Wo),Qo=[tr("channels",jt(tt.value,Ht([qo("onReceive"),ar("schema",Zt())])))],Zo=Gr({fields:Qo,name:"receiving",active:Ao}),ni=function(n,e){var t=oi(n,e),r=e.aria();r.update()(n,r,t)},ei=function(n,e,t){uo(n.element(),e.toggleClass()),ni(n,e)},ti=function(n,e,t){oo(n.element(),e.toggleClass()),ni(n,e)},ri=function(n,e,t){io(n.element(),e.toggleClass()),ni(n,e)},oi=function(n,e){return co(n.element(),e.toggleClass())},ii=function(n,e,t){(e.selected()?ti:ri)(n,e,t)},ui=Object.freeze({onLoad:ii,toggle:ei,isOn:oi,on:ti,off:ri}),ci=Object.freeze({exhibit:function(n,e,t){return Dr({})},events:function(n,e){var t,r,o,i=(t=n,r=e,o=ei,Or(function(n){o(n,t,r)})),u=Mr(n,e,ii);return mr(In([n.toggleOnExecute()?[i]:[],[u]]))}}),ai=function(n,e,t){Yr(n.element(),"aria-expanded",t)},si=[ar("selected",!1),er("toggleClass"),ar("toggleOnExecute",!0),sr("aria",{mode:"none"},Qt("mode",{pressed:[ar("syncWithExpanded",!1),Ko("update",function(n,e,t){Yr(n.element(),"aria-pressed",t),e.syncWithExpanded()&&ai(n,e,t)})],checked:[Ko("update",function(n,e,t){Yr(n.element(),"aria-checked",t)})],expanded:[Ko("update",ai)],selected:[Ko("update",function(n,e,t){Yr(n.element(),"aria-selected",t)})],none:[Ko("update",I)]}))],fi=Gr({fields:si,name:"toggling",active:ci,apis:ui}),li=function(t,r){return Zo.config({channels:St(ko.formatChanged(),{onReceive:function(n,e){e.command===t&&r(n,e.state)}})})},di=function(n){return Zo.config({channels:St(ko.orientationChanged(),{onReceive:n})})},mi=function(n,e){return{key:n,value:{onReceive:e}}},gi="tinymce-mobile",vi={resolve:function(n){return gi+"-"+n},prefix:M(gi)},pi=function(n,e){e.ignore()||(bo(n.element()),e.onFocus()(n))},hi=Object.freeze({focus:pi,blur:function(n,e){e.ignore()||yo(n.element())},isFocused:function(n){return e=n.element(),t=ze(e).dom(),e.dom()===t.activeElement;var e,t}}),bi=Object.freeze({exhibit:function(n,e){return e.ignore()?Dr({}):Dr({attributes:{tabindex:"-1"}})},events:function(t){return mr([vr(Un(),function(n,e){pi(n,t),e.stop()})])}}),yi=[_o("onFocus"),ar("ignore",!1)],xi=Gr({fields:yi,name:"focusing",active:bi,apis:hi}),wi=function(n){return n.style!==undefined&&S(n.style.getPropertyValue)},Si=function(n,e,t){if(!b(t))throw v.console.error("Invalid call to CSS.set. Property ",e,":: Value ",t,":: Element ",n),new Error("CSS value must be a string: "+t);wi(n)&&n.style.setProperty(e,t)},Oi=function(n,e,t){var r=n.dom();Si(r,e,t)},Ti=function(n,e){var t=n.dom();H(e,function(n,e){Si(t,e,n)})},ki=function(n,e){var t=n.dom(),r=v.window.getComputedStyle(t).getPropertyValue(e),o=""!==r||be(n)?r:Ci(t,e);return null===o?undefined:o},Ci=function(n,e){return wi(n)?n.style.getPropertyValue(e):""},Ei=function(n,e){var t=n.dom(),r=Ci(t,e);return V.from(r).filter(function(n){return 0<n.length})},Di=function(n,e){var t,r,o=n.dom();r=e,wi(t=o)&&t.style.removeProperty(r),Jr(n,"style")&&""===Xr(n,"style").replace(/^\s+|\s+$/g,"")&&Qr(n,"style")},Ii=function(n){return n.dom().offsetWidth};function Mi(r,o){var n=function(n){var e=o(n);if(e<=0||null===e){var t=ki(n,r);return parseFloat(t)||0}return e},i=function(o,n){return Tn(n,function(n,e){var t=ki(o,e),r=t===undefined?0:parseInt(t,10);return isNaN(r)?n:n+r},0)};return{set:function(n,e){if(!O(e)&&!e.match(/^[0-9]+$/))throw new Error(r+".set accepts only positive integer values. Value was "+e);var t=n.dom();wi(t)&&(t.style[r]=e+"px")},get:n,getOuter:n,aggregate:i,max:function(n,e,t){var r=i(n,t);return r<e?e-r:0}}}var Ai,Bi,Ri=Mi("height",function(n){var e=n.dom();return be(n)?e.getBoundingClientRect().height:e.offsetHeight}),Fi=function(n){return Ri.get(n)},Vi=function(n,e,t){return Sn(function(n,e){for(var t=S(e)?e:M(!1),r=n.dom(),o=[];null!==r.parentNode&&r.parentNode!==undefined;){var i=r.parentNode,u=fe.fromDom(i);if(o.push(u),!0===t(u))break;r=i}return o}(n,t),e)},Ni=function(n,e){return Sn(Le(t=n).map(Pe).map(function(n){return Sn(n,function(n){return!He(t,n)})}).getOr([]),e);var t},Hi=function(n,e){return Ve(e,n)},zi=function(n){return Ne(n)},ji=function(n,e,t){return vo(n,function(n){return Re(n,e)},t)},Li=function(n,e){return Ne(e,n)},Pi=function(n,e,t){return go(Re,ji,n,e,t)},$i=function(n,e,t){var r=Bn(n.slice(0,e)),o=Bn(n.slice(e+1));return kn(r.concat(o),t)},Wi=function(n,e,t){var r=Bn(n.slice(0,e));return kn(r,t)},Gi=function(n,e,t){var r=n.slice(0,e),o=n.slice(e+1);return kn(o.concat(r),t)},_i=function(n,e,t){var r=n.slice(e+1);return kn(r,t)},Ui=function(t){return function(n){var e=n.raw();return yn(t,e.which)}},qi=function(n){return function(e){return An(n,function(n){return n(e)})}},Yi=function(n){return!0===n.raw().shiftKey},Ki=function(n){return!0===n.raw().ctrlKey},Xi=w(Yi),Ji=function(n,e){return{matches:n,classification:e}},Qi=function(n,e,t,r){var o=n+e;return r<o?t:o<t?r:o},Zi=function(n,e,t){return n<=e?e:t<=n?t:n},nu=function(e,t,n){var r=Hi(e.element(),"."+t.highlightClass());wn(r,function(n){io(n,t.highlightClass()),e.getSystem().getByDom(n).each(function(n){t.onDehighlight()(e,n)})})},eu=function(n,e,t,r){var o=tu(n,e,t,r);nu(n,e),oo(r.element(),e.highlightClass()),o||e.onHighlight()(n,r)},tu=function(n,e,t,r){return co(r.element(),e.highlightClass())},ru=function(n,e,t,r){var o=Hi(n.element(),"."+e.itemClass());return V.from(o[r]).fold(function(){return tt.error("No element found with index "+r)},n.getSystem().getByDom)},ou=function(e,n,t){return Li(e.element(),"."+n.itemClass()).bind(function(n){return e.getSystem().getByDom(n).toOption()})},iu=function(e,n,t){var r=Hi(e.element(),"."+n.itemClass());return(0<r.length?V.some(r[r.length-1]):V.none()).bind(function(n){return e.getSystem().getByDom(n).toOption()})},uu=function(t,e,n,r){var o=Hi(t.element(),"."+e.itemClass());return Cn(o,function(n){return co(n,e.highlightClass())}).bind(function(n){var e=Qi(n,r,0,o.length-1);return t.getSystem().getByDom(o[e]).toOption()})},cu=Object.freeze({dehighlightAll:nu,dehighlight:function(n,e,t,r){var o=tu(n,e,t,r);io(r.element(),e.highlightClass()),o&&e.onDehighlight()(n,r)},highlight:eu,highlightFirst:function(e,t,r){ou(e,t).each(function(n){eu(e,t,r,n)})},highlightLast:function(e,t,r){iu(e,t).each(function(n){eu(e,t,r,n)})},highlightAt:function(e,t,r,n){ru(e,t,r,n).fold(function(n){throw new Error(n)},function(n){eu(e,t,r,n)})},highlightBy:function(e,t,r,n){var o=Hi(e.element(),"."+t.itemClass()),i=Bo(xn(o,function(n){return e.getSystem().getByDom(n).toOption()}));kn(i,n).each(function(n){eu(e,t,r,n)})},isHighlighted:tu,getHighlighted:function(e,n,t){return Li(e.element(),"."+n.highlightClass()).bind(function(n){return e.getSystem().getByDom(n).toOption()})},getFirst:ou,getLast:iu,getPrevious:function(n,e,t){return uu(n,e,0,-1)},getNext:function(n,e,t){return uu(n,e,0,1)}}),au=[er("highlightClass"),er("itemClass"),_o("onHighlight"),_o("onDehighlight")],su=Gr({fields:au,name:"highlighting",apis:cu}),fu=function(){return{get:function(n){return wo(n.element())},set:function(n,e){n.getSystem().triggerFocus(e,n.element())}}},lu=function(n,e,c,t,r,i){var u=function(e,t,r,o){var n,i,u=c(e,t,r,o);return(n=u,i=t.event(),kn(n,function(n){return n.matches(i)}).map(function(n){return n.classification})).bind(function(n){return n(e,t,r,o)})},o={schema:function(){return n.concat([ar("focusManager",fu()),Ko("handler",o),Ko("state",e)])},processKey:u,toEvents:function(r,o){var n=t(r,o),e=mr(i.map(function(t){return vr(Un(),function(n,e){t(n,r,o,e),e.stop()})}).toArray().concat([vr(Y(),function(n,e){u(n,e,r,o).each(function(n){e.stop()})})]));return C(n,e)},toApis:r};return o},du=function(n){var e=[ir("onEscape"),ir("onEnter"),ar("selector",'[data-alloy-tabstop="true"]'),ar("firstTabstop",0),ar("useTabstopAt",M(!0)),ir("visibilitySelector")].concat([n]),u=function(n,e){var t=n.visibilitySelector().bind(function(n){return Pi(e,n)}).getOr(e);return 0<Fi(t)},c=function(e,n,t,r,o){return o(n,t,function(n){return u(e=r,t=n)&&e.useTabstopAt()(t);var e,t}).fold(function(){return r.cyclic()?V.some(!0):V.none()},function(n){return r.focusManager().set(e,n),V.some(!0)})},i=function(e,n,t,r){var o,i,u=Hi(e.element(),t.selector());return(o=e,i=t,i.focusManager().get(o).bind(function(n){return Pi(n,i.selector())})).bind(function(n){return Cn(u,l(He,n)).bind(function(n){return c(e,u,n,t,r)})})},t=M([Ji(qi([Yi,Ui([9])]),function(n,e,t,r){var o=t.cyclic()?$i:Wi;return i(n,0,t,o)}),Ji(Ui([9]),function(n,e,t,r){var o=t.cyclic()?Gi:_i;return i(n,0,t,o)}),Ji(Ui([27]),function(e,t,n,r){return n.onEscape().bind(function(n){return n(e,t)})}),Ji(qi([Xi,Ui([13])]),function(e,t,n,r){return n.onEnter().bind(function(n){return n(e,t)})})]),r=M({}),o=M({});return lu(e,Lr.init,t,r,o,V.some(function(e,t){var n,r,o,i;(n=e,r=t,o=Hi(n.element(),r.selector()),i=Sn(o,function(n){return u(r,n)}),V.from(i[r.firstTabstop()])).each(function(n){t.focusManager().set(e,n)})}))},mu=du(fr("cyclic",M(!1))),gu=du(fr("cyclic",M(!0))),vu=function(n){return"input"===ge(n)&&"radio"!==Xr(n,"type")||"textarea"===ge(n)},pu=function(n,e,t){return vu(t)&&Ui([32])(e.event())?V.none():(ce(n,t,Kn()),V.some(!0))},hu=[ar("execute",pu),ar("useSpace",!1),ar("useEnter",!0),ar("useControlEnter",!1),ar("useDown",!1)],bu=function(n,e,t){return t.execute()(n,e,n.element())},yu=M({}),xu=M({}),wu=lu(hu,Lr.init,function(n,e,t,r){var o=t.useSpace()&&!vu(n.element())?[32]:[],i=t.useEnter()?[13]:[],u=t.useDown()?[40]:[],c=o.concat(i).concat(u);return[Ji(Ui(c),bu)].concat(t.useControlEnter()?[Ji(qi([Ki,Ui([13])]),bu)]:[])},yu,xu,V.none()),Su=function(n){var t=mo(V.none());return Pr({readState:M({}),setGridSize:function(n,e){t.set(V.some({numRows:M(n),numColumns:M(e)}))},getNumRows:function(){return t.get().map(function(n){return n.numRows()})},getNumColumns:function(){return t.get().map(function(n){return n.numColumns()})}})},Ou=Object.freeze({flatgrid:Su,init:function(n){return n.state()(n)}}),Tu=function(e,t){return function(n){return"rtl"===ku(n)?t:e}},ku=function(n){return"rtl"===ki(n,"direction")?"rtl":"ltr"},Cu=function(i){return function(n,e,t,r){var o=i(n.element());return Mu(o,n,e,t,r)}},Eu=function(n,e){var t=Tu(n,e);return Cu(t)},Du=function(n,e){var t=Tu(e,n);return Cu(t)},Iu=function(o){return function(n,e,t,r){return Mu(o,n,e,t,r)}},Mu=function(e,t,n,r,o){return r.focusManager().get(t).bind(function(n){return e(t.element(),n,r,o)}).map(function(n){return r.focusManager().set(t,n),!0})},Au=Iu,Bu=Iu,Ru=Iu,Fu=function(n){var e,t=n.dom();return!((e=t).offsetWidth<=0&&e.offsetHeight<=0)},Vu=Ee(["index","candidates"],[]),Nu=function(n,e,t){return Hu(n,e,t)},Hu=function(n,e,t,r){var o,i=l(He,e),u=Hi(n,t),c=Sn(u,Fu);return Cn(o=c,i).map(function(n){return Vu({index:n,candidates:o})})},zu=function(n,e){return Cn(n,function(n){return He(e,n)})},ju=function(t,n,r,e){return e(Math.floor(n/r),n%r).bind(function(n){var e=n.row()*r+n.column();return 0<=e&&e<t.length?V.some(t[e]):V.none()})},Lu=function(o,n,i,u,c){return ju(o,n,u,function(n,e){var t=n===i-1?o.length-n*u:u,r=Qi(e,c,0,t-1);return V.some({row:M(n),column:M(r)})})},Pu=function(i,n,u,c,a){return ju(i,n,c,function(n,e){var t=Qi(n,a,0,u-1),r=t===u-1?i.length-t*c:c,o=Zi(e,0,r-1);return V.some({row:M(t),column:M(o)})})},$u=[er("selector"),ar("execute",pu),Uo("onEscape"),ar("captureTab",!1),Jo()],Wu=function(o){return function(n,e,t,r){return Nu(n,e,t.selector()).bind(function(n){return o(n.candidates(),n.index(),r.getNumRows().getOr(t.initSize().numRows()),r.getNumColumns().getOr(t.initSize().numColumns()))})}},Gu=function(n,e,t,r){return t.captureTab()?V.some(!0):V.none()},_u=Wu(function(n,e,t,r){return Lu(n,e,t,r,-1)}),Uu=Wu(function(n,e,t,r){return Lu(n,e,t,r,1)}),qu=Wu(function(n,e,t,r){return Pu(n,e,t,r,-1)}),Yu=Wu(function(n,e,t,r){return Pu(n,e,t,r,1)}),Ku=M([Ji(Ui([37]),Eu(_u,Uu)),Ji(Ui([39]),Du(_u,Uu)),Ji(Ui([38]),Au(qu)),Ji(Ui([40]),Bu(Yu)),Ji(qi([Yi,Ui([9])]),Gu),Ji(qi([Xi,Ui([9])]),Gu),Ji(Ui([27]),function(n,e,t,r){return t.onEscape()(n,e)}),Ji(Ui([32].concat([13])),function(e,t,r,n){return(o=e,i=r,i.focusManager().get(o).bind(function(n){return Pi(n,i.selector())})).bind(function(n){return r.execute()(e,t,n)});var o,i})]),Xu=M({}),Ju=lu($u,Su,Ku,Xu,{},V.some(function(e,t,n){Li(e.element(),t.selector()).each(function(n){t.focusManager().set(e,n)})})),Qu=function(n,e,t,o){return Nu(n,t,e).bind(function(n){var e=n.index(),t=n.candidates(),r=Qi(e,o,0,t.length-1);return V.from(t[r])})},Zu=[er("selector"),ar("getInitial",V.none),ar("execute",pu),ar("executeOnMove",!1),ar("allowVertical",!0)],nc=function(e,t,r){return(n=e,o=r,o.focusManager().get(n).bind(function(n){return Pi(n,o.selector())})).bind(function(n){return r.execute()(e,t,n)});var n,o},ec=function(n,e,t){return Qu(n,t.selector(),e,-1)},tc=function(n,e,t){return Qu(n,t.selector(),e,1)},rc=function(r){return function(n,e,t){return r(n,e,t).bind(function(){return t.executeOnMove()?nc(n,e,t):V.some(!0)})}},oc=M({}),ic=M({}),uc=lu(Zu,Lr.init,function(n,e,t,r){var o=[37].concat(t.allowVertical()?[38]:[]),i=[39].concat(t.allowVertical()?[40]:[]);return[Ji(Ui(o),rc(Eu(ec,tc))),Ji(Ui(i),rc(Du(ec,tc))),Ji(Ui([13]),nc),Ji(Ui([32]),nc)]},oc,ic,V.some(function(e,t){t.getInitial()(e).or(Li(e.element(),t.selector())).each(function(n){t.focusManager().set(e,n)})})),cc=Ee(["rowIndex","columnIndex","cell"],[]),ac=function(n,e,t){return V.from(n[e]).bind(function(n){return V.from(n[t]).map(function(n){return cc({rowIndex:e,columnIndex:t,cell:n})})})},sc=function(n,e,t,r){var o=n[e].length,i=Qi(t,r,0,o-1);return ac(n,e,i)},fc=function(n,e,t,r){var o=Qi(t,r,0,n.length-1),i=n[o].length,u=Zi(e,0,i-1);return ac(n,o,u)},lc=function(n,e,t,r){var o=n[e].length,i=Zi(t+r,0,o-1);return ac(n,e,i)},dc=function(n,e,t,r){var o=Zi(t+r,0,n.length-1),i=n[o].length,u=Zi(e,0,i-1);return ac(n,o,u)},mc=[or("selectors",[er("row"),er("cell")]),ar("cycles",!0),ar("previousSelector",V.none),ar("execute",pu)],gc=function(n,e){return function(t,r,i){var u=i.cycles()?n:e;return Pi(r,i.selectors().row()).bind(function(n){var e=Hi(n,i.selectors().cell());return zu(e,r).bind(function(r){var o=Hi(t,i.selectors().row());return zu(o,n).bind(function(n){var e,t=(e=i,xn(o,function(n){return Hi(n,e.selectors().cell())}));return u(t,n,r).map(function(n){return n.cell()})})})})}},vc=gc(function(n,e,t){return sc(n,e,t,-1)},function(n,e,t){return lc(n,e,t,-1)}),pc=gc(function(n,e,t){return sc(n,e,t,1)},function(n,e,t){return lc(n,e,t,1)}),hc=gc(function(n,e,t){return fc(n,t,e,-1)},function(n,e,t){return dc(n,t,e,-1)}),bc=gc(function(n,e,t){return fc(n,t,e,1)},function(n,e,t){return dc(n,t,e,1)}),yc=M([Ji(Ui([37]),Eu(vc,pc)),Ji(Ui([39]),Du(vc,pc)),Ji(Ui([38]),Au(hc)),Ji(Ui([40]),Bu(bc)),Ji(Ui([32].concat([13])),function(e,t,r){return wo(e.element()).bind(function(n){return r.execute()(e,t,n)})})]),xc=M({}),wc=M({}),Sc=lu(mc,Lr.init,yc,xc,wc,V.some(function(e,t){t.previousSelector()(e).orThunk(function(){var n=t.selectors();return Li(e.element(),n.cell())}).each(function(n){t.focusManager().set(e,n)})})),Oc=[er("selector"),ar("execute",pu),ar("moveOnTab",!1)],Tc=function(e,t,r){return r.focusManager().get(e).bind(function(n){return r.execute()(e,t,n)})},kc=function(n,e,t){return Qu(n,t.selector(),e,-1)},Cc=function(n,e,t){return Qu(n,t.selector(),e,1)},Ec=M([Ji(Ui([38]),Ru(kc)),Ji(Ui([40]),Ru(Cc)),Ji(qi([Yi,Ui([9])]),function(n,e,t){return t.moveOnTab()?Ru(kc)(n,e,t):V.none()}),Ji(qi([Xi,Ui([9])]),function(n,e,t){return t.moveOnTab()?Ru(Cc)(n,e,t):V.none()}),Ji(Ui([13]),Tc),Ji(Ui([32]),Tc)]),Dc=M({}),Ic=M({}),Mc=lu(Oc,Lr.init,Ec,Dc,Ic,V.some(function(e,t){Li(e.element(),t.selector()).each(function(n){t.focusManager().set(e,n)})})),Ac=[Uo("onSpace"),Uo("onEnter"),Uo("onShiftEnter"),Uo("onLeft"),Uo("onRight"),Uo("onTab"),Uo("onShiftTab"),Uo("onUp"),Uo("onDown"),Uo("onEscape"),ir("focusIn")],Bc=lu(Ac,Lr.init,function(n,e,t){return[Ji(Ui([32]),t.onSpace()),Ji(qi([Xi,Ui([13])]),t.onEnter()),Ji(qi([Yi,Ui([13])]),t.onShiftEnter()),Ji(qi([Yi,Ui([9])]),t.onShiftTab()),Ji(qi([Xi,Ui([9])]),t.onTab()),Ji(Ui([38]),t.onUp()),Ji(Ui([40]),t.onDown()),Ji(Ui([37]),t.onLeft()),Ji(Ui([39]),t.onRight()),Ji(Ui([32]),t.onSpace()),Ji(Ui([27]),t.onEscape())]},function(){return{}},function(){return{}},V.some(function(e,t){return t.focusIn().bind(function(n){return n(e,t)})})),Rc=mu.schema(),Fc=gu.schema(),Vc=uc.schema(),Nc=Ju.schema(),Hc=Sc.schema(),zc=wu.schema(),jc=Mc.schema(),Lc=Bc.schema(),Pc=(Bi=Kt("Creating behaviour: "+(Ai={branchKey:"mode",branches:Object.freeze({acyclic:Rc,cyclic:Fc,flow:Vc,flatgrid:Nc,matrix:Hc,execution:zc,menu:jc,special:Lc}),name:"keying",active:{events:function(n,e){return n.handler().toEvents(n,e)}},apis:{focusIn:function(n){n.getSystem().triggerFocus(n.element(),n.element())},setGridSize:function(n,e,t,r,o){kt(t,"setGridSize")?t.setGridSize(r,o):v.console.error("Layout does not support setGridSize")}},state:Ou}).name,_r,Ai),Ar(Qt(Bi.branchKey,Bi.branches),Bi.name,Bi.active,Bi.apis,Bi.extra,Bi.state)),$c=function(r,n){return e=r,t={},o=xn(n,function(n){return e=n.name(),t="Cannot configure "+n.name()+" for "+r,$t(e,e,ct(),Nt(function(n){return tt.error("The field: "+e+" is forbidden. "+t)}));var e,t}).concat([fr("dump",h)]),$t(e,e,it(t),zt(o));var e,t,o},Wc=function(n){return n.dump()},Gc="placeholder",_c=rt([{single:["required","valueThunk"]},{multiple:["required","valueThunks"]}]),Uc=function(n,e,t,r){return t.uiType===Gc?(i=t,u=r,(o=n).exists(function(n){return n!==i.owner})?_c.single(!0,M(i)):wt(u,i.name).fold(function(){throw new Error("Unknown placeholder component: "+i.name+"\nKnown: ["+N(u)+"]\nNamespace: "+o.getOr("none")+"\nSpec: "+It(i,null,2))},function(n){return n.replace()})):_c.single(!1,M(t));var o,i,u},qc=function(i,u,c,a){return Uc(i,0,c,a).fold(function(n,e){var t=e(u,c.config,c.validated),r=wt(t,"components").getOr([]),o=Mn(r,function(n){return qc(i,u,n,a)});return[C(t,{components:o})]},function(n,e){return e(u,c.config,c.validated)})},Yc=function(e,t,n,r){var o,i,u,c=z(r,function(n,e){return r=n,o=!1,{name:M(t=e),required:function(){return r.fold(function(n,e){return n},function(n,e){return n})},used:function(){return o},replace:function(){if(!0===o)throw new Error("Trying to use the same placeholder more than once: "+t);return o=!0,r}};var t,r,o}),a=(o=e,i=t,u=c,Mn(n,function(n){return qc(o,i,n,u)}));return H(c,function(n){if(!1===n.used()&&n.required())throw new Error("Placeholder: "+n.name()+" was not found in components list\nNamespace: "+e.getOr("none")+"\nComponents: "+It(t.components(),null,2))}),a},Kc=_c.single,Xc=_c.multiple,Jc=M(Gc),Qc=0,Zc=function(n){var e=(new Date).getTime();return n+"_"+Math.floor(1e9*Math.random())+ ++Qc+String(e)},na=rt([{required:["data"]},{external:["data"]},{optional:["data"]},{group:["data"]}]),ea=ar("factory",{sketch:h}),ta=ar("schema",[]),ra=er("name"),oa=$t("pname","pname",at(function(n){return"<alloy."+Zc(n.name)+">"}),Zt()),ia=ar("defaults",M({})),ua=ar("overrides",M({})),ca=zt([ea,ta,ra,oa,ia,ua]),aa=zt([ea,ta,ra,oa,ia,ua]),sa=zt([ea,ta,ra,er("unit"),oa,ia,ua]),fa=function(n){var e=function(n){return n.name()};return n.fold(e,e,e,e)},la=function(t,r){return function(n){var e=Xt("Converting part type",r,n);return t(e)}},da=la(na.required,ca),ma=la(na.optional,aa),ga=la(na.group,sa),va=M("entirety"),pa=function(n,e,t,r){var o=t;return C(e.defaults()(n,t,r),t,{uid:n.partUids()[e.name()]},e.overrides()(n,t,r),{"debug.sketcher":St("part-"+e.name(),o)})},ha=function(o,n){var i={};return wn(n,function(n){var e;(e=n,e.fold(V.some,V.none,V.some,V.some)).each(function(t){var r=ba(o,t.pname());i[t.name()]=function(n){var e=Kt("Part: "+t.name()+" in "+o,zt(t.schema()),n);return C(r,{config:n,validated:e})}})}),i},ba=function(n,e){return{uiType:Jc(),owner:n,name:e}},ya=function(n,e,t){return r=e,i={},o={},wn(t,function(n){n.fold(function(r){i[r.pname()]=Kc(!0,function(n,e,t){return r.factory().sketch(pa(n,r,e,t))})},function(n){var e=r.parts()[n.name()]();o[n.name()]=M(pa(r,n,e[va()]()))},function(r){i[r.pname()]=Kc(!1,function(n,e,t){return r.factory().sketch(pa(n,r,e,t))})},function(o){i[o.pname()]=Xc(!0,function(e,n,t){var r=e[o.name()]();return xn(r,function(n){return o.factory().sketch(C(o.defaults()(e,n),n,o.overrides()(e,n)))})})})}),{internals:M(i),externals:M(o)};var r,i,o},xa=function(n,e,t){return Yc(V.some(n),e,e.components(),t)},wa=function(n,e,t){var r=e.partUids()[t];return n.getSystem().getByUid(r).toOption()},Sa=function(n,e,t){return wa(n,e,t).getOrDie("Could not find part: "+t)},Oa=function(e,n){var t=xn(n,fa);return Ot(xn(t,function(n){return{key:n,value:e+"-"+n}}))},Ta=function(e){return $t("partUids","partUids",st(function(n){return Oa(n.uid,e)}),Zt())},ka=Zc("alloy-premade"),Ca=Zc("api"),Ea=function(n){return St(ka,n)},Da=function(o){return n=function(n){for(var e=[],t=1;t<arguments.length;t++)e[t-1]=arguments[t];var r=n.config(Ca);return o.apply(undefined,[r].concat([n].concat(e)))},e=o.toString(),t=e.indexOf(")")+1,r=e.indexOf("("),i=e.substring(r+1,t-1).split(/,\s*/),n.toFunctionAnnotation=function(){return{name:"OVERRIDE",parameters:Tr(i.slice(1))}},n;var n,e,t,r,i},Ia=M(Ca),Ma=M("alloy-id-"),Aa=M("data-alloy-id"),Ba=Ma(),Ra=Aa(),Fa=function(n){var e=pe(n)?Xr(n,Ra):null;return V.from(e)},Va=function(n){return Zc(n)},Na=function(n,e,t,r,o){var i,u,c=(u=o,(0<(i=r).length?[or("parts",i)]:[]).concat([er("uid"),ar("dom",{}),ar("components",[]),Xo("originalSpec"),ar("debug.sketcher",{})]).concat(u));return Xt(n+" [SpecSchema]",Ht(c.concat(e)),t)},Ha=function(n,e,t,r,o){var i=za(o),u=Mn(t,function(n){return n.fold(V.none,V.some,V.none,V.none).map(function(n){return or(n.name(),n.schema().concat([Xo(va())]))}).toArray()}),c=Ta(t),a=Na(n,e,i,u,[c]),s=ya(0,a,t),f=xa(n,a,s.internals());return C(r(a,f,i,s.externals()),{"debug.sketcher":St(n,o)})},za=function(n){return C({uid:Va("uid")},n)},ja=Ht([er("name"),er("factory"),er("configFields"),ar("apis",{}),ar("extraApis",{})]),La=Ht([er("name"),er("factory"),er("configFields"),er("partFields"),ar("apis",{}),ar("extraApis",{})]),Pa=function(n){var c=Kt("Sketcher for "+n.name,ja,n),e=z(c.apis,Da),t=z(c.extraApis,function(n,e){return kr(n,e)});return C({name:M(c.name),partFields:M([]),configFields:M(c.configFields),sketch:function(n){return e=c.name,t=c.configFields,r=c.factory,i=za(o=n),u=Na(e,t,i,[],[]),C(r(u,i),{"debug.sketcher":St(e,o)});var e,t,r,o,i,u}},e,t)},$a=function(n){var e=Kt("Sketcher for "+n.name,La,n),t=ha(e.name,e.partFields),r=z(e.apis,Da),o=z(e.extraApis,function(n,e){return kr(n,e)});return C({name:M(e.name),partFields:M(e.partFields),configFields:M(e.configFields),sketch:function(n){return Ha(e.name,e.configFields,e.partFields,e.factory,n)},parts:M(t)},r,o)},Wa=Pa({name:"Button",factory:function(n){var e,t,r,o=(e=n.action(),t=function(n,e){e.stop(),ue(n)},r=Gn.detect().deviceType.isTouch()?[vr(Jn(),t)]:[vr(J(),t),vr(G(),function(n,e){e.cut()})],mr(In([e.map(function(t){return vr(Kn(),function(n,e){t(n),e.stop()})}).toArray(),r]))),i=wt(n.dom(),"attributes").bind(yt("type")),u=wt(n.dom(),"tag");return{uid:n.uid(),dom:n.dom(),components:n.components(),events:o,behaviours:C($r([xi.config({}),Pc.config({mode:"execution",useSpace:!0,useEnter:!0})]),Wc(n.buttonBehaviours())),domModification:{attributes:C(i.fold(function(){return u.is("button")?{type:"button"}:{}},function(n){return{}}),{role:n.role().getOr("button")})},eventOrder:n.eventOrder()}},configFields:[ar("uid",undefined),er("dom"),ar("components",[]),$c("buttonBehaviours",[xi,Pc]),ir("action"),ir("role"),ar("eventOrder",{})]}),Ga=Gr({fields:[],name:"unselecting",active:Object.freeze({events:function(n){return mr([gr(Z(),M(!0))])},exhibit:function(n,e){return Dr({styles:{"-webkit-user-select":"none","user-select":"none","-ms-user-select":"none","-moz-user-select":"-moz-none"},attributes:{unselectable:"on"}})}})}),_a=function(n){var e,t,r,o=fe.fromHtml(n),i=Pe(o),u=(t=(e=o).dom().attributes!==undefined?e.dom().attributes:[],Tn(t,function(n,e){return"class"===e.name?n:C(n,St(e.name,e.value))},{})),c=(r=o,Array.prototype.slice.call(r.dom().classList,0)),a=0===i.length?{}:{innerHtml:Co(o)};return C({tag:ge(o),classes:c,attributes:u},a)},Ua=function(n){var e,o,t=(e=n,o={prefix:vi.prefix()},e.replace(/\$\{([^{}]*)\}/g,function(n,e){var t,r=o[e];return"string"==(t=typeof r)||"number"===t?r.toString():n}));return _a(t)},qa=function(n){return{dom:Ua(n)}},Ya=function(n){return $r([fi.config({toggleClass:vi.resolve("toolbar-button-selected"),toggleOnExecute:!1,aria:{mode:"pressed"}}),li(n,function(n,e){(e?fi.on:fi.off)(n)})])},Ka=function(n,e,t){return Wa.sketch({dom:Ua('<span class="${prefix}-toolbar-button ${prefix}-icon-'+n+' ${prefix}-icon"></span>'),action:e,buttonBehaviours:C($r([Ga.config({})]),t)})},Xa={forToolbar:Ka,forToolbarCommand:function(n,e){return Ka(e,function(){n.execCommand(e)},{})},forToolbarStateAction:function(n,e,t,r){var o=Ya(t);return Ka(e,r,o)},forToolbarStateCommand:function(n,e){var t=Ya(e);return Ka(e,function(){n.execCommand(e)},t)}},Ja=function(t,r){return{left:M(t),top:M(r),translate:function(n,e){return Ja(t+n,r+e)}}},Qa=Ja,Za=function(n,e,t){return Math.max(e,Math.min(t,n))},ns=function(n,e,t,r,o,i,u){var c=t-e;if(r<n.left)return e-1;if(r>n.right)return t+1;var a,s,f,l,d=Math.min(n.right,Math.max(r,n.left))-n.left,m=Za(d/n.width*c+e,e-1,t+1),g=Math.round(m);return i&&e<=m&&m<=t?(a=m,s=e,f=t,l=o,u.fold(function(){var n=a-s,e=Math.round(n/l)*l;return Za(s+e,s-1,f+1)},function(n){var e=(a-n)%l,t=Math.round(e/l),r=Math.floor((a-n)/l),o=Math.floor((f-n)/l),i=n+Math.min(o,r+t)*l;return Math.max(n,i)})):g},es="slider.change.value",ts=Gn.detect().deviceType.isTouch(),rs=function(n){return function(n){var e=n.event().raw();if(ts){var t=e;return t.touches!==undefined&&1===t.touches.length?V.some(t.touches[0]).map(function(n){return Qa(n.clientX,n.clientY)}):V.none()}var r=e;return r.clientX!==undefined?V.some(r).map(function(n){return Qa(n.clientX,n.clientY)}):V.none()}(n).map(function(n){return n.left()})},os=function(n,e){ie(n,es,{value:e})},is=function(i,u,c,n){return rs(n).map(function(n){var e,t,r,o;return e=i,r=n,o=ns(c,(t=u).min(),t.max(),r,t.stepSize(),t.snapToGrid(),t.snapStart()),os(e,o),n})},us=function(n,e){var t,r,o,i,u=(t=e.value().get(),r=e.min(),o=e.max(),i=e.stepSize(),t<r?t:o<t?o:t===r?r-1:Math.max(r,t-i));os(n,u)},cs=function(n,e){var t,r,o,i,u=(t=e.value().get(),r=e.min(),o=e.max(),i=e.stepSize(),o<t?t:t<r?r:t===o?o+1:Math.min(o,t+i));os(n,u)},as=Gn.detect().deviceType.isTouch(),ss=function(n,r){return ma({name:n+"-edge",overrides:function(n){var e=mr([pr(P(),r,[n])]),t=mr([pr(G(),r,[n]),pr(_(),function(n,e){e.mouseIsDown().get()&&r(n,e)},[n])]);return{events:as?e:t}}})},fs=[ss("left",function(n,e){os(n,e.min()-1)}),ss("right",function(n,e){os(n,e.max()+1)}),da({name:"thumb",defaults:M({dom:{styles:{position:"absolute"}}}),overrides:function(n){return{events:mr([br(P(),n,"spectrum"),br($(),n,"spectrum"),br(W(),n,"spectrum")])}}}),da({schema:[fr("mouseIsDown",function(){return mo(!1)})],name:"spectrum",overrides:function(r){var t=function(n,e){var t=n.element().dom().getBoundingClientRect();is(n,r,t,e)},n=mr([vr(P(),t),vr($(),t)]),e=mr([vr(G(),t),vr(_(),function(n,e){r.mouseIsDown().get()&&t(n,e)})]);return{behaviours:$r(as?[]:[Pc.config({mode:"special",onLeft:function(n){return us(n,r),V.some(!0)},onRight:function(n){return cs(n,r),V.some(!0)}}),xi.config({})]),events:as?n:e}}})],ls=function(n,e,t){e.store().manager().onLoad(n,e,t)},ds=function(n,e,t){e.store().manager().onUnload(n,e,t)},ms=Object.freeze({onLoad:ls,onUnload:ds,setValue:function(n,e,t,r){e.store().manager().setValue(n,e,t,r)},getValue:function(n,e,t){return e.store().manager().getValue(n,e,t)}}),gs=Object.freeze({events:function(t,r){var n=t.resetOnDom()?[xr(function(n,e){ls(n,t,r)}),wr(function(n,e){ds(n,t,r)})]:[Mr(t,r,ls)];return mr(n)}}),vs=function(){var n=mo(null);return Pr({set:n.set,get:n.get,isNotSet:function(){return null===n.get()},clear:function(){n.set(null)},readState:function(){return{mode:"memory",value:n.get()}}})},ps=function(){var n=mo({});return Pr({readState:function(){return{mode:"dataset",dataset:n.get()}},set:n.set,get:n.get})},hs=Object.freeze({memory:vs,dataset:ps,manual:function(){return Pr({readState:function(){}})},init:function(n){return n.store().manager().state(n)}}),bs=function(n,e,t,r){e.store().getDataKey(),t.set({}),e.store().setData()(n,r),e.onSetValue()(n,r)},ys=[ir("initialValue"),er("getFallbackEntry"),er("getDataKey"),er("setData"),Ko("manager",{setValue:bs,getValue:function(n,e,t){var r=e.store().getDataKey()(n),o=t.get();return wt(o,r).fold(function(){return e.store().getFallbackEntry()(r)},function(n){return n})},onLoad:function(e,t,r){t.store().initialValue().each(function(n){bs(e,t,r,n)})},onUnload:function(n,e,t){t.set({})},state:ps})],xs=[er("getValue"),ar("setValue",I),ir("initialValue"),Ko("manager",{setValue:function(n,e,t,r){e.store().setValue()(n,r),e.onSetValue()(n,r)},getValue:function(n,e,t){return e.store().getValue()(n)},onLoad:function(e,t,n){t.store().initialValue().each(function(n){t.store().setValue()(e,n)})},onUnload:I,state:Lr.init})],ws=[ir("initialValue"),Ko("manager",{setValue:function(n,e,t,r){t.set(r),e.onSetValue()(n,r)},getValue:function(n,e,t){return t.get()},onLoad:function(n,e,t){e.store().initialValue().each(function(n){t.isNotSet()&&t.set(n)})},onUnload:function(n,e,t){t.clear()},state:vs})],Ss=[sr("store",{mode:"memory"},Qt("mode",{memory:ws,manual:xs,dataset:ys})),_o("onSetValue"),ar("resetOnDom",!1)],Os=Gr({fields:Ss,name:"representing",active:gs,apis:ms,extra:{setValueFrom:function(n,e){var t=Os.getValue(e);Os.setValue(n,t)}},state:hs}),Ts=Gn.detect().deviceType.isTouch(),ks=[er("min"),er("max"),ar("stepSize",1),ar("onChange",I),ar("onInit",I),ar("onDragStart",I),ar("onDragEnd",I),ar("snapToGrid",!1),ir("snapStart"),er("getInitialValue"),$c("sliderBehaviours",[Pc,Os]),fr("value",function(n){return mo(n.min)})].concat(Ts?[]:[fr("mouseIsDown",function(){return mo(!1)})]),Cs=Mi("width",function(n){return n.dom().offsetWidth}),Es=function(n,e){Cs.set(n,e)},Ds=function(n){return Cs.get(n)},Is=Gn.detect().deviceType.isTouch(),Ms=$a({name:"Slider",configFields:ks,partFields:fs,factory:function(a,n,e,t){var s=a.max()-a.min(),f=function(n){var e=n.element().dom().getBoundingClientRect();return(e.left+e.right)/2},o=function(n){return Sa(n,a,"thumb")},i=function(n){var e,t,r,o,i=Sa(n,a,"spectrum").element().dom().getBoundingClientRect(),u=n.element().dom().getBoundingClientRect(),c=(e=n,t=i,(o=(r=a).value().get())<r.min()?wa(e,r,"left-edge").fold(function(){return 0},function(n){return f(n)-t.left}):o>r.max()?wa(e,r,"right-edge").fold(function(){return t.width},function(n){return f(n)-t.left}):(r.value().get()-r.min())/s*t.width);return i.left-u.left+c},u=function(n){var e=i(n),t=o(n),r=Ds(t.element())/2;Oi(t.element(),"left",e-r+"px")},r=function(n,e){var t=a.value().get(),r=o(n);return t!==e||Ei(r.element(),"left").isNone()?(a.value().set(e),u(n),a.onChange()(n,r,e),V.some(!0)):V.none()},c=Is?[vr(P(),function(n,e){a.onDragStart()(n,o(n))}),vr(W(),function(n,e){a.onDragEnd()(n,o(n))})]:[vr(G(),function(n,e){e.stop(),a.onDragStart()(n,o(n)),a.mouseIsDown().set(!0)}),vr(U(),function(n,e){a.onDragEnd()(n,o(n)),a.mouseIsDown().set(!1)})];return{uid:a.uid(),dom:a.dom(),components:n,behaviours:C($r(In([Is?[]:[Pc.config({mode:"special",focusIn:function(n){return wa(n,a,"spectrum").map(Pc.focusIn).map(M(!0))}})],[Os.config({store:{mode:"manual",getValue:function(n){return a.value().get()}}})]])),Wc(a.sliderBehaviours())),events:mr([vr(es,function(n,e){r(n,e.event().value())}),xr(function(n,e){a.value().set(a.getInitialValue()());var t=o(n);u(n),a.onInit()(n,t,a.value().get())})].concat(c)),apis:{resetToMin:function(n){r(n,a.min())},resetToMax:function(n){r(n,a.max())},refresh:u},domModification:{styles:{position:"relative"}}}},apis:{resetToMin:function(n,e){n.resetToMin(e)},resetToMax:function(n,e){n.resetToMax(e)},refresh:function(n,e){n.refresh(e)}}}),As=function(e,t,r){return Xa.forToolbar(t,function(){var n=r();e.setContextToolbar([{label:t+" group",items:n}])},{})},Bs=function(n){return[(o=n,i=function(n){return n<0?"black":360<n?"white":"hsl("+n+", 100%, 50%)"},Ms.sketch({dom:Ua('<div class="${prefix}-slider ${prefix}-hue-slider-container"></div>'),components:[Ms.parts()["left-edge"](qa('<div class="${prefix}-hue-slider-black"></div>')),Ms.parts().spectrum({dom:Ua('<div class="${prefix}-slider-gradient-container"></div>'),components:[qa('<div class="${prefix}-slider-gradient"></div>')],behaviours:$r([fi.config({toggleClass:vi.resolve("thumb-active")})])}),Ms.parts()["right-edge"](qa('<div class="${prefix}-hue-slider-white"></div>')),Ms.parts().thumb({dom:Ua('<div class="${prefix}-slider-thumb"></div>'),behaviours:$r([fi.config({toggleClass:vi.resolve("thumb-active")})])})],onChange:function(n,e,t){var r=i(t);Oi(e.element(),"background-color",r),o.onChange(n,e,r)},onDragStart:function(n,e){fi.on(e)},onDragEnd:function(n,e){fi.off(e)},onInit:function(n,e,t){var r=i(t);Oi(e.element(),"background-color",r)},stepSize:10,min:0,max:360,getInitialValue:o.getInitialValue,sliderBehaviours:$r([di(Ms.refresh)])}))];var o,i},Rs=function(n,r){var e={onChange:function(n,e,t){r.undoManager.transact(function(){r.formatter.apply("forecolor",{value:t}),r.nodeChanged()})},getInitialValue:function(){return-1}};return As(n,"color",function(){return Bs(e)})},Fs=Ht([er("getInitialValue"),er("onChange"),er("category"),er("sizes")]),Vs=function(n){var o=Kt("SizeSlider",Fs,n);return Ms.sketch({dom:{tag:"div",classes:[vi.resolve("slider-"+o.category+"-size-container"),vi.resolve("slider"),vi.resolve("slider-size-container")]},onChange:function(n,e,t){var r;0<=(r=t)&&r<o.sizes.length&&o.onChange(t)},onDragStart:function(n,e){fi.on(e)},onDragEnd:function(n,e){fi.off(e)},min:0,max:o.sizes.length-1,stepSize:1,getInitialValue:o.getInitialValue,snapToGrid:!0,sliderBehaviours:$r([di(Ms.refresh)]),components:[Ms.parts().spectrum({dom:Ua('<div class="${prefix}-slider-size-container"></div>'),components:[qa('<div class="${prefix}-slider-size-line"></div>')]}),Ms.parts().thumb({dom:Ua('<div class="${prefix}-slider-thumb"></div>'),behaviours:$r([fi.config({toggleClass:vi.resolve("thumb-active")})])})]})},Ns=["9px","10px","11px","12px","14px","16px","18px","20px","24px","32px","36px"],Hs=function(n){var e,t,r=n.selection.getStart(),o=fe.fromDom(r),i=fe.fromDom(n.getBody()),u=(e=function(n){return He(i,n)},(pe(t=o)?V.some(t):Le(t)).map(function(n){return po(n,function(n){return Ei(n,"font-size").isSome()},e).bind(function(n){return Ei(n,"font-size")}).getOrThunk(function(){return ki(n,"font-size")})}).getOr(""));return kn(Ns,function(n){return u===n}).getOr("medium")},zs={candidates:M(Ns),get:function(n){var e,t=Hs(n);return(e=t,Cn(Ns,function(n){return n===e})).getOr(2)},apply:function(r,n){var e;(e=n,V.from(Ns[e])).each(function(n){var e,t;t=n,Hs(e=r)!==t&&e.execCommand("fontSize",!1,t)})}},js=zs.candidates(),Ls=function(n){return[qa('<span class="${prefix}-toolbar-button ${prefix}-icon-small-font ${prefix}-icon"></span>'),(e=n,Vs({onChange:e.onChange,sizes:js,category:"font",getInitialValue:e.getInitialValue})),qa('<span class="${prefix}-toolbar-button ${prefix}-icon-large-font ${prefix}-icon"></span>')];var e},Ps=function(n){var e=n.uid!==undefined&&kt(n,"uid")?n.uid:Va("memento");return{get:function(n){return n.getSystem().getByUid(e).getOrDie()},getOpt:function(n){return n.getSystem().getByUid(e).fold(V.none,V.some)},asSpec:function(){return C(n,{uid:e})}}},$s=window.Promise?window.Promise:function(){var i=function(n){if("object"!=typeof this)throw new TypeError("Promises must be constructed via new");if("function"!=typeof n)throw new TypeError("not a function");this._state=null,this._value=null,this._deferreds=[],f(n,r(o,this),r(c,this))},n=i.immediateFn||"function"==typeof window.setImmediate&&window.setImmediate||function(n){v.setTimeout(n,1)};function r(n,e){return function(){return n.apply(e,arguments)}}var t=Array.isArray||function(n){return"[object Array]"===Object.prototype.toString.call(n)};function u(r){var o=this;null!==this._state?n(function(){var n=o._state?r.onFulfilled:r.onRejected;if(null!==n){var e;try{e=n(o._value)}catch(t){return void r.reject(t)}r.resolve(e)}else(o._state?r.resolve:r.reject)(o._value)}):this._deferreds.push(r)}function o(n){try{if(n===this)throw new TypeError("A promise cannot be resolved with itself.");if(n&&("object"==typeof n||"function"==typeof n)){var e=n.then;if("function"==typeof e)return void f(r(e,n),r(o,this),r(c,this))}this._state=!0,this._value=n,a.call(this)}catch(t){c.call(this,t)}}function c(n){this._state=!1,this._value=n,a.call(this)}function a(){for(var n=0,e=this._deferreds;n<e.length;n++){var t=e[n];u.call(this,t)}this._deferreds=[]}function s(n,e,t,r){this.onFulfilled="function"==typeof n?n:null,this.onRejected="function"==typeof e?e:null,this.resolve=t,this.reject=r}function f(n,e,t){var r=!1;try{n(function(n){r||(r=!0,e(n))},function(n){r||(r=!0,t(n))})}catch(o){if(r)return;r=!0,t(o)}}return i.prototype["catch"]=function(n){return this.then(null,n)},i.prototype.then=function(t,r){var o=this;return new i(function(n,e){u.call(o,new s(t,r,n,e))})},i.all=function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];var a=Array.prototype.slice.call(1===n.length&&t(n[0])?n[0]:n);return new i(function(o,i){if(0===a.length)return o([]);var u=a.length;function c(e,n){try{if(n&&("object"==typeof n||"function"==typeof n)){var t=n.then;if("function"==typeof t)return void t.call(n,function(n){c(e,n)},i)}a[e]=n,0==--u&&o(a)}catch(r){i(r)}}for(var n=0;n<a.length;n++)c(n,a[n])})},i.resolve=function(e){return e&&"object"==typeof e&&e.constructor===i?e:new i(function(n){n(e)})},i.reject=function(t){return new i(function(n,e){e(t)})},i.race=function(o){return new i(function(n,e){for(var t=0,r=o;t<r.length;t++)r[t].then(n,e)})},i}();function Ws(t){return new $s(function(n){var e=new(Me.getOrDie("FileReader"));e.onloadend=function(){n(e.result)},e.readAsDataURL(t)})}var Gs,_s,Us,qs,Ys,Ks,Xs,Js,Qs=function(n){return Ws(n).then(function(n){return n.split(",")[1]})},Zs=function(u){var e=Ps({dom:{tag:"input",attributes:{accept:"image/*",type:"file",title:""},styles:{visibility:"hidden",position:"absolute"}},events:mr([yr(J()),vr(X(),function(n,e){var t,r,o;(t=e,r=t.event(),o=r.raw().target.files||r.raw().dataTransfer.files,V.from(o[0])).each(function(n){var o,i;o=u,Qs(i=n).then(function(r){o.undoManager.transact(function(){var n=o.editorUpload.blobCache,e=n.create(Zc("mceu"),i,r);n.add(e);var t=o.dom.createHTML("img",{src:e.blobUri()});o.insertContent(t)})})})})])});return Wa.sketch({dom:Ua('<span class="${prefix}-toolbar-button ${prefix}-icon-image ${prefix}-icon"></span>'),components:[e.asSpec()],action:function(n){e.get(n).element().dom().click()}})},nf=function(n){return n.dom().textContent},ef=function(n){return 0<n.length},tf=function(n){return n===undefined||null===n?"":n},rf=function(e,t,n){return n.text.filter(ef).fold(function(){return Xr(n=e,"href")===nf(n)?V.some(t):V.none();var n},V.some)},of=function(n){var e=fe.fromDom(n.selection.getStart());return Pi(e,"a")},uf={getInfo:function(n){return of(n).fold(function(){return{url:"",text:n.selection.getContent({format:"text"}),title:"",target:"",link:V.none()}},function(n){return t=nf(e=n),r=Xr(e,"href"),o=Xr(e,"title"),i=Xr(e,"target"),{url:tf(r),text:t!==r?tf(t):"",title:tf(o),target:tf(i),link:V.some(e)};var e,t,r,o,i})},applyInfo:function(o,i){i.url.filter(ef).fold(function(){var e;e=o,i.link.bind(h).each(function(n){e.execCommand("unlink")})},function(e){var n,t,r=(n=i,(t={}).href=e,n.title.filter(ef).each(function(n){t.title=n}),n.target.filter(ef).each(function(n){t.target=n}),t);i.link.bind(h).fold(function(){var n=i.text.filter(ef).getOr(e);o.insertContent(o.dom.createHTML("a",r,o.dom.encode(n)))},function(t){var n=rf(t,e,i);Kr(t,r),n.each(function(n){var e;e=n,t.dom().textContent=e})})})},query:of},cf=Gn.detect(),af=function(n,e){var t=e.selection.getRng();n(),e.selection.setRng(t)},sf=function(n,e){(cf.os.isAndroid()?af:s)(e,n)},ff=function(n,e){var t,r;return{key:n,value:{config:{},me:(t=n,r=mr(e),Gr({fields:[er("enabled")],name:t,active:{events:M(r)}})),configAsRaw:M({}),initialConfig:{},state:Lr}}},lf=Object.freeze({getCurrent:function(n,e,t){return e.find()(n)}}),df=[er("find")],mf=Gr({fields:df,name:"composing",apis:lf}),gf=Pa({name:"Container",factory:function(n){return{uid:n.uid(),dom:C({tag:"div",attributes:{role:"presentation"}},n.dom()),components:n.components(),behaviours:Wc(n.containerBehaviours()),events:n.events(),domModification:n.domModification(),eventOrder:n.eventOrder()}},configFields:[ar("components",[]),$c("containerBehaviours",[]),ar("events",{}),ar("domModification",{}),ar("eventOrder",{})]}),vf=Pa({name:"DataField",factory:function(t){return{uid:t.uid(),dom:t.dom(),behaviours:C($r([Os.config({store:{mode:"memory",initialValue:t.getInitialValue()()}}),mf.config({find:V.some})]),Wc(t.dataBehaviours())),events:mr([xr(function(n,e){Os.setValue(n,t.getInitialValue()())})])}},configFields:[er("uid"),er("dom"),er("getInitialValue"),$c("dataBehaviours",[Os,mf])]}),pf=function(n){return n.dom().value},hf=function(n,e){if(e===undefined)throw new Error("Value.set was undefined");n.dom().value=e},bf=M([ir("data"),ar("inputAttributes",{}),ar("inputStyles",{}),ar("type","input"),ar("tag","input"),ar("inputClasses",[]),_o("onSetValue"),ar("styles",{}),ir("placeholder"),ar("eventOrder",{}),$c("inputBehaviours",[Os,xi]),ar("selectOnFocus",!0)]),yf=function(n){return C($r([Os.config({store:{mode:"manual",initialValue:n.data().getOr(undefined),getValue:function(n){return pf(n.element())},setValue:function(n,e){pf(n.element())!==e&&hf(n.element(),e)}},onSetValue:n.onSetValue()})]),(e=n,$r([xi.config({onFocus:!1===e.selectOnFocus()?I:function(n){var e=n.element(),t=pf(e);e.dom().setSelectionRange(0,t.length)}})])),Wc(n.inputBehaviours()));var e},xf=Pa({name:"Input",configFields:bf(),factory:function(n,e){return{uid:n.uid(),dom:(t=n,{tag:t.tag(),attributes:C(Ot([{key:"type",value:t.type()}].concat(t.placeholder().map(function(n){return{key:"placeholder",value:n}}).toArray())),t.inputAttributes()),styles:t.inputStyles(),classes:t.inputClasses()}),components:[],behaviours:yf(n),eventOrder:n.eventOrder()};var t}}),wf=Object.freeze({exhibit:function(n,e){return Dr({attributes:Ot([{key:e.tabAttr(),value:"true"}])})}}),Sf=[ar("tabAttr","data-alloy-tabstop")],Of=Gr({fields:Sf,name:"tabstopping",active:wf}),Tf=function(n,e){var t=Ps(xf.sketch({placeholder:e,onSetValue:function(n,e){oe(n,K())},inputBehaviours:$r([mf.config({find:V.some}),Of.config({}),Pc.config({mode:"execution"})]),selectOnFocus:!1})),r=Ps(Wa.sketch({dom:Ua('<button class="${prefix}-input-container-x ${prefix}-icon-cancel-circle ${prefix}-icon"></button>'),action:function(n){var e=t.get(n);Os.setValue(e,"")}}));return{name:n,spec:gf.sketch({dom:Ua('<div class="${prefix}-input-container"></div>'),components:[t.asSpec(),r.asSpec()],containerBehaviours:$r([fi.config({toggleClass:vi.resolve("input-container-empty")}),mf.config({find:function(n){return V.some(t.get(n))}}),ff("input-clearing",[vr(K(),function(n){var e=t.get(n);(0<Os.getValue(e).length?fi.off:fi.on)(n)})])])})}},kf=["input","button","textarea"],Cf=function(n,e,t){e.disabled()&&Bf(n,e)},Ef=function(n){return yn(kf,ge(n.element()))},Df=function(n){Yr(n.element(),"disabled","disabled")},If=function(n){Qr(n.element(),"disabled")},Mf=function(n){Yr(n.element(),"aria-disabled","true")},Af=function(n){Yr(n.element(),"aria-disabled","false")},Bf=function(e,n,t){n.disableClass().each(function(n){oo(e.element(),n)}),(Ef(e)?Df:Mf)(e)},Rf=function(n){return Ef(n)?Jr(n.element(),"disabled"):"true"===Xr(n.element(),"aria-disabled")},Ff=Object.freeze({enable:function(e,n,t){n.disableClass().each(function(n){io(e.element(),n)}),(Ef(e)?If:Af)(e)},disable:Bf,isDisabled:Rf,onLoad:Cf}),Vf=Object.freeze({exhibit:function(n,e,t){return Dr({classes:e.disabled()?e.disableClass().map(Rn).getOr([]):[]})},events:function(n,e){return mr([gr(Kn(),function(n,e){return Rf(n)}),Mr(n,e,Cf)])}}),Nf=[ar("disabled",!1),ir("disableClass")],Hf=Gr({fields:Nf,name:"disabling",active:Vf,apis:Ff}),zf=[$c("formBehaviours",[Os])],jf=function(n){return"<alloy.field."+n+">"},Lf=function(o,n,e){return C({"debug.sketcher":{Form:e},uid:o.uid(),dom:o.dom(),components:n,behaviours:C($r([Os.config({store:{mode:"manual",getValue:function(n){var e,t,r=(e=o,t=n.getSystem(),z(e.partUids(),function(n,e){return M(t.getByUid(n))}));return z(r,function(n,e){return n().bind(mf.getCurrent).map(Os.getValue)})},setValue:function(t,n){H(n,function(e,n){wa(t,o,n).each(function(n){mf.getCurrent(n).each(function(n){Os.setValue(n,e)})})})}}})]),Wc(o.formBehaviours())),apis:{getField:function(n,e){return wa(n,o,e).bind(mf.getCurrent)}}})},Pf=(Da(function(n,e,t){return n.getField(e,t)}),function(n){var i,e=(i=[],{field:function(n,e){return i.push(n),t="form",r=jf(n),o=e,{uiType:Jc(),owner:t,name:r,config:o,validated:{}};var t,r,o},record:function(){return i}}),t=n(e),r=e.record(),o=xn(r,function(n){return da({name:n,pname:jf(n)})});return Ha("form",zf,o,Lf,t)}),$f=function(){var e=mo(V.none()),t=function(){e.get().each(function(n){n.destroy()})};return{clear:function(){t(),e.set(V.none())},isSet:function(){return e.get().isSome()},set:function(n){t(),e.set(V.some(n))},run:function(n){e.get().each(n)}}},Wf=function(){var e=mo(V.none());return{clear:function(){e.set(V.none())},set:function(n){e.set(V.some(n))},isSet:function(){return e.get().isSome()},on:function(n){e.get().each(n)}}},Gf=function(n){return{xValue:n,points:[]}},_f=function(n,e){if(e===n.xValue)return n;var t=0<e-n.xValue?1:-1,r={direction:t,xValue:e};return{xValue:e,points:(0===n.points.length?[]:n.points[n.points.length-1].direction===t?n.points.slice(0,n.points.length-1):n.points).concat([r])}},Uf=function(n){if(0===n.points.length)return 0;var e=n.points[0].direction,t=n.points[n.points.length-1].direction;return-1===e&&-1===t?-1:1===e&&1===t?1:0},qf=function(n){var r="navigateEvent",e=zt([er("fields"),ar("maxFieldIndex",n.fields.length-1),er("onExecute"),er("getInitialValue"),fr("state",function(){return{dialogSwipeState:Wf(),currentScreen:mo(0)}})]),u=Kt("SerialisedDialog",e,n),o=function(e,n,t){return Wa.sketch({dom:Ua('<span class="${prefix}-icon-'+n+' ${prefix}-icon"></span>'),action:function(n){ie(n,r,{direction:e})},buttonBehaviours:$r([Hf.config({disableClass:vi.resolve("toolbar-navigation-disabled"),disabled:!t})])})},i=function(n,o){var i=Hi(n.element(),"."+vi.resolve("serialised-dialog-screen"));Li(n.element(),"."+vi.resolve("serialised-dialog-chain")).each(function(r){0<=u.state.currentScreen.get()+o&&u.state.currentScreen.get()+o<i.length&&(Ei(r,"left").each(function(n){var e=parseInt(n,10),t=Ds(i[0]);Oi(r,"left",e-o*t+"px")}),u.state.currentScreen.set(u.state.currentScreen.get()+o))})},c=function(r){var n=Hi(r.element(),"input");V.from(n[u.state.currentScreen.get()]).each(function(n){r.getSystem().getByDom(n).each(function(n){var e,t;e=r,t=n.element(),e.getSystem().triggerFocus(t,e.element())})});var e=s.get(r);su.highlightAt(e,u.state.currentScreen.get())},a=Ps(Pf(function(t){return{dom:Ua('<div class="${prefix}-serialised-dialog"></div>'),components:[gf.sketch({dom:Ua('<div class="${prefix}-serialised-dialog-chain" style="left: 0px; position: absolute;"></div>'),components:xn(u.fields,function(n,e){return e<=u.maxFieldIndex?gf.sketch({dom:Ua('<div class="${prefix}-serialised-dialog-screen"></div>'),components:In([[o(-1,"previous",0<e)],[t.field(n.name,n.spec)],[o(1,"next",e<u.maxFieldIndex)]])}):t.field(n.name,n.spec)})})],formBehaviours:$r([di(function(n,e){var t;t=e,Li(n.element(),"."+vi.resolve("serialised-dialog-chain")).each(function(n){Oi(n,"left",-u.state.currentScreen.get()*t.width+"px")})}),Pc.config({mode:"special",focusIn:function(n){c(n)},onTab:function(n){return i(n,1),V.some(!0)},onShiftTab:function(n){return i(n,-1),V.some(!0)}}),ff("form-events",[xr(function(e,n){u.state.currentScreen.set(0),u.state.dialogSwipeState.clear();var t=s.get(e);su.highlightFirst(t),u.getInitialValue(e).each(function(n){Os.setValue(e,n)})}),Or(u.onExecute),vr(Q(),function(n,e){"left"===e.event().raw().propertyName&&c(n)}),vr(r,function(n,e){var t=e.event().direction();i(n,t)})])])}})),s=Ps({dom:Ua('<div class="${prefix}-dot-container"></div>'),behaviours:$r([su.config({highlightClass:vi.resolve("dot-active"),itemClass:vi.resolve("dot-item")})]),components:Mn(u.fields,function(n,e){return e<=u.maxFieldIndex?[qa('<div class="${prefix}-dot-item ${prefix}-icon-full-dot ${prefix}-icon"></div>')]:[]})});return{dom:Ua('<div class="${prefix}-serializer-wrapper"></div>'),components:[a.asSpec(),s.asSpec()],behaviours:$r([Pc.config({mode:"special",focusIn:function(n){var e=a.get(n);Pc.focusIn(e)}}),ff("serializer-wrapper-events",[vr(P(),function(n,e){var t=e.event();u.state.dialogSwipeState.set(Gf(t.touches[0].clientX))}),vr($(),function(n,e){var t=e.event();u.state.dialogSwipeState.on(function(n){e.event().prevent(),u.state.dialogSwipeState.set(_f(n,t.raw().touches[0].clientX))})}),vr(W(),function(r){u.state.dialogSwipeState.on(function(n){var e=a.get(r),t=-1*Uf(n);i(e,t)})})])])}},Yf=nn(function(t,r){return[{label:"the link group",items:[qf({fields:[Tf("url","Type or paste URL"),Tf("text","Link text"),Tf("title","Link title"),Tf("target","Link target"),(n="link",{name:n,spec:vf.sketch({dom:{tag:"span",styles:{display:"none"}},getInitialValue:function(){return V.none()}})})],maxFieldIndex:["url","text","title","target"].length-1,getInitialValue:function(){return V.some(uf.getInfo(r))},onExecute:function(n){var e=Os.getValue(n);uf.applyInfo(r,e),t.restoreToolbar(),r.focus()}})]}];var n}),Kf=[{title:"Headings",items:[{title:"Heading 1",format:"h1"},{title:"Heading 2",format:"h2"},{title:"Heading 3",format:"h3"},{title:"Heading 4",format:"h4"},{title:"Heading 5",format:"h5"},{title:"Heading 6",format:"h6"}]},{title:"Inline",items:[{title:"Bold",icon:"bold",format:"bold"},{title:"Italic",icon:"italic",format:"italic"},{title:"Underline",icon:"underline",format:"underline"},{title:"Strikethrough",icon:"strikethrough",format:"strikethrough"},{title:"Superscript",icon:"superscript",format:"superscript"},{title:"Subscript",icon:"subscript",format:"subscript"},{title:"Code",icon:"code",format:"code"}]},{title:"Blocks",items:[{title:"Paragraph",format:"p"},{title:"Blockquote",format:"blockquote"},{title:"Div",format:"div"},{title:"Pre",format:"pre"}]},{title:"Alignment",items:[{title:"Left",icon:"alignleft",format:"alignleft"},{title:"Center",icon:"aligncenter",format:"aligncenter"},{title:"Right",icon:"alignright",format:"alignright"},{title:"Justify",icon:"alignjustify",format:"alignjustify"}]}],Xf=mr([(Gs=Un(),_s=function(n,e){var t,r,o=e.event().originator(),i=e.event().target();return r=i,!(He(t=o,n.element())&&!He(t,r)&&(v.console.warn(Un()+" did not get interpreted by the desired target. \nOriginator: "+Mo(o)+"\nTarget: "+Mo(i)+"\nCheck the "+Un()+" event handlers"),1))},{key:Gs,value:lr({can:_s})})]),Jf=Object.freeze({events:Xf}),Qf=h,Zf=jr(["debugInfo","triggerFocus","triggerEvent","triggerEscape","addToWorld","removeFromWorld","addToGui","removeFromGui","build","getByUid","getByDom","broadcast","broadcastOn","isConnected"]),nl=function(e){var n=function(n){return function(){throw new Error("The component must be in a context to send: "+n+"\n"+Mo(e().element())+" is not in context.")}};return Zf({debugInfo:M("fake"),triggerEvent:n("triggerEvent"),triggerFocus:n("triggerFocus"),triggerEscape:n("triggerEscape"),build:n("build"),addToWorld:n("addToWorld"),removeFromWorld:n("removeFromWorld"),addToGui:n("addToGui"),removeFromGui:n("removeFromGui"),getByUid:n("getByUid"),getByDom:n("getByDom"),broadcast:n("broadcast"),broadcastOn:n("broadcastOn"),isConnected:M(!1)})},el=function(n,o){var i={};return H(n,function(n,r){H(n,function(n,e){var t=xt(e,[])(i);i[e]=t.concat([o(r,n)])})}),i},tl=function(n,e){return 1<n.length?tt.error('Multiple behaviours have tried to change DOM "'+e+'". The guilty behaviours are: '+It(xn(n,function(n){return n.name()}))+". At this stage, this is not supported. Future releases might provide strategies for resolving this."):0===n.length?tt.value({}):tt.value(n[0].modification().fold(function(){return{}},function(n){return St(e,n)}))},rl=function(u,c){return Tn(u,function(n,e){var t=e.modification().getOr({});return n.bind(function(i){var n=L(t,function(n,e){return i[e]!==undefined?(t=c,r=e,o=u,tt.error("Mulitple behaviours have tried to change the _"+r+'_ "'+t+'". The guilty behaviours are: '+It(Mn(o,function(n){return n.modification().getOr({})[r]!==undefined?[n.name()]:[]}),null,2)+". This is not currently supported.")):tt.value(St(e,n));var t,r,o});return Tt(n,i)})},tt.value({})).map(function(n){return St(c,n)})},ol={classes:function(n,e){var t=Mn(n,function(n){return n.modification().getOr([])});return tt.value(St(e,t))},attributes:rl,styles:rl,domChildren:tl,defChildren:tl,innerHtml:tl,value:tl},il=function(n,e){return t=l.apply(undefined,[n.handler].concat(e)),r=n.purpose(),{cHandler:t,purpose:M(r)};var t,r},ul=function(n){return n.cHandler},cl=function(n,e){return{name:M(n),handler:M(e)}},al=function(n,e,t){var r,o,i=C(t,(r=n,o={},wn(e,function(n){o[n.name()]=n.handlers(r)}),o));return el(i,cl)},sl=function(n){var e,i=S(e=n)?{can:M(!0),abort:M(!1),run:e}:e;return function(n,e){for(var t=[],r=2;r<arguments.length;r++)t[r-2]=arguments[r];var o=[n,e].concat(t);i.abort.apply(undefined,o)?e.stop():i.can.apply(undefined,o)&&i.run.apply(undefined,o)}},fl=function(n,e,t){var r,o,i=e[t];return i?function(u,c,n,a){var e=n.slice(0);try{var t=e.sort(function(n,e){var t=n[c](),r=e[c](),o=a.indexOf(t),i=a.indexOf(r);if(-1===o)throw new Error("The ordering for "+u+" does not have an entry for "+t+".\nOrder specified: "+It(a,null,2));if(-1===i)throw new Error("The ordering for "+u+" does not have an entry for "+r+".\nOrder specified: "+It(a,null,2));return o<i?-1:i<o?1:0});return tt.value(t)}catch(r){return tt.error([r])}}("Event: "+t,"name",n,i).map(function(n){var e=xn(n,function(n){return n.handler()});return dr(e)}):(r=t,o=n,tt.error(["The event ("+r+') has more than one behaviour that listens to it.\nWhen this occurs, you must specify an event ordering for the behaviours in your spec (e.g. [ "listing", "toggling" ]).\nThe behaviours that can trigger it are: '+It(xn(o,function(n){return n.name()}),null,2)]))},ll=function(n,i){var e=L(n,function(r,o){return(1===r.length?tt.value(r[0].handler()):fl(r,i,o)).map(function(n){var e=sl(n),t=1<r.length?Sn(i,function(e){return yn(r,function(n){return n.name()===e})}).join(" > "):r[0].name();return St(o,{handler:e,purpose:M(t)})})});return Tt(e,{})},dl=function(n){return qt("custom.definition",Ht([$t("dom","dom",ut(),Ht([er("tag"),ar("styles",{}),ar("classes",[]),ar("attributes",{}),ir("value"),ir("innerHtml")])),er("components"),er("uid"),ar("events",{}),ar("apis",M({})),$t("eventOrder","eventOrder",(e={"alloy.execute":["disabling","alloy.base.behaviour","toggling"],"alloy.focus":["alloy.base.behaviour","focusing","keying"],"alloy.system.init":["alloy.base.behaviour","disabling","toggling","representing"],input:["alloy.base.behaviour","representing","streaming","invalidating"],"alloy.system.detached":["alloy.base.behaviour","representing"]},ot.mergeWithThunk(M(e))),Zt()),ir("domModification"),Xo("originalSpec"),ar("debug.sketcher","unknown")]),n);var e},ml=function(n){var e,t={tag:n.dom().tag(),classes:n.dom().classes(),attributes:C((e=n,St(Aa(),e.uid())),n.dom().attributes()),styles:n.dom().styles(),domChildren:xn(n.components(),function(n){return n.element()})};return Cr(C(t,n.dom().innerHtml().map(function(n){return St("innerHtml",n)}).getOr({}),n.dom().value().map(function(n){return St("value",n)}).getOr({})))},gl=function(e,n){wn(n,function(n){oo(e,n)})},vl=function(e,n){wn(n,function(n){io(e,n)})},pl=function(e){if(e.domChildren().isSome()&&e.defChildren().isSome())throw new Error("Cannot specify children and child specs! Must be one or the other.\nDef: "+(n=Er(e),It(n,null,2)));return e.domChildren().fold(function(){var n=e.defChildren().getOr([]);return xn(n,bl)},function(n){return n});var n},hl=function(n){var e=fe.fromTag(n.tag());Kr(e,n.attributes().getOr({})),gl(e,n.classes().getOr([])),Ti(e,n.styles().getOr({})),Eo(e,n.innerHtml().getOr(""));var t=pl(n);return _e(e,t),n.value().each(function(n){hf(e,n)}),e},bl=function(n){var e=Cr(n);return hl(e)},yl=function(n,e){return t=n,o=xn(r=e,function(n){return ur(n.name(),[er("config"),ar("state",Lr)])}),i=qt("component.behaviours",zt(o),t.behaviours).fold(function(n){throw new Error(Jt(n)+"\nComplete spec:\n"+It(t,null,2))},function(n){return n}),{list:r,data:z(i,function(n){var e=n().map(function(n){return{config:n.config(),state:n.state().init(n.config())}});return function(){return e}})};var t,r,o,i},xl=function(n){var e,t,r=(e=wt(n,"behaviours").getOr({}),t=Sn(N(e),function(n){return e[n]!==undefined}),xn(t,function(n){return e[n].me}));return yl(n,r)},wl=jr(["getSystem","config","hasConfigured","spec","connect","disconnect","element","syncComponents","readState","components","events"]),Sl=function(n,e,t){var r,o,i,u,c=ml(n),a=function(e,n,t,r){var o=C({},n);wn(t,function(n){o[n.name()]=n.exhibit(e,r)});var i=el(o,function(n,e){return{name:function(){return n},modification:e}}),u=z(i,function(n,e){return Mn(n,function(e){return e.modification().fold(function(){return[]},function(n){return[e]})})}),c=L(u,function(e,t){return wt(ol,t).fold(function(){return tt.error("Unknown field type: "+t)},function(n){return n(e,t)})});return Tt(c,{}).map(Dr)}(t,{"alloy.base.modification":(r=n,r.domModification().fold(function(){return Dr({})},Dr))},e,c).getOrDie();return i=a,u=C({tag:(o=c).tag(),classes:i.classes().getOr([]).concat(o.classes().getOr([])),attributes:E(o.attributes().getOr({}),i.attributes().getOr({})),styles:E(o.styles().getOr({}),i.styles().getOr({}))},i.innerHtml().or(o.innerHtml()).map(function(n){return St("innerHtml",n)}).getOr({}),Ir("domChildren",i.domChildren(),o.domChildren()),Ir("defChildren",i.defChildren(),o.defChildren()),i.value().or(o.value()).map(function(n){return St("value",n)}).getOr({})),Cr(u)},Ol=function(n,e,t){var r,o,i,u,c,a,s={"alloy.base.behaviour":(r=n,r.events())};return(o=t,i=n.eventOrder(),u=e,c=s,a=al(o,u,c),ll(a,i)).getOrDie()},Tl=function(n){var e,t,r,o,i,u,c,a,s,f,l,d,m,g,v=Qf(n),p=(e=v,t=xt("components",[])(e),xn(t,El)),h=C(Jf,v,St("components",p));return tt.value((r=h,i=mo(nl(o=function(){return g})),u=Yt(dl(C(r,{behaviours:undefined}))),c=xl(r),a=c.list,s=c.data,f=Sl(u,a,s),l=hl(f),d=Ol(u,a,s),m=mo(u.components()),g=wl({getSystem:i.get,config:function(n){if(n===Ia())return u.apis();if(b(n))throw new Error("Invalid input: only API constant is allowed");var e=s;return(S(e[n.name()])?e[n.name()]:function(){throw new Error("Could not find "+n.name()+" in "+It(r,null,2))})()},hasConfigured:function(n){return S(s[n.name()])},spec:M(r),readState:function(n){return s[n]().map(function(n){return n.state.readState()}).getOr("not enabled")},connect:function(n){i.set(n)},disconnect:function(){i.set(nl(o))},element:M(l),syncComponents:function(){var n=Pe(l),e=Mn(n,function(n){return i.get().getByDom(n).fold(function(){return[]},function(n){return[n]})});m.set(e)},components:m.get,events:M(d)})))},kl=function(n){var e=fe.fromText(n);return Cl({element:e})},Cl=function(n){var t=Xt("external.component",Ht([er("element"),ir("uid")]),n),e=mo(nl());t.uid().each(function(n){var e;e=t.element(),Yr(e,Ra,n)});var r=wl({getSystem:e.get,config:V.none,hasConfigured:M(!1),connect:function(n){e.set(n)},disconnect:function(){e.set(nl(function(){return r}))},element:M(t.element()),spec:M(n),readState:M("No state"),syncComponents:I,components:M([]),events:M({})});return Ea(r)},El=function(e){return(n=e,wt(n,ka)).fold(function(){var n=C({uid:Va("")},e);return Tl(n).getOrDie()},function(n){return n});var n},Dl=Ea,Il="alloy.item-hover",Ml="alloy.item-focus",Al=function(n){(wo(n.element()).isNone()||xi.isFocused(n))&&(xi.isFocused(n)||xi.focus(n),ie(n,Il,{item:n}))},Bl=function(n){ie(n,Ml,{item:n})},Rl=M(Il),Fl=M(Ml),Vl=[er("data"),er("components"),er("dom"),ir("toggling"),ar("itemBehaviours",{}),ar("ignoreFocus",!1),ar("domModification",{}),Ko("builder",function(n){return{dom:C(n.dom(),{attributes:{role:n.toggling().isSome()?"menuitemcheckbox":"menuitem"}}),behaviours:C($r([n.toggling().fold(fi.revoke,function(n){return fi.config(C({aria:{mode:"checked"}},n))}),xi.config({ignore:n.ignoreFocus(),onFocus:function(n){Bl(n)}}),Pc.config({mode:"execution"}),Os.config({store:{mode:"memory",initialValue:n.data()}})]),n.itemBehaviours()),events:mr([(e=Qn(),r=ue,vr(e,function(e,t){var n=t.event();e.getSystem().getByDom(n.target()).each(function(n){r(e,n,t)})})),yr(G()),vr(q(),Al),vr(Xn(),xi.focus)]),components:n.components(),domModification:n.domModification(),eventOrder:n.eventOrder()};var e,r}),ar("eventOrder",{})],Nl=[er("dom"),er("components"),Ko("builder",function(n){return{dom:n.dom(),components:n.components(),events:mr([(e=Xn(),vr(e,function(n,e){e.stop()}))])};var e})],Hl=M([da({name:"widget",overrides:function(e){return{behaviours:$r([Os.config({store:{mode:"manual",getValue:function(n){return e.data()},setValue:function(){}}})])}}})]),zl=[er("uid"),er("data"),er("components"),er("dom"),ar("autofocus",!1),ar("domModification",{}),Ta(Hl()),Ko("builder",function(t){var n=ya(0,t,Hl()),e=xa("item-widget",t,n.internals()),r=function(n){return wa(n,t,"widget").map(function(n){return Pc.focusIn(n),n})},o=function(n,e){return vu(e.event().target())||t.autofocus()&&e.setSource(n.element()),V.none()};return C({dom:t.dom(),components:e,domModification:t.domModification(),events:mr([Or(function(n,e){r(n).each(function(n){e.stop()})}),vr(q(),Al),vr(Xn(),function(n,e){t.autofocus()?r(n):xi.focus(n)})]),behaviours:$r([Os.config({store:{mode:"memory",initialValue:t.data()}}),xi.config({onFocus:function(n){Bl(n)}}),Pc.config({mode:"special",focusIn:t.autofocus()?function(n){r(n)}:Ur(),onLeft:o,onRight:o,onEscape:function(n,e){return xi.isFocused(n)||t.autofocus()?(t.autofocus()&&e.setSource(n.element()),V.none()):(xi.focus(n),V.some(!0))}})])})})],jl=Qt("type",{widget:zl,item:Vl,separator:Nl}),Ll=M([ga({factory:{sketch:function(n){var e=Xt("menu.spec item",jl,n);return e.builder()(e)}},name:"items",unit:"item",defaults:function(n,e){var t=Va("");return C({uid:t},e)},overrides:function(n,e){return{type:e.type,ignoreFocus:n.fakeFocus(),domModification:{classes:[n.markers().item()]}}}})]),Pl=M([er("value"),er("items"),er("dom"),er("components"),ar("eventOrder",{}),$c("menuBehaviours",[su,Os,mf,Pc]),sr("movement",{mode:"menu",moveOnTab:!0},Qt("mode",{grid:[Jo(),Ko("config",function(n,e){return{mode:"flatgrid",selector:"."+n.markers().item(),initSize:{numColumns:e.initSize().numColumns(),numRows:e.initSize().numRows()},focusManager:n.focusManager()}})],menu:[ar("moveOnTab",!0),Ko("config",function(n,e){return{mode:"menu",selector:"."+n.markers().item(),moveOnTab:e.moveOnTab(),focusManager:n.focusManager()}})]})),tr("markers",$o()),ar("fakeFocus",!1),ar("focusManager",fu()),_o("onHighlight")]),$l=M("alloy.menu-focus"),Wl=$a({name:"Menu",configFields:Pl(),partFields:Ll(),factory:function(n,e,t,r){return C({dom:C(n.dom(),{attributes:{role:"menu"}}),uid:n.uid(),behaviours:C($r([su.config({highlightClass:n.markers().selectedItem(),itemClass:n.markers().item(),onHighlight:n.onHighlight()}),Os.config({store:{mode:"memory",initialValue:n.value()}}),mf.config({find:V.some}),Pc.config(n.movement().config()(n,n.movement()))]),Wc(n.menuBehaviours())),events:mr([vr(Fl(),function(e,t){var n=t.event();e.getSystem().getByDom(n.target()).each(function(n){su.highlight(e,n),t.stop(),ie(e,$l(),{menu:e,item:n})})}),vr(Rl(),function(n,e){var t=e.event().item();su.highlight(n,t)})]),components:e,eventOrder:n.eventOrder()})}}),Gl=function(n,e,t,r){var o=n.getSystem().build(r);Je(n,o,t)},_l=function(n,e){return n.components()},Ul=Gr({fields:[],name:"replacing",apis:Object.freeze({append:function(n,e,t,r){Gl(n,0,Ge,r)},prepend:function(n,e,t,r){Gl(n,0,We,r)},remove:function(n,e,t,r){var o=_l(n);kn(o,function(n){return He(r.element(),n.element())}).each(Ze)},set:function(e,n,t,r){var o,i,u,c,a,s;i=(o=e).components(),wn(i,Qe),Ue(o.element()),o.syncComponents(),u=function(){var n=xn(r,e.getSystem().build);wn(n,function(n){Xe(e,n)})},c=e.element(),a=ze(c),s=xo(a).bind(function(e){var n=function(n){return He(e,n)};return n(c)?V.some(c):ho(c,n)}),u(c),s.each(function(e){xo(a).filter(function(n){return He(n,e)}).fold(function(){bo(e)},I)})},contents:_l})}),ql=function(t,r,o,n){return wt(o,n).bind(function(n){return wt(t,n).bind(function(n){var e=ql(t,r,o,n);return V.some([n].concat(e))})}).getOr([])},Yl=function(n,e){var t={};H(n,function(n,e){wn(n,function(n){t[n]=e})});var r=e,o=j(e,function(n,e){return{k:n,v:e}}),i=z(o,function(n,e){return[e].concat(ql(t,r,o,e))});return z(t,function(n){return wt(i,n).getOr([n])})},Kl=function(){var i=mo({}),u=mo({}),c=mo({}),a=mo(V.none()),s=mo({}),n=function(n){return wt(u.get(),n)};return{setContents:function(n,e,t,r){a.set(V.some(n)),i.set(t),u.set(e),s.set(r);var o=Yl(r,t);c.set(o)},expand:function(t){return wt(i.get(),t).map(function(n){var e=wt(c.get(),t).getOr([]);return[n].concat(e)})},refresh:function(n){return wt(c.get(),n)},collapse:function(n){return wt(c.get(),n).bind(function(n){return 1<n.length?V.some(n.slice(1)):V.none()})},lookupMenu:n,otherMenus:function(n){var e,t,r=s.get();return e=N(r),t=n,Sn(e,function(n){return!yn(t,n)})},getPrimary:function(){return a.get().bind(n)},getMenus:function(){return u.get()},clear:function(){i.set({}),u.set({}),c.set({}),a.set(V.none())},isClear:function(){return a.get().isNone()}}},Xl=M("collapse-item"),Jl=Pa({name:"TieredMenu",configFields:[Yo("onExecute"),Yo("onEscape"),qo("onOpenMenu"),qo("onOpenSubmenu"),_o("onCollapseMenu"),ar("openImmediately",!0),or("data",[er("primary"),er("menus"),er("expansions")]),ar("fakeFocus",!1),_o("onHighlight"),_o("onHover"),or("markers",[er("backgroundMenu")].concat(Lo()).concat(Po())),er("dom"),ar("navigateOnHover",!0),ar("stayInDom",!1),$c("tmenuBehaviours",[Pc,su,mf,Ul]),ar("eventOrder",{})],apis:{collapseMenu:function(n,e){n.collapseMenu(e)}},factory:function(u,o){var i=function(r,n){return z(n,function(n,e){var t=Wl.sketch(C(n,{value:e,items:n.items,markers:ht(o.markers,["item","selectedItem"]),fakeFocus:u.fakeFocus(),onHighlight:u.onHighlight(),focusManager:u.fakeFocus()?{get:function(n){return su.getHighlighted(n).map(function(n){return n.element()})},set:function(e,n){e.getSystem().getByDom(n).fold(I,function(n){su.highlight(e,n)})}}:fu()}));return r.getSystem().build(t)})},c=Kl(),a=function(n){return Os.getValue(n).value},s=function(n){return z(u.data().menus(),function(n,e){return Mn(n.items,function(n){return"separator"===n.type?[]:[n.data.value]})})},f=function(e,n){su.highlight(e,n),su.getHighlighted(n).orThunk(function(){return su.getFirst(n)}).each(function(n){ce(e,n.element(),Xn())})},l=function(n,e){return Bo(xn(e,n.lookupMenu))},d=function(r,o,i){return V.from(i[0]).bind(o.lookupMenu).map(function(n){var e=l(o,i.slice(1));wn(e,function(n){oo(n.element(),u.markers().backgroundMenu())}),be(n.element())||Ul.append(r,Dl(n)),vl(n.element(),[u.markers().backgroundMenu()]),f(r,n);var t=l(o,o.otherMenus(i));return wn(t,function(n){vl(n.element(),[u.markers().backgroundMenu()]),u.stayInDom()||Ul.remove(r,n)}),n})},m=function(e,t){var n=a(t);return c.expand(n).bind(function(n){return V.from(n[0]).bind(c.lookupMenu).each(function(n){be(n.element())||Ul.append(e,Dl(n)),u.onOpenSubmenu()(e,t,n),su.highlightFirst(n)}),d(e,c,n)})},r=function(e,t){var n=a(t);return c.collapse(n).bind(function(n){return d(e,c,n).map(function(n){return u.onCollapseMenu()(e,t,n),n})})},n=function(t){return function(e,n){return Pi(n.getSource(),"."+u.markers().item()).bind(function(n){return e.getSystem().getByDom(n).toOption().bind(function(n){return t(e,n).map(function(){return!0})})})}},e=mr([vr($l(),function(n,e){var t=e.event().menu();su.highlight(n,t)}),Or(function(e,n){var t=n.event().target();e.getSystem().getByDom(t).each(function(n){0===a(n).indexOf("collapse-item")&&r(e,n),m(e,n).fold(function(){u.onExecute()(e,n)},function(){})})}),xr(function(e,n){var t,r,o;(t=e,r=i(t,u.data().menus()),o=s(),c.setContents(u.data().primary(),r,u.data().expansions(),o),c.getPrimary()).each(function(n){Ul.append(e,Dl(n)),u.openImmediately()&&(f(e,n),u.onOpenMenu()(e,n))})})].concat(u.navigateOnHover()?[vr(Rl(),function(n,e){var t,r,o=e.event().item();t=n,r=a(o),c.refresh(r).bind(function(n){return d(t,c,n)}),m(n,o),u.onHover()(n,o)})]:[]));return{uid:u.uid(),dom:u.dom(),behaviours:C($r([Pc.config({mode:"special",onRight:n(function(n,e){return vu(e.element())?V.none():m(n,e)}),onLeft:n(function(n,e){return vu(e.element())?V.none():r(n,e)}),onEscape:n(function(n,e){return r(n,e).orThunk(function(){return u.onEscape()(n,e).map(function(){return n})})}),focusIn:function(e,n){c.getPrimary().each(function(n){ce(e,n.element(),Xn())})}}),su.config({highlightClass:u.markers().selectedMenu(),itemClass:u.markers().menu()}),mf.config({find:function(n){return su.getHighlighted(n)}}),Ul.config({})]),Wc(u.tmenuBehaviours())),eventOrder:u.eventOrder(),apis:{collapseMenu:function(e){su.getHighlighted(e).each(function(n){su.getHighlighted(n).each(function(n){r(e,n)})})}},events:e}},extraApis:{tieredData:function(n,e,t){return{primary:n,menus:e,expansions:t}},singleData:function(n,e){return{primary:n,menus:St(n,e),expansions:{}}},collapseItem:function(n){return{value:Zc(Xl()),text:n}}}}),Ql=function(n,e,t,r){return wt(e.routes(),r.start()).map(s).bind(function(n){return wt(n,r.destination()).map(s)})},Zl=function(n,e,t,r){return Ql(0,e,0,r).bind(function(e){return e.transition().map(function(n){return{transition:M(n),route:M(e)}})})},nd=function(t,r,n){var e,o,i;(e=t,o=r,i=n,ed(e,o).bind(function(n){return Zl(e,o,i,n)})).each(function(n){var e=n.transition();io(t.element(),e.transitionClass()),Qr(t.element(),r.destinationAttr())})},ed=function(n,e,t){var r=n.element();return Jr(r,e.destinationAttr())?V.some({start:M(Xr(n.element(),e.stateAttr())),destination:M(Xr(n.element(),e.destinationAttr()))}):V.none()},td=function(n,e,t,r){nd(n,e,t),Jr(n.element(),e.stateAttr())&&Xr(n.element(),e.stateAttr())!==r&&e.onFinish()(n,r),Yr(n.element(),e.stateAttr(),r)},rd=Object.freeze({findRoute:Ql,disableTransition:nd,getCurrentRoute:ed,jumpTo:td,progressTo:function(t,r,o,i){var n,e;e=r,Jr((n=t).element(),e.destinationAttr())&&(Yr(n.element(),e.stateAttr(),Xr(n.element(),e.destinationAttr())),Qr(n.element(),e.destinationAttr()));var u,c,a=(u=r,c=i,{start:M(Xr(t.element(),u.stateAttr())),destination:M(c)});Zl(t,r,o,a).fold(function(){td(t,r,o,i)},function(n){nd(t,r,o);var e=n.transition();oo(t.element(),e.transitionClass()),Yr(t.element(),r.destinationAttr(),i)})},getState:function(n,e,t){var r=n.element();return Jr(r,e.stateAttr())?V.some(Xr(r,e.stateAttr())):V.none()}}),od=Object.freeze({events:function(o,i){return mr([vr(Q(),function(t,n){var r=n.event().raw();ed(t,o).each(function(e){Ql(0,o,0,e).each(function(n){n.transition().each(function(n){r.propertyName===n.property()&&(td(t,o,i,e.destination()),o.onTransition()(t,e))})})})}),xr(function(n,e){td(n,o,i,o.initialState())})])}}),id=[ar("destinationAttr","data-transitioning-destination"),ar("stateAttr","data-transitioning-state"),er("initialState"),_o("onTransition"),_o("onFinish"),tr("routes",jt(tt.value,jt(tt.value,Ht([cr("transition",[er("property"),er("transitionClass")])]))))],ud=Gr({fields:id,name:"transitioning",active:od,apis:rd,extra:{createRoutes:function(n){var r={};return H(n,function(n,e){var t=e.split("<->");r[t[0]]=St(t[1],n),r[t[1]]=St(t[0],n)}),r},createBistate:function(n,e,t){return Ot([{key:n,value:St(e,t)},{key:e,value:St(n,t)}])},createTristate:function(n,e,t,r){return Ot([{key:n,value:Ot([{key:e,value:r},{key:t,value:r}])},{key:e,value:Ot([{key:n,value:r},{key:t,value:r}])},{key:t,value:Ot([{key:n,value:r},{key:e,value:r}])}])}}}),cd=vi.resolve("scrollable"),ad={register:function(n){oo(n,cd)},deregister:function(n){io(n,cd)},scrollable:M(cd)},sd=function(n){return wt(n,"format").getOr(n.title)},fd=function(n,e,t,r,o){return{data:{value:n,text:e},type:"item",dom:{tag:"div",classes:o?[vi.resolve("styles-item-is-menu")]:[]},toggling:{toggleOnExecute:!1,toggleClass:vi.resolve("format-matches"),selected:t},itemBehaviours:$r(o?[]:[li(n,function(n,e){(e?fi.on:fi.off)(n)})]),components:[{dom:{tag:"div",attributes:{style:r},innerHtml:e}}]}},ld=function(n,e,t,r){return{value:n,dom:{tag:"div"},components:[Wa.sketch({dom:{tag:"div",classes:[vi.resolve("styles-collapser")]},components:r?[{dom:{tag:"span",classes:[vi.resolve("styles-collapse-icon")]}},kl(n)]:[kl(n)],action:function(n){if(r){var e=t().get(n);Jl.collapseMenu(e)}}}),{dom:{tag:"div",classes:[vi.resolve("styles-menu-items-container")]},components:[Wl.parts().items({})],behaviours:$r([ff("adhoc-scrollable-menu",[xr(function(n,e){Oi(n.element(),"overflow-y","auto"),Oi(n.element(),"-webkit-overflow-scrolling","touch"),ad.register(n.element())}),wr(function(n){Di(n.element(),"overflow-y"),Di(n.element(),"-webkit-overflow-scrolling"),ad.deregister(n.element())})])])}],items:e,menuBehaviours:$r([ud.config({initialState:"after",routes:ud.createTristate("before","current","after",{transition:{property:"transform",transitionClass:"transitioning"}})})])}},dd=function(r){var o,i,n,e,t,u=(o=r.formats,i=function(){return c},n=ld("Styles",[].concat(xn(o.items,function(n){return fd(sd(n),n.title,n.isSelected(),n.getPreview(),kt(o.expansions,sd(n)))})),i,!1),e=z(o.menus,function(n,e){var t=xn(n,function(n){return fd(sd(n),n.title,n.isSelected!==undefined&&n.isSelected(),n.getPreview!==undefined?n.getPreview():"",kt(o.expansions,sd(n)))});return ld(e,t,i,!0)}),t=C(e,St("styles",n)),{tmenu:Jl.tieredData("styles",t,o.expansions)}),c=Ps(Jl.sketch({dom:{tag:"div",classes:[vi.resolve("styles-menu")]},components:[],fakeFocus:!0,stayInDom:!0,onExecute:function(n,e){var t=Os.getValue(e);return r.handle(e,t.value),V.none()},onEscape:function(){return V.none()},onOpenMenu:function(n,e){var t=Ds(n.element());Es(e.element(),t),ud.jumpTo(e,"current")},onOpenSubmenu:function(n,e,t){var r=Ds(n.element()),o=ji(e.element(),'[role="menu"]').getOrDie("hacky"),i=n.getSystem().getByDom(o).getOrDie();Es(t.element(),r),ud.progressTo(i,"before"),ud.jumpTo(t,"after"),ud.progressTo(t,"current")},onCollapseMenu:function(n,e,t){var r=ji(e.element(),'[role="menu"]').getOrDie("hacky"),o=n.getSystem().getByDom(r).getOrDie();ud.progressTo(o,"after"),ud.progressTo(t,"current")},navigateOnHover:!1,openImmediately:!0,data:u.tmenu,markers:{backgroundMenu:vi.resolve("styles-background-menu"),menu:vi.resolve("styles-menu"),selectedMenu:vi.resolve("styles-selected-menu"),item:vi.resolve("styles-item"),selectedItem:vi.resolve("styles-selected-item")}}));return c.asSpec()},md=function(n){return kt(n,"items")?(t=C(bt(e=n,["items"]),{menu:!0}),r=gd(e.items),{item:t,menus:C(r.menus,St(e.title,r.items)),expansions:C(r.expansions,St(e.title,e.title))}):{item:n,menus:{},expansions:{}};var e,t,r},gd=function(n){return On(n,function(n,e){var t=md(e);return{menus:C(n.menus,t.menus),items:[t.item].concat(n.items),expansions:C(n.expansions,t.expansions)}},{menus:{},expansions:{},items:[]})},vd={expand:gd},pd=function(u,n){var c=function(n){return function(){return u.formatter.match(n)}},a=function(n){return function(){return u.formatter.getCssText(n)}},e=wt(n,"style_formats").getOr(Kf),s=function(n){return xn(n,function(n){if(kt(n,"items")){var e=s(n.items);return C(C(n,{isSelected:M(!1),getPreview:M("")}),{items:e})}return kt(n,"format")?C(i=n,{isSelected:c(i.format),getPreview:a(i.format)}):(r=Zc((t=n).title),o=C(t,{format:r,isSelected:c(r),getPreview:a(r)}),u.formatter.register(r,o),o);var t,r,o,i})};return s(e)},hd=function(t,n,r){var e,o,i,u=(e=t,i=(o=function(n){return Mn(n,function(n){return n.items!==undefined?0<o(n.items).length?[n]:[]:!kt(n,"format")||e.formatter.canApply(n.format)?[n]:[]})})(n),vd.expand(i));return dd({formats:u,handle:function(n,e){t.undoManager.transact(function(){fi.isOn(n)?t.formatter.remove(e):t.formatter.apply(e)}),r()}})},bd=["undo","bold","italic","link","image","bullist","styleselect"],yd=function(n){var e=n.replace(/\|/g," ").trim();return 0<e.length?e.split(/\s+/):[]},xd=function(n){return Mn(n,function(n){return y(n)?xd(n):yd(n)})},wd=function(n){var e=n.toolbar!==undefined?n.toolbar:bd;return y(e)?xd(e):yd(e)},Sd=function(r,o){var n=function(n){return function(){return Xa.forToolbarCommand(o,n)}},e=function(n){return function(){return Xa.forToolbarStateCommand(o,n)}},t=function(n,e,t){return function(){return Xa.forToolbarStateAction(o,n,e,t)}},i=n("undo"),u=n("redo"),c=e("bold"),a=e("italic"),s=e("underline"),f=n("removeformat"),l=t("unlink","link",function(){o.execCommand("unlink",null,!1)}),d=t("unordered-list","ul",function(){o.execCommand("InsertUnorderedList",null,!1)}),m=t("ordered-list","ol",function(){o.execCommand("InsertOrderedList",null,!1)}),g=pd(o,o.settings),v=function(){return hd(o,g,function(){o.fire("scrollIntoView")})},p=function(n,e){return{isSupported:function(){return n.forall(function(n){return kt(o.buttons,n)})},sketch:e}};return{undo:p(V.none(),i),redo:p(V.none(),u),bold:p(V.none(),c),italic:p(V.none(),a),underline:p(V.none(),s),removeformat:p(V.none(),f),link:p(V.none(),function(){return e=r,t=o,Xa.forToolbarStateAction(t,"link","link",function(){var n=Yf(e,t);e.setContextToolbar(n),sf(t,function(){e.focusToolbar()}),uf.query(t).each(function(n){t.selection.select(n.dom())})});var e,t}),unlink:p(V.none(),l),image:p(V.none(),function(){return Zs(o)}),bullist:p(V.some("bullist"),d),numlist:p(V.some("numlist"),m),fontsizeselect:p(V.none(),function(){return e=o,n={onChange:function(n){zs.apply(e,n)},getInitialValue:function(){return zs.get(e)}},As(r,"font-size",function(){return Ls(n)});var e,n}),forecolor:p(V.none(),function(){return Rs(r,o)}),styleselect:p(V.none(),function(){return Xa.forToolbar("style-formats",function(n){o.fire("toReading"),r.dropup().appear(v,fi.on,n)},$r([fi.config({toggleClass:vi.resolve("toolbar-button-selected"),toggleOnExecute:!1,aria:{mode:"pressed"}}),Zo.config({channels:Ot([mi(ko.orientationChanged(),fi.off),mi(ko.dropupDismissed(),fi.off)])})]))})}},Od=function(n,t){var e=wd(n),r={};return Mn(e,function(n){var e=!kt(r,n)&&kt(t,n)&&t[n].isSupported()?[t[n].sketch()]:[];return r[n]=!0,e})},Td=function(m,g){return function(n){if(m(n)){var e,t,r,o,i,u,c,a=fe.fromDom(n.target),s=function(){n.stopPropagation()},f=function(){n.preventDefault()},l=p(f,s),d=(e=a,t=n.clientX,r=n.clientY,o=s,i=f,u=l,c=n,{target:M(e),x:M(t),y:M(r),stop:o,prevent:i,kill:u,raw:M(c)});g(d)}}},kd=function(n,e,t,r,o){var i=Td(t,r);return n.dom().addEventListener(e,i,o),{unbind:l(Cd,n,e,i,o)}},Cd=function(n,e,t,r){n.dom().removeEventListener(e,t,r)},Ed=M(!0),Dd=function(n,e,t){return kd(n,e,Ed,t,!1)},Id=function(n,e,t){return kd(n,e,Ed,t,!0)},Md=function(n){var e=n.matchMedia("(orientation: portrait)").matches;return{isPortrait:M(e)}},Ad=Md,Bd=function(r,e){var n=fe.fromDom(r),o=null,t=Dd(n,"orientationchange",function(){clearInterval(o);var n=Md(r);e.onChange(n),i(function(){e.onReady(n)})}),i=function(n){clearInterval(o);var e=r.innerHeight,t=0;o=setInterval(function(){e!==r.innerHeight?(clearInterval(o),n(V.some(r.innerHeight))):20<t&&(clearInterval(o),n(V.none())),t++},50)};return{onAdjustment:i,destroy:function(){t.unbind()}}},Rd=function(n){var e=Gn.detect().os.isiOS(),t=Md(n).isPortrait();return e&&!t?n.screen.height:n.screen.width},Fd=function(n){var e=n.raw();return e.touches===undefined||1!==e.touches.length?V.none():V.some(e.touches[0])},Vd=function(t){var r,o,i,u=mo(V.none()),c=(r=function(n){u.set(V.none()),t.triggerEvent(Zn(),n)},o=400,i=null,{cancel:function(){null!==i&&(v.clearTimeout(i),i=null)},schedule:function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];i=v.setTimeout(function(){r.apply(null,n),i=null},o)}}),a=Ot([{key:P(),value:function(t){return Fd(t).each(function(n){c.cancel();var e={x:M(n.clientX),y:M(n.clientY),target:t.target};c.schedule(t),u.set(V.some(e))}),V.none()}},{key:$(),value:function(n){return c.cancel(),Fd(n).each(function(i){u.get().each(function(n){var e,t,r,o;e=i,t=n,r=Math.abs(e.clientX-t.x()),o=Math.abs(e.clientY-t.y()),(5<r||5<o)&&u.set(V.none())})}),V.none()}},{key:W(),value:function(e){return c.cancel(),u.get().filter(function(n){return He(n.target(),e.target())}).map(function(n){return t.triggerEvent(Jn(),e)})}}]);return{fireIfReady:function(e,n){return wt(a,n).bind(function(n){return n(e)})}}},Nd=function(t){var e=Vd({triggerEvent:function(n,e){t.onTapContent(e)}});return{fireTouchstart:function(n){e.fireIfReady(n,"touchstart")},onTouchend:function(){return Dd(t.body(),"touchend",function(n){e.fireIfReady(n,"touchend")})},onTouchmove:function(){return Dd(t.body(),"touchmove",function(n){e.fireIfReady(n,"touchmove")})}}},Hd=6<=Gn.detect().os.version.major,zd=function(r,e,t){var o=Nd(r),i=ze(e),u=function(n){return!He(n.start(),n.finish())||n.soffset()!==n.foffset()},n=function(){var n=r.doc().dom().hasFocus()&&r.getSelection().exists(u);t.getByDom(e).each(!0===(n||xo(i).filter(function(n){return"input"===ge(n)}).exists(function(n){return n.dom().selectionStart!==n.dom().selectionEnd}))?fi.on:fi.off)},c=[Dd(r.body(),"touchstart",function(n){r.onTouchContent(),o.fireTouchstart(n)}),o.onTouchmove(),o.onTouchend(),Dd(e,"touchstart",function(n){r.onTouchToolstrip()}),r.onToReading(function(){yo(r.body())}),r.onToEditing(I),r.onScrollToCursor(function(n){n.preventDefault(),r.getCursorBox().each(function(n){var e=r.win(),t=n.top()>e.innerHeight||n.bottom()>e.innerHeight?n.bottom()-e.innerHeight+50:0;0!==t&&e.scrollTo(e.pageXOffset,e.pageYOffset+t)})})].concat(!0===Hd?[]:[Dd(fe.fromDom(r.win()),"blur",function(){t.getByDom(e).each(fi.off)}),Dd(i,"select",n),Dd(r.doc(),"selectionchange",n)]);return{destroy:function(){wn(c,function(n){n.unbind()})}}},jd=function(n,e){var t=parseInt(Xr(n,e),10);return isNaN(t)?0:t},Ld=(Us=he,qs="text",Ys=function(n){return Us(n)?V.from(n.dom().nodeValue):V.none()},Ks=Gn.detect().browser,{get:function(n){if(!Us(n))throw new Error("Can only get "+qs+" value of a "+qs+" node");return Xs(n).getOr("")},getOption:Xs=Ks.isIE()&&10===Ks.version.major?function(n){try{return Ys(n)}catch(e){return V.none()}}:Ys,set:function(n,e){if(!Us(n))throw new Error("Can only set raw "+qs+" value of a "+qs+" node");n.dom().nodeValue=e}}),Pd=function(n){return Ld.getOption(n)},$d={create:we("start","soffset","finish","foffset")},Wd=rt([{before:["element"]},{on:["element","offset"]},{after:["element"]}]),Gd={before:Wd.before,on:Wd.on,after:Wd.after,cata:function(n,e,t,r){return n.fold(e,t,r)},getStart:function(n){return n.fold(h,h,h)}},_d=rt([{domRange:["rng"]},{relative:["startSitu","finishSitu"]},{exact:["start","soffset","finish","foffset"]}]),Ud={domRange:_d.domRange,relative:_d.relative,exact:_d.exact,exactFromRange:function(n){return _d.exact(n.start(),n.soffset(),n.finish(),n.foffset())},getWin:function(n){var e=n.match({domRange:function(n){return fe.fromDom(n.startContainer)},relative:function(n,e){return Gd.getStart(n)},exact:function(n,e,t,r){return n}});return je(e)},range:$d.create},qd=function(n,e,t){var r,o,i=n.document.createRange();return r=i,e.fold(function(n){r.setStartBefore(n.dom())},function(n,e){r.setStart(n.dom(),e)},function(n){r.setStartAfter(n.dom())}),o=i,t.fold(function(n){o.setEndBefore(n.dom())},function(n,e){o.setEnd(n.dom(),e)},function(n){o.setEndAfter(n.dom())}),i},Yd=function(n,e,t,r,o){var i=n.document.createRange();return i.setStart(e.dom(),t),i.setEnd(r.dom(),o),i},Kd=function(n){return{left:M(n.left),top:M(n.top),right:M(n.right),bottom:M(n.bottom),width:M(n.width),height:M(n.height)}},Xd=rt([{ltr:["start","soffset","finish","foffset"]},{rtl:["start","soffset","finish","foffset"]}]),Jd=function(n,e,t){return e(fe.fromDom(t.startContainer),t.startOffset,fe.fromDom(t.endContainer),t.endOffset)},Qd=function(n,e){var o,t,r,i=(o=n,e.match({domRange:function(n){return{ltr:M(n),rtl:V.none}},relative:function(n,e){return{ltr:nn(function(){return qd(o,n,e)}),rtl:nn(function(){return V.some(qd(o,e,n))})}},exact:function(n,e,t,r){return{ltr:nn(function(){return Yd(o,n,e,t,r)}),rtl:nn(function(){return V.some(Yd(o,t,r,n,e))})}}}));return(r=(t=i).ltr()).collapsed?t.rtl().filter(function(n){return!1===n.collapsed}).map(function(n){return Xd.rtl(fe.fromDom(n.endContainer),n.endOffset,fe.fromDom(n.startContainer),n.startOffset)}).getOrThunk(function(){return Jd(0,Xd.ltr,r)}):Jd(0,Xd.ltr,r)},Zd=(document.caretPositionFromPoint||document.caretRangeFromPoint,function(n,e){var t=ge(n);return"input"===t?Gd.after(n):yn(["br","img"],t)?0===e?Gd.before(n):Gd.after(n):Gd.on(n,e)}),nm=function(n,e,t,r){var o,i,u,c,a,s=(i=e,u=t,c=r,(a=ze(o=n).dom().createRange()).setStart(o.dom(),i),a.setEnd(u.dom(),c),a),f=He(n,t)&&e===r;return s.collapsed&&!f},em=function(n,e,t,r,o){var i,u,c=Yd(n,e,t,r,o);i=n,u=c,V.from(i.getSelection()).each(function(n){n.removeAllRanges(),n.addRange(u)})},tm=function(n,e,t,r,o){var i,u,c,a,l,s=(i=r,u=o,c=Zd(e,t),a=Zd(i,u),Ud.relative(c,a));Qd(l=n,s).match({ltr:function(n,e,t,r){em(l,n,e,t,r)},rtl:function(n,e,t,r){var o,i,u,c,a,s=l.getSelection();if(s.setBaseAndExtent)s.setBaseAndExtent(n.dom(),e,t.dom(),r);else if(s.extend)try{i=n,u=e,c=t,a=r,(o=s).collapse(i.dom(),u),o.extend(c.dom(),a)}catch(f){em(l,t,r,n,e)}else em(l,t,r,n,e)}})},rm=function(n){var e=fe.fromDom(n.anchorNode),t=fe.fromDom(n.focusNode);return nm(e,n.anchorOffset,t,n.focusOffset)?V.some($d.create(e,n.anchorOffset,t,n.focusOffset)):function(n){if(0<n.rangeCount){var e=n.getRangeAt(0),t=n.getRangeAt(n.rangeCount-1);return V.some($d.create(fe.fromDom(e.startContainer),e.startOffset,fe.fromDom(t.endContainer),t.endOffset))}return V.none()}(n)},om=function(n){return V.from(n.getSelection()).filter(function(n){return 0<n.rangeCount}).bind(rm)},im=function(n,e){var i,t,r,o,u=Qd(i=n,e).match({ltr:function(n,e,t,r){var o=i.document.createRange();return o.setStart(n.dom(),e),o.setEnd(t.dom(),r),o},rtl:function(n,e,t,r){var o=i.document.createRange();return o.setStart(t.dom(),r),o.setEnd(n.dom(),e),o}});return r=(t=u).getClientRects(),0<(o=0<r.length?r[0]:t.getBoundingClientRect()).width||0<o.height?V.some(o).map(Kd):V.none()},um=function(n){return{left:n.left,top:n.top,right:n.right,bottom:n.bottom,width:M(2),height:n.height}},cm=function(n){return{left:M(n.left),top:M(n.top),right:M(n.right),bottom:M(n.bottom),width:M(n.width),height:M(n.height)}},am=function(r){if(r.collapsed){var o=fe.fromDom(r.startContainer);return Le(o).bind(function(n){var e,t=Ud.exact(o,r.startOffset,n,"img"===ge(e=n)?1:Pd(e).fold(function(){return Pe(e).length},function(n){return n.length}));return im(r.startContainer.ownerDocument.defaultView,t).map(um).map(Rn)}).getOr([])}return xn(r.getClientRects(),cm)},sm=function(n){var e=n.getSelection();return e!==undefined&&0<e.rangeCount?am(e.getRangeAt(0)):[]},fm=function(n){n.focus();var e=fe.fromDom(n.document.body);(xo().exists(function(n){return yn(["input","textarea"],ge(n))})?function(n){setTimeout(function(){n()},0)}:s)(function(){xo().each(yo),bo(e)})},lm="data-"+vi.resolve("last-outer-height"),dm=function(n,e){Yr(n,lm,e)},mm=function(n){return{top:M(n.top()),bottom:M(n.top()+n.height())}},gm=function(n,e){var t=jd(e,lm),r=n.innerHeight;return r<t?V.some(t-r):V.none()},vm=function(n,u){var e=fe.fromDom(u.document.body),t=Dd(fe.fromDom(n),"resize",function(){gm(n,e).each(function(i){var n,e;(n=u,e=sm(n),0<e.length?V.some(e[0]).map(mm):V.none()).each(function(n){var e,t,r,o=(e=u,r=i,(t=n).top()>e.innerHeight||t.bottom()>e.innerHeight?Math.min(r,t.bottom()-e.innerHeight+50):0);0!==o&&u.scrollTo(u.pageXOffset,u.pageYOffset+o)})}),dm(e,n.innerHeight)});return dm(e,n.innerHeight),{toEditing:function(){fm(u)},destroy:function(){t.unbind()}}},pm=function(n){return V.some(fe.fromDom(n.dom().contentWindow.document.body))},hm=function(n){return V.some(fe.fromDom(n.dom().contentWindow.document))},bm=function(n){return V.from(n.dom().contentWindow)},ym=function(n){return bm(n).bind(om)},xm=function(n){return n.getFrame()},wm=function(n,t){return function(e){return e[n].getOrThunk(function(){var n=xm(e);return function(){return t(n)}})()}},Sm=function(n,e,t,r){return n[t].getOrThunk(function(){return function(n){return Dd(e,r,n)}})},Om=function(n){return{left:M(n.left),top:M(n.top),right:M(n.right),bottom:M(n.bottom),width:M(n.width),height:M(n.height)}},Tm={getBody:wm("getBody",pm),getDoc:wm("getDoc",hm),getWin:wm("getWin",bm),getSelection:wm("getSelection",ym),getFrame:xm,getActiveApi:function(c){var a=xm(c);return pm(a).bind(function(u){return hm(a).bind(function(i){return bm(a).map(function(o){var n=fe.fromDom(i.dom().documentElement),e=c.getCursorBox.getOrThunk(function(){return function(){return(n=o,om(n).map(function(n){return Ud.exact(n.start(),n.soffset(),n.finish(),n.foffset())})).bind(function(n){return im(o,n).orThunk(function(){return om(o).filter(function(n){return He(n.start(),n.finish())&&n.soffset()===n.foffset()}).bind(function(n){var e=n.start().dom().getBoundingClientRect();return 0<e.width||0<e.height?V.some(e).map(Om):V.none()})})});var n}}),t=c.setSelection.getOrThunk(function(){return function(n,e,t,r){tm(o,n,e,t,r)}}),r=c.clearSelection.getOrThunk(function(){return function(){o.getSelection().removeAllRanges()}});return{body:M(u),doc:M(i),win:M(o),html:M(n),getSelection:l(ym,a),setSelection:t,clearSelection:r,frame:M(a),onKeyup:Sm(c,i,"onKeyup","keyup"),onNodeChanged:Sm(c,i,"onNodeChanged","selectionchange"),onDomChanged:c.onDomChanged,onScrollToCursor:c.onScrollToCursor,onScrollToElement:c.onScrollToElement,onToReading:c.onToReading,onToEditing:c.onToEditing,onToolbarScrollStart:c.onToolbarScrollStart,onTouchContent:c.onTouchContent,onTapContent:c.onTapContent,onTouchToolstrip:c.onTouchToolstrip,getCursorBox:e}})})})}},km="data-ephox-mobile-fullscreen-style",Cm="position:absolute!important;",Em="top:0!important;left:0!important;margin:0!important;padding:0!important;width:100%!important;height:100%!important;overflow:visible!important;",Dm=Gn.detect().os.isAndroid(),Im=function(n,e){var t,r,o,i=function(r){return function(n){var e=Xr(n,"style"),t=e===undefined?"no-styles":e.trim();t!==r&&(Yr(n,km,t),Yr(n,"style",r))}},u=(t="*",Vi(n,function(n){return Re(n,t)},r)),c=Mn(u,function(n){var e;return e="*",Ni(n,function(n){return Re(n,e)})}),a=(o=ki(e,"background-color"))!==undefined&&""!==o?"background-color:"+o+"!important":"background-color:rgb(255,255,255)!important;";wn(c,i("display:none!important;")),wn(u,i(Cm+Em+a)),i((!0===Dm?"":Cm)+Em+a)(n)},Mm=function(){var n=Ve("["+km+"]");wn(n,function(n){var e=Xr(n,km);"no-styles"!==e?Yr(n,"style",e):Qr(n,"style"),Qr(n,km)})},Am=function(){var e=zi("head").getOrDie(),n=zi('meta[name="viewport"]').getOrThunk(function(){var n=fe.fromTag("meta");return Yr(n,"name","viewport"),Ge(e,n),n}),t=Xr(n,"content");return{maximize:function(){Yr(n,"content","width=device-width, initial-scale=1.0, user-scalable=no, maximum-scale=1.0")},restore:function(){t!==undefined&&null!==t&&0<t.length?Yr(n,"content",t):Yr(n,"content","user-scalable=yes")}}},Bm=function(e,n){var t=Am(),r=$f(),o=$f();return{enter:function(){n.hide(),oo(e.container,vi.resolve("fullscreen-maximized")),oo(e.container,vi.resolve("android-maximized")),t.maximize(),oo(e.body,vi.resolve("android-scroll-reload")),r.set(vm(e.win,Tm.getWin(e.editor).getOrDie("no"))),Tm.getActiveApi(e.editor).each(function(n){Im(e.container,n.body()),o.set(zd(n,e.toolstrip,e.alloy))})},exit:function(){t.restore(),n.show(),io(e.container,vi.resolve("fullscreen-maximized")),io(e.container,vi.resolve("android-maximized")),Mm(),io(e.body,vi.resolve("android-scroll-reload")),o.clear(),r.clear()}}},Rm=function(t,r){var o=null;return{cancel:function(){null!==o&&(v.clearTimeout(o),o=null)},throttle:function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];null!==o&&v.clearTimeout(o),o=v.setTimeout(function(){t.apply(null,n),o=null},r)}}},Fm=function(n,e){var t,r,o,i=Ps(gf.sketch({dom:Ua('<div aria-hidden="true" class="${prefix}-mask-tap-icon"></div>'),containerBehaviours:$r([fi.config({toggleClass:vi.resolve("mask-tap-icon-selected"),toggleOnExecute:!1})])})),u=(t=n,r=200,o=null,{cancel:function(){null!==o&&(v.clearTimeout(o),o=null)},throttle:function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];null===o&&(o=v.setTimeout(function(){t.apply(null,n),o=null},r))}});return gf.sketch({dom:Ua('<div class="${prefix}-disabled-mask"></div>'),components:[gf.sketch({dom:Ua('<div class="${prefix}-content-container"></div>'),components:[Wa.sketch({dom:Ua('<div class="${prefix}-content-tap-section"></div>'),components:[i.asSpec()],action:function(n){u.throttle()},buttonBehaviours:$r([fi.config({toggleClass:vi.resolve("mask-tap-icon-selected")})])})]})]})},Vm=zt([or("editor",[er("getFrame"),ir("getBody"),ir("getDoc"),ir("getWin"),ir("getSelection"),ir("setSelection"),ir("clearSelection"),ir("cursorSaver"),ir("onKeyup"),ir("onNodeChanged"),ir("getCursorBox"),er("onDomChanged"),ar("onTouchContent",I),ar("onTapContent",I),ar("onTouchToolstrip",I),ar("onScrollToCursor",M({unbind:I})),ar("onScrollToElement",M({unbind:I})),ar("onToEditing",M({unbind:I})),ar("onToReading",M({unbind:I})),ar("onToolbarScrollStart",h)]),er("socket"),er("toolstrip"),er("dropup"),er("toolbar"),er("container"),er("alloy"),fr("win",function(n){return ze(n.socket).dom().defaultView}),fr("body",function(n){return fe.fromDom(n.socket.dom().ownerDocument.body)}),ar("translate",h),ar("setReadOnly",I),ar("readOnlyOnInit",M(!0))]),Nm=function(n){var e=Kt("Getting AndroidWebapp schema",Vm,n);Oi(e.toolstrip,"width","100%");var t=El(Fm(function(){e.setReadOnly(e.readOnlyOnInit()),o.enter()},e.translate));e.alloy.add(t);var r={show:function(){e.alloy.add(t)},hide:function(){e.alloy.remove(t)}};Ge(e.container,t.element());var o=Bm(e,r);return{setReadOnly:e.setReadOnly,refreshStructure:I,enter:o.enter,exit:o.exit,destroy:I}},Hm=M([ar("shell",!0),$c("toolbarBehaviours",[Ul])]),zm=M([ma({name:"groups",overrides:function(n){return{behaviours:$r([Ul.config({})])}}})]),jm=$a({name:"Toolbar",configFields:Hm(),partFields:zm(),factory:function(e,n,t,r){var o=function(n){return e.shell()?V.some(n):wa(n,e,"groups")},i=e.shell()?{behaviours:[Ul.config({})],components:[]}:{behaviours:[],components:n};return{uid:e.uid(),dom:e.dom(),components:i.components,behaviours:C($r(i.behaviours),Wc(e.toolbarBehaviours())),apis:{setGroups:function(n,e){o(n).fold(function(){throw v.console.error("Toolbar was defined to not be a shell, but no groups container was specified in components"),new Error("Toolbar was defined to not be a shell, but no groups container was specified in components")},function(n){Ul.set(n,e)})}},domModification:{attributes:{role:"group"}}}},apis:{setGroups:function(n,e,t){n.setGroups(e,t)}}}),Lm=M([er("items"),(Js=["itemClass"],or("markers",xn(Js,er))),$c("tgroupBehaviours",[Pc])]),Pm=M([ga({name:"items",unit:"item",overrides:function(n){return{domModification:{classes:[n.markers().itemClass()]}}}})]),$m=$a({name:"ToolbarGroup",configFields:Lm(),partFields:Pm(),factory:function(n,e,t,r){return C({dom:{attributes:{role:"toolbar"}}},{uid:n.uid(),dom:n.dom(),components:e,behaviours:C($r([Pc.config({mode:"flow",selector:"."+n.markers().itemClass()})]),Wc(n.tgroupBehaviours())),"debug.sketcher":t["debug.sketcher"]})}}),Wm="data-"+vi.resolve("horizontal-scroll"),Gm=function(n){return"true"===Xr(n,Wm)?0<(t=n).dom().scrollLeft||function(n){n.dom().scrollLeft=1;var e=0!==n.dom().scrollLeft;return n.dom().scrollLeft=0,e}(t):0<(e=n).dom().scrollTop||function(n){n.dom().scrollTop=1;var e=0!==n.dom().scrollTop;return n.dom().scrollTop=0,e}(e);var e,t},_m={exclusive:function(n,e){return Dd(n,"touchmove",function(n){Pi(n.target(),e).filter(Gm).fold(function(){n.raw().preventDefault()},I)})},markAsHorizontal:function(n){Yr(n,Wm,"true")}};function Um(){var e=function(n){var e=!0===n.scrollable?"${prefix}-toolbar-scrollable-group":"";return{dom:Ua('<div aria-label="'+n.label+'" class="${prefix}-toolbar-group '+e+'"></div>'),tgroupBehaviours:$r([ff("adhoc-scrollable-toolbar",!0===n.scrollable?[Sr(function(n,e){Oi(n.element(),"overflow-x","auto"),_m.markAsHorizontal(n.element()),ad.register(n.element())})]:[])]),components:[gf.sketch({components:[$m.parts().items({})]})],markers:{itemClass:vi.resolve("toolbar-group-item")},items:n.items}},t=El(jm.sketch({dom:Ua('<div class="${prefix}-toolbar"></div>'),components:[jm.parts().groups({})],toolbarBehaviours:$r([fi.config({toggleClass:vi.resolve("context-toolbar"),toggleOnExecute:!1,aria:{mode:"none"}}),Pc.config({mode:"cyclic"})]),shell:!0})),n=El(gf.sketch({dom:{classes:[vi.resolve("toolstrip")]},components:[Dl(t)],containerBehaviours:$r([fi.config({toggleClass:vi.resolve("android-selection-context-toolbar"),toggleOnExecute:!1})])})),r=function(){jm.setGroups(t,o.get()),fi.off(t)},o=mo([]);return{wrapper:M(n),toolbar:M(t),createGroups:function(n){return xn(n,p($m.sketch,e))},setGroups:function(n){o.set(n),r()},setContextToolbar:function(n){fi.on(t),jm.setGroups(t,n)},restoreToolbar:function(){fi.isOn(t)&&r()},refresh:function(){},focus:function(){Pc.focusIn(t)}}}var qm=function(n,e){Ul.append(n,Dl(e))},Ym=function(n,e){Ul.remove(n,e)},Km=function(n){return El(Wa.sketch({dom:Ua('<div class="${prefix}-mask-edit-icon ${prefix}-icon"></div>'),action:function(){n.run(function(n){n.setReadOnly(!1)})}}))},Xm=function(){return El(gf.sketch({dom:Ua('<div class="${prefix}-editor-socket"></div>'),components:[],containerBehaviours:$r([Ul.config({})])}))},Jm=function(n,e,t,r){(!0===t?lo.toAlpha:lo.toOmega)(r),(t?qm:Ym)(n,e)},Qm=function(e,n){return n.getAnimationRoot().fold(function(){return e.element()},function(n){return n(e)})},Zm=function(n){return n.dimension().property()},ng=function(n,e){return n.dimension().getDimension()(e)},eg=function(n,e){var t=Qm(n,e);vl(t,[e.shrinkingClass(),e.growingClass()])},tg=function(n,e){io(n.element(),e.openClass()),oo(n.element(),e.closedClass()),Oi(n.element(),Zm(e),"0px"),Ii(n.element())},rg=function(n,e){io(n.element(),e.closedClass()),oo(n.element(),e.openClass()),Di(n.element(),Zm(e))},og=function(n,e,t){t.setCollapsed(),Oi(n.element(),Zm(e),ng(e,n.element())),Ii(n.element());var r=Qm(n,e);oo(r,e.shrinkingClass()),tg(n,e),e.onStartShrink()(n)},ig=function(n,e,t){var r=function(n,e){rg(n,e);var t=ng(e,n.element());return tg(n,e),t}(n,e),o=Qm(n,e);oo(o,e.growingClass()),rg(n,e),Oi(n.element(),Zm(e),r),t.setExpanded(),e.onStartGrow()(n)},ug=function(n,e,t){var r=Qm(n,e);return!0===co(r,e.growingClass())},cg=function(n,e,t){var r=Qm(n,e);return!0===co(r,e.shrinkingClass())},ag=Object.freeze({grow:function(n,e,t){t.isExpanded()||ig(n,e,t)},shrink:function(n,e,t){t.isExpanded()&&og(n,e,t)},immediateShrink:function(n,e,t){var r,o;t.isExpanded()&&(r=n,o=e,t.setCollapsed(),Oi(r.element(),Zm(o),ng(o,r.element())),Ii(r.element()),eg(r,o),tg(r,o),o.onStartShrink()(r),o.onShrunk()(r))},hasGrown:function(n,e,t){return t.isExpanded()},hasShrunk:function(n,e,t){return t.isCollapsed()},isGrowing:ug,isShrinking:cg,isTransitioning:function(n,e,t){return!0===ug(n,e)||!0===cg(n,e)},toggleGrow:function(n,e,t){(t.isExpanded()?og:ig)(n,e,t)},disableTransitions:eg}),sg=Object.freeze({exhibit:function(n,e){var t=e.expanded();return Dr(t?{classes:[e.openClass()],styles:{}}:{classes:[e.closedClass()],styles:St(e.dimension().property(),"0px")})},events:function(t,r){return mr([vr(Q(),function(n,e){e.event().raw().propertyName===t.dimension().property()&&(eg(n,t),r.isExpanded()&&Di(n.element(),t.dimension().property()),(r.isExpanded()?t.onGrown():t.onShrunk())(n))})])}}),fg=[er("closedClass"),er("openClass"),er("shrinkingClass"),er("growingClass"),ir("getAnimationRoot"),_o("onShrunk"),_o("onStartShrink"),_o("onGrown"),_o("onStartGrow"),ar("expanded",!1),tr("dimension",Qt("property",{width:[Ko("property","width"),Ko("getDimension",function(n){return Ds(n)+"px"})],height:[Ko("property","height"),Ko("getDimension",function(n){return Fi(n)+"px"})]}))],lg=Gr({fields:fg,name:"sliding",active:sg,apis:ag,state:Object.freeze({init:function(n){var e=mo(n.expanded());return Pr({isExpanded:function(){return!0===e.get()},isCollapsed:function(){return!1===e.get()},setCollapsed:l(e.set,!1),setExpanded:l(e.set,!0),readState:function(){return"expanded: "+e.get()}})}})}),dg=function(e,t){var r=El(gf.sketch({dom:{tag:"div",classes:[vi.resolve("dropup")]},components:[],containerBehaviours:$r([Ul.config({}),lg.config({closedClass:vi.resolve("dropup-closed"),openClass:vi.resolve("dropup-open"),shrinkingClass:vi.resolve("dropup-shrinking"),growingClass:vi.resolve("dropup-growing"),dimension:{property:"height"},onShrunk:function(n){e(),t(),Ul.set(n,[])},onGrown:function(n){e(),t()}}),di(function(n,e){o(I)})])})),o=function(n){v.window.requestAnimationFrame(function(){n(),lg.shrink(r)})};return{appear:function(n,e,t){!0===lg.hasShrunk(r)&&!1===lg.isTransitioning(r)&&v.window.requestAnimationFrame(function(){e(t),Ul.set(r,[n()]),lg.grow(r)})},disappear:o,component:M(r),element:r.element}},mg=Gn.detect().browser.isFirefox(),gg=Ht([rr("triggerEvent"),rr("broadcastEvent"),ar("stopBackspace",!0)]),vg=function(e,n){var t,r,o,i,u=Kt("Getting GUI events settings",gg,n),c=Gn.detect().deviceType.isTouch()?["touchstart","touchmove","touchend","gesturestart"]:["mousedown","mouseup","mouseover","mousemove","mouseout","click"],a=Vd(u),s=xn(c.concat(["selectstart","input","contextmenu","change","transitionend","drag","dragstart","dragend","dragenter","dragleave","dragover","drop"]),function(n){return Dd(e,n,function(e){a.fireIfReady(e,n).each(function(n){n&&e.kill()}),u.triggerEvent(n,e)&&e.kill()})}),f=Dd(e,"keydown",function(n){var e;u.triggerEvent("keydown",n)?n.kill():!0!==u.stopBackspace||8!==(e=n).raw().which||yn(["input","textarea"],ge(e.target()))||n.prevent()}),l=(t=e,r=function(n){u.triggerEvent("focusin",n)&&n.kill()},mg?Id(t,"focus",r):Dd(t,"focusin",r)),d=(o=e,i=function(n){u.triggerEvent("focusout",n)&&n.kill(),v.setTimeout(function(){u.triggerEvent(qn(),n)},0)},mg?Id(o,"blur",i):Dd(o,"focusout",i)),m=je(e),g=Dd(m,"scroll",function(n){u.broadcastEvent(ee(),n)&&n.kill()});return{unbind:function(){wn(s,function(n){n.unbind()}),f.unbind(),l.unbind(),d.unbind(),g.unbind()}}},pg=function(n,e){var t=wt(n,"target").map(function(n){return n()}).getOr(e);return mo(t)},hg=rt([{stopped:[]},{resume:["element"]},{complete:[]}]),bg=function(n,r,e,t,o,i){var u,c,a,s,f=n(r,t),l=(u=e,c=o,a=mo(!1),s=mo(!1),{stop:function(){a.set(!0)},cut:function(){s.set(!0)},isStopped:a.get,isCut:s.get,event:M(u),setSource:c.set,getSource:c.get});return f.fold(function(){return i.logEventNoHandlers(r,t),hg.complete()},function(e){var t=e.descHandler();return ul(t)(l),l.isStopped()?(i.logEventStopped(r,e.element(),t.purpose()),hg.stopped()):l.isCut()?(i.logEventCut(r,e.element(),t.purpose()),hg.complete()):Le(e.element()).fold(function(){return i.logNoParent(r,e.element(),t.purpose()),hg.complete()},function(n){return i.logEventResponse(r,e.element(),t.purpose()),hg.resume(n)})})},yg=function(e,t,r,n,o,i){return bg(e,t,r,n,o,i).fold(function(){return!0},function(n){return yg(e,t,r,n,o,i)},function(){return!1})},xg=function(n,e,t){var r,o,i=(r=e,o=mo(!1),{stop:function(){o.set(!0)},cut:I,isStopped:o.get,isCut:M(!1),event:M(r),setSource:a("Cannot set source of a broadcasted event"),getSource:a("Cannot get source of a broadcasted event")});return wn(n,function(n){var e=n.descHandler();ul(e)(i)}),i.isStopped()},wg=function(n,e,t,r,o){var i=pg(t,r);return yg(n,e,t,r,i,o)},Sg=function(n,e,t){return po(n,function(n){return e(n).isSome()},t).bind(e)},Og=we("element","descHandler"),Tg=function(n,e){return{id:M(n),descHandler:M(e)}};function kg(){var i={};return{registerId:function(r,o,n){H(n,function(n,e){var t=i[e]!==undefined?i[e]:{};t[o]=il(n,r),i[e]=t})},unregisterId:function(t){H(i,function(n,e){n.hasOwnProperty(t)&&delete n[t]})},filterByType:function(n){return wt(i,n).map(function(n){return L(n,function(n,e){return Tg(e,n)})}).getOr([])},find:function(n,e,t){var o=yt(e)(i);return Sg(t,function(n){return t=o,Fa(r=n).fold(function(){return V.none()},function(n){var e=yt(n);return t.bind(e).map(function(n){return Og(r,n)})});var t,r},n)}}}function Cg(){var r=kg(),o={},i=function(r){var n=r.element();return Fa(n).fold(function(){return n="uid-",e=r.element(),t=Zc(Ba+n),Yr(e,Ra,t),t;var n,e,t},function(n){return n})},u=function(n){Fa(n.element()).each(function(n){o[n]=undefined,r.unregisterId(n)})};return{find:function(n,e,t){return r.find(n,e,t)},filter:function(n){return r.filterByType(n)},register:function(n){var e=i(n);kt(o,e)&&function(n,e){var t=o[e];if(t!==n)throw new Error('The tagId "'+e+'" is already used by: '+Mo(t.element())+"\nCannot use it for: "+Mo(n.element())+"\nThe conflicting element is"+(be(t.element())?" ":" not ")+"already in the DOM");u(n)}(n,e);var t=[n];r.registerId(t,e,n.events()),o[e]=n},unregister:u,getById:function(n){return yt(n)(o)}}}var Eg=function(t){var r=function(e){return Le(t.element()).fold(function(){return!0},function(n){return He(e,n)})},o=Cg(),s=function(n,e){return o.find(r,n,e)},n=vg(t.element(),{triggerEvent:function(u,c){return jo(u,c.target(),function(n){return e=s,t=u,o=n,i=(r=c).target(),wg(e,t,r,i,o);var e,t,r,o,i})},broadcastEvent:function(n,e){var t=o.filter(n);return xg(t,e)}}),i=Zf({debugInfo:M("real"),triggerEvent:function(e,t,r){jo(e,t,function(n){wg(s,e,r,t,n)})},triggerFocus:function(c,a){Fa(c).fold(function(){bo(c)},function(n){jo(Un(),c,function(n){var e,t,r,o,i,u;e=s,t=Un(),r={originator:M(a),kill:I,prevent:I,target:M(c)},i=n,u=pg(r,o=c),bg(e,t,r,o,u,i)})})},triggerEscape:function(n,e){i.triggerEvent("keydown",n.element(),e.event())},getByUid:function(n){return m(n)},getByDom:function(n){return g(n)},build:El,addToGui:function(n){c(n)},removeFromGui:function(n){a(n)},addToWorld:function(n){e(n)},removeFromWorld:function(n){u(n)},broadcast:function(n){l(n)},broadcastOn:function(n,e){d(n,e)},isConnected:M(!0)}),e=function(n){n.connect(i),he(n.element())||(o.register(n),wn(n.components(),e),i.triggerEvent(ne(),n.element(),{target:M(n.element())}))},u=function(n){he(n.element())||(wn(n.components(),u),o.unregister(n)),n.disconnect()},c=function(n){Xe(t,n)},a=function(n){Ze(n)},f=function(t){var n=o.filter(Yn());wn(n,function(n){var e=n.descHandler();ul(e)(t)})},l=function(n){f({universal:M(!0),data:M(n)})},d=function(n,e){f({universal:M(!1),channels:M(n),data:M(e)})},m=function(n){return o.getById(n).fold(function(){return tt.error(new Error('Could not find component with uid: "'+n+'" in system.'))},tt.value)},g=function(n){var e=Fa(n).getOr("not found");return m(e)};return e(t),{root:M(t),element:t.element,destroy:function(){n.unbind(),qe(t.element())},add:c,remove:a,getByUid:m,getByDom:g,addToWorld:e,removeFromWorld:u,broadcast:l,broadcastOn:d}},Dg=M(vi.resolve("readonly-mode")),Ig=M(vi.resolve("edit-mode"));function Mg(n){var e=El(gf.sketch({dom:{classes:[vi.resolve("outer-container")].concat(n.classes)},containerBehaviours:$r([lo.config({alpha:Dg(),omega:Ig()})])}));return Eg(e)}var Ag=function(n,e){var t=fe.fromTag("input");Ti(t,{opacity:"0",position:"absolute",top:"-1000px",left:"-1000px"}),Ge(n,t),bo(t),e(t),qe(t)},Bg=function(n){var e=n.getSelection();if(0<e.rangeCount){var t=e.getRangeAt(0),r=n.document.createRange();r.setStart(t.startContainer,t.startOffset),r.setEnd(t.endContainer,t.endOffset),e.removeAllRanges(),e.addRange(r)}},Rg=function(n,e){xo().each(function(n){He(n,e)||yo(n)}),n.focus(),bo(fe.fromDom(n.document.body)),Bg(n)},Fg={stubborn:function(n,e,t,r){var o=function(){Rg(e,r)},i=Dd(t,"keydown",function(n){yn(["input","textarea"],ge(n.target()))||o()});return{toReading:function(){Ag(n,yo)},toEditing:o,onToolbarTouch:function(){},destroy:function(){i.unbind()}}},timid:function(n,e,t,r){var o=function(){yo(r)};return{toReading:function(){o()},toEditing:function(){Rg(e,r)},onToolbarTouch:function(){o()},destroy:I}}},Vg=function(t,r,o,i,n){var u=function(){r.run(function(n){n.refreshSelection()})},e=function(n,e){var t=n-i.dom().scrollTop;r.run(function(n){n.scrollIntoView(t,t+e)})},c=function(){r.run(function(n){n.clearSelection()})},a=function(){t.getCursorBox().each(function(n){e(n.top(),n.height())}),r.run(function(n){n.syncHeight()})},s=Nd(t),f=Rm(a,300),l=[t.onKeyup(function(){c(),f.throttle()}),t.onNodeChanged(u),t.onDomChanged(f.throttle),t.onDomChanged(u),t.onScrollToCursor(function(n){n.preventDefault(),f.throttle()}),t.onScrollToElement(function(n){n.element(),e(r,i)}),t.onToEditing(function(){r.run(function(n){n.toEditing()})}),t.onToReading(function(){r.run(function(n){n.toReading()})}),Dd(t.doc(),"touchend",function(n){He(t.html(),n.target())||He(t.body(),n.target())}),Dd(o,"transitionend",function(n){var e;"height"===n.raw().propertyName&&(e=Fi(o),r.run(function(n){n.setViewportOffset(e)}),u(),a())}),Id(o,"touchstart",function(n){var e;r.run(function(n){n.highlightSelection()}),e=n,r.run(function(n){n.onToolbarTouch(e)}),t.onTouchToolstrip()}),Dd(t.body(),"touchstart",function(n){c(),t.onTouchContent(),s.fireTouchstart(n)}),s.onTouchmove(),s.onTouchend(),Dd(t.body(),"click",function(n){n.kill()}),Dd(o,"touchmove",function(){t.onToolbarScrollStart()})];return{destroy:function(){wn(l,function(n){n.unbind()})}}},Ng=function(n){var t=V.none(),e=[],r=function(n){o()?u(n):e.push(n)},o=function(){return t.isSome()},i=function(n){wn(n,u)},u=function(e){t.each(function(n){v.setTimeout(function(){e(n)},0)})};return n(function(n){t=V.some(n),i(e),e=[]}),{get:r,map:function(t){return Ng(function(e){r(function(n){e(t(n))})})},isReady:o}},Hg={nu:Ng,pure:function(e){return Ng(function(n){n(e)})}},zg=function(e){var n=function(n){var r;e((r=n,function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];var t=this;v.setTimeout(function(){r.apply(t,n)},0)}))},t=function(){return Hg.nu(n)};return{map:function(r){return zg(function(t){n(function(n){var e=r(n);t(e)})})},bind:function(t){return zg(function(e){n(function(n){t(n).get(e)})})},anonBind:function(t){return zg(function(e){n(function(n){t.get(e)})})},toLazy:t,toCached:function(){var e=null;return zg(function(n){null===e&&(e=t()),e.get(n)})},get:n}},jg={nu:zg,pure:function(e){return zg(function(n){n(e)})}},Lg=function(n,e,t){return Math.abs(n-e)<=t?V.none():n<e?V.some(n+t):V.some(n-t)},Pg=function(){var s=null;return{animate:function(r,o,n,i,e,t){var u=!1,c=function(n){u=!0,e(n)};clearInterval(s);var a=function(n){clearInterval(s),c(n)};s=setInterval(function(){var t=r();Lg(t,o,n).fold(function(){clearInterval(s),c(o)},function(n){if(i(n,a),!u){var e=r();(e!==n||Math.abs(e-o)>Math.abs(t-o))&&(clearInterval(s),c(o))}})},t)}}},$g=function(e,t){return Ro([{width:320,height:480,keyboard:{portrait:300,landscape:240}},{width:320,height:568,keyboard:{portrait:300,landscape:240}},{width:375,height:667,keyboard:{portrait:305,landscape:240}},{width:414,height:736,keyboard:{portrait:320,landscape:240}},{width:768,height:1024,keyboard:{portrait:320,landscape:400}},{width:1024,height:1366,keyboard:{portrait:380,landscape:460}}],function(n){return e<=n.width&&t<=n.height?V.some(n.keyboard):V.none()}).getOr({portrait:t/5,landscape:e/4})},Wg=function(n){var e,t=Ad(n).isPortrait(),r=$g((e=n).screen.width,e.screen.height),o=t?r.portrait:r.landscape;return(t?n.screen.height:n.screen.width)-n.innerHeight>o?0:o},Gg=function(n,e){var t=ze(n).dom().defaultView;return Fi(n)+Fi(e)-Wg(t)},_g=Gg,Ug=function(n,e,t){var r=Gg(e,t),o=Fi(e)+Fi(t)-r;Oi(n,"padding-bottom",o+"px")},qg=rt([{fixed:["element","property","offsetY"]},{scroller:["element","offsetY"]}]),Yg="data-"+vi.resolve("position-y-fixed"),Kg="data-"+vi.resolve("y-property"),Xg="data-"+vi.resolve("scrolling"),Jg="data-"+vi.resolve("last-window-height"),Qg=function(n){return jd(n,Yg)},Zg=function(n,e){var t=Xr(n,Kg);return qg.fixed(n,t,e)},nv=function(n,e){return qg.scroller(n,e)},ev=function(n){var e=Qg(n);return("true"===Xr(n,Xg)?nv:Zg)(n,e)},tv=function(n,e,t){var r=ze(n).dom().defaultView.innerHeight;return Yr(n,Jg,r+"px"),r-e-t},rv=function(n){var e=Hi(n,"["+Yg+"]");return xn(e,ev)},ov=function(r,o,i,u){var n,e,t,c,a,s,f,l,d=ze(r).dom().defaultView,m=(l=Xr(f=i,"style"),Ti(f,{position:"absolute",top:"0px"}),Yr(f,Yg,"0px"),Yr(f,Kg,"top"),{restore:function(){Yr(f,"style",l||""),Qr(f,Yg),Qr(f,Kg)}}),g=Fi(i),v=Fi(u),p=(c=tv(r,t=g,v),s=Xr(a=r,"style"),ad.register(a),Ti(a,{position:"absolute",height:c+"px",width:"100%",top:t+"px"}),Yr(a,Yg,t+"px"),Yr(a,Xg,"true"),Yr(a,Kg,"top"),{restore:function(){ad.deregister(a),Yr(a,"style",s||""),Qr(a,Yg),Qr(a,Xg),Qr(a,Kg)}}),h=(e=Xr(n=u,"style"),Ti(n,{position:"absolute",bottom:"0px"}),Yr(n,Yg,"0px"),Yr(n,Kg,"bottom"),{restore:function(){Yr(n,"style",e||""),Qr(n,Yg),Qr(n,Kg)}}),b=!0,y=function(){var n=d.innerHeight;return jd(r,Jg)<n},x=function(){if(b){var n=Fi(i),e=Fi(u),t=tv(r,n,e);Yr(r,Yg,n+"px"),Oi(r,"height",t+"px"),Ug(o,r,u)}};return Ug(o,r,u),{setViewportOffset:function(n){Yr(r,Yg,n+"px"),x()},isExpanding:y,isShrinking:w(y),refresh:x,restore:function(){b=!1,m.restore(),p.restore(),h.restore()}}},iv=Qg,uv=Pg(),cv="data-"+vi.resolve("last-scroll-top"),av=function(n){var e=Ei(n,"top").getOr("0");return parseInt(e,10)},sv=function(n){return parseInt(n.dom().scrollTop,10)},fv=function(n,e){var t=e+iv(n)+"px";Oi(n,"top",t)},lv=function(t,r,o){return jg.nu(function(n){var e=l(sv,t);uv.animate(e,r,15,function(n){t.dom().scrollTop=n,Oi(t,"top",av(t)+15+"px")},function(){t.dom().scrollTop=r,Oi(t,"top",o+"px"),n(r)},10)})},dv=function(o,i){return jg.nu(function(n){var e=l(sv,o);Yr(o,cv,e());var t=Math.abs(i-e()),r=Math.ceil(t/10);uv.animate(e,i,r,function(n,e){jd(o,cv)!==o.dom().scrollTop?e(o.dom().scrollTop):(o.dom().scrollTop=n,Yr(o,cv,n))},function(){o.dom().scrollTop=i,Yr(o,cv,i),n(i)},10)})},mv=function(i,u){return jg.nu(function(n){var e=l(av,i),t=function(n){Oi(i,"top",n+"px")},r=Math.abs(u-e()),o=Math.ceil(r/10);uv.animate(e,u,o,t,function(){t(u),n(u)},10)})},gv=function(e,t,r){var o=ze(e).dom().defaultView;return jg.nu(function(n){fv(e,r),fv(t,r),o.scrollTo(0,r),n(r)})},vv=function(n,e,t,r,o){var i=_g(e,t),u=l(Bg,n);i<r||i<o?dv(e,e.dom().scrollTop-i+o).get(u):r<0&&dv(e,e.dom().scrollTop+r).get(u)},pv=function(u,n){return n(function(r){var o=[],i=0;0===u.length?r([]):wn(u,function(n,e){var t;n.get((t=e,function(n){o[t]=n,++i>=u.length&&r(o)}))})})},hv=function(n,a){return n.fold(function(n,e,t){return Oi(n,e,a+(r=t)+"px"),jg.pure(r);var r},function(n,e){return o=a+(r=e),i=Ei(t=n,"top").getOr(r),u=o-parseInt(i,10),c=t.dom().scrollTop+u,lv(t,c,o);var t,r,o,i,u,c})},bv=function(n,e){var t=rv(n),r=xn(t,function(n){return hv(n,e)});return pv(r,jg.nu)},yv=function(e,t,n,r,o,i){var u,c,a=(u=function(n){return gv(e,t,n)},c=mo(Hg.pure({})),{start:function(e){var n=Hg.nu(function(n){return u(e).get(n)});c.set(n)},idle:function(n){c.get().get(function(){n()})}}),s=Rm(function(){a.idle(function(){bv(n,r.pageYOffset).get(function(){var n;(n=sm(i),V.from(n[0]).bind(function(n){var e=n.top()-t.dom().scrollTop;return e>r.innerHeight+5||e<-5?V.some({top:M(e),bottom:M(e+n.height())}):V.none()})).each(function(n){t.dom().scrollTop=t.dom().scrollTop+n.top()}),a.start(0),o.refresh()})})},1e3),f=Dd(fe.fromDom(r),"scroll",function(){r.pageYOffset<0||s.throttle()});return bv(n,r.pageYOffset).get(h),{unbind:f.unbind}},xv=function(n){var t=n.cWin(),e=n.ceBody(),r=n.socket(),o=n.toolstrip(),i=n.toolbar(),u=n.contentElement(),c=n.keyboardType(),a=n.outerWindow(),s=n.dropup(),f=ov(r,e,o,s),l=c(n.outerBody(),t,ye(),u,o,i),d=Bd(a,{onChange:I,onReady:f.refresh});d.onAdjustment(function(){f.refresh()});var m=Dd(fe.fromDom(a),"resize",function(){f.isExpanding()&&f.refresh()}),g=yv(o,r,n.outerBody(),a,f,t),v=function(t,e){var n=t.document,r=fe.fromTag("div");oo(r,vi.resolve("unfocused-selections")),Ge(fe.fromDom(n.documentElement),r);var o=Dd(r,"touchstart",function(n){n.prevent(),Rg(t,e),u()}),i=function(n){var e=fe.fromTag("span");return gl(e,[vi.resolve("layer-editor"),vi.resolve("unfocused-selection")]),Ti(e,{left:n.left()+"px",top:n.top()+"px",width:n.width()+"px",height:n.height()+"px"}),e},u=function(){Ue(r)};return{update:function(){u();var n=sm(t),e=xn(n,i);_e(r,e)},isActive:function(){return 0<Pe(r).length},destroy:function(){o.unbind(),qe(r)},clear:u}}(t,u),p=function(){v.clear()};return{toEditing:function(){l.toEditing(),p()},toReading:function(){l.toReading()},onToolbarTouch:function(n){l.onToolbarTouch(n)},refreshSelection:function(){v.isActive()&&v.update()},clearSelection:p,highlightSelection:function(){v.update()},scrollIntoView:function(n,e){vv(t,r,s,n,e)},updateToolbarPadding:I,setViewportOffset:function(n){f.setViewportOffset(n),mv(r,n).get(h)},syncHeight:function(){Oi(u,"height",u.dom().contentWindow.document.body.scrollHeight+"px")},refreshStructure:f.refresh,destroy:function(){f.restore(),d.destroy(),g.unbind(),m.unbind(),l.destroy(),v.destroy(),Ag(ye(),yo)}}},wv=function(r,n){var o=Am(),i=Wf(),u=Wf(),c=$f(),a=$f();return{enter:function(){n.hide();var t=fe.fromDom(v.document);Tm.getActiveApi(r.editor).each(function(n){i.set({socketHeight:Ei(r.socket,"height"),iframeHeight:Ei(n.frame(),"height"),outerScroll:v.document.body.scrollTop}),u.set({exclusives:_m.exclusive(t,"."+ad.scrollable())}),oo(r.container,vi.resolve("fullscreen-maximized")),Im(r.container,n.body()),o.maximize(),Oi(r.socket,"overflow","scroll"),Oi(r.socket,"-webkit-overflow-scrolling","touch"),bo(n.body());var e=Ee(["cWin","ceBody","socket","toolstrip","toolbar","dropup","contentElement","cursor","keyboardType","isScrolling","outerWindow","outerBody"],[]);c.set(xv(e({cWin:n.win(),ceBody:n.body(),socket:r.socket,toolstrip:r.toolstrip,toolbar:r.toolbar,dropup:r.dropup.element(),contentElement:n.frame(),cursor:I,outerBody:r.body,outerWindow:r.win,keyboardType:Fg.stubborn,isScrolling:function(){return u.get().exists(function(n){return n.socket.isScrolling()})}}))),c.run(function(n){n.syncHeight()}),a.set(Vg(n,c,r.toolstrip,r.socket,r.dropup))})},refreshStructure:function(){c.run(function(n){n.refreshStructure()})},exit:function(){o.restore(),a.clear(),c.clear(),n.show(),i.on(function(n){n.socketHeight.each(function(n){Oi(r.socket,"height",n)}),n.iframeHeight.each(function(n){Oi(r.editor.getFrame(),"height",n)}),v.document.body.scrollTop=n.scrollTop}),i.clear(),u.on(function(n){n.exclusives.unbind()}),u.clear(),io(r.container,vi.resolve("fullscreen-maximized")),Mm(),ad.deregister(r.toolbar),Di(r.socket,"overflow"),Di(r.socket,"-webkit-overflow-scrolling"),yo(r.editor.getFrame()),Tm.getActiveApi(r.editor).each(function(n){n.clearSelection()})}}},Sv=function(n){var e=Kt("Getting IosWebapp schema",Vm,n);Oi(e.toolstrip,"width","100%"),Oi(e.container,"position","relative");var t=El(Fm(function(){e.setReadOnly(e.readOnlyOnInit()),r.enter()},e.translate));e.alloy.add(t);var r=wv(e,{show:function(){e.alloy.add(t)},hide:function(){e.alloy.remove(t)}});return{setReadOnly:e.setReadOnly,refreshStructure:r.refreshStructure,enter:r.enter,exit:r.exit,destroy:I}},Ov=tinymce.util.Tools.resolve("tinymce.EditorManager"),Tv=function(n){var e=wt(n.settings,"skin_url").fold(function(){return Ov.baseURL+"/skins/lightgray"},function(n){return n});return{content:e+"/content.mobile.min.css",ui:e+"/skin.mobile.min.css"}},kv=function(n,e,t){n.system().broadcastOn([ko.formatChanged()],{command:e,state:t})},Cv=function(r,n){var e=N(n.formatter.get());wn(e,function(e){n.formatter.formatChanged(e,function(n){kv(r,e,n)})}),wn(["ul","ol"],function(t){n.selection.selectorChanged(t,function(n,e){kv(r,t,n)})})},Ev=(M(["x-small","small","medium","large","x-large"]),function(n){var e=function(){n._skinLoaded=!0,n.fire("SkinLoaded")};return function(){n.initialized?e():n.on("init",e)}}),Dv=M("toReading"),Iv=M("toEditing");Oo.add("mobile",function(D){return{getNotificationManagerImpl:function(){return{open:M({progressBar:{value:I},close:I}),close:I,reposition:I,getArgs:h}},renderUI:function(n){var e=Tv(D);0==(!1===D.settings.skin)?(D.contentCSS.push(e.content),So.DOM.styleSheetLoader.load(e.ui,Ev(D))):Ev(D)();var t,r,o,i,u,c,a,s,f,l,d,m,g,v,p,h,b,y=function(){D.fire("scrollIntoView")},x=fe.fromTag("div"),w=Gn.detect().os.isAndroid()?(s=y,f=Mg({classes:[vi.resolve("android-container")]}),l=Um(),d=$f(),m=Km(d),g=Xm(),v=dg(I,s),f.add(l.wrapper()),f.add(g),f.add(v.component()),{system:M(f),element:f.element,init:function(n){d.set(Nm(n))},exit:function(){d.run(function(n){n.exit(),Ul.remove(g,m)})},setToolbarGroups:function(n){var e=l.createGroups(n);l.setGroups(e)},setContextToolbar:function(n){var e=l.createGroups(n);l.setContextToolbar(e)},focusToolbar:function(){l.focus()},restoreToolbar:function(){l.restoreToolbar()},updateMode:function(n){Jm(g,m,n,f.root())},socket:M(g),dropup:M(v)}):(t=y,r=Mg({classes:[vi.resolve("ios-container")]}),o=Um(),i=$f(),u=Km(i),c=Xm(),a=dg(function(){i.run(function(n){n.refreshStructure()})},t),r.add(o.wrapper()),r.add(c),r.add(a.component()),{system:M(r),element:r.element,init:function(n){i.set(Sv(n))},exit:function(){i.run(function(n){Ul.remove(c,u),n.exit()})},setToolbarGroups:function(n){var e=o.createGroups(n);o.setGroups(e)},setContextToolbar:function(n){var e=o.createGroups(n);o.setContextToolbar(e)},focusToolbar:function(){o.focus()},restoreToolbar:function(){o.restoreToolbar()},updateMode:function(n){Jm(c,u,n,r.root())},socket:M(c),dropup:M(a)}),S=fe.fromDom(n.targetNode);we("element","offset"),h=x,(b=(p=S).dom(),V.from(b.nextSibling).map(fe.fromDom)).fold(function(){Le(p).each(function(n){Ge(n,h)})},function(n){var e,t;t=h,Le(e=n).each(function(n){n.dom().insertBefore(t.dom(),e.dom())})}),function(n,e){Ge(n,e.element());var t=Pe(e.element());wn(t,function(n){e.getByDom(n).each(Ke)})}(x,w.system());var O=n.targetNode.ownerDocument.defaultView,T=Bd(O,{onChange:function(){w.system().broadcastOn([ko.orientationChanged()],{width:Rd(O)})},onReady:I}),k=function(n,e,t,r){!1===r&&D.selection.collapse();var o=C(n,e,t);w.setToolbarGroups(!0===r?o.readOnly:o.main),D.setMode(!0===r?"readonly":"design"),D.fire(!0===r?Dv():Iv()),w.updateMode(r)},C=function(n,e,t){var r=n.get();return{readOnly:r.backToMask.concat(e.get()),main:r.backToMask.concat(t.get())}},E=function(n,e){return D.on(n,e),{unbind:function(){D.off(n)}}};return D.on("init",function(){w.init({editor:{getFrame:function(){return fe.fromDom(D.contentAreaContainer.querySelector("iframe"))},onDomChanged:function(){return{unbind:I}},onToReading:function(n){return E(Dv(),n)},onToEditing:function(n){return E(Iv(),n)},onScrollToCursor:function(e){return D.on("scrollIntoView",function(n){e(n)}),{unbind:function(){D.off("scrollIntoView"),T.destroy()}}},onTouchToolstrip:function(){t()},onTouchContent:function(){var n,e=fe.fromDom(D.editorContainer.querySelector("."+vi.resolve("toolbar")));(n=e,wo(n).bind(function(n){return w.system().getByDom(n).toOption()})).each(ue),w.restoreToolbar(),t()},onTapContent:function(n){var e=n.target();"img"===ge(e)?(D.selection.select(e.dom()),n.kill()):"a"===ge(e)&&w.system().getByDom(fe.fromDom(D.editorContainer)).each(function(n){lo.isAlpha(n)&&To(e.dom())})}},container:fe.fromDom(D.editorContainer),socket:fe.fromDom(D.contentAreaContainer),toolstrip:fe.fromDom(D.editorContainer.querySelector("."+vi.resolve("toolstrip"))),toolbar:fe.fromDom(D.editorContainer.querySelector("."+vi.resolve("toolbar"))),dropup:w.dropup(),alloy:w.system(),translate:I,setReadOnly:function(n){k(a,c,u,n)},readOnlyOnInit:function(){return!1}});var t=function(){w.dropup().disappear(function(){w.system().broadcastOn([ko.dropupDismissed()],{})})},n={label:"The first group",scrollable:!1,items:[Xa.forToolbar("back",function(){D.selection.collapse(),w.exit()},{})]},e={label:"Back to read only",scrollable:!1,items:[Xa.forToolbar("readonly-back",function(){k(a,c,u,!0)},{})]},r=Sd(w,D),o=Od(D.settings,r),i={label:"The extra group",scrollable:!1,items:[]},u=mo([{label:"the action group",scrollable:!0,items:o},i]),c=mo([{label:"The read only mode group",scrollable:!0,items:[]},i]),a=mo({backToMask:[n],backToReadOnly:[e]});Cv(w,D)}),D.on("remove",function(){w.exit()}),D.on("detach",function(){var e,n;e=w.system(),n=Pe(e.element()),wn(n,function(n){e.getByDom(n).each(Ye)}),qe(e.element()),w.system().destroy(),qe(x)}),{iframeContainer:w.socket().element().dom(),editorContainer:w.element().dom()}}}})}(window);
\ No newline at end of file
+!function(p){"use strict";var I=function(){},v=function(t,r){return function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];return t(r.apply(null,n))}},A=function(n){return function(){return n}},h=function(n){return n};function l(r){for(var o=[],n=1;n<arguments.length;n++)o[n-1]=arguments[n];return function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];var t=o.concat(n);return r.apply(null,t)}}var n,e,t,r,o,i,u,x=function(t){return function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];return!t.apply(null,n)}},c=function(n){return function(){throw new Error(n)}},a=function(n){return n()},s=A(!1),f=A(!0),d=function(e){return function(n){return function(n){if(null===n)return"null";var e=typeof n;return"object"===e&&(Array.prototype.isPrototypeOf(n)||n.constructor&&"Array"===n.constructor.name)?"array":"object"===e&&(String.prototype.isPrototypeOf(n)||n.constructor&&"String"===n.constructor.name)?"string":e}(n)===e}},y=d("string"),m=d("object"),g=d("array"),b=d("boolean"),w=d("function"),T=d("number"),S=Object.prototype.hasOwnProperty,O=function(u){return function(){for(var n=new Array(arguments.length),e=0;e<n.length;e++)n[e]=arguments[e];if(0===n.length)throw new Error("Can't merge zero objects");for(var t={},r=0;r<n.length;r++){var o=n[r];for(var i in o)S.call(o,i)&&(t[i]=u(t[i],o[i]))}return t}},k=O(function(n,e){return m(n)&&m(e)?k(n,e):e}),C=O(function(n,e){return e}),E=function(){return D},D=(n=function(n){return n.isNone()},r={fold:function(n,e){return n()},is:s,isSome:s,isNone:f,getOr:t=function(n){return n},getOrThunk:e=function(n){return n()},getOrDie:function(n){throw new Error(n||"error: getOrDie called on none.")},getOrNull:A(null),getOrUndefined:A(undefined),or:t,orThunk:e,map:E,each:I,bind:E,exists:s,forall:f,filter:E,equals:n,equals_:n,toArray:function(){return[]},toString:A("none()")},Object.freeze&&Object.freeze(r),r),M=function(t){var n=A(t),e=function(){return o},r=function(n){return n(t)},o={fold:function(n,e){return e(t)},is:function(n){return t===n},isSome:f,isNone:s,getOr:n,getOrThunk:n,getOrDie:n,getOrNull:n,getOrUndefined:n,or:e,orThunk:e,map:function(n){return M(n(t))},each:function(n){n(t)},bind:r,exists:r,forall:r,filter:function(n){return n(t)?o:D},toArray:function(){return[t]},toString:function(){return"some("+t+")"},equals:function(n){return n.is(t)},equals_:function(n,e){return n.fold(s,function(n){return e(t,n)})}};return o},F={some:M,none:E,from:function(n){return null===n||n===undefined?D:M(n)}},R=Object.keys,B=function(n,e){for(var t=R(n),r=0,o=t.length;r<o;r++){var i=t[r];e(n[i],i)}},V=function(n,t){return N(n,function(n,e){return{k:e,v:t(n,e)}})},N=function(n,r){var o={};return B(n,function(n,e){var t=r(n,e);o[t.k]=t.v}),o},_=function(n,t){var r=[];return B(n,function(n,e){r.push(t(n,e))}),r},j=A("touchstart"),H=A("touchmove"),z=A("touchend"),L=A("mousedown"),P=A("mousemove"),$=A("mouseup"),W=A("mouseover"),U=A("keydown"),G=A("input"),q=A("change"),Y=A("click"),K=A("transitionend"),X=A("selectstart"),J=function(t){var r,o=!1;return function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];return o||(o=!0,r=t.apply(null,n)),r}},Q=function(n,e){var t=function(n,e){for(var t=0;t<n.length;t++){var r=n[t];if(r.test(e))return r}return undefined}(n,e);if(!t)return{major:0,minor:0};var r=function(n){return Number(e.replace(t,"$"+n))};return nn(r(1),r(2))},Z=function(){return nn(0,0)},nn=function(n,e){return{major:n,minor:e}},en={nu:nn,detect:function(n,e){var t=String(e).toLowerCase();return 0===n.length?Z():Q(n,t)},unknown:Z},tn="Firefox",rn=function(n,e){return function(){return e===n}},on=function(n){var e=n.current;return{current:e,version:n.version,isEdge:rn("Edge",e),isChrome:rn("Chrome",e),isIE:rn("IE",e),isOpera:rn("Opera",e),isFirefox:rn(tn,e),isSafari:rn("Safari",e)}},un={unknown:function(){return on({current:undefined,version:en.unknown()})},nu:on,edge:A("Edge"),chrome:A("Chrome"),ie:A("IE"),opera:A("Opera"),firefox:A(tn),safari:A("Safari")},cn="Windows",an="Android",sn="Solaris",fn="FreeBSD",ln=function(n,e){return function(){return e===n}},dn=function(n){var e=n.current;return{current:e,version:n.version,isWindows:ln(cn,e),isiOS:ln("iOS",e),isAndroid:ln(an,e),isOSX:ln("OSX",e),isLinux:ln("Linux",e),isSolaris:ln(sn,e),isFreeBSD:ln(fn,e)}},mn={unknown:function(){return dn({current:undefined,version:en.unknown()})},nu:dn,windows:A(cn),ios:A("iOS"),android:A(an),linux:A("Linux"),osx:A("OSX"),solaris:A(sn),freebsd:A(fn)},gn=Array.prototype.slice,pn=Array.prototype.indexOf,vn=Array.prototype.push,hn=function(n,e){return t=n,r=e,-1<pn.call(t,r);var t,r},yn=function(n,e){for(var t=n.length,r=new Array(t),o=0;o<t;o++){var i=n[o];r[o]=e(i,o)}return r},bn=function(n,e){for(var t=0,r=n.length;t<r;t++)e(n[t],t)},wn=function(n,e){for(var t=[],r=0,o=n.length;r<o;r++){var i=n[r];e(i,r)&&t.push(i)}return t},xn=function(n,e,t){return function(n,e){for(var t=n.length-1;0<=t;t--)e(n[t],t)}(n,function(n){t=e(t,n)}),t},Tn=function(n,e,t){return bn(n,function(n){t=e(t,n)}),t},Sn=function(n,e){for(var t=0,r=n.length;t<r;t++){var o=n[t];if(e(o,t))return F.some(o)}return F.none()},On=function(n,e){for(var t=0,r=n.length;t<r;t++)if(e(n[t],t))return F.some(t);return F.none()},kn=function(n){for(var e=[],t=0,r=n.length;t<r;++t){if(!g(n[t]))throw new Error("Arr.flatten item "+t+" was not an array, input: "+n);vn.apply(e,n[t])}return e},Cn=function(n,e){var t=yn(n,e);return kn(t)},En=function(n,e){for(var t=0,r=n.length;t<r;++t)if(!0!==e(n[t],t))return!1;return!0},Dn=function(n){var e=gn.call(n,0);return e.reverse(),e},In=function(n){return[n]},An=(w(Array.from)&&Array.from,function(n,e){var t=String(e).toLowerCase();return Sn(n,function(n){return n.search(t)})}),Mn=function(n,t){return An(n,t).map(function(n){var e=en.detect(n.versionRegexes,t);return{current:n.name,version:e}})},Fn=function(n,t){return An(n,t).map(function(n){var e=en.detect(n.versionRegexes,t);return{current:n.name,version:e}})},Rn=function(n,e){return-1!==n.indexOf(e)},Bn=/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,Vn=function(e){return function(n){return Rn(n,e)}},Nn=[{name:"Edge",versionRegexes:[/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],search:function(n){return Rn(n,"edge/")&&Rn(n,"chrome")&&Rn(n,"safari")&&Rn(n,"applewebkit")}},{name:"Chrome",versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/,Bn],search:function(n){return Rn(n,"chrome")&&!Rn(n,"chromeframe")}},{name:"IE",versionRegexes:[/.*?msie\ ?([0-9]+)\.([0-9]+).*/,/.*?rv:([0-9]+)\.([0-9]+).*/],search:function(n){return Rn(n,"msie")||Rn(n,"trident")}},{name:"Opera",versionRegexes:[Bn,/.*?opera\/([0-9]+)\.([0-9]+).*/],search:Vn("opera")},{name:"Firefox",versionRegexes:[/.*?firefox\/\ ?([0-9]+)\.([0-9]+).*/],search:Vn("firefox")},{name:"Safari",versionRegexes:[Bn,/.*?cpu os ([0-9]+)_([0-9]+).*/],search:function(n){return(Rn(n,"safari")||Rn(n,"mobile/"))&&Rn(n,"applewebkit")}}],_n=[{name:"Windows",search:Vn("win"),versionRegexes:[/.*?windows\ nt\ ?([0-9]+)\.([0-9]+).*/]},{name:"iOS",search:function(n){return Rn(n,"iphone")||Rn(n,"ipad")},versionRegexes:[/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,/.*cpu os ([0-9]+)_([0-9]+).*/,/.*cpu iphone os ([0-9]+)_([0-9]+).*/]},{name:"Android",search:Vn("android"),versionRegexes:[/.*?android\ ?([0-9]+)\.([0-9]+).*/]},{name:"OSX",search:Vn("os x"),versionRegexes:[/.*?os\ x\ ?([0-9]+)_([0-9]+).*/]},{name:"Linux",search:Vn("linux"),versionRegexes:[]},{name:"Solaris",search:Vn("sunos"),versionRegexes:[]},{name:"FreeBSD",search:Vn("freebsd"),versionRegexes:[]}],jn={browsers:A(Nn),oses:A(_n)},Hn=function(n){var e,t,r,o,i,u,c,a,s,f,l,d=jn.browsers(),m=jn.oses(),g=Mn(d,n).fold(un.unknown,un.nu),p=Fn(m,n).fold(mn.unknown,mn.nu);return{browser:g,os:p,deviceType:(t=g,r=n,o=(e=p).isiOS()&&!0===/ipad/i.test(r),i=e.isiOS()&&!o,u=e.isAndroid()&&3===e.version.major,c=e.isAndroid()&&4===e.version.major,a=o||u||c&&!0===/mobile/i.test(r),s=e.isiOS()||e.isAndroid(),f=s&&!a,l=t.isSafari()&&e.isiOS()&&!1===/safari/i.test(r),{isiPad:A(o),isiPhone:A(i),isTablet:A(a),isPhone:A(f),isTouch:A(s),isAndroid:e.isAndroid,isiOS:e.isiOS,isWebView:A(l)})}},zn={detect:J(function(){var n=p.navigator.userAgent;return Hn(n)})},Ln={tap:A("alloy.tap")},Pn=A("alloy.focus"),$n=A("alloy.blur.post"),Wn=A("alloy.receive"),Un=A("alloy.execute"),Gn=A("alloy.focus.item"),qn=Ln.tap,Yn=zn.detect().deviceType.isTouch()?Ln.tap:Y,Kn=A("alloy.longpress"),Xn=A("alloy.system.init"),Jn=A("alloy.system.scroll"),Qn=A("alloy.system.attached"),Zn=A("alloy.system.detached"),ne=function(n,e){oe(n,n.element(),e,{})},ee=function(n,e,t){oe(n,n.element(),e,t)},te=function(n){ne(n,Un())},re=function(n,e,t){oe(n,e,t,{})},oe=function(n,e,t,r){var o=k({target:e},r);n.getSystem().triggerEvent(t,e,V(o,A))},ie=function(n){if(null===n||n===undefined)throw new Error("Node cannot be null or undefined");return{dom:A(n)}},ue={fromHtml:function(n,e){var t=(e||p.document).createElement("div");if(t.innerHTML=n,!t.hasChildNodes()||1<t.childNodes.length)throw p.console.error("HTML does not have a single root node",n),new Error("HTML must have a single root node");return ie(t.childNodes[0])},fromTag:function(n,e){var t=(e||p.document).createElement(n);return ie(t)},fromText:function(n,e){var t=(e||p.document).createTextNode(n);return ie(t)},fromDom:ie,fromPoint:function(n,e,t){var r=n.dom();return F.from(r.elementFromPoint(e,t)).map(ie)}},ce=(p.Node.ATTRIBUTE_NODE,p.Node.CDATA_SECTION_NODE,p.Node.COMMENT_NODE,p.Node.DOCUMENT_NODE),ae=(p.Node.DOCUMENT_TYPE_NODE,p.Node.DOCUMENT_FRAGMENT_NODE,p.Node.ELEMENT_NODE),se=p.Node.TEXT_NODE,fe=(p.Node.PROCESSING_INSTRUCTION_NODE,p.Node.ENTITY_REFERENCE_NODE,p.Node.ENTITY_NODE,p.Node.NOTATION_NODE,"undefined"!=typeof p.window?p.window:Function("return this;")()),le=function(n,e){return function(n,e){for(var t=e!==undefined&&null!==e?e:fe,r=0;r<n.length&&t!==undefined&&null!==t;++r)t=t[n[r]];return t}(n.split("."),e)},de=function(n,e){var t=le(n,e);if(t===undefined||null===t)throw new Error(n+" not available on this browser");return t},me=function(n){return n.dom().nodeName.toLowerCase()},ge=function(e){return function(n){return n.dom().nodeType===e}},pe=ge(ae),ve=ge(se),he=function(n){var e=ve(n)?n.dom().parentNode:n.dom();return e!==undefined&&null!==e&&e.ownerDocument.body.contains(e)},ye=J(function(){return be(ue.fromDom(p.document))}),be=function(n){var e=n.dom().body;if(null===e||e===undefined)throw new Error("Body is not available yet");return ue.fromDom(e)},we=function(){for(var e=[],n=0;n<arguments.length;n++)e[n]=arguments[n];return function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];if(e.length!==t.length)throw new Error('Wrong number of arguments to struct. Expected "['+e.length+']", got '+t.length+" arguments");var r={};return bn(e,function(n,e){r[n]=A(t[e])}),r}},xe=function(n){return n.slice(0).sort()},Te=function(n,e){throw new Error("All required keys ("+xe(n).join(", ")+") were not specified. Specified keys were: "+xe(e).join(", ")+".")},Se=function(n){throw new Error("Unsupported keys for object: "+xe(n).join(", "))},Oe=function(e,n){if(!g(n))throw new Error("The "+e+" fields must be an array. Was: "+n+".");bn(n,function(n){if(!y(n))throw new Error("The value "+n+" in the "+e+" fields was not a string.")})},ke=function(n){var t=xe(n);Sn(t,function(n,e){return e<t.length-1&&n===t[e+1]}).each(function(n){throw new Error("The field: "+n+" occurs more than once in the combined fields: ["+t.join(", ")+"].")})},Ce=function(o,i){var u=o.concat(i);if(0===u.length)throw new Error("You must specify at least one required or optional field.");return Oe("required",o),Oe("optional",i),ke(u),function(e){var t=R(e);En(o,function(n){return hn(t,n)})||Te(o,t);var n=wn(t,function(n){return!hn(u,n)});0<n.length&&Se(n);var r={};return bn(o,function(n){r[n]=A(e[n])}),bn(i,function(n){r[n]=A(Object.prototype.hasOwnProperty.call(e,n)?F.some(e[n]):F.none())}),r}},Ee=ae,De=ce,Ie=function(n,e){var t=n.dom();if(t.nodeType!==Ee)return!1;var r=t;if(r.matches!==undefined)return r.matches(e);if(r.msMatchesSelector!==undefined)return r.msMatchesSelector(e);if(r.webkitMatchesSelector!==undefined)return r.webkitMatchesSelector(e);if(r.mozMatchesSelector!==undefined)return r.mozMatchesSelector(e);throw new Error("Browser lacks native selectors")},Ae=function(n){return n.nodeType!==Ee&&n.nodeType!==De||0===n.childElementCount},Me=function(n,e){var t=e===undefined?p.document:e.dom();return Ae(t)?[]:yn(t.querySelectorAll(n),ue.fromDom)},Fe=function(n,e){var t=e===undefined?p.document:e.dom();return Ae(t)?F.none():F.from(t.querySelector(n)).map(ue.fromDom)},Re=function(n,e){return n.dom()===e.dom()},Be=(zn.detect().browser.isIE(),function(n){return ue.fromDom(n.dom().ownerDocument)}),Ve=function(n){return ue.fromDom(n.dom().ownerDocument.defaultView)},Ne=function(n){return F.from(n.dom().parentNode).map(ue.fromDom)},_e=function(n){return yn(n.dom().childNodes,ue.fromDom)},je=function(n){return e=0,t=n.dom().childNodes,F.from(t[e]).map(ue.fromDom);var e,t},He=(we("element","offset"),function(e,t){je(e).fold(function(){ze(e,t)},function(n){e.dom().insertBefore(t.dom(),n.dom())})}),ze=function(n,e){n.dom().appendChild(e.dom())},Le=function(e,n){bn(n,function(n){ze(e,n)})},Pe=function(n){n.dom().textContent="",bn(_e(n),function(n){$e(n)})},$e=function(n){var e=n.dom();null!==e.parentNode&&e.parentNode.removeChild(e)},We=function(n){ne(n,Zn());var e=n.components();bn(e,We)},Ue=function(n){var e=n.components();bn(e,Ue),ne(n,Qn())},Ge=function(n,e){qe(n,e,ze)},qe=function(n,e,t){n.getSystem().addToWorld(e),t(n.element(),e.element()),he(n.element())&&Ue(e),n.syncComponents()},Ye=function(n){We(n),$e(n.element()),n.getSystem().removeFromWorld(n)},Ke=function(e){var n=Ne(e.element()).bind(function(n){return e.getSystem().getByDom(n).fold(F.none,F.some)});Ye(e),n.each(function(n){n.syncComponents()})},Xe=function(t){return{is:function(n){return t===n},isValue:f,isError:s,getOr:A(t),getOrThunk:A(t),getOrDie:A(t),or:function(n){return Xe(t)},orThunk:function(n){return Xe(t)},fold:function(n,e){return e(t)},map:function(n){return Xe(n(t))},mapError:function(n){return Xe(t)},each:function(n){n(t)},bind:function(n){return n(t)},exists:function(n){return n(t)},forall:function(n){return n(t)},toOption:function(){return F.some(t)}}},Je=function(t){return{is:s,isValue:s,isError:f,getOr:h,getOrThunk:function(n){return n()},getOrDie:function(){return c(String(t))()},or:function(n){return n},orThunk:function(n){return n()},fold:function(n,e){return n(t)},map:function(n){return Je(t)},mapError:function(n){return Je(n(t))},each:I,bind:function(n){return Je(t)},exists:s,forall:f,toOption:F.none}},Qe={value:Xe,error:Je,fromOption:function(n,e){return n.fold(function(){return Je(e)},Xe)}},Ze=function(u){if(!g(u))throw new Error("cases must be an array");if(0===u.length)throw new Error("there must be at least one case");var c=[],t={};return bn(u,function(n,r){var e=R(n);if(1!==e.length)throw new Error("one and only one name per case");var o=e[0],i=n[o];if(t[o]!==undefined)throw new Error("duplicate key detected:"+o);if("cata"===o)throw new Error("cannot have a case named cata (sorry)");if(!g(i))throw new Error("case arguments must be an array");c.push(o),t[o]=function(){var n=arguments.length;if(n!==i.length)throw new Error("Wrong number of arguments to case "+o+". Expected "+i.length+" ("+i+"), got "+n);for(var t=new Array(n),e=0;e<t.length;e++)t[e]=arguments[e];return{fold:function(){if(arguments.length!==u.length)throw new Error("Wrong number of arguments to fold. Expected "+u.length+", got "+arguments.length);return arguments[r].apply(null,t)},match:function(n){var e=R(n);if(c.length!==e.length)throw new Error("Wrong number of arguments to match. Expected: "+c.join(",")+"\nActual: "+e.join(","));if(!En(c,function(n){return hn(e,n)}))throw new Error("Not all branches were specified when using match. Specified: "+e.join(", ")+"\nRequired: "+c.join(", "));return n[o].apply(null,t)},log:function(n){p.console.log(n,{constructors:c,constructor:o,params:t})}}}}),t},nt=Ze([{strict:[]},{defaultedThunk:["fallbackThunk"]},{asOption:[]},{asDefaultedOptionThunk:["fallbackThunk"]},{mergeWithThunk:["baseThunk"]}]),et=function(n){return nt.defaultedThunk(A(n))},tt=nt.strict,rt=nt.asOption,ot=nt.defaultedThunk,it=nt.mergeWithThunk,ut=(Ze([{bothErrors:["error1","error2"]},{firstError:["error1","value2"]},{secondError:["value1","error2"]},{bothValues:["value1","value2"]}]),function(n){var e=[],t=[];return bn(n,function(n){n.fold(function(n){e.push(n)},function(n){t.push(n)})}),{errors:e,values:t}}),ct=function(n){return v(Qe.error,kn)(n)},at=function(n,e){var t,r,o=ut(n);return 0<o.errors.length?ct(o.errors):(t=o.values,r=e,Qe.value(k.apply(undefined,[r].concat(t))))},st=function(n){var e=ut(n);return 0<e.errors.length?ct(e.errors):Qe.value(e.values)},ft=function(e){return function(n){return n.hasOwnProperty(e)?F.from(n[e]):F.none()}},lt=function(n,e){return ft(e)(n)},dt=function(n,e){var t={};return t[n]=e,t},mt=function(n,e){return t=n,r={},bn(e,function(n){t[n]!==undefined&&t.hasOwnProperty(n)&&(r[n]=t[n])}),r;var t,r},gt=function(n,e){return t=e,r={},B(n,function(n,e){hn(t,e)||(r[e]=n)}),r;var t,r},pt=function(n){return ft(n)},vt=function(n,e){return t=n,r=e,function(n){return ft(t)(n).getOr(r)};var t,r},ht=function(n,e){return lt(n,e)},yt=function(n,e){return dt(n,e)},bt=function(n){return e={},bn(n,function(n){e[n.key]=n.value}),e;var e},wt=function(n,e){return at(n,e)},xt=function(n,e){return r=e,(t=n).hasOwnProperty(r)&&t[r]!==undefined&&null!==t[r];var t,r},Tt=Ze([{setOf:["validator","valueType"]},{arrOf:["valueType"]},{objOf:["fields"]},{itemOf:["validator"]},{choiceOf:["key","branches"]},{thunk:["description"]},{func:["args","outputSchema"]}]),St=Ze([{field:["name","presence","type"]},{state:["name"]}]),Ot=function(){return de("JSON")},kt=function(n,e,t){return Ot().stringify(n,e,t)},Ct=function(n){return m(n)&&100<R(n).length?" removed due to size":kt(n,null,2)},Et=function(n,e){return Qe.error([{path:n,getErrorInfo:e}])},Dt=Ze([{field:["key","okey","presence","prop"]},{state:["okey","instantiator"]}]),It=function(t,r,o){return lt(r,o).fold(function(){return n=o,e=r,Et(t,function(){return'Could not find valid *strict* value for "'+n+'" in '+Ct(e)});var n,e},Qe.value)},At=function(n,e,t){var r=lt(n,e).fold(function(){return t(n)},h);return Qe.value(r)},Mt=function(o,c,n,a){return n.fold(function(i,e,n,t){var r=function(n){return t.extract(o.concat([i]),a,n).map(function(n){return dt(e,a(n))})},u=function(n){return n.fold(function(){var n=dt(e,a(F.none()));return Qe.value(n)},function(n){return t.extract(o.concat([i]),a,n).map(function(n){return dt(e,a(F.some(n)))})})};return n.fold(function(){return It(o,c,i).bind(r)},function(n){return At(c,i,n).bind(r)},function(){return(n=c,e=i,Qe.value(lt(n,e))).bind(u);var n,e},function(n){return(e=c,t=i,r=n,o=lt(e,t).map(function(n){return!0===n?r(e):n}),Qe.value(o)).bind(u);var e,t,r,o},function(n){var e=n(c);return At(c,i,A({})).map(function(n){return k(e,n)}).bind(r)})},function(n,e){var t=e(c);return Qe.value(dt(n,a(t)))})},Ft=function(r){return{extract:function(t,n,e){return r(e,n).fold(function(n){return e=n,Et(t,function(){return e});var e},Qe.value)},toString:function(){return"val"},toDsl:function(){return Tt.itemOf(r)}}},Rt=function(n){var a=Bt(n),s=xn(n,function(e,n){return n.fold(function(n){return k(e,yt(n,!0))},A(e))},{});return{extract:function(n,e,t){var r,o,i,u=b(t)?[]:(o=R(r=t),wn(o,function(n){return xt(r,n)})),c=wn(u,function(n){return!xt(s,n)});return 0===c.length?a.extract(n,e,t):(i=c,Et(n,function(){return"There are unsupported fields: ["+i.join(", ")+"] specified"}))},toString:a.toString,toDsl:a.toDsl}},Bt=function(c){return{extract:function(n,e,t){return r=n,o=t,i=e,u=yn(c,function(n){return Mt(r,o,n,i)}),at(u,{});var r,o,i,u},toString:function(){return"obj{\n"+yn(c,function(n){return n.fold(function(n,e,t,r){return n+" -> "+r.toString()},function(n,e){return"state("+n+")"})}).join("\n")+"}"},toDsl:function(){return Tt.objOf(yn(c,function(n){return n.fold(function(n,e,t,r){return St.field(n,t,r)},function(n,e){return St.state(n)})}))}}},Vt=function(t,i){var e=function(n,e){return(o=Ft(t),{extract:function(t,r,n){var e=yn(n,function(n,e){return o.extract(t.concat(["["+e+"]"]),r,n)});return st(e)},toString:function(){return"array("+o.toString()+")"},toDsl:function(){return Tt.arrOf(o)}}).extract(n,h,e);var o};return{extract:function(t,r,o){var n=R(o);return e(t,n).bind(function(n){var e=yn(n,function(n){return Dt.field(n,n,tt(),i)});return Bt(e).extract(t,r,o)})},toString:function(){return"setOf("+i.toString()+")"},toDsl:function(){return Tt.setOf(t,i)}}},Nt=A(Ft(Qe.value)),_t=Dt.state,jt=Dt.field,Ht=function(t,e,r,o,i){return ht(o,i).fold(function(){return n=o,e=i,Et(t,function(){return'The chosen schema: "'+e+'" did not exist in branches: '+Ct(n)});var n,e},function(n){return Bt(n).extract(t.concat(["branch: "+i]),e,r)})},zt=function(o,i){return{extract:function(e,t,r){return ht(r,o).fold(function(){return n=o,Et(e,function(){return'Choice schema did not contain choice key: "'+n+'"'});var n},function(n){return Ht(e,t,r,i,n)})},toString:function(){return"chooseOn("+o+"). Possible values: "+R(i)},toDsl:function(){return Tt.choiceOf(o,i)}}},Lt=Ft(Qe.value),Pt=function(n,e,t,r){return e.extract([n],t,r).fold(function(n){return Qe.error({input:r,errors:n})},Qe.value)},$t=function(n,e,t){return Pt(n,e,A,t)},Wt=function(n){return n.fold(function(n){throw new Error(qt(n))},h)},Ut=function(n,e,t){return Wt(Pt(n,e,h,t))},Gt=function(n,e,t){return Wt($t(n,e,t))},qt=function(n){return"Errors: \n"+(e=n.errors,t=10<e.length?e.slice(0,10).concat([{path:[],getErrorInfo:function(){return"... (only showing first ten failures)"}}]):e,yn(t,function(n){return"Failed path: ("+n.path.join(" > ")+")\n"+n.getErrorInfo()}))+"\n\nInput object: "+Ct(n.input);var e,t},Yt=function(n,e){return zt(n,e)},Kt=A(Lt),Xt=(o=w,i="function",Ft(function(n){var e=typeof n;return o(n)?Qe.value(n):Qe.error("Expected type: "+i+" but got: "+e)})),Jt=function(n){return jt(n,n,tt(),Nt())},Qt=function(n,e){return jt(n,n,tt(),e)},Zt=function(n){return Qt(n,Xt)},nr=function(n,e){return jt(n,n,tt(),Bt(e))},er=function(n){return jt(n,n,rt(),Nt())},tr=function(n,e){return jt(n,n,rt(),Bt(e))},rr=function(n,e){return jt(n,n,rt(),Rt(e))},or=function(n,e){return jt(n,n,et(e),Nt())},ir=function(n,e,t){return jt(n,n,et(e),t)},ur=function(n,e){return _t(n,e)},cr=function(n){if(!xt(n,"can")&&!xt(n,"abort")&&!xt(n,"run"))throw new Error("EventHandler defined by: "+kt(n,null,2)+" does not have can, abort, or run!");return Ut("Extracting event.handler",Rt([or("can",A(!0)),or("abort",A(!1)),or("run",I)]),n)},ar=function(t){var e,r,o,i,n=(e=t,r=function(n){return n.can},function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];return Tn(e,function(n,e){return n&&r(e).apply(undefined,t)},!0)}),u=(o=t,i=function(n){return n.abort},function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];return Tn(o,function(n,e){return n||i(e).apply(undefined,t)},!1)});return cr({can:n,abort:u,run:function(){for(var e=[],n=0;n<arguments.length;n++)e[n]=arguments[n];bn(t,function(n){n.run.apply(undefined,e)})}})},sr=function(n){return bt(n)},fr=function(n,e){return{key:n,value:cr({abort:e})}},lr=function(n,e){return{key:n,value:cr({run:e})}},dr=function(n,e,t){return{key:n,value:cr({run:function(n){e.apply(undefined,[n].concat(t))}})}},mr=function(n){return function(r){return{key:n,value:cr({run:function(n,e){var t;t=e,Re(n.element(),t.event().target())&&r(n,e)}})}}},gr=function(n,e,t){var u,r,o=e.partUids()[t];return r=o,lr(u=n,function(n,i){n.getSystem().getByUid(r).each(function(n){var e,t,r,o;t=(e=n).element(),r=u,o=i,e.getSystem().triggerEvent(r,t,o.event())})})},pr=function(n){return lr(n,function(n,e){e.cut()})},vr=mr(Qn()),hr=mr(Zn()),yr=mr(Xn()),br=(u=Un(),function(n){return lr(u,n)}),wr=function(n){return yn(n,function(n){return r=e="/*",o=(t=n).length-e.length,""!==r&&(t.length<r.length||t.substr(o,o+r.length)!==r)?n:n.substring(0,n.length-"/*".length);var e,t,r,o})},xr=function(n,e){var t=n.toString(),r=t.indexOf(")")+1,o=t.indexOf("("),i=t.substring(o+1,r-1).split(/,\s*/);return n.toFunctionAnnotation=function(){return{name:e,parameters:wr(i)}},n},Tr=Ce(["tag"],["classes","attributes","styles","value","innerHtml","domChildren","defChildren"]),Sr=function(n){return{tag:n.tag(),classes:n.classes().getOr([]),attributes:n.attributes().getOr({}),styles:n.styles().getOr({}),value:n.value().getOr("<none>"),innerHtml:n.innerHtml().getOr("<none>"),defChildren:n.defChildren().fold(function(){return"<none>"},function(n){return kt(n,null,2)}),domChildren:n.domChildren().fold(function(){return"<none>"},function(n){return 0===n.length?"0 children, but still specified":String(n.length)})}},Or=Ce([],["classes","attributes","styles","value","innerHtml","defChildren","domChildren"]),kr=function(e,n,t){return n.fold(function(){return t.fold(function(){return{}},function(n){return yt(e,n)})},function(n){return t.fold(function(){return yt(e,n)},function(n){return yt(e,n)})})},Cr=function(t,r,o){return yr(function(n,e){o(n,t,r)})},Er=function(n,e,t,r,o,i){var u,c,a=n,s=tr(e,[(u="config",c=n,jt(u,u,rt(),c))]);return Ar(a,s,e,t,r,o,i)},Dr=function(o,i,u){var n,e,t,r,c,a;return n=function(t){for(var n=[],e=1;e<arguments.length;e++)n[e-1]=arguments[e];var r=[t].concat(n);return t.config({name:A(o)}).fold(function(){throw new Error("We could not find any behaviour configuration for: "+o+". Using API: "+u)},function(n){var e=Array.prototype.slice.call(r,1);return i.apply(undefined,[t,n.config,n.state].concat(e))})},e=u,t=i.toString(),r=t.indexOf(")")+1,c=t.indexOf("("),a=t.substring(c+1,r-1).split(/,\s*/),n.toFunctionAnnotation=function(){return{name:e,parameters:wr(a.slice(0,1).concat(a.slice(3)))}},n},Ir=function(n){return{key:n,value:undefined}},Ar=function(t,n,r,o,e,i,u){var c=function(n){return xt(n,r)?n[r]():F.none()},a=V(e,function(n,e){return Dr(r,n,e)}),s=V(i,function(n,e){return xr(n,e)}),f=k(s,a,{revoke:l(Ir,r),config:function(n){var e=Gt(r+"-config",t,n);return{key:r,value:{config:e,me:f,configAsRaw:J(function(){return Ut(r+"-config",t,n)}),initialConfig:n,state:u}}},schema:function(){return n},exhibit:function(n,t){return c(n).bind(function(e){return ht(o,"exhibit").map(function(n){return n(t,e.config,e.state)})}).getOr(Or({}))},name:function(){return r},handlers:function(n){return c(n).bind(function(e){return ht(o,"events").map(function(n){return n(e.config,e.state)})}).getOr({})}});return f},Mr=function(n,e){return Fr(n,e,{validate:w,label:"function"})},Fr=function(r,o,i){if(0===o.length)throw new Error("You must specify at least one required field.");return Oe("required",o),ke(o),function(e){var t=R(e);En(o,function(n){return hn(t,n)})||Te(o,t),r(o,t);var n=wn(o,function(n){return!i.validate(e[n],n)});return 0<n.length&&function(n,e){throw new Error("All values need to be of type: "+e+". Keys ("+xe(n).join(", ")+") were not.")}(n,i.label),e}},Rr=function(e,n){var t=wn(n,function(n){return!hn(e,n)});0<t.length&&Se(t)},Br=I,Vr=function(n){return Mr(Rr,n)},Nr={init:function(){return _r({readState:function(){return"No State required"}})}},_r=function(n){return Mr(Br,["readState"])(n),n},jr=function(n){return bt(n)},Hr=Rt([Jt("fields"),Jt("name"),or("active",{}),or("apis",{}),or("state",Nr),or("extra",{})]),zr=function(n){var e,t,r,o,i,u,c,a,s=Ut("Creating behaviour: "+n.name,Hr,n);return e=s.fields,t=s.name,r=s.active,o=s.apis,i=s.extra,u=s.state,c=Rt(e),a=tr(t,[rr("config",e)]),Ar(c,a,t,r,o,i,u)},Lr=Rt([Jt("branchKey"),Jt("branches"),Jt("name"),or("active",{}),or("apis",{}),or("state",Nr),or("extra",{})]),Pr=A(undefined),$r=function(n,e,t){if(!(y(t)||b(t)||T(t)))throw p.console.error("Invalid call to Attr.set. Key ",e,":: Value ",t,":: Element ",n),new Error("Attribute value was not simple");n.setAttribute(e,t+"")},Wr=function(n,e,t){$r(n.dom(),e,t)},Ur=function(n,e){var t=n.dom();B(e,function(n,e){$r(t,e,n)})},Gr=function(n,e){var t=n.dom().getAttribute(e);return null===t?undefined:t},qr=function(n,e){var t=n.dom();return!(!t||!t.hasAttribute)&&t.hasAttribute(e)},Yr=function(n,e){n.dom().removeAttribute(e)},Kr=function(n,e){var t=Gr(n,e);return t===undefined||""===t?[]:t.split(" ")},Xr=function(n){return n.dom().classList!==undefined},Jr=function(n){return Kr(n,"class")},Qr=function(n,e){return o=e,i=Kr(t=n,r="class").concat([o]),Wr(t,r,i.join(" ")),!0;var t,r,o,i},Zr=function(n,e){return o=e,0<(i=wn(Kr(t=n,r="class"),function(n){return n!==o})).length?Wr(t,r,i.join(" ")):Yr(t,r),!1;var t,r,o,i},no=function(n,e){Xr(n)?n.dom().classList.add(e):Qr(n,e)},eo=function(n,e){var t;Xr(n)?n.dom().classList.remove(e):Zr(n,e),0===(Xr(t=n)?t.dom().classList:Jr(t)).length&&Yr(t,"class")},to=function(n,e){return Xr(n)?n.dom().classList.toggle(e):(r=e,hn(Jr(t=n),r)?Zr(t,r):Qr(t,r));var t,r},ro=function(n,e){return Xr(n)&&n.dom().classList.contains(e)},oo=function(n,e,t){eo(n,t),no(n,e)},io=Object.freeze({toAlpha:function(n,e,t){oo(n.element(),e.alpha(),e.omega())},toOmega:function(n,e,t){oo(n.element(),e.omega(),e.alpha())},isAlpha:function(n,e,t){return ro(n.element(),e.alpha())},isOmega:function(n,e,t){return ro(n.element(),e.omega())},clear:function(n,e,t){eo(n.element(),e.alpha()),eo(n.element(),e.omega())}}),uo=[Jt("alpha"),Jt("omega")],co=zr({fields:uo,name:"swapping",apis:io}),ao=function(n){var e=n,t=function(){return e};return{get:t,set:function(n){e=n},clone:function(){return ao(t())}}};function so(n,e,t,r,o){return n(t,r)?F.some(t):w(o)&&o(t)?F.none():e(t,r,o)}var fo=function(n,e,t){for(var r=n.dom(),o=w(t)?t:A(!1);r.parentNode;){r=r.parentNode;var i=ue.fromDom(r);if(e(i))return F.some(i);if(o(i))break}return F.none()},lo=function(n,e,t){return so(function(n,e){return e(n)},fo,n,e,t)},mo=function(n){n.dom().focus()},go=function(n){n.dom().blur()},po=function(n){var e=n!==undefined?n.dom():p.document;return F.from(e.activeElement).map(ue.fromDom)},vo=function(e){return po(Be(e)).filter(function(n){return e.dom().contains(n.dom())})},ho=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),yo=tinymce.util.Tools.resolve("tinymce.ThemeManager"),bo=function(n){var e=p.document.createElement("a");e.target="_blank",e.href=n.href,e.rel="noreferrer noopener";var t=p.document.createEvent("MouseEvents");t.initMouseEvent("click",!0,!0,p.window,0,0,0,0,0,!1,!1,!1,!1,0,null),p.document.body.appendChild(e),e.dispatchEvent(t),p.document.body.removeChild(e)},wo={formatChanged:A("formatChanged"),orientationChanged:A("orientationChanged"),dropupDismissed:A("dropupDismissed")},xo=function(n){return n.dom().innerHTML},To=function(n,e){var t,r,o=Be(n).dom(),i=ue.fromDom(o.createDocumentFragment()),u=(t=e,(r=(o||p.document).createElement("div")).innerHTML=t,_e(ue.fromDom(r)));Le(i,u),Pe(n),ze(n,i)},So=function(n){return e=n,t=!1,ue.fromDom(e.dom().cloneNode(t));var e,t},Oo=function(n){var e,t,r,o=So(n);return e=o,t=ue.fromTag("div"),r=ue.fromDom(e.dom().cloneNode(!0)),ze(t,r),xo(t)},ko=function(n){return Oo(n)},Co=Object.freeze({events:function(c){return sr([lr(Wn(),function(o,i){var n,e,u=c.channels(),t=R(u),r=(n=t,(e=i).universal()?n:wn(n,function(n){return hn(e.channels(),n)}));bn(r,function(n){var e=u[n](),t=e.schema(),r=Gt("channel["+n+"] data\nReceiver: "+ko(o.element()),t,i.data());e.onReceive()(o,r)})})])}}),Eo=function(n){for(var e=[],t=function(n){e.push(n)},r=0;r<n.length;r++)n[r].each(t);return e},Do="unknown",Io=[],Ao=["alloy/data/Fields","alloy/debugging/Debugging"],Mo={logEventCut:I,logEventStopped:I,logNoParent:I,logEventNoHandlers:I,logEventResponse:I,write:I},Fo=function(n,e,t){var r,o="*"===Io||hn(Io,n)?(r=[],{logEventCut:function(n,e,t){r.push({outcome:"cut",target:e,purpose:t})},logEventStopped:function(n,e,t){r.push({outcome:"stopped",target:e,purpose:t})},logNoParent:function(n,e,t){r.push({outcome:"no-parent",target:e,purpose:t})},logEventNoHandlers:function(n,e){r.push({outcome:"no-handlers-left",target:e})},logEventResponse:function(n,e,t){r.push({outcome:"response",purpose:t,target:e})},write:function(){hn(["mousemove","mouseover","mouseout",Xn()],n)||p.console.log(n,{event:n,target:e.dom(),sequence:yn(r,function(n){return hn(["cut","stopped","response"],n.outcome)?"{"+n.purpose+"} "+n.outcome+" at ("+ko(n.target)+")":n.outcome})})}}):Mo,i=t(o);return o.write(),i},Ro=A([Jt("menu"),Jt("selectedMenu")]),Bo=A([Jt("item"),Jt("selectedItem")]),Vo=(A(Rt(Bo().concat(Ro()))),A(Rt(Bo()))),No=nr("initSize",[Jt("numColumns"),Jt("numRows")]),_o=function(n,e,t){var r;return function(){var n=new Error;if(n.stack!==undefined){var e=n.stack.split("\n");Sn(e,function(e){return 0<e.indexOf("alloy")&&!function(n,e){for(var t=0,r=n.length;t<r;t++)if(e(n[t],t))return!0;return!1}(Ao,function(n){return-1<e.indexOf(n)})}).getOr(Do)}}(),jt(e,e,t,(r=function(t){return Qe.value(function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];return t.apply(undefined,n)})},Ft(function(n){return r(n)})))},jo=function(n){return _o(0,n,et(I))},Ho=function(n){return _o(0,n,et(F.none))},zo=function(n){return _o(0,n,tt())},Lo=function(n){return _o(0,n,tt())},Po=function(n,e){return ur(n,A(e))},$o=function(n){return ur(n,h)},Wo=A(No),Uo=[Qt("channels",Vt(Qe.value,Rt([zo("onReceive"),or("schema",Kt())])))],Go=zr({fields:Uo,name:"receiving",active:Co}),qo=function(n,e){var t=Jo(n,e),r=e.aria();r.update()(n,r,t)},Yo=function(n,e,t){to(n.element(),e.toggleClass()),qo(n,e)},Ko=function(n,e,t){no(n.element(),e.toggleClass()),qo(n,e)},Xo=function(n,e,t){eo(n.element(),e.toggleClass()),qo(n,e)},Jo=function(n,e){return ro(n.element(),e.toggleClass())},Qo=function(n,e,t){(e.selected()?Ko:Xo)(n,e,t)},Zo=Object.freeze({onLoad:Qo,toggle:Yo,isOn:Jo,on:Ko,off:Xo}),ni=Object.freeze({exhibit:function(n,e,t){return Or({})},events:function(n,e){var t,r,o,i=(t=n,r=e,o=Yo,br(function(n){o(n,t,r)})),u=Cr(n,e,Qo);return sr(kn([n.toggleOnExecute()?[i]:[],[u]]))}}),ei=function(n,e,t){Wr(n.element(),"aria-expanded",t)},ti=[or("selected",!1),Jt("toggleClass"),or("toggleOnExecute",!0),ir("aria",{mode:"none"},Yt("mode",{pressed:[or("syncWithExpanded",!1),Po("update",function(n,e,t){Wr(n.element(),"aria-pressed",t),e.syncWithExpanded()&&ei(n,e,t)})],checked:[Po("update",function(n,e,t){Wr(n.element(),"aria-checked",t)})],expanded:[Po("update",ei)],selected:[Po("update",function(n,e,t){Wr(n.element(),"aria-selected",t)})],none:[Po("update",I)]}))],ri=zr({fields:ti,name:"toggling",active:ni,apis:Zo}),oi=function(t,r){return Go.config({channels:yt(wo.formatChanged(),{onReceive:function(n,e){e.command===t&&r(n,e.state)}})})},ii=function(n){return Go.config({channels:yt(wo.orientationChanged(),{onReceive:n})})},ui=function(n,e){return{key:n,value:{onReceive:e}}},ci="tinymce-mobile",ai={resolve:function(n){return ci+"-"+n},prefix:A(ci)},si=function(n,e){e.ignore()||(mo(n.element()),e.onFocus()(n))},fi=Object.freeze({focus:si,blur:function(n,e){e.ignore()||go(n.element())},isFocused:function(n){return e=n.element(),t=Be(e).dom(),e.dom()===t.activeElement;var e,t}}),li=Object.freeze({exhibit:function(n,e){return e.ignore()?Or({}):Or({attributes:{tabindex:"-1"}})},events:function(t){return sr([lr(Pn(),function(n,e){si(n,t),e.stop()})])}}),di=[jo("onFocus"),or("ignore",!1)],mi=zr({fields:di,name:"focusing",active:li,apis:fi}),gi=function(n){return n.style!==undefined&&w(n.style.getPropertyValue)},pi=function(n,e,t){if(!y(t))throw p.console.error("Invalid call to CSS.set. Property ",e,":: Value ",t,":: Element ",n),new Error("CSS value must be a string: "+t);gi(n)&&n.style.setProperty(e,t)},vi=function(n,e,t){var r=n.dom();pi(r,e,t)},hi=function(n,e){var t=n.dom();B(e,function(n,e){pi(t,e,n)})},yi=function(n,e){var t=n.dom(),r=p.window.getComputedStyle(t).getPropertyValue(e),o=""!==r||he(n)?r:bi(t,e);return null===o?undefined:o},bi=function(n,e){return gi(n)?n.style.getPropertyValue(e):""},wi=function(n,e){var t=n.dom(),r=bi(t,e);return F.from(r).filter(function(n){return 0<n.length})},xi=function(n,e){var t,r,o=n.dom();r=e,gi(t=o)&&t.style.removeProperty(r),qr(n,"style")&&""===Gr(n,"style").replace(/^\s+|\s+$/g,"")&&Yr(n,"style")},Ti=function(n){return n.dom().offsetWidth};function Si(r,o){var n=function(n){var e=o(n);if(e<=0||null===e){var t=yi(n,r);return parseFloat(t)||0}return e},i=function(o,n){return Tn(n,function(n,e){var t=yi(o,e),r=t===undefined?0:parseInt(t,10);return isNaN(r)?n:n+r},0)};return{set:function(n,e){if(!T(e)&&!e.match(/^[0-9]+$/))throw new Error(r+".set accepts only positive integer values. Value was "+e);var t=n.dom();gi(t)&&(t.style[r]=e+"px")},get:n,getOuter:n,aggregate:i,max:function(n,e,t){var r=i(n,t);return r<e?e-r:0}}}var Oi,ki,Ci=Si("height",function(n){var e=n.dom();return he(n)?e.getBoundingClientRect().height:e.offsetHeight}),Ei=function(n){return Ci.get(n)},Di=function(n,e,t){return wn(function(n,e){for(var t=w(e)?e:s,r=n.dom(),o=[];null!==r.parentNode&&r.parentNode!==undefined;){var i=r.parentNode,u=ue.fromDom(i);if(o.push(u),!0===t(u))break;r=i}return o}(n,t),e)},Ii=function(n,e){return wn(Ne(t=n).map(_e).map(function(n){return wn(n,function(n){return!Re(t,n)})}).getOr([]),e);var t},Ai=function(n,e){return Me(e,n)},Mi=function(n){return Fe(n)},Fi=function(n,e,t){return fo(n,function(n){return Ie(n,e)},t)},Ri=function(n,e){return Fe(e,n)},Bi=function(n,e,t){return so(Ie,Fi,n,e,t)},Vi=function(n,e,t){var r=Dn(n.slice(0,e)),o=Dn(n.slice(e+1));return Sn(r.concat(o),t)},Ni=function(n,e,t){var r=Dn(n.slice(0,e));return Sn(r,t)},_i=function(n,e,t){var r=n.slice(0,e),o=n.slice(e+1);return Sn(o.concat(r),t)},ji=function(n,e,t){var r=n.slice(e+1);return Sn(r,t)},Hi=function(t){return function(n){var e=n.raw();return hn(t,e.which)}},zi=function(n){return function(e){return En(n,function(n){return n(e)})}},Li=function(n){return!0===n.raw().shiftKey},Pi=function(n){return!0===n.raw().ctrlKey},$i=x(Li),Wi=function(n,e){return{matches:n,classification:e}},Ui=function(n,e,t,r){var o=n+e;return r<o?t:o<t?r:o},Gi=function(n,e,t){return n<=e?e:t<=n?t:n},qi=function(e,t,n){var r=Ai(e.element(),"."+t.highlightClass());bn(r,function(n){eo(n,t.highlightClass()),e.getSystem().getByDom(n).each(function(n){t.onDehighlight()(e,n)})})},Yi=function(n,e,t,r){var o=Ki(n,e,t,r);qi(n,e),no(r.element(),e.highlightClass()),o||e.onHighlight()(n,r)},Ki=function(n,e,t,r){return ro(r.element(),e.highlightClass())},Xi=function(n,e,t,r){var o=Ai(n.element(),"."+e.itemClass());return F.from(o[r]).fold(function(){return Qe.error("No element found with index "+r)},n.getSystem().getByDom)},Ji=function(e,n,t){return Ri(e.element(),"."+n.itemClass()).bind(function(n){return e.getSystem().getByDom(n).toOption()})},Qi=function(e,n,t){var r=Ai(e.element(),"."+n.itemClass());return(0<r.length?F.some(r[r.length-1]):F.none()).bind(function(n){return e.getSystem().getByDom(n).toOption()})},Zi=function(t,e,n,r){var o=Ai(t.element(),"."+e.itemClass());return On(o,function(n){return ro(n,e.highlightClass())}).bind(function(n){var e=Ui(n,r,0,o.length-1);return t.getSystem().getByDom(o[e]).toOption()})},nu=Object.freeze({dehighlightAll:qi,dehighlight:function(n,e,t,r){var o=Ki(n,e,t,r);eo(r.element(),e.highlightClass()),o&&e.onDehighlight()(n,r)},highlight:Yi,highlightFirst:function(e,t,r){Ji(e,t).each(function(n){Yi(e,t,r,n)})},highlightLast:function(e,t,r){Qi(e,t).each(function(n){Yi(e,t,r,n)})},highlightAt:function(e,t,r,n){Xi(e,t,r,n).fold(function(n){throw new Error(n)},function(n){Yi(e,t,r,n)})},highlightBy:function(e,t,r,n){var o=Ai(e.element(),"."+t.itemClass()),i=Eo(yn(o,function(n){return e.getSystem().getByDom(n).toOption()}));Sn(i,n).each(function(n){Yi(e,t,r,n)})},isHighlighted:Ki,getHighlighted:function(e,n,t){return Ri(e.element(),"."+n.highlightClass()).bind(function(n){return e.getSystem().getByDom(n).toOption()})},getFirst:Ji,getLast:Qi,getPrevious:function(n,e,t){return Zi(n,e,0,-1)},getNext:function(n,e,t){return Zi(n,e,0,1)}}),eu=[Jt("highlightClass"),Jt("itemClass"),jo("onHighlight"),jo("onDehighlight")],tu=zr({fields:eu,name:"highlighting",apis:nu}),ru=function(){return{get:function(n){return vo(n.element())},set:function(n,e){n.getSystem().triggerFocus(e,n.element())}}},ou=function(n,e,c,t,r,i){var u=function(e,t,r,o){var n,i,u=c(e,t,r,o);return(n=u,i=t.event(),Sn(n,function(n){return n.matches(i)}).map(function(n){return n.classification})).bind(function(n){return n(e,t,r,o)})},o={schema:function(){return n.concat([or("focusManager",ru()),Po("handler",o),Po("state",e)])},processKey:u,toEvents:function(r,o){var n=t(r,o),e=sr(i.map(function(t){return lr(Pn(),function(n,e){t(n,r,o,e),e.stop()})}).toArray().concat([lr(U(),function(n,e){u(n,e,r,o).each(function(n){e.stop()})})]));return k(n,e)},toApis:r};return o},iu=function(n){var e=[er("onEscape"),er("onEnter"),or("selector",'[data-alloy-tabstop="true"]'),or("firstTabstop",0),or("useTabstopAt",A(!0)),er("visibilitySelector")].concat([n]),u=function(n,e){var t=n.visibilitySelector().bind(function(n){return Bi(e,n)}).getOr(e);return 0<Ei(t)},c=function(e,n,t,r,o){return o(n,t,function(n){return u(e=r,t=n)&&e.useTabstopAt()(t);var e,t}).fold(function(){return r.cyclic()?F.some(!0):F.none()},function(n){return r.focusManager().set(e,n),F.some(!0)})},i=function(e,n,t,r){var o,i,u=Ai(e.element(),t.selector());return(o=e,i=t,i.focusManager().get(o).bind(function(n){return Bi(n,i.selector())})).bind(function(n){return On(u,l(Re,n)).bind(function(n){return c(e,u,n,t,r)})})},t=A([Wi(zi([Li,Hi([9])]),function(n,e,t,r){var o=t.cyclic()?Vi:Ni;return i(n,0,t,o)}),Wi(Hi([9]),function(n,e,t,r){var o=t.cyclic()?_i:ji;return i(n,0,t,o)}),Wi(Hi([27]),function(e,t,n,r){return n.onEscape().bind(function(n){return n(e,t)})}),Wi(zi([$i,Hi([13])]),function(e,t,n,r){return n.onEnter().bind(function(n){return n(e,t)})})]),r=A({}),o=A({});return ou(e,Nr.init,t,r,o,F.some(function(e,t){var n,r,o,i;(n=e,r=t,o=Ai(n.element(),r.selector()),i=wn(o,function(n){return u(r,n)}),F.from(i[r.firstTabstop()])).each(function(n){t.focusManager().set(e,n)})}))},uu=iu(ur("cyclic",A(!1))),cu=iu(ur("cyclic",A(!0))),au=function(n){return"input"===me(n)&&"radio"!==Gr(n,"type")||"textarea"===me(n)},su=function(n,e,t){return au(t)&&Hi([32])(e.event())?F.none():(re(n,t,Un()),F.some(!0))},fu=[or("execute",su),or("useSpace",!1),or("useEnter",!0),or("useControlEnter",!1),or("useDown",!1)],lu=function(n,e,t){return t.execute()(n,e,n.element())},du=A({}),mu=A({}),gu=ou(fu,Nr.init,function(n,e,t,r){var o=t.useSpace()&&!au(n.element())?[32]:[],i=t.useEnter()?[13]:[],u=t.useDown()?[40]:[],c=o.concat(i).concat(u);return[Wi(Hi(c),lu)].concat(t.useControlEnter()?[Wi(zi([Pi,Hi([13])]),lu)]:[])},du,mu,F.none()),pu=function(n){var t=ao(F.none());return _r({readState:A({}),setGridSize:function(n,e){t.set(F.some({numRows:A(n),numColumns:A(e)}))},getNumRows:function(){return t.get().map(function(n){return n.numRows()})},getNumColumns:function(){return t.get().map(function(n){return n.numColumns()})}})},vu=Object.freeze({flatgrid:pu,init:function(n){return n.state()(n)}}),hu=function(e,t){return function(n){return"rtl"===yu(n)?t:e}},yu=function(n){return"rtl"===yi(n,"direction")?"rtl":"ltr"},bu=function(i){return function(n,e,t,r){var o=i(n.element());return Su(o,n,e,t,r)}},wu=function(n,e){var t=hu(n,e);return bu(t)},xu=function(n,e){var t=hu(e,n);return bu(t)},Tu=function(o){return function(n,e,t,r){return Su(o,n,e,t,r)}},Su=function(e,t,n,r,o){return r.focusManager().get(t).bind(function(n){return e(t.element(),n,r,o)}).map(function(n){return r.focusManager().set(t,n),!0})},Ou=Tu,ku=Tu,Cu=Tu,Eu=function(n){var e,t=n.dom();return!((e=t).offsetWidth<=0&&e.offsetHeight<=0)},Du=Ce(["index","candidates"],[]),Iu=function(n,e,t){return Au(n,e,t)},Au=function(n,e,t,r){var o,i=l(Re,e),u=Ai(n,t),c=wn(u,Eu);return On(o=c,i).map(function(n){return Du({index:n,candidates:o})})},Mu=function(n,e){return On(n,function(n){return Re(e,n)})},Fu=function(t,n,r,e){return e(Math.floor(n/r),n%r).bind(function(n){var e=n.row()*r+n.column();return 0<=e&&e<t.length?F.some(t[e]):F.none()})},Ru=function(o,n,i,u,c){return Fu(o,n,u,function(n,e){var t=n===i-1?o.length-n*u:u,r=Ui(e,c,0,t-1);return F.some({row:A(n),column:A(r)})})},Bu=function(i,n,u,c,a){return Fu(i,n,c,function(n,e){var t=Ui(n,a,0,u-1),r=t===u-1?i.length-t*c:c,o=Gi(e,0,r-1);return F.some({row:A(t),column:A(o)})})},Vu=[Jt("selector"),or("execute",su),Ho("onEscape"),or("captureTab",!1),Wo()],Nu=function(o){return function(n,e,t,r){return Iu(n,e,t.selector()).bind(function(n){return o(n.candidates(),n.index(),r.getNumRows().getOr(t.initSize().numRows()),r.getNumColumns().getOr(t.initSize().numColumns()))})}},_u=function(n,e,t,r){return t.captureTab()?F.some(!0):F.none()},ju=Nu(function(n,e,t,r){return Ru(n,e,t,r,-1)}),Hu=Nu(function(n,e,t,r){return Ru(n,e,t,r,1)}),zu=Nu(function(n,e,t,r){return Bu(n,e,t,r,-1)}),Lu=Nu(function(n,e,t,r){return Bu(n,e,t,r,1)}),Pu=A([Wi(Hi([37]),wu(ju,Hu)),Wi(Hi([39]),xu(ju,Hu)),Wi(Hi([38]),Ou(zu)),Wi(Hi([40]),ku(Lu)),Wi(zi([Li,Hi([9])]),_u),Wi(zi([$i,Hi([9])]),_u),Wi(Hi([27]),function(n,e,t,r){return t.onEscape()(n,e)}),Wi(Hi([32].concat([13])),function(e,t,r,n){return(o=e,i=r,i.focusManager().get(o).bind(function(n){return Bi(n,i.selector())})).bind(function(n){return r.execute()(e,t,n)});var o,i})]),$u=A({}),Wu=ou(Vu,pu,Pu,$u,{},F.some(function(e,t,n){Ri(e.element(),t.selector()).each(function(n){t.focusManager().set(e,n)})})),Uu=function(n,e,t,o){return Iu(n,t,e).bind(function(n){var e=n.index(),t=n.candidates(),r=Ui(e,o,0,t.length-1);return F.from(t[r])})},Gu=[Jt("selector"),or("getInitial",F.none),or("execute",su),or("executeOnMove",!1),or("allowVertical",!0)],qu=function(e,t,r){return(n=e,o=r,o.focusManager().get(n).bind(function(n){return Bi(n,o.selector())})).bind(function(n){return r.execute()(e,t,n)});var n,o},Yu=function(n,e,t){return Uu(n,t.selector(),e,-1)},Ku=function(n,e,t){return Uu(n,t.selector(),e,1)},Xu=function(r){return function(n,e,t){return r(n,e,t).bind(function(){return t.executeOnMove()?qu(n,e,t):F.some(!0)})}},Ju=A({}),Qu=A({}),Zu=ou(Gu,Nr.init,function(n,e,t,r){var o=[37].concat(t.allowVertical()?[38]:[]),i=[39].concat(t.allowVertical()?[40]:[]);return[Wi(Hi(o),Xu(wu(Yu,Ku))),Wi(Hi(i),Xu(xu(Yu,Ku))),Wi(Hi([13]),qu),Wi(Hi([32]),qu)]},Ju,Qu,F.some(function(e,t){t.getInitial()(e).or(Ri(e.element(),t.selector())).each(function(n){t.focusManager().set(e,n)})})),nc=Ce(["rowIndex","columnIndex","cell"],[]),ec=function(n,e,t){return F.from(n[e]).bind(function(n){return F.from(n[t]).map(function(n){return nc({rowIndex:e,columnIndex:t,cell:n})})})},tc=function(n,e,t,r){var o=n[e].length,i=Ui(t,r,0,o-1);return ec(n,e,i)},rc=function(n,e,t,r){var o=Ui(t,r,0,n.length-1),i=n[o].length,u=Gi(e,0,i-1);return ec(n,o,u)},oc=function(n,e,t,r){var o=n[e].length,i=Gi(t+r,0,o-1);return ec(n,e,i)},ic=function(n,e,t,r){var o=Gi(t+r,0,n.length-1),i=n[o].length,u=Gi(e,0,i-1);return ec(n,o,u)},uc=[nr("selectors",[Jt("row"),Jt("cell")]),or("cycles",!0),or("previousSelector",F.none),or("execute",su)],cc=function(n,e){return function(t,r,i){var u=i.cycles()?n:e;return Bi(r,i.selectors().row()).bind(function(n){var e=Ai(n,i.selectors().cell());return Mu(e,r).bind(function(r){var o=Ai(t,i.selectors().row());return Mu(o,n).bind(function(n){var e,t=(e=i,yn(o,function(n){return Ai(n,e.selectors().cell())}));return u(t,n,r).map(function(n){return n.cell()})})})})}},ac=cc(function(n,e,t){return tc(n,e,t,-1)},function(n,e,t){return oc(n,e,t,-1)}),sc=cc(function(n,e,t){return tc(n,e,t,1)},function(n,e,t){return oc(n,e,t,1)}),fc=cc(function(n,e,t){return rc(n,t,e,-1)},function(n,e,t){return ic(n,t,e,-1)}),lc=cc(function(n,e,t){return rc(n,t,e,1)},function(n,e,t){return ic(n,t,e,1)}),dc=A([Wi(Hi([37]),wu(ac,sc)),Wi(Hi([39]),xu(ac,sc)),Wi(Hi([38]),Ou(fc)),Wi(Hi([40]),ku(lc)),Wi(Hi([32].concat([13])),function(e,t,r){return vo(e.element()).bind(function(n){return r.execute()(e,t,n)})})]),mc=A({}),gc=A({}),pc=ou(uc,Nr.init,dc,mc,gc,F.some(function(e,t){t.previousSelector()(e).orThunk(function(){var n=t.selectors();return Ri(e.element(),n.cell())}).each(function(n){t.focusManager().set(e,n)})})),vc=[Jt("selector"),or("execute",su),or("moveOnTab",!1)],hc=function(e,t,r){return r.focusManager().get(e).bind(function(n){return r.execute()(e,t,n)})},yc=function(n,e,t){return Uu(n,t.selector(),e,-1)},bc=function(n,e,t){return Uu(n,t.selector(),e,1)},wc=A([Wi(Hi([38]),Cu(yc)),Wi(Hi([40]),Cu(bc)),Wi(zi([Li,Hi([9])]),function(n,e,t){return t.moveOnTab()?Cu(yc)(n,e,t):F.none()}),Wi(zi([$i,Hi([9])]),function(n,e,t){return t.moveOnTab()?Cu(bc)(n,e,t):F.none()}),Wi(Hi([13]),hc),Wi(Hi([32]),hc)]),xc=A({}),Tc=A({}),Sc=ou(vc,Nr.init,wc,xc,Tc,F.some(function(e,t){Ri(e.element(),t.selector()).each(function(n){t.focusManager().set(e,n)})})),Oc=[Ho("onSpace"),Ho("onEnter"),Ho("onShiftEnter"),Ho("onLeft"),Ho("onRight"),Ho("onTab"),Ho("onShiftTab"),Ho("onUp"),Ho("onDown"),Ho("onEscape"),er("focusIn")],kc=ou(Oc,Nr.init,function(n,e,t){return[Wi(Hi([32]),t.onSpace()),Wi(zi([$i,Hi([13])]),t.onEnter()),Wi(zi([Li,Hi([13])]),t.onShiftEnter()),Wi(zi([Li,Hi([9])]),t.onShiftTab()),Wi(zi([$i,Hi([9])]),t.onTab()),Wi(Hi([38]),t.onUp()),Wi(Hi([40]),t.onDown()),Wi(Hi([37]),t.onLeft()),Wi(Hi([39]),t.onRight()),Wi(Hi([32]),t.onSpace()),Wi(Hi([27]),t.onEscape())]},function(){return{}},function(){return{}},F.some(function(e,t){return t.focusIn().bind(function(n){return n(e,t)})})),Cc=uu.schema(),Ec=cu.schema(),Dc=Zu.schema(),Ic=Wu.schema(),Ac=pc.schema(),Mc=gu.schema(),Fc=Sc.schema(),Rc=kc.schema(),Bc=(ki=Ut("Creating behaviour: "+(Oi={branchKey:"mode",branches:Object.freeze({acyclic:Cc,cyclic:Ec,flow:Dc,flatgrid:Ic,matrix:Ac,execution:Mc,menu:Fc,special:Rc}),name:"keying",active:{events:function(n,e){return n.handler().toEvents(n,e)}},apis:{focusIn:function(n){n.getSystem().triggerFocus(n.element(),n.element())},setGridSize:function(n,e,t,r,o){xt(t,"setGridSize")?t.setGridSize(r,o):p.console.error("Layout does not support setGridSize")}},state:vu}).name,Lr,Oi),Er(Yt(ki.branchKey,ki.branches),ki.name,ki.active,ki.apis,ki.extra,ki.state)),Vc=function(r,n){return e=r,t={},o=yn(n,function(n){return e=n.name(),t="Cannot configure "+n.name()+" for "+r,jt(e,e,rt(),Ft(function(n){return Qe.error("The field: "+e+" is forbidden. "+t)}));var e,t}).concat([ur("dump",h)]),jt(e,e,et(t),Bt(o));var e,t,o},Nc=function(n){return n.dump()},_c="placeholder",jc=Ze([{single:["required","valueThunk"]},{multiple:["required","valueThunks"]}]),Hc=function(n,e,t,r){return t.uiType===_c?(i=t,u=r,(o=n).exists(function(n){return n!==i.owner})?jc.single(!0,A(i)):ht(u,i.name).fold(function(){throw new Error("Unknown placeholder component: "+i.name+"\nKnown: ["+R(u)+"]\nNamespace: "+o.getOr("none")+"\nSpec: "+kt(i,null,2))},function(n){return n.replace()})):jc.single(!1,A(t));var o,i,u},zc=function(i,u,c,a){return Hc(i,0,c,a).fold(function(n,e){var t=e(u,c.config,c.validated),r=ht(t,"components").getOr([]),o=Cn(r,function(n){return zc(i,u,n,a)});return[k(t,{components:o})]},function(n,e){return e(u,c.config,c.validated)})},Lc=function(e,t,n,r){var o,i,u,c=V(r,function(n,e){return r=n,o=!1,{name:A(t=e),required:function(){return r.fold(function(n,e){return n},function(n,e){return n})},used:function(){return o},replace:function(){if(!0===o)throw new Error("Trying to use the same placeholder more than once: "+t);return o=!0,r}};var t,r,o}),a=(o=e,i=t,u=c,Cn(n,function(n){return zc(o,i,n,u)}));return B(c,function(n){if(!1===n.used()&&n.required())throw new Error("Placeholder: "+n.name()+" was not found in components list\nNamespace: "+e.getOr("none")+"\nComponents: "+kt(t.components(),null,2))}),a},Pc=jc.single,$c=jc.multiple,Wc=A(_c),Uc=0,Gc=function(n){var e=(new Date).getTime();return n+"_"+Math.floor(1e9*Math.random())+ ++Uc+String(e)},qc=Ze([{required:["data"]},{external:["data"]},{optional:["data"]},{group:["data"]}]),Yc=or("factory",{sketch:h}),Kc=or("schema",[]),Xc=Jt("name"),Jc=jt("pname","pname",ot(function(n){return"<alloy."+Gc(n.name)+">"}),Kt()),Qc=or("defaults",A({})),Zc=or("overrides",A({})),na=Bt([Yc,Kc,Xc,Jc,Qc,Zc]),ea=Bt([Yc,Kc,Xc,Jc,Qc,Zc]),ta=Bt([Yc,Kc,Xc,Jt("unit"),Jc,Qc,Zc]),ra=function(n){var e=function(n){return n.name()};return n.fold(e,e,e,e)},oa=function(t,r){return function(n){var e=Gt("Converting part type",r,n);return t(e)}},ia=oa(qc.required,na),ua=oa(qc.optional,ea),ca=oa(qc.group,ta),aa=A("entirety"),sa=function(n,e,t,r){var o=t;return k(e.defaults()(n,t,r),t,{uid:n.partUids()[e.name()]},e.overrides()(n,t,r),{"debug.sketcher":yt("part-"+e.name(),o)})},fa=function(o,n){var i={};return bn(n,function(n){var e;(e=n,e.fold(F.some,F.none,F.some,F.some)).each(function(t){var r=la(o,t.pname());i[t.name()]=function(n){var e=Ut("Part: "+t.name()+" in "+o,Bt(t.schema()),n);return k(r,{config:n,validated:e})}})}),i},la=function(n,e){return{uiType:Wc(),owner:n,name:e}},da=function(n,e,t){return r=e,i={},o={},bn(t,function(n){n.fold(function(r){i[r.pname()]=Pc(!0,function(n,e,t){return r.factory().sketch(sa(n,r,e,t))})},function(n){var e=r.parts()[n.name()]();o[n.name()]=A(sa(r,n,e[aa()]()))},function(r){i[r.pname()]=Pc(!1,function(n,e,t){return r.factory().sketch(sa(n,r,e,t))})},function(o){i[o.pname()]=$c(!0,function(e,n,t){var r=e[o.name()]();return yn(r,function(n){return o.factory().sketch(k(o.defaults()(e,n),n,o.overrides()(e,n)))})})})}),{internals:A(i),externals:A(o)};var r,i,o},ma=function(n,e,t){return Lc(F.some(n),e,e.components(),t)},ga=function(n,e,t){var r=e.partUids()[t];return n.getSystem().getByUid(r).toOption()},pa=function(n,e,t){return ga(n,e,t).getOrDie("Could not find part: "+t)},va=function(e,n){var t=yn(n,ra);return bt(yn(t,function(n){return{key:n,value:e+"-"+n}}))},ha=function(e){return jt("partUids","partUids",it(function(n){return va(n.uid,e)}),Kt())},ya=Gc("alloy-premade"),ba=Gc("api"),wa=function(n){return yt(ya,n)},xa=function(o){return n=function(n){for(var e=[],t=1;t<arguments.length;t++)e[t-1]=arguments[t];var r=n.config(ba);return o.apply(undefined,[r].concat([n].concat(e)))},e=o.toString(),t=e.indexOf(")")+1,r=e.indexOf("("),i=e.substring(r+1,t-1).split(/,\s*/),n.toFunctionAnnotation=function(){return{name:"OVERRIDE",parameters:wr(i.slice(1))}},n;var n,e,t,r,i},Ta=A(ba),Sa=A("alloy-id-"),Oa=A("data-alloy-id"),ka=Sa(),Ca=Oa(),Ea=function(n){var e=pe(n)?Gr(n,Ca):null;return F.from(e)},Da=function(n){return Gc(n)},Ia=function(n,e,t,r,o){var i,u,c=(u=o,(0<(i=r).length?[nr("parts",i)]:[]).concat([Jt("uid"),or("dom",{}),or("components",[]),$o("originalSpec"),or("debug.sketcher",{})]).concat(u));return Gt(n+" [SpecSchema]",Rt(c.concat(e)),t)},Aa=function(n,e,t,r,o){var i=Ma(o),u=Cn(t,function(n){return n.fold(F.none,F.some,F.none,F.none).map(function(n){return nr(n.name(),n.schema().concat([$o(aa())]))}).toArray()}),c=ha(t),a=Ia(n,e,i,u,[c]),s=da(0,a,t),f=ma(n,a,s.internals());return k(r(a,f,i,s.externals()),{"debug.sketcher":yt(n,o)})},Ma=function(n){return k({uid:Da("uid")},n)},Fa=Rt([Jt("name"),Jt("factory"),Jt("configFields"),or("apis",{}),or("extraApis",{})]),Ra=Rt([Jt("name"),Jt("factory"),Jt("configFields"),Jt("partFields"),or("apis",{}),or("extraApis",{})]),Ba=function(n){var c=Ut("Sketcher for "+n.name,Fa,n),e=V(c.apis,xa),t=V(c.extraApis,function(n,e){return xr(n,e)});return k({name:A(c.name),partFields:A([]),configFields:A(c.configFields),sketch:function(n){return e=c.name,t=c.configFields,r=c.factory,i=Ma(o=n),u=Ia(e,t,i,[],[]),k(r(u,i),{"debug.sketcher":yt(e,o)});var e,t,r,o,i,u}},e,t)},Va=function(n){var e=Ut("Sketcher for "+n.name,Ra,n),t=fa(e.name,e.partFields),r=V(e.apis,xa),o=V(e.extraApis,function(n,e){return xr(n,e)});return k({name:A(e.name),partFields:A(e.partFields),configFields:A(e.configFields),sketch:function(n){return Aa(e.name,e.configFields,e.partFields,e.factory,n)},parts:A(t)},r,o)},Na=Ba({name:"Button",factory:function(n){var e,t,r,o=(e=n.action(),t=function(n,e){e.stop(),te(n)},r=zn.detect().deviceType.isTouch()?[lr(qn(),t)]:[lr(Y(),t),lr(L(),function(n,e){e.cut()})],sr(kn([e.map(function(t){return lr(Un(),function(n,e){t(n),e.stop()})}).toArray(),r]))),i=ht(n.dom(),"attributes").bind(pt("type")),u=ht(n.dom(),"tag");return{uid:n.uid(),dom:n.dom(),components:n.components(),events:o,behaviours:k(jr([mi.config({}),Bc.config({mode:"execution",useSpace:!0,useEnter:!0})]),Nc(n.buttonBehaviours())),domModification:{attributes:k(i.fold(function(){return u.is("button")?{type:"button"}:{}},function(n){return{}}),{role:n.role().getOr("button")})},eventOrder:n.eventOrder()}},configFields:[or("uid",undefined),Jt("dom"),or("components",[]),Vc("buttonBehaviours",[mi,Bc]),er("action"),er("role"),or("eventOrder",{})]}),_a=zr({fields:[],name:"unselecting",active:Object.freeze({events:function(n){return sr([fr(X(),A(!0))])},exhibit:function(n,e){return Or({styles:{"-webkit-user-select":"none","user-select":"none","-ms-user-select":"none","-moz-user-select":"-moz-none"},attributes:{unselectable:"on"}})}})}),ja=function(n){var e,t,r,o=ue.fromHtml(n),i=_e(o),u=(t=(e=o).dom().attributes!==undefined?e.dom().attributes:[],Tn(t,function(n,e){return"class"===e.name?n:k(n,yt(e.name,e.value))},{})),c=(r=o,Array.prototype.slice.call(r.dom().classList,0)),a=0===i.length?{}:{innerHtml:xo(o)};return k({tag:me(o),classes:c,attributes:u},a)},Ha=function(n){var e,o,t=(e=n,o={prefix:ai.prefix()},e.replace(/\$\{([^{}]*)\}/g,function(n,e){var t,r=o[e];return"string"==(t=typeof r)||"number"===t?r.toString():n}));return ja(t)},za=function(n){return{dom:Ha(n)}},La=function(n){return jr([ri.config({toggleClass:ai.resolve("toolbar-button-selected"),toggleOnExecute:!1,aria:{mode:"pressed"}}),oi(n,function(n,e){(e?ri.on:ri.off)(n)})])},Pa=function(n,e,t){return Na.sketch({dom:Ha('<span class="${prefix}-toolbar-button ${prefix}-icon-'+n+' ${prefix}-icon"></span>'),action:e,buttonBehaviours:k(jr([_a.config({})]),t)})},$a={forToolbar:Pa,forToolbarCommand:function(n,e){return Pa(e,function(){n.execCommand(e)},{})},forToolbarStateAction:function(n,e,t,r){var o=La(t);return Pa(e,r,o)},forToolbarStateCommand:function(n,e){var t=La(e);return Pa(e,function(){n.execCommand(e)},t)}},Wa=function(t,r){return{left:A(t),top:A(r),translate:function(n,e){return Wa(t+n,r+e)}}},Ua=Wa,Ga=function(n,e,t){return Math.max(e,Math.min(t,n))},qa=function(n,e,t,r,o,i,u){var c=t-e;if(r<n.left)return e-1;if(r>n.right)return t+1;var a,s,f,l,d=Math.min(n.right,Math.max(r,n.left))-n.left,m=Ga(d/n.width*c+e,e-1,t+1),g=Math.round(m);return i&&e<=m&&m<=t?(a=m,s=e,f=t,l=o,u.fold(function(){var n=a-s,e=Math.round(n/l)*l;return Ga(s+e,s-1,f+1)},function(n){var e=(a-n)%l,t=Math.round(e/l),r=Math.floor((a-n)/l),o=Math.floor((f-n)/l),i=n+Math.min(o,r+t)*l;return Math.max(n,i)})):g},Ya="slider.change.value",Ka=zn.detect().deviceType.isTouch(),Xa=function(n){return function(n){var e=n.event().raw();if(Ka){var t=e;return t.touches!==undefined&&1===t.touches.length?F.some(t.touches[0]).map(function(n){return Ua(n.clientX,n.clientY)}):F.none()}var r=e;return r.clientX!==undefined?F.some(r).map(function(n){return Ua(n.clientX,n.clientY)}):F.none()}(n).map(function(n){return n.left()})},Ja=function(n,e){ee(n,Ya,{value:e})},Qa=function(i,u,c,n){return Xa(n).map(function(n){var e,t,r,o;return e=i,r=n,o=qa(c,(t=u).min(),t.max(),r,t.stepSize(),t.snapToGrid(),t.snapStart()),Ja(e,o),n})},Za=function(n,e){var t,r,o,i,u=(t=e.value().get(),r=e.min(),o=e.max(),i=e.stepSize(),t<r?t:o<t?o:t===r?r-1:Math.max(r,t-i));Ja(n,u)},ns=function(n,e){var t,r,o,i,u=(t=e.value().get(),r=e.min(),o=e.max(),i=e.stepSize(),o<t?t:t<r?r:t===o?o+1:Math.min(o,t+i));Ja(n,u)},es=zn.detect().deviceType.isTouch(),ts=function(n,r){return ua({name:n+"-edge",overrides:function(n){var e=sr([dr(j(),r,[n])]),t=sr([dr(L(),r,[n]),dr(P(),function(n,e){e.mouseIsDown().get()&&r(n,e)},[n])]);return{events:es?e:t}}})},rs=[ts("left",function(n,e){Ja(n,e.min()-1)}),ts("right",function(n,e){Ja(n,e.max()+1)}),ia({name:"thumb",defaults:A({dom:{styles:{position:"absolute"}}}),overrides:function(n){return{events:sr([gr(j(),n,"spectrum"),gr(H(),n,"spectrum"),gr(z(),n,"spectrum")])}}}),ia({schema:[ur("mouseIsDown",function(){return ao(!1)})],name:"spectrum",overrides:function(r){var t=function(n,e){var t=n.element().dom().getBoundingClientRect();Qa(n,r,t,e)},n=sr([lr(j(),t),lr(H(),t)]),e=sr([lr(L(),t),lr(P(),function(n,e){r.mouseIsDown().get()&&t(n,e)})]);return{behaviours:jr(es?[]:[Bc.config({mode:"special",onLeft:function(n){return Za(n,r),F.some(!0)},onRight:function(n){return ns(n,r),F.some(!0)}}),mi.config({})]),events:es?n:e}}})],os=function(n,e,t){e.store().manager().onLoad(n,e,t)},is=function(n,e,t){e.store().manager().onUnload(n,e,t)},us=Object.freeze({onLoad:os,onUnload:is,setValue:function(n,e,t,r){e.store().manager().setValue(n,e,t,r)},getValue:function(n,e,t){return e.store().manager().getValue(n,e,t)}}),cs=Object.freeze({events:function(t,r){var n=t.resetOnDom()?[vr(function(n,e){os(n,t,r)}),hr(function(n,e){is(n,t,r)})]:[Cr(t,r,os)];return sr(n)}}),as=function(){var n=ao(null);return _r({set:n.set,get:n.get,isNotSet:function(){return null===n.get()},clear:function(){n.set(null)},readState:function(){return{mode:"memory",value:n.get()}}})},ss=function(){var n=ao({});return _r({readState:function(){return{mode:"dataset",dataset:n.get()}},set:n.set,get:n.get})},fs=Object.freeze({memory:as,dataset:ss,manual:function(){return _r({readState:function(){}})},init:function(n){return n.store().manager().state(n)}}),ls=function(n,e,t,r){e.store().getDataKey(),t.set({}),e.store().setData()(n,r),e.onSetValue()(n,r)},ds=[er("initialValue"),Jt("getFallbackEntry"),Jt("getDataKey"),Jt("setData"),Po("manager",{setValue:ls,getValue:function(n,e,t){var r=e.store().getDataKey()(n),o=t.get();return ht(o,r).fold(function(){return e.store().getFallbackEntry()(r)},function(n){return n})},onLoad:function(e,t,r){t.store().initialValue().each(function(n){ls(e,t,r,n)})},onUnload:function(n,e,t){t.set({})},state:ss})],ms=[Jt("getValue"),or("setValue",I),er("initialValue"),Po("manager",{setValue:function(n,e,t,r){e.store().setValue()(n,r),e.onSetValue()(n,r)},getValue:function(n,e,t){return e.store().getValue()(n)},onLoad:function(e,t,n){t.store().initialValue().each(function(n){t.store().setValue()(e,n)})},onUnload:I,state:Nr.init})],gs=[er("initialValue"),Po("manager",{setValue:function(n,e,t,r){t.set(r),e.onSetValue()(n,r)},getValue:function(n,e,t){return t.get()},onLoad:function(n,e,t){e.store().initialValue().each(function(n){t.isNotSet()&&t.set(n)})},onUnload:function(n,e,t){t.clear()},state:as})],ps=[ir("store",{mode:"memory"},Yt("mode",{memory:gs,manual:ms,dataset:ds})),jo("onSetValue"),or("resetOnDom",!1)],vs=zr({fields:ps,name:"representing",active:cs,apis:us,extra:{setValueFrom:function(n,e){var t=vs.getValue(e);vs.setValue(n,t)}},state:fs}),hs=zn.detect().deviceType.isTouch(),ys=[Jt("min"),Jt("max"),or("stepSize",1),or("onChange",I),or("onInit",I),or("onDragStart",I),or("onDragEnd",I),or("snapToGrid",!1),er("snapStart"),Jt("getInitialValue"),Vc("sliderBehaviours",[Bc,vs]),ur("value",function(n){return ao(n.min)})].concat(hs?[]:[ur("mouseIsDown",function(){return ao(!1)})]),bs=Si("width",function(n){return n.dom().offsetWidth}),ws=function(n,e){bs.set(n,e)},xs=function(n){return bs.get(n)},Ts=zn.detect().deviceType.isTouch(),Ss=Va({name:"Slider",configFields:ys,partFields:rs,factory:function(a,n,e,t){var s=a.max()-a.min(),f=function(n){var e=n.element().dom().getBoundingClientRect();return(e.left+e.right)/2},o=function(n){return pa(n,a,"thumb")},i=function(n){var e,t,r,o,i=pa(n,a,"spectrum").element().dom().getBoundingClientRect(),u=n.element().dom().getBoundingClientRect(),c=(e=n,t=i,(o=(r=a).value().get())<r.min()?ga(e,r,"left-edge").fold(function(){return 0},function(n){return f(n)-t.left}):o>r.max()?ga(e,r,"right-edge").fold(function(){return t.width},function(n){return f(n)-t.left}):(r.value().get()-r.min())/s*t.width);return i.left-u.left+c},u=function(n){var e=i(n),t=o(n),r=xs(t.element())/2;vi(t.element(),"left",e-r+"px")},r=function(n,e){var t=a.value().get(),r=o(n);return t!==e||wi(r.element(),"left").isNone()?(a.value().set(e),u(n),a.onChange()(n,r,e),F.some(!0)):F.none()},c=Ts?[lr(j(),function(n,e){a.onDragStart()(n,o(n))}),lr(z(),function(n,e){a.onDragEnd()(n,o(n))})]:[lr(L(),function(n,e){e.stop(),a.onDragStart()(n,o(n)),a.mouseIsDown().set(!0)}),lr($(),function(n,e){a.onDragEnd()(n,o(n)),a.mouseIsDown().set(!1)})];return{uid:a.uid(),dom:a.dom(),components:n,behaviours:k(jr(kn([Ts?[]:[Bc.config({mode:"special",focusIn:function(n){return ga(n,a,"spectrum").map(Bc.focusIn).map(A(!0))}})],[vs.config({store:{mode:"manual",getValue:function(n){return a.value().get()}}})]])),Nc(a.sliderBehaviours())),events:sr([lr(Ya,function(n,e){r(n,e.event().value())}),vr(function(n,e){a.value().set(a.getInitialValue()());var t=o(n);u(n),a.onInit()(n,t,a.value().get())})].concat(c)),apis:{resetToMin:function(n){r(n,a.min())},resetToMax:function(n){r(n,a.max())},refresh:u},domModification:{styles:{position:"relative"}}}},apis:{resetToMin:function(n,e){n.resetToMin(e)},resetToMax:function(n,e){n.resetToMax(e)},refresh:function(n,e){n.refresh(e)}}}),Os=function(e,t,r){return $a.forToolbar(t,function(){var n=r();e.setContextToolbar([{label:t+" group",items:n}])},{})},ks=function(n){return[(o=n,i=function(n){return n<0?"black":360<n?"white":"hsl("+n+", 100%, 50%)"},Ss.sketch({dom:Ha('<div class="${prefix}-slider ${prefix}-hue-slider-container"></div>'),components:[Ss.parts()["left-edge"](za('<div class="${prefix}-hue-slider-black"></div>')),Ss.parts().spectrum({dom:Ha('<div class="${prefix}-slider-gradient-container"></div>'),components:[za('<div class="${prefix}-slider-gradient"></div>')],behaviours:jr([ri.config({toggleClass:ai.resolve("thumb-active")})])}),Ss.parts()["right-edge"](za('<div class="${prefix}-hue-slider-white"></div>')),Ss.parts().thumb({dom:Ha('<div class="${prefix}-slider-thumb"></div>'),behaviours:jr([ri.config({toggleClass:ai.resolve("thumb-active")})])})],onChange:function(n,e,t){var r=i(t);vi(e.element(),"background-color",r),o.onChange(n,e,r)},onDragStart:function(n,e){ri.on(e)},onDragEnd:function(n,e){ri.off(e)},onInit:function(n,e,t){var r=i(t);vi(e.element(),"background-color",r)},stepSize:10,min:0,max:360,getInitialValue:o.getInitialValue,sliderBehaviours:jr([ii(Ss.refresh)])}))];var o,i},Cs=function(n,r){var e={onChange:function(n,e,t){r.undoManager.transact(function(){r.formatter.apply("forecolor",{value:t}),r.nodeChanged()})},getInitialValue:function(){return-1}};return Os(n,"color",function(){return ks(e)})},Es=Rt([Jt("getInitialValue"),Jt("onChange"),Jt("category"),Jt("sizes")]),Ds=function(n){var o=Ut("SizeSlider",Es,n);return Ss.sketch({dom:{tag:"div",classes:[ai.resolve("slider-"+o.category+"-size-container"),ai.resolve("slider"),ai.resolve("slider-size-container")]},onChange:function(n,e,t){var r;0<=(r=t)&&r<o.sizes.length&&o.onChange(t)},onDragStart:function(n,e){ri.on(e)},onDragEnd:function(n,e){ri.off(e)},min:0,max:o.sizes.length-1,stepSize:1,getInitialValue:o.getInitialValue,snapToGrid:!0,sliderBehaviours:jr([ii(Ss.refresh)]),components:[Ss.parts().spectrum({dom:Ha('<div class="${prefix}-slider-size-container"></div>'),components:[za('<div class="${prefix}-slider-size-line"></div>')]}),Ss.parts().thumb({dom:Ha('<div class="${prefix}-slider-thumb"></div>'),behaviours:jr([ri.config({toggleClass:ai.resolve("thumb-active")})])})]})},Is=["9px","10px","11px","12px","14px","16px","18px","20px","24px","32px","36px"],As=function(n){var e,t,r=n.selection.getStart(),o=ue.fromDom(r),i=ue.fromDom(n.getBody()),u=(e=function(n){return Re(i,n)},(pe(t=o)?F.some(t):Ne(t).filter(pe)).map(function(n){return lo(n,function(n){return wi(n,"font-size").isSome()},e).bind(function(n){return wi(n,"font-size")}).getOrThunk(function(){return yi(n,"font-size")})}).getOr(""));return Sn(Is,function(n){return u===n}).getOr("medium")},Ms={candidates:A(Is),get:function(n){var e,t=As(n);return(e=t,On(Is,function(n){return n===e})).getOr(2)},apply:function(r,n){var e;(e=n,F.from(Is[e])).each(function(n){var e,t;t=n,As(e=r)!==t&&e.execCommand("fontSize",!1,t)})}},Fs=Ms.candidates(),Rs=function(n){return[za('<span class="${prefix}-toolbar-button ${prefix}-icon-small-font ${prefix}-icon"></span>'),(e=n,Ds({onChange:e.onChange,sizes:Fs,category:"font",getInitialValue:e.getInitialValue})),za('<span class="${prefix}-toolbar-button ${prefix}-icon-large-font ${prefix}-icon"></span>')];var e},Bs=function(n){var e=n.uid!==undefined&&xt(n,"uid")?n.uid:Da("memento");return{get:function(n){return n.getSystem().getByUid(e).getOrDie()},getOpt:function(n){return n.getSystem().getByUid(e).fold(F.none,F.some)},asSpec:function(){return k(n,{uid:e})}}},Vs=window.Promise?window.Promise:function(){var i=function(n){if("object"!=typeof this)throw new TypeError("Promises must be constructed via new");if("function"!=typeof n)throw new TypeError("not a function");this._state=null,this._value=null,this._deferreds=[],f(n,r(o,this),r(c,this))},n=i.immediateFn||"function"==typeof window.setImmediate&&window.setImmediate||function(n){p.setTimeout(n,1)};function r(n,e){return function(){return n.apply(e,arguments)}}var t=Array.isArray||function(n){return"[object Array]"===Object.prototype.toString.call(n)};function u(r){var o=this;null!==this._state?n(function(){var n=o._state?r.onFulfilled:r.onRejected;if(null!==n){var e;try{e=n(o._value)}catch(t){return void r.reject(t)}r.resolve(e)}else(o._state?r.resolve:r.reject)(o._value)}):this._deferreds.push(r)}function o(n){try{if(n===this)throw new TypeError("A promise cannot be resolved with itself.");if(n&&("object"==typeof n||"function"==typeof n)){var e=n.then;if("function"==typeof e)return void f(r(e,n),r(o,this),r(c,this))}this._state=!0,this._value=n,a.call(this)}catch(t){c.call(this,t)}}function c(n){this._state=!1,this._value=n,a.call(this)}function a(){for(var n=0,e=this._deferreds;n<e.length;n++){var t=e[n];u.call(this,t)}this._deferreds=[]}function s(n,e,t,r){this.onFulfilled="function"==typeof n?n:null,this.onRejected="function"==typeof e?e:null,this.resolve=t,this.reject=r}function f(n,e,t){var r=!1;try{n(function(n){r||(r=!0,e(n))},function(n){r||(r=!0,t(n))})}catch(o){if(r)return;r=!0,t(o)}}return i.prototype["catch"]=function(n){return this.then(null,n)},i.prototype.then=function(t,r){var o=this;return new i(function(n,e){u.call(o,new s(t,r,n,e))})},i.all=function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];var a=Array.prototype.slice.call(1===n.length&&t(n[0])?n[0]:n);return new i(function(o,i){if(0===a.length)return o([]);var u=a.length;function c(e,n){try{if(n&&("object"==typeof n||"function"==typeof n)){var t=n.then;if("function"==typeof t)return void t.call(n,function(n){c(e,n)},i)}a[e]=n,0==--u&&o(a)}catch(r){i(r)}}for(var n=0;n<a.length;n++)c(n,a[n])})},i.resolve=function(e){return e&&"object"==typeof e&&e.constructor===i?e:new i(function(n){n(e)})},i.reject=function(t){return new i(function(n,e){e(t)})},i.race=function(o){return new i(function(n,e){for(var t=0,r=o;t<r.length;t++)r[t].then(n,e)})},i}();function Ns(n){return(t=n,new Vs(function(n){var e=new p.FileReader;e.onloadend=function(){n(e.result)},e.readAsDataURL(t)})).then(function(n){return n.split(",")[1]});var t}var _s,js,Hs,zs,Ls,Ps,$s=function(o,i){var n;(n=i,Ns(n)).then(function(r){o.undoManager.transact(function(){var n=o.editorUpload.blobCache,e=n.create(Gc("mceu"),i,r);n.add(e);var t=o.dom.createHTML("img",{src:e.blobUri()});o.insertContent(t)})})},Ws=function(i){var e=Bs({dom:{tag:"input",attributes:{accept:"image/*",type:"file",title:""},styles:{visibility:"hidden",position:"absolute"}},events:sr([pr(Y()),lr(q(),function(n,e){var t,r,o;(t=e,r=t.event(),o=r.raw().target.files||r.raw().dataTransfer.files,F.from(o[0])).each(function(n){$s(i,n)})})])});return Na.sketch({dom:Ha('<span class="${prefix}-toolbar-button ${prefix}-icon-image ${prefix}-icon"></span>'),components:[e.asSpec()],action:function(n){e.get(n).element().dom().click()}})},Us=function(n){return n.dom().textContent},Gs=function(n){return 0<n.length},qs=function(n){return n===undefined||null===n?"":n},Ys=function(e,t,n){return n.text.filter(Gs).fold(function(){return Gr(n=e,"href")===Us(n)?F.some(t):F.none();var n},F.some)},Ks=function(n){var e=ue.fromDom(n.selection.getStart());return Bi(e,"a")},Xs={getInfo:function(n){return Ks(n).fold(function(){return{url:"",text:n.selection.getContent({format:"text"}),title:"",target:"",link:F.none()}},function(n){return t=Us(e=n),r=Gr(e,"href"),o=Gr(e,"title"),i=Gr(e,"target"),{url:qs(r),text:t!==r?qs(t):"",title:qs(o),target:qs(i),link:F.some(e)};var e,t,r,o,i})},applyInfo:function(o,i){i.url.filter(Gs).fold(function(){var e;e=o,i.link.bind(h).each(function(n){e.execCommand("unlink")})},function(e){var n,t,r=(n=i,(t={}).href=e,n.title.filter(Gs).each(function(n){t.title=n}),n.target.filter(Gs).each(function(n){t.target=n}),t);i.link.bind(h).fold(function(){var n=i.text.filter(Gs).getOr(e);o.insertContent(o.dom.createHTML("a",r,o.dom.encode(n)))},function(t){var n=Ys(t,e,i);Ur(t,r),n.each(function(n){var e;e=n,t.dom().textContent=e})})})},query:Ks},Js=zn.detect(),Qs=function(n,e){var t=e.selection.getRng();n(),e.selection.setRng(t)},Zs=function(n,e){(Js.os.isAndroid()?Qs:a)(e,n)},nf=function(n,e){var t,r;return{key:n,value:{config:{},me:(t=n,r=sr(e),zr({fields:[Jt("enabled")],name:t,active:{events:A(r)}})),configAsRaw:A({}),initialConfig:{},state:Nr}}},ef=Object.freeze({getCurrent:function(n,e,t){return e.find()(n)}}),tf=[Jt("find")],rf=zr({fields:tf,name:"composing",apis:ef}),of=Ba({name:"Container",factory:function(n){return{uid:n.uid(),dom:k({tag:"div",attributes:{role:"presentation"}},n.dom()),components:n.components(),behaviours:Nc(n.containerBehaviours()),events:n.events(),domModification:n.domModification(),eventOrder:n.eventOrder()}},configFields:[or("components",[]),Vc("containerBehaviours",[]),or("events",{}),or("domModification",{}),or("eventOrder",{})]}),uf=Ba({name:"DataField",factory:function(t){return{uid:t.uid(),dom:t.dom(),behaviours:k(jr([vs.config({store:{mode:"memory",initialValue:t.getInitialValue()()}}),rf.config({find:F.some})]),Nc(t.dataBehaviours())),events:sr([vr(function(n,e){vs.setValue(n,t.getInitialValue()())})])}},configFields:[Jt("uid"),Jt("dom"),Jt("getInitialValue"),Vc("dataBehaviours",[vs,rf])]}),cf=function(n){return n.dom().value},af=function(n,e){if(e===undefined)throw new Error("Value.set was undefined");n.dom().value=e},sf=A([er("data"),or("inputAttributes",{}),or("inputStyles",{}),or("type","input"),or("tag","input"),or("inputClasses",[]),jo("onSetValue"),or("styles",{}),er("placeholder"),or("eventOrder",{}),Vc("inputBehaviours",[vs,mi]),or("selectOnFocus",!0)]),ff=function(n){return k(jr([vs.config({store:{mode:"manual",initialValue:n.data().getOr(undefined),getValue:function(n){return cf(n.element())},setValue:function(n,e){cf(n.element())!==e&&af(n.element(),e)}},onSetValue:n.onSetValue()})]),(e=n,jr([mi.config({onFocus:!1===e.selectOnFocus()?I:function(n){var e=n.element(),t=cf(e);e.dom().setSelectionRange(0,t.length)}})])),Nc(n.inputBehaviours()));var e},lf=Ba({name:"Input",configFields:sf(),factory:function(n,e){return{uid:n.uid(),dom:(t=n,{tag:t.tag(),attributes:k(bt([{key:"type",value:t.type()}].concat(t.placeholder().map(function(n){return{key:"placeholder",value:n}}).toArray())),t.inputAttributes()),styles:t.inputStyles(),classes:t.inputClasses()}),components:[],behaviours:ff(n),eventOrder:n.eventOrder()};var t}}),df=Object.freeze({exhibit:function(n,e){return Or({attributes:bt([{key:e.tabAttr(),value:"true"}])})}}),mf=[or("tabAttr","data-alloy-tabstop")],gf=zr({fields:mf,name:"tabstopping",active:df}),pf=function(n,e){var t=Bs(lf.sketch({placeholder:e,onSetValue:function(n,e){ne(n,G())},inputBehaviours:jr([rf.config({find:F.some}),gf.config({}),Bc.config({mode:"execution"})]),selectOnFocus:!1})),r=Bs(Na.sketch({dom:Ha('<button class="${prefix}-input-container-x ${prefix}-icon-cancel-circle ${prefix}-icon"></button>'),action:function(n){var e=t.get(n);vs.setValue(e,"")}}));return{name:n,spec:of.sketch({dom:Ha('<div class="${prefix}-input-container"></div>'),components:[t.asSpec(),r.asSpec()],containerBehaviours:jr([ri.config({toggleClass:ai.resolve("input-container-empty")}),rf.config({find:function(n){return F.some(t.get(n))}}),nf("input-clearing",[lr(G(),function(n){var e=t.get(n);(0<vs.getValue(e).length?ri.off:ri.on)(n)})])])})}},vf=["input","button","textarea"],hf=function(n,e,t){e.disabled()&&Sf(n,e)},yf=function(n){return hn(vf,me(n.element()))},bf=function(n){Wr(n.element(),"disabled","disabled")},wf=function(n){Yr(n.element(),"disabled")},xf=function(n){Wr(n.element(),"aria-disabled","true")},Tf=function(n){Wr(n.element(),"aria-disabled","false")},Sf=function(e,n,t){n.disableClass().each(function(n){no(e.element(),n)}),(yf(e)?bf:xf)(e)},Of=function(n){return yf(n)?qr(n.element(),"disabled"):"true"===Gr(n.element(),"aria-disabled")},kf=Object.freeze({enable:function(e,n,t){n.disableClass().each(function(n){eo(e.element(),n)}),(yf(e)?wf:Tf)(e)},disable:Sf,isDisabled:Of,onLoad:hf}),Cf=Object.freeze({exhibit:function(n,e,t){return Or({classes:e.disabled()?e.disableClass().map(In).getOr([]):[]})},events:function(n,e){return sr([fr(Un(),function(n,e){return Of(n)}),Cr(n,e,hf)])}}),Ef=[or("disabled",!1),er("disableClass")],Df=zr({fields:Ef,name:"disabling",active:Cf,apis:kf}),If=[Vc("formBehaviours",[vs])],Af=function(n){return"<alloy.field."+n+">"},Mf=function(o,n,e){return k({"debug.sketcher":{Form:e},uid:o.uid(),dom:o.dom(),components:n,behaviours:k(jr([vs.config({store:{mode:"manual",getValue:function(n){var e,t,r=(e=o,t=n.getSystem(),V(e.partUids(),function(n,e){return A(t.getByUid(n))}));return V(r,function(n,e){return n().bind(rf.getCurrent).map(vs.getValue)})},setValue:function(t,n){B(n,function(e,n){ga(t,o,n).each(function(n){rf.getCurrent(n).each(function(n){vs.setValue(n,e)})})})}}})]),Nc(o.formBehaviours())),apis:{getField:function(n,e){return ga(n,o,e).bind(rf.getCurrent)}}})},Ff=(xa(function(n,e,t){return n.getField(e,t)}),function(n){var i,e=(i=[],{field:function(n,e){return i.push(n),t="form",r=Af(n),o=e,{uiType:Wc(),owner:t,name:r,config:o,validated:{}};var t,r,o},record:function(){return i}}),t=n(e),r=e.record(),o=yn(r,function(n){return ia({name:n,pname:Af(n)})});return Aa("form",If,o,Mf,t)}),Rf=function(){var e=ao(F.none()),t=function(){e.get().each(function(n){n.destroy()})};return{clear:function(){t(),e.set(F.none())},isSet:function(){return e.get().isSome()},set:function(n){t(),e.set(F.some(n))},run:function(n){e.get().each(n)}}},Bf=function(){var e=ao(F.none());return{clear:function(){e.set(F.none())},set:function(n){e.set(F.some(n))},isSet:function(){return e.get().isSome()},on:function(n){e.get().each(n)}}},Vf=function(n){return{xValue:n,points:[]}},Nf=function(n,e){if(e===n.xValue)return n;var t=0<e-n.xValue?1:-1,r={direction:t,xValue:e};return{xValue:e,points:(0===n.points.length?[]:n.points[n.points.length-1].direction===t?n.points.slice(0,n.points.length-1):n.points).concat([r])}},_f=function(n){if(0===n.points.length)return 0;var e=n.points[0].direction,t=n.points[n.points.length-1].direction;return-1===e&&-1===t?-1:1===e&&1===t?1:0},jf=function(n){var r="navigateEvent",e=Bt([Jt("fields"),or("maxFieldIndex",n.fields.length-1),Jt("onExecute"),Jt("getInitialValue"),ur("state",function(){return{dialogSwipeState:Bf(),currentScreen:ao(0)}})]),u=Ut("SerialisedDialog",e,n),o=function(e,n,t){return Na.sketch({dom:Ha('<span class="${prefix}-icon-'+n+' ${prefix}-icon"></span>'),action:function(n){ee(n,r,{direction:e})},buttonBehaviours:jr([Df.config({disableClass:ai.resolve("toolbar-navigation-disabled"),disabled:!t})])})},i=function(n,o){var i=Ai(n.element(),"."+ai.resolve("serialised-dialog-screen"));Ri(n.element(),"."+ai.resolve("serialised-dialog-chain")).each(function(r){0<=u.state.currentScreen.get()+o&&u.state.currentScreen.get()+o<i.length&&(wi(r,"left").each(function(n){var e=parseInt(n,10),t=xs(i[0]);vi(r,"left",e-o*t+"px")}),u.state.currentScreen.set(u.state.currentScreen.get()+o))})},c=function(r){var n=Ai(r.element(),"input");F.from(n[u.state.currentScreen.get()]).each(function(n){r.getSystem().getByDom(n).each(function(n){var e,t;e=r,t=n.element(),e.getSystem().triggerFocus(t,e.element())})});var e=s.get(r);tu.highlightAt(e,u.state.currentScreen.get())},a=Bs(Ff(function(t){return{dom:Ha('<div class="${prefix}-serialised-dialog"></div>'),components:[of.sketch({dom:Ha('<div class="${prefix}-serialised-dialog-chain" style="left: 0px; position: absolute;"></div>'),components:yn(u.fields,function(n,e){return e<=u.maxFieldIndex?of.sketch({dom:Ha('<div class="${prefix}-serialised-dialog-screen"></div>'),components:kn([[o(-1,"previous",0<e)],[t.field(n.name,n.spec)],[o(1,"next",e<u.maxFieldIndex)]])}):t.field(n.name,n.spec)})})],formBehaviours:jr([ii(function(n,e){var t;t=e,Ri(n.element(),"."+ai.resolve("serialised-dialog-chain")).each(function(n){vi(n,"left",-u.state.currentScreen.get()*t.width+"px")})}),Bc.config({mode:"special",focusIn:function(n){c(n)},onTab:function(n){return i(n,1),F.some(!0)},onShiftTab:function(n){return i(n,-1),F.some(!0)}}),nf("form-events",[vr(function(e,n){u.state.currentScreen.set(0),u.state.dialogSwipeState.clear();var t=s.get(e);tu.highlightFirst(t),u.getInitialValue(e).each(function(n){vs.setValue(e,n)})}),br(u.onExecute),lr(K(),function(n,e){"left"===e.event().raw().propertyName&&c(n)}),lr(r,function(n,e){var t=e.event().direction();i(n,t)})])])}})),s=Bs({dom:Ha('<div class="${prefix}-dot-container"></div>'),behaviours:jr([tu.config({highlightClass:ai.resolve("dot-active"),itemClass:ai.resolve("dot-item")})]),components:Cn(u.fields,function(n,e){return e<=u.maxFieldIndex?[za('<div class="${prefix}-dot-item ${prefix}-icon-full-dot ${prefix}-icon"></div>')]:[]})});return{dom:Ha('<div class="${prefix}-serializer-wrapper"></div>'),components:[a.asSpec(),s.asSpec()],behaviours:jr([Bc.config({mode:"special",focusIn:function(n){var e=a.get(n);Bc.focusIn(e)}}),nf("serializer-wrapper-events",[lr(j(),function(n,e){var t=e.event();u.state.dialogSwipeState.set(Vf(t.touches[0].clientX))}),lr(H(),function(n,e){var t=e.event();u.state.dialogSwipeState.on(function(n){e.event().prevent(),u.state.dialogSwipeState.set(Nf(n,t.raw().touches[0].clientX))})}),lr(z(),function(r){u.state.dialogSwipeState.on(function(n){var e=a.get(r),t=-1*_f(n);i(e,t)})})])])}},Hf=J(function(t,r){return[{label:"the link group",items:[jf({fields:[pf("url","Type or paste URL"),pf("text","Link text"),pf("title","Link title"),pf("target","Link target"),(n="link",{name:n,spec:uf.sketch({dom:{tag:"span",styles:{display:"none"}},getInitialValue:function(){return F.none()}})})],maxFieldIndex:["url","text","title","target"].length-1,getInitialValue:function(){return F.some(Xs.getInfo(r))},onExecute:function(n){var e=vs.getValue(n);Xs.applyInfo(r,e),t.restoreToolbar(),r.focus()}})]}];var n}),zf=[{title:"Headings",items:[{title:"Heading 1",format:"h1"},{title:"Heading 2",format:"h2"},{title:"Heading 3",format:"h3"},{title:"Heading 4",format:"h4"},{title:"Heading 5",format:"h5"},{title:"Heading 6",format:"h6"}]},{title:"Inline",items:[{title:"Bold",icon:"bold",format:"bold"},{title:"Italic",icon:"italic",format:"italic"},{title:"Underline",icon:"underline",format:"underline"},{title:"Strikethrough",icon:"strikethrough",format:"strikethrough"},{title:"Superscript",icon:"superscript",format:"superscript"},{title:"Subscript",icon:"subscript",format:"subscript"},{title:"Code",icon:"code",format:"code"}]},{title:"Blocks",items:[{title:"Paragraph",format:"p"},{title:"Blockquote",format:"blockquote"},{title:"Div",format:"div"},{title:"Pre",format:"pre"}]},{title:"Alignment",items:[{title:"Left",icon:"alignleft",format:"alignleft"},{title:"Center",icon:"aligncenter",format:"aligncenter"},{title:"Right",icon:"alignright",format:"alignright"},{title:"Justify",icon:"alignjustify",format:"alignjustify"}]}],Lf=sr([(_s=Pn(),js=function(n,e){var t,r,o=e.event().originator(),i=e.event().target();return r=i,!(Re(t=o,n.element())&&!Re(t,r)&&(p.console.warn(Pn()+" did not get interpreted by the desired target. \nOriginator: "+ko(o)+"\nTarget: "+ko(i)+"\nCheck the "+Pn()+" event handlers"),1))},{key:_s,value:cr({can:js})})]),Pf=Object.freeze({events:Lf}),$f=h,Wf=Vr(["debugInfo","triggerFocus","triggerEvent","triggerEscape","addToWorld","removeFromWorld","addToGui","removeFromGui","build","getByUid","getByDom","broadcast","broadcastOn","isConnected"]),Uf=function(e){var n=function(n){return function(){throw new Error("The component must be in a context to send: "+n+"\n"+ko(e().element())+" is not in context.")}};return Wf({debugInfo:A("fake"),triggerEvent:n("triggerEvent"),triggerFocus:n("triggerFocus"),triggerEscape:n("triggerEscape"),build:n("build"),addToWorld:n("addToWorld"),removeFromWorld:n("removeFromWorld"),addToGui:n("addToGui"),removeFromGui:n("removeFromGui"),getByUid:n("getByUid"),getByDom:n("getByDom"),broadcast:n("broadcast"),broadcastOn:n("broadcastOn"),isConnected:A(!1)})},Gf=function(n,o){var i={};return B(n,function(n,r){B(n,function(n,e){var t=vt(e,[])(i);i[e]=t.concat([o(r,n)])})}),i},qf=function(n,e){return 1<n.length?Qe.error('Multiple behaviours have tried to change DOM "'+e+'". The guilty behaviours are: '+kt(yn(n,function(n){return n.name()}))+". At this stage, this is not supported. Future releases might provide strategies for resolving this."):0===n.length?Qe.value({}):Qe.value(n[0].modification().fold(function(){return{}},function(n){return yt(e,n)}))},Yf=function(u,c){return Tn(u,function(n,e){var t=e.modification().getOr({});return n.bind(function(i){var n=_(t,function(n,e){return i[e]!==undefined?(t=c,r=e,o=u,Qe.error("Mulitple behaviours have tried to change the _"+r+'_ "'+t+'". The guilty behaviours are: '+kt(Cn(o,function(n){return n.modification().getOr({})[r]!==undefined?[n.name()]:[]}),null,2)+". This is not currently supported.")):Qe.value(yt(e,n));var t,r,o});return wt(n,i)})},Qe.value({})).map(function(n){return yt(c,n)})},Kf={classes:function(n,e){var t=Cn(n,function(n){return n.modification().getOr([])});return Qe.value(yt(e,t))},attributes:Yf,styles:Yf,domChildren:qf,defChildren:qf,innerHtml:qf,value:qf},Xf=function(n,e){return t=l.apply(undefined,[n.handler].concat(e)),r=n.purpose(),{cHandler:t,purpose:A(r)};var t,r},Jf=function(n){return n.cHandler},Qf=function(n,e){return{name:A(n),handler:A(e)}},Zf=function(n,e,t){var r,o,i=k(t,(r=n,o={},bn(e,function(n){o[n.name()]=n.handlers(r)}),o));return Gf(i,Qf)},nl=function(n){var e,i=w(e=n)?{can:A(!0),abort:A(!1),run:e}:e;return function(n,e){for(var t=[],r=2;r<arguments.length;r++)t[r-2]=arguments[r];var o=[n,e].concat(t);i.abort.apply(undefined,o)?e.stop():i.can.apply(undefined,o)&&i.run.apply(undefined,o)}},el=function(n,e,t){var r,o,i=e[t];return i?function(u,c,n,a){var e=n.slice(0);try{var t=e.sort(function(n,e){var t=n[c](),r=e[c](),o=a.indexOf(t),i=a.indexOf(r);if(-1===o)throw new Error("The ordering for "+u+" does not have an entry for "+t+".\nOrder specified: "+kt(a,null,2));if(-1===i)throw new Error("The ordering for "+u+" does not have an entry for "+r+".\nOrder specified: "+kt(a,null,2));return o<i?-1:i<o?1:0});return Qe.value(t)}catch(r){return Qe.error([r])}}("Event: "+t,"name",n,i).map(function(n){var e=yn(n,function(n){return n.handler()});return ar(e)}):(r=t,o=n,Qe.error(["The event ("+r+') has more than one behaviour that listens to it.\nWhen this occurs, you must specify an event ordering for the behaviours in your spec (e.g. [ "listing", "toggling" ]).\nThe behaviours that can trigger it are: '+kt(yn(o,function(n){return n.name()}),null,2)]))},tl=function(n,i){var e=_(n,function(r,o){return(1===r.length?Qe.value(r[0].handler()):el(r,i,o)).map(function(n){var e=nl(n),t=1<r.length?wn(i,function(e){return hn(r,function(n){return n.name()===e})}).join(" > "):r[0].name();return yt(o,{handler:e,purpose:A(t)})})});return wt(e,{})},rl=function(n){return $t("custom.definition",Rt([jt("dom","dom",tt(),Rt([Jt("tag"),or("styles",{}),or("classes",[]),or("attributes",{}),er("value"),er("innerHtml")])),Jt("components"),Jt("uid"),or("events",{}),or("apis",A({})),jt("eventOrder","eventOrder",(e={"alloy.execute":["disabling","alloy.base.behaviour","toggling"],"alloy.focus":["alloy.base.behaviour","focusing","keying"],"alloy.system.init":["alloy.base.behaviour","disabling","toggling","representing"],input:["alloy.base.behaviour","representing","streaming","invalidating"],"alloy.system.detached":["alloy.base.behaviour","representing"]},nt.mergeWithThunk(A(e))),Kt()),er("domModification"),$o("originalSpec"),or("debug.sketcher","unknown")]),n);var e},ol=function(n){var e,t={tag:n.dom().tag(),classes:n.dom().classes(),attributes:k((e=n,yt(Oa(),e.uid())),n.dom().attributes()),styles:n.dom().styles(),domChildren:yn(n.components(),function(n){return n.element()})};return Tr(k(t,n.dom().innerHtml().map(function(n){return yt("innerHtml",n)}).getOr({}),n.dom().value().map(function(n){return yt("value",n)}).getOr({})))},il=function(e,n){bn(n,function(n){no(e,n)})},ul=function(e,n){bn(n,function(n){eo(e,n)})},cl=function(e){if(e.domChildren().isSome()&&e.defChildren().isSome())throw new Error("Cannot specify children and child specs! Must be one or the other.\nDef: "+(n=Sr(e),kt(n,null,2)));return e.domChildren().fold(function(){var n=e.defChildren().getOr([]);return yn(n,sl)},function(n){return n});var n},al=function(n){var e=ue.fromTag(n.tag());Ur(e,n.attributes().getOr({})),il(e,n.classes().getOr([])),hi(e,n.styles().getOr({})),To(e,n.innerHtml().getOr(""));var t=cl(n);return Le(e,t),n.value().each(function(n){af(e,n)}),e},sl=function(n){var e=Tr(n);return al(e)},fl=function(n,e){return t=n,o=yn(r=e,function(n){return tr(n.name(),[Jt("config"),or("state",Nr)])}),i=$t("component.behaviours",Bt(o),t.behaviours).fold(function(n){throw new Error(qt(n)+"\nComplete spec:\n"+kt(t,null,2))},function(n){return n}),{list:r,data:V(i,function(n){var e=n().map(function(n){return{config:n.config(),state:n.state().init(n.config())}});return function(){return e}})};var t,r,o,i},ll=function(n){var e,t,r=(e=ht(n,"behaviours").getOr({}),t=wn(R(e),function(n){return e[n]!==undefined}),yn(t,function(n){return e[n].me}));return fl(n,r)},dl=Vr(["getSystem","config","hasConfigured","spec","connect","disconnect","element","syncComponents","readState","components","events"]),ml=function(n,e,t){var r,o,i,u,c=ol(n),a=function(e,n,t,r){var o=k({},n);bn(t,function(n){o[n.name()]=n.exhibit(e,r)});var i=Gf(o,function(n,e){return{name:function(){return n},modification:e}}),u=V(i,function(n,e){return Cn(n,function(e){return e.modification().fold(function(){return[]},function(n){return[e]})})}),c=_(u,function(e,t){return ht(Kf,t).fold(function(){return Qe.error("Unknown field type: "+t)},function(n){return n(e,t)})});return wt(c,{}).map(Or)}(t,{"alloy.base.modification":(r=n,r.domModification().fold(function(){return Or({})},Or))},e,c).getOrDie();return i=a,u=k({tag:(o=c).tag(),classes:i.classes().getOr([]).concat(o.classes().getOr([])),attributes:C(o.attributes().getOr({}),i.attributes().getOr({})),styles:C(o.styles().getOr({}),i.styles().getOr({}))},i.innerHtml().or(o.innerHtml()).map(function(n){return yt("innerHtml",n)}).getOr({}),kr("domChildren",i.domChildren(),o.domChildren()),kr("defChildren",i.defChildren(),o.defChildren()),i.value().or(o.value()).map(function(n){return yt("value",n)}).getOr({})),Tr(u)},gl=function(n,e,t){var r,o,i,u,c,a,s={"alloy.base.behaviour":(r=n,r.events())};return(o=t,i=n.eventOrder(),u=e,c=s,a=Zf(o,u,c),tl(a,i)).getOrDie()},pl=function(n){var e,t,r,o,i,u,c,a,s,f,l,d,m,g,p=$f(n),v=(e=p,t=vt("components",[])(e),yn(t,yl)),h=k(Pf,p,yt("components",v));return Qe.value((r=h,i=ao(Uf(o=function(){return g})),u=Wt(rl(k(r,{behaviours:undefined}))),c=ll(r),a=c.list,s=c.data,f=ml(u,a,s),l=al(f),d=gl(u,a,s),m=ao(u.components()),g=dl({getSystem:i.get,config:function(n){if(n===Ta())return u.apis();if(y(n))throw new Error("Invalid input: only API constant is allowed");var e=s;return(w(e[n.name()])?e[n.name()]:function(){throw new Error("Could not find "+n.name()+" in "+kt(r,null,2))})()},hasConfigured:function(n){return w(s[n.name()])},spec:A(r),readState:function(n){return s[n]().map(function(n){return n.state.readState()}).getOr("not enabled")},connect:function(n){i.set(n)},disconnect:function(){i.set(Uf(o))},element:A(l),syncComponents:function(){var n=_e(l),e=Cn(n,function(n){return i.get().getByDom(n).fold(function(){return[]},function(n){return[n]})});m.set(e)},components:m.get,events:A(d)})))},vl=function(n){var e=ue.fromText(n);return hl({element:e})},hl=function(n){var t=Gt("external.component",Rt([Jt("element"),er("uid")]),n),e=ao(Uf());t.uid().each(function(n){var e;e=t.element(),Wr(e,Ca,n)});var r=dl({getSystem:e.get,config:F.none,hasConfigured:A(!1),connect:function(n){e.set(n)},disconnect:function(){e.set(Uf(function(){return r}))},element:A(t.element()),spec:A(n),readState:A("No state"),syncComponents:I,components:A([]),events:A({})});return wa(r)},yl=function(e){return(n=e,ht(n,ya)).fold(function(){var n=k({uid:Da("")},e);return pl(n).getOrDie()},function(n){return n});var n},bl=wa,wl="alloy.item-hover",xl="alloy.item-focus",Tl=function(n){(vo(n.element()).isNone()||mi.isFocused(n))&&(mi.isFocused(n)||mi.focus(n),ee(n,wl,{item:n}))},Sl=function(n){ee(n,xl,{item:n})},Ol=A(wl),kl=A(xl),Cl=[Jt("data"),Jt("components"),Jt("dom"),er("toggling"),or("itemBehaviours",{}),or("ignoreFocus",!1),or("domModification",{}),Po("builder",function(n){return{dom:k(n.dom(),{attributes:{role:n.toggling().isSome()?"menuitemcheckbox":"menuitem"}}),behaviours:k(jr([n.toggling().fold(ri.revoke,function(n){return ri.config(k({aria:{mode:"checked"}},n))}),mi.config({ignore:n.ignoreFocus(),onFocus:function(n){Sl(n)}}),Bc.config({mode:"execution"}),vs.config({store:{mode:"memory",initialValue:n.data()}})]),n.itemBehaviours()),events:sr([(e=Yn(),r=te,lr(e,function(e,t){var n=t.event();e.getSystem().getByDom(n.target()).each(function(n){r(e,n,t)})})),pr(L()),lr(W(),Tl),lr(Gn(),mi.focus)]),components:n.components(),domModification:n.domModification(),eventOrder:n.eventOrder()};var e,r}),or("eventOrder",{})],El=[Jt("dom"),Jt("components"),Po("builder",function(n){return{dom:n.dom(),components:n.components(),events:sr([(e=Gn(),lr(e,function(n,e){e.stop()}))])};var e})],Dl=A([ia({name:"widget",overrides:function(e){return{behaviours:jr([vs.config({store:{mode:"manual",getValue:function(n){return e.data()},setValue:function(){}}})])}}})]),Il=[Jt("uid"),Jt("data"),Jt("components"),Jt("dom"),or("autofocus",!1),or("domModification",{}),ha(Dl()),Po("builder",function(t){var n=da(0,t,Dl()),e=ma("item-widget",t,n.internals()),r=function(n){return ga(n,t,"widget").map(function(n){return Bc.focusIn(n),n})},o=function(n,e){return au(e.event().target())||t.autofocus()&&e.setSource(n.element()),F.none()};return k({dom:t.dom(),components:e,domModification:t.domModification(),events:sr([br(function(n,e){r(n).each(function(n){e.stop()})}),lr(W(),Tl),lr(Gn(),function(n,e){t.autofocus()?r(n):mi.focus(n)})]),behaviours:jr([vs.config({store:{mode:"memory",initialValue:t.data()}}),mi.config({onFocus:function(n){Sl(n)}}),Bc.config({mode:"special",focusIn:t.autofocus()?function(n){r(n)}:Pr(),onLeft:o,onRight:o,onEscape:function(n,e){return mi.isFocused(n)||t.autofocus()?(t.autofocus()&&e.setSource(n.element()),F.none()):(mi.focus(n),F.some(!0))}})])})})],Al=Yt("type",{widget:Il,item:Cl,separator:El}),Ml=A([ca({factory:{sketch:function(n){var e=Gt("menu.spec item",Al,n);return e.builder()(e)}},name:"items",unit:"item",defaults:function(n,e){var t=Da("");return k({uid:t},e)},overrides:function(n,e){return{type:e.type,ignoreFocus:n.fakeFocus(),domModification:{classes:[n.markers().item()]}}}})]),Fl=A([Jt("value"),Jt("items"),Jt("dom"),Jt("components"),or("eventOrder",{}),Vc("menuBehaviours",[tu,vs,rf,Bc]),ir("movement",{mode:"menu",moveOnTab:!0},Yt("mode",{grid:[Wo(),Po("config",function(n,e){return{mode:"flatgrid",selector:"."+n.markers().item(),initSize:{numColumns:e.initSize().numColumns(),numRows:e.initSize().numRows()},focusManager:n.focusManager()}})],menu:[or("moveOnTab",!0),Po("config",function(n,e){return{mode:"menu",selector:"."+n.markers().item(),moveOnTab:e.moveOnTab(),focusManager:n.focusManager()}})]})),Qt("markers",Vo()),or("fakeFocus",!1),or("focusManager",ru()),jo("onHighlight")]),Rl=A("alloy.menu-focus"),Bl=Va({name:"Menu",configFields:Fl(),partFields:Ml(),factory:function(n,e,t,r){return k({dom:k(n.dom(),{attributes:{role:"menu"}}),uid:n.uid(),behaviours:k(jr([tu.config({highlightClass:n.markers().selectedItem(),itemClass:n.markers().item(),onHighlight:n.onHighlight()}),vs.config({store:{mode:"memory",initialValue:n.value()}}),rf.config({find:F.some}),Bc.config(n.movement().config()(n,n.movement()))]),Nc(n.menuBehaviours())),events:sr([lr(kl(),function(e,t){var n=t.event();e.getSystem().getByDom(n.target()).each(function(n){tu.highlight(e,n),t.stop(),ee(e,Rl(),{menu:e,item:n})})}),lr(Ol(),function(n,e){var t=e.event().item();tu.highlight(n,t)})]),components:e,eventOrder:n.eventOrder()})}}),Vl=function(n,t){var r=Be(t),e=po(r).bind(function(e){var o,i,n=function(n){return Re(e,n)};return n(t)?F.some(t):(o=n,(i=function(n){for(var e=0;e<n.childNodes.length;e++){var t=ue.fromDom(n.childNodes[e]);if(o(t))return F.some(t);var r=i(n.childNodes[e]);if(r.isSome())return r}return F.none()})(t.dom()))}),o=n(t);return e.each(function(e){po(r).filter(function(n){return Re(n,e)}).fold(function(){mo(e)},I)}),o},Nl=function(n,e,t,r){var o=n.getSystem().build(r);qe(n,o,t)},_l=function(n,e){return n.components()},jl=zr({fields:[],name:"replacing",apis:Object.freeze({append:function(n,e,t,r){Nl(n,0,ze,r)},prepend:function(n,e,t,r){Nl(n,0,He,r)},remove:function(n,e,t,r){var o=_l(n);Sn(o,function(n){return Re(r.element(),n.element())}).each(Ke)},set:function(e,n,t,r){var o,i;i=(o=e).components(),bn(i,Ye),Pe(o.element()),o.syncComponents(),Vl(function(){var n=yn(r,e.getSystem().build);bn(n,function(n){Ge(e,n)})},e.element())},contents:_l})}),Hl=function(t,r,o,n){return ht(o,n).bind(function(n){return ht(t,n).bind(function(n){var e=Hl(t,r,o,n);return F.some([n].concat(e))})}).getOr([])},zl=function(n,e){var t={};B(n,function(n,e){bn(n,function(n){t[n]=e})});var r=e,o=N(e,function(n,e){return{k:n,v:e}}),i=V(o,function(n,e){return[e].concat(Hl(t,r,o,e))});return V(t,function(n){return ht(i,n).getOr([n])})},Ll=function(){var i=ao({}),u=ao({}),c=ao({}),a=ao(F.none()),s=ao({}),n=function(n){return ht(u.get(),n)};return{setContents:function(n,e,t,r){a.set(F.some(n)),i.set(t),u.set(e),s.set(r);var o=zl(r,t);c.set(o)},expand:function(t){return ht(i.get(),t).map(function(n){var e=ht(c.get(),t).getOr([]);return[n].concat(e)})},refresh:function(n){return ht(c.get(),n)},collapse:function(n){return ht(c.get(),n).bind(function(n){return 1<n.length?F.some(n.slice(1)):F.none()})},lookupMenu:n,otherMenus:function(n){var e,t,r=s.get();return e=R(r),t=n,wn(e,function(n){return!hn(t,n)})},getPrimary:function(){return a.get().bind(n)},getMenus:function(){return u.get()},clear:function(){i.set({}),u.set({}),c.set({}),a.set(F.none())},isClear:function(){return a.get().isNone()}}},Pl=A("collapse-item"),$l=Ba({name:"TieredMenu",configFields:[Lo("onExecute"),Lo("onEscape"),zo("onOpenMenu"),zo("onOpenSubmenu"),jo("onCollapseMenu"),or("openImmediately",!0),nr("data",[Jt("primary"),Jt("menus"),Jt("expansions")]),or("fakeFocus",!1),jo("onHighlight"),jo("onHover"),nr("markers",[Jt("backgroundMenu")].concat(Ro()).concat(Bo())),Jt("dom"),or("navigateOnHover",!0),or("stayInDom",!1),Vc("tmenuBehaviours",[Bc,tu,rf,jl]),or("eventOrder",{})],apis:{collapseMenu:function(n,e){n.collapseMenu(e)}},factory:function(u,o){var i=function(r,n){return V(n,function(n,e){var t=Bl.sketch(k(n,{value:e,items:n.items,markers:mt(o.markers,["item","selectedItem"]),fakeFocus:u.fakeFocus(),onHighlight:u.onHighlight(),focusManager:u.fakeFocus()?{get:function(n){return tu.getHighlighted(n).map(function(n){return n.element()})},set:function(e,n){e.getSystem().getByDom(n).fold(I,function(n){tu.highlight(e,n)})}}:ru()}));return r.getSystem().build(t)})},c=Ll(),a=function(n){return vs.getValue(n).value},s=function(n){return V(u.data().menus(),function(n,e){return Cn(n.items,function(n){return"separator"===n.type?[]:[n.data.value]})})},f=function(e,n){tu.highlight(e,n),tu.getHighlighted(n).orThunk(function(){return tu.getFirst(n)}).each(function(n){re(e,n.element(),Gn())})},l=function(n,e){return Eo(yn(e,n.lookupMenu))},d=function(r,o,i){return F.from(i[0]).bind(o.lookupMenu).map(function(n){var e=l(o,i.slice(1));bn(e,function(n){no(n.element(),u.markers().backgroundMenu())}),he(n.element())||jl.append(r,bl(n)),ul(n.element(),[u.markers().backgroundMenu()]),f(r,n);var t=l(o,o.otherMenus(i));return bn(t,function(n){ul(n.element(),[u.markers().backgroundMenu()]),u.stayInDom()||jl.remove(r,n)}),n})},m=function(e,t){var n=a(t);return c.expand(n).bind(function(n){return F.from(n[0]).bind(c.lookupMenu).each(function(n){he(n.element())||jl.append(e,bl(n)),u.onOpenSubmenu()(e,t,n),tu.highlightFirst(n)}),d(e,c,n)})},r=function(e,t){var n=a(t);return c.collapse(n).bind(function(n){return d(e,c,n).map(function(n){return u.onCollapseMenu()(e,t,n),n})})},n=function(t){return function(e,n){return Bi(n.getSource(),"."+u.markers().item()).bind(function(n){return e.getSystem().getByDom(n).toOption().bind(function(n){return t(e,n).map(function(){return!0})})})}},e=sr([lr(Rl(),function(n,e){var t=e.event().menu();tu.highlight(n,t)}),br(function(e,n){var t=n.event().target();e.getSystem().getByDom(t).each(function(n){0===a(n).indexOf("collapse-item")&&r(e,n),m(e,n).fold(function(){u.onExecute()(e,n)},function(){})})}),vr(function(e,n){var t,r,o;(t=e,r=i(t,u.data().menus()),o=s(),c.setContents(u.data().primary(),r,u.data().expansions(),o),c.getPrimary()).each(function(n){jl.append(e,bl(n)),u.openImmediately()&&(f(e,n),u.onOpenMenu()(e,n))})})].concat(u.navigateOnHover()?[lr(Ol(),function(n,e){var t,r,o=e.event().item();t=n,r=a(o),c.refresh(r).bind(function(n){return d(t,c,n)}),m(n,o),u.onHover()(n,o)})]:[]));return{uid:u.uid(),dom:u.dom(),behaviours:k(jr([Bc.config({mode:"special",onRight:n(function(n,e){return au(e.element())?F.none():m(n,e)}),onLeft:n(function(n,e){return au(e.element())?F.none():r(n,e)}),onEscape:n(function(n,e){return r(n,e).orThunk(function(){return u.onEscape()(n,e).map(function(){return n})})}),focusIn:function(e,n){c.getPrimary().each(function(n){re(e,n.element(),Gn())})}}),tu.config({highlightClass:u.markers().selectedMenu(),itemClass:u.markers().menu()}),rf.config({find:function(n){return tu.getHighlighted(n)}}),jl.config({})]),Nc(u.tmenuBehaviours())),eventOrder:u.eventOrder(),apis:{collapseMenu:function(e){tu.getHighlighted(e).each(function(n){tu.getHighlighted(n).each(function(n){r(e,n)})})}},events:e}},extraApis:{tieredData:function(n,e,t){return{primary:n,menus:e,expansions:t}},singleData:function(n,e){return{primary:n,menus:yt(n,e),expansions:{}}},collapseItem:function(n){return{value:Gc(Pl()),text:n}}}}),Wl=function(n,e,t,r){return ht(e.routes(),r.start()).map(a).bind(function(n){return ht(n,r.destination()).map(a)})},Ul=function(n,e,t,r){return Wl(0,e,0,r).bind(function(e){return e.transition().map(function(n){return{transition:A(n),route:A(e)}})})},Gl=function(t,r,n){var e,o,i;(e=t,o=r,i=n,ql(e,o).bind(function(n){return Ul(e,o,i,n)})).each(function(n){var e=n.transition();eo(t.element(),e.transitionClass()),Yr(t.element(),r.destinationAttr())})},ql=function(n,e,t){var r=n.element();return qr(r,e.destinationAttr())?F.some({start:A(Gr(n.element(),e.stateAttr())),destination:A(Gr(n.element(),e.destinationAttr()))}):F.none()},Yl=function(n,e,t,r){Gl(n,e,t),qr(n.element(),e.stateAttr())&&Gr(n.element(),e.stateAttr())!==r&&e.onFinish()(n,r),Wr(n.element(),e.stateAttr(),r)},Kl=Object.freeze({findRoute:Wl,disableTransition:Gl,getCurrentRoute:ql,jumpTo:Yl,progressTo:function(t,r,o,i){var n,e;e=r,qr((n=t).element(),e.destinationAttr())&&(Wr(n.element(),e.stateAttr(),Gr(n.element(),e.destinationAttr())),Yr(n.element(),e.destinationAttr()));var u,c,a=(u=r,c=i,{start:A(Gr(t.element(),u.stateAttr())),destination:A(c)});Ul(t,r,o,a).fold(function(){Yl(t,r,o,i)},function(n){Gl(t,r,o);var e=n.transition();no(t.element(),e.transitionClass()),Wr(t.element(),r.destinationAttr(),i)})},getState:function(n,e,t){var r=n.element();return qr(r,e.stateAttr())?F.some(Gr(r,e.stateAttr())):F.none()}}),Xl=Object.freeze({events:function(o,i){return sr([lr(K(),function(t,n){var r=n.event().raw();ql(t,o).each(function(e){Wl(0,o,0,e).each(function(n){n.transition().each(function(n){r.propertyName===n.property()&&(Yl(t,o,i,e.destination()),o.onTransition()(t,e))})})})}),vr(function(n,e){Yl(n,o,i,o.initialState())})])}}),Jl=[or("destinationAttr","data-transitioning-destination"),or("stateAttr","data-transitioning-state"),Jt("initialState"),jo("onTransition"),jo("onFinish"),Qt("routes",Vt(Qe.value,Vt(Qe.value,Rt([rr("transition",[Jt("property"),Jt("transitionClass")])]))))],Ql=zr({fields:Jl,name:"transitioning",active:Xl,apis:Kl,extra:{createRoutes:function(n){var r={};return B(n,function(n,e){var t=e.split("<->");r[t[0]]=yt(t[1],n),r[t[1]]=yt(t[0],n)}),r},createBistate:function(n,e,t){return bt([{key:n,value:yt(e,t)},{key:e,value:yt(n,t)}])},createTristate:function(n,e,t,r){return bt([{key:n,value:bt([{key:e,value:r},{key:t,value:r}])},{key:e,value:bt([{key:n,value:r},{key:t,value:r}])},{key:t,value:bt([{key:n,value:r},{key:e,value:r}])}])}}}),Zl=ai.resolve("scrollable"),nd={register:function(n){no(n,Zl)},deregister:function(n){eo(n,Zl)},scrollable:A(Zl)},ed=function(n){return ht(n,"format").getOr(n.title)},td=function(n,e,t,r,o){return{data:{value:n,text:e},type:"item",dom:{tag:"div",classes:o?[ai.resolve("styles-item-is-menu")]:[]},toggling:{toggleOnExecute:!1,toggleClass:ai.resolve("format-matches"),selected:t},itemBehaviours:jr(o?[]:[oi(n,function(n,e){(e?ri.on:ri.off)(n)})]),components:[{dom:{tag:"div",attributes:{style:r},innerHtml:e}}]}},rd=function(n,e,t,r){return{value:n,dom:{tag:"div"},components:[Na.sketch({dom:{tag:"div",classes:[ai.resolve("styles-collapser")]},components:r?[{dom:{tag:"span",classes:[ai.resolve("styles-collapse-icon")]}},vl(n)]:[vl(n)],action:function(n){if(r){var e=t().get(n);$l.collapseMenu(e)}}}),{dom:{tag:"div",classes:[ai.resolve("styles-menu-items-container")]},components:[Bl.parts().items({})],behaviours:jr([nf("adhoc-scrollable-menu",[vr(function(n,e){vi(n.element(),"overflow-y","auto"),vi(n.element(),"-webkit-overflow-scrolling","touch"),nd.register(n.element())}),hr(function(n){xi(n.element(),"overflow-y"),xi(n.element(),"-webkit-overflow-scrolling"),nd.deregister(n.element())})])])}],items:e,menuBehaviours:jr([Ql.config({initialState:"after",routes:Ql.createTristate("before","current","after",{transition:{property:"transform",transitionClass:"transitioning"}})})])}},od=function(r){var o,i,n,e,t,u=(o=r.formats,i=function(){return c},n=rd("Styles",[].concat(yn(o.items,function(n){return td(ed(n),n.title,n.isSelected(),n.getPreview(),xt(o.expansions,ed(n)))})),i,!1),e=V(o.menus,function(n,e){var t=yn(n,function(n){return td(ed(n),n.title,n.isSelected!==undefined&&n.isSelected(),n.getPreview!==undefined?n.getPreview():"",xt(o.expansions,ed(n)))});return rd(e,t,i,!0)}),t=k(e,yt("styles",n)),{tmenu:$l.tieredData("styles",t,o.expansions)}),c=Bs($l.sketch({dom:{tag:"div",classes:[ai.resolve("styles-menu")]},components:[],fakeFocus:!0,stayInDom:!0,onExecute:function(n,e){var t=vs.getValue(e);return r.handle(e,t.value),F.none()},onEscape:function(){return F.none()},onOpenMenu:function(n,e){var t=xs(n.element());ws(e.element(),t),Ql.jumpTo(e,"current")},onOpenSubmenu:function(n,e,t){var r=xs(n.element()),o=Fi(e.element(),'[role="menu"]').getOrDie("hacky"),i=n.getSystem().getByDom(o).getOrDie();ws(t.element(),r),Ql.progressTo(i,"before"),Ql.jumpTo(t,"after"),Ql.progressTo(t,"current")},onCollapseMenu:function(n,e,t){var r=Fi(e.element(),'[role="menu"]').getOrDie("hacky"),o=n.getSystem().getByDom(r).getOrDie();Ql.progressTo(o,"after"),Ql.progressTo(t,"current")},navigateOnHover:!1,openImmediately:!0,data:u.tmenu,markers:{backgroundMenu:ai.resolve("styles-background-menu"),menu:ai.resolve("styles-menu"),selectedMenu:ai.resolve("styles-selected-menu"),item:ai.resolve("styles-item"),selectedItem:ai.resolve("styles-selected-item")}}));return c.asSpec()},id=function(n){return xt(n,"items")?(t=k(gt(e=n,["items"]),{menu:!0}),r=ud(e.items),{item:t,menus:k(r.menus,yt(e.title,r.items)),expansions:k(r.expansions,yt(e.title,e.title))}):{item:n,menus:{},expansions:{}};var e,t,r},ud=function(n){return xn(n,function(n,e){var t=id(e);return{menus:k(n.menus,t.menus),items:[t.item].concat(n.items),expansions:k(n.expansions,t.expansions)}},{menus:{},expansions:{},items:[]})},cd={expand:ud},ad=function(u,n){var c=function(n){return function(){return u.formatter.match(n)}},a=function(n){return function(){return u.formatter.getCssText(n)}},e=ht(n,"style_formats").getOr(zf),s=function(n){return yn(n,function(n){if(xt(n,"items")){var e=s(n.items);return k(k(n,{isSelected:A(!1),getPreview:A("")}),{items:e})}return xt(n,"format")?k(i=n,{isSelected:c(i.format),getPreview:a(i.format)}):(r=Gc((t=n).title),o=k(t,{format:r,isSelected:c(r),getPreview:a(r)}),u.formatter.register(r,o),o);var t,r,o,i})};return s(e)},sd=function(t,n,r){var e,o,i,u=(e=t,i=(o=function(n){return Cn(n,function(n){return n.items!==undefined?0<o(n.items).length?[n]:[]:!xt(n,"format")||e.formatter.canApply(n.format)?[n]:[]})})(n),cd.expand(i));return od({formats:u,handle:function(n,e){t.undoManager.transact(function(){ri.isOn(n)?t.formatter.remove(e):t.formatter.apply(e)}),r()}})},fd=["undo","bold","italic","link","image","bullist","styleselect"],ld=function(n){var e=n.replace(/\|/g," ").trim();return 0<e.length?e.split(/\s+/):[]},dd=function(n){return Cn(n,function(n){return g(n)?dd(n):ld(n)})},md=function(n){var e=n.toolbar!==undefined?n.toolbar:fd;return g(e)?dd(e):ld(e)},gd=function(r,o){var n=function(n){return function(){return $a.forToolbarCommand(o,n)}},e=function(n){return function(){return $a.forToolbarStateCommand(o,n)}},t=function(n,e,t){return function(){return $a.forToolbarStateAction(o,n,e,t)}},i=n("undo"),u=n("redo"),c=e("bold"),a=e("italic"),s=e("underline"),f=n("removeformat"),l=t("unlink","link",function(){o.execCommand("unlink",null,!1)}),d=t("unordered-list","ul",function(){o.execCommand("InsertUnorderedList",null,!1)}),m=t("ordered-list","ol",function(){o.execCommand("InsertOrderedList",null,!1)}),g=ad(o,o.settings),p=function(){return sd(o,g,function(){o.fire("scrollIntoView")})},v=function(n,e){return{isSupported:function(){return n.forall(function(n){return xt(o.buttons,n)})},sketch:e}};return{undo:v(F.none(),i),redo:v(F.none(),u),bold:v(F.none(),c),italic:v(F.none(),a),underline:v(F.none(),s),removeformat:v(F.none(),f),link:v(F.none(),function(){return e=r,t=o,$a.forToolbarStateAction(t,"link","link",function(){var n=Hf(e,t);e.setContextToolbar(n),Zs(t,function(){e.focusToolbar()}),Xs.query(t).each(function(n){t.selection.select(n.dom())})});var e,t}),unlink:v(F.none(),l),image:v(F.none(),function(){return Ws(o)}),bullist:v(F.some("bullist"),d),numlist:v(F.some("numlist"),m),fontsizeselect:v(F.none(),function(){return e=o,n={onChange:function(n){Ms.apply(e,n)},getInitialValue:function(){return Ms.get(e)}},Os(r,"font-size",function(){return Rs(n)});var e,n}),forecolor:v(F.none(),function(){return Cs(r,o)}),styleselect:v(F.none(),function(){return $a.forToolbar("style-formats",function(n){o.fire("toReading"),r.dropup().appear(p,ri.on,n)},jr([ri.config({toggleClass:ai.resolve("toolbar-button-selected"),toggleOnExecute:!1,aria:{mode:"pressed"}}),Go.config({channels:bt([ui(wo.orientationChanged(),ri.off),ui(wo.dropupDismissed(),ri.off)])})]))})}},pd=function(n,t){var e=md(n),r={};return Cn(e,function(n){var e=!xt(r,n)&&xt(t,n)&&t[n].isSupported()?[t[n].sketch()]:[];return r[n]=!0,e})},vd=function(m,g){return function(n){if(m(n)){var e,t,r,o,i,u,c,a=ue.fromDom(n.target),s=function(){n.stopPropagation()},f=function(){n.preventDefault()},l=v(f,s),d=(e=a,t=n.clientX,r=n.clientY,o=s,i=f,u=l,c=n,{target:A(e),x:A(t),y:A(r),stop:o,prevent:i,kill:u,raw:A(c)});g(d)}}},hd=function(n,e,t,r,o){var i=vd(t,r);return n.dom().addEventListener(e,i,o),{unbind:l(yd,n,e,i,o)}},yd=function(n,e,t,r){n.dom().removeEventListener(e,t,r)},bd=A(!0),wd=function(n,e,t){return hd(n,e,bd,t,!1)},xd=function(n,e,t){return hd(n,e,bd,t,!0)},Td=function(n){var e=n.matchMedia("(orientation: portrait)").matches;return{isPortrait:A(e)}},Sd=Td,Od=function(r,e){var n=ue.fromDom(r),o=null,t=wd(n,"orientationchange",function(){clearInterval(o);var n=Td(r);e.onChange(n),i(function(){e.onReady(n)})}),i=function(n){clearInterval(o);var e=r.innerHeight,t=0;o=setInterval(function(){e!==r.innerHeight?(clearInterval(o),n(F.some(r.innerHeight))):20<t&&(clearInterval(o),n(F.none())),t++},50)};return{onAdjustment:i,destroy:function(){t.unbind()}}},kd=function(n){var e=zn.detect().os.isiOS(),t=Td(n).isPortrait();return e&&!t?n.screen.height:n.screen.width},Cd=function(n){var e=n.raw();return e.touches===undefined||1!==e.touches.length?F.none():F.some(e.touches[0])},Ed=function(t){var r,o,i,u=ao(F.none()),c=(r=function(n){u.set(F.none()),t.triggerEvent(Kn(),n)},o=400,i=null,{cancel:function(){null!==i&&(p.clearTimeout(i),i=null)},schedule:function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];i=p.setTimeout(function(){r.apply(null,n),i=null},o)}}),a=bt([{key:j(),value:function(t){return Cd(t).each(function(n){c.cancel();var e={x:A(n.clientX),y:A(n.clientY),target:t.target};c.schedule(t),u.set(F.some(e))}),F.none()}},{key:H(),value:function(n){return c.cancel(),Cd(n).each(function(i){u.get().each(function(n){var e,t,r,o;e=i,t=n,r=Math.abs(e.clientX-t.x()),o=Math.abs(e.clientY-t.y()),(5<r||5<o)&&u.set(F.none())})}),F.none()}},{key:z(),value:function(e){return c.cancel(),u.get().filter(function(n){return Re(n.target(),e.target())}).map(function(n){return t.triggerEvent(qn(),e)})}}]);return{fireIfReady:function(e,n){return ht(a,n).bind(function(n){return n(e)})}}},Dd=function(t){var e=Ed({triggerEvent:function(n,e){t.onTapContent(e)}});return{fireTouchstart:function(n){e.fireIfReady(n,"touchstart")},onTouchend:function(){return wd(t.body(),"touchend",function(n){e.fireIfReady(n,"touchend")})},onTouchmove:function(){return wd(t.body(),"touchmove",function(n){e.fireIfReady(n,"touchmove")})}}},Id=6<=zn.detect().os.version.major,Ad=function(r,e,t){var o=Dd(r),i=Be(e),u=function(n){return!Re(n.start(),n.finish())||n.soffset()!==n.foffset()},n=function(){var n=r.doc().dom().hasFocus()&&r.getSelection().exists(u);t.getByDom(e).each(!0===(n||po(i).filter(function(n){return"input"===me(n)}).exists(function(n){return n.dom().selectionStart!==n.dom().selectionEnd}))?ri.on:ri.off)},c=[wd(r.body(),"touchstart",function(n){r.onTouchContent(),o.fireTouchstart(n)}),o.onTouchmove(),o.onTouchend(),wd(e,"touchstart",function(n){r.onTouchToolstrip()}),r.onToReading(function(){go(r.body())}),r.onToEditing(I),r.onScrollToCursor(function(n){n.preventDefault(),r.getCursorBox().each(function(n){var e=r.win(),t=n.top()>e.innerHeight||n.bottom()>e.innerHeight?n.bottom()-e.innerHeight+50:0;0!==t&&e.scrollTo(e.pageXOffset,e.pageYOffset+t)})})].concat(!0===Id?[]:[wd(ue.fromDom(r.win()),"blur",function(){t.getByDom(e).each(ri.off)}),wd(i,"select",n),wd(r.doc(),"selectionchange",n)]);return{destroy:function(){bn(c,function(n){n.unbind()})}}},Md=function(n,e){var t=parseInt(Gr(n,e),10);return isNaN(t)?0:t},Fd=(Hs=ve,zs="text",{get:function(n){if(!Hs(n))throw new Error("Can only get "+zs+" value of a "+zs+" node");return Ls(n).getOr("")},getOption:Ls=function(n){return Hs(n)?F.from(n.dom().nodeValue):F.none()},set:function(n,e){if(!Hs(n))throw new Error("Can only set raw "+zs+" value of a "+zs+" node");n.dom().nodeValue=e}}),Rd=function(n){return"img"===me(n)?1:(e=n,Fd.getOption(e)).fold(function(){return _e(n).length},function(n){return n.length});var e},Bd={create:we("start","soffset","finish","foffset")},Vd=Ze([{before:["element"]},{on:["element","offset"]},{after:["element"]}]),Nd={before:Vd.before,on:Vd.on,after:Vd.after,cata:function(n,e,t,r){return n.fold(e,t,r)},getStart:function(n){return n.fold(h,h,h)}},_d=Ze([{domRange:["rng"]},{relative:["startSitu","finishSitu"]},{exact:["start","soffset","finish","foffset"]}]),jd={domRange:_d.domRange,relative:_d.relative,exact:_d.exact,exactFromRange:function(n){return _d.exact(n.start(),n.soffset(),n.finish(),n.foffset())},getWin:function(n){var e=n.match({domRange:function(n){return ue.fromDom(n.startContainer)},relative:function(n,e){return Nd.getStart(n)},exact:function(n,e,t,r){return n}});return Ve(e)},range:Bd.create},Hd=function(n,e,t){var r,o,i=n.document.createRange();return r=i,e.fold(function(n){r.setStartBefore(n.dom())},function(n,e){r.setStart(n.dom(),e)},function(n){r.setStartAfter(n.dom())}),o=i,t.fold(function(n){o.setEndBefore(n.dom())},function(n,e){o.setEnd(n.dom(),e)},function(n){o.setEndAfter(n.dom())}),i},zd=function(n,e,t,r,o){var i=n.document.createRange();return i.setStart(e.dom(),t),i.setEnd(r.dom(),o),i},Ld=function(n){return{left:A(n.left),top:A(n.top),right:A(n.right),bottom:A(n.bottom),width:A(n.width),height:A(n.height)}},Pd=Ze([{ltr:["start","soffset","finish","foffset"]},{rtl:["start","soffset","finish","foffset"]}]),$d=function(n,e,t){return e(ue.fromDom(t.startContainer),t.startOffset,ue.fromDom(t.endContainer),t.endOffset)},Wd=function(n,e){var o,t,r,i=(o=n,e.match({domRange:function(n){return{ltr:A(n),rtl:F.none}},relative:function(n,e){return{ltr:J(function(){return Hd(o,n,e)}),rtl:J(function(){return F.some(Hd(o,e,n))})}},exact:function(n,e,t,r){return{ltr:J(function(){return zd(o,n,e,t,r)}),rtl:J(function(){return F.some(zd(o,t,r,n,e))})}}}));return(r=(t=i).ltr()).collapsed?t.rtl().filter(function(n){return!1===n.collapsed}).map(function(n){return Pd.rtl(ue.fromDom(n.endContainer),n.endOffset,ue.fromDom(n.startContainer),n.startOffset)}).getOrThunk(function(){return $d(0,Pd.ltr,r)}):$d(0,Pd.ltr,r)},Ud=function(n,e){var t=me(n);return"input"===t?Nd.after(n):hn(["br","img"],t)?0===e?Nd.before(n):Nd.after(n):Nd.on(n,e)},Gd=function(n,e,t,r){var o,i,u,c,a,s=(i=e,u=t,c=r,(a=Be(o=n).dom().createRange()).setStart(o.dom(),i),a.setEnd(u.dom(),c),a),f=Re(n,t)&&e===r;return s.collapsed&&!f},qd=function(n,e,t,r,o){var i,u,c=zd(n,e,t,r,o);i=n,u=c,F.from(i.getSelection()).each(function(n){n.removeAllRanges(),n.addRange(u)})},Yd=function(n,e,t,r,o){var i,u,c,a,l,s=(i=r,u=o,c=Ud(e,t),a=Ud(i,u),jd.relative(c,a));Wd(l=n,s).match({ltr:function(n,e,t,r){qd(l,n,e,t,r)},rtl:function(n,e,t,r){var o,i,u,c,a,s=l.getSelection();if(s.setBaseAndExtent)s.setBaseAndExtent(n.dom(),e,t.dom(),r);else if(s.extend)try{i=n,u=e,c=t,a=r,(o=s).collapse(i.dom(),u),o.extend(c.dom(),a)}catch(f){qd(l,t,r,n,e)}else qd(l,t,r,n,e)}})},Kd=function(n){var e=ue.fromDom(n.anchorNode),t=ue.fromDom(n.focusNode);return Gd(e,n.anchorOffset,t,n.focusOffset)?F.some(Bd.create(e,n.anchorOffset,t,n.focusOffset)):function(n){if(0<n.rangeCount){var e=n.getRangeAt(0),t=n.getRangeAt(n.rangeCount-1);return F.some(Bd.create(ue.fromDom(e.startContainer),e.startOffset,ue.fromDom(t.endContainer),t.endOffset))}return F.none()}(n)},Xd=function(n){return F.from(n.getSelection()).filter(function(n){return 0<n.rangeCount}).bind(Kd)},Jd=function(n,e){var i,t,r,o,u=Wd(i=n,e).match({ltr:function(n,e,t,r){var o=i.document.createRange();return o.setStart(n.dom(),e),o.setEnd(t.dom(),r),o},rtl:function(n,e,t,r){var o=i.document.createRange();return o.setStart(t.dom(),r),o.setEnd(n.dom(),e),o}});return r=(t=u).getClientRects(),0<(o=0<r.length?r[0]:t.getBoundingClientRect()).width||0<o.height?F.some(o).map(Ld):F.none()},Qd=function(n){return{left:n.left,top:n.top,right:n.right,bottom:n.bottom,width:A(2),height:n.height}},Zd=function(n){return{left:A(n.left),top:A(n.top),right:A(n.right),bottom:A(n.bottom),width:A(n.width),height:A(n.height)}},nm=function(n){var e=n.getSelection();return e!==undefined&&0<e.rangeCount?function(t){if(t.collapsed){var r=ue.fromDom(t.startContainer);return Ne(r).bind(function(n){var e=jd.exact(r,t.startOffset,n,Rd(n));return Jd(t.startContainer.ownerDocument.defaultView,e).map(Qd).map(In)}).getOr([])}return yn(t.getClientRects(),Zd)}(e.getRangeAt(0)):[]},em=function(n){n.focus();var e=ue.fromDom(n.document.body);(po().exists(function(n){return hn(["input","textarea"],me(n))})?function(n){setTimeout(function(){n()},0)}:a)(function(){po().each(go),mo(e)})},tm="data-"+ai.resolve("last-outer-height"),rm=function(n,e){Wr(n,tm,e)},om=function(n){return{top:A(n.top()),bottom:A(n.top()+n.height())}},im=function(n,e){var t=Md(e,tm),r=n.innerHeight;return r<t?F.some(t-r):F.none()},um=function(n,u){var e=ue.fromDom(u.document.body),t=wd(ue.fromDom(n),"resize",function(){im(n,e).each(function(i){var n,e;(n=u,e=nm(n),0<e.length?F.some(e[0]).map(om):F.none()).each(function(n){var e,t,r,o=(e=u,r=i,(t=n).top()>e.innerHeight||t.bottom()>e.innerHeight?Math.min(r,t.bottom()-e.innerHeight+50):0);0!==o&&u.scrollTo(u.pageXOffset,u.pageYOffset+o)})}),rm(e,n.innerHeight)});return rm(e,n.innerHeight),{toEditing:function(){em(u)},destroy:function(){t.unbind()}}},cm=function(n){return F.some(ue.fromDom(n.dom().contentWindow.document.body))},am=function(n){return F.some(ue.fromDom(n.dom().contentWindow.document))},sm=function(n){return F.from(n.dom().contentWindow)},fm=function(n){return sm(n).bind(Xd)},lm=function(n){return n.getFrame()},dm=function(n,t){return function(e){return e[n].getOrThunk(function(){var n=lm(e);return function(){return t(n)}})()}},mm=function(n,e,t,r){return n[t].getOrThunk(function(){return function(n){return wd(e,r,n)}})},gm=function(n){return{left:A(n.left),top:A(n.top),right:A(n.right),bottom:A(n.bottom),width:A(n.width),height:A(n.height)}},pm={getBody:dm("getBody",cm),getDoc:dm("getDoc",am),getWin:dm("getWin",sm),getSelection:dm("getSelection",fm),getFrame:lm,getActiveApi:function(c){var a=lm(c);return cm(a).bind(function(u){return am(a).bind(function(i){return sm(a).map(function(o){var n=ue.fromDom(i.dom().documentElement),e=c.getCursorBox.getOrThunk(function(){return function(){return(n=o,Xd(n).map(function(n){return jd.exact(n.start(),n.soffset(),n.finish(),n.foffset())})).bind(function(n){return Jd(o,n).orThunk(function(){return Xd(o).filter(function(n){return Re(n.start(),n.finish())&&n.soffset()===n.foffset()}).bind(function(n){var e=n.start().dom().getBoundingClientRect();return 0<e.width||0<e.height?F.some(e).map(gm):F.none()})})});var n}}),t=c.setSelection.getOrThunk(function(){return function(n,e,t,r){Yd(o,n,e,t,r)}}),r=c.clearSelection.getOrThunk(function(){return function(){o.getSelection().removeAllRanges()}});return{body:A(u),doc:A(i),win:A(o),html:A(n),getSelection:l(fm,a),setSelection:t,clearSelection:r,frame:A(a),onKeyup:mm(c,i,"onKeyup","keyup"),onNodeChanged:mm(c,i,"onNodeChanged","selectionchange"),onDomChanged:c.onDomChanged,onScrollToCursor:c.onScrollToCursor,onScrollToElement:c.onScrollToElement,onToReading:c.onToReading,onToEditing:c.onToEditing,onToolbarScrollStart:c.onToolbarScrollStart,onTouchContent:c.onTouchContent,onTapContent:c.onTapContent,onTouchToolstrip:c.onTouchToolstrip,getCursorBox:e}})})})}},vm="data-ephox-mobile-fullscreen-style",hm="position:absolute!important;",ym="top:0!important;left:0!important;margin:0!important;padding:0!important;width:100%!important;height:100%!important;overflow:visible!important;",bm=zn.detect().os.isAndroid(),wm=function(n,e){var t,r,o,i=function(r){return function(n){var e=Gr(n,"style"),t=e===undefined?"no-styles":e.trim();t!==r&&(Wr(n,vm,t),Wr(n,"style",r))}},u=(t="*",Di(n,function(n){return Ie(n,t)},r)),c=Cn(u,function(n){var e;return e="*",Ii(n,function(n){return Ie(n,e)})}),a=(o=yi(e,"background-color"))!==undefined&&""!==o?"background-color:"+o+"!important":"background-color:rgb(255,255,255)!important;";bn(c,i("display:none!important;")),bn(u,i(hm+ym+a)),i((!0===bm?"":hm)+ym+a)(n)},xm=function(){var n=Me("["+vm+"]");bn(n,function(n){var e=Gr(n,vm);"no-styles"!==e?Wr(n,"style",e):Yr(n,"style"),Yr(n,vm)})},Tm=function(){var e=Mi("head").getOrDie(),n=Mi('meta[name="viewport"]').getOrThunk(function(){var n=ue.fromTag("meta");return Wr(n,"name","viewport"),ze(e,n),n}),t=Gr(n,"content");return{maximize:function(){Wr(n,"content","width=device-width, initial-scale=1.0, user-scalable=no, maximum-scale=1.0")},restore:function(){t!==undefined&&null!==t&&0<t.length?Wr(n,"content",t):Wr(n,"content","user-scalable=yes")}}},Sm=function(e,n){var t=Tm(),r=Rf(),o=Rf();return{enter:function(){n.hide(),no(e.container,ai.resolve("fullscreen-maximized")),no(e.container,ai.resolve("android-maximized")),t.maximize(),no(e.body,ai.resolve("android-scroll-reload")),r.set(um(e.win,pm.getWin(e.editor).getOrDie("no"))),pm.getActiveApi(e.editor).each(function(n){wm(e.container,n.body()),o.set(Ad(n,e.toolstrip,e.alloy))})},exit:function(){t.restore(),n.show(),eo(e.container,ai.resolve("fullscreen-maximized")),eo(e.container,ai.resolve("android-maximized")),xm(),eo(e.body,ai.resolve("android-scroll-reload")),o.clear(),r.clear()}}},Om=function(t,r){var o=null;return{cancel:function(){null!==o&&(p.clearTimeout(o),o=null)},throttle:function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];null!==o&&p.clearTimeout(o),o=p.setTimeout(function(){t.apply(null,n),o=null},r)}}},km=function(n,e){var t,r,o,i=Bs(of.sketch({dom:Ha('<div aria-hidden="true" class="${prefix}-mask-tap-icon"></div>'),containerBehaviours:jr([ri.config({toggleClass:ai.resolve("mask-tap-icon-selected"),toggleOnExecute:!1})])})),u=(t=n,r=200,o=null,{cancel:function(){null!==o&&(p.clearTimeout(o),o=null)},throttle:function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];null===o&&(o=p.setTimeout(function(){t.apply(null,n),o=null},r))}});return of.sketch({dom:Ha('<div class="${prefix}-disabled-mask"></div>'),components:[of.sketch({dom:Ha('<div class="${prefix}-content-container"></div>'),components:[Na.sketch({dom:Ha('<div class="${prefix}-content-tap-section"></div>'),components:[i.asSpec()],action:function(n){u.throttle()},buttonBehaviours:jr([ri.config({toggleClass:ai.resolve("mask-tap-icon-selected")})])})]})]})},Cm=Bt([nr("editor",[Jt("getFrame"),er("getBody"),er("getDoc"),er("getWin"),er("getSelection"),er("setSelection"),er("clearSelection"),er("cursorSaver"),er("onKeyup"),er("onNodeChanged"),er("getCursorBox"),Jt("onDomChanged"),or("onTouchContent",I),or("onTapContent",I),or("onTouchToolstrip",I),or("onScrollToCursor",A({unbind:I})),or("onScrollToElement",A({unbind:I})),or("onToEditing",A({unbind:I})),or("onToReading",A({unbind:I})),or("onToolbarScrollStart",h)]),Jt("socket"),Jt("toolstrip"),Jt("dropup"),Jt("toolbar"),Jt("container"),Jt("alloy"),ur("win",function(n){return Be(n.socket).dom().defaultView}),ur("body",function(n){return ue.fromDom(n.socket.dom().ownerDocument.body)}),or("translate",h),or("setReadOnly",I),or("readOnlyOnInit",A(!0))]),Em=function(n){var e=Ut("Getting AndroidWebapp schema",Cm,n);vi(e.toolstrip,"width","100%");var t=yl(km(function(){e.setReadOnly(e.readOnlyOnInit()),o.enter()},e.translate));e.alloy.add(t);var r={show:function(){e.alloy.add(t)},hide:function(){e.alloy.remove(t)}};ze(e.container,t.element());var o=Sm(e,r);return{setReadOnly:e.setReadOnly,refreshStructure:I,enter:o.enter,exit:o.exit,destroy:I}},Dm=A([or("shell",!0),Vc("toolbarBehaviours",[jl])]),Im=A([ua({name:"groups",overrides:function(n){return{behaviours:jr([jl.config({})])}}})]),Am=Va({name:"Toolbar",configFields:Dm(),partFields:Im(),factory:function(e,n,t,r){var o=function(n){return e.shell()?F.some(n):ga(n,e,"groups")},i=e.shell()?{behaviours:[jl.config({})],components:[]}:{behaviours:[],components:n};return{uid:e.uid(),dom:e.dom(),components:i.components,behaviours:k(jr(i.behaviours),Nc(e.toolbarBehaviours())),apis:{setGroups:function(n,e){o(n).fold(function(){throw p.console.error("Toolbar was defined to not be a shell, but no groups container was specified in components"),new Error("Toolbar was defined to not be a shell, but no groups container was specified in components")},function(n){jl.set(n,e)})}},domModification:{attributes:{role:"group"}}}},apis:{setGroups:function(n,e,t){n.setGroups(e,t)}}}),Mm=A([Jt("items"),(Ps=["itemClass"],nr("markers",yn(Ps,Jt))),Vc("tgroupBehaviours",[Bc])]),Fm=A([ca({name:"items",unit:"item",overrides:function(n){return{domModification:{classes:[n.markers().itemClass()]}}}})]),Rm=Va({name:"ToolbarGroup",configFields:Mm(),partFields:Fm(),factory:function(n,e,t,r){return k({dom:{attributes:{role:"toolbar"}}},{uid:n.uid(),dom:n.dom(),components:e,behaviours:k(jr([Bc.config({mode:"flow",selector:"."+n.markers().itemClass()})]),Nc(n.tgroupBehaviours())),"debug.sketcher":t["debug.sketcher"]})}}),Bm="data-"+ai.resolve("horizontal-scroll"),Vm=function(n){return"true"===Gr(n,Bm)?0<(t=n).dom().scrollLeft||function(n){n.dom().scrollLeft=1;var e=0!==n.dom().scrollLeft;return n.dom().scrollLeft=0,e}(t):0<(e=n).dom().scrollTop||function(n){n.dom().scrollTop=1;var e=0!==n.dom().scrollTop;return n.dom().scrollTop=0,e}(e);var e,t},Nm={exclusive:function(n,e){return wd(n,"touchmove",function(n){Bi(n.target(),e).filter(Vm).fold(function(){n.raw().preventDefault()},I)})},markAsHorizontal:function(n){Wr(n,Bm,"true")}};function _m(){var e=function(n){var e=!0===n.scrollable?"${prefix}-toolbar-scrollable-group":"";return{dom:Ha('<div aria-label="'+n.label+'" class="${prefix}-toolbar-group '+e+'"></div>'),tgroupBehaviours:jr([nf("adhoc-scrollable-toolbar",!0===n.scrollable?[yr(function(n,e){vi(n.element(),"overflow-x","auto"),Nm.markAsHorizontal(n.element()),nd.register(n.element())})]:[])]),components:[of.sketch({components:[Rm.parts().items({})]})],markers:{itemClass:ai.resolve("toolbar-group-item")},items:n.items}},t=yl(Am.sketch({dom:Ha('<div class="${prefix}-toolbar"></div>'),components:[Am.parts().groups({})],toolbarBehaviours:jr([ri.config({toggleClass:ai.resolve("context-toolbar"),toggleOnExecute:!1,aria:{mode:"none"}}),Bc.config({mode:"cyclic"})]),shell:!0})),n=yl(of.sketch({dom:{classes:[ai.resolve("toolstrip")]},components:[bl(t)],containerBehaviours:jr([ri.config({toggleClass:ai.resolve("android-selection-context-toolbar"),toggleOnExecute:!1})])})),r=function(){Am.setGroups(t,o.get()),ri.off(t)},o=ao([]);return{wrapper:A(n),toolbar:A(t),createGroups:function(n){return yn(n,v(Rm.sketch,e))},setGroups:function(n){o.set(n),r()},setContextToolbar:function(n){ri.on(t),Am.setGroups(t,n)},restoreToolbar:function(){ri.isOn(t)&&r()},refresh:function(){},focus:function(){Bc.focusIn(t)}}}var jm=function(n,e){jl.append(n,bl(e))},Hm=function(n,e){jl.remove(n,e)},zm=function(n){return yl(Na.sketch({dom:Ha('<div class="${prefix}-mask-edit-icon ${prefix}-icon"></div>'),action:function(){n.run(function(n){n.setReadOnly(!1)})}}))},Lm=function(){return yl(of.sketch({dom:Ha('<div class="${prefix}-editor-socket"></div>'),components:[],containerBehaviours:jr([jl.config({})])}))},Pm=function(n,e,t,r){(!0===t?co.toAlpha:co.toOmega)(r),(t?jm:Hm)(n,e)},$m=function(e,n){return n.getAnimationRoot().fold(function(){return e.element()},function(n){return n(e)})},Wm=function(n){return n.dimension().property()},Um=function(n,e){return n.dimension().getDimension()(e)},Gm=function(n,e){var t=$m(n,e);ul(t,[e.shrinkingClass(),e.growingClass()])},qm=function(n,e){eo(n.element(),e.openClass()),no(n.element(),e.closedClass()),vi(n.element(),Wm(e),"0px"),Ti(n.element())},Ym=function(n,e){eo(n.element(),e.closedClass()),no(n.element(),e.openClass()),xi(n.element(),Wm(e))},Km=function(n,e,t){t.setCollapsed(),vi(n.element(),Wm(e),Um(e,n.element())),Ti(n.element());var r=$m(n,e);no(r,e.shrinkingClass()),qm(n,e),e.onStartShrink()(n)},Xm=function(n,e,t){var r=function(n,e){Ym(n,e);var t=Um(e,n.element());return qm(n,e),t}(n,e),o=$m(n,e);no(o,e.growingClass()),Ym(n,e),vi(n.element(),Wm(e),r),t.setExpanded(),e.onStartGrow()(n)},Jm=function(n,e,t){var r=$m(n,e);return!0===ro(r,e.growingClass())},Qm=function(n,e,t){var r=$m(n,e);return!0===ro(r,e.shrinkingClass())},Zm=Object.freeze({grow:function(n,e,t){t.isExpanded()||Xm(n,e,t)},shrink:function(n,e,t){t.isExpanded()&&Km(n,e,t)},immediateShrink:function(n,e,t){var r,o;t.isExpanded()&&(r=n,o=e,t.setCollapsed(),vi(r.element(),Wm(o),Um(o,r.element())),Ti(r.element()),Gm(r,o),qm(r,o),o.onStartShrink()(r),o.onShrunk()(r))},hasGrown:function(n,e,t){return t.isExpanded()},hasShrunk:function(n,e,t){return t.isCollapsed()},isGrowing:Jm,isShrinking:Qm,isTransitioning:function(n,e,t){return!0===Jm(n,e)||!0===Qm(n,e)},toggleGrow:function(n,e,t){(t.isExpanded()?Km:Xm)(n,e,t)},disableTransitions:Gm}),ng=Object.freeze({exhibit:function(n,e){var t=e.expanded();return Or(t?{classes:[e.openClass()],styles:{}}:{classes:[e.closedClass()],styles:yt(e.dimension().property(),"0px")})},events:function(t,r){return sr([lr(K(),function(n,e){e.event().raw().propertyName===t.dimension().property()&&(Gm(n,t),r.isExpanded()&&xi(n.element(),t.dimension().property()),(r.isExpanded()?t.onGrown():t.onShrunk())(n))})])}}),eg=[Jt("closedClass"),Jt("openClass"),Jt("shrinkingClass"),Jt("growingClass"),er("getAnimationRoot"),jo("onShrunk"),jo("onStartShrink"),jo("onGrown"),jo("onStartGrow"),or("expanded",!1),Qt("dimension",Yt("property",{width:[Po("property","width"),Po("getDimension",function(n){return xs(n)+"px"})],height:[Po("property","height"),Po("getDimension",function(n){return Ei(n)+"px"})]}))],tg=zr({fields:eg,name:"sliding",active:ng,apis:Zm,state:Object.freeze({init:function(n){var e=ao(n.expanded());return _r({isExpanded:function(){return!0===e.get()},isCollapsed:function(){return!1===e.get()},setCollapsed:l(e.set,!1),setExpanded:l(e.set,!0),readState:function(){return"expanded: "+e.get()}})}})}),rg=function(e,t){var r=yl(of.sketch({dom:{tag:"div",classes:[ai.resolve("dropup")]},components:[],containerBehaviours:jr([jl.config({}),tg.config({closedClass:ai.resolve("dropup-closed"),openClass:ai.resolve("dropup-open"),shrinkingClass:ai.resolve("dropup-shrinking"),growingClass:ai.resolve("dropup-growing"),dimension:{property:"height"},onShrunk:function(n){e(),t(),jl.set(n,[])},onGrown:function(n){e(),t()}}),ii(function(n,e){o(I)})])})),o=function(n){p.window.requestAnimationFrame(function(){n(),tg.shrink(r)})};return{appear:function(n,e,t){!0===tg.hasShrunk(r)&&!1===tg.isTransitioning(r)&&p.window.requestAnimationFrame(function(){e(t),jl.set(r,[n()]),tg.grow(r)})},disappear:o,component:A(r),element:r.element}},og=zn.detect().browser.isFirefox(),ig=Rt([Zt("triggerEvent"),Zt("broadcastEvent"),or("stopBackspace",!0)]),ug=function(e,n){var t,r,o,i,u=Ut("Getting GUI events settings",ig,n),c=zn.detect().deviceType.isTouch()?["touchstart","touchmove","touchend","gesturestart"]:["mousedown","mouseup","mouseover","mousemove","mouseout","click"],a=Ed(u),s=yn(c.concat(["selectstart","input","contextmenu","change","transitionend","drag","dragstart","dragend","dragenter","dragleave","dragover","drop"]),function(n){return wd(e,n,function(e){a.fireIfReady(e,n).each(function(n){n&&e.kill()}),u.triggerEvent(n,e)&&e.kill()})}),f=wd(e,"keydown",function(n){var e;u.triggerEvent("keydown",n)?n.kill():!0!==u.stopBackspace||8!==(e=n).raw().which||hn(["input","textarea"],me(e.target()))||n.prevent()}),l=(t=e,r=function(n){u.triggerEvent("focusin",n)&&n.kill()},og?xd(t,"focus",r):wd(t,"focusin",r)),d=(o=e,i=function(n){u.triggerEvent("focusout",n)&&n.kill(),p.setTimeout(function(){u.triggerEvent($n(),n)},0)},og?xd(o,"blur",i):wd(o,"focusout",i)),m=Ve(e),g=wd(m,"scroll",function(n){u.broadcastEvent(Jn(),n)&&n.kill()});return{unbind:function(){bn(s,function(n){n.unbind()}),f.unbind(),l.unbind(),d.unbind(),g.unbind()}}},cg=function(n,e){var t=ht(n,"target").map(function(n){return n()}).getOr(e);return ao(t)},ag=Ze([{stopped:[]},{resume:["element"]},{complete:[]}]),sg=function(n,r,e,t,o,i){var u,c,a,s,f=n(r,t),l=(u=e,c=o,a=ao(!1),s=ao(!1),{stop:function(){a.set(!0)},cut:function(){s.set(!0)},isStopped:a.get,isCut:s.get,event:A(u),setSource:c.set,getSource:c.get});return f.fold(function(){return i.logEventNoHandlers(r,t),ag.complete()},function(e){var t=e.descHandler();return Jf(t)(l),l.isStopped()?(i.logEventStopped(r,e.element(),t.purpose()),ag.stopped()):l.isCut()?(i.logEventCut(r,e.element(),t.purpose()),ag.complete()):Ne(e.element()).fold(function(){return i.logNoParent(r,e.element(),t.purpose()),ag.complete()},function(n){return i.logEventResponse(r,e.element(),t.purpose()),ag.resume(n)})})},fg=function(e,t,r,n,o,i){return sg(e,t,r,n,o,i).fold(function(){return!0},function(n){return fg(e,t,r,n,o,i)},function(){return!1})},lg=function(n,e,t){var r,o,i=(r=e,o=ao(!1),{stop:function(){o.set(!0)},cut:I,isStopped:o.get,isCut:A(!1),event:A(r),setSource:c("Cannot set source of a broadcasted event"),getSource:c("Cannot get source of a broadcasted event")});return bn(n,function(n){var e=n.descHandler();Jf(e)(i)}),i.isStopped()},dg=function(n,e,t,r,o){var i=cg(t,r);return fg(n,e,t,r,i,o)},mg=function(n,e,t){return lo(n,function(n){return e(n).isSome()},t).bind(e)},gg=we("element","descHandler"),pg=function(n,e){return{id:A(n),descHandler:A(e)}};function vg(){var i={};return{registerId:function(r,o,n){B(n,function(n,e){var t=i[e]!==undefined?i[e]:{};t[o]=Xf(n,r),i[e]=t})},unregisterId:function(t){B(i,function(n,e){n.hasOwnProperty(t)&&delete n[t]})},filterByType:function(n){return ht(i,n).map(function(n){return _(n,function(n,e){return pg(e,n)})}).getOr([])},find:function(n,e,t){var o=pt(e)(i);return mg(t,function(n){return t=o,Ea(r=n).fold(function(){return F.none()},function(n){var e=pt(n);return t.bind(e).map(function(n){return gg(r,n)})});var t,r},n)}}}function hg(){var r=vg(),o={},i=function(r){var n=r.element();return Ea(n).fold(function(){return n="uid-",e=r.element(),t=Gc(ka+n),Wr(e,Ca,t),t;var n,e,t},function(n){return n})},u=function(n){Ea(n.element()).each(function(n){o[n]=undefined,r.unregisterId(n)})};return{find:function(n,e,t){return r.find(n,e,t)},filter:function(n){return r.filterByType(n)},register:function(n){var e=i(n);xt(o,e)&&function(n,e){var t=o[e];if(t!==n)throw new Error('The tagId "'+e+'" is already used by: '+ko(t.element())+"\nCannot use it for: "+ko(n.element())+"\nThe conflicting element is"+(he(t.element())?" ":" not ")+"already in the DOM");u(n)}(n,e);var t=[n];r.registerId(t,e,n.events()),o[e]=n},unregister:u,getById:function(n){return pt(n)(o)}}}var yg=function(t){var r=function(e){return Ne(t.element()).fold(function(){return!0},function(n){return Re(e,n)})},o=hg(),s=function(n,e){return o.find(r,n,e)},n=ug(t.element(),{triggerEvent:function(u,c){return Fo(u,c.target(),function(n){return e=s,t=u,o=n,i=(r=c).target(),dg(e,t,r,i,o);var e,t,r,o,i})},broadcastEvent:function(n,e){var t=o.filter(n);return lg(t,e)}}),i=Wf({debugInfo:A("real"),triggerEvent:function(e,t,r){Fo(e,t,function(n){dg(s,e,r,t,n)})},triggerFocus:function(c,a){Ea(c).fold(function(){mo(c)},function(n){Fo(Pn(),c,function(n){var e,t,r,o,i,u;e=s,t=Pn(),r={originator:A(a),kill:I,prevent:I,target:A(c)},i=n,u=cg(r,o=c),sg(e,t,r,o,u,i)})})},triggerEscape:function(n,e){i.triggerEvent("keydown",n.element(),e.event())},getByUid:function(n){return m(n)},getByDom:function(n){return g(n)},build:yl,addToGui:function(n){c(n)},removeFromGui:function(n){a(n)},addToWorld:function(n){e(n)},removeFromWorld:function(n){u(n)},broadcast:function(n){l(n)},broadcastOn:function(n,e){d(n,e)},isConnected:A(!0)}),e=function(n){n.connect(i),ve(n.element())||(o.register(n),bn(n.components(),e),i.triggerEvent(Xn(),n.element(),{target:A(n.element())}))},u=function(n){ve(n.element())||(bn(n.components(),u),o.unregister(n)),n.disconnect()},c=function(n){Ge(t,n)},a=function(n){Ke(n)},f=function(t){var n=o.filter(Wn());bn(n,function(n){var e=n.descHandler();Jf(e)(t)})},l=function(n){f({universal:A(!0),data:A(n)})},d=function(n,e){f({universal:A(!1),channels:A(n),data:A(e)})},m=function(n){return o.getById(n).fold(function(){return Qe.error(new Error('Could not find component with uid: "'+n+'" in system.'))},Qe.value)},g=function(n){var e=Ea(n).getOr("not found");return m(e)};return e(t),{root:A(t),element:t.element,destroy:function(){n.unbind(),$e(t.element())},add:c,remove:a,getByUid:m,getByDom:g,addToWorld:e,removeFromWorld:u,broadcast:l,broadcastOn:d}},bg=A(ai.resolve("readonly-mode")),wg=A(ai.resolve("edit-mode"));function xg(n){var e=yl(of.sketch({dom:{classes:[ai.resolve("outer-container")].concat(n.classes)},containerBehaviours:jr([co.config({alpha:bg(),omega:wg()})])}));return yg(e)}var Tg,Sg,Og,kg,Cg=function(n,e){var t=ue.fromTag("input");hi(t,{opacity:"0",position:"absolute",top:"-1000px",left:"-1000px"}),ze(n,t),mo(t),e(t),$e(t)},Eg=function(n){var e=n.getSelection();if(0<e.rangeCount){var t=e.getRangeAt(0),r=n.document.createRange();r.setStart(t.startContainer,t.startOffset),r.setEnd(t.endContainer,t.endOffset),e.removeAllRanges(),e.addRange(r)}},Dg=function(n,e){po().each(function(n){Re(n,e)||go(n)}),n.focus(),mo(ue.fromDom(n.document.body)),Eg(n)},Ig={stubborn:function(n,e,t,r){var o=function(){Dg(e,r)},i=wd(t,"keydown",function(n){hn(["input","textarea"],me(n.target()))||o()});return{toReading:function(){Cg(n,go)},toEditing:o,onToolbarTouch:function(){},destroy:function(){i.unbind()}}},timid:function(n,e,t,r){var o=function(){go(r)};return{toReading:function(){o()},toEditing:function(){Dg(e,r)},onToolbarTouch:function(){o()},destroy:I}}},Ag=function(t,r,o,i,n){var u=function(){r.run(function(n){n.refreshSelection()})},e=function(n,e){var t=n-i.dom().scrollTop;r.run(function(n){n.scrollIntoView(t,t+e)})},c=function(){r.run(function(n){n.clearSelection()})},a=function(){t.getCursorBox().each(function(n){e(n.top(),n.height())}),r.run(function(n){n.syncHeight()})},s=Dd(t),f=Om(a,300),l=[t.onKeyup(function(){c(),f.throttle()}),t.onNodeChanged(u),t.onDomChanged(f.throttle),t.onDomChanged(u),t.onScrollToCursor(function(n){n.preventDefault(),f.throttle()}),t.onScrollToElement(function(n){n.element(),e(r,i)}),t.onToEditing(function(){r.run(function(n){n.toEditing()})}),t.onToReading(function(){r.run(function(n){n.toReading()})}),wd(t.doc(),"touchend",function(n){Re(t.html(),n.target())||Re(t.body(),n.target())}),wd(o,"transitionend",function(n){var e;"height"===n.raw().propertyName&&(e=Ei(o),r.run(function(n){n.setViewportOffset(e)}),u(),a())}),xd(o,"touchstart",function(n){var e;r.run(function(n){n.highlightSelection()}),e=n,r.run(function(n){n.onToolbarTouch(e)}),t.onTouchToolstrip()}),wd(t.body(),"touchstart",function(n){c(),t.onTouchContent(),s.fireTouchstart(n)}),s.onTouchmove(),s.onTouchend(),wd(t.body(),"click",function(n){n.kill()}),wd(o,"touchmove",function(){t.onToolbarScrollStart()})];return{destroy:function(){bn(l,function(n){n.unbind()})}}},Mg={},Fg={exports:Mg};Tg=undefined,Sg=Mg,Og=Fg,kg=undefined,function(n){"object"==typeof Sg&&void 0!==Og?Og.exports=n():"function"==typeof Tg&&Tg.amd?Tg([],n):("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).EphoxContactWrapper=n()}(function(){return function i(u,c,a){function s(e,n){if(!c[e]){if(!u[e]){var t="function"==typeof kg&&kg;if(!n&&t)return t(e,!0);if(f)return f(e,!0);var r=new Error("Cannot find module '"+e+"'");throw r.code="MODULE_NOT_FOUND",r}var o=c[e]={exports:{}};u[e][0].call(o.exports,function(n){return s(u[e][1][n]||n)},o,o.exports,i,u,c,a)}return c[e].exports}for(var f="function"==typeof kg&&kg,n=0;n<a.length;n++)s(a[n]);return s}({1:[function(n,e,t){var r,o,i=e.exports={};function u(){throw new Error("setTimeout has not been defined")}function c(){throw new Error("clearTimeout has not been defined")}function a(n){if(r===setTimeout)return setTimeout(n,0);if((r===u||!r)&&setTimeout)return r=setTimeout,setTimeout(n,0);try{return r(n,0)}catch(e){try{return r.call(null,n,0)}catch(e){return r.call(this,n,0)}}}!function(){try{r="function"==typeof setTimeout?setTimeout:u}catch(n){r=u}try{o="function"==typeof clearTimeout?clearTimeout:c}catch(n){o=c}}();var s,f=[],l=!1,d=-1;function m(){l&&s&&(l=!1,s.length?f=s.concat(f):d=-1,f.length&&g())}function g(){if(!l){var n=a(m);l=!0;for(var e=f.length;e;){for(s=f,f=[];++d<e;)s&&s[d].run();d=-1,e=f.length}s=null,l=!1,function(n){if(o===clearTimeout)return clearTimeout(n);if((o===c||!o)&&clearTimeout)return o=clearTimeout,clearTimeout(n);try{o(n)}catch(e){try{return o.call(null,n)}catch(e){return o.call(this,n)}}}(n)}}function p(n,e){this.fun=n,this.array=e}function v(){}i.nextTick=function(n){var e=new Array(arguments.length-1);if(1<arguments.length)for(var t=1;t<arguments.length;t++)e[t-1]=arguments[t];f.push(new p(n,e)),1!==f.length||l||a(g)},p.prototype.run=function(){this.fun.apply(null,this.array)},i.title="browser",i.browser=!0,i.env={},i.argv=[],i.version="",i.versions={},i.on=v,i.addListener=v,i.once=v,i.off=v,i.removeListener=v,i.removeAllListeners=v,i.emit=v,i.prependListener=v,i.prependOnceListener=v,i.listeners=function(n){return[]},i.binding=function(n){throw new Error("process.binding is not supported")},i.cwd=function(){return"/"},i.chdir=function(n){throw new Error("process.chdir is not supported")},i.umask=function(){return 0}},{}],2:[function(n,l,e){(function(t){!function(n){var e=setTimeout;function r(){}function u(n){if("object"!=typeof this)throw new TypeError("Promises must be constructed via new");if("function"!=typeof n)throw new TypeError("not a function");this._state=0,this._handled=!1,this._value=undefined,this._deferreds=[],f(n,this)}function o(r,o){for(;3===r._state;)r=r._value;0!==r._state?(r._handled=!0,u._immediateFn(function(){var n=1===r._state?o.onFulfilled:o.onRejected;if(null!==n){var e;try{e=n(r._value)}catch(t){return void c(o.promise,t)}i(o.promise,e)}else(1===r._state?i:c)(o.promise,r._value)})):r._deferreds.push(o)}function i(n,e){try{if(e===n)throw new TypeError("A promise cannot be resolved with itself.");if(e&&("object"==typeof e||"function"==typeof e)){var t=e.then;if(e instanceof u)return n._state=3,n._value=e,void a(n);if("function"==typeof t)return void f((r=t,o=e,function(){r.apply(o,arguments)}),n)}n._state=1,n._value=e,a(n)}catch(i){c(n,i)}var r,o}function c(n,e){n._state=2,n._value=e,a(n)}function a(n){2===n._state&&0===n._deferreds.length&&u._immediateFn(function(){n._handled||u._unhandledRejectionFn(n._value)});for(var e=0,t=n._deferreds.length;e<t;e++)o(n,n._deferreds[e]);n._deferreds=null}function s(n,e,t){this.onFulfilled="function"==typeof n?n:null,this.onRejected="function"==typeof e?e:null,this.promise=t}function f(n,e){var t=!1;try{n(function(n){t||(t=!0,i(e,n))},function(n){t||(t=!0,c(e,n))})}catch(r){if(t)return;t=!0,c(e,r)}}u.prototype["catch"]=function(n){return this.then(null,n)},u.prototype.then=function(n,e){var t=new this.constructor(r);return o(this,new s(n,e,t)),t},u.all=function(n){var a=Array.prototype.slice.call(n);return new u(function(o,i){if(0===a.length)return o([]);var u=a.length;function c(e,n){try{if(n&&("object"==typeof n||"function"==typeof n)){var t=n.then;if("function"==typeof t)return void t.call(n,function(n){c(e,n)},i)}a[e]=n,0==--u&&o(a)}catch(r){i(r)}}for(var n=0;n<a.length;n++)c(n,a[n])})},u.resolve=function(e){return e&&"object"==typeof e&&e.constructor===u?e:new u(function(n){n(e)})},u.reject=function(t){return new u(function(n,e){e(t)})},u.race=function(o){return new u(function(n,e){for(var t=0,r=o.length;t<r;t++)o[t].then(n,e)})},u._immediateFn="function"==typeof t?function(n){t(n)}:function(n){e(n,0)},u._unhandledRejectionFn=function(n){"undefined"!=typeof console&&console&&console.warn("Possible Unhandled Promise Rejection:",n)},u._setImmediateFn=function(n){u._immediateFn=n},u._setUnhandledRejectionFn=function(n){u._unhandledRejectionFn=n},void 0!==l&&l.exports?l.exports=u:n.Promise||(n.Promise=u)}(this)}).call(this,n("timers").setImmediate)},{timers:3}],3:[function(a,n,s){(function(n,e){var r=a("process/browser.js").nextTick,t=Function.prototype.apply,o=Array.prototype.slice,i={},u=0;function c(n,e){this._id=n,this._clearFn=e}s.setTimeout=function(){return new c(t.call(setTimeout,window,arguments),clearTimeout)},s.setInterval=function(){return new c(t.call(setInterval,window,arguments),clearInterval)},s.clearTimeout=s.clearInterval=function(n){n.close()},c.prototype.unref=c.prototype.ref=function(){},c.prototype.close=function(){this._clearFn.call(window,this._id)},s.enroll=function(n,e){clearTimeout(n._idleTimeoutId),n._idleTimeout=e},s.unenroll=function(n){clearTimeout(n._idleTimeoutId),n._idleTimeout=-1},s._unrefActive=s.active=function(n){clearTimeout(n._idleTimeoutId);var e=n._idleTimeout;0<=e&&(n._idleTimeoutId=setTimeout(function(){n._onTimeout&&n._onTimeout()},e))},s.setImmediate="function"==typeof n?n:function(n){var e=u++,t=!(arguments.length<2)&&o.call(arguments,1);return i[e]=!0,r(function(){i[e]&&(t?n.apply(null,t):n.call(null),s.clearImmediate(e))}),e},s.clearImmediate="function"==typeof e?e:function(n){delete i[n]}}).call(this,a("timers").setImmediate,a("timers").clearImmediate)},{"process/browser.js":1,timers:3}],4:[function(n,e,t){var r=n("promise-polyfill"),o="undefined"!=typeof window?window:Function("return this;")();e.exports={boltExport:o.Promise||r}},{"promise-polyfill":2}]},{},[4])(4)});var Rg=Fg.exports.boltExport,Bg=function(n){var t=F.none(),e=[],r=function(n){o()?u(n):e.push(n)},o=function(){return t.isSome()},i=function(n){bn(n,u)},u=function(e){t.each(function(n){p.setTimeout(function(){e(n)},0)})};return n(function(n){t=F.some(n),i(e),e=[]}),{get:r,map:function(t){return Bg(function(e){r(function(n){e(t(n))})})},isReady:o}},Vg={nu:Bg,pure:function(e){return Bg(function(n){n(e)})}},Ng=function(n){p.setTimeout(function(){throw n},0)},_g=function(t){var n=function(n){t().then(n,Ng)};return{map:function(n){return _g(function(){return t().then(n)})},bind:function(e){return _g(function(){return t().then(function(n){return e(n).toPromise()})})},anonBind:function(n){return _g(function(){return t().then(function(){return n.toPromise()})})},toLazy:function(){return Vg.nu(n)},toCached:function(){var n=null;return _g(function(){return null===n&&(n=t()),n})},toPromise:t,get:n}},jg=function(n){return _g(function(){return new Rg(n)})},Hg=function(n){return _g(function(){return Rg.resolve(n)})},zg=function(n,e,t){return Math.abs(n-e)<=t?F.none():n<e?F.some(n+t):F.some(n-t)},Lg=function(){var s=null;return{animate:function(r,o,n,i,e,t){var u=!1,c=function(n){u=!0,e(n)};clearInterval(s);var a=function(n){clearInterval(s),c(n)};s=setInterval(function(){var t=r();zg(t,o,n).fold(function(){clearInterval(s),c(o)},function(n){if(i(n,a),!u){var e=r();(e!==n||Math.abs(e-o)>Math.abs(t-o))&&(clearInterval(s),c(o))}})},t)}}},Pg=function(r,o){return function(n,e){for(var t=0;t<n.length;t++){var r=e(n[t],t);if(r.isSome())return r}return F.none()}([{width:320,height:480,keyboard:{portrait:300,landscape:240}},{width:320,height:568,keyboard:{portrait:300,landscape:240}},{width:375,height:667,keyboard:{portrait:305,landscape:240}},{width:414,height:736,keyboard:{portrait:320,landscape:240}},{width:768,height:1024,keyboard:{portrait:320,landscape:400}},{width:1024,height:1366,keyboard:{portrait:380,landscape:460}}],function(n){return e=r<=n.width&&o<=n.height,t=n.keyboard,e?F.some(t):F.none();var e,t}).getOr({portrait:o/5,landscape:r/4})},$g=function(n){var e,t=Sd(n).isPortrait(),r=Pg((e=n).screen.width,e.screen.height),o=t?r.portrait:r.landscape;return(t?n.screen.height:n.screen.width)-n.innerHeight>o?0:o},Wg=function(n,e){var t=Be(n).dom().defaultView;return Ei(n)+Ei(e)-$g(t)},Ug=Wg,Gg=function(n,e,t){var r=Wg(e,t),o=Ei(e)+Ei(t)-r;vi(n,"padding-bottom",o+"px")},qg=Ze([{fixed:["element","property","offsetY"]},{scroller:["element","offsetY"]}]),Yg="data-"+ai.resolve("position-y-fixed"),Kg="data-"+ai.resolve("y-property"),Xg="data-"+ai.resolve("scrolling"),Jg="data-"+ai.resolve("last-window-height"),Qg=function(n){return Md(n,Yg)},Zg=function(n,e){var t=Gr(n,Kg);return qg.fixed(n,t,e)},np=function(n,e){return qg.scroller(n,e)},ep=function(n){var e=Qg(n);return("true"===Gr(n,Xg)?np:Zg)(n,e)},tp=function(n,e,t){var r=Be(n).dom().defaultView.innerHeight;return Wr(n,Jg,r+"px"),r-e-t},rp=function(n){var e=Ai(n,"["+Yg+"]");return yn(e,ep)},op=function(r,o,i,u){var n,e,t,c,a,s,f,l,d=Be(r).dom().defaultView,m=(l=Gr(f=i,"style"),hi(f,{position:"absolute",top:"0px"}),Wr(f,Yg,"0px"),Wr(f,Kg,"top"),{restore:function(){Wr(f,"style",l||""),Yr(f,Yg),Yr(f,Kg)}}),g=Ei(i),p=Ei(u),v=(c=tp(r,t=g,p),s=Gr(a=r,"style"),nd.register(a),hi(a,{position:"absolute",height:c+"px",width:"100%",top:t+"px"}),Wr(a,Yg,t+"px"),Wr(a,Xg,"true"),Wr(a,Kg,"top"),{restore:function(){nd.deregister(a),Wr(a,"style",s||""),Yr(a,Yg),Yr(a,Xg),Yr(a,Kg)}}),h=(e=Gr(n=u,"style"),hi(n,{position:"absolute",bottom:"0px"}),Wr(n,Yg,"0px"),Wr(n,Kg,"bottom"),{restore:function(){Wr(n,"style",e||""),Yr(n,Yg),Yr(n,Kg)}}),y=!0,b=function(){var n=d.innerHeight;return Md(r,Jg)<n},w=function(){if(y){var n=Ei(i),e=Ei(u),t=tp(r,n,e);Wr(r,Yg,n+"px"),vi(r,"height",t+"px"),Gg(o,r,u)}};return Gg(o,r,u),{setViewportOffset:function(n){Wr(r,Yg,n+"px"),w()},isExpanding:b,isShrinking:x(b),refresh:w,restore:function(){y=!1,m.restore(),v.restore(),h.restore()}}},ip=Qg,up=Lg(),cp="data-"+ai.resolve("last-scroll-top"),ap=function(n){var e=wi(n,"top").getOr("0");return parseInt(e,10)},sp=function(n){return parseInt(n.dom().scrollTop,10)},fp=function(n,e){var t=e+ip(n)+"px";vi(n,"top",t)},lp=function(t,r,o){return jg(function(n){var e=l(sp,t);up.animate(e,r,15,function(n){t.dom().scrollTop=n,vi(t,"top",ap(t)+15+"px")},function(){t.dom().scrollTop=r,vi(t,"top",o+"px"),n(r)},10)})},dp=function(o,i){return jg(function(n){var e=l(sp,o);Wr(o,cp,e());var t=Math.abs(i-e()),r=Math.ceil(t/10);up.animate(e,i,r,function(n,e){Md(o,cp)!==o.dom().scrollTop?e(o.dom().scrollTop):(o.dom().scrollTop=n,Wr(o,cp,n))},function(){o.dom().scrollTop=i,Wr(o,cp,i),n(i)},10)})},mp=function(i,u){return jg(function(n){var e=l(ap,i),t=function(n){vi(i,"top",n+"px")},r=Math.abs(u-e()),o=Math.ceil(r/10);up.animate(e,u,o,t,function(){t(u),n(u)},10)})},gp=function(e,t,r){var o=Be(e).dom().defaultView;return jg(function(n){fp(e,r),fp(t,r),o.scrollTo(0,r),n(r)})},pp=function(n,e,t,r,o){var i=Ug(e,t),u=l(Eg,n);i<r||i<o?dp(e,e.dom().scrollTop-i+o).get(u):r<0&&dp(e,e.dom().scrollTop+r).get(u)},vp=function(u,n){return n(function(r){var o=[],i=0;0===u.length?r([]):bn(u,function(n,e){var t;n.get((t=e,function(n){o[t]=n,++i>=u.length&&r(o)}))})})},hp=function(n,a){return n.fold(function(n,e,t){return vi(n,e,a+(r=t)+"px"),Hg(r);var r},function(n,e){return o=a+(r=e),i=wi(t=n,"top").getOr(r),u=o-parseInt(i,10),c=t.dom().scrollTop+u,lp(t,c,o);var t,r,o,i,u,c})},yp=function(n,e){var t=rp(n),r=yn(t,function(n){return hp(n,e)});return vp(r,jg)},bp=function(e,t,n,r,o,i){var u,c,a=(u=function(n){return gp(e,t,n)},c=ao(Vg.pure({})),{start:function(e){var n=Vg.nu(function(n){return u(e).get(n)});c.set(n)},idle:function(n){c.get().get(function(){n()})}}),s=Om(function(){a.idle(function(){yp(n,r.pageYOffset).get(function(){var n;(n=nm(i),F.from(n[0]).bind(function(n){var e=n.top()-t.dom().scrollTop;return e>r.innerHeight+5||e<-5?F.some({top:A(e),bottom:A(e+n.height())}):F.none()})).each(function(n){t.dom().scrollTop=t.dom().scrollTop+n.top()}),a.start(0),o.refresh()})})},1e3),f=wd(ue.fromDom(r),"scroll",function(){r.pageYOffset<0||s.throttle()});return yp(n,r.pageYOffset).get(h),{unbind:f.unbind}},wp=function(n){var t=n.cWin(),e=n.ceBody(),r=n.socket(),o=n.toolstrip(),i=n.toolbar(),u=n.contentElement(),c=n.keyboardType(),a=n.outerWindow(),s=n.dropup(),f=op(r,e,o,s),l=c(n.outerBody(),t,ye(),u,o,i),d=Od(a,{onChange:I,onReady:f.refresh});d.onAdjustment(function(){f.refresh()});var m=wd(ue.fromDom(a),"resize",function(){f.isExpanding()&&f.refresh()}),g=bp(o,r,n.outerBody(),a,f,t),p=function(t,e){var n=t.document,r=ue.fromTag("div");no(r,ai.resolve("unfocused-selections")),ze(ue.fromDom(n.documentElement),r);var o=wd(r,"touchstart",function(n){n.prevent(),Dg(t,e),u()}),i=function(n){var e=ue.fromTag("span");return il(e,[ai.resolve("layer-editor"),ai.resolve("unfocused-selection")]),hi(e,{left:n.left()+"px",top:n.top()+"px",width:n.width()+"px",height:n.height()+"px"}),e},u=function(){Pe(r)};return{update:function(){u();var n=nm(t),e=yn(n,i);Le(r,e)},isActive:function(){return 0<_e(r).length},destroy:function(){o.unbind(),$e(r)},clear:u}}(t,u),v=function(){p.clear()};return{toEditing:function(){l.toEditing(),v()},toReading:function(){l.toReading()},onToolbarTouch:function(n){l.onToolbarTouch(n)},refreshSelection:function(){p.isActive()&&p.update()},clearSelection:v,highlightSelection:function(){p.update()},scrollIntoView:function(n,e){pp(t,r,s,n,e)},updateToolbarPadding:I,setViewportOffset:function(n){f.setViewportOffset(n),mp(r,n).get(h)},syncHeight:function(){vi(u,"height",u.dom().contentWindow.document.body.scrollHeight+"px")},refreshStructure:f.refresh,destroy:function(){f.restore(),d.destroy(),g.unbind(),m.unbind(),l.destroy(),p.destroy(),Cg(ye(),go)}}},xp=function(r,n){var o=Tm(),i=Bf(),u=Bf(),c=Rf(),a=Rf();return{enter:function(){n.hide();var t=ue.fromDom(p.document);pm.getActiveApi(r.editor).each(function(n){i.set({socketHeight:wi(r.socket,"height"),iframeHeight:wi(n.frame(),"height"),outerScroll:p.document.body.scrollTop}),u.set({exclusives:Nm.exclusive(t,"."+nd.scrollable())}),no(r.container,ai.resolve("fullscreen-maximized")),wm(r.container,n.body()),o.maximize(),vi(r.socket,"overflow","scroll"),vi(r.socket,"-webkit-overflow-scrolling","touch"),mo(n.body());var e=Ce(["cWin","ceBody","socket","toolstrip","toolbar","dropup","contentElement","cursor","keyboardType","isScrolling","outerWindow","outerBody"],[]);c.set(wp(e({cWin:n.win(),ceBody:n.body(),socket:r.socket,toolstrip:r.toolstrip,toolbar:r.toolbar,dropup:r.dropup.element(),contentElement:n.frame(),cursor:I,outerBody:r.body,outerWindow:r.win,keyboardType:Ig.stubborn,isScrolling:function(){return u.get().exists(function(n){return n.socket.isScrolling()})}}))),c.run(function(n){n.syncHeight()}),a.set(Ag(n,c,r.toolstrip,r.socket,r.dropup))})},refreshStructure:function(){c.run(function(n){n.refreshStructure()})},exit:function(){o.restore(),a.clear(),c.clear(),n.show(),i.on(function(n){n.socketHeight.each(function(n){vi(r.socket,"height",n)}),n.iframeHeight.each(function(n){vi(r.editor.getFrame(),"height",n)}),p.document.body.scrollTop=n.scrollTop}),i.clear(),u.on(function(n){n.exclusives.unbind()}),u.clear(),eo(r.container,ai.resolve("fullscreen-maximized")),xm(),nd.deregister(r.toolbar),xi(r.socket,"overflow"),xi(r.socket,"-webkit-overflow-scrolling"),go(r.editor.getFrame()),pm.getActiveApi(r.editor).each(function(n){n.clearSelection()})}}},Tp=function(n){var e=Ut("Getting IosWebapp schema",Cm,n);vi(e.toolstrip,"width","100%"),vi(e.container,"position","relative");var t=yl(km(function(){e.setReadOnly(e.readOnlyOnInit()),r.enter()},e.translate));e.alloy.add(t);var r=xp(e,{show:function(){e.alloy.add(t)},hide:function(){e.alloy.remove(t)}});return{setReadOnly:e.setReadOnly,refreshStructure:r.refreshStructure,enter:r.enter,exit:r.exit,destroy:I}},Sp=tinymce.util.Tools.resolve("tinymce.EditorManager"),Op=function(n){var e=ht(n.settings,"skin_url").fold(function(){return Sp.baseURL+"/skins/lightgray"},function(n){return n});return{content:e+"/content.mobile.min.css",ui:e+"/skin.mobile.min.css"}},kp=function(n,e,t){n.system().broadcastOn([wo.formatChanged()],{command:e,state:t})},Cp=function(r,n){var e=R(n.formatter.get());bn(e,function(e){n.formatter.formatChanged(e,function(n){kp(r,e,n)})}),bn(["ul","ol"],function(t){n.selection.selectorChanged(t,function(n,e){kp(r,t,n)})})},Ep=(A(["x-small","small","medium","large","x-large"]),function(n){var e=function(){n._skinLoaded=!0,n.fire("SkinLoaded")};return function(){n.initialized?e():n.on("init",e)}}),Dp=A("toReading"),Ip=A("toEditing");yo.add("mobile",function(D){return{getNotificationManagerImpl:function(){return{open:A({progressBar:{value:I},close:I}),close:I,reposition:I,getArgs:h}},renderUI:function(n){var e=Op(D);0==(!1===D.settings.skin)?(D.contentCSS.push(e.content),ho.DOM.styleSheetLoader.load(e.ui,Ep(D))):Ep(D)();var t,r,o,i,u,c,a,s,f,l,d,m,g,p,v,h,y,b=function(){D.fire("scrollIntoView")},w=ue.fromTag("div"),x=zn.detect().os.isAndroid()?(s=b,f=xg({classes:[ai.resolve("android-container")]}),l=_m(),d=Rf(),m=zm(d),g=Lm(),p=rg(I,s),f.add(l.wrapper()),f.add(g),f.add(p.component()),{system:A(f),element:f.element,init:function(n){d.set(Em(n))},exit:function(){d.run(function(n){n.exit(),jl.remove(g,m)})},setToolbarGroups:function(n){var e=l.createGroups(n);l.setGroups(e)},setContextToolbar:function(n){var e=l.createGroups(n);l.setContextToolbar(e)},focusToolbar:function(){l.focus()},restoreToolbar:function(){l.restoreToolbar()},updateMode:function(n){Pm(g,m,n,f.root())},socket:A(g),dropup:A(p)}):(t=b,r=xg({classes:[ai.resolve("ios-container")]}),o=_m(),i=Rf(),u=zm(i),c=Lm(),a=rg(function(){i.run(function(n){n.refreshStructure()})},t),r.add(o.wrapper()),r.add(c),r.add(a.component()),{system:A(r),element:r.element,init:function(n){i.set(Tp(n))},exit:function(){i.run(function(n){jl.remove(c,u),n.exit()})},setToolbarGroups:function(n){var e=o.createGroups(n);o.setGroups(e)},setContextToolbar:function(n){var e=o.createGroups(n);o.setContextToolbar(e)},focusToolbar:function(){o.focus()},restoreToolbar:function(){o.restoreToolbar()},updateMode:function(n){Pm(c,u,n,r.root())},socket:A(c),dropup:A(a)}),T=ue.fromDom(n.targetNode);we("element","offset"),h=w,(y=v=T,F.from(y.dom().nextSibling).map(ue.fromDom)).fold(function(){Ne(v).each(function(n){ze(n,h)})},function(n){var e,t;t=h,Ne(e=n).each(function(n){n.dom().insertBefore(t.dom(),e.dom())})}),function(n,e){ze(n,e.element());var t=_e(e.element());bn(t,function(n){e.getByDom(n).each(Ue)})}(w,x.system());var S=n.targetNode.ownerDocument.defaultView,O=Od(S,{onChange:function(){x.system().broadcastOn([wo.orientationChanged()],{width:kd(S)})},onReady:I}),k=function(n,e,t,r){!1===r&&D.selection.collapse();var o=C(n,e,t);x.setToolbarGroups(!0===r?o.readOnly:o.main),D.setMode(!0===r?"readonly":"design"),D.fire(!0===r?Dp():Ip()),x.updateMode(r)},C=function(n,e,t){var r=n.get();return{readOnly:r.backToMask.concat(e.get()),main:r.backToMask.concat(t.get())}},E=function(n,e){return D.on(n,e),{unbind:function(){D.off(n)}}};return D.on("init",function(){x.init({editor:{getFrame:function(){return ue.fromDom(D.contentAreaContainer.querySelector("iframe"))},onDomChanged:function(){return{unbind:I}},onToReading:function(n){return E(Dp(),n)},onToEditing:function(n){return E(Ip(),n)},onScrollToCursor:function(e){return D.on("scrollIntoView",function(n){e(n)}),{unbind:function(){D.off("scrollIntoView"),O.destroy()}}},onTouchToolstrip:function(){t()},onTouchContent:function(){var n,e=ue.fromDom(D.editorContainer.querySelector("."+ai.resolve("toolbar")));(n=e,vo(n).bind(function(n){return x.system().getByDom(n).toOption()})).each(te),x.restoreToolbar(),t()},onTapContent:function(n){var e=n.target();"img"===me(e)?(D.selection.select(e.dom()),n.kill()):"a"===me(e)&&x.system().getByDom(ue.fromDom(D.editorContainer)).each(function(n){co.isAlpha(n)&&bo(e.dom())})}},container:ue.fromDom(D.editorContainer),socket:ue.fromDom(D.contentAreaContainer),toolstrip:ue.fromDom(D.editorContainer.querySelector("."+ai.resolve("toolstrip"))),toolbar:ue.fromDom(D.editorContainer.querySelector("."+ai.resolve("toolbar"))),dropup:x.dropup(),alloy:x.system(),translate:I,setReadOnly:function(n){k(a,c,u,n)},readOnlyOnInit:function(){return!1}});var t=function(){x.dropup().disappear(function(){x.system().broadcastOn([wo.dropupDismissed()],{})})},n={label:"The first group",scrollable:!1,items:[$a.forToolbar("back",function(){D.selection.collapse(),x.exit()},{})]},e={label:"Back to read only",scrollable:!1,items:[$a.forToolbar("readonly-back",function(){k(a,c,u,!0)},{})]},r=gd(x,D),o=pd(D.settings,r),i={label:"The extra group",scrollable:!1,items:[]},u=ao([{label:"the action group",scrollable:!0,items:o},i]),c=ao([{label:"The read only mode group",scrollable:!0,items:[]},i]),a=ao({backToMask:[n],backToReadOnly:[e]});Cp(x,D)}),D.on("remove",function(){x.exit()}),D.on("detach",function(){var e,n;e=x.system(),n=_e(e.element()),bn(n,function(n){e.getByDom(n).each(We)}),$e(e.element()),x.system().destroy(),$e(w)}),{iframeContainer:x.socket().element().dom(),editorContainer:x.element().dom()}}}})}(window);
\ No newline at end of file
diff --git a/lib/web/tiny_mce_4/themes/modern/theme.min.js b/lib/web/tiny_mce_4/themes/modern/theme.min.js
index 7fcbe50b5fa15..0f406aa671c82 100644
--- a/lib/web/tiny_mce_4/themes/modern/theme.min.js
+++ b/lib/web/tiny_mce_4/themes/modern/theme.min.js
@@ -1 +1 @@
-!function(_){"use strict";var e,t,n,i,r,o=tinymce.util.Tools.resolve("tinymce.ThemeManager"),h=tinymce.util.Tools.resolve("tinymce.EditorManager"),w=tinymce.util.Tools.resolve("tinymce.util.Tools"),d=function(e){return!1!==c(e)},c=function(e){return e.getParam("menubar")},f=function(e){return e.getParam("toolbar_items_size")},m=function(e){return e.getParam("menu")},g=function(e){return!1===e.settings.skin},p=function(e){var t=e.getParam("resize","vertical");return!1===t?"none":"both"===t?"both":"vertical"},v=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),b=tinymce.util.Tools.resolve("tinymce.ui.Factory"),y=tinymce.util.Tools.resolve("tinymce.util.I18n"),s=function(e){return e.fire("SkinLoaded")},x=function(e){return e.fire("ResizeEditor")},R=function(e){return e.fire("BeforeRenderUI")},a=function(t,n){return function(){var e=t.find(n)[0];e&&e.focus(!0)}},C=function(e,t){e.shortcuts.add("Alt+F9","",a(t,"menubar")),e.shortcuts.add("Alt+F10,F10","",a(t,"toolbar")),e.shortcuts.add("Alt+F11","",a(t,"elementpath")),t.on("cancel",function(){e.focus()})},E=tinymce.util.Tools.resolve("tinymce.geom.Rect"),u=tinymce.util.Tools.resolve("tinymce.util.Delay"),k=function(){},H=function(e){return function(){return e}},l=H(!1),S=H(!0),T=l,M=S,N=function(){return P},P=(i={fold:function(e,t){return e()},is:T,isSome:T,isNone:M,getOr:n=function(e){return e},getOrThunk:t=function(e){return e()},getOrDie:function(e){throw new Error(e||"error: getOrDie called on none.")},getOrNull:function(){return null},getOrUndefined:function(){return undefined},or:n,orThunk:t,map:N,ap:N,each:function(){},bind:N,flatten:N,exists:T,forall:M,filter:N,equals:e=function(e){return e.isNone()},equals_:e,toArray:function(){return[]},toString:H("none()")},Object.freeze&&Object.freeze(i),i),W=function(n){var e=function(){return n},t=function(){return r},i=function(e){return e(n)},r={fold:function(e,t){return t(n)},is:function(e){return n===e},isSome:M,isNone:T,getOr:e,getOrThunk:e,getOrDie:e,getOrNull:e,getOrUndefined:e,or:t,orThunk:t,map:function(e){return W(e(n))},ap:function(e){return e.fold(N,function(e){return W(e(n))})},each:function(e){e(n)},bind:i,flatten:e,exists:i,forall:i,filter:function(e){return e(n)?r:P},equals:function(e){return e.is(n)},equals_:function(e,t){return e.fold(T,function(e){return t(n,e)})},toArray:function(){return[n]},toString:function(){return"some("+n+")"}};return r},D={some:W,none:N,from:function(e){return null===e||e===undefined?P:W(e)}},O=function(e){return e?e.getRoot().uiContainer:null},A={getUiContainerDelta:function(e){var t=O(e);if(t&&"static"!==v.DOM.getStyle(t,"position",!0)){var n=v.DOM.getPos(t),i=t.scrollLeft-n.x,r=t.scrollTop-n.y;return D.some({x:i,y:r})}return D.none()},setUiContainer:function(e,t){var n=v.DOM.select(e.settings.ui_container)[0];t.getRoot().uiContainer=n},getUiContainer:O,inheritUiContainer:function(e,t){return t.uiContainer=O(e)}},B=function(i,e,r){var o,s=[];if(e)return w.each(e.split(/[ ,]/),function(t){var e,n=function(){var e=i.selection;t.settings.stateSelector&&e.selectorChanged(t.settings.stateSelector,function(e){t.active(e)},!0),t.settings.disabledStateSelector&&e.selectorChanged(t.settings.disabledStateSelector,function(e){t.disabled(e)})};"|"===t?o=null:(o||(o={type:"buttongroup",items:[]},s.push(o)),i.buttons[t]&&(e=t,"function"==typeof(t=i.buttons[e])&&(t=t()),t.type=t.type||"button",t.size=r,t=b.create(t),o.items.push(t),i.initialized?n():i.on("init",n)))}),{type:"toolbar",layout:"flow",items:s}},L=B,z=function(n,i){var e,t,r=[];if(w.each(!1===(t=(e=n).getParam("toolbar"))?[]:w.isArray(t)?w.grep(t,function(e){return 0<e.length}):function(e,t){for(var n=[],i=1;i<10;i++){var r=e["toolbar"+i];if(!r)break;n.push(r)}var o=e.toolbar?[e.toolbar]:[t];return 0<n.length?n:o}(e.settings,"undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image"),function(e){var t;(t=e)&&r.push(B(n,t,i))}),r.length)return{type:"panel",layout:"stack",classes:"toolbar-grp",ariaRoot:!0,ariaRemember:!0,items:r}},I=v.DOM,F=function(e){return{left:e.x,top:e.y,width:e.w,height:e.h,right:e.x+e.w,bottom:e.y+e.h}},U=function(e,t){e.moveTo(t.left,t.top)},V=function(e,t,n,i,r,o){return o=F({x:t,y:n,w:o.w,h:o.h}),e&&(o=e({elementRect:F(i),contentAreaRect:F(r),panelRect:o})),o},Y=function(x){var i,o=function(){return x.contextToolbars||[]},n=function(e,t){var n,i,r,o,s,a,l,u=x.getParam("inline_toolbar_position_handler");if(!x.removed){if(!e||!e.toolbar.panel)return c=x,void w.each(c.contextToolbars,function(e){e.panel&&e.panel.hide()});var c,d,f,h,m;l=["bc-tc","tc-bc","tl-bl","bl-tl","tr-br","br-tr"],s=e.toolbar.panel,t&&s.show(),d=e.element,f=I.getPos(x.getContentAreaContainer()),h=x.dom.getRect(d),"BODY"===(m=x.dom.getRoot()).nodeName&&(h.x-=m.ownerDocument.documentElement.scrollLeft||m.scrollLeft,h.y-=m.ownerDocument.documentElement.scrollTop||m.scrollTop),h.x+=f.x,h.y+=f.y,r=h,i=I.getRect(s.getEl()),o=I.getRect(x.getContentAreaContainer()||x.getBody());var g,p,v,b=A.getUiContainerDelta(s).getOr({x:0,y:0});if(r.x+=b.x,r.y+=b.y,i.x+=b.x,i.y+=b.y,o.x+=b.x,o.y+=b.y,"inline"!==I.getStyle(e.element,"display",!0)){var y=e.element.getBoundingClientRect();r.w=y.width,r.h=y.height}x.inline||(o.w=x.getDoc().documentElement.offsetWidth),x.selection.controlSelection.isResizable(e.element)&&r.w<25&&(r=E.inflate(r,0,8)),n=E.findBestRelativePosition(i,r,o,l),r=E.clamp(r,o),n?(a=E.relativePosition(i,r,n),U(s,V(u,a.x,a.y,r,o,i))):(o.h+=i.h,(r=E.intersect(o,r))?(n=E.findBestRelativePosition(i,r,o,["bc-tc","bl-tl","br-tr"]))?(a=E.relativePosition(i,r,n),U(s,V(u,a.x,a.y,r,o,i))):U(s,V(u,r.x,r.y,r,o,i)):s.hide()),g=s,v=function(e,t){return e===t},p=(p=n)?p.substr(0,2):"",w.each({t:"down",b:"up"},function(e,t){g.classes.toggle("arrow-"+e,v(t,p.substr(0,1)))}),w.each({l:"left",r:"right"},function(e,t){g.classes.toggle("arrow-"+e,v(t,p.substr(1,1)))})}},r=function(e){return function(){u.requestAnimationFrame(function(){x.selection&&n(a(x.selection.getNode()),e)})}},t=function(e){var t;if(e.toolbar.panel)return e.toolbar.panel.show(),void n(e);t=b.create({type:"floatpanel",role:"dialog",classes:"tinymce tinymce-inline arrow",ariaLabel:"Inline toolbar",layout:"flex",direction:"column",align:"stretch",autohide:!1,autofix:!0,fixed:!0,border:1,items:L(x,e.toolbar.items),oncancel:function(){x.focus()}}),A.setUiContainer(x,t),function(e){if(!i){var t=r(!0),n=A.getUiContainer(e);i=x.selection.getScrollContainer()||x.getWin(),I.bind(i,"scroll",t),I.bind(n,"scroll",t),x.on("remove",function(){I.unbind(i,"scroll",t),I.unbind(n,"scroll",t)})}}(t),(e.toolbar.panel=t).renderTo().reflow(),n(e)},s=function(){w.each(o(),function(e){e.panel&&e.panel.hide()})},a=function(e){var t,n,i,r=o();for(t=(i=x.$(e).parents().add(e)).length-1;0<=t;t--)for(n=r.length-1;0<=n;n--)if(r[n].predicate(i[t]))return{toolbar:r[n],element:i[t]};return null};x.on("click keyup setContent ObjectResized",function(e){("setcontent"!==e.type||e.selection)&&u.setEditorTimeout(x,function(){var e;(e=a(x.selection.getNode()))?(s(),t(e)):s()})}),x.on("blur hide contextmenu",s),x.on("ObjectResizeStart",function(){var e=a(x.selection.getNode());e&&e.toolbar.panel&&e.toolbar.panel.hide()}),x.on("ResizeEditor ResizeWindow",r(!0)),x.on("nodeChange",r(!1)),x.on("remove",function(){w.each(o(),function(e){e.panel&&e.panel.remove()}),x.contextToolbars={}}),x.shortcuts.add("ctrl+F9","",function(){var e=a(x.selection.getNode());e&&e.toolbar.panel&&e.toolbar.panel.items()[0].focus()})},$=function(t){return function(e){return function(e){if(null===e)return"null";var t=typeof e;return"object"===t&&(Array.prototype.isPrototypeOf(e)||e.constructor&&"Array"===e.constructor.name)?"array":"object"===t&&(String.prototype.isPrototypeOf(e)||e.constructor&&"String"===e.constructor.name)?"string":t}(e)===t}},q=$("function"),X=$("number"),j=(Array.prototype.slice,(r=Array.prototype.indexOf)===undefined?function(e,t){return ee(e,t)}:function(e,t){return r.call(e,t)}),J=function(e,t){return Q(e,t).isSome()},G=function(e,t){for(var n=e.length,i=new Array(n),r=0;r<n;r++){var o=e[r];i[r]=t(o,r,e)}return i},K=function(e,t){for(var n=0,i=e.length;n<i;n++)t(e[n],n,e)},Z=function(e,t){for(var n=[],i=0,r=e.length;i<r;i++){var o=e[i];t(o,i,e)&&n.push(o)}return n},Q=function(e,t){for(var n=0,i=e.length;n<i;n++)if(t(e[n],n,e))return D.some(n);return D.none()},ee=function(e,t){for(var n=0,i=e.length;n<i;++n)if(e[n]===t)return n;return-1},te=Array.prototype.push,ne=(q(Array.from)&&Array.from,{file:{title:"File",items:"newdocument restoredraft | preview | print"},edit:{title:"Edit",items:"undo redo | cut copy paste pastetext | selectall"},view:{title:"View",items:"code | visualaid visualchars visualblocks | spellchecker | preview fullscreen"},insert:{title:"Insert",items:"image link media template codesample inserttable | charmap hr | pagebreak nonbreaking anchor toc | insertdatetime"},format:{title:"Format",items:"bold italic underline strikethrough superscript subscript codeformat | blockformats align | removeformat"},tools:{title:"Tools",items:"spellchecker spellcheckerlanguage | a11ycheck code"},table:{title:"Table"},help:{title:"Help"}}),ie=function(e,t){return"|"===e?{name:"|",item:{text:"|"}}:t?{name:e,item:t}:null},re=function(e){return e&&"|"===e.item.text},oe=function(n,e,t,i){var r,o,s,a,l,u,c;return e?(o=e[i],a=!0):o=ne[i],o&&(r={text:o.title},s=[],w.each((o.items||"").split(/[ ,]/),function(e){var t=ie(e,n[e]);t&&s.push(t)}),a||w.each(n,function(e,t){var n;e.context!==i||(n=t,Q(s,function(e){return e.name===n}).isSome())||("before"===e.separator&&s.push({name:"|",item:{text:"|"}}),e.prependToContext?s.unshift(ie(t,e)):s.push(ie(t,e)),"after"===e.separator&&s.push({name:"|",item:{text:"|"}}))}),r.menu=G((l=t,u=Z(s,function(e){return!1===l.hasOwnProperty(e.name)}),c=Z(u,function(e,t,n){return!re(e)||!re(n[t-1])}),Z(c,function(e,t,n){return!re(e)||0<t&&t<n.length-1})),function(e){return e.item}),!r.menu.length)?null:r},se=function(e){for(var t,n=[],i=function(e){var t,n=[],i=m(e);if(i)for(t in i)n.push(t);else for(t in ne)n.push(t);return n}(e),r=w.makeMap((t=e,t.getParam("removed_menuitems","")).split(/[ ,]/)),o=c(e),s="string"==typeof o?o.split(/[ ,]/):i,a=0;a<s.length;a++){var l=s[a],u=oe(e.menuItems,m(e),r,l);u&&n.push(u)}return n},ae=v.DOM,le=function(e){return{width:e.clientWidth,height:e.clientHeight}},ue=function(e,t,n){var i,r,o,s;i=e.getContainer(),r=e.getContentAreaContainer().firstChild,o=le(i),s=le(r),null!==t&&(t=Math.max(e.getParam("min_width",100,"number"),t),t=Math.min(e.getParam("max_width",65535,"number"),t),ae.setStyle(i,"width",t+(o.width-s.width)),ae.setStyle(r,"width",t)),n=Math.max(e.getParam("min_height",100,"number"),n),n=Math.min(e.getParam("max_height",65535,"number"),n),ae.setStyle(r,"height",n),x(e)},ce=ue,de=function(e,t,n){var i=e.getContentAreaContainer();ue(e,i.clientWidth+t,i.clientHeight+n)},fe=tinymce.util.Tools.resolve("tinymce.Env"),he=function(e,t,n){var i,r=e.settings[n];r&&r((i=t.getEl("body"),{element:function(){return i}}))},me=function(c,d,f){return function(e){var t,n,i,r,o,s=e.control,a=s.parents().filter("panel")[0],l=a.find("#"+d)[0],u=(t=f,n=d,w.grep(t,function(e){return e.name===n})[0]);i=d,r=a,o=f,w.each(o,function(e){var t=r.items().filter("#"+e.name)[0];t&&t.visible()&&e.name!==i&&(he(e,t,"onhide"),t.visible(!1))}),s.parent().items().each(function(e){e.active(!1)}),l&&l.visible()?(he(u,l,"onhide"),l.hide(),s.active(!1)):(l?l.show():(l=b.create({type:"container",name:d,layout:"stack",classes:"sidebar-panel",html:""}),a.prepend(l),he(u,l,"onrender")),he(u,l,"onshow"),s.active(!0)),x(c)}},ge=function(e){return!(fe.ie&&!(11<=fe.ie)||!e.sidebars)&&0<e.sidebars.length},pe=function(n){return{type:"panel",name:"sidebar",layout:"stack",classes:"sidebar",items:[{type:"toolbar",layout:"stack",classes:"sidebar-toolbar",items:w.map(n.sidebars,function(e){var t=e.settings;return{type:"button",icon:t.icon,image:t.image,tooltip:t.tooltip,onclick:me(n,e.name,n.sidebars)}})}]}},ve=function(e){var t=function(){e._skinLoaded=!0,s(e)};return function(){e.initialized?t():e.on("init",t)}},be=v.DOM,ye=function(e){return{type:"panel",name:"iframe",layout:"stack",classes:"edit-area",border:e,html:""}},xe=function(t,e,n){var i,r,o,s,a;if(!1===g(t)&&n.skinUiCss?be.styleSheetLoader.load(n.skinUiCss,ve(t)):ve(t)(),i=e.panel=b.create({type:"panel",role:"application",classes:"tinymce",style:"visibility: hidden",layout:"stack",border:1,items:[{type:"container",classes:"top-part",items:[!1===d(t)?null:{type:"menubar",border:"0 0 1 0",items:se(t)},z(t,f(t))]},ge(t)?(s=t,{type:"panel",layout:"stack",classes:"edit-aria-container",border:"1 0 0 0",items:[ye("0"),pe(s)]}):ye("1 0 0 0")]}),A.setUiContainer(t,i),"none"!==p(t)&&(r={type:"resizehandle",direction:p(t),onResizeStart:function(){var e=t.getContentAreaContainer().firstChild;o={width:e.clientWidth,height:e.clientHeight}},onResize:function(e){"both"===p(t)?ce(t,o.width+e.deltaX,o.height+e.deltaY):ce(t,null,o.height+e.deltaY)}}),t.getParam("statusbar",!0,"boolean")){var l=y.translate(["Powered by {0}",'<a href="https://www.tiny.cloud/?utm_campaign=editor_referral&amp;utm_medium=poweredby&amp;utm_source=tinymce" rel="noopener" target="_blank" role="presentation" tabindex="-1">Tiny</a>']),u=t.getParam("branding",!0,"boolean")?{type:"label",classes:"branding",html:" "+l}:null;i.add({type:"panel",name:"statusbar",classes:"statusbar",layout:"flow",border:"1 0 0 0",ariaRoot:!0,items:[{type:"elementpath",editor:t},r,u]})}return R(t),t.on("SwitchMode",(a=i,function(e){a.find("*").disabled("readonly"===e.mode)})),i.renderBefore(n.targetNode).reflow(),t.getParam("readonly",!1,"boolean")&&t.setMode("readonly"),n.width&&be.setStyle(i.getEl(),"width",n.width),t.on("remove",function(){i.remove(),i=null}),C(t,i),Y(t),{iframeContainer:i.find("#iframe")[0].getEl(),editorContainer:i.getEl()}},we=tinymce.util.Tools.resolve("tinymce.dom.DomQuery"),_e=0,Re={id:function(){return"mceu_"+_e++},create:function(e,t,n){var i=_.document.createElement(e);return v.DOM.setAttribs(i,t),"string"==typeof n?i.innerHTML=n:w.each(n,function(e){e.nodeType&&i.appendChild(e)}),i},createFragment:function(e){return v.DOM.createFragment(e)},getWindowSize:function(){return v.DOM.getViewPort()},getSize:function(e){var t,n;if(e.getBoundingClientRect){var i=e.getBoundingClientRect();t=Math.max(i.width||i.right-i.left,e.offsetWidth),n=Math.max(i.height||i.bottom-i.bottom,e.offsetHeight)}else t=e.offsetWidth,n=e.offsetHeight;return{width:t,height:n}},getPos:function(e,t){return v.DOM.getPos(e,t||Re.getContainer())},getContainer:function(){return fe.container?fe.container:_.document.body},getViewPort:function(e){return v.DOM.getViewPort(e)},get:function(e){return _.document.getElementById(e)},addClass:function(e,t){return v.DOM.addClass(e,t)},removeClass:function(e,t){return v.DOM.removeClass(e,t)},hasClass:function(e,t){return v.DOM.hasClass(e,t)},toggleClass:function(e,t,n){return v.DOM.toggleClass(e,t,n)},css:function(e,t,n){return v.DOM.setStyle(e,t,n)},getRuntimeStyle:function(e,t){return v.DOM.getStyle(e,t,!0)},on:function(e,t,n,i){return v.DOM.bind(e,t,n,i)},off:function(e,t,n){return v.DOM.unbind(e,t,n)},fire:function(e,t,n){return v.DOM.fire(e,t,n)},innerHtml:function(e,t){v.DOM.setHTML(e,t)}},Ce=function(e){return"static"===Re.getRuntimeStyle(e,"position")},Ee=function(e){return e.state.get("fixed")};function ke(e,t,n){var i,r,o,s,a,l,u,c,d,f;return d=He(),o=(r=Re.getPos(t,A.getUiContainer(e))).x,s=r.y,Ee(e)&&Ce(_.document.body)&&(o-=d.x,s-=d.y),i=e.getEl(),a=(f=Re.getSize(i)).width,l=f.height,u=(f=Re.getSize(t)).width,c=f.height,"b"===(n=(n||"").split(""))[0]&&(s+=c),"r"===n[1]&&(o+=u),"c"===n[0]&&(s+=Math.round(c/2)),"c"===n[1]&&(o+=Math.round(u/2)),"b"===n[3]&&(s-=l),"r"===n[4]&&(o-=a),"c"===n[3]&&(s-=Math.round(l/2)),"c"===n[4]&&(o-=Math.round(a/2)),{x:o,y:s,w:a,h:l}}var He=function(){var e=_.window;return{x:Math.max(e.pageXOffset,_.document.body.scrollLeft,_.document.documentElement.scrollLeft),y:Math.max(e.pageYOffset,_.document.body.scrollTop,_.document.documentElement.scrollTop),w:e.innerWidth||_.document.documentElement.clientWidth,h:e.innerHeight||_.document.documentElement.clientHeight}},Se=function(e){var t,n=A.getUiContainer(e);return n&&!Ee(e)?{x:0,y:0,w:(t=n).scrollWidth-1,h:t.scrollHeight-1}:He()},Te={testMoveRel:function(e,t){for(var n=Se(this),i=0;i<t.length;i++){var r=ke(this,e,t[i]);if(Ee(this)){if(0<r.x&&r.x+r.w<n.w&&0<r.y&&r.y+r.h<n.h)return t[i]}else if(r.x>n.x&&r.x+r.w<n.w+n.x&&r.y>n.y&&r.y+r.h<n.h+n.y)return t[i]}return t[0]},moveRel:function(e,t){"string"!=typeof t&&(t=this.testMoveRel(e,t));var n=ke(this,e,t);return this.moveTo(n.x,n.y)},moveBy:function(e,t){var n=this.layoutRect();return this.moveTo(n.x+e,n.y+t),this},moveTo:function(e,t){var n=this;function i(e,t,n){return e<0?0:t<e+n&&(e=t-n)<0?0:e}if(n.settings.constrainToViewport){var r=Se(this),o=n.layoutRect();e=i(e,r.w+r.x,o.w),t=i(t,r.h+r.y,o.h)}var s=A.getUiContainer(n);return s&&Ce(s)&&!Ee(n)&&(e-=s.scrollLeft,t-=s.scrollTop),s&&(e+=1,t+=1),n.state.get("rendered")?n.layoutRect({x:e,y:t}).repaint():(n.settings.x=e,n.settings.y=t),n.fire("move",{x:e,y:t}),n}},Me=tinymce.util.Tools.resolve("tinymce.util.Class"),Ne=tinymce.util.Tools.resolve("tinymce.util.EventDispatcher"),Pe=function(e){var t;if(e)return"number"==typeof e?{top:e=e||0,left:e,bottom:e,right:e}:(1===(t=(e=e.split(" ")).length)?e[1]=e[2]=e[3]=e[0]:2===t?(e[2]=e[0],e[3]=e[1]):3===t&&(e[3]=e[1]),{top:parseInt(e[0],10)||0,right:parseInt(e[1],10)||0,bottom:parseInt(e[2],10)||0,left:parseInt(e[3],10)||0})},We=function(i,e){function t(e){var t=parseFloat(function(e){var t=i.ownerDocument.defaultView;if(t){var n=t.getComputedStyle(i,null);return n?(e=e.replace(/[A-Z]/g,function(e){return"-"+e}),n.getPropertyValue(e)):null}return i.currentStyle[e]}(e));return isNaN(t)?0:t}return{top:t(e+"TopWidth"),right:t(e+"RightWidth"),bottom:t(e+"BottomWidth"),left:t(e+"LeftWidth")}};function De(){}function Oe(e){this.cls=[],this.cls._map={},this.onchange=e||De,this.prefix=""}w.extend(Oe.prototype,{add:function(e){return e&&!this.contains(e)&&(this.cls._map[e]=!0,this.cls.push(e),this._change()),this},remove:function(e){if(this.contains(e)){var t=void 0;for(t=0;t<this.cls.length&&this.cls[t]!==e;t++);this.cls.splice(t,1),delete this.cls._map[e],this._change()}return this},toggle:function(e,t){var n=this.contains(e);return n!==t&&(n?this.remove(e):this.add(e),this._change()),this},contains:function(e){return!!this.cls._map[e]},_change:function(){delete this.clsValue,this.onchange.call(this)}}),Oe.prototype.toString=function(){var e;if(this.clsValue)return this.clsValue;e="";for(var t=0;t<this.cls.length;t++)0<t&&(e+=" "),e+=this.prefix+this.cls[t];return e};var Ae,Be,Le,ze=/^([\w\\*]+)?(?:#([\w\-\\]+))?(?:\.([\w\\\.]+))?(?:\[\@?([\w\\]+)([\^\$\*!~]?=)([\w\\]+)\])?(?:\:(.+))?/i,Ie=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,Fe=/^\s*|\s*$/g,Ue=Me.extend({init:function(e){var o=this.match;function s(e,t,n){var i;function r(e){e&&t.push(e)}return r(function(t){if(t)return t=t.toLowerCase(),function(e){return"*"===t||e.type===t}}((i=ze.exec(e.replace(Fe,"")))[1])),r(function(t){if(t)return function(e){return e._name===t}}(i[2])),r(function(n){if(n)return n=n.split("."),function(e){for(var t=n.length;t--;)if(!e.classes.contains(n[t]))return!1;return!0}}(i[3])),r(function(n,i,r){if(n)return function(e){var t=e[n]?e[n]():"";return i?"="===i?t===r:"*="===i?0<=t.indexOf(r):"~="===i?0<=(" "+t+" ").indexOf(" "+r+" "):"!="===i?t!==r:"^="===i?0===t.indexOf(r):"$="===i&&t.substr(t.length-r.length)===r:!!r}}(i[4],i[5],i[6])),r(function(i){var t;if(i)return(i=/(?:not\((.+)\))|(.+)/i.exec(i))[1]?(t=a(i[1],[]),function(e){return!o(e,t)}):(i=i[2],function(e,t,n){return"first"===i?0===t:"last"===i?t===n-1:"even"===i?t%2==0:"odd"===i?t%2==1:!!e[i]&&e[i]()})}(i[7])),t.pseudo=!!i[7],t.direct=n,t}function a(e,t){var n,i,r,o=[];do{if(Ie.exec(""),(i=Ie.exec(e))&&(e=i[3],o.push(i[1]),i[2])){n=i[3];break}}while(i);for(n&&a(n,t),e=[],r=0;r<o.length;r++)">"!==o[r]&&e.push(s(o[r],[],">"===o[r-1]));return t.push(e),t}this._selectors=a(e,[])},match:function(e,t){var n,i,r,o,s,a,l,u,c,d,f,h,m;for(n=0,i=(t=t||this._selectors).length;n<i;n++){for(m=e,h=0,r=(o=(s=t[n]).length)-1;0<=r;r--)for(u=s[r];m;){if(u.pseudo)for(c=d=(f=m.parent().items()).length;c--&&f[c]!==m;);for(a=0,l=u.length;a<l;a++)if(!u[a](m,c,d)){a=l+1;break}if(a===l){h++;break}if(r===o-1)break;m=m.parent()}if(h===o)return!0}return!1},find:function(e){var t,n,u=[],i=this._selectors;function c(e,t,n){var i,r,o,s,a,l=t[n];for(i=0,r=e.length;i<r;i++){for(a=e[i],o=0,s=l.length;o<s;o++)if(!l[o](a,i,r)){o=s+1;break}if(o===s)n===t.length-1?u.push(a):a.items&&c(a.items(),t,n+1);else if(l.direct)return;a.items&&c(a.items(),t,n)}}if(e.items){for(t=0,n=i.length;t<n;t++)c(e.items(),i[t],0);1<n&&(u=function(e){for(var t,n=[],i=e.length;i--;)(t=e[i]).__checked||(n.push(t),t.__checked=1);for(i=n.length;i--;)delete n[i].__checked;return n}(u))}return Ae||(Ae=Ue.Collection),new Ae(u)}}),Ve=Array.prototype.push,Ye=Array.prototype.slice;Le={length:0,init:function(e){e&&this.add(e)},add:function(e){return w.isArray(e)?Ve.apply(this,e):e instanceof Be?this.add(e.toArray()):Ve.call(this,e),this},set:function(e){var t,n=this,i=n.length;for(n.length=0,n.add(e),t=n.length;t<i;t++)delete n[t];return n},filter:function(t){var e,n,i,r,o=[];for("string"==typeof t?(t=new Ue(t),r=function(e){return t.match(e)}):r=t,e=0,n=this.length;e<n;e++)r(i=this[e])&&o.push(i);return new Be(o)},slice:function(){return new Be(Ye.apply(this,arguments))},eq:function(e){return-1===e?this.slice(e):this.slice(e,+e+1)},each:function(e){return w.each(this,e),this},toArray:function(){return w.toArray(this)},indexOf:function(e){for(var t=this.length;t--&&this[t]!==e;);return t},reverse:function(){return new Be(w.toArray(this).reverse())},hasClass:function(e){return!!this[0]&&this[0].classes.contains(e)},prop:function(t,n){var e;return n!==undefined?(this.each(function(e){e[t]&&e[t](n)}),this):(e=this[0])&&e[t]?e[t]():void 0},exec:function(t){var n=w.toArray(arguments).slice(1);return this.each(function(e){e[t]&&e[t].apply(e,n)}),this},remove:function(){for(var e=this.length;e--;)this[e].remove();return this},addClass:function(t){return this.each(function(e){e.classes.add(t)})},removeClass:function(t){return this.each(function(e){e.classes.remove(t)})}},w.each("fire on off show hide append prepend before after reflow".split(" "),function(n){Le[n]=function(){var t=w.toArray(arguments);return this.each(function(e){n in e&&e[n].apply(e,t)}),this}}),w.each("text name disabled active selected checked visible parent value data".split(" "),function(t){Le[t]=function(e){return this.prop(t,e)}}),Be=Me.extend(Le);var $e=Ue.Collection=Be,qe=function(e){this.create=e.create};qe.create=function(r,o){return new qe({create:function(t,n){var i,e=function(e){t.set(n,e.value)};return t.on("change:"+n,function(e){r.set(o,e.value)}),r.on("change:"+o,e),(i=t._bindings)||(i=t._bindings=[],t.on("destroy",function(){for(var e=i.length;e--;)i[e]()})),i.push(function(){r.off("change:"+o,e)}),r.get(o)}})};var Xe=tinymce.util.Tools.resolve("tinymce.util.Observable");function je(e){return 0<e.nodeType}var Je,Ge,Ke=Me.extend({Mixins:[Xe],init:function(e){var t,n;for(t in e=e||{})(n=e[t])instanceof qe&&(e[t]=n.create(this,t));this.data=e},set:function(t,n){var i,r,o=this.data[t];if(n instanceof qe&&(n=n.create(this,t)),"object"==typeof t){for(i in t)this.set(i,t[i]);return this}return function e(t,n){var i,r;if(t===n)return!0;if(null===t||null===n)return t===n;if("object"!=typeof t||"object"!=typeof n)return t===n;if(w.isArray(n)){if(t.length!==n.length)return!1;for(i=t.length;i--;)if(!e(t[i],n[i]))return!1}if(je(t)||je(n))return t===n;for(i in r={},n){if(!e(t[i],n[i]))return!1;r[i]=!0}for(i in t)if(!r[i]&&!e(t[i],n[i]))return!1;return!0}(o,n)||(this.data[t]=n,r={target:this,name:t,value:n,oldValue:o},this.fire("change:"+t,r),this.fire("change",r)),this},get:function(e){return this.data[e]},has:function(e){return e in this.data},bind:function(e){return qe.create(this,e)},destroy:function(){this.fire("destroy")}}),Ze={},Qe={add:function(e){var t=e.parent();if(t){if(!t._layout||t._layout.isNative())return;Ze[t._id]||(Ze[t._id]=t),Je||(Je=!0,u.requestAnimationFrame(function(){var e,t;for(e in Je=!1,Ze)(t=Ze[e]).state.get("rendered")&&t.reflow();Ze={}},_.document.body))}},remove:function(e){Ze[e._id]&&delete Ze[e._id]}},et="onmousewheel"in _.document,tt=!1,nt=0,it={Statics:{classPrefix:"mce-"},isRtl:function(){return Ge.rtl},classPrefix:"mce-",init:function(t){var e,n,i=this;function r(e){var t;for(e=e.split(" "),t=0;t<e.length;t++)i.classes.add(e[t])}i.settings=t=w.extend({},i.Defaults,t),i._id=t.id||"mceu_"+nt++,i._aria={role:t.role},i._elmCache={},i.$=we,i.state=new Ke({visible:!0,active:!1,disabled:!1,value:""}),i.data=new Ke(t.data),i.classes=new Oe(function(){i.state.get("rendered")&&(i.getEl().className=this.toString())}),i.classes.prefix=i.classPrefix,(e=t.classes)&&(i.Defaults&&(n=i.Defaults.classes)&&e!==n&&r(n),r(e)),w.each("title text name visible disabled active value".split(" "),function(e){e in t&&i[e](t[e])}),i.on("click",function(){if(i.disabled())return!1}),i.settings=t,i.borderBox=Pe(t.border),i.paddingBox=Pe(t.padding),i.marginBox=Pe(t.margin),t.hidden&&i.hide()},Properties:"parent,name",getContainerElm:function(){var e=A.getUiContainer(this);return e||Re.getContainer()},getParentCtrl:function(e){for(var t,n=this.getRoot().controlIdLookup;e&&n&&!(t=n[e.id]);)e=e.parentNode;return t},initLayoutRect:function(){var e,t,n,i,r,o,s,a,l,u,c=this,d=c.settings,f=c.getEl();e=c.borderBox=c.borderBox||We(f,"border"),c.paddingBox=c.paddingBox||We(f,"padding"),c.marginBox=c.marginBox||We(f,"margin"),u=Re.getSize(f),a=d.minWidth,l=d.minHeight,r=a||u.width,o=l||u.height,n=d.width,i=d.height,s=void 0!==(s=d.autoResize)?s:!n&&!i,n=n||r,i=i||o;var h=e.left+e.right,m=e.top+e.bottom,g=d.maxWidth||65535,p=d.maxHeight||65535;return c._layoutRect=t={x:d.x||0,y:d.y||0,w:n,h:i,deltaW:h,deltaH:m,contentW:n-h,contentH:i-m,innerW:n-h,innerH:i-m,startMinWidth:a||0,startMinHeight:l||0,minW:Math.min(r,g),minH:Math.min(o,p),maxW:g,maxH:p,autoResize:s,scrollW:0},c._lastLayoutRect={},t},layoutRect:function(e){var t,n,i,r,o,s=this,a=s._layoutRect;return a||(a=s.initLayoutRect()),e?(i=a.deltaW,r=a.deltaH,e.x!==undefined&&(a.x=e.x),e.y!==undefined&&(a.y=e.y),e.minW!==undefined&&(a.minW=e.minW),e.minH!==undefined&&(a.minH=e.minH),(n=e.w)!==undefined&&(n=(n=n<a.minW?a.minW:n)>a.maxW?a.maxW:n,a.w=n,a.innerW=n-i),(n=e.h)!==undefined&&(n=(n=n<a.minH?a.minH:n)>a.maxH?a.maxH:n,a.h=n,a.innerH=n-r),(n=e.innerW)!==undefined&&(n=(n=n<a.minW-i?a.minW-i:n)>a.maxW-i?a.maxW-i:n,a.innerW=n,a.w=n+i),(n=e.innerH)!==undefined&&(n=(n=n<a.minH-r?a.minH-r:n)>a.maxH-r?a.maxH-r:n,a.innerH=n,a.h=n+r),e.contentW!==undefined&&(a.contentW=e.contentW),e.contentH!==undefined&&(a.contentH=e.contentH),(t=s._lastLayoutRect).x===a.x&&t.y===a.y&&t.w===a.w&&t.h===a.h||((o=Ge.repaintControls)&&o.map&&!o.map[s._id]&&(o.push(s),o.map[s._id]=!0),t.x=a.x,t.y=a.y,t.w=a.w,t.h=a.h),s):a},repaint:function(){var e,t,n,i,r,o,s,a,l,u,c=this;l=_.document.createRange?function(e){return e}:Math.round,e=c.getEl().style,i=c._layoutRect,a=c._lastRepaintRect||{},o=(r=c.borderBox).left+r.right,s=r.top+r.bottom,i.x!==a.x&&(e.left=l(i.x)+"px",a.x=i.x),i.y!==a.y&&(e.top=l(i.y)+"px",a.y=i.y),i.w!==a.w&&(u=l(i.w-o),e.width=(0<=u?u:0)+"px",a.w=i.w),i.h!==a.h&&(u=l(i.h-s),e.height=(0<=u?u:0)+"px",a.h=i.h),c._hasBody&&i.innerW!==a.innerW&&(u=l(i.innerW),(n=c.getEl("body"))&&((t=n.style).width=(0<=u?u:0)+"px"),a.innerW=i.innerW),c._hasBody&&i.innerH!==a.innerH&&(u=l(i.innerH),(n=n||c.getEl("body"))&&((t=t||n.style).height=(0<=u?u:0)+"px"),a.innerH=i.innerH),c._lastRepaintRect=a,c.fire("repaint",{},!1)},updateLayoutRect:function(){var e=this;e.parent()._lastRect=null,Re.css(e.getEl(),{width:"",height:""}),e._layoutRect=e._lastRepaintRect=e._lastLayoutRect=null,e.initLayoutRect()},on:function(e,t){var n,i,r,o=this;return rt(o).on(e,"string"!=typeof(n=t)?n:function(e){return i||o.parentsAndSelf().each(function(e){var t=e.settings.callbacks;if(t&&(i=t[n]))return r=e,!1}),i?i.call(r,e):(e.action=n,void this.fire("execute",e))}),o},off:function(e,t){return rt(this).off(e,t),this},fire:function(e,t,n){if((t=t||{}).control||(t.control=this),t=rt(this).fire(e,t),!1!==n&&this.parent)for(var i=this.parent();i&&!t.isPropagationStopped();)i.fire(e,t,!1),i=i.parent();return t},hasEventListeners:function(e){return rt(this).has(e)},parents:function(e){var t,n=new $e;for(t=this.parent();t;t=t.parent())n.add(t);return e&&(n=n.filter(e)),n},parentsAndSelf:function(e){return new $e(this).add(this.parents(e))},next:function(){var e=this.parent().items();return e[e.indexOf(this)+1]},prev:function(){var e=this.parent().items();return e[e.indexOf(this)-1]},innerHtml:function(e){return this.$el.html(e),this},getEl:function(e){var t=e?this._id+"-"+e:this._id;return this._elmCache[t]||(this._elmCache[t]=we("#"+t)[0]),this._elmCache[t]},show:function(){return this.visible(!0)},hide:function(){return this.visible(!1)},focus:function(){try{this.getEl().focus()}catch(e){}return this},blur:function(){return this.getEl().blur(),this},aria:function(e,t){var n=this,i=n.getEl(n.ariaTarget);return void 0===t?n._aria[e]:(n._aria[e]=t,n.state.get("rendered")&&i.setAttribute("role"===e?e:"aria-"+e,t),n)},encode:function(e,t){return!1!==t&&(e=this.translate(e)),(e||"").replace(/[&<>"]/g,function(e){return"&#"+e.charCodeAt(0)+";"})},translate:function(e){return Ge.translate?Ge.translate(e):e},before:function(e){var t=this.parent();return t&&t.insert(e,t.items().indexOf(this),!0),this},after:function(e){var t=this.parent();return t&&t.insert(e,t.items().indexOf(this)),this},remove:function(){var t,e,n=this,i=n.getEl(),r=n.parent();if(n.items){var o=n.items().toArray();for(e=o.length;e--;)o[e].remove()}r&&r.items&&(t=[],r.items().each(function(e){e!==n&&t.push(e)}),r.items().set(t),r._lastRect=null),n._eventsRoot&&n._eventsRoot===n&&we(i).off();var s=n.getRoot().controlIdLookup;return s&&delete s[n._id],i&&i.parentNode&&i.parentNode.removeChild(i),n.state.set("rendered",!1),n.state.destroy(),n.fire("remove"),n},renderBefore:function(e){return we(e).before(this.renderHtml()),this.postRender(),this},renderTo:function(e){return we(e||this.getContainerElm()).append(this.renderHtml()),this.postRender(),this},preRender:function(){},render:function(){},renderHtml:function(){return'<div id="'+this._id+'" class="'+this.classes+'"></div>'},postRender:function(){var e,t,n,i,r,o=this,s=o.settings;for(i in o.$el=we(o.getEl()),o.state.set("rendered",!0),s)0===i.indexOf("on")&&o.on(i.substr(2),s[i]);if(o._eventsRoot){for(n=o.parent();!r&&n;n=n.parent())r=n._eventsRoot;if(r)for(i in r._nativeEvents)o._nativeEvents[i]=!0}ot(o),s.style&&(e=o.getEl())&&(e.setAttribute("style",s.style),e.style.cssText=s.style),o.settings.border&&(t=o.borderBox,o.$el.css({"border-top-width":t.top,"border-right-width":t.right,"border-bottom-width":t.bottom,"border-left-width":t.left}));var a=o.getRoot();for(var l in a.controlIdLookup||(a.controlIdLookup={}),(a.controlIdLookup[o._id]=o)._aria)o.aria(l,o._aria[l]);!1===o.state.get("visible")&&(o.getEl().style.display="none"),o.bindStates(),o.state.on("change:visible",function(e){var t,n=e.value;o.state.get("rendered")&&(o.getEl().style.display=!1===n?"none":"",o.getEl().getBoundingClientRect()),(t=o.parent())&&(t._lastRect=null),o.fire(n?"show":"hide"),Qe.add(o)}),o.fire("postrender",{},!1)},bindStates:function(){},scrollIntoView:function(e){var t,n,i,r,o,s,a=this.getEl(),l=a.parentNode,u=function(e,t){var n,i,r=e;for(n=i=0;r&&r!==t&&r.nodeType;)n+=r.offsetLeft||0,i+=r.offsetTop||0,r=r.offsetParent;return{x:n,y:i}}(a,l);return t=u.x,n=u.y,i=a.offsetWidth,r=a.offsetHeight,o=l.clientWidth,s=l.clientHeight,"end"===e?(t-=o-i,n-=s-r):"center"===e&&(t-=o/2-i/2,n-=s/2-r/2),l.scrollLeft=t,l.scrollTop=n,this},getRoot:function(){for(var e,t=this,n=[];t;){if(t.rootControl){e=t.rootControl;break}n.push(t),t=(e=t).parent()}e||(e=this);for(var i=n.length;i--;)n[i].rootControl=e;return e},reflow:function(){Qe.remove(this);var e=this.parent();return e&&e._layout&&!e._layout.isNative()&&e.reflow(),this}};function rt(n){return n._eventDispatcher||(n._eventDispatcher=new Ne({scope:n,toggleEvent:function(e,t){t&&Ne.isNative(e)&&(n._nativeEvents||(n._nativeEvents={}),n._nativeEvents[e]=!0,n.state.get("rendered")&&ot(n))}})),n._eventDispatcher}function ot(a){var e,t,n,l,i,r;function o(e){var t=a.getParentCtrl(e.target);t&&t.fire(e.type,e)}function s(){var e=l._lastHoverCtrl;e&&(e.fire("mouseleave",{target:e.getEl()}),e.parents().each(function(e){e.fire("mouseleave",{target:e.getEl()})}),l._lastHoverCtrl=null)}function u(e){var t,n,i,r=a.getParentCtrl(e.target),o=l._lastHoverCtrl,s=0;if(r!==o){if((n=(l._lastHoverCtrl=r).parents().toArray().reverse()).push(r),o){for((i=o.parents().toArray().reverse()).push(o),s=0;s<i.length&&n[s]===i[s];s++);for(t=i.length-1;s<=t;t--)(o=i[t]).fire("mouseleave",{target:o.getEl()})}for(t=s;t<n.length;t++)(r=n[t]).fire("mouseenter",{target:r.getEl()})}}function c(e){e.preventDefault(),"mousewheel"===e.type?(e.deltaY=-.025*e.wheelDelta,e.wheelDeltaX&&(e.deltaX=-.025*e.wheelDeltaX)):(e.deltaX=0,e.deltaY=e.detail),e=a.fire("wheel",e)}if(i=a._nativeEvents){for((n=a.parents().toArray()).unshift(a),e=0,t=n.length;!l&&e<t;e++)l=n[e]._eventsRoot;for(l||(l=n[n.length-1]||a),a._eventsRoot=l,t=e,e=0;e<t;e++)n[e]._eventsRoot=l;var d=l._delegates;for(r in d||(d=l._delegates={}),i){if(!i)return!1;"wheel"!==r||tt?("mouseenter"===r||"mouseleave"===r?l._hasMouseEnter||(we(l.getEl()).on("mouseleave",s).on("mouseover",u),l._hasMouseEnter=1):d[r]||(we(l.getEl()).on(r,o),d[r]=!0),i[r]=!1):et?we(a.getEl()).on("mousewheel",c):we(a.getEl()).on("DOMMouseScroll",c)}}}w.each("text title visible disabled active value".split(" "),function(t){it[t]=function(e){return 0===arguments.length?this.state.get(t):(void 0!==e&&this.state.set(t,e),this)}});var st=Ge=Me.extend(it),at=function(e){return!!e.getAttribute("data-mce-tabstop")};function lt(e){var o,r,n=e.root;function i(e){return e&&1===e.nodeType}try{o=_.document.activeElement}catch(t){o=_.document.body}function s(e){return i(e=e||o)?e.getAttribute("role"):null}function a(e){for(var t,n=e||o;n=n.parentNode;)if(t=s(n))return t}function l(e){var t=o;if(i(t))return t.getAttribute("aria-"+e)}function u(e){var t=e.tagName.toUpperCase();return"INPUT"===t||"TEXTAREA"===t||"SELECT"===t}function c(t){var r=[];return function e(t){if(1===t.nodeType&&"none"!==t.style.display&&!t.disabled){var n;(u(n=t)&&!n.hidden||at(n)||/^(button|menuitem|checkbox|tab|menuitemcheckbox|option|gridcell|slider)$/.test(s(n)))&&r.push(t);for(var i=0;i<t.childNodes.length;i++)e(t.childNodes[i])}}(t||n.getEl()),r}function d(e){var t,n;(n=(e=e||r).parents().toArray()).unshift(e);for(var i=0;i<n.length&&!(t=n[i]).settings.ariaRoot;i++);return t}function f(e,t){return e<0?e=t.length-1:e>=t.length&&(e=0),t[e]&&t[e].focus(),e}function h(e,t){var n=-1,i=d();t=t||c(i.getEl());for(var r=0;r<t.length;r++)t[r]===o&&(n=r);n+=e,i.lastAriaIndex=f(n,t)}function m(){"tablist"===a()?h(-1,c(o.parentNode)):r.parent().submenu?b():h(-1)}function g(){var e=s(),t=a();"tablist"===t?h(1,c(o.parentNode)):"menuitem"===e&&"menu"===t&&l("haspopup")?y():h(1)}function p(){h(-1)}function v(){var e=s(),t=a();"menuitem"===e&&"menubar"===t?y():"button"===e&&l("haspopup")?y({key:"down"}):h(1)}function b(){r.fire("cancel")}function y(e){e=e||{},r.fire("click",{target:o,aria:e})}return r=n.getParentCtrl(o),n.on("keydown",function(e){function t(e,t){u(o)||at(o)||"slider"!==s(o)&&!1!==t(e)&&e.preventDefault()}if(!e.isDefaultPrevented())switch(e.keyCode){case 37:t(e,m);break;case 39:t(e,g);break;case 38:t(e,p);break;case 40:t(e,v);break;case 27:b();break;case 14:case 13:case 32:t(e,y);break;case 9:!function(e){if("tablist"===a()){var t=c(r.getEl("body"))[0];t&&t.focus()}else h(e.shiftKey?-1:1)}(e),e.preventDefault()}}),n.on("focusin",function(e){o=e.target,r=e.control}),{focusFirst:function(e){var t=d(e),n=c(t.getEl());t.settings.ariaRemember&&"lastAriaIndex"in t?f(t.lastAriaIndex,n):f(0,n)}}}var ut={},ct=st.extend({init:function(e){var t=this;t._super(e),(e=t.settings).fixed&&t.state.set("fixed",!0),t._items=new $e,t.isRtl()&&t.classes.add("rtl"),t.bodyClasses=new Oe(function(){t.state.get("rendered")&&(t.getEl("body").className=this.toString())}),t.bodyClasses.prefix=t.classPrefix,t.classes.add("container"),t.bodyClasses.add("container-body"),e.containerCls&&t.classes.add(e.containerCls),t._layout=b.create((e.layout||"")+"layout"),t.settings.items?t.add(t.settings.items):t.add(t.render()),t._hasBody=!0},items:function(){return this._items},find:function(e){return(e=ut[e]=ut[e]||new Ue(e)).find(this)},add:function(e){return this.items().add(this.create(e)).parent(this),this},focus:function(e){var t,n,i,r=this;if(!e||!(n=r.keyboardNav||r.parents().eq(-1)[0].keyboardNav))return i=r.find("*"),r.statusbar&&i.add(r.statusbar.items()),i.each(function(e){if(e.settings.autofocus)return t=null,!1;e.canFocus&&(t=t||e)}),t&&t.focus(),r;n.focusFirst(r)},replace:function(e,t){for(var n,i=this.items(),r=i.length;r--;)if(i[r]===e){i[r]=t;break}0<=r&&((n=t.getEl())&&n.parentNode.removeChild(n),(n=e.getEl())&&n.parentNode.removeChild(n)),t.parent(this)},create:function(e){var t,n=this,i=[];return w.isArray(e)||(e=[e]),w.each(e,function(e){e&&(e instanceof st||("string"==typeof e&&(e={type:e}),t=w.extend({},n.settings.defaults,e),e.type=t.type=t.type||e.type||n.settings.defaultType||(t.defaults?t.defaults.type:null),e=b.create(t)),i.push(e))}),i},renderNew:function(){var i=this;return i.items().each(function(e,t){var n;e.parent(i),e.state.get("rendered")||((n=i.getEl("body")).hasChildNodes()&&t<=n.childNodes.length-1?we(n.childNodes[t]).before(e.renderHtml()):we(n).append(e.renderHtml()),e.postRender(),Qe.add(e))}),i._layout.applyClasses(i.items().filter(":visible")),i._lastRect=null,i},append:function(e){return this.add(e).renderNew()},prepend:function(e){return this.items().set(this.create(e).concat(this.items().toArray())),this.renderNew()},insert:function(e,t,n){var i,r,o;return e=this.create(e),i=this.items(),!n&&t<i.length-1&&(t+=1),0<=t&&t<i.length&&(r=i.slice(0,t).toArray(),o=i.slice(t).toArray(),i.set(r.concat(e,o))),this.renderNew()},fromJSON:function(e){for(var t in e)this.find("#"+t).value(e[t]);return this},toJSON:function(){var i={};return this.find("*").each(function(e){var t=e.name(),n=e.value();t&&void 0!==n&&(i[t]=n)}),i},renderHtml:function(){var e=this,t=e._layout,n=this.settings.role;return e.preRender(),t.preRender(e),'<div id="'+e._id+'" class="'+e.classes+'"'+(n?' role="'+this.settings.role+'"':"")+'><div id="'+e._id+'-body" class="'+e.bodyClasses+'">'+(e.settings.html||"")+t.renderHtml(e)+"</div></div>"},postRender:function(){var e,t=this;return t.items().exec("postRender"),t._super(),t._layout.postRender(t),t.state.set("rendered",!0),t.settings.style&&t.$el.css(t.settings.style),t.settings.border&&(e=t.borderBox,t.$el.css({"border-top-width":e.top,"border-right-width":e.right,"border-bottom-width":e.bottom,"border-left-width":e.left})),t.parent()||(t.keyboardNav=lt({root:t})),t},initLayoutRect:function(){var e=this._super();return this._layout.recalc(this),e},recalc:function(){var e=this,t=e._layoutRect,n=e._lastRect;if(!n||n.w!==t.w||n.h!==t.h)return e._layout.recalc(e),t=e.layoutRect(),e._lastRect={x:t.x,y:t.y,w:t.w,h:t.h},!0},reflow:function(){var e;if(Qe.remove(this),this.visible()){for(st.repaintControls=[],st.repaintControls.map={},this.recalc(),e=st.repaintControls.length;e--;)st.repaintControls[e].repaint();"flow"!==this.settings.layout&&"stack"!==this.settings.layout&&this.repaint(),st.repaintControls=[]}return this}});function dt(e){var t,n;if(e.changedTouches)for(t="screenX screenY pageX pageY clientX clientY".split(" "),n=0;n<t.length;n++)e[t[n]]=e.changedTouches[0][t[n]]}function ft(e,h){var m,g,t,p,v,b,y,x=h.document||_.document;h=h||{};var w=x.getElementById(h.handle||e);t=function(e){var t,n,i,r,o,s,a,l,u,c,d,f=(t=x,u=Math.max,n=t.documentElement,i=t.body,r=u(n.scrollWidth,i.scrollWidth),o=u(n.clientWidth,i.clientWidth),s=u(n.offsetWidth,i.offsetWidth),a=u(n.scrollHeight,i.scrollHeight),l=u(n.clientHeight,i.clientHeight),{width:r<s?o:r,height:a<u(n.offsetHeight,i.offsetHeight)?l:a});dt(e),e.preventDefault(),g=e.button,c=w,b=e.screenX,y=e.screenY,d=_.window.getComputedStyle?_.window.getComputedStyle(c,null).getPropertyValue("cursor"):c.runtimeStyle.cursor,m=we("<div></div>").css({position:"absolute",top:0,left:0,width:f.width,height:f.height,zIndex:2147483647,opacity:1e-4,cursor:d}).appendTo(x.body),we(x).on("mousemove touchmove",v).on("mouseup touchend",p),h.start(e)},v=function(e){if(dt(e),e.button!==g)return p(e);e.deltaX=e.screenX-b,e.deltaY=e.screenY-y,e.preventDefault(),h.drag(e)},p=function(e){dt(e),we(x).off("mousemove touchmove",v).off("mouseup touchend",p),m.remove(),h.stop&&h.stop(e)},this.destroy=function(){we(w).off()},we(w).on("mousedown touchstart",t)}var ht,mt,gt,pt,vt={init:function(){this.on("repaint",this.renderScroll)},renderScroll:function(){var p=this,v=2;function n(){var m,g,e;function t(e,t,n,i,r,o){var s,a,l,u,c,d,f,h;if(a=p.getEl("scroll"+e)){if(f=t.toLowerCase(),h=n.toLowerCase(),we(p.getEl("absend")).css(f,p.layoutRect()[i]-1),!r)return void we(a).css("display","none");we(a).css("display","block"),s=p.getEl("body"),l=p.getEl("scroll"+e+"t"),u=s["client"+n]-2*v,c=(u-=m&&g?a["client"+o]:0)/s["scroll"+n],(d={})[f]=s["offset"+t]+v,d[h]=u,we(a).css(d),(d={})[f]=s["scroll"+t]*c,d[h]=u*c,we(l).css(d)}}e=p.getEl("body"),m=e.scrollWidth>e.clientWidth,g=e.scrollHeight>e.clientHeight,t("h","Left","Width","contentW",m,"Height"),t("v","Top","Height","contentH",g,"Width")}p.settings.autoScroll&&(p._hasScroll||(p._hasScroll=!0,function(){function e(s,a,l,u,c){var d,e=p._id+"-scroll"+s,t=p.classPrefix;we(p.getEl()).append('<div id="'+e+'" class="'+t+"scrollbar "+t+"scrollbar-"+s+'"><div id="'+e+'t" class="'+t+'scrollbar-thumb"></div></div>'),p.draghelper=new ft(e+"t",{start:function(){d=p.getEl("body")["scroll"+a],we("#"+e).addClass(t+"active")},drag:function(e){var t,n,i,r,o=p.layoutRect();n=o.contentW>o.innerW,i=o.contentH>o.innerH,r=p.getEl("body")["client"+l]-2*v,t=(r-=n&&i?p.getEl("scroll"+s)["client"+c]:0)/p.getEl("body")["scroll"+l],p.getEl("body")["scroll"+a]=d+e["delta"+u]/t},stop:function(){we("#"+e).removeClass(t+"active")}})}p.classes.add("scroll"),e("v","Top","Height","Y","Width"),e("h","Left","Width","X","Height")}(),p.on("wheel",function(e){var t=p.getEl("body");t.scrollLeft+=10*(e.deltaX||0),t.scrollTop+=10*e.deltaY,n()}),we(p.getEl("body")).on("scroll",n)),n())}},bt=ct.extend({Defaults:{layout:"fit",containerCls:"panel"},Mixins:[vt],renderHtml:function(){var e=this,t=e._layout,n=e.settings.html;return e.preRender(),t.preRender(e),void 0===n?n='<div id="'+e._id+'-body" class="'+e.bodyClasses+'">'+t.renderHtml(e)+"</div>":("function"==typeof n&&(n=n.call(e)),e._hasBody=!1),'<div id="'+e._id+'" class="'+e.classes+'" hidefocus="1" tabindex="-1" role="group">'+(e._preBodyHtml||"")+n+"</div>"}}),yt={resizeToContent:function(){this._layoutRect.autoResize=!0,this._lastRect=null,this.reflow()},resizeTo:function(e,t){if(e<=1||t<=1){var n=Re.getWindowSize();e=e<=1?e*n.w:e,t=t<=1?t*n.h:t}return this._layoutRect.autoResize=!1,this.layoutRect({minW:e,minH:t,w:e,h:t}).reflow()},resizeBy:function(e,t){var n=this.layoutRect();return this.resizeTo(n.w+e,n.h+t)}},xt=[],wt=[];function _t(e,t){for(;e;){if(e===t)return!0;e=e.parent()}}function Rt(){ht||(ht=function(e){2!==e.button&&function(e){for(var t=xt.length;t--;){var n=xt[t],i=n.getParentCtrl(e.target);if(n.settings.autohide){if(i&&(_t(i,n)||n.parent()===i))continue;(e=n.fire("autohide",{target:e.target})).isDefaultPrevented()||n.hide()}}}(e)},we(_.document).on("click touchstart",ht))}function Ct(r){var e=Re.getViewPort().y;function t(e,t){for(var n,i=0;i<xt.length;i++)if(xt[i]!==r)for(n=xt[i].parent();n&&(n=n.parent());)n===r&&xt[i].fixed(e).moveBy(0,t).repaint()}r.settings.autofix&&(r.state.get("fixed")?r._autoFixY>e&&(r.fixed(!1).layoutRect({y:r._autoFixY}).repaint(),t(!1,r._autoFixY-e)):(r._autoFixY=r.layoutRect().y,r._autoFixY<e&&(r.fixed(!0).layoutRect({y:0}).repaint(),t(!0,e-r._autoFixY))))}function Et(e,t){var n,i,r=kt.zIndex||65535;if(e)wt.push(t);else for(n=wt.length;n--;)wt[n]===t&&wt.splice(n,1);if(wt.length)for(n=0;n<wt.length;n++)wt[n].modal&&(r++,i=wt[n]),wt[n].getEl().style.zIndex=r,wt[n].zIndex=r,r++;var o=we("#"+t.classPrefix+"modal-block",t.getContainerElm())[0];i?we(o).css("z-index",i.zIndex-1):o&&(o.parentNode.removeChild(o),pt=!1),kt.currentZIndex=r}var kt=bt.extend({Mixins:[Te,yt],init:function(e){var i=this;i._super(e),(i._eventsRoot=i).classes.add("floatpanel"),e.autohide&&(Rt(),function(){if(!gt){var e=_.document.documentElement,t=e.clientWidth,n=e.clientHeight;gt=function(){_.document.all&&t===e.clientWidth&&n===e.clientHeight||(t=e.clientWidth,n=e.clientHeight,kt.hideAll())},we(_.window).on("resize",gt)}}(),xt.push(i)),e.autofix&&(mt||(mt=function(){var e;for(e=xt.length;e--;)Ct(xt[e])},we(_.window).on("scroll",mt)),i.on("move",function(){Ct(this)})),i.on("postrender show",function(e){if(e.control===i){var t,n=i.classPrefix;i.modal&&!pt&&((t=we("#"+n+"modal-block",i.getContainerElm()))[0]||(t=we('<div id="'+n+'modal-block" class="'+n+"reset "+n+'fade"></div>').appendTo(i.getContainerElm())),u.setTimeout(function(){t.addClass(n+"in"),we(i.getEl()).addClass(n+"in")}),pt=!0),Et(!0,i)}}),i.on("show",function(){i.parents().each(function(e){if(e.state.get("fixed"))return i.fixed(!0),!1})}),e.popover&&(i._preBodyHtml='<div class="'+i.classPrefix+'arrow"></div>',i.classes.add("popover").add("bottom").add(i.isRtl()?"end":"start")),i.aria("label",e.ariaLabel),i.aria("labelledby",i._id),i.aria("describedby",i.describedBy||i._id+"-none")},fixed:function(e){var t=this;if(t.state.get("fixed")!==e){if(t.state.get("rendered")){var n=Re.getViewPort();e?t.layoutRect().y-=n.y:t.layoutRect().y+=n.y}t.classes.toggle("fixed",e),t.state.set("fixed",e)}return t},show:function(){var e,t=this._super();for(e=xt.length;e--&&xt[e]!==this;);return-1===e&&xt.push(this),t},hide:function(){return Ht(this),Et(!1,this),this._super()},hideAll:function(){kt.hideAll()},close:function(){return this.fire("close").isDefaultPrevented()||(this.remove(),Et(!1,this)),this},remove:function(){Ht(this),this._super()},postRender:function(){return this.settings.bodyRole&&this.getEl("body").setAttribute("role",this.settings.bodyRole),this._super()}});function Ht(e){var t;for(t=xt.length;t--;)xt[t]===e&&xt.splice(t,1);for(t=wt.length;t--;)wt[t]===e&&wt.splice(t,1)}kt.hideAll=function(){for(var e=xt.length;e--;){var t=xt[e];t&&t.settings.autohide&&(t.hide(),xt.splice(e,1))}};var St=function(s,n,e){var a,i,l=v.DOM,t=s.getParam("fixed_toolbar_container");t&&(i=l.select(t)[0]);var r=function(){if(a&&a.moveRel&&a.visible()&&!a._fixed){var e=s.selection.getScrollContainer(),t=s.getBody(),n=0,i=0;if(e){var r=l.getPos(t),o=l.getPos(e);n=Math.max(0,o.x-r.x),i=Math.max(0,o.y-r.y)}a.fixed(!1).moveRel(t,s.rtl?["tr-br","br-tr"]:["tl-bl","bl-tl","tr-br"]).moveBy(n,i)}},o=function(){a&&(a.show(),r(),l.addClass(s.getBody(),"mce-edit-focus"))},u=function(){a&&(a.hide(),kt.hideAll(),l.removeClass(s.getBody(),"mce-edit-focus"))},c=function(){var e,t;a?a.visible()||o():(a=n.panel=b.create({type:i?"panel":"floatpanel",role:"application",classes:"tinymce tinymce-inline",layout:"flex",direction:"column",align:"stretch",autohide:!1,autofix:!0,fixed:(e=i,t=s,!(!e||t.settings.ui_container)),border:1,items:[!1===d(s)?null:{type:"menubar",border:"0 0 1 0",items:se(s)},z(s,f(s))]}),A.setUiContainer(s,a),R(s),i?a.renderTo(i).reflow():a.renderTo().reflow(),C(s,a),o(),Y(s),s.on("nodeChange",r),s.on("ResizeWindow",r),s.on("activate",o),s.on("deactivate",u),s.nodeChanged())};return s.settings.content_editable=!0,s.on("focus",function(){!1===g(s)&&e.skinUiCss?l.styleSheetLoader.load(e.skinUiCss,c,c):c()}),s.on("blur hide",u),s.on("remove",function(){a&&(a.remove(),a=null)}),!1===g(s)&&e.skinUiCss?l.styleSheetLoader.load(e.skinUiCss,ve(s)):ve(s)(),{}};function Tt(i,r){var o,s,a=this,l=st.classPrefix;a.show=function(e,t){function n(){o&&(we(i).append('<div class="'+l+"throbber"+(r?" "+l+"throbber-inline":"")+'"></div>'),t&&t())}return a.hide(),o=!0,e?s=u.setTimeout(n,e):n(),a},a.hide=function(){var e=i.lastChild;return u.clearTimeout(s),e&&-1!==e.className.indexOf("throbber")&&e.parentNode.removeChild(e),o=!1,a}}var Mt=function(e,t){var n;e.on("ProgressState",function(e){n=n||new Tt(t.panel.getEl("body")),e.state?n.show(e.time):n.hide()})},Nt=function(e,t,n){var i=function(e){var t=e.settings,n=t.skin,i=t.skin_url;if(!1!==n){var r=n||"lightgray";i=i?e.documentBaseURI.toAbsolute(i):h.baseURL+"/skins/"+r}return i}(e);return i&&(n.skinUiCss=i+"/skin.min.css",e.contentCSS.push(i+"/content"+(e.inline?".inline":"")+".min.css")),Mt(e,t),e.getParam("inline",!1,"boolean")?St(e,t,n):xe(e,t,n)},Pt=st.extend({Mixins:[Te],Defaults:{classes:"widget tooltip tooltip-n"},renderHtml:function(){var e=this,t=e.classPrefix;return'<div id="'+e._id+'" class="'+e.classes+'" role="presentation"><div class="'+t+'tooltip-arrow"></div><div class="'+t+'tooltip-inner">'+e.encode(e.state.get("text"))+"</div></div>"},bindStates:function(){var t=this;return t.state.on("change:text",function(e){t.getEl().lastChild.innerHTML=t.encode(e.value)}),t._super()},repaint:function(){var e,t;e=this.getEl().style,t=this._layoutRect,e.left=t.x+"px",e.top=t.y+"px",e.zIndex=131070}}),Wt=st.extend({init:function(i){var r=this;r._super(i),i=r.settings,r.canFocus=!0,i.tooltip&&!1!==Wt.tooltips&&(r.on("mouseenter",function(e){var t=r.tooltip().moveTo(-65535);if(e.control===r){var n=t.text(i.tooltip).show().testMoveRel(r.getEl(),["bc-tc","bc-tl","bc-tr"]);t.classes.toggle("tooltip-n","bc-tc"===n),t.classes.toggle("tooltip-nw","bc-tl"===n),t.classes.toggle("tooltip-ne","bc-tr"===n),t.moveRel(r.getEl(),n)}else t.hide()}),r.on("mouseleave mousedown click",function(){r.tooltip().remove(),r._tooltip=null})),r.aria("label",i.ariaLabel||i.tooltip)},tooltip:function(){return this._tooltip||(this._tooltip=new Pt({type:"tooltip"}),A.inheritUiContainer(this,this._tooltip),this._tooltip.renderTo()),this._tooltip},postRender:function(){var e=this,t=e.settings;e._super(),e.parent()||!t.width&&!t.height||(e.initLayoutRect(),e.repaint()),t.autofocus&&e.focus()},bindStates:function(){var t=this;function n(e){t.aria("disabled",e),t.classes.toggle("disabled",e)}function i(e){t.aria("pressed",e),t.classes.toggle("active",e)}return t.state.on("change:disabled",function(e){n(e.value)}),t.state.on("change:active",function(e){i(e.value)}),t.state.get("disabled")&&n(!0),t.state.get("active")&&i(!0),t._super()},remove:function(){this._super(),this._tooltip&&(this._tooltip.remove(),this._tooltip=null)}}),Dt=Wt.extend({Defaults:{value:0},init:function(e){this._super(e),this.classes.add("progress"),this.settings.filter||(this.settings.filter=function(e){return Math.round(e)})},renderHtml:function(){var e=this._id,t=this.classPrefix;return'<div id="'+e+'" class="'+this.classes+'"><div class="'+t+'bar-container"><div class="'+t+'bar"></div></div><div class="'+t+'text">0%</div></div>'},postRender:function(){return this._super(),this.value(this.settings.value),this},bindStates:function(){var t=this;function n(e){e=t.settings.filter(e),t.getEl().lastChild.innerHTML=e+"%",t.getEl().firstChild.firstChild.style.width=e+"%"}return t.state.on("change:value",function(e){n(e.value)}),n(t.state.get("value")),t._super()}}),Ot=function(e,t){e.getEl().lastChild.textContent=t+(e.progressBar?" "+e.progressBar.value()+"%":"")},At=st.extend({Mixins:[Te],Defaults:{classes:"widget notification"},init:function(e){var t=this;t._super(e),t.maxWidth=e.maxWidth,e.text&&t.text(e.text),e.icon&&(t.icon=e.icon),e.color&&(t.color=e.color),e.type&&t.classes.add("notification-"+e.type),e.timeout&&(e.timeout<0||0<e.timeout)&&!e.closeButton?t.closeButton=!1:(t.classes.add("has-close"),t.closeButton=!0),e.progressBar&&(t.progressBar=new Dt),t.on("click",function(e){-1!==e.target.className.indexOf(t.classPrefix+"close")&&t.close()})},renderHtml:function(){var e,t=this,n=t.classPrefix,i="",r="",o="";return t.icon&&(i='<i class="'+n+"ico "+n+"i-"+t.icon+'"></i>'),e=' style="max-width: '+t.maxWidth+"px;"+(t.color?"background-color: "+t.color+';"':'"'),t.closeButton&&(r='<button type="button" class="'+n+'close" aria-hidden="true">\xd7</button>'),t.progressBar&&(o=t.progressBar.renderHtml()),'<div id="'+t._id+'" class="'+t.classes+'"'+e+' role="presentation">'+i+'<div class="'+n+'notification-inner">'+t.state.get("text")+"</div>"+o+r+'<div style="clip: rect(1px, 1px, 1px, 1px);height: 1px;overflow: hidden;position: absolute;width: 1px;" aria-live="assertive" aria-relevant="additions" aria-atomic="true"></div></div>'},postRender:function(){var e=this;return u.setTimeout(function(){e.$el.addClass(e.classPrefix+"in"),Ot(e,e.state.get("text"))},100),e._super()},bindStates:function(){var t=this;return t.state.on("change:text",function(e){t.getEl().firstChild.innerHTML=e.value,Ot(t,e.value)}),t.progressBar&&(t.progressBar.bindStates(),t.progressBar.state.on("change:value",function(e){Ot(t,t.state.get("text"))})),t._super()},close:function(){return this.fire("close").isDefaultPrevented()||this.remove(),this},repaint:function(){var e,t;e=this.getEl().style,t=this._layoutRect,e.left=t.x+"px",e.top=t.y+"px",e.zIndex=65534}});function Bt(o){var s=function(e){return e.inline?e.getElement():e.getContentAreaContainer()};return{open:function(e,t){var n,i=w.extend(e,{maxWidth:(n=s(o),Re.getSize(n).width)}),r=new At(i);return 0<(r.args=i).timeout&&(r.timer=setTimeout(function(){r.close(),t()},i.timeout)),r.on("close",function(){t()}),r.renderTo(),r},close:function(e){e.close()},reposition:function(e){K(e,function(e){e.moveTo(0,0)}),function(n){if(0<n.length){var e=n.slice(0,1)[0],t=s(o);e.moveRel(t,"tc-tc"),K(n,function(e,t){0<t&&e.moveRel(n[t-1].getEl(),"bc-tc")})}}(e)},getArgs:function(e){return e.args}}}var Lt=[],zt="";function It(e){var t,n=we("meta[name=viewport]")[0];!1!==fe.overrideViewPort&&(n||((n=_.document.createElement("meta")).setAttribute("name","viewport"),_.document.getElementsByTagName("head")[0].appendChild(n)),(t=n.getAttribute("content"))&&void 0!==zt&&(zt=t),n.setAttribute("content",e?"width=device-width,initial-scale=1.0,user-scalable=0,minimum-scale=1.0,maximum-scale=1.0":zt))}function Ft(e,t){(function(){for(var e=0;e<Lt.length;e++)if(Lt[e]._fullscreen)return!0;return!1})()&&!1===t&&we([_.document.documentElement,_.document.body]).removeClass(e+"fullscreen")}var Ut=kt.extend({modal:!0,Defaults:{border:1,layout:"flex",containerCls:"panel",role:"dialog",callbacks:{submit:function(){this.fire("submit",{data:this.toJSON()})},close:function(){this.close()}}},init:function(e){var n=this;n._super(e),n.isRtl()&&n.classes.add("rtl"),n.classes.add("window"),n.bodyClasses.add("window-body"),n.state.set("fixed",!0),e.buttons&&(n.statusbar=new bt({layout:"flex",border:"1 0 0 0",spacing:3,padding:10,align:"center",pack:n.isRtl()?"start":"end",defaults:{type:"button"},items:e.buttons}),n.statusbar.classes.add("foot"),n.statusbar.parent(n)),n.on("click",function(e){var t=n.classPrefix+"close";(Re.hasClass(e.target,t)||Re.hasClass(e.target.parentNode,t))&&n.close()}),n.on("cancel",function(){n.close()}),n.on("move",function(e){e.control===n&&kt.hideAll()}),n.aria("describedby",n.describedBy||n._id+"-none"),n.aria("label",e.title),n._fullscreen=!1},recalc:function(){var e,t,n,i,r=this,o=r.statusbar;r._fullscreen&&(r.layoutRect(Re.getWindowSize()),r.layoutRect().contentH=r.layoutRect().innerH),r._super(),e=r.layoutRect(),r.settings.title&&!r._fullscreen&&(t=e.headerW)>e.w&&(n=e.x-Math.max(0,t/2),r.layoutRect({w:t,x:n}),i=!0),o&&(o.layoutRect({w:r.layoutRect().innerW}).recalc(),(t=o.layoutRect().minW+e.deltaW)>e.w&&(n=e.x-Math.max(0,t-e.w),r.layoutRect({w:t,x:n}),i=!0)),i&&r.recalc()},initLayoutRect:function(){var e,t=this,n=t._super(),i=0;if(t.settings.title&&!t._fullscreen){e=t.getEl("head");var r=Re.getSize(e);n.headerW=r.width,n.headerH=r.height,i+=n.headerH}t.statusbar&&(i+=t.statusbar.layoutRect().h),n.deltaH+=i,n.minH+=i,n.h+=i;var o=Re.getWindowSize();return n.x=t.settings.x||Math.max(0,o.w/2-n.w/2),n.y=t.settings.y||Math.max(0,o.h/2-n.h/2),n},renderHtml:function(){var e=this,t=e._layout,n=e._id,i=e.classPrefix,r=e.settings,o="",s="",a=r.html;return e.preRender(),t.preRender(e),r.title&&(o='<div id="'+n+'-head" class="'+i+'window-head"><div id="'+n+'-title" class="'+i+'title">'+e.encode(r.title)+'</div><div id="'+n+'-dragh" class="'+i+'dragh"></div><button type="button" class="'+i+'close" aria-hidden="true"><i class="mce-ico mce-i-remove"></i></button></div>'),r.url&&(a='<iframe src="'+r.url+'" tabindex="-1"></iframe>'),void 0===a&&(a=t.renderHtml(e)),e.statusbar&&(s=e.statusbar.renderHtml()),'<div id="'+n+'" class="'+e.classes+'" hidefocus="1"><div class="'+e.classPrefix+'reset" role="application">'+o+'<div id="'+n+'-body" class="'+e.bodyClasses+'">'+a+"</div>"+s+"</div></div>"},fullscreen:function(e){var n,t,i=this,r=_.document.documentElement,o=i.classPrefix;if(e!==i._fullscreen)if(we(_.window).on("resize",function(){var e;if(i._fullscreen)if(n)i._timer||(i._timer=u.setTimeout(function(){var e=Re.getWindowSize();i.moveTo(0,0).resizeTo(e.w,e.h),i._timer=0},50));else{e=(new Date).getTime();var t=Re.getWindowSize();i.moveTo(0,0).resizeTo(t.w,t.h),50<(new Date).getTime()-e&&(n=!0)}}),t=i.layoutRect(),i._fullscreen=e){i._initial={x:t.x,y:t.y,w:t.w,h:t.h},i.borderBox=Pe("0"),i.getEl("head").style.display="none",t.deltaH-=t.headerH+2,we([r,_.document.body]).addClass(o+"fullscreen"),i.classes.add("fullscreen");var s=Re.getWindowSize();i.moveTo(0,0).resizeTo(s.w,s.h)}else i.borderBox=Pe(i.settings.border),i.getEl("head").style.display="",t.deltaH+=t.headerH,we([r,_.document.body]).removeClass(o+"fullscreen"),i.classes.remove("fullscreen"),i.moveTo(i._initial.x,i._initial.y).resizeTo(i._initial.w,i._initial.h);return i.reflow()},postRender:function(){var t,n=this;setTimeout(function(){n.classes.add("in"),n.fire("open")},0),n._super(),n.statusbar&&n.statusbar.postRender(),n.focus(),this.dragHelper=new ft(n._id+"-dragh",{start:function(){t={x:n.layoutRect().x,y:n.layoutRect().y}},drag:function(e){n.moveTo(t.x+e.deltaX,t.y+e.deltaY)}}),n.on("submit",function(e){e.isDefaultPrevented()||n.close()}),Lt.push(n),It(!0)},submit:function(){return this.fire("submit",{data:this.toJSON()})},remove:function(){var e,t=this;for(t.dragHelper.destroy(),t._super(),t.statusbar&&this.statusbar.remove(),Ft(t.classPrefix,!1),e=Lt.length;e--;)Lt[e]===t&&Lt.splice(e,1);It(0<Lt.length)},getContentWindow:function(){var e=this.getEl().getElementsByTagName("iframe")[0];return e?e.contentWindow:null}});!function(){if(!fe.desktop){var n={w:_.window.innerWidth,h:_.window.innerHeight};u.setInterval(function(){var e=_.window.innerWidth,t=_.window.innerHeight;n.w===e&&n.h===t||(n={w:e,h:t},we(_.window).trigger("resize"))},100)}we(_.window).on("resize",function(){var e,t,n=Re.getWindowSize();for(e=0;e<Lt.length;e++)t=Lt[e].layoutRect(),Lt[e].moveTo(Lt[e].settings.x||Math.max(0,n.w/2-t.w/2),Lt[e].settings.y||Math.max(0,n.h/2-t.h/2))})}();var Vt,Yt,$t,qt=Ut.extend({init:function(e){e={border:1,padding:20,layout:"flex",pack:"center",align:"center",containerCls:"panel",autoScroll:!0,buttons:{type:"button",text:"Ok",action:"ok"},items:{type:"label",multiline:!0,maxWidth:500,maxHeight:200}},this._super(e)},Statics:{OK:1,OK_CANCEL:2,YES_NO:3,YES_NO_CANCEL:4,msgBox:function(e){var t,i=e.callback||function(){};function n(e,t,n){return{type:"button",text:e,subtype:n?"primary":"",onClick:function(e){e.control.parents()[1].close(),i(t)}}}switch(e.buttons){case qt.OK_CANCEL:t=[n("Ok",!0,!0),n("Cancel",!1)];break;case qt.YES_NO:case qt.YES_NO_CANCEL:t=[n("Yes",1,!0),n("No",0)],e.buttons===qt.YES_NO_CANCEL&&t.push(n("Cancel",-1));break;default:t=[n("Ok",!0,!0)]}return new Ut({padding:20,x:e.x,y:e.y,minWidth:300,minHeight:100,layout:"flex",pack:"center",align:"center",buttons:t,title:e.title,role:"alertdialog",items:{type:"label",multiline:!0,maxWidth:500,maxHeight:200,text:e.text},onPostRender:function(){this.aria("describedby",this.items()[0]._id)},onClose:e.onClose,onCancel:function(){i(!1)}}).renderTo(_.document.body).reflow()},alert:function(e,t){return"string"==typeof e&&(e={text:e}),e.callback=t,qt.msgBox(e)},confirm:function(e,t){return"string"==typeof e&&(e={text:e}),e.callback=t,e.buttons=qt.OK_CANCEL,qt.msgBox(e)}}}),Xt=function(n){return{renderUI:function(e){return Nt(n,this,e)},resizeTo:function(e,t){return ce(n,e,t)},resizeBy:function(e,t){return de(n,e,t)},getNotificationManagerImpl:function(){return Bt(n)},getWindowManagerImpl:function(){return{open:function(n,e,t){var i;return n.title=n.title||" ",n.url=n.url||n.file,n.url&&(n.width=parseInt(n.width||320,10),n.height=parseInt(n.height||240,10)),n.body&&(n.items={defaults:n.defaults,type:n.bodyType||"form",items:n.body,data:n.data,callbacks:n.commands}),n.url||n.buttons||(n.buttons=[{text:"Ok",subtype:"primary",onclick:function(){i.find("form")[0].submit()}},{text:"Cancel",onclick:function(){i.close()}}]),(i=new Ut(n)).on("close",function(){t(i)}),n.data&&i.on("postRender",function(){this.find("*").each(function(e){var t=e.name();t in n.data&&e.value(n.data[t])})}),i.features=n||{},i.params=e||{},i=i.renderTo(_.document.body).reflow()},alert:function(e,t,n){var i;return(i=qt.alert(e,function(){t()})).on("close",function(){n(i)}),i},confirm:function(e,t,n){var i;return(i=qt.confirm(e,function(e){t(e)})).on("close",function(){n(i)}),i},close:function(e){e.close()},getParams:function(e){return e.params},setParams:function(e,t){e.params=t}}}}},jt=Me.extend({Defaults:{firstControlClass:"first",lastControlClass:"last"},init:function(e){this.settings=w.extend({},this.Defaults,e)},preRender:function(e){e.bodyClasses.add(this.settings.containerClass)},applyClasses:function(e){var t,n,i,r,o=this.settings;t=o.firstControlClass,n=o.lastControlClass,e.each(function(e){e.classes.remove(t).remove(n).add(o.controlClass),e.visible()&&(i||(i=e),r=e)}),i&&i.classes.add(t),r&&r.classes.add(n)},renderHtml:function(e){var t="";return this.applyClasses(e.items()),e.items().each(function(e){t+=e.renderHtml()}),t},recalc:function(){},postRender:function(){},isNative:function(){return!1}}),Jt=jt.extend({Defaults:{containerClass:"abs-layout",controlClass:"abs-layout-item"},recalc:function(e){e.items().filter(":visible").each(function(e){var t=e.settings;e.layoutRect({x:t.x,y:t.y,w:t.w,h:t.h}),e.recalc&&e.recalc()})},renderHtml:function(e){return'<div id="'+e._id+'-absend" class="'+e.classPrefix+'abs-end"></div>'+this._super(e)}}),Gt=Wt.extend({Defaults:{classes:"widget btn",role:"button"},init:function(e){var t,n=this;n._super(e),e=n.settings,t=n.settings.size,n.on("click mousedown",function(e){e.preventDefault()}),n.on("touchstart",function(e){n.fire("click",e),e.preventDefault()}),e.subtype&&n.classes.add(e.subtype),t&&n.classes.add("btn-"+t),e.icon&&n.icon(e.icon)},icon:function(e){return arguments.length?(this.state.set("icon",e),this):this.state.get("icon")},repaint:function(){var e,t=this.getEl().firstChild;t&&((e=t.style).width=e.height="100%"),this._super()},renderHtml:function(){var e,t,n=this,i=n._id,r=n.classPrefix,o=n.state.get("icon"),s=n.state.get("text"),a="",l=n.settings;return(e=l.image)?(o="none","string"!=typeof e&&(e=_.window.getSelection?e[0]:e[1]),e=" style=\"background-image: url('"+e+"')\""):e="",s&&(n.classes.add("btn-has-text"),a='<span class="'+r+'txt">'+n.encode(s)+"</span>"),o=o?r+"ico "+r+"i-"+o:"",t="boolean"==typeof l.active?' aria-pressed="'+l.active+'"':"",'<div id="'+i+'" class="'+n.classes+'" tabindex="-1"'+t+'><button id="'+i+'-button" role="presentation" type="button" tabindex="-1">'+(o?'<i class="'+o+'"'+e+"></i>":"")+a+"</button></div>"},bindStates:function(){var o=this,n=o.$,i=o.classPrefix+"txt";function s(e){var t=n("span."+i,o.getEl());e?(t[0]||(n("button:first",o.getEl()).append('<span class="'+i+'"></span>'),t=n("span."+i,o.getEl())),t.html(o.encode(e))):t.remove(),o.classes.toggle("btn-has-text",!!e)}return o.state.on("change:text",function(e){s(e.value)}),o.state.on("change:icon",function(e){var t=e.value,n=o.classPrefix;t=(o.settings.icon=t)?n+"ico "+n+"i-"+o.settings.icon:"";var i=o.getEl().firstChild,r=i.getElementsByTagName("i")[0];t?(r&&r===i.firstChild||(r=_.document.createElement("i"),i.insertBefore(r,i.firstChild)),r.className=t):r&&i.removeChild(r),s(o.state.get("text"))}),o._super()}}),Kt=Gt.extend({init:function(e){e=w.extend({text:"Browse...",multiple:!1,accept:null},e),this._super(e),this.classes.add("browsebutton"),e.multiple&&this.classes.add("multiple")},postRender:function(){var n=this,t=Re.create("input",{type:"file",id:n._id+"-browse",accept:n.settings.accept});n._super(),we(t).on("change",function(e){var t=e.target.files;n.value=function(){return t.length?n.settings.multiple?t:t[0]:null},e.preventDefault(),t.length&&n.fire("change",e)}),we(t).on("click",function(e){e.stopPropagation()}),we(n.getEl("button")).on("click touchstart",function(e){e.stopPropagation(),t.click()}),n.getEl().appendChild(t)},remove:function(){we(this.getEl("button")).off(),we(this.getEl("input")).off(),this._super()}}),Zt=ct.extend({Defaults:{defaultType:"button",role:"group"},renderHtml:function(){var e=this,t=e._layout;return e.classes.add("btn-group"),e.preRender(),t.preRender(e),'<div id="'+e._id+'" class="'+e.classes+'"><div id="'+e._id+'-body">'+(e.settings.html||"")+t.renderHtml(e)+"</div></div>"}}),Qt=Wt.extend({Defaults:{classes:"checkbox",role:"checkbox",checked:!1},init:function(e){var t=this;t._super(e),t.on("click mousedown",function(e){e.preventDefault()}),t.on("click",function(e){e.preventDefault(),t.disabled()||t.checked(!t.checked())}),t.checked(t.settings.checked)},checked:function(e){return arguments.length?(this.state.set("checked",e),this):this.state.get("checked")},value:function(e){return arguments.length?this.checked(e):this.checked()},renderHtml:function(){var e=this,t=e._id,n=e.classPrefix;return'<div id="'+t+'" class="'+e.classes+'" unselectable="on" aria-labelledby="'+t+'-al" tabindex="-1"><i class="'+n+"ico "+n+'i-checkbox"></i><span id="'+t+'-al" class="'+n+'label">'+e.encode(e.state.get("text"))+"</span></div>"},bindStates:function(){var o=this;function t(e){o.classes.toggle("checked",e),o.aria("checked",e)}return o.state.on("change:text",function(e){o.getEl("al").firstChild.data=o.translate(e.value)}),o.state.on("change:checked change:value",function(e){o.fire("change"),t(e.value)}),o.state.on("change:icon",function(e){var t=e.value,n=o.classPrefix;if(void 0===t)return o.settings.icon;t=(o.settings.icon=t)?n+"ico "+n+"i-"+o.settings.icon:"";var i=o.getEl().firstChild,r=i.getElementsByTagName("i")[0];t?(r&&r===i.firstChild||(r=_.document.createElement("i"),i.insertBefore(r,i.firstChild)),r.className=t):r&&i.removeChild(r)}),o.state.get("checked")&&t(!0),o._super()}}),en=tinymce.util.Tools.resolve("tinymce.util.VK"),tn=Wt.extend({init:function(i){var r=this;r._super(i),i=r.settings,r.classes.add("combobox"),r.subinput=!0,r.ariaTarget="inp",i.menu=i.menu||i.values,i.menu&&(i.icon="caret"),r.on("click",function(e){var t=e.target,n=r.getEl();if(we.contains(n,t)||t===n)for(;t&&t!==n;)t.id&&-1!==t.id.indexOf("-open")&&(r.fire("action"),i.menu&&(r.showMenu(),e.aria&&r.menu.items()[0].focus())),t=t.parentNode}),r.on("keydown",function(e){var t;13===e.keyCode&&"INPUT"===e.target.nodeName&&(e.preventDefault(),r.parents().reverse().each(function(e){if(e.toJSON)return t=e,!1}),r.fire("submit",{data:t.toJSON()}))}),r.on("keyup",function(e){if("INPUT"===e.target.nodeName){var t=r.state.get("value"),n=e.target.value;n!==t&&(r.state.set("value",n),r.fire("autocomplete",e))}}),r.on("mouseover",function(e){var t=r.tooltip().moveTo(-65535);if(r.statusLevel()&&-1!==e.target.className.indexOf(r.classPrefix+"status")){var n=r.statusMessage()||"Ok",i=t.text(n).show().testMoveRel(e.target,["bc-tc","bc-tl","bc-tr"]);t.classes.toggle("tooltip-n","bc-tc"===i),t.classes.toggle("tooltip-nw","bc-tl"===i),t.classes.toggle("tooltip-ne","bc-tr"===i),t.moveRel(e.target,i)}})},statusLevel:function(e){return 0<arguments.length&&this.state.set("statusLevel",e),this.state.get("statusLevel")},statusMessage:function(e){return 0<arguments.length&&this.state.set("statusMessage",e),this.state.get("statusMessage")},showMenu:function(){var e,t=this,n=t.settings;t.menu||((e=n.menu||[]).length?e={type:"menu",items:e}:e.type=e.type||"menu",t.menu=b.create(e).parent(t).renderTo(t.getContainerElm()),t.fire("createmenu"),t.menu.reflow(),t.menu.on("cancel",function(e){e.control===t.menu&&t.focus()}),t.menu.on("show hide",function(e){e.control.items().each(function(e){e.active(e.value()===t.value())})}).fire("show"),t.menu.on("select",function(e){t.value(e.control.value())}),t.on("focusin",function(e){"INPUT"===e.target.tagName.toUpperCase()&&t.menu.hide()}),t.aria("expanded",!0)),t.menu.show(),t.menu.layoutRect({w:t.layoutRect().w}),t.menu.moveRel(t.getEl(),t.isRtl()?["br-tr","tr-br"]:["bl-tl","tl-bl"])},focus:function(){this.getEl("inp").focus()},repaint:function(){var e,t,n=this,i=n.getEl(),r=n.getEl("open"),o=n.layoutRect(),s=0,a=i.firstChild;n.statusLevel()&&"none"!==n.statusLevel()&&(s=parseInt(Re.getRuntimeStyle(a,"padding-right"),10)-parseInt(Re.getRuntimeStyle(a,"padding-left"),10)),e=r?o.w-Re.getSize(r).width-10:o.w-10;var l=_.document;return l.all&&(!l.documentMode||l.documentMode<=8)&&(t=n.layoutRect().h-2+"px"),we(a).css({width:e-s,lineHeight:t}),n._super(),n},postRender:function(){var t=this;return we(this.getEl("inp")).on("change",function(e){t.state.set("value",e.target.value),t.fire("change",e)}),t._super()},renderHtml:function(){var e,t,n,i=this,r=i._id,o=i.settings,s=i.classPrefix,a=i.state.get("value")||"",l="",u="";return"spellcheck"in o&&(u+=' spellcheck="'+o.spellcheck+'"'),o.maxLength&&(u+=' maxlength="'+o.maxLength+'"'),o.size&&(u+=' size="'+o.size+'"'),o.subtype&&(u+=' type="'+o.subtype+'"'),n='<i id="'+r+'-status" class="mce-status mce-ico" style="display: none"></i>',i.disabled()&&(u+=' disabled="disabled"'),(e=o.icon)&&"caret"!==e&&(e=s+"ico "+s+"i-"+o.icon),t=i.state.get("text"),(e||t)&&(l='<div id="'+r+'-open" class="'+s+"btn "+s+'open" tabIndex="-1" role="button"><button id="'+r+'-action" type="button" hidefocus="1" tabindex="-1">'+("caret"!==e?'<i class="'+e+'"></i>':'<i class="'+s+'caret"></i>')+(t?(e?" ":"")+t:"")+"</button></div>",i.classes.add("has-open")),'<div id="'+r+'" class="'+i.classes+'"><input id="'+r+'-inp" class="'+s+'textbox" value="'+i.encode(a,!1)+'" hidefocus="1"'+u+' placeholder="'+i.encode(o.placeholder)+'" />'+n+l+"</div>"},value:function(e){return arguments.length?(this.state.set("value",e),this):(this.state.get("rendered")&&this.state.set("value",this.getEl("inp").value),this.state.get("value"))},showAutoComplete:function(e,i){var r=this;if(0!==e.length){r.menu?r.menu.items().remove():r.menu=b.create({type:"menu",classes:"combobox-menu",layout:"flow"}).parent(r).renderTo(),w.each(e,function(e){var t,n;r.menu.add({text:e.title,url:e.previewUrl,match:i,classes:"menu-item-ellipsis",onclick:(t=e.value,n=e.title,function(){r.fire("selectitem",{title:n,value:t})})})}),r.menu.renderNew(),r.hideMenu(),r.menu.on("cancel",function(e){e.control.parent()===r.menu&&(e.stopPropagation(),r.focus(),r.hideMenu())}),r.menu.on("select",function(){r.focus()});var t=r.layoutRect().w;r.menu.layoutRect({w:t,minW:0,maxW:t}),r.menu.repaint(),r.menu.reflow(),r.menu.show(),r.menu.moveRel(r.getEl(),r.isRtl()?["br-tr","tr-br"]:["bl-tl","tl-bl"])}else r.hideMenu()},hideMenu:function(){this.menu&&this.menu.hide()},bindStates:function(){var r=this;r.state.on("change:value",function(e){r.getEl("inp").value!==e.value&&(r.getEl("inp").value=e.value)}),r.state.on("change:disabled",function(e){r.getEl("inp").disabled=e.value}),r.state.on("change:statusLevel",function(e){var t=r.getEl("status"),n=r.classPrefix,i=e.value;Re.css(t,"display","none"===i?"none":""),Re.toggleClass(t,n+"i-checkmark","ok"===i),Re.toggleClass(t,n+"i-warning","warn"===i),Re.toggleClass(t,n+"i-error","error"===i),r.classes.toggle("has-status","none"!==i),r.repaint()}),Re.on(r.getEl("status"),"mouseleave",function(){r.tooltip().hide()}),r.on("cancel",function(e){r.menu&&r.menu.visible()&&(e.stopPropagation(),r.hideMenu())});var n=function(e,t){t&&0<t.items().length&&t.items().eq(e)[0].focus()};return r.on("keydown",function(e){var t=e.keyCode;"INPUT"===e.target.nodeName&&(t===en.DOWN?(e.preventDefault(),r.fire("autocomplete"),n(0,r.menu)):t===en.UP&&(e.preventDefault(),n(-1,r.menu)))}),r._super()},remove:function(){we(this.getEl("inp")).off(),this.menu&&this.menu.remove(),this._super()}}),nn=tn.extend({init:function(e){var t=this;e.spellcheck=!1,e.onaction&&(e.icon="none"),t._super(e),t.classes.add("colorbox"),t.on("change keyup postrender",function(){t.repaintColor(t.value())})},repaintColor:function(e){var t=this.getEl("open"),n=t?t.getElementsByTagName("i")[0]:null;if(n)try{n.style.background=e}catch(i){}},bindStates:function(){var t=this;return t.state.on("change:value",function(e){t.state.get("rendered")&&t.repaintColor(e.value)}),t._super()}}),rn=Gt.extend({showPanel:function(){var t=this,e=t.settings;if(t.classes.add("opened"),t.panel)t.panel.show();else{var n=e.panel;n.type&&(n={layout:"grid",items:n}),n.role=n.role||"dialog",n.popover=!0,n.autohide=!0,n.ariaRoot=!0,t.panel=new kt(n).on("hide",function(){t.classes.remove("opened")}).on("cancel",function(e){e.stopPropagation(),t.focus(),t.hidePanel()}).parent(t).renderTo(t.getContainerElm()),t.panel.fire("show"),t.panel.reflow()}var i=t.panel.testMoveRel(t.getEl(),e.popoverAlign||(t.isRtl()?["bc-tc","bc-tl","bc-tr"]:["bc-tc","bc-tr","bc-tl","tc-bc","tc-br","tc-bl"]));t.panel.classes.toggle("start","l"===i.substr(-1)),t.panel.classes.toggle("end","r"===i.substr(-1));var r="t"===i.substr(0,1);t.panel.classes.toggle("bottom",!r),t.panel.classes.toggle("top",r),t.panel.moveRel(t.getEl(),i)},hidePanel:function(){this.panel&&this.panel.hide()},postRender:function(){var t=this;return t.aria("haspopup",!0),t.on("click",function(e){e.control===t&&(t.panel&&t.panel.visible()?t.hidePanel():(t.showPanel(),t.panel.focus(!!e.aria)))}),t._super()},remove:function(){return this.panel&&(this.panel.remove(),this.panel=null),this._super()}}),on=v.DOM,sn=rn.extend({init:function(e){this._super(e),this.classes.add("splitbtn"),this.classes.add("colorbutton")},color:function(e){return e?(this._color=e,this.getEl("preview").style.backgroundColor=e,this):this._color},resetColor:function(){return this._color=null,this.getEl("preview").style.backgroundColor=null,this},renderHtml:function(){var e=this,t=e._id,n=e.classPrefix,i=e.state.get("text"),r=e.settings.icon?n+"ico "+n+"i-"+e.settings.icon:"",o=e.settings.image?" style=\"background-image: url('"+e.settings.image+"')\"":"",s="";return i&&(e.classes.add("btn-has-text"),s='<span class="'+n+'txt">'+e.encode(i)+"</span>"),'<div id="'+t+'" class="'+e.classes+'" role="button" tabindex="-1" aria-haspopup="true"><button role="presentation" hidefocus="1" type="button" tabindex="-1">'+(r?'<i class="'+r+'"'+o+"></i>":"")+'<span id="'+t+'-preview" class="'+n+'preview"></span>'+s+'</button><button type="button" class="'+n+'open" hidefocus="1" tabindex="-1"> <i class="'+n+'caret"></i></button></div>'},postRender:function(){var t=this,n=t.settings.onclick;return t.on("click",function(e){e.aria&&"down"===e.aria.key||e.control!==t||on.getParent(e.target,"."+t.classPrefix+"open")||(e.stopImmediatePropagation(),n.call(t,e))}),delete t.settings.onclick,t._super()}}),an=tinymce.util.Tools.resolve("tinymce.util.Color"),ln=Wt.extend({Defaults:{classes:"widget colorpicker"},init:function(e){this._super(e)},postRender:function(){var n,i,r,o,s,a=this,l=a.color();function u(e,t){var n,i,r=Re.getPos(e);return n=t.pageX-r.x,i=t.pageY-r.y,{x:n=Math.max(0,Math.min(n/e.clientWidth,1)),y:i=Math.max(0,Math.min(i/e.clientHeight,1))}}function c(e,t){var n=(360-e.h)/360;Re.css(r,{top:100*n+"%"}),t||Re.css(s,{left:e.s+"%",top:100-e.v+"%"}),o.style.background=an({s:100,v:100,h:e.h}).toHex(),a.color().parse({s:e.s,v:e.v,h:e.h})}function e(e){var t;t=u(o,e),n.s=100*t.x,n.v=100*(1-t.y),c(n),a.fire("change")}function t(e){var t;t=u(i,e),(n=l.toHsv()).h=360*(1-t.y),c(n,!0),a.fire("change")}i=a.getEl("h"),r=a.getEl("hp"),o=a.getEl("sv"),s=a.getEl("svp"),a._repaint=function(){c(n=l.toHsv())},a._super(),a._svdraghelper=new ft(a._id+"-sv",{start:e,drag:e}),a._hdraghelper=new ft(a._id+"-h",{start:t,drag:t}),a._repaint()},rgb:function(){return this.color().toRgb()},value:function(e){if(!arguments.length)return this.color().toHex();this.color().parse(e),this._rendered&&this._repaint()},color:function(){return this._color||(this._color=an()),this._color},renderHtml:function(){var e,t=this._id,o=this.classPrefix,s="#ff0000,#ff0080,#ff00ff,#8000ff,#0000ff,#0080ff,#00ffff,#00ff80,#00ff00,#80ff00,#ffff00,#ff8000,#ff0000";return e='<div id="'+t+'-h" class="'+o+'colorpicker-h" style="background: -ms-linear-gradient(top,'+s+");background: linear-gradient(to bottom,"+s+');">'+function(){var e,t,n,i,r="";for(n="filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=",e=0,t=(i=s.split(",")).length-1;e<t;e++)r+='<div class="'+o+'colorpicker-h-chunk" style="height:'+100/t+"%;"+n+i[e]+",endColorstr="+i[e+1]+");-ms-"+n+i[e]+",endColorstr="+i[e+1]+')"></div>';return r}()+'<div id="'+t+'-hp" class="'+o+'colorpicker-h-marker"></div></div>','<div id="'+t+'" class="'+this.classes+'"><div id="'+t+'-sv" class="'+o+'colorpicker-sv"><div class="'+o+'colorpicker-overlay1"><div class="'+o+'colorpicker-overlay2"><div id="'+t+'-svp" class="'+o+'colorpicker-selector1"><div class="'+o+'colorpicker-selector2"></div></div></div></div></div>'+e+"</div>"}}),un=Wt.extend({init:function(e){e=w.extend({height:100,text:"Drop an image here",multiple:!1,accept:null},e),this._super(e),this.classes.add("dropzone"),e.multiple&&this.classes.add("multiple")},renderHtml:function(){var e,t,n=this.settings;return e={id:this._id,hidefocus:"1"},t=Re.create("div",e,"<span>"+this.translate(n.text)+"</span>"),n.height&&Re.css(t,"height",n.height+"px"),n.width&&Re.css(t,"width",n.width+"px"),t.className=this.classes,t.outerHTML},postRender:function(){var i=this,e=function(e){e.preventDefault(),i.classes.toggle("dragenter"),i.getEl().className=i.classes};i._super(),i.$el.on("dragover",function(e){e.preventDefault()}),i.$el.on("dragenter",e),i.$el.on("dragleave",e),i.$el.on("drop",function(e){if(e.preventDefault(),!i.state.get("disabled")){var t=function(e){var t=i.settings.accept;if("string"!=typeof t)return e;var n=new RegExp("("+t.split(/\s*,\s*/).join("|")+")$","i");return w.grep(e,function(e){return n.test(e.name)})}(e.dataTransfer.files);i.value=function(){return t.length?i.settings.multiple?t:t[0]:null},t.length&&i.fire("change",e)}})},remove:function(){this.$el.off(),this._super()}}),cn=Wt.extend({init:function(e){var n=this;e.delimiter||(e.delimiter="\xbb"),n._super(e),n.classes.add("path"),n.canFocus=!0,n.on("click",function(e){var t;(t=e.target.getAttribute("data-index"))&&n.fire("select",{value:n.row()[t],index:t})}),n.row(n.settings.row)},focus:function(){return this.getEl().firstChild.focus(),this},row:function(e){return arguments.length?(this.state.set("row",e),this):this.state.get("row")},renderHtml:function(){return'<div id="'+this._id+'" class="'+this.classes+'">'+this._getDataPathHtml(this.state.get("row"))+"</div>"},bindStates:function(){var t=this;return t.state.on("change:row",function(e){t.innerHtml(t._getDataPathHtml(e.value))}),t._super()},_getDataPathHtml:function(e){var t,n,i=e||[],r="",o=this.classPrefix;for(t=0,n=i.length;t<n;t++)r+=(0<t?'<div class="'+o+'divider" aria-hidden="true"> '+this.settings.delimiter+" </div>":"")+'<div role="button" class="'+o+"path-item"+(t===n-1?" "+o+"last":"")+'" data-index="'+t+'" tabindex="-1" id="'+this._id+"-"+t+'" aria-level="'+(t+1)+'">'+i[t].name+"</div>";return r||(r='<div class="'+o+'path-item">\xa0</div>'),r}}),dn=cn.extend({postRender:function(){var o=this,s=o.settings.editor;function a(e){if(1===e.nodeType){if("BR"===e.nodeName||e.getAttribute("data-mce-bogus"))return!0;if("bookmark"===e.getAttribute("data-mce-type"))return!0}return!1}return!1!==s.settings.elementpath&&(o.on("select",function(e){s.focus(),s.selection.select(this.row()[e.index].element),s.nodeChanged()}),s.on("nodeChange",function(e){for(var t=[],n=e.parents,i=n.length;i--;)if(1===n[i].nodeType&&!a(n[i])){var r=s.fire("ResolveName",{name:n[i].nodeName.toLowerCase(),target:n[i]});if(r.isDefaultPrevented()||t.push({name:r.name,element:n[i]}),r.isPropagationStopped())break}o.row(t)})),o._super()}}),fn=ct.extend({Defaults:{layout:"flex",align:"center",defaults:{flex:1}},renderHtml:function(){var e=this,t=e._layout,n=e.classPrefix;return e.classes.add("formitem"),t.preRender(e),'<div id="'+e._id+'" class="'+e.classes+'" hidefocus="1" tabindex="-1">'+(e.settings.title?'<div id="'+e._id+'-title" class="'+n+'title">'+e.settings.title+"</div>":"")+'<div id="'+e._id+'-body" class="'+e.bodyClasses+'">'+(e.settings.html||"")+t.renderHtml(e)+"</div></div>"}}),hn=ct.extend({Defaults:{containerCls:"form",layout:"flex",direction:"column",align:"stretch",flex:1,padding:15,labelGap:30,spacing:10,callbacks:{submit:function(){this.submit()}}},preRender:function(){var i=this,e=i.items();i.settings.formItemDefaults||(i.settings.formItemDefaults={layout:"flex",autoResize:"overflow",defaults:{flex:1}}),e.each(function(e){var t,n=e.settings.label;n&&((t=new fn(w.extend({items:{type:"label",id:e._id+"-l",text:n,flex:0,forId:e._id,disabled:e.disabled()}},i.settings.formItemDefaults))).type="formitem",e.aria("labelledby",e._id+"-l"),"undefined"==typeof e.settings.flex&&(e.settings.flex=1),i.replace(e,t),t.add(e))})},submit:function(){return this.fire("submit",{data:this.toJSON()})},postRender:function(){this._super(),this.fromJSON(this.settings.data)},bindStates:function(){var n=this;function e(){var e,t,i=0,r=[];if(!1!==n.settings.labelGapCalc)for(("children"===n.settings.labelGapCalc?n.find("formitem"):n.items()).filter("formitem").each(function(e){var t=e.items()[0],n=t.getEl().clientWidth;i=i<n?n:i,r.push(t)}),t=n.settings.labelGap||0,e=r.length;e--;)r[e].settings.minWidth=i+t}n._super(),n.on("show",e),e()}}),mn=hn.extend({Defaults:{containerCls:"fieldset",layout:"flex",direction:"column",align:"stretch",flex:1,padding:"25 15 5 15",labelGap:30,spacing:10,border:1},renderHtml:function(){var e=this,t=e._layout,n=e.classPrefix;return e.preRender(),t.preRender(e),'<fieldset id="'+e._id+'" class="'+e.classes+'" hidefocus="1" tabindex="-1">'+(e.settings.title?'<legend id="'+e._id+'-title" class="'+n+'fieldset-title">'+e.settings.title+"</legend>":"")+'<div id="'+e._id+'-body" class="'+e.bodyClasses+'">'+(e.settings.html||"")+t.renderHtml(e)+"</div></fieldset>"}}),gn=0,pn=function(e){if(null===e||e===undefined)throw new Error("Node cannot be null or undefined");return{dom:H(e)}},vn={fromHtml:function(e,t){var n=(t||_.document).createElement("div");if(n.innerHTML=e,!n.hasChildNodes()||1<n.childNodes.length)throw _.console.error("HTML does not have a single root node",e),new Error("HTML must have a single root node");return pn(n.childNodes[0])},fromTag:function(e,t){var n=(t||_.document).createElement(e);return pn(n)},fromText:function(e,t){var n=(t||_.document).createTextNode(e);return pn(n)},fromDom:pn,fromPoint:function(e,t,n){var i=e.dom();return D.from(i.elementFromPoint(t,n)).map(pn)}},bn=(_.Node.ATTRIBUTE_NODE,_.Node.CDATA_SECTION_NODE,_.Node.COMMENT_NODE,_.Node.DOCUMENT_NODE),yn=(_.Node.DOCUMENT_TYPE_NODE,_.Node.DOCUMENT_FRAGMENT_NODE,_.Node.ELEMENT_NODE),xn=(_.Node.TEXT_NODE,_.Node.PROCESSING_INSTRUCTION_NODE,_.Node.ENTITY_REFERENCE_NODE,_.Node.ENTITY_NODE,_.Node.NOTATION_NODE,"undefined"!=typeof _.window?_.window:Function("return this;")(),function(e,t){var n=function(e,t){for(var n=0;n<e.length;n++){var i=e[n];if(i.test(t))return i}return undefined}(e,t);if(!n)return{major:0,minor:0};var i=function(e){return Number(t.replace(n,"$"+e))};return _n(i(1),i(2))}),wn=function(){return _n(0,0)},_n=function(e,t){return{major:e,minor:t}},Rn={nu:_n,detect:function(e,t){var n=String(t).toLowerCase();return 0===e.length?wn():xn(e,n)},unknown:wn},Cn="Firefox",En=function(e,t){return function(){return t===e}},kn=function(e){var t=e.current;return{current:t,version:e.version,isEdge:En("Edge",t),isChrome:En("Chrome",t),isIE:En("IE",t),isOpera:En("Opera",t),isFirefox:En(Cn,t),isSafari:En("Safari",t)}},Hn={unknown:function(){return kn({current:undefined,version:Rn.unknown()})},nu:kn,edge:H("Edge"),chrome:H("Chrome"),ie:H("IE"),opera:H("Opera"),firefox:H(Cn),safari:H("Safari")},Sn="Windows",Tn="Android",Mn="Solaris",Nn="FreeBSD",Pn=function(e,t){return function(){return t===e}},Wn=function(e){var t=e.current;return{current:t,version:e.version,isWindows:Pn(Sn,t),isiOS:Pn("iOS",t),isAndroid:Pn(Tn,t),isOSX:Pn("OSX",t),isLinux:Pn("Linux",t),isSolaris:Pn(Mn,t),isFreeBSD:Pn(Nn,t)}},Dn={unknown:function(){return Wn({current:undefined,version:Rn.unknown()})},nu:Wn,windows:H(Sn),ios:H("iOS"),android:H(Tn),linux:H("Linux"),osx:H("OSX"),solaris:H(Mn),freebsd:H(Nn)},On=function(e,t){var n=String(t).toLowerCase();return function(e,t){for(var n=0,i=e.length;n<i;n++){var r=e[n];if(t(r,n,e))return D.some(r)}return D.none()}(e,function(e){return e.search(n)})},An=function(e,n){return On(e,n).map(function(e){var t=Rn.detect(e.versionRegexes,n);return{current:e.name,version:t}})},Bn=function(e,n){return On(e,n).map(function(e){var t=Rn.detect(e.versionRegexes,n);return{current:e.name,version:t}})},Ln=function(e,t){return-1!==e.indexOf(t)},zn=/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,In=function(t){return function(e){return Ln(e,t)}},Fn=[{name:"Edge",versionRegexes:[/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],search:function(e){return Ln(e,"edge/")&&Ln(e,"chrome")&&Ln(e,"safari")&&Ln(e,"applewebkit")}},{name:"Chrome",versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/,zn],search:function(e){return Ln(e,"chrome")&&!Ln(e,"chromeframe")}},{name:"IE",versionRegexes:[/.*?msie\ ?([0-9]+)\.([0-9]+).*/,/.*?rv:([0-9]+)\.([0-9]+).*/],search:function(e){return Ln(e,"msie")||Ln(e,"trident")}},{name:"Opera",versionRegexes:[zn,/.*?opera\/([0-9]+)\.([0-9]+).*/],search:In("opera")},{name:"Firefox",versionRegexes:[/.*?firefox\/\ ?([0-9]+)\.([0-9]+).*/],search:In("firefox")},{name:"Safari",versionRegexes:[zn,/.*?cpu os ([0-9]+)_([0-9]+).*/],search:function(e){return(Ln(e,"safari")||Ln(e,"mobile/"))&&Ln(e,"applewebkit")}}],Un=[{name:"Windows",search:In("win"),versionRegexes:[/.*?windows\ nt\ ?([0-9]+)\.([0-9]+).*/]},{name:"iOS",search:function(e){return Ln(e,"iphone")||Ln(e,"ipad")},versionRegexes:[/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,/.*cpu os ([0-9]+)_([0-9]+).*/,/.*cpu iphone os ([0-9]+)_([0-9]+).*/]},{name:"Android",search:In("android"),versionRegexes:[/.*?android\ ?([0-9]+)\.([0-9]+).*/]},{name:"OSX",search:In("os x"),versionRegexes:[/.*?os\ x\ ?([0-9]+)_([0-9]+).*/]},{name:"Linux",search:In("linux"),versionRegexes:[]},{name:"Solaris",search:In("sunos"),versionRegexes:[]},{name:"FreeBSD",search:In("freebsd"),versionRegexes:[]}],Vn={browsers:H(Fn),oses:H(Un)},Yn=function(e){var t,n,i,r,o,s,a,l,u,c,d,f=Vn.browsers(),h=Vn.oses(),m=An(f,e).fold(Hn.unknown,Hn.nu),g=Bn(h,e).fold(Dn.unknown,Dn.nu);return{browser:m,os:g,deviceType:(n=m,i=e,r=(t=g).isiOS()&&!0===/ipad/i.test(i),o=t.isiOS()&&!r,s=t.isAndroid()&&3===t.version.major,a=t.isAndroid()&&4===t.version.major,l=r||s||a&&!0===/mobile/i.test(i),u=t.isiOS()||t.isAndroid(),c=u&&!l,d=n.isSafari()&&t.isiOS()&&!1===/safari/i.test(i),{isiPad:H(r),isiPhone:H(o),isTablet:H(l),isPhone:H(c),isTouch:H(u),isAndroid:t.isAndroid,isiOS:t.isiOS,isWebView:H(d)})}},$n=($t=!(Vt=function(){var e=_.navigator.userAgent;return Yn(e)}),function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return $t||($t=!0,Yt=Vt.apply(null,e)),Yt}),qn=yn,Xn=bn,jn=function(e){return e.nodeType!==qn&&e.nodeType!==Xn||0===e.childElementCount},Jn=($n().browser.isIE(),function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t]}("element","offset"),w.trim),Gn=function(t){return function(e){if(e&&1===e.nodeType){if(e.contentEditable===t)return!0;if(e.getAttribute("data-mce-contenteditable")===t)return!0}return!1}},Kn=Gn("true"),Zn=Gn("false"),Qn=function(e,t,n,i,r){return{type:e,title:t,url:n,level:i,attach:r}},ei=function(e){return e.innerText||e.textContent},ti=function(e){return e.id?e.id:(t="h",n=(new Date).getTime(),t+"_"+Math.floor(1e9*Math.random())+ ++gn+String(n));var t,n},ni=function(e){return(t=e)&&"A"===t.nodeName&&(t.id||t.name)&&ri(e);var t},ii=function(e){return e&&/^(H[1-6])$/.test(e.nodeName)},ri=function(e){return function(e){for(;e=e.parentNode;){var t=e.contentEditable;if(t&&"inherit"!==t)return Kn(e)}return!1}(e)&&!Zn(e)},oi=function(e){return ii(e)&&ri(e)},si=function(e){var t,n=ti(e);return Qn("header",ei(e),"#"+n,ii(t=e)?parseInt(t.nodeName.substr(1),10):0,function(){e.id=n})},ai=function(e){var t=e.id||e.name,n=ei(e);return Qn("anchor",n||"#"+t,"#"+t,0,k)},li=function(e){var t,n,i,r,o,s;return t="h1,h2,h3,h4,h5,h6,a:not([href])",n=e,G(($n().browser.isIE(),function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t]}("element","offset"),i=vn.fromDom(n),r=t,s=(o=i)===undefined?_.document:o.dom(),jn(s)?[]:G(s.querySelectorAll(r),vn.fromDom)),function(e){return e.dom()})},ui=function(e){return 0<Jn(e.title).length},ci=function(e){var t,n=li(e);return Z((t=n,G(Z(t,oi),si)).concat(G(Z(n,ni),ai)),ui)},di={},fi=function(e){return{title:e.title,value:{title:{raw:e.title},url:e.url,attach:e.attach}}},hi=function(e,t){return{title:e,value:{title:e,url:t,attach:k}}},mi=function(e,t,n){var i=t in e?e[t]:n;return!1===i?null:i},gi=function(e,i,r,t){var n,o,s,a,l,u,c={title:"-"},d=function(e){var t=e.hasOwnProperty(r)?e[r]:[],n=Z(t,function(e){return t=e,!J(i,function(e){return e.url===t});var t});return w.map(n,function(e){return{title:e,value:{title:e,url:e,attach:k}}})},f=function(t){var e,n=Z(i,function(e){return e.type===t});return e=n,w.map(e,fi)};return!1===t.typeahead_urls?[]:"file"===r?(n=[vi(e,d(di)),vi(e,f("header")),vi(e,(a=f("anchor"),l=mi(t,"anchor_top","#top"),u=mi(t,"anchor_bottom","#bottom"),null!==l&&a.unshift(hi("<top>",l)),null!==u&&a.push(hi("<bottom>",u)),a))],o=function(e,t){return 0===e.length||0===t.length?e.concat(t):e.concat(c,t)},s=[],K(n,function(e){s=o(s,e)}),s):vi(e,d(di))},pi=function(e,t){var n,i,r,o=di[t];/^https?/.test(e)&&(o?(n=o,i=e,r=j(n,i),-1===r?D.none():D.some(r)).isNone()&&(di[t]=o.slice(0,5).concat(e)):di[t]=[e])},vi=function(e,t){var n=e.toLowerCase(),i=w.grep(t,function(e){return-1!==e.title.toLowerCase().indexOf(n)});return 1===i.length&&i[0].title===e?[]:i},bi=function(o,e,n){var i=e.filepicker_validator_handler;i&&o.state.on("change:value",function(e){var t;0!==(t=e.value).length?i({url:t,type:n},function(e){var t,n,i,r=(n=(t=e).status,i=t.message,"valid"===n?{status:"ok",message:i}:"unknown"===n?{status:"warn",message:i}:"invalid"===n?{status:"warn",message:i}:{status:"none",message:""});o.statusMessage(r.message),o.statusLevel(r.status)}):o.statusLevel("none")})},yi=tn.extend({Statics:{clearHistory:function(){di={}}},init:function(e){var t,n,i,r,o,s,a,l,u=this,c=window.tinymce?window.tinymce.activeEditor:h.activeEditor,d=c.settings,f=e.filetype;e.spellcheck=!1,(i=d.file_picker_types||d.file_browser_callback_types)&&(i=w.makeMap(i,/[, ]/)),i&&!i[f]||(!(n=d.file_picker_callback)||i&&!i[f]?!(n=d.file_browser_callback)||i&&!i[f]||(t=function(){n(u.getEl("inp").id,u.value(),f,window)}):t=function(){var e=u.fire("beforecall").meta;e=w.extend({filetype:f},e),n.call(c,function(e,t){u.value(e).fire("change",{meta:t})},u.value(),e)}),t&&(e.icon="browse",e.onaction=t),u._super(e),u.classes.add("filepicker"),r=u,o=d,s=c.getBody(),a=f,l=function(e){var t=ci(s),n=gi(e,t,a,o);r.showAutoComplete(n,e)},r.on("autocomplete",function(){l(r.value())}),r.on("selectitem",function(e){var t=e.value;r.value(t.url);var n,i=(n=t.title).raw?n.raw:n;"image"===a?r.fire("change",{meta:{alt:i,attach:t.attach}}):r.fire("change",{meta:{text:i,attach:t.attach}}),r.focus()}),r.on("click",function(e){0===r.value().length&&"INPUT"===e.target.nodeName&&l("")}),r.on("PostRender",function(){r.getRoot().on("submit",function(e){e.isDefaultPrevented()||pi(r.value(),a)})}),bi(u,d,f)}}),xi=Jt.extend({recalc:function(e){var t=e.layoutRect(),n=e.paddingBox;e.items().filter(":visible").each(function(e){e.layoutRect({x:n.left,y:n.top,w:t.innerW-n.right-n.left,h:t.innerH-n.top-n.bottom}),e.recalc&&e.recalc()})}}),wi=Jt.extend({recalc:function(e){var t,n,i,r,o,s,a,l,u,c,d,f,h,m,g,p,v,b,y,x,w,_,R,C,E,k,H,S,T,M,N,P,W,D,O,A,B,L=[],z=Math.max,I=Math.min;for(i=e.items().filter(":visible"),r=e.layoutRect(),o=e.paddingBox,s=e.settings,f=e.isRtl()?s.direction||"row-reversed":s.direction,a=s.align,l=e.isRtl()?s.pack||"end":s.pack,u=s.spacing||0,"row-reversed"!==f&&"column-reverse"!==f||(i=i.set(i.toArray().reverse()),f=f.split("-")[0]),"column"===f?(C="y",_="h",R="minH",E="maxH",H="innerH",k="top",S="deltaH",T="contentH",D="left",P="w",M="x",N="innerW",W="minW",O="right",A="deltaW",B="contentW"):(C="x",_="w",R="minW",E="maxW",H="innerW",k="left",S="deltaW",T="contentW",D="top",P="h",M="y",N="innerH",W="minH",O="bottom",A="deltaH",B="contentH"),d=r[H]-o[k]-o[k],w=c=0,t=0,n=i.length;t<n;t++)m=(h=i[t]).layoutRect(),d-=t<n-1?u:0,0<(g=h.settings.flex)&&(c+=g,m[E]&&L.push(h),m.flex=g),d-=m[R],w<(p=o[D]+m[W]+o[O])&&(w=p);if((y={})[R]=d<0?r[R]-d+r[S]:r[H]-d+r[S],y[W]=w+r[A],y[T]=r[H]-d,y[B]=w,y.minW=I(y.minW,r.maxW),y.minH=I(y.minH,r.maxH),y.minW=z(y.minW,r.startMinWidth),y.minH=z(y.minH,r.startMinHeight),!r.autoResize||y.minW===r.minW&&y.minH===r.minH){for(b=d/c,t=0,n=L.length;t<n;t++)(v=(m=(h=L[t]).layoutRect())[E])<(p=m[R]+m.flex*b)?(d-=m[E]-m[R],c-=m.flex,m.flex=0,m.maxFlexSize=v):m.maxFlexSize=0;for(b=d/c,x=o[k],y={},0===c&&("end"===l?x=d+o[k]:"center"===l?(x=Math.round(r[H]/2-(r[H]-d)/2)+o[k])<0&&(x=o[k]):"justify"===l&&(x=o[k],u=Math.floor(d/(i.length-1)))),y[M]=o[D],t=0,n=i.length;t<n;t++)p=(m=(h=i[t]).layoutRect()).maxFlexSize||m[R],"center"===a?y[M]=Math.round(r[N]/2-m[P]/2):"stretch"===a?(y[P]=z(m[W]||0,r[N]-o[D]-o[O]),y[M]=o[D]):"end"===a&&(y[M]=r[N]-m[P]-o.top),0<m.flex&&(p+=m.flex*b),y[_]=p,y[C]=x,h.layoutRect(y),h.recalc&&h.recalc(),x+=p+u}else if(y.w=y.minW,y.h=y.minH,e.layoutRect(y),this.recalc(e),null===e._lastRect){var F=e.parent();F&&(F._lastRect=null,F.recalc())}}}),_i=jt.extend({Defaults:{containerClass:"flow-layout",controlClass:"flow-layout-item",endClass:"break"},recalc:function(e){e.items().filter(":visible").each(function(e){e.recalc&&e.recalc()})},isNative:function(){return!0}}),Ri=function(e,t){return n=t,r=(i=e)===undefined?_.document:i.dom(),jn(r)?D.none():D.from(r.querySelector(n)).map(vn.fromDom);var n,i,r},Ci=function(e,t){return function(){e.execCommand("mceToggleFormat",!1,t)}},Ei=function(e,t,n){var i=function(e){n(e,t)};e.formatter?e.formatter.formatChanged(t,i):e.on("init",function(){e.formatter.formatChanged(t,i)})},ki=function(e,n){return function(t){Ei(e,n,function(e){t.control.active(e)})}},Hi=function(i){var t=["alignleft","aligncenter","alignright","alignjustify"],r="alignleft",e=[{text:"Left",icon:"alignleft",onclick:Ci(i,"alignleft")},{text:"Center",icon:"aligncenter",onclick:Ci(i,"aligncenter")},{text:"Right",icon:"alignright",onclick:Ci(i,"alignright")},{text:"Justify",icon:"alignjustify",onclick:Ci(i,"alignjustify")}];i.addMenuItem("align",{text:"Align",menu:e}),i.addButton("align",{type:"menubutton",icon:r,menu:e,onShowMenu:function(e){var n=e.control.menu;w.each(t,function(t,e){n.items().eq(e).each(function(e){return e.active(i.formatter.match(t))})})},onPostRender:function(e){var n=e.control;w.each(t,function(t,e){Ei(i,t,function(e){n.icon(r),e&&n.icon(t)})})}}),w.each({alignleft:["Align left","JustifyLeft"],aligncenter:["Align center","JustifyCenter"],alignright:["Align right","JustifyRight"],alignjustify:["Justify","JustifyFull"],alignnone:["No alignment","JustifyNone"]},function(e,t){i.addButton(t,{active:!1,tooltip:e[0],cmd:e[1],onPostRender:ki(i,t)})})},Si=function(e){return e?e.split(",")[0]:""},Ti=function(l,u){return function(){var a=this;a.state.set("value",null),l.on("init nodeChange",function(e){var t,n,i,r,o=l.queryCommandValue("FontName"),s=(t=u,r=(n=o)?n.toLowerCase():"",w.each(t,function(e){e.value.toLowerCase()===r&&(i=e.value)}),w.each(t,function(e){i||Si(e.value).toLowerCase()!==Si(r).toLowerCase()||(i=e.value)}),i);a.value(s||null),!s&&o&&a.text(Si(o))})}},Mi=function(n){n.addButton("fontselect",function(){var e,t=(e=function(e){for(var t=(e=e.replace(/;$/,"").split(";")).length;t--;)e[t]=e[t].split("=");return e}(n.settings.font_formats||"Andale Mono=andale mono,monospace;Arial=arial,helvetica,sans-serif;Arial Black=arial black,sans-serif;Book Antiqua=book antiqua,palatino,serif;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,palatino,serif;Helvetica=helvetica,arial,sans-serif;Impact=impact,sans-serif;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco,monospace;Times New Roman=times new roman,times,serif;Trebuchet MS=trebuchet ms,geneva,sans-serif;Verdana=verdana,geneva,sans-serif;Webdings=webdings;Wingdings=wingdings,zapf dingbats"),w.map(e,function(e){return{text:{raw:e[0]},value:e[1],textStyle:-1===e[1].indexOf("dings")?"font-family:"+e[1]:""}}));return{type:"listbox",text:"Font Family",tooltip:"Font Family",values:t,fixedWidth:!0,onPostRender:Ti(n,t),onselect:function(e){e.control.settings.value&&n.execCommand("FontName",!1,e.control.settings.value)}}})},Ni=function(e){Mi(e)},Pi=function(e,t){return/[0-9.]+px$/.test(e)?(n=72*parseInt(e,10)/96,i=t||0,r=Math.pow(10,i),Math.round(n*r)/r+"pt"):e;var n,i,r},Wi=function(e,t,n){var i;return w.each(e,function(e){e.value===n?i=n:e.value===t&&(i=t)}),i},Di=function(n){n.addButton("fontsizeselect",function(){var e,s,a,t=(e=n.settings.fontsize_formats||"8pt 10pt 12pt 14pt 18pt 24pt 36pt",w.map(e.split(" "),function(e){var t=e,n=e,i=e.split("=");return 1<i.length&&(t=i[0],n=i[1]),{text:t,value:n}}));return{type:"listbox",text:"Font Sizes",tooltip:"Font Sizes",values:t,fixedWidth:!0,onPostRender:(s=n,a=t,function(){var o=this;s.on("init nodeChange",function(e){var t,n,i,r;if(t=s.queryCommandValue("FontSize"))for(i=3;!r&&0<=i;i--)n=Pi(t,i),r=Wi(a,n,t);o.value(r||null),r||o.text(n)})}),onclick:function(e){e.control.settings.value&&n.execCommand("FontSize",!1,e.control.settings.value)}}})},Oi=function(e){Di(e)},Ai=function(n,e){var i=e.length;return w.each(e,function(e){e.menu&&(e.hidden=0===Ai(n,e.menu));var t=e.format;t&&(e.hidden=!n.formatter.canApply(t)),e.hidden&&i--}),i},Bi=function(n,e){var i=e.items().length;return e.items().each(function(e){e.menu&&e.visible(0<Bi(n,e.menu)),!e.menu&&e.settings.menu&&e.visible(0<Ai(n,e.settings.menu));var t=e.settings.format;t&&e.visible(n.formatter.canApply(t)),e.visible()||i--}),i},Li=function(e){var i,r,o,t,s,n,a,l,u=(r=0,o=[],t=[{title:"Headings",items:[{title:"Heading 1",format:"h1"},{title:"Heading 2",format:"h2"},{title:"Heading 3",format:"h3"},{title:"Heading 4",format:"h4"},{title:"Heading 5",format:"h5"},{title:"Heading 6",format:"h6"}]},{title:"Inline",items:[{title:"Bold",icon:"bold",format:"bold"},{title:"Italic",icon:"italic",format:"italic"},{title:"Underline",icon:"underline",format:"underline"},{title:"Strikethrough",icon:"strikethrough",format:"strikethrough"},{title:"Superscript",icon:"superscript",format:"superscript"},{title:"Subscript",icon:"subscript",format:"subscript"},{title:"Code",icon:"code",format:"code"}]},{title:"Blocks",items:[{title:"Paragraph",format:"p"},{title:"Blockquote",format:"blockquote"},{title:"Div",format:"div"},{title:"Pre",format:"pre"}]},{title:"Alignment",items:[{title:"Left",icon:"alignleft",format:"alignleft"},{title:"Center",icon:"aligncenter",format:"aligncenter"},{title:"Right",icon:"alignright",format:"alignright"},{title:"Justify",icon:"alignjustify",format:"alignjustify"}]}],s=function(e){var i=[];if(e)return w.each(e,function(e){var t={text:e.title,icon:e.icon};if(e.items)t.menu=s(e.items);else{var n=e.format||"custom"+r++;e.format||(e.name=n,o.push(e)),t.format=n,t.cmd=e.cmd}i.push(t)}),i},(i=e).on("init",function(){w.each(o,function(e){i.formatter.register(e.name,e)})}),{type:"menu",items:i.settings.style_formats_merge?i.settings.style_formats?s(t.concat(i.settings.style_formats)):s(t):s(i.settings.style_formats||t),onPostRender:function(e){i.fire("renderFormatsMenu",{control:e.control})},itemDefaults:{preview:!0,textStyle:function(){if(this.settings.format)return i.formatter.getCssText(this.settings.format)},onPostRender:function(){var n=this;n.parent().on("show",function(){var e,t;(e=n.settings.format)&&(n.disabled(!i.formatter.canApply(e)),n.active(i.formatter.match(e))),(t=n.settings.cmd)&&n.active(i.queryCommandState(t))})},onclick:function(){this.settings.format&&Ci(i,this.settings.format)(),this.settings.cmd&&i.execCommand(this.settings.cmd)}}});n=u,e.addMenuItem("formats",{text:"Formats",menu:n}),l=u,(a=e).addButton("styleselect",{type:"menubutton",text:"Formats",menu:l,onShowMenu:function(){a.settings.style_formats_autohide&&Bi(a,this.menu)}})},zi=function(n,e){return function(){var r,o,s,t=[];return w.each(e,function(e){t.push({text:e[0],value:e[1],textStyle:function(){return n.formatter.getCssText(e[1])}})}),{type:"listbox",text:e[0][0],values:t,fixedWidth:!0,onselect:function(e){if(e.control){var t=e.control.value();Ci(n,t)()}},onPostRender:(r=n,o=t,function(){var t=this;r.on("nodeChange",function(e){var n=r.formatter,i=null;w.each(e.parents,function(t){if(w.each(o,function(e){if(s?n.matchNode(t,s,{value:e.value})&&(i=e.value):n.matchNode(t,e.value)&&(i=e.value),i)return!1}),i)return!1}),t.value(i)})})}}},Ii=function(e){var t,n,i=function(e){for(var t=(e=e.replace(/;$/,"").split(";")).length;t--;)e[t]=e[t].split("=");return e}(e.settings.block_formats||"Paragraph=p;Heading 1=h1;Heading 2=h2;Heading 3=h3;Heading 4=h4;Heading 5=h5;Heading 6=h6;Preformatted=pre");e.addMenuItem("blockformats",{text:"Blocks",menu:(t=e,n=i,w.map(n,function(e){return{text:e[0],onclick:Ci(t,e[1]),textStyle:function(){return t.formatter.getCssText(e[1])}}}))}),e.addButton("formatselect",zi(e,i))},Fi=function(t,e){var n,i;if("string"==typeof e)i=e.split(" ");else if(w.isArray(e))return function(e){for(var t=[],n=0,i=e.length;n<i;++n){if(!Array.prototype.isPrototypeOf(e[n]))throw new Error("Arr.flatten item "+n+" was not an array, input: "+e);te.apply(t,e[n])}return t}(w.map(e,function(e){return Fi(t,e)}));return n=w.grep(i,function(e){return"|"===e||e in t.menuItems}),w.map(n,function(e){return"|"===e?{text:"-"}:t.menuItems[e]})},Ui=function(e){return e&&"-"===e.text},Vi=function(e){var t=Z(e,function(e,t,n){return!Ui(e)||!Ui(n[t-1])});return Z(t,function(e,t,n){return!Ui(e)||0<t&&t<n.length-1})},Yi=function(e){var t,n,i,r,o=e.settings.insert_button_items;return Vi(o?Fi(e,o):(t=e,n="insert",i=[{text:"-"}],r=w.grep(t.menuItems,function(e){return e.context===n}),w.each(r,function(e){"before"===e.separator&&i.push({text:"|"}),e.prependToContext?i.unshift(e):i.push(e),"after"===e.separator&&i.push({text:"|"})}),i))},$i=function(e){var t;(t=e).addButton("insert",{type:"menubutton",icon:"insert",menu:[],oncreatemenu:function(){this.menu.add(Yi(t)),this.menu.renderNew()}})},qi=function(e){var n,i,r;n=e,w.each({bold:"Bold",italic:"Italic",underline:"Underline",strikethrough:"Strikethrough",subscript:"Subscript",superscript:"Superscript"},function(e,t){n.addButton(t,{active:!1,tooltip:e,onPostRender:ki(n,t),onclick:Ci(n,t)})}),i=e,w.each({outdent:["Decrease indent","Outdent"],indent:["Increase indent","Indent"],cut:["Cut","Cut"],copy:["Copy","Copy"],paste:["Paste","Paste"],help:["Help","mceHelp"],selectall:["Select all","SelectAll"],visualaid:["Visual aids","mceToggleVisualAid"],newdocument:["New document","mceNewDocument"],removeformat:["Clear formatting","RemoveFormat"],remove:["Remove","Delete"]},function(e,t){i.addButton(t,{tooltip:e[0],cmd:e[1]})}),r=e,w.each({blockquote:["Blockquote","mceBlockQuote"],subscript:["Subscript","Subscript"],superscript:["Superscript","Superscript"]},function(e,t){r.addButton(t,{active:!1,tooltip:e[0],cmd:e[1],onPostRender:ki(r,t)})})},Xi=function(e){var n;qi(e),n=e,w.each({bold:["Bold","Bold","Meta+B"],italic:["Italic","Italic","Meta+I"],underline:["Underline","Underline","Meta+U"],strikethrough:["Strikethrough","Strikethrough"],subscript:["Subscript","Subscript"],superscript:["Superscript","Superscript"],removeformat:["Clear formatting","RemoveFormat"],newdocument:["New document","mceNewDocument"],cut:["Cut","Cut","Meta+X"],copy:["Copy","Copy","Meta+C"],paste:["Paste","Paste","Meta+V"],selectall:["Select all","SelectAll","Meta+A"]},function(e,t){n.addMenuItem(t,{text:e[0],icon:t,shortcut:e[2],cmd:e[1]})}),n.addMenuItem("codeformat",{text:"Code",icon:"code",onclick:Ci(n,"code")})},ji=function(n,i){return function(){var e=this,t=function(){var e="redo"===i?"hasRedo":"hasUndo";return!!n.undoManager&&n.undoManager[e]()};e.disabled(!t()),n.on("Undo Redo AddUndo TypingUndo ClearUndos SwitchMode",function(){e.disabled(n.readonly||!t())})}},Ji=function(e){var t,n;(t=e).addMenuItem("undo",{text:"Undo",icon:"undo",shortcut:"Meta+Z",onPostRender:ji(t,"undo"),cmd:"undo"}),t.addMenuItem("redo",{text:"Redo",icon:"redo",shortcut:"Meta+Y",onPostRender:ji(t,"redo"),cmd:"redo"}),(n=e).addButton("undo",{tooltip:"Undo",onPostRender:ji(n,"undo"),cmd:"undo"}),n.addButton("redo",{tooltip:"Redo",onPostRender:ji(n,"redo"),cmd:"redo"})},Gi=function(e){var t,n;(t=e).addMenuItem("visualaid",{text:"Visual aids",selectable:!0,onPostRender:(n=t,function(){var t=this;n.on("VisualAid",function(e){t.active(e.hasVisual)}),t.active(n.hasVisual)}),cmd:"mceToggleVisualAid"})},Ki={setup:function(e){var t;e.rtl&&(st.rtl=!0),e.on("mousedown progressstate",function(){kt.hideAll()}),(t=e).settings.ui_container&&(fe.container=Ri(vn.fromDom(_.document.body),t.settings.ui_container).fold(H(null),function(e){return e.dom()})),Wt.tooltips=!fe.iOS,st.translate=function(e){return h.translate(e)},Ii(e),Hi(e),Xi(e),Ji(e),Oi(e),Ni(e),Li(e),Gi(e),$i(e)}},Zi=Jt.extend({recalc:function(e){var t,n,i,r,o,s,a,l,u,c,d,f,h,m,g,p,v,b,y,x,w,_,R,C,E,k,H,S,T=[],M=[];t=e.settings,r=e.items().filter(":visible"),o=e.layoutRect(),i=t.columns||Math.ceil(Math.sqrt(r.length)),n=Math.ceil(r.length/i),b=t.spacingH||t.spacing||0,y=t.spacingV||t.spacing||0,x=t.alignH||t.align,w=t.alignV||t.align,p=e.paddingBox,S="reverseRows"in t?t.reverseRows:e.isRtl(),x&&"string"==typeof x&&(x=[x]),w&&"string"==typeof w&&(w=[w]);for(d=0;d<i;d++)T.push(0);for(f=0;f<n;f++)M.push(0);for(f=0;f<n;f++)for(d=0;d<i&&(c=r[f*i+d]);d++)C=(u=c.layoutRect()).minW,E=u.minH,T[d]=C>T[d]?C:T[d],M[f]=E>M[f]?E:M[f];for(k=o.innerW-p.left-p.right,d=_=0;d<i;d++)_+=T[d]+(0<d?b:0),k-=(0<d?b:0)+T[d];for(H=o.innerH-p.top-p.bottom,f=R=0;f<n;f++)R+=M[f]+(0<f?y:0),H-=(0<f?y:0)+M[f];if(_+=p.left+p.right,R+=p.top+p.bottom,(l={}).minW=_+(o.w-o.innerW),l.minH=R+(o.h-o.innerH),l.contentW=l.minW-o.deltaW,l.contentH=l.minH-o.deltaH,l.minW=Math.min(l.minW,o.maxW),l.minH=Math.min(l.minH,o.maxH),l.minW=Math.max(l.minW,o.startMinWidth),l.minH=Math.max(l.minH,o.startMinHeight),!o.autoResize||l.minW===o.minW&&l.minH===o.minH){var N;o.autoResize&&((l=e.layoutRect(l)).contentW=l.minW-o.deltaW,l.contentH=l.minH-o.deltaH),N="start"===t.packV?0:0<H?Math.floor(H/n):0;var P=0,W=t.flexWidths;if(W)for(d=0;d<W.length;d++)P+=W[d];else P=i;var D=k/P;for(d=0;d<i;d++)T[d]+=W?W[d]*D:D;for(m=p.top,f=0;f<n;f++){for(h=p.left,a=M[f]+N,d=0;d<i&&(c=r[S?f*i+i-1-d:f*i+d]);d++)g=c.settings,u=c.layoutRect(),s=Math.max(T[d],u.startMinWidth),u.x=h,u.y=m,"center"===(v=g.alignH||(x?x[d]||x[0]:null))?u.x=h+s/2-u.w/2:"right"===v?u.x=h+s-u.w:"stretch"===v&&(u.w=s),"center"===(v=g.alignV||(w?w[d]||w[0]:null))?u.y=m+a/2-u.h/2:"bottom"===v?u.y=m+a-u.h:"stretch"===v&&(u.h=a),c.layoutRect(u),h+=s+b,c.recalc&&c.recalc();m+=a+y}}else if(l.w=l.minW,l.h=l.minH,e.layoutRect(l),this.recalc(e),null===e._lastRect){var O=e.parent();O&&(O._lastRect=null,O.recalc())}}}),Qi=Wt.extend({renderHtml:function(){var e=this;return e.classes.add("iframe"),e.canFocus=!1,'<iframe id="'+e._id+'" class="'+e.classes+'" tabindex="-1" src="'+(e.settings.url||"javascript:''")+'" frameborder="0"></iframe>'},src:function(e){this.getEl().src=e},html:function(e,t){var n=this,i=this.getEl().contentWindow.document.body;return i?(i.innerHTML=e,t&&t()):u.setTimeout(function(){n.html(e)}),this}}),er=Wt.extend({init:function(e){this._super(e),this.classes.add("widget").add("infobox"),this.canFocus=!1},severity:function(e){this.classes.remove("error"),this.classes.remove("warning"),this.classes.remove("success"),this.classes.add(e)},help:function(e){this.state.set("help",e)},renderHtml:function(){var e=this,t=e.classPrefix;return'<div id="'+e._id+'" class="'+e.classes+'"><div id="'+e._id+'-body">'+e.encode(e.state.get("text"))+'<button role="button" tabindex="-1"><i class="'+t+"ico "+t+'i-help"></i></button></div></div>'},bindStates:function(){var t=this;return t.state.on("change:text",function(e){t.getEl("body").firstChild.data=t.encode(e.value),t.state.get("rendered")&&t.updateLayoutRect()}),t.state.on("change:help",function(e){t.classes.toggle("has-help",e.value),t.state.get("rendered")&&t.updateLayoutRect()}),t._super()}}),tr=Wt.extend({init:function(e){var t=this;t._super(e),t.classes.add("widget").add("label"),t.canFocus=!1,e.multiline&&t.classes.add("autoscroll"),e.strong&&t.classes.add("strong")},initLayoutRect:function(){var e=this,t=e._super();return e.settings.multiline&&(Re.getSize(e.getEl()).width>t.maxW&&(t.minW=t.maxW,e.classes.add("multiline")),e.getEl().style.width=t.minW+"px",t.startMinH=t.h=t.minH=Math.min(t.maxH,Re.getSize(e.getEl()).height)),t},repaint:function(){return this.settings.multiline||(this.getEl().style.lineHeight=this.layoutRect().h+"px"),this._super()},severity:function(e){this.classes.remove("error"),this.classes.remove("warning"),this.classes.remove("success"),this.classes.add(e)},renderHtml:function(){var e,t,n=this,i=n.settings.forId,r=n.settings.html?n.settings.html:n.encode(n.state.get("text"));return!i&&(t=n.settings.forName)&&(e=n.getRoot().find("#"+t)[0])&&(i=e._id),i?'<label id="'+n._id+'" class="'+n.classes+'"'+(i?' for="'+i+'"':"")+">"+r+"</label>":'<span id="'+n._id+'" class="'+n.classes+'">'+r+"</span>"},bindStates:function(){var t=this;return t.state.on("change:text",function(e){t.innerHtml(t.encode(e.value)),t.state.get("rendered")&&t.updateLayoutRect()}),t._super()}}),nr=ct.extend({Defaults:{role:"toolbar",layout:"flow"},init:function(e){this._super(e),this.classes.add("toolbar")},postRender:function(){return this.items().each(function(e){e.classes.add("toolbar-item")}),this._super()}}),ir=nr.extend({Defaults:{role:"menubar",containerCls:"menubar",ariaRoot:!0,defaults:{type:"menubutton"}}}),rr=Gt.extend({init:function(e){var t=this;t._renderOpen=!0,t._super(e),e=t.settings,t.classes.add("menubtn"),e.fixedWidth&&t.classes.add("fixed-width"),t.aria("haspopup",!0),t.state.set("menu",e.menu||t.render())},showMenu:function(e){var t,n=this;if(n.menu&&n.menu.visible()&&!1!==e)return n.hideMenu();n.menu||(t=n.state.get("menu")||[],n.classes.add("opened"),t.length?t={type:"menu",animate:!0,items:t}:(t.type=t.type||"menu",t.animate=!0),t.renderTo?n.menu=t.parent(n).show().renderTo():n.menu=b.create(t).parent(n).renderTo(),n.fire("createmenu"),n.menu.reflow(),n.menu.on("cancel",function(e){e.control.parent()===n.menu&&(e.stopPropagation(),n.focus(),n.hideMenu())}),n.menu.on("select",function(){n.focus()}),n.menu.on("show hide",function(e){"hide"===e.type&&e.control.parent()===n&&n.classes.remove("opened-under"),e.control===n.menu&&(n.activeMenu("show"===e.type),n.classes.toggle("opened","show"===e.type)),n.aria("expanded","show"===e.type)}).fire("show")),n.menu.show(),n.menu.layoutRect({w:n.layoutRect().w}),n.menu.repaint(),n.menu.moveRel(n.getEl(),n.isRtl()?["br-tr","tr-br"]:["bl-tl","tl-bl"]);var i=n.menu.layoutRect(),r=n.$el.offset().top+n.layoutRect().h;r>i.y&&r<i.y+i.h&&n.classes.add("opened-under"),n.fire("showmenu")},hideMenu:function(){this.menu&&(this.menu.items().each(function(e){e.hideMenu&&e.hideMenu()}),this.menu.hide())},activeMenu:function(e){this.classes.toggle("active",e)},renderHtml:function(){var e,t=this,n=t._id,i=t.classPrefix,r=t.settings.icon,o=t.state.get("text"),s="";return(e=t.settings.image)?(r="none","string"!=typeof e&&(e=_.window.getSelection?e[0]:e[1]),e=" style=\"background-image: url('"+e+"')\""):e="",o&&(t.classes.add("btn-has-text"),s='<span class="'+i+'txt">'+t.encode(o)+"</span>"),r=t.settings.icon?i+"ico "+i+"i-"+r:"",t.aria("role",t.parent()instanceof ir?"menuitem":"button"),'<div id="'+n+'" class="'+t.classes+'" tabindex="-1" aria-labelledby="'+n+'"><button id="'+n+'-open" role="presentation" type="button" tabindex="-1">'+(r?'<i class="'+r+'"'+e+"></i>":"")+s+' <i class="'+i+'caret"></i></button></div>'},postRender:function(){var r=this;return r.on("click",function(e){e.control===r&&function(e,t){for(;e;){if(t===e)return!0;e=e.parentNode}return!1}(e.target,r.getEl())&&(r.focus(),r.showMenu(!e.aria),e.aria&&r.menu.items().filter(":visible")[0].focus())}),r.on("mouseenter",function(e){var t,n=e.control,i=r.parent();n&&i&&n instanceof rr&&n.parent()===i&&(i.items().filter("MenuButton").each(function(e){e.hideMenu&&e!==n&&(e.menu&&e.menu.visible()&&(t=!0),e.hideMenu())}),t&&(n.focus(),n.showMenu()))}),r._super()},bindStates:function(){var e=this;return e.state.on("change:menu",function(){e.menu&&e.menu.remove(),e.menu=null}),e._super()},remove:function(){this._super(),this.menu&&this.menu.remove()}}),or=kt.extend({Defaults:{defaultType:"menuitem",border:1,layout:"stack",role:"application",bodyRole:"menu",ariaRoot:!0},init:function(e){if(e.autohide=!0,e.constrainToViewport=!0,"function"==typeof e.items&&(e.itemsFactory=e.items,e.items=[]),e.itemDefaults)for(var t=e.items,n=t.length;n--;)t[n]=w.extend({},e.itemDefaults,t[n]);this._super(e),this.classes.add("menu"),e.animate&&11!==fe.ie&&this.classes.add("animate")},repaint:function(){return this.classes.toggle("menu-align",!0),this._super(),this.getEl().style.height="",this.getEl("body").style.height="",this},cancel:function(){this.hideAll(),this.fire("select")},load:function(){var t,n=this;function i(){n.throbber&&(n.throbber.hide(),n.throbber=null)}n.settings.itemsFactory&&(n.throbber||(n.throbber=new Tt(n.getEl("body"),!0),0===n.items().length?(n.throbber.show(),n.fire("loading")):n.throbber.show(100,function(){n.items().remove(),n.fire("loading")}),n.on("hide close",i)),n.requestTime=t=(new Date).getTime(),n.settings.itemsFactory(function(e){0!==e.length?n.requestTime===t&&(n.getEl().style.width="",n.getEl("body").style.width="",i(),n.items().remove(),n.getEl("body").innerHTML="",n.add(e),n.renderNew(),n.fire("loaded")):n.hide()}))},hideAll:function(){return this.find("menuitem").exec("hideMenu"),this._super()},preRender:function(){var n=this;return n.items().each(function(e){var t=e.settings;if(t.icon||t.image||t.selectable)return!(n._hasIcons=!0)}),n.settings.itemsFactory&&n.on("postrender",function(){n.settings.itemsFactory&&n.load()}),n.on("show hide",function(e){e.control===n&&("show"===e.type?u.setTimeout(function(){n.classes.add("in")},0):n.classes.remove("in"))}),n._super()}}),sr=rr.extend({init:function(i){var t,r,o,n,s=this;s._super(i),i=s.settings,s._values=t=i.values,t&&("undefined"!=typeof i.value&&function e(t){for(var n=0;n<t.length;n++){if(r=t[n].selected||i.value===t[n].value)return o=o||t[n].text,s.state.set("value",t[n].value),!0;if(t[n].menu&&e(t[n].menu))return!0}}(t),!r&&0<t.length&&(o=t[0].text,s.state.set("value",t[0].value)),s.state.set("menu",t)),s.state.set("text",i.text||o),s.classes.add("listbox"),s.on("select",function(e){var t=e.control;n&&(e.lastControl=n),i.multiple?t.active(!t.active()):s.value(e.control.value()),n=t})},value:function(n){return 0===arguments.length?this.state.get("value"):(void 0===n||(this.settings.values&&!function t(e){return J(e,function(e){return e.menu?t(e.menu):e.value===n})}(this.settings.values)?null===n&&this.state.set("value",null):this.state.set("value",n)),this)},bindStates:function(){var i=this;return i.on("show",function(e){var t,n;t=e.control,n=i.value(),t instanceof or&&t.items().each(function(e){e.hasMenus()||e.active(e.value()===n)})}),i.state.on("change:value",function(t){var n=function e(t,n){var i;if(t)for(var r=0;r<t.length;r++){if(t[r].value===n)return t[r];if(t[r].menu&&(i=e(t[r].menu,n)))return i}}(i.state.get("menu"),t.value);n?i.text(n.text):i.text(i.settings.text)}),i._super()}}),ar=Wt.extend({Defaults:{border:0,role:"menuitem"},init:function(e){var t,n=this;n._super(e),e=n.settings,n.classes.add("menu-item"),e.menu&&n.classes.add("menu-item-expand"),e.preview&&n.classes.add("menu-item-preview"),"-"!==(t=n.state.get("text"))&&"|"!==t||(n.classes.add("menu-item-sep"),n.aria("role","separator"),n.state.set("text","-")),e.selectable&&(n.aria("role","menuitemcheckbox"),n.classes.add("menu-item-checkbox"),e.icon="selected"),e.preview||e.selectable||n.classes.add("menu-item-normal"),n.on("mousedown",function(e){e.preventDefault()}),e.menu&&!e.ariaHideMenu&&n.aria("haspopup",!0)},hasMenus:function(){return!!this.settings.menu},showMenu:function(){var t,n=this,e=n.settings,i=n.parent();if(i.items().each(function(e){e!==n&&e.hideMenu()}),e.menu){(t=n.menu)?t.show():((t=e.menu).length?t={type:"menu",items:t}:t.type=t.type||"menu",i.settings.itemDefaults&&(t.itemDefaults=i.settings.itemDefaults),(t=n.menu=b.create(t).parent(n).renderTo()).reflow(),t.on("cancel",function(e){e.stopPropagation(),n.focus(),t.hide()}),t.on("show hide",function(e){e.control.items&&e.control.items().each(function(e){e.active(e.settings.selected)})}).fire("show"),t.on("hide",function(e){e.control===t&&n.classes.remove("selected")}),t.submenu=!0),t._parentMenu=i,t.classes.add("menu-sub");var r=t.testMoveRel(n.getEl(),n.isRtl()?["tl-tr","bl-br","tr-tl","br-bl"]:["tr-tl","br-bl","tl-tr","bl-br"]);t.moveRel(n.getEl(),r),r="menu-sub-"+(t.rel=r),t.classes.remove(t._lastRel).add(r),t._lastRel=r,n.classes.add("selected"),n.aria("expanded",!0)}},hideMenu:function(){var e=this;return e.menu&&(e.menu.items().each(function(e){e.hideMenu&&e.hideMenu()}),e.menu.hide(),e.aria("expanded",!1)),e},renderHtml:function(){var e,t=this,n=t._id,i=t.settings,r=t.classPrefix,o=t.state.get("text"),s=t.settings.icon,a="",l=i.shortcut,u=t.encode(i.url);function c(e){return e.replace(/[.*+?^${}()|[\]\\]/g,"\\$&")}function d(e){var t=i.match||"";return t?e.replace(new RegExp(c(t),"gi"),function(e){return"!mce~match["+e+"]mce~match!"}):e}function f(e){return e.replace(new RegExp(c("!mce~match["),"g"),"<b>").replace(new RegExp(c("]mce~match!"),"g"),"</b>")}return s&&t.parent().classes.add("menu-has-icons"),i.image&&(a=" style=\"background-image: url('"+i.image+"')\""),l&&(l=function(e){var t,n,i={};for(i=fe.mac?{alt:"&#x2325;",ctrl:"&#x2318;",shift:"&#x21E7;",meta:"&#x2318;"}:{meta:"Ctrl"},e=e.split("+"),t=0;t<e.length;t++)(n=i[e[t].toLowerCase()])&&(e[t]=n);return e.join("+")}(l)),s=r+"ico "+r+"i-"+(t.settings.icon||"none"),e="-"!==o?'<i class="'+s+'"'+a+"></i>\xa0":"",o=f(t.encode(d(o))),u=f(t.encode(d(u))),'<div id="'+n+'" class="'+t.classes+'" tabindex="-1">'+e+("-"!==o?'<span id="'+n+'-text" class="'+r+'text">'+o+"</span>":"")+(l?'<div id="'+n+'-shortcut" class="'+r+'menu-shortcut">'+l+"</div>":"")+(i.menu?'<div class="'+r+'caret"></div>':"")+(u?'<div class="'+r+'menu-item-link">'+u+"</div>":"")+"</div>"},postRender:function(){var t=this,n=t.settings,e=n.textStyle;if("function"==typeof e&&(e=e.call(this)),e){var i=t.getEl("text");i&&(i.setAttribute("style",e),t._textStyle=e)}return t.on("mouseenter click",function(e){e.control===t&&(n.menu||"click"!==e.type?(t.showMenu(),e.aria&&t.menu.focus(!0)):(t.fire("select"),u.requestAnimationFrame(function(){t.parent().hideAll()})))}),t._super(),t},hover:function(){return this.parent().items().each(function(e){e.classes.remove("selected")}),this.classes.toggle("selected",!0),this},active:function(e){return function(e,t){var n=e._textStyle;if(n){var i=e.getEl("text");i.setAttribute("style",n),t&&(i.style.color="",i.style.backgroundColor="")}}(this,e),void 0!==e&&this.aria("checked",e),this._super(e)},remove:function(){this._super(),this.menu&&this.menu.remove()}}),lr=Qt.extend({Defaults:{classes:"radio",role:"radio"}}),ur=Wt.extend({renderHtml:function(){var e=this,t=e.classPrefix;return e.classes.add("resizehandle"),"both"===e.settings.direction&&e.classes.add("resizehandle-both"),e.canFocus=!1,'<div id="'+e._id+'" class="'+e.classes+'"><i class="'+t+"ico "+t+'i-resize"></i></div>'},postRender:function(){var t=this;t._super(),t.resizeDragHelper=new ft(this._id,{start:function(){t.fire("ResizeStart")},drag:function(e){"both"!==t.settings.direction&&(e.deltaX=0),t.fire("Resize",e)},stop:function(){t.fire("ResizeEnd")}})},remove:function(){return this.resizeDragHelper&&this.resizeDragHelper.destroy(),this._super()}});function cr(e){var t="";if(e)for(var n=0;n<e.length;n++)t+='<option value="'+e[n]+'">'+e[n]+"</option>";return t}var dr=Wt.extend({Defaults:{classes:"selectbox",role:"selectbox",options:[]},init:function(e){var n=this;n._super(e),n.settings.size&&(n.size=n.settings.size),n.settings.options&&(n._options=n.settings.options),n.on("keydown",function(e){var t;13===e.keyCode&&(e.preventDefault(),n.parents().reverse().each(function(e){if(e.toJSON)return t=e,!1}),n.fire("submit",{data:t.toJSON()}))})},options:function(e){return arguments.length?(this.state.set("options",e),this):this.state.get("options")},renderHtml:function(){var e,t=this,n="";return e=cr(t._options),t.size&&(n=' size = "'+t.size+'"'),'<select id="'+t._id+'" class="'+t.classes+'"'+n+">"+e+"</select>"},bindStates:function(){var t=this;return t.state.on("change:options",function(e){t.getEl().innerHTML=cr(e.value)}),t._super()}});function fr(e,t,n){return e<t&&(e=t),n<e&&(e=n),e}function hr(e,t,n){e.setAttribute("aria-"+t,n)}function mr(e,t){var n,i,r,o,s;"v"===e.settings.orientation?(r="top",i="height",n="h"):(r="left",i="width",n="w"),s=e.getEl("handle"),o=((e.layoutRect()[n]||100)-Re.getSize(s)[i])*((t-e._minValue)/(e._maxValue-e._minValue))+"px",s.style[r]=o,s.style.height=e.layoutRect().h+"px",hr(s,"valuenow",t),hr(s,"valuetext",""+e.settings.previewFilter(t)),hr(s,"valuemin",e._minValue),hr(s,"valuemax",e._maxValue)}var gr=Wt.extend({init:function(e){var t=this;e.previewFilter||(e.previewFilter=function(e){return Math.round(100*e)/100}),t._super(e),t.classes.add("slider"),"v"===e.orientation&&t.classes.add("vertical"),t._minValue=X(e.minValue)?e.minValue:0,t._maxValue=X(e.maxValue)?e.maxValue:100,t._initValue=t.state.get("value")},renderHtml:function(){var e=this._id,t=this.classPrefix;return'<div id="'+e+'" class="'+this.classes+'"><div id="'+e+'-handle" class="'+t+'slider-handle" role="slider" tabindex="-1"></div></div>'},reset:function(){this.value(this._initValue).repaint()},postRender:function(){var e,t,n,i,r,o,s,a,l,u,c,d,f,h,m=this;e=m._minValue,t=m._maxValue,"v"===m.settings.orientation?(n="screenY",i="top",r="height",o="h"):(n="screenX",i="left",r="width",o="w"),m._super(),function(o,s){function t(e){var t,n,i,r;t=fr(t=(((t=m.value())+(r=n=o))/((i=s)-r)+.05*e)*(i-n)-n,o,s),m.value(t),m.fire("dragstart",{value:t}),m.fire("drag",{value:t}),m.fire("dragend",{value:t})}m.on("keydown",function(e){switch(e.keyCode){case 37:case 38:t(-1);break;case 39:case 40:t(1)}})}(e,t),s=e,a=t,l=m.getEl("handle"),m._dragHelper=new ft(m._id,{handle:m._id+"-handle",start:function(e){u=e[n],c=parseInt(m.getEl("handle").style[i],10),d=(m.layoutRect()[o]||100)-Re.getSize(l)[r],m.fire("dragstart",{value:h})},drag:function(e){var t=e[n]-u;f=fr(c+t,0,d),l.style[i]=f+"px",h=s+f/d*(a-s),m.value(h),m.tooltip().text(""+m.settings.previewFilter(h)).show().moveRel(l,"bc tc"),m.fire("drag",{value:h})},stop:function(){m.tooltip().hide(),m.fire("dragend",{value:h})}})},repaint:function(){this._super(),mr(this,this.value())},bindStates:function(){var t=this;return t.state.on("change:value",function(e){mr(t,e.value)}),t._super()}}),pr=Wt.extend({renderHtml:function(){return this.classes.add("spacer"),this.canFocus=!1,'<div id="'+this._id+'" class="'+this.classes+'"></div>'}}),vr=rr.extend({Defaults:{classes:"widget btn splitbtn",role:"button"},repaint:function(){var e,t,n=this.getEl(),i=this.layoutRect();return this._super(),e=n.firstChild,t=n.lastChild,we(e).css({width:i.w-Re.getSize(t).width,height:i.h-2}),we(t).css({height:i.h-2}),this},activeMenu:function(e){we(this.getEl().lastChild).toggleClass(this.classPrefix+"active",e)},renderHtml:function(){var e,t,n=this,i=n._id,r=n.classPrefix,o=n.state.get("icon"),s=n.state.get("text"),a=n.settings,l="";return(e=a.image)?(o="none","string"!=typeof e&&(e=_.window.getSelection?e[0]:e[1]),e=" style=\"background-image: url('"+e+"')\""):e="",o=a.icon?r+"ico "+r+"i-"+o:"",s&&(n.classes.add("btn-has-text"),l='<span class="'+r+'txt">'+n.encode(s)+"</span>"),t="boolean"==typeof a.active?' aria-pressed="'+a.active+'"':"",'<div id="'+i+'" class="'+n.classes+'" role="button"'+t+' tabindex="-1"><button type="button" hidefocus="1" tabindex="-1">'+(o?'<i class="'+o+'"'+e+"></i>":"")+l+'</button><button type="button" class="'+r+'open" hidefocus="1" tabindex="-1">'+(n._menuBtnText?(o?"\xa0":"")+n._menuBtnText:"")+' <i class="'+r+'caret"></i></button></div>'},postRender:function(){var n=this.settings.onclick;return this.on("click",function(e){var t=e.target;if(e.control===this)for(;t;){if(e.aria&&"down"!==e.aria.key||"BUTTON"===t.nodeName&&-1===t.className.indexOf("open"))return e.stopImmediatePropagation(),void(n&&n.call(this,e));t=t.parentNode}}),delete this.settings.onclick,this._super()}}),br=_i.extend({Defaults:{containerClass:"stack-layout",controlClass:"stack-layout-item",endClass:"break"},isNative:function(){return!0}}),yr=bt.extend({Defaults:{layout:"absolute",defaults:{type:"panel"}},activateTab:function(n){var e;this.activeTabId&&(e=this.getEl(this.activeTabId),we(e).removeClass(this.classPrefix+"active"),e.setAttribute("aria-selected","false")),this.activeTabId="t"+n,(e=this.getEl("t"+n)).setAttribute("aria-selected","true"),we(e).addClass(this.classPrefix+"active"),this.items()[n].show().fire("showtab"),this.reflow(),this.items().each(function(e,t){n!==t&&e.hide()})},renderHtml:function(){var i=this,e=i._layout,r="",o=i.classPrefix;return i.preRender(),e.preRender(i),i.items().each(function(e,t){var n=i._id+"-t"+t;e.aria("role","tabpanel"),e.aria("labelledby",n),r+='<div id="'+n+'" class="'+o+'tab" unselectable="on" role="tab" aria-controls="'+e._id+'" aria-selected="false" tabIndex="-1">'+i.encode(e.settings.title)+"</div>"}),'<div id="'+i._id+'" class="'+i.classes+'" hidefocus="1" tabindex="-1"><div id="'+i._id+'-head" class="'+o+'tabs" role="tablist">'+r+'</div><div id="'+i._id+'-body" class="'+i.bodyClasses+'">'+e.renderHtml(i)+"</div></div>"},postRender:function(){var i=this;i._super(),i.settings.activeTab=i.settings.activeTab||0,i.activateTab(i.settings.activeTab),this.on("click",function(e){var t=e.target.parentNode;if(t&&t.id===i._id+"-head")for(var n=t.childNodes.length;n--;)t.childNodes[n]===e.target&&i.activateTab(n)})},initLayoutRect:function(){var e,t,n,i=this;t=(t=Re.getSize(i.getEl("head")).width)<0?0:t,n=0,i.items().each(function(e){t=Math.max(t,e.layoutRect().minW),n=Math.max(n,e.layoutRect().minH)}),i.items().each(function(e){e.settings.x=0,e.settings.y=0,e.settings.w=t,e.settings.h=n,e.layoutRect({x:0,y:0,w:t,h:n})});var r=Re.getSize(i.getEl("head")).height;return i.settings.minWidth=t,i.settings.minHeight=n+r,(e=i._super()).deltaH+=r,e.innerH=e.h-e.deltaH,e}}),xr=Wt.extend({init:function(e){var n=this;n._super(e),n.classes.add("textbox"),e.multiline?n.classes.add("multiline"):(n.on("keydown",function(e){var t;13===e.keyCode&&(e.preventDefault(),n.parents().reverse().each(function(e){if(e.toJSON)return t=e,!1}),n.fire("submit",{data:t.toJSON()}))}),n.on("keyup",function(e){n.state.set("value",e.target.value)}))},repaint:function(){var e,t,n,i,r,o=this,s=0;e=o.getEl().style,t=o._layoutRect,r=o._lastRepaintRect||{};var a=_.document;return!o.settings.multiline&&a.all&&(!a.documentMode||a.documentMode<=8)&&(e.lineHeight=t.h-s+"px"),i=(n=o.borderBox).left+n.right+8,s=n.top+n.bottom+(o.settings.multiline?8:0),t.x!==r.x&&(e.left=t.x+"px",r.x=t.x),t.y!==r.y&&(e.top=t.y+"px",r.y=t.y),t.w!==r.w&&(e.width=t.w-i+"px",r.w=t.w),t.h!==r.h&&(e.height=t.h-s+"px",r.h=t.h),o._lastRepaintRect=r,o.fire("repaint",{},!1),o},renderHtml:function(){var t,e,n=this,i=n.settings;return t={id:n._id,hidefocus:"1"},w.each(["rows","spellcheck","maxLength","size","readonly","min","max","step","list","pattern","placeholder","required","multiple"],function(e){t[e]=i[e]}),n.disabled()&&(t.disabled="disabled"),i.subtype&&(t.type=i.subtype),(e=Re.create(i.multiline?"textarea":"input",t)).value=n.state.get("value"),e.className=n.classes.toString(),e.outerHTML},value:function(e){return arguments.length?(this.state.set("value",e),this):(this.state.get("rendered")&&this.state.set("value",this.getEl().value),this.state.get("value"))},postRender:function(){var t=this;t.getEl().value=t.state.get("value"),t._super(),t.$el.on("change",function(e){t.state.set("value",e.target.value),t.fire("change",e)})},bindStates:function(){var t=this;return t.state.on("change:value",function(e){t.getEl().value!==e.value&&(t.getEl().value=e.value)}),t.state.on("change:disabled",function(e){t.getEl().disabled=e.value}),t._super()},remove:function(){this.$el.off(),this._super()}}),wr=function(){return{Selector:Ue,Collection:$e,ReflowQueue:Qe,Control:st,Factory:b,KeyboardNavigation:lt,Container:ct,DragHelper:ft,Scrollable:vt,Panel:bt,Movable:Te,Resizable:yt,FloatPanel:kt,Window:Ut,MessageBox:qt,Tooltip:Pt,Widget:Wt,Progress:Dt,Notification:At,Layout:jt,AbsoluteLayout:Jt,Button:Gt,ButtonGroup:Zt,Checkbox:Qt,ComboBox:tn,ColorBox:nn,PanelButton:rn,ColorButton:sn,ColorPicker:ln,Path:cn,ElementPath:dn,FormItem:fn,Form:hn,FieldSet:mn,FilePicker:yi,FitLayout:xi,FlexLayout:wi,FlowLayout:_i,FormatControls:Ki,GridLayout:Zi,Iframe:Qi,InfoBox:er,Label:tr,Toolbar:nr,MenuBar:ir,MenuButton:rr,MenuItem:ar,Throbber:Tt,Menu:or,ListBox:sr,Radio:lr,ResizeHandle:ur,SelectBox:dr,Slider:gr,Spacer:pr,SplitButton:vr,StackLayout:br,TabPanel:yr,TextBox:xr,DropZone:un,BrowseButton:Kt}},_r=function(n){n.ui?w.each(wr(),function(e,t){n.ui[t]=e}):n.ui=wr()};w.each(wr(),function(e,t){b.add(t,e)}),_r(window.tinymce?window.tinymce:{}),o.add("modern",function(e){return Ki.setup(e),Xt(e)})}(window);
\ No newline at end of file
+!function(_){"use strict";var e,t,n,i,r=tinymce.util.Tools.resolve("tinymce.ThemeManager"),l=tinymce.util.Tools.resolve("tinymce.EditorManager"),w=tinymce.util.Tools.resolve("tinymce.util.Tools"),d=function(e){return!1!==c(e)},c=function(e){return e.getParam("menubar")},f=function(e){return e.getParam("toolbar_items_size")},h=function(e){return e.getParam("menu")},m=function(e){return!1===e.settings.skin},g=function(e){var t=e.getParam("resize","vertical");return!1===t?"none":"both"===t?"both":"vertical"},p=tinymce.util.Tools.resolve("tinymce.dom.DOMUtils"),v=tinymce.util.Tools.resolve("tinymce.ui.Factory"),b=tinymce.util.Tools.resolve("tinymce.util.I18n"),o=function(e){return e.fire("SkinLoaded")},y=function(e){return e.fire("ResizeEditor")},x=function(e){return e.fire("BeforeRenderUI")},s=function(t,n){return function(){var e=t.find(n)[0];e&&e.focus(!0)}},R=function(e,t){e.shortcuts.add("Alt+F9","",s(t,"menubar")),e.shortcuts.add("Alt+F10,F10","",s(t,"toolbar")),e.shortcuts.add("Alt+F11","",s(t,"elementpath")),t.on("cancel",function(){e.focus()})},C=tinymce.util.Tools.resolve("tinymce.geom.Rect"),u=tinymce.util.Tools.resolve("tinymce.util.Delay"),E=function(){},k=function(e){return function(){return e}},a=k(!1),H=k(!0),S=function(){return T},T=(e=function(e){return e.isNone()},i={fold:function(e,t){return e()},is:a,isSome:a,isNone:H,getOr:n=function(e){return e},getOrThunk:t=function(e){return e()},getOrDie:function(e){throw new Error(e||"error: getOrDie called on none.")},getOrNull:k(null),getOrUndefined:k(undefined),or:n,orThunk:t,map:S,each:E,bind:S,exists:a,forall:H,filter:S,equals:e,equals_:e,toArray:function(){return[]},toString:k("none()")},Object.freeze&&Object.freeze(i),i),M=function(n){var e=k(n),t=function(){return r},i=function(e){return e(n)},r={fold:function(e,t){return t(n)},is:function(e){return n===e},isSome:H,isNone:a,getOr:e,getOrThunk:e,getOrDie:e,getOrNull:e,getOrUndefined:e,or:t,orThunk:t,map:function(e){return M(e(n))},each:function(e){e(n)},bind:i,exists:i,forall:i,filter:function(e){return e(n)?r:T},toArray:function(){return[n]},toString:function(){return"some("+n+")"},equals:function(e){return e.is(n)},equals_:function(e,t){return e.fold(a,function(e){return t(n,e)})}};return r},N={some:M,none:S,from:function(e){return null===e||e===undefined?T:M(e)}},P=function(e){return e?e.getRoot().uiContainer:null},W={getUiContainerDelta:function(e){var t=P(e);if(t&&"static"!==p.DOM.getStyle(t,"position",!0)){var n=p.DOM.getPos(t),i=t.scrollLeft-n.x,r=t.scrollTop-n.y;return N.some({x:i,y:r})}return N.none()},setUiContainer:function(e,t){var n=p.DOM.select(e.settings.ui_container)[0];t.getRoot().uiContainer=n},getUiContainer:P,inheritUiContainer:function(e,t){return t.uiContainer=P(e)}},D=function(i,e,r){var o,s=[];if(e)return w.each(e.split(/[ ,]/),function(t){var e,n=function(){var e=i.selection;t.settings.stateSelector&&e.selectorChanged(t.settings.stateSelector,function(e){t.active(e)},!0),t.settings.disabledStateSelector&&e.selectorChanged(t.settings.disabledStateSelector,function(e){t.disabled(e)})};"|"===t?o=null:(o||(o={type:"buttongroup",items:[]},s.push(o)),i.buttons[t]&&(e=t,"function"==typeof(t=i.buttons[e])&&(t=t()),t.type=t.type||"button",t.size=r,t=v.create(t),o.items.push(t),i.initialized?n():i.on("init",n)))}),{type:"toolbar",layout:"flow",items:s}},O=D,A=function(n,i){var e,t,r=[];if(w.each(!1===(t=(e=n).getParam("toolbar"))?[]:w.isArray(t)?w.grep(t,function(e){return 0<e.length}):function(e,t){for(var n=[],i=1;i<10;i++){var r=e["toolbar"+i];if(!r)break;n.push(r)}var o=e.toolbar?[e.toolbar]:[t];return 0<n.length?n:o}(e.settings,"undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image"),function(e){var t;(t=e)&&r.push(D(n,t,i))}),r.length)return{type:"panel",layout:"stack",classes:"toolbar-grp",ariaRoot:!0,ariaRemember:!0,items:r}},B=p.DOM,L=function(e){return{left:e.x,top:e.y,width:e.w,height:e.h,right:e.x+e.w,bottom:e.y+e.h}},z=function(e,t){e.moveTo(t.left,t.top)},I=function(e,t,n,i,r,o){return o=L({x:t,y:n,w:o.w,h:o.h}),e&&(o=e({elementRect:L(i),contentAreaRect:L(r),panelRect:o})),o},F=function(x){var i,o=function(){return x.contextToolbars||[]},n=function(e,t){var n,i,r,o,s,a,l,u=x.getParam("inline_toolbar_position_handler");if(!x.removed){if(!e||!e.toolbar.panel)return c=x,void w.each(c.contextToolbars,function(e){e.panel&&e.panel.hide()});var c,d,f,h,m;l=["bc-tc","tc-bc","tl-bl","bl-tl","tr-br","br-tr"],s=e.toolbar.panel,t&&s.show(),d=e.element,f=B.getPos(x.getContentAreaContainer()),h=x.dom.getRect(d),"BODY"===(m=x.dom.getRoot()).nodeName&&(h.x-=m.ownerDocument.documentElement.scrollLeft||m.scrollLeft,h.y-=m.ownerDocument.documentElement.scrollTop||m.scrollTop),h.x+=f.x,h.y+=f.y,r=h,i=B.getRect(s.getEl()),o=B.getRect(x.getContentAreaContainer()||x.getBody());var g,p,v,b=W.getUiContainerDelta(s).getOr({x:0,y:0});if(r.x+=b.x,r.y+=b.y,i.x+=b.x,i.y+=b.y,o.x+=b.x,o.y+=b.y,"inline"!==B.getStyle(e.element,"display",!0)){var y=e.element.getBoundingClientRect();r.w=y.width,r.h=y.height}x.inline||(o.w=x.getDoc().documentElement.offsetWidth),x.selection.controlSelection.isResizable(e.element)&&r.w<25&&(r=C.inflate(r,0,8)),n=C.findBestRelativePosition(i,r,o,l),r=C.clamp(r,o),n?(a=C.relativePosition(i,r,n),z(s,I(u,a.x,a.y,r,o,i))):(o.h+=i.h,(r=C.intersect(o,r))?(n=C.findBestRelativePosition(i,r,o,["bc-tc","bl-tl","br-tr"]))?(a=C.relativePosition(i,r,n),z(s,I(u,a.x,a.y,r,o,i))):z(s,I(u,r.x,r.y,r,o,i)):s.hide()),g=s,v=function(e,t){return e===t},p=(p=n)?p.substr(0,2):"",w.each({t:"down",b:"up"},function(e,t){g.classes.toggle("arrow-"+e,v(t,p.substr(0,1)))}),w.each({l:"left",r:"right"},function(e,t){g.classes.toggle("arrow-"+e,v(t,p.substr(1,1)))})}},r=function(e){return function(){u.requestAnimationFrame(function(){x.selection&&n(a(x.selection.getNode()),e)})}},t=function(e){var t;if(e.toolbar.panel)return e.toolbar.panel.show(),void n(e);t=v.create({type:"floatpanel",role:"dialog",classes:"tinymce tinymce-inline arrow",ariaLabel:"Inline toolbar",layout:"flex",direction:"column",align:"stretch",autohide:!1,autofix:!0,fixed:!0,border:1,items:O(x,e.toolbar.items),oncancel:function(){x.focus()}}),W.setUiContainer(x,t),function(e){if(!i){var t=r(!0),n=W.getUiContainer(e);i=x.selection.getScrollContainer()||x.getWin(),B.bind(i,"scroll",t),B.bind(n,"scroll",t),x.on("remove",function(){B.unbind(i,"scroll",t),B.unbind(n,"scroll",t)})}}(t),(e.toolbar.panel=t).renderTo().reflow(),n(e)},s=function(){w.each(o(),function(e){e.panel&&e.panel.hide()})},a=function(e){var t,n,i,r=o();for(t=(i=x.$(e).parents().add(e)).length-1;0<=t;t--)for(n=r.length-1;0<=n;n--)if(r[n].predicate(i[t]))return{toolbar:r[n],element:i[t]};return null};x.on("click keyup setContent ObjectResized",function(e){("setcontent"!==e.type||e.selection)&&u.setEditorTimeout(x,function(){var e;(e=a(x.selection.getNode()))?(s(),t(e)):s()})}),x.on("blur hide contextmenu",s),x.on("ObjectResizeStart",function(){var e=a(x.selection.getNode());e&&e.toolbar.panel&&e.toolbar.panel.hide()}),x.on("ResizeEditor ResizeWindow",r(!0)),x.on("nodeChange",r(!1)),x.on("remove",function(){w.each(o(),function(e){e.panel&&e.panel.remove()}),x.contextToolbars={}}),x.shortcuts.add("ctrl+F9","",function(){var e=a(x.selection.getNode());e&&e.toolbar.panel&&e.toolbar.panel.items()[0].focus()})},U=function(t){return function(e){return function(e){if(null===e)return"null";var t=typeof e;return"object"===t&&(Array.prototype.isPrototypeOf(e)||e.constructor&&"Array"===e.constructor.name)?"array":"object"===t&&(String.prototype.isPrototypeOf(e)||e.constructor&&"String"===e.constructor.name)?"string":t}(e)===t}},V=U("array"),Y=U("function"),$=U("number"),q=(Array.prototype.slice,Array.prototype.indexOf),X=Array.prototype.push,j=function(e,t){var n,i,r=(n=e,i=t,q.call(n,i));return-1===r?N.none():N.some(r)},J=function(e,t){for(var n=0,i=e.length;n<i;n++)if(t(e[n],n))return!0;return!1},G=function(e,t){for(var n=e.length,i=new Array(n),r=0;r<n;r++){var o=e[r];i[r]=t(o,r)}return i},K=function(e,t){for(var n=0,i=e.length;n<i;n++)t(e[n],n)},Z=function(e,t){for(var n=[],i=0,r=e.length;i<r;i++){var o=e[i];t(o,i)&&n.push(o)}return n},Q=(Y(Array.from)&&Array.from,{file:{title:"File",items:"newdocument restoredraft | preview | print"},edit:{title:"Edit",items:"undo redo | cut copy paste pastetext | selectall"},view:{title:"View",items:"code | visualaid visualchars visualblocks | spellchecker | preview fullscreen"},insert:{title:"Insert",items:"image link media template codesample inserttable | charmap hr | pagebreak nonbreaking anchor toc | insertdatetime"},format:{title:"Format",items:"bold italic underline strikethrough superscript subscript codeformat | blockformats align | removeformat"},tools:{title:"Tools",items:"spellchecker spellcheckerlanguage | a11ycheck code"},table:{title:"Table"},help:{title:"Help"}}),ee=function(e,t){return"|"===e?{name:"|",item:{text:"|"}}:t?{name:e,item:t}:null},te=function(e,t){return function(e,t){for(var n=0,i=e.length;n<i;n++)if(t(e[n],n))return N.some(n);return N.none()}(e,function(e){return e.name===t}).isSome()},ne=function(e){return e&&"|"===e.item.text},ie=function(n,e,t,i){var r,o,s,a,l,u,c;return e?(o=e[i],a=!0):o=Q[i],o&&(r={text:o.title},s=[],w.each((o.items||"").split(/[ ,]/),function(e){var t=ee(e,n[e]);t&&s.push(t)}),a||w.each(n,function(e,t){e.context!==i||te(s,t)||("before"===e.separator&&s.push({name:"|",item:{text:"|"}}),e.prependToContext?s.unshift(ee(t,e)):s.push(ee(t,e)),"after"===e.separator&&s.push({name:"|",item:{text:"|"}}))}),r.menu=G((l=t,u=Z(s,function(e){return!1===l.hasOwnProperty(e.name)}),c=Z(u,function(e,t){return!ne(e)||!ne(u[t-1])}),Z(c,function(e,t){return!ne(e)||0<t&&t<c.length-1})),function(e){return e.item}),!r.menu.length)?null:r},re=function(e){for(var t,n=[],i=function(e){var t,n=[],i=h(e);if(i)for(t in i)n.push(t);else for(t in Q)n.push(t);return n}(e),r=w.makeMap((t=e,t.getParam("removed_menuitems","")).split(/[ ,]/)),o=c(e),s="string"==typeof o?o.split(/[ ,]/):i,a=0;a<s.length;a++){var l=s[a],u=ie(e.menuItems,h(e),r,l);u&&n.push(u)}return n},oe=p.DOM,se=function(e){return{width:e.clientWidth,height:e.clientHeight}},ae=function(e,t,n){var i,r,o,s;i=e.getContainer(),r=e.getContentAreaContainer().firstChild,o=se(i),s=se(r),null!==t&&(t=Math.max(e.getParam("min_width",100,"number"),t),t=Math.min(e.getParam("max_width",65535,"number"),t),oe.setStyle(i,"width",t+(o.width-s.width)),oe.setStyle(r,"width",t)),n=Math.max(e.getParam("min_height",100,"number"),n),n=Math.min(e.getParam("max_height",65535,"number"),n),oe.setStyle(r,"height",n),y(e)},le=ae,ue=function(e,t,n){var i=e.getContentAreaContainer();ae(e,i.clientWidth+t,i.clientHeight+n)},ce=tinymce.util.Tools.resolve("tinymce.Env"),de=function(e,t,n){var i,r=e.settings[n];r&&r((i=t.getEl("body"),{element:function(){return i}}))},fe=function(c,d,f){return function(e){var t,n,i,r,o,s=e.control,a=s.parents().filter("panel")[0],l=a.find("#"+d)[0],u=(t=f,n=d,w.grep(t,function(e){return e.name===n})[0]);i=d,r=a,o=f,w.each(o,function(e){var t=r.items().filter("#"+e.name)[0];t&&t.visible()&&e.name!==i&&(de(e,t,"onhide"),t.visible(!1))}),s.parent().items().each(function(e){e.active(!1)}),l&&l.visible()?(de(u,l,"onhide"),l.hide(),s.active(!1)):(l?l.show():(l=v.create({type:"container",name:d,layout:"stack",classes:"sidebar-panel",html:""}),a.prepend(l),de(u,l,"onrender")),de(u,l,"onshow"),s.active(!0)),y(c)}},he=function(e){return!(ce.ie&&!(11<=ce.ie)||!e.sidebars)&&0<e.sidebars.length},me=function(n){return{type:"panel",name:"sidebar",layout:"stack",classes:"sidebar",items:[{type:"toolbar",layout:"stack",classes:"sidebar-toolbar",items:w.map(n.sidebars,function(e){var t=e.settings;return{type:"button",icon:t.icon,image:t.image,tooltip:t.tooltip,onclick:fe(n,e.name,n.sidebars)}})}]}},ge=function(e){var t=function(){e._skinLoaded=!0,o(e)};return function(){e.initialized?t():e.on("init",t)}},pe=p.DOM,ve=function(e){return{type:"panel",name:"iframe",layout:"stack",classes:"edit-area",border:e,html:""}},be=function(t,e,n){var i,r,o,s,a;if(!1===m(t)&&n.skinUiCss?pe.styleSheetLoader.load(n.skinUiCss,ge(t)):ge(t)(),i=e.panel=v.create({type:"panel",role:"application",classes:"tinymce",style:"visibility: hidden",layout:"stack",border:1,items:[{type:"container",classes:"top-part",items:[!1===d(t)?null:{type:"menubar",border:"0 0 1 0",items:re(t)},A(t,f(t))]},he(t)?(s=t,{type:"panel",layout:"stack",classes:"edit-aria-container",border:"1 0 0 0",items:[ve("0"),me(s)]}):ve("1 0 0 0")]}),W.setUiContainer(t,i),"none"!==g(t)&&(r={type:"resizehandle",direction:g(t),onResizeStart:function(){var e=t.getContentAreaContainer().firstChild;o={width:e.clientWidth,height:e.clientHeight}},onResize:function(e){"both"===g(t)?le(t,o.width+e.deltaX,o.height+e.deltaY):le(t,null,o.height+e.deltaY)}}),t.getParam("statusbar",!0,"boolean")){var l=b.translate(["Powered by {0}",'<a href="https://www.tiny.cloud/?utm_campaign=editor_referral&amp;utm_medium=poweredby&amp;utm_source=tinymce" rel="noopener" target="_blank" role="presentation" tabindex="-1">Tiny</a>']),u=t.getParam("branding",!0,"boolean")?{type:"label",classes:"branding",html:" "+l}:null;i.add({type:"panel",name:"statusbar",classes:"statusbar",layout:"flow",border:"1 0 0 0",ariaRoot:!0,items:[{type:"elementpath",editor:t},r,u]})}return x(t),t.on("SwitchMode",(a=i,function(e){a.find("*").disabled("readonly"===e.mode)})),i.renderBefore(n.targetNode).reflow(),t.getParam("readonly",!1,"boolean")&&t.setMode("readonly"),n.width&&pe.setStyle(i.getEl(),"width",n.width),t.on("remove",function(){i.remove(),i=null}),R(t,i),F(t),{iframeContainer:i.find("#iframe")[0].getEl(),editorContainer:i.getEl()}},ye=tinymce.util.Tools.resolve("tinymce.dom.DomQuery"),xe=0,we={id:function(){return"mceu_"+xe++},create:function(e,t,n){var i=_.document.createElement(e);return p.DOM.setAttribs(i,t),"string"==typeof n?i.innerHTML=n:w.each(n,function(e){e.nodeType&&i.appendChild(e)}),i},createFragment:function(e){return p.DOM.createFragment(e)},getWindowSize:function(){return p.DOM.getViewPort()},getSize:function(e){var t,n;if(e.getBoundingClientRect){var i=e.getBoundingClientRect();t=Math.max(i.width||i.right-i.left,e.offsetWidth),n=Math.max(i.height||i.bottom-i.bottom,e.offsetHeight)}else t=e.offsetWidth,n=e.offsetHeight;return{width:t,height:n}},getPos:function(e,t){return p.DOM.getPos(e,t||we.getContainer())},getContainer:function(){return ce.container?ce.container:_.document.body},getViewPort:function(e){return p.DOM.getViewPort(e)},get:function(e){return _.document.getElementById(e)},addClass:function(e,t){return p.DOM.addClass(e,t)},removeClass:function(e,t){return p.DOM.removeClass(e,t)},hasClass:function(e,t){return p.DOM.hasClass(e,t)},toggleClass:function(e,t,n){return p.DOM.toggleClass(e,t,n)},css:function(e,t,n){return p.DOM.setStyle(e,t,n)},getRuntimeStyle:function(e,t){return p.DOM.getStyle(e,t,!0)},on:function(e,t,n,i){return p.DOM.bind(e,t,n,i)},off:function(e,t,n){return p.DOM.unbind(e,t,n)},fire:function(e,t,n){return p.DOM.fire(e,t,n)},innerHtml:function(e,t){p.DOM.setHTML(e,t)}},_e=function(e){return"static"===we.getRuntimeStyle(e,"position")},Re=function(e){return e.state.get("fixed")};function Ce(e,t,n){var i,r,o,s,a,l,u,c,d,f;return d=Ee(),o=(r=we.getPos(t,W.getUiContainer(e))).x,s=r.y,Re(e)&&_e(_.document.body)&&(o-=d.x,s-=d.y),i=e.getEl(),a=(f=we.getSize(i)).width,l=f.height,u=(f=we.getSize(t)).width,c=f.height,"b"===(n=(n||"").split(""))[0]&&(s+=c),"r"===n[1]&&(o+=u),"c"===n[0]&&(s+=Math.round(c/2)),"c"===n[1]&&(o+=Math.round(u/2)),"b"===n[3]&&(s-=l),"r"===n[4]&&(o-=a),"c"===n[3]&&(s-=Math.round(l/2)),"c"===n[4]&&(o-=Math.round(a/2)),{x:o,y:s,w:a,h:l}}var Ee=function(){var e=_.window;return{x:Math.max(e.pageXOffset,_.document.body.scrollLeft,_.document.documentElement.scrollLeft),y:Math.max(e.pageYOffset,_.document.body.scrollTop,_.document.documentElement.scrollTop),w:e.innerWidth||_.document.documentElement.clientWidth,h:e.innerHeight||_.document.documentElement.clientHeight}},ke=function(e){var t,n=W.getUiContainer(e);return n&&!Re(e)?{x:0,y:0,w:(t=n).scrollWidth-1,h:t.scrollHeight-1}:Ee()},He={testMoveRel:function(e,t){for(var n=ke(this),i=0;i<t.length;i++){var r=Ce(this,e,t[i]);if(Re(this)){if(0<r.x&&r.x+r.w<n.w&&0<r.y&&r.y+r.h<n.h)return t[i]}else if(r.x>n.x&&r.x+r.w<n.w+n.x&&r.y>n.y&&r.y+r.h<n.h+n.y)return t[i]}return t[0]},moveRel:function(e,t){"string"!=typeof t&&(t=this.testMoveRel(e,t));var n=Ce(this,e,t);return this.moveTo(n.x,n.y)},moveBy:function(e,t){var n=this.layoutRect();return this.moveTo(n.x+e,n.y+t),this},moveTo:function(e,t){var n=this;function i(e,t,n){return e<0?0:t<e+n&&(e=t-n)<0?0:e}if(n.settings.constrainToViewport){var r=ke(this),o=n.layoutRect();e=i(e,r.w+r.x,o.w),t=i(t,r.h+r.y,o.h)}var s=W.getUiContainer(n);return s&&_e(s)&&!Re(n)&&(e-=s.scrollLeft,t-=s.scrollTop),s&&(e+=1,t+=1),n.state.get("rendered")?n.layoutRect({x:e,y:t}).repaint():(n.settings.x=e,n.settings.y=t),n.fire("move",{x:e,y:t}),n}},Se=tinymce.util.Tools.resolve("tinymce.util.Class"),Te=tinymce.util.Tools.resolve("tinymce.util.EventDispatcher"),Me=function(e){var t;if(e)return"number"==typeof e?{top:e=e||0,left:e,bottom:e,right:e}:(1===(t=(e=e.split(" ")).length)?e[1]=e[2]=e[3]=e[0]:2===t?(e[2]=e[0],e[3]=e[1]):3===t&&(e[3]=e[1]),{top:parseInt(e[0],10)||0,right:parseInt(e[1],10)||0,bottom:parseInt(e[2],10)||0,left:parseInt(e[3],10)||0})},Ne=function(i,e){function t(e){var t=parseFloat(function(e){var t=i.ownerDocument.defaultView;if(t){var n=t.getComputedStyle(i,null);return n?(e=e.replace(/[A-Z]/g,function(e){return"-"+e}),n.getPropertyValue(e)):null}return i.currentStyle[e]}(e));return isNaN(t)?0:t}return{top:t(e+"TopWidth"),right:t(e+"RightWidth"),bottom:t(e+"BottomWidth"),left:t(e+"LeftWidth")}};function Pe(){}function We(e){this.cls=[],this.cls._map={},this.onchange=e||Pe,this.prefix=""}w.extend(We.prototype,{add:function(e){return e&&!this.contains(e)&&(this.cls._map[e]=!0,this.cls.push(e),this._change()),this},remove:function(e){if(this.contains(e)){var t=void 0;for(t=0;t<this.cls.length&&this.cls[t]!==e;t++);this.cls.splice(t,1),delete this.cls._map[e],this._change()}return this},toggle:function(e,t){var n=this.contains(e);return n!==t&&(n?this.remove(e):this.add(e),this._change()),this},contains:function(e){return!!this.cls._map[e]},_change:function(){delete this.clsValue,this.onchange.call(this)}}),We.prototype.toString=function(){var e;if(this.clsValue)return this.clsValue;e="";for(var t=0;t<this.cls.length;t++)0<t&&(e+=" "),e+=this.prefix+this.cls[t];return e};var De,Oe,Ae,Be=/^([\w\\*]+)?(?:#([\w\-\\]+))?(?:\.([\w\\\.]+))?(?:\[\@?([\w\\]+)([\^\$\*!~]?=)([\w\\]+)\])?(?:\:(.+))?/i,Le=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,ze=/^\s*|\s*$/g,Ie=Se.extend({init:function(e){var o=this.match;function s(e,t,n){var i;function r(e){e&&t.push(e)}return r(function(t){if(t)return t=t.toLowerCase(),function(e){return"*"===t||e.type===t}}((i=Be.exec(e.replace(ze,"")))[1])),r(function(t){if(t)return function(e){return e._name===t}}(i[2])),r(function(n){if(n)return n=n.split("."),function(e){for(var t=n.length;t--;)if(!e.classes.contains(n[t]))return!1;return!0}}(i[3])),r(function(n,i,r){if(n)return function(e){var t=e[n]?e[n]():"";return i?"="===i?t===r:"*="===i?0<=t.indexOf(r):"~="===i?0<=(" "+t+" ").indexOf(" "+r+" "):"!="===i?t!==r:"^="===i?0===t.indexOf(r):"$="===i&&t.substr(t.length-r.length)===r:!!r}}(i[4],i[5],i[6])),r(function(i){var t;if(i)return(i=/(?:not\((.+)\))|(.+)/i.exec(i))[1]?(t=a(i[1],[]),function(e){return!o(e,t)}):(i=i[2],function(e,t,n){return"first"===i?0===t:"last"===i?t===n-1:"even"===i?t%2==0:"odd"===i?t%2==1:!!e[i]&&e[i]()})}(i[7])),t.pseudo=!!i[7],t.direct=n,t}function a(e,t){var n,i,r,o=[];do{if(Le.exec(""),(i=Le.exec(e))&&(e=i[3],o.push(i[1]),i[2])){n=i[3];break}}while(i);for(n&&a(n,t),e=[],r=0;r<o.length;r++)">"!==o[r]&&e.push(s(o[r],[],">"===o[r-1]));return t.push(e),t}this._selectors=a(e,[])},match:function(e,t){var n,i,r,o,s,a,l,u,c,d,f,h,m;for(n=0,i=(t=t||this._selectors).length;n<i;n++){for(m=e,h=0,r=(o=(s=t[n]).length)-1;0<=r;r--)for(u=s[r];m;){if(u.pseudo)for(c=d=(f=m.parent().items()).length;c--&&f[c]!==m;);for(a=0,l=u.length;a<l;a++)if(!u[a](m,c,d)){a=l+1;break}if(a===l){h++;break}if(r===o-1)break;m=m.parent()}if(h===o)return!0}return!1},find:function(e){var t,n,u=[],i=this._selectors;function c(e,t,n){var i,r,o,s,a,l=t[n];for(i=0,r=e.length;i<r;i++){for(a=e[i],o=0,s=l.length;o<s;o++)if(!l[o](a,i,r)){o=s+1;break}if(o===s)n===t.length-1?u.push(a):a.items&&c(a.items(),t,n+1);else if(l.direct)return;a.items&&c(a.items(),t,n)}}if(e.items){for(t=0,n=i.length;t<n;t++)c(e.items(),i[t],0);1<n&&(u=function(e){for(var t,n=[],i=e.length;i--;)(t=e[i]).__checked||(n.push(t),t.__checked=1);for(i=n.length;i--;)delete n[i].__checked;return n}(u))}return De||(De=Ie.Collection),new De(u)}}),Fe=Array.prototype.push,Ue=Array.prototype.slice;Ae={length:0,init:function(e){e&&this.add(e)},add:function(e){return w.isArray(e)?Fe.apply(this,e):e instanceof Oe?this.add(e.toArray()):Fe.call(this,e),this},set:function(e){var t,n=this,i=n.length;for(n.length=0,n.add(e),t=n.length;t<i;t++)delete n[t];return n},filter:function(t){var e,n,i,r,o=[];for("string"==typeof t?(t=new Ie(t),r=function(e){return t.match(e)}):r=t,e=0,n=this.length;e<n;e++)r(i=this[e])&&o.push(i);return new Oe(o)},slice:function(){return new Oe(Ue.apply(this,arguments))},eq:function(e){return-1===e?this.slice(e):this.slice(e,+e+1)},each:function(e){return w.each(this,e),this},toArray:function(){return w.toArray(this)},indexOf:function(e){for(var t=this.length;t--&&this[t]!==e;);return t},reverse:function(){return new Oe(w.toArray(this).reverse())},hasClass:function(e){return!!this[0]&&this[0].classes.contains(e)},prop:function(t,n){var e;return n!==undefined?(this.each(function(e){e[t]&&e[t](n)}),this):(e=this[0])&&e[t]?e[t]():void 0},exec:function(t){var n=w.toArray(arguments).slice(1);return this.each(function(e){e[t]&&e[t].apply(e,n)}),this},remove:function(){for(var e=this.length;e--;)this[e].remove();return this},addClass:function(t){return this.each(function(e){e.classes.add(t)})},removeClass:function(t){return this.each(function(e){e.classes.remove(t)})}},w.each("fire on off show hide append prepend before after reflow".split(" "),function(n){Ae[n]=function(){var t=w.toArray(arguments);return this.each(function(e){n in e&&e[n].apply(e,t)}),this}}),w.each("text name disabled active selected checked visible parent value data".split(" "),function(t){Ae[t]=function(e){return this.prop(t,e)}}),Oe=Se.extend(Ae);var Ve=Ie.Collection=Oe,Ye=function(e){this.create=e.create};Ye.create=function(r,o){return new Ye({create:function(t,n){var i,e=function(e){t.set(n,e.value)};return t.on("change:"+n,function(e){r.set(o,e.value)}),r.on("change:"+o,e),(i=t._bindings)||(i=t._bindings=[],t.on("destroy",function(){for(var e=i.length;e--;)i[e]()})),i.push(function(){r.off("change:"+o,e)}),r.get(o)}})};var $e=tinymce.util.Tools.resolve("tinymce.util.Observable");function qe(e){return 0<e.nodeType}var Xe,je,Je=Se.extend({Mixins:[$e],init:function(e){var t,n;for(t in e=e||{})(n=e[t])instanceof Ye&&(e[t]=n.create(this,t));this.data=e},set:function(t,n){var i,r,o=this.data[t];if(n instanceof Ye&&(n=n.create(this,t)),"object"==typeof t){for(i in t)this.set(i,t[i]);return this}return function e(t,n){var i,r;if(t===n)return!0;if(null===t||null===n)return t===n;if("object"!=typeof t||"object"!=typeof n)return t===n;if(w.isArray(n)){if(t.length!==n.length)return!1;for(i=t.length;i--;)if(!e(t[i],n[i]))return!1}if(qe(t)||qe(n))return t===n;for(i in r={},n){if(!e(t[i],n[i]))return!1;r[i]=!0}for(i in t)if(!r[i]&&!e(t[i],n[i]))return!1;return!0}(o,n)||(this.data[t]=n,r={target:this,name:t,value:n,oldValue:o},this.fire("change:"+t,r),this.fire("change",r)),this},get:function(e){return this.data[e]},has:function(e){return e in this.data},bind:function(e){return Ye.create(this,e)},destroy:function(){this.fire("destroy")}}),Ge={},Ke={add:function(e){var t=e.parent();if(t){if(!t._layout||t._layout.isNative())return;Ge[t._id]||(Ge[t._id]=t),Xe||(Xe=!0,u.requestAnimationFrame(function(){var e,t;for(e in Xe=!1,Ge)(t=Ge[e]).state.get("rendered")&&t.reflow();Ge={}},_.document.body))}},remove:function(e){Ge[e._id]&&delete Ge[e._id]}},Ze="onmousewheel"in _.document,Qe=!1,et=0,tt={Statics:{classPrefix:"mce-"},isRtl:function(){return je.rtl},classPrefix:"mce-",init:function(t){var e,n,i=this;function r(e){var t;for(e=e.split(" "),t=0;t<e.length;t++)i.classes.add(e[t])}i.settings=t=w.extend({},i.Defaults,t),i._id=t.id||"mceu_"+et++,i._aria={role:t.role},i._elmCache={},i.$=ye,i.state=new Je({visible:!0,active:!1,disabled:!1,value:""}),i.data=new Je(t.data),i.classes=new We(function(){i.state.get("rendered")&&(i.getEl().className=this.toString())}),i.classes.prefix=i.classPrefix,(e=t.classes)&&(i.Defaults&&(n=i.Defaults.classes)&&e!==n&&r(n),r(e)),w.each("title text name visible disabled active value".split(" "),function(e){e in t&&i[e](t[e])}),i.on("click",function(){if(i.disabled())return!1}),i.settings=t,i.borderBox=Me(t.border),i.paddingBox=Me(t.padding),i.marginBox=Me(t.margin),t.hidden&&i.hide()},Properties:"parent,name",getContainerElm:function(){var e=W.getUiContainer(this);return e||we.getContainer()},getParentCtrl:function(e){for(var t,n=this.getRoot().controlIdLookup;e&&n&&!(t=n[e.id]);)e=e.parentNode;return t},initLayoutRect:function(){var e,t,n,i,r,o,s,a,l,u,c=this,d=c.settings,f=c.getEl();e=c.borderBox=c.borderBox||Ne(f,"border"),c.paddingBox=c.paddingBox||Ne(f,"padding"),c.marginBox=c.marginBox||Ne(f,"margin"),u=we.getSize(f),a=d.minWidth,l=d.minHeight,r=a||u.width,o=l||u.height,n=d.width,i=d.height,s=void 0!==(s=d.autoResize)?s:!n&&!i,n=n||r,i=i||o;var h=e.left+e.right,m=e.top+e.bottom,g=d.maxWidth||65535,p=d.maxHeight||65535;return c._layoutRect=t={x:d.x||0,y:d.y||0,w:n,h:i,deltaW:h,deltaH:m,contentW:n-h,contentH:i-m,innerW:n-h,innerH:i-m,startMinWidth:a||0,startMinHeight:l||0,minW:Math.min(r,g),minH:Math.min(o,p),maxW:g,maxH:p,autoResize:s,scrollW:0},c._lastLayoutRect={},t},layoutRect:function(e){var t,n,i,r,o,s=this,a=s._layoutRect;return a||(a=s.initLayoutRect()),e?(i=a.deltaW,r=a.deltaH,e.x!==undefined&&(a.x=e.x),e.y!==undefined&&(a.y=e.y),e.minW!==undefined&&(a.minW=e.minW),e.minH!==undefined&&(a.minH=e.minH),(n=e.w)!==undefined&&(n=(n=n<a.minW?a.minW:n)>a.maxW?a.maxW:n,a.w=n,a.innerW=n-i),(n=e.h)!==undefined&&(n=(n=n<a.minH?a.minH:n)>a.maxH?a.maxH:n,a.h=n,a.innerH=n-r),(n=e.innerW)!==undefined&&(n=(n=n<a.minW-i?a.minW-i:n)>a.maxW-i?a.maxW-i:n,a.innerW=n,a.w=n+i),(n=e.innerH)!==undefined&&(n=(n=n<a.minH-r?a.minH-r:n)>a.maxH-r?a.maxH-r:n,a.innerH=n,a.h=n+r),e.contentW!==undefined&&(a.contentW=e.contentW),e.contentH!==undefined&&(a.contentH=e.contentH),(t=s._lastLayoutRect).x===a.x&&t.y===a.y&&t.w===a.w&&t.h===a.h||((o=je.repaintControls)&&o.map&&!o.map[s._id]&&(o.push(s),o.map[s._id]=!0),t.x=a.x,t.y=a.y,t.w=a.w,t.h=a.h),s):a},repaint:function(){var e,t,n,i,r,o,s,a,l,u,c=this;l=_.document.createRange?function(e){return e}:Math.round,e=c.getEl().style,i=c._layoutRect,a=c._lastRepaintRect||{},o=(r=c.borderBox).left+r.right,s=r.top+r.bottom,i.x!==a.x&&(e.left=l(i.x)+"px",a.x=i.x),i.y!==a.y&&(e.top=l(i.y)+"px",a.y=i.y),i.w!==a.w&&(u=l(i.w-o),e.width=(0<=u?u:0)+"px",a.w=i.w),i.h!==a.h&&(u=l(i.h-s),e.height=(0<=u?u:0)+"px",a.h=i.h),c._hasBody&&i.innerW!==a.innerW&&(u=l(i.innerW),(n=c.getEl("body"))&&((t=n.style).width=(0<=u?u:0)+"px"),a.innerW=i.innerW),c._hasBody&&i.innerH!==a.innerH&&(u=l(i.innerH),(n=n||c.getEl("body"))&&((t=t||n.style).height=(0<=u?u:0)+"px"),a.innerH=i.innerH),c._lastRepaintRect=a,c.fire("repaint",{},!1)},updateLayoutRect:function(){var e=this;e.parent()._lastRect=null,we.css(e.getEl(),{width:"",height:""}),e._layoutRect=e._lastRepaintRect=e._lastLayoutRect=null,e.initLayoutRect()},on:function(e,t){var n,i,r,o=this;return nt(o).on(e,"string"!=typeof(n=t)?n:function(e){return i||o.parentsAndSelf().each(function(e){var t=e.settings.callbacks;if(t&&(i=t[n]))return r=e,!1}),i?i.call(r,e):(e.action=n,void this.fire("execute",e))}),o},off:function(e,t){return nt(this).off(e,t),this},fire:function(e,t,n){if((t=t||{}).control||(t.control=this),t=nt(this).fire(e,t),!1!==n&&this.parent)for(var i=this.parent();i&&!t.isPropagationStopped();)i.fire(e,t,!1),i=i.parent();return t},hasEventListeners:function(e){return nt(this).has(e)},parents:function(e){var t,n=new Ve;for(t=this.parent();t;t=t.parent())n.add(t);return e&&(n=n.filter(e)),n},parentsAndSelf:function(e){return new Ve(this).add(this.parents(e))},next:function(){var e=this.parent().items();return e[e.indexOf(this)+1]},prev:function(){var e=this.parent().items();return e[e.indexOf(this)-1]},innerHtml:function(e){return this.$el.html(e),this},getEl:function(e){var t=e?this._id+"-"+e:this._id;return this._elmCache[t]||(this._elmCache[t]=ye("#"+t)[0]),this._elmCache[t]},show:function(){return this.visible(!0)},hide:function(){return this.visible(!1)},focus:function(){try{this.getEl().focus()}catch(e){}return this},blur:function(){return this.getEl().blur(),this},aria:function(e,t){var n=this,i=n.getEl(n.ariaTarget);return void 0===t?n._aria[e]:(n._aria[e]=t,n.state.get("rendered")&&i.setAttribute("role"===e?e:"aria-"+e,t),n)},encode:function(e,t){return!1!==t&&(e=this.translate(e)),(e||"").replace(/[&<>"]/g,function(e){return"&#"+e.charCodeAt(0)+";"})},translate:function(e){return je.translate?je.translate(e):e},before:function(e){var t=this.parent();return t&&t.insert(e,t.items().indexOf(this),!0),this},after:function(e){var t=this.parent();return t&&t.insert(e,t.items().indexOf(this)),this},remove:function(){var t,e,n=this,i=n.getEl(),r=n.parent();if(n.items){var o=n.items().toArray();for(e=o.length;e--;)o[e].remove()}r&&r.items&&(t=[],r.items().each(function(e){e!==n&&t.push(e)}),r.items().set(t),r._lastRect=null),n._eventsRoot&&n._eventsRoot===n&&ye(i).off();var s=n.getRoot().controlIdLookup;return s&&delete s[n._id],i&&i.parentNode&&i.parentNode.removeChild(i),n.state.set("rendered",!1),n.state.destroy(),n.fire("remove"),n},renderBefore:function(e){return ye(e).before(this.renderHtml()),this.postRender(),this},renderTo:function(e){return ye(e||this.getContainerElm()).append(this.renderHtml()),this.postRender(),this},preRender:function(){},render:function(){},renderHtml:function(){return'<div id="'+this._id+'" class="'+this.classes+'"></div>'},postRender:function(){var e,t,n,i,r,o=this,s=o.settings;for(i in o.$el=ye(o.getEl()),o.state.set("rendered",!0),s)0===i.indexOf("on")&&o.on(i.substr(2),s[i]);if(o._eventsRoot){for(n=o.parent();!r&&n;n=n.parent())r=n._eventsRoot;if(r)for(i in r._nativeEvents)o._nativeEvents[i]=!0}it(o),s.style&&(e=o.getEl())&&(e.setAttribute("style",s.style),e.style.cssText=s.style),o.settings.border&&(t=o.borderBox,o.$el.css({"border-top-width":t.top,"border-right-width":t.right,"border-bottom-width":t.bottom,"border-left-width":t.left}));var a=o.getRoot();for(var l in a.controlIdLookup||(a.controlIdLookup={}),(a.controlIdLookup[o._id]=o)._aria)o.aria(l,o._aria[l]);!1===o.state.get("visible")&&(o.getEl().style.display="none"),o.bindStates(),o.state.on("change:visible",function(e){var t,n=e.value;o.state.get("rendered")&&(o.getEl().style.display=!1===n?"none":"",o.getEl().getBoundingClientRect()),(t=o.parent())&&(t._lastRect=null),o.fire(n?"show":"hide"),Ke.add(o)}),o.fire("postrender",{},!1)},bindStates:function(){},scrollIntoView:function(e){var t,n,i,r,o,s,a=this.getEl(),l=a.parentNode,u=function(e,t){var n,i,r=e;for(n=i=0;r&&r!==t&&r.nodeType;)n+=r.offsetLeft||0,i+=r.offsetTop||0,r=r.offsetParent;return{x:n,y:i}}(a,l);return t=u.x,n=u.y,i=a.offsetWidth,r=a.offsetHeight,o=l.clientWidth,s=l.clientHeight,"end"===e?(t-=o-i,n-=s-r):"center"===e&&(t-=o/2-i/2,n-=s/2-r/2),l.scrollLeft=t,l.scrollTop=n,this},getRoot:function(){for(var e,t=this,n=[];t;){if(t.rootControl){e=t.rootControl;break}n.push(t),t=(e=t).parent()}e||(e=this);for(var i=n.length;i--;)n[i].rootControl=e;return e},reflow:function(){Ke.remove(this);var e=this.parent();return e&&e._layout&&!e._layout.isNative()&&e.reflow(),this}};function nt(n){return n._eventDispatcher||(n._eventDispatcher=new Te({scope:n,toggleEvent:function(e,t){t&&Te.isNative(e)&&(n._nativeEvents||(n._nativeEvents={}),n._nativeEvents[e]=!0,n.state.get("rendered")&&it(n))}})),n._eventDispatcher}function it(a){var e,t,n,l,i,r;function o(e){var t=a.getParentCtrl(e.target);t&&t.fire(e.type,e)}function s(){var e=l._lastHoverCtrl;e&&(e.fire("mouseleave",{target:e.getEl()}),e.parents().each(function(e){e.fire("mouseleave",{target:e.getEl()})}),l._lastHoverCtrl=null)}function u(e){var t,n,i,r=a.getParentCtrl(e.target),o=l._lastHoverCtrl,s=0;if(r!==o){if((n=(l._lastHoverCtrl=r).parents().toArray().reverse()).push(r),o){for((i=o.parents().toArray().reverse()).push(o),s=0;s<i.length&&n[s]===i[s];s++);for(t=i.length-1;s<=t;t--)(o=i[t]).fire("mouseleave",{target:o.getEl()})}for(t=s;t<n.length;t++)(r=n[t]).fire("mouseenter",{target:r.getEl()})}}function c(e){e.preventDefault(),"mousewheel"===e.type?(e.deltaY=-.025*e.wheelDelta,e.wheelDeltaX&&(e.deltaX=-.025*e.wheelDeltaX)):(e.deltaX=0,e.deltaY=e.detail),e=a.fire("wheel",e)}if(i=a._nativeEvents){for((n=a.parents().toArray()).unshift(a),e=0,t=n.length;!l&&e<t;e++)l=n[e]._eventsRoot;for(l||(l=n[n.length-1]||a),a._eventsRoot=l,t=e,e=0;e<t;e++)n[e]._eventsRoot=l;var d=l._delegates;for(r in d||(d=l._delegates={}),i){if(!i)return!1;"wheel"!==r||Qe?("mouseenter"===r||"mouseleave"===r?l._hasMouseEnter||(ye(l.getEl()).on("mouseleave",s).on("mouseover",u),l._hasMouseEnter=1):d[r]||(ye(l.getEl()).on(r,o),d[r]=!0),i[r]=!1):Ze?ye(a.getEl()).on("mousewheel",c):ye(a.getEl()).on("DOMMouseScroll",c)}}}w.each("text title visible disabled active value".split(" "),function(t){tt[t]=function(e){return 0===arguments.length?this.state.get(t):(void 0!==e&&this.state.set(t,e),this)}});var rt=je=Se.extend(tt),ot=function(e){return!!e.getAttribute("data-mce-tabstop")};function st(e){var o,r,n=e.root;function i(e){return e&&1===e.nodeType}try{o=_.document.activeElement}catch(t){o=_.document.body}function s(e){return i(e=e||o)?e.getAttribute("role"):null}function a(e){for(var t,n=e||o;n=n.parentNode;)if(t=s(n))return t}function l(e){var t=o;if(i(t))return t.getAttribute("aria-"+e)}function u(e){var t=e.tagName.toUpperCase();return"INPUT"===t||"TEXTAREA"===t||"SELECT"===t}function c(t){var r=[];return function e(t){if(1===t.nodeType&&"none"!==t.style.display&&!t.disabled){var n;(u(n=t)&&!n.hidden||ot(n)||/^(button|menuitem|checkbox|tab|menuitemcheckbox|option|gridcell|slider)$/.test(s(n)))&&r.push(t);for(var i=0;i<t.childNodes.length;i++)e(t.childNodes[i])}}(t||n.getEl()),r}function d(e){var t,n;(n=(e=e||r).parents().toArray()).unshift(e);for(var i=0;i<n.length&&!(t=n[i]).settings.ariaRoot;i++);return t}function f(e,t){return e<0?e=t.length-1:e>=t.length&&(e=0),t[e]&&t[e].focus(),e}function h(e,t){var n=-1,i=d();t=t||c(i.getEl());for(var r=0;r<t.length;r++)t[r]===o&&(n=r);n+=e,i.lastAriaIndex=f(n,t)}function m(){"tablist"===a()?h(-1,c(o.parentNode)):r.parent().submenu?b():h(-1)}function g(){var e=s(),t=a();"tablist"===t?h(1,c(o.parentNode)):"menuitem"===e&&"menu"===t&&l("haspopup")?y():h(1)}function p(){h(-1)}function v(){var e=s(),t=a();"menuitem"===e&&"menubar"===t?y():"button"===e&&l("haspopup")?y({key:"down"}):h(1)}function b(){r.fire("cancel")}function y(e){e=e||{},r.fire("click",{target:o,aria:e})}return r=n.getParentCtrl(o),n.on("keydown",function(e){function t(e,t){u(o)||ot(o)||"slider"!==s(o)&&!1!==t(e)&&e.preventDefault()}if(!e.isDefaultPrevented())switch(e.keyCode){case 37:t(e,m);break;case 39:t(e,g);break;case 38:t(e,p);break;case 40:t(e,v);break;case 27:b();break;case 14:case 13:case 32:t(e,y);break;case 9:!function(e){if("tablist"===a()){var t=c(r.getEl("body"))[0];t&&t.focus()}else h(e.shiftKey?-1:1)}(e),e.preventDefault()}}),n.on("focusin",function(e){o=e.target,r=e.control}),{focusFirst:function(e){var t=d(e),n=c(t.getEl());t.settings.ariaRemember&&"lastAriaIndex"in t?f(t.lastAriaIndex,n):f(0,n)}}}var at={},lt=rt.extend({init:function(e){var t=this;t._super(e),(e=t.settings).fixed&&t.state.set("fixed",!0),t._items=new Ve,t.isRtl()&&t.classes.add("rtl"),t.bodyClasses=new We(function(){t.state.get("rendered")&&(t.getEl("body").className=this.toString())}),t.bodyClasses.prefix=t.classPrefix,t.classes.add("container"),t.bodyClasses.add("container-body"),e.containerCls&&t.classes.add(e.containerCls),t._layout=v.create((e.layout||"")+"layout"),t.settings.items?t.add(t.settings.items):t.add(t.render()),t._hasBody=!0},items:function(){return this._items},find:function(e){return(e=at[e]=at[e]||new Ie(e)).find(this)},add:function(e){return this.items().add(this.create(e)).parent(this),this},focus:function(e){var t,n,i,r=this;if(!e||!(n=r.keyboardNav||r.parents().eq(-1)[0].keyboardNav))return i=r.find("*"),r.statusbar&&i.add(r.statusbar.items()),i.each(function(e){if(e.settings.autofocus)return t=null,!1;e.canFocus&&(t=t||e)}),t&&t.focus(),r;n.focusFirst(r)},replace:function(e,t){for(var n,i=this.items(),r=i.length;r--;)if(i[r]===e){i[r]=t;break}0<=r&&((n=t.getEl())&&n.parentNode.removeChild(n),(n=e.getEl())&&n.parentNode.removeChild(n)),t.parent(this)},create:function(e){var t,n=this,i=[];return w.isArray(e)||(e=[e]),w.each(e,function(e){e&&(e instanceof rt||("string"==typeof e&&(e={type:e}),t=w.extend({},n.settings.defaults,e),e.type=t.type=t.type||e.type||n.settings.defaultType||(t.defaults?t.defaults.type:null),e=v.create(t)),i.push(e))}),i},renderNew:function(){var i=this;return i.items().each(function(e,t){var n;e.parent(i),e.state.get("rendered")||((n=i.getEl("body")).hasChildNodes()&&t<=n.childNodes.length-1?ye(n.childNodes[t]).before(e.renderHtml()):ye(n).append(e.renderHtml()),e.postRender(),Ke.add(e))}),i._layout.applyClasses(i.items().filter(":visible")),i._lastRect=null,i},append:function(e){return this.add(e).renderNew()},prepend:function(e){return this.items().set(this.create(e).concat(this.items().toArray())),this.renderNew()},insert:function(e,t,n){var i,r,o;return e=this.create(e),i=this.items(),!n&&t<i.length-1&&(t+=1),0<=t&&t<i.length&&(r=i.slice(0,t).toArray(),o=i.slice(t).toArray(),i.set(r.concat(e,o))),this.renderNew()},fromJSON:function(e){for(var t in e)this.find("#"+t).value(e[t]);return this},toJSON:function(){var i={};return this.find("*").each(function(e){var t=e.name(),n=e.value();t&&void 0!==n&&(i[t]=n)}),i},renderHtml:function(){var e=this,t=e._layout,n=this.settings.role;return e.preRender(),t.preRender(e),'<div id="'+e._id+'" class="'+e.classes+'"'+(n?' role="'+this.settings.role+'"':"")+'><div id="'+e._id+'-body" class="'+e.bodyClasses+'">'+(e.settings.html||"")+t.renderHtml(e)+"</div></div>"},postRender:function(){var e,t=this;return t.items().exec("postRender"),t._super(),t._layout.postRender(t),t.state.set("rendered",!0),t.settings.style&&t.$el.css(t.settings.style),t.settings.border&&(e=t.borderBox,t.$el.css({"border-top-width":e.top,"border-right-width":e.right,"border-bottom-width":e.bottom,"border-left-width":e.left})),t.parent()||(t.keyboardNav=st({root:t})),t},initLayoutRect:function(){var e=this._super();return this._layout.recalc(this),e},recalc:function(){var e=this,t=e._layoutRect,n=e._lastRect;if(!n||n.w!==t.w||n.h!==t.h)return e._layout.recalc(e),t=e.layoutRect(),e._lastRect={x:t.x,y:t.y,w:t.w,h:t.h},!0},reflow:function(){var e;if(Ke.remove(this),this.visible()){for(rt.repaintControls=[],rt.repaintControls.map={},this.recalc(),e=rt.repaintControls.length;e--;)rt.repaintControls[e].repaint();"flow"!==this.settings.layout&&"stack"!==this.settings.layout&&this.repaint(),rt.repaintControls=[]}return this}});function ut(e){var t,n;if(e.changedTouches)for(t="screenX screenY pageX pageY clientX clientY".split(" "),n=0;n<t.length;n++)e[t[n]]=e.changedTouches[0][t[n]]}function ct(e,h){var m,g,t,p,v,b,y,x=h.document||_.document;h=h||{};var w=x.getElementById(h.handle||e);t=function(e){var t,n,i,r,o,s,a,l,u,c,d,f=(t=x,u=Math.max,n=t.documentElement,i=t.body,r=u(n.scrollWidth,i.scrollWidth),o=u(n.clientWidth,i.clientWidth),s=u(n.offsetWidth,i.offsetWidth),a=u(n.scrollHeight,i.scrollHeight),l=u(n.clientHeight,i.clientHeight),{width:r<s?o:r,height:a<u(n.offsetHeight,i.offsetHeight)?l:a});ut(e),e.preventDefault(),g=e.button,c=w,b=e.screenX,y=e.screenY,d=_.window.getComputedStyle?_.window.getComputedStyle(c,null).getPropertyValue("cursor"):c.runtimeStyle.cursor,m=ye("<div></div>").css({position:"absolute",top:0,left:0,width:f.width,height:f.height,zIndex:2147483647,opacity:1e-4,cursor:d}).appendTo(x.body),ye(x).on("mousemove touchmove",v).on("mouseup touchend",p),h.start(e)},v=function(e){if(ut(e),e.button!==g)return p(e);e.deltaX=e.screenX-b,e.deltaY=e.screenY-y,e.preventDefault(),h.drag(e)},p=function(e){ut(e),ye(x).off("mousemove touchmove",v).off("mouseup touchend",p),m.remove(),h.stop&&h.stop(e)},this.destroy=function(){ye(w).off()},ye(w).on("mousedown touchstart",t)}var dt,ft,ht,mt,gt={init:function(){this.on("repaint",this.renderScroll)},renderScroll:function(){var p=this,v=2;function n(){var m,g,e;function t(e,t,n,i,r,o){var s,a,l,u,c,d,f,h;if(a=p.getEl("scroll"+e)){if(f=t.toLowerCase(),h=n.toLowerCase(),ye(p.getEl("absend")).css(f,p.layoutRect()[i]-1),!r)return void ye(a).css("display","none");ye(a).css("display","block"),s=p.getEl("body"),l=p.getEl("scroll"+e+"t"),u=s["client"+n]-2*v,c=(u-=m&&g?a["client"+o]:0)/s["scroll"+n],(d={})[f]=s["offset"+t]+v,d[h]=u,ye(a).css(d),(d={})[f]=s["scroll"+t]*c,d[h]=u*c,ye(l).css(d)}}e=p.getEl("body"),m=e.scrollWidth>e.clientWidth,g=e.scrollHeight>e.clientHeight,t("h","Left","Width","contentW",m,"Height"),t("v","Top","Height","contentH",g,"Width")}p.settings.autoScroll&&(p._hasScroll||(p._hasScroll=!0,function(){function e(s,a,l,u,c){var d,e=p._id+"-scroll"+s,t=p.classPrefix;ye(p.getEl()).append('<div id="'+e+'" class="'+t+"scrollbar "+t+"scrollbar-"+s+'"><div id="'+e+'t" class="'+t+'scrollbar-thumb"></div></div>'),p.draghelper=new ct(e+"t",{start:function(){d=p.getEl("body")["scroll"+a],ye("#"+e).addClass(t+"active")},drag:function(e){var t,n,i,r,o=p.layoutRect();n=o.contentW>o.innerW,i=o.contentH>o.innerH,r=p.getEl("body")["client"+l]-2*v,t=(r-=n&&i?p.getEl("scroll"+s)["client"+c]:0)/p.getEl("body")["scroll"+l],p.getEl("body")["scroll"+a]=d+e["delta"+u]/t},stop:function(){ye("#"+e).removeClass(t+"active")}})}p.classes.add("scroll"),e("v","Top","Height","Y","Width"),e("h","Left","Width","X","Height")}(),p.on("wheel",function(e){var t=p.getEl("body");t.scrollLeft+=10*(e.deltaX||0),t.scrollTop+=10*e.deltaY,n()}),ye(p.getEl("body")).on("scroll",n)),n())}},pt=lt.extend({Defaults:{layout:"fit",containerCls:"panel"},Mixins:[gt],renderHtml:function(){var e=this,t=e._layout,n=e.settings.html;return e.preRender(),t.preRender(e),void 0===n?n='<div id="'+e._id+'-body" class="'+e.bodyClasses+'">'+t.renderHtml(e)+"</div>":("function"==typeof n&&(n=n.call(e)),e._hasBody=!1),'<div id="'+e._id+'" class="'+e.classes+'" hidefocus="1" tabindex="-1" role="group">'+(e._preBodyHtml||"")+n+"</div>"}}),vt={resizeToContent:function(){this._layoutRect.autoResize=!0,this._lastRect=null,this.reflow()},resizeTo:function(e,t){if(e<=1||t<=1){var n=we.getWindowSize();e=e<=1?e*n.w:e,t=t<=1?t*n.h:t}return this._layoutRect.autoResize=!1,this.layoutRect({minW:e,minH:t,w:e,h:t}).reflow()},resizeBy:function(e,t){var n=this.layoutRect();return this.resizeTo(n.w+e,n.h+t)}},bt=[],yt=[];function xt(e,t){for(;e;){if(e===t)return!0;e=e.parent()}}function wt(){dt||(dt=function(e){2!==e.button&&function(e){for(var t=bt.length;t--;){var n=bt[t],i=n.getParentCtrl(e.target);if(n.settings.autohide){if(i&&(xt(i,n)||n.parent()===i))continue;(e=n.fire("autohide",{target:e.target})).isDefaultPrevented()||n.hide()}}}(e)},ye(_.document).on("click touchstart",dt))}function _t(r){var e=we.getViewPort().y;function t(e,t){for(var n,i=0;i<bt.length;i++)if(bt[i]!==r)for(n=bt[i].parent();n&&(n=n.parent());)n===r&&bt[i].fixed(e).moveBy(0,t).repaint()}r.settings.autofix&&(r.state.get("fixed")?r._autoFixY>e&&(r.fixed(!1).layoutRect({y:r._autoFixY}).repaint(),t(!1,r._autoFixY-e)):(r._autoFixY=r.layoutRect().y,r._autoFixY<e&&(r.fixed(!0).layoutRect({y:0}).repaint(),t(!0,e-r._autoFixY))))}function Rt(e,t){var n,i,r=Ct.zIndex||65535;if(e)yt.push(t);else for(n=yt.length;n--;)yt[n]===t&&yt.splice(n,1);if(yt.length)for(n=0;n<yt.length;n++)yt[n].modal&&(r++,i=yt[n]),yt[n].getEl().style.zIndex=r,yt[n].zIndex=r,r++;var o=ye("#"+t.classPrefix+"modal-block",t.getContainerElm())[0];i?ye(o).css("z-index",i.zIndex-1):o&&(o.parentNode.removeChild(o),mt=!1),Ct.currentZIndex=r}var Ct=pt.extend({Mixins:[He,vt],init:function(e){var i=this;i._super(e),(i._eventsRoot=i).classes.add("floatpanel"),e.autohide&&(wt(),function(){if(!ht){var e=_.document.documentElement,t=e.clientWidth,n=e.clientHeight;ht=function(){_.document.all&&t===e.clientWidth&&n===e.clientHeight||(t=e.clientWidth,n=e.clientHeight,Ct.hideAll())},ye(_.window).on("resize",ht)}}(),bt.push(i)),e.autofix&&(ft||(ft=function(){var e;for(e=bt.length;e--;)_t(bt[e])},ye(_.window).on("scroll",ft)),i.on("move",function(){_t(this)})),i.on("postrender show",function(e){if(e.control===i){var t,n=i.classPrefix;i.modal&&!mt&&((t=ye("#"+n+"modal-block",i.getContainerElm()))[0]||(t=ye('<div id="'+n+'modal-block" class="'+n+"reset "+n+'fade"></div>').appendTo(i.getContainerElm())),u.setTimeout(function(){t.addClass(n+"in"),ye(i.getEl()).addClass(n+"in")}),mt=!0),Rt(!0,i)}}),i.on("show",function(){i.parents().each(function(e){if(e.state.get("fixed"))return i.fixed(!0),!1})}),e.popover&&(i._preBodyHtml='<div class="'+i.classPrefix+'arrow"></div>',i.classes.add("popover").add("bottom").add(i.isRtl()?"end":"start")),i.aria("label",e.ariaLabel),i.aria("labelledby",i._id),i.aria("describedby",i.describedBy||i._id+"-none")},fixed:function(e){var t=this;if(t.state.get("fixed")!==e){if(t.state.get("rendered")){var n=we.getViewPort();e?t.layoutRect().y-=n.y:t.layoutRect().y+=n.y}t.classes.toggle("fixed",e),t.state.set("fixed",e)}return t},show:function(){var e,t=this._super();for(e=bt.length;e--&&bt[e]!==this;);return-1===e&&bt.push(this),t},hide:function(){return Et(this),Rt(!1,this),this._super()},hideAll:function(){Ct.hideAll()},close:function(){return this.fire("close").isDefaultPrevented()||(this.remove(),Rt(!1,this)),this},remove:function(){Et(this),this._super()},postRender:function(){return this.settings.bodyRole&&this.getEl("body").setAttribute("role",this.settings.bodyRole),this._super()}});function Et(e){var t;for(t=bt.length;t--;)bt[t]===e&&bt.splice(t,1);for(t=yt.length;t--;)yt[t]===e&&yt.splice(t,1)}Ct.hideAll=function(){for(var e=bt.length;e--;){var t=bt[e];t&&t.settings.autohide&&(t.hide(),bt.splice(e,1))}};var kt=function(s,n,e){var a,i,l=p.DOM,t=s.getParam("fixed_toolbar_container");t&&(i=l.select(t)[0]);var r=function(){if(a&&a.moveRel&&a.visible()&&!a._fixed){var e=s.selection.getScrollContainer(),t=s.getBody(),n=0,i=0;if(e){var r=l.getPos(t),o=l.getPos(e);n=Math.max(0,o.x-r.x),i=Math.max(0,o.y-r.y)}a.fixed(!1).moveRel(t,s.rtl?["tr-br","br-tr"]:["tl-bl","bl-tl","tr-br"]).moveBy(n,i)}},o=function(){a&&(a.show(),r(),l.addClass(s.getBody(),"mce-edit-focus"))},u=function(){a&&(a.hide(),Ct.hideAll(),l.removeClass(s.getBody(),"mce-edit-focus"))},c=function(){var e,t;a?a.visible()||o():(a=n.panel=v.create({type:i?"panel":"floatpanel",role:"application",classes:"tinymce tinymce-inline",layout:"flex",direction:"column",align:"stretch",autohide:!1,autofix:!0,fixed:(e=i,t=s,!(!e||t.settings.ui_container)),border:1,items:[!1===d(s)?null:{type:"menubar",border:"0 0 1 0",items:re(s)},A(s,f(s))]}),W.setUiContainer(s,a),x(s),i?a.renderTo(i).reflow():a.renderTo().reflow(),R(s,a),o(),F(s),s.on("nodeChange",r),s.on("ResizeWindow",r),s.on("activate",o),s.on("deactivate",u),s.nodeChanged())};return s.settings.content_editable=!0,s.on("focus",function(){!1===m(s)&&e.skinUiCss?l.styleSheetLoader.load(e.skinUiCss,c,c):c()}),s.on("blur hide",u),s.on("remove",function(){a&&(a.remove(),a=null)}),!1===m(s)&&e.skinUiCss?l.styleSheetLoader.load(e.skinUiCss,ge(s)):ge(s)(),{}};function Ht(i,r){var o,s,a=this,l=rt.classPrefix;a.show=function(e,t){function n(){o&&(ye(i).append('<div class="'+l+"throbber"+(r?" "+l+"throbber-inline":"")+'"></div>'),t&&t())}return a.hide(),o=!0,e?s=u.setTimeout(n,e):n(),a},a.hide=function(){var e=i.lastChild;return u.clearTimeout(s),e&&-1!==e.className.indexOf("throbber")&&e.parentNode.removeChild(e),o=!1,a}}var St=function(e,t){var n;e.on("ProgressState",function(e){n=n||new Ht(t.panel.getEl("body")),e.state?n.show(e.time):n.hide()})},Tt=function(e,t,n){var i=function(e){var t=e.settings,n=t.skin,i=t.skin_url;if(!1!==n){var r=n||"lightgray";i=i?e.documentBaseURI.toAbsolute(i):l.baseURL+"/skins/"+r}return i}(e);return i&&(n.skinUiCss=i+"/skin.min.css",e.contentCSS.push(i+"/content"+(e.inline?".inline":"")+".min.css")),St(e,t),e.getParam("inline",!1,"boolean")?kt(e,t,n):be(e,t,n)},Mt=rt.extend({Mixins:[He],Defaults:{classes:"widget tooltip tooltip-n"},renderHtml:function(){var e=this,t=e.classPrefix;return'<div id="'+e._id+'" class="'+e.classes+'" role="presentation"><div class="'+t+'tooltip-arrow"></div><div class="'+t+'tooltip-inner">'+e.encode(e.state.get("text"))+"</div></div>"},bindStates:function(){var t=this;return t.state.on("change:text",function(e){t.getEl().lastChild.innerHTML=t.encode(e.value)}),t._super()},repaint:function(){var e,t;e=this.getEl().style,t=this._layoutRect,e.left=t.x+"px",e.top=t.y+"px",e.zIndex=131070}}),Nt=rt.extend({init:function(i){var r=this;r._super(i),i=r.settings,r.canFocus=!0,i.tooltip&&!1!==Nt.tooltips&&(r.on("mouseenter",function(e){var t=r.tooltip().moveTo(-65535);if(e.control===r){var n=t.text(i.tooltip).show().testMoveRel(r.getEl(),["bc-tc","bc-tl","bc-tr"]);t.classes.toggle("tooltip-n","bc-tc"===n),t.classes.toggle("tooltip-nw","bc-tl"===n),t.classes.toggle("tooltip-ne","bc-tr"===n),t.moveRel(r.getEl(),n)}else t.hide()}),r.on("mouseleave mousedown click",function(){r.tooltip().remove(),r._tooltip=null})),r.aria("label",i.ariaLabel||i.tooltip)},tooltip:function(){return this._tooltip||(this._tooltip=new Mt({type:"tooltip"}),W.inheritUiContainer(this,this._tooltip),this._tooltip.renderTo()),this._tooltip},postRender:function(){var e=this,t=e.settings;e._super(),e.parent()||!t.width&&!t.height||(e.initLayoutRect(),e.repaint()),t.autofocus&&e.focus()},bindStates:function(){var t=this;function n(e){t.aria("disabled",e),t.classes.toggle("disabled",e)}function i(e){t.aria("pressed",e),t.classes.toggle("active",e)}return t.state.on("change:disabled",function(e){n(e.value)}),t.state.on("change:active",function(e){i(e.value)}),t.state.get("disabled")&&n(!0),t.state.get("active")&&i(!0),t._super()},remove:function(){this._super(),this._tooltip&&(this._tooltip.remove(),this._tooltip=null)}}),Pt=Nt.extend({Defaults:{value:0},init:function(e){this._super(e),this.classes.add("progress"),this.settings.filter||(this.settings.filter=function(e){return Math.round(e)})},renderHtml:function(){var e=this._id,t=this.classPrefix;return'<div id="'+e+'" class="'+this.classes+'"><div class="'+t+'bar-container"><div class="'+t+'bar"></div></div><div class="'+t+'text">0%</div></div>'},postRender:function(){return this._super(),this.value(this.settings.value),this},bindStates:function(){var t=this;function n(e){e=t.settings.filter(e),t.getEl().lastChild.innerHTML=e+"%",t.getEl().firstChild.firstChild.style.width=e+"%"}return t.state.on("change:value",function(e){n(e.value)}),n(t.state.get("value")),t._super()}}),Wt=function(e,t){e.getEl().lastChild.textContent=t+(e.progressBar?" "+e.progressBar.value()+"%":"")},Dt=rt.extend({Mixins:[He],Defaults:{classes:"widget notification"},init:function(e){var t=this;t._super(e),t.maxWidth=e.maxWidth,e.text&&t.text(e.text),e.icon&&(t.icon=e.icon),e.color&&(t.color=e.color),e.type&&t.classes.add("notification-"+e.type),e.timeout&&(e.timeout<0||0<e.timeout)&&!e.closeButton?t.closeButton=!1:(t.classes.add("has-close"),t.closeButton=!0),e.progressBar&&(t.progressBar=new Pt),t.on("click",function(e){-1!==e.target.className.indexOf(t.classPrefix+"close")&&t.close()})},renderHtml:function(){var e,t=this,n=t.classPrefix,i="",r="",o="";return t.icon&&(i='<i class="'+n+"ico "+n+"i-"+t.icon+'"></i>'),e=' style="max-width: '+t.maxWidth+"px;"+(t.color?"background-color: "+t.color+';"':'"'),t.closeButton&&(r='<button type="button" class="'+n+'close" aria-hidden="true">\xd7</button>'),t.progressBar&&(o=t.progressBar.renderHtml()),'<div id="'+t._id+'" class="'+t.classes+'"'+e+' role="presentation">'+i+'<div class="'+n+'notification-inner">'+t.state.get("text")+"</div>"+o+r+'<div style="clip: rect(1px, 1px, 1px, 1px);height: 1px;overflow: hidden;position: absolute;width: 1px;" aria-live="assertive" aria-relevant="additions" aria-atomic="true"></div></div>'},postRender:function(){var e=this;return u.setTimeout(function(){e.$el.addClass(e.classPrefix+"in"),Wt(e,e.state.get("text"))},100),e._super()},bindStates:function(){var t=this;return t.state.on("change:text",function(e){t.getEl().firstChild.innerHTML=e.value,Wt(t,e.value)}),t.progressBar&&(t.progressBar.bindStates(),t.progressBar.state.on("change:value",function(e){Wt(t,t.state.get("text"))})),t._super()},close:function(){return this.fire("close").isDefaultPrevented()||this.remove(),this},repaint:function(){var e,t;e=this.getEl().style,t=this._layoutRect,e.left=t.x+"px",e.top=t.y+"px",e.zIndex=65534}});function Ot(o){var s=function(e){return e.inline?e.getElement():e.getContentAreaContainer()};return{open:function(e,t){var n,i=w.extend(e,{maxWidth:(n=s(o),we.getSize(n).width)}),r=new Dt(i);return 0<(r.args=i).timeout&&(r.timer=setTimeout(function(){r.close(),t()},i.timeout)),r.on("close",function(){t()}),r.renderTo(),r},close:function(e){e.close()},reposition:function(e){K(e,function(e){e.moveTo(0,0)}),function(n){if(0<n.length){var e=n.slice(0,1)[0],t=s(o);e.moveRel(t,"tc-tc"),K(n,function(e,t){0<t&&e.moveRel(n[t-1].getEl(),"bc-tc")})}}(e)},getArgs:function(e){return e.args}}}var At=[],Bt="";function Lt(e){var t,n=ye("meta[name=viewport]")[0];!1!==ce.overrideViewPort&&(n||((n=_.document.createElement("meta")).setAttribute("name","viewport"),_.document.getElementsByTagName("head")[0].appendChild(n)),(t=n.getAttribute("content"))&&void 0!==Bt&&(Bt=t),n.setAttribute("content",e?"width=device-width,initial-scale=1.0,user-scalable=0,minimum-scale=1.0,maximum-scale=1.0":Bt))}function zt(e,t){(function(){for(var e=0;e<At.length;e++)if(At[e]._fullscreen)return!0;return!1})()&&!1===t&&ye([_.document.documentElement,_.document.body]).removeClass(e+"fullscreen")}var It=Ct.extend({modal:!0,Defaults:{border:1,layout:"flex",containerCls:"panel",role:"dialog",callbacks:{submit:function(){this.fire("submit",{data:this.toJSON()})},close:function(){this.close()}}},init:function(e){var n=this;n._super(e),n.isRtl()&&n.classes.add("rtl"),n.classes.add("window"),n.bodyClasses.add("window-body"),n.state.set("fixed",!0),e.buttons&&(n.statusbar=new pt({layout:"flex",border:"1 0 0 0",spacing:3,padding:10,align:"center",pack:n.isRtl()?"start":"end",defaults:{type:"button"},items:e.buttons}),n.statusbar.classes.add("foot"),n.statusbar.parent(n)),n.on("click",function(e){var t=n.classPrefix+"close";(we.hasClass(e.target,t)||we.hasClass(e.target.parentNode,t))&&n.close()}),n.on("cancel",function(){n.close()}),n.on("move",function(e){e.control===n&&Ct.hideAll()}),n.aria("describedby",n.describedBy||n._id+"-none"),n.aria("label",e.title),n._fullscreen=!1},recalc:function(){var e,t,n,i,r=this,o=r.statusbar;r._fullscreen&&(r.layoutRect(we.getWindowSize()),r.layoutRect().contentH=r.layoutRect().innerH),r._super(),e=r.layoutRect(),r.settings.title&&!r._fullscreen&&(t=e.headerW)>e.w&&(n=e.x-Math.max(0,t/2),r.layoutRect({w:t,x:n}),i=!0),o&&(o.layoutRect({w:r.layoutRect().innerW}).recalc(),(t=o.layoutRect().minW+e.deltaW)>e.w&&(n=e.x-Math.max(0,t-e.w),r.layoutRect({w:t,x:n}),i=!0)),i&&r.recalc()},initLayoutRect:function(){var e,t=this,n=t._super(),i=0;if(t.settings.title&&!t._fullscreen){e=t.getEl("head");var r=we.getSize(e);n.headerW=r.width,n.headerH=r.height,i+=n.headerH}t.statusbar&&(i+=t.statusbar.layoutRect().h),n.deltaH+=i,n.minH+=i,n.h+=i;var o=we.getWindowSize();return n.x=t.settings.x||Math.max(0,o.w/2-n.w/2),n.y=t.settings.y||Math.max(0,o.h/2-n.h/2),n},renderHtml:function(){var e=this,t=e._layout,n=e._id,i=e.classPrefix,r=e.settings,o="",s="",a=r.html;return e.preRender(),t.preRender(e),r.title&&(o='<div id="'+n+'-head" class="'+i+'window-head"><div id="'+n+'-title" class="'+i+'title">'+e.encode(r.title)+'</div><div id="'+n+'-dragh" class="'+i+'dragh"></div><button type="button" class="'+i+'close" aria-hidden="true"><i class="mce-ico mce-i-remove"></i></button></div>'),r.url&&(a='<iframe src="'+r.url+'" tabindex="-1"></iframe>'),void 0===a&&(a=t.renderHtml(e)),e.statusbar&&(s=e.statusbar.renderHtml()),'<div id="'+n+'" class="'+e.classes+'" hidefocus="1"><div class="'+e.classPrefix+'reset" role="application">'+o+'<div id="'+n+'-body" class="'+e.bodyClasses+'">'+a+"</div>"+s+"</div></div>"},fullscreen:function(e){var n,t,i=this,r=_.document.documentElement,o=i.classPrefix;if(e!==i._fullscreen)if(ye(_.window).on("resize",function(){var e;if(i._fullscreen)if(n)i._timer||(i._timer=u.setTimeout(function(){var e=we.getWindowSize();i.moveTo(0,0).resizeTo(e.w,e.h),i._timer=0},50));else{e=(new Date).getTime();var t=we.getWindowSize();i.moveTo(0,0).resizeTo(t.w,t.h),50<(new Date).getTime()-e&&(n=!0)}}),t=i.layoutRect(),i._fullscreen=e){i._initial={x:t.x,y:t.y,w:t.w,h:t.h},i.borderBox=Me("0"),i.getEl("head").style.display="none",t.deltaH-=t.headerH+2,ye([r,_.document.body]).addClass(o+"fullscreen"),i.classes.add("fullscreen");var s=we.getWindowSize();i.moveTo(0,0).resizeTo(s.w,s.h)}else i.borderBox=Me(i.settings.border),i.getEl("head").style.display="",t.deltaH+=t.headerH,ye([r,_.document.body]).removeClass(o+"fullscreen"),i.classes.remove("fullscreen"),i.moveTo(i._initial.x,i._initial.y).resizeTo(i._initial.w,i._initial.h);return i.reflow()},postRender:function(){var t,n=this;setTimeout(function(){n.classes.add("in"),n.fire("open")},0),n._super(),n.statusbar&&n.statusbar.postRender(),n.focus(),this.dragHelper=new ct(n._id+"-dragh",{start:function(){t={x:n.layoutRect().x,y:n.layoutRect().y}},drag:function(e){n.moveTo(t.x+e.deltaX,t.y+e.deltaY)}}),n.on("submit",function(e){e.isDefaultPrevented()||n.close()}),At.push(n),Lt(!0)},submit:function(){return this.fire("submit",{data:this.toJSON()})},remove:function(){var e,t=this;for(t.dragHelper.destroy(),t._super(),t.statusbar&&this.statusbar.remove(),zt(t.classPrefix,!1),e=At.length;e--;)At[e]===t&&At.splice(e,1);Lt(0<At.length)},getContentWindow:function(){var e=this.getEl().getElementsByTagName("iframe")[0];return e?e.contentWindow:null}});!function(){if(!ce.desktop){var n={w:_.window.innerWidth,h:_.window.innerHeight};u.setInterval(function(){var e=_.window.innerWidth,t=_.window.innerHeight;n.w===e&&n.h===t||(n={w:e,h:t},ye(_.window).trigger("resize"))},100)}ye(_.window).on("resize",function(){var e,t,n=we.getWindowSize();for(e=0;e<At.length;e++)t=At[e].layoutRect(),At[e].moveTo(At[e].settings.x||Math.max(0,n.w/2-t.w/2),At[e].settings.y||Math.max(0,n.h/2-t.h/2))})}();var Ft,Ut,Vt,Yt=It.extend({init:function(e){e={border:1,padding:20,layout:"flex",pack:"center",align:"center",containerCls:"panel",autoScroll:!0,buttons:{type:"button",text:"Ok",action:"ok"},items:{type:"label",multiline:!0,maxWidth:500,maxHeight:200}},this._super(e)},Statics:{OK:1,OK_CANCEL:2,YES_NO:3,YES_NO_CANCEL:4,msgBox:function(e){var t,i=e.callback||function(){};function n(e,t,n){return{type:"button",text:e,subtype:n?"primary":"",onClick:function(e){e.control.parents()[1].close(),i(t)}}}switch(e.buttons){case Yt.OK_CANCEL:t=[n("Ok",!0,!0),n("Cancel",!1)];break;case Yt.YES_NO:case Yt.YES_NO_CANCEL:t=[n("Yes",1,!0),n("No",0)],e.buttons===Yt.YES_NO_CANCEL&&t.push(n("Cancel",-1));break;default:t=[n("Ok",!0,!0)]}return new It({padding:20,x:e.x,y:e.y,minWidth:300,minHeight:100,layout:"flex",pack:"center",align:"center",buttons:t,title:e.title,role:"alertdialog",items:{type:"label",multiline:!0,maxWidth:500,maxHeight:200,text:e.text},onPostRender:function(){this.aria("describedby",this.items()[0]._id)},onClose:e.onClose,onCancel:function(){i(!1)}}).renderTo(_.document.body).reflow()},alert:function(e,t){return"string"==typeof e&&(e={text:e}),e.callback=t,Yt.msgBox(e)},confirm:function(e,t){return"string"==typeof e&&(e={text:e}),e.callback=t,e.buttons=Yt.OK_CANCEL,Yt.msgBox(e)}}}),$t=function(n){return{renderUI:function(e){return Tt(n,this,e)},resizeTo:function(e,t){return le(n,e,t)},resizeBy:function(e,t){return ue(n,e,t)},getNotificationManagerImpl:function(){return Ot(n)},getWindowManagerImpl:function(){return{open:function(n,e,t){var i;return n.title=n.title||" ",n.url=n.url||n.file,n.url&&(n.width=parseInt(n.width||320,10),n.height=parseInt(n.height||240,10)),n.body&&(n.items={defaults:n.defaults,type:n.bodyType||"form",items:n.body,data:n.data,callbacks:n.commands}),n.url||n.buttons||(n.buttons=[{text:"Ok",subtype:"primary",onclick:function(){i.find("form")[0].submit()}},{text:"Cancel",onclick:function(){i.close()}}]),(i=new It(n)).on("close",function(){t(i)}),n.data&&i.on("postRender",function(){this.find("*").each(function(e){var t=e.name();t in n.data&&e.value(n.data[t])})}),i.features=n||{},i.params=e||{},i=i.renderTo(_.document.body).reflow()},alert:function(e,t,n){var i;return(i=Yt.alert(e,function(){t()})).on("close",function(){n(i)}),i},confirm:function(e,t,n){var i;return(i=Yt.confirm(e,function(e){t(e)})).on("close",function(){n(i)}),i},close:function(e){e.close()},getParams:function(e){return e.params},setParams:function(e,t){e.params=t}}}}},qt=Se.extend({Defaults:{firstControlClass:"first",lastControlClass:"last"},init:function(e){this.settings=w.extend({},this.Defaults,e)},preRender:function(e){e.bodyClasses.add(this.settings.containerClass)},applyClasses:function(e){var t,n,i,r,o=this.settings;t=o.firstControlClass,n=o.lastControlClass,e.each(function(e){e.classes.remove(t).remove(n).add(o.controlClass),e.visible()&&(i||(i=e),r=e)}),i&&i.classes.add(t),r&&r.classes.add(n)},renderHtml:function(e){var t="";return this.applyClasses(e.items()),e.items().each(function(e){t+=e.renderHtml()}),t},recalc:function(){},postRender:function(){},isNative:function(){return!1}}),Xt=qt.extend({Defaults:{containerClass:"abs-layout",controlClass:"abs-layout-item"},recalc:function(e){e.items().filter(":visible").each(function(e){var t=e.settings;e.layoutRect({x:t.x,y:t.y,w:t.w,h:t.h}),e.recalc&&e.recalc()})},renderHtml:function(e){return'<div id="'+e._id+'-absend" class="'+e.classPrefix+'abs-end"></div>'+this._super(e)}}),jt=Nt.extend({Defaults:{classes:"widget btn",role:"button"},init:function(e){var t,n=this;n._super(e),e=n.settings,t=n.settings.size,n.on("click mousedown",function(e){e.preventDefault()}),n.on("touchstart",function(e){n.fire("click",e),e.preventDefault()}),e.subtype&&n.classes.add(e.subtype),t&&n.classes.add("btn-"+t),e.icon&&n.icon(e.icon)},icon:function(e){return arguments.length?(this.state.set("icon",e),this):this.state.get("icon")},repaint:function(){var e,t=this.getEl().firstChild;t&&((e=t.style).width=e.height="100%"),this._super()},renderHtml:function(){var e,t,n=this,i=n._id,r=n.classPrefix,o=n.state.get("icon"),s=n.state.get("text"),a="",l=n.settings;return(e=l.image)?(o="none","string"!=typeof e&&(e=_.window.getSelection?e[0]:e[1]),e=" style=\"background-image: url('"+e+"')\""):e="",s&&(n.classes.add("btn-has-text"),a='<span class="'+r+'txt">'+n.encode(s)+"</span>"),o=o?r+"ico "+r+"i-"+o:"",t="boolean"==typeof l.active?' aria-pressed="'+l.active+'"':"",'<div id="'+i+'" class="'+n.classes+'" tabindex="-1"'+t+'><button id="'+i+'-button" role="presentation" type="button" tabindex="-1">'+(o?'<i class="'+o+'"'+e+"></i>":"")+a+"</button></div>"},bindStates:function(){var o=this,n=o.$,i=o.classPrefix+"txt";function s(e){var t=n("span."+i,o.getEl());e?(t[0]||(n("button:first",o.getEl()).append('<span class="'+i+'"></span>'),t=n("span."+i,o.getEl())),t.html(o.encode(e))):t.remove(),o.classes.toggle("btn-has-text",!!e)}return o.state.on("change:text",function(e){s(e.value)}),o.state.on("change:icon",function(e){var t=e.value,n=o.classPrefix;t=(o.settings.icon=t)?n+"ico "+n+"i-"+o.settings.icon:"";var i=o.getEl().firstChild,r=i.getElementsByTagName("i")[0];t?(r&&r===i.firstChild||(r=_.document.createElement("i"),i.insertBefore(r,i.firstChild)),r.className=t):r&&i.removeChild(r),s(o.state.get("text"))}),o._super()}}),Jt=jt.extend({init:function(e){e=w.extend({text:"Browse...",multiple:!1,accept:null},e),this._super(e),this.classes.add("browsebutton"),e.multiple&&this.classes.add("multiple")},postRender:function(){var n=this,t=we.create("input",{type:"file",id:n._id+"-browse",accept:n.settings.accept});n._super(),ye(t).on("change",function(e){var t=e.target.files;n.value=function(){return t.length?n.settings.multiple?t:t[0]:null},e.preventDefault(),t.length&&n.fire("change",e)}),ye(t).on("click",function(e){e.stopPropagation()}),ye(n.getEl("button")).on("click touchstart",function(e){e.stopPropagation(),t.click(),e.preventDefault()}),n.getEl().appendChild(t)},remove:function(){ye(this.getEl("button")).off(),ye(this.getEl("input")).off(),this._super()}}),Gt=lt.extend({Defaults:{defaultType:"button",role:"group"},renderHtml:function(){var e=this,t=e._layout;return e.classes.add("btn-group"),e.preRender(),t.preRender(e),'<div id="'+e._id+'" class="'+e.classes+'"><div id="'+e._id+'-body">'+(e.settings.html||"")+t.renderHtml(e)+"</div></div>"}}),Kt=Nt.extend({Defaults:{classes:"checkbox",role:"checkbox",checked:!1},init:function(e){var t=this;t._super(e),t.on("click mousedown",function(e){e.preventDefault()}),t.on("click",function(e){e.preventDefault(),t.disabled()||t.checked(!t.checked())}),t.checked(t.settings.checked)},checked:function(e){return arguments.length?(this.state.set("checked",e),this):this.state.get("checked")},value:function(e){return arguments.length?this.checked(e):this.checked()},renderHtml:function(){var e=this,t=e._id,n=e.classPrefix;return'<div id="'+t+'" class="'+e.classes+'" unselectable="on" aria-labelledby="'+t+'-al" tabindex="-1"><i class="'+n+"ico "+n+'i-checkbox"></i><span id="'+t+'-al" class="'+n+'label">'+e.encode(e.state.get("text"))+"</span></div>"},bindStates:function(){var o=this;function t(e){o.classes.toggle("checked",e),o.aria("checked",e)}return o.state.on("change:text",function(e){o.getEl("al").firstChild.data=o.translate(e.value)}),o.state.on("change:checked change:value",function(e){o.fire("change"),t(e.value)}),o.state.on("change:icon",function(e){var t=e.value,n=o.classPrefix;if(void 0===t)return o.settings.icon;t=(o.settings.icon=t)?n+"ico "+n+"i-"+o.settings.icon:"";var i=o.getEl().firstChild,r=i.getElementsByTagName("i")[0];t?(r&&r===i.firstChild||(r=_.document.createElement("i"),i.insertBefore(r,i.firstChild)),r.className=t):r&&i.removeChild(r)}),o.state.get("checked")&&t(!0),o._super()}}),Zt=tinymce.util.Tools.resolve("tinymce.util.VK"),Qt=Nt.extend({init:function(i){var r=this;r._super(i),i=r.settings,r.classes.add("combobox"),r.subinput=!0,r.ariaTarget="inp",i.menu=i.menu||i.values,i.menu&&(i.icon="caret"),r.on("click",function(e){var t=e.target,n=r.getEl();if(ye.contains(n,t)||t===n)for(;t&&t!==n;)t.id&&-1!==t.id.indexOf("-open")&&(r.fire("action"),i.menu&&(r.showMenu(),e.aria&&r.menu.items()[0].focus())),t=t.parentNode}),r.on("keydown",function(e){var t;13===e.keyCode&&"INPUT"===e.target.nodeName&&(e.preventDefault(),r.parents().reverse().each(function(e){if(e.toJSON)return t=e,!1}),r.fire("submit",{data:t.toJSON()}))}),r.on("keyup",function(e){if("INPUT"===e.target.nodeName){var t=r.state.get("value"),n=e.target.value;n!==t&&(r.state.set("value",n),r.fire("autocomplete",e))}}),r.on("mouseover",function(e){var t=r.tooltip().moveTo(-65535);if(r.statusLevel()&&-1!==e.target.className.indexOf(r.classPrefix+"status")){var n=r.statusMessage()||"Ok",i=t.text(n).show().testMoveRel(e.target,["bc-tc","bc-tl","bc-tr"]);t.classes.toggle("tooltip-n","bc-tc"===i),t.classes.toggle("tooltip-nw","bc-tl"===i),t.classes.toggle("tooltip-ne","bc-tr"===i),t.moveRel(e.target,i)}})},statusLevel:function(e){return 0<arguments.length&&this.state.set("statusLevel",e),this.state.get("statusLevel")},statusMessage:function(e){return 0<arguments.length&&this.state.set("statusMessage",e),this.state.get("statusMessage")},showMenu:function(){var e,t=this,n=t.settings;t.menu||((e=n.menu||[]).length?e={type:"menu",items:e}:e.type=e.type||"menu",t.menu=v.create(e).parent(t).renderTo(t.getContainerElm()),t.fire("createmenu"),t.menu.reflow(),t.menu.on("cancel",function(e){e.control===t.menu&&t.focus()}),t.menu.on("show hide",function(e){e.control.items().each(function(e){e.active(e.value()===t.value())})}).fire("show"),t.menu.on("select",function(e){t.value(e.control.value())}),t.on("focusin",function(e){"INPUT"===e.target.tagName.toUpperCase()&&t.menu.hide()}),t.aria("expanded",!0)),t.menu.show(),t.menu.layoutRect({w:t.layoutRect().w}),t.menu.moveRel(t.getEl(),t.isRtl()?["br-tr","tr-br"]:["bl-tl","tl-bl"])},focus:function(){this.getEl("inp").focus()},repaint:function(){var e,t,n=this,i=n.getEl(),r=n.getEl("open"),o=n.layoutRect(),s=0,a=i.firstChild;n.statusLevel()&&"none"!==n.statusLevel()&&(s=parseInt(we.getRuntimeStyle(a,"padding-right"),10)-parseInt(we.getRuntimeStyle(a,"padding-left"),10)),e=r?o.w-we.getSize(r).width-10:o.w-10;var l=_.document;return l.all&&(!l.documentMode||l.documentMode<=8)&&(t=n.layoutRect().h-2+"px"),ye(a).css({width:e-s,lineHeight:t}),n._super(),n},postRender:function(){var t=this;return ye(this.getEl("inp")).on("change",function(e){t.state.set("value",e.target.value),t.fire("change",e)}),t._super()},renderHtml:function(){var e,t,n,i=this,r=i._id,o=i.settings,s=i.classPrefix,a=i.state.get("value")||"",l="",u="";return"spellcheck"in o&&(u+=' spellcheck="'+o.spellcheck+'"'),o.maxLength&&(u+=' maxlength="'+o.maxLength+'"'),o.size&&(u+=' size="'+o.size+'"'),o.subtype&&(u+=' type="'+o.subtype+'"'),n='<i id="'+r+'-status" class="mce-status mce-ico" style="display: none"></i>',i.disabled()&&(u+=' disabled="disabled"'),(e=o.icon)&&"caret"!==e&&(e=s+"ico "+s+"i-"+o.icon),t=i.state.get("text"),(e||t)&&(l='<div id="'+r+'-open" class="'+s+"btn "+s+'open" tabIndex="-1" role="button"><button id="'+r+'-action" type="button" hidefocus="1" tabindex="-1">'+("caret"!==e?'<i class="'+e+'"></i>':'<i class="'+s+'caret"></i>')+(t?(e?" ":"")+t:"")+"</button></div>",i.classes.add("has-open")),'<div id="'+r+'" class="'+i.classes+'"><input id="'+r+'-inp" class="'+s+'textbox" value="'+i.encode(a,!1)+'" hidefocus="1"'+u+' placeholder="'+i.encode(o.placeholder)+'" />'+n+l+"</div>"},value:function(e){return arguments.length?(this.state.set("value",e),this):(this.state.get("rendered")&&this.state.set("value",this.getEl("inp").value),this.state.get("value"))},showAutoComplete:function(e,i){var r=this;if(0!==e.length){r.menu?r.menu.items().remove():r.menu=v.create({type:"menu",classes:"combobox-menu",layout:"flow"}).parent(r).renderTo(),w.each(e,function(e){var t,n;r.menu.add({text:e.title,url:e.previewUrl,match:i,classes:"menu-item-ellipsis",onclick:(t=e.value,n=e.title,function(){r.fire("selectitem",{title:n,value:t})})})}),r.menu.renderNew(),r.hideMenu(),r.menu.on("cancel",function(e){e.control.parent()===r.menu&&(e.stopPropagation(),r.focus(),r.hideMenu())}),r.menu.on("select",function(){r.focus()});var t=r.layoutRect().w;r.menu.layoutRect({w:t,minW:0,maxW:t}),r.menu.repaint(),r.menu.reflow(),r.menu.show(),r.menu.moveRel(r.getEl(),r.isRtl()?["br-tr","tr-br"]:["bl-tl","tl-bl"])}else r.hideMenu()},hideMenu:function(){this.menu&&this.menu.hide()},bindStates:function(){var r=this;r.state.on("change:value",function(e){r.getEl("inp").value!==e.value&&(r.getEl("inp").value=e.value)}),r.state.on("change:disabled",function(e){r.getEl("inp").disabled=e.value}),r.state.on("change:statusLevel",function(e){var t=r.getEl("status"),n=r.classPrefix,i=e.value;we.css(t,"display","none"===i?"none":""),we.toggleClass(t,n+"i-checkmark","ok"===i),we.toggleClass(t,n+"i-warning","warn"===i),we.toggleClass(t,n+"i-error","error"===i),r.classes.toggle("has-status","none"!==i),r.repaint()}),we.on(r.getEl("status"),"mouseleave",function(){r.tooltip().hide()}),r.on("cancel",function(e){r.menu&&r.menu.visible()&&(e.stopPropagation(),r.hideMenu())});var n=function(e,t){t&&0<t.items().length&&t.items().eq(e)[0].focus()};return r.on("keydown",function(e){var t=e.keyCode;"INPUT"===e.target.nodeName&&(t===Zt.DOWN?(e.preventDefault(),r.fire("autocomplete"),n(0,r.menu)):t===Zt.UP&&(e.preventDefault(),n(-1,r.menu)))}),r._super()},remove:function(){ye(this.getEl("inp")).off(),this.menu&&this.menu.remove(),this._super()}}),en=Qt.extend({init:function(e){var t=this;e.spellcheck=!1,e.onaction&&(e.icon="none"),t._super(e),t.classes.add("colorbox"),t.on("change keyup postrender",function(){t.repaintColor(t.value())})},repaintColor:function(e){var t=this.getEl("open"),n=t?t.getElementsByTagName("i")[0]:null;if(n)try{n.style.background=e}catch(i){}},bindStates:function(){var t=this;return t.state.on("change:value",function(e){t.state.get("rendered")&&t.repaintColor(e.value)}),t._super()}}),tn=jt.extend({showPanel:function(){var t=this,e=t.settings;if(t.classes.add("opened"),t.panel)t.panel.show();else{var n=e.panel;n.type&&(n={layout:"grid",items:n}),n.role=n.role||"dialog",n.popover=!0,n.autohide=!0,n.ariaRoot=!0,t.panel=new Ct(n).on("hide",function(){t.classes.remove("opened")}).on("cancel",function(e){e.stopPropagation(),t.focus(),t.hidePanel()}).parent(t).renderTo(t.getContainerElm()),t.panel.fire("show"),t.panel.reflow()}var i=t.panel.testMoveRel(t.getEl(),e.popoverAlign||(t.isRtl()?["bc-tc","bc-tl","bc-tr"]:["bc-tc","bc-tr","bc-tl","tc-bc","tc-br","tc-bl"]));t.panel.classes.toggle("start","l"===i.substr(-1)),t.panel.classes.toggle("end","r"===i.substr(-1));var r="t"===i.substr(0,1);t.panel.classes.toggle("bottom",!r),t.panel.classes.toggle("top",r),t.panel.moveRel(t.getEl(),i)},hidePanel:function(){this.panel&&this.panel.hide()},postRender:function(){var t=this;return t.aria("haspopup",!0),t.on("click",function(e){e.control===t&&(t.panel&&t.panel.visible()?t.hidePanel():(t.showPanel(),t.panel.focus(!!e.aria)))}),t._super()},remove:function(){return this.panel&&(this.panel.remove(),this.panel=null),this._super()}}),nn=p.DOM,rn=tn.extend({init:function(e){this._super(e),this.classes.add("splitbtn"),this.classes.add("colorbutton")},color:function(e){return e?(this._color=e,this.getEl("preview").style.backgroundColor=e,this):this._color},resetColor:function(){return this._color=null,this.getEl("preview").style.backgroundColor=null,this},renderHtml:function(){var e=this,t=e._id,n=e.classPrefix,i=e.state.get("text"),r=e.settings.icon?n+"ico "+n+"i-"+e.settings.icon:"",o=e.settings.image?" style=\"background-image: url('"+e.settings.image+"')\"":"",s="";return i&&(e.classes.add("btn-has-text"),s='<span class="'+n+'txt">'+e.encode(i)+"</span>"),'<div id="'+t+'" class="'+e.classes+'" role="button" tabindex="-1" aria-haspopup="true"><button role="presentation" hidefocus="1" type="button" tabindex="-1">'+(r?'<i class="'+r+'"'+o+"></i>":"")+'<span id="'+t+'-preview" class="'+n+'preview"></span>'+s+'</button><button type="button" class="'+n+'open" hidefocus="1" tabindex="-1"> <i class="'+n+'caret"></i></button></div>'},postRender:function(){var t=this,n=t.settings.onclick;return t.on("click",function(e){e.aria&&"down"===e.aria.key||e.control!==t||nn.getParent(e.target,"."+t.classPrefix+"open")||(e.stopImmediatePropagation(),n.call(t,e))}),delete t.settings.onclick,t._super()}}),on=tinymce.util.Tools.resolve("tinymce.util.Color"),sn=Nt.extend({Defaults:{classes:"widget colorpicker"},init:function(e){this._super(e)},postRender:function(){var n,i,r,o,s,a=this,l=a.color();function u(e,t){var n,i,r=we.getPos(e);return n=t.pageX-r.x,i=t.pageY-r.y,{x:n=Math.max(0,Math.min(n/e.clientWidth,1)),y:i=Math.max(0,Math.min(i/e.clientHeight,1))}}function c(e,t){var n=(360-e.h)/360;we.css(r,{top:100*n+"%"}),t||we.css(s,{left:e.s+"%",top:100-e.v+"%"}),o.style.background=on({s:100,v:100,h:e.h}).toHex(),a.color().parse({s:e.s,v:e.v,h:e.h})}function e(e){var t;t=u(o,e),n.s=100*t.x,n.v=100*(1-t.y),c(n),a.fire("change")}function t(e){var t;t=u(i,e),(n=l.toHsv()).h=360*(1-t.y),c(n,!0),a.fire("change")}i=a.getEl("h"),r=a.getEl("hp"),o=a.getEl("sv"),s=a.getEl("svp"),a._repaint=function(){c(n=l.toHsv())},a._super(),a._svdraghelper=new ct(a._id+"-sv",{start:e,drag:e}),a._hdraghelper=new ct(a._id+"-h",{start:t,drag:t}),a._repaint()},rgb:function(){return this.color().toRgb()},value:function(e){if(!arguments.length)return this.color().toHex();this.color().parse(e),this._rendered&&this._repaint()},color:function(){return this._color||(this._color=on()),this._color},renderHtml:function(){var e,t=this._id,o=this.classPrefix,s="#ff0000,#ff0080,#ff00ff,#8000ff,#0000ff,#0080ff,#00ffff,#00ff80,#00ff00,#80ff00,#ffff00,#ff8000,#ff0000";return e='<div id="'+t+'-h" class="'+o+'colorpicker-h" style="background: -ms-linear-gradient(top,'+s+");background: linear-gradient(to bottom,"+s+');">'+function(){var e,t,n,i,r="";for(n="filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=",e=0,t=(i=s.split(",")).length-1;e<t;e++)r+='<div class="'+o+'colorpicker-h-chunk" style="height:'+100/t+"%;"+n+i[e]+",endColorstr="+i[e+1]+");-ms-"+n+i[e]+",endColorstr="+i[e+1]+')"></div>';return r}()+'<div id="'+t+'-hp" class="'+o+'colorpicker-h-marker"></div></div>','<div id="'+t+'" class="'+this.classes+'"><div id="'+t+'-sv" class="'+o+'colorpicker-sv"><div class="'+o+'colorpicker-overlay1"><div class="'+o+'colorpicker-overlay2"><div id="'+t+'-svp" class="'+o+'colorpicker-selector1"><div class="'+o+'colorpicker-selector2"></div></div></div></div></div>'+e+"</div>"}}),an=Nt.extend({init:function(e){e=w.extend({height:100,text:"Drop an image here",multiple:!1,accept:null},e),this._super(e),this.classes.add("dropzone"),e.multiple&&this.classes.add("multiple")},renderHtml:function(){var e,t,n=this.settings;return e={id:this._id,hidefocus:"1"},t=we.create("div",e,"<span>"+this.translate(n.text)+"</span>"),n.height&&we.css(t,"height",n.height+"px"),n.width&&we.css(t,"width",n.width+"px"),t.className=this.classes,t.outerHTML},postRender:function(){var i=this,e=function(e){e.preventDefault(),i.classes.toggle("dragenter"),i.getEl().className=i.classes};i._super(),i.$el.on("dragover",function(e){e.preventDefault()}),i.$el.on("dragenter",e),i.$el.on("dragleave",e),i.$el.on("drop",function(e){if(e.preventDefault(),!i.state.get("disabled")){var t=function(e){var t=i.settings.accept;if("string"!=typeof t)return e;var n=new RegExp("("+t.split(/\s*,\s*/).join("|")+")$","i");return w.grep(e,function(e){return n.test(e.name)})}(e.dataTransfer.files);i.value=function(){return t.length?i.settings.multiple?t:t[0]:null},t.length&&i.fire("change",e)}})},remove:function(){this.$el.off(),this._super()}}),ln=Nt.extend({init:function(e){var n=this;e.delimiter||(e.delimiter="\xbb"),n._super(e),n.classes.add("path"),n.canFocus=!0,n.on("click",function(e){var t;(t=e.target.getAttribute("data-index"))&&n.fire("select",{value:n.row()[t],index:t})}),n.row(n.settings.row)},focus:function(){return this.getEl().firstChild.focus(),this},row:function(e){return arguments.length?(this.state.set("row",e),this):this.state.get("row")},renderHtml:function(){return'<div id="'+this._id+'" class="'+this.classes+'">'+this._getDataPathHtml(this.state.get("row"))+"</div>"},bindStates:function(){var t=this;return t.state.on("change:row",function(e){t.innerHtml(t._getDataPathHtml(e.value))}),t._super()},_getDataPathHtml:function(e){var t,n,i=e||[],r="",o=this.classPrefix;for(t=0,n=i.length;t<n;t++)r+=(0<t?'<div class="'+o+'divider" aria-hidden="true"> '+this.settings.delimiter+" </div>":"")+'<div role="button" class="'+o+"path-item"+(t===n-1?" "+o+"last":"")+'" data-index="'+t+'" tabindex="-1" id="'+this._id+"-"+t+'" aria-level="'+(t+1)+'">'+i[t].name+"</div>";return r||(r='<div class="'+o+'path-item">\xa0</div>'),r}}),un=ln.extend({postRender:function(){var o=this,s=o.settings.editor;function a(e){if(1===e.nodeType){if("BR"===e.nodeName||e.getAttribute("data-mce-bogus"))return!0;if("bookmark"===e.getAttribute("data-mce-type"))return!0}return!1}return!1!==s.settings.elementpath&&(o.on("select",function(e){s.focus(),s.selection.select(this.row()[e.index].element),s.nodeChanged()}),s.on("nodeChange",function(e){for(var t=[],n=e.parents,i=n.length;i--;)if(1===n[i].nodeType&&!a(n[i])){var r=s.fire("ResolveName",{name:n[i].nodeName.toLowerCase(),target:n[i]});if(r.isDefaultPrevented()||t.push({name:r.name,element:n[i]}),r.isPropagationStopped())break}o.row(t)})),o._super()}}),cn=lt.extend({Defaults:{layout:"flex",align:"center",defaults:{flex:1}},renderHtml:function(){var e=this,t=e._layout,n=e.classPrefix;return e.classes.add("formitem"),t.preRender(e),'<div id="'+e._id+'" class="'+e.classes+'" hidefocus="1" tabindex="-1">'+(e.settings.title?'<div id="'+e._id+'-title" class="'+n+'title">'+e.settings.title+"</div>":"")+'<div id="'+e._id+'-body" class="'+e.bodyClasses+'">'+(e.settings.html||"")+t.renderHtml(e)+"</div></div>"}}),dn=lt.extend({Defaults:{containerCls:"form",layout:"flex",direction:"column",align:"stretch",flex:1,padding:15,labelGap:30,spacing:10,callbacks:{submit:function(){this.submit()}}},preRender:function(){var i=this,e=i.items();i.settings.formItemDefaults||(i.settings.formItemDefaults={layout:"flex",autoResize:"overflow",defaults:{flex:1}}),e.each(function(e){var t,n=e.settings.label;n&&((t=new cn(w.extend({items:{type:"label",id:e._id+"-l",text:n,flex:0,forId:e._id,disabled:e.disabled()}},i.settings.formItemDefaults))).type="formitem",e.aria("labelledby",e._id+"-l"),"undefined"==typeof e.settings.flex&&(e.settings.flex=1),i.replace(e,t),t.add(e))})},submit:function(){return this.fire("submit",{data:this.toJSON()})},postRender:function(){this._super(),this.fromJSON(this.settings.data)},bindStates:function(){var n=this;function e(){var e,t,i=0,r=[];if(!1!==n.settings.labelGapCalc)for(("children"===n.settings.labelGapCalc?n.find("formitem"):n.items()).filter("formitem").each(function(e){var t=e.items()[0],n=t.getEl().clientWidth;i=i<n?n:i,r.push(t)}),t=n.settings.labelGap||0,e=r.length;e--;)r[e].settings.minWidth=i+t}n._super(),n.on("show",e),e()}}),fn=dn.extend({Defaults:{containerCls:"fieldset",layout:"flex",direction:"column",align:"stretch",flex:1,padding:"25 15 5 15",labelGap:30,spacing:10,border:1},renderHtml:function(){var e=this,t=e._layout,n=e.classPrefix;return e.preRender(),t.preRender(e),'<fieldset id="'+e._id+'" class="'+e.classes+'" hidefocus="1" tabindex="-1">'+(e.settings.title?'<legend id="'+e._id+'-title" class="'+n+'fieldset-title">'+e.settings.title+"</legend>":"")+'<div id="'+e._id+'-body" class="'+e.bodyClasses+'">'+(e.settings.html||"")+t.renderHtml(e)+"</div></fieldset>"}}),hn=0,mn=function(e){if(null===e||e===undefined)throw new Error("Node cannot be null or undefined");return{dom:k(e)}},gn={fromHtml:function(e,t){var n=(t||_.document).createElement("div");if(n.innerHTML=e,!n.hasChildNodes()||1<n.childNodes.length)throw _.console.error("HTML does not have a single root node",e),new Error("HTML must have a single root node");return mn(n.childNodes[0])},fromTag:function(e,t){var n=(t||_.document).createElement(e);return mn(n)},fromText:function(e,t){var n=(t||_.document).createTextNode(e);return mn(n)},fromDom:mn,fromPoint:function(e,t,n){var i=e.dom();return N.from(i.elementFromPoint(t,n)).map(mn)}},pn=(_.Node.ATTRIBUTE_NODE,_.Node.CDATA_SECTION_NODE,_.Node.COMMENT_NODE,_.Node.DOCUMENT_NODE),vn=(_.Node.DOCUMENT_TYPE_NODE,_.Node.DOCUMENT_FRAGMENT_NODE,_.Node.ELEMENT_NODE),bn=(_.Node.TEXT_NODE,_.Node.PROCESSING_INSTRUCTION_NODE,_.Node.ENTITY_REFERENCE_NODE,_.Node.ENTITY_NODE,_.Node.NOTATION_NODE,"undefined"!=typeof _.window?_.window:Function("return this;")(),function(e,t){var n=function(e,t){for(var n=0;n<e.length;n++){var i=e[n];if(i.test(t))return i}return undefined}(e,t);if(!n)return{major:0,minor:0};var i=function(e){return Number(t.replace(n,"$"+e))};return xn(i(1),i(2))}),yn=function(){return xn(0,0)},xn=function(e,t){return{major:e,minor:t}},wn={nu:xn,detect:function(e,t){var n=String(t).toLowerCase();return 0===e.length?yn():bn(e,n)},unknown:yn},_n="Firefox",Rn=function(e,t){return function(){return t===e}},Cn=function(e){var t=e.current;return{current:t,version:e.version,isEdge:Rn("Edge",t),isChrome:Rn("Chrome",t),isIE:Rn("IE",t),isOpera:Rn("Opera",t),isFirefox:Rn(_n,t),isSafari:Rn("Safari",t)}},En={unknown:function(){return Cn({current:undefined,version:wn.unknown()})},nu:Cn,edge:k("Edge"),chrome:k("Chrome"),ie:k("IE"),opera:k("Opera"),firefox:k(_n),safari:k("Safari")},kn="Windows",Hn="Android",Sn="Solaris",Tn="FreeBSD",Mn=function(e,t){return function(){return t===e}},Nn=function(e){var t=e.current;return{current:t,version:e.version,isWindows:Mn(kn,t),isiOS:Mn("iOS",t),isAndroid:Mn(Hn,t),isOSX:Mn("OSX",t),isLinux:Mn("Linux",t),isSolaris:Mn(Sn,t),isFreeBSD:Mn(Tn,t)}},Pn={unknown:function(){return Nn({current:undefined,version:wn.unknown()})},nu:Nn,windows:k(kn),ios:k("iOS"),android:k(Hn),linux:k("Linux"),osx:k("OSX"),solaris:k(Sn),freebsd:k(Tn)},Wn=function(e,t){var n=String(t).toLowerCase();return function(e,t){for(var n=0,i=e.length;n<i;n++){var r=e[n];if(t(r,n))return N.some(r)}return N.none()}(e,function(e){return e.search(n)})},Dn=function(e,n){return Wn(e,n).map(function(e){var t=wn.detect(e.versionRegexes,n);return{current:e.name,version:t}})},On=function(e,n){return Wn(e,n).map(function(e){var t=wn.detect(e.versionRegexes,n);return{current:e.name,version:t}})},An=function(e,t){return-1!==e.indexOf(t)},Bn=/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,Ln=function(t){return function(e){return An(e,t)}},zn=[{name:"Edge",versionRegexes:[/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],search:function(e){return An(e,"edge/")&&An(e,"chrome")&&An(e,"safari")&&An(e,"applewebkit")}},{name:"Chrome",versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/,Bn],search:function(e){return An(e,"chrome")&&!An(e,"chromeframe")}},{name:"IE",versionRegexes:[/.*?msie\ ?([0-9]+)\.([0-9]+).*/,/.*?rv:([0-9]+)\.([0-9]+).*/],search:function(e){return An(e,"msie")||An(e,"trident")}},{name:"Opera",versionRegexes:[Bn,/.*?opera\/([0-9]+)\.([0-9]+).*/],search:Ln("opera")},{name:"Firefox",versionRegexes:[/.*?firefox\/\ ?([0-9]+)\.([0-9]+).*/],search:Ln("firefox")},{name:"Safari",versionRegexes:[Bn,/.*?cpu os ([0-9]+)_([0-9]+).*/],search:function(e){return(An(e,"safari")||An(e,"mobile/"))&&An(e,"applewebkit")}}],In=[{name:"Windows",search:Ln("win"),versionRegexes:[/.*?windows\ nt\ ?([0-9]+)\.([0-9]+).*/]},{name:"iOS",search:function(e){return An(e,"iphone")||An(e,"ipad")},versionRegexes:[/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,/.*cpu os ([0-9]+)_([0-9]+).*/,/.*cpu iphone os ([0-9]+)_([0-9]+).*/]},{name:"Android",search:Ln("android"),versionRegexes:[/.*?android\ ?([0-9]+)\.([0-9]+).*/]},{name:"OSX",search:Ln("os x"),versionRegexes:[/.*?os\ x\ ?([0-9]+)_([0-9]+).*/]},{name:"Linux",search:Ln("linux"),versionRegexes:[]},{name:"Solaris",search:Ln("sunos"),versionRegexes:[]},{name:"FreeBSD",search:Ln("freebsd"),versionRegexes:[]}],Fn={browsers:k(zn),oses:k(In)},Un=function(e){var t,n,i,r,o,s,a,l,u,c,d,f=Fn.browsers(),h=Fn.oses(),m=Dn(f,e).fold(En.unknown,En.nu),g=On(h,e).fold(Pn.unknown,Pn.nu);return{browser:m,os:g,deviceType:(n=m,i=e,r=(t=g).isiOS()&&!0===/ipad/i.test(i),o=t.isiOS()&&!r,s=t.isAndroid()&&3===t.version.major,a=t.isAndroid()&&4===t.version.major,l=r||s||a&&!0===/mobile/i.test(i),u=t.isiOS()||t.isAndroid(),c=u&&!l,d=n.isSafari()&&t.isiOS()&&!1===/safari/i.test(i),{isiPad:k(r),isiPhone:k(o),isTablet:k(l),isPhone:k(c),isTouch:k(u),isAndroid:t.isAndroid,isiOS:t.isiOS,isWebView:k(d)})}},Vn=(Vt=!(Ft=function(){var e=_.navigator.userAgent;return Un(e)}),function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return Vt||(Vt=!0,Ut=Ft.apply(null,e)),Ut}),Yn=vn,$n=pn,qn=function(e){return e.nodeType!==Yn&&e.nodeType!==$n||0===e.childElementCount},Xn=(Vn().browser.isIE(),function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t]}("element","offset"),w.trim),jn=function(t){return function(e){if(e&&1===e.nodeType){if(e.contentEditable===t)return!0;if(e.getAttribute("data-mce-contenteditable")===t)return!0}return!1}},Jn=jn("true"),Gn=jn("false"),Kn=function(e,t,n,i,r){return{type:e,title:t,url:n,level:i,attach:r}},Zn=function(e){return e.innerText||e.textContent},Qn=function(e){return e.id?e.id:(t="h",n=(new Date).getTime(),t+"_"+Math.floor(1e9*Math.random())+ ++hn+String(n));var t,n},ei=function(e){return(t=e)&&"A"===t.nodeName&&(t.id||t.name)&&ni(e);var t},ti=function(e){return e&&/^(H[1-6])$/.test(e.nodeName)},ni=function(e){return function(e){for(;e=e.parentNode;){var t=e.contentEditable;if(t&&"inherit"!==t)return Jn(e)}return!1}(e)&&!Gn(e)},ii=function(e){return ti(e)&&ni(e)},ri=function(e){var t,n=Qn(e);return Kn("header",Zn(e),"#"+n,ti(t=e)?parseInt(t.nodeName.substr(1),10):0,function(){e.id=n})},oi=function(e){var t=e.id||e.name,n=Zn(e);return Kn("anchor",n||"#"+t,"#"+t,0,E)},si=function(e){var t,n,i,r,o,s;return t="h1,h2,h3,h4,h5,h6,a:not([href])",n=e,G((Vn().browser.isIE(),function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t]}("element","offset"),i=gn.fromDom(n),r=t,s=(o=i)===undefined?_.document:o.dom(),qn(s)?[]:G(s.querySelectorAll(r),gn.fromDom)),function(e){return e.dom()})},ai=function(e){return 0<Xn(e.title).length},li=function(e){var t,n=si(e);return Z((t=n,G(Z(t,ii),ri)).concat(G(Z(n,ei),oi)),ai)},ui={},ci=function(e){return{title:e.title,value:{title:{raw:e.title},url:e.url,attach:e.attach}}},di=function(e,t){return{title:e,value:{title:e,url:t,attach:E}}},fi=function(e,t,n){var i=t in e?e[t]:n;return!1===i?null:i},hi=function(e,i,r,t){var n,o,s,a,l,u,c={title:"-"},d=function(e){var t=e.hasOwnProperty(r)?e[r]:[],n=Z(t,function(e){return t=e,!J(i,function(e){return e.url===t});var t});return w.map(n,function(e){return{title:e,value:{title:e,url:e,attach:E}}})},f=function(t){var e,n=Z(i,function(e){return e.type===t});return e=n,w.map(e,ci)};return!1===t.typeahead_urls?[]:"file"===r?(n=[mi(e,d(ui)),mi(e,f("header")),mi(e,(a=f("anchor"),l=fi(t,"anchor_top","#top"),u=fi(t,"anchor_bottom","#bottom"),null!==l&&a.unshift(di("<top>",l)),null!==u&&a.push(di("<bottom>",u)),a))],o=function(e,t){return 0===e.length||0===t.length?e.concat(t):e.concat(c,t)},s=[],K(n,function(e){s=o(s,e)}),s):mi(e,d(ui))},mi=function(e,t){var n=e.toLowerCase(),i=w.grep(t,function(e){return-1!==e.title.toLowerCase().indexOf(n)});return 1===i.length&&i[0].title===e?[]:i},gi=function(r,i,o,s){var t=function(e){var t=li(o),n=hi(e,t,s,i);r.showAutoComplete(n,e)};r.on("autocomplete",function(){t(r.value())}),r.on("selectitem",function(e){var t=e.value;r.value(t.url);var n,i=(n=t.title).raw?n.raw:n;"image"===s?r.fire("change",{meta:{alt:i,attach:t.attach}}):r.fire("change",{meta:{text:i,attach:t.attach}}),r.focus()}),r.on("click",function(e){0===r.value().length&&"INPUT"===e.target.nodeName&&t("")}),r.on("PostRender",function(){r.getRoot().on("submit",function(e){var t,n,i;e.isDefaultPrevented()||(t=r.value(),i=ui[n=s],/^https?/.test(t)&&(i?j(i,t).isNone()&&(ui[n]=i.slice(0,5).concat(t)):ui[n]=[t]))})})},pi=function(o,e,n){var i=e.filepicker_validator_handler;i&&o.state.on("change:value",function(e){var t;0!==(t=e.value).length?i({url:t,type:n},function(e){var t,n,i,r=(n=(t=e).status,i=t.message,"valid"===n?{status:"ok",message:i}:"unknown"===n?{status:"warn",message:i}:"invalid"===n?{status:"warn",message:i}:{status:"none",message:""});o.statusMessage(r.message),o.statusLevel(r.status)}):o.statusLevel("none")})},vi=Qt.extend({Statics:{clearHistory:function(){ui={}}},init:function(e){var t,n,i,r=this,o=window.tinymce?window.tinymce.activeEditor:l.activeEditor,s=o.settings,a=e.filetype;e.spellcheck=!1,(i=s.file_picker_types||s.file_browser_callback_types)&&(i=w.makeMap(i,/[, ]/)),i&&!i[a]||(!(n=s.file_picker_callback)||i&&!i[a]?!(n=s.file_browser_callback)||i&&!i[a]||(t=function(){n(r.getEl("inp").id,r.value(),a,window)}):t=function(){var e=r.fire("beforecall").meta;e=w.extend({filetype:a},e),n.call(o,function(e,t){r.value(e).fire("change",{meta:t})},r.value(),e)}),t&&(e.icon="browse",e.onaction=t),r._super(e),r.classes.add("filepicker"),gi(r,s,o.getBody(),a),pi(r,s,a)}}),bi=Xt.extend({recalc:function(e){var t=e.layoutRect(),n=e.paddingBox;e.items().filter(":visible").each(function(e){e.layoutRect({x:n.left,y:n.top,w:t.innerW-n.right-n.left,h:t.innerH-n.top-n.bottom}),e.recalc&&e.recalc()})}}),yi=Xt.extend({recalc:function(e){var t,n,i,r,o,s,a,l,u,c,d,f,h,m,g,p,v,b,y,x,w,_,R,C,E,k,H,S,T,M,N,P,W,D,O,A,B,L=[],z=Math.max,I=Math.min;for(i=e.items().filter(":visible"),r=e.layoutRect(),o=e.paddingBox,s=e.settings,f=e.isRtl()?s.direction||"row-reversed":s.direction,a=s.align,l=e.isRtl()?s.pack||"end":s.pack,u=s.spacing||0,"row-reversed"!==f&&"column-reverse"!==f||(i=i.set(i.toArray().reverse()),f=f.split("-")[0]),"column"===f?(C="y",_="h",R="minH",E="maxH",H="innerH",k="top",S="deltaH",T="contentH",D="left",P="w",M="x",N="innerW",W="minW",O="right",A="deltaW",B="contentW"):(C="x",_="w",R="minW",E="maxW",H="innerW",k="left",S="deltaW",T="contentW",D="top",P="h",M="y",N="innerH",W="minH",O="bottom",A="deltaH",B="contentH"),d=r[H]-o[k]-o[k],w=c=0,t=0,n=i.length;t<n;t++)m=(h=i[t]).layoutRect(),d-=t<n-1?u:0,0<(g=h.settings.flex)&&(c+=g,m[E]&&L.push(h),m.flex=g),d-=m[R],w<(p=o[D]+m[W]+o[O])&&(w=p);if((y={})[R]=d<0?r[R]-d+r[S]:r[H]-d+r[S],y[W]=w+r[A],y[T]=r[H]-d,y[B]=w,y.minW=I(y.minW,r.maxW),y.minH=I(y.minH,r.maxH),y.minW=z(y.minW,r.startMinWidth),y.minH=z(y.minH,r.startMinHeight),!r.autoResize||y.minW===r.minW&&y.minH===r.minH){for(b=d/c,t=0,n=L.length;t<n;t++)(v=(m=(h=L[t]).layoutRect())[E])<(p=m[R]+m.flex*b)?(d-=m[E]-m[R],c-=m.flex,m.flex=0,m.maxFlexSize=v):m.maxFlexSize=0;for(b=d/c,x=o[k],y={},0===c&&("end"===l?x=d+o[k]:"center"===l?(x=Math.round(r[H]/2-(r[H]-d)/2)+o[k])<0&&(x=o[k]):"justify"===l&&(x=o[k],u=Math.floor(d/(i.length-1)))),y[M]=o[D],t=0,n=i.length;t<n;t++)p=(m=(h=i[t]).layoutRect()).maxFlexSize||m[R],"center"===a?y[M]=Math.round(r[N]/2-m[P]/2):"stretch"===a?(y[P]=z(m[W]||0,r[N]-o[D]-o[O]),y[M]=o[D]):"end"===a&&(y[M]=r[N]-m[P]-o.top),0<m.flex&&(p+=m.flex*b),y[_]=p,y[C]=x,h.layoutRect(y),h.recalc&&h.recalc(),x+=p+u}else if(y.w=y.minW,y.h=y.minH,e.layoutRect(y),this.recalc(e),null===e._lastRect){var F=e.parent();F&&(F._lastRect=null,F.recalc())}}}),xi=qt.extend({Defaults:{containerClass:"flow-layout",controlClass:"flow-layout-item",endClass:"break"},recalc:function(e){e.items().filter(":visible").each(function(e){e.recalc&&e.recalc()})},isNative:function(){return!0}}),wi=function(e,t){return n=t,r=(i=e)===undefined?_.document:i.dom(),qn(r)?N.none():N.from(r.querySelector(n)).map(gn.fromDom);var n,i,r},_i=function(e,t){return function(){e.execCommand("mceToggleFormat",!1,t)}},Ri=function(e,t,n){var i=function(e){n(e,t)};e.formatter?e.formatter.formatChanged(t,i):e.on("init",function(){e.formatter.formatChanged(t,i)})},Ci=function(e,n){return function(t){Ri(e,n,function(e){t.control.active(e)})}},Ei=function(i){var t=["alignleft","aligncenter","alignright","alignjustify"],r="alignleft",e=[{text:"Left",icon:"alignleft",onclick:_i(i,"alignleft")},{text:"Center",icon:"aligncenter",onclick:_i(i,"aligncenter")},{text:"Right",icon:"alignright",onclick:_i(i,"alignright")},{text:"Justify",icon:"alignjustify",onclick:_i(i,"alignjustify")}];i.addMenuItem("align",{text:"Align",menu:e}),i.addButton("align",{type:"menubutton",icon:r,menu:e,onShowMenu:function(e){var n=e.control.menu;w.each(t,function(t,e){n.items().eq(e).each(function(e){return e.active(i.formatter.match(t))})})},onPostRender:function(e){var n=e.control;w.each(t,function(t,e){Ri(i,t,function(e){n.icon(r),e&&n.icon(t)})})}}),w.each({alignleft:["Align left","JustifyLeft"],aligncenter:["Align center","JustifyCenter"],alignright:["Align right","JustifyRight"],alignjustify:["Justify","JustifyFull"],alignnone:["No alignment","JustifyNone"]},function(e,t){i.addButton(t,{active:!1,tooltip:e[0],cmd:e[1],onPostRender:Ci(i,t)})})},ki=function(e){return e?e.split(",")[0]:""},Hi=function(l,u){return function(){var a=this;a.state.set("value",null),l.on("init nodeChange",function(e){var t,n,i,r,o=l.queryCommandValue("FontName"),s=(t=u,r=(n=o)?n.toLowerCase():"",w.each(t,function(e){e.value.toLowerCase()===r&&(i=e.value)}),w.each(t,function(e){i||ki(e.value).toLowerCase()!==ki(r).toLowerCase()||(i=e.value)}),i);a.value(s||null),!s&&o&&a.text(ki(o))})}},Si=function(n){n.addButton("fontselect",function(){var e,t=(e=function(e){for(var t=(e=e.replace(/;$/,"").split(";")).length;t--;)e[t]=e[t].split("=");return e}(n.settings.font_formats||"Andale Mono=andale mono,monospace;Arial=arial,helvetica,sans-serif;Arial Black=arial black,sans-serif;Book Antiqua=book antiqua,palatino,serif;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,palatino,serif;Helvetica=helvetica,arial,sans-serif;Impact=impact,sans-serif;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco,monospace;Times New Roman=times new roman,times,serif;Trebuchet MS=trebuchet ms,geneva,sans-serif;Verdana=verdana,geneva,sans-serif;Webdings=webdings;Wingdings=wingdings,zapf dingbats"),w.map(e,function(e){return{text:{raw:e[0]},value:e[1],textStyle:-1===e[1].indexOf("dings")?"font-family:"+e[1]:""}}));return{type:"listbox",text:"Font Family",tooltip:"Font Family",values:t,fixedWidth:!0,onPostRender:Hi(n,t),onselect:function(e){e.control.settings.value&&n.execCommand("FontName",!1,e.control.settings.value)}}})},Ti=function(e){Si(e)},Mi=function(e,t){return/[0-9.]+px$/.test(e)?(n=72*parseInt(e,10)/96,i=t||0,r=Math.pow(10,i),Math.round(n*r)/r+"pt"):e;var n,i,r},Ni=function(e,t,n){var i;return w.each(e,function(e){e.value===n?i=n:e.value===t&&(i=t)}),i},Pi=function(n){n.addButton("fontsizeselect",function(){var e,s,a,t=(e=n.settings.fontsize_formats||"8pt 10pt 12pt 14pt 18pt 24pt 36pt",w.map(e.split(" "),function(e){var t=e,n=e,i=e.split("=");return 1<i.length&&(t=i[0],n=i[1]),{text:t,value:n}}));return{type:"listbox",text:"Font Sizes",tooltip:"Font Sizes",values:t,fixedWidth:!0,onPostRender:(s=n,a=t,function(){var o=this;s.on("init nodeChange",function(e){var t,n,i,r;if(t=s.queryCommandValue("FontSize"))for(i=3;!r&&0<=i;i--)n=Mi(t,i),r=Ni(a,n,t);o.value(r||null),r||o.text(n)})}),onclick:function(e){e.control.settings.value&&n.execCommand("FontSize",!1,e.control.settings.value)}}})},Wi=function(e){Pi(e)},Di=function(n,e){var i=e.length;return w.each(e,function(e){e.menu&&(e.hidden=0===Di(n,e.menu));var t=e.format;t&&(e.hidden=!n.formatter.canApply(t)),e.hidden&&i--}),i},Oi=function(n,e){var i=e.items().length;return e.items().each(function(e){e.menu&&e.visible(0<Oi(n,e.menu)),!e.menu&&e.settings.menu&&e.visible(0<Di(n,e.settings.menu));var t=e.settings.format;t&&e.visible(n.formatter.canApply(t)),e.visible()||i--}),i},Ai=function(e){var i,r,o,t,s,n,a,l,u=(r=0,o=[],t=[{title:"Headings",items:[{title:"Heading 1",format:"h1"},{title:"Heading 2",format:"h2"},{title:"Heading 3",format:"h3"},{title:"Heading 4",format:"h4"},{title:"Heading 5",format:"h5"},{title:"Heading 6",format:"h6"}]},{title:"Inline",items:[{title:"Bold",icon:"bold",format:"bold"},{title:"Italic",icon:"italic",format:"italic"},{title:"Underline",icon:"underline",format:"underline"},{title:"Strikethrough",icon:"strikethrough",format:"strikethrough"},{title:"Superscript",icon:"superscript",format:"superscript"},{title:"Subscript",icon:"subscript",format:"subscript"},{title:"Code",icon:"code",format:"code"}]},{title:"Blocks",items:[{title:"Paragraph",format:"p"},{title:"Blockquote",format:"blockquote"},{title:"Div",format:"div"},{title:"Pre",format:"pre"}]},{title:"Alignment",items:[{title:"Left",icon:"alignleft",format:"alignleft"},{title:"Center",icon:"aligncenter",format:"aligncenter"},{title:"Right",icon:"alignright",format:"alignright"},{title:"Justify",icon:"alignjustify",format:"alignjustify"}]}],s=function(e){var i=[];if(e)return w.each(e,function(e){var t={text:e.title,icon:e.icon};if(e.items)t.menu=s(e.items);else{var n=e.format||"custom"+r++;e.format||(e.name=n,o.push(e)),t.format=n,t.cmd=e.cmd}i.push(t)}),i},(i=e).on("init",function(){w.each(o,function(e){i.formatter.register(e.name,e)})}),{type:"menu",items:i.settings.style_formats_merge?i.settings.style_formats?s(t.concat(i.settings.style_formats)):s(t):s(i.settings.style_formats||t),onPostRender:function(e){i.fire("renderFormatsMenu",{control:e.control})},itemDefaults:{preview:!0,textStyle:function(){if(this.settings.format)return i.formatter.getCssText(this.settings.format)},onPostRender:function(){var n=this;n.parent().on("show",function(){var e,t;(e=n.settings.format)&&(n.disabled(!i.formatter.canApply(e)),n.active(i.formatter.match(e))),(t=n.settings.cmd)&&n.active(i.queryCommandState(t))})},onclick:function(){this.settings.format&&_i(i,this.settings.format)(),this.settings.cmd&&i.execCommand(this.settings.cmd)}}});n=u,e.addMenuItem("formats",{text:"Formats",menu:n}),l=u,(a=e).addButton("styleselect",{type:"menubutton",text:"Formats",menu:l,onShowMenu:function(){a.settings.style_formats_autohide&&Oi(a,this.menu)}})},Bi=function(n,e){return function(){var r,o,s,t=[];return w.each(e,function(e){t.push({text:e[0],value:e[1],textStyle:function(){return n.formatter.getCssText(e[1])}})}),{type:"listbox",text:e[0][0],values:t,fixedWidth:!0,onselect:function(e){if(e.control){var t=e.control.value();_i(n,t)()}},onPostRender:(r=n,o=t,function(){var t=this;r.on("nodeChange",function(e){var n=r.formatter,i=null;w.each(e.parents,function(t){if(w.each(o,function(e){if(s?n.matchNode(t,s,{value:e.value})&&(i=e.value):n.matchNode(t,e.value)&&(i=e.value),i)return!1}),i)return!1}),t.value(i)})})}}},Li=function(e){var t,n,i=function(e){for(var t=(e=e.replace(/;$/,"").split(";")).length;t--;)e[t]=e[t].split("=");return e}(e.settings.block_formats||"Paragraph=p;Heading 1=h1;Heading 2=h2;Heading 3=h3;Heading 4=h4;Heading 5=h5;Heading 6=h6;Preformatted=pre");e.addMenuItem("blockformats",{text:"Blocks",menu:(t=e,n=i,w.map(n,function(e){return{text:e[0],onclick:_i(t,e[1]),textStyle:function(){return t.formatter.getCssText(e[1])}}}))}),e.addButton("formatselect",Bi(e,i))},zi=function(t,e){var n,i;if("string"==typeof e)i=e.split(" ");else if(w.isArray(e))return function(e){for(var t=[],n=0,i=e.length;n<i;++n){if(!V(e[n]))throw new Error("Arr.flatten item "+n+" was not an array, input: "+e);X.apply(t,e[n])}return t}(w.map(e,function(e){return zi(t,e)}));return n=w.grep(i,function(e){return"|"===e||e in t.menuItems}),w.map(n,function(e){return"|"===e?{text:"-"}:t.menuItems[e]})},Ii=function(e){return e&&"-"===e.text},Fi=function(n){var i=Z(n,function(e,t){return!Ii(e)||!Ii(n[t-1])});return Z(i,function(e,t){return!Ii(e)||0<t&&t<i.length-1})},Ui=function(e){var t,n,i,r,o=e.settings.insert_button_items;return Fi(o?zi(e,o):(t=e,n="insert",i=[{text:"-"}],r=w.grep(t.menuItems,function(e){return e.context===n}),w.each(r,function(e){"before"===e.separator&&i.push({text:"|"}),e.prependToContext?i.unshift(e):i.push(e),"after"===e.separator&&i.push({text:"|"})}),i))},Vi=function(e){var t;(t=e).addButton("insert",{type:"menubutton",icon:"insert",menu:[],oncreatemenu:function(){this.menu.add(Ui(t)),this.menu.renderNew()}})},Yi=function(e){var n,i,r;n=e,w.each({bold:"Bold",italic:"Italic",underline:"Underline",strikethrough:"Strikethrough",subscript:"Subscript",superscript:"Superscript"},function(e,t){n.addButton(t,{active:!1,tooltip:e,onPostRender:Ci(n,t),onclick:_i(n,t)})}),i=e,w.each({outdent:["Decrease indent","Outdent"],indent:["Increase indent","Indent"],cut:["Cut","Cut"],copy:["Copy","Copy"],paste:["Paste","Paste"],help:["Help","mceHelp"],selectall:["Select all","SelectAll"],visualaid:["Visual aids","mceToggleVisualAid"],newdocument:["New document","mceNewDocument"],removeformat:["Clear formatting","RemoveFormat"],remove:["Remove","Delete"]},function(e,t){i.addButton(t,{tooltip:e[0],cmd:e[1]})}),r=e,w.each({blockquote:["Blockquote","mceBlockQuote"],subscript:["Subscript","Subscript"],superscript:["Superscript","Superscript"]},function(e,t){r.addButton(t,{active:!1,tooltip:e[0],cmd:e[1],onPostRender:Ci(r,t)})})},$i=function(e){var n;Yi(e),n=e,w.each({bold:["Bold","Bold","Meta+B"],italic:["Italic","Italic","Meta+I"],underline:["Underline","Underline","Meta+U"],strikethrough:["Strikethrough","Strikethrough"],subscript:["Subscript","Subscript"],superscript:["Superscript","Superscript"],removeformat:["Clear formatting","RemoveFormat"],newdocument:["New document","mceNewDocument"],cut:["Cut","Cut","Meta+X"],copy:["Copy","Copy","Meta+C"],paste:["Paste","Paste","Meta+V"],selectall:["Select all","SelectAll","Meta+A"]},function(e,t){n.addMenuItem(t,{text:e[0],icon:t,shortcut:e[2],cmd:e[1]})}),n.addMenuItem("codeformat",{text:"Code",icon:"code",onclick:_i(n,"code")})},qi=function(n,i){return function(){var e=this,t=function(){var e="redo"===i?"hasRedo":"hasUndo";return!!n.undoManager&&n.undoManager[e]()};e.disabled(!t()),n.on("Undo Redo AddUndo TypingUndo ClearUndos SwitchMode",function(){e.disabled(n.readonly||!t())})}},Xi=function(e){var t,n;(t=e).addMenuItem("undo",{text:"Undo",icon:"undo",shortcut:"Meta+Z",onPostRender:qi(t,"undo"),cmd:"undo"}),t.addMenuItem("redo",{text:"Redo",icon:"redo",shortcut:"Meta+Y",onPostRender:qi(t,"redo"),cmd:"redo"}),(n=e).addButton("undo",{tooltip:"Undo",onPostRender:qi(n,"undo"),cmd:"undo"}),n.addButton("redo",{tooltip:"Redo",onPostRender:qi(n,"redo"),cmd:"redo"})},ji=function(e){var t,n;(t=e).addMenuItem("visualaid",{text:"Visual aids",selectable:!0,onPostRender:(n=t,function(){var t=this;n.on("VisualAid",function(e){t.active(e.hasVisual)}),t.active(n.hasVisual)}),cmd:"mceToggleVisualAid"})},Ji={setup:function(e){var t;e.rtl&&(rt.rtl=!0),e.on("mousedown progressstate",function(){Ct.hideAll()}),(t=e).settings.ui_container&&(ce.container=wi(gn.fromDom(_.document.body),t.settings.ui_container).fold(k(null),function(e){return e.dom()})),Nt.tooltips=!ce.iOS,rt.translate=function(e){return l.translate(e)},Li(e),Ei(e),$i(e),Xi(e),Wi(e),Ti(e),Ai(e),ji(e),Vi(e)}},Gi=Xt.extend({recalc:function(e){var t,n,i,r,o,s,a,l,u,c,d,f,h,m,g,p,v,b,y,x,w,_,R,C,E,k,H,S,T=[],M=[];t=e.settings,r=e.items().filter(":visible"),o=e.layoutRect(),i=t.columns||Math.ceil(Math.sqrt(r.length)),n=Math.ceil(r.length/i),b=t.spacingH||t.spacing||0,y=t.spacingV||t.spacing||0,x=t.alignH||t.align,w=t.alignV||t.align,p=e.paddingBox,S="reverseRows"in t?t.reverseRows:e.isRtl(),x&&"string"==typeof x&&(x=[x]),w&&"string"==typeof w&&(w=[w]);for(d=0;d<i;d++)T.push(0);for(f=0;f<n;f++)M.push(0);for(f=0;f<n;f++)for(d=0;d<i&&(c=r[f*i+d]);d++)C=(u=c.layoutRect()).minW,E=u.minH,T[d]=C>T[d]?C:T[d],M[f]=E>M[f]?E:M[f];for(k=o.innerW-p.left-p.right,d=_=0;d<i;d++)_+=T[d]+(0<d?b:0),k-=(0<d?b:0)+T[d];for(H=o.innerH-p.top-p.bottom,f=R=0;f<n;f++)R+=M[f]+(0<f?y:0),H-=(0<f?y:0)+M[f];if(_+=p.left+p.right,R+=p.top+p.bottom,(l={}).minW=_+(o.w-o.innerW),l.minH=R+(o.h-o.innerH),l.contentW=l.minW-o.deltaW,l.contentH=l.minH-o.deltaH,l.minW=Math.min(l.minW,o.maxW),l.minH=Math.min(l.minH,o.maxH),l.minW=Math.max(l.minW,o.startMinWidth),l.minH=Math.max(l.minH,o.startMinHeight),!o.autoResize||l.minW===o.minW&&l.minH===o.minH){var N;o.autoResize&&((l=e.layoutRect(l)).contentW=l.minW-o.deltaW,l.contentH=l.minH-o.deltaH),N="start"===t.packV?0:0<H?Math.floor(H/n):0;var P=0,W=t.flexWidths;if(W)for(d=0;d<W.length;d++)P+=W[d];else P=i;var D=k/P;for(d=0;d<i;d++)T[d]+=W?W[d]*D:D;for(m=p.top,f=0;f<n;f++){for(h=p.left,a=M[f]+N,d=0;d<i&&(c=r[S?f*i+i-1-d:f*i+d]);d++)g=c.settings,u=c.layoutRect(),s=Math.max(T[d],u.startMinWidth),u.x=h,u.y=m,"center"===(v=g.alignH||(x?x[d]||x[0]:null))?u.x=h+s/2-u.w/2:"right"===v?u.x=h+s-u.w:"stretch"===v&&(u.w=s),"center"===(v=g.alignV||(w?w[d]||w[0]:null))?u.y=m+a/2-u.h/2:"bottom"===v?u.y=m+a-u.h:"stretch"===v&&(u.h=a),c.layoutRect(u),h+=s+b,c.recalc&&c.recalc();m+=a+y}}else if(l.w=l.minW,l.h=l.minH,e.layoutRect(l),this.recalc(e),null===e._lastRect){var O=e.parent();O&&(O._lastRect=null,O.recalc())}}}),Ki=Nt.extend({renderHtml:function(){var e=this;return e.classes.add("iframe"),e.canFocus=!1,'<iframe id="'+e._id+'" class="'+e.classes+'" tabindex="-1" src="'+(e.settings.url||"javascript:''")+'" frameborder="0"></iframe>'},src:function(e){this.getEl().src=e},html:function(e,t){var n=this,i=this.getEl().contentWindow.document.body;return i?(i.innerHTML=e,t&&t()):u.setTimeout(function(){n.html(e)}),this}}),Zi=Nt.extend({init:function(e){this._super(e),this.classes.add("widget").add("infobox"),this.canFocus=!1},severity:function(e){this.classes.remove("error"),this.classes.remove("warning"),this.classes.remove("success"),this.classes.add(e)},help:function(e){this.state.set("help",e)},renderHtml:function(){var e=this,t=e.classPrefix;return'<div id="'+e._id+'" class="'+e.classes+'"><div id="'+e._id+'-body">'+e.encode(e.state.get("text"))+'<button role="button" tabindex="-1"><i class="'+t+"ico "+t+'i-help"></i></button></div></div>'},bindStates:function(){var t=this;return t.state.on("change:text",function(e){t.getEl("body").firstChild.data=t.encode(e.value),t.state.get("rendered")&&t.updateLayoutRect()}),t.state.on("change:help",function(e){t.classes.toggle("has-help",e.value),t.state.get("rendered")&&t.updateLayoutRect()}),t._super()}}),Qi=Nt.extend({init:function(e){var t=this;t._super(e),t.classes.add("widget").add("label"),t.canFocus=!1,e.multiline&&t.classes.add("autoscroll"),e.strong&&t.classes.add("strong")},initLayoutRect:function(){var e=this,t=e._super();return e.settings.multiline&&(we.getSize(e.getEl()).width>t.maxW&&(t.minW=t.maxW,e.classes.add("multiline")),e.getEl().style.width=t.minW+"px",t.startMinH=t.h=t.minH=Math.min(t.maxH,we.getSize(e.getEl()).height)),t},repaint:function(){return this.settings.multiline||(this.getEl().style.lineHeight=this.layoutRect().h+"px"),this._super()},severity:function(e){this.classes.remove("error"),this.classes.remove("warning"),this.classes.remove("success"),this.classes.add(e)},renderHtml:function(){var e,t,n=this,i=n.settings.forId,r=n.settings.html?n.settings.html:n.encode(n.state.get("text"));return!i&&(t=n.settings.forName)&&(e=n.getRoot().find("#"+t)[0])&&(i=e._id),i?'<label id="'+n._id+'" class="'+n.classes+'"'+(i?' for="'+i+'"':"")+">"+r+"</label>":'<span id="'+n._id+'" class="'+n.classes+'">'+r+"</span>"},bindStates:function(){var t=this;return t.state.on("change:text",function(e){t.innerHtml(t.encode(e.value)),t.state.get("rendered")&&t.updateLayoutRect()}),t._super()}}),er=lt.extend({Defaults:{role:"toolbar",layout:"flow"},init:function(e){this._super(e),this.classes.add("toolbar")},postRender:function(){return this.items().each(function(e){e.classes.add("toolbar-item")}),this._super()}}),tr=er.extend({Defaults:{role:"menubar",containerCls:"menubar",ariaRoot:!0,defaults:{type:"menubutton"}}}),nr=jt.extend({init:function(e){var t=this;t._renderOpen=!0,t._super(e),e=t.settings,t.classes.add("menubtn"),e.fixedWidth&&t.classes.add("fixed-width"),t.aria("haspopup",!0),t.state.set("menu",e.menu||t.render())},showMenu:function(e){var t,n=this;if(n.menu&&n.menu.visible()&&!1!==e)return n.hideMenu();n.menu||(t=n.state.get("menu")||[],n.classes.add("opened"),t.length?t={type:"menu",animate:!0,items:t}:(t.type=t.type||"menu",t.animate=!0),t.renderTo?n.menu=t.parent(n).show().renderTo():n.menu=v.create(t).parent(n).renderTo(),n.fire("createmenu"),n.menu.reflow(),n.menu.on("cancel",function(e){e.control.parent()===n.menu&&(e.stopPropagation(),n.focus(),n.hideMenu())}),n.menu.on("select",function(){n.focus()}),n.menu.on("show hide",function(e){"hide"===e.type&&e.control.parent()===n&&n.classes.remove("opened-under"),e.control===n.menu&&(n.activeMenu("show"===e.type),n.classes.toggle("opened","show"===e.type)),n.aria("expanded","show"===e.type)}).fire("show")),n.menu.show(),n.menu.layoutRect({w:n.layoutRect().w}),n.menu.repaint(),n.menu.moveRel(n.getEl(),n.isRtl()?["br-tr","tr-br"]:["bl-tl","tl-bl"]);var i=n.menu.layoutRect(),r=n.$el.offset().top+n.layoutRect().h;r>i.y&&r<i.y+i.h&&n.classes.add("opened-under"),n.fire("showmenu")},hideMenu:function(){this.menu&&(this.menu.items().each(function(e){e.hideMenu&&e.hideMenu()}),this.menu.hide())},activeMenu:function(e){this.classes.toggle("active",e)},renderHtml:function(){var e,t=this,n=t._id,i=t.classPrefix,r=t.settings.icon,o=t.state.get("text"),s="";return(e=t.settings.image)?(r="none","string"!=typeof e&&(e=_.window.getSelection?e[0]:e[1]),e=" style=\"background-image: url('"+e+"')\""):e="",o&&(t.classes.add("btn-has-text"),s='<span class="'+i+'txt">'+t.encode(o)+"</span>"),r=t.settings.icon?i+"ico "+i+"i-"+r:"",t.aria("role",t.parent()instanceof tr?"menuitem":"button"),'<div id="'+n+'" class="'+t.classes+'" tabindex="-1" aria-labelledby="'+n+'"><button id="'+n+'-open" role="presentation" type="button" tabindex="-1">'+(r?'<i class="'+r+'"'+e+"></i>":"")+s+' <i class="'+i+'caret"></i></button></div>'},postRender:function(){var r=this;return r.on("click",function(e){e.control===r&&function(e,t){for(;e;){if(t===e)return!0;e=e.parentNode}return!1}(e.target,r.getEl())&&(r.focus(),r.showMenu(!e.aria),e.aria&&r.menu.items().filter(":visible")[0].focus())}),r.on("mouseenter",function(e){var t,n=e.control,i=r.parent();n&&i&&n instanceof nr&&n.parent()===i&&(i.items().filter("MenuButton").each(function(e){e.hideMenu&&e!==n&&(e.menu&&e.menu.visible()&&(t=!0),e.hideMenu())}),t&&(n.focus(),n.showMenu()))}),r._super()},bindStates:function(){var e=this;return e.state.on("change:menu",function(){e.menu&&e.menu.remove(),e.menu=null}),e._super()},remove:function(){this._super(),this.menu&&this.menu.remove()}}),ir=Ct.extend({Defaults:{defaultType:"menuitem",border:1,layout:"stack",role:"application",bodyRole:"menu",ariaRoot:!0},init:function(e){if(e.autohide=!0,e.constrainToViewport=!0,"function"==typeof e.items&&(e.itemsFactory=e.items,e.items=[]),e.itemDefaults)for(var t=e.items,n=t.length;n--;)t[n]=w.extend({},e.itemDefaults,t[n]);this._super(e),this.classes.add("menu"),e.animate&&11!==ce.ie&&this.classes.add("animate")},repaint:function(){return this.classes.toggle("menu-align",!0),this._super(),this.getEl().style.height="",this.getEl("body").style.height="",this},cancel:function(){this.hideAll(),this.fire("select")},load:function(){var t,n=this;function i(){n.throbber&&(n.throbber.hide(),n.throbber=null)}n.settings.itemsFactory&&(n.throbber||(n.throbber=new Ht(n.getEl("body"),!0),0===n.items().length?(n.throbber.show(),n.fire("loading")):n.throbber.show(100,function(){n.items().remove(),n.fire("loading")}),n.on("hide close",i)),n.requestTime=t=(new Date).getTime(),n.settings.itemsFactory(function(e){0!==e.length?n.requestTime===t&&(n.getEl().style.width="",n.getEl("body").style.width="",i(),n.items().remove(),n.getEl("body").innerHTML="",n.add(e),n.renderNew(),n.fire("loaded")):n.hide()}))},hideAll:function(){return this.find("menuitem").exec("hideMenu"),this._super()},preRender:function(){var n=this;return n.items().each(function(e){var t=e.settings;if(t.icon||t.image||t.selectable)return!(n._hasIcons=!0)}),n.settings.itemsFactory&&n.on("postrender",function(){n.settings.itemsFactory&&n.load()}),n.on("show hide",function(e){e.control===n&&("show"===e.type?u.setTimeout(function(){n.classes.add("in")},0):n.classes.remove("in"))}),n._super()}}),rr=nr.extend({init:function(i){var t,r,o,n,s=this;s._super(i),i=s.settings,s._values=t=i.values,t&&("undefined"!=typeof i.value&&function e(t){for(var n=0;n<t.length;n++){if(r=t[n].selected||i.value===t[n].value)return o=o||t[n].text,s.state.set("value",t[n].value),!0;if(t[n].menu&&e(t[n].menu))return!0}}(t),!r&&0<t.length&&(o=t[0].text,s.state.set("value",t[0].value)),s.state.set("menu",t)),s.state.set("text",i.text||o),s.classes.add("listbox"),s.on("select",function(e){var t=e.control;n&&(e.lastControl=n),i.multiple?t.active(!t.active()):s.value(e.control.value()),n=t})},value:function(n){return 0===arguments.length?this.state.get("value"):(void 0===n||(this.settings.values&&!function t(e){return J(e,function(e){return e.menu?t(e.menu):e.value===n})}(this.settings.values)?null===n&&this.state.set("value",null):this.state.set("value",n)),this)},bindStates:function(){var i=this;return i.on("show",function(e){var t,n;t=e.control,n=i.value(),t instanceof ir&&t.items().each(function(e){e.hasMenus()||e.active(e.value()===n)})}),i.state.on("change:value",function(t){var n=function e(t,n){var i;if(t)for(var r=0;r<t.length;r++){if(t[r].value===n)return t[r];if(t[r].menu&&(i=e(t[r].menu,n)))return i}}(i.state.get("menu"),t.value);n?i.text(n.text):i.text(i.settings.text)}),i._super()}}),or=Nt.extend({Defaults:{border:0,role:"menuitem"},init:function(e){var t,n=this;n._super(e),e=n.settings,n.classes.add("menu-item"),e.menu&&n.classes.add("menu-item-expand"),e.preview&&n.classes.add("menu-item-preview"),"-"!==(t=n.state.get("text"))&&"|"!==t||(n.classes.add("menu-item-sep"),n.aria("role","separator"),n.state.set("text","-")),e.selectable&&(n.aria("role","menuitemcheckbox"),n.classes.add("menu-item-checkbox"),e.icon="selected"),e.preview||e.selectable||n.classes.add("menu-item-normal"),n.on("mousedown",function(e){e.preventDefault()}),e.menu&&!e.ariaHideMenu&&n.aria("haspopup",!0)},hasMenus:function(){return!!this.settings.menu},showMenu:function(){var t,n=this,e=n.settings,i=n.parent();if(i.items().each(function(e){e!==n&&e.hideMenu()}),e.menu){(t=n.menu)?t.show():((t=e.menu).length?t={type:"menu",items:t}:t.type=t.type||"menu",i.settings.itemDefaults&&(t.itemDefaults=i.settings.itemDefaults),(t=n.menu=v.create(t).parent(n).renderTo()).reflow(),t.on("cancel",function(e){e.stopPropagation(),n.focus(),t.hide()}),t.on("show hide",function(e){e.control.items&&e.control.items().each(function(e){e.active(e.settings.selected)})}).fire("show"),t.on("hide",function(e){e.control===t&&n.classes.remove("selected")}),t.submenu=!0),t._parentMenu=i,t.classes.add("menu-sub");var r=t.testMoveRel(n.getEl(),n.isRtl()?["tl-tr","bl-br","tr-tl","br-bl"]:["tr-tl","br-bl","tl-tr","bl-br"]);t.moveRel(n.getEl(),r),r="menu-sub-"+(t.rel=r),t.classes.remove(t._lastRel).add(r),t._lastRel=r,n.classes.add("selected"),n.aria("expanded",!0)}},hideMenu:function(){var e=this;return e.menu&&(e.menu.items().each(function(e){e.hideMenu&&e.hideMenu()}),e.menu.hide(),e.aria("expanded",!1)),e},renderHtml:function(){var e,t=this,n=t._id,i=t.settings,r=t.classPrefix,o=t.state.get("text"),s=t.settings.icon,a="",l=i.shortcut,u=t.encode(i.url);function c(e){return e.replace(/[.*+?^${}()|[\]\\]/g,"\\$&")}function d(e){var t=i.match||"";return t?e.replace(new RegExp(c(t),"gi"),function(e){return"!mce~match["+e+"]mce~match!"}):e}function f(e){return e.replace(new RegExp(c("!mce~match["),"g"),"<b>").replace(new RegExp(c("]mce~match!"),"g"),"</b>")}return s&&t.parent().classes.add("menu-has-icons"),i.image&&(a=" style=\"background-image: url('"+i.image+"')\""),l&&(l=function(e){var t,n,i={};for(i=ce.mac?{alt:"&#x2325;",ctrl:"&#x2318;",shift:"&#x21E7;",meta:"&#x2318;"}:{meta:"Ctrl"},e=e.split("+"),t=0;t<e.length;t++)(n=i[e[t].toLowerCase()])&&(e[t]=n);return e.join("+")}(l)),s=r+"ico "+r+"i-"+(t.settings.icon||"none"),e="-"!==o?'<i class="'+s+'"'+a+"></i>\xa0":"",o=f(t.encode(d(o))),u=f(t.encode(d(u))),'<div id="'+n+'" class="'+t.classes+'" tabindex="-1">'+e+("-"!==o?'<span id="'+n+'-text" class="'+r+'text">'+o+"</span>":"")+(l?'<div id="'+n+'-shortcut" class="'+r+'menu-shortcut">'+l+"</div>":"")+(i.menu?'<div class="'+r+'caret"></div>':"")+(u?'<div class="'+r+'menu-item-link">'+u+"</div>":"")+"</div>"},postRender:function(){var t=this,n=t.settings,e=n.textStyle;if("function"==typeof e&&(e=e.call(this)),e){var i=t.getEl("text");i&&(i.setAttribute("style",e),t._textStyle=e)}return t.on("mouseenter click",function(e){e.control===t&&(n.menu||"click"!==e.type?(t.showMenu(),e.aria&&t.menu.focus(!0)):(t.fire("select"),u.requestAnimationFrame(function(){t.parent().hideAll()})))}),t._super(),t},hover:function(){return this.parent().items().each(function(e){e.classes.remove("selected")}),this.classes.toggle("selected",!0),this},active:function(e){return function(e,t){var n=e._textStyle;if(n){var i=e.getEl("text");i.setAttribute("style",n),t&&(i.style.color="",i.style.backgroundColor="")}}(this,e),void 0!==e&&this.aria("checked",e),this._super(e)},remove:function(){this._super(),this.menu&&this.menu.remove()}}),sr=Kt.extend({Defaults:{classes:"radio",role:"radio"}}),ar=Nt.extend({renderHtml:function(){var e=this,t=e.classPrefix;return e.classes.add("resizehandle"),"both"===e.settings.direction&&e.classes.add("resizehandle-both"),e.canFocus=!1,'<div id="'+e._id+'" class="'+e.classes+'"><i class="'+t+"ico "+t+'i-resize"></i></div>'},postRender:function(){var t=this;t._super(),t.resizeDragHelper=new ct(this._id,{start:function(){t.fire("ResizeStart")},drag:function(e){"both"!==t.settings.direction&&(e.deltaX=0),t.fire("Resize",e)},stop:function(){t.fire("ResizeEnd")}})},remove:function(){return this.resizeDragHelper&&this.resizeDragHelper.destroy(),this._super()}});function lr(e){var t="";if(e)for(var n=0;n<e.length;n++)t+='<option value="'+e[n]+'">'+e[n]+"</option>";return t}var ur=Nt.extend({Defaults:{classes:"selectbox",role:"selectbox",options:[]},init:function(e){var n=this;n._super(e),n.settings.size&&(n.size=n.settings.size),n.settings.options&&(n._options=n.settings.options),n.on("keydown",function(e){var t;13===e.keyCode&&(e.preventDefault(),n.parents().reverse().each(function(e){if(e.toJSON)return t=e,!1}),n.fire("submit",{data:t.toJSON()}))})},options:function(e){return arguments.length?(this.state.set("options",e),this):this.state.get("options")},renderHtml:function(){var e,t=this,n="";return e=lr(t._options),t.size&&(n=' size = "'+t.size+'"'),'<select id="'+t._id+'" class="'+t.classes+'"'+n+">"+e+"</select>"},bindStates:function(){var t=this;return t.state.on("change:options",function(e){t.getEl().innerHTML=lr(e.value)}),t._super()}});function cr(e,t,n){return e<t&&(e=t),n<e&&(e=n),e}function dr(e,t,n){e.setAttribute("aria-"+t,n)}function fr(e,t){var n,i,r,o,s;"v"===e.settings.orientation?(r="top",i="height",n="h"):(r="left",i="width",n="w"),s=e.getEl("handle"),o=((e.layoutRect()[n]||100)-we.getSize(s)[i])*((t-e._minValue)/(e._maxValue-e._minValue))+"px",s.style[r]=o,s.style.height=e.layoutRect().h+"px",dr(s,"valuenow",t),dr(s,"valuetext",""+e.settings.previewFilter(t)),dr(s,"valuemin",e._minValue),dr(s,"valuemax",e._maxValue)}var hr=Nt.extend({init:function(e){var t=this;e.previewFilter||(e.previewFilter=function(e){return Math.round(100*e)/100}),t._super(e),t.classes.add("slider"),"v"===e.orientation&&t.classes.add("vertical"),t._minValue=$(e.minValue)?e.minValue:0,t._maxValue=$(e.maxValue)?e.maxValue:100,t._initValue=t.state.get("value")},renderHtml:function(){var e=this._id,t=this.classPrefix;return'<div id="'+e+'" class="'+this.classes+'"><div id="'+e+'-handle" class="'+t+'slider-handle" role="slider" tabindex="-1"></div></div>'},reset:function(){this.value(this._initValue).repaint()},postRender:function(){var e,t,n,i,r,o,s,a,l,u,c,d,f,h,m=this;e=m._minValue,t=m._maxValue,"v"===m.settings.orientation?(n="screenY",i="top",r="height",o="h"):(n="screenX",i="left",r="width",o="w"),m._super(),function(o,s){function t(e){var t,n,i,r;t=cr(t=(((t=m.value())+(r=n=o))/((i=s)-r)+.05*e)*(i-n)-n,o,s),m.value(t),m.fire("dragstart",{value:t}),m.fire("drag",{value:t}),m.fire("dragend",{value:t})}m.on("keydown",function(e){switch(e.keyCode){case 37:case 38:t(-1);break;case 39:case 40:t(1)}})}(e,t),s=e,a=t,l=m.getEl("handle"),m._dragHelper=new ct(m._id,{handle:m._id+"-handle",start:function(e){u=e[n],c=parseInt(m.getEl("handle").style[i],10),d=(m.layoutRect()[o]||100)-we.getSize(l)[r],m.fire("dragstart",{value:h})},drag:function(e){var t=e[n]-u;f=cr(c+t,0,d),l.style[i]=f+"px",h=s+f/d*(a-s),m.value(h),m.tooltip().text(""+m.settings.previewFilter(h)).show().moveRel(l,"bc tc"),m.fire("drag",{value:h})},stop:function(){m.tooltip().hide(),m.fire("dragend",{value:h})}})},repaint:function(){this._super(),fr(this,this.value())},bindStates:function(){var t=this;return t.state.on("change:value",function(e){fr(t,e.value)}),t._super()}}),mr=Nt.extend({renderHtml:function(){return this.classes.add("spacer"),this.canFocus=!1,'<div id="'+this._id+'" class="'+this.classes+'"></div>'}}),gr=nr.extend({Defaults:{classes:"widget btn splitbtn",role:"button"},repaint:function(){var e,t,n=this.getEl(),i=this.layoutRect();return this._super(),e=n.firstChild,t=n.lastChild,ye(e).css({width:i.w-we.getSize(t).width,height:i.h-2}),ye(t).css({height:i.h-2}),this},activeMenu:function(e){ye(this.getEl().lastChild).toggleClass(this.classPrefix+"active",e)},renderHtml:function(){var e,t,n=this,i=n._id,r=n.classPrefix,o=n.state.get("icon"),s=n.state.get("text"),a=n.settings,l="";return(e=a.image)?(o="none","string"!=typeof e&&(e=_.window.getSelection?e[0]:e[1]),e=" style=\"background-image: url('"+e+"')\""):e="",o=a.icon?r+"ico "+r+"i-"+o:"",s&&(n.classes.add("btn-has-text"),l='<span class="'+r+'txt">'+n.encode(s)+"</span>"),t="boolean"==typeof a.active?' aria-pressed="'+a.active+'"':"",'<div id="'+i+'" class="'+n.classes+'" role="button"'+t+' tabindex="-1"><button type="button" hidefocus="1" tabindex="-1">'+(o?'<i class="'+o+'"'+e+"></i>":"")+l+'</button><button type="button" class="'+r+'open" hidefocus="1" tabindex="-1">'+(n._menuBtnText?(o?"\xa0":"")+n._menuBtnText:"")+' <i class="'+r+'caret"></i></button></div>'},postRender:function(){var n=this.settings.onclick;return this.on("click",function(e){var t=e.target;if(e.control===this)for(;t;){if(e.aria&&"down"!==e.aria.key||"BUTTON"===t.nodeName&&-1===t.className.indexOf("open"))return e.stopImmediatePropagation(),void(n&&n.call(this,e));t=t.parentNode}}),delete this.settings.onclick,this._super()}}),pr=xi.extend({Defaults:{containerClass:"stack-layout",controlClass:"stack-layout-item",endClass:"break"},isNative:function(){return!0}}),vr=pt.extend({Defaults:{layout:"absolute",defaults:{type:"panel"}},activateTab:function(n){var e;this.activeTabId&&(e=this.getEl(this.activeTabId),ye(e).removeClass(this.classPrefix+"active"),e.setAttribute("aria-selected","false")),this.activeTabId="t"+n,(e=this.getEl("t"+n)).setAttribute("aria-selected","true"),ye(e).addClass(this.classPrefix+"active"),this.items()[n].show().fire("showtab"),this.reflow(),this.items().each(function(e,t){n!==t&&e.hide()})},renderHtml:function(){var i=this,e=i._layout,r="",o=i.classPrefix;return i.preRender(),e.preRender(i),i.items().each(function(e,t){var n=i._id+"-t"+t;e.aria("role","tabpanel"),e.aria("labelledby",n),r+='<div id="'+n+'" class="'+o+'tab" unselectable="on" role="tab" aria-controls="'+e._id+'" aria-selected="false" tabIndex="-1">'+i.encode(e.settings.title)+"</div>"}),'<div id="'+i._id+'" class="'+i.classes+'" hidefocus="1" tabindex="-1"><div id="'+i._id+'-head" class="'+o+'tabs" role="tablist">'+r+'</div><div id="'+i._id+'-body" class="'+i.bodyClasses+'">'+e.renderHtml(i)+"</div></div>"},postRender:function(){var i=this;i._super(),i.settings.activeTab=i.settings.activeTab||0,i.activateTab(i.settings.activeTab),this.on("click",function(e){var t=e.target.parentNode;if(t&&t.id===i._id+"-head")for(var n=t.childNodes.length;n--;)t.childNodes[n]===e.target&&i.activateTab(n)})},initLayoutRect:function(){var e,t,n,i=this;t=(t=we.getSize(i.getEl("head")).width)<0?0:t,n=0,i.items().each(function(e){t=Math.max(t,e.layoutRect().minW),n=Math.max(n,e.layoutRect().minH)}),i.items().each(function(e){e.settings.x=0,e.settings.y=0,e.settings.w=t,e.settings.h=n,e.layoutRect({x:0,y:0,w:t,h:n})});var r=we.getSize(i.getEl("head")).height;return i.settings.minWidth=t,i.settings.minHeight=n+r,(e=i._super()).deltaH+=r,e.innerH=e.h-e.deltaH,e}}),br=Nt.extend({init:function(e){var n=this;n._super(e),n.classes.add("textbox"),e.multiline?n.classes.add("multiline"):(n.on("keydown",function(e){var t;13===e.keyCode&&(e.preventDefault(),n.parents().reverse().each(function(e){if(e.toJSON)return t=e,!1}),n.fire("submit",{data:t.toJSON()}))}),n.on("keyup",function(e){n.state.set("value",e.target.value)}))},repaint:function(){var e,t,n,i,r,o=this,s=0;e=o.getEl().style,t=o._layoutRect,r=o._lastRepaintRect||{};var a=_.document;return!o.settings.multiline&&a.all&&(!a.documentMode||a.documentMode<=8)&&(e.lineHeight=t.h-s+"px"),i=(n=o.borderBox).left+n.right+8,s=n.top+n.bottom+(o.settings.multiline?8:0),t.x!==r.x&&(e.left=t.x+"px",r.x=t.x),t.y!==r.y&&(e.top=t.y+"px",r.y=t.y),t.w!==r.w&&(e.width=t.w-i+"px",r.w=t.w),t.h!==r.h&&(e.height=t.h-s+"px",r.h=t.h),o._lastRepaintRect=r,o.fire("repaint",{},!1),o},renderHtml:function(){var t,e,n=this,i=n.settings;return t={id:n._id,hidefocus:"1"},w.each(["rows","spellcheck","maxLength","size","readonly","min","max","step","list","pattern","placeholder","required","multiple"],function(e){t[e]=i[e]}),n.disabled()&&(t.disabled="disabled"),i.subtype&&(t.type=i.subtype),(e=we.create(i.multiline?"textarea":"input",t)).value=n.state.get("value"),e.className=n.classes.toString(),e.outerHTML},value:function(e){return arguments.length?(this.state.set("value",e),this):(this.state.get("rendered")&&this.state.set("value",this.getEl().value),this.state.get("value"))},postRender:function(){var t=this;t.getEl().value=t.state.get("value"),t._super(),t.$el.on("change",function(e){t.state.set("value",e.target.value),t.fire("change",e)})},bindStates:function(){var t=this;return t.state.on("change:value",function(e){t.getEl().value!==e.value&&(t.getEl().value=e.value)}),t.state.on("change:disabled",function(e){t.getEl().disabled=e.value}),t._super()},remove:function(){this.$el.off(),this._super()}}),yr=function(){return{Selector:Ie,Collection:Ve,ReflowQueue:Ke,Control:rt,Factory:v,KeyboardNavigation:st,Container:lt,DragHelper:ct,Scrollable:gt,Panel:pt,Movable:He,Resizable:vt,FloatPanel:Ct,Window:It,MessageBox:Yt,Tooltip:Mt,Widget:Nt,Progress:Pt,Notification:Dt,Layout:qt,AbsoluteLayout:Xt,Button:jt,ButtonGroup:Gt,Checkbox:Kt,ComboBox:Qt,ColorBox:en,PanelButton:tn,ColorButton:rn,ColorPicker:sn,Path:ln,ElementPath:un,FormItem:cn,Form:dn,FieldSet:fn,FilePicker:vi,FitLayout:bi,FlexLayout:yi,FlowLayout:xi,FormatControls:Ji,GridLayout:Gi,Iframe:Ki,InfoBox:Zi,Label:Qi,Toolbar:er,MenuBar:tr,MenuButton:nr,MenuItem:or,Throbber:Ht,Menu:ir,ListBox:rr,Radio:sr,ResizeHandle:ar,SelectBox:ur,Slider:hr,Spacer:mr,SplitButton:gr,StackLayout:pr,TabPanel:vr,TextBox:br,DropZone:an,BrowseButton:Jt}},xr=function(n){n.ui?w.each(yr(),function(e,t){n.ui[t]=e}):n.ui=yr()};w.each(yr(),function(e,t){v.add(t,e)}),xr(window.tinymce?window.tinymce:{}),r.add("modern",function(e){return Ji.setup(e),$t(e)})}(window);
\ No newline at end of file
diff --git a/lib/web/tiny_mce_4/tinymce.min.js b/lib/web/tiny_mce_4/tinymce.min.js
index 369dd7c6c872b..a9128ab30f04a 100644
--- a/lib/web/tiny_mce_4/tinymce.min.js
+++ b/lib/web/tiny_mce_4/tinymce.min.js
@@ -1,2 +1,2 @@
-// 4.9.5 (2019-07-02)
-!function(H){"use strict";var o=function(){},j=function(n,r){return function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return n(r.apply(null,e))}},q=function(e){return function(){return e}},$=function(e){return e};function d(r){for(var o=[],e=1;e<arguments.length;e++)o[e-1]=arguments[e];return function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n=o.concat(e);return r.apply(null,n)}}var e,t,n,r,i,a,u,s,c,l,f,m,g,p,h,v,b,y=function(n){return function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return!n.apply(null,e)}},C=q(!1),x=q(!0),w=C,N=x,E=function(){return S},S=(r={fold:function(e,t){return e()},is:w,isSome:w,isNone:N,getOr:n=function(e){return e},getOrThunk:t=function(e){return e()},getOrDie:function(e){throw new Error(e||"error: getOrDie called on none.")},getOrNull:function(){return null},getOrUndefined:function(){return undefined},or:n,orThunk:t,map:E,ap:E,each:function(){},bind:E,flatten:E,exists:w,forall:N,filter:E,equals:e=function(e){return e.isNone()},equals_:e,toArray:function(){return[]},toString:q("none()")},Object.freeze&&Object.freeze(r),r),k=function(n){var e=function(){return n},t=function(){return o},r=function(e){return e(n)},o={fold:function(e,t){return t(n)},is:function(e){return n===e},isSome:N,isNone:w,getOr:e,getOrThunk:e,getOrDie:e,getOrNull:e,getOrUndefined:e,or:t,orThunk:t,map:function(e){return k(e(n))},ap:function(e){return e.fold(E,function(e){return k(e(n))})},each:function(e){e(n)},bind:r,flatten:e,exists:r,forall:r,filter:function(e){return e(n)?o:S},equals:function(e){return e.is(n)},equals_:function(e,t){return e.fold(w,function(e){return t(n,e)})},toArray:function(){return[n]},toString:function(){return"some("+n+")"}};return o},A={some:k,none:E,from:function(e){return null===e||e===undefined?S:k(e)}},T=function(t){return function(e){return function(e){if(null===e)return"null";var t=typeof e;return"object"===t&&(Array.prototype.isPrototypeOf(e)||e.constructor&&"Array"===e.constructor.name)?"array":"object"===t&&(String.prototype.isPrototypeOf(e)||e.constructor&&"String"===e.constructor.name)?"string":t}(e)===t}},R=T("string"),_=T("object"),D=T("array"),B=T("null"),O=T("boolean"),P=T("function"),I=T("number"),L=Array.prototype.slice,M=(i=Array.prototype.indexOf)===undefined?function(e,t){return J(e,t)}:function(e,t){return i.call(e,t)},F=function(e,t){return-1<M(e,t)},z=function(e,t){return G(e,t).isSome()},W=function(e,t){for(var n=e.length,r=new Array(n),o=0;o<n;o++){var i=e[o];r[o]=t(i,o,e)}return r},U=function(e,t){for(var n=0,r=e.length;n<r;n++)t(e[n],n,e)},K=function(e,t){for(var n=[],r=[],o=0,i=e.length;o<i;o++){var a=e[o];(t(a,o,e)?n:r).push(a)}return{pass:n,fail:r}},V=function(e,t){for(var n=[],r=0,o=e.length;r<o;r++){var i=e[r];t(i,r,e)&&n.push(i)}return n},X=function(e,t,n){return U(e,function(e){n=t(n,e)}),n},Y=function(e,t){for(var n=0,r=e.length;n<r;n++){var o=e[n];if(t(o,n,e))return A.some(o)}return A.none()},G=function(e,t){for(var n=0,r=e.length;n<r;n++)if(t(e[n],n,e))return A.some(n);return A.none()},J=function(e,t){for(var n=0,r=e.length;n<r;++n)if(e[n]===t)return n;return-1},Q=Array.prototype.push,Z=function(e,t){return function(e){for(var t=[],n=0,r=e.length;n<r;++n){if(!Array.prototype.isPrototypeOf(e[n]))throw new Error("Arr.flatten item "+n+" was not an array, input: "+e);Q.apply(t,e[n])}return t}(W(e,t))},ee=function(e,t){for(var n=0,r=e.length;n<r;++n)if(!0!==t(e[n],n,e))return!1;return!0},te=function(e,t){return V(e,function(e){return!F(t,e)})},ne=function(e){return 0===e.length?A.none():A.some(e[0])},re=function(e){return 0===e.length?A.none():A.some(e[e.length-1])},oe=P(Array.from)?Array.from:function(e){return L.call(e)},ie="undefined"!=typeof H.window?H.window:Function("return this;")(),ae=function(e,t){return function(e,t){for(var n=t!==undefined&&null!==t?t:ie,r=0;r<e.length&&n!==undefined&&null!==n;++r)n=n[e[r]];return n}(e.split("."),t)},ue={getOrDie:function(e,t){var n=ae(e,t);if(n===undefined||null===n)throw e+" not available on this browser";return n}},se=function(){return ue.getOrDie("URL")},ce={createObjectURL:function(e){return se().createObjectURL(e)},revokeObjectURL:function(e){se().revokeObjectURL(e)}},le=H.navigator,fe=le.userAgent,de=function(e){return"matchMedia"in H.window&&H.matchMedia(e).matches};g=/Android/.test(fe),u=(u=!(a=/WebKit/.test(fe))&&/MSIE/gi.test(fe)&&/Explorer/gi.test(le.appName))&&/MSIE (\w+)\./.exec(fe)[1],s=-1!==fe.indexOf("Trident/")&&(-1!==fe.indexOf("rv:")||-1!==le.appName.indexOf("Netscape"))&&11,c=-1!==fe.indexOf("Edge/")&&!u&&!s&&12,u=u||s||c,l=!a&&!s&&/Gecko/.test(fe),f=-1!==fe.indexOf("Mac"),m=/(iPad|iPhone)/.test(fe),p="FormData"in H.window&&"FileReader"in H.window&&"URL"in H.window&&!!ce.createObjectURL,h=de("only screen and (max-device-width: 480px)")&&(g||m),v=de("only screen and (min-width: 800px)")&&(g||m),b=-1!==fe.indexOf("Windows Phone"),c&&(a=!1);var me,ge={opera:!1,webkit:a,ie:u,gecko:l,mac:f,iOS:m,android:g,contentEditable:!m||p||534<=parseInt(fe.match(/AppleWebKit\/(\d*)/)[1],10),transparentSrc:"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7",caretAfter:8!==u,range:H.window.getSelection&&"Range"in H.window,documentMode:u&&!c?H.document.documentMode||7:10,fileApi:p,ceFalse:!1===u||8<u,cacheSuffix:null,container:null,overrideViewPort:null,experimentalShadowDom:!1,canHaveCSP:!1===u||11<u,desktop:!h&&!v,windowsPhone:b},pe=window.Promise?window.Promise:function(){function r(e,t){return function(){e.apply(t,arguments)}}var e=Array.isArray||function(e){return"[object Array]"===Object.prototype.toString.call(e)},i=function(e){if("object"!=typeof this)throw new TypeError("Promises must be constructed via new");if("function"!=typeof e)throw new TypeError("not a function");this._state=null,this._value=null,this._deferreds=[],l(e,r(o,this),r(u,this))},t=i.immediateFn||"function"==typeof setImmediate&&setImmediate||function(e){setTimeout(e,1)};function a(r){var o=this;null!==this._state?t(function(){var e=o._state?r.onFulfilled:r.onRejected;if(null!==e){var t;try{t=e(o._value)}catch(n){return void r.reject(n)}r.resolve(t)}else(o._state?r.resolve:r.reject)(o._value)}):this._deferreds.push(r)}function o(e){try{if(e===this)throw new TypeError("A promise cannot be resolved with itself.");if(e&&("object"==typeof e||"function"==typeof e)){var t=e.then;if("function"==typeof t)return void l(r(t,e),r(o,this),r(u,this))}this._state=!0,this._value=e,s.call(this)}catch(n){u.call(this,n)}}function u(e){this._state=!1,this._value=e,s.call(this)}function s(){for(var e=0,t=this._deferreds.length;e<t;e++)a.call(this,this._deferreds[e]);this._deferreds=null}function c(e,t,n,r){this.onFulfilled="function"==typeof e?e:null,this.onRejected="function"==typeof t?t:null,this.resolve=n,this.reject=r}function l(e,t,n){var r=!1;try{e(function(e){r||(r=!0,t(e))},function(e){r||(r=!0,n(e))})}catch(o){if(r)return;r=!0,n(o)}}return i.prototype["catch"]=function(e){return this.then(null,e)},i.prototype.then=function(n,r){var o=this;return new i(function(e,t){a.call(o,new c(n,r,e,t))})},i.all=function(){var s=Array.prototype.slice.call(1===arguments.length&&e(arguments[0])?arguments[0]:arguments);return new i(function(o,i){if(0===s.length)return o([]);var a=s.length;function u(t,e){try{if(e&&("object"==typeof e||"function"==typeof e)){var n=e.then;if("function"==typeof n)return void n.call(e,function(e){u(t,e)},i)}s[t]=e,0==--a&&o(s)}catch(r){i(r)}}for(var e=0;e<s.length;e++)u(e,s[e])})},i.resolve=function(t){return t&&"object"==typeof t&&t.constructor===i?t:new i(function(e){e(t)})},i.reject=function(n){return new i(function(e,t){t(n)})},i.race=function(o){return new i(function(e,t){for(var n=0,r=o.length;n<r;n++)o[n].then(e,t)})},i}(),he=function(e,t){return"number"!=typeof t&&(t=0),setTimeout(e,t)},ve=function(e,t){return"number"!=typeof t&&(t=1),setInterval(e,t)},be=function(t,n){var r,e;return(e=function(){var e=arguments;clearTimeout(r),r=he(function(){t.apply(this,e)},n)}).stop=function(){clearTimeout(r)},e},ye={requestAnimationFrame:function(e,t){me?me.then(e):me=new pe(function(e){t||(t=H.document.body),function(e,t){var n,r=H.window.requestAnimationFrame,o=["ms","moz","webkit"];for(n=0;n<o.length&&!r;n++)r=H.window[o[n]+"RequestAnimationFrame"];r||(r=function(e){H.window.setTimeout(e,0)}),r(e,t)}(e,t)}).then(e)},setTimeout:he,setInterval:ve,setEditorTimeout:function(e,t,n){return he(function(){e.removed||t()},n)},setEditorInterval:function(e,t,n){var r;return r=ve(function(){e.removed?clearInterval(r):t()},n)},debounce:be,throttle:be,clearInterval:function(e){return clearInterval(e)},clearTimeout:function(e){return clearTimeout(e)}},Ce=/^(?:mouse|contextmenu)|click/,xe={keyLocation:1,layerX:1,layerY:1,returnValue:1,webkitMovementX:1,webkitMovementY:1,keyIdentifier:1},we=function(){return!1},Ne=function(){return!0},Ee=function(e,t,n,r){e.addEventListener?e.addEventListener(t,n,r||!1):e.attachEvent&&e.attachEvent("on"+t,n)},Se=function(e,t,n,r){e.removeEventListener?e.removeEventListener(t,n,r||!1):e.detachEvent&&e.detachEvent("on"+t,n)},ke=function(e,t){var n,r,o=t||{};for(n in e)xe[n]||(o[n]=e[n]);if(o.target||(o.target=o.srcElement||H.document),ge.experimentalShadowDom&&(o.target=function(e,t){if(e.composedPath){var n=e.composedPath();if(n&&0<n.length)return n[0]}return t}(e,o.target)),e&&Ce.test(e.type)&&e.pageX===undefined&&e.clientX!==undefined){var i=o.target.ownerDocument||H.document,a=i.documentElement,u=i.body;o.pageX=e.clientX+(a&&a.scrollLeft||u&&u.scrollLeft||0)-(a&&a.clientLeft||u&&u.clientLeft||0),o.pageY=e.clientY+(a&&a.scrollTop||u&&u.scrollTop||0)-(a&&a.clientTop||u&&u.clientTop||0)}return o.preventDefault=function(){o.isDefaultPrevented=Ne,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},o.stopPropagation=function(){o.isPropagationStopped=Ne,e&&(e.stopPropagation?e.stopPropagation():e.cancelBubble=!0)},!(o.stopImmediatePropagation=function(){o.isImmediatePropagationStopped=Ne,o.stopPropagation()})==((r=o).isDefaultPrevented===Ne||r.isDefaultPrevented===we)&&(o.isDefaultPrevented=we,o.isPropagationStopped=we,o.isImmediatePropagationStopped=we),"undefined"==typeof o.metaKey&&(o.metaKey=!1),o},Te=function(e,t,n){var r=e.document,o={type:"ready"};if(n.domLoaded)t(o);else{var i=function(){return"complete"===r.readyState||"interactive"===r.readyState&&r.body},a=function(){n.domLoaded||(n.domLoaded=!0,t(o))},u=function(){i()&&(Se(r,"readystatechange",u),a())},s=function(){try{r.documentElement.doScroll("left")}catch(e){return void ye.setTimeout(s)}a()};!r.addEventListener||ge.ie&&ge.ie<11?(Ee(r,"readystatechange",u),r.documentElement.doScroll&&e.self===e.top&&s()):i()?a():Ee(e,"DOMContentLoaded",a),Ee(e,"load",a)}},Ae=function(){var m,g,p,h,v,b=this,y={};g="mce-data-"+(+new Date).toString(32),h="onmouseenter"in H.document.documentElement,p="onfocusin"in H.document.documentElement,v={mouseenter:"mouseover",mouseleave:"mouseout"},m=1,b.domLoaded=!1,b.events=y;var C=function(e,t){var n,r,o,i,a=y[t];if(n=a&&a[e.type])for(r=0,o=n.length;r<o;r++)if((i=n[r])&&!1===i.func.call(i.scope,e)&&e.preventDefault(),e.isImmediatePropagationStopped())return};b.bind=function(e,t,n,r){var o,i,a,u,s,c,l,f=H.window,d=function(e){C(ke(e||f.event),o)};if(e&&3!==e.nodeType&&8!==e.nodeType){for(e[g]?o=e[g]:(o=m++,e[g]=o,y[o]={}),r=r||e,a=(t=t.split(" ")).length;a--;)c=d,s=l=!1,"DOMContentLoaded"===(u=t[a])&&(u="ready"),b.domLoaded&&"ready"===u&&"complete"===e.readyState?n.call(r,ke({type:u})):(h||(s=v[u])&&(c=function(e){var t,n;if(t=e.currentTarget,(n=e.relatedTarget)&&t.contains)n=t.contains(n);else for(;n&&n!==t;)n=n.parentNode;n||((e=ke(e||f.event)).type="mouseout"===e.type?"mouseleave":"mouseenter",e.target=t,C(e,o))}),p||"focusin"!==u&&"focusout"!==u||(l=!0,s="focusin"===u?"focus":"blur",c=function(e){(e=ke(e||f.event)).type="focus"===e.type?"focusin":"focusout",C(e,o)}),(i=y[o][u])?"ready"===u&&b.domLoaded?n({type:u}):i.push({func:n,scope:r}):(y[o][u]=i=[{func:n,scope:r}],i.fakeName=s,i.capture=l,i.nativeHandler=c,"ready"===u?Te(e,c,b):Ee(e,s||u,c,l)));return e=i=0,n}},b.unbind=function(e,t,n){var r,o,i,a,u,s;if(!e||3===e.nodeType||8===e.nodeType)return b;if(r=e[g]){if(s=y[r],t){for(i=(t=t.split(" ")).length;i--;)if(o=s[u=t[i]]){if(n)for(a=o.length;a--;)if(o[a].func===n){var c=o.nativeHandler,l=o.fakeName,f=o.capture;(o=o.slice(0,a).concat(o.slice(a+1))).nativeHandler=c,o.fakeName=l,o.capture=f,s[u]=o}n&&0!==o.length||(delete s[u],Se(e,o.fakeName||u,o.nativeHandler,o.capture))}}else{for(u in s)o=s[u],Se(e,o.fakeName||u,o.nativeHandler,o.capture);s={}}for(u in s)return b;delete y[r];try{delete e[g]}catch(d){e[g]=null}}return b},b.fire=function(e,t,n){var r;if(!e||3===e.nodeType||8===e.nodeType)return b;for((n=ke(null,n)).type=t,n.target=e;(r=e[g])&&C(n,r),(e=e.parentNode||e.ownerDocument||e.defaultView||e.parentWindow)&&!n.isPropagationStopped(););return b},b.clean=function(e){var t,n,r=b.unbind;if(!e||3===e.nodeType||8===e.nodeType)return b;if(e[g]&&r(e),e.getElementsByTagName||(e=e.document),e&&e.getElementsByTagName)for(r(e),t=(n=e.getElementsByTagName("*")).length;t--;)(e=n[t])[g]&&r(e);return b},b.destroy=function(){y={}},b.cancel=function(e){return e&&(e.preventDefault(),e.stopImmediatePropagation()),!1}};Ae.Event=new Ae,Ae.Event.bind(H.window,"ready",function(){});var Re,_e,De,Be,Oe,Pe,Ie,Le,Me,Fe,ze,Ue,Ve,He,je,qe,$e,We,Ke="sizzle"+-new Date,Xe=H.window.document,Ye=0,Ge=0,Je=Rt(),Qe=Rt(),Ze=Rt(),et=function(e,t){return e===t&&(ze=!0),0},tt=typeof undefined,nt={}.hasOwnProperty,rt=[],ot=rt.pop,it=rt.push,at=rt.push,ut=rt.slice,st=rt.indexOf||function(e){for(var t=0,n=this.length;t<n;t++)if(this[t]===e)return t;return-1},ct="[\\x20\\t\\r\\n\\f]",lt="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",ft="\\["+ct+"*("+lt+")(?:"+ct+"*([*^$|!~]?=)"+ct+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+lt+"))|)"+ct+"*\\]",dt=":("+lt+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+ft+")*)|.*)\\)|)",mt=new RegExp("^"+ct+"+|((?:^|[^\\\\])(?:\\\\.)*)"+ct+"+$","g"),gt=new RegExp("^"+ct+"*,"+ct+"*"),pt=new RegExp("^"+ct+"*([>+~]|"+ct+")"+ct+"*"),ht=new RegExp("="+ct+"*([^\\]'\"]*?)"+ct+"*\\]","g"),vt=new RegExp(dt),bt=new RegExp("^"+lt+"$"),yt={ID:new RegExp("^#("+lt+")"),CLASS:new RegExp("^\\.("+lt+")"),TAG:new RegExp("^("+lt+"|[*])"),ATTR:new RegExp("^"+ft),PSEUDO:new RegExp("^"+dt),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+ct+"*(even|odd|(([+-]|)(\\d*)n|)"+ct+"*(?:([+-]|)"+ct+"*(\\d+)|))"+ct+"*\\)|)","i"),bool:new RegExp("^(?:checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped)$","i"),needsContext:new RegExp("^"+ct+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+ct+"*((?:-\\d)?\\d*)"+ct+"*\\)|)(?=[^-]|$)","i")},Ct=/^(?:input|select|textarea|button)$/i,xt=/^h\d$/i,wt=/^[^{]+\{\s*\[native \w/,Nt=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,Et=/[+~]/,St=/'|\\/g,kt=new RegExp("\\\\([\\da-f]{1,6}"+ct+"?|("+ct+")|.)","ig"),Tt=function(e,t,n){var r="0x"+t-65536;return r!=r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)};try{at.apply(rt=ut.call(Xe.childNodes),Xe.childNodes),rt[Xe.childNodes.length].nodeType}catch(ZN){at={apply:rt.length?function(e,t){it.apply(e,ut.call(t))}:function(e,t){for(var n=e.length,r=0;e[n++]=t[r++];);e.length=n-1}}}var At=function(e,t,n,r){var o,i,a,u,s,c,l,f,d,m;if((t?t.ownerDocument||t:Xe)!==Ve&&Ue(t),n=n||[],!e||"string"!=typeof e)return n;if(1!==(u=(t=t||Ve).nodeType)&&9!==u)return[];if(je&&!r){if(o=Nt.exec(e))if(a=o[1]){if(9===u){if(!(i=t.getElementById(a))||!i.parentNode)return n;if(i.id===a)return n.push(i),n}else if(t.ownerDocument&&(i=t.ownerDocument.getElementById(a))&&We(t,i)&&i.id===a)return n.push(i),n}else{if(o[2])return at.apply(n,t.getElementsByTagName(e)),n;if((a=o[3])&&_e.getElementsByClassName)return at.apply(n,t.getElementsByClassName(a)),n}if(_e.qsa&&(!qe||!qe.test(e))){if(f=l=Ke,d=t,m=9===u&&e,1===u&&"object"!==t.nodeName.toLowerCase()){for(c=Pe(e),(l=t.getAttribute("id"))?f=l.replace(St,"\\$&"):t.setAttribute("id",f),f="[id='"+f+"'] ",s=c.length;s--;)c[s]=f+Mt(c[s]);d=Et.test(e)&&It(t.parentNode)||t,m=c.join(",")}if(m)try{return at.apply(n,d.querySelectorAll(m)),n}catch(g){}finally{l||t.removeAttribute("id")}}}return Le(e.replace(mt,"$1"),t,n,r)};function Rt(){var r=[];return function e(t,n){return r.push(t+" ")>De.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function _t(e){return e[Ke]=!0,e}function Dt(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||1<<31)-(~e.sourceIndex||1<<31);if(r)return r;if(n)for(;n=n.nextSibling;)if(n===t)return-1;return e?1:-1}function Bt(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function Ot(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function Pt(a){return _t(function(i){return i=+i,_t(function(e,t){for(var n,r=a([],e.length,i),o=r.length;o--;)e[n=r[o]]&&(e[n]=!(t[n]=e[n]))})})}function It(e){return e&&typeof e.getElementsByTagName!==tt&&e}for(Re in _e=At.support={},Oe=At.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return!!t&&"HTML"!==t.nodeName},Ue=At.setDocument=function(e){var t,s=e?e.ownerDocument||e:Xe,n=s.defaultView;return s!==Ve&&9===s.nodeType&&s.documentElement?(He=(Ve=s).documentElement,je=!Oe(s),n&&n!==function(e){try{return e.top}catch(t){}return null}(n)&&(n.addEventListener?n.addEventListener("unload",function(){Ue()},!1):n.attachEvent&&n.attachEvent("onunload",function(){Ue()})),_e.attributes=!0,_e.getElementsByTagName=!0,_e.getElementsByClassName=wt.test(s.getElementsByClassName),_e.getById=!0,De.find.ID=function(e,t){if(typeof t.getElementById!==tt&&je){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},De.filter.ID=function(e){var t=e.replace(kt,Tt);return function(e){return e.getAttribute("id")===t}},De.find.TAG=_e.getElementsByTagName?function(e,t){if(typeof t.getElementsByTagName!==tt)return t.getElementsByTagName(e)}:function(e,t){var n,r=[],o=0,i=t.getElementsByTagName(e);if("*"===e){for(;n=i[o++];)1===n.nodeType&&r.push(n);return r}return i},De.find.CLASS=_e.getElementsByClassName&&function(e,t){if(je)return t.getElementsByClassName(e)},$e=[],qe=[],_e.disconnectedMatch=!0,qe=qe.length&&new RegExp(qe.join("|")),$e=$e.length&&new RegExp($e.join("|")),t=wt.test(He.compareDocumentPosition),We=t||wt.test(He.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)for(;t=t.parentNode;)if(t===e)return!0;return!1},et=t?function(e,t){if(e===t)return ze=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!_e.sortDetached&&t.compareDocumentPosition(e)===n?e===s||e.ownerDocument===Xe&&We(Xe,e)?-1:t===s||t.ownerDocument===Xe&&We(Xe,t)?1:Fe?st.call(Fe,e)-st.call(Fe,t):0:4&n?-1:1)}:function(e,t){if(e===t)return ze=!0,0;var n,r=0,o=e.parentNode,i=t.parentNode,a=[e],u=[t];if(!o||!i)return e===s?-1:t===s?1:o?-1:i?1:Fe?st.call(Fe,e)-st.call(Fe,t):0;if(o===i)return Dt(e,t);for(n=e;n=n.parentNode;)a.unshift(n);for(n=t;n=n.parentNode;)u.unshift(n);for(;a[r]===u[r];)r++;return r?Dt(a[r],u[r]):a[r]===Xe?-1:u[r]===Xe?1:0},s):Ve},At.matches=function(e,t){return At(e,null,null,t)},At.matchesSelector=function(e,t){if((e.ownerDocument||e)!==Ve&&Ue(e),t=t.replace(ht,"='$1']"),_e.matchesSelector&&je&&(!$e||!$e.test(t))&&(!qe||!qe.test(t)))try{var n=(void 0).call(e,t);if(n||_e.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(ZN){}return 0<At(t,Ve,null,[e]).length},At.contains=function(e,t){return(e.ownerDocument||e)!==Ve&&Ue(e),We(e,t)},At.attr=function(e,t){(e.ownerDocument||e)!==Ve&&Ue(e);var n=De.attrHandle[t.toLowerCase()],r=n&&nt.call(De.attrHandle,t.toLowerCase())?n(e,t,!je):undefined;return r!==undefined?r:_e.attributes||!je?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},At.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},At.uniqueSort=function(e){var t,n=[],r=0,o=0;if(ze=!_e.detectDuplicates,Fe=!_e.sortStable&&e.slice(0),e.sort(et),ze){for(;t=e[o++];)t===e[o]&&(r=n.push(o));for(;r--;)e.splice(n[r],1)}return Fe=null,e},Be=At.getText=function(e){var t,n="",r=0,o=e.nodeType;if(o){if(1===o||9===o||11===o){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=Be(e)}else if(3===o||4===o)return e.nodeValue}else for(;t=e[r++];)n+=Be(t);return n},(De=At.selectors={cacheLength:50,createPseudo:_t,match:yt,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(kt,Tt),e[3]=(e[3]||e[4]||e[5]||"").replace(kt,Tt),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||At.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&At.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return yt.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&vt.test(n)&&(t=Pe(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(kt,Tt).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=Je[e+" "];return t||(t=new RegExp("(^|"+ct+")"+e+"("+ct+"|$)"))&&Je(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==tt&&e.getAttribute("class")||"")})},ATTR:function(n,r,o){return function(e){var t=At.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===o:"!="===r?t!==o:"^="===r?o&&0===t.indexOf(o):"*="===r?o&&-1<t.indexOf(o):"$="===r?o&&t.slice(-o.length)===o:"~="===r?-1<(" "+t+" ").indexOf(o):"|="===r&&(t===o||t.slice(0,o.length+1)===o+"-"))}},CHILD:function(m,e,t,g,p){var h="nth"!==m.slice(0,3),v="last"!==m.slice(-4),b="of-type"===e;return 1===g&&0===p?function(e){return!!e.parentNode}:function(e,t,n){var r,o,i,a,u,s,c=h!==v?"nextSibling":"previousSibling",l=e.parentNode,f=b&&e.nodeName.toLowerCase(),d=!n&&!b;if(l){if(h){for(;c;){for(i=e;i=i[c];)if(b?i.nodeName.toLowerCase()===f:1===i.nodeType)return!1;s=c="only"===m&&!s&&"nextSibling"}return!0}if(s=[v?l.firstChild:l.lastChild],v&&d){for(u=(r=(o=l[Ke]||(l[Ke]={}))[m]||[])[0]===Ye&&r[1],a=r[0]===Ye&&r[2],i=u&&l.childNodes[u];i=++u&&i&&i[c]||(a=u=0)||s.pop();)if(1===i.nodeType&&++a&&i===e){o[m]=[Ye,u,a];break}}else if(d&&(r=(e[Ke]||(e[Ke]={}))[m])&&r[0]===Ye)a=r[1];else for(;(i=++u&&i&&i[c]||(a=u=0)||s.pop())&&((b?i.nodeName.toLowerCase()!==f:1!==i.nodeType)||!++a||(d&&((i[Ke]||(i[Ke]={}))[m]=[Ye,a]),i!==e)););return(a-=p)===g||a%g==0&&0<=a/g}}},PSEUDO:function(e,i){var t,a=De.pseudos[e]||De.setFilters[e.toLowerCase()]||At.error("unsupported pseudo: "+e);return a[Ke]?a(i):1<a.length?(t=[e,e,"",i],De.setFilters.hasOwnProperty(e.toLowerCase())?_t(function(e,t){for(var n,r=a(e,i),o=r.length;o--;)e[n=st.call(e,r[o])]=!(t[n]=r[o])}):function(e){return a(e,0,t)}):a}},pseudos:{not:_t(function(e){var r=[],o=[],u=Ie(e.replace(mt,"$1"));return u[Ke]?_t(function(e,t,n,r){for(var o,i=u(e,null,r,[]),a=e.length;a--;)(o=i[a])&&(e[a]=!(t[a]=o))}):function(e,t,n){return r[0]=e,u(r,null,n,o),!o.pop()}}),has:_t(function(t){return function(e){return 0<At(t,e).length}}),contains:_t(function(t){return t=t.replace(kt,Tt),function(e){return-1<(e.textContent||e.innerText||Be(e)).indexOf(t)}}),lang:_t(function(n){return bt.test(n||"")||At.error("unsupported lang: "+n),n=n.replace(kt,Tt).toLowerCase(),function(e){var t;do{if(t=je?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=H.window.location&&H.window.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===He},focus:function(e){return e===Ve.activeElement&&(!Ve.hasFocus||Ve.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return!1===e.disabled},disabled:function(e){return!0===e.disabled},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!De.pseudos.empty(e)},header:function(e){return xt.test(e.nodeName)},input:function(e){return Ct.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:Pt(function(){return[0]}),last:Pt(function(e,t){return[t-1]}),eq:Pt(function(e,t,n){return[n<0?n+t:n]}),even:Pt(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:Pt(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:Pt(function(e,t,n){for(var r=n<0?n+t:n;0<=--r;)e.push(r);return e}),gt:Pt(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=De.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})De.pseudos[Re]=Bt(Re);for(Re in{submit:!0,reset:!0})De.pseudos[Re]=Ot(Re);function Lt(){}function Mt(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function Ft(a,e,t){var u=e.dir,s=t&&"parentNode"===u,c=Ge++;return e.first?function(e,t,n){for(;e=e[u];)if(1===e.nodeType||s)return a(e,t,n)}:function(e,t,n){var r,o,i=[Ye,c];if(n){for(;e=e[u];)if((1===e.nodeType||s)&&a(e,t,n))return!0}else for(;e=e[u];)if(1===e.nodeType||s){if((r=(o=e[Ke]||(e[Ke]={}))[u])&&r[0]===Ye&&r[1]===c)return i[2]=r[2];if((o[u]=i)[2]=a(e,t,n))return!0}}}function zt(o){return 1<o.length?function(e,t,n){for(var r=o.length;r--;)if(!o[r](e,t,n))return!1;return!0}:o[0]}function Ut(e,t,n,r,o){for(var i,a=[],u=0,s=e.length,c=null!=t;u<s;u++)(i=e[u])&&(n&&!n(i,r,o)||(a.push(i),c&&t.push(u)));return a}function Vt(m,g,p,h,v,e){return h&&!h[Ke]&&(h=Vt(h)),v&&!v[Ke]&&(v=Vt(v,e)),_t(function(e,t,n,r){var o,i,a,u=[],s=[],c=t.length,l=e||function(e,t,n){for(var r=0,o=t.length;r<o;r++)At(e,t[r],n);return n}(g||"*",n.nodeType?[n]:n,[]),f=!m||!e&&g?l:Ut(l,u,m,n,r),d=p?v||(e?m:c||h)?[]:t:f;if(p&&p(f,d,n,r),h)for(o=Ut(d,s),h(o,[],n,r),i=o.length;i--;)(a=o[i])&&(d[s[i]]=!(f[s[i]]=a));if(e){if(v||m){if(v){for(o=[],i=d.length;i--;)(a=d[i])&&o.push(f[i]=a);v(null,d=[],o,r)}for(i=d.length;i--;)(a=d[i])&&-1<(o=v?st.call(e,a):u[i])&&(e[o]=!(t[o]=a))}}else d=Ut(d===t?d.splice(c,d.length):d),v?v(null,t,d,r):at.apply(t,d)})}function Ht(e){for(var r,t,n,o=e.length,i=De.relative[e[0].type],a=i||De.relative[" "],u=i?1:0,s=Ft(function(e){return e===r},a,!0),c=Ft(function(e){return-1<st.call(r,e)},a,!0),l=[function(e,t,n){return!i&&(n||t!==Me)||((r=t).nodeType?s(e,t,n):c(e,t,n))}];u<o;u++)if(t=De.relative[e[u].type])l=[Ft(zt(l),t)];else{if((t=De.filter[e[u].type].apply(null,e[u].matches))[Ke]){for(n=++u;n<o&&!De.relative[e[n].type];n++);return Vt(1<u&&zt(l),1<u&&Mt(e.slice(0,u-1).concat({value:" "===e[u-2].type?"*":""})).replace(mt,"$1"),t,u<n&&Ht(e.slice(u,n)),n<o&&Ht(e=e.slice(n)),n<o&&Mt(e))}l.push(t)}return zt(l)}Lt.prototype=De.filters=De.pseudos,De.setFilters=new Lt,Pe=At.tokenize=function(e,t){var n,r,o,i,a,u,s,c=Qe[e+" "];if(c)return t?0:c.slice(0);for(a=e,u=[],s=De.preFilter;a;){for(i in n&&!(r=gt.exec(a))||(r&&(a=a.slice(r[0].length)||a),u.push(o=[])),n=!1,(r=pt.exec(a))&&(n=r.shift(),o.push({value:n,type:r[0].replace(mt," ")}),a=a.slice(n.length)),De.filter)!(r=yt[i].exec(a))||s[i]&&!(r=s[i](r))||(n=r.shift(),o.push({value:n,type:i,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?At.error(e):Qe(e,u).slice(0)},Ie=At.compile=function(e,t){var n,h,v,b,y,r,o=[],i=[],a=Ze[e+" "];if(!a){for(t||(t=Pe(e)),n=t.length;n--;)(a=Ht(t[n]))[Ke]?o.push(a):i.push(a);(a=Ze(e,(h=i,b=0<(v=o).length,y=0<h.length,r=function(e,t,n,r,o){var i,a,u,s=0,c="0",l=e&&[],f=[],d=Me,m=e||y&&De.find.TAG("*",o),g=Ye+=null==d?1:Math.random()||.1,p=m.length;for(o&&(Me=t!==Ve&&t);c!==p&&null!=(i=m[c]);c++){if(y&&i){for(a=0;u=h[a++];)if(u(i,t,n)){r.push(i);break}o&&(Ye=g)}b&&((i=!u&&i)&&s--,e&&l.push(i))}if(s+=c,b&&c!==s){for(a=0;u=v[a++];)u(l,f,t,n);if(e){if(0<s)for(;c--;)l[c]||f[c]||(f[c]=ot.call(r));f=Ut(f)}at.apply(r,f),o&&!e&&0<f.length&&1<s+v.length&&At.uniqueSort(r)}return o&&(Ye=g,Me=d),l},b?_t(r):r))).selector=e}return a},Le=At.select=function(e,t,n,r){var o,i,a,u,s,c="function"==typeof e&&e,l=!r&&Pe(e=c.selector||e);if(n=n||[],1===l.length){if(2<(i=l[0]=l[0].slice(0)).length&&"ID"===(a=i[0]).type&&_e.getById&&9===t.nodeType&&je&&De.relative[i[1].type]){if(!(t=(De.find.ID(a.matches[0].replace(kt,Tt),t)||[])[0]))return n;c&&(t=t.parentNode),e=e.slice(i.shift().value.length)}for(o=yt.needsContext.test(e)?0:i.length;o--&&(a=i[o],!De.relative[u=a.type]);)if((s=De.find[u])&&(r=s(a.matches[0].replace(kt,Tt),Et.test(i[0].type)&&It(t.parentNode)||t))){if(i.splice(o,1),!(e=r.length&&Mt(i)))return at.apply(n,r),n;break}}return(c||Ie(e,l))(r,t,!je,n,Et.test(e)&&It(t.parentNode)||t),n},_e.sortStable=Ke.split("").sort(et).join("")===Ke,_e.detectDuplicates=!!ze,Ue(),_e.sortDetached=!0;var jt=Array.isArray,qt=function(e,t,n){var r,o;if(!e)return 0;if(n=n||e,e.length!==undefined){for(r=0,o=e.length;r<o;r++)if(!1===t.call(n,e[r],r,e))return 0}else for(r in e)if(e.hasOwnProperty(r)&&!1===t.call(n,e[r],r,e))return 0;return 1},$t=function(e,t,n){var r,o;for(r=0,o=e.length;r<o;r++)if(t.call(n,e[r],r,e))return r;return-1},Wt={isArray:jt,toArray:function(e){var t,n,r=e;if(!jt(e))for(r=[],t=0,n=e.length;t<n;t++)r[t]=e[t];return r},each:qt,map:function(n,r){var o=[];return qt(n,function(e,t){o.push(r(e,t,n))}),o},filter:function(n,r){var o=[];return qt(n,function(e,t){r&&!r(e,t,n)||o.push(e)}),o},indexOf:function(e,t){var n,r;if(e)for(n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},reduce:function(e,t,n,r){var o=0;for(arguments.length<3&&(n=e[0]);o<e.length;o++)n=t.call(r,n,e[o],o);return n},findIndex:$t,find:function(e,t,n){var r=$t(e,t,n);return-1!==r?e[r]:undefined},last:function(e){return e[e.length-1]}},Kt=/^\s*|\s*$/g,Xt=function(e){return null===e||e===undefined?"":(""+e).replace(Kt,"")},Yt=function(e,t){return t?!("array"!==t||!Wt.isArray(e))||typeof e===t:e!==undefined},Gt=function(e,n,r,o){o=o||this,e&&(r&&(e=e[r]),Wt.each(e,function(e,t){if(!1===n.call(o,e,t,r))return!1;Gt(e,n,r,o)}))},Jt={trim:Xt,isArray:Wt.isArray,is:Yt,toArray:Wt.toArray,makeMap:function(e,t,n){var r;for(t=t||",","string"==typeof(e=e||[])&&(e=e.split(t)),n=n||{},r=e.length;r--;)n[e[r]]={};return n},each:Wt.each,map:Wt.map,grep:Wt.filter,inArray:Wt.indexOf,hasOwn:function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},extend:function(e,t){for(var n,r,o,i=[],a=2;a<arguments.length;a++)i[a-2]=arguments[a];var u,s=arguments;for(n=1,r=s.length;n<r;n++)for(o in t=s[n])t.hasOwnProperty(o)&&(u=t[o])!==undefined&&(e[o]=u);return e},create:function(e,t,n){var r,o,i,a,u,s=this,c=0;if(e=/^((static) )?([\w.]+)(:([\w.]+))?/.exec(e),i=e[3].match(/(^|\.)(\w+)$/i)[2],!(o=s.createNS(e[3].replace(/\.\w+$/,""),n))[i]){if("static"===e[2])return o[i]=t,void(this.onCreate&&this.onCreate(e[2],e[3],o[i]));t[i]||(t[i]=function(){},c=1),o[i]=t[i],s.extend(o[i].prototype,t),e[5]&&(r=s.resolve(e[5]).prototype,a=e[5].match(/\.(\w+)$/i)[1],u=o[i],o[i]=c?function(){return r[a].apply(this,arguments)}:function(){return this.parent=r[a],u.apply(this,arguments)},o[i].prototype[i]=o[i],s.each(r,function(e,t){o[i].prototype[t]=r[t]}),s.each(t,function(e,t){r[t]?o[i].prototype[t]=function(){return this.parent=r[t],e.apply(this,arguments)}:t!==i&&(o[i].prototype[t]=e)})),s.each(t["static"],function(e,t){o[i][t]=e})}},walk:Gt,createNS:function(e,t){var n,r;for(t=t||H.window,e=e.split("."),n=0;n<e.length;n++)t[r=e[n]]||(t[r]={}),t=t[r];return t},resolve:function(e,t){var n,r;for(t=t||H.window,n=0,r=(e=e.split(".")).length;n<r&&(t=t[e[n]]);n++);return t},explode:function(e,t){return!e||Yt(e,"array")?e:Wt.map(e.split(t||","),Xt)},_addCacheSuffix:function(e){var t=ge.cacheSuffix;return t&&(e+=(-1===e.indexOf("?")?"?":"&")+t),e}},Qt=H.document,Zt=Array.prototype.push,en=Array.prototype.slice,tn=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,nn=Ae.Event,rn=Jt.makeMap("children,contents,next,prev"),on=function(e){return void 0!==e},an=function(e){return"string"==typeof e},un=function(e,t){var n,r,o;for(o=(t=t||Qt).createElement("div"),n=t.createDocumentFragment(),o.innerHTML=e;r=o.firstChild;)n.appendChild(r);return n},sn=function(e,t,n,r){var o;if(an(t))t=un(t,wn(e[0]));else if(t.length&&!t.nodeType){if(t=vn.makeArray(t),r)for(o=t.length-1;0<=o;o--)sn(e,t[o],n,r);else for(o=0;o<t.length;o++)sn(e,t[o],n,r);return e}if(t.nodeType)for(o=e.length;o--;)n.call(e[o],t);return e},cn=function(e,t){return e&&t&&-1!==(" "+e.className+" ").indexOf(" "+t+" ")},ln=function(e,t,n){var r,o;return t=vn(t)[0],e.each(function(){var e=this;n&&r===e.parentNode||(r=e.parentNode,o=t.cloneNode(!1),e.parentNode.insertBefore(o,e)),o.appendChild(e)}),e},fn=Jt.makeMap("fillOpacity fontWeight lineHeight opacity orphans widows zIndex zoom"," "),dn=Jt.makeMap("checked compact declare defer disabled ismap multiple nohref noshade nowrap readonly selected"," "),mn={"for":"htmlFor","class":"className",readonly:"readOnly"},gn={"float":"cssFloat"},pn={},hn={},vn=function(e,t){return new vn.fn.init(e,t)},bn=/^\s*|\s*$/g,yn=function(e){return null===e||e===undefined?"":(""+e).replace(bn,"")},Cn=function(e,t){var n,r,o,i;if(e)if((n=e.length)===undefined){for(r in e)if(e.hasOwnProperty(r)&&(i=e[r],!1===t.call(i,r,i)))break}else for(o=0;o<n&&(i=e[o],!1!==t.call(i,o,i));o++);return e},xn=function(e,n){var r=[];return Cn(e,function(e,t){n(t,e)&&r.push(t)}),r},wn=function(e){return e?9===e.nodeType?e:e.ownerDocument:Qt};vn.fn=vn.prototype={constructor:vn,selector:"",context:null,length:0,init:function(e,t){var n,r,o=this;if(!e)return o;if(e.nodeType)return o.context=o[0]=e,o.length=1,o;if(t&&t.nodeType)o.context=t;else{if(t)return vn(e).attr(t);o.context=t=H.document}if(an(e)){if(!(n="<"===(o.selector=e).charAt(0)&&">"===e.charAt(e.length-1)&&3<=e.length?[null,e,null]:tn.exec(e)))return vn(t).find(e);if(n[1])for(r=un(e,wn(t)).firstChild;r;)Zt.call(o,r),r=r.nextSibling;else{if(!(r=wn(t).getElementById(n[2])))return o;if(r.id!==n[2])return o.find(e);o.length=1,o[0]=r}}else this.add(e,!1);return o},toArray:function(){return Jt.toArray(this)},add:function(e,t){var n,r,o=this;if(an(e))return o.add(vn(e));if(!1!==t)for(n=vn.unique(o.toArray().concat(vn.makeArray(e))),o.length=n.length,r=0;r<n.length;r++)o[r]=n[r];else Zt.apply(o,vn.makeArray(e));return o},attr:function(t,n){var e,r=this;if("object"==typeof t)Cn(t,function(e,t){r.attr(e,t)});else{if(!on(n)){if(r[0]&&1===r[0].nodeType){if((e=pn[t])&&e.get)return e.get(r[0],t);if(dn[t])return r.prop(t)?t:undefined;null===(n=r[0].getAttribute(t,2))&&(n=undefined)}return n}this.each(function(){var e;if(1===this.nodeType){if((e=pn[t])&&e.set)return void e.set(this,n);null===n?this.removeAttribute(t,2):this.setAttribute(t,n,2)}})}return r},removeAttr:function(e){return this.attr(e,null)},prop:function(e,t){var n=this;if("object"==typeof(e=mn[e]||e))Cn(e,function(e,t){n.prop(e,t)});else{if(!on(t))return n[0]&&n[0].nodeType&&e in n[0]?n[0][e]:t;this.each(function(){1===this.nodeType&&(this[e]=t)})}return n},css:function(n,r){var e,o,i=this,t=function(e){return e.replace(/-(\D)/g,function(e,t){return t.toUpperCase()})},a=function(e){return e.replace(/[A-Z]/g,function(e){return"-"+e})};if("object"==typeof n)Cn(n,function(e,t){i.css(e,t)});else if(on(r))n=t(n),"number"!=typeof r||fn[n]||(r=r.toString()+"px"),i.each(function(){var e=this.style;if((o=hn[n])&&o.set)o.set(this,r);else{try{this.style[gn[n]||n]=r}catch(t){}null!==r&&""!==r||(e.removeProperty?e.removeProperty(a(n)):e.removeAttribute(n))}});else{if(e=i[0],(o=hn[n])&&o.get)return o.get(e);if(!e.ownerDocument.defaultView)return e.currentStyle?e.currentStyle[t(n)]:"";try{return e.ownerDocument.defaultView.getComputedStyle(e,null).getPropertyValue(a(n))}catch(u){return undefined}}return i},remove:function(){for(var e,t=this.length;t--;)e=this[t],nn.clean(e),e.parentNode&&e.parentNode.removeChild(e);return this},empty:function(){for(var e,t=this.length;t--;)for(e=this[t];e.firstChild;)e.removeChild(e.firstChild);return this},html:function(e){var t,n=this;if(on(e)){t=n.length;try{for(;t--;)n[t].innerHTML=e}catch(r){vn(n[t]).empty().append(e)}return n}return n[0]?n[0].innerHTML:""},text:function(e){var t,n=this;if(on(e)){for(t=n.length;t--;)"innerText"in n[t]?n[t].innerText=e:n[0].textContent=e;return n}return n[0]?n[0].innerText||n[0].textContent:""},append:function(){return sn(this,arguments,function(e){(1===this.nodeType||this.host&&1===this.host.nodeType)&&this.appendChild(e)})},prepend:function(){return sn(this,arguments,function(e){(1===this.nodeType||this.host&&1===this.host.nodeType)&&this.insertBefore(e,this.firstChild)},!0)},before:function(){return this[0]&&this[0].parentNode?sn(this,arguments,function(e){this.parentNode.insertBefore(e,this)}):this},after:function(){return this[0]&&this[0].parentNode?sn(this,arguments,function(e){this.parentNode.insertBefore(e,this.nextSibling)},!0):this},appendTo:function(e){return vn(e).append(this),this},prependTo:function(e){return vn(e).prepend(this),this},replaceWith:function(e){return this.before(e).remove()},wrap:function(e){return ln(this,e)},wrapAll:function(e){return ln(this,e,!0)},wrapInner:function(e){return this.each(function(){vn(this).contents().wrapAll(e)}),this},unwrap:function(){return this.parent().each(function(){vn(this).replaceWith(this.childNodes)})},clone:function(){var e=[];return this.each(function(){e.push(this.cloneNode(!0))}),vn(e)},addClass:function(e){return this.toggleClass(e,!0)},removeClass:function(e){return this.toggleClass(e,!1)},toggleClass:function(o,i){var e=this;return"string"!=typeof o||(-1!==o.indexOf(" ")?Cn(o.split(" "),function(){e.toggleClass(this,i)}):e.each(function(e,t){var n,r;(r=cn(t,o))!==i&&(n=t.className,r?t.className=yn((" "+n+" ").replace(" "+o+" "," ")):t.className+=n?" "+o:o)})),e},hasClass:function(e){return cn(this[0],e)},each:function(e){return Cn(this,e)},on:function(e,t){return this.each(function(){nn.bind(this,e,t)})},off:function(e,t){return this.each(function(){nn.unbind(this,e,t)})},trigger:function(e){return this.each(function(){"object"==typeof e?nn.fire(this,e.type,e):nn.fire(this,e)})},show:function(){return this.css("display","")},hide:function(){return this.css("display","none")},slice:function(){return new vn(en.apply(this,arguments))},eq:function(e){return-1===e?this.slice(e):this.slice(e,+e+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},find:function(e){var t,n,r=[];for(t=0,n=this.length;t<n;t++)vn.find(e,this[t],r);return vn(r)},filter:function(n){return vn("function"==typeof n?xn(this.toArray(),function(e,t){return n(t,e)}):vn.filter(n,this.toArray()))},closest:function(n){var r=[];return n instanceof vn&&(n=n[0]),this.each(function(e,t){for(;t;){if("string"==typeof n&&vn(t).is(n)){r.push(t);break}if(t===n){r.push(t);break}t=t.parentNode}}),vn(r)},offset:function(e){var t,n,r,o,i=0,a=0;return e?this.css(e):((t=this[0])&&(r=(n=t.ownerDocument).documentElement,t.getBoundingClientRect&&(i=(o=t.getBoundingClientRect()).left+(r.scrollLeft||n.body.scrollLeft)-r.clientLeft,a=o.top+(r.scrollTop||n.body.scrollTop)-r.clientTop)),{left:i,top:a})},push:Zt,sort:[].sort,splice:[].splice},Jt.extend(vn,{extend:Jt.extend,makeArray:function(e){return(t=e)&&t===t.window||e.nodeType?[e]:Jt.toArray(e);var t},inArray:function(e,t){var n;if(t.indexOf)return t.indexOf(e);for(n=t.length;n--;)if(t[n]===e)return n;return-1},isArray:Jt.isArray,each:Cn,trim:yn,grep:xn,find:At,expr:At.selectors,unique:At.uniqueSort,text:At.getText,contains:At.contains,filter:function(e,t,n){var r=t.length;for(n&&(e=":not("+e+")");r--;)1!==t[r].nodeType&&t.splice(r,1);return t=1===t.length?vn.find.matchesSelector(t[0],e)?[t[0]]:[]:vn.find.matches(e,t)}});var Nn=function(e,t,n){var r=[],o=e[t];for("string"!=typeof n&&n instanceof vn&&(n=n[0]);o&&9!==o.nodeType;){if(n!==undefined){if(o===n)break;if("string"==typeof n&&vn(o).is(n))break}1===o.nodeType&&r.push(o),o=o[t]}return r},En=function(e,t,n,r){var o=[];for(r instanceof vn&&(r=r[0]);e;e=e[t])if(!n||e.nodeType===n){if(r!==undefined){if(e===r)break;if("string"==typeof r&&vn(e).is(r))break}o.push(e)}return o},Sn=function(e,t,n){for(e=e[t];e;e=e[t])if(e.nodeType===n)return e;return null};Cn({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return Nn(e,"parentNode")},next:function(e){return Sn(e,"nextSibling",1)},prev:function(e){return Sn(e,"previousSibling",1)},children:function(e){return En(e.firstChild,"nextSibling",1)},contents:function(e){return Jt.toArray(("iframe"===e.nodeName?e.contentDocument||e.contentWindow.document:e).childNodes)}},function(e,r){vn.fn[e]=function(t){var n=[];return this.each(function(){var e=r.call(n,this,t,n);e&&(vn.isArray(e)?n.push.apply(n,e):n.push(e))}),1<this.length&&(rn[e]||(n=vn.unique(n)),0===e.indexOf("parents")&&(n=n.reverse())),n=vn(n),t?n.filter(t):n}}),Cn({parentsUntil:function(e,t){return Nn(e,"parentNode",t)},nextUntil:function(e,t){return En(e,"nextSibling",1,t).slice(1)},prevUntil:function(e,t){return En(e,"previousSibling",1,t).slice(1)}},function(r,o){vn.fn[r]=function(t,e){var n=[];return this.each(function(){var e=o.call(n,this,t,n);e&&(vn.isArray(e)?n.push.apply(n,e):n.push(e))}),1<this.length&&(n=vn.unique(n),0!==r.indexOf("parents")&&"prevUntil"!==r||(n=n.reverse())),n=vn(n),e?n.filter(e):n}}),vn.fn.is=function(e){return!!e&&0<this.filter(e).length},vn.fn.init.prototype=vn.fn,vn.overrideDefaults=function(n){var r,o=function(e,t){return r=r||n(),0===arguments.length&&(e=r.element),t||(t=r.context),new o.fn.init(e,t)};return vn.extend(o,this),o};var kn=function(n,r,e){Cn(e,function(e,t){n[e]=n[e]||{},n[e][r]=t})};ge.ie&&ge.ie<8&&(kn(pn,"get",{maxlength:function(e){var t=e.maxLength;return 2147483647===t?undefined:t},size:function(e){var t=e.size;return 20===t?undefined:t},"class":function(e){return e.className},style:function(e){var t=e.style.cssText;return 0===t.length?undefined:t}}),kn(pn,"set",{"class":function(e,t){e.className=t},style:function(e,t){e.style.cssText=t}})),ge.ie&&ge.ie<9&&(gn["float"]="styleFloat",kn(hn,"set",{opacity:function(e,t){var n=e.style;null===t||""===t?n.removeAttribute("filter"):(n.zoom=1,n.filter="alpha(opacity="+100*t+")")}})),vn.attrHooks=pn,vn.cssHooks=hn;var Tn,An,Rn,_n=function(e,t){var n=function(e,t){for(var n=0;n<e.length;n++){var r=e[n];if(r.test(t))return r}return undefined}(e,t);if(!n)return{major:0,minor:0};var r=function(e){return Number(t.replace(n,"$"+e))};return Bn(r(1),r(2))},Dn=function(){return Bn(0,0)},Bn=function(e,t){return{major:e,minor:t}},On={nu:Bn,detect:function(e,t){var n=String(t).toLowerCase();return 0===e.length?Dn():_n(e,n)},unknown:Dn},Pn="Firefox",In=function(e,t){return function(){return t===e}},Ln=function(e){var t=e.current;return{current:t,version:e.version,isEdge:In("Edge",t),isChrome:In("Chrome",t),isIE:In("IE",t),isOpera:In("Opera",t),isFirefox:In(Pn,t),isSafari:In("Safari",t)}},Mn={unknown:function(){return Ln({current:undefined,version:On.unknown()})},nu:Ln,edge:q("Edge"),chrome:q("Chrome"),ie:q("IE"),opera:q("Opera"),firefox:q(Pn),safari:q("Safari")},Fn="Windows",zn="Android",Un="Solaris",Vn="FreeBSD",Hn=function(e,t){return function(){return t===e}},jn=function(e){var t=e.current;return{current:t,version:e.version,isWindows:Hn(Fn,t),isiOS:Hn("iOS",t),isAndroid:Hn(zn,t),isOSX:Hn("OSX",t),isLinux:Hn("Linux",t),isSolaris:Hn(Un,t),isFreeBSD:Hn(Vn,t)}},qn={unknown:function(){return jn({current:undefined,version:On.unknown()})},nu:jn,windows:q(Fn),ios:q("iOS"),android:q(zn),linux:q("Linux"),osx:q("OSX"),solaris:q(Un),freebsd:q(Vn)},$n=function(e,t){var n=String(t).toLowerCase();return Y(e,function(e){return e.search(n)})},Wn=function(e,n){return $n(e,n).map(function(e){var t=On.detect(e.versionRegexes,n);return{current:e.name,version:t}})},Kn=function(e,n){return $n(e,n).map(function(e){var t=On.detect(e.versionRegexes,n);return{current:e.name,version:t}})},Xn=function(e,t){return-1!==e.indexOf(t)},Yn=function(e){return e.replace(/^\s+|\s+$/g,"")},Gn=function(e){return e.replace(/\s+$/g,"")},Jn=/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,Qn=function(t){return function(e){return Xn(e,t)}},Zn=[{name:"Edge",versionRegexes:[/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],search:function(e){return Xn(e,"edge/")&&Xn(e,"chrome")&&Xn(e,"safari")&&Xn(e,"applewebkit")}},{name:"Chrome",versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/,Jn],search:function(e){return Xn(e,"chrome")&&!Xn(e,"chromeframe")}},{name:"IE",versionRegexes:[/.*?msie\ ?([0-9]+)\.([0-9]+).*/,/.*?rv:([0-9]+)\.([0-9]+).*/],search:function(e){return Xn(e,"msie")||Xn(e,"trident")}},{name:"Opera",versionRegexes:[Jn,/.*?opera\/([0-9]+)\.([0-9]+).*/],search:Qn("opera")},{name:"Firefox",versionRegexes:[/.*?firefox\/\ ?([0-9]+)\.([0-9]+).*/],search:Qn("firefox")},{name:"Safari",versionRegexes:[Jn,/.*?cpu os ([0-9]+)_([0-9]+).*/],search:function(e){return(Xn(e,"safari")||Xn(e,"mobile/"))&&Xn(e,"applewebkit")}}],er=[{name:"Windows",search:Qn("win"),versionRegexes:[/.*?windows\ nt\ ?([0-9]+)\.([0-9]+).*/]},{name:"iOS",search:function(e){return Xn(e,"iphone")||Xn(e,"ipad")},versionRegexes:[/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,/.*cpu os ([0-9]+)_([0-9]+).*/,/.*cpu iphone os ([0-9]+)_([0-9]+).*/]},{name:"Android",search:Qn("android"),versionRegexes:[/.*?android\ ?([0-9]+)\.([0-9]+).*/]},{name:"OSX",search:Qn("os x"),versionRegexes:[/.*?os\ x\ ?([0-9]+)_([0-9]+).*/]},{name:"Linux",search:Qn("linux"),versionRegexes:[]},{name:"Solaris",search:Qn("sunos"),versionRegexes:[]},{name:"FreeBSD",search:Qn("freebsd"),versionRegexes:[]}],tr={browsers:q(Zn),oses:q(er)},nr=function(e){var t,n,r,o,i,a,u,s,c,l,f,d=tr.browsers(),m=tr.oses(),g=Wn(d,e).fold(Mn.unknown,Mn.nu),p=Kn(m,e).fold(qn.unknown,qn.nu);return{browser:g,os:p,deviceType:(n=g,r=e,o=(t=p).isiOS()&&!0===/ipad/i.test(r),i=t.isiOS()&&!o,a=t.isAndroid()&&3===t.version.major,u=t.isAndroid()&&4===t.version.major,s=o||a||u&&!0===/mobile/i.test(r),c=t.isiOS()||t.isAndroid(),l=c&&!s,f=n.isSafari()&&t.isiOS()&&!1===/safari/i.test(r),{isiPad:q(o),isiPhone:q(i),isTablet:q(s),isPhone:q(l),isTouch:q(c),isAndroid:t.isAndroid,isiOS:t.isiOS,isWebView:q(f)})}},rr={detect:(Tn=function(){var e=H.navigator.userAgent;return nr(e)},Rn=!1,function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return Rn||(Rn=!0,An=Tn.apply(null,e)),An})},or=function(e){if(null===e||e===undefined)throw new Error("Node cannot be null or undefined");return{dom:q(e)}},ir={fromHtml:function(e,t){var n=(t||H.document).createElement("div");if(n.innerHTML=e,!n.hasChildNodes()||1<n.childNodes.length)throw H.console.error("HTML does not have a single root node",e),new Error("HTML must have a single root node");return or(n.childNodes[0])},fromTag:function(e,t){var n=(t||H.document).createElement(e);return or(n)},fromText:function(e,t){var n=(t||H.document).createTextNode(e);return or(n)},fromDom:or,fromPoint:function(e,t,n){var r=e.dom();return A.from(r.elementFromPoint(t,n)).map(or)}},ar=(H.Node.ATTRIBUTE_NODE,H.Node.CDATA_SECTION_NODE,H.Node.COMMENT_NODE,H.Node.DOCUMENT_NODE),ur=(H.Node.DOCUMENT_TYPE_NODE,H.Node.DOCUMENT_FRAGMENT_NODE,H.Node.ELEMENT_NODE),sr=H.Node.TEXT_NODE,cr=(H.Node.PROCESSING_INSTRUCTION_NODE,H.Node.ENTITY_REFERENCE_NODE,H.Node.ENTITY_NODE,H.Node.NOTATION_NODE,function(e){return e.dom().nodeName.toLowerCase()}),lr=function(t){return function(e){return e.dom().nodeType===t}},fr=lr(ur),dr=lr(sr),mr=Object.keys,gr=Object.hasOwnProperty,pr=function(e,t){for(var n=mr(e),r=0,o=n.length;r<o;r++){var i=n[r];t(e[i],i,e)}},hr=function(r,o){var i={};return pr(r,function(e,t){var n=o(e,t,r);i[n.k]=n.v}),i},vr=function(e){return e.style!==undefined&&P(e.style.getPropertyValue)},br=function(e,t,n){if(!(R(n)||O(n)||I(n)))throw H.console.error("Invalid call to Attr.set. Key ",t,":: Value ",n,":: Element ",e),new Error("Attribute value was not simple");e.setAttribute(t,n+"")},yr=function(e,t,n){br(e.dom(),t,n)},Cr=function(e,t){var n=e.dom();pr(t,function(e,t){br(n,t,e)})},xr=function(e,t){var n=e.dom().getAttribute(t);return null===n?undefined:n},wr=function(e,t){e.dom().removeAttribute(t)},Nr=function(e,t){var n=e.dom();pr(t,function(e,t){!function(e,t,n){if(!R(n))throw H.console.error("Invalid call to CSS.set. Property ",t,":: Value ",n,":: Element ",e),new Error("CSS value must be a string: "+n);vr(e)&&e.style.setProperty(t,n)}(n,t,e)})},Er=function(e,t){var n,r,o=e.dom(),i=H.window.getComputedStyle(o).getPropertyValue(t),a=""!==i||(r=dr(n=e)?n.dom().parentNode:n.dom())!==undefined&&null!==r&&r.ownerDocument.body.contains(r)?i:Sr(o,t);return null===a?undefined:a},Sr=function(e,t){return vr(e)?e.style.getPropertyValue(t):""},kr=function(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e];return function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];if(t.length!==n.length)throw new Error('Wrong number of arguments to struct. Expected "['+t.length+']", got '+n.length+" arguments");var r={};return U(t,function(e,t){r[e]=q(n[t])}),r}},Tr=function(e,t){for(var n=[],r=function(e){return n.push(e),t(e)},o=t(e);(o=o.bind(r)).isSome(););return n},Ar=function(){return ue.getOrDie("Node")},Rr=function(e,t,n){return 0!=(e.compareDocumentPosition(t)&n)},_r=function(e,t){return Rr(e,t,Ar().DOCUMENT_POSITION_CONTAINED_BY)},Dr=ur,Br=ar,Or=function(e,t){var n=e.dom();if(n.nodeType!==Dr)return!1;if(n.matches!==undefined)return n.matches(t);if(n.msMatchesSelector!==undefined)return n.msMatchesSelector(t);if(n.webkitMatchesSelector!==undefined)return n.webkitMatchesSelector(t);if(n.mozMatchesSelector!==undefined)return n.mozMatchesSelector(t);throw new Error("Browser lacks native selectors")},Pr=function(e){return e.nodeType!==Dr&&e.nodeType!==Br||0===e.childElementCount},Ir=function(e,t){return e.dom()===t.dom()},Lr=rr.detect().browser.isIE()?function(e,t){return _r(e.dom(),t.dom())}:function(e,t){var n=e.dom(),r=t.dom();return n!==r&&n.contains(r)},Mr=function(e){return ir.fromDom(e.dom().ownerDocument)},Fr=function(e){var t=e.dom().ownerDocument.defaultView;return ir.fromDom(t)},zr=function(e){var t=e.dom();return A.from(t.parentNode).map(ir.fromDom)},Ur=function(e){var t=e.dom();return A.from(t.previousSibling).map(ir.fromDom)},Vr=function(e){var t=e.dom();return A.from(t.nextSibling).map(ir.fromDom)},Hr=function(e){return t=Tr(e,Ur),(n=L.call(t,0)).reverse(),n;var t,n},jr=function(e){return Tr(e,Vr)},qr=function(e){var t=e.dom();return W(t.childNodes,ir.fromDom)},$r=function(e,t){var n=e.dom().childNodes;return A.from(n[t]).map(ir.fromDom)},Wr=function(e){return $r(e,0)},Kr=function(e){return $r(e,e.dom().childNodes.length-1)},Xr=(kr("element","offset"),rr.detect().browser),Yr=function(e){return Y(e,fr)},Gr={getPos:function(e,t,n){var r,o,i,a=0,u=0,s=e.ownerDocument;if(n=n||e,t){if(n===e&&t.getBoundingClientRect&&"static"===Er(ir.fromDom(e),"position"))return{x:a=(o=t.getBoundingClientRect()).left+(s.documentElement.scrollLeft||e.scrollLeft)-s.documentElement.clientLeft,y:u=o.top+(s.documentElement.scrollTop||e.scrollTop)-s.documentElement.clientTop};for(r=t;r&&r!==n&&r.nodeType;)a+=r.offsetLeft||0,u+=r.offsetTop||0,r=r.offsetParent;for(r=t.parentNode;r&&r!==n&&r.nodeType;)a-=r.scrollLeft||0,u-=r.scrollTop||0,r=r.parentNode;u+=(i=ir.fromDom(t),Xr.isFirefox()&&"table"===cr(i)?Yr(qr(i)).filter(function(e){return"caption"===cr(e)}).bind(function(o){return Yr(jr(o)).map(function(e){var t=e.dom().offsetTop,n=o.dom().offsetTop,r=o.dom().offsetHeight;return t<=n?-r:0})}).getOr(0):0)}return{x:a,y:u}}},Jr=function(e){var n=A.none(),t=[],r=function(e){o()?a(e):t.push(e)},o=function(){return n.isSome()},i=function(e){U(e,a)},a=function(t){n.each(function(e){H.setTimeout(function(){t(e)},0)})};return e(function(e){n=A.some(e),i(t),t=[]}),{get:r,map:function(n){return Jr(function(t){r(function(e){t(n(e))})})},isReady:o}},Qr={nu:Jr,pure:function(t){return Jr(function(e){e(t)})}},Zr=function(t){var e=function(e){var r;t((r=e,function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n=this;H.setTimeout(function(){r.apply(n,e)},0)}))},n=function(){return Qr.nu(e)};return{map:function(r){return Zr(function(n){e(function(e){var t=r(e);n(t)})})},bind:function(n){return Zr(function(t){e(function(e){n(e).get(t)})})},anonBind:function(n){return Zr(function(t){e(function(e){n.get(t)})})},toLazy:n,toCached:function(){var t=null;return Zr(function(e){null===t&&(t=n()),t.get(e)})},get:e}},eo={nu:Zr,pure:function(t){return Zr(function(e){e(t)})}},to=function(a,e){return e(function(r){var o=[],i=0;0===a.length?r([]):U(a,function(e,t){var n;e.get((n=t,function(e){o[n]=e,++i>=a.length&&r(o)}))})})},no=function(e){return to(e,eo.nu)},ro=function(n){return{is:function(e){return n===e},isValue:x,isError:C,getOr:q(n),getOrThunk:q(n),getOrDie:q(n),or:function(e){return ro(n)},orThunk:function(e){return ro(n)},fold:function(e,t){return t(n)},map:function(e){return ro(e(n))},mapError:function(e){return ro(n)},each:function(e){e(n)},bind:function(e){return e(n)},exists:function(e){return e(n)},forall:function(e){return e(n)},toOption:function(){return A.some(n)}}},oo=function(n){return{is:C,isValue:C,isError:x,getOr:$,getOrThunk:function(e){return e()},getOrDie:function(){return e=String(n),function(){throw new Error(e)}();var e},or:function(e){return e},orThunk:function(e){return e()},fold:function(e,t){return e(n)},map:function(e){return oo(n)},mapError:function(e){return oo(e(n))},each:o,bind:function(e){return oo(n)},exists:C,forall:x,toOption:A.none}},io={value:ro,error:oo,fromOption:function(e,t){return e.fold(function(){return oo(t)},ro)}};function ao(e,u){var t=e,n=function(e,t,n,r){var o,i;if(e){if(!r&&e[t])return e[t];if(e!==u){if(o=e[n])return o;for(i=e.parentNode;i&&i!==u;i=i.parentNode)if(o=i[n])return o}}};this.current=function(){return t},this.next=function(e){return t=n(t,"firstChild","nextSibling",e)},this.prev=function(e){return t=n(t,"lastChild","previousSibling",e)},this.prev2=function(e){return t=function(e,t,n,r){var o,i,a;if(e){if(o=e[n],u&&o===u)return;if(o){if(!r)for(a=o[t];a;a=a[t])if(!a[t])return a;return o}if((i=e.parentNode)&&i!==u)return i}}(t,"lastChild","previousSibling",e)}}var uo,so,co,lo=function(t){var n;return function(e){return(n=n||function(e,t){for(var n={},r=0,o=e.length;r<o;r++){var i=e[r];n[String(i)]=t(i,r)}return n}(t,q(!0))).hasOwnProperty(cr(e))}},fo=lo(["h1","h2","h3","h4","h5","h6"]),mo=lo(["article","aside","details","div","dt","figcaption","footer","form","fieldset","header","hgroup","html","main","nav","section","summary","body","p","dl","multicol","dd","figure","address","center","blockquote","h1","h2","h3","h4","h5","h6","listing","xmp","pre","plaintext","menu","dir","ul","ol","li","hr","table","tbody","thead","tfoot","th","tr","td","caption"]),go=function(e){return fr(e)&&!mo(e)},po=function(e){return fr(e)&&"br"===cr(e)},ho=lo(["h1","h2","h3","h4","h5","h6","p","div","address","pre","form","blockquote","center","dir","fieldset","header","footer","article","section","hgroup","aside","nav","figure"]),vo=lo(["ul","ol","dl"]),bo=lo(["li","dd","dt"]),yo=lo(["area","base","basefont","br","col","frame","hr","img","input","isindex","link","meta","param","embed","source","wbr","track"]),Co=lo(["thead","tbody","tfoot"]),xo=lo(["td","th"]),wo=lo(["pre","script","textarea","style"]),No=function(t){return function(e){return!!e&&e.nodeType===t}},Eo=No(1),So=function(e){var r=e.toLowerCase().split(" ");return function(e){var t,n;if(e&&e.nodeType)for(n=e.nodeName.toLowerCase(),t=0;t<r.length;t++)if(n===r[t])return!0;return!1}},ko=function(t){return function(e){if(Eo(e)){if(e.contentEditable===t)return!0;if(e.getAttribute("data-mce-contenteditable")===t)return!0}return!1}},To=No(3),Ao=No(8),Ro=No(9),_o=No(11),Do=So("br"),Bo=ko("true"),Oo=ko("false"),Po={isText:To,isElement:Eo,isComment:Ao,isDocument:Ro,isDocumentFragment:_o,isBr:Do,isContentEditableTrue:Bo,isContentEditableFalse:Oo,isRestrictedNode:function(e){return!!e&&!Object.getPrototypeOf(e)},matchNodeNames:So,hasPropValue:function(t,n){return function(e){return Eo(e)&&e[t]===n}},hasAttribute:function(t,e){return function(e){return Eo(e)&&e.hasAttribute(t)}},hasAttributeValue:function(t,n){return function(e){return Eo(e)&&e.getAttribute(t)===n}},matchStyleValues:function(r,e){var o=e.toLowerCase().split(" ");return function(e){var t;if(Eo(e))for(t=0;t<o.length;t++){var n=e.ownerDocument.defaultView.getComputedStyle(e,null);if((n?n.getPropertyValue(r):null)===o[t])return!0}return!1}},isBogus:function(e){return Eo(e)&&e.hasAttribute("data-mce-bogus")},isBogusAll:function(e){return Eo(e)&&"all"===e.getAttribute("data-mce-bogus")},isTable:function(e){return Eo(e)&&"TABLE"===e.tagName}},Io=function(e){return e&&"SPAN"===e.tagName&&"bookmark"===e.getAttribute("data-mce-type")},Lo=function(e,t){var n,r=t.childNodes;if(!Po.isElement(t)||!Io(t)){for(n=r.length-1;0<=n;n--)Lo(e,r[n]);if(!1===Po.isDocument(t)){if(Po.isText(t)&&0<t.nodeValue.length){var o=Jt.trim(t.nodeValue).length;if(e.isBlock(t.parentNode)||0<o)return;if(0===o&&(a=(i=t).previousSibling&&"SPAN"===i.previousSibling.nodeName,u=i.nextSibling&&"SPAN"===i.nextSibling.nodeName,a&&u))return}else if(Po.isElement(t)&&(1===(r=t.childNodes).length&&Io(r[0])&&t.parentNode.insertBefore(r[0],t),r.length||yo(ir.fromDom(t))))return;e.remove(t)}var i,a,u;return t}},Mo={trimNode:Lo},Fo=Jt.makeMap,zo=/[&<>\"\u0060\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,Uo=/[<>&\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,Vo=/[<>&\"\']/g,Ho=/&#([a-z0-9]+);?|&([a-z0-9]+);/gi,jo={128:"\u20ac",130:"\u201a",131:"\u0192",132:"\u201e",133:"\u2026",134:"\u2020",135:"\u2021",136:"\u02c6",137:"\u2030",138:"\u0160",139:"\u2039",140:"\u0152",142:"\u017d",145:"\u2018",146:"\u2019",147:"\u201c",148:"\u201d",149:"\u2022",150:"\u2013",151:"\u2014",152:"\u02dc",153:"\u2122",154:"\u0161",155:"\u203a",156:"\u0153",158:"\u017e",159:"\u0178"};so={'"':"&quot;","'":"&#39;","<":"&lt;",">":"&gt;","&":"&amp;","`":"&#96;"},co={"&lt;":"<","&gt;":">","&amp;":"&","&quot;":'"',"&apos;":"'"};var qo=function(e,t){var n,r,o,i={};if(e){for(e=e.split(","),t=t||10,n=0;n<e.length;n+=2)r=String.fromCharCode(parseInt(e[n],t)),so[r]||(o="&"+e[n+1]+";",i[r]=o,i[o]=r);return i}};uo=qo("50,nbsp,51,iexcl,52,cent,53,pound,54,curren,55,yen,56,brvbar,57,sect,58,uml,59,copy,5a,ordf,5b,laquo,5c,not,5d,shy,5e,reg,5f,macr,5g,deg,5h,plusmn,5i,sup2,5j,sup3,5k,acute,5l,micro,5m,para,5n,middot,5o,cedil,5p,sup1,5q,ordm,5r,raquo,5s,frac14,5t,frac12,5u,frac34,5v,iquest,60,Agrave,61,Aacute,62,Acirc,63,Atilde,64,Auml,65,Aring,66,AElig,67,Ccedil,68,Egrave,69,Eacute,6a,Ecirc,6b,Euml,6c,Igrave,6d,Iacute,6e,Icirc,6f,Iuml,6g,ETH,6h,Ntilde,6i,Ograve,6j,Oacute,6k,Ocirc,6l,Otilde,6m,Ouml,6n,times,6o,Oslash,6p,Ugrave,6q,Uacute,6r,Ucirc,6s,Uuml,6t,Yacute,6u,THORN,6v,szlig,70,agrave,71,aacute,72,acirc,73,atilde,74,auml,75,aring,76,aelig,77,ccedil,78,egrave,79,eacute,7a,ecirc,7b,euml,7c,igrave,7d,iacute,7e,icirc,7f,iuml,7g,eth,7h,ntilde,7i,ograve,7j,oacute,7k,ocirc,7l,otilde,7m,ouml,7n,divide,7o,oslash,7p,ugrave,7q,uacute,7r,ucirc,7s,uuml,7t,yacute,7u,thorn,7v,yuml,ci,fnof,sh,Alpha,si,Beta,sj,Gamma,sk,Delta,sl,Epsilon,sm,Zeta,sn,Eta,so,Theta,sp,Iota,sq,Kappa,sr,Lambda,ss,Mu,st,Nu,su,Xi,sv,Omicron,t0,Pi,t1,Rho,t3,Sigma,t4,Tau,t5,Upsilon,t6,Phi,t7,Chi,t8,Psi,t9,Omega,th,alpha,ti,beta,tj,gamma,tk,delta,tl,epsilon,tm,zeta,tn,eta,to,theta,tp,iota,tq,kappa,tr,lambda,ts,mu,tt,nu,tu,xi,tv,omicron,u0,pi,u1,rho,u2,sigmaf,u3,sigma,u4,tau,u5,upsilon,u6,phi,u7,chi,u8,psi,u9,omega,uh,thetasym,ui,upsih,um,piv,812,bull,816,hellip,81i,prime,81j,Prime,81u,oline,824,frasl,88o,weierp,88h,image,88s,real,892,trade,89l,alefsym,8cg,larr,8ch,uarr,8ci,rarr,8cj,darr,8ck,harr,8dl,crarr,8eg,lArr,8eh,uArr,8ei,rArr,8ej,dArr,8ek,hArr,8g0,forall,8g2,part,8g3,exist,8g5,empty,8g7,nabla,8g8,isin,8g9,notin,8gb,ni,8gf,prod,8gh,sum,8gi,minus,8gn,lowast,8gq,radic,8gt,prop,8gu,infin,8h0,ang,8h7,and,8h8,or,8h9,cap,8ha,cup,8hb,int,8hk,there4,8hs,sim,8i5,cong,8i8,asymp,8j0,ne,8j1,equiv,8j4,le,8j5,ge,8k2,sub,8k3,sup,8k4,nsub,8k6,sube,8k7,supe,8kl,oplus,8kn,otimes,8l5,perp,8m5,sdot,8o8,lceil,8o9,rceil,8oa,lfloor,8ob,rfloor,8p9,lang,8pa,rang,9ea,loz,9j0,spades,9j3,clubs,9j5,hearts,9j6,diams,ai,OElig,aj,oelig,b0,Scaron,b1,scaron,bo,Yuml,m6,circ,ms,tilde,802,ensp,803,emsp,809,thinsp,80c,zwnj,80d,zwj,80e,lrm,80f,rlm,80j,ndash,80k,mdash,80o,lsquo,80p,rsquo,80q,sbquo,80s,ldquo,80t,rdquo,80u,bdquo,810,dagger,811,Dagger,81g,permil,81p,lsaquo,81q,rsaquo,85c,euro",32);var $o=function(e,t){return e.replace(t?zo:Uo,function(e){return so[e]||e})},Wo=function(e,t){return e.replace(t?zo:Uo,function(e){return 1<e.length?"&#"+(1024*(e.charCodeAt(0)-55296)+(e.charCodeAt(1)-56320)+65536)+";":so[e]||"&#"+e.charCodeAt(0)+";"})},Ko=function(e,t,n){return n=n||uo,e.replace(t?zo:Uo,function(e){return so[e]||n[e]||e})},Xo={encodeRaw:$o,encodeAllRaw:function(e){return(""+e).replace(Vo,function(e){return so[e]||e})},encodeNumeric:Wo,encodeNamed:Ko,getEncodeFunc:function(e,t){var n=qo(t)||uo,r=Fo(e.replace(/\+/g,","));return r.named&&r.numeric?function(e,t){return e.replace(t?zo:Uo,function(e){return so[e]!==undefined?so[e]:n[e]!==undefined?n[e]:1<e.length?"&#"+(1024*(e.charCodeAt(0)-55296)+(e.charCodeAt(1)-56320)+65536)+";":"&#"+e.charCodeAt(0)+";"})}:r.named?t?function(e,t){return Ko(e,t,n)}:Ko:r.numeric?Wo:$o},decode:function(e){return e.replace(Ho,function(e,t){return t?65535<(t="x"===t.charAt(0).toLowerCase()?parseInt(t.substr(1),16):parseInt(t,10))?(t-=65536,String.fromCharCode(55296+(t>>10),56320+(1023&t))):jo[t]||String.fromCharCode(t):co[e]||uo[e]||(n=e,(r=ir.fromTag("div").dom()).innerHTML=n,r.textContent||r.innerText||n);var n,r})}},Yo={},Go={},Jo=Jt.makeMap,Qo=Jt.each,Zo=Jt.extend,ei=Jt.explode,ti=Jt.inArray,ni=function(e,t){return(e=Jt.trim(e))?e.split(t||" "):[]},ri=function(e){var u,t,n,r,o,i,s={},a=function(e,t,n){var r,o,i,a=function(e,t){var n,r,o={};for(n=0,r=e.length;n<r;n++)o[e[n]]=t||{};return o};for(t=t||"","string"==typeof(n=n||[])&&(n=ni(n)),r=(e=ni(e)).length;r--;)i={attributes:a(o=ni([u,t].join(" "))),attributesOrder:o,children:a(n,Go)},s[e[r]]=i},c=function(e,t){var n,r,o,i;for(n=(e=ni(e)).length,t=ni(t);n--;)for(r=s[e[n]],o=0,i=t.length;o<i;o++)r.attributes[t[o]]={},r.attributesOrder.push(t[o])};return Yo[e]?Yo[e]:(u="id accesskey class dir lang style tabindex title role",t="address blockquote div dl fieldset form h1 h2 h3 h4 h5 h6 hr menu ol p pre table ul",n="a abbr b bdo br button cite code del dfn em embed i iframe img input ins kbd label map noscript object q s samp script select small span strong sub sup textarea u var #text #comment","html4"!==e&&(u+=" contenteditable contextmenu draggable dropzone hidden spellcheck translate",t+=" article aside details dialog figure main header footer hgroup section nav",n+=" audio canvas command datalist mark meter output picture progress time wbr video ruby bdi keygen"),"html5-strict"!==e&&(u+=" xml:lang",n=[n,i="acronym applet basefont big font strike tt"].join(" "),Qo(ni(i),function(e){a(e,"",n)}),t=[t,o="center dir isindex noframes"].join(" "),r=[t,n].join(" "),Qo(ni(o),function(e){a(e,"",r)})),r=r||[t,n].join(" "),a("html","manifest","head body"),a("head","","base command link meta noscript script style title"),a("title hr noscript br"),a("base","href target"),a("link","href rel media hreflang type sizes hreflang"),a("meta","name http-equiv content charset"),a("style","media type scoped"),a("script","src async defer type charset"),a("body","onafterprint onbeforeprint onbeforeunload onblur onerror onfocus onhashchange onload onmessage onoffline ononline onpagehide onpageshow onpopstate onresize onscroll onstorage onunload",r),a("address dt dd div caption","",r),a("h1 h2 h3 h4 h5 h6 pre p abbr code var samp kbd sub sup i b u bdo span legend em strong small s cite dfn","",n),a("blockquote","cite",r),a("ol","reversed start type","li"),a("ul","","li"),a("li","value",r),a("dl","","dt dd"),a("a","href target rel media hreflang type",n),a("q","cite",n),a("ins del","cite datetime",r),a("img","src sizes srcset alt usemap ismap width height"),a("iframe","src name width height",r),a("embed","src type width height"),a("object","data type typemustmatch name usemap form width height",[r,"param"].join(" ")),a("param","name value"),a("map","name",[r,"area"].join(" ")),a("area","alt coords shape href target rel media hreflang type"),a("table","border","caption colgroup thead tfoot tbody tr"+("html4"===e?" col":"")),a("colgroup","span","col"),a("col","span"),a("tbody thead tfoot","","tr"),a("tr","","td th"),a("td","colspan rowspan headers",r),a("th","colspan rowspan headers scope abbr",r),a("form","accept-charset action autocomplete enctype method name novalidate target",r),a("fieldset","disabled form name",[r,"legend"].join(" ")),a("label","form for",n),a("input","accept alt autocomplete checked dirname disabled form formaction formenctype formmethod formnovalidate formtarget height list max maxlength min multiple name pattern readonly required size src step type value width"),a("button","disabled form formaction formenctype formmethod formnovalidate formtarget name type value","html4"===e?r:n),a("select","disabled form multiple name required size","option optgroup"),a("optgroup","disabled label","option"),a("option","disabled label selected value"),a("textarea","cols dirname disabled form maxlength name readonly required rows wrap"),a("menu","type label",[r,"li"].join(" ")),a("noscript","",r),"html4"!==e&&(a("wbr"),a("ruby","",[n,"rt rp"].join(" ")),a("figcaption","",r),a("mark rt rp summary bdi","",n),a("canvas","width height",r),a("video","src crossorigin poster preload autoplay mediagroup loop muted controls width height buffered",[r,"track source"].join(" ")),a("audio","src crossorigin preload autoplay mediagroup loop muted controls buffered volume",[r,"track source"].join(" ")),a("picture","","img source"),a("source","src srcset type media sizes"),a("track","kind src srclang label default"),a("datalist","",[n,"option"].join(" ")),a("article section nav aside main header footer","",r),a("hgroup","","h1 h2 h3 h4 h5 h6"),a("figure","",[r,"figcaption"].join(" ")),a("time","datetime",n),a("dialog","open",r),a("command","type label icon disabled checked radiogroup command"),a("output","for form name",n),a("progress","value max",n),a("meter","value min max low high optimum",n),a("details","open",[r,"summary"].join(" ")),a("keygen","autofocus challenge disabled form keytype name")),"html5-strict"!==e&&(c("script","language xml:space"),c("style","xml:space"),c("object","declare classid code codebase codetype archive standby align border hspace vspace"),c("embed","align name hspace vspace"),c("param","valuetype type"),c("a","charset name rev shape coords"),c("br","clear"),c("applet","codebase archive code object alt name width height align hspace vspace"),c("img","name longdesc align border hspace vspace"),c("iframe","longdesc frameborder marginwidth marginheight scrolling align"),c("font basefont","size color face"),c("input","usemap align"),c("select","onchange"),c("textarea"),c("h1 h2 h3 h4 h5 h6 div p legend caption","align"),c("ul","type compact"),c("li","type"),c("ol dl menu dir","compact"),c("pre","width xml:space"),c("hr","align noshade size width"),c("isindex","prompt"),c("table","summary width frame rules cellspacing cellpadding align bgcolor"),c("col","width align char charoff valign"),c("colgroup","width align char charoff valign"),c("thead","align char charoff valign"),c("tr","align char charoff valign bgcolor"),c("th","axis align char charoff valign nowrap bgcolor width height"),c("form","accept"),c("td","abbr axis scope align char charoff valign nowrap bgcolor width height"),c("tfoot","align char charoff valign"),c("tbody","align char charoff valign"),c("area","nohref"),c("body","background bgcolor text link vlink alink")),"html4"!==e&&(c("input button select textarea","autofocus"),c("input textarea","placeholder"),c("a","download"),c("link script img","crossorigin"),c("iframe","sandbox seamless allowfullscreen")),Qo(ni("a form meter progress dfn"),function(e){s[e]&&delete s[e].children[e]}),delete s.caption.children.table,delete s.script,Yo[e]=s)},oi=function(e,n){var r;return e&&(r={},"string"==typeof e&&(e={"*":e}),Qo(e,function(e,t){r[t]=r[t.toUpperCase()]="map"===n?Jo(e,/[, ]/):ei(e,/[, ]/)})),r};function ii(i){var e,t,n,r,o,a,u,s,c,l,f,d,m,N={},g={},E=[],p={},h={},v=function(e,t,n){var r=i[e];return r?r=Jo(r,/[, ]/,Jo(r.toUpperCase(),/[, ]/)):(r=Yo[e])||(r=Jo(t," ",Jo(t.toUpperCase()," ")),r=Zo(r,n),Yo[e]=r),r};n=ri((i=i||{}).schema),!1===i.verify_html&&(i.valid_elements="*[*]"),e=oi(i.valid_styles),t=oi(i.invalid_styles,"map"),s=oi(i.valid_classes,"map"),r=v("whitespace_elements","pre script noscript style textarea video audio iframe object code"),o=v("self_closing_elements","colgroup dd dt li option p td tfoot th thead tr"),a=v("short_ended_elements","area base basefont br col frame hr img input isindex link meta param embed source wbr track"),u=v("boolean_attributes","checked compact declare defer disabled ismap multiple nohref noresize noshade nowrap readonly selected autoplay loop controls"),l=v("non_empty_elements","td th iframe video audio object script pre code",a),f=v("move_caret_before_on_enter_elements","table",l),d=v("text_block_elements","h1 h2 h3 h4 h5 h6 p div address pre form blockquote center dir fieldset header footer article section hgroup aside main nav figure"),c=v("block_elements","hr table tbody thead tfoot th tr td li ol ul caption dl dt dd noscript menu isindex option datalist select optgroup figcaption details summary",d),m=v("text_inline_elements","span strong b em i font strike u var cite dfn code mark q sup sub samp"),Qo((i.special||"script noscript noframes noembed title style textarea xmp").split(" "),function(e){h[e]=new RegExp("</"+e+"[^>]*>","gi")});var S=function(e){return new RegExp("^"+e.replace(/([?+*])/g,".$1")+"$")},b=function(e){var t,n,r,o,i,a,u,s,c,l,f,d,m,g,p,h,v,b,y,C=/^([#+\-])?([^\[!\/]+)(?:\/([^\[!]+))?(?:(!?)\[([^\]]+)\])?$/,x=/^([!\-])?(\w+[\\:]:\w+|[^=:<]+)?(?:([=:<])(.*))?$/,w=/[*?+]/;if(e)for(e=ni(e,","),N["@"]&&(h=N["@"].attributes,v=N["@"].attributesOrder),t=0,n=e.length;t<n;t++)if(i=C.exec(e[t])){if(g=i[1],c=i[2],p=i[3],s=i[5],a={attributes:d={},attributesOrder:m=[]},"#"===g&&(a.paddEmpty=!0),"-"===g&&(a.removeEmpty=!0),"!"===i[4]&&(a.removeEmptyAttrs=!0),h){for(b in h)d[b]=h[b];m.push.apply(m,v)}if(s)for(r=0,o=(s=ni(s,"|")).length;r<o;r++)if(i=x.exec(s[r])){if(u={},f=i[1],l=i[2].replace(/[\\:]:/g,":"),g=i[3],y=i[4],"!"===f&&(a.attributesRequired=a.attributesRequired||[],a.attributesRequired.push(l),u.required=!0),"-"===f){delete d[l],m.splice(ti(m,l),1);continue}g&&("="===g&&(a.attributesDefault=a.attributesDefault||[],a.attributesDefault.push({name:l,value:y}),u.defaultValue=y),":"===g&&(a.attributesForced=a.attributesForced||[],a.attributesForced.push({name:l,value:y}),u.forcedValue=y),"<"===g&&(u.validValues=Jo(y,"?"))),w.test(l)?(a.attributePatterns=a.attributePatterns||[],u.pattern=S(l),a.attributePatterns.push(u)):(d[l]||m.push(l),d[l]=u)}h||"@"!==c||(h=d,v=m),p&&(a.outputName=c,N[p]=a),w.test(c)?(a.pattern=S(c),E.push(a)):N[c]=a}},y=function(e){N={},E=[],b(e),Qo(n,function(e,t){g[t]=e.children})},C=function(e){var a=/^(~)?(.+)$/;e&&(Yo.text_block_elements=Yo.block_elements=null,Qo(ni(e,","),function(e){var t=a.exec(e),n="~"===t[1],r=n?"span":"div",o=t[2];if(g[o]=g[r],p[o]=r,n||(c[o.toUpperCase()]={},c[o]={}),!N[o]){var i=N[r];delete(i=Zo({},i)).removeEmptyAttrs,delete i.removeEmpty,N[o]=i}Qo(g,function(e,t){e[r]&&(g[t]=e=Zo({},g[t]),e[o]=e[r])})}))},x=function(e){var o=/^([+\-]?)(\w+)\[([^\]]+)\]$/;Yo[i.schema]=null,e&&Qo(ni(e,","),function(e){var t,n,r=o.exec(e);r&&(n=r[1],t=n?g[r[2]]:g[r[2]]={"#comment":{}},t=g[r[2]],Qo(ni(r[3],"|"),function(e){"-"===n?delete t[e]:t[e]={}}))})},w=function(e){var t,n=N[e];if(n)return n;for(t=E.length;t--;)if((n=E[t]).pattern.test(e))return n};return i.valid_elements?y(i.valid_elements):(Qo(n,function(e,t){N[t]={attributes:e.attributes,attributesOrder:e.attributesOrder},g[t]=e.children}),"html5"!==i.schema&&Qo(ni("strong/b em/i"),function(e){e=ni(e,"/"),N[e[1]].outputName=e[0]}),Qo(ni("ol ul sub sup blockquote span font a table tbody tr strong em b i"),function(e){N[e]&&(N[e].removeEmpty=!0)}),Qo(ni("p h1 h2 h3 h4 h5 h6 th td pre div address caption li"),function(e){N[e].paddEmpty=!0}),Qo(ni("span"),function(e){N[e].removeEmptyAttrs=!0})),C(i.custom_elements),x(i.valid_children),b(i.extended_valid_elements),x("+ol[ul|ol],+ul[ul|ol]"),Qo({dd:"dl",dt:"dl",li:"ul ol",td:"tr",th:"tr",tr:"tbody thead tfoot",tbody:"table",thead:"table",tfoot:"table",legend:"fieldset",area:"map",param:"video audio object"},function(e,t){N[t]&&(N[t].parentsRequired=ni(e))}),i.invalid_elements&&Qo(ei(i.invalid_elements),function(e){N[e]&&delete N[e]}),w("span")||b("span[!data-mce-type|*]"),{children:g,elements:N,getValidStyles:function(){return e},getValidClasses:function(){return s},getBlockElements:function(){return c},getInvalidStyles:function(){return t},getShortEndedElements:function(){return a},getTextBlockElements:function(){return d},getTextInlineElements:function(){return m},getBoolAttrs:function(){return u},getElementRule:w,getSelfClosingElements:function(){return o},getNonEmptyElements:function(){return l},getMoveCaretBeforeOnEnterElements:function(){return f},getWhiteSpaceElements:function(){return r},getSpecialElements:function(){return h},isValidChild:function(e,t){var n=g[e.toLowerCase()];return!(!n||!n[t.toLowerCase()])},isValid:function(e,t){var n,r,o=w(e);if(o){if(!t)return!0;if(o.attributes[t])return!0;if(n=o.attributePatterns)for(r=n.length;r--;)if(n[r].pattern.test(e))return!0}return!1},getCustomElements:function(){return p},addValidElements:b,setValidElements:y,addCustomElements:C,addValidChildren:x}}var ai=function(e,t,n,r){var o=function(e){return 1<(e=parseInt(e,10).toString(16)).length?e:"0"+e};return"#"+o(t)+o(n)+o(r)};function ui(y,e){var C,t,c,l,x=/rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/gi,w=/(?:url(?:(?:\(\s*\"([^\"]+)\"\s*\))|(?:\(\s*\'([^\']+)\'\s*\))|(?:\(\s*([^)\s]+)\s*\))))|(?:\'([^\']+)\')|(?:\"([^\"]+)\")/gi,N=/\s*([^:]+):\s*([^;]+);?/g,E=/\s+$/,S={},k="\ufeff";for(y=y||{},e&&(c=e.getValidStyles(),l=e.getInvalidStyles()),t=("\\\" \\' \\; \\: ; : "+k).split(" "),C=0;C<t.length;C++)S[t[C]]=k+C,S[k+C]=t[C];return{toHex:function(e){return e.replace(x,ai)},parse:function(e){var t,n,r,o,i,a,u,s,c={},l=y.url_converter,f=y.url_converter_scope||this,d=function(e,t,n){var r,o,i,a;if((r=c[e+"-top"+t])&&(o=c[e+"-right"+t])&&(i=c[e+"-bottom"+t])&&(a=c[e+"-left"+t])){var u=[r,o,i,a];for(C=u.length-1;C--&&u[C]===u[C+1];);-1<C&&n||(c[e+t]=-1===C?u[0]:u.join(" "),delete c[e+"-top"+t],delete c[e+"-right"+t],delete c[e+"-bottom"+t],delete c[e+"-left"+t])}},m=function(e){var t,n=c[e];if(n){for(t=(n=n.split(" ")).length;t--;)if(n[t]!==n[0])return!1;return c[e]=n[0],!0}},g=function(e){return o=!0,S[e]},p=function(e,t){return o&&(e=e.replace(/\uFEFF[0-9]/g,function(e){return S[e]})),t||(e=e.replace(/\\([\'\";:])/g,"$1")),e},h=function(e){return String.fromCharCode(parseInt(e.slice(1),16))},v=function(e){return e.replace(/\\[0-9a-f]+/gi,h)},b=function(e,t,n,r,o,i){if(o=o||i)return"'"+(o=p(o)).replace(/\'/g,"\\'")+"'";if(t=p(t||n||r),!y.allow_script_urls){var a=t.replace(/[\s\r\n]+/g,"");if(/(java|vb)script:/i.test(a))return"";if(!y.allow_svg_data_urls&&/^data:image\/svg/i.test(a))return""}return l&&(t=l.call(f,t,"style")),"url('"+t.replace(/\'/g,"\\'")+"')"};if(e){for(e=(e=e.replace(/[\u0000-\u001F]/g,"")).replace(/\\[\"\';:\uFEFF]/g,g).replace(/\"[^\"]+\"|\'[^\']+\'/g,function(e){return e.replace(/[;:]/g,g)});t=N.exec(e);)if(N.lastIndex=t.index+t[0].length,n=t[1].replace(E,"").toLowerCase(),r=t[2].replace(E,""),n&&r){if(n=v(n),r=v(r),-1!==n.indexOf(k)||-1!==n.indexOf('"'))continue;if(!y.allow_script_urls&&("behavior"===n||/expression\s*\(|\/\*|\*\//.test(r)))continue;"font-weight"===n&&"700"===r?r="bold":"color"!==n&&"background-color"!==n||(r=r.toLowerCase()),r=(r=r.replace(x,ai)).replace(w,b),c[n]=o?p(r,!0):r}d("border","",!0),d("border","-width"),d("border","-color"),d("border","-style"),d("padding",""),d("margin",""),i="border",u="border-style",s="border-color",m(a="border-width")&&m(u)&&m(s)&&(c[i]=c[a]+" "+c[u]+" "+c[s],delete c[a],delete c[u],delete c[s]),"medium none"===c.border&&delete c.border,"none"===c["border-image"]&&delete c["border-image"]}return c},serialize:function(i,e){var t,n,r,o,a,u="",s=function(e){var t,n,r,o;if(t=c[e])for(n=0,r=t.length;n<r;n++)e=t[n],(o=i[e])&&(u+=(0<u.length?" ":"")+e+": "+o+";")};if(e&&c)s("*"),s(e);else for(t in i)!(n=i[t])||l&&(r=t,o=e,a=void 0,(a=l["*"])&&a[r]||(a=l[o])&&a[r])||(u+=(0<u.length?" ":"")+t+": "+n+";");return u}}}var si,ci=Jt.each,li=Jt.grep,fi=ge.ie,di=/^([a-z0-9],?)+$/i,mi=/^[ \t\r\n]*$/,gi=function(n,r,o){var e={},i=r.keep_values,t={set:function(e,t,n){r.url_converter&&(t=r.url_converter.call(r.url_converter_scope||o(),t,n,e[0])),e.attr("data-mce-"+n,t).attr(n,t)},get:function(e,t){return e.attr("data-mce-"+t)||e.attr(t)}};return e={style:{set:function(e,t){null===t||"object"!=typeof t?(i&&e.attr("data-mce-style",t),e.attr("style",t)):e.css(t)},get:function(e){var t=e.attr("data-mce-style")||e.attr("style");return t=n.serialize(n.parse(t),e[0].nodeName)}}},i&&(e.href=e.src=t),e},pi=function(e,t){var n=t.attr("style"),r=e.serialize(e.parse(n),t[0].nodeName);r||(r=null),t.attr("data-mce-style",r)},hi=function(e,t){var n,r,o=0;if(e)for(n=e.nodeType,e=e.previousSibling;e;e=e.previousSibling)r=e.nodeType,(!t||3!==r||r!==n&&e.nodeValue.length)&&(o++,n=r);return o};function vi(a,u){var s,c=this;void 0===u&&(u={});var r={},i=H.window,o={},t=0,e=function(m,g){void 0===g&&(g={});var p,h=0,v={};p=g.maxLoadTime||5e3;var b=function(e){m.getElementsByTagName("head")[0].appendChild(e)},n=function(e,t,n){var o,r,i,a,u=function(){for(var e=a.passed,t=e.length;t--;)e[t]();a.status=2,a.passed=[],a.failed=[]},s=function(){for(var e=a.failed,t=e.length;t--;)e[t]();a.status=3,a.passed=[],a.failed=[]},c=function(e,t){e()||((new Date).getTime()-i<p?ye.setTimeout(t):s())},l=function(){c(function(){for(var e,t,n=m.styleSheets,r=n.length;r--;)if((t=(e=n[r]).ownerNode?e.ownerNode:e.owningElement)&&t.id===o.id)return u(),!0},l)},f=function(){c(function(){try{var e=r.sheet.cssRules;return u(),!!e}catch(t){}},f)};if(e=Jt._addCacheSuffix(e),v[e]?a=v[e]:(a={passed:[],failed:[]},v[e]=a),t&&a.passed.push(t),n&&a.failed.push(n),1!==a.status)if(2!==a.status)if(3!==a.status){if(a.status=1,(o=m.createElement("link")).rel="stylesheet",o.type="text/css",o.id="u"+h++,o.async=!1,o.defer=!1,i=(new Date).getTime(),g.contentCssCors&&(o.crossOrigin="anonymous"),"onload"in o&&!((d=H.navigator.userAgent.match(/WebKit\/(\d*)/))&&parseInt(d[1],10)<536))o.onload=l,o.onerror=s;else{if(0<H.navigator.userAgent.indexOf("Firefox"))return(r=m.createElement("style")).textContent='@import "'+e+'"',f(),void b(r);l()}var d;b(o),o.href=e}else s();else u()},t=function(t){return eo.nu(function(e){n(t,j(e,q(io.value(t))),j(e,q(io.error(t))))})},o=function(e){return e.fold($,$)};return{load:n,loadAll:function(e,n,r){no(W(e,t)).get(function(e){var t=K(e,function(e){return e.isValue()});0<t.fail.length?r(t.fail.map(o)):n(t.pass.map(o))})}}}(a,{contentCssCors:u.contentCssCors}),l=[],f=u.schema?u.schema:ii({}),d=ui({url_converter:u.url_converter,url_converter_scope:u.url_converter_scope},u.schema),m=u.ownEvents?new Ae(u.proxy):Ae.Event,n=f.getBlockElements(),g=vn.overrideDefaults(function(){return{context:a,element:V.getRoot()}}),p=function(e){if(e&&a&&"string"==typeof e){var t=a.getElementById(e);return t&&t.id!==e?a.getElementsByName(e)[1]:t}return e},h=function(e){return"string"==typeof e&&(e=p(e)),g(e)},v=function(e,t,n){var r,o,i=h(e);return i.length&&(o=(r=s[t])&&r.get?r.get(i,t):i.attr(t)),void 0===o&&(o=n||""),o},b=function(e){var t=p(e);return t?t.attributes:[]},y=function(e,t,n){var r,o;""===n&&(n=null);var i=h(e);r=i.attr(t),i.length&&((o=s[t])&&o.set?o.set(i,n,t):i.attr(t,n),r!==n&&u.onSetAttrib&&u.onSetAttrib({attrElm:i,attrName:t,attrValue:n}))},C=function(){return u.root_element||a.body},x=function(e,t){return Gr.getPos(a.body,p(e),t)},w=function(e,t,n){var r=h(e);return n?r.css(t):("float"===(t=t.replace(/-(\D)/g,function(e,t){return t.toUpperCase()}))&&(t=ge.ie&&ge.ie<12?"styleFloat":"cssFloat"),r[0]&&r[0].style?r[0].style[t]:undefined)},N=function(e){var t,n;return e=p(e),t=w(e,"width"),n=w(e,"height"),-1===t.indexOf("px")&&(t=0),-1===n.indexOf("px")&&(n=0),{w:parseInt(t,10)||e.offsetWidth||e.clientWidth,h:parseInt(n,10)||e.offsetHeight||e.clientHeight}},E=function(e,t){var n;if(!e)return!1;if(!Array.isArray(e)){if("*"===t)return 1===e.nodeType;if(di.test(t)){var r=t.toLowerCase().split(/,/),o=e.nodeName.toLowerCase();for(n=r.length-1;0<=n;n--)if(r[n]===o)return!0;return!1}if(e.nodeType&&1!==e.nodeType)return!1}var i=Array.isArray(e)?e:[e];return 0<At(t,i[0].ownerDocument||i[0],null,i).length},S=function(e,t,n,r){var o,i=[],a=p(e);for(r=r===undefined,n=n||("BODY"!==C().nodeName?C().parentNode:null),Jt.is(t,"string")&&(t="*"===(o=t)?function(e){return 1===e.nodeType}:function(e){return E(e,o)});a&&a!==n&&a.nodeType&&9!==a.nodeType;){if(!t||"function"==typeof t&&t(a)){if(!r)return[a];i.push(a)}a=a.parentNode}return r?i:null},k=function(e,t,n){var r=t;if(e)for("string"==typeof t&&(r=function(e){return E(e,t)}),e=e[n];e;e=e[n])if("function"==typeof r&&r(e))return e;return null},T=function(e,n,r){var o,t="string"==typeof e?p(e):e;if(!t)return!1;if(Jt.isArray(t)&&(t.length||0===t.length))return o=[],ci(t,function(e,t){e&&("string"==typeof e&&(e=p(e)),o.push(n.call(r,e,t)))}),o;var i=r||c;return n.call(i,t)},A=function(e,t){h(e).each(function(e,n){ci(t,function(e,t){y(n,t,e)})})},R=function(e,r){var t=h(e);fi?t.each(function(e,t){if(!1!==t.canHaveHTML){for(;t.firstChild;)t.removeChild(t.firstChild);try{t.innerHTML="<br>"+r,t.removeChild(t.firstChild)}catch(n){vn("<div></div>").html("<br>"+r).contents().slice(1).appendTo(t)}return r}}):t.html(r)},_=function(e,n,r,o,i){return T(e,function(e){var t="string"==typeof n?a.createElement(n):n;return A(t,r),o&&("string"!=typeof o&&o.nodeType?t.appendChild(o):"string"==typeof o&&R(t,o)),i?t:e.appendChild(t)})},D=function(e,t,n){return _(a.createElement(e),e,t,n,!0)},B=Xo.decode,O=Xo.encodeAllRaw,P=function(e,t){var n=h(e);return t?n.each(function(){for(var e;e=this.firstChild;)3===e.nodeType&&0===e.data.length?this.removeChild(e):this.parentNode.insertBefore(e,this)}).remove():n.remove(),1<n.length?n.toArray():n[0]},I=function(e,t,n){h(e).toggleClass(t,n).each(function(){""===this.className&&vn(this).attr("class",null)})},L=function(t,e,n){return T(e,function(e){return Jt.is(e,"array")&&(t=t.cloneNode(!0)),n&&ci(li(e.childNodes),function(e){t.appendChild(e)}),e.parentNode.replaceChild(t,e)})},M=function(){return a.createRange()},F=function(e,t,n,r){if(Jt.isArray(e)){for(var o=e.length;o--;)e[o]=F(e[o],t,n,r);return e}return!u.collect||e!==a&&e!==i||l.push([e,t,n,r]),m.bind(e,t,n,r||V)},z=function(e,t,n){var r;if(Jt.isArray(e)){for(r=e.length;r--;)e[r]=z(e[r],t,n);return e}if(l&&(e===a||e===i))for(r=l.length;r--;){var o=l[r];e!==o[0]||t&&t!==o[1]||n&&n!==o[2]||m.unbind(o[0],o[1],o[2])}return m.unbind(e,t,n)},U=function(e){if(e&&Po.isElement(e)){var t=e.getAttribute("data-mce-contenteditable");return t&&"inherit"!==t?t:"inherit"!==e.contentEditable?e.contentEditable:null}return null},V={doc:a,settings:u,win:i,files:o,stdMode:!0,boxModel:!0,styleSheetLoader:e,boundEvents:l,styles:d,schema:f,events:m,isBlock:function(e){if("string"==typeof e)return!!n[e];if(e){var t=e.nodeType;if(t)return!(1!==t||!n[e.nodeName])}return!1},$:g,$$:h,root:null,clone:function(t,e){if(!fi||1!==t.nodeType||e)return t.cloneNode(e);if(!e){var n=a.createElement(t.nodeName);return ci(b(t),function(e){y(n,e.nodeName,v(t,e.nodeName))}),n}return null},getRoot:C,getViewPort:function(e){var t=e||i,n=t.document.documentElement;return{x:t.pageXOffset||n.scrollLeft,y:t.pageYOffset||n.scrollTop,w:t.innerWidth||n.clientWidth,h:t.innerHeight||n.clientHeight}},getRect:function(e){var t,n;return e=p(e),t=x(e),n=N(e),{x:t.x,y:t.y,w:n.w,h:n.h}},getSize:N,getParent:function(e,t,n){var r=S(e,t,n,!1);return r&&0<r.length?r[0]:null},getParents:S,get:p,getNext:function(e,t){return k(e,t,"nextSibling")},getPrev:function(e,t){return k(e,t,"previousSibling")},select:function(e,t){return At(e,p(t)||u.root_element||a,[])},is:E,add:_,create:D,createHTML:function(e,t,n){var r,o="";for(r in o+="<"+e,t)t.hasOwnProperty(r)&&null!==t[r]&&"undefined"!=typeof t[r]&&(o+=" "+r+'="'+O(t[r])+'"');return void 0!==n?o+">"+n+"</"+e+">":o+" />"},createFragment:function(e){var t,n=a.createElement("div"),r=a.createDocumentFragment();for(e&&(n.innerHTML=e);t=n.firstChild;)r.appendChild(t);return r},remove:P,setStyle:function(e,t,n){var r=h(e).css(t,n);u.update_styles&&pi(d,r)},getStyle:w,setStyles:function(e,t){var n=h(e).css(t);u.update_styles&&pi(d,n)},removeAllAttribs:function(e){return T(e,function(e){var t,n=e.attributes;for(t=n.length-1;0<=t;t--)e.removeAttributeNode(n.item(t))})},setAttrib:y,setAttribs:A,getAttrib:v,getPos:x,parseStyle:function(e){return d.parse(e)},serializeStyle:function(e,t){return d.serialize(e,t)},addStyle:function(e){var t,n;if(V!==vi.DOM&&a===H.document){if(r[e])return;r[e]=!0}(n=a.getElementById("mceDefaultStyles"))||((n=a.createElement("style")).id="mceDefaultStyles",n.type="text/css",(t=a.getElementsByTagName("head")[0]).firstChild?t.insertBefore(n,t.firstChild):t.appendChild(n)),n.styleSheet?n.styleSheet.cssText+=e:n.appendChild(a.createTextNode(e))},loadCSS:function(e){var n;V===vi.DOM||a!==H.document?(e||(e=""),n=a.getElementsByTagName("head")[0],ci(e.split(","),function(e){var t;e=Jt._addCacheSuffix(e),o[e]||(o[e]=!0,t=D("link",{rel:"stylesheet",href:e}),n.appendChild(t))})):vi.DOM.loadCSS(e)},addClass:function(e,t){h(e).addClass(t)},removeClass:function(e,t){I(e,t,!1)},hasClass:function(e,t){return h(e).hasClass(t)},toggleClass:I,show:function(e){h(e).show()},hide:function(e){h(e).hide()},isHidden:function(e){return"none"===h(e).css("display")},uniqueId:function(e){return(e||"mce_")+t++},setHTML:R,getOuterHTML:function(e){var t="string"==typeof e?p(e):e;return Po.isElement(t)?t.outerHTML:vn("<div></div>").append(vn(t).clone()).html()},setOuterHTML:function(e,t){h(e).each(function(){try{if("outerHTML"in this)return void(this.outerHTML=t)}catch(e){}P(vn(this).html(t),!0)})},decode:B,encode:O,insertAfter:function(e,t){var r=p(t);return T(e,function(e){var t,n;return t=r.parentNode,(n=r.nextSibling)?t.insertBefore(e,n):t.appendChild(e),e})},replace:L,rename:function(t,e){var n;return t.nodeName!==e.toUpperCase()&&(n=D(e),ci(b(t),function(e){y(n,e.nodeName,v(t,e.nodeName))}),L(n,t,!0)),n||t},findCommonAncestor:function(e,t){for(var n,r=e;r;){for(n=t;n&&r!==n;)n=n.parentNode;if(r===n)break;r=r.parentNode}return!r&&e.ownerDocument?e.ownerDocument.documentElement:r},toHex:function(e){return d.toHex(Jt.trim(e))},run:T,getAttribs:b,isEmpty:function(e,t){var n,r,o,i,a,u,s=0;if(e=e.firstChild){a=new ao(e,e.parentNode),t=t||(f?f.getNonEmptyElements():null),i=f?f.getWhiteSpaceElements():{};do{if(o=e.nodeType,Po.isElement(e)){var c=e.getAttribute("data-mce-bogus");if(c){e=a.next("all"===c);continue}if(u=e.nodeName.toLowerCase(),t&&t[u]){if("br"===u){s++,e=a.next();continue}return!1}for(n=(r=b(e)).length;n--;)if("name"===(u=r[n].nodeName)||"data-mce-bookmark"===u)return!1}if(8===o)return!1;if(3===o&&!mi.test(e.nodeValue))return!1;if(3===o&&e.parentNode&&i[e.parentNode.nodeName]&&mi.test(e.nodeValue))return!1;e=a.next()}while(e)}return s<=1},createRng:M,nodeIndex:hi,split:function(e,t,n){var r,o,i,a=M();if(e&&t)return a.setStart(e.parentNode,hi(e)),a.setEnd(t.parentNode,hi(t)),r=a.extractContents(),(a=M()).setStart(t.parentNode,hi(t)+1),a.setEnd(e.parentNode,hi(e)+1),o=a.extractContents(),(i=e.parentNode).insertBefore(Mo.trimNode(V,r),e),n?i.insertBefore(n,e):i.insertBefore(t,e),i.insertBefore(Mo.trimNode(V,o),e),P(e),n||t},bind:F,unbind:z,fire:function(e,t,n){return m.fire(e,t,n)},getContentEditable:U,getContentEditableParent:function(e){for(var t=C(),n=null;e&&e!==t&&null===(n=U(e));e=e.parentNode);return n},destroy:function(){if(l)for(var e=l.length;e--;){var t=l[e];m.unbind(t[0],t[1],t[2])}At.setDocument&&At.setDocument()},isChildOf:function(e,t){for(;e;){if(t===e)return!0;e=e.parentNode}return!1},dumpRng:function(e){return"startContainer: "+e.startContainer.nodeName+", startOffset: "+e.startOffset+", endContainer: "+e.endContainer.nodeName+", endOffset: "+e.endOffset}};return s=gi(d,u,function(){return V}),V}(si=vi||(vi={})).DOM=si(H.document),si.nodeIndex=hi;var bi=vi,yi=bi.DOM,Ci=Jt.each,xi=Jt.grep,wi=function(e){return"function"==typeof e},Ni=function(){var l={},o=[],i={},a=[],f=0;this.isDone=function(e){return 2===l[e]},this.markDone=function(e){l[e]=2},this.add=this.load=function(e,t,n,r){l[e]===undefined&&(o.push(e),l[e]=0),t&&(i[e]||(i[e]=[]),i[e].push({success:t,failure:r,scope:n||this}))},this.remove=function(e){delete l[e],delete i[e]},this.loadQueue=function(e,t,n){this.loadScripts(o,e,t,n)},this.loadScripts=function(n,e,t,r){var u,s=[],c=function(t,e){Ci(i[e],function(e){wi(e[t])&&e[t].call(e.scope)}),i[e]=undefined};a.push({success:e,failure:r,scope:t||this}),(u=function(){var e=xi(n);if(n.length=0,Ci(e,function(e){var t,n,r,o,i,a;2!==l[e]?3!==l[e]?1!==l[e]&&(l[e]=1,f++,t=e,n=function(){l[e]=2,f--,c("success",e),u()},r=function(){l[e]=3,f--,s.push(e),c("failure",e),u()},i=(a=yi).uniqueId(),(o=H.document.createElement("script")).id=i,o.type="text/javascript",o.src=Jt._addCacheSuffix(t),o.onload=function(){a.remove(i),o&&(o.onreadystatechange=o.onload=o=null),n()},o.onerror=function(){wi(r)?r():"undefined"!=typeof console&&console.log&&console.log("Failed to load script: "+t)},(H.document.getElementsByTagName("head")[0]||H.document.body).appendChild(o)):c("failure",e):c("success",e)}),!f){var t=a.slice(0);a.length=0,Ci(t,function(e){0===s.length?wi(e.success)&&e.success.call(e.scope):wi(e.failure)&&e.failure.call(e.scope,s)})}})()}};Ni.ScriptLoader=new Ni;var Ei,Si=Jt.each;function ki(){var r=this,o=[],a={},u={},i=[],s=function(e){var t;return u[e]&&(t=u[e].dependencies),t||[]},c=function(e,t){return"object"==typeof t?t:"string"==typeof e?{prefix:"",resource:t,suffix:""}:{prefix:e.prefix,resource:t,suffix:e.suffix}},l=function(e,n,t,r){var o=s(e);Si(o,function(e){var t=c(n,e);f(t.resource,t,undefined,undefined)}),t&&(r?t.call(r):t.call(Ni))},f=function(e,t,n,r,o){if(!a[e]){var i="string"==typeof t?t:t.prefix+t.resource+t.suffix;0!==i.indexOf("/")&&-1===i.indexOf("://")&&(i=ki.baseURL+"/"+i),a[e]=i.substring(0,i.lastIndexOf("/")),u[e]?l(e,t,n,r):Ni.ScriptLoader.add(i,function(){return l(e,t,n,r)},r,o)}};return{items:o,urls:a,lookup:u,_listeners:i,get:function(e){return u[e]?u[e].instance:undefined},dependencies:s,requireLangPack:function(e,t){var n=ki.language;if(n&&!1!==ki.languageLoad){if(t)if(-1!==(t=","+t+",").indexOf(","+n.substr(0,2)+","))n=n.substr(0,2);else if(-1===t.indexOf(","+n+","))return;Ni.ScriptLoader.add(a[e]+"/langs/"+n+".js")}},add:function(t,e,n){o.push(e),u[t]={instance:e,dependencies:n};var r=K(i,function(e){return e.name===t});return i=r.fail,Si(r.pass,function(e){e.callback()}),e},remove:function(e){delete a[e],delete u[e]},createUrl:c,addComponents:function(e,t){var n=r.urls[e];Si(t,function(e){Ni.ScriptLoader.add(n+"/"+e)})},load:f,waitFor:function(e,t){u.hasOwnProperty(e)?t():i.push({name:e,callback:t})}}}(Ei=ki||(ki={})).PluginManager=Ei(),Ei.ThemeManager=Ei();var Ti=function(t,n){zr(t).each(function(e){e.dom().insertBefore(n.dom(),t.dom())})},Ai=function(e,t){Vr(e).fold(function(){zr(e).each(function(e){_i(e,t)})},function(e){Ti(e,t)})},Ri=function(t,n){Wr(t).fold(function(){_i(t,n)},function(e){t.dom().insertBefore(n.dom(),e.dom())})},_i=function(e,t){e.dom().appendChild(t.dom())},Di=function(t,e){U(e,function(e){_i(t,e)})},Bi=function(e){e.dom().textContent="",U(qr(e),function(e){Oi(e)})},Oi=function(e){var t=e.dom();null!==t.parentNode&&t.parentNode.removeChild(t)},Pi=function(e){var t,n=qr(e);0<n.length&&(t=e,U(n,function(e){Ti(t,e)})),Oi(e)},Ii=function(n,r){var o=null;return{cancel:function(){null!==o&&(H.clearTimeout(o),o=null)},throttle:function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];null===o&&(o=H.setTimeout(function(){n.apply(null,e),o=null},r))}}},Li=function(e){var t=e,n=function(){return t};return{get:n,set:function(e){t=e},clone:function(){return Li(n())}}},Mi=function(e,t){var n=xr(e,t);return n===undefined||""===n?[]:n.split(" ")},Fi=function(e){return e.dom().classList!==undefined},zi=function(e,t){return o=t,i=Mi(n=e,r="class").concat([o]),yr(n,r,i.join(" ")),!0;var n,r,o,i},Ui=function(e,t){return o=t,0<(i=V(Mi(n=e,r="class"),function(e){return e!==o})).length?yr(n,r,i.join(" ")):wr(n,r),!1;var n,r,o,i},Vi=function(e,t){Fi(e)?e.dom().classList.add(t):zi(e,t)},Hi=function(e){0===(Fi(e)?e.dom().classList:Mi(e,"class")).length&&wr(e,"class")},ji=function(e,t){return Fi(e)&&e.dom().classList.contains(t)},qi=function(e,t){var n=[];return U(qr(e),function(e){t(e)&&(n=n.concat([e])),n=n.concat(qi(e,t))}),n},$i=function(e,t){return n=t,o=(r=e)===undefined?H.document:r.dom(),Pr(o)?[]:W(o.querySelectorAll(n),ir.fromDom);var n,r,o};function Wi(e,t,n,r,o){return e(n,r)?A.some(n):P(o)&&o(n)?A.none():t(n,r,o)}var Ki,Xi=function(e,t,n){for(var r=e.dom(),o=P(n)?n:q(!1);r.parentNode;){r=r.parentNode;var i=ir.fromDom(r);if(t(i))return A.some(i);if(o(i))break}return A.none()},Yi=function(e,t,n){return Wi(function(e){return t(e)},Xi,e,t,n)},Gi=function(e,t,n){return Xi(e,function(e){return Or(e,t)},n)},Ji=function(e,t){return n=t,o=(r=e)===undefined?H.document:r.dom(),Pr(o)?A.none():A.from(o.querySelector(n)).map(ir.fromDom);var n,r,o},Qi=function(e,t,n){return Wi(Or,Gi,e,t,n)},Zi=q("mce-annotation"),ea=q("data-mce-annotation"),ta=q("data-mce-annotation-uid"),na=function(r,e){var t=r.selection.getRng(),n=ir.fromDom(t.startContainer),o=ir.fromDom(r.getBody()),i=e.fold(function(){return"."+Zi()},function(e){return"["+ea()+'="'+e+'"]'}),a=$r(n,t.startOffset).getOr(n),u=Qi(a,i,function(e){return Ir(e,o)}),s=function(e,t){return n=t,(r=e.dom())&&r.hasAttribute&&r.hasAttribute(n)?A.some(xr(e,t)):A.none();var n,r};return u.bind(function(e){return s(e,""+ta()).bind(function(n){return s(e,""+ea()).map(function(e){var t=ra(r,n);return{uid:n,name:e,elements:t}})})})},ra=function(e,t){var n=ir.fromDom(e.getBody());return $i(n,"["+ta()+'="'+t+'"]')},oa=function(i,e){var n,r,o,a=Li({}),c=function(e,t){u(e,function(e){return t(e),e})},u=function(e,t){var n=a.get(),r=t(n.hasOwnProperty(e)?n[e]:{listeners:[],previous:Li(A.none())});n[e]=r,a.set(n)},t=(n=function(){var e,t,n,r=a.get(),o=(e=mr(r),(n=L.call(e,0)).sort(t),n);U(o,function(e){u(e,function(u){var s=u.previous.get();return na(i,A.some(e)).fold(function(){var t;s.isSome()&&(c(t=e,function(e){U(e.listeners,function(e){return e(!1,t)})}),u.previous.set(A.none()))},function(e){var t,n,r,o=e.uid,i=e.name,a=e.elements;s.is(o)||(n=o,r=a,c(t=i,function(e){U(e.listeners,function(e){return e(!0,t,{uid:n,nodes:W(r,function(e){return e.dom()})})})}),u.previous.set(A.some(o)))}),{previous:u.previous,listeners:u.listeners}})})},r=30,o=null,{cancel:function(){null!==o&&(H.clearTimeout(o),o=null)},throttle:function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];null!==o&&H.clearTimeout(o),o=H.setTimeout(function(){n.apply(null,e),o=null},r)}});return i.on("remove",function(){t.cancel()}),i.on("nodeChange",function(){t.throttle()}),{addListener:function(e,t){u(e,function(e){return{previous:e.previous,listeners:e.listeners.concat([t])}})}}},ia=function(e,n){e.on("init",function(){e.serializer.addNodeFilter("span",function(e){U(e,function(t){var e;(e=t,A.from(e.attributes.map[ea()]).bind(n.lookup)).each(function(e){!1===e.persistent&&t.unwrap()})})})})},aa=0,ua=function(e,t){return ir.fromDom(e.dom().cloneNode(t))},sa=function(e){return ua(e,!1)},ca=function(e){return ua(e,!0)},la=function(e,t){var n,r,o=Mr(e).dom(),i=ir.fromDom(o.createDocumentFragment()),a=(n=t,(r=(o||H.document).createElement("div")).innerHTML=n,qr(ir.fromDom(r)));Di(i,a),Bi(e),_i(e,i)},fa="\ufeff",da=function(e){return e===fa},ma=fa,ga=function(e){return e.replace(new RegExp(fa,"g"),"")},pa=Po.isElement,ha=Po.isText,va=function(e){return ha(e)&&(e=e.parentNode),pa(e)&&e.hasAttribute("data-mce-caret")},ba=function(e){return ha(e)&&da(e.data)},ya=function(e){return va(e)||ba(e)},Ca=function(e){return e.firstChild!==e.lastChild||!Po.isBr(e.firstChild)},xa=function(e){var t=e.container();return!(!e||!Po.isText(t))&&(t.data.charAt(e.offset())===ma||e.isAtStart()&&ba(t.previousSibling))},wa=function(e){var t=e.container();return!(!e||!Po.isText(t))&&(t.data.charAt(e.offset()-1)===ma||e.isAtEnd()&&ba(t.nextSibling))},Na=function(e,t,n){var r,o,i;return(r=t.ownerDocument.createElement(e)).setAttribute("data-mce-caret",n?"before":"after"),r.setAttribute("data-mce-bogus","all"),r.appendChild(((i=H.document.createElement("br")).setAttribute("data-mce-bogus","1"),i)),o=t.parentNode,n?o.insertBefore(r,t):t.nextSibling?o.insertBefore(r,t.nextSibling):o.appendChild(r),r},Ea=function(e){return ha(e)&&e.data[0]===ma},Sa=function(e){return ha(e)&&e.data[e.data.length-1]===ma},ka=function(e){return e&&e.hasAttribute("data-mce-caret")?(t=e.getElementsByTagName("br"),n=t[t.length-1],Po.isBogus(n)&&n.parentNode.removeChild(n),e.removeAttribute("data-mce-caret"),e.removeAttribute("data-mce-bogus"),e.removeAttribute("style"),e.removeAttribute("_moz_abspos"),e):null;var t,n},Ta=Po.isContentEditableTrue,Aa=Po.isContentEditableFalse,Ra=Po.isBr,_a=Po.isText,Da=Po.matchNodeNames("script style textarea"),Ba=Po.matchNodeNames("img input textarea hr iframe video audio object"),Oa=Po.matchNodeNames("table"),Pa=ya,Ia=function(e){return!Pa(e)&&(_a(e)?!Da(e.parentNode):Ba(e)||Ra(e)||Oa(e)||La(e))},La=function(e){return!1===(t=e,Po.isElement(t)&&"true"===t.getAttribute("unselectable"))&&Aa(e);var t},Ma=function(e,t){return Ia(e)&&function(e,t){for(e=e.parentNode;e&&e!==t;e=e.parentNode){if(La(e))return!1;if(Ta(e))return!0}return!0}(e,t)},Fa=Math.round,za=function(e){return e?{left:Fa(e.left),top:Fa(e.top),bottom:Fa(e.bottom),right:Fa(e.right),width:Fa(e.width),height:Fa(e.height)}:{left:0,top:0,bottom:0,right:0,width:0,height:0}},Ua=function(e,t){return e=za(e),t||(e.left=e.left+e.width),e.right=e.left,e.width=0,e},Va=function(e,t,n){return 0<=e&&e<=Math.min(t.height,n.height)/2},Ha=function(e,t){return e.bottom-e.height/2<t.top||!(e.top>t.bottom)&&Va(t.top-e.bottom,e,t)},ja=function(e,t){return e.top>t.bottom||!(e.bottom<t.top)&&Va(t.bottom-e.top,e,t)},qa=function(e,t,n){return t>=e.left&&t<=e.right&&n>=e.top&&n<=e.bottom},$a=function(e){var t=e.startContainer,n=e.startOffset;return t.hasChildNodes()&&e.endOffset===n+1?t.childNodes[n]:null},Wa=function(e,t){return 1===e.nodeType&&e.hasChildNodes()&&(t>=e.childNodes.length&&(t=e.childNodes.length-1),e=e.childNodes[t]),e},Ka=new RegExp("[\u0300-\u036f\u0483-\u0487\u0488-\u0489\u0591-\u05bd\u05bf\u05c1-\u05c2\u05c4-\u05c5\u05c7\u0610-\u061a\u064b-\u065f\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7-\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u08e3-\u0902\u093a\u093c\u0941-\u0948\u094d\u0951-\u0957\u0962-\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2-\u09e3\u0a01-\u0a02\u0a3c\u0a41-\u0a42\u0a47-\u0a48\u0a4b-\u0a4d\u0a51\u0a70-\u0a71\u0a75\u0a81-\u0a82\u0abc\u0ac1-\u0ac5\u0ac7-\u0ac8\u0acd\u0ae2-\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62-\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c00\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55-\u0c56\u0c62-\u0c63\u0c81\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc-\u0ccd\u0cd5-\u0cd6\u0ce2-\u0ce3\u0d01\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62-\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb-\u0ebc\u0ec8-\u0ecd\u0f18-\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86-\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039-\u103a\u103d-\u103e\u1058-\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085-\u1086\u108d\u109d\u135d-\u135f\u1712-\u1714\u1732-\u1734\u1752-\u1753\u1772-\u1773\u17b4-\u17b5\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927-\u1928\u1932\u1939-\u193b\u1a17-\u1a18\u1a1b\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1ab0-\u1abd\u1abe\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80-\u1b81\u1ba2-\u1ba5\u1ba8-\u1ba9\u1bab-\u1bad\u1be6\u1be8-\u1be9\u1bed\u1bef-\u1bf1\u1c2c-\u1c33\u1c36-\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1cf4\u1cf8-\u1cf9\u1dc0-\u1df5\u1dfc-\u1dff\u200c-\u200d\u20d0-\u20dc\u20dd-\u20e0\u20e1\u20e2-\u20e4\u20e5-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302d\u302e-\u302f\u3099-\u309a\ua66f\ua670-\ua672\ua674-\ua67d\ua69e-\ua69f\ua6f0-\ua6f1\ua802\ua806\ua80b\ua825-\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\ua9e5\uaa29-\uaa2e\uaa31-\uaa32\uaa35-\uaa36\uaa43\uaa4c\uaa7c\uaab0\uaab2-\uaab4\uaab7-\uaab8\uaabe-\uaabf\uaac1\uaaec-\uaaed\uaaf6\uabe5\uabe8\uabed\ufb1e\ufe00-\ufe0f\ufe20-\ufe2f\uff9e-\uff9f]"),Xa=function(e){return"string"==typeof e&&768<=e.charCodeAt(0)&&Ka.test(e)},Ya=function(e,t){for(var n=[],r=0;r<e.length;r++){var o=e[r];if(!o.isSome())return A.none();n.push(o.getOrDie())}return A.some(t.apply(null,n))},Ga=[].slice,Ja=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n=Ga.call(arguments);return function(e){for(var t=0;t<n.length;t++)if(!n[t](e))return!1;return!0}},Qa=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n=Ga.call(arguments);return function(e){for(var t=0;t<n.length;t++)if(n[t](e))return!0;return!1}},Za=Po.isElement,eu=Ia,tu=Po.matchStyleValues("display","block table"),nu=Po.matchStyleValues("float","left right"),ru=Ja(Za,eu,y(nu)),ou=y(Po.matchStyleValues("white-space","pre pre-line pre-wrap")),iu=Po.isText,au=Po.isBr,uu=bi.nodeIndex,su=Wa,cu=function(e){return"createRange"in e?e.createRange():bi.DOM.createRng()},lu=function(e){return e&&/[\r\n\t ]/.test(e)},fu=function(e){return!!e.setStart&&!!e.setEnd},du=function(e){var t,n=e.startContainer,r=e.startOffset;return!!(lu(e.toString())&&ou(n.parentNode)&&Po.isText(n)&&(t=n.data,lu(t[r-1])||lu(t[r+1])))},mu=function(e){return 0===e.left&&0===e.right&&0===e.top&&0===e.bottom},gu=function(e){var t,n,r,o,i,a,u,s;return t=0<(n=e.getClientRects()).length?za(n[0]):za(e.getBoundingClientRect()),!fu(e)&&au(e)&&mu(t)?(i=(r=e).ownerDocument,a=cu(i),u=i.createTextNode("\xa0"),(s=r.parentNode).insertBefore(u,r),a.setStart(u,0),a.setEnd(u,1),o=za(a.getBoundingClientRect()),s.removeChild(u),o):mu(t)&&fu(e)?function(e){var t=e.startContainer,n=e.endContainer,r=e.startOffset,o=e.endOffset;if(t===n&&Po.isText(n)&&0===r&&1===o){var i=e.cloneRange();return i.setEndAfter(n),gu(i)}return null}(e):t},pu=function(e,t){var n=Ua(e,t);return n.width=1,n.right=n.left+1,n},hu=function(e){var t,n,r=[],o=function(e){var t,n;0!==e.height&&(0<r.length&&(t=e,n=r[r.length-1],t.left===n.left&&t.top===n.top&&t.bottom===n.bottom&&t.right===n.right)||r.push(e))},i=function(e,t){var n=cu(e.ownerDocument);if(t<e.data.length){if(Xa(e.data[t]))return r;if(Xa(e.data[t-1])&&(n.setStart(e,t),n.setEnd(e,t+1),!du(n)))return o(pu(gu(n),!1)),r}0<t&&(n.setStart(e,t-1),n.setEnd(e,t),du(n)||o(pu(gu(n),!1))),t<e.data.length&&(n.setStart(e,t),n.setEnd(e,t+1),du(n)||o(pu(gu(n),!0)))};if(iu(e.container()))return i(e.container(),e.offset()),r;if(Za(e.container()))if(e.isAtEnd())n=su(e.container(),e.offset()),iu(n)&&i(n,n.data.length),ru(n)&&!au(n)&&o(pu(gu(n),!1));else{if(n=su(e.container(),e.offset()),iu(n)&&i(n,0),ru(n)&&e.isAtEnd())return o(pu(gu(n),!1)),r;t=su(e.container(),e.offset()-1),ru(t)&&!au(t)&&(tu(t)||tu(n)||!ru(n))&&o(pu(gu(t),!1)),ru(n)&&o(pu(gu(n),!0))}return r};function vu(t,n,e){var r=function(){return e||(e=hu(vu(t,n))),e};return{container:q(t),offset:q(n),toRange:function(){var e;return(e=cu(t.ownerDocument)).setStart(t,n),e.setEnd(t,n),e},getClientRects:r,isVisible:function(){return 0<r().length},isAtStart:function(){return iu(t),0===n},isAtEnd:function(){return iu(t)?n>=t.data.length:n>=t.childNodes.length},isEqual:function(e){return e&&t===e.container()&&n===e.offset()},getNode:function(e){return su(t,e?n-1:n)}}}(Ki=vu||(vu={})).fromRangeStart=function(e){return Ki(e.startContainer,e.startOffset)},Ki.fromRangeEnd=function(e){return Ki(e.endContainer,e.endOffset)},Ki.after=function(e){return Ki(e.parentNode,uu(e)+1)},Ki.before=function(e){return Ki(e.parentNode,uu(e))},Ki.isAbove=function(e,t){return Ya([ne(t.getClientRects()),re(e.getClientRects())],Ha).getOr(!1)},Ki.isBelow=function(e,t){return Ya([re(t.getClientRects()),ne(e.getClientRects())],ja).getOr(!1)},Ki.isAtStart=function(e){return!!e&&e.isAtStart()},Ki.isAtEnd=function(e){return!!e&&e.isAtEnd()},Ki.isTextPosition=function(e){return!!e&&Po.isText(e.container())},Ki.isElementPosition=function(e){return!1===Ki.isTextPosition(e)};var bu,yu,Cu=vu,xu=Po.isText,wu=Po.isBogus,Nu=bi.nodeIndex,Eu=function(e){var t=e.parentNode;return wu(t)?Eu(t):t},Su=function(e){return e?Wt.reduce(e.childNodes,function(e,t){return wu(t)&&"BR"!==t.nodeName?e=e.concat(Su(t)):e.push(t),e},[]):[]},ku=function(t){return function(e){return t===e}},Tu=function(e){var t,r,n,o;return(xu(e)?"text()":e.nodeName.toLowerCase())+"["+(r=Su(Eu(t=e)),n=Wt.findIndex(r,ku(t),t),r=r.slice(0,n+1),o=Wt.reduce(r,function(e,t,n){return xu(t)&&xu(r[n-1])&&e++,e},0),r=Wt.filter(r,Po.matchNodeNames(t.nodeName)),(n=Wt.findIndex(r,ku(t),t))-o)+"]"},Au=function(e,t){var n,r,o,i,a,u=[];return n=t.container(),r=t.offset(),xu(n)?o=function(e,t){for(;(e=e.previousSibling)&&xu(e);)t+=e.data.length;return t}(n,r):(r>=(i=n.childNodes).length?(o="after",r=i.length-1):o="before",n=i[r]),u.push(Tu(n)),a=function(e,t,n){var r=[];for(t=t.parentNode;!(t===e||n&&n(t));t=t.parentNode)r.push(t);return r}(e,n),a=Wt.filter(a,y(Po.isBogus)),(u=u.concat(Wt.map(a,function(e){return Tu(e)}))).reverse().join("/")+","+o},Ru=function(e,t){var n,r,o;return t?(t=(n=t.split(","))[0].split("/"),o=1<n.length?n[1]:"before",(r=Wt.reduce(t,function(e,t){return(t=/([\w\-\(\)]+)\[([0-9]+)\]/.exec(t))?("text()"===t[1]&&(t[1]="#text"),n=e,r=t[1],o=parseInt(t[2],10),i=Su(n),i=Wt.filter(i,function(e,t){return!xu(e)||!xu(i[t-1])}),(i=Wt.filter(i,Po.matchNodeNames(r)))[o]):null;var n,r,o,i},e))?xu(r)?function(e,t){for(var n,r=e,o=0;xu(r);){if(n=r.data.length,o<=t&&t<=o+n){e=r,t-=o;break}if(!xu(r.nextSibling)){e=r,t=n;break}o+=n,r=r.nextSibling}return xu(e)&&t>e.data.length&&(t=e.data.length),Cu(e,t)}(r,parseInt(o,10)):(o="after"===o?Nu(r)+1:Nu(r),Cu(r.parentNode,o)):null):null},_u=function(e,t){Po.isText(t)&&0===t.data.length&&e.remove(t)},Du=function(e,t,n){var r,o,i,a,u,s,c;Po.isDocumentFragment(n)?(i=e,a=t,u=n,s=A.from(u.firstChild),c=A.from(u.lastChild),a.insertNode(u),s.each(function(e){return _u(i,e.previousSibling)}),c.each(function(e){return _u(i,e.nextSibling)})):(r=e,o=n,t.insertNode(o),_u(r,o.previousSibling),_u(r,o.nextSibling))},Bu=Po.isContentEditableFalse,Ou=function(e,t,n,r,o){var i,a=r[o?"startContainer":"endContainer"],u=r[o?"startOffset":"endOffset"],s=[],c=0,l=e.getRoot();for(Po.isText(a)?s.push(n?function(e,t,n){var r,o;for(o=e(t.data.slice(0,n)).length,r=t.previousSibling;r&&Po.isText(r);r=r.previousSibling)o+=e(r.data).length;return o}(t,a,u):u):(u>=(i=a.childNodes).length&&i.length&&(c=1,u=Math.max(0,i.length-1)),s.push(e.nodeIndex(i[u],n)+c));a&&a!==l;a=a.parentNode)s.push(e.nodeIndex(a,n));return s},Pu=function(e,t,n){var r=0;return Jt.each(e.select(t),function(e){if("all"!==e.getAttribute("data-mce-bogus"))return e!==n&&void r++}),r},Iu=function(e,t){var n,r,o,i=t?"start":"end";n=e[i+"Container"],r=e[i+"Offset"],Po.isElement(n)&&"TR"===n.nodeName&&(n=(o=n.childNodes)[Math.min(t?r:r-1,o.length-1)])&&(r=t?0:n.childNodes.length,e["set"+(t?"Start":"End")](n,r))},Lu=function(e){return Iu(e,!0),Iu(e,!1),e},Mu=function(e,t){var n;if(Po.isElement(e)&&(e=Wa(e,t),Bu(e)))return e;if(ya(e)){if(Po.isText(e)&&va(e)&&(e=e.parentNode),n=e.previousSibling,Bu(n))return n;if(n=e.nextSibling,Bu(n))return n}},Fu=function(e,t,n){var r=n.getNode(),o=r?r.nodeName:null,i=n.getRng();if(Bu(r)||"IMG"===o)return{name:o,index:Pu(n.dom,o,r)};var a,u,s,c,l,f,d,m=Mu((a=i).startContainer,a.startOffset)||Mu(a.endContainer,a.endOffset);return m?{name:o=m.tagName,index:Pu(n.dom,o,m)}:(u=e,c=t,l=i,f=(s=n).dom,(d={}).start=Ou(f,u,c,l,!0),s.isCollapsed()||(d.end=Ou(f,u,c,l,!1)),d)},zu=function(e,t,n){var r={"data-mce-type":"bookmark",id:t,style:"overflow:hidden;line-height:0px"};return n?e.create("span",r,"&#xFEFF;"):e.create("span",r)},Uu=function(e,t){var n=e.dom,r=e.getRng(),o=n.uniqueId(),i=e.isCollapsed(),a=e.getNode(),u=a.nodeName;if("IMG"===u)return{name:u,index:Pu(n,u,a)};var s=Lu(r.cloneRange());if(!i){s.collapse(!1);var c=zu(n,o+"_end",t);Du(n,s,c)}(r=Lu(r)).collapse(!0);var l=zu(n,o+"_start",t);return Du(n,r,l),e.moveToBookmark({id:o,keep:1}),{id:o}},Vu={getBookmark:function(e,t,n){return 2===t?Fu(ga,n,e):3===t?(o=(r=e).getRng(),{start:Au(r.dom.getRoot(),Cu.fromRangeStart(o)),end:Au(r.dom.getRoot(),Cu.fromRangeEnd(o))}):t?{rng:e.getRng()}:Uu(e,!1);var r,o},getUndoBookmark:d(Fu,$,!0),getPersistentBookmark:Uu},Hu="_mce_caret",ju=function(e){return Po.isElement(e)&&e.id===Hu},qu=function(e,t){for(;t&&t!==e;){if(t.id===Hu)return t;t=t.parentNode}return null},$u=Po.isElement,Wu=Po.isText,Ku=function(e){var t=e.parentNode;t&&t.removeChild(e)},Xu=function(e,t){0===t.length?Ku(e):e.nodeValue=t},Yu=function(e){var t=ga(e);return{count:e.length-t.length,text:t}},Gu=function(e,t){return Zu(e),t},Ju=function(e,t){var n,r,o,i=t.container(),a=(n=oe(i.childNodes),r=e,o=M(n,r),-1===o?A.none():A.some(o)).map(function(e){return e<t.offset()?Cu(i,t.offset()-1):t}).getOr(t);return Zu(e),a},Qu=function(e,t){return Wu(e)&&t.container()===e?(r=t,o=Yu((n=e).data.substr(0,r.offset())),i=Yu(n.data.substr(r.offset())),0<(a=o.text+i.text).length?(Xu(n,a),Cu(n,r.offset()-o.count)):r):Gu(e,t);var n,r,o,i,a},Zu=function(e){if($u(e)&&ya(e)&&(Ca(e)?e.removeAttribute("data-mce-caret"):Ku(e)),Wu(e)){var t=ga(function(e){try{return e.nodeValue}catch(t){return""}}(e));Xu(e,t)}},es={removeAndReposition:function(e,t){return Cu.isTextPosition(t)?Qu(e,t):(n=e,(r=t).container()===n.parentNode?Ju(n,r):Gu(n,r));var n,r},remove:Zu},ts=rr.detect().browser,ns=Po.isContentEditableFalse,rs=function(e,t,n){var r,o,i,a,u,s=Ua(t.getBoundingClientRect(),n);return"BODY"===e.tagName?(r=e.ownerDocument.documentElement,o=e.scrollLeft||r.scrollLeft,i=e.scrollTop||r.scrollTop):(u=e.getBoundingClientRect(),o=e.scrollLeft-u.left,i=e.scrollTop-u.top),s.left+=o,s.right+=o,s.top+=i,s.bottom+=i,s.width=1,0<(a=t.offsetWidth-t.clientWidth)&&(n&&(a*=-1),s.left+=a,s.right+=a),s},os=function(a,u,e){var t,s,c=Li(A.none()),l=function(){!function(e){var t,n,r,o,i;for(t=vn("*[contentEditable=false]",e),o=0;o<t.length;o++)r=(n=t[o]).previousSibling,Sa(r)&&(1===(i=r.data).length?r.parentNode.removeChild(r):r.deleteData(i.length-1,1)),r=n.nextSibling,Ea(r)&&(1===(i=r.data).length?r.parentNode.removeChild(r):r.deleteData(0,1))}(a),s&&(es.remove(s),s=null),c.get().each(function(e){vn(e.caret).remove(),c.set(A.none())}),clearInterval(t)},f=function(){t=ye.setInterval(function(){e()?vn("div.mce-visual-caret",a).toggleClass("mce-visual-caret-hidden"):vn("div.mce-visual-caret",a).addClass("mce-visual-caret-hidden")},500)};return{show:function(t,e){var n,r,o;if(l(),o=e,Po.isElement(o)&&/^(TD|TH)$/i.test(o.tagName))return null;if(!u(e))return s=function(e,t){var n,r,o;if(r=e.ownerDocument.createTextNode(ma),o=e.parentNode,t){if(n=e.previousSibling,ha(n)){if(ya(n))return n;if(Sa(n))return n.splitText(n.data.length-1)}o.insertBefore(r,e)}else{if(n=e.nextSibling,ha(n)){if(ya(n))return n;if(Ea(n))return n.splitText(1),n}e.nextSibling?o.insertBefore(r,e.nextSibling):o.appendChild(r)}return r}(e,t),r=e.ownerDocument.createRange(),ns(s.nextSibling)?(r.setStart(s,0),r.setEnd(s,0)):(r.setStart(s,1),r.setEnd(s,1)),r;s=Na("p",e,t),n=rs(a,e,t),vn(s).css("top",n.top);var i=vn('<div class="mce-visual-caret" data-mce-bogus="all"></div>').css(n).appendTo(a)[0];return c.set(A.some({caret:i,element:e,before:t})),c.get().each(function(e){t&&vn(e.caret).addClass("mce-visual-caret-before")}),f(),(r=e.ownerDocument.createRange()).setStart(s,0),r.setEnd(s,0),r},hide:l,getCss:function(){return".mce-visual-caret {position: absolute;background-color: black;background-color: currentcolor;}.mce-visual-caret-hidden {display: none;}*[data-mce-caret] {position: absolute;left: -1000px;right: auto;top: 0;margin: 0;padding: 0;}"},reposition:function(){c.get().each(function(e){var t=rs(a,e.element,e.before);vn(e.caret).css(t)})},destroy:function(){return ye.clearInterval(t)}}},is=function(){return ts.isIE()||ts.isEdge()||ts.isFirefox()},as=function(e){return ns(e)||Po.isTable(e)&&is()},us=Po.isContentEditableFalse,ss=Po.matchStyleValues("display","block table table-cell table-caption list-item"),cs=ya,ls=va,fs=Po.isElement,ds=Ia,ms=function(e){return 0<e},gs=function(e){return e<0},ps=function(e,t){for(var n;n=e(t);)if(!ls(n))return n;return null},hs=function(e,t,n,r,o){var i=new ao(e,r);if(gs(t)){if((us(e)||ls(e))&&n(e=ps(i.prev,!0)))return e;for(;e=ps(i.prev,o);)if(n(e))return e}if(ms(t)){if((us(e)||ls(e))&&n(e=ps(i.next,!0)))return e;for(;e=ps(i.next,o);)if(n(e))return e}return null},vs=function(e,t){for(;e&&e!==t;){if(ss(e))return e;e=e.parentNode}return null},bs=function(e,t,n){return vs(e.container(),n)===vs(t.container(),n)},ys=function(e,t){var n,r;return t?(n=t.container(),r=t.offset(),fs(n)?n.childNodes[r+e]:null):null},Cs=function(e,t){var n=t.ownerDocument.createRange();return e?(n.setStartBefore(t),n.setEndBefore(t)):(n.setStartAfter(t),n.setEndAfter(t)),n},xs=function(e,t,n){var r,o,i,a;for(o=e?"previousSibling":"nextSibling";n&&n!==t;){if(r=n[o],cs(r)&&(r=r[o]),us(r)){if(a=n,vs(r,i=t)===vs(a,i))return r;break}if(ds(r))break;n=n.parentNode}return null},ws=d(Cs,!0),Ns=d(Cs,!1),Es=function(e,t,n){var r,o,i,a,u=d(xs,!0,t),s=d(xs,!1,t);if(o=n.startContainer,i=n.startOffset,va(o)){if(fs(o)||(o=o.parentNode),"before"===(a=o.getAttribute("data-mce-caret"))&&(r=o.nextSibling,as(r)))return ws(r);if("after"===a&&(r=o.previousSibling,as(r)))return Ns(r)}if(!n.collapsed)return n;if(Po.isText(o)){if(cs(o)){if(1===e){if(r=s(o))return ws(r);if(r=u(o))return Ns(r)}if(-1===e){if(r=u(o))return Ns(r);if(r=s(o))return ws(r)}return n}if(Sa(o)&&i>=o.data.length-1)return 1===e&&(r=s(o))?ws(r):n;if(Ea(o)&&i<=1)return-1===e&&(r=u(o))?Ns(r):n;if(i===o.data.length)return(r=s(o))?ws(r):n;if(0===i)return(r=u(o))?Ns(r):n}return n},Ss=function(e,t){return A.from(ys(e?0:-1,t)).filter(us)},ks=function(e,t,n){var r=Es(e,t,n);return-1===e?vu.fromRangeStart(r):vu.fromRangeEnd(r)},Ts=function(e){return A.from(e.getNode()).map(ir.fromDom)},As=function(e,t){for(;t=e(t);)if(t.isVisible())return t;return t},Rs=function(e,t){var n=bs(e,t);return!(n||!Po.isBr(e.getNode()))||n};(yu=bu||(bu={}))[yu.Backwards=-1]="Backwards",yu[yu.Forwards=1]="Forwards";var _s,Ds,Bs,Os,Ps,Is=Po.isContentEditableFalse,Ls=Po.isText,Ms=Po.isElement,Fs=Po.isBr,zs=Ia,Us=function(e){return Ba(e)||!!La(t=e)&&!0!==X(oe(t.getElementsByTagName("*")),function(e,t){return e||Ta(t)},!1);var t},Vs=Ma,Hs=function(e,t){return e.hasChildNodes()&&t<e.childNodes.length?e.childNodes[t]:null},js=function(e,t){if(ms(e)){if(zs(t.previousSibling)&&!Ls(t.previousSibling))return Cu.before(t);if(Ls(t))return Cu(t,0)}if(gs(e)){if(zs(t.nextSibling)&&!Ls(t.nextSibling))return Cu.after(t);if(Ls(t))return Cu(t,t.data.length)}return gs(e)?Fs(t)?Cu.before(t):Cu.after(t):Cu.before(t)},qs=function(e,t,n){var r,o,i,a,u;if(!Ms(n)||!t)return null;if(t.isEqual(Cu.after(n))&&n.lastChild){if(u=Cu.after(n.lastChild),gs(e)&&zs(n.lastChild)&&Ms(n.lastChild))return Fs(n.lastChild)?Cu.before(n.lastChild):u}else u=t;var s,c,l,f=u.container(),d=u.offset();if(Ls(f)){if(gs(e)&&0<d)return Cu(f,--d);if(ms(e)&&d<f.length)return Cu(f,++d);r=f}else{if(gs(e)&&0<d&&(o=Hs(f,d-1),zs(o)))return!Us(o)&&(i=hs(o,e,Vs,o))?Ls(i)?Cu(i,i.data.length):Cu.after(i):Ls(o)?Cu(o,o.data.length):Cu.before(o);if(ms(e)&&d<f.childNodes.length&&(o=Hs(f,d),zs(o)))return Fs(o)?(s=n,(l=(c=o).nextSibling)&&zs(l)?Ls(l)?Cu(l,0):Cu.before(l):qs(bu.Forwards,Cu.after(c),s)):!Us(o)&&(i=hs(o,e,Vs,o))?Ls(i)?Cu(i,0):Cu.before(i):Ls(o)?Cu(o,0):Cu.after(o);r=o||u.getNode()}return(ms(e)&&u.isAtEnd()||gs(e)&&u.isAtStart())&&(r=hs(r,e,q(!0),n,!0),Vs(r,n))?js(e,r):(o=hs(r,e,Vs,n),!(a=Wt.last(V(function(e,t){for(var n=[];e&&e!==t;)n.push(e),e=e.parentNode;return n}(f,n),Is)))||o&&a.contains(o)?o?js(e,o):null:u=ms(e)?Cu.after(a):Cu.before(a))},$s=function(t){return{next:function(e){return qs(bu.Forwards,e,t)},prev:function(e){return qs(bu.Backwards,e,t)}}},Ws=function(e){return Cu.isTextPosition(e)?0===e.offset():Ia(e.getNode())},Ks=function(e){if(Cu.isTextPosition(e)){var t=e.container();return e.offset()===t.data.length}return Ia(e.getNode(!0))},Xs=function(e,t){return!Cu.isTextPosition(e)&&!Cu.isTextPosition(t)&&e.getNode()===t.getNode(!0)},Ys=function(e,t,n){return e?!Xs(t,n)&&(r=t,!(!Cu.isTextPosition(r)&&Po.isBr(r.getNode())))&&Ks(t)&&Ws(n):!Xs(n,t)&&Ws(t)&&Ks(n);var r},Gs=function(e,t,n){var r=$s(t);return A.from(e?r.next(n):r.prev(n))},Js=function(t,n,r){return Gs(t,n,r).bind(function(e){return bs(r,e,n)&&Ys(t,r,e)?Gs(t,n,e):A.some(e)})},Qs=function(t,n,e,r){return Js(t,n,e).bind(function(e){return r(e)?Qs(t,n,e,r):A.some(e)})},Zs=function(e,t){var n,r,o,i,a,u=e?t.firstChild:t.lastChild;return Po.isText(u)?A.some(Cu(u,e?0:u.data.length)):u?Ia(u)?A.some(e?Cu.before(u):(a=u,Po.isBr(a)?Cu.before(a):Cu.after(a))):(r=t,o=u,i=(n=e)?Cu.before(o):Cu.after(o),Gs(n,r,i)):A.none()},ec=d(Gs,!0),tc=d(Gs,!1),nc={fromPosition:Gs,nextPosition:ec,prevPosition:tc,navigate:Js,navigateIgnore:Qs,positionIn:Zs,firstPositionIn:d(Zs,!0),lastPositionIn:d(Zs,!1)},rc=function(e,t){return!e.isBlock(t)||t.innerHTML||ge.ie||(t.innerHTML='<br data-mce-bogus="1" />'),t},oc=function(e,t){return nc.lastPositionIn(e).fold(function(){return!1},function(e){return t.setStart(e.container(),e.offset()),t.setEnd(e.container(),e.offset()),!0})},ic=function(e,t,n){return!(!1!==t.hasChildNodes()||!qu(e,t)||(o=n,i=(r=t).ownerDocument.createTextNode(ma),r.appendChild(i),o.setStart(i,0),o.setEnd(i,0),0));var r,o,i},ac=function(e,t,n,r){var o,i,a,u,s=n[t?"start":"end"],c=e.getRoot();if(s){for(a=s[0],i=c,o=s.length-1;1<=o;o--){if(u=i.childNodes,ic(c,i,r))return!0;if(s[o]>u.length-1)return!!ic(c,i,r)||oc(i,r);i=u[s[o]]}3===i.nodeType&&(a=Math.min(s[0],i.nodeValue.length)),1===i.nodeType&&(a=Math.min(s[0],i.childNodes.length)),t?r.setStart(i,a):r.setEnd(i,a)}return!0},uc=function(e){return Po.isText(e)&&0<e.data.length},sc=function(e,t,n){var r,o,i,a,u,s,c=e.get(n.id+"_"+t),l=n.keep;if(c){if(r=c.parentNode,"start"===t?l?c.hasChildNodes()?(r=c.firstChild,o=1):uc(c.nextSibling)?(r=c.nextSibling,o=0):uc(c.previousSibling)?(r=c.previousSibling,o=c.previousSibling.data.length):(r=c.parentNode,o=e.nodeIndex(c)+1):o=e.nodeIndex(c):l?c.hasChildNodes()?(r=c.firstChild,o=1):uc(c.previousSibling)?(r=c.previousSibling,o=c.previousSibling.data.length):(r=c.parentNode,o=e.nodeIndex(c)):o=e.nodeIndex(c),u=r,s=o,!l){for(a=c.previousSibling,i=c.nextSibling,Jt.each(Jt.grep(c.childNodes),function(e){Po.isText(e)&&(e.nodeValue=e.nodeValue.replace(/\uFEFF/g,""))});c=e.get(n.id+"_"+t);)e.remove(c,!0);a&&i&&a.nodeType===i.nodeType&&Po.isText(a)&&!ge.opera&&(o=a.nodeValue.length,a.appendData(i.nodeValue),e.remove(i),u=a,s=o)}return A.some(Cu(u,s))}return A.none()},cc=function(e,t){var n,r,o,i,a,u,s,c,l,f,d,m,g,p,h,v,b=e.dom;if(t){if(v=t,Jt.isArray(v.start))return p=t,h=(g=b).createRng(),ac(g,!0,p,h)&&ac(g,!1,p,h)?A.some(h):A.none();if("string"==typeof t.start)return A.some((f=t,d=(l=b).createRng(),m=Ru(l.getRoot(),f.start),d.setStart(m.container(),m.offset()),m=Ru(l.getRoot(),f.end),d.setEnd(m.container(),m.offset()),d));if(t.hasOwnProperty("id"))return s=sc(o=b,"start",i=t),c=sc(o,"end",i),Ya([s,(a=c,u=s,a.isSome()?a:u)],function(e,t){var n=o.createRng();return n.setStart(rc(o,e.container()),e.offset()),n.setEnd(rc(o,t.container()),t.offset()),n});if(t.hasOwnProperty("name"))return n=b,r=t,A.from(n.select(r.name)[r.index]).map(function(e){var t=n.createRng();return t.selectNode(e),t});if(t.hasOwnProperty("rng"))return A.some(t.rng)}return A.none()},lc=function(e,t,n){return Vu.getBookmark(e,t,n)},fc=function(t,e){cc(t,e).each(function(e){t.setRng(e)})},dc=function(e){return Po.isElement(e)&&"SPAN"===e.tagName&&"bookmark"===e.getAttribute("data-mce-type")},mc=function(e){return e&&/^(IMG)$/.test(e.nodeName)},gc=function(e){return e&&3===e.nodeType&&/^([\t \r\n]+|)$/.test(e.nodeValue)},pc=function(e,t,n){return"color"!==n&&"backgroundColor"!==n||(t=e.toHex(t)),"fontWeight"===n&&700===t&&(t="bold"),"fontFamily"===n&&(t=t.replace(/[\'\"]/g,"").replace(/,\s+/g,",")),""+t},hc={isInlineBlock:mc,moveStart:function(e,t,n){var r,o,i,a=n.startOffset,u=n.startContainer;if((n.startContainer!==n.endContainer||!mc(n.startContainer.childNodes[n.startOffset]))&&1===u.nodeType)for(a<(i=u.childNodes).length?r=new ao(u=i[a],e.getParent(u,e.isBlock)):(r=new ao(u=i[i.length-1],e.getParent(u,e.isBlock))).next(!0),o=r.current();o;o=r.next())if(3===o.nodeType&&!gc(o))return n.setStart(o,0),void t.setRng(n)},getNonWhiteSpaceSibling:function(e,t,n){if(e)for(t=t?"nextSibling":"previousSibling",e=n?e:e[t];e;e=e[t])if(1===e.nodeType||!gc(e))return e},isTextBlock:function(e,t){return t.nodeType&&(t=t.nodeName),!!e.schema.getTextBlockElements()[t.toLowerCase()]},isValid:function(e,t,n){return e.schema.isValidChild(t,n)},isWhiteSpaceNode:gc,replaceVars:function(e,n){return"string"!=typeof e?e=e(n):n&&(e=e.replace(/%(\w+)/g,function(e,t){return n[t]||e})),e},isEq:function(e,t){return t=t||"",e=""+((e=e||"").nodeName||e),t=""+(t.nodeName||t),e.toLowerCase()===t.toLowerCase()},normalizeStyleValue:pc,getStyle:function(e,t,n){return pc(e,e.getStyle(t,n),n)},getTextDecoration:function(t,e){var n;return t.getParent(e,function(e){return(n=t.getStyle(e,"text-decoration"))&&"none"!==n}),n},getParents:function(e,t,n){return e.getParents(t,n,e.getRoot())}},vc=dc,bc=hc.getParents,yc=hc.isWhiteSpaceNode,Cc=hc.isTextBlock,xc=function(e,t){for(void 0===t&&(t=3===e.nodeType?e.length:e.childNodes.length);e&&e.hasChildNodes();)(e=e.childNodes[t])&&(t=3===e.nodeType?e.length:e.childNodes.length);return{node:e,offset:t}},wc=function(e,t){for(var n=t;n;){if(1===n.nodeType&&e.getContentEditable(n))return"false"===e.getContentEditable(n)?n:t;n=n.parentNode}return t},Nc=function(e,t,n,r){var o,i,a=n.nodeValue;return void 0===r&&(r=e?a.length:0),e?(o=a.lastIndexOf(" ",r),-1!==(o=(i=a.lastIndexOf("\xa0",r))<o?o:i)&&!t&&(o<r||!e)&&o<=a.length&&o++):(o=a.indexOf(" ",r),i=a.indexOf("\xa0",r),o=-1!==o&&(-1===i||o<i)?o:i),o},Ec=function(e,t,n,r,o,i){var a,u,s,c;if(3===n.nodeType){if(-1!==(s=Nc(o,i,n,r)))return{container:n,offset:s};c=n}for(a=new ao(n,e.getParent(n,e.isBlock)||t);u=a[o?"prev":"next"]();)if(3!==u.nodeType||vc(u.parentNode)){if(e.isBlock(u)||hc.isEq(u,"BR"))break}else if(-1!==(s=Nc(o,i,c=u)))return{container:u,offset:s};if(c)return{container:c,offset:r=o?0:c.length}},Sc=function(e,t,n,r,o){var i,a,u,s;for(3===r.nodeType&&0===r.nodeValue.length&&r[o]&&(r=r[o]),i=bc(e,r),a=0;a<i.length;a++)for(u=0;u<t.length;u++)if(!("collapsed"in(s=t[u])&&s.collapsed!==n.collapsed)&&e.is(i[a],s.selector))return i[a];return r},kc=function(t,e,n,r){var o,i=t.dom,a=i.getRoot();if(e[0].wrapper||(o=i.getParent(n,e[0].block,a)),!o){var u=i.getParent(n,"LI,TD,TH");o=i.getParent(3===n.nodeType?n.parentNode:n,function(e){return e!==a&&Cc(t,e)},u)}if(o&&e[0].wrapper&&(o=bc(i,o,"ul,ol").reverse()[0]||o),!o)for(o=n;o[r]&&!i.isBlock(o[r])&&(o=o[r],!hc.isEq(o,"br")););return o||n},Tc=function(e,t,n,r,o,i,a){var u,s,c,l,f,d;if(u=s=a?n:o,l=a?"previousSibling":"nextSibling",f=e.getRoot(),3===u.nodeType&&!yc(u)&&(a?0<r:i<u.nodeValue.length))return u;for(;;){if(!t[0].block_expand&&e.isBlock(s))return s;for(c=s[l];c;c=c[l])if(!vc(c)&&!yc(c)&&("BR"!==(d=c).nodeName||!d.getAttribute("data-mce-bogus")||d.nextSibling))return s;if(s===f||s.parentNode===f){u=s;break}s=s.parentNode}return u},Ac=function(e,t,n,r){var o,i=t.startContainer,a=t.startOffset,u=t.endContainer,s=t.endOffset,c=e.dom;return 1===i.nodeType&&i.hasChildNodes()&&3===(i=Wa(i,a)).nodeType&&(a=0),1===u.nodeType&&u.hasChildNodes()&&3===(u=Wa(u,t.collapsed?s:s-1)).nodeType&&(s=u.nodeValue.length),i=wc(c,i),u=wc(c,u),(vc(i.parentNode)||vc(i))&&(i=vc(i)?i:i.parentNode,3===(i=t.collapsed?i.previousSibling||i:i.nextSibling||i).nodeType&&(a=t.collapsed?i.length:0)),(vc(u.parentNode)||vc(u))&&(u=vc(u)?u:u.parentNode,3===(u=t.collapsed?u.nextSibling||u:u.previousSibling||u).nodeType&&(s=t.collapsed?0:u.length)),t.collapsed&&((o=Ec(c,e.getBody(),i,a,!0,r))&&(i=o.container,a=o.offset),(o=Ec(c,e.getBody(),u,s,!1,r))&&(u=o.container,s=o.offset)),n[0].inline&&(u=r?u:function(e,t){var n=xc(e,t);if(n.node){for(;n.node&&0===n.offset&&n.node.previousSibling;)n=xc(n.node.previousSibling);n.node&&0<n.offset&&3===n.node.nodeType&&" "===n.node.nodeValue.charAt(n.offset-1)&&1<n.offset&&(e=n.node).splitText(n.offset-1)}return e}(u,s)),(n[0].inline||n[0].block_expand)&&(n[0].inline&&3===i.nodeType&&0!==a||(i=Tc(c,n,i,a,u,s,!0)),n[0].inline&&3===u.nodeType&&s!==u.nodeValue.length||(u=Tc(c,n,i,a,u,s,!1))),n[0].selector&&!1!==n[0].expand&&!n[0].inline&&(i=Sc(c,n,t,i,"previousSibling"),u=Sc(c,n,t,u,"nextSibling")),(n[0].block||n[0].selector)&&(i=kc(e,n,i,"previousSibling"),u=kc(e,n,u,"nextSibling"),n[0].block&&(c.isBlock(i)||(i=Tc(c,n,i,a,u,s,!0)),c.isBlock(u)||(u=Tc(c,n,i,a,u,s,!1)))),1===i.nodeType&&(a=c.nodeIndex(i),i=i.parentNode),1===u.nodeType&&(s=c.nodeIndex(u)+1,u=u.parentNode),{startContainer:i,startOffset:a,endContainer:u,endOffset:s}},Rc=Jt.each,_c=function(e,t,o){var n,r,i,a,u,s,c,l=t.startContainer,f=t.startOffset,d=t.endContainer,m=t.endOffset;if(0<(c=e.select("td[data-mce-selected],th[data-mce-selected]")).length)Rc(c,function(e){o([e])});else{var g,p,h,v=function(e){var t;return 3===(t=e[0]).nodeType&&t===l&&f>=t.nodeValue.length&&e.splice(0,1),t=e[e.length-1],0===m&&0<e.length&&t===d&&3===t.nodeType&&e.splice(e.length-1,1),e},b=function(e,t,n){for(var r=[];e&&e!==n;e=e[t])r.push(e);return r},y=function(e,t){do{if(e.parentNode===t)return e;e=e.parentNode}while(e)},C=function(e,t,n){var r=n?"nextSibling":"previousSibling";for(u=(a=e).parentNode;a&&a!==t;a=u)u=a.parentNode,(s=b(a===e?a:a[r],r)).length&&(n||s.reverse(),o(v(s)))};if(1===l.nodeType&&l.hasChildNodes()&&(l=l.childNodes[f]),1===d.nodeType&&d.hasChildNodes()&&(p=m,h=(g=d).childNodes,--p>h.length-1?p=h.length-1:p<0&&(p=0),d=h[p]||g),l===d)return o(v([l]));for(n=e.findCommonAncestor(l,d),a=l;a;a=a.parentNode){if(a===d)return C(l,n,!0);if(a===n)break}for(a=d;a;a=a.parentNode){if(a===l)return C(d,n);if(a===n)break}r=y(l,n)||l,i=y(d,n)||d,C(l,r,!0),(s=b(r===l?r:r.nextSibling,"nextSibling",i===d?i.nextSibling:i)).length&&o(v(s)),C(d,i)}},Dc=(_s=dr,Ds="text",Bs=function(e){return _s(e)?A.from(e.dom().nodeValue):A.none()},Os=rr.detect().browser,{get:function(e){if(!_s(e))throw new Error("Can only get "+Ds+" value of a "+Ds+" node");return Ps(e).getOr("")},getOption:Ps=Os.isIE()&&10===Os.version.major?function(e){try{return Bs(e)}catch(ZN){return A.none()}}:Bs,set:function(e,t){if(!_s(e))throw new Error("Can only set raw "+Ds+" value of a "+Ds+" node");e.dom().nodeValue=t}}),Bc=function(e){return Dc.get(e)},Oc=function(r,o,i,a){return zr(o).fold(function(){return"skipping"},function(e){return"br"===a||dr(n=o)&&"\ufeff"===Bc(n)?"valid":fr(t=o)&&ji(t,Zi())?"existing":ju(o)?"caret":hc.isValid(r,i,a)&&hc.isValid(r,cr(e),i)?"valid":"invalid-child";var t,n})},Pc=function(e,t,n,r){var o,i,a=t.uid,u=void 0===a?(o="mce-annotation",i=(new Date).getTime(),o+"_"+Math.floor(1e9*Math.random())+ ++aa+String(i)):a,s=function(e,t){var n={};for(var r in e)Object.prototype.hasOwnProperty.call(e,r)&&t.indexOf(r)<0&&(n[r]=e[r]);if(null!=e&&"function"==typeof Object.getOwnPropertySymbols){var o=0;for(r=Object.getOwnPropertySymbols(e);o<r.length;o++)t.indexOf(r[o])<0&&Object.prototype.propertyIsEnumerable.call(e,r[o])&&(n[r[o]]=e[r[o]])}return n}(t,["uid"]),c=ir.fromTag("span",e);Vi(c,Zi()),yr(c,""+ta(),u),yr(c,""+ea(),n);var l,f=r(u,s),d=f.attributes,m=void 0===d?{}:d,g=f.classes,p=void 0===g?[]:g;return Cr(c,m),l=c,U(p,function(e){Vi(l,e)}),c},Ic=function(i,e,t,n,r){var a=[],u=Pc(i.getDoc(),r,t,n),s=Li(A.none()),c=function(){s.set(A.none())},l=function(e){U(e,o)},o=function(e){var t,n;switch(Oc(i,e,"span",cr(e))){case"invalid-child":c();var r=qr(e);l(r),c();break;case"valid":var o=s.get().getOrThunk(function(){var e=sa(u);return a.push(e),s.set(A.some(e)),e});Ti(t=e,n=o),_i(n,t)}};return _c(i.dom,e,function(e){var t;c(),t=W(e,ir.fromDom),l(t)}),a},Lc=function(s,c,l,f){s.undoManager.transact(function(){var e,t,n,r,o=s.selection.getRng();if(o.collapsed&&(r=Ac(e=s,t=o,[{inline:!0}],3===(n=t).startContainer.nodeType&&n.startContainer.nodeValue.length>=n.startOffset&&"\xa0"===n.startContainer.nodeValue[n.startOffset]),t.setStart(r.startContainer,r.startOffset),t.setEnd(r.endContainer,r.endOffset),e.selection.setRng(t)),s.selection.getRng().collapsed){var i=Pc(s.getDoc(),f,c,l.decorate);la(i,"\xa0"),s.selection.getRng().insertNode(i.dom()),s.selection.select(i.dom())}else{var a=Vu.getPersistentBookmark(s.selection,!1),u=s.selection.getRng();Ic(s,u,c,l.decorate,f),s.selection.moveToBookmark(a)}})};function Mc(s){var n,r=(n={},{register:function(e,t){n[e]={name:e,settings:t}},lookup:function(e){return n.hasOwnProperty(e)?A.from(n[e]).map(function(e){return e.settings}):A.none()}});ia(s,r);var o=oa(s);return{register:function(e,t){r.register(e,t)},annotate:function(t,n){r.lookup(t).each(function(e){Lc(s,t,e,n)})},annotationChanged:function(e,t){o.addListener(e,t)},remove:function(e){na(s,A.some(e)).each(function(e){var t=e.elements;U(t,Pi)})},getAll:function(e){var t,n,r,o,i,a,u=(t=s,n=e,r=ir.fromDom(t.getBody()),o=$i(r,"["+ea()+'="'+n+'"]'),i={},U(o,function(e){var t=xr(e,ta()),n=i.hasOwnProperty(t)?i[t]:[];i[t]=n.concat([e])}),i);return a=function(e){return W(e,function(e){return e.dom()})},hr(u,function(e,t,n){return{k:t,v:a(e,t,n)}})}}}var Fc=function(e){return Jt.grep(e.childNodes,function(e){return"LI"===e.nodeName})},zc=function(e){return e&&e.firstChild&&e.firstChild===e.lastChild&&("\xa0"===(t=e.firstChild).data||Po.isBr(t));var t},Uc=function(e){return 0<e.length&&(!(t=e[e.length-1]).firstChild||zc(t))?e.slice(0,-1):e;var t},Vc=function(e,t){var n=e.getParent(t,e.isBlock);return n&&"LI"===n.nodeName?n:null},Hc=function(e,t){var n=Cu.after(e),r=$s(t).prev(n);return r?r.toRange():null},jc=function(t,e,n){var r,o,i,a,u=t.parentNode;return Jt.each(e,function(e){u.insertBefore(e,t)}),r=t,o=n,i=Cu.before(r),(a=$s(o).next(i))?a.toRange():null},qc=function(e,t){var n,r,o,i,a,u,s=t.firstChild,c=t.lastChild;return s&&"meta"===s.name&&(s=s.next),c&&"mce_marker"===c.attr("id")&&(c=c.prev),r=c,u=(n=e).getNonEmptyElements(),r&&(r.isEmpty(u)||(o=r,n.getBlockElements()[o.name]&&(a=o).firstChild&&a.firstChild===a.lastChild&&("br"===(i=o.firstChild).name||"\xa0"===i.value)))&&(c=c.prev),!(!s||s!==c||"ul"!==s.name&&"ol"!==s.name)},$c=function(e,o,i,t){var n,r,a,u,s,c,l,f,d,m,g,p,h,v,b,y,C,x,w,N=(n=o,r=t,c=e.serialize(r),l=n.createFragment(c),u=(a=l).firstChild,s=a.lastChild,u&&"META"===u.nodeName&&u.parentNode.removeChild(u),s&&"mce_marker"===s.id&&s.parentNode.removeChild(s),a),E=Vc(o,i.startContainer),S=Uc(Fc(N.firstChild)),k=o.getRoot(),T=function(e){var t=Cu.fromRangeStart(i),n=$s(o.getRoot()),r=1===e?n.prev(t):n.next(t);return!r||Vc(o,r.getNode())!==E};return T(1)?jc(E,S,k):T(2)?(f=E,d=S,m=k,o.insertAfter(d.reverse(),f),Hc(d[0],m)):(p=S,h=k,v=g=E,y=(b=i).cloneRange(),C=b.cloneRange(),y.setStartBefore(v),C.setEndAfter(v),x=[y.cloneContents(),C.cloneContents()],(w=g.parentNode).insertBefore(x[0],g),Jt.each(p,function(e){w.insertBefore(e,g)}),w.insertBefore(x[1],g),w.removeChild(g),Hc(p[p.length-1],h))},Wc=function(e,t){return!!Vc(e,t)},Kc=Jt.each,Xc=function(o){this.compare=function(e,t){if(e.nodeName!==t.nodeName)return!1;var n=function(n){var r={};return Kc(o.getAttribs(n),function(e){var t=e.nodeName.toLowerCase();0!==t.indexOf("_")&&"style"!==t&&0!==t.indexOf("data-")&&(r[t]=o.getAttrib(n,t))}),r},r=function(e,t){var n,r;for(r in e)if(e.hasOwnProperty(r)){if(void 0===(n=t[r]))return!1;if(e[r]!==n)return!1;delete t[r]}for(r in t)if(t.hasOwnProperty(r))return!1;return!0};return!(!r(n(e),n(t))||!r(o.parseStyle(o.getAttrib(e,"style")),o.parseStyle(o.getAttrib(t,"style")))||dc(e)||dc(t))}},Yc=function(e){var t=$i(e,"br"),n=V(function(e){for(var t=[],n=e.dom();n;)t.push(ir.fromDom(n)),n=n.lastChild;return t}(e).slice(-1),po);t.length===n.length&&U(n,Oi)},Gc=function(e){Bi(e),_i(e,ir.fromHtml('<br data-mce-bogus="1">'))},Jc=function(n){Kr(n).each(function(t){Ur(t).each(function(e){mo(n)&&po(t)&&mo(e)&&Oi(t)})})},Qc=Jt.makeMap;function Zc(e){var u,s,c,l,f,d=[];return u=(e=e||{}).indent,s=Qc(e.indent_before||""),c=Qc(e.indent_after||""),l=Xo.getEncodeFunc(e.entity_encoding||"raw",e.entities),f="html"===e.element_format,{start:function(e,t,n){var r,o,i,a;if(u&&s[e]&&0<d.length&&0<(a=d[d.length-1]).length&&"\n"!==a&&d.push("\n"),d.push("<",e),t)for(r=0,o=t.length;r<o;r++)i=t[r],d.push(" ",i.name,'="',l(i.value,!0),'"');d[d.length]=!n||f?">":" />",n&&u&&c[e]&&0<d.length&&0<(a=d[d.length-1]).length&&"\n"!==a&&d.push("\n")},end:function(e){var t;d.push("</",e,">"),u&&c[e]&&0<d.length&&0<(t=d[d.length-1]).length&&"\n"!==t&&d.push("\n")},text:function(e,t){0<e.length&&(d[d.length]=t?e:l(e))},cdata:function(e){d.push("<![CDATA[",e,"]]>")},comment:function(e){d.push("\x3c!--",e,"--\x3e")},pi:function(e,t){t?d.push("<?",e," ",l(t),"?>"):d.push("<?",e,"?>"),u&&d.push("\n")},doctype:function(e){d.push("<!DOCTYPE",e,">",u?"\n":"")},reset:function(){d.length=0},getContent:function(){return d.join("").replace(/\n$/,"")}}}function el(t,g){void 0===g&&(g=ii());var p=Zc(t);return(t=t||{}).validate=!("validate"in t)||t.validate,{serialize:function(e){var f,d;d=t.validate,f={3:function(e){p.text(e.value,e.raw)},8:function(e){p.comment(e.value)},7:function(e){p.pi(e.name,e.value)},10:function(e){p.doctype(e.value)},4:function(e){p.cdata(e.value)},11:function(e){if(e=e.firstChild)for(;m(e),e=e.next;);}},p.reset();var m=function(e){var t,n,r,o,i,a,u,s,c,l=f[e.type];if(l)l(e);else{if(t=e.name,n=e.shortEnded,r=e.attributes,d&&r&&1<r.length&&((a=[]).map={},c=g.getElementRule(e.name))){for(u=0,s=c.attributesOrder.length;u<s;u++)(o=c.attributesOrder[u])in r.map&&(i=r.map[o],a.map[o]=i,a.push({name:o,value:i}));for(u=0,s=r.length;u<s;u++)(o=r[u].name)in a.map||(i=r.map[o],a.map[o]=i,a.push({name:o,value:i}));r=a}if(p.start(e.name,r,n),!n){if(e=e.firstChild)for(;m(e),e=e.next;);p.end(t)}}};return 1!==e.type||t.inner?f[11](e):m(e),p.getContent()}}}var tl,nl=function(a){var u=Cu.fromRangeStart(a),s=Cu.fromRangeEnd(a),c=a.commonAncestorContainer;return nc.fromPosition(!1,c,s).map(function(e){return!bs(u,s,c)&&bs(u,e,c)?(t=u.container(),n=u.offset(),r=e.container(),o=e.offset(),(i=H.document.createRange()).setStart(t,n),i.setEnd(r,o),i):a;var t,n,r,o,i}).getOr(a)},rl=function(e){return e.collapsed?e:nl(e)},ol=Po.matchNodeNames("td th"),il=function(e,t){var n,r,o=e.selection.getRng(),i=o.startContainer,a=o.startOffset;o.collapsed&&(n=i,r=a,Po.isText(n)&&"\xa0"===n.nodeValue[r-1])&&Po.isText(i)&&(i.insertData(a-1," "),i.deleteData(a,1),o.setStart(i,a),o.setEnd(i,a),e.selection.setRng(o)),e.selection.setContent(t)},al=function(e,t,n){var r,o,i,a,u,s,c,l,f,d,m,g=e.selection,p=e.dom;if(/^ | $/.test(t)&&(t=function(e,t){var n,r;n=e.startContainer,r=e.startOffset;var o=function(e){return n[e]&&3===n[e].nodeType};return 3===n.nodeType&&(0<r?t=t.replace(/^&nbsp;/," "):o("previousSibling")||(t=t.replace(/^ /,"&nbsp;")),r<n.length?t=t.replace(/&nbsp;(<br>|)$/," "):o("nextSibling")||(t=t.replace(/(&nbsp;| )(<br>|)$/,"&nbsp;"))),t}(g.getRng(),t)),r=e.parser,m=n.merge,o=el({validate:e.settings.validate},e.schema),d='<span id="mce_marker" data-mce-type="bookmark">&#xFEFF;&#x200B;</span>',s={content:t,format:"html",selection:!0,paste:n.paste},(s=e.fire("BeforeSetContent",s)).isDefaultPrevented())e.fire("SetContent",{content:s.content,format:"html",selection:!0,paste:n.paste});else{-1===(t=s.content).indexOf("{$caret}")&&(t+="{$caret}"),t=t.replace(/\{\$caret\}/,d);var h,v,b,y,C,x,w=(l=g.getRng()).startContainer||(l.parentElement?l.parentElement():null),N=e.getBody();w===N&&g.isCollapsed()&&p.isBlock(N.firstChild)&&(h=e,(v=N.firstChild)&&!h.schema.getShortEndedElements()[v.nodeName])&&p.isEmpty(N.firstChild)&&((l=p.createRng()).setStart(N.firstChild,0),l.setEnd(N.firstChild,0),g.setRng(l)),g.isCollapsed()||(e.selection.setRng(rl(e.selection.getRng())),e.getDoc().execCommand("Delete",!1,null),b=e.selection.getRng(),y=t,C=b.startContainer,x=b.startOffset,3===C.nodeType&&b.collapsed&&("\xa0"===C.data[x]?(C.deleteData(x,1),/[\u00a0| ]$/.test(y)||(y+=" ")):"\xa0"===C.data[x-1]&&(C.deleteData(x-1,1),/[\u00a0| ]$/.test(y)||(y=" "+y))),t=y);var E,S,k,T={context:(i=g.getNode()).nodeName.toLowerCase(),data:n.data,insert:!0};if(u=r.parse(t,T),!0===n.paste&&qc(e.schema,u)&&Wc(p,i))return l=$c(o,p,e.selection.getRng(),u),e.selection.setRng(l),void e.fire("SetContent",s);if(function(e){for(var t=e;t=t.walk();)1===t.type&&t.attr("data-mce-fragment","1")}(u),"mce_marker"===(f=u.lastChild).attr("id"))for(f=(c=f).prev;f;f=f.walk(!0))if(3===f.type||!p.isBlock(f.name)){e.schema.isValidChild(f.parent.name,"span")&&f.parent.insert(c,f,"br"===f.name);break}if(e._selectionOverrides.showBlockCaretContainer(i),T.invalid){for(il(e,d),i=g.getNode(),a=e.getBody(),9===i.nodeType?i=f=a:f=i;f!==a;)f=(i=f).parentNode;t=i===a?a.innerHTML:p.getOuterHTML(i),t=o.serialize(r.parse(t.replace(/<span (id="mce_marker"|id=mce_marker).+?<\/span>/i,function(){return o.serialize(u)}))),i===a?p.setHTML(a,t):p.setOuterHTML(i,t)}else!function(e,t,n){if("all"===n.getAttribute("data-mce-bogus"))n.parentNode.insertBefore(e.dom.createFragment(t),n);else{var r=n.firstChild,o=n.lastChild;!r||r===o&&"BR"===r.nodeName?e.dom.setHTML(n,t):il(e,t)}}(e,t=o.serialize(u),i);!function(e,t){var n=e.schema.getTextInlineElements(),r=e.dom;if(t){var o=e.getBody(),i=new Xc(r);Jt.each(r.select("*[data-mce-fragment]"),function(e){for(var t=e.parentNode;t&&t!==o;t=t.parentNode)n[e.nodeName.toLowerCase()]&&i.compare(t,e)&&r.remove(e,!0)})}}(e,m),function(n,e){var t,r,o,i,a,u=n.dom,s=n.selection;if(e){if(n.selection.scrollIntoView(e),t=function(e){for(var t=n.getBody();e&&e!==t;e=e.parentNode)if("false"===n.dom.getContentEditable(e))return e;return null}(e))return u.remove(e),s.select(t);var c=u.createRng();(i=e.previousSibling)&&3===i.nodeType?(c.setStart(i,i.nodeValue.length),ge.ie||(a=e.nextSibling)&&3===a.nodeType&&(i.appendData(a.data),a.parentNode.removeChild(a))):(c.setStartBefore(e),c.setEndBefore(e)),r=u.getParent(e,u.isBlock),u.remove(e),r&&u.isEmpty(r)&&(n.$(r).empty(),c.setStart(r,0),c.setEnd(r,0),ol(r)||r.getAttribute("data-mce-fragment")||!(o=function(e){var t=Cu.fromRangeStart(e);if(t=$s(n.getBody()).next(t))return t.toRange()}(c))?u.add(r,u.create("br",{"data-mce-bogus":"1"})):(c=o,u.remove(r))),s.setRng(c)}}(e,p.get("mce_marker")),E=e.getBody(),Jt.each(E.getElementsByTagName("*"),function(e){e.removeAttribute("data-mce-fragment")}),S=e.dom,k=e.selection.getStart(),A.from(S.getParent(k,"td,th")).map(ir.fromDom).each(Jc),e.fire("SetContent",s),e.addVisual()}},ul=function(e,t){var n,r,o="string"!=typeof(n=t)?(r=Jt.extend({paste:n.paste,data:{paste:n.paste}},n),{content:n.content,details:r}):{content:n,details:{}};al(e,o.content,o.details)},sl=/[\u0591-\u07FF\uFB1D-\uFDFF\uFE70-\uFEFC]/,cl=function(e,t,n){var r=e.getParam(t,n);if(-1!==r.indexOf("=")){var o=e.getParam(t,"","hash");return o.hasOwnProperty(e.id)?o[e.id]:n}return r},ll=function(e){return e.getParam("iframe_attrs",{})},fl=function(e){return e.getParam("doctype","<!DOCTYPE html>")},dl=function(e){return e.getParam("document_base_url","")},ml=function(e){return cl(e,"body_id","tinymce")},gl=function(e){return cl(e,"body_class","")},pl=function(e){return e.getParam("content_security_policy","")},hl=function(e){return e.getParam("br_in_pre",!0)},vl=function(e){if(e.getParam("force_p_newlines",!1))return"p";var t=e.getParam("forced_root_block","p");return!1===t?"":t},bl=function(e){return e.getParam("forced_root_block_attrs",{})},yl=function(e){return e.getParam("br_newline_selector",".mce-toc h2,figcaption,caption")},Cl=function(e){return e.getParam("no_newline_selector","")},xl=function(e){return e.getParam("keep_styles",!0)},wl=function(e){return e.getParam("end_container_on_empty_block",!1)},Nl=function(e){return Jt.explode(e.getParam("font_size_style_values",""))},El=function(e){return Jt.explode(e.getParam("font_size_classes",""))},Sl=function(e){return e.getParam("images_dataimg_filter",q(!0),"function")},kl=function(e){return e.getParam("automatic_uploads",!0,"boolean")},Tl=function(e){return e.getParam("images_reuse_filename",!1,"boolean")},Al=function(e){return e.getParam("images_replace_blob_uris",!0,"boolean")},Rl=function(e){return e.getParam("images_upload_url","","string")},_l=function(e){return e.getParam("images_upload_base_path","","string")},Dl=function(e){return e.getParam("images_upload_credentials",!1,"boolean")},Bl=function(e){return e.getParam("images_upload_handler",null,"function")},Ol=function(e){return e.getParam("content_css_cors",!1,"boolean")},Pl=function(e){return e.getParam("inline_boundaries_selector","a[href],code,.mce-annotation","string")},Il=function(e,t){if(!t)return t;var n=t.container(),r=t.offset();return e?ba(n)?Po.isText(n.nextSibling)?Cu(n.nextSibling,0):Cu.after(n):xa(t)?Cu(n,r+1):t:ba(n)?Po.isText(n.previousSibling)?Cu(n.previousSibling,n.previousSibling.data.length):Cu.before(n):wa(t)?Cu(n,r-1):t},Ll={isInlineTarget:function(e,t){return Or(ir.fromDom(t),Pl(e))},findRootInline:function(e,t,n){var r,o,i,a=(r=e,o=t,i=n,V(bi.DOM.getParents(i.container(),"*",o),r));return A.from(a[a.length-1])},isRtl:function(e){return"rtl"===bi.DOM.getStyle(e,"direction",!0)||(t=e.textContent,sl.test(t));var t},isAtZwsp:function(e){return xa(e)||wa(e)},normalizePosition:Il,normalizeForwards:d(Il,!0),normalizeBackwards:d(Il,!1),hasSameParentBlock:function(e,t,n){var r=vs(t,e),o=vs(n,e);return r&&r===o}},Ml=function(e,t){return Lr(e,t)?Yi(t,function(e){return ho(e)||bo(e)},(n=e,function(e){return Ir(n,ir.fromDom(e.dom().parentNode))})):A.none();var n},Fl=function(e){var t,n,r;e.dom.isEmpty(e.getBody())&&(e.setContent(""),n=(t=e).getBody(),r=n.firstChild&&t.dom.isBlock(n.firstChild)?n.firstChild:n,t.selection.setCursorLocation(r,0))},zl=function(i,a,u){return Ya([nc.firstPositionIn(u),nc.lastPositionIn(u)],function(e,t){var n=Ll.normalizePosition(!0,e),r=Ll.normalizePosition(!1,t),o=Ll.normalizePosition(!1,a);return i?nc.nextPosition(u,o).map(function(e){return e.isEqual(r)&&a.isEqual(n)}).getOr(!1):nc.prevPosition(u,o).map(function(e){return e.isEqual(n)&&a.isEqual(r)}).getOr(!1)}).getOr(!0)},Ul=function(e,t){var n,r,o,i=ir.fromDom(e),a=ir.fromDom(t);return n=a,r="pre,code",o=d(Ir,i),Gi(n,r,o).isSome()},Vl=function(e,t){return Ia(t)&&!1===(r=e,o=t,Po.isText(o)&&/^[ \t\r\n]*$/.test(o.data)&&!1===Ul(r,o))||(n=t,Po.isElement(n)&&"A"===n.nodeName&&n.hasAttribute("name"))||Hl(t);var n,r,o},Hl=Po.hasAttribute("data-mce-bookmark"),jl=Po.hasAttribute("data-mce-bogus"),ql=Po.hasAttributeValue("data-mce-bogus","all"),$l=function(e){return function(e){var t,n,r=0;if(Vl(e,e))return!1;if(!(n=e.firstChild))return!0;t=new ao(n,e);do{if(ql(n))n=t.next(!0);else if(jl(n))n=t.next();else if(Po.isBr(n))r++,n=t.next();else{if(Vl(e,n))return!1;n=t.next()}}while(n);return r<=1}(e.dom())},Wl=kr("block","position"),Kl=kr("from","to"),Xl=function(e,t){var n=ir.fromDom(e),r=ir.fromDom(t.container());return Ml(n,r).map(function(e){return Wl(e,t)})},Yl=function(o,i,e){var t=Xl(o,Cu.fromRangeStart(e)),n=t.bind(function(e){return nc.fromPosition(i,o,e.position()).bind(function(e){return Xl(o,e).map(function(e){return t=o,n=i,r=e,Po.isBr(r.position().getNode())&&!1===$l(r.block())?nc.positionIn(!1,r.block().dom()).bind(function(e){return e.isEqual(r.position())?nc.fromPosition(n,t,e).bind(function(e){return Xl(t,e)}):A.some(r)}).getOr(r):r;var t,n,r})})});return Ya([t,n],Kl).filter(function(e){return!1===Ir((r=e).from().block(),r.to().block())&&zr((n=e).from().block()).bind(function(t){return zr(n.to().block()).filter(function(e){return Ir(t,e)})}).isSome()&&(t=e,!1===Po.isContentEditableFalse(t.from().block())&&!1===Po.isContentEditableFalse(t.to().block()));var t,n,r})},Gl=function(e,t,n){return n.collapsed?Yl(e,t,n):A.none()},Jl=function(e,t,n){return Lr(t,e)?function(e,t){for(var n=P(t)?t:q(!1),r=e.dom(),o=[];null!==r.parentNode&&r.parentNode!==undefined;){var i=r.parentNode,a=ir.fromDom(i);if(o.push(a),!0===n(a))break;r=i}return o}(e,function(e){return n(e)||Ir(e,t)}).slice(0,-1):[]},Ql=function(e,t){return Jl(e,t,q(!1))},Zl=Ql,ef=function(e,t){return[e].concat(Ql(e,t))},tf=function(e){var t,n=(t=qr(e),G(t,mo).fold(function(){return t},function(e){return t.slice(0,e)}));return U(n,Oi),n},nf=function(e,t){var n=ef(t,e);return Y(n.reverse(),$l).each(Oi)},rf=function(e,t,n,r){if($l(n))return Gc(n),nc.firstPositionIn(n.dom());0===V(Hr(r),function(e){return!$l(e)}).length&&$l(t)&&Ti(r,ir.fromTag("br"));var o=nc.prevPosition(n.dom(),Cu.before(r.dom()));return U(tf(t),function(e){Ti(r,e)}),nf(e,t),o},of=function(e,t,n){if($l(n))return Oi(n),$l(t)&&Gc(t),nc.firstPositionIn(t.dom());var r=nc.lastPositionIn(n.dom());return U(tf(t),function(e){_i(n,e)}),nf(e,t),r},af=function(e,t){return Lr(t,e)?(n=ef(e,t),A.from(n[n.length-1])):A.none();var n},uf=function(e,t){nc.positionIn(e,t.dom()).map(function(e){return e.getNode()}).map(ir.fromDom).filter(po).each(Oi)},sf=function(e,t,n){return uf(!0,t),uf(!1,n),af(t,n).fold(d(of,e,t,n),d(rf,e,t,n))},cf=function(e,t,n,r){return t?sf(e,r,n):sf(e,n,r)},lf=function(t,n){var e,r=ir.fromDom(t.getBody());return(e=Gl(r.dom(),n,t.selection.getRng()).bind(function(e){return cf(r,n,e.from().block(),e.to().block())})).each(function(e){t.selection.setRng(e.toRange())}),e.isSome()},ff=function(e,t){var n=ir.fromDom(t),r=d(Ir,e);return Xi(n,xo,r).isSome()},df=function(e,t){var n,r,o=nc.prevPosition(e.dom(),Cu.fromRangeStart(t)).isNone(),i=nc.nextPosition(e.dom(),Cu.fromRangeEnd(t)).isNone();return!(ff(n=e,(r=t).startContainer)||ff(n,r.endContainer))&&o&&i},mf=function(e){var n,r,o,t,i=ir.fromDom(e.getBody()),a=e.selection.getRng();return df(i,a)?((t=e).setContent(""),t.selection.setCursorLocation(),!0):(n=i,r=e.selection,o=r.getRng(),Ya([Ml(n,ir.fromDom(o.startContainer)),Ml(n,ir.fromDom(o.endContainer))],function(e,t){return!1===Ir(e,t)&&(o.deleteContents(),cf(n,!0,e,t).each(function(e){r.setRng(e.toRange())}),!0)}).getOr(!1))},gf=function(e,t){return!e.selection.isCollapsed()&&mf(e)},pf=function(a){if(!D(a))throw new Error("cases must be an array");if(0===a.length)throw new Error("there must be at least one case");var u=[],n={};return U(a,function(e,r){var t=mr(e);if(1!==t.length)throw new Error("one and only one name per case");var o=t[0],i=e[o];if(n[o]!==undefined)throw new Error("duplicate key detected:"+o);if("cata"===o)throw new Error("cannot have a case named cata (sorry)");if(!D(i))throw new Error("case arguments must be an array");u.push(o),n[o]=function(){var e=arguments.length;if(e!==i.length)throw new Error("Wrong number of arguments to case "+o+". Expected "+i.length+" ("+i+"), got "+e);for(var n=new Array(e),t=0;t<n.length;t++)n[t]=arguments[t];return{fold:function(){if(arguments.length!==a.length)throw new Error("Wrong number of arguments to fold. Expected "+a.length+", got "+arguments.length);return arguments[r].apply(null,n)},match:function(e){var t=mr(e);if(u.length!==t.length)throw new Error("Wrong number of arguments to match. Expected: "+u.join(",")+"\nActual: "+t.join(","));if(!ee(u,function(e){return F(t,e)}))throw new Error("Not all branches were specified when using match. Specified: "+t.join(", ")+"\nRequired: "+u.join(", "));return e[o].apply(null,n)},log:function(e){H.console.log(e,{constructors:u,constructor:o,params:n})}}}}),n},hf=function(e){return Ts(e).exists(po)},vf=function(e,t,n){var r=V(ef(ir.fromDom(n.container()),t),mo),o=ne(r).getOr(t);return nc.fromPosition(e,o.dom(),n).filter(hf)},bf=function(e,t){return Ts(t).exists(po)||vf(!0,e,t).isSome()},yf=function(e,t){return(n=t,A.from(n.getNode(!0)).map(ir.fromDom)).exists(po)||vf(!1,e,t).isSome();var n},Cf=d(vf,!1),xf=d(vf,!0),wf=(tl="\xa0",function(e){return tl===e}),Nf=function(e){return/^[\r\n\t ]$/.test(e)},Ef=function(e){return!Nf(e)&&!wf(e)},Sf=function(n,r,o){return A.from(o.container()).filter(Po.isText).exists(function(e){var t=n?0:-1;return r(e.data.charAt(o.offset()+t))})},kf=d(Sf,!0,Nf),Tf=d(Sf,!1,Nf),Af=function(e){var t=e.container();return Po.isText(t)&&0===t.data.length},Rf=function(e,t){var n=ys(e,t);return Po.isContentEditableFalse(n)&&!Po.isBogusAll(n)},_f=d(Rf,0),Df=d(Rf,-1),Bf=function(e,t){return Po.isTable(ys(e,t))},Of=d(Bf,0),Pf=d(Bf,-1),If=pf([{remove:["element"]},{moveToElement:["element"]},{moveToPosition:["position"]}]),Lf=function(e,t,n,r){var o=r.getNode(!1===t);return Ml(ir.fromDom(e),ir.fromDom(n.getNode())).map(function(e){return $l(e)?If.remove(e.dom()):If.moveToElement(o)}).orThunk(function(){return A.some(If.moveToElement(o))})},Mf=function(u,s,c){return nc.fromPosition(s,u,c).bind(function(e){return a=e.getNode(),xo(ir.fromDom(a))||bo(ir.fromDom(a))?A.none():(t=u,o=e,i=function(e){return go(ir.fromDom(e))&&!bs(r,o,t)},Ss(!(n=s),r=c).fold(function(){return Ss(n,o).fold(q(!1),i)},i)?A.none():s&&Po.isContentEditableFalse(e.getNode())?Lf(u,s,c,e):!1===s&&Po.isContentEditableFalse(e.getNode(!0))?Lf(u,s,c,e):s&&Df(c)?A.some(If.moveToPosition(e)):!1===s&&_f(c)?A.some(If.moveToPosition(e)):A.none());var t,n,r,o,i,a})},Ff=function(r,e,o){return i=e,a=o.getNode(!1===i),u=i?"after":"before",Po.isElement(a)&&a.getAttribute("data-mce-caret")===u?(t=e,n=o.getNode(!1===e),t&&Po.isContentEditableFalse(n.nextSibling)?A.some(If.moveToElement(n.nextSibling)):!1===t&&Po.isContentEditableFalse(n.previousSibling)?A.some(If.moveToElement(n.previousSibling)):A.none()).fold(function(){return Mf(r,e,o)},A.some):Mf(r,e,o).bind(function(e){return t=r,n=o,e.fold(function(e){return A.some(If.remove(e))},function(e){return A.some(If.moveToElement(e))},function(e){return bs(n,e,t)?A.none():A.some(If.moveToPosition(e))});var t,n});var t,n,i,a,u},zf=function(e,t,n){if(0!==n){var r,o,i,a=e.data.slice(t,t+n),u=t+n>=e.data.length,s=0===t;e.replaceData(t,n,(o=s,i=u,X((r=a).split(""),function(e,t){return-1!==" \f\n\r\t\x0B".indexOf(t)||"\xa0"===t?e.previousCharIsSpace||""===e.str&&o||e.str.length===r.length-1&&i?{previousCharIsSpace:!1,str:e.str+"\xa0"}:{previousCharIsSpace:!0,str:e.str+" "}:{previousCharIsSpace:!1,str:e.str+t}},{previousCharIsSpace:!1,str:""}).str))}},Uf=function(e,t){var n,r=e.data.slice(t),o=r.length-(n=r,n.replace(/^\s+/g,"")).length;return zf(e,t,o)},Vf=function(e,t){return r=e,o=(n=t).container(),i=n.offset(),!1===Cu.isTextPosition(n)&&o===r.parentNode&&i>Cu.before(r).offset()?Cu(t.container(),t.offset()-1):t;var n,r,o,i},Hf=function(e){return Ia(e.previousSibling)?A.some((t=e.previousSibling,Po.isText(t)?Cu(t,t.data.length):Cu.after(t))):e.previousSibling?nc.lastPositionIn(e.previousSibling):A.none();var t},jf=function(e){return Ia(e.nextSibling)?A.some((t=e.nextSibling,Po.isText(t)?Cu(t,0):Cu.before(t))):e.nextSibling?nc.firstPositionIn(e.nextSibling):A.none();var t},qf=function(r,o){return Hf(o).orThunk(function(){return jf(o)}).orThunk(function(){return e=r,t=o,n=Cu.before(t.previousSibling?t.previousSibling:t.parentNode),nc.prevPosition(e,n).fold(function(){return nc.nextPosition(e,Cu.after(t))},A.some);var e,t,n})},$f=function(n,r){return jf(r).orThunk(function(){return Hf(r)}).orThunk(function(){return e=n,t=r,nc.nextPosition(e,Cu.after(t)).fold(function(){return nc.prevPosition(e,Cu.before(t))},A.some);var e,t})},Wf=function(e,t,n){return(r=e,o=t,i=n,r?$f(o,i):qf(o,i)).map(d(Vf,n));var r,o,i},Kf=function(t,n,e){e.fold(function(){t.focus()},function(e){t.selection.setRng(e.toRange(),n)})},Xf=function(e,t){return t&&e.schema.getBlockElements().hasOwnProperty(cr(t))},Yf=function(e){if($l(e)){var t=ir.fromHtml('<br data-mce-bogus="1">');return Bi(e),_i(e,t),A.some(Cu.before(t.dom()))}return A.none()},Gf=function(e,t,l){var n=Ur(e).filter(function(e){return Po.isText(e.dom())}),r=Vr(e).filter(function(e){return Po.isText(e.dom())});return Oi(e),Ya([n,r,t],function(e,t,n){var r,o,i,a,u=e.dom(),s=t.dom(),c=u.data.length;return o=s,i=l,a=Gn((r=u).data).length,r.appendData(o.data),Oi(ir.fromDom(o)),i&&Uf(r,a),n.container()===s?Cu(u,c):n}).orThunk(function(){return l&&(n.each(function(e){return t=e.dom(),n=e.dom().length,r=t.data.slice(0,n),o=r.length-Gn(r).length,zf(t,n-o,o);var t,n,r,o}),r.each(function(e){return Uf(e.dom(),0)})),t})},Jf=function(e,t){return n=e.schema.getTextInlineElements(),r=cr(t),gr.call(n,r);var n,r},Qf=function(t,n,e,r){void 0===r&&(r=!0);var o,i=Wf(n,t.getBody(),e.dom()),a=Xi(e,d(Xf,t),(o=t.getBody(),function(e){return e.dom()===o})),u=Gf(e,i,Jf(t,e));t.dom.isEmpty(t.getBody())?(t.setContent(""),t.selection.setCursorLocation()):a.bind(Yf).fold(function(){r&&Kf(t,n,u)},function(e){r&&Kf(t,n,A.some(e))})},Zf=function(a,u){var e,t,n,r,o,i;return(e=a.getBody(),t=u,n=a.selection.getRng(),r=Es(t?1:-1,e,n),o=Cu.fromRangeStart(r),i=ir.fromDom(e),!1===t&&Df(o)?A.some(If.remove(o.getNode(!0))):t&&_f(o)?A.some(If.remove(o.getNode())):!1===t&&_f(o)&&yf(i,o)?Cf(i,o).map(function(e){return If.remove(e.getNode())}):t&&Df(o)&&bf(i,o)?xf(i,o).map(function(e){return If.remove(e.getNode())}):Ff(e,t,o)).map(function(e){return e.fold((o=a,i=u,function(e){return o._selectionOverrides.hideFakeCaret(),Qf(o,i,ir.fromDom(e)),!0}),(n=a,r=u,function(e){var t=r?Cu.before(e):Cu.after(e);return n.selection.setRng(t.toRange()),!0}),(t=a,function(e){return t.selection.setRng(e.toRange()),!0}));var t,n,r,o,i}).getOr(!1)},ed=function(e,t){var n,r=e.selection.getNode();return!!Po.isContentEditableFalse(r)&&(n=ir.fromDom(e.getBody()),U($i(n,".mce-offscreen-selection"),Oi),Qf(e,t,ir.fromDom(e.selection.getNode())),Fl(e),!0)},td=function(e,t){return e.selection.isCollapsed()?Zf(e,t):ed(e,t)},nd=function(e){var t,n=function(e,t){for(;t&&t!==e;){if(Po.isContentEditableTrue(t)||Po.isContentEditableFalse(t))return t;t=t.parentNode}return null}(e.getBody(),e.selection.getNode());return Po.isContentEditableTrue(n)&&e.dom.isBlock(n)&&e.dom.isEmpty(n)&&(t=e.dom.create("br",{"data-mce-bogus":"1"}),e.dom.setHTML(n,""),n.appendChild(t),e.selection.setRng(Cu.before(t).toRange())),!0},rd=Po.isText,od=function(e){return rd(e)&&e.data[0]===ma},id=function(e){return rd(e)&&e.data[e.data.length-1]===ma},ad=function(e){return e.ownerDocument.createTextNode(ma)},ud=function(e,t){return e?function(e){if(rd(e.previousSibling))return id(e.previousSibling)||e.previousSibling.appendData(ma),e.previousSibling;if(rd(e))return od(e)||e.insertData(0,ma),e;var t=ad(e);return e.parentNode.insertBefore(t,e),t}(t):function(e){if(rd(e.nextSibling))return od(e.nextSibling)||e.nextSibling.insertData(0,ma),e.nextSibling;if(rd(e))return id(e)||e.appendData(ma),e;var t=ad(e);return e.nextSibling?e.parentNode.insertBefore(t,e.nextSibling):e.parentNode.appendChild(t),t}(t)},sd=d(ud,!0),cd=d(ud,!1),ld=function(e,t){return Po.isText(e.container())?ud(t,e.container()):ud(t,e.getNode())},fd=function(e,t){var n=t.get();return n&&e.container()===n&&ba(n)},dd=function(n,e){return e.fold(function(e){es.remove(n.get());var t=sd(e);return n.set(t),A.some(Cu(t,t.length-1))},function(e){return nc.firstPositionIn(e).map(function(e){if(fd(e,n))return Cu(n.get(),1);es.remove(n.get());var t=ld(e,!0);return n.set(t),Cu(t,1)})},function(e){return nc.lastPositionIn(e).map(function(e){if(fd(e,n))return Cu(n.get(),n.get().length-1);es.remove(n.get());var t=ld(e,!1);return n.set(t),Cu(t,t.length-1)})},function(e){es.remove(n.get());var t=cd(e);return n.set(t),A.some(Cu(t,1))})},md=function(e,t){for(var n=0;n<e.length;n++){var r=e[n].apply(null,t);if(r.isSome())return r}return A.none()},gd=pf([{before:["element"]},{start:["element"]},{end:["element"]},{after:["element"]}]),pd=function(e,t){var n=vs(t,e);return n||e},hd=function(e,t,n){var r=Ll.normalizeForwards(n),o=pd(t,r.container());return Ll.findRootInline(e,o,r).fold(function(){return nc.nextPosition(o,r).bind(d(Ll.findRootInline,e,o)).map(function(e){return gd.before(e)})},A.none)},vd=function(e,t){return null===qu(e,t)},bd=function(e,t,n){return Ll.findRootInline(e,t,n).filter(d(vd,t))},yd=function(e,t,n){var r=Ll.normalizeBackwards(n);return bd(e,t,r).bind(function(e){return nc.prevPosition(e,r).isNone()?A.some(gd.start(e)):A.none()})},Cd=function(e,t,n){var r=Ll.normalizeForwards(n);return bd(e,t,r).bind(function(e){return nc.nextPosition(e,r).isNone()?A.some(gd.end(e)):A.none()})},xd=function(e,t,n){var r=Ll.normalizeBackwards(n),o=pd(t,r.container());return Ll.findRootInline(e,o,r).fold(function(){return nc.prevPosition(o,r).bind(d(Ll.findRootInline,e,o)).map(function(e){return gd.after(e)})},A.none)},wd=function(e){return!1===Ll.isRtl(Ed(e))},Nd=function(e,t,n){return md([hd,yd,Cd,xd],[e,t,n]).filter(wd)},Ed=function(e){return e.fold($,$,$,$)},Sd=function(e){return e.fold(q("before"),q("start"),q("end"),q("after"))},kd=function(e){return e.fold(gd.before,gd.before,gd.after,gd.after)},Td=function(n,e,r,t,o,i){return Ya([Ll.findRootInline(e,r,t),Ll.findRootInline(e,r,o)],function(e,t){return e!==t&&Ll.hasSameParentBlock(r,e,t)?gd.after(n?e:t):i}).getOr(i)},Ad=function(e,r){return e.fold(q(!0),function(e){return n=r,!(Sd(t=e)===Sd(n)&&Ed(t)===Ed(n));var t,n})},Rd=function(e,t){return e?t.fold(j(A.some,gd.start),A.none,j(A.some,gd.after),A.none):t.fold(A.none,j(A.some,gd.before),A.none,j(A.some,gd.end))},_d=function(a,u,s,c){var e=Ll.normalizePosition(a,c),l=Nd(u,s,e);return Nd(u,s,e).bind(d(Rd,a)).orThunk(function(){return t=a,n=u,r=s,o=l,e=c,i=Ll.normalizePosition(t,e),nc.fromPosition(t,r,i).map(d(Ll.normalizePosition,t)).fold(function(){return o.map(kd)},function(e){return Nd(n,r,e).map(d(Td,t,n,r,i,e)).filter(d(Ad,o))}).filter(wd);var t,n,r,o,e,i})},Dd=Nd,Bd=_d,Od=(d(_d,!1),d(_d,!0),kd),Pd=function(e){return e.fold(gd.start,gd.start,gd.end,gd.end)},Id=function(e){return P(e.selection.getSel().modify)},Ld=function(e,t,n){var r=e?1:-1;return t.setRng(Cu(n.container(),n.offset()+r).toRange()),t.getSel().modify("move",e?"forward":"backward","word"),!0},Md=function(e,t){var n=t.selection.getRng(),r=e?Cu.fromRangeEnd(n):Cu.fromRangeStart(n);return!!Id(t)&&(e&&xa(r)?Ld(!0,t.selection,r):!(e||!wa(r))&&Ld(!1,t.selection,r))},Fd=function(e,t){var n=e.dom.createRng();n.setStart(t.container(),t.offset()),n.setEnd(t.container(),t.offset()),e.selection.setRng(n)},zd=function(e){return!1!==e.settings.inline_boundaries},Ud=function(e,t){e?t.setAttribute("data-mce-selected","inline-boundary"):t.removeAttribute("data-mce-selected")},Vd=function(t,e,n){return dd(e,n).map(function(e){return Fd(t,e),n})},Hd=function(e,t,n){return function(){return!!zd(t)&&Md(e,t)}},jd={move:function(a,u,s){return function(){return!!zd(a)&&(t=a,n=u,e=s,r=t.getBody(),o=Cu.fromRangeStart(t.selection.getRng()),i=d(Ll.isInlineTarget,t),Bd(e,i,r,o).bind(function(e){return Vd(t,n,e)})).isSome();var t,n,e,r,o,i}},moveNextWord:d(Hd,!0),movePrevWord:d(Hd,!1),setupSelectedState:function(a){var u=Li(null),s=d(Ll.isInlineTarget,a);return a.on("NodeChange",function(e){var t,n,r,o,i;zd(a)&&(t=s,n=a.dom,r=e.parents,o=V(n.select('*[data-mce-selected="inline-boundary"]'),t),i=V(r,t),U(te(o,i),d(Ud,!1)),U(te(i,o),d(Ud,!0)),function(e,t){if(e.selection.isCollapsed()&&!0!==e.composing&&t.get()){var n=Cu.fromRangeStart(e.selection.getRng());Cu.isTextPosition(n)&&!1===Ll.isAtZwsp(n)&&(Fd(e,es.removeAndReposition(t.get(),n)),t.set(null))}}(a,u),function(n,r,o,e){if(r.selection.isCollapsed()){var t=V(e,n);U(t,function(e){var t=Cu.fromRangeStart(r.selection.getRng());Dd(n,r.getBody(),t).bind(function(e){return Vd(r,o,e)})})}}(s,a,u,e.parents))}),u},setCaretPosition:Fd},qd=function(t,n){return function(e){return dd(n,e).map(function(e){return jd.setCaretPosition(t,e),!0}).getOr(!1)}},$d=function(r,o,i,a){var u=r.getBody(),s=d(Ll.isInlineTarget,r);r.undoManager.ignore(function(){var e,t,n;r.selection.setRng((e=i,t=a,(n=H.document.createRange()).setStart(e.container(),e.offset()),n.setEnd(t.container(),t.offset()),n)),r.execCommand("Delete"),Dd(s,u,Cu.fromRangeStart(r.selection.getRng())).map(Pd).map(qd(r,o))}),r.nodeChanged()},Wd=function(n,r,i,o){var e,t,a=(e=n.getBody(),t=o.container(),vs(t,e)||e),u=d(Ll.isInlineTarget,n),s=Dd(u,a,o);return s.bind(function(e){return i?e.fold(q(A.some(Pd(e))),A.none,q(A.some(Od(e))),A.none):e.fold(A.none,q(A.some(Od(e))),A.none,q(A.some(Pd(e))))}).map(qd(n,r)).getOrThunk(function(){var t=nc.navigate(i,a,o),e=t.bind(function(e){return Dd(u,a,e)});return s.isSome()&&e.isSome()?Ll.findRootInline(u,a,o).map(function(e){return o=e,!!Ya([nc.firstPositionIn(o),nc.lastPositionIn(o)],function(e,t){var n=Ll.normalizePosition(!0,e),r=Ll.normalizePosition(!1,t);return nc.nextPosition(o,n).map(function(e){return e.isEqual(r)}).getOr(!0)}).getOr(!0)&&(Qf(n,i,ir.fromDom(e)),!0);var o}).getOr(!1):e.bind(function(e){return t.map(function(e){return i?$d(n,r,o,e):$d(n,r,e,o),!0})}).getOr(!1)})},Kd=function(e,t,n){if(e.selection.isCollapsed()&&!1!==e.settings.inline_boundaries){var r=Cu.fromRangeStart(e.selection.getRng());return Wd(e,t,n,r)}return!1},Xd=kr("start","end"),Yd=kr("rng","table","cells"),Gd=pf([{removeTable:["element"]},{emptyCells:["cells"]}]),Jd=function(e,t){return Qi(ir.fromDom(e),"td,th",t)},Qd=function(e,t){return Gi(e,"table",t)},Zd=function(e){return!1===Ir(e.start(),e.end())},em=function(e,n){return Qd(e.start(),n).bind(function(t){return Qd(e.end(),n).bind(function(e){return Ir(t,e)?A.some(t):A.none()})})},tm=function(e){return $i(e,"td,th")},nm=function(r,e){var t=Jd(e.startContainer,r),n=Jd(e.endContainer,r);return e.collapsed?A.none():Ya([t,n],Xd).fold(function(){return t.fold(function(){return n.bind(function(t){return Qd(t,r).bind(function(e){return ne(tm(e)).map(function(e){return Xd(e,t)})})})},function(t){return Qd(t,r).bind(function(e){return re(tm(e)).map(function(e){return Xd(t,e)})})})},function(e){return rm(r,e)?A.none():(n=r,Qd((t=e).start(),n).bind(function(e){return re(tm(e)).map(function(e){return Xd(t.start(),e)})}));var t,n})},rm=function(e,t){return em(t,e).isSome()},om=function(e,t){var n,r,o,i,a=d(Ir,e);return(n=t,r=a,o=Jd(n.startContainer,r),i=Jd(n.endContainer,r),Ya([o,i],Xd).filter(Zd).filter(function(e){return rm(r,e)}).orThunk(function(){return nm(r,n)})).bind(function(e){return em(t=e,a).map(function(e){return Yd(t,e,tm(e))});var t})},im=function(e,t){return G(e,function(e){return Ir(e,t)})},am=function(n){return(r=n,Ya([im(r.cells(),r.rng().start()),im(r.cells(),r.rng().end())],function(e,t){return r.cells().slice(e,t+1)})).map(function(e){var t=n.cells();return e.length===t.length?Gd.removeTable(n.table()):Gd.emptyCells(e)});var r},um=function(e,t){return om(e,t).bind(am)},sm=function(e){var t=[];if(e)for(var n=0;n<e.rangeCount;n++)t.push(e.getRangeAt(n));return t},cm=sm,lm=function(e){return Z(e,function(e){var t=$a(e);return t?[ir.fromDom(t)]:[]})},fm=function(e){return 1<sm(e).length},dm=function(e){return V(lm(e),xo)},mm=function(e){return $i(e,"td[data-mce-selected],th[data-mce-selected]")},gm=function(e,t){var n=mm(t),r=dm(e);return 0<n.length?n:r},pm=gm,hm=function(e){return gm(cm(e.selection.getSel()),ir.fromDom(e.getBody()))},vm=function(e,t){return U(t,Gc),e.selection.setCursorLocation(t[0].dom(),0),!0},bm=function(e,t){return Qf(e,!1,t),!0},ym=function(n,e,r,t){return xm(e,t).fold(function(){return t=n,um(e,r).map(function(e){return e.fold(d(bm,t),d(vm,t))});var t},function(e){return wm(n,e)}).getOr(!1)},Cm=function(e,t){return Y(ef(t,e),xo)},xm=function(e,t){return Y(ef(t,e),function(e){return"caption"===cr(e)})},wm=function(e,t){return Gc(t),e.selection.setCursorLocation(t.dom(),0),A.some(!0)},Nm=function(u,s,c,l,f){return nc.navigate(c,u.getBody(),f).bind(function(e){return r=l,o=c,i=f,a=e,nc.firstPositionIn(r.dom()).bind(function(t){return nc.lastPositionIn(r.dom()).map(function(e){return o?i.isEqual(t)&&a.isEqual(e):i.isEqual(e)&&a.isEqual(t)})}).getOr(!0)?wm(u,l):(t=l,n=e,xm(s,ir.fromDom(n.getNode())).map(function(e){return!1===Ir(e,t)}));var t,n,r,o,i,a}).or(A.some(!0))},Em=function(a,u,s,e){var c=Cu.fromRangeStart(a.selection.getRng());return Cm(s,e).bind(function(e){return $l(e)?wm(a,e):(t=a,n=s,r=u,o=e,i=c,nc.navigate(r,t.getBody(),i).bind(function(e){return Cm(n,ir.fromDom(e.getNode())).map(function(e){return!1===Ir(e,o)})}));var t,n,r,o,i})},Sm=function(a,u,e){var s=ir.fromDom(a.getBody());return xm(s,e).fold(function(){return Em(a,u,s,e)},function(e){return t=a,n=u,r=s,o=e,i=Cu.fromRangeStart(t.selection.getRng()),$l(o)?wm(t,o):Nm(t,r,n,o,i);var t,n,r,o,i}).getOr(!1)},km=function(e,t){var n,r,o,i,a,u=ir.fromDom(e.selection.getStart(!0)),s=hm(e);return e.selection.isCollapsed()&&0===s.length?Sm(e,t,u):(n=e,r=u,o=ir.fromDom(n.getBody()),i=n.selection.getRng(),0!==(a=hm(n)).length?vm(n,a):ym(n,o,i,r))},Tm=hc.isEq,Am=function(e,t,n){var r=e.formatter.get(n);if(r)for(var o=0;o<r.length;o++)if(!1===r[o].inherit&&e.dom.is(t,r[o].selector))return!0;return!1},Rm=function(t,e,n,r){var o=t.dom.getRoot();return e!==o&&(e=t.dom.getParent(e,function(e){return!!Am(t,e,n)||e.parentNode===o||!!Bm(t,e,n,r,!0)}),Bm(t,e,n,r))},_m=function(e,t,n){return!!Tm(t,n.inline)||!!Tm(t,n.block)||(n.selector?1===t.nodeType&&e.is(t,n.selector):void 0)},Dm=function(e,t,n,r,o,i){var a,u,s,c=n[r];if(n.onmatch)return n.onmatch(t,n,r);if(c)if("undefined"==typeof c.length){for(a in c)if(c.hasOwnProperty(a)){if(u="attributes"===r?e.getAttrib(t,a):hc.getStyle(e,t,a),o&&!u&&!n.exact)return;if((!o||n.exact)&&!Tm(u,hc.normalizeStyleValue(e,hc.replaceVars(c[a],i),a)))return}}else for(s=0;s<c.length;s++)if("attributes"===r?e.getAttrib(t,c[s]):hc.getStyle(e,t,c[s]))return n;return n},Bm=function(e,t,n,r,o){var i,a,u,s,c=e.formatter.get(n),l=e.dom;if(c&&t)for(a=0;a<c.length;a++)if(i=c[a],_m(e.dom,t,i)&&Dm(l,t,i,"attributes",o,r)&&Dm(l,t,i,"styles",o,r)){if(s=i.classes)for(u=0;u<s.length;u++)if(!e.dom.hasClass(t,s[u]))return;return i}},Om={matchNode:Bm,matchName:_m,match:function(e,t,n,r){var o;return r?Rm(e,r,t,n):(r=e.selection.getNode(),!!Rm(e,r,t,n)||!((o=e.selection.getStart())===r||!Rm(e,o,t,n)))},matchAll:function(r,o,i){var e,a=[],u={};return e=r.selection.getStart(),r.dom.getParent(e,function(e){var t,n;for(t=0;t<o.length;t++)n=o[t],!u[n]&&Bm(r,e,n,i)&&(u[n]=!0,a.push(n))},r.dom.getRoot()),a},canApply:function(e,t){var n,r,o,i,a,u=e.formatter.get(t),s=e.dom;if(u)for(n=e.selection.getStart(),r=hc.getParents(s,n),i=u.length-1;0<=i;i--){if(!(a=u[i].selector)||u[i].defaultBlock)return!0;for(o=r.length-1;0<=o;o--)if(s.is(r[o],a))return!0}return!1},matchesUnInheritedFormatSelector:Am},Pm=function(e,t){return e.splitText(t)},Im=function(e){var t=e.startContainer,n=e.startOffset,r=e.endContainer,o=e.endOffset;return t===r&&Po.isText(t)?0<n&&n<t.nodeValue.length&&(t=(r=Pm(t,n)).previousSibling,n<o?(t=r=Pm(r,o-=n).previousSibling,o=r.nodeValue.length,n=0):o=0):(Po.isText(t)&&0<n&&n<t.nodeValue.length&&(t=Pm(t,n),n=0),Po.isText(r)&&0<o&&o<r.nodeValue.length&&(o=(r=Pm(r,o).previousSibling).nodeValue.length)),{startContainer:t,startOffset:n,endContainer:r,endOffset:o}},Lm=ma,Mm="_mce_caret",Fm=function(e){return 0<function(e){for(var t=[];e;){if(3===e.nodeType&&e.nodeValue!==Lm||1<e.childNodes.length)return[];1===e.nodeType&&t.push(e),e=e.firstChild}return t}(e).length},zm=function(e){var t;if(e)for(e=(t=new ao(e,e)).current();e;e=t.next())if(3===e.nodeType)return e;return null},Um=function(e){var t=ir.fromTag("span");return Cr(t,{id:Mm,"data-mce-bogus":"1","data-mce-type":"format-caret"}),e&&_i(t,ir.fromText(Lm)),t},Vm=function(e,t,n){void 0===n&&(n=!0);var r,o=e.dom,i=e.selection;if(Fm(t))Qf(e,!1,ir.fromDom(t),n);else{var a=i.getRng(),u=o.getParent(t,o.isBlock),s=((r=zm(t))&&r.nodeValue.charAt(0)===Lm&&r.deleteData(0,1),r);a.startContainer===s&&0<a.startOffset&&a.setStart(s,a.startOffset-1),a.endContainer===s&&0<a.endOffset&&a.setEnd(s,a.endOffset-1),o.remove(t,!0),u&&o.isEmpty(u)&&Gc(ir.fromDom(u)),i.setRng(a)}},Hm=function(e,t,n){void 0===n&&(n=!0);var r=e.dom,o=e.selection;if(t)Vm(e,t,n);else if(!(t=qu(e.getBody(),o.getStart())))for(;t=r.get(Mm);)Vm(e,t,!1)},jm=function(e,t,n){var r=e.dom,o=r.getParent(n,d(hc.isTextBlock,e));o&&r.isEmpty(o)?n.parentNode.replaceChild(t,n):(Yc(ir.fromDom(n)),r.isEmpty(n)?n.parentNode.replaceChild(t,n):r.insertAfter(t,n))},qm=function(e,t){return e.appendChild(t),t},$m=function(e,t){var n,r,o=(n=function(e,t){return qm(e,t.cloneNode(!1))},r=t,function(e,t){for(var n=e.length-1;0<=n;n--)t(e[n],n,e)}(e,function(e){r=n(r,e)}),r);return qm(o,o.ownerDocument.createTextNode(Lm))},Wm=function(i){i.on("mouseup keydown",function(e){var t,n,r,o;t=i,n=e.keyCode,r=t.selection,o=t.getBody(),Hm(t,null,!1),8!==n&&46!==n||!r.isCollapsed()||r.getStart().innerHTML!==Lm||Hm(t,qu(o,r.getStart())),37!==n&&39!==n||Hm(t,qu(o,r.getStart()))})},Km=function(e,t){return e.schema.getTextInlineElements().hasOwnProperty(cr(t))&&!ju(t.dom())&&!Po.isBogus(t.dom())},Xm=function(e){return 1===qr(e).length},Ym=function(e,t,n,r){var o,i,a,u,s=d(Km,t),c=W(V(r,s),function(e){return e.dom()});if(0===c.length)Qf(t,e,n);else{var l=(o=n.dom(),i=c,a=Um(!1),u=$m(i,a.dom()),Ti(ir.fromDom(o),a),Oi(ir.fromDom(o)),Cu(u,0));t.selection.setRng(l.toRange())}},Gm=function(r,o){var t,e=ir.fromDom(r.getBody()),n=ir.fromDom(r.selection.getStart()),i=V((t=ef(n,e),G(t,mo).fold(q(t),function(e){return t.slice(0,e)})),Xm);return re(i).map(function(e){var t,n=Cu.fromRangeStart(r.selection.getRng());return!(!zl(o,n,e.dom())||ju((t=e).dom())&&Fm(t.dom())||(Ym(o,r,e,i),0))}).getOr(!1)},Jm=function(e,t){return!!e.selection.isCollapsed()&&Gm(e,t)},Qm=Po.isContentEditableTrue,Zm=Po.isContentEditableFalse,eg=function(e,t,n,r,o){return t._selectionOverrides.showCaret(e,n,r,o)},tg=function(e,t){var n,r;return e.fire("BeforeObjectSelected",{target:t}).isDefaultPrevented()?null:((r=(n=t).ownerDocument.createRange()).selectNode(n),r)},ng=function(e,t,n){var r=Es(1,e.getBody(),t),o=Cu.fromRangeStart(r),i=o.getNode();if(Zm(i))return eg(1,e,i,!o.isAtEnd(),!1);var a=o.getNode(!0);if(Zm(a))return eg(1,e,a,!1,!1);var u=e.dom.getParent(o.getNode(),function(e){return Zm(e)||Qm(e)});return Zm(u)?eg(1,e,u,!1,n):null},rg=function(e,t,n){if(!t||!t.collapsed)return t;var r=ng(e,t,n);return r||t},og=function(e,t,n,r,o,i){var a,u,s=eg(r,e,i.getNode(!o),o,!0);if(t.collapsed){var c=t.cloneRange();o?c.setEnd(s.startContainer,s.startOffset):c.setStart(s.endContainer,s.endOffset),c.deleteContents()}else t.deleteContents();return e.selection.setRng(s),a=e.dom,u=n,Po.isText(u)&&0===u.data.length&&a.remove(u),!0},ig=function(e,t){return function(e,t){var n=e.selection.getRng();if(!Po.isText(n.commonAncestorContainer))return!1;var r=t?bu.Forwards:bu.Backwards,o=$s(e.getBody()),i=d(As,o.next),a=d(As,o.prev),u=t?i:a,s=t?_f:Df,c=ks(r,e.getBody(),n),l=Ll.normalizePosition(t,u(c));if(!l)return!1;if(s(l))return og(e,n,c.getNode(),r,t,l);var f=u(l);return!!(f&&s(f)&&Rs(l,f))&&og(e,n,c.getNode(),r,t,f)}(e,t)},ag=function(e,t){e.getDoc().execCommand(t,!1,null)},ug=function(e){td(e,!1)||ig(e,!1)||Kd(e,!1)||lf(e,!1)||km(e)||gf(e,!1)||Jm(e,!1)||(ag(e,"Delete"),Fl(e))},sg=function(e){td(e,!0)||ig(e,!0)||Kd(e,!0)||lf(e,!0)||km(e)||gf(e,!0)||Jm(e,!0)||ag(e,"ForwardDelete")},cg=function(o,t,e){var n=function(e){return t=o,n=e.dom(),r=Sr(n,t),A.from(r).filter(function(e){return 0<e.length});var t,n,r};return Yi(ir.fromDom(e),function(e){return n(e).isSome()},function(e){return Ir(ir.fromDom(t),e)}).bind(n)},lg=function(o){return function(r,e){return A.from(e).map(ir.fromDom).filter(fr).bind(function(e){return cg(o,r,e.dom()).or((t=o,n=e.dom(),A.from(bi.DOM.getStyle(n,t,!0))));var t,n}).getOr("")}},fg={getFontSize:lg("font-size"),getFontFamily:j(function(e){return e.replace(/[\'\"\\]/g,"").replace(/,\s+/g,",")},lg("font-family")),toPt:function(e,t){return/[0-9.]+px$/.test(e)?(n=72*parseInt(e,10)/96,r=t||0,o=Math.pow(10,r),Math.round(n*o)/o+"pt"):e;var n,r,o}},dg=function(e){return nc.firstPositionIn(e.getBody()).map(function(e){var t=e.container();return Po.isText(t)?t.parentNode:t})},mg=function(o){return A.from(o.selection.getRng()).bind(function(e){var t,n,r=o.getBody();return n=r,(t=e).startContainer===n&&0===t.startOffset?A.none():A.from(o.selection.getStart(!0))})},gg=function(e,t){if(/^[0-9\.]+$/.test(t)){var n=parseInt(t,10);if(1<=n&&n<=7){var r=Nl(e),o=El(e);return o?o[n-1]||t:r[n-1]||t}return t}return t},pg=function(e,t){return e&&t&&e.startContainer===t.startContainer&&e.startOffset===t.startOffset&&e.endContainer===t.endContainer&&e.endOffset===t.endOffset},hg=function(e,t,n){return null!==function(e,t,n){for(;e&&e!==t;){if(n(e))return e;e=e.parentNode}return null}(e,t,n)},vg=function(e,t,n){return hg(e,t,function(e){return e.nodeName===n})},bg=function(e){return e&&"TABLE"===e.nodeName},yg=function(e,t,n){for(var r=new ao(t,e.getParent(t.parentNode,e.isBlock)||e.getRoot());t=r[n?"prev":"next"]();)if(Po.isBr(t))return!0},Cg=function(e,t,n,r,o){var i,a,u,s,c,l,f=e.getRoot(),d=e.schema.getNonEmptyElements();if(u=e.getParent(o.parentNode,e.isBlock)||f,r&&Po.isBr(o)&&t&&e.isEmpty(u))return A.some(vu(o.parentNode,e.nodeIndex(o)));for(i=new ao(o,u);s=i[r?"prev":"next"]();){if("false"===e.getContentEditableParent(s)||(l=f,ya(c=s)&&!1===hg(c,l,ju)))return A.none();if(Po.isText(s)&&0<s.nodeValue.length)return!1===vg(s,f,"A")?A.some(vu(s,r?s.nodeValue.length:0)):A.none();if(e.isBlock(s)||d[s.nodeName.toLowerCase()])return A.none();a=s}return n&&a?A.some(vu(a,0)):A.none()},xg=function(e,t,n,r){var o,i,a,u,s,c,l,f,d,m,g=e.getRoot(),p=!1;if(o=r[(n?"start":"end")+"Container"],i=r[(n?"start":"end")+"Offset"],l=Po.isElement(o)&&i===o.childNodes.length,s=e.schema.getNonEmptyElements(),c=n,ya(o))return A.none();if(Po.isElement(o)&&i>o.childNodes.length-1&&(c=!1),Po.isDocument(o)&&(o=g,i=0),o===g){if(c&&(u=o.childNodes[0<i?i-1:0])){if(ya(u))return A.none();if(s[u.nodeName]||bg(u))return A.none()}if(o.hasChildNodes()){if(i=Math.min(!c&&0<i?i-1:i,o.childNodes.length-1),o=o.childNodes[i],i=Po.isText(o)&&l?o.data.length:0,!t&&o===g.lastChild&&bg(o))return A.none();if(function(e,t){for(;t&&t!==e;){if(Po.isContentEditableFalse(t))return!0;t=t.parentNode}return!1}(g,o)||ya(o))return A.none();if(o.hasChildNodes()&&!1===bg(o)){a=new ao(u=o,g);do{if(Po.isContentEditableFalse(u)||ya(u)){p=!1;break}if(Po.isText(u)&&0<u.nodeValue.length){i=c?0:u.nodeValue.length,o=u,p=!0;break}if(s[u.nodeName.toLowerCase()]&&(!(f=u)||!/^(TD|TH|CAPTION)$/.test(f.nodeName))){i=e.nodeIndex(u),o=u.parentNode,c||i++,p=!0;break}}while(u=c?a.next():a.prev())}}}return t&&(Po.isText(o)&&0===i&&Cg(e,l,t,!0,o).each(function(e){o=e.container(),i=e.offset(),p=!0}),Po.isElement(o)&&((u=o.childNodes[i])||(u=o.childNodes[i-1]),!u||!Po.isBr(u)||(m="A",(d=u).previousSibling&&d.previousSibling.nodeName===m)||yg(e,u,!1)||yg(e,u,!0)||Cg(e,l,t,!0,u).each(function(e){o=e.container(),i=e.offset(),p=!0}))),c&&!t&&Po.isText(o)&&i===o.nodeValue.length&&Cg(e,l,t,!1,o).each(function(e){o=e.container(),i=e.offset(),p=!0}),p?A.some(vu(o,i)):A.none()},wg=function(e,t){var n=t.collapsed,r=t.cloneRange(),o=vu.fromRangeStart(t);return xg(e,n,!0,r).each(function(e){n&&vu.isAbove(o,e)||r.setStart(e.container(),e.offset())}),n||xg(e,n,!1,r).each(function(e){r.setEnd(e.container(),e.offset())}),n&&r.collapse(!0),pg(t,r)?A.none():A.some(r)},Ng=function(e,t,n){var r=e.create("span",{},"&nbsp;");n.parentNode.insertBefore(r,n),t.scrollIntoView(r),e.remove(r)},Eg=function(e,t,n,r){var o=e.createRng();r?(o.setStartBefore(n),o.setEndBefore(n)):(o.setStartAfter(n),o.setEndAfter(n)),t.setRng(o)},Sg=function(e,t){var n,r,o=e.selection,i=e.dom,a=o.getRng();wg(i,a).each(function(e){a.setStart(e.startContainer,e.startOffset),a.setEnd(e.endContainer,e.endOffset)});var u=a.startOffset,s=a.startContainer;if(1===s.nodeType&&s.hasChildNodes()){var c=u>s.childNodes.length-1;s=s.childNodes[Math.min(u,s.childNodes.length-1)]||s,u=c&&3===s.nodeType?s.nodeValue.length:0}var l=i.getParent(s,i.isBlock),f=l?i.getParent(l.parentNode,i.isBlock):null,d=f?f.nodeName.toUpperCase():"",m=t&&t.ctrlKey;"LI"!==d||m||(l=f),s&&3===s.nodeType&&u>=s.nodeValue.length&&(function(e,t,n){for(var r,o=new ao(t,n),i=e.getNonEmptyElements();r=o.next();)if(i[r.nodeName.toLowerCase()]||0<r.length)return!0}(e.schema,s,l)||(n=i.create("br"),a.insertNode(n),a.setStartAfter(n),a.setEndAfter(n),r=!0)),n=i.create("br"),Du(i,a,n),Ng(i,o,n),Eg(i,o,n,r),e.undoManager.add()},kg=function(e,t){var n=ir.fromTag("br");Ti(ir.fromDom(t),n),e.undoManager.add()},Tg=function(e,t){Ag(e.getBody(),t)||Ai(ir.fromDom(t),ir.fromTag("br"));var n=ir.fromTag("br");Ai(ir.fromDom(t),n),Ng(e.dom,e.selection,n.dom()),Eg(e.dom,e.selection,n.dom(),!1),e.undoManager.add()},Ag=function(e,t){return n=Cu.after(t),!!Po.isBr(n.getNode())||nc.nextPosition(e,Cu.after(t)).map(function(e){return Po.isBr(e.getNode())}).getOr(!1);var n},Rg=function(e){return e&&"A"===e.nodeName&&"href"in e},_g=function(e){return e.fold(q(!1),Rg,Rg,q(!1))},Dg=function(e,t){t.fold(o,d(kg,e),d(Tg,e),o)},Bg=function(e,t){var n,r,o,i=(n=e,r=d(Ll.isInlineTarget,n),o=Cu.fromRangeStart(n.selection.getRng()),Dd(r,n.getBody(),o).filter(_g));i.isSome()?i.each(d(Dg,e)):Sg(e,t)},Og={create:kr("start","soffset","finish","foffset")},Pg=pf([{before:["element"]},{on:["element","offset"]},{after:["element"]}]),Ig=(Pg.before,Pg.on,Pg.after,function(e){return e.fold($,$,$)}),Lg=pf([{domRange:["rng"]},{relative:["startSitu","finishSitu"]},{exact:["start","soffset","finish","foffset"]}]),Mg={domRange:Lg.domRange,relative:Lg.relative,exact:Lg.exact,exactFromRange:function(e){return Lg.exact(e.start(),e.soffset(),e.finish(),e.foffset())},getWin:function(e){var t=e.match({domRange:function(e){return ir.fromDom(e.startContainer)},relative:function(e,t){return Ig(e)},exact:function(e,t,n,r){return e}});return Fr(t)},range:Og.create},Fg=rr.detect().browser,zg=function(e,t){var n=dr(t)?Bc(t).length:qr(t).length+1;return n<e?n:e<0?0:e},Ug=function(e){return Mg.range(e.start(),zg(e.soffset(),e.start()),e.finish(),zg(e.foffset(),e.finish()))},Vg=function(e,t){return!Po.isRestrictedNode(t.dom())&&(Lr(e,t)||Ir(e,t))},Hg=function(t){return function(e){return Vg(t,e.start())&&Vg(t,e.finish())}},jg=function(e){return!0===e.inline||Fg.isIE()},qg=function(e){return Mg.range(ir.fromDom(e.startContainer),e.startOffset,ir.fromDom(e.endContainer),e.endOffset)},$g=function(e){var t=e.getSelection();return(t&&0!==t.rangeCount?A.from(t.getRangeAt(0)):A.none()).map(qg)},Wg=function(e){var t=Fr(e);return $g(t.dom()).filter(Hg(e))},Kg=function(e,t){return A.from(t).filter(Hg(e)).map(Ug)},Xg=function(e){var t=H.document.createRange();try{return t.setStart(e.start().dom(),e.soffset()),t.setEnd(e.finish().dom(),e.foffset()),A.some(t)}catch(n){return A.none()}},Yg=function(e){return(e.bookmark?e.bookmark:A.none()).bind(d(Kg,ir.fromDom(e.getBody()))).bind(Xg)},Gg=function(e){var t=jg(e)?Wg(ir.fromDom(e.getBody())):A.none();e.bookmark=t.isSome()?t:e.bookmark},Jg=function(t){Yg(t).each(function(e){t.selection.setRng(e)})},Qg=Yg,Zg=function(e){return vo(e)||bo(e)},ep=function(e){return V(W(e.selection.getSelectedBlocks(),ir.fromDom),function(e){return!Zg(e)&&!zr(e).map(Zg).getOr(!1)})},tp=function(e,t){var n=e.settings,r=e.dom,o=e.selection,i=e.formatter,a=/[a-z%]+$/i.exec(n.indentation)[0],u=parseInt(n.indentation,10),s=e.getParam("indent_use_margin",!1);e.queryCommandState("InsertUnorderedList")||e.queryCommandState("InsertOrderedList")||n.forced_root_block||r.getParent(o.getNode(),r.isBlock)||i.apply("div"),U(ep(e),function(e){!function(e,t,n,r,o,i){if("false"!==e.getContentEditable(i)){var a=n?"margin":"padding";if(a="TABLE"===i.nodeName?"margin":a,a+="rtl"===e.getStyle(i,"direction",!0)?"Right":"Left","outdent"===t){var u=Math.max(0,parseInt(i.style[a]||0,10)-r);e.setStyle(i,a,u?u+o:"")}else u=parseInt(i.style[a]||0,10)+r+o,e.setStyle(i,a,u)}}(r,t,s,u,a,e.dom())})},np=Jt.each,rp=Jt.extend,op=Jt.map,ip=Jt.inArray;function ap(s){var o,i,a,t,c={state:{},exec:{},value:{}},n=s.settings;s.on("PreInit",function(){o=s.dom,i=s.selection,n=s.settings,a=s.formatter});var r=function(e){var t;if(!s.quirks.isHidden()&&!s.removed){if(e=e.toLowerCase(),t=c.state[e])return t(e);try{return s.getDoc().queryCommandState(e)}catch(n){}return!1}},e=function(e,n){n=n||"exec",np(e,function(t,e){np(e.toLowerCase().split(","),function(e){c[n][e]=t})})},u=function(e,t,n){e=e.toLowerCase(),c.value[e]=function(){return t.call(n||s)}};rp(this,{execCommand:function(t,n,r,e){var o,i,a=!1;if(!s.removed){if(/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint)$/.test(t)||e&&e.skip_focus?Jg(s):s.focus(),(e=s.fire("BeforeExecCommand",{command:t,ui:n,value:r})).isDefaultPrevented())return!1;if(i=t.toLowerCase(),o=c.exec[i])return o(i,n,r),s.fire("ExecCommand",{command:t,ui:n,value:r}),!0;if(np(s.plugins,function(e){if(e.execCommand&&e.execCommand(t,n,r))return s.fire("ExecCommand",{command:t,ui:n,value:r}),!(a=!0)}),a)return a;if(s.theme&&s.theme.execCommand&&s.theme.execCommand(t,n,r))return s.fire("ExecCommand",{command:t,ui:n,value:r}),!0;try{a=s.getDoc().execCommand(t,n,r)}catch(u){}return!!a&&(s.fire("ExecCommand",{command:t,ui:n,value:r}),!0)}},queryCommandState:r,queryCommandValue:function(e){var t;if(!s.quirks.isHidden()&&!s.removed){if(e=e.toLowerCase(),t=c.value[e])return t(e);try{return s.getDoc().queryCommandValue(e)}catch(n){}}},queryCommandSupported:function(e){if(e=e.toLowerCase(),c.exec[e])return!0;try{return s.getDoc().queryCommandSupported(e)}catch(t){}return!1},addCommands:e,addCommand:function(e,o,i){e=e.toLowerCase(),c.exec[e]=function(e,t,n,r){return o.call(i||s,t,n,r)}},addQueryStateHandler:function(e,t,n){e=e.toLowerCase(),c.state[e]=function(){return t.call(n||s)}},addQueryValueHandler:u,hasCustomCommand:function(e){return e=e.toLowerCase(),!!c.exec[e]}});var l=function(e,t,n){return t===undefined&&(t=!1),n===undefined&&(n=null),s.getDoc().execCommand(e,t,n)},f=function(e){return a.match(e)},d=function(e,t){a.toggle(e,t?{value:t}:undefined),s.nodeChanged()},m=function(e){t=i.getBookmark(e)},g=function(){i.moveToBookmark(t)};e({"mceResetDesignMode,mceBeginUndoLevel":function(){},"mceEndUndoLevel,mceAddUndoLevel":function(){s.undoManager.add()},"Cut,Copy,Paste":function(e){var t,n=s.getDoc();try{l(e)}catch(o){t=!0}if("paste"!==e||n.queryCommandEnabled(e)||(t=!0),t||!n.queryCommandSupported(e)){var r=s.translate("Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.");ge.mac&&(r=r.replace(/Ctrl\+/g,"\u2318+")),s.notificationManager.open({text:r,type:"error"})}},unlink:function(){if(i.isCollapsed()){var e=s.dom.getParent(s.selection.getStart(),"a");e&&s.dom.remove(e,!0)}else a.remove("link")},"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull,JustifyNone":function(e){var t=e.substring(7);"full"===t&&(t="justify"),np("left,center,right,justify".split(","),function(e){t!==e&&a.remove("align"+e)}),"none"!==t&&d("align"+t)},"InsertUnorderedList,InsertOrderedList":function(e){var t,n;l(e),(t=o.getParent(i.getNode(),"ol,ul"))&&(n=t.parentNode,/^(H[1-6]|P|ADDRESS|PRE)$/.test(n.nodeName)&&(m(),o.split(n,t),g()))},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(e){d(e)},"ForeColor,HiliteColor":function(e,t,n){d(e,n)},FontName:function(e,t,n){var r,o;o=n,(r=s).formatter.toggle("fontname",{value:gg(r,o)}),r.nodeChanged()},FontSize:function(e,t,n){var r,o;o=n,(r=s).formatter.toggle("fontsize",{value:gg(r,o)}),r.nodeChanged()},RemoveFormat:function(e){a.remove(e)},mceBlockQuote:function(){d("blockquote")},FormatBlock:function(e,t,n){return d(n||"p")},mceCleanup:function(){var e=i.getBookmark();s.setContent(s.getContent()),i.moveToBookmark(e)},mceRemoveNode:function(e,t,n){var r=n||i.getNode();r!==s.getBody()&&(m(),s.dom.remove(r,!0),g())},mceSelectNodeDepth:function(e,t,n){var r=0;o.getParent(i.getNode(),function(e){if(1===e.nodeType&&r++===n)return i.select(e),!1},s.getBody())},mceSelectNode:function(e,t,n){i.select(n)},mceInsertContent:function(e,t,n){ul(s,n)},mceInsertRawHTML:function(e,t,n){i.setContent("tiny_mce_marker");var r=s.getContent();s.setContent(r.replace(/tiny_mce_marker/g,function(){return n}))},mceToggleFormat:function(e,t,n){d(n)},mceSetContent:function(e,t,n){s.setContent(n)},"Indent,Outdent":function(e){tp(s,e)},mceRepaint:function(){},InsertHorizontalRule:function(){s.execCommand("mceInsertContent",!1,"<hr />")},mceToggleVisualAid:function(){s.hasVisual=!s.hasVisual,s.addVisual()},mceReplaceContent:function(e,t,n){s.execCommand("mceInsertContent",!1,n.replace(/\{\$selection\}/g,i.getContent({format:"text"})))},mceInsertLink:function(e,t,n){var r;"string"==typeof n&&(n={href:n}),r=o.getParent(i.getNode(),"a"),n.href=n.href.replace(" ","%20"),r&&n.href||a.remove("link"),n.href&&a.apply("link",n,r)},selectAll:function(){var e=o.getParent(i.getStart(),Po.isContentEditableTrue);if(e){var t=o.createRng();t.selectNodeContents(e),i.setRng(t)}},"delete":function(){ug(s)},forwardDelete:function(){sg(s)},mceNewDocument:function(){s.setContent("")},InsertLineBreak:function(e,t,n){return Bg(s,n),!0}});var p=function(n){return function(){var e=i.isCollapsed()?[o.getParent(i.getNode(),o.isBlock)]:i.getSelectedBlocks(),t=op(e,function(e){return!!a.matchNode(e,n)});return-1!==ip(t,!0)}};e({JustifyLeft:p("alignleft"),JustifyCenter:p("aligncenter"),JustifyRight:p("alignright"),JustifyFull:p("alignjustify"),"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(e){return f(e)},mceBlockQuote:function(){return f("blockquote")},Outdent:function(){var e;if(n.inline_styles){if((e=o.getParent(i.getStart(),o.isBlock))&&0<parseInt(e.style.paddingLeft,10))return!0;if((e=o.getParent(i.getEnd(),o.isBlock))&&0<parseInt(e.style.paddingLeft,10))return!0}return r("InsertUnorderedList")||r("InsertOrderedList")||!n.inline_styles&&!!o.getParent(i.getNode(),"BLOCKQUOTE")},"InsertUnorderedList,InsertOrderedList":function(e){var t=o.getParent(i.getNode(),"ul,ol");return t&&("insertunorderedlist"===e&&"UL"===t.tagName||"insertorderedlist"===e&&"OL"===t.tagName)}},"state"),e({Undo:function(){s.undoManager.undo()},Redo:function(){s.undoManager.redo()}}),u("FontName",function(){return mg(t=s).fold(function(){return dg(t).map(function(e){return fg.getFontFamily(t.getBody(),e)}).getOr("")},function(e){return fg.getFontFamily(t.getBody(),e)});var t},this),u("FontSize",function(){return mg(t=s).fold(function(){return dg(t).map(function(e){return fg.getFontSize(t.getBody(),e)}).getOr("")},function(e){return fg.getFontSize(t.getBody(),e)});var t},this)}var up=Jt.makeMap("focus blur focusin focusout click dblclick mousedown mouseup mousemove mouseover beforepaste paste cut copy selectionchange mouseout mouseenter mouseleave wheel keydown keypress keyup input contextmenu dragstart dragend dragover draggesture dragdrop drop drag submit compositionstart compositionend compositionupdate touchstart touchmove touchend"," "),sp=function(a){var u,s,c=this,l={},f=function(){return!1},d=function(){return!0};u=(a=a||{}).scope||c,s=a.toggleEvent||f;var r=function(e,t,n,r){var o,i,a;if(!1===t&&(t=f),t)for(t={func:t},r&&Jt.extend(t,r),a=(i=e.toLowerCase().split(" ")).length;a--;)e=i[a],(o=l[e])||(o=l[e]=[],s(e,!0)),n?o.unshift(t):o.push(t);return c},m=function(e,t){var n,r,o,i,a;if(e)for(n=(i=e.toLowerCase().split(" ")).length;n--;){if(e=i[n],r=l[e],!e){for(o in l)s(o,!1),delete l[o];return c}if(r){if(t)for(a=r.length;a--;)r[a].func===t&&(r=r.slice(0,a).concat(r.slice(a+1)),l[e]=r);else r.length=0;r.length||(s(e,!1),delete l[e])}}else{for(e in l)s(e,!1);l={}}return c};c.fire=function(e,t){var n,r,o,i;if(e=e.toLowerCase(),(t=t||{}).type=e,t.target||(t.target=u),t.preventDefault||(t.preventDefault=function(){t.isDefaultPrevented=d},t.stopPropagation=function(){t.isPropagationStopped=d},t.stopImmediatePropagation=function(){t.isImmediatePropagationStopped=d},t.isDefaultPrevented=f,t.isPropagationStopped=f,t.isImmediatePropagationStopped=f),a.beforeFire&&a.beforeFire(t),n=l[e])for(r=0,o=n.length;r<o;r++){if((i=n[r]).once&&m(e,i.func),t.isImmediatePropagationStopped())return t.stopPropagation(),t;if(!1===i.func.call(u,t))return t.preventDefault(),t}return t},c.on=r,c.off=m,c.once=function(e,t,n){return r(e,t,n,{once:!0})},c.has=function(e){return e=e.toLowerCase(),!(!l[e]||0===l[e].length)}};sp.isNative=function(e){return!!up[e.toLowerCase()]};var cp,lp=function(n){return n._eventDispatcher||(n._eventDispatcher=new sp({scope:n,toggleEvent:function(e,t){sp.isNative(e)&&n.toggleNativeEvent&&n.toggleNativeEvent(e,t)}})),n._eventDispatcher},fp={fire:function(e,t,n){if(this.removed&&"remove"!==e&&"detach"!==e)return t;if(t=lp(this).fire(e,t,n),!1!==n&&this.parent)for(var r=this.parent();r&&!t.isPropagationStopped();)r.fire(e,t,!1),r=r.parent();return t},on:function(e,t,n){return lp(this).on(e,t,n)},off:function(e,t){return lp(this).off(e,t)},once:function(e,t){return lp(this).once(e,t)},hasEventListeners:function(e){return lp(this).has(e)}},dp=function(e,t){return e.fire("PreProcess",t)},mp=function(e,t){return e.fire("PostProcess",t)},gp=function(e){return e.fire("remove")},pp=function(e){return e.fire("detach")},hp=function(e,t){return e.fire("SwitchMode",{mode:t})},vp=function(e,t,n,r){e.fire("ObjectResizeStart",{target:t,width:n,height:r})},bp=function(e,t,n,r){e.fire("ObjectResized",{target:t,width:n,height:r})},yp=function(e,t,n){try{e.getDoc().execCommand(t,!1,n)}catch(r){}},Cp=function(e,t,n){var r,o;ji(e,t)&&!1===n?(o=t,Fi(r=e)?r.dom().classList.remove(o):Ui(r,o),Hi(r)):n&&Vi(e,t)},xp=function(e,t){Cp(ir.fromDom(e.getBody()),"mce-content-readonly",t),t?(e.selection.controlSelection.hideResizeRect(),e.readonly=!0,e.getBody().contentEditable="false"):(e.readonly=!1,e.getBody().contentEditable="true",yp(e,"StyleWithCSS",!1),yp(e,"enableInlineTableEditing",!1),yp(e,"enableObjectResizing",!1),e.focus(),e.nodeChanged())},wp=function(e){return e.readonly?"readonly":"design"},Np=bi.DOM,Ep=function(e,t){return"selectionchange"===t?e.getDoc():!e.inline&&/^mouse|touch|click|contextmenu|drop|dragover|dragend/.test(t)?e.getDoc().documentElement:e.settings.event_root?(e.eventRoot||(e.eventRoot=Np.select(e.settings.event_root)[0]),e.eventRoot):e.getBody()},Sp=function(e,t,n){var r;(r=e).hidden||r.readonly?!0===e.readonly&&n.preventDefault():e.fire(t,n)},kp=function(i,a){var e,t;if(i.delegates||(i.delegates={}),!i.delegates[a]&&!i.removed)if(e=Ep(i,a),i.settings.event_root){if(cp||(cp={},i.editorManager.on("removeEditor",function(){var e;if(!i.editorManager.activeEditor&&cp){for(e in cp)i.dom.unbind(Ep(i,e));cp=null}})),cp[a])return;t=function(e){for(var t=e.target,n=i.editorManager.get(),r=n.length;r--;){var o=n[r].getBody();(o===t||Np.isChildOf(t,o))&&Sp(n[r],a,e)}},cp[a]=t,Np.bind(e,a,t)}else t=function(e){Sp(i,a,e)},Np.bind(e,a,t),i.delegates[a]=t},Tp={bindPendingEventDelegates:function(){var t=this;Jt.each(t._pendingNativeEvents,function(e){kp(t,e)})},toggleNativeEvent:function(e,t){var n=this;"focus"!==e&&"blur"!==e&&(t?n.initialized?kp(n,e):n._pendingNativeEvents?n._pendingNativeEvents.push(e):n._pendingNativeEvents=[e]:n.initialized&&(n.dom.unbind(Ep(n,e),e,n.delegates[e]),delete n.delegates[e]))},unbindAllNativeEvents:function(){var e,t=this,n=t.getBody(),r=t.dom;if(t.delegates){for(e in t.delegates)t.dom.unbind(Ep(t,e),e,t.delegates[e]);delete t.delegates}!t.inline&&n&&r&&(n.onload=null,r.unbind(t.getWin()),r.unbind(t.getDoc())),r&&(r.unbind(n),r.unbind(t.getContainer()))}},Ap=Tp=Jt.extend({},fp,Tp),Rp=kr("sections","settings"),_p=rr.detect().deviceType.isTouch(),Dp=["lists","autolink","autosave"],Bp={theme:"mobile"},Op=function(e){var t=D(e)?e.join(" "):e,n=W(R(t)?t.split(" "):[],Yn);return V(n,function(e){return 0<e.length})},Pp=function(n,e){var r,o,i,t=(r=function(e,t){return F(n,t)},o={},i={},pr(e,function(e,t){(r(e,t)?o:i)[t]=e}),{t:o,f:i});return Rp(t.t,t.f)},Ip=function(e,t){return e.sections().hasOwnProperty(t)},Lp=function(e,t,n,r){var o,i=Op(n.forced_plugins),a=Op(r.plugins),u=e&&Ip(t,"mobile")?V(a,d(F,Dp)):a,s=(o=u,[].concat(Op(i)).concat(Op(o)));return Jt.extend(r,{plugins:s.join(" ")})},Mp=function(e,t,n,r){var o,i,a,u,s,c,l,f,d,m,g=Pp(["mobile"],r),p=Jt.extend(t,n,g.settings(),(f=e,m=(d=g).settings().inline,f&&Ip(d,"mobile")&&!m?(u="mobile",s=Bp,c=g.sections(),l=c.hasOwnProperty(u)?c[u]:{},Jt.extend({},s,l)):{}),{validate:!0,content_editable:g.settings().inline,external_plugins:(o=n,i=g.settings(),a=i.external_plugins?i.external_plugins:{},o&&o.external_plugins?Jt.extend({},o.external_plugins,a):a)});return Lp(e,g,n,p)},Fp=function(e,t,n){return A.from(t.settings[n]).filter(e)},zp=function(e,t,n,r){var o,i,a,u=t in e.settings?e.settings[t]:n;return"hash"===r?(a={},"string"==typeof(i=u)?U(0<i.indexOf("=")?i.split(/[;,](?![^=;,]*(?:[;,]|$))/):i.split(","),function(e){var t=e.split("=");1<t.length?a[Jt.trim(t[0])]=Jt.trim(t[1]):a[Jt.trim(t[0])]=Jt.trim(t)}):a=i,a):"string"===r?Fp(R,e,t).getOr(n):"number"===r?Fp(I,e,t).getOr(n):"boolean"===r?Fp(O,e,t).getOr(n):"object"===r?Fp(_,e,t).getOr(n):"array"===r?Fp(D,e,t).getOr(n):"string[]"===r?Fp((o=R,function(e){return D(e)&&ee(e,o)}),e,t).getOr(n):"function"===r?Fp(P,e,t).getOr(n):u},Up=Jt.each,Vp=Jt.explode,Hp={f1:112,f2:113,f3:114,f4:115,f5:116,f6:117,f7:118,f8:119,f9:120,f10:121,f11:122,f12:123},jp=Jt.makeMap("alt,ctrl,shift,meta,access");function qp(i){var a={},r=[],u=function(e){var t,n,r={};for(n in Up(Vp(e,"+"),function(e){e in jp?r[e]=!0:/^[0-9]{2,}$/.test(e)?r.keyCode=parseInt(e,10):(r.charCode=e.charCodeAt(0),r.keyCode=Hp[e]||e.toUpperCase().charCodeAt(0))}),t=[r.keyCode],jp)r[n]?t.push(n):r[n]=!1;return r.id=t.join(","),r.access&&(r.alt=!0,ge.mac?r.ctrl=!0:r.shift=!0),r.meta&&(ge.mac?r.meta=!0:(r.ctrl=!0,r.meta=!1)),r},s=function(e,t,n,r){var o;return(o=Jt.map(Vp(e,">"),u))[o.length-1]=Jt.extend(o[o.length-1],{func:n,scope:r||i}),Jt.extend(o[0],{desc:i.translate(t),subpatterns:o.slice(1)})},o=function(e,t){return!!t&&t.ctrl===e.ctrlKey&&t.meta===e.metaKey&&t.alt===e.altKey&&t.shift===e.shiftKey&&!!(e.keyCode===t.keyCode||e.charCode&&e.charCode===t.charCode)&&(e.preventDefault(),!0)},c=function(e){return e.func?e.func.call(e.scope):null};i.on("keyup keypress keydown",function(t){var e,n;((n=t).altKey||n.ctrlKey||n.metaKey||"keydown"===(e=t).type&&112<=e.keyCode&&e.keyCode<=123)&&!t.isDefaultPrevented()&&(Up(a,function(e){if(o(t,e))return r=e.subpatterns.slice(0),"keydown"===t.type&&c(e),!0}),o(t,r[0])&&(1===r.length&&"keydown"===t.type&&c(r[0]),r.shift()))}),this.add=function(e,n,r,o){var t;return"string"==typeof(t=r)?r=function(){i.execCommand(t,!1,null)}:Jt.isArray(t)&&(r=function(){i.execCommand(t[0],t[1],t[2])}),Up(Vp(Jt.trim(e.toLowerCase())),function(e){var t=s(e,n,r,o);a[t.id]=t}),!0},this.remove=function(e){var t=s(e);return!!a[t.id]&&(delete a[t.id],!0)}}var $p=function(e){var t=Mr(e).dom();return e.dom()===t.activeElement},Wp=function(t){return(e=Mr(t),n=e!==undefined?e.dom():H.document,A.from(n.activeElement).map(ir.fromDom)).filter(function(e){return t.dom().contains(e.dom())});var e,n},Kp=function(t,e){return(n=e,n.collapsed?A.from(Wa(n.startContainer,n.startOffset)).map(ir.fromDom):A.none()).bind(function(e){return Co(e)?A.some(e):!1===Lr(t,e)?A.some(t):A.none()});var n},Xp=function(t,e){Kp(ir.fromDom(t.getBody()),e).bind(function(e){return nc.firstPositionIn(e.dom())}).fold(function(){t.selection.normalize()},function(e){return t.selection.setRng(e.toRange())})},Yp=function(e){if(e.setActive)try{e.setActive()}catch(t){e.focus()}else e.focus()},Gp=function(e){var t,n=e.getBody();return n&&(t=ir.fromDom(n),$p(t)||Wp(t).isSome())},Jp=function(e){return e.inline?Gp(e):(t=e).iframeElement&&$p(ir.fromDom(t.iframeElement));var t},Qp=function(e){return e.editorManager.setActive(e)},Zp=function(e,t){e.removed||(t?Qp(e):function(t){var e=t.selection,n=t.settings.content_editable,r=t.getBody(),o=e.getRng();t.quirks.refreshContentEditable();var i,a,u=(i=t,a=e.getNode(),i.dom.getParent(a,function(e){return"true"===i.dom.getContentEditable(e)}));if(t.$.contains(r,u))return Yp(u),Xp(t,o),Qp(t);t.bookmark!==undefined&&!1===Jp(t)&&Qg(t).each(function(e){t.selection.setRng(e),o=e}),n||(ge.opera||Yp(r),t.getWin().focus()),(ge.gecko||n)&&(Yp(r),Xp(t,o)),Qp(t)}(e))},eh=Jp,th=function(e,t){return t.dom()[e]},nh=function(e,t){return parseInt(Er(t,e),10)},rh=d(th,"clientWidth"),oh=d(th,"clientHeight"),ih=d(nh,"margin-top"),ah=d(nh,"margin-left"),uh=function(e,t,n){var r,o,i,a,u,s,c,l,f,d,m,g=ir.fromDom(e.getBody()),p=e.inline?g:(r=g,ir.fromDom(r.dom().ownerDocument.documentElement)),h=(o=e.inline,a=t,u=n,s=(i=p).dom().getBoundingClientRect(),{x:a-(o?s.left+i.dom().clientLeft+ah(i):0),y:u-(o?s.top+i.dom().clientTop+ih(i):0)});return l=h.x,f=h.y,d=rh(c=p),m=oh(c),0<=l&&0<=f&&l<=d&&f<=m},sh=function(e){var t,n=e.inline?e.getBody():e.getContentAreaContainer();return(t=n,A.from(t).map(ir.fromDom)).map(function(e){return Lr(Mr(e),e)}).getOr(!1)};function ch(n){var t,o=[],i=function(){var e,t=n.theme;return t&&t.getNotificationManagerImpl?t.getNotificationManagerImpl():{open:e=function(){throw new Error("Theme did not provide a NotificationManager implementation.")},close:e,reposition:e,getArgs:e}},a=function(){0<o.length&&i().reposition(o)},u=function(t){G(o,function(e){return e===t}).each(function(e){o.splice(e,1)})},r=function(r){if(!n.removed&&sh(n))return Y(o,function(e){return t=i().getArgs(e),n=r,!(t.type!==n.type||t.text!==n.text||t.progressBar||t.timeout||n.progressBar||n.timeout);var t,n}).getOrThunk(function(){n.editorManager.setActive(n);var e,t=i().open(r,function(){u(t),a()});return e=t,o.push(e),a(),t})};return(t=n).on("SkinLoaded",function(){var e=t.settings.service_message;e&&r({text:e,type:"warning",timeout:0,icon:""})}),t.on("ResizeEditor ResizeWindow",function(){ye.requestAnimationFrame(a)}),t.on("remove",function(){U(o.slice(),function(e){i().close(e)})}),{open:r,close:function(){A.from(o[0]).each(function(e){i().close(e),u(e),a()})},getNotifications:function(){return o}}}function lh(r){var o=[],i=function(){var e,t=r.theme;return t&&t.getWindowManagerImpl?t.getWindowManagerImpl():{open:e=function(){throw new Error("Theme did not provide a WindowManager implementation.")},alert:e,confirm:e,close:e,getParams:e,setParams:e}},a=function(e,t){return function(){return t?t.apply(e,arguments):undefined}},u=function(e){var t;o.push(e),t=e,r.fire("OpenWindow",{win:t})},s=function(n){G(o,function(e){return e===n}).each(function(e){var t;o.splice(e,1),t=n,r.fire("CloseWindow",{win:t}),0===o.length&&r.focus()})},e=function(){return A.from(o[o.length-1])};return r.on("remove",function(){U(o.slice(0),function(e){i().close(e)})}),{windows:o,open:function(e,t){r.editorManager.setActive(r),Gg(r);var n=i().open(e,t,s);return u(n),n},alert:function(e,t,n){var r=i().alert(e,a(n||this,t),s);u(r)},confirm:function(e,t,n){var r=i().confirm(e,a(n||this,t),s);u(r)},close:function(){e().each(function(e){i().close(e),s(e)})},getParams:function(){return e().map(i().getParams).getOr(null)},setParams:function(t){e().each(function(e){i().setParams(e,t)})},getWindows:function(){return o}}}var fh={},dh="en",mh={setCode:function(e){e&&(dh=e,this.rtl=!!this.data[e]&&"rtl"===this.data[e]._dir)},getCode:function(){return dh},rtl:!1,add:function(e,t){var n=fh[e];for(var r in n||(fh[e]=n={}),t)n[r]=t[r];this.setCode(e)},translate:function(e){var t=fh[dh]||{},n=function(e){return Jt.is(e,"function")?Object.prototype.toString.call(e):r(e)?"":""+e},r=function(e){return""===e||null===e||Jt.is(e,"undefined")},o=function(e){return e=n(e),Jt.hasOwn(t,e)?n(t[e]):e};if(r(e))return"";if(Jt.is(e,"object")&&Jt.hasOwn(e,"raw"))return n(e.raw);if(Jt.is(e,"array")){var i=e.slice(1);e=o(e[0]).replace(/\{([0-9]+)\}/g,function(e,t){return Jt.hasOwn(i,t)?n(i[t]):e})}return o(e).replace(/{context:\w+}$/,"")},data:fh},gh=ki.PluginManager,ph=function(e,t){var n=function(e,t){for(var n in gh.urls)if(gh.urls[n]+"/plugin"+t+".js"===e)return n;return null}(t,e.suffix);return n?mh.translate(["Failed to load plugin: {0} from url {1}",n,t]):mh.translate(["Failed to load plugin url: {0}",t])},hh=function(e,t){e.notificationManager.open({type:"error",text:t})},vh=function(e,t){e._skinLoaded?hh(e,t):e.on("SkinLoaded",function(){hh(e,t)})},bh=function(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];var r=H.window.console;r&&(r.error?r.error.apply(r,arguments):r.log.apply(r,arguments))},yh={pluginLoadError:function(e,t){vh(e,ph(e,t))},pluginInitError:function(e,t,n){var r=mh.translate(["Failed to initialize plugin: {0}",t]);bh(r,n),vh(e,r)},uploadError:function(e,t){vh(e,mh.translate(["Failed to upload image: {0}",t]))},displayError:vh,initError:bh},Ch=ki.PluginManager,xh=ki.ThemeManager;function wh(){return new(ue.getOrDie("XMLHttpRequest"))}function Nh(u,s){var r={},n=function(e,r,o,t){var i,n;(i=wh()).open("POST",s.url),i.withCredentials=s.credentials,i.upload.onprogress=function(e){t(e.loaded/e.total*100)},i.onerror=function(){o("Image upload failed due to a XHR Transport error. Code: "+i.status)},i.onload=function(){var e,t,n;i.status<200||300<=i.status?o("HTTP Error: "+i.status):(e=JSON.parse(i.responseText))&&"string"==typeof e.location?r((t=s.basePath,n=e.location,t?t.replace(/\/$/,"")+"/"+n.replace(/^\//,""):n)):o("Invalid JSON: "+i.responseText)},(n=new H.FormData).append("file",e.blob(),e.filename()),i.send(n)},c=function(e,t){return{url:t,blobInfo:e,status:!0}},l=function(e,t){return{url:"",blobInfo:e,status:!1,error:t}},f=function(e,t){Jt.each(r[e],function(e){e(t)}),delete r[e]},o=function(e,n){return e=Jt.grep(e,function(e){return!u.isUploaded(e.blobUri())}),pe.all(Jt.map(e,function(e){return u.isPending(e.blobUri())?(t=e.blobUri(),new pe(function(e){r[t]=r[t]||[],r[t].push(e)})):(o=e,i=s.handler,a=n,u.markPending(o.blobUri()),new pe(function(t){var n;try{var r=function(){n&&n.close()};i(o,function(e){r(),u.markUploaded(o.blobUri(),e),f(o.blobUri(),c(o,e)),t(c(o,e))},function(e){r(),u.removeFailed(o.blobUri()),f(o.blobUri(),l(o,e)),t(l(o,e))},function(e){e<0||100<e||(n||(n=a()),n.progressBar.value(e))})}catch(e){t(l(o,e.message))}}));var o,i,a,t}))};return!1===P(s.handler)&&(s.handler=n),{upload:function(e,t){return s.url||s.handler!==n?o(e,t):new pe(function(e){e([])})}}}var Eh=function(e){return ue.getOrDie("atob")(e)},Sh=function(e){var t,n,r=decodeURIComponent(e).split(",");return(n=/data:([^;]+)/.exec(r[0]))&&(t=n[1]),{type:t,data:r[1]}},kh=function(a){return new pe(function(e){var t,n,r,o,i=Sh(a);try{t=Eh(i.data)}catch(ZN){return void e(new H.Blob([]))}for(o=t.length,n=new(ue.getOrDie("Uint8Array"))(o),r=0;r<n.length;r++)n[r]=t.charCodeAt(r);e(new H.Blob([n],{type:i.type}))})},Th=function(e){return 0===e.indexOf("blob:")?(i=e,new pe(function(e,t){var n=function(){t("Cannot convert "+i+" to Blob. Resource might not exist or is inaccessible.")};try{var r=wh();r.open("GET",i,!0),r.responseType="blob",r.onload=function(){200===this.status?e(this.response):n()},r.onerror=n,r.send()}catch(o){n()}})):0===e.indexOf("data:")?kh(e):null;var i},Ah=function(n){return new pe(function(e){var t=new(ue.getOrDie("FileReader"));t.onloadend=function(){e(t.result)},t.readAsDataURL(n)})},Rh=Sh,_h=0,Dh=function(e){return(e||"blobid")+_h++},Bh=function(n,r,o,t){var i,a;0!==r.src.indexOf("blob:")?(i=Rh(r.src).data,(a=n.findFirst(function(e){return e.base64()===i}))?o({image:r,blobInfo:a}):Th(r.src).then(function(e){a=n.create(Dh(),e,i),n.add(a),o({image:r,blobInfo:a})},function(e){t(e)})):(a=n.getByUri(r.src))?o({image:r,blobInfo:a}):Th(r.src).then(function(t){Ah(t).then(function(e){i=Rh(e).data,a=n.create(Dh(),t,i),n.add(a),o({image:r,blobInfo:a})})},function(e){t(e)})},Oh=function(e){return e?oe(e.getElementsByTagName("img")):[]},Ph=0,Ih={uuid:function(e){return e+Ph+++(t=function(){return Math.round(4294967295*Math.random()).toString(36)},"s"+(new Date).getTime().toString(36)+t()+t()+t());var t}};function Lh(u){var n,o,t,e,i,r,a,s,c,l=(n=[],o=function(e){var t,n,r;if(!e.blob||!e.base64)throw new Error("blob and base64 representations of the image are required for BlobInfo to be created");return t=e.id||Ih.uuid("blobid"),n=e.name||t,{id:q(t),name:q(n),filename:q(n+"."+(r=e.blob.type,{"image/jpeg":"jpg","image/jpg":"jpg","image/gif":"gif","image/png":"png"}[r.toLowerCase()]||"dat")),blob:q(e.blob),base64:q(e.base64),blobUri:q(e.blobUri||ce.createObjectURL(e.blob)),uri:q(e.uri)}},{create:function(e,t,n,r){if(R(e))return o({id:e,name:r,blob:t,base64:n});if(_(e))return o(e);throw new Error("Unknown input type")},add:function(e){t(e.id())||n.push(e)},get:t=function(t){return e(function(e){return e.id()===t})},getByUri:function(t){return e(function(e){return e.blobUri()===t})},findFirst:e=function(e){return V(n,e)[0]},removeByUri:function(t){n=V(n,function(e){return e.blobUri()!==t||(ce.revokeObjectURL(e.blobUri()),!1)})},destroy:function(){U(n,function(e){ce.revokeObjectURL(e.blobUri())}),n=[]}}),f=(a={},s=function(e,t){return{status:e,resultUri:t}},{hasBlobUri:c=function(e){return e in a},getResultUri:function(e){var t=a[e];return t?t.resultUri:null},isPending:function(e){return!!c(e)&&1===a[e].status},isUploaded:function(e){return!!c(e)&&2===a[e].status},markPending:function(e){a[e]=s(1,null)},markUploaded:function(e,t){a[e]=s(2,t)},removeFailed:function(e){delete a[e]},destroy:function(){a={}}}),d=[],m=function(t){return function(e){return u.selection?t(e):[]}},g=function(e,t,n){for(var r=0;-1!==(r=e.indexOf(t,r))&&(e=e.substring(0,r)+n+e.substr(r+t.length),r+=n.length-t.length+1),-1!==r;);return e},p=function(e,t,n){return e=g(e,'src="'+t+'"','src="'+n+'"'),e=g(e,'data-mce-src="'+t+'"','data-mce-src="'+n+'"')},h=function(t,n){U(u.undoManager.data,function(e){"fragmented"===e.type?e.fragments=W(e.fragments,function(e){return p(e,t,n)}):e.content=p(e.content,t,n)})},v=function(){return u.notificationManager.open({text:u.translate("Image uploading..."),type:"info",timeout:-1,progressBar:!0})},b=function(e,t){l.removeByUri(e.src),h(e.src,t),u.$(e).attr({src:Tl(u)?t+"?"+(new Date).getTime():t,"data-mce-src":u.convertURL(t,"src")})},y=function(n){return i||(i=Nh(f,{url:Rl(u),basePath:_l(u),credentials:Dl(u),handler:Bl(u)})),w().then(m(function(r){var e;return e=W(r,function(e){return e.blobInfo}),i.upload(e,v).then(m(function(e){var t=W(e,function(e,t){var n=r[t].image;return e.status&&Al(u)?b(n,e.url):e.error&&yh.uploadError(u,e.error),{element:n,status:e.status}});return n&&n(t),t}))}))},C=function(e){if(kl(u))return y(e)},x=function(t){return!1!==ee(d,function(e){return e(t)})&&(0!==t.getAttribute("src").indexOf("data:")||Sl(u)(t))},w=function(){var o,i,a;return r||(o=f,i=l,a={},r={findAll:function(e,n){var t;n||(n=q(!0)),t=V(Oh(e),function(e){var t=e.src;return!!ge.fileApi&&!e.hasAttribute("data-mce-bogus")&&!e.hasAttribute("data-mce-placeholder")&&!(!t||t===ge.transparentSrc)&&(0===t.indexOf("blob:")?!o.isUploaded(t)&&n(e):0===t.indexOf("data:")&&n(e))});var r=W(t,function(n){if(a[n.src])return new pe(function(t){a[n.src].then(function(e){if("string"==typeof e)return e;t({image:n,blobInfo:e.blobInfo})})});var e=new pe(function(e,t){Bh(i,n,e,t)}).then(function(e){return delete a[e.image.src],e})["catch"](function(e){return delete a[n.src],e});return a[n.src]=e});return pe.all(r)}}),r.findAll(u.getBody(),x).then(m(function(e){return e=V(e,function(e){return"string"!=typeof e||(yh.displayError(u,e),!1)}),U(e,function(e){h(e.image.src,e.blobInfo.blobUri()),e.image.src=e.blobInfo.blobUri(),e.image.removeAttribute("data-mce-src")}),e}))},N=function(e){return e.replace(/src="(blob:[^"]+)"/g,function(e,n){var t=f.getResultUri(n);if(t)return'src="'+t+'"';var r=l.getByUri(n);return r||(r=X(u.editorManager.get(),function(e,t){return e||t.editorUpload&&t.editorUpload.blobCache.getByUri(n)},null)),r?'src="data:'+r.blob().type+";base64,"+r.base64()+'"':e})};return u.on("setContent",function(){kl(u)?C():w()}),u.on("RawSaveContent",function(e){e.content=N(e.content)}),u.on("getContent",function(e){e.source_view||"raw"===e.format||(e.content=N(e.content))}),u.on("PostRender",function(){u.parser.addNodeFilter("img",function(e){U(e,function(e){var t=e.attr("src");if(!l.getByUri(t)){var n=f.getResultUri(t);n&&e.attr("src",n)}})})}),{blobCache:l,addFilter:function(e){d.push(e)},uploadImages:y,uploadImagesAuto:C,scanForImages:w,destroy:function(){l.destroy(),f.destroy(),r=i=null}}}var Mh=function(e,t){return e.hasOwnProperty(t.nodeName)},Fh=function(e,t){if(Po.isText(t)){if(0===t.nodeValue.length)return!0;if(/^\s+$/.test(t.nodeValue)&&(!t.nextSibling||Mh(e,t.nextSibling)))return!0}return!1},zh=function(e){var t,n,r,o,i,a,u,s,c,l,f,d=e.settings,m=e.dom,g=e.selection,p=e.schema,h=p.getBlockElements(),v=g.getStart(),b=e.getBody();if(f=d.forced_root_block,v&&Po.isElement(v)&&f&&(l=b.nodeName.toLowerCase(),p.isValidChild(l,f.toLowerCase())&&(y=h,C=b,x=v,!z(Zl(ir.fromDom(x),ir.fromDom(C)),function(e){return Mh(y,e.dom())})))){var y,C,x,w,N;for(n=(t=g.getRng()).startContainer,r=t.startOffset,o=t.endContainer,i=t.endOffset,c=eh(e),v=b.firstChild;v;)if(w=h,N=v,Po.isText(N)||Po.isElement(N)&&!Mh(w,N)&&!dc(N)){if(Fh(h,v)){v=(u=v).nextSibling,m.remove(u);continue}a||(a=m.create(f,e.settings.forced_root_block_attrs),v.parentNode.insertBefore(a,v),s=!0),v=(u=v).nextSibling,a.appendChild(u)}else a=null,v=v.nextSibling;s&&c&&(t.setStart(n,r),t.setEnd(o,i),g.setRng(t),e.nodeChanged())}},Uh=function(e){e.settings.forced_root_block&&e.on("NodeChange",d(zh,e))},Vh=function(t){return Wr(t).fold(q([t]),function(e){return[t].concat(Vh(e))})},Hh=function(t){return Kr(t).fold(q([t]),function(e){return"br"===cr(e)?Ur(e).map(function(e){return[t].concat(Hh(e))}).getOr([]):[t].concat(Hh(e))})},jh=function(o,e){return Ya([(i=e,a=i.startContainer,u=i.startOffset,Po.isText(a)?0===u?A.some(ir.fromDom(a)):A.none():A.from(a.childNodes[u]).map(ir.fromDom)),(t=e,n=t.endContainer,r=t.endOffset,Po.isText(n)?r===n.data.length?A.some(ir.fromDom(n)):A.none():A.from(n.childNodes[r-1]).map(ir.fromDom))],function(e,t){var n=Y(Vh(o),d(Ir,e)),r=Y(Hh(o),d(Ir,t));return n.isSome()&&r.isSome()}).getOr(!1);var t,n,r,i,a,u},qh=function(e,t,n,r){var o=n,i=new ao(n,o),a=e.schema.getNonEmptyElements();do{if(3===n.nodeType&&0!==Jt.trim(n.nodeValue).length)return void(r?t.setStart(n,0):t.setEnd(n,n.nodeValue.length));if(a[n.nodeName]&&!/^(TD|TH)$/.test(n.nodeName))return void(r?t.setStartBefore(n):"BR"===n.nodeName?t.setEndBefore(n):t.setEndAfter(n));if(ge.ie&&ge.ie<11&&e.isBlock(n)&&e.isEmpty(n))return void(r?t.setStart(n,0):t.setEnd(n,0))}while(n=r?i.next():i.prev());"BODY"===o.nodeName&&(r?t.setStart(o,0):t.setEnd(o,o.childNodes.length))},$h=function(e){var t=e.selection.getSel();return t&&0<t.rangeCount};function Wh(i){var r,o=[];"onselectionchange"in i.getDoc()||i.on("NodeChange Click MouseUp KeyUp Focus",function(e){var t,n;n={startContainer:(t=i.selection.getRng()).startContainer,startOffset:t.startOffset,endContainer:t.endContainer,endOffset:t.endOffset},"nodechange"!==e.type&&pg(n,r)||i.fire("SelectionChange"),r=n}),i.on("contextmenu",function(){i.fire("SelectionChange")}),i.on("SelectionChange",function(){var e=i.selection.getStart(!0);!e||!ge.range&&i.selection.isCollapsed()||$h(i)&&!function(e){var t,n;if((n=i.$(e).parentsUntil(i.getBody()).add(e)).length===o.length){for(t=n.length;0<=t&&n[t]===o[t];t--);if(-1===t)return o=n,!0}return o=n,!1}(e)&&i.dom.isChildOf(e,i.getBody())&&i.nodeChanged({selectionChange:!0})}),i.on("MouseUp",function(e){!e.isDefaultPrevented()&&$h(i)&&("IMG"===i.selection.getNode().nodeName?ye.setEditorTimeout(i,function(){i.nodeChanged()}):i.nodeChanged())}),this.nodeChanged=function(e){var t,n,r,o=i.selection;i.initialized&&o&&!i.settings.disable_nodechange&&!i.readonly&&(r=i.getBody(),(t=o.getStart(!0)||r).ownerDocument===i.getDoc()&&i.dom.isChildOf(t,r)||(t=r),n=[],i.dom.getParent(t,function(e){if(e===r)return!0;n.push(e)}),(e=e||{}).element=t,e.parents=n,i.fire("NodeChange",e))}}var Kh,Xh,Yh=function(e){var t,n,r,o;return o=e.getBoundingClientRect(),n=(t=e.ownerDocument).documentElement,r=t.defaultView,{top:o.top+r.pageYOffset-n.clientTop,left:o.left+r.pageXOffset-n.clientLeft}},Gh=function(e,t){return n=(u=e).inline?Yh(u.getBody()):{left:0,top:0},a=(i=e).getBody(),r=i.inline?{left:a.scrollLeft,top:a.scrollTop}:{left:0,top:0},{pageX:(o=function(e,t){if(t.target.ownerDocument!==e.getDoc()){var n=Yh(e.getContentAreaContainer()),r=(i=(o=e).getBody(),a=o.getDoc().documentElement,u={left:i.scrollLeft,top:i.scrollTop},s={left:i.scrollLeft||a.scrollLeft,top:i.scrollTop||a.scrollTop},o.inline?u:s);return{left:t.pageX-n.left+r.left,top:t.pageY-n.top+r.top}}var o,i,a,u,s;return{left:t.pageX,top:t.pageY}}(e,t)).left-n.left+r.left,pageY:o.top-n.top+r.top};var n,r,o,i,a,u},Jh=Po.isContentEditableFalse,Qh=Po.isContentEditableTrue,Zh=function(e){e&&e.parentNode&&e.parentNode.removeChild(e)},ev=function(u,s){return function(e){if(0===e.button){var t=Y(s.dom.getParents(e.target),Qa(Jh,Qh)).getOr(null);if(i=s.getBody(),Jh(a=t)&&a!==i){var n=s.dom.getPos(t),r=s.getBody(),o=s.getDoc().documentElement;u.element=t,u.screenX=e.screenX,u.screenY=e.screenY,u.maxX=(s.inline?r.scrollWidth:o.offsetWidth)-2,u.maxY=(s.inline?r.scrollHeight:o.offsetHeight)-2,u.relX=e.pageX-n.x,u.relY=e.pageY-n.y,u.width=t.offsetWidth,u.height=t.offsetHeight,u.ghost=function(e,t,n,r){var o=t.cloneNode(!0);e.dom.setStyles(o,{width:n,height:r}),e.dom.setAttrib(o,"data-mce-selected",null);var i=e.dom.create("div",{"class":"mce-drag-container","data-mce-bogus":"all",unselectable:"on",contenteditable:"false"});return e.dom.setStyles(i,{position:"absolute",opacity:.5,overflow:"hidden",border:0,padding:0,margin:0,width:n,height:r}),e.dom.setStyles(o,{margin:0,boxSizing:"border-box"}),i.appendChild(o),i}(s,t,u.width,u.height)}}var i,a}},tv=function(l,f){return function(e){if(l.dragging&&(s=(i=f).selection,c=s.getSel().getRangeAt(0).startContainer,a=3===c.nodeType?c.parentNode:c,u=l.element,a!==u&&!i.dom.isChildOf(a,u)&&!Jh(a))){var t=(r=l.element,(o=r.cloneNode(!0)).removeAttribute("data-mce-selected"),o),n=f.fire("drop",{targetClone:t,clientX:e.clientX,clientY:e.clientY});n.isDefaultPrevented()||(t=n.targetClone,f.undoManager.transact(function(){Zh(l.element),f.insertContent(f.dom.getOuterHTML(t)),f._selectionOverrides.hideFakeCaret()}))}var r,o,i,a,u,s,c;nv(l)}},nv=function(e){e.dragging=!1,e.element=null,Zh(e.ghost)},rv=function(e){var t,n,r,o,i,a,p,h,v,u,s,c={};t=bi.DOM,a=H.document,n=ev(c,e),p=c,h=e,v=ye.throttle(function(e,t){h._selectionOverrides.hideFakeCaret(),h.selection.placeCaretAt(e,t)},0),r=function(e){var t,n,r,o,i,a,u,s,c,l,f,d,m=Math.max(Math.abs(e.screenX-p.screenX),Math.abs(e.screenY-p.screenY));if(p.element&&!p.dragging&&10<m){if(h.fire("dragstart",{target:p.element}).isDefaultPrevented())return;p.dragging=!0,h.focus()}if(p.dragging){var g=(f=p,{pageX:(d=Gh(h,e)).pageX-f.relX,pageY:d.pageY+5});c=p.ghost,l=h.getBody(),c.parentNode!==l&&l.appendChild(c),t=p.ghost,n=g,r=p.width,o=p.height,i=p.maxX,a=p.maxY,s=u=0,t.style.left=n.pageX+"px",t.style.top=n.pageY+"px",n.pageX+r>i&&(u=n.pageX+r-i),n.pageY+o>a&&(s=n.pageY+o-a),t.style.width=r-u+"px",t.style.height=o-s+"px",v(e.clientX,e.clientY)}},o=tv(c,e),u=c,i=function(){u.dragging&&s.fire("dragend"),nv(u)},(s=e).on("mousedown",n),e.on("mousemove",r),e.on("mouseup",o),t.bind(a,"mousemove",r),t.bind(a,"mouseup",i),e.on("remove",function(){t.unbind(a,"mousemove",r),t.unbind(a,"mouseup",i)})},ov=function(e){var n;rv(e),(n=e).on("drop",function(e){var t="undefined"!=typeof e.clientX?n.getDoc().elementFromPoint(e.clientX,e.clientY):null;(Jh(t)||Jh(n.dom.getContentEditableParent(t)))&&e.preventDefault()})},iv=function(e){return X(e,function(e,t){return e.concat(function(t){var e=function(e){return W(e,function(e){return(e=za(e)).node=t,e})};if(Po.isElement(t))return e(t.getClientRects());if(Po.isText(t)){var n=t.ownerDocument.createRange();return n.setStart(t,0),n.setEnd(t,t.data.length),e(n.getClientRects())}}(t))},[])};(Xh=Kh||(Kh={}))[Xh.Up=-1]="Up",Xh[Xh.Down=1]="Down";var av=function(o,i,a,e,u,t){var n,s,c=0,l=[],r=function(e){var t,n,r;for(r=iv([e]),-1===o&&(r=r.reverse()),t=0;t<r.length;t++)if(n=r[t],!a(n,s)){if(0<l.length&&i(n,Wt.last(l))&&c++,n.line=c,u(n))return!0;l.push(n)}};return(s=Wt.last(t.getClientRects()))&&(r(n=t.getNode()),function(e,t,n,r){for(;r=hs(r,e,Ma,t);)if(n(r))return}(o,e,r,n)),l},uv=d(av,Kh.Up,Ha,ja),sv=d(av,Kh.Down,ja,Ha),cv=function(n){return function(e){return t=n,e.line>t;var t}},lv=function(n){return function(e){return t=n,e.line===t;var t}},fv=Po.isContentEditableFalse,dv=hs,mv=function(e,t){return Math.abs(e.left-t)},gv=function(e,t){return Math.abs(e.right-t)},pv=function(e,t){return e>=t.left&&e<=t.right},hv=function(e,o){return Wt.reduce(e,function(e,t){var n,r;return n=Math.min(mv(e,o),gv(e,o)),r=Math.min(mv(t,o),gv(t,o)),pv(o,t)?t:pv(o,e)?e:r===n&&fv(t.node)?t:r<n?t:e})},vv=function(e,t,n,r){for(;r=dv(r,e,Ma,t);)if(n(r))return},bv=function(e,t,n){var r,o,i,a,u,s,c,l=iv(V(oe(e.getElementsByTagName("*")),as)),f=V(l,function(e){return n>=e.top&&n<=e.bottom});return(r=hv(f,t))&&(r=hv((a=e,c=function(t,e){var n;return n=V(iv([e]),function(e){return!t(e,u)}),s=s.concat(n),0===n.length},(s=[]).push(u=r),vv(Kh.Up,a,d(c,Ha),u.node),vv(Kh.Down,a,d(c,ja),u.node),s),t))&&as(r.node)?(i=t,{node:(o=r).node,before:mv(o,i)<gv(o,i)}):null},yv=function(t,n,e){if(e.collapsed)return!1;if(ge.ie&&ge.ie<=11&&e.startOffset===e.endOffset-1&&e.startContainer===e.endContainer){var r=e.startContainer.childNodes[e.startOffset];if(Po.isElement(r))return z(r.getClientRects(),function(e){return qa(e,t,n)})}return z(e.getClientRects(),function(e){return qa(e,t,n)})},Cv=function(t){var e=Ii(function(){if(!t.removed&&t.selection.getRng().collapsed){var e=rg(t,t.selection.getRng(),!1);t.selection.setRng(e)}},0);t.on("focus",function(){e.throttle()}),t.on("blur",function(){e.cancel()})},xv={BACKSPACE:8,DELETE:46,DOWN:40,ENTER:13,LEFT:37,RIGHT:39,SPACEBAR:32,TAB:9,UP:38,END:35,HOME:36,modifierPressed:function(e){return e.shiftKey||e.ctrlKey||e.altKey||this.metaKeyPressed(e)},metaKeyPressed:function(e){return ge.mac?e.metaKey:e.ctrlKey&&!e.altKey}},wv=Po.isContentEditableTrue,Nv=Po.isContentEditableFalse,Ev=function(e,t){for(var n=e.getBody();t&&t!==n;){if(wv(t)||Nv(t))return t;t=t.parentNode}return null},Sv=function(g){var p,e,t,a=g.getBody(),o=os(g.getBody(),function(e){return g.dom.isBlock(e)},function(){return eh(g)}),h="sel-"+g.dom.uniqueId(),u=function(e){e&&g.selection.setRng(e)},s=function(){return g.selection.getRng()},v=function(e,t,n,r){return void 0===r&&(r=!0),g.fire("ShowCaret",{target:t,direction:e,before:n}).isDefaultPrevented()?null:(r&&g.selection.scrollIntoView(t,-1===e),o.show(n,t))},b=function(e,t){return t=Es(e,a,t),-1===e?Cu.fromRangeStart(t):Cu.fromRangeEnd(t)},n=function(e){return ya(e)||Ea(e)||Sa(e)},y=function(e){return n(e.startContainer)||n(e.endContainer)},c=function(e,t){var n,r,o,i,a,u,s,c,l,f,d=g.$,m=g.dom;if(!e)return null;if(e.collapsed){if(!y(e))if(!1===t){if(c=b(-1,e),as(c.getNode(!0)))return v(-1,c.getNode(!0),!1,!1);if(as(c.getNode()))return v(-1,c.getNode(),!c.isAtEnd(),!1)}else{if(c=b(1,e),as(c.getNode()))return v(1,c.getNode(),!c.isAtEnd(),!1);if(as(c.getNode(!0)))return v(1,c.getNode(!0),!1,!1)}return null}return i=e.startContainer,a=e.startOffset,u=e.endOffset,3===i.nodeType&&0===a&&Nv(i.parentNode)&&(i=i.parentNode,a=m.nodeIndex(i),i=i.parentNode),1!==i.nodeType?null:(u===a+1&&i===e.endContainer&&(n=i.childNodes[a]),Nv(n)?(l=f=n.cloneNode(!0),(s=g.fire("ObjectSelected",{target:n,targetClone:l})).isDefaultPrevented()?null:(r=Ji(ir.fromDom(g.getBody()),"#"+h).fold(function(){return d([])},function(e){return d([e.dom()])}),l=s.targetClone,0===r.length&&(r=d('<div data-mce-bogus="all" class="mce-offscreen-selection"></div>').attr("id",h)).appendTo(g.getBody()),e=g.dom.createRng(),l===f&&ge.ie?(r.empty().append('<p style="font-size: 0" data-mce-bogus="all">\xa0</p>').append(l),e.setStartAfter(r[0].firstChild.firstChild),e.setEndAfter(l)):(r.empty().append("\xa0").append(l).append("\xa0"),e.setStart(r[0].firstChild,1),e.setEnd(r[0].lastChild,0)),r.css({top:m.getPos(n,g.getBody()).y}),r[0].focus(),(o=g.selection.getSel()).removeAllRanges(),o.addRange(e),U($i(ir.fromDom(g.getBody()),"*[data-mce-selected]"),function(e){wr(e,"data-mce-selected")}),n.setAttribute("data-mce-selected","1"),p=n,C(),e)):null)},l=function(){p&&(p.removeAttribute("data-mce-selected"),Ji(ir.fromDom(g.getBody()),"#"+h).each(Oi),p=null),Ji(ir.fromDom(g.getBody()),"#"+h).each(Oi),p=null},C=function(){o.hide()};return ge.ceFalse&&(function(){g.on("mouseup",function(e){var t=s();t.collapsed&&uh(g,e.clientX,e.clientY)&&u(ng(g,t,!1))}),g.on("click",function(e){var t;(t=Ev(g,e.target))&&(Nv(t)&&(e.preventDefault(),g.focus()),wv(t)&&g.dom.isChildOf(t,g.selection.getNode())&&l())}),g.on("blur NewBlock",function(){l()}),g.on("ResizeWindow FullscreenStateChanged",function(){return o.reposition()});var n,r,i=function(e,t){var n,r,o=g.dom.getParent(e,g.dom.isBlock),i=g.dom.getParent(t,g.dom.isBlock);return!(!o||!g.dom.isChildOf(o,i)||!1!==Nv(Ev(g,o)))||o&&(n=o,r=i,!(g.dom.getParent(n,g.dom.isBlock)===g.dom.getParent(r,g.dom.isBlock)))&&function(e){var t=$s(e);if(!e.firstChild)return!1;var n=Cu.before(e.firstChild),r=t.next(n);return r&&!_f(r)&&!Df(r)}(o)};r=!1,(n=g).on("touchstart",function(){r=!1}),n.on("touchmove",function(){r=!0}),n.on("touchend",function(e){var t=Ev(n,e.target);Nv(t)&&(r||(e.preventDefault(),c(tg(n,t))))}),g.on("mousedown",function(e){var t,n=e.target;if((n===a||"HTML"===n.nodeName||g.dom.isChildOf(n,a))&&!1!==uh(g,e.clientX,e.clientY))if(t=Ev(g,n))Nv(t)?(e.preventDefault(),c(tg(g,t))):(l(),wv(t)&&e.shiftKey||yv(e.clientX,e.clientY,g.selection.getRng())||(C(),g.selection.placeCaretAt(e.clientX,e.clientY)));else if(!1===as(n)){l(),C();var r=bv(a,e.clientX,e.clientY);if(r&&!i(e.target,r.node)){e.preventDefault();var o=v(1,r.node,r.before,!1);g.getBody().focus(),u(o)}}}),g.on("keypress",function(e){xv.modifierPressed(e)||(e.keyCode,Nv(g.selection.getNode())&&e.preventDefault())}),g.on("getSelectionRange",function(e){var t=e.range;if(p){if(!p.parentNode)return void(p=null);(t=t.cloneRange()).selectNode(p),e.range=t}}),g.on("setSelectionRange",function(e){var t;(t=c(e.range,e.forward))&&(e.range=t)}),g.on("AfterSetSelectionRange",function(e){var t,n=e.range;y(n)||"mcepastebin"===n.startContainer.parentNode.id||C(),t=n.startContainer.parentNode,g.dom.hasClass(t,"mce-offscreen-selection")||l()}),g.on("copy",function(e){var t,n=e.clipboardData;if(!e.isDefaultPrevented()&&e.clipboardData&&!ge.ie){var r=(t=g.dom.get(h))?t.getElementsByTagName("*")[0]:t;r&&(e.preventDefault(),n.clearData(),n.setData("text/html",r.outerHTML),n.setData("text/plain",r.outerText))}}),ov(g),Cv(g)}(),e=g.contentStyles,t=".mce-content-body",e.push(o.getCss()),e.push(t+" .mce-offscreen-selection {position: absolute;left: -9999999999px;max-width: 1000000px;}"+t+" *[contentEditable=false] {cursor: default;}"+t+" *[contentEditable=true] {cursor: text;}")),{showCaret:v,showBlockCaretContainer:function(e){e.hasAttribute("data-mce-caret")&&(ka(e),u(s()),g.selection.scrollIntoView(e[0]))},hideFakeCaret:C,destroy:function(){o.destroy(),p=null}}},kv=function(e,t,n){var r,o,i,a,u=1;for(a=e.getShortEndedElements(),(i=/<([!?\/])?([A-Za-z0-9\-_\:\.]+)((?:\s+[^"\'>]+(?:(?:"[^"]*")|(?:\'[^\']*\')|[^>]*))*|\/|\s+)>/g).lastIndex=r=n;o=i.exec(t);){if(r=i.lastIndex,"/"===o[1])u--;else if(!o[1]){if(o[2]in a)continue;u++}if(0===u)break}return r},Tv=function(e,t){var n=e.exec(t);if(n){var r=n[1],o=n[2];return"string"==typeof r&&"data-mce-bogus"===r.toLowerCase()?o:null}return null};function Av(z,U){void 0===U&&(U=ii());var e=function(){};!1!==(z=z||{}).fix_self_closing&&(z.fix_self_closing=!0);var V=z.comment?z.comment:e,H=z.cdata?z.cdata:e,j=z.text?z.text:e,q=z.start?z.start:e,$=z.end?z.end:e,W=z.pi?z.pi:e,K=z.doctype?z.doctype:e;return{parse:function(e){var t,n,r,d,o,i,a,m,u,s,g,c,p,l,f,h,v,b,y,C,x,w,N,E,S,k,T,A,R,_=0,D=[],B=0,O=Xo.decode,P=Jt.makeMap("src,href,data,background,formaction,poster,xlink:href"),I=/((java|vb)script|mhtml):/i,L=function(e){var t,n;for(t=D.length;t--&&D[t].name!==e;);if(0<=t){for(n=D.length-1;t<=n;n--)(e=D[n]).valid&&$(e.name);D.length=t}},M=function(e,t,n,r,o){var i,a,u,s,c;if(n=(t=t.toLowerCase())in g?t:O(n||r||o||""),p&&!m&&0==(0===(u=t).indexOf("data-")||0===u.indexOf("aria-"))){if(!(i=b[t])&&y){for(a=y.length;a--&&!(i=y[a]).pattern.test(t););-1===a&&(i=null)}if(!i)return;if(i.validValues&&!(n in i.validValues))return}if(P[t]&&!z.allow_script_urls){var l=n.replace(/[\s\u0000-\u001F]+/g,"");try{l=decodeURIComponent(l)}catch(f){l=unescape(l)}if(I.test(l))return;if(c=l,!(s=z).allow_html_data_urls&&(/^data:image\//i.test(c)?!1===s.allow_svg_data_urls&&/^data:image\/svg\+xml/i.test(c):/^data:/i.test(c)))return}m&&(t in P||0===t.indexOf("on"))||(d.map[t]=n,d.push({name:t,value:n}))};for(S=new RegExp("<(?:(?:!--([\\w\\W]*?)--\x3e)|(?:!\\[CDATA\\[([\\w\\W]*?)\\]\\]>)|(?:!DOCTYPE([\\w\\W]*?)>)|(?:\\?([^\\s\\/<>]+) ?([\\w\\W]*?)[?/]>)|(?:\\/([A-Za-z][A-Za-z0-9\\-_\\:\\.]*)>)|(?:([A-Za-z][A-Za-z0-9\\-_\\:\\.]*)((?:\\s+[^\"'>]+(?:(?:\"[^\"]*\")|(?:'[^']*')|[^>]*))*|\\/|\\s+)>))","g"),k=/([\w:\-]+)(?:\s*=\s*(?:(?:\"((?:[^\"])*)\")|(?:\'((?:[^\'])*)\')|([^>\s]+)))?/g,s=U.getShortEndedElements(),E=z.self_closing_elements||U.getSelfClosingElements(),g=U.getBoolAttrs(),p=z.validate,u=z.remove_internals,R=z.fix_self_closing,T=U.getSpecialElements(),N=e+">";t=S.exec(N);){if(_<t.index&&j(O(e.substr(_,t.index-_))),n=t[6])":"===(n=n.toLowerCase()).charAt(0)&&(n=n.substr(1)),L(n);else if(n=t[7]){if(t.index+t[0].length>e.length){j(O(e.substr(t.index))),_=t.index+t[0].length;continue}":"===(n=n.toLowerCase()).charAt(0)&&(n=n.substr(1)),c=n in s,R&&E[n]&&0<D.length&&D[D.length-1].name===n&&L(n);var F=Tv(k,t[8]);if(null!==F){if("all"===F){_=kv(U,e,S.lastIndex),S.lastIndex=_;continue}f=!1}if(!p||(l=U.getElementRule(n))){if(f=!0,p&&(b=l.attributes,y=l.attributePatterns),(v=t[8])?((m=-1!==v.indexOf("data-mce-type"))&&u&&(f=!1),(d=[]).map={},v.replace(k,M)):(d=[]).map={},p&&!m){if(C=l.attributesRequired,x=l.attributesDefault,w=l.attributesForced,l.removeEmptyAttrs&&!d.length&&(f=!1),w)for(o=w.length;o--;)a=(h=w[o]).name,"{$uid}"===(A=h.value)&&(A="mce_"+B++),d.map[a]=A,d.push({name:a,value:A});if(x)for(o=x.length;o--;)(a=(h=x[o]).name)in d.map||("{$uid}"===(A=h.value)&&(A="mce_"+B++),d.map[a]=A,d.push({name:a,value:A}));if(C){for(o=C.length;o--&&!(C[o]in d.map););-1===o&&(f=!1)}if(h=d.map["data-mce-bogus"]){if("all"===h){_=kv(U,e,S.lastIndex),S.lastIndex=_;continue}f=!1}}f&&q(n,d,c)}else f=!1;if(r=T[n]){r.lastIndex=_=t.index+t[0].length,(t=r.exec(e))?(f&&(i=e.substr(_,t.index-_)),_=t.index+t[0].length):(i=e.substr(_),_=e.length),f&&(0<i.length&&j(i,!0),$(n)),S.lastIndex=_;continue}c||(v&&v.indexOf("/")===v.length-1?f&&$(n):D.push({name:n,valid:f}))}else(n=t[1])?(">"===n.charAt(0)&&(n=" "+n),z.allow_conditional_comments||"[if"!==n.substr(0,3).toLowerCase()||(n=" "+n),V(n)):(n=t[2])?H(n.replace(/<!--|-->/g,"")):(n=t[3])?K(n):(n=t[4])&&W(n,t[5]);_=t.index+t[0].length}for(_<e.length&&j(O(e.substr(_))),o=D.length-1;0<=o;o--)(n=D[o]).valid&&$(n.name)}}}(Av||(Av={})).findEndTag=kv;var Rv=Av,_v=function(e,t){var n,r,o,i,a,u,s,c,l=t,f=/<(\w+) [^>]*data-mce-bogus="all"[^>]*>/g,d=e.schema;for(u=e.getTempAttrs(),s=l,c=new RegExp(["\\s?("+u.join("|")+')="[^"]+"'].join("|"),"gi"),l=s.replace(c,""),a=d.getShortEndedElements();i=f.exec(l);)r=f.lastIndex,o=i[0].length,n=a[i[1]]?r:Rv.findEndTag(d,l,r),l=l.substring(0,r-o)+l.substring(n),f.lastIndex=r-o;return ga(l)},Dv={trimExternal:_v,trimInternal:_v},Bv=0,Ov=2,Pv=1,Iv=function(g,p){var e=g.length+p.length+2,h=new Array(e),v=new Array(e),c=function(e,t,n,r,o){var i=l(e,t,n,r);if(null===i||i.start===t&&i.diag===t-r||i.end===e&&i.diag===e-n)for(var a=e,u=n;a<t||u<r;)a<t&&u<r&&g[a]===p[u]?(o.push([0,g[a]]),++a,++u):r-n<t-e?(o.push([2,g[a]]),++a):(o.push([1,p[u]]),++u);else{c(e,i.start,n,i.start-i.diag,o);for(var s=i.start;s<i.end;++s)o.push([0,g[s]]);c(i.end,t,i.end-i.diag,r,o)}},b=function(e,t,n,r){for(var o=e;o-t<r&&o<n&&g[o]===p[o-t];)++o;return{start:e,end:o,diag:t}},l=function(e,t,n,r){var o=t-e,i=r-n;if(0===o||0===i)return null;var a,u,s,c,l,f=o-i,d=i+o,m=(d%2==0?d:d+1)/2;for(h[1+m]=e,v[1+m]=t+1,a=0;a<=m;++a){for(u=-a;u<=a;u+=2){for(s=u+m,u===-a||u!==a&&h[s-1]<h[s+1]?h[s]=h[s+1]:h[s]=h[s-1]+1,l=(c=h[s])-e+n-u;c<t&&l<r&&g[c]===p[l];)h[s]=++c,++l;if(f%2!=0&&f-a<=u&&u<=f+a&&v[s-f]<=h[s])return b(v[s-f],u+e-n,t,r)}for(u=f-a;u<=f+a;u+=2){for(s=u+m-f,u===f-a||u!==f+a&&v[s+1]<=v[s-1]?v[s]=v[s+1]-1:v[s]=v[s-1],l=(c=v[s]-1)-e+n-u;e<=c&&n<=l&&g[c]===p[l];)v[s]=c--,l--;if(f%2==0&&-a<=u&&u<=a&&v[s]<=h[s+f])return b(v[s],u+e-n,t,r)}}},t=[];return c(0,g.length,0,p.length,t),t},Lv=function(e){return Po.isElement(e)?e.outerHTML:Po.isText(e)?Xo.encodeRaw(e.data,!1):Po.isComment(e)?"\x3c!--"+e.data+"--\x3e":""},Mv=function(e,t,n){var r=function(e){var t,n,r;for(r=H.document.createElement("div"),t=H.document.createDocumentFragment(),e&&(r.innerHTML=e);n=r.firstChild;)t.appendChild(n);return t}(t);if(e.hasChildNodes()&&n<e.childNodes.length){var o=e.childNodes[n];o.parentNode.insertBefore(r,o)}else e.appendChild(r)},Fv=function(e){return V(W(oe(e.childNodes),Lv),function(e){return 0<e.length})},zv=function(e,t){var n,r,o,i=W(oe(t.childNodes),Lv);return n=Iv(i,e),r=t,o=0,U(n,function(e){e[0]===Bv?o++:e[0]===Pv?(Mv(r,e[1],o),o++):e[0]===Ov&&function(e,t){if(e.hasChildNodes()&&t<e.childNodes.length){var n=e.childNodes[t];n.parentNode.removeChild(n)}}(r,o)}),t},Uv=Li(A.none()),Vv=function(e){return{type:"fragmented",fragments:e,content:"",bookmark:null,beforeBookmark:null}},Hv=function(e){return{type:"complete",fragments:null,content:e,bookmark:null,beforeBookmark:null}},jv=function(e){return"fragmented"===e.type?e.fragments.join(""):e.content},qv=function(e){var t=ir.fromTag("body",Uv.get().getOrThunk(function(){var e=H.document.implementation.createHTMLDocument("undo");return Uv.set(A.some(e)),e}));return la(t,jv(e)),U($i(t,"*[data-mce-bogus]"),Pi),t.dom().innerHTML},$v=function(n){var e,t,r;return e=Fv(n.getBody()),-1!==(t=(r=Z(e,function(e){var t=Dv.trimInternal(n.serializer,e);return 0<t.length?[t]:[]})).join("")).indexOf("</iframe>")?Vv(r):Hv(t)},Wv=function(e,t,n){"fragmented"===t.type?zv(t.fragments,e.getBody()):e.setContent(t.content,{format:"raw"}),e.selection.moveToBookmark(n?t.beforeBookmark:t.bookmark)},Kv=function(e,t){return!(!e||!t)&&(r=t,jv(e)===jv(r)||(n=t,qv(e)===qv(n)));var n,r};function Xv(u){var s,r,o=this,c=0,l=[],t=0,f=function(){return 0===t},i=function(e){f()&&(o.typing=e)},d=function(e){u.setDirty(e)},a=function(e){i(!1),o.add({},e)},n=function(){o.typing&&(i(!1),o.add())};return u.on("init",function(){o.add()}),u.on("BeforeExecCommand",function(e){var t=e.command;"Undo"!==t&&"Redo"!==t&&"mceRepaint"!==t&&(n(),o.beforeChange())}),u.on("ExecCommand",function(e){var t=e.command;"Undo"!==t&&"Redo"!==t&&"mceRepaint"!==t&&a(e)}),u.on("ObjectResizeStart Cut",function(){o.beforeChange()}),u.on("SaveContent ObjectResized blur",a),u.on("DragEnd",a),u.on("KeyUp",function(e){var t=e.keyCode;e.isDefaultPrevented()||((33<=t&&t<=36||37<=t&&t<=40||45===t||e.ctrlKey)&&(a(),u.nodeChanged()),46!==t&&8!==t||u.nodeChanged(),r&&o.typing&&!1===Kv($v(u),l[0])&&(!1===u.isDirty()&&(d(!0),u.fire("change",{level:l[0],lastLevel:null})),u.fire("TypingUndo"),r=!1,u.nodeChanged()))}),u.on("KeyDown",function(e){var t=e.keyCode;if(!e.isDefaultPrevented())if(33<=t&&t<=36||37<=t&&t<=40||45===t)o.typing&&a(e);else{var n=e.ctrlKey&&!e.altKey||e.metaKey;!(t<16||20<t)||224===t||91===t||o.typing||n||(o.beforeChange(),i(!0),o.add({},e),r=!0)}}),u.on("MouseDown",function(e){o.typing&&a(e)}),u.on("input",function(e){var t;e.inputType&&("insertReplacementText"===e.inputType||"insertText"===(t=e).inputType&&null===t.data)&&a(e)}),u.addShortcut("meta+z","","Undo"),u.addShortcut("meta+y,meta+shift+z","","Redo"),u.on("AddUndo Undo Redo ClearUndos",function(e){e.isDefaultPrevented()||u.nodeChanged()}),o={data:l,typing:!1,beforeChange:function(){f()&&(s=Vu.getUndoBookmark(u.selection))},add:function(e,t){var n,r,o,i=u.settings;if(o=$v(u),e=e||{},e=Jt.extend(e,o),!1===f()||u.removed)return null;if(r=l[c],u.fire("BeforeAddUndo",{level:e,lastLevel:r,originalEvent:t}).isDefaultPrevented())return null;if(r&&Kv(r,e))return null;if(l[c]&&(l[c].beforeBookmark=s),i.custom_undo_redo_levels&&l.length>i.custom_undo_redo_levels){for(n=0;n<l.length-1;n++)l[n]=l[n+1];l.length--,c=l.length}e.bookmark=Vu.getUndoBookmark(u.selection),c<l.length-1&&(l.length=c+1),l.push(e),c=l.length-1;var a={level:e,lastLevel:r,originalEvent:t};return u.fire("AddUndo",a),0<c&&(d(!0),u.fire("change",a)),e},undo:function(){var e;return o.typing&&(o.add(),o.typing=!1,i(!1)),0<c&&(e=l[--c],Wv(u,e,!0),d(!0),u.fire("undo",{level:e})),e},redo:function(){var e;return c<l.length-1&&(e=l[++c],Wv(u,e,!1),d(!0),u.fire("redo",{level:e})),e},clear:function(){l=[],c=0,o.typing=!1,o.data=l,u.fire("ClearUndos")},hasUndo:function(){return 0<c||o.typing&&l[0]&&!Kv($v(u),l[0])},hasRedo:function(){return c<l.length-1&&!o.typing},transact:function(e){return n(),o.beforeChange(),o.ignore(e),o.add()},ignore:function(e){try{t++,e()}finally{t--}},extra:function(e,t){var n,r;o.transact(e)&&(r=l[c].bookmark,n=l[c-1],Wv(u,n,!0),o.transact(t)&&(l[c-1].beforeBookmark=r))}}}var Yv,Gv,Jv={},Qv=Wt.filter,Zv=Wt.each;Gv=function(e){var t,n,r=e.selection.getRng();t=Po.matchNodeNames("pre"),r.collapsed||(n=e.selection.getSelectedBlocks(),Zv(Qv(Qv(n,t),function(e){return t(e.previousSibling)&&-1!==Wt.indexOf(n,e.previousSibling)}),function(e){var t,n;t=e.previousSibling,vn(n=e).remove(),vn(t).append("<br><br>").append(n.childNodes)}))},Jv[Yv="pre"]||(Jv[Yv]=[]),Jv[Yv].push(Gv);var eb=function(e,t){Zv(Jv[e],function(e){e(t)})},tb=/^(src|href|style)$/,nb=Jt.each,rb=hc.isEq,ob=function(e,t,n){return e.isChildOf(t,n)&&t!==n&&!e.isBlock(n)},ib=function(e,t,n){var r,o,i;return r=t[n?"startContainer":"endContainer"],o=t[n?"startOffset":"endOffset"],Po.isElement(r)&&(i=r.childNodes.length-1,!n&&o&&o--,r=r.childNodes[i<o?i:o]),Po.isText(r)&&n&&o>=r.nodeValue.length&&(r=new ao(r,e.getBody()).next()||r),Po.isText(r)&&!n&&0===o&&(r=new ao(r,e.getBody()).prev()||r),r},ab=function(e,t,n,r){var o=e.create(n,r);return t.parentNode.insertBefore(o,t),o.appendChild(t),o},ub=function(e,t,n,r,o){var i=ir.fromDom(t),a=ir.fromDom(e.create(r,o)),u=n?jr(i):Hr(i);return Di(a,u),n?(Ti(i,a),Ri(a,i)):(Ai(i,a),_i(a,i)),a.dom()},sb=function(e,t,n,r){return!(t=hc.getNonWhiteSpaceSibling(t,n,r))||"BR"===t.nodeName||e.isBlock(t)},cb=function(e,n,r,o,i){var t,a,u,s,c,l,f,d,m,g,p,h,v,b,y=e.dom;if(c=y,!(rb(l=o,(f=n).inline)||rb(l,f.block)||(f.selector?Po.isElement(l)&&c.is(l,f.selector):void 0)||(s=o,n.links&&"A"===s.tagName)))return!1;if("all"!==n.remove)for(nb(n.styles,function(e,t){e=hc.normalizeStyleValue(y,hc.replaceVars(e,r),t),"number"==typeof t&&(t=e,i=0),(n.remove_similar||!i||rb(hc.getStyle(y,i,t),e))&&y.setStyle(o,t,""),u=1}),u&&""===y.getAttrib(o,"style")&&(o.removeAttribute("style"),o.removeAttribute("data-mce-style")),nb(n.attributes,function(e,t){var n;if(e=hc.replaceVars(e,r),"number"==typeof t&&(t=e,i=0),!i||rb(y.getAttrib(i,t),e)){if("class"===t&&(e=y.getAttrib(o,t))&&(n="",nb(e.split(/\s+/),function(e){/mce\-\w+/.test(e)&&(n+=(n?" ":"")+e)}),n))return void y.setAttrib(o,t,n);"class"===t&&o.removeAttribute("className"),tb.test(t)&&o.removeAttribute("data-mce-"+t),o.removeAttribute(t)}}),nb(n.classes,function(e){e=hc.replaceVars(e,r),i&&!y.hasClass(i,e)||y.removeClass(o,e)}),a=y.getAttribs(o),t=0;t<a.length;t++){var C=a[t].nodeName;if(0!==C.indexOf("_")&&0!==C.indexOf("data-"))return!1}return"none"!==n.remove?(d=e,g=n,h=(m=o).parentNode,v=d.dom,b=d.settings.forced_root_block,g.block&&(b?h===v.getRoot()&&(g.list_block&&rb(m,g.list_block)||nb(Jt.grep(m.childNodes),function(e){hc.isValid(d,b,e.nodeName.toLowerCase())?p?p.appendChild(e):(p=ab(v,e,b),v.setAttribs(p,d.settings.forced_root_block_attrs)):p=0})):v.isBlock(m)&&!v.isBlock(h)&&(sb(v,m,!1)||sb(v,m.firstChild,!0,1)||m.insertBefore(v.create("br"),m.firstChild),sb(v,m,!0)||sb(v,m.lastChild,!1,1)||m.appendChild(v.create("br")))),g.selector&&g.inline&&!rb(g.inline,m)||v.remove(m,1),!0):void 0},lb=cb,fb=function(s,c,l,e,f){var t,n,d=s.formatter.get(c),m=d[0],a=!0,u=s.dom,r=s.selection,i=function(e){var n,t,r,o,i,a,u=(n=s,t=e,r=c,o=l,i=f,nb(hc.getParents(n.dom,t.parentNode).reverse(),function(e){var t;a||"_start"===e.id||"_end"===e.id||(t=Om.matchNode(n,e,r,o,i))&&!1!==t.split&&(a=e)}),a);return function(e,t,n,r,o,i,a,u){var s,c,l,f,d,m,g=e.dom;if(n){for(m=n.parentNode,s=r.parentNode;s&&s!==m;s=s.parentNode){for(c=g.clone(s,!1),d=0;d<t.length;d++)if(cb(e,t[d],u,c,c)){c=0;break}c&&(l&&c.appendChild(l),f||(f=c),l=c)}!i||a.mixed&&g.isBlock(n)||(r=g.split(n,r)),l&&(o.parentNode.insertBefore(l,o),f.appendChild(o))}return r}(s,d,u,e,e,!0,m,l)},g=function(e){var t,n,r,o,i;if(Po.isElement(e)&&u.getContentEditable(e)&&(o=a,a="true"===u.getContentEditable(e),i=!0),t=Jt.grep(e.childNodes),a&&!i)for(n=0,r=d.length;n<r&&!cb(s,d[n],l,e,e);n++);if(m.deep&&t.length){for(n=0,r=t.length;n<r;n++)g(t[n]);i&&(a=o)}},p=function(e){var t,n=u.get(e?"_start":"_end"),r=n[e?"firstChild":"lastChild"];return dc(t=r)&&Po.isElement(t)&&("_start"===t.id||"_end"===t.id)&&(r=r[e?"firstChild":"lastChild"]),Po.isText(r)&&0===r.data.length&&(r=e?n.previousSibling||n.nextSibling:n.nextSibling||n.previousSibling),u.remove(n,!0),r},o=function(e){var t,n,r=e.commonAncestorContainer;if(e=Ac(s,e,d,!0),m.split){if(e=Im(e),(t=ib(s,e,!0))!==(n=ib(s,e))){if(/^(TR|TH|TD)$/.test(t.nodeName)&&t.firstChild&&(t="TR"===t.nodeName?t.firstChild.firstChild||t:t.firstChild||t),r&&/^T(HEAD|BODY|FOOT|R)$/.test(r.nodeName)&&/^(TH|TD)$/.test(n.nodeName)&&n.firstChild&&(n=n.firstChild||n),ob(u,t,n)){var o=A.from(t.firstChild).getOr(t);return i(ub(u,o,!0,"span",{id:"_start","data-mce-type":"bookmark"})),void p(!0)}if(ob(u,n,t))return o=A.from(n.lastChild).getOr(n),i(ub(u,o,!1,"span",{id:"_end","data-mce-type":"bookmark"})),void p(!1);t=ab(u,t,"span",{id:"_start","data-mce-type":"bookmark"}),n=ab(u,n,"span",{id:"_end","data-mce-type":"bookmark"}),i(t),i(n),t=p(!0),n=p()}else t=n=i(t);e.startContainer=t.parentNode?t.parentNode:t,e.startOffset=u.nodeIndex(t),e.endContainer=n.parentNode?n.parentNode:n,e.endOffset=u.nodeIndex(n)+1}_c(u,e,function(e){nb(e,function(e){g(e),Po.isElement(e)&&"underline"===s.dom.getStyle(e,"text-decoration")&&e.parentNode&&"underline"===hc.getTextDecoration(u,e.parentNode)&&cb(s,{deep:!1,exact:!0,inline:"span",styles:{textDecoration:"underline"}},null,e)})})};if(e)e.nodeType?((n=u.createRng()).setStartBefore(e),n.setEndAfter(e),o(n)):o(e);else if("false"!==u.getContentEditable(r.getNode()))r.isCollapsed()&&m.inline&&!u.select("td[data-mce-selected],th[data-mce-selected]").length?function(e,t,n,r){var o,i,a,u,s,c,l,f=e.dom,d=e.selection,m=[],g=d.getRng();for(o=g.startContainer,i=g.startOffset,3===(s=o).nodeType&&(i!==o.nodeValue.length&&(u=!0),s=s.parentNode);s;){if(Om.matchNode(e,s,t,n,r)){c=s;break}s.nextSibling&&(u=!0),m.push(s),s=s.parentNode}if(c)if(u){a=d.getBookmark(),g.collapse(!0);var p=Ac(e,g,e.formatter.get(t),!0);p=Im(p),e.formatter.remove(t,n,p),d.moveToBookmark(a)}else{l=qu(e.getBody(),c);var h=Um(!1).dom(),v=$m(m,h);jm(e,h,l||c),Vm(e,l,!1),d.setCursorLocation(v,1),f.isEmpty(c)&&f.remove(c)}}(s,c,l,f):(t=Vu.getPersistentBookmark(s.selection,!0),o(r.getRng()),r.moveToBookmark(t),m.inline&&Om.match(s,c,l,r.getStart())&&hc.moveStart(u,r,r.getRng()),s.nodeChanged());else{e=r.getNode();for(var h=0,v=d.length;h<v&&(!d[h].ceFalseOverride||!cb(s,d[h],l,e,e));h++);}},db=Jt.each,mb=function(e){return e&&1===e.nodeType&&!dc(e)&&!ju(e)&&!Po.isBogus(e)},gb=function(e,t){var n;for(n=e;n;n=n[t]){if(3===n.nodeType&&0!==n.nodeValue.length)return e;if(1===n.nodeType&&!dc(n))return n}return e},pb=function(e,t,n){var r,o,i=new Xc(e);if(t&&n&&(t=gb(t,"previousSibling"),n=gb(n,"nextSibling"),i.compare(t,n))){for(r=t.nextSibling;r&&r!==n;)r=(o=r).nextSibling,t.appendChild(o);return e.remove(n),Jt.each(Jt.grep(n.childNodes),function(e){t.appendChild(e)}),t}return n},hb=function(e,t,n){db(e.childNodes,function(e){mb(e)&&(t(e)&&n(e),e.hasChildNodes()&&hb(e,t,n))})},vb=function(n,e){return d(function(e,t){return!(!t||!hc.getStyle(n,t,e))},e)},bb=function(r,e,t){return d(function(e,t,n){r.setStyle(n,e,t),""===n.getAttribute("style")&&n.removeAttribute("style"),yb(r,n)},e,t)},yb=function(e,t){"SPAN"===t.nodeName&&0===e.getAttribs(t).length&&e.remove(t,!0)},Cb=function(e,t){var n;1===t.nodeType&&t.parentNode&&1===t.parentNode.nodeType&&(n=hc.getTextDecoration(e,t.parentNode),e.getStyle(t,"color")&&n?e.setStyle(t,"text-decoration",n):e.getStyle(t,"text-decoration")===n&&e.setStyle(t,"text-decoration",null))},xb=function(n,e,r,o){db(e,function(t){db(n.dom.select(t.inline,o),function(e){mb(e)&&lb(n,t,r,e,t.exact?e:null)}),function(r,e,t){if(e.clear_child_styles){var n=e.links?"*:not(a)":"*";db(r.select(n,t),function(n){mb(n)&&db(e.styles,function(e,t){r.setStyle(n,t,"")})})}}(n.dom,t,o)})},wb=function(e,t,n,r){(t.styles.color||t.styles.textDecoration)&&(Jt.walk(r,d(Cb,e),"childNodes"),Cb(e,r))},Nb=function(e,t,n,r){t.styles&&t.styles.backgroundColor&&hb(r,vb(e,"fontSize"),bb(e,"backgroundColor",hc.replaceVars(t.styles.backgroundColor,n)))},Eb=function(e,t,n,r){"sub"!==t.inline&&"sup"!==t.inline||(hb(r,vb(e,"fontSize"),bb(e,"fontSize","")),e.remove(e.select("sup"===t.inline?"sub":"sup",r),!0))},Sb=function(e,t,n,r){r&&!1!==t.merge_siblings&&(r=pb(e,hc.getNonWhiteSpaceSibling(r),r),r=pb(e,r,hc.getNonWhiteSpaceSibling(r,!0)))},kb=function(t,n,r,o,i){Om.matchNode(t,i.parentNode,r,o)&&lb(t,n,o,i)||n.merge_with_parents&&t.dom.getParent(i.parentNode,function(e){if(Om.matchNode(t,e,r,o))return lb(t,n,o,i),!0})},Tb=Jt.each,Ab=function(g,p,h,r){var e,t,v=g.formatter.get(p),b=v[0],o=!r&&g.selection.isCollapsed(),i=g.dom,n=g.selection,y=function(n,e){if(e=e||b,n){if(e.onformat&&e.onformat(n,e,h,r),Tb(e.styles,function(e,t){i.setStyle(n,t,hc.replaceVars(e,h))}),e.styles){var t=i.getAttrib(n,"style");t&&n.setAttribute("data-mce-style",t)}Tb(e.attributes,function(e,t){i.setAttrib(n,t,hc.replaceVars(e,h))}),Tb(e.classes,function(e){e=hc.replaceVars(e,h),i.hasClass(n,e)||i.addClass(n,e)})}},C=function(e,t){var n=!1;return!!b.selector&&(Tb(e,function(e){if(!("collapsed"in e&&e.collapsed!==o))return i.is(t,e.selector)&&!ju(t)?(y(t,e),!(n=!0)):void 0}),n)},a=function(s,e,t,c){var l,f,d=[],m=!0;l=b.inline||b.block,f=s.create(l),y(f),_c(s,e,function(e){var a,u=function(e){var t,n,r,o;if(o=m,t=e.nodeName.toLowerCase(),n=e.parentNode.nodeName.toLowerCase(),1===e.nodeType&&s.getContentEditable(e)&&(o=m,m="true"===s.getContentEditable(e),r=!0),hc.isEq(t,"br"))return a=0,void(b.block&&s.remove(e));if(b.wrapper&&Om.matchNode(g,e,p,h))a=0;else{if(m&&!r&&b.block&&!b.wrapper&&hc.isTextBlock(g,t)&&hc.isValid(g,n,l))return e=s.rename(e,l),y(e),d.push(e),void(a=0);if(b.selector){var i=C(v,e);if(!b.inline||i)return void(a=0)}!m||r||!hc.isValid(g,l,t)||!hc.isValid(g,n,l)||!c&&3===e.nodeType&&1===e.nodeValue.length&&65279===e.nodeValue.charCodeAt(0)||ju(e)||b.inline&&s.isBlock(e)?(a=0,Tb(Jt.grep(e.childNodes),u),r&&(m=o),a=0):(a||(a=s.clone(f,!1),e.parentNode.insertBefore(a,e),d.push(a)),a.appendChild(e))}};Tb(e,u)}),!0===b.links&&Tb(d,function(e){var t=function(e){"A"===e.nodeName&&y(e,b),Tb(Jt.grep(e.childNodes),t)};t(e)}),Tb(d,function(e){var t,n,r,o,i,a=function(e){var n=!1;return Tb(e.childNodes,function(e){if((t=e)&&1===t.nodeType&&!dc(t)&&!ju(t)&&!Po.isBogus(t))return n=e,!1;var t}),n};n=0,Tb(e.childNodes,function(e){hc.isWhiteSpaceNode(e)||dc(e)||n++}),t=n,!(1<d.length)&&s.isBlock(e)||0!==t?(b.inline||b.wrapper)&&(b.exact||1!==t||((o=a(r=e))&&!dc(o)&&Om.matchName(s,o,b)&&(i=s.clone(o,!1),y(i),s.replace(i,r,!0),s.remove(o,1)),e=i||r),xb(g,v,h,e),kb(g,b,p,h,e),Nb(s,b,h,e),Eb(s,b,h,e),Sb(s,b,h,e)):s.remove(e,1)})};if("false"!==i.getContentEditable(n.getNode())){if(b){if(r)r.nodeType?C(v,r)||((t=i.createRng()).setStartBefore(r),t.setEndAfter(r),a(i,Ac(g,t,v),0,!0)):a(i,r,0,!0);else if(o&&b.inline&&!i.select("td[data-mce-selected],th[data-mce-selected]").length)!function(e,t,n){var r,o,i,a,u,s,c=e.selection;a=(r=c.getRng(!0)).startOffset,s=r.startContainer.nodeValue,(o=qu(e.getBody(),c.getStart()))&&(i=zm(o));var l,f,d=/[^\s\u00a0\u00ad\u200b\ufeff]/;s&&0<a&&a<s.length&&d.test(s.charAt(a))&&d.test(s.charAt(a-1))?(u=c.getBookmark(),r.collapse(!0),r=Ac(e,r,e.formatter.get(t)),r=Im(r),e.formatter.apply(t,n,r),c.moveToBookmark(u)):(o&&i.nodeValue===Lm||(l=e.getDoc(),f=Um(!0).dom(),i=(o=l.importNode(f,!0)).firstChild,r.insertNode(o),a=1),e.formatter.apply(t,n,o),c.setCursorLocation(i,a))}(g,p,h);else{var u=g.selection.getNode();g.settings.forced_root_block||!v[0].defaultBlock||i.getParent(u,i.isBlock)||Ab(g,v[0].defaultBlock),g.selection.setRng(rl(g.selection.getRng())),e=Vu.getPersistentBookmark(g.selection,!0),a(i,Ac(g,n.getRng(),v)),b.styles&&wb(i,b,h,u),n.moveToBookmark(e),hc.moveStart(i,n,n.getRng()),g.nodeChanged()}eb(p,g)}}else{r=n.getNode();for(var s=0,c=v.length;s<c;s++)if(v[s].ceFalseOverride&&i.is(r,v[s].selector))return void y(r,v[s])}},Rb={applyFormat:Ab},_b=Jt.each,Db=function(e,t,n,r,o){var i,a,u,s,c,l,f,d;null===t.get()&&(a=e,u={},(i=t).set({}),a.on("NodeChange",function(n){var r=hc.getParents(a.dom,n.element),o={};r=Jt.grep(r,function(e){return 1===e.nodeType&&!e.getAttribute("data-mce-bogus")}),_b(i.get(),function(e,n){_b(r,function(t){return a.formatter.matchNode(t,n,{},e.similar)?(u[n]||(_b(e,function(e){e(!0,{node:t,format:n,parents:r})}),u[n]=e),o[n]=e,!1):!Om.matchesUnInheritedFormatSelector(a,t,n)&&void 0})}),_b(u,function(e,t){o[t]||(delete u[t],_b(e,function(e){e(!1,{node:n.element,format:t,parents:r})}))})})),c=n,l=r,f=o,d=(s=t).get(),_b(c.split(","),function(e){d[e]||(d[e]=[],d[e].similar=f),d[e].push(l)}),s.set(d)},Bb={get:function(r){var t={valigntop:[{selector:"td,th",styles:{verticalAlign:"top"}}],valignmiddle:[{selector:"td,th",styles:{verticalAlign:"middle"}}],valignbottom:[{selector:"td,th",styles:{verticalAlign:"bottom"}}],alignleft:[{selector:"figure.image",collapsed:!1,classes:"align-left",ceFalseOverride:!0,preview:"font-family font-size"},{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"left"},inherit:!1,preview:!1,defaultBlock:"div"},{selector:"img,table",collapsed:!1,styles:{"float":"left"},preview:"font-family font-size"}],aligncenter:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"center"},inherit:!1,preview:"font-family font-size",defaultBlock:"div"},{selector:"figure.image",collapsed:!1,classes:"align-center",ceFalseOverride:!0,preview:"font-family font-size"},{selector:"img",collapsed:!1,styles:{display:"block",marginLeft:"auto",marginRight:"auto"},preview:!1},{selector:"table",collapsed:!1,styles:{marginLeft:"auto",marginRight:"auto"},preview:"font-family font-size"}],alignright:[{selector:"figure.image",collapsed:!1,classes:"align-right",ceFalseOverride:!0,preview:"font-family font-size"},{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"right"},inherit:!1,preview:"font-family font-size",defaultBlock:"div"},{selector:"img,table",collapsed:!1,styles:{"float":"right"},preview:"font-family font-size"}],alignjustify:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"justify"},inherit:!1,defaultBlock:"div",preview:"font-family font-size"}],bold:[{inline:"strong",remove:"all"},{inline:"span",styles:{fontWeight:"bold"}},{inline:"b",remove:"all"}],italic:[{inline:"em",remove:"all"},{inline:"span",styles:{fontStyle:"italic"}},{inline:"i",remove:"all"}],underline:[{inline:"span",styles:{textDecoration:"underline"},exact:!0},{inline:"u",remove:"all"}],strikethrough:[{inline:"span",styles:{textDecoration:"line-through"},exact:!0},{inline:"strike",remove:"all"}],forecolor:{inline:"span",styles:{color:"%value"},links:!0,remove_similar:!0,clear_child_styles:!0},hilitecolor:{inline:"span",styles:{backgroundColor:"%value"},links:!0,remove_similar:!0,clear_child_styles:!0},fontname:{inline:"span",toggle:!1,styles:{fontFamily:"%value"},clear_child_styles:!0},fontsize:{inline:"span",toggle:!1,styles:{fontSize:"%value"},clear_child_styles:!0},fontsize_class:{inline:"span",attributes:{"class":"%value"}},blockquote:{block:"blockquote",wrapper:1,remove:"all"},subscript:{inline:"sub"},superscript:{inline:"sup"},code:{inline:"code"},link:{inline:"a",selector:"a",remove:"all",split:!0,deep:!0,onmatch:function(){return!0},onformat:function(n,e,t){Jt.each(t,function(e,t){r.setAttrib(n,t,e)})}},removeformat:[{selector:"b,strong,em,i,font,u,strike,sub,sup,dfn,code,samp,kbd,var,cite,mark,q,del,ins",remove:"all",split:!0,expand:!1,block_expand:!0,deep:!0},{selector:"span",attributes:["style","class"],remove:"empty",split:!0,expand:!1,deep:!0},{selector:"*",attributes:["style","class"],split:!1,expand:!1,deep:!0}]};return Jt.each("p h1 h2 h3 h4 h5 h6 div address pre div dt dd samp".split(/\s/),function(e){t[e]={block:e,remove:"all"}}),t}},Ob=Jt.each,Pb=bi.DOM,Ib=function(e,t){var n,o,r,m=t&&t.schema||ii({}),g=function(e){var t,n,r;return o="string"==typeof e?{name:e,classes:[],attrs:{}}:e,t=Pb.create(o.name),n=t,(r=o).classes.length&&Pb.addClass(n,r.classes.join(" ")),Pb.setAttribs(n,r.attrs),t},p=function(n,e,t){var r,o,i,a,u,s,c,l,f=0<e.length&&e[0],d=f&&f.name;if(u=d,s="string"!=typeof(a=n)?a.nodeName.toLowerCase():a,c=m.getElementRule(s),i=!(!(l=c&&c.parentsRequired)||!l.length)&&(u&&-1!==Jt.inArray(l,u)?u:l[0]))d===i?(o=e[0],e=e.slice(1)):o=i;else if(f)o=e[0],e=e.slice(1);else if(!t)return n;return o&&(r=g(o)).appendChild(n),t&&(r||(r=Pb.create("div")).appendChild(n),Jt.each(t,function(e){var t=g(e);r.insertBefore(t,n)})),p(r,e,o&&o.siblings)};return e&&e.length?(o=e[0],n=g(o),(r=Pb.create("div")).appendChild(p(n,e.slice(1),o.siblings)),r):""},Lb=function(e){var t,a={classes:[],attrs:{}};return"*"!==(e=a.selector=Jt.trim(e))&&(t=e.replace(/(?:([#\.]|::?)([\w\-]+)|(\[)([^\]]+)\]?)/g,function(e,t,n,r,o){switch(t){case"#":a.attrs.id=n;break;case".":a.classes.push(n);break;case":":-1!==Jt.inArray("checked disabled enabled read-only required".split(" "),n)&&(a.attrs[n]=n)}if("["===r){var i=o.match(/([\w\-]+)(?:\=\"([^\"]+))?/);i&&(a.attrs[i[1]]=i[2])}return""})),a.name=t||"div",a},Mb=function(e){return e&&"string"==typeof e?(e=(e=e.split(/\s*,\s*/)[0]).replace(/\s*(~\+|~|\+|>)\s*/g,"$1"),Jt.map(e.split(/(?:>|\s+(?![^\[\]]+\]))/),function(e){var t=Jt.map(e.split(/(?:~\+|~|\+)/),Lb),n=t.pop();return t.length&&(n.siblings=t),n}).reverse()):[]},Fb=function(n,e){var t,r,o,i,a,u,s="";if(!1===(u=n.settings.preview_styles))return"";"string"!=typeof u&&(u="font-family font-size font-weight font-style text-decoration text-transform color background-color border border-radius outline text-shadow");var c=function(e){return e.replace(/%(\w+)/g,"")};if("string"==typeof e){if(!(e=n.formatter.get(e)))return;e=e[0]}return"preview"in e&&!1===(u=e.preview)?"":(t=e.block||e.inline||"span",(i=Mb(e.selector)).length?(i[0].name||(i[0].name=t),t=e.selector,r=Ib(i,n)):r=Ib([t],n),o=Pb.select(t,r)[0]||r.firstChild,Ob(e.styles,function(e,t){(e=c(e))&&Pb.setStyle(o,t,e)}),Ob(e.attributes,function(e,t){(e=c(e))&&Pb.setAttrib(o,t,e)}),Ob(e.classes,function(e){e=c(e),Pb.hasClass(o,e)||Pb.addClass(o,e)}),n.fire("PreviewFormats"),Pb.setStyles(r,{position:"absolute",left:-65535}),n.getBody().appendChild(r),a=Pb.getStyle(n.getBody(),"fontSize",!0),a=/px$/.test(a)?parseInt(a,10):0,Ob(u.split(" "),function(e){var t=Pb.getStyle(o,e,!0);if(!("background-color"===e&&/transparent|rgba\s*\([^)]+,\s*0\)/.test(t)&&(t=Pb.getStyle(n.getBody(),e,!0),"#ffffff"===Pb.toHex(t).toLowerCase())||"color"===e&&"#000000"===Pb.toHex(t).toLowerCase())){if("font-size"===e&&/em|%$/.test(t)){if(0===a)return;t=parseFloat(t)/(/%$/.test(t)?100:1)*a+"px"}"border"===e&&t&&(s+="padding:0 2px;"),s+=e+":"+t+";"}}),n.fire("AfterPreviewFormats"),Pb.remove(r),s)},zb=function(e,t,n,r,o){var i=t.get(n);!Om.match(e,n,r,o)||"toggle"in i[0]&&!i[0].toggle?Rb.applyFormat(e,n,r,o):fb(e,n,r,o)},Ub=function(e){e.addShortcut("meta+b","","Bold"),e.addShortcut("meta+i","","Italic"),e.addShortcut("meta+u","","Underline");for(var t=1;t<=6;t++)e.addShortcut("access+"+t,"",["FormatBlock",!1,"h"+t]);e.addShortcut("access+7","",["FormatBlock",!1,"p"]),e.addShortcut("access+8","",["FormatBlock",!1,"div"]),e.addShortcut("access+9","",["FormatBlock",!1,"address"])};function Vb(e){var t,n,r,o=(t=e,n={},(r=function(e,t){e&&("string"!=typeof e?Jt.each(e,function(e,t){r(t,e)}):(t=t.length?t:[t],Jt.each(t,function(e){"undefined"==typeof e.deep&&(e.deep=!e.selector),"undefined"==typeof e.split&&(e.split=!e.selector||e.inline),"undefined"==typeof e.remove&&e.selector&&!e.inline&&(e.remove="none"),e.selector&&e.inline&&(e.mixed=!0,e.block_expand=!0),"string"==typeof e.classes&&(e.classes=e.classes.split(/\s+/))}),n[e]=t))})(Bb.get(t.dom)),r(t.settings.formats),{get:function(e){return e?n[e]:n},register:r,unregister:function(e){return e&&n[e]&&delete n[e],n}}),i=Li(null);return Ub(e),Wm(e),{get:o.get,register:o.register,unregister:o.unregister,apply:d(Rb.applyFormat,e),remove:d(fb,e),toggle:d(zb,e,o),match:d(Om.match,e),matchAll:d(Om.matchAll,e),matchNode:d(Om.matchNode,e),canApply:d(Om.canApply,e),formatChanged:d(Db,e,i),getCssText:d(Fb,e)}}var Hb,jb=Object.prototype.hasOwnProperty,qb=(Hb=function(e,t){return t},function(){for(var e=new Array(arguments.length),t=0;t<e.length;t++)e[t]=arguments[t];if(0===e.length)throw new Error("Can't merge zero objects");for(var n={},r=0;r<e.length;r++){var o=e[r];for(var i in o)jb.call(o,i)&&(n[i]=Hb(n[i],o[i]))}return n}),$b={register:function(t,s,c){t.addAttributeFilter("data-mce-tabindex",function(e,t){for(var n,r=e.length;r--;)(n=e[r]).attr("tabindex",n.attributes.map["data-mce-tabindex"]),n.attr(t,null)}),t.addAttributeFilter("src,href,style",function(e,t){for(var n,r,o=e.length,i="data-mce-"+t,a=s.url_converter,u=s.url_converter_scope;o--;)(r=(n=e[o]).attributes.map[i])!==undefined?(n.attr(t,0<r.length?r:null),n.attr(i,null)):(r=n.attributes.map[t],"style"===t?r=c.serializeStyle(c.parseStyle(r),n.name):a&&(r=a.call(u,r,t,n.name)),n.attr(t,0<r.length?r:null))}),t.addAttributeFilter("class",function(e){for(var t,n,r=e.length;r--;)(n=(t=e[r]).attr("class"))&&(n=t.attr("class").replace(/(?:^|\s)mce-item-\w+(?!\S)/g,""),t.attr("class",0<n.length?n:null))}),t.addAttributeFilter("data-mce-type",function(e,t,n){for(var r,o=e.length;o--;)"bookmark"!==(r=e[o]).attributes.map["data-mce-type"]||n.cleanup||(A.from(r.firstChild).exists(function(e){return!da(e.value)})?r.unwrap():r.remove())}),t.addNodeFilter("noscript",function(e){for(var t,n=e.length;n--;)(t=e[n].firstChild)&&(t.value=Xo.decode(t.value))}),t.addNodeFilter("script,style",function(e,t){for(var n,r,o,i=e.length,a=function(e){return e.replace(/(<!--\[CDATA\[|\]\]-->)/g,"\n").replace(/^[\r\n]*|[\r\n]*$/g,"").replace(/^\s*((<!--)?(\s*\/\/)?\s*<!\[CDATA\[|(<!--\s*)?\/\*\s*<!\[CDATA\[\s*\*\/|(\/\/)?\s*<!--|\/\*\s*<!--\s*\*\/)\s*[\r\n]*/gi,"").replace(/\s*(\/\*\s*\]\]>\s*\*\/(-->)?|\s*\/\/\s*\]\]>(-->)?|\/\/\s*(-->)?|\]\]>|\/\*\s*-->\s*\*\/|\s*-->\s*)\s*$/g,"")};i--;)r=(n=e[i]).firstChild?n.firstChild.value:"","script"===t?((o=n.attr("type"))&&n.attr("type","mce-no/type"===o?null:o.replace(/^mce\-/,"")),"xhtml"===s.element_format&&0<r.length&&(n.firstChild.value="// <![CDATA[\n"+a(r)+"\n// ]]>")):"xhtml"===s.element_format&&0<r.length&&(n.firstChild.value="\x3c!--\n"+a(r)+"\n--\x3e")}),t.addNodeFilter("#comment",function(e){for(var t,n=e.length;n--;)0===(t=e[n]).value.indexOf("[CDATA[")?(t.name="#cdata",t.type=4,t.value=t.value.replace(/^\[CDATA\[|\]\]$/g,"")):0===t.value.indexOf("mce:protected ")&&(t.name="#text",t.type=3,t.raw=!0,t.value=unescape(t.value).substr(14))}),t.addNodeFilter("xml:namespace,input",function(e,t){for(var n,r=e.length;r--;)7===(n=e[r]).type?n.remove():1===n.type&&("input"!==t||"type"in n.attributes.map||n.attr("type","text"))}),t.addAttributeFilter("data-mce-type",function(e){U(e,function(e){"format-caret"===e.attr("data-mce-type")&&(e.isEmpty(t.schema.getNonEmptyElements())?e.remove():e.unwrap())})}),t.addAttributeFilter("data-mce-src,data-mce-href,data-mce-style,data-mce-selected,data-mce-expando,data-mce-type,data-mce-resize",function(e,t){for(var n=e.length;n--;)e[n].attr(t,null)})},trimTrailingBr:function(e){var t,n,r=function(e){return e&&"br"===e.name};r(t=e.lastChild)&&r(n=t.prev)&&(t.remove(),n.remove())}},Wb={process:function(e,t,n){return f=n,(l=e)&&l.hasEventListeners("PreProcess")&&!f.no_events?(o=t,i=n,c=(r=e).dom,o=o.cloneNode(!0),(a=H.document.implementation).createHTMLDocument&&(u=a.createHTMLDocument(""),Jt.each("BODY"===o.nodeName?o.childNodes:[o],function(e){u.body.appendChild(u.importNode(e,!0))}),o="BODY"!==o.nodeName?u.body.firstChild:u.body,s=c.doc,c.doc=u),dp(r,qb(i,{node:o})),s&&(c.doc=s),o):t;var r,o,i,a,u,s,c,l,f}},Kb=function(e,a,u){e.addNodeFilter("font",function(e){U(e,function(e){var t,n=a.parse(e.attr("style")),r=e.attr("color"),o=e.attr("face"),i=e.attr("size");r&&(n.color=r),o&&(n["font-family"]=o),i&&(n["font-size"]=u[parseInt(e.attr("size"),10)-1]),e.name="span",e.attr("style",a.serialize(n)),t=e,U(["color","face","size"],function(e){t.attr(e,null)})})})},Xb=function(e,t){var n,r=ui();t.convert_fonts_to_spans&&Kb(e,r,Jt.explode(t.font_size_legacy_values)),n=r,e.addNodeFilter("strike",function(e){U(e,function(e){var t=n.parse(e.attr("style"));t["text-decoration"]="line-through",e.name="span",e.attr("style",n.serialize(t))})})},Yb={register:function(e,t){t.inline_styles&&Xb(e,t)}},Gb=/^[ \t\r\n]*$/,Jb={"#text":3,"#comment":8,"#cdata":4,"#pi":7,"#doctype":10,"#document-fragment":11},Qb=function(e,t,n){var r,o,i=n?"lastChild":"firstChild",a=n?"prev":"next";if(e[i])return e[i];if(e!==t){if(r=e[a])return r;for(o=e.parent;o&&o!==t;o=o.parent)if(r=o[a])return r}},Zb=function(){function a(e,t){this.name=e,1===(this.type=t)&&(this.attributes=[],this.attributes.map={})}return a.create=function(e,t){var n,r;if(n=new a(e,Jb[e]||1),t)for(r in t)n.attr(r,t[r]);return n},a.prototype.replace=function(e){return e.parent&&e.remove(),this.insert(e,this),this.remove(),this},a.prototype.attr=function(e,t){var n,r;if("string"!=typeof e){for(r in e)this.attr(r,e[r]);return this}if(n=this.attributes){if(t!==undefined){if(null===t){if(e in n.map)for(delete n.map[e],r=n.length;r--;)if(n[r].name===e)return n=n.splice(r,1),this;return this}if(e in n.map){for(r=n.length;r--;)if(n[r].name===e){n[r].value=t;break}}else n.push({name:e,value:t});return n.map[e]=t,this}return n.map[e]}},a.prototype.clone=function(){var e,t,n,r,o,i=new a(this.name,this.type);if(n=this.attributes){for((o=[]).map={},e=0,t=n.length;e<t;e++)"id"!==(r=n[e]).name&&(o[o.length]={name:r.name,value:r.value},o.map[r.name]=r.value);i.attributes=o}return i.value=this.value,i.shortEnded=this.shortEnded,i},a.prototype.wrap=function(e){return this.parent.insert(e,this),e.append(this),this},a.prototype.unwrap=function(){var e,t;for(e=this.firstChild;e;)t=e.next,this.insert(e,this,!0),e=t;this.remove()},a.prototype.remove=function(){var e=this.parent,t=this.next,n=this.prev;return e&&(e.firstChild===this?(e.firstChild=t)&&(t.prev=null):n.next=t,e.lastChild===this?(e.lastChild=n)&&(n.next=null):t.prev=n,this.parent=this.next=this.prev=null),this},a.prototype.append=function(e){var t;return e.parent&&e.remove(),(t=this.lastChild)?((t.next=e).prev=t,this.lastChild=e):this.lastChild=this.firstChild=e,e.parent=this,e},a.prototype.insert=function(e,t,n){var r;return e.parent&&e.remove(),r=t.parent||this,n?(t===r.firstChild?r.firstChild=e:t.prev.next=e,e.prev=t.prev,(e.next=t).prev=e):(t===r.lastChild?r.lastChild=e:t.next.prev=e,e.next=t.next,(e.prev=t).next=e),e.parent=r,e},a.prototype.getAll=function(e){var t,n=[];for(t=this.firstChild;t;t=Qb(t,this))t.name===e&&n.push(t);return n},a.prototype.empty=function(){var e,t,n;if(this.firstChild){for(e=[],n=this.firstChild;n;n=Qb(n,this))e.push(n);for(t=e.length;t--;)(n=e[t]).parent=n.firstChild=n.lastChild=n.next=n.prev=null}return this.firstChild=this.lastChild=null,this},a.prototype.isEmpty=function(e,t,n){var r,o,i=this.firstChild;if(t=t||{},i)do{if(1===i.type){if(i.attributes.map["data-mce-bogus"])continue;if(e[i.name])return!1;for(r=i.attributes.length;r--;)if("name"===(o=i.attributes[r].name)||0===o.indexOf("data-mce-bookmark"))return!1}if(8===i.type)return!1;if(3===i.type&&!Gb.test(i.value))return!1;if(3===i.type&&i.parent&&t[i.parent.name]&&Gb.test(i.value))return!1;if(n&&n(i))return!1}while(i=Qb(i,this));return!0},a.prototype.walk=function(e){return Qb(this,null,e)},a}(),ey=function(e,t,n,r){(e.padd_empty_with_br||t.insert)&&n[r.name]?r.empty().append(new Zb("br",1)).shortEnded=!0:r.empty().append(new Zb("#text",3)).value="\xa0"},ty=function(e){return ny(e,"#text")&&"\xa0"===e.firstChild.value},ny=function(e,t){return e&&e.firstChild&&e.firstChild===e.lastChild&&e.firstChild.name===t},ry=function(r,e,t,n){return n.isEmpty(e,t,function(e){return t=e,(n=r.getElementRule(t.name))&&n.paddEmpty;var t,n})},oy=function(e,t){return e&&(t[e.name]||"br"===e.name)},iy=function(e,p){var h=e.schema;p.remove_trailing_brs&&e.addNodeFilter("br",function(e,t,n){var r,o,i,a,u,s,c,l,f=e.length,d=Jt.extend({},h.getBlockElements()),m=h.getNonEmptyElements(),g=h.getNonEmptyElements();for(d.body=1,r=0;r<f;r++)if(i=(o=e[r]).parent,d[o.parent.name]&&o===i.lastChild){for(u=o.prev;u;){if("span"!==(s=u.name)||"bookmark"!==u.attr("data-mce-type")){if("br"!==s)break;if("br"===s){o=null;break}}u=u.prev}o&&(o.remove(),ry(h,m,g,i)&&(c=h.getElementRule(i.name))&&(c.removeEmpty?i.remove():c.paddEmpty&&ey(p,n,d,i)))}else{for(a=o;i&&i.firstChild===a&&i.lastChild===a&&!d[(a=i).name];)i=i.parent;a===i&&!0!==p.padd_empty_with_br&&((l=new Zb("#text",3)).value="\xa0",o.replace(l))}}),e.addAttributeFilter("href",function(e){var t,n,r,o=e.length;if(!p.allow_unsafe_link_target)for(;o--;)"a"===(t=e[o]).name&&"_blank"===t.attr("target")&&t.attr("rel",(n=t.attr("rel"),r=n?Jt.trim(n):"",/\b(noopener)\b/g.test(r)?r:r.split(" ").filter(function(e){return 0<e.length}).concat(["noopener"]).sort().join(" ")))}),p.allow_html_in_named_anchor||e.addAttributeFilter("id,name",function(e){for(var t,n,r,o,i=e.length;i--;)if("a"===(o=e[i]).name&&o.firstChild&&!o.attr("href"))for(r=o.parent,t=o.lastChild;n=t.prev,r.insert(t,o),t=n;);}),p.fix_list_elements&&e.addNodeFilter("ul,ol",function(e){for(var t,n,r=e.length;r--;)if("ul"===(n=(t=e[r]).parent).name||"ol"===n.name)if(t.prev&&"li"===t.prev.name)t.prev.append(t);else{var o=new Zb("li",1);o.attr("style","list-style-type: none"),t.wrap(o)}}),p.validate&&h.getValidClasses()&&e.addAttributeFilter("class",function(e){for(var t,n,r,o,i,a,u,s=e.length,c=h.getValidClasses();s--;){for(n=(t=e[s]).attr("class").split(" "),i="",r=0;r<n.length;r++)o=n[r],u=!1,(a=c["*"])&&a[o]&&(u=!0),a=c[t.name],!u&&a&&a[o]&&(u=!0),u&&(i&&(i+=" "),i+=o);i.length||(i=null),t.attr("class",i)}})},ay=Jt.makeMap,uy=Jt.each,sy=Jt.explode,cy=Jt.extend;function ly(k,T){void 0===T&&(T=ii());var A={},R=[],_={},D={};(k=k||{}).validate=!("validate"in k)||k.validate,k.root_name=k.root_name||"body";var B=function(e){var t,n,r;(n=e.name)in A&&((r=_[n])?r.push(e):_[n]=[e]),t=R.length;for(;t--;)(n=R[t].name)in e.attributes.map&&((r=D[n])?r.push(e):D[n]=[e]);return e},e={schema:T,addAttributeFilter:function(e,n){uy(sy(e),function(e){var t;for(t=0;t<R.length;t++)if(R[t].name===e)return void R[t].callbacks.push(n);R.push({name:e,callbacks:[n]})})},getAttributeFilters:function(){return[].concat(R)},addNodeFilter:function(e,n){uy(sy(e),function(e){var t=A[e];t||(A[e]=t=[]),t.push(n)})},getNodeFilters:function(){var e=[];for(var t in A)A.hasOwnProperty(t)&&e.push({name:t,callbacks:A[t]});return e},filterNode:B,parse:function(e,a){var t,n,r,o,i,u,s,c,l,f,d,m=[];a=a||{},_={},D={},l=cy(ay("script,style,head,html,body,title,meta,param"),T.getBlockElements());var g=T.getNonEmptyElements(),p=T.children,h=k.validate,v="forced_root_block"in a?a.forced_root_block:k.forced_root_block,b=T.getWhiteSpaceElements(),y=/^[ \t\r\n]+/,C=/[ \t\r\n]+$/,x=/[ \t\r\n]+/g,w=/^[ \t\r\n]+$/;f=b.hasOwnProperty(a.context)||b.hasOwnProperty(k.root_name);var N=function(e,t){var n,r=new Zb(e,t);return e in A&&((n=_[e])?n.push(r):_[e]=[r]),r},E=function(e){var t,n,r,o,i=T.getBlockElements();for(t=e.prev;t&&3===t.type;){if(0<(r=t.value.replace(C,"")).length)return void(t.value=r);if(n=t.next){if(3===n.type&&n.value.length){t=t.prev;continue}if(!i[n.name]&&"script"!==n.name&&"style"!==n.name){t=t.prev;continue}}o=t.prev,t.remove(),t=o}};t=Rv({validate:h,allow_script_urls:k.allow_script_urls,allow_conditional_comments:k.allow_conditional_comments,self_closing_elements:function(e){var t,n={};for(t in e)"li"!==t&&"p"!==t&&(n[t]=e[t]);return n}(T.getSelfClosingElements()),cdata:function(e){d.append(N("#cdata",4)).value=e},text:function(e,t){var n;f||(e=e.replace(x," "),oy(d.lastChild,l)&&(e=e.replace(y,""))),0!==e.length&&((n=N("#text",3)).raw=!!t,d.append(n).value=e)},comment:function(e){d.append(N("#comment",8)).value=e},pi:function(e,t){d.append(N(e,7)).value=t,E(d)},doctype:function(e){d.append(N("#doctype",10)).value=e,E(d)},start:function(e,t,n){var r,o,i,a,u;if(i=h?T.getElementRule(e):{}){for((r=N(i.outputName||e,1)).attributes=t,r.shortEnded=n,d.append(r),(u=p[d.name])&&p[r.name]&&!u[r.name]&&m.push(r),o=R.length;o--;)(a=R[o].name)in t.map&&((s=D[a])?s.push(r):D[a]=[r]);l[e]&&E(r),n||(d=r),!f&&b[e]&&(f=!0)}},end:function(e){var t,n,r,o,i;if(n=h?T.getElementRule(e):{}){if(l[e]&&!f){if((t=d.firstChild)&&3===t.type)if(0<(r=t.value.replace(y,"")).length)t.value=r,t=t.next;else for(o=t.next,t.remove(),t=o;t&&3===t.type;)r=t.value,o=t.next,(0===r.length||w.test(r))&&(t.remove(),t=o),t=o;if((t=d.lastChild)&&3===t.type)if(0<(r=t.value.replace(C,"")).length)t.value=r,t=t.prev;else for(o=t.prev,t.remove(),t=o;t&&3===t.type;)r=t.value,o=t.prev,(0===r.length||w.test(r))&&(t.remove(),t=o),t=o}if(f&&b[e]&&(f=!1),n.removeEmpty&&ry(T,g,b,d)&&!d.attributes.map.name&&!d.attr("id"))return i=d.parent,l[d.name]?d.empty().remove():d.unwrap(),void(d=i);n.paddEmpty&&(ty(d)||ry(T,g,b,d))&&ey(k,a,l,d),d=d.parent}}},T);var S=d=new Zb(a.context||k.root_name,11);if(t.parse(e),h&&m.length&&(a.context?a.invalid=!0:function(e){var t,n,r,o,i,a,u,s,c,l,f,d,m,g,p,h;for(d=ay("tr,td,th,tbody,thead,tfoot,table"),l=T.getNonEmptyElements(),f=T.getWhiteSpaceElements(),m=T.getTextBlockElements(),g=T.getSpecialElements(),t=0;t<e.length;t++)if((n=e[t]).parent&&!n.fixed)if(m[n.name]&&"li"===n.parent.name){for(p=n.next;p&&m[p.name];)p.name="li",p.fixed=!0,n.parent.insert(p,n.parent),p=p.next;n.unwrap(n)}else{for(o=[n],r=n.parent;r&&!T.isValidChild(r.name,n.name)&&!d[r.name];r=r.parent)o.push(r);if(r&&1<o.length){for(o.reverse(),i=a=B(o[0].clone()),c=0;c<o.length-1;c++){for(T.isValidChild(a.name,o[c].name)?(u=B(o[c].clone()),a.append(u)):u=a,s=o[c].firstChild;s&&s!==o[c+1];)h=s.next,u.append(s),s=h;a=u}ry(T,l,f,i)?r.insert(n,o[0],!0):(r.insert(i,o[0],!0),r.insert(n,i)),r=o[0],(ry(T,l,f,r)||ny(r,"br"))&&r.empty().remove()}else if(n.parent){if("li"===n.name){if((p=n.prev)&&("ul"===p.name||"ul"===p.name)){p.append(n);continue}if((p=n.next)&&("ul"===p.name||"ul"===p.name)){p.insert(n,p.firstChild,!0);continue}n.wrap(B(new Zb("ul",1)));continue}T.isValidChild(n.parent.name,"div")&&T.isValidChild("div",n.name)?n.wrap(B(new Zb("div",1))):g[n.name]?n.empty().remove():n.unwrap()}}}(m)),v&&("body"===S.name||a.isRootContent)&&function(){var e,t,n=S.firstChild,r=function(e){e&&((n=e.firstChild)&&3===n.type&&(n.value=n.value.replace(y,"")),(n=e.lastChild)&&3===n.type&&(n.value=n.value.replace(C,"")))};if(T.isValidChild(S.name,v.toLowerCase())){for(;n;)e=n.next,3===n.type||1===n.type&&"p"!==n.name&&!l[n.name]&&!n.attr("data-mce-type")?(t||((t=N(v,1)).attr(k.forced_root_block_attrs),S.insert(t,n)),t.append(n)):(r(t),t=null),n=e;r(t)}}(),!a.invalid){for(c in _){for(s=A[c],i=(n=_[c]).length;i--;)n[i].parent||n.splice(i,1);for(r=0,o=s.length;r<o;r++)s[r](n,c,a)}for(r=0,o=R.length;r<o;r++)if((s=R[r]).name in D){for(i=(n=D[s.name]).length;i--;)n[i].parent||n.splice(i,1);for(i=0,u=s.callbacks.length;i<u;i++)s.callbacks[i](n,s.name,a)}}return S}};return iy(e,k),Yb.register(e,k),e}var fy=function(e,t,n){-1===Jt.inArray(t,n)&&(e.addAttributeFilter(n,function(e,t){for(var n=e.length;n--;)e[n].attr(t,null)}),t.push(n))},dy=function(e,t,n){var r=ga(n.getInner?t.innerHTML:e.getOuterHTML(t));return n.selection||wo(ir.fromDom(t))?r:Jt.trim(r)},my=function(e,t,n){var r=n.selection?qb({forced_root_block:!1},n):n,o=e.parse(t,r);return $b.trimTrailingBr(o),o},gy=function(e,t,n,r,o){var i,a,u,s,c=(i=r,el(t,n).serialize(i));return a=e,s=c,!(u=o).no_events&&a?mp(a,qb(u,{content:s})).content:s};function py(e,t){var a,u,s,c,l,n,r=(a=e,n=["data-mce-selected"],s=(u=t)&&u.dom?u.dom:bi.DOM,c=u&&u.schema?u.schema:ii(a),a.entity_encoding=a.entity_encoding||"named",a.remove_trailing_brs=!("remove_trailing_brs"in a)||a.remove_trailing_brs,l=ly(a,c),$b.register(l,a,s),{schema:c,addNodeFilter:l.addNodeFilter,addAttributeFilter:l.addAttributeFilter,serialize:function(e,t){var n=qb({format:"html"},t||{}),r=Wb.process(u,e,n),o=dy(s,r,n),i=my(l,o,n);return"tree"===n.format?i:gy(u,a,c,i,n)},addRules:function(e){c.addValidElements(e)},setRules:function(e){c.setValidElements(e)},addTempAttr:d(fy,l,n),getTempAttrs:function(){return n}});return{schema:r.schema,addNodeFilter:r.addNodeFilter,addAttributeFilter:r.addAttributeFilter,serialize:r.serialize,addRules:r.addRules,setRules:r.setRules,addTempAttr:r.addTempAttr,getTempAttrs:r.getTempAttrs}}function hy(e){return{getBookmark:d(lc,e),moveToBookmark:d(fc,e)}}(hy||(hy={})).isBookmarkNode=dc;var vy,by,yy=hy,Cy=Po.isContentEditableFalse,xy=Po.isContentEditableTrue,wy=function(r,a){var u,s,c,l,f,d,m,g,p,h,v,b,i,y,C,x,w,N=a.dom,E=Jt.each,S=a.getDoc(),k=H.document,T=Math.abs,A=Math.round,R=a.getBody();l={nw:[0,0,-1,-1],ne:[1,0,1,-1],se:[1,1,1,1],sw:[0,1,-1,1]};var e=".mce-content-body";a.contentStyles.push(e+" div.mce-resizehandle {position: absolute;border: 1px solid black;box-sizing: content-box;background: #FFF;width: 7px;height: 7px;z-index: 10000}"+e+" .mce-resizehandle:hover {background: #000}"+e+" img[data-mce-selected],"+e+" hr[data-mce-selected] {outline: 1px solid black;resize: none}"+e+" .mce-clonedresizable {position: absolute;"+(ge.gecko?"":"outline: 1px dashed black;")+"opacity: .5;filter: alpha(opacity=50);z-index: 10000}"+e+" .mce-resize-helper {background: #555;background: rgba(0,0,0,0.75);border-radius: 3px;border: 1px;color: white;display: none;font-family: sans-serif;font-size: 12px;white-space: nowrap;line-height: 14px;margin: 5px 10px;padding: 5px;position: absolute;z-index: 10001}");var _=function(e){return e&&("IMG"===e.nodeName||a.dom.is(e,"figure.image"))},n=function(e){var t,n,r=e.target;t=e,n=a.selection.getRng(),!_(t.target)||yv(t.clientX,t.clientY,n)||e.isDefaultPrevented()||a.selection.select(r)},D=function(e){return a.dom.is(e,"figure.image")?e.querySelector("img"):e},B=function(e){var t=a.settings.object_resizing;return!1!==t&&!ge.iOS&&("string"!=typeof t&&(t="table,img,figure.image,div"),"false"!==e.getAttribute("data-mce-resize")&&e!==a.getBody()&&Or(ir.fromDom(e),t))},O=function(e){var t,n,r,o;t=e.screenX-d,n=e.screenY-m,y=t*f[2]+h,C=n*f[3]+v,y=y<5?5:y,C=C<5?5:C,(_(u)&&!1!==a.settings.resize_img_proportional?!xv.modifierPressed(e):xv.modifierPressed(e)||_(u)&&f[2]*f[3]!=0)&&(T(t)>T(n)?(C=A(y*b),y=A(C/b)):(y=A(C/b),C=A(y*b))),N.setStyles(D(s),{width:y,height:C}),r=0<(r=f.startPos.x+t)?r:0,o=0<(o=f.startPos.y+n)?o:0,N.setStyles(c,{left:r,top:o,display:"block"}),c.innerHTML=y+" &times; "+C,f[2]<0&&s.clientWidth<=y&&N.setStyle(s,"left",g+(h-y)),f[3]<0&&s.clientHeight<=C&&N.setStyle(s,"top",p+(v-C)),(t=R.scrollWidth-x)+(n=R.scrollHeight-w)!=0&&N.setStyles(c,{left:r-t,top:o-n}),i||(vp(a,u,h,v),i=!0)},P=function(){i=!1;var e=function(e,t){t&&(u.style[e]||!a.schema.isValid(u.nodeName.toLowerCase(),e)?N.setStyle(D(u),e,t):N.setAttrib(D(u),e,t))};e("width",y),e("height",C),N.unbind(S,"mousemove",O),N.unbind(S,"mouseup",P),k!==S&&(N.unbind(k,"mousemove",O),N.unbind(k,"mouseup",P)),N.remove(s),N.remove(c),o(u),bp(a,u,y,C),N.setAttrib(u,"style",N.getAttrib(u,"style")),a.nodeChanged()},o=function(e){var t,r,o,n,i;I(),F(),t=N.getPos(e,R),g=t.x,p=t.y,i=e.getBoundingClientRect(),r=i.width||i.right-i.left,o=i.height||i.bottom-i.top,u!==e&&(u=e,y=C=0),n=a.fire("ObjectSelected",{target:e}),B(e)&&!n.isDefaultPrevented()?E(l,function(n,e){var t;(t=N.get("mceResizeHandle"+e))&&N.remove(t),t=N.add(R,"div",{id:"mceResizeHandle"+e,"data-mce-bogus":"all","class":"mce-resizehandle",unselectable:!0,style:"cursor:"+e+"-resize; margin:0; padding:0"}),11===ge.ie&&(t.contentEditable=!1),N.bind(t,"mousedown",function(e){var t;e.stopImmediatePropagation(),e.preventDefault(),d=(t=e).screenX,m=t.screenY,h=D(u).clientWidth,v=D(u).clientHeight,b=v/h,(f=n).startPos={x:r*n[0]+g,y:o*n[1]+p},x=R.scrollWidth,w=R.scrollHeight,s=u.cloneNode(!0),N.addClass(s,"mce-clonedresizable"),N.setAttrib(s,"data-mce-bogus","all"),s.contentEditable=!1,s.unSelectabe=!0,N.setStyles(s,{left:g,top:p,margin:0}),s.removeAttribute("data-mce-selected"),R.appendChild(s),N.bind(S,"mousemove",O),N.bind(S,"mouseup",P),k!==S&&(N.bind(k,"mousemove",O),N.bind(k,"mouseup",P)),c=N.add(R,"div",{"class":"mce-resize-helper","data-mce-bogus":"all"},h+" &times; "+v)}),n.elm=t,N.setStyles(t,{left:r*n[0]+g-t.offsetWidth/2,top:o*n[1]+p-t.offsetHeight/2})}):I(),u.setAttribute("data-mce-selected","1")},I=function(){var e,t;for(e in F(),u&&u.removeAttribute("data-mce-selected"),l)(t=N.get("mceResizeHandle"+e))&&(N.unbind(t),N.remove(t))},L=function(e){var t,n=function(e,t){if(e)do{if(e===t)return!0}while(e=e.parentNode)};i||a.removed||(E(N.select("img[data-mce-selected],hr[data-mce-selected]"),function(e){e.removeAttribute("data-mce-selected")}),t="mousedown"===e.type?e.target:r.getNode(),n(t=N.$(t).closest("table,img,figure.image,hr")[0],R)&&(z(),n(r.getStart(!0),t)&&n(r.getEnd(!0),t))?o(t):I())},M=function(e){return Cy(function(e,t){for(;t&&t!==e;){if(xy(t)||Cy(t))return t;t=t.parentNode}return null}(a.getBody(),e))},F=function(){for(var e in l){var t=l[e];t.elm&&(N.unbind(t.elm),delete t.elm)}},z=function(){try{a.getDoc().execCommand("enableObjectResizing",!1,!1)}catch(e){}};return a.on("init",function(){z(),ge.ie&&11<=ge.ie&&(a.on("mousedown click",function(e){var t=e.target,n=t.nodeName;i||!/^(TABLE|IMG|HR)$/.test(n)||M(t)||(2!==e.button&&a.selection.select(t,"TABLE"===n),"mousedown"===e.type&&a.nodeChanged())}),a.dom.bind(R,"mscontrolselect",function(e){var t=function(e){ye.setEditorTimeout(a,function(){a.selection.select(e)})};if(M(e.target))return e.preventDefault(),void t(e.target);/^(TABLE|IMG|HR)$/.test(e.target.nodeName)&&(e.preventDefault(),"IMG"===e.target.tagName&&t(e.target))}));var t=ye.throttle(function(e){a.composing||L(e)});a.on("nodechange ResizeEditor ResizeWindow drop FullscreenStateChanged",t),a.on("keyup compositionend",function(e){u&&"TABLE"===u.nodeName&&t(e)}),a.on("hide blur",I),a.on("contextmenu",n)}),a.on("remove",F),{isResizable:B,showResizeRect:o,hideResizeRect:I,updateResizeRect:L,destroy:function(){u=s=null}}},Ny=function(e){for(var t=0,n=0,r=e;r&&r.nodeType;)t+=r.offsetLeft||0,n+=r.offsetTop||0,r=r.offsetParent;return{x:t,y:n}},Ey=function(e,t,n){var r,o,i,a,u,s=e.dom,c=s.getRoot(),l=0;if(u={elm:t,alignToTop:n},e.fire("scrollIntoView",u),!u.isDefaultPrevented()&&Po.isElement(t)){if(!1===n&&(l=t.offsetHeight),"BODY"!==c.nodeName){var f=e.selection.getScrollContainer();if(f)return r=Ny(t).y-Ny(f).y+l,a=f.clientHeight,void((r<(i=f.scrollTop)||i+a<r+25)&&(f.scrollTop=r<i?r:r-a+25))}o=s.getViewPort(e.getWin()),r=s.getPos(t).y+l,i=o.y,a=o.h,(r<o.y||i+a<r+25)&&e.getWin().scrollTo(0,r<i?r:r-a+25)}},Sy=function(d,e){ne(vu.fromRangeStart(e).getClientRects()).each(function(e){var t,n,r,o,i,a,u,s,c,l=function(e){if(e.inline)return e.getBody().getBoundingClientRect();var t=e.getWin();return{left:0,right:t.innerWidth,top:0,bottom:t.innerHeight,width:t.innerWidth,height:t.innerHeight}}(d),f={x:(i=t=l,a=n=e,a.left>i.left&&a.right<i.right?0:a.left<i.left?a.left-i.left:a.right-i.right),y:(r=t,o=n,o.top>r.top&&o.bottom<r.bottom?0:o.top<r.top?o.top-r.top:o.bottom-r.bottom)};s=0!==f.x?0<f.x?f.x+4:f.x-4:0,c=0!==f.y?0<f.y?f.y+4:f.y-4:0,(u=d).inline?(u.getBody().scrollLeft+=s,u.getBody().scrollTop+=c):u.getWin().scrollBy(s,c)})},ky=function(e){return Po.isContentEditableTrue(e)||Po.isContentEditableFalse(e)},Ty=function(e,t,n){var r,o,i,a,u,s=n;if(s.caretPositionFromPoint)(o=s.caretPositionFromPoint(e,t))&&((r=n.createRange()).setStart(o.offsetNode,o.offset),r.collapse(!0));else if(n.caretRangeFromPoint)r=n.caretRangeFromPoint(e,t);else if(s.body.createTextRange){r=s.body.createTextRange();try{r.moveToPoint(e,t),r.collapse(!0)}catch(c){r=function(e,n,t){var r,o,i;if(r=t.elementFromPoint(e,n),o=t.body.createTextRange(),r&&"HTML"!==r.tagName||(r=t.body),o.moveToElementText(r),0<(i=(i=Jt.toArray(o.getClientRects())).sort(function(e,t){return(e=Math.abs(Math.max(e.top-n,e.bottom-n)))-(t=Math.abs(Math.max(t.top-n,t.bottom-n)))})).length){n=(i[0].bottom+i[0].top)/2;try{return o.moveToPoint(e,n),o.collapse(!0),o}catch(a){}}return null}(e,t,n)}return i=r,a=n.body,u=i&&i.parentElement?i.parentElement():null,Po.isContentEditableFalse(function(e,t,n){for(;e&&e!==t;){if(n(e))return e;e=e.parentNode}return null}(u,a,ky))?null:i}return r},Ay=function(n,e){return W(e,function(e){var t=n.fire("GetSelectionRange",{range:e});return t.range!==e?t.range:e})},Ry=function(e,t){var n=(t||H.document).createDocumentFragment();return U(e,function(e){n.appendChild(e.dom())}),ir.fromDom(n)},_y=kr("element","width","rows"),Dy=kr("element","cells"),By=kr("x","y"),Oy=function(e,t){var n=parseInt(xr(e,t),10);return isNaN(n)?1:n},Py=function(e){return X(e,function(e,t){return t.cells().length>e?t.cells().length:e},0)},Iy=function(e,t){for(var n=e.rows(),r=0;r<n.length;r++)for(var o=n[r].cells(),i=0;i<o.length;i++)if(Ir(o[i],t))return A.some(By(i,r));return A.none()},Ly=function(e,t,n,r,o){for(var i=[],a=e.rows(),u=n;u<=o;u++){var s=a[u].cells(),c=t<r?s.slice(t,r+1):s.slice(r,t+1);i.push(Dy(a[u].element(),c))}return i},My=function(e){var o=_y(sa(e),0,[]);return U($i(e,"tr"),function(n,r){U($i(n,"td,th"),function(e,t){!function(e,t,n,r,o){for(var i=Oy(o,"rowspan"),a=Oy(o,"colspan"),u=e.rows(),s=n;s<n+i;s++){u[s]||(u[s]=Dy(ca(r),[]));for(var c=t;c<t+a;c++)u[s].cells()[c]=s===n&&c===t?o:sa(o)}}(o,function(e,t,n){for(;r=t,o=n,i=void 0,((i=e.rows())[o]?i[o].cells():[])[r];)t++;var r,o,i;return t}(o,t,r),r,n,e)})}),_y(o.element(),Py(o.rows()),o.rows())},Fy=function(e){return n=W((t=e).rows(),function(e){var t=W(e.cells(),function(e){var t=ca(e);return wr(t,"colspan"),wr(t,"rowspan"),t}),n=sa(e.element());return Di(n,t),n}),r=sa(t.element()),o=ir.fromTag("tbody"),Di(o,n),_i(r,o),r;var t,n,r,o},zy=function(l,e,t){return Iy(l,e).bind(function(c){return Iy(l,t).map(function(e){return t=l,r=e,o=(n=c).x(),i=n.y(),a=r.x(),u=r.y(),s=i<u?Ly(t,o,i,a,u):Ly(t,o,u,a,i),_y(t.element(),Py(s),s);var t,n,r,o,i,a,u,s})})},Uy=function(n,t){return Y(n,function(e){return"li"===cr(e)&&jh(e,t)}).fold(q([]),function(e){return(t=n,Y(t,function(e){return"ul"===cr(e)||"ol"===cr(e)})).map(function(e){return[ir.fromTag("li"),ir.fromTag(cr(e))]}).getOr([]);var t})},Vy=function(e,t){var n,r=ir.fromDom(t.commonAncestorContainer),o=ef(r,e),i=V(o,function(e){return go(e)||fo(e)}),a=Uy(o,t),u=i.concat(a.length?a:bo(n=r)?zr(n).filter(vo).fold(q([]),function(e){return[n,e]}):vo(n)?[n]:[]);return W(u,sa)},Hy=function(){return Ry([])},jy=function(e,t){return n=ir.fromDom(t.cloneContents()),r=Vy(e,t),o=X(r,function(e,t){return _i(t,e),t},n),0<r.length?Ry([o]):o;var n,r,o},qy=function(e,o){return(t=e,n=o[0],Gi(n,"table",d(Ir,t))).bind(function(e){var t=o[0],n=o[o.length-1],r=My(e);return zy(r,t,n).map(function(e){return Ry([Fy(e)])})}).getOrThunk(Hy);var t,n},$y=function(e,t){var n,r,o=pm(t,e);return 0<o.length?qy(e,o):(n=e,0<(r=t).length&&r[0].collapsed?Hy():jy(n,r[0]))},Wy=function(e,t){if(void 0===t&&(t={}),t.get=!0,t.format=t.format||"html",t.selection=!0,(t=e.fire("BeforeGetContent",t)).isDefaultPrevented())return e.fire("GetContent",t),t.content;if("text"===t.format)return c=e,A.from(c.selection.getRng()).map(function(e){var t=c.dom.add(c.getBody(),"div",{"data-mce-bogus":"all",style:"overflow: hidden; opacity: 0;"},e.cloneContents()),n=ga(t.innerText);return c.dom.remove(t),n}).getOr("");t.getInner=!0;var n,r,o,i,a,u,s,c,l=(r=t,i=(n=e).selection.getRng(),a=n.dom.create("body"),u=n.selection.getSel(),s=Ay(n,cm(u)),(o=r.contextual?$y(ir.fromDom(n.getBody()),s).dom():i.cloneContents())&&a.appendChild(o),n.selection.serializer.serialize(a,r));return"tree"===t.format?l:(t.content=e.selection.isCollapsed()?"":l,e.fire("GetContent",t),t.content)},Ky=function(e,t,n){var r,o,i,a=e.selection.getRng(),u=e.getDoc();if((n=n||{format:"html"}).set=!0,n.selection=!0,n.content=t,n.no_events||!(n=e.fire("BeforeSetContent",n)).isDefaultPrevented()){if(t=n.content,a.insertNode){t+='<span id="__caret">_</span>',a.startContainer===u&&a.endContainer===u?u.body.innerHTML=t:(a.deleteContents(),0===u.body.childNodes.length?u.body.innerHTML=t:a.createContextualFragment?a.insertNode(a.createContextualFragment(t)):(o=u.createDocumentFragment(),i=u.createElement("div"),o.appendChild(i),i.outerHTML=t,a.insertNode(o))),r=e.dom.get("__caret"),(a=u.createRange()).setStartBefore(r),a.setEndBefore(r),e.selection.setRng(a),e.dom.remove("__caret");try{e.selection.setRng(a)}catch(s){}}else a.item&&(u.execCommand("Delete",!1,null),a=e.getRng()),/^\s+/.test(t)?(a.pasteHTML('<span id="__mce_tmp">_</span>'+t),e.dom.remove("__mce_tmp")):a.pasteHTML(t);n.no_events||e.fire("SetContent",n)}else e.fire("SetContent",n)},Xy=function(e,t,n,r,o){var i=n?t.startContainer:t.endContainer,a=n?t.startOffset:t.endOffset;return A.from(i).map(ir.fromDom).map(function(e){return r&&t.collapsed?e:$r(e,o(e,a)).getOr(e)}).bind(function(e){return fr(e)?A.some(e):zr(e)}).map(function(e){return e.dom()}).getOr(e)},Yy=function(e,t,n){return Xy(e,t,!0,n,function(e,t){return Math.min(e.dom().childNodes.length,t)})},Gy=function(e,t,n){return Xy(e,t,!1,n,function(e,t){return 0<t?t-1:t})},Jy=function(e,t){for(var n=e;e&&Po.isText(e)&&0===e.length;)e=t?e.nextSibling:e.previousSibling;return e||n},Qy=Jt.each,Zy=function(e){return!!e.select},eC=function(e){return!(!e||!e.ownerDocument)&&Lr(ir.fromDom(e.ownerDocument),ir.fromDom(e))},tC=function(u,s,e,c){var n,t,l,f,a,r=function(e,t){return Ky(c,e,t)},o=function(e){var t=m();t.collapse(!!e),i(t)},d=function(){return s.getSelection?s.getSelection():s.document.selection},m=function(){var e,t,n,r,o=function(e,t,n){try{return t.compareBoundaryPoints(e,n)}catch(r){return-1}};if(!s)return null;if(null==(r=s.document))return null;if(c.bookmark!==undefined&&!1===eh(c)){var i=Qg(c);if(i.isSome())return i.map(function(e){return Ay(c,[e])[0]}).getOr(r.createRange())}try{(e=d())&&!Po.isRestrictedNode(e.anchorNode)&&(t=0<e.rangeCount?e.getRangeAt(0):e.createRange?e.createRange():r.createRange())}catch(a){}return(t=Ay(c,[t])[0])||(t=r.createRange?r.createRange():r.body.createTextRange()),t.setStart&&9===t.startContainer.nodeType&&t.collapsed&&(n=u.getRoot(),t.setStart(n,0),t.setEnd(n,0)),l&&f&&(0===o(t.START_TO_START,t,l)&&0===o(t.END_TO_END,t,l)?t=f:f=l=null),t},i=function(e,t){var n,r;if((o=e)&&(Zy(o)||eC(o.startContainer)&&eC(o.endContainer))){var o,i=Zy(e)?e:null;if(i){f=null;try{i.select()}catch(a){}}else{if(n=d(),e=c.fire("SetSelectionRange",{range:e,forward:t}).range,n){f=e;try{n.removeAllRanges(),n.addRange(e)}catch(a){}!1===t&&n.extend&&(n.collapse(e.endContainer,e.endOffset),n.extend(e.startContainer,e.startOffset)),l=0<n.rangeCount?n.getRangeAt(0):null}e.collapsed||e.startContainer!==e.endContainer||!n.setBaseAndExtent||ge.ie||e.endOffset-e.startOffset<2&&e.startContainer.hasChildNodes()&&(r=e.startContainer.childNodes[e.startOffset])&&"IMG"===r.tagName&&(n.setBaseAndExtent(e.startContainer,e.startOffset,e.endContainer,e.endOffset),n.anchorNode===e.startContainer&&n.focusNode===e.endContainer||n.setBaseAndExtent(r,0,r,1)),c.fire("AfterSetSelectionRange",{range:e,forward:t})}}},g=function(){var e,t,n=d();return!(n&&n.anchorNode&&n.focusNode)||((e=u.createRng()).setStart(n.anchorNode,n.anchorOffset),e.collapse(!0),(t=u.createRng()).setStart(n.focusNode,n.focusOffset),t.collapse(!0),e.compareBoundaryPoints(e.START_TO_START,t)<=0)},p={bookmarkManager:null,controlSelection:null,dom:u,win:s,serializer:e,editor:c,collapse:o,setCursorLocation:function(e,t){var n=u.createRng();e?(n.setStart(e,t),n.setEnd(e,t),i(n),o(!1)):(qh(u,n,c.getBody(),!0),i(n))},getContent:function(e){return Wy(c,e)},setContent:r,getBookmark:function(e,t){return n.getBookmark(e,t)},moveToBookmark:function(e){return n.moveToBookmark(e)},select:function(e,t){var r,n,o;return(r=u,n=e,o=t,A.from(n).map(function(e){var t=r.nodeIndex(e),n=r.createRng();return n.setStart(e.parentNode,t),n.setEnd(e.parentNode,t+1),o&&(qh(r,n,e,!0),qh(r,n,e,!1)),n})).each(i),e},isCollapsed:function(){var e=m(),t=d();return!(!e||e.item)&&(e.compareEndPoints?0===e.compareEndPoints("StartToEnd",e):!t||e.collapsed)},isForward:g,setNode:function(e){return r(u.getOuterHTML(e)),e},getNode:function(){return e=c.getBody(),(t=m())?(r=t.startContainer,o=t.endContainer,i=t.startOffset,a=t.endOffset,n=t.commonAncestorContainer,!t.collapsed&&(r===o&&a-i<2&&r.hasChildNodes()&&(n=r.childNodes[i]),3===r.nodeType&&3===o.nodeType&&(r=r.length===i?Jy(r.nextSibling,!0):r.parentNode,o=0===a?Jy(o.previousSibling,!1):o.parentNode,r&&r===o))?r:n&&3===n.nodeType?n.parentNode:n):e;var e,t,n,r,o,i,a},getSel:d,setRng:i,getRng:m,getStart:function(e){return Yy(c.getBody(),m(),e)},getEnd:function(e){return Gy(c.getBody(),m(),e)},getSelectedBlocks:function(e,t){return function(e,t,n,r){var o,i,a=[];if(i=e.getRoot(),n=e.getParent(n||Yy(i,t,t.collapsed),e.isBlock),r=e.getParent(r||Gy(i,t,t.collapsed),e.isBlock),n&&n!==i&&a.push(n),n&&r&&n!==r)for(var u=new ao(o=n,i);(o=u.next())&&o!==r;)e.isBlock(o)&&a.push(o);return r&&n!==r&&r!==i&&a.push(r),a}(u,m(),e,t)},normalize:function(){var e=m(),t=d();if(!fm(t)&&$h(c)){var n=wg(u,e);return n.each(function(e){i(e,g())}),n.getOr(e)}return e},selectorChanged:function(e,t){var i;return a||(a={},i={},c.on("NodeChange",function(e){var n=e.element,r=u.getParents(n,null,u.getRoot()),o={};Qy(a,function(e,n){Qy(r,function(t){if(u.is(t,n))return i[n]||(Qy(e,function(e){e(!0,{node:t,selector:n,parents:r})}),i[n]=e),o[n]=e,!1})}),Qy(i,function(e,t){o[t]||(delete i[t],Qy(e,function(e){e(!1,{node:n,selector:t,parents:r})}))})})),a[e]||(a[e]=[]),a[e].push(t),p},getScrollContainer:function(){for(var e,t=u.getRoot();t&&"BODY"!==t.nodeName;){if(t.scrollHeight>t.clientHeight){e=t;break}t=t.parentNode}return e},scrollIntoView:function(e,t){return Ey(c,e,t)},placeCaretAt:function(e,t){return i(Ty(e,t,c.getDoc()))},getBoundingClientRect:function(){var e=m();return e.collapsed?Cu.fromRangeStart(e).getClientRects()[0]:e.getBoundingClientRect()},destroy:function(){s=l=f=null,t.destroy()}};return n=yy(p),t=wy(p,c),p.bookmarkManager=n,p.controlSelection=t,p};(by=vy||(vy={}))[by.Br=0]="Br",by[by.Block=1]="Block",by[by.Wrap=2]="Wrap",by[by.Eol=3]="Eol";var nC=function(e,t){return e===bu.Backwards?t.reverse():t},rC=function(e,t,n,r){for(var o,i,a,u,s,c,l=$s(n),f=r,d=[];f&&(s=l,c=f,o=t===bu.Forwards?s.next(c):s.prev(c));){if(Po.isBr(o.getNode(!1)))return t===bu.Forwards?{positions:nC(t,d).concat([o]),breakType:vy.Br,breakAt:A.some(o)}:{positions:nC(t,d),breakType:vy.Br,breakAt:A.some(o)};if(o.isVisible()){if(e(f,o)){var m=(i=t,a=f,u=o,Po.isBr(u.getNode(i===bu.Forwards))?vy.Br:!1===bs(a,u)?vy.Block:vy.Wrap);return{positions:nC(t,d),breakType:m,breakAt:A.some(o)}}d.push(o),f=o}else f=o}return{positions:nC(t,d),breakType:vy.Eol,breakAt:A.none()}},oC=function(n,r,o,e){return r(o,e).breakAt.map(function(e){var t=r(o,e).positions;return n===bu.Backwards?t.concat(e):[e].concat(t)}).getOr([])},iC=function(e,i){return X(e,function(e,o){return e.fold(function(){return A.some(o)},function(r){return Ya([ne(r.getClientRects()),ne(o.getClientRects())],function(e,t){var n=Math.abs(i-e.left);return Math.abs(i-t.left)<=n?o:r}).or(e)})},A.none())},aC=function(t,e){return ne(e.getClientRects()).bind(function(e){return iC(t,e.left)})},uC=d(rC,vu.isAbove,-1),sC=d(rC,vu.isBelow,1),cC=d(oC,-1,uC),lC=d(oC,1,sC),fC=Po.isContentEditableFalse,dC=$a,mC=function(e,t,n,r){var o=e===bu.Forwards,i=o?_f:Df;if(!r.collapsed){var a=dC(r);if(fC(a))return eg(e,t,a,e===bu.Backwards,!0)}var u=va(r.startContainer),s=ks(e,t.getBody(),r);if(i(s))return tg(t,s.getNode(!o));var c=Ll.normalizePosition(o,n(s));if(!c)return u?r:null;if(i(c))return eg(e,t,c.getNode(!o),o,!0);var l=n(c);return l&&i(l)&&Rs(c,l)?eg(e,t,l.getNode(!o),o,!0):u?rg(t,c.toRange(),!0):null},gC=function(e,t,n,r){var o,i,a,u,s,c,l,f,d;if(d=dC(r),o=ks(e,t.getBody(),r),i=n(t.getBody(),cv(1),o),a=V(i,lv(1)),s=Wt.last(o.getClientRects()),(_f(o)||Of(o))&&(d=o.getNode()),(Df(o)||Pf(o))&&(d=o.getNode(!0)),!s)return null;if(c=s.left,(u=hv(a,c))&&fC(u.node))return l=Math.abs(c-u.left),f=Math.abs(c-u.right),eg(e,t,u.node,l<f,!0);if(d){var m=function(e,t,n,r){var o,i,a,u,s,c,l=$s(t),f=[],d=0,m=function(e){return Wt.last(e.getClientRects())};1===e?(o=l.next,i=ja,a=Ha,u=Cu.after(r)):(o=l.prev,i=Ha,a=ja,u=Cu.before(r)),c=m(u);do{if(u.isVisible()&&!a(s=m(u),c)){if(0<f.length&&i(s,Wt.last(f))&&d++,(s=za(s)).position=u,s.line=d,n(s))return f;f.push(s)}}while(u=o(u));return f}(e,t.getBody(),cv(1),d);if(u=hv(V(m,lv(1)),c))return rg(t,u.position.toRange(),!0);if(u=Wt.last(V(m,lv(0))))return rg(t,u.position.toRange(),!0)}},pC=function(e,t,n){var r,o,i,a,u=$s(e.getBody()),s=d(As,u.next),c=d(As,u.prev);if(n.collapsed&&e.settings.forced_root_block){if(!(r=e.dom.getParent(n.startContainer,"PRE")))return;(1===t?s(Cu.fromRangeStart(n)):c(Cu.fromRangeStart(n)))||(a=(i=e).dom.create(vl(i)),(!ge.ie||11<=ge.ie)&&(a.innerHTML='<br data-mce-bogus="1">'),o=a,1===t?e.$(r).after(o):e.$(r).before(o),e.selection.select(o,!0),e.selection.collapse())}},hC=function(l,f){return function(){var e,t,n,r,o,i,a,u,s,c=(t=f,r=$s((e=l).getBody()),o=d(As,r.next),i=d(As,r.prev),a=t?bu.Forwards:bu.Backwards,u=t?o:i,s=e.selection.getRng(),(n=mC(a,e,u,s))?n:(n=pC(e,a,s))||null);return!!c&&(l.selection.setRng(c),!0)}},vC=function(u,s){return function(){var e,t,n,r,o,i,a=(r=(t=s)?1:-1,o=t?sv:uv,i=(e=u).selection.getRng(),(n=gC(r,e,o,i))?n:(n=pC(e,r,i))||null);return!!a&&(u.selection.setRng(a),!0)}},bC=function(r,o){return function(){var t,e=o?Cu.fromRangeEnd(r.selection.getRng()):Cu.fromRangeStart(r.selection.getRng()),n=o?sC(r.getBody(),e):uC(r.getBody(),e);return(o?re(n.positions):ne(n.positions)).filter((t=o,function(e){return t?Df(e):_f(e)})).fold(q(!1),function(e){return r.selection.setRng(e.toRange()),!0})}},yC=function(e,t,n,r,o){var i,a,u,s,c=$i(ir.fromDom(n),"td,th,caption").map(function(e){return e.dom()}),l=V((i=e,Z(c,function(e){var t,n,r=(t=za(e.getBoundingClientRect()),n=-1,{left:t.left-n,top:t.top-n,right:t.right+2*n,bottom:t.bottom+2*n,width:t.width+n,height:t.height+n});return[{x:r.left,y:i(r),cell:e},{x:r.right,y:i(r),cell:e}]})),function(e){return t(e,o)});return(a=l,u=r,s=o,X(a,function(e,r){return e.fold(function(){return A.some(r)},function(e){var t=Math.sqrt(Math.abs(e.x-u)+Math.abs(e.y-s)),n=Math.sqrt(Math.abs(r.x-u)+Math.abs(r.y-s));return A.some(n<t?r:e)})},A.none())).map(function(e){return e.cell})},CC=d(yC,function(e){return e.bottom},function(e,t){return e.y<t}),xC=d(yC,function(e){return e.top},function(e,t){return e.y>t}),wC=function(t,n){return ne(n.getClientRects()).bind(function(e){return CC(t,e.left,e.top)}).bind(function(e){return aC((t=e,nc.lastPositionIn(t).map(function(e){return uC(t,e).positions.concat(e)}).getOr([])),n);var t})},NC=function(t,n){return re(n.getClientRects()).bind(function(e){return xC(t,e.left,e.top)}).bind(function(e){return aC((t=e,nc.firstPositionIn(t).map(function(e){return[e].concat(sC(t,e).positions)}).getOr([])),n);var t})},EC=function(e,t){e.selection.setRng(t),Sy(e,t)},SC=function(e,t,n){var r,o,i,a,u=e(t,n);return(a=u).breakType===vy.Wrap&&0===a.positions.length||!Po.isBr(n.getNode())&&(i=u).breakType===vy.Br&&1===i.positions.length?(r=e,o=t,!u.breakAt.map(function(e){return r(o,e).breakAt.isSome()}).getOr(!1)):u.breakAt.isNone()},kC=d(SC,uC),TC=d(SC,sC),AC=function(e,t,n,r){var o,i,a,u,s=e.selection.getRng(),c=t?1:-1;if(is()&&(o=t,i=s,a=n,u=Cu.fromRangeStart(i),nc.positionIn(!o,a).map(function(e){return e.isEqual(u)}).getOr(!1))){var l=eg(c,e,n,!t,!0);return EC(e,l),!0}return!1},RC=function(e,t){var n=t.getNode(e);return Po.isElement(n)&&"TABLE"===n.nodeName?A.some(n):A.none()},_C=function(u,s,c){var e=RC(!!s,c),t=!1===s;e.fold(function(){return EC(u,c.toRange())},function(a){return nc.positionIn(t,u.getBody()).filter(function(e){return e.isEqual(c)}).fold(function(){return EC(u,c.toRange())},function(e){return n=s,o=a,t=c,void((i=vl(r=u))?r.undoManager.transact(function(){var e=ir.fromTag(i);Cr(e,bl(r)),_i(e,ir.fromTag("br")),n?Ai(ir.fromDom(o),e):Ti(ir.fromDom(o),e);var t=r.dom.createRng();t.setStart(e.dom(),0),t.setEnd(e.dom(),0),EC(r,t)}):EC(r,t.toRange()));var n,r,o,t,i})})},DC=function(e,t,n,r){var o,i,a,u,s,c,l=e.selection.getRng(),f=Cu.fromRangeStart(l),d=e.getBody();if(!t&&kC(r,f)){var m=(u=d,wC(s=n,c=f).orThunk(function(){return ne(c.getClientRects()).bind(function(e){return iC(cC(u,Cu.before(s)),e.left)})}).getOr(Cu.before(s)));return _C(e,t,m),!0}return!(!t||!TC(r,f))&&(o=d,m=NC(i=n,a=f).orThunk(function(){return ne(a.getClientRects()).bind(function(e){return iC(lC(o,Cu.after(i)),e.left)})}).getOr(Cu.after(i)),_C(e,t,m),!0)},BC=function(t,n){return function(){return A.from(t.dom.getParent(t.selection.getNode(),"td,th")).bind(function(e){return A.from(t.dom.getParent(e,"table")).map(function(e){return AC(t,n,e)})}).getOr(!1)}},OC=function(n,r){return function(){return A.from(n.dom.getParent(n.selection.getNode(),"td,th")).bind(function(t){return A.from(n.dom.getParent(t,"table")).map(function(e){return DC(n,r,e,t)})}).getOr(!1)}},PC=function(e){return F(["figcaption"],cr(e))},IC=function(e){var t=H.document.createRange();return t.setStartBefore(e.dom()),t.setEndBefore(e.dom()),t},LC=function(e,t,n){n?_i(e,t):Ri(e,t)},MC=function(e,t,n,r){return""===t?(l=e,f=r,d=ir.fromTag("br"),LC(l,d,f),IC(d)):(o=e,i=r,a=t,u=n,s=ir.fromTag(a),c=ir.fromTag("br"),Cr(s,u),_i(s,c),LC(o,s,i),IC(c));var o,i,a,u,s,c,l,f,d},FC=function(e,t,n){return t?(o=e.dom(),sC(o,n).breakAt.isNone()):(r=e.dom(),uC(r,n).breakAt.isNone());var r,o},zC=function(t,n){var e,r,o,i=ir.fromDom(t.getBody()),a=Cu.fromRangeStart(t.selection.getRng()),u=vl(t),s=bl(t);return(e=a,r=i,o=d(Ir,r),Yi(ir.fromDom(e.container()),mo,o).filter(PC)).exists(function(){if(FC(i,n,a)){var e=MC(i,u,s,n);return t.selection.setRng(e),!0}return!1})},UC=function(e,t){return function(){return!!e.selection.isCollapsed()&&zC(e,t)}},VC=function(e,r){return Z(W(e,function(e){return qb({shiftKey:!1,altKey:!1,ctrlKey:!1,metaKey:!1,keyCode:0,action:o},e)}),function(e){return t=e,(n=r).keyCode===t.keyCode&&n.shiftKey===t.shiftKey&&n.altKey===t.altKey&&n.ctrlKey===t.ctrlKey&&n.metaKey===t.metaKey?[e]:[];var t,n})},HC=function(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];var r=Array.prototype.slice.call(arguments,1);return function(){return e.apply(null,r)}},jC=function(e,t){return Y(VC(e,t),function(e){return e.action()})},qC=function(i,a){i.on("keydown",function(e){var t,n,r,o;!1===e.isDefaultPrevented()&&(t=i,n=a,r=e,o=rr.detect().os,jC([{keyCode:xv.RIGHT,action:hC(t,!0)},{keyCode:xv.LEFT,action:hC(t,!1)},{keyCode:xv.UP,action:vC(t,!1)},{keyCode:xv.DOWN,action:vC(t,!0)},{keyCode:xv.RIGHT,action:BC(t,!0)},{keyCode:xv.LEFT,action:BC(t,!1)},{keyCode:xv.UP,action:OC(t,!1)},{keyCode:xv.DOWN,action:OC(t,!0)},{keyCode:xv.RIGHT,action:jd.move(t,n,!0)},{keyCode:xv.LEFT,action:jd.move(t,n,!1)},{keyCode:xv.RIGHT,ctrlKey:!o.isOSX(),altKey:o.isOSX(),action:jd.moveNextWord(t,n)},{keyCode:xv.LEFT,ctrlKey:!o.isOSX(),altKey:o.isOSX(),action:jd.movePrevWord(t,n)},{keyCode:xv.UP,action:UC(t,!1)},{keyCode:xv.DOWN,action:UC(t,!0)}],r).each(function(e){r.preventDefault()}))})},$C=function(o,i){o.on("keydown",function(e){var t,n,r;!1===e.isDefaultPrevented()&&(t=o,n=i,r=e,jC([{keyCode:xv.BACKSPACE,action:HC(td,t,!1)},{keyCode:xv.DELETE,action:HC(td,t,!0)},{keyCode:xv.BACKSPACE,action:HC(ig,t,!1)},{keyCode:xv.DELETE,action:HC(ig,t,!0)},{keyCode:xv.BACKSPACE,action:HC(Kd,t,n,!1)},{keyCode:xv.DELETE,action:HC(Kd,t,n,!0)},{keyCode:xv.BACKSPACE,action:HC(km,t,!1)},{keyCode:xv.DELETE,action:HC(km,t,!0)},{keyCode:xv.BACKSPACE,action:HC(gf,t,!1)},{keyCode:xv.DELETE,action:HC(gf,t,!0)},{keyCode:xv.BACKSPACE,action:HC(lf,t,!1)},{keyCode:xv.DELETE,action:HC(lf,t,!0)},{keyCode:xv.BACKSPACE,action:HC(Jm,t,!1)},{keyCode:xv.DELETE,action:HC(Jm,t,!0)}],r).each(function(e){r.preventDefault()}))}),o.on("keyup",function(e){var t,n;!1===e.isDefaultPrevented()&&(t=o,n=e,jC([{keyCode:xv.BACKSPACE,action:HC(nd,t)},{keyCode:xv.DELETE,action:HC(nd,t)}],n))})},WC=function(e){return A.from(e.dom.getParent(e.selection.getStart(!0),e.dom.isBlock))},KC=function(e,t){var n,r,o,i=t,a=e.dom,u=e.schema.getMoveCaretBeforeOnEnterElements();if(t){if(/^(LI|DT|DD)$/.test(t.nodeName)){var s=function(e){for(;e;){if(1===e.nodeType||3===e.nodeType&&e.data&&/[\r\n\s]/.test(e.data))return e;e=e.nextSibling}}(t.firstChild);s&&/^(UL|OL|DL)$/.test(s.nodeName)&&t.insertBefore(a.doc.createTextNode("\xa0"),t.firstChild)}if(o=a.createRng(),t.normalize(),t.hasChildNodes()){for(n=new ao(t,t);r=n.current();){if(Po.isText(r)){o.setStart(r,0),o.setEnd(r,0);break}if(u[r.nodeName.toLowerCase()]){o.setStartBefore(r),o.setEndBefore(r);break}i=r,r=n.next()}r||(o.setStart(i,0),o.setEnd(i,0))}else Po.isBr(t)?t.nextSibling&&a.isBlock(t.nextSibling)?(o.setStartBefore(t),o.setEndBefore(t)):(o.setStartAfter(t),o.setEndAfter(t)):(o.setStart(t,0),o.setEnd(t,0));e.selection.setRng(o),a.remove(void 0),e.selection.scrollIntoView(t)}},XC=function(e,t){var n,r,o=e.getRoot();for(n=t;n!==o&&"false"!==e.getContentEditable(n);)"true"===e.getContentEditable(n)&&(r=n),n=n.parentNode;return n!==o?r:o},YC=WC,GC=function(e){return WC(e).fold(q(""),function(e){return e.nodeName.toUpperCase()})},JC=function(e){return WC(e).filter(function(e){return bo(ir.fromDom(e))}).isSome()},QC=function(e,t){return e&&e.parentNode&&e.parentNode.nodeName===t},ZC=function(e){return e&&/^(OL|UL|LI)$/.test(e.nodeName)},ex=function(e){var t=e.parentNode;return/^(LI|DT|DD)$/.test(t.nodeName)?t:e},tx=function(e,t,n){for(var r=e[n?"firstChild":"lastChild"];r&&!Po.isElement(r);)r=r[n?"nextSibling":"previousSibling"];return r===t},nx=function(e,t,n,r,o){var i=e.dom,a=e.selection.getRng();if(n!==e.getBody()){var u;ZC(u=n)&&ZC(u.parentNode)&&(o="LI");var s,c,l=o?t(o):i.create("BR");if(tx(n,r,!0)&&tx(n,r,!1))QC(n,"LI")?i.insertAfter(l,ex(n)):i.replace(l,n);else if(tx(n,r,!0))QC(n,"LI")?(i.insertAfter(l,ex(n)),l.appendChild(i.doc.createTextNode(" ")),l.appendChild(n)):n.parentNode.insertBefore(l,n);else if(tx(n,r,!1))i.insertAfter(l,ex(n));else{n=ex(n);var f=a.cloneRange();f.setStartAfter(r),f.setEndAfter(n);var d=f.extractContents();"LI"===o&&(c="LI",(s=d).firstChild&&s.firstChild.nodeName===c)?(l=d.firstChild,i.insertAfter(d,n)):(i.insertAfter(d,n),i.insertAfter(l,n))}i.remove(r),KC(e,l)}},rx=function(e){e.innerHTML='<br data-mce-bogus="1">'},ox=function(e,t){return e.nodeName===t||e.previousSibling&&e.previousSibling.nodeName===t},ix=function(e,t){return t&&e.isBlock(t)&&!/^(TD|TH|CAPTION|FORM)$/.test(t.nodeName)&&!/^(fixed|absolute)/i.test(t.style.position)&&"true"!==e.getContentEditable(t)},ax=function(e,t,n){return!1===Po.isText(t)?n:e?1===n&&t.data.charAt(n-1)===ma?0:n:n===t.data.length-1&&t.data.charAt(n)===ma?t.data.length:n},ux=function(e,t){var n,r,o=e.getRoot();for(n=t;n!==o&&"false"!==e.getContentEditable(n);)"true"===e.getContentEditable(n)&&(r=n),n=n.parentNode;return n!==o?r:o},sx=function(e,t){var n=vl(e);n&&n.toLowerCase()===t.tagName.toLowerCase()&&e.dom.setAttribs(t,bl(e))},cx=function(a,e){var t,u,s,i,c,n,r,o,l,f,d,m,g,p,h,v,b,y,C,x=a.dom,w=a.schema,N=w.getNonEmptyElements(),E=a.selection.getRng(),S=function(e){var t,n,r,o=s,i=w.getTextInlineElements();if(e||"TABLE"===f||"HR"===f?(t=x.create(e||m),sx(a,t)):t=c.cloneNode(!1),r=t,!1===xl(a))x.setAttrib(t,"style",null),x.setAttrib(t,"class",null);else do{if(i[o.nodeName]){if(ju(o)||dc(o))continue;n=o.cloneNode(!1),x.setAttrib(n,"id",""),t.hasChildNodes()?n.appendChild(t.firstChild):r=n,t.appendChild(n)}}while((o=o.parentNode)&&o!==u);return rx(r),t},k=function(e){var t,n,r,o;if(o=ax(e,s,i),Po.isText(s)&&(e?0<o:o<s.nodeValue.length))return!1;if(s.parentNode===c&&g&&!e)return!0;if(e&&Po.isElement(s)&&s===c.firstChild)return!0;if(ox(s,"TABLE")||ox(s,"HR"))return g&&!e||!g&&e;for(t=new ao(s,c),Po.isText(s)&&(e&&0===o?t.prev():e||o!==s.nodeValue.length||t.next());n=t.current();){if(Po.isElement(n)){if(!n.getAttribute("data-mce-bogus")&&(r=n.nodeName.toLowerCase(),N[r]&&"br"!==r))return!1}else if(Po.isText(n)&&!/^[ \t\r\n]*$/.test(n.nodeValue))return!1;e?t.prev():t.next()}return!0},T=function(){r=/^(H[1-6]|PRE|FIGURE)$/.test(f)&&"HGROUP"!==d?S(m):S(),wl(a)&&ix(x,l)&&x.isEmpty(c)?r=x.split(l,c):x.insertAfter(r,c),KC(a,r)};wg(x,E).each(function(e){E.setStart(e.startContainer,e.startOffset),E.setEnd(e.endContainer,e.endOffset)}),s=E.startContainer,i=E.startOffset,m=vl(a),n=e.shiftKey,Po.isElement(s)&&s.hasChildNodes()&&(g=i>s.childNodes.length-1,s=s.childNodes[Math.min(i,s.childNodes.length-1)]||s,i=g&&Po.isText(s)?s.nodeValue.length:0),(u=ux(x,s))&&((m&&!n||!m&&n)&&(s=function(e,t,n,r,o){var i,a,u,s,c,l,f,d=t||"P",m=e.dom,g=ux(m,r);if(!(a=m.getParent(r,m.isBlock))||!ix(m,a)){if(l=(a=a||g)===e.getBody()||(f=a)&&/^(TD|TH|CAPTION)$/.test(f.nodeName)?a.nodeName.toLowerCase():a.parentNode.nodeName.toLowerCase(),!a.hasChildNodes())return i=m.create(d),sx(e,i),a.appendChild(i),n.setStart(i,0),n.setEnd(i,0),i;for(s=r;s.parentNode!==a;)s=s.parentNode;for(;s&&!m.isBlock(s);)s=(u=s).previousSibling;if(u&&e.schema.isValidChild(l,d.toLowerCase())){for(i=m.create(d),sx(e,i),u.parentNode.insertBefore(i,u),s=u;s&&!m.isBlock(s);)c=s.nextSibling,i.appendChild(s),s=c;n.setStart(r,o),n.setEnd(r,o)}}return r}(a,m,E,s,i)),c=x.getParent(s,x.isBlock),l=c?x.getParent(c.parentNode,x.isBlock):null,f=c?c.nodeName.toUpperCase():"","LI"!==(d=l?l.nodeName.toUpperCase():"")||e.ctrlKey||(l=(c=l).parentNode,f=d),/^(LI|DT|DD)$/.test(f)&&x.isEmpty(c)?nx(a,S,l,c,m):m&&c===a.getBody()||(m=m||"P",va(c)?(r=ka(c),x.isEmpty(c)&&rx(c),KC(a,r)):k()?T():k(!0)?(r=c.parentNode.insertBefore(S(),c),KC(a,ox(c,"HR")?r:c)):((t=(y=E,C=y.cloneRange(),C.setStart(y.startContainer,ax(!0,y.startContainer,y.startOffset)),C.setEnd(y.endContainer,ax(!1,y.endContainer,y.endOffset)),C).cloneRange()).setEndAfter(c),o=t.extractContents(),b=o,U(qi(ir.fromDom(b),dr),function(e){var t=e.dom();t.nodeValue=ga(t.nodeValue)}),function(e){for(;Po.isText(e)&&(e.nodeValue=e.nodeValue.replace(/^[\r\n]+/,"")),e=e.firstChild;);}(o),r=o.firstChild,x.insertAfter(o,c),function(e,t,n){var r,o=n,i=[];if(o){for(;o=o.firstChild;){if(e.isBlock(o))return;Po.isElement(o)&&!t[o.nodeName.toLowerCase()]&&i.push(o)}for(r=i.length;r--;)!(o=i[r]).hasChildNodes()||o.firstChild===o.lastChild&&""===o.firstChild.nodeValue?e.remove(o):(a=e,(u=o)&&"A"===u.nodeName&&a.isEmpty(u)&&e.remove(o));var a,u}}(x,N,r),p=x,(h=c).normalize(),(v=h.lastChild)&&!/^(left|right)$/gi.test(p.getStyle(v,"float",!0))||p.add(h,"br"),x.isEmpty(c)&&rx(c),r.normalize(),x.isEmpty(r)?(x.remove(r),T()):KC(a,r)),x.setAttrib(r,"id",""),a.fire("NewBlock",{newBlock:r})))},lx=function(e,t){return YC(e).filter(function(e){return 0<t.length&&Or(ir.fromDom(e),t)}).isSome()},fx=function(e){return lx(e,yl(e))},dx=function(e){return lx(e,Cl(e))},mx=pf([{br:[]},{block:[]},{none:[]}]),gx=function(e,t){return dx(e)},px=function(n){return function(e,t){return""===vl(e)===n}},hx=function(n){return function(e,t){return JC(e)===n}},vx=function(n,r){return function(e,t){return GC(e)===n.toUpperCase()===r}},bx=function(e){return vx("pre",e)},yx=function(n){return function(e,t){return hl(e)===n}},Cx=function(e,t){return fx(e)},xx=function(e,t){return t},wx=function(e){var t=vl(e),n=XC(e.dom,e.selection.getStart());return n&&e.schema.isValidChild(n.nodeName,t||"P")},Nx=function(e,t){return function(n,r){return X(e,function(e,t){return e&&t(n,r)},!0)?A.some(t):A.none()}},Ex=function(e,t){return md([Nx([gx],mx.none()),Nx([vx("summary",!0)],mx.br()),Nx([bx(!0),yx(!1),xx],mx.br()),Nx([bx(!0),yx(!1)],mx.block()),Nx([bx(!0),yx(!0),xx],mx.block()),Nx([bx(!0),yx(!0)],mx.br()),Nx([hx(!0),xx],mx.br()),Nx([hx(!0)],mx.block()),Nx([px(!0),xx,wx],mx.block()),Nx([px(!0)],mx.br()),Nx([Cx],mx.br()),Nx([px(!1),xx],mx.br()),Nx([wx],mx.block())],[e,t.shiftKey]).getOr(mx.none())},Sx=function(e,t){Ex(e,t).fold(function(){Bg(e,t)},function(){cx(e,t)},o)},kx=function(o){o.on("keydown",function(e){var t,n,r;e.keyCode===xv.ENTER&&(t=o,(n=e).isDefaultPrevented()||(n.preventDefault(),(r=t.undoManager).typing&&(r.typing=!1,r.add()),t.undoManager.transact(function(){!1===t.selection.isCollapsed()&&t.execCommand("Delete"),Sx(t,n)})))})},Tx=function(n,r){var e=r.container(),t=r.offset();return Po.isText(e)?(e.insertData(t,n),A.some(vu(e,t+n.length))):Ts(r).map(function(e){var t=ir.fromText(n);return r.isAtEnd()?Ai(e,t):Ti(e,t),vu(t.dom(),n.length)})},Ax=d(Tx,"\xa0"),Rx=d(Tx," "),_x=function(e,t,n){return nc.navigateIgnore(e,t,n,Af)},Dx=function(e,t){return Y(ef(ir.fromDom(t.container()),e),mo)},Bx=function(e,n,r){return _x(e,n.dom(),r).forall(function(t){return Dx(n,r).fold(function(){return!1===bs(t,r,n.dom())},function(e){return!1===bs(t,r,n.dom())&&Lr(e,ir.fromDom(t.container()))})})},Ox=function(t,n,r){return Dx(n,r).fold(function(){return _x(t,n.dom(),r).forall(function(e){return!1===bs(e,r,n.dom())})},function(e){return _x(t,e.dom(),r).isNone()})},Px=d(Ox,!1),Ix=d(Ox,!0),Lx=d(Bx,!1),Mx=d(Bx,!0),Fx=function(e){return vu.isTextPosition(e)&&!e.isAtStart()&&!e.isAtEnd()},zx=function(e,t){var n=V(ef(ir.fromDom(t.container()),e),mo);return ne(n).getOr(e)},Ux=function(e,t){return Fx(t)?Tf(t):Tf(t)||nc.prevPosition(zx(e,t).dom(),t).exists(Tf)},Vx=function(e,t){return Fx(t)?kf(t):kf(t)||nc.nextPosition(zx(e,t).dom(),t).exists(kf)},Hx=function(e){return Ts(e).bind(function(e){return Yi(e,fr)}).exists(function(e){return t=Er(e,"white-space"),F(["pre","pre-wrap"],t);var t})},jx=function(e,t){return o=e,i=t,nc.prevPosition(o.dom(),i).isNone()||(n=e,r=t,nc.nextPosition(n.dom(),r).isNone())||Px(e,t)||Ix(e,t)||yf(e,t)||bf(e,t);var n,r,o,i},qx=function(e,t){var n,r,o,i=(r=(n=t).container(),o=n.offset(),Po.isText(r)&&o<r.data.length?vu(r,o+1):n);return!Hx(i)&&(Ix(e,i)||Mx(e,i)||bf(e,i)||Vx(e,i))},$x=function(e,t){return n=e,!Hx(r=t)&&(Px(n,r)||Lx(n,r)||yf(n,r)||Ux(n,r))||qx(e,t);var n,r},Wx=function(e,t){return wf(e.charAt(t))},Kx=function(e){var t=e.container();return Po.isText(t)&&Xn(t.data,"\xa0")},Xx=function(e){var t=e.data,n=W(t.split(""),function(e,t,n){return wf(e)&&0<t&&t<n.length-1&&Ef(n[t-1])&&Ef(n[t+1])?" ":e}).join("");return n!==t&&(e.data=n,!0)},Yx=function(l,e){return A.some(e).filter(Kx).bind(function(e){var t,n,r,o,i,a,u,s,c=e.container();return i=l,u=(a=c).data,s=vu(a,0),Wx(u,0)&&!$x(i,s)&&(a.data=" "+u.slice(1),1)||Xx(c)||(t=l,r=(n=c).data,o=vu(n,r.length-1),Wx(r,r.length-1)&&!$x(t,o)&&(n.data=r.slice(0,-1)+" ",1))?A.some(e):A.none()})},Gx=function(t){var e=ir.fromDom(t.getBody());t.selection.isCollapsed()&&Yx(e,vu.fromRangeStart(t.selection.getRng())).each(function(e){t.selection.setRng(e.toRange())})},Jx=function(r,o){return function(e){return t=r,!Hx(n=e)&&(jx(t,n)||Ux(t,n)||Vx(t,n))?Ax(o):Rx(o);var t,n}},Qx=function(e){var t,n,r=Cu.fromRangeStart(e.selection.getRng()),o=ir.fromDom(e.getBody());if(e.selection.isCollapsed()){var i=d(Ll.isInlineTarget,e),a=Cu.fromRangeStart(e.selection.getRng());return Dd(i,e.getBody(),a).bind((n=o,function(e){return e.fold(function(e){return nc.prevPosition(n.dom(),Cu.before(e))},function(e){return nc.firstPositionIn(e)},function(e){return nc.lastPositionIn(e)},function(e){return nc.nextPosition(n.dom(),Cu.after(e))})})).bind(Jx(o,r)).exists((t=e,function(e){return t.selection.setRng(e.toRange()),t.nodeChanged(),!0}))}return!1},Zx=function(r){r.on("keydown",function(e){var t,n;!1===e.isDefaultPrevented()&&(t=r,n=e,jC([{keyCode:xv.SPACEBAR,action:HC(Qx,t)}],n).each(function(e){n.preventDefault()}))})},ew=function(e,t){var n;t.hasAttribute("data-mce-caret")&&(ka(t),(n=e).selection.setRng(n.selection.getRng()),e.selection.scrollIntoView(t))},tw=function(e,t){var n,r=(n=e,Ji(ir.fromDom(n.getBody()),"*[data-mce-caret]").fold(q(null),function(e){return e.dom()}));if(r)return"compositionstart"===t.type?(t.preventDefault(),t.stopPropagation(),void ew(e,r)):void(Ca(r)&&(ew(e,r),e.undoManager.add()))},nw=function(e){e.on("keyup compositionstart",d(tw,e))},rw=rr.detect().browser,ow=function(t){var e,n;e=t,n=Ii(function(){e.composing||Gx(e)},0),rw.isIE()&&(e.on("keypress",function(e){n.throttle()}),e.on("remove",function(e){n.cancel()})),t.on("input",function(e){!1===e.isComposing&&Gx(t)})},iw=function(r){r.on("keydown",function(e){var t,n;!1===e.isDefaultPrevented()&&(t=r,n=e,jC([{keyCode:xv.END,action:bC(t,!0)},{keyCode:xv.HOME,action:bC(t,!1)}],n).each(function(e){n.preventDefault()}))})},aw=function(e){var t=jd.setupSelectedState(e);nw(e),qC(e,t),$C(e,t),kx(e),Zx(e),ow(e),iw(e)};function uw(u){var s,n,r,o=Jt.each,c=xv.BACKSPACE,l=xv.DELETE,f=u.dom,d=u.selection,e=u.settings,t=u.parser,i=ge.gecko,a=ge.ie,m=ge.webkit,g="data:text/mce-internal,",p=a?"Text":"URL",h=function(e,t){try{u.getDoc().execCommand(e,!1,t)}catch(n){}},v=function(e){return e.isDefaultPrevented()},b=function(){u.shortcuts.add("meta+a",null,"SelectAll")},y=function(){u.on("keydown",function(e){if(!v(e)&&e.keyCode===c&&d.isCollapsed()&&0===d.getRng().startOffset){var t=d.getNode().previousSibling;if(t&&t.nodeName&&"table"===t.nodeName.toLowerCase())return e.preventDefault(),!1}})},C=function(){u.inline||(u.contentStyles.push("body {min-height: 150px}"),u.on("click",function(e){var t;if("HTML"===e.target.nodeName){if(11<ge.ie)return void u.getBody().focus();t=u.selection.getRng(),u.getBody().focus(),u.selection.setRng(t),u.selection.normalize(),u.nodeChanged()}}))};return u.on("keydown",function(e){var t,n,r,o,i;if(!v(e)&&e.keyCode===xv.BACKSPACE&&(n=(t=d.getRng()).startContainer,r=t.startOffset,o=f.getRoot(),i=n,t.collapsed&&0===r)){for(;i&&i.parentNode&&i.parentNode.firstChild===i&&i.parentNode!==o;)i=i.parentNode;"BLOCKQUOTE"===i.tagName&&(u.formatter.toggle("blockquote",null,i),(t=f.createRng()).setStart(n,0),t.setEnd(n,0),d.setRng(t))}}),s=function(e){var t=f.create("body"),n=e.cloneContents();return t.appendChild(n),d.serializer.serialize(t,{format:"html"})},u.on("keydown",function(e){var t,n,r,o,i,a=e.keyCode;if(!v(e)&&(a===l||a===c)){if(t=u.selection.isCollapsed(),n=u.getBody(),t&&!f.isEmpty(n))return;if(!t&&(r=u.selection.getRng(),o=s(r),(i=f.createRng()).selectNode(u.getBody()),o!==s(i)))return;e.preventDefault(),u.setContent(""),n.firstChild&&f.isBlock(n.firstChild)?u.selection.setCursorLocation(n.firstChild,0):u.selection.setCursorLocation(n,0),u.nodeChanged()}}),ge.windowsPhone||u.on("keyup focusin mouseup",function(e){xv.modifierPressed(e)||d.normalize()},!0),m&&(u.settings.content_editable||f.bind(u.getDoc(),"mousedown mouseup",function(e){var t;if(e.target===u.getDoc().documentElement)if(t=d.getRng(),u.getBody().focus(),"mousedown"===e.type){if(ya(t.startContainer))return;d.placeCaretAt(e.clientX,e.clientY)}else d.setRng(t)}),u.on("click",function(e){var t=e.target;/^(IMG|HR)$/.test(t.nodeName)&&"false"!==f.getContentEditableParent(t)&&(e.preventDefault(),u.selection.select(t),u.nodeChanged()),"A"===t.nodeName&&f.hasClass(t,"mce-item-anchor")&&(e.preventDefault(),d.select(t))}),e.forced_root_block&&u.on("init",function(){h("DefaultParagraphSeparator",e.forced_root_block)}),u.on("init",function(){u.dom.bind(u.getBody(),"submit",function(e){e.preventDefault()})}),y(),t.addNodeFilter("br",function(e){for(var t=e.length;t--;)"Apple-interchange-newline"===e[t].attr("class")&&e[t].remove()}),ge.iOS?(u.inline||u.on("keydown",function(){H.document.activeElement===H.document.body&&u.getWin().focus()}),C(),u.on("click",function(e){var t=e.target;do{if("A"===t.tagName)return void e.preventDefault()}while(t=t.parentNode)}),u.contentStyles.push(".mce-content-body {-webkit-touch-callout: none}")):b()),11<=ge.ie&&(C(),y()),ge.ie&&(b(),h("AutoUrlDetect",!1),u.on("dragstart",function(e){var t,n,r;(t=e).dataTransfer&&(u.selection.isCollapsed()&&"IMG"===t.target.tagName&&d.select(t.target),0<(n=u.selection.getContent()).length&&(r=g+escape(u.id)+","+escape(n),t.dataTransfer.setData(p,r)))}),u.on("drop",function(e){if(!v(e)){var t=(i=e).dataTransfer&&(a=i.dataTransfer.getData(p))&&0<=a.indexOf(g)?(a=a.substr(g.length).split(","),{id:unescape(a[0]),html:unescape(a[1])}):null;if(t&&t.id!==u.id){e.preventDefault();var n=Ty(e.x,e.y,u.getDoc());d.setRng(n),r=t.html,o=!0,u.queryCommandSupported("mceInsertClipboardContent")?u.execCommand("mceInsertClipboardContent",!1,{content:r,internal:o}):u.execCommand("mceInsertContent",!1,r)}}var r,o,i,a})),i&&(u.on("keydown",function(e){if(!v(e)&&e.keyCode===c){if(!u.getBody().getElementsByTagName("hr").length)return;if(d.isCollapsed()&&0===d.getRng().startOffset){var t=d.getNode(),n=t.previousSibling;if("HR"===t.nodeName)return f.remove(t),void e.preventDefault();n&&n.nodeName&&"hr"===n.nodeName.toLowerCase()&&(f.remove(n),e.preventDefault())}}}),H.Range.prototype.getClientRects||u.on("mousedown",function(e){if(!v(e)&&"HTML"===e.target.nodeName){var t=u.getBody();t.blur(),ye.setEditorTimeout(u,function(){t.focus()})}}),n=function(){var e=f.getAttribs(d.getStart().cloneNode(!1));return function(){var t=d.getStart();t!==u.getBody()&&(f.setAttrib(t,"style",null),o(e,function(e){t.setAttributeNode(e.cloneNode(!0))}))}},r=function(){return!d.isCollapsed()&&f.getParent(d.getStart(),f.isBlock)!==f.getParent(d.getEnd(),f.isBlock)},u.on("keypress",function(e){var t;if(!v(e)&&(8===e.keyCode||46===e.keyCode)&&r())return t=n(),u.getDoc().execCommand("delete",!1,null),t(),e.preventDefault(),!1}),f.bind(u.getDoc(),"cut",function(e){var t;!v(e)&&r()&&(t=n(),ye.setEditorTimeout(u,function(){t()}))}),e.readonly||u.on("BeforeExecCommand MouseDown",function(){h("StyleWithCSS",!1),h("enableInlineTableEditing",!1),e.object_resizing||h("enableObjectResizing",!1)}),u.on("SetContent ExecCommand",function(e){"setcontent"!==e.type&&"mceInsertLink"!==e.command||o(f.select("a"),function(e){var t=e.parentNode,n=f.getRoot();if(t.lastChild===e){for(;t&&!f.isBlock(t);){if(t.parentNode.lastChild!==t||t===n)return;t=t.parentNode}f.add(t,"br",{"data-mce-bogus":1})}})}),u.contentStyles.push("img:-moz-broken {-moz-force-broken-image-icon:1;min-width:24px;min-height:24px}"),ge.mac&&u.on("keydown",function(e){!xv.metaKeyPressed(e)||e.shiftKey||37!==e.keyCode&&39!==e.keyCode||(e.preventDefault(),u.selection.getSel().modify("move",37===e.keyCode?"backward":"forward","lineboundary"))}),y()),{refreshContentEditable:function(){},isHidden:function(){var e;return!i||u.removed?0:!(e=u.selection.getSel())||!e.rangeCount||0===e.rangeCount}}}var sw=function(e){return Po.isElement(e)&&ho(ir.fromDom(e))},cw=function(t){t.on("click",function(e){3<=e.detail&&function(e){var t=e.selection.getRng(),n=vu.fromRangeStart(t),r=vu.fromRangeEnd(t);if(vu.isElementPosition(n)){var o=n.container();sw(o)&&nc.firstPositionIn(o).each(function(e){return t.setStart(e.container(),e.offset())})}vu.isElementPosition(r)&&(o=n.container(),sw(o)&&nc.lastPositionIn(o).each(function(e){return t.setEnd(e.container(),e.offset())})),e.selection.setRng(rl(t))}(t)})},lw=function(e){var t,n;(t=e).on("click",function(e){t.dom.getParent(e.target,"details")&&e.preventDefault()}),(n=e).parser.addNodeFilter("details",function(e){U(e,function(e){e.attr("data-mce-open",e.attr("open")),e.attr("open","open")})}),n.serializer.addNodeFilter("details",function(e){U(e,function(e){var t=e.attr("data-mce-open");e.attr("open",R(t)?t:null),e.attr("data-mce-open",null)})})},fw=bi.DOM,dw=function(e){var t;e.bindPendingEventDelegates(),e.initialized=!0,e.fire("init"),e.focus(!0),e.nodeChanged({initial:!0}),e.execCallback("init_instance_callback",e),(t=e).settings.auto_focus&&ye.setEditorTimeout(t,function(){var e;(e=!0===t.settings.auto_focus?t:t.editorManager.get(t.settings.auto_focus)).destroyed||e.focus()},100)},mw=function(t,e){var n,r,u,o,i,a,s,c,l,f=t.settings,d=t.getElement(),m=t.getDoc();f.inline||(t.getElement().style.visibility=t.orgVisibility),e||f.content_editable||(m.open(),m.write(t.iframeHTML),m.close()),f.content_editable&&(t.on("remove",function(){var e=this.getBody();fw.removeClass(e,"mce-content-body"),fw.removeClass(e,"mce-edit-focus"),fw.setAttrib(e,"contentEditable",null)}),fw.addClass(d,"mce-content-body"),t.contentDocument=m=f.content_document||H.document,t.contentWindow=f.content_window||H.window,t.bodyElement=d,f.content_document=f.content_window=null,f.root_name=d.nodeName.toLowerCase()),(n=t.getBody()).disabled=!0,t.readonly=f.readonly,t.readonly||(t.inline&&"static"===fw.getStyle(n,"position",!0)&&(n.style.position="relative"),n.contentEditable=t.getParam("content_editable_state",!0)),n.disabled=!1,t.editorUpload=Lh(t),t.schema=ii(f),t.dom=bi(m,{keep_values:!0,url_converter:t.convertURL,url_converter_scope:t,hex_colors:f.force_hex_style_colors,class_filter:f.class_filter,update_styles:!0,root_element:t.inline?t.getBody():null,collect:f.content_editable,schema:t.schema,contentCssCors:Ol(t),onSetAttrib:function(e){t.fire("SetAttrib",e)}}),t.parser=((o=ly((u=t).settings,u.schema)).addAttributeFilter("src,href,style,tabindex",function(e,t){for(var n,r,o,i=e.length,a=u.dom;i--;)if(r=(n=e[i]).attr(t),o="data-mce-"+t,!n.attributes.map[o]){if(0===r.indexOf("data:")||0===r.indexOf("blob:"))continue;"style"===t?((r=a.serializeStyle(a.parseStyle(r),n.name)).length||(r=null),n.attr(o,r),n.attr(t,r)):"tabindex"===t?(n.attr(o,r),n.attr(t,null)):n.attr(o,u.convertURL(r,t,n.name))}}),o.addNodeFilter("script",function(e){for(var t,n,r=e.length;r--;)0!==(n=(t=e[r]).attr("type")||"no/type").indexOf("mce-")&&t.attr("type","mce-"+n)}),o.addNodeFilter("#cdata",function(e){for(var t,n=e.length;n--;)(t=e[n]).type=8,t.name="#comment",t.value="[CDATA["+t.value+"]]"}),o.addNodeFilter("p,h1,h2,h3,h4,h5,h6,div",function(e){for(var t,n=e.length,r=u.schema.getNonEmptyElements();n--;)(t=e[n]).isEmpty(r)&&0===t.getAll("br").length&&(t.append(new Zb("br",1)).shortEnded=!0)}),o),t.serializer=py(f,t),t.selection=tC(t.dom,t.getWin(),t.serializer,t),t.annotator=Mc(t),t.formatter=Vb(t),t.undoManager=Xv(t),t._nodeChangeDispatcher=new Wh(t),t._selectionOverrides=Sv(t),lw(t),cw(t),aw(t),Uh(t),t.fire("PreInit"),f.browser_spellcheck||f.gecko_spellcheck||(m.body.spellcheck=!1,fw.setAttrib(n,"spellcheck","false")),t.quirks=uw(t),t.fire("PostRender"),f.directionality&&(n.dir=f.directionality),f.nowrap&&(n.style.whiteSpace="nowrap"),f.protect&&t.on("BeforeSetContent",function(t){Jt.each(f.protect,function(e){t.content=t.content.replace(e,function(e){return"\x3c!--mce:protected "+escape(e)+"--\x3e"})})}),t.on("SetContent",function(){t.addVisual(t.getBody())}),t.load({initial:!0,format:"html"}),t.startContent=t.getContent({format:"raw"}),t.on("compositionstart compositionend",function(e){t.composing="compositionstart"===e.type}),0<t.contentStyles.length&&(r="",Jt.each(t.contentStyles,function(e){r+=e+"\r\n"}),t.dom.addStyle(r)),(i=t,i.inline?fw.styleSheetLoader:i.dom.styleSheetLoader).loadAll(t.contentCSS,function(e){dw(t)},function(e){dw(t)}),f.content_style&&(a=t,s=f.content_style,c=ir.fromDom(a.getDoc().head),l=ir.fromTag("style"),yr(l,"type","text/css"),_i(l,ir.fromText(s)),_i(c,l))},gw=bi.DOM,pw=function(e,t){var n,r,o,i,a,u,s,c=e.editorManager.translate("Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help"),l=(n=e.id,r=c,o=t.height,i=ll(e),s=ir.fromTag("iframe"),Cr(s,i),Cr(s,{id:n+"_ifr",frameBorder:"0",allowTransparency:"true",title:r}),Nr(s,{width:"100%",height:(a=o,u="number"==typeof a?a+"px":a,u||""),display:"block"}),s).dom();l.onload=function(){l.onload=null,e.fire("load")};var f,d,m,g,p=function(e,t){if(H.document.domain!==H.window.location.hostname&&ge.ie&&ge.ie<12){var n=Ih.uuid("mce");e[n]=function(){mw(e)};var r='javascript:(function(){document.open();document.domain="'+H.document.domain+'";var ed = window.parent.tinymce.get("'+e.id+'");document.write(ed.iframeHTML);document.close();ed.'+n+"(true);})()";return gw.setAttrib(t,"src",r),!0}return!1}(e,l);return e.contentAreaContainer=t.iframeContainer,e.iframeElement=l,e.iframeHTML=(g=fl(f=e)+"<html><head>",dl(f)!==f.documentBaseUrl&&(g+='<base href="'+f.documentBaseURI.getURI()+'" />'),g+='<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />',d=ml(f),m=gl(f),pl(f)&&(g+='<meta http-equiv="Content-Security-Policy" content="'+pl(f)+'" />'),g+='</head><body id="'+d+'" class="mce-content-body '+m+'" data-id="'+f.id+'"><br></body></html>'),gw.add(t.iframeContainer,l),p},hw=function(e,t){var n=pw(e,t);t.editorContainer&&(gw.get(t.editorContainer).style.display=e.orgDisplay,e.hidden=gw.isHidden(t.editorContainer)),e.getElement().style.display="none",gw.setAttrib(e.id,"aria-hidden","true"),n||mw(e)},vw=bi.DOM,bw=function(t,n,e){var r=Ch.get(e),o=Ch.urls[e]||t.documentBaseUrl.replace(/\/$/,"");if(e=Jt.trim(e),r&&-1===Jt.inArray(n,e)){if(Jt.each(Ch.dependencies(e),function(e){bw(t,n,e)}),t.plugins[e])return;try{var i=new r(t,o,t.$);(t.plugins[e]=i).init&&(i.init(t,o),n.push(e))}catch(ZN){yh.pluginInitError(t,e,ZN)}}},yw=function(e){return e.replace(/^\-/,"")},Cw=function(e){return{editorContainer:e,iframeContainer:e}},xw=function(e){var t,n,r=e.getElement();return e.inline?Cw(null):(t=r,n=vw.create("div"),vw.insertAfter(n,t),Cw(n))},ww=function(e){var t,n,r,o,i,a,u,s,c,l,f,d=e.settings,m=e.getElement();return e.orgDisplay=m.style.display,R(d.theme)?(l=(o=e).settings,f=o.getElement(),i=l.width||vw.getStyle(f,"width")||"100%",a=l.height||vw.getStyle(f,"height")||f.offsetHeight,u=l.min_height||100,(s=/^[0-9\.]+(|px)$/i).test(""+i)&&(i=Math.max(parseInt(i,10),100)),s.test(""+a)&&(a=Math.max(parseInt(a,10),u)),c=o.theme.renderUI({targetNode:f,width:i,height:a,deltaWidth:l.delta_width,deltaHeight:l.delta_height}),l.content_editable||(a=(c.iframeHeight||a)+("number"==typeof a?c.deltaHeight||0:""))<u&&(a=u),c.height=a,c):P(d.theme)?(r=(t=e).getElement(),(n=t.settings.theme(t,r)).editorContainer.nodeType&&(n.editorContainer.id=n.editorContainer.id||t.id+"_parent"),n.iframeContainer&&n.iframeContainer.nodeType&&(n.iframeContainer.id=n.iframeContainer.id||t.id+"_iframecontainer"),n.height=n.iframeHeight?n.iframeHeight:r.offsetHeight,n):xw(e)},Nw=function(t){var e,n,r,o,i,a,u=t.settings,s=t.getElement();return t.rtl=u.rtl_ui||t.editorManager.i18n.rtl,t.editorManager.i18n.setCode(u.language),u.aria_label=u.aria_label||vw.getAttrib(s,"aria-label",t.getLang("aria.rich_text_area")),t.fire("ScriptsLoaded"),o=(n=t).settings.theme,R(o)?(n.settings.theme=yw(o),r=xh.get(o),n.theme=new r(n,xh.urls[o]),n.theme.init&&n.theme.init(n,xh.urls[o]||n.documentBaseUrl.replace(/\/$/,""),n.$)):n.theme={},i=t,a=[],Jt.each(i.settings.plugins.split(/[ ,]/),function(e){bw(i,a,yw(e))}),e=ww(t),t.editorContainer=e.editorContainer?e.editorContainer:null,u.content_css&&Jt.each(Jt.explode(u.content_css),function(e){t.contentCSS.push(t.documentBaseURI.toAbsolute(e))}),u.content_editable?mw(t):hw(t,e)},Ew=bi.DOM,Sw=function(e){return"-"===e.charAt(0)},kw=function(i,a){var u=Ni.ScriptLoader;!function(e,t,n,r){var o=t.settings,i=o.theme;if(R(i)){if(!Sw(i)&&!xh.urls.hasOwnProperty(i)){var a=o.theme_url;a?xh.load(i,t.documentBaseURI.toAbsolute(a)):xh.load(i,"themes/"+i+"/theme"+n+".js")}e.loadQueue(function(){xh.waitFor(i,r)})}else r()}(u,i,a,function(){var e,t,n,r,o;e=u,(n=(t=i).settings).language&&"en"!==n.language&&!n.language_url&&(n.language_url=t.editorManager.baseURL+"/langs/"+n.language+".js"),n.language_url&&!t.editorManager.i18n.data[n.language]&&e.add(n.language_url),r=i.settings,o=a,Jt.isArray(r.plugins)&&(r.plugins=r.plugins.join(" ")),Jt.each(r.external_plugins,function(e,t){Ch.load(t,e),r.plugins+=" "+t}),Jt.each(r.plugins.split(/[ ,]/),function(e){if((e=Jt.trim(e))&&!Ch.urls[e])if(Sw(e)){e=e.substr(1,e.length);var t=Ch.dependencies(e);Jt.each(t,function(e){var t={prefix:"plugins/",resource:e,suffix:"/plugin"+o+".js"};e=Ch.createUrl(t,e),Ch.load(e.resource,e)})}else Ch.load(e,{prefix:"plugins/",resource:e,suffix:"/plugin"+o+".js"})}),u.loadQueue(function(){i.removed||Nw(i)},i,function(e){yh.pluginLoadError(i,e[0]),i.removed||Nw(i)})})},Tw=function(t){var e=t.settings,n=t.id,r=function(){Ew.unbind(H.window,"ready",r),t.render()};if(Ae.Event.domLoaded){if(t.getElement()&&ge.contentEditable){e.inline?t.inline=!0:(t.orgVisibility=t.getElement().style.visibility,t.getElement().style.visibility="hidden");var o=t.getElement().form||Ew.getParent(n,"form");o&&(t.formElement=o,e.hidden_input&&!/TEXTAREA|INPUT/i.test(t.getElement().nodeName)&&(Ew.insertAfter(Ew.create("input",{type:"hidden",name:n}),n),t.hasHiddenInput=!0),t.formEventDelegate=function(e){t.fire(e.type,e)},Ew.bind(o,"submit reset",t.formEventDelegate),t.on("reset",function(){t.setContent(t.startContent,{format:"raw"})}),!e.submit_patch||o.submit.nodeType||o.submit.length||o._mceOldSubmit||(o._mceOldSubmit=o.submit,o.submit=function(){return t.editorManager.triggerSave(),t.setDirty(!1),o._mceOldSubmit(o)})),t.windowManager=lh(t),t.notificationManager=ch(t),"xml"===e.encoding&&t.on("GetContent",function(e){e.save&&(e.content=Ew.encode(e.content))}),e.add_form_submit_trigger&&t.on("submit",function(){t.initialized&&t.save()}),e.add_unload_trigger&&(t._beforeUnload=function(){!t.initialized||t.destroyed||t.isHidden()||t.save({format:"raw",no_events:!0,set_dirty:!1})},t.editorManager.on("BeforeUnload",t._beforeUnload)),t.editorManager.add(t),kw(t,t.suffix)}}else Ew.bind(H.window,"ready",r)},Aw=function(e,t,n){var r=e.sidebars?e.sidebars:[];r.push({name:t,settings:n}),e.sidebars=r},Rw=Jt.each,_w=Jt.trim,Dw="source protocol authority userInfo user password host port relative path directory file query anchor".split(" "),Bw={ftp:21,http:80,https:443,mailto:25},Ow=function(r,e){var t,n,o=this;if(r=_w(r),t=(e=o.settings=e||{}).base_uri,/^([\w\-]+):([^\/]{2})/i.test(r)||/^\s*#/.test(r))o.source=r;else{var i=0===r.indexOf("//");0!==r.indexOf("/")||i||(r=(t&&t.protocol||"http")+"://mce_host"+r),/^[\w\-]*:?\/\//.test(r)||(n=e.base_uri?e.base_uri.path:new Ow(H.document.location.href).directory,""==e.base_uri.protocol?r="//mce_host"+o.toAbsPath(n,r):(r=/([^#?]*)([#?]?.*)/.exec(r),r=(t&&t.protocol||"http")+"://mce_host"+o.toAbsPath(n,r[1])+r[2])),r=r.replace(/@@/g,"(mce_at)"),r=/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@\/]*):?([^:@\/]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(r),Rw(Dw,function(e,t){var n=r[t];n&&(n=n.replace(/\(mce_at\)/g,"@@")),o[e]=n}),t&&(o.protocol||(o.protocol=t.protocol),o.userInfo||(o.userInfo=t.userInfo),o.port||"mce_host"!==o.host||(o.port=t.port),o.host&&"mce_host"!==o.host||(o.host=t.host),o.source=""),i&&(o.protocol="")}};Ow.prototype={setPath:function(e){e=/^(.*?)\/?(\w+)?$/.exec(e),this.path=e[0],this.directory=e[1],this.file=e[2],this.source="",this.getURI()},toRelative:function(e){var t;if("./"===e)return e;if("mce_host"!==(e=new Ow(e,{base_uri:this})).host&&this.host!==e.host&&e.host||this.port!==e.port||this.protocol!==e.protocol&&""!==e.protocol)return e.getURI();var n=this.getURI(),r=e.getURI();return n===r||"/"===n.charAt(n.length-1)&&n.substr(0,n.length-1)===r?n:(t=this.toRelPath(this.path,e.path),e.query&&(t+="?"+e.query),e.anchor&&(t+="#"+e.anchor),t)},toAbsolute:function(e,t){return(e=new Ow(e,{base_uri:this})).getURI(t&&this.isSameOrigin(e))},isSameOrigin:function(e){if(this.host==e.host&&this.protocol==e.protocol){if(this.port==e.port)return!0;var t=Bw[this.protocol];if(t&&(this.port||t)==(e.port||t))return!0}return!1},toRelPath:function(e,t){var n,r,o,i=0,a="";if(e=(e=e.substring(0,e.lastIndexOf("/"))).split("/"),n=t.split("/"),e.length>=n.length)for(r=0,o=e.length;r<o;r++)if(r>=n.length||e[r]!==n[r]){i=r+1;break}if(e.length<n.length)for(r=0,o=n.length;r<o;r++)if(r>=e.length||e[r]!==n[r]){i=r+1;break}if(1===i)return t;for(r=0,o=e.length-(i-1);r<o;r++)a+="../";for(r=i-1,o=n.length;r<o;r++)a+=r!==i-1?"/"+n[r]:n[r];return a},toAbsPath:function(e,t){var n,r,o,i=0,a=[];for(r=/\/$/.test(t)?"/":"",e=e.split("/"),t=t.split("/"),Rw(e,function(e){e&&a.push(e)}),e=a,n=t.length-1,a=[];0<=n;n--)0!==t[n].length&&"."!==t[n]&&(".."!==t[n]?0<i?i--:a.push(t[n]):i++);return 0!==(o=(n=e.length-i)<=0?a.reverse().join("/"):e.slice(0,n).join("/")+"/"+a.reverse().join("/")).indexOf("/")&&(o="/"+o),r&&o.lastIndexOf("/")!==o.length-1&&(o+=r),o},getURI:function(e){var t,n=this;return n.source&&!e||(t="",e||(n.protocol?t+=n.protocol+"://":t+="//",n.userInfo&&(t+=n.userInfo+"@"),n.host&&(t+=n.host),n.port&&(t+=":"+n.port)),n.path&&(t+=n.path),n.query&&(t+="?"+n.query),n.anchor&&(t+="#"+n.anchor),n.source=t),n.source}},Ow.parseDataUri=function(e){var t,n;return e=decodeURIComponent(e).split(","),(n=/data:([^;]+)/.exec(e[0]))&&(t=n[1]),{type:t,data:e[1]}},Ow.getDocumentBaseUrl=function(e){var t;return t=0!==e.protocol.indexOf("http")&&"file:"!==e.protocol?e.href:e.protocol+"//"+e.host+e.pathname,/^[^:]+:\/\/\/?[^\/]+\//.test(t)&&(t=t.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,""),/[\/\\]$/.test(t)||(t+="/")),t};var Pw=function(e,t,n){var r,o,i,a,u;if(t.format=t.format?t.format:"html",t.get=!0,t.getInner=!0,t.no_events||e.fire("BeforeGetContent",t),"raw"===t.format)r=Jt.trim(Dv.trimExternal(e.serializer,n.innerHTML));else if("text"===t.format)r=ga(n.innerText||n.textContent);else{if("tree"===t.format)return e.serializer.serialize(n,t);i=(o=e).serializer.serialize(n,t),a=vl(o),u=new RegExp("^(<"+a+"[^>]*>(&nbsp;|&#160;|\\s|\xa0|<br \\/>|)<\\/"+a+">[\r\n]*|<br \\/>[\r\n]*)$"),r=i.replace(u,"")}return"text"===t.format||wo(ir.fromDom(n))?t.content=r:t.content=Jt.trim(r),t.no_events||e.fire("GetContent",t),t.content},Iw=function(e,t){t(e),e.firstChild&&Iw(e.firstChild,t),e.next&&Iw(e.next,t)},Lw=function(e,t,n){var r=function(e,n,t){var r={},o={},i=[];for(var a in t.firstChild&&Iw(t.firstChild,function(t){U(e,function(e){e.name===t.name&&(r[e.name]?r[e.name].nodes.push(t):r[e.name]={filter:e,nodes:[t]})}),U(n,function(e){"string"==typeof t.attr(e.name)&&(o[e.name]?o[e.name].nodes.push(t):o[e.name]={filter:e,nodes:[t]})})}),r)r.hasOwnProperty(a)&&i.push(r[a]);for(var a in o)o.hasOwnProperty(a)&&i.push(o[a]);return i}(e,t,n);U(r,function(t){U(t.filter.callbacks,function(e){e(t.nodes,t.filter.name,{})})})},Mw=function(e){return e instanceof Zb},Fw=function(e,t){var r;e.dom.setHTML(e.getBody(),t),eh(r=e)&&nc.firstPositionIn(r.getBody()).each(function(e){var t=e.getNode(),n=Po.isTable(t)?nc.firstPositionIn(t).getOr(e):e;r.selection.setRng(n.toRange())})},zw=function(u,s,c){return void 0===c&&(c={}),c.format=c.format?c.format:"html",c.set=!0,c.content=Mw(s)?"":s,Mw(s)||c.no_events||(u.fire("BeforeSetContent",c),s=c.content),A.from(u.getBody()).fold(q(s),function(e){return Mw(s)?function(e,t,n,r){Lw(e.parser.getNodeFilters(),e.parser.getAttributeFilters(),n);var o=el({validate:e.validate},e.schema).serialize(n);return r.content=wo(ir.fromDom(t))?o:Jt.trim(o),Fw(e,r.content),r.no_events||e.fire("SetContent",r),n}(u,e,s,c):(t=u,n=e,o=c,0===(r=s).length||/^\s+$/.test(r)?(a='<br data-mce-bogus="1">',"TABLE"===n.nodeName?r="<tr><td>"+a+"</td></tr>":/^(UL|OL)$/.test(n.nodeName)&&(r="<li>"+a+"</li>"),(i=vl(t))&&t.schema.isValidChild(n.nodeName.toLowerCase(),i.toLowerCase())?(r=a,r=t.dom.createHTML(i,t.settings.forced_root_block_attrs,r)):r||(r='<br data-mce-bogus="1">'),Fw(t,r),t.fire("SetContent",o)):("raw"!==o.format&&(r=el({validate:t.validate},t.schema).serialize(t.parser.parse(r,{isRootContent:!0,insert:!0}))),o.content=wo(ir.fromDom(n))?r:Jt.trim(r),Fw(t,o.content),o.no_events||t.fire("SetContent",o)),o.content);var t,n,r,o,i,a})},Uw=bi.DOM,Vw=function(e){return A.from(e).each(function(e){return e.destroy()})},Hw=function(e){if(!e.removed){var t=e._selectionOverrides,n=e.editorUpload,r=e.getBody(),o=e.getElement();r&&e.save({is_removing:!0}),e.removed=!0,e.unbindAllNativeEvents(),e.hasHiddenInput&&o&&Uw.remove(o.nextSibling),gp(e),e.editorManager.remove(e),!e.inline&&r&&(i=e,Uw.setStyle(i.id,"display",i.orgDisplay)),pp(e),Uw.remove(e.getContainer()),Vw(t),Vw(n),e.destroy()}var i},jw=function(e,t){var n,r,o,i=e.selection,a=e.dom;e.destroyed||(t||e.removed?(t||(e.editorManager.off("beforeunload",e._beforeUnload),e.theme&&e.theme.destroy&&e.theme.destroy(),Vw(i),Vw(a)),(r=(n=e).formElement)&&(r._mceOldSubmit&&(r.submit=r._mceOldSubmit,r._mceOldSubmit=null),Uw.unbind(r,"submit reset",n.formEventDelegate)),(o=e).contentAreaContainer=o.formElement=o.container=o.editorContainer=null,o.bodyElement=o.contentDocument=o.contentWindow=null,o.iframeElement=o.targetElm=null,o.selection&&(o.selection=o.selection.win=o.selection.dom=o.selection.dom.doc=null),e.destroyed=!0):e.remove())},qw=bi.DOM,$w=Jt.extend,Ww=Jt.each,Kw=Jt.resolve,Xw=ge.ie,Yw=function(e,t,n){var r,o,i,a,u,s,c,l=this,f=l.documentBaseUrl=n.documentBaseURL,d=n.baseURI;r=l,o=e,i=f,a=n.defaultSettings,u=t,c={id:o,theme:"modern",delta_width:0,delta_height:0,popup_css:"",plugins:"",document_base_url:i,add_form_submit_trigger:!0,submit_patch:!0,add_unload_trigger:!0,convert_urls:!0,relative_urls:!0,remove_script_host:!0,object_resizing:!0,doctype:"<!DOCTYPE html>",visual:!0,font_size_style_values:"xx-small,x-small,small,medium,large,x-large,xx-large",font_size_legacy_values:"xx-small,small,medium,large,x-large,xx-large,300%",forced_root_block:"p",hidden_input:!0,render_ui:!0,indentation:"40px",inline_styles:!0,convert_fonts_to_spans:!0,indent:"simple",indent_before:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,th,ul,ol,li,dl,dt,dd,area,table,thead,tfoot,tbody,tr,section,summary,article,hgroup,aside,figure,figcaption,option,optgroup,datalist",indent_after:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,th,ul,ol,li,dl,dt,dd,area,table,thead,tfoot,tbody,tr,section,summary,article,hgroup,aside,figure,figcaption,option,optgroup,datalist",entity_encoding:"named",url_converter:(s=r).convertURL,url_converter_scope:s,ie7_compat:!0},t=Mp(_p,c,a,u),l.settings=t,ki.language=t.language||"en",ki.languageLoad=t.language_load,ki.baseURL=n.baseURL,l.id=e,l.setDirty(!1),l.plugins={},l.documentBaseURI=new Ow(t.document_base_url,{base_uri:d}),l.baseURI=d,l.contentCSS=[],l.contentStyles=[],l.shortcuts=new qp(l),l.loadedCSS={},l.editorCommands=new ap(l),l.suffix=n.suffix,l.editorManager=n,l.inline=t.inline,l.buttons={},l.menuItems={},t.cache_suffix&&(ge.cacheSuffix=t.cache_suffix.replace(/^[\?\&]+/,"")),!1===t.override_viewport&&(ge.overrideViewPort=!1),n.fire("SetupEditor",{editor:l}),l.execCallback("setup",l),l.$=vn.overrideDefaults(function(){return{context:l.inline?l.getBody():l.getDoc(),element:l.getBody()}})};$w(Yw.prototype={render:function(){Tw(this)},focus:function(e){Zp(this,e)},hasFocus:function(){return eh(this)},execCallback:function(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];var r,o=this.settings[e];if(o)return this.callbackLookup&&(r=this.callbackLookup[e])&&(o=r.func,r=r.scope),"string"==typeof o&&(r=(r=o.replace(/\.\w+$/,""))?Kw(r):0,o=Kw(o),this.callbackLookup=this.callbackLookup||{},this.callbackLookup[e]={func:o,scope:r}),o.apply(r||this,Array.prototype.slice.call(arguments,1))},translate:function(e){if(e&&Jt.is(e,"string")){var n=this.settings.language||"en",r=this.editorManager.i18n;e=r.data[n+"."+e]||e.replace(/\{\#([^\}]+)\}/g,function(e,t){return r.data[n+"."+t]||"{#"+t+"}"})}return this.editorManager.translate(e)},getLang:function(e,t){return this.editorManager.i18n.data[(this.settings.language||"en")+"."+e]||(t!==undefined?t:"{#"+e+"}")},getParam:function(e,t,n){return zp(this,e,t,n)},nodeChanged:function(e){this._nodeChangeDispatcher.nodeChanged(e)},addButton:function(e,t){var n=this;t.cmd&&(t.onclick=function(){n.execCommand(t.cmd)}),t.stateSelector&&"undefined"==typeof t.active&&(t.active=!1),t.text||t.icon||(t.icon=e),t.tooltip=t.tooltip||t.title,n.buttons[e]=t},addSidebar:function(e,t){return Aw(this,e,t)},addMenuItem:function(e,t){var n=this;t.cmd&&(t.onclick=function(){n.execCommand(t.cmd)}),n.menuItems[e]=t},addContextToolbar:function(e,t){var n,r=this;r.contextToolbars=r.contextToolbars||[],"string"==typeof e&&(n=e,e=function(e){return r.dom.is(e,n)}),r.contextToolbars.push({id:Ih.uuid("mcet"),predicate:e,items:t})},addCommand:function(e,t,n){this.editorCommands.addCommand(e,t,n)},addQueryStateHandler:function(e,t,n){this.editorCommands.addQueryStateHandler(e,t,n)},addQueryValueHandler:function(e,t,n){this.editorCommands.addQueryValueHandler(e,t,n)},addShortcut:function(e,t,n,r){this.shortcuts.add(e,t,n,r)},execCommand:function(e,t,n,r){return this.editorCommands.execCommand(e,t,n,r)},queryCommandState:function(e){return this.editorCommands.queryCommandState(e)},queryCommandValue:function(e){return this.editorCommands.queryCommandValue(e)},queryCommandSupported:function(e){return this.editorCommands.queryCommandSupported(e)},show:function(){this.hidden&&(this.hidden=!1,this.inline?this.getBody().contentEditable=!0:(qw.show(this.getContainer()),qw.hide(this.id)),this.load(),this.fire("show"))},hide:function(){var e=this,t=e.getDoc();e.hidden||(Xw&&t&&!e.inline&&t.execCommand("SelectAll"),e.save(),e.inline?(e.getBody().contentEditable=!1,e===e.editorManager.focusedEditor&&(e.editorManager.focusedEditor=null)):(qw.hide(e.getContainer()),qw.setStyle(e.id,"display",e.orgDisplay)),e.hidden=!0,e.fire("hide"))},isHidden:function(){return!!this.hidden},setProgressState:function(e,t){this.fire("ProgressState",{state:e,time:t})},load:function(e){var t,n=this.getElement();return this.removed?"":n?((e=e||{}).load=!0,t=this.setContent(n.value!==undefined?n.value:n.innerHTML,e),e.element=n,e.no_events||this.fire("LoadContent",e),e.element=n=null,t):void 0},save:function(e){var t,n,r=this,o=r.getElement();if(o&&r.initialized&&!r.removed)return(e=e||{}).save=!0,e.element=o,e.content=r.getContent(e),e.no_events||r.fire("SaveContent",e),"raw"===e.format&&r.fire("RawSaveContent",e),t=e.content,/TEXTAREA|INPUT/i.test(o.nodeName)?o.value=t:(!e.is_removing&&r.inline||(o.innerHTML=t),(n=qw.getParent(r.id,"form"))&&Ww(n.elements,function(e){if(e.name===r.id)return e.value=t,!1})),e.element=o=null,!1!==e.set_dirty&&r.setDirty(!1),t},setContent:function(e,t){return zw(this,e,t)},getContent:function(e){return t=this,void 0===(n=e)&&(n={}),A.from(t.getBody()).fold(q("tree"===n.format?new Zb("body",11):""),function(e){return Pw(t,n,e)});var t,n},insertContent:function(e,t){t&&(e=$w({content:e},t)),this.execCommand("mceInsertContent",!1,e)},isDirty:function(){return!this.isNotDirty},setDirty:function(e){var t=!this.isNotDirty;this.isNotDirty=!e,e&&e!==t&&this.fire("dirty")},setMode:function(e){var t,n;(n=e)!==wp(t=this)&&(t.initialized?xp(t,"readonly"===n):t.on("init",function(){xp(t,"readonly"===n)}),hp(t,n))},getContainer:function(){return this.container||(this.container=qw.get(this.editorContainer||this.id+"_parent")),this.container},getContentAreaContainer:function(){return this.contentAreaContainer},getElement:function(){return this.targetElm||(this.targetElm=qw.get(this.id)),this.targetElm},getWin:function(){var e;return this.contentWindow||(e=this.iframeElement)&&(this.contentWindow=e.contentWindow),this.contentWindow},getDoc:function(){var e;return this.contentDocument||(e=this.getWin())&&(this.contentDocument=e.document),this.contentDocument},getBody:function(){var e=this.getDoc();return this.bodyElement||(e?e.body:null)},convertURL:function(e,t,n){var r=this.settings;return r.urlconverter_callback?this.execCallback("urlconverter_callback",e,n,!0,t):!r.convert_urls||n&&"LINK"===n.nodeName||0===e.indexOf("file:")||0===e.length?e:r.relative_urls?this.documentBaseURI.toRelative(e):e=this.documentBaseURI.toAbsolute(e,r.remove_script_host)},addVisual:function(e){var n,r=this,o=r.settings,i=r.dom;e=e||r.getBody(),r.hasVisual===undefined&&(r.hasVisual=o.visual),Ww(i.select("table,a",e),function(e){var t;switch(e.nodeName){case"TABLE":return n=o.visual_table_class||"mce-item-table",void((t=i.getAttrib(e,"border"))&&"0"!==t||!r.hasVisual?i.removeClass(e,n):i.addClass(e,n));case"A":return void(i.getAttrib(e,"href")||(t=i.getAttrib(e,"name")||e.id,n=o.visual_anchor_class||"mce-item-anchor",t&&r.hasVisual?i.addClass(e,n):i.removeClass(e,n)))}}),r.fire("VisualAid",{element:e,hasVisual:r.hasVisual})},remove:function(){Hw(this)},destroy:function(e){jw(this,e)},uploadImages:function(e){return this.editorUpload.uploadImages(e)},_scanForImages:function(){return this.editorUpload.scanForImages()}},Ap);var Gw,Jw,Qw,Zw={isEditorUIElement:function(e){return-1!==e.className.toString().indexOf("mce-")}},eN=function(n,e){var t,r;rr.detect().browser.isIE()?(r=n).on("focusout",function(){Gg(r)}):(t=e,n.on("mouseup touchend",function(e){t.throttle()})),n.on("keyup nodechange",function(e){var t;"nodechange"===(t=e).type&&t.selectionChange||Gg(n)})},tN=function(e){var t,n,r,o=Ii(function(){Gg(e)},0);e.inline&&(t=e,n=o,r=function(){n.throttle()},bi.DOM.bind(H.document,"mouseup",r),t.on("remove",function(){bi.DOM.unbind(H.document,"mouseup",r)})),e.on("init",function(){eN(e,o)}),e.on("remove",function(){o.cancel()})},nN=bi.DOM,rN=function(e){return Zw.isEditorUIElement(e)},oN=function(t,e){var n=t?t.settings.custom_ui_selector:"";return null!==nN.getParent(e,function(e){return rN(e)||!!n&&t.dom.is(e,n)})},iN=function(r,e){var t=e.editor;tN(t),t.on("focusin",function(){var e=r.focusedEditor;e!==this&&(e&&e.fire("blur",{focusedEditor:this}),r.setActive(this),(r.focusedEditor=this).fire("focus",{blurredEditor:e}),this.focus(!0))}),t.on("focusout",function(){var t=this;ye.setEditorTimeout(t,function(){var e=r.focusedEditor;oN(t,function(){try{return H.document.activeElement}catch(e){return H.document.body}}())||e!==t||(t.fire("blur",{focusedEditor:null}),r.focusedEditor=null)})}),Gw||(Gw=function(e){var t,n=r.activeEditor;t=e.target,n&&t.ownerDocument===H.document&&(t===H.document.body||oN(n,t)||r.focusedEditor!==n||(n.fire("blur",{focusedEditor:null}),r.focusedEditor=null))},nN.bind(H.document,"focusin",Gw))},aN=function(e,t){e.focusedEditor===t.editor&&(e.focusedEditor=null),e.activeEditor||(nN.unbind(H.document,"focusin",Gw),Gw=null)},uN=function(e){e.on("AddEditor",d(iN,e)),e.on("RemoveEditor",d(aN,e))},sN=bi.DOM,cN=Jt.explode,lN=Jt.each,fN=Jt.extend,dN=0,mN=!1,gN=[],pN=[],hN=function(t){var n=t.type;lN(Qw.get(),function(e){switch(n){case"scroll":e.fire("ScrollWindow",t);break;case"resize":e.fire("ResizeWindow",t)}})},vN=function(e){e!==mN&&(e?vn(window).on("resize scroll",hN):vn(window).off("resize scroll",hN),mN=e)},bN=function(t){var e=pN;delete gN[t.id];for(var n=0;n<gN.length;n++)if(gN[n]===t){gN.splice(n,1);break}return pN=V(pN,function(e){return t!==e}),Qw.activeEditor===t&&(Qw.activeEditor=0<pN.length?pN[0]:null),Qw.focusedEditor===t&&(Qw.focusedEditor=null),e.length!==pN.length};fN(Qw={defaultSettings:{},$:vn,majorVersion:"4",minorVersion:"9.5",releaseDate:"2019-07-02",editors:gN,i18n:mh,activeEditor:null,settings:{},setup:function(){var e,t,n,r,o="";if(t=Ow.getDocumentBaseUrl(H.document.location),/^[^:]+:\/\/\/?[^\/]+\//.test(t)&&(t=t.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,""),/[\/\\]$/.test(t)||(t+="/")),n=window.tinymce||window.tinyMCEPreInit)e=n.base||n.baseURL,o=n.suffix;else{for(var i=H.document.getElementsByTagName("script"),a=0;a<i.length;a++){var u=(r=i[a].src).substring(r.lastIndexOf("/"));if(/tinymce(\.full|\.jquery|)(\.min|\.dev|)\.js/.test(r)){-1!==u.indexOf(".min")&&(o=".min"),e=r.substring(0,r.lastIndexOf("/"));break}}!e&&H.document.currentScript&&(-1!==(r=H.document.currentScript.src).indexOf(".min")&&(o=".min"),e=r.substring(0,r.lastIndexOf("/")))}this.baseURL=new Ow(t).toAbsolute(e),this.documentBaseURL=t,this.baseURI=new Ow(this.baseURL),this.suffix=o,uN(this)},overrideDefaults:function(e){var t,n;(t=e.base_url)&&(this.baseURL=new Ow(this.documentBaseURL).toAbsolute(t.replace(/\/+$/,"")),this.baseURI=new Ow(this.baseURL)),n=e.suffix,e.suffix&&(this.suffix=n);var r=(this.defaultSettings=e).plugin_base_urls;for(var o in r)ki.PluginManager.urls[o]=r[o]},init:function(r){var n,u,s=this;u=Jt.makeMap("area base basefont br col frame hr img input isindex link meta param embed source wbr track colgroup option tbody tfoot thead tr script noscript style textarea video audio iframe object menu"," ");var c=function(e){var t=e.id;return t||(t=(t=e.name)&&!sN.get(t)?e.name:sN.uniqueId(),e.setAttribute("id",t)),t},l=function(e,t){return t.constructor===RegExp?t.test(e.className):sN.hasClass(e,t)},f=function(e){n=e},e=function(){var o,i=0,a=[],n=function(e,t,n){var r=new Yw(e,t,s);a.push(r),r.on("init",function(){++i===o.length&&f(a)}),r.targetElm=r.targetElm||n,r.render()};sN.unbind(window,"ready",e),function(e){var t=r[e];t&&t.apply(s,Array.prototype.slice.call(arguments,2))}("onpageload"),o=vn.unique(function(t){var e,n=[];if(ge.ie&&ge.ie<11)return yh.initError("TinyMCE does not support the browser you are using. For a list of supported browsers please see: https://www.tinymce.com/docs/get-started/system-requirements/"),[];if(t.types)return lN(t.types,function(e){n=n.concat(sN.select(e.selector))}),n;if(t.selector)return sN.select(t.selector);if(t.target)return[t.target];switch(t.mode){case"exact":0<(e=t.elements||"").length&&lN(cN(e),function(t){var e;(e=sN.get(t))?n.push(e):lN(H.document.forms,function(e){lN(e.elements,function(e){e.name===t&&(t="mce_editor_"+dN++,sN.setAttrib(e,"id",t),n.push(e))})})});break;case"textareas":case"specific_textareas":lN(sN.select("textarea"),function(e){t.editor_deselector&&l(e,t.editor_deselector)||t.editor_selector&&!l(e,t.editor_selector)||n.push(e)})}return n}(r)),r.types?lN(r.types,function(t){Jt.each(o,function(e){return!sN.is(e,t.selector)||(n(c(e),fN({},r,t),e),!1)})}):(Jt.each(o,function(e){var t;(t=s.get(e.id))&&t.initialized&&!(t.getContainer()||t.getBody()).parentNode&&(bN(t),t.unbindAllNativeEvents(),t.destroy(!0),t.removed=!0,t=null)}),0===(o=Jt.grep(o,function(e){return!s.get(e.id)})).length?f([]):lN(o,function(e){var t;t=e,r.inline&&t.tagName.toLowerCase()in u?yh.initError("Could not initialize inline editor on invalid inline target element",e):n(c(e),r,e)}))};return s.settings=r,sN.bind(window,"ready",e),new pe(function(t){n?t(n):f=function(e){t(e)}})},get:function(t){return 0===arguments.length?pN.slice(0):R(t)?Y(pN,function(e){return e.id===t}).getOr(null):I(t)&&pN[t]?pN[t]:null},add:function(e){var t=this;return gN[e.id]===e||(null===t.get(e.id)&&("length"!==e.id&&(gN[e.id]=e),gN.push(e),pN.push(e)),vN(!0),t.activeEditor=e,t.fire("AddEditor",{editor:e}),Jw||(Jw=function(){t.fire("BeforeUnload")},sN.bind(window,"beforeunload",Jw))),e},createEditor:function(e,t){return this.add(new Yw(e,t,this))},remove:function(e){var t,n,r=this;if(e){if(!R(e))return n=e,B(r.get(n.id))?null:(bN(n)&&r.fire("RemoveEditor",{editor:n}),0===pN.length&&sN.unbind(window,"beforeunload",Jw),n.remove(),vN(0<pN.length),n);lN(sN.select(e),function(e){(n=r.get(e.id))&&r.remove(n)})}else for(t=pN.length-1;0<=t;t--)r.remove(pN[t])},execCommand:function(e,t,n){var r=this.get(n);switch(e){case"mceAddEditor":return this.get(n)||new Yw(n,this.settings,this).render(),!0;case"mceRemoveEditor":return r&&r.remove(),!0;case"mceToggleEditor":return r?r.isHidden()?r.show():r.hide():this.execCommand("mceAddEditor",0,n),!0}return!!this.activeEditor&&this.activeEditor.execCommand(e,t,n)},triggerSave:function(){lN(pN,function(e){e.save()})},addI18n:function(e,t){mh.add(e,t)},translate:function(e){return mh.translate(e)},setActive:function(e){var t=this.activeEditor;this.activeEditor!==e&&(t&&t.fire("deactivate",{relatedTarget:e}),e.fire("activate",{relatedTarget:t})),this.activeEditor=e}},fp),Qw.setup();var yN,CN=Qw;function xN(n){return{walk:function(e,t){return _c(n,e,t)},split:Im,normalize:function(t){return wg(n,t).fold(q(!1),function(e){return t.setStart(e.startContainer,e.startOffset),t.setEnd(e.endContainer,e.endOffset),!0})}}}(yN=xN||(xN={})).compareRanges=pg,yN.getCaretRangeFromPoint=Ty,yN.getSelectedNode=$a,yN.getNode=Wa;var wN,NN,EN=xN,SN=Math.min,kN=Math.max,TN=Math.round,AN=function(e,t,n){var r,o,i,a,u,s;return r=t.x,o=t.y,i=e.w,a=e.h,u=t.w,s=t.h,"b"===(n=(n||"").split(""))[0]&&(o+=s),"r"===n[1]&&(r+=u),"c"===n[0]&&(o+=TN(s/2)),"c"===n[1]&&(r+=TN(u/2)),"b"===n[3]&&(o-=a),"r"===n[4]&&(r-=i),"c"===n[3]&&(o-=TN(a/2)),"c"===n[4]&&(r-=TN(i/2)),RN(r,o,i,a)},RN=function(e,t,n,r){return{x:e,y:t,w:n,h:r}},_N={inflate:function(e,t,n){return RN(e.x-t,e.y-n,e.w+2*t,e.h+2*n)},relativePosition:AN,findBestRelativePosition:function(e,t,n,r){var o,i;for(i=0;i<r.length;i++)if((o=AN(e,t,r[i])).x>=n.x&&o.x+o.w<=n.w+n.x&&o.y>=n.y&&o.y+o.h<=n.h+n.y)return r[i];return null},intersect:function(e,t){var n,r,o,i;return n=kN(e.x,t.x),r=kN(e.y,t.y),o=SN(e.x+e.w,t.x+t.w),i=SN(e.y+e.h,t.y+t.h),o-n<0||i-r<0?null:RN(n,r,o-n,i-r)},clamp:function(e,t,n){var r,o,i,a,u,s,c,l,f,d;return u=e.x,s=e.y,c=e.x+e.w,l=e.y+e.h,f=t.x+t.w,d=t.y+t.h,r=kN(0,t.x-u),o=kN(0,t.y-s),i=kN(0,c-f),a=kN(0,l-d),u+=r,s+=o,n&&(c+=r,l+=o,u-=i,s-=a),RN(u,s,(c-=i)-u,(l-=a)-s)},create:RN,fromClientRect:function(e){return RN(e.left,e.top,e.width,e.height)}},DN={},BN={add:function(e,t){DN[e.toLowerCase()]=t},has:function(e){return!!DN[e.toLowerCase()]},get:function(e){var t=e.toLowerCase(),n=DN.hasOwnProperty(t)?DN[t]:null;if(null===n)throw new Error("Could not find module for type: "+e);return n},create:function(e,t){var n;if("string"==typeof e?(t=t||{}).type=e:e=(t=e).type,e=e.toLowerCase(),!(n=DN[e]))throw new Error("Could not find control by type: "+e);return(n=new n(t)).type=e,n}},ON=Jt.each,PN=Jt.extend,IN=function(){};IN.extend=wN=function(n){var e,t,r,o=this.prototype,i=function(){var e,t,n;if(!NN&&(this.init&&this.init.apply(this,arguments),t=this.Mixins))for(e=t.length;e--;)(n=t[e]).init&&n.init.apply(this,arguments)},a=function(){return this},u=function(n,r){return function(){var e,t=this._super;return this._super=o[n],e=r.apply(this,arguments),this._super=t,e}};for(t in NN=!0,e=new this,NN=!1,n.Mixins&&(ON(n.Mixins,function(e){for(var t in e)"init"!==t&&(n[t]=e[t])}),o.Mixins&&(n.Mixins=o.Mixins.concat(n.Mixins))),n.Methods&&ON(n.Methods.split(","),function(e){n[e]=a}),n.Properties&&ON(n.Properties.split(","),function(e){var t="_"+e;n[e]=function(e){return e!==undefined?(this[t]=e,this):this[t]}}),n.Statics&&ON(n.Statics,function(e,t){i[t]=e}),n.Defaults&&o.Defaults&&(n.Defaults=PN({},o.Defaults,n.Defaults)),n)"function"==typeof(r=n[t])&&o[t]?e[t]=u(t,r):e[t]=r;return i.prototype=e,(i.constructor=i).extend=wN,i};var LN=Math.min,MN=Math.max,FN=Math.round,zN=function(e,n){var r,o,t,i;if(n=n||'"',null===e)return"null";if("string"==(t=typeof e))return o="\bb\tt\nn\ff\rr\"\"''\\\\",n+e.replace(/([\u0080-\uFFFF\x00-\x1f\"\'\\])/g,function(e,t){return'"'===n&&"'"===e?e:(r=o.indexOf(t))+1?"\\"+o.charAt(r+1):(e=t.charCodeAt().toString(16),"\\u"+"0000".substring(e.length)+e)})+n;if("object"===t){if(e.hasOwnProperty&&"[object Array]"===Object.prototype.toString.call(e)){for(r=0,o="[";r<e.length;r++)o+=(0<r?",":"")+zN(e[r],n);return o+"]"}for(i in o="{",e)e.hasOwnProperty(i)&&(o+="function"!=typeof e[i]?(1<o.length?","+n:n)+i+n+":"+zN(e[i],n):"");return o+"}"}return""+e},UN={serialize:zN,parse:function(e){try{return JSON.parse(e)}catch(t){}}},VN={callbacks:{},count:0,send:function(t){var n=this,r=bi.DOM,o=t.count!==undefined?t.count:n.count,i="tinymce_jsonp_"+o;n.callbacks[o]=function(e){r.remove(i),delete n.callbacks[o],t.callback(e)},r.add(r.doc.body,"script",{id:i,src:t.url,type:"text/javascript"}),n.count++}},HN={send:function(e){var t,n=0,r=function(){!e.async||4===t.readyState||1e4<n++?(e.success&&n<1e4&&200===t.status?e.success.call(e.success_scope,""+t.responseText,t,e):e.error&&e.error.call(e.error_scope,1e4<n?"TIMED_OUT":"GENERAL",t,e),t=null):setTimeout(r,10)};if(e.scope=e.scope||this,e.success_scope=e.success_scope||e.scope,e.error_scope=e.error_scope||e.scope,e.async=!1!==e.async,e.data=e.data||"",HN.fire("beforeInitialize",{settings:e}),t=wh()){if(t.overrideMimeType&&t.overrideMimeType(e.content_type),t.open(e.type||(e.data?"POST":"GET"),e.url,e.async),e.crossDomain&&(t.withCredentials=!0),e.content_type&&t.setRequestHeader("Content-Type",e.content_type),e.requestheaders&&Jt.each(e.requestheaders,function(e){t.setRequestHeader(e.key,e.value)}),t.setRequestHeader("X-Requested-With","XMLHttpRequest"),(t=HN.fire("beforeSend",{xhr:t,settings:e}).xhr).send(e.data),!e.async)return r();setTimeout(r,10)}}};Jt.extend(HN,fp);var jN,qN,$N,WN,KN=Jt.extend,XN=function(e){this.settings=KN({},e),this.count=0};XN.sendRPC=function(e){return(new XN).send(e)},XN.prototype={send:function(n){var r=n.error,o=n.success;(n=KN(this.settings,n)).success=function(e,t){void 0===(e=UN.parse(e))&&(e={error:"JSON Parse error."}),e.error?r.call(n.error_scope||n.scope,e.error,t):o.call(n.success_scope||n.scope,e.result)},n.error=function(e,t){r&&r.call(n.error_scope||n.scope,e,t)},n.data=UN.serialize({id:n.id||"c"+this.count++,method:n.method,params:n.params}),n.content_type="application/json",HN.send(n)}};try{jN=H.window.localStorage}catch(ZN){qN={},$N=[],WN={getItem:function(e){var t=qN[e];return t||null},setItem:function(e,t){$N.push(e),qN[e]=String(t)},key:function(e){return $N[e]},removeItem:function(t){$N=$N.filter(function(e){return e===t}),delete qN[t]},clear:function(){$N=[],qN={}},length:0},Object.defineProperty(WN,"length",{get:function(){return $N.length},configurable:!1,enumerable:!1}),jN=WN}var YN,GN=CN,JN={geom:{Rect:_N},util:{Promise:pe,Delay:ye,Tools:Jt,VK:xv,URI:Ow,Class:IN,EventDispatcher:sp,Observable:fp,I18n:mh,XHR:HN,JSON:UN,JSONRequest:XN,JSONP:VN,LocalStorage:jN,Color:function(e){var n={},u=0,s=0,c=0,t=function(e){var t;return"object"==typeof e?"r"in e?(u=e.r,s=e.g,c=e.b):"v"in e&&function(e,t,n){var r,o,i,a;if(e=(parseInt(e,10)||0)%360,t=parseInt(t,10)/100,n=parseInt(n,10)/100,t=MN(0,LN(t,1)),n=MN(0,LN(n,1)),0!==t){switch(r=e/60,i=(o=n*t)*(1-Math.abs(r%2-1)),a=n-o,Math.floor(r)){case 0:u=o,s=i,c=0;break;case 1:u=i,s=o,c=0;break;case 2:u=0,s=o,c=i;break;case 3:u=0,s=i,c=o;break;case 4:u=i,s=0,c=o;break;case 5:u=o,s=0,c=i;break;default:u=s=c=0}u=FN(255*(u+a)),s=FN(255*(s+a)),c=FN(255*(c+a))}else u=s=c=FN(255*n)}(e.h,e.s,e.v):(t=/rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)[^\)]*\)/gi.exec(e))?(u=parseInt(t[1],10),s=parseInt(t[2],10),c=parseInt(t[3],10)):(t=/#([0-F]{2})([0-F]{2})([0-F]{2})/gi.exec(e))?(u=parseInt(t[1],16),s=parseInt(t[2],16),c=parseInt(t[3],16)):(t=/#([0-F])([0-F])([0-F])/gi.exec(e))&&(u=parseInt(t[1]+t[1],16),s=parseInt(t[2]+t[2],16),c=parseInt(t[3]+t[3],16)),u=u<0?0:255<u?255:u,s=s<0?0:255<s?255:s,c=c<0?0:255<c?255:c,n};return e&&t(e),n.toRgb=function(){return{r:u,g:s,b:c}},n.toHsv=function(){return e=u,t=s,n=c,o=0,(i=LN(e/=255,LN(t/=255,n/=255)))===(a=MN(e,MN(t,n)))?{h:0,s:0,v:100*(o=i)}:(r=(a-i)/a,{h:FN(60*((e===i?3:n===i?1:5)-(e===i?t-n:n===i?e-t:n-e)/((o=a)-i))),s:FN(100*r),v:FN(100*o)});var e,t,n,r,o,i,a},n.toHex=function(){var e=function(e){return 1<(e=parseInt(e,10).toString(16)).length?e:"0"+e};return"#"+e(u)+e(s)+e(c)},n.parse=t,n}},dom:{EventUtils:Ae,Sizzle:At,DomQuery:vn,TreeWalker:ao,DOMUtils:bi,ScriptLoader:Ni,RangeUtils:EN,Serializer:py,ControlSelection:wy,BookmarkManager:yy,Selection:tC,Event:Ae.Event},html:{Styles:ui,Entities:Xo,Node:Zb,Schema:ii,SaxParser:Rv,DomParser:ly,Writer:Zc,Serializer:el},ui:{Factory:BN},Env:ge,AddOnManager:ki,Annotator:Mc,Formatter:Vb,UndoManager:Xv,EditorCommands:ap,WindowManager:lh,NotificationManager:ch,EditorObservable:Ap,Shortcuts:qp,Editor:Yw,FocusManager:Zw,EditorManager:CN,DOM:bi.DOM,ScriptLoader:Ni.ScriptLoader,PluginManager:ki.PluginManager,ThemeManager:ki.ThemeManager,trim:Jt.trim,isArray:Jt.isArray,is:Jt.is,toArray:Jt.toArray,makeMap:Jt.makeMap,each:Jt.each,map:Jt.map,grep:Jt.grep,inArray:Jt.inArray,extend:Jt.extend,create:Jt.create,walk:Jt.walk,createNS:Jt.createNS,resolve:Jt.resolve,explode:Jt.explode,_addCacheSuffix:Jt._addCacheSuffix,isOpera:ge.opera,isWebKit:ge.webkit,isIE:ge.ie,isGecko:ge.gecko,isMac:ge.mac},QN=GN=Jt.extend(GN,JN);YN=QN,window.tinymce=YN,window.tinyMCE=YN,function(e){if("object"==typeof module)try{module.exports=e}catch(t){}}(QN)}(window);
\ No newline at end of file
+// 4.9.10 (2020-04-23)
+!function(V){"use strict";var o=function(){},H=function(n,r){return function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return n(r.apply(null,e))}},q=function(e){return function(){return e}},$=function(e){return e};function d(r){for(var o=[],e=1;e<arguments.length;e++)o[e-1]=arguments[e];return function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n=o.concat(e);return r.apply(null,n)}}var e,t,n,r,i,a,u,s,c,l,f,m,g,p,h,v,y=function(n){return function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return!n.apply(null,e)}},b=q(!1),C=q(!0),x=function(){return w},w=(e=function(e){return e.isNone()},r={fold:function(e,t){return e()},is:b,isSome:b,isNone:C,getOr:n=function(e){return e},getOrThunk:t=function(e){return e()},getOrDie:function(e){throw new Error(e||"error: getOrDie called on none.")},getOrNull:q(null),getOrUndefined:q(undefined),or:n,orThunk:t,map:x,each:o,bind:x,exists:b,forall:C,filter:x,equals:e,equals_:e,toArray:function(){return[]},toString:q("none()")},Object.freeze&&Object.freeze(r),r),N=function(n){var e=q(n),t=function(){return o},r=function(e){return e(n)},o={fold:function(e,t){return t(n)},is:function(e){return n===e},isSome:C,isNone:b,getOr:e,getOrThunk:e,getOrDie:e,getOrNull:e,getOrUndefined:e,or:t,orThunk:t,map:function(e){return N(e(n))},each:function(e){e(n)},bind:r,exists:r,forall:r,filter:function(e){return e(n)?o:w},toArray:function(){return[n]},toString:function(){return"some("+n+")"},equals:function(e){return e.is(n)},equals_:function(e,t){return e.fold(b,function(e){return t(n,e)})}};return o},_={some:N,none:x,from:function(e){return null===e||e===undefined?w:N(e)}},E=function(t){return function(e){return function(e){if(null===e)return"null";var t=typeof e;return"object"===t&&(Array.prototype.isPrototypeOf(e)||e.constructor&&"Array"===e.constructor.name)?"array":"object"===t&&(String.prototype.isPrototypeOf(e)||e.constructor&&"String"===e.constructor.name)?"string":t}(e)===t}},S=E("string"),T=E("object"),k=E("array"),A=E("null"),R=E("boolean"),D=E("function"),O=E("number"),B=Array.prototype.slice,P=Array.prototype.indexOf,I=Array.prototype.push,L=function(e,t){return P.call(e,t)},F=function(e,t){return-1<L(e,t)},M=function(e,t){for(var n=0,r=e.length;n<r;n++)if(t(e[n],n))return!0;return!1},W=function(e,t){for(var n=e.length,r=new Array(n),o=0;o<n;o++){var i=e[o];r[o]=t(i,o)}return r},z=function(e,t){for(var n=0,r=e.length;n<r;n++)t(e[n],n)},K=function(e,t){for(var n=[],r=[],o=0,i=e.length;o<i;o++){var a=e[o];(t(a,o)?n:r).push(a)}return{pass:n,fail:r}},U=function(e,t){for(var n=[],r=0,o=e.length;r<o;r++){var i=e[r];t(i,r)&&n.push(i)}return n},j=function(e,t,n){return z(e,function(e){n=t(n,e)}),n},X=function(e,t){for(var n=0,r=e.length;n<r;n++){var o=e[n];if(t(o,n))return _.some(o)}return _.none()},Y=function(e,t){for(var n=0,r=e.length;n<r;n++)if(t(e[n],n))return _.some(n);return _.none()},G=function(e,t){return function(e){for(var t=[],n=0,r=e.length;n<r;++n){if(!k(e[n]))throw new Error("Arr.flatten item "+n+" was not an array, input: "+e);I.apply(t,e[n])}return t}(W(e,t))},J=function(e,t){for(var n=0,r=e.length;n<r;++n)if(!0!==t(e[n],n))return!1;return!0},Q=function(e,t){return U(e,function(e){return!F(t,e)})},Z=function(e){return 0===e.length?_.none():_.some(e[0])},ee=function(e){return 0===e.length?_.none():_.some(e[e.length-1])},te=D(Array.from)?Array.from:function(e){return B.call(e)},ne="undefined"!=typeof V.window?V.window:Function("return this;")(),re=function(e,t){return function(e,t){for(var n=t!==undefined&&null!==t?t:ne,r=0;r<e.length&&n!==undefined&&null!==n;++r)n=n[e[r]];return n}(e.split("."),t)},oe={getOrDie:function(e,t){var n=re(e,t);if(n===undefined||null===n)throw new Error(e+" not available on this browser");return n}},ie=function(){return oe.getOrDie("URL")},ae={createObjectURL:function(e){return ie().createObjectURL(e)},revokeObjectURL:function(e){ie().revokeObjectURL(e)}},ue=V.navigator,se=ue.userAgent,ce=function(e){return"matchMedia"in V.window&&V.matchMedia(e).matches};m=/Android/.test(se),a=(a=!(i=/WebKit/.test(se))&&/MSIE/gi.test(se)&&/Explorer/gi.test(ue.appName))&&/MSIE (\w+)\./.exec(se)[1],u=-1!==se.indexOf("Trident/")&&(-1!==se.indexOf("rv:")||-1!==ue.appName.indexOf("Netscape"))&&11,s=-1!==se.indexOf("Edge/")&&!a&&!u&&12,a=a||u||s,c=!i&&!u&&/Gecko/.test(se),l=-1!==se.indexOf("Mac"),f=/(iPad|iPhone)/.test(se),g="FormData"in V.window&&"FileReader"in V.window&&"URL"in V.window&&!!ae.createObjectURL,p=ce("only screen and (max-device-width: 480px)")&&(m||f),h=ce("only screen and (min-width: 800px)")&&(m||f),v=-1!==se.indexOf("Windows Phone"),s&&(i=!1);var le,fe={opera:!1,webkit:i,ie:a,gecko:c,mac:l,iOS:f,android:m,contentEditable:!f||g||534<=parseInt(se.match(/AppleWebKit\/(\d*)/)[1],10),transparentSrc:"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7",caretAfter:8!==a,range:V.window.getSelection&&"Range"in V.window,documentMode:a&&!s?V.document.documentMode||7:10,fileApi:g,ceFalse:!1===a||8<a,cacheSuffix:null,container:null,overrideViewPort:null,experimentalShadowDom:!1,canHaveCSP:!1===a||11<a,desktop:!p&&!h,windowsPhone:v},de=window.Promise?window.Promise:function(){function r(e,t){return function(){e.apply(t,arguments)}}var e=Array.isArray||function(e){return"[object Array]"===Object.prototype.toString.call(e)},i=function(e){if("object"!=typeof this)throw new TypeError("Promises must be constructed via new");if("function"!=typeof e)throw new TypeError("not a function");this._state=null,this._value=null,this._deferreds=[],l(e,r(o,this),r(u,this))},t=i.immediateFn||"function"==typeof setImmediate&&setImmediate||function(e){setTimeout(e,1)};function a(r){var o=this;null!==this._state?t(function(){var e=o._state?r.onFulfilled:r.onRejected;if(null!==e){var t;try{t=e(o._value)}catch(n){return void r.reject(n)}r.resolve(t)}else(o._state?r.resolve:r.reject)(o._value)}):this._deferreds.push(r)}function o(e){try{if(e===this)throw new TypeError("A promise cannot be resolved with itself.");if(e&&("object"==typeof e||"function"==typeof e)){var t=e.then;if("function"==typeof t)return void l(r(t,e),r(o,this),r(u,this))}this._state=!0,this._value=e,s.call(this)}catch(n){u.call(this,n)}}function u(e){this._state=!1,this._value=e,s.call(this)}function s(){for(var e=0,t=this._deferreds.length;e<t;e++)a.call(this,this._deferreds[e]);this._deferreds=null}function c(e,t,n,r){this.onFulfilled="function"==typeof e?e:null,this.onRejected="function"==typeof t?t:null,this.resolve=n,this.reject=r}function l(e,t,n){var r=!1;try{e(function(e){r||(r=!0,t(e))},function(e){r||(r=!0,n(e))})}catch(o){if(r)return;r=!0,n(o)}}return i.prototype["catch"]=function(e){return this.then(null,e)},i.prototype.then=function(n,r){var o=this;return new i(function(e,t){a.call(o,new c(n,r,e,t))})},i.all=function(){var s=Array.prototype.slice.call(1===arguments.length&&e(arguments[0])?arguments[0]:arguments);return new i(function(o,i){if(0===s.length)return o([]);var a=s.length;function u(t,e){try{if(e&&("object"==typeof e||"function"==typeof e)){var n=e.then;if("function"==typeof n)return void n.call(e,function(e){u(t,e)},i)}s[t]=e,0==--a&&o(s)}catch(r){i(r)}}for(var e=0;e<s.length;e++)u(e,s[e])})},i.resolve=function(t){return t&&"object"==typeof t&&t.constructor===i?t:new i(function(e){e(t)})},i.reject=function(n){return new i(function(e,t){t(n)})},i.race=function(o){return new i(function(e,t){for(var n=0,r=o.length;n<r;n++)o[n].then(e,t)})},i}(),me=function(e,t){return"number"!=typeof t&&(t=0),setTimeout(e,t)},ge=function(e,t){return"number"!=typeof t&&(t=1),setInterval(e,t)},pe=function(t,n){var r,e;return(e=function(){var e=arguments;clearTimeout(r),r=me(function(){t.apply(this,e)},n)}).stop=function(){clearTimeout(r)},e},he={requestAnimationFrame:function(e,t){le?le.then(e):le=new de(function(e){t||(t=V.document.body),function(e,t){var n,r=V.window.requestAnimationFrame,o=["ms","moz","webkit"];for(n=0;n<o.length&&!r;n++)r=V.window[o[n]+"RequestAnimationFrame"];r||(r=function(e){V.window.setTimeout(e,0)}),r(e,t)}(e,t)}).then(e)},setTimeout:me,setInterval:ge,setEditorTimeout:function(e,t,n){return me(function(){e.removed||t()},n)},setEditorInterval:function(e,t,n){var r;return r=ge(function(){e.removed?clearInterval(r):t()},n)},debounce:pe,throttle:pe,clearInterval:function(e){return clearInterval(e)},clearTimeout:function(e){return clearTimeout(e)}},ve=/^(?:mouse|contextmenu)|click/,ye={keyLocation:1,layerX:1,layerY:1,returnValue:1,webkitMovementX:1,webkitMovementY:1,keyIdentifier:1},be=function(){return!1},Ce=function(){return!0},xe=function(e,t,n,r){e.addEventListener?e.addEventListener(t,n,r||!1):e.attachEvent&&e.attachEvent("on"+t,n)},we=function(e,t,n,r){e.removeEventListener?e.removeEventListener(t,n,r||!1):e.detachEvent&&e.detachEvent("on"+t,n)},Ne=function(e,t){var n,r,o=t||{};for(n in e)ye[n]||(o[n]=e[n]);if(o.target||(o.target=o.srcElement||V.document),fe.experimentalShadowDom&&(o.target=function(e,t){if(e.composedPath){var n=e.composedPath();if(n&&0<n.length)return n[0]}return t}(e,o.target)),e&&ve.test(e.type)&&e.pageX===undefined&&e.clientX!==undefined){var i=o.target.ownerDocument||V.document,a=i.documentElement,u=i.body;o.pageX=e.clientX+(a&&a.scrollLeft||u&&u.scrollLeft||0)-(a&&a.clientLeft||u&&u.clientLeft||0),o.pageY=e.clientY+(a&&a.scrollTop||u&&u.scrollTop||0)-(a&&a.clientTop||u&&u.clientTop||0)}return o.preventDefault=function(){o.isDefaultPrevented=Ce,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},o.stopPropagation=function(){o.isPropagationStopped=Ce,e&&(e.stopPropagation?e.stopPropagation():e.cancelBubble=!0)},!(o.stopImmediatePropagation=function(){o.isImmediatePropagationStopped=Ce,o.stopPropagation()})==((r=o).isDefaultPrevented===Ce||r.isDefaultPrevented===be)&&(o.isDefaultPrevented=be,o.isPropagationStopped=be,o.isImmediatePropagationStopped=be),"undefined"==typeof o.metaKey&&(o.metaKey=!1),o},Ee=function(e,t,n){var r=e.document,o={type:"ready"};if(n.domLoaded)t(o);else{var i=function(){return"complete"===r.readyState||"interactive"===r.readyState&&r.body},a=function(){n.domLoaded||(n.domLoaded=!0,t(o))},u=function(){i()&&(we(r,"readystatechange",u),a())},s=function(){try{r.documentElement.doScroll("left")}catch(e){return void he.setTimeout(s)}a()};!r.addEventListener||fe.ie&&fe.ie<11?(xe(r,"readystatechange",u),r.documentElement.doScroll&&e.self===e.top&&s()):i()?a():xe(e,"DOMContentLoaded",a),xe(e,"load",a)}},Se=function(){var m,g,p,h,v,y=this,b={};g="mce-data-"+(+new Date).toString(32),h="onmouseenter"in V.document.documentElement,p="onfocusin"in V.document.documentElement,v={mouseenter:"mouseover",mouseleave:"mouseout"},m=1,y.domLoaded=!1,y.events=b;var C=function(e,t){var n,r,o,i,a=b[t];if(n=a&&a[e.type])for(r=0,o=n.length;r<o;r++)if((i=n[r])&&!1===i.func.call(i.scope,e)&&e.preventDefault(),e.isImmediatePropagationStopped())return};y.bind=function(e,t,n,r){var o,i,a,u,s,c,l,f=V.window,d=function(e){C(Ne(e||f.event),o)};if(e&&3!==e.nodeType&&8!==e.nodeType){for(e[g]?o=e[g]:(o=m++,e[g]=o,b[o]={}),r=r||e,a=(t=t.split(" ")).length;a--;)c=d,s=l=!1,"DOMContentLoaded"===(u=t[a])&&(u="ready"),y.domLoaded&&"ready"===u&&"complete"===e.readyState?n.call(r,Ne({type:u})):(h||(s=v[u])&&(c=function(e){var t,n;if(t=e.currentTarget,(n=e.relatedTarget)&&t.contains)n=t.contains(n);else for(;n&&n!==t;)n=n.parentNode;n||((e=Ne(e||f.event)).type="mouseout"===e.type?"mouseleave":"mouseenter",e.target=t,C(e,o))}),p||"focusin"!==u&&"focusout"!==u||(l=!0,s="focusin"===u?"focus":"blur",c=function(e){(e=Ne(e||f.event)).type="focus"===e.type?"focusin":"focusout",C(e,o)}),(i=b[o][u])?"ready"===u&&y.domLoaded?n({type:u}):i.push({func:n,scope:r}):(b[o][u]=i=[{func:n,scope:r}],i.fakeName=s,i.capture=l,i.nativeHandler=c,"ready"===u?Ee(e,c,y):xe(e,s||u,c,l)));return e=i=0,n}},y.unbind=function(e,t,n){var r,o,i,a,u,s;if(!e||3===e.nodeType||8===e.nodeType)return y;if(r=e[g]){if(s=b[r],t){for(i=(t=t.split(" ")).length;i--;)if(o=s[u=t[i]]){if(n)for(a=o.length;a--;)if(o[a].func===n){var c=o.nativeHandler,l=o.fakeName,f=o.capture;(o=o.slice(0,a).concat(o.slice(a+1))).nativeHandler=c,o.fakeName=l,o.capture=f,s[u]=o}n&&0!==o.length||(delete s[u],we(e,o.fakeName||u,o.nativeHandler,o.capture))}}else{for(u in s)o=s[u],we(e,o.fakeName||u,o.nativeHandler,o.capture);s={}}for(u in s)return y;delete b[r];try{delete e[g]}catch(d){e[g]=null}}return y},y.fire=function(e,t,n){var r;if(!e||3===e.nodeType||8===e.nodeType)return y;for((n=Ne(null,n)).type=t,n.target=e;(r=e[g])&&C(n,r),(e=e.parentNode||e.ownerDocument||e.defaultView||e.parentWindow)&&!n.isPropagationStopped(););return y},y.clean=function(e){var t,n,r=y.unbind;if(!e||3===e.nodeType||8===e.nodeType)return y;if(e[g]&&r(e),e.getElementsByTagName||(e=e.document),e&&e.getElementsByTagName)for(r(e),t=(n=e.getElementsByTagName("*")).length;t--;)(e=n[t])[g]&&r(e);return y},y.destroy=function(){b={}},y.cancel=function(e){return e&&(e.preventDefault(),e.stopImmediatePropagation()),!1}};Se.Event=new Se,Se.Event.bind(V.window,"ready",function(){});var Te,ke,_e,Ae,Re,De,Oe,Be,Pe,Ie,Le,Fe,Me,ze,Ue,je,Ve,He,qe="sizzle"+-new Date,$e=V.window.document,We=0,Ke=0,Xe=Tt(),Ye=Tt(),Ge=Tt(),Je=function(e,t){return e===t&&(Le=!0),0},Qe=typeof undefined,Ze={}.hasOwnProperty,et=[],tt=et.pop,nt=et.push,rt=et.push,ot=et.slice,it=et.indexOf||function(e){for(var t=0,n=this.length;t<n;t++)if(this[t]===e)return t;return-1},at="[\\x20\\t\\r\\n\\f]",ut="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",st="\\["+at+"*("+ut+")(?:"+at+"*([*^$|!~]?=)"+at+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+ut+"))|)"+at+"*\\]",ct=":("+ut+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+st+")*)|.*)\\)|)",lt=new RegExp("^"+at+"+|((?:^|[^\\\\])(?:\\\\.)*)"+at+"+$","g"),ft=new RegExp("^"+at+"*,"+at+"*"),dt=new RegExp("^"+at+"*([>+~]|"+at+")"+at+"*"),mt=new RegExp("="+at+"*([^\\]'\"]*?)"+at+"*\\]","g"),gt=new RegExp(ct),pt=new RegExp("^"+ut+"$"),ht={ID:new RegExp("^#("+ut+")"),CLASS:new RegExp("^\\.("+ut+")"),TAG:new RegExp("^("+ut+"|[*])"),ATTR:new RegExp("^"+st),PSEUDO:new RegExp("^"+ct),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+at+"*(even|odd|(([+-]|)(\\d*)n|)"+at+"*(?:([+-]|)"+at+"*(\\d+)|))"+at+"*\\)|)","i"),bool:new RegExp("^(?:checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped)$","i"),needsContext:new RegExp("^"+at+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+at+"*((?:-\\d)?\\d*)"+at+"*\\)|)(?=[^-]|$)","i")},vt=/^(?:input|select|textarea|button)$/i,yt=/^h\d$/i,bt=/^[^{]+\{\s*\[native \w/,Ct=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,xt=/[+~]/,wt=/'|\\/g,Nt=new RegExp("\\\\([\\da-f]{1,6}"+at+"?|("+at+")|.)","ig"),Et=function(e,t,n){var r="0x"+t-65536;return r!=r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)};try{rt.apply(et=ot.call($e.childNodes),$e.childNodes),et[$e.childNodes.length].nodeType}catch(iE){rt={apply:et.length?function(e,t){nt.apply(e,ot.call(t))}:function(e,t){for(var n=e.length,r=0;e[n++]=t[r++];);e.length=n-1}}}var St=function(e,t,n,r){var o,i,a,u,s,c,l,f,d,m;if((t?t.ownerDocument||t:$e)!==Me&&Fe(t),n=n||[],!e||"string"!=typeof e)return n;if(1!==(u=(t=t||Me).nodeType)&&9!==u)return[];if(Ue&&!r){if(o=Ct.exec(e))if(a=o[1]){if(9===u){if(!(i=t.getElementById(a))||!i.parentNode)return n;if(i.id===a)return n.push(i),n}else if(t.ownerDocument&&(i=t.ownerDocument.getElementById(a))&&He(t,i)&&i.id===a)return n.push(i),n}else{if(o[2])return rt.apply(n,t.getElementsByTagName(e)),n;if((a=o[3])&&ke.getElementsByClassName)return rt.apply(n,t.getElementsByClassName(a)),n}if(ke.qsa&&(!je||!je.test(e))){if(f=l=qe,d=t,m=9===u&&e,1===u&&"object"!==t.nodeName.toLowerCase()){for(c=De(e),(l=t.getAttribute("id"))?f=l.replace(wt,"\\$&"):t.setAttribute("id",f),f="[id='"+f+"'] ",s=c.length;s--;)c[s]=f+Pt(c[s]);d=xt.test(e)&&Ot(t.parentNode)||t,m=c.join(",")}if(m)try{return rt.apply(n,d.querySelectorAll(m)),n}catch(g){}finally{l||t.removeAttribute("id")}}}return Be(e.replace(lt,"$1"),t,n,r)};function Tt(){var r=[];return function e(t,n){return r.push(t+" ")>_e.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function kt(e){return e[qe]=!0,e}function _t(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||1<<31)-(~e.sourceIndex||1<<31);if(r)return r;if(n)for(;n=n.nextSibling;)if(n===t)return-1;return e?1:-1}function At(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function Rt(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function Dt(a){return kt(function(i){return i=+i,kt(function(e,t){for(var n,r=a([],e.length,i),o=r.length;o--;)e[n=r[o]]&&(e[n]=!(t[n]=e[n]))})})}function Ot(e){return e&&typeof e.getElementsByTagName!==Qe&&e}for(Te in ke=St.support={},Re=St.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return!!t&&"HTML"!==t.nodeName},Fe=St.setDocument=function(e){var t,s=e?e.ownerDocument||e:$e,n=s.defaultView;return s!==Me&&9===s.nodeType&&s.documentElement?(ze=(Me=s).documentElement,Ue=!Re(s),n&&n!==function(e){try{return e.top}catch(t){}return null}(n)&&(n.addEventListener?n.addEventListener("unload",function(){Fe()},!1):n.attachEvent&&n.attachEvent("onunload",function(){Fe()})),ke.attributes=!0,ke.getElementsByTagName=!0,ke.getElementsByClassName=bt.test(s.getElementsByClassName),ke.getById=!0,_e.find.ID=function(e,t){if(typeof t.getElementById!==Qe&&Ue){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},_e.filter.ID=function(e){var t=e.replace(Nt,Et);return function(e){return e.getAttribute("id")===t}},_e.find.TAG=ke.getElementsByTagName?function(e,t){if(typeof t.getElementsByTagName!==Qe)return t.getElementsByTagName(e)}:function(e,t){var n,r=[],o=0,i=t.getElementsByTagName(e);if("*"===e){for(;n=i[o++];)1===n.nodeType&&r.push(n);return r}return i},_e.find.CLASS=ke.getElementsByClassName&&function(e,t){if(Ue)return t.getElementsByClassName(e)},Ve=[],je=[],ke.disconnectedMatch=!0,je=je.length&&new RegExp(je.join("|")),Ve=Ve.length&&new RegExp(Ve.join("|")),t=bt.test(ze.compareDocumentPosition),He=t||bt.test(ze.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)for(;t=t.parentNode;)if(t===e)return!0;return!1},Je=t?function(e,t){if(e===t)return Le=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!ke.sortDetached&&t.compareDocumentPosition(e)===n?e===s||e.ownerDocument===$e&&He($e,e)?-1:t===s||t.ownerDocument===$e&&He($e,t)?1:Ie?it.call(Ie,e)-it.call(Ie,t):0:4&n?-1:1)}:function(e,t){if(e===t)return Le=!0,0;var n,r=0,o=e.parentNode,i=t.parentNode,a=[e],u=[t];if(!o||!i)return e===s?-1:t===s?1:o?-1:i?1:Ie?it.call(Ie,e)-it.call(Ie,t):0;if(o===i)return _t(e,t);for(n=e;n=n.parentNode;)a.unshift(n);for(n=t;n=n.parentNode;)u.unshift(n);for(;a[r]===u[r];)r++;return r?_t(a[r],u[r]):a[r]===$e?-1:u[r]===$e?1:0},s):Me},St.matches=function(e,t){return St(e,null,null,t)},St.matchesSelector=function(e,t){if((e.ownerDocument||e)!==Me&&Fe(e),t=t.replace(mt,"='$1']"),ke.matchesSelector&&Ue&&(!Ve||!Ve.test(t))&&(!je||!je.test(t)))try{var n=(void 0).call(e,t);if(n||ke.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(iE){}return 0<St(t,Me,null,[e]).length},St.contains=function(e,t){return(e.ownerDocument||e)!==Me&&Fe(e),He(e,t)},St.attr=function(e,t){(e.ownerDocument||e)!==Me&&Fe(e);var n=_e.attrHandle[t.toLowerCase()],r=n&&Ze.call(_e.attrHandle,t.toLowerCase())?n(e,t,!Ue):undefined;return r!==undefined?r:ke.attributes||!Ue?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},St.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},St.uniqueSort=function(e){var t,n=[],r=0,o=0;if(Le=!ke.detectDuplicates,Ie=!ke.sortStable&&e.slice(0),e.sort(Je),Le){for(;t=e[o++];)t===e[o]&&(r=n.push(o));for(;r--;)e.splice(n[r],1)}return Ie=null,e},Ae=St.getText=function(e){var t,n="",r=0,o=e.nodeType;if(o){if(1===o||9===o||11===o){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=Ae(e)}else if(3===o||4===o)return e.nodeValue}else for(;t=e[r++];)n+=Ae(t);return n},(_e=St.selectors={cacheLength:50,createPseudo:kt,match:ht,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(Nt,Et),e[3]=(e[3]||e[4]||e[5]||"").replace(Nt,Et),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||St.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&St.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return ht.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&gt.test(n)&&(t=De(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(Nt,Et).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=Xe[e+" "];return t||(t=new RegExp("(^|"+at+")"+e+"("+at+"|$)"))&&Xe(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==Qe&&e.getAttribute("class")||"")})},ATTR:function(n,r,o){return function(e){var t=St.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===o:"!="===r?t!==o:"^="===r?o&&0===t.indexOf(o):"*="===r?o&&-1<t.indexOf(o):"$="===r?o&&t.slice(-o.length)===o:"~="===r?-1<(" "+t+" ").indexOf(o):"|="===r&&(t===o||t.slice(0,o.length+1)===o+"-"))}},CHILD:function(m,e,t,g,p){var h="nth"!==m.slice(0,3),v="last"!==m.slice(-4),y="of-type"===e;return 1===g&&0===p?function(e){return!!e.parentNode}:function(e,t,n){var r,o,i,a,u,s,c=h!==v?"nextSibling":"previousSibling",l=e.parentNode,f=y&&e.nodeName.toLowerCase(),d=!n&&!y;if(l){if(h){for(;c;){for(i=e;i=i[c];)if(y?i.nodeName.toLowerCase()===f:1===i.nodeType)return!1;s=c="only"===m&&!s&&"nextSibling"}return!0}if(s=[v?l.firstChild:l.lastChild],v&&d){for(u=(r=(o=l[qe]||(l[qe]={}))[m]||[])[0]===We&&r[1],a=r[0]===We&&r[2],i=u&&l.childNodes[u];i=++u&&i&&i[c]||(a=u=0)||s.pop();)if(1===i.nodeType&&++a&&i===e){o[m]=[We,u,a];break}}else if(d&&(r=(e[qe]||(e[qe]={}))[m])&&r[0]===We)a=r[1];else for(;(i=++u&&i&&i[c]||(a=u=0)||s.pop())&&((y?i.nodeName.toLowerCase()!==f:1!==i.nodeType)||!++a||(d&&((i[qe]||(i[qe]={}))[m]=[We,a]),i!==e)););return(a-=p)===g||a%g==0&&0<=a/g}}},PSEUDO:function(e,i){var t,a=_e.pseudos[e]||_e.setFilters[e.toLowerCase()]||St.error("unsupported pseudo: "+e);return a[qe]?a(i):1<a.length?(t=[e,e,"",i],_e.setFilters.hasOwnProperty(e.toLowerCase())?kt(function(e,t){for(var n,r=a(e,i),o=r.length;o--;)e[n=it.call(e,r[o])]=!(t[n]=r[o])}):function(e){return a(e,0,t)}):a}},pseudos:{not:kt(function(e){var r=[],o=[],u=Oe(e.replace(lt,"$1"));return u[qe]?kt(function(e,t,n,r){for(var o,i=u(e,null,r,[]),a=e.length;a--;)(o=i[a])&&(e[a]=!(t[a]=o))}):function(e,t,n){return r[0]=e,u(r,null,n,o),!o.pop()}}),has:kt(function(t){return function(e){return 0<St(t,e).length}}),contains:kt(function(t){return t=t.replace(Nt,Et),function(e){return-1<(e.textContent||e.innerText||Ae(e)).indexOf(t)}}),lang:kt(function(n){return pt.test(n||"")||St.error("unsupported lang: "+n),n=n.replace(Nt,Et).toLowerCase(),function(e){var t;do{if(t=Ue?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=V.window.location&&V.window.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===ze},focus:function(e){return e===Me.activeElement&&(!Me.hasFocus||Me.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return!1===e.disabled},disabled:function(e){return!0===e.disabled},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!_e.pseudos.empty(e)},header:function(e){return yt.test(e.nodeName)},input:function(e){return vt.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:Dt(function(){return[0]}),last:Dt(function(e,t){return[t-1]}),eq:Dt(function(e,t,n){return[n<0?n+t:n]}),even:Dt(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:Dt(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:Dt(function(e,t,n){for(var r=n<0?n+t:n;0<=--r;)e.push(r);return e}),gt:Dt(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=_e.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})_e.pseudos[Te]=At(Te);for(Te in{submit:!0,reset:!0})_e.pseudos[Te]=Rt(Te);function Bt(){}function Pt(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function It(a,e,t){var u=e.dir,s=t&&"parentNode"===u,c=Ke++;return e.first?function(e,t,n){for(;e=e[u];)if(1===e.nodeType||s)return a(e,t,n)}:function(e,t,n){var r,o,i=[We,c];if(n){for(;e=e[u];)if((1===e.nodeType||s)&&a(e,t,n))return!0}else for(;e=e[u];)if(1===e.nodeType||s){if((r=(o=e[qe]||(e[qe]={}))[u])&&r[0]===We&&r[1]===c)return i[2]=r[2];if((o[u]=i)[2]=a(e,t,n))return!0}}}function Lt(o){return 1<o.length?function(e,t,n){for(var r=o.length;r--;)if(!o[r](e,t,n))return!1;return!0}:o[0]}function Ft(e,t,n,r,o){for(var i,a=[],u=0,s=e.length,c=null!=t;u<s;u++)(i=e[u])&&(n&&!n(i,r,o)||(a.push(i),c&&t.push(u)));return a}function Mt(m,g,p,h,v,e){return h&&!h[qe]&&(h=Mt(h)),v&&!v[qe]&&(v=Mt(v,e)),kt(function(e,t,n,r){var o,i,a,u=[],s=[],c=t.length,l=e||function(e,t,n){for(var r=0,o=t.length;r<o;r++)St(e,t[r],n);return n}(g||"*",n.nodeType?[n]:n,[]),f=!m||!e&&g?l:Ft(l,u,m,n,r),d=p?v||(e?m:c||h)?[]:t:f;if(p&&p(f,d,n,r),h)for(o=Ft(d,s),h(o,[],n,r),i=o.length;i--;)(a=o[i])&&(d[s[i]]=!(f[s[i]]=a));if(e){if(v||m){if(v){for(o=[],i=d.length;i--;)(a=d[i])&&o.push(f[i]=a);v(null,d=[],o,r)}for(i=d.length;i--;)(a=d[i])&&-1<(o=v?it.call(e,a):u[i])&&(e[o]=!(t[o]=a))}}else d=Ft(d===t?d.splice(c,d.length):d),v?v(null,t,d,r):rt.apply(t,d)})}function zt(e){for(var r,t,n,o=e.length,i=_e.relative[e[0].type],a=i||_e.relative[" "],u=i?1:0,s=It(function(e){return e===r},a,!0),c=It(function(e){return-1<it.call(r,e)},a,!0),l=[function(e,t,n){return!i&&(n||t!==Pe)||((r=t).nodeType?s(e,t,n):c(e,t,n))}];u<o;u++)if(t=_e.relative[e[u].type])l=[It(Lt(l),t)];else{if((t=_e.filter[e[u].type].apply(null,e[u].matches))[qe]){for(n=++u;n<o&&!_e.relative[e[n].type];n++);return Mt(1<u&&Lt(l),1<u&&Pt(e.slice(0,u-1).concat({value:" "===e[u-2].type?"*":""})).replace(lt,"$1"),t,u<n&&zt(e.slice(u,n)),n<o&&zt(e=e.slice(n)),n<o&&Pt(e))}l.push(t)}return Lt(l)}Bt.prototype=_e.filters=_e.pseudos,_e.setFilters=new Bt,De=St.tokenize=function(e,t){var n,r,o,i,a,u,s,c=Ye[e+" "];if(c)return t?0:c.slice(0);for(a=e,u=[],s=_e.preFilter;a;){for(i in n&&!(r=ft.exec(a))||(r&&(a=a.slice(r[0].length)||a),u.push(o=[])),n=!1,(r=dt.exec(a))&&(n=r.shift(),o.push({value:n,type:r[0].replace(lt," ")}),a=a.slice(n.length)),_e.filter)!(r=ht[i].exec(a))||s[i]&&!(r=s[i](r))||(n=r.shift(),o.push({value:n,type:i,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?St.error(e):Ye(e,u).slice(0)},Oe=St.compile=function(e,t){var n,h,v,y,b,r,o=[],i=[],a=Ge[e+" "];if(!a){for(t||(t=De(e)),n=t.length;n--;)(a=zt(t[n]))[qe]?o.push(a):i.push(a);(a=Ge(e,(h=i,y=0<(v=o).length,b=0<h.length,r=function(e,t,n,r,o){var i,a,u,s=0,c="0",l=e&&[],f=[],d=Pe,m=e||b&&_e.find.TAG("*",o),g=We+=null==d?1:Math.random()||.1,p=m.length;for(o&&(Pe=t!==Me&&t);c!==p&&null!=(i=m[c]);c++){if(b&&i){for(a=0;u=h[a++];)if(u(i,t,n)){r.push(i);break}o&&(We=g)}y&&((i=!u&&i)&&s--,e&&l.push(i))}if(s+=c,y&&c!==s){for(a=0;u=v[a++];)u(l,f,t,n);if(e){if(0<s)for(;c--;)l[c]||f[c]||(f[c]=tt.call(r));f=Ft(f)}rt.apply(r,f),o&&!e&&0<f.length&&1<s+v.length&&St.uniqueSort(r)}return o&&(We=g,Pe=d),l},y?kt(r):r))).selector=e}return a},Be=St.select=function(e,t,n,r){var o,i,a,u,s,c="function"==typeof e&&e,l=!r&&De(e=c.selector||e);if(n=n||[],1===l.length){if(2<(i=l[0]=l[0].slice(0)).length&&"ID"===(a=i[0]).type&&ke.getById&&9===t.nodeType&&Ue&&_e.relative[i[1].type]){if(!(t=(_e.find.ID(a.matches[0].replace(Nt,Et),t)||[])[0]))return n;c&&(t=t.parentNode),e=e.slice(i.shift().value.length)}for(o=ht.needsContext.test(e)?0:i.length;o--&&(a=i[o],!_e.relative[u=a.type]);)if((s=_e.find[u])&&(r=s(a.matches[0].replace(Nt,Et),xt.test(i[0].type)&&Ot(t.parentNode)||t))){if(i.splice(o,1),!(e=r.length&&Pt(i)))return rt.apply(n,r),n;break}}return(c||Oe(e,l))(r,t,!Ue,n,xt.test(e)&&Ot(t.parentNode)||t),n},ke.sortStable=qe.split("").sort(Je).join("")===qe,ke.detectDuplicates=!!Le,Fe(),ke.sortDetached=!0;var Ut=Array.isArray,jt=function(e,t,n){var r,o;if(!e)return 0;if(n=n||e,e.length!==undefined){for(r=0,o=e.length;r<o;r++)if(!1===t.call(n,e[r],r,e))return 0}else for(r in e)if(e.hasOwnProperty(r)&&!1===t.call(n,e[r],r,e))return 0;return 1},Vt=function(e,t,n){var r,o;for(r=0,o=e.length;r<o;r++)if(t.call(n,e[r],r,e))return r;return-1},Ht={isArray:Ut,toArray:function(e){var t,n,r=e;if(!Ut(e))for(r=[],t=0,n=e.length;t<n;t++)r[t]=e[t];return r},each:jt,map:function(n,r){var o=[];return jt(n,function(e,t){o.push(r(e,t,n))}),o},filter:function(n,r){var o=[];return jt(n,function(e,t){r&&!r(e,t,n)||o.push(e)}),o},indexOf:function(e,t){var n,r;if(e)for(n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},reduce:function(e,t,n,r){var o=0;for(arguments.length<3&&(n=e[0]);o<e.length;o++)n=t.call(r,n,e[o],o);return n},findIndex:Vt,find:function(e,t,n){var r=Vt(e,t,n);return-1!==r?e[r]:undefined},last:function(e){return e[e.length-1]}},qt=/^\s*|\s*$/g,$t=function(e){return null===e||e===undefined?"":(""+e).replace(qt,"")},Wt=function(e,t){return t?!("array"!==t||!Ht.isArray(e))||typeof e===t:e!==undefined},Kt=function(e,n,r,o){o=o||this,e&&(r&&(e=e[r]),Ht.each(e,function(e,t){if(!1===n.call(o,e,t,r))return!1;Kt(e,n,r,o)}))},Xt={trim:$t,isArray:Ht.isArray,is:Wt,toArray:Ht.toArray,makeMap:function(e,t,n){var r;for(t=t||",","string"==typeof(e=e||[])&&(e=e.split(t)),n=n||{},r=e.length;r--;)n[e[r]]={};return n},each:Ht.each,map:Ht.map,grep:Ht.filter,inArray:Ht.indexOf,hasOwn:function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},extend:function(e,t){for(var n,r,o,i=[],a=2;a<arguments.length;a++)i[a-2]=arguments[a];var u,s=arguments;for(n=1,r=s.length;n<r;n++)for(o in t=s[n])t.hasOwnProperty(o)&&(u=t[o])!==undefined&&(e[o]=u);return e},create:function(e,t,n){var r,o,i,a,u,s=this,c=0;if(e=/^((static) )?([\w.]+)(:([\w.]+))?/.exec(e),i=e[3].match(/(^|\.)(\w+)$/i)[2],!(o=s.createNS(e[3].replace(/\.\w+$/,""),n))[i]){if("static"===e[2])return o[i]=t,void(this.onCreate&&this.onCreate(e[2],e[3],o[i]));t[i]||(t[i]=function(){},c=1),o[i]=t[i],s.extend(o[i].prototype,t),e[5]&&(r=s.resolve(e[5]).prototype,a=e[5].match(/\.(\w+)$/i)[1],u=o[i],o[i]=c?function(){return r[a].apply(this,arguments)}:function(){return this.parent=r[a],u.apply(this,arguments)},o[i].prototype[i]=o[i],s.each(r,function(e,t){o[i].prototype[t]=r[t]}),s.each(t,function(e,t){r[t]?o[i].prototype[t]=function(){return this.parent=r[t],e.apply(this,arguments)}:t!==i&&(o[i].prototype[t]=e)})),s.each(t["static"],function(e,t){o[i][t]=e})}},walk:Kt,createNS:function(e,t){var n,r;for(t=t||V.window,e=e.split("."),n=0;n<e.length;n++)t[r=e[n]]||(t[r]={}),t=t[r];return t},resolve:function(e,t){var n,r;for(t=t||V.window,n=0,r=(e=e.split(".")).length;n<r&&(t=t[e[n]]);n++);return t},explode:function(e,t){return!e||Wt(e,"array")?e:Ht.map(e.split(t||","),$t)},_addCacheSuffix:function(e){var t=fe.cacheSuffix;return t&&(e+=(-1===e.indexOf("?")?"?":"&")+t),e}},Yt=V.document,Gt=Array.prototype.push,Jt=Array.prototype.slice,Qt=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,Zt=Se.Event,en=Xt.makeMap("children,contents,next,prev"),tn=function(e){return void 0!==e},nn=function(e){return"string"==typeof e},rn=function(e,t){var n,r,o;for(o=(t=t||Yt).createElement("div"),n=t.createDocumentFragment(),o.innerHTML=e;r=o.firstChild;)n.appendChild(r);return n},on=function(e,t,n,r){var o;if(nn(t))t=rn(t,bn(e[0]));else if(t.length&&!t.nodeType){if(t=gn.makeArray(t),r)for(o=t.length-1;0<=o;o--)on(e,t[o],n,r);else for(o=0;o<t.length;o++)on(e,t[o],n,r);return e}if(t.nodeType)for(o=e.length;o--;)n.call(e[o],t);return e},an=function(e,t){return e&&t&&-1!==(" "+e.className+" ").indexOf(" "+t+" ")},un=function(e,t,n){var r,o;return t=gn(t)[0],e.each(function(){var e=this;n&&r===e.parentNode||(r=e.parentNode,o=t.cloneNode(!1),e.parentNode.insertBefore(o,e)),o.appendChild(e)}),e},sn=Xt.makeMap("fillOpacity fontWeight lineHeight opacity orphans widows zIndex zoom"," "),cn=Xt.makeMap("checked compact declare defer disabled ismap multiple nohref noshade nowrap readonly selected"," "),ln={"for":"htmlFor","class":"className",readonly:"readOnly"},fn={"float":"cssFloat"},dn={},mn={},gn=function(e,t){return new gn.fn.init(e,t)},pn=/^\s*|\s*$/g,hn=function(e){return null===e||e===undefined?"":(""+e).replace(pn,"")},vn=function(e,t){var n,r,o,i;if(e)if((n=e.length)===undefined){for(r in e)if(e.hasOwnProperty(r)&&(i=e[r],!1===t.call(i,r,i)))break}else for(o=0;o<n&&(i=e[o],!1!==t.call(i,o,i));o++);return e},yn=function(e,n){var r=[];return vn(e,function(e,t){n(t,e)&&r.push(t)}),r},bn=function(e){return e?9===e.nodeType?e:e.ownerDocument:Yt};gn.fn=gn.prototype={constructor:gn,selector:"",context:null,length:0,init:function(e,t){var n,r,o=this;if(!e)return o;if(e.nodeType)return o.context=o[0]=e,o.length=1,o;if(t&&t.nodeType)o.context=t;else{if(t)return gn(e).attr(t);o.context=t=V.document}if(nn(e)){if(!(n="<"===(o.selector=e).charAt(0)&&">"===e.charAt(e.length-1)&&3<=e.length?[null,e,null]:Qt.exec(e)))return gn(t).find(e);if(n[1])for(r=rn(e,bn(t)).firstChild;r;)Gt.call(o,r),r=r.nextSibling;else{if(!(r=bn(t).getElementById(n[2])))return o;if(r.id!==n[2])return o.find(e);o.length=1,o[0]=r}}else this.add(e,!1);return o},toArray:function(){return Xt.toArray(this)},add:function(e,t){var n,r,o=this;if(nn(e))return o.add(gn(e));if(!1!==t)for(n=gn.unique(o.toArray().concat(gn.makeArray(e))),o.length=n.length,r=0;r<n.length;r++)o[r]=n[r];else Gt.apply(o,gn.makeArray(e));return o},attr:function(t,n){var e,r=this;if("object"==typeof t)vn(t,function(e,t){r.attr(e,t)});else{if(!tn(n)){if(r[0]&&1===r[0].nodeType){if((e=dn[t])&&e.get)return e.get(r[0],t);if(cn[t])return r.prop(t)?t:undefined;null===(n=r[0].getAttribute(t,2))&&(n=undefined)}return n}this.each(function(){var e;if(1===this.nodeType){if((e=dn[t])&&e.set)return void e.set(this,n);null===n?this.removeAttribute(t,2):this.setAttribute(t,n,2)}})}return r},removeAttr:function(e){return this.attr(e,null)},prop:function(e,t){var n=this;if("object"==typeof(e=ln[e]||e))vn(e,function(e,t){n.prop(e,t)});else{if(!tn(t))return n[0]&&n[0].nodeType&&e in n[0]?n[0][e]:t;this.each(function(){1===this.nodeType&&(this[e]=t)})}return n},css:function(n,r){var e,o,i=this,t=function(e){return e.replace(/-(\D)/g,function(e,t){return t.toUpperCase()})},a=function(e){return e.replace(/[A-Z]/g,function(e){return"-"+e})};if("object"==typeof n)vn(n,function(e,t){i.css(e,t)});else if(tn(r))n=t(n),"number"!=typeof r||sn[n]||(r=r.toString()+"px"),i.each(function(){var e=this.style;if((o=mn[n])&&o.set)o.set(this,r);else{try{this.style[fn[n]||n]=r}catch(t){}null!==r&&""!==r||(e.removeProperty?e.removeProperty(a(n)):e.removeAttribute(n))}});else{if(e=i[0],(o=mn[n])&&o.get)return o.get(e);if(!e.ownerDocument.defaultView)return e.currentStyle?e.currentStyle[t(n)]:"";try{return e.ownerDocument.defaultView.getComputedStyle(e,null).getPropertyValue(a(n))}catch(u){return undefined}}return i},remove:function(){for(var e,t=this.length;t--;)e=this[t],Zt.clean(e),e.parentNode&&e.parentNode.removeChild(e);return this},empty:function(){for(var e,t=this.length;t--;)for(e=this[t];e.firstChild;)e.removeChild(e.firstChild);return this},html:function(e){var t,n=this;if(tn(e)){t=n.length;try{for(;t--;)n[t].innerHTML=e}catch(r){gn(n[t]).empty().append(e)}return n}return n[0]?n[0].innerHTML:""},text:function(e){var t,n=this;if(tn(e)){for(t=n.length;t--;)"innerText"in n[t]?n[t].innerText=e:n[0].textContent=e;return n}return n[0]?n[0].innerText||n[0].textContent:""},append:function(){return on(this,arguments,function(e){(1===this.nodeType||this.host&&1===this.host.nodeType)&&this.appendChild(e)})},prepend:function(){return on(this,arguments,function(e){(1===this.nodeType||this.host&&1===this.host.nodeType)&&this.insertBefore(e,this.firstChild)},!0)},before:function(){return this[0]&&this[0].parentNode?on(this,arguments,function(e){this.parentNode.insertBefore(e,this)}):this},after:function(){return this[0]&&this[0].parentNode?on(this,arguments,function(e){this.parentNode.insertBefore(e,this.nextSibling)},!0):this},appendTo:function(e){return gn(e).append(this),this},prependTo:function(e){return gn(e).prepend(this),this},replaceWith:function(e){return this.before(e).remove()},wrap:function(e){return un(this,e)},wrapAll:function(e){return un(this,e,!0)},wrapInner:function(e){return this.each(function(){gn(this).contents().wrapAll(e)}),this},unwrap:function(){return this.parent().each(function(){gn(this).replaceWith(this.childNodes)})},clone:function(){var e=[];return this.each(function(){e.push(this.cloneNode(!0))}),gn(e)},addClass:function(e){return this.toggleClass(e,!0)},removeClass:function(e){return this.toggleClass(e,!1)},toggleClass:function(o,i){var e=this;return"string"!=typeof o||(-1!==o.indexOf(" ")?vn(o.split(" "),function(){e.toggleClass(this,i)}):e.each(function(e,t){var n,r;(r=an(t,o))!==i&&(n=t.className,r?t.className=hn((" "+n+" ").replace(" "+o+" "," ")):t.className+=n?" "+o:o)})),e},hasClass:function(e){return an(this[0],e)},each:function(e){return vn(this,e)},on:function(e,t){return this.each(function(){Zt.bind(this,e,t)})},off:function(e,t){return this.each(function(){Zt.unbind(this,e,t)})},trigger:function(e){return this.each(function(){"object"==typeof e?Zt.fire(this,e.type,e):Zt.fire(this,e)})},show:function(){return this.css("display","")},hide:function(){return this.css("display","none")},slice:function(){return new gn(Jt.apply(this,arguments))},eq:function(e){return-1===e?this.slice(e):this.slice(e,+e+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},find:function(e){var t,n,r=[];for(t=0,n=this.length;t<n;t++)gn.find(e,this[t],r);return gn(r)},filter:function(n){return gn("function"==typeof n?yn(this.toArray(),function(e,t){return n(t,e)}):gn.filter(n,this.toArray()))},closest:function(n){var r=[];return n instanceof gn&&(n=n[0]),this.each(function(e,t){for(;t;){if("string"==typeof n&&gn(t).is(n)){r.push(t);break}if(t===n){r.push(t);break}t=t.parentNode}}),gn(r)},offset:function(e){var t,n,r,o,i=0,a=0;return e?this.css(e):((t=this[0])&&(r=(n=t.ownerDocument).documentElement,t.getBoundingClientRect&&(i=(o=t.getBoundingClientRect()).left+(r.scrollLeft||n.body.scrollLeft)-r.clientLeft,a=o.top+(r.scrollTop||n.body.scrollTop)-r.clientTop)),{left:i,top:a})},push:Gt,sort:[].sort,splice:[].splice},Xt.extend(gn,{extend:Xt.extend,makeArray:function(e){return(t=e)&&t===t.window||e.nodeType?[e]:Xt.toArray(e);var t},inArray:function(e,t){var n;if(t.indexOf)return t.indexOf(e);for(n=t.length;n--;)if(t[n]===e)return n;return-1},isArray:Xt.isArray,each:vn,trim:hn,grep:yn,find:St,expr:St.selectors,unique:St.uniqueSort,text:St.getText,contains:St.contains,filter:function(e,t,n){var r=t.length;for(n&&(e=":not("+e+")");r--;)1!==t[r].nodeType&&t.splice(r,1);return t=1===t.length?gn.find.matchesSelector(t[0],e)?[t[0]]:[]:gn.find.matches(e,t)}});var Cn=function(e,t,n){var r=[],o=e[t];for("string"!=typeof n&&n instanceof gn&&(n=n[0]);o&&9!==o.nodeType;){if(n!==undefined){if(o===n)break;if("string"==typeof n&&gn(o).is(n))break}1===o.nodeType&&r.push(o),o=o[t]}return r},xn=function(e,t,n,r){var o=[];for(r instanceof gn&&(r=r[0]);e;e=e[t])if(!n||e.nodeType===n){if(r!==undefined){if(e===r)break;if("string"==typeof r&&gn(e).is(r))break}o.push(e)}return o},wn=function(e,t,n){for(e=e[t];e;e=e[t])if(e.nodeType===n)return e;return null};vn({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return Cn(e,"parentNode")},next:function(e){return wn(e,"nextSibling",1)},prev:function(e){return wn(e,"previousSibling",1)},children:function(e){return xn(e.firstChild,"nextSibling",1)},contents:function(e){return Xt.toArray(("iframe"===e.nodeName?e.contentDocument||e.contentWindow.document:e).childNodes)}},function(e,r){gn.fn[e]=function(t){var n=[];return this.each(function(){var e=r.call(n,this,t,n);e&&(gn.isArray(e)?n.push.apply(n,e):n.push(e))}),1<this.length&&(en[e]||(n=gn.unique(n)),0===e.indexOf("parents")&&(n=n.reverse())),n=gn(n),t?n.filter(t):n}}),vn({parentsUntil:function(e,t){return Cn(e,"parentNode",t)},nextUntil:function(e,t){return xn(e,"nextSibling",1,t).slice(1)},prevUntil:function(e,t){return xn(e,"previousSibling",1,t).slice(1)}},function(r,o){gn.fn[r]=function(t,e){var n=[];return this.each(function(){var e=o.call(n,this,t,n);e&&(gn.isArray(e)?n.push.apply(n,e):n.push(e))}),1<this.length&&(n=gn.unique(n),0!==r.indexOf("parents")&&"prevUntil"!==r||(n=n.reverse())),n=gn(n),e?n.filter(e):n}}),gn.fn.is=function(e){return!!e&&0<this.filter(e).length},gn.fn.init.prototype=gn.fn,gn.overrideDefaults=function(n){var r,o=function(e,t){return r=r||n(),0===arguments.length&&(e=r.element),t||(t=r.context),new o.fn.init(e,t)};return gn.extend(o,this),o};var Nn=function(n,r,e){vn(e,function(e,t){n[e]=n[e]||{},n[e][r]=t})};fe.ie&&fe.ie<8&&(Nn(dn,"get",{maxlength:function(e){var t=e.maxLength;return 2147483647===t?undefined:t},size:function(e){var t=e.size;return 20===t?undefined:t},"class":function(e){return e.className},style:function(e){var t=e.style.cssText;return 0===t.length?undefined:t}}),Nn(dn,"set",{"class":function(e,t){e.className=t},style:function(e,t){e.style.cssText=t}})),fe.ie&&fe.ie<9&&(fn["float"]="styleFloat",Nn(mn,"set",{opacity:function(e,t){var n=e.style;null===t||""===t?n.removeAttribute("filter"):(n.zoom=1,n.filter="alpha(opacity="+100*t+")")}})),gn.attrHooks=dn,gn.cssHooks=mn;var En,Sn,Tn,kn,_n,An,Rn,Dn=function(e,t){var n=function(e,t){for(var n=0;n<e.length;n++){var r=e[n];if(r.test(t))return r}return undefined}(e,t);if(!n)return{major:0,minor:0};var r=function(e){return Number(t.replace(n,"$"+e))};return Bn(r(1),r(2))},On=function(){return Bn(0,0)},Bn=function(e,t){return{major:e,minor:t}},Pn={nu:Bn,detect:function(e,t){var n=String(t).toLowerCase();return 0===e.length?On():Dn(e,n)},unknown:On},In="Firefox",Ln=function(e,t){return function(){return t===e}},Fn=function(e){var t=e.current;return{current:t,version:e.version,isEdge:Ln("Edge",t),isChrome:Ln("Chrome",t),isIE:Ln("IE",t),isOpera:Ln("Opera",t),isFirefox:Ln(In,t),isSafari:Ln("Safari",t)}},Mn={unknown:function(){return Fn({current:undefined,version:Pn.unknown()})},nu:Fn,edge:q("Edge"),chrome:q("Chrome"),ie:q("IE"),opera:q("Opera"),firefox:q(In),safari:q("Safari")},zn="Windows",Un="Android",jn="Solaris",Vn="FreeBSD",Hn=function(e,t){return function(){return t===e}},qn=function(e){var t=e.current;return{current:t,version:e.version,isWindows:Hn(zn,t),isiOS:Hn("iOS",t),isAndroid:Hn(Un,t),isOSX:Hn("OSX",t),isLinux:Hn("Linux",t),isSolaris:Hn(jn,t),isFreeBSD:Hn(Vn,t)}},$n={unknown:function(){return qn({current:undefined,version:Pn.unknown()})},nu:qn,windows:q(zn),ios:q("iOS"),android:q(Un),linux:q("Linux"),osx:q("OSX"),solaris:q(jn),freebsd:q(Vn)},Wn=function(e,t){var n=String(t).toLowerCase();return X(e,function(e){return e.search(n)})},Kn=function(e,n){return Wn(e,n).map(function(e){var t=Pn.detect(e.versionRegexes,n);return{current:e.name,version:t}})},Xn=function(e,n){return Wn(e,n).map(function(e){var t=Pn.detect(e.versionRegexes,n);return{current:e.name,version:t}})},Yn=function(e,t){return-1!==e.indexOf(t)},Gn=function(e){return e.replace(/^\s+|\s+$/g,"")},Jn=function(e){return e.replace(/\s+$/g,"")},Qn=/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,Zn=function(t){return function(e){return Yn(e,t)}},er=[{name:"Edge",versionRegexes:[/.*?edge\/ ?([0-9]+)\.([0-9]+)$/],search:function(e){return Yn(e,"edge/")&&Yn(e,"chrome")&&Yn(e,"safari")&&Yn(e,"applewebkit")}},{name:"Chrome",versionRegexes:[/.*?chrome\/([0-9]+)\.([0-9]+).*/,Qn],search:function(e){return Yn(e,"chrome")&&!Yn(e,"chromeframe")}},{name:"IE",versionRegexes:[/.*?msie\ ?([0-9]+)\.([0-9]+).*/,/.*?rv:([0-9]+)\.([0-9]+).*/],search:function(e){return Yn(e,"msie")||Yn(e,"trident")}},{name:"Opera",versionRegexes:[Qn,/.*?opera\/([0-9]+)\.([0-9]+).*/],search:Zn("opera")},{name:"Firefox",versionRegexes:[/.*?firefox\/\ ?([0-9]+)\.([0-9]+).*/],search:Zn("firefox")},{name:"Safari",versionRegexes:[Qn,/.*?cpu os ([0-9]+)_([0-9]+).*/],search:function(e){return(Yn(e,"safari")||Yn(e,"mobile/"))&&Yn(e,"applewebkit")}}],tr=[{name:"Windows",search:Zn("win"),versionRegexes:[/.*?windows\ nt\ ?([0-9]+)\.([0-9]+).*/]},{name:"iOS",search:function(e){return Yn(e,"iphone")||Yn(e,"ipad")},versionRegexes:[/.*?version\/\ ?([0-9]+)\.([0-9]+).*/,/.*cpu os ([0-9]+)_([0-9]+).*/,/.*cpu iphone os ([0-9]+)_([0-9]+).*/]},{name:"Android",search:Zn("android"),versionRegexes:[/.*?android\ ?([0-9]+)\.([0-9]+).*/]},{name:"OSX",search:Zn("os x"),versionRegexes:[/.*?os\ x\ ?([0-9]+)_([0-9]+).*/]},{name:"Linux",search:Zn("linux"),versionRegexes:[]},{name:"Solaris",search:Zn("sunos"),versionRegexes:[]},{name:"FreeBSD",search:Zn("freebsd"),versionRegexes:[]}],nr={browsers:q(er),oses:q(tr)},rr=function(e){var t,n,r,o,i,a,u,s,c,l,f,d=nr.browsers(),m=nr.oses(),g=Kn(d,e).fold(Mn.unknown,Mn.nu),p=Xn(m,e).fold($n.unknown,$n.nu);return{browser:g,os:p,deviceType:(n=g,r=e,o=(t=p).isiOS()&&!0===/ipad/i.test(r),i=t.isiOS()&&!o,a=t.isAndroid()&&3===t.version.major,u=t.isAndroid()&&4===t.version.major,s=o||a||u&&!0===/mobile/i.test(r),c=t.isiOS()||t.isAndroid(),l=c&&!s,f=n.isSafari()&&t.isiOS()&&!1===/safari/i.test(r),{isiPad:q(o),isiPhone:q(i),isTablet:q(s),isPhone:q(l),isTouch:q(c),isAndroid:t.isAndroid,isiOS:t.isiOS,isWebView:q(f)})}},or={detect:(En=function(){var e=V.navigator.userAgent;return rr(e)},Tn=!1,function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];return Tn||(Tn=!0,Sn=En.apply(null,e)),Sn})},ir=function(e){if(null===e||e===undefined)throw new Error("Node cannot be null or undefined");return{dom:q(e)}},ar={fromHtml:function(e,t){var n=(t||V.document).createElement("div");if(n.innerHTML=e,!n.hasChildNodes()||1<n.childNodes.length)throw V.console.error("HTML does not have a single root node",e),new Error("HTML must have a single root node");return ir(n.childNodes[0])},fromTag:function(e,t){var n=(t||V.document).createElement(e);return ir(n)},fromText:function(e,t){var n=(t||V.document).createTextNode(e);return ir(n)},fromDom:ir,fromPoint:function(e,t,n){var r=e.dom();return _.from(r.elementFromPoint(t,n)).map(ir)}},ur=(V.Node.ATTRIBUTE_NODE,V.Node.CDATA_SECTION_NODE,V.Node.COMMENT_NODE,V.Node.DOCUMENT_NODE),sr=(V.Node.DOCUMENT_TYPE_NODE,V.Node.DOCUMENT_FRAGMENT_NODE,V.Node.ELEMENT_NODE),cr=V.Node.TEXT_NODE,lr=(V.Node.PROCESSING_INSTRUCTION_NODE,V.Node.ENTITY_REFERENCE_NODE,V.Node.ENTITY_NODE,V.Node.NOTATION_NODE,function(e){return e.dom().nodeName.toLowerCase()}),fr=function(t){return function(e){return e.dom().nodeType===t}},dr=fr(sr),mr=fr(cr),gr=Object.keys,pr=Object.hasOwnProperty,hr=function(e,t){for(var n=gr(e),r=0,o=n.length;r<o;r++){var i=n[r];t(e[i],i)}},vr=function(e,r){var o={};return hr(e,function(e,t){var n=r(e,t);o[n.k]=n.v}),o},yr=function(e,n){var r={},o={};return hr(e,function(e,t){(n(e,t)?r:o)[t]=e}),{t:r,f:o}},br=function(e,t){return pr.call(e,t)},Cr=function(e){return e.style!==undefined&&D(e.style.getPropertyValue)},xr=function(e,t,n){if(!(S(n)||R(n)||O(n)))throw V.console.error("Invalid call to Attr.set. Key ",t,":: Value ",n,":: Element ",e),new Error("Attribute value was not simple");e.setAttribute(t,n+"")},wr=function(e,t,n){xr(e.dom(),t,n)},Nr=function(e,t){var n=e.dom();hr(t,function(e,t){xr(n,t,e)})},Er=function(e,t){var n=e.dom().getAttribute(t);return null===n?undefined:n},Sr=function(e,t){e.dom().removeAttribute(t)},Tr=function(e,t){var n=e.dom();hr(t,function(e,t){!function(e,t,n){if(!S(n))throw V.console.error("Invalid call to CSS.set. Property ",t,":: Value ",n,":: Element ",e),new Error("CSS value must be a string: "+n);Cr(e)&&e.style.setProperty(t,n)}(n,t,e)})},kr=function(e,t){var n,r,o=e.dom(),i=V.window.getComputedStyle(o).getPropertyValue(t),a=""!==i||(r=mr(n=e)?n.dom().parentNode:n.dom())!==undefined&&null!==r&&r.ownerDocument.body.contains(r)?i:_r(o,t);return null===a?undefined:a},_r=function(e,t){return Cr(e)?e.style.getPropertyValue(t):""},Ar=function(){for(var t=[],e=0;e<arguments.length;e++)t[e]=arguments[e];return function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];if(t.length!==n.length)throw new Error('Wrong number of arguments to struct. Expected "['+t.length+']", got '+n.length+" arguments");var r={};return z(t,function(e,t){r[e]=q(n[t])}),r}},Rr=function(e,t){for(var n=[],r=function(e){return n.push(e),t(e)},o=t(e);(o=o.bind(r)).isSome(););return n},Dr=function(){return oe.getOrDie("Node")},Or=function(e,t,n){return 0!=(e.compareDocumentPosition(t)&n)},Br=function(e,t){return Or(e,t,Dr().DOCUMENT_POSITION_CONTAINED_BY)},Pr=sr,Ir=ur,Lr=function(e,t){var n=e.dom();if(n.nodeType!==Pr)return!1;var r=n;if(r.matches!==undefined)return r.matches(t);if(r.msMatchesSelector!==undefined)return r.msMatchesSelector(t);if(r.webkitMatchesSelector!==undefined)return r.webkitMatchesSelector(t);if(r.mozMatchesSelector!==undefined)return r.mozMatchesSelector(t);throw new Error("Browser lacks native selectors")},Fr=function(e){return e.nodeType!==Pr&&e.nodeType!==Ir||0===e.childElementCount},Mr=function(e,t){return e.dom()===t.dom()},zr=or.detect().browser.isIE()?function(e,t){return Br(e.dom(),t.dom())}:function(e,t){var n=e.dom(),r=t.dom();return n!==r&&n.contains(r)},Ur=function(e){return ar.fromDom(e.dom().ownerDocument)},jr=function(e){return ar.fromDom(e.dom().ownerDocument.defaultView)},Vr=function(e){return _.from(e.dom().parentNode).map(ar.fromDom)},Hr=function(e){return _.from(e.dom().previousSibling).map(ar.fromDom)},qr=function(e){return _.from(e.dom().nextSibling).map(ar.fromDom)},$r=function(e){return t=Rr(e,Hr),(n=B.call(t,0)).reverse(),n;var t,n},Wr=function(e){return Rr(e,qr)},Kr=function(e){return W(e.dom().childNodes,ar.fromDom)},Xr=function(e,t){var n=e.dom().childNodes;return _.from(n[t]).map(ar.fromDom)},Yr=function(e){return Xr(e,0)},Gr=function(e){return Xr(e,e.dom().childNodes.length-1)},Jr=(Ar("element","offset"),or.detect().browser),Qr=function(e){return X(e,dr)},Zr={getPos:function(e,t,n){var r,o,i,a=0,u=0,s=e.ownerDocument;if(n=n||e,t){if(n===e&&t.getBoundingClientRect&&"static"===kr(ar.fromDom(e),"position"))return{x:a=(o=t.getBoundingClientRect()).left+(s.documentElement.scrollLeft||e.scrollLeft)-s.documentElement.clientLeft,y:u=o.top+(s.documentElement.scrollTop||e.scrollTop)-s.documentElement.clientTop};for(r=t;r&&r!==n&&r.nodeType;)a+=r.offsetLeft||0,u+=r.offsetTop||0,r=r.offsetParent;for(r=t.parentNode;r&&r!==n&&r.nodeType;)a-=r.scrollLeft||0,u-=r.scrollTop||0,r=r.parentNode;u+=(i=ar.fromDom(t),Jr.isFirefox()&&"table"===lr(i)?Qr(Kr(i)).filter(function(e){return"caption"===lr(e)}).bind(function(o){return Qr(Wr(o)).map(function(e){var t=e.dom().offsetTop,n=o.dom().offsetTop,r=o.dom().offsetHeight;return t<=n?-r:0})}).getOr(0):0)}return{x:a,y:u}}},eo={},to={exports:eo};kn=undefined,_n=eo,An=to,Rn=undefined,function(e){"object"==typeof _n&&void 0!==An?An.exports=e():"function"==typeof kn&&kn.amd?kn([],e):("undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this).EphoxContactWrapper=e()}(function(){return function i(a,u,s){function c(t,e){if(!u[t]){if(!a[t]){var n="function"==typeof Rn&&Rn;if(!e&&n)return n(t,!0);if(l)return l(t,!0);var r=new Error("Cannot find module '"+t+"'");throw r.code="MODULE_NOT_FOUND",r}var o=u[t]={exports:{}};a[t][0].call(o.exports,function(e){return c(a[t][1][e]||e)},o,o.exports,i,a,u,s)}return u[t].exports}for(var l="function"==typeof Rn&&Rn,e=0;e<s.length;e++)c(s[e]);return c}({1:[function(e,t,n){var r,o,i=t.exports={};function a(){throw new Error("setTimeout has not been defined")}function u(){throw new Error("clearTimeout has not been defined")}function s(e){if(r===setTimeout)return setTimeout(e,0);if((r===a||!r)&&setTimeout)return r=setTimeout,setTimeout(e,0);try{return r(e,0)}catch(iE){try{return r.call(null,e,0)}catch(iE){return r.call(this,e,0)}}}!function(){try{r="function"==typeof setTimeout?setTimeout:a}catch(iE){r=a}try{o="function"==typeof clearTimeout?clearTimeout:u}catch(iE){o=u}}();var c,l=[],f=!1,d=-1;function m(){f&&c&&(f=!1,c.length?l=c.concat(l):d=-1,l.length&&g())}function g(){if(!f){var e=s(m);f=!0;for(var t=l.length;t;){for(c=l,l=[];++d<t;)c&&c[d].run();d=-1,t=l.length}c=null,f=!1,function(e){if(o===clearTimeout)return clearTimeout(e);if((o===u||!o)&&clearTimeout)return o=clearTimeout,clearTimeout(e);try{o(e)}catch(iE){try{return o.call(null,e)}catch(iE){return o.call(this,e)}}}(e)}}function p(e,t){this.fun=e,this.array=t}function h(){}i.nextTick=function(e){var t=new Array(arguments.length-1);if(1<arguments.length)for(var n=1;n<arguments.length;n++)t[n-1]=arguments[n];l.push(new p(e,t)),1!==l.length||f||s(g)},p.prototype.run=function(){this.fun.apply(null,this.array)},i.title="browser",i.browser=!0,i.env={},i.argv=[],i.version="",i.versions={},i.on=h,i.addListener=h,i.once=h,i.off=h,i.removeListener=h,i.removeAllListeners=h,i.emit=h,i.prependListener=h,i.prependOnceListener=h,i.listeners=function(e){return[]},i.binding=function(e){throw new Error("process.binding is not supported")},i.cwd=function(){return"/"},i.chdir=function(e){throw new Error("process.chdir is not supported")},i.umask=function(){return 0}},{}],2:[function(e,f,t){(function(n){!function(e){var t=setTimeout;function r(){}function i(e){if("object"!=typeof this)throw new TypeError("Promises must be constructed via new");if("function"!=typeof e)throw new TypeError("not a function");this._state=0,this._handled=!1,this._value=undefined,this._deferreds=[],l(e,this)}function o(n,r){for(;3===n._state;)n=n._value;0!==n._state?(n._handled=!0,i._immediateFn(function(){var e=1===n._state?r.onFulfilled:r.onRejected;if(null!==e){var t;try{t=e(n._value)}catch(iE){return void u(r.promise,iE)}a(r.promise,t)}else(1===n._state?a:u)(r.promise,n._value)})):n._deferreds.push(r)}function a(e,t){try{if(t===e)throw new TypeError("A promise cannot be resolved with itself.");if(t&&("object"==typeof t||"function"==typeof t)){var n=t.then;if(t instanceof i)return e._state=3,e._value=t,void s(e);if("function"==typeof n)return void l((r=n,o=t,function(){r.apply(o,arguments)}),e)}e._state=1,e._value=t,s(e)}catch(iE){u(e,iE)}var r,o}function u(e,t){e._state=2,e._value=t,s(e)}function s(e){2===e._state&&0===e._deferreds.length&&i._immediateFn(function(){e._handled||i._unhandledRejectionFn(e._value)});for(var t=0,n=e._deferreds.length;t<n;t++)o(e,e._deferreds[t]);e._deferreds=null}function c(e,t,n){this.onFulfilled="function"==typeof e?e:null,this.onRejected="function"==typeof t?t:null,this.promise=n}function l(e,t){var n=!1;try{e(function(e){n||(n=!0,a(t,e))},function(e){n||(n=!0,u(t,e))})}catch(r){if(n)return;n=!0,u(t,r)}}i.prototype["catch"]=function(e){return this.then(null,e)},i.prototype.then=function(e,t){var n=new this.constructor(r);return o(this,new c(e,t,n)),n},i.all=function(e){var s=Array.prototype.slice.call(e);return new i(function(o,i){if(0===s.length)return o([]);var a=s.length;function u(t,e){try{if(e&&("object"==typeof e||"function"==typeof e)){var n=e.then;if("function"==typeof n)return void n.call(e,function(e){u(t,e)},i)}s[t]=e,0==--a&&o(s)}catch(r){i(r)}}for(var e=0;e<s.length;e++)u(e,s[e])})},i.resolve=function(t){return t&&"object"==typeof t&&t.constructor===i?t:new i(function(e){e(t)})},i.reject=function(n){return new i(function(e,t){t(n)})},i.race=function(o){return new i(function(e,t){for(var n=0,r=o.length;n<r;n++)o[n].then(e,t)})},i._immediateFn="function"==typeof n?function(e){n(e)}:function(e){t(e,0)},i._unhandledRejectionFn=function(e){"undefined"!=typeof console&&console&&console.warn("Possible Unhandled Promise Rejection:",e)},i._setImmediateFn=function(e){i._immediateFn=e},i._setUnhandledRejectionFn=function(e){i._unhandledRejectionFn=e},void 0!==f&&f.exports?f.exports=i:e.Promise||(e.Promise=i)}(this)}).call(this,e("timers").setImmediate)},{timers:3}],3:[function(s,e,c){(function(e,t){var r=s("process/browser.js").nextTick,n=Function.prototype.apply,o=Array.prototype.slice,i={},a=0;function u(e,t){this._id=e,this._clearFn=t}c.setTimeout=function(){return new u(n.call(setTimeout,window,arguments),clearTimeout)},c.setInterval=function(){return new u(n.call(setInterval,window,arguments),clearInterval)},c.clearTimeout=c.clearInterval=function(e){e.close()},u.prototype.unref=u.prototype.ref=function(){},u.prototype.close=function(){this._clearFn.call(window,this._id)},c.enroll=function(e,t){clearTimeout(e._idleTimeoutId),e._idleTimeout=t},c.unenroll=function(e){clearTimeout(e._idleTimeoutId),e._idleTimeout=-1},c._unrefActive=c.active=function(e){clearTimeout(e._idleTimeoutId);var t=e._idleTimeout;0<=t&&(e._idleTimeoutId=setTimeout(function(){e._onTimeout&&e._onTimeout()},t))},c.setImmediate="function"==typeof e?e:function(e){var t=a++,n=!(arguments.length<2)&&o.call(arguments,1);return i[t]=!0,r(function(){i[t]&&(n?e.apply(null,n):e.call(null),c.clearImmediate(t))}),t},c.clearImmediate="function"==typeof t?t:function(e){delete i[e]}}).call(this,s("timers").setImmediate,s("timers").clearImmediate)},{"process/browser.js":1,timers:3}],4:[function(e,t,n){var r=e("promise-polyfill"),o="undefined"!=typeof window?window:Function("return this;")();t.exports={boltExport:o.Promise||r}},{"promise-polyfill":2}]},{},[4])(4)});var no=to.exports.boltExport,ro=function(e){var n=_.none(),t=[],r=function(e){o()?a(e):t.push(e)},o=function(){return n.isSome()},i=function(e){z(e,a)},a=function(t){n.each(function(e){V.setTimeout(function(){t(e)},0)})};return e(function(e){n=_.some(e),i(t),t=[]}),{get:r,map:function(n){return ro(function(t){r(function(e){t(n(e))})})},isReady:o}},oo={nu:ro,pure:function(t){return ro(function(e){e(t)})}},io=function(e){V.setTimeout(function(){throw e},0)},ao=function(n){var e=function(e){n().then(e,io)};return{map:function(e){return ao(function(){return n().then(e)})},bind:function(t){return ao(function(){return n().then(function(e){return t(e).toPromise()})})},anonBind:function(e){return ao(function(){return n().then(function(){return e.toPromise()})})},toLazy:function(){return oo.nu(e)},toCached:function(){var e=null;return ao(function(){return null===e&&(e=n()),e})},toPromise:n,get:e}},uo={nu:function(e){return ao(function(){return new no(e)})},pure:function(e){return ao(function(){return no.resolve(e)})}},so=function(a,e){return e(function(r){var o=[],i=0;0===a.length?r([]):z(a,function(e,t){var n;e.get((n=t,function(e){o[n]=e,++i>=a.length&&r(o)}))})})},co=function(e){return so(e,uo.nu)},lo=function(n){return{is:function(e){return n===e},isValue:C,isError:b,getOr:q(n),getOrThunk:q(n),getOrDie:q(n),or:function(e){return lo(n)},orThunk:function(e){return lo(n)},fold:function(e,t){return t(n)},map:function(e){return lo(e(n))},mapError:function(e){return lo(n)},each:function(e){e(n)},bind:function(e){return e(n)},exists:function(e){return e(n)},forall:function(e){return e(n)},toOption:function(){return _.some(n)}}},fo=function(n){return{is:b,isValue:b,isError:C,getOr:$,getOrThunk:function(e){return e()},getOrDie:function(){return e=String(n),function(){throw new Error(e)}();var e},or:function(e){return e},orThunk:function(e){return e()},fold:function(e,t){return e(n)},map:function(e){return fo(n)},mapError:function(e){return fo(e(n))},each:o,bind:function(e){return fo(n)},exists:b,forall:C,toOption:_.none}},mo={value:lo,error:fo,fromOption:function(e,t){return e.fold(function(){return fo(t)},lo)}};function go(e,u){var t=e,n=function(e,t,n,r){var o,i;if(e){if(!r&&e[t])return e[t];if(e!==u){if(o=e[n])return o;for(i=e.parentNode;i&&i!==u;i=i.parentNode)if(o=i[n])return o}}};this.current=function(){return t},this.next=function(e){return t=n(t,"firstChild","nextSibling",e)},this.prev=function(e){return t=n(t,"lastChild","previousSibling",e)},this.prev2=function(e){return t=function(e,t,n,r){var o,i,a;if(e){if(o=e[n],u&&o===u)return;if(o){if(!r)for(a=o[t];a;a=a[t])if(!a[t])return a;return o}if((i=e.parentNode)&&i!==u)return i}}(t,"lastChild","previousSibling",e)}}var po,ho,vo,yo=function(t){var n;return function(e){return(n=n||function(e,t){for(var n={},r=0,o=e.length;r<o;r++){var i=e[r];n[String(i)]=t(i,r)}return n}(t,q(!0))).hasOwnProperty(lr(e))}},bo=yo(["h1","h2","h3","h4","h5","h6"]),Co=yo(["article","aside","details","div","dt","figcaption","footer","form","fieldset","header","hgroup","html","main","nav","section","summary","body","p","dl","multicol","dd","figure","address","center","blockquote","h1","h2","h3","h4","h5","h6","listing","xmp","pre","plaintext","menu","dir","ul","ol","li","hr","table","tbody","thead","tfoot","th","tr","td","caption"]),xo=function(e){return dr(e)&&!Co(e)},wo=function(e){return dr(e)&&"br"===lr(e)},No=yo(["h1","h2","h3","h4","h5","h6","p","div","address","pre","form","blockquote","center","dir","fieldset","header","footer","article","section","hgroup","aside","nav","figure"]),Eo=yo(["ul","ol","dl"]),So=yo(["li","dd","dt"]),To=yo(["area","base","basefont","br","col","frame","hr","img","input","isindex","link","meta","param","embed","source","wbr","track"]),ko=yo(["thead","tbody","tfoot"]),_o=yo(["td","th"]),Ao=yo(["pre","script","textarea","style"]),Ro=function(t){return function(e){return!!e&&e.nodeType===t}},Do=Ro(1),Oo=function(e){var r=e.toLowerCase().split(" ");return function(e){var t,n;if(e&&e.nodeType)for(n=e.nodeName.toLowerCase(),t=0;t<r.length;t++)if(n===r[t])return!0;return!1}},Bo=function(t){return function(e){if(Do(e)){if(e.contentEditable===t)return!0;if(e.getAttribute("data-mce-contenteditable")===t)return!0}return!1}},Po=Ro(3),Io=Ro(8),Lo=Ro(9),Fo=Ro(11),Mo=Oo("br"),zo=Bo("true"),Uo=Bo("false"),jo={isText:Po,isElement:Do,isComment:Io,isDocument:Lo,isDocumentFragment:Fo,isBr:Mo,isContentEditableTrue:zo,isContentEditableFalse:Uo,isRestrictedNode:function(e){return!!e&&!Object.getPrototypeOf(e)},matchNodeNames:Oo,hasPropValue:function(t,n){return function(e){return Do(e)&&e[t]===n}},hasAttribute:function(t,e){return function(e){return Do(e)&&e.hasAttribute(t)}},hasAttributeValue:function(t,n){return function(e){return Do(e)&&e.getAttribute(t)===n}},matchStyleValues:function(r,e){var o=e.toLowerCase().split(" ");return function(e){var t;if(Do(e))for(t=0;t<o.length;t++){var n=e.ownerDocument.defaultView.getComputedStyle(e,null);if((n?n.getPropertyValue(r):null)===o[t])return!0}return!1}},isBogus:function(e){return Do(e)&&e.hasAttribute("data-mce-bogus")},isBogusAll:function(e){return Do(e)&&"all"===e.getAttribute("data-mce-bogus")},isTable:function(e){return Do(e)&&"TABLE"===e.tagName}},Vo=function(e){return e&&"SPAN"===e.tagName&&"bookmark"===e.getAttribute("data-mce-type")},Ho=function(e,t){var n,r=t.childNodes;if(!jo.isElement(t)||!Vo(t)){for(n=r.length-1;0<=n;n--)Ho(e,r[n]);if(!1===jo.isDocument(t)){if(jo.isText(t)&&0<t.nodeValue.length){var o=Xt.trim(t.nodeValue).length;if(e.isBlock(t.parentNode)||0<o)return;if(0===o&&(a=(i=t).previousSibling&&"SPAN"===i.previousSibling.nodeName,u=i.nextSibling&&"SPAN"===i.nextSibling.nodeName,a&&u))return}else if(jo.isElement(t)&&(1===(r=t.childNodes).length&&Vo(r[0])&&t.parentNode.insertBefore(r[0],t),r.length||To(ar.fromDom(t))))return;e.remove(t)}var i,a,u;return t}},qo={trimNode:Ho},$o=Xt.makeMap,Wo=/[&<>\"\u0060\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,Ko=/[<>&\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,Xo=/[<>&\"\']/g,Yo=/&#([a-z0-9]+);?|&([a-z0-9]+);/gi,Go={128:"\u20ac",130:"\u201a",131:"\u0192",132:"\u201e",133:"\u2026",134:"\u2020",135:"\u2021",136:"\u02c6",137:"\u2030",138:"\u0160",139:"\u2039",140:"\u0152",142:"\u017d",145:"\u2018",146:"\u2019",147:"\u201c",148:"\u201d",149:"\u2022",150:"\u2013",151:"\u2014",152:"\u02dc",153:"\u2122",154:"\u0161",155:"\u203a",156:"\u0153",158:"\u017e",159:"\u0178"};ho={'"':"&quot;","'":"&#39;","<":"&lt;",">":"&gt;","&":"&amp;","`":"&#96;"},vo={"&lt;":"<","&gt;":">","&amp;":"&","&quot;":'"',"&apos;":"'"};var Jo=function(e,t){var n,r,o,i={};if(e){for(e=e.split(","),t=t||10,n=0;n<e.length;n+=2)r=String.fromCharCode(parseInt(e[n],t)),ho[r]||(o="&"+e[n+1]+";",i[r]=o,i[o]=r);return i}};po=Jo("50,nbsp,51,iexcl,52,cent,53,pound,54,curren,55,yen,56,brvbar,57,sect,58,uml,59,copy,5a,ordf,5b,laquo,5c,not,5d,shy,5e,reg,5f,macr,5g,deg,5h,plusmn,5i,sup2,5j,sup3,5k,acute,5l,micro,5m,para,5n,middot,5o,cedil,5p,sup1,5q,ordm,5r,raquo,5s,frac14,5t,frac12,5u,frac34,5v,iquest,60,Agrave,61,Aacute,62,Acirc,63,Atilde,64,Auml,65,Aring,66,AElig,67,Ccedil,68,Egrave,69,Eacute,6a,Ecirc,6b,Euml,6c,Igrave,6d,Iacute,6e,Icirc,6f,Iuml,6g,ETH,6h,Ntilde,6i,Ograve,6j,Oacute,6k,Ocirc,6l,Otilde,6m,Ouml,6n,times,6o,Oslash,6p,Ugrave,6q,Uacute,6r,Ucirc,6s,Uuml,6t,Yacute,6u,THORN,6v,szlig,70,agrave,71,aacute,72,acirc,73,atilde,74,auml,75,aring,76,aelig,77,ccedil,78,egrave,79,eacute,7a,ecirc,7b,euml,7c,igrave,7d,iacute,7e,icirc,7f,iuml,7g,eth,7h,ntilde,7i,ograve,7j,oacute,7k,ocirc,7l,otilde,7m,ouml,7n,divide,7o,oslash,7p,ugrave,7q,uacute,7r,ucirc,7s,uuml,7t,yacute,7u,thorn,7v,yuml,ci,fnof,sh,Alpha,si,Beta,sj,Gamma,sk,Delta,sl,Epsilon,sm,Zeta,sn,Eta,so,Theta,sp,Iota,sq,Kappa,sr,Lambda,ss,Mu,st,Nu,su,Xi,sv,Omicron,t0,Pi,t1,Rho,t3,Sigma,t4,Tau,t5,Upsilon,t6,Phi,t7,Chi,t8,Psi,t9,Omega,th,alpha,ti,beta,tj,gamma,tk,delta,tl,epsilon,tm,zeta,tn,eta,to,theta,tp,iota,tq,kappa,tr,lambda,ts,mu,tt,nu,tu,xi,tv,omicron,u0,pi,u1,rho,u2,sigmaf,u3,sigma,u4,tau,u5,upsilon,u6,phi,u7,chi,u8,psi,u9,omega,uh,thetasym,ui,upsih,um,piv,812,bull,816,hellip,81i,prime,81j,Prime,81u,oline,824,frasl,88o,weierp,88h,image,88s,real,892,trade,89l,alefsym,8cg,larr,8ch,uarr,8ci,rarr,8cj,darr,8ck,harr,8dl,crarr,8eg,lArr,8eh,uArr,8ei,rArr,8ej,dArr,8ek,hArr,8g0,forall,8g2,part,8g3,exist,8g5,empty,8g7,nabla,8g8,isin,8g9,notin,8gb,ni,8gf,prod,8gh,sum,8gi,minus,8gn,lowast,8gq,radic,8gt,prop,8gu,infin,8h0,ang,8h7,and,8h8,or,8h9,cap,8ha,cup,8hb,int,8hk,there4,8hs,sim,8i5,cong,8i8,asymp,8j0,ne,8j1,equiv,8j4,le,8j5,ge,8k2,sub,8k3,sup,8k4,nsub,8k6,sube,8k7,supe,8kl,oplus,8kn,otimes,8l5,perp,8m5,sdot,8o8,lceil,8o9,rceil,8oa,lfloor,8ob,rfloor,8p9,lang,8pa,rang,9ea,loz,9j0,spades,9j3,clubs,9j5,hearts,9j6,diams,ai,OElig,aj,oelig,b0,Scaron,b1,scaron,bo,Yuml,m6,circ,ms,tilde,802,ensp,803,emsp,809,thinsp,80c,zwnj,80d,zwj,80e,lrm,80f,rlm,80j,ndash,80k,mdash,80o,lsquo,80p,rsquo,80q,sbquo,80s,ldquo,80t,rdquo,80u,bdquo,810,dagger,811,Dagger,81g,permil,81p,lsaquo,81q,rsaquo,85c,euro",32);var Qo=function(e,t){return e.replace(t?Wo:Ko,function(e){return ho[e]||e})},Zo=function(e,t){return e.replace(t?Wo:Ko,function(e){return 1<e.length?"&#"+(1024*(e.charCodeAt(0)-55296)+(e.charCodeAt(1)-56320)+65536)+";":ho[e]||"&#"+e.charCodeAt(0)+";"})},ei=function(e,t,n){return n=n||po,e.replace(t?Wo:Ko,function(e){return ho[e]||n[e]||e})},ti={encodeRaw:Qo,encodeAllRaw:function(e){return(""+e).replace(Xo,function(e){return ho[e]||e})},encodeNumeric:Zo,encodeNamed:ei,getEncodeFunc:function(e,t){var n=Jo(t)||po,r=$o(e.replace(/\+/g,","));return r.named&&r.numeric?function(e,t){return e.replace(t?Wo:Ko,function(e){return ho[e]!==undefined?ho[e]:n[e]!==undefined?n[e]:1<e.length?"&#"+(1024*(e.charCodeAt(0)-55296)+(e.charCodeAt(1)-56320)+65536)+";":"&#"+e.charCodeAt(0)+";"})}:r.named?t?function(e,t){return ei(e,t,n)}:ei:r.numeric?Zo:Qo},decode:function(e){return e.replace(Yo,function(e,t){return t?65535<(t="x"===t.charAt(0).toLowerCase()?parseInt(t.substr(1),16):parseInt(t,10))?(t-=65536,String.fromCharCode(55296+(t>>10),56320+(1023&t))):Go[t]||String.fromCharCode(t):vo[e]||po[e]||(n=e,(r=ar.fromTag("div").dom()).innerHTML=n,r.textContent||r.innerText||n);var n,r})}},ni={},ri={},oi=Xt.makeMap,ii=Xt.each,ai=Xt.extend,ui=Xt.explode,si=Xt.inArray,ci=function(e,t){return(e=Xt.trim(e))?e.split(t||" "):[]},li=function(e){var u,t,n,r,o,i,s={},a=function(e,t,n){var r,o,i,a=function(e,t){var n,r,o={};for(n=0,r=e.length;n<r;n++)o[e[n]]=t||{};return o};for(t=t||"","string"==typeof(n=n||[])&&(n=ci(n)),r=(e=ci(e)).length;r--;)i={attributes:a(o=ci([u,t].join(" "))),attributesOrder:o,children:a(n,ri)},s[e[r]]=i},c=function(e,t){var n,r,o,i;for(n=(e=ci(e)).length,t=ci(t);n--;)for(r=s[e[n]],o=0,i=t.length;o<i;o++)r.attributes[t[o]]={},r.attributesOrder.push(t[o])};return ni[e]?ni[e]:(u="id accesskey class dir lang style tabindex title role",t="address blockquote div dl fieldset form h1 h2 h3 h4 h5 h6 hr menu ol p pre table ul",n="a abbr b bdo br button cite code del dfn em embed i iframe img input ins kbd label map noscript object q s samp script select small span strong sub sup textarea u var #text #comment","html4"!==e&&(u+=" contenteditable contextmenu draggable dropzone hidden spellcheck translate",t+=" article aside details dialog figure main header footer hgroup section nav",n+=" audio canvas command datalist mark meter output picture progress time wbr video ruby bdi keygen"),"html5-strict"!==e&&(u+=" xml:lang",n=[n,i="acronym applet basefont big font strike tt"].join(" "),ii(ci(i),function(e){a(e,"",n)}),t=[t,o="center dir isindex noframes"].join(" "),r=[t,n].join(" "),ii(ci(o),function(e){a(e,"",r)})),r=r||[t,n].join(" "),a("html","manifest","head body"),a("head","","base command link meta noscript script style title"),a("title hr noscript br"),a("base","href target"),a("link","href rel media hreflang type sizes hreflang"),a("meta","name http-equiv content charset"),a("style","media type scoped"),a("script","src async defer type charset"),a("body","onafterprint onbeforeprint onbeforeunload onblur onerror onfocus onhashchange onload onmessage onoffline ononline onpagehide onpageshow onpopstate onresize onscroll onstorage onunload",r),a("address dt dd div caption","",r),a("h1 h2 h3 h4 h5 h6 pre p abbr code var samp kbd sub sup i b u bdo span legend em strong small s cite dfn","",n),a("blockquote","cite",r),a("ol","reversed start type","li"),a("ul","","li"),a("li","value",r),a("dl","","dt dd"),a("a","href target rel media hreflang type",n),a("q","cite",n),a("ins del","cite datetime",r),a("img","src sizes srcset alt usemap ismap width height"),a("iframe","src name width height",r),a("embed","src type width height"),a("object","data type typemustmatch name usemap form width height",[r,"param"].join(" ")),a("param","name value"),a("map","name",[r,"area"].join(" ")),a("area","alt coords shape href target rel media hreflang type"),a("table","border","caption colgroup thead tfoot tbody tr"+("html4"===e?" col":"")),a("colgroup","span","col"),a("col","span"),a("tbody thead tfoot","","tr"),a("tr","","td th"),a("td","colspan rowspan headers",r),a("th","colspan rowspan headers scope abbr",r),a("form","accept-charset action autocomplete enctype method name novalidate target",r),a("fieldset","disabled form name",[r,"legend"].join(" ")),a("label","form for",n),a("input","accept alt autocomplete checked dirname disabled form formaction formenctype formmethod formnovalidate formtarget height list max maxlength min multiple name pattern readonly required size src step type value width"),a("button","disabled form formaction formenctype formmethod formnovalidate formtarget name type value","html4"===e?r:n),a("select","disabled form multiple name required size","option optgroup"),a("optgroup","disabled label","option"),a("option","disabled label selected value"),a("textarea","cols dirname disabled form maxlength name readonly required rows wrap"),a("menu","type label",[r,"li"].join(" ")),a("noscript","",r),"html4"!==e&&(a("wbr"),a("ruby","",[n,"rt rp"].join(" ")),a("figcaption","",r),a("mark rt rp summary bdi","",n),a("canvas","width height",r),a("video","src crossorigin poster preload autoplay mediagroup loop muted controls width height buffered",[r,"track source"].join(" ")),a("audio","src crossorigin preload autoplay mediagroup loop muted controls buffered volume",[r,"track source"].join(" ")),a("picture","","img source"),a("source","src srcset type media sizes"),a("track","kind src srclang label default"),a("datalist","",[n,"option"].join(" ")),a("article section nav aside main header footer","",r),a("hgroup","","h1 h2 h3 h4 h5 h6"),a("figure","",[r,"figcaption"].join(" ")),a("time","datetime",n),a("dialog","open",r),a("command","type label icon disabled checked radiogroup command"),a("output","for form name",n),a("progress","value max",n),a("meter","value min max low high optimum",n),a("details","open",[r,"summary"].join(" ")),a("keygen","autofocus challenge disabled form keytype name")),"html5-strict"!==e&&(c("script","language xml:space"),c("style","xml:space"),c("object","declare classid code codebase codetype archive standby align border hspace vspace"),c("embed","align name hspace vspace"),c("param","valuetype type"),c("a","charset name rev shape coords"),c("br","clear"),c("applet","codebase archive code object alt name width height align hspace vspace"),c("img","name longdesc align border hspace vspace"),c("iframe","longdesc frameborder marginwidth marginheight scrolling align"),c("font basefont","size color face"),c("input","usemap align"),c("select","onchange"),c("textarea"),c("h1 h2 h3 h4 h5 h6 div p legend caption","align"),c("ul","type compact"),c("li","type"),c("ol dl menu dir","compact"),c("pre","width xml:space"),c("hr","align noshade size width"),c("isindex","prompt"),c("table","summary width frame rules cellspacing cellpadding align bgcolor"),c("col","width align char charoff valign"),c("colgroup","width align char charoff valign"),c("thead","align char charoff valign"),c("tr","align char charoff valign bgcolor"),c("th","axis align char charoff valign nowrap bgcolor width height"),c("form","accept"),c("td","abbr axis scope align char charoff valign nowrap bgcolor width height"),c("tfoot","align char charoff valign"),c("tbody","align char charoff valign"),c("area","nohref"),c("body","background bgcolor text link vlink alink")),"html4"!==e&&(c("input button select textarea","autofocus"),c("input textarea","placeholder"),c("a","download"),c("link script img","crossorigin"),c("iframe","sandbox seamless allowfullscreen")),ii(ci("a form meter progress dfn"),function(e){s[e]&&delete s[e].children[e]}),delete s.caption.children.table,delete s.script,ni[e]=s)},fi=function(e,n){var r;return e&&(r={},"string"==typeof e&&(e={"*":e}),ii(e,function(e,t){r[t]=r[t.toUpperCase()]="map"===n?oi(e,/[, ]/):ui(e,/[, ]/)})),r};function di(i){var e,t,n,r,o,a,u,s,c,l,f,d,m,N={},g={},E=[],p={},h={},v=function(e,t,n){var r=i[e];return r?r=oi(r,/[, ]/,oi(r.toUpperCase(),/[, ]/)):(r=ni[e])||(r=oi(t," ",oi(t.toUpperCase()," ")),r=ai(r,n),ni[e]=r),r};n=li((i=i||{}).schema),!1===i.verify_html&&(i.valid_elements="*[*]"),e=fi(i.valid_styles),t=fi(i.invalid_styles,"map"),s=fi(i.valid_classes,"map"),r=v("whitespace_elements","pre script noscript style textarea video audio iframe object code"),o=v("self_closing_elements","colgroup dd dt li option p td tfoot th thead tr"),a=v("short_ended_elements","area base basefont br col frame hr img input isindex link meta param embed source wbr track"),u=v("boolean_attributes","checked compact declare defer disabled ismap multiple nohref noresize noshade nowrap readonly selected autoplay loop controls"),l=v("non_empty_elements","td th iframe video audio object script pre code",a),f=v("move_caret_before_on_enter_elements","table",l),d=v("text_block_elements","h1 h2 h3 h4 h5 h6 p div address pre form blockquote center dir fieldset header footer article section hgroup aside main nav figure"),c=v("block_elements","hr table tbody thead tfoot th tr td li ol ul caption dl dt dd noscript menu isindex option datalist select optgroup figcaption details summary",d),m=v("text_inline_elements","span strong b em i font strike u var cite dfn code mark q sup sub samp"),ii((i.special||"script noscript noframes noembed title style textarea xmp").split(" "),function(e){h[e]=new RegExp("</"+e+"[^>]*>","gi")});var S=function(e){return new RegExp("^"+e.replace(/([?+*])/g,".$1")+"$")},y=function(e){var t,n,r,o,i,a,u,s,c,l,f,d,m,g,p,h,v,y,b,C=/^([#+\-])?([^\[!\/]+)(?:\/([^\[!]+))?(?:(!?)\[([^\]]+)\])?$/,x=/^([!\-])?(\w+[\\:]:\w+|[^=:<]+)?(?:([=:<])(.*))?$/,w=/[*?+]/;if(e)for(e=ci(e,","),N["@"]&&(h=N["@"].attributes,v=N["@"].attributesOrder),t=0,n=e.length;t<n;t++)if(i=C.exec(e[t])){if(g=i[1],c=i[2],p=i[3],s=i[5],a={attributes:d={},attributesOrder:m=[]},"#"===g&&(a.paddEmpty=!0),"-"===g&&(a.removeEmpty=!0),"!"===i[4]&&(a.removeEmptyAttrs=!0),h){for(y in h)d[y]=h[y];m.push.apply(m,v)}if(s)for(r=0,o=(s=ci(s,"|")).length;r<o;r++)if(i=x.exec(s[r])){if(u={},f=i[1],l=i[2].replace(/[\\:]:/g,":"),g=i[3],b=i[4],"!"===f&&(a.attributesRequired=a.attributesRequired||[],a.attributesRequired.push(l),u.required=!0),"-"===f){delete d[l],m.splice(si(m,l),1);continue}g&&("="===g&&(a.attributesDefault=a.attributesDefault||[],a.attributesDefault.push({name:l,value:b}),u.defaultValue=b),":"===g&&(a.attributesForced=a.attributesForced||[],a.attributesForced.push({name:l,value:b}),u.forcedValue=b),"<"===g&&(u.validValues=oi(b,"?"))),w.test(l)?(a.attributePatterns=a.attributePatterns||[],u.pattern=S(l),a.attributePatterns.push(u)):(d[l]||m.push(l),d[l]=u)}h||"@"!==c||(h=d,v=m),p&&(a.outputName=c,N[p]=a),w.test(c)?(a.pattern=S(c),E.push(a)):N[c]=a}},b=function(e){N={},E=[],y(e),ii(n,function(e,t){g[t]=e.children})},C=function(e){var a=/^(~)?(.+)$/;e&&(ni.text_block_elements=ni.block_elements=null,ii(ci(e,","),function(e){var t=a.exec(e),n="~"===t[1],r=n?"span":"div",o=t[2];if(g[o]=g[r],p[o]=r,n||(c[o.toUpperCase()]={},c[o]={}),!N[o]){var i=N[r];delete(i=ai({},i)).removeEmptyAttrs,delete i.removeEmpty,N[o]=i}ii(g,function(e,t){e[r]&&(g[t]=e=ai({},g[t]),e[o]=e[r])})}))},x=function(e){var o=/^([+\-]?)(\w+)\[([^\]]+)\]$/;ni[i.schema]=null,e&&ii(ci(e,","),function(e){var t,n,r=o.exec(e);r&&(n=r[1],t=n?g[r[2]]:g[r[2]]={"#comment":{}},t=g[r[2]],ii(ci(r[3],"|"),function(e){"-"===n?delete t[e]:t[e]={}}))})},w=function(e){var t,n=N[e];if(n)return n;for(t=E.length;t--;)if((n=E[t]).pattern.test(e))return n};return i.valid_elements?b(i.valid_elements):(ii(n,function(e,t){N[t]={attributes:e.attributes,attributesOrder:e.attributesOrder},g[t]=e.children}),"html5"!==i.schema&&ii(ci("strong/b em/i"),function(e){e=ci(e,"/"),N[e[1]].outputName=e[0]}),ii(ci("ol ul sub sup blockquote span font a table tbody tr strong em b i"),function(e){N[e]&&(N[e].removeEmpty=!0)}),ii(ci("p h1 h2 h3 h4 h5 h6 th td pre div address caption li"),function(e){N[e].paddEmpty=!0}),ii(ci("span"),function(e){N[e].removeEmptyAttrs=!0})),C(i.custom_elements),x(i.valid_children),y(i.extended_valid_elements),x("+ol[ul|ol],+ul[ul|ol]"),ii({dd:"dl",dt:"dl",li:"ul ol",td:"tr",th:"tr",tr:"tbody thead tfoot",tbody:"table",thead:"table",tfoot:"table",legend:"fieldset",area:"map",param:"video audio object"},function(e,t){N[t]&&(N[t].parentsRequired=ci(e))}),i.invalid_elements&&ii(ui(i.invalid_elements),function(e){N[e]&&delete N[e]}),w("span")||y("span[!data-mce-type|*]"),{children:g,elements:N,getValidStyles:function(){return e},getValidClasses:function(){return s},getBlockElements:function(){return c},getInvalidStyles:function(){return t},getShortEndedElements:function(){return a},getTextBlockElements:function(){return d},getTextInlineElements:function(){return m},getBoolAttrs:function(){return u},getElementRule:w,getSelfClosingElements:function(){return o},getNonEmptyElements:function(){return l},getMoveCaretBeforeOnEnterElements:function(){return f},getWhiteSpaceElements:function(){return r},getSpecialElements:function(){return h},isValidChild:function(e,t){var n=g[e.toLowerCase()];return!(!n||!n[t.toLowerCase()])},isValid:function(e,t){var n,r,o=w(e);if(o){if(!t)return!0;if(o.attributes[t])return!0;if(n=o.attributePatterns)for(r=n.length;r--;)if(n[r].pattern.test(e))return!0}return!1},getCustomElements:function(){return p},addValidElements:y,setValidElements:b,addCustomElements:C,addValidChildren:x}}var mi=function(e,t,n,r){var o=function(e){return 1<(e=parseInt(e,10).toString(16)).length?e:"0"+e};return"#"+o(t)+o(n)+o(r)};function gi(b,e){var C,t,c,l,x=/rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/gi,w=/(?:url(?:(?:\(\s*\"([^\"]+)\"\s*\))|(?:\(\s*\'([^\']+)\'\s*\))|(?:\(\s*([^)\s]+)\s*\))))|(?:\'([^\']+)\')|(?:\"([^\"]+)\")/gi,N=/\s*([^:]+):\s*([^;]+);?/g,E=/\s+$/,S={},T="\ufeff";for(b=b||{},e&&(c=e.getValidStyles(),l=e.getInvalidStyles()),t=("\\\" \\' \\; \\: ; : "+T).split(" "),C=0;C<t.length;C++)S[t[C]]=T+C,S[T+C]=t[C];return{toHex:function(e){return e.replace(x,mi)},parse:function(e){var t,n,r,o,i,a,u,s,c={},l=b.url_converter,f=b.url_converter_scope||this,d=function(e,t,n){var r,o,i,a;if((r=c[e+"-top"+t])&&(o=c[e+"-right"+t])&&(i=c[e+"-bottom"+t])&&(a=c[e+"-left"+t])){var u=[r,o,i,a];for(C=u.length-1;C--&&u[C]===u[C+1];);-1<C&&n||(c[e+t]=-1===C?u[0]:u.join(" "),delete c[e+"-top"+t],delete c[e+"-right"+t],delete c[e+"-bottom"+t],delete c[e+"-left"+t])}},m=function(e){var t,n=c[e];if(n){for(t=(n=n.split(" ")).length;t--;)if(n[t]!==n[0])return!1;return c[e]=n[0],!0}},g=function(e){return o=!0,S[e]},p=function(e,t){return o&&(e=e.replace(/\uFEFF[0-9]/g,function(e){return S[e]})),t||(e=e.replace(/\\([\'\";:])/g,"$1")),e},h=function(e){return String.fromCharCode(parseInt(e.slice(1),16))},v=function(e){return e.replace(/\\[0-9a-f]+/gi,h)},y=function(e,t,n,r,o,i){if(o=o||i)return"'"+(o=p(o)).replace(/\'/g,"\\'")+"'";if(t=p(t||n||r),!b.allow_script_urls){var a=t.replace(/[\s\r\n]+/g,"");if(/(java|vb)script:/i.test(a))return"";if(!b.allow_svg_data_urls&&/^data:image\/svg/i.test(a))return""}return l&&(t=l.call(f,t,"style")),"url('"+t.replace(/\'/g,"\\'")+"')"};if(e){for(e=(e=e.replace(/[\u0000-\u001F]/g,"")).replace(/\\[\"\';:\uFEFF]/g,g).replace(/\"[^\"]+\"|\'[^\']+\'/g,function(e){return e.replace(/[;:]/g,g)});t=N.exec(e);)if(N.lastIndex=t.index+t[0].length,n=t[1].replace(E,"").toLowerCase(),r=t[2].replace(E,""),n&&r){if(n=v(n),r=v(r),-1!==n.indexOf(T)||-1!==n.indexOf('"'))continue;if(!b.allow_script_urls&&("behavior"===n||/expression\s*\(|\/\*|\*\//.test(r)))continue;"font-weight"===n&&"700"===r?r="bold":"color"!==n&&"background-color"!==n||(r=r.toLowerCase()),r=(r=r.replace(x,mi)).replace(w,y),c[n]=o?p(r,!0):r}d("border","",!0),d("border","-width"),d("border","-color"),d("border","-style"),d("padding",""),d("margin",""),i="border",u="border-style",s="border-color",m(a="border-width")&&m(u)&&m(s)&&(c[i]=c[a]+" "+c[u]+" "+c[s],delete c[a],delete c[u],delete c[s]),"medium none"===c.border&&delete c.border,"none"===c["border-image"]&&delete c["border-image"]}return c},serialize:function(i,e){var t,n,r,o,a,u="",s=function(e){var t,n,r,o;if(t=c[e])for(n=0,r=t.length;n<r;n++)e=t[n],(o=i[e])&&(u+=(0<u.length?" ":"")+e+": "+o+";")};if(e&&c)s("*"),s(e);else for(t in i)!(n=i[t])||l&&(r=t,o=e,a=void 0,(a=l["*"])&&a[r]||(a=l[o])&&a[r])||(u+=(0<u.length?" ":"")+t+": "+n+";");return u}}}var pi,hi=Xt.each,vi=Xt.grep,yi=fe.ie,bi=/^([a-z0-9],?)+$/i,Ci=/^[ \t\r\n]*$/,xi=function(n,r,o){var e={},i=r.keep_values,t={set:function(e,t,n){r.url_converter&&(t=r.url_converter.call(r.url_converter_scope||o(),t,n,e[0])),e.attr("data-mce-"+n,t).attr(n,t)},get:function(e,t){return e.attr("data-mce-"+t)||e.attr(t)}};return e={style:{set:function(e,t){null===t||"object"!=typeof t?(i&&e.attr("data-mce-style",t),e.attr("style",t)):e.css(t)},get:function(e){var t=e.attr("data-mce-style")||e.attr("style");return t=n.serialize(n.parse(t),e[0].nodeName)}}},i&&(e.href=e.src=t),e},wi=function(e,t){var n=t.attr("style"),r=e.serialize(e.parse(n),t[0].nodeName);r||(r=null),t.attr("data-mce-style",r)},Ni=function(e,t){var n,r,o=0;if(e)for(n=e.nodeType,e=e.previousSibling;e;e=e.previousSibling)r=e.nodeType,(!t||3!==r||r!==n&&e.nodeValue.length)&&(o++,n=r);return o};function Ei(a,u){var s,c=this;void 0===u&&(u={});var r={},i=V.window,o={},t=0,e=function(m,g){void 0===g&&(g={});var p,h=0,v={};p=g.maxLoadTime||5e3;var y=function(e){m.getElementsByTagName("head")[0].appendChild(e)},n=function(e,t,n){var o,r,i,a,u=function(){for(var e=a.passed,t=e.length;t--;)e[t]();a.status=2,a.passed=[],a.failed=[]},s=function(){for(var e=a.failed,t=e.length;t--;)e[t]();a.status=3,a.passed=[],a.failed=[]},c=function(e,t){e()||((new Date).getTime()-i<p?he.setTimeout(t):s())},l=function(){c(function(){for(var e,t,n=m.styleSheets,r=n.length;r--;)if((t=(e=n[r]).ownerNode?e.ownerNode:e.owningElement)&&t.id===o.id)return u(),!0},l)},f=function(){c(function(){try{var e=r.sheet.cssRules;return u(),!!e}catch(t){}},f)};if(e=Xt._addCacheSuffix(e),v[e]?a=v[e]:(a={passed:[],failed:[]},v[e]=a),t&&a.passed.push(t),n&&a.failed.push(n),1!==a.status)if(2!==a.status)if(3!==a.status){if(a.status=1,(o=m.createElement("link")).rel="stylesheet",o.type="text/css",o.id="u"+h++,o.async=!1,o.defer=!1,i=(new Date).getTime(),g.contentCssCors&&(o.crossOrigin="anonymous"),"onload"in o&&!((d=V.navigator.userAgent.match(/WebKit\/(\d*)/))&&parseInt(d[1],10)<536))o.onload=l,o.onerror=s;else{if(0<V.navigator.userAgent.indexOf("Firefox"))return(r=m.createElement("style")).textContent='@import "'+e+'"',f(),void y(r);l()}var d;y(o),o.href=e}else s();else u()},t=function(t){return uo.nu(function(e){n(t,H(e,q(mo.value(t))),H(e,q(mo.error(t))))})},o=function(e){return e.fold($,$)};return{load:n,loadAll:function(e,n,r){co(W(e,t)).get(function(e){var t=K(e,function(e){return e.isValue()});0<t.fail.length?r(t.fail.map(o)):n(t.pass.map(o))})}}}(a,{contentCssCors:u.contentCssCors}),l=[],f=u.schema?u.schema:di({}),d=gi({url_converter:u.url_converter,url_converter_scope:u.url_converter_scope},u.schema),m=u.ownEvents?new Se(u.proxy):Se.Event,n=f.getBlockElements(),g=gn.overrideDefaults(function(){return{context:a,element:j.getRoot()}}),p=function(e){if(e&&a&&"string"==typeof e){var t=a.getElementById(e);return t&&t.id!==e?a.getElementsByName(e)[1]:t}return e},h=function(e){return"string"==typeof e&&(e=p(e)),g(e)},v=function(e,t,n){var r,o,i=h(e);return i.length&&(o=(r=s[t])&&r.get?r.get(i,t):i.attr(t)),void 0===o&&(o=n||""),o},y=function(e){var t=p(e);return t?t.attributes:[]},b=function(e,t,n){var r,o;""===n&&(n=null);var i=h(e);r=i.attr(t),i.length&&((o=s[t])&&o.set?o.set(i,n,t):i.attr(t,n),r!==n&&u.onSetAttrib&&u.onSetAttrib({attrElm:i,attrName:t,attrValue:n}))},C=function(){return u.root_element||a.body},x=function(e,t){return Zr.getPos(a.body,p(e),t)},w=function(e,t,n){var r=h(e);return n?r.css(t):("float"===(t=t.replace(/-(\D)/g,function(e,t){return t.toUpperCase()}))&&(t=fe.ie&&fe.ie<12?"styleFloat":"cssFloat"),r[0]&&r[0].style?r[0].style[t]:undefined)},N=function(e){var t,n;return e=p(e),t=w(e,"width"),n=w(e,"height"),-1===t.indexOf("px")&&(t=0),-1===n.indexOf("px")&&(n=0),{w:parseInt(t,10)||e.offsetWidth||e.clientWidth,h:parseInt(n,10)||e.offsetHeight||e.clientHeight}},E=function(e,t){var n;if(!e)return!1;if(!Array.isArray(e)){if("*"===t)return 1===e.nodeType;if(bi.test(t)){var r=t.toLowerCase().split(/,/),o=e.nodeName.toLowerCase();for(n=r.length-1;0<=n;n--)if(r[n]===o)return!0;return!1}if(e.nodeType&&1!==e.nodeType)return!1}var i=Array.isArray(e)?e:[e];return 0<St(t,i[0].ownerDocument||i[0],null,i).length},S=function(e,t,n,r){var o,i=[],a=p(e);for(r=r===undefined,n=n||("BODY"!==C().nodeName?C().parentNode:null),Xt.is(t,"string")&&(t="*"===(o=t)?function(e){return 1===e.nodeType}:function(e){return E(e,o)});a&&a!==n&&a.nodeType&&9!==a.nodeType;){if(!t||"function"==typeof t&&t(a)){if(!r)return[a];i.push(a)}a=a.parentNode}return r?i:null},T=function(e,t,n){var r=t;if(e)for("string"==typeof t&&(r=function(e){return E(e,t)}),e=e[n];e;e=e[n])if("function"==typeof r&&r(e))return e;return null},k=function(e,n,r){var o,t="string"==typeof e?p(e):e;if(!t)return!1;if(Xt.isArray(t)&&(t.length||0===t.length))return o=[],hi(t,function(e,t){e&&("string"==typeof e&&(e=p(e)),o.push(n.call(r,e,t)))}),o;var i=r||c;return n.call(i,t)},_=function(e,t){h(e).each(function(e,n){hi(t,function(e,t){b(n,t,e)})})},A=function(e,r){var t=h(e);yi?t.each(function(e,t){if(!1!==t.canHaveHTML){for(;t.firstChild;)t.removeChild(t.firstChild);try{t.innerHTML="<br>"+r,t.removeChild(t.firstChild)}catch(n){gn("<div></div>").html("<br>"+r).contents().slice(1).appendTo(t)}return r}}):t.html(r)},R=function(e,n,r,o,i){return k(e,function(e){var t="string"==typeof n?a.createElement(n):n;return _(t,r),o&&("string"!=typeof o&&o.nodeType?t.appendChild(o):"string"==typeof o&&A(t,o)),i?t:e.appendChild(t)})},D=function(e,t,n){return R(a.createElement(e),e,t,n,!0)},O=ti.decode,B=ti.encodeAllRaw,P=function(e,t){var n=h(e);return t?n.each(function(){for(var e;e=this.firstChild;)3===e.nodeType&&0===e.data.length?this.removeChild(e):this.parentNode.insertBefore(e,this)}).remove():n.remove(),1<n.length?n.toArray():n[0]},I=function(e,t,n){h(e).toggleClass(t,n).each(function(){""===this.className&&gn(this).attr("class",null)})},L=function(t,e,n){return k(e,function(e){return Xt.is(e,"array")&&(t=t.cloneNode(!0)),n&&hi(vi(e.childNodes),function(e){t.appendChild(e)}),e.parentNode.replaceChild(t,e)})},F=function(){return a.createRange()},M=function(e,t,n,r){if(Xt.isArray(e)){for(var o=e.length;o--;)e[o]=M(e[o],t,n,r);return e}return!u.collect||e!==a&&e!==i||l.push([e,t,n,r]),m.bind(e,t,n,r||j)},z=function(e,t,n){var r;if(Xt.isArray(e)){for(r=e.length;r--;)e[r]=z(e[r],t,n);return e}if(l&&(e===a||e===i))for(r=l.length;r--;){var o=l[r];e!==o[0]||t&&t!==o[1]||n&&n!==o[2]||m.unbind(o[0],o[1],o[2])}return m.unbind(e,t,n)},U=function(e){if(e&&jo.isElement(e)){var t=e.getAttribute("data-mce-contenteditable");return t&&"inherit"!==t?t:"inherit"!==e.contentEditable?e.contentEditable:null}return null},j={doc:a,settings:u,win:i,files:o,stdMode:!0,boxModel:!0,styleSheetLoader:e,boundEvents:l,styles:d,schema:f,events:m,isBlock:function(e){if("string"==typeof e)return!!n[e];if(e){var t=e.nodeType;if(t)return!(1!==t||!n[e.nodeName])}return!1},$:g,$$:h,root:null,clone:function(t,e){if(!yi||1!==t.nodeType||e)return t.cloneNode(e);if(!e){var n=a.createElement(t.nodeName);return hi(y(t),function(e){b(n,e.nodeName,v(t,e.nodeName))}),n}return null},getRoot:C,getViewPort:function(e){var t=e||i,n=t.document.documentElement;return{x:t.pageXOffset||n.scrollLeft,y:t.pageYOffset||n.scrollTop,w:t.innerWidth||n.clientWidth,h:t.innerHeight||n.clientHeight}},getRect:function(e){var t,n;return e=p(e),t=x(e),n=N(e),{x:t.x,y:t.y,w:n.w,h:n.h}},getSize:N,getParent:function(e,t,n){var r=S(e,t,n,!1);return r&&0<r.length?r[0]:null},getParents:S,get:p,getNext:function(e,t){return T(e,t,"nextSibling")},getPrev:function(e,t){return T(e,t,"previousSibling")},select:function(e,t){return St(e,p(t)||u.root_element||a,[])},is:E,add:R,create:D,createHTML:function(e,t,n){var r,o="";for(r in o+="<"+e,t)t.hasOwnProperty(r)&&null!==t[r]&&"undefined"!=typeof t[r]&&(o+=" "+r+'="'+B(t[r])+'"');return void 0!==n?o+">"+n+"</"+e+">":o+" />"},createFragment:function(e){var t,n=a.createElement("div"),r=a.createDocumentFragment();for(r.appendChild(n),e&&(n.innerHTML=e);t=n.firstChild;)r.appendChild(t);return r.removeChild(n),r},remove:P,setStyle:function(e,t,n){var r=h(e).css(t,n);u.update_styles&&wi(d,r)},getStyle:w,setStyles:function(e,t){var n=h(e).css(t);u.update_styles&&wi(d,n)},removeAllAttribs:function(e){return k(e,function(e){var t,n=e.attributes;for(t=n.length-1;0<=t;t--)e.removeAttributeNode(n.item(t))})},setAttrib:b,setAttribs:_,getAttrib:v,getPos:x,parseStyle:function(e){return d.parse(e)},serializeStyle:function(e,t){return d.serialize(e,t)},addStyle:function(e){var t,n;if(j!==Ei.DOM&&a===V.document){if(r[e])return;r[e]=!0}(n=a.getElementById("mceDefaultStyles"))||((n=a.createElement("style")).id="mceDefaultStyles",n.type="text/css",(t=a.getElementsByTagName("head")[0]).firstChild?t.insertBefore(n,t.firstChild):t.appendChild(n)),n.styleSheet?n.styleSheet.cssText+=e:n.appendChild(a.createTextNode(e))},loadCSS:function(e){var n;j===Ei.DOM||a!==V.document?(e||(e=""),n=a.getElementsByTagName("head")[0],hi(e.split(","),function(e){var t;e=Xt._addCacheSuffix(e),o[e]||(o[e]=!0,t=D("link",{rel:"stylesheet",href:e}),n.appendChild(t))})):Ei.DOM.loadCSS(e)},addClass:function(e,t){h(e).addClass(t)},removeClass:function(e,t){I(e,t,!1)},hasClass:function(e,t){return h(e).hasClass(t)},toggleClass:I,show:function(e){h(e).show()},hide:function(e){h(e).hide()},isHidden:function(e){return"none"===h(e).css("display")},uniqueId:function(e){return(e||"mce_")+t++},setHTML:A,getOuterHTML:function(e){var t="string"==typeof e?p(e):e;return jo.isElement(t)?t.outerHTML:gn("<div></div>").append(gn(t).clone()).html()},setOuterHTML:function(e,t){h(e).each(function(){try{if("outerHTML"in this)return void(this.outerHTML=t)}catch(e){}P(gn(this).html(t),!0)})},decode:O,encode:B,insertAfter:function(e,t){var r=p(t);return k(e,function(e){var t,n;return t=r.parentNode,(n=r.nextSibling)?t.insertBefore(e,n):t.appendChild(e),e})},replace:L,rename:function(t,e){var n;return t.nodeName!==e.toUpperCase()&&(n=D(e),hi(y(t),function(e){b(n,e.nodeName,v(t,e.nodeName))}),L(n,t,!0)),n||t},findCommonAncestor:function(e,t){for(var n,r=e;r;){for(n=t;n&&r!==n;)n=n.parentNode;if(r===n)break;r=r.parentNode}return!r&&e.ownerDocument?e.ownerDocument.documentElement:r},toHex:function(e){return d.toHex(Xt.trim(e))},run:k,getAttribs:y,isEmpty:function(e,t){var n,r,o,i,a,u,s=0;if(e=e.firstChild){a=new go(e,e.parentNode),t=t||(f?f.getNonEmptyElements():null),i=f?f.getWhiteSpaceElements():{};do{if(o=e.nodeType,jo.isElement(e)){var c=e.getAttribute("data-mce-bogus");if(c){e=a.next("all"===c);continue}if(u=e.nodeName.toLowerCase(),t&&t[u]){if("br"===u){s++,e=a.next();continue}return!1}for(n=(r=y(e)).length;n--;)if("name"===(u=r[n].nodeName)||"data-mce-bookmark"===u)return!1}if(8===o)return!1;if(3===o&&!Ci.test(e.nodeValue))return!1;if(3===o&&e.parentNode&&i[e.parentNode.nodeName]&&Ci.test(e.nodeValue))return!1;e=a.next()}while(e)}return s<=1},createRng:F,nodeIndex:Ni,split:function(e,t,n){var r,o,i,a=F();if(e&&t)return a.setStart(e.parentNode,Ni(e)),a.setEnd(t.parentNode,Ni(t)),r=a.extractContents(),(a=F()).setStart(t.parentNode,Ni(t)+1),a.setEnd(e.parentNode,Ni(e)+1),o=a.extractContents(),(i=e.parentNode).insertBefore(qo.trimNode(j,r),e),n?i.insertBefore(n,e):i.insertBefore(t,e),i.insertBefore(qo.trimNode(j,o),e),P(e),n||t},bind:M,unbind:z,fire:function(e,t,n){return m.fire(e,t,n)},getContentEditable:U,getContentEditableParent:function(e){for(var t=C(),n=null;e&&e!==t&&null===(n=U(e));e=e.parentNode);return n},destroy:function(){if(l)for(var e=l.length;e--;){var t=l[e];m.unbind(t[0],t[1],t[2])}St.setDocument&&St.setDocument()},isChildOf:function(e,t){for(;e;){if(t===e)return!0;e=e.parentNode}return!1},dumpRng:function(e){return"startContainer: "+e.startContainer.nodeName+", startOffset: "+e.startOffset+", endContainer: "+e.endContainer.nodeName+", endOffset: "+e.endOffset}};return s=xi(d,u,function(){return j}),j}(pi=Ei||(Ei={})).DOM=pi(V.document),pi.nodeIndex=Ni;var Si=Ei,Ti=Si.DOM,ki=Xt.each,_i=Xt.grep,Ai=function(e){return"function"==typeof e},Ri=function(){var l={},o=[],i={},a=[],f=0;this.isDone=function(e){return 2===l[e]},this.markDone=function(e){l[e]=2},this.add=this.load=function(e,t,n,r){l[e]===undefined&&(o.push(e),l[e]=0),t&&(i[e]||(i[e]=[]),i[e].push({success:t,failure:r,scope:n||this}))},this.remove=function(e){delete l[e],delete i[e]},this.loadQueue=function(e,t,n){this.loadScripts(o,e,t,n)},this.loadScripts=function(n,e,t,r){var u,s=[],c=function(t,e){ki(i[e],function(e){Ai(e[t])&&e[t].call(e.scope)}),i[e]=undefined};a.push({success:e,failure:r,scope:t||this}),(u=function(){var e=_i(n);if(n.length=0,ki(e,function(e){var t,n,r,o,i,a;2!==l[e]?3!==l[e]?1!==l[e]&&(l[e]=1,f++,t=e,n=function(){l[e]=2,f--,c("success",e),u()},r=function(){l[e]=3,f--,s.push(e),c("failure",e),u()},i=(a=Ti).uniqueId(),(o=V.document.createElement("script")).id=i,o.type="text/javascript",o.src=Xt._addCacheSuffix(t),o.onload=function(){a.remove(i),o&&(o.onreadystatechange=o.onload=o=null),n()},o.onerror=function(){Ai(r)?r():"undefined"!=typeof console&&console.log&&console.log("Failed to load script: "+t)},(V.document.getElementsByTagName("head")[0]||V.document.body).appendChild(o)):c("failure",e):c("success",e)}),!f){var t=a.slice(0);a.length=0,ki(t,function(e){0===s.length?Ai(e.success)&&e.success.call(e.scope):Ai(e.failure)&&e.failure.call(e.scope,s)})}})()}};Ri.ScriptLoader=new Ri;var Di,Oi=Xt.each;function Bi(){var r=this,o=[],a={},u={},i=[],s=function(e){var t;return u[e]&&(t=u[e].dependencies),t||[]},c=function(e,t){return"object"==typeof t?t:"string"==typeof e?{prefix:"",resource:t,suffix:""}:{prefix:e.prefix,resource:t,suffix:e.suffix}},l=function(e,n,t,r){var o=s(e);Oi(o,function(e){var t=c(n,e);f(t.resource,t,undefined,undefined)}),t&&(r?t.call(r):t.call(Ri))},f=function(e,t,n,r,o){if(!a[e]){var i="string"==typeof t?t:t.prefix+t.resource+t.suffix;0!==i.indexOf("/")&&-1===i.indexOf("://")&&(i=Bi.baseURL+"/"+i),a[e]=i.substring(0,i.lastIndexOf("/")),u[e]?l(e,t,n,r):Ri.ScriptLoader.add(i,function(){return l(e,t,n,r)},r,o)}};return{items:o,urls:a,lookup:u,_listeners:i,get:function(e){return u[e]?u[e].instance:undefined},dependencies:s,requireLangPack:function(e,t){var n=Bi.language;if(n&&!1!==Bi.languageLoad){if(t)if(-1!==(t=","+t+",").indexOf(","+n.substr(0,2)+","))n=n.substr(0,2);else if(-1===t.indexOf(","+n+","))return;Ri.ScriptLoader.add(a[e]+"/langs/"+n+".js")}},add:function(t,e,n){o.push(e),u[t]={instance:e,dependencies:n};var r=K(i,function(e){return e.name===t});return i=r.fail,Oi(r.pass,function(e){e.callback()}),e},remove:function(e){delete a[e],delete u[e]},createUrl:c,addComponents:function(e,t){var n=r.urls[e];Oi(t,function(e){Ri.ScriptLoader.add(n+"/"+e)})},load:f,waitFor:function(e,t){u.hasOwnProperty(e)?t():i.push({name:e,callback:t})}}}(Di=Bi||(Bi={})).PluginManager=Di(),Di.ThemeManager=Di();var Pi=function(t,n){Vr(t).each(function(e){e.dom().insertBefore(n.dom(),t.dom())})},Ii=function(e,t){qr(e).fold(function(){Vr(e).each(function(e){Fi(e,t)})},function(e){Pi(e,t)})},Li=function(t,n){Yr(t).fold(function(){Fi(t,n)},function(e){t.dom().insertBefore(n.dom(),e.dom())})},Fi=function(e,t){e.dom().appendChild(t.dom())},Mi=function(t,e){z(e,function(e){Fi(t,e)})},zi=function(e){e.dom().textContent="",z(Kr(e),function(e){Ui(e)})},Ui=function(e){var t=e.dom();null!==t.parentNode&&t.parentNode.removeChild(t)},ji=function(e){var t,n=Kr(e);0<n.length&&(t=e,z(n,function(e){Pi(t,e)})),Ui(e)},Vi=function(n,r){var o=null;return{cancel:function(){null!==o&&(V.clearTimeout(o),o=null)},throttle:function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];null===o&&(o=V.setTimeout(function(){n.apply(null,e),o=null},r))}}},Hi=function(e){var t=e,n=function(){return t};return{get:n,set:function(e){t=e},clone:function(){return Hi(n())}}},qi=function(e,t){var n=Er(e,t);return n===undefined||""===n?[]:n.split(" ")},$i=function(e){return e.dom().classList!==undefined},Wi=function(e,t){return o=t,i=qi(n=e,r="class").concat([o]),wr(n,r,i.join(" ")),!0;var n,r,o,i},Ki=function(e,t){return o=t,0<(i=U(qi(n=e,r="class"),function(e){return e!==o})).length?wr(n,r,i.join(" ")):Sr(n,r),!1;var n,r,o,i},Xi=function(e,t){$i(e)?e.dom().classList.add(t):Wi(e,t)},Yi=function(e){0===($i(e)?e.dom().classList:qi(e,"class")).length&&Sr(e,"class")},Gi=function(e,t){return $i(e)&&e.dom().classList.contains(t)},Ji=function(e,t){var n=[];return z(Kr(e),function(e){t(e)&&(n=n.concat([e])),n=n.concat(Ji(e,t))}),n},Qi=function(e,t){return n=t,o=(r=e)===undefined?V.document:r.dom(),Fr(o)?[]:W(o.querySelectorAll(n),ar.fromDom);var n,r,o};function Zi(e,t,n,r,o){return e(n,r)?_.some(n):D(o)&&o(n)?_.none():t(n,r,o)}var ea,ta=function(e,t,n){for(var r=e.dom(),o=D(n)?n:q(!1);r.parentNode;){r=r.parentNode;var i=ar.fromDom(r);if(t(i))return _.some(i);if(o(i))break}return _.none()},na=function(e,t,n){return Zi(function(e,t){return t(e)},ta,e,t,n)},ra=function(e,t,n){return ta(e,function(e){return Lr(e,t)},n)},oa=function(e,t){return n=t,o=(r=e)===undefined?V.document:r.dom(),Fr(o)?_.none():_.from(o.querySelector(n)).map(ar.fromDom);var n,r,o},ia=function(e,t,n){return Zi(Lr,ra,e,t,n)},aa=q("mce-annotation"),ua=q("data-mce-annotation"),sa=q("data-mce-annotation-uid"),ca=function(r,e){var t=r.selection.getRng(),n=ar.fromDom(t.startContainer),o=ar.fromDom(r.getBody()),i=e.fold(function(){return"."+aa()},function(e){return"["+ua()+'="'+e+'"]'}),a=Xr(n,t.startOffset).getOr(n),u=ia(a,i,function(e){return Mr(e,o)}),s=function(e,t){return n=t,(r=e.dom())&&r.hasAttribute&&r.hasAttribute(n)?_.some(Er(e,t)):_.none();var n,r};return u.bind(function(e){return s(e,""+sa()).bind(function(n){return s(e,""+ua()).map(function(e){var t=la(r,n);return{uid:n,name:e,elements:t}})})})},la=function(e,t){var n=ar.fromDom(e.getBody());return Qi(n,"["+sa()+'="'+t+'"]')},fa=function(i,e){var n,r,o,a=Hi({}),c=function(e,t){u(e,function(e){return t(e),e})},u=function(e,t){var n=a.get(),r=t(n.hasOwnProperty(e)?n[e]:{listeners:[],previous:Hi(_.none())});n[e]=r,a.set(n)},t=(n=function(){var e,t,n,r=a.get(),o=(e=gr(r),(n=B.call(e,0)).sort(t),n);z(o,function(e){u(e,function(u){var s=u.previous.get();return ca(i,_.some(e)).fold(function(){var t;s.isSome()&&(c(t=e,function(e){z(e.listeners,function(e){return e(!1,t)})}),u.previous.set(_.none()))},function(e){var t,n,r,o=e.uid,i=e.name,a=e.elements;s.is(o)||(n=o,r=a,c(t=i,function(e){z(e.listeners,function(e){return e(!0,t,{uid:n,nodes:W(r,function(e){return e.dom()})})})}),u.previous.set(_.some(o)))}),{previous:u.previous,listeners:u.listeners}})})},r=30,o=null,{cancel:function(){null!==o&&(V.clearTimeout(o),o=null)},throttle:function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];null!==o&&V.clearTimeout(o),o=V.setTimeout(function(){n.apply(null,e),o=null},r)}});return i.on("remove",function(){t.cancel()}),i.on("nodeChange",function(){t.throttle()}),{addListener:function(e,t){u(e,function(e){return{previous:e.previous,listeners:e.listeners.concat([t])}})}}},da=function(e,n){e.on("init",function(){e.serializer.addNodeFilter("span",function(e){z(e,function(t){var e;(e=t,_.from(e.attributes.map[ua()]).bind(n.lookup)).each(function(e){!1===e.persistent&&t.unwrap()})})})})},ma=function(){return(ma=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var o in t=arguments[n])Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);return e}).apply(this,arguments)},ga=0,pa=function(e,t){return ar.fromDom(e.dom().cloneNode(t))},ha=function(e){return pa(e,!1)},va=function(e){return pa(e,!0)},ya=function(e,t){var n,r,o=Ur(e).dom(),i=ar.fromDom(o.createDocumentFragment()),a=(n=t,(r=(o||V.document).createElement("div")).innerHTML=n,Kr(ar.fromDom(r)));Mi(i,a),zi(e),Fi(e,i)},ba="\ufeff",Ca=function(e){return e===ba},xa=ba,wa=function(e){return e.replace(new RegExp(ba,"g"),"")},Na=jo.isElement,Ea=jo.isText,Sa=function(e){return Ea(e)&&(e=e.parentNode),Na(e)&&e.hasAttribute("data-mce-caret")},Ta=function(e){return Ea(e)&&Ca(e.data)},ka=function(e){return Sa(e)||Ta(e)},_a=function(e){return e.firstChild!==e.lastChild||!jo.isBr(e.firstChild)},Aa=function(e){var t=e.container();return!(!e||!jo.isText(t))&&(t.data.charAt(e.offset())===xa||e.isAtStart()&&Ta(t.previousSibling))},Ra=function(e){var t=e.container();return!(!e||!jo.isText(t))&&(t.data.charAt(e.offset()-1)===xa||e.isAtEnd()&&Ta(t.nextSibling))},Da=function(e,t,n){var r,o,i;return(r=t.ownerDocument.createElement(e)).setAttribute("data-mce-caret",n?"before":"after"),r.setAttribute("data-mce-bogus","all"),r.appendChild(((i=V.document.createElement("br")).setAttribute("data-mce-bogus","1"),i)),o=t.parentNode,n?o.insertBefore(r,t):t.nextSibling?o.insertBefore(r,t.nextSibling):o.appendChild(r),r},Oa=function(e){return Ea(e)&&e.data[0]===xa},Ba=function(e){return Ea(e)&&e.data[e.data.length-1]===xa},Pa=function(e){return e&&e.hasAttribute("data-mce-caret")?(t=e.getElementsByTagName("br"),n=t[t.length-1],jo.isBogus(n)&&n.parentNode.removeChild(n),e.removeAttribute("data-mce-caret"),e.removeAttribute("data-mce-bogus"),e.removeAttribute("style"),e.removeAttribute("_moz_abspos"),e):null;var t,n},Ia=jo.isContentEditableTrue,La=jo.isContentEditableFalse,Fa=jo.isBr,Ma=jo.isText,za=jo.matchNodeNames("script style textarea"),Ua=jo.matchNodeNames("img input textarea hr iframe video audio object"),ja=jo.matchNodeNames("table"),Va=ka,Ha=function(e){return!Va(e)&&(Ma(e)?!za(e.parentNode):Ua(e)||Fa(e)||ja(e)||qa(e))},qa=function(e){return!1===(t=e,jo.isElement(t)&&"true"===t.getAttribute("unselectable"))&&La(e);var t},$a=function(e,t){return Ha(e)&&function(e,t){for(e=e.parentNode;e&&e!==t;e=e.parentNode){if(qa(e))return!1;if(Ia(e))return!0}return!0}(e,t)},Wa=Math.round,Ka=function(e){return e?{left:Wa(e.left),top:Wa(e.top),bottom:Wa(e.bottom),right:Wa(e.right),width:Wa(e.width),height:Wa(e.height)}:{left:0,top:0,bottom:0,right:0,width:0,height:0}},Xa=function(e,t){return e=Ka(e),t||(e.left=e.left+e.width),e.right=e.left,e.width=0,e},Ya=function(e,t,n){return 0<=e&&e<=Math.min(t.height,n.height)/2},Ga=function(e,t){return e.bottom-e.height/2<t.top||!(e.top>t.bottom)&&Ya(t.top-e.bottom,e,t)},Ja=function(e,t){return e.top>t.bottom||!(e.bottom<t.top)&&Ya(t.bottom-e.top,e,t)},Qa=function(e,t,n){return t>=e.left&&t<=e.right&&n>=e.top&&n<=e.bottom},Za=function(e){var t=e.startContainer,n=e.startOffset;return t.hasChildNodes()&&e.endOffset===n+1?t.childNodes[n]:null},eu=function(e,t){return 1===e.nodeType&&e.hasChildNodes()&&(t>=e.childNodes.length&&(t=e.childNodes.length-1),e=e.childNodes[t]),e},tu=new RegExp("[\u0300-\u036f\u0483-\u0487\u0488-\u0489\u0591-\u05bd\u05bf\u05c1-\u05c2\u05c4-\u05c5\u05c7\u0610-\u061a\u064b-\u065f\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7-\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u08e3-\u0902\u093a\u093c\u0941-\u0948\u094d\u0951-\u0957\u0962-\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2-\u09e3\u0a01-\u0a02\u0a3c\u0a41-\u0a42\u0a47-\u0a48\u0a4b-\u0a4d\u0a51\u0a70-\u0a71\u0a75\u0a81-\u0a82\u0abc\u0ac1-\u0ac5\u0ac7-\u0ac8\u0acd\u0ae2-\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62-\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c00\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55-\u0c56\u0c62-\u0c63\u0c81\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc-\u0ccd\u0cd5-\u0cd6\u0ce2-\u0ce3\u0d01\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62-\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb-\u0ebc\u0ec8-\u0ecd\u0f18-\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86-\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039-\u103a\u103d-\u103e\u1058-\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085-\u1086\u108d\u109d\u135d-\u135f\u1712-\u1714\u1732-\u1734\u1752-\u1753\u1772-\u1773\u17b4-\u17b5\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927-\u1928\u1932\u1939-\u193b\u1a17-\u1a18\u1a1b\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1ab0-\u1abd\u1abe\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80-\u1b81\u1ba2-\u1ba5\u1ba8-\u1ba9\u1bab-\u1bad\u1be6\u1be8-\u1be9\u1bed\u1bef-\u1bf1\u1c2c-\u1c33\u1c36-\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1cf4\u1cf8-\u1cf9\u1dc0-\u1df5\u1dfc-\u1dff\u200c-\u200d\u20d0-\u20dc\u20dd-\u20e0\u20e1\u20e2-\u20e4\u20e5-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302d\u302e-\u302f\u3099-\u309a\ua66f\ua670-\ua672\ua674-\ua67d\ua69e-\ua69f\ua6f0-\ua6f1\ua802\ua806\ua80b\ua825-\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\ua9e5\uaa29-\uaa2e\uaa31-\uaa32\uaa35-\uaa36\uaa43\uaa4c\uaa7c\uaab0\uaab2-\uaab4\uaab7-\uaab8\uaabe-\uaabf\uaac1\uaaec-\uaaed\uaaf6\uabe5\uabe8\uabed\ufb1e\ufe00-\ufe0f\ufe20-\ufe2f\uff9e-\uff9f]"),nu=function(e){return"string"==typeof e&&768<=e.charCodeAt(0)&&tu.test(e)},ru=function(e,t,n){return e.isSome()&&t.isSome()?_.some(n(e.getOrDie(),t.getOrDie())):_.none()},ou=[].slice,iu=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n=ou.call(arguments);return function(e){for(var t=0;t<n.length;t++)if(!n[t](e))return!1;return!0}},au=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];var n=ou.call(arguments);return function(e){for(var t=0;t<n.length;t++)if(n[t](e))return!0;return!1}},uu=jo.isElement,su=Ha,cu=jo.matchStyleValues("display","block table"),lu=jo.matchStyleValues("float","left right"),fu=iu(uu,su,y(lu)),du=y(jo.matchStyleValues("white-space","pre pre-line pre-wrap")),mu=jo.isText,gu=jo.isBr,pu=Si.nodeIndex,hu=eu,vu=function(e){return"createRange"in e?e.createRange():Si.DOM.createRng()},yu=function(e){return e&&/[\r\n\t ]/.test(e)},bu=function(e){return!!e.setStart&&!!e.setEnd},Cu=function(e){var t,n=e.startContainer,r=e.startOffset;return!!(yu(e.toString())&&du(n.parentNode)&&jo.isText(n)&&(t=n.data,yu(t[r-1])||yu(t[r+1])))},xu=function(e){return 0===e.left&&0===e.right&&0===e.top&&0===e.bottom},wu=function(e){var t,n,r,o,i,a,u,s;return t=0<(n=e.getClientRects()).length?Ka(n[0]):Ka(e.getBoundingClientRect()),!bu(e)&&gu(e)&&xu(t)?(i=(r=e).ownerDocument,a=vu(i),u=i.createTextNode("\xa0"),(s=r.parentNode).insertBefore(u,r),a.setStart(u,0),a.setEnd(u,1),o=Ka(a.getBoundingClientRect()),s.removeChild(u),o):xu(t)&&bu(e)?function(e){var t=e.startContainer,n=e.endContainer,r=e.startOffset,o=e.endOffset;if(t===n&&jo.isText(n)&&0===r&&1===o){var i=e.cloneRange();return i.setEndAfter(n),wu(i)}return null}(e):t},Nu=function(e,t){var n=Xa(e,t);return n.width=1,n.right=n.left+1,n},Eu=function(e){var t,n,r=[],o=function(e){var t,n;0!==e.height&&(0<r.length&&(t=e,n=r[r.length-1],t.left===n.left&&t.top===n.top&&t.bottom===n.bottom&&t.right===n.right)||r.push(e))},i=function(e,t){var n=vu(e.ownerDocument);if(t<e.data.length){if(nu(e.data[t]))return r;if(nu(e.data[t-1])&&(n.setStart(e,t),n.setEnd(e,t+1),!Cu(n)))return o(Nu(wu(n),!1)),r}0<t&&(n.setStart(e,t-1),n.setEnd(e,t),Cu(n)||o(Nu(wu(n),!1))),t<e.data.length&&(n.setStart(e,t),n.setEnd(e,t+1),Cu(n)||o(Nu(wu(n),!0)))};if(mu(e.container()))return i(e.container(),e.offset()),r;if(uu(e.container()))if(e.isAtEnd())n=hu(e.container(),e.offset()),mu(n)&&i(n,n.data.length),fu(n)&&!gu(n)&&o(Nu(wu(n),!1));else{if(n=hu(e.container(),e.offset()),mu(n)&&i(n,0),fu(n)&&e.isAtEnd())return o(Nu(wu(n),!1)),r;t=hu(e.container(),e.offset()-1),fu(t)&&!gu(t)&&(cu(t)||cu(n)||!fu(n))&&o(Nu(wu(t),!1)),fu(n)&&o(Nu(wu(n),!0))}return r};function Su(t,n,e){var r=function(){return e||(e=Eu(Su(t,n))),e};return{container:q(t),offset:q(n),toRange:function(){var e;return(e=vu(t.ownerDocument)).setStart(t,n),e.setEnd(t,n),e},getClientRects:r,isVisible:function(){return 0<r().length},isAtStart:function(){return mu(t),0===n},isAtEnd:function(){return mu(t)?n>=t.data.length:n>=t.childNodes.length},isEqual:function(e){return e&&t===e.container()&&n===e.offset()},getNode:function(e){return hu(t,e?n-1:n)}}}(ea=Su||(Su={})).fromRangeStart=function(e){return ea(e.startContainer,e.startOffset)},ea.fromRangeEnd=function(e){return ea(e.endContainer,e.endOffset)},ea.after=function(e){return ea(e.parentNode,pu(e)+1)},ea.before=function(e){return ea(e.parentNode,pu(e))},ea.isAbove=function(e,t){return ru(Z(t.getClientRects()),ee(e.getClientRects()),Ga).getOr(!1)},ea.isBelow=function(e,t){return ru(ee(t.getClientRects()),Z(e.getClientRects()),Ja).getOr(!1)},ea.isAtStart=function(e){return!!e&&e.isAtStart()},ea.isAtEnd=function(e){return!!e&&e.isAtEnd()},ea.isTextPosition=function(e){return!!e&&jo.isText(e.container())},ea.isElementPosition=function(e){return!1===ea.isTextPosition(e)};var Tu,ku,_u=Su,Au=jo.isText,Ru=jo.isBogus,Du=Si.nodeIndex,Ou=function(e){var t=e.parentNode;return Ru(t)?Ou(t):t},Bu=function(e){return e?Ht.reduce(e.childNodes,function(e,t){return Ru(t)&&"BR"!==t.nodeName?e=e.concat(Bu(t)):e.push(t),e},[]):[]},Pu=function(t){return function(e){return t===e}},Iu=function(e){var t,r,n,o;return(Au(e)?"text()":e.nodeName.toLowerCase())+"["+(r=Bu(Ou(t=e)),n=Ht.findIndex(r,Pu(t),t),r=r.slice(0,n+1),o=Ht.reduce(r,function(e,t,n){return Au(t)&&Au(r[n-1])&&e++,e},0),r=Ht.filter(r,jo.matchNodeNames(t.nodeName)),(n=Ht.findIndex(r,Pu(t),t))-o)+"]"},Lu=function(e,t){var n,r,o,i,a,u=[];return n=t.container(),r=t.offset(),Au(n)?o=function(e,t){for(;(e=e.previousSibling)&&Au(e);)t+=e.data.length;return t}(n,r):(r>=(i=n.childNodes).length?(o="after",r=i.length-1):o="before",n=i[r]),u.push(Iu(n)),a=function(e,t,n){var r=[];for(t=t.parentNode;!(t===e||n&&n(t));t=t.parentNode)r.push(t);return r}(e,n),a=Ht.filter(a,y(jo.isBogus)),(u=u.concat(Ht.map(a,function(e){return Iu(e)}))).reverse().join("/")+","+o},Fu=function(e,t){var n,r,o;return t?(t=(n=t.split(","))[0].split("/"),o=1<n.length?n[1]:"before",(r=Ht.reduce(t,function(e,t){return(t=/([\w\-\(\)]+)\[([0-9]+)\]/.exec(t))?("text()"===t[1]&&(t[1]="#text"),n=e,r=t[1],o=parseInt(t[2],10),i=Bu(n),i=Ht.filter(i,function(e,t){return!Au(e)||!Au(i[t-1])}),(i=Ht.filter(i,jo.matchNodeNames(r)))[o]):null;var n,r,o,i},e))?Au(r)?function(e,t){for(var n,r=e,o=0;Au(r);){if(n=r.data.length,o<=t&&t<=o+n){e=r,t-=o;break}if(!Au(r.nextSibling)){e=r,t=n;break}o+=n,r=r.nextSibling}return Au(e)&&t>e.data.length&&(t=e.data.length),_u(e,t)}(r,parseInt(o,10)):(o="after"===o?Du(r)+1:Du(r),_u(r.parentNode,o)):null):null},Mu=function(e,t){jo.isText(t)&&0===t.data.length&&e.remove(t)},zu=function(e,t,n){var r,o,i,a,u,s,c;jo.isDocumentFragment(n)?(i=e,a=t,u=n,s=_.from(u.firstChild),c=_.from(u.lastChild),a.insertNode(u),s.each(function(e){return Mu(i,e.previousSibling)}),c.each(function(e){return Mu(i,e.nextSibling)})):(r=e,o=n,t.insertNode(o),Mu(r,o.previousSibling),Mu(r,o.nextSibling))},Uu=jo.isContentEditableFalse,ju=function(e,t,n,r,o){var i,a=r[o?"startContainer":"endContainer"],u=r[o?"startOffset":"endOffset"],s=[],c=0,l=e.getRoot();for(jo.isText(a)?s.push(n?function(e,t,n){var r,o;for(o=e(t.data.slice(0,n)).length,r=t.previousSibling;r&&jo.isText(r);r=r.previousSibling)o+=e(r.data).length;return o}(t,a,u):u):(u>=(i=a.childNodes).length&&i.length&&(c=1,u=Math.max(0,i.length-1)),s.push(e.nodeIndex(i[u],n)+c));a&&a!==l;a=a.parentNode)s.push(e.nodeIndex(a,n));return s},Vu=function(e,t,n){var r=0;return Xt.each(e.select(t),function(e){if("all"!==e.getAttribute("data-mce-bogus"))return e!==n&&void r++}),r},Hu=function(e,t){var n,r,o,i=t?"start":"end";n=e[i+"Container"],r=e[i+"Offset"],jo.isElement(n)&&"TR"===n.nodeName&&(n=(o=n.childNodes)[Math.min(t?r:r-1,o.length-1)])&&(r=t?0:n.childNodes.length,e["set"+(t?"Start":"End")](n,r))},qu=function(e){return Hu(e,!0),Hu(e,!1),e},$u=function(e,t){var n;if(jo.isElement(e)&&(e=eu(e,t),Uu(e)))return e;if(ka(e)){if(jo.isText(e)&&Sa(e)&&(e=e.parentNode),n=e.previousSibling,Uu(n))return n;if(n=e.nextSibling,Uu(n))return n}},Wu=function(e,t,n){var r=n.getNode(),o=r?r.nodeName:null,i=n.getRng();if(Uu(r)||"IMG"===o)return{name:o,index:Vu(n.dom,o,r)};var a,u,s,c,l,f,d,m=$u((a=i).startContainer,a.startOffset)||$u(a.endContainer,a.endOffset);return m?{name:o=m.tagName,index:Vu(n.dom,o,m)}:(u=e,c=t,l=i,f=(s=n).dom,(d={}).start=ju(f,u,c,l,!0),s.isCollapsed()||(d.end=ju(f,u,c,l,!1)),d)},Ku=function(e,t,n){var r={"data-mce-type":"bookmark",id:t,style:"overflow:hidden;line-height:0px"};return n?e.create("span",r,"&#xFEFF;"):e.create("span",r)},Xu=function(e,t){var n=e.dom,r=e.getRng(),o=n.uniqueId(),i=e.isCollapsed(),a=e.getNode(),u=a.nodeName;if("IMG"===u)return{name:u,index:Vu(n,u,a)};var s=qu(r.cloneRange());if(!i){s.collapse(!1);var c=Ku(n,o+"_end",t);zu(n,s,c)}(r=qu(r)).collapse(!0);var l=Ku(n,o+"_start",t);return zu(n,r,l),e.moveToBookmark({id:o,keep:1}),{id:o}},Yu={getBookmark:function(e,t,n){return 2===t?Wu(wa,n,e):3===t?(o=(r=e).getRng(),{start:Lu(r.dom.getRoot(),_u.fromRangeStart(o)),end:Lu(r.dom.getRoot(),_u.fromRangeEnd(o))}):t?{rng:e.getRng()}:Xu(e,!1);var r,o},getUndoBookmark:d(Wu,$,!0),getPersistentBookmark:Xu},Gu="_mce_caret",Ju=function(e){return jo.isElement(e)&&e.id===Gu},Qu=function(e,t){for(;t&&t!==e;){if(t.id===Gu)return t;t=t.parentNode}return null},Zu=jo.isElement,es=jo.isText,ts=function(e){var t=e.parentNode;t&&t.removeChild(e)},ns=function(e,t){0===t.length?ts(e):e.nodeValue=t},rs=function(e){var t=wa(e);return{count:e.length-t.length,text:t}},os=function(e,t){return us(e),t},is=function(e,t){var n,r,o,i=t.container(),a=(n=te(i.childNodes),r=e,o=L(n,r),-1===o?_.none():_.some(o)).map(function(e){return e<t.offset()?_u(i,t.offset()-1):t}).getOr(t);return us(e),a},as=function(e,t){return es(e)&&t.container()===e?(r=t,o=rs((n=e).data.substr(0,r.offset())),i=rs(n.data.substr(r.offset())),0<(a=o.text+i.text).length?(ns(n,a),_u(n,r.offset()-o.count)):r):os(e,t);var n,r,o,i,a},us=function(e){if(Zu(e)&&ka(e)&&(_a(e)?e.removeAttribute("data-mce-caret"):ts(e)),es(e)){var t=wa(function(e){try{return e.nodeValue}catch(t){return""}}(e));ns(e,t)}},ss={removeAndReposition:function(e,t){return _u.isTextPosition(t)?as(e,t):(n=e,(r=t).container()===n.parentNode?is(n,r):os(n,r));var n,r},remove:us},cs=or.detect().browser,ls=jo.isContentEditableFalse,fs=function(e,t,n){var r,o,i,a,u,s=Xa(t.getBoundingClientRect(),n);return"BODY"===e.tagName?(r=e.ownerDocument.documentElement,o=e.scrollLeft||r.scrollLeft,i=e.scrollTop||r.scrollTop):(u=e.getBoundingClientRect(),o=e.scrollLeft-u.left,i=e.scrollTop-u.top),s.left+=o,s.right+=o,s.top+=i,s.bottom+=i,s.width=1,0<(a=t.offsetWidth-t.clientWidth)&&(n&&(a*=-1),s.left+=a,s.right+=a),s},ds=function(a,u,e){var t,s,c=Hi(_.none()),l=function(){!function(e){var t,n,r,o,i;for(t=gn("*[contentEditable=false]",e),o=0;o<t.length;o++)r=(n=t[o]).previousSibling,Ba(r)&&(1===(i=r.data).length?r.parentNode.removeChild(r):r.deleteData(i.length-1,1)),r=n.nextSibling,Oa(r)&&(1===(i=r.data).length?r.parentNode.removeChild(r):r.deleteData(0,1))}(a),s&&(ss.remove(s),s=null),c.get().each(function(e){gn(e.caret).remove(),c.set(_.none())}),clearInterval(t)},f=function(){t=he.setInterval(function(){e()?gn("div.mce-visual-caret",a).toggleClass("mce-visual-caret-hidden"):gn("div.mce-visual-caret",a).addClass("mce-visual-caret-hidden")},500)};return{show:function(t,e){var n,r,o;if(l(),o=e,jo.isElement(o)&&/^(TD|TH)$/i.test(o.tagName))return null;if(!u(e))return s=function(e,t){var n,r,o;if(r=e.ownerDocument.createTextNode(xa),o=e.parentNode,t){if(n=e.previousSibling,Ea(n)){if(ka(n))return n;if(Ba(n))return n.splitText(n.data.length-1)}o.insertBefore(r,e)}else{if(n=e.nextSibling,Ea(n)){if(ka(n))return n;if(Oa(n))return n.splitText(1),n}e.nextSibling?o.insertBefore(r,e.nextSibling):o.appendChild(r)}return r}(e,t),r=e.ownerDocument.createRange(),ls(s.nextSibling)?(r.setStart(s,0),r.setEnd(s,0)):(r.setStart(s,1),r.setEnd(s,1)),r;s=Da("p",e,t),n=fs(a,e,t),gn(s).css("top",n.top);var i=gn('<div class="mce-visual-caret" data-mce-bogus="all"></div>').css(n).appendTo(a)[0];return c.set(_.some({caret:i,element:e,before:t})),c.get().each(function(e){t&&gn(e.caret).addClass("mce-visual-caret-before")}),f(),(r=e.ownerDocument.createRange()).setStart(s,0),r.setEnd(s,0),r},hide:l,getCss:function(){return".mce-visual-caret {position: absolute;background-color: black;background-color: currentcolor;}.mce-visual-caret-hidden {display: none;}*[data-mce-caret] {position: absolute;left: -1000px;right: auto;top: 0;margin: 0;padding: 0;}"},reposition:function(){c.get().each(function(e){var t=fs(a,e.element,e.before);gn(e.caret).css(t)})},destroy:function(){return he.clearInterval(t)}}},ms=function(){return cs.isIE()||cs.isEdge()||cs.isFirefox()},gs=function(e){return ls(e)||jo.isTable(e)&&ms()},ps=jo.isContentEditableFalse,hs=jo.matchStyleValues("display","block table table-cell table-caption list-item"),vs=ka,ys=Sa,bs=jo.isElement,Cs=Ha,xs=function(e){return 0<e},ws=function(e){return e<0},Ns=function(e,t){for(var n;n=e(t);)if(!ys(n))return n;return null},Es=function(e,t,n,r,o){var i=new go(e,r);if(ws(t)){if((ps(e)||ys(e))&&n(e=Ns(i.prev,!0)))return e;for(;e=Ns(i.prev,o);)if(n(e))return e}if(xs(t)){if((ps(e)||ys(e))&&n(e=Ns(i.next,!0)))return e;for(;e=Ns(i.next,o);)if(n(e))return e}return null},Ss=function(e,t){for(;e&&e!==t;){if(hs(e))return e;e=e.parentNode}return null},Ts=function(e,t,n){return Ss(e.container(),n)===Ss(t.container(),n)},ks=function(e,t){var n,r;return t?(n=t.container(),r=t.offset(),bs(n)?n.childNodes[r+e]:null):null},_s=function(e,t){var n=t.ownerDocument.createRange();return e?(n.setStartBefore(t),n.setEndBefore(t)):(n.setStartAfter(t),n.setEndAfter(t)),n},As=function(e,t,n){var r,o,i,a;for(o=e?"previousSibling":"nextSibling";n&&n!==t;){if(r=n[o],vs(r)&&(r=r[o]),ps(r)){if(a=n,Ss(r,i=t)===Ss(a,i))return r;break}if(Cs(r))break;n=n.parentNode}return null},Rs=d(_s,!0),Ds=d(_s,!1),Os=function(e,t,n){var r,o,i,a,u=d(As,!0,t),s=d(As,!1,t);if(o=n.startContainer,i=n.startOffset,Sa(o)){if(bs(o)||(o=o.parentNode),"before"===(a=o.getAttribute("data-mce-caret"))&&(r=o.nextSibling,gs(r)))return Rs(r);if("after"===a&&(r=o.previousSibling,gs(r)))return Ds(r)}if(!n.collapsed)return n;if(jo.isText(o)){if(vs(o)){if(1===e){if(r=s(o))return Rs(r);if(r=u(o))return Ds(r)}if(-1===e){if(r=u(o))return Ds(r);if(r=s(o))return Rs(r)}return n}if(Ba(o)&&i>=o.data.length-1)return 1===e&&(r=s(o))?Rs(r):n;if(Oa(o)&&i<=1)return-1===e&&(r=u(o))?Ds(r):n;if(i===o.data.length)return(r=s(o))?Rs(r):n;if(0===i)return(r=u(o))?Ds(r):n}return n},Bs=function(e,t){return _.from(ks(e?0:-1,t)).filter(ps)},Ps=function(e,t,n){var r=Os(e,t,n);return-1===e?Su.fromRangeStart(r):Su.fromRangeEnd(r)},Is=function(e){return _.from(e.getNode()).map(ar.fromDom)},Ls=function(e,t){for(;t=e(t);)if(t.isVisible())return t;return t},Fs=function(e,t){var n=Ts(e,t);return!(n||!jo.isBr(e.getNode()))||n};(ku=Tu||(Tu={}))[ku.Backwards=-1]="Backwards",ku[ku.Forwards=1]="Forwards";var Ms,zs,Us,js=jo.isContentEditableFalse,Vs=jo.isText,Hs=jo.isElement,qs=jo.isBr,$s=Ha,Ws=function(e){return Ua(e)||!!qa(t=e)&&!0!==j(te(t.getElementsByTagName("*")),function(e,t){return e||Ia(t)},!1);var t},Ks=$a,Xs=function(e,t){return e.hasChildNodes()&&t<e.childNodes.length?e.childNodes[t]:null},Ys=function(e,t){if(xs(e)){if($s(t.previousSibling)&&!Vs(t.previousSibling))return _u.before(t);if(Vs(t))return _u(t,0)}if(ws(e)){if($s(t.nextSibling)&&!Vs(t.nextSibling))return _u.after(t);if(Vs(t))return _u(t,t.data.length)}return ws(e)?qs(t)?_u.before(t):_u.after(t):_u.before(t)},Gs=function(e,t,n){var r,o,i,a,u;if(!Hs(n)||!t)return null;if(t.isEqual(_u.after(n))&&n.lastChild){if(u=_u.after(n.lastChild),ws(e)&&$s(n.lastChild)&&Hs(n.lastChild))return qs(n.lastChild)?_u.before(n.lastChild):u}else u=t;var s,c,l,f=u.container(),d=u.offset();if(Vs(f)){if(ws(e)&&0<d)return _u(f,--d);if(xs(e)&&d<f.length)return _u(f,++d);r=f}else{if(ws(e)&&0<d&&(o=Xs(f,d-1),$s(o)))return!Ws(o)&&(i=Es(o,e,Ks,o))?Vs(i)?_u(i,i.data.length):_u.after(i):Vs(o)?_u(o,o.data.length):_u.before(o);if(xs(e)&&d<f.childNodes.length&&(o=Xs(f,d),$s(o)))return qs(o)?(s=n,(l=(c=o).nextSibling)&&$s(l)?Vs(l)?_u(l,0):_u.before(l):Gs(Tu.Forwards,_u.after(c),s)):!Ws(o)&&(i=Es(o,e,Ks,o))?Vs(i)?_u(i,0):_u.before(i):Vs(o)?_u(o,0):_u.after(o);r=o||u.getNode()}return(xs(e)&&u.isAtEnd()||ws(e)&&u.isAtStart())&&(r=Es(r,e,q(!0),n,!0),Ks(r,n))?Ys(e,r):(o=Es(r,e,Ks,n),!(a=Ht.last(U(function(e,t){for(var n=[];e&&e!==t;)n.push(e),e=e.parentNode;return n}(f,n),js)))||o&&a.contains(o)?o?Ys(e,o):null:u=xs(e)?_u.after(a):_u.before(a))},Js=function(t){return{next:function(e){return Gs(Tu.Forwards,e,t)},prev:function(e){return Gs(Tu.Backwards,e,t)}}},Qs=function(e){return _u.isTextPosition(e)?0===e.offset():Ha(e.getNode())},Zs=function(e){if(_u.isTextPosition(e)){var t=e.container();return e.offset()===t.data.length}return Ha(e.getNode(!0))},ec=function(e,t){return!_u.isTextPosition(e)&&!_u.isTextPosition(t)&&e.getNode()===t.getNode(!0)},tc=function(e,t,n){return e?!ec(t,n)&&(r=t,!(!_u.isTextPosition(r)&&jo.isBr(r.getNode())))&&Zs(t)&&Qs(n):!ec(n,t)&&Qs(t)&&Zs(n);var r},nc=function(e,t,n){var r=Js(t);return _.from(e?r.next(n):r.prev(n))},rc=function(t,n,r){return nc(t,n,r).bind(function(e){return Ts(r,e,n)&&tc(t,r,e)?nc(t,n,e):_.some(e)})},oc=function(t,n,e,r){return rc(t,n,e).bind(function(e){return r(e)?oc(t,n,e,r):_.some(e)})},ic=function(e,t){var n,r,o,i,a,u=e?t.firstChild:t.lastChild;return jo.isText(u)?_.some(_u(u,e?0:u.data.length)):u?Ha(u)?_.some(e?_u.before(u):(a=u,jo.isBr(a)?_u.before(a):_u.after(a))):(r=t,o=u,i=(n=e)?_u.before(o):_u.after(o),nc(n,r,i)):_.none()},ac=d(nc,!0),uc=d(nc,!1),sc={fromPosition:nc,nextPosition:ac,prevPosition:uc,navigate:rc,navigateIgnore:oc,positionIn:ic,firstPositionIn:d(ic,!0),lastPositionIn:d(ic,!1)},cc=function(e,t){return jo.isElement(t)&&e.isBlock(t)&&!t.innerHTML&&!fe.ie&&(t.innerHTML='<br data-mce-bogus="1" />'),t},lc=function(e,t){return sc.lastPositionIn(e).fold(function(){return!1},function(e){return t.setStart(e.container(),e.offset()),t.setEnd(e.container(),e.offset()),!0})},fc=function(e,t,n){return!(!1!==t.hasChildNodes()||!Qu(e,t)||(o=n,i=(r=t).ownerDocument.createTextNode(xa),r.appendChild(i),o.setStart(i,0),o.setEnd(i,0),0));var r,o,i},dc=function(e,t,n,r){var o,i,a,u,s=n[t?"start":"end"],c=e.getRoot();if(s){for(a=s[0],i=c,o=s.length-1;1<=o;o--){if(u=i.childNodes,fc(c,i,r))return!0;if(s[o]>u.length-1)return!!fc(c,i,r)||lc(i,r);i=u[s[o]]}3===i.nodeType&&(a=Math.min(s[0],i.nodeValue.length)),1===i.nodeType&&(a=Math.min(s[0],i.childNodes.length)),t?r.setStart(i,a):r.setEnd(i,a)}return!0},mc=function(e){return jo.isText(e)&&0<e.data.length},gc=function(e,t,n){var r,o,i,a,u,s,c=e.get(n.id+"_"+t),l=n.keep;if(c){if(r=c.parentNode,"start"===t?l?c.hasChildNodes()?(r=c.firstChild,o=1):mc(c.nextSibling)?(r=c.nextSibling,o=0):mc(c.previousSibling)?(r=c.previousSibling,o=c.previousSibling.data.length):(r=c.parentNode,o=e.nodeIndex(c)+1):o=e.nodeIndex(c):l?c.hasChildNodes()?(r=c.firstChild,o=1):mc(c.previousSibling)?(r=c.previousSibling,o=c.previousSibling.data.length):(r=c.parentNode,o=e.nodeIndex(c)):o=e.nodeIndex(c),u=r,s=o,!l){for(a=c.previousSibling,i=c.nextSibling,Xt.each(Xt.grep(c.childNodes),function(e){jo.isText(e)&&(e.nodeValue=e.nodeValue.replace(/\uFEFF/g,""))});c=e.get(n.id+"_"+t);)e.remove(c,!0);a&&i&&a.nodeType===i.nodeType&&jo.isText(a)&&!fe.opera&&(o=a.nodeValue.length,a.appendData(i.nodeValue),e.remove(i),u=a,s=o)}return _.some(_u(u,s))}return _.none()},pc=function(e,t){var n,r,o,i,a,u,s,c,l,f,d,m,g,p,h,v,y=e.dom;if(t){if(v=t,Xt.isArray(v.start))return p=t,h=(g=y).createRng(),dc(g,!0,p,h)&&dc(g,!1,p,h)?_.some(h):_.none();if("string"==typeof t.start)return _.some((f=t,d=(l=y).createRng(),m=Fu(l.getRoot(),f.start),d.setStart(m.container(),m.offset()),m=Fu(l.getRoot(),f.end),d.setEnd(m.container(),m.offset()),d));if(t.hasOwnProperty("id"))return s=gc(o=y,"start",i=t),c=gc(o,"end",i),ru(s,(u=s,(a=c).isSome()?a:u),function(e,t){var n=o.createRng();return n.setStart(cc(o,e.container()),e.offset()),n.setEnd(cc(o,t.container()),t.offset()),n});if(t.hasOwnProperty("name"))return n=y,r=t,_.from(n.select(r.name)[r.index]).map(function(e){var t=n.createRng();return t.selectNode(e),t});if(t.hasOwnProperty("rng"))return _.some(t.rng)}return _.none()},hc=function(e,t,n){return Yu.getBookmark(e,t,n)},vc=function(t,e){pc(t,e).each(function(e){t.setRng(e)})},yc=function(e){return jo.isElement(e)&&"SPAN"===e.tagName&&"bookmark"===e.getAttribute("data-mce-type")},bc=function(e){return e&&/^(IMG)$/.test(e.nodeName)},Cc=function(e){return e&&3===e.nodeType&&/^([\t \r\n]+|)$/.test(e.nodeValue)},xc=function(e,t,n){return"color"!==n&&"backgroundColor"!==n||(t=e.toHex(t)),"fontWeight"===n&&700===t&&(t="bold"),"fontFamily"===n&&(t=t.replace(/[\'\"]/g,"").replace(/,\s+/g,",")),""+t},wc={isInlineBlock:bc,moveStart:function(e,t,n){var r,o,i,a=n.startOffset,u=n.startContainer;if((n.startContainer!==n.endContainer||!bc(n.startContainer.childNodes[n.startOffset]))&&1===u.nodeType)for(a<(i=u.childNodes).length?r=new go(u=i[a],e.getParent(u,e.isBlock)):(r=new go(u=i[i.length-1],e.getParent(u,e.isBlock))).next(!0),o=r.current();o;o=r.next())if(3===o.nodeType&&!Cc(o))return n.setStart(o,0),void t.setRng(n)},getNonWhiteSpaceSibling:function(e,t,n){if(e)for(t=t?"nextSibling":"previousSibling",e=n?e:e[t];e;e=e[t])if(1===e.nodeType||!Cc(e))return e},isTextBlock:function(e,t){return t.nodeType&&(t=t.nodeName),!!e.schema.getTextBlockElements()[t.toLowerCase()]},isValid:function(e,t,n){return e.schema.isValidChild(t,n)},isWhiteSpaceNode:Cc,replaceVars:function(e,n){return"string"!=typeof e?e=e(n):n&&(e=e.replace(/%(\w+)/g,function(e,t){return n[t]||e})),e},isEq:function(e,t){return t=t||"",e=""+((e=e||"").nodeName||e),t=""+(t.nodeName||t),e.toLowerCase()===t.toLowerCase()},normalizeStyleValue:xc,getStyle:function(e,t,n){return xc(e,e.getStyle(t,n),n)},getTextDecoration:function(t,e){var n;return t.getParent(e,function(e){return(n=t.getStyle(e,"text-decoration"))&&"none"!==n}),n},getParents:function(e,t,n){return e.getParents(t,n,e.getRoot())}},Nc=yc,Ec=wc.getParents,Sc=wc.isWhiteSpaceNode,Tc=wc.isTextBlock,kc=function(e,t){for(void 0===t&&(t=3===e.nodeType?e.length:e.childNodes.length);e&&e.hasChildNodes();)(e=e.childNodes[t])&&(t=3===e.nodeType?e.length:e.childNodes.length);return{node:e,offset:t}},_c=function(e,t){for(var n=t;n;){if(1===n.nodeType&&e.getContentEditable(n))return"false"===e.getContentEditable(n)?n:t;n=n.parentNode}return t},Ac=function(e,t,n,r){var o,i,a=n.nodeValue;return void 0===r&&(r=e?a.length:0),e?(o=a.lastIndexOf(" ",r),-1!==(o=(i=a.lastIndexOf("\xa0",r))<o?o:i)&&!t&&(o<r||!e)&&o<=a.length&&o++):(o=a.indexOf(" ",r),i=a.indexOf("\xa0",r),o=-1!==o&&(-1===i||o<i)?o:i),o},Rc=function(e,t,n,r,o,i){var a,u,s,c;if(3===n.nodeType){if(-1!==(s=Ac(o,i,n,r)))return{container:n,offset:s};c=n}for(a=new go(n,e.getParent(n,e.isBlock)||t);u=a[o?"prev":"next"]();)if(3!==u.nodeType||Nc(u.parentNode)){if(e.isBlock(u)||wc.isEq(u,"BR"))break}else if(-1!==(s=Ac(o,i,c=u)))return{container:u,offset:s};if(c)return{container:c,offset:r=o?0:c.length}},Dc=function(e,t,n,r,o){var i,a,u,s;for(3===r.nodeType&&0===r.nodeValue.length&&r[o]&&(r=r[o]),i=Ec(e,r),a=0;a<i.length;a++)for(u=0;u<t.length;u++)if(!("collapsed"in(s=t[u])&&s.collapsed!==n.collapsed)&&e.is(i[a],s.selector))return i[a];return r},Oc=function(t,e,n,r){var o,i=t.dom,a=i.getRoot();if(e[0].wrapper||(o=i.getParent(n,e[0].block,a)),!o){var u=i.getParent(n,"LI,TD,TH");o=i.getParent(3===n.nodeType?n.parentNode:n,function(e){return e!==a&&Tc(t,e)},u)}if(o&&e[0].wrapper&&(o=Ec(i,o,"ul,ol").reverse()[0]||o),!o)for(o=n;o[r]&&!i.isBlock(o[r])&&(o=o[r],!wc.isEq(o,"br")););return o||n},Bc=function(e,t,n,r,o,i,a){var u,s,c,l,f,d;if(u=s=a?n:o,l=a?"previousSibling":"nextSibling",f=e.getRoot(),3===u.nodeType&&!Sc(u)&&(a?0<r:i<u.nodeValue.length))return u;for(;;){if(!t[0].block_expand&&e.isBlock(s))return s;for(c=s[l];c;c=c[l])if(!Nc(c)&&!Sc(c)&&("BR"!==(d=c).nodeName||!d.getAttribute("data-mce-bogus")||d.nextSibling))return s;if(s===f||s.parentNode===f){u=s;break}s=s.parentNode}return u},Pc=function(e,t,n,r){var o,i=t.startContainer,a=t.startOffset,u=t.endContainer,s=t.endOffset,c=e.dom;return 1===i.nodeType&&i.hasChildNodes()&&3===(i=eu(i,a)).nodeType&&(a=0),1===u.nodeType&&u.hasChildNodes()&&3===(u=eu(u,t.collapsed?s:s-1)).nodeType&&(s=u.nodeValue.length),i=_c(c,i),u=_c(c,u),(Nc(i.parentNode)||Nc(i))&&(i=Nc(i)?i:i.parentNode,3===(i=t.collapsed?i.previousSibling||i:i.nextSibling||i).nodeType&&(a=t.collapsed?i.length:0)),(Nc(u.parentNode)||Nc(u))&&(u=Nc(u)?u:u.parentNode,3===(u=t.collapsed?u.nextSibling||u:u.previousSibling||u).nodeType&&(s=t.collapsed?0:u.length)),t.collapsed&&((o=Rc(c,e.getBody(),i,a,!0,r))&&(i=o.container,a=o.offset),(o=Rc(c,e.getBody(),u,s,!1,r))&&(u=o.container,s=o.offset)),n[0].inline&&(u=r?u:function(e,t){var n=kc(e,t);if(n.node){for(;n.node&&0===n.offset&&n.node.previousSibling;)n=kc(n.node.previousSibling);n.node&&0<n.offset&&3===n.node.nodeType&&" "===n.node.nodeValue.charAt(n.offset-1)&&1<n.offset&&(e=n.node).splitText(n.offset-1)}return e}(u,s)),(n[0].inline||n[0].block_expand)&&(n[0].inline&&3===i.nodeType&&0!==a||(i=Bc(c,n,i,a,u,s,!0)),n[0].inline&&3===u.nodeType&&s!==u.nodeValue.length||(u=Bc(c,n,i,a,u,s,!1))),n[0].selector&&!1!==n[0].expand&&!n[0].inline&&(i=Dc(c,n,t,i,"previousSibling"),u=Dc(c,n,t,u,"nextSibling")),(n[0].block||n[0].selector)&&(i=Oc(e,n,i,"previousSibling"),u=Oc(e,n,u,"nextSibling"),n[0].block&&(c.isBlock(i)||(i=Bc(c,n,i,a,u,s,!0)),c.isBlock(u)||(u=Bc(c,n,i,a,u,s,!1)))),1===i.nodeType&&(a=c.nodeIndex(i),i=i.parentNode),1===u.nodeType&&(s=c.nodeIndex(u)+1,u=u.parentNode),{startContainer:i,startOffset:a,endContainer:u,endOffset:s}},Ic=Xt.each,Lc=function(e,t,o){var n,r,i,a,u,s,c,l=t.startContainer,f=t.startOffset,d=t.endContainer,m=t.endOffset;if(0<(c=e.select("td[data-mce-selected],th[data-mce-selected]")).length)Ic(c,function(e){o([e])});else{var g,p,h,v=function(e){var t;return 3===(t=e[0]).nodeType&&t===l&&f>=t.nodeValue.length&&e.splice(0,1),t=e[e.length-1],0===m&&0<e.length&&t===d&&3===t.nodeType&&e.splice(e.length-1,1),e},y=function(e,t,n){for(var r=[];e&&e!==n;e=e[t])r.push(e);return r},b=function(e,t){do{if(e.parentNode===t)return e;e=e.parentNode}while(e)},C=function(e,t,n){var r=n?"nextSibling":"previousSibling";for(u=(a=e).parentNode;a&&a!==t;a=u)u=a.parentNode,(s=y(a===e?a:a[r],r)).length&&(n||s.reverse(),o(v(s)))};if(1===l.nodeType&&l.hasChildNodes()&&(l=l.childNodes[f]),1===d.nodeType&&d.hasChildNodes()&&(p=m,h=(g=d).childNodes,--p>h.length-1?p=h.length-1:p<0&&(p=0),d=h[p]||g),l===d)return o(v([l]));for(n=e.findCommonAncestor(l,d),a=l;a;a=a.parentNode){if(a===d)return C(l,n,!0);if(a===n)break}for(a=d;a;a=a.parentNode){if(a===l)return C(d,n);if(a===n)break}r=b(l,n)||l,i=b(d,n)||d,C(l,r,!0),(s=y(r===l?r:r.nextSibling,"nextSibling",i===d?i.nextSibling:i)).length&&o(v(s)),C(d,i)}},Fc=(Ms=mr,zs="text",{get:function(e){if(!Ms(e))throw new Error("Can only get "+zs+" value of a "+zs+" node");return Us(e).getOr("")},getOption:Us=function(e){return Ms(e)?_.from(e.dom().nodeValue):_.none()},set:function(e,t){if(!Ms(e))throw new Error("Can only set raw "+zs+" value of a "+zs+" node");e.dom().nodeValue=t}}),Mc=function(e){return Fc.get(e)},zc=function(r,o,i,a){return Vr(o).fold(function(){return"skipping"},function(e){return"br"===a||mr(n=o)&&"\ufeff"===Mc(n)?"valid":dr(t=o)&&Gi(t,aa())?"existing":Ju(o)?"caret":wc.isValid(r,i,a)&&wc.isValid(r,lr(e),i)?"valid":"invalid-child";var t,n})},Uc=function(e,t,n,r){var o,i,a=t.uid,u=void 0===a?(o="mce-annotation",i=(new Date).getTime(),o+"_"+Math.floor(1e9*Math.random())+ ++ga+String(i)):a,s=function(e,t){var n={};for(var r in e)Object.prototype.hasOwnProperty.call(e,r)&&t.indexOf(r)<0&&(n[r]=e[r]);if(null!=e&&"function"==typeof Object.getOwnPropertySymbols){var o=0;for(r=Object.getOwnPropertySymbols(e);o<r.length;o++)t.indexOf(r[o])<0&&Object.prototype.propertyIsEnumerable.call(e,r[o])&&(n[r[o]]=e[r[o]])}return n}(t,["uid"]),c=ar.fromTag("span",e);Xi(c,aa()),wr(c,""+sa(),u),wr(c,""+ua(),n);var l,f=r(u,s),d=f.attributes,m=void 0===d?{}:d,g=f.classes,p=void 0===g?[]:g;return Nr(c,m),l=c,z(p,function(e){Xi(l,e)}),c},jc=function(i,e,t,n,r){var a=[],u=Uc(i.getDoc(),r,t,n),s=Hi(_.none()),c=function(){s.set(_.none())},l=function(e){z(e,o)},o=function(e){var t,n;switch(zc(i,e,"span",lr(e))){case"invalid-child":c();var r=Kr(e);l(r),c();break;case"valid":var o=s.get().getOrThunk(function(){var e=ha(u);return a.push(e),s.set(_.some(e)),e});Pi(t=e,n=o),Fi(n,t)}};return Lc(i.dom,e,function(e){var t;c(),t=W(e,ar.fromDom),l(t)}),a},Vc=function(s,c,l,f){s.undoManager.transact(function(){var e,t,n,r,o=s.selection.getRng();if(o.collapsed&&(r=Pc(e=s,t=o,[{inline:!0}],3===(n=t).startContainer.nodeType&&n.startContainer.nodeValue.length>=n.startOffset&&"\xa0"===n.startContainer.nodeValue[n.startOffset]),t.setStart(r.startContainer,r.startOffset),t.setEnd(r.endContainer,r.endOffset),e.selection.setRng(t)),s.selection.getRng().collapsed){var i=Uc(s.getDoc(),f,c,l.decorate);ya(i,"\xa0"),s.selection.getRng().insertNode(i.dom()),s.selection.select(i.dom())}else{var a=Yu.getPersistentBookmark(s.selection,!1),u=s.selection.getRng();jc(s,u,c,l.decorate,f),s.selection.moveToBookmark(a)}})};function Hc(s){var n,r=(n={},{register:function(e,t){n[e]={name:e,settings:t}},lookup:function(e){return n.hasOwnProperty(e)?_.from(n[e]).map(function(e){return e.settings}):_.none()}});da(s,r);var o=fa(s);return{register:function(e,t){r.register(e,t)},annotate:function(t,n){r.lookup(t).each(function(e){Vc(s,t,e,n)})},annotationChanged:function(e,t){o.addListener(e,t)},remove:function(e){ca(s,_.some(e)).each(function(e){var t=e.elements;z(t,ji)})},getAll:function(e){var t,n,r,o,i,a,u=(t=s,n=e,r=ar.fromDom(t.getBody()),o=Qi(r,"["+ua()+'="'+n+'"]'),i={},z(o,function(e){var t=Er(e,sa()),n=i.hasOwnProperty(t)?i[t]:[];i[t]=n.concat([e])}),i);return a=function(e){return W(e,function(e){return e.dom()})},vr(u,function(e,t){return{k:t,v:a(e,t)}})}}}var qc=function(e){return Xt.grep(e.childNodes,function(e){return"LI"===e.nodeName})},$c=function(e){return e&&e.firstChild&&e.firstChild===e.lastChild&&("\xa0"===(t=e.firstChild).data||jo.isBr(t));var t},Wc=function(e){return 0<e.length&&(!(t=e[e.length-1]).firstChild||$c(t))?e.slice(0,-1):e;var t},Kc=function(e,t){var n=e.getParent(t,e.isBlock);return n&&"LI"===n.nodeName?n:null},Xc=function(e,t){var n=_u.after(e),r=Js(t).prev(n);return r?r.toRange():null},Yc=function(t,e,n){var r,o,i,a,u=t.parentNode;return Xt.each(e,function(e){u.insertBefore(e,t)}),r=t,o=n,i=_u.before(r),(a=Js(o).next(i))?a.toRange():null},Gc=function(e,t){var n,r,o,i,a,u,s=t.firstChild,c=t.lastChild;return s&&"meta"===s.name&&(s=s.next),c&&"mce_marker"===c.attr("id")&&(c=c.prev),r=c,u=(n=e).getNonEmptyElements(),r&&(r.isEmpty(u)||(o=r,n.getBlockElements()[o.name]&&(a=o).firstChild&&a.firstChild===a.lastChild&&("br"===(i=o.firstChild).name||"\xa0"===i.value)))&&(c=c.prev),!(!s||s!==c||"ul"!==s.name&&"ol"!==s.name)},Jc=function(e,o,i,t){var n,r,a,u,s,c,l,f,d,m,g,p,h,v,y,b,C,x,w,N=(n=o,r=t,c=e.serialize(r),l=n.createFragment(c),u=(a=l).firstChild,s=a.lastChild,u&&"META"===u.nodeName&&u.parentNode.removeChild(u),s&&"mce_marker"===s.id&&s.parentNode.removeChild(s),a),E=Kc(o,i.startContainer),S=Wc(qc(N.firstChild)),T=o.getRoot(),k=function(e){var t=_u.fromRangeStart(i),n=Js(o.getRoot()),r=1===e?n.prev(t):n.next(t);return!r||Kc(o,r.getNode())!==E};return k(1)?Yc(E,S,T):k(2)?(f=E,d=S,m=T,o.insertAfter(d.reverse(),f),Xc(d[0],m)):(p=S,h=T,v=g=E,b=(y=i).cloneRange(),C=y.cloneRange(),b.setStartBefore(v),C.setEndAfter(v),x=[b.cloneContents(),C.cloneContents()],(w=g.parentNode).insertBefore(x[0],g),Xt.each(p,function(e){w.insertBefore(e,g)}),w.insertBefore(x[1],g),w.removeChild(g),Xc(p[p.length-1],h))},Qc=function(e,t){return!!Kc(e,t)},Zc=Xt.each,el=function(o){this.compare=function(e,t){if(e.nodeName!==t.nodeName)return!1;var n=function(n){var r={};return Zc(o.getAttribs(n),function(e){var t=e.nodeName.toLowerCase();0!==t.indexOf("_")&&"style"!==t&&0!==t.indexOf("data-")&&(r[t]=o.getAttrib(n,t))}),r},r=function(e,t){var n,r;for(r in e)if(e.hasOwnProperty(r)){if(void 0===(n=t[r]))return!1;if(e[r]!==n)return!1;delete t[r]}for(r in t)if(t.hasOwnProperty(r))return!1;return!0};return!(!r(n(e),n(t))||!r(o.parseStyle(o.getAttrib(e,"style")),o.parseStyle(o.getAttrib(t,"style")))||yc(e)||yc(t))}},tl=function(e){var t=Qi(e,"br"),n=U(function(e){for(var t=[],n=e.dom();n;)t.push(ar.fromDom(n)),n=n.lastChild;return t}(e).slice(-1),wo);t.length===n.length&&z(n,Ui)},nl=function(e){zi(e),Fi(e,ar.fromHtml('<br data-mce-bogus="1">'))},rl=function(n){Gr(n).each(function(t){Hr(t).each(function(e){Co(n)&&wo(t)&&Co(e)&&Ui(t)})})},ol=Xt.makeMap;function il(e){var u,s,c,l,f,d=[];return u=(e=e||{}).indent,s=ol(e.indent_before||""),c=ol(e.indent_after||""),l=ti.getEncodeFunc(e.entity_encoding||"raw",e.entities),f="html"===e.element_format,{start:function(e,t,n){var r,o,i,a;if(u&&s[e]&&0<d.length&&0<(a=d[d.length-1]).length&&"\n"!==a&&d.push("\n"),d.push("<",e),t)for(r=0,o=t.length;r<o;r++)i=t[r],d.push(" ",i.name,'="',l(i.value,!0),'"');d[d.length]=!n||f?">":" />",n&&u&&c[e]&&0<d.length&&0<(a=d[d.length-1]).length&&"\n"!==a&&d.push("\n")},end:function(e){var t;d.push("</",e,">"),u&&c[e]&&0<d.length&&0<(t=d[d.length-1]).length&&"\n"!==t&&d.push("\n")},text:function(e,t){0<e.length&&(d[d.length]=t?e:l(e))},cdata:function(e){d.push("<![CDATA[",e,"]]>")},comment:function(e){d.push("\x3c!--",e,"--\x3e")},pi:function(e,t){t?d.push("<?",e," ",l(t),"?>"):d.push("<?",e,"?>"),u&&d.push("\n")},doctype:function(e){d.push("<!DOCTYPE",e,">",u?"\n":"")},reset:function(){d.length=0},getContent:function(){return d.join("").replace(/\n$/,"")}}}function al(t,g){void 0===g&&(g=di());var p=il(t);return(t=t||{}).validate=!("validate"in t)||t.validate,{serialize:function(e){var f,d;d=t.validate,f={3:function(e){p.text(e.value,e.raw)},8:function(e){p.comment(e.value)},7:function(e){p.pi(e.name,e.value)},10:function(e){p.doctype(e.value)},4:function(e){p.cdata(e.value)},11:function(e){if(e=e.firstChild)for(;m(e),e=e.next;);}},p.reset();var m=function(e){var t,n,r,o,i,a,u,s,c,l=f[e.type];if(l)l(e);else{if(t=e.name,n=e.shortEnded,r=e.attributes,d&&r&&1<r.length&&((a=[]).map={},c=g.getElementRule(e.name))){for(u=0,s=c.attributesOrder.length;u<s;u++)(o=c.attributesOrder[u])in r.map&&(i=r.map[o],a.map[o]=i,a.push({name:o,value:i}));for(u=0,s=r.length;u<s;u++)(o=r[u].name)in a.map||(i=r.map[o],a.map[o]=i,a.push({name:o,value:i}));r=a}if(p.start(e.name,r,n),!n){if(e=e.firstChild)for(;m(e),e=e.next;);p.end(t)}}};return 1!==e.type||t.inner?f[11](e):m(e),p.getContent()}}}var ul,sl=function(a){var u=_u.fromRangeStart(a),s=_u.fromRangeEnd(a),c=a.commonAncestorContainer;return sc.fromPosition(!1,c,s).map(function(e){return!Ts(u,s,c)&&Ts(u,e,c)?(t=u.container(),n=u.offset(),r=e.container(),o=e.offset(),(i=V.document.createRange()).setStart(t,n),i.setEnd(r,o),i):a;var t,n,r,o,i}).getOr(a)},cl=function(e){return e.collapsed?e:sl(e)},ll=jo.matchNodeNames("td th"),fl=function(e,t){var n,r,o=e.selection.getRng(),i=o.startContainer,a=o.startOffset;o.collapsed&&(n=i,r=a,jo.isText(n)&&"\xa0"===n.nodeValue[r-1])&&jo.isText(i)&&(i.insertData(a-1," "),i.deleteData(a,1),o.setStart(i,a),o.setEnd(i,a),e.selection.setRng(o)),e.selection.setContent(t)},dl=function(e,t,n){var r,o,i,a,u,s,c,l,f,d,m,g=e.selection,p=e.dom;if(/^ | $/.test(t)&&(t=function(e,t){var n,r;n=e.startContainer,r=e.startOffset;var o=function(e){return n[e]&&3===n[e].nodeType};return 3===n.nodeType&&(0<r?t=t.replace(/^&nbsp;/," "):o("previousSibling")||(t=t.replace(/^ /,"&nbsp;")),r<n.length?t=t.replace(/&nbsp;(<br>|)$/," "):o("nextSibling")||(t=t.replace(/(&nbsp;| )(<br>|)$/,"&nbsp;"))),t}(g.getRng(),t)),r=e.parser,m=n.merge,o=al({validate:e.settings.validate},e.schema),d='<span id="mce_marker" data-mce-type="bookmark">&#xFEFF;&#x200B;</span>',s={content:t,format:"html",selection:!0,paste:n.paste},(s=e.fire("BeforeSetContent",s)).isDefaultPrevented())e.fire("SetContent",{content:s.content,format:"html",selection:!0,paste:n.paste});else{-1===(t=s.content).indexOf("{$caret}")&&(t+="{$caret}"),t=t.replace(/\{\$caret\}/,d);var h,v,y,b,C,x,w=(l=g.getRng()).startContainer||(l.parentElement?l.parentElement():null),N=e.getBody();w===N&&g.isCollapsed()&&p.isBlock(N.firstChild)&&(h=e,(v=N.firstChild)&&!h.schema.getShortEndedElements()[v.nodeName])&&p.isEmpty(N.firstChild)&&((l=p.createRng()).setStart(N.firstChild,0),l.setEnd(N.firstChild,0),g.setRng(l)),g.isCollapsed()||(e.selection.setRng(cl(e.selection.getRng())),e.getDoc().execCommand("Delete",!1,null),y=e.selection.getRng(),b=t,C=y.startContainer,x=y.startOffset,3===C.nodeType&&y.collapsed&&("\xa0"===C.data[x]?(C.deleteData(x,1),/[\u00a0| ]$/.test(b)||(b+=" ")):"\xa0"===C.data[x-1]&&(C.deleteData(x-1,1),/[\u00a0| ]$/.test(b)||(b=" "+b))),t=b);var E,S,T,k={context:(i=g.getNode()).nodeName.toLowerCase(),data:n.data,insert:!0};if(u=r.parse(t,k),!0===n.paste&&Gc(e.schema,u)&&Qc(p,i))return l=Jc(o,p,e.selection.getRng(),u),e.selection.setRng(l),void e.fire("SetContent",s);if(function(e){for(var t=e;t=t.walk();)1===t.type&&t.attr("data-mce-fragment","1")}(u),"mce_marker"===(f=u.lastChild).attr("id"))for(f=(c=f).prev;f;f=f.walk(!0))if(3===f.type||!p.isBlock(f.name)){e.schema.isValidChild(f.parent.name,"span")&&f.parent.insert(c,f,"br"===f.name);break}if(e._selectionOverrides.showBlockCaretContainer(i),k.invalid){for(fl(e,d),i=g.getNode(),a=e.getBody(),9===i.nodeType?i=f=a:f=i;f!==a;)f=(i=f).parentNode;t=i===a?a.innerHTML:p.getOuterHTML(i),t=o.serialize(r.parse(t.replace(/<span (id="mce_marker"|id=mce_marker).+?<\/span>/i,function(){return o.serialize(u)}))),i===a?p.setHTML(a,t):p.setOuterHTML(i,t)}else!function(e,t,n){if("all"===n.getAttribute("data-mce-bogus"))n.parentNode.insertBefore(e.dom.createFragment(t),n);else{var r=n.firstChild,o=n.lastChild;!r||r===o&&"BR"===r.nodeName?e.dom.setHTML(n,t):fl(e,t)}}(e,t=o.serialize(u),i);!function(e,t){var n=e.schema.getTextInlineElements(),r=e.dom;if(t){var o=e.getBody(),i=new el(r);Xt.each(r.select("*[data-mce-fragment]"),function(e){for(var t=e.parentNode;t&&t!==o;t=t.parentNode)n[e.nodeName.toLowerCase()]&&i.compare(t,e)&&r.remove(e,!0)})}}(e,m),function(n,e){var t,r,o,i,a,u=n.dom,s=n.selection;if(e){if(n.selection.scrollIntoView(e),t=function(e){for(var t=n.getBody();e&&e!==t;e=e.parentNode)if("false"===n.dom.getContentEditable(e))return e;return null}(e))return u.remove(e),s.select(t);var c=u.createRng();(i=e.previousSibling)&&3===i.nodeType?(c.setStart(i,i.nodeValue.length),fe.ie||(a=e.nextSibling)&&3===a.nodeType&&(i.appendData(a.data),a.parentNode.removeChild(a))):(c.setStartBefore(e),c.setEndBefore(e)),r=u.getParent(e,u.isBlock),u.remove(e),r&&u.isEmpty(r)&&(n.$(r).empty(),c.setStart(r,0),c.setEnd(r,0),ll(r)||r.getAttribute("data-mce-fragment")||!(o=function(e){var t=_u.fromRangeStart(e);if(t=Js(n.getBody()).next(t))return t.toRange()}(c))?u.add(r,u.create("br",{"data-mce-bogus":"1"})):(c=o,u.remove(r))),s.setRng(c)}}(e,p.get("mce_marker")),E=e.getBody(),Xt.each(E.getElementsByTagName("*"),function(e){e.removeAttribute("data-mce-fragment")}),S=e.dom,T=e.selection.getStart(),_.from(S.getParent(T,"td,th")).map(ar.fromDom).each(rl),e.fire("SetContent",s),e.addVisual()}},ml=function(e,t){var n,r,o="string"!=typeof(n=t)?(r=Xt.extend({paste:n.paste,data:{paste:n.paste}},n),{content:n.content,details:r}):{content:n,details:{}};dl(e,o.content,o.details)},gl=/[\u0591-\u07FF\uFB1D-\uFDFF\uFE70-\uFEFC]/,pl=function(e,t,n){var r=e.getParam(t,n);if(-1!==r.indexOf("=")){var o=e.getParam(t,"","hash");return o.hasOwnProperty(e.id)?o[e.id]:n}return r},hl=function(e){return e.getParam("iframe_attrs",{})},vl=function(e){return e.getParam("doctype","<!DOCTYPE html>")},yl=function(e){return e.getParam("document_base_url","")},bl=function(e){return pl(e,"body_id","tinymce")},Cl=function(e){return pl(e,"body_class","")},xl=function(e){return e.getParam("content_security_policy","")},wl=function(e){return e.getParam("br_in_pre",!0)},Nl=function(e){if(e.getParam("force_p_newlines",!1))return"p";var t=e.getParam("forced_root_block","p");return!1===t?"":t},El=function(e){return e.getParam("forced_root_block_attrs",{})},Sl=function(e){return e.getParam("br_newline_selector",".mce-toc h2,figcaption,caption")},Tl=function(e){return e.getParam("no_newline_selector","")},kl=function(e){return e.getParam("keep_styles",!0)},_l=function(e){return e.getParam("end_container_on_empty_block",!1)},Al=function(e){return Xt.explode(e.getParam("font_size_style_values",""))},Rl=function(e){return Xt.explode(e.getParam("font_size_classes",""))},Dl=function(e){return e.getParam("images_dataimg_filter",q(!0),"function")},Ol=function(e){return e.getParam("automatic_uploads",!0,"boolean")},Bl=function(e){return e.getParam("images_reuse_filename",!1,"boolean")},Pl=function(e){return e.getParam("images_replace_blob_uris",!0,"boolean")},Il=function(e){return e.getParam("images_upload_url","","string")},Ll=function(e){return e.getParam("images_upload_base_path","","string")},Fl=function(e){return e.getParam("images_upload_credentials",!1,"boolean")},Ml=function(e){return e.getParam("images_upload_handler",null,"function")},zl=function(e){return e.getParam("content_css_cors",!1,"boolean")},Ul=function(e){return e.getParam("inline_boundaries_selector","a[href],code,.mce-annotation","string")},jl=function(e,t){if(!t)return t;var n=t.container(),r=t.offset();return e?Ta(n)?jo.isText(n.nextSibling)?_u(n.nextSibling,0):_u.after(n):Aa(t)?_u(n,r+1):t:Ta(n)?jo.isText(n.previousSibling)?_u(n.previousSibling,n.previousSibling.data.length):_u.before(n):Ra(t)?_u(n,r-1):t},Vl={isInlineTarget:function(e,t){return Lr(ar.fromDom(t),Ul(e))},findRootInline:function(e,t,n){var r,o,i,a=(r=e,o=t,i=n,U(Si.DOM.getParents(i.container(),"*",o),r));return _.from(a[a.length-1])},isRtl:function(e){return"rtl"===Si.DOM.getStyle(e,"direction",!0)||(t=e.textContent,gl.test(t));var t},isAtZwsp:function(e){return Aa(e)||Ra(e)},normalizePosition:jl,normalizeForwards:d(jl,!0),normalizeBackwards:d(jl,!1),hasSameParentBlock:function(e,t,n){var r=Ss(t,e),o=Ss(n,e);return r&&r===o}},Hl=function(e,t){return zr(e,t)?na(t,function(e){return No(e)||So(e)},(n=e,function(e){return Mr(n,ar.fromDom(e.dom().parentNode))})):_.none();var n},ql=function(e){var t,n,r;e.dom.isEmpty(e.getBody())&&(e.setContent(""),n=(t=e).getBody(),r=n.firstChild&&t.dom.isBlock(n.firstChild)?n.firstChild:n,t.selection.setCursorLocation(r,0))},$l=function(i,a,u){return ru(sc.firstPositionIn(u),sc.lastPositionIn(u),function(e,t){var n=Vl.normalizePosition(!0,e),r=Vl.normalizePosition(!1,t),o=Vl.normalizePosition(!1,a);return i?sc.nextPosition(u,o).map(function(e){return e.isEqual(r)&&a.isEqual(n)}).getOr(!1):sc.prevPosition(u,o).map(function(e){return e.isEqual(n)&&a.isEqual(r)}).getOr(!1)}).getOr(!0)},Wl=function(e,t){var n,r,o,i=ar.fromDom(e),a=ar.fromDom(t);return n=a,r="pre,code",o=d(Mr,i),ra(n,r,o).isSome()},Kl=function(e,t){return Ha(t)&&!1===(r=e,o=t,jo.isText(o)&&/^[ \t\r\n]*$/.test(o.data)&&!1===Wl(r,o))||(n=t,jo.isElement(n)&&"A"===n.nodeName&&n.hasAttribute("name"))||Xl(t);var n,r,o},Xl=jo.hasAttribute("data-mce-bookmark"),Yl=jo.hasAttribute("data-mce-bogus"),Gl=jo.hasAttributeValue("data-mce-bogus","all"),Jl=function(e){return function(e){var t,n,r=0;if(Kl(e,e))return!1;if(!(n=e.firstChild))return!0;t=new go(n,e);do{if(Gl(n))n=t.next(!0);else if(Yl(n))n=t.next();else if(jo.isBr(n))r++,n=t.next();else{if(Kl(e,n))return!1;n=t.next()}}while(n);return r<=1}(e.dom())},Ql=Ar("block","position"),Zl=Ar("from","to"),ef=function(e,t){var n=ar.fromDom(e),r=ar.fromDom(t.container());return Hl(n,r).map(function(e){return Ql(e,t)})},tf=function(o,i,e){var t=ef(o,_u.fromRangeStart(e)),n=t.bind(function(e){return sc.fromPosition(i,o,e.position()).bind(function(e){return ef(o,e).map(function(e){return t=o,n=i,r=e,jo.isBr(r.position().getNode())&&!1===Jl(r.block())?sc.positionIn(!1,r.block().dom()).bind(function(e){return e.isEqual(r.position())?sc.fromPosition(n,t,e).bind(function(e){return ef(t,e)}):_.some(r)}).getOr(r):r;var t,n,r})})});return ru(t,n,Zl).filter(function(e){return!1===Mr((r=e).from().block(),r.to().block())&&Vr((n=e).from().block()).bind(function(t){return Vr(n.to().block()).filter(function(e){return Mr(t,e)})}).isSome()&&(t=e,!1===jo.isContentEditableFalse(t.from().block().dom())&&!1===jo.isContentEditableFalse(t.to().block().dom()));var t,n,r})},nf=function(e,t,n){return n.collapsed?tf(e,t,n):_.none()},rf=function(e,t,n){return zr(t,e)?function(e,t){for(var n=D(t)?t:b,r=e.dom(),o=[];null!==r.parentNode&&r.parentNode!==undefined;){var i=r.parentNode,a=ar.fromDom(i);if(o.push(a),!0===n(a))break;r=i}return o}(e,function(e){return n(e)||Mr(e,t)}).slice(0,-1):[]},of=function(e,t){return rf(e,t,q(!1))},af=of,uf=function(e,t){return[e].concat(of(e,t))},sf=function(e){var t,n=(t=Kr(e),Y(t,Co).fold(function(){return t},function(e){return t.slice(0,e)}));return z(n,Ui),n},cf=function(e,t){var n=uf(t,e);return X(n.reverse(),Jl).each(Ui)},lf=function(e,t,n,r){if(Jl(n))return nl(n),sc.firstPositionIn(n.dom());0===U($r(r),function(e){return!Jl(e)}).length&&Jl(t)&&Pi(r,ar.fromTag("br"));var o=sc.prevPosition(n.dom(),_u.before(r.dom()));return z(sf(t),function(e){Pi(r,e)}),cf(e,t),o},ff=function(e,t,n){if(Jl(n))return Ui(n),Jl(t)&&nl(t),sc.firstPositionIn(t.dom());var r=sc.lastPositionIn(n.dom());return z(sf(t),function(e){Fi(n,e)}),cf(e,t),r},df=function(e,t){return zr(t,e)?(n=uf(e,t),_.from(n[n.length-1])):_.none();var n},mf=function(e,t){sc.positionIn(e,t.dom()).map(function(e){return e.getNode()}).map(ar.fromDom).filter(wo).each(Ui)},gf=function(e,t,n){return mf(!0,t),mf(!1,n),df(t,n).fold(d(ff,e,t,n),d(lf,e,t,n))},pf=function(e,t,n,r){return t?gf(e,r,n):gf(e,n,r)},hf=function(t,n){var e,r=ar.fromDom(t.getBody());return(e=nf(r.dom(),n,t.selection.getRng()).bind(function(e){return pf(r,n,e.from().block(),e.to().block())})).each(function(e){t.selection.setRng(e.toRange())}),e.isSome()},vf=function(e,t){var n=ar.fromDom(t),r=d(Mr,e);return ta(n,_o,r).isSome()},yf=function(e,t){var n,r,o=sc.prevPosition(e.dom(),_u.fromRangeStart(t)).isNone(),i=sc.nextPosition(e.dom(),_u.fromRangeEnd(t)).isNone();return!(vf(n=e,(r=t).startContainer)||vf(n,r.endContainer))&&o&&i},bf=function(e){var n,r,o,t,i=ar.fromDom(e.getBody()),a=e.selection.getRng();return yf(i,a)?((t=e).setContent(""),t.selection.setCursorLocation(),!0):(n=i,r=e.selection,o=r.getRng(),ru(Hl(n,ar.fromDom(o.startContainer)),Hl(n,ar.fromDom(o.endContainer)),function(e,t){return!1===Mr(e,t)&&(o.deleteContents(),pf(n,!0,e,t).each(function(e){r.setRng(e.toRange())}),!0)}).getOr(!1))},Cf=function(e,t){return!e.selection.isCollapsed()&&bf(e)},xf=function(a){if(!k(a))throw new Error("cases must be an array");if(0===a.length)throw new Error("there must be at least one case");var u=[],n={};return z(a,function(e,r){var t=gr(e);if(1!==t.length)throw new Error("one and only one name per case");var o=t[0],i=e[o];if(n[o]!==undefined)throw new Error("duplicate key detected:"+o);if("cata"===o)throw new Error("cannot have a case named cata (sorry)");if(!k(i))throw new Error("case arguments must be an array");u.push(o),n[o]=function(){var e=arguments.length;if(e!==i.length)throw new Error("Wrong number of arguments to case "+o+". Expected "+i.length+" ("+i+"), got "+e);for(var n=new Array(e),t=0;t<n.length;t++)n[t]=arguments[t];return{fold:function(){if(arguments.length!==a.length)throw new Error("Wrong number of arguments to fold. Expected "+a.length+", got "+arguments.length);return arguments[r].apply(null,n)},match:function(e){var t=gr(e);if(u.length!==t.length)throw new Error("Wrong number of arguments to match. Expected: "+u.join(",")+"\nActual: "+t.join(","));if(!J(u,function(e){return F(t,e)}))throw new Error("Not all branches were specified when using match. Specified: "+t.join(", ")+"\nRequired: "+u.join(", "));return e[o].apply(null,n)},log:function(e){V.console.log(e,{constructors:u,constructor:o,params:n})}}}}),n},wf=function(e){return Is(e).exists(wo)},Nf=function(e,t,n){var r=U(uf(ar.fromDom(n.container()),t),Co),o=Z(r).getOr(t);return sc.fromPosition(e,o.dom(),n).filter(wf)},Ef=function(e,t){return Is(t).exists(wo)||Nf(!0,e,t).isSome()},Sf=function(e,t){return(n=t,_.from(n.getNode(!0)).map(ar.fromDom)).exists(wo)||Nf(!1,e,t).isSome();var n},Tf=d(Nf,!1),kf=d(Nf,!0),_f=(ul="\xa0",function(e){return ul===e}),Af=function(e){return/^[\r\n\t ]$/.test(e)},Rf=function(e){return!Af(e)&&!_f(e)},Df=function(n,r,o){return _.from(o.container()).filter(jo.isText).exists(function(e){var t=n?0:-1;return r(e.data.charAt(o.offset()+t))})},Of=d(Df,!0,Af),Bf=d(Df,!1,Af),Pf=function(e){var t=e.container();return jo.isText(t)&&0===t.data.length},If=function(e,t){var n=ks(e,t);return jo.isContentEditableFalse(n)&&!jo.isBogusAll(n)},Lf=d(If,0),Ff=d(If,-1),Mf=function(e,t){return jo.isTable(ks(e,t))},zf=d(Mf,0),Uf=d(Mf,-1),jf=xf([{remove:["element"]},{moveToElement:["element"]},{moveToPosition:["position"]}]),Vf=function(e,t,n,r){var o=r.getNode(!1===t);return Hl(ar.fromDom(e),ar.fromDom(n.getNode())).map(function(e){return Jl(e)?jf.remove(e.dom()):jf.moveToElement(o)}).orThunk(function(){return _.some(jf.moveToElement(o))})},Hf=function(u,s,c){return sc.fromPosition(s,u,c).bind(function(e){return a=e.getNode(),_o(ar.fromDom(a))||So(ar.fromDom(a))?_.none():(t=u,o=e,i=function(e){return xo(ar.fromDom(e))&&!Ts(r,o,t)},Bs(!(n=s),r=c).fold(function(){return Bs(n,o).fold(q(!1),i)},i)?_.none():s&&jo.isContentEditableFalse(e.getNode())?Vf(u,s,c,e):!1===s&&jo.isContentEditableFalse(e.getNode(!0))?Vf(u,s,c,e):s&&Ff(c)?_.some(jf.moveToPosition(e)):!1===s&&Lf(c)?_.some(jf.moveToPosition(e)):_.none());var t,n,r,o,i,a})},qf=function(r,e,o){return i=e,a=o.getNode(!1===i),u=i?"after":"before",jo.isElement(a)&&a.getAttribute("data-mce-caret")===u?(t=e,n=o.getNode(!1===e),t&&jo.isContentEditableFalse(n.nextSibling)?_.some(jf.moveToElement(n.nextSibling)):!1===t&&jo.isContentEditableFalse(n.previousSibling)?_.some(jf.moveToElement(n.previousSibling)):_.none()).fold(function(){return Hf(r,e,o)},_.some):Hf(r,e,o).bind(function(e){return t=r,n=o,e.fold(function(e){return _.some(jf.remove(e))},function(e){return _.some(jf.moveToElement(e))},function(e){return Ts(n,e,t)?_.none():_.some(jf.moveToPosition(e))});var t,n});var t,n,i,a,u},$f=function(e,t,n){if(0!==n){var r,o,i,a=e.data.slice(t,t+n),u=t+n>=e.data.length,s=0===t;e.replaceData(t,n,(o=s,i=u,j((r=a).split(""),function(e,t){return-1!==" \f\n\r\t\x0B".indexOf(t)||"\xa0"===t?e.previousCharIsSpace||""===e.str&&o||e.str.length===r.length-1&&i?{previousCharIsSpace:!1,str:e.str+"\xa0"}:{previousCharIsSpace:!0,str:e.str+" "}:{previousCharIsSpace:!1,str:e.str+t}},{previousCharIsSpace:!1,str:""}).str))}},Wf=function(e,t){var n,r=e.data.slice(t),o=r.length-(n=r,n.replace(/^\s+/g,"")).length;return $f(e,t,o)},Kf=function(e,t){return r=e,o=(n=t).container(),i=n.offset(),!1===_u.isTextPosition(n)&&o===r.parentNode&&i>_u.before(r).offset()?_u(t.container(),t.offset()-1):t;var n,r,o,i},Xf=function(e){return Ha(e.previousSibling)?_.some((t=e.previousSibling,jo.isText(t)?_u(t,t.data.length):_u.after(t))):e.previousSibling?sc.lastPositionIn(e.previousSibling):_.none();var t},Yf=function(e){return Ha(e.nextSibling)?_.some((t=e.nextSibling,jo.isText(t)?_u(t,0):_u.before(t))):e.nextSibling?sc.firstPositionIn(e.nextSibling):_.none();var t},Gf=function(r,o){return Xf(o).orThunk(function(){return Yf(o)}).orThunk(function(){return e=r,t=o,n=_u.before(t.previousSibling?t.previousSibling:t.parentNode),sc.prevPosition(e,n).fold(function(){return sc.nextPosition(e,_u.after(t))},_.some);var e,t,n})},Jf=function(n,r){return Yf(r).orThunk(function(){return Xf(r)}).orThunk(function(){return e=n,t=r,sc.nextPosition(e,_u.after(t)).fold(function(){return sc.prevPosition(e,_u.before(t))},_.some);var e,t})},Qf=function(e,t,n){return(r=e,o=t,i=n,r?Jf(o,i):Gf(o,i)).map(d(Kf,n));var r,o,i},Zf=function(t,n,e){e.fold(function(){t.focus()},function(e){t.selection.setRng(e.toRange(),n)})},ed=function(e,t){return t&&e.schema.getBlockElements().hasOwnProperty(lr(t))},td=function(e){if(Jl(e)){var t=ar.fromHtml('<br data-mce-bogus="1">');return zi(e),Fi(e,t),_.some(_u.before(t.dom()))}return _.none()},nd=function(e,t,l){var n,r,o,i,a=Hr(e).filter(mr),u=qr(e).filter(mr);return Ui(e),(n=a,r=u,o=t,i=function(e,t,n){var r,o,i,a,u=e.dom(),s=t.dom(),c=u.data.length;return o=s,i=l,a=Jn((r=u).data).length,r.appendData(o.data),Ui(ar.fromDom(o)),i&&Wf(r,a),n.container()===s?_u(u,c):n},n.isSome()&&r.isSome()&&o.isSome()?_.some(i(n.getOrDie(),r.getOrDie(),o.getOrDie())):_.none()).orThunk(function(){return l&&(a.each(function(e){return t=e.dom(),n=e.dom().length,r=t.data.slice(0,n),o=r.length-Jn(r).length,$f(t,n-o,o);var t,n,r,o}),u.each(function(e){return Wf(e.dom(),0)})),t})},rd=function(t,n,e,r){void 0===r&&(r=!0);var o,i,a=Qf(n,t.getBody(),e.dom()),u=ta(e,d(ed,t),(o=t.getBody(),function(e){return e.dom()===o})),s=nd(e,a,(i=e,br(t.schema.getTextInlineElements(),lr(i))));t.dom.isEmpty(t.getBody())?(t.setContent(""),t.selection.setCursorLocation()):u.bind(td).fold(function(){r&&Zf(t,n,s)},function(e){r&&Zf(t,n,_.some(e))})},od=function(a,u){var e,t,n,r,o,i;return(e=a.getBody(),t=u,n=a.selection.getRng(),r=Os(t?1:-1,e,n),o=_u.fromRangeStart(r),i=ar.fromDom(e),!1===t&&Ff(o)?_.some(jf.remove(o.getNode(!0))):t&&Lf(o)?_.some(jf.remove(o.getNode())):!1===t&&Lf(o)&&Sf(i,o)?Tf(i,o).map(function(e){return jf.remove(e.getNode())}):t&&Ff(o)&&Ef(i,o)?kf(i,o).map(function(e){return jf.remove(e.getNode())}):qf(e,t,o)).map(function(e){return e.fold((o=a,i=u,function(e){return o._selectionOverrides.hideFakeCaret(),rd(o,i,ar.fromDom(e)),!0}),(n=a,r=u,function(e){var t=r?_u.before(e):_u.after(e);return n.selection.setRng(t.toRange()),!0}),(t=a,function(e){return t.selection.setRng(e.toRange()),!0}));var t,n,r,o,i}).getOr(!1)},id=function(e,t){var n,r=e.selection.getNode();return!!jo.isContentEditableFalse(r)&&(n=ar.fromDom(e.getBody()),z(Qi(n,".mce-offscreen-selection"),Ui),rd(e,t,ar.fromDom(e.selection.getNode())),ql(e),!0)},ad=function(e,t){return e.selection.isCollapsed()?od(e,t):id(e,t)},ud=function(e){var t,n=function(e,t){for(;t&&t!==e;){if(jo.isContentEditableTrue(t)||jo.isContentEditableFalse(t))return t;t=t.parentNode}return null}(e.getBody(),e.selection.getNode());return jo.isContentEditableTrue(n)&&e.dom.isBlock(n)&&e.dom.isEmpty(n)&&(t=e.dom.create("br",{"data-mce-bogus":"1"}),e.dom.setHTML(n,""),n.appendChild(t),e.selection.setRng(_u.before(t).toRange())),!0},sd=jo.isText,cd=function(e){return sd(e)&&e.data[0]===xa},ld=function(e){return sd(e)&&e.data[e.data.length-1]===xa},fd=function(e){return e.ownerDocument.createTextNode(xa)},dd=function(e,t){return e?function(e){if(sd(e.previousSibling))return ld(e.previousSibling)||e.previousSibling.appendData(xa),e.previousSibling;if(sd(e))return cd(e)||e.insertData(0,xa),e;var t=fd(e);return e.parentNode.insertBefore(t,e),t}(t):function(e){if(sd(e.nextSibling))return cd(e.nextSibling)||e.nextSibling.insertData(0,xa),e.nextSibling;if(sd(e))return ld(e)||e.appendData(xa),e;var t=fd(e);return e.nextSibling?e.parentNode.insertBefore(t,e.nextSibling):e.parentNode.appendChild(t),t}(t)},md=d(dd,!0),gd=d(dd,!1),pd=function(e,t){return jo.isText(e.container())?dd(t,e.container()):dd(t,e.getNode())},hd=function(e,t){var n=t.get();return n&&e.container()===n&&Ta(n)},vd=function(n,e){return e.fold(function(e){ss.remove(n.get());var t=md(e);return n.set(t),_.some(_u(t,t.length-1))},function(e){return sc.firstPositionIn(e).map(function(e){if(hd(e,n))return _u(n.get(),1);ss.remove(n.get());var t=pd(e,!0);return n.set(t),_u(t,1)})},function(e){return sc.lastPositionIn(e).map(function(e){if(hd(e,n))return _u(n.get(),n.get().length-1);ss.remove(n.get());var t=pd(e,!1);return n.set(t),_u(t,t.length-1)})},function(e){ss.remove(n.get());var t=gd(e);return n.set(t),_.some(_u(t,1))})},yd=function(e,t){for(var n=0;n<e.length;n++){var r=e[n].apply(null,t);if(r.isSome())return r}return _.none()},bd=xf([{before:["element"]},{start:["element"]},{end:["element"]},{after:["element"]}]),Cd=function(e,t){var n=Ss(t,e);return n||e},xd=function(e,t,n){var r=Vl.normalizeForwards(n),o=Cd(t,r.container());return Vl.findRootInline(e,o,r).fold(function(){return sc.nextPosition(o,r).bind(d(Vl.findRootInline,e,o)).map(function(e){return bd.before(e)})},_.none)},wd=function(e,t){return null===Qu(e,t)},Nd=function(e,t,n){return Vl.findRootInline(e,t,n).filter(d(wd,t))},Ed=function(e,t,n){var r=Vl.normalizeBackwards(n);return Nd(e,t,r).bind(function(e){return sc.prevPosition(e,r).isNone()?_.some(bd.start(e)):_.none()})},Sd=function(e,t,n){var r=Vl.normalizeForwards(n);return Nd(e,t,r).bind(function(e){return sc.nextPosition(e,r).isNone()?_.some(bd.end(e)):_.none()})},Td=function(e,t,n){var r=Vl.normalizeBackwards(n),o=Cd(t,r.container());return Vl.findRootInline(e,o,r).fold(function(){return sc.prevPosition(o,r).bind(d(Vl.findRootInline,e,o)).map(function(e){return bd.after(e)})},_.none)},kd=function(e){return!1===Vl.isRtl(Ad(e))},_d=function(e,t,n){return yd([xd,Ed,Sd,Td],[e,t,n]).filter(kd)},Ad=function(e){return e.fold($,$,$,$)},Rd=function(e){return e.fold(q("before"),q("start"),q("end"),q("after"))},Dd=function(e){return e.fold(bd.before,bd.before,bd.after,bd.after)},Od=function(n,e,r,t,o,i){return ru(Vl.findRootInline(e,r,t),Vl.findRootInline(e,r,o),function(e,t){return e!==t&&Vl.hasSameParentBlock(r,e,t)?bd.after(n?e:t):i}).getOr(i)},Bd=function(e,r){return e.fold(q(!0),function(e){return n=r,!(Rd(t=e)===Rd(n)&&Ad(t)===Ad(n));var t,n})},Pd=function(e,t){return e?t.fold(H(_.some,bd.start),_.none,H(_.some,bd.after),_.none):t.fold(_.none,H(_.some,bd.before),_.none,H(_.some,bd.end))},Id=function(a,u,s,c){var e=Vl.normalizePosition(a,c),l=_d(u,s,e);return _d(u,s,e).bind(d(Pd,a)).orThunk(function(){return t=a,n=u,r=s,o=l,e=c,i=Vl.normalizePosition(t,e),sc.fromPosition(t,r,i).map(d(Vl.normalizePosition,t)).fold(function(){return o.map(Dd)},function(e){return _d(n,r,e).map(d(Od,t,n,r,i,e)).filter(d(Bd,o))}).filter(kd);var t,n,r,o,e,i})},Ld=_d,Fd=Id,Md=(d(Id,!1),d(Id,!0),Dd),zd=function(e){return e.fold(bd.start,bd.start,bd.end,bd.end)},Ud=function(e){return D(e.selection.getSel().modify)},jd=function(e,t,n){var r=e?1:-1;return t.setRng(_u(n.container(),n.offset()+r).toRange()),t.getSel().modify("move",e?"forward":"backward","word"),!0},Vd=function(e,t){var n=t.selection.getRng(),r=e?_u.fromRangeEnd(n):_u.fromRangeStart(n);return!!Ud(t)&&(e&&Aa(r)?jd(!0,t.selection,r):!(e||!Ra(r))&&jd(!1,t.selection,r))},Hd=function(e,t){var n=e.dom.createRng();n.setStart(t.container(),t.offset()),n.setEnd(t.container(),t.offset()),e.selection.setRng(n)},qd=function(e){return!1!==e.settings.inline_boundaries},$d=function(e,t){e?t.setAttribute("data-mce-selected","inline-boundary"):t.removeAttribute("data-mce-selected")},Wd=function(t,e,n){return vd(e,n).map(function(e){return Hd(t,e),n})},Kd=function(e,t,n){return function(){return!!qd(t)&&Vd(e,t)}},Xd={move:function(a,u,s){return function(){return!!qd(a)&&(t=a,n=u,e=s,r=t.getBody(),o=_u.fromRangeStart(t.selection.getRng()),i=d(Vl.isInlineTarget,t),Fd(e,i,r,o).bind(function(e){return Wd(t,n,e)})).isSome();var t,n,e,r,o,i}},moveNextWord:d(Kd,!0),movePrevWord:d(Kd,!1),setupSelectedState:function(a){var u=Hi(null),s=d(Vl.isInlineTarget,a);return a.on("NodeChange",function(e){var t,n,r,o,i;qd(a)&&(t=s,n=a.dom,r=e.parents,o=U(n.select('*[data-mce-selected="inline-boundary"]'),t),i=U(r,t),z(Q(o,i),d($d,!1)),z(Q(i,o),d($d,!0)),function(e,t){if(e.selection.isCollapsed()&&!0!==e.composing&&t.get()){var n=_u.fromRangeStart(e.selection.getRng());_u.isTextPosition(n)&&!1===Vl.isAtZwsp(n)&&(Hd(e,ss.removeAndReposition(t.get(),n)),t.set(null))}}(a,u),function(n,r,o,e){if(r.selection.isCollapsed()){var t=U(e,n);z(t,function(e){var t=_u.fromRangeStart(r.selection.getRng());Ld(n,r.getBody(),t).bind(function(e){return Wd(r,o,e)})})}}(s,a,u,e.parents))}),u},setCaretPosition:Hd},Yd=function(t,n){return function(e){return vd(n,e).map(function(e){return Xd.setCaretPosition(t,e),!0}).getOr(!1)}},Gd=function(r,o,i,a){var u=r.getBody(),s=d(Vl.isInlineTarget,r);r.undoManager.ignore(function(){var e,t,n;r.selection.setRng((e=i,t=a,(n=V.document.createRange()).setStart(e.container(),e.offset()),n.setEnd(t.container(),t.offset()),n)),r.execCommand("Delete"),Ld(s,u,_u.fromRangeStart(r.selection.getRng())).map(zd).map(Yd(r,o))}),r.nodeChanged()},Jd=function(n,r,i,o){var e,t,a=(e=n.getBody(),t=o.container(),Ss(t,e)||e),u=d(Vl.isInlineTarget,n),s=Ld(u,a,o);return s.bind(function(e){return i?e.fold(q(_.some(zd(e))),_.none,q(_.some(Md(e))),_.none):e.fold(_.none,q(_.some(Md(e))),_.none,q(_.some(zd(e))))}).map(Yd(n,r)).getOrThunk(function(){var t=sc.navigate(i,a,o),e=t.bind(function(e){return Ld(u,a,e)});return s.isSome()&&e.isSome()?Vl.findRootInline(u,a,o).map(function(e){return o=e,!!ru(sc.firstPositionIn(o),sc.lastPositionIn(o),function(e,t){var n=Vl.normalizePosition(!0,e),r=Vl.normalizePosition(!1,t);return sc.nextPosition(o,n).map(function(e){return e.isEqual(r)}).getOr(!0)}).getOr(!0)&&(rd(n,i,ar.fromDom(e)),!0);var o}).getOr(!1):e.bind(function(e){return t.map(function(e){return i?Gd(n,r,o,e):Gd(n,r,e,o),!0})}).getOr(!1)})},Qd=function(e,t,n){if(e.selection.isCollapsed()&&!1!==e.settings.inline_boundaries){var r=_u.fromRangeStart(e.selection.getRng());return Jd(e,t,n,r)}return!1},Zd=Ar("start","end"),em=Ar("rng","table","cells"),tm=xf([{removeTable:["element"]},{emptyCells:["cells"]}]),nm=function(e,t){return ia(ar.fromDom(e),"td,th",t)},rm=function(e,t){return ra(e,"table",t)},om=function(e){return!1===Mr(e.start(),e.end())},im=function(e,n){return rm(e.start(),n).bind(function(t){return rm(e.end(),n).bind(function(e){return Mr(t,e)?_.some(t):_.none()})})},am=function(e){return Qi(e,"td,th")},um=function(r,e){var t=nm(e.startContainer,r),n=nm(e.endContainer,r);return e.collapsed?_.none():ru(t,n,Zd).fold(function(){return t.fold(function(){return n.bind(function(t){return rm(t,r).bind(function(e){return Z(am(e)).map(function(e){return Zd(e,t)})})})},function(t){return rm(t,r).bind(function(e){return ee(am(e)).map(function(e){return Zd(t,e)})})})},function(e){return sm(r,e)?_.none():(n=r,rm((t=e).start(),n).bind(function(e){return ee(am(e)).map(function(e){return Zd(t.start(),e)})}));var t,n})},sm=function(e,t){return im(t,e).isSome()},cm=function(e,t){var n,r,o,i,a=d(Mr,e);return(n=t,r=a,o=nm(n.startContainer,r),i=nm(n.endContainer,r),ru(o,i,Zd).filter(om).filter(function(e){return sm(r,e)}).orThunk(function(){return um(r,n)})).bind(function(e){return im(t=e,a).map(function(e){return em(t,e,am(e))});var t})},lm=function(e,t){return Y(e,function(e){return Mr(e,t)})},fm=function(n){return(r=n,ru(lm(r.cells(),r.rng().start()),lm(r.cells(),r.rng().end()),function(e,t){return r.cells().slice(e,t+1)})).map(function(e){var t=n.cells();return e.length===t.length?tm.removeTable(n.table()):tm.emptyCells(e)});var r},dm=function(e,t){return cm(e,t).bind(fm)},mm=function(e){var t=[];if(e)for(var n=0;n<e.rangeCount;n++)t.push(e.getRangeAt(n));return t},gm=mm,pm=function(e){return G(e,function(e){var t=Za(e);return t?[ar.fromDom(t)]:[]})},hm=function(e){return 1<mm(e).length},vm=function(e){return U(pm(e),_o)},ym=function(e){return Qi(e,"td[data-mce-selected],th[data-mce-selected]")},bm=function(e,t){var n=ym(t),r=vm(e);return 0<n.length?n:r},Cm=bm,xm=function(e){return bm(gm(e.selection.getSel()),ar.fromDom(e.getBody()))},wm=function(e,t){return z(t,nl),e.selection.setCursorLocation(t[0].dom(),0),!0},Nm=function(e,t){return rd(e,!1,t),!0},Em=function(n,e,r,t){return Tm(e,t).fold(function(){return t=n,dm(e,r).map(function(e){return e.fold(d(Nm,t),d(wm,t))});var t},function(e){return km(n,e)}).getOr(!1)},Sm=function(e,t){return X(uf(t,e),_o)},Tm=function(e,t){return X(uf(t,e),function(e){return"caption"===lr(e)})},km=function(e,t){return nl(t),e.selection.setCursorLocation(t.dom(),0),_.some(!0)},_m=function(u,s,c,l,f){return sc.navigate(c,u.getBody(),f).bind(function(e){return r=l,o=c,i=f,a=e,sc.firstPositionIn(r.dom()).bind(function(t){return sc.lastPositionIn(r.dom()).map(function(e){return o?i.isEqual(t)&&a.isEqual(e):i.isEqual(e)&&a.isEqual(t)})}).getOr(!0)?km(u,l):(t=l,n=e,Tm(s,ar.fromDom(n.getNode())).map(function(e){return!1===Mr(e,t)}));var t,n,r,o,i,a}).or(_.some(!0))},Am=function(a,u,s,e){var c=_u.fromRangeStart(a.selection.getRng());return Sm(s,e).bind(function(e){return Jl(e)?km(a,e):(t=a,n=s,r=u,o=e,i=c,sc.navigate(r,t.getBody(),i).bind(function(e){return Sm(n,ar.fromDom(e.getNode())).map(function(e){return!1===Mr(e,o)})}));var t,n,r,o,i})},Rm=function(a,u,e){var s=ar.fromDom(a.getBody());return Tm(s,e).fold(function(){return Am(a,u,s,e)},function(e){return t=a,n=u,r=s,o=e,i=_u.fromRangeStart(t.selection.getRng()),Jl(o)?km(t,o):_m(t,r,n,o,i);var t,n,r,o,i}).getOr(!1)},Dm=function(e,t){var n,r,o,i,a,u=ar.fromDom(e.selection.getStart(!0)),s=xm(e);return e.selection.isCollapsed()&&0===s.length?Rm(e,t,u):(n=e,r=u,o=ar.fromDom(n.getBody()),i=n.selection.getRng(),0!==(a=xm(n)).length?wm(n,a):Em(n,o,i,r))},Om=wc.isEq,Bm=function(e,t,n){var r=e.formatter.get(n);if(r)for(var o=0;o<r.length;o++)if(!1===r[o].inherit&&e.dom.is(t,r[o].selector))return!0;return!1},Pm=function(t,e,n,r){var o=t.dom.getRoot();return e!==o&&(e=t.dom.getParent(e,function(e){return!!Bm(t,e,n)||e.parentNode===o||!!Fm(t,e,n,r,!0)}),Fm(t,e,n,r))},Im=function(e,t,n){return!!Om(t,n.inline)||!!Om(t,n.block)||(n.selector?1===t.nodeType&&e.is(t,n.selector):void 0)},Lm=function(e,t,n,r,o,i){var a,u,s,c=n[r];if(n.onmatch)return n.onmatch(t,n,r);if(c)if("undefined"==typeof c.length){for(a in c)if(c.hasOwnProperty(a)){if(u="attributes"===r?e.getAttrib(t,a):wc.getStyle(e,t,a),o&&!u&&!n.exact)return;if((!o||n.exact)&&!Om(u,wc.normalizeStyleValue(e,wc.replaceVars(c[a],i),a)))return}}else for(s=0;s<c.length;s++)if("attributes"===r?e.getAttrib(t,c[s]):wc.getStyle(e,t,c[s]))return n;return n},Fm=function(e,t,n,r,o){var i,a,u,s,c=e.formatter.get(n),l=e.dom;if(c&&t)for(a=0;a<c.length;a++)if(i=c[a],Im(e.dom,t,i)&&Lm(l,t,i,"attributes",o,r)&&Lm(l,t,i,"styles",o,r)){if(s=i.classes)for(u=0;u<s.length;u++)if(!e.dom.hasClass(t,s[u]))return;return i}},Mm={matchNode:Fm,matchName:Im,match:function(e,t,n,r){var o;return r?Pm(e,r,t,n):(r=e.selection.getNode(),!!Pm(e,r,t,n)||!((o=e.selection.getStart())===r||!Pm(e,o,t,n)))},matchAll:function(r,o,i){var e,a=[],u={};return e=r.selection.getStart(),r.dom.getParent(e,function(e){var t,n;for(t=0;t<o.length;t++)n=o[t],!u[n]&&Fm(r,e,n,i)&&(u[n]=!0,a.push(n))},r.dom.getRoot()),a},canApply:function(e,t){var n,r,o,i,a,u=e.formatter.get(t),s=e.dom;if(u)for(n=e.selection.getStart(),r=wc.getParents(s,n),i=u.length-1;0<=i;i--){if(!(a=u[i].selector)||u[i].defaultBlock)return!0;for(o=r.length-1;0<=o;o--)if(s.is(r[o],a))return!0}return!1},matchesUnInheritedFormatSelector:Bm},zm=function(e,t){return e.splitText(t)},Um=function(e){var t=e.startContainer,n=e.startOffset,r=e.endContainer,o=e.endOffset;return t===r&&jo.isText(t)?0<n&&n<t.nodeValue.length&&(t=(r=zm(t,n)).previousSibling,n<o?(t=r=zm(r,o-=n).previousSibling,o=r.nodeValue.length,n=0):o=0):(jo.isText(t)&&0<n&&n<t.nodeValue.length&&(t=zm(t,n),n=0),jo.isText(r)&&0<o&&o<r.nodeValue.length&&(o=(r=zm(r,o).previousSibling).nodeValue.length)),{startContainer:t,startOffset:n,endContainer:r,endOffset:o}},jm=xa,Vm="_mce_caret",Hm=function(e){return 0<function(e){for(var t=[];e;){if(3===e.nodeType&&e.nodeValue!==jm||1<e.childNodes.length)return[];1===e.nodeType&&t.push(e),e=e.firstChild}return t}(e).length},qm=function(e){var t;if(e)for(e=(t=new go(e,e)).current();e;e=t.next())if(3===e.nodeType)return e;return null},$m=function(e){var t=ar.fromTag("span");return Nr(t,{id:Vm,"data-mce-bogus":"1","data-mce-type":"format-caret"}),e&&Fi(t,ar.fromText(jm)),t},Wm=function(e,t,n){void 0===n&&(n=!0);var r,o=e.dom,i=e.selection;if(Hm(t))rd(e,!1,ar.fromDom(t),n);else{var a=i.getRng(),u=o.getParent(t,o.isBlock),s=((r=qm(t))&&r.nodeValue.charAt(0)===jm&&r.deleteData(0,1),r);a.startContainer===s&&0<a.startOffset&&a.setStart(s,a.startOffset-1),a.endContainer===s&&0<a.endOffset&&a.setEnd(s,a.endOffset-1),o.remove(t,!0),u&&o.isEmpty(u)&&nl(ar.fromDom(u)),i.setRng(a)}},Km=function(e,t,n){void 0===n&&(n=!0);var r=e.dom,o=e.selection;if(t)Wm(e,t,n);else if(!(t=Qu(e.getBody(),o.getStart())))for(;t=r.get(Vm);)Wm(e,t,!1)},Xm=function(e,t,n){var r=e.dom,o=r.getParent(n,d(wc.isTextBlock,e));o&&r.isEmpty(o)?n.parentNode.replaceChild(t,n):(tl(ar.fromDom(n)),r.isEmpty(n)?n.parentNode.replaceChild(t,n):r.insertAfter(t,n))},Ym=function(e,t){return e.appendChild(t),t},Gm=function(e,t){var n,r,o=(n=function(e,t){return Ym(e,t.cloneNode(!1))},r=t,function(e,t){for(var n=e.length-1;0<=n;n--)t(e[n],n)}(e,function(e){r=n(r,e)}),r);return Ym(o,o.ownerDocument.createTextNode(jm))},Jm=function(i){i.on("mouseup keydown",function(e){var t,n,r,o;t=i,n=e.keyCode,r=t.selection,o=t.getBody(),Km(t,null,!1),8!==n&&46!==n||!r.isCollapsed()||r.getStart().innerHTML!==jm||Km(t,Qu(o,r.getStart())),37!==n&&39!==n||Km(t,Qu(o,r.getStart()))})},Qm=function(e,t){return e.schema.getTextInlineElements().hasOwnProperty(lr(t))&&!Ju(t.dom())&&!jo.isBogus(t.dom())},Zm=function(e){return 1===Kr(e).length},eg=function(e,t,n,r){var o,i,a,u,s=d(Qm,t),c=W(U(r,s),function(e){return e.dom()});if(0===c.length)rd(t,e,n);else{var l=(o=n.dom(),i=c,a=$m(!1),u=Gm(i,a.dom()),Pi(ar.fromDom(o),a),Ui(ar.fromDom(o)),_u(u,0));t.selection.setRng(l.toRange())}},tg=function(r,o){var t,e=ar.fromDom(r.getBody()),n=ar.fromDom(r.selection.getStart()),i=U((t=uf(n,e),Y(t,Co).fold(q(t),function(e){return t.slice(0,e)})),Zm);return ee(i).map(function(e){var t,n=_u.fromRangeStart(r.selection.getRng());return!(!$l(o,n,e.dom())||Ju((t=e).dom())&&Hm(t.dom())||(eg(o,r,e,i),0))}).getOr(!1)},ng=function(e,t){return!!e.selection.isCollapsed()&&tg(e,t)},rg=jo.isContentEditableTrue,og=jo.isContentEditableFalse,ig=function(e,t,n,r,o){return t._selectionOverrides.showCaret(e,n,r,o)},ag=function(e,t){var n,r;return e.fire("BeforeObjectSelected",{target:t}).isDefaultPrevented()?null:((r=(n=t).ownerDocument.createRange()).selectNode(n),r)},ug=function(e,t,n){var r=Os(1,e.getBody(),t),o=_u.fromRangeStart(r),i=o.getNode();if(og(i))return ig(1,e,i,!o.isAtEnd(),!1);var a=o.getNode(!0);if(og(a))return ig(1,e,a,!1,!1);var u=e.dom.getParent(o.getNode(),function(e){return og(e)||rg(e)});return og(u)?ig(1,e,u,!1,n):null},sg=function(e,t,n){if(!t||!t.collapsed)return t;var r=ug(e,t,n);return r||t},cg=function(e,t,n,r,o,i){var a,u,s=ig(r,e,i.getNode(!o),o,!0);if(t.collapsed){var c=t.cloneRange();o?c.setEnd(s.startContainer,s.startOffset):c.setStart(s.endContainer,s.endOffset),c.deleteContents()}else t.deleteContents();return e.selection.setRng(s),a=e.dom,u=n,jo.isText(u)&&0===u.data.length&&a.remove(u),!0},lg=function(e,t){return function(e,t){var n=e.selection.getRng();if(!jo.isText(n.commonAncestorContainer))return!1;var r=t?Tu.Forwards:Tu.Backwards,o=Js(e.getBody()),i=d(Ls,o.next),a=d(Ls,o.prev),u=t?i:a,s=t?Lf:Ff,c=Ps(r,e.getBody(),n),l=Vl.normalizePosition(t,u(c));if(!l)return!1;if(s(l))return cg(e,n,c.getNode(),r,t,l);var f=u(l);return!!(f&&s(f)&&Fs(l,f))&&cg(e,n,c.getNode(),r,t,f)}(e,t)},fg=function(e,t){e.getDoc().execCommand(t,!1,null)},dg=function(e){ad(e,!1)||lg(e,!1)||Qd(e,!1)||hf(e,!1)||Dm(e)||Cf(e,!1)||ng(e,!1)||(fg(e,"Delete"),ql(e))},mg=function(e){ad(e,!0)||lg(e,!0)||Qd(e,!0)||hf(e,!0)||Dm(e)||Cf(e,!0)||ng(e,!0)||fg(e,"ForwardDelete")},gg=function(o,t,e){var n=function(e){return t=o,n=e.dom(),r=_r(n,t),_.from(r).filter(function(e){return 0<e.length});var t,n,r};return na(ar.fromDom(e),function(e){return n(e).isSome()},function(e){return Mr(ar.fromDom(t),e)}).bind(n)},pg=function(o){return function(r,e){return _.from(e).map(ar.fromDom).filter(dr).bind(function(e){return gg(o,r,e.dom()).or((t=o,n=e.dom(),_.from(Si.DOM.getStyle(n,t,!0))));var t,n}).getOr("")}},hg={getFontSize:pg("font-size"),getFontFamily:H(function(e){return e.replace(/[\'\"\\]/g,"").replace(/,\s+/g,",")},pg("font-family")),toPt:function(e,t){return/[0-9.]+px$/.test(e)?(n=72*parseInt(e,10)/96,r=t||0,o=Math.pow(10,r),Math.round(n*o)/o+"pt"):e;var n,r,o}},vg=function(e){return sc.firstPositionIn(e.getBody()).map(function(e){var t=e.container();return jo.isText(t)?t.parentNode:t})},yg=function(o){return _.from(o.selection.getRng()).bind(function(e){var t,n,r=o.getBody();return n=r,(t=e).startContainer===n&&0===t.startOffset?_.none():_.from(o.selection.getStart(!0))})},bg=function(e,t){if(/^[0-9\.]+$/.test(t)){var n=parseInt(t,10);if(1<=n&&n<=7){var r=Al(e),o=Rl(e);return o?o[n-1]||t:r[n-1]||t}return t}return t},Cg=function(e,t){return e&&t&&e.startContainer===t.startContainer&&e.startOffset===t.startOffset&&e.endContainer===t.endContainer&&e.endOffset===t.endOffset},xg=function(e,t,n){return null!==function(e,t,n){for(;e&&e!==t;){if(n(e))return e;e=e.parentNode}return null}(e,t,n)},wg=function(e,t,n){return xg(e,t,function(e){return e.nodeName===n})},Ng=function(e){return e&&"TABLE"===e.nodeName},Eg=function(e,t,n){for(var r=new go(t,e.getParent(t.parentNode,e.isBlock)||e.getRoot());t=r[n?"prev":"next"]();)if(jo.isBr(t))return!0},Sg=function(e,t,n,r,o){var i,a,u,s,c,l,f=e.getRoot(),d=e.schema.getNonEmptyElements();if(u=e.getParent(o.parentNode,e.isBlock)||f,r&&jo.isBr(o)&&t&&e.isEmpty(u))return _.some(Su(o.parentNode,e.nodeIndex(o)));for(i=new go(o,u);s=i[r?"prev":"next"]();){if("false"===e.getContentEditableParent(s)||(l=f,ka(c=s)&&!1===xg(c,l,Ju)))return _.none();if(jo.isText(s)&&0<s.nodeValue.length)return!1===wg(s,f,"A")?_.some(Su(s,r?s.nodeValue.length:0)):_.none();if(e.isBlock(s)||d[s.nodeName.toLowerCase()])return _.none();a=s}return n&&a?_.some(Su(a,0)):_.none()},Tg=function(e,t,n,r){var o,i,a,u,s,c,l,f,d,m,g=e.getRoot(),p=!1;if(o=r[(n?"start":"end")+"Container"],i=r[(n?"start":"end")+"Offset"],l=jo.isElement(o)&&i===o.childNodes.length,s=e.schema.getNonEmptyElements(),c=n,ka(o))return _.none();if(jo.isElement(o)&&i>o.childNodes.length-1&&(c=!1),jo.isDocument(o)&&(o=g,i=0),o===g){if(c&&(u=o.childNodes[0<i?i-1:0])){if(ka(u))return _.none();if(s[u.nodeName]||Ng(u))return _.none()}if(o.hasChildNodes()){if(i=Math.min(!c&&0<i?i-1:i,o.childNodes.length-1),o=o.childNodes[i],i=jo.isText(o)&&l?o.data.length:0,!t&&o===g.lastChild&&Ng(o))return _.none();if(function(e,t){for(;t&&t!==e;){if(jo.isContentEditableFalse(t))return!0;t=t.parentNode}return!1}(g,o)||ka(o))return _.none();if(o.hasChildNodes()&&!1===Ng(o)){a=new go(u=o,g);do{if(jo.isContentEditableFalse(u)||ka(u)){p=!1;break}if(jo.isText(u)&&0<u.nodeValue.length){i=c?0:u.nodeValue.length,o=u,p=!0;break}if(s[u.nodeName.toLowerCase()]&&(!(f=u)||!/^(TD|TH|CAPTION)$/.test(f.nodeName))){i=e.nodeIndex(u),o=u.parentNode,c||i++,p=!0;break}}while(u=c?a.next():a.prev())}}}return t&&(jo.isText(o)&&0===i&&Sg(e,l,t,!0,o).each(function(e){o=e.container(),i=e.offset(),p=!0}),jo.isElement(o)&&((u=o.childNodes[i])||(u=o.childNodes[i-1]),!u||!jo.isBr(u)||(m="A",(d=u).previousSibling&&d.previousSibling.nodeName===m)||Eg(e,u,!1)||Eg(e,u,!0)||Sg(e,l,t,!0,u).each(function(e){o=e.container(),i=e.offset(),p=!0}))),c&&!t&&jo.isText(o)&&i===o.nodeValue.length&&Sg(e,l,t,!1,o).each(function(e){o=e.container(),i=e.offset(),p=!0}),p?_.some(Su(o,i)):_.none()},kg=function(e,t){var n=t.collapsed,r=t.cloneRange(),o=Su.fromRangeStart(t);return Tg(e,n,!0,r).each(function(e){n&&Su.isAbove(o,e)||r.setStart(e.container(),e.offset())}),n||Tg(e,n,!1,r).each(function(e){r.setEnd(e.container(),e.offset())}),n&&r.collapse(!0),Cg(t,r)?_.none():_.some(r)},_g=function(e,t,n){var r=e.create("span",{},"&nbsp;");n.parentNode.insertBefore(r,n),t.scrollIntoView(r),e.remove(r)},Ag=function(e,t,n,r){var o=e.createRng();r?(o.setStartBefore(n),o.setEndBefore(n)):(o.setStartAfter(n),o.setEndAfter(n)),t.setRng(o)},Rg=function(e,t){var n,r,o=e.selection,i=e.dom,a=o.getRng();kg(i,a).each(function(e){a.setStart(e.startContainer,e.startOffset),a.setEnd(e.endContainer,e.endOffset)});var u=a.startOffset,s=a.startContainer;if(1===s.nodeType&&s.hasChildNodes()){var c=u>s.childNodes.length-1;s=s.childNodes[Math.min(u,s.childNodes.length-1)]||s,u=c&&3===s.nodeType?s.nodeValue.length:0}var l=i.getParent(s,i.isBlock),f=l?i.getParent(l.parentNode,i.isBlock):null,d=f?f.nodeName.toUpperCase():"",m=t&&t.ctrlKey;"LI"!==d||m||(l=f),s&&3===s.nodeType&&u>=s.nodeValue.length&&(function(e,t,n){for(var r,o=new go(t,n),i=e.getNonEmptyElements();r=o.next();)if(i[r.nodeName.toLowerCase()]||0<r.length)return!0}(e.schema,s,l)||(n=i.create("br"),a.insertNode(n),a.setStartAfter(n),a.setEndAfter(n),r=!0)),n=i.create("br"),zu(i,a,n),_g(i,o,n),Ag(i,o,n,r),e.undoManager.add()},Dg=function(e,t){var n=ar.fromTag("br");Pi(ar.fromDom(t),n),e.undoManager.add()},Og=function(e,t){Bg(e.getBody(),t)||Ii(ar.fromDom(t),ar.fromTag("br"));var n=ar.fromTag("br");Ii(ar.fromDom(t),n),_g(e.dom,e.selection,n.dom()),Ag(e.dom,e.selection,n.dom(),!1),e.undoManager.add()},Bg=function(e,t){return n=_u.after(t),!!jo.isBr(n.getNode())||sc.nextPosition(e,_u.after(t)).map(function(e){return jo.isBr(e.getNode())}).getOr(!1);var n},Pg=function(e){return e&&"A"===e.nodeName&&"href"in e},Ig=function(e){return e.fold(q(!1),Pg,Pg,q(!1))},Lg=function(e,t){t.fold(o,d(Dg,e),d(Og,e),o)},Fg=function(e,t){var n,r,o,i=(n=e,r=d(Vl.isInlineTarget,n),o=_u.fromRangeStart(n.selection.getRng()),Ld(r,n.getBody(),o).filter(Ig));i.isSome()?i.each(d(Lg,e)):Rg(e,t)},Mg={create:Ar("start","soffset","finish","foffset")},zg=xf([{before:["element"]},{on:["element","offset"]},{after:["element"]}]),Ug=(zg.before,zg.on,zg.after,function(e){return e.fold($,$,$)}),jg=xf([{domRange:["rng"]},{relative:["startSitu","finishSitu"]},{exact:["start","soffset","finish","foffset"]}]),Vg={domRange:jg.domRange,relative:jg.relative,exact:jg.exact,exactFromRange:function(e){return jg.exact(e.start(),e.soffset(),e.finish(),e.foffset())},getWin:function(e){var t=e.match({domRange:function(e){return ar.fromDom(e.startContainer)},relative:function(e,t){return Ug(e)},exact:function(e,t,n,r){return e}});return jr(t)},range:Mg.create},Hg=or.detect().browser,qg=function(e,t){var n=mr(t)?Mc(t).length:Kr(t).length+1;return n<e?n:e<0?0:e},$g=function(e){return Vg.range(e.start(),qg(e.soffset(),e.start()),e.finish(),qg(e.foffset(),e.finish()))},Wg=function(e,t){return!jo.isRestrictedNode(t.dom())&&(zr(e,t)||Mr(e,t))},Kg=function(t){return function(e){return Wg(t,e.start())&&Wg(t,e.finish())}},Xg=function(e){return!0===e.inline||Hg.isIE()},Yg=function(e){return Vg.range(ar.fromDom(e.startContainer),e.startOffset,ar.fromDom(e.endContainer),e.endOffset)},Gg=function(e){var t=e.getSelection();return(t&&0!==t.rangeCount?_.from(t.getRangeAt(0)):_.none()).map(Yg)},Jg=function(e){var t=jr(e);return Gg(t.dom()).filter(Kg(e))},Qg=function(e,t){return _.from(t).filter(Kg(e)).map($g)},Zg=function(e){var t=V.document.createRange();try{return t.setStart(e.start().dom(),e.soffset()),t.setEnd(e.finish().dom(),e.foffset()),_.some(t)}catch(n){return _.none()}},ep=function(e){return(e.bookmark?e.bookmark:_.none()).bind(d(Qg,ar.fromDom(e.getBody()))).bind(Zg)},tp=function(e){var t=Xg(e)?Jg(ar.fromDom(e.getBody())):_.none();e.bookmark=t.isSome()?t:e.bookmark},np=function(t){ep(t).each(function(e){t.selection.setRng(e)})},rp=ep,op=function(e){return Eo(e)||So(e)},ip=function(e){return U(W(e.selection.getSelectedBlocks(),ar.fromDom),function(e){return!op(e)&&!Vr(e).map(op).getOr(!1)})},ap=function(e,t){var n=e.settings,r=e.dom,o=e.selection,i=e.formatter,a=/[a-z%]+$/i.exec(n.indentation)[0],u=parseInt(n.indentation,10),s=e.getParam("indent_use_margin",!1);e.queryCommandState("InsertUnorderedList")||e.queryCommandState("InsertOrderedList")||n.forced_root_block||r.getParent(o.getNode(),r.isBlock)||i.apply("div"),z(ip(e),function(e){!function(e,t,n,r,o,i){if("false"!==e.getContentEditable(i)){var a=n?"margin":"padding";if(a="TABLE"===i.nodeName?"margin":a,a+="rtl"===e.getStyle(i,"direction",!0)?"Right":"Left","outdent"===t){var u=Math.max(0,parseInt(i.style[a]||0,10)-r);e.setStyle(i,a,u?u+o:"")}else u=parseInt(i.style[a]||0,10)+r+o,e.setStyle(i,a,u)}}(r,t,s,u,a,e.dom())})},up=Xt.each,sp=Xt.extend,cp=Xt.map,lp=Xt.inArray;function fp(s){var o,i,a,t,c={state:{},exec:{},value:{}},n=s.settings;s.on("PreInit",function(){o=s.dom,i=s.selection,n=s.settings,a=s.formatter});var r=function(e){var t;if(!s.quirks.isHidden()&&!s.removed){if(e=e.toLowerCase(),t=c.state[e])return t(e);try{return s.getDoc().queryCommandState(e)}catch(n){}return!1}},e=function(e,n){n=n||"exec",up(e,function(t,e){up(e.toLowerCase().split(","),function(e){c[n][e]=t})})},u=function(e,t,n){e=e.toLowerCase(),c.value[e]=function(){return t.call(n||s)}};sp(this,{execCommand:function(t,n,r,e){var o,i,a=!1;if(!s.removed){if(/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint)$/.test(t)||e&&e.skip_focus?np(s):s.focus(),(e=s.fire("BeforeExecCommand",{command:t,ui:n,value:r})).isDefaultPrevented())return!1;if(i=t.toLowerCase(),o=c.exec[i])return o(i,n,r),s.fire("ExecCommand",{command:t,ui:n,value:r}),!0;if(up(s.plugins,function(e){if(e.execCommand&&e.execCommand(t,n,r))return s.fire("ExecCommand",{command:t,ui:n,value:r}),!(a=!0)}),a)return a;if(s.theme&&s.theme.execCommand&&s.theme.execCommand(t,n,r))return s.fire("ExecCommand",{command:t,ui:n,value:r}),!0;try{a=s.getDoc().execCommand(t,n,r)}catch(u){}return!!a&&(s.fire("ExecCommand",{command:t,ui:n,value:r}),!0)}},queryCommandState:r,queryCommandValue:function(e){var t;if(!s.quirks.isHidden()&&!s.removed){if(e=e.toLowerCase(),t=c.value[e])return t(e);try{return s.getDoc().queryCommandValue(e)}catch(n){}}},queryCommandSupported:function(e){if(e=e.toLowerCase(),c.exec[e])return!0;try{return s.getDoc().queryCommandSupported(e)}catch(t){}return!1},addCommands:e,addCommand:function(e,o,i){e=e.toLowerCase(),c.exec[e]=function(e,t,n,r){return o.call(i||s,t,n,r)}},addQueryStateHandler:function(e,t,n){e=e.toLowerCase(),c.state[e]=function(){return t.call(n||s)}},addQueryValueHandler:u,hasCustomCommand:function(e){return e=e.toLowerCase(),!!c.exec[e]}});var l=function(e,t,n){return t===undefined&&(t=!1),n===undefined&&(n=null),s.getDoc().execCommand(e,t,n)},f=function(e){return a.match(e)},d=function(e,t){a.toggle(e,t?{value:t}:undefined),s.nodeChanged()},m=function(e){t=i.getBookmark(e)},g=function(){i.moveToBookmark(t)};e({"mceResetDesignMode,mceBeginUndoLevel":function(){},"mceEndUndoLevel,mceAddUndoLevel":function(){s.undoManager.add()},"Cut,Copy,Paste":function(e){var t,n=s.getDoc();try{l(e)}catch(o){t=!0}if("paste"!==e||n.queryCommandEnabled(e)||(t=!0),t||!n.queryCommandSupported(e)){var r=s.translate("Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.");fe.mac&&(r=r.replace(/Ctrl\+/g,"\u2318+")),s.notificationManager.open({text:r,type:"error"})}},unlink:function(){if(i.isCollapsed()){var e=s.dom.getParent(s.selection.getStart(),"a");e&&s.dom.remove(e,!0)}else a.remove("link")},"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull,JustifyNone":function(e){var t=e.substring(7);"full"===t&&(t="justify"),up("left,center,right,justify".split(","),function(e){t!==e&&a.remove("align"+e)}),"none"!==t&&d("align"+t)},"InsertUnorderedList,InsertOrderedList":function(e){var t,n;l(e),(t=o.getParent(i.getNode(),"ol,ul"))&&(n=t.parentNode,/^(H[1-6]|P|ADDRESS|PRE)$/.test(n.nodeName)&&(m(),o.split(n,t),g()))},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(e){d(e)},"ForeColor,HiliteColor":function(e,t,n){d(e,n)},FontName:function(e,t,n){var r,o;o=n,(r=s).formatter.toggle("fontname",{value:bg(r,o)}),r.nodeChanged()},FontSize:function(e,t,n){var r,o;o=n,(r=s).formatter.toggle("fontsize",{value:bg(r,o)}),r.nodeChanged()},RemoveFormat:function(e){a.remove(e)},mceBlockQuote:function(){d("blockquote")},FormatBlock:function(e,t,n){return d(n||"p")},mceCleanup:function(){var e=i.getBookmark();s.setContent(s.getContent()),i.moveToBookmark(e)},mceRemoveNode:function(e,t,n){var r=n||i.getNode();r!==s.getBody()&&(m(),s.dom.remove(r,!0),g())},mceSelectNodeDepth:function(e,t,n){var r=0;o.getParent(i.getNode(),function(e){if(1===e.nodeType&&r++===n)return i.select(e),!1},s.getBody())},mceSelectNode:function(e,t,n){i.select(n)},mceInsertContent:function(e,t,n){ml(s,n)},mceInsertRawHTML:function(e,t,n){i.setContent("tiny_mce_marker");var r=s.getContent();s.setContent(r.replace(/tiny_mce_marker/g,function(){return n}))},mceToggleFormat:function(e,t,n){d(n)},mceSetContent:function(e,t,n){s.setContent(n)},"Indent,Outdent":function(e){ap(s,e)},mceRepaint:function(){},InsertHorizontalRule:function(){s.execCommand("mceInsertContent",!1,"<hr />")},mceToggleVisualAid:function(){s.hasVisual=!s.hasVisual,s.addVisual()},mceReplaceContent:function(e,t,n){s.execCommand("mceInsertContent",!1,n.replace(/\{\$selection\}/g,i.getContent({format:"text"})))},mceInsertLink:function(e,t,n){var r;"string"==typeof n&&(n={href:n}),r=o.getParent(i.getNode(),"a"),n.href=n.href.replace(" ","%20"),r&&n.href||a.remove("link"),n.href&&a.apply("link",n,r)},selectAll:function(){var e=o.getParent(i.getStart(),jo.isContentEditableTrue);if(e){var t=o.createRng();t.selectNodeContents(e),i.setRng(t)}},"delete":function(){dg(s)},forwardDelete:function(){mg(s)},mceNewDocument:function(){s.setContent("")},InsertLineBreak:function(e,t,n){return Fg(s,n),!0}});var p=function(n){return function(){var e=i.isCollapsed()?[o.getParent(i.getNode(),o.isBlock)]:i.getSelectedBlocks(),t=cp(e,function(e){return!!a.matchNode(e,n)});return-1!==lp(t,!0)}};e({JustifyLeft:p("alignleft"),JustifyCenter:p("aligncenter"),JustifyRight:p("alignright"),JustifyFull:p("alignjustify"),"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(e){return f(e)},mceBlockQuote:function(){return f("blockquote")},Outdent:function(){var e;if(n.inline_styles){if((e=o.getParent(i.getStart(),o.isBlock))&&0<parseInt(e.style.paddingLeft,10))return!0;if((e=o.getParent(i.getEnd(),o.isBlock))&&0<parseInt(e.style.paddingLeft,10))return!0}return r("InsertUnorderedList")||r("InsertOrderedList")||!n.inline_styles&&!!o.getParent(i.getNode(),"BLOCKQUOTE")},"InsertUnorderedList,InsertOrderedList":function(e){var t=o.getParent(i.getNode(),"ul,ol");return t&&("insertunorderedlist"===e&&"UL"===t.tagName||"insertorderedlist"===e&&"OL"===t.tagName)}},"state"),e({Undo:function(){s.undoManager.undo()},Redo:function(){s.undoManager.redo()}}),u("FontName",function(){return yg(t=s).fold(function(){return vg(t).map(function(e){return hg.getFontFamily(t.getBody(),e)}).getOr("")},function(e){return hg.getFontFamily(t.getBody(),e)});var t},this),u("FontSize",function(){return yg(t=s).fold(function(){return vg(t).map(function(e){return hg.getFontSize(t.getBody(),e)}).getOr("")},function(e){return hg.getFontSize(t.getBody(),e)});var t},this)}var dp=Xt.makeMap("focus blur focusin focusout click dblclick mousedown mouseup mousemove mouseover beforepaste paste cut copy selectionchange mouseout mouseenter mouseleave wheel keydown keypress keyup input contextmenu dragstart dragend dragover draggesture dragdrop drop drag submit compositionstart compositionend compositionupdate touchstart touchmove touchend"," "),mp=function(a){var u,s,c=this,l={},f=function(){return!1},d=function(){return!0};u=(a=a||{}).scope||c,s=a.toggleEvent||f;var r=function(e,t,n,r){var o,i,a;if(!1===t&&(t=f),t)for(t={func:t},r&&Xt.extend(t,r),a=(i=e.toLowerCase().split(" ")).length;a--;)e=i[a],(o=l[e])||(o=l[e]=[],s(e,!0)),n?o.unshift(t):o.push(t);return c},m=function(e,t){var n,r,o,i,a;if(e)for(n=(i=e.toLowerCase().split(" ")).length;n--;){if(e=i[n],r=l[e],!e){for(o in l)s(o,!1),delete l[o];return c}if(r){if(t)for(a=r.length;a--;)r[a].func===t&&(r=r.slice(0,a).concat(r.slice(a+1)),l[e]=r);else r.length=0;r.length||(s(e,!1),delete l[e])}}else{for(e in l)s(e,!1);l={}}return c};c.fire=function(e,t){var n,r,o,i;if(e=e.toLowerCase(),(t=t||{}).type=e,t.target||(t.target=u),t.preventDefault||(t.preventDefault=function(){t.isDefaultPrevented=d},t.stopPropagation=function(){t.isPropagationStopped=d},t.stopImmediatePropagation=function(){t.isImmediatePropagationStopped=d},t.isDefaultPrevented=f,t.isPropagationStopped=f,t.isImmediatePropagationStopped=f),a.beforeFire&&a.beforeFire(t),n=l[e])for(r=0,o=n.length;r<o;r++){if((i=n[r]).once&&m(e,i.func),t.isImmediatePropagationStopped())return t.stopPropagation(),t;if(!1===i.func.call(u,t))return t.preventDefault(),t}return t},c.on=r,c.off=m,c.once=function(e,t,n){return r(e,t,n,{once:!0})},c.has=function(e){return e=e.toLowerCase(),!(!l[e]||0===l[e].length)}};mp.isNative=function(e){return!!dp[e.toLowerCase()]};var gp,pp=function(n){return n._eventDispatcher||(n._eventDispatcher=new mp({scope:n,toggleEvent:function(e,t){mp.isNative(e)&&n.toggleNativeEvent&&n.toggleNativeEvent(e,t)}})),n._eventDispatcher},hp={fire:function(e,t,n){if(this.removed&&"remove"!==e&&"detach"!==e)return t;if(t=pp(this).fire(e,t,n),!1!==n&&this.parent)for(var r=this.parent();r&&!t.isPropagationStopped();)r.fire(e,t,!1),r=r.parent();return t},on:function(e,t,n){return pp(this).on(e,t,n)},off:function(e,t){return pp(this).off(e,t)},once:function(e,t){return pp(this).once(e,t)},hasEventListeners:function(e){return pp(this).has(e)}},vp=function(e,t){return e.fire("PreProcess",t)},yp=function(e,t){return e.fire("PostProcess",t)},bp=function(e){return e.fire("remove")},Cp=function(e){return e.fire("detach")},xp=function(e,t){return e.fire("SwitchMode",{mode:t})},wp=function(e,t,n,r){e.fire("ObjectResizeStart",{target:t,width:n,height:r})},Np=function(e,t,n,r){e.fire("ObjectResized",{target:t,width:n,height:r})},Ep=function(e,t,n){try{e.getDoc().execCommand(t,!1,n)}catch(r){}},Sp=function(e,t,n){var r,o;Gi(e,t)&&!1===n?(o=t,$i(r=e)?r.dom().classList.remove(o):Ki(r,o),Yi(r)):n&&Xi(e,t)},Tp=function(e,t){Sp(ar.fromDom(e.getBody()),"mce-content-readonly",t),t?(e.selection.controlSelection.hideResizeRect(),e.readonly=!0,e.getBody().contentEditable="false"):(e.readonly=!1,e.getBody().contentEditable="true",Ep(e,"StyleWithCSS",!1),Ep(e,"enableInlineTableEditing",!1),Ep(e,"enableObjectResizing",!1),e.focus(),e.nodeChanged())},kp=function(e){return e.readonly?"readonly":"design"},_p=Si.DOM,Ap=function(e,t){return"selectionchange"===t?e.getDoc():!e.inline&&/^mouse|touch|click|contextmenu|drop|dragover|dragend/.test(t)?e.getDoc().documentElement:e.settings.event_root?(e.eventRoot||(e.eventRoot=_p.select(e.settings.event_root)[0]),e.eventRoot):e.getBody()},Rp=function(e,t,n){var r;(r=e).hidden||r.readonly?!0===e.readonly&&n.preventDefault():e.fire(t,n)},Dp=function(i,a){var e,t;if(i.delegates||(i.delegates={}),!i.delegates[a]&&!i.removed)if(e=Ap(i,a),i.settings.event_root){if(gp||(gp={},i.editorManager.on("removeEditor",function(){var e;if(!i.editorManager.activeEditor&&gp){for(e in gp)i.dom.unbind(Ap(i,e));gp=null}})),gp[a])return;t=function(e){for(var t=e.target,n=i.editorManager.get(),r=n.length;r--;){var o=n[r].getBody();(o===t||_p.isChildOf(t,o))&&Rp(n[r],a,e)}},gp[a]=t,_p.bind(e,a,t)}else t=function(e){Rp(i,a,e)},_p.bind(e,a,t),i.delegates[a]=t},Op={bindPendingEventDelegates:function(){var t=this;Xt.each(t._pendingNativeEvents,function(e){Dp(t,e)})},toggleNativeEvent:function(e,t){var n=this;"focus"!==e&&"blur"!==e&&(t?n.initialized?Dp(n,e):n._pendingNativeEvents?n._pendingNativeEvents.push(e):n._pendingNativeEvents=[e]:n.initialized&&(n.dom.unbind(Ap(n,e),e,n.delegates[e]),delete n.delegates[e]))},unbindAllNativeEvents:function(){var e,t=this,n=t.getBody(),r=t.dom;if(t.delegates){for(e in t.delegates)t.dom.unbind(Ap(t,e),e,t.delegates[e]);delete t.delegates}!t.inline&&n&&r&&(n.onload=null,r.unbind(t.getWin()),r.unbind(t.getDoc())),r&&(r.unbind(n),r.unbind(t.getContainer()))}},Bp=Op=Xt.extend({},hp,Op),Pp=Ar("sections","settings"),Ip=or.detect().deviceType.isTouch(),Lp=["lists","autolink","autosave"],Fp={theme:"mobile"},Mp=function(e){var t=k(e)?e.join(" "):e,n=W(S(t)?t.split(" "):[],Gn);return U(n,function(e){return 0<e.length})},zp=function(e,t){return e.sections().hasOwnProperty(t)},Up=function(e,t,n,r){var o,i=Mp(n.forced_plugins),a=Mp(r.plugins),u=e&&zp(t,"mobile")?U(a,d(F,Lp)):a,s=(o=u,[].concat(Mp(i)).concat(Mp(o)));return Xt.extend(r,{plugins:s.join(" ")})},jp=function(e,t,n,r){var o,i,a,u,s,c,l,f,d,m,g,p,h=(o=["mobile"],i=yr(r,function(e,t){return F(o,t)}),Pp(i.t,i.f)),v=Xt.extend(t,n,h.settings(),(m=e,p=(g=h).settings().inline,m&&zp(g,"mobile")&&!p?(c="mobile",l=Fp,f=h.sections(),d=f.hasOwnProperty(c)?f[c]:{},Xt.extend({},l,d)):{}),{validate:!0,content_editable:h.settings().inline,external_plugins:(a=n,u=h.settings(),s=u.external_plugins?u.external_plugins:{},a&&a.external_plugins?Xt.extend({},a.external_plugins,s):s)});return Up(e,h,n,v)},Vp=function(e,t,n){return _.from(t.settings[n]).filter(e)},Hp=function(e,t,n,r){var o,i,a,u=t in e.settings?e.settings[t]:n;return"hash"===r?(a={},"string"==typeof(i=u)?z(0<i.indexOf("=")?i.split(/[;,](?![^=;,]*(?:[;,]|$))/):i.split(","),function(e){var t=e.split("=");1<t.length?a[Xt.trim(t[0])]=Xt.trim(t[1]):a[Xt.trim(t[0])]=Xt.trim(t)}):a=i,a):"string"===r?Vp(S,e,t).getOr(n):"number"===r?Vp(O,e,t).getOr(n):"boolean"===r?Vp(R,e,t).getOr(n):"object"===r?Vp(T,e,t).getOr(n):"array"===r?Vp(k,e,t).getOr(n):"string[]"===r?Vp((o=S,function(e){return k(e)&&J(e,o)}),e,t).getOr(n):"function"===r?Vp(D,e,t).getOr(n):u},qp=Xt.each,$p=Xt.explode,Wp={f1:112,f2:113,f3:114,f4:115,f5:116,f6:117,f7:118,f8:119,f9:120,f10:121,f11:122,f12:123},Kp=Xt.makeMap("alt,ctrl,shift,meta,access");function Xp(i){var a={},r=[],u=function(e){var t,n,r={};for(n in qp($p(e,"+"),function(e){e in Kp?r[e]=!0:/^[0-9]{2,}$/.test(e)?r.keyCode=parseInt(e,10):(r.charCode=e.charCodeAt(0),r.keyCode=Wp[e]||e.toUpperCase().charCodeAt(0))}),t=[r.keyCode],Kp)r[n]?t.push(n):r[n]=!1;return r.id=t.join(","),r.access&&(r.alt=!0,fe.mac?r.ctrl=!0:r.shift=!0),r.meta&&(fe.mac?r.meta=!0:(r.ctrl=!0,r.meta=!1)),r},s=function(e,t,n,r){var o;return(o=Xt.map($p(e,">"),u))[o.length-1]=Xt.extend(o[o.length-1],{func:n,scope:r||i}),Xt.extend(o[0],{desc:i.translate(t),subpatterns:o.slice(1)})},o=function(e,t){return!!t&&t.ctrl===e.ctrlKey&&t.meta===e.metaKey&&t.alt===e.altKey&&t.shift===e.shiftKey&&!!(e.keyCode===t.keyCode||e.charCode&&e.charCode===t.charCode)&&(e.preventDefault(),!0)},c=function(e){return e.func?e.func.call(e.scope):null};i.on("keyup keypress keydown",function(t){var e,n;((n=t).altKey||n.ctrlKey||n.metaKey||"keydown"===(e=t).type&&112<=e.keyCode&&e.keyCode<=123)&&!t.isDefaultPrevented()&&(qp(a,function(e){if(o(t,e))return r=e.subpatterns.slice(0),"keydown"===t.type&&c(e),!0}),o(t,r[0])&&(1===r.length&&"keydown"===t.type&&c(r[0]),r.shift()))}),this.add=function(e,n,r,o){var t;return"string"==typeof(t=r)?r=function(){i.execCommand(t,!1,null)}:Xt.isArray(t)&&(r=function(){i.execCommand(t[0],t[1],t[2])}),qp($p(Xt.trim(e.toLowerCase())),function(e){var t=s(e,n,r,o);a[t.id]=t}),!0},this.remove=function(e){var t=s(e);return!!a[t.id]&&(delete a[t.id],!0)}}var Yp=function(e){var t=Ur(e).dom();return e.dom()===t.activeElement},Gp=function(t){return(e=Ur(t),n=e!==undefined?e.dom():V.document,_.from(n.activeElement).map(ar.fromDom)).filter(function(e){return t.dom().contains(e.dom())});var e,n},Jp=function(t,e){return(n=e,n.collapsed?_.from(eu(n.startContainer,n.startOffset)).map(ar.fromDom):_.none()).bind(function(e){return ko(e)?_.some(e):!1===zr(t,e)?_.some(t):_.none()});var n},Qp=function(t,e){Jp(ar.fromDom(t.getBody()),e).bind(function(e){return sc.firstPositionIn(e.dom())}).fold(function(){t.selection.normalize()},function(e){return t.selection.setRng(e.toRange())})},Zp=function(e){if(e.setActive)try{e.setActive()}catch(t){e.focus()}else e.focus()},eh=function(e){var t,n=e.getBody();return n&&(t=ar.fromDom(n),Yp(t)||Gp(t).isSome())},th=function(e){return e.inline?eh(e):(t=e).iframeElement&&Yp(ar.fromDom(t.iframeElement));var t},nh=function(e){return e.editorManager.setActive(e)},rh=function(e,t){e.removed||(t?nh(e):function(t){var e=t.selection,n=t.settings.content_editable,r=t.getBody(),o=e.getRng();t.quirks.refreshContentEditable();var i,a,u=(i=t,a=e.getNode(),i.dom.getParent(a,function(e){return"true"===i.dom.getContentEditable(e)}));if(t.$.contains(r,u))return Zp(u),Qp(t,o),nh(t);t.bookmark!==undefined&&!1===th(t)&&rp(t).each(function(e){t.selection.setRng(e),o=e}),n||(fe.opera||Zp(r),t.getWin().focus()),(fe.gecko||n)&&(Zp(r),Qp(t,o)),nh(t)}(e))},oh=th,ih=function(e,t){return t.dom()[e]},ah=function(e,t){return parseInt(kr(t,e),10)},uh=d(ih,"clientWidth"),sh=d(ih,"clientHeight"),ch=d(ah,"margin-top"),lh=d(ah,"margin-left"),fh=function(e,t,n){var r,o,i,a,u,s,c,l,f,d,m,g=ar.fromDom(e.getBody()),p=e.inline?g:(r=g,ar.fromDom(r.dom().ownerDocument.documentElement)),h=(o=e.inline,a=t,u=n,s=(i=p).dom().getBoundingClientRect(),{x:a-(o?s.left+i.dom().clientLeft+lh(i):0),y:u-(o?s.top+i.dom().clientTop+ch(i):0)});return l=h.x,f=h.y,d=uh(c=p),m=sh(c),0<=l&&0<=f&&l<=d&&f<=m},dh=function(e){var t,n=e.inline?e.getBody():e.getContentAreaContainer();return(t=n,_.from(t).map(ar.fromDom)).map(function(e){return zr(Ur(e),e)}).getOr(!1)};function mh(n){var t,o=[],i=function(){var e,t=n.theme;return t&&t.getNotificationManagerImpl?t.getNotificationManagerImpl():{open:e=function(){throw new Error("Theme did not provide a NotificationManager implementation.")},close:e,reposition:e,getArgs:e}},a=function(){0<o.length&&i().reposition(o)},u=function(t){Y(o,function(e){return e===t}).each(function(e){o.splice(e,1)})},r=function(r){if(!n.removed&&dh(n))return X(o,function(e){return t=i().getArgs(e),n=r,!(t.type!==n.type||t.text!==n.text||t.progressBar||t.timeout||n.progressBar||n.timeout);var t,n}).getOrThunk(function(){n.editorManager.setActive(n);var e,t=i().open(r,function(){u(t),a()});return e=t,o.push(e),a(),t})};return(t=n).on("SkinLoaded",function(){var e=t.settings.service_message;e&&r({text:e,type:"warning",timeout:0,icon:""})}),t.on("ResizeEditor ResizeWindow",function(){he.requestAnimationFrame(a)}),t.on("remove",function(){z(o.slice(),function(e){i().close(e)})}),{open:r,close:function(){_.from(o[0]).each(function(e){i().close(e),u(e),a()})},getNotifications:function(){return o}}}function gh(r){var o=[],i=function(){var e,t=r.theme;return t&&t.getWindowManagerImpl?t.getWindowManagerImpl():{open:e=function(){throw new Error("Theme did not provide a WindowManager implementation.")},alert:e,confirm:e,close:e,getParams:e,setParams:e}},a=function(e,t){return function(){return t?t.apply(e,arguments):undefined}},u=function(e){var t;o.push(e),t=e,r.fire("OpenWindow",{win:t})},s=function(n){Y(o,function(e){return e===n}).each(function(e){var t;o.splice(e,1),t=n,r.fire("CloseWindow",{win:t}),0===o.length&&r.focus()})},e=function(){return _.from(o[o.length-1])};return r.on("remove",function(){z(o.slice(0),function(e){i().close(e)})}),{windows:o,open:function(e,t){r.editorManager.setActive(r),tp(r);var n=i().open(e,t,s);return u(n),n},alert:function(e,t,n){var r=i().alert(e,a(n||this,t),s);u(r)},confirm:function(e,t,n){var r=i().confirm(e,a(n||this,t),s);u(r)},close:function(){e().each(function(e){i().close(e),s(e)})},getParams:function(){return e().map(i().getParams).getOr(null)},setParams:function(t){e().each(function(e){i().setParams(e,t)})},getWindows:function(){return o}}}var ph={},hh="en",vh={setCode:function(e){e&&(hh=e,this.rtl=!!this.data[e]&&"rtl"===this.data[e]._dir)},getCode:function(){return hh},rtl:!1,add:function(e,t){var n=ph[e];for(var r in n||(ph[e]=n={}),t)n[r]=t[r];this.setCode(e)},translate:function(e){var t=ph[hh]||{},n=function(e){return Xt.is(e,"function")?Object.prototype.toString.call(e):r(e)?"":""+e},r=function(e){return""===e||null===e||Xt.is(e,"undefined")},o=function(e){return e=n(e),Xt.hasOwn(t,e)?n(t[e]):e};if(r(e))return"";if(Xt.is(e,"object")&&Xt.hasOwn(e,"raw"))return n(e.raw);if(Xt.is(e,"array")){var i=e.slice(1);e=o(e[0]).replace(/\{([0-9]+)\}/g,function(e,t){return Xt.hasOwn(i,t)?n(i[t]):e})}return o(e).replace(/{context:\w+}$/,"")},data:ph},yh=Bi.PluginManager,bh=function(e,t){var n=function(e,t){for(var n in yh.urls)if(yh.urls[n]+"/plugin"+t+".js"===e)return n;return null}(t,e.suffix);return n?vh.translate(["Failed to load plugin: {0} from url {1}",n,t]):vh.translate(["Failed to load plugin url: {0}",t])},Ch=function(e,t){e.notificationManager.open({type:"error",text:t})},xh=function(e,t){e._skinLoaded?Ch(e,t):e.on("SkinLoaded",function(){Ch(e,t)})},wh=function(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];var r=V.window.console;r&&(r.error?r.error.apply(r,arguments):r.log.apply(r,arguments))},Nh={pluginLoadError:function(e,t){xh(e,bh(e,t))},pluginInitError:function(e,t,n){var r=vh.translate(["Failed to initialize plugin: {0}",t]);wh(r,n),xh(e,r)},uploadError:function(e,t){xh(e,vh.translate(["Failed to upload image: {0}",t]))},displayError:xh,initError:wh},Eh=Bi.PluginManager,Sh=Bi.ThemeManager;function Th(){return new(oe.getOrDie("XMLHttpRequest"))}function kh(u,s){var r={},n=function(e,r,o,t){var i,n;(i=Th()).open("POST",s.url),i.withCredentials=s.credentials,i.upload.onprogress=function(e){t(e.loaded/e.total*100)},i.onerror=function(){o("Image upload failed due to a XHR Transport error. Code: "+i.status)},i.onload=function(){var e,t,n;i.status<200||300<=i.status?o("HTTP Error: "+i.status):(e=JSON.parse(i.responseText))&&"string"==typeof e.location?r((t=s.basePath,n=e.location,t?t.replace(/\/$/,"")+"/"+n.replace(/^\//,""):n)):o("Invalid JSON: "+i.responseText)},(n=new V.FormData).append("file",e.blob(),e.filename()),i.send(n)},c=function(e,t){return{url:t,blobInfo:e,status:!0}},l=function(e,t){return{url:"",blobInfo:e,status:!1,error:t}},f=function(e,t){Xt.each(r[e],function(e){e(t)}),delete r[e]},o=function(e,n){return e=Xt.grep(e,function(e){return!u.isUploaded(e.blobUri())}),de.all(Xt.map(e,function(e){return u.isPending(e.blobUri())?(t=e.blobUri(),new de(function(e){r[t]=r[t]||[],r[t].push(e)})):(o=e,i=s.handler,a=n,u.markPending(o.blobUri()),new de(function(t){var n;try{var r=function(){n&&n.close()};i(o,function(e){r(),u.markUploaded(o.blobUri(),e),f(o.blobUri(),c(o,e)),t(c(o,e))},function(e){r(),u.removeFailed(o.blobUri()),f(o.blobUri(),l(o,e)),t(l(o,e))},function(e){e<0||100<e||(n||(n=a()),n.progressBar.value(e))})}catch(e){t(l(o,e.message))}}));var o,i,a,t}))};return!1===D(s.handler)&&(s.handler=n),{upload:function(e,t){return s.url||s.handler!==n?o(e,t):new de(function(e){e([])})}}}var _h=function(e){return oe.getOrDie("atob")(e)},Ah=function(e){var t,n,r=decodeURIComponent(e).split(",");return(n=/data:([^;]+)/.exec(r[0]))&&(t=n[1]),{type:t,data:r[1]}},Rh=function(a){return new de(function(e){var t,n,r,o,i=Ah(a);try{t=_h(i.data)}catch(iE){return void e(new V.Blob([]))}for(o=t.length,n=new(oe.getOrDie("Uint8Array"))(o),r=0;r<n.length;r++)n[r]=t.charCodeAt(r);e(new V.Blob([n],{type:i.type}))})},Dh=function(e){return 0===e.indexOf("blob:")?(i=e,new de(function(e,t){var n=function(){t("Cannot convert "+i+" to Blob. Resource might not exist or is inaccessible.")};try{var r=Th();r.open("GET",i,!0),r.responseType="blob",r.onload=function(){200===this.status?e(this.response):n()},r.onerror=n,r.send()}catch(o){n()}})):0===e.indexOf("data:")?Rh(e):null;var i},Oh=function(n){return new de(function(e){var t=new(oe.getOrDie("FileReader"));t.onloadend=function(){e(t.result)},t.readAsDataURL(n)})},Bh=Ah,Ph=0,Ih=function(e){return(e||"blobid")+Ph++},Lh=function(n,r,o,t){var i,a;0!==r.src.indexOf("blob:")?(i=Bh(r.src).data,(a=n.findFirst(function(e){return e.base64()===i}))?o({image:r,blobInfo:a}):Dh(r.src).then(function(e){a=n.create(Ih(),e,i),n.add(a),o({image:r,blobInfo:a})},function(e){t(e)})):(a=n.getByUri(r.src))?o({image:r,blobInfo:a}):Dh(r.src).then(function(t){Oh(t).then(function(e){i=Bh(e).data,a=n.create(Ih(),t,i),n.add(a),o({image:r,blobInfo:a})})},function(e){t(e)})},Fh=function(e){return e?te(e.getElementsByTagName("img")):[]},Mh=0,zh={uuid:function(e){return e+Mh+++(t=function(){return Math.round(4294967295*Math.random()).toString(36)},"s"+(new Date).getTime().toString(36)+t()+t()+t());var t}};function Uh(u){var n,o,t,e,i,r,a,s,c,l=(n=[],o=function(e){var t,n,r;if(!e.blob||!e.base64)throw new Error("blob and base64 representations of the image are required for BlobInfo to be created");return t=e.id||zh.uuid("blobid"),n=e.name||t,{id:q(t),name:q(n),filename:q(n+"."+(r=e.blob.type,{"image/jpeg":"jpg","image/jpg":"jpg","image/gif":"gif","image/png":"png"}[r.toLowerCase()]||"dat")),blob:q(e.blob),base64:q(e.base64),blobUri:q(e.blobUri||ae.createObjectURL(e.blob)),uri:q(e.uri)}},{create:function(e,t,n,r){if(S(e))return o({id:e,name:r,blob:t,base64:n});if(T(e))return o(e);throw new Error("Unknown input type")},add:function(e){t(e.id())||n.push(e)},get:t=function(t){return e(function(e){return e.id()===t})},getByUri:function(t){return e(function(e){return e.blobUri()===t})},findFirst:e=function(e){return U(n,e)[0]},removeByUri:function(t){n=U(n,function(e){return e.blobUri()!==t||(ae.revokeObjectURL(e.blobUri()),!1)})},destroy:function(){z(n,function(e){ae.revokeObjectURL(e.blobUri())}),n=[]}}),f=(a={},s=function(e,t){return{status:e,resultUri:t}},{hasBlobUri:c=function(e){return e in a},getResultUri:function(e){var t=a[e];return t?t.resultUri:null},isPending:function(e){return!!c(e)&&1===a[e].status},isUploaded:function(e){return!!c(e)&&2===a[e].status},markPending:function(e){a[e]=s(1,null)},markUploaded:function(e,t){a[e]=s(2,t)},removeFailed:function(e){delete a[e]},destroy:function(){a={}}}),d=[],m=function(t){return function(e){return u.selection?t(e):[]}},g=function(e,t,n){for(var r=0;-1!==(r=e.indexOf(t,r))&&(e=e.substring(0,r)+n+e.substr(r+t.length),r+=n.length-t.length+1),-1!==r;);return e},p=function(e,t,n){return e=g(e,'src="'+t+'"','src="'+n+'"'),e=g(e,'data-mce-src="'+t+'"','data-mce-src="'+n+'"')},h=function(t,n){z(u.undoManager.data,function(e){"fragmented"===e.type?e.fragments=W(e.fragments,function(e){return p(e,t,n)}):e.content=p(e.content,t,n)})},v=function(){return u.notificationManager.open({text:u.translate("Image uploading..."),type:"info",timeout:-1,progressBar:!0})},y=function(e,t){l.removeByUri(e.src),h(e.src,t),u.$(e).attr({src:Bl(u)?t+"?"+(new Date).getTime():t,"data-mce-src":u.convertURL(t,"src")})},b=function(n){return i||(i=kh(f,{url:Il(u),basePath:Ll(u),credentials:Fl(u),handler:Ml(u)})),w().then(m(function(r){var e;return e=W(r,function(e){return e.blobInfo}),i.upload(e,v).then(m(function(e){var t=W(e,function(e,t){var n=r[t].image;return e.status&&Pl(u)?y(n,e.url):e.error&&Nh.uploadError(u,e.error),{element:n,status:e.status}});return n&&n(t),t}))}))},C=function(e){if(Ol(u))return b(e)},x=function(t){return!1!==J(d,function(e){return e(t)})&&(0!==t.getAttribute("src").indexOf("data:")||Dl(u)(t))},w=function(){var o,i,a;return r||(o=f,i=l,a={},r={findAll:function(e,n){var t;n||(n=q(!0)),t=U(Fh(e),function(e){var t=e.src;return!!fe.fileApi&&!e.hasAttribute("data-mce-bogus")&&!e.hasAttribute("data-mce-placeholder")&&!(!t||t===fe.transparentSrc)&&(0===t.indexOf("blob:")?!o.isUploaded(t)&&n(e):0===t.indexOf("data:")&&n(e))});var r=W(t,function(n){if(a[n.src])return new de(function(t){a[n.src].then(function(e){if("string"==typeof e)return e;t({image:n,blobInfo:e.blobInfo})})});var e=new de(function(e,t){Lh(i,n,e,t)}).then(function(e){return delete a[e.image.src],e})["catch"](function(e){return delete a[n.src],e});return a[n.src]=e});return de.all(r)}}),r.findAll(u.getBody(),x).then(m(function(e){return e=U(e,function(e){return"string"!=typeof e||(Nh.displayError(u,e),!1)}),z(e,function(e){h(e.image.src,e.blobInfo.blobUri()),e.image.src=e.blobInfo.blobUri(),e.image.removeAttribute("data-mce-src")}),e}))},N=function(e){return e.replace(/src="(blob:[^"]+)"/g,function(e,n){var t=f.getResultUri(n);if(t)return'src="'+t+'"';var r=l.getByUri(n);return r||(r=j(u.editorManager.get(),function(e,t){return e||t.editorUpload&&t.editorUpload.blobCache.getByUri(n)},null)),r?'src="data:'+r.blob().type+";base64,"+r.base64()+'"':e})};return u.on("setContent",function(){Ol(u)?C():w()}),u.on("RawSaveContent",function(e){e.content=N(e.content)}),u.on("getContent",function(e){e.source_view||"raw"===e.format||(e.content=N(e.content))}),u.on("PostRender",function(){u.parser.addNodeFilter("img",function(e){z(e,function(e){var t=e.attr("src");if(!l.getByUri(t)){var n=f.getResultUri(t);n&&e.attr("src",n)}})})}),{blobCache:l,addFilter:function(e){d.push(e)},uploadImages:b,uploadImagesAuto:C,scanForImages:w,destroy:function(){l.destroy(),f.destroy(),r=i=null}}}var jh=function(e,t){return e.hasOwnProperty(t.nodeName)},Vh=function(e,t){if(jo.isText(t)){if(0===t.nodeValue.length)return!0;if(/^\s+$/.test(t.nodeValue)&&(!t.nextSibling||jh(e,t.nextSibling)))return!0}return!1},Hh=function(e){var t,n,r,o,i,a,u,s,c,l,f,d=e.settings,m=e.dom,g=e.selection,p=e.schema,h=p.getBlockElements(),v=g.getStart(),y=e.getBody();if(f=d.forced_root_block,v&&jo.isElement(v)&&f&&(l=y.nodeName.toLowerCase(),p.isValidChild(l,f.toLowerCase())&&(b=h,C=y,x=v,!M(af(ar.fromDom(x),ar.fromDom(C)),function(e){return jh(b,e.dom())})))){var b,C,x,w,N;for(n=(t=g.getRng()).startContainer,r=t.startOffset,o=t.endContainer,i=t.endOffset,c=oh(e),v=y.firstChild;v;)if(w=h,N=v,jo.isText(N)||jo.isElement(N)&&!jh(w,N)&&!yc(N)){if(Vh(h,v)){v=(u=v).nextSibling,m.remove(u);continue}a||(a=m.create(f,e.settings.forced_root_block_attrs),v.parentNode.insertBefore(a,v),s=!0),v=(u=v).nextSibling,a.appendChild(u)}else a=null,v=v.nextSibling;s&&c&&(t.setStart(n,r),t.setEnd(o,i),g.setRng(t),e.nodeChanged())}},qh=function(e){e.settings.forced_root_block&&e.on("NodeChange",d(Hh,e))},$h=function(t){return Yr(t).fold(q([t]),function(e){return[t].concat($h(e))})},Wh=function(t){return Gr(t).fold(q([t]),function(e){return"br"===lr(e)?Hr(e).map(function(e){return[t].concat(Wh(e))}).getOr([]):[t].concat(Wh(e))})},Kh=function(o,e){return ru((i=e,a=i.startContainer,u=i.startOffset,jo.isText(a)?0===u?_.some(ar.fromDom(a)):_.none():_.from(a.childNodes[u]).map(ar.fromDom)),(t=e,n=t.endContainer,r=t.endOffset,jo.isText(n)?r===n.data.length?_.some(ar.fromDom(n)):_.none():_.from(n.childNodes[r-1]).map(ar.fromDom)),function(e,t){var n=X($h(o),d(Mr,e)),r=X(Wh(o),d(Mr,t));return n.isSome()&&r.isSome()}).getOr(!1);var t,n,r,i,a,u},Xh=function(e,t,n,r){var o=n,i=new go(n,o),a=e.schema.getNonEmptyElements();do{if(3===n.nodeType&&0!==Xt.trim(n.nodeValue).length)return void(r?t.setStart(n,0):t.setEnd(n,n.nodeValue.length));if(a[n.nodeName]&&!/^(TD|TH)$/.test(n.nodeName))return void(r?t.setStartBefore(n):"BR"===n.nodeName?t.setEndBefore(n):t.setEndAfter(n));if(fe.ie&&fe.ie<11&&e.isBlock(n)&&e.isEmpty(n))return void(r?t.setStart(n,0):t.setEnd(n,0))}while(n=r?i.next():i.prev());"BODY"===o.nodeName&&(r?t.setStart(o,0):t.setEnd(o,o.childNodes.length))},Yh=function(e){var t=e.selection.getSel();return t&&0<t.rangeCount};function Gh(i){var r,o=[];"onselectionchange"in i.getDoc()||i.on("NodeChange Click MouseUp KeyUp Focus",function(e){var t,n;n={startContainer:(t=i.selection.getRng()).startContainer,startOffset:t.startOffset,endContainer:t.endContainer,endOffset:t.endOffset},"nodechange"!==e.type&&Cg(n,r)||i.fire("SelectionChange"),r=n}),i.on("contextmenu",function(){i.fire("SelectionChange")}),i.on("SelectionChange",function(){var e=i.selection.getStart(!0);!e||!fe.range&&i.selection.isCollapsed()||Yh(i)&&!function(e){var t,n;if((n=i.$(e).parentsUntil(i.getBody()).add(e)).length===o.length){for(t=n.length;0<=t&&n[t]===o[t];t--);if(-1===t)return o=n,!0}return o=n,!1}(e)&&i.dom.isChildOf(e,i.getBody())&&i.nodeChanged({selectionChange:!0})}),i.on("MouseUp",function(e){!e.isDefaultPrevented()&&Yh(i)&&("IMG"===i.selection.getNode().nodeName?he.setEditorTimeout(i,function(){i.nodeChanged()}):i.nodeChanged())}),this.nodeChanged=function(e){var t,n,r,o=i.selection;i.initialized&&o&&!i.settings.disable_nodechange&&!i.readonly&&(r=i.getBody(),(t=o.getStart(!0)||r).ownerDocument===i.getDoc()&&i.dom.isChildOf(t,r)||(t=r),n=[],i.dom.getParent(t,function(e){if(e===r)return!0;n.push(e)}),(e=e||{}).element=t,e.parents=n,i.fire("NodeChange",e))}}var Jh,Qh,Zh={BACKSPACE:8,DELETE:46,DOWN:40,ENTER:13,LEFT:37,RIGHT:39,SPACEBAR:32,TAB:9,UP:38,END:35,HOME:36,modifierPressed:function(e){return e.shiftKey||e.ctrlKey||e.altKey||this.metaKeyPressed(e)},metaKeyPressed:function(e){return fe.mac?e.metaKey:e.ctrlKey&&!e.altKey}},ev=function(e){return j(e,function(e,t){return e.concat(function(t){var e=function(e){return W(e,function(e){return(e=Ka(e)).node=t,e})};if(jo.isElement(t))return e(t.getClientRects());if(jo.isText(t)){var n=t.ownerDocument.createRange();return n.setStart(t,0),n.setEnd(t,t.data.length),e(n.getClientRects())}}(t))},[])};(Qh=Jh||(Jh={}))[Qh.Up=-1]="Up",Qh[Qh.Down=1]="Down";var tv=function(o,i,a,e,u,t){var n,s,c=0,l=[],r=function(e){var t,n,r;for(r=ev([e]),-1===o&&(r=r.reverse()),t=0;t<r.length;t++)if(n=r[t],!a(n,s)){if(0<l.length&&i(n,Ht.last(l))&&c++,n.line=c,u(n))return!0;l.push(n)}};return(s=Ht.last(t.getClientRects()))&&(r(n=t.getNode()),function(e,t,n,r){for(;r=Es(r,e,$a,t);)if(n(r))return}(o,e,r,n)),l},nv=d(tv,Jh.Up,Ga,Ja),rv=d(tv,Jh.Down,Ja,Ga),ov=function(n){return function(e){return t=n,e.line>t;var t}},iv=function(n){return function(e){return t=n,e.line===t;var t}},av=jo.isContentEditableFalse,uv=Es,sv=function(e,t){return Math.abs(e.left-t)},cv=function(e,t){return Math.abs(e.right-t)},lv=function(e,t){return e>=t.left&&e<=t.right},fv=function(e,o){return Ht.reduce(e,function(e,t){var n,r;return n=Math.min(sv(e,o),cv(e,o)),r=Math.min(sv(t,o),cv(t,o)),lv(o,t)?t:lv(o,e)?e:r===n&&av(t.node)?t:r<n?t:e})},dv=function(e,t,n,r){for(;r=uv(r,e,$a,t);)if(n(r))return},mv=function(e,t,n){var r,o,i,a,u,s,c,l=ev(U(te(e.getElementsByTagName("*")),gs)),f=U(l,function(e){return n>=e.top&&n<=e.bottom});return(r=fv(f,t))&&(r=fv((a=e,c=function(t,e){var n;return n=U(ev([e]),function(e){return!t(e,u)}),s=s.concat(n),0===n.length},(s=[]).push(u=r),dv(Jh.Up,a,d(c,Ga),u.node),dv(Jh.Down,a,d(c,Ja),u.node),s),t))&&gs(r.node)?(i=t,{node:(o=r).node,before:sv(o,i)<cv(o,i)}):null},gv=function(t,n,e){if(e.collapsed)return!1;if(fe.ie&&fe.ie<=11&&e.startOffset===e.endOffset-1&&e.startContainer===e.endContainer){var r=e.startContainer.childNodes[e.startOffset];if(jo.isElement(r))return M(r.getClientRects(),function(e){return Qa(e,t,n)})}return M(e.getClientRects(),function(e){return Qa(e,t,n)})},pv=function(e){var t,n,r,o;return o=e.getBoundingClientRect(),n=(t=e.ownerDocument).documentElement,r=t.defaultView,{top:o.top+r.pageYOffset-n.clientTop,left:o.left+r.pageXOffset-n.clientLeft}},hv=function(e,t){return n=(u=e).inline?pv(u.getBody()):{left:0,top:0},a=(i=e).getBody(),r=i.inline?{left:a.scrollLeft,top:a.scrollTop}:{left:0,top:0},{pageX:(o=function(e,t){if(t.target.ownerDocument!==e.getDoc()){var n=pv(e.getContentAreaContainer()),r=(i=(o=e).getBody(),a=o.getDoc().documentElement,u={left:i.scrollLeft,top:i.scrollTop},s={left:i.scrollLeft||a.scrollLeft,top:i.scrollTop||a.scrollTop},o.inline?u:s);return{left:t.pageX-n.left+r.left,top:t.pageY-n.top+r.top}}var o,i,a,u,s;return{left:t.pageX,top:t.pageY}}(e,t)).left-n.left+r.left,pageY:o.top-n.top+r.top};var n,r,o,i,a,u},vv=jo.isContentEditableFalse,yv=jo.isContentEditableTrue,bv=function(e){e&&e.parentNode&&e.parentNode.removeChild(e)},Cv=function(u,s){return function(e){if(0===e.button){var t=X(s.dom.getParents(e.target),au(vv,yv)).getOr(null);if(i=s.getBody(),vv(a=t)&&a!==i){var n=s.dom.getPos(t),r=s.getBody(),o=s.getDoc().documentElement;u.element=t,u.screenX=e.screenX,u.screenY=e.screenY,u.maxX=(s.inline?r.scrollWidth:o.offsetWidth)-2,u.maxY=(s.inline?r.scrollHeight:o.offsetHeight)-2,u.relX=e.pageX-n.x,u.relY=e.pageY-n.y,u.width=t.offsetWidth,u.height=t.offsetHeight,u.ghost=function(e,t,n,r){var o=t.cloneNode(!0);e.dom.setStyles(o,{width:n,height:r}),e.dom.setAttrib(o,"data-mce-selected",null);var i=e.dom.create("div",{"class":"mce-drag-container","data-mce-bogus":"all",unselectable:"on",contenteditable:"false"});return e.dom.setStyles(i,{position:"absolute",opacity:.5,overflow:"hidden",border:0,padding:0,margin:0,width:n,height:r}),e.dom.setStyles(o,{margin:0,boxSizing:"border-box"}),i.appendChild(o),i}(s,t,u.width,u.height)}}var i,a}},xv=function(l,f){return function(e){if(l.dragging&&(s=(i=f).selection,c=s.getSel().getRangeAt(0).startContainer,a=3===c.nodeType?c.parentNode:c,u=l.element,a!==u&&!i.dom.isChildOf(a,u)&&!vv(a))){var t=(r=l.element,(o=r.cloneNode(!0)).removeAttribute("data-mce-selected"),o),n=f.fire("drop",{targetClone:t,clientX:e.clientX,clientY:e.clientY});n.isDefaultPrevented()||(t=n.targetClone,f.undoManager.transact(function(){bv(l.element),f.insertContent(f.dom.getOuterHTML(t)),f._selectionOverrides.hideFakeCaret()}))}var r,o,i,a,u,s,c;wv(l)}},wv=function(e){e.dragging=!1,e.element=null,bv(e.ghost)},Nv=function(e){var t,n,r,o,i,a,p,h,v,u,s,c={};t=Si.DOM,a=V.document,n=Cv(c,e),p=c,h=e,v=he.throttle(function(e,t){h._selectionOverrides.hideFakeCaret(),h.selection.placeCaretAt(e,t)},0),r=function(e){var t,n,r,o,i,a,u,s,c,l,f,d,m=Math.max(Math.abs(e.screenX-p.screenX),Math.abs(e.screenY-p.screenY));if(p.element&&!p.dragging&&10<m){if(h.fire("dragstart",{target:p.element}).isDefaultPrevented())return;p.dragging=!0,h.focus()}if(p.dragging){var g=(f=p,{pageX:(d=hv(h,e)).pageX-f.relX,pageY:d.pageY+5});c=p.ghost,l=h.getBody(),c.parentNode!==l&&l.appendChild(c),t=p.ghost,n=g,r=p.width,o=p.height,i=p.maxX,a=p.maxY,s=u=0,t.style.left=n.pageX+"px",t.style.top=n.pageY+"px",n.pageX+r>i&&(u=n.pageX+r-i),n.pageY+o>a&&(s=n.pageY+o-a),t.style.width=r-u+"px",t.style.height=o-s+"px",v(e.clientX,e.clientY)}},o=xv(c,e),u=c,i=function(){u.dragging&&s.fire("dragend"),wv(u)},(s=e).on("mousedown",n),e.on("mousemove",r),e.on("mouseup",o),t.bind(a,"mousemove",r),t.bind(a,"mouseup",i),e.on("remove",function(){t.unbind(a,"mousemove",r),t.unbind(a,"mouseup",i)})},Ev=function(e){var n;Nv(e),(n=e).on("drop",function(e){var t="undefined"!=typeof e.clientX?n.getDoc().elementFromPoint(e.clientX,e.clientY):null;(vv(t)||vv(n.dom.getContentEditableParent(t)))&&e.preventDefault()})},Sv=function(t){var e=Vi(function(){if(!t.removed&&t.selection.getRng().collapsed){var e=sg(t,t.selection.getRng(),!1);t.selection.setRng(e)}},0);t.on("focus",function(){e.throttle()}),t.on("blur",function(){e.cancel()})},Tv=jo.isContentEditableTrue,kv=jo.isContentEditableFalse,_v=function(e,t){for(var n=e.getBody();t&&t!==n;){if(Tv(t)||kv(t))return t;t=t.parentNode}return null},Av=function(g){var p,e,t,a=g.getBody(),o=ds(g.getBody(),function(e){return g.dom.isBlock(e)},function(){return oh(g)}),h="sel-"+g.dom.uniqueId(),u=function(e){e&&g.selection.setRng(e)},s=function(){return g.selection.getRng()},v=function(e,t,n,r){return void 0===r&&(r=!0),g.fire("ShowCaret",{target:t,direction:e,before:n}).isDefaultPrevented()?null:(r&&g.selection.scrollIntoView(t,-1===e),o.show(n,t))},y=function(e,t){return t=Os(e,a,t),-1===e?_u.fromRangeStart(t):_u.fromRangeEnd(t)},n=function(e){return ka(e)||Oa(e)||Ba(e)},b=function(e){return n(e.startContainer)||n(e.endContainer)},c=function(e){var t=g.schema.getShortEndedElements(),n=g.dom.createRng(),r=e.startContainer,o=e.startOffset,i=e.endContainer,a=e.endOffset;return br(t,r.nodeName.toLowerCase())?0===o?n.setStartBefore(r):n.setStartAfter(r):n.setStart(r,o),br(t,i.nodeName.toLowerCase())?0===a?n.setEndBefore(i):n.setEndAfter(i):n.setEnd(i,a),n},l=function(e,t){var n,r,o,i,a,u,s,c,l,f,d=g.$,m=g.dom;if(!e)return null;if(e.collapsed){if(!b(e))if(!1===t){if(c=y(-1,e),gs(c.getNode(!0)))return v(-1,c.getNode(!0),!1,!1);if(gs(c.getNode()))return v(-1,c.getNode(),!c.isAtEnd(),!1)}else{if(c=y(1,e),gs(c.getNode()))return v(1,c.getNode(),!c.isAtEnd(),!1);if(gs(c.getNode(!0)))return v(1,c.getNode(!0),!1,!1)}return null}return i=e.startContainer,a=e.startOffset,u=e.endOffset,3===i.nodeType&&0===a&&kv(i.parentNode)&&(i=i.parentNode,a=m.nodeIndex(i),i=i.parentNode),1!==i.nodeType?null:(u===a+1&&i===e.endContainer&&(n=i.childNodes[a]),kv(n)?(l=f=n.cloneNode(!0),(s=g.fire("ObjectSelected",{target:n,targetClone:l})).isDefaultPrevented()?null:(r=oa(ar.fromDom(g.getBody()),"#"+h).fold(function(){return d([])},function(e){return d([e.dom()])}),l=s.targetClone,0===r.length&&(r=d('<div data-mce-bogus="all" class="mce-offscreen-selection"></div>').attr("id",h)).appendTo(g.getBody()),e=g.dom.createRng(),l===f&&fe.ie?(r.empty().append('<p style="font-size: 0" data-mce-bogus="all">\xa0</p>').append(l),e.setStartAfter(r[0].firstChild.firstChild),e.setEndAfter(l)):(r.empty().append("\xa0").append(l).append("\xa0"),e.setStart(r[0].firstChild,1),e.setEnd(r[0].lastChild,0)),r.css({top:m.getPos(n,g.getBody()).y}),r[0].focus(),(o=g.selection.getSel()).removeAllRanges(),o.addRange(e),z(Qi(ar.fromDom(g.getBody()),"*[data-mce-selected]"),function(e){Sr(e,"data-mce-selected")}),n.setAttribute("data-mce-selected","1"),p=n,C(),e)):null)},f=function(){p&&(p.removeAttribute("data-mce-selected"),oa(ar.fromDom(g.getBody()),"#"+h).each(Ui),p=null),oa(ar.fromDom(g.getBody()),"#"+h).each(Ui),p=null},C=function(){o.hide()};return fe.ceFalse&&(function(){g.on("mouseup",function(e){var t=s();t.collapsed&&fh(g,e.clientX,e.clientY)&&u(ug(g,t,!1))}),g.on("click",function(e){var t;(t=_v(g,e.target))&&(kv(t)&&(e.preventDefault(),g.focus()),Tv(t)&&g.dom.isChildOf(t,g.selection.getNode())&&f())}),g.on("blur NewBlock",function(){f()}),g.on("ResizeWindow FullscreenStateChanged",function(){return o.reposition()});var n,r,i=function(e,t){var n,r,o=g.dom.getParent(e,g.dom.isBlock),i=g.dom.getParent(t,g.dom.isBlock);return!(!o||!g.dom.isChildOf(o,i)||!1!==kv(_v(g,o)))||o&&(n=o,r=i,!(g.dom.getParent(n,g.dom.isBlock)===g.dom.getParent(r,g.dom.isBlock)))&&function(e){var t=Js(e);if(!e.firstChild)return!1;var n=_u.before(e.firstChild),r=t.next(n);return r&&!Lf(r)&&!Ff(r)}(o)};r=!1,(n=g).on("touchstart",function(){r=!1}),n.on("touchmove",function(){r=!0}),n.on("touchend",function(e){var t=_v(n,e.target);kv(t)&&(r||(e.preventDefault(),l(ag(n,t))))}),g.on("mousedown",function(e){var t,n=e.target;if((n===a||"HTML"===n.nodeName||g.dom.isChildOf(n,a))&&!1!==fh(g,e.clientX,e.clientY))if(t=_v(g,n))kv(t)?(e.preventDefault(),l(ag(g,t))):(f(),Tv(t)&&e.shiftKey||gv(e.clientX,e.clientY,g.selection.getRng())||(C(),g.selection.placeCaretAt(e.clientX,e.clientY)));else if(!1===gs(n)){f(),C();var r=mv(a,e.clientX,e.clientY);if(r&&!i(e.target,r.node)){e.preventDefault();var o=v(1,r.node,r.before,!1);g.getBody().focus(),u(o)}}}),g.on("keypress",function(e){Zh.modifierPressed(e)||(e.keyCode,kv(g.selection.getNode())&&e.preventDefault())}),g.on("getSelectionRange",function(e){var t=e.range;if(p){if(!p.parentNode)return void(p=null);(t=t.cloneRange()).selectNode(p),e.range=t}}),g.on("setSelectionRange",function(e){e.range=c(e.range);var t=l(e.range,e.forward);t&&(e.range=t)}),g.on("AfterSetSelectionRange",function(e){var t,n=e.range;b(n)||"mcepastebin"===n.startContainer.parentNode.id||C(),t=n.startContainer.parentNode,g.dom.hasClass(t,"mce-offscreen-selection")||f()}),g.on("copy",function(e){var t,n=e.clipboardData;if(!e.isDefaultPrevented()&&e.clipboardData&&!fe.ie){var r=(t=g.dom.get(h))?t.getElementsByTagName("*")[0]:t;r&&(e.preventDefault(),n.clearData(),n.setData("text/html",r.outerHTML),n.setData("text/plain",r.outerText))}}),Ev(g),Sv(g)}(),e=g.contentStyles,t=".mce-content-body",e.push(o.getCss()),e.push(t+" .mce-offscreen-selection {position: absolute;left: -9999999999px;max-width: 1000000px;}"+t+" *[contentEditable=false] {cursor: default;}"+t+" *[contentEditable=true] {cursor: text;}")),{showCaret:v,showBlockCaretContainer:function(e){e.hasAttribute("data-mce-caret")&&(Pa(e),u(s()),g.selection.scrollIntoView(e[0]))},hideFakeCaret:C,destroy:function(){o.destroy(),p=null}}},Rv=function(e){for(var t=e;/<!--|--!?>/g.test(t);)t=t.replace(/<!--|--!?>/g,"");return t},Dv=function(e,t,n){var r,o,i,a,u=1;for(a=e.getShortEndedElements(),(i=/<([!?\/])?([A-Za-z0-9\-_\:\.]+)((?:\s+[^"\'>]+(?:(?:"[^"]*")|(?:\'[^\']*\')|[^>]*))*|\/|\s+)>/g).lastIndex=r=n;o=i.exec(t);){if(r=i.lastIndex,"/"===o[1])u--;else if(!o[1]){if(o[2]in a)continue;u++}if(0===u)break}return r},Ov=function(e,t){var n=e.exec(t);if(n){var r=n[1],o=n[2];return"string"==typeof r&&"data-mce-bogus"===r.toLowerCase()?o:null}return null};function Bv(z,U){void 0===U&&(U=di());var e=function(){};!1!==(z=z||{}).fix_self_closing&&(z.fix_self_closing=!0);var j=z.comment?z.comment:e,V=z.cdata?z.cdata:e,H=z.text?z.text:e,q=z.start?z.start:e,$=z.end?z.end:e,W=z.pi?z.pi:e,K=z.doctype?z.doctype:e;return{parse:function(e){var t,n,r,d,o,i,a,m,u,s,g,c,p,l,f,h,v,y,b,C,x,w,N,E,S,T,k,_,A,R=0,D=[],O=0,B=ti.decode,P=Xt.makeMap("src,href,data,background,formaction,poster,xlink:href"),I=/((java|vb)script|mhtml):/i,L=function(e){var t,n;for(t=D.length;t--&&D[t].name!==e;);if(0<=t){for(n=D.length-1;t<=n;n--)(e=D[n]).valid&&$(e.name);D.length=t}},F=function(e,t,n,r,o){var i,a,u,s,c;if(n=(t=t.toLowerCase())in g?t:B(n||r||o||""),p&&!m&&0==(0===(u=t).indexOf("data-")||0===u.indexOf("aria-"))){if(!(i=y[t])&&b){for(a=b.length;a--&&!(i=b[a]).pattern.test(t););-1===a&&(i=null)}if(!i)return;if(i.validValues&&!(n in i.validValues))return}if(P[t]&&!z.allow_script_urls){var l=n.replace(/[\s\u0000-\u001F]+/g,"");try{l=decodeURIComponent(l)}catch(f){l=unescape(l)}if(I.test(l))return;if(c=l,!(s=z).allow_html_data_urls&&(/^data:image\//i.test(c)?!1===s.allow_svg_data_urls&&/^data:image\/svg\+xml/i.test(c):/^data:/i.test(c)))return}m&&(t in P||0===t.indexOf("on"))||(d.map[t]=n,d.push({name:t,value:n}))};for(S=new RegExp("<(?:(?:!--([\\w\\W]*?)--!?>)|(?:!\\[CDATA\\[([\\w\\W]*?)\\]\\]>)|(?:!DOCTYPE([\\w\\W]*?)>)|(?:\\?([^\\s\\/<>]+) ?([\\w\\W]*?)[?/]>)|(?:\\/([A-Za-z][A-Za-z0-9\\-_\\:\\.]*)>)|(?:([A-Za-z][A-Za-z0-9\\-_\\:\\.]*)((?:\\s+[^\"'>]+(?:(?:\"[^\"]*\")|(?:'[^']*')|[^>]*))*|\\/|\\s+)>))","g"),T=/([\w:\-]+)(?:\s*=\s*(?:(?:\"((?:[^\"])*)\")|(?:\'((?:[^\'])*)\')|([^>\s]+)))?/g,s=U.getShortEndedElements(),E=z.self_closing_elements||U.getSelfClosingElements(),g=U.getBoolAttrs(),p=z.validate,u=z.remove_internals,A=z.fix_self_closing,k=U.getSpecialElements(),N=e+">";t=S.exec(N);){if(R<t.index&&H(B(e.substr(R,t.index-R))),n=t[6])":"===(n=n.toLowerCase()).charAt(0)&&(n=n.substr(1)),L(n);else if(n=t[7]){if(t.index+t[0].length>e.length){H(B(e.substr(t.index))),R=t.index+t[0].length;continue}":"===(n=n.toLowerCase()).charAt(0)&&(n=n.substr(1)),c=n in s,A&&E[n]&&0<D.length&&D[D.length-1].name===n&&L(n);var M=Ov(T,t[8]);if(null!==M){if("all"===M){R=Dv(U,e,S.lastIndex),S.lastIndex=R;continue}f=!1}if(!p||(l=U.getElementRule(n))){if(f=!0,p&&(y=l.attributes,b=l.attributePatterns),(v=t[8])?((m=-1!==v.indexOf("data-mce-type"))&&u&&(f=!1),(d=[]).map={},v.replace(T,F)):(d=[]).map={},p&&!m){if(C=l.attributesRequired,x=l.attributesDefault,w=l.attributesForced,l.removeEmptyAttrs&&!d.length&&(f=!1),w)for(o=w.length;o--;)a=(h=w[o]).name,"{$uid}"===(_=h.value)&&(_="mce_"+O++),d.map[a]=_,d.push({name:a,value:_});if(x)for(o=x.length;o--;)(a=(h=x[o]).name)in d.map||("{$uid}"===(_=h.value)&&(_="mce_"+O++),d.map[a]=_,d.push({name:a,value:_}));if(C){for(o=C.length;o--&&!(C[o]in d.map););-1===o&&(f=!1)}if(h=d.map["data-mce-bogus"]){if("all"===h){R=Dv(U,e,S.lastIndex),S.lastIndex=R;continue}f=!1}}f&&q(n,d,c)}else f=!1;if(r=k[n]){r.lastIndex=R=t.index+t[0].length,(t=r.exec(e))?(f&&(i=e.substr(R,t.index-R)),R=t.index+t[0].length):(i=e.substr(R),R=e.length),f&&(0<i.length&&H(i,!0),$(n)),S.lastIndex=R;continue}c||(v&&v.indexOf("/")===v.length-1?f&&$(n):D.push({name:n,valid:f}))}else(n=t[1])?(">"===n.charAt(0)&&(n=" "+n),z.allow_conditional_comments||"[if"!==n.substr(0,3).toLowerCase()||(n=" "+n),j(n)):(n=t[2])?V(Rv(n)):(n=t[3])?K(n):(n=t[4])&&W(n,t[5]);R=t.index+t[0].length}for(R<e.length&&H(B(e.substr(R))),o=D.length-1;0<=o;o--)(n=D[o]).valid&&$(n.name)}}}(Bv||(Bv={})).findEndTag=Dv;var Pv=Bv,Iv=function(e,t){var n,r,o,i,a,u,s,c,l=t,f=/<(\w+) [^>]*data-mce-bogus="all"[^>]*>/g,d=e.schema;for(u=e.getTempAttrs(),s=l,c=new RegExp(["\\s?("+u.join("|")+')="[^"]+"'].join("|"),"gi"),l=s.replace(c,""),a=d.getShortEndedElements();i=f.exec(l);)r=f.lastIndex,o=i[0].length,n=a[i[1]]?r:Pv.findEndTag(d,l,r),l=l.substring(0,r-o)+l.substring(n),f.lastIndex=r-o;return wa(l)},Lv={trimExternal:Iv,trimInternal:Iv},Fv=0,Mv=2,zv=1,Uv=function(g,p){var e=g.length+p.length+2,h=new Array(e),v=new Array(e),c=function(e,t,n,r,o){var i=l(e,t,n,r);if(null===i||i.start===t&&i.diag===t-r||i.end===e&&i.diag===e-n)for(var a=e,u=n;a<t||u<r;)a<t&&u<r&&g[a]===p[u]?(o.push([0,g[a]]),++a,++u):r-n<t-e?(o.push([2,g[a]]),++a):(o.push([1,p[u]]),++u);else{c(e,i.start,n,i.start-i.diag,o);for(var s=i.start;s<i.end;++s)o.push([0,g[s]]);c(i.end,t,i.end-i.diag,r,o)}},y=function(e,t,n,r){for(var o=e;o-t<r&&o<n&&g[o]===p[o-t];)++o;return{start:e,end:o,diag:t}},l=function(e,t,n,r){var o=t-e,i=r-n;if(0===o||0===i)return null;var a,u,s,c,l,f=o-i,d=i+o,m=(d%2==0?d:d+1)/2;for(h[1+m]=e,v[1+m]=t+1,a=0;a<=m;++a){for(u=-a;u<=a;u+=2){for(s=u+m,u===-a||u!==a&&h[s-1]<h[s+1]?h[s]=h[s+1]:h[s]=h[s-1]+1,l=(c=h[s])-e+n-u;c<t&&l<r&&g[c]===p[l];)h[s]=++c,++l;if(f%2!=0&&f-a<=u&&u<=f+a&&v[s-f]<=h[s])return y(v[s-f],u+e-n,t,r)}for(u=f-a;u<=f+a;u+=2){for(s=u+m-f,u===f-a||u!==f+a&&v[s+1]<=v[s-1]?v[s]=v[s+1]-1:v[s]=v[s-1],l=(c=v[s]-1)-e+n-u;e<=c&&n<=l&&g[c]===p[l];)v[s]=c--,l--;if(f%2==0&&-a<=u&&u<=a&&v[s]<=h[s+f])return y(v[s],u+e-n,t,r)}}},t=[];return c(0,g.length,0,p.length,t),t},jv=function(e){return jo.isElement(e)?e.outerHTML:jo.isText(e)?ti.encodeRaw(e.data,!1):jo.isComment(e)?"\x3c!--"+e.data+"--\x3e":""},Vv=function(e,t,n){var r=function(e){var t,n,r;for(r=V.document.createElement("div"),t=V.document.createDocumentFragment(),e&&(r.innerHTML=e);n=r.firstChild;)t.appendChild(n);return t}(t);if(e.hasChildNodes()&&n<e.childNodes.length){var o=e.childNodes[n];o.parentNode.insertBefore(r,o)}else e.appendChild(r)},Hv=function(e){return U(W(te(e.childNodes),jv),function(e){return 0<e.length})},qv=function(e,t){var n,r,o,i=W(te(t.childNodes),jv);return n=Uv(i,e),r=t,o=0,z(n,function(e){e[0]===Fv?o++:e[0]===zv?(Vv(r,e[1],o),o++):e[0]===Mv&&function(e,t){if(e.hasChildNodes()&&t<e.childNodes.length){var n=e.childNodes[t];n.parentNode.removeChild(n)}}(r,o)}),t},$v=Hi(_.none()),Wv=function(e){return{type:"fragmented",fragments:e,content:"",bookmark:null,beforeBookmark:null}},Kv=function(e){return{type:"complete",fragments:null,content:e,bookmark:null,beforeBookmark:null}},Xv=function(e){return"fragmented"===e.type?e.fragments.join(""):e.content},Yv=function(e){var t=ar.fromTag("body",$v.get().getOrThunk(function(){var e=V.document.implementation.createHTMLDocument("undo");return $v.set(_.some(e)),e}));return ya(t,Xv(e)),z(Qi(t,"*[data-mce-bogus]"),ji),t.dom().innerHTML},Gv=function(n){var e,t,r;return e=Hv(n.getBody()),-1!==(t=(r=G(e,function(e){var t=Lv.trimInternal(n.serializer,e);return 0<t.length?[t]:[]})).join("")).indexOf("</iframe>")?Wv(r):Kv(t)},Jv=function(e,t,n){"fragmented"===t.type?qv(t.fragments,e.getBody()):e.setContent(t.content,{format:"raw"}),e.selection.moveToBookmark(n?t.beforeBookmark:t.bookmark)},Qv=function(e,t){return!(!e||!t)&&(r=t,Xv(e)===Xv(r)||(n=t,Yv(e)===Yv(n)));var n,r};function Zv(u){var s,r,o=this,c=0,l=[],t=0,f=function(){return 0===t},i=function(e){f()&&(o.typing=e)},d=function(e){u.setDirty(e)},a=function(e){i(!1),o.add({},e)},n=function(){o.typing&&(i(!1),o.add())};return u.on("init",function(){o.add()}),u.on("BeforeExecCommand",function(e){var t=e.command;"Undo"!==t&&"Redo"!==t&&"mceRepaint"!==t&&(n(),o.beforeChange())}),u.on("ExecCommand",function(e){var t=e.command;"Undo"!==t&&"Redo"!==t&&"mceRepaint"!==t&&a(e)}),u.on("ObjectResizeStart Cut",function(){o.beforeChange()}),u.on("SaveContent ObjectResized blur",a),u.on("DragEnd",a),u.on("KeyUp",function(e){var t=e.keyCode;e.isDefaultPrevented()||((33<=t&&t<=36||37<=t&&t<=40||45===t||e.ctrlKey)&&(a(),u.nodeChanged()),46!==t&&8!==t||u.nodeChanged(),r&&o.typing&&!1===Qv(Gv(u),l[0])&&(!1===u.isDirty()&&(d(!0),u.fire("change",{level:l[0],lastLevel:null})),u.fire("TypingUndo"),r=!1,u.nodeChanged()))}),u.on("KeyDown",function(e){var t=e.keyCode;if(!e.isDefaultPrevented())if(33<=t&&t<=36||37<=t&&t<=40||45===t)o.typing&&a(e);else{var n=e.ctrlKey&&!e.altKey||e.metaKey;!(t<16||20<t)||224===t||91===t||o.typing||n||(o.beforeChange(),i(!0),o.add({},e),r=!0)}}),u.on("MouseDown",function(e){o.typing&&a(e)}),u.on("input",function(e){var t;e.inputType&&("insertReplacementText"===e.inputType||"insertText"===(t=e).inputType&&null===t.data)&&a(e)}),u.addShortcut("meta+z","","Undo"),u.addShortcut("meta+y,meta+shift+z","","Redo"),u.on("AddUndo Undo Redo ClearUndos",function(e){e.isDefaultPrevented()||u.nodeChanged()}),o={data:l,typing:!1,beforeChange:function(){f()&&(s=Yu.getUndoBookmark(u.selection))},add:function(e,t){var n,r,o,i=u.settings;if(o=Gv(u),e=e||{},e=Xt.extend(e,o),!1===f()||u.removed)return null;if(r=l[c],u.fire("BeforeAddUndo",{level:e,lastLevel:r,originalEvent:t}).isDefaultPrevented())return null;if(r&&Qv(r,e))return null;if(l[c]&&(l[c].beforeBookmark=s),i.custom_undo_redo_levels&&l.length>i.custom_undo_redo_levels){for(n=0;n<l.length-1;n++)l[n]=l[n+1];l.length--,c=l.length}e.bookmark=Yu.getUndoBookmark(u.selection),c<l.length-1&&(l.length=c+1),l.push(e),c=l.length-1;var a={level:e,lastLevel:r,originalEvent:t};return u.fire("AddUndo",a),0<c&&(d(!0),u.fire("change",a)),e},undo:function(){var e;return o.typing&&(o.add(),o.typing=!1,i(!1)),0<c&&(e=l[--c],Jv(u,e,!0),d(!0),u.fire("undo",{level:e})),e},redo:function(){var e;return c<l.length-1&&(e=l[++c],Jv(u,e,!1),d(!0),u.fire("redo",{level:e})),e},clear:function(){l=[],c=0,o.typing=!1,o.data=l,u.fire("ClearUndos")},hasUndo:function(){return 0<c||o.typing&&l[0]&&!Qv(Gv(u),l[0])},hasRedo:function(){return c<l.length-1&&!o.typing},transact:function(e){return n(),o.beforeChange(),o.ignore(e),o.add()},ignore:function(e){try{t++,e()}finally{t--}},extra:function(e,t){var n,r;o.transact(e)&&(r=l[c].bookmark,n=l[c-1],Jv(u,n,!0),o.transact(t)&&(l[c-1].beforeBookmark=r))}}}var ey,ty,ny={},ry=Ht.filter,oy=Ht.each;ty=function(e){var t,n,r=e.selection.getRng();t=jo.matchNodeNames("pre"),r.collapsed||(n=e.selection.getSelectedBlocks(),oy(ry(ry(n,t),function(e){return t(e.previousSibling)&&-1!==Ht.indexOf(n,e.previousSibling)}),function(e){var t,n;t=e.previousSibling,gn(n=e).remove(),gn(t).append("<br><br>").append(n.childNodes)}))},ny[ey="pre"]||(ny[ey]=[]),ny[ey].push(ty);var iy=function(e,t){oy(ny[e],function(e){e(t)})},ay=/^(src|href|style)$/,uy=Xt.each,sy=wc.isEq,cy=function(e,t,n){return e.isChildOf(t,n)&&t!==n&&!e.isBlock(n)},ly=function(e,t,n){var r,o,i;return r=t[n?"startContainer":"endContainer"],o=t[n?"startOffset":"endOffset"],jo.isElement(r)&&(i=r.childNodes.length-1,!n&&o&&o--,r=r.childNodes[i<o?i:o]),jo.isText(r)&&n&&o>=r.nodeValue.length&&(r=new go(r,e.getBody()).next()||r),jo.isText(r)&&!n&&0===o&&(r=new go(r,e.getBody()).prev()||r),r},fy=function(e,t,n,r){var o=e.create(n,r);return t.parentNode.insertBefore(o,t),o.appendChild(t),o},dy=function(e,t,n,r,o){var i=ar.fromDom(t),a=ar.fromDom(e.create(r,o)),u=n?Wr(i):$r(i);return Mi(a,u),n?(Pi(i,a),Li(a,i)):(Ii(i,a),Fi(a,i)),a.dom()},my=function(e,t,n,r){return!(t=wc.getNonWhiteSpaceSibling(t,n,r))||"BR"===t.nodeName||e.isBlock(t)},gy=function(e,n,r,o,i){var t,a,u,s,c,l,f,d,m,g,p,h,v,y,b=e.dom;if(c=b,!(sy(l=o,(f=n).inline)||sy(l,f.block)||(f.selector?jo.isElement(l)&&c.is(l,f.selector):void 0)||(s=o,n.links&&"A"===s.tagName)))return!1;if("all"!==n.remove)for(uy(n.styles,function(e,t){e=wc.normalizeStyleValue(b,wc.replaceVars(e,r),t),"number"==typeof t&&(t=e,i=0),(n.remove_similar||!i||sy(wc.getStyle(b,i,t),e))&&b.setStyle(o,t,""),u=1}),u&&""===b.getAttrib(o,"style")&&(o.removeAttribute("style"),o.removeAttribute("data-mce-style")),uy(n.attributes,function(e,t){var n;if(e=wc.replaceVars(e,r),"number"==typeof t&&(t=e,i=0),!i||sy(b.getAttrib(i,t),e)){if("class"===t&&(e=b.getAttrib(o,t))&&(n="",uy(e.split(/\s+/),function(e){/mce\-\w+/.test(e)&&(n+=(n?" ":"")+e)}),n))return void b.setAttrib(o,t,n);"class"===t&&o.removeAttribute("className"),ay.test(t)&&o.removeAttribute("data-mce-"+t),o.removeAttribute(t)}}),uy(n.classes,function(e){e=wc.replaceVars(e,r),i&&!b.hasClass(i,e)||b.removeClass(o,e)}),a=b.getAttribs(o),t=0;t<a.length;t++){var C=a[t].nodeName;if(0!==C.indexOf("_")&&0!==C.indexOf("data-"))return!1}return"none"!==n.remove?(d=e,g=n,h=(m=o).parentNode,v=d.dom,y=d.settings.forced_root_block,g.block&&(y?h===v.getRoot()&&(g.list_block&&sy(m,g.list_block)||uy(Xt.grep(m.childNodes),function(e){wc.isValid(d,y,e.nodeName.toLowerCase())?p?p.appendChild(e):(p=fy(v,e,y),v.setAttribs(p,d.settings.forced_root_block_attrs)):p=0})):v.isBlock(m)&&!v.isBlock(h)&&(my(v,m,!1)||my(v,m.firstChild,!0,1)||m.insertBefore(v.create("br"),m.firstChild),my(v,m,!0)||my(v,m.lastChild,!1,1)||m.appendChild(v.create("br")))),g.selector&&g.inline&&!sy(g.inline,m)||v.remove(m,1),!0):void 0},py=gy,hy=function(s,c,l,e,f){var t,n,d=s.formatter.get(c),m=d[0],a=!0,u=s.dom,r=s.selection,i=function(e){var n,t,r,o,i,a,u=(n=s,t=e,r=c,o=l,i=f,uy(wc.getParents(n.dom,t.parentNode).reverse(),function(e){var t;a||"_start"===e.id||"_end"===e.id||(t=Mm.matchNode(n,e,r,o,i))&&!1!==t.split&&(a=e)}),a);return function(e,t,n,r,o,i,a,u){var s,c,l,f,d,m,g=e.dom;if(n){for(m=n.parentNode,s=r.parentNode;s&&s!==m;s=s.parentNode){for(c=g.clone(s,!1),d=0;d<t.length;d++)if(gy(e,t[d],u,c,c)){c=0;break}c&&(l&&c.appendChild(l),f||(f=c),l=c)}!i||a.mixed&&g.isBlock(n)||(r=g.split(n,r)),l&&(o.parentNode.insertBefore(l,o),f.appendChild(o))}return r}(s,d,u,e,e,!0,m,l)},g=function(e){var t,n,r,o,i;if(jo.isElement(e)&&u.getContentEditable(e)&&(o=a,a="true"===u.getContentEditable(e),i=!0),t=Xt.grep(e.childNodes),a&&!i)for(n=0,r=d.length;n<r&&!gy(s,d[n],l,e,e);n++);if(m.deep&&t.length){for(n=0,r=t.length;n<r;n++)g(t[n]);i&&(a=o)}},p=function(e){var t,n=u.get(e?"_start":"_end"),r=n[e?"firstChild":"lastChild"];return yc(t=r)&&jo.isElement(t)&&("_start"===t.id||"_end"===t.id)&&(r=r[e?"firstChild":"lastChild"]),jo.isText(r)&&0===r.data.length&&(r=e?n.previousSibling||n.nextSibling:n.nextSibling||n.previousSibling),u.remove(n,!0),r},o=function(e){var t,n,r=e.commonAncestorContainer;if(e=Pc(s,e,d,!0),m.split){if(e=Um(e),(t=ly(s,e,!0))!==(n=ly(s,e))){if(/^(TR|TH|TD)$/.test(t.nodeName)&&t.firstChild&&(t="TR"===t.nodeName?t.firstChild.firstChild||t:t.firstChild||t),r&&/^T(HEAD|BODY|FOOT|R)$/.test(r.nodeName)&&/^(TH|TD)$/.test(n.nodeName)&&n.firstChild&&(n=n.firstChild||n),cy(u,t,n)){var o=_.from(t.firstChild).getOr(t);return i(dy(u,o,!0,"span",{id:"_start","data-mce-type":"bookmark"})),void p(!0)}if(cy(u,n,t))return o=_.from(n.lastChild).getOr(n),i(dy(u,o,!1,"span",{id:"_end","data-mce-type":"bookmark"})),void p(!1);t=fy(u,t,"span",{id:"_start","data-mce-type":"bookmark"}),n=fy(u,n,"span",{id:"_end","data-mce-type":"bookmark"}),i(t),i(n),t=p(!0),n=p()}else t=n=i(t);e.startContainer=t.parentNode?t.parentNode:t,e.startOffset=u.nodeIndex(t),e.endContainer=n.parentNode?n.parentNode:n,e.endOffset=u.nodeIndex(n)+1}Lc(u,e,function(e){uy(e,function(e){g(e),jo.isElement(e)&&"underline"===s.dom.getStyle(e,"text-decoration")&&e.parentNode&&"underline"===wc.getTextDecoration(u,e.parentNode)&&gy(s,{deep:!1,exact:!0,inline:"span",styles:{textDecoration:"underline"}},null,e)})})};if(e)e.nodeType?((n=u.createRng()).setStartBefore(e),n.setEndAfter(e),o(n)):o(e);else if("false"!==u.getContentEditable(r.getNode()))r.isCollapsed()&&m.inline&&!u.select("td[data-mce-selected],th[data-mce-selected]").length?function(e,t,n,r){var o,i,a,u,s,c,l,f=e.dom,d=e.selection,m=[],g=d.getRng();for(o=g.startContainer,i=g.startOffset,3===(s=o).nodeType&&(i!==o.nodeValue.length&&(u=!0),s=s.parentNode);s;){if(Mm.matchNode(e,s,t,n,r)){c=s;break}s.nextSibling&&(u=!0),m.push(s),s=s.parentNode}if(c)if(u){a=d.getBookmark(),g.collapse(!0);var p=Pc(e,g,e.formatter.get(t),!0);p=Um(p),e.formatter.remove(t,n,p),d.moveToBookmark(a)}else{l=Qu(e.getBody(),c);var h=$m(!1).dom(),v=Gm(m,h);Xm(e,h,l||c),Wm(e,l,!1),d.setCursorLocation(v,1),f.isEmpty(c)&&f.remove(c)}}(s,c,l,f):(t=Yu.getPersistentBookmark(s.selection,!0),o(r.getRng()),r.moveToBookmark(t),m.inline&&Mm.match(s,c,l,r.getStart())&&wc.moveStart(u,r,r.getRng()),s.nodeChanged());else{e=r.getNode();for(var h=0,v=d.length;h<v&&(!d[h].ceFalseOverride||!gy(s,d[h],l,e,e));h++);}},vy=Xt.each,yy=function(e){return e&&1===e.nodeType&&!yc(e)&&!Ju(e)&&!jo.isBogus(e)},by=function(e,t){var n;for(n=e;n;n=n[t]){if(3===n.nodeType&&0!==n.nodeValue.length)return e;if(1===n.nodeType&&!yc(n))return n}return e},Cy=function(e,t,n){var r,o,i=new el(e);if(t&&n&&(t=by(t,"previousSibling"),n=by(n,"nextSibling"),i.compare(t,n))){for(r=t.nextSibling;r&&r!==n;)r=(o=r).nextSibling,t.appendChild(o);return e.remove(n),Xt.each(Xt.grep(n.childNodes),function(e){t.appendChild(e)}),t}return n},xy=function(e,t,n){vy(e.childNodes,function(e){yy(e)&&(t(e)&&n(e),e.hasChildNodes()&&xy(e,t,n))})},wy=function(n,e){return d(function(e,t){return!(!t||!wc.getStyle(n,t,e))},e)},Ny=function(r,e,t){return d(function(e,t,n){r.setStyle(n,e,t),""===n.getAttribute("style")&&n.removeAttribute("style"),Ey(r,n)},e,t)},Ey=function(e,t){"SPAN"===t.nodeName&&0===e.getAttribs(t).length&&e.remove(t,!0)},Sy=function(e,t){var n;1===t.nodeType&&t.parentNode&&1===t.parentNode.nodeType&&(n=wc.getTextDecoration(e,t.parentNode),e.getStyle(t,"color")&&n?e.setStyle(t,"text-decoration",n):e.getStyle(t,"text-decoration")===n&&e.setStyle(t,"text-decoration",null))},Ty=function(n,e,r,o){vy(e,function(t){vy(n.dom.select(t.inline,o),function(e){yy(e)&&py(n,t,r,e,t.exact?e:null)}),function(r,e,t){if(e.clear_child_styles){var n=e.links?"*:not(a)":"*";vy(r.select(n,t),function(n){yy(n)&&vy(e.styles,function(e,t){r.setStyle(n,t,"")})})}}(n.dom,t,o)})},ky=function(e,t,n,r){(t.styles.color||t.styles.textDecoration)&&(Xt.walk(r,d(Sy,e),"childNodes"),Sy(e,r))},_y=function(e,t,n,r){t.styles&&t.styles.backgroundColor&&xy(r,wy(e,"fontSize"),Ny(e,"backgroundColor",wc.replaceVars(t.styles.backgroundColor,n)))},Ay=function(e,t,n,r){"sub"!==t.inline&&"sup"!==t.inline||(xy(r,wy(e,"fontSize"),Ny(e,"fontSize","")),e.remove(e.select("sup"===t.inline?"sub":"sup",r),!0))},Ry=function(e,t,n,r){r&&!1!==t.merge_siblings&&(r=Cy(e,wc.getNonWhiteSpaceSibling(r),r),r=Cy(e,r,wc.getNonWhiteSpaceSibling(r,!0)))},Dy=function(t,n,r,o,i){Mm.matchNode(t,i.parentNode,r,o)&&py(t,n,o,i)||n.merge_with_parents&&t.dom.getParent(i.parentNode,function(e){if(Mm.matchNode(t,e,r,o))return py(t,n,o,i),!0})},Oy=Xt.each,By=function(g,p,h,r){var e,t,v=g.formatter.get(p),y=v[0],o=!r&&g.selection.isCollapsed(),i=g.dom,n=g.selection,b=function(n,e){if(e=e||y,n){if(e.onformat&&e.onformat(n,e,h,r),Oy(e.styles,function(e,t){i.setStyle(n,t,wc.replaceVars(e,h))}),e.styles){var t=i.getAttrib(n,"style");t&&n.setAttribute("data-mce-style",t)}Oy(e.attributes,function(e,t){i.setAttrib(n,t,wc.replaceVars(e,h))}),Oy(e.classes,function(e){e=wc.replaceVars(e,h),i.hasClass(n,e)||i.addClass(n,e)})}},C=function(e,t){var n=!1;return!!y.selector&&(Oy(e,function(e){if(!("collapsed"in e&&e.collapsed!==o))return i.is(t,e.selector)&&!Ju(t)?(b(t,e),!(n=!0)):void 0}),n)},a=function(s,e,t,c){var l,f,d=[],m=!0;l=y.inline||y.block,f=s.create(l),b(f),Lc(s,e,function(e){var a,u=function(e){var t,n,r,o;if(o=m,t=e.nodeName.toLowerCase(),n=e.parentNode.nodeName.toLowerCase(),1===e.nodeType&&s.getContentEditable(e)&&(o=m,m="true"===s.getContentEditable(e),r=!0),wc.isEq(t,"br"))return a=0,void(y.block&&s.remove(e));if(y.wrapper&&Mm.matchNode(g,e,p,h))a=0;else{if(m&&!r&&y.block&&!y.wrapper&&wc.isTextBlock(g,t)&&wc.isValid(g,n,l))return e=s.rename(e,l),b(e),d.push(e),void(a=0);if(y.selector){var i=C(v,e);if(!y.inline||i)return void(a=0)}!m||r||!wc.isValid(g,l,t)||!wc.isValid(g,n,l)||!c&&3===e.nodeType&&1===e.nodeValue.length&&65279===e.nodeValue.charCodeAt(0)||Ju(e)||y.inline&&s.isBlock(e)?(a=0,Oy(Xt.grep(e.childNodes),u),r&&(m=o),a=0):(a||(a=s.clone(f,!1),e.parentNode.insertBefore(a,e),d.push(a)),a.appendChild(e))}};Oy(e,u)}),!0===y.links&&Oy(d,function(e){var t=function(e){"A"===e.nodeName&&b(e,y),Oy(Xt.grep(e.childNodes),t)};t(e)}),Oy(d,function(e){var t,n,r,o,i,a=function(e){var n=!1;return Oy(e.childNodes,function(e){if((t=e)&&1===t.nodeType&&!yc(t)&&!Ju(t)&&!jo.isBogus(t))return n=e,!1;var t}),n};n=0,Oy(e.childNodes,function(e){wc.isWhiteSpaceNode(e)||yc(e)||n++}),t=n,!(1<d.length)&&s.isBlock(e)||0!==t?(y.inline||y.wrapper)&&(y.exact||1!==t||((o=a(r=e))&&!yc(o)&&Mm.matchName(s,o,y)&&(i=s.clone(o,!1),b(i),s.replace(i,r,!0),s.remove(o,1)),e=i||r),Ty(g,v,h,e),Dy(g,y,p,h,e),_y(s,y,h,e),Ay(s,y,h,e),Ry(s,y,h,e)):s.remove(e,1)})};if("false"!==i.getContentEditable(n.getNode())){if(y){if(r)r.nodeType?C(v,r)||((t=i.createRng()).setStartBefore(r),t.setEndAfter(r),a(i,Pc(g,t,v),0,!0)):a(i,r,0,!0);else if(o&&y.inline&&!i.select("td[data-mce-selected],th[data-mce-selected]").length)!function(e,t,n){var r,o,i,a,u,s,c=e.selection;a=(r=c.getRng(!0)).startOffset,s=r.startContainer.nodeValue,(o=Qu(e.getBody(),c.getStart()))&&(i=qm(o));var l,f,d=/[^\s\u00a0\u00ad\u200b\ufeff]/;s&&0<a&&a<s.length&&d.test(s.charAt(a))&&d.test(s.charAt(a-1))?(u=c.getBookmark(),r.collapse(!0),r=Pc(e,r,e.formatter.get(t)),r=Um(r),e.formatter.apply(t,n,r),c.moveToBookmark(u)):(o&&i.nodeValue===jm||(l=e.getDoc(),f=$m(!0).dom(),i=(o=l.importNode(f,!0)).firstChild,r.insertNode(o),a=1),e.formatter.apply(t,n,o),c.setCursorLocation(i,a))}(g,p,h);else{var u=g.selection.getNode();g.settings.forced_root_block||!v[0].defaultBlock||i.getParent(u,i.isBlock)||By(g,v[0].defaultBlock),g.selection.setRng(cl(g.selection.getRng())),e=Yu.getPersistentBookmark(g.selection,!0),a(i,Pc(g,n.getRng(),v)),y.styles&&ky(i,y,h,u),n.moveToBookmark(e),wc.moveStart(i,n,n.getRng()),g.nodeChanged()}iy(p,g)}}else{r=n.getNode();for(var s=0,c=v.length;s<c;s++)if(v[s].ceFalseOverride&&i.is(r,v[s].selector))return void b(r,v[s])}},Py={applyFormat:By},Iy=Xt.each,Ly=function(e,t,n,r,o){var i,a,u,s,c,l,f,d;null===t.get()&&(a=e,u={},(i=t).set({}),a.on("NodeChange",function(n){var r=wc.getParents(a.dom,n.element),o={};r=Xt.grep(r,function(e){return 1===e.nodeType&&!e.getAttribute("data-mce-bogus")}),Iy(i.get(),function(e,n){Iy(r,function(t){return a.formatter.matchNode(t,n,{},e.similar)?(u[n]||(Iy(e,function(e){e(!0,{node:t,format:n,parents:r})}),u[n]=e),o[n]=e,!1):!Mm.matchesUnInheritedFormatSelector(a,t,n)&&void 0})}),Iy(u,function(e,t){o[t]||(delete u[t],Iy(e,function(e){e(!1,{node:n.element,format:t,parents:r})}))})})),c=n,l=r,f=o,d=(s=t).get(),Iy(c.split(","),function(e){d[e]||(d[e]=[],d[e].similar=f),d[e].push(l)}),s.set(d)},Fy={get:function(r){var t={valigntop:[{selector:"td,th",styles:{verticalAlign:"top"}}],valignmiddle:[{selector:"td,th",styles:{verticalAlign:"middle"}}],valignbottom:[{selector:"td,th",styles:{verticalAlign:"bottom"}}],alignleft:[{selector:"figure.image",collapsed:!1,classes:"align-left",ceFalseOverride:!0,preview:"font-family font-size"},{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"left"},inherit:!1,preview:!1,defaultBlock:"div"},{selector:"img,table",collapsed:!1,styles:{"float":"left"},preview:"font-family font-size"}],aligncenter:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"center"},inherit:!1,preview:"font-family font-size",defaultBlock:"div"},{selector:"figure.image",collapsed:!1,classes:"align-center",ceFalseOverride:!0,preview:"font-family font-size"},{selector:"img",collapsed:!1,styles:{display:"block",marginLeft:"auto",marginRight:"auto"},preview:!1},{selector:"table",collapsed:!1,styles:{marginLeft:"auto",marginRight:"auto"},preview:"font-family font-size"}],alignright:[{selector:"figure.image",collapsed:!1,classes:"align-right",ceFalseOverride:!0,preview:"font-family font-size"},{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"right"},inherit:!1,preview:"font-family font-size",defaultBlock:"div"},{selector:"img,table",collapsed:!1,styles:{"float":"right"},preview:"font-family font-size"}],alignjustify:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"justify"},inherit:!1,defaultBlock:"div",preview:"font-family font-size"}],bold:[{inline:"strong",remove:"all"},{inline:"span",styles:{fontWeight:"bold"}},{inline:"b",remove:"all"}],italic:[{inline:"em",remove:"all"},{inline:"span",styles:{fontStyle:"italic"}},{inline:"i",remove:"all"}],underline:[{inline:"span",styles:{textDecoration:"underline"},exact:!0},{inline:"u",remove:"all"}],strikethrough:[{inline:"span",styles:{textDecoration:"line-through"},exact:!0},{inline:"strike",remove:"all"}],forecolor:{inline:"span",styles:{color:"%value"},links:!0,remove_similar:!0,clear_child_styles:!0},hilitecolor:{inline:"span",styles:{backgroundColor:"%value"},links:!0,remove_similar:!0,clear_child_styles:!0},fontname:{inline:"span",toggle:!1,styles:{fontFamily:"%value"},clear_child_styles:!0},fontsize:{inline:"span",toggle:!1,styles:{fontSize:"%value"},clear_child_styles:!0},fontsize_class:{inline:"span",attributes:{"class":"%value"}},blockquote:{block:"blockquote",wrapper:1,remove:"all"},subscript:{inline:"sub"},superscript:{inline:"sup"},code:{inline:"code"},link:{inline:"a",selector:"a",remove:"all",split:!0,deep:!0,onmatch:function(){return!0},onformat:function(n,e,t){Xt.each(t,function(e,t){r.setAttrib(n,t,e)})}},removeformat:[{selector:"b,strong,em,i,font,u,strike,sub,sup,dfn,code,samp,kbd,var,cite,mark,q,del,ins",remove:"all",split:!0,expand:!1,block_expand:!0,deep:!0},{selector:"span",attributes:["style","class"],remove:"empty",split:!0,expand:!1,deep:!0},{selector:"*",attributes:["style","class"],split:!1,expand:!1,deep:!0}]};return Xt.each("p h1 h2 h3 h4 h5 h6 div address pre div dt dd samp".split(/\s/),function(e){t[e]={block:e,remove:"all"}}),t}},My=Xt.each,zy=Si.DOM,Uy=function(e,t){var n,o,r,m=t&&t.schema||di({}),g=function(e){var t,n,r;return o="string"==typeof e?{name:e,classes:[],attrs:{}}:e,t=zy.create(o.name),n=t,(r=o).classes.length&&zy.addClass(n,r.classes.join(" ")),zy.setAttribs(n,r.attrs),t},p=function(n,e,t){var r,o,i,a,u,s,c,l,f=0<e.length&&e[0],d=f&&f.name;if(u=d,s="string"!=typeof(a=n)?a.nodeName.toLowerCase():a,c=m.getElementRule(s),i=!(!(l=c&&c.parentsRequired)||!l.length)&&(u&&-1!==Xt.inArray(l,u)?u:l[0]))d===i?(o=e[0],e=e.slice(1)):o=i;else if(f)o=e[0],e=e.slice(1);else if(!t)return n;return o&&(r=g(o)).appendChild(n),t&&(r||(r=zy.create("div")).appendChild(n),Xt.each(t,function(e){var t=g(e);r.insertBefore(t,n)})),p(r,e,o&&o.siblings)};return e&&e.length?(o=e[0],n=g(o),(r=zy.create("div")).appendChild(p(n,e.slice(1),o.siblings)),r):""},jy=function(e){var t,a={classes:[],attrs:{}};return"*"!==(e=a.selector=Xt.trim(e))&&(t=e.replace(/(?:([#\.]|::?)([\w\-]+)|(\[)([^\]]+)\]?)/g,function(e,t,n,r,o){switch(t){case"#":a.attrs.id=n;break;case".":a.classes.push(n);break;case":":-1!==Xt.inArray("checked disabled enabled read-only required".split(" "),n)&&(a.attrs[n]=n)}if("["===r){var i=o.match(/([\w\-]+)(?:\=\"([^\"]+))?/);i&&(a.attrs[i[1]]=i[2])}return""})),a.name=t||"div",a},Vy=function(e){return e&&"string"==typeof e?(e=(e=e.split(/\s*,\s*/)[0]).replace(/\s*(~\+|~|\+|>)\s*/g,"$1"),Xt.map(e.split(/(?:>|\s+(?![^\[\]]+\]))/),function(e){var t=Xt.map(e.split(/(?:~\+|~|\+)/),jy),n=t.pop();return t.length&&(n.siblings=t),n}).reverse()):[]},Hy=function(n,e){var t,r,o,i,a,u,s="";if(!1===(u=n.settings.preview_styles))return"";"string"!=typeof u&&(u="font-family font-size font-weight font-style text-decoration text-transform color background-color border border-radius outline text-shadow");var c=function(e){return e.replace(/%(\w+)/g,"")};if("string"==typeof e){if(!(e=n.formatter.get(e)))return;e=e[0]}return"preview"in e&&!1===(u=e.preview)?"":(t=e.block||e.inline||"span",(i=Vy(e.selector)).length?(i[0].name||(i[0].name=t),t=e.selector,r=Uy(i,n)):r=Uy([t],n),o=zy.select(t,r)[0]||r.firstChild,My(e.styles,function(e,t){(e=c(e))&&zy.setStyle(o,t,e)}),My(e.attributes,function(e,t){(e=c(e))&&zy.setAttrib(o,t,e)}),My(e.classes,function(e){e=c(e),zy.hasClass(o,e)||zy.addClass(o,e)}),n.fire("PreviewFormats"),zy.setStyles(r,{position:"absolute",left:-65535}),n.getBody().appendChild(r),a=zy.getStyle(n.getBody(),"fontSize",!0),a=/px$/.test(a)?parseInt(a,10):0,My(u.split(" "),function(e){var t=zy.getStyle(o,e,!0);if(!("background-color"===e&&/transparent|rgba\s*\([^)]+,\s*0\)/.test(t)&&(t=zy.getStyle(n.getBody(),e,!0),"#ffffff"===zy.toHex(t).toLowerCase())||"color"===e&&"#000000"===zy.toHex(t).toLowerCase())){if("font-size"===e&&/em|%$/.test(t)){if(0===a)return;t=parseFloat(t)/(/%$/.test(t)?100:1)*a+"px"}"border"===e&&t&&(s+="padding:0 2px;"),s+=e+":"+t+";"}}),n.fire("AfterPreviewFormats"),zy.remove(r),s)},qy=function(e,t,n,r,o){var i=t.get(n);!Mm.match(e,n,r,o)||"toggle"in i[0]&&!i[0].toggle?Py.applyFormat(e,n,r,o):hy(e,n,r,o)},$y=function(e){e.addShortcut("meta+b","","Bold"),e.addShortcut("meta+i","","Italic"),e.addShortcut("meta+u","","Underline");for(var t=1;t<=6;t++)e.addShortcut("access+"+t,"",["FormatBlock",!1,"h"+t]);e.addShortcut("access+7","",["FormatBlock",!1,"p"]),e.addShortcut("access+8","",["FormatBlock",!1,"div"]),e.addShortcut("access+9","",["FormatBlock",!1,"address"])};function Wy(e){var t,n,r,o=(t=e,n={},(r=function(e,t){e&&("string"!=typeof e?Xt.each(e,function(e,t){r(t,e)}):(t=t.length?t:[t],Xt.each(t,function(e){"undefined"==typeof e.deep&&(e.deep=!e.selector),"undefined"==typeof e.split&&(e.split=!e.selector||e.inline),"undefined"==typeof e.remove&&e.selector&&!e.inline&&(e.remove="none"),e.selector&&e.inline&&(e.mixed=!0,e.block_expand=!0),"string"==typeof e.classes&&(e.classes=e.classes.split(/\s+/))}),n[e]=t))})(Fy.get(t.dom)),r(t.settings.formats),{get:function(e){return e?n[e]:n},register:r,unregister:function(e){return e&&n[e]&&delete n[e],n}}),i=Hi(null);return $y(e),Jm(e),{get:o.get,register:o.register,unregister:o.unregister,apply:d(Py.applyFormat,e),remove:d(hy,e),toggle:d(qy,e,o),match:d(Mm.match,e),matchAll:d(Mm.matchAll,e),matchNode:d(Mm.matchNode,e),canApply:d(Mm.canApply,e),formatChanged:d(Ly,e,i),getCssText:d(Hy,e)}}var Ky,Xy=Object.prototype.hasOwnProperty,Yy=(Ky=function(e,t){return t},function(){for(var e=new Array(arguments.length),t=0;t<e.length;t++)e[t]=arguments[t];if(0===e.length)throw new Error("Can't merge zero objects");for(var n={},r=0;r<e.length;r++){var o=e[r];for(var i in o)Xy.call(o,i)&&(n[i]=Ky(n[i],o[i]))}return n}),Gy={register:function(t,s,c){t.addAttributeFilter("data-mce-tabindex",function(e,t){for(var n,r=e.length;r--;)(n=e[r]).attr("tabindex",n.attributes.map["data-mce-tabindex"]),n.attr(t,null)}),t.addAttributeFilter("src,href,style",function(e,t){for(var n,r,o=e.length,i="data-mce-"+t,a=s.url_converter,u=s.url_converter_scope;o--;)(r=(n=e[o]).attributes.map[i])!==undefined?(n.attr(t,0<r.length?r:null),n.attr(i,null)):(r=n.attributes.map[t],"style"===t?r=c.serializeStyle(c.parseStyle(r),n.name):a&&(r=a.call(u,r,t,n.name)),n.attr(t,0<r.length?r:null))}),t.addAttributeFilter("class",function(e){for(var t,n,r=e.length;r--;)(n=(t=e[r]).attr("class"))&&(n=t.attr("class").replace(/(?:^|\s)mce-item-\w+(?!\S)/g,""),t.attr("class",0<n.length?n:null))}),t.addAttributeFilter("data-mce-type",function(e,t,n){for(var r,o=e.length;o--;)"bookmark"!==(r=e[o]).attributes.map["data-mce-type"]||n.cleanup||(_.from(r.firstChild).exists(function(e){return!Ca(e.value)})?r.unwrap():r.remove())}),t.addNodeFilter("noscript",function(e){for(var t,n=e.length;n--;)(t=e[n].firstChild)&&(t.value=ti.decode(t.value))}),t.addNodeFilter("script,style",function(e,t){for(var n,r,o,i=e.length,a=function(e){return e.replace(/(<!--\[CDATA\[|\]\]-->)/g,"\n").replace(/^[\r\n]*|[\r\n]*$/g,"").replace(/^\s*((<!--)?(\s*\/\/)?\s*<!\[CDATA\[|(<!--\s*)?\/\*\s*<!\[CDATA\[\s*\*\/|(\/\/)?\s*<!--|\/\*\s*<!--\s*\*\/)\s*[\r\n]*/gi,"").replace(/\s*(\/\*\s*\]\]>\s*\*\/(-->)?|\s*\/\/\s*\]\]>(-->)?|\/\/\s*(-->)?|\]\]>|\/\*\s*-->\s*\*\/|\s*-->\s*)\s*$/g,"")};i--;)r=(n=e[i]).firstChild?n.firstChild.value:"","script"===t?((o=n.attr("type"))&&n.attr("type","mce-no/type"===o?null:o.replace(/^mce\-/,"")),"xhtml"===s.element_format&&0<r.length&&(n.firstChild.value="// <![CDATA[\n"+a(r)+"\n// ]]>")):"xhtml"===s.element_format&&0<r.length&&(n.firstChild.value="\x3c!--\n"+a(r)+"\n--\x3e")}),t.addNodeFilter("#comment",function(e){for(var t,n=e.length;n--;)0===(t=e[n]).value.indexOf("[CDATA[")?(t.name="#cdata",t.type=4,t.value=t.value.replace(/^\[CDATA\[|\]\]$/g,"")):0===t.value.indexOf("mce:protected ")&&(t.name="#text",t.type=3,t.raw=!0,t.value=unescape(t.value).substr(14))}),t.addNodeFilter("xml:namespace,input",function(e,t){for(var n,r=e.length;r--;)7===(n=e[r]).type?n.remove():1===n.type&&("input"!==t||"type"in n.attributes.map||n.attr("type","text"))}),t.addAttributeFilter("data-mce-type",function(e){z(e,function(e){"format-caret"===e.attr("data-mce-type")&&(e.isEmpty(t.schema.getNonEmptyElements())?e.remove():e.unwrap())})}),t.addAttributeFilter("data-mce-src,data-mce-href,data-mce-style,data-mce-selected,data-mce-expando,data-mce-type,data-mce-resize",function(e,t){for(var n=e.length;n--;)e[n].attr(t,null)})},trimTrailingBr:function(e){var t,n,r=function(e){return e&&"br"===e.name};r(t=e.lastChild)&&r(n=t.prev)&&(t.remove(),n.remove())}},Jy={process:function(e,t,n){return f=n,(l=e)&&l.hasEventListeners("PreProcess")&&!f.no_events?(o=t,i=n,c=(r=e).dom,o=o.cloneNode(!0),(a=V.document.implementation).createHTMLDocument&&(u=a.createHTMLDocument(""),Xt.each("BODY"===o.nodeName?o.childNodes:[o],function(e){u.body.appendChild(u.importNode(e,!0))}),o="BODY"!==o.nodeName?u.body.firstChild:u.body,s=c.doc,c.doc=u),vp(r,Yy(i,{node:o})),s&&(c.doc=s),o):t;var r,o,i,a,u,s,c,l,f}},Qy=function(e,a,u){e.addNodeFilter("font",function(e){z(e,function(e){var t,n=a.parse(e.attr("style")),r=e.attr("color"),o=e.attr("face"),i=e.attr("size");r&&(n.color=r),o&&(n["font-family"]=o),i&&(n["font-size"]=u[parseInt(e.attr("size"),10)-1]),e.name="span",e.attr("style",a.serialize(n)),t=e,z(["color","face","size"],function(e){t.attr(e,null)})})})},Zy=function(e,t){var n,r=gi();t.convert_fonts_to_spans&&Qy(e,r,Xt.explode(t.font_size_legacy_values)),n=r,e.addNodeFilter("strike",function(e){z(e,function(e){var t=n.parse(e.attr("style"));t["text-decoration"]="line-through",e.name="span",e.attr("style",n.serialize(t))})})},eb={register:function(e,t){t.inline_styles&&Zy(e,t)}},tb=/^[ \t\r\n]*$/,nb={"#text":3,"#comment":8,"#cdata":4,"#pi":7,"#doctype":10,"#document-fragment":11},rb=function(e,t,n){var r,o,i=n?"lastChild":"firstChild",a=n?"prev":"next";if(e[i])return e[i];if(e!==t){if(r=e[a])return r;for(o=e.parent;o&&o!==t;o=o.parent)if(r=o[a])return r}},ob=function(){function a(e,t){this.name=e,1===(this.type=t)&&(this.attributes=[],this.attributes.map={})}return a.create=function(e,t){var n,r;if(n=new a(e,nb[e]||1),t)for(r in t)n.attr(r,t[r]);return n},a.prototype.replace=function(e){return e.parent&&e.remove(),this.insert(e,this),this.remove(),this},a.prototype.attr=function(e,t){var n,r;if("string"!=typeof e){for(r in e)this.attr(r,e[r]);return this}if(n=this.attributes){if(t!==undefined){if(null===t){if(e in n.map)for(delete n.map[e],r=n.length;r--;)if(n[r].name===e)return n=n.splice(r,1),this;return this}if(e in n.map){for(r=n.length;r--;)if(n[r].name===e){n[r].value=t;break}}else n.push({name:e,value:t});return n.map[e]=t,this}return n.map[e]}},a.prototype.clone=function(){var e,t,n,r,o,i=new a(this.name,this.type);if(n=this.attributes){for((o=[]).map={},e=0,t=n.length;e<t;e++)"id"!==(r=n[e]).name&&(o[o.length]={name:r.name,value:r.value},o.map[r.name]=r.value);i.attributes=o}return i.value=this.value,i.shortEnded=this.shortEnded,i},a.prototype.wrap=function(e){return this.parent.insert(e,this),e.append(this),this},a.prototype.unwrap=function(){var e,t;for(e=this.firstChild;e;)t=e.next,this.insert(e,this,!0),e=t;this.remove()},a.prototype.remove=function(){var e=this.parent,t=this.next,n=this.prev;return e&&(e.firstChild===this?(e.firstChild=t)&&(t.prev=null):n.next=t,e.lastChild===this?(e.lastChild=n)&&(n.next=null):t.prev=n,this.parent=this.next=this.prev=null),this},a.prototype.append=function(e){var t;return e.parent&&e.remove(),(t=this.lastChild)?((t.next=e).prev=t,this.lastChild=e):this.lastChild=this.firstChild=e,e.parent=this,e},a.prototype.insert=function(e,t,n){var r;return e.parent&&e.remove(),r=t.parent||this,n?(t===r.firstChild?r.firstChild=e:t.prev.next=e,e.prev=t.prev,(e.next=t).prev=e):(t===r.lastChild?r.lastChild=e:t.next.prev=e,e.next=t.next,(e.prev=t).next=e),e.parent=r,e},a.prototype.getAll=function(e){var t,n=[];for(t=this.firstChild;t;t=rb(t,this))t.name===e&&n.push(t);return n},a.prototype.empty=function(){var e,t,n;if(this.firstChild){for(e=[],n=this.firstChild;n;n=rb(n,this))e.push(n);for(t=e.length;t--;)(n=e[t]).parent=n.firstChild=n.lastChild=n.next=n.prev=null}return this.firstChild=this.lastChild=null,this},a.prototype.isEmpty=function(e,t,n){var r,o,i=this.firstChild;if(t=t||{},i)do{if(1===i.type){if(i.attributes.map["data-mce-bogus"])continue;if(e[i.name])return!1;for(r=i.attributes.length;r--;)if("name"===(o=i.attributes[r].name)||0===o.indexOf("data-mce-bookmark"))return!1}if(8===i.type)return!1;if(3===i.type&&!tb.test(i.value))return!1;if(3===i.type&&i.parent&&t[i.parent.name]&&tb.test(i.value))return!1;if(n&&n(i))return!1}while(i=rb(i,this));return!0},a.prototype.walk=function(e){return rb(this,null,e)},a}(),ib=function(e,t,n,r){(e.padd_empty_with_br||t.insert)&&n[r.name]?r.empty().append(new ob("br",1)).shortEnded=!0:r.empty().append(new ob("#text",3)).value="\xa0"},ab=function(e){return ub(e,"#text")&&"\xa0"===e.firstChild.value},ub=function(e,t){return e&&e.firstChild&&e.firstChild===e.lastChild&&e.firstChild.name===t},sb=function(r,e,t,n){return n.isEmpty(e,t,function(e){return t=e,(n=r.getElementRule(t.name))&&n.paddEmpty;var t,n})},cb=function(e,t){return e&&(t[e.name]||"br"===e.name)},lb=function(e,p){var h=e.schema;p.remove_trailing_brs&&e.addNodeFilter("br",function(e,t,n){var r,o,i,a,u,s,c,l,f=e.length,d=Xt.extend({},h.getBlockElements()),m=h.getNonEmptyElements(),g=h.getNonEmptyElements();for(d.body=1,r=0;r<f;r++)if(i=(o=e[r]).parent,d[o.parent.name]&&o===i.lastChild){for(u=o.prev;u;){if("span"!==(s=u.name)||"bookmark"!==u.attr("data-mce-type")){if("br"!==s)break;if("br"===s){o=null;break}}u=u.prev}o&&(o.remove(),sb(h,m,g,i)&&(c=h.getElementRule(i.name))&&(c.removeEmpty?i.remove():c.paddEmpty&&ib(p,n,d,i)))}else{for(a=o;i&&i.firstChild===a&&i.lastChild===a&&!d[(a=i).name];)i=i.parent;a===i&&!0!==p.padd_empty_with_br&&((l=new ob("#text",3)).value="\xa0",o.replace(l))}}),e.addAttributeFilter("href",function(e){var t,n,r,o=e.length;if(!p.allow_unsafe_link_target)for(;o--;)"a"===(t=e[o]).name&&"_blank"===t.attr("target")&&t.attr("rel",(n=t.attr("rel"),r=n?Xt.trim(n):"",/\b(noopener)\b/g.test(r)?r:r.split(" ").filter(function(e){return 0<e.length}).concat(["noopener"]).sort().join(" ")))}),p.allow_html_in_named_anchor||e.addAttributeFilter("id,name",function(e){for(var t,n,r,o,i=e.length;i--;)if("a"===(o=e[i]).name&&o.firstChild&&!o.attr("href"))for(r=o.parent,t=o.lastChild;n=t.prev,r.insert(t,o),t=n;);}),p.fix_list_elements&&e.addNodeFilter("ul,ol",function(e){for(var t,n,r=e.length;r--;)if("ul"===(n=(t=e[r]).parent).name||"ol"===n.name)if(t.prev&&"li"===t.prev.name)t.prev.append(t);else{var o=new ob("li",1);o.attr("style","list-style-type: none"),t.wrap(o)}}),p.validate&&h.getValidClasses()&&e.addAttributeFilter("class",function(e){for(var t,n,r,o,i,a,u,s=e.length,c=h.getValidClasses();s--;){for(n=(t=e[s]).attr("class").split(" "),i="",r=0;r<n.length;r++)o=n[r],u=!1,(a=c["*"])&&a[o]&&(u=!0),a=c[t.name],!u&&a&&a[o]&&(u=!0),u&&(i&&(i+=" "),i+=o);i.length||(i=null),t.attr("class",i)}})},fb=Xt.makeMap,db=Xt.each,mb=Xt.explode,gb=Xt.extend;function pb(T,k){void 0===k&&(k=di());var _={},A=[],R={},D={};(T=T||{}).validate=!("validate"in T)||T.validate,T.root_name=T.root_name||"body";var O=function(e){var t,n,r;(n=e.name)in _&&((r=R[n])?r.push(e):R[n]=[e]),t=A.length;for(;t--;)(n=A[t].name)in e.attributes.map&&((r=D[n])?r.push(e):D[n]=[e]);return e},e={schema:k,addAttributeFilter:function(e,n){db(mb(e),function(e){var t;for(t=0;t<A.length;t++)if(A[t].name===e)return void A[t].callbacks.push(n);A.push({name:e,callbacks:[n]})})},getAttributeFilters:function(){return[].concat(A)},addNodeFilter:function(e,n){db(mb(e),function(e){var t=_[e];t||(_[e]=t=[]),t.push(n)})},getNodeFilters:function(){var e=[];for(var t in _)_.hasOwnProperty(t)&&e.push({name:t,callbacks:_[t]});return e},filterNode:O,parse:function(e,a){var t,n,r,o,i,u,s,c,l,f,d,m=[];a=a||{},R={},D={},l=gb(fb("script,style,head,html,body,title,meta,param"),k.getBlockElements());var g=k.getNonEmptyElements(),p=k.children,h=T.validate,v="forced_root_block"in a?a.forced_root_block:T.forced_root_block,y=k.getWhiteSpaceElements(),b=/^[ \t\r\n]+/,C=/[ \t\r\n]+$/,x=/[ \t\r\n]+/g,w=/^[ \t\r\n]+$/;f=y.hasOwnProperty(a.context)||y.hasOwnProperty(T.root_name);var N=function(e,t){var n,r=new ob(e,t);return e in _&&((n=R[e])?n.push(r):R[e]=[r]),r},E=function(e){var t,n,r,o,i=k.getBlockElements();for(t=e.prev;t&&3===t.type;){if(0<(r=t.value.replace(C,"")).length)return void(t.value=r);if(n=t.next){if(3===n.type&&n.value.length){t=t.prev;continue}if(!i[n.name]&&"script"!==n.name&&"style"!==n.name){t=t.prev;continue}}o=t.prev,t.remove(),t=o}};t=Pv({validate:h,allow_script_urls:T.allow_script_urls,allow_conditional_comments:T.allow_conditional_comments,self_closing_elements:function(e){var t,n={};for(t in e)"li"!==t&&"p"!==t&&(n[t]=e[t]);return n}(k.getSelfClosingElements()),cdata:function(e){d.append(N("#cdata",4)).value=e},text:function(e,t){var n;f||(e=e.replace(x," "),cb(d.lastChild,l)&&(e=e.replace(b,""))),0!==e.length&&((n=N("#text",3)).raw=!!t,d.append(n).value=e)},comment:function(e){d.append(N("#comment",8)).value=e},pi:function(e,t){d.append(N(e,7)).value=t,E(d)},doctype:function(e){d.append(N("#doctype",10)).value=e,E(d)},start:function(e,t,n){var r,o,i,a,u;if(i=h?k.getElementRule(e):{}){for((r=N(i.outputName||e,1)).attributes=t,r.shortEnded=n,d.append(r),(u=p[d.name])&&p[r.name]&&!u[r.name]&&m.push(r),o=A.length;o--;)(a=A[o].name)in t.map&&((s=D[a])?s.push(r):D[a]=[r]);l[e]&&E(r),n||(d=r),!f&&y[e]&&(f=!0)}},end:function(e){var t,n,r,o,i;if(n=h?k.getElementRule(e):{}){if(l[e]&&!f){if((t=d.firstChild)&&3===t.type)if(0<(r=t.value.replace(b,"")).length)t.value=r,t=t.next;else for(o=t.next,t.remove(),t=o;t&&3===t.type;)r=t.value,o=t.next,(0===r.length||w.test(r))&&(t.remove(),t=o),t=o;if((t=d.lastChild)&&3===t.type)if(0<(r=t.value.replace(C,"")).length)t.value=r,t=t.prev;else for(o=t.prev,t.remove(),t=o;t&&3===t.type;)r=t.value,o=t.prev,(0===r.length||w.test(r))&&(t.remove(),t=o),t=o}if(f&&y[e]&&(f=!1),n.removeEmpty&&sb(k,g,y,d)&&!d.attributes.map.name&&!d.attr("id"))return i=d.parent,l[d.name]?d.empty().remove():d.unwrap(),void(d=i);n.paddEmpty&&(ab(d)||sb(k,g,y,d))&&ib(T,a,l,d),d=d.parent}}},k);var S=d=new ob(a.context||T.root_name,11);if(t.parse(e),h&&m.length&&(a.context?a.invalid=!0:function(e){var t,n,r,o,i,a,u,s,c,l,f,d,m,g,p,h;for(d=fb("tr,td,th,tbody,thead,tfoot,table"),l=k.getNonEmptyElements(),f=k.getWhiteSpaceElements(),m=k.getTextBlockElements(),g=k.getSpecialElements(),t=0;t<e.length;t++)if((n=e[t]).parent&&!n.fixed)if(m[n.name]&&"li"===n.parent.name){for(p=n.next;p&&m[p.name];)p.name="li",p.fixed=!0,n.parent.insert(p,n.parent),p=p.next;n.unwrap(n)}else{for(o=[n],r=n.parent;r&&!k.isValidChild(r.name,n.name)&&!d[r.name];r=r.parent)o.push(r);if(r&&1<o.length){for(o.reverse(),i=a=O(o[0].clone()),c=0;c<o.length-1;c++){for(k.isValidChild(a.name,o[c].name)?(u=O(o[c].clone()),a.append(u)):u=a,s=o[c].firstChild;s&&s!==o[c+1];)h=s.next,u.append(s),s=h;a=u}sb(k,l,f,i)?r.insert(n,o[0],!0):(r.insert(i,o[0],!0),r.insert(n,i)),r=o[0],(sb(k,l,f,r)||ub(r,"br"))&&r.empty().remove()}else if(n.parent){if("li"===n.name){if((p=n.prev)&&("ul"===p.name||"ul"===p.name)){p.append(n);continue}if((p=n.next)&&("ul"===p.name||"ul"===p.name)){p.insert(n,p.firstChild,!0);continue}n.wrap(O(new ob("ul",1)));continue}k.isValidChild(n.parent.name,"div")&&k.isValidChild("div",n.name)?n.wrap(O(new ob("div",1))):g[n.name]?n.empty().remove():n.unwrap()}}}(m)),v&&("body"===S.name||a.isRootContent)&&function(){var e,t,n=S.firstChild,r=function(e){e&&((n=e.firstChild)&&3===n.type&&(n.value=n.value.replace(b,"")),(n=e.lastChild)&&3===n.type&&(n.value=n.value.replace(C,"")))};if(k.isValidChild(S.name,v.toLowerCase())){for(;n;)e=n.next,3===n.type||1===n.type&&"p"!==n.name&&!l[n.name]&&!n.attr("data-mce-type")?(t||((t=N(v,1)).attr(T.forced_root_block_attrs),S.insert(t,n)),t.append(n)):(r(t),t=null),n=e;r(t)}}(),!a.invalid){for(c in R){for(s=_[c],i=(n=R[c]).length;i--;)n[i].parent||n.splice(i,1);for(r=0,o=s.length;r<o;r++)s[r](n,c,a)}for(r=0,o=A.length;r<o;r++)if((s=A[r]).name in D){for(i=(n=D[s.name]).length;i--;)n[i].parent||n.splice(i,1);for(i=0,u=s.callbacks.length;i<u;i++)s.callbacks[i](n,s.name,a)}}return S}};return lb(e,T),eb.register(e,T),e}var hb=function(e,t,n){-1===Xt.inArray(t,n)&&(e.addAttributeFilter(n,function(e,t){for(var n=e.length;n--;)e[n].attr(t,null)}),t.push(n))},vb=function(e,t,n){var r=wa(n.getInner?t.innerHTML:e.getOuterHTML(t));return n.selection||Ao(ar.fromDom(t))?r:Xt.trim(r)},yb=function(e,t,n){var r=n.selection?Yy({forced_root_block:!1},n):n,o=e.parse(t,r);return Gy.trimTrailingBr(o),o},bb=function(e,t,n,r,o){var i,a,u,s,c=(i=r,al(t,n).serialize(i));return a=e,s=c,!(u=o).no_events&&a?yp(a,Yy(u,{content:s})).content:s};function Cb(e,t){var a,u,s,c,l,n,r=(a=e,n=["data-mce-selected"],s=(u=t)&&u.dom?u.dom:Si.DOM,c=u&&u.schema?u.schema:di(a),a.entity_encoding=a.entity_encoding||"named",a.remove_trailing_brs=!("remove_trailing_brs"in a)||a.remove_trailing_brs,l=pb(a,c),Gy.register(l,a,s),{schema:c,addNodeFilter:l.addNodeFilter,addAttributeFilter:l.addAttributeFilter,serialize:function(e,t){var n=Yy({format:"html"},t||{}),r=Jy.process(u,e,n),o=vb(s,r,n),i=yb(l,o,n);return"tree"===n.format?i:bb(u,a,c,i,n)},addRules:function(e){c.addValidElements(e)},setRules:function(e){c.setValidElements(e)},addTempAttr:d(hb,l,n),getTempAttrs:function(){return n}});return{schema:r.schema,addNodeFilter:r.addNodeFilter,addAttributeFilter:r.addAttributeFilter,serialize:r.serialize,addRules:r.addRules,setRules:r.setRules,addTempAttr:r.addTempAttr,getTempAttrs:r.getTempAttrs}}function xb(e){return{getBookmark:d(hc,e),moveToBookmark:d(vc,e)}}(xb||(xb={})).isBookmarkNode=yc;var wb,Nb,Eb=xb,Sb=jo.isContentEditableFalse,Tb=jo.isContentEditableTrue,kb=function(r,a){var u,s,c,l,f,d,m,g,p,h,v,y,i,b,C,x,w,N=a.dom,E=Xt.each,S=a.getDoc(),T=V.document,k=Math.abs,_=Math.round,A=a.getBody();l={nw:[0,0,-1,-1],ne:[1,0,1,-1],se:[1,1,1,1],sw:[0,1,-1,1]};var e=".mce-content-body";a.contentStyles.push(e+" div.mce-resizehandle {position: absolute;border: 1px solid black;box-sizing: content-box;background: #FFF;width: 7px;height: 7px;z-index: 10000}"+e+" .mce-resizehandle:hover {background: #000}"+e+" img[data-mce-selected],"+e+" hr[data-mce-selected] {outline: 1px solid black;resize: none}"+e+" .mce-clonedresizable {position: absolute;"+(fe.gecko?"":"outline: 1px dashed black;")+"opacity: .5;filter: alpha(opacity=50);z-index: 10000}"+e+" .mce-resize-helper {background: #555;background: rgba(0,0,0,0.75);border-radius: 3px;border: 1px;color: white;display: none;font-family: sans-serif;font-size: 12px;white-space: nowrap;line-height: 14px;margin: 5px 10px;padding: 5px;position: absolute;z-index: 10001}");var R=function(e){return e&&("IMG"===e.nodeName||a.dom.is(e,"figure.image"))},n=function(e){var t,n,r=e.target;t=e,n=a.selection.getRng(),!R(t.target)||gv(t.clientX,t.clientY,n)||e.isDefaultPrevented()||a.selection.select(r)},D=function(e){return a.dom.is(e,"figure.image")?e.querySelector("img"):e},O=function(e){var t=a.settings.object_resizing;return!1!==t&&!fe.iOS&&("string"!=typeof t&&(t="table,img,figure.image,div"),"false"!==e.getAttribute("data-mce-resize")&&e!==a.getBody()&&Lr(ar.fromDom(e),t))},B=function(e){var t,n,r,o;t=e.screenX-d,n=e.screenY-m,b=t*f[2]+h,C=n*f[3]+v,b=b<5?5:b,C=C<5?5:C,(R(u)&&!1!==a.settings.resize_img_proportional?!Zh.modifierPressed(e):Zh.modifierPressed(e)||R(u)&&f[2]*f[3]!=0)&&(k(t)>k(n)?(C=_(b*y),b=_(C/y)):(b=_(C/y),C=_(b*y))),N.setStyles(D(s),{width:b,height:C}),r=0<(r=f.startPos.x+t)?r:0,o=0<(o=f.startPos.y+n)?o:0,N.setStyles(c,{left:r,top:o,display:"block"}),c.innerHTML=b+" &times; "+C,f[2]<0&&s.clientWidth<=b&&N.setStyle(s,"left",g+(h-b)),f[3]<0&&s.clientHeight<=C&&N.setStyle(s,"top",p+(v-C)),(t=A.scrollWidth-x)+(n=A.scrollHeight-w)!=0&&N.setStyles(c,{left:r-t,top:o-n}),i||(wp(a,u,h,v),i=!0)},P=function(){i=!1;var e=function(e,t){t&&(u.style[e]||!a.schema.isValid(u.nodeName.toLowerCase(),e)?N.setStyle(D(u),e,t):N.setAttrib(D(u),e,t))};e("width",b),e("height",C),N.unbind(S,"mousemove",B),N.unbind(S,"mouseup",P),T!==S&&(N.unbind(T,"mousemove",B),N.unbind(T,"mouseup",P)),N.remove(s),N.remove(c),o(u),Np(a,u,b,C),N.setAttrib(u,"style",N.getAttrib(u,"style")),a.nodeChanged()},o=function(e){var t,r,o,n,i;I(),M(),t=N.getPos(e,A),g=t.x,p=t.y,i=e.getBoundingClientRect(),r=i.width||i.right-i.left,o=i.height||i.bottom-i.top,u!==e&&(u=e,b=C=0),n=a.fire("ObjectSelected",{target:e}),O(e)&&!n.isDefaultPrevented()?E(l,function(n,e){var t;(t=N.get("mceResizeHandle"+e))&&N.remove(t),t=N.add(A,"div",{id:"mceResizeHandle"+e,"data-mce-bogus":"all","class":"mce-resizehandle",unselectable:!0,style:"cursor:"+e+"-resize; margin:0; padding:0"}),11===fe.ie&&(t.contentEditable=!1),N.bind(t,"mousedown",function(e){var t;e.stopImmediatePropagation(),e.preventDefault(),d=(t=e).screenX,m=t.screenY,h=D(u).clientWidth,v=D(u).clientHeight,y=v/h,(f=n).startPos={x:r*n[0]+g,y:o*n[1]+p},x=A.scrollWidth,w=A.scrollHeight,s=u.cloneNode(!0),N.addClass(s,"mce-clonedresizable"),N.setAttrib(s,"data-mce-bogus","all"),s.contentEditable=!1,s.unSelectabe=!0,N.setStyles(s,{left:g,top:p,margin:0}),s.removeAttribute("data-mce-selected"),A.appendChild(s),N.bind(S,"mousemove",B),N.bind(S,"mouseup",P),T!==S&&(N.bind(T,"mousemove",B),N.bind(T,"mouseup",P)),c=N.add(A,"div",{"class":"mce-resize-helper","data-mce-bogus":"all"},h+" &times; "+v)}),n.elm=t,N.setStyles(t,{left:r*n[0]+g-t.offsetWidth/2,top:o*n[1]+p-t.offsetHeight/2})}):I(),u.setAttribute("data-mce-selected","1")},I=function(){var e,t;for(e in M(),u&&u.removeAttribute("data-mce-selected"),l)(t=N.get("mceResizeHandle"+e))&&(N.unbind(t),N.remove(t))},L=function(e){var t,n=function(e,t){if(e)do{if(e===t)return!0}while(e=e.parentNode)};i||a.removed||(E(N.select("img[data-mce-selected],hr[data-mce-selected]"),function(e){e.removeAttribute("data-mce-selected")}),t="mousedown"===e.type?e.target:r.getNode(),n(t=N.$(t).closest("table,img,figure.image,hr")[0],A)&&(z(),n(r.getStart(!0),t)&&n(r.getEnd(!0),t))?o(t):I())},F=function(e){return Sb(function(e,t){for(;t&&t!==e;){if(Tb(t)||Sb(t))return t;t=t.parentNode}return null}(a.getBody(),e))},M=function(){for(var e in l){var t=l[e];t.elm&&(N.unbind(t.elm),delete t.elm)}},z=function(){try{a.getDoc().execCommand("enableObjectResizing",!1,!1)}catch(e){}};return a.on("init",function(){z(),fe.ie&&11<=fe.ie&&(a.on("mousedown click",function(e){var t=e.target,n=t.nodeName;i||!/^(TABLE|IMG|HR)$/.test(n)||F(t)||(2!==e.button&&a.selection.select(t,"TABLE"===n),"mousedown"===e.type&&a.nodeChanged())}),a.dom.bind(A,"mscontrolselect",function(e){var t=function(e){he.setEditorTimeout(a,function(){a.selection.select(e)})};if(F(e.target))return e.preventDefault(),void t(e.target);/^(TABLE|IMG|HR)$/.test(e.target.nodeName)&&(e.preventDefault(),"IMG"===e.target.tagName&&t(e.target))}));var t=he.throttle(function(e){a.composing||L(e)});a.on("nodechange ResizeEditor ResizeWindow drop FullscreenStateChanged",t),a.on("keyup compositionend",function(e){u&&"TABLE"===u.nodeName&&t(e)}),a.on("hide blur",I),a.on("contextmenu",n)}),a.on("remove",M),{isResizable:O,showResizeRect:o,hideResizeRect:I,updateResizeRect:L,destroy:function(){u=s=null}}},_b=function(e){for(var t=0,n=0,r=e;r&&r.nodeType;)t+=r.offsetLeft||0,n+=r.offsetTop||0,r=r.offsetParent;return{x:t,y:n}},Ab=function(e,t,n){var r,o,i,a,u,s=e.dom,c=s.getRoot(),l=0;if(u={elm:t,alignToTop:n},e.fire("scrollIntoView",u),!u.isDefaultPrevented()&&jo.isElement(t)){if(!1===n&&(l=t.offsetHeight),"BODY"!==c.nodeName){var f=e.selection.getScrollContainer();if(f)return r=_b(t).y-_b(f).y+l,a=f.clientHeight,void((r<(i=f.scrollTop)||i+a<r+25)&&(f.scrollTop=r<i?r:r-a+25))}o=s.getViewPort(e.getWin()),r=s.getPos(t).y+l,i=o.y,a=o.h,(r<o.y||i+a<r+25)&&e.getWin().scrollTo(0,r<i?r:r-a+25)}},Rb=function(d,e){Z(Su.fromRangeStart(e).getClientRects()).each(function(e){var t,n,r,o,i,a,u,s,c,l=function(e){if(e.inline)return e.getBody().getBoundingClientRect();var t=e.getWin();return{left:0,right:t.innerWidth,top:0,bottom:t.innerHeight,width:t.innerWidth,height:t.innerHeight}}(d),f={x:(i=t=l,a=n=e,a.left>i.left&&a.right<i.right?0:a.left<i.left?a.left-i.left:a.right-i.right),y:(r=t,o=n,o.top>r.top&&o.bottom<r.bottom?0:o.top<r.top?o.top-r.top:o.bottom-r.bottom)};s=0!==f.x?0<f.x?f.x+4:f.x-4:0,c=0!==f.y?0<f.y?f.y+4:f.y-4:0,(u=d).inline?(u.getBody().scrollLeft+=s,u.getBody().scrollTop+=c):u.getWin().scrollBy(s,c)})},Db=function(e){return jo.isContentEditableTrue(e)||jo.isContentEditableFalse(e)},Ob=function(e,t,n){var r,o,i,a,u,s=n;if(s.caretPositionFromPoint)(o=s.caretPositionFromPoint(e,t))&&((r=n.createRange()).setStart(o.offsetNode,o.offset),r.collapse(!0));else if(n.caretRangeFromPoint)r=n.caretRangeFromPoint(e,t);else if(s.body.createTextRange){r=s.body.createTextRange();try{r.moveToPoint(e,t),r.collapse(!0)}catch(c){r=function(e,n,t){var r,o,i;if(r=t.elementFromPoint(e,n),o=t.body.createTextRange(),r&&"HTML"!==r.tagName||(r=t.body),o.moveToElementText(r),0<(i=(i=Xt.toArray(o.getClientRects())).sort(function(e,t){return(e=Math.abs(Math.max(e.top-n,e.bottom-n)))-(t=Math.abs(Math.max(t.top-n,t.bottom-n)))})).length){n=(i[0].bottom+i[0].top)/2;try{return o.moveToPoint(e,n),o.collapse(!0),o}catch(a){}}return null}(e,t,n)}return i=r,a=n.body,u=i&&i.parentElement?i.parentElement():null,jo.isContentEditableFalse(function(e,t,n){for(;e&&e!==t;){if(n(e))return e;e=e.parentNode}return null}(u,a,Db))?null:i}return r},Bb=function(n,e){return W(e,function(e){var t=n.fire("GetSelectionRange",{range:e});return t.range!==e?t.range:e})},Pb=function(e,t){var n=(t||V.document).createDocumentFragment();return z(e,function(e){n.appendChild(e.dom())}),ar.fromDom(n)},Ib=Ar("element","width","rows"),Lb=Ar("element","cells"),Fb=Ar("x","y"),Mb=function(e,t){var n=parseInt(Er(e,t),10);return isNaN(n)?1:n},zb=function(e){return j(e,function(e,t){return t.cells().length>e?t.cells().length:e},0)},Ub=function(e,t){for(var n=e.rows(),r=0;r<n.length;r++)for(var o=n[r].cells(),i=0;i<o.length;i++)if(Mr(o[i],t))return _.some(Fb(i,r));return _.none()},jb=function(e,t,n,r,o){for(var i=[],a=e.rows(),u=n;u<=o;u++){var s=a[u].cells(),c=t<r?s.slice(t,r+1):s.slice(r,t+1);i.push(Lb(a[u].element(),c))}return i},Vb=function(e){var o=Ib(ha(e),0,[]);return z(Qi(e,"tr"),function(n,r){z(Qi(n,"td,th"),function(e,t){!function(e,t,n,r,o){for(var i=Mb(o,"rowspan"),a=Mb(o,"colspan"),u=e.rows(),s=n;s<n+i;s++){u[s]||(u[s]=Lb(va(r),[]));for(var c=t;c<t+a;c++)u[s].cells()[c]=s===n&&c===t?o:ha(o)}}(o,function(e,t,n){for(;r=t,o=n,i=void 0,((i=e.rows())[o]?i[o].cells():[])[r];)t++;var r,o,i;return t}(o,t,r),r,n,e)})}),Ib(o.element(),zb(o.rows()),o.rows())},Hb=function(e){return n=W((t=e).rows(),function(e){var t=W(e.cells(),function(e){var t=va(e);return Sr(t,"colspan"),Sr(t,"rowspan"),t}),n=ha(e.element());return Mi(n,t),n}),r=ha(t.element()),o=ar.fromTag("tbody"),Mi(o,n),Fi(r,o),r;var t,n,r,o},qb=function(l,e,t){return Ub(l,e).bind(function(c){return Ub(l,t).map(function(e){return t=l,r=e,o=(n=c).x(),i=n.y(),a=r.x(),u=r.y(),s=i<u?jb(t,o,i,a,u):jb(t,o,u,a,i),Ib(t.element(),zb(s),s);var t,n,r,o,i,a,u,s})})},$b=function(n,t){return X(n,function(e){return"li"===lr(e)&&Kh(e,t)}).fold(q([]),function(e){return(t=n,X(t,function(e){return"ul"===lr(e)||"ol"===lr(e)})).map(function(e){return[ar.fromTag("li"),ar.fromTag(lr(e))]}).getOr([]);var t})},Wb=function(e,t){var n,r=ar.fromDom(t.commonAncestorContainer),o=uf(r,e),i=U(o,function(e){return xo(e)||bo(e)}),a=$b(o,t),u=i.concat(a.length?a:So(n=r)?Vr(n).filter(Eo).fold(q([]),function(e){return[n,e]}):Eo(n)?[n]:[]);return W(u,ha)},Kb=function(){return Pb([])},Xb=function(e,t){return n=ar.fromDom(t.cloneContents()),r=Wb(e,t),o=j(r,function(e,t){return Fi(t,e),t},n),0<r.length?Pb([o]):o;var n,r,o},Yb=function(e,o){return(t=e,n=o[0],ra(n,"table",d(Mr,t))).bind(function(e){var t=o[0],n=o[o.length-1],r=Vb(e);return qb(r,t,n).map(function(e){return Pb([Hb(e)])})}).getOrThunk(Kb);var t,n},Gb=function(e,t){var n,r,o=Cm(t,e);return 0<o.length?Yb(e,o):(n=e,0<(r=t).length&&r[0].collapsed?Kb():Xb(n,r[0]))},Jb=function(e,t){if(void 0===t&&(t={}),t.get=!0,t.format=t.format||"html",t.selection=!0,(t=e.fire("BeforeGetContent",t)).isDefaultPrevented())return e.fire("GetContent",t),t.content;if("text"===t.format)return c=e,_.from(c.selection.getRng()).map(function(e){var t=c.dom.add(c.getBody(),"div",{"data-mce-bogus":"all",style:"overflow: hidden; opacity: 0;"},e.cloneContents()),n=wa(t.innerText);return c.dom.remove(t),n}).getOr("");t.getInner=!0;var n,r,o,i,a,u,s,c,l=(r=t,i=(n=e).selection.getRng(),a=n.dom.create("body"),u=n.selection.getSel(),s=Bb(n,gm(u)),(o=r.contextual?Gb(ar.fromDom(n.getBody()),s).dom():i.cloneContents())&&a.appendChild(o),n.selection.serializer.serialize(a,r));return"tree"===t.format?l:(t.content=e.selection.isCollapsed()?"":l,e.fire("GetContent",t),t.content)},Qb=function(e,t,n){var r,o,i,a=e.selection.getRng(),u=e.getDoc();if((n=n||{format:"html"}).set=!0,n.selection=!0,n.content=t,n.no_events||!(n=e.fire("BeforeSetContent",n)).isDefaultPrevented()){if(t=n.content,a.insertNode){t+='<span id="__caret">_</span>',a.startContainer===u&&a.endContainer===u?u.body.innerHTML=t:(a.deleteContents(),0===u.body.childNodes.length?u.body.innerHTML=t:a.createContextualFragment?a.insertNode(a.createContextualFragment(t)):(o=u.createDocumentFragment(),i=u.createElement("div"),o.appendChild(i),i.outerHTML=t,a.insertNode(o))),r=e.dom.get("__caret"),(a=u.createRange()).setStartBefore(r),a.setEndBefore(r),e.selection.setRng(a),e.dom.remove("__caret");try{e.selection.setRng(a)}catch(s){}}else a.item&&(u.execCommand("Delete",!1,null),a=e.getRng()),/^\s+/.test(t)?(a.pasteHTML('<span id="__mce_tmp">_</span>'+t),e.dom.remove("__mce_tmp")):a.pasteHTML(t);n.no_events||e.fire("SetContent",n)}else e.fire("SetContent",n)},Zb=function(e,t,n,r,o){var i=n?t.startContainer:t.endContainer,a=n?t.startOffset:t.endOffset;return _.from(i).map(ar.fromDom).map(function(e){return r&&t.collapsed?e:Xr(e,o(e,a)).getOr(e)}).bind(function(e){return dr(e)?_.some(e):Vr(e)}).map(function(e){return e.dom()}).getOr(e)},eC=function(e,t,n){return Zb(e,t,!0,n,function(e,t){return Math.min(e.dom().childNodes.length,t)})},tC=function(e,t,n){return Zb(e,t,!1,n,function(e,t){return 0<t?t-1:t})},nC=function(e,t){for(var n=e;e&&jo.isText(e)&&0===e.length;)e=t?e.nextSibling:e.previousSibling;return e||n},rC=Xt.each,oC=function(e){return!!e.select},iC=function(e){return!(!e||!e.ownerDocument)&&zr(ar.fromDom(e.ownerDocument),ar.fromDom(e))},aC=function(u,s,e,c){var n,t,l,f,a,r=function(e,t){return Qb(c,e,t)},o=function(e){var t=m();t.collapse(!!e),i(t)},d=function(){return s.getSelection?s.getSelection():s.document.selection},m=function(){var e,t,n,r,o=function(e,t,n){try{return t.compareBoundaryPoints(e,n)}catch(r){return-1}};if(!s)return null;if(null==(r=s.document))return null;if(c.bookmark!==undefined&&!1===oh(c)){var i=rp(c);if(i.isSome())return i.map(function(e){return Bb(c,[e])[0]}).getOr(r.createRange())}try{(e=d())&&!jo.isRestrictedNode(e.anchorNode)&&(t=0<e.rangeCount?e.getRangeAt(0):e.createRange?e.createRange():r.createRange())}catch(a){}return(t=Bb(c,[t])[0])||(t=r.createRange?r.createRange():r.body.createTextRange()),t.setStart&&9===t.startContainer.nodeType&&t.collapsed&&(n=u.getRoot(),t.setStart(n,0),t.setEnd(n,0)),l&&f&&(0===o(t.START_TO_START,t,l)&&0===o(t.END_TO_END,t,l)?t=f:f=l=null),t},i=function(e,t){var n,r;if((o=e)&&(oC(o)||iC(o.startContainer)&&iC(o.endContainer))){var o,i=oC(e)?e:null;if(i){f=null;try{i.select()}catch(a){}}else{if(n=d(),e=c.fire("SetSelectionRange",{range:e,forward:t}).range,n){f=e;try{n.removeAllRanges(),n.addRange(e)}catch(a){}!1===t&&n.extend&&(n.collapse(e.endContainer,e.endOffset),n.extend(e.startContainer,e.startOffset)),l=0<n.rangeCount?n.getRangeAt(0):null}e.collapsed||e.startContainer!==e.endContainer||!n.setBaseAndExtent||fe.ie||e.endOffset-e.startOffset<2&&e.startContainer.hasChildNodes()&&(r=e.startContainer.childNodes[e.startOffset])&&"IMG"===r.tagName&&(n.setBaseAndExtent(e.startContainer,e.startOffset,e.endContainer,e.endOffset),n.anchorNode===e.startContainer&&n.focusNode===e.endContainer||n.setBaseAndExtent(r,0,r,1)),c.fire("AfterSetSelectionRange",{range:e,forward:t})}}},g=function(){var e,t,n=d();return!(n&&n.anchorNode&&n.focusNode)||((e=u.createRng()).setStart(n.anchorNode,n.anchorOffset),e.collapse(!0),(t=u.createRng()).setStart(n.focusNode,n.focusOffset),t.collapse(!0),e.compareBoundaryPoints(e.START_TO_START,t)<=0)},p={bookmarkManager:null,controlSelection:null,dom:u,win:s,serializer:e,editor:c,collapse:o,setCursorLocation:function(e,t){var n=u.createRng();e?(n.setStart(e,t),n.setEnd(e,t),i(n),o(!1)):(Xh(u,n,c.getBody(),!0),i(n))},getContent:function(e){return Jb(c,e)},setContent:r,getBookmark:function(e,t){return n.getBookmark(e,t)},moveToBookmark:function(e){return n.moveToBookmark(e)},select:function(e,t){var r,n,o;return(r=u,n=e,o=t,_.from(n).map(function(e){var t=r.nodeIndex(e),n=r.createRng();return n.setStart(e.parentNode,t),n.setEnd(e.parentNode,t+1),o&&(Xh(r,n,e,!0),Xh(r,n,e,!1)),n})).each(i),e},isCollapsed:function(){var e=m(),t=d();return!(!e||e.item)&&(e.compareEndPoints?0===e.compareEndPoints("StartToEnd",e):!t||e.collapsed)},isForward:g,setNode:function(e){return r(u.getOuterHTML(e)),e},getNode:function(){return e=c.getBody(),(t=m())?(r=t.startContainer,o=t.endContainer,i=t.startOffset,a=t.endOffset,n=t.commonAncestorContainer,!t.collapsed&&(r===o&&a-i<2&&r.hasChildNodes()&&(n=r.childNodes[i]),3===r.nodeType&&3===o.nodeType&&(r=r.length===i?nC(r.nextSibling,!0):r.parentNode,o=0===a?nC(o.previousSibling,!1):o.parentNode,r&&r===o))?r:n&&3===n.nodeType?n.parentNode:n):e;var e,t,n,r,o,i,a},getSel:d,setRng:i,getRng:m,getStart:function(e){return eC(c.getBody(),m(),e)},getEnd:function(e){return tC(c.getBody(),m(),e)},getSelectedBlocks:function(e,t){return function(e,t,n,r){var o,i,a=[];if(i=e.getRoot(),n=e.getParent(n||eC(i,t,t.collapsed),e.isBlock),r=e.getParent(r||tC(i,t,t.collapsed),e.isBlock),n&&n!==i&&a.push(n),n&&r&&n!==r)for(var u=new go(o=n,i);(o=u.next())&&o!==r;)e.isBlock(o)&&a.push(o);return r&&n!==r&&r!==i&&a.push(r),a}(u,m(),e,t)},normalize:function(){var e=m(),t=d();if(!hm(t)&&Yh(c)){var n=kg(u,e);return n.each(function(e){i(e,g())}),n.getOr(e)}return e},selectorChanged:function(e,t){var i;return a||(a={},i={},c.on("NodeChange",function(e){var n=e.element,r=u.getParents(n,null,u.getRoot()),o={};rC(a,function(e,n){rC(r,function(t){if(u.is(t,n))return i[n]||(rC(e,function(e){e(!0,{node:t,selector:n,parents:r})}),i[n]=e),o[n]=e,!1})}),rC(i,function(e,t){o[t]||(delete i[t],rC(e,function(e){e(!1,{node:n,selector:t,parents:r})}))})})),a[e]||(a[e]=[]),a[e].push(t),p},getScrollContainer:function(){for(var e,t=u.getRoot();t&&"BODY"!==t.nodeName;){if(t.scrollHeight>t.clientHeight){e=t;break}t=t.parentNode}return e},scrollIntoView:function(e,t){return Ab(c,e,t)},placeCaretAt:function(e,t){return i(Ob(e,t,c.getDoc()))},getBoundingClientRect:function(){var e=m();return e.collapsed?_u.fromRangeStart(e).getClientRects()[0]:e.getBoundingClientRect()},destroy:function(){s=l=f=null,t.destroy()}};return n=Eb(p),t=kb(p,c),p.bookmarkManager=n,p.controlSelection=t,p};(Nb=wb||(wb={}))[Nb.Br=0]="Br",Nb[Nb.Block=1]="Block",Nb[Nb.Wrap=2]="Wrap",Nb[Nb.Eol=3]="Eol";var uC=function(e,t){return e===Tu.Backwards?t.reverse():t},sC=function(e,t,n,r){for(var o,i,a,u,s,c,l=Js(n),f=r,d=[];f&&(s=l,c=f,o=t===Tu.Forwards?s.next(c):s.prev(c));){if(jo.isBr(o.getNode(!1)))return t===Tu.Forwards?{positions:uC(t,d).concat([o]),breakType:wb.Br,breakAt:_.some(o)}:{positions:uC(t,d),breakType:wb.Br,breakAt:_.some(o)};if(o.isVisible()){if(e(f,o)){var m=(i=t,a=f,u=o,jo.isBr(u.getNode(i===Tu.Forwards))?wb.Br:!1===Ts(a,u)?wb.Block:wb.Wrap);return{positions:uC(t,d),breakType:m,breakAt:_.some(o)}}d.push(o),f=o}else f=o}return{positions:uC(t,d),breakType:wb.Eol,breakAt:_.none()}},cC=function(n,r,o,e){return r(o,e).breakAt.map(function(e){var t=r(o,e).positions;return n===Tu.Backwards?t.concat(e):[e].concat(t)}).getOr([])},lC=function(e,i){return j(e,function(e,o){return e.fold(function(){return _.some(o)},function(r){return ru(Z(r.getClientRects()),Z(o.getClientRects()),function(e,t){var n=Math.abs(i-e.left);return Math.abs(i-t.left)<=n?o:r}).or(e)})},_.none())},fC=function(t,e){return Z(e.getClientRects()).bind(function(e){return lC(t,e.left)})},dC=d(sC,Su.isAbove,-1),mC=d(sC,Su.isBelow,1),gC=d(cC,-1,dC),pC=d(cC,1,mC),hC=jo.isContentEditableFalse,vC=Za,yC=function(e,t,n,r){var o=e===Tu.Forwards,i=o?Lf:Ff;if(!r.collapsed){var a=vC(r);if(hC(a))return ig(e,t,a,e===Tu.Backwards,!0)}var u=Sa(r.startContainer),s=Ps(e,t.getBody(),r);if(i(s))return ag(t,s.getNode(!o));var c=Vl.normalizePosition(o,n(s));if(!c)return u?r:null;if(i(c))return ig(e,t,c.getNode(!o),o,!0);var l=n(c);return l&&i(l)&&Fs(c,l)?ig(e,t,l.getNode(!o),o,!0):u?sg(t,c.toRange(),!0):null},bC=function(e,t,n,r){var o,i,a,u,s,c,l,f,d;if(d=vC(r),o=Ps(e,t.getBody(),r),i=n(t.getBody(),ov(1),o),a=U(i,iv(1)),s=Ht.last(o.getClientRects()),(Lf(o)||zf(o))&&(d=o.getNode()),(Ff(o)||Uf(o))&&(d=o.getNode(!0)),!s)return null;if(c=s.left,(u=fv(a,c))&&hC(u.node))return l=Math.abs(c-u.left),f=Math.abs(c-u.right),ig(e,t,u.node,l<f,!0);if(d){var m=function(e,t,n,r){var o,i,a,u,s,c,l=Js(t),f=[],d=0,m=function(e){return Ht.last(e.getClientRects())};1===e?(o=l.next,i=Ja,a=Ga,u=_u.after(r)):(o=l.prev,i=Ga,a=Ja,u=_u.before(r)),c=m(u);do{if(u.isVisible()&&!a(s=m(u),c)){if(0<f.length&&i(s,Ht.last(f))&&d++,(s=Ka(s)).position=u,s.line=d,n(s))return f;f.push(s)}}while(u=o(u));return f}(e,t.getBody(),ov(1),d);if(u=fv(U(m,iv(1)),c))return sg(t,u.position.toRange(),!0);if(u=Ht.last(U(m,iv(0))))return sg(t,u.position.toRange(),!0)}},CC=function(e,t,n){var r,o,i,a,u=Js(e.getBody()),s=d(Ls,u.next),c=d(Ls,u.prev);if(n.collapsed&&e.settings.forced_root_block){if(!(r=e.dom.getParent(n.startContainer,"PRE")))return;(1===t?s(_u.fromRangeStart(n)):c(_u.fromRangeStart(n)))||(a=(i=e).dom.create(Nl(i)),(!fe.ie||11<=fe.ie)&&(a.innerHTML='<br data-mce-bogus="1">'),o=a,1===t?e.$(r).after(o):e.$(r).before(o),e.selection.select(o,!0),e.selection.collapse())}},xC=function(l,f){return function(){var e,t,n,r,o,i,a,u,s,c=(t=f,r=Js((e=l).getBody()),o=d(Ls,r.next),i=d(Ls,r.prev),a=t?Tu.Forwards:Tu.Backwards,u=t?o:i,s=e.selection.getRng(),(n=yC(a,e,u,s))?n:(n=CC(e,a,s))||null);return!!c&&(l.selection.setRng(c),!0)}},wC=function(u,s){return function(){var e,t,n,r,o,i,a=(r=(t=s)?1:-1,o=t?rv:nv,i=(e=u).selection.getRng(),(n=bC(r,e,o,i))?n:(n=CC(e,r,i))||null);return!!a&&(u.selection.setRng(a),!0)}},NC=function(r,o){return function(){var t,e=o?_u.fromRangeEnd(r.selection.getRng()):_u.fromRangeStart(r.selection.getRng()),n=o?mC(r.getBody(),e):dC(r.getBody(),e);return(o?ee(n.positions):Z(n.positions)).filter((t=o,function(e){return t?Ff(e):Lf(e)})).fold(q(!1),function(e){return r.selection.setRng(e.toRange()),!0})}},EC=function(e,t,n,r,o){var i,a,u,s,c=Qi(ar.fromDom(n),"td,th,caption").map(function(e){return e.dom()}),l=U((i=e,G(c,function(e){var t,n,r=(t=Ka(e.getBoundingClientRect()),n=-1,{left:t.left-n,top:t.top-n,right:t.right+2*n,bottom:t.bottom+2*n,width:t.width+n,height:t.height+n});return[{x:r.left,y:i(r),cell:e},{x:r.right,y:i(r),cell:e}]})),function(e){return t(e,o)});return(a=l,u=r,s=o,j(a,function(e,r){return e.fold(function(){return _.some(r)},function(e){var t=Math.sqrt(Math.abs(e.x-u)+Math.abs(e.y-s)),n=Math.sqrt(Math.abs(r.x-u)+Math.abs(r.y-s));return _.some(n<t?r:e)})},_.none())).map(function(e){return e.cell})},SC=d(EC,function(e){return e.bottom},function(e,t){return e.y<t}),TC=d(EC,function(e){return e.top},function(e,t){return e.y>t}),kC=function(t,n){return Z(n.getClientRects()).bind(function(e){return SC(t,e.left,e.top)}).bind(function(e){return fC((t=e,sc.lastPositionIn(t).map(function(e){return dC(t,e).positions.concat(e)}).getOr([])),n);var t})},_C=function(t,n){return ee(n.getClientRects()).bind(function(e){return TC(t,e.left,e.top)}).bind(function(e){return fC((t=e,sc.firstPositionIn(t).map(function(e){return[e].concat(mC(t,e).positions)}).getOr([])),n);var t})},AC=function(e,t){e.selection.setRng(t),Rb(e,t)},RC=function(e,t,n){var r,o,i,a,u=e(t,n);return(a=u).breakType===wb.Wrap&&0===a.positions.length||!jo.isBr(n.getNode())&&(i=u).breakType===wb.Br&&1===i.positions.length?(r=e,o=t,!u.breakAt.map(function(e){return r(o,e).breakAt.isSome()}).getOr(!1)):u.breakAt.isNone()},DC=d(RC,dC),OC=d(RC,mC),BC=function(e,t,n,r){var o,i,a,u,s=e.selection.getRng(),c=t?1:-1;if(ms()&&(o=t,i=s,a=n,u=_u.fromRangeStart(i),sc.positionIn(!o,a).map(function(e){return e.isEqual(u)}).getOr(!1))){var l=ig(c,e,n,!t,!0);return AC(e,l),!0}return!1},PC=function(e,t){var n=t.getNode(e);return jo.isElement(n)&&"TABLE"===n.nodeName?_.some(n):_.none()},IC=function(u,s,c){var e=PC(!!s,c),t=!1===s;e.fold(function(){return AC(u,c.toRange())},function(a){return sc.positionIn(t,u.getBody()).filter(function(e){return e.isEqual(c)}).fold(function(){return AC(u,c.toRange())},function(e){return n=s,o=a,t=c,void((i=Nl(r=u))?r.undoManager.transact(function(){var e=ar.fromTag(i);Nr(e,El(r)),Fi(e,ar.fromTag("br")),n?Ii(ar.fromDom(o),e):Pi(ar.fromDom(o),e);var t=r.dom.createRng();t.setStart(e.dom(),0),t.setEnd(e.dom(),0),AC(r,t)}):AC(r,t.toRange()));var n,r,o,t,i})})},LC=function(e,t,n,r){var o,i,a,u,s,c,l=e.selection.getRng(),f=_u.fromRangeStart(l),d=e.getBody();if(!t&&DC(r,f)){var m=(u=d,kC(s=n,c=f).orThunk(function(){return Z(c.getClientRects()).bind(function(e){return lC(gC(u,_u.before(s)),e.left)})}).getOr(_u.before(s)));return IC(e,t,m),!0}return!(!t||!OC(r,f))&&(o=d,m=_C(i=n,a=f).orThunk(function(){return Z(a.getClientRects()).bind(function(e){return lC(pC(o,_u.after(i)),e.left)})}).getOr(_u.after(i)),IC(e,t,m),!0)},FC=function(t,n){return function(){return _.from(t.dom.getParent(t.selection.getNode(),"td,th")).bind(function(e){return _.from(t.dom.getParent(e,"table")).map(function(e){return BC(t,n,e)})}).getOr(!1)}},MC=function(n,r){return function(){return _.from(n.dom.getParent(n.selection.getNode(),"td,th")).bind(function(t){return _.from(n.dom.getParent(t,"table")).map(function(e){return LC(n,r,e,t)})}).getOr(!1)}},zC=function(e){return F(["figcaption"],lr(e))},UC=function(e){var t=V.document.createRange();return t.setStartBefore(e.dom()),t.setEndBefore(e.dom()),t},jC=function(e,t,n){n?Fi(e,t):Li(e,t)},VC=function(e,t,n,r){return""===t?(l=e,f=r,d=ar.fromTag("br"),jC(l,d,f),UC(d)):(o=e,i=r,a=t,u=n,s=ar.fromTag(a),c=ar.fromTag("br"),Nr(s,u),Fi(s,c),jC(o,s,i),UC(c));var o,i,a,u,s,c,l,f,d},HC=function(e,t,n){return t?(o=e.dom(),mC(o,n).breakAt.isNone()):(r=e.dom(),dC(r,n).breakAt.isNone());var r,o},qC=function(t,n){var e,r,o,i=ar.fromDom(t.getBody()),a=_u.fromRangeStart(t.selection.getRng()),u=Nl(t),s=El(t);return(e=a,r=i,o=d(Mr,r),na(ar.fromDom(e.container()),Co,o).filter(zC)).exists(function(){if(HC(i,n,a)){var e=VC(i,u,s,n);return t.selection.setRng(e),!0}return!1})},$C=function(e,t){return function(){return!!e.selection.isCollapsed()&&qC(e,t)}},WC=function(e,r){return G(W(e,function(e){return Yy({shiftKey:!1,altKey:!1,ctrlKey:!1,metaKey:!1,keyCode:0,action:o},e)}),function(e){return t=e,(n=r).keyCode===t.keyCode&&n.shiftKey===t.shiftKey&&n.altKey===t.altKey&&n.ctrlKey===t.ctrlKey&&n.metaKey===t.metaKey?[e]:[];var t,n})},KC=function(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];var r=Array.prototype.slice.call(arguments,1);return function(){return e.apply(null,r)}},XC=function(e,t){return X(WC(e,t),function(e){return e.action()})},YC=function(i,a){i.on("keydown",function(e){var t,n,r,o;!1===e.isDefaultPrevented()&&(t=i,n=a,r=e,o=or.detect().os,XC([{keyCode:Zh.RIGHT,action:xC(t,!0)},{keyCode:Zh.LEFT,action:xC(t,!1)},{keyCode:Zh.UP,action:wC(t,!1)},{keyCode:Zh.DOWN,action:wC(t,!0)},{keyCode:Zh.RIGHT,action:FC(t,!0)},{keyCode:Zh.LEFT,action:FC(t,!1)},{keyCode:Zh.UP,action:MC(t,!1)},{keyCode:Zh.DOWN,action:MC(t,!0)},{keyCode:Zh.RIGHT,action:Xd.move(t,n,!0)},{keyCode:Zh.LEFT,action:Xd.move(t,n,!1)},{keyCode:Zh.RIGHT,ctrlKey:!o.isOSX(),altKey:o.isOSX(),action:Xd.moveNextWord(t,n)},{keyCode:Zh.LEFT,ctrlKey:!o.isOSX(),altKey:o.isOSX(),action:Xd.movePrevWord(t,n)},{keyCode:Zh.UP,action:$C(t,!1)},{keyCode:Zh.DOWN,action:$C(t,!0)}],r).each(function(e){r.preventDefault()}))})},GC=function(o,i){o.on("keydown",function(e){var t,n,r;!1===e.isDefaultPrevented()&&(t=o,n=i,r=e,XC([{keyCode:Zh.BACKSPACE,action:KC(ad,t,!1)},{keyCode:Zh.DELETE,action:KC(ad,t,!0)},{keyCode:Zh.BACKSPACE,action:KC(lg,t,!1)},{keyCode:Zh.DELETE,action:KC(lg,t,!0)},{keyCode:Zh.BACKSPACE,action:KC(Qd,t,n,!1)},{keyCode:Zh.DELETE,action:KC(Qd,t,n,!0)},{keyCode:Zh.BACKSPACE,action:KC(Dm,t,!1)},{keyCode:Zh.DELETE,action:KC(Dm,t,!0)},{keyCode:Zh.BACKSPACE,action:KC(Cf,t,!1)},{keyCode:Zh.DELETE,action:KC(Cf,t,!0)},{keyCode:Zh.BACKSPACE,action:KC(hf,t,!1)},{keyCode:Zh.DELETE,action:KC(hf,t,!0)},{keyCode:Zh.BACKSPACE,action:KC(ng,t,!1)},{keyCode:Zh.DELETE,action:KC(ng,t,!0)}],r).each(function(e){r.preventDefault()}))}),o.on("keyup",function(e){var t,n;!1===e.isDefaultPrevented()&&(t=o,n=e,XC([{keyCode:Zh.BACKSPACE,action:KC(ud,t)},{keyCode:Zh.DELETE,action:KC(ud,t)}],n))})},JC=function(e){return _.from(e.dom.getParent(e.selection.getStart(!0),e.dom.isBlock))},QC=function(e,t){var n,r,o,i=t,a=e.dom,u=e.schema.getMoveCaretBeforeOnEnterElements();if(t){if(/^(LI|DT|DD)$/.test(t.nodeName)){var s=function(e){for(;e;){if(1===e.nodeType||3===e.nodeType&&e.data&&/[\r\n\s]/.test(e.data))return e;e=e.nextSibling}}(t.firstChild);s&&/^(UL|OL|DL)$/.test(s.nodeName)&&t.insertBefore(a.doc.createTextNode("\xa0"),t.firstChild)}if(o=a.createRng(),t.normalize(),t.hasChildNodes()){for(n=new go(t,t);r=n.current();){if(jo.isText(r)){o.setStart(r,0),o.setEnd(r,0);break}if(u[r.nodeName.toLowerCase()]){o.setStartBefore(r),o.setEndBefore(r);break}i=r,r=n.next()}r||(o.setStart(i,0),o.setEnd(i,0))}else jo.isBr(t)?t.nextSibling&&a.isBlock(t.nextSibling)?(o.setStartBefore(t),o.setEndBefore(t)):(o.setStartAfter(t),o.setEndAfter(t)):(o.setStart(t,0),o.setEnd(t,0));e.selection.setRng(o),a.remove(void 0),e.selection.scrollIntoView(t)}},ZC=function(e,t){var n,r,o=e.getRoot();for(n=t;n!==o&&"false"!==e.getContentEditable(n);)"true"===e.getContentEditable(n)&&(r=n),n=n.parentNode;return n!==o?r:o},ex=JC,tx=function(e){return JC(e).fold(q(""),function(e){return e.nodeName.toUpperCase()})},nx=function(e){return JC(e).filter(function(e){return So(ar.fromDom(e))}).isSome()},rx=function(e,t){return e&&e.parentNode&&e.parentNode.nodeName===t},ox=function(e){return e&&/^(OL|UL|LI)$/.test(e.nodeName)},ix=function(e){var t=e.parentNode;return/^(LI|DT|DD)$/.test(t.nodeName)?t:e},ax=function(e,t,n){for(var r=e[n?"firstChild":"lastChild"];r&&!jo.isElement(r);)r=r[n?"nextSibling":"previousSibling"];return r===t},ux=function(e,t,n,r,o){var i=e.dom,a=e.selection.getRng();if(n!==e.getBody()){var u;ox(u=n)&&ox(u.parentNode)&&(o="LI");var s,c,l=o?t(o):i.create("BR");if(ax(n,r,!0)&&ax(n,r,!1))rx(n,"LI")?i.insertAfter(l,ix(n)):i.replace(l,n);else if(ax(n,r,!0))rx(n,"LI")?(i.insertAfter(l,ix(n)),l.appendChild(i.doc.createTextNode(" ")),l.appendChild(n)):n.parentNode.insertBefore(l,n);else if(ax(n,r,!1))i.insertAfter(l,ix(n));else{n=ix(n);var f=a.cloneRange();f.setStartAfter(r),f.setEndAfter(n);var d=f.extractContents();"LI"===o&&(c="LI",(s=d).firstChild&&s.firstChild.nodeName===c)?(l=d.firstChild,i.insertAfter(d,n)):(i.insertAfter(d,n),i.insertAfter(l,n))}i.remove(r),QC(e,l)}},sx=function(e){e.innerHTML='<br data-mce-bogus="1">'},cx=function(e,t){return e.nodeName===t||e.previousSibling&&e.previousSibling.nodeName===t},lx=function(e,t){return t&&e.isBlock(t)&&!/^(TD|TH|CAPTION|FORM)$/.test(t.nodeName)&&!/^(fixed|absolute)/i.test(t.style.position)&&"true"!==e.getContentEditable(t)},fx=function(e,t,n){return!1===jo.isText(t)?n:e?1===n&&t.data.charAt(n-1)===xa?0:n:n===t.data.length-1&&t.data.charAt(n)===xa?t.data.length:n},dx=function(e,t){var n,r,o=e.getRoot();for(n=t;n!==o&&"false"!==e.getContentEditable(n);)"true"===e.getContentEditable(n)&&(r=n),n=n.parentNode;return n!==o?r:o},mx=function(o,i,e){_.from(e.style).map(o.dom.parseStyle).each(function(e){var t=function(e){var t={},n=e.dom();if(Cr(n))for(var r=0;r<n.style.length;r++){var o=n.style.item(r);t[o]=n.style[o]}return t}(ar.fromDom(i)),n=ma(ma({},t),e);o.dom.setStyles(i,n)});var t=_.from(e["class"]).map(function(e){return e.split(/\s+/)}),n=_.from(i.className).map(function(e){return U(e.split(/\s+/),function(e){return""!==e})});ru(t,n,function(t,e){var n=U(e,function(e){return!F(t,e)}),r=function(){for(var e=0,t=0,n=arguments.length;t<n;t++)e+=arguments[t].length;var r=Array(e),o=0;for(t=0;t<n;t++)for(var i=arguments[t],a=0,u=i.length;a<u;a++,o++)r[o]=i[a];return r}(t,n);o.dom.setAttrib(i,"class",r.join(" "))});var r=["style","class"],a=yr(e,function(e,t){return!F(r,t)}).t;o.dom.setAttribs(i,a)},gx=function(e,t){var n=Nl(e);if(n&&n.toLowerCase()===t.tagName.toLowerCase()){var r=El(e);mx(e,t,r)}},px=function(a,e){var t,u,s,i,c,n,r,o,l,f,d,m,g,p,h,v,y,b,C,x=a.dom,w=a.schema,N=w.getNonEmptyElements(),E=a.selection.getRng(),S=function(e){var t,n,r,o=s,i=w.getTextInlineElements();if(r=t=e||"TABLE"===f||"HR"===f?x.create(e||m):c.cloneNode(!1),!1===kl(a))x.setAttrib(t,"style",null),x.setAttrib(t,"class",null);else do{if(i[o.nodeName]){if(Ju(o)||yc(o))continue;n=o.cloneNode(!1),x.setAttrib(n,"id",""),t.hasChildNodes()?n.appendChild(t.firstChild):r=n,t.appendChild(n)}}while((o=o.parentNode)&&o!==u);return gx(a,t),sx(r),t},T=function(e){var t,n,r,o;if(o=fx(e,s,i),jo.isText(s)&&(e?0<o:o<s.nodeValue.length))return!1;if(s.parentNode===c&&g&&!e)return!0;if(e&&jo.isElement(s)&&s===c.firstChild)return!0;if(cx(s,"TABLE")||cx(s,"HR"))return g&&!e||!g&&e;for(t=new go(s,c),jo.isText(s)&&(e&&0===o?t.prev():e||o!==s.nodeValue.length||t.next());n=t.current();){if(jo.isElement(n)){if(!n.getAttribute("data-mce-bogus")&&(r=n.nodeName.toLowerCase(),N[r]&&"br"!==r))return!1}else if(jo.isText(n)&&!/^[ \t\r\n]*$/.test(n.nodeValue))return!1;e?t.prev():t.next()}return!0},k=function(){r=/^(H[1-6]|PRE|FIGURE)$/.test(f)&&"HGROUP"!==d?S(m):S(),_l(a)&&lx(x,l)&&x.isEmpty(c)?r=x.split(l,c):x.insertAfter(r,c),QC(a,r)};kg(x,E).each(function(e){E.setStart(e.startContainer,e.startOffset),E.setEnd(e.endContainer,e.endOffset)}),s=E.startContainer,i=E.startOffset,m=Nl(a),n=e.shiftKey,jo.isElement(s)&&s.hasChildNodes()&&(g=i>s.childNodes.length-1,s=s.childNodes[Math.min(i,s.childNodes.length-1)]||s,i=g&&jo.isText(s)?s.nodeValue.length:0),(u=dx(x,s))&&((m&&!n||!m&&n)&&(s=function(e,t,n,r,o){var i,a,u,s,c,l,f,d=t||"P",m=e.dom,g=dx(m,r);if(!(a=m.getParent(r,m.isBlock))||!lx(m,a)){if(l=(a=a||g)===e.getBody()||(f=a)&&/^(TD|TH|CAPTION)$/.test(f.nodeName)?a.nodeName.toLowerCase():a.parentNode.nodeName.toLowerCase(),!a.hasChildNodes())return i=m.create(d),gx(e,i),a.appendChild(i),n.setStart(i,0),n.setEnd(i,0),i;for(s=r;s.parentNode!==a;)s=s.parentNode;for(;s&&!m.isBlock(s);)s=(u=s).previousSibling;if(u&&e.schema.isValidChild(l,d.toLowerCase())){for(i=m.create(d),gx(e,i),u.parentNode.insertBefore(i,u),s=u;s&&!m.isBlock(s);)c=s.nextSibling,i.appendChild(s),s=c;n.setStart(r,o),n.setEnd(r,o)}}return r}(a,m,E,s,i)),c=x.getParent(s,x.isBlock),l=c?x.getParent(c.parentNode,x.isBlock):null,f=c?c.nodeName.toUpperCase():"","LI"!==(d=l?l.nodeName.toUpperCase():"")||e.ctrlKey||(l=(c=l).parentNode,f=d),/^(LI|DT|DD)$/.test(f)&&x.isEmpty(c)?ux(a,S,l,c,m):m&&c===a.getBody()||(m=m||"P",Sa(c)?(r=Pa(c),x.isEmpty(c)&&sx(c),gx(a,r),QC(a,r)):T()?k():T(!0)?(r=c.parentNode.insertBefore(S(),c),QC(a,cx(c,"HR")?r:c)):((t=(b=E,C=b.cloneRange(),C.setStart(b.startContainer,fx(!0,b.startContainer,b.startOffset)),C.setEnd(b.endContainer,fx(!1,b.endContainer,b.endOffset)),C).cloneRange()).setEndAfter(c),o=t.extractContents(),y=o,z(Ji(ar.fromDom(y),mr),function(e){var t=e.dom();t.nodeValue=wa(t.nodeValue)}),function(e){for(;jo.isText(e)&&(e.nodeValue=e.nodeValue.replace(/^[\r\n]+/,"")),e=e.firstChild;);}(o),r=o.firstChild,x.insertAfter(o,c),function(e,t,n){var r,o=n,i=[];if(o){for(;o=o.firstChild;){if(e.isBlock(o))return;jo.isElement(o)&&!t[o.nodeName.toLowerCase()]&&i.push(o)}for(r=i.length;r--;)!(o=i[r]).hasChildNodes()||o.firstChild===o.lastChild&&""===o.firstChild.nodeValue?e.remove(o):(a=e,(u=o)&&"A"===u.nodeName&&a.isEmpty(u)&&e.remove(o));var a,u}}(x,N,r),p=x,(h=c).normalize(),(v=h.lastChild)&&!/^(left|right)$/gi.test(p.getStyle(v,"float",!0))||p.add(h,"br"),x.isEmpty(c)&&sx(c),r.normalize(),x.isEmpty(r)?(x.remove(r),k()):(gx(a,r),QC(a,r))),x.setAttrib(r,"id",""),a.fire("NewBlock",{newBlock:r})))},hx=function(e,t){return ex(e).filter(function(e){return 0<t.length&&Lr(ar.fromDom(e),t)}).isSome()},vx=function(e){return hx(e,Sl(e))},yx=function(e){return hx(e,Tl(e))},bx=xf([{br:[]},{block:[]},{none:[]}]),Cx=function(e,t){return yx(e)},xx=function(n){return function(e,t){return""===Nl(e)===n}},wx=function(n){return function(e,t){return nx(e)===n}},Nx=function(n,r){return function(e,t){return tx(e)===n.toUpperCase()===r}},Ex=function(e){return Nx("pre",e)},Sx=function(n){return function(e,t){return wl(e)===n}},Tx=function(e,t){return vx(e)},kx=function(e,t){return t},_x=function(e){var t=Nl(e),n=ZC(e.dom,e.selection.getStart());return n&&e.schema.isValidChild(n.nodeName,t||"P")},Ax=function(e,t){return function(n,r){return j(e,function(e,t){return e&&t(n,r)},!0)?_.some(t):_.none()}},Rx=function(e,t){return yd([Ax([Cx],bx.none()),Ax([Nx("summary",!0)],bx.br()),Ax([Ex(!0),Sx(!1),kx],bx.br()),Ax([Ex(!0),Sx(!1)],bx.block()),Ax([Ex(!0),Sx(!0),kx],bx.block()),Ax([Ex(!0),Sx(!0)],bx.br()),Ax([wx(!0),kx],bx.br()),Ax([wx(!0)],bx.block()),Ax([xx(!0),kx,_x],bx.block()),Ax([xx(!0)],bx.br()),Ax([Tx],bx.br()),Ax([xx(!1),kx],bx.br()),Ax([_x],bx.block())],[e,t.shiftKey]).getOr(bx.none())},Dx=function(e,t){Rx(e,t).fold(function(){Fg(e,t)},function(){px(e,t)},o)},Ox=function(o){o.on("keydown",function(e){var t,n,r;e.keyCode===Zh.ENTER&&(t=o,(n=e).isDefaultPrevented()||(n.preventDefault(),(r=t.undoManager).typing&&(r.typing=!1,r.add()),t.undoManager.transact(function(){!1===t.selection.isCollapsed()&&t.execCommand("Delete"),Dx(t,n)})))})},Bx=function(n,r){var e=r.container(),t=r.offset();return jo.isText(e)?(e.insertData(t,n),_.some(Su(e,t+n.length))):Is(r).map(function(e){var t=ar.fromText(n);return r.isAtEnd()?Ii(e,t):Pi(e,t),Su(t.dom(),n.length)})},Px=d(Bx,"\xa0"),Ix=d(Bx," "),Lx=function(e,t,n){return sc.navigateIgnore(e,t,n,Pf)},Fx=function(e,t){return X(uf(ar.fromDom(t.container()),e),Co)},Mx=function(e,n,r){return Lx(e,n.dom(),r).forall(function(t){return Fx(n,r).fold(function(){return!1===Ts(t,r,n.dom())},function(e){return!1===Ts(t,r,n.dom())&&zr(e,ar.fromDom(t.container()))})})},zx=function(t,n,r){return Fx(n,r).fold(function(){return Lx(t,n.dom(),r).forall(function(e){return!1===Ts(e,r,n.dom())})},function(e){return Lx(t,e.dom(),r).isNone()})},Ux=d(zx,!1),jx=d(zx,!0),Vx=d(Mx,!1),Hx=d(Mx,!0),qx=function(e){return Su.isTextPosition(e)&&!e.isAtStart()&&!e.isAtEnd()},$x=function(e,t){var n=U(uf(ar.fromDom(t.container()),e),Co);return Z(n).getOr(e)},Wx=function(e,t){return qx(t)?Bf(t):Bf(t)||sc.prevPosition($x(e,t).dom(),t).exists(Bf)},Kx=function(e,t){return qx(t)?Of(t):Of(t)||sc.nextPosition($x(e,t).dom(),t).exists(Of)},Xx=function(e){return Is(e).bind(function(e){return na(e,dr)}).exists(function(e){return t=kr(e,"white-space"),F(["pre","pre-wrap"],t);var t})},Yx=function(e,t){return o=e,i=t,sc.prevPosition(o.dom(),i).isNone()||(n=e,r=t,sc.nextPosition(n.dom(),r).isNone())||Ux(e,t)||jx(e,t)||Sf(e,t)||Ef(e,t);var n,r,o,i},Gx=function(e,t){var n,r,o,i=(r=(n=t).container(),o=n.offset(),jo.isText(r)&&o<r.data.length?Su(r,o+1):n);return!Xx(i)&&(jx(e,i)||Hx(e,i)||Ef(e,i)||Kx(e,i))},Jx=function(e,t){return n=e,!Xx(r=t)&&(Ux(n,r)||Vx(n,r)||Sf(n,r)||Wx(n,r))||Gx(e,t);var n,r},Qx=function(e,t){return _f(e.charAt(t))},Zx=function(e){var t=e.container();return jo.isText(t)&&Yn(t.data,"\xa0")},ew=function(e){var n,t=e.data,r=(n=t.split(""),W(n,function(e,t){return _f(e)&&0<t&&t<n.length-1&&Rf(n[t-1])&&Rf(n[t+1])?" ":e}).join(""));return r!==t&&(e.data=r,!0)},tw=function(l,e){return _.some(e).filter(Zx).bind(function(e){var t,n,r,o,i,a,u,s,c=e.container();return i=l,u=(a=c).data,s=Su(a,0),Qx(u,0)&&!Jx(i,s)&&(a.data=" "+u.slice(1),1)||ew(c)||(t=l,r=(n=c).data,o=Su(n,r.length-1),Qx(r,r.length-1)&&!Jx(t,o)&&(n.data=r.slice(0,-1)+" ",1))?_.some(e):_.none()})},nw=function(t){var e=ar.fromDom(t.getBody());t.selection.isCollapsed()&&tw(e,Su.fromRangeStart(t.selection.getRng())).each(function(e){t.selection.setRng(e.toRange())})},rw=function(r,o){return function(e){return t=r,!Xx(n=e)&&(Yx(t,n)||Wx(t,n)||Kx(t,n))?Px(o):Ix(o);var t,n}},ow=function(e){var t,n,r=_u.fromRangeStart(e.selection.getRng()),o=ar.fromDom(e.getBody());if(e.selection.isCollapsed()){var i=d(Vl.isInlineTarget,e),a=_u.fromRangeStart(e.selection.getRng());return Ld(i,e.getBody(),a).bind((n=o,function(e){return e.fold(function(e){return sc.prevPosition(n.dom(),_u.before(e))},function(e){return sc.firstPositionIn(e)},function(e){return sc.lastPositionIn(e)},function(e){return sc.nextPosition(n.dom(),_u.after(e))})})).bind(rw(o,r)).exists((t=e,function(e){return t.selection.setRng(e.toRange()),t.nodeChanged(),!0}))}return!1},iw=function(r){r.on("keydown",function(e){var t,n;!1===e.isDefaultPrevented()&&(t=r,n=e,XC([{keyCode:Zh.SPACEBAR,action:KC(ow,t)}],n).each(function(e){n.preventDefault()}))})},aw=function(e,t){var n;t.hasAttribute("data-mce-caret")&&(Pa(t),(n=e).selection.setRng(n.selection.getRng()),e.selection.scrollIntoView(t))},uw=function(e,t){var n,r=(n=e,oa(ar.fromDom(n.getBody()),"*[data-mce-caret]").fold(q(null),function(e){return e.dom()}));if(r)return"compositionstart"===t.type?(t.preventDefault(),t.stopPropagation(),void aw(e,r)):void(_a(r)&&(aw(e,r),e.undoManager.add()))},sw=function(e){e.on("keyup compositionstart",d(uw,e))},cw=or.detect().browser,lw=function(t){var e,n;e=t,n=Vi(function(){e.composing||nw(e)},0),cw.isIE()&&(e.on("keypress",function(e){n.throttle()}),e.on("remove",function(e){n.cancel()})),t.on("input",function(e){!1===e.isComposing&&nw(t)})},fw=function(r){r.on("keydown",function(e){var t,n;!1===e.isDefaultPrevented()&&(t=r,n=e,XC([{keyCode:Zh.END,action:NC(t,!0)},{keyCode:Zh.HOME,action:NC(t,!1)}],n).each(function(e){n.preventDefault()}))})},dw=function(e){var t=Xd.setupSelectedState(e);sw(e),YC(e,t),GC(e,t),Ox(e),iw(e),lw(e),fw(e)};function mw(u){var s,n,r,o=Xt.each,c=Zh.BACKSPACE,l=Zh.DELETE,f=u.dom,d=u.selection,e=u.settings,t=u.parser,i=fe.gecko,a=fe.ie,m=fe.webkit,g="data:text/mce-internal,",p=a?"Text":"URL",h=function(e,t){try{u.getDoc().execCommand(e,!1,t)}catch(n){}},v=function(e){return e.isDefaultPrevented()},y=function(){u.shortcuts.add("meta+a",null,"SelectAll")},b=function(){u.on("keydown",function(e){if(!v(e)&&e.keyCode===c&&d.isCollapsed()&&0===d.getRng().startOffset){var t=d.getNode().previousSibling;if(t&&t.nodeName&&"table"===t.nodeName.toLowerCase())return e.preventDefault(),!1}})},C=function(){u.inline||(u.contentStyles.push("body {min-height: 150px}"),u.on("click",function(e){var t;if("HTML"===e.target.nodeName){if(11<fe.ie)return void u.getBody().focus();t=u.selection.getRng(),u.getBody().focus(),u.selection.setRng(t),u.selection.normalize(),u.nodeChanged()}}))};return u.on("keydown",function(e){var t,n,r,o,i;if(!v(e)&&e.keyCode===Zh.BACKSPACE&&(n=(t=d.getRng()).startContainer,r=t.startOffset,o=f.getRoot(),i=n,t.collapsed&&0===r)){for(;i&&i.parentNode&&i.parentNode.firstChild===i&&i.parentNode!==o;)i=i.parentNode;"BLOCKQUOTE"===i.tagName&&(u.formatter.toggle("blockquote",null,i),(t=f.createRng()).setStart(n,0),t.setEnd(n,0),d.setRng(t))}}),s=function(e){var t=f.create("body"),n=e.cloneContents();return t.appendChild(n),d.serializer.serialize(t,{format:"html"})},u.on("keydown",function(e){var t,n,r,o,i,a=e.keyCode;if(!v(e)&&(a===l||a===c)){if(t=u.selection.isCollapsed(),n=u.getBody(),t&&!f.isEmpty(n))return;if(!t&&(r=u.selection.getRng(),o=s(r),(i=f.createRng()).selectNode(u.getBody()),o!==s(i)))return;e.preventDefault(),u.setContent(""),n.firstChild&&f.isBlock(n.firstChild)?u.selection.setCursorLocation(n.firstChild,0):u.selection.setCursorLocation(n,0),u.nodeChanged()}}),fe.windowsPhone||u.on("keyup focusin mouseup",function(e){Zh.modifierPressed(e)||d.normalize()},!0),m&&(u.settings.content_editable||f.bind(u.getDoc(),"mousedown mouseup",function(e){var t;if(e.target===u.getDoc().documentElement)if(t=d.getRng(),u.getBody().focus(),"mousedown"===e.type){if(ka(t.startContainer))return;d.placeCaretAt(e.clientX,e.clientY)}else d.setRng(t)}),u.on("click",function(e){var t=e.target;/^(IMG|HR)$/.test(t.nodeName)&&"false"!==f.getContentEditableParent(t)&&(e.preventDefault(),u.selection.select(t),u.nodeChanged()),"A"===t.nodeName&&f.hasClass(t,"mce-item-anchor")&&(e.preventDefault(),d.select(t))}),e.forced_root_block&&u.on("init",function(){h("DefaultParagraphSeparator",e.forced_root_block)}),u.on("init",function(){u.dom.bind(u.getBody(),"submit",function(e){e.preventDefault()})}),b(),t.addNodeFilter("br",function(e){for(var t=e.length;t--;)"Apple-interchange-newline"===e[t].attr("class")&&e[t].remove()}),fe.iOS?(u.inline||u.on("keydown",function(){V.document.activeElement===V.document.body&&u.getWin().focus()}),C(),u.on("click",function(e){var t=e.target;do{if("A"===t.tagName)return void e.preventDefault()}while(t=t.parentNode)}),u.contentStyles.push(".mce-content-body {-webkit-touch-callout: none}")):y()),11<=fe.ie&&(C(),b()),fe.ie&&(y(),h("AutoUrlDetect",!1),u.on("dragstart",function(e){var t,n,r;(t=e).dataTransfer&&(u.selection.isCollapsed()&&"IMG"===t.target.tagName&&d.select(t.target),0<(n=u.selection.getContent()).length&&(r=g+escape(u.id)+","+escape(n),t.dataTransfer.setData(p,r)))}),u.on("drop",function(e){if(!v(e)){var t=(i=e).dataTransfer&&(a=i.dataTransfer.getData(p))&&0<=a.indexOf(g)?(a=a.substr(g.length).split(","),{id:unescape(a[0]),html:unescape(a[1])}):null;if(t&&t.id!==u.id){e.preventDefault();var n=Ob(e.x,e.y,u.getDoc());d.setRng(n),r=t.html,o=!0,u.queryCommandSupported("mceInsertClipboardContent")?u.execCommand("mceInsertClipboardContent",!1,{content:r,internal:o}):u.execCommand("mceInsertContent",!1,r)}}var r,o,i,a})),i&&(u.on("keydown",function(e){if(!v(e)&&e.keyCode===c){if(!u.getBody().getElementsByTagName("hr").length)return;if(d.isCollapsed()&&0===d.getRng().startOffset){var t=d.getNode(),n=t.previousSibling;if("HR"===t.nodeName)return f.remove(t),void e.preventDefault();n&&n.nodeName&&"hr"===n.nodeName.toLowerCase()&&(f.remove(n),e.preventDefault())}}}),V.Range.prototype.getClientRects||u.on("mousedown",function(e){if(!v(e)&&"HTML"===e.target.nodeName){var t=u.getBody();t.blur(),he.setEditorTimeout(u,function(){t.focus()})}}),n=function(){var e=f.getAttribs(d.getStart().cloneNode(!1));return function(){var t=d.getStart();t!==u.getBody()&&(f.setAttrib(t,"style",null),o(e,function(e){t.setAttributeNode(e.cloneNode(!0))}))}},r=function(){return!d.isCollapsed()&&f.getParent(d.getStart(),f.isBlock)!==f.getParent(d.getEnd(),f.isBlock)},u.on("keypress",function(e){var t;if(!v(e)&&(8===e.keyCode||46===e.keyCode)&&r())return t=n(),u.getDoc().execCommand("delete",!1,null),t(),e.preventDefault(),!1}),f.bind(u.getDoc(),"cut",function(e){var t;!v(e)&&r()&&(t=n(),he.setEditorTimeout(u,function(){t()}))}),e.readonly||u.on("BeforeExecCommand MouseDown",function(){h("StyleWithCSS",!1),h("enableInlineTableEditing",!1),e.object_resizing||h("enableObjectResizing",!1)}),u.on("SetContent ExecCommand",function(e){"setcontent"!==e.type&&"mceInsertLink"!==e.command||o(f.select("a"),function(e){var t=e.parentNode,n=f.getRoot();if(t.lastChild===e){for(;t&&!f.isBlock(t);){if(t.parentNode.lastChild!==t||t===n)return;t=t.parentNode}f.add(t,"br",{"data-mce-bogus":1})}})}),u.contentStyles.push("img:-moz-broken {-moz-force-broken-image-icon:1;min-width:24px;min-height:24px}"),fe.mac&&u.on("keydown",function(e){!Zh.metaKeyPressed(e)||e.shiftKey||37!==e.keyCode&&39!==e.keyCode||(e.preventDefault(),u.selection.getSel().modify("move",37===e.keyCode?"backward":"forward","lineboundary"))}),b()),{refreshContentEditable:function(){},isHidden:function(){var e;return!i||u.removed?0:!(e=u.selection.getSel())||!e.rangeCount||0===e.rangeCount}}}var gw=function(e){return jo.isElement(e)&&No(ar.fromDom(e))},pw=function(t){t.on("click",function(e){3<=e.detail&&function(e){var t=e.selection.getRng(),n=Su.fromRangeStart(t),r=Su.fromRangeEnd(t);if(Su.isElementPosition(n)){var o=n.container();gw(o)&&sc.firstPositionIn(o).each(function(e){return t.setStart(e.container(),e.offset())})}Su.isElementPosition(r)&&(o=n.container(),gw(o)&&sc.lastPositionIn(o).each(function(e){return t.setEnd(e.container(),e.offset())})),e.selection.setRng(cl(t))}(t)})},hw=function(e){var t,n;(t=e).on("click",function(e){t.dom.getParent(e.target,"details")&&e.preventDefault()}),(n=e).parser.addNodeFilter("details",function(e){z(e,function(e){e.attr("data-mce-open",e.attr("open")),e.attr("open","open")})}),n.serializer.addNodeFilter("details",function(e){z(e,function(e){var t=e.attr("data-mce-open");e.attr("open",S(t)?t:null),e.attr("data-mce-open",null)})})},vw=Si.DOM,yw=function(e){var t;e.bindPendingEventDelegates(),e.initialized=!0,e.fire("init"),e.focus(!0),e.nodeChanged({initial:!0}),e.execCallback("init_instance_callback",e),(t=e).settings.auto_focus&&he.setEditorTimeout(t,function(){var e;(e=!0===t.settings.auto_focus?t:t.editorManager.get(t.settings.auto_focus)).destroyed||e.focus()},100)},bw=function(t,e){var n,r,u,o,i,a,s,c,l,f=t.settings,d=t.getElement(),m=t.getDoc();f.inline||(t.getElement().style.visibility=t.orgVisibility),e||f.content_editable||(m.open(),m.write(t.iframeHTML),m.close()),f.content_editable&&(t.on("remove",function(){var e=this.getBody();vw.removeClass(e,"mce-content-body"),vw.removeClass(e,"mce-edit-focus"),vw.setAttrib(e,"contentEditable",null)}),vw.addClass(d,"mce-content-body"),t.contentDocument=m=f.content_document||V.document,t.contentWindow=f.content_window||V.window,t.bodyElement=d,f.content_document=f.content_window=null,f.root_name=d.nodeName.toLowerCase()),(n=t.getBody()).disabled=!0,t.readonly=f.readonly,t.readonly||(t.inline&&"static"===vw.getStyle(n,"position",!0)&&(n.style.position="relative"),n.contentEditable=t.getParam("content_editable_state",!0)),n.disabled=!1,t.editorUpload=Uh(t),t.schema=di(f),t.dom=Si(m,{keep_values:!0,url_converter:t.convertURL,url_converter_scope:t,hex_colors:f.force_hex_style_colors,class_filter:f.class_filter,update_styles:!0,root_element:t.inline?t.getBody():null,collect:f.content_editable,schema:t.schema,contentCssCors:zl(t),onSetAttrib:function(e){t.fire("SetAttrib",e)}}),t.parser=((o=pb((u=t).settings,u.schema)).addAttributeFilter("src,href,style,tabindex",function(e,t){for(var n,r,o,i=e.length,a=u.dom;i--;)if(r=(n=e[i]).attr(t),o="data-mce-"+t,!n.attributes.map[o]){if(0===r.indexOf("data:")||0===r.indexOf("blob:"))continue;"style"===t?((r=a.serializeStyle(a.parseStyle(r),n.name)).length||(r=null),n.attr(o,r),n.attr(t,r)):"tabindex"===t?(n.attr(o,r),n.attr(t,null)):n.attr(o,u.convertURL(r,t,n.name))}}),o.addNodeFilter("script",function(e){for(var t,n,r=e.length;r--;)0!==(n=(t=e[r]).attr("type")||"no/type").indexOf("mce-")&&t.attr("type","mce-"+n)}),o.addNodeFilter("#cdata",function(e){for(var t,n=e.length;n--;)(t=e[n]).type=8,t.name="#comment",t.value="[CDATA["+t.value+"]]"}),o.addNodeFilter("p,h1,h2,h3,h4,h5,h6,div",function(e){for(var t,n=e.length,r=u.schema.getNonEmptyElements();n--;)(t=e[n]).isEmpty(r)&&0===t.getAll("br").length&&(t.append(new ob("br",1)).shortEnded=!0)}),o),t.serializer=Cb(f,t),t.selection=aC(t.dom,t.getWin(),t.serializer,t),t.annotator=Hc(t),t.formatter=Wy(t),t.undoManager=Zv(t),t._nodeChangeDispatcher=new Gh(t),t._selectionOverrides=Av(t),hw(t),pw(t),dw(t),qh(t),t.fire("PreInit"),f.browser_spellcheck||f.gecko_spellcheck||(m.body.spellcheck=!1,vw.setAttrib(n,"spellcheck","false")),t.quirks=mw(t),t.fire("PostRender"),f.directionality&&(n.dir=f.directionality),f.nowrap&&(n.style.whiteSpace="nowrap"),f.protect&&t.on("BeforeSetContent",function(t){Xt.each(f.protect,function(e){t.content=t.content.replace(e,function(e){return"\x3c!--mce:protected "+escape(e)+"--\x3e"})})}),t.on("SetContent",function(){t.addVisual(t.getBody())}),t.load({initial:!0,format:"html"}),t.startContent=t.getContent({format:"raw"}),t.on("compositionstart compositionend",function(e){t.composing="compositionstart"===e.type}),0<t.contentStyles.length&&(r="",Xt.each(t.contentStyles,function(e){r+=e+"\r\n"}),t.dom.addStyle(r)),(i=t,i.inline?vw.styleSheetLoader:i.dom.styleSheetLoader).loadAll(t.contentCSS,function(e){yw(t)},function(e){yw(t)}),f.content_style&&(a=t,s=f.content_style,c=ar.fromDom(a.getDoc().head),l=ar.fromTag("style"),wr(l,"type","text/css"),Fi(l,ar.fromText(s)),Fi(c,l))},Cw=Si.DOM,xw=function(e,t){var n,r,o,i,a,u,s,c=e.editorManager.translate("Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help"),l=(n=e.id,r=c,o=t.height,i=hl(e),s=ar.fromTag("iframe"),Nr(s,i),Nr(s,{id:n+"_ifr",frameBorder:"0",allowTransparency:"true",title:r}),Tr(s,{width:"100%",height:(a=o,u="number"==typeof a?a+"px":a,u||""),display:"block"}),s).dom();l.onload=function(){l.onload=null,e.fire("load")};var f,d,m,g,p=function(e,t){if(V.document.domain!==V.window.location.hostname&&fe.ie&&fe.ie<12){var n=zh.uuid("mce");e[n]=function(){bw(e)};var r='javascript:(function(){document.open();document.domain="'+V.document.domain+'";var ed = window.parent.tinymce.get("'+e.id+'");document.write(ed.iframeHTML);document.close();ed.'+n+"(true);})()";return Cw.setAttrib(t,"src",r),!0}return!1}(e,l);return e.contentAreaContainer=t.iframeContainer,e.iframeElement=l,e.iframeHTML=(g=vl(f=e)+"<html><head>",yl(f)!==f.documentBaseUrl&&(g+='<base href="'+f.documentBaseURI.getURI()+'" />'),g+='<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />',d=bl(f),m=Cl(f),xl(f)&&(g+='<meta http-equiv="Content-Security-Policy" content="'+xl(f)+'" />'),g+='</head><body id="'+d+'" class="mce-content-body '+m+'" data-id="'+f.id+'"><br></body></html>'),Cw.add(t.iframeContainer,l),p},ww=function(e,t){var n=xw(e,t);t.editorContainer&&(Cw.get(t.editorContainer).style.display=e.orgDisplay,e.hidden=Cw.isHidden(t.editorContainer)),e.getElement().style.display="none",Cw.setAttrib(e.id,"aria-hidden","true"),n||bw(e)},Nw=Si.DOM,Ew=function(t,n,e){var r=Eh.get(e),o=Eh.urls[e]||t.documentBaseUrl.replace(/\/$/,"");if(e=Xt.trim(e),r&&-1===Xt.inArray(n,e)){if(Xt.each(Eh.dependencies(e),function(e){Ew(t,n,e)}),t.plugins[e])return;try{var i=new r(t,o,t.$);(t.plugins[e]=i).init&&(i.init(t,o),n.push(e))}catch(iE){Nh.pluginInitError(t,e,iE)}}},Sw=function(e){return e.replace(/^\-/,"")},Tw=function(e){return{editorContainer:e,iframeContainer:e}},kw=function(e){var t,n,r=e.getElement();return e.inline?Tw(null):(t=r,n=Nw.create("div"),Nw.insertAfter(n,t),Tw(n))},_w=function(e){var t,n,r,o,i,a,u,s,c,l,f,d=e.settings,m=e.getElement();return e.orgDisplay=m.style.display,S(d.theme)?(l=(o=e).settings,f=o.getElement(),i=l.width||Nw.getStyle(f,"width")||"100%",a=l.height||Nw.getStyle(f,"height")||f.offsetHeight,u=l.min_height||100,(s=/^[0-9\.]+(|px)$/i).test(""+i)&&(i=Math.max(parseInt(i,10),100)),s.test(""+a)&&(a=Math.max(parseInt(a,10),u)),c=o.theme.renderUI({targetNode:f,width:i,height:a,deltaWidth:l.delta_width,deltaHeight:l.delta_height}),l.content_editable||(a=(c.iframeHeight||a)+("number"==typeof a?c.deltaHeight||0:""))<u&&(a=u),c.height=a,c):D(d.theme)?(r=(t=e).getElement(),(n=t.settings.theme(t,r)).editorContainer.nodeType&&(n.editorContainer.id=n.editorContainer.id||t.id+"_parent"),n.iframeContainer&&n.iframeContainer.nodeType&&(n.iframeContainer.id=n.iframeContainer.id||t.id+"_iframecontainer"),n.height=n.iframeHeight?n.iframeHeight:r.offsetHeight,n):kw(e)},Aw=function(t){var e,n,r,o,i,a,u=t.settings,s=t.getElement();return t.rtl=u.rtl_ui||t.editorManager.i18n.rtl,t.editorManager.i18n.setCode(u.language),u.aria_label=u.aria_label||Nw.getAttrib(s,"aria-label",t.getLang("aria.rich_text_area")),t.fire("ScriptsLoaded"),o=(n=t).settings.theme,S(o)?(n.settings.theme=Sw(o),r=Sh.get(o),n.theme=new r(n,Sh.urls[o]),n.theme.init&&n.theme.init(n,Sh.urls[o]||n.documentBaseUrl.replace(/\/$/,""),n.$)):n.theme={},i=t,a=[],Xt.each(i.settings.plugins.split(/[ ,]/),function(e){Ew(i,a,Sw(e))}),e=_w(t),t.editorContainer=e.editorContainer?e.editorContainer:null,u.content_css&&Xt.each(Xt.explode(u.content_css),function(e){t.contentCSS.push(t.documentBaseURI.toAbsolute(e))}),u.content_editable?bw(t):ww(t,e)},Rw=Si.DOM,Dw=function(e){return"-"===e.charAt(0)},Ow=function(i,a){var u=Ri.ScriptLoader;!function(e,t,n,r){var o=t.settings,i=o.theme;if(S(i)){if(!Dw(i)&&!Sh.urls.hasOwnProperty(i)){var a=o.theme_url;a?Sh.load(i,t.documentBaseURI.toAbsolute(a)):Sh.load(i,"themes/"+i+"/theme"+n+".js")}e.loadQueue(function(){Sh.waitFor(i,r)})}else r()}(u,i,a,function(){var e,t,n,r,o;e=u,(n=(t=i).settings).language&&"en"!==n.language&&!n.language_url&&(n.language_url=t.editorManager.baseURL+"/langs/"+n.language+".js"),n.language_url&&!t.editorManager.i18n.data[n.language]&&e.add(n.language_url),r=i.settings,o=a,Xt.isArray(r.plugins)&&(r.plugins=r.plugins.join(" ")),Xt.each(r.external_plugins,function(e,t){Eh.load(t,e),r.plugins+=" "+t}),Xt.each(r.plugins.split(/[ ,]/),function(e){if((e=Xt.trim(e))&&!Eh.urls[e])if(Dw(e)){e=e.substr(1,e.length);var t=Eh.dependencies(e);Xt.each(t,function(e){var t={prefix:"plugins/",resource:e,suffix:"/plugin"+o+".js"};e=Eh.createUrl(t,e),Eh.load(e.resource,e)})}else Eh.load(e,{prefix:"plugins/",resource:e,suffix:"/plugin"+o+".js"})}),u.loadQueue(function(){i.removed||Aw(i)},i,function(e){Nh.pluginLoadError(i,e[0]),i.removed||Aw(i)})})},Bw=function(t){var e=t.settings,n=t.id,r=function(){Rw.unbind(V.window,"ready",r),t.render()};if(Se.Event.domLoaded){if(t.getElement()&&fe.contentEditable){e.inline?t.inline=!0:(t.orgVisibility=t.getElement().style.visibility,t.getElement().style.visibility="hidden");var o=t.getElement().form||Rw.getParent(n,"form");o&&(t.formElement=o,e.hidden_input&&!/TEXTAREA|INPUT/i.test(t.getElement().nodeName)&&(Rw.insertAfter(Rw.create("input",{type:"hidden",name:n}),n),t.hasHiddenInput=!0),t.formEventDelegate=function(e){t.fire(e.type,e)},Rw.bind(o,"submit reset",t.formEventDelegate),t.on("reset",function(){t.setContent(t.startContent,{format:"raw"})}),!e.submit_patch||o.submit.nodeType||o.submit.length||o._mceOldSubmit||(o._mceOldSubmit=o.submit,o.submit=function(){return t.editorManager.triggerSave(),t.setDirty(!1),o._mceOldSubmit(o)})),t.windowManager=gh(t),t.notificationManager=mh(t),"xml"===e.encoding&&t.on("GetContent",function(e){e.save&&(e.content=Rw.encode(e.content))}),e.add_form_submit_trigger&&t.on("submit",function(){t.initialized&&t.save()}),e.add_unload_trigger&&(t._beforeUnload=function(){!t.initialized||t.destroyed||t.isHidden()||t.save({format:"raw",no_events:!0,set_dirty:!1})},t.editorManager.on("BeforeUnload",t._beforeUnload)),t.editorManager.add(t),Ow(t,t.suffix)}}else Rw.bind(V.window,"ready",r)},Pw=function(e,t,n){var r=e.sidebars?e.sidebars:[];r.push({name:t,settings:n}),e.sidebars=r},Iw=Xt.each,Lw=Xt.trim,Fw="source protocol authority userInfo user password host port relative path directory file query anchor".split(" "),Mw={ftp:21,http:80,https:443,mailto:25},zw=function(r,e){var t,n,o=this;if(r=Lw(r),t=(e=o.settings=e||{}).base_uri,/^([\w\-]+):([^\/]{2})/i.test(r)||/^\s*#/.test(r))o.source=r;else{var i=0===r.indexOf("//");0!==r.indexOf("/")||i||(r=(t&&t.protocol||"http")+"://mce_host"+r),/^[\w\-]*:?\/\//.test(r)||(n=e.base_uri?e.base_uri.path:new zw(V.document.location.href).directory,""==e.base_uri.protocol?r="//mce_host"+o.toAbsPath(n,r):(r=/([^#?]*)([#?]?.*)/.exec(r),r=(t&&t.protocol||"http")+"://mce_host"+o.toAbsPath(n,r[1])+r[2])),r=r.replace(/@@/g,"(mce_at)"),r=/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@\/]*):?([^:@\/]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(r),Iw(Fw,function(e,t){var n=r[t];n&&(n=n.replace(/\(mce_at\)/g,"@@")),o[e]=n}),t&&(o.protocol||(o.protocol=t.protocol),o.userInfo||(o.userInfo=t.userInfo),o.port||"mce_host"!==o.host||(o.port=t.port),o.host&&"mce_host"!==o.host||(o.host=t.host),o.source=""),i&&(o.protocol="")}};zw.prototype={setPath:function(e){e=/^(.*?)\/?(\w+)?$/.exec(e),this.path=e[0],this.directory=e[1],this.file=e[2],this.source="",this.getURI()},toRelative:function(e){var t;if("./"===e)return e;if("mce_host"!==(e=new zw(e,{base_uri:this})).host&&this.host!==e.host&&e.host||this.port!==e.port||this.protocol!==e.protocol&&""!==e.protocol)return e.getURI();var n=this.getURI(),r=e.getURI();return n===r||"/"===n.charAt(n.length-1)&&n.substr(0,n.length-1)===r?n:(t=this.toRelPath(this.path,e.path),e.query&&(t+="?"+e.query),e.anchor&&(t+="#"+e.anchor),t)},toAbsolute:function(e,t){return(e=new zw(e,{base_uri:this})).getURI(t&&this.isSameOrigin(e))},isSameOrigin:function(e){if(this.host==e.host&&this.protocol==e.protocol){if(this.port==e.port)return!0;var t=Mw[this.protocol];if(t&&(this.port||t)==(e.port||t))return!0}return!1},toRelPath:function(e,t){var n,r,o,i=0,a="";if(e=(e=e.substring(0,e.lastIndexOf("/"))).split("/"),n=t.split("/"),e.length>=n.length)for(r=0,o=e.length;r<o;r++)if(r>=n.length||e[r]!==n[r]){i=r+1;break}if(e.length<n.length)for(r=0,o=n.length;r<o;r++)if(r>=e.length||e[r]!==n[r]){i=r+1;break}if(1===i)return t;for(r=0,o=e.length-(i-1);r<o;r++)a+="../";for(r=i-1,o=n.length;r<o;r++)a+=r!==i-1?"/"+n[r]:n[r];return a},toAbsPath:function(e,t){var n,r,o,i=0,a=[];for(r=/\/$/.test(t)?"/":"",e=e.split("/"),t=t.split("/"),Iw(e,function(e){e&&a.push(e)}),e=a,n=t.length-1,a=[];0<=n;n--)0!==t[n].length&&"."!==t[n]&&(".."!==t[n]?0<i?i--:a.push(t[n]):i++);return 0!==(o=(n=e.length-i)<=0?a.reverse().join("/"):e.slice(0,n).join("/")+"/"+a.reverse().join("/")).indexOf("/")&&(o="/"+o),r&&o.lastIndexOf("/")!==o.length-1&&(o+=r),o},getURI:function(e){var t,n=this;return n.source&&!e||(t="",e||(n.protocol?t+=n.protocol+"://":t+="//",n.userInfo&&(t+=n.userInfo+"@"),n.host&&(t+=n.host),n.port&&(t+=":"+n.port)),n.path&&(t+=n.path),n.query&&(t+="?"+n.query),n.anchor&&(t+="#"+n.anchor),n.source=t),n.source}},zw.parseDataUri=function(e){var t,n;return e=decodeURIComponent(e).split(","),(n=/data:([^;]+)/.exec(e[0]))&&(t=n[1]),{type:t,data:e[1]}},zw.getDocumentBaseUrl=function(e){var t;return t=0!==e.protocol.indexOf("http")&&"file:"!==e.protocol?e.href:e.protocol+"//"+e.host+e.pathname,/^[^:]+:\/\/\/?[^\/]+\//.test(t)&&(t=t.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,""),/[\/\\]$/.test(t)||(t+="/")),t};var Uw=function(e,t,n){var r,o,i,a,u;if(t.format=t.format?t.format:"html",t.get=!0,t.getInner=!0,t.no_events||e.fire("BeforeGetContent",t),"raw"===t.format)r=Xt.trim(Lv.trimExternal(e.serializer,n.innerHTML));else if("text"===t.format)r=wa(n.innerText||n.textContent);else{if("tree"===t.format)return e.serializer.serialize(n,t);i=(o=e).serializer.serialize(n,t),a=Nl(o),u=new RegExp("^(<"+a+"[^>]*>(&nbsp;|&#160;|\\s|\xa0|<br \\/>|)<\\/"+a+">[\r\n]*|<br \\/>[\r\n]*)$"),r=i.replace(u,"")}return"text"===t.format||Ao(ar.fromDom(n))?t.content=r:t.content=Xt.trim(r),t.no_events||e.fire("GetContent",t),t.content},jw=function(e,t){t(e),e.firstChild&&jw(e.firstChild,t),e.next&&jw(e.next,t)},Vw=function(e,t,n){var r=function(e,n,t){var r={},o={},i=[];for(var a in t.firstChild&&jw(t.firstChild,function(t){z(e,function(e){e.name===t.name&&(r[e.name]?r[e.name].nodes.push(t):r[e.name]={filter:e,nodes:[t]})}),z(n,function(e){"string"==typeof t.attr(e.name)&&(o[e.name]?o[e.name].nodes.push(t):o[e.name]={filter:e,nodes:[t]})})}),r)r.hasOwnProperty(a)&&i.push(r[a]);for(var a in o)o.hasOwnProperty(a)&&i.push(o[a]);return i}(e,t,n);z(r,function(t){z(t.filter.callbacks,function(e){e(t.nodes,t.filter.name,{})})})},Hw=function(e){return e instanceof ob},qw=function(e,t){var r;e.dom.setHTML(e.getBody(),t),oh(r=e)&&sc.firstPositionIn(r.getBody()).each(function(e){var t=e.getNode(),n=jo.isTable(t)?sc.firstPositionIn(t).getOr(e):e;r.selection.setRng(n.toRange())})},$w=function(u,s,c){return void 0===c&&(c={}),c.format=c.format?c.format:"html",c.set=!0,c.content=Hw(s)?"":s,Hw(s)||c.no_events||(u.fire("BeforeSetContent",c),s=c.content),_.from(u.getBody()).fold(q(s),function(e){return Hw(s)?function(e,t,n,r){Vw(e.parser.getNodeFilters(),e.parser.getAttributeFilters(),n);var o=al({validate:e.validate},e.schema).serialize(n);return r.content=Ao(ar.fromDom(t))?o:Xt.trim(o),qw(e,r.content),r.no_events||e.fire("SetContent",r),n}(u,e,s,c):(t=u,n=e,o=c,0===(r=s).length||/^\s+$/.test(r)?(a='<br data-mce-bogus="1">',"TABLE"===n.nodeName?r="<tr><td>"+a+"</td></tr>":/^(UL|OL)$/.test(n.nodeName)&&(r="<li>"+a+"</li>"),(i=Nl(t))&&t.schema.isValidChild(n.nodeName.toLowerCase(),i.toLowerCase())?(r=a,r=t.dom.createHTML(i,t.settings.forced_root_block_attrs,r)):r||(r='<br data-mce-bogus="1">'),qw(t,r),t.fire("SetContent",o)):("raw"!==o.format&&(r=al({validate:t.validate},t.schema).serialize(t.parser.parse(r,{isRootContent:!0,insert:!0}))),o.content=Ao(ar.fromDom(n))?r:Xt.trim(r),qw(t,o.content),o.no_events||t.fire("SetContent",o)),o.content);var t,n,r,o,i,a})},Ww=Si.DOM,Kw=function(e){return _.from(e).each(function(e){return e.destroy()})},Xw=function(e){if(!e.removed){var t=e._selectionOverrides,n=e.editorUpload,r=e.getBody(),o=e.getElement();r&&e.save({is_removing:!0}),e.removed=!0,e.unbindAllNativeEvents(),e.hasHiddenInput&&o&&Ww.remove(o.nextSibling),bp(e),e.editorManager.remove(e),!e.inline&&r&&(i=e,Ww.setStyle(i.id,"display",i.orgDisplay)),Cp(e),Ww.remove(e.getContainer()),Kw(t),Kw(n),e.destroy()}var i},Yw=function(e,t){var n,r,o,i=e.selection,a=e.dom;e.destroyed||(t||e.removed?(t||(e.editorManager.off("beforeunload",e._beforeUnload),e.theme&&e.theme.destroy&&e.theme.destroy(),Kw(i),Kw(a)),(r=(n=e).formElement)&&(r._mceOldSubmit&&(r.submit=r._mceOldSubmit,r._mceOldSubmit=null),Ww.unbind(r,"submit reset",n.formEventDelegate)),(o=e).contentAreaContainer=o.formElement=o.container=o.editorContainer=null,o.bodyElement=o.contentDocument=o.contentWindow=null,o.iframeElement=o.targetElm=null,o.selection&&(o.selection=o.selection.win=o.selection.dom=o.selection.dom.doc=null),e.destroyed=!0):e.remove())},Gw=Si.DOM,Jw=Xt.extend,Qw=Xt.each,Zw=Xt.resolve,eN=fe.ie,tN=function(e,t,n){var r,o,i,a,u,s,c,l=this,f=l.documentBaseUrl=n.documentBaseURL,d=n.baseURI;r=l,o=e,i=f,a=n.defaultSettings,u=t,c={id:o,theme:"modern",delta_width:0,delta_height:0,popup_css:"",plugins:"",document_base_url:i,add_form_submit_trigger:!0,submit_patch:!0,add_unload_trigger:!0,convert_urls:!0,relative_urls:!0,remove_script_host:!0,object_resizing:!0,doctype:"<!DOCTYPE html>",visual:!0,font_size_style_values:"xx-small,x-small,small,medium,large,x-large,xx-large",font_size_legacy_values:"xx-small,small,medium,large,x-large,xx-large,300%",forced_root_block:"p",hidden_input:!0,render_ui:!0,indentation:"40px",inline_styles:!0,convert_fonts_to_spans:!0,indent:"simple",indent_before:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,th,ul,ol,li,dl,dt,dd,area,table,thead,tfoot,tbody,tr,section,summary,article,hgroup,aside,figure,figcaption,option,optgroup,datalist",indent_after:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,th,ul,ol,li,dl,dt,dd,area,table,thead,tfoot,tbody,tr,section,summary,article,hgroup,aside,figure,figcaption,option,optgroup,datalist",entity_encoding:"named",url_converter:(s=r).convertURL,url_converter_scope:s,ie7_compat:!0},t=jp(Ip,c,a,u),l.settings=t,Bi.language=t.language||"en",Bi.languageLoad=t.language_load,Bi.baseURL=n.baseURL,l.id=e,l.setDirty(!1),l.plugins={},l.documentBaseURI=new zw(t.document_base_url,{base_uri:d}),l.baseURI=d,l.contentCSS=[],l.contentStyles=[],l.shortcuts=new Xp(l),l.loadedCSS={},l.editorCommands=new fp(l),l.suffix=n.suffix,l.editorManager=n,l.inline=t.inline,l.buttons={},l.menuItems={},t.cache_suffix&&(fe.cacheSuffix=t.cache_suffix.replace(/^[\?\&]+/,"")),!1===t.override_viewport&&(fe.overrideViewPort=!1),n.fire("SetupEditor",{editor:l}),l.execCallback("setup",l),l.$=gn.overrideDefaults(function(){return{context:l.inline?l.getBody():l.getDoc(),element:l.getBody()}})};Jw(tN.prototype={render:function(){Bw(this)},focus:function(e){rh(this,e)},hasFocus:function(){return oh(this)},execCallback:function(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];var r,o=this.settings[e];if(o)return this.callbackLookup&&(r=this.callbackLookup[e])&&(o=r.func,r=r.scope),"string"==typeof o&&(r=(r=o.replace(/\.\w+$/,""))?Zw(r):0,o=Zw(o),this.callbackLookup=this.callbackLookup||{},this.callbackLookup[e]={func:o,scope:r}),o.apply(r||this,Array.prototype.slice.call(arguments,1))},translate:function(e){if(e&&Xt.is(e,"string")){var n=this.settings.language||"en",r=this.editorManager.i18n;e=r.data[n+"."+e]||e.replace(/\{\#([^\}]+)\}/g,function(e,t){return r.data[n+"."+t]||"{#"+t+"}"})}return this.editorManager.translate(e)},getLang:function(e,t){return this.editorManager.i18n.data[(this.settings.language||"en")+"."+e]||(t!==undefined?t:"{#"+e+"}")},getParam:function(e,t,n){return Hp(this,e,t,n)},nodeChanged:function(e){this._nodeChangeDispatcher.nodeChanged(e)},addButton:function(e,t){var n=this;t.cmd&&(t.onclick=function(){n.execCommand(t.cmd)}),t.stateSelector&&"undefined"==typeof t.active&&(t.active=!1),t.text||t.icon||(t.icon=e),t.tooltip=t.tooltip||t.title,n.buttons[e]=t},addSidebar:function(e,t){return Pw(this,e,t)},addMenuItem:function(e,t){var n=this;t.cmd&&(t.onclick=function(){n.execCommand(t.cmd)}),n.menuItems[e]=t},addContextToolbar:function(e,t){var n,r=this;r.contextToolbars=r.contextToolbars||[],"string"==typeof e&&(n=e,e=function(e){return r.dom.is(e,n)}),r.contextToolbars.push({id:zh.uuid("mcet"),predicate:e,items:t})},addCommand:function(e,t,n){this.editorCommands.addCommand(e,t,n)},addQueryStateHandler:function(e,t,n){this.editorCommands.addQueryStateHandler(e,t,n)},addQueryValueHandler:function(e,t,n){this.editorCommands.addQueryValueHandler(e,t,n)},addShortcut:function(e,t,n,r){this.shortcuts.add(e,t,n,r)},execCommand:function(e,t,n,r){return this.editorCommands.execCommand(e,t,n,r)},queryCommandState:function(e){return this.editorCommands.queryCommandState(e)},queryCommandValue:function(e){return this.editorCommands.queryCommandValue(e)},queryCommandSupported:function(e){return this.editorCommands.queryCommandSupported(e)},show:function(){this.hidden&&(this.hidden=!1,this.inline?this.getBody().contentEditable=!0:(Gw.show(this.getContainer()),Gw.hide(this.id)),this.load(),this.fire("show"))},hide:function(){var e=this,t=e.getDoc();e.hidden||(eN&&t&&!e.inline&&t.execCommand("SelectAll"),e.save(),e.inline?(e.getBody().contentEditable=!1,e===e.editorManager.focusedEditor&&(e.editorManager.focusedEditor=null)):(Gw.hide(e.getContainer()),Gw.setStyle(e.id,"display",e.orgDisplay)),e.hidden=!0,e.fire("hide"))},isHidden:function(){return!!this.hidden},setProgressState:function(e,t){this.fire("ProgressState",{state:e,time:t})},load:function(e){var t,n=this.getElement();return this.removed?"":n?((e=e||{}).load=!0,t=this.setContent(n.value!==undefined?n.value:n.innerHTML,e),e.element=n,e.no_events||this.fire("LoadContent",e),e.element=n=null,t):void 0},save:function(e){var t,n,r=this,o=r.getElement();if(o&&r.initialized&&!r.removed)return(e=e||{}).save=!0,e.element=o,e.content=r.getContent(e),e.no_events||r.fire("SaveContent",e),"raw"===e.format&&r.fire("RawSaveContent",e),t=e.content,/TEXTAREA|INPUT/i.test(o.nodeName)?o.value=t:(!e.is_removing&&r.inline||(o.innerHTML=t),(n=Gw.getParent(r.id,"form"))&&Qw(n.elements,function(e){if(e.name===r.id)return e.value=t,!1})),e.element=o=null,!1!==e.set_dirty&&r.setDirty(!1),t},setContent:function(e,t){return $w(this,e,t)},getContent:function(e){return t=this,void 0===(n=e)&&(n={}),_.from(t.getBody()).fold(q("tree"===n.format?new ob("body",11):""),function(e){return Uw(t,n,e)});var t,n},insertContent:function(e,t){t&&(e=Jw({content:e},t)),this.execCommand("mceInsertContent",!1,e)},isDirty:function(){return!this.isNotDirty},setDirty:function(e){var t=!this.isNotDirty;this.isNotDirty=!e,e&&e!==t&&this.fire("dirty")},setMode:function(e){var t,n;(n=e)!==kp(t=this)&&(t.initialized?Tp(t,"readonly"===n):t.on("init",function(){Tp(t,"readonly"===n)}),xp(t,n))},getContainer:function(){return this.container||(this.container=Gw.get(this.editorContainer||this.id+"_parent")),this.container},getContentAreaContainer:function(){return this.contentAreaContainer},getElement:function(){return this.targetElm||(this.targetElm=Gw.get(this.id)),this.targetElm},getWin:function(){var e;return this.contentWindow||(e=this.iframeElement)&&(this.contentWindow=e.contentWindow),this.contentWindow},getDoc:function(){var e;return this.contentDocument||(e=this.getWin())&&(this.contentDocument=e.document),this.contentDocument},getBody:function(){var e=this.getDoc();return this.bodyElement||(e?e.body:null)},convertURL:function(e,t,n){var r=this.settings;return r.urlconverter_callback?this.execCallback("urlconverter_callback",e,n,!0,t):!r.convert_urls||n&&"LINK"===n.nodeName||0===e.indexOf("file:")||0===e.length?e:r.relative_urls?this.documentBaseURI.toRelative(e):e=this.documentBaseURI.toAbsolute(e,r.remove_script_host)},addVisual:function(e){var n,r=this,o=r.settings,i=r.dom;e=e||r.getBody(),r.hasVisual===undefined&&(r.hasVisual=o.visual),Qw(i.select("table,a",e),function(e){var t;switch(e.nodeName){case"TABLE":return n=o.visual_table_class||"mce-item-table",void((t=i.getAttrib(e,"border"))&&"0"!==t||!r.hasVisual?i.removeClass(e,n):i.addClass(e,n));case"A":return void(i.getAttrib(e,"href")||(t=i.getAttrib(e,"name")||e.id,n=o.visual_anchor_class||"mce-item-anchor",t&&r.hasVisual?i.addClass(e,n):i.removeClass(e,n)))}}),r.fire("VisualAid",{element:e,hasVisual:r.hasVisual})},remove:function(){Xw(this)},destroy:function(e){Yw(this,e)},uploadImages:function(e){return this.editorUpload.uploadImages(e)},_scanForImages:function(){return this.editorUpload.scanForImages()}},Bp);var nN,rN,oN,iN={isEditorUIElement:function(e){return-1!==e.className.toString().indexOf("mce-")}},aN=function(n,e){var t,r;or.detect().browser.isIE()?(r=n).on("focusout",function(){tp(r)}):(t=e,n.on("mouseup touchend",function(e){t.throttle()})),n.on("keyup nodechange",function(e){var t;"nodechange"===(t=e).type&&t.selectionChange||tp(n)})},uN=function(e){var t,n,r,o=Vi(function(){tp(e)},0);e.inline&&(t=e,n=o,r=function(){n.throttle()},Si.DOM.bind(V.document,"mouseup",r),t.on("remove",function(){Si.DOM.unbind(V.document,"mouseup",r)})),e.on("init",function(){aN(e,o)}),e.on("remove",function(){o.cancel()})},sN=Si.DOM,cN=function(e){return iN.isEditorUIElement(e)},lN=function(t,e){var n=t?t.settings.custom_ui_selector:"";return null!==sN.getParent(e,function(e){return cN(e)||!!n&&t.dom.is(e,n)})},fN=function(r,e){var t=e.editor;uN(t),t.on("focusin",function(){var e=r.focusedEditor;e!==this&&(e&&e.fire("blur",{focusedEditor:this}),r.setActive(this),(r.focusedEditor=this).fire("focus",{blurredEditor:e}),this.focus(!0))}),t.on("focusout",function(){var t=this;he.setEditorTimeout(t,function(){var e=r.focusedEditor;lN(t,function(){try{return V.document.activeElement}catch(e){return V.document.body}}())||e!==t||(t.fire("blur",{focusedEditor:null}),r.focusedEditor=null)})}),nN||(nN=function(e){var t,n=r.activeEditor;t=e.target,n&&t.ownerDocument===V.document&&(t===V.document.body||lN(n,t)||r.focusedEditor!==n||(n.fire("blur",{focusedEditor:null}),r.focusedEditor=null))},sN.bind(V.document,"focusin",nN))},dN=function(e,t){e.focusedEditor===t.editor&&(e.focusedEditor=null),e.activeEditor||(sN.unbind(V.document,"focusin",nN),nN=null)},mN=function(e){e.on("AddEditor",d(fN,e)),e.on("RemoveEditor",d(dN,e))},gN=Si.DOM,pN=Xt.explode,hN=Xt.each,vN=Xt.extend,yN=0,bN=!1,CN=[],xN=[],wN=function(t){var n=t.type;hN(oN.get(),function(e){switch(n){case"scroll":e.fire("ScrollWindow",t);break;case"resize":e.fire("ResizeWindow",t)}})},NN=function(e){e!==bN&&(e?gn(window).on("resize scroll",wN):gn(window).off("resize scroll",wN),bN=e)},EN=function(t){var e=xN;delete CN[t.id];for(var n=0;n<CN.length;n++)if(CN[n]===t){CN.splice(n,1);break}return xN=U(xN,function(e){return t!==e}),oN.activeEditor===t&&(oN.activeEditor=0<xN.length?xN[0]:null),oN.focusedEditor===t&&(oN.focusedEditor=null),e.length!==xN.length};vN(oN={defaultSettings:{},$:gn,majorVersion:"4",minorVersion:"9.10",releaseDate:"2020-04-23",editors:CN,i18n:vh,activeEditor:null,settings:{},setup:function(){var e,t,n="";t=zw.getDocumentBaseUrl(V.document.location),/^[^:]+:\/\/\/?[^\/]+\//.test(t)&&(t=t.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,""),/[\/\\]$/.test(t)||(t+="/"));var r=window.tinymce||window.tinyMCEPreInit;if(r)e=r.base||r.baseURL,n=r.suffix;else{for(var o=V.document.getElementsByTagName("script"),i=0;i<o.length;i++){var a;if(""!==(a=o[i].src||"")){var u=a.substring(a.lastIndexOf("/"));if(/tinymce(\.full|\.jquery|)(\.min|\.dev|)\.js/.test(a)){-1!==u.indexOf(".min")&&(n=".min"),e=a.substring(0,a.lastIndexOf("/"));break}}}!e&&V.document.currentScript&&(-1!==(a=V.document.currentScript.src).indexOf(".min")&&(n=".min"),e=a.substring(0,a.lastIndexOf("/")))}this.baseURL=new zw(t).toAbsolute(e),this.documentBaseURL=t,this.baseURI=new zw(this.baseURL),this.suffix=n,mN(this)},overrideDefaults:function(e){var t,n;(t=e.base_url)&&(this.baseURL=new zw(this.documentBaseURL).toAbsolute(t.replace(/\/+$/,"")),this.baseURI=new zw(this.baseURL)),n=e.suffix,e.suffix&&(this.suffix=n);var r=(this.defaultSettings=e).plugin_base_urls;for(var o in r)Bi.PluginManager.urls[o]=r[o]},init:function(r){var n,u,s=this;u=Xt.makeMap("area base basefont br col frame hr img input isindex link meta param embed source wbr track colgroup option tbody tfoot thead tr script noscript style textarea video audio iframe object menu"," ");var c=function(e){var t=e.id;return t||(t=(t=e.name)&&!gN.get(t)?e.name:gN.uniqueId(),e.setAttribute("id",t)),t},l=function(e,t){return t.constructor===RegExp?t.test(e.className):gN.hasClass(e,t)},f=function(e){n=e},e=function(){var o,i=0,a=[],n=function(e,t,n){var r=new tN(e,t,s);a.push(r),r.on("init",function(){++i===o.length&&f(a)}),r.targetElm=r.targetElm||n,r.render()};gN.unbind(window,"ready",e),function(e){var t=r[e];t&&t.apply(s,Array.prototype.slice.call(arguments,2))}("onpageload"),o=gn.unique(function(t){var e,n=[];if(fe.ie&&fe.ie<11)return Nh.initError("TinyMCE does not support the browser you are using. For a list of supported browsers please see: https://www.tinymce.com/docs/get-started/system-requirements/"),[];if(t.types)return hN(t.types,function(e){n=n.concat(gN.select(e.selector))}),n;if(t.selector)return gN.select(t.selector);if(t.target)return[t.target];switch(t.mode){case"exact":0<(e=t.elements||"").length&&hN(pN(e),function(t){var e;(e=gN.get(t))?n.push(e):hN(V.document.forms,function(e){hN(e.elements,function(e){e.name===t&&(t="mce_editor_"+yN++,gN.setAttrib(e,"id",t),n.push(e))})})});break;case"textareas":case"specific_textareas":hN(gN.select("textarea"),function(e){t.editor_deselector&&l(e,t.editor_deselector)||t.editor_selector&&!l(e,t.editor_selector)||n.push(e)})}return n}(r)),r.types?hN(r.types,function(t){Xt.each(o,function(e){return!gN.is(e,t.selector)||(n(c(e),vN({},r,t),e),!1)})}):(Xt.each(o,function(e){var t;(t=s.get(e.id))&&t.initialized&&!(t.getContainer()||t.getBody()).parentNode&&(EN(t),t.unbindAllNativeEvents(),t.destroy(!0),t.removed=!0,t=null)}),0===(o=Xt.grep(o,function(e){return!s.get(e.id)})).length?f([]):hN(o,function(e){var t;t=e,r.inline&&t.tagName.toLowerCase()in u?Nh.initError("Could not initialize inline editor on invalid inline target element",e):n(c(e),r,e)}))};return s.settings=r,gN.bind(window,"ready",e),new de(function(t){n?t(n):f=function(e){t(e)}})},get:function(t){return 0===arguments.length?xN.slice(0):S(t)?X(xN,function(e){return e.id===t}).getOr(null):O(t)&&xN[t]?xN[t]:null},add:function(e){var t=this;return CN[e.id]===e||(null===t.get(e.id)&&("length"!==e.id&&(CN[e.id]=e),CN.push(e),xN.push(e)),NN(!0),t.activeEditor=e,t.fire("AddEditor",{editor:e}),rN||(rN=function(){t.fire("BeforeUnload")},gN.bind(window,"beforeunload",rN))),e},createEditor:function(e,t){return this.add(new tN(e,t,this))},remove:function(e){var t,n,r=this;if(e){if(!S(e))return n=e,A(r.get(n.id))?null:(EN(n)&&r.fire("RemoveEditor",{editor:n}),0===xN.length&&gN.unbind(window,"beforeunload",rN),n.remove(),NN(0<xN.length),n);hN(gN.select(e),function(e){(n=r.get(e.id))&&r.remove(n)})}else for(t=xN.length-1;0<=t;t--)r.remove(xN[t])},execCommand:function(e,t,n){var r=this.get(n);switch(e){case"mceAddEditor":return this.get(n)||new tN(n,this.settings,this).render(),!0;case"mceRemoveEditor":return r&&r.remove(),!0;case"mceToggleEditor":return r?r.isHidden()?r.show():r.hide():this.execCommand("mceAddEditor",0,n),!0}return!!this.activeEditor&&this.activeEditor.execCommand(e,t,n)},triggerSave:function(){hN(xN,function(e){e.save()})},addI18n:function(e,t){vh.add(e,t)},translate:function(e){return vh.translate(e)},setActive:function(e){var t=this.activeEditor;this.activeEditor!==e&&(t&&t.fire("deactivate",{relatedTarget:e}),e.fire("activate",{relatedTarget:t})),this.activeEditor=e}},hp),oN.setup();var SN,TN=oN;function kN(n){return{walk:function(e,t){return Lc(n,e,t)},split:Um,normalize:function(t){return kg(n,t).fold(q(!1),function(e){return t.setStart(e.startContainer,e.startOffset),t.setEnd(e.endContainer,e.endOffset),!0})}}}(SN=kN||(kN={})).compareRanges=Cg,SN.getCaretRangeFromPoint=Ob,SN.getSelectedNode=Za,SN.getNode=eu;var _N,AN,RN=kN,DN=Math.min,ON=Math.max,BN=Math.round,PN=function(e,t,n){var r,o,i,a,u,s;return r=t.x,o=t.y,i=e.w,a=e.h,u=t.w,s=t.h,"b"===(n=(n||"").split(""))[0]&&(o+=s),"r"===n[1]&&(r+=u),"c"===n[0]&&(o+=BN(s/2)),"c"===n[1]&&(r+=BN(u/2)),"b"===n[3]&&(o-=a),"r"===n[4]&&(r-=i),"c"===n[3]&&(o-=BN(a/2)),"c"===n[4]&&(r-=BN(i/2)),IN(r,o,i,a)},IN=function(e,t,n,r){return{x:e,y:t,w:n,h:r}},LN={inflate:function(e,t,n){return IN(e.x-t,e.y-n,e.w+2*t,e.h+2*n)},relativePosition:PN,findBestRelativePosition:function(e,t,n,r){var o,i;for(i=0;i<r.length;i++)if((o=PN(e,t,r[i])).x>=n.x&&o.x+o.w<=n.w+n.x&&o.y>=n.y&&o.y+o.h<=n.h+n.y)return r[i];return null},intersect:function(e,t){var n,r,o,i;return n=ON(e.x,t.x),r=ON(e.y,t.y),o=DN(e.x+e.w,t.x+t.w),i=DN(e.y+e.h,t.y+t.h),o-n<0||i-r<0?null:IN(n,r,o-n,i-r)},clamp:function(e,t,n){var r,o,i,a,u,s,c,l,f,d;return u=e.x,s=e.y,c=e.x+e.w,l=e.y+e.h,f=t.x+t.w,d=t.y+t.h,r=ON(0,t.x-u),o=ON(0,t.y-s),i=ON(0,c-f),a=ON(0,l-d),u+=r,s+=o,n&&(c+=r,l+=o,u-=i,s-=a),IN(u,s,(c-=i)-u,(l-=a)-s)},create:IN,fromClientRect:function(e){return IN(e.left,e.top,e.width,e.height)}},FN={},MN={add:function(e,t){FN[e.toLowerCase()]=t},has:function(e){return!!FN[e.toLowerCase()]},get:function(e){var t=e.toLowerCase(),n=FN.hasOwnProperty(t)?FN[t]:null;if(null===n)throw new Error("Could not find module for type: "+e);return n},create:function(e,t){var n;if("string"==typeof e?(t=t||{}).type=e:e=(t=e).type,e=e.toLowerCase(),!(n=FN[e]))throw new Error("Could not find control by type: "+e);return(n=new n(t)).type=e,n}},zN=Xt.each,UN=Xt.extend,jN=function(){};jN.extend=_N=function(n){var e,t,r,o=this.prototype,i=function(){var e,t,n;if(!AN&&(this.init&&this.init.apply(this,arguments),t=this.Mixins))for(e=t.length;e--;)(n=t[e]).init&&n.init.apply(this,arguments)},a=function(){return this},u=function(n,r){return function(){var e,t=this._super;return this._super=o[n],e=r.apply(this,arguments),this._super=t,e}};for(t in AN=!0,e=new this,AN=!1,n.Mixins&&(zN(n.Mixins,function(e){for(var t in e)"init"!==t&&(n[t]=e[t])}),o.Mixins&&(n.Mixins=o.Mixins.concat(n.Mixins))),n.Methods&&zN(n.Methods.split(","),function(e){n[e]=a}),n.Properties&&zN(n.Properties.split(","),function(e){var t="_"+e;n[e]=function(e){return e!==undefined?(this[t]=e,this):this[t]}}),n.Statics&&zN(n.Statics,function(e,t){i[t]=e}),n.Defaults&&o.Defaults&&(n.Defaults=UN({},o.Defaults,n.Defaults)),n)"function"==typeof(r=n[t])&&o[t]?e[t]=u(t,r):e[t]=r;return i.prototype=e,(i.constructor=i).extend=_N,i};var VN=Math.min,HN=Math.max,qN=Math.round,$N=function(e,n){var r,o,t,i;if(n=n||'"',null===e)return"null";if("string"==(t=typeof e))return o="\bb\tt\nn\ff\rr\"\"''\\\\",n+e.replace(/([\u0080-\uFFFF\x00-\x1f\"\'\\])/g,function(e,t){return'"'===n&&"'"===e?e:(r=o.indexOf(t))+1?"\\"+o.charAt(r+1):(e=t.charCodeAt().toString(16),"\\u"+"0000".substring(e.length)+e)})+n;if("object"===t){if(e.hasOwnProperty&&"[object Array]"===Object.prototype.toString.call(e)){for(r=0,o="[";r<e.length;r++)o+=(0<r?",":"")+$N(e[r],n);return o+"]"}for(i in o="{",e)e.hasOwnProperty(i)&&(o+="function"!=typeof e[i]?(1<o.length?","+n:n)+i+n+":"+$N(e[i],n):"");return o+"}"}return""+e},WN={serialize:$N,parse:function(e){try{return JSON.parse(e)}catch(t){}}},KN={callbacks:{},count:0,send:function(t){var n=this,r=Si.DOM,o=t.count!==undefined?t.count:n.count,i="tinymce_jsonp_"+o;n.callbacks[o]=function(e){r.remove(i),delete n.callbacks[o],t.callback(e)},r.add(r.doc.body,"script",{id:i,src:t.url,type:"text/javascript"}),n.count++}},XN={send:function(e){var t,n=0,r=function(){!e.async||4===t.readyState||1e4<n++?(e.success&&n<1e4&&200===t.status?e.success.call(e.success_scope,""+t.responseText,t,e):e.error&&e.error.call(e.error_scope,1e4<n?"TIMED_OUT":"GENERAL",t,e),t=null):setTimeout(r,10)};if(e.scope=e.scope||this,e.success_scope=e.success_scope||e.scope,e.error_scope=e.error_scope||e.scope,e.async=!1!==e.async,e.data=e.data||"",XN.fire("beforeInitialize",{settings:e}),t=Th()){if(t.overrideMimeType&&t.overrideMimeType(e.content_type),t.open(e.type||(e.data?"POST":"GET"),e.url,e.async),e.crossDomain&&(t.withCredentials=!0),e.content_type&&t.setRequestHeader("Content-Type",e.content_type),e.requestheaders&&Xt.each(e.requestheaders,function(e){t.setRequestHeader(e.key,e.value)}),t.setRequestHeader("X-Requested-With","XMLHttpRequest"),(t=XN.fire("beforeSend",{xhr:t,settings:e}).xhr).send(e.data),!e.async)return r();setTimeout(r,10)}}};Xt.extend(XN,hp);var YN,GN,JN,QN,ZN=Xt.extend,eE=function(e){this.settings=ZN({},e),this.count=0};eE.sendRPC=function(e){return(new eE).send(e)},eE.prototype={send:function(n){var r=n.error,o=n.success;(n=ZN(this.settings,n)).success=function(e,t){void 0===(e=WN.parse(e))&&(e={error:"JSON Parse error."}),e.error?r.call(n.error_scope||n.scope,e.error,t):o.call(n.success_scope||n.scope,e.result)},n.error=function(e,t){r&&r.call(n.error_scope||n.scope,e,t)},n.data=WN.serialize({id:n.id||"c"+this.count++,method:n.method,params:n.params}),n.content_type="application/json",XN.send(n)}};try{YN=V.window.localStorage}catch(iE){GN={},JN=[],QN={getItem:function(e){var t=GN[e];return t||null},setItem:function(e,t){JN.push(e),GN[e]=String(t)},key:function(e){return JN[e]},removeItem:function(t){JN=JN.filter(function(e){return e===t}),delete GN[t]},clear:function(){JN=[],GN={}},length:0},Object.defineProperty(QN,"length",{get:function(){return JN.length},configurable:!1,enumerable:!1}),YN=QN}var tE,nE=TN,rE={geom:{Rect:LN},util:{Promise:de,Delay:he,Tools:Xt,VK:Zh,URI:zw,Class:jN,EventDispatcher:mp,Observable:hp,I18n:vh,XHR:XN,JSON:WN,JSONRequest:eE,JSONP:KN,LocalStorage:YN,Color:function(e){var n={},u=0,s=0,c=0,t=function(e){var t;return"object"==typeof e?"r"in e?(u=e.r,s=e.g,c=e.b):"v"in e&&function(e,t,n){var r,o,i,a;if(e=(parseInt(e,10)||0)%360,t=parseInt(t,10)/100,n=parseInt(n,10)/100,t=HN(0,VN(t,1)),n=HN(0,VN(n,1)),0!==t){switch(r=e/60,i=(o=n*t)*(1-Math.abs(r%2-1)),a=n-o,Math.floor(r)){case 0:u=o,s=i,c=0;break;case 1:u=i,s=o,c=0;break;case 2:u=0,s=o,c=i;break;case 3:u=0,s=i,c=o;break;case 4:u=i,s=0,c=o;break;case 5:u=o,s=0,c=i;break;default:u=s=c=0}u=qN(255*(u+a)),s=qN(255*(s+a)),c=qN(255*(c+a))}else u=s=c=qN(255*n)}(e.h,e.s,e.v):(t=/rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)[^\)]*\)/gi.exec(e))?(u=parseInt(t[1],10),s=parseInt(t[2],10),c=parseInt(t[3],10)):(t=/#([0-F]{2})([0-F]{2})([0-F]{2})/gi.exec(e))?(u=parseInt(t[1],16),s=parseInt(t[2],16),c=parseInt(t[3],16)):(t=/#([0-F])([0-F])([0-F])/gi.exec(e))&&(u=parseInt(t[1]+t[1],16),s=parseInt(t[2]+t[2],16),c=parseInt(t[3]+t[3],16)),u=u<0?0:255<u?255:u,s=s<0?0:255<s?255:s,c=c<0?0:255<c?255:c,n};return e&&t(e),n.toRgb=function(){return{r:u,g:s,b:c}},n.toHsv=function(){return e=u,t=s,n=c,o=0,(i=VN(e/=255,VN(t/=255,n/=255)))===(a=HN(e,HN(t,n)))?{h:0,s:0,v:100*(o=i)}:(r=(a-i)/a,{h:qN(60*((e===i?3:n===i?1:5)-(e===i?t-n:n===i?e-t:n-e)/((o=a)-i))),s:qN(100*r),v:qN(100*o)});var e,t,n,r,o,i,a},n.toHex=function(){var e=function(e){return 1<(e=parseInt(e,10).toString(16)).length?e:"0"+e};return"#"+e(u)+e(s)+e(c)},n.parse=t,n}},dom:{EventUtils:Se,Sizzle:St,DomQuery:gn,TreeWalker:go,DOMUtils:Si,ScriptLoader:Ri,RangeUtils:RN,Serializer:Cb,ControlSelection:kb,BookmarkManager:Eb,Selection:aC,Event:Se.Event},html:{Styles:gi,Entities:ti,Node:ob,Schema:di,SaxParser:Pv,DomParser:pb,Writer:il,Serializer:al},ui:{Factory:MN},Env:fe,AddOnManager:Bi,Annotator:Hc,Formatter:Wy,UndoManager:Zv,EditorCommands:fp,WindowManager:gh,NotificationManager:mh,EditorObservable:Bp,Shortcuts:Xp,Editor:tN,FocusManager:iN,EditorManager:TN,DOM:Si.DOM,ScriptLoader:Ri.ScriptLoader,PluginManager:Bi.PluginManager,ThemeManager:Bi.ThemeManager,trim:Xt.trim,isArray:Xt.isArray,is:Xt.is,toArray:Xt.toArray,makeMap:Xt.makeMap,each:Xt.each,map:Xt.map,grep:Xt.grep,inArray:Xt.inArray,extend:Xt.extend,create:Xt.create,walk:Xt.walk,createNS:Xt.createNS,resolve:Xt.resolve,explode:Xt.explode,_addCacheSuffix:Xt._addCacheSuffix,isOpera:fe.opera,isWebKit:fe.webkit,isIE:fe.ie,isGecko:fe.gecko,isMac:fe.mac},oE=nE=Xt.extend(nE,rE);tE=oE,window.tinymce=tE,window.tinyMCE=tE,function(e){if("object"==typeof module)try{module.exports=e}catch(t){}}(oE)}(window);
\ No newline at end of file

From cc4c5d0f217874044ffd63fb0941213b54730d19 Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Wed, 22 Jul 2020 13:07:56 +0800
Subject: [PATCH 0966/1718] magento/adobe-stock-integration#1391:
 SaveAssetsKeywordsInterface to delete obsolete keywords - Revised try catch
 to resolve failure in unit tests

---
 .../ResourceModel/Keyword/SaveAssetLinks.php  | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetLinks.php b/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetLinks.php
index a1b057cee5d0d..95a0cadd3abcc 100644
--- a/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetLinks.php
+++ b/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetLinks.php
@@ -61,26 +61,18 @@ public function __construct(
      * @param int $assetId
      * @param KeywordInterface[] $keywordIds
      *
+     * @throws CouldNotDeleteException
      * @throws CouldNotSaveException
      */
     public function execute(int $assetId, array $keywordIds): void
     {
-        try {
-            $currentKeywordIds = $this->getCurrentKeywordIds($assetId);
+        $currentKeywordIds = $this->getCurrentKeywordIds($assetId);
 
-            $obsoleteKeywordIds = array_diff($currentKeywordIds, $keywordIds);
-            $newKeywordIds = array_diff($keywordIds, $currentKeywordIds);
+        $obsoleteKeywordIds = array_diff($currentKeywordIds, $keywordIds);
+        $newKeywordIds = array_diff($keywordIds, $currentKeywordIds);
 
-            $this->deleteAssetKeywords($assetId, $obsoleteKeywordIds);
-            $this->insertAssetKeywords($assetId, $newKeywordIds);
-
-        } catch (\Exception $exception) {
-            $this->logger->critical($exception);
-            throw new CouldNotSaveException(
-                __('Could not process asset keyword links'),
-                $exception
-            );
-        }
+        $this->deleteAssetKeywords($assetId, $obsoleteKeywordIds);
+        $this->insertAssetKeywords($assetId, $newKeywordIds);
     }
 
     /**
@@ -88,6 +80,8 @@ public function execute(int $assetId, array $keywordIds): void
      *
      * @param int $assetId
      * @param int[] $keywordIds
+     *
+     * @throws CouldNotSaveException
      */
     private function insertAssetKeywords(int $assetId, array $keywordIds): void
     {
@@ -111,6 +105,10 @@ private function insertAssetKeywords(int $assetId, array $keywordIds): void
             );
         } catch (\Exception $exception) {
             $this->logger->critical($exception);
+            throw new CouldNotSaveException(
+                __('Could not save asset keyword links'),
+                $exception
+            );
         }
     }
 

From 418c6e8c1d5cfe5fba25d4f4c34374e350195139 Mon Sep 17 00:00:00 2001
From: John Carlo Octabio <johncarlo@abovethefray.io>
Date: Wed, 22 Jul 2020 14:19:14 +0800
Subject: [PATCH 0967/1718] magento/magento2#108: Clear Shopping Cart -
 Refactor MFTF and PHP files for PR changes requested

---
 .../ClearShoppingCartEnableDisableConfigurationTest.xml    | 7 +------
 app/code/Magento/Checkout/ViewModel/Cart.php               | 5 ++++-
 .../testsuite/Magento/Checkout/ViewModel/CartTest.php      | 1 -
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/ClearShoppingCartEnableDisableConfigurationTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/ClearShoppingCartEnableDisableConfigurationTest.xml
index 5e2690e619436..92a4b9563ab3d 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/ClearShoppingCartEnableDisableConfigurationTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/ClearShoppingCartEnableDisableConfigurationTest.xml
@@ -14,6 +14,7 @@
             <title value="Enable and Disable Clear Shopping Cart Configuration"/>
             <description value="Verify that disabling the clear shopping cart store configuration will remove the clear shopping cart configuration button from the storefront's shopping cart page. Verify that enabling the configuration will add the button to the page and that the button functions as expected"/>
             <group value="shoppingCart"/>
+            <severity value="MAJOR"/>
         </annotations>
         <before>
             <!-- Create simple products and category -->
@@ -45,9 +46,6 @@
         <!-- Enable clear shopping cart button -->
         <actionGroup ref="AdminSelectClearShoppingCartConfigurationActionGroup" stepKey="enableClearShoppingCartButton"/>
         <actionGroup ref="SaveStoreConfigurationActionGroup" stepKey="saveStoreConfiguration1"/>
-        <actionGroup ref="CliCacheCleanActionGroup" stepKey="cliCacheClean1">
-            <argument name="tags" value=""/>
-        </actionGroup>
 
         <!-- Open product 1 and add to cart -->
         <actionGroup ref="StorefrontOpenProductEntityPageActionGroup" stepKey="openProduct1Page1">
@@ -74,9 +72,6 @@
             <argument name="value" value="{{DisableClearShoppingCart.textValue}}"/>
         </actionGroup>
         <actionGroup ref="SaveStoreConfigurationActionGroup" stepKey="saveStoreConfiguration2"/>
-        <actionGroup ref="CliCacheCleanActionGroup" stepKey="cliCacheClean2">
-            <argument name="tags" value=""/>
-        </actionGroup>
 
         <!-- Open product 1 page and add to cart -->
         <actionGroup ref="StorefrontOpenProductEntityPageActionGroup" stepKey="openProduct1Page2">
diff --git a/app/code/Magento/Checkout/ViewModel/Cart.php b/app/code/Magento/Checkout/ViewModel/Cart.php
index 21fe090249a92..f5415079d396e 100644
--- a/app/code/Magento/Checkout/ViewModel/Cart.php
+++ b/app/code/Magento/Checkout/ViewModel/Cart.php
@@ -11,12 +11,15 @@
 use Magento\Framework\View\Element\Context;
 use Magento\Store\Model\ScopeInterface;
 
+/**
+ * Cart form view model.
+ */
 class Cart implements ArgumentInterface
 {
     /**
      * Config settings path to enable clear shopping cart button
      */
-    public const XPATH_CONFIG_ENABLE_CLEAR_SHOPPING_CART = 'checkout/cart/enable_clear_shopping_cart';
+    private const XPATH_CONFIG_ENABLE_CLEAR_SHOPPING_CART = 'checkout/cart/enable_clear_shopping_cart';
 
     /**
      * @var ScopeConfigInterface
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/ViewModel/CartTest.php b/dev/tests/integration/testsuite/Magento/Checkout/ViewModel/CartTest.php
index 52040a503c37a..8ae61d5ea7928 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/ViewModel/CartTest.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/ViewModel/CartTest.php
@@ -17,7 +17,6 @@
 /**
  * Test for clear shopping cart config
  *
- * @package Magento\Checkout\ViewModel
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CartTest extends TestCase

From d57c287a715cf3514d0aef7c761047b2113e58e5 Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Wed, 22 Jul 2020 10:13:20 +0300
Subject: [PATCH 0968/1718] MC-34515: Fix integration test

---
 .../integration/testsuite/Magento/Framework/Console/CliTest.php  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Console/CliTest.php b/dev/tests/integration/testsuite/Magento/Framework/Console/CliTest.php
index cdbfa26111d0f..c6aeaf9e0f927 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Console/CliTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Console/CliTest.php
@@ -79,6 +79,7 @@ protected function tearDown(): void
      * Checks that settings from env.php config file are applied
      * to created application instance.
      *
+     * @magentoAppIsolation enabled
      * @param bool $isPub
      * @param array $params
      * @dataProvider documentRootIsPubProvider

From 95be24375067bd43ef94ad6c403c8a0fecdaa5cf Mon Sep 17 00:00:00 2001
From: Andrii Kalinich <51681435+engcom-Echo@users.noreply.github.com>
Date: Wed, 22 Jul 2020 14:10:54 +0300
Subject: [PATCH 0969/1718] added testCaseId

---
 .../Mftf/Test/StorefrontOnePageCheckoutPhoneValidationTest.xml   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutPhoneValidationTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutPhoneValidationTest.xml
index 38b946892677c..b001128fee906 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutPhoneValidationTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutPhoneValidationTest.xml
@@ -15,6 +15,7 @@
             <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"/>

From dbea58a03f070c4d9ed3bd671a351a42c04b4234 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Wed, 22 Jul 2020 07:12:07 -0500
Subject: [PATCH 0970/1718] MC-32014: Remove google-shopping-ads module from
 core in 2.4.1

---
 .../Magento/Framework/Mview/TriggerCleaner.php         | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/internal/Magento/Framework/Mview/TriggerCleaner.php b/lib/internal/Magento/Framework/Mview/TriggerCleaner.php
index 0c28acd9b9e03..ac2db0a6f4816 100644
--- a/lib/internal/Magento/Framework/Mview/TriggerCleaner.php
+++ b/lib/internal/Magento/Framework/Mview/TriggerCleaner.php
@@ -54,15 +54,16 @@ public function __construct(
      */
     public function removeTriggers(): bool
     {
+        // Get list of views that are enabled
         $viewCollection = $this->viewCollectionFactory->create();
         $viewList = $viewCollection->getViewsByStateMode(StateInterface::MODE_ENABLED);
 
-        // Unsubscribe mviews
+        // Unsubscribe existing view to remove triggers from db
         foreach ($viewList as $view) {
             $view->unsubscribe();
         }
 
-        // Unsubscribe old views that still have triggers in db
+        // Remove any remaining triggers from db that are not linked to a view
         $triggerTableNames = $this->getTableNamesWithTriggers();
         foreach ($triggerTableNames as $tableName) {
             $view = $this->createViewByTableName($tableName);
@@ -70,7 +71,7 @@ public function removeTriggers(): bool
             $view->getState()->delete();
         }
 
-        // Re-subscribe mviews
+        // Restore the previous state of the views to add triggers back to db
         foreach ($viewList as $view) {
             $view->subscribe();
         }
@@ -100,6 +101,9 @@ private function getTableNamesWithTriggers(): array
     /**
      * Create view by db table name
      *
+     * Create a view that has the table name so that unsubscribe can be used to
+     * remove triggers with the correct naming structure from the db
+     *
      * @param string $tableName
      * @return ViewInterface
      */

From 57b733fdd4a59492b6b09842a287654f8044a759 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 22 Jul 2020 16:00:20 +0300
Subject: [PATCH 0971/1718] fix issue with cc_type

---
 .../PaypalGraphQl/Model/Resolver/PayflowProResponse.php     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/PaypalGraphQl/Model/Resolver/PayflowProResponse.php b/app/code/Magento/PaypalGraphQl/Model/Resolver/PayflowProResponse.php
index ce44511c60f3e..b3ddced97aca6 100644
--- a/app/code/Magento/PaypalGraphQl/Model/Resolver/PayflowProResponse.php
+++ b/app/code/Magento/PaypalGraphQl/Model/Resolver/PayflowProResponse.php
@@ -126,9 +126,9 @@ public function resolve(
         $this->parameters->fromString(urldecode($paypalPayload));
         $data = $this->parameters->toArray();
         try {
-            $do = $this->dataObjectFactory->create(['data' => array_change_key_case($data, CASE_LOWER)]);
-            $this->responseValidator->validate($do, $this->transparent);
-            $this->transaction->savePaymentInQuote($do, $cart->getId());
+            $response = $this->transaction->getResponseObject($data);
+            $this->responseValidator->validate($response, $this->transparent);
+            $this->transaction->savePaymentInQuote($response, $cart->getId());
         } catch (LocalizedException $exception) {
             $parameters['error'] = true;
             $parameters['error_msg'] = $exception->getMessage();

From 1422df6a8dcdd8aa9cef74fc62c1ccf6fdbbea5a Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 22 Jul 2020 16:52:51 +0300
Subject: [PATCH 0972/1718] remove redundant data from graphql schema

---
 app/code/Magento/PaypalGraphQl/etc/schema.graphqls | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/code/Magento/PaypalGraphQl/etc/schema.graphqls b/app/code/Magento/PaypalGraphQl/etc/schema.graphqls
index cf7fcebf289a4..905e702c512fd 100644
--- a/app/code/Magento/PaypalGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/PaypalGraphQl/etc/schema.graphqls
@@ -51,7 +51,6 @@ input PaymentMethodInput {
     payflow_link: PayflowLinkInput @doc(description:"Required input for PayPal Payflow Link and Payments Advanced payments")
     payflowpro: PayflowProInput @doc(description: "Required input type for PayPal Payflow Pro and Payment Pro payments")
     hosted_pro: HostedProInput @doc(description:"Required input for PayPal Hosted pro payments")
-    payflowpro_cc_vault: VaultTokenInput @doc(description:"Required input for payment methods with Vault support.")
 }
 
 input HostedProInput @doc(description:"A set of relative URLs that PayPal will use in response to various actions during the authorization process. Magento prepends the base URL to this value to create a full URL. For example, if the full URL is https://www.example.com/path/to/page.html, the relative URL is path/to/page.html. Use this input for Payments Pro Hosted Solution payment method.") {
@@ -143,7 +142,3 @@ input PayflowProResponseInput @doc(description:"Input required to complete payme
 type PayflowProResponseOutput {
     cart: Cart!
 }
-
-input VaultTokenInput @doc(description:"Required input for payment methods with Vault support.") {
-    public_hash: String! @doc(description: "The public hash of the payment token")
-}

From 958fee38d7aa17b58131b01b4f4e6f77e7afd60f Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Wed, 22 Jul 2020 22:27:53 +0800
Subject: [PATCH 0973/1718] magento/adobe-stock-integration#1391:
 SaveAssetsKeywordsInterface to delete obsolete keywords - Allow empty
 keywords to execute saveAssetLinks, added condition to integration test for
 empty keywords

---
 .../Keyword/SaveAssetsKeywords.php            | 20 ++++++-------
 .../Model/ResourceModel/AssetKeywordsTest.php | 29 +++++++++----------
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetsKeywords.php b/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetsKeywords.php
index a97c5f602c5c7..56bdfda49d84c 100644
--- a/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetsKeywords.php
+++ b/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetsKeywords.php
@@ -93,19 +93,17 @@ private function saveAssetKeywords(array $keywords, int $assetId): void
             $data[] = $keyword->getKeyword();
         }
 
-        if (empty($data)) {
-            return;
+        if (!empty($data)) {
+            /** @var Mysql $connection */
+            $connection = $this->resourceConnection->getConnection();
+            $connection->insertArray(
+                $this->resourceConnection->getTableName(self::TABLE_KEYWORD),
+                [self::KEYWORD],
+                $data,
+                AdapterInterface::INSERT_IGNORE
+            );
         }
 
-        /** @var Mysql $connection */
-        $connection = $this->resourceConnection->getConnection();
-        $connection->insertArray(
-            $this->resourceConnection->getTableName(self::TABLE_KEYWORD),
-            [self::KEYWORD],
-            $data,
-            AdapterInterface::INSERT_IGNORE
-        );
-
         $this->saveAssetLinks->execute($assetId, $this->getKeywordIds($data));
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/MediaGallery/Model/ResourceModel/AssetKeywordsTest.php b/dev/tests/integration/testsuite/Magento/MediaGallery/Model/ResourceModel/AssetKeywordsTest.php
index 53711c0074a64..def1eb3231be4 100644
--- a/dev/tests/integration/testsuite/Magento/MediaGallery/Model/ResourceModel/AssetKeywordsTest.php
+++ b/dev/tests/integration/testsuite/Magento/MediaGallery/Model/ResourceModel/AssetKeywordsTest.php
@@ -70,14 +70,14 @@ protected function setUp(): void
      * @param string[] $updatedKeywords
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    public function testSaveAndGetKeywords(array $keywords = [], array $updatedKeywords = []): void
+    public function testSaveAndGetKeywords(array $keywords, array $updatedKeywords): void
     {
         $loadedAssets = $this->getAssetsByPath->execute([self::FIXTURE_ASSET_PATH]);
         $this->assertCount(1, $loadedAssets);
         $loadedAsset = current($loadedAssets);
 
         $this->updateAssetKeywords($loadedAsset->getId(), $keywords);
-        $this->updateAssetKeywords($loadedAsset->getId(), $updatedKeywords, $keywords);
+        $this->updateAssetKeywords($loadedAsset->getId(), $updatedKeywords);
     }
 
     /**
@@ -85,9 +85,8 @@ public function testSaveAndGetKeywords(array $keywords = [], array $updatedKeywo
      *
      * @param int $assetId
      * @param string[] $keywords
-     * @param string[] $currentKeywords
      */
-    private function updateAssetKeywords(int $assetId, array $keywords = [], array $currentKeywords = []): void
+    private function updateAssetKeywords(int $assetId, array $keywords): void
     {
         $assetKeywords = $this->assetsKeywordsFactory->create(
             [
@@ -99,28 +98,28 @@ private function updateAssetKeywords(int $assetId, array $keywords = [], array $
         $this->saveAssetsKeywords->execute([$assetKeywords]);
         $loadedAssetKeywords = $this->getAssetsKeywords->execute([$assetId]);
 
-        $currentKeywords = empty($keywords) ? $currentKeywords : $keywords;
-        $expectedCount = !empty($currentKeywords) ? 1 : 0;
+        if (empty($keywords)) {
+            $this->assertEmpty($loadedAssetKeywords);
+            return;
+        }
 
-        $this->assertCount($expectedCount, $loadedAssetKeywords);
+        $this->assertCount(1, $loadedAssetKeywords);
         /** @var AssetKeywordsInterface $loadedAssetKeyword */
         $loadedAssetKeyword = current($loadedAssetKeywords);
 
-        $loadedKeywords = !empty($loadedAssetKeyword) ? $loadedAssetKeyword->getKeywords() : [];
+        $loadedKeywords = $loadedAssetKeyword->getKeywords();
 
-        $this->assertEquals(count($currentKeywords), count($loadedKeywords));
+        $this->assertEquals(count($keywords), count($loadedKeywords));
 
         $loadedKeywordStrings = [];
-        if (!empty($loadedKeywords)) {
-            foreach ($loadedKeywords as $loadedKeywordObject) {
-                $loadedKeywordStrings[] = $loadedKeywordObject->getKeyword();
-            }
+        foreach ($loadedKeywords as $loadedKeywordObject) {
+            $loadedKeywordStrings[] = $loadedKeywordObject->getKeyword();
         }
 
         sort($loadedKeywordStrings);
-        sort($currentKeywords);
+        sort($keywords);
 
-        $this->assertEquals($currentKeywords, $loadedKeywordStrings);
+        $this->assertEquals($keywords, $loadedKeywordStrings);
     }
 
     /**

From dd40340d896c26a113b8d4645ef352447f020887 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Wed, 22 Jul 2020 12:48:50 -0500
Subject: [PATCH 0974/1718] MC-32014: Remove google-shopping-ads module from
 core in 2.4.1

---
 dev/tests/setup-integration/framework/bootstrap.php      | 2 ++
 .../Framework/Mview/Test/Unit/View/CollectionTest.php    | 9 +++++++++
 setup/src/Magento/Setup/Model/Installer.php              | 6 ++++++
 3 files changed, 17 insertions(+)

diff --git a/dev/tests/setup-integration/framework/bootstrap.php b/dev/tests/setup-integration/framework/bootstrap.php
index f10f430f2f401..20dde0224d73e 100644
--- a/dev/tests/setup-integration/framework/bootstrap.php
+++ b/dev/tests/setup-integration/framework/bootstrap.php
@@ -102,6 +102,8 @@
     /* Unset declared global variables to release the PHPUnit from maintaining their values between tests */
     unset($testsBaseDir, $logWriter, $settings, $shell, $application, $bootstrap);
 } catch (\Exception $e) {
+    // phpcs:disable Magento2.Security.LanguageConstruct
     echo $e . PHP_EOL;
     exit(1);
+    // phpcs:enable Magento2.Security.LanguageConstruct
 }
diff --git a/lib/internal/Magento/Framework/Mview/Test/Unit/View/CollectionTest.php b/lib/internal/Magento/Framework/Mview/Test/Unit/View/CollectionTest.php
index 522aff5d43b7b..0247503093278 100644
--- a/lib/internal/Magento/Framework/Mview/Test/Unit/View/CollectionTest.php
+++ b/lib/internal/Magento/Framework/Mview/Test/Unit/View/CollectionTest.php
@@ -143,6 +143,15 @@ function ($elem) {
                 $indexers
             ));
 
+        $this->mviewConfigMock
+            ->method('getView')
+            ->willReturnMap(array_map(
+                function ($elem) {
+                    return [$elem, ['view_id' => $elem]];
+                },
+                $views
+            ));
+
         $this->entityFactoryMock
             ->method('create')
             ->willReturnMap([
diff --git a/setup/src/Magento/Setup/Model/Installer.php b/setup/src/Magento/Setup/Model/Installer.php
index 35d0ac457b31c..d53dede971fa4 100644
--- a/setup/src/Magento/Setup/Model/Installer.php
+++ b/setup/src/Magento/Setup/Model/Installer.php
@@ -995,6 +995,7 @@ private function throwExceptionForNotWritablePaths(array $paths)
     private function handleDBSchemaData($setup, $type, array $request)
     {
         if (!($type === 'schema' || $type === 'data')) {
+            // phpcs:ignore Magento2.Exceptions.DirectThrow
             throw  new Exception("Unsupported operation type $type is requested");
         }
         $resource = new \Magento\Framework\Module\ModuleResource($this->context);
@@ -1117,6 +1118,7 @@ private function assertDbConfigExists()
     {
         $config = $this->deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTION_DEFAULT);
         if (!$config) {
+            // phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new Exception(
                 "Can't run this operation: configuration for DB connection is absent."
             );
@@ -1193,6 +1195,7 @@ protected function createSchemaDataHandler($className, $interfaceName)
     {
         if (class_exists($className)) {
             if (!is_subclass_of($className, $interfaceName) && $className !== $interfaceName) {
+                // phpcs:ignore Magento2.Exceptions.DirectThrow
                 throw  new Exception($className . ' must implement \\' . $interfaceName);
             } else {
                 return $this->objectManagerProvider->get()->create($className);
@@ -1282,6 +1285,7 @@ public function updateModulesSequence($keepGeneratedFiles = false)
     {
         $config = $this->deploymentConfig->get(ConfigOptionsListConstants::KEY_MODULES);
         if (!$config) {
+            // phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new Exception(
                 "Can't run this operation: deployment configuration is absent."
                 . " Run 'magento setup:config:set --help' for options."
@@ -1579,6 +1583,7 @@ private function getSchemaDataHandler($moduleName, $type)
                 $interface = self::DATA_INSTALL;
                 break;
             default:
+                // phpcs:ignore Magento2.Exceptions.DirectThrow
                 throw new Exception("$className does not exist");
         }
 
@@ -1602,6 +1607,7 @@ private function generateListOfModuleContext($resource, $type)
             } elseif ($type === 'data-version') {
                 $dbVer = $resource->getDataVersion($moduleName);
             } else {
+                // phpcs:ignore Magento2.Exceptions.DirectThrow
                 throw  new Exception("Unsupported version type $type is requested");
             }
             if ($dbVer !== false) {

From 8dbc6a3f638bebfe63e8b8778b6afeebc817fa99 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Wed, 22 Jul 2020 13:05:48 -0500
Subject: [PATCH 0975/1718] MC-20639: MyAccount :: Order Details :: Refund
 (creditMemo) Details by Order Number

- fix interface
---
 .../Model/Resolver/CreditMemo/CreditMemoComments.php          | 4 ----
 app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemos.php  | 3 ++-
 app/code/Magento/SalesGraphQl/etc/graphql/di.xml              | 2 +-
 app/code/Magento/SalesGraphQl/etc/schema.graphqls             | 4 ++--
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoComments.php b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoComments.php
index 9f27122466b11..e5f735a7e1f09 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoComments.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoComments.php
@@ -33,10 +33,6 @@ public function resolve(
             throw new LocalizedException(__('"model" value should be specified'));
         }
 
-        if (!(($value['order'] ?? null) instanceof OrderInterface)) {
-            throw new LocalizedException(__('"order" value should be specified'));
-        }
-
         /** @var CreditmemoInterface $creditMemo */
         $creditMemo = $value['model'];
 
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemos.php b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemos.php
index 69dbca9d66599..150bda5001dd1 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemos.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemos.php
@@ -43,7 +43,8 @@ public function resolve(
                 'id' => base64_encode($creditMemo->getEntityId()),
                 'number' => $creditMemo->getIncrementId(),
                 'order' => $orderModel,
-                'model' => $creditMemo
+                'model' => $creditMemo,
+                //'product_type' => $orderItem['product_type'],
             ];
         }
         return $creditMemos;
diff --git a/app/code/Magento/SalesGraphQl/etc/graphql/di.xml b/app/code/Magento/SalesGraphQl/etc/graphql/di.xml
index eb8e8eadadc5c..f071ed73dc43d 100644
--- a/app/code/Magento/SalesGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/SalesGraphQl/etc/graphql/di.xml
@@ -22,7 +22,7 @@
     </type>
     <type name="Magento\SalesGraphQl\Model\CreditmemoItemInterfaceTypeResolverComposite">
         <arguments>
-            <argument name="creditmemoItemTypeResolvers" xsi:type="array">
+            <argument name="creditMemoItemTypeResolvers" xsi:type="array">
                 <item name="creditmemo_catalog_item_type_resolver" xsi:type="object">Magento\SalesGraphQl\Model\CreditmemoItemTypeResolver</item>
             </argument>
         </arguments>
diff --git a/app/code/Magento/SalesGraphQl/etc/schema.graphqls b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
index 19c6657e815a6..d90665d101491 100644
--- a/app/code/Magento/SalesGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
@@ -47,7 +47,7 @@ type CustomerOrder @doc(description: "Contains details about each of the custome
     total: OrderTotal @doc(description: "Contains details about the calculated totals for this order") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\OrderTotal")
     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")
-    credit_memos: [CreditMemo  ] @doc(description: "A list of credit memos") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\CreditMemos")
+    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")
     shipping_address: CustomerAddress @doc(description: "The shipping address for the order")
     billing_address: CustomerAddress @doc(description: "The billing address for the order")
@@ -203,7 +203,7 @@ type PaymentMethod @doc(description: "Contains details about the payment method
 type CreditMemo @doc(description: "Credit memo details") {
     id: ID! @doc(description: "The unique ID of the credit memo, used for API purposes")
     number: String! @doc(description: "The sequential credit memo number")
-    items: [CreditMemoItem] @doc(description: "An array containing details about refunded items") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\CreditMemo\\CreditMemoItems")
+    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")
 }

From 719143d6c254b496e41fcfc21f1734ad2bd36767 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Wed, 22 Jul 2020 13:18:20 -0500
Subject: [PATCH 0976/1718] MC-20639: MyAccount :: Order Details :: Refund
 (creditMemo) Details by Order Number

- fix interface
---
 app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemos.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemos.php b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemos.php
index 150bda5001dd1..69dbca9d66599 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemos.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemos.php
@@ -43,8 +43,7 @@ public function resolve(
                 'id' => base64_encode($creditMemo->getEntityId()),
                 'number' => $creditMemo->getIncrementId(),
                 'order' => $orderModel,
-                'model' => $creditMemo,
-                //'product_type' => $orderItem['product_type'],
+                'model' => $creditMemo
             ];
         }
         return $creditMemos;

From 2cd8303a0713fa15e1b3838285f36fd2ea80921a Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@magento.com>
Date: Wed, 22 Jul 2020 14:08:57 -0500
Subject: [PATCH 0977/1718] MC-35985: Enable new consumer configuration
 settings on current consumers

- Update unit test;
---
 .../Unit/Model/Cron/ConsumersRunnerTest.php   | 57 +++++++++++++------
 1 file changed, 39 insertions(+), 18 deletions(-)

diff --git a/app/code/Magento/MessageQueue/Test/Unit/Model/Cron/ConsumersRunnerTest.php b/app/code/Magento/MessageQueue/Test/Unit/Model/Cron/ConsumersRunnerTest.php
index da86cdca6bbef..54c10a352aff0 100644
--- a/app/code/Magento/MessageQueue/Test/Unit/Model/Cron/ConsumersRunnerTest.php
+++ b/app/code/Magento/MessageQueue/Test/Unit/Model/Cron/ConsumersRunnerTest.php
@@ -146,22 +146,21 @@ public function testRun(
     ) {
         $consumerName = 'consumerName';
 
-        $this->deploymentConfigMock->expects($this->exactly(3))
+        $this->deploymentConfigMock
             ->method('get')
             ->willReturnMap(
                 [
                     ['cron_consumers_runner/cron_run', true, true],
                     ['cron_consumers_runner/max_messages', 10000, $maxMessages],
                     ['cron_consumers_runner/consumers', [], $allowedConsumers],
+                    ['queue/only_spawn_when_message_available', 0, 0],
                 ]
             );
 
         /** @var ConsumerConfigInterface|MockObject $firstCunsumer */
         $consumer = $this->getMockBuilder(ConsumerConfigItemInterface::class)
             ->getMockForAbstractClass();
-        $consumer->expects($this->any())
-            ->method('getName')
-            ->willReturn($consumerName);
+        $consumer->method('getName')->willReturn($consumerName);
 
         $this->phpExecutableFinderMock->expects($this->once())
             ->method('find')
@@ -276,39 +275,40 @@ public function runDataProvider()
      * @param boolean $onlySpawnWhenMessageAvailable
      * @param boolean $isMassagesAvailableInTheQueue
      * @param int $shellBackgroundExpects
+     * @param boolean $globalOnlySpawnWhenMessageAvailable
+     * @param int $getOnlySpawnWhenMessageAvailableCallCount
      * @dataProvider runBasedOnOnlySpawnWhenMessageAvailableConsumerConfigurationDataProvider
      */
     public function testRunBasedOnOnlySpawnWhenMessageAvailableConsumerConfiguration(
         $onlySpawnWhenMessageAvailable,
         $isMassagesAvailableInTheQueue,
-        $shellBackgroundExpects
+        $shellBackgroundExpects,
+        $globalOnlySpawnWhenMessageAvailable,
+        $getOnlySpawnWhenMessageAvailableCallCount
     ) {
         $consumerName = 'consumerName';
         $connectionName = 'connectionName';
         $queueName = 'queueName';
-        $this->deploymentConfigMock->expects($this->exactly(3))
+        $this->deploymentConfigMock->expects($this->exactly(4))
             ->method('get')
             ->willReturnMap(
                 [
                     ['cron_consumers_runner/cron_run', true, true],
                     ['cron_consumers_runner/max_messages', 10000, 1000],
                     ['cron_consumers_runner/consumers', [], []],
+                    ['queue/only_spawn_when_message_available', 0, $globalOnlySpawnWhenMessageAvailable],
                 ]
             );
 
         /** @var ConsumerConfigInterface|MockObject $firstCunsumer */
         $consumer = $this->getMockBuilder(ConsumerConfigItemInterface::class)
             ->getMockForAbstractClass();
-        $consumer->expects($this->any())
-            ->method('getName')
-            ->willReturn($consumerName);
+        $consumer->method('getName')->willReturn($consumerName);
         $consumer->expects($this->once())
             ->method('getConnection')
             ->willReturn($connectionName);
-        $consumer->expects($this->any())
-            ->method('getQueue')
-            ->willReturn($queueName);
-        $consumer->expects($this->once())
+        $consumer->method('getQueue')->willReturn($queueName);
+        $consumer->expects($this->exactly($getOnlySpawnWhenMessageAvailableCallCount))
             ->method('getOnlySpawnWhenMessageAvailable')
             ->willReturn($onlySpawnWhenMessageAvailable);
         $this->consumerConfigMock->expects($this->once())
@@ -342,24 +342,45 @@ public function runBasedOnOnlySpawnWhenMessageAvailableConsumerConfigurationData
             [
                 'onlySpawnWhenMessageAvailable' => true,
                 'isMassagesAvailableInTheQueue' => true,
-                'shellBackgroundExpects' => 1
+                'shellBackgroundExpects' => 1,
+                'globalOnlySpawnWhenMessageAvailable' => false,
+                'getOnlySpawnWhenMessageAvailableCallCount' => 1
             ],
             [
                 'onlySpawnWhenMessageAvailable' => true,
                 'isMassagesAvailableInTheQueue' => false,
-                'shellBackgroundExpects' => 0
+                'shellBackgroundExpects' => 0,
+                'globalOnlySpawnWhenMessageAvailable' => false,
+                'getOnlySpawnWhenMessageAvailableCallCount' => 1
             ],
             [
                 'onlySpawnWhenMessageAvailable' => false,
                 'isMassagesAvailableInTheQueue' => true,
-                'shellBackgroundExpects' => 1
+                'shellBackgroundExpects' => 1,
+                'globalOnlySpawnWhenMessageAvailable' => false,
+                'getOnlySpawnWhenMessageAvailableCallCount' => 1
             ],
             [
                 'onlySpawnWhenMessageAvailable' => false,
                 'isMassagesAvailableInTheQueue' => false,
-                'shellBackgroundExpects' => 1
+                'shellBackgroundExpects' => 1,
+                'globalOnlySpawnWhenMessageAvailable' => false,
+                'getOnlySpawnWhenMessageAvailableCallCount' => 1
+            ],
+            [
+                'onlySpawnWhenMessageAvailable' => true,
+                'isMassagesAvailableInTheQueue' => true,
+                'shellBackgroundExpects' => 1,
+                'globalOnlySpawnWhenMessageAvailable' => true,
+                'getOnlySpawnWhenMessageAvailableCallCount' => 0
+            ],
+            [
+                'onlySpawnWhenMessageAvailable' => true,
+                'isMassagesAvailableInTheQueue' => true,
+                'shellBackgroundExpects' => 1,
+                'globalOnlySpawnWhenMessageAvailable' => false,
+                'getOnlySpawnWhenMessageAvailableCallCount' => 1
             ],
-
         ];
     }
 }

From 53b25c780dca13caf188675334c5c23945c67207 Mon Sep 17 00:00:00 2001
From: Matt Walters <bluemwhitew@hotmail.co.uk>
Date: Wed, 22 Jul 2020 20:46:22 +0100
Subject: [PATCH 0978/1718] magento/magento2-page-builder#543: Content Product
 Attributes Default Sorting Order - Reordering Description/Short Description
 Product Attributes

---
 app/code/Magento/Catalog/Setup/CategorySetup.php | 16 ++++++++--------
 .../Setup/Patch/Data/UpdateProductAttributes.php |  7 ++++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/Catalog/Setup/CategorySetup.php b/app/code/Magento/Catalog/Setup/CategorySetup.php
index f8542454bef92..9f12f68fb9beb 100644
--- a/app/code/Magento/Catalog/Setup/CategorySetup.php
+++ b/app/code/Magento/Catalog/Setup/CategorySetup.php
@@ -421,9 +421,9 @@ public function getDefaultEntities()
                         'comparable' => true,
                         'visible_in_advanced_search' => true,
                     ],
-                    'description' => [
+                    'short_description' => [
                         'type' => 'text',
-                        'label' => 'Description',
+                        'label' => 'Short Description',
                         'input' => 'textarea',
                         'sort_order' => 3,
                         'global' => ScopedAttributeInterface::SCOPE_STORE,
@@ -432,10 +432,14 @@ public function getDefaultEntities()
                         'wysiwyg_enabled' => true,
                         'is_html_allowed_on_front' => true,
                         'visible_in_advanced_search' => true,
+                        'used_in_product_listing' => true,
+                        'is_used_in_grid' => true,
+                        'is_visible_in_grid' => false,
+                        'is_filterable_in_grid' => false,
                     ],
-                    'short_description' => [
+                    'description' => [
                         'type' => 'text',
-                        'label' => 'Short Description',
+                        'label' => 'Description',
                         'input' => 'textarea',
                         'sort_order' => 4,
                         'global' => ScopedAttributeInterface::SCOPE_STORE,
@@ -444,10 +448,6 @@ public function getDefaultEntities()
                         'wysiwyg_enabled' => true,
                         'is_html_allowed_on_front' => true,
                         'visible_in_advanced_search' => true,
-                        'used_in_product_listing' => true,
-                        'is_used_in_grid' => true,
-                        'is_visible_in_grid' => false,
-                        'is_filterable_in_grid' => false,
                     ],
                     'price' => [
                         'type' => 'decimal',
diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductAttributes.php b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductAttributes.php
index d02753d44adee..31a5ac46a9297 100644
--- a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductAttributes.php
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductAttributes.php
@@ -113,14 +113,15 @@ public function apply()
             \Magento\Catalog\Model\Product::ENTITY,
             $attributeSetId,
             'Content',
-            'description'
+            'short_description',
+            100
         );
         $categorySetup->addAttributeToGroup(
             \Magento\Catalog\Model\Product::ENTITY,
             $attributeSetId,
             'Content',
-            'short_description',
-            100
+            'description',
+            110
         );
 
         //Images tab

From 00650a86825d4261055ea8f096d4f3b416d347e2 Mon Sep 17 00:00:00 2001
From: Matt Walters <bluemwhitew@hotmail.co.uk>
Date: Wed, 22 Jul 2020 21:24:02 +0100
Subject: [PATCH 0979/1718] magento/magento2-page-builder#543: Content Product
 Attributes Default Sorting Order - Partially Reverting
 53b25c780dca13caf188675334c5c23945c67207

---
 .../Catalog/Setup/Patch/Data/UpdateProductAttributes.php   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductAttributes.php b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductAttributes.php
index 31a5ac46a9297..d02753d44adee 100644
--- a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductAttributes.php
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductAttributes.php
@@ -113,15 +113,14 @@ public function apply()
             \Magento\Catalog\Model\Product::ENTITY,
             $attributeSetId,
             'Content',
-            'short_description',
-            100
+            'description'
         );
         $categorySetup->addAttributeToGroup(
             \Magento\Catalog\Model\Product::ENTITY,
             $attributeSetId,
             'Content',
-            'description',
-            110
+            'short_description',
+            100
         );
 
         //Images tab

From eb09069eb6e060343c47ba506b81ffa30485e649 Mon Sep 17 00:00:00 2001
From: Matt Walters <bluemwhitew@hotmail.co.uk>
Date: Wed, 22 Jul 2020 21:48:05 +0100
Subject: [PATCH 0980/1718] magento/magento2-page-builder#543: Content Product
 Attributes Default Sorting Order - Adding New Patch

---
 .../Data/UpdateProductDescriptionOrder.php    | 109 ++++++++++++++++++
 1 file changed, 109 insertions(+)
 create mode 100644 app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductDescriptionOrder.php

diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductDescriptionOrder.php b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductDescriptionOrder.php
new file mode 100644
index 0000000000000..77fcedd8c6272
--- /dev/null
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductDescriptionOrder.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Setup\Patch\Data;
+
+use Magento\Catalog\Setup\CategorySetup;
+use Magento\Catalog\Setup\CategorySetupFactory;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+
+/**
+ * Class UpdateProductDescriptionOrder
+ *
+ * @package Magento\Catalog\Setup\Patch
+ */
+class UpdateProductDescriptionOrder implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var CategorySetupFactory
+     */
+    private $categorySetupFactory;
+
+    /**
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param CategorySetupFactory $categorySetupFactory
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        CategorySetupFactory $categorySetupFactory
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->categorySetupFactory = $categorySetupFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply()
+    {
+        /** @var CategorySetup $categorySetup */
+        $categorySetup = $this->categorySetupFactory->create(['setup' => $this->moduleDataSetup]);
+        $attributeSetId = $categorySetup->getDefaultAttributeSetId(\Magento\Catalog\Model\Product::ENTITY);
+
+        // Content
+        $categorySetup->addAttributeGroup(
+            \Magento\Catalog\Model\Product::ENTITY,
+            $attributeSetId,
+            'Content',
+            15
+        );
+        $categorySetup->updateAttributeGroup(
+            \Magento\Catalog\Model\Product::ENTITY,
+            $attributeSetId,
+            'Content',
+            'tab_group_code',
+            'basic'
+        );
+        $categorySetup->addAttributeToGroup(
+            \Magento\Catalog\Model\Product::ENTITY,
+            $attributeSetId,
+            'Content',
+            'short_description',
+            100
+        );
+        $categorySetup->addAttributeToGroup(
+            \Magento\Catalog\Model\Product::ENTITY,
+            $attributeSetId,
+            'Content',
+            'description',
+            110
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getDependencies()
+    {
+        return [
+            UpdateMediaAttributesBackendTypes::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getVersion()
+    {
+        return '2.3.5';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}

From 67851de528fc47469ea41ec1c2537f3f8df0c66f Mon Sep 17 00:00:00 2001
From: Matt Walters <bluemwhitew@hotmail.co.uk>
Date: Wed, 22 Jul 2020 21:49:44 +0100
Subject: [PATCH 0981/1718] magento/magento2-page-builder#543: Content Product
 Attributes Default Sorting Order - Refactoring

---
 .../Setup/Patch/Data/UpdateProductDescriptionOrder.php        | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductDescriptionOrder.php b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductDescriptionOrder.php
index 77fcedd8c6272..873296bfcf145 100644
--- a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductDescriptionOrder.php
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductDescriptionOrder.php
@@ -8,17 +8,15 @@
 
 use Magento\Catalog\Setup\CategorySetup;
 use Magento\Catalog\Setup\CategorySetupFactory;
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
-use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
  * Class UpdateProductDescriptionOrder
  *
  * @package Magento\Catalog\Setup\Patch
  */
-class UpdateProductDescriptionOrder implements DataPatchInterface, PatchVersionInterface
+class UpdateProductDescriptionOrder implements DataPatchInterface
 {
     /**
      * @var ModuleDataSetupInterface

From 374e86f9d7a6dea1ff6ea5a05afda19176568be5 Mon Sep 17 00:00:00 2001
From: Matt Walters <bluemwhitew@hotmail.co.uk>
Date: Wed, 22 Jul 2020 22:04:01 +0100
Subject: [PATCH 0982/1718] magento/magento2-page-builder#543: Content Product
 Attributes Default Sorting Order - Code Review Feedback/Amends

---
 .../Setup/Patch/Data/UpdateProductDescriptionOrder.php    | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductDescriptionOrder.php b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductDescriptionOrder.php
index 873296bfcf145..42d9339fdd6d8 100644
--- a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductDescriptionOrder.php
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductDescriptionOrder.php
@@ -89,14 +89,6 @@ public static function getDependencies()
         ];
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public static function getVersion()
-    {
-        return '2.3.5';
-    }
-
     /**
      * {@inheritdoc}
      */

From c172ef3439095dc02862f5da64267154d2d5ec00 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Wed, 22 Jul 2020 16:06:06 -0500
Subject: [PATCH 0983/1718] MC-32014: Remove google-shopping-ads module from
 core in 2.4.1

---
 dev/tests/setup-integration/framework/bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/setup-integration/framework/bootstrap.php b/dev/tests/setup-integration/framework/bootstrap.php
index 20dde0224d73e..e3eed312a21b9 100644
--- a/dev/tests/setup-integration/framework/bootstrap.php
+++ b/dev/tests/setup-integration/framework/bootstrap.php
@@ -100,7 +100,7 @@
     );
 
     /* Unset declared global variables to release the PHPUnit from maintaining their values between tests */
-    unset($testsBaseDir, $logWriter, $settings, $shell, $application, $bootstrap);
+    unset($testsBaseDir, $settings, $shell, $application, $bootstrap);
 } catch (\Exception $e) {
     // phpcs:disable Magento2.Security.LanguageConstruct
     echo $e . PHP_EOL;

From f5823e5566a8603eee37e0a82c7cecc31827c0f5 Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Wed, 22 Jul 2020 16:27:35 -0500
Subject: [PATCH 0984/1718] MC-34573: Update TinyMCE

- Deprecated all tinymce related test content
- Removed tinymce3 option from admin options
- Added upgrade script to set cms to tinymce4 if current settings is tinymce3
---
 .../ProductWYSIWYGSection.xml                 |  5 +-
 .../Cms/Test/Mftf/Data/WysiwygConfigData.xml  |  2 +-
 .../TinyMCESection/MediaGallerySection.xml    |  3 +-
 .../AdminAddImageToCMSPageTinyMCE3Test.xml    |  5 +-
 .../Config/Setup/Patch/Data/UnsetTinymce3.php | 92 +++++++++++++++++++
 .../SwitchToTinyMCE3ActionGroup.xml           |  2 +-
 .../NewsletterWYSIWYGSection.xml              |  2 +-
 .../ProductWYSIWYGSection.xml                 |  2 +-
 .../TinyMCESection.xml                        |  2 +-
 .../Test/AdminSwitchWYSIWYGOptionsTest.xml    |  5 +-
 .../Magento/Tinymce3/etc/adminhtml/di.xml     | 10 --
 app/code/Magento/Tinymce3/etc/di.xml          |  7 --
 .../Modifier/WysiwygModifierInterface.php     |  2 +-
 .../adminhtml/Magento/backend/etc/view.xml    |  1 -
 .../frontend/Magento/blank/etc/view.xml       |  1 -
 app/design/frontend/Magento/luma/etc/view.xml |  1 -
 16 files changed, 111 insertions(+), 31 deletions(-)
 create mode 100644 app/code/Magento/Config/Setup/Patch/Data/UnsetTinymce3.php

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/ProductWYSIWYGSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/ProductWYSIWYGSection.xml
index b919cdff2bb92..f4d5d20bcfb83 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/ProductWYSIWYGSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/ProductWYSIWYGSection.xml
@@ -9,8 +9,9 @@
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="ProductWYSIWYGSection">
         <element name="Switcher" type="button" selector="select#dropdown-switcher"/>
-        <element name="v436" type="button" selector="//select[@id='dropdown-switcher']/option[text()='TinyMCE 4.3.6']"/>
-        <element name="v3" type="button" selector="//select[@id='dropdown-switcher']/option[text()='TinyMCE 3.6(Deprecated)']"/>
+        <element name="v436" type="button" selector="//select[@id='dropdown-switcher']/option[text()='TinyMCE 4.3.6']" deprecated="New element was introduced. Please use 'ProductWYSIWYGSection.v4910'"/>
+        <element name="v3" type="button" selector="//select[@id='dropdown-switcher']/option[text()='TinyMCE 3.6(Deprecated)']" deprecated="New element was introduced. Please use 'ProductWYSIWYGSection.v4910'"/>
+        <element name="v4910" type ="button" selector="//select[@id='dropdown-switcher']/option[text()='TinyMCE 4.9.10']" />
         <element name="TinymceDescription3" type="button" selector="//span[text()='Description']"/>
         <element name="SaveConfig" type="button" selector="#save"/>
         <element name="v4" type="button" selector="#category_form_description_v4"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Data/WysiwygConfigData.xml b/app/code/Magento/Cms/Test/Mftf/Data/WysiwygConfigData.xml
index 46a968959407f..ea5e90383511c 100644
--- a/app/code/Magento/Cms/Test/Mftf/Data/WysiwygConfigData.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Data/WysiwygConfigData.xml
@@ -18,7 +18,7 @@
         <data key="scope_id">0</data>
         <data key="value">hidden</data>
     </entity>
-    <entity name="WysiwygTinyMCE3Enable">
+    <entity name="WysiwygTinyMCE3Enable" deprecated="Use WysiwygTinyMCE4Enable instead">
         <data key="path">cms/wysiwyg/editor</data>
         <data key="scope_id">0</data>
         <data key="value">Magento_Tinymce3/tinymce3Adapter</data>
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 a6f4e7780d096..42675f3ee72e5 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/MediaGallerySection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/MediaGallerySection.xml
@@ -17,7 +17,8 @@
         <element name="imageSelected" type="text" selector="//small[text()='{{var1}}']/parent::*[@class='filecnt selected']" parameterized="true"/>
         <element name="ImageSource" type="input" selector=".mce-combobox.mce-abs-layout-item.mce-last.mce-has-open"/>
         <element name="ImageDescription" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-last"/>
-        <element name="ImageDescriptionTinyMCE3" type="input" selector="#alt"/>
+        <element name="ImageDescriptionTinyMCE3" type="input" selector="#alt" deprecated="New element was introduced. Please use 'ImageDescriptionTinyMCE4'"/>
+        <element name="ImageDescriptionTinyMCE4" type="input" selector="#alt" />
         <element name="Height" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-first"/>
         <element name="UploadImage" type="file" selector=".fileupload"/>
         <element name="OkBtn" type="button" selector="//span[text()='Ok']"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml
index 7c2aedceb9b7e..3cbee520f731e 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminAddImageToCMSPageTinyMCE3Test">
+    <test name="AdminAddImageToCMSPageTinyMCE3Test" deprecated="TinyMCE3 is no longer supported">
         <annotations>
             <features value="Cms"/>
             <stories value="Admin should be able to upload images with TinyMCE3 WYSIWYG"/>
@@ -17,6 +17,9 @@
             <description value="Verify that admin is able to upload image to CMS Page with TinyMCE3 enabled"/>
             <severity value="BLOCKER"/>
             <testCaseId value="MAGETWO-95725"/>
+            <skip>
+                <issueId value="DEPRECATED">TinyMCE3 is no longer supported</issueId>
+            </skip>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/Config/Setup/Patch/Data/UnsetTinymce3.php b/app/code/Magento/Config/Setup/Patch/Data/UnsetTinymce3.php
new file mode 100644
index 0000000000000..115b3baeded8d
--- /dev/null
+++ b/app/code/Magento/Config/Setup/Patch/Data/UnsetTinymce3.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Config\Setup\Patch\Data;
+
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Framework\Setup\Patch\PatchVersionInterface;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+
+/**
+ * Update config to Tinymce4 if Tinymce3 adapter is used.
+ */
+class UnsetTinymce3 implements DataPatchInterface, PatchVersionInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * CreateDefaultPages constructor.
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        try {
+            $connection = $this->moduleDataSetup->getConnection();
+            $table = $this->moduleDataSetup->getTable('core_config_data');
+            $select = $connection
+                ->select()
+                ->from(
+                    $table,
+                    ['value']
+                )
+                ->where('path = ?', 'cms/wysiwyg/editor');
+
+            if (strpos($connection->fetchOne($select), 'Tinymce3/tinymce3Adapter') !== false) {
+                $row = [
+                    'value' => 'mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter'
+                ];
+                $where = $connection->quoteInto(
+                    'path = ?',
+                    'cms/wysiwyg/editor'
+                );
+                $connection->update(
+                    $table,
+                    $row,
+                    $where
+                );
+            }
+            return $this;
+        } catch (\Exception $e) {
+            return $this;
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getVersion()
+    {
+        return '2.3.6';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/SwitchToTinyMCE3ActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/SwitchToTinyMCE3ActionGroup.xml
index b725610b7b2ee..837402005fecf 100644
--- a/app/code/Magento/Config/Test/Mftf/ActionGroup/SwitchToTinyMCE3ActionGroup.xml
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/SwitchToTinyMCE3ActionGroup.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="SwitchToTinyMCE3ActionGroup">
+    <actionGroup name="SwitchToTinyMCE3ActionGroup" deprecated="This version of TinyMCE is no longer supported">
         <annotations>
             <description>Goes to the 'Configuration' page for 'Content Management'. Sets 'WYSIWYG Editor' to 'TinyMCE 3'. Clicks on the Save button. PLEASE NOTE: The value is Hardcoded.</description>
         </annotations>
diff --git a/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/NewsletterWYSIWYGSection.xml b/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/NewsletterWYSIWYGSection.xml
index 14002028d9da4..fec71209c1f99 100644
--- a/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/NewsletterWYSIWYGSection.xml
+++ b/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/NewsletterWYSIWYGSection.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="NewsletterWYSIWYGSection">
+    <section name="NewsletterWYSIWYGSection" deprecated="This version of TinyMCE is no longer supported">
         <element name="TinyMCE3" type="text" selector="#cms_page_form_content_tbl"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/ProductWYSIWYGSection.xml b/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/ProductWYSIWYGSection.xml
index 9ce4e067169ec..bc666d3590a8f 100644
--- a/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/ProductWYSIWYGSection.xml
+++ b/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/ProductWYSIWYGSection.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="ProductWYSIWYGSection">
+    <section name="ProductWYSIWYGSection" deprecated="This version of TinyMCE is no longer supported">
         <element name="Tinymce3MSG" type="button" selector=".admin__field-error"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/TinyMCESection.xml b/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/TinyMCESection.xml
index cb46bed781e5a..9080af01c9a5b 100644
--- a/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/TinyMCESection.xml
+++ b/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/TinyMCESection.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="TinyMCESection">
+    <section name="TinyMCESection" deprecated="This version of TinyMCE is no longer supported">
         <element name="TinyMCE3" type="text" selector="#cms_page_form_content_tbl"/>
         <element name="InsertImageBtnTinyMCE3" type="button" selector="#cms_page_form_content_image"/>
     </section>
diff --git a/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml b/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml
index 9c4e7bf3a646a..3fdc99c29faf6 100644
--- a/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml
+++ b/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminSwitchWYSIWYGOptionsTest">
+    <test name="AdminSwitchWYSIWYGOptionsTest" deprecated="TinyMCE3 is no longer supported">
         <annotations>
             <features value="Cms"/>
             <stories value="MAGETWO-51829-Extensible list of WYSIWYG editors available in Magento"/>
@@ -17,6 +17,9 @@
             <description value="Admin should able to switch between versions of TinyMCE"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MC-6114"/>
+            <skip>
+                <issueId value="DEPRECATED">TinyMCE3 is no longer supported</issueId>
+            </skip>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginGetFromGeneralFile"/>
diff --git a/app/code/Magento/Tinymce3/etc/adminhtml/di.xml b/app/code/Magento/Tinymce3/etc/adminhtml/di.xml
index 53ab66c7ef21f..bcccf44594103 100644
--- a/app/code/Magento/Tinymce3/etc/adminhtml/di.xml
+++ b/app/code/Magento/Tinymce3/etc/adminhtml/di.xml
@@ -39,14 +39,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Cms\Model\Config\Source\Wysiwyg\Editor">
-        <arguments>
-            <argument name="adapterOptions" xsi:type="array">
-                <item name="tinymce3" xsi:type="array">
-                    <item name="value" xsi:type="const">Magento\Tinymce3\Model\Config\Source\Wysiwyg\Editor::WYSIWYG_EDITOR_CONFIG_VALUE</item>
-                    <item name="label" xsi:type="string" translatable="true">TinyMCE 3 (deprecated)</item>
-                </item>
-            </argument>
-        </arguments>
-    </type>
 </config>
diff --git a/app/code/Magento/Tinymce3/etc/di.xml b/app/code/Magento/Tinymce3/etc/di.xml
index e03d865ce4e01..0b1175b0cd94c 100644
--- a/app/code/Magento/Tinymce3/etc/di.xml
+++ b/app/code/Magento/Tinymce3/etc/di.xml
@@ -6,11 +6,4 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\Ui\Block\Wysiwyg\ActiveEditor">
-        <arguments>
-            <argument name="availableAdapterPaths" xsi:type="array">
-                <item name="Magento_Tinymce3/tinymce3Adapter" xsi:type="string"/>
-            </argument>
-        </arguments>
-    </type>
 </config>
diff --git a/app/code/Magento/Ui/DataProvider/Modifier/WysiwygModifierInterface.php b/app/code/Magento/Ui/DataProvider/Modifier/WysiwygModifierInterface.php
index 6336d8f8fb828..67420a081af86 100644
--- a/app/code/Magento/Ui/DataProvider/Modifier/WysiwygModifierInterface.php
+++ b/app/code/Magento/Ui/DataProvider/Modifier/WysiwygModifierInterface.php
@@ -12,7 +12,7 @@ interface WysiwygModifierInterface
 {
     /**
      * Provide editor name
-     * For example tmce3 or tmce4
+     * For example tmce4
      *
      * @return array
      */
diff --git a/app/design/adminhtml/Magento/backend/etc/view.xml b/app/design/adminhtml/Magento/backend/etc/view.xml
index 621c18fc97cc8..6539e3330e98b 100644
--- a/app/design/adminhtml/Magento/backend/etc/view.xml
+++ b/app/design/adminhtml/Magento/backend/etc/view.xml
@@ -59,7 +59,6 @@
         <item type="file">Lib::requirejs/require.js</item>
         <item type="file">Lib::requirejs/text.js</item>
         <item type="file">Lib::varien/js.js</item>
-        <item type="directory">Magento_Tinymce3::tiny_mce</item>
         <item type="directory">Lib::css</item>
         <item type="directory">Lib::lib</item>
         <item type="directory">Lib::prototype</item>
diff --git a/app/design/frontend/Magento/blank/etc/view.xml b/app/design/frontend/Magento/blank/etc/view.xml
index dbadb958d0471..3ef51a93c4fe2 100644
--- a/app/design/frontend/Magento/blank/etc/view.xml
+++ b/app/design/frontend/Magento/blank/etc/view.xml
@@ -291,7 +291,6 @@
         <item type="directory">Magento_Ui::templates/grid</item>
         <item type="directory">Magento_Ui::templates/dynamic-rows</item>
         <item type="directory">Magento_Swagger::swagger-ui</item>
-        <item type="directory">Magento_Tinymce3::tiny_mce</item>
         <item type="directory">Lib::modernizr</item>
         <item type="directory">Lib::tiny_mce</item>
         <item type="directory">Lib::varien</item>
diff --git a/app/design/frontend/Magento/luma/etc/view.xml b/app/design/frontend/Magento/luma/etc/view.xml
index b02f221784494..7b33c02a68750 100644
--- a/app/design/frontend/Magento/luma/etc/view.xml
+++ b/app/design/frontend/Magento/luma/etc/view.xml
@@ -302,7 +302,6 @@
         <item type="directory">Magento_Ui::templates/grid</item>
         <item type="directory">Magento_Ui::templates/dynamic-rows</item>
         <item type="directory">Magento_Swagger::swagger-ui</item>
-        <item type="directory">Magento_Tinymce3::tiny_mce</item>
         <item type="directory">Lib::modernizr</item>
         <item type="directory">Lib::tiny_mce</item>
         <item type="directory">Lib::varien</item>

From 0c3565e730f2471a34fdf62f29eac33049536a25 Mon Sep 17 00:00:00 2001
From: kphan <kphan@adobe.com>
Date: Wed, 22 Jul 2020 16:56:08 -0500
Subject: [PATCH 0985/1718] MC-33330: Product is removed from Shopping Cart
 after cancel PayPal checkout flow Fixed static test by changing class
 description in PlaceOrder.php

---
 .../Paypal/Controller/Express/AbstractExpress/PlaceOrder.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php
index 50efc763a4456..29d4a5bd1f25c 100644
--- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php
+++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php
@@ -11,7 +11,7 @@
 use Magento\Paypal\Model\Api\ProcessableException as ApiProcessableException;
 
 /**
- * Class PlaceOrder
+ * Creates order on backend and prepares session to show appropriate next step in flow
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class PlaceOrder extends \Magento\Paypal\Controller\Express\AbstractExpress

From 6e8867f80436afdd2dd75051e62e572ca7191ba0 Mon Sep 17 00:00:00 2001
From: Matt Walters <bluemwhitew@hotmail.co.uk>
Date: Wed, 22 Jul 2020 22:21:00 +0100
Subject: [PATCH 0986/1718] magento/magento2-page-builder#543: Content Product
 Attributes Default Sorting Order - Refactoring

---
 .../Data/UpdateProductDescriptionOrder.php    | 31 ++++++-------------
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductDescriptionOrder.php b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductDescriptionOrder.php
index 42d9339fdd6d8..5b6d2627f65c9 100644
--- a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductDescriptionOrder.php
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductDescriptionOrder.php
@@ -47,34 +47,21 @@ public function apply()
     {
         /** @var CategorySetup $categorySetup */
         $categorySetup = $this->categorySetupFactory->create(['setup' => $this->moduleDataSetup]);
-        $attributeSetId = $categorySetup->getDefaultAttributeSetId(\Magento\Catalog\Model\Product::ENTITY);
+        $entityTypeId = $categorySetup->getEntityTypeId(\Magento\Catalog\Model\Product::ENTITY);
 
         // Content
-        $categorySetup->addAttributeGroup(
-            \Magento\Catalog\Model\Product::ENTITY,
-            $attributeSetId,
-            'Content',
-            15
-        );
-        $categorySetup->updateAttributeGroup(
-            \Magento\Catalog\Model\Product::ENTITY,
-            $attributeSetId,
-            'Content',
-            'tab_group_code',
-            'basic'
-        );
-        $categorySetup->addAttributeToGroup(
-            \Magento\Catalog\Model\Product::ENTITY,
-            $attributeSetId,
-            'Content',
+        $categorySetup->updateAttribute(
+            $entityTypeId,
             'short_description',
+            'frontend_label',
+            'Short Description',
             100
         );
-        $categorySetup->addAttributeToGroup(
-            \Magento\Catalog\Model\Product::ENTITY,
-            $attributeSetId,
-            'Content',
+        $categorySetup->updateAttribute(
+            $entityTypeId,
             'description',
+            'frontend_label',
+            'Description',
             110
         );
     }

From b24efece34efe540403ce1c9e0b12d00a0f06021 Mon Sep 17 00:00:00 2001
From: Vitalii Zabaznov <vzabaznov@magento.com>
Date: Wed, 22 Jul 2020 17:28:15 -0500
Subject: [PATCH 0987/1718] MC-35885: Process public PR with bin/magento
 improvements

---
 .../Magento/Framework/Module/Dir/Reader.php      |  6 +++++-
 .../Magento/Framework/Module/ModuleList.php      | 16 ++++------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/lib/internal/Magento/Framework/Module/Dir/Reader.php b/lib/internal/Magento/Framework/Module/Dir/Reader.php
index 141a291ea6818..f4b287a18860f 100644
--- a/lib/internal/Magento/Framework/Module/Dir/Reader.php
+++ b/lib/internal/Magento/Framework/Module/Dir/Reader.php
@@ -124,7 +124,11 @@ private function getFiles($filename, $subDir = '')
     {
         $result = [];
         foreach ($this->modulesList->getNames() as $moduleName) {
-            $moduleSubDir = $this->getModuleDir($subDir, $moduleName);
+            try {
+                $moduleSubDir = $this->getModuleDir($subDir, $moduleName);
+            } catch (\InvalidArgumentException $e) {
+                continue;
+            }
             $file = $moduleSubDir . '/' . $filename;
             $directoryRead = $this->readFactory->create($moduleSubDir);
             $path = $directoryRead->getRelativePath($file);
diff --git a/lib/internal/Magento/Framework/Module/ModuleList.php b/lib/internal/Magento/Framework/Module/ModuleList.php
index 20cf0bc773156..b3cf433bbaf45 100644
--- a/lib/internal/Magento/Framework/Module/ModuleList.php
+++ b/lib/internal/Magento/Framework/Module/ModuleList.php
@@ -7,7 +7,6 @@
 
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Config\ConfigOptionsListConstants;
-use Magento\Framework\Module\ModuleList\Loader;
 
 /**
  * A list of modules in the Magento application
@@ -27,7 +26,7 @@ class ModuleList implements ModuleListInterface
     /**
      * Loader of module information from source code
      *
-     * @var Loader
+     * @var ModuleList\Loader
      */
     private $loader;
 
@@ -51,9 +50,9 @@ class ModuleList implements ModuleListInterface
      * Constructor
      *
      * @param DeploymentConfig $config
-     * @param Loader $loader
+     * @param ModuleList\Loader $loader
      */
-    public function __construct(DeploymentConfig $config, Loader $loader)
+    public function __construct(DeploymentConfig $config, ModuleList\Loader $loader)
     {
         $this->config = $config;
         $this->loader = $loader;
@@ -99,17 +98,10 @@ public function getOne($name)
     public function getNames()
     {
         $this->loadConfigData();
-
-        $modulesList = array_keys($this->loader->load());
-
         if (!$this->configData) {
             return [];
         }
-
-        $modulesInConfig = array_keys(array_filter($this->configData));
-
-        $result = array_intersect($modulesInConfig, $modulesList);
-
+        $result = array_keys(array_filter($this->configData));
         return $result;
     }
 

From b34b29d4d5dd673c8f09c0f8f8c172cf9a74cbd9 Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Wed, 22 Jul 2020 19:32:07 -0500
Subject: [PATCH 0988/1718] MC-34573: Update TinyMCE

- Use comment deprecation for selectors due to known issue with mftf deprecatedEntityUsage static test
- Fixed static test failures
---
 .../Test/Mftf/Section/TinyMCESection/MediaGallerySection.xml | 3 ++-
 .../AdminTinymce3FileldsSection/NewsletterWYSIWYGSection.xml | 4 ++--
 .../Section/AdminTinymce3FileldsSection/TinyMCESection.xml   | 4 +++-
 .../Ui/DataProvider/Modifier/WysiwygModifierInterface.php    | 5 +++--
 4 files changed, 10 insertions(+), 6 deletions(-)

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 42675f3ee72e5..8841ce4668aa5 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/MediaGallerySection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/MediaGallerySection.xml
@@ -17,7 +17,8 @@
         <element name="imageSelected" type="text" selector="//small[text()='{{var1}}']/parent::*[@class='filecnt selected']" parameterized="true"/>
         <element name="ImageSource" type="input" selector=".mce-combobox.mce-abs-layout-item.mce-last.mce-has-open"/>
         <element name="ImageDescription" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-last"/>
-        <element name="ImageDescriptionTinyMCE3" type="input" selector="#alt" deprecated="New element was introduced. Please use 'ImageDescriptionTinyMCE4'"/>
+        <!-- Deprecated New element was introduced. Please use 'ImageDescriptionTinyMCE4'-->
+        <element name="ImageDescriptionTinyMCE3" type="input" selector="#alt"/>
         <element name="ImageDescriptionTinyMCE4" type="input" selector="#alt" />
         <element name="Height" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-first"/>
         <element name="UploadImage" type="file" selector=".fileupload"/>
diff --git a/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/NewsletterWYSIWYGSection.xml b/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/NewsletterWYSIWYGSection.xml
index fec71209c1f99..13917561629bc 100644
--- a/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/NewsletterWYSIWYGSection.xml
+++ b/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/NewsletterWYSIWYGSection.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="NewsletterWYSIWYGSection" deprecated="This version of TinyMCE is no longer supported">
-        <element name="TinyMCE3" type="text" selector="#cms_page_form_content_tbl"/>
+    <section name="NewsletterWYSIWYGSection">
+        <element name="TinyMCE3" type="text" selector="#cms_page_form_content_tbl" deprecated="This version of TinyMCE is no longer supported"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/TinyMCESection.xml b/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/TinyMCESection.xml
index 9080af01c9a5b..5a8242defeb90 100644
--- a/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/TinyMCESection.xml
+++ b/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/TinyMCESection.xml
@@ -7,8 +7,10 @@
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-    <section name="TinyMCESection" deprecated="This version of TinyMCE is no longer supported">
+    <section name="TinyMCESection">
+        <!-- Deprecated this version of TinyMCE is no longer supported -->
         <element name="TinyMCE3" type="text" selector="#cms_page_form_content_tbl"/>
+        <!-- Deprecated this version of TinyMCE is no longer supported -->
         <element name="InsertImageBtnTinyMCE3" type="button" selector="#cms_page_form_content_image"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Ui/DataProvider/Modifier/WysiwygModifierInterface.php b/app/code/Magento/Ui/DataProvider/Modifier/WysiwygModifierInterface.php
index 67420a081af86..93ede9ad0a4f8 100644
--- a/app/code/Magento/Ui/DataProvider/Modifier/WysiwygModifierInterface.php
+++ b/app/code/Magento/Ui/DataProvider/Modifier/WysiwygModifierInterface.php
@@ -11,15 +11,16 @@
 interface WysiwygModifierInterface
 {
     /**
-     * Provide editor name
-     * For example tmce4
+     * Provide editor name for example tmce4
      *
      * @return array
      */
     public function getEditorName();
 
     /**
+     * Modifies the meta
      * @param array $meta
+     *
      * @return array
      */
     public function modifyMeta(array $meta);

From f6574e4c828f6f909e59d5d88d9ce59894c4f8e1 Mon Sep 17 00:00:00 2001
From: John Carlo Octabio <johncarlo@abovethefray.io>
Date: Thu, 23 Jul 2020 12:10:01 +0800
Subject: [PATCH 0989/1718] magento/magento2#108: Clear Shopping Cart -
 Refactor integration test incorrect PHPDoc description

---
 .../testsuite/Magento/Checkout/ViewModel/CartTest.php           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Checkout/ViewModel/CartTest.php b/dev/tests/integration/testsuite/Magento/Checkout/ViewModel/CartTest.php
index 8ae61d5ea7928..7fb57ca0f4090 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/ViewModel/CartTest.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/ViewModel/CartTest.php
@@ -107,7 +107,7 @@ public function testConfigClearShoppingCartEnabledWithWebsiteScopes()
     }
 
     /**
-     * Set purchase order enabled status.
+     * Set clear shopping cart enabled.
      *
      * @param bool $isActive
      * @param string $scope

From be2aaae781d9cc4fda3834841324f564285bdb71 Mon Sep 17 00:00:00 2001
From: ameysar <andrii.meysar@transoftgroup.com>
Date: Thu, 23 Jul 2020 12:48:03 +0300
Subject: [PATCH 0990/1718] MC-31304: [ElasticSearch] Exception on catalog
 search result page

---
 app/code/Magento/CatalogSearch/etc/di.xml     |   2 +-
 .../Model/Client/Elasticsearch.php            |  28 +++
 .../Model/Adapter/Elasticsearch.php           |  52 +++++-
 .../Magento/Elasticsearch/Model/Config.php    |  10 +-
 .../Plugin/Category/Product/Attribute.php     |  92 ++++++++++
 .../Model/Indexer/IndexerHandler.php          |  24 ++-
 .../Model/Client/ElasticsearchTest.php        |  17 ++
 .../Unit/Model/Adapter/ElasticsearchTest.php  |  77 +++++++-
 .../Test/Unit/Model/ConfigTest.php            |  78 ++++++++-
 .../Plugin/Category/Product/AttributeTest.php | 164 ++++++++++++++++++
 .../Unit/Model/Indexer/IndexerHandlerTest.php |  40 +++++
 app/code/Magento/Elasticsearch/etc/di.xml     |   8 +
 app/code/Magento/Elasticsearch/i18n/en_US.csv |   1 +
 .../Model/Client/Elasticsearch.php            |  28 +++
 .../Unit/Model/Client/ElasticsearchTest.php   |  17 ++
 .../Model/Client/Elasticsearch.php            |  28 +++
 .../Unit/Model/Client/ElasticsearchTest.php   |  17 ++
 .../Plugin/Category/Product/AttributeTest.php | 111 ++++++++++++
 18 files changed, 774 insertions(+), 20 deletions(-)
 create mode 100644 app/code/Magento/Elasticsearch/Model/Indexer/Fulltext/Plugin/Category/Product/Attribute.php
 create mode 100644 app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Category/Product/AttributeTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/Fulltext/Plugin/Category/Product/AttributeTest.php

diff --git a/app/code/Magento/CatalogSearch/etc/di.xml b/app/code/Magento/CatalogSearch/etc/di.xml
index 6ff9119e78c2a..628be3114028d 100644
--- a/app/code/Magento/CatalogSearch/etc/di.xml
+++ b/app/code/Magento/CatalogSearch/etc/di.xml
@@ -47,7 +47,7 @@
         <plugin name="catalogsearchFulltextIndexerStoreGroup" type="Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\Store\Group"/>
     </type>
     <type name="Magento\Catalog\Model\ResourceModel\Attribute">
-        <plugin name="catalogsearchFulltextIndexerAttribute" type="Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\Attribute"/>
+        <plugin name="catalogsearchFulltextIndexerAttribute" type="Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\Attribute" sortOrder="10"/>
         <plugin name="catalogsearchAttributeSearchWeightCache" type="Magento\CatalogSearch\Model\Attribute\SearchWeight"/>
     </type>
     <type name="Magento\Framework\Search\EntityMetadata" />
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php
index 1ea2b6958734c..2560d7e26e7d9 100644
--- a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php
+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php
@@ -166,6 +166,23 @@ public function createIndex($index, $settings)
         );
     }
 
+    /**
+     * Add/update an Elasticsearch index settings.
+     *
+     * @param string $index
+     * @param array $settings
+     * @return void
+     */
+    public function putIndexSettings(string $index, array $settings): void
+    {
+        $this->getClient()->indices()->putSettings(
+            [
+                'index' => $index,
+                'body' => $settings,
+            ]
+        );
+    }
+
     /**
      * Delete an Elasticsearch index.
      *
@@ -348,6 +365,17 @@ private function prepareFieldInfo($fieldInfo)
         return $fieldInfo;
     }
 
+    /**
+     * Get mapping from Elasticsearch index.
+     *
+     * @param array $params
+     * @return array
+     */
+    public function getMapping(array $params): array
+    {
+        return $this->getClient()->indices()->getMapping($params);
+    }
+
     /**
      * Delete mapping in Elasticsearch index
      *
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php b/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
index 5ab6669a34cc4..00ce79dd1b7cf 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
@@ -6,6 +6,9 @@
 
 namespace Magento\Elasticsearch\Model\Adapter;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Stdlib\ArrayManager;
+
 /**
  * Elasticsearch adapter
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -69,6 +72,11 @@ class Elasticsearch
      */
     private $batchDocumentDataMapper;
 
+    /**
+     * @var ArrayManager
+     */
+    private $arrayManager;
+
     /**
      * @param \Magento\Elasticsearch\SearchAdapter\ConnectionManager $connectionManager
      * @param FieldMapperInterface $fieldMapper
@@ -78,6 +86,7 @@ class Elasticsearch
      * @param Index\IndexNameResolver $indexNameResolver
      * @param BatchDataMapperInterface $batchDocumentDataMapper
      * @param array $options
+     * @param ArrayManager|null $arrayManager
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function __construct(
@@ -88,7 +97,8 @@ public function __construct(
         \Psr\Log\LoggerInterface $logger,
         \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver $indexNameResolver,
         BatchDataMapperInterface $batchDocumentDataMapper,
-        $options = []
+        $options = [],
+        ArrayManager $arrayManager = null
     ) {
         $this->connectionManager = $connectionManager;
         $this->fieldMapper = $fieldMapper;
@@ -97,6 +107,8 @@ public function __construct(
         $this->logger = $logger;
         $this->indexNameResolver = $indexNameResolver;
         $this->batchDocumentDataMapper = $batchDocumentDataMapper;
+        $this->arrayManager = $arrayManager ?:
+            ObjectManager::getInstance()->get(ArrayManager::class);
 
         try {
             $this->client = $this->connectionManager->getConnection($options);
@@ -327,6 +339,44 @@ public function updateAlias($storeId, $mappedIndexerId)
         return $this;
     }
 
+    /**
+     * Update Elasticsearch mapping for index.
+     *
+     * @param int $storeId
+     * @param string $mappedIndexerId
+     *
+     * @return $this
+     */
+    public function updateIndexMapping(int $storeId, string $mappedIndexerId): self
+    {
+        $indexName = $this->indexNameResolver->getIndexFromAlias($storeId, $mappedIndexerId);
+        if (empty($indexName)) {
+            return $this;
+        }
+
+        $allAttributeTypes = $this->fieldMapper->getAllAttributesTypes([
+            'entityType' => $mappedIndexerId,
+            'websiteId' => $storeId,
+        ]);
+
+        $mappedAttributes = $this->client->getMapping(['index' => $indexName]);
+        $pathField = $this->arrayManager->findPath('properties', $mappedAttributes);
+        $mappedAttributes = $this->arrayManager->get($pathField, $mappedAttributes, $allAttributeTypes);
+
+        $settings['index']['mapping']['total_fields']['limit'] = $this->getMappingTotalFieldsLimit($allAttributeTypes);
+        $this->client->putIndexSettings($indexName, ['settings' => $settings]);
+        $attrToUpdate = array_diff_key($allAttributeTypes, $mappedAttributes);
+        if (!empty($attrToUpdate)) {
+            $this->client->addFieldsMapping(
+                $attrToUpdate,
+                $indexName,
+                $this->clientConfig->getEntityType()
+            );
+        }
+
+        return $this;
+    }
+
     /**
      * Create new index with mapping.
      *
diff --git a/app/code/Magento/Elasticsearch/Model/Config.php b/app/code/Magento/Elasticsearch/Model/Config.php
index 3766d825aefb5..ccd56c9c8d316 100644
--- a/app/code/Magento/Elasticsearch/Model/Config.php
+++ b/app/code/Magento/Elasticsearch/Model/Config.php
@@ -45,7 +45,7 @@ class Config implements ClientOptionsInterface
     protected $scopeConfig;
 
     /**
-     * @var string
+     * @var string|null
      */
     private $prefix;
 
@@ -83,7 +83,7 @@ public function __construct(
         $this->scopeConfig = $scopeConfig;
         $this->clientResolver = $clientResolver;
         $this->engineResolver = $engineResolver;
-        $this->prefix = $prefix ?: $this->clientResolver->getCurrentEngine();
+        $this->prefix = $prefix;
         $this->engineList = $engineList;
     }
 
@@ -101,7 +101,7 @@ public function prepareClientOptions($options = [])
             'enableAuth' => $this->getElasticsearchConfigData('enable_auth'),
             'username' => $this->getElasticsearchConfigData('username'),
             'password' => $this->getElasticsearchConfigData('password'),
-            'timeout' => $this->getElasticsearchConfigData('server_timeout') ? : self::ELASTICSEARCH_DEFAULT_TIMEOUT,
+            'timeout' => $this->getElasticsearchConfigData('server_timeout') ?: self::ELASTICSEARCH_DEFAULT_TIMEOUT,
         ];
         $options = array_merge($defaultOptions, $options);
         $allowedOptions = array_merge(array_keys($defaultOptions), ['engine']);
@@ -125,7 +125,9 @@ function (string $key) use ($allowedOptions) {
      */
     public function getElasticsearchConfigData($field, $storeId = null)
     {
-        return $this->getSearchConfigData($this->prefix . '_' . $field, $storeId);
+        $searchEngine = $this->prefix ?: $this->clientResolver->getCurrentEngine();
+
+        return $this->getSearchConfigData($searchEngine . '_' . $field, $storeId);
     }
 
     /**
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
new file mode 100644
index 0000000000000..5b41f1093bdbe
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Indexer/Fulltext/Plugin/Category/Product/Attribute.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Indexer\Fulltext\Plugin\Category\Product;
+
+use Magento\Catalog\Model\ResourceModel\Attribute as AttributeResourceModel;
+use Magento\CatalogSearch\Model\Indexer\Fulltext\Processor;
+use Magento\Elasticsearch\Model\Config;
+use Magento\Elasticsearch\Model\Indexer\IndexerHandler as ElasticsearchIndexerHandler;
+use Magento\Framework\Indexer\DimensionProviderInterface;
+use Magento\CatalogSearch\Model\Indexer\IndexerHandlerFactory;
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * Catalog search indexer plugin for catalog attribute.
+ */
+class Attribute
+{
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var Processor
+     */
+    private $indexerProcessor;
+
+    /**
+     * @var DimensionProviderInterface
+     */
+    private $dimensionProvider;
+
+    /**
+     * @var IndexerHandlerFactory
+     */
+    private $indexerHandlerFactory;
+
+    /**
+     * @param Config $config
+     * @param Processor $indexerProcessor
+     * @param DimensionProviderInterface $dimensionProvider
+     * @param IndexerHandlerFactory $indexerHandlerFactory
+     */
+    public function __construct(
+        Config $config,
+        Processor $indexerProcessor,
+        DimensionProviderInterface $dimensionProvider,
+        IndexerHandlerFactory $indexerHandlerFactory
+    ) {
+        $this->config = $config;
+        $this->indexerProcessor = $indexerProcessor;
+        $this->dimensionProvider = $dimensionProvider;
+        $this->indexerHandlerFactory = $indexerHandlerFactory;
+    }
+
+    /**
+     * Update catalog search indexer mapping if third party search engine is used.
+     *
+     * @param AttributeResourceModel $subject
+     * @param AttributeResourceModel $result
+     * @return AttributeResourceModel
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @throws LocalizedException
+     */
+    public function afterSave(
+        AttributeResourceModel $subject,
+        AttributeResourceModel $result
+    ): AttributeResourceModel {
+        $indexer = $this->indexerProcessor->getIndexer();
+        if ($indexer->isInvalid()
+            && !$indexer->isScheduled()
+            && $this->config->isElasticsearchEnabled()
+        ) {
+            $indexerHandler = $this->indexerHandlerFactory->create(['data' => $indexer->getData()]);
+            if (!$indexerHandler instanceof ElasticsearchIndexerHandler) {
+                throw new LocalizedException(
+                    __('Created indexer handler must be instance of %1.', ElasticsearchIndexerHandler::class)
+                );
+            }
+            foreach ($this->dimensionProvider->getIterator() as $dimension) {
+                $indexerHandler->updateIndex($dimension);
+            }
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Indexer/IndexerHandler.php b/app/code/Magento/Elasticsearch/Model/Indexer/IndexerHandler.php
index 847710eaa445a..248338df1ee72 100644
--- a/app/code/Magento/Elasticsearch/Model/Indexer/IndexerHandler.php
+++ b/app/code/Magento/Elasticsearch/Model/Indexer/IndexerHandler.php
@@ -5,12 +5,13 @@
  */
 namespace Magento\Elasticsearch\Model\Indexer;
 
-use Magento\Framework\Indexer\SaveHandler\IndexerInterface;
-use Magento\Framework\Indexer\SaveHandler\Batch;
-use Magento\Framework\Indexer\IndexStructureInterface;
 use Magento\Elasticsearch\Model\Adapter\Elasticsearch as ElasticsearchAdapter;
 use Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver;
 use Magento\Framework\App\ScopeResolverInterface;
+use Magento\Framework\Indexer\IndexStructureInterface;
+use Magento\Framework\Indexer\SaveHandler\Batch;
+use Magento\Framework\Indexer\SaveHandler\IndexerInterface;
+use Magento\Framework\Search\Request\Dimension;
 
 /**
  * Indexer Handler for Elasticsearch engine.
@@ -18,7 +19,7 @@
 class IndexerHandler implements IndexerInterface
 {
     /**
-     * Default batch size
+     * Size of default batch
      */
     const DEFAULT_BATCH_SIZE = 500;
 
@@ -132,6 +133,21 @@ public function isAvailable($dimensions = [])
         return $this->adapter->ping();
     }
 
+    /**
+     * Update mapping data for index.
+     *
+     * @param Dimension[] $dimensions
+     * @return IndexerInterface
+     */
+    public function updateIndex(array $dimensions): IndexerInterface
+    {
+        $dimension = current($dimensions);
+        $scopeId = $this->scopeResolver->getScope($dimension->getValue())->getId();
+        $this->adapter->updateIndexMapping($scopeId, $this->getIndexerId());
+
+        return $this;
+    }
+
     /**
      * Returns indexer id.
      *
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php
index fc146e801124a..398c79f056810 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php
@@ -69,6 +69,7 @@ protected function setUp(): void
                     'create',
                     'delete',
                     'putMapping',
+                    'getMapping',
                     'deleteMapping',
                     'stats',
                     'updateAliases',
@@ -533,6 +534,22 @@ public function testDeleteMappingFailure()
         );
     }
 
+    /**
+     * Test get Elasticsearch mapping process.
+     *
+     * @return void
+     */
+    public function testGetMapping(): void
+    {
+        $params = ['index' => 'indexName'];
+        $this->indicesMock->expects($this->once())
+            ->method('getMapping')
+            ->with($params)
+            ->willReturn([]);
+
+        $this->model->getMapping($params);
+    }
+
     /**
      * Test query() method
      * @return void
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php
index dd4bffe8e7c33..3b1163bd8d47f 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php
@@ -19,6 +19,7 @@
 use Magento\Elasticsearch\Model\Config;
 use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Stdlib\ArrayManager;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -81,6 +82,11 @@ class ElasticsearchTest extends TestCase
      */
     protected $indexNameResolver;
 
+    /**
+     * @var ArrayManager|MockObject
+     */
+    private $arrayManager;
+
     /**
      * Setup
      *
@@ -177,9 +183,11 @@ protected function setUp(): void
             )
             ->disableOriginalConstructor()
             ->getMock();
-        $this->batchDocumentDataMapper = $this->getMockBuilder(
-            BatchDataMapperInterface::class
-        )->disableOriginalConstructor()
+        $this->batchDocumentDataMapper = $this->getMockBuilder(BatchDataMapperInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->arrayManager = $this->getMockBuilder(ArrayManager::class)
+            ->disableOriginalConstructor()
             ->getMock();
         $this->model = $this->objectManager->getObject(
             \Magento\Elasticsearch\Model\Adapter\Elasticsearch::class,
@@ -192,6 +200,7 @@ protected function setUp(): void
                 'logger' => $this->logger,
                 'indexNameResolver' => $this->indexNameResolver,
                 'options' => [],
+                'arrayManager' => $this->arrayManager,
             ]
         );
     }
@@ -459,6 +468,68 @@ public function testUpdateAliasWithoutOldIndex()
         $this->assertEquals($this->model, $this->model->updateAlias(1, 'product'));
     }
 
+    /**
+     * Test update Elasticsearch mapping for index alias without definition.
+     *
+     * @return void
+     */
+    public function testUpdateIndexMappingWithoutAliasDefinition(): void
+    {
+        $storeId = 1;
+        $mappedIndexerId = 'product';
+
+        $this->indexNameResolver->expects($this->once())
+            ->method('getIndexFromAlias')
+            ->with($storeId, $mappedIndexerId)
+            ->willReturn('');
+
+        $this->fieldMapper->expects($this->never())
+            ->method('getAllAttributesTypes');
+
+        $this->model->updateIndexMapping($storeId, $mappedIndexerId);
+    }
+
+    /**
+     * Test update Elasticsearch mapping for index alias with definition.
+     *
+     * @return void
+     */
+    public function testUpdateIndexMappingWithAliasDefinition(): void
+    {
+        $storeId = 1;
+        $mappedIndexerId = 'product';
+        $indexName = '_product_1_v1';
+        $allAttributeTypes = ['name' => 'string'];
+
+        $this->indexNameResolver->expects($this->once())
+            ->method('getIndexFromAlias')
+            ->with($storeId, $mappedIndexerId)
+            ->willReturn($indexName);
+
+        $this->fieldMapper->expects($this->once())
+            ->method('getAllAttributesTypes')
+            ->with([
+                'entityType' => $mappedIndexerId,
+                'websiteId' => $storeId,
+            ])
+            ->willReturn($allAttributeTypes);
+
+        $this->client->expects($this->once())
+            ->method('getMapping')
+            ->with(['index' => $indexName])
+            ->willReturn(['properties' => ['attribute_name' => 'attribute_value']]);
+
+        $this->arrayManager->expects($this->once())
+            ->method('get')
+            ->willReturn(['attribute_name' => 'attribute_value']);
+
+        $this->client->expects($this->once())
+            ->method('addFieldsMapping')
+            ->with($allAttributeTypes, $indexName, 'product');
+
+        $this->model->updateIndexMapping($storeId, $mappedIndexerId);
+    }
+
     /**
      * Get elasticsearch client options
      *
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/ConfigTest.php
index 34d3bdaf11e18..50ff5dab48fe9 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Model/ConfigTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/ConfigTest.php
@@ -7,12 +7,17 @@
 
 namespace Magento\Elasticsearch\Test\Unit\Model;
 
+use Magento\AdvancedSearch\Model\Client\ClientResolver;
 use Magento\Elasticsearch\Model\Config;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * Elasticsearch config model tests.
+ */
 class ConfigTest extends TestCase
 {
     /**
@@ -23,7 +28,17 @@ class ConfigTest extends TestCase
     /**
      * @var ScopeConfigInterface|MockObject
      */
-    protected $scopeConfig;
+    protected $scopeConfigMock;
+
+    /**
+     * @var ClientResolver|MockObject
+     */
+    private $clientResolverMock;
+
+    /**
+     * @var ObjectManagerHelper
+     */
+    private $objectManager;
 
     /**
      * Setup
@@ -32,15 +47,17 @@ class ConfigTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->scopeConfig = $this->getMockBuilder(ScopeConfigInterface::class)
+        $this->scopeConfigMock = $this->getMockBuilder(ScopeConfigInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
+        $this->clientResolverMock = $this->createMock(ClientResolver::class);
 
-        $objectManager = new ObjectManagerHelper($this);
-        $this->model = $objectManager->getObject(
+        $this->objectManager = new ObjectManagerHelper($this);
+        $this->model = $this->objectManager->getObject(
             Config::class,
             [
-                'scopeConfig' => $this->scopeConfig
+                'scopeConfig' => $this->scopeConfigMock,
+                'clientResolver' => $this->clientResolverMock,
             ]
         );
     }
@@ -50,7 +67,7 @@ protected function setUp(): void
      */
     public function testPrepareClientOptions()
     {
-        $this->scopeConfig->expects($this->any())
+        $this->scopeConfigMock->expects($this->any())
             ->method('getValue')
             ->willReturn('');
         $options = [
@@ -70,7 +87,7 @@ public function testPrepareClientOptions()
      */
     public function testGetIndexPrefix()
     {
-        $this->scopeConfig->expects($this->any())
+        $this->scopeConfigMock->expects($this->any())
             ->method('getValue')
             ->willReturn('indexPrefix');
         $this->assertEquals('indexPrefix', $this->model->getIndexPrefix());
@@ -91,4 +108,51 @@ public function testIsElasticsearchEnabled()
     {
         $this->assertFalse($this->model->isElasticsearchEnabled());
     }
+
+    /**
+     * Test retrieve search engine configuration information.
+     *
+     * @return void
+     */
+    public function testGetElasticsearchConfigData(): void
+    {
+        $fieldName = 'server_hostname';
+
+        $this->clientResolverMock->expects($this->once())
+            ->method('getCurrentEngine')
+            ->willReturn(Config::ENGINE_NAME);
+
+        $this->scopeConfigMock->expects($this->once())
+            ->method('getValue')
+            ->with('catalog/search/' . Config::ENGINE_NAME . '_' . $fieldName, ScopeInterface::SCOPE_STORE, 1);
+
+        $this->model->getElasticsearchConfigData($fieldName, 1);
+    }
+
+    /**
+     * Test retrieve search engine configuration information with predefined prefix.
+     *
+     * @return void
+     */
+    public function testGetElasticsearchConfigDataWithPredefinedPrefix(): void
+    {
+        $fieldName = 'server_hostname';
+        $model = $this->objectManager->getObject(
+            Config::class,
+            [
+                'scopeConfig' => $this->scopeConfigMock,
+                'clientResolver' => $this->clientResolverMock,
+                'prefix' => Config::ENGINE_NAME,
+            ]
+        );
+
+        $this->clientResolverMock->expects($this->never())
+            ->method('getCurrentEngine');
+
+        $this->scopeConfigMock->expects($this->once())
+            ->method('getValue')
+            ->with('catalog/search/' . Config::ENGINE_NAME . '_' . $fieldName, ScopeInterface::SCOPE_STORE, 1);
+
+        $model->getElasticsearchConfigData($fieldName, 1);
+    }
 }
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Category/Product/AttributeTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Category/Product/AttributeTest.php
new file mode 100644
index 0000000000000..d37414cf63e68
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Category/Product/AttributeTest.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Test\Unit\Model\Indexer\Fulltext\Plugin\Category\Product;
+
+use ArrayIterator;
+use Magento\Catalog\Model\ResourceModel\Attribute as AttributeResourceModel;
+use Magento\CatalogSearch\Model\Indexer\Fulltext\Processor;
+use Magento\CatalogSearch\Model\Indexer\IndexerHandlerFactory;
+use Magento\Elasticsearch\Model\Config;
+use Magento\Elasticsearch\Model\Indexer\Fulltext\Plugin\Category\Product\Attribute;
+use Magento\Elasticsearch\Model\Indexer\IndexerHandler;
+use Magento\Framework\Indexer\DimensionProviderInterface;
+use Magento\Framework\Indexer\IndexerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\MockObject\Rule\InvokedCount as InvokedCountMatcher;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Tests for catalog search indexer plugin.
+ */
+class AttributeTest extends TestCase
+{
+    /**
+     * @var Config|MockObject
+     */
+    private $configMock;
+
+    /**
+     * @var Processor|MockObject
+     */
+    private $indexerProcessorMock;
+
+    /**
+     * @var DimensionProviderInterface|MockObject
+     */
+    private $dimensionProviderMock;
+
+    /**
+     * @var IndexerHandlerFactory|MockObject
+     */
+    private $indexerHandlerFactoryMock;
+
+    /**
+     * @var Attribute
+     */
+    private $attributePlugin;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->configMock = $this->createMock(Config::class);
+        $this->indexerProcessorMock = $this->createMock(Processor::class);
+        $this->dimensionProviderMock = $this->getMockBuilder(DimensionProviderInterface::class)
+            ->getMockForAbstractClass();
+        $this->indexerHandlerFactoryMock = $this->createMock(IndexerHandlerFactory::class);
+
+        $this->attributePlugin = (new ObjectManager($this))->getObject(
+            Attribute::class,
+            [
+                'config' => $this->configMock,
+                'indexerProcessor' => $this->indexerProcessorMock,
+                'dimensionProvider' => $this->dimensionProviderMock,
+                'indexerHandlerFactory' => $this->indexerHandlerFactoryMock,
+            ]
+        );
+    }
+
+    /**
+     * Test update catalog search indexer process.
+     *
+     * @param bool $isInvalid
+     * @param bool $isElasticsearchEnabled
+     * @param array $dimensions
+     * @return void
+     * @dataProvider afterSaveDataProvider
+     *
+     */
+    public function testAfterSave(bool $isInvalid, bool $isElasticsearchEnabled, array $dimensions): void
+    {
+        $indexerData = ['indexer_example_data'];
+
+        /** @var AttributeResourceModel|MockObject $subjectMock */
+        $subjectMock = $this->createMock(AttributeResourceModel::class);
+        /** @var IndexerInterface|MockObject $indexerMock */
+        $indexerMock = $this->getMockBuilder(IndexerInterface::class)
+            ->setMethods(['isInvalid', 'getData'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $indexerMock->expects($this->once())
+            ->method('isInvalid')
+            ->willReturn($isInvalid);
+
+        $indexerMock->expects($this->getExpectsCount($isInvalid, $isElasticsearchEnabled))
+            ->method('getData')
+            ->willReturn($indexerData);
+
+        $this->indexerProcessorMock->expects($this->once())
+            ->method('getIndexer')
+            ->willReturn($indexerMock);
+
+        $this->configMock->expects($isInvalid ? $this->once() : $this->never())
+            ->method('isElasticsearchEnabled')
+            ->willReturn($isElasticsearchEnabled);
+
+        /** @var IndexerHandler|MockObject $indexerHandlerMock */
+        $indexerHandlerMock = $this->createMock(IndexerHandler::class);
+
+        $indexerHandlerMock
+            ->expects(($isInvalid && $isElasticsearchEnabled) ? $this->exactly(count($dimensions)) : $this->never())
+            ->method('updateIndex')
+            ->willReturnSelf();
+
+        $this->indexerHandlerFactoryMock->expects($this->getExpectsCount($isInvalid, $isElasticsearchEnabled))
+            ->method('create')
+            ->with(['data' => $indexerData])
+            ->willReturn($indexerHandlerMock);
+
+        $this->dimensionProviderMock->expects($this->getExpectsCount($isInvalid, $isElasticsearchEnabled))
+            ->method('getIterator')
+            ->willReturn(new ArrayIterator($dimensions));
+
+        $this->attributePlugin->afterSave($subjectMock, $subjectMock);
+    }
+
+    /**
+     * DataProvider for testAfterSave().
+     *
+     * @return array
+     */
+    public function afterSaveDataProvider(): array
+    {
+        $dimensions = [['scope' => 1], ['scope' => 2]];
+
+        return [
+            'save_without_invalidation' => [false, false, []],
+            'save_with_mysql_search' => [true, false, $dimensions],
+            'save_with_elasticsearch' => [true, true, []],
+            'save_with_elasticsearch_and_dimensions' => [true, true, $dimensions],
+        ];
+    }
+
+    /**
+     * Retrieves how many times method is executed.
+     *
+     * @param bool $isInvalid
+     * @param bool $isElasticsearchEnabled
+     * @return InvokedCountMatcher
+     */
+    private function getExpectsCount(bool $isInvalid, bool $isElasticsearchEnabled): InvokedCountMatcher
+    {
+        return ($isInvalid && $isElasticsearchEnabled) ? $this->once() : $this->never();
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/IndexerHandlerTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/IndexerHandlerTest.php
index a147ca1b42b3b..7dce2879d72a6 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/IndexerHandlerTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/IndexerHandlerTest.php
@@ -267,4 +267,44 @@ public function testCleanIndex()
 
         $this->assertEquals($model, $result);
     }
+
+    /**
+     * Test mapping data is updated for index.
+     *
+     * @return void
+     */
+    public function testUpdateIndex(): void
+    {
+        $dimensionValue = 'SomeDimension';
+        $indexMapping = 'some_index_mapping';
+
+        $dimension = $this->getMockBuilder(Dimension::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $dimension->expects($this->once())
+            ->method('getValue')
+            ->willReturn($dimensionValue);
+
+        $this->scopeResolver->expects($this->once())
+            ->method('getScope')
+            ->with($dimensionValue)
+            ->willReturn($this->scopeInterface);
+
+        $this->scopeInterface->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
+
+        $this->indexNameResolver->expects($this->once())
+            ->method('getIndexMapping')
+            ->with('catalogsearch_fulltext')
+            ->willReturn($indexMapping);
+
+        $this->adapter->expects($this->once())
+            ->method('updateIndexMapping')
+            ->with(1, $indexMapping)
+            ->willReturnSelf();
+
+        $this->model->updateIndex([$dimension]);
+    }
 }
diff --git a/app/code/Magento/Elasticsearch/etc/di.xml b/app/code/Magento/Elasticsearch/etc/di.xml
index 6c1a771958081..6c61fb8fbe02c 100644
--- a/app/code/Magento/Elasticsearch/etc/di.xml
+++ b/app/code/Magento/Elasticsearch/etc/di.xml
@@ -550,4 +550,12 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Elasticsearch\Model\Indexer\Fulltext\Plugin\Category\Product\Attribute">
+        <arguments>
+            <argument name="dimensionProvider" xsi:type="object" shared="false">Magento\Store\Model\StoreDimensionProvider</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Catalog\Model\ResourceModel\Attribute">
+        <plugin name="updateElasticsearchIndexerMapping" type="Magento\Elasticsearch\Model\Indexer\Fulltext\Plugin\Category\Product\Attribute" sortOrder="20"/>
+    </type>
 </config>
diff --git a/app/code/Magento/Elasticsearch/i18n/en_US.csv b/app/code/Magento/Elasticsearch/i18n/en_US.csv
index 3a0ec556dbf8d..e36b3e054accd 100644
--- a/app/code/Magento/Elasticsearch/i18n/en_US.csv
+++ b/app/code/Magento/Elasticsearch/i18n/en_US.csv
@@ -11,3 +11,4 @@
 "Elasticsearch Server Timeout","Elasticsearch Server Timeout"
 "Test Connection","Test Connection"
 "Minimum Terms to Match","Minimum Terms to Match"
+"Created indexer handler must be instance of %1.", "Created indexer handler must be instance of %1."
diff --git a/app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php b/app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php
index e552d0067df84..839590a0f7fa2 100644
--- a/app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php
+++ b/app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php
@@ -177,6 +177,23 @@ public function createIndex($index, $settings)
         );
     }
 
+    /**
+     * Add/update an Elasticsearch index settings.
+     *
+     * @param string $index
+     * @param array $settings
+     * @return void
+     */
+    public function putIndexSettings(string $index, array $settings): void
+    {
+        $this->getClient()->indices()->putSettings(
+            [
+                'index' => $index,
+                'body' => $settings,
+            ]
+        );
+    }
+
     /**
      * Delete an Elasticsearch index.
      *
@@ -330,6 +347,17 @@ public function addFieldsMapping(array $fields, $index, $entityType)
         $this->getClient()->indices()->putMapping($params);
     }
 
+    /**
+     * Get mapping from Elasticsearch index.
+     *
+     * @param array $params
+     * @return array
+     */
+    public function getMapping(array $params): array
+    {
+        return $this->getClient()->indices()->getMapping($params);
+    }
+
     /**
      * Delete mapping in Elasticsearch index
      *
diff --git a/app/code/Magento/Elasticsearch6/Test/Unit/Model/Client/ElasticsearchTest.php b/app/code/Magento/Elasticsearch6/Test/Unit/Model/Client/ElasticsearchTest.php
index 427e630ac2099..f52e24d72e4d4 100644
--- a/app/code/Magento/Elasticsearch6/Test/Unit/Model/Client/ElasticsearchTest.php
+++ b/app/code/Magento/Elasticsearch6/Test/Unit/Model/Client/ElasticsearchTest.php
@@ -73,6 +73,7 @@ protected function setUp(): void
                     'delete',
                     'putMapping',
                     'deleteMapping',
+                    'getMapping',
                     'stats',
                     'updateAliases',
                     'existsAlias',
@@ -608,6 +609,22 @@ public function testDeleteMappingFailure()
         );
     }
 
+    /**
+     * Test get Elasticsearch mapping process.
+     *
+     * @return void
+     */
+    public function testGetMapping(): void
+    {
+        $params = ['index' => 'indexName'];
+        $this->indicesMock->expects($this->once())
+            ->method('getMapping')
+            ->with($params)
+            ->willReturn([]);
+
+        $this->model->getMapping($params);
+    }
+
     /**
      * Test query() method
      * @return void
diff --git a/app/code/Magento/Elasticsearch7/Model/Client/Elasticsearch.php b/app/code/Magento/Elasticsearch7/Model/Client/Elasticsearch.php
index a16a70b1cd702..d193c8aa108c8 100644
--- a/app/code/Magento/Elasticsearch7/Model/Client/Elasticsearch.php
+++ b/app/code/Magento/Elasticsearch7/Model/Client/Elasticsearch.php
@@ -179,6 +179,23 @@ public function createIndex(string $index, array $settings)
         );
     }
 
+    /**
+     * Add/update an Elasticsearch index settings.
+     *
+     * @param string $index
+     * @param array $settings
+     * @return void
+     */
+    public function putIndexSettings(string $index, array $settings): void
+    {
+        $this->getElasticsearchClient()->indices()->putSettings(
+            [
+                'index' => $index,
+                'body' => $settings,
+            ]
+        );
+    }
+
     /**
      * Delete an Elasticsearch 7 index.
      *
@@ -350,6 +367,17 @@ public function query(array $query): array
         return $this->getElasticsearchClient()->search($query);
     }
 
+    /**
+     * Get mapping from Elasticsearch index.
+     *
+     * @param array $params
+     * @return array
+     */
+    public function getMapping(array $params): array
+    {
+        return $this->getElasticsearchClient()->indices()->getMapping($params);
+    }
+
     /**
      * Delete mapping in Elasticsearch 7 index
      *
diff --git a/app/code/Magento/Elasticsearch7/Test/Unit/Model/Client/ElasticsearchTest.php b/app/code/Magento/Elasticsearch7/Test/Unit/Model/Client/ElasticsearchTest.php
index a31a1971a5acc..3b3cbcfbb15f8 100644
--- a/app/code/Magento/Elasticsearch7/Test/Unit/Model/Client/ElasticsearchTest.php
+++ b/app/code/Magento/Elasticsearch7/Test/Unit/Model/Client/ElasticsearchTest.php
@@ -73,6 +73,7 @@ protected function setUp(): void
                     'delete',
                     'putMapping',
                     'deleteMapping',
+                    'getMapping',
                     'stats',
                     'updateAliases',
                     'existsAlias',
@@ -608,6 +609,22 @@ public function testDeleteMappingFailure()
         );
     }
 
+    /**
+     * Test get Elasticsearch mapping process.
+     *
+     * @return void
+     */
+    public function testGetMapping(): void
+    {
+        $params = ['index' => 'indexName'];
+        $this->indicesMock->expects($this->once())
+            ->method('getMapping')
+            ->with($params)
+            ->willReturn([]);
+
+        $this->model->getMapping($params);
+    }
+
     /**
      * Test query() method
      * @return void
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/Fulltext/Plugin/Category/Product/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/Fulltext/Plugin/Category/Product/AttributeTest.php
new file mode 100644
index 0000000000000..1f5619ba9d450
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/Fulltext/Plugin/Category/Product/AttributeTest.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\Indexer\Fulltext\Plugin\Category\Product;
+
+use Magento\AdvancedSearch\Model\Client\ClientInterface;
+use Magento\Catalog\Api\Data\EavAttributeInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\CatalogSearch\Model\Indexer\Fulltext\Processor;
+use Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver;
+use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
+use Magento\Framework\Stdlib\ArrayManager;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Check Elasticsearch indexer mapping when working with attributes.
+ */
+class AttributeTest extends TestCase
+{
+    /**
+     * @var ClientInterface
+     */
+    private $client;
+
+    /**
+     * @var ArrayManager
+     */
+    private $arrayManager;
+
+    /**
+     * @var IndexNameResolver
+     */
+    private $indexNameResolver;
+
+    /**
+     * @var Processor
+     */
+    private $indexerProcessor;
+
+    /**
+     * @var Attribute
+     */
+    private $attribute;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $connectionManager = Bootstrap::getObjectManager()->get(ConnectionManager::class);
+        $this->client = $connectionManager->getConnection();
+        $this->arrayManager = Bootstrap::getObjectManager()->get(ArrayManager::class);
+        $this->indexNameResolver = Bootstrap::getObjectManager()->get(IndexNameResolver::class);
+        $this->indexerProcessor = Bootstrap::getObjectManager()->get(Processor::class);
+        $this->attribute = Bootstrap::getObjectManager()->get(Attribute::class);
+    }
+
+    /**
+     * Check Elasticsearch indexer mapping is updated after changing non searchable attribute to searchable.
+     *
+     * @return void
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch7
+     * @magentoDataFixture Magento/CatalogSearch/_files/full_reindex.php
+     * @magentoDataFixture Magento/Catalog/_files/dropdown_attribute.php
+     */
+    public function testCheckElasticsearchMappingAfterUpdateAttributeToSearchable(): void
+    {
+        $mappedAttributesBefore = $this->getMappingProperties();
+
+        $this->attribute->loadByCode(Product::ENTITY, 'dropdown_attribute');
+        $this->attribute->setData(EavAttributeInterface::IS_SEARCHABLE, true)->save();
+        $this->assertTrue($this->indexerProcessor->getIndexer()->isInvalid());
+
+        $mappedAttributesAfter = $this->getMappingProperties();
+        $expectedResult = [
+            'dropdown_attribute' => [
+                'type' => 'keyword',
+                'copy_to' => ['_search'],
+            ],
+            'dropdown_attribute_value' => [
+                'type' => 'text',
+                'copy_to' => ['_search'],
+            ],
+        ];
+
+        $this->assertEquals($expectedResult, array_diff_key($mappedAttributesAfter, $mappedAttributesBefore));
+    }
+
+    /**
+     * Retrieve Elasticsearch indexer mapping.
+     *
+     * @return array
+     */
+    private function getMappingProperties(): array
+    {
+        $mappedIndexerId = $this->indexNameResolver->getIndexMapping(Processor::INDEXER_ID);
+        $indexName = $this->indexNameResolver->getIndexFromAlias(1, $mappedIndexerId);
+        $mappedAttributes = $this->client->getMapping(['index' => $indexName]);
+        $pathField = $this->arrayManager->findPath('properties', $mappedAttributes);
+
+        return $this->arrayManager->get($pathField, $mappedAttributes, []);
+    }
+}

From c41c854486c1981b94679aeff696b443954eec12 Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Thu, 23 Jul 2020 14:07:13 +0300
Subject: [PATCH 0991/1718] Update integration and functional tests

---
 .../AdminCreateCatalogPriceRuleForCustomerGroupTest.xml       | 3 +++
 ...avigateToNewOrderPageNewCustomerSingleStoreActionGroup.xml | 1 +
 .../Block/Adminhtml/Grid/Renderer/AbstractMultiactionTest.php | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleForCustomerGroupTest.xml b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleForCustomerGroupTest.xml
index 51689440af534..fb218297b646d 100644
--- a/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleForCustomerGroupTest.xml
+++ b/app/code/Magento/CatalogRule/Test/Mftf/Test/AdminCreateCatalogPriceRuleTest/AdminCreateCatalogPriceRuleForCustomerGroupTest.xml
@@ -43,7 +43,10 @@
         <!-- Create a catalog rule for the NOT LOGGED IN customer group -->
         <actionGroup ref="NewCatalogPriceRuleByUIActionGroup" stepKey="createNewPriceRule"/>
         <actionGroup ref="SelectNotLoggedInCustomerGroupActionGroup" stepKey="selectNotLoggedInCustomerGroup"/>
+        <conditionalClick selector="{{AdminNewCatalogPriceRule.active}}" dependentSelector="{{AdminNewCatalogPriceRule.activeIsEnabled}}" visible="false" stepKey="enableActiveBtn"/>
         <click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="saveAndApply"/>
+
+        <!--<click selector="{{AdminNewCatalogPriceRule.saveAndApply}}" stepKey="saveAndApply"/>-->
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the rule." stepKey="assertSuccess"/>
 
         <!-- Perform reindex and flush cache -->
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/NavigateToNewOrderPageNewCustomerSingleStoreActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/NavigateToNewOrderPageNewCustomerSingleStoreActionGroup.xml
index 3d3efc705854d..6ec3cef59e22e 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/NavigateToNewOrderPageNewCustomerSingleStoreActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/NavigateToNewOrderPageNewCustomerSingleStoreActionGroup.xml
@@ -18,6 +18,7 @@
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Orders" stepKey="seeIndexPageTitle"/>
         <click selector="{{AdminOrdersGridSection.createNewOrder}}" stepKey="clickCreateNewOrder"/>
         <click selector="{{AdminOrderFormActionSection.CreateNewCustomer}}" stepKey="clickCreateCustomer"/>
+        <conditionalClick selector="{{AdminOrderStoreScopeTreeSection.storeOption(_defaultStore.name)}}" dependentSelector="{{AdminOrderStoreScopeTreeSection.storeOption(_defaultStore.name)}}" visible="true" stepKey="selectStoreViewIfAppears"/>
         <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Create New Order" stepKey="seeNewOrderPageTitle"/>
     </actionGroup>
 </actionGroups>
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Grid/Renderer/AbstractMultiactionTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Grid/Renderer/AbstractMultiactionTest.php
index f8ede749872f4..02d7c886ec2e2 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Grid/Renderer/AbstractMultiactionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Grid/Renderer/AbstractMultiactionTest.php
@@ -99,12 +99,12 @@ protected function processRender(): void
     private function assertUrl(int $quoteItemId, array $action, string $html): void
     {
         $jsFunction = str_replace('url_', '', $action['url']);
-        $configureXPath = "//a[contains(@onclick, 'return cartControl.$jsFunction($quoteItemId)')"
-            . " and text()='{$action['caption']}' and @href='{$action['url']}']";
+        $configureXPath = "//a[text()='{$action['caption']}' and @href='{$action['url']}']";
         $this->assertEquals(
             1,
             Xpath::getElementsCountForXpath($configureXPath, $html),
             sprintf('Expected %s link is incorrect or missing', $action['caption'])
         );
+        $this->assertStringContainsString("return cartControl.$jsFunction($quoteItemId)", $html);
     }
 }

From 2a5ca3609f968d4a8dca6a1ee912c5f32905c3f3 Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Thu, 23 Jul 2020 14:24:24 +0300
Subject: [PATCH 0992/1718] MC-35989: Custom address attribute is missing on
 Payment step of checkout

---
 .../view/frontend/web/js/model/customer/address.js        | 4 ++--
 .../Customer/frontend/js/model/customer/address.test.js   | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Customer/view/frontend/web/js/model/customer/address.js b/app/code/Magento/Customer/view/frontend/web/js/model/customer/address.js
index a6d1de5fde255..eba9a8c3ea7ae 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/model/customer/address.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/model/customer/address.js
@@ -6,7 +6,7 @@
 /**
  * @api
  */
-define([], function () {
+define(['underscore'], function (_) {
     'use strict';
 
     /**
@@ -44,7 +44,7 @@ define([], function () {
             vatId: addressData['vat_id'],
             sameAsBilling: addressData['same_as_billing'],
             saveInAddressBook: addressData['save_in_address_book'],
-            customAttributes: addressData['custom_attributes'],
+            customAttributes: _.toArray(addressData['custom_attributes']).reverse(),
 
             /**
              * @return {*}
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/model/customer/address.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/model/customer/address.test.js
index fc00772375e3b..45c509a901c47 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/model/customer/address.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/model/customer/address.test.js
@@ -22,9 +22,12 @@ define([
         it('Check on empty object.', function () {
             var addressData = {
                 region: {}
+            },
+            expected = {
+                customAttributes: []
             };
 
-            expect(JSON.stringify(customerAddress(addressData))).toEqual(JSON.stringify({}));
+            expect(JSON.stringify(customerAddress(addressData))).toEqual(JSON.stringify(expected));
         });
 
         it('Check on function call with empty address data.', function () {
@@ -49,7 +52,8 @@ define([
                     }
                 }),
                 expected = {
-                    regionId: '1'
+                    regionId: '1',
+                    customAttributes: []
                 };
 
             expect(JSON.stringify(result)).toEqual(JSON.stringify(expected));

From 7069f07b8de1603dc82d25a3479bc38f24edb1a4 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Thu, 23 Jul 2020 14:51:16 +0300
Subject: [PATCH 0993/1718] MFTF tests updates.

---
 ...oginAsCustomerConfigVisibleActionGroup.xml |  21 ++++
 ...omerSectionLinkNotAvailableActionGroup.xml |  19 +++
 .../Mftf/Page/AdminCustomerConfigPage.xml     |   3 +-
 .../Section/AdminCustomerConfigSection.xml    |  18 +++
 ...merSettingsAvailableForGlobalLevelTest.xml |  40 ++++++
 ...erBannerPresentOnAllPagesInSessionTest.xml | 112 +++++++++++++++++
 ...sCustomerSeeSpecialPriceOnCategoryTest.xml | 114 ++++++++++++++++++
 ...oppingCartIsNotMergedWithGuestCartTest.xml |  67 ++++++++++
 8 files changed, 393 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigVisibleActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerSectionLinkNotAvailableActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminCustomerConfigSection.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSettingsAvailableForGlobalLevelTest.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerBannerPresentOnAllPagesInSessionTest.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerSeeSpecialPriceOnCategoryTest.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerShoppingCartIsNotMergedWithGuestCartTest.xml

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigVisibleActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigVisibleActionGroup.xml
new file mode 100644
index 0000000000000..cdc513651ad54
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigVisibleActionGroup.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="AdminAssertLoginAsCustomerConfigVisibleActionGroup">
+        <annotations>
+            <description>Verify Login as Customer config section available.</description>
+        </annotations>
+
+        <seeElement selector="{{AdminCustomerConfigSection.loginAsCustomerSettingsHead}}" stepKey="seeLoginAsCustomerSettingsHead"/>
+        <seeElement selector="{{AdminCustomerConfigSection.enableExtensionLabel}}" stepKey="seeEnableExtensionLabel"/>
+        <seeElement selector="{{AdminCustomerConfigSection.disablePageCacheLabel}}" stepKey="seeDisablePageCacheLabel"/>
+        <seeElement selector="{{AdminCustomerConfigSection.storeViewToLoginToLabel}}" stepKey="seeStoreViewToLoginToLabel"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerSectionLinkNotAvailableActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerSectionLinkNotAvailableActionGroup.xml
new file mode 100644
index 0000000000000..779cb1e5c8899
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerSectionLinkNotAvailableActionGroup.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="AdminAssertLoginAsCustomerSectionLinkNotAvailableActionGroup">
+        <annotations>
+            <description>Verify Login as Customer config section isn't available.</description>
+        </annotations>
+
+        <conditionalClick selector="{{CaptchaFormsDisplayingSection.customer}}" dependentSelector="{{AdminCustomerConfigSection.loginAsCustomerSettingsSectionLink}}" visible="false" stepKey="expandCustomerGroup"/>
+        <dontSeeElement selector="{{AdminCustomerConfigSection.loginAsCustomerSettingsSectionLink}}" stepKey="dontSeeLoginAsCustomerSettingsLink"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Page/AdminCustomerConfigPage.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Page/AdminCustomerConfigPage.xml
index cfeead829e8ae..b48e20237cee8 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Page/AdminCustomerConfigPage.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Page/AdminCustomerConfigPage.xml
@@ -6,6 +6,7 @@
   */
 -->
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
-    <page name="AdminLoginAsCustomerConfigPage" url="admin/system_config/edit/section/mfloginascustomer" area="admin" module="Magento_LoginAsCustomer">
+    <page name="AdminLoginAsCustomerConfigPage" url="admin/system_config/edit/section/login_as_customer" area="admin" module="Magento_LoginAsCustomer">
+        <section name="AdminCustomerConfigSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminCustomerConfigSection.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminCustomerConfigSection.xml
new file mode 100644
index 0000000000000..14b3336ea5484
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminCustomerConfigSection.xml
@@ -0,0 +1,18 @@
+<?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="AdminCustomerConfigSection">
+        <element name="loginAsCustomerSettingsSectionLink" type="text" selector="//a/span[contains(text(),'Login as Customer')]" timeout="30"/>
+        <element name="loginAsCustomerSettingsHead" type="text" selector="#login_as_customer_general-head" timeout="30"/>
+        <element name="enableExtensionLabel" type="text" selector="//span[contains(text(),'Enable Extension') and contains(@data-config-scope,'[GLOBAL]')]" timeout="30"/>
+        <element name="disablePageCacheLabel" type="text" selector="//span[contains(text(),'Disable Page Cache For Admin User') and contains(@data-config-scope,'[GLOBAL]')]" timeout="30"/>
+        <element name="storeViewToLoginToLabel" type="text" selector="//span[contains(text(),'Store View To Login To') and contains(@data-config-scope,'[GLOBAL]')]" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSettingsAvailableForGlobalLevelTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSettingsAvailableForGlobalLevelTest.xml
new file mode 100644
index 0000000000000..807603bdcba0a
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSettingsAvailableForGlobalLevelTest.xml
@@ -0,0 +1,40 @@
+<?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="AdminLoginAsCustomerSettingsAvailableForGlobalLevelTest">
+        <annotations>
+            <features value="Login as Customer"/>
+            <stories value="'Login as Customer' settings are available only for global level"/>
+            <title value="Verify all 'Login as Customer' settings are available for global level"/>
+            <description value="'Login as Customer' settings are available for global level"/>
+            <severity value="MAJOR"/>
+            <group value="login_as_customer"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+
+        <amOnPage url="{{AdminLoginAsCustomerConfigPage.url}}" stepKey="navigateToLoginAsCustomerConfigSection"/>
+        <actionGroup ref="AdminAssertLoginAsCustomerConfigVisibleActionGroup" stepKey="seeLoginAsCustomerConfig"/>
+
+        <actionGroup ref="SwitchToTheNewStoreViewActionGroup" stepKey="switchToDefaultStoreView">
+            <argument name="storeViewName" value="'Default Store View'"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertLoginAsCustomerSectionLinkNotAvailableActionGroup" stepKey="dontSeeLoginAsCustomerSectionLinkOnStoreView"/>
+
+        <actionGroup ref="SwitchToTheNewStoreViewActionGroup" stepKey="switchToDefaultWebsite">
+            <argument name="storeViewName" value="'Main Website'"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertLoginAsCustomerSectionLinkNotAvailableActionGroup" stepKey="dontSeeLoginAsCustomerSectionLink"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerBannerPresentOnAllPagesInSessionTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerBannerPresentOnAllPagesInSessionTest.xml
new file mode 100644
index 0000000000000..6874fcb4fd220
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerBannerPresentOnAllPagesInSessionTest.xml
@@ -0,0 +1,112 @@
+<?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="StorefrontLoginAsCustomerBannerPresentOnAllPagesInSessionTest">
+        <annotations>
+            <features value="Login as Customer"/>
+            <stories value="Notification banner appears on all pages in session"/>
+            <title value="Verify banner is persistent and appears during all page views in session"/>
+            <description value="Banner is persistent and appears on all pages in session"/>
+            <severity value="CRITICAL"/>
+            <group value="login_as_customer"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
+                        stepKey="enableLoginAsCustomer"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushConfigCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
+        </before>
+        <after>
+            <closeTab stepKey="closeLoginAsCustomerTab"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0"
+                        stepKey="disableLoginAsCustomer"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushConfigCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
+        </after>
+
+        <!-- Admin Login as Customer from Customer page and assert notification banner -->
+        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup" stepKey="loginAsCustomerFromCustomerPage">
+            <argument name="customerId" value="$$createCustomer.id$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBanner">
+            <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
+        </actionGroup>
+
+        <!-- Go to Wishlist and assert notification banner -->
+        <amOnPage url="{{StorefrontCustomerWishlistPage.url}}" stepKey="amOnWishListPage"/>
+        <waitForPageLoad stepKey="waitForWishlistPageLoad"/>
+        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerOnWishList">
+            <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
+        </actionGroup>
+
+        <!-- Go to category page and assert notification banner -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="navigateToCategoryPage"/>
+        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerOnCategoryPage">
+            <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
+        </actionGroup>
+
+        <!-- Go to product page and assert notification banner -->
+        <actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="openProductPage">
+            <argument name="productUrlKey" value="$$createSimpleProduct.custom_attributes[url_key]$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerOnProductPage">
+            <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
+        </actionGroup>
+
+        <!-- Add product to cart and assert notification banner -->
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openCartPage"/>
+        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerOnCartPage">
+            <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
+        </actionGroup>
+
+        <!-- Proceed to checkout and assert notification banner -->
+        <click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout"/>
+        <waitForPageLoad stepKey="waitForProceedToCheckout"/>
+        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerOnCheckoutPage">
+            <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
+        </actionGroup>
+
+        <!-- Assert notification banner before place order -->
+        <actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
+        <waitForElementVisible selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterClickNext"/>
+        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerBeforePlaceOrder">
+            <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
+        </actionGroup>
+
+        <!-- Assert notification banner after place order -->
+        <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPaymentMethod"/>
+        <actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="customerPlaceOrder">
+            <argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage"/>
+            <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerAfterPlaceOrder">
+            <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerSeeSpecialPriceOnCategoryTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerSeeSpecialPriceOnCategoryTest.xml
new file mode 100644
index 0000000000000..c935e3446678f
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerSeeSpecialPriceOnCategoryTest.xml
@@ -0,0 +1,114 @@
+<?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="StorefrontLoginAsCustomerSeeSpecialPriceOnCategoryTest">
+        <annotations>
+            <features value="Login as Customer"/>
+            <stories value="'Login as Customer' should see special prices on a category page"/>
+            <title value="Special prices shown on category when Admin user Login as customer account"/>
+            <description value="Login as customer sees special prices on category"/>
+            <severity value="CRITICAL"/>
+            <group value="login_as_customer"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
+                        stepKey="enableLoginAsCustomer"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushConfigCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+                <field key="price">10</field>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer">
+                <field key="group_id">3</field>
+            </createData>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
+        </before>
+        <after>
+            <amOnPage stepKey="goToPriceRulePage" url="{{CatalogRulePage.url}}"/>
+            <actionGroup stepKey="deletePriceRule" ref="deleteEntitySecondaryGrid">
+                <argument name="name" value="{{_defaultCatalogRule.name}}"/>
+                <argument name="searchInput" value="{{AdminSecondaryGridSection.catalogRuleIdentifierSearch}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0"
+                        stepKey="disableLoginAsCustomer"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushConfigCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
+        </after>
+
+        <!-- Creating a new catalog price rule with 50 percent discount for Retailer customer group -->
+        <actionGroup ref="NewCatalogPriceRuleByUIWithConditionIsCategoryActionGroup" stepKey="newCatalogPriceRuleByUIWithConditionIsCategory">
+            <argument name="categoryId" value="$createCategory.id$"/>
+        </actionGroup>
+        <actionGroup ref="SelectRetailerCustomerGroupActionGroup" stepKey="selectRetailerCustomerGroup"/>
+        <actionGroup ref="AdminCatalogPriceRuleFillActionsActionGroup" stepKey="fillActionsForCatalogPriceRule">
+            <argument name="apply" value="{{CatalogRuleToPercent.simple_action}}"/>
+            <argument name="discountAmount" value="50"/>
+        </actionGroup>
+
+        <!-- Save and apply the new catalog price rule -->
+        <actionGroup ref="SaveAndApplyCatalogPriceRuleActionGroup" stepKey="saveAndApplyCatalogPriceRule"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
+
+        <!-- Admin Login as Customer -->
+        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup" stepKey="loginAsCustomerFromCustomerPage">
+            <argument name="customerId" value="$$createCustomer.id$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBanner">
+            <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
+        </actionGroup>
+
+        <!-- Check simple product prices on store front category page -->
+        <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="navigateToCategoryPage"/>
+        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct1Price">
+            <argument name="productInfo" value="$5.00"/>
+            <argument name="productNumber" value="1"/>
+        </actionGroup>
+        <actionGroup ref="AssertProductDetailsOnStorefrontActionGroup" stepKey="storefrontProduct1RegularPrice">
+            <argument name="productInfo" value="$10.00"/>
+            <argument name="productNumber" value="1"/>
+        </actionGroup>
+
+        <!-- Place order -->
+        <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"/>
+        <closeTab stepKey="closeLoginAsCustomerTab"/>
+
+        <!-- Open order in admin -->
+        <actionGroup ref="OpenOrderByIdActionGroup" stepKey="addFilterToGridAndOpenOrder">
+            <argument name="orderId" value="{$grabOrderId}"/>
+        </actionGroup>
+
+        <!-- Assert order subtotal -->
+        <scrollTo selector="{{AdminOrderTotalSection.subTotal}}" stepKey="scrollToOrderTotalSection"/>
+        <see selector="{{AdminOrderTotalSection.subTotal}}" userInput="$5.00" stepKey="checkOrderTotalInBackend"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerShoppingCartIsNotMergedWithGuestCartTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerShoppingCartIsNotMergedWithGuestCartTest.xml
new file mode 100644
index 0000000000000..09ec1b427f515
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerShoppingCartIsNotMergedWithGuestCartTest.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="StorefrontLoginAsCustomerShoppingCartIsNotMergedWithGuestCartTest">
+        <annotations>
+            <features value="Login as Customer"/>
+            <stories value="Customer shopping cart shouldn't merge with guest shopping cart"/>
+            <title value="Customer shopping cart is not merged with guest shopping cart"/>
+            <description value="Shopping cart customer is not merged with guest cart"/>
+            <severity value="MAJOR"/>
+            <group value="login_as_customer"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
+                        stepKey="enableLoginAsCustomer"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushConfigCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
+        </before>
+        <after>
+            <closeTab stepKey="closeLoginAsCustomerTab"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0"
+                        stepKey="disableLoginAsCustomer"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushConfigCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
+        </after>
+
+        <!-- Add product to guest cart -->
+        <actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="openProductPage">
+            <argument name="productUrlKey" value="$$createSimpleProduct.custom_attributes[url_key]$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+
+        <!-- Admin Login as Customer -->
+        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup" stepKey="loginAsCustomerFromCustomerPage">
+            <argument name="customerId" value="$$createCustomer.id$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBanner">
+            <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
+        </actionGroup>
+
+        <!-- Check the mini cart is empty -->
+        <actionGroup ref="AssertMiniCartEmptyActionGroup" stepKey="miniCartEmpty"/>
+    </test>
+</tests>

From 86000cea24a9dd757e1b4d6cf54957e32e577f3c Mon Sep 17 00:00:00 2001
From: Anton Evers <evers@adobe.com>
Date: Thu, 23 Jul 2020 11:23:22 +0200
Subject: [PATCH 0994/1718] repair
 \Magento\Captcha\Test\Unit\Model\Customer\Plugin\AjaxLoginTest

Data providers are executed before setUp.
In previous phpunit versions $this->formIds[0] would just convert to
null, explaining why the logAttempt method was never called.
Fixing this issue leads to different expectations of the test result in
testAroundExecuteCaptchaIsNotRequired. I have adjusted the necessary.

No need to test if this method returns nothing if the return type is
already void

Fix quote unit tests by explicitely declaring methods that are vital
to quote operations. I think it is better to declare these methods
explicitely than to depend on DataObject methods

Update extensionattribute mock

repair partial mock with non-existing method mocking

Revert "Fix quote unit tests by explicitely declaring methods that are vital"

This reverts commit e29506ce3b353d55cbe64d064e863c4969c3d6cd.

fix mock object with non existing method mocks

replace partial mocks with non-existing method mocking
---
 .../Model/Customer/Plugin/AjaxLoginTest.php   |  8 ++--
 .../Command/XmlCatalogGenerateCommandTest.php |  2 +-
 .../Test/Unit/Model/QuoteManagerTest.php      | 11 ++---
 .../Quote/Address/Total/SubtotalTest.php      | 45 ++++++++++++-------
 .../Model/Order/CreditmemoFactoryTest.php     | 12 +++--
 .../Test/Unit/Adjustment/CollectionTest.php   | 19 ++++----
 6 files changed, 56 insertions(+), 41 deletions(-)

diff --git a/app/code/Magento/Captcha/Test/Unit/Model/Customer/Plugin/AjaxLoginTest.php b/app/code/Magento/Captcha/Test/Unit/Model/Customer/Plugin/AjaxLoginTest.php
index f243718952f4f..3c5aed076a653 100644
--- a/app/code/Magento/Captcha/Test/Unit/Model/Customer/Plugin/AjaxLoginTest.php
+++ b/app/code/Magento/Captcha/Test/Unit/Model/Customer/Plugin/AjaxLoginTest.php
@@ -63,7 +63,7 @@ class AjaxLoginTest extends TestCase
     /**
      * @var array
      */
-    protected $formIds;
+    protected $formIds = ['user_login'];
 
     /**
      * @var AjaxLogin
@@ -97,7 +97,6 @@ protected function setUp(): void
             ->method('getCaptcha')
             ->willReturn($this->captchaMock);
 
-        $this->formIds = ['user_login'];
         $this->serializerMock = $this->createMock(Json::class);
 
         $this->model = new AjaxLogin(
@@ -194,7 +193,10 @@ public function testAroundExecuteCaptchaIsNotRequired($username, $requestContent
 
         $this->captchaMock->expects($this->once())->method('isRequired')->with($username)
             ->willReturn(false);
-        $this->captchaMock->expects($this->never())->method('logAttempt')->with($username);
+        $expectLogAttempt = $requestContent['captcha_form_id'] ?? false;
+        $this->captchaMock
+            ->expects($expectLogAttempt ? $this->once() : $this->never())
+            ->method('logAttempt')->with($username);
         $this->captchaMock->expects($this->never())->method('isCorrect');
 
         $closure = function () {
diff --git a/app/code/Magento/Developer/Test/Unit/Console/Command/XmlCatalogGenerateCommandTest.php b/app/code/Magento/Developer/Test/Unit/Console/Command/XmlCatalogGenerateCommandTest.php
index 919ee0e060468..a9e42cd01f2d5 100644
--- a/app/code/Magento/Developer/Test/Unit/Console/Command/XmlCatalogGenerateCommandTest.php
+++ b/app/code/Magento/Developer/Test/Unit/Console/Command/XmlCatalogGenerateCommandTest.php
@@ -97,7 +97,7 @@ public function testExecuteVsCodeFormat()
             ->with(
                 $this->equalTo(['urn:magento:framework:Module/etc/module.xsd' => $fixtureXmlFile]),
                 $this->equalTo('test')
-            )->willReturn(null);
+            );
 
         $formats = ['vscode' => $vscodeFormatMock];
         $readFactory = $this->createMock(ReadFactory::class);
diff --git a/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php b/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php
index 5c4a3eb624d3c..39ef03afb83df 100644
--- a/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php
@@ -228,13 +228,10 @@ public function testSetGuest()
             ->method('removePersistentCookie')->willReturn($this->sessionMock);
         $this->quoteMock->expects($this->once())->method('isVirtual')->willReturn(false);
         $this->quoteMock->expects($this->once())->method('getItemsQty')->willReturn(1);
-        $extensionAttributes = $this->createPartialMock(
-            CartExtensionInterface::class,
-            [
-                'setShippingAssignments',
-                'getShippingAssignments'
-            ]
-        );
+        $extensionAttributes = $this->getMockBuilder(CartExtensionInterface::class)
+            ->addMethods(['getShippingAssignments', 'setShippingAssignments'])
+            ->disableArgumentCloning()
+            ->getMockForAbstractClass();
         $shippingAssignment = $this->createMock(ShippingAssignmentInterface::class);
         $extensionAttributes->expects($this->once())
             ->method('setShippingAssignments')
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/SubtotalTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/SubtotalTest.php
index 2f8a5a344503c..96c9fbee8834f 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/SubtotalTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/SubtotalTest.php
@@ -59,7 +59,7 @@ protected function setUp(): void
 
         $this->stockRegistry = $this->createPartialMock(
             StockRegistry::class,
-            ['getStockItem', '__wakeup']
+            ['getStockItem']
         );
         $this->stockItemMock = $this->createPartialMock(
             \Magento\CatalogInventory\Model\Stock\Item::class,
@@ -110,10 +110,14 @@ public function testCollect($price, $originalPrice, $itemHasParent, $expectedPri
             ]
         );
         /** @var Address|MockObject $address */
-        $address = $this->createPartialMock(
-            Address::class,
-            ['setTotalQty', 'getTotalQty', 'removeItem', 'getQuote']
-        );
+        $address = $this->getMockBuilder(Address::class)
+            ->disableOriginalConstructor()
+            ->disableOriginalClone()
+            ->disableArgumentCloning()
+            ->disallowMockingUnknownTypes()
+            ->onlyMethods(['removeItem', 'getQuote'])
+            ->addMethods(['setTotalQty', 'getTotalQty'])
+            ->getMock();
 
         /** @var Product|MockObject $product */
         $product = $this->createMock(Product::class);
@@ -161,10 +165,13 @@ public function testCollect($price, $originalPrice, $itemHasParent, $expectedPri
         $shippingAssignmentMock->expects($this->exactly(2))->method('getShipping')->willReturn($shipping);
         $shippingAssignmentMock->expects($this->once())->method('getItems')->willReturn([$quoteItem]);
 
-        $total = $this->createPartialMock(
-            Total::class,
-            ['setBaseVirtualAmount', 'setVirtualAmount']
-        );
+        $total = $this->getMockBuilder(Total::class)
+            ->disableOriginalConstructor()
+            ->disableOriginalClone()
+            ->disableArgumentCloning()
+            ->disallowMockingUnknownTypes()
+            ->addMethods(['setVirtualAmount', 'setBaseVirtualAmount'])
+            ->getMock();
         $total->expects($this->once())->method('setBaseVirtualAmount')->willReturnSelf();
         $total->expects($this->once())->method('setVirtualAmount')->willReturnSelf();
 
@@ -185,7 +192,10 @@ public function testFetch()
         ];
 
         $quoteMock = $this->createMock(Quote::class);
-        $totalMock = $this->createPartialMock(Total::class, ['getSubtotal']);
+        $totalMock = $this->getMockBuilder(Total::class)
+            ->addMethods(['getSubtotal'])
+            ->disableArgumentCloning()
+            ->getMockForAbstractClass();
         $totalMock->expects($this->once())->method('getSubtotal')->willReturn(100);
 
         $this->assertEquals($expectedResult, $this->subtotalModel->fetch($quoteMock, $totalMock));
@@ -229,13 +239,14 @@ public function testCollectWithInvalidItems()
         $address->expects($this->once())
             ->method('removeItem')
             ->with($addressItemId);
-        $addressItem = $this->createPartialMock(
-            AddressItem::class,
-            [
-                'getId',
-                'getQuoteItemId'
-            ]
-        );
+        $addressItem = $this->getMockBuilder(AddressItem::class)
+            ->disableOriginalConstructor()
+            ->disableOriginalClone()
+            ->disableArgumentCloning()
+            ->disallowMockingUnknownTypes()
+            ->onlyMethods(['getId'])
+            ->addMethods(['getQuoteItemId'])
+            ->getMock();
         $addressItem->setAddress($address);
         $addressItem->method('getId')
             ->willReturn($addressItemId);
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoFactoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoFactoryTest.php
index 4cf571d3b6108..e27f6918f1876 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoFactoryTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoFactoryTest.php
@@ -49,10 +49,14 @@ class CreditmemoFactoryTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->orderItemMock = $this->createPartialMock(
-            Item::class,
-            ['getChildrenItems', 'isDummy', 'getHasChildren', 'getId', 'getParentItemId']
-        );
+        $this->orderItemMock = $this->getMockBuilder(Item::class)
+            ->disableOriginalConstructor()
+            ->disableOriginalClone()
+            ->disableArgumentCloning()
+            ->disallowMockingUnknownTypes()
+            ->onlyMethods(['getChildrenItems', 'isDummy', 'getId', 'getParentItemId'])
+            ->addMethods(['getHasChildren'])
+            ->getMock();
         $this->orderChildItemOneMock = $this->createPartialMock(
             Item::class,
             ['getQtyToRefund', 'getId']
diff --git a/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/CollectionTest.php b/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/CollectionTest.php
index fc65eabb33d62..58354722d484d 100644
--- a/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/CollectionTest.php
+++ b/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/CollectionTest.php
@@ -50,6 +50,7 @@ protected function setUp(): void
             'adj3' => $adj3,
             'adj4' => $adj4,
         ];
+        $this->adjustmentsData = $adjustmentsData;
 
         /** @var Pool|MockObject $adjustmentPool */
         $adjustmentPool = $this->getMockBuilder(Pool::class)
@@ -64,14 +65,13 @@ function ($code) use ($adjustmentsData) {
                 return $adjustmentsData[$code];
             }
         );
-
         $this->adjustmentPool = $adjustmentPool;
-        $this->adjustmentsData = $adjustmentsData;
     }
 
     /**
      * @param string[] $adjustments
      * @param string[] $expectedResult
+     *
      * @dataProvider getItemsDataProvider
      */
     public function testGetItems($adjustments, $expectedResult)
@@ -92,7 +92,7 @@ public function getItemsDataProvider()
             [['adj1'], ['adj1']],
             [['adj4'], ['adj4']],
             [['adj1', 'adj4'], ['adj1', 'adj4']],
-            [['adj1', 'adj2', 'adj3', 'adj4'], ['adj3', 'adj1', 'adj2', 'adj4']]
+            [['adj1', 'adj2', 'adj3', 'adj4'], ['adj3', 'adj1', 'adj2', 'adj4']],
         ];
     }
 
@@ -100,6 +100,7 @@ public function getItemsDataProvider()
      * @param string[] $adjustments
      * @param string $code
      * @param $expectedResult
+     *
      * @dataProvider getItemByCodeDataProvider
      */
     public function testGetItemByCode($adjustments, $code, $expectedResult)
@@ -108,7 +109,7 @@ public function testGetItemByCode($adjustments, $code, $expectedResult)
 
         $item = $collection->getItemByCode($code);
 
-        $this->assertEquals($expectedResult, $item->getAdjustmentCode());
+        $this->assertEquals($expectedResult, $item->getSortOrder());
     }
 
     /**
@@ -117,11 +118,11 @@ public function testGetItemByCode($adjustments, $code, $expectedResult)
     public function getItemByCodeDataProvider()
     {
         return [
-            [['adj1'], 'adj1', $this->adjustmentsData['adj1']],
-            [['adj1', 'adj2', 'adj3', 'adj4'], 'adj1', $this->adjustmentsData['adj1']],
-            [['adj1', 'adj2', 'adj3', 'adj4'], 'adj2', $this->adjustmentsData['adj2']],
-            [['adj1', 'adj2', 'adj3', 'adj4'], 'adj3', $this->adjustmentsData['adj3']],
-            [['adj1', 'adj2', 'adj3', 'adj4'], 'adj4', $this->adjustmentsData['adj4']],
+            [['adj1'], 'adj1', 10],
+            [['adj1', 'adj2', 'adj3', 'adj4'], 'adj1', 10],
+            [['adj1', 'adj2', 'adj3', 'adj4'], 'adj2', 20],
+            [['adj1', 'adj2', 'adj3', 'adj4'], 'adj3', 5],
+            [['adj1', 'adj2', 'adj3', 'adj4'], 'adj4', Pool::DEFAULT_SORT_ORDER],
         ];
     }
 

From 39aff394256735c448dbee13d6da9849190f4110 Mon Sep 17 00:00:00 2001
From: Sathish <srsathish92@gmail.com>
Date: Thu, 23 Jul 2020 17:55:29 +0530
Subject: [PATCH 0995/1718] Covered MFTF for new search synonyms form reset

---
 .../AdminFillNewSearchSynonymsActionGroup.xml | 25 ++++++++
 ...gateToNewSearchSynonymsPageActionGroup.xml | 15 +++++
 .../Test/Mftf/Data/SearchSynonymsData.xml     | 16 +++++
 .../AdminSearchSynonymsGridSection.xml        | 14 +++++
 .../Section/AdminSearchSynonymsNewSection.xml | 18 ++++++
 .../AdminNewSearchSynonymsFormResetTest.xml   | 61 +++++++++++++++++++
 6 files changed, 149 insertions(+)
 create mode 100644 app/code/Magento/Search/Test/Mftf/ActionGroup/AdminFillNewSearchSynonymsActionGroup.xml
 create mode 100644 app/code/Magento/Search/Test/Mftf/ActionGroup/AdminNavigateToNewSearchSynonymsPageActionGroup.xml
 create mode 100644 app/code/Magento/Search/Test/Mftf/Data/SearchSynonymsData.xml
 create mode 100644 app/code/Magento/Search/Test/Mftf/Section/AdminSearchSynonymsGridSection.xml
 create mode 100644 app/code/Magento/Search/Test/Mftf/Section/AdminSearchSynonymsNewSection.xml
 create mode 100644 app/code/Magento/Search/Test/Mftf/Test/AdminNewSearchSynonymsFormResetTest.xml

diff --git a/app/code/Magento/Search/Test/Mftf/ActionGroup/AdminFillNewSearchSynonymsActionGroup.xml b/app/code/Magento/Search/Test/Mftf/ActionGroup/AdminFillNewSearchSynonymsActionGroup.xml
new file mode 100644
index 0000000000000..88cc8049af28d
--- /dev/null
+++ b/app/code/Magento/Search/Test/Mftf/ActionGroup/AdminFillNewSearchSynonymsActionGroup.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="AdminFillNewSearchSynonymsActionGroup">
+        <annotations>
+            <description>Fills the search synonyms form field.</description>
+        </annotations>
+        <arguments>
+            <argument name="scope_id" type="string"/>
+            <argument name="synonyms" type="string"/>
+            <argument name="merge" type="string"/>
+        </arguments>
+
+        <selectOption selector="{{AdminSearchSynonymsNewSection.scope}}" userInput="{{scope_id}}" stepKey="selectScope"/>
+        <fillField selector="{{AdminSearchSynonymsNewSection.synonyms}}" userInput="{{synonyms}}" stepKey="fillSynonyms"/>
+        <checkOption selector="{{AdminSearchSynonymsNewSection.merge}}" stepKey="checkCheckbox"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Search/Test/Mftf/ActionGroup/AdminNavigateToNewSearchSynonymsPageActionGroup.xml b/app/code/Magento/Search/Test/Mftf/ActionGroup/AdminNavigateToNewSearchSynonymsPageActionGroup.xml
new file mode 100644
index 0000000000000..6c14aba36a139
--- /dev/null
+++ b/app/code/Magento/Search/Test/Mftf/ActionGroup/AdminNavigateToNewSearchSynonymsPageActionGroup.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="AdminNavigateToNewSearchSynonymsPageActionGroup">
+        <click stepKey="clickNewSynonymsGroupButton" selector="{{AdminSearchSynonymsGridSection.add}}"/>
+        <waitForPageLoad stepKey="waitForNewSearchSynonymsPageLoaded"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Search/Test/Mftf/Data/SearchSynonymsData.xml b/app/code/Magento/Search/Test/Mftf/Data/SearchSynonymsData.xml
new file mode 100644
index 0000000000000..e8242b5694739
--- /dev/null
+++ b/app/code/Magento/Search/Test/Mftf/Data/SearchSynonymsData.xml
@@ -0,0 +1,16 @@
+<?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="AdminSearchSynonyms" type="SearchSynonyms">
+        <data key="pageTitle">Search Synonyms</data>
+        <data key="title">Search Synonyms</data>
+        <data key="dataUiId">magento-search-search-synonyms</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Search/Test/Mftf/Section/AdminSearchSynonymsGridSection.xml b/app/code/Magento/Search/Test/Mftf/Section/AdminSearchSynonymsGridSection.xml
new file mode 100644
index 0000000000000..fe97fe7a5663d
--- /dev/null
+++ b/app/code/Magento/Search/Test/Mftf/Section/AdminSearchSynonymsGridSection.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="AdminSearchSynonymsGridSection">
+        <element name="add" type="button" selector=".page-actions-buttons #add"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Search/Test/Mftf/Section/AdminSearchSynonymsNewSection.xml b/app/code/Magento/Search/Test/Mftf/Section/AdminSearchSynonymsNewSection.xml
new file mode 100644
index 0000000000000..73a39a25325f7
--- /dev/null
+++ b/app/code/Magento/Search/Test/Mftf/Section/AdminSearchSynonymsNewSection.xml
@@ -0,0 +1,18 @@
+<?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="AdminSearchSynonymsNewSection">
+        <element name="save" type="button" selector="//button[@id='save']"/>
+        <element name="resetButton" type="button" selector="//button[@id='reset']"/>
+        <element name="scope" type="select" selector="//select[@name='scope_id']"/>
+        <element name="synonyms" type="textarea" selector="//textarea[@name='synonyms']"/>
+        <element name="merge" type="checkbox" selector="//input[@name='mergeOnConflict']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Search/Test/Mftf/Test/AdminNewSearchSynonymsFormResetTest.xml b/app/code/Magento/Search/Test/Mftf/Test/AdminNewSearchSynonymsFormResetTest.xml
new file mode 100644
index 0000000000000..d4cb3d5b3460d
--- /dev/null
+++ b/app/code/Magento/Search/Test/Mftf/Test/AdminNewSearchSynonymsFormResetTest.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="AdminNewSearchSynonymsFormResetTest">
+        <annotations>
+            <features value="Search"/>
+            <stories value="Reset new search synonyms group form"/>
+            <title value="Admin reset new search synonyms group form"/>
+            <description value="When admin users reset button on new search synonyms form all fields should be set to default values"/>
+            <severity value="AVERAGE"/>
+            <group value="Search"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+
+        <!--TEST BODY -->
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSearchSynonymsPage">
+            <argument name="menuUiId" value="{{AdminMenuMarketing.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminSearchSynonyms.dataUiId}}"/>
+        </actionGroup>
+
+        <actionGroup ref="AdminNavigateToNewSearchSynonymsPageActionGroup" stepKey="navigateToNewSearchSynonymsPage"/>
+
+        <actionGroup ref="AdminFillNewSearchSynonymsActionGroup" stepKey="fillNewSearchSynonyms">
+            <argument name="scope_id" value="1:1"/>
+            <argument name="synonyms" value="Test Synonyms"/>
+            <argument name="merge" value="true"/>
+        </actionGroup>
+
+        <click selector="{{AdminSearchSynonymsNewSection.resetButton}}" stepKey="clickResetButton"/>
+
+        <grabValueFrom selector="{{AdminSearchSynonymsNewSection.scope}}" stepKey="grabScopeValue"/>
+        <assertEquals stepKey="assertScopeDefaultValue">
+            <expectedResult type="string">0:0</expectedResult>
+            <actualResult type="string">$grabScopeValue</actualResult>
+        </assertEquals>
+
+        <grabValueFrom selector="{{AdminSearchSynonymsNewSection.synonyms}}" stepKey="grabSynonymsValue"/>
+        <assertEmpty stepKey="assertSynonymsDefaultValue">
+            <actualResult type="string">$grabSynonymsValue</actualResult>
+        </assertEmpty>
+
+        <grabValueFrom selector="{{AdminSearchSynonymsNewSection.merge}}" stepKey="grabMergeValue"/>
+        <assertEquals stepKey="assertMergeDefaultValue">
+            <expectedResult type="string">false</expectedResult>
+            <actualResult type="string">$grabMergeValue</actualResult>
+        </assertEquals>
+        <!--END TEST BODY -->
+    </test>
+</tests>

From 2faf31c50482763c8fb49be96ffefa84b5691fdb Mon Sep 17 00:00:00 2001
From: DianaRusin <rusind95@gmail.com>
Date: Thu, 23 Jul 2020 18:11:14 +0300
Subject: [PATCH 0996/1718] MC-35843: Automate MC-26543 tests

---
 ...leProductSetAdvancedPricingActionGroup.xml | 21 +++++
 .../Test/Mftf/Page/AdminProductCreatePage.xml |  1 +
 ...undleProductFormAdvancedPricingSection.xml | 14 +++
 .../Section/AdminProductFormBundleSection.xml |  1 +
 .../StorefrontProductInfoMainSection.xml      |  2 +
 ...eProductWithDynamicTierPriceInCartTest.xml | 41 +++++++++
 ...leProductWithOptionTierPriceInCartTest.xml | 47 ++++++++++
 ...ceWithFixedAndPercentOptionsInCartTest.xml | 92 +++++++++++++++++++
 .../Catalog/Test/Mftf/Data/TierPriceData.xml  |  8 ++
 9 files changed, 227 insertions(+)
 create mode 100644 app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminBundleProductSetAdvancedPricingActionGroup.xml
 create mode 100644 app/code/Magento/Bundle/Test/Mftf/Section/AdminBundleProductFormAdvancedPricingSection.xml
 create mode 100644 app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithDynamicTierPriceInCartTest.xml
 create mode 100644 app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithOptionTierPriceInCartTest.xml
 create mode 100644 app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithTierPriceWithFixedAndPercentOptionsInCartTest.xml

diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminBundleProductSetAdvancedPricingActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminBundleProductSetAdvancedPricingActionGroup.xml
new file mode 100644
index 0000000000000..4e574a67df43a
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminBundleProductSetAdvancedPricingActionGroup.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="AdminBundleProductSetAdvancedPricingActionGroup" extends="ProductSetAdvancedPricingActionGroup">
+        <annotations>
+            <description>Sets the provided Advanced Pricing on the Admin Bundle Product creation/edit page.</description>
+        </annotations>
+        <arguments>
+            <argument name="priceView" type="string" defaultValue="Price Range"/>
+        </arguments>
+        <remove keyForRemoval="selectProductCustomGroupValue"/>
+        <selectOption selector="{{AdminBundleProductFormAdvancedPricingSection.bundleAdvancedPriceView}}" userInput="{{priceView}}" stepKey="selectPriceView" before="clickDoneButton"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Page/AdminProductCreatePage.xml b/app/code/Magento/Bundle/Test/Mftf/Page/AdminProductCreatePage.xml
index 562ded6c8e40f..09137d3376157 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Page/AdminProductCreatePage.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Page/AdminProductCreatePage.xml
@@ -10,5 +10,6 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
     <page name="AdminProductCreatePage" url="catalog/product/new/set/{{set}}/type/{{type}}/" area="admin" module="Magento_Catalog" parameterized="true">
         <section name="AdminProductFormBundleSection"/>
+        <section name="AdminProductFormAdvancedPricingSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/AdminBundleProductFormAdvancedPricingSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/AdminBundleProductFormAdvancedPricingSection.xml
new file mode 100644
index 0000000000000..9d24e1ed25d6c
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Section/AdminBundleProductFormAdvancedPricingSection.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="AdminBundleProductFormAdvancedPricingSection">
+        <element name="bundleAdvancedPriceView" type="select" selector="div[data-index='advanced-pricing'] select[name='product[price_view]']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml
index 967cf5ac49ed5..6ad83ba1105f4 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml
@@ -20,6 +20,7 @@
         <element name="bundleOptionXInputType" type="select" selector="[name='bundle_options[bundle_options][{{x}}][type]']" parameterized="true"/>
         <element name="bundleOptionXRequired" type="checkbox" selector="[name='bundle_options[bundle_options][{{x}}][required]']" parameterized="true"/>
         <element name="bundleOptionXProductYQuantity" type="input" selector="[name='bundle_options[bundle_options][{{x}}][bundle_selections][{{y}}][selection_qty]']" parameterized="true"/>
+        <element name="bundleOptionXProductYPrice" type="input" selector="[name='bundle_options[bundle_options][{{x}}][bundle_selections][{{y}}][selection_price_value]']" parameterized="true"/>
         <element name="addProductsToOption" type="button" selector="[data-index='modal_set']" timeout="30"/>
         <element name="nthAddProductsToOption" type="button" selector="//tr[{{var}}]//button[@data-index='modal_set']" timeout="30" parameterized="true"/>
         <element name="bundlePriceType" type="select" selector="bundle_options[bundle_options][0][bundle_selections][0][selection_price_type]"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
index fae1ec331b667..23b541273a861 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -13,6 +13,8 @@
         <element name="priceTo" type="text" selector=".product-info-price .price-to"/>
         <element name="minPrice" type="text" selector="span[data-price-type='minPrice']"/>
         <element name="maxPrice" type="text" selector="span[data-price-type='minPrice']"/>
+        <element name="asLowAsFinalPrice" type="text" selector="div.price-box.price-final_price p.minimal-price > span.price-final_price span.price"/>
+        <element name="fixedFinalPrice" type="text" selector="div.price-box.price-final_price > span.price-final_price span.price"/>
         <element name="productBundleOptionsCheckbox" type="checkbox" selector="//*[@id='product-options-wrapper']//div[@class='fieldset']//label[contains(.,'{{childName}}')]/../input" parameterized="true" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithDynamicTierPriceInCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithDynamicTierPriceInCartTest.xml
new file mode 100644
index 0000000000000..6e808fa921563
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithDynamicTierPriceInCartTest.xml
@@ -0,0 +1,41 @@
+<?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="BundleProductWithDynamicTierPriceInCartTest" extends="BundleProductWithTierPriceWithFixedAndPercentOptionsInCartTest">
+        <annotations>
+            <stories value="Add bundle product to cart on storefront"/>
+            <title value="Customer should get the right subtotal in cart when the bundle product with dynamic tier price added to the cart"/>
+            <description value="Customer should be able to add bundle product with dynamic tier price to the cart and get the right price"/>
+            <severity value="CRITICAL"/>
+        </annotations>
+
+        <before>
+            <createData entity="VirtualProduct" stepKey="simpleProduct1">
+                <field key="price">50.00</field>
+            </createData>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2">
+                <field key="price">100.00</field>
+            </createData>
+        </before>
+
+        <remove keyForRemoval="clickDynamicPriceSwitcher"/>
+        <remove keyForRemoval="fillBundlePrice"/>
+        <remove keyForRemoval="disableDynamicSku"/>
+        <remove keyForRemoval="fillBundleOption1Price"/>
+        <remove keyForRemoval="selectPercentPrice"/>
+        <remove keyForRemoval="fillBundleOption2Price"/>
+        <assertEquals message="ExpectedPrice" stepKey="assertBundleProductPrice">
+            <actualResult type="variable">grabProductPrice</actualResult>
+            <expectedResult type="string">$75.00</expectedResult>
+        </assertEquals>
+        <actionGroup ref="AssertSubTotalOnStorefrontMiniCartActionGroup" stepKey="assertSubTotalOnStorefrontMiniCart">
+            <argument name="subTotal" value="$75.00"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithOptionTierPriceInCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithOptionTierPriceInCartTest.xml
new file mode 100644
index 0000000000000..2cb1d8673abe8
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithOptionTierPriceInCartTest.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="BundleProductWithOptionTierPriceInCartTest" extends="BundleProductWithTierPriceWithFixedAndPercentOptionsInCartTest">
+        <annotations>
+            <stories value="Add bundle product to cart on storefront"/>
+            <title value="Customer should get the right subtotal in cart when the bundle product with tier price for sub-item added to the cart"/>
+            <description value="Customer should be able to add bundle product with tier price for sub-item price to the cart and get the right price"/>
+            <severity value="CRITICAL"/>
+        </annotations>
+
+        <before>
+            <createData entity="VirtualProduct" stepKey="simpleProduct1">
+                <field key="price">50.00</field>
+            </createData>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2">
+                <field key="price">100.00</field>
+            </createData>
+            <createData entity="tierProductPrice50PercentDiscount" stepKey="addTierPrice">
+                <requiredEntity createDataKey="simpleProduct2"/>
+            </createData>
+        </before>
+
+        <remove keyForRemoval="clickDynamicPriceSwitcher"/>
+        <remove keyForRemoval="fillBundlePrice"/>
+        <remove keyForRemoval="disableDynamicSku"/>
+        <remove keyForRemoval="fillBundleOption1Price"/>
+        <remove keyForRemoval="selectPercentPrice"/>
+        <remove keyForRemoval="fillBundleOption2Price"/>
+        <remove keyForRemoval="addProductTierPrice"/>
+        <actionGroup ref="SaveProductFormActionGroup" after="addBundleOption2" stepKey="saveBundleProduct"/>
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.fixedFinalPrice}}" stepKey="grabProductPrice"/>
+        <assertEquals message="ExpectedPrice" stepKey="assertBundleProductPrice">
+            <actualResult type="variable">grabProductPrice</actualResult>
+            <expectedResult type="string">$100.00</expectedResult>
+        </assertEquals>
+        <actionGroup ref="AssertSubTotalOnStorefrontMiniCartActionGroup" stepKey="assertSubTotalOnStorefrontMiniCart">
+            <argument name="subTotal" value="$100.00"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithTierPriceWithFixedAndPercentOptionsInCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithTierPriceWithFixedAndPercentOptionsInCartTest.xml
new file mode 100644
index 0000000000000..8817c66668a2a
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithTierPriceWithFixedAndPercentOptionsInCartTest.xml
@@ -0,0 +1,92 @@
+<?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="BundleProductWithTierPriceWithFixedAndPercentOptionsInCartTest">
+        <annotations>
+            <features value="Bundle"/>
+            <stories value="Add bundle product to cart on storefront"/>
+            <title value="Customer should get the right subtotal in cart when the bundle product with tier price and bundle items with fixed and percent price added to the cart"/>
+            <description value="Customer should be able to add bundle product with tier price and bundle items with fixed and percent price to the cart and get the right price"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-26543"/>
+            <group value="bundle"/>
+        </annotations>
+
+        <before>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1">
+                <field key="price">100.00</field>
+            </createData>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2">
+                <field key="price">100.00</field>
+            </createData>
+            <magentoCron groups="index" stepKey="runCronIndex"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+            <actionGroup ref="DeleteProductUsingProductGridActionGroup" stepKey="deleteBundle">
+                <argument name="product" value="BundleProduct"/>
+            </actionGroup>
+            <actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearFiltersAfter"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+
+        <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage"/>
+        <waitForPageLoad stepKey="waitForBundleProductCreatePageToLoad"/>
+        <click selector="{{AdminProductFormBundleSection.dynamicSkuToggle}}" stepKey="disableDynamicSku"/>
+        <click selector="{{AdminProductFormBundleSection.dynamicPrice}}" stepKey="clickDynamicPriceSwitcher"/>
+        <fillField selector="{{AdminProductFormBundleSection.priceField}}" userInput="100" stepKey="fillBundlePrice"/>
+        <actionGroup ref="FillMainBundleProductFormActionGroup" stepKey="fillMainFieldsForBundle"/>
+        <actionGroup ref="AddBundleOptionWithOneProductActionGroup" stepKey="addBundleOption1">
+            <argument name="x" value="0"/>
+            <argument name="n" value="1"/>
+            <argument name="prodOneSku" value="$simpleProduct1.sku$"/>
+            <argument name="prodTwoSku" value=""/>
+            <argument name="optionTitle" value="Option1"/>
+            <argument name="inputType" value="checkbox"/>
+        </actionGroup>
+        <wait time="5" stepKey="vcbcvvc2"/>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYPrice('0', '0')}}" userInput="100" stepKey="fillBundleOption1Price"/>
+        <selectOption selector="{{AdminProductFormBundleSection.bundlePriceType}}" userInput="Percent" stepKey="selectPercentPrice"/>
+        <actionGroup ref="AddBundleOptionWithOneProductActionGroup" stepKey="addBundleOption2">
+            <argument name="x" value="1"/>
+            <argument name="n" value="2"/>
+            <argument name="prodOneSku" value="$simpleProduct2.sku$"/>
+            <argument name="prodTwoSku" value=""/>
+            <argument name="optionTitle" value="Option2"/>
+            <argument name="inputType" value="checkbox"/>
+        </actionGroup>
+        <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYPrice('1', '0')}}" userInput="100" stepKey="fillBundleOption2Price"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfTheProductPage"/>
+        <wait time="5" stepKey="vcbcvvc"/>
+        <actionGroup ref="AdminBundleProductSetAdvancedPricingActionGroup" stepKey="addProductTierPrice">
+            <argument name="quantity" value="1"/>
+            <argument name="price" value="Discount"/>
+            <argument name="amount" value="50"/>
+            <argument name="priceView" value="As Low as"/>
+        </actionGroup>
+        <amOnPage url="{{StorefrontProductPage.url(BundleProduct.urlKey)}}" stepKey="goToStorefront"/>
+        <waitForPageLoad stepKey="waitForStorefront"/>
+        <!--Assert Bundle Product Price-->
+        <grabTextFrom selector="{{StorefrontProductInfoMainSection.asLowAsFinalPrice}}" stepKey="grabProductPrice"/>
+        <assertEquals message="ExpectedPrice" stepKey="assertBundleProductPrice">
+            <actualResult type="variable">grabProductPrice</actualResult>
+            <expectedResult type="string">$150.00</expectedResult>
+        </assertEquals>
+        <actionGroup ref="StorefrontSelectCustomizeAndAddToTheCartButtonActionGroup" stepKey="clickOnCustomizeAndAddToCartButton"/>
+        <actionGroup ref="StorefrontEnterProductQuantityAndAddToTheCartActionGroup" stepKey="enterProductQuantityAndAddToTheCart">
+            <argument name="quantity" value="1"/>
+        </actionGroup>
+        <actionGroup ref="AssertSubTotalOnStorefrontMiniCartActionGroup" stepKey="assertSubTotalOnStorefrontMiniCart">
+            <argument name="subTotal" value="$150.00"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml
index c79756507794a..1c14ef0c72b11 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml
@@ -72,4 +72,12 @@
         <data key="quantity">3</data>
         <var key="sku" entityType="product" entityKey="sku" />
     </entity>
+    <entity name="tierProductPrice50PercentDiscount" type="catalogTierPrice">
+        <data key="price">50</data>
+        <data key="price_type">discount</data>
+        <data key="website_id">0</data>
+        <data key="customer_group">ALL GROUPS</data>
+        <data key="quantity">1</data>
+        <var key="sku" entityType="product" entityKey="sku" />
+    </entity>
 </entities>

From b75c28228c471cb0157dc818fed68a42c1d47fa6 Mon Sep 17 00:00:00 2001
From: DianaRusin <rusind95@gmail.com>
Date: Thu, 23 Jul 2020 18:49:57 +0300
Subject: [PATCH 0997/1718] MC-35892: Automate MC-35954 tests

---
 .../AdminProductAttributeSaveActionGroup.xml  |  22 +++
 .../AdminSaveProductAttributeActionGroup.xml  |   2 +-
 ...seInLayeredNavigationOptionActionGroup.xml |  19 +++
 .../SaveProductAttributeActionGroup.xml       |   2 +-
 .../SaveProductAttributeInUseActionGroup.xml  |   2 +-
 .../StorefrontCategorySidebarSection.xml      |   2 +
 ...eInLayeredNavigationWithoutReindexTest.xml | 152 ++++++++++++++++++
 .../js/jasmine/tests/lib/mage/apply.test.js   |   2 +-
 8 files changed, 199 insertions(+), 4 deletions(-)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSaveActionGroup.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSetProductAttributeUseInLayeredNavigationOptionActionGroup.xml
 create mode 100644 app/code/Magento/LayeredNavigation/Test/Mftf/Test/StorefrontFilterableProductAttributeInLayeredNavigationWithoutReindexTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSaveActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSaveActionGroup.xml
new file mode 100644
index 0000000000000..57d4a6c702c89
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSaveActionGroup.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="AdminProductAttributeSaveActionGroup">
+        <annotations>
+            <description>Clicks on Save button to save the attribute and check success message.</description>
+        </annotations>
+
+        <scrollToTopOfPage stepKey="scrollToTopOfThePage"/>
+        <waitForElementVisible selector="{{AdminMainActionsSection.save}}" stepKey="waitForSaveButton"/>
+        <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveButton"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the product attribute." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSaveProductAttributeActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSaveProductAttributeActionGroup.xml
index 956dc3bf6fa52..66e08b222b60e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSaveProductAttributeActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSaveProductAttributeActionGroup.xml
@@ -10,7 +10,7 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminSaveProductAttributeActionGroup">
         <annotations>
-            <description>Clicks on Save button to save the attribute.</description>
+            <description>DEPRECATED. Use AdminProductAttributeSaveActionGroup instead. Clicks on Save button to save the attribute.</description>
         </annotations>
 
         <waitForElementVisible selector="{{AttributePropertiesSection.Save}}" stepKey="waitForSaveButton"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSetProductAttributeUseInLayeredNavigationOptionActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSetProductAttributeUseInLayeredNavigationOptionActionGroup.xml
new file mode 100644
index 0000000000000..37947ffca7c5d
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSetProductAttributeUseInLayeredNavigationOptionActionGroup.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="AdminSetProductAttributeUseInLayeredNavigationOptionActionGroup">
+        <arguments>
+            <argument name="useInLayeredNavigationValue" type="string" defaultValue="Filterable (with results)"/>
+        </arguments>
+        <conditionalClick selector="{{StorefrontPropertiesSection.StoreFrontPropertiesTab}}"  dependentSelector="{{AttributePropertiesSection.useInLayeredNavigation}}" visible="false" stepKey="clickStoreFrontTab"/>
+        <waitForElementVisible selector="{{AttributePropertiesSection.useInLayeredNavigation}}" stepKey="waitForStorefrontTabLoad"/>
+        <selectOption selector="{{AttributePropertiesSection.useInLayeredNavigation}}" userInput="{{useInLayeredNavigationValue}}" stepKey="selectUseInLayeredNavigationOption"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SaveProductAttributeActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SaveProductAttributeActionGroup.xml
index e1bf2dea21318..796577bf84b65 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SaveProductAttributeActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SaveProductAttributeActionGroup.xml
@@ -10,7 +10,7 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="SaveProductAttributeActionGroup">
         <annotations>
-            <description>Clicks on Save. Validates that the Success Message is present.</description>
+            <description>DEPRECATED. Use AdminProductAttributeSaveActionGroup instead. Clicks on Save. Validates that the Success Message is present.</description>
         </annotations>
 
         <waitForElementVisible selector="{{AttributePropertiesSection.Save}}" stepKey="waitForSaveButton"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SaveProductAttributeInUseActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SaveProductAttributeInUseActionGroup.xml
index 4da8232e8405d..660bd314c4bf3 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SaveProductAttributeInUseActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SaveProductAttributeInUseActionGroup.xml
@@ -10,7 +10,7 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="SaveProductAttributeInUseActionGroup">
         <annotations>
-            <description>Clicks on Save. Validates that the Success Message is present.</description>
+            <description>DEPRECATED. Use AdminProductAttributeSaveActionGroup instead. Clicks on Save. Validates that the Success Message is present.</description>
         </annotations>
 
         <waitForElementVisible selector="{{AttributePropertiesSection.Save}}" stepKey="waitForSaveButton"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategorySidebarSection/StorefrontCategorySidebarSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategorySidebarSection/StorefrontCategorySidebarSection.xml
index 186d0cf313d96..8219208cb76f2 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategorySidebarSection/StorefrontCategorySidebarSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategorySidebarSection/StorefrontCategorySidebarSection.xml
@@ -17,5 +17,7 @@
         <element name="removeFilter" type="button" selector="div.filter-current .remove"/>
         <element name="activeFilterOptions" type="text" selector=".filter-options-item.active .items"/>
         <element name="activeFilterOptionItemByPosition" type="text" selector=".filter-options-item.active .items li:nth-child({{itemPosition}}) a" parameterized="true"/>
+        <element name="enabledFilterOptionItemByLabel" type="text" selector="//main//div[@class='filter-options']//li[@class='item']//a[contains(text(), '{{optionLabel}}')]" parameterized="true"/>
+        <element name="disabledFilterOptionItemByLabel" type="text" selector="//main//div[@class='filter-options']//li[@class='item' and contains(text(), '{{optionLabel}}')]" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/Test/StorefrontFilterableProductAttributeInLayeredNavigationWithoutReindexTest.xml b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/StorefrontFilterableProductAttributeInLayeredNavigationWithoutReindexTest.xml
new file mode 100644
index 0000000000000..b950f7fe97015
--- /dev/null
+++ b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/StorefrontFilterableProductAttributeInLayeredNavigationWithoutReindexTest.xml
@@ -0,0 +1,152 @@
+<?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="StorefrontFilterableProductAttributeInLayeredNavigationWithoutReindexTest">
+        <annotations>
+            <features value="LayeredNavigation"/>
+            <stories value="Magento_LayeredNavigation"/>
+            <title value="Create and add new dropdown product attribute to existing set, assign it to existing product with that set and see it on layered navigation"/>
+            <description value="Verify that new dropdown attribute in existing attribute set shows on layered navigation on storefront without reindex"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-35954"/>
+            <group value="layeredNavigation"/>
+        </annotations>
+
+        <before>
+            <!--Create category, attribute set with multiselect product attribute with two options-->
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+            <createData entity="CatalogAttributeSet" stepKey="createAttributeSet"/>
+            <createData entity="multipleSelectProductAttribute" stepKey="createMultiselectAttribute"/>
+            <createData entity="ProductAttributeOption10" stepKey="firstMultiselectOption">
+                <requiredEntity createDataKey="createMultiselectAttribute"/>
+            </createData>
+            <createData entity="ProductAttributeOption11" stepKey="secondMultiselectOption">
+                <requiredEntity createDataKey="createMultiselectAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getFirstMultiselectOption">
+                <requiredEntity createDataKey="createMultiselectAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getSecondMultiselectOption">
+                <requiredEntity createDataKey="createMultiselectAttribute"/>
+            </getData>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <amOnPage url="{{AdminProductAttributeSetEditPage.url}}/$createAttributeSet.attribute_set_id$/" stepKey="onAttributeSetEdit"/>
+            <waitForPageLoad stepKey="waitForAttributeSetPageLoad"/>
+            <actionGroup ref="AssignAttributeToGroupActionGroup" stepKey="assignMultiselectAttributeToGroup">
+                <argument name="group" value="Product Details"/>
+                <argument name="attribute" value="$createMultiselectAttribute.attribute_code$"/>
+            </actionGroup>
+            <actionGroup ref="SaveAttributeSetActionGroup" stepKey="saveAttributeSet"/>
+            <!--Create configurable product with created attribute set and multiselect attribute-->
+            <createData entity="SimpleOne" storeCode="all" stepKey="createFirstSimpleProduct">
+                <field key="attribute_set_id">$createAttributeSet.attribute_set_id$</field>
+                <requiredEntity createDataKey="createMultiselectAttribute"/>
+                <requiredEntity createDataKey="getFirstMultiselectOption"/>
+            </createData>
+            <createData entity="SimpleOne" storeCode="all" stepKey="createSecondSimpleProduct">
+                <field key="attribute_set_id">$createAttributeSet.attribute_set_id$</field>
+                <requiredEntity createDataKey="createMultiselectAttribute"/>
+                <requiredEntity createDataKey="getSecondMultiselectOption"/>
+            </createData>
+            <createData entity="BaseConfigurableProduct" stepKey="createConfigurableProduct">
+                <field key="attribute_set_id">$createAttributeSet.attribute_set_id$</field>
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ConfigurableProductOneOption" stepKey="createConfigProductOption">
+                <requiredEntity createDataKey="createConfigurableProduct"/>
+                <requiredEntity createDataKey="createMultiselectAttribute"/>
+                <requiredEntity createDataKey="getFirstMultiselectOption"/>
+            </createData>
+            <createData entity="ConfigurableProductOneOption" stepKey="createConfigProductOption2">
+                <requiredEntity createDataKey="createConfigurableProduct"/>
+                <requiredEntity createDataKey="createMultiselectAttribute"/>
+                <requiredEntity createDataKey="getSecondMultiselectOption"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild">
+                <requiredEntity createDataKey="createConfigurableProduct"/>
+                <requiredEntity createDataKey="createFirstSimpleProduct"/>
+            </createData>
+            <createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
+                <requiredEntity createDataKey="createConfigurableProduct"/>
+                <requiredEntity createDataKey="createSecondSimpleProduct"/>
+            </createData>
+            <!--Create new dropdown attribute with two options and set Use in layered navigation "Filterable (no results)"-->
+            <createData entity="dropdownProductAttribute" stepKey="createDropdownAttribute"/>
+            <createData entity="ProductAttributeOption10" stepKey="firstDropdownOption">
+                <requiredEntity createDataKey="createDropdownAttribute"/>
+            </createData>
+            <createData entity="ProductAttributeOption11" stepKey="secondDropdownOption">
+                <requiredEntity createDataKey="createDropdownAttribute"/>
+            </createData>
+            <getData entity="ProductAttributeOptionGetter" index="1" stepKey="getFirstDropdownOption">
+                <requiredEntity createDataKey="createDropdownAttribute"/>
+            </getData>
+            <getData entity="ProductAttributeOptionGetter" index="2" stepKey="getSecondDropdownOption">
+                <requiredEntity createDataKey="createDropdownAttribute"/>
+            </getData>
+            <actionGroup ref="OpenProductAttributeFromSearchResultInGridActionGroup" stepKey="goToDropdownAttributePage">
+                <argument name="productAttributeCode" value="$createDropdownAttribute.attribute_code$"/>
+            </actionGroup>
+            <actionGroup ref="AdminSetProductAttributeUseInLayeredNavigationOptionActionGroup" stepKey="setDropdownUseInLayeredNavigationNoResults">
+                <argument name="useInLayeredNavigationValue" value="Filterable (no results)"/>
+            </actionGroup>
+            <actionGroup ref="AdminProductAttributeSaveActionGroup" stepKey="saveDropdownAttribute"/>
+            <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createFirstSimpleProduct" stepKey="deleteFirstSimpleProduct"/>
+            <deleteData createDataKey="createSecondSimpleProduct" stepKey="deleteSecondSimpleProduct"/>
+            <deleteData createDataKey="createConfigurableProduct" stepKey="deleteConfigurableProduct"/>
+            <deleteData createDataKey="createMultiselectAttribute" stepKey="deleteMultiselectAttribute"/>
+            <deleteData createDataKey="createDropdownAttribute" stepKey="deleteDropdownAttribute"/>
+            <deleteData createDataKey="createAttributeSet" stepKey="deleteAttributeSet"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+
+        <!--Set attribute option Use in layered navigation to "Filterable(no results)"-->
+        <actionGroup ref="OpenProductAttributeFromSearchResultInGridActionGroup" stepKey="goToMultiselectAttributePage">
+            <argument name="productAttributeCode" value="$createMultiselectAttribute.attribute_code$"/>
+        </actionGroup>
+        <actionGroup ref="AdminSetProductAttributeUseInLayeredNavigationOptionActionGroup" stepKey="setMultiselectUseInLayeredNavigationNoResults">
+            <argument name="useInLayeredNavigationValue" value="Filterable (no results)"/>
+        </actionGroup>
+        <actionGroup ref="AdminProductAttributeSaveActionGroup" stepKey="saveMultiselectAttribute"/>
+        <amOnPage url="{{StorefrontCategoryPage.url($createCategory.custom_attributes[url_key]$)}}" stepKey="onCategoryPage"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
+        <waitForElementVisible selector="{{StorefrontCategorySidebarSection.filterOptionsTitle($createMultiselectAttribute.default_frontend_label$)}}" stepKey="waitForMultiselectAttributeVisible"/>
+        <conditionalClick selector="{{StorefrontCategorySidebarSection.filterOptionsTitle($createMultiselectAttribute.default_frontend_label$)}}" dependentSelector="{{StorefrontCategorySidebarSection.activeFilterOptions}}" visible="false" stepKey="clickToExpandAttribute"/>
+        <waitForElementVisible selector="{{StorefrontCategorySidebarSection.activeFilterOptions}}" stepKey="waitForMultiselectAttributeOptionsVisible"/>
+        <seeElement selector="{{StorefrontCategorySidebarSection.enabledFilterOptionItemByLabel($getFirstMultiselectOption.label$)}}" stepKey="assertMultiselectAttributeFirstOptionInLayeredNavigation"/>
+        <seeElement selector="{{StorefrontCategorySidebarSection.enabledFilterOptionItemByLabel($getSecondMultiselectOption.label$)}}" stepKey="assertMultiselectAttributeSecondOptionInLayeredNavigation"/>
+        <amOnPage url="{{AdminProductAttributeSetEditPage.url}}/$createAttributeSet.attribute_set_id$/" stepKey="onAttributeSetEditPage"/>
+        <waitForPageLoad stepKey="waitForAttributeSetEditPageLoad"/>
+        <actionGroup ref="AssignAttributeToGroupActionGroup" stepKey="assignDropdownAttributeToGroup">
+            <argument name="group" value="Product Details"/>
+            <argument name="attribute" value="$createDropdownAttribute.attribute_code$"/>
+        </actionGroup>
+        <actionGroup ref="SaveAttributeSetActionGroup" stepKey="saveAttributeSetWithDropdownAttribute"/>
+        <!--Assign dropdown attribute to child product of configurable-->
+        <amOnPage url="{{AdminProductEditPage.url($createFirstSimpleProduct.id$)}}" stepKey="visitAdminEditProductPage"/>
+        <waitForElementVisible selector="{{AdminProductFormSection.customSelectField('$createDropdownAttribute.attribute_code$')}}" stepKey="waitForDropdownAttributeSelectVisible"/>
+        <selectOption selector="{{AdminProductFormSection.customSelectField('$createDropdownAttribute.attribute_code$')}}" userInput="$getFirstDropdownOption.label$" stepKey="selectValueOfNewAttribute"/>
+        <actionGroup ref="SaveProductFormActionGroup" stepKey="saveSimpleProduct"/>
+        <!--Assert that dropdown attribute is present on layered navigation with both options-->
+        <amOnPage url="{{StorefrontCategoryPage.url($createCategory.custom_attributes[url_key]$)}}" stepKey="goToCategoryPage"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoadWithDropdownAttribute"/>
+        <waitForElementVisible selector="{{StorefrontCategorySidebarSection.filterOptionsTitle($createDropdownAttribute.default_frontend_label$)}}" stepKey="waitForDropdownAttributeVisible"/>
+        <conditionalClick selector="{{StorefrontCategorySidebarSection.filterOptionsTitle($createDropdownAttribute.default_frontend_label$)}}" dependentSelector="{{StorefrontCategorySidebarSection.activeFilterOptions}}" visible="false" stepKey="clickToExpandDropdownAttribute"/>
+        <waitForElementVisible selector="{{StorefrontCategorySidebarSection.activeFilterOptions}}" stepKey="waitForDropdownAttributeOptionsVisible"/>
+        <seeElement selector="{{StorefrontCategorySidebarSection.enabledFilterOptionItemByLabel($getFirstDropdownOption.label$)}}" stepKey="assertDropdownAttributeFirstOptionInLayeredNavigation"/>
+        <seeElement selector="{{StorefrontCategorySidebarSection.disabledFilterOptionItemByLabel($getSecondDropdownOption.label$)}}" stepKey="assertDropdownAttributeSecondOptionInLayeredNavigation"/>
+    </test>
+</tests>
diff --git a/dev/tests/js/jasmine/tests/lib/mage/apply.test.js b/dev/tests/js/jasmine/tests/lib/mage/apply.test.js
index c2c5d65db34f4..86e0e9b78c952 100644
--- a/dev/tests/js/jasmine/tests/lib/mage/apply.test.js
+++ b/dev/tests/js/jasmine/tests/lib/mage/apply.test.js
@@ -64,7 +64,7 @@ define([
                     .toHaveBeenCalledWith(jasmine.any(Object), node);
 
                 done();
-            }, preset.timeout);
+            }, 100);
         });
     });
 });

From e6deb9c3c391d285cccc1c7a7bcc8ddb52f4eb7c Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Thu, 23 Jul 2020 15:02:44 -0500
Subject: [PATCH 0998/1718] MC-32014: Remove google-shopping-ads module from
 core in 2.4.1

---
 dev/tests/integration/bin/magento                           | 6 +++++-
 .../framework/Magento/TestFramework/Console/CliProxy.php    | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/dev/tests/integration/bin/magento b/dev/tests/integration/bin/magento
index 4a86eaee01e83..e3c0be6eaffca 100755
--- a/dev/tests/integration/bin/magento
+++ b/dev/tests/integration/bin/magento
@@ -33,7 +33,11 @@ try {
 try {
     $handler = new \Magento\Framework\App\ErrorHandler();
     set_error_handler([$handler, 'handler']);
-    $application = new CliProxy('Magento CLI');
+    if ($_SERVER['INTEGRATION_TESTS_CLI_AUTOLOADER']) {
+        $application = new CliProxy('Magento CLI');
+    } else {
+        $application = new Cli('Magento CLI');
+    }
     $application->run();
 } catch (\Exception $e) {
     while ($e) {
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Console/CliProxy.php b/dev/tests/integration/framework/Magento/TestFramework/Console/CliProxy.php
index d47931f4734ab..497f234dfa84b 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Console/CliProxy.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Console/CliProxy.php
@@ -13,6 +13,9 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
+/**
+ * Provides the ability to inject additional DI configuration to call a CLI command
+ */
 class CliProxy implements \Magento\Framework\ObjectManager\NoninterceptableInterface
 {
     /**

From 0ab86edf6c6a29c775334771f5ccc44f4aabb6a2 Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Thu, 23 Jul 2020 16:35:20 -0500
Subject: [PATCH 0999/1718] MC-34573: Update TinyMCE

- Fixed static test failure
---
 .../Ui/DataProvider/Modifier/WysiwygModifierInterface.php        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Ui/DataProvider/Modifier/WysiwygModifierInterface.php b/app/code/Magento/Ui/DataProvider/Modifier/WysiwygModifierInterface.php
index 93ede9ad0a4f8..87a2c85ca9573 100644
--- a/app/code/Magento/Ui/DataProvider/Modifier/WysiwygModifierInterface.php
+++ b/app/code/Magento/Ui/DataProvider/Modifier/WysiwygModifierInterface.php
@@ -19,6 +19,7 @@ public function getEditorName();
 
     /**
      * Modifies the meta
+     *
      * @param array $meta
      *
      * @return array

From d977db175e1633788c626bc0635699554edd6774 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Thu, 23 Jul 2020 18:47:22 -0500
Subject: [PATCH 1000/1718] MC-20639: MyAccount :: Order Details :: Refund
 (creditMemo) Details by Order Number

---
 .../Resolver/CreditMemo/CreditMemoTotal.php   | 151 +++++++++++++++---
 .../Model/Resolver/InvoiceTotal.php           |   3 +-
 .../Model/Resolver/OrderTotal.php             |   3 +-
 .../Magento/SalesGraphQl/etc/schema.graphqls  |  15 +-
 4 files changed, 143 insertions(+), 29 deletions(-)

diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoTotal.php b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoTotal.php
index 22dc6cccba251..6212994bff6db 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoTotal.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoTotal.php
@@ -13,12 +13,44 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Sales\Api\Data\CreditmemoInterface;
 use Magento\Sales\Api\Data\OrderInterface;
+use Magento\SalesGraphQl\Model\SalesItem\ShippingTaxCalculator;
+use Magento\Tax\Api\OrderTaxManagementInterface;
+use Magento\Tax\Helper\Data as TaxHelper;
 
 /**
  * Resolve credit memo totals information
  */
 class CreditMemoTotal implements ResolverInterface
 {
+    /**
+     * @var TaxHelper
+     */
+    private $taxHelper;
+
+    /**
+     * @var OrderTaxManagementInterface
+     */
+    private $orderTaxManagement;
+
+    /**
+     * @var ShippingTaxCalculator
+     */
+    private $shippingTaxCalculator;
+    /**
+     * @param OrderTaxManagementInterface $orderTaxManagement
+     * @param TaxHelper $taxHelper
+     * @param ShippingTaxCalculator $shippingTaxCalculator
+     */
+    public function __construct(
+        OrderTaxManagementInterface $orderTaxManagement,
+        TaxHelper $taxHelper,
+        ShippingTaxCalculator $shippingTaxCalculator
+    ) {
+        $this->taxHelper = $taxHelper;
+        $this->orderTaxManagement = $orderTaxManagement;
+        $this->shippingTaxCalculator = $shippingTaxCalculator;
+    }
+
     /**
      * @inheritDoc
      */
@@ -42,32 +74,109 @@ public function resolve(
         /** @var CreditmemoInterface $creditMemo */
         $creditMemo = $value['model'];
         $currency = $orderModel->getOrderCurrencyCode();
-
+        $baseCurrency = $orderModel->getBaseCurrencyCode();
         return [
-            'subtotal' => [
-                'value' =>  $creditMemo->getSubtotal(),
-                'currency' => $currency
-            ],
-            'base_grand_total' => [
-                'value' => $creditMemo->getBaseGrandTotal(),
-                'currency' => $currency
-            ],
-            'grand_total' => [
-                'value' =>  $creditMemo->getGrandTotal(),
-                'currency' => $currency
-            ],
-            'total_tax' => [
-                'value' =>  $creditMemo->getTaxAmount(),
-                'currency' => $currency
-            ],
-            'shipping_amount' => [
-                'value' =>  $creditMemo->getShippingAmount(),
-                'currency' => $currency
+            'base_grand_total' => ['value' => $creditMemo->getBaseGrandTotal(), 'currency' => $baseCurrency],
+            'grand_total' => ['value' =>  $creditMemo->getGrandTotal(), 'currency' => $currency],
+            'subtotal' => ['value' =>  $creditMemo->getSubtotal(), 'currency' => $currency],
+            'total_tax' => ['value' =>  $creditMemo->getTaxAmount(), 'currency' => $currency],
+            'total_shipping' => ['value' => $creditMemo->getShippingAmount(), 'currency' => $currency],
+            'discounts' => $this->getDiscountDetails($creditMemo),
+            'taxes' => $this->formatTaxes(
+                $orderModel,
+                $this->taxHelper->getCalculatedTaxes($creditMemo),
+            ),
+            'shipping_handling' => [
+                'amount_excluding_tax' => [
+                    'value' => $creditMemo->getShippingAmount() ?? 0,
+                    'currency' => $currency
+                ],
+                'amount_including_tax' => [
+                    'value' => $creditMemo->getShippingInclTax() ?? 0,
+                    'currency' => $currency
+                ],
+                'total_amount' => [
+                    'value' => $creditMemo->getShippingAmount() ?? 0,
+                    'currency' => $currency
+                ],
+                'discounts' => $this->getShippingDiscountDetails($creditMemo),
+                'taxes' => $this->formatTaxes(
+                    $orderModel,
+                    $this->shippingTaxCalculator->calculateShippingTaxes($orderModel, $creditMemo),
+                )
             ],
             'adjustment' => [
-                'value' =>  $creditMemo->getAdjustment(),
+                'value' =>  abs($creditMemo->getAdjustment()),
                 'currency' => $currency
             ],
         ];
     }
+
+    /**
+     * Return information about an applied discount on shipping
+     *
+     * @param CreditmemoInterface $creditmemo
+     * @return array
+     */
+    private function getShippingDiscountDetails(CreditmemoInterface $creditmemo)
+    {
+        $shippingDiscounts = [];
+        if (!($creditmemo->getDiscountDescription() === null
+            && $creditmemo->getShippingDiscountTaxCompensationAmount() == 0)) {
+            $shippingDiscounts[] =
+                [
+                    'label' => $creditmemo->getDiscountDescription() ?? __('Discount'),
+                    'amount' => [
+                        'value' => abs($creditmemo->getShippingDiscountTaxCompensationAmount()),
+                        'currency' => $creditmemo->getOrderCurrencyCode()
+                    ]
+                ];
+        }
+        return $shippingDiscounts;
+    }
+
+    /**
+     * Return information about an applied discount
+     *
+     * @param CreditmemoInterface $creditmemo
+     * @return array
+     */
+    private function getDiscountDetails(CreditmemoInterface $creditmemo)
+    {
+        $discounts = [];
+        if (!($creditmemo->getDiscountDescription() === null && $creditmemo->getDiscountAmount() == 0)) {
+            $discounts[] = [
+                'label' => $creditmemo->getDiscountDescription() ?? __('Discount'),
+                'amount' => [
+                    'value' => abs($creditmemo->getDiscountAmount()),
+                    'currency' => $creditmemo->getOrderCurrencyCode()
+                ]
+            ];
+        }
+        return $discounts;
+    }
+
+    /**
+     * Format applied taxes
+     *
+     * @param OrderInterface $order
+     * @param array $appliedTaxes
+     * @return array
+     */
+    private function formatTaxes(OrderInterface $order, array $appliedTaxes)
+    {
+        $taxes = [];
+        foreach ($appliedTaxes as $appliedTax) {
+            $appliedTaxesArray = [
+                'rate' => $appliedTax['percent'] ?? 0,
+                'title' => $appliedTax['title'] ?? null,
+                'amount' => [
+                    'value' => $appliedTax['tax_amount'] ?? 0,
+                    'currency' => $order->getOrderCurrencyCode()
+                ]
+            ];
+            $taxes[] = $appliedTaxesArray;
+        }
+        return $taxes;
+    }
 }
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceTotal.php b/app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceTotal.php
index a7be11d386fd3..24e6a86bcc6d6 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceTotal.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceTotal.php
@@ -75,8 +75,9 @@ public function resolve(
         /** @var InvoiceInterface $invoiceModel */
         $invoiceModel = $value['model'];
         $currency = $orderModel->getOrderCurrencyCode();
+        $baseCurrency = $orderModel->getBaseCurrencyCode();
         return [
-            'base_grand_total' => ['value' => $invoiceModel->getBaseGrandTotal(), 'currency' => $currency],
+            'base_grand_total' => ['value' => $invoiceModel->getBaseGrandTotal(), 'currency' => $baseCurrency],
             'grand_total' => ['value' =>  $invoiceModel->getGrandTotal(), 'currency' => $currency],
             'subtotal' => ['value' =>  $invoiceModel->getSubtotal(), 'currency' => $currency],
             'total_tax' => ['value' =>  $invoiceModel->getTaxAmount(), 'currency' => $currency],
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php
index 6f7b943bf6ca2..fc1049e3fe800 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php
@@ -35,10 +35,11 @@ public function resolve(
         /** @var OrderInterface $order */
         $order = $value['model'];
         $currency = $order->getOrderCurrencyCode();
+        $baseCurrency = $order->getBaseCurrencyCode();
 
         return [
             'base_grand_total' => ['value' => $order->getBaseGrandTotal(), 'currency' => $currency],
-            'grand_total' => ['value' => $order->getGrandTotal(), 'currency' => $currency],
+            'grand_total' => ['value' => $order->getGrandTotal(), 'currency' => $baseCurrency],
             'subtotal' => ['value' => $order->getSubtotal(), 'currency' => $currency],
             'total_tax' => ['value' => $order->getTaxAmount(), 'currency' => $currency],
             'taxes' => $this->getAppliedTaxesDetails($order),
diff --git a/app/code/Magento/SalesGraphQl/etc/schema.graphqls b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
index f4efb6e942f12..d8a5d5ce0bda5 100644
--- a/app/code/Magento/SalesGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
@@ -169,7 +169,7 @@ type InvoiceTotal @doc(description: "Contains price details from an invoice"){
     subtotal: Money! @doc(description: "The subtotal of the invoice, excluding shipping, discounts, and taxes")
     discounts: [Discount] @doc(description: "The applied discounts to the invoice")
     total_tax: Money! @doc(description: "The amount of tax applied to the invoice")
-    taxes: [TaxItem] @doc(description: "The order tax details")
+    taxes: [TaxItem] @doc(description: "The invoice tax details")
     grand_total: Money! @doc(description: "The final total amount, including shipping, discounts, and taxes")
     base_grand_total: Money! @doc(description: "The final base grand total amount in the base currency")
     total_shipping: Money! @doc(description: "The shipping amount for the invoice")
@@ -243,11 +243,14 @@ type BundleCreditMemoItem implements CreditMemoItemInterface {
 }
 
 type CreditMemoTotal @doc(description: "Credit memo price details") {
-    subtotal: Money! @doc(description: "The subtotal amount, excluding shipping, discounts, and tax")
-    total_tax: Money! @doc(description: "The total tax amount")
-    grand_total: Money! @doc(description: "The final total amount, including shipping and taxes")
-    base_grand_total: Money! @doc(description: "The final total amount in the base currency")
-    shipping_amount: Money! @doc(description: "The refunded shipping fees")
+    subtotal: Money! @doc(description: "The subtotal of the invoice, excluding shipping, discounts, and taxes")
+    discounts: [Discount] @doc(description: "The applied discounts to the credit memo")
+    total_tax: Money! @doc(description: "The amount of tax applied to the credit memo")
+    taxes: [TaxItem] @doc(description: "The credit memo tax details")
+    grand_total: Money! @doc(description: "The final total amount, including shipping, discounts, and taxes")
+    base_grand_total: Money! @doc(description: "The final base grand total amount in the base currency")
+    total_shipping: Money! @doc(description: "The shipping amount for the credit memo")
+    shipping_handling: ShippingHandling @doc(description: "Contains details about the shipping and handling costs for the credit memo")
     adjustment: Money! @doc(description: "An adjustment manually applied to the order")
 }
 

From 8b5cb3db6e8c14b9741920268e62520f767074fe Mon Sep 17 00:00:00 2001
From: Matt Walters <bluemwhitew@hotmail.co.uk>
Date: Fri, 24 Jul 2020 10:07:00 +0100
Subject: [PATCH 1001/1718] magento/magento2-page-builder#543: Content Product
 Attributes Default Sorting Order - Fixing Static Tests

---
 .../Setup/Patch/Data/UpdateProductDescriptionOrder.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductDescriptionOrder.php b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductDescriptionOrder.php
index 5b6d2627f65c9..c0377298e5a13 100644
--- a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductDescriptionOrder.php
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductDescriptionOrder.php
@@ -12,9 +12,7 @@
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 
 /**
- * Class UpdateProductDescriptionOrder
- *
- * @package Magento\Catalog\Setup\Patch
+ * Reorder Short Description/Description Product Attributes
  */
 class UpdateProductDescriptionOrder implements DataPatchInterface
 {
@@ -41,7 +39,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function apply()
     {
@@ -67,7 +65,7 @@ public function apply()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDependencies()
     {
@@ -77,7 +75,7 @@ public static function getDependencies()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAliases()
     {

From d7abed97b9a2e0ac142ba14891feed095ee682d3 Mon Sep 17 00:00:00 2001
From: John Carlo Octabio <johncarlo@abovethefray.io>
Date: Fri, 24 Jul 2020 17:10:16 +0800
Subject: [PATCH 1002/1718] magento/magento2#108: Clear Shopping Cart - Update
 translation file for clear shopping cart modal incorrect wording string

---
 app/code/Magento/Checkout/i18n/en_US.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/i18n/en_US.csv b/app/code/Magento/Checkout/i18n/en_US.csv
index 0c10d5a66e9ee..4a78f8deae841 100644
--- a/app/code/Magento/Checkout/i18n/en_US.csv
+++ b/app/code/Magento/Checkout/i18n/en_US.csv
@@ -154,7 +154,7 @@ Shipping,Shipping
 "Quote Lifetime (days)","Quote Lifetime (days)"
 "After Adding a Product Redirect to Shopping Cart","After Adding a Product Redirect to Shopping Cart"
 "Enable Clear Shopping Cart","Enable Clear Shopping Cart"
-"Are you sure you want to remove all items from your Shopping Cart?","Are you sure you want to remove all items from your Shopping Cart?"
+"Are you sure you want to remove all items from your shopping cart?","Are you sure you want to remove all items from your shopping cart?"
 "Number of Items to Display Pager","Number of Items to Display Pager"
 "My Cart Link","My Cart Link"
 "Display Cart Summary","Display Cart Summary"

From 0b150613a1a1506fedcb4a3ecd07158efc5c5985 Mon Sep 17 00:00:00 2001
From: DianaRusin <rusind95@gmail.com>
Date: Fri, 24 Jul 2020 12:11:45 +0300
Subject: [PATCH 1003/1718] MC-35843: Automate MC-26543 tests

---
 ...nBundleProductSetAdvancedPricingActionGroup.xml |  2 +-
 .../Test/Mftf/Page/AdminProductCreatePage.xml      |  1 -
 ... => AdminProductFormAdvancedPricingSection.xml} |  2 +-
 ...BundleProductWithDynamicTierPriceInCartTest.xml |  4 ++--
 .../BundleProductWithOptionTierPriceInCartTest.xml |  8 ++++----
 ...erPriceWithFixedAndPercentOptionsInCartTest.xml | 14 ++++++--------
 .../Catalog/Test/Mftf/Data/TierPriceData.xml       |  2 +-
 7 files changed, 15 insertions(+), 18 deletions(-)
 rename app/code/Magento/Bundle/Test/Mftf/Section/{AdminBundleProductFormAdvancedPricingSection.xml => AdminProductFormAdvancedPricingSection.xml} (87%)

diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminBundleProductSetAdvancedPricingActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminBundleProductSetAdvancedPricingActionGroup.xml
index 4e574a67df43a..16b07a49fabda 100644
--- a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminBundleProductSetAdvancedPricingActionGroup.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminBundleProductSetAdvancedPricingActionGroup.xml
@@ -16,6 +16,6 @@
             <argument name="priceView" type="string" defaultValue="Price Range"/>
         </arguments>
         <remove keyForRemoval="selectProductCustomGroupValue"/>
-        <selectOption selector="{{AdminBundleProductFormAdvancedPricingSection.bundleAdvancedPriceView}}" userInput="{{priceView}}" stepKey="selectPriceView" before="clickDoneButton"/>
+        <selectOption selector="{{AdminProductFormAdvancedPricingSection.bundleAdvancedPriceView}}" userInput="{{priceView}}" stepKey="selectPriceView" before="clickDoneButton"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Page/AdminProductCreatePage.xml b/app/code/Magento/Bundle/Test/Mftf/Page/AdminProductCreatePage.xml
index 09137d3376157..562ded6c8e40f 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Page/AdminProductCreatePage.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Page/AdminProductCreatePage.xml
@@ -10,6 +10,5 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
     <page name="AdminProductCreatePage" url="catalog/product/new/set/{{set}}/type/{{type}}/" area="admin" module="Magento_Catalog" parameterized="true">
         <section name="AdminProductFormBundleSection"/>
-        <section name="AdminProductFormAdvancedPricingSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/AdminBundleProductFormAdvancedPricingSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml
similarity index 87%
rename from app/code/Magento/Bundle/Test/Mftf/Section/AdminBundleProductFormAdvancedPricingSection.xml
rename to app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.xml
index 9d24e1ed25d6c..b30b599f4a034 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Section/AdminBundleProductFormAdvancedPricingSection.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormAdvancedPricingSection.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="AdminBundleProductFormAdvancedPricingSection">
+    <section name="AdminProductFormAdvancedPricingSection">
         <element name="bundleAdvancedPriceView" type="select" selector="div[data-index='advanced-pricing'] select[name='product[price_view]']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithDynamicTierPriceInCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithDynamicTierPriceInCartTest.xml
index 6e808fa921563..c56e09562d49a 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithDynamicTierPriceInCartTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithDynamicTierPriceInCartTest.xml
@@ -16,10 +16,10 @@
         </annotations>
 
         <before>
-            <createData entity="VirtualProduct" stepKey="simpleProduct1">
+            <createData entity="VirtualProduct" stepKey="createProductForBundleItem1">
                 <field key="price">50.00</field>
             </createData>
-            <createData entity="SimpleProduct2" stepKey="simpleProduct2">
+            <createData entity="SimpleProduct2" stepKey="createProductForBundleItem2">
                 <field key="price">100.00</field>
             </createData>
         </before>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithOptionTierPriceInCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithOptionTierPriceInCartTest.xml
index 2cb1d8673abe8..1b33bb08b1b03 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithOptionTierPriceInCartTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithOptionTierPriceInCartTest.xml
@@ -16,14 +16,14 @@
         </annotations>
 
         <before>
-            <createData entity="VirtualProduct" stepKey="simpleProduct1">
+            <createData entity="VirtualProduct" stepKey="createProductForBundleItem1">
                 <field key="price">50.00</field>
             </createData>
-            <createData entity="SimpleProduct2" stepKey="simpleProduct2">
+            <createData entity="SimpleProduct2" stepKey="createProductForBundleItem2">
                 <field key="price">100.00</field>
             </createData>
-            <createData entity="tierProductPrice50PercentDiscount" stepKey="addTierPrice">
-                <requiredEntity createDataKey="simpleProduct2"/>
+            <createData entity="TierProductPrice50PercentDiscount" stepKey="addTierPrice">
+                <requiredEntity createDataKey="createProductForBundleItem2"/>
             </createData>
         </before>
 
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithTierPriceWithFixedAndPercentOptionsInCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithTierPriceWithFixedAndPercentOptionsInCartTest.xml
index 8817c66668a2a..6159b63307815 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithTierPriceWithFixedAndPercentOptionsInCartTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithTierPriceWithFixedAndPercentOptionsInCartTest.xml
@@ -19,10 +19,10 @@
         </annotations>
 
         <before>
-            <createData entity="SimpleProduct2" stepKey="simpleProduct1">
+            <createData entity="SimpleProduct2" stepKey="createProductForBundleItem1">
                 <field key="price">100.00</field>
             </createData>
-            <createData entity="SimpleProduct2" stepKey="simpleProduct2">
+            <createData entity="SimpleProduct2" stepKey="createProductForBundleItem2">
                 <field key="price">100.00</field>
             </createData>
             <magentoCron groups="index" stepKey="runCronIndex"/>
@@ -30,8 +30,8 @@
         </before>
 
         <after>
-            <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
-            <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+            <deleteData createDataKey="createProductForBundleItem1" stepKey="deleteProductForBundleItem1"/>
+            <deleteData createDataKey="createProductForBundleItem2" stepKey="deleteProductForBundleItem2"/>
             <actionGroup ref="DeleteProductUsingProductGridActionGroup" stepKey="deleteBundle">
                 <argument name="product" value="BundleProduct"/>
             </actionGroup>
@@ -48,25 +48,23 @@
         <actionGroup ref="AddBundleOptionWithOneProductActionGroup" stepKey="addBundleOption1">
             <argument name="x" value="0"/>
             <argument name="n" value="1"/>
-            <argument name="prodOneSku" value="$simpleProduct1.sku$"/>
+            <argument name="prodOneSku" value="$createProductForBundleItem1.sku$"/>
             <argument name="prodTwoSku" value=""/>
             <argument name="optionTitle" value="Option1"/>
             <argument name="inputType" value="checkbox"/>
         </actionGroup>
-        <wait time="5" stepKey="vcbcvvc2"/>
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYPrice('0', '0')}}" userInput="100" stepKey="fillBundleOption1Price"/>
         <selectOption selector="{{AdminProductFormBundleSection.bundlePriceType}}" userInput="Percent" stepKey="selectPercentPrice"/>
         <actionGroup ref="AddBundleOptionWithOneProductActionGroup" stepKey="addBundleOption2">
             <argument name="x" value="1"/>
             <argument name="n" value="2"/>
-            <argument name="prodOneSku" value="$simpleProduct2.sku$"/>
+            <argument name="prodOneSku" value="$createProductForBundleItem2.sku$"/>
             <argument name="prodTwoSku" value=""/>
             <argument name="optionTitle" value="Option2"/>
             <argument name="inputType" value="checkbox"/>
         </actionGroup>
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXProductYPrice('1', '0')}}" userInput="100" stepKey="fillBundleOption2Price"/>
         <scrollToTopOfPage stepKey="scrollToTopOfTheProductPage"/>
-        <wait time="5" stepKey="vcbcvvc"/>
         <actionGroup ref="AdminBundleProductSetAdvancedPricingActionGroup" stepKey="addProductTierPrice">
             <argument name="quantity" value="1"/>
             <argument name="price" value="Discount"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml
index 1c14ef0c72b11..731754ef01959 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/TierPriceData.xml
@@ -72,7 +72,7 @@
         <data key="quantity">3</data>
         <var key="sku" entityType="product" entityKey="sku" />
     </entity>
-    <entity name="tierProductPrice50PercentDiscount" type="catalogTierPrice">
+    <entity name="TierProductPrice50PercentDiscount" type="catalogTierPrice">
         <data key="price">50</data>
         <data key="price_type">discount</data>
         <data key="website_id">0</data>

From b74061c4e0acbc2d1cf8cda6695fc6cee04f099a Mon Sep 17 00:00:00 2001
From: Matt Walters <bluemwhitew@hotmail.co.uk>
Date: Fri, 24 Jul 2020 10:23:06 +0100
Subject: [PATCH 1004/1718] magento/magento2-page-builder#543: Content Product
 Attributes Default Sorting Order - Fixing Unit Tests

---
 app/code/Magento/Catalog/Setup/CategorySetup.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Catalog/Setup/CategorySetup.php b/app/code/Magento/Catalog/Setup/CategorySetup.php
index 9f12f68fb9beb..f8542454bef92 100644
--- a/app/code/Magento/Catalog/Setup/CategorySetup.php
+++ b/app/code/Magento/Catalog/Setup/CategorySetup.php
@@ -421,9 +421,9 @@ public function getDefaultEntities()
                         'comparable' => true,
                         'visible_in_advanced_search' => true,
                     ],
-                    'short_description' => [
+                    'description' => [
                         'type' => 'text',
-                        'label' => 'Short Description',
+                        'label' => 'Description',
                         'input' => 'textarea',
                         'sort_order' => 3,
                         'global' => ScopedAttributeInterface::SCOPE_STORE,
@@ -432,14 +432,10 @@ public function getDefaultEntities()
                         'wysiwyg_enabled' => true,
                         'is_html_allowed_on_front' => true,
                         'visible_in_advanced_search' => true,
-                        'used_in_product_listing' => true,
-                        'is_used_in_grid' => true,
-                        'is_visible_in_grid' => false,
-                        'is_filterable_in_grid' => false,
                     ],
-                    'description' => [
+                    'short_description' => [
                         'type' => 'text',
-                        'label' => 'Description',
+                        'label' => 'Short Description',
                         'input' => 'textarea',
                         'sort_order' => 4,
                         'global' => ScopedAttributeInterface::SCOPE_STORE,
@@ -448,6 +444,10 @@ public function getDefaultEntities()
                         'wysiwyg_enabled' => true,
                         'is_html_allowed_on_front' => true,
                         'visible_in_advanced_search' => true,
+                        'used_in_product_listing' => true,
+                        'is_used_in_grid' => true,
+                        'is_visible_in_grid' => false,
+                        'is_filterable_in_grid' => false,
                     ],
                     'price' => [
                         'type' => 'decimal',

From b192e57ef6eafc886ee02d8d009878f646e18c2c Mon Sep 17 00:00:00 2001
From: DianaRusin <rusind95@gmail.com>
Date: Fri, 24 Jul 2020 12:32:46 +0300
Subject: [PATCH 1005/1718] MC-35892: Automate MC-35954 tests

---
 .../StorefrontCategorySidebarSection.xml                     | 4 ++--
 ...ProductAttributeInLayeredNavigationWithoutReindexTest.xml | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategorySidebarSection/StorefrontCategorySidebarSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategorySidebarSection/StorefrontCategorySidebarSection.xml
index 8219208cb76f2..5ec493aef0cea 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategorySidebarSection/StorefrontCategorySidebarSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategorySidebarSection/StorefrontCategorySidebarSection.xml
@@ -17,7 +17,7 @@
         <element name="removeFilter" type="button" selector="div.filter-current .remove"/>
         <element name="activeFilterOptions" type="text" selector=".filter-options-item.active .items"/>
         <element name="activeFilterOptionItemByPosition" type="text" selector=".filter-options-item.active .items li:nth-child({{itemPosition}}) a" parameterized="true"/>
-        <element name="enabledFilterOptionItemByLabel" type="text" selector="//main//div[@class='filter-options']//li[@class='item']//a[contains(text(), '{{optionLabel}}')]" parameterized="true"/>
-        <element name="disabledFilterOptionItemByLabel" type="text" selector="//main//div[@class='filter-options']//li[@class='item' and contains(text(), '{{optionLabel}}')]" parameterized="true"/>
+        <element name="enabledFilterOptionItemByLabel" type="text" selector="//div[@class='filter-options']//li[@class='item']//a[contains(text(), '{{optionLabel}}')]" parameterized="true"/>
+        <element name="disabledFilterOptionItemByLabel" type="text" selector="//div[@class='filter-options']//li[@class='item' and contains(text(), '{{optionLabel}}')]" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/Test/StorefrontFilterableProductAttributeInLayeredNavigationWithoutReindexTest.xml b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/StorefrontFilterableProductAttributeInLayeredNavigationWithoutReindexTest.xml
index b950f7fe97015..be56caa6d3246 100644
--- a/app/code/Magento/LayeredNavigation/Test/Mftf/Test/StorefrontFilterableProductAttributeInLayeredNavigationWithoutReindexTest.xml
+++ b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/StorefrontFilterableProductAttributeInLayeredNavigationWithoutReindexTest.xml
@@ -11,12 +11,13 @@
     <test name="StorefrontFilterableProductAttributeInLayeredNavigationWithoutReindexTest">
         <annotations>
             <features value="LayeredNavigation"/>
-            <stories value="Magento_LayeredNavigation"/>
+            <stories value="Product attributes in Layered Navigation"/>
             <title value="Create and add new dropdown product attribute to existing set, assign it to existing product with that set and see it on layered navigation"/>
             <description value="Verify that new dropdown attribute in existing attribute set shows on layered navigation on storefront without reindex"/>
-            <severity value="AVERAGE"/>
+            <severity value="MAJOR"/>
             <testCaseId value="MC-35954"/>
             <group value="layeredNavigation"/>
+            <group value="SearchEngineElasticsearch"/>
         </annotations>
 
         <before>

From bd4d60cdee80a06663e1342baf946cf8ee5fff63 Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Fri, 24 Jul 2020 13:31:43 +0300
Subject: [PATCH 1006/1718] Increase timeout and skip test

---
 ...ifyCategoryProductAndProductCategoryPartialReindexTest.xml | 4 ++--
 .../Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml    | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyCategoryProductAndProductCategoryPartialReindexTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyCategoryProductAndProductCategoryPartialReindexTest.xml
index b7ae6559b8dfb..890b7b69529a1 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyCategoryProductAndProductCategoryPartialReindexTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyCategoryProductAndProductCategoryPartialReindexTest.xml
@@ -146,7 +146,7 @@
         <!-- Run cron -->
         <wait stepKey="waitBeforeRunMagentoCron" time="30"/>
         <magentoCLI stepKey="runMagentoCron" command="cron:run --group=index"/>
-        <wait stepKey="waitAfterRunMagentoCron" time="60"/>
+        <wait stepKey="waitAfterRunMagentoCron" time="90"/>
 
         <!-- Open categories K, L, M, N on Storefront in order to make sure that new assigments are applied -->
         <!-- Category K contains only Products A, C -->
@@ -212,7 +212,7 @@
         <!-- Run Cron once to reindex product changes -->
         <wait stepKey="waitBeforeRunCronIndexAfterProductAssignToCategory" time="30"/>
         <magentoCLI stepKey="runCronIndexAfterProductAssignToCategory" command="cron:run --group=index"/>
-        <wait stepKey="waitAfterRunCronIndexAfterProductAssignToCategory" time="60"/>
+        <wait stepKey="waitAfterRunCronIndexAfterProductAssignToCategory" time="90"/>
 
         <!-- Open categories K, L, M, N on Storefront in order to make sure that new assigments are applied -->
 
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml
index 842faeb32cc33..63c482d66c57f 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml
@@ -17,6 +17,9 @@
             <severity value="BLOCKER"/>
             <testCaseId value="MC-16161"/>
             <group value="mtf_migrated"/>
+            <skip>
+                <issueId value="MC-36044"/>
+            </skip>
         </annotations>
 
         <before>

From 8de9666e87a0ab85a591be087b838362514a8a1b Mon Sep 17 00:00:00 2001
From: DianaRusin <rusind95@gmail.com>
Date: Fri, 24 Jul 2020 15:23:46 +0300
Subject: [PATCH 1007/1718] MC-35843: Automate MC-26543 tests

---
 ...uctWithTierPriceWithFixedAndPercentOptionsInCartTest.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithTierPriceWithFixedAndPercentOptionsInCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithTierPriceWithFixedAndPercentOptionsInCartTest.xml
index 6159b63307815..59a6869747444 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithTierPriceWithFixedAndPercentOptionsInCartTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductWithTierPriceWithFixedAndPercentOptionsInCartTest.xml
@@ -16,6 +16,7 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-26543"/>
             <group value="bundle"/>
+            <group value="catalog"/>
         </annotations>
 
         <before>
@@ -35,8 +36,9 @@
             <actionGroup ref="DeleteProductUsingProductGridActionGroup" stepKey="deleteBundle">
                 <argument name="product" value="BundleProduct"/>
             </actionGroup>
-            <actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearFiltersAfter"/>
-            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+            <actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearProductsGridFilters"/>
+            <waitForPageLoad stepKey="waitForClearProductsGridFilters"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
         </after>
 
         <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage"/>

From 1bd733a10038b96662e4a681e679f8aa1f9a6da6 Mon Sep 17 00:00:00 2001
From: Matt Walters <bluemwhitew@hotmail.co.uk>
Date: Fri, 24 Jul 2020 13:50:33 +0100
Subject: [PATCH 1008/1718] magento/magento2-page-builder#543: Content Product
 Attributes Default Sorting Order - Fixing Functional Tests

---
 .../Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml       | 3 ++-
 .../Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnProductTest.xml  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml
index d86a696880bae..dbc6fcb9e3265 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml
@@ -32,6 +32,7 @@
         <actionGroup ref="FillMainProductFormActionGroup" stepKey="fillBasicProductInfo" />
 
         <click selector="{{AdminProductFormSection.contentTab}}" stepKey="clickContentTab" />
+        <scrollTo selector="{{ProductDescriptionWYSIWYGToolbarSection.showHideBtn}}" y="-150" x="0" stepKey="scrollToDescription" />
         <waitForElementVisible selector="{{ProductDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey="waitForDescription" />
         <click selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertImageIcon}}" stepKey="clickInsertImageIcon1" />
         <click selector="{{ProductDescriptionWYSIWYGToolbarSection.Browse}}" stepKey="clickBrowse1" />
@@ -67,7 +68,7 @@
         <fillField selector="{{ProductDescriptionWYSIWYGToolbarSection.ImageDescription}}" userInput="{{ImageUpload1.content}}" stepKey="fillImageDescription1" />
         <fillField selector="{{ProductDescriptionWYSIWYGToolbarSection.Height}}" userInput="{{ImageUpload1.height}}" stepKey="fillImageHeight1" />
         <click selector="{{ProductDescriptionWYSIWYGToolbarSection.OkBtn}}" stepKey="clickOkBtn1" />
-        <scrollTo selector="{{ProductDescriptionWYSIWYGToolbarSection.TinyMCE4}}" stepKey="scrollToTinyMCE4" />
+        <scrollTo selector="{{ProductShortDescriptionWYSIWYGToolbarSection.showHideBtn}}" y="-150" x="0" stepKey="scrollToTinyMCE4" />
         <click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertImageIcon}}" stepKey="clickInsertImageIcon2" />
         <click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.Browse}}" stepKey="clickBrowse2" />
         <waitForLoadingMaskToDisappear stepKey="waitForLoading13"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnProductTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnProductTest.xml
index 1e4adedfc168d..aef4d88490500 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnProductTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnProductTest.xml
@@ -44,7 +44,7 @@
         <see selector="{{ProductDescriptionWYSIWYGToolbarSection.InsertImageBtn}}" userInput="Insert Image..." stepKey="seeInsertImage1"/>
         <dontSee selector="{{TinyMCESection.InsertWidgetBtn}}" stepKey="insertWidget1" />
         <dontSee selector="{{TinyMCESection.InsertVariableBtn}}" stepKey="insertVariable1" />
-        <scrollTo selector="{{ProductDescriptionWYSIWYGToolbarSection.showHideBtn}}" stepKey="scrollToDesShowHideBtn2" />
+        <scrollTo selector="{{ProductShortDescriptionWYSIWYGToolbarSection.showHideBtn}}" y="-150" x="0" stepKey="scrollToDesShowHideBtn2" />
         <click selector="{{ProductShortDescriptionWYSIWYGToolbarSection.showHideBtn}}" stepKey="clickShowHideBtn2" />
         <waitForElementVisible selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertImageBtn}}" stepKey="waitForInsertImage2" />
         <see selector="{{ProductShortDescriptionWYSIWYGToolbarSection.InsertImageBtn}}" userInput="Insert Image..." stepKey="seeInsertImage2"/>

From 2357344c1679cd65598b337781167b992b681845 Mon Sep 17 00:00:00 2001
From: Matt Walters <bluemwhitew@hotmail.co.uk>
Date: Fri, 24 Jul 2020 15:18:22 +0100
Subject: [PATCH 1009/1718] magento/magento2-page-builder#543: Content Product
 Attributes Default Sorting Order - Fixing Static Tests

---
 .../Catalog/Setup/Patch/Data/UpdateProductDescriptionOrder.php  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductDescriptionOrder.php b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductDescriptionOrder.php
index c0377298e5a13..db113448eb238 100644
--- a/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductDescriptionOrder.php
+++ b/app/code/Magento/Catalog/Setup/Patch/Data/UpdateProductDescriptionOrder.php
@@ -62,6 +62,8 @@ public function apply()
             'Description',
             110
         );
+
+        return $this;
     }
 
     /**

From 34b230376884cd24c2ee2fc5717cd7c95527ef73 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Fri, 24 Jul 2020 10:48:33 -0500
Subject: [PATCH 1010/1718] MC-20639: MyAccount :: Order Details :: Refund
 (creditMemo) Details by Order Number

---
 .../Magento/GraphQl/Sales/CreditmemoTest.php  | 30 +++++++++++++++++--
 .../customer_creditmemo_with_two_items.php    |  1 +
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
index 4726c7b797509..b86d630e33fe4 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
@@ -61,12 +61,22 @@ public function testCreditMemoForLoggedInCustomerQuery(): void
                     subtotal {
                         value
                     }
+                    base_grand_total  {
+                        value
+                    }
                     grand_total {
                         value
                     }
-                    shipping_amount {
+                    total_shipping {
                         value
                     }
+                    shipping_handling {
+                         amount_including_tax{value}
+                         amount_excluding_tax{value}
+                         total_amount{value}
+                         taxes {amount{value} title rate}
+                         discounts {amount{value} label}
+                    }
                     adjustment {
                         value
                     }
@@ -118,9 +128,25 @@ public function testCreditMemoForLoggedInCustomerQuery(): void
                     'grand_total' => [
                         'value' => 20
                     ],
-                    'shipping_amount' => [
+                    'base_grand_total' => [
+                        'value' => 10
+                    ],
+                    'total_shipping' => [
                         'value' => 0
                     ],
+                    'shipping_handling' => [
+                        'amount_including_tax' => [
+                            'value' => 0
+                        ],
+                        'amount_excluding_tax' => [
+                            'value' => 0
+                        ],
+                        'total_amount' => [
+                            'value' => 0
+                        ],
+                        'taxes' => [],
+                        'discounts' => [],
+                    ],
                     'adjustment' => [
                         'value' => 1.23
                     ]
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/customer_creditmemo_with_two_items.php b/dev/tests/integration/testsuite/Magento/Sales/_files/customer_creditmemo_with_two_items.php
index 02dd5f5533b6b..730848b078413 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/customer_creditmemo_with_two_items.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/customer_creditmemo_with_two_items.php
@@ -28,6 +28,7 @@
 
 $creditMemo = $creditMemoFactory->createByOrder($order);
 $creditMemo->setAdjustment(1.23);
+$creditMemo->setBaseGrandTotal(10);
 $creditMemo->addComment('some_comment', false, true);
 $creditMemo->addComment('some_other_comment', false, true);
 $creditMemo->addComment('not_visible', false, false);

From efacaca8074ce3e283e347ad170cfdf2b8a3fcc5 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Fri, 24 Jul 2020 12:34:40 -0500
Subject: [PATCH 1011/1718] MC-36110: Remove google-shopping-ads clean cache
 fails

---
 setup/src/Magento/Setup/Model/Installer.php   | 21 +++++++++++++++++++
 .../Setup/Test/Unit/Model/InstallerTest.php   | 14 +++++++------
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/setup/src/Magento/Setup/Model/Installer.php b/setup/src/Magento/Setup/Model/Installer.php
index d53dede971fa4..e0f29825585c1 100644
--- a/setup/src/Magento/Setup/Model/Installer.php
+++ b/setup/src/Magento/Setup/Model/Installer.php
@@ -9,6 +9,7 @@
 use Magento\Backend\Setup\ConfigOptionsList as BackendConfigOptionsList;
 use Magento\Framework\App\Cache\Manager;
 use Magento\Framework\App\Cache\Type\Block as BlockCache;
+use Magento\Framework\App\Cache\Type\Config as ConfigCache;
 use Magento\Framework\App\Cache\Type\Layout as LayoutCache;
 use Magento\Framework\App\DeploymentConfig\Reader;
 use Magento\Framework\App\DeploymentConfig\Writer;
@@ -1291,6 +1292,7 @@ public function updateModulesSequence($keepGeneratedFiles = false)
                 . " Run 'magento setup:config:set --help' for options."
             );
         }
+        $this->flushCaches([ConfigCache::TYPE_IDENTIFIER]);
         $this->cleanCaches();
         if (!$keepGeneratedFiles) {
             $this->cleanupGeneratedFiles();
@@ -1397,6 +1399,25 @@ private function cleanCaches()
         $this->log->log('Cache cleared successfully');
     }
 
+    /**
+     * Flush caches for specific types or all available types
+     *
+     * @param array $types
+     * @return void
+     *
+     * @throws Exception
+     */
+    private function flushCaches($types = [])
+    {
+        /** @var Manager $cacheManager */
+        $cacheManager = $this->objectManagerProvider->get()->get(Manager::class);
+        if (empty($types)) {
+            $types = $cacheManager->getAvailableTypes();
+        }
+        $cacheManager->flush($types);
+        $this->log->log('Cache types ' . implode(',', $types) . ' flushed successfully');
+    }
+
     /**
      * Enables or disables maintenance mode for Magento application
      *
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php b/setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php
index 8446486c2f104..48afa684bb9d2 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php
@@ -588,11 +588,12 @@ public function testUpdateModulesSequence()
             );
             $installer = $this->prepareForUpdateModulesTests();
 
-            $this->logger->expects($this->at(0))->method('log')->with('Cache cleared successfully');
-            $this->logger->expects($this->at(1))->method('log')->with('File system cleanup:');
-            $this->logger->expects($this->at(2))->method('log')
+            $this->logger->expects($this->at(0))->method('log')->with('Cache types config flushed successfully');
+            $this->logger->expects($this->at(1))->method('log')->with('Cache cleared successfully');
+            $this->logger->expects($this->at(2))->method('log')->with('File system cleanup:');
+            $this->logger->expects($this->at(3))->method('log')
                 ->with('The directory \'/generation\' doesn\'t exist - skipping cleanup');
-            $this->logger->expects($this->at(3))->method('log')->with('Updating modules:');
+            $this->logger->expects($this->at(4))->method('log')->with('Updating modules:');
             $installer->updateModulesSequence(false);
         }
 
@@ -602,8 +603,9 @@ public function testUpdateModulesSequenceKeepGenerated()
 
             $installer = $this->prepareForUpdateModulesTests();
 
-            $this->logger->expects($this->at(0))->method('log')->with('Cache cleared successfully');
-            $this->logger->expects($this->at(1))->method('log')->with('Updating modules:');
+            $this->logger->expects($this->at(0))->method('log')->with('Cache types config flushed successfully');
+            $this->logger->expects($this->at(1))->method('log')->with('Cache cleared successfully');
+            $this->logger->expects($this->at(2))->method('log')->with('Updating modules:');
             $installer->updateModulesSequence(true);
         }
 

From 7d0579d4e9dd700c92347854b38f828eeb0eb76a Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Fri, 24 Jul 2020 15:10:24 -0500
Subject: [PATCH 1012/1718] MC-36110: Remove google-shopping-ads clean cache
 fails

---
 setup/src/Magento/Setup/Model/Installer.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/setup/src/Magento/Setup/Model/Installer.php b/setup/src/Magento/Setup/Model/Installer.php
index e0f29825585c1..296782c3873c0 100644
--- a/setup/src/Magento/Setup/Model/Installer.php
+++ b/setup/src/Magento/Setup/Model/Installer.php
@@ -1411,9 +1411,7 @@ private function flushCaches($types = [])
     {
         /** @var Manager $cacheManager */
         $cacheManager = $this->objectManagerProvider->get()->get(Manager::class);
-        if (empty($types)) {
-            $types = $cacheManager->getAvailableTypes();
-        }
+        $types = empty($types) ? $cacheManager->getAvailableTypes() : $types;
         $cacheManager->flush($types);
         $this->log->log('Cache types ' . implode(',', $types) . ' flushed successfully');
     }

From c8e2b16339195735a6bd5b642a4e80fe134580dc Mon Sep 17 00:00:00 2001
From: Kevin Kozan <kkozan@adobe.com>
Date: Fri, 24 Jul 2020 16:44:21 -0500
Subject: [PATCH 1013/1718] MQE-2044: Integration Coverage - Jenkins
 Implementation

- Fixed GenerateFixturesCommandTest to use a minimum profile
- Previous profile would cause massive memory usage in B2B
---
 .../Command/GenerateFixturesCommandTest.php   |   2 +-
 .../Console/Command/_files/min_profile.xml    | 122 ++++++++++++++++++
 2 files changed, 123 insertions(+), 1 deletion(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/min_profile.xml

diff --git a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/GenerateFixturesCommandTest.php b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/GenerateFixturesCommandTest.php
index e39d4d7331a40..ebd579330a5a1 100644
--- a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/GenerateFixturesCommandTest.php
+++ b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/GenerateFixturesCommandTest.php
@@ -117,7 +117,7 @@ public static function setUpBeforeClass(): void
      */
     public function testExecute()
     {
-        $profile = BP . "/setup/performance-toolkit/profiles/{$this->getEdition()}/small.xml";
+        $profile = realpath(__DIR__ . "./_files/min_profile.xml");
         $this->commandTester->execute(
             [
                 GenerateFixturesCommand::PROFILE_ARGUMENT => $profile,
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/min_profile.xml b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/min_profile.xml
new file mode 100644
index 0000000000000..535740b316c31
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/min_profile.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xi="http://www.w3.org/2001/XInclude">
+    <profile>
+        <admin_users>2</admin_users><!-- Number of admin users to generate -->
+        <websites>1</websites> <!-- Number of websites to generate -->
+        <store_groups>1</store_groups> <!--Number of stores-->
+        <store_views>1</store_views> <!-- Number of store views -->
+        <assign_entities_to_all_websites>0</assign_entities_to_all_websites> <!-- Whether to assign all products per each website -->
+        <simple_products>1</simple_products> <!-- Simple products count -->
+        <configurable_products> <!-- Configurable product -->
+            <config>
+                <attributes>
+                    <attribute>
+                        <options>3</options>
+                        <swatches>image</swatches>
+                    </attribute>
+                    <attribute>
+                        <options>8</options>
+                    </attribute>
+                </attributes>
+                <sku>Configurable Product %s</sku>
+                <products>16</products>
+            </config>
+        </configurable_products>
+        <product-images>
+            <images-count>1</images-count>
+            <images-per-product>1</images-per-product>
+        </product-images>
+        <categories>1</categories> <!-- Number of categories to generate -->
+        <categories_nesting_level>1</categories_nesting_level> <!-- Nesting level for categories -->
+        <customers>1</customers> <!-- Number of customers to generate -->
+
+        <catalog_price_rules>1</catalog_price_rules> <!-- Number of catalog price rules -->
+        <cart_price_rules>1</cart_price_rules> <!-- Number of cart price rules -->
+        <cart_price_rules_floor>1</cart_price_rules_floor>
+        <coupon_codes>1</coupon_codes> <!-- Number of coupon codes -->
+
+        <product_attribute_sets>1</product_attribute_sets> <!-- Number of product attribute sets -->
+        <product_attribute_sets_attributes>1</product_attribute_sets_attributes> <!-- Number of attributes per set -->
+        <product_attribute_sets_attributes_values>1</product_attribute_sets_attributes_values> <!-- Number of values per attribute -->
+
+        <order_quotes_enable>true</order_quotes_enable>
+        <order_simple_product_count_from>1</order_simple_product_count_from>
+        <order_simple_product_count_to>1</order_simple_product_count_to>
+        <orders>1</orders> <!-- Orders count -->
+
+        <tax_rates_file>tax_rates_small.csv</tax_rates_file> <!-- Tax rates file in fixtures directory-->
+
+        <configs> <!-- Config variables and values for change -->
+            <config>
+                <path>admin/security/use_form_key</path>
+                <scope>default</scope>
+                <scopeId>0</scopeId>
+                <value>0</value>
+            </config>
+            <config>
+                <path>admin/security/session_lifetime</path>
+                <scope>default</scope>
+                <scopeId>0</scopeId>
+                <value>7200</value>
+            </config>
+            <config>
+                <path>admin/security/admin_account_sharing</path>
+                <scope>default</scope>
+                <scopeId>0</scopeId>
+                <value>1</value>
+            </config>
+            <config>
+                <path>carriers/flatrate/active</path>
+                <scope>default</scope>
+                <scopeId>0</scopeId>
+                <value>1</value>
+            </config>
+        </configs>
+        <indexers> <!-- Indexer mode value (true - Update by Schedule, false - Update on Save) -->
+            <indexer>
+                <id>catalog_category_product</id>
+                <set_scheduled>false</set_scheduled>
+            </indexer>
+            <indexer>
+                <id>catalog_product_category</id>
+                <set_scheduled>false</set_scheduled>
+            </indexer>
+            <indexer>
+                <id>catalog_product_price</id>
+                <set_scheduled>false</set_scheduled>
+            </indexer>
+            <indexer>
+                <id>catalog_product_attribute</id>
+                <set_scheduled>false</set_scheduled>
+            </indexer>
+            <indexer>
+                <id>cataloginventory_stock</id>
+                <set_scheduled>false</set_scheduled>
+            </indexer>
+            <indexer>
+                <id>catalogrule_rule</id>
+                <set_scheduled>false</set_scheduled>
+            </indexer>
+            <indexer>
+                <id>catalogrule_product</id>
+                <set_scheduled>false</set_scheduled>
+            </indexer>
+            <indexer>
+                <id>catalogsearch_fulltext</id>
+                <set_scheduled>false</set_scheduled>
+            </indexer>
+        </indexers>
+        <xi:include href="../../config/searchTermsLarge.xml" />
+        <xi:include href="../../config/attributeSets.xml" />
+        <xi:include href="../../config/searchConfig.xml" />
+        <xi:include href="../../config/customerConfig.xml" />
+        <xi:include href="../../config/description.xml" />
+        <xi:include href="../../config/shortDescription.xml" />
+    </profile>
+</config>

From 67a4be3c2d31abb4b0198069e89589780c11fae6 Mon Sep 17 00:00:00 2001
From: ralbin <russell.albin@blueacorn.com>
Date: Fri, 24 Jul 2020 16:53:15 -0500
Subject: [PATCH 1014/1718] Issue 25595 - multiple address virtual product
 error at checkout fixed by adding a default message

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

diff --git a/app/code/Magento/Multishipping/etc/config.xml b/app/code/Magento/Multishipping/etc/config.xml
index aee4199ed4757..e7f247b5afba5 100644
--- a/app/code/Magento/Multishipping/etc/config.xml
+++ b/app/code/Magento/Multishipping/etc/config.xml
@@ -13,5 +13,10 @@
                 <checkout_multiple_maximum_qty>100</checkout_multiple_maximum_qty>
             </options>
         </multishipping>
+        <sales>
+            <minimum_order>
+                <multi_address_error_message>All shippable products have been removed from your order</multi_address_error_message>
+            </minimum_order>
+        </sales>
     </default>
 </config>

From 01e63121e9d9b32a3b89dfe30ef7c648a03e8cbb Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Sat, 25 Jul 2020 09:51:01 +0200
Subject: [PATCH 1015/1718] Fixing existing API-functional tests

---
 .../AddBundleProductToCartSingleMutationTest.php      | 10 +++++-----
 ...AddConfigurableProductToCartSingleMutationTest.php | 11 +++++------
 ...AddDownloadableProductToCartSingleMutationTest.php |  6 +++---
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartSingleMutationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartSingleMutationTest.php
index 4a7b181295d92..33f2174134b3a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartSingleMutationTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartSingleMutationTest.php
@@ -42,7 +42,7 @@ class AddBundleProductToCartSingleMutationTest extends GraphQlAbstract
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->quoteResource = $objectManager->get(QuoteResource::class);
@@ -83,8 +83,8 @@ public function testAddBundleProductToCart()
         $query = <<<QUERY
 mutation {
     addProductsToCart(
-        cart_id: "{$maskedQuoteId}",
-        cart_items: [
+        cartId: "{$maskedQuoteId}",
+        cartItems: [
             {
                 sku: "{$sku}"
                 quantity: 1
@@ -175,8 +175,8 @@ public function testAddBundleToCartWithWrongBundleOptions()
         $query = <<<QUERY
 mutation {
       addProductsToCart(
-            cart_id: "{$maskedQuoteId}",
-            cart_items: [
+            cartId: "{$maskedQuoteId}",
+            cartItems: [
                 {
                     sku: "bundle-product"
                     quantity: 1
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 a56d55528b59b..9b4e1dc6ea610 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartSingleMutationTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartSingleMutationTest.php
@@ -25,7 +25,7 @@ class AddConfigurableProductToCartSingleMutationTest extends GraphQlAbstract
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
@@ -131,7 +131,7 @@ public function testAddProductIfQuantityIsNotAvailable()
         $response = $this->graphQlMutation($query);
 
         self::assertEquals(
-            'Could not add the product with SKU configurable to the shopping cart: The requested qty is not available',
+            'The requested qty is not available',
             $response['addProductsToCart']['userInputErrors'][0]['message']
         );
     }
@@ -183,8 +183,7 @@ public function testOutOfStockVariationToCart()
 
         $response = $this->graphQlMutation($query);
 
-        $expectedErrorMessage = 'Could not add the product with SKU configurable to the shopping cart: ' .
-            'There are no source items with the in stock status';
+        $expectedErrorMessage = 'This product is out of stock.';
         self::assertEquals($expectedErrorMessage, $response['addProductsToCart']['userInputErrors'][0]['message']);
     }
 
@@ -204,8 +203,8 @@ private function getQuery(
         return <<<QUERY
 mutation {
     addProductsToCart(
-        cart_id:"{$maskedQuoteId}"
-        cart_items: [
+        cartId:"{$maskedQuoteId}"
+        cartItems: [
             {
                 sku: "{$parentSku}"
                 quantity: $quantity
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddDownloadableProductToCartSingleMutationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddDownloadableProductToCartSingleMutationTest.php
index 50a17aa22c040..f13a5ebfe42fa 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddDownloadableProductToCartSingleMutationTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddDownloadableProductToCartSingleMutationTest.php
@@ -35,7 +35,7 @@ class AddDownloadableProductToCartSingleMutationTest extends GraphQlAbstract
     /**
      * @inheritdoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
         $this->getMaskedQuoteIdByReservedOrderId = $this->objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
@@ -175,8 +175,8 @@ private function getQuery(
         return <<<MUTATION
 mutation {
     addProductsToCart(
-        cart_id: "{$maskedQuoteId}",
-        cart_items: [
+        cartId: "{$maskedQuoteId}",
+        cartItems: [
             {
                 sku: "{$sku}"
                 quantity: {$qty}

From 11e23d65240adc25cee53eebde5dcd6be0ad7c19 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Sat, 25 Jul 2020 14:15:21 +0200
Subject: [PATCH 1016/1718] Tests enhancements. Added test case for simple
 product with customizable options

---
 ...oadableProductToCartSingleMutationTest.php |  47 ++----
 ...dSimpleProductToCartSingleMutationTest.php | 148 ++++++++++++++++++
 .../Quote/GetCartItemOptionsFromUID.php       |  46 ++++++
 ... GetCustomOptionsWithUIDForQueryBySku.php} |  45 ++++--
 4 files changed, 239 insertions(+), 47 deletions(-)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartItemOptionsFromUID.php
 rename dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/{GetCustomOptionsWithIDV2ForQueryBySku.php => GetCustomOptionsWithUIDForQueryBySku.php} (60%)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddDownloadableProductToCartSingleMutationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddDownloadableProductToCartSingleMutationTest.php
index f13a5ebfe42fa..b457b49a97807 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddDownloadableProductToCartSingleMutationTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddDownloadableProductToCartSingleMutationTest.php
@@ -28,10 +28,15 @@ class AddDownloadableProductToCartSingleMutationTest extends GraphQlAbstract
     private $objectManager;
 
     /**
-     * @var GetCustomOptionsWithIDV2ForQueryBySku
+     * @var GetCustomOptionsWithUIDForQueryBySku
      */
     private $getCustomOptionsWithIDV2ForQueryBySku;
 
+    /**
+     * @var GetCartItemOptionsFromUID
+     */
+    private $getCartItemOptionsFromUID;
+
     /**
      * @inheritdoc
      */
@@ -39,8 +44,9 @@ protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
         $this->getMaskedQuoteIdByReservedOrderId = $this->objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+        $this->getCartItemOptionsFromUID = $this->objectManager->get(GetCartItemOptionsFromUID::class);
         $this->getCustomOptionsWithIDV2ForQueryBySku =
-            $this->objectManager->get(GetCustomOptionsWithIDV2ForQueryBySku::class);
+            $this->objectManager->get(GetCustomOptionsWithUIDForQueryBySku::class);
     }
 
     /**
@@ -57,7 +63,14 @@ public function testAddDownloadableProductWithOptions()
         $linkId = key($links);
 
         $itemOptions = $this->getCustomOptionsWithIDV2ForQueryBySku->execute($sku);
-        $decodedItemOptions = $this->decodeCustomOptions($itemOptions);
+        $decodedItemOptions = $this->getCartItemOptionsFromUID->execute($itemOptions);
+
+        /* The type field is only required for assertions, it should not be present in query */
+        foreach ($itemOptions['entered_options'] as &$enteredOption) {
+            if (isset($enteredOption['type'])) {
+                unset($enteredOption['type']);
+            }
+        }
 
         /* Add downloadable product link data to the "selected_options" */
         $itemOptions['selected_options'][] = $this->generateProductLinkSelectedOptions($linkId);
@@ -129,34 +142,6 @@ private function generateProductLinkSelectedOptions(int $linkId): string
         return base64_encode("downloadable/$linkId");
     }
 
-    /**
-     * Decodes ID_v2 for customizable options and returns [ID] = value pairs
-     *
-     * @param array $encodedCustomOptions
-     * @return array
-     */
-    private function decodeCustomOptions(array $encodedCustomOptions): array
-    {
-        $customOptions = [];
-
-        foreach ($encodedCustomOptions['selected_options'] as $selectedOption) {
-            [,$optionId, $optionValueId] = explode('/', base64_decode($selectedOption));
-            if (isset($customOptions[$optionId])) {
-                $customOptions[$optionId] = [$customOptions[$optionId], $optionValueId];
-            } else {
-                $customOptions[$optionId] = $optionValueId;
-            }
-
-        }
-
-        foreach ($encodedCustomOptions['entered_options'] as $enteredOption) {
-            [,$optionId] = explode('/', base64_decode($enteredOption['id']));
-            $customOptions[$optionId] = $enteredOption['value'];
-        }
-
-        return $customOptions;
-    }
-
     /**
      * Returns GraphQl query string
      *
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php
new file mode 100644
index 0000000000000..64f19a886a388
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Add simple product with custom options to cart using the unified mutation for adding different product types
+ */
+class AddSimpleProductToCartSingleMutationTest extends GraphQlAbstract
+{
+    /**
+     * @var GetCustomOptionsWithUIDForQueryBySku
+     */
+    private $getCustomOptionsWithIDV2ForQueryBySku;
+
+    /**
+     * @var GetMaskedQuoteIdByReservedOrderId
+     */
+    private $getMaskedQuoteIdByReservedOrderId;
+
+    /**
+     * @var GetCartItemOptionsFromUID
+     */
+    private $getCartItemOptionsFromUID;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+        $this->getCartItemOptionsFromUID = $objectManager->get(GetCartItemOptionsFromUID::class);
+        $this->getCustomOptionsWithIDV2ForQueryBySku = $objectManager->get(
+            GetCustomOptionsWithUIDForQueryBySku::class
+        );
+    }
+
+    /**
+     * Test adding a simple product to the shopping cart with all supported
+     * customizable options assigned
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_with_options.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     */
+    public function testAddSimpleProductWithOptions()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
+
+        $sku = 'simple';
+        $qty = 1;
+
+        $itemOptions = $this->getCustomOptionsWithIDV2ForQueryBySku->execute($sku);
+        $decodedItemOptions = $this->getCartItemOptionsFromUID->execute($itemOptions);
+
+        /* The type field is only required for assertions, it should not be present in query */
+        foreach ($itemOptions['entered_options'] as &$enteredOption) {
+            if (isset($enteredOption['type'])) {
+                unset($enteredOption['type']);
+            }
+        }
+
+        $productOptionsQuery = preg_replace(
+            '/"([^"]+)"\s*:\s*/',
+            '$1:',
+            json_encode($itemOptions)
+        );
+
+        $query = $this->getQuery($maskedQuoteId, $qty, $sku, trim($productOptionsQuery, '{}'));
+        $response = $this->graphQlMutation($query);
+
+        self::assertArrayHasKey('items', $response['addProductsToCart']['cart']);
+        self::assertCount($qty, $response['addProductsToCart']['cart']);
+        $customizableOptionsOutput =
+            $response['addProductsToCart']['cart']['items'][0]['customizable_options'];
+
+        foreach ($customizableOptionsOutput as $customizableOptionOutput) {
+            $customizableOptionOutputValues = [];
+            foreach ($customizableOptionOutput['values'] as $customizableOptionOutputValue) {
+                $customizableOptionOutputValues[] =  $customizableOptionOutputValue['value'];
+            }
+            if (count($customizableOptionOutputValues) === 1) {
+                $customizableOptionOutputValues = $customizableOptionOutputValues[0];
+            }
+
+            self::assertEquals(
+                $decodedItemOptions[$customizableOptionOutput['id']],
+                $customizableOptionOutputValues
+            );
+        }
+    }
+
+    /**
+     * Returns GraphQl query string
+     *
+     * @param string $maskedQuoteId
+     * @param int $qty
+     * @param string $sku
+     * @param string $customizableOptions
+     * @return string
+     */
+    private function getQuery(
+        string $maskedQuoteId,
+        int $qty,
+        string $sku,
+        string $customizableOptions
+    ): string {
+        return <<<MUTATION
+mutation {
+    addProductsToCart(
+        cartId: "{$maskedQuoteId}",
+        cartItems: [
+            {
+                sku: "{$sku}"
+                quantity: {$qty}
+                {$customizableOptions}
+            }
+        ]
+    ) {
+        cart {
+            items {
+                quantity
+                ... on SimpleCartItem {
+                    customizable_options {
+                        label
+                        id
+                          values {
+                            value
+                        }
+                    }
+                }
+            }
+        },
+        userInputErrors {
+            message
+        }
+    }
+}
+MUTATION;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartItemOptionsFromUID.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartItemOptionsFromUID.php
new file mode 100644
index 0000000000000..74237ed981896
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartItemOptionsFromUID.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote;
+
+/**
+ * Extracts cart item options from UID
+ */
+class GetCartItemOptionsFromUID
+{
+    /**
+     * Gets an array of encoded item options with UID, extracts and decodes the values
+     *
+     * @param array $encodedCustomOptions
+     * @return array
+     */
+    public function execute(array $encodedCustomOptions): array
+    {
+        $customOptions = [];
+
+        foreach ($encodedCustomOptions['selected_options'] as $selectedOption) {
+            [,$optionId, $optionValueId] = explode('/', base64_decode($selectedOption));
+            if (isset($customOptions[$optionId])) {
+                $customOptions[$optionId] = [$customOptions[$optionId], $optionValueId];
+            } else {
+                $customOptions[$optionId] = $optionValueId;
+            }
+
+        }
+
+        foreach ($encodedCustomOptions['entered_options'] as $enteredOption) {
+            /* The date normalization is required since the attribute might value is formatted by the system */
+            if ($enteredOption['type'] === 'date') {
+                $enteredOption['value'] = date('M d, Y', strtotime($enteredOption['value']));
+            }
+            [,$optionId] = explode('/', base64_decode($enteredOption['id']));
+            $customOptions[$optionId] = $enteredOption['value'];
+        }
+
+        return $customOptions;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCustomOptionsWithIDV2ForQueryBySku.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCustomOptionsWithUIDForQueryBySku.php
similarity index 60%
rename from dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCustomOptionsWithIDV2ForQueryBySku.php
rename to dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCustomOptionsWithUIDForQueryBySku.php
index 1d0bae2d72e3d..dcad6a6125c2f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCustomOptionsWithIDV2ForQueryBySku.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCustomOptionsWithUIDForQueryBySku.php
@@ -12,7 +12,7 @@
 /**
  * Generate an array with test values for customizable options with encoded id_v2 value
  */
-class GetCustomOptionsWithIDV2ForQueryBySku
+class GetCustomOptionsWithUIDForQueryBySku
 {
     /**
      * @var ProductCustomOptionRepositoryInterface
@@ -42,24 +42,37 @@ public function execute(string $sku): array
         foreach ($customOptions as $customOption) {
             $optionType = $customOption->getType();
 
-            if ($optionType === 'field' || $optionType === 'area' || $optionType === 'date') {
-                $enteredOptions[] = [
-                    'id' => $this->encodeEnteredOption((int) $customOption->getOptionId()),
-                    'value' => '2012-12-12'
-                ];
-            } elseif ($optionType === 'drop_down') {
-                $optionSelectValues = $customOption->getValues();
-                $selectedOptions[] = $this->encodeSelectedOption(
-                    (int) $customOption->getOptionId(),
-                    (int) reset($optionSelectValues)->getOptionTypeId()
-                );
-            } elseif ($optionType === 'multiple') {
-                foreach ($customOption->getValues() as $optionValue) {
+            switch ($optionType) {
+                case 'field':
+                case 'area':
+                    $enteredOptions[] = [
+                        'type' => 'field',
+                        'id' => $this->encodeEnteredOption((int) $customOption->getOptionId()),
+                        'value' => 'test'
+                    ];
+                    break;
+                case 'date':
+                    $enteredOptions[] = [
+                        'type' => 'date',
+                        'id' => $this->encodeEnteredOption((int) $customOption->getOptionId()),
+                        'value' => '2012-12-12 00:00:00'
+                    ];
+                    break;
+                case 'drop_down':
+                    $optionSelectValues = $customOption->getValues();
                     $selectedOptions[] = $this->encodeSelectedOption(
                         (int) $customOption->getOptionId(),
-                        (int) $optionValue->getOptionTypeId()
+                        (int) reset($optionSelectValues)->getOptionTypeId()
                     );
-                }
+                    break;
+                case 'multiple':
+                    foreach ($customOption->getValues() as $optionValue) {
+                        $selectedOptions[] = $this->encodeSelectedOption(
+                            (int) $customOption->getOptionId(),
+                            (int) $optionValue->getOptionTypeId()
+                        );
+                    }
+                    break;
             }
         }
 

From 3907936e36a7ea8e0f45ead53db94584b2d92829 Mon Sep 17 00:00:00 2001
From: Eden <eden@magestore.com>
Date: Sat, 25 Jul 2020 20:42:27 +0700
Subject: [PATCH 1017/1718] Remove backup menu if the backup feature is
 disabled

---
 app/code/Magento/Backup/etc/adminhtml/menu.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Backup/etc/adminhtml/menu.xml b/app/code/Magento/Backup/etc/adminhtml/menu.xml
index 27991e57b8485..d6967a6a7932e 100644
--- a/app/code/Magento/Backup/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Backup/etc/adminhtml/menu.xml
@@ -7,6 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
     <menu>
-        <add id="Magento_Backup::system_tools_backup" title="Backups" translate="title" module="Magento_Backup" sortOrder="30" parent="Magento_Backend::system_tools" action="backup/index" resource="Magento_Backup::backup"/>
+        <add id="Magento_Backup::system_tools_backup" title="Backups" translate="title" module="Magento_Backup" sortOrder="30" parent="Magento_Backend::system_tools" action="backup/index" resource="Magento_Backup::backup" dependsOnConfig="system/backup/functionality_enabled"/>
     </menu>
 </config>

From 10be37119368774f964a12c53765522bbdc7617a Mon Sep 17 00:00:00 2001
From: Deepty Thampy <dthampy@adobe.com>
Date: Sat, 25 Jul 2020 12:09:07 -0500
Subject: [PATCH 1018/1718] MC-20639: MyAccount :: Order Details :: Refund
 (creditMemo) Details by Order Number

- test for refund
---
 .../Magento/GraphQl/Sales/CreditmemoTest.php  | 583 ++++++++++++++++--
 1 file changed, 535 insertions(+), 48 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
index 4726c7b797509..45ec21319c7d0 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
@@ -7,7 +7,19 @@
 
 namespace Magento\GraphQl\Sales;
 
+use Magento\Bundle\Model\Selection;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Exception\AuthenticationException;
 use Magento\GraphQl\GetCustomerAuthenticationHeader;
+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 as CreditMemoCollection;
+use Magento\Sales\Model\Service\CreditmemoService;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -21,16 +33,48 @@ class CreditmemoTest extends GraphQlAbstract
      */
     private $customerAuthenticationHeader;
 
+    /** @var CreditmemoFactory */
+    private $creditMemoFactory;
+
+    /** @var Order */
+    private $order;
+
+    /** @var OrderCollection */
+    private $orderCollection;
+
+    /** @var CreditmemoService */
+    private $creditMemoService;
+
+    /** @var ProductRepositoryInterface */
+    private $productRepository;
+
+    /** @var OrderRepositoryInterface */
+    private $orderRepository;
+
+    /** @var CreditMemoCollection */
+    private $creditMemoCollection;
+
+    /** @var SearchCriteriaBuilder */
+    private $searchCriteriaBuilder;
+
     /**
      * Set up
      */
     protected function setUp(): void
     {
         parent::setUp();
-
-        $this->customerAuthenticationHeader = Bootstrap::getObjectManager()->get(
+        $objectManager = Bootstrap::getObjectManager();
+        $this->customerAuthenticationHeader = $objectManager->get(
             GetCustomerAuthenticationHeader::class
         );
+        $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
+        $this->creditMemoFactory = $objectManager->get(CreditmemoFactory::class);
+        $this->order = $objectManager->create(Order::class);
+        $this->searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+        $this->orderCollection = $objectManager->get(OrderCollection::class);
+        $this->orderRepository = $objectManager->get(OrderRepositoryInterface::class);
+        $this->creditMemoService = $objectManager->get(CreditmemoService::class);
+        $this->creditMemoCollection = $objectManager->get(CreditMemoCollection::class);
     }
 
     /**
@@ -38,6 +82,494 @@ protected function setUp(): void
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function testCreditMemoForLoggedInCustomerQuery(): void
+    {
+        $response = $this->getCustomerOrderWithCreditMemoQuery();
+
+        $expectedCreditMemoData = [
+            [
+                'comments' => [
+                    ['message' => 'some_comment'],
+                    ['message' => 'some_other_comment']
+                ],
+                'items' => [
+                    [
+                        'product_name' => 'Simple Related Product',
+                        'product_sku' => 'simple',
+                        'product_sale_price' => [
+                            'value' => 10
+                        ],
+                        'quantity_refunded' => 1
+                    ],
+                    [
+                        'product_name' => 'Simple Product With Related Product',
+                        'product_sku' => 'simple_with_cross',
+                        'product_sale_price' => [
+                            'value' => 10
+                        ],
+                        'quantity_refunded' => 1
+                    ]
+                ],
+                'total' => [
+                    'subtotal' => [
+                        'value' => 20
+                    ],
+                    'grand_total' => [
+                        'value' => 20
+                    ],
+                    'shipping_amount' => [
+                        'value' => 0
+                    ],
+                    'adjustment' => [
+                        'value' => 1.23
+                    ]
+                ]
+            ]
+        ];
+
+        $firstOrderItem = current($response['customer']['orders']['items'] ?? []);
+
+        $creditMemos = $firstOrderItem['credit_memos'] ?? [];
+        $this->assertResponseFields($creditMemos, $expectedCreditMemoData);
+    }
+    /**
+     * Test customer refund details from order for bundle product with a partial refund
+     *
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Bundle/_files/bundle_product_two_dropdown_options.php
+     */
+    public function testCreditMemoForBundledProductsWithPartialRefund()
+    {
+        $qty = 2;
+        $bundleSku = 'bundle-product-two-dropdown-options';
+        $optionsAndSelectionData = $this->getBundleOptionAndSelectionData($bundleSku);
+
+        $cartId = $this->createEmptyCart();
+        $this->addBundleProductQuery($cartId, $qty, $bundleSku, $optionsAndSelectionData);
+        $this->setBillingAddress($cartId);
+        $shippingMethod = $this->setShippingAddress($cartId);
+        $paymentMethod = $this->setShippingMethod($cartId, $shippingMethod);
+        $this->setPaymentMethod($cartId, $paymentMethod);
+        $orderNumber = $this->placeOrder($cartId);
+        $this->prepareInvoice($orderNumber, 2);
+        $order = $this->order->loadByIncrementId($orderNumber);
+        /** @var Order\Item $orderItem */
+        $orderItem = current($order->getAllItems());
+        $orderItem->setQtyRefunded(1);
+        $order->addItem($orderItem);
+        $order->save();
+
+        $creditMemo = $this->creditMemoFactory->createByOrder($order, $order->getData());
+        $creditMemo->setOrder($order);
+        $creditMemo->setState(1);
+        $creditMemo->setSubtotal(15);
+        $creditMemo->setBaseSubTotal(15);
+        $creditMemo->setShippingAmount(10);
+        $creditMemo->setBaseGrandTotal(23);
+        $creditMemo->setGrandTotal(23);
+        $creditMemo->setAdjustment(-2.00);
+        $creditMemo->addComment("Test comment for partial refund", false, true);
+        $creditMemo->save();
+
+        $this->creditMemoService->refund($creditMemo, true);
+        $response = $this->getCustomerOrderWithCreditMemoQuery();
+        $i = 0;
+        $expectedCreditMemoData = [
+            [
+                'comments' => [
+                    ['message' => 'Test comment for partial refund']
+
+                ],
+                'items' => [
+                    [
+                        'product_name' => 'Bundle Product With Two dropdown options',
+                        'product_sku' => 'bundle-product-two-dropdown-options-simple1-simple2',
+                        'product_sale_price' => [
+                            'value' => 15
+                        ],
+                        'quantity_refunded' => 1
+                    ],
+
+                ],
+                'total' => [
+                    'subtotal' => [
+                        'value' => 15
+                    ],
+                    'grand_total' => [
+                        'value' => 23
+                    ],
+                    'shipping_amount' => [
+                        'value' => 10
+                    ],
+                    'adjustment' => [
+                        'value' => -2
+                    ]
+                ]
+            ]
+        ];
+        $firstOrderItem = current($response['customer']['orders']['items'] ?? []);
+
+        $creditMemos = $firstOrderItem['credit_memos'] ?? [];
+        $this->assertResponseFields($creditMemos, $expectedCreditMemoData);
+        $this->deleteOrder();
+        $searchCriteria = $this->searchCriteriaBuilder->addFilter('increment_id', $orderNumber)
+            ->create();
+        $creditmemoRepository = Bootstrap::getObjectManager()->get(CreditmemoRepositoryInterface::class);
+        $creditmemos = $creditmemoRepository->getList($searchCriteria)->getItems();
+        foreach ($creditmemos as $creditmemo) {
+            $creditmemoRepository->delete($creditmemo);
+        }
+    }
+
+    /**
+     * @return string
+     */
+    private function createEmptyCart(): string
+    {
+        $query = <<<QUERY
+mutation {
+  createEmptyCart
+}
+QUERY;
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+        $response = $this->graphQlMutation(
+            $query,
+            [],
+            '',
+            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
+        );
+        return $response['createEmptyCart'];
+    }
+    /**
+     *  Add bundle product to cart with Graphql query
+     *
+     * @param string $cartId
+     * @param float $qty
+     * @param string $sku
+     * @param array $optionsAndSelectionData
+     * @throws AuthenticationException
+     */
+    public function addBundleProductQuery(
+        string $cartId,
+        float $qty,
+        string $sku,
+        array $optionsAndSelectionData
+    ) {
+        $query = <<<QUERY
+mutation {
+  addBundleProductsToCart(input:{
+    cart_id:"{$cartId}"
+    cart_items:[
+      {
+        data:{
+          sku:"{$sku}"
+          quantity:$qty
+        }
+        bundle_options:[
+          {
+            id:$optionsAndSelectionData[0]
+            quantity:1
+            value:["{$optionsAndSelectionData[1]}"]
+          }
+          {
+            id:$optionsAndSelectionData[2]
+            quantity:2
+            value:["{$optionsAndSelectionData[3]}"]
+          }
+        ]
+      }
+    ]
+  }) {
+    cart {
+      items {quantity product {sku}}
+      }
+    }
+}
+QUERY;
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+        $response = $this->graphQlMutation(
+            $query,
+            [],
+            '',
+            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
+        );
+        $this->assertArrayHasKey('cart', $response['addBundleProductsToCart']);
+    }
+    /**
+     * @param string $cartId
+     * @param array $auth
+     * @return array
+     */
+    private function setBillingAddress(string $cartId): void
+    {
+        $query = <<<QUERY
+mutation {
+  setBillingAddressOnCart(
+    input: {
+      cart_id: "{$cartId}"
+      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;
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+        $this->graphQlMutation(
+            $query,
+            [],
+            '',
+            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
+        );
+    }
+
+    /**
+     * @param string $cartId
+     * @return array
+     */
+    private function setShippingAddress(string $cartId): array
+    {
+        $query = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "$cartId"
+      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;
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+        $response = $this->graphQlMutation(
+            $query,
+            [],
+            '',
+            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
+        );
+        $shippingAddress = current($response['setShippingAddressesOnCart']['cart']['shipping_addresses']);
+        $availableShippingMethod = current($shippingAddress['available_shipping_methods']);
+        return $availableShippingMethod;
+    }
+    /**
+     * @param string $cartId
+     * @param array $method
+     * @return array
+     */
+    private function setShippingMethod(string $cartId, array $method): array
+    {
+        $query = <<<QUERY
+mutation {
+  setShippingMethodsOnCart(input:  {
+    cart_id: "{$cartId}",
+    shipping_methods: [
+      {
+         carrier_code: "{$method['carrier_code']}"
+         method_code: "{$method['method_code']}"
+      }
+    ]
+  }) {
+    cart {
+      available_payment_methods {
+        code
+        title
+      }
+    }
+  }
+}
+QUERY;
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+        $response = $this->graphQlMutation(
+            $query,
+            [],
+            '',
+            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
+        );
+
+        $availablePaymentMethod = current($response['setShippingMethodsOnCart']['cart']['available_payment_methods']);
+        return $availablePaymentMethod;
+    }
+
+    /**
+     * @param string $cartId
+     * @param array $method
+     * @return void
+     */
+    private function setPaymentMethod(string $cartId, array $method): void
+    {
+        $query = <<<QUERY
+mutation {
+  setPaymentMethodOnCart(
+    input: {
+      cart_id: "{$cartId}"
+      payment_method: {
+        code: "{$method['code']}"
+      }
+    }
+  ) {
+    cart {selected_payment_method {code}}
+  }
+}
+QUERY;
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+        $this->graphQlMutation(
+            $query,
+            [],
+            '',
+            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
+        );
+    }
+
+    /**
+     * @param string $cartId
+     * @return string
+     */
+    private function placeOrder(string $cartId): string
+    {
+        $query = <<<QUERY
+mutation {
+  placeOrder(
+    input: {
+      cart_id: "{$cartId}"
+    }
+  ) {
+    order {
+      order_number
+    }
+  }
+}
+QUERY;
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+        $response = $this->graphQlMutation(
+            $query,
+            [],
+            '',
+            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
+        );
+        return $response['placeOrder']['order']['order_number'];
+    }
+    /**
+     * @param string $bundleSku
+     * @return array
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    private function getBundleOptionAndSelectionData($bundleSku): array
+    {
+        /** @var Product $bundleProduct */
+        $bundleProduct = $this->productRepository->get($bundleSku);
+        /** @var $typeInstance \Magento\Bundle\Model\Product\Type */
+        $typeInstance = $bundleProduct->getTypeInstance();
+        $optionsAndSelections = [];
+        /** @var $option \Magento\Bundle\Model\Option */
+        $option1 = $typeInstance->getOptionsCollection($bundleProduct)->getFirstItem();
+        $option2 = $typeInstance->getOptionsCollection($bundleProduct)->getLastItem();
+        $optionId1 =(int) $option1->getId();
+        $optionId2 =(int) $option2->getId();
+        /** @var Selection $selection */
+        $selection1 = $typeInstance->getSelectionsCollection([$option1->getId()], $bundleProduct)->getFirstItem();
+        $selectionId1 = (int)$selection1->getSelectionId();
+        $selection2 = $typeInstance->getSelectionsCollection([$option2->getId()], $bundleProduct)->getLastItem();
+        $selectionId2 = (int)$selection2->getSelectionId();
+        array_push($optionsAndSelections, $optionId1, $selectionId1, $optionId2, $selectionId2);
+        return $optionsAndSelections;
+    }
+
+    /**
+     * 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();
+    }
+
+    /**
+     * @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);
+        $creditmemoRepository = Bootstrap::getObjectManager()->get(CreditmemoRepositoryInterface::class);
+        foreach ($orderCollection as $order) {
+            $this->orderRepository->delete($order);
+        }
+        $registry->unregister('isSecureArea');
+        $registry->register('isSecureArea', false);
+    }
+
+    /**
+     *  Get CustomerOrder with credit memo details
+     *
+     * @return array
+     * @throws AuthenticationException
+     */
+    private function getCustomerOrderWithCreditMemoQuery(): array
     {
         $query =
             <<<QUERY
@@ -86,51 +618,6 @@ public function testCreditMemoForLoggedInCustomerQuery(): void
             '',
             $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
         );
-
-        $expectedCreditMemoData = [
-            [
-                'comments' => [
-                    ['message' => 'some_comment'],
-                    ['message' => 'some_other_comment']
-                ],
-                'items' => [
-                    [
-                        'product_name' => 'Simple Related Product',
-                        'product_sku' => 'simple',
-                        'product_sale_price' => [
-                            'value' => 10
-                        ],
-                        'quantity_refunded' => 1
-                    ],
-                    [
-                        'product_name' => 'Simple Product With Related Product',
-                        'product_sku' => 'simple_with_cross',
-                        'product_sale_price' => [
-                            'value' => 10
-                        ],
-                        'quantity_refunded' => 1
-                    ]
-                ],
-                'total' => [
-                    'subtotal' => [
-                        'value' => 20
-                    ],
-                    'grand_total' => [
-                        'value' => 20
-                    ],
-                    'shipping_amount' => [
-                        'value' => 0
-                    ],
-                    'adjustment' => [
-                        'value' => 1.23
-                    ]
-                ]
-            ]
-        ];
-
-        $firstOrderItem = current($response['customer']['orders']['items'] ?? []);
-
-        $creditMemos = $firstOrderItem['credit_memos'] ?? [];
-        $this->assertResponseFields($creditMemos, $expectedCreditMemoData);
+        return $response;
     }
 }

From f32984dd5f3b7fcca91d432101f5d2fb007bb908 Mon Sep 17 00:00:00 2001
From: Deepty Thampy <dthampy@adobe.com>
Date: Sat, 25 Jul 2020 12:52:55 -0500
Subject: [PATCH 1019/1718] MC-20639: MyAccount :: Order Details :: Refund
 (creditMemo) Details by Order Number

- test fixes
---
 .../Magento/GraphQl/Sales/CreditmemoTest.php  | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
index 058ae5d666172..dcabdb951bde2 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
@@ -193,7 +193,6 @@ public function testCreditMemoForBundledProductsWithPartialRefund()
             [
                 'comments' => [
                     ['message' => 'Test comment for partial refund']
-
                 ],
                 'items' => [
                     [
@@ -213,11 +212,27 @@ public function testCreditMemoForBundledProductsWithPartialRefund()
                     'grand_total' => [
                         'value' => 23
                     ],
-                    'shipping_amount' => [
+                    'base_grand_total' => [
+                        'value' => 23
+                    ],
+                    'total_shipping' => [
                         'value' => 10
                     ],
+                    'shipping_handling' => [
+                        'amount_including_tax' => [
+                            'value' => 10
+                        ],
+                        'amount_excluding_tax' => [
+                            'value' => 10
+                        ],
+                        'total_amount' => [
+                            'value' => 10
+                        ],
+                        'taxes' => [],
+                        'discounts' => [],
+                    ],
                     'adjustment' => [
-                        'value' => -2
+                        'value' => 2
                     ]
                 ]
             ]

From ff0e8f69c67698bef8f06fbb24e14ef1167e9644 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Sat, 25 Jul 2020 23:01:50 +0200
Subject: [PATCH 1020/1718] Unit Test / Bugfix / Inverted Expected value with
 actual one

---
 .../Test/Unit/Model/SubscriptionManagerTest.php       | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Newsletter/Test/Unit/Model/SubscriptionManagerTest.php b/app/code/Magento/Newsletter/Test/Unit/Model/SubscriptionManagerTest.php
index 912c6a1df8729..4e1f18a26a95a 100644
--- a/app/code/Magento/Newsletter/Test/Unit/Model/SubscriptionManagerTest.php
+++ b/app/code/Magento/Newsletter/Test/Unit/Model/SubscriptionManagerTest.php
@@ -136,11 +136,8 @@ public function testSubscribe(
             ->with(Subscriber::XML_PATH_CONFIRMATION_FLAG, ScopeInterface::SCOPE_STORE, $storeId)
             ->willReturn($isConfirmNeed);
 
-        $this->assertEquals(
-            $subscriber,
-            $this->subscriptionManager->subscribe($email, $storeId)
-        );
-        $this->assertEquals($subscriber->getData(), $expectedData);
+        $this->assertEquals($subscriber, $this->subscriptionManager->subscribe($email, $storeId));
+        $this->assertEquals($expectedData, $subscriber->getData());
     }
 
     /**
@@ -308,7 +305,7 @@ public function testSubscribeCustomer(
             $subscriber,
             $this->subscriptionManager->subscribeCustomer($customerId, $storeId)
         );
-        $this->assertEquals($subscriber->getData(), $expectedData);
+        $this->assertEquals($expectedData, $subscriber->getData());
     }
 
     /**
@@ -553,7 +550,7 @@ public function testUnsubscribeCustomer(
             $subscriber,
             $this->subscriptionManager->unsubscribeCustomer($customerId, $storeId)
         );
-        $this->assertEquals($subscriber->getData(), $expectedData);
+        $this->assertEquals($expectedData, $subscriber->getData());
     }
 
     /**

From 03198de345527a1e981011c469be57c20391f86f Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Sun, 26 Jul 2020 00:42:07 +0200
Subject: [PATCH 1021/1718] Unit Test / Deprecate / ObjectManager Helper

---
 .../Framework/TestFramework/Unit/Helper/ObjectManager.php        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ObjectManager.php b/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ObjectManager.php
index 26457f23c6c78..527b5b292ca1f 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ObjectManager.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ObjectManager.php
@@ -8,6 +8,7 @@
 /**
  * Helper class for basic object retrieving, such as blocks, models etc...
  *
+ * @deprecated Class under test should be instantiated with `new` keyword with explicit dependencies declaration
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ObjectManager

From d0218e19ae5dd5c519ca960db28fac46edca84a0 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Sun, 26 Jul 2020 00:59:34 +0200
Subject: [PATCH 1022/1718] Replace PHPUnit 6 MockObject reference with
 PHPPUnit 9 ones.

---
 .../TestFramework/Unit/Helper/ObjectManager.php    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ObjectManager.php b/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ObjectManager.php
index 527b5b292ca1f..b313e556335a0 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ObjectManager.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ObjectManager.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Framework\TestFramework\Unit\Helper;
 
+use PHPUnit\Framework\MockObject\MockObject;
+
 /**
  * Helper class for basic object retrieving, such as blocks, models etc...
  *
@@ -45,7 +47,7 @@ public function __construct(\PHPUnit\Framework\TestCase $testObject)
      *
      * @param string $argClassName
      * @param array $originalArguments
-     * @return null|object|\PHPUnit_Framework_MockObject_MockObject
+     * @return null|object|MockObject
      */
     protected function _createArgumentMock($argClassName, array $originalArguments)
     {
@@ -83,7 +85,7 @@ protected function _processSpecialCases($className, $arguments)
     /**
      * Retrieve specific mock of core resource model
      *
-     * @return \Magento\Framework\Module\ResourceInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @return \Magento\Framework\Module\ResourceInterface|MockObject
      */
     protected function _getResourceModelMock()
     {
@@ -109,7 +111,7 @@ protected function _getResourceModelMock()
      * Retrieve mock of core translator model
      *
      * @param string $className
-     * @return \Magento\Framework\TranslateInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @return \Magento\Framework\TranslateInterface|MockObject
      */
     protected function _getTranslatorMock($className)
     {
@@ -131,7 +133,7 @@ protected function _getTranslatorMock($className)
      * Get mock without call of original constructor
      *
      * @param string $className
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * @return MockObject
      */
     protected function _getMockWithoutConstructorCall($className)
     {
@@ -293,7 +295,7 @@ public function getConstructArguments($className, array $arguments = [])
      *
      * @param string $className
      * @param array $data
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * @return MockObject
      * @throws \InvalidArgumentException
      */
     public function getCollectionMock($className, array $data)
@@ -327,7 +329,7 @@ public function getCollectionMock($className, array $data)
      *
      * @param string $argClassName
      * @param array $arguments
-     * @return null|object|\PHPUnit_Framework_MockObject_MockObject
+     * @return null|object|MockObject
      */
     private function _getMockObject($argClassName, array $arguments)
     {

From b39f0d8c3b02b4522c5740aa16c5ebc0737129cf Mon Sep 17 00:00:00 2001
From: Deepty Thampy <dthampy@adobe.com>
Date: Sat, 25 Jul 2020 20:38:20 -0500
Subject: [PATCH 1023/1718] MC-20639: MyAccount :: Order Details :: Refund
 (creditMemo) Details by Order Number

- additional test for tax and discount
---
 .../Magento/GraphQl/Sales/CreditmemoTest.php  | 130 +++++++++++++++++-
 1 file changed, 129 insertions(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
index dcabdb951bde2..c2441630f7996 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
@@ -122,6 +122,7 @@ public function testCreditMemoForLoggedInCustomerQuery(): void
                     'total_shipping' => [
                         'value' => 0
                     ],
+                    'total_tax' => [],
                     'shipping_handling' => [
                         'amount_including_tax' => [
                             'value' => 0
@@ -167,6 +168,7 @@ public function testCreditMemoForBundledProductsWithPartialRefund()
         $this->setPaymentMethod($cartId, $paymentMethod);
         $orderNumber = $this->placeOrder($cartId);
         $this->prepareInvoice($orderNumber, 2);
+        // Create a credit memo
         $order = $this->order->loadByIncrementId($orderNumber);
         /** @var Order\Item $orderItem */
         $orderItem = current($order->getAllItems());
@@ -188,7 +190,6 @@ public function testCreditMemoForBundledProductsWithPartialRefund()
 
         $this->creditMemoService->refund($creditMemo, true);
         $response = $this->getCustomerOrderWithCreditMemoQuery();
-        $i = 0;
         $expectedCreditMemoData = [
             [
                 'comments' => [
@@ -218,6 +219,7 @@ public function testCreditMemoForBundledProductsWithPartialRefund()
                     'total_shipping' => [
                         'value' => 10
                     ],
+                    'total_tax' => [],
                     'shipping_handling' => [
                         'amount_including_tax' => [
                             'value' => 10
@@ -251,6 +253,129 @@ public function testCreditMemoForBundledProductsWithPartialRefund()
         }
     }
 
+    /**
+     * Test customer order with credit memo details for bundle products with taxes and discounts
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Bundle/_files/bundle_product_two_dropdown_options.php
+     * @magentoApiDataFixture Magento/GraphQl/Tax/_files/tax_rule_for_region_1.php
+     * @magentoApiDataFixture Magento/SalesRule/_files/cart_rule_10_percent_off_with_discount_on_shipping.php
+     * @magentoApiDataFixture Magento/GraphQl/Tax/_files/tax_calculation_shipping_excludeTax_order_display_settings.php
+     */
+    public function testCreditMemoForBundleProductWithTaxesAndDiscounts()
+    {
+        $quantity = 2;
+        $bundleSku = 'bundle-product-two-dropdown-options';
+        $optionsAndSelectionData = $this->getBundleOptionAndSelectionData($bundleSku);
+
+        $cartId = $this->createEmptyCart();
+        $this->addBundleProductQuery($cartId, $quantity, $bundleSku, $optionsAndSelectionData);
+        $this->setBillingAddress($cartId);
+        $shippingMethod = $this->setShippingAddress($cartId);
+        $paymentMethod = $this->setShippingMethod($cartId, $shippingMethod);
+        $this->setPaymentMethod($cartId, $paymentMethod);
+        $orderNumber = $this->placeOrder($cartId);
+        $this->prepareInvoice($orderNumber, 2);
+
+        $order = $this->order->loadByIncrementId($orderNumber);
+        /** @var Order\Item $orderItem */
+        $orderItem = current($order->getAllItems());
+        $orderItem->setQtyRefunded(1);
+        $order->addItem($orderItem);
+        $order->save();
+
+        $creditMemo = $this->creditMemoFactory->createByOrder($order, $order->getData());
+        $creditMemo->setOrder($order);
+        $creditMemo->setState(1);
+        $creditMemo->setSubtotal(15);
+        $creditMemo->setBaseSubTotal(15);
+        $creditMemo->setShippingAmount(10);
+        $creditMemo->setTaxAmount(1.69);
+        $creditMemo->setBaseGrandTotal(24.19);
+        $creditMemo->setGrandTotal(24.19);
+        $creditMemo->setAdjustment(0.00);
+        $creditMemo->setDiscountAmount(-2.5);
+        $creditMemo->setDiscountDescription('Discount Label for 10% off');
+        $creditMemo->addComment("Test comment for refund with taxes and discount", false, true);
+        $creditMemo->save();
+
+        $this->creditMemoService->refund($creditMemo, true);
+        //$this->prepareCreditmemoAndRefund($orderNumber);
+        $response = $this->getCustomerOrderWithCreditMemoQuery();
+        $expectedCreditMemoData = [
+            [
+                'comments' => [
+                    ['message' => 'Test comment for refund with taxes and discount']
+                ],
+                'items' => [
+                    [
+                        'product_name' => 'Bundle Product With Two dropdown options',
+                        'product_sku' => 'bundle-product-two-dropdown-options-simple1-simple2',
+                        'product_sale_price' => [
+                            'value' => 15
+                        ],
+                        'quantity_refunded' => 1
+                    ],
+
+                ],
+                'total' => [
+                    'subtotal' => [
+                        'value' => 15
+                    ],
+                    'grand_total' => [
+                        'value' => 24.19
+                    ],
+                    'base_grand_total' => [
+                        'value' => 24.19
+                    ],
+                    'total_shipping' => [
+                        'value' => 10
+                    ],
+                    'total_tax' => [
+                        'value'=> 1.69
+                    ],
+                    'shipping_handling' => [
+                        'amount_including_tax' => [
+                            'value' => 10.75
+                        ],
+                        'amount_excluding_tax' => [
+                            'value' => 10
+                        ],
+                        'total_amount' => [
+                            'value' => 10
+                        ],
+                        'taxes'=> [
+                            0 => [
+                                'amount'=>['value' => 1.69],
+                                'title' => 'US-TEST-*-Rate-1',
+                                'rate' => 7.5
+                            ]
+                        ],
+                        'discounts' => [
+                            0 => ['amount'=>['value'=> 2.5],
+                                'label' => 'Discount Label for 10% off'
+                            ]
+                        ],
+                    ],
+                    'adjustment' => [
+                        'value' => 0
+                    ]
+                ]
+            ]
+        ];
+        $firstOrderItem = current($response['customer']['orders']['items'] ?? []);
+
+        $creditMemos = $firstOrderItem['credit_memos'] ?? [];
+        $this->assertResponseFields($creditMemos, $expectedCreditMemoData);
+        $this->deleteOrder();
+        $searchCriteria = $this->searchCriteriaBuilder->addFilter('increment_id', $orderNumber)
+            ->create();
+        $creditmemoRepository = Bootstrap::getObjectManager()->get(CreditmemoRepositoryInterface::class);
+        $creditmemos = $creditmemoRepository->getList($searchCriteria)->getItems();
+        foreach ($creditmemos as $creditmemo) {
+            $creditmemoRepository->delete($creditmemo);
+        }
+    }
+
     /**
      * @return string
      */
@@ -633,6 +758,9 @@ private function getCustomerOrderWithCreditMemoQuery(): array
                     total_shipping {
                         value
                     }
+                    total_tax {
+                        value
+                    }
                     shipping_handling {
                          amount_including_tax{value}
                          amount_excluding_tax{value}

From 019646ca1ab9937a3f49cc9efa4daa051ac1fad1 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Sun, 26 Jul 2020 09:28:11 +0200
Subject: [PATCH 1024/1718] Fix Static Tests failure, related to non-existing
 class reference

---
 .../TestFramework/Unit/Helper/ObjectManager.php        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ObjectManager.php b/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ObjectManager.php
index b313e556335a0..0f828c6b7cb82 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ObjectManager.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ObjectManager.php
@@ -155,6 +155,7 @@ protected function _getMockWithoutConstructorCall($className)
      */
     public function getObject($className, array $arguments = [])
     {
+        // phpstan:ignore
         if (is_subclass_of($className, \Magento\Framework\Api\AbstractSimpleObjectBuilder::class)
             || is_subclass_of($className, \Magento\Framework\Api\Builder::class)
         ) {
@@ -333,13 +334,12 @@ public function getCollectionMock($className, array $data)
      */
     private function _getMockObject($argClassName, array $arguments)
     {
+        // phpstan:ignore
         if (is_subclass_of($argClassName, \Magento\Framework\Api\ExtensibleObjectBuilder::class)) {
-            $object = $this->getBuilder($argClassName, $arguments);
-            return $object;
-        } else {
-            $object = $this->_createArgumentMock($argClassName, $arguments);
-            return $object;
+            return $this->getBuilder($argClassName, $arguments);
         }
+
+        return $this->_createArgumentMock($argClassName, $arguments);
     }
 
     /**

From 1521ac2a56ffe6d7a97d2c3c716619dde4873473 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Sun, 26 Jul 2020 13:32:42 +0200
Subject: [PATCH 1025/1718] API-functional test for adding product with wrong
 SKU

---
 ...dSimpleProductToCartSingleMutationTest.php | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php
index 64f19a886a388..1315dcfa73ff6 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php
@@ -97,6 +97,26 @@ public function testAddSimpleProductWithOptions()
         }
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     * @group wip
+     */
+    public function testAddProductWithWrongSku()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
+        $sku = 'non-existent';
+
+        $query = $this->getQuery($maskedQuoteId, 1, $sku, '');
+        $response = $this->graphQlMutation($query);
+
+        self::assertArrayHasKey('userInputErrors', $response['addProductsToCart']);
+        self::assertCount(1, $response['addProductsToCart']['userInputErrors']);
+        self::assertEquals(
+            'Could not find a product with SKU "' . $sku .'"',
+            $response['addProductsToCart']['userInputErrors'][0]['message']
+        );
+    }
+
     /**
      * Returns GraphQl query string
      *

From 9be928c3dd9bdd8ea6ffa413062ed98644e07857 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Sun, 26 Jul 2020 13:48:39 +0200
Subject: [PATCH 1026/1718] API-functional tests for wrong SKU and wrong
 quantity

---
 ...dSimpleProductToCartSingleMutationTest.php | 70 +++++++++++++++++--
 1 file changed, 66 insertions(+), 4 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php
index 1315dcfa73ff6..2ab0de101a8f0 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php
@@ -98,13 +98,16 @@ public function testAddSimpleProductWithOptions()
     }
 
     /**
+     * @param string $sku
+     * @param string $message
+     *
+     * @dataProvider wrongSkuDataProvider
+     *
      * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
-     * @group wip
      */
-    public function testAddProductWithWrongSku()
+    public function testAddProductWithWrongSku(string $sku, string $message)
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
-        $sku = 'non-existent';
 
         $query = $this->getQuery($maskedQuoteId, 1, $sku, '');
         $response = $this->graphQlMutation($query);
@@ -112,11 +115,70 @@ public function testAddProductWithWrongSku()
         self::assertArrayHasKey('userInputErrors', $response['addProductsToCart']);
         self::assertCount(1, $response['addProductsToCart']['userInputErrors']);
         self::assertEquals(
-            'Could not find a product with SKU "' . $sku .'"',
+            $message,
+            $response['addProductsToCart']['userInputErrors'][0]['message']
+        );
+    }
+
+    /**
+     * @param int $quantity
+     * @param string $message
+     *
+     * @dataProvider wrongQuantityDataProvider
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_without_custom_options.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     */
+    public function testAddProductWithWrongQuantity(int $quantity, string $message)
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
+        $sku = 'simple-2';
+
+        $query = $this->getQuery($maskedQuoteId, $quantity, $sku, '');
+        $response = $this->graphQlMutation($query);
+        self::assertArrayHasKey('userInputErrors', $response['addProductsToCart']);
+        self::assertCount(1, $response['addProductsToCart']['userInputErrors']);
+
+        self::assertEquals(
+            $message,
             $response['addProductsToCart']['userInputErrors'][0]['message']
         );
     }
 
+    /**
+     * @return array
+     */
+    public function wrongSkuDataProvider(): array
+    {
+        return [
+            'Non-existent SKU' => [
+                'non-existent',
+                'Could not find a product with SKU "non-existent"'
+            ],
+            'Empty SKU' => [
+                '',
+                'Could not find a product with SKU ""'
+            ]
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function wrongQuantityDataProvider(): array
+    {
+        return [
+            'More quantity than in stock' => [
+                101,
+                'The requested qty is not available'
+            ],
+            'Quantity equals zero' => [
+                0,
+                'The product quantity should be greater than 0'
+            ]
+        ];
+    }
+
     /**
      * Returns GraphQl query string
      *

From 4d045f5623b39d76fdbfa16afea592fb35a6b454 Mon Sep 17 00:00:00 2001
From: Tu Nguyen <tuna@ecommage.com>
Date: Sun, 26 Jul 2020 20:03:22 +0700
Subject: [PATCH 1027/1718] Cover js component with jasmine test

update
---
 .../js/view/form/element/email.test.js        | 66 +++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/form/element/email.test.js

diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/form/element/email.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/form/element/email.test.js
new file mode 100644
index 0000000000000..d8c27e1a00c91
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/view/form/element/email.test.js
@@ -0,0 +1,66 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* eslint max-nested-callbacks: 0 */
+
+define(['squire', 'ko'], function (Squire, ko) {
+    'use strict';
+
+    describe('Magento_Checkout/js/view/form/element/email', function () {
+        var injector = new Squire(),
+            mocks = {
+                'Magento_Customer/js/model/customer': {
+                    isLoggedIn: ko.observable()
+                },
+                'Magento_Customer/js/action/check-email-availability': jasmine.createSpy(),
+                'Magento_Customer/js/action/login': jasmine.createSpy(),
+                'Magento_Checkout/js/model/quote': {
+                    isVirtual: jasmine.createSpy(),
+                    shippingAddress: jasmine.createSpy()
+                },
+                'Magento_Checkout/js/checkout-data': jasmine.createSpyObj(
+                    'checkoutData',
+                    [
+                        'setInputFieldEmailValue',
+                        'setValidatedEmailValue',
+                        'setCheckedEmailValue',
+                        'getInputFieldEmailValue',
+                        'getValidatedEmailValue',
+                        'getCheckedEmailValue'
+                    ]
+                ),
+                'Magento_Checkout/js/model/full-screen-loader': jasmine.createSpy(),
+                'mage/validation': jasmine.createSpy()
+            },
+            Component;
+
+        beforeEach(function (done) {
+            injector.mock(mocks);
+            injector.require(['Magento_Checkout/js/view/form/element/email'], function (Constr) {
+                Component = new Constr({
+                    provider: 'provName',
+                    name: '',
+                    index: '',
+                    isPasswordVisible: false,
+                    isEmailCheckComplete: null
+                });
+                done();
+            });
+        });
+
+        afterEach(function () {
+            try {
+                injector.clean();
+                injector.remove();
+            } catch (e) {}
+        });
+
+        describe('"resolveInitialPasswordVisibility" method', function () {
+            it('Check return type of method.', function () {
+                expect(typeof Component.resolveInitialPasswordVisibility()).toEqual('boolean');
+            });
+        });
+    });
+});

From 4faf6460297f24b880dbab24ec9298b26c0ee5a6 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Mon, 27 Jul 2020 10:04:58 +0300
Subject: [PATCH 1028/1718] MC-35026: When a Downloadable Product in a Group
 Product The Order does not show links

---
 .../Observer/SaveDownloadableOrderItemObserver.php | 14 ++++++++------
 .../SaveDownloadableOrderItemObserverTest.php      |  6 ++++++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php b/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
index 4f7939da478fa..341387d3317c7 100644
--- a/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
+++ b/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Downloadable\Observer;
 
 use Magento\Framework\Event\ObserverInterface;
@@ -81,12 +83,14 @@ public function __construct(
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
+        /** @var \Magento\Sales\Model\Order\Item $orderItem */
         $orderItem = $observer->getEvent()->getItem();
         if (!$orderItem->getId()) {
             //order not saved in the database
             return $this;
         }
-        if ($orderItem->getProductType() != \Magento\Downloadable\Model\Product\Type::TYPE_DOWNLOADABLE) {
+        $productType = $orderItem->getRealProductType() ?: $orderItem->getProductType();
+        if ($productType != \Magento\Downloadable\Model\Product\Type::TYPE_DOWNLOADABLE) {
             return $this;
         }
         $product = $orderItem->getProduct();
@@ -112,13 +116,13 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             if ($linkIds = $orderItem->getProductOptionByCode('links')) {
                 $linkPurchased = $this->_createPurchasedModel();
                 $this->_objectCopyService->copyFieldsetToTarget(
-                    \downloadable_sales_copy_order::class,
+                    'downloadable_sales_copy_order',
                     'to_downloadable',
                     $orderItem->getOrder(),
                     $linkPurchased
                 );
                 $this->_objectCopyService->copyFieldsetToTarget(
-                    \downloadable_sales_copy_order_item::class,
+                    'downloadable_sales_copy_order_item',
                     'to_downloadable',
                     $orderItem,
                     $linkPurchased
@@ -131,14 +135,12 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                         ScopeInterface::SCOPE_STORE
                     );
                 $linkPurchased->setLinkSectionTitle($linkSectionTitle)->save();
-                
                 $linkStatus = \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_PENDING;
                 if ($orderStatusToEnableItem == \Magento\Sales\Model\Order\Item::STATUS_PENDING
                     || $orderItem->getOrder()->getState() == \Magento\Sales\Model\Order::STATE_COMPLETE
                 ) {
                     $linkStatus = \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_AVAILABLE;
                 }
-                
                 foreach ($linkIds as $linkId) {
                     if (isset($links[$linkId])) {
                         $linkPurchasedItem = $this->_createPurchasedItemModel()->setPurchasedId(
@@ -148,7 +150,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                         );
 
                         $this->_objectCopyService->copyFieldsetToTarget(
-                            \downloadable_sales_copy_link::class,
+                            'downloadable_sales_copy_link',
                             'to_purchased',
                             $links[$linkId],
                             $linkPurchasedItem
diff --git a/app/code/Magento/Downloadable/Test/Unit/Observer/SaveDownloadableOrderItemObserverTest.php b/app/code/Magento/Downloadable/Test/Unit/Observer/SaveDownloadableOrderItemObserverTest.php
index 80f23c859a031..09edbf4935fe4 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Observer/SaveDownloadableOrderItemObserverTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Observer/SaveDownloadableOrderItemObserverTest.php
@@ -176,6 +176,9 @@ public function testSaveDownloadableOrderItem()
         $itemMock->expects($this->any())
             ->method('getProductType')
             ->willReturn(DownloadableProductType::TYPE_DOWNLOADABLE);
+        $itemMock->expects($this->any())
+            ->method('getRealProductType')
+            ->willReturn(DownloadableProductType::TYPE_DOWNLOADABLE);
 
         $this->orderMock->expects($this->once())
             ->method('getStoreId')
@@ -311,6 +314,9 @@ public function testSaveDownloadableOrderItemSavedPurchasedLink()
         $itemMock->expects($this->any())
             ->method('getProductType')
             ->willReturn(DownloadableProductType::TYPE_DOWNLOADABLE);
+        $itemMock->expects($this->any())
+            ->method('getRealProductType')
+            ->willReturn(DownloadableProductType::TYPE_DOWNLOADABLE);
 
         $purchasedLink = $this->getMockBuilder(Purchased::class)
             ->disableOriginalConstructor()

From 48f5a92a29fbb55d1e687bc1c0ff72075147cf82 Mon Sep 17 00:00:00 2001
From: Anton Evers <evers@adobe.com>
Date: Mon, 27 Jul 2020 09:55:28 +0200
Subject: [PATCH 1029/1718] process code review comments

---
 .../Persistent/Test/Unit/Model/QuoteManagerTest.php    |  1 -
 .../Unit/Model/Quote/Address/Total/SubtotalTest.php    | 10 ----------
 .../Test/Unit/Model/Order/CreditmemoFactoryTest.php    |  3 ---
 .../Pricing/Test/Unit/Adjustment/CollectionTest.php    |  4 +---
 4 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php b/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php
index 39ef03afb83df..0c183084edca2 100644
--- a/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php
@@ -230,7 +230,6 @@ public function testSetGuest()
         $this->quoteMock->expects($this->once())->method('getItemsQty')->willReturn(1);
         $extensionAttributes = $this->getMockBuilder(CartExtensionInterface::class)
             ->addMethods(['getShippingAssignments', 'setShippingAssignments'])
-            ->disableArgumentCloning()
             ->getMockForAbstractClass();
         $shippingAssignment = $this->createMock(ShippingAssignmentInterface::class);
         $extensionAttributes->expects($this->once())
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/SubtotalTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/SubtotalTest.php
index 96c9fbee8834f..3cc586096d4a0 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/SubtotalTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/SubtotalTest.php
@@ -112,9 +112,6 @@ public function testCollect($price, $originalPrice, $itemHasParent, $expectedPri
         /** @var Address|MockObject $address */
         $address = $this->getMockBuilder(Address::class)
             ->disableOriginalConstructor()
-            ->disableOriginalClone()
-            ->disableArgumentCloning()
-            ->disallowMockingUnknownTypes()
             ->onlyMethods(['removeItem', 'getQuote'])
             ->addMethods(['setTotalQty', 'getTotalQty'])
             ->getMock();
@@ -167,9 +164,6 @@ public function testCollect($price, $originalPrice, $itemHasParent, $expectedPri
 
         $total = $this->getMockBuilder(Total::class)
             ->disableOriginalConstructor()
-            ->disableOriginalClone()
-            ->disableArgumentCloning()
-            ->disallowMockingUnknownTypes()
             ->addMethods(['setVirtualAmount', 'setBaseVirtualAmount'])
             ->getMock();
         $total->expects($this->once())->method('setBaseVirtualAmount')->willReturnSelf();
@@ -194,7 +188,6 @@ public function testFetch()
         $quoteMock = $this->createMock(Quote::class);
         $totalMock = $this->getMockBuilder(Total::class)
             ->addMethods(['getSubtotal'])
-            ->disableArgumentCloning()
             ->getMockForAbstractClass();
         $totalMock->expects($this->once())->method('getSubtotal')->willReturn(100);
 
@@ -241,9 +234,6 @@ public function testCollectWithInvalidItems()
             ->with($addressItemId);
         $addressItem = $this->getMockBuilder(AddressItem::class)
             ->disableOriginalConstructor()
-            ->disableOriginalClone()
-            ->disableArgumentCloning()
-            ->disallowMockingUnknownTypes()
             ->onlyMethods(['getId'])
             ->addMethods(['getQuoteItemId'])
             ->getMock();
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoFactoryTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoFactoryTest.php
index e27f6918f1876..67f1931cf7bd1 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoFactoryTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoFactoryTest.php
@@ -51,9 +51,6 @@ protected function setUp(): void
     {
         $this->orderItemMock = $this->getMockBuilder(Item::class)
             ->disableOriginalConstructor()
-            ->disableOriginalClone()
-            ->disableArgumentCloning()
-            ->disallowMockingUnknownTypes()
             ->onlyMethods(['getChildrenItems', 'isDummy', 'getId', 'getParentItemId'])
             ->addMethods(['getHasChildren'])
             ->getMock();
diff --git a/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/CollectionTest.php b/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/CollectionTest.php
index 58354722d484d..ae0e006de59a2 100644
--- a/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/CollectionTest.php
+++ b/lib/internal/Magento/Framework/Pricing/Test/Unit/Adjustment/CollectionTest.php
@@ -71,7 +71,6 @@ function ($code) use ($adjustmentsData) {
     /**
      * @param string[] $adjustments
      * @param string[] $expectedResult
-     *
      * @dataProvider getItemsDataProvider
      */
     public function testGetItems($adjustments, $expectedResult)
@@ -92,7 +91,7 @@ public function getItemsDataProvider()
             [['adj1'], ['adj1']],
             [['adj4'], ['adj4']],
             [['adj1', 'adj4'], ['adj1', 'adj4']],
-            [['adj1', 'adj2', 'adj3', 'adj4'], ['adj3', 'adj1', 'adj2', 'adj4']],
+            [['adj1', 'adj2', 'adj3', 'adj4'], ['adj3', 'adj1', 'adj2', 'adj4']]
         ];
     }
 
@@ -100,7 +99,6 @@ public function getItemsDataProvider()
      * @param string[] $adjustments
      * @param string $code
      * @param $expectedResult
-     *
      * @dataProvider getItemByCodeDataProvider
      */
     public function testGetItemByCode($adjustments, $code, $expectedResult)

From 2dbab41631cce46be4a27dcbf10a7b172be61f63 Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Mon, 27 Jul 2020 11:38:25 +0300
Subject: [PATCH 1030/1718] MC-35675: Orders with Zero Payment Information
 required are Closed after being invoiced

---
 .../Model/Order/Invoice/Total/Discount.php    |  45 +++--
 .../Order/Invoice/Total/DiscountTest.php      | 159 ++++++++++++++++++
 2 files changed, 192 insertions(+), 12 deletions(-)
 create mode 100644 app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Total/DiscountTest.php

diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Total/Discount.php b/app/code/Magento/Sales/Model/Order/Invoice/Total/Discount.php
index acd0d0c67d8c0..ef7205b374415 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Total/Discount.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Total/Discount.php
@@ -5,13 +5,20 @@
  */
 namespace Magento\Sales\Model\Order\Invoice\Total;
 
+use Magento\Sales\Model\Order\Invoice;
+
+/**
+ * Discount invoice
+ */
 class Discount extends AbstractTotal
 {
     /**
-     * @param \Magento\Sales\Model\Order\Invoice $invoice
+     * Collect invoice
+     *
+     * @param Invoice $invoice
      * @return $this
      */
-    public function collect(\Magento\Sales\Model\Order\Invoice $invoice)
+    public function collect(Invoice $invoice)
     {
         $invoice->setDiscountAmount(0);
         $invoice->setBaseDiscountAmount(0);
@@ -24,14 +31,7 @@ public function collect(\Magento\Sales\Model\Order\Invoice $invoice)
          * So basically if we have invoice with positive discount and it
          * was not canceled we don't add shipping discount to this one.
          */
-        $addShippingDiscount = true;
-        foreach ($invoice->getOrder()->getInvoiceCollection() as $previousInvoice) {
-            if ($previousInvoice->getDiscountAmount()) {
-                $addShippingDiscount = false;
-            }
-        }
-
-        if ($addShippingDiscount) {
+        if ($this->isShippingDiscount($invoice)) {
             $totalDiscountAmount = $totalDiscountAmount + $invoice->getOrder()->getShippingDiscountAmount();
             $baseTotalDiscountAmount = $baseTotalDiscountAmount +
                 $invoice->getOrder()->getBaseShippingDiscountAmount();
@@ -71,8 +71,29 @@ public function collect(\Magento\Sales\Model\Order\Invoice $invoice)
         $invoice->setDiscountAmount(-$totalDiscountAmount);
         $invoice->setBaseDiscountAmount(-$baseTotalDiscountAmount);
 
-        $invoice->setGrandTotal($invoice->getGrandTotal() - $totalDiscountAmount);
-        $invoice->setBaseGrandTotal($invoice->getBaseGrandTotal() - $baseTotalDiscountAmount);
+        $grandTotal = $invoice->getGrandTotal() - $totalDiscountAmount < 0.0001
+            ? 0 : $invoice->getGrandTotal() - $totalDiscountAmount;
+        $baseGrandTotal = $invoice->getBaseGrandTotal() - $baseTotalDiscountAmount < 0.0001
+            ? 0 : $invoice->getBaseGrandTotal() - $baseTotalDiscountAmount;
+        $invoice->setGrandTotal($grandTotal);
+        $invoice->setBaseGrandTotal($baseGrandTotal);
         return $this;
     }
+
+    /**
+     * Checking if shipping discount was added in previous invoices.
+     *
+     * @param Invoice $invoice
+     * @return bool
+     */
+    private function isShippingDiscount(Invoice $invoice): bool
+    {
+        $addShippingDiscount = true;
+        foreach ($invoice->getOrder()->getInvoiceCollection() as $previousInvoice) {
+            if ($previousInvoice->getDiscountAmount()) {
+                $addShippingDiscount = false;
+            }
+        }
+        return $addShippingDiscount;
+    }
 }
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Total/DiscountTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Total/DiscountTest.php
new file mode 100644
index 0000000000000..f7587031337a7
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Total/DiscountTest.php
@@ -0,0 +1,159 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Test\Unit\Model\Order\Invoice\Total;
+
+use Magento\Sales\Model\Order\Invoice\Total\Discount;
+use PHPUnit\Framework\TestCase;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\MockObject\MockObject;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Invoice;
+use Magento\Sales\Model\Order\Invoice\Item as InvoiceItem;
+use Magento\Sales\Model\Order\Item as OrderItem;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class DiscountTest extends TestCase
+{
+    /**
+     * @var Discount
+     */
+    protected $model;
+
+    /**
+     * @var Order|MockObject
+     */
+    protected $order;
+
+    /**
+     * @var  ObjectManager
+     */
+    protected $objectManager;
+
+    /**
+     * @var Invoice|MockObject
+     */
+    protected $invoice;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->model = $this->objectManager->getObject(Discount::class);
+        $this->order = $this->createPartialMock(Order::class, [
+            'getInvoiceCollection',
+        ]);
+        $this->invoice = $this->createPartialMock(Invoice::class, [
+            'getAllItems',
+            'getOrder',
+            'roundPrice',
+            'isLast',
+            'getGrandTotal',
+            'getBaseGrandTotal',
+            'setGrandTotal',
+            'setBaseGrandTotal'
+        ]);
+    }
+
+    /**
+     * Test for collect invoice
+     *
+     * @param array $invoiceData
+     * @dataProvider collectInvoiceData
+     * @return void
+     */
+    public function testCollectInvoiceWithZeroGrandTotal(array $invoiceData): void
+    {
+        //Set up invoice mock
+        /** @var InvoiceItem[] $invoiceItems */
+        $invoiceItems = [];
+        foreach ($invoiceData as $invoiceItemData) {
+            $invoiceItems[] = $this->getInvoiceItem($invoiceItemData);
+        }
+        $this->invoice->method('getOrder')
+            ->willReturn($this->order);
+        $this->order->method('getInvoiceCollection')
+            ->willReturn([]);
+        $this->invoice->method('getAllItems')
+            ->willReturn($invoiceItems);
+        $this->invoice->method('getGrandTotal')
+            ->willReturn(15.6801);
+        $this->invoice->method('getBaseGrandTotal')
+            ->willReturn(15.6801);
+
+        $this->invoice->expects($this->exactly(1))
+            ->method('setGrandTotal')
+            ->with(0);
+        $this->invoice->expects($this->exactly(1))
+            ->method('setBaseGrandTotal')
+            ->with(0);
+        $this->model->collect($this->invoice);
+    }
+
+    /**
+     * @return array
+     */
+    public function collectInvoiceData(): array
+    {
+        return [
+            [
+               [
+                    [
+                        'order_item' => [
+                            'qty_ordered' => 1,
+                            'discount_amount' => 5.34,
+                            'base_discount_amount' => 5.34,
+                        ],
+                        'is_last' => true,
+                        'qty' => 1,
+                    ],
+                    [
+                        'order_item' => [
+                            'qty_ordered' => 1,
+                            'discount_amount' => 10.34,
+                            'base_discount_amount' => 10.34,
+                        ],
+                        'is_last' => true,
+                        'qty' => 1,
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Get InvoiceItem
+     *
+     * @param $invoiceItemData array
+     * @return InvoiceItem|MockObject
+     */
+    protected function getInvoiceItem($invoiceItemData)
+    {
+        /** @var OrderItem|MockObject $orderItem */
+        $orderItem = $this->createPartialMock(OrderItem::class, [
+            'isDummy',
+        ]);
+        foreach ($invoiceItemData['order_item'] as $key => $value) {
+            $orderItem->setData($key, $value);
+        }
+        /** @var InvoiceItem|MockObject $invoiceItem */
+        $invoiceItem = $this->createPartialMock(InvoiceItem::class, [
+            'getOrderItem',
+            'isLast',
+        ]);
+        $invoiceItem->method('getOrderItem')
+            ->willReturn($orderItem);
+        $invoiceItem->method('isLast')
+            ->willReturn($invoiceItemData['is_last']);
+        $invoiceItem->getData('qty', $invoiceItemData['qty']);
+        return $invoiceItem;
+    }
+}

From 0887f2e0ad1e6e72b4c3dc1c309121a5e747bb09 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 27 Jul 2020 12:04:26 +0300
Subject: [PATCH 1031/1718] Delete tests images after tests execution

---
 .../AdminAddImageToWYSIWYGCatalogTest.xml     |  7 +++++++
 .../AdminAddImageToCMSPageTinyMCE3Test.xml    |  7 +++++++
 .../Test/AdminAddImageToWYSIWYGBlockTest.xml  |  7 +++++++
 .../Test/AdminAddImageToWYSIWYGCMSTest.xml    | 20 +++++++++++++------
 .../AdminAddImageToWYSIWYGNewsletterTest.xml  |  7 +++++++
 5 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml
index 6eb4de39726f0..79ddef74085b6 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml
@@ -50,6 +50,13 @@
         <seeElement selector="{{StorefrontCategoryMainSection.mediaDescription(ImageUpload3.content)}}" stepKey="assertMediaDescription"/>
         <seeElementInDOM selector="{{StorefrontCategoryMainSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSource"/>
         <after>
+             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
+             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder">
+                <argument name="FolderName" value="Storage Root"/>
+            </actionGroup>
+            <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteImageFromStorage">
+                <argument name="Image" value="ImageUpload3"/>
+            </actionGroup>
             <actionGroup ref="DeleteCategoryActionGroup" stepKey="DeleteCategory">
                 <argument name="categoryEntity" value="SimpleSubCategory"/>
             </actionGroup>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml
index 7c2aedceb9b7e..ee1666716e040 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml
@@ -25,6 +25,13 @@
             <magentoCLI command="config:set cms/wysiwyg/editor Magento_Tinymce3/tinymce3Adapter" stepKey="enableTinyMCE3"/>
         </before>
         <after>
+        <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
+        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder">
+            <argument name="FolderName" value="Storage Root"/>
+        </actionGroup>
+        <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteImageFromStorage">
+            <argument name="Image" value="ImageUpload3"/>
+        </actionGroup>
             <!-- Switch WYSIWYG editor to TinyMCE4-->
             <comment userInput="Reset editor as TinyMCE4" stepKey="chooseTinyMCE4AsEditor"/>
             <magentoCLI command="config:set cms/wysiwyg/editor mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter" stepKey="enableTinyMCE4"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml
index 162c9a60fd6b1..f097981f71188 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml
@@ -56,6 +56,13 @@
         <seeElement selector="{{StorefrontBlockSection.mediaDescription}}" stepKey="assertMediaDescription"/>
         <seeElementInDOM selector="{{StorefrontBlockSection.imageSource(ImageUpload.fileName)}}" stepKey="assertMediaSource"/>
         <after>
+             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
+             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder">
+                <argument name="FolderName" value="Storage Root"/>
+            </actionGroup>
+            <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteImageFromStorage">
+                <argument name="Image" value="ImageUpload"/>
+            </actionGroup>
             <amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnEditPage"/>
             <waitForPageLoad stepKey="waitForPageLoad"/>
             <conditionalClick selector="{{CmsPagesPageActionsSection.clearAllButton}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGCMSTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGCMSTest.xml
index 0476ecf99ad36..bcef2c5f2de28 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGCMSTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGCMSTest.xml
@@ -23,6 +23,20 @@
             <actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
             <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
         </before>
+        <after>
+        <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
+        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder">
+            <argument name="FolderName" value="Storage Root"/>
+        </actionGroup>
+        <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteImageFromStorage">
+            <argument name="Image" value="ImageUpload3"/>
+        </actionGroup>
+            <actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYGFirst"/>
+            <deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage" />
+            <actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+        
         <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
             <argument name="CMSPage" value="$$createCMSPage$$"/>
         </actionGroup>
@@ -54,11 +68,5 @@
         <waitForPageLoad  stepKey="wait4"/>
         <seeElement selector="{{StorefrontCMSPageSection.mediaDescription}}" stepKey="assertMediaDescription"/>
         <seeElementInDOM selector="{{StorefrontCMSPageSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSource"/>
-        <after>
-            <actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYGFirst"/>
-            <deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage" />
-            <actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
-            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
-        </after>
     </test>
 </tests>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddImageToWYSIWYGNewsletterTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddImageToWYSIWYGNewsletterTest.xml
index a763f43d9e4d1..099242be53bc1 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddImageToWYSIWYGNewsletterTest.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddImageToWYSIWYGNewsletterTest.xml
@@ -57,6 +57,13 @@
         <seeElementInDOM selector="{{StorefrontNewsletterSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSource"/>
         <closeTab stepKey="closeTab"/>
         <after>
+             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
+             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder">
+                <argument name="FolderName" value="Storage Root"/>
+            </actionGroup>
+            <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteImageFromStorage">
+               <argument name="Image" value="ImageUpload3"/>
+            </actionGroup>
             <actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>

From 06efa819a905f0307c6d42dbd50d770b82f9e175 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Mon, 27 Jul 2020 12:13:13 +0300
Subject: [PATCH 1032/1718] MC-35479: Unable to download import history file

---
 .../Magento/ImportExport/Model/Report/Csv.php |  38 +++---
 .../Test/Unit/Model/Report/CsvTest.php        | 124 ------------------
 .../ImportExport/Model/Report/CsvTest.php     |  90 +++++++++++++
 3 files changed, 105 insertions(+), 147 deletions(-)
 delete mode 100644 app/code/Magento/ImportExport/Test/Unit/Model/Report/CsvTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/ImportExport/Model/Report/CsvTest.php

diff --git a/app/code/Magento/ImportExport/Model/Report/Csv.php b/app/code/Magento/ImportExport/Model/Report/Csv.php
index 7279092265cbb..e7ddef1008444 100644
--- a/app/code/Magento/ImportExport/Model/Report/Csv.php
+++ b/app/code/Magento/ImportExport/Model/Report/Csv.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\ImportExport\Model\Report;
 
@@ -60,22 +61,16 @@ public function __construct(
     }
 
     /**
-     * @param string $originalFileName
-     * @param ProcessingErrorAggregatorInterface $errorAggregator
-     * @param bool $writeOnlyErrorItems
-     * @return string
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @inheritDoc
      */
     public function createReport(
         $originalFileName,
         ProcessingErrorAggregatorInterface $errorAggregator,
         $writeOnlyErrorItems = false
     ) {
-        $sourceCsv = $this->createSourceCsvModel($originalFileName);
-
-        $outputFileName = $this->generateOutputFileName($originalFileName);
-        $outputCsv = $this->createOutputCsvModel($outputFileName);
+        $outputCsv = $this->outputCsvFactory->create();
 
+        $sourceCsv = $this->createSourceCsvModel($originalFileName);
         $columnsName = $sourceCsv->getColNames();
         $columnsName[] = self::REPORT_ERROR_COLUMN_NAME;
         $outputCsv->setHeaderCols($columnsName);
@@ -88,10 +83,16 @@ public function createReport(
             }
         }
 
+        $directory = $this->filesystem->getDirectoryWrite(DirectoryList::VAR_DIR);
+        $outputFileName = $this->generateOutputFileName($originalFileName);
+        $directory->writeFile(Import::IMPORT_HISTORY_DIR . $outputFileName, $outputCsv->getContents());
+
         return $outputFileName;
     }
 
     /**
+     * Retrieve error messages
+     *
      * @param int $rowNumber
      * @param ProcessingErrorAggregatorInterface $errorAggregator
      * @return string
@@ -112,16 +113,21 @@ public function retrieveErrorMessagesByRowNumber($rowNumber, ProcessingErrorAggr
     }
 
     /**
+     * Generate output filename based on source filename
+     *
      * @param string $sourceFile
      * @return string
      */
     protected function generateOutputFileName($sourceFile)
     {
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         $fileName = basename($sourceFile, self::ERROR_REPORT_FILE_EXTENSION);
         return $fileName . self::ERROR_REPORT_FILE_SUFFIX . self::ERROR_REPORT_FILE_EXTENSION;
     }
 
     /**
+     * Create source CSV model
+     *
      * @param string $sourceFile
      * @return \Magento\ImportExport\Model\Import\Source\Csv
      */
@@ -135,18 +141,4 @@ protected function createSourceCsvModel($sourceFile)
             ]
         );
     }
-
-    /**
-     * @param string $outputFileName
-     * @return \Magento\ImportExport\Model\Export\Adapter\Csv
-     */
-    protected function createOutputCsvModel($outputFileName)
-    {
-        return $this->outputCsvFactory->create(
-            [
-                'destination' => Import::IMPORT_HISTORY_DIR . $outputFileName,
-                'destinationDirectoryCode' => DirectoryList::VAR_DIR,
-            ]
-        );
-    }
 }
diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Report/CsvTest.php b/app/code/Magento/ImportExport/Test/Unit/Model/Report/CsvTest.php
deleted file mode 100644
index 9ca7f2bcbc9c7..0000000000000
--- a/app/code/Magento/ImportExport/Test/Unit/Model/Report/CsvTest.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\ImportExport\Test\Unit\Model\Report;
-
-use Magento\Framework\Filesystem;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\ImportExport\Helper\Report;
-use Magento\ImportExport\Model\Export\Adapter\Csv;
-use Magento\ImportExport\Model\Export\Adapter\CsvFactory;
-use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingError;
-use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregator;
-use PHPUnit\Framework\MockObject\MockObject;
-use PHPUnit\Framework\TestCase;
-
-class CsvTest extends TestCase
-{
-    /**
-     * @var Report|MockObject
-     */
-    protected $reportHelperMock;
-
-    /**
-     * @var CsvFactory|MockObject
-     */
-    protected $outputCsvFactoryMock;
-
-    /**
-     * @var Csv|MockObject
-     */
-    protected $outputCsvMock;
-
-    /**
-     * @var \Magento\ImportExport\Model\Import\Source\CsvFactory|MockObject
-     */
-    protected $sourceCsvFactoryMock;
-
-    /**
-     * @var Csv|MockObject
-     */
-    protected $sourceCsvMock;
-
-    /**
-     * @var Filesystem|MockObject
-     */
-    protected $filesystemMock;
-
-    /**
-     * @var \Magento\ImportExport\Model\Report\Csv|ObjectManager
-     */
-    protected $csvModel;
-
-    protected function setUp(): void
-    {
-        $objectManager = new ObjectManager($this);
-        $testDelimiter = 'some_delimiter';
-
-        $this->reportHelperMock = $this->createMock(Report::class);
-        $this->reportHelperMock->expects($this->any())->method('getDelimiter')->willReturn($testDelimiter);
-
-        $this->outputCsvFactoryMock = $this->createPartialMock(
-            CsvFactory::class,
-            ['create']
-        );
-        $this->outputCsvMock = $this->createMock(Csv::class);
-        $this->outputCsvFactoryMock->expects($this->any())->method('create')->willReturn($this->outputCsvMock);
-
-        $this->sourceCsvFactoryMock = $this->createPartialMock(
-            \Magento\ImportExport\Model\Import\Source\CsvFactory::class,
-            ['create']
-        );
-        $this->sourceCsvMock = $this->createMock(\Magento\ImportExport\Model\Import\Source\Csv::class);
-        $this->sourceCsvMock->expects($this->any())->method('valid')->willReturnOnConsecutiveCalls(true, true, false);
-        $this->sourceCsvMock->expects($this->any())->method('current')->willReturnOnConsecutiveCalls(
-            [23 => 'first error'],
-            [27 => 'second error']
-        );
-        $this->sourceCsvFactoryMock
-            ->expects($this->any())
-            ->method('create')
-            ->with(
-                [
-                    'file' => 'some_file_name',
-                    'directory' => null,
-                    'delimiter' => $testDelimiter
-                ]
-            )
-            ->willReturn($this->sourceCsvMock);
-
-        $this->filesystemMock = $this->createMock(Filesystem::class);
-
-        $this->csvModel = $objectManager->getObject(
-            \Magento\ImportExport\Model\Report\Csv::class,
-            [
-                'reportHelper' => $this->reportHelperMock,
-                'sourceCsvFactory' => $this->sourceCsvFactoryMock,
-                'outputCsvFactory' => $this->outputCsvFactoryMock,
-                'filesystem' => $this->filesystemMock
-            ]
-        );
-    }
-
-    public function testCreateReport()
-    {
-        $errorAggregatorMock = $this->createMock(
-            ProcessingErrorAggregator::class
-        );
-        $errorProcessingMock = $this->createPartialMock(
-            ProcessingError::class,
-            ['getErrorMessage']
-        );
-        $errorProcessingMock->expects($this->any())->method('getErrorMessage')->willReturn('some_error_message');
-        $errorAggregatorMock->expects($this->any())->method('getErrorByRowNumber')->willReturn([$errorProcessingMock]);
-        $this->sourceCsvMock->expects($this->any())->method('getColNames')->willReturn([]);
-
-        $name = $this->csvModel->createReport('some_file_name', $errorAggregatorMock, true);
-
-        $this->assertEquals($name, 'some_file_name_error_report.csv');
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/ImportExport/Model/Report/CsvTest.php b/dev/tests/integration/testsuite/Magento/ImportExport/Model/Report/CsvTest.php
new file mode 100644
index 0000000000000..60f50b15a281b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ImportExport/Model/Report/CsvTest.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ImportExport\Model\Report;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
+use Magento\ImportExport\Model\Import;
+use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingError;
+use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * @magentoAppIsolation enabled
+ * @magentoDbIsolation enabled
+ * @magentoAppArea adminhtml
+ */
+class CsvTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Filesystem\Directory\WriteInterface
+     */
+    private $directory;
+
+    /**
+     * @var Csv
+     */
+    private $csvReport;
+
+    /**
+     * @var string|null
+     */
+    private $importFilePath;
+
+    /**
+     * @var string|null
+     */
+    private $reportPath;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp()
+    {
+        $filesystem = Bootstrap::getObjectManager()->create(Filesystem::class);
+        $this->directory = $filesystem->getDirectoryWrite(DirectoryList::VAR_DIR);
+
+        $this->csvReport = Bootstrap::getObjectManager()->create(Csv::class);
+    }
+    /**
+     * @inheritDoc
+     */
+    protected function tearDown()
+    {
+        foreach ([$this->importFilePath, $this->reportPath] as $path) {
+            if ($path && $this->directory->isExist($path)) {
+                $this->directory->delete($path);
+            }
+        }
+    }
+
+    /**
+     * @return void
+     */
+    public function testCreateReport()
+    {
+        $importData = <<<fileContent
+sku,store_view_code,name,price,product_type,attribute_set_code,weight
+simple1,,"simple 1",10,simple,Default,-5
+fileContent;
+        $this->importFilePath = 'test_import.csv';
+        $this->directory->writeFile($this->importFilePath, $importData);
+
+        $errorAggregator = Bootstrap::getObjectManager()->create(ProcessingErrorAggregatorInterface::class);
+        $error = 'Value for \'weight\' attribute contains incorrect value';
+        $errorAggregator->addError($error, ProcessingError::ERROR_LEVEL_CRITICAL, 1, 'weight', $error);
+
+        $outputFileName = $this->csvReport->createReport(
+            $this->directory->getAbsolutePath($this->importFilePath),
+            $errorAggregator
+        );
+
+        $this->reportPath = Import::IMPORT_HISTORY_DIR . $outputFileName;
+        $this->assertTrue($this->directory->isExist($this->reportPath), 'Report was not generated');
+    }
+}

From 9c25127bf3e2387e2b9b7aba9b1ecc71a17cf415 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@aovethefray.io>
Date: Mon, 27 Jul 2020 17:45:22 +0800
Subject: [PATCH 1033/1718] magento/adobe-stock-integration#1618: Duplicated
 items in used in entities filters - prevent simultaneous requests when user
 types search key

---
 .../Magento/Ui/view/base/web/js/form/element/ui-select.js   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js b/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js
index b488a4b2f8c16..af5d5be5640ee 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js
@@ -153,8 +153,8 @@ define([
             showPath: true,
             labelsDecoration: false,
             disableLabel: false,
-            filterRateLimit: 500,
-            filterRateLimitMethod: 'notifyAtFixedRate',
+            filterRateLimit: 1000,
+            filterRateLimitMethod: 'notifyWhenChangesStop',
             closeBtnLabel: $t('Done'),
             optgroupTmpl: 'ui/grid/filters/elements/ui-select-optgroup',
             quantityPlaceholder: $t('options'),
@@ -1167,7 +1167,7 @@ define([
                 return;
             }
 
-            if (searchKey !== this.lastSearchKey) {
+            if (searchKey !== this.lastSearchKey || currentPage === 1) {
                 this.options([]);
             }
             this.processRequest(searchKey, currentPage);

From 08671ba3d1a80c805742219a01d2134787ac144b Mon Sep 17 00:00:00 2001
From: Ivan Gerchak <ivang@ven.com>
Date: Mon, 27 Jul 2020 12:46:17 +0300
Subject: [PATCH 1034/1718] Add back extension point for adding some html to
 the category page #29286

---
 .../frontend/templates/product/list.phtml     |  4 +-
 .../templates/product/listing/renderer.phtml  | 65 ++++++++++---------
 2 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
index 554caf6026001..7803293e0d4b4 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
@@ -74,9 +74,7 @@ $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
                         </strong>
                         <?= $block->getReviewsSummaryHtml($_product, $templateType) ?>
                         <?= /* @noEscape */ $block->getProductPrice($_product) ?>
-                        <?php if ($_product->isAvailable()) :?>
-                            <?= $block->getProductDetailsHtml($_product) ?>
-                        <?php endif; ?>
+                        <?= $block->getProductDetailsHtml($_product) ?>
 
                         <div class="product-item-inner">
                             <div class="product actions product-item-actions"<?= strpos($pos, $viewMode . '-actions') ? $escaper->escapeHtmlAttr($position) : '' ?>>
diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
index 5838ba9625c6a..3829f830c435e 100644
--- a/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
+++ b/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
@@ -4,42 +4,43 @@
  * See COPYING.txt for license details.
  */
 ?>
-<?php
-/** @var $block \Magento\Swatches\Block\Product\Renderer\Listing\Configurable */
-$productId = $block->getProduct()->getId();
-/** @var \Magento\Swatches\ViewModel\Product\Renderer\Configurable $configurableViewModel */
-$configurableViewModel = $block->getConfigurableViewModel()
-?>
-<div class="swatch-opt-<?= $block->escapeHtmlAttr($productId) ?>"
-     data-role="swatch-option-<?= $block->escapeHtmlAttr($productId) ?>"></div>
+<?php /** @var $block \Magento\Swatches\Block\Product\Renderer\Listing\Configurable */ ?>
+<?php $product = $block->getProduct() ?>
+<?php if ($product && $product->isAvailable()) : ?>
+    <?php $productId = $product->getId() ?>
+    <?php /** @var \Magento\Swatches\ViewModel\Product\Renderer\Configurable $configurableViewModel */ ?>
+    <?php $configurableViewModel = $block->getConfigurableViewModel() ?>
+    <div class="swatch-opt-<?= $block->escapeHtmlAttr($productId) ?>"
+         data-role="swatch-option-<?= $block->escapeHtmlAttr($productId) ?>"></div>
 
-<script type="text/x-magento-init">
-    {
-        "[data-role=swatch-option-<?= $block->escapeJs($productId) ?>]": {
-            "Magento_Swatches/js/swatch-renderer": {
-                "selectorProduct": ".product-item-details",
-                "onlySwatches": true,
-                "enableControlLabel": false,
-                "numberToShow": <?=  $block->escapeJs($block->getNumberSwatchesPerProduct()) ?>,
-                "jsonConfig": <?= /* @noEscape */ $block->getJsonConfig() ?>,
-                "jsonSwatchConfig": <?= /* @noEscape */ $block->getJsonSwatchConfig() ?>,
-                "mediaCallback": "<?= $block->escapeJs($block->escapeUrl($block->getMediaCallback())) ?>",
-                "jsonSwatchImageSizeConfig": <?= /* @noEscape */ $block->getJsonSwatchSizeConfig() ?>,
-                "showTooltip": <?= $block->escapeJs($configurableViewModel->getShowSwatchTooltip()) ?>
+    <script type="text/x-magento-init">
+        {
+            "[data-role=swatch-option-<?= $block->escapeJs($productId) ?>]": {
+                "Magento_Swatches/js/swatch-renderer": {
+                    "selectorProduct": ".product-item-details",
+                    "onlySwatches": true,
+                    "enableControlLabel": false,
+                    "numberToShow": <?=  $block->escapeJs($block->getNumberSwatchesPerProduct()) ?>,
+                    "jsonConfig": <?= /* @noEscape */ $block->getJsonConfig() ?>,
+                    "jsonSwatchConfig": <?= /* @noEscape */ $block->getJsonSwatchConfig() ?>,
+                    "mediaCallback": "<?= $block->escapeJs($block->escapeUrl($block->getMediaCallback())) ?>",
+                    "jsonSwatchImageSizeConfig": <?= /* @noEscape */ $block->getJsonSwatchSizeConfig() ?>,
+                    "showTooltip": <?= $block->escapeJs($configurableViewModel->getShowSwatchTooltip()) ?>
+                }
             }
         }
-    }
-</script>
+    </script>
 
-<script type="text/x-magento-init">
-    {
-        "[data-role=priceBox][data-price-box=product-id-<?= $block->escapeJs($productId) ?>]": {
-            "priceBox": {
-                "priceConfig": {
-                    "priceFormat": <?= /* @noEscape */ $block->getPriceFormatJson(); ?>,
-                    "prices": <?= /* @noEscape */ $block->getPricesJson(); ?>
+    <script type="text/x-magento-init">
+        {
+            "[data-role=priceBox][data-price-box=product-id-<?= $block->escapeJs($productId) ?>]": {
+                "priceBox": {
+                    "priceConfig": {
+                        "priceFormat": <?= /* @noEscape */ $block->getPriceFormatJson() ?>,
+                        "prices": <?= /* @noEscape */ $block->getPricesJson() ?>
+                    }
                 }
             }
         }
-    }
-</script>
+    </script>
+<?php endif; ?>

From f8f53e4396d034c25f0e6d2fbb3b3a40e4b25204 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Mon, 27 Jul 2020 12:20:21 +0200
Subject: [PATCH 1035/1718] Revert `composer.json` to the state of
 `2.4-develop`

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index eeded8a3d3fe9..3428a7dff23cc 100644
--- a/composer.json
+++ b/composer.json
@@ -93,8 +93,8 @@
         "phpcompatibility/php-compatibility": "^9.3",
         "phpmd/phpmd": "^2.8.0",
         "phpstan/phpstan": ">=0.12.3 <=0.12.23",
-        "phpunit/phpunit": "^9.2",
-        "sebastian/phpcpd": "@stable",
+        "phpunit/phpunit": "^9",
+        "sebastian/phpcpd": "~5.0.0",
         "squizlabs/php_codesniffer": "~3.5.4"
     },
     "suggest": {

From 9821017c40eb46990b0b68805c2bd76dea966b32 Mon Sep 17 00:00:00 2001
From: DianaRusin <rusind95@gmail.com>
Date: Mon, 27 Jul 2020 13:53:56 +0300
Subject: [PATCH 1036/1718] MC-33747: [MFTF] Flaky
 StorefrontButtonsInlineTranslationTest

---
 .../Mftf/Test/StorefrontButtonsInlineTranslationTest.xml    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Translation/Test/Mftf/Test/StorefrontButtonsInlineTranslationTest.xml b/app/code/Magento/Translation/Test/Mftf/Test/StorefrontButtonsInlineTranslationTest.xml
index 1ba3236185148..8e15b42befaa1 100644
--- a/app/code/Magento/Translation/Test/Mftf/Test/StorefrontButtonsInlineTranslationTest.xml
+++ b/app/code/Magento/Translation/Test/Mftf/Test/StorefrontButtonsInlineTranslationTest.xml
@@ -41,9 +41,9 @@
         </after>
 
         <!-- Add product to cart on storefront -->
-        <amOnPage url="{{StorefrontCategoryPage.url($createCategory.custom_attributes[url_key]$)}}" stepKey="goToCategoryPage"/>
-        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
-        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProductToCart">
+        <amOnPage url="{{StorefrontProductPage.url($createProduct.custom_attributes[url_key]$)}}" stepKey="goToProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <actionGroup ref="AddToCartFromStorefrontProductPageActionGroup" stepKey="addProductToCart">
             <argument name="productName" value="$createProduct.name$"/>
         </actionGroup>
 

From 3ec0f57754c4b0096d17a2c26ef9a838aa65f5d9 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Mon, 27 Jul 2020 13:02:53 +0200
Subject: [PATCH 1037/1718] Fix invalid return type provided for private method

---
 .../Magento/Catalog/Model/Product/TierPriceManagement.php     | 4 ++--
 .../Test/Unit/Model/Product/TierPriceManagementTest.php       | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php b/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php
index 1af1c3042fbcd..d14984d3d3478 100644
--- a/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php
@@ -224,9 +224,9 @@ private function isCustomerGroupApplicable(string $customerGroupId, array $price
     /**
      * Returns current Price Scope configuration value
      *
-     * @return string
+     * @return int
      */
-    private function getPriceScopeConfig(): string
+    private function getPriceScopeConfig(): int
     {
         return (int)$this->config->getValue('catalog/price/scope', ScopeInterface::SCOPE_WEBSITE);
     }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/TierPriceManagementTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/TierPriceManagementTest.php
index d326f5fb19520..412855c929331 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/TierPriceManagementTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/TierPriceManagementTest.php
@@ -203,7 +203,9 @@ public function testSuccessDeleteTierPrice()
             ->method('getValue')
             ->with('catalog/price/scope', ScopeInterface::SCOPE_WEBSITE)
             ->willReturn(0);
-        $this->priceModifierMock->expects($this->once())->method('removeTierPrice')->with($this->productMock, 4, 5, 0);
+        $this->priceModifierMock->expects($this->once())
+            ->method('removeTierPrice')
+            ->with($this->productMock, 4, 5, 0);
 
         $this->assertTrue($this->service->remove('product_sku', 4, 5, 0));
     }

From 535f219a19773016f9a710a80c598c95aab2ab58 Mon Sep 17 00:00:00 2001
From: Sathish <srsathish92@gmail.com>
Date: Mon, 27 Jul 2020 16:43:07 +0530
Subject: [PATCH 1038/1718] MFTF unwanted comments removed

---
 .../Mftf/ActionGroup/AdminFillNewSearchSynonymsActionGroup.xml | 1 -
 .../Test/Mftf/Test/AdminNewSearchSynonymsFormResetTest.xml     | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/app/code/Magento/Search/Test/Mftf/ActionGroup/AdminFillNewSearchSynonymsActionGroup.xml b/app/code/Magento/Search/Test/Mftf/ActionGroup/AdminFillNewSearchSynonymsActionGroup.xml
index 88cc8049af28d..ae4128e4f5d9a 100644
--- a/app/code/Magento/Search/Test/Mftf/ActionGroup/AdminFillNewSearchSynonymsActionGroup.xml
+++ b/app/code/Magento/Search/Test/Mftf/ActionGroup/AdminFillNewSearchSynonymsActionGroup.xml
@@ -15,7 +15,6 @@
         <arguments>
             <argument name="scope_id" type="string"/>
             <argument name="synonyms" type="string"/>
-            <argument name="merge" type="string"/>
         </arguments>
 
         <selectOption selector="{{AdminSearchSynonymsNewSection.scope}}" userInput="{{scope_id}}" stepKey="selectScope"/>
diff --git a/app/code/Magento/Search/Test/Mftf/Test/AdminNewSearchSynonymsFormResetTest.xml b/app/code/Magento/Search/Test/Mftf/Test/AdminNewSearchSynonymsFormResetTest.xml
index d4cb3d5b3460d..c296435dde815 100644
--- a/app/code/Magento/Search/Test/Mftf/Test/AdminNewSearchSynonymsFormResetTest.xml
+++ b/app/code/Magento/Search/Test/Mftf/Test/AdminNewSearchSynonymsFormResetTest.xml
@@ -24,7 +24,6 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
-        <!--TEST BODY -->
         <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToSearchSynonymsPage">
             <argument name="menuUiId" value="{{AdminMenuMarketing.dataUiId}}"/>
             <argument name="submenuUiId" value="{{AdminSearchSynonyms.dataUiId}}"/>
@@ -35,7 +34,6 @@
         <actionGroup ref="AdminFillNewSearchSynonymsActionGroup" stepKey="fillNewSearchSynonyms">
             <argument name="scope_id" value="1:1"/>
             <argument name="synonyms" value="Test Synonyms"/>
-            <argument name="merge" value="true"/>
         </actionGroup>
 
         <click selector="{{AdminSearchSynonymsNewSection.resetButton}}" stepKey="clickResetButton"/>
@@ -56,6 +54,5 @@
             <expectedResult type="string">false</expectedResult>
             <actualResult type="string">$grabMergeValue</actualResult>
         </assertEquals>
-        <!--END TEST BODY -->
     </test>
 </tests>

From 01450cb0b60400446578f00a8919989b26023bf5 Mon Sep 17 00:00:00 2001
From: ameysar <andrii.meysar@transoftgroup.com>
Date: Mon, 27 Jul 2020 14:23:27 +0300
Subject: [PATCH 1039/1718] MC-31304: [ElasticSearch] Exception on catalog
 search result page

---
 .../Elasticsearch/Model/Adapter/Elasticsearch.php      |  2 +-
 app/code/Magento/Elasticsearch/Model/Config.php        | 10 ++++------
 .../Elasticsearch/Model/Indexer/IndexerHandler.php     |  2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php b/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
index 00ce79dd1b7cf..dfb79e2e8b5c7 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
@@ -361,7 +361,7 @@ public function updateIndexMapping(int $storeId, string $mappedIndexerId): self
 
         $mappedAttributes = $this->client->getMapping(['index' => $indexName]);
         $pathField = $this->arrayManager->findPath('properties', $mappedAttributes);
-        $mappedAttributes = $this->arrayManager->get($pathField, $mappedAttributes, $allAttributeTypes);
+        $mappedAttributes = $this->arrayManager->get($pathField, $mappedAttributes, []);
 
         $settings['index']['mapping']['total_fields']['limit'] = $this->getMappingTotalFieldsLimit($allAttributeTypes);
         $this->client->putIndexSettings($indexName, ['settings' => $settings]);
diff --git a/app/code/Magento/Elasticsearch/Model/Config.php b/app/code/Magento/Elasticsearch/Model/Config.php
index ccd56c9c8d316..3766d825aefb5 100644
--- a/app/code/Magento/Elasticsearch/Model/Config.php
+++ b/app/code/Magento/Elasticsearch/Model/Config.php
@@ -45,7 +45,7 @@ class Config implements ClientOptionsInterface
     protected $scopeConfig;
 
     /**
-     * @var string|null
+     * @var string
      */
     private $prefix;
 
@@ -83,7 +83,7 @@ public function __construct(
         $this->scopeConfig = $scopeConfig;
         $this->clientResolver = $clientResolver;
         $this->engineResolver = $engineResolver;
-        $this->prefix = $prefix;
+        $this->prefix = $prefix ?: $this->clientResolver->getCurrentEngine();
         $this->engineList = $engineList;
     }
 
@@ -101,7 +101,7 @@ public function prepareClientOptions($options = [])
             'enableAuth' => $this->getElasticsearchConfigData('enable_auth'),
             'username' => $this->getElasticsearchConfigData('username'),
             'password' => $this->getElasticsearchConfigData('password'),
-            'timeout' => $this->getElasticsearchConfigData('server_timeout') ?: self::ELASTICSEARCH_DEFAULT_TIMEOUT,
+            'timeout' => $this->getElasticsearchConfigData('server_timeout') ? : self::ELASTICSEARCH_DEFAULT_TIMEOUT,
         ];
         $options = array_merge($defaultOptions, $options);
         $allowedOptions = array_merge(array_keys($defaultOptions), ['engine']);
@@ -125,9 +125,7 @@ function (string $key) use ($allowedOptions) {
      */
     public function getElasticsearchConfigData($field, $storeId = null)
     {
-        $searchEngine = $this->prefix ?: $this->clientResolver->getCurrentEngine();
-
-        return $this->getSearchConfigData($searchEngine . '_' . $field, $storeId);
+        return $this->getSearchConfigData($this->prefix . '_' . $field, $storeId);
     }
 
     /**
diff --git a/app/code/Magento/Elasticsearch/Model/Indexer/IndexerHandler.php b/app/code/Magento/Elasticsearch/Model/Indexer/IndexerHandler.php
index 248338df1ee72..8b39cb28f81e2 100644
--- a/app/code/Magento/Elasticsearch/Model/Indexer/IndexerHandler.php
+++ b/app/code/Magento/Elasticsearch/Model/Indexer/IndexerHandler.php
@@ -142,7 +142,7 @@ public function isAvailable($dimensions = [])
     public function updateIndex(array $dimensions): IndexerInterface
     {
         $dimension = current($dimensions);
-        $scopeId = $this->scopeResolver->getScope($dimension->getValue())->getId();
+        $scopeId = (int)$this->scopeResolver->getScope($dimension->getValue())->getId();
         $this->adapter->updateIndexMapping($scopeId, $this->getIndexerId());
 
         return $this;

From 34462d0c5ca1beccd994ea23e16b03fefc25842a Mon Sep 17 00:00:00 2001
From: ameysar <andrii.meysar@transoftgroup.com>
Date: Mon, 27 Jul 2020 14:28:22 +0300
Subject: [PATCH 1040/1718] MC-31304: [ElasticSearch] Exception on catalog
 search result page

---
 .../Test/Unit/Model/ConfigTest.php            | 78 ++-----------------
 1 file changed, 7 insertions(+), 71 deletions(-)

diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/ConfigTest.php
index 50ff5dab48fe9..34d3bdaf11e18 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Model/ConfigTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/ConfigTest.php
@@ -7,17 +7,12 @@
 
 namespace Magento\Elasticsearch\Test\Unit\Model;
 
-use Magento\AdvancedSearch\Model\Client\ClientResolver;
 use Magento\Elasticsearch\Model\Config;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Store\Model\ScopeInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
-/**
- * Elasticsearch config model tests.
- */
 class ConfigTest extends TestCase
 {
     /**
@@ -28,17 +23,7 @@ class ConfigTest extends TestCase
     /**
      * @var ScopeConfigInterface|MockObject
      */
-    protected $scopeConfigMock;
-
-    /**
-     * @var ClientResolver|MockObject
-     */
-    private $clientResolverMock;
-
-    /**
-     * @var ObjectManagerHelper
-     */
-    private $objectManager;
+    protected $scopeConfig;
 
     /**
      * Setup
@@ -47,17 +32,15 @@ class ConfigTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->scopeConfigMock = $this->getMockBuilder(ScopeConfigInterface::class)
+        $this->scopeConfig = $this->getMockBuilder(ScopeConfigInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
-        $this->clientResolverMock = $this->createMock(ClientResolver::class);
 
-        $this->objectManager = new ObjectManagerHelper($this);
-        $this->model = $this->objectManager->getObject(
+        $objectManager = new ObjectManagerHelper($this);
+        $this->model = $objectManager->getObject(
             Config::class,
             [
-                'scopeConfig' => $this->scopeConfigMock,
-                'clientResolver' => $this->clientResolverMock,
+                'scopeConfig' => $this->scopeConfig
             ]
         );
     }
@@ -67,7 +50,7 @@ protected function setUp(): void
      */
     public function testPrepareClientOptions()
     {
-        $this->scopeConfigMock->expects($this->any())
+        $this->scopeConfig->expects($this->any())
             ->method('getValue')
             ->willReturn('');
         $options = [
@@ -87,7 +70,7 @@ public function testPrepareClientOptions()
      */
     public function testGetIndexPrefix()
     {
-        $this->scopeConfigMock->expects($this->any())
+        $this->scopeConfig->expects($this->any())
             ->method('getValue')
             ->willReturn('indexPrefix');
         $this->assertEquals('indexPrefix', $this->model->getIndexPrefix());
@@ -108,51 +91,4 @@ public function testIsElasticsearchEnabled()
     {
         $this->assertFalse($this->model->isElasticsearchEnabled());
     }
-
-    /**
-     * Test retrieve search engine configuration information.
-     *
-     * @return void
-     */
-    public function testGetElasticsearchConfigData(): void
-    {
-        $fieldName = 'server_hostname';
-
-        $this->clientResolverMock->expects($this->once())
-            ->method('getCurrentEngine')
-            ->willReturn(Config::ENGINE_NAME);
-
-        $this->scopeConfigMock->expects($this->once())
-            ->method('getValue')
-            ->with('catalog/search/' . Config::ENGINE_NAME . '_' . $fieldName, ScopeInterface::SCOPE_STORE, 1);
-
-        $this->model->getElasticsearchConfigData($fieldName, 1);
-    }
-
-    /**
-     * Test retrieve search engine configuration information with predefined prefix.
-     *
-     * @return void
-     */
-    public function testGetElasticsearchConfigDataWithPredefinedPrefix(): void
-    {
-        $fieldName = 'server_hostname';
-        $model = $this->objectManager->getObject(
-            Config::class,
-            [
-                'scopeConfig' => $this->scopeConfigMock,
-                'clientResolver' => $this->clientResolverMock,
-                'prefix' => Config::ENGINE_NAME,
-            ]
-        );
-
-        $this->clientResolverMock->expects($this->never())
-            ->method('getCurrentEngine');
-
-        $this->scopeConfigMock->expects($this->once())
-            ->method('getValue')
-            ->with('catalog/search/' . Config::ENGINE_NAME . '_' . $fieldName, ScopeInterface::SCOPE_STORE, 1);
-
-        $model->getElasticsearchConfigData($fieldName, 1);
-    }
 }

From 2f496e293418708f751189b36e803fa1d02503ef Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Mon, 27 Jul 2020 14:28:37 +0300
Subject: [PATCH 1041/1718] MC-35479: Unable to download import history file

---
 .../testsuite/Magento/ImportExport/Model/Report/CsvTest.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/ImportExport/Model/Report/CsvTest.php b/dev/tests/integration/testsuite/Magento/ImportExport/Model/Report/CsvTest.php
index 60f50b15a281b..218221c35632c 100644
--- a/dev/tests/integration/testsuite/Magento/ImportExport/Model/Report/CsvTest.php
+++ b/dev/tests/integration/testsuite/Magento/ImportExport/Model/Report/CsvTest.php
@@ -44,7 +44,7 @@ class CsvTest extends \PHPUnit\Framework\TestCase
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $filesystem = Bootstrap::getObjectManager()->create(Filesystem::class);
         $this->directory = $filesystem->getDirectoryWrite(DirectoryList::VAR_DIR);
@@ -54,7 +54,7 @@ protected function setUp()
     /**
      * @inheritDoc
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         foreach ([$this->importFilePath, $this->reportPath] as $path) {
             if ($path && $this->directory->isExist($path)) {

From b3222cdbb867a1cd1a35bf169cb4c9f2f808cf8f Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Fri, 24 Jul 2020 15:23:19 +0300
Subject: [PATCH 1042/1718] MC-32271: Order of State/Province drop down is not
 consistent in admin UI

---
 .../view/frontend/web/js/region-updater.js    | 15 ++++--
 lib/web/mage/adminhtml/form.js                | 48 ++++++++++++++-----
 2 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js b/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
index 6d54f607484b4..d9de1e0935faa 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
@@ -157,7 +157,10 @@ define([
                 regionInput = $(this.options.regionInputId),
                 postcode = $(this.options.postcodeId),
                 label = regionList.parent().siblings('label'),
-                container = regionList.parents('div.field');
+                container = regionList.parents('div.field'),
+                regionsEntries,
+                regionId,
+                regionData;
 
             this._clearError();
             this._checkRegionRequired(country);
@@ -168,8 +171,14 @@ define([
             // Populate state/province dropdown list if available or use input box
             if (this.options.regionJson[country]) {
                 this._removeSelectOptions(regionList);
-                $.each(this.options.regionJson[country], $.proxy(function (key, value) {
-                    this._renderSelectOption(regionList, key, value);
+                regionsEntries = Object.entries(this.options.regionJson[country]);
+                regionsEntries.sort(function (a, b) {
+                    return a[1].name > b[1].name ? 1 : -1;
+                });
+                $.each(regionsEntries, $.proxy(function (key, value) {
+                    regionId = value[0];
+                    regionData = value[1];
+                    this._renderSelectOption(regionList, regionId, regionData);
                 }, this));
 
                 if (this.currentRegionOption) {
diff --git a/lib/web/mage/adminhtml/form.js b/lib/web/mage/adminhtml/form.js
index 4dfbde6afa9d7..eae359c4b26a4 100644
--- a/lib/web/mage/adminhtml/form.js
+++ b/lib/web/mage/adminhtml/form.js
@@ -133,6 +133,7 @@ define([
             this.config = regions.config;
             delete regions.config;
             this.regions = regions;
+            this.sortedRegions = this.getSortedRegions();
             this.disableAction = typeof disableAction === 'undefined' ? 'hide' : disableAction;
             this.clearRegionValueOnDisable = typeof clearRegionValueOnDisable === 'undefined' ?
                 false : clearRegionValueOnDisable;
@@ -246,11 +247,13 @@ define([
          * Update.
          */
         update: function () {
-            var option, region, def, regionId;
+            var option, selectElement, def, regionId, region;
 
-            if (this.regions[this.countryEl.value]) {
+            selectElement = this.regionSelectEl;
+
+            if (this.sortedRegions[this.countryEl.value]) {
                 if (this.lastCountryId != this.countryEl.value) { //eslint-disable-line eqeqeq
-                    def = this.regionSelectEl.getAttribute('defaultValue');
+                    def = selectElement.getAttribute('defaultValue');
 
                     if (this.regionTextEl) {
                         if (!def) {
@@ -259,26 +262,27 @@ define([
                         this.regionTextEl.value = '';
                     }
 
-                    this.regionSelectEl.options.length = 1;
+                    selectElement.options.length = 1;
 
-                    for (regionId in this.regions[this.countryEl.value]) { //eslint-disable-line guard-for-in
-                        region = this.regions[this.countryEl.value][regionId];
+                    this.sortedRegions[this.countryEl.value].forEach(function (item) {
+                        regionId = item[0];
+                        region = item[1];
 
                         option = document.createElement('OPTION');
                         option.value = regionId;
                         option.text = region.name.stripTags();
                         option.title = region.name;
 
-                        if (this.regionSelectEl.options.add) {
-                            this.regionSelectEl.options.add(option);
+                        if (selectElement.options.add) {
+                            selectElement.options.add(option);
                         } else {
-                            this.regionSelectEl.appendChild(option);
+                            selectElement.appendChild(option);
                         }
 
                         if (regionId == def || region.name.toLowerCase() == def || region.code.toLowerCase() == def) { //eslint-disable-line
-                            this.regionSelectEl.value = regionId;
+                            selectElement.value = regionId;
                         }
-                    }
+                    });
                 }
 
                 if (this.disableAction == 'hide') { //eslint-disable-line eqeqeq
@@ -340,6 +344,28 @@ define([
                     display ? marks[0].show() : marks[0].hide();
                 }
             }
+        },
+
+        /**
+         * Sort regions from JSON by name
+         *
+         * @returns {*[]}
+         */
+        getSortedRegions: function () {
+            var country, regionsEntries, regionsByCountry;
+
+            regionsByCountry = [];
+
+            for (country in this.regions) { //eslint-disable-line guard-for-in
+                regionsEntries = Object.entries(this.regions[country]);
+                regionsEntries.sort(function (a, b) {
+                    return a[1].name > b[1].name ? 1 : -1;
+                });
+
+                regionsByCountry[country] = regionsEntries;
+            }
+
+            return regionsByCountry;
         }
     };
 

From 78ef828f723825960281828a67a8f0562f973f54 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Mon, 27 Jul 2020 14:35:44 +0300
Subject: [PATCH 1043/1718] MC-36060: [On Premise] - State field is disabled
 after country change

---
 .../view/frontend/web/js/region-updater.js    |   4 +-
 .../frontend/js/region-updater.test.js        | 206 ++++++++++++++++++
 2 files changed, 208 insertions(+), 2 deletions(-)
 create mode 100644 dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/region-updater.test.js

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js b/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
index d9de1e0935faa..2555aa876b71e 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
@@ -171,7 +171,7 @@ define([
             // Populate state/province dropdown list if available or use input box
             if (this.options.regionJson[country]) {
                 this._removeSelectOptions(regionList);
-                regionsEntries = Object.entries(this.options.regionJson[country]);
+                regionsEntries = _.pairs(this.options.regionJson[country]);
                 regionsEntries.sort(function (a, b) {
                     return a[1].name > b[1].name ? 1 : -1;
                 });
@@ -202,7 +202,7 @@ define([
                         regionList.hide();
                         container.hide();
                     } else {
-                        regionList.show();
+                        regionList.removeAttr('disabled').show();
                     }
                 }
 
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/region-updater.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/region-updater.test.js
new file mode 100644
index 0000000000000..6b77c35b9fe60
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/region-updater.test.js
@@ -0,0 +1,206 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/*eslint-disable max-nested-callbacks*/
+/*jscs:disable jsDoc*/
+define([
+    'jquery',
+    'Magento_Checkout/js/region-updater'
+], function ($) {
+    'use strict';
+
+    var regionJson = {
+            'config': {
+                'show_all_regions': true,
+                'regions_required': [
+                    'US'
+                ]
+            },
+            'US': {
+                '1': {
+                    'code': 'AL',
+                    'name': 'Alabama'
+                },
+                '2': {
+                    'code': 'AK',
+                    'name': 'Alaska'
+                },
+                '3': {
+                    'code': 'AS',
+                    'name': 'American Samoa'
+                }
+            },
+            'DE': {
+                '81': {
+                    'code': 'BAY',
+                    'name': 'Bayern'
+                },
+                '82': {
+                    'code': 'BER',
+                    'name': 'Berlin'
+                },
+                '83': {
+                    'code': 'BRG',
+                    'name': 'Brandenburg'
+                }
+            }
+        },
+        defaultCountry = 'GB',
+        countries = {
+            '': '',
+            'US': 'United States',
+            'GB': 'United Kingdom',
+            'DE': 'Germany'
+        },
+        regions = {
+            '': 'Please select a region, state or province.'
+        },
+        countryEl,
+        regionSelectEl,
+        regionInputEl,
+        postalCodeEl,
+        formEl,
+        containerEl;
+
+    function createFormField() {
+        var fieldWrapperEl = document.createElement('div'),
+            labelEl = document.createElement('label'),
+            inputControlEl = document.createElement('div'),
+            i;
+
+        fieldWrapperEl.appendChild(labelEl);
+        fieldWrapperEl.appendChild(inputControlEl);
+
+        for (i = 0; i < arguments.length; i++) {
+            inputControlEl.appendChild(arguments[i]);
+        }
+        labelEl.setAttribute('class', 'label');
+        fieldWrapperEl.setAttribute('class', 'field required');
+        inputControlEl.setAttribute('class', 'control');
+
+        return fieldWrapperEl;
+    }
+
+    function buildSelectOptions(select, options, defaultOption) {
+        var optionValue,
+            optionEl;
+
+        defaultOption = typeof defaultOption === 'undefined' ? '' : defaultOption;
+
+        // eslint-disable-next-line guard-for-in
+        for (optionValue in options) {
+            if (options.hasOwnProperty(optionValue)) {
+                optionEl = document.createElement('option');
+                optionEl.setAttribute('value', optionValue);
+                optionEl.textContent = countries[optionValue];
+                // eslint-disable-next-line max-depth
+                if (defaultOption === optionValue) {
+                    optionEl.setAttribute('selected', 'selected');
+                }
+                select.add(optionEl);
+            }
+        }
+    }
+
+    function init(config) {
+        var defaultConfig = {
+            'optionalRegionAllowed': true,
+            'regionListId': '#' + regionSelectEl.id,
+            'regionInputId': '#' + regionInputEl.id,
+            'postcodeId': '#' + postalCodeEl.id,
+            'form': '#' + formEl.id,
+            'regionJson': regionJson,
+            'defaultRegion': 0,
+            'countriesWithOptionalZip': ['GB']
+        };
+
+        $(countryEl).regionUpdater($.extend({}, defaultConfig, config || {}));
+    }
+
+    beforeEach(function () {
+        containerEl = document.createElement('div');
+        formEl = document.createElement('form');
+        regionSelectEl = document.createElement('select');
+        regionInputEl = document.createElement('input');
+        postalCodeEl = document.createElement('input');
+        countryEl = document.createElement('select');
+        regionSelectEl.setAttribute('id', 'region_id');
+        regionSelectEl.setAttribute('style', 'display:none;');
+        regionInputEl.setAttribute('id', 'region');
+        regionInputEl.setAttribute('style', 'display:none;');
+        countryEl.setAttribute('id', 'country');
+        postalCodeEl.setAttribute('id', 'zip');
+        formEl.setAttribute('id', 'test_form');
+        formEl.appendChild(createFormField(countryEl));
+        formEl.appendChild(createFormField(regionSelectEl, regionInputEl));
+        formEl.appendChild(createFormField(postalCodeEl));
+        containerEl.appendChild(formEl);
+        buildSelectOptions(regionSelectEl, regions);
+        buildSelectOptions(countryEl, countries, defaultCountry);
+        document.body.appendChild(containerEl);
+    });
+
+    afterEach(function () {
+        $(containerEl).remove();
+        formEl = undefined;
+        containerEl = undefined;
+        regionSelectEl = undefined;
+        regionInputEl = undefined;
+        postalCodeEl = undefined;
+        countryEl = undefined;
+    });
+
+    describe('Magento_Checkout/js/region-updater', function () {
+        it('Check that default country is selected', function () {
+            init();
+            expect($(countryEl).val()).toBe(defaultCountry);
+        });
+        it('Check that region list is not displayed when selected country has no predefined regions', function () {
+            init();
+            $(countryEl).val('GB').change();
+            expect($(regionInputEl).is(':visible')).toBe(true);
+            expect($(regionInputEl).is(':disabled')).toBe(false);
+            expect($(regionSelectEl).is(':visible')).toBe(false);
+            expect($(regionSelectEl).is(':disabled')).toBe(true);
+        });
+        it('Check country that has predefined and optional regions', function () {
+            init();
+            $(countryEl).val('DE').change();
+            expect($(regionSelectEl).is(':visible')).toBe(true);
+            expect($(regionSelectEl).is(':disabled')).toBe(false);
+            expect($(regionSelectEl).hasClass('required-entry')).toBe(false);
+            expect($(regionInputEl).is(':visible')).toBe(false);
+            expect(
+                $(regionSelectEl).find('option')
+                    .map(function () {
+                        return this.textContent;
+                    })
+                    .get()
+            ).toContain('Berlin');
+        });
+        it('Check country that has predefined and required regions', function () {
+            init();
+            $(countryEl).val('US').change();
+            expect($(regionSelectEl).is(':visible')).toBe(true);
+            expect($(regionSelectEl).is(':disabled')).toBe(false);
+            expect($(regionSelectEl).hasClass('required-entry')).toBe(true);
+            expect($(regionInputEl).is(':visible')).toBe(false);
+            expect(
+                $(regionSelectEl).find('option')
+                    .map(function () {
+                        return this.textContent;
+                    })
+                    .get()
+            ).toContain('Alaska');
+        });
+        it('Check that region fields are not displayed for country with optional regions if configured', function () {
+            init({
+                optionalRegionAllowed: false
+            });
+            $(countryEl).val('DE').change();
+            expect($(regionSelectEl).is(':visible')).toBe(false);
+            expect($(regionInputEl).is(':visible')).toBe(false);
+        });
+    });
+});

From 1be7e8ceeee68ee04f595055b2280195fd613eac Mon Sep 17 00:00:00 2001
From: Nikita Sarychev <nsarychev@lachestry.com>
Date: Mon, 27 Jul 2020 14:55:41 +0300
Subject: [PATCH 1044/1718] add unit test for price filter

---
 .../Widget/Grid/Column/Filter/PriceTest.php   | 102 ++++++++++++++++++
 1 file changed, 102 insertions(+)
 create mode 100644 app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/PriceTest.php

diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/PriceTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/PriceTest.php
new file mode 100644
index 0000000000000..32eebbb2e7670
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/PriceTest.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Backend\Test\Unit\Block\Widget\Grid\Column\Filter;
+
+use Magento\Backend\Block\Context;
+use Magento\Backend\Block\Widget\Grid\Column;
+use Magento\Backend\Block\Widget\Grid\Column\Filter\Price;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\DB\Helper;
+use Magento\Directory\Model\Currency;
+use Magento\Directory\Model\Currency\DefaultLocator;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class PriceTest extends TestCase
+{
+    /** @var RequestInterface|MockObject  */
+    private $_requestMock;
+
+    /** @var Context|MockObject */
+    private $context;
+
+    /** @var Helper|MockObject */
+    private $helper;
+
+    /** @var Currency|MockObject */
+    private $currency;
+
+    /** @var DefaultLocator|MockObject */
+    private $currencyLocator;
+
+    /** @var Column|MockObject */
+    private $columnMock;
+
+    /** @var Price  */
+    private $blockPrice;
+
+    protected function setUp(): void
+    {
+        $this->_requestMock = $this->getMockForAbstractClass(RequestInterface::class);
+
+        $this->context = $this->createMock(Context::class);
+        $this->context->expects($this->any())->method('getRequest')->willReturn($this->_requestMock);
+
+        $this->helper = $this->createMock(Helper::class);
+
+        $this->currency = $this->getMockBuilder(Currency::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getAnyRate'])
+            ->getMock();
+
+        $this->currencyLocator = $this->createMock(DefaultLocator::class);
+
+        $this->columnMock = $this->getMockBuilder(Column::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getCurrencyCode'])
+            ->getMock();
+
+        $helper = new ObjectManager($this);
+
+        $this->blockPrice = $helper->getObject(Price::class, [
+            'context'         => $this->context,
+            'resourceHelper'  => $this->helper,
+            'currencyModel'   => $this->currency,
+            'currencyLocator' => $this->currencyLocator
+        ]);
+        $this->blockPrice->setColumn($this->columnMock);
+    }
+
+    public function testGetCondition()
+    {
+        $this->currencyLocator->expects(
+            $this->any()
+        )->method(
+            'getDefaultCurrency'
+        )->with(
+            $this->_requestMock
+        )->willReturn(
+            'defaultCurrency'
+        );
+
+        $this->currency->expects($this->at(0))
+            ->method('getAnyRate')
+            ->with('defaultCurrency')
+            ->willReturn(1.0);
+
+        $testValue = [
+            'value' => [
+                'from' => '1234a',
+            ]
+        ];
+
+        $this->blockPrice->addData($testValue);
+        $this->assertEquals(['from' => 1234], $this->blockPrice->getCondition());
+    }
+}

From 9c45910719f888d6b71121c2faa3cf701fd46acb Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@aovethefray.io>
Date: Mon, 27 Jul 2020 20:17:40 +0800
Subject: [PATCH 1045/1718] magento/adobe-stock-integration#1618: Duplicated
 items in used in entities filters - applied requested change

---
 .../Magento/Ui/view/base/web/js/form/element/ui-select.js   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js b/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js
index af5d5be5640ee..7dddf735b7cc5 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js
@@ -153,8 +153,8 @@ define([
             showPath: true,
             labelsDecoration: false,
             disableLabel: false,
-            filterRateLimit: 1000,
-            filterRateLimitMethod: 'notifyWhenChangesStop',
+            filterRateLimit: 500,
+            filterRateLimitMethod: 'notifyAtFixedRate',
             closeBtnLabel: $t('Done'),
             optgroupTmpl: 'ui/grid/filters/elements/ui-select-optgroup',
             quantityPlaceholder: $t('options'),
@@ -1167,7 +1167,7 @@ define([
                 return;
             }
 
-            if (searchKey !== this.lastSearchKey || currentPage === 1) {
+            if (currentPage === 1) {
                 this.options([]);
             }
             this.processRequest(searchKey, currentPage);

From cd946e3474a2b63b0b860dfe1888f1fcae4212cd Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Mon, 27 Jul 2020 15:39:52 +0300
Subject: [PATCH 1046/1718] MC-36048: Unexpected behavior of sorting in the
 Magento Admin Panel

---
 .../Magento/Theme/Plugin/Data/Collection.php  | 26 +++++++++++++++++++
 app/code/Magento/Theme/etc/adminhtml/di.xml   |  3 +++
 app/code/Magento/Theme/etc/frontend/di.xml    |  4 +++
 3 files changed, 33 insertions(+)
 create mode 100644 app/code/Magento/Theme/Plugin/Data/Collection.php

diff --git a/app/code/Magento/Theme/Plugin/Data/Collection.php b/app/code/Magento/Theme/Plugin/Data/Collection.php
new file mode 100644
index 0000000000000..35c66f555dae7
--- /dev/null
+++ b/app/code/Magento/Theme/Plugin/Data/Collection.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Theme\Plugin\Data;
+
+/**
+ * Plugin to return real current page even if it greater then collection size.
+ *
+ * It is necessary to return no values when we reached the last page for api requests
+ */
+class Collection
+{
+    public function afterGetCurPage(\Magento\Framework\Data\Collection $subject, int $result, int $displacement = 0)
+    {
+        if ($result > $subject->getLastPageNumber()) {
+            $result = $subject->getLastPageNumber();
+        }
+
+        return $result;
+    }
+
+}
diff --git a/app/code/Magento/Theme/etc/adminhtml/di.xml b/app/code/Magento/Theme/etc/adminhtml/di.xml
index 8e672cbe1317e..81dafb48fd13f 100644
--- a/app/code/Magento/Theme/etc/adminhtml/di.xml
+++ b/app/code/Magento/Theme/etc/adminhtml/di.xml
@@ -41,4 +41,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\Data\Collection">
+        <plugin name="currentPageDetection" type="Magento\Theme\Plugin\Data\Collection" />
+    </type>
 </config>
diff --git a/app/code/Magento/Theme/etc/frontend/di.xml b/app/code/Magento/Theme/etc/frontend/di.xml
index d3e5c07861c84..a83c1fa280404 100644
--- a/app/code/Magento/Theme/etc/frontend/di.xml
+++ b/app/code/Magento/Theme/etc/frontend/di.xml
@@ -37,4 +37,8 @@
             <argument name="filePath" xsi:type="string">css/critical.css</argument>
         </arguments>
     </type>
+
+    <type name="Magento\Framework\Data\Collection">
+        <plugin name="currentPageDetection" type="Magento\Theme\Plugin\Data\Collection" />
+    </type>
 </config>

From aa68df53db28b40eb23dd0ae78e91d8d87ecc796 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Mon, 27 Jul 2020 16:38:48 +0300
Subject: [PATCH 1047/1718] MC-35026: When a Downloadable Product in a Group
 Product The Order does not show links

---
 .../Downloadable/Observer/SaveDownloadableOrderItemObserver.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php b/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
index 341387d3317c7..9351568c5a757 100644
--- a/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
+++ b/app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php
@@ -90,7 +90,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             return $this;
         }
         $productType = $orderItem->getRealProductType() ?: $orderItem->getProductType();
-        if ($productType != \Magento\Downloadable\Model\Product\Type::TYPE_DOWNLOADABLE) {
+        if ($productType !== \Magento\Downloadable\Model\Product\Type::TYPE_DOWNLOADABLE) {
             return $this;
         }
         $product = $orderItem->getProduct();

From b628b5328cb3df896e4e8f996c707dbf4676ae80 Mon Sep 17 00:00:00 2001
From: DianaRusin <rusind95@gmail.com>
Date: Mon, 27 Jul 2020 17:09:52 +0300
Subject: [PATCH 1048/1718] MC-33747: [MFTF] Flaky
 StorefrontButtonsInlineTranslationTest

---
 .../Catalog/Test/Mftf/Section/StorefrontProductActionSection.xml | 1 +
 .../Test/Mftf/Test/StorefrontButtonsInlineTranslationTest.xml    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductActionSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductActionSection.xml
index 5ee754904b702..3e3f2ac97f2e6 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductActionSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductActionSection.xml
@@ -10,6 +10,7 @@
     <section name="StorefrontProductActionSection">
         <element name="quantity" type="input" selector="#qty"/>
         <element name="addToCart" type="button" selector="#product-addtocart-button" timeout="60"/>
+        <element name="addToCartEnabled" type="button" selector="//button[@id='product-addtocart-button' and not(contains(@class, 'disabled'))]" timeout="60"/>
         <element name="addToCartButtonTitleIsAdding" type="text" selector="//button/span[text()='Adding...']"/>
         <element name="addToCartButtonTitleIsAdded" type="text" selector="//button/span[text()='Added']"/>
         <element name="addToCartButtonTitleIsAddToCart" type="text" selector="//button/span[text()='Add to Cart']"/>
diff --git a/app/code/Magento/Translation/Test/Mftf/Test/StorefrontButtonsInlineTranslationTest.xml b/app/code/Magento/Translation/Test/Mftf/Test/StorefrontButtonsInlineTranslationTest.xml
index 8e15b42befaa1..7e59c58bbbe5e 100644
--- a/app/code/Magento/Translation/Test/Mftf/Test/StorefrontButtonsInlineTranslationTest.xml
+++ b/app/code/Magento/Translation/Test/Mftf/Test/StorefrontButtonsInlineTranslationTest.xml
@@ -43,6 +43,7 @@
         <!-- Add product to cart on storefront -->
         <amOnPage url="{{StorefrontProductPage.url($createProduct.custom_attributes[url_key]$)}}" stepKey="goToProductPage"/>
         <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <seeElement selector="{{StorefrontProductActionSection.addToCartEnabled}}" stepKey="waitForAddToCartButtonEnabled"/>
         <actionGroup ref="AddToCartFromStorefrontProductPageActionGroup" stepKey="addProductToCart">
             <argument name="productName" value="$createProduct.name$"/>
         </actionGroup>

From ebedd6047e63dab9e074ba81d235d1e6aaac4c44 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 27 Jul 2020 17:21:36 +0300
Subject: [PATCH 1049/1718] Use correct folder

---
 .../Test/AdminAddImageToWYSIWYGCatalogTest.xml     | 10 +++++-----
 .../Test/AdminAddImageToCMSPageTinyMCE3Test.xml    | 14 +++++++-------
 .../Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml  | 10 +++++-----
 .../Test/AdminAddImageToWYSIWYGNewsletterTest.xml  |  7 +++++--
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml
index 79ddef74085b6..aab7198c6fcde 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml
@@ -32,6 +32,9 @@
         <waitForPageLoad stepKey="waitForPageLoad" />
         <actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
         <actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
+         <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder">
+             <argument name="FolderName" value="Storage Root"/>
+        </actionGroup>
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
                 <argument name="ImageFolder" value="ImageFolder"/>
         </actionGroup>
@@ -51,11 +54,8 @@
         <seeElementInDOM selector="{{StorefrontCategoryMainSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSource"/>
         <after>
              <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
-             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder">
-                <argument name="FolderName" value="Storage Root"/>
-            </actionGroup>
-            <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteImageFromStorage">
-                <argument name="Image" value="ImageUpload3"/>
+             <actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteCreatedFolder">
+                <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
             <actionGroup ref="DeleteCategoryActionGroup" stepKey="DeleteCategory">
                 <argument name="categoryEntity" value="SimpleSubCategory"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml
index ee1666716e040..32fb83dc15e2c 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml
@@ -25,13 +25,10 @@
             <magentoCLI command="config:set cms/wysiwyg/editor Magento_Tinymce3/tinymce3Adapter" stepKey="enableTinyMCE3"/>
         </before>
         <after>
-        <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
-        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder">
-            <argument name="FolderName" value="Storage Root"/>
-        </actionGroup>
-        <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteImageFromStorage">
-            <argument name="Image" value="ImageUpload3"/>
-        </actionGroup>
+             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
+             <actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteCreatedFolder">
+                <argument name="ImageFolder" value="ImageFolder"/>
+            </actionGroup>
             <!-- Switch WYSIWYG editor to TinyMCE4-->
             <comment userInput="Reset editor as TinyMCE4" stepKey="chooseTinyMCE4AsEditor"/>
             <magentoCLI command="config:set cms/wysiwyg/editor mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter" stepKey="enableTinyMCE4"/>
@@ -54,6 +51,9 @@
         <click selector="{{MediaGallerySection.browseForImage}}" stepKey="clickBrowse"/>
         <switchToIFrame stepKey="switchOutOfIFrame"/>
         <waitForPageLoad stepKey="waitForPageToLoad" />
+         <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder">
+             <argument name="FolderName" value="Storage Root"/>
+        </actionGroup>
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
             <argument name="ImageFolder" value="ImageFolder"/>
         </actionGroup>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml
index f097981f71188..c7b4d59818f09 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml
@@ -37,6 +37,9 @@
         <waitForPageLoad stepKey="waitForPageLoad2" />
         <actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
         <actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
+        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder">
+             <argument name="FolderName" value="Storage Root"/>
+        </actionGroup>
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
             <argument name="ImageFolder" value="ImageFolder"/>
         </actionGroup>
@@ -57,11 +60,8 @@
         <seeElementInDOM selector="{{StorefrontBlockSection.imageSource(ImageUpload.fileName)}}" stepKey="assertMediaSource"/>
         <after>
              <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
-             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder">
-                <argument name="FolderName" value="Storage Root"/>
-            </actionGroup>
-            <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteImageFromStorage">
-                <argument name="Image" value="ImageUpload"/>
+             <actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteCreatedFolder">
+                <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
             <amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnEditPage"/>
             <waitForPageLoad stepKey="waitForPageLoad"/>
diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddImageToWYSIWYGNewsletterTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddImageToWYSIWYGNewsletterTest.xml
index 099242be53bc1..ec63a81d99fe1 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddImageToWYSIWYGNewsletterTest.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddImageToWYSIWYGNewsletterTest.xml
@@ -35,6 +35,9 @@
         <waitForPageLoad stepKey="waitForPageLoad" />
         <actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
         <actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
+         <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder">
+             <argument name="FolderName" value="Storage Root"/>
+        </actionGroup>
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
             <argument name="ImageFolder" value="ImageFolder"/>
         </actionGroup>
@@ -58,8 +61,8 @@
         <closeTab stepKey="closeTab"/>
         <after>
              <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
-             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder">
-                <argument name="FolderName" value="Storage Root"/>
+             <actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteCreatedFolder">
+                <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteImageFromStorage">
                <argument name="Image" value="ImageUpload3"/>

From 6ad63ad5abf2bb25f2a100bc9fd03aa1f7e0f507 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 27 Jul 2020 17:43:14 +0300
Subject: [PATCH 1050/1718] fix identation

---
 .../Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml  |  2 +-
 .../Mftf/Test/AdminAddImageToWYSIWYGCMSTest.xml    | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml
index c7b4d59818f09..a53feb861b44a 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml
@@ -38,7 +38,7 @@
         <actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
         <actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
         <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder">
-             <argument name="FolderName" value="Storage Root"/>
+            <argument name="FolderName" value="Storage Root"/>
         </actionGroup>
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
             <argument name="ImageFolder" value="ImageFolder"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGCMSTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGCMSTest.xml
index bcef2c5f2de28..4f67b81446ae7 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGCMSTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGCMSTest.xml
@@ -24,13 +24,10 @@
             <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
         </before>
         <after>
-        <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
-        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder">
-            <argument name="FolderName" value="Storage Root"/>
-        </actionGroup>
-        <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteImageFromStorage">
-            <argument name="Image" value="ImageUpload3"/>
-        </actionGroup>
+            <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
+            <actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteCreatedFolder">
+                <argument name="ImageFolder" value="ImageFolder"/>
+            </actionGroup>
             <actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYGFirst"/>
             <deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage" />
             <actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
@@ -46,6 +43,9 @@
         <waitForPageLoad stepKey="waitForPageLoad" />
         <actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
         <actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
+        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder">
+             <argument name="FolderName" value="Storage Root"/>
+        </actionGroup>
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
             <argument name="ImageFolder" value="ImageFolder"/>
         </actionGroup>

From d66811fbb093208a3b36f97c10770a9dd6518e36 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 27 Jul 2020 17:46:17 +0300
Subject: [PATCH 1051/1718] Fix identation

---
 .../Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml  | 8 ++++----
 .../Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml | 6 +++---
 .../Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml    | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml
index aab7198c6fcde..897c4b0b3c494 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGCatalogTest.xml
@@ -32,11 +32,11 @@
         <waitForPageLoad stepKey="waitForPageLoad" />
         <actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
         <actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
-         <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder">
+        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder">
              <argument name="FolderName" value="Storage Root"/>
         </actionGroup>
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
-                <argument name="ImageFolder" value="ImageFolder"/>
+             <argument name="ImageFolder" value="ImageFolder"/>
         </actionGroup>
         <actionGroup ref="AttachImageActionGroup" stepKey="attachImage1">
             <argument name="Image" value="ImageUpload3"/>
@@ -53,8 +53,8 @@
         <seeElement selector="{{StorefrontCategoryMainSection.mediaDescription(ImageUpload3.content)}}" stepKey="assertMediaDescription"/>
         <seeElementInDOM selector="{{StorefrontCategoryMainSection.imageSource(ImageUpload3.fileName)}}" stepKey="assertMediaSource"/>
         <after>
-             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
-             <actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteCreatedFolder">
+            <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
+            <actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteCreatedFolder">
                 <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
             <actionGroup ref="DeleteCategoryActionGroup" stepKey="DeleteCategory">
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml
index 32fb83dc15e2c..6f818629f2faf 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml
@@ -25,8 +25,8 @@
             <magentoCLI command="config:set cms/wysiwyg/editor Magento_Tinymce3/tinymce3Adapter" stepKey="enableTinyMCE3"/>
         </before>
         <after>
-             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
-             <actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteCreatedFolder">
+            <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
+            <actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteCreatedFolder">
                 <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
             <!-- Switch WYSIWYG editor to TinyMCE4-->
@@ -51,7 +51,7 @@
         <click selector="{{MediaGallerySection.browseForImage}}" stepKey="clickBrowse"/>
         <switchToIFrame stepKey="switchOutOfIFrame"/>
         <waitForPageLoad stepKey="waitForPageToLoad" />
-         <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder">
+        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToFolder">
              <argument name="FolderName" value="Storage Root"/>
         </actionGroup>
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml
index a53feb861b44a..c0424e09f8f76 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml
@@ -59,8 +59,8 @@
         <seeElement selector="{{StorefrontBlockSection.mediaDescription}}" stepKey="assertMediaDescription"/>
         <seeElementInDOM selector="{{StorefrontBlockSection.imageSource(ImageUpload.fileName)}}" stepKey="assertMediaSource"/>
         <after>
-             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
-             <actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteCreatedFolder">
+            <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
+            <actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteCreatedFolder">
                 <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
             <amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnEditPage"/>

From 4dac67dbf06550a1e36f2e463dad8b8f3e36a457 Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Mon, 27 Jul 2020 18:49:24 +0300
Subject: [PATCH 1052/1718] Fix typo.

---
 app/code/Magento/PageCache/etc/graphql/di.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/PageCache/etc/graphql/di.xml b/app/code/Magento/PageCache/etc/graphql/di.xml
index c1f6647bba8f6..93714465f4d72 100644
--- a/app/code/Magento/PageCache/etc/graphql/di.xml
+++ b/app/code/Magento/PageCache/etc/graphql/di.xml
@@ -7,6 +7,6 @@
 -->
 <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="page_cache_from_key_from_cookie" type="Magento\PageCache\Plugin\RegisterFormKeyFromCookie" />
+        <plugin name="page_cache_form_key_from_cookie" type="Magento\PageCache\Plugin\RegisterFormKeyFromCookie" />
     </type>
 </config>

From b9b06e59c52b8a53c4058c7aa258a98f40e18b0f Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 27 Jul 2020 19:33:13 +0300
Subject: [PATCH 1053/1718] Fix newsletter test

---
 .../Test/Mftf/Test/AdminAddImageToWYSIWYGNewsletterTest.xml    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddImageToWYSIWYGNewsletterTest.xml b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddImageToWYSIWYGNewsletterTest.xml
index ec63a81d99fe1..e255f14a83661 100644
--- a/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddImageToWYSIWYGNewsletterTest.xml
+++ b/app/code/Magento/Newsletter/Test/Mftf/Test/AdminAddImageToWYSIWYGNewsletterTest.xml
@@ -64,9 +64,6 @@
              <actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteCreatedFolder">
                 <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
-            <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteImageFromStorage">
-               <argument name="Image" value="ImageUpload3"/>
-            </actionGroup>
             <actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>

From 1990bf079b134efec2236a8dd67e4bd5cfaff971 Mon Sep 17 00:00:00 2001
From: DianaRusin <rusind95@gmail.com>
Date: Mon, 27 Jul 2020 19:44:50 +0300
Subject: [PATCH 1054/1718] MC-33747: [MFTF] Flaky
 StorefrontButtonsInlineTranslationTest

---
 .../Test/Mftf/Section/StorefrontProductActionSection.xml        | 2 +-
 .../Test/Mftf/Test/StorefrontButtonsInlineTranslationTest.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductActionSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductActionSection.xml
index 3e3f2ac97f2e6..13ced1c0263e0 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductActionSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductActionSection.xml
@@ -10,7 +10,7 @@
     <section name="StorefrontProductActionSection">
         <element name="quantity" type="input" selector="#qty"/>
         <element name="addToCart" type="button" selector="#product-addtocart-button" timeout="60"/>
-        <element name="addToCartEnabled" type="button" selector="//button[@id='product-addtocart-button' and not(contains(@class, 'disabled'))]" timeout="60"/>
+        <element name="addToCartEnabledWithTranslation" type="button" selector="button#product-addtocart-button[data-translate]:enabled" timeout="60"/>
         <element name="addToCartButtonTitleIsAdding" type="text" selector="//button/span[text()='Adding...']"/>
         <element name="addToCartButtonTitleIsAdded" type="text" selector="//button/span[text()='Added']"/>
         <element name="addToCartButtonTitleIsAddToCart" type="text" selector="//button/span[text()='Add to Cart']"/>
diff --git a/app/code/Magento/Translation/Test/Mftf/Test/StorefrontButtonsInlineTranslationTest.xml b/app/code/Magento/Translation/Test/Mftf/Test/StorefrontButtonsInlineTranslationTest.xml
index 7e59c58bbbe5e..3f2f4515d7d68 100644
--- a/app/code/Magento/Translation/Test/Mftf/Test/StorefrontButtonsInlineTranslationTest.xml
+++ b/app/code/Magento/Translation/Test/Mftf/Test/StorefrontButtonsInlineTranslationTest.xml
@@ -43,7 +43,7 @@
         <!-- Add product to cart on storefront -->
         <amOnPage url="{{StorefrontProductPage.url($createProduct.custom_attributes[url_key]$)}}" stepKey="goToProductPage"/>
         <waitForPageLoad stepKey="waitForProductPageLoad"/>
-        <seeElement selector="{{StorefrontProductActionSection.addToCartEnabled}}" stepKey="waitForAddToCartButtonEnabled"/>
+        <seeElement selector="{{StorefrontProductActionSection.addToCartEnabledWithTranslation}}" stepKey="waitForAddToCartButtonEnabled"/>
         <actionGroup ref="AddToCartFromStorefrontProductPageActionGroup" stepKey="addProductToCart">
             <argument name="productName" value="$createProduct.name$"/>
         </actionGroup>

From dbb34278aa50eb4ed5e9c428820a059d7199a922 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Mon, 27 Jul 2020 20:20:29 +0300
Subject: [PATCH 1055/1718] Use plugin for checking is customer logged

---
 .../Cart/HostedPro/SetPaymentMethodOnCart.php |  5 +-
 .../PayflowPro/SetPaymentMethodOnCart.php     | 72 +++++++++++++++++++
 .../Observer/PayflowProSetCcData.php          | 15 +---
 app/code/Magento/PaypalGraphQl/composer.json  |  3 +-
 .../Magento/PaypalGraphQl/etc/graphql/di.xml  |  3 +
 .../Model/Cart/SetPaymentMethodOnCart.php     |  5 +-
 .../Model/Resolver/SetPaymentMethodOnCart.php |  2 +-
 7 files changed, 87 insertions(+), 18 deletions(-)
 create mode 100644 app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/PayflowPro/SetPaymentMethodOnCart.php

diff --git a/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/HostedPro/SetPaymentMethodOnCart.php b/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/HostedPro/SetPaymentMethodOnCart.php
index f3353afb7f5b7..f127a9355adfc 100644
--- a/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/HostedPro/SetPaymentMethodOnCart.php
+++ b/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/HostedPro/SetPaymentMethodOnCart.php
@@ -8,6 +8,7 @@
 namespace Magento\PaypalGraphQl\Model\Plugin\Cart\HostedPro;
 
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 use Magento\Paypal\Model\Config;
 use Magento\Quote\Model\Quote;
 use Magento\QuoteGraphQl\Model\Cart\Payment\AdditionalDataProviderPool;
@@ -47,6 +48,7 @@ public function __construct(
      * @param mixed $result
      * @param Quote $cart
      * @param array $paymentData
+     * @param ContextInterface $context
      * @return void
      * @throws GraphQlInputException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -55,7 +57,8 @@ public function afterExecute(
         \Magento\QuoteGraphQl\Model\Cart\SetPaymentMethodOnCart $subject,
         $result,
         Quote $cart,
-        array $paymentData
+        array $paymentData,
+        ContextInterface $context
     ): void {
         $paymentData = $this->additionalDataProviderPool->getData(Config::METHOD_HOSTEDPRO, $paymentData);
 
diff --git a/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/PayflowPro/SetPaymentMethodOnCart.php b/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/PayflowPro/SetPaymentMethodOnCart.php
new file mode 100644
index 0000000000000..eb72483f47d4a
--- /dev/null
+++ b/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/PayflowPro/SetPaymentMethodOnCart.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\PaypalGraphQl\Model\Plugin\Cart\PayflowPro;
+
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Paypal\Model\Config;
+use Magento\Quote\Model\Quote;
+use Magento\QuoteGraphQl\Model\Cart\Payment\AdditionalDataProviderPool;
+use Magento\Sales\Model\Order\Payment\Repository as PaymentRepository;
+use Magento\PaypalGraphQl\Observer\PayflowProSetCcData;
+
+/**
+ * Set additionalInformation on payment for PayflowPro method
+ */
+class SetPaymentMethodOnCart
+{
+    /**
+     * @var PaymentRepository
+     */
+    private $paymentRepository;
+
+    /**
+     * @var AdditionalDataProviderPool
+     */
+    private $additionalDataProviderPool;
+
+    /**
+     * @param PaymentRepository $paymentRepository
+     * @param AdditionalDataProviderPool $additionalDataProviderPool
+     */
+    public function __construct(
+        PaymentRepository $paymentRepository,
+        AdditionalDataProviderPool $additionalDataProviderPool
+    ) {
+        $this->paymentRepository = $paymentRepository;
+        $this->additionalDataProviderPool = $additionalDataProviderPool;
+    }
+
+    /**
+     * Set redirect URL paths on payment additionalInformation
+     *
+     * @param \Magento\QuoteGraphQl\Model\Cart\SetPaymentMethodOnCart $subject
+     * @param mixed $result
+     * @param Quote $cart
+     * @param array $paymentData
+     * @return void
+     * @throws GraphQlInputException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterExecute(
+        \Magento\QuoteGraphQl\Model\Cart\SetPaymentMethodOnCart $subject,
+        $result,
+        Quote $cart,
+        array $paymentData,
+        ContextInterface $context
+    ): void {
+        $paymentData = $this->additionalDataProviderPool->getData(Config::METHOD_PAYFLOWPRO, $paymentData);
+
+        if (!$context->getExtensionAttributes()->getIsCustomer()
+            && array_key_exists(PayflowProSetCcData::IS_ACTIVE_PAYMENT_TOKEN_ENABLER, $paymentData)) {
+            $payment = $cart->getPayment();
+            $payment->unsAdditionalInformation(PayflowProSetCcData::IS_ACTIVE_PAYMENT_TOKEN_ENABLER);
+            $payment->save();
+        }
+    }
+}
diff --git a/app/code/Magento/PaypalGraphQl/Observer/PayflowProSetCcData.php b/app/code/Magento/PaypalGraphQl/Observer/PayflowProSetCcData.php
index 191d2c0435f60..801ec91d063c5 100644
--- a/app/code/Magento/PaypalGraphQl/Observer/PayflowProSetCcData.php
+++ b/app/code/Magento/PaypalGraphQl/Observer/PayflowProSetCcData.php
@@ -8,7 +8,6 @@
 
 namespace Magento\PaypalGraphQl\Observer;
 
-use Magento\Customer\Model\Session as CustomerModelSession;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Event\Observer;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
@@ -24,11 +23,6 @@ class PayflowProSetCcData extends AbstractDataAssignObserver
     const XML_PATH_PAYMENT_PAYFLOWPRO_CC_VAULT_ACTIVE = "payment/payflowpro_cc_vault/active";
     const IS_ACTIVE_PAYMENT_TOKEN_ENABLER = "is_active_payment_token_enabler";
 
-    /**
-     * @var CustomerModelSession
-     */
-    private $customerSession;
-
     /**
      * Core store config
      *
@@ -37,14 +31,11 @@ class PayflowProSetCcData extends AbstractDataAssignObserver
     private $scopeConfig;
 
     /**
-     * @param CustomerModelSession $customerSession
      * @param ScopeConfigInterface $scopeConfig
      */
     public function __construct(
-        CustomerModelSession $customerSession,
         ScopeConfigInterface $scopeConfig
     ) {
-        $this->customerSession = $customerSession;
         $this->scopeConfig = $scopeConfig;
     }
 
@@ -65,11 +56,9 @@ public function execute(Observer $observer)
             return;
         }
 
-        if ($this->customerSession->isLoggedIn() && $this->isPayflowProVaultEnable()) {
+        if ($this->isPayflowProVaultEnable()) {
             if (!isset($additionalData[self::IS_ACTIVE_PAYMENT_TOKEN_ENABLER])) {
-                throw new GraphQlInputException(
-                    __('Required parameter "is_active_payment_token_enabler" is missing.')
-                );
+                $paymentModel->setData(self::IS_ACTIVE_PAYMENT_TOKEN_ENABLER, false);
             }
 
             $paymentModel->setData(
diff --git a/app/code/Magento/PaypalGraphQl/composer.json b/app/code/Magento/PaypalGraphQl/composer.json
index 6cf790dcfc0f7..8d012be3492dd 100644
--- a/app/code/Magento/PaypalGraphQl/composer.json
+++ b/app/code/Magento/PaypalGraphQl/composer.json
@@ -13,8 +13,7 @@
         "magento/module-quote-graph-ql": "*",
         "magento/module-sales": "*",
         "magento/module-payment": "*",
-        "magento/module-store": "*",
-        "magento/module-customer": "*"
+        "magento/module-store": "*"
     },
     "suggest": {
         "magento/module-graph-ql": "*"
diff --git a/app/code/Magento/PaypalGraphQl/etc/graphql/di.xml b/app/code/Magento/PaypalGraphQl/etc/graphql/di.xml
index cd5d6e2062bb9..a83a556b37d42 100644
--- a/app/code/Magento/PaypalGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/PaypalGraphQl/etc/graphql/di.xml
@@ -12,6 +12,9 @@
     <type name="Magento\QuoteGraphQl\Model\Cart\SetPaymentMethodOnCart">
         <plugin name="hosted_pro_payment_method" type="Magento\PaypalGraphQl\Model\Plugin\Cart\HostedPro\SetPaymentMethodOnCart"/>
     </type>
+    <type name="Magento\QuoteGraphQl\Model\Cart\SetPaymentMethodOnCart">
+        <plugin name="payflowpro_payment_method" type="Magento\PaypalGraphQl\Model\Plugin\Cart\PayflowPro\SetPaymentMethodOnCart"/>
+    </type>
     <type name="Magento\Paypal\Model\Payflowlink">
         <plugin name="payflow_link_update_redirect_urls" type="Magento\PaypalGraphQl\Model\Plugin\Payflowlink"/>
     </type>
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php
index 4deb794761efb..56cfcba140081 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php
@@ -11,6 +11,7 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 use Magento\Quote\Api\Data\PaymentInterface;
 use Magento\Quote\Api\Data\PaymentInterfaceFactory;
 use Magento\Quote\Api\PaymentMethodManagementInterface;
@@ -57,10 +58,12 @@ public function __construct(
      *
      * @param Quote $cart
      * @param array $paymentData
+     * @param ContextInterface $context
      * @throws GraphQlInputException
      * @throws GraphQlNoSuchEntityException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function execute(Quote $cart, array $paymentData): void
+    public function execute(Quote $cart, array $paymentData, ContextInterface $context): void
     {
         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/Model/Resolver/SetPaymentMethodOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentMethodOnCart.php
index fb6c1e678f1f0..b5e23d237b800 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentMethodOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentMethodOnCart.php
@@ -68,7 +68,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         $storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
         $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId(), $storeId);
         $this->checkCartCheckoutAllowance->execute($cart);
-        $this->setPaymentMethodOnCart->execute($cart, $paymentData);
+        $this->setPaymentMethodOnCart->execute($cart, $paymentData, $context);
 
         return [
             'cart' => [

From 8759bd308f3c83c48d6637d9028f6123074bf1f1 Mon Sep 17 00:00:00 2001
From: Kevin Kozan <kkozan@adobe.com>
Date: Mon, 27 Jul 2020 12:43:05 -0500
Subject: [PATCH 1056/1718] MQE-2044: Integration Coverage - Jenkins
 Implementation

- Additional fixes to _files support
---
 .../Console/Command/GenerateFixturesCommandTest.php  |  2 +-
 .../Setup/Console/Command/_files/min_profile.xml     | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/GenerateFixturesCommandTest.php b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/GenerateFixturesCommandTest.php
index ebd579330a5a1..75db44f30e58a 100644
--- a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/GenerateFixturesCommandTest.php
+++ b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/GenerateFixturesCommandTest.php
@@ -117,7 +117,7 @@ public static function setUpBeforeClass(): void
      */
     public function testExecute()
     {
-        $profile = realpath(__DIR__ . "./_files/min_profile.xml");
+        $profile = realpath(__DIR__ . "/_files/min_profile.xml");
         $this->commandTester->execute(
             [
                 GenerateFixturesCommand::PROFILE_ARGUMENT => $profile,
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/min_profile.xml b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/min_profile.xml
index 535740b316c31..6f6c548621b21 100644
--- a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/min_profile.xml
+++ b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/min_profile.xml
@@ -112,11 +112,11 @@
                 <set_scheduled>false</set_scheduled>
             </indexer>
         </indexers>
-        <xi:include href="../../config/searchTermsLarge.xml" />
-        <xi:include href="../../config/attributeSets.xml" />
-        <xi:include href="../../config/searchConfig.xml" />
-        <xi:include href="../../config/customerConfig.xml" />
-        <xi:include href="../../config/description.xml" />
-        <xi:include href="../../config/shortDescription.xml" />
+        <xi:include href="../../../../../../../../../setup/performance-toolkit/config/searchTermsLarge.xml" />
+        <xi:include href="../../../../../../../../../setup/performance-toolkit/config/attributeSets.xml" />
+        <xi:include href="../../../../../../../../../setup/performance-toolkit/config/searchConfig.xml" />
+        <xi:include href="../../../../../../../../../setup/performance-toolkit/config/customerConfig.xml" />
+        <xi:include href="../../../../../../../../../setup/performance-toolkit/config/description.xml" />
+        <xi:include href="../../../../../../../../../setup/performance-toolkit/config/shortDescription.xml" />
     </profile>
 </config>

From 6b3da47001d7ede2dcb7d6bf78a88140fe2b83b6 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Mon, 27 Jul 2020 21:41:05 +0300
Subject: [PATCH 1057/1718] fixed static issues

---
 .../Model/Plugin/Cart/PayflowPro/SetPaymentMethodOnCart.php     | 1 +
 app/code/Magento/PaypalGraphQl/etc/graphql/di.xml               | 2 --
 .../Magento/QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php  | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/PayflowPro/SetPaymentMethodOnCart.php b/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/PayflowPro/SetPaymentMethodOnCart.php
index eb72483f47d4a..1277a2464435d 100644
--- a/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/PayflowPro/SetPaymentMethodOnCart.php
+++ b/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/PayflowPro/SetPaymentMethodOnCart.php
@@ -49,6 +49,7 @@ public function __construct(
      * @param mixed $result
      * @param Quote $cart
      * @param array $paymentData
+     * @param ContextInterface $context
      * @return void
      * @throws GraphQlInputException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
diff --git a/app/code/Magento/PaypalGraphQl/etc/graphql/di.xml b/app/code/Magento/PaypalGraphQl/etc/graphql/di.xml
index a83a556b37d42..cbb70d52c401a 100644
--- a/app/code/Magento/PaypalGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/PaypalGraphQl/etc/graphql/di.xml
@@ -11,8 +11,6 @@
     </type>
     <type name="Magento\QuoteGraphQl\Model\Cart\SetPaymentMethodOnCart">
         <plugin name="hosted_pro_payment_method" type="Magento\PaypalGraphQl\Model\Plugin\Cart\HostedPro\SetPaymentMethodOnCart"/>
-    </type>
-    <type name="Magento\QuoteGraphQl\Model\Cart\SetPaymentMethodOnCart">
         <plugin name="payflowpro_payment_method" type="Magento\PaypalGraphQl\Model\Plugin\Cart\PayflowPro\SetPaymentMethodOnCart"/>
     </type>
     <type name="Magento\Paypal\Model\Payflowlink">
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php
index 56cfcba140081..80fe860381d04 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php
@@ -19,7 +19,7 @@
 use Magento\QuoteGraphQl\Model\Cart\Payment\AdditionalDataProviderPool;
 
 /**
- * Set payment method on cart
+ * Set payment method for cart
  */
 class SetPaymentMethodOnCart
 {

From b8760b32ddcd491bb154fd6d63e02d5848a715b2 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Mon, 27 Jul 2020 14:55:27 -0500
Subject: [PATCH 1058/1718] MC-32014: Remove google-shopping-ads module from
 core in 2.4.1

---
 dev/tests/integration/bin/magento | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/integration/bin/magento b/dev/tests/integration/bin/magento
index e3c0be6eaffca..8226f5c711708 100755
--- a/dev/tests/integration/bin/magento
+++ b/dev/tests/integration/bin/magento
@@ -33,7 +33,7 @@ try {
 try {
     $handler = new \Magento\Framework\App\ErrorHandler();
     set_error_handler([$handler, 'handler']);
-    if ($_SERVER['INTEGRATION_TESTS_CLI_AUTOLOADER']) {
+    if (isset($_SERVER['INTEGRATION_TESTS_CLI_AUTOLOADER'])) {
         $application = new CliProxy('Magento CLI');
     } else {
         $application = new Cli('Magento CLI');

From 80f41958e039e3275488f034bba4b5d874d0da9c Mon Sep 17 00:00:00 2001
From: Yevhenii Dumskyi <yevhenii.dumskyi@gmail.com>
Date: Mon, 27 Jul 2020 23:03:21 +0200
Subject: [PATCH 1059/1718] Fix Build-in README installation command. Add
 required ElasticSearch params since 2.4. Add new line concatenation character

---
 phpserver/README.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/phpserver/README.md b/phpserver/README.md
index 2e8c8f2efd317..a6f9cafaf023c 100644
--- a/phpserver/README.md
+++ b/phpserver/README.md
@@ -17,11 +17,12 @@ Without a router script, that is not possible via the php built-in server.
 Please read how to install Magento using the <a href="https://devdocs.magento.com/guides/v2.4/install-gde/install/cli/install-cli.html" target="_blank">command line</a>. An example follows:
 
 ```
-php bin/magento setup:install --base-url=http://127.0.0.1:8082 
---db-host=localhost --db-name=magento --db-user=magento --db-password=magento
---admin-firstname=Magento --admin-lastname=User --admin-email=user@example.com
---admin-user=admin --admin-password=admin123 --language=en_US
---currency=USD --timezone=America/Chicago --use-rewrites=1
+php bin/magento setup:install --base-url=http://127.0.0.1:8082 \
+--db-host=localhost --db-name=magento --db-user=magento --db-password=magento \
+--admin-firstname=Magento --admin-lastname=User --admin-email=user@example.com \
+--admin-user=admin --admin-password=admin123 --language=en_US \
+--currency=USD --timezone=America/Chicago --use-rewrites=1 \
+--search-engine=elasticsearch7 --elasticsearch-host=es-host.example.com --elasticsearch-port=9200
 ```
 
 Notes:

From 00510851d1abf286a864f5aa2ecc50c8fa3ecd49 Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Mon, 27 Jul 2020 16:43:09 -0500
Subject: [PATCH 1060/1718] MC-20638: MyAccount :: Order Details :: Shipping
 Details by Order Number

---
 .../CustomerOrders/OrderShipmentsTest.php     | 139 +++++--
 .../Sales/Fixtures/CustomerPlaceOrder.php     | 367 ++++++++++++++++++
 ...dersWithBundleProductByOrderNumberTest.php | 348 ++---------------
 ...stomer_place_order_with_bundle_product.php | 233 -----------
 4 files changed, 504 insertions(+), 583 deletions(-)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/Fixtures/CustomerPlaceOrder.php
 delete mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/_files/customer_place_order_with_bundle_product.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CustomerOrders/OrderShipmentsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CustomerOrders/OrderShipmentsTest.php
index 12884abd2fd65..30f845c1fae3a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CustomerOrders/OrderShipmentsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CustomerOrders/OrderShipmentsTest.php
@@ -5,13 +5,17 @@
  */
 declare(strict_types=1);
 
+use Magento\Framework\DB\Transaction;
+use Magento\Framework\Registry;
 use Magento\GraphQl\GetCustomerAuthenticationHeader;
+use Magento\GraphQl\Sales\Fixtures\CustomerPlaceOrder;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Shipment;
+use Magento\Sales\Model\Order\ShipmentFactory;
+use Magento\Sales\Model\ResourceModel\Order\Collection as OrderCollection;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
-use Magento\Sales\Model\ResourceModel\Order\Collection as OrderCollection;
 
 class OrderShipmentsTest extends GraphQlAbstract
 {
@@ -20,29 +24,20 @@ class OrderShipmentsTest extends GraphQlAbstract
      */
     private $getCustomerAuthHeader;
 
+    /**
+     * @var OrderRepositoryInterface
+     */
     private $orderRepository;
 
-    private $registry;
-
     protected function setUp(): void
     {
         $this->getCustomerAuthHeader = Bootstrap::getObjectManager()->get(GetCustomerAuthenticationHeader::class);
         $this->orderRepository = Bootstrap::getObjectManager()->get(OrderRepositoryInterface::class);
-        $this->registry = Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
     }
 
     protected function tearDown(): void
     {
-        $this->registry->unregister('isSecureArea');
-        $this->registry->register('isSecureArea', true);
-
-        /** @var $order \Magento\Sales\Model\Order */
-        $orderCollection = Bootstrap::getObjectManager()->create(OrderCollection::class);
-        foreach ($orderCollection as $order) {
-            $this->orderRepository->delete($order);
-        }
-        $this->registry->unregister('isSecureArea');
-        $this->registry->register('isSecureArea', false);
+        $this->cleanupOrders();
     }
 
     /**
@@ -142,30 +137,81 @@ public function testOrderShipmentWithUpsCarrier()
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Bundle/_files/bundle_product_two_dropdown_options.php
      */
-    public function testOrderShipmentDifferentProductTypes()
+    public function testOrderShipmentWithBundleProduct()
     {
         //Place order with bundled product
-        require __DIR__ . '/../_files/customer_place_order_with_bundle_product.php';
+        /** @var CustomerPlaceOrder $bundleProductOrderFixture */
+        $bundleProductOrderFixture = Bootstrap::getObjectManager()->create(CustomerPlaceOrder::class);
+        $placeOrderResponse = $bundleProductOrderFixture->placeOrderWithBundleProduct(
+            ['email' => 'customer@example.com', 'password' => 'password'],
+            ['sku' => 'bundle-product-two-dropdown-options']
+        );
+        $orderNumber = $placeOrderResponse['placeOrder']['order']['order_number'];
+        $this->shipOrder($orderNumber);
+
         $result = $this->graphQlQuery(
             $this->getQuery(),
             [],
             '',
             $this->getCustomerAuthHeader->execute('customer@example.com', 'password')
         );
-
         $this->assertArrayNotHasKey('errors', $result);
 
         $shipments = $result['customer']['orders']['items'][0]['shipments'];
-    }
+        $shipmentBundleItem = $shipments[0]['items'][0];
+
+        $shipmentItemAssertionMap = [
+            'order_item' => [
+                'product_sku' => 'bundle-product-two-dropdown-options-simple1-simple2'
+            ],
+            'product_name' => 'Bundle Product With Two dropdown options',
+            'product_sku' => 'bundle-product-two-dropdown-options-simple1-simple2',
+            'product_sale_price' => [
+                'value' => 15,
+                'currency' => 'USD'
+            ],
+            'bundle_options' => [
+                [
+                    'label' => 'Drop Down Option 1',
+                    'values' => [
+                        [
+                            'product_name' => 'Simple Product1',
+                            'product_sku' => 'simple1',
+                            'quantity' => 1,
+                            'price' => ['value' => 1]
+                        ]
+                    ]
+                ],
+                [
+                    'label' => 'Drop Down Option 2',
+                    'values' => [
+                        [
+                            'product_name' => 'Simple Product2',
+                            'product_sku' => 'simple2',
+                            'quantity' => 2,
+                            'price' => ['value' => 2]
+                        ]
+                    ]
+                ]
+            ]
+        ];
 
+        $this->assertResponseFields($shipmentBundleItem, $shipmentItemAssertionMap);
+    }
 
+    /**
+     * Get query that fetch orders and shipment information
+     *
+     * @param string|null $orderId
+     * @return string
+     */
     private function getQuery(string $orderId = null)
     {
         $filter = $orderId ? "(filter:{number:{eq:\"$orderId\"}})" : "";
-        $query = <<<QUERY
+        return <<<QUERY
 {
-  customer $filter{
-    orders {
+  customer {
+    orders {$filter}{
       items {
         number
         status
@@ -185,7 +231,6 @@ private function getQuery(string $orderId = null)
           items {
             id
             order_item {
-              id
               product_sku
             }
             product_name
@@ -196,10 +241,8 @@ private function getQuery(string $orderId = null)
             }
             ... on BundleShipmentItem {
                 bundle_options {
-                    id
                     label
                     values {
-                        id
                         product_name
                         product_sku
                         quantity
@@ -221,10 +264,14 @@ private function getQuery(string $orderId = null)
   }
 }
 QUERY;
-
-        return $query;
     }
 
+    /**
+     * Get model instance for order by number
+     *
+     * @param string $orderNumber
+     * @return Order
+     */
     private function fetchOrderModel(string $orderNumber): Order
     {
         /** @var Order $order */
@@ -232,4 +279,44 @@ private function fetchOrderModel(string $orderNumber): Order
         $order->loadByIncrementId($orderNumber);
         return $order;
     }
+
+    /**
+     * Create shipment for order
+     *
+     * @param string $orderNumber
+     */
+    private function shipOrder(string $orderNumber): void
+    {
+        $order = $this->fetchOrderModel($orderNumber);
+        $order->setIsInProcess(true);
+        /** @var Transaction $transaction */
+        $transaction = Bootstrap::getObjectManager()->create(Transaction::class);
+
+        $items = [];
+        foreach ($order->getItems() as $orderItem) {
+            $items[$orderItem->getId()] = $orderItem->getQtyOrdered();
+        }
+
+        $shipment = Bootstrap::getObjectManager()->get(ShipmentFactory::class)->create($order, $items);
+        $shipment->register();
+        $transaction->addObject($shipment)->addObject($order)->save();
+    }
+
+    /**
+     * Clean up orders
+     */
+    private function cleanupOrders()
+    {
+        $registry = Bootstrap::getObjectManager()->get(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);
+    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/Fixtures/CustomerPlaceOrder.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/Fixtures/CustomerPlaceOrder.php
new file mode 100644
index 0000000000000..2824597ce970b
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/Fixtures/CustomerPlaceOrder.php
@@ -0,0 +1,367 @@
+<?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\Integration\Api\CustomerTokenServiceInterface;
+use Magento\TestFramework\TestCase\GraphQl\Client;
+
+class CustomerPlaceOrder
+{
+    /**
+     * @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 placeOrderWithBundleProduct(array $customerLogin, array $productData): array
+    {
+        $this->customerLogin = $customerLogin;
+        $this->createCustomerCart();
+        $this->addBundleProduct($productData);
+        $this->setBillingAddress();
+        $shippingMethod = $this->setShippingAddress();
+        $paymentMethod = $this->setShippingMethod($shippingMethod);
+        $this->setPaymentMethod($paymentMethod);
+        return $this->doPlaceOrder();
+    }
+
+    /**
+     * Make GraphQl POST request
+     *
+     * @param $query
+     * @param array $additionalHeaders
+     * @return array
+     */
+    private function makeRequest($query, $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);
+    }
+
+    /**
+     * 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 array $paymentMethod
+     * @return array
+     */
+    private function setPaymentMethod(array $paymentMethod): array
+    {
+        $setPaymentMethod = <<<QUERY
+mutation {
+  setPaymentMethodOnCart(
+    input: {
+      cart_id: "{$this->getCartId()}"
+      payment_method: {
+        code: "{$paymentMethod['code']}"
+      }
+    }
+  ) {
+    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/RetrieveOrdersWithBundleProductByOrderNumberTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithBundleProductByOrderNumberTest.php
index f0a63b10b2a5b..7202456049fc9 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithBundleProductByOrderNumberTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithBundleProductByOrderNumberTest.php
@@ -7,12 +7,11 @@
 
 namespace Magento\GraphQl\Sales;
 
-use Magento\Bundle\Model\Selection;
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Catalog\Model\Product;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Exception\AuthenticationException;
 use Magento\GraphQl\GetCustomerAuthenticationHeader;
+use Magento\GraphQl\Sales\Fixtures\CustomerPlaceOrder;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Model\ResourceModel\Order\Collection;
 use Magento\TestFramework\Helper\Bootstrap;
@@ -45,6 +44,11 @@ protected function setUp():void
         $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
     }
 
+    protected function tearDown(): void
+    {
+        $this->deleteOrder();
+    }
+
     /**
      * Test customer order details with bundle product with child items
      *
@@ -53,19 +57,19 @@ protected function setUp():void
      */
     public function testGetCustomerOrderBundleProduct()
     {
+        //Place order with bundled product
         $qty = 1;
         $bundleSku = 'bundle-product-two-dropdown-options';
-        $optionsAndSelectionData = $this->getBundleOptionAndSelectionData($bundleSku);
+        /** @var CustomerPlaceOrder $bundleProductOrderFixture */
+        $bundleProductOrderFixture = Bootstrap::getObjectManager()->create(CustomerPlaceOrder::class);
+        $orderResponse = $bundleProductOrderFixture->placeOrderWithBundleProduct(
+            ['email' => 'customer@example.com', 'password' => 'password'],
+            ['sku' => $bundleSku, 'quantity' => $qty]
+        );
+        $orderNumber = $orderResponse['placeOrder']['order']['order_number'];
+        //End place order with bundled product
 
-        $cartId = $this->createEmptyCart();
-        $this->addBundleProductQuery($cartId, $qty, $bundleSku, $optionsAndSelectionData);
-        $this->setBillingAddress($cartId);
-        $shippingMethod = $this->setShippingAddress($cartId);
-        $paymentMethod = $this->setShippingMethod($cartId, $shippingMethod);
-        $this->setPaymentMethod($cartId, $paymentMethod);
-        $orderNumber = $this->placeOrder($cartId);
         $customerOrderResponse = $this->getCustomerOrderQueryBundleProduct($orderNumber);
-
         $customerOrderItems = $customerOrderResponse[0];
         $this->assertEquals("Pending", $customerOrderItems['status']);
         $bundledItemInTheOrder = $customerOrderItems['items'][0];
@@ -111,7 +115,6 @@ public function testGetCustomerOrderBundleProduct()
                 ],
             ];
         $this->assertEquals($expectedBundleOptions, $bundleOptionsFromResponse);
-        $this->deleteOrder();
     }
 
     /**
@@ -124,19 +127,19 @@ public function testGetCustomerOrderBundleProduct()
      */
     public function testGetCustomerOrderBundleProductWithTaxesAndDiscounts()
     {
+        //Place order with bundled product
         $qty = 4;
         $bundleSku = 'bundle-product-two-dropdown-options';
-        $optionsAndSelectionData = $this->getBundleOptionAndSelectionData($bundleSku);
+        /** @var CustomerPlaceOrder $bundleProductOrderFixture */
+        $bundleProductOrderFixture = Bootstrap::getObjectManager()->create(CustomerPlaceOrder::class);
+        $orderResponse = $bundleProductOrderFixture->placeOrderWithBundleProduct(
+            ['email' => 'customer@example.com', 'password' => 'password'],
+            ['sku' => $bundleSku, 'quantity' => $qty]
+        );
+        $orderNumber = $orderResponse['placeOrder']['order']['order_number'];
+        //End place order with bundled product
 
-        $cartId = $this->createEmptyCart();
-        $this->addBundleProductQuery($cartId, $qty, $bundleSku, $optionsAndSelectionData);
-        $this->setBillingAddress($cartId);
-        $shippingMethod = $this->setShippingAddress($cartId);
-        $paymentMethod = $this->setShippingMethod($cartId, $shippingMethod);
-        $this->setPaymentMethod($cartId, $paymentMethod);
-        $orderNumber = $this->placeOrder($cartId);
         $customerOrderResponse = $this->getCustomerOrderQueryBundleProduct($orderNumber);
-
         $customerOrderItems = $customerOrderResponse[0];
         $this->assertEquals("Pending", $customerOrderItems['status']);
 
@@ -160,7 +163,6 @@ public function testGetCustomerOrderBundleProductWithTaxesAndDiscounts()
         $this->assertEquals('simple1', $childItemsInTheOrder[0]['values'][0]['product_sku']);
         $this->assertEquals('simple2', $childItemsInTheOrder[1]['values'][0]['product_sku']);
         $this->assertTotalsOnBundleProductWithTaxesAndDiscounts($customerOrderItems['total']);
-        $this->deleteOrder();
     }
 
     /**
@@ -208,281 +210,6 @@ private function assertTotalsOnBundleProductWithTaxesAndDiscounts(array $custome
         $this->assertResponseFields($customerOrderItemTotal, $assertionMap);
     }
 
-    /**
-     * @return string
-     */
-    private function createEmptyCart(): string
-    {
-        $query = <<<QUERY
-mutation {
-  createEmptyCart
-}
-QUERY;
-        $currentEmail = 'customer@example.com';
-        $currentPassword = 'password';
-        $response = $this->graphQlMutation(
-            $query,
-            [],
-            '',
-            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
-        );
-        return $response['createEmptyCart'];
-    }
-
-    /**
-     *  Add bundle product to cart with Graphql query
-     *
-     * @param string $cartId
-     * @param float $qty
-     * @param string $sku
-     * @param array $optionsAndSelectionData
-     * @throws AuthenticationException
-     */
-    public function addBundleProductQuery(
-        string $cartId,
-        float $qty,
-        string $sku,
-        array $optionsAndSelectionData
-    ) {
-        $query = <<<QUERY
-mutation {
-  addBundleProductsToCart(input:{
-    cart_id:"{$cartId}"
-    cart_items:[
-      {
-        data:{
-          sku:"{$sku}"
-          quantity:$qty
-        }
-        bundle_options:[
-          {
-            id:$optionsAndSelectionData[0]
-            quantity:1
-            value:["{$optionsAndSelectionData[1]}"]
-          }
-          {
-            id:$optionsAndSelectionData[2]
-            quantity:2
-            value:["{$optionsAndSelectionData[3]}"]
-          }
-        ]
-      }
-    ]
-  }) {
-    cart {
-      items {quantity product {sku}}
-      }
-    }
-}
-QUERY;
-        $currentEmail = 'customer@example.com';
-        $currentPassword = 'password';
-        $response = $this->graphQlMutation(
-            $query,
-            [],
-            '',
-            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
-        );
-        $this->assertArrayHasKey('cart', $response['addBundleProductsToCart']);
-    }
-    /**
-     * @param string $cartId
-     * @param array $auth
-     * @return array
-     */
-    private function setBillingAddress(string $cartId): void
-    {
-        $query = <<<QUERY
-mutation {
-  setBillingAddressOnCart(
-    input: {
-      cart_id: "{$cartId}"
-      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;
-        $currentEmail = 'customer@example.com';
-        $currentPassword = 'password';
-        $this->graphQlMutation(
-            $query,
-            [],
-            '',
-            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
-        );
-    }
-
-    /**
-     * @param string $cartId
-     * @return array
-     */
-    private function setShippingAddress(string $cartId): array
-    {
-        $query = <<<QUERY
-mutation {
-  setShippingAddressesOnCart(
-    input: {
-      cart_id: "$cartId"
-      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;
-        $currentEmail = 'customer@example.com';
-        $currentPassword = 'password';
-        $response = $this->graphQlMutation(
-            $query,
-            [],
-            '',
-            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
-        );
-        $shippingAddress = current($response['setShippingAddressesOnCart']['cart']['shipping_addresses']);
-        $availableShippingMethod = current($shippingAddress['available_shipping_methods']);
-        return $availableShippingMethod;
-    }
-    /**
-     * @param string $cartId
-     * @param array $method
-     * @return array
-     */
-    private function setShippingMethod(string $cartId, array $method): array
-    {
-        $query = <<<QUERY
-mutation {
-  setShippingMethodsOnCart(input:  {
-    cart_id: "{$cartId}",
-    shipping_methods: [
-      {
-         carrier_code: "{$method['carrier_code']}"
-         method_code: "{$method['method_code']}"
-      }
-    ]
-  }) {
-    cart {
-      available_payment_methods {
-        code
-        title
-      }
-    }
-  }
-}
-QUERY;
-        $currentEmail = 'customer@example.com';
-        $currentPassword = 'password';
-        $response = $this->graphQlMutation(
-            $query,
-            [],
-            '',
-            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
-        );
-
-        $availablePaymentMethod = current($response['setShippingMethodsOnCart']['cart']['available_payment_methods']);
-        return $availablePaymentMethod;
-    }
-
-    /**
-     * @param string $cartId
-     * @param array $method
-     * @return void
-     */
-    private function setPaymentMethod(string $cartId, array $method): void
-    {
-        $query = <<<QUERY
-mutation {
-  setPaymentMethodOnCart(
-    input: {
-      cart_id: "{$cartId}"
-      payment_method: {
-        code: "{$method['code']}"
-      }
-    }
-  ) {
-    cart {selected_payment_method {code}}
-  }
-}
-QUERY;
-        $currentEmail = 'customer@example.com';
-        $currentPassword = 'password';
-        $this->graphQlMutation(
-            $query,
-            [],
-            '',
-            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
-        );
-    }
-
-    /**
-     * @param string $cartId
-     * @return string
-     */
-    private function placeOrder(string $cartId): string
-    {
-        $query = <<<QUERY
-mutation {
-  placeOrder(
-    input: {
-      cart_id: "{$cartId}"
-    }
-  ) {
-    order {
-      order_number
-    }
-  }
-}
-QUERY;
-        $currentEmail = 'customer@example.com';
-        $currentPassword = 'password';
-        $response = $this->graphQlMutation(
-            $query,
-            [],
-            '',
-            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
-        );
-        return $response['placeOrder']['order']['order_number'];
-    }
-
     /**
      * Get customer order query for bundle order items
      *
@@ -576,37 +303,10 @@ private function deleteOrder(): void
 
         /** @var $order \Magento\Sales\Model\Order */
         $orderCollection = Bootstrap::getObjectManager()->create(Collection::class);
-        //$orderCollection = $this->orderCollectionFactory->create();
         foreach ($orderCollection as $order) {
             $this->orderRepository->delete($order);
         }
         $registry->unregister('isSecureArea');
         $registry->register('isSecureArea', false);
     }
-
-    /**
-     * @param string $bundleSku
-     * @return array
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
-     */
-    private function getBundleOptionAndSelectionData($bundleSku): array
-    {
-        /** @var Product $bundleProduct */
-        $bundleProduct = $this->productRepository->get($bundleSku);
-        /** @var $typeInstance \Magento\Bundle\Model\Product\Type */
-        $typeInstance = $bundleProduct->getTypeInstance();
-        $optionsAndSelections = [];
-        /** @var $option \Magento\Bundle\Model\Option */
-        $option1 = $typeInstance->getOptionsCollection($bundleProduct)->getFirstItem();
-        $option2 = $typeInstance->getOptionsCollection($bundleProduct)->getLastItem();
-        $optionId1 =(int) $option1->getId();
-        $optionId2 =(int) $option2->getId();
-        /** @var Selection $selection */
-        $selection1 = $typeInstance->getSelectionsCollection([$option1->getId()], $bundleProduct)->getFirstItem();
-        $selectionId1 = (int)$selection1->getSelectionId();
-        $selection2 = $typeInstance->getSelectionsCollection([$option2->getId()], $bundleProduct)->getLastItem();
-        $selectionId2 = (int)$selection2->getSelectionId();
-        array_push($optionsAndSelections, $optionId1, $selectionId1, $optionId2, $selectionId2);
-        return $optionsAndSelections;
-    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/_files/customer_place_order_with_bundle_product.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/_files/customer_place_order_with_bundle_product.php
deleted file mode 100644
index d61046e5d9bc5..0000000000000
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/_files/customer_place_order_with_bundle_product.php
+++ /dev/null
@@ -1,233 +0,0 @@
-<?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\GraphQl\GetCustomerAuthenticationHeader;
-use Magento\TestFramework\Helper\Bootstrap;
-use Magento\TestFramework\TestCase\GraphQl\Client;
-
-//Customer and product should be created using @magentoApiDataFixture annotations in test
-
-$customerAuthHeader = Bootstrap::getObjectManager()->get(GetCustomerAuthenticationHeader::class);
-$productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
-$bundleSku = 'bundle-product-two-dropdown-options';
-$auth = $customerAuthHeader->execute('customer@example.com', 'password');
-$headers = [
-    sprintf('%s: %s', array_keys($auth)[0], $auth[array_keys($auth)[0]])
-];
-
-/** @var Client $graphQlClient */
-$graphQlClient = Bootstrap::getObjectManager()->get(Client::class);
-
-//Create empty cart
-$createEmptyCart = <<<QUERY
-mutation {
-  createEmptyCart
-}
-QUERY;
-$result = $graphQlClient->post($createEmptyCart, [], '', $headers);
-$cartId = $result['createEmptyCart'];
-
-//Add bundle product
-$qty = 2;
-/** @var Product $bundleProduct */
-$bundleProduct = $productRepository->get($bundleSku);
-/** @var $typeInstance \Magento\Bundle\Model\Product\Type */
-$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:"{$cartId}"
-    cart_items:[
-      {
-        data:{
-          sku:"{$bundleSku}"
-          quantity:{$qty}
-        }
-        bundle_options:[
-          {
-            id:{$optionId1}
-            quantity:1
-            value:["{$selectionId1}"]
-          }
-          {
-            id:$optionId2
-            quantity:2
-            value:["{$selectionId2}"]
-          }
-        ]
-      }
-    ]
-  }) {
-    cart {
-      items {quantity product {sku}}
-      }
-    }
-}
-QUERY;
-$result = $graphQlClient->post($addProduct, [], '', $headers);
-
-//Set billing Address
-$setBillingAddress = <<<QUERY
-mutation {
-  setBillingAddressOnCart(
-    input: {
-      cart_id: "{$cartId}"
-      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;
-$result = $graphQlClient->post($setBillingAddress, [], '', $headers);
-
-//Set shipping address
-$setShippingAddress = <<<QUERY
-mutation {
-  setShippingAddressesOnCart(
-    input: {
-      cart_id: "$cartId"
-      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 = $graphQlClient->post($setShippingAddress, [], '', $headers);
-$shippingMethod = $result['setShippingAddressesOnCart']['cart']['shipping_addresses'][0]['available_shipping_methods'][0];
-
-//Set shipping method
-$setShippingMethod = <<<QUERY
-mutation {
-  setShippingMethodsOnCart(input:  {
-    cart_id: "{$cartId}",
-    shipping_methods: [
-      {
-         carrier_code: "{$shippingMethod['carrier_code']}"
-         method_code: "{$shippingMethod['method_code']}"
-      }
-    ]
-  }) {
-    cart {
-      available_payment_methods {
-        code
-        title
-      }
-    }
-  }
-}
-QUERY;
-$result = $graphQlClient->post($setShippingMethod, [], '', $headers);
-$paymentMethod = $result['setShippingMethodsOnCart']['cart']['available_payment_methods'][0];
-
-//Set payment method
-$setPaymentMethod = <<<QUERY
-mutation {
-  setPaymentMethodOnCart(
-    input: {
-      cart_id: "{$cartId}"
-      payment_method: {
-        code: "{$paymentMethod['code']}"
-      }
-    }
-  ) {
-    cart {
-      selected_payment_method {
-        code
-      }
-    }
-  }
-}
-QUERY;
-$result = $graphQlClient->post($setPaymentMethod, [], '', $headers);
-
-//Place order
-$placeOrder = <<<QUERY
-mutation {
-  placeOrder(
-    input: {
-      cart_id: "{$cartId}"
-    }
-  ) {
-    order {
-      order_number
-    }
-  }
-}
-QUERY;
-$result = $graphQlClient->post($placeOrder, [], '', $headers);
-
-
-    /**
-     * @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(Collection::class);
-//        //$orderCollection = $this->orderCollectionFactory->create();
-//        foreach ($orderCollection as $order) {
-//            $this->orderRepository->delete($order);
-//        }
-//        $registry->unregister('isSecureArea');
-//        $registry->register('isSecureArea', false);
-//    }

From 8339eae08d4a86b7d26bd390f0d5a6ad8d1feec6 Mon Sep 17 00:00:00 2001
From: Krissy Hiserote <khiserote@magento.com>
Date: Mon, 27 Jul 2020 17:13:32 -0500
Subject: [PATCH 1061/1718] MC-32014: Remove google-shopping-ads module from
 core in 2.4.1

- fix merge conflict
---
 .../Magento/Setup/Console/Command/UpgradeCommand.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php b/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
index af25466fa141d..10a2ffa05a796 100644
--- a/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
@@ -11,6 +11,7 @@
 use Magento\Framework\App\State as AppState;
 use Magento\Framework\Console\Cli;
 use Magento\Framework\Exception\RuntimeException;
+use Magento\Framework\Config\CacheInterface;
 use Magento\Framework\Setup\ConsoleLogger;
 use Magento\Framework\Setup\Declaration\Schema\DryRunLogger;
 use Magento\Framework\Setup\Declaration\Schema\OperationsExecutor;
@@ -54,22 +55,30 @@ class UpgradeCommand extends AbstractSetupCommand
      */
     private $searchConfigFactory;
 
+    /*
+     * @var CacheInterface
+     */
+    private $cache;
+
     /**
      * @param InstallerFactory $installerFactory
      * @param SearchConfigFactory $searchConfigFactory
      * @param DeploymentConfig $deploymentConfig
      * @param AppState|null $appState
+     * @param CacheInterface|null $cache
      */
     public function __construct(
         InstallerFactory $installerFactory,
         SearchConfigFactory $searchConfigFactory,
         DeploymentConfig $deploymentConfig = null,
-        AppState $appState = null
+        AppState $appState = null,
+        CacheInterface $cache = null
     ) {
         $this->installerFactory = $installerFactory;
         $this->searchConfigFactory = $searchConfigFactory;
         $this->deploymentConfig = $deploymentConfig ?: ObjectManager::getInstance()->get(DeploymentConfig::class);
         $this->appState = $appState ?: ObjectManager::getInstance()->get(AppState::class);
+        $this->cache = $cache ?: ObjectManager::getInstance()->get(CacheInterface::class);
         parent::__construct();
     }
 
@@ -131,6 +140,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $installer = $this->installerFactory->create(new ConsoleLogger($output));
             $installer->updateModulesSequence($keepGenerated);
             $searchConfig = $this->searchConfigFactory->create();
+            $this->cache->clean();
             $searchConfig->validateSearchEngine();
             $installer->removeUnusedTriggers();
             $installer->installSchema($request);

From be83e05e8603b12acd670fdf76067bedf934eb18 Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Mon, 27 Jul 2020 17:25:11 -0500
Subject: [PATCH 1062/1718] MC-20638: MyAccount :: Order Details :: Shipping
 Details by Order Number

---
 .../Shipment/BundleShipmentItemFormatter.php  |  19 ++-
 .../Resolver/Order/Item/BundleOptions.php     |   2 +-
 .../Model/InvoiceItemTypeResolver.php         |   7 +-
 .../Model/OrderItemTypeResolver.php           |   9 +-
 .../Model/Resolver/Shipment/ShipmentItems.php |   1 -
 .../SalesGraphQl/Model/Resolver/Shipments.php |   1 -
 .../Shipment/Item/ShipmentItemFormatter.php   |   3 +
 .../Model/Shipment/ItemProvider.php           |   2 +
 .../_files/order_with_bundle_and_shipment.php | 114 ------------------
 ...rder_with_bundle_and_shipment_rollback.php |  10 --
 10 files changed, 36 insertions(+), 132 deletions(-)
 delete mode 100644 dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle_and_shipment.php
 delete mode 100644 dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle_and_shipment_rollback.php

diff --git a/app/code/Magento/BundleGraphQl/Model/Order/Shipment/BundleShipmentItemFormatter.php b/app/code/Magento/BundleGraphQl/Model/Order/Shipment/BundleShipmentItemFormatter.php
index 8a73192ddab71..8e678cdb12d24 100644
--- a/app/code/Magento/BundleGraphQl/Model/Order/Shipment/BundleShipmentItemFormatter.php
+++ b/app/code/Magento/BundleGraphQl/Model/Order/Shipment/BundleShipmentItemFormatter.php
@@ -10,17 +10,34 @@
 use Magento\Catalog\Model\Product\Type\AbstractType;
 use Magento\Sales\Api\Data\ShipmentInterface;
 use Magento\Sales\Api\Data\ShipmentItemInterface;
+use Magento\SalesGraphQl\Model\Shipment\Item\ShipmentItemFormatter;
 use Magento\SalesGraphQl\Model\Shipment\Item\FormatterInterface;
 
+/**
+ * Format Bundle shipment items for GraphQl output
+ */
 class BundleShipmentItemFormatter implements FormatterInterface
 {
+    /**
+     * @var ShipmentItemFormatter
+     */
     private $itemFormatter;
 
-    public function __construct(FormatterInterface $itemFormatter)
+    /**
+     * @param ShipmentItemFormatter $itemFormatter
+     */
+    public function __construct(ShipmentItemFormatter $itemFormatter)
     {
         $this->itemFormatter = $itemFormatter;
     }
 
+    /**
+     * Format bundle product shipment item
+     *
+     * @param ShipmentInterface $shipment
+     * @param ShipmentItemInterface $item
+     * @return array|null
+     */
     public function formatShipmentItem(ShipmentInterface $shipment, ShipmentItemInterface $item): ?array
     {
         $orderItem = $item->getOrderItem();
diff --git a/app/code/Magento/BundleGraphQl/Model/Resolver/Order/Item/BundleOptions.php b/app/code/Magento/BundleGraphQl/Model/Resolver/Order/Item/BundleOptions.php
index de83f9fc1e170..8af5361db1039 100644
--- a/app/code/Magento/BundleGraphQl/Model/Resolver/Order/Item/BundleOptions.php
+++ b/app/code/Magento/BundleGraphQl/Model/Resolver/Order/Item/BundleOptions.php
@@ -61,7 +61,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
                 return $this->getBundleOptions($item, $value);
             }
             if ($value['model'] instanceof InvoiceItemInterface || $value['model'] instanceof ShipmentItemInterface) {
-                /** @var InvoiceItemInterface $item */
+                /** @var InvoiceItemInterface|ShipmentItemInterface $item */
                 $item = $value['model'];
                 // Have to pass down order and item to map to avoid refetching all data
                 return $this->getBundleOptions($item->getOrderItem(), $value);
diff --git a/app/code/Magento/SalesGraphQl/Model/InvoiceItemTypeResolver.php b/app/code/Magento/SalesGraphQl/Model/InvoiceItemTypeResolver.php
index 2e1b991e91775..05d234d64ad96 100644
--- a/app/code/Magento/SalesGraphQl/Model/InvoiceItemTypeResolver.php
+++ b/app/code/Magento/SalesGraphQl/Model/InvoiceItemTypeResolver.php
@@ -20,6 +20,9 @@ class InvoiceItemTypeResolver implements TypeResolverInterface
      */
     private $productTypeMap;
 
+    /**
+     * @param array $productTypeMap
+     */
     public function __construct($productTypeMap = [])
     {
         $this->productTypeMap = $productTypeMap;
@@ -31,9 +34,7 @@ public function __construct($productTypeMap = [])
     public function resolveType(array $data): string
     {
         if (!isset($data['product_type'])) {
-            throw new GraphQlInputException(
-                __('Missing key %1 in sales item data', ['product_type'])
-            );
+            throw new GraphQlInputException(__('Missing key %1 in sales item data', ['product_type']));
         }
         if (isset($this->productTypeMap[$data['product_type']])) {
             return $this->productTypeMap[$data['product_type']];
diff --git a/app/code/Magento/SalesGraphQl/Model/OrderItemTypeResolver.php b/app/code/Magento/SalesGraphQl/Model/OrderItemTypeResolver.php
index a5360572c54e9..a2d57deaeba72 100644
--- a/app/code/Magento/SalesGraphQl/Model/OrderItemTypeResolver.php
+++ b/app/code/Magento/SalesGraphQl/Model/OrderItemTypeResolver.php
@@ -15,9 +15,16 @@
  */
 class OrderItemTypeResolver implements TypeResolverInterface
 {
+    /**
+     * @var array
+     */
     private $productTypeMap;
 
-    public function __construct(array $productTypeMap = []){
+    /**
+     * @param array $productTypeMap
+     */
+    public function __construct(array $productTypeMap = [])
+    {
         $this->productTypeMap = $productTypeMap;
     }
 
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/Shipment/ShipmentItems.php b/app/code/Magento/SalesGraphQl/Model/Resolver/Shipment/ShipmentItems.php
index a011bddc5cb6c..dceb2848bda5b 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/Shipment/ShipmentItems.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/Shipment/ShipmentItems.php
@@ -11,7 +11,6 @@
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\ShipmentInterface;
 use Magento\SalesGraphQl\Model\Shipment\ItemProvider;
 
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/Shipments.php b/app/code/Magento/SalesGraphQl/Model/Resolver/Shipments.php
index 8d70c5d8f3e99..8b6aaad09c304 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/Shipments.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/Shipments.php
@@ -13,7 +13,6 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Sales\Api\Data\ShipmentInterface;
 use Magento\Sales\Model\Order;
-use Magento\Sales\Model\Order\Shipment;
 
 /**
  * Resolve shipment information for order
diff --git a/app/code/Magento/SalesGraphQl/Model/Shipment/Item/ShipmentItemFormatter.php b/app/code/Magento/SalesGraphQl/Model/Shipment/Item/ShipmentItemFormatter.php
index edb33e04fc5d0..e8ba6e5f784ec 100644
--- a/app/code/Magento/SalesGraphQl/Model/Shipment/Item/ShipmentItemFormatter.php
+++ b/app/code/Magento/SalesGraphQl/Model/Shipment/Item/ShipmentItemFormatter.php
@@ -10,6 +10,9 @@
 use Magento\Sales\Api\Data\ShipmentInterface;
 use Magento\Sales\Api\Data\ShipmentItemInterface;
 
+/**
+ * Format shipment item for GraphQl output
+ */
 class ShipmentItemFormatter implements FormatterInterface
 {
     /**
diff --git a/app/code/Magento/SalesGraphQl/Model/Shipment/ItemProvider.php b/app/code/Magento/SalesGraphQl/Model/Shipment/ItemProvider.php
index 8e4beb4f1ac21..49f8e3b119da2 100644
--- a/app/code/Magento/SalesGraphQl/Model/Shipment/ItemProvider.php
+++ b/app/code/Magento/SalesGraphQl/Model/Shipment/ItemProvider.php
@@ -49,6 +49,8 @@ public function getItemData(ShipmentInterface $shipment): array
     }
 
     /**
+     * Format individual shipment item
+     *
      * @param ShipmentInterface $shipment
      * @param ShipmentItemInterface $shipmentItem
      * @return array|null
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle_and_shipment.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle_and_shipment.php
deleted file mode 100644
index be1b6b29a776b..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle_and_shipment.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-use Magento\Sales\Api\Data\OrderInterfaceFactory;
-use Magento\Sales\Api\Data\OrderItemInterface;
-use Magento\Sales\Api\OrderRepositoryInterface;
-use Magento\Sales\Model\Order;
-use Magento\Sales\Model\Order\Item;
-use Magento\Sales\Model\Order\ShipmentFactory;
-use Magento\TestFramework\ObjectManager;
-use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
-use Magento\Framework\DB\Transaction;
-
-Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/order_with_customer.php');
-
-$objectManager = ObjectManager::getInstance();
-/** @var Order $order */
-$order = $objectManager->get(OrderInterfaceFactory::class)->create()->loadByIncrementId('100000001');
-
-$orderItems = [
-    [
-        OrderItemInterface::SKU => 'bundle_1',
-        OrderItemInterface::NAME => 'bundle_1',
-        OrderItemInterface::PRODUCT_ID => 2,
-        OrderItemInterface::BASE_PRICE => 100,
-        OrderItemInterface::ORDER_ID => $order->getId(),
-        OrderItemInterface::QTY_ORDERED => 2,
-        OrderItemInterface::PRICE => 100,
-        OrderItemInterface::ROW_TOTAL => 102,
-        OrderItemInterface::PRODUCT_TYPE => 'bundle',
-        'product_options' => [
-            'product_calculations' => 0,
-            'shipment_type' => 0,
-            "bundle_options"=> [
-                "1" => [
-                    "option_id"=> "1",
-                    "label" => "Bundle Option 1",
-                    "value" => [
-                        [
-                            "title" => "bundle_simple_1",
-                            "qty" => 1,
-                            "price" => 10
-                        ]
-                    ]
-                ],
-            ],
-        ],
-        'children' => [
-            [
-                OrderItemInterface::SKU => 'bundle_simple_1',
-                OrderItemInterface::NAME => 'bundle_simple_1',
-                OrderItemInterface::PRODUCT_ID => 13,
-                OrderItemInterface::ORDER_ID => $order->getId(),
-                OrderItemInterface::QTY_ORDERED => 10,
-                OrderItemInterface::BASE_PRICE => 90,
-                OrderItemInterface::PRICE => 90,
-                OrderItemInterface::ROW_TOTAL => 92,
-                OrderItemInterface::PRODUCT_TYPE => 'simple',
-                'product_options' => [
-                    'bundle_selection_attributes' => '{"qty":5}',
-                ],
-            ],
-        ],
-    ],
-];
-
-if (!function_exists('saveOrderItems')) {
-    /**
-     * Save Order Items.
-     *
-     * @param array $orderItems
-     * @param Order $order
-     * @param Item|null $parentOrderItem [optional]
-     * @return void
-     */
-    function saveOrderItems(array $orderItems, Order $order, $parentOrderItem = null)
-    {
-        $objectManager = ObjectManager::getInstance();
-
-        foreach ($orderItems as $orderItemData) {
-            /** @var Item $orderItem */
-            $orderItem = $objectManager->create(Item::class);
-            if (null !== $parentOrderItem) {
-                $orderItemData['parent_item'] = $parentOrderItem;
-            }
-            $orderItem->setData($orderItemData);
-            $order->addItem($orderItem);
-
-            if (isset($orderItemData['children'])) {
-                saveOrderItems($orderItemData['children'], $order, $orderItem);
-            }
-        }
-    }
-}
-
-saveOrderItems($orderItems, $order);
-/** @var OrderRepositoryInterface $orderRepository */
-$orderRepository = $objectManager->get(OrderRepositoryInterface::class);
-$order = $orderRepository->save($order);
-
-$shipmentItems = [];
-foreach ($order->getItems() as $orderItem) {
-    $shipmentItems[$orderItem->getId()] = $orderItem->getQtyOrdered();
-}
-$shipment = $objectManager->get(ShipmentFactory::class)->create($order, $shipmentItems);
-$shipment->register();
-
-/** @var Transaction $transaction */
-$transaction = $objectManager->create(Transaction::class);
-$transaction->addObject($shipment)->addObject($order)->save();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle_and_shipment_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle_and_shipment_rollback.php
deleted file mode 100644
index 07d468289f5b4..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_bundle_and_shipment_rollback.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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');

From 605d847e997a8ab9177b0cd48474984f56706628 Mon Sep 17 00:00:00 2001
From: dnyomo <dnyomo@briteskies.com>
Date: Mon, 27 Jul 2020 20:21:52 -0400
Subject: [PATCH 1063/1718] Added a filter to sort categories by position by
 default

---
 .../Magento/CatalogGraphQl/Model/Category/CategoryFilter.php    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Category/CategoryFilter.php b/app/code/Magento/CatalogGraphQl/Model/Category/CategoryFilter.php
index 1fae247c981d2..dc93005983776 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Category/CategoryFilter.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Category/CategoryFilter.php
@@ -13,6 +13,7 @@
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\Resolver\Argument\SearchCriteria\ArgumentApplier\Filter;
+use Magento\Framework\GraphQl\Query\Resolver\Argument\SearchCriteria\ArgumentApplier\Sort;
 use Magento\Search\Model\Query;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\ScopeInterface;
@@ -71,6 +72,7 @@ public function getResult(array $criteria, StoreInterface $store)
         $categoryIds = [];
         $criteria[Filter::ARGUMENT_NAME] = $this->formatMatchFilters($criteria['filters'], $store);
         $criteria[Filter::ARGUMENT_NAME][CategoryInterface::KEY_IS_ACTIVE] = ['eq' => 1];
+        $criteria[Sort::ARGUMENT_NAME][CategoryInterface::KEY_POSITION] = ['ASC'];
         $searchCriteria = $this->searchCriteriaBuilder->build('categoryList', $criteria);
         $pageSize = $criteria['pageSize'] ?? 20;
         $currentPage = $criteria['currentPage'] ?? 1;

From 4f4c54286a2eafc01c76c76e2adb5ee33afac68e Mon Sep 17 00:00:00 2001
From: DianaRusin <rusind95@gmail.com>
Date: Tue, 28 Jul 2020 10:02:16 +0300
Subject: [PATCH 1064/1718] MC-33747: [MFTF] Flaky
 StorefrontButtonsInlineTranslationTest

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

diff --git a/app/code/Magento/Translation/Test/Mftf/Test/StorefrontButtonsInlineTranslationTest.xml b/app/code/Magento/Translation/Test/Mftf/Test/StorefrontButtonsInlineTranslationTest.xml
index 3f2f4515d7d68..b57d198dfc570 100644
--- a/app/code/Magento/Translation/Test/Mftf/Test/StorefrontButtonsInlineTranslationTest.xml
+++ b/app/code/Magento/Translation/Test/Mftf/Test/StorefrontButtonsInlineTranslationTest.xml
@@ -43,7 +43,7 @@
         <!-- Add product to cart on storefront -->
         <amOnPage url="{{StorefrontProductPage.url($createProduct.custom_attributes[url_key]$)}}" stepKey="goToProductPage"/>
         <waitForPageLoad stepKey="waitForProductPageLoad"/>
-        <seeElement selector="{{StorefrontProductActionSection.addToCartEnabledWithTranslation}}" stepKey="waitForAddToCartButtonEnabled"/>
+        <waitForElementVisible selector="{{StorefrontProductActionSection.addToCartEnabledWithTranslation}}" stepKey="waitForAddToCartButtonEnabled"/>
         <actionGroup ref="AddToCartFromStorefrontProductPageActionGroup" stepKey="addProductToCart">
             <argument name="productName" value="$createProduct.name$"/>
         </actionGroup>

From d043a79035a49e5ed19dfff9c6bb395fb6136d1d Mon Sep 17 00:00:00 2001
From: Viktor Sevch <viktor.sevch@transoftgroup.com>
Date: Tue, 28 Jul 2020 10:44:56 +0300
Subject: [PATCH 1065/1718] =?UTF-8?q?MC-35296:=20Refresh=20buttons=20of=20?=
 =?UTF-8?q?=E2=80=9CCustomer's=20Activities=E2=80=9D=20dont=20work?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../view/adminhtml/templates/order/create/sidebar/items.phtml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
index dd5a2e4771a7e..df9ee09fa1a4d 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
@@ -21,7 +21,7 @@
         'onclick',
         "order.loadArea('sidebar_" . $block->escapeJs($block->getDataId()) .
         "', 'sidebar_data_" . $block->escapeJs($block->getDataId()) . "');event.preventDefault();",
-        'div.head.sidebar-title-block'
+        'div#sidebar_data_'. $block->escapeJs($block->getDataId()) . ' div.head.sidebar-title-block'
     ) ?>
     <div class="content">
         <div class="auto-scroll">

From 56fee0faf1d6a6cd96ada227c36e237de14787c4 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Tue, 28 Jul 2020 10:58:59 +0300
Subject: [PATCH 1066/1718] MC-35550: Persistent Shopping Cart - Clear
 Persistence on Sign Out - Not working

---
 .../SynchronizePersistentOnLoginObserver.php  |  8 +-
 ...nchronizePersistentOnLoginObserverTest.php | 88 ++++++++++++++-----
 2 files changed, 71 insertions(+), 25 deletions(-)

diff --git a/app/code/Magento/Persistent/Observer/SynchronizePersistentOnLoginObserver.php b/app/code/Magento/Persistent/Observer/SynchronizePersistentOnLoginObserver.php
index 52a2912c4b170..f0b05cb7850cc 100644
--- a/app/code/Magento/Persistent/Observer/SynchronizePersistentOnLoginObserver.php
+++ b/app/code/Magento/Persistent/Observer/SynchronizePersistentOnLoginObserver.php
@@ -11,6 +11,9 @@
 
 /**
  * Persistent Session Observer
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class SynchronizePersistentOnLoginObserver implements ObserverInterface
 {
@@ -63,6 +66,8 @@ public function __construct(
     }
 
     /**
+     * Synchronize persistent session data with logged in customer
+     *
      * @param Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
@@ -96,8 +101,9 @@ public function execute(Observer $observer)
             if (!$sessionModel->getId()) {
                 /** @var \Magento\Persistent\Model\Session $sessionModel */
                 $sessionModel = $this->_sessionFactory->create();
-                $sessionModel->setCustomerId($customer->getId())->save();
+                $sessionModel->setCustomerId($customer->getId());
             }
+            $sessionModel->save();
             $this->_persistentSession->setSession($sessionModel);
         }
 
diff --git a/dev/tests/integration/testsuite/Magento/Persistent/Observer/SynchronizePersistentOnLoginObserverTest.php b/dev/tests/integration/testsuite/Magento/Persistent/Observer/SynchronizePersistentOnLoginObserverTest.php
index c2e499c455983..35f2283494b1c 100644
--- a/dev/tests/integration/testsuite/Magento/Persistent/Observer/SynchronizePersistentOnLoginObserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Persistent/Observer/SynchronizePersistentOnLoginObserverTest.php
@@ -3,20 +3,35 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Persistent\Observer;
 
+use DateTime;
+use DateTimeZone;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Framework\Event;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Persistent\Model\Session;
+use Magento\Persistent\Model\SessionFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
 /**
  * @magentoDataFixture Magento/Customer/_files/customer.php
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class SynchronizePersistentOnLoginObserverTest extends \PHPUnit\Framework\TestCase
+class SynchronizePersistentOnLoginObserverTest extends TestCase
 {
     /**
-     * @var \Magento\Persistent\Observer\SynchronizePersistentOnLoginObserver
+     * @var SynchronizePersistentOnLoginObserver
      */
     protected $_model;
 
     /**
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var ObjectManagerInterface
      */
     protected $_objectManager;
 
@@ -30,45 +45,70 @@ class SynchronizePersistentOnLoginObserverTest extends \PHPUnit\Framework\TestCa
      */
     protected $_customerSession;
 
+    /**
+     * @var CustomerInterface
+     */
+    private $customer;
+
+    /**
+     * @inheritDoc
+     */
     protected function setUp(): void
     {
-        $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->_objectManager = Bootstrap::getObjectManager();
         $this->_persistentSession = $this->_objectManager->get(\Magento\Persistent\Helper\Session::class);
         $this->_customerSession = $this->_objectManager->get(\Magento\Customer\Model\Session::class);
         $this->_model = $this->_objectManager->create(
-            \Magento\Persistent\Observer\SynchronizePersistentOnLoginObserver::class,
+            SynchronizePersistentOnLoginObserver::class,
             [
                 'persistentSession' => $this->_persistentSession,
                 'customerSession' => $this->_customerSession
             ]
         );
+        /** @var CustomerRepositoryInterface $customerRepository */
+        $customerRepository = $this->_objectManager->create(CustomerRepositoryInterface::class);
+        $this->customer = $customerRepository->getById(1);
     }
 
     /**
-     * @covers \Magento\Persistent\Observer\SynchronizePersistentOnLoginObserver::execute
+     * Test that persistent session is created on customer login
      */
-    public function testSynchronizePersistentOnLogin()
+    public function testSynchronizePersistentOnLogin(): void
     {
-        $event = new \Magento\Framework\Event();
-        $observer = new \Magento\Framework\Event\Observer(['event' => $event]);
-
-        /** @var \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository */
-        $customerRepository = $this->_objectManager->create(
-            \Magento\Customer\Api\CustomerRepositoryInterface::class
-        );
-
-        /** @var $customer \Magento\Customer\Api\Data\CustomerInterface */
-        $customer = $customerRepository->getById(1);
-        $event->setData('customer', $customer);
+        $sessionModel = $this->_objectManager->create(Session::class);
+        $sessionModel->loadByCustomerId($this->customer->getId());
+        $this->assertNull($sessionModel->getCustomerId());
+        $event = new Event();
+        $observer = new Observer(['event' => $event]);
+        $event->setData('customer', $this->customer);
         $this->_persistentSession->setRememberMeChecked(true);
         $this->_model->execute($observer);
-
         // check that persistent session has been stored for Customer
-        /** @var \Magento\Persistent\Model\Session $sessionModel */
-        $sessionModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Persistent\Model\Session::class
-        );
+        /** @var Session $sessionModel */
+        $sessionModel = $this->_objectManager->create(Session::class);
+        $sessionModel->loadByCustomerId($this->customer->getId());
+        $this->assertEquals($this->customer->getId(), $sessionModel->getCustomerId());
+    }
+
+    /**
+     * Test that expired persistent session is renewed on customer login
+     */
+    public function testExpiredPersistentSessionShouldBeRenewedOnLogin(): void
+    {
+        $lastUpdatedAt = (new DateTime('-1day'))->setTimezone(new DateTimeZone('UTC'))->format('Y-m-d H:i:s');
+        /** @var Session $sessionModel */
+        $sessionModel = $this->_objectManager->create(SessionFactory::class)->create();
+        $sessionModel->setCustomerId($this->customer->getId());
+        $sessionModel->setUpdatedAt($lastUpdatedAt);
+        $sessionModel->save();
+        $event = new Event();
+        $observer = new Observer(['event' => $event]);
+        $event->setData('customer', $this->customer);
+        $this->_persistentSession->setRememberMeChecked(true);
+        $this->_model->execute($observer);
+        /** @var Session $sessionModel */
+        $sessionModel = $this->_objectManager->create(Session::class);
         $sessionModel->loadByCustomerId(1);
-        $this->assertEquals(1, $sessionModel->getCustomerId());
+        $this->assertGreaterThan($lastUpdatedAt, $sessionModel->getUpdatedAt());
     }
 }

From aeccbe5ec1d4c5cee1ab7ee291efd9b25253ea8a Mon Sep 17 00:00:00 2001
From: Ivan Gerchak <ivang@ven.com>
Date: Mon, 27 Jul 2020 12:57:45 +0300
Subject: [PATCH 1067/1718] Add back extension point for adding some html to
 the category page #29286

---
 .../frontend/templates/product/list.phtml     | 55 ++++++++++++-------
 .../templates/product/listing/renderer.phtml  | 14 +++--
 2 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
index 7803293e0d4b4..f4cd50b45d246 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
@@ -8,6 +8,8 @@ use Magento\Framework\App\Action\Action;
 ?>
 <?php
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundHelper
+// phpcs:disable Generic.Files.LineLength.TooLong
 
 /**
  * Product list template
@@ -21,13 +23,15 @@ $_productCollection = $block->getLoadedProductCollection();
 /** @var \Magento\Catalog\Helper\Output $_helper */
 $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
 ?>
-<?php if (!$_productCollection->count()) :?>
-    <div class="message info empty"><div><?= $escaper->escapeHtml(__('We can\'t find products matching the selection.')) ?></div></div>
-<?php else :?>
+<?php if (!$_productCollection->count()): ?>
+    <div class="message info empty">
+        <div><?= $escaper->escapeHtml(__('We can\'t find products matching the selection.')) ?></div>
+    </div>
+<?php else: ?>
     <?= $block->getToolbarHtml() ?>
     <?= $block->getAdditionalHtml() ?>
     <?php
-    if ($block->getMode() == 'grid') {
+    if ($block->getMode() === 'grid') {
         $viewMode = 'grid';
         $imageDisplayArea = 'category_page_grid';
         $showDescription = false;
@@ -46,7 +50,7 @@ $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
     <div class="products wrapper <?= /* @noEscape */ $viewMode ?> products-<?= /* @noEscape */ $viewMode ?>">
         <ol class="products list items product-items">
             <?php /** @var $_product \Magento\Catalog\Model\Product */ ?>
-            <?php foreach ($_productCollection as $_product) :?>
+            <?php foreach ($_productCollection as $_product): ?>
             <li class="item product product-item">
                 <div class="product-item-info" data-container="product-<?= /* @noEscape */ $viewMode ?>">
                     <?php
@@ -63,13 +67,15 @@ $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
                         <?= $productImage->toHtml() ?>
                     </a>
                     <div class="product details product-item-details">
-                        <?php
-                            $_productNameStripped = $block->stripTags($_product->getName(), null, true);
-                        ?>
+                        <?php $_productNameStripped = $block->stripTags($_product->getName(), null, true); ?>
                         <strong class="product name product-item-name">
                             <a class="product-item-link"
                                href="<?= $escaper->escapeUrl($_product->getProductUrl()) ?>">
-                                <?= /* @noEscape */ $_helper->productAttribute($_product, $_product->getName(), 'name') ?>
+                                <?= /* @noEscape */ $_helper->productAttribute(
+                                    $_product,
+                                    $_product->getName(),
+                                    'name'
+                                ) ?>
                             </a>
                         </strong>
                         <?= $block->getReviewsSummaryHtml($_product, $templateType) ?>
@@ -79,7 +85,7 @@ $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
                         <div class="product-item-inner">
                             <div class="product actions product-item-actions"<?= strpos($pos, $viewMode . '-actions') ? $escaper->escapeHtmlAttr($position) : '' ?>>
                                 <div class="actions-primary"<?= strpos($pos, $viewMode . '-primary') ? $escaper->escapeHtmlAttr($position) : '' ?>>
-                                    <?php if ($_product->isSaleable()) :?>
+                                    <?php if ($_product->isSaleable()): ?>
                                         <?php $postParams = $block->getAddToCartPostParams($_product); ?>
                                         <form data-role="tocart-form"
                                               data-product-sku="<?= $escaper->escapeHtml($_product->getSku()) ?>"
@@ -88,7 +94,8 @@ $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
                                             <input type="hidden"
                                                    name="product"
                                                    value="<?= /* @noEscape */ $postParams['data']['product'] ?>">
-                                            <input type="hidden" name="<?= /* @noEscape */ Action::PARAM_NAME_URL_ENCODED ?>"
+                                            <input type="hidden"
+                                                   name="<?= /* @noEscape */ Action::PARAM_NAME_URL_ENCODED ?>"
                                                    value="<?= /* @noEscape */ $postParams['data'][Action::PARAM_NAME_URL_ENCODED] ?>">
                                             <?= $block->getBlockHtml('formkey') ?>
                                             <button type="submit"
@@ -97,23 +104,31 @@ $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
                                                 <span><?= $escaper->escapeHtml(__('Add to Cart')) ?></span>
                                             </button>
                                         </form>
-                                    <?php else :?>
-                                        <?php if ($_product->isAvailable()) :?>
-                                            <div class="stock available"><span><?= $escaper->escapeHtml(__('In stock')) ?></span></div>
-                                        <?php else :?>
-                                            <div class="stock unavailable"><span><?= $escaper->escapeHtml(__('Out of stock')) ?></span></div>
+                                    <?php else: ?>
+                                        <?php if ($_product->isAvailable()): ?>
+                                            <div class="stock available">
+                                                <span><?= $escaper->escapeHtml(__('In stock')) ?></span>
+                                            </div>
+                                        <?php else: ?>
+                                            <div class="stock unavailable">
+                                                <span><?= $escaper->escapeHtml(__('Out of stock')) ?></span>
+                                            </div>
                                         <?php endif; ?>
                                     <?php endif; ?>
                                 </div>
                                 <div data-role="add-to-links" class="actions-secondary"<?= strpos($pos, $viewMode . '-secondary') ? $escaper->escapeHtmlAttr($position) : '' ?>>
-                                    <?php if ($addToBlock = $block->getChildBlock('addto')) :?>
+                                    <?php if ($addToBlock = $block->getChildBlock('addto')): ?>
                                         <?= $addToBlock->setProduct($_product)->getChildHtml() ?>
                                     <?php endif; ?>
                                 </div>
                             </div>
-                            <?php if ($showDescription) :?>
+                            <?php if ($showDescription): ?>
                                 <div class="product description product-item-description">
-                                    <?= /* @noEscape */ $_helper->productAttribute($_product, $_product->getShortDescription(), 'short_description') ?>
+                                    <?= /* @noEscape */ $_helper->productAttribute(
+                                        $_product,
+                                        $_product->getShortDescription(),
+                                        'short_description'
+                                    ) ?>
                                     <a href="<?= $escaper->escapeUrl($_product->getProductUrl()) ?>"
                                        title="<?= /* @noEscape */ $_productNameStripped ?>"
                                        class="action more"><?= $escaper->escapeHtml(__('Learn More')) ?></a>
@@ -127,7 +142,7 @@ $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
         </ol>
     </div>
     <?= $block->getToolbarHtml() ?>
-    <?php if (!$block->isRedirectToCartEnabled()) :?>
+    <?php if (!$block->isRedirectToCartEnabled()): ?>
         <script type="text/x-magento-init">
         {
             "[data-role=tocart-form], .form.map.checkout": {
diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
index 3829f830c435e..5a051d8ecf675 100644
--- a/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
+++ b/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
@@ -3,12 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+use Magento\Catalog\Model\Product;
+use Magento\Swatches\Block\Product\Renderer\Listing\Configurable;
+use Magento\Swatches\ViewModel\Product\Renderer\Configurable as ConfigurableViewModel;
+
+/** @var Configurable $block */
+/** @var Product $product */
+$product = $block->getProduct()
 ?>
-<?php /** @var $block \Magento\Swatches\Block\Product\Renderer\Listing\Configurable */ ?>
-<?php $product = $block->getProduct() ?>
-<?php if ($product && $product->isAvailable()) : ?>
+<?php if ($product && $product->isAvailable()): ?>
     <?php $productId = $product->getId() ?>
-    <?php /** @var \Magento\Swatches\ViewModel\Product\Renderer\Configurable $configurableViewModel */ ?>
+    <?php /** @var ConfigurableViewModel $configurableViewModel */ ?>
     <?php $configurableViewModel = $block->getConfigurableViewModel() ?>
     <div class="swatch-opt-<?= $block->escapeHtmlAttr($productId) ?>"
          data-role="swatch-option-<?= $block->escapeHtmlAttr($productId) ?>"></div>

From 22dd903c67ffc0a19e3ce201173228a55a037d11 Mon Sep 17 00:00:00 2001
From: ameysar <andrii.meysar@transoftgroup.com>
Date: Tue, 28 Jul 2020 12:46:46 +0300
Subject: [PATCH 1068/1718] MC-31304: [ElasticSearch] Exception on catalog
 search result page

---
 .../Model/DataProvider/Base/Suggestions.php   |  32 ++-
 .../DataProvider/Base/SuggestionsTest.php     | 189 ++++++++++++++----
 2 files changed, 172 insertions(+), 49 deletions(-)

diff --git a/app/code/Magento/Elasticsearch/Model/DataProvider/Base/Suggestions.php b/app/code/Magento/Elasticsearch/Model/DataProvider/Base/Suggestions.php
index 8364b6c116b7d..2d4f8abeb8ecd 100644
--- a/app/code/Magento/Elasticsearch/Model/DataProvider/Base/Suggestions.php
+++ b/app/code/Magento/Elasticsearch/Model/DataProvider/Base/Suggestions.php
@@ -5,19 +5,23 @@
  */
 namespace Magento\Elasticsearch\Model\DataProvider\Base;
 
-use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProviderInterface;
-use Magento\Store\Model\ScopeInterface;
-use Magento\Search\Model\QueryInterface;
+use Elasticsearch\Common\Exceptions\BadRequest400Exception;
 use Magento\AdvancedSearch\Model\SuggestedQueriesInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProviderInterface;
 use Magento\Elasticsearch\Model\Config;
 use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
-use Magento\Search\Model\QueryResultFactory;
-use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Search\Model\QueryInterface;
+use Magento\Search\Model\QueryResultFactory;
+use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface as StoreManager;
+use Psr\Log\LoggerInterface;
 
 /**
  * Default implementation to provide suggestions mechanism for Elasticsearch
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Suggestions implements SuggestedQueriesInterface
 {
@@ -56,6 +60,11 @@ class Suggestions implements SuggestedQueriesInterface
      */
     private $fieldProvider;
 
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * Suggestions constructor.
      *
@@ -66,6 +75,7 @@ class Suggestions implements SuggestedQueriesInterface
      * @param SearchIndexNameResolver $searchIndexNameResolver
      * @param StoreManager $storeManager
      * @param FieldProviderInterface $fieldProvider
+     * @param LoggerInterface|null $logger
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
@@ -74,7 +84,8 @@ public function __construct(
         ConnectionManager $connectionManager,
         SearchIndexNameResolver $searchIndexNameResolver,
         StoreManager $storeManager,
-        FieldProviderInterface $fieldProvider
+        FieldProviderInterface $fieldProvider,
+        LoggerInterface $logger = null
     ) {
         $this->queryResultFactory = $queryResultFactory;
         $this->connectionManager = $connectionManager;
@@ -83,6 +94,7 @@ public function __construct(
         $this->searchIndexNameResolver = $searchIndexNameResolver;
         $this->storeManager = $storeManager;
         $this->fieldProvider = $fieldProvider;
+        $this->logger = $logger ?: ObjectManager::getInstance()->get(LoggerInterface::class);
     }
 
     /**
@@ -93,8 +105,14 @@ public function getItems(QueryInterface $query)
         $result = [];
         if ($this->isSuggestionsAllowed()) {
             $isResultsCountEnabled = $this->isResultsCountEnabled();
+            try {
+                $suggestions = $this->getSuggestions($query);
+            } catch (BadRequest400Exception $e) {
+                $this->logger->critical($e);
+                $suggestions = [];
+            }
 
-            foreach ($this->getSuggestions($query) as $suggestion) {
+            foreach ($suggestions as $suggestion) {
                 $count = null;
                 if ($isResultsCountEnabled) {
                     $count = isset($suggestion['freq']) ? $suggestion['freq'] : null;
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/DataProvider/Base/SuggestionsTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/DataProvider/Base/SuggestionsTest.php
index 7151677db3405..9f1c5db60b3d8 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Model/DataProvider/Base/SuggestionsTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/DataProvider/Base/SuggestionsTest.php
@@ -7,7 +7,10 @@
 
 namespace Magento\Elasticsearch\Test\Unit\Model\DataProvider\Base;
 
+use Elasticsearch\Common\Exceptions\BadRequest400Exception;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProviderInterface;
 use Magento\Elasticsearch\Model\Config;
+use Magento\Elasticsearch\Model\DataProvider\Base\Suggestions;
 use Magento\Elasticsearch\Model\DataProvider\Suggestions as SuggestionsDataProvider;
 use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
 use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver;
@@ -21,6 +24,7 @@
 use Magento\Store\Model\StoreManagerInterface as StoreManager;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -62,6 +66,21 @@ class SuggestionsTest extends TestCase
      */
     private $storeManager;
 
+    /**
+     * @var FieldProviderInterface|MockObject
+     */
+    private $fieldProvider;
+
+    /**
+     * @var LoggerInterface|MockObject
+     */
+    private $logger;
+
+    /**
+     * @var Elasticsearch|MockObject
+     */
+    private $client;
+
     /**
      * @var QueryInterface|MockObject
      */
@@ -99,7 +118,19 @@ protected function setUp(): void
             ->setMethods(['getIndexName'])
             ->getMock();
 
-        $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
+        $this->storeManager = $this->getMockBuilder(StoreManager::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->fieldProvider = $this->getMockBuilder(FieldProviderInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->logger = $this->getMockBuilder(LoggerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->client = $this->getMockBuilder(Elasticsearch::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -110,81 +141,155 @@ protected function setUp(): void
         $objectManager = new ObjectManagerHelper($this);
 
         $this->model = $objectManager->getObject(
-            \Magento\Elasticsearch\Model\DataProvider\Base\Suggestions::class,
+            Suggestions::class,
             [
                 'queryResultFactory' => $this->queryResultFactory,
                 'connectionManager' => $this->connectionManager,
                 'scopeConfig' => $this->scopeConfig,
                 'config' => $this->config,
                 'searchIndexNameResolver' => $this->searchIndexNameResolver,
-                'storeManager' => $this->storeManager
+                'storeManager' => $this->storeManager,
+                'fieldProvider' => $this->fieldProvider,
+                'logger' => $this->logger,
             ]
         );
     }
 
     /**
-     * Test getItems() method
+     * Test get items process with search suggestions disabled.
+     * @return void
      */
-    public function testGetItems()
+    public function testGetItemsWithDisabledSearchSuggestion(): void
     {
-        $this->scopeConfig->expects($this->any())
-            ->method('getValue')
-            ->willReturn(1);
-
-        $this->config->expects($this->any())
-            ->method('isElasticsearchEnabled')
-            ->willReturn(1);
-
-        $store = $this->getMockBuilder(StoreInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+        $this->scopeConfig->expects($this->once())
+            ->method('isSetFlag')
+            ->willReturn(false);
 
-        $this->storeManager->expects($this->any())
-            ->method('getStore')
-            ->willReturn($store);
-
-        $store->expects($this->any())
-            ->method('getId')
-            ->willReturn(1);
+        $this->scopeConfig->expects($this->never())
+            ->method('getValue');
 
-        $this->searchIndexNameResolver->expects($this->any())
-            ->method('getIndexName')
-            ->willReturn('magento2_product_1');
+        $this->config->expects($this->once())
+            ->method('isElasticsearchEnabled')
+            ->willReturn(true);
 
-        $this->query->expects($this->any())
-            ->method('getQueryText')
-            ->willReturn('query');
+        $this->logger->expects($this->never())
+            ->method('critical');
 
-        $client = $this->getMockBuilder(Elasticsearch::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->queryResultFactory->expects($this->never())
+            ->method('create');
 
-        $this->connectionManager->expects($this->any())
-            ->method('getConnection')
-            ->willReturn($client);
+        $this->assertEmpty($this->model->getItems($this->query));
+    }
 
-        $client->expects($this->any())
+    /**
+     * Test get items process with search suggestions enabled.
+     * @return void
+     */
+    public function testGetItemsWithEnabledSearchSuggestion(): void
+    {
+        $this->prepareSearchQuery();
+        $this->client->expects($this->once())
             ->method('query')
             ->willReturn([
                 'suggest' => [
                     'phrase_field' => [
-                        'options' => [
-                            'text' => 'query',
-                            'score' => 1,
-                            'freq' => 1,
+                        [
+                            'options' => [
+                                'suggestion' => [
+                                    'text' => 'query',
+                                    'score' => 1,
+                                    'freq' => 1,
+                                ]
+                            ]
                         ]
                     ],
                 ],
             ]);
 
+        $this->logger->expects($this->never())
+            ->method('critical');
+
         $query = $this->getMockBuilder(QueryResult::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->queryResultFactory->expects($this->any())
+        $this->queryResultFactory->expects($this->once())
             ->method('create')
             ->willReturn($query);
 
-        $this->assertIsArray($this->model->getItems($this->query));
+        $this->assertEquals([$query], $this->model->getItems($this->query));
+    }
+
+    /**
+     * Test get items process when throwing an exception.
+     * @return void
+     */
+    public function testGetItemsException(): void
+    {
+        $this->prepareSearchQuery();
+        $exception = new BadRequest400Exception();
+
+        $this->client->expects($this->once())
+            ->method('query')
+            ->willThrowException($exception);
+
+        $this->logger->expects($this->once())
+            ->method('critical')
+            ->with($exception);
+
+        $this->queryResultFactory->expects($this->never())
+            ->method('create');
+
+        $this->assertEmpty($this->model->getItems($this->query));
+    }
+
+    /**
+     * Prepare Mocks for default get items process.
+     * @return void
+     */
+    private function prepareSearchQuery(): void
+    {
+        $storeId = 1;
+
+        $this->scopeConfig->expects($this->exactly(2))
+            ->method('isSetFlag')
+            ->willReturn(true);
+
+        $this->scopeConfig->expects($this->once())
+            ->method('getValue')
+            ->willReturn(1);
+
+        $this->config->expects($this->once())
+            ->method('isElasticsearchEnabled')
+            ->willReturn(true);
+
+        $store = $this->getMockBuilder(StoreInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $store->expects($this->once())
+            ->method('getId')
+            ->willReturn($storeId);
+
+        $this->storeManager->expects($this->once())
+            ->method('getStore')
+            ->willReturn($store);
+
+        $this->searchIndexNameResolver->expects($this->once())
+            ->method('getIndexName')
+            ->with($storeId, Config::ELASTICSEARCH_TYPE_DEFAULT)
+            ->willReturn('magento2_product_1');
+
+        $this->query->expects($this->once())
+            ->method('getQueryText')
+            ->willReturn('query');
+
+        $this->fieldProvider->expects($this->once())
+            ->method('getFields')
+            ->willReturn([]);
+
+        $this->connectionManager->expects($this->once())
+            ->method('getConnection')
+            ->willReturn($this->client);
     }
 }

From c3d76f7b1cf870c75b58d0da09c7ed0745fbcbc3 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Tue, 28 Jul 2020 12:48:11 +0300
Subject: [PATCH 1069/1718] add mftf

---
 ...ssertBackupLinkAbsentInMenuActionGroup.xml | 19 ++++++++++++
 .../Mftf/Test/AdminSystemBackupMenuTest.xml   | 29 +++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 app/code/Magento/Backup/Test/Mftf/ActionGroup/AdminAssertBackupLinkAbsentInMenuActionGroup.xml
 create mode 100644 app/code/Magento/Backup/Test/Mftf/Test/AdminSystemBackupMenuTest.xml

diff --git a/app/code/Magento/Backup/Test/Mftf/ActionGroup/AdminAssertBackupLinkAbsentInMenuActionGroup.xml b/app/code/Magento/Backup/Test/Mftf/ActionGroup/AdminAssertBackupLinkAbsentInMenuActionGroup.xml
new file mode 100644
index 0000000000000..094c6292684f6
--- /dev/null
+++ b/app/code/Magento/Backup/Test/Mftf/ActionGroup/AdminAssertBackupLinkAbsentInMenuActionGroup.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="AdminAssertBackupLinkAbsentInMenuActionGroup">
+        <annotations>
+            <description>Verify 'Backup' link is absent in admin menu.</description>
+        </annotations>
+
+        <click selector="{{AdminMenuSection.menuItem('magento-backend-system')}}" stepKey="clickSystem"/>
+        <dontSeeElement selector="{{AdminMenuSection.menuItem('magento-backup-system-tools-backup')}}" stepKey="dontSeeBackup"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Backup/Test/Mftf/Test/AdminSystemBackupMenuTest.xml b/app/code/Magento/Backup/Test/Mftf/Test/AdminSystemBackupMenuTest.xml
new file mode 100644
index 0000000000000..b322b1381ec34
--- /dev/null
+++ b/app/code/Magento/Backup/Test/Mftf/Test/AdminSystemBackupMenuTest.xml
@@ -0,0 +1,29 @@
+<?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="AdminSystemBackupMenuTest">
+        <annotations>
+            <features value="Backup"/>
+            <stories value="Backup menu not visible if config disabled"/>
+            <title value="Backup menu not visible if backup config disabled"/>
+            <description value="Disable backup config and check backup menu isn't visible"/>
+            <severity value="AVERAGE"/>
+            <group value="backup"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
+        </after>
+
+        <actionGroup ref="AdminAssertBackupLinkAbsentInMenuActionGroup" stepKey="verifyBackupLinkAbsentInMenu"/>
+    </test>
+</tests>

From 8109a5403675b03542f756c239d12cf4e44e07e6 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Tue, 28 Jul 2020 13:59:01 +0300
Subject: [PATCH 1070/1718] MC-35658: Checkout summary section is flickering on
 scrolling of checkout page

---
 lib/web/mage/sticky.js | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/lib/web/mage/sticky.js b/lib/web/mage/sticky.js
index b6e29bb3cae20..78ff63168b9ba 100644
--- a/lib/web/mage/sticky.js
+++ b/lib/web/mage/sticky.js
@@ -68,6 +68,9 @@ define([
             this.element.on('dimensionsChanged', $.proxy(this.reset, this));
 
             this.reset();
+
+            // Application of the workaround for IE11 and Edge
+            this.normalizeIE11AndEdgeScroll();
         },
 
         /**
@@ -128,11 +131,27 @@ define([
         },
 
         /**
-         * Facade method that palces sticky element where it should be.
+         * Facade method that places sticky element where it should be.
          */
         reset: function () {
             this._calculateDimens()
                 ._stick();
+        },
+
+        /**
+         * Workaround for IE11 and Edge that solves the IE known rendering issue
+         * that prevents sticky element from jumpy movement on scrolling the page.
+         *
+         * Alternatively, undesired jumpy movement can be eliminated by changing the setting in IE:
+         * Settings > Internet options > Advanced tab > inside 'Browsing' item > set 'Use smooth scrolling' to False
+         */
+        normalizeIE11AndEdgeScroll: function () {
+            if (navigator.userAgent.match(/Trident.*rv[ :]*11\.|Edge\//)) {
+                document.body.addEventListener('mousewheel', function () {
+                    event.preventDefault();
+                    window.scrollTo(0, window.pageYOffset - event.wheelDelta);
+                });
+            }
         }
     });
 

From 8bb3b5e6040ba270683e837c90bacc486f2c89ae Mon Sep 17 00:00:00 2001
From: "Kristof, Fooman" <kristof@fooman.co.nz>
Date: Tue, 28 Jul 2020 23:09:53 +1200
Subject: [PATCH 1071/1718] ScopeConfigInterface can be more than a string

Reverts parts of https://github.com/magento/magento2/commit/a5a98dfa56cac8cdb60e15568c10578f522be3f3 as it restricts @magentoConfigFixture unnecessarily to strings.

Neither `Magento\Framework\App\Config\ScopeConfigInterface` nor `Magento\Framework\App\Config` have this limitation.

```
    /**
     * Retrieve config value by path and scope
     *
     * @param string $path
     * @param string $scope
     * @param null|int|string $scopeCode
     * @return mixed
     */
    public function getValue(
        $path = null,
        $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
        $scopeCode = null
    ) {
```
---
 .../Magento/TestFramework/Annotation/ConfigFixture.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php
index 4c1e31c85ec77..50d37739239ee 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php
@@ -71,7 +71,7 @@ protected function _getConfigValue($configPath, $scopeCode = null)
      * @param string|null $scopeCode
      * @return string|null
      */
-    protected function getScopeConfigValue(string $configPath, string $scopeType, string $scopeCode = null): ?string
+    protected function getScopeConfigValue(string $configPath, string $scopeType, string $scopeCode = null)
     {
         $result = null;
         if ($scopeCode !== false) {

From 13413fb0344d330fd2db3133af26fca3e3e159fd Mon Sep 17 00:00:00 2001
From: Stas Kozar <stas.kozar@transoftgroup.com>
Date: Tue, 28 Jul 2020 14:28:19 +0300
Subject: [PATCH 1072/1718] =?UTF-8?q?MC-35974:=20The=20=E2=80=9CEdit=20Rev?=
 =?UTF-8?q?iew=E2=80=9D=20page=20is=20distorted=20if=20a=20Product=20Ratin?=
 =?UTF-8?q?g=20is=20available?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Review/view/adminhtml/templates/rating/stars/summary.phtml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Review/view/adminhtml/templates/rating/stars/summary.phtml b/app/code/Magento/Review/view/adminhtml/templates/rating/stars/summary.phtml
index cc33ab639191f..22ddf532b6926 100644
--- a/app/code/Magento/Review/view/adminhtml/templates/rating/stars/summary.phtml
+++ b/app/code/Magento/Review/view/adminhtml/templates/rating/stars/summary.phtml
@@ -11,7 +11,7 @@
 ?>
 <?php if ($block->getRatingSummary()->getCount()): ?>
     <div class="rating-box">
-        <div class="rating"/>
+        <div class="rating"></div>
     </div>
     <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
         "width:" . /* @noEscape */ ceil($block->getRatingSummary()->getSum() /

From 262445fbc6f635e8a5e5c3b4ecabb93411f93a4d Mon Sep 17 00:00:00 2001
From: dnyomo <dnyomo@briteskies.com>
Date: Tue, 28 Jul 2020 07:36:52 -0400
Subject: [PATCH 1073/1718] Test Fixes for the new filter that sorts categories
 by position

---
 .../CategoriesQuery/CategoriesFilterTest.php   | 18 +++++++++---------
 .../CategoriesPaginationTest.php               |  2 +-
 .../GraphQl/Catalog/CategoryListTest.php       | 18 +++++++++---------
 3 files changed, 19 insertions(+), 19 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 4da588794b2a9..4444b81619bd3 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
@@ -648,15 +648,6 @@ public function filterMultipleCategoriesDataProvider(): array
                 'in',
                 '["category-1-2", "movable"]',
                 [
-                    [
-                        'id' => '7',
-                        'name' => 'Movable',
-                        'url_key' => 'movable',
-                        'url_path' => 'movable',
-                        'children_count' => '0',
-                        'path' => '1/2/7',
-                        'position' => '3'
-                    ],
                     [
                         'id' => '13',
                         'name' => 'Category 1.2',
@@ -665,6 +656,15 @@ public function filterMultipleCategoriesDataProvider(): array
                         'children_count' => '0',
                         'path' => '1/2/3/13',
                         'position' => '2'
+                    ],
+                    [
+                        'id' => '7',
+                        'name' => 'Movable',
+                        'url_key' => 'movable',
+                        'url_path' => 'movable',
+                        'children_count' => '0',
+                        'path' => '1/2/7',
+                        'position' => '3'
                     ]
                 ]
             ],
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoriesPaginationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoriesPaginationTest.php
index c7fbcbd38c7e4..bbc84a82737bd 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoriesPaginationTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoriesPaginationTest.php
@@ -155,7 +155,7 @@ public function testPaging()
         $lastPageQuery = sprintf($baseQuery, $page1Result['categories']['page_info']['total_pages']);
         $lastPageResult = $this->graphQlQuery($lastPageQuery);
         $this->assertCount(1, $lastPageResult['categories']['items']);
-        $this->assertEquals('Category 1.2', $lastPageResult['categories']['items'][0]['name']);
+        $this->assertEquals('Category 12', $lastPageResult['categories']['items'][0]['name']);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php
index d6477c82513e9..c49baf7333dde 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php
@@ -629,15 +629,6 @@ public function filterMultipleCategoriesDataProvider(): array
                 'in',
                 '["category-1-2", "movable"]',
                 [
-                    [
-                        'id' => '7',
-                        'name' => 'Movable',
-                        'url_key' => 'movable',
-                        'url_path' => 'movable',
-                        'children_count' => '0',
-                        'path' => '1/2/7',
-                        'position' => '3'
-                    ],
                     [
                         'id' => '13',
                         'name' => 'Category 1.2',
@@ -646,6 +637,15 @@ public function filterMultipleCategoriesDataProvider(): array
                         'children_count' => '0',
                         'path' => '1/2/3/13',
                         'position' => '2'
+                    ],
+                    [
+                        'id' => '7',
+                        'name' => 'Movable',
+                        'url_key' => 'movable',
+                        'url_path' => 'movable',
+                        'children_count' => '0',
+                        'path' => '1/2/7',
+                        'position' => '3'
                     ]
                 ]
             ],

From 1f5c12321580c087090862298f3ada8a98c4baea Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Tue, 28 Jul 2020 14:37:36 +0300
Subject: [PATCH 1074/1718] MC-36048: Unexpected behavior of sorting in the
 Magento Admin Panel

---
 app/code/Magento/Theme/Plugin/Data/Collection.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Theme/Plugin/Data/Collection.php b/app/code/Magento/Theme/Plugin/Data/Collection.php
index 35c66f555dae7..770224ffc5db4 100644
--- a/app/code/Magento/Theme/Plugin/Data/Collection.php
+++ b/app/code/Magento/Theme/Plugin/Data/Collection.php
@@ -8,12 +8,18 @@
 namespace Magento\Theme\Plugin\Data;
 
 /**
- * Plugin to return real current page even if it greater then collection size.
- *
- * It is necessary to return no values when we reached the last page for api requests
+ * Plugin to return last page if current page greater then collection size.
  */
 class Collection
 {
+    /**
+     * Return last page if current page greater then last page.
+     *
+     * @param \Magento\Framework\Data\Collection $subject
+     * @param int $result
+     * @param int $displacement
+     * @return int
+     */
     public function afterGetCurPage(\Magento\Framework\Data\Collection $subject, int $result, int $displacement = 0)
     {
         if ($result > $subject->getLastPageNumber()) {
@@ -22,5 +28,4 @@ public function afterGetCurPage(\Magento\Framework\Data\Collection $subject, int
 
         return $result;
     }
-
 }

From 1baeb2128a59b70defb78d483a6ba669fd294c08 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Tue, 28 Jul 2020 14:47:04 +0300
Subject: [PATCH 1075/1718] Added integration tests

---
 .../Customer/PlaceOrderWithPayflowProTest.php |   1 -
 .../SaveCartDataWithPayflowProTest.php        | 249 ++++++++++++++++++
 2 files changed, 249 insertions(+), 1 deletion(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/SaveCartDataWithPayflowProTest.php

diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowProTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowProTest.php
index 6a8b6cbc4df61..8ad5e4d98c24e 100644
--- a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowProTest.php
+++ b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowProTest.php
@@ -77,7 +77,6 @@ public function testResolveCustomer(): void
         payment_method: {
           code: "{$paymentMethod}",
             payflowpro: {
-              is_active_payment_token_enabler: true
               cc_details: {
                  cc_exp_month: 12,
                  cc_exp_year: 2030,
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/SaveCartDataWithPayflowProTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/SaveCartDataWithPayflowProTest.php
new file mode 100644
index 0000000000000..d5e0b902311f8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/SaveCartDataWithPayflowProTest.php
@@ -0,0 +1,249 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\PaypalGraphQl\Model\Resolver\Customer;
+
+use Magento\Integration\Model\Oauth\Token;
+use Magento\PaypalGraphQl\PaypalPayflowProAbstractTest;
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteId;
+use Magento\Framework\DataObject;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+use Magento\Vault\Model\PaymentTokenManagement;
+use Magento\Vault\Model\PaymentTokenRepository;
+
+/**
+ * End to end place order test using payflowpro via graphql endpoint for customer
+ *
+ * @magentoAppArea graphql
+ */
+class SaveCartDataWithPayflowProTest extends PaypalPayflowProAbstractTest
+{
+    /**
+     * @var SerializerInterface
+     */
+    private $json;
+
+    /**
+     * @var QuoteIdToMaskedQuoteId
+     */
+    private $quoteIdToMaskedId;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->json = $this->objectManager->get(SerializerInterface::class);
+        $this->quoteIdToMaskedId = $this->objectManager->get(QuoteIdToMaskedQuoteId::class);
+    }
+
+    /**
+     * Place order use payflowpro method and save cart data to future
+     *
+     * @magentoDataFixture Magento/Sales/_files/default_rollback.php
+     * @magentoDataFixture Magento/Sales/_files/default_rollback.php
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+     *
+     * @return void
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testPlaceOrderAndSaveDataForFuturePayflowPro(): void
+    {
+        $responseData = $this->placeOrderPayflowPro('is_active_payment_token_enabler: true');
+        $this->assertArrayHasKey('data', $responseData);
+        $this->assertArrayHasKey('createPayflowProToken', $responseData['data']);
+        $this->assertTrue($this->getVaultCartData()->getIsActive());
+        $this->assertTrue($this->getVaultCartData()->getIsVisible());
+    }
+
+    /**
+     * Place order use payflowpro method and not save cart data to future
+     *
+     * @magentoDataFixture Magento/Sales/_files/default_rollback.php
+     * @magentoDataFixture Magento/Sales/_files/default_rollback.php
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+     *
+     * @return void
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testPlaceOrderAndNotSaveDataForFuturePayflowPro(): void
+    {
+        $responseData = $this->placeOrderPayflowPro('is_active_payment_token_enabler: false');
+        $this->assertArrayHasKey('data', $responseData);
+        $this->assertArrayHasKey('createPayflowProToken', $responseData['data']);
+        $this->assertTrue($this->getVaultCartData()->getIsActive());
+        $this->assertFalse($this->getVaultCartData()->getIsVisible());
+    }
+
+    /**
+     * @param $isActivePaymentTokenEnabler
+     *
+     * @return array
+     */
+    private function placeOrderPayflowPro($isActivePaymentTokenEnabler)
+    {
+        $paymentMethod = 'payflowpro';
+        $this->enablePaymentMethod($paymentMethod);
+        $this->enablePaymentMethod('payflowpro_cc_vault');
+        $reservedQuoteId = 'test_quote';
+
+        $payload = 'BILLTOCITY=CityM&AMT=0.00&BILLTOSTREET=Green+str,+67&VISACARDLEVEL=12&SHIPTOCITY=CityM'
+            . '&NAMETOSHIP=John+Smith&ZIP=75477&BILLTOLASTNAME=Smith&BILLTOFIRSTNAME=John'
+            . '&RESPMSG=Verified&PROCCVV2=M&STATETOSHIP=AL&NAME=John+Smith&BILLTOZIP=75477&CVV2MATCH=Y'
+            . '&PNREF=B70CCC236815&ZIPTOSHIP=75477&SHIPTOCOUNTRY=US&SHIPTOSTREET=Green+str,+67&CITY=CityM'
+            . '&HOSTCODE=A&LASTNAME=Smith&STATE=AL&SECURETOKEN=MYSECURETOKEN&CITYTOSHIP=CityM&COUNTRYTOSHIP=US'
+            . '&AVSDATA=YNY&ACCT=1111&AUTHCODE=111PNI&FIRSTNAME=John&RESULT=0&IAVS=N&POSTFPSMSG=No+Rules+Triggered&'
+            . 'BILLTOSTATE=AL&BILLTOCOUNTRY=US&EXPDATE=0222&CARDTYPE=0&PREFPSMSG=No+Rules+Triggered&SHIPTOZIP=75477&'
+            . 'PROCAVS=A&COUNTRY=US&AVSZIP=N&ADDRESS=Green+str,+67&BILLTONAME=John+Smith&'
+            . 'ADDRESSTOSHIP=Green+str,+67&'
+            . 'AVSADDR=Y&SECURETOKENID=MYSECURETOKENID&SHIPTOSTATE=AL&TRANSTIME=2019-06-24+07%3A53%3A10';
+
+        $cart = $this->getQuoteByReservedOrderId($reservedQuoteId);
+        $cartId = $this->quoteIdToMaskedId->execute((int)$cart->getId());
+
+        $query = <<<QUERY
+mutation {
+    setPaymentMethodOnCart(input: {
+        payment_method: {
+          code: "{$paymentMethod}",
+            payflowpro: {
+              {$isActivePaymentTokenEnabler}
+              cc_details: {
+                 cc_exp_month: 12,
+                 cc_exp_year: 2030,
+                 cc_last_4: 1111,
+                 cc_type: "IV",
+              }
+          }
+        },
+        cart_id: "{$cartId}"})
+      {
+        cart {
+          selected_payment_method {
+            code
+          }
+        }
+      }
+      createPayflowProToken(
+        input: {
+          cart_id:"{$cartId}",
+          urls: {
+            cancel_url: "paypal/transparent/cancel/"
+            error_url: "paypal/transparent/error/"
+            return_url: "paypal/transparent/response/"
+          }
+        }
+      ) {
+          response_message
+          result
+          result_code
+          secure_token
+          secure_token_id
+        }
+      handlePayflowProResponse(input: {
+          paypal_payload: "$payload",
+          cart_id: "{$cartId}"
+        })
+      {
+        cart {
+          selected_payment_method {
+            code
+          }
+        }
+      }
+      placeOrder(input: {cart_id: "{$cartId}"}) {
+        order {
+          order_number
+        }
+      }
+}
+QUERY;
+
+        /** @var Token $tokenModel */
+        $tokenModel = $this->objectManager->create(Token::class);
+        $customerToken = $tokenModel->createCustomerToken(1)->getToken();
+
+        $requestHeaders = [
+            'Content-Type' => 'application/json',
+            'Accept' => 'application/json',
+            'Authorization' => 'Bearer ' . $customerToken
+        ];
+        $paypalResponse = new DataObject(
+            [
+                'result' => '0',
+                'securetoken' => 'mysecuretoken',
+                'securetokenid' => 'mysecuretokenid',
+                'respmsg' => 'Approved',
+                'result_code' => '0',
+            ]
+        );
+
+        $this->gatewayMock
+            ->method('postRequest')
+            ->willReturn($paypalResponse);
+
+        $this->gatewayMock
+            ->method('postRequest')
+            ->willReturn(
+                new DataObject(
+                    [
+                        'result' => '0',
+                        'pnref' => 'A70AAC2378BA',
+                        'respmsg' => 'Approved',
+                        'authcode' => '647PNI',
+                        'avsaddr' => 'Y',
+                        'avszip' => 'N',
+                        'hostcode' => 'A',
+                        'procavs' => 'A',
+                        'visacardlevel' => '12',
+                        'transtime' => '2019-06-24 10:12:03',
+                        'firstname' => 'Cristian',
+                        'lastname' => 'Partica',
+                        'amt' => '14.99',
+                        'acct' => '1111',
+                        'expdate' => '0221',
+                        'cardtype' => '0',
+                        'iavs' => 'N',
+                        'result_code' => '0',
+                    ]
+                )
+            );
+
+        $response = $this->graphQlRequest->send($query, [], '', $requestHeaders);
+
+        return $this->json->unserialize($response->getContent());
+    }
+
+    /**
+     * Get saved cart data
+     *
+     * @return PaymentTokenInterface
+     */
+    private function getVaultCartData()
+    {
+        /** @var PaymentTokenManagement $tokenManagement */
+        $tokenManagement = $this->objectManager->get(PaymentTokenManagement::class);
+        $token = $tokenManagement->getByGatewayToken('B70CCC236815', 'payflowpro',1);
+        /** @var PaymentTokenRepository $tokenRepository */
+        $tokenRepository = $this->objectManager->get(PaymentTokenRepository::class);
+        return $tokenRepository->getById($token->getEntityId());
+    }
+}

From b0d26457b795691149f79b42bce2b0dee95b4401 Mon Sep 17 00:00:00 2001
From: DianaRusin <rusind95@gmail.com>
Date: Tue, 28 Jul 2020 15:46:08 +0300
Subject: [PATCH 1076/1718] MC-36044: There are no 'Add Products By SKU' and
 'Add Products' buttons on Create New Order page

---
 .../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 102b7072dc6d1..2621f7106bb14 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
@@ -84,7 +84,7 @@ define([
                     }, 10);
                 };
 
-                if (jQuery('#' + this.getAreaId('items')).is(':visible')) {
+                if (jQuery('#order-items').ready()) {
                     this.dataArea.onLoad = this.dataArea.onLoad.wrap(function (proceed) {
                         proceed();
                         this._parent.itemsArea.setNode($(this._parent.getAreaId('items')));

From cb2be536fef162c0b433a7cbf38971320b73b794 Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Tue, 28 Jul 2020 16:10:48 +0300
Subject: [PATCH 1077/1718] MC-36113: 2.4.0 installation fails with outdated
 Stores cache

---
 .../Store/Model/Config/Processor/Fallback.php        | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Store/Model/Config/Processor/Fallback.php b/app/code/Magento/Store/Model/Config/Processor/Fallback.php
index 4e8b3bca14c92..537802d312eed 100644
--- a/app/code/Magento/Store/Model/Config/Processor/Fallback.php
+++ b/app/code/Magento/Store/Model/Config/Processor/Fallback.php
@@ -178,20 +178,18 @@ private function getWebsiteConfig(array $websites, $id)
      */
     private function loadScopes(): void
     {
-        $loaded = false;
         try {
             if ($this->deploymentConfig->isDbAvailable()) {
                 $this->storeData = $this->storeResource->readAllStores();
                 $this->websiteData = $this->websiteResource->readAllWebsites();
-                $loaded = true;
+            } else {
+                $this->storeData = $this->scopes->get('stores');
+                $this->websiteData = $this->scopes->get('websites');
             }
         } catch (TableNotFoundException $exception) {
             // database is empty or not setup
-            $loaded = false;
-        }
-        if (!$loaded) {
-            $this->storeData = $this->scopes->get('stores');
-            $this->websiteData = $this->scopes->get('websites');
+            $this->storeData = [];
+            $this->websiteData = [];
         }
     }
 }

From 4cc85f38623cee4af1960db0d8be43b019a4018f Mon Sep 17 00:00:00 2001
From: "Kristof, Fooman" <kristof@fooman.co.nz>
Date: Wed, 29 Jul 2020 01:40:15 +1200
Subject: [PATCH 1078/1718] Update
 dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php

Co-authored-by: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
---
 .../Magento/TestFramework/Annotation/ConfigFixture.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php
index 50d37739239ee..48b27c83ee6e3 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php
@@ -69,7 +69,7 @@ protected function _getConfigValue($configPath, $scopeCode = null)
      * @param string $configPath
      * @param string $scopeType
      * @param string|null $scopeCode
-     * @return string|null
+     * @return mixed|null
      */
     protected function getScopeConfigValue(string $configPath, string $scopeType, string $scopeCode = null)
     {

From 7e7b64554e74433cd054c26e85f68bb81c491717 Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Tue, 28 Jul 2020 14:34:38 +0300
Subject: [PATCH 1079/1718] minor change

---
 lib/internal/Magento/Framework/App/Request/Http.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/internal/Magento/Framework/App/Request/Http.php b/lib/internal/Magento/Framework/App/Request/Http.php
index 8e4a184c51843..961e871fbfa91 100644
--- a/lib/internal/Magento/Framework/App/Request/Http.php
+++ b/lib/internal/Magento/Framework/App/Request/Http.php
@@ -199,8 +199,8 @@ public function isDirectAccessFrontendName($code)
      */
     public function getBasePath()
     {
-        return empty(parent::getBasePath()) ? '/'
-            : str_replace('\\', '/', parent::getBasePath());
+        $path = parent::getBasePath();
+        return empty($path) ? '/' : str_replace('\\', '/', $path);
     }
 
     /**
@@ -306,8 +306,8 @@ public function getBeforeForwardInfo($name = null)
     public function isAjax()
     {
         return $this->isXmlHttpRequest()
-            || $this->getParam('ajax', null)
-            || $this->getParam('isAjax', null);
+            || $this->getParam('ajax')
+            || $this->getParam('isAjax');
     }
 
     /**

From afaede9ee5eaa54714f869baf348f6aca5ddb076 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Tue, 28 Jul 2020 18:05:54 +0300
Subject: [PATCH 1080/1718] minor fix

---
 .../Resolver/Customer/SaveCartDataWithPayflowProTest.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/SaveCartDataWithPayflowProTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/SaveCartDataWithPayflowProTest.php
index d5e0b902311f8..0de3e696613b4 100644
--- a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/SaveCartDataWithPayflowProTest.php
+++ b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/SaveCartDataWithPayflowProTest.php
@@ -81,8 +81,6 @@ public function testPlaceOrderAndSaveDataForFuturePayflowPro(): void
      * @magentoDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
      *
      * @return void
-     *
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function testPlaceOrderAndNotSaveDataForFuturePayflowPro(): void
     {
@@ -97,6 +95,7 @@ public function testPlaceOrderAndNotSaveDataForFuturePayflowPro(): void
      * @param $isActivePaymentTokenEnabler
      *
      * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     private function placeOrderPayflowPro($isActivePaymentTokenEnabler)
     {
@@ -241,7 +240,11 @@ private function getVaultCartData()
     {
         /** @var PaymentTokenManagement $tokenManagement */
         $tokenManagement = $this->objectManager->get(PaymentTokenManagement::class);
-        $token = $tokenManagement->getByGatewayToken('B70CCC236815', 'payflowpro',1);
+        $token = $tokenManagement->getByGatewayToken(
+            'B70CCC236815',
+            'payflowpro',
+            1
+        );
         /** @var PaymentTokenRepository $tokenRepository */
         $tokenRepository = $this->objectManager->get(PaymentTokenRepository::class);
         return $tokenRepository->getById($token->getEntityId());

From e182353c4d53dc79f7d67eee5b9c931a18851663 Mon Sep 17 00:00:00 2001
From: SmVladyslav <vlatame.tsg@gmail.com>
Date: Tue, 28 Jul 2020 18:57:57 +0300
Subject: [PATCH 1081/1718] MC-31304: [ElasticSearch] Exception on catalog
 search result page

---
 .../Model/Adapter/Elasticsearch.php           | 74 +++++++++++++++++--
 1 file changed, 66 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php b/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
index dfb79e2e8b5c7..85721b6a91409 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
@@ -72,6 +72,16 @@ class Elasticsearch
      */
     private $batchDocumentDataMapper;
 
+    /**
+     * @var array
+     */
+    private $mappedAttributes = [];
+
+    /**
+     * @var string[]
+     */
+    private $indexByCode = [];
+
     /**
      * @var ArrayManager
      */
@@ -349,7 +359,7 @@ public function updateAlias($storeId, $mappedIndexerId)
      */
     public function updateIndexMapping(int $storeId, string $mappedIndexerId): self
     {
-        $indexName = $this->indexNameResolver->getIndexFromAlias($storeId, $mappedIndexerId);
+        $indexName = $this->getIndexFromAlias($storeId, $mappedIndexerId);
         if (empty($indexName)) {
             return $this;
         }
@@ -359,19 +369,67 @@ public function updateIndexMapping(int $storeId, string $mappedIndexerId): self
             'websiteId' => $storeId,
         ]);
 
-        $mappedAttributes = $this->client->getMapping(['index' => $indexName]);
-        $pathField = $this->arrayManager->findPath('properties', $mappedAttributes);
-        $mappedAttributes = $this->arrayManager->get($pathField, $mappedAttributes, []);
-
-        $settings['index']['mapping']['total_fields']['limit'] = $this->getMappingTotalFieldsLimit($allAttributeTypes);
-        $this->client->putIndexSettings($indexName, ['settings' => $settings]);
-        $attrToUpdate = array_diff_key($allAttributeTypes, $mappedAttributes);
+        $attrToUpdate = array_diff_key($allAttributeTypes, $this->getMappedAttributes($indexName));
         if (!empty($attrToUpdate)) {
+            $settings['index']['mapping']['total_fields']['limit'] = $this
+                ->getMappingTotalFieldsLimit($allAttributeTypes);
+            $this->client->putIndexSettings($indexName, ['settings' => $settings]);
+
             $this->client->addFieldsMapping(
                 $attrToUpdate,
                 $indexName,
                 $this->clientConfig->getEntityType()
             );
+            $this->setMappedAttributes($attrToUpdate);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Retrieve index definition from cache.
+     *
+     * @param int $storeId
+     * @param string $mappedIndexerId
+     * @return string
+     */
+    private function getIndexFromAlias(int $storeId, string $mappedIndexerId): string
+    {
+        $indexCode = $mappedIndexerId . $storeId;
+        if (!isset($this->indexByCode[$indexCode])) {
+            $this->indexByCode[$indexCode] = $this->indexNameResolver->getIndexFromAlias($storeId, $mappedIndexerId);
+        }
+
+        return $this->indexByCode[$indexCode];
+    }
+
+    /**
+     * Retrieve mapped attributes from cache.
+     *
+     * @param string $indexName
+     * @return array
+     */
+    private function getMappedAttributes(string $indexName): array
+    {
+        if (empty($this->mappedAttributes)) {
+            $mappedAttributes = $this->client->getMapping(['index' => $indexName]);
+            $pathField = $this->arrayManager->findPath('properties', $mappedAttributes);
+            $this->mappedAttributes = $this->arrayManager->get($pathField, $mappedAttributes, []);
+        }
+
+        return $this->mappedAttributes;
+    }
+
+    /**
+     * Set mapped attributes to cache.
+     *
+     * @param array $mappedAttributes
+     * @return $this
+     */
+    private function setMappedAttributes(array $mappedAttributes): self
+    {
+        foreach ($mappedAttributes as $attributeCode => $attributeParams) {
+            $this->mappedAttributes[$attributeCode] = $attributeParams;
         }
 
         return $this;

From 986d5b19fc7edd126210fe5b4b6c6eab7532462a Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Tue, 28 Jul 2020 19:01:19 +0300
Subject: [PATCH 1082/1718] get customer id from cart not context

---
 .../Plugin/Cart/HostedPro/SetPaymentMethodOnCart.php   |  5 +----
 .../Plugin/Cart/PayflowPro/SetPaymentMethodOnCart.php  | 10 +++-------
 .../QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php |  6 ++----
 .../Model/Resolver/SetPaymentMethodOnCart.php          |  2 +-
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/HostedPro/SetPaymentMethodOnCart.php b/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/HostedPro/SetPaymentMethodOnCart.php
index f127a9355adfc..f3353afb7f5b7 100644
--- a/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/HostedPro/SetPaymentMethodOnCart.php
+++ b/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/HostedPro/SetPaymentMethodOnCart.php
@@ -8,7 +8,6 @@
 namespace Magento\PaypalGraphQl\Model\Plugin\Cart\HostedPro;
 
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 use Magento\Paypal\Model\Config;
 use Magento\Quote\Model\Quote;
 use Magento\QuoteGraphQl\Model\Cart\Payment\AdditionalDataProviderPool;
@@ -48,7 +47,6 @@ public function __construct(
      * @param mixed $result
      * @param Quote $cart
      * @param array $paymentData
-     * @param ContextInterface $context
      * @return void
      * @throws GraphQlInputException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -57,8 +55,7 @@ public function afterExecute(
         \Magento\QuoteGraphQl\Model\Cart\SetPaymentMethodOnCart $subject,
         $result,
         Quote $cart,
-        array $paymentData,
-        ContextInterface $context
+        array $paymentData
     ): void {
         $paymentData = $this->additionalDataProviderPool->getData(Config::METHOD_HOSTEDPRO, $paymentData);
 
diff --git a/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/PayflowPro/SetPaymentMethodOnCart.php b/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/PayflowPro/SetPaymentMethodOnCart.php
index 1277a2464435d..30f57f898f070 100644
--- a/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/PayflowPro/SetPaymentMethodOnCart.php
+++ b/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/PayflowPro/SetPaymentMethodOnCart.php
@@ -8,7 +8,6 @@
 namespace Magento\PaypalGraphQl\Model\Plugin\Cart\PayflowPro;
 
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 use Magento\Paypal\Model\Config;
 use Magento\Quote\Model\Quote;
 use Magento\QuoteGraphQl\Model\Cart\Payment\AdditionalDataProviderPool;
@@ -49,7 +48,6 @@ public function __construct(
      * @param mixed $result
      * @param Quote $cart
      * @param array $paymentData
-     * @param ContextInterface $context
      * @return void
      * @throws GraphQlInputException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -58,13 +56,11 @@ public function afterExecute(
         \Magento\QuoteGraphQl\Model\Cart\SetPaymentMethodOnCart $subject,
         $result,
         Quote $cart,
-        array $paymentData,
-        ContextInterface $context
+        array $paymentData
     ): void {
         $paymentData = $this->additionalDataProviderPool->getData(Config::METHOD_PAYFLOWPRO, $paymentData);
-
-        if (!$context->getExtensionAttributes()->getIsCustomer()
-            && array_key_exists(PayflowProSetCcData::IS_ACTIVE_PAYMENT_TOKEN_ENABLER, $paymentData)) {
+        $cartCustomerId = (int)$cart->getCustomerId();
+        if ($cartCustomerId === 0 && array_key_exists(PayflowProSetCcData::IS_ACTIVE_PAYMENT_TOKEN_ENABLER, $paymentData)) {
             $payment = $cart->getPayment();
             $payment->unsAdditionalInformation(PayflowProSetCcData::IS_ACTIVE_PAYMENT_TOKEN_ENABLER);
             $payment->save();
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php
index 80fe860381d04..0fee0f2ae1549 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php
@@ -11,7 +11,6 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 use Magento\Quote\Api\Data\PaymentInterface;
 use Magento\Quote\Api\Data\PaymentInterfaceFactory;
 use Magento\Quote\Api\PaymentMethodManagementInterface;
@@ -19,7 +18,7 @@
 use Magento\QuoteGraphQl\Model\Cart\Payment\AdditionalDataProviderPool;
 
 /**
- * Set payment method for cart
+ * Set payment method on cart
  */
 class SetPaymentMethodOnCart
 {
@@ -58,12 +57,11 @@ public function __construct(
      *
      * @param Quote $cart
      * @param array $paymentData
-     * @param ContextInterface $context
      * @throws GraphQlInputException
      * @throws GraphQlNoSuchEntityException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function execute(Quote $cart, array $paymentData, ContextInterface $context): void
+    public function execute(Quote $cart, array $paymentData): void
     {
         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/Model/Resolver/SetPaymentMethodOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentMethodOnCart.php
index b5e23d237b800..fb6c1e678f1f0 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentMethodOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentMethodOnCart.php
@@ -68,7 +68,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         $storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
         $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId(), $storeId);
         $this->checkCartCheckoutAllowance->execute($cart);
-        $this->setPaymentMethodOnCart->execute($cart, $paymentData, $context);
+        $this->setPaymentMethodOnCart->execute($cart, $paymentData);
 
         return [
             'cart' => [

From fec41fe52e48ddc296a10e1b9d4a4de2028a4fd6 Mon Sep 17 00:00:00 2001
From: SmVladyslav <vlatame.tsg@gmail.com>
Date: Tue, 28 Jul 2020 19:25:04 +0300
Subject: [PATCH 1083/1718] MC-31304: [ElasticSearch] Exception on catalog
 search result page

---
 .../Elasticsearch/Model/Adapter/Elasticsearch.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php b/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
index 85721b6a91409..2fd4880f83b76 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
@@ -380,7 +380,7 @@ public function updateIndexMapping(int $storeId, string $mappedIndexerId): self
                 $indexName,
                 $this->clientConfig->getEntityType()
             );
-            $this->setMappedAttributes($attrToUpdate);
+            $this->setMappedAttributes($indexName, $attrToUpdate);
         }
 
         return $this;
@@ -395,7 +395,7 @@ public function updateIndexMapping(int $storeId, string $mappedIndexerId): self
      */
     private function getIndexFromAlias(int $storeId, string $mappedIndexerId): string
     {
-        $indexCode = $mappedIndexerId . $storeId;
+        $indexCode = $mappedIndexerId . '_' . $storeId;
         if (!isset($this->indexByCode[$indexCode])) {
             $this->indexByCode[$indexCode] = $this->indexNameResolver->getIndexFromAlias($storeId, $mappedIndexerId);
         }
@@ -411,25 +411,26 @@ private function getIndexFromAlias(int $storeId, string $mappedIndexerId): strin
      */
     private function getMappedAttributes(string $indexName): array
     {
-        if (empty($this->mappedAttributes)) {
+        if (empty($this->mappedAttributes[$indexName])) {
             $mappedAttributes = $this->client->getMapping(['index' => $indexName]);
             $pathField = $this->arrayManager->findPath('properties', $mappedAttributes);
-            $this->mappedAttributes = $this->arrayManager->get($pathField, $mappedAttributes, []);
+            $this->mappedAttributes[$indexName] = $this->arrayManager->get($pathField, $mappedAttributes, []);
         }
 
-        return $this->mappedAttributes;
+        return $this->mappedAttributes[$indexName];
     }
 
     /**
      * Set mapped attributes to cache.
      *
+     * @param string $indexName
      * @param array $mappedAttributes
      * @return $this
      */
-    private function setMappedAttributes(array $mappedAttributes): self
+    private function setMappedAttributes(string $indexName, array $mappedAttributes): self
     {
         foreach ($mappedAttributes as $attributeCode => $attributeParams) {
-            $this->mappedAttributes[$attributeCode] = $attributeParams;
+            $this->mappedAttributes[$indexName][$attributeCode] = $attributeParams;
         }
 
         return $this;

From 52864f54b37f16ddbdf6110f9ab14121aa046226 Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Tue, 28 Jul 2020 14:20:19 -0500
Subject: [PATCH 1084/1718] MC-20638: MyAccount :: Order Details :: Shipping
 Details by Order Number

---
 app/code/Magento/BundleGraphQl/composer.json                  | 2 ++
 .../SalesGraphQl/Model/Resolver/CustomerOrders/Carrier.php    | 2 +-
 .../SalesGraphQl/Model/Resolver/Invoice/InvoiceItems.php      | 2 +-
 app/code/Magento/SalesGraphQl/composer.json                   | 4 +---
 .../GraphQl/Sales/CustomerOrders/OrderShipmentsTest.php       | 2 ++
 .../Magento/GraphQl/Sales/Fixtures/CustomerPlaceOrder.php     | 4 ++--
 .../Sales/_files/customer_order_with_simple_shipment.php      | 2 --
 .../GraphQl/Sales/_files/customer_order_with_ups_shipping.php | 4 ++--
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/BundleGraphQl/composer.json b/app/code/Magento/BundleGraphQl/composer.json
index cb49ab78588b3..e3c54719f4d0e 100644
--- a/app/code/Magento/BundleGraphQl/composer.json
+++ b/app/code/Magento/BundleGraphQl/composer.json
@@ -10,6 +10,8 @@
         "magento/module-quote": "*",
         "magento/module-quote-graph-ql": "*",
         "magento/module-store": "*",
+        "magento/module-sales": "*",
+        "magento/module-sales-graph-ql": "*",
         "magento/framework": "*"
     },
     "license": [
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders/Carrier.php b/app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders/Carrier.php
index c1890cfbe6670..8fae5c3d19d20 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders/Carrier.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders/Carrier.php
@@ -60,7 +60,7 @@ private function findCarrierByMethodCode(string $methodCode): ?string
     {
         $allCarrierMethods = $this->carrierMethods->toOptionArray();
 
-        foreach ($allCarrierMethods as $carrierCode => $carrierMethods) {
+        foreach ($allCarrierMethods as $carrierMethods) {
             $carrierLabel = $carrierMethods['label'];
             $carrierMethodOptions = $carrierMethods['value'];
             if (is_array($carrierMethodOptions)) {
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceItems.php b/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceItems.php
index 93e0f0ac4d065..17ff800989172 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceItems.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceItems.php
@@ -16,7 +16,7 @@
 use Magento\Sales\Api\Data\InvoiceItemInterface;
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\OrderItemInterface;
-use Magento\SalesGraphQl\Model\Resolver\OrderItem\DataProvider as OrderItemProvider;
+use Magento\SalesGraphQl\Model\OrderItem\DataProvider as OrderItemProvider;
 
 /**
  * Resolver for Invoice Items
diff --git a/app/code/Magento/SalesGraphQl/composer.json b/app/code/Magento/SalesGraphQl/composer.json
index f820b239d727d..b85d8c0f852da 100644
--- a/app/code/Magento/SalesGraphQl/composer.json
+++ b/app/code/Magento/SalesGraphQl/composer.json
@@ -10,9 +10,7 @@
         "magento/module-catalog": "*",
         "magento/module-tax": "*",
         "magento/module-quote": "*",
-        "magento/module-graph-ql": "*"
-    },
-    "suggest": {
+        "magento/module-graph-ql": "*",
         "magento/module-shipping": "*"
     },
     "license": [
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CustomerOrders/OrderShipmentsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CustomerOrders/OrderShipmentsTest.php
index 30f845c1fae3a..f23ae2869e435 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CustomerOrders/OrderShipmentsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CustomerOrders/OrderShipmentsTest.php
@@ -5,6 +5,8 @@
  */
 declare(strict_types=1);
 
+namespace Magento\GraphQl\Sales\CustomerOrders;
+
 use Magento\Framework\DB\Transaction;
 use Magento\Framework\Registry;
 use Magento\GraphQl\GetCustomerAuthenticationHeader;
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/Fixtures/CustomerPlaceOrder.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/Fixtures/CustomerPlaceOrder.php
index 2824597ce970b..0386d414b8682 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/Fixtures/CustomerPlaceOrder.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/Fixtures/CustomerPlaceOrder.php
@@ -81,11 +81,11 @@ public function placeOrderWithBundleProduct(array $customerLogin, array $product
     /**
      * Make GraphQl POST request
      *
-     * @param $query
+     * @param string $query
      * @param array $additionalHeaders
      * @return array
      */
-    private function makeRequest($query, $additionalHeaders = []): array
+    private function makeRequest(string $query, array $additionalHeaders = []): array
     {
         $headers = array_merge([$this->getAuthHeader()], $additionalHeaders);
         return $this->gqlClient->post($query, [], '', $headers);
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_simple_shipment.php b/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_simple_shipment.php
index edd1269442e25..22eac03f9a6a8 100644
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_simple_shipment.php
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_simple_shipment.php
@@ -68,5 +68,3 @@
 $track->setCarrierCode('ups');
 $track->setTrackNumber('1234567890');
 $shipmentTrackRepository->save($track);
-
-
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping.php b/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping.php
index c6396710a515f..a9c559b0556d1 100644
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping.php
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping.php
@@ -40,7 +40,7 @@
 $track->setCarrierCode('ups');
 $track->setTitle('United Parcel Service');
 $track->setTrackNumber('987654321');
-$shipOrder->execute($order->getEntityId(), $shipmentItems, false, false, null, [$track]);
+$shipOrder->execute($order->getId(), $shipmentItems, false, false, null, [$track]);
 
 //Create second Shipment
 $shipmentItems = [];
@@ -53,4 +53,4 @@
         $shipmentItems[] = $shipmentItem;
     }
 }
-$shipOrder->execute($order->getEntityId(), $shipmentItems);
+$shipOrder->execute($order->getId(), $shipmentItems);

From 6925546abeab5e75b0f9bf997db7f5062775e230 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Tue, 28 Jul 2020 22:52:06 +0300
Subject: [PATCH 1085/1718] minor fix

---
 .../Model/Plugin/Cart/PayflowPro/SetPaymentMethodOnCart.php    | 3 ++-
 .../Magento/QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/PayflowPro/SetPaymentMethodOnCart.php b/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/PayflowPro/SetPaymentMethodOnCart.php
index 30f57f898f070..7ca4d41cfd33a 100644
--- a/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/PayflowPro/SetPaymentMethodOnCart.php
+++ b/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/PayflowPro/SetPaymentMethodOnCart.php
@@ -60,7 +60,8 @@ public function afterExecute(
     ): void {
         $paymentData = $this->additionalDataProviderPool->getData(Config::METHOD_PAYFLOWPRO, $paymentData);
         $cartCustomerId = (int)$cart->getCustomerId();
-        if ($cartCustomerId === 0 && array_key_exists(PayflowProSetCcData::IS_ACTIVE_PAYMENT_TOKEN_ENABLER, $paymentData)) {
+        if ($cartCustomerId === 0 &&
+            array_key_exists(PayflowProSetCcData::IS_ACTIVE_PAYMENT_TOKEN_ENABLER, $paymentData)) {
             $payment = $cart->getPayment();
             $payment->unsAdditionalInformation(PayflowProSetCcData::IS_ACTIVE_PAYMENT_TOKEN_ENABLER);
             $payment->save();
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php
index 0fee0f2ae1549..4deb794761efb 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php
@@ -59,7 +59,6 @@ public function __construct(
      * @param array $paymentData
      * @throws GraphQlInputException
      * @throws GraphQlNoSuchEntityException
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute(Quote $cart, array $paymentData): void
     {

From b8c02609dd5cb50da34fc05774ad0a1cc7214a50 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Tue, 28 Jul 2020 15:26:45 -0500
Subject: [PATCH 1086/1718] MC-20639: MyAccount :: Order Details :: Refund
 (creditMemo) Details by Order Number

- fix base currency
---
 .../Magento/GraphQl/Sales/CreditmemoTest.php  | 46 ++++++++++++-------
 .../Magento/GraphQl/Sales/InvoiceTest.php     | 38 +++++++--------
 ...e_with_two_products_and_custom_options.php |  6 ++-
 ...s_with_two_products_and_custom_options.php |  1 +
 4 files changed, 53 insertions(+), 38 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
index c2441630f7996..b573b9fcb8a37 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
@@ -114,15 +114,19 @@ public function testCreditMemoForLoggedInCustomerQuery(): void
                         'value' => 20
                     ],
                     'grand_total' => [
-                        'value' => 20
+                        'value' => 20,
+                        'currency' => 'USD'
                     ],
                     'base_grand_total' => [
-                        'value' => 10
+                        'value' => 10,
+                        'currency' => 'EUR'
                     ],
                     'total_shipping' => [
                         'value' => 0
                     ],
-                    'total_tax' => [],
+                    'total_tax' => [
+                        'value' => 0
+                    ],
                     'shipping_handling' => [
                         'amount_including_tax' => [
                             'value' => 0
@@ -134,7 +138,7 @@ public function testCreditMemoForLoggedInCustomerQuery(): void
                             'value' => 0
                         ],
                         'taxes' => [],
-                        'discounts' => [],
+                        // 'discounts' => [],
                     ],
                     'adjustment' => [
                         'value' => 1.23
@@ -211,15 +215,19 @@ public function testCreditMemoForBundledProductsWithPartialRefund()
                         'value' => 15
                     ],
                     'grand_total' => [
-                        'value' => 23
+                        'value' => 23,
+                        'currency' => 'USD'
                     ],
                     'base_grand_total' => [
-                        'value' => 23
+                        'value' => 23,
+                        'currency' => 'USD'
                     ],
                     'total_shipping' => [
                         'value' => 10
                     ],
-                    'total_tax' => [],
+                    'total_tax' => [
+                        'value' => 0
+                    ],
                     'shipping_handling' => [
                         'amount_including_tax' => [
                             'value' => 10
@@ -231,7 +239,7 @@ public function testCreditMemoForBundledProductsWithPartialRefund()
                             'value' => 10
                         ],
                         'taxes' => [],
-                        'discounts' => [],
+                        // 'discounts' => [],
                     ],
                     'adjustment' => [
                         'value' => 2
@@ -322,10 +330,12 @@ public function testCreditMemoForBundleProductWithTaxesAndDiscounts()
                         'value' => 15
                     ],
                     'grand_total' => [
-                        'value' => 24.19
+                        'value' => 24.19,
+                        'currency' => 'USD'
                     ],
                     'base_grand_total' => [
-                        'value' => 24.19
+                        'value' => 24.19,
+                        'currency' => 'USD'
                     ],
                     'total_shipping' => [
                         'value' => 10
@@ -345,16 +355,16 @@ public function testCreditMemoForBundleProductWithTaxesAndDiscounts()
                         ],
                         'taxes'=> [
                             0 => [
-                                'amount'=>['value' => 1.69],
+                                'amount'=>['value' => 0.67],
                                 'title' => 'US-TEST-*-Rate-1',
                                 'rate' => 7.5
                             ]
                         ],
-                        'discounts' => [
-                            0 => ['amount'=>['value'=> 2.5],
-                                'label' => 'Discount Label for 10% off'
-                            ]
-                        ],
+                      //  'discounts' => [
+                      //      0 => ['amount'=>['value'=> 1],
+                      //          'label' => 'Discount Label for 10% off'
+                      //      ]
+                      //  ],
                     ],
                     'adjustment' => [
                         'value' => 0
@@ -751,9 +761,11 @@ private function getCustomerOrderWithCreditMemoQuery(): array
                     }
                     base_grand_total  {
                         value
+                        currency
                     }
                     grand_total {
                         value
+                        currency
                     }
                     total_shipping {
                         value
@@ -766,7 +778,7 @@ private function getCustomerOrderWithCreditMemoQuery(): array
                          amount_excluding_tax{value}
                          total_amount{value}
                          taxes {amount{value} title rate}
-                         discounts {amount{value} label}
+                         # discounts {amount{value} label}
                     }
                     adjustment {
                         value
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/InvoiceTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/InvoiceTest.php
index 10d47872b16f7..5a4b553d081ed 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/InvoiceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/InvoiceTest.php
@@ -94,13 +94,13 @@ public function testSingleInvoiceForLoggedInCustomerQuery()
                             'currency' => 'USD'
                         ],
                         'taxes' => [],
-                        'discounts' => []
+                        // 'discounts' => []
                     ],
                     'taxes' => [],
                     'discounts' => [],
                     'base_grand_total' => [
                         'value' => 100,
-                        'currency' => 'USD'
+                        'currency' => 'EUR'
                     ],
                     'total_tax' => [
                         'value' => 0,
@@ -154,7 +154,7 @@ public function testMultipleInvoiceForLoggedInCustomerQuery()
                     ],
                     'base_grand_total' => [
                         'value' => 50,
-                        'currency' => 'USD'
+                        'currency' => 'EUR'
                     ],
                     'total_tax' => [
                         'value' => 0,
@@ -174,7 +174,7 @@ public function testMultipleInvoiceForLoggedInCustomerQuery()
                             'currency' => 'USD'
                         ],
                         'taxes' => [],
-                        'discounts' => [],
+                        // 'discounts' => [],
                     ],
                     'taxes' => [],
                     'discounts' => [],
@@ -204,7 +204,7 @@ public function testMultipleInvoiceForLoggedInCustomerQuery()
                     ],
                     'base_grand_total' => [
                         'value' => 0,
-                        'currency' => 'USD'
+                        'currency' => 'EUR'
                     ],
                     'total_tax' => [
                         'value' => 0,
@@ -228,7 +228,7 @@ public function testMultipleInvoiceForLoggedInCustomerQuery()
                             'currency' => 'USD'
                         ],
                         'taxes' => [],
-                        'discounts' => [],
+                        // 'discounts' => [],
                     ],
                     'taxes' => [],
                     'discounts' => [],
@@ -466,12 +466,12 @@ private function assertTotalsAndShippingWithTaxesAndDiscounts(array $customerOrd
                         'rate' => 7.5
                     ]
                 ],
-                'discounts'=> [
-                    0 => [
-                        'amount'=>['value' => 0.07, 'currency'=> 'USD'],
-                        'label' => 'Discount Label for 10% off'
-                    ]
-                ],
+                // 'discounts'=> [
+                //     0 => [
+                //         'amount'=>['value' => 0.07, 'currency'=> 'USD'],
+                //         'label' => 'Discount Label for 10% off'
+                //     ]
+                // ],
             ]
         ];
         $this->assertResponseFields($customerOrderItemTotal, $assertionMap);
@@ -509,12 +509,12 @@ private function assertTotalsAndShippingWithTaxesAndDiscountsForOneQty(array $cu
                         'rate' => 7.5
                     ]
                 ],
-                'discounts'=> [
-                    0 => [
-                        'amount'=>['value' => 0.07, 'currency'=> 'USD'],
-                        'label' => 'Discount Label for 10% off'
-                    ]
-                ],
+                // 'discounts'=> [
+                //     0 => [
+                //         'amount'=>['value' => 0.07, 'currency'=> 'USD'],
+                //         'label' => 'Discount Label for 10% off'
+                //     ]
+                // ],
             ]
         ];
         $this->assertResponseFields($customerOrderItemTotal, $assertionMap);
@@ -827,7 +827,7 @@ private function getCustomerInvoicesBasedOnOrderNumber($orderNumber): array
                amount_excluding_tax{value currency}
                total_amount{value currency}
                taxes {amount{value} title rate}
-               discounts {amount{value currency} label}
+               # discounts {amount{value currency} label}
              }
            }
             }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/customer_invoice_with_two_products_and_custom_options.php b/dev/tests/integration/testsuite/Magento/Sales/_files/customer_invoice_with_two_products_and_custom_options.php
index 48fbdefb2cdf8..c14ff93b6393a 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/customer_invoice_with_two_products_and_custom_options.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/customer_invoice_with_two_products_and_custom_options.php
@@ -5,6 +5,7 @@
  */
 
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+use Magento\Sales\Api\InvoiceManagementInterface;
 
 Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer.php');
 Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/products_in_category.php');
@@ -97,12 +98,13 @@
 $order->setBaseGrandTotal(100);
 $order->setGrandTotal(100);
 $order->setOrderCurrencyCode('USD');
+$order->setBaseCurrencyCode('EUR');
 $order->setCustomerId(1)
     ->setCustomerIsGuest(false)
     ->save();
-
+/** @var InvoiceManagementInterface $orderService */
 $orderService = $objectManager->create(
-    \Magento\Sales\Api\InvoiceManagementInterface::class
+    InvoiceManagementInterface::class
 );
 $invoice = $orderService->prepareInvoice($order);
 $invoice->register();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/customer_multiple_invoices_with_two_products_and_custom_options.php b/dev/tests/integration/testsuite/Magento/Sales/_files/customer_multiple_invoices_with_two_products_and_custom_options.php
index 8507987240557..39ac3d1912b93 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/customer_multiple_invoices_with_two_products_and_custom_options.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/customer_multiple_invoices_with_two_products_and_custom_options.php
@@ -97,6 +97,7 @@
 $order->setBaseGrandTotal(60);
 $order->setGrandTotal(60);
 $order->setOrderCurrencyCode('USD');
+$order->setBaseCurrencyCode('EUR');
 $order->setCustomerId(1)
     ->setCustomerIsGuest(false)
     ->save();

From 241b799a5b9705784e8f79130bb4fbea8a082475 Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Tue, 28 Jul 2020 17:44:05 -0500
Subject: [PATCH 1087/1718] MC-20638: MyAccount :: Order Details :: Shipping
 Details by Order Number

---
 .../CustomerOrders/OrderShipmentsTest.php     |  8 +++-
 .../customer_order_with_ups_shipping.php      | 44 ++++++-------------
 2 files changed, 19 insertions(+), 33 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CustomerOrders/OrderShipmentsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CustomerOrders/OrderShipmentsTest.php
index f23ae2869e435..c9f507b1f94e8 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CustomerOrders/OrderShipmentsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CustomerOrders/OrderShipmentsTest.php
@@ -129,9 +129,13 @@ public function testOrderShipmentWithUpsCarrier()
         $this->assertArrayNotHasKey('errors', $result);
         $this->assertEquals('UPS Next Day Air', $result['customer']['orders']['items'][0]['shipping_method']);
         $this->assertEquals('United Parcel Service', $result['customer']['orders']['items'][0]['carrier']);
-
         $shipments = $result['customer']['orders']['items'][0]['shipments'];
-        $this->assertCount(2, $shipments);
+        $expectedTracking = [
+            'title' => 'United Parcel Service',
+            'carrier' => 'ups',
+            'number' => '987654321'
+        ];
+        $this->assertEquals($expectedTracking, $shipments[0]['tracking'][0]);
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping.php b/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping.php
index a9c559b0556d1..d382b7dba3ab9 100644
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping.php
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping.php
@@ -4,18 +4,17 @@
  * See COPYING.txt for license details.
  */
 
-use Magento\Sales\Api\Data\ShipmentItemCreationInterface;
-use Magento\Sales\Api\Data\ShipmentTrackCreationInterface;
-use Magento\Sales\Api\ShipOrderInterface;
 use Magento\Sales\Model\Order;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+use Magento\Framework\DB\Transaction;
+use Magento\Sales\Model\Order\ShipmentFactory;
 
 Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/order_with_different_types_of_product.php');
 
 $objectManager = Bootstrap::getObjectManager();
-/** @var ShipOrderInterface $shipOrder */
-$shipOrder = $objectManager->create(ShipOrderInterface::class);
+/** @var Transaction $transaction */
+$transaction = $objectManager->get(Transaction::class);
 /** @var Order $order */
 $order = $objectManager->create(Order::class)->loadByIncrementId('100000001');
 //Set the shipping method
@@ -26,31 +25,14 @@
 //Create Shipment with UPS tracking and some items
 $shipmentItems = [];
 foreach ($order->getItems() as $orderItem) {
-    if (count($shipmentItems) === 2) {
-        break;
-    }
-    /** @var ShipmentItemCreationInterface $shipmentItem */
-    $shipmentItem = $objectManager->create(ShipmentItemCreationInterface::class);
-    $shipmentItem->setOrderItemId($orderItem->getItemId());
-    $shipmentItem->setQty($orderItem->getQtyOrdered());
-    $shipmentItems[] = $shipmentItem;
+    $shipmentItems[$orderItem->getId()] = $orderItem->getQtyOrdered();
 }
-/** @var ShipmentTrackCreationInterface $track */
-$track = $objectManager->create(ShipmentTrackCreationInterface::class);
-$track->setCarrierCode('ups');
-$track->setTitle('United Parcel Service');
-$track->setTrackNumber('987654321');
-$shipOrder->execute($order->getId(), $shipmentItems, false, false, null, [$track]);
+$tracking = [
+    'carrier_code' => 'ups',
+    'title' => 'United Parcel Service',
+    'number' => '987654321'
+];
 
-//Create second Shipment
-$shipmentItems = [];
-foreach ($order->getItems() as $orderItem) {
-    if ($orderItem->getQtyShipped() === 0) {
-        /** @var ShipmentItemCreationInterface $shipmentItem */
-        $shipmentItem = $objectManager->create(ShipmentItemCreationInterface::class);
-        $shipmentItem->setOrderItemId($orderItem->getItemId());
-        $shipmentItem->setQty($orderItem->getQtyOrdered());
-        $shipmentItems[] = $shipmentItem;
-    }
-}
-$shipOrder->execute($order->getId(), $shipmentItems);
+$shipment = $objectManager->get(ShipmentFactory::class)->create($order, $shipmentItems, [$tracking]);
+$shipment->register();
+$transaction->addObject($shipment)->addObject($order)->save();

From 9f575f45d36377ce10d755058d6e185422957052 Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@magento.com>
Date: Tue, 28 Jul 2020 23:40:13 -0500
Subject: [PATCH 1088/1718] MC-35985: Enable new consumer configuration
 settings on current consumers

- Update handling onlySpawnWhenMessageAvailable attribute;
---
 .../Magento/MessageQueue/Model/Cron/ConsumersRunner.php    | 7 ++++---
 .../MessageQueue/Config/Consumer/ConfigReaderPlugin.php    | 2 +-
 .../MessageQueue/Consumer/Config/Xml/Converter.php         | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner.php b/app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner.php
index 694abe6ebd2e4..fd61f96b300d6 100644
--- a/app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner.php
+++ b/app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner.php
@@ -176,11 +176,12 @@ private function canBeRun(ConsumerConfigItemInterface $consumerConfig, array $al
             return false;
         }
 
-        $onlySpawnWhenMessageAvailable = (bool)$this->deploymentConfig->get(
+        $globalOnlySpawnWhenMessageAvailable = (bool)$this->deploymentConfig->get(
             'queue/only_spawn_when_message_available',
-            0
+            true
         );
-        if ($onlySpawnWhenMessageAvailable || $consumerConfig->getOnlySpawnWhenMessageAvailable()) {
+        if ($consumerConfig->getOnlySpawnWhenMessageAvailable() === true
+            || ($consumerConfig->getOnlySpawnWhenMessageAvailable() === null && $globalOnlySpawnWhenMessageAvailable)) {
             try {
                 return $this->checkIsAvailableMessages->execute(
                     $connectionName,
diff --git a/lib/internal/Magento/Framework/MessageQueue/Config/Consumer/ConfigReaderPlugin.php b/lib/internal/Magento/Framework/MessageQueue/Config/Consumer/ConfigReaderPlugin.php
index 7653f581d02cc..21f3435e23526 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Config/Consumer/ConfigReaderPlugin.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Config/Consumer/ConfigReaderPlugin.php
@@ -71,7 +71,7 @@ private function getConsumerConfigDataFromQueueConfig()
                 'maxMessages' => $consumerData['max_messages'],
                 'maxIdleTime' => null,
                 'sleep' => null,
-                'onlySpawnWhenMessageAvailable' => false
+                'onlySpawnWhenMessageAvailable' => null
             ];
         }
 
diff --git a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Xml/Converter.php b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Xml/Converter.php
index 28e31d6735c4a..e346fe07d894b 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Xml/Converter.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Consumer/Config/Xml/Converter.php
@@ -77,7 +77,7 @@ public function convert($source)
                 'maxIdleTime' => $this->getAttributeValue($consumerNode, 'maxIdleTime'),
                 'sleep' => $this->getAttributeValue($consumerNode, 'sleep'),
                 'onlySpawnWhenMessageAvailable' =>
-                    $onlySpawnWhenMessageAvailable === 'false' ? false : boolval($onlySpawnWhenMessageAvailable)
+                    $onlySpawnWhenMessageAvailable === null ? null : boolval($onlySpawnWhenMessageAvailable)
             ];
         }
         return $result;

From fc6b0f86cc201d75fe3e7b6ccb56843a8657dae2 Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Wed, 29 Jul 2020 08:13:40 +0300
Subject: [PATCH 1089/1718] MC-36048: Unexpected behavior of sorting in the
 Magento Admin Panel

---
 app/code/Magento/Theme/Plugin/Data/Collection.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/code/Magento/Theme/Plugin/Data/Collection.php b/app/code/Magento/Theme/Plugin/Data/Collection.php
index 770224ffc5db4..7b72776ce4a43 100644
--- a/app/code/Magento/Theme/Plugin/Data/Collection.php
+++ b/app/code/Magento/Theme/Plugin/Data/Collection.php
@@ -17,10 +17,9 @@ class Collection
      *
      * @param \Magento\Framework\Data\Collection $subject
      * @param int $result
-     * @param int $displacement
      * @return int
      */
-    public function afterGetCurPage(\Magento\Framework\Data\Collection $subject, int $result, int $displacement = 0)
+    public function afterGetCurPage(\Magento\Framework\Data\Collection $subject, int $result)
     {
         if ($result > $subject->getLastPageNumber()) {
             $result = $subject->getLastPageNumber();

From e786d514ef72699bdedada6444665d882dd015c3 Mon Sep 17 00:00:00 2001
From: Will Wright <wwrig@guidance.com>
Date: Tue, 28 Jul 2020 22:41:30 -0700
Subject: [PATCH 1090/1718] magento/magento2#29315:
 \Magento\Config\Model\Config\Source\Email\Template::toOptionArray throws
 error when setPath() is not called first - Guard against an edge case where
 toOptionArray is called without having set a path first

---
 .../Model/Config/Source/Email/Template.php    | 10 ++--
 .../Config/Source/Email/TemplateTest.php      | 46 ++++++++++++++++++-
 2 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Config/Model/Config/Source/Email/Template.php b/app/code/Magento/Config/Model/Config/Source/Email/Template.php
index ac168f16ca182..182faa53e5288 100644
--- a/app/code/Magento/Config/Model/Config/Source/Email/Template.php
+++ b/app/code/Magento/Config/Model/Config/Source/Email/Template.php
@@ -60,10 +60,12 @@ public function toOptionArray()
             $this->_coreRegistry->register('config_system_email_template', $collection);
         }
         $options = $collection->toOptionArray();
-        $templateId = str_replace('/', '_', $this->getPath());
-        $templateLabel = $this->_emailConfig->getTemplateLabel($templateId);
-        $templateLabel = __('%1 (Default)', $templateLabel);
-        array_unshift($options, ['value' => $templateId, 'label' => $templateLabel]);
+        if (!empty($this->getPath())) {
+            $templateId = str_replace('/', '_', $this->getPath());
+            $templateLabel = $this->_emailConfig->getTemplateLabel($templateId);
+            $templateLabel = __('%1 (Default)', $templateLabel);
+            array_unshift($options, ['value' => $templateId, 'label' => $templateLabel]);
+        }
         return $options;
     }
 }
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Source/Email/TemplateTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Source/Email/TemplateTest.php
index 356d1133aca81..74ab4baa4e990 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Source/Email/TemplateTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Source/Email/TemplateTest.php
@@ -102,4 +102,48 @@ public function testToOptionArray()
         $this->_model->setPath('template/new');
         $this->assertEquals($expectedResult, $this->_model->toOptionArray());
     }
-}
+
+    public function testToOptionArrayWithoutPath()
+    {
+        $collection = $this->createMock(Collection::class);
+        $collection->expects(
+            $this->once()
+        )->method(
+            'toOptionArray'
+        )->willReturn(
+            [
+                ['value' => 'template_one', 'label' => 'Template One'],
+                ['value' => 'template_two', 'label' => 'Template Two'],
+            ]
+        );
+
+        $this->_coreRegistry->expects(
+            $this->once()
+        )->method(
+            'registry'
+        )->with(
+            'config_system_email_template'
+        )->willReturn(
+            $collection
+        );
+
+        $this->_emailConfig->expects(
+            $this->never()
+        )->method(
+            'getTemplateLabel'
+        )->with('')
+        ->willThrowException(new \UnexpectedValueException("Email template '' is not defined."));
+
+        $expectedResult = [
+            [
+                'value' => 'template_one',
+                'label' => 'Template One',
+            ],
+            [
+                'value' => 'template_two',
+                'label' => 'Template Two',
+            ],
+        ];
+
+        $this->assertEquals($expectedResult, $this->_model->toOptionArray());
+    }}

From 3da492ba3249880803d657d4172b95d62af70980 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Wed, 29 Jul 2020 11:14:36 +0300
Subject: [PATCH 1091/1718] Fix static test after merge

---
 .../Magento/Catalog/view/frontend/templates/product/list.phtml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
index bdbf873a0cf2b..c805941fa0272 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
@@ -70,7 +70,7 @@ $_helper = $block->getData('outputHelper');
                         <strong class="product name product-item-name">
                             <a class="product-item-link"
                                href="<?= $escaper->escapeUrl($_product->getProductUrl()) ?>">
-                                <?=/* @noEscape */ $_helper->productAttribute($_product, $_product->getName(), 'name') ?>
+                                <?=/* @noEscape */ $_helper->productAttribute($_product, $_product->getName(), 'name')?>
                             </a>
                         </strong>
                         <?= $block->getReviewsSummaryHtml($_product, $templateType) ?>

From 43cfb8b36d39af46b23cbcfe1a9133775191606f Mon Sep 17 00:00:00 2001
From: Mykhailo Matiola <mykhailo.matiola@transoftgroup.com>
Date: Wed, 29 Jul 2020 12:09:46 +0300
Subject: [PATCH 1092/1718] MC-25196: Special/tier/group/rule/option prices for
 product in multiple websites

---
 .../CombinationAbstract.php}                  | 474 ++++++++++--------
 .../Render/PriceTypes/CombinationTest.php     | 112 +++++
 .../MultiWebsiteCombinationTest.php           | 188 +++++++
 .../product_with_price_on_second_website.php  |  78 +++
 ..._with_price_on_second_website_rollback.php |  40 ++
 ...ond_website_with_store_group_and_store.php |  56 +++
 ...te_with_store_group_and_store_rollback.php |  41 ++
 7 files changed, 772 insertions(+), 217 deletions(-)
 rename dev/tests/integration/testsuite/Magento/Catalog/Pricing/Render/{CombinationWithDifferentTypePricesTest.php => PriceTypes/CombinationAbstract.php} (55%)
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/Pricing/Render/PriceTypes/CombinationTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/Pricing/Render/PriceTypes/MultiWebsiteCombinationTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_price_on_second_website.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_price_on_second_website_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_store_group_and_store.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_store_group_and_store_rollback.php

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Pricing/Render/CombinationWithDifferentTypePricesTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Pricing/Render/PriceTypes/CombinationAbstract.php
similarity index 55%
rename from dev/tests/integration/testsuite/Magento/Catalog/Pricing/Render/CombinationWithDifferentTypePricesTest.php
rename to dev/tests/integration/testsuite/Magento/Catalog/Pricing/Render/PriceTypes/CombinationAbstract.php
index 7d366811952ca..fce502b2dfea0 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Pricing/Render/CombinationWithDifferentTypePricesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Pricing/Render/PriceTypes/CombinationAbstract.php
@@ -5,12 +5,16 @@
  */
 declare(strict_types=1);
 
-namespace Magento\Catalog\Pricing\Render;
+namespace Magento\Catalog\Pricing\Render\PriceTypes;
 
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
+use Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\Data\ProductTierPriceExtensionFactory;
 use Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Config\Source\ProductPriceOptionsInterface;
+use Magento\Catalog\Model\Product\Option;
 use Magento\CatalogRule\Api\CatalogRuleRepositoryInterface;
 use Magento\CatalogRule\Api\Data\RuleInterface;
 use Magento\CatalogRule\Api\Data\RuleInterfaceFactory;
@@ -19,45 +23,50 @@
 use Magento\Customer\Model\Session;
 use Magento\Framework\Registry;
 use Magento\Framework\View\Result\Page;
+use Magento\Framework\View\Result\PageFactory;
 use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Helper\Xpath;
 use Magento\TestFramework\ObjectManager;
 use PHPUnit\Framework\TestCase;
 
 /**
- * Assertions related to check product price rendering with combination of different price types.
+ * Base class for combination of different price types tests.
  *
- * @magentoDbIsolation disabled
- * @magentoAppArea frontend
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class CombinationWithDifferentTypePricesTest extends TestCase
+abstract class CombinationAbstract extends TestCase
 {
     /**
      * @var ObjectManager
      */
-    private $objectManager;
+    protected $objectManager;
 
     /**
      * @var Page
      */
-    private $page;
+    protected $page;
 
     /**
-     * @var Registry
+     * @var IndexBuilder
      */
-    private $registry;
+    protected $indexBuilder;
 
     /**
-     * @var IndexBuilder
+     * @var Session
      */
-    private $indexBuilder;
+    protected $customerSession;
 
     /**
-     * @var Session
+     * @var StoreManagerInterface
+     */
+    protected $storeManager;
+
+    /**
+     * @var Registry
      */
-    private $customerSession;
+    private $registry;
 
     /**
      * @var WebsiteRepositoryInterface
@@ -89,6 +98,11 @@ class CombinationWithDifferentTypePricesTest extends TestCase
      */
     private $productTierPriceExtensionFactory;
 
+    /**
+     * @var ProductCustomOptionInterfaceFactory
+     */
+    private $productCustomOptionFactory;
+
     /**
      * @inheritdoc
      */
@@ -96,17 +110,19 @@ protected function setUp(): void
     {
         parent::setUp();
         $this->objectManager = Bootstrap::getObjectManager();
-        $this->page = $this->objectManager->create(Page::class);
+        $this->page = $this->objectManager->get(PageFactory::class)->create();
         $this->registry = $this->objectManager->get(Registry::class);
         $this->indexBuilder = $this->objectManager->get(IndexBuilder::class);
         $this->customerSession = $this->objectManager->get(Session::class);
         $this->websiteRepository = $this->objectManager->get(WebsiteRepositoryInterface::class);
+        $this->storeManager = $this->objectManager->get(StoreManagerInterface::class);
         $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $this->productRepository->cleanCache();
         $this->catalogRuleFactory = $this->objectManager->get(RuleInterfaceFactory::class);
         $this->catalogRuleRepository = $this->objectManager->get(CatalogRuleRepositoryInterface::class);
         $this->productTierPriceFactory = $this->objectManager->get(ProductTierPriceInterfaceFactory::class);
         $this->productTierPriceExtensionFactory = $this->objectManager->get(ProductTierPriceExtensionFactory::class);
-        $this->productRepository->cleanCache();
+        $this->productCustomOptionFactory = $this->objectManager->get(ProductCustomOptionInterfaceFactory::class);
     }
 
     /**
@@ -116,29 +132,7 @@ protected function tearDown(): void
     {
         parent::tearDown();
         $this->registry->unregister('product');
-    }
-
-    /**
-     * Assert that product price rendered with expected special and regular prices if
-     * product has special price which lower than regular and tier prices.
-     *
-     * @magentoDataFixture Magento/Catalog/_files/product_special_price.php
-     *
-     * @dataProvider tierPricesForAllCustomerGroupsDataProvider
-     *
-     * @param float $specialPrice
-     * @param float $regularPrice
-     * @param array $tierPrices
-     * @param array|null $tierMessageConfig
-     * @return void
-     */
-    public function testRenderSpecialPriceInCombinationWithTierPrice(
-        float $specialPrice,
-        float $regularPrice,
-        array $tierPrices,
-        ?array $tierMessageConfig
-    ): void {
-        $this->assertRenderedPrices($specialPrice, $regularPrice, $tierPrices, $tierMessageConfig);
+        $this->registry->unregister('current_product');
     }
 
     /**
@@ -150,79 +144,48 @@ public function tierPricesForAllCustomerGroupsDataProvider(): array
     {
         return [
             'fixed_tier_price_with_qty_1' => [
-                5.99,
-                10,
-                [
-                    ['customer_group_id' => Group::CUST_GROUP_ALL, 'qty' => 1, 'value' => 9],
+                'special_price' => 5.99,
+                'regular_price' => 10,
+                'tier_data' => [
+                    'prices' => [['customer_group_id' => Group::CUST_GROUP_ALL, 'qty' => 1, 'value' => 9]],
+                    'message_config' => null,
                 ],
-                null
             ],
             'fixed_tier_price_with_qty_2' => [
-                5.99,
-                10,
-                [
-                    ['customer_group_id' => Group::CUST_GROUP_ALL, 'qty' => 2, 'value' => 5],
+                'special_price' => 5.99,
+                'regular_price' => 10,
+                'tier_data' => [
+                    'prices' => [['customer_group_id' => Group::CUST_GROUP_ALL, 'qty' => 2, 'value' => 5]],
+                    'message_config' => ['qty' => 2, 'price' => 5.00, 'percent' => 17],
                 ],
-                ['qty' => 2, 'price' => 5.00, 'percent' => 17],
             ],
             'percent_tier_price_with_qty_2' => [
-                5.99,
-                10,
-                [
-                    ['customer_group_id' => Group::CUST_GROUP_ALL, 'qty' => 2, 'percent_value' => 70],
+                'special_price' => 5.99,
+                'regular_price' => 10,
+                'tier_data' => [
+                    'prices' => [['customer_group_id' => Group::CUST_GROUP_ALL, 'qty' => 2, 'percent_value' => 70]],
+                    'message_config' => ['qty' => 2, 'price' => 3.00, 'percent' => 50],
                 ],
-                ['qty' => 2, 'price' => 3.00, 'percent' => 50],
             ],
             'fixed_tier_price_with_qty_1_is_lower_than_special' => [
-                5,
-                10,
-                [
-                    ['customer_group_id' => Group::CUST_GROUP_ALL, 'qty' => 1, 'value' => 5],
+                'special_price' => 5,
+                'regular_price' => 10,
+                'tier_data' => [
+                    'prices' => [['customer_group_id' => Group::CUST_GROUP_ALL, 'qty' => 1, 'value' => 5]],
+                    'message_config' => null,
                 ],
-                null
             ],
             'percent_tier_price_with_qty_1_is_lower_than_special' => [
-                3,
-                10,
-                [
-                    ['customer_group_id' => Group::NOT_LOGGED_IN_ID, 'qty' => 1, 'percent_value' => 70],
+                'special_price' => 3,
+                'regular_price' => 10,
+                'tier_data' => [
+                    'prices' => [['customer_group_id' => Group::NOT_LOGGED_IN_ID, 'qty' => 1, 'percent_value' => 70]],
+                    'message_config' => null,
                 ],
-                null
             ],
         ];
     }
 
-    /**
-     * Assert that product price rendered with expected special and regular prices if
-     * product has special price which lower than regular and tier prices and customer is logged.
-     *
-     * @magentoDataFixture Magento/Catalog/_files/product_special_price.php
-     * @magentoDataFixture Magento/Customer/_files/customer.php
-     *
-     * @magentoAppIsolation enabled
-     *
-     * @dataProvider tierPricesForLoggedCustomerGroupDataProvider
-     *
-     * @param float $specialPrice
-     * @param float $regularPrice
-     * @param array $tierPrices
-     * @param array|null $tierMessageConfig
-     * @return void
-     */
-    public function testRenderSpecialPriceInCombinationWithTierPriceForLoggedInUser(
-        float $specialPrice,
-        float $regularPrice,
-        array $tierPrices,
-        ?array $tierMessageConfig
-    ): void {
-        try {
-            $this->customerSession->setCustomerId(1);
-            $this->assertRenderedPrices($specialPrice, $regularPrice, $tierPrices, $tierMessageConfig);
-        } finally {
-            $this->customerSession->setCustomerId(null);
-        }
-    }
-
     /**
      * Data provider with tier prices which are for logged customers group.
      *
@@ -232,52 +195,24 @@ public function tierPricesForLoggedCustomerGroupDataProvider(): array
     {
         return [
             'fixed_tier_price_with_qty_1' => [
-                5.99,
-                10,
-                [
-                    ['customer_group_id' => 1, 'qty' => 1, 'value' => 9],
+                'special_price' => 5.99,
+                'regular_price' => 10,
+                'tier_data' => [
+                    'prices' => [['customer_group_id' => 1, 'qty' => 1, 'value' => 9]],
+                    'message_config' => null,
                 ],
-                null
             ],
             'percent_tier_price_with_qty_1' => [
-                5.99,
-                10,
-                [
-                    ['customer_group_id' => 1, 'qty' => 1, 'percent_value' => 30],
+                'special_price' => 5.99,
+                'regular_price' => 10,
+                'tier_data' => [
+                    'prices' => [['customer_group_id' => 1, 'qty' => 1, 'percent_value' => 30]],
+                    'message_config' => null,
                 ],
-                null
             ],
         ];
     }
 
-    /**
-     * Assert that product price rendered with expected special and regular prices if
-     * product has catalog rule price with different type of prices.
-     *
-     * @magentoDataFixture Magento/Catalog/_files/product_special_price.php
-     * @magentoDataFixture Magento/CatalogRule/_files/delete_catalog_rule_data.php
-     *
-     * @dataProvider catalogRulesDataProvider
-     *
-     * @param float $specialPrice
-     * @param float $regularPrice
-     * @param array $catalogRules
-     * @param array $tierPrices
-     * @param array|null $tierMessageConfig
-     * @return void
-     */
-    public function testRenderCatalogRulePriceInCombinationWithDifferentPriceTypes(
-        float $specialPrice,
-        float $regularPrice,
-        array $catalogRules,
-        array $tierPrices,
-        ?array $tierMessageConfig
-    ): void {
-        $this->createCatalogRulesForProduct($catalogRules);
-        $this->indexBuilder->reindexFull();
-        $this->assertRenderedPrices($specialPrice, $regularPrice, $tierPrices, $tierMessageConfig);
-    }
-
     /**
      * Data provider with expect special and regular price, catalog rule data and tier price.
      *
@@ -287,84 +222,99 @@ public function catalogRulesDataProvider(): array
     {
         return [
             'fixed_catalog_rule_price_more_than_special_price' => [
-                5.99,
-                10,
-                [
+                'special_price' => 5.99,
+                'regular_price' => 10,
+                'catalog_rules' => [
                     [RuleInterface::DISCOUNT_AMOUNT => 2],
                 ],
-                [],
-                null
+                'tier_data' => ['prices' => [], 'message_config' => null],
             ],
             'fixed_catalog_rule_price_lower_than_special_price' => [
-                2,
-                10,
-                [
+                'special_price' => 2,
+                'regular_price' => 10,
+                'catalog_rules' => [
                     [RuleInterface::DISCOUNT_AMOUNT => 8],
                 ],
-                [],
-                null
+                'tier_data' => ['prices' => [], 'message_config' => null],
             ],
             'fixed_catalog_rule_price_more_than_tier_price' => [
-                4,
-                10,
-                [
+                'special_price' => 4,
+                'regular_price' => 10,
+                'catalog_rules' => [
                     [RuleInterface::DISCOUNT_AMOUNT => 6],
                 ],
-                [
-                    ['customer_group_id' => Group::CUST_GROUP_ALL, 'qty' => 2, 'percent_value' => 70],
+                'tier_data' => [
+                    'prices' => [['customer_group_id' => Group::CUST_GROUP_ALL, 'qty' => 2, 'percent_value' => 70]],
+                    'message_config' => ['qty' => 2, 'price' => 3.00, 'percent' => 25],
                 ],
-                ['qty' => 2, 'price' => 3.00, 'percent' => 25],
             ],
             'fixed_catalog_rule_price_lower_than_tier_price' => [
-                2,
-                10,
-                [
+                'special_price' => 2,
+                'regular_price' => 10,
+                'catalog_rules' => [
                     [RuleInterface::DISCOUNT_AMOUNT => 7],
                 ],
-                [
-                    ['customer_group_id' => Group::CUST_GROUP_ALL, 'qty' => 1, 'value' => 2],
+                'tier_data' => [
+                    'prices' => [['customer_group_id' => Group::CUST_GROUP_ALL, 'qty' => 1, 'value' => 2]],
+                    'message_config' => null,
                 ],
-                null
             ],
             'adjust_percent_catalog_rule_price_lower_than_special_price' => [
-                4.50,
-                10,
-                [
+                'special_price' => 4.50,
+                'regular_price' => 10,
+                'catalog_rules' => [
                     [RuleInterface::DISCOUNT_AMOUNT => 45, RuleInterface::SIMPLE_ACTION => 'to_percent'],
                 ],
-                [],
-                null
+                'tier_data' => ['prices' => [], 'message_config' => null],
             ],
             'adjust_percent_catalog_rule_price_lower_than_tier_price' => [
-                3,
-                10,
-                [
+                'special_price' => 3,
+                'regular_price' => 10,
+                'catalog_rules' => [
                     [RuleInterface::DISCOUNT_AMOUNT => 30, RuleInterface::SIMPLE_ACTION => 'to_percent'],
                 ],
-                [
-                    ['customer_group_id' => Group::CUST_GROUP_ALL, 'qty' => 1, 'value' => 3.50],
+                'tier_data' => [
+                    'prices' => [['customer_group_id' => Group::CUST_GROUP_ALL, 'qty' => 1, 'value' => 3.50]],
+                    'message_config' => null,
                 ],
-                null
             ],
             'percent_catalog_rule_price_lower_than_special_price' => [
-                2,
-                10,
-                [
+                'special_price' => 2,
+                'regular_price' => 10,
+                'catalog_rules' => [
                     [RuleInterface::DISCOUNT_AMOUNT => 2, RuleInterface::SIMPLE_ACTION => 'to_fixed'],
                 ],
-                [],
-                null
+                'tier_data' => ['prices' => [], 'message_config' => null],
             ],
             'percent_catalog_rule_price_lower_than_tier_price' => [
-                1,
-                10,
-                [
+                'special_price' => 1,
+                'regular_price' => 10,
+                'catalog_rules' => [
                     [RuleInterface::DISCOUNT_AMOUNT => 1, RuleInterface::SIMPLE_ACTION => 'to_fixed'],
                 ],
-                [
-                    ['customer_group_id' => Group::CUST_GROUP_ALL, 'qty' => 1, 'value' => 3],
+                'tier_data' => [
+                    'prices' => [['customer_group_id' => Group::CUST_GROUP_ALL, 'qty' => 1, 'value' => 3]],
+                    'message_config' => null,
                 ],
-                null
+            ],
+        ];
+    }
+
+    /**
+     * Data provider with percent customizable option prices.
+     *
+     * @return array
+     */
+    public function percentCustomOptionsDataProvider(): array
+    {
+        return [
+            'percent_option_for_product_without_special_price' => [
+                'option_price' => 5,
+                'product_prices' => ['special_price' => null],
+            ],
+            'percent_option_for_product_with_special_price' => [
+                'option_price' => 3,
+                'product_prices' => ['special_price' => 5.99],
             ],
         ];
     }
@@ -377,7 +327,7 @@ public function catalogRulesDataProvider(): array
      * @param float $regularPrice
      * @return void
      */
-    private function checkPrices(string $priceHtml, float $specialPrice, float $regularPrice): void
+    protected function checkPrices(string $priceHtml, float $specialPrice, float $regularPrice): void
     {
         $this->assertEquals(
             1,
@@ -403,7 +353,7 @@ private function checkPrices(string $priceHtml, float $specialPrice, float $regu
      * @param array $tierMessageConfig
      * @return void
      */
-    private function checkTierPriceMessage(string $priceHtml, array $tierMessageConfig): void
+    protected function checkTierPriceMessage(string $priceHtml, array $tierMessageConfig): void
     {
         $this->assertEquals(
             1,
@@ -418,38 +368,40 @@ private function checkTierPriceMessage(string $priceHtml, array $tierMessageConf
      * @param ProductInterface $product
      * @return string
      */
-    private function getPriceHtml(ProductInterface $product): string
+    protected function getPriceHtml(ProductInterface $product): string
     {
-        $this->registerProduct($product);
-        $this->page->addHandle([
-            'default',
-            'catalog_product_view',
-        ]);
-        $this->page->getLayout()->generateXml();
-        $priceHtml = '';
-        $availableChildNames = [
-            'product.info.price',
-            'product.price.tier'
-        ];
-        foreach ($this->page->getLayout()->getChildNames('product.info.main') as $childName) {
-            if (in_array($childName, $availableChildNames, true)) {
-                $priceHtml .= $this->page->getLayout()->renderElement($childName, false);
-            }
-        }
+        $this->preparePageLayout($product);
+        $priceHtml = $this->page->getLayout()->renderElement('product.info.price', false);
+        $priceHtml .= $this->page->getLayout()->renderElement('product.price.tier', false);
 
         return $priceHtml;
     }
 
+    /**
+     * Render custom options price render template with product.
+     *
+     * @param ProductInterface $product
+     * @return string
+     */
+    protected function getCustomOptionsPriceHtml(ProductInterface $product): string
+    {
+        $this->preparePageLayout($product);
+
+        return  $this->page->getLayout()->renderElement('product.info.options', false);
+    }
+
     /**
      * Add product to the registry.
      *
      * @param ProductInterface $product
      * @return void
      */
-    private function registerProduct(ProductInterface $product): void
+    protected function registerProduct(ProductInterface $product): void
     {
         $this->registry->unregister('product');
         $this->registry->register('product', $product);
+        $this->registry->unregister('current_product');
+        $this->registry->register('current_product', $product);
     }
 
     /**
@@ -457,10 +409,14 @@ private function registerProduct(ProductInterface $product): void
      *
      * @param ProductInterface $product
      * @param array $tierPrices
+     * @param int $websiteId
      * @return ProductInterface
      */
-    private function createTierPricesForProduct(ProductInterface $product, array $tierPrices): ProductInterface
-    {
+    protected function createTierPricesForProduct(
+        ProductInterface $product,
+        array $tierPrices,
+        int $websiteId
+    ): ProductInterface {
         if (empty($tierPrices)) {
             return $product;
         }
@@ -468,7 +424,7 @@ private function createTierPricesForProduct(ProductInterface $product, array $ti
         $createdTierPrices = [];
         foreach ($tierPrices as $tierPrice) {
             $tierPriceExtensionAttribute = $this->productTierPriceExtensionFactory->create();
-            $tierPriceExtensionAttribute->setWebsiteId(0);
+            $tierPriceExtensionAttribute->setWebsiteId($websiteId);
 
             if (isset($tierPrice['percent_value'])) {
                 $tierPriceExtensionAttribute->setPercentageValue($tierPrice['percent_value']);
@@ -487,10 +443,35 @@ private function createTierPricesForProduct(ProductInterface $product, array $ti
     }
 
     /**
+     * Add custom option to product with data.
+     *
+     * @param ProductInterface $product
+     * @return void
+     */
+    protected function addOptionToProduct(ProductInterface $product): void
+    {
+        $optionData = [
+            Option::KEY_PRODUCT_SKU => $product->getSku(),
+            Option::KEY_TITLE => 'Test option field title',
+            Option::KEY_TYPE => ProductCustomOptionInterface::OPTION_TYPE_FIELD,
+            Option::KEY_IS_REQUIRE => 0,
+            Option::KEY_PRICE => 50,
+            Option::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_PERCENT,
+            Option::KEY_SKU => 'test-option-field-title',
+        ];
+        $option = $this->productCustomOptionFactory->create(['data' => $optionData]);
+        $option->setProductSku($product->getSku());
+        $product->setOptions([$option]);
+        $product->setHasOptions(true);
+    }
+
+    /**
+     * Returns xpath for special price.
+     *
      * @param float $specialPrice
      * @return string
      */
-    private function getSpecialPriceXpath(float $specialPrice): string
+    protected function getSpecialPriceXpath(float $specialPrice): string
     {
         $pathsForSearch = [
             "//div[contains(@class, 'price-box') and contains(@class, 'price-final_price')]",
@@ -502,10 +483,12 @@ private function getSpecialPriceXpath(float $specialPrice): string
     }
 
     /**
+     * Returns xpath for regular price.
+     *
      * @param float $regularPrice
      * @return string
      */
-    private function getRegularPriceXpath(float $regularPrice): string
+    protected function getRegularPriceXpath(float $regularPrice): string
     {
         $pathsForSearch = [
             "//div[contains(@class, 'price-box') and contains(@class, 'price-final_price')]",
@@ -518,28 +501,29 @@ private function getRegularPriceXpath(float $regularPrice): string
     }
 
     /**
+     * Returns xpath for regular price label.
+     *
      * @return string
      */
-    private function getRegularPriceLabelXpath(): string
+    protected function getRegularPriceLabelXpath(): string
     {
         $pathsForSearch = [
             "//div[contains(@class, 'price-box') and contains(@class, 'price-final_price')]",
             "//span[contains(@class, 'old-price')]",
             "//span[contains(@class, 'price-container')]",
-            "//span[text()='Regular Price']",
+            sprintf("//span[normalize-space(text())='%s']", __('Regular Price')),
         ];
 
         return implode('', $pathsForSearch);
     }
 
     /**
-     * Return tier price message xpath. Message must contain expected quantity,
-     * price and discount percent.
+     * Return tier price message xpath. Message must contain expected quantity, price and discount percent.
      *
      * @param array $expectedMessage
      * @return string
      */
-    private function getTierPriceMessageXpath(array $expectedMessage): string
+    protected function getTierPriceMessageXpath(array $expectedMessage): string
     {
         [$qty, $price, $percent] = array_values($expectedMessage);
         $liPaths = [
@@ -557,36 +541,60 @@ private function getTierPriceMessageXpath(array $expectedMessage): string
     /**
      * Process test with combination of special and tier price.
      *
+     * @param string $sku
      * @param float $specialPrice
      * @param float $regularPrice
-     * @param array $tierPrices
-     * @param array|null $tierMessageConfig
+     * @param array $tierData
+     * @param int $websiteId
      * @return void
      */
-    private function assertRenderedPrices(
+    public function assertRenderedPrices(
+        string $sku,
         float $specialPrice,
         float $regularPrice,
-        array $tierPrices,
-        ?array $tierMessageConfig
+        array $tierData,
+        int $websiteId = 0
     ): void {
-        $product = $this->productRepository->get('simple', false, null, true);
-        $product = $this->createTierPricesForProduct($product, $tierPrices);
+        $product = $this->getProduct($sku);
+        $product = $this->createTierPricesForProduct($product, $tierData['prices'], $websiteId);
         $priceHtml = $this->getPriceHtml($product);
         $this->checkPrices($priceHtml, $specialPrice, $regularPrice);
-        if (null !== $tierMessageConfig) {
-            $this->checkTierPriceMessage($priceHtml, $tierMessageConfig);
+        if (null !== $tierData['message_config']) {
+            $this->checkTierPriceMessage($priceHtml, $tierData['message_config']);
         }
     }
 
+    /**
+     * Process test with combination of special and custom option price.
+     *
+     * @param string $sku
+     * @param float $optionPrice
+     * @param array $productPrices
+     * @return void
+     */
+    public function assertRenderedCustomOptionPrices(
+        string $sku,
+        float $optionPrice,
+        array $productPrices
+    ): void {
+        $product = $this->getProduct($sku);
+        $product->addData($productPrices);
+        $this->addOptionToProduct($product);
+        $this->productRepository->save($product);
+        $priceHtml = $this->getCustomOptionsPriceHtml($this->getProduct($sku));
+        $this->assertStringContainsString(sprintf('data-price-amount="%s"', $optionPrice), $priceHtml);
+    }
+
     /**
      * Create provided catalog rules.
      *
      * @param array $catalogRules
+     * @param string $websiteCode
      * @return void
      */
-    private function createCatalogRulesForProduct(array $catalogRules): void
+    protected function createCatalogRulesForProduct(array $catalogRules, string $websiteCode): void
     {
-        $baseWebsite = $this->websiteRepository->get('base');
+        $baseWebsite = $this->websiteRepository->get($websiteCode);
         $staticRuleData = [
             RuleInterface::IS_ACTIVE => 1,
             RuleInterface::NAME => 'Test rule name.',
@@ -605,4 +613,36 @@ private function createCatalogRulesForProduct(array $catalogRules): void
             $this->catalogRuleRepository->save($catalogRule);
         }
     }
+
+    /**
+     * Loads product by sku.
+     *
+     * @param string $sku
+     * @return ProductInterface
+     */
+    protected function getProduct(string $sku): ProductInterface
+    {
+        return $this->productRepository->get(
+            $sku,
+            false,
+            null,
+            true
+        );
+    }
+
+    /**
+     * Prepares product page layout.
+     *
+     * @param ProductInterface $product
+     * @return void
+     */
+    private function preparePageLayout(ProductInterface $product): void
+    {
+        $this->registerProduct($product);
+        $this->page->addHandle([
+            'default',
+            'catalog_product_view',
+        ]);
+        $this->page->getLayout()->generateXml();
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Pricing/Render/PriceTypes/CombinationTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Pricing/Render/PriceTypes/CombinationTest.php
new file mode 100644
index 0000000000000..f30e0492fc23e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Pricing/Render/PriceTypes/CombinationTest.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Pricing\Render\PriceTypes;
+
+/**
+ * Assertions related to check product price rendering with combination of different price types.
+ *
+ * @magentoDbIsolation disabled
+ * @magentoAppArea frontend
+ * @magentoAppIsolation enabled
+ */
+class CombinationTest extends CombinationAbstract
+{
+    /**
+     * Assert that product price rendered with expected special and regular prices if
+     * product has special price which lower than regular and tier prices.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_special_price.php
+     *
+     * @dataProvider tierPricesForAllCustomerGroupsDataProvider
+     *
+     * @param float $specialPrice
+     * @param float $regularPrice
+     * @param array $tierData
+     * @return void
+     */
+    public function testRenderSpecialPriceInCombinationWithTierPrice(
+        float $specialPrice,
+        float $regularPrice,
+        array $tierData
+    ): void {
+        $this->assertRenderedPrices('simple', $specialPrice, $regularPrice, $tierData);
+    }
+
+    /**
+     * Assert that product price rendered with expected special and regular prices if
+     * product has special price which lower than regular and tier prices and customer is logged.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_special_price.php
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     *
+     * @magentoAppIsolation enabled
+     *
+     * @dataProvider tierPricesForLoggedCustomerGroupDataProvider
+     *
+     * @param float $specialPrice
+     * @param float $regularPrice
+     * @param array $tierData
+     * @return void
+     */
+    public function testRenderSpecialPriceInCombinationWithTierPriceForLoggedInUser(
+        float $specialPrice,
+        float $regularPrice,
+        array $tierData
+    ): void {
+        try {
+            $this->customerSession->setCustomerId(1);
+            $this->assertRenderedPrices('simple', $specialPrice, $regularPrice, $tierData);
+        } finally {
+            $this->customerSession->setCustomerId(null);
+        }
+    }
+
+    /**
+     * Assert that product price rendered with expected special and regular prices if
+     * product has catalog rule price with different type of prices.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_special_price.php
+     * @magentoDataFixture Magento/CatalogRule/_files/delete_catalog_rule_data.php
+     *
+     * @dataProvider catalogRulesDataProvider
+     *
+     * @param float $specialPrice
+     * @param float $regularPrice
+     * @param array $catalogRules
+     * @param array $tierData
+     * @return void
+     */
+    public function testRenderCatalogRulePriceInCombinationWithDifferentPriceTypes(
+        float $specialPrice,
+        float $regularPrice,
+        array $catalogRules,
+        array $tierData
+    ): void {
+        $this->createCatalogRulesForProduct($catalogRules, 'base');
+        $this->indexBuilder->reindexFull();
+        $this->assertRenderedPrices('simple', $specialPrice, $regularPrice, $tierData);
+    }
+
+    /**
+     * Assert that product price rendered with expected custom option price if product has special price.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_special_price.php
+     *
+     * @dataProvider percentCustomOptionsDataProvider
+     *
+     * @param float $optionPrice
+     * @param array $productPrices
+     * @return void
+     */
+    public function testRenderSpecialPriceInCombinationWithCustomOptionPrice(
+        float $optionPrice,
+        array $productPrices
+    ): void {
+        $this->assertRenderedCustomOptionPrices('simple', $optionPrice, $productPrices);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Pricing/Render/PriceTypes/MultiWebsiteCombinationTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Pricing/Render/PriceTypes/MultiWebsiteCombinationTest.php
new file mode 100644
index 0000000000000..852acf63a3f64
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Pricing/Render/PriceTypes/MultiWebsiteCombinationTest.php
@@ -0,0 +1,188 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Pricing\Render\PriceTypes;
+
+use Magento\Framework\View\Result\PageFactory;
+use Magento\TestFramework\Store\ExecuteInStoreContext;
+
+/**
+ * Assertions related to check product price rendering with combination of different price types on second website.
+ *
+ * @magentoDbIsolation disabled
+ * @magentoAppArea frontend
+ */
+class MultiWebsiteCombinationTest extends CombinationAbstract
+{
+    /**
+     * @var ExecuteInStoreContext
+     */
+    private $executeInStoreContext;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->executeInStoreContext = $this->objectManager->get(ExecuteInStoreContext::class);
+    }
+
+    /**
+     * Assert that product price rendered with expected special and regular prices if
+     * product has special price which lower than regular and tier prices on second website.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_with_price_on_second_website.php
+     * @dataProvider tierPricesForAllCustomerGroupsDataProvider
+     *
+     * @param float $specialPrice
+     * @param float $regularPrice
+     * @param array $tierData
+     * @return void
+     */
+    public function testRenderSpecialPriceInCombinationWithTierPrice(
+        float $specialPrice,
+        float $regularPrice,
+        array $tierData
+    ): void {
+        $this->executeInStoreContext->execute(
+            'fixture_second_store',
+            [$this, 'assertRenderedPrices'],
+            'second-website-price-product',
+            $specialPrice,
+            $regularPrice,
+            $tierData,
+            (int)$this->storeManager->getStore('fixture_second_store')->getWebsiteId()
+        );
+        $this->assertRenderedPricesOnDefaultStore('second-website-price-product');
+    }
+
+    /**
+     * Assert that product price rendered with expected special and regular prices  on second website if
+     * product has special price which lower than regular and tier prices and customer is logged.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_with_price_on_second_website.php
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     *
+     * @magentoAppIsolation enabled
+     *
+     * @dataProvider tierPricesForLoggedCustomerGroupDataProvider
+     *
+     * @param float $specialPrice
+     * @param float $regularPrice
+     * @param array $tierData
+     * @return void
+     */
+    public function testRenderSpecialPriceInCombinationWithTierPriceForLoggedInUser(
+        float $specialPrice,
+        float $regularPrice,
+        array $tierData
+    ): void {
+        try {
+            $this->customerSession->setCustomerId(1);
+            $this->executeInStoreContext->execute(
+                'fixture_second_store',
+                [$this, 'assertRenderedPrices'],
+                'second-website-price-product',
+                $specialPrice,
+                $regularPrice,
+                $tierData,
+                (int)$this->storeManager->getStore('fixture_second_store')->getWebsiteId()
+            );
+            $this->assertRenderedPricesOnDefaultStore('second-website-price-product');
+        } finally {
+            $this->customerSession->setCustomerId(null);
+        }
+    }
+
+    /**
+     * Assert that product price rendered with expected special and regular prices if
+     * product has catalog rule price with different type of prices on second website.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_with_price_on_second_website.php
+     * @magentoDataFixture Magento/CatalogRule/_files/delete_catalog_rule_data.php
+     *
+     * @dataProvider catalogRulesDataProvider
+     *
+     * @param float $specialPrice
+     * @param float $regularPrice
+     * @param array $catalogRules
+     * @param array $tierData
+     * @return void
+     */
+    public function testRenderCatalogRulePriceInCombinationWithDifferentPriceTypes(
+        float $specialPrice,
+        float $regularPrice,
+        array $catalogRules,
+        array $tierData
+    ): void {
+        $this->createCatalogRulesForProduct($catalogRules, 'test');
+        $this->indexBuilder->reindexFull();
+        $this->executeInStoreContext->execute(
+            'fixture_second_store',
+            [$this, 'assertRenderedPrices'],
+            'second-website-price-product',
+            $specialPrice,
+            $regularPrice,
+            $tierData,
+            (int)$this->storeManager->getStore('fixture_second_store')->getWebsiteId()
+        );
+        $this->assertRenderedPricesOnDefaultStore('second-website-price-product');
+    }
+
+    /**
+     * Assert that product price rendered with expected custom option price if product has special price.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_with_price_on_second_website.php
+     *
+     * @dataProvider percentCustomOptionsDataProvider
+     *
+     * @param float $optionPrice
+     * @param array $productPrices
+     * @return void
+     */
+    public function testRenderSpecialPriceInCombinationWithCustomOptionPrice(
+        float $optionPrice,
+        array $productPrices
+    ): void {
+        $this->executeInStoreContext->execute(
+            'fixture_second_store',
+            [$this, 'assertRenderedCustomOptionPrices'],
+            'second-website-price-product',
+            $optionPrice,
+            $productPrices
+        );
+        $this->assertRenderedCustomOptionPricesOnDefaultStore('second-website-price-product');
+    }
+
+    /**
+     * Checks price data for product on default store.
+     *
+     * @param string $sku
+     * @return void
+     */
+    private function assertRenderedPricesOnDefaultStore(string $sku): void
+    {
+        //Reset layout page to get new block html
+        $this->page = $this->objectManager->get(PageFactory::class)->create();
+        $defaultStoreTierData = ['prices' => [], 'message_config' => null];
+        $this->assertRenderedPrices($sku, 15, 20, $defaultStoreTierData);
+    }
+
+    /**
+     * Checks custom option price data for product on default store.
+     *
+     * @param string $sku
+     * @return void
+     */
+    private function assertRenderedCustomOptionPricesOnDefaultStore(string $sku): void
+    {
+        //Reset layout page to get new block html
+        $this->page = $this->objectManager->get(PageFactory::class)->create();
+        $this->assertRenderedCustomOptionPrices($sku, 7.5, []);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_price_on_second_website.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_price_on_second_website.php
new file mode 100644
index 0000000000000..fd746578fcbf7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_price_on_second_website.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\Data\ProductInterfaceFactory;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Helper\Data;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Observer\SwitchPriceAttributeScopeOnConfigChange;
+use Magento\Config\Model\ResourceModel\Config;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Framework\Event\Observer;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\Store\Model\Store;
+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_store_group_and_store.php');
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Config $configResource */
+$configResource = $objectManager->get(Config::class);
+$configResource->saveConfig(Data::XML_PATH_PRICE_SCOPE, Store::PRICE_SCOPE_WEBSITE, 'default', 0);
+$objectManager->get(ReinitableConfigInterface::class)->reinit();
+/** @var SwitchPriceAttributeScopeOnConfigChange $observer */
+$observer = $objectManager->get(Observer::class);
+$objectManager->get(SwitchPriceAttributeScopeOnConfigChange::class)->execute($observer);
+/** @var ProductInterfaceFactory $productFactory */
+$productFactory = $objectManager->get(ProductInterfaceFactory::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+/** @var WebsiteRepositoryInterface $websiteRepository */
+$websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class);
+$websiteId = $websiteRepository->get('test')->getId();
+$defaultWebsiteId = $websiteRepository->get('base')->getId();
+/** @var StoreManagerInterface $storeManager */
+$storeManager = $objectManager->get(StoreManagerInterface::class);
+$secondStoreId = $storeManager->getStore('fixture_second_store')->getId();
+/** @var $product \Magento\Catalog\Model\Product */
+$product = $productFactory->create();
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
+    ->setWebsiteIds([$defaultWebsiteId, $websiteId])
+    ->setName('Second website price product')
+    ->setSku('second-website-price-product')
+    ->setPrice(20)
+    ->setSpecialPrice(15)
+    ->setWeight(1)
+    ->setMetaTitle('meta title')
+    ->setMetaKeyword('meta keyword')
+    ->setMetaDescription('meta description')
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setStockData(
+        [
+            'use_config_manage_stock' => 1,
+            'qty' => 100,
+            'is_in_stock' => 1
+        ]
+    );
+$productRepository->save($product);
+
+try {
+    $currentStoreCode = $storeManager->getStore()->getCode();
+    $storeManager->setCurrentStore('fixture_second_store');
+    $product = $productRepository->get('second-website-price-product', false, $secondStoreId, true);
+    $product->setPrice(10)
+        ->setSpecialPrice(5.99);
+    $productRepository->save($product);
+} finally {
+    $storeManager->setCurrentStore($currentStoreCode);
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_price_on_second_website_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_price_on_second_website_rollback.php
new file mode 100644
index 0000000000000..ce8d54d02a9ab
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_price_on_second_website_rollback.php
@@ -0,0 +1,40 @@
+<?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\Helper\Data;
+use Magento\Catalog\Observer\SwitchPriceAttributeScopeOnConfigChange;
+use Magento\Config\Model\ResourceModel\Config;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+$objectManager = Bootstrap::getObjectManager();
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+/** @var Config $configResource */
+$configResource = $objectManager->get(Config::class);
+$configResource->deleteConfig(Data::XML_PATH_PRICE_SCOPE, 'default', 0);
+$observer = $objectManager->get(Observer::class);
+$objectManager->get(SwitchPriceAttributeScopeOnConfigChange::class)->execute($observer);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+try {
+    $productRepository->deleteById('second-website-price-product');
+} catch (NoSuchEntityException $e) {
+    //product already deleted
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+
+Resolver::getInstance()->requireDataFixture(
+    'Magento/Store/_files/second_website_with_store_group_and_store_rollback.php'
+);
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_store_group_and_store.php b/dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_store_group_and_store.php
new file mode 100644
index 0000000000000..ca469840daa31
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_store_group_and_store.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\CatalogSearch\Model\Indexer\Fulltext;
+use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\Store\Api\Data\GroupInterface;
+use Magento\Store\Api\Data\GroupInterfaceFactory;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Api\Data\StoreInterfaceFactory;
+use \Magento\Store\Api\Data\WebsiteInterface;
+use \Magento\Store\Api\Data\WebsiteInterfaceFactory;
+use Magento\Store\Model\ResourceModel\Group as GroupResource;
+use Magento\Store\Model\ResourceModel\Store as StoreResource;
+use Magento\Store\Model\ResourceModel\Website as WebsiteResource;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var StoreManagerInterface $storeManager */
+$storeManager = $objectManager->get(StoreManagerInterface::class);
+/** @var WebsiteResource $websiteResource */
+$websiteResource = $objectManager->get(WebsiteResource::class);
+/** @var StoreResource $storeResource */
+$storeResource = $objectManager->get(StoreResource::class);
+/** @var GroupResource $groupResource */
+$groupResource = $objectManager->get(GroupResource::class);
+/** @var WebsiteInterface $website */
+$website = $objectManager->get(WebsiteInterfaceFactory::class)->create();
+$website->setCode('test')->setName('Test Website');
+$websiteResource->save($website);
+/** @var GroupInterface $storeGroup */
+$storeGroup = $objectManager->get(GroupInterfaceFactory::class)->create();
+$storeGroup->setCode('second_group')
+    ->setName('second store group')
+    ->setWebsite($website);
+$groupResource->save($storeGroup);
+/* Refresh stores memory cache */
+$storeManager->reinitStores();
+
+/** @var StoreInterface $store */
+$store = $objectManager->get(StoreInterfaceFactory::class)->create();
+$store->setCode('fixture_second_store')
+    ->setWebsiteId($website->getId())
+    ->setGroupId($storeGroup->getId())
+    ->setName('Fixture Second Store')
+    ->setSortOrder(10)
+    ->setIsActive(1);
+$storeResource->save($store);
+/* Refresh CatalogSearch index */
+/** @var IndexerRegistry $indexerRegistry */
+$indexerRegistry = $objectManager->get(IndexerRegistry::class);
+$indexerRegistry->get(Fulltext::INDEXER_ID)->reindexAll();
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_store_group_and_store_rollback.php b/dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_store_group_and_store_rollback.php
new file mode 100644
index 0000000000000..bc95019b8dc97
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_store_group_and_store_rollback.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Registry;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Api\Data\StoreInterfaceFactory;
+use Magento\Store\Api\Data\WebsiteInterface;
+use Magento\Store\Api\Data\WebsiteInterfaceFactory;
+use Magento\Store\Model\ResourceModel\Store as StoreResource;
+use Magento\Store\Model\ResourceModel\Website as WebsiteResource;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var WebsiteResource $websiteResource */
+$websiteResource = $objectManager->get(WebsiteResource::class);
+/** @var StoreResource $storeResource */
+$storeResource = $objectManager->get(StoreResource::class);
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+/** @var WebsiteInterface $website */
+$website = $objectManager->get(WebsiteInterfaceFactory::class)->create();
+$websiteResource->load($website, 'test', 'code');
+if ($website->getId()) {
+    $websiteResource->delete($website);
+}
+/** @var StoreInterface $store */
+$store = $objectManager->get(StoreInterfaceFactory::class)->create();
+$storeResource->load($store, 'fixture_second_store', 'code');
+if ($store->getId()) {
+    $storeResource->delete($store);
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);

From 584805741f205af9f1d67891a68c87f74d488191 Mon Sep 17 00:00:00 2001
From: SmVladyslav <vlatame.tsg@gmail.com>
Date: Wed, 29 Jul 2020 12:10:08 +0300
Subject: [PATCH 1093/1718] MC-31304: [ElasticSearch] Exception on catalog
 search result page

---
 .../Plugin/Category/Product/Attribute.php     |  23 +++-
 .../Plugin/Category/Product/AttributeTest.php |  48 ++++----
 .../Plugin/Category/Product/AttributeTest.php | 116 +++++++++++++++---
 3 files changed, 147 insertions(+), 40 deletions(-)

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 5b41f1093bdbe..05801bd62f658 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
@@ -13,6 +13,7 @@
 use Magento\Elasticsearch\Model\Indexer\IndexerHandler as ElasticsearchIndexerHandler;
 use Magento\Framework\Indexer\DimensionProviderInterface;
 use Magento\CatalogSearch\Model\Indexer\IndexerHandlerFactory;
+use Magento\Framework\Model\AbstractModel;
 use Magento\Framework\Exception\LocalizedException;
 
 /**
@@ -40,6 +41,11 @@ class Attribute
      */
     private $indexerHandlerFactory;
 
+    /**
+     * @var bool
+     */
+    private $isNewObject;
+
     /**
      * @param Config $config
      * @param Processor $indexerProcessor
@@ -72,7 +78,7 @@ public function afterSave(
         AttributeResourceModel $result
     ): AttributeResourceModel {
         $indexer = $this->indexerProcessor->getIndexer();
-        if ($indexer->isInvalid()
+        if ($this->isNewObject
             && !$indexer->isScheduled()
             && $this->config->isElasticsearchEnabled()
         ) {
@@ -89,4 +95,19 @@ public function afterSave(
 
         return $result;
     }
+
+    /**
+     * Check if mapping needs to be updated (attribute is new).
+     *
+     * @param AttributeResourceModel $subject
+     * @param AbstractModel $attribute
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeSave(
+        AttributeResourceModel $subject,
+        AbstractModel $attribute
+    ): void {
+        $this->isNewObject = $attribute->isObjectNew();
+    }
 }
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Category/Product/AttributeTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Category/Product/AttributeTest.php
index d37414cf63e68..a13bb844e5a8e 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Category/Product/AttributeTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Category/Product/AttributeTest.php
@@ -9,16 +9,17 @@
 
 use ArrayIterator;
 use Magento\Catalog\Model\ResourceModel\Attribute as AttributeResourceModel;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute as AttributeModel;
 use Magento\CatalogSearch\Model\Indexer\Fulltext\Processor;
 use Magento\CatalogSearch\Model\Indexer\IndexerHandlerFactory;
 use Magento\Elasticsearch\Model\Config;
-use Magento\Elasticsearch\Model\Indexer\Fulltext\Plugin\Category\Product\Attribute;
+use Magento\Elasticsearch\Model\Indexer\Fulltext\Plugin\Category\Product\Attribute as AttributePlugin;
 use Magento\Elasticsearch\Model\Indexer\IndexerHandler;
 use Magento\Framework\Indexer\DimensionProviderInterface;
 use Magento\Framework\Indexer\IndexerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use PHPUnit\Framework\MockObject\Rule\InvokedCount as InvokedCountMatcher;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\Rule\InvokedCount as InvokedCountMatcher;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -47,7 +48,7 @@ class AttributeTest extends TestCase
     private $indexerHandlerFactoryMock;
 
     /**
-     * @var Attribute
+     * @var AttributePlugin
      */
     private $attributePlugin;
 
@@ -65,7 +66,7 @@ protected function setUp(): void
         $this->indexerHandlerFactoryMock = $this->createMock(IndexerHandlerFactory::class);
 
         $this->attributePlugin = (new ObjectManager($this))->getObject(
-            Attribute::class,
+            AttributePlugin::class,
             [
                 'config' => $this->configMock,
                 'indexerProcessor' => $this->indexerProcessorMock,
@@ -78,30 +79,31 @@ protected function setUp(): void
     /**
      * Test update catalog search indexer process.
      *
-     * @param bool $isInvalid
+     * @param bool $isNewObject
      * @param bool $isElasticsearchEnabled
      * @param array $dimensions
      * @return void
      * @dataProvider afterSaveDataProvider
      *
      */
-    public function testAfterSave(bool $isInvalid, bool $isElasticsearchEnabled, array $dimensions): void
+    public function testAfterSave(bool $isNewObject, bool $isElasticsearchEnabled, array $dimensions): void
     {
-        $indexerData = ['indexer_example_data'];
-
+        /** @var AttributeModel $attribute */
+        $attribute = (new ObjectManager($this))->getObject(AttributeModel::class);
+        $attribute->isObjectNew($isNewObject);
         /** @var AttributeResourceModel|MockObject $subjectMock */
         $subjectMock = $this->createMock(AttributeResourceModel::class);
+        $this->attributePlugin->beforeSave($subjectMock, $attribute);
+
+        $indexerData = ['indexer_example_data'];
+
         /** @var IndexerInterface|MockObject $indexerMock */
         $indexerMock = $this->getMockBuilder(IndexerInterface::class)
-            ->setMethods(['isInvalid', 'getData'])
+            ->setMethods(['getData'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
 
-        $indexerMock->expects($this->once())
-            ->method('isInvalid')
-            ->willReturn($isInvalid);
-
-        $indexerMock->expects($this->getExpectsCount($isInvalid, $isElasticsearchEnabled))
+        $indexerMock->expects($this->getExpectsCount($isNewObject, $isElasticsearchEnabled))
             ->method('getData')
             ->willReturn($indexerData);
 
@@ -109,7 +111,7 @@ public function testAfterSave(bool $isInvalid, bool $isElasticsearchEnabled, arr
             ->method('getIndexer')
             ->willReturn($indexerMock);
 
-        $this->configMock->expects($isInvalid ? $this->once() : $this->never())
+        $this->configMock->expects($isNewObject ? $this->once() : $this->never())
             ->method('isElasticsearchEnabled')
             ->willReturn($isElasticsearchEnabled);
 
@@ -117,16 +119,16 @@ public function testAfterSave(bool $isInvalid, bool $isElasticsearchEnabled, arr
         $indexerHandlerMock = $this->createMock(IndexerHandler::class);
 
         $indexerHandlerMock
-            ->expects(($isInvalid && $isElasticsearchEnabled) ? $this->exactly(count($dimensions)) : $this->never())
+            ->expects(($isNewObject && $isElasticsearchEnabled) ? $this->exactly(count($dimensions)) : $this->never())
             ->method('updateIndex')
             ->willReturnSelf();
 
-        $this->indexerHandlerFactoryMock->expects($this->getExpectsCount($isInvalid, $isElasticsearchEnabled))
+        $this->indexerHandlerFactoryMock->expects($this->getExpectsCount($isNewObject, $isElasticsearchEnabled))
             ->method('create')
             ->with(['data' => $indexerData])
             ->willReturn($indexerHandlerMock);
 
-        $this->dimensionProviderMock->expects($this->getExpectsCount($isInvalid, $isElasticsearchEnabled))
+        $this->dimensionProviderMock->expects($this->getExpectsCount($isNewObject, $isElasticsearchEnabled))
             ->method('getIterator')
             ->willReturn(new ArrayIterator($dimensions));
 
@@ -143,8 +145,8 @@ public function afterSaveDataProvider(): array
         $dimensions = [['scope' => 1], ['scope' => 2]];
 
         return [
-            'save_without_invalidation' => [false, false, []],
-            'save_with_mysql_search' => [true, false, $dimensions],
+            'save_existing_object' => [false, false, $dimensions],
+            'save_with_another_search_engine' => [true, false, $dimensions],
             'save_with_elasticsearch' => [true, true, []],
             'save_with_elasticsearch_and_dimensions' => [true, true, $dimensions],
         ];
@@ -153,12 +155,12 @@ public function afterSaveDataProvider(): array
     /**
      * Retrieves how many times method is executed.
      *
-     * @param bool $isInvalid
+     * @param bool $isNewObject
      * @param bool $isElasticsearchEnabled
      * @return InvokedCountMatcher
      */
-    private function getExpectsCount(bool $isInvalid, bool $isElasticsearchEnabled): InvokedCountMatcher
+    private function getExpectsCount(bool $isNewObject, bool $isElasticsearchEnabled): InvokedCountMatcher
     {
-        return ($isInvalid && $isElasticsearchEnabled) ? $this->once() : $this->never();
+        return ($isNewObject && $isElasticsearchEnabled) ? $this->once() : $this->never();
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/Fulltext/Plugin/Category/Product/AttributeTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/Fulltext/Plugin/Category/Product/AttributeTest.php
index 1f5619ba9d450..c1fe6f11f6e6e 100644
--- a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/Fulltext/Plugin/Category/Product/AttributeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/Fulltext/Plugin/Category/Product/AttributeTest.php
@@ -9,12 +9,15 @@
 
 use Magento\AdvancedSearch\Model\Client\ClientInterface;
 use Magento\Catalog\Api\Data\EavAttributeInterface;
-use Magento\Catalog\Model\Product;
-use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Eav\AttributeFactory;
+use Magento\Catalog\Setup\CategorySetup;
 use Magento\CatalogSearch\Model\Indexer\Fulltext\Processor;
 use Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver;
 use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
 use Magento\Framework\Stdlib\ArrayManager;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 
@@ -44,9 +47,24 @@ class AttributeTest extends TestCase
     private $indexerProcessor;
 
     /**
-     * @var Attribute
+     * @var StoreManagerInterface
      */
-    private $attribute;
+    private $storeManager;
+
+    /**
+     * @var CategorySetup
+     */
+    private $installer;
+
+    /**
+     * @var AttributeFactory
+     */
+    private $attributeFactory;
+
+    /**
+     * @var ProductAttributeRepositoryInterface
+     */
+    private $attributeRepository;
 
     /**
      * @inheritdoc
@@ -60,30 +78,38 @@ protected function setUp(): void
         $this->arrayManager = Bootstrap::getObjectManager()->get(ArrayManager::class);
         $this->indexNameResolver = Bootstrap::getObjectManager()->get(IndexNameResolver::class);
         $this->indexerProcessor = Bootstrap::getObjectManager()->get(Processor::class);
-        $this->attribute = Bootstrap::getObjectManager()->get(Attribute::class);
+        $this->storeManager = Bootstrap::getObjectManager()->get(StoreManagerInterface::class);
+        $this->installer = Bootstrap::getObjectManager()->get(CategorySetup::class);
+        $this->attributeFactory = Bootstrap::getObjectManager()->get(AttributeFactory::class);
+        $this->attributeRepository = Bootstrap::getObjectManager()->get(ProductAttributeRepositoryInterface::class);
     }
 
     /**
-     * Check Elasticsearch indexer mapping is updated after changing non searchable attribute to searchable.
+     * @inheritdoc
+     */
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        /** @var ProductAttributeInterface $attribute */
+        $attribute = $this->attributeRepository->get('dropdown_attribute');
+        $this->attributeRepository->delete($attribute);
+    }
+
+    /**
+     * Check Elasticsearch indexer mapping is updated after creating attribute.
      *
      * @return void
      * @magentoConfigFixture default/catalog/search/engine elasticsearch7
      * @magentoDataFixture Magento/CatalogSearch/_files/full_reindex.php
-     * @magentoDataFixture Magento/Catalog/_files/dropdown_attribute.php
      */
     public function testCheckElasticsearchMappingAfterUpdateAttributeToSearchable(): void
     {
         $mappedAttributesBefore = $this->getMappingProperties();
-
-        $this->attribute->loadByCode(Product::ENTITY, 'dropdown_attribute');
-        $this->attribute->setData(EavAttributeInterface::IS_SEARCHABLE, true)->save();
-        $this->assertTrue($this->indexerProcessor->getIndexer()->isInvalid());
-
-        $mappedAttributesAfter = $this->getMappingProperties();
         $expectedResult = [
             'dropdown_attribute' => [
-                'type' => 'keyword',
-                'copy_to' => ['_search'],
+                'type' => 'integer',
+                'index' => false,
             ],
             'dropdown_attribute_value' => [
                 'type' => 'text',
@@ -91,7 +117,20 @@ public function testCheckElasticsearchMappingAfterUpdateAttributeToSearchable():
             ],
         ];
 
+        /** @var ProductAttributeInterface $dropDownAttribute */
+        $dropDownAttribute = $this->attributeFactory->create();
+        $dropDownAttribute->setData($this->getAttributeData());
+        $this->attributeRepository->save($dropDownAttribute);
+        $this->assertTrue($this->indexerProcessor->getIndexer()->isValid());
+
+        $mappedAttributesAfter = $this->getMappingProperties();
         $this->assertEquals($expectedResult, array_diff_key($mappedAttributesAfter, $mappedAttributesBefore));
+
+        $dropDownAttribute->setData(EavAttributeInterface::IS_SEARCHABLE, true);
+        $this->attributeRepository->save($dropDownAttribute);
+        $this->assertTrue($this->indexerProcessor->getIndexer()->isInvalid());
+
+        $this->assertEquals($mappedAttributesAfter, $this->getMappingProperties());
     }
 
     /**
@@ -101,11 +140,56 @@ public function testCheckElasticsearchMappingAfterUpdateAttributeToSearchable():
      */
     private function getMappingProperties(): array
     {
+        $storeId = $this->storeManager->getStore()->getId();
         $mappedIndexerId = $this->indexNameResolver->getIndexMapping(Processor::INDEXER_ID);
-        $indexName = $this->indexNameResolver->getIndexFromAlias(1, $mappedIndexerId);
+        $indexName = $this->indexNameResolver->getIndexFromAlias($storeId, $mappedIndexerId);
         $mappedAttributes = $this->client->getMapping(['index' => $indexName]);
         $pathField = $this->arrayManager->findPath('properties', $mappedAttributes);
 
         return $this->arrayManager->get($pathField, $mappedAttributes, []);
     }
+
+    /**
+     * Retrieve drop-down attribute data.
+     *
+     * @return array
+     */
+    private function getAttributeData(): array
+    {
+        $entityTypeId = $this->installer->getEntityTypeId(ProductAttributeInterface::ENTITY_TYPE_CODE);
+
+        return [
+            'attribute_code'                => 'dropdown_attribute',
+            'entity_type_id'                => $entityTypeId,
+            'is_global'                     => 0,
+            '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'           => 1,
+            'used_in_product_listing'       => 1,
+            'used_for_sort_by'              => 0,
+            'frontend_label'                => ['Drop-Down Attribute'],
+            'backend_type'                  => 'varchar',
+            'option'                        => [
+                'value' => [
+                    'option_1' => ['Option 1'],
+                    'option_2' => ['Option 2'],
+                    'option_3' => ['Option 3'],
+                ],
+                'order' => [
+                    'option_1' => 1,
+                    'option_2' => 2,
+                    'option_3' => 3,
+                ],
+            ],
+        ];
+    }
 }

From 09e6bdaac8244005d80b5c536b12f60982bc93a9 Mon Sep 17 00:00:00 2001
From: SmVladyslav <vlatame.tsg@gmail.com>
Date: Wed, 29 Jul 2020 12:34:47 +0300
Subject: [PATCH 1094/1718] MC-31304: [ElasticSearch] Exception on catalog
 search result page

---
 app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php b/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
index 2fd4880f83b76..24139e1b2efe3 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
@@ -344,6 +344,7 @@ public function updateAlias($storeId, $mappedIndexerId)
         // remove obsolete index
         if ($oldIndex) {
             $this->client->deleteIndex($oldIndex);
+            unset($this->indexByCode[$mappedIndexerId . '_' . $storeId]);
         }
 
         return $this;

From bf83c7fcae3d046a03db9bc7f12759034bf810b5 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Wed, 29 Jul 2020 11:42:55 +0200
Subject: [PATCH 1095/1718] Added end-to-end test for adding product with
 customizable options to the shopping cart

---
 .../AddSimpleProductToCartEndToEndTest.php    | 262 ++++++++++++++++++
 1 file changed, 262 insertions(+)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartEndToEndTest.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartEndToEndTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartEndToEndTest.php
new file mode 100644
index 0000000000000..a03c2eb1ff698
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartEndToEndTest.php
@@ -0,0 +1,262 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Quote;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Get customizable options of simple product via the corresponding GraphQl query and add the product
+ * with customizable options to the shopping cart
+ */
+class AddSimpleProductToCartEndToEndTest extends GraphQlAbstract
+{
+    /**
+     * @var GetCustomOptionsWithUIDForQueryBySku
+     */
+    private $getCustomOptionsWithIDV2ForQueryBySku;
+
+    /**
+     * @var GetMaskedQuoteIdByReservedOrderId
+     */
+    private $getMaskedQuoteIdByReservedOrderId;
+
+    /**
+     * @var GetCartItemOptionsFromUID
+     */
+    private $getCartItemOptionsFromUID;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+        $this->getCartItemOptionsFromUID = $objectManager->get(GetCartItemOptionsFromUID::class);
+        $this->getCustomOptionsWithIDV2ForQueryBySku = $objectManager->get(
+            GetCustomOptionsWithUIDForQueryBySku::class
+        );
+    }
+
+    /**
+     * Test adding a simple product to the shopping cart with all supported
+     * customizable options assigned
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_with_options.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     */
+    public function testAddSimpleProductWithOptions()
+    {
+        $sku = 'simple';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
+        $qty = 1;
+
+        $productOptionsData = $this->getProductOptionsViaQuery($sku);
+
+        $itemOptionsQuery = preg_replace(
+            '/"([^"]+)"\s*:\s*/',
+            '$1:',
+            json_encode($productOptionsData['received_options'])
+        );
+
+        $query = $this->getAddToCartMutation($maskedQuoteId, $qty, $sku, trim($itemOptionsQuery, '{}'));
+        $response = $this->graphQlMutation($query);
+
+        self::assertArrayHasKey('customizable_options', $response['addProductsToCart']['cart']['items'][0]);
+
+        foreach ($response['addProductsToCart']['cart']['items'][0]['customizable_options'] as $option) {
+            self::assertEquals($productOptionsData['expected_options'][$option['id']], $option['values'][0]['value']);
+        }
+    }
+
+    /**
+     * Get product data with customizable options using GraphQl query
+     *
+     * @param string $sku
+     * @return array
+     * @throws \Exception
+     */
+    private function getProductOptionsViaQuery(string $sku): array
+    {
+        $query = $this->getProductQuery($sku);
+        $response = $this->graphQlQuery($query);
+        self::assertArrayHasKey('options', $response['products']['items'][0]);
+
+        $expectedItemOptions = [];
+        $receivedItemOptions = [
+            'entered_options' => [],
+            'selected_options' => []
+        ];
+
+        foreach ($response['products']['items'][0]['options'] as $option) {
+            if (isset($option['entered_option'])) {
+                /* The date normalization is required since the attribute might value is formatted by the system */
+                if ($option['title'] === 'date option') {
+                    $value = '2012-12-12 00:00:00';
+                    $expectedItemOptions[$option['option_id']] = date('M d, Y', strtotime($value));
+                } else {
+                    $value = 'test';
+                    $expectedItemOptions[$option['option_id']] = $value;
+                }
+                $value = $option['title'] === 'date option' ? '2012-12-12 00:00:00' : 'test';
+
+                $receivedItemOptions['entered_options'][] = [
+                    'id' => $option['entered_option']['uid'],
+                    'value' => $value
+                ];
+
+
+            } elseif (isset($option['selected_option'])) {
+                $receivedItemOptions['selected_options'][] = reset($option['selected_option'])['uid'];
+                $expectedItemOptions[$option['option_id']] = reset($option['selected_option'])['option_type_id'];
+            }
+        }
+
+        return [
+            'expected_options' => $expectedItemOptions,
+            'received_options' => $receivedItemOptions
+        ];
+    }
+
+    /**
+     * Returns GraphQL query for retrieving a product with customizable options
+     *
+     * @param string $sku
+     * @return string
+     */
+    private function getProductQuery(string $sku): string
+    {
+        $sku = $options = $values = null; // WTF?
+        return <<<QUERY
+query {
+  products(filter: { sku: { eq: "$sku" } }) {
+    items {
+      sku
+
+      ... on CustomizableProductInterface {
+        options {
+          option_id
+          title
+
+          ... on CustomizableRadioOption {
+            option_id
+            selected_option: value {
+              option_type_id
+              uid
+            }
+          }
+
+          ... on CustomizableDropDownOption {
+            option_id
+            selected_option: value {
+              option_type_id
+              uid
+            }
+          }
+
+          ... on CustomizableMultipleOption {
+            option_id
+            selected_option: value {
+              option_type_id
+              uid
+            }
+          }
+
+          ... on CustomizableCheckboxOption {
+            option_id
+            selected_option: value {
+              option_type_id
+              uid
+            }
+          }
+
+          ... on CustomizableAreaOption {
+            option_id
+            entered_option: value {
+              uid
+            }
+          }
+
+          ... on CustomizableFieldOption {
+            option_id
+            entered_option: value {
+              uid
+            }
+          }
+
+          ... on CustomizableFileOption {
+            option_id
+            entered_option: value {
+              uid
+            }
+          }
+
+          ... on CustomizableDateOption {
+            option_id
+            entered_option: value {
+              uid
+            }
+          }
+        }
+      }
+    }
+  }
+}
+QUERY;
+    }
+
+    /**
+     * Returns GraphQl mutation for adding item to cart
+     *
+     * @param string $maskedQuoteId
+     * @param int $qty
+     * @param string $sku
+     * @param string $customizableOptions
+     * @return string
+     */
+    private function getAddToCartMutation(
+        string $maskedQuoteId,
+        int $qty,
+        string $sku,
+        string $customizableOptions
+    ): string {
+        return <<<MUTATION
+mutation {
+    addProductsToCart(
+        cartId: "{$maskedQuoteId}",
+        cartItems: [
+            {
+                sku: "{$sku}"
+                quantity: {$qty}
+                {$customizableOptions}
+            }
+        ]
+    ) {
+        cart {
+            items {
+                quantity
+                ... on SimpleCartItem {
+                    customizable_options {
+                        label
+                        id
+                          values {
+                            value
+                        }
+                    }
+                }
+            }
+        },
+        userInputErrors {
+            message
+        }
+    }
+}
+MUTATION;
+    }
+}

From 354fcbd3216ed983ca6ff2dff7a1f5133cc5731e Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Wed, 29 Jul 2020 11:56:11 +0200
Subject: [PATCH 1096/1718] Added test case for adding available QTY + 1

---
 .../api-functional/phpunit_graphql.xml.dist   | 115 ------------------
 ...dSimpleProductToCartSingleMutationTest.php |  47 ++++++-
 2 files changed, 43 insertions(+), 119 deletions(-)
 delete mode 100644 dev/tests/api-functional/phpunit_graphql.xml.dist

diff --git a/dev/tests/api-functional/phpunit_graphql.xml.dist b/dev/tests/api-functional/phpunit_graphql.xml.dist
deleted file mode 100644
index 2f6ad1f9a37d4..0000000000000
--- a/dev/tests/api-functional/phpunit_graphql.xml.dist
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * PHPUnit configuration for GraphQL web API functional tests.
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.2/phpunit.xsd"
-         colors="true"
-         columns="max"
-         beStrictAboutTestsThatDoNotTestAnything="false"
-         bootstrap="./framework/bootstrap.php"
-         testSuiteLoaderClass="Magento\TestFramework\ApiSuiteLoader"
-         testSuiteLoaderFile="framework/Magento/TestFramework/ApiSuiteLoader.php"
->
-    <!-- Test suites definition -->
-    <testsuites>
-            <testsuite name="Magento GraphQL web API functional tests">
-                <file>testsuite/Magento/WebApiTest.php</file>
-            </testsuite>
-        <testsuite name="Magento GraphQL web API functional tests real suite">
-            <directory suffix="Test.php">testsuite/Magento/GraphQl</directory>
-        </testsuite>
-    </testsuites>
-
-    <!-- PHP INI settings and constants definition -->
-    <php>
-        <includePath>./testsuite</includePath>
-        <const name="TESTS_INSTALL_CONFIG_FILE" value="config/install-config-mysql.php"/>
-        <const name="TESTS_GLOBAL_CONFIG_FILE" value="config/config-global.php"/>
-        <!-- Webserver URL -->
-        <const name="TESTS_BASE_URL" value="http://magento.url"/>
-        <!-- Webserver API user -->
-        <const name="TESTS_WEBSERVICE_USER" value="admin"/>
-        <!-- Webserver API key -->
-        <const name="TESTS_WEBSERVICE_APIKEY" value="123123q"/>
-        <!-- Define if debugger should be started using XDEBUG_SESSION cookie -->
-        <const name="TESTS_XDEBUG_ENABLED" value="false"/>
-        <!-- Define XDEBUG_SESSION cookie value-->
-        <const name="TESTS_XDEBUG_SESSION" value="phpstorm" />
-
-        <ini name="date.timezone" value="America/Los_Angeles"/>
-
-        <!-- Semicolon-separated 'glob' patterns, that match global XML configuration files -->
-        <const name="TESTS_GLOBAL_CONFIG_DIR" value="../../../app/etc"/>
-        <!-- Whether to cleanup the application before running tests or not -->
-        <const name="TESTS_CLEANUP" value="enabled"/>
-        <!--Defines if Magento should be installed before tests execution-->
-        <const name="TESTS_MAGENTO_INSTALLATION" value="disabled"/>
-        <!-- Magento mode for tests execution. Possible values are "default", "developer" and "production". -->
-        <const name="TESTS_MAGENTO_MODE" value="default"/>
-        <const name="USE_OVERRIDE_CONFIG" value="enabled"/>
-    </php>
-
-    <!-- Test listeners -->
-    <listeners>
-        <listener class="Magento\TestFramework\Event\PhpUnit"/>
-        <listener class="Yandex\Allure\Adapter\AllureAdapter">
-            <arguments>
-                <string>var/allure-results</string> <!-- XML files output folder -->
-                <boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
-                <array> <!-- A list of custom annotations to ignore (optional) -->
-                    <element key="codingStandardsIgnoreStart">
-                        <string>codingStandardsIgnoreStart</string>
-                    </element>
-                    <element key="codingStandardsIgnoreEnd">
-                        <string>codingStandardsIgnoreEnd</string>
-                    </element>
-                    <element key="expectedExceptionMessageRegExp">
-                        <string>expectedExceptionMessageRegExp</string>
-                    </element>
-                    <element key="magentoAdminConfigFixture">
-                        <string>magentoAdminConfigFixture</string>
-                    </element>
-                    <element key="magentoAppArea">
-                        <string>magentoAppArea</string>
-                    </element>
-                    <element key="magentoAppIsolation">
-                        <string>magentoAppIsolation</string>
-                    </element>
-                    <element key="magentoCache">
-                        <string>magentoCache</string>
-                    </element>
-                    <element key="magentoComponentsDir">
-                        <string>magentoComponentsDir</string>
-                    </element>
-                    <element key="magentoConfigFixture">
-                        <string>magentoConfigFixture</string>
-                    </element>
-                    <element key="magentoDataFixture">
-                        <string>magentoDataFixture</string>
-                    </element>
-                    <element key="magentoDataFixtureBeforeTransaction">
-                        <string>magentoDataFixtureBeforeTransaction</string>
-                    </element>
-                    <element key="magentoDbIsolation">
-                        <string>magentoDbIsolation</string>
-                    </element>
-                    <element key="magentoIndexerDimensionMode">
-                        <string>magentoIndexerDimensionMode</string>
-                    </element>
-                    <element key="magentoApiDataFixture">
-                        <string>magentoApiDataFixture</string>
-                    </element>
-                    <element key="Override">
-                        <string>Override</string>
-                    </element>
-                </array>
-            </arguments>
-        </listener>
-    </listeners>
-</phpunit>
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php
index 2ab0de101a8f0..93959c1afbbaf 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php
@@ -73,7 +73,7 @@ public function testAddSimpleProductWithOptions()
             json_encode($itemOptions)
         );
 
-        $query = $this->getQuery($maskedQuoteId, $qty, $sku, trim($productOptionsQuery, '{}'));
+        $query = $this->getAddToCartMutation($maskedQuoteId, $qty, $sku, trim($productOptionsQuery, '{}'));
         $response = $this->graphQlMutation($query);
 
         self::assertArrayHasKey('items', $response['addProductsToCart']['cart']);
@@ -109,7 +109,7 @@ public function testAddProductWithWrongSku(string $sku, string $message)
     {
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
-        $query = $this->getQuery($maskedQuoteId, 1, $sku, '');
+        $query = $this->getAddToCartMutation($maskedQuoteId, 1, $sku, '');
         $response = $this->graphQlMutation($query);
 
         self::assertArrayHasKey('userInputErrors', $response['addProductsToCart']);
@@ -120,6 +120,34 @@ public function testAddProductWithWrongSku(string $sku, string $message)
         );
     }
 
+    /**
+     * The test covers the case when upon adding available_qty + 1 to the shopping cart, the cart is being
+     * cleared
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_without_custom_options.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     */
+    public function testAddToCartWithQtyPlusOne()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
+        $sku = 'simple-2';
+
+        $query = $this->getAddToCartMutation($maskedQuoteId, 100, $sku, '');
+        $response = $this->graphQlMutation($query);
+
+        self::assertEquals(100, $response['addProductsToCart']['cart']['total_quantity']);
+
+        $query = $this->getAddToCartMutation($maskedQuoteId, 1, $sku, '');
+        $response = $this->graphQlMutation($query);
+
+        self::assertArrayHasKey('userInputErrors', $response['addProductsToCart']);
+        self::assertEquals(
+            'The requested qty is not available',
+            $response['addProductsToCart']['userInputErrors'][0]['message']
+        );
+        self::assertEquals(100, $response['addProductsToCart']['cart']['total_quantity']);
+    }
+
     /**
      * @param int $quantity
      * @param string $message
@@ -134,7 +162,7 @@ public function testAddProductWithWrongQuantity(int $quantity, string $message)
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
         $sku = 'simple-2';
 
-        $query = $this->getQuery($maskedQuoteId, $quantity, $sku, '');
+        $query = $this->getAddToCartMutation($maskedQuoteId, $quantity, $sku, '');
         $response = $this->graphQlMutation($query);
         self::assertArrayHasKey('userInputErrors', $response['addProductsToCart']);
         self::assertCount(1, $response['addProductsToCart']['userInputErrors']);
@@ -188,7 +216,7 @@ public function wrongQuantityDataProvider(): array
      * @param string $customizableOptions
      * @return string
      */
-    private function getQuery(
+    private function getAddToCartMutation(
         string $maskedQuoteId,
         int $qty,
         string $sku,
@@ -207,6 +235,7 @@ private function getQuery(
         ]
     ) {
         cart {
+            total_quantity
             items {
                 quantity
                 ... on SimpleCartItem {
@@ -227,4 +256,14 @@ private function getQuery(
 }
 MUTATION;
     }
+
+    private function getCartQuery(string $maskedQuoteId)
+    {
+        return <<<QUERY
+{
+    cart(cart_id: "{$maskedQuoteId}") {
+        total_quantity
+}
+QUERY;
+    }
 }

From 780712ccc2746c26daa1baeb389d35f6ae2de193 Mon Sep 17 00:00:00 2001
From: Mykhailo Matiola <mykhailo.matiola@transoftgroup.com>
Date: Wed, 29 Jul 2020 13:51:18 +0300
Subject: [PATCH 1097/1718] MC-25185: Storefront: View product with cross-sells
 products

---
 .../Catalog/Block/Product/AbstractTest.php    | 173 ++++++---
 .../Product/ProductList/AbstractLinksTest.php |   8 +-
 .../Block/Product/ProductList/RelatedTest.php |   2 +-
 .../Block/Product/ProductList/UpsellTest.php  |   2 +-
 .../_files/second_product_simple_rollback.php |  24 +-
 .../Checkout/Block/Cart/CrosssellTest.php     | 353 ++++++++++++++++++
 6 files changed, 507 insertions(+), 55 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/Block/Cart/CrosssellTest.php

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/AbstractTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/AbstractTest.php
index a80b229bbbd15..ed2e8cbfcf7c2 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/AbstractTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/AbstractTest.php
@@ -3,15 +3,28 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Block\Product;
 
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Pricing\Price\FinalPrice;
+use Magento\Framework\Pricing\Render;
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Framework\View\DesignInterface;
+use Magento\Framework\View\LayoutInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use PHPUnit\Framework\TestCase;
+
 /**
  * Test class for \Magento\Catalog\Block\Product\Abstract.
  *
  * @magentoDataFixture Magento/Catalog/_files/product_with_image.php
  * @magentoAppArea frontend
  */
-class AbstractTest extends \PHPUnit\Framework\TestCase
+class AbstractTest extends TestCase
 {
     /**
      * Stub class name for class under test
@@ -19,17 +32,17 @@ class AbstractTest extends \PHPUnit\Framework\TestCase
     const STUB_CLASS = 'Magento_Catalog_Block_Product_AbstractProduct_Stub';
 
     /**
-     * @var \Magento\Catalog\Block\Product\AbstractProduct
+     * @var AbstractProduct
      */
     protected $block;
 
     /**
-     * @var \Magento\Catalog\Model\Product
+     * @var ProductInterface
      */
     protected $product;
 
     /**
-     * @var \Magento\Catalog\Api\ProductRepositoryInterface
+     * @var ProductRepositoryInterface
      */
     protected $productRepository;
 
@@ -40,43 +53,51 @@ class AbstractTest extends \PHPUnit\Framework\TestCase
      */
     protected static $isStubClass = false;
 
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var LayoutInterface
+     */
+    private $layout;
+
+    /**
+     * @var SerializerInterface
+     */
+    private $json;
+
+    /**
+     * @inheritdoc
+     */
+
     protected function setUp(): void
     {
         if (!self::$isStubClass) {
             $this->getMockForAbstractClass(
-                \Magento\Catalog\Block\Product\AbstractProduct::class,
+                AbstractProduct::class,
                 [],
                 self::STUB_CLASS,
                 false
             );
             self::$isStubClass = true;
         }
-
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-
-        $objectManager->get(\Magento\Framework\App\State::class)->setAreaCode('frontend');
-        $objectManager->get(\Magento\Framework\View\DesignInterface::class)->setDefaultDesignTheme();
-        $this->block = $objectManager->get(
-            \Magento\Framework\View\LayoutInterface::class
-        )->createBlock(self::STUB_CLASS);
-        $this->productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-
-        $this->product = $this->productRepository->get('simple');
-        $this->product->addData(
-            [
-                'image' => '/m/a/magento_image.jpg',
-                'small_image' => '/m/a/magento_image.jpg',
-                'thumbnail' => '/m/a/magento_image.jpg',
-            ]
-        );
-        $this->block->setProduct($this->product);
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->objectManager->get(DesignInterface::class)->setDefaultDesignTheme();
+        $this->layout = $this->objectManager->get(LayoutInterface::class);
+        $this->block = $this->layout->createBlock(self::STUB_CLASS);
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $this->productRepository->cleanCache();
+        $this->json = $this->objectManager->get(SerializerInterface::class);
     }
 
     /**
      * @magentoDataFixture Magento/CatalogUrlRewrite/_files/product_simple.php
      * @magentoAppIsolation enabled
+     * @return void
      */
-    public function testGetAddToCartUrl()
+    public function testGetAddToCartUrlWithProductRequiredOptions(): void
     {
         $product = $this->productRepository->get('simple');
         $url = $this->block->getAddToCartUrl($product);
@@ -84,18 +105,38 @@ public function testGetAddToCartUrl()
         $this->assertStringMatchesFormat('%ssimple-product.html%s', $url);
     }
 
-    public function testGetSubmitUrl()
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_duplicated.php
+     * @return void
+     */
+    public function testGetAddToCartUrlWithSimpleProduct(): void
+    {
+        $product = $this->productRepository->get('simple-1');
+        $url = $this->block->getAddToCartUrl($product);
+        $this->assertStringEndsWith(sprintf('product/%s/', $product->getId()), $url);
+        $this->assertContains('checkout/cart/add', $url);
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetSubmitUrl(): void
     {
+        $this->product = $this->productRepository->get('simple');
         /* by default same as add to cart */
         $this->assertStringEndsWith('?options=cart', $this->block->getSubmitUrl($this->product));
         $this->block->setData('submit_route_data', ['route' => 'catalog/product/view']);
         $this->assertStringEndsWith('catalog/product/view/', $this->block->getSubmitUrl($this->product));
     }
 
-    public function testGetAddToWishlistParams()
+    /**
+     * @return void
+     */
+    public function testGetAddToWishlistParams(): void
     {
+        $this->product = $this->productRepository->get('simple');
         $json = $this->block->getAddToWishlistParams($this->product);
-        $params = (array)json_decode($json);
+        $params = (array)$this->json->unserialize($json);
         $data = (array)$params['data'];
         $this->assertEquals($this->product->getId(), $data['product']);
         $this->assertArrayHasKey('uenc', $data);
@@ -105,53 +146,70 @@ public function testGetAddToWishlistParams()
         );
     }
 
-    public function testGetAddToCompareUrl()
+    /**
+     * @return void
+     */
+    public function testGetAddToCompareUrl(): void
     {
         $this->assertStringMatchesFormat('%scatalog/product_compare/add/', $this->block->getAddToCompareUrl());
     }
 
-    public function testGetMinimalQty()
+    /**
+     * @return void
+     */
+    public function testGetMinimalQty(): void
     {
+        $this->product = $this->productRepository->get('simple');
         $this->assertGreaterThan(0, $this->block->getMinimalQty($this->product));
     }
 
-    public function testGetReviewsSummaryHtml()
+    /**
+     * @return void
+     */
+    public function testGetReviewsSummaryHtml(): void
     {
-        $this->block->setLayout(
-            \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-                ->get(\Magento\Framework\View\LayoutInterface::class)
-        );
+        $this->product = $this->productRepository->get('simple');
         $html = $this->block->getReviewsSummaryHtml($this->product, false, true);
         $this->assertNotEmpty($html);
         $this->assertStringContainsString('review', $html);
     }
 
-    public function testGetProduct()
+    /**
+     * @return void
+     */
+    public function testGetProduct(): void
     {
+        $this->product = $this->productRepository->get('simple');
+        $this->block->setProduct($this->product);
         $this->assertSame($this->product, $this->block->getProduct());
     }
 
     /**
      * @magentoDataFixture Magento/CatalogUrlRewrite/_files/product_simple.php
      * @magentoAppIsolation enabled
+     * @return void
      */
-    public function testGetProductUrl()
+    public function testGetProductUrl(): void
     {
         $product = $this->productRepository->get('simple');
         $this->assertStringEndsWith('simple-product.html', $this->block->getProductUrl($product));
     }
 
-    public function testHasProductUrl()
+    /**
+     * @return void
+     */
+    public function testHasProductUrl(): void
     {
+        $this->product = $this->productRepository->get('simple');
         $this->assertTrue($this->block->hasProductUrl($this->product));
     }
 
-    public function testLayoutDependColumnCount()
+    /**
+     * @return void
+     */
+    public function testLayoutDependColumnCount(): void
     {
-        $this->block->setLayout(
-            \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-                ->get(\Magento\Framework\View\LayoutInterface::class)
-        );
+        $this->block->setLayout($this->layout);
         $this->assertEquals(3, $this->block->getColumnCount());
         /* default column count */
 
@@ -161,8 +219,35 @@ public function testLayoutDependColumnCount()
         $this->assertFalse($this->block->getColumnCountLayoutDepend('test'));
     }
 
-    public function testGetCanShowProductPrice()
+    /**
+     * @return void
+     */
+    public function testGetCanShowProductPrice(): void
     {
+        $this->product = $this->productRepository->get('simple');
         $this->assertTrue($this->block->getCanShowProductPrice($this->product));
     }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_duplicated.php
+     * @return void
+     */
+    public function testGetProductPriceHtml(): void
+    {
+        $product = $this->productRepository->get('simple-1');
+        $this->assertEmpty($this->block->getProductPriceHtml($product, FinalPrice::PRICE_CODE));
+        $this->layout->createBlock(
+            Render::class,
+            'product.price.render.default',
+            [
+                'data' => [
+                    'price_render_handle' => 'catalog_product_prices',
+                    'use_link_for_as_low_as' => true,
+                ],
+            ]
+        );
+        $finalPriceHtml = $this->block->getProductPriceHtml($product, FinalPrice::PRICE_CODE);
+        $this->assertContains('price-' . FinalPrice::PRICE_CODE, $finalPriceHtml);
+        $this->assertContains('product-price-' . $product->getId(), $finalPriceHtml);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ProductList/AbstractLinksTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ProductList/AbstractLinksTest.php
index 699df30c7bf3d..5badbef361b62 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ProductList/AbstractLinksTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ProductList/AbstractLinksTest.php
@@ -66,6 +66,12 @@ abstract class AbstractLinksTest extends TestCase
     /** @var string */
     protected $linkType;
 
+    /** @var string */
+    protected $titleName;
+
+    /** @var string */
+    protected $titleXpath = "//strong[@id = 'block-%s-heading'][contains(text(), '%s')]";
+
     /**
      * @inheritdoc
      */
@@ -297,7 +303,7 @@ protected function linkProducts(string $sku, array $productLinks): void
      *
      * @return array
      */
-    protected function prepareWebsiteIdsProducts(): array
+    protected function prepareProductsWebsiteIds(): array
     {
         $websiteId = $this->storeManager->getWebsite('test')->getId();
         $defaultWebsiteId = $this->storeManager->getWebsite('base')->getId();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ProductList/RelatedTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ProductList/RelatedTest.php
index 2c61743ae6aa5..11ce7b1328df8 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ProductList/RelatedTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ProductList/RelatedTest.php
@@ -132,7 +132,7 @@ public function testPositionRelatedProducts(): void
      */
     public function testMultipleWebsitesRelatedProducts(array $data): void
     {
-        $this->updateProducts($this->prepareWebsiteIdsProducts());
+        $this->updateProducts($this->prepareProductsWebsiteIds());
         $productLinks = array_replace_recursive($this->existingProducts, $data['productLinks']);
         $this->linkProducts('simple-1', $productLinks);
         $this->product = $this->productRepository->get(
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ProductList/UpsellTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ProductList/UpsellTest.php
index fd9d4e7e68fff..4d24a5aabafdb 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ProductList/UpsellTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ProductList/UpsellTest.php
@@ -120,7 +120,7 @@ public function testPositionUpsellProducts(): void
      */
     public function testMultipleWebsitesUpsellProducts(array $data): void
     {
-        $this->updateProducts($this->prepareWebsiteIdsProducts());
+        $this->updateProducts($this->prepareProductsWebsiteIds());
         $productLinks = array_replace_recursive($this->existingProducts, $data['productLinks']);
         $this->linkProducts('simple-1', $productLinks);
         $this->product = $this->productRepository->get(
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/second_product_simple_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/second_product_simple_rollback.php
index 27e60d29805ff..b045bfe4f6977 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/second_product_simple_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/second_product_simple_rollback.php
@@ -3,19 +3,27 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-/** @var \Magento\Framework\Registry $registry */
-$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$productRepository->cleanCache();
 
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 
-/** @var \Magento\Catalog\Model\Product $product */
-$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-$product->load(6);
-
-if ($product->getId()) {
-    $product->delete();
+try {
+    $productRepository->deleteById('simple2');
+} catch (NoSuchEntityException $e) {
+    //Product already removed
 }
 
 $registry->unregister('isSecureArea');
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Block/Cart/CrosssellTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Block/Cart/CrosssellTest.php
new file mode 100644
index 0000000000000..7a898b4310b3f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Block/Cart/CrosssellTest.php
@@ -0,0 +1,353 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Checkout\Block\Cart;
+
+use Magento\Catalog\Block\Product\ProductList\AbstractLinksTest;
+use Magento\Catalog\ViewModel\Product\Listing\PreparePostData;
+use Magento\Checkout\Model\Session;
+use Magento\TestFramework\Helper\Xpath;
+use Magento\TestFramework\Quote\Model\GetQuoteByReservedOrderId;
+use Magento\TestFramework\Store\ExecuteInStoreContext;
+
+/**
+ * Check the correct behavior of cross-sell products in the shopping cart
+ *
+ * @see \Magento\Checkout\Block\Cart\Crosssell
+ * @magentoDbIsolation disabled
+ * @magentoAppIsolation enabled
+ * @magentoAppArea frontend
+ */
+class CrosssellTest extends AbstractLinksTest
+{
+    private const MAX_ITEM_COUNT = 4;
+
+    /** @var Session */
+    private $checkoutSession;
+
+    /** @var string */
+    private $addToCartButtonXpath = "//div[contains(@class, 'actions-primary')]/button[@type='button']";
+
+    /** @var string */
+    private $addToCartSubmitXpath = "//div[contains(@class, 'actions-primary')]"
+    . "/form[@data-product-sku='%s']/button[@type='submit']";
+
+    /** @var string */
+    private $addToLinksXpath = "//div[contains(@class, 'actions-secondary')]";
+
+    /** @var ExecuteInStoreContext */
+    private $executeInStoreContext;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->block = $this->layout->createBlock(Crosssell::class);
+        $this->linkType = 'crosssell';
+        $this->titleName = (string)__('More Choices:');
+        $this->checkoutSession = $this->objectManager->get(Session::class);
+        $this->executeInStoreContext = $this->objectManager->get(ExecuteInStoreContext::class);
+    }
+
+    /**
+     * Checks for a simple cross-sell product when block code is generated
+     *
+     * @magentoDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_duplicated.php
+     * @return void
+     */
+    public function testSimpleCrosssellProduct(): void
+    {
+        $relatedProduct = $this->productRepository->get('simple-1');
+        $this->linkProducts('simple', ['simple-1' => ['position' => 2]]);
+        $this->setCheckoutSessionQuote('test_order_with_simple_product_without_address');
+        $this->prepareBlock();
+        $html = $this->block->toHtml();
+
+        $this->assertNotEmpty($html);
+        $this->assertEquals(
+            1,
+            Xpath::getElementsCountForXpath(sprintf($this->titleXpath, $this->linkType, $this->titleName), $html),
+            'Expected title is incorrect or missing!'
+        );
+        $this->assertEquals(
+            1,
+            Xpath::getElementsCountForXpath(sprintf($this->addToCartSubmitXpath, $relatedProduct->getSku()), $html),
+            'Expected add to cart button is incorrect or missing!'
+        );
+        $this->assertEquals(
+            1,
+            Xpath::getElementsCountForXpath($this->addToLinksXpath, $html),
+            'Expected add to links is incorrect or missing!'
+        );
+    }
+
+    /**
+     * Checks for a cross-sell product with required option when block code is generated
+     *
+     * @magentoDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoDataFixture Magento/Catalog/_files/product_virtual_with_options.php
+     * @return void
+     */
+    public function testCrosssellProductWithRequiredOption(): void
+    {
+        $this->linkProducts('simple', ['virtual' => ['position' => 1]]);
+        $this->setCheckoutSessionQuote('test_order_with_simple_product_without_address');
+        $this->prepareBlock();
+        $html = $this->block->toHtml();
+
+        $this->assertEquals(
+            1,
+            Xpath::getElementsCountForXpath($this->addToCartButtonXpath, $html),
+            'Expected add to cart button is incorrect or missing!'
+        );
+    }
+
+    /**
+     * Test the display of cross-sell products in the block
+     *
+     * @dataProvider displayLinkedProductsProvider
+     * @magentoDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoDataFixture Magento/Catalog/_files/products_list.php
+     * @param array $data
+     * @return void
+     */
+    public function testDisplayCrosssellProducts(array $data): void
+    {
+        $this->updateProducts($data['updateProducts']);
+        $this->linkProducts('simple', $this->existingProducts);
+        $items = $this->getBlockItems('test_order_with_simple_product_without_address');
+
+        $this->assertEquals(
+            $data['expectedProductLinks'],
+            $this->getActualLinks($items),
+            'Expected cross-sell products do not match actual cross-sell products!'
+        );
+    }
+
+    /**
+     * Test the position and max count of cross-sell products in the block
+     *
+     * @magentoDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoDataFixture Magento/Catalog/_files/products_list.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_duplicated.php
+     * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+     * @return void
+     */
+    public function testPositionCrosssellProducts(): void
+    {
+        $positionData = array_merge_recursive(
+            $this->getPositionData(),
+            [
+                'productLinks' => [
+                    'simple-1' => ['position' => 5],
+                    'simple2' => ['position' => 4],
+                ],
+                'expectedProductLinks' => [
+                    'simple2',
+                ],
+            ]
+        );
+        $this->linkProducts('simple', $positionData['productLinks']);
+        $items = $this->getBlockItems('test_order_with_simple_product_without_address');
+
+        $this->assertCount(
+            self::MAX_ITEM_COUNT,
+            $items,
+            'Expected quantity of cross-sell products do not match the actual quantity!'
+        );
+        $this->assertEquals(
+            $positionData['expectedProductLinks'],
+            $this->getActualLinks($items),
+            'Expected cross-sell products do not match actual cross-sell products!'
+        );
+    }
+
+    /**
+     * Test the position and max count of cross-sell products in the block
+     * when set last added product in checkout session
+     *
+     * @dataProvider positionWithLastAddedProductProvider
+     * @magentoDataFixture Magento/Sales/_files/quote_with_multiple_products.php
+     * @magentoDataFixture Magento/Catalog/_files/products_list.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_duplicated.php
+     * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+     * @param array $positionData
+     * @param array $expectedProductLinks
+     * @return void
+     */
+    public function testPositionCrosssellProductsWithLastAddedProduct(
+        array $positionData,
+        array $expectedProductLinks
+    ): void {
+        foreach ($positionData as $sku => $productLinks) {
+            $this->linkProducts($sku, $productLinks);
+        }
+        $this->checkoutSession->setLastAddedProductId($this->productRepository->get('simple-tableRate-1')->getId());
+        $items = $this->getBlockItems('tableRate');
+
+        $this->assertCount(
+            self::MAX_ITEM_COUNT,
+            $items,
+            'Expected quantity of cross-sell products do not match the actual quantity!'
+        );
+        $this->assertEquals(
+            $expectedProductLinks,
+            $this->getActualLinks($items),
+            'Expected cross-sell products do not match actual cross-sell products!'
+        );
+    }
+
+    /**
+     * Provide test data to verify the position of linked products of the last added product.
+     *
+     * @return array
+     */
+    public function positionWithLastAddedProductProvider(): array
+    {
+        return [
+            'less_four_linked_products_to_last_added_product' => [
+                'positionData' => [
+                    'simple-tableRate-1' => [
+                        'simple-249' => ['position' => 2],
+                        'simple-156' => ['position' => 1],
+                    ],
+                    'simple-tableRate-2' => [
+                        'simple-1' => ['position' => 2],
+                        'simple2' => ['position' => 1],
+                        'wrong-simple' => ['position' => 3],
+                    ],
+                ],
+                'expectedProductLinks' => [
+                    'simple-156',
+                    'simple-249',
+                    'simple2',
+                    'simple-1',
+                ],
+            ],
+            'four_linked_products_to_last_added_product' => [
+                'positionData' => [
+                    'simple-tableRate-1' => [
+                        'wrong-simple' => ['position' => 3],
+                        'simple-249' => ['position' => 1],
+                        'simple-156' => ['position' => 2],
+                        'simple2' => ['position' => 4],
+                    ],
+                    'simple-tableRate-2' => [
+                        'simple-1' => ['position' => 1],
+                    ],
+                ],
+                'expectedProductLinks' => [
+                    'simple-249',
+                    'simple-156',
+                    'wrong-simple',
+                    'simple2',
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Test the display of cross-sell products in the block on different websites
+     *
+     * @dataProvider multipleWebsitesLinkedProductsProvider
+     * @magentoDataFixture Magento/Catalog/_files/products_with_websites_and_stores.php
+     * @magentoDataFixture Magento/Sales/_files/quote_with_multiple_products.php
+     * @magentoDataFixture Magento/Catalog/_files/products_list.php
+     * @param array $data
+     * @return void
+     */
+    public function testMultipleWebsitesCrosssellProducts(array $data): void
+    {
+        $this->updateProducts($this->prepareProductsWebsiteIds());
+        $productLinks = array_merge($this->existingProducts, $data['productLinks']);
+        $this->linkProducts('simple-tableRate-1', $productLinks);
+        $items = $this->executeInStoreContext->execute($data['storeCode'], [$this, 'getBlockItems'], 'tableRate');
+
+        $this->assertEquals(
+            $data['expectedProductLinks'],
+            $this->getActualLinks($items),
+            'Expected cross-sell products do not match actual cross-sell products!'
+        );
+    }
+
+    /**
+     * Test the invisibility of cross-sell products in the block which added to cart
+     *
+     * @magentoDataFixture Magento/Sales/_files/quote_with_multiple_products.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_duplicated.php
+     * @return void
+     */
+    public function testInvisibilityCrosssellProductAddedToCart(): void
+    {
+        $productLinks = [
+            'simple-1' => ['position' => 1],
+            'simple-tableRate-2' => ['position' => 2],
+        ];
+        $this->linkProducts('simple-tableRate-1', $productLinks);
+        $items = $this->getBlockItems('tableRate');
+
+        $this->assertEquals(
+            ['simple-1'],
+            $this->getActualLinks($items),
+            'Expected cross-sell products do not match actual cross-sell products!'
+        );
+    }
+
+    /**
+     * Get products of block when quote in checkout session
+     *
+     * @param string $reservedOrderId
+     * @return array
+     */
+    public function getBlockItems(string $reservedOrderId): array
+    {
+        $this->setCheckoutSessionQuote($reservedOrderId);
+
+        return $this->block->getItems();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function prepareBlock(): void
+    {
+        parent::prepareBlock();
+
+        $this->block->setViewModel($this->objectManager->get(PreparePostData::class));
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function prepareProductsWebsiteIds(): array
+    {
+        $productsWebsiteIds = parent::prepareProductsWebsiteIds();
+        $simple = $productsWebsiteIds['simple-1'];
+        unset($productsWebsiteIds['simple-1']);
+
+        return array_merge($productsWebsiteIds, ['simple-tableRate-1' => $simple]);
+    }
+
+    /**
+     * Set quoteId in checkoutSession object.
+     *
+     * @param string $reservedOrderId
+     * @return void
+     */
+    private function setCheckoutSessionQuote(string $reservedOrderId): void
+    {
+        $this->checkoutSession->clearQuote();
+        $quote = $this->objectManager->get(GetQuoteByReservedOrderId::class)->execute($reservedOrderId);
+        if ($quote !== null) {
+            $this->checkoutSession->setQuoteId($quote->getId());
+        }
+    }
+}

From 2d6341b782a722848d3e029fa89d37d6eddb9e16 Mon Sep 17 00:00:00 2001
From: DianaRusin <rusind95@gmail.com>
Date: Wed, 29 Jul 2020 14:48:48 +0300
Subject: [PATCH 1098/1718] MC-36044: There are no 'Add Products By SKU' and
 'Add Products' buttons on Create New Order page

---
 .../Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml     | 3 ---
 .../Magento/Sales/view/adminhtml/web/order/create/scripts.js   | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml
index 63c482d66c57f..842faeb32cc33 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml
@@ -17,9 +17,6 @@
             <severity value="BLOCKER"/>
             <testCaseId value="MC-16161"/>
             <group value="mtf_migrated"/>
-            <skip>
-                <issueId value="MC-36044"/>
-            </skip>
         </annotations>
 
         <before>
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 2621f7106bb14..0c7c6621f58de 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
@@ -84,7 +84,7 @@ define([
                     }, 10);
                 };
 
-                if (jQuery('#order-items').ready()) {
+                if (jQuery('#' + this.getAreaId('items')).ready()) {
                     this.dataArea.onLoad = this.dataArea.onLoad.wrap(function (proceed) {
                         proceed();
                         this._parent.itemsArea.setNode($(this._parent.getAreaId('items')));

From 6792fbf54e7781c8ca369933d45de054a7768378 Mon Sep 17 00:00:00 2001
From: SmVladyslav <vlatame.tsg@gmail.com>
Date: Wed, 29 Jul 2020 15:13:01 +0300
Subject: [PATCH 1099/1718] MC-31304: [ElasticSearch] Exception on catalog
 search result page

---
 app/code/Magento/Eav/Model/Config.php               | 1 +
 app/code/Magento/Eav/Test/Unit/Model/ConfigTest.php | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Eav/Model/Config.php b/app/code/Magento/Eav/Model/Config.php
index ec099eb576425..8522700adbb6d 100644
--- a/app/code/Magento/Eav/Model/Config.php
+++ b/app/code/Magento/Eav/Model/Config.php
@@ -839,6 +839,7 @@ protected function _createAttribute($entityType, $attributeData)
         }
         /** @var AbstractAttribute $attribute */
         $attribute = $this->createAttribute($model)->setData($attributeData);
+        $attribute->setOrigData('entity_type_id', $attribute->getEntityTypeId());
         $this->_addAttributeReference(
             $attributeData['attribute_id'],
             $code,
diff --git a/app/code/Magento/Eav/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Eav/Test/Unit/Model/ConfigTest.php
index e4a0e935b325d..83fb1253aba96 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/ConfigTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/ConfigTest.php
@@ -223,11 +223,13 @@ public function testGetAttributes($cacheEnabled)
             ->method('getData')
             ->willReturn([$attributeData]);
         $entityAttributeMock = $this->getMockBuilder(Attribute::class)
-            ->setMethods(['setData', 'load', 'toArray'])
+            ->setMethods(['setData', 'setOrigData', 'load', 'toArray'])
             ->disableOriginalConstructor()
             ->getMock();
         $entityAttributeMock->method('setData')
             ->willReturnSelf();
+        $entityAttributeMock->method('setOrigData')
+            ->willReturn($attributeData);
         $entityAttributeMock->method('load')
             ->willReturnSelf();
         $entityAttributeMock->method('toArray')

From ed89465834c8e23789da134ef15b287a7c30215d Mon Sep 17 00:00:00 2001
From: Yurii Sapiha <yurasapiga93@gmail.com>
Date: Wed, 29 Jul 2020 15:14:20 +0300
Subject: [PATCH 1100/1718] MC-35968: Admin: Add items to shopping cart from
 different sources (advanced checkout)

---
 .../product_in_compare_list_with_customer.php | 31 +++++++++++
 ...in_compare_list_with_customer_rollback.php |  9 ++++
 .../Catalog/_files/taxable_simple_product.php | 50 +++++++++++++++++
 .../taxable_simple_product_rollback.php       | 29 ++++++++++
 ..._with_not_visible_individually_product.php | 50 +++++++++++++++++
 ..._visible_individually_product_rollback.php | 24 +++++++++
 ...uote_with_taxable_product_and_customer.php | 50 +++++++++++++++++
 ..._taxable_product_and_customer_rollback.php | 24 +++++++++
 ...recently_compared_out_of_stock_product.php | 54 +++++++++++++++++++
 ...compared_out_of_stock_product_rollback.php |  9 ++++
 .../_files/recently_compared_product.php      | 49 +++++++++++++++++
 .../recently_compared_product_rollback.php    |  9 ++++
 ...ly_viewed_disabled_product_by_customer.php | 49 +++++++++++++++++
 ..._disabled_product_by_customer_rollback.php | 44 +++++++++++++++
 .../recently_viewed_product_by_customer.php   | 44 +++++++++++++++
 ...ly_viewed_product_by_customer_rollback.php |  9 ++++
 .../_files/tax_rule_region_1_al_rollback.php  | 34 ++++++++++++
 .../_files/wishlist_with_disabled_product.php | 30 +++++++++++
 ...ishlist_with_disabled_product_rollback.php | 32 +++++++++++
 .../wishlist_with_not_visible_product.php     | 30 +++++++++++
 ...list_with_not_visible_product_rollback.php | 32 +++++++++++
 21 files changed, 692 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/product_in_compare_list_with_customer.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/product_in_compare_list_with_customer_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/taxable_simple_product.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/taxable_simple_product_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_not_visible_individually_product.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_not_visible_individually_product_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_taxable_product_and_customer.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_taxable_product_and_customer_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_out_of_stock_product.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_out_of_stock_product_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_product.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_product_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_disabled_product_by_customer.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_disabled_product_by_customer_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_product_by_customer.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_product_by_customer_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Tax/_files/tax_rule_region_1_al_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_product.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_product_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_not_visible_product.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_not_visible_product_rollback.php

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_in_compare_list_with_customer.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_in_compare_list_with_customer.php
new file mode 100644
index 0000000000000..dc0d866fa93a9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_in_compare_list_with_customer.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Model\Product\Compare\ListCompare;
+use Magento\Catalog\Model\Product\Compare\ListCompareFactory;
+use Magento\Customer\Model\Session;
+use Magento\Customer\Model\Visitor;
+use Magento\TestFramework\Helper\Bootstrap;
+
+require __DIR__ . '/second_product_simple.php';
+require __DIR__ . '/../../Customer/_files/customer.php';
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Session $session */
+$session = $objectManager->get(Session::class);
+
+try {
+    $session->loginById(1);
+    /** @var Visitor $visitor */
+    $visitor = $objectManager->get(Visitor::class);
+    $visitor->setVisitorId(1);
+    /** @var ListCompare $compareList */
+    $compareList = $objectManager->get(ListCompareFactory::class)->create();
+    $compareList->addProduct(6);
+} finally {
+    $session->logout();
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_in_compare_list_with_customer_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_in_compare_list_with_customer_rollback.php
new file mode 100644
index 0000000000000..1715de49070fc
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_in_compare_list_with_customer_rollback.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require __DIR__ . '/../../Customer/_files/customer_rollback.php';
+require __DIR__ . '/second_product_simple_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/taxable_simple_product.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/taxable_simple_product.php
new file mode 100644
index 0000000000000..10a06c3b8a239
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/taxable_simple_product.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\ProductInterface;
+use Magento\Catalog\Api\Data\ProductInterfaceFactory;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Helper\DefaultCategory;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var WebsiteRepositoryInterface $websiteRepository */
+$websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class);
+$defaultWebsiteId = $websiteRepository->get('base')->getId();
+/** @var DefaultCategory $defaultCategory */
+$defaultCategory = $objectManager->get(DefaultCategory::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$productRepository->cleanCache();
+/** @var ProductInterfaceFactory $productFactory */
+$productFactory = $objectManager->get(ProductInterfaceFactory::class);
+$product = $productFactory->create();
+$productData = [
+    ProductInterface::TYPE_ID => Type::TYPE_SIMPLE,
+    ProductInterface::ATTRIBUTE_SET_ID => $product->getDefaultAttributeSetId(),
+    ProductInterface::SKU => 'taxable_product',
+    ProductInterface::NAME => 'Taxable Product',
+    ProductInterface::PRICE => 10,
+    ProductInterface::VISIBILITY => Visibility::VISIBILITY_BOTH,
+    ProductInterface::STATUS => Status::STATUS_ENABLED,
+    'website_ids' => [$defaultWebsiteId],
+    'stock_data' => [
+        'use_config_manage_stock' => 1,
+        'qty' => 100,
+        'is_qty_decimal' => 0,
+        'is_in_stock' => 1,
+    ],
+    'category_ids' => [$defaultCategory->getId()],
+    'tax_class_id' => 2, //Taxable Goods
+];
+$product->setData($productData);
+
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/taxable_simple_product_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/taxable_simple_product_rollback.php
new file mode 100644
index 0000000000000..9d58556fc987e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/taxable_simple_product_rollback.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$productRepository->cleanCache();
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+try {
+    $productRepository->deleteById('taxable_product');
+} catch (NoSuchEntityException $e) {
+    // product already deleted
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_not_visible_individually_product.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_not_visible_individually_product.php
new file mode 100644
index 0000000000000..ac1ae698e96b6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_not_visible_individually_product.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\ProductRepositoryInterface;
+use Magento\Checkout\Model\Type\Onepage;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\AddressInterface;
+use Magento\Quote\Api\Data\AddressInterfaceFactory;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\Quote\Api\Data\CartInterfaceFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+
+require __DIR__ . '/../../Customer/_files/customer.php';
+require __DIR__ . '/../../Customer/_files/customer_address.php';
+require __DIR__ . '/../../../Magento/Catalog/_files/simple_products_not_visible_individually.php';
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+/** @var CartRepositoryInterface $quoteRepository */
+$quoteRepository = $objectManager->get(CartRepositoryInterface::class);
+/** @var AddressInterface $quoteShippingAddress */
+$quoteShippingAddress = $objectManager->get(AddressInterfaceFactory::class)->create();
+/** @var CustomerRepositoryInterface $customerRepository */
+$customerRepository = $objectManager->get(CustomerRepositoryInterface::class);
+/** @var AddressRepositoryInterface $addressRepository */
+$addressRepository = $objectManager->get(AddressRepositoryInterface::class);
+$quoteShippingAddress->importCustomerAddressData($addressRepository->getById(1));
+$customer = $customerRepository->getById(1);
+
+/** @var CartInterface $quote */
+$quote = $objectManager->get(CartInterfaceFactory::class)->create();
+$quote->setStoreId(1)
+    ->setIsActive(true)
+    ->setIsMultiShipping(0)
+    ->assignCustomerWithAddressChange($customer)
+    ->setShippingAddress($quoteShippingAddress)
+    ->setBillingAddress($quoteShippingAddress)
+    ->setCheckoutMethod(Onepage::METHOD_CUSTOMER)
+    ->setReservedOrderId('test_order_with_not_visible_product')
+    ->setEmail($customer->getEmail())
+    ->addProduct($productRepository->get('simple_not_visible_1'), 1);
+
+$quoteRepository->save($quote);
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_not_visible_individually_product_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_not_visible_individually_product_rollback.php
new file mode 100644
index 0000000000000..f8e724a8bd324
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_not_visible_individually_product_rollback.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Quote\Model\GetQuoteByReservedOrderId;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var CartRepositoryInterface $quoteRepository */
+$quoteRepository = $objectManager->get(CartRepositoryInterface::class);
+/** @var GetQuoteByReservedOrderId $getQuoteByReservedOrderId */
+$getQuoteByReservedOrderId = $objectManager->get(GetQuoteByReservedOrderId::class);
+$quote = $getQuoteByReservedOrderId->execute('test_order_with_not_visible_product');
+if ($quote) {
+    $quoteRepository->delete($quote);
+}
+
+require __DIR__ . '/../../../Magento/Catalog/_files/simple_products_not_visible_individually_rollback.php';
+require __DIR__ . '/../../Customer/_files/customer_address_rollback.php';
+require __DIR__ . '/../../Customer/_files/customer_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_taxable_product_and_customer.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_taxable_product_and_customer.php
new file mode 100644
index 0000000000000..6de9701c5db0b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_taxable_product_and_customer.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\ProductRepositoryInterface;
+use Magento\Checkout\Model\Type\Onepage;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\AddressInterface;
+use Magento\Quote\Api\Data\AddressInterfaceFactory;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\Quote\Api\Data\CartInterfaceFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+
+require __DIR__ . '/../../Customer/_files/customer.php';
+require __DIR__ . '/../../Customer/_files/customer_address.php';
+require __DIR__ . '/../../../Magento/Catalog/_files/taxable_simple_product.php';
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$productRepository->cleanCache();
+/** @var CartRepositoryInterface $quoteRepository */
+$quoteRepository = $objectManager->get(CartRepositoryInterface::class);
+/** @var AddressInterface $quoteShippingAddress */
+$quoteShippingAddress = $objectManager->get(AddressInterfaceFactory::class)->create();
+/** @var CustomerRepositoryInterface $customerRepository */
+$customerRepository = $objectManager->get(CustomerRepositoryInterface::class);
+/** @var AddressRepositoryInterface $addressRepository */
+$addressRepository = $objectManager->get(AddressRepositoryInterface::class);
+$quoteShippingAddress->importCustomerAddressData($addressRepository->getById(1));
+$customer = $customerRepository->getById(1);
+
+/** @var CartInterface $quote */
+$quote = $objectManager->get(CartInterfaceFactory::class)->create();
+$quote->setStoreId(1)
+    ->setIsActive(true)
+    ->setIsMultiShipping(0)
+    ->assignCustomerWithAddressChange($customer)
+    ->setShippingAddress($quoteShippingAddress)
+    ->setBillingAddress($quoteShippingAddress)
+    ->setCheckoutMethod(Onepage::METHOD_CUSTOMER)
+    ->setReservedOrderId('test_order_with_taxable_product')
+    ->setEmail($customer->getEmail())
+    ->addProduct($productRepository->get('taxable_product'), 1);
+$quoteRepository->save($quote);
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_taxable_product_and_customer_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_taxable_product_and_customer_rollback.php
new file mode 100644
index 0000000000000..f92ea92127fef
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_taxable_product_and_customer_rollback.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Quote\Model\GetQuoteByReservedOrderId;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var CartRepositoryInterface $quoteRepository */
+$quoteRepository = $objectManager->get(CartRepositoryInterface::class);
+/** @var GetQuoteByReservedOrderId $getQuoteByReservedOrderId */
+$getQuoteByReservedOrderId = $objectManager->get(GetQuoteByReservedOrderId::class);
+$quote = $getQuoteByReservedOrderId->execute('test_order_with_taxable_product');
+if ($quote) {
+    $quoteRepository->delete($quote);
+}
+
+require __DIR__ . '/../../../Magento/Catalog/_files/taxable_simple_product_rollback.php';
+require __DIR__ . '/../../Customer/_files/customer_address_rollback.php';
+require __DIR__ . '/../../Customer/_files/customer_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_out_of_stock_product.php b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_out_of_stock_product.php
new file mode 100644
index 0000000000000..2e9625f921a36
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_out_of_stock_product.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+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;
+
+require __DIR__ . '/../../../Magento/Catalog/_files/out_of_stock_product_with_category.php';
+require __DIR__ . '/../../Customer/_files/customer.php';
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$productRepository->cleanCache();
+$product = $productRepository->get('out-of-stock-product');
+$session = $objectManager->get(Session::class);
+/** @var CatalogProductCompareAddProductObserver $reportObserver */
+$reportObserver = $objectManager->get(CatalogProductCompareAddProductObserver::class);
+/** @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'),
+];
+
+try {
+    $config->setValue('reports/options/enabled', 1);
+    $config->setValue('reports/options/product_compare_enabled', 1);
+    $session->loginById(1);
+    $reportObserver->execute(
+        new Observer(
+            [
+                'event' => new DataObject(
+                    [
+                        'product' => new DataObject(['id' => $product->getId()]),
+                    ]
+                ),
+            ]
+        )
+    );
+} finally {
+    $session->logout();
+    foreach ($originValues as $key => $value) {
+        $config->setValue($key, $value);
+    }
+}
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
new file mode 100644
index 0000000000000..1327ec34a17d2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_out_of_stock_product_rollback.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require __DIR__ . '/../../../Magento/Catalog/_files/out_of_stock_product_with_category.php';
+require __DIR__ . '/../../Customer/_files/customer_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_product.php b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_product.php
new file mode 100644
index 0000000000000..ebcf1078d896d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_product.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\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;
+
+require __DIR__ . '/../../../Magento/Catalog/_files/second_product_simple.php';
+require __DIR__ . '/../../Customer/_files/customer.php';
+
+$objectManager = Bootstrap::getObjectManager();
+$session = $objectManager->get(Session::class);
+/** @var CatalogProductCompareAddProductObserver $reportObserver */
+$reportObserver = $objectManager->get(CatalogProductCompareAddProductObserver::class);
+/** @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'),
+];
+
+try {
+    $config->setValue('reports/options/enabled', 1);
+    $config->setValue('reports/options/product_compare_enabled', 1);
+    $session->loginById(1);
+    $reportObserver->execute(
+        new Observer(
+            [
+                'event' => new DataObject(
+                    [
+                        'product' => new DataObject(['id' => 6]),
+                    ]
+                ),
+            ]
+        )
+    );
+} 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_rollback.php b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_product_rollback.php
new file mode 100644
index 0000000000000..7ea240bb12c84
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_product_rollback.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require __DIR__ . '/../../../Magento/Catalog/_files/second_product_simple_rollback.php';
+require __DIR__ . '/../../Customer/_files/customer_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_disabled_product_by_customer.php b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_disabled_product_by_customer.php
new file mode 100644
index 0000000000000..2fe1b5812ccb9
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_disabled_product_by_customer.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\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;
+
+require __DIR__ . '/../../../Magento/Catalog/_files/simple_product_disabled.php';
+require __DIR__ . '/../../Customer/_files/customer.php';
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$productRepository->cleanCache();
+/** @var Session $session */
+$session = $objectManager->get(Session::class);
+/** @var MutableScopeConfigInterface $config */
+$config = $objectManager->get(MutableScopeConfigInterface::class);
+$originalValue = $config->getValue('reports/options/enabled');
+/** @var CatalogProductViewObserver $reportObserver */
+$reportObserver = $objectManager->get(CatalogProductViewObserver::class);
+$product = $productRepository->get('product_disabled');
+
+try {
+    $config->setValue('reports/options/enabled', 1);
+    $session->loginById(1);
+    $reportObserver->execute(
+        new Observer(
+            [
+                'event' => new DataObject(
+                    [
+                        'product' => new DataObject(['id' => $product->getId()]),
+                    ]
+                ),
+            ]
+        )
+    );
+} finally {
+    $session->logout();
+    $config->setValue('reports/options/enabled', $originalValue);
+}
diff --git a/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_disabled_product_by_customer_rollback.php b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_disabled_product_by_customer_rollback.php
new file mode 100644
index 0000000000000..2a4cb8809b4ad
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_disabled_product_by_customer_rollback.php
@@ -0,0 +1,44 @@
+<?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;
+
+require __DIR__ . '/../../../Magento/Catalog/_files/second_product_simple.php';
+require __DIR__ . '/../../Customer/_files/customer.php';
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Session $session */
+$session = $objectManager->get(Session::class);
+/** @var MutableScopeConfigInterface $config */
+$config = $objectManager->get(MutableScopeConfigInterface::class);
+$originalValue = $config->getValue('reports/options/enabled');
+/** @var CatalogProductViewObserver $reportObserver */
+$reportObserver = $objectManager->get(CatalogProductViewObserver::class);
+
+try {
+    $config->setValue('reports/options/enabled', 1);
+    $session->loginById(1);
+    $reportObserver->execute(
+        new Observer(
+            [
+                'event' => new DataObject(
+                    [
+                        'product' => new DataObject(['id' => 6]),
+                    ]
+                ),
+            ]
+        )
+    );
+} finally {
+    $session->logout();
+    $config->setValue('reports/options/enabled', $originalValue);
+}
diff --git a/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_product_by_customer.php b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_product_by_customer.php
new file mode 100644
index 0000000000000..2a4cb8809b4ad
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_product_by_customer.php
@@ -0,0 +1,44 @@
+<?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;
+
+require __DIR__ . '/../../../Magento/Catalog/_files/second_product_simple.php';
+require __DIR__ . '/../../Customer/_files/customer.php';
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Session $session */
+$session = $objectManager->get(Session::class);
+/** @var MutableScopeConfigInterface $config */
+$config = $objectManager->get(MutableScopeConfigInterface::class);
+$originalValue = $config->getValue('reports/options/enabled');
+/** @var CatalogProductViewObserver $reportObserver */
+$reportObserver = $objectManager->get(CatalogProductViewObserver::class);
+
+try {
+    $config->setValue('reports/options/enabled', 1);
+    $session->loginById(1);
+    $reportObserver->execute(
+        new Observer(
+            [
+                'event' => new DataObject(
+                    [
+                        'product' => new DataObject(['id' => 6]),
+                    ]
+                ),
+            ]
+        )
+    );
+} finally {
+    $session->logout();
+    $config->setValue('reports/options/enabled', $originalValue);
+}
diff --git a/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_product_by_customer_rollback.php b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_product_by_customer_rollback.php
new file mode 100644
index 0000000000000..7ea240bb12c84
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_product_by_customer_rollback.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require __DIR__ . '/../../../Magento/Catalog/_files/second_product_simple_rollback.php';
+require __DIR__ . '/../../Customer/_files/customer_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Tax/_files/tax_rule_region_1_al_rollback.php b/dev/tests/integration/testsuite/Magento/Tax/_files/tax_rule_region_1_al_rollback.php
new file mode 100644
index 0000000000000..fc9fde077fb3d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Tax/_files/tax_rule_region_1_al_rollback.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Tax\Model\Calculation\Rate;
+use Magento\Tax\Model\Calculation\RateFactory;
+use Magento\Tax\Model\Calculation\RateRepository;
+use Magento\Tax\Model\ResourceModel\Calculation\Rule\Collection;
+use Magento\Tax\Model\ResourceModel\Calculation\Rule\CollectionFactory;
+use Magento\Tax\Model\TaxRuleRepository;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var TaxRuleRepository $taxRuleRepository */
+$taxRuleRepository = $objectManager->get(TaxRuleRepository::class);
+/** @var Collection $taxRuleCollection */
+$taxRuleCollection = $objectManager->get(CollectionFactory::class)->create();
+/** @var Rate $rate */
+$rate = $objectManager->get(RateFactory::class)->create();
+/** @var RateRepository $rateRepository */
+$rateRepository = $objectManager->get(RateRepository::class);
+$taxRuleCollection->addFieldToFilter('code', 'AL Test Rule');
+$taxRule = $taxRuleCollection->getFirstItem();
+if ($taxRule->getId()) {
+    $taxRuleRepository->delete($taxRule);
+}
+
+$rate->loadByCode('US-AL-*-Rate-1');
+if ($rate->getId()) {
+    $rateRepository->delete($rate);
+}
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_product.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_product.php
new file mode 100644
index 0000000000000..fc9c8e886dd44
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_product.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Wishlist\Model\ResourceModel\Wishlist as WishlistResource;
+use Magento\Wishlist\Model\Wishlist;
+use Magento\Wishlist\Model\WishlistFactory;
+
+require __DIR__ . '/../../../Magento/Customer/_files/customer.php';
+require __DIR__ . '/../../../Magento/Catalog/_files/simple_product_disabled.php';
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var WishlistResource $wishListResource */
+$wishListResource = $objectManager->get(WishlistResource::class);
+/** @var Wishlist $wishlist */
+$wishlist = $objectManager->get(WishlistFactory::class)->create();
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$productRepository->cleanCache();
+$product = $productRepository->get('product_disabled');
+$wishlist->loadByCustomerId($customer->getId(), true);
+$item = $wishlist->addNewItem($product);
+$wishlist->setSharingCode('wishlist_disabled_item');
+$wishListResource->save($wishlist);
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_product_rollback.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_product_rollback.php
new file mode 100644
index 0000000000000..0adb54034f145
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_product_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\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Wishlist\Model\ResourceModel\Wishlist as WishlistResource;
+use Magento\Wishlist\Model\Wishlist;
+use Magento\Wishlist\Model\WishlistFactory;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+/** @var WishlistResource $wishListResource */
+$wishListResource = $objectManager->get(WishlistResource::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+/** @var Wishlist $wishlist */
+$wishlist = $objectManager->get(WishlistFactory::class)->create();
+$wishlist->loadByCustomerId(1);
+if ($wishlist->getId()) {
+    $wishListResource->delete($wishlist);
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+
+require __DIR__ . '/../../../Magento/Catalog/_files/simple_product_disabled.php';
+require __DIR__ . '/../../../Magento/Customer/_files/customer_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_not_visible_product.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_not_visible_product.php
new file mode 100644
index 0000000000000..8e201d372f6c5
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_not_visible_product.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Wishlist\Model\ResourceModel\Wishlist as WishlistResource;
+use Magento\Wishlist\Model\Wishlist;
+use Magento\Wishlist\Model\WishlistFactory;
+
+require __DIR__ . '/../../../Magento/Customer/_files/customer.php';
+require __DIR__ . '/../../../Magento/Catalog/_files/simple_products_not_visible_individually.php';
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var WishlistResource $wishListResource */
+$wishListResource = $objectManager->get(WishlistResource::class);
+/** @var Wishlist $wishList */
+$wishList = $objectManager->get(WishlistFactory::class)->create();
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$productRepository->cleanCache();
+$product = $productRepository->get('simple_not_visible_1');
+$wishList->loadByCustomerId($customer->getId(), true);
+$item = $wishList->addNewItem($product);
+$wishList->setSharingCode('fixture_unique_code');
+$wishListResource->save($wishList);
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_not_visible_product_rollback.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_not_visible_product_rollback.php
new file mode 100644
index 0000000000000..ea68bc136e7da
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_not_visible_product_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\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Wishlist\Model\ResourceModel\Wishlist as WishlistResource;
+use Magento\Wishlist\Model\Wishlist;
+use Magento\Wishlist\Model\WishlistFactory;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+/** @var WishlistResource $wishListResource */
+$wishListResource = $objectManager->get(WishlistResource::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+/** @var Wishlist $wishlist */
+$wishlist = $objectManager->get(WishlistFactory::class)->create();
+$wishlist->loadByCustomerId(1);
+if ($wishlist->getId()) {
+    $wishListResource->delete($wishlist);
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+
+require __DIR__ . '/../../../Magento/Catalog/_files/simple_products_not_visible_individually_rollback.php';
+require __DIR__ . '/../../../Magento/Customer/_files/customer_rollback.php';

From 3422a253cf84e9a22c4fc4755cdeddf64142be59 Mon Sep 17 00:00:00 2001
From: Yurii Sapiha <yurasapiga93@gmail.com>
Date: Wed, 29 Jul 2020 15:21:07 +0300
Subject: [PATCH 1101/1718] MC-35960: Admin: Create Order from customer edit
 page

---
 .../quote_with_customer_without_address.php   |  38 ++++++
 ...with_customer_without_address_rollback.php |  23 ++++
 .../Block/Adminhtml/Edit/OrderButtonTest.php  |  83 ++++++++++++
 .../Order/Create/AbstractAddressFormTest.php  | 125 ++++++++++++++++++
 .../Order/Create/Billing/FormTest.php         |  59 +++++++++
 .../Order/Create/Shipping/FormTest.php        |  57 ++++++++
 .../Adminhtml/Order/Create/IndexTest.php      |  67 ++++++++++
 7 files changed, 452 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_without_address.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_without_address_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/OrderButtonTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/AbstractAddressFormTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Billing/FormTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/FormTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/IndexTest.php

diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_without_address.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_without_address.php
new file mode 100644
index 0000000000000..29144831d66ad
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_without_address.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Checkout\Model\Type\Onepage;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\Quote\Api\Data\CartInterfaceFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+
+require __DIR__ . '/../../Customer/_files/customer.php';
+require __DIR__ . '/../../../Magento/Catalog/_files/second_product_simple.php';
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$productRepository->cleanCache();
+/** @var CartRepositoryInterface $quoteRepository */
+$quoteRepository = $objectManager->get(CartRepositoryInterface::class);
+/** @var CustomerRepositoryInterface $customerRepository */
+$customerRepository = $objectManager->get(CustomerRepositoryInterface::class);
+$customer = $customerRepository->get('customer@example.com');
+
+/** @var CartInterface $quote */
+$quote = $objectManager->get(CartInterfaceFactory::class)->create();
+$quote->setStoreId(1)
+    ->setIsActive(true)
+    ->setIsMultiShipping(0)
+    ->setCustomer($customer)
+    ->setCheckoutMethod(Onepage::METHOD_CUSTOMER)
+    ->setReservedOrderId('test_order_with_customer_without_address')
+    ->addProduct($productRepository->get('simple2'), 1);
+$quoteRepository->save($quote);
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_without_address_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_without_address_rollback.php
new file mode 100644
index 0000000000000..4144b884b1492
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_without_address_rollback.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Quote\Model\GetQuoteByReservedOrderId;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var CartRepositoryInterface $quoteRepository */
+$quoteRepository = $objectManager->get(CartRepositoryInterface::class);
+/** @var GetQuoteByReservedOrderId $getQuoteByReservedOrderId */
+$getQuoteByReservedOrderId = $objectManager->get(GetQuoteByReservedOrderId::class);
+$quote = $getQuoteByReservedOrderId->execute('test_order_with_customer_without_address');
+if ($quote !== null) {
+    $quoteRepository->delete($quote);
+}
+
+require __DIR__ . '/../../../Magento/Catalog/_files/second_product_simple_rollback.php';
+require __DIR__ . '/../../Customer/_files/customer_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/OrderButtonTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/OrderButtonTest.php
new file mode 100644
index 0000000000000..1a093c741b1b2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/OrderButtonTest.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Block\Adminhtml\Edit;
+
+use Magento\Backend\Model\Search\AuthorizationMock;
+use Magento\Customer\Controller\RegistryConstants;
+use Magento\Framework\Authorization;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class checks Create Order button visibility
+ *
+ * @magentoAppArea adminhtml
+ * @magentoDbIsolation enabled
+ */
+class OrderButtonTest extends TestCase
+{
+    /** @var ObjectManagerInterface */
+    private $objectManager;
+
+    /** @var OrderButton */
+    private $button;
+
+    /** @var Registry */
+    private $registry;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->objectManager->addSharedInstance(
+            $this->objectManager->get(AuthorizationMock::class),
+            Authorization::class
+        );
+        $this->button = $this->objectManager->get(OrderButton::class);
+        $this->registry = $this->objectManager->get(Registry::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown(): void
+    {
+        $this->registry->unregister(RegistryConstants::CURRENT_CUSTOMER_ID);
+
+        parent::tearDown();
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetButtonDataWithoutCustomer(): void
+    {
+        $this->assertEmpty($this->button->getButtonData());
+    }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     *
+     * @return void
+     */
+    public function testGetButtonDataWithCustomer(): void
+    {
+        $this->registry->unregister(RegistryConstants::CURRENT_CUSTOMER_ID);
+        $this->registry->register(RegistryConstants::CURRENT_CUSTOMER_ID, 1);
+        $data = $this->button->getButtonData();
+        $this->assertNotEmpty($data);
+        $this->assertEquals(__('Create Order'), $data['label']);
+        $this->assertStringContainsString('sales/order_create/start/customer_id/1/', $data['on_click']);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/AbstractAddressFormTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/AbstractAddressFormTest.php
new file mode 100644
index 0000000000000..5219fd72ec94e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/AbstractAddressFormTest.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Block\Adminhtml\Order\Create;
+
+use Magento\Config\Model\Config\Backend\Admin\Custom;
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Customer\Model\Address\AddressModelInterface;
+use Magento\Customer\Model\CustomerRegistry;
+use Magento\Customer\Model\Metadata\FormFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Data\Form;
+use Magento\Framework\View\Element\BlockInterface;
+use Magento\Framework\View\LayoutInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class consist of basic logic to check address form
+ */
+abstract class AbstractAddressFormTest extends TestCase
+{
+    /** @var LayoutInterface */
+    protected $layout;
+
+    /** @var CustomerRegistry */
+    protected $customerRegistry;
+
+    /** @var CartRepositoryInterface */
+    private $quoteRepository;
+
+    /** @var BlockInterface */
+    private $form;
+
+    /** @var ScopeConfigInterface */
+    private $config;
+
+    /** @var array */
+    private $formAttributes;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $objectManager = Bootstrap::getObjectManager();
+        $this->layout = $objectManager->get(LayoutInterface::class);
+        $this->form = $this->getFormBlock();
+        $this->customerRegistry = $objectManager->get(CustomerRegistry::class);
+        $this->quoteRepository = $objectManager->get(CartRepositoryInterface::class);
+        $this->config = $objectManager->get(ScopeConfigInterface::class);
+        $this->formAttributes = array_keys($objectManager->get(FormFactory::class)
+            ->create('customer_address', 'adminhtml_customer_address')->getAttributes());
+    }
+
+    /**
+     * Check that all form values are filled according to address attributes values
+     *
+     * @param int $customerId
+     * @return void
+     */
+    protected function checkFormValuesExist(int $customerId): void
+    {
+        $address = $this->getAddress($customerId);
+        $form = $this->prepareForm($customerId);
+        foreach ($this->formAttributes as $attribute) {
+            $this->assertEquals($address->getData($attribute), $form->getElement($attribute)->getValue());
+        }
+    }
+
+    /**
+     * Check that form values is empty
+     *
+     * @param int $customerId
+     * @return void
+     */
+    protected function checkFormValuesAreEmpty(int $customerId): void
+    {
+        $defaultCountryCode = $this->config->getValue(Custom::XML_PATH_GENERAL_COUNTRY_DEFAULT);
+        $form = $this->prepareForm($customerId);
+        foreach ($this->formAttributes as $attribute) {
+            if ($attribute === AddressInterface::COUNTRY_ID) {
+                $this->assertEquals($defaultCountryCode, $form->getElement($attribute)->getValue());
+                continue;
+            }
+            $this->assertNull($form->getElement($attribute)->getValue());
+        }
+    }
+
+    /**
+     * Prepare form
+     *
+     * @param int $customerId
+     * @return Form
+     */
+    private function prepareForm(int $customerId): Form
+    {
+        $quote = $this->quoteRepository->getForCustomer($customerId);
+        $this->form->getCreateOrderModel()->setQuote($quote);
+
+        return $this->form->getForm();
+    }
+
+    /**
+     * Get form block
+     *
+     * @return BlockInterface
+     */
+    abstract protected function getFormBlock(): BlockInterface;
+
+    /**
+     * Get appropriate customer address
+     *
+     * @param int $customerId
+     * @return AddressModelInterface
+     */
+    abstract protected function getAddress(int $customerId): AddressModelInterface;
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Billing/FormTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Billing/FormTest.php
new file mode 100644
index 0000000000000..58a4616e3a219
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Billing/FormTest.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Billing;
+
+use Magento\Customer\Model\Address\AddressModelInterface;
+use Magento\Framework\View\Element\BlockInterface;
+use Magento\Sales\Block\Adminhtml\Order\Create\AbstractAddressFormTest;
+use Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address;
+
+/**
+ * Class checks billing address form behaviour
+ *
+ * @magentoAppArea adminhtml
+ * @magentoDbIsolation enabled
+ *
+ */
+class FormTest extends AbstractAddressFormTest
+{
+    /**
+     * @magentoDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     *
+     * @return void
+     */
+    public function testFormValuesExist(): void
+    {
+        $this->checkFormValuesExist(1);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Checkout/_files/quote_with_customer_without_address.php
+     *
+     * @return void
+     */
+    public function testFormValuesAreEmpty(): void
+    {
+        $this->checkFormValuesAreEmpty(1);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getFormBlock(): BlockInterface
+    {
+        return $this->layout->createBlock(Address::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getAddress(int $customerId): AddressModelInterface
+    {
+        return $this->customerRegistry->retrieve($customerId)->getDefaultBillingAddress();
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/FormTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/FormTest.php
new file mode 100644
index 0000000000000..5d6191d355e72
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/FormTest.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Block\Adminhtml\Order\Create\Shipping;
+
+use Magento\Customer\Model\Address\AddressModelInterface;
+use Magento\Framework\View\Element\BlockInterface;
+use Magento\Sales\Block\Adminhtml\Order\Create\AbstractAddressFormTest;
+
+/**
+ * Class checks shipping address form behaviour
+ *
+ * @magentoAppArea adminhtml
+ * @magentoDbIsolation enabled
+ */
+class FormTest extends AbstractAddressFormTest
+{
+    /**
+     * @magentoDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     *
+     * @return void
+     */
+    public function testFormValuesExist(): void
+    {
+        $this->checkFormValuesExist(1);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Checkout/_files/quote_with_customer_without_address.php
+     *
+     * @return void
+     */
+    public function testFormValuesAreEmpty(): void
+    {
+        $this->checkFormValuesAreEmpty(1);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getFormBlock(): BlockInterface
+    {
+        return $this->layout->createBlock(Address::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getAddress(int $customerId): AddressModelInterface
+    {
+        return $this->customerRegistry->retrieve($customerId)->getDefaultShippingAddress();
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/IndexTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/IndexTest.php
new file mode 100644
index 0000000000000..764c48b523968
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/IndexTest.php
@@ -0,0 +1,67 @@
+<?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\Backend\Model\Session\Quote;
+use Magento\Framework\App\Request\Http;
+use Magento\Framework\Registry;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
+/**
+ * Class checks create order index controller.
+ *
+ * @see \Magento\Sales\Controller\Adminhtml\Order\Create\Index
+ *
+ * @magentoAppArea adminhtml
+ * @magentoDbIsolation enabled
+ */
+class IndexTest extends AbstractBackendController
+{
+    /** @var Registry */
+    private $registry;
+
+    /** @var StoreManagerInterface */
+    private $storeManager;
+
+    /** @var Quote */
+    private $quoteSession;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->registry = $this->_objectManager->get(Registry::class);
+        $this->storeManager = $this->_objectManager->get(StoreManagerInterface::class);
+        $this->quoteSession = $this->_objectManager->get(Quote::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     *
+     * @return void
+     */
+    public function testExecute(): void
+    {
+        $customerId = 1;
+        $this->getRequest()->setMethod(Http::METHOD_GET);
+        $this->getRequest()->setParam('customer_id', $customerId);
+        $this->dispatch('backend/sales/order_create/index');
+        $store = $this->storeManager->getStore();
+        $this->assertEquals($customerId, $this->quoteSession->getCustomerId());
+        $ruleData = $this->registry->registry('rule_data');
+        $this->assertNotNull($ruleData);
+        $this->assertEquals(
+            ['store_id' => $store->getId(), 'website_id' => $store->getWebsiteId(), 'customer_group_id' => 1],
+            $ruleData->getData()
+        );
+    }
+}

From d62482970bc41f652162b469b57fe2a38dc4b804 Mon Sep 17 00:00:00 2001
From: SmVladyslav <vlatame.tsg@gmail.com>
Date: Wed, 29 Jul 2020 15:37:09 +0300
Subject: [PATCH 1102/1718] MC-31304: [ElasticSearch] Exception on catalog
 search result page

---
 app/code/Magento/CatalogSearch/etc/di.xml | 2 +-
 app/code/Magento/Elasticsearch/etc/di.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CatalogSearch/etc/di.xml b/app/code/Magento/CatalogSearch/etc/di.xml
index 628be3114028d..6ff9119e78c2a 100644
--- a/app/code/Magento/CatalogSearch/etc/di.xml
+++ b/app/code/Magento/CatalogSearch/etc/di.xml
@@ -47,7 +47,7 @@
         <plugin name="catalogsearchFulltextIndexerStoreGroup" type="Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\Store\Group"/>
     </type>
     <type name="Magento\Catalog\Model\ResourceModel\Attribute">
-        <plugin name="catalogsearchFulltextIndexerAttribute" type="Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\Attribute" sortOrder="10"/>
+        <plugin name="catalogsearchFulltextIndexerAttribute" type="Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\Attribute"/>
         <plugin name="catalogsearchAttributeSearchWeightCache" type="Magento\CatalogSearch\Model\Attribute\SearchWeight"/>
     </type>
     <type name="Magento\Framework\Search\EntityMetadata" />
diff --git a/app/code/Magento/Elasticsearch/etc/di.xml b/app/code/Magento/Elasticsearch/etc/di.xml
index 6c61fb8fbe02c..61a20324eaf6a 100644
--- a/app/code/Magento/Elasticsearch/etc/di.xml
+++ b/app/code/Magento/Elasticsearch/etc/di.xml
@@ -556,6 +556,6 @@
         </arguments>
     </type>
     <type name="Magento\Catalog\Model\ResourceModel\Attribute">
-        <plugin name="updateElasticsearchIndexerMapping" type="Magento\Elasticsearch\Model\Indexer\Fulltext\Plugin\Category\Product\Attribute" sortOrder="20"/>
+        <plugin name="updateElasticsearchIndexerMapping" type="Magento\Elasticsearch\Model\Indexer\Fulltext\Plugin\Category\Product\Attribute"/>
     </type>
 </config>

From b8ed0145bc6b8d86b87ba5741197bbeda9398520 Mon Sep 17 00:00:00 2001
From: Yurii Sapiha <yurasapiga93@gmail.com>
Date: Wed, 29 Jul 2020 15:44:21 +0300
Subject: [PATCH 1103/1718] MC-35964: Admin: Shopping cart grid multisite
 selection

---
 .../products_with_websites_and_stores.php     |  65 +++++---
 ...ucts_with_websites_and_stores_rollback.php |  29 ++--
 .../customer_quote_on_second_website.php      |  41 +++++
 ...tomer_quote_on_second_website_rollback.php |  25 +++
 .../Edit/Tab/Cart/CollectionTest.php          | 101 ++++++++++++
 .../Edit/Tab/Cart/StoreSwitcherTest.php       | 146 ++++++++++++++++++
 6 files changed, 371 insertions(+), 36 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/customer_quote_on_second_website.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/customer_quote_on_second_website_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart/CollectionTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart/StoreSwitcherTest.php

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_websites_and_stores.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_websites_and_stores.php
index 6d74d85c0c819..58994e51a7a9f 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_websites_and_stores.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_websites_and_stores.php
@@ -3,40 +3,59 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Helper\DefaultCategory;
+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\Store\Api\WebsiteRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
 Resolver::getInstance()->requireDataFixture('Magento/Store/_files/second_website_with_two_stores.php');
 
-$website = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Website::class);
-/** @var $website \Magento\Store\Model\Website */
-$websiteId = $website->load('test', 'code')->getId();
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductFactory $productFactory */
+$productFactory = $objectManager->get(ProductFactory::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$productRepository->cleanCache();
+/** @var WebsiteRepositoryInterface $websiteRepository */
+$websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class);
+$baseWebsiteId = $websiteRepository->get('base')->getId();
+$secondWebsiteId = $websiteRepository->get('test')->getId();
+$defaultCategoryId = $objectManager->get(DefaultCategory::class)->getId();
+$stockData = ['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1];
 
-/** @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)
-    ->setWebsiteIds([$websiteId])
+$product = $productFactory->create();
+$attributeSetId = $product->getDefaultAttributeSetId();
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId($attributeSetId)
+    ->setWebsiteIds([$secondWebsiteId])
     ->setName('Simple Product on second website')
     ->setSku('simple-2')
     ->setPrice(10)
     ->setDescription('Description with <b>html tag</b>')
-    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
-    ->setCategoryIds([2])
-    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
-    ->save();
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setCategoryIds([$defaultCategoryId])
+    ->setStockData($stockData);
+$productRepository->save($product);
 
-/** @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)
-    ->setWebsiteIds([1])
+$secondProduct = $productFactory->create();
+$secondProduct->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId($attributeSetId)
+    ->setWebsiteIds([$baseWebsiteId])
     ->setName('Simple Product')
     ->setSku('simple-1')
+    ->setUrlKey('simple_product_uniq_key_1')
     ->setPrice(10)
     ->setDescription('Description with <b>html tag</b>')
-    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
-    ->setCategoryIds([2])
-    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
-    ->save();
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setCategoryIds([$defaultCategoryId])
+    ->setStockData($stockData);
+$productRepository->save($secondProduct);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_websites_and_stores_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_websites_and_stores_rollback.php
index dcd849279ae39..f152438fe93f6 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_websites_and_stores_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_websites_and_stores_rollback.php
@@ -3,30 +3,33 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
-
-Resolver::getInstance()->requireDataFixture('Magento/Store/_files/second_website_with_two_stores_rollback.php');
+declare(strict_types=1);
 
-$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-/** @var \Magento\Framework\Registry $registry */
-$registry = $objectManager->get(\Magento\Framework\Registry::class);
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$productRepository->cleanCache();
+/** @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);
-
 try {
     foreach (['simple-2', 'simple-1'] as $sku) {
-        $product = $productRepository->get($sku, false, null, true);
-        $productRepository->delete($product);
+        $productRepository->deleteById($sku);
     }
-} catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
+} catch (NoSuchEntityException $exception) {
     //Product already removed
 }
 
 $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/Checkout/_files/customer_quote_on_second_website.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/customer_quote_on_second_website.php
new file mode 100644
index 0000000000000..a705335a3f68b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/customer_quote_on_second_website.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Checkout\Model\Type\Onepage;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\Quote\Api\Data\CartInterfaceFactory;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer.php');
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/products_with_websites_and_stores.php');
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$productRepository->cleanCache();
+/** @var CartRepositoryInterface $quoteRepository */
+$quoteRepository = $objectManager->get(CartRepositoryInterface::class);
+/** @var CustomerRepositoryInterface $customerRepository */
+$customerRepository = $objectManager->get(CustomerRepositoryInterface::class);
+$customer = $customerRepository->get('customer@example.com');
+/** @var StoreManagerInterface $storeManager */
+$storeManager = $objectManager->get(StoreManagerInterface::class);
+/** @var CartInterface $quote */
+$quote = $objectManager->get(CartInterfaceFactory::class)->create();
+$quote->setStoreId($storeManager->getStore('fixture_second_store')->getId())
+    ->setIsActive(true)
+    ->setIsMultiShipping(0)
+    ->setCustomer($customer)
+    ->setCheckoutMethod(Onepage::METHOD_CUSTOMER)
+    ->setReservedOrderId('test_order_on_second_website')
+    ->addProduct($productRepository->get('simple-2'), 1);
+$quoteRepository->save($quote);
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/customer_quote_on_second_website_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/customer_quote_on_second_website_rollback.php
new file mode 100644
index 0000000000000..2cc43f9171f4b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/customer_quote_on_second_website_rollback.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Quote\Model\GetQuoteByReservedOrderId;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var CartRepositoryInterface $quoteRepository */
+$quoteRepository = $objectManager->get(CartRepositoryInterface::class);
+/** @var GetQuoteByReservedOrderId $getQuoteByReservedOrderId */
+$getQuoteByReservedOrderId = $objectManager->get(GetQuoteByReservedOrderId::class);
+$quote = $getQuoteByReservedOrderId->execute('test_order_on_second_website');
+if ($quote !== null) {
+    $quoteRepository->delete($quote);
+}
+
+Resolver::getInstance()
+    ->requireDataFixture('Magento/Catalog/_files/products_with_websites_and_stores_rollback.php');
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_rollback.php');
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart/CollectionTest.php
new file mode 100644
index 0000000000000..b37870535d9da
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart/CollectionTest.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Block\Adminhtml\Edit\Tab\Cart;
+
+use Magento\Customer\Block\Adminhtml\Edit\Tab\Cart;
+use Magento\Customer\Controller\RegistryConstants;
+use Magento\Framework\Data\Collection;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Registry;
+use Magento\Framework\View\LayoutInterface;
+use Magento\Quote\Model\QuoteRepository;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Store\ExecuteInStoreContext;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class checks that shopping cart grid can be filtered
+ *
+ * @see \Magento\Customer\Block\Adminhtml\Edit\Tab\Cart::_prepareCollection()
+ *
+ * @magentoAppArea adminhtml
+ * @magentoDbIsolation disabled
+ */
+class CollectionTest extends TestCase
+{
+    /** @var ObjectManagerInterface */
+    private $objectManager;
+
+    /** @var ExecuteInStoreContext */
+    private $executeInStoreContext;
+
+    /** @var Registry */
+    private $registry;
+
+    /** @var LayoutInterface */
+    private $layout;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->executeInStoreContext = $this->objectManager->get(ExecuteInStoreContext::class);
+        $this->registry = $this->objectManager->get(Registry::class);
+        $this->layout = $this->objectManager->get(LayoutInterface::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown(): void
+    {
+        $this->registry->unregister(RegistryConstants::CURRENT_CUSTOMER_ID);
+
+        parent::tearDown();
+    }
+
+    /**
+     * @magentoDataFixture Magento/Checkout/_files/quote_with_address_saved.php
+     * @magentoDataFixture Magento/Checkout/_files/customer_quote_on_second_website.php
+     *
+     * @return void
+     */
+    public function testCollectionOnDifferentStores(): void
+    {
+        $this->registry->unregister(RegistryConstants::CURRENT_CUSTOMER_ID);
+        $this->registry->register(RegistryConstants::CURRENT_CUSTOMER_ID, 1);
+        $collectionFirstWebsite = $this->executeInStoreContext->execute(
+            'default',
+            [$this->layout->createBlock(Cart::class), 'getPreparedCollection']
+        );
+        $this->assertCollection($collectionFirstWebsite, 'Simple Product');
+        $this->objectManager->removeSharedInstance(QuoteRepository::class);
+        $collectionSecondWebsite = $this->executeInStoreContext->execute(
+            'fixture_second_store',
+            [$this->layout->createBlock(Cart::class), 'getPreparedCollection']
+        );
+        $this->assertCollection($collectionSecondWebsite, 'Simple Product on second website');
+    }
+
+    /**
+     * Check is collection match expected value
+     *
+     * @param Collection $collection
+     * @param string $itemName
+     * @return void
+     */
+    private function assertCollection(Collection $collection, string $itemName): void
+    {
+        $this->assertCount(1, $collection, 'Collection size does not match expected value');
+        $this->assertEquals($itemName, $collection->getFirstItem()->getName());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart/StoreSwitcherTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart/StoreSwitcherTest.php
new file mode 100644
index 0000000000000..5aba76b37e74a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/Cart/StoreSwitcherTest.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Block\Adminhtml\Edit\Tab\Cart;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\View\Result\Page;
+use Magento\Framework\View\Result\PageFactory;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Helper\Xpath;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class checks store switcher appearance in the customer shopping cart block.
+ *
+ * @see \Magento\Customer\Block\Adminhtml\Edit\Tab\Cart
+ *
+ * @magentoAppArea adminhtml
+ * @magentoDbIsolation enabled
+ */
+class StoreSwitcherTest extends TestCase
+{
+    private const WEBSITE_FILTER_XPATH = "//select[@name='website_id' and @id='website_filter']";
+
+    private const WEBSITE_FILTER_OPTION_XPATH = "//select[@name='website_id' and @id='website_filter']/option";
+
+    /** @var ObjectManagerInterface */
+    private $objectManager;
+
+    /** @var PageFactory */
+    private $pageFactory;
+
+    /** @var StoreManagerInterface */
+    private $storeManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->pageFactory = $this->objectManager->get(PageFactory::class);
+        $this->storeManager = $this->objectManager->get(StoreManagerInterface::class);
+    }
+
+    /**
+     * @return void
+     */
+    public function testStoreSwitcherDisplayed(): void
+    {
+        $html = $this->getBlockHtml('admin.customer.view.edit.cart');
+        $this->assertEquals(
+            1,
+            Xpath::getElementsCountForXpath(self::WEBSITE_FILTER_XPATH, $html),
+            'Website Filter was not found on the page'
+        );
+        $this->checkFilterOptions($html, [$this->storeManager->getWebsite('base')->getName()]);
+    }
+
+    /**
+     * @magentoConfigFixture current_store general/single_store_mode/enabled 1
+     *
+     * @return void
+     */
+    public function testStoreSwitcherIsNotDisplayed(): void
+    {
+        $html = $this->getBlockHtml('admin.customer.view.edit.cart');
+        $this->assertEmpty(Xpath::getElementsCountForXpath(self::WEBSITE_FILTER_XPATH, $html));
+    }
+
+    /**
+     * @magentoDataFixture Magento/Store/_files/second_website_with_two_stores.php
+     *
+     * @return void
+     */
+    public function testStoreSwitcherMultiWebsite(): void
+    {
+        $expectedWebsites = [
+            $this->storeManager->getWebsite('base')->getName(),
+            $this->storeManager->getWebsite('test')->getName(),
+        ];
+        $html = $this->getBlockHtml('admin.customer.view.edit.cart');
+        $this->assertEquals(1, Xpath::getElementsCountForXpath(self::WEBSITE_FILTER_XPATH, $html));
+        $this->checkFilterOptions($html, $expectedWebsites);
+    }
+
+    /**
+     * Check store switcher appearance
+     *
+     * @param string $html
+     * @param array $expectedOptions
+     * @return void
+     */
+    private function checkFilterOptions(string $html, array $expectedOptions): void
+    {
+        $this->assertEquals(
+            count($expectedOptions),
+            Xpath::getElementsCountForXpath(self::WEBSITE_FILTER_OPTION_XPATH, $html),
+            'Website filter options count does not match expected value'
+        );
+        $optionPath = self::WEBSITE_FILTER_OPTION_XPATH . "[contains(text(), '%s')]";
+        foreach ($expectedOptions as $option) {
+            $this->assertEquals(
+                1,
+                Xpath::getElementsCountForXpath(sprintf($optionPath, $option), $html),
+                sprintf('Option for %s website was not found in filter options list', $option)
+            );
+        }
+    }
+
+    /**
+     * Get block html
+     *
+     * @param string $alias
+     * @return string
+     */
+    private function getBlockHtml(string $alias): string
+    {
+        $page = $this->preparePage();
+        $block = $page->getLayout()->getBlock($alias);
+        $this->assertNotFalse($block);
+
+        return $block->toHtml();
+    }
+
+    /**
+     * Prepare page layout
+     *
+     * @return Page
+     */
+    private function preparePage(): Page
+    {
+        $page = $this->pageFactory->create();
+        $page->addHandle(['default', 'customer_index_cart']);
+        $page->getLayout()->generateXml();
+
+        return $page;
+    }
+}

From b3e9715873470bd305682c8abb18b7a365e95566 Mon Sep 17 00:00:00 2001
From: Yurii Sapiha <yurasapiga93@gmail.com>
Date: Wed, 29 Jul 2020 15:48:28 +0300
Subject: [PATCH 1104/1718] MC-35960: Admin: Create Order from customer edit
 page

---
 .../Checkout/_files/quote_with_customer_without_address.php | 6 ++++--
 .../_files/quote_with_customer_without_address_rollback.php | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_without_address.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_without_address.php
index 29144831d66ad..b2ebb6d98b975 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_without_address.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_without_address.php
@@ -12,9 +12,11 @@
 use Magento\Quote\Api\Data\CartInterface;
 use Magento\Quote\Api\Data\CartInterfaceFactory;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-require __DIR__ . '/../../Customer/_files/customer.php';
-require __DIR__ . '/../../../Magento/Catalog/_files/second_product_simple.php';
+
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer.php');
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/second_product_simple.php');
 
 $objectManager = Bootstrap::getObjectManager();
 /** @var ProductRepositoryInterface $productRepository */
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_without_address_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_without_address_rollback.php
index 4144b884b1492..bd06a8da059dd 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_without_address_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_without_address_rollback.php
@@ -8,6 +8,7 @@
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Quote\Model\GetQuoteByReservedOrderId;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
 $objectManager = Bootstrap::getObjectManager();
 /** @var CartRepositoryInterface $quoteRepository */
@@ -19,5 +20,5 @@
     $quoteRepository->delete($quote);
 }
 
-require __DIR__ . '/../../../Magento/Catalog/_files/second_product_simple_rollback.php';
-require __DIR__ . '/../../Customer/_files/customer_rollback.php';
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/second_product_simple_rollback.php');
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_rollback.php');

From 2ca81211d40bbb52560d47adf1191ee4f146b2ae Mon Sep 17 00:00:00 2001
From: DianaRusin <rusind95@gmail.com>
Date: Wed, 29 Jul 2020 15:54:13 +0300
Subject: [PATCH 1105/1718] MC-33747: [MFTF] Flaky
 StorefrontButtonsInlineTranslationTest

---
 ...tonsInlineTranslationOnProductPageTest.xml | 64 +++++++++++++++++++
 ...StorefrontButtonsInlineTranslationTest.xml | 10 +--
 2 files changed, 70 insertions(+), 4 deletions(-)
 create mode 100644 app/code/Magento/Translation/Test/Mftf/Test/StorefrontButtonsInlineTranslationOnProductPageTest.xml

diff --git a/app/code/Magento/Translation/Test/Mftf/Test/StorefrontButtonsInlineTranslationOnProductPageTest.xml b/app/code/Magento/Translation/Test/Mftf/Test/StorefrontButtonsInlineTranslationOnProductPageTest.xml
new file mode 100644
index 0000000000000..0023d4ec757c9
--- /dev/null
+++ b/app/code/Magento/Translation/Test/Mftf/Test/StorefrontButtonsInlineTranslationOnProductPageTest.xml
@@ -0,0 +1,64 @@
+<?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="StorefrontButtonsInlineTranslationOnProductPageTest">
+        <annotations>
+            <features value="Translation"/>
+            <stories value="Inline Translation"/>
+            <title value="Buttons inline translation on product page"/>
+            <description value="A merchant should be able to translate buttons by an inline translation tool"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-27118"/>
+            <useCaseId value="MC-24186"/>
+            <group value="translation"/>
+            <group value="catalog"/>
+            <group value="developer_mode_only"/>
+        </annotations>
+        <before>
+            <!-- Enable Translate Inline For Storefront -->
+            <magentoCLI command="config:set {{EnableTranslateInlineForStorefront.path}} {{EnableTranslateInlineForStorefront.value}}" stepKey="enableTranslateInlineForStorefront"/>
+            <!-- Create Category -->
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <!-- Create Simple Product -->
+            <createData entity="ApiSimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <!-- Disable Translate Inline For Storefront -->
+            <magentoCLI command="config:set {{DisableTranslateInlineForStorefront.path}} {{DisableTranslateInlineForStorefront.value}}" stepKey="disableTranslateInlineForStorefront"/>
+            <!-- Delete Simple Product -->
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <!-- Delete Category -->
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+        </after>
+
+        <!-- Add product to cart on storefront -->
+        <amOnPage url="{{StorefrontProductPage.url($createProduct.custom_attributes[url_key]$)}}" stepKey="goToProductPage"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad"/>
+        <waitForElementVisible selector="{{StorefrontProductActionSection.addToCartEnabledWithTranslation}}" stepKey="waitForAddToCartButtonEnabled"/>
+        <actionGroup ref="AddToCartFromStorefrontProductPageActionGroup" stepKey="addProductToCart">
+            <argument name="productName" value="$createProduct.name$"/>
+        </actionGroup>
+
+        <!-- Open Mini Cart -->
+        <actionGroup ref="StorefrontOpenMiniCartActionGroup" stepKey="openMiniCart"/>
+
+        <!-- Check button "Proceed to Checkout". There must be red borders and "book" icons on labels that can be translated. -->
+        <actionGroup ref="AssertElementInTranslateInlineModeActionGroup" stepKey="assertRedBordersAndBookIcon">
+            <argument name="elementSelector" value="{{StorefrontMinicartSection.goToCheckout}}"/>
+        </actionGroup>
+
+        <!-- Open Inline Translation popup -->
+        <actionGroup ref="StorefrontOpenInlineTranslationPopupActionGroup" stepKey="openInlineTranslationPopup">
+            <argument name="elementSelector" value="{{StorefrontMinicartSection.goToCheckout}}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Translation/Test/Mftf/Test/StorefrontButtonsInlineTranslationTest.xml b/app/code/Magento/Translation/Test/Mftf/Test/StorefrontButtonsInlineTranslationTest.xml
index b57d198dfc570..3d617360a9d28 100644
--- a/app/code/Magento/Translation/Test/Mftf/Test/StorefrontButtonsInlineTranslationTest.xml
+++ b/app/code/Magento/Translation/Test/Mftf/Test/StorefrontButtonsInlineTranslationTest.xml
@@ -20,6 +20,9 @@
             <group value="translation"/>
             <group value="catalog"/>
             <group value="developer_mode_only"/>
+            <skip>
+                <issueId value="DEPRECATED">Use StorefrontButtonsInlineTranslationOnProductPageTest instead</issueId>
+            </skip>
         </annotations>
         <before>
             <!-- Enable Translate Inline For Storefront -->
@@ -41,10 +44,9 @@
         </after>
 
         <!-- Add product to cart on storefront -->
-        <amOnPage url="{{StorefrontProductPage.url($createProduct.custom_attributes[url_key]$)}}" stepKey="goToProductPage"/>
-        <waitForPageLoad stepKey="waitForProductPageLoad"/>
-        <waitForElementVisible selector="{{StorefrontProductActionSection.addToCartEnabledWithTranslation}}" stepKey="waitForAddToCartButtonEnabled"/>
-        <actionGroup ref="AddToCartFromStorefrontProductPageActionGroup" stepKey="addProductToCart">
+        <amOnPage url="{{StorefrontCategoryPage.url($createCategory.custom_attributes[url_key]$)}}" stepKey="goToCategoryPage"/>
+        <waitForPageLoad stepKey="waitForCategoryPageLoad"/>
+        <actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProductToCart">
             <argument name="productName" value="$createProduct.name$"/>
         </actionGroup>
 

From f1da0c7b742e29cde4cb347c1c75f4fe9a08006d Mon Sep 17 00:00:00 2001
From: Yurii Sapiha <yurasapiga93@gmail.com>
Date: Wed, 29 Jul 2020 16:09:17 +0300
Subject: [PATCH 1106/1718] MC-35968: Admin: Add items to shopping cart from
 different sources (advanced checkout)

---
 .../_files/product_in_compare_list_with_customer.php      | 5 +++--
 .../product_in_compare_list_with_customer_rollback.php    | 6 ++++--
 .../quote_with_not_visible_individually_product.php       | 8 +++++---
 ...ote_with_not_visible_individually_product_rollback.php | 8 +++++---
 .../_files/quote_with_taxable_product_and_customer.php    | 7 ++++---
 .../quote_with_taxable_product_and_customer_rollback.php  | 7 ++++---
 .../_files/recently_compared_out_of_stock_product.php     | 5 +++--
 .../recently_compared_out_of_stock_product_rollback.php   | 6 ++++--
 .../Magento/Reports/_files/recently_compared_product.php  | 5 +++--
 .../Reports/_files/recently_compared_product_rollback.php | 6 ++++--
 .../recently_viewed_disabled_product_by_customer.php      | 5 +++--
 ...ently_viewed_disabled_product_by_customer_rollback.php | 5 +++--
 .../_files/recently_viewed_product_by_customer.php        | 5 +++--
 .../recently_viewed_product_by_customer_rollback.php      | 6 ++++--
 .../Wishlist/_files/wishlist_with_disabled_product.php    | 5 +++--
 .../_files/wishlist_with_disabled_product_rollback.php    | 5 +++--
 .../Wishlist/_files/wishlist_with_not_visible_product.php | 5 +++--
 .../_files/wishlist_with_not_visible_product_rollback.php | 6 ++++--
 18 files changed, 65 insertions(+), 40 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_in_compare_list_with_customer.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_in_compare_list_with_customer.php
index dc0d866fa93a9..17bf50bc76352 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_in_compare_list_with_customer.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_in_compare_list_with_customer.php
@@ -10,9 +10,10 @@
 use Magento\Customer\Model\Session;
 use Magento\Customer\Model\Visitor;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-require __DIR__ . '/second_product_simple.php';
-require __DIR__ . '/../../Customer/_files/customer.php';
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/second_product_simple.php');
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer.php');
 
 $objectManager = Bootstrap::getObjectManager();
 /** @var Session $session */
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_in_compare_list_with_customer_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_in_compare_list_with_customer_rollback.php
index 1715de49070fc..dc948702b7f53 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_in_compare_list_with_customer_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_in_compare_list_with_customer_rollback.php
@@ -5,5 +5,7 @@
  */
 declare(strict_types=1);
 
-require __DIR__ . '/../../Customer/_files/customer_rollback.php';
-require __DIR__ . '/second_product_simple_rollback.php';
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_rollback.php');
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/second_product_simple_rollback.php');
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_not_visible_individually_product.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_not_visible_individually_product.php
index ac1ae698e96b6..77982c1ff0688 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_not_visible_individually_product.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_not_visible_individually_product.php
@@ -15,10 +15,12 @@
 use Magento\Quote\Api\Data\CartInterface;
 use Magento\Quote\Api\Data\CartInterfaceFactory;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-require __DIR__ . '/../../Customer/_files/customer.php';
-require __DIR__ . '/../../Customer/_files/customer_address.php';
-require __DIR__ . '/../../../Magento/Catalog/_files/simple_products_not_visible_individually.php';
+
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer.php');
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_address.php');
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/simple_products_not_visible_individually.php');
 
 $objectManager = Bootstrap::getObjectManager();
 /** @var ProductRepositoryInterface $productRepository */
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_not_visible_individually_product_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_not_visible_individually_product_rollback.php
index f8e724a8bd324..4ed8bf5e11735 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_not_visible_individually_product_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_not_visible_individually_product_rollback.php
@@ -8,6 +8,7 @@
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Quote\Model\GetQuoteByReservedOrderId;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
 $objectManager = Bootstrap::getObjectManager();
 /** @var CartRepositoryInterface $quoteRepository */
@@ -19,6 +20,7 @@
     $quoteRepository->delete($quote);
 }
 
-require __DIR__ . '/../../../Magento/Catalog/_files/simple_products_not_visible_individually_rollback.php';
-require __DIR__ . '/../../Customer/_files/customer_address_rollback.php';
-require __DIR__ . '/../../Customer/_files/customer_rollback.php';
+Resolver::getInstance()
+    ->requireDataFixture('Magento/Catalog/_files/simple_products_not_visible_individually_rollback.php');
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_address_rollback.php');
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_rollback.php');
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_taxable_product_and_customer.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_taxable_product_and_customer.php
index 6de9701c5db0b..c32d299d427b5 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_taxable_product_and_customer.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_taxable_product_and_customer.php
@@ -15,10 +15,11 @@
 use Magento\Quote\Api\Data\CartInterface;
 use Magento\Quote\Api\Data\CartInterfaceFactory;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-require __DIR__ . '/../../Customer/_files/customer.php';
-require __DIR__ . '/../../Customer/_files/customer_address.php';
-require __DIR__ . '/../../../Magento/Catalog/_files/taxable_simple_product.php';
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer.php');
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_address.php');
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/taxable_simple_product.php');
 
 $objectManager = Bootstrap::getObjectManager();
 /** @var ProductRepositoryInterface $productRepository */
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_taxable_product_and_customer_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_taxable_product_and_customer_rollback.php
index f92ea92127fef..0051023e48060 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_taxable_product_and_customer_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_taxable_product_and_customer_rollback.php
@@ -8,6 +8,7 @@
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Quote\Model\GetQuoteByReservedOrderId;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
 $objectManager = Bootstrap::getObjectManager();
 /** @var CartRepositoryInterface $quoteRepository */
@@ -19,6 +20,6 @@
     $quoteRepository->delete($quote);
 }
 
-require __DIR__ . '/../../../Magento/Catalog/_files/taxable_simple_product_rollback.php';
-require __DIR__ . '/../../Customer/_files/customer_address_rollback.php';
-require __DIR__ . '/../../Customer/_files/customer_rollback.php';
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/taxable_simple_product_rollback.php');
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_address_rollback.php');
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_rollback.php');
diff --git a/dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_out_of_stock_product.php b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_out_of_stock_product.php
index 2e9625f921a36..42e0a956f6c8d 100644
--- a/dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_out_of_stock_product.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_out_of_stock_product.php
@@ -12,9 +12,10 @@
 use Magento\Framework\Event\Observer;
 use Magento\Reports\Observer\CatalogProductCompareAddProductObserver;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-require __DIR__ . '/../../../Magento/Catalog/_files/out_of_stock_product_with_category.php';
-require __DIR__ . '/../../Customer/_files/customer.php';
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/out_of_stock_product_with_category.php');
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer.php');
 
 $objectManager = Bootstrap::getObjectManager();
 /** @var ProductRepositoryInterface $productRepository */
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 1327ec34a17d2..677bfb32cd8e9 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
@@ -5,5 +5,7 @@
  */
 declare(strict_types=1);
 
-require __DIR__ . '/../../../Magento/Catalog/_files/out_of_stock_product_with_category.php';
-require __DIR__ . '/../../Customer/_files/customer_rollback.php';
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/out_of_stock_product_with_category.php');
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_rollback.php');
diff --git a/dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_product.php b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_product.php
index ebcf1078d896d..1695247e8ba13 100644
--- a/dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_product.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_product.php
@@ -11,9 +11,10 @@
 use Magento\Framework\Event\Observer;
 use Magento\Reports\Observer\CatalogProductCompareAddProductObserver;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-require __DIR__ . '/../../../Magento/Catalog/_files/second_product_simple.php';
-require __DIR__ . '/../../Customer/_files/customer.php';
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/second_product_simple.php');
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer.php');
 
 $objectManager = Bootstrap::getObjectManager();
 $session = $objectManager->get(Session::class);
diff --git a/dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_product_rollback.php b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_product_rollback.php
index 7ea240bb12c84..1181618afecdb 100644
--- a/dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_product_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_product_rollback.php
@@ -5,5 +5,7 @@
  */
 declare(strict_types=1);
 
-require __DIR__ . '/../../../Magento/Catalog/_files/second_product_simple_rollback.php';
-require __DIR__ . '/../../Customer/_files/customer_rollback.php';
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/second_product_simple_rollback.php');
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_rollback.php');
diff --git a/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_disabled_product_by_customer.php b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_disabled_product_by_customer.php
index 2fe1b5812ccb9..33e09155e7c03 100644
--- a/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_disabled_product_by_customer.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_disabled_product_by_customer.php
@@ -12,9 +12,10 @@
 use Magento\Framework\Event\Observer;
 use Magento\Reports\Observer\CatalogProductViewObserver;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-require __DIR__ . '/../../../Magento/Catalog/_files/simple_product_disabled.php';
-require __DIR__ . '/../../Customer/_files/customer.php';
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/simple_product_disabled.php');
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer.php');
 
 $objectManager = Bootstrap::getObjectManager();
 /** @var ProductRepositoryInterface $productRepository */
diff --git a/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_disabled_product_by_customer_rollback.php b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_disabled_product_by_customer_rollback.php
index 2a4cb8809b4ad..f3dedf0a35d96 100644
--- a/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_disabled_product_by_customer_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_disabled_product_by_customer_rollback.php
@@ -11,9 +11,10 @@
 use Magento\Framework\Event\Observer;
 use Magento\Reports\Observer\CatalogProductViewObserver;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-require __DIR__ . '/../../../Magento/Catalog/_files/second_product_simple.php';
-require __DIR__ . '/../../Customer/_files/customer.php';
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/second_product_simple.php');
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer.php');
 
 $objectManager = Bootstrap::getObjectManager();
 /** @var Session $session */
diff --git a/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_product_by_customer.php b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_product_by_customer.php
index 2a4cb8809b4ad..f3dedf0a35d96 100644
--- a/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_product_by_customer.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_product_by_customer.php
@@ -11,9 +11,10 @@
 use Magento\Framework\Event\Observer;
 use Magento\Reports\Observer\CatalogProductViewObserver;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-require __DIR__ . '/../../../Magento/Catalog/_files/second_product_simple.php';
-require __DIR__ . '/../../Customer/_files/customer.php';
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/second_product_simple.php');
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer.php');
 
 $objectManager = Bootstrap::getObjectManager();
 /** @var Session $session */
diff --git a/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_product_by_customer_rollback.php b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_product_by_customer_rollback.php
index 7ea240bb12c84..1181618afecdb 100644
--- a/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_product_by_customer_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_product_by_customer_rollback.php
@@ -5,5 +5,7 @@
  */
 declare(strict_types=1);
 
-require __DIR__ . '/../../../Magento/Catalog/_files/second_product_simple_rollback.php';
-require __DIR__ . '/../../Customer/_files/customer_rollback.php';
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/second_product_simple_rollback.php');
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_rollback.php');
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_product.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_product.php
index fc9c8e886dd44..1e3fc36286579 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_product.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_product.php
@@ -11,9 +11,10 @@
 use Magento\Wishlist\Model\ResourceModel\Wishlist as WishlistResource;
 use Magento\Wishlist\Model\Wishlist;
 use Magento\Wishlist\Model\WishlistFactory;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-require __DIR__ . '/../../../Magento/Customer/_files/customer.php';
-require __DIR__ . '/../../../Magento/Catalog/_files/simple_product_disabled.php';
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer.php');
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/simple_product_disabled.php');
 
 $objectManager = Bootstrap::getObjectManager();
 /** @var WishlistResource $wishListResource */
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_product_rollback.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_product_rollback.php
index 0adb54034f145..665644cd9b6db 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_product_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_product_rollback.php
@@ -10,6 +10,7 @@
 use Magento\Wishlist\Model\ResourceModel\Wishlist as WishlistResource;
 use Magento\Wishlist\Model\Wishlist;
 use Magento\Wishlist\Model\WishlistFactory;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
 $objectManager = Bootstrap::getObjectManager();
 /** @var Registry $registry */
@@ -28,5 +29,5 @@
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
 
-require __DIR__ . '/../../../Magento/Catalog/_files/simple_product_disabled.php';
-require __DIR__ . '/../../../Magento/Customer/_files/customer_rollback.php';
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/simple_product_disabled.php');
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_rollback.php');
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_not_visible_product.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_not_visible_product.php
index 8e201d372f6c5..952b50b52bac4 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_not_visible_product.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_not_visible_product.php
@@ -11,9 +11,10 @@
 use Magento\Wishlist\Model\ResourceModel\Wishlist as WishlistResource;
 use Magento\Wishlist\Model\Wishlist;
 use Magento\Wishlist\Model\WishlistFactory;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-require __DIR__ . '/../../../Magento/Customer/_files/customer.php';
-require __DIR__ . '/../../../Magento/Catalog/_files/simple_products_not_visible_individually.php';
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer.php');
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/simple_products_not_visible_individually.php');
 
 $objectManager = Bootstrap::getObjectManager();
 /** @var WishlistResource $wishListResource */
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_not_visible_product_rollback.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_not_visible_product_rollback.php
index ea68bc136e7da..d747566d68ddc 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_not_visible_product_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_not_visible_product_rollback.php
@@ -10,6 +10,7 @@
 use Magento\Wishlist\Model\ResourceModel\Wishlist as WishlistResource;
 use Magento\Wishlist\Model\Wishlist;
 use Magento\Wishlist\Model\WishlistFactory;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
 $objectManager = Bootstrap::getObjectManager();
 /** @var Registry $registry */
@@ -28,5 +29,6 @@
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
 
-require __DIR__ . '/../../../Magento/Catalog/_files/simple_products_not_visible_individually_rollback.php';
-require __DIR__ . '/../../../Magento/Customer/_files/customer_rollback.php';
+Resolver::getInstance()
+    ->requireDataFixture('Magento/Catalog/_files/simple_products_not_visible_individually_rollback.php');
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_rollback.php');

From 93a616bdc307fd7b0bbaaa72149a942433141cdf Mon Sep 17 00:00:00 2001
From: Yurii Sapiha <yurasapiga93@gmail.com>
Date: Wed, 29 Jul 2020 16:10:25 +0300
Subject: [PATCH 1107/1718] MC-35960: Admin: Create Order from customer edit
 page

---
 .../Checkout/_files/quote_with_customer_without_address.php      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_without_address.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_without_address.php
index b2ebb6d98b975..1e3813f3970bc 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_without_address.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_customer_without_address.php
@@ -14,7 +14,6 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-
 Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer.php');
 Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/second_product_simple.php');
 

From 7f1ea0e930a831ef068fc22b0332a39591bb25bc Mon Sep 17 00:00:00 2001
From: Mykhailo Matiola <mykhailo.matiola@transoftgroup.com>
Date: Wed, 29 Jul 2020 16:20:22 +0300
Subject: [PATCH 1108/1718] MC-25185: Storefront: View product with cross-sells
 products

---
 .../Magento/Catalog/Block/Product/AbstractTest.php          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/AbstractTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/AbstractTest.php
index ed2e8cbfcf7c2..fd1ff22dc6525 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/AbstractTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/AbstractTest.php
@@ -114,7 +114,7 @@ public function testGetAddToCartUrlWithSimpleProduct(): void
         $product = $this->productRepository->get('simple-1');
         $url = $this->block->getAddToCartUrl($product);
         $this->assertStringEndsWith(sprintf('product/%s/', $product->getId()), $url);
-        $this->assertContains('checkout/cart/add', $url);
+        $this->assertStringContainsString('checkout/cart/add', $url);
     }
 
     /**
@@ -247,7 +247,7 @@ public function testGetProductPriceHtml(): void
             ]
         );
         $finalPriceHtml = $this->block->getProductPriceHtml($product, FinalPrice::PRICE_CODE);
-        $this->assertContains('price-' . FinalPrice::PRICE_CODE, $finalPriceHtml);
-        $this->assertContains('product-price-' . $product->getId(), $finalPriceHtml);
+        $this->assertStringContainsString('price-' . FinalPrice::PRICE_CODE, $finalPriceHtml);
+        $this->assertStringContainsString('product-price-' . $product->getId(), $finalPriceHtml);
     }
 }

From aab95209026730debcc4b3b420b7b50cca1cdc72 Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Wed, 29 Jul 2020 09:36:39 -0500
Subject: [PATCH 1109/1718] MC-20638: MyAccount :: Order Details :: Shipping
 Details by Order Number

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

diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping.php b/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping.php
index d382b7dba3ab9..848ee1ff0174b 100644
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping.php
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping.php
@@ -10,7 +10,7 @@
 use Magento\Framework\DB\Transaction;
 use Magento\Sales\Model\Order\ShipmentFactory;
 
-Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/order_with_different_types_of_product.php');
+Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/order_with_customer.php');
 
 $objectManager = Bootstrap::getObjectManager();
 /** @var Transaction $transaction */

From eb2a80597f4e4df176542a658fb730fdbc4338b1 Mon Sep 17 00:00:00 2001
From: Nikita Sarychev <nsarychev@lachestry.com>
Date: Wed, 29 Jul 2020 17:37:01 +0300
Subject: [PATCH 1110/1718] fix static test

---
 .../Backend/Block/Widget/Grid/Column/Filter/Price.php     | 2 +-
 .../Unit/Block/Widget/Grid/Column/Filter/PriceTest.php    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Price.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Price.php
index b8c12b434652d..40106833b6a9a 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Price.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Price.php
@@ -162,7 +162,7 @@ protected function _getCurrencyList()
     /**
      * Retrieve filter value
      *
-     * @param null $index
+     * @param string|null $index
      * @return array|null
      */
     public function getValue($index = null)
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/PriceTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/PriceTest.php
index 32eebbb2e7670..6efc6fcab5b8a 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/PriceTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/Column/Filter/PriceTest.php
@@ -21,7 +21,7 @@
 class PriceTest extends TestCase
 {
     /** @var RequestInterface|MockObject  */
-    private $_requestMock;
+    private $requestMock;
 
     /** @var Context|MockObject */
     private $context;
@@ -43,10 +43,10 @@ class PriceTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->_requestMock = $this->getMockForAbstractClass(RequestInterface::class);
+        $this->requestMock = $this->getMockForAbstractClass(RequestInterface::class);
 
         $this->context = $this->createMock(Context::class);
-        $this->context->expects($this->any())->method('getRequest')->willReturn($this->_requestMock);
+        $this->context->expects($this->any())->method('getRequest')->willReturn($this->requestMock);
 
         $this->helper = $this->createMock(Helper::class);
 
@@ -80,7 +80,7 @@ public function testGetCondition()
         )->method(
             'getDefaultCurrency'
         )->with(
-            $this->_requestMock
+            $this->requestMock
         )->willReturn(
             'defaultCurrency'
         );

From 72a7e089eb494adf9d5f4ecabebf8233d06fff42 Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@magento.com>
Date: Wed, 29 Jul 2020 13:32:56 -0500
Subject: [PATCH 1111/1718] MC-35985: Enable new consumer configuration
 settings on current consumers

- Update tests;
---
 .../Unit/Model/Cron/ConsumersRunnerTest.php   | 42 +++++++++++--------
 .../Model/Cron/ConsumersRunnerTest.php        |  1 +
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/app/code/Magento/MessageQueue/Test/Unit/Model/Cron/ConsumersRunnerTest.php b/app/code/Magento/MessageQueue/Test/Unit/Model/Cron/ConsumersRunnerTest.php
index 54c10a352aff0..b907661e14b6b 100644
--- a/app/code/Magento/MessageQueue/Test/Unit/Model/Cron/ConsumersRunnerTest.php
+++ b/app/code/Magento/MessageQueue/Test/Unit/Model/Cron/ConsumersRunnerTest.php
@@ -153,7 +153,7 @@ public function testRun(
                     ['cron_consumers_runner/cron_run', true, true],
                     ['cron_consumers_runner/max_messages', 10000, $maxMessages],
                     ['cron_consumers_runner/consumers', [], $allowedConsumers],
-                    ['queue/only_spawn_when_message_available', 0, 0],
+                    ['queue/only_spawn_when_message_available', null, 0],
                 ]
             );
 
@@ -277,6 +277,7 @@ public function runDataProvider()
      * @param int $shellBackgroundExpects
      * @param boolean $globalOnlySpawnWhenMessageAvailable
      * @param int $getOnlySpawnWhenMessageAvailableCallCount
+     * @param int $isMassagesAvailableInTheQueueCallCount
      * @dataProvider runBasedOnOnlySpawnWhenMessageAvailableConsumerConfigurationDataProvider
      */
     public function testRunBasedOnOnlySpawnWhenMessageAvailableConsumerConfiguration(
@@ -284,7 +285,8 @@ public function testRunBasedOnOnlySpawnWhenMessageAvailableConsumerConfiguration
         $isMassagesAvailableInTheQueue,
         $shellBackgroundExpects,
         $globalOnlySpawnWhenMessageAvailable,
-        $getOnlySpawnWhenMessageAvailableCallCount
+        $getOnlySpawnWhenMessageAvailableCallCount,
+        $isMassagesAvailableInTheQueueCallCount
     ) {
         $consumerName = 'consumerName';
         $connectionName = 'connectionName';
@@ -296,7 +298,7 @@ public function testRunBasedOnOnlySpawnWhenMessageAvailableConsumerConfiguration
                     ['cron_consumers_runner/cron_run', true, true],
                     ['cron_consumers_runner/max_messages', 10000, 1000],
                     ['cron_consumers_runner/consumers', [], []],
-                    ['queue/only_spawn_when_message_available', 0, $globalOnlySpawnWhenMessageAvailable],
+                    ['queue/only_spawn_when_message_available', true, $globalOnlySpawnWhenMessageAvailable],
                 ]
             );
 
@@ -323,7 +325,7 @@ public function testRunBasedOnOnlySpawnWhenMessageAvailableConsumerConfiguration
             ->method('isLocked')
             ->willReturn(false);
 
-        $this->checkIsAvailableMessagesMock->expects($this->exactly((int)$onlySpawnWhenMessageAvailable))
+        $this->checkIsAvailableMessagesMock->expects($this->exactly($isMassagesAvailableInTheQueueCallCount))
             ->method('execute')
             ->willReturn($isMassagesAvailableInTheQueue);
 
@@ -344,42 +346,48 @@ public function runBasedOnOnlySpawnWhenMessageAvailableConsumerConfigurationData
                 'isMassagesAvailableInTheQueue' => true,
                 'shellBackgroundExpects' => 1,
                 'globalOnlySpawnWhenMessageAvailable' => false,
-                'getOnlySpawnWhenMessageAvailableCallCount' => 1
+                'getOnlySpawnWhenMessageAvailableCallCount' => 1,
+                'isMassagesAvailableInTheQueueCallCount' => 1
             ],
             [
                 'onlySpawnWhenMessageAvailable' => true,
                 'isMassagesAvailableInTheQueue' => false,
                 'shellBackgroundExpects' => 0,
                 'globalOnlySpawnWhenMessageAvailable' => false,
-                'getOnlySpawnWhenMessageAvailableCallCount' => 1
+                'getOnlySpawnWhenMessageAvailableCallCount' => 1,
+                'isMassagesAvailableInTheQueueCallCount' => 1
             ],
             [
                 'onlySpawnWhenMessageAvailable' => false,
                 'isMassagesAvailableInTheQueue' => true,
                 'shellBackgroundExpects' => 1,
                 'globalOnlySpawnWhenMessageAvailable' => false,
-                'getOnlySpawnWhenMessageAvailableCallCount' => 1
+                'getOnlySpawnWhenMessageAvailableCallCount' => 2,
+                'isMassagesAvailableInTheQueueCallCount' => 0
             ],
             [
-                'onlySpawnWhenMessageAvailable' => false,
-                'isMassagesAvailableInTheQueue' => false,
+                'onlySpawnWhenMessageAvailable' => null,
+                'isMassagesAvailableInTheQueue' => true,
                 'shellBackgroundExpects' => 1,
-                'globalOnlySpawnWhenMessageAvailable' => false,
-                'getOnlySpawnWhenMessageAvailableCallCount' => 1
+                'globalOnlySpawnWhenMessageAvailable' => true,
+                'getOnlySpawnWhenMessageAvailableCallCount' => 2,
+                'isMassagesAvailableInTheQueueCallCount' => 1
             ],
             [
-                'onlySpawnWhenMessageAvailable' => true,
+                'onlySpawnWhenMessageAvailable' => null,
                 'isMassagesAvailableInTheQueue' => true,
                 'shellBackgroundExpects' => 1,
-                'globalOnlySpawnWhenMessageAvailable' => true,
-                'getOnlySpawnWhenMessageAvailableCallCount' => 0
+                'globalOnlySpawnWhenMessageAvailable' => false,
+                'getOnlySpawnWhenMessageAvailableCallCount' => 2,
+                'isMassagesAvailableInTheQueueCallCount' => 0
             ],
             [
-                'onlySpawnWhenMessageAvailable' => true,
+                'onlySpawnWhenMessageAvailable' => false,
                 'isMassagesAvailableInTheQueue' => true,
                 'shellBackgroundExpects' => 1,
-                'globalOnlySpawnWhenMessageAvailable' => false,
-                'getOnlySpawnWhenMessageAvailableCallCount' => 1
+                'globalOnlySpawnWhenMessageAvailable' => true,
+                'getOnlySpawnWhenMessageAvailableCallCount' => 2,
+                'isMassagesAvailableInTheQueueCallCount' => 0
             ],
         ];
     }
diff --git a/dev/tests/integration/testsuite/Magento/MessageQueue/Model/Cron/ConsumersRunnerTest.php b/dev/tests/integration/testsuite/Magento/MessageQueue/Model/Cron/ConsumersRunnerTest.php
index 8fafec2ee091f..dca0ef14663f4 100644
--- a/dev/tests/integration/testsuite/Magento/MessageQueue/Model/Cron/ConsumersRunnerTest.php
+++ b/dev/tests/integration/testsuite/Magento/MessageQueue/Model/Cron/ConsumersRunnerTest.php
@@ -127,6 +127,7 @@ public function testSpecificConsumerAndRerun()
         $specificConsumer = 'exportProcessor';
         $config = $this->config;
         $config['cron_consumers_runner'] = ['consumers' => [$specificConsumer], 'max_messages' => 0];
+        $config['queue'] = ['only_spawn_when_message_available' => 0];
         $this->writeConfig($config);
         $this->reRunConsumersAndCheckLocks($specificConsumer);
         $this->reRunConsumersAndCheckLocks($specificConsumer);

From 065c78027a30f1ae4e65d6927c5535c4398e60cd Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Wed, 29 Jul 2020 13:41:17 -0500
Subject: [PATCH 1112/1718] Added store config for payflowpro vault

---
 app/code/Magento/PaypalGraphQl/etc/graphql/di.xml  | 8 ++++++++
 app/code/Magento/PaypalGraphQl/etc/schema.graphqls | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/app/code/Magento/PaypalGraphQl/etc/graphql/di.xml b/app/code/Magento/PaypalGraphQl/etc/graphql/di.xml
index cbb70d52c401a..9c884aa32ace4 100644
--- a/app/code/Magento/PaypalGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/PaypalGraphQl/etc/graphql/di.xml
@@ -54,4 +54,12 @@
             </argument>
         </arguments>
     </type>
+
+    <type name="Magento\StoreGraphQl\Model\Resolver\Store\StoreConfigDataProvider">
+        <arguments>
+            <argument name="extendedConfigData" xsi:type="array">
+                <item name="payflowpro_vault_enabled" xsi:type="string">payment/payflowpro_cc_vault/active</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/PaypalGraphQl/etc/schema.graphqls b/app/code/Magento/PaypalGraphQl/etc/schema.graphqls
index 905e702c512fd..2cefc7d0c68af 100644
--- a/app/code/Magento/PaypalGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/PaypalGraphQl/etc/schema.graphqls
@@ -142,3 +142,7 @@ input PayflowProResponseInput @doc(description:"Input required to complete payme
 type PayflowProResponseOutput {
     cart: Cart!
 }
+
+type StoreConfig {
+    payflowpro_vault_enabled: String @doc(description: "Payflowpro vault status.")
+}

From d47baa8c9cb5be44fbd145b902d8456bde35c83b Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Wed, 29 Jul 2020 13:45:10 -0500
Subject: [PATCH 1113/1718] composer changes for store config

---
 app/code/Magento/PaypalGraphQl/composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/PaypalGraphQl/composer.json b/app/code/Magento/PaypalGraphQl/composer.json
index 8d012be3492dd..13864e54fa1f5 100644
--- a/app/code/Magento/PaypalGraphQl/composer.json
+++ b/app/code/Magento/PaypalGraphQl/composer.json
@@ -16,7 +16,8 @@
         "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-graph-ql": "*"
+        "magento/module-graph-ql": "*",
+        "magento/module-store-graph-ql": "*"
     },
     "type": "magento2-module",
     "license": [

From 4c9adb5d653cd296c160f65e25ea0922f73f9ce2 Mon Sep 17 00:00:00 2001
From: Vitalii Zabaznov <vzabaznov@magento.com>
Date: Wed, 29 Jul 2020 15:29:39 -0500
Subject: [PATCH 1114/1718] MC-35903: Refactor place where lock mechanism is
 used regarding proper lock description

---
 .../Console/StartConsumerCommand.php          | 32 +++++++++----------
 .../Framework/Lock/Backend/CacheTest.php      | 29 ++++++-----------
 .../Cache/LockGuardedCacheLoader.php          |  2 +-
 .../Magento/Framework/Lock/Backend/Cache.php  | 28 ++++++++++++----
 4 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/app/code/Magento/MessageQueue/Console/StartConsumerCommand.php b/app/code/Magento/MessageQueue/Console/StartConsumerCommand.php
index fc2207dcd7c86..f0f9cf4b68bdb 100644
--- a/app/code/Magento/MessageQueue/Console/StartConsumerCommand.php
+++ b/app/code/Magento/MessageQueue/Console/StartConsumerCommand.php
@@ -79,22 +79,20 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $singleThread = $input->getOption(self::OPTION_SINGLE_THREAD);
 
-        if ($singleThread && $this->lockManager->isLocked(md5($consumerName))) { //phpcs:ignore
-            $output->writeln('<error>Consumer with the same name is running</error>');
-            return \Magento\Framework\Console\Cli::RETURN_FAILURE;
-        }
-
-        if ($singleThread) {
-            $this->lockManager->lock(md5($consumerName)); //phpcs:ignore
-        }
-
-        $this->appState->setAreaCode($areaCode ?? 'global');
-
-        $consumer = $this->consumerFactory->get($consumerName, $batchSize);
-        $consumer->process($numberOfMessages);
-
-        if ($singleThread) {
-            $this->lockManager->unlock(md5($consumerName)); //phpcs:ignore
+        try {
+            if ($singleThread && !$this->lockManager->lock(md5($consumerName),0)) { //phpcs:ignore
+                $output->writeln('<error>Consumer with the same name is running</error>');
+                return \Magento\Framework\Console\Cli::RETURN_FAILURE;
+            }
+
+            $this->appState->setAreaCode($areaCode ?? 'global');
+
+            $consumer = $this->consumerFactory->get($consumerName, $batchSize);
+            $consumer->process($numberOfMessages);
+        } finally {
+            if ($singleThread) {
+                $this->lockManager->unlock(md5($consumerName)); //phpcs:ignore
+            }
         }
 
         return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
@@ -163,7 +161,7 @@ protected function configure()
 To specify the preferred area:
 
     <comment>%command.full_name% someConsumer --area-code='adminhtml'</comment>
-    
+
 To do not run multiple copies of one consumer simultaneously:
 
     <comment>%command.full_name% someConsumer --single-thread'</comment>
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/CacheTest.php b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/CacheTest.php
index 306bda462820a..bf5b282c805e6 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/CacheTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/CacheTest.php
@@ -47,16 +47,10 @@ public function testParallelLock(): void
     {
         $identifier1 = \uniqid('lock_name_1_', true);
 
-        $this->assertTrue($this->cacheInstance1->lock($identifier1, 2));
+        $this->assertTrue($this->cacheInstance1->lock($identifier1));
 
-        $this->assertFalse($this->cacheInstance1->lock($identifier1, 2));
-        $this->assertFalse($this->cacheInstance2->lock($identifier1, 2));
-        sleep(4);
-        $this->assertFalse($this->cacheInstance1->isLocked($identifier1));
-
-        $this->assertTrue($this->cacheInstance2->lock($identifier1, -1));
-        sleep(4);
-        $this->assertTrue($this->cacheInstance1->isLocked($identifier1));
+        $this->assertFalse($this->cacheInstance1->lock($identifier1, 0));
+        $this->assertFalse($this->cacheInstance2->lock($identifier1, 0));
     }
 
     /**
@@ -66,19 +60,16 @@ public function testParallelLock(): void
      */
     public function testParallelLockExpired(): void
     {
-        $identifier1 = \uniqid('lock_name_1_', true);
+        $lifeTime = \Closure::bind(function (Cache $class) {
+            return $class->defaultLifetime;
+        }, null, $this->cacheInstance1)($this->cacheInstance1);
 
-        $this->assertTrue($this->cacheInstance1->lock($identifier1, 1));
-        sleep(2);
-        $this->assertFalse($this->cacheInstance1->isLocked($identifier1));
+        $identifier1 = \uniqid('lock_name_1_', true);
 
-        $this->assertTrue($this->cacheInstance1->lock($identifier1, 1));
-        sleep(2);
-        $this->assertFalse($this->cacheInstance1->isLocked($identifier1));
+        $this->assertTrue($this->cacheInstance1->lock($identifier1, 0));
+        $this->assertTrue($this->cacheInstance2->lock($identifier1, $lifeTime + 1));
 
-        $this->assertTrue($this->cacheInstance2->lock($identifier1, 1));
-        sleep(2);
-        $this->assertFalse($this->cacheInstance1->isLocked($identifier1));
+        $this->cacheInstance2->unlock($identifier1);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Cache/LockGuardedCacheLoader.php b/lib/internal/Magento/Framework/Cache/LockGuardedCacheLoader.php
index 439648b3cc32b..d3b4c8852267a 100644
--- a/lib/internal/Magento/Framework/Cache/LockGuardedCacheLoader.php
+++ b/lib/internal/Magento/Framework/Cache/LockGuardedCacheLoader.php
@@ -131,7 +131,7 @@ public function lockedLoadData(
                 return $dataCollector();
             }
 
-            if ($this->locker->lock($lockName, $this->lockTimeout / 1000)) {
+            if ($this->locker->lock($lockName, 0)) {
                 try {
                     $data = $dataCollector();
                     $dataSaver($data);
diff --git a/lib/internal/Magento/Framework/Lock/Backend/Cache.php b/lib/internal/Magento/Framework/Lock/Backend/Cache.php
index 612d8541281b0..c8517c9cf73c4 100644
--- a/lib/internal/Magento/Framework/Lock/Backend/Cache.php
+++ b/lib/internal/Magento/Framework/Lock/Backend/Cache.php
@@ -31,6 +31,20 @@ class Cache implements \Magento\Framework\Lock\LockManagerInterface
      */
     private $lockSign;
 
+    /**
+     * How many microseconds to wait before re-try to acquire a lock
+     *
+     * @var int
+     */
+    private $sleepCycle = 100000;
+
+    /**
+     * Lifetime of lock data in seconds.
+     *
+     * @var int
+     */
+    private $defaultLifetime = 10;
+
     /**
      * @param FrontendInterface $cache
      */
@@ -49,14 +63,16 @@ public function lock(string $name, int $timeout = -1): bool
             $this->lockSign = $this->generateLockSign();
         }
 
-        $data = $this->cache->load($this->getIdentifier($name));
-
-        if (false !== $data) {
-             return false;
+        $skipDeadline = $timeout < 0;
+        $deadline = microtime(true) + $timeout;
+        while ($this->cache->load($this->getIdentifier($name))) {
+            if (!$skipDeadline && $deadline <= microtime(true)) {
+                return false;
+            }
+            usleep($this->sleepCycle);
         }
 
-        $timeout = $timeout <= 0 ? null : $timeout;
-        $this->cache->save($this->lockSign, $this->getIdentifier($name), [], $timeout);
+        $this->cache->save($this->lockSign, $this->getIdentifier($name), [], $this->defaultLifetime);
 
         $data = $this->cache->load($this->getIdentifier($name));
 

From fd8e270122df128ff7f2e46840bca31a91e7651e Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Wed, 29 Jul 2020 16:42:12 -0500
Subject: [PATCH 1115/1718] added better naming for store config field

---
 app/code/Magento/PaypalGraphQl/etc/graphql/di.xml  | 2 +-
 app/code/Magento/PaypalGraphQl/etc/schema.graphqls | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/PaypalGraphQl/etc/graphql/di.xml b/app/code/Magento/PaypalGraphQl/etc/graphql/di.xml
index 9c884aa32ace4..f1b99295f5627 100644
--- a/app/code/Magento/PaypalGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/PaypalGraphQl/etc/graphql/di.xml
@@ -58,7 +58,7 @@
     <type name="Magento\StoreGraphQl\Model\Resolver\Store\StoreConfigDataProvider">
         <arguments>
             <argument name="extendedConfigData" xsi:type="array">
-                <item name="payflowpro_vault_enabled" xsi:type="string">payment/payflowpro_cc_vault/active</item>
+                <item name="payment_payflowpro_cc_vault_active" xsi:type="string">payment/payflowpro_cc_vault/active</item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/PaypalGraphQl/etc/schema.graphqls b/app/code/Magento/PaypalGraphQl/etc/schema.graphqls
index 2cefc7d0c68af..52b0a6ec97518 100644
--- a/app/code/Magento/PaypalGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/PaypalGraphQl/etc/schema.graphqls
@@ -144,5 +144,5 @@ type PayflowProResponseOutput {
 }
 
 type StoreConfig {
-    payflowpro_vault_enabled: String @doc(description: "Payflowpro vault status.")
+    payment_payflowpro_cc_vault_active: String @doc(description: "Payflow Pro vault status.")
 }

From 736ce0dabb55780bcae5c493db6f06beb85a0036 Mon Sep 17 00:00:00 2001
From: Deepty Thampy <dthampy@adobe.com>
Date: Wed, 29 Jul 2020 20:32:48 -0500
Subject: [PATCH 1116/1718] MC-20639: MyAccount :: Order Details :: Refund
 (creditMemo) Details by Order Number

- cleanup test
---
 .../Magento/GraphQl/Sales/CreditmemoTest.php  | 40 +++++++++----------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
index b573b9fcb8a37..15959d9ebb52b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
@@ -18,7 +18,6 @@
 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 as CreditMemoCollection;
 use Magento\Sales\Model\Service\CreditmemoService;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -51,9 +50,6 @@ class CreditmemoTest extends GraphQlAbstract
     /** @var OrderRepositoryInterface */
     private $orderRepository;
 
-    /** @var CreditMemoCollection */
-    private $creditMemoCollection;
-
     /** @var SearchCriteriaBuilder */
     private $searchCriteriaBuilder;
 
@@ -74,7 +70,6 @@ protected function setUp(): void
         $this->orderCollection = $objectManager->get(OrderCollection::class);
         $this->orderRepository = $objectManager->get(OrderRepositoryInterface::class);
         $this->creditMemoService = $objectManager->get(CreditmemoService::class);
-        $this->creditMemoCollection = $objectManager->get(CreditMemoCollection::class);
     }
 
     /**
@@ -172,14 +167,14 @@ public function testCreditMemoForBundledProductsWithPartialRefund()
         $this->setPaymentMethod($cartId, $paymentMethod);
         $orderNumber = $this->placeOrder($cartId);
         $this->prepareInvoice($orderNumber, 2);
-        // Create a credit memo
+
         $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);
@@ -252,13 +247,7 @@ public function testCreditMemoForBundledProductsWithPartialRefund()
         $creditMemos = $firstOrderItem['credit_memos'] ?? [];
         $this->assertResponseFields($creditMemos, $expectedCreditMemoData);
         $this->deleteOrder();
-        $searchCriteria = $this->searchCriteriaBuilder->addFilter('increment_id', $orderNumber)
-            ->create();
-        $creditmemoRepository = Bootstrap::getObjectManager()->get(CreditmemoRepositoryInterface::class);
-        $creditmemos = $creditmemoRepository->getList($searchCriteria)->getItems();
-        foreach ($creditmemos as $creditmemo) {
-            $creditmemoRepository->delete($creditmemo);
-        }
+        $this->cleanUpCreditMemos($orderNumber);
     }
 
     /**
@@ -307,7 +296,6 @@ public function testCreditMemoForBundleProductWithTaxesAndDiscounts()
         $creditMemo->save();
 
         $this->creditMemoService->refund($creditMemo, true);
-        //$this->prepareCreditmemoAndRefund($orderNumber);
         $response = $this->getCustomerOrderWithCreditMemoQuery();
         $expectedCreditMemoData = [
             [
@@ -377,13 +365,7 @@ public function testCreditMemoForBundleProductWithTaxesAndDiscounts()
         $creditMemos = $firstOrderItem['credit_memos'] ?? [];
         $this->assertResponseFields($creditMemos, $expectedCreditMemoData);
         $this->deleteOrder();
-        $searchCriteria = $this->searchCriteriaBuilder->addFilter('increment_id', $orderNumber)
-            ->create();
-        $creditmemoRepository = Bootstrap::getObjectManager()->get(CreditmemoRepositoryInterface::class);
-        $creditmemos = $creditmemoRepository->getList($searchCriteria)->getItems();
-        foreach ($creditmemos as $creditmemo) {
-            $creditmemoRepository->delete($creditmemo);
-        }
+        $this->cleanUpCreditMemos($orderNumber);
     }
 
     /**
@@ -729,6 +711,20 @@ private function deleteOrder(): void
         $registry->register('isSecureArea', false);
     }
 
+    /**
+     * @param $orderNumber
+     */
+    private function cleanUpCreditMemos($orderNumber): void
+    {
+        $creditmemoRepository = Bootstrap::getObjectManager()->get(CreditmemoRepositoryInterface::class);
+        $searchCriteria = $this->searchCriteriaBuilder->addFilter('increment_id', $orderNumber)
+            ->create();
+        $creditmemos = $creditmemoRepository->getList($searchCriteria)->getItems();
+        foreach ($creditmemos as $creditmemo) {
+            $creditmemoRepository->delete($creditmemo);
+        }
+    }
+
     /**
      *  Get CustomerOrder with credit memo details
      *

From e0972bf2ac019a1b4645f2aaa7ac2e6016859fe5 Mon Sep 17 00:00:00 2001
From: Will Wright <wwrig@guidance.com>
Date: Wed, 29 Jul 2020 22:15:00 -0700
Subject: [PATCH 1117/1718] magento/magento2#29315:
 \Magento\Config\Model\Config\Source\Email\Template::toOptionArray throws
 error when setPath() is not called first - Fix formatting for static tests

---
 .../Unit/Model/Config/Source/Email/TemplateTest.php   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Source/Email/TemplateTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Source/Email/TemplateTest.php
index 74ab4baa4e990..9b531280f66c6 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Source/Email/TemplateTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Source/Email/TemplateTest.php
@@ -131,8 +131,12 @@ public function testToOptionArrayWithoutPath()
             $this->never()
         )->method(
             'getTemplateLabel'
-        )->with('')
-        ->willThrowException(new \UnexpectedValueException("Email template '' is not defined."));
+        )->with(
+            ''
+        )
+        ->willThrowException(
+            new \UnexpectedValueException("Email template '' is not defined.")
+        );
 
         $expectedResult = [
             [
@@ -146,4 +150,5 @@ public function testToOptionArrayWithoutPath()
         ];
 
         $this->assertEquals($expectedResult, $this->_model->toOptionArray());
-    }}
+    }
+}

From 8cbce5ca033e7e2609e596609bfa7a95e938d11e Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Thu, 30 Jul 2020 10:24:05 +0200
Subject: [PATCH 1118/1718] Minor fixes for tests

---
 .../Model/Resolver/AddProductsToCart.php      |   2 +-
 .../api-functional/phpunit_graphql.xml.dist   | 115 ++++++++++++++++++
 ...dSimpleProductToCartSingleMutationTest.php |   2 +-
 3 files changed, 117 insertions(+), 2 deletions(-)
 create mode 100644 dev/tests/api-functional/phpunit_graphql.xml.dist

diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/AddProductsToCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/AddProductsToCart.php
index de89f3c062e95..a00633390eff1 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/AddProductsToCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/AddProductsToCart.php
@@ -78,7 +78,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             'cart' => [
                 'model' => $addProductsToCartOutput->getCart(),
             ],
-            'userInputErrors' => \array_map(
+            'userInputErrors' => array_map(
                 function (Error $error) {
                     return [
                         'code' => $error->getCode(),
diff --git a/dev/tests/api-functional/phpunit_graphql.xml.dist b/dev/tests/api-functional/phpunit_graphql.xml.dist
new file mode 100644
index 0000000000000..2f6ad1f9a37d4
--- /dev/null
+++ b/dev/tests/api-functional/phpunit_graphql.xml.dist
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * PHPUnit configuration for GraphQL web API functional tests.
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.2/phpunit.xsd"
+         colors="true"
+         columns="max"
+         beStrictAboutTestsThatDoNotTestAnything="false"
+         bootstrap="./framework/bootstrap.php"
+         testSuiteLoaderClass="Magento\TestFramework\ApiSuiteLoader"
+         testSuiteLoaderFile="framework/Magento/TestFramework/ApiSuiteLoader.php"
+>
+    <!-- Test suites definition -->
+    <testsuites>
+            <testsuite name="Magento GraphQL web API functional tests">
+                <file>testsuite/Magento/WebApiTest.php</file>
+            </testsuite>
+        <testsuite name="Magento GraphQL web API functional tests real suite">
+            <directory suffix="Test.php">testsuite/Magento/GraphQl</directory>
+        </testsuite>
+    </testsuites>
+
+    <!-- PHP INI settings and constants definition -->
+    <php>
+        <includePath>./testsuite</includePath>
+        <const name="TESTS_INSTALL_CONFIG_FILE" value="config/install-config-mysql.php"/>
+        <const name="TESTS_GLOBAL_CONFIG_FILE" value="config/config-global.php"/>
+        <!-- Webserver URL -->
+        <const name="TESTS_BASE_URL" value="http://magento.url"/>
+        <!-- Webserver API user -->
+        <const name="TESTS_WEBSERVICE_USER" value="admin"/>
+        <!-- Webserver API key -->
+        <const name="TESTS_WEBSERVICE_APIKEY" value="123123q"/>
+        <!-- Define if debugger should be started using XDEBUG_SESSION cookie -->
+        <const name="TESTS_XDEBUG_ENABLED" value="false"/>
+        <!-- Define XDEBUG_SESSION cookie value-->
+        <const name="TESTS_XDEBUG_SESSION" value="phpstorm" />
+
+        <ini name="date.timezone" value="America/Los_Angeles"/>
+
+        <!-- Semicolon-separated 'glob' patterns, that match global XML configuration files -->
+        <const name="TESTS_GLOBAL_CONFIG_DIR" value="../../../app/etc"/>
+        <!-- Whether to cleanup the application before running tests or not -->
+        <const name="TESTS_CLEANUP" value="enabled"/>
+        <!--Defines if Magento should be installed before tests execution-->
+        <const name="TESTS_MAGENTO_INSTALLATION" value="disabled"/>
+        <!-- Magento mode for tests execution. Possible values are "default", "developer" and "production". -->
+        <const name="TESTS_MAGENTO_MODE" value="default"/>
+        <const name="USE_OVERRIDE_CONFIG" value="enabled"/>
+    </php>
+
+    <!-- Test listeners -->
+    <listeners>
+        <listener class="Magento\TestFramework\Event\PhpUnit"/>
+        <listener class="Yandex\Allure\Adapter\AllureAdapter">
+            <arguments>
+                <string>var/allure-results</string> <!-- XML files output folder -->
+                <boolean>true</boolean> <!-- Whether to delete previous results on rerun -->
+                <array> <!-- A list of custom annotations to ignore (optional) -->
+                    <element key="codingStandardsIgnoreStart">
+                        <string>codingStandardsIgnoreStart</string>
+                    </element>
+                    <element key="codingStandardsIgnoreEnd">
+                        <string>codingStandardsIgnoreEnd</string>
+                    </element>
+                    <element key="expectedExceptionMessageRegExp">
+                        <string>expectedExceptionMessageRegExp</string>
+                    </element>
+                    <element key="magentoAdminConfigFixture">
+                        <string>magentoAdminConfigFixture</string>
+                    </element>
+                    <element key="magentoAppArea">
+                        <string>magentoAppArea</string>
+                    </element>
+                    <element key="magentoAppIsolation">
+                        <string>magentoAppIsolation</string>
+                    </element>
+                    <element key="magentoCache">
+                        <string>magentoCache</string>
+                    </element>
+                    <element key="magentoComponentsDir">
+                        <string>magentoComponentsDir</string>
+                    </element>
+                    <element key="magentoConfigFixture">
+                        <string>magentoConfigFixture</string>
+                    </element>
+                    <element key="magentoDataFixture">
+                        <string>magentoDataFixture</string>
+                    </element>
+                    <element key="magentoDataFixtureBeforeTransaction">
+                        <string>magentoDataFixtureBeforeTransaction</string>
+                    </element>
+                    <element key="magentoDbIsolation">
+                        <string>magentoDbIsolation</string>
+                    </element>
+                    <element key="magentoIndexerDimensionMode">
+                        <string>magentoIndexerDimensionMode</string>
+                    </element>
+                    <element key="magentoApiDataFixture">
+                        <string>magentoApiDataFixture</string>
+                    </element>
+                    <element key="Override">
+                        <string>Override</string>
+                    </element>
+                </array>
+            </arguments>
+        </listener>
+    </listeners>
+</phpunit>
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php
index 93959c1afbbaf..2e26d89c0b600 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php
@@ -77,7 +77,7 @@ public function testAddSimpleProductWithOptions()
         $response = $this->graphQlMutation($query);
 
         self::assertArrayHasKey('items', $response['addProductsToCart']['cart']);
-        self::assertCount($qty, $response['addProductsToCart']['cart']);
+        self::assertCount($qty, $response['addProductsToCart']['cart']['items']);
         $customizableOptionsOutput =
             $response['addProductsToCart']['cart']['items'][0]['customizable_options'];
 

From b26a7e527fc2682e3a8e6c895133e2cd9f2dcefa Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Thu, 30 Jul 2020 10:34:55 +0200
Subject: [PATCH 1119/1718] Rename ID_V2 to UID

---
 ...ddConfigurableProductToCartSingleMutationTest.php | 12 ++++++------
 ...ddDownloadableProductToCartSingleMutationTest.php |  2 +-
 .../Quote/GetCustomOptionsWithUIDForQueryBySku.php   |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

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 9b4e1dc6ea610..740c50916e498 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartSingleMutationTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartSingleMutationTest.php
@@ -43,7 +43,7 @@ public function testAddConfigurableProductToCart()
         $attributeId = (int) $product['configurable_options'][0]['attribute_id'];
         $valueIndex = $product['configurable_options'][0]['values'][1]['value_index'];
 
-        $selectedConfigurableOptionsQuery = $this->generateSuperAttributesIdV2Query($attributeId, $valueIndex);
+        $selectedConfigurableOptionsQuery = $this->generateSuperAttributesUIDQuery($attributeId, $valueIndex);
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
         $query = $this->getQuery(
@@ -68,13 +68,13 @@ public function testAddConfigurableProductToCart()
     }
 
     /**
-     * Generates Id_v2 for super configurable product super attributes
+     * Generates UID for super configurable product super attributes
      *
      * @param int $attributeId
      * @param int $valueIndex
      * @return string
      */
-    private function generateSuperAttributesIdV2Query(int $attributeId, int $valueIndex): string
+    private function generateSuperAttributesUIDQuery(int $attributeId, int $valueIndex): string
     {
         return 'selected_options: ["' . base64_encode("configurable/$attributeId/$valueIndex") . '"]';
     }
@@ -89,7 +89,7 @@ public function testAddConfigurableProductWithWrongSuperAttributes()
         $quantity = 2;
         $parentSku = $product['sku'];
 
-        $selectedConfigurableOptionsQuery = $this->generateSuperAttributesIdV2Query(0, 0);
+        $selectedConfigurableOptionsQuery = $this->generateSuperAttributesUIDQuery(0, 0);
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
         $query = $this->getQuery(
@@ -118,7 +118,7 @@ public function testAddProductIfQuantityIsNotAvailable()
         $attributeId = (int) $product['configurable_options'][0]['attribute_id'];
         $valueIndex = $product['configurable_options'][0]['values'][1]['value_index'];
 
-        $selectedConfigurableOptionsQuery = $this->generateSuperAttributesIdV2Query($attributeId, $valueIndex);
+        $selectedConfigurableOptionsQuery = $this->generateSuperAttributesUIDQuery($attributeId, $valueIndex);
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
         $query = $this->getQuery(
@@ -171,7 +171,7 @@ public function testOutOfStockVariationToCart()
         $valueIndex = $product['configurable_options'][0]['values'][0]['value_index'];
         $parentSku = $product['sku'];
 
-        $configurableOptionsQuery = $this->generateSuperAttributesIdV2Query($attributeId, $valueIndex);
+        $configurableOptionsQuery = $this->generateSuperAttributesUIDQuery($attributeId, $valueIndex);
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
 
         $query = $this->getQuery(
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddDownloadableProductToCartSingleMutationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddDownloadableProductToCartSingleMutationTest.php
index b457b49a97807..ce613d2d958c0 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddDownloadableProductToCartSingleMutationTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddDownloadableProductToCartSingleMutationTest.php
@@ -132,7 +132,7 @@ private function getProductsLinks(string $sku) : array
     }
 
     /**
-     * Generates Id_v2 for downloadable links
+     * Generates UID for downloadable links
      *
      * @param int $linkId
      * @return string
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCustomOptionsWithUIDForQueryBySku.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCustomOptionsWithUIDForQueryBySku.php
index dcad6a6125c2f..c6377c47b4743 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCustomOptionsWithUIDForQueryBySku.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCustomOptionsWithUIDForQueryBySku.php
@@ -10,7 +10,7 @@
 use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface;
 
 /**
- * Generate an array with test values for customizable options with encoded id_v2 value
+ * Generate an array with test values for customizable options with UID
  */
 class GetCustomOptionsWithUIDForQueryBySku
 {
@@ -83,7 +83,7 @@ public function execute(string $sku): array
     }
 
     /**
-     * Returns id_v2 of the selected custom option
+     * Returns UID of the selected custom option
      *
      * @param int $optionId
      * @param int $optionValueId
@@ -95,7 +95,7 @@ private function encodeSelectedOption(int $optionId, int $optionValueId): string
     }
 
     /**
-     * Returns id_v2 of the entered custom option
+     * Returns UID of the entered custom option
      *
      * @param int $optionId
      * @return string

From 1d81ca2da99bf57157a428c10c889d7ff791e319 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Thu, 30 Jul 2020 11:43:23 +0300
Subject: [PATCH 1120/1718] fix static

---
 .../Console/Command/ModuleStatusCommand.php   | 71 ++++++++++++-------
 1 file changed, 47 insertions(+), 24 deletions(-)

diff --git a/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php b/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php
index b4504efdc3423..65a26df11b2cd 100644
--- a/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php
@@ -8,13 +8,13 @@
 
 namespace Magento\Setup\Console\Command;
 
+use Magento\Framework\Console\Cli;
 use Magento\Framework\Module\FullModuleList;
 use Magento\Framework\Module\ModuleList;
 use Magento\Setup\Model\ObjectManagerProvider;
-use Magento\Framework\Console\Cli;
+use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputArgument;
 
 /**
  * Command for displaying status of modules
@@ -22,15 +22,11 @@
 class ModuleStatusCommand extends AbstractSetupCommand
 {
     /**
-     * Object manager provider
-     *
      * @var ObjectManagerProvider
      */
     private $objectManagerProvider;
 
     /**
-     * Inject dependencies
-     *
      * @param ObjectManagerProvider $objectManagerProvider
      */
     public function __construct(ObjectManagerProvider $objectManagerProvider)
@@ -40,28 +36,33 @@ public function __construct(ObjectManagerProvider $objectManagerProvider)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function configure()
     {
         $this->setName('module:status')
             ->setDescription('Displays status of modules')
-            ->addArgument('module-names', InputArgument::OPTIONAL | InputArgument::IS_ARRAY , 'Optional module name')
+            ->addArgument(
+                'module-names',
+                InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
+                'Optional module name'
+            )
             ->addOption('enabled', null, null, 'Print only enabled modules')
             ->addOption('disabled', null, null, 'Print only disabled modules');
         parent::configure();
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $moduleNames = $input->getArgument('module-names');
         if (!empty($moduleNames)) {
-            foreach($moduleNames as $moduleName)
+            foreach ($moduleNames as $moduleName) {
                 $this->showSpecificModule($moduleName, $output);
-            return;
+            }
+            return 0;
         }
 
         $onlyEnabled = $input->getOption('enabled');
@@ -81,34 +82,42 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $output->writeln("<info>List of disabled modules:</info>");
         $this->showDisabledModules($output);
         $output->writeln('');
+
+        return 0;
     }
 
     /**
+     * Specific module show
+     *
      * @param string $moduleName
      * @param OutputInterface $output
+     * @return int
      */
-    private function showSpecificModule(string $moduleName, OutputInterface $output)
+    private function showSpecificModule(string $moduleName, OutputInterface $output): int
     {
         $allModules = $this->getAllModules();
-        if (!in_array($moduleName, $allModules->getNames())) {
-            $output->writeln($moduleName.' : <error>Module does not exist</error>');
+        if (!in_array($moduleName, $allModules->getNames(), true)) {
+            $output->writeln($moduleName . ' : <error>Module does not exist</error>');
             return Cli::RETURN_FAILURE;
         }
 
         $enabledModules = $this->getEnabledModules();
-        if (in_array($moduleName, $enabledModules->getNames())) {
-            $output->writeln($moduleName.' : <info>Module is enabled</info>');
+        if (in_array($moduleName, $enabledModules->getNames(), true)) {
+            $output->writeln($moduleName . ' : <info>Module is enabled</info>');
             return Cli::RETURN_FAILURE;
         }
 
-        $output->writeln($moduleName.' : <info> Module is disabled</info>');
-        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
+        $output->writeln($moduleName . ' : <info> Module is disabled</info>');
+        return Cli::RETURN_SUCCESS;
     }
 
     /**
+     * Enable modules show
+     *
      * @param OutputInterface $output
+     * @return int
      */
-    private function showEnabledModules(OutputInterface $output)
+    private function showEnabledModules(OutputInterface $output): int
     {
         $enabledModules = $this->getEnabledModules();
         $enabledModuleNames = $enabledModules->getNames();
@@ -118,13 +127,17 @@ private function showEnabledModules(OutputInterface $output)
         }
 
         $output->writeln(join("\n", $enabledModuleNames));
-        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
+
+        return Cli::RETURN_SUCCESS;
     }
 
     /**
+     * Disabled modules show
+     *
      * @param OutputInterface $output
+     * @return int
      */
-    private function showDisabledModules(OutputInterface $output)
+    private function showDisabledModules(OutputInterface $output): int
     {
         $disabledModuleNames = $this->getDisabledModuleNames();
         if (count($disabledModuleNames) === 0) {
@@ -133,32 +146,42 @@ private function showDisabledModules(OutputInterface $output)
         }
 
         $output->writeln(join("\n", $disabledModuleNames));
-        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
+
+        return Cli::RETURN_SUCCESS;
     }
 
     /**
+     * Returns all modules
+     *
      * @return FullModuleList
      */
     private function getAllModules(): FullModuleList
     {
-        return $this->objectManagerProvider->get()->create(FullModuleList::class);
+        return $this->objectManagerProvider->get()
+            ->create(FullModuleList::class);
     }
 
     /**
+     * Returns enabled modules
+     *
      * @return ModuleList
      */
     private function getEnabledModules(): ModuleList
     {
-        return $this->objectManagerProvider->get()->create(ModuleList::class);
+        return $this->objectManagerProvider->get()
+            ->create(ModuleList::class);
     }
 
     /**
+     * Returns disabled module names
+     *
      * @return array
      */
     private function getDisabledModuleNames(): array
     {
         $fullModuleList = $this->getAllModules();
         $enabledModules = $this->getEnabledModules();
+
         return array_diff($fullModuleList->getNames(), $enabledModules->getNames());
     }
 }

From 50b62ea417aef8f83f5cf07bc82edab613209ce9 Mon Sep 17 00:00:00 2001
From: Vadim Malesh <51680850+engcom-Charlie@users.noreply.github.com>
Date: Thu, 30 Jul 2020 11:56:52 +0300
Subject: [PATCH 1121/1718] add testCase id

---
 .../Magento/Backup/Test/Mftf/Test/AdminSystemBackupMenuTest.xml  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Backup/Test/Mftf/Test/AdminSystemBackupMenuTest.xml b/app/code/Magento/Backup/Test/Mftf/Test/AdminSystemBackupMenuTest.xml
index b322b1381ec34..af86163fbfe64 100644
--- a/app/code/Magento/Backup/Test/Mftf/Test/AdminSystemBackupMenuTest.xml
+++ b/app/code/Magento/Backup/Test/Mftf/Test/AdminSystemBackupMenuTest.xml
@@ -15,6 +15,7 @@
             <title value="Backup menu not visible if backup config disabled"/>
             <description value="Disable backup config and check backup menu isn't visible"/>
             <severity value="AVERAGE"/>
+            <testCaseId value="MC-36292"/>
             <group value="backup"/>
         </annotations>
         <before>

From b1054ad172e5537b7ef8fbca6595de2b7de62ee2 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Thu, 30 Jul 2020 12:05:39 +0300
Subject: [PATCH 1122/1718] fix robots.txt not store specific

---
 app/code/Magento/Sitemap/Block/Robots.php     |  39 ++--
 .../Sitemap/Test/Unit/Block/RobotsTest.php    | 191 ++++++------------
 2 files changed, 86 insertions(+), 144 deletions(-)

diff --git a/app/code/Magento/Sitemap/Block/Robots.php b/app/code/Magento/Sitemap/Block/Robots.php
index 2beb31bd06570..a074e95ce2f80 100644
--- a/app/code/Magento/Sitemap/Block/Robots.php
+++ b/app/code/Magento/Sitemap/Block/Robots.php
@@ -11,6 +11,8 @@
 use Magento\Robots\Model\Config\Value;
 use Magento\Sitemap\Helper\Data as SitemapHelper;
 use Magento\Sitemap\Model\ResourceModel\Sitemap\CollectionFactory;
+use Magento\Sitemap\Model\SitemapConfigReader;
+use Magento\Framework\App\ObjectManager;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Model\StoreResolver;
 
@@ -29,6 +31,7 @@ class Robots extends AbstractBlock implements IdentityInterface
 
     /**
      * @var SitemapHelper
+     * @deprecated
      */
     private $sitemapHelper;
 
@@ -37,6 +40,11 @@ class Robots extends AbstractBlock implements IdentityInterface
      */
     private $storeManager;
 
+    /**
+     * @var SitemapConfigReader
+     */
+    private $sitemapConfigReader;
+
     /**
      * @param Context $context
      * @param StoreResolver $storeResolver
@@ -44,7 +52,7 @@ class Robots extends AbstractBlock implements IdentityInterface
      * @param SitemapHelper $sitemapHelper
      * @param StoreManagerInterface $storeManager
      * @param array $data
-     *
+     * @param SitemapConfigReader|null $sitemapConfigReader
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
@@ -53,11 +61,14 @@ public function __construct(
         CollectionFactory $sitemapCollectionFactory,
         SitemapHelper $sitemapHelper,
         StoreManagerInterface $storeManager,
-        array $data = []
+        array $data = [],
+        ?SitemapConfigReader $sitemapConfigReader = null
     ) {
         $this->sitemapCollectionFactory = $sitemapCollectionFactory;
         $this->sitemapHelper = $sitemapHelper;
         $this->storeManager = $storeManager;
+        $this->sitemapConfigReader = $sitemapConfigReader
+            ?: ObjectManager::getInstance()->get(SitemapConfigReader::class);
 
         parent::__construct($context, $data);
     }
@@ -74,22 +85,16 @@ public function __construct(
      */
     protected function _toHtml()
     {
-        $defaultStore = $this->storeManager->getDefaultStoreView();
-
-        /** @var \Magento\Store\Model\Website $website */
-        $website = $this->storeManager->getWebsite($defaultStore->getWebsiteId());
+        $website = $this->storeManager->getWebsite();
 
         $storeIds = [];
         foreach ($website->getStoreIds() as $storeId) {
-            if ((bool)$this->sitemapHelper->getEnableSubmissionRobots($storeId)) {
-                $storeIds[] = (int)$storeId;
+            if ((bool) $this->sitemapConfigReader->getEnableSubmissionRobots($storeId)) {
+                $storeIds[] = (int) $storeId;
             }
         }
 
-        $links = [];
-        if ($storeIds) {
-            $links = array_merge($links, $this->getSitemapLinks($storeIds));
-        }
+        $links = $storeIds ? $this->getSitemapLinks($storeIds) : [];
 
         return $links ? implode(PHP_EOL, $links) . PHP_EOL : '';
     }
@@ -106,18 +111,12 @@ protected function _toHtml()
      */
     protected function getSitemapLinks(array $storeIds)
     {
-        $sitemapLinks = [];
-
-        /** @var \Magento\Sitemap\Model\ResourceModel\Sitemap\Collection $collection */
         $collection = $this->sitemapCollectionFactory->create();
         $collection->addStoreFilter($storeIds);
 
+        $sitemapLinks = [];
         foreach ($collection as $sitemap) {
-            /** @var \Magento\Sitemap\Model\Sitemap $sitemap */
-            $sitemapFilename = $sitemap->getSitemapFilename();
-            $sitemapPath = $sitemap->getSitemapPath();
-
-            $sitemapUrl = $sitemap->getSitemapUrl($sitemapPath, $sitemapFilename);
+            $sitemapUrl = $sitemap->getSitemapUrl($sitemap->getSitemapPath(), $sitemap->getSitemapFilename());
             $sitemapLinks[$sitemapUrl] = 'Sitemap: ' . $sitemapUrl;
         }
 
diff --git a/app/code/Magento/Sitemap/Test/Unit/Block/RobotsTest.php b/app/code/Magento/Sitemap/Test/Unit/Block/RobotsTest.php
index 0ddac1bb98fd1..3513fe32cd9b8 100644
--- a/app/code/Magento/Sitemap/Test/Unit/Block/RobotsTest.php
+++ b/app/code/Magento/Sitemap/Test/Unit/Block/RobotsTest.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 declare(strict_types=1);
 
 namespace Magento\Sitemap\Test\Unit\Block;
@@ -10,49 +11,35 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\DataObject;
 use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Element\Context;
 use Magento\Robots\Model\Config\Value;
 use Magento\Sitemap\Block\Robots;
-use Magento\Sitemap\Helper\Data;
 use Magento\Sitemap\Model\ResourceModel\Sitemap\Collection;
 use Magento\Sitemap\Model\ResourceModel\Sitemap\CollectionFactory;
 use Magento\Sitemap\Model\Sitemap;
+use Magento\Sitemap\Model\SitemapConfigReader;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Store\Model\StoreResolver;
 use Magento\Store\Model\Website;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 /**
+ * Test for \Magento\Sitemap\Block\Robots.
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class RobotsTest extends TestCase
 {
-    /**
-     * @var Context|MockObject
-     */
-    private $context;
-
-    /**
-     * @var StoreResolver|MockObject
-     */
-    private $storeResolver;
-
     /**
      * @var CollectionFactory|MockObject
      */
     private $sitemapCollectionFactory;
 
-    /**
-     * @var Data|MockObject
-     */
-    private $sitemapHelper;
-
     /**
      * @var Robots
      */
-    private $block;
+    private $model;
 
     /**
      * @var ManagerInterface|MockObject
@@ -69,147 +56,112 @@ class RobotsTest extends TestCase
      */
     private $storeManager;
 
+    /**
+     * @var SitemapConfigReader|MockObject
+     */
+    private $siteMapConfigReader;
+
+    /**
+     * @inheritDoc
+     */
     protected function setUp(): void
     {
-        $this->eventManagerMock = $this->getMockBuilder(ManagerInterface::class)
-            ->getMockForAbstractClass();
-
-        $this->scopeConfigMock = $this->getMockBuilder(ScopeConfigInterface::class)
-            ->getMockForAbstractClass();
+        $objectManager = new ObjectManager($this);
 
-        $this->context = $this->getMockBuilder(Context::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->eventManagerMock = $this->getMockForAbstractClass(ManagerInterface::class);
+        $this->scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
 
-        $this->context->expects($this->any())
+        $context = $this->createMock(Context::class);
+        $context->expects($this->any())
             ->method('getEventManager')
             ->willReturn($this->eventManagerMock);
-
-        $this->context->expects($this->any())
+        $context->expects($this->any())
             ->method('getScopeConfig')
             ->willReturn($this->scopeConfigMock);
 
-        $this->storeResolver = $this->getMockBuilder(StoreResolver::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->sitemapCollectionFactory = $this->getMockBuilder(
-            CollectionFactory::class
-        )
-            ->setMethods(['create'])
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->sitemapHelper = $this->getMockBuilder(Data::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->storeManager = $this->getMockBuilder(StoreManagerInterface::class)
-            ->getMockForAbstractClass();
-
-        $this->block = new Robots(
-            $this->context,
-            $this->storeResolver,
-            $this->sitemapCollectionFactory,
-            $this->sitemapHelper,
-            $this->storeManager
+        $this->sitemapCollectionFactory = $this->createMock(CollectionFactory::class);
+        $this->storeManager = $this->getMockForAbstractClass(StoreManagerInterface::class);
+        $this->siteMapConfigReader = $this->createMock(SitemapConfigReader::class);
+
+        $this->model = $objectManager->getObject(
+            Robots::class,
+            [
+                'context' => $context,
+                'sitemapCollectionFactory' => $this->sitemapCollectionFactory,
+                'storeManager' => $this->storeManager,
+                'sitemapConfigReader' => $this->siteMapConfigReader
+            ]
         );
     }
 
     /**
      * Check toHtml() method in case when robots submission is disabled
+     *
+     * @return void
      */
-    public function testToHtmlRobotsSubmissionIsDisabled()
+    public function testToHtmlRobotsSubmissionIsDisabled(): void
     {
         $defaultStoreId = 1;
-        $defaultWebsiteId = 1;
-
         $expected = '';
 
         $this->initEventManagerMock($expected);
-        $this->scopeConfigMock->expects($this->once())->method('getValue')->willReturn(false);
-
-        $storeMock = $this->getMockBuilder(StoreInterface::class)
-            ->getMockForAbstractClass();
-
-        $storeMock->expects($this->once())
-            ->method('getWebsiteId')
-            ->willReturn($defaultWebsiteId);
-
-        $this->storeManager->expects($this->once())
-            ->method('getDefaultStoreView')
-            ->willReturn($storeMock);
-
-        $storeMock->expects($this->any())
-            ->method('getWebsiteId')
-            ->willReturn($defaultWebsiteId);
+        $this->scopeConfigMock->expects($this->once())
+            ->method('getValue')
+            ->willReturn(false);
 
-        $websiteMock = $this->getMockBuilder(Website::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $websiteMock->expects($this->any())
+        $websiteMock = $this->createMock(Website::class);
+        $websiteMock->expects($this->once())
             ->method('getStoreIds')
             ->willReturn([$defaultStoreId]);
 
         $this->storeManager->expects($this->once())
             ->method('getWebsite')
-            ->with($defaultWebsiteId)
+            ->with(null)
             ->willReturn($websiteMock);
 
-        $this->sitemapHelper->expects($this->once())
+        $this->siteMapConfigReader->expects($this->once())
             ->method('getEnableSubmissionRobots')
             ->with($defaultStoreId)
             ->willReturn(false);
 
-        $this->assertEquals($expected, $this->block->toHtml());
+        $this->assertEquals($expected, $this->model->toHtml());
     }
 
     /**
      * Check toHtml() method in case when robots submission is enabled
+     *
+     * @return void
      */
-    public function testAfterGetDataRobotsSubmissionIsEnabled()
+    public function testAfterGetDataRobotsSubmissionIsEnabled(): void
     {
         $defaultStoreId = 1;
         $secondStoreId = 2;
-        $defaultWebsiteId = 1;
 
         $sitemapPath = '/';
         $sitemapFilenameOne = 'sitemap.xml';
         $sitemapFilenameTwo = 'sitemap_custom.xml';
         $sitemapFilenameThree = 'sitemap.xml';
 
-        $expected = 'Sitemap: ' . $sitemapFilenameOne
-            . PHP_EOL
-            . 'Sitemap: ' . $sitemapFilenameTwo
-            . PHP_EOL;
+        $expected = 'Sitemap: ' . $sitemapFilenameOne . PHP_EOL . 'Sitemap: ' . $sitemapFilenameTwo . PHP_EOL;
 
         $this->initEventManagerMock($expected);
-        $this->scopeConfigMock->expects($this->once())->method('getValue')->willReturn(false);
-
-        $storeMock = $this->getMockBuilder(StoreInterface::class)
-            ->getMockForAbstractClass();
-
-        $this->storeManager->expects($this->once())
-            ->method('getDefaultStoreView')
-            ->willReturn($storeMock);
-
-        $storeMock->expects($this->any())
-            ->method('getWebsiteId')
-            ->willReturn($defaultWebsiteId);
+        $this->scopeConfigMock->expects($this->once())
+            ->method('getValue')
+            ->willReturn(false);
 
         $websiteMock = $this->getMockBuilder(Website::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $websiteMock->expects($this->any())
+        $websiteMock->expects($this->once())
             ->method('getStoreIds')
             ->willReturn([$defaultStoreId, $secondStoreId]);
 
         $this->storeManager->expects($this->once())
             ->method('getWebsite')
-            ->with($defaultWebsiteId)
+            ->with(null)
             ->willReturn($websiteMock);
 
-        $this->sitemapHelper->expects($this->any())
+        $this->siteMapConfigReader->expects($this->atLeastOnce())
             ->method('getEnableSubmissionRobots')
             ->willReturnMap([
                 [$defaultStoreId, true],
@@ -223,12 +175,12 @@ public function testAfterGetDataRobotsSubmissionIsEnabled()
         $sitemapCollectionMock = $this->getMockBuilder(Collection::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $sitemapCollectionMock->expects($this->any())
+        $sitemapCollectionMock->expects($this->once())
             ->method('addStoreFilter')
             ->with([$defaultStoreId])
             ->willReturnSelf();
 
-        $sitemapCollectionMock->expects($this->any())
+        $sitemapCollectionMock->expects($this->once())
             ->method('getIterator')
             ->willReturn(new \ArrayIterator([$sitemapMockOne, $sitemapMockTwo, $sitemapMockThree]));
 
@@ -236,18 +188,19 @@ public function testAfterGetDataRobotsSubmissionIsEnabled()
             ->method('create')
             ->willReturn($sitemapCollectionMock);
 
-        $this->assertEquals($expected, $this->block->toHtml());
+        $this->assertEquals($expected, $this->model->toHtml());
     }
 
     /**
      * Check that getIdentities() method returns specified cache tag
+     *
+     * @return void
      */
-    public function testGetIdentities()
+    public function testGetIdentities(): void
     {
         $storeId = 1;
 
-        $storeMock = $this->getMockBuilder(StoreInterface::class)
-            ->getMockForAbstractClass();
+        $storeMock = $this->getMockForAbstractClass(StoreInterface::class);
 
         $this->storeManager->expects($this->once())
             ->method('getDefaultStoreView')
@@ -257,10 +210,8 @@ public function testGetIdentities()
             ->method('getId')
             ->willReturn($storeId);
 
-        $expected = [
-            Value::CACHE_TAG . '_' . $storeId,
-        ];
-        $this->assertEquals($expected, $this->block->getIdentities());
+        $expected = [Value::CACHE_TAG . '_' . $storeId];
+        $this->assertEquals($expected, $this->model->getIdentities());
     }
 
     /**
@@ -269,23 +220,18 @@ public function testGetIdentities()
      * @param string $data
      * @return void
      */
-    protected function initEventManagerMock($data)
+    protected function initEventManagerMock($data): void
     {
         $this->eventManagerMock->expects($this->any())
             ->method('dispatch')
             ->willReturnMap([
                 [
                     'view_block_abstract_to_html_before',
-                    [
-                        'block' => $this->block,
-                    ],
+                    ['block' => $this->model],
                 ],
                 [
                     'view_block_abstract_to_html_after',
-                    [
-                        'block' => $this->block,
-                        'transport' => new DataObject(['html' => $data]),
-                    ],
+                    ['block' => $this->model, 'transport' => new DataObject(['html' => $data])],
                 ],
             ]);
     }
@@ -297,15 +243,12 @@ protected function initEventManagerMock($data)
      * @param string $sitemapFilename
      * @return MockObject
      */
-    protected function getSitemapMock($sitemapPath, $sitemapFilename)
+    protected function getSitemapMock($sitemapPath, $sitemapFilename): MockObject
     {
         $sitemapMock = $this->getMockBuilder(Sitemap::class)
             ->disableOriginalConstructor()
-            ->setMethods([
-                'getSitemapFilename',
-                'getSitemapPath',
-                'getSitemapUrl',
-            ])
+            ->onlyMethods(['getSitemapUrl'])
+            ->addMethods(['getSitemapFilename', 'getSitemapPath'])
             ->getMock();
 
         $sitemapMock->expects($this->any())

From 28e20d92a2f7bdca7d638ea60b90efa9f7a3d4e8 Mon Sep 17 00:00:00 2001
From: Michal Derlatka <michal@molokaistudio.com>
Date: Fri, 24 Jul 2020 12:08:45 +0200
Subject: [PATCH 1123/1718] magento/magento2#26110: Bundle products options
 input validation

---
 .../Magento/Bundle/Model/Product/Type.php     |  64 ++++++-
 .../Bundle/AddBundleProductToCartTest.php     | 104 ++++++++++-
 ...uct_with_multiple_options_radio_select.php | 174 ++++++++++++++++++
 ...multiple_options_radio_select_rollback.php |  23 +++
 4 files changed, 358 insertions(+), 7 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_radio_select.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_radio_select_rollback.php

diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
index 2dc519dbf1540..101aab9d3aed9 100644
--- a/app/code/Magento/Bundle/Model/Product/Type.php
+++ b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Bundle\Model\Product;
 
+use Magento\Bundle\Model\Option;
+use Magento\Bundle\Model\ResourceModel\Option\Collection;
 use Magento\Bundle\Model\ResourceModel\Selection\Collection as Selections;
 use Magento\Bundle\Model\ResourceModel\Selection\Collection\FilterApplier as SelectionCollectionFilterApplier;
 use Magento\Catalog\Api\ProductRepositoryInterface;
@@ -459,12 +461,12 @@ public function getOptionsIds($product)
      * Retrieve bundle option collection
      *
      * @param \Magento\Catalog\Model\Product $product
-     * @return \Magento\Bundle\Model\ResourceModel\Option\Collection
+     * @return Collection
      */
     public function getOptionsCollection($product)
     {
         if (!$product->hasData($this->_keyOptionsCollection)) {
-            /** @var \Magento\Bundle\Model\ResourceModel\Option\Collection $optionsCollection */
+            /** @var Collection $optionsCollection */
             $optionsCollection = $this->_bundleOption->create()
                 ->getResourceCollection();
             $optionsCollection->setProductIdFilter($product->getEntityId());
@@ -682,6 +684,11 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p
                     $options
                 );
 
+                $this->validateRadioAndSelectOptions(
+                    $optionsCollection,
+                    $options
+                );
+
                 $selectionIds = array_values($this->arrayUtility->flatten($options));
                 // If product has not been configured yet then $selections array should be empty
                 if (!empty($selectionIds)) {
@@ -887,7 +894,7 @@ public function getSelectionsByIds($selectionIds, $product)
      *
      * @param array $optionIds
      * @param \Magento\Catalog\Model\Product $product
-     * @return \Magento\Bundle\Model\ResourceModel\Option\Collection
+     * @return Collection
      */
     public function getOptionsByIds($optionIds, $product)
     {
@@ -1254,7 +1261,7 @@ protected function getBeforeQty($product, $selection)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @param bool $isStrictProcessMode
-     * @param \Magento\Bundle\Model\ResourceModel\Option\Collection $optionsCollection
+     * @param Collection $optionsCollection
      * @param int[] $options
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
@@ -1272,12 +1279,59 @@ protected function checkIsAllRequiredOptions($product, $isStrictProcessMode, $op
         }
     }
 
+    /**
+     * Validate Options for Radio and Select input types
+     *
+     * @param Collection $optionsCollection
+     * @param int[] $options
+     * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function validateRadioAndSelectOptions($optionsCollection, $options): void
+    {
+        $errorTypes = [];
+
+        if (is_array($optionsCollection->getItems())) {
+            foreach ($optionsCollection->getItems() as $option) {
+                if ($this->isSelectedOptionValid($option, $options)) {
+                    $errorTypes[] = $option->getType();
+                }
+            }
+        }
+
+        if (!empty($errorTypes)) {
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __(
+                    'Option type (%types) should have only one element.',
+                    ['types' => implode(", ", $errorTypes)]
+                )
+            );
+        }
+    }
+
+    /**
+     * Check if selected option is valid
+     *
+     * @param Option $option
+     * @param array $options
+     * @return bool
+     */
+    private function isSelectedOptionValid($option, $options): bool
+    {
+        return (
+            ($option->getType() == 'radio' || $option->getType() == 'select') &&
+            isset($options[$option->getOptionId()]) &&
+            is_array($options[$option->getOptionId()]) &&
+            count($options[$option->getOptionId()]) > 1
+        );
+    }
+
     /**
      * Check if selection is salable
      *
      * @param \Magento\Bundle\Model\ResourceModel\Selection\Collection $selections
      * @param bool $skipSaleableCheck
-     * @param \Magento\Bundle\Model\ResourceModel\Option\Collection $optionsCollection
+     * @param Collection $optionsCollection
      * @param int[] $options
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartTest.php
index 0acd6bb333426..2d19b70c33ac2 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartTest.php
@@ -80,7 +80,7 @@ public function testAddBundleProductToCart()
         $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
 
         $query = <<<QUERY
-mutation {  
+mutation {
   addBundleProductsToCart(input:{
     cart_id:"{$maskedQuoteId}"
     cart_items:[
@@ -223,7 +223,7 @@ public function testAddBundleToCartWithoutOptions()
         $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
 
         $query = <<<QUERY
-mutation {  
+mutation {
   addBundleProductsToCart(input:{
     cart_id:"{$maskedQuoteId}"
     cart_items:[
@@ -268,6 +268,106 @@ public function testAddBundleToCartWithoutOptions()
     }
   }
 }
+QUERY;
+
+        $this->graphQlMutation($query);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Bundle/_files/product_with_multiple_options_radio_select.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     */
+    public function testAddBundleToCartWithRadioAndSelectErr()
+    {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('Option type (select, radio) should have only one element.');
+
+        $sku = 'bundle-product';
+
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_1',
+            'reserved_order_id'
+        );
+
+        $product = $this->productRepository->get($sku);
+
+        /** @var $typeInstance \Magento\Bundle\Model\Product\Type */
+        $typeInstance = $product->getTypeInstance();
+        $typeInstance->setStoreFilter($product->getStoreId(), $product);
+        /** @var $option \Magento\Bundle\Model\Option */
+        $options = $typeInstance->getOptionsCollection($product);
+
+        $selectionIds = [];
+        foreach ($options as $option) {
+            $type = $option->getType();
+
+            /** @var \Magento\Catalog\Model\Product $selection */
+            $selections = $typeInstance->getSelectionsCollection([$option->getId()], $product);
+            $optionIds[$type] = $option->getId();
+
+            foreach ($selections->getItems() as $selection) {
+                $selectionIds[$type][] = $selection->getSelectionId();
+            }
+        }
+
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+
+        $query = <<<QUERY
+mutation {
+  addBundleProductsToCart(input:{
+    cart_id:"{$maskedQuoteId}"
+    cart_items:[
+      {
+        data:{
+          sku:"{$sku}"
+          quantity:1
+        }
+        bundle_options:[
+          {
+            id:{$optionIds['select']}
+            quantity:1
+            value:[
+              "{$selectionIds['select'][0]}"
+              "{$selectionIds['select'][1]}"
+            ]
+          },
+           {
+            id:{$optionIds['radio']}
+            quantity:1
+            value:[
+              "{$selectionIds['radio'][0]}"
+              "{$selectionIds['radio'][1]}"
+            ]
+          }
+        ]
+      }
+    ]
+  }) {
+    cart {
+      items {
+        id
+        quantity
+        product {
+          sku
+        }
+        ... on BundleCartItem {
+          bundle_options {
+            id
+            label
+            type
+            values {
+              id
+              label
+              price
+              quantity
+            }
+          }
+        }
+      }
+    }
+  }
+}
 QUERY;
 
         $this->graphQlMutation($query);
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_radio_select.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_radio_select.php
new file mode 100644
index 0000000000000..e3dc33449911b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_radio_select.php
@@ -0,0 +1,174 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require __DIR__ . '/../../../Magento/Catalog/_files/multiple_products.php';
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$productIds = range(10, 12, 1);
+foreach ($productIds as $productId) {
+    /** @var \Magento\CatalogInventory\Model\Stock\Item $stockItem */
+    $stockItem = $objectManager->create(\Magento\CatalogInventory\Model\Stock\Item::class);
+    $stockItem->load($productId, 'product_id');
+
+    if (!$stockItem->getProductId()) {
+        $stockItem->setProductId($productId);
+    }
+    $stockItem->setUseConfigManageStock(1);
+    $stockItem->setQty(1000);
+    $stockItem->setIsQtyDecimal(0);
+    $stockItem->setIsInStock(1);
+    $stockItem->save();
+}
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_BUNDLE)
+    ->setId(3)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Bundle Product')
+    ->setSku('bundle-product')
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+    ->setPriceView(1)
+    ->setPriceType(1)
+    ->setPrice(10.0)
+    ->setShipmentType(0)
+    ->setBundleOptionsData(
+        [
+            // Required "Drop-down" option
+            [
+                'title' => 'Option 1',
+                'default_title' => 'Option 1',
+                'type' => 'select',
+                'required' => 1,
+                'position' => 1,
+                'delete' => '',
+            ],
+            // Required "Radio Buttons" option
+            [
+                'title' => 'Option 2',
+                'default_title' => 'Option 2',
+                'type' => 'radio',
+                'required' => 1,
+                'position' => 2,
+                'delete' => '',
+            ]
+        ]
+    )->setBundleSelectionsData(
+        [
+            [
+                [
+                    'product_id' => 10,
+                    'selection_qty' => 1,
+                    'selection_can_change_qty' => 1,
+                    'delete' => '',
+                    'option_id' => 1
+                ],
+                [
+                    'product_id' => 11,
+                    'selection_qty' => 1,
+                    'selection_can_change_qty' => 1,
+                    'delete' => '',
+                    'option_id' => 1
+                ]
+            ],
+            [
+                [
+                    'product_id' => 10,
+                    'selection_qty' => 1,
+                    'selection_can_change_qty' => 1,
+                    'delete' => '',
+                    'option_id' => 2
+                ],
+                [
+                    'product_id' => 11,
+                    'selection_qty' => 1,
+                    'selection_can_change_qty' => 1,
+                    'delete' => '',
+                    'option_id' => 2
+                ]
+            ],
+            [
+                [
+                    'product_id' => 10,
+                    'selection_qty' => 1,
+                    'delete' => '',
+                    'option_id' => 3
+                ],
+                [
+                    'product_id' => 11,
+                    'selection_qty' => 1,
+                    'delete' => '',
+                    'option_id' => 3
+                ]
+            ],
+            [
+                [
+                    'product_id' => 10,
+                    'selection_qty' => 1,
+                    'delete' => '',
+                    'option_id' => 4
+                ],
+                [
+                    'product_id' => 11,
+                    'selection_qty' => 1,
+                    'delete' => '',
+                    'option_id' => 4
+                ]
+            ],
+            [
+                [
+                    'product_id' => 10,
+                    'selection_qty' => 1,
+                    'delete' => '',
+                    'option_id' => 5
+                ],
+                [
+                    'product_id' => 11,
+                    'selection_qty' => 1,
+                    'delete' => '',
+                    'option_id' => 5
+                ]
+            ]
+        ]
+    );
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+if ($product->getBundleOptionsData()) {
+    $options = [];
+    foreach ($product->getBundleOptionsData() as $key => $optionData) {
+        if (!(bool)$optionData['delete']) {
+            $option = $objectManager->create(\Magento\Bundle\Api\Data\OptionInterfaceFactory::class)
+                ->create(['data' => $optionData]);
+            $option->setSku($product->getSku());
+            $option->setOptionId(null);
+
+            $links = [];
+            $bundleLinks = $product->getBundleSelectionsData();
+            if (!empty($bundleLinks[$key])) {
+                foreach ($bundleLinks[$key] as $linkData) {
+                    if (!(bool)$linkData['delete']) {
+                        $link = $objectManager->create(\Magento\Bundle\Api\Data\LinkInterfaceFactory::class)
+                            ->create(['data' => $linkData]);
+                        $linkProduct = $productRepository->getById($linkData['product_id']);
+                        $link->setSku($linkProduct->getSku());
+                        $link->setQty($linkData['selection_qty']);
+                        $links[] = $link;
+                    }
+                }
+                $option->setProductLinks($links);
+                $options[] = $option;
+            }
+        }
+    }
+    $extension = $product->getExtensionAttributes();
+    $extension->setBundleProductOptions($options);
+    $product->setExtensionAttributes($extension);
+}
+$product->save();
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_radio_select_rollback.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_radio_select_rollback.php
new file mode 100644
index 0000000000000..3748666b25136
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_radio_select_rollback.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require __DIR__ . '/../../../Magento/Catalog/_files/multiple_products_rollback.php';
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+try {
+    $product = $productRepository->get('bundle-product');
+    $productRepository->delete($product);
+} catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
+    //Product already removed
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);

From 6c5246a03d45e7f7a10c41fe857a96480142fc6c Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Thu, 30 Jul 2020 14:04:04 +0300
Subject: [PATCH 1124/1718] MC-36096: [Cloud] Local cache storage is not
 retained for the expected period.

---
 .../Customer/view/frontend/web/js/customer-data.js   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 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..bd6b5c0806fbe 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
@@ -30,12 +30,6 @@ define([
     url.setBaseUrl(window.BASE_URL);
     options.sectionLoadUrl = url.build('customer/section/load');
 
-    //TODO: remove global change, in this case made for initNamespaceStorage
-    $.cookieStorage.setConf({
-        path: '/',
-        expires: 1
-    });
-
     storage = $.initNamespaceStorage('mage-cache-storage').localStorage;
     storageInvalidation = $.initNamespaceStorage('mage-cache-storage-section-invalidation').localStorage;
 
@@ -220,6 +214,12 @@ define([
                 this.reload(sectionConfig.getSectionNames(), true);
                 $.cookieStorage.set('section_data_clean', '');
             }
+
+            var cookieExpires = new Date(Date.now() + parseInt(options.cookieLifeTime, 10) * 1000);
+            $.cookieStorage.setConf({
+                path: '/',
+                expires: cookieExpires
+            });
         },
 
         /**

From 3c22eef0165bb155e6768eeba870c9eff03cdc6d Mon Sep 17 00:00:00 2001
From: Viktor Petryk <victor.petryk@transoftgroup.com>
Date: Thu, 30 Jul 2020 14:27:44 +0300
Subject: [PATCH 1125/1718] MC-35514: Can't create shipping label for existing
 order all JS components in sliding modal doesn't work.

---
 .../Block/Adminhtml/Order/Packaging.php       |   9 +-
 .../adminhtml/templates/create/items.phtml    |   6 +-
 .../templates/order/packaging/grid.phtml      | 101 ++++++++++--------
 .../order/packaging/popup_content.phtml       |  91 +++++++---------
 4 files changed, 108 insertions(+), 99 deletions(-)

diff --git a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php
index e5e419328eea4..ce4521c9baa51 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php
@@ -3,8 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Shipping\Block\Adminhtml\Order;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Shipping\Helper\Carrier;
+
 /**
  * Adminhtml shipment packaging
  *
@@ -44,6 +48,7 @@ class Packaging extends \Magento\Backend\Block\Template
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Shipping\Model\CarrierFactory $carrierFactory
      * @param array $data
+     * @param Carrier|null $carrierHelper
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -51,12 +56,14 @@ public function __construct(
         \Magento\Shipping\Model\Carrier\Source\GenericInterface $sourceSizeModel,
         \Magento\Framework\Registry $coreRegistry,
         \Magento\Shipping\Model\CarrierFactory $carrierFactory,
-        array $data = []
+        array $data = [],
+        ?Carrier $carrierHelper = null
     ) {
         $this->_jsonEncoder = $jsonEncoder;
         $this->_coreRegistry = $coreRegistry;
         $this->_sourceSizeModel = $sourceSizeModel;
         $this->_carrierFactory = $carrierFactory;
+        $data['carrierHelper'] = $carrierHelper ?? ObjectManager::getInstance()->get(Carrier::class);
         parent::__construct($context, $data);
     }
 
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml
index 54d7aaec21f9b..9b55d2b969d3f 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml
@@ -77,14 +77,14 @@
                            name="shipment[create_shipping_label]"
                            value="1"
                            type="checkbox"/>
+                    <label class="admin__field-label"
+                           for="create_shipping_label">
+                        <span><?= $block->escapeHtml(__('Create Shipping Label')) ?></span></label>
                     <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
                         'onclick',
                         'toggleCreateLabelCheckbox();',
                         'input#create_shipping_label'
                     ) ?>
-                    <label class="admin__field-label"
-                           for="create_shipping_label">
-                        <span><?= $block->escapeHtml(__('Create Shipping Label')) ?></span></label>
                 </div>
             <?php endif ?>
 
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
index 4a3cad2066d32..72d3c72846dd9 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
@@ -4,42 +4,45 @@
  * See COPYING.txt for license details.
  */
 //phpcs:disable Squiz.PHP.NonExecutableCode.Unreachable
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/**
+ * @var \Magento\Shipping\Block\Adminhtml\Order\Packaging $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
 <div class="grid">
     <?php $randomId = rand(); ?>
     <div class="admin__table-wrapper">
         <table class="data-grid">
             <thead>
-                <tr>
-                    <th class="data-grid-checkbox-cell">
-                        <label class="data-grid-checkbox-cell-inner">
-                            <input type="checkbox"
-                                   id="select-items-<?= /* @noEscape */ $randomId ?>"
-                                   class="checkbox admin__control-checkbox"
-                                   title="<?= $block->escapeHtmlAttr(__('Select All')) ?>">
-                            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
-                                'onchange',
-                                'packaging.checkAllItems(this);',
-                                'input#select-items-' . /* @noEscape */ $randomId
-                            ) ?>
-                            <label for="select-items-<?= /* @noEscape */ $randomId ?>"></label>
-                        </label>
-                    </th>
-                    <th class="data-grid-th"><?= $block->escapeHtml(__('Product Name')) ?></th>
-                    <th class="data-grid-th"><?= $block->escapeHtml(__('Weight')) ?></th>
-                    <th class="data-grid-th custom-value">
-                        <?= $block->escapeHtml(__('Customs Value')) ?>
-                    </th>
-                    <?php if (!$block->displayCustomsValue()): ?>
-                        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display: none;', 'th.custom-value') ?>
-                    <?php endif ?>
-                    <th class="data-grid-th"><?= $block->escapeHtml(__('Qty Ordered')) ?></th>
-                    <th class="data-grid-th"><?= $block->escapeHtml(__('Qty')) ?></th>
-                </tr>
+            <tr>
+                <th class="data-grid-checkbox-cell">
+                    <label class="data-grid-checkbox-cell-inner">
+                        <input type="checkbox"
+                               id="select-items-<?= /* @noEscape */ $randomId ?>"
+                               class="checkbox admin__control-checkbox"
+                               title="<?= $block->escapeHtmlAttr(__('Select All')) ?>">
+                        <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
+                            'onchange',
+                            'packaging.checkAllItems(this);',
+                            'input#select-items-' . /* @noEscape */ $randomId
+                        ) ?>
+                        <label for="select-items-<?= /* @noEscape */ $randomId ?>"></label>
+                    </label>
+                </th>
+                <th class="data-grid-th"><?= $block->escapeHtml(__('Product Name')) ?></th>
+                <th class="data-grid-th"><?= $block->escapeHtml(__('Weight')) ?></th>
+                <th class="data-grid-th custom-value">
+                    <?= $block->escapeHtml(__('Customs Value')) ?>
+                </th>
+                <?php if (!$block->displayCustomsValue()): ?>
+                    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display: none;', 'th.custom-value') ?>
+                <?php endif ?>
+                <th class="data-grid-th"><?= $block->escapeHtml(__('Qty Ordered')) ?></th>
+                <th class="data-grid-th"><?= $block->escapeHtml(__('Qty')) ?></th>
+            </tr>
             </thead>
             <tbody>
-            <?php $i=0; ?>
+            <?php $i = 0; ?>
             <?php foreach ($block->getCollection() as $item): ?>
                 <?php
                     $_order = $block->getShipment()->getOrder();
@@ -54,12 +57,12 @@
                 <?php endif; ?>
                 <tr class="data-grid-controls-row data-row <?= ($i++ % 2 != 0) ? '_odd-row' : '' ?>">
                     <td class="data-grid-checkbox-cell">
-                        <?php $id = $item->getId() ? $item->getId() : $item->getOrderItemId(); ?>
+                        <?php $id = $item->getId() ?? $item->getOrderItemId(); ?>
                         <label class="data-grid-checkbox-cell-inner">
                             <input type="checkbox"
                                    name=""
                                    id="select-item-<?= /* @noEscape */ $randomId . '-' . $id ?>"
-                                   value="<?= (int) $id ?>"
+                                   value="<?= (int)$id ?>"
                                    class="checkbox admin__control-checkbox">
                             <label for="select-item-<?= /* @noEscape */ $randomId . '-' . $id ?>"></label>
                         </label>
@@ -78,47 +81,55 @@
                     }
 
                     ?>
-                    <td class="custom-value">
+                    <td id="custom-value-<?= /* @noEscape */ $randomId . '-' . $id ?>" class="custom-value">
                         <input type="text"
                                name="customs_value"
                                class="input-text admin__control-text <?= /* @noEscape */ $customsValueValidation ?>"
                                value="<?= $block->escapeHtmlAttr($block->formatPrice($item->getPrice())) ?>"
                                size="10">
                     </td>
-                    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display: none;', 'td.custom-value') ?>
-                    <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
-                        'onblur',
-                        'packaging.recalcContainerWeightAndCustomsValue(this);',
-                        'td.custom-value'
-                    ) ?>
+                    <?php if (!$block->displayCustomsValue()): ?>
+                        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                            'display:none',
+                            'td#custom-value-' . $randomId . '-' . $id
+                        ) ?>
+                    <?php endif ?>
                     <td>
-                        <?= /* @noEscape */ $item->getOrderItem()->getQtyOrdered()*1 ?>
+                        <?= /* @noEscape */ $item->getOrderItem()->getQtyOrdered() * 1 ?>
                     </td>
                     <td>
                         <input type="hidden" name="price" value="<?= $block->escapeHtml($item->getPrice()) ?>">
                         <input type="text"
                                name="qty"
-                               value="<?= /* @noEscape */ $item->getQty()*1 ?>"
+                               value="<?= /* @noEscape */ $item->getQty() * 1 ?>"
                                class="input-text admin__control-text qty
                             <?php if ($item->getOrderItem()->getIsQtyDecimal()): ?>
                                qty-decimal
                             <?php endif ?>">&nbsp;
                         <button type="button"
-                                id="packaging-delete-item-<?= /* @noEscape */ $item->getId() ?>"
+                                id="packaging-delete-item-<?= /* @noEscape */ $randomId . '-' . $id ?>"
                                 class="action-delete"
                                 data-action="package-delete-item">
                             <span><?= $block->escapeHtml(__('Delete')) ?></span>
                         </button>
-                        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display:none', 'button.action-delete') ?>
-                        <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
-                            'onclick',
-                            'packaging.deleteItem(this);',
-                            'button#packaging-delete-item-' . $item->getId()
+                        <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                            'display:none',
+                            'button#packaging-delete-item-' . $randomId . '-' . $id
                         ) ?>
                     </td>
                 </tr>
             <?php endforeach; ?>
             </tbody>
         </table>
+        <?php $scriptString = <<<script
+        require(['jquery'], function ($) {
+            $("table.data-grid").on('blur', 'td.custom-value input',
+                function(){packaging.recalcContainerWeightAndCustomsValue(this)});
+            $("table.data-grid").on('click', 'button[data-action="package-delete-item"]',
+                function(){packaging.deleteItem(this)});
+        });
+script;
+        ?>
+        <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
     </div>
 </div>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup_content.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup_content.phtml
index 0093c46d211fe..c3418049a38a0 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup_content.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup_content.phtml
@@ -5,7 +5,7 @@
  */
 
 /**
- * @var $block \Magento\Shipping\Block\Adminhtml\Order\Packaging
+ * @var \Magento\Shipping\Block\Adminhtml\Order\Packaging $block
  * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
@@ -22,21 +22,11 @@
                         data-action="package-save-items">
                     <span><?= $block->escapeHtml(__('Add Selected Product(s) to Package')) ?></span>
                 </button>
-                <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
-                    'onclick',
-                    'packaging.packItems(this);',
-                    "button[data-action='package-save-items']"
-                ) ?>
                 <button type="button"
                         class="action-secondary"
                         data-action="package-add-items">
                     <span><?= $block->escapeHtml(__('Add Products to Package')) ?></span>
                 </button>
-                <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
-                    'onclick',
-                    'packaging.getItemsForPack(this);',
-                    "button[data-action='package-add-items']"
-                ) ?>
             </div>
         </div>
         <div class="admin__control-table-wrapper admin__page-subsection">
@@ -87,12 +77,6 @@
                                     </option>
                                 <?php endforeach; ?>
                             </select>
-                            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
-                                'onchange',
-                                "packaging.changeContainerType(this);
-                                packaging.checkSizeAndGirthParameter(this, {$block->escapeJs($girthEnabled)});",
-                                "select[name='package_container']"
-                            ) ?>
                         </td>
                         <?php if ($girthEnabled == 1 && !empty($sizeSource)): ?>
                         <td>
@@ -103,11 +87,6 @@
                                 </option>
                                 <?php endforeach; ?>
                             </select>
-                            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
-                                'onchange',
-                                "packaging.checkSizeAndGirthParameter(this, {$block->escapeJs($girthEnabled)});",
-                                "select[name='package_size']"
-                            ) ?>
                         </td>
                         <td>
                             <input type="text"
@@ -124,11 +103,6 @@
                                     <?= $block->escapeHtml(__('cm')) ?>
                                 </option>
                             </select>
-                            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
-                                'onchange',
-                                "packaging.changeMeasures(this);",
-                                "select[name='container_girth_dimension_units']"
-                            ) ?>
                         </td>
                         <?php endif; ?>
                         <?php
@@ -169,11 +143,6 @@
                                             <?= $block->escapeHtml(__('kg')) ?>
                                         </option>
                                     </select>
-                                    <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
-                                        'onchange',
-                                        "packaging.changeMeasures(this);",
-                                        "select[name='container_weight_units']"
-                                    ) ?>
                                 <span class="admin__addon-prefix"></span>
                             </div>
                         </td>
@@ -202,11 +171,6 @@
                                     <?= $block->escapeHtml(__('cm')) ?>
                                 </option>
                             </select>
-                            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
-                                'onchange',
-                                "packaging.changeMeasures(this);",
-                                "select[name='container_dimension_units']"
-                            ) ?>
                         </td>
                         <?php if ($block->getDeliveryConfirmationTypes()): ?>
                         <td>
@@ -224,11 +188,6 @@
                                     class="action-delete DeletePackageBtn">
                                 <span><?= $block->escapeHtml(__('Delete Package')) ?></span>
                             </button>
-                            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
-                                'onclick',
-                                'packaging.deletePackage(this);',
-                                "button.action-delete.DeletePackageBtn"
-                            ) ?>
                         </td>
                     </tr>
                 </tbody>
@@ -252,11 +211,6 @@
                                     </option>
                                 <?php endforeach; ?>
                             </select>
-                            <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
-                                'onchange',
-                                "packaging.changeContentTypes(this);",
-                                "select[name='content_type']"
-                            ) ?>
                         </td>
                         <td>
                             <input name="content_type_other"
@@ -273,10 +227,47 @@
             <div class="grid_prepare admin__page-subsection"></div>
         </div>
     </section>
-    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("display:none;", 'div#package_template') ?>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display:none', '#package_template') ?>
     <div id="packages_content"></div>
+    <?php $scriptString = <<<script
+require(['jquery'], function($){
+    $("div#packages_content").on('click', "button[data-action='package-save-items']",
+        function(){packaging.packItems(this)});
+    $("div#packages_content").on('click', "button[data-action='package-add-items']",
+        function(){packaging.getItemsForPack(this)});
+    $("div#packages_content").on('change', "select[name='package_container']",
+        function(){
+            packaging.changeContainerType(this);
+            packaging.checkSizeAndGirthParameter(this, {$block->escapeJs($girthEnabled)})
+        });
+    $("div#packages_content").on('change', "select[name='container_weight_units']",
+        function(){packaging.changeMeasures(this)});
+    $("div#packages_content").on('change', "select[name='container_dimension_units']",
+        function(){packaging.changeMeasures(this)});
+    $("div#packages_content").on('click', "button.action-delete.DeletePackageBtn",
+        function(){packaging.deletePackage(this)});
+script;
+    if ($girthEnabled == 1 && !empty($sizeSource)) {
+        $scriptString .= <<<script
+    $("div#packages_content").on('change', "select[name='package_size']",
+        function(){packaging.checkSizeAndGirthParameter(this, {$block->escapeJs($girthEnabled)})});
+    $("div#packages_content").on('change', "select[name='container_girth_dimension_units']",
+        function(){packaging.changeMeasures(this)});
+script;
+    }
+    if ($block->getContentTypes()) {
+        $scriptString .= <<<script
+    $("div#packages_content").on('change', "select[name='content_type']",
+        function(){packaging.changeContentTypes(this)});
+script;
+    }
+    $scriptString .= <<<script
+})
+script;
+    ?>
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
 </div>
 <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-    "display:none;",
-    'div#packaging_window div.message message-warning'
+    'display:none',
+    'div#packaging_window div.message.message-warning'
 ) ?>

From 566cb4e1fd95c930053e30f9577f3038c86cc104 Mon Sep 17 00:00:00 2001
From: Yurii Sapiha <yurasapiga93@gmail.com>
Date: Thu, 30 Jul 2020 14:29:41 +0300
Subject: [PATCH 1126/1718] MC-35968: Admin: Add items to shopping cart from
 different sources (advanced checkout)

---
 .../_files/quote_with_not_visible_individually_product.php    | 1 -
 .../Wishlist/_files/wishlist_with_disabled_product.php        | 4 ++++
 .../Wishlist/_files/wishlist_with_not_visible_product.php     | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_not_visible_individually_product.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_not_visible_individually_product.php
index 77982c1ff0688..2321aa1d4bc71 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_not_visible_individually_product.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_not_visible_individually_product.php
@@ -17,7 +17,6 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-
 Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer.php');
 Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_address.php');
 Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/simple_products_not_visible_individually.php');
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_product.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_product.php
index 1e3fc36286579..22583483ddf69 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_product.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_product.php
@@ -7,6 +7,7 @@
 
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Wishlist\Model\ResourceModel\Wishlist as WishlistResource;
 use Magento\Wishlist\Model\Wishlist;
@@ -21,6 +22,9 @@
 $wishListResource = $objectManager->get(WishlistResource::class);
 /** @var Wishlist $wishlist */
 $wishlist = $objectManager->get(WishlistFactory::class)->create();
+/** @var CustomerRepositoryInterface $customerRepository */
+$customerRepository = $objectManager->get(CustomerRepositoryInterface::class);
+$customer = $customerRepository->get('customer@example.com');
 /** @var ProductRepositoryInterface $productRepository */
 $productRepository = $objectManager->get(ProductRepositoryInterface::class);
 $productRepository->cleanCache();
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_not_visible_product.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_not_visible_product.php
index 952b50b52bac4..3777ed5258a65 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_not_visible_product.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_not_visible_product.php
@@ -7,6 +7,7 @@
 
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Wishlist\Model\ResourceModel\Wishlist as WishlistResource;
 use Magento\Wishlist\Model\Wishlist;
@@ -24,6 +25,9 @@
 /** @var ProductRepositoryInterface $productRepository */
 $productRepository = $objectManager->get(ProductRepositoryInterface::class);
 $productRepository->cleanCache();
+/** @var CustomerRepositoryInterface $customerRepository */
+$customerRepository = $objectManager->get(CustomerRepositoryInterface::class);
+$customer = $customerRepository->get('customer@example.com');
 $product = $productRepository->get('simple_not_visible_1');
 $wishList->loadByCustomerId($customer->getId(), true);
 $item = $wishList->addNewItem($product);

From 2aaa969295f16f13b6dc0d77697d8a10a48da5ec Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Thu, 30 Jul 2020 14:44:57 +0300
Subject: [PATCH 1127/1718] MC-36096: [Cloud] Local cache storage is not
 retained for the expected period.

---
 .../Magento/Customer/view/frontend/web/js/customer-data.js     | 3 +--
 1 file changed, 1 insertion(+), 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 bd6b5c0806fbe..81b0868ede624 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
@@ -215,10 +215,9 @@ define([
                 $.cookieStorage.set('section_data_clean', '');
             }
 
-            var cookieExpires = new Date(Date.now() + parseInt(options.cookieLifeTime, 10) * 1000);
             $.cookieStorage.setConf({
                 path: '/',
-                expires: cookieExpires
+                expires: new Date(Date.now() + parseInt(options.cookieLifeTime, 10) * 1000)
             });
         },
 

From 259c03aa15884ebad7d889d64877cd8697136f48 Mon Sep 17 00:00:00 2001
From: SmVladyslav <vlatame.tsg@gmail.com>
Date: Thu, 30 Jul 2020 15:37:54 +0300
Subject: [PATCH 1128/1718] MC-31304: [ElasticSearch] Exception on catalog
 search result page

---
 .../Model/Adapter/Elasticsearch.php           |  38 ++++--
 .../Product/FieldProvider/StaticField.php     | 120 ++++++++++--------
 .../Plugin/Category/Product/Attribute.php     |   8 +-
 .../Model/Indexer/IndexerHandler.php          |   5 +-
 .../Unit/Model/Adapter/ElasticsearchTest.php  |  68 +++++++---
 .../Product/FieldProvider/StaticFieldTest.php |   4 +-
 .../Plugin/Category/Product/AttributeTest.php |   1 +
 .../Unit/Model/Indexer/IndexerHandlerTest.php |   5 +-
 app/code/Magento/Elasticsearch/etc/di.xml     |   5 +
 9 files changed, 170 insertions(+), 84 deletions(-)

diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php b/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
index 24139e1b2efe3..4f8173a17798a 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
@@ -6,6 +6,9 @@
 
 namespace Magento\Elasticsearch\Model\Adapter;
 
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\StaticField;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Stdlib\ArrayManager;
 
@@ -82,6 +85,16 @@ class Elasticsearch
      */
     private $indexByCode = [];
 
+    /**
+     * @var ProductAttributeRepositoryInterface
+     */
+    private $productAttributeRepository;
+
+    /**
+     * @var StaticField
+     */
+    private $staticFieldProvider;
+
     /**
      * @var ArrayManager
      */
@@ -96,8 +109,11 @@ class Elasticsearch
      * @param Index\IndexNameResolver $indexNameResolver
      * @param BatchDataMapperInterface $batchDocumentDataMapper
      * @param array $options
+     * @param ProductAttributeRepositoryInterface|null $productAttributeRepository
+     * @param StaticField|null $staticFieldProvider
      * @param ArrayManager|null $arrayManager
      * @throws \Magento\Framework\Exception\LocalizedException
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Elasticsearch\SearchAdapter\ConnectionManager $connectionManager,
@@ -108,6 +124,8 @@ public function __construct(
         \Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver $indexNameResolver,
         BatchDataMapperInterface $batchDocumentDataMapper,
         $options = [],
+        ProductAttributeRepositoryInterface $productAttributeRepository = null,
+        StaticField $staticFieldProvider = null,
         ArrayManager $arrayManager = null
     ) {
         $this->connectionManager = $connectionManager;
@@ -117,6 +135,10 @@ public function __construct(
         $this->logger = $logger;
         $this->indexNameResolver = $indexNameResolver;
         $this->batchDocumentDataMapper = $batchDocumentDataMapper;
+        $this->productAttributeRepository = $productAttributeRepository ?:
+            ObjectManager::getInstance()->get(ProductAttributeRepositoryInterface::class);
+        $this->staticFieldProvider = $staticFieldProvider ?:
+            ObjectManager::getInstance()->get(StaticField::class);
         $this->arrayManager = $arrayManager ?:
             ObjectManager::getInstance()->get(ArrayManager::class);
 
@@ -355,25 +377,25 @@ public function updateAlias($storeId, $mappedIndexerId)
      *
      * @param int $storeId
      * @param string $mappedIndexerId
-     *
+     * @param string $attributeCode
      * @return $this
      */
-    public function updateIndexMapping(int $storeId, string $mappedIndexerId): self
+    public function updateIndexMapping(int $storeId, string $mappedIndexerId, string $attributeCode): self
     {
         $indexName = $this->getIndexFromAlias($storeId, $mappedIndexerId);
         if (empty($indexName)) {
             return $this;
         }
 
-        $allAttributeTypes = $this->fieldMapper->getAllAttributesTypes([
-            'entityType' => $mappedIndexerId,
-            'websiteId' => $storeId,
-        ]);
+        /** @var ProductAttributeInterface $attribute */
+        $attribute = $this->productAttributeRepository->get($attributeCode);
+        $newAttributeMapping = $this->staticFieldProvider->getField($attribute);
+        $mappedAttributes = $this->getMappedAttributes($indexName);
 
-        $attrToUpdate = array_diff_key($allAttributeTypes, $this->getMappedAttributes($indexName));
+        $attrToUpdate = array_diff_key($newAttributeMapping, $mappedAttributes);
         if (!empty($attrToUpdate)) {
             $settings['index']['mapping']['total_fields']['limit'] = $this
-                ->getMappingTotalFieldsLimit($allAttributeTypes);
+                ->getMappingTotalFieldsLimit(array_merge($mappedAttributes, $attrToUpdate));
             $this->client->putIndexSettings($indexName, ['settings' => $settings]);
 
             $this->client->addFieldsMapping(
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..c35fe2d030e23 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
@@ -105,71 +105,87 @@ public function __construct(
      */
     public function getFields(array $context = []): array
     {
+        /** @var ProductAttributeInterface[] $attributes */
         $attributes = $this->eavConfig->getEntityAttributes(ProductAttributeInterface::ENTITY_TYPE_CODE);
         $allAttributes = [];
 
         foreach ($attributes as $attribute) {
-            if (in_array($attribute->getAttributeCode(), $this->excludedAttributes, true)) {
-                continue;
-            }
-            $attributeAdapter = $this->attributeAdapterProvider->getByAttributeCode($attribute->getAttributeCode());
-            $fieldName = $this->fieldNameResolver->getFieldName($attributeAdapter);
+            $allAttributes += $this->getField($attribute);
+        }
 
-            $allAttributes[$fieldName] = [
-                'type' => $this->fieldTypeResolver->getFieldType($attributeAdapter),
-            ];
+        $allAttributes['store_id'] = [
+            'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_STRING),
+            'index' => $this->indexTypeConverter->convert(IndexTypeConverterInterface::INTERNAL_NO_INDEX_VALUE),
+        ];
 
-            $index = $this->fieldIndexResolver->getFieldIndex($attributeAdapter);
-            if (null !== $index) {
-                $allAttributes[$fieldName]['index'] = $index;
-            }
+        return $allAttributes;
+    }
 
-            if ($attributeAdapter->isSortable()) {
-                $sortFieldName = $this->fieldNameResolver->getFieldName(
-                    $attributeAdapter,
-                    ['type' => FieldMapperInterface::TYPE_SORT]
-                );
-                $allAttributes[$fieldName]['fields'][$sortFieldName] = [
-                    'type' => $this->fieldTypeConverter->convert(
-                        FieldTypeConverterInterface::INTERNAL_DATA_TYPE_KEYWORD
-                    ),
-                    'index' => $this->indexTypeConverter->convert(
-                        IndexTypeConverterInterface::INTERNAL_NO_ANALYZE_VALUE
-                    )
-                ];
-            }
+    /**
+     * Get field mapping for specific attribute.
+     *
+     * @param ProductAttributeInterface $attribute
+     * @return array
+     */
+    public function getField(ProductAttributeInterface $attribute): array
+    {
+        $fieldMapping = [];
+        if (in_array($attribute->getAttributeCode(), $this->excludedAttributes, true)) {
+            return $fieldMapping;
+        }
 
-            if ($attributeAdapter->isTextType()) {
-                $keywordFieldName = FieldTypeConverterInterface::INTERNAL_DATA_TYPE_KEYWORD;
-                $index = $this->indexTypeConverter->convert(
+        $attributeAdapter = $this->attributeAdapterProvider->getByAttributeCode($attribute->getAttributeCode());
+        $fieldName = $this->fieldNameResolver->getFieldName($attributeAdapter);
+
+        $fieldMapping[$fieldName] = [
+            'type' => $this->fieldTypeResolver->getFieldType($attributeAdapter),
+        ];
+
+        $index = $this->fieldIndexResolver->getFieldIndex($attributeAdapter);
+        if (null !== $index) {
+            $fieldMapping[$fieldName]['index'] = $index;
+        }
+
+        if ($attributeAdapter->isSortable()) {
+            $sortFieldName = $this->fieldNameResolver->getFieldName(
+                $attributeAdapter,
+                ['type' => FieldMapperInterface::TYPE_SORT]
+            );
+            $fieldMapping[$fieldName]['fields'][$sortFieldName] = [
+                'type' => $this->fieldTypeConverter->convert(
+                    FieldTypeConverterInterface::INTERNAL_DATA_TYPE_KEYWORD
+                ),
+                'index' => $this->indexTypeConverter->convert(
                     IndexTypeConverterInterface::INTERNAL_NO_ANALYZE_VALUE
-                );
-                $allAttributes[$fieldName]['fields'][$keywordFieldName] = [
-                    'type' => $this->fieldTypeConverter->convert(
-                        FieldTypeConverterInterface::INTERNAL_DATA_TYPE_KEYWORD
-                    )
-                ];
-                if ($index) {
-                    $allAttributes[$fieldName]['fields'][$keywordFieldName]['index'] = $index;
-                }
-            }
+                )
+            ];
+        }
 
-            if ($attributeAdapter->isComplexType()) {
-                $childFieldName = $this->fieldNameResolver->getFieldName(
-                    $attributeAdapter,
-                    ['type' => FieldMapperInterface::TYPE_QUERY]
-                );
-                $allAttributes[$childFieldName] = [
-                    'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_STRING)
-                ];
+        if ($attributeAdapter->isTextType()) {
+            $keywordFieldName = FieldTypeConverterInterface::INTERNAL_DATA_TYPE_KEYWORD;
+            $index = $this->indexTypeConverter->convert(
+                IndexTypeConverterInterface::INTERNAL_NO_ANALYZE_VALUE
+            );
+            $fieldMapping[$fieldName]['fields'][$keywordFieldName] = [
+                'type' => $this->fieldTypeConverter->convert(
+                    FieldTypeConverterInterface::INTERNAL_DATA_TYPE_KEYWORD
+                )
+            ];
+            if ($index) {
+                $fieldMapping[$fieldName]['fields'][$keywordFieldName]['index'] = $index;
             }
         }
 
-        $allAttributes['store_id'] = [
-            'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_STRING),
-            'index' => $this->indexTypeConverter->convert(IndexTypeConverterInterface::INTERNAL_NO_INDEX_VALUE),
-        ];
+        if ($attributeAdapter->isComplexType()) {
+            $childFieldName = $this->fieldNameResolver->getFieldName(
+                $attributeAdapter,
+                ['type' => FieldMapperInterface::TYPE_QUERY]
+            );
+            $fieldMapping[$childFieldName] = [
+                'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_STRING)
+            ];
+        }
 
-        return $allAttributes;
+        return $fieldMapping;
     }
 }
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 05801bd62f658..211c5f563c5d8 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
@@ -46,6 +46,11 @@ class Attribute
      */
     private $isNewObject;
 
+    /**
+     * @var string
+     */
+    private $attributeCode;
+
     /**
      * @param Config $config
      * @param Processor $indexerProcessor
@@ -89,7 +94,7 @@ public function afterSave(
                 );
             }
             foreach ($this->dimensionProvider->getIterator() as $dimension) {
-                $indexerHandler->updateIndex($dimension);
+                $indexerHandler->updateIndex($dimension, $this->attributeCode);
             }
         }
 
@@ -109,5 +114,6 @@ public function beforeSave(
         AbstractModel $attribute
     ): void {
         $this->isNewObject = $attribute->isObjectNew();
+        $this->attributeCode = $attribute->getAttributeCode();
     }
 }
diff --git a/app/code/Magento/Elasticsearch/Model/Indexer/IndexerHandler.php b/app/code/Magento/Elasticsearch/Model/Indexer/IndexerHandler.php
index 8b39cb28f81e2..90e21e9e3ea1e 100644
--- a/app/code/Magento/Elasticsearch/Model/Indexer/IndexerHandler.php
+++ b/app/code/Magento/Elasticsearch/Model/Indexer/IndexerHandler.php
@@ -137,13 +137,14 @@ public function isAvailable($dimensions = [])
      * Update mapping data for index.
      *
      * @param Dimension[] $dimensions
+     * @param string $attributeCode
      * @return IndexerInterface
      */
-    public function updateIndex(array $dimensions): IndexerInterface
+    public function updateIndex(array $dimensions, string $attributeCode): IndexerInterface
     {
         $dimension = current($dimensions);
         $scopeId = (int)$this->scopeResolver->getScope($dimension->getValue())->getId();
-        $this->adapter->updateIndexMapping($scopeId, $this->getIndexerId());
+        $this->adapter->updateIndexMapping($scopeId, $this->getIndexerId(), $attributeCode);
 
         return $this;
     }
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php
index 3b1163bd8d47f..a14df3d97b5a3 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php
@@ -11,9 +11,12 @@
 use Elasticsearch\Namespaces\IndicesNamespace;
 use Magento\AdvancedSearch\Model\Client\ClientInterface as ElasticsearchClient;
 use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface;
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
 use Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface;
 use Magento\Elasticsearch\Model\Adapter\Elasticsearch as ElasticsearchAdapter;
 use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\StaticField;
 use Magento\Elasticsearch\Model\Adapter\Index\BuilderInterface;
 use Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver;
 use Magento\Elasticsearch\Model\Config;
@@ -82,6 +85,16 @@ class ElasticsearchTest extends TestCase
      */
     protected $indexNameResolver;
 
+    /**
+     * @var ProductAttributeRepositoryInterface|MockObject
+     */
+    private $productAttributeRepository;
+
+    /**
+     * @var StaticField|MockObject
+     */
+    private $staticFieldProvider;
+
     /**
      * @var ArrayManager|MockObject
      */
@@ -186,6 +199,12 @@ protected function setUp(): void
         $this->batchDocumentDataMapper = $this->getMockBuilder(BatchDataMapperInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
+        $this->productAttributeRepository = $this->getMockBuilder(ProductAttributeRepositoryInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->staticFieldProvider = $this->getMockBuilder(StaticField::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->arrayManager = $this->getMockBuilder(ArrayManager::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -200,6 +219,8 @@ protected function setUp(): void
                 'logger' => $this->logger,
                 'indexNameResolver' => $this->indexNameResolver,
                 'options' => [],
+                'productAttributeRepository' => $this->productAttributeRepository,
+                'staticFieldProvider' => $this->staticFieldProvider,
                 'arrayManager' => $this->arrayManager,
             ]
         );
@@ -469,7 +490,7 @@ public function testUpdateAliasWithoutOldIndex()
     }
 
     /**
-     * Test update Elasticsearch mapping for index alias without definition.
+     * Test update Elasticsearch mapping for index without alias definition.
      *
      * @return void
      */
@@ -483,14 +504,14 @@ public function testUpdateIndexMappingWithoutAliasDefinition(): void
             ->with($storeId, $mappedIndexerId)
             ->willReturn('');
 
-        $this->fieldMapper->expects($this->never())
-            ->method('getAllAttributesTypes');
+        $this->productAttributeRepository->expects($this->never())
+            ->method('get');
 
-        $this->model->updateIndexMapping($storeId, $mappedIndexerId);
+        $this->model->updateIndexMapping($storeId, $mappedIndexerId, 'attribute_code');
     }
 
     /**
-     * Test update Elasticsearch mapping for index alias with definition.
+     * Test update Elasticsearch mapping for index with alias definition.
      *
      * @return void
      */
@@ -499,35 +520,48 @@ public function testUpdateIndexMappingWithAliasDefinition(): void
         $storeId = 1;
         $mappedIndexerId = 'product';
         $indexName = '_product_1_v1';
-        $allAttributeTypes = ['name' => 'string'];
+        $attributeCode = 'example_attribute_code';
 
         $this->indexNameResolver->expects($this->once())
             ->method('getIndexFromAlias')
             ->with($storeId, $mappedIndexerId)
             ->willReturn($indexName);
 
-        $this->fieldMapper->expects($this->once())
-            ->method('getAllAttributesTypes')
-            ->with([
-                'entityType' => $mappedIndexerId,
-                'websiteId' => $storeId,
-            ])
-            ->willReturn($allAttributeTypes);
+        $attribute = $this->getMockBuilder(ProductAttributeInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
 
+        $this->productAttributeRepository->expects($this->once())
+            ->method('get')
+            ->with($attributeCode)
+            ->willReturn($attribute);
+
+        $this->staticFieldProvider->expects($this->once())
+            ->method('getField')
+            ->with($attribute)
+            ->willReturn([$attributeCode => ['type' => 'text']]);
+
+        $mappedAttributes = ['another_attribute_code' => 'attribute_mapping'];
         $this->client->expects($this->once())
             ->method('getMapping')
             ->with(['index' => $indexName])
-            ->willReturn(['properties' => ['attribute_name' => 'attribute_value']]);
+            ->willReturn(['properties' => $mappedAttributes]);
+
+        $this->arrayManager->expects($this->once())
+            ->method('findPath')
+            ->with('properties', ['properties' => $mappedAttributes])
+            ->willReturn('example/path/to/properties');
 
         $this->arrayManager->expects($this->once())
             ->method('get')
-            ->willReturn(['attribute_name' => 'attribute_value']);
+            ->with('example/path/to/properties', ['properties' => $mappedAttributes], [])
+            ->willReturn($mappedAttributes);
 
         $this->client->expects($this->once())
             ->method('addFieldsMapping')
-            ->with($allAttributeTypes, $indexName, 'product');
+            ->with([$attributeCode => ['type' => 'text']], $indexName, 'product');
 
-        $this->model->updateIndexMapping($storeId, $mappedIndexerId);
+        $this->model->updateIndexMapping($storeId, $mappedIndexerId, $attributeCode);
     }
 
     /**
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/StaticFieldTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/StaticFieldTest.php
index d41a71dd6d994..99b157ee24fe5 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/StaticFieldTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/StaticFieldTest.php
@@ -7,8 +7,8 @@
 
 namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider;
 
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Eav\Model\Config;
-use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ConverterInterface
@@ -184,7 +184,7 @@ function ($attributeMock, $context) use ($fieldName, $compositeFieldName, $sortF
                 }
             );
 
-        $productAttributeMock = $this->getMockBuilder(AbstractAttribute::class)
+        $productAttributeMock = $this->getMockBuilder(ProductAttributeInterface::class)
             ->setMethods(['getAttributeCode'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Category/Product/AttributeTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Category/Product/AttributeTest.php
index a13bb844e5a8e..71efdf1d4d38a 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Category/Product/AttributeTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Category/Product/AttributeTest.php
@@ -91,6 +91,7 @@ public function testAfterSave(bool $isNewObject, bool $isElasticsearchEnabled, a
         /** @var AttributeModel $attribute */
         $attribute = (new ObjectManager($this))->getObject(AttributeModel::class);
         $attribute->isObjectNew($isNewObject);
+        $attribute->setAttributeCode('example_attribute_code');
         /** @var AttributeResourceModel|MockObject $subjectMock */
         $subjectMock = $this->createMock(AttributeResourceModel::class);
         $this->attributePlugin->beforeSave($subjectMock, $attribute);
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/IndexerHandlerTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/IndexerHandlerTest.php
index 7dce2879d72a6..3a9aef68c328c 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/IndexerHandlerTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/IndexerHandlerTest.php
@@ -277,6 +277,7 @@ public function testUpdateIndex(): void
     {
         $dimensionValue = 'SomeDimension';
         $indexMapping = 'some_index_mapping';
+        $attributeCode = 'example_attribute_code';
 
         $dimension = $this->getMockBuilder(Dimension::class)
             ->disableOriginalConstructor()
@@ -302,9 +303,9 @@ public function testUpdateIndex(): void
 
         $this->adapter->expects($this->once())
             ->method('updateIndexMapping')
-            ->with(1, $indexMapping)
+            ->with(1, $indexMapping, $attributeCode)
             ->willReturnSelf();
 
-        $this->model->updateIndex([$dimension]);
+        $this->model->updateIndex([$dimension], $attributeCode);
     }
 }
diff --git a/app/code/Magento/Elasticsearch/etc/di.xml b/app/code/Magento/Elasticsearch/etc/di.xml
index 61a20324eaf6a..edec07cb5d51e 100644
--- a/app/code/Magento/Elasticsearch/etc/di.xml
+++ b/app/code/Magento/Elasticsearch/etc/di.xml
@@ -475,6 +475,11 @@
             <argument name="fieldTypeConverter" xsi:type="object">Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter</argument>
         </arguments>
     </virtualType>
+    <type name="Magento\Elasticsearch\Model\Adapter\Elasticsearch">
+        <arguments>
+            <argument name="staticFieldProvider" xsi:type="object">elasticsearch5StaticFieldProvider</argument>
+        </arguments>
+    </type>
     <type name="Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\ProductFieldMapper">
         <arguments>
             <argument name="fieldProvider" xsi:type="object">elasticsearch5FieldProvider</argument>

From 22d8a9eff37cd2c94ce0acd460bdaa48b7eab9ef Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Thu, 30 Jul 2020 15:52:15 +0300
Subject: [PATCH 1129/1718] fix suggestions

---
 .../src/Magento/Setup/Console/Command/ModuleStatusCommand.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php b/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php
index 65a26df11b2cd..4e5e73f53478e 100644
--- a/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/ModuleStatusCommand.php
@@ -62,7 +62,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             foreach ($moduleNames as $moduleName) {
                 $this->showSpecificModule($moduleName, $output);
             }
-            return 0;
+            return Cli::RETURN_SUCCESS;
         }
 
         $onlyEnabled = $input->getOption('enabled');
@@ -83,7 +83,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $this->showDisabledModules($output);
         $output->writeln('');
 
-        return 0;
+        return Cli::RETURN_SUCCESS;
     }
 
     /**

From 78ea0dfae5420859e9be1a73bbc455eda307d3a6 Mon Sep 17 00:00:00 2001
From: Stas Kozar <stas.kozar@transoftgroup.com>
Date: Thu, 30 Jul 2020 19:00:53 +0300
Subject: [PATCH 1130/1718] MC-35475: Wrong design for Admin Customer Edit Page
 on Safari browser

---
 .../templates/catalog/product/composite/configure.phtml         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
index d04eb300746ac..5ff6f939b4da5 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
@@ -38,7 +38,7 @@
     <div id="product_composite_configure_confirmed" class="product_composite_configure_confirmed"></div>
 
     <?php $scriptString = <<<script
-        prodCompConfIframe = document.querySelector("iframe[name='product_composite_configure_iframe']:last-of-type");
+        prodCompConfIframe = document.querySelector("iframe[name='product_composite_configure_iframe']");
         prodCompConfIframe.style.width = 0;
         prodCompConfIframe.style.height = 0;
         prodCompConfIframe.style.border = "0px solid #fff";

From 0feb6a455df9d9308d85e5a6d100830180478c19 Mon Sep 17 00:00:00 2001
From: SmVladyslav <vlatame.tsg@gmail.com>
Date: Thu, 30 Jul 2020 20:09:25 +0300
Subject: [PATCH 1131/1718] MC-31304: [ElasticSearch] Exception on catalog
 search result page

---
 .../Magento/Catalog/_files/category_attribute.php |  8 ++++++--
 .../_files/category_attribute_rollback.php        | 15 ++++++++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_attribute.php
index 29b4a05c4dcbe..286ca456f406f 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_attribute.php
@@ -5,8 +5,12 @@
  */
 
 /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
-$attribute = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-    ->create(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class);
+
+use Magento\Catalog\Model\Category\Attribute;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$attribute = Bootstrap::getObjectManager()
+    ->create(Attribute::class);
 $attribute->setAttributeCode('test_attribute_code_666')
     ->setEntityTypeId(3)
     ->setIsGlobal(1)
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_attribute_rollback.php
index 34114703de344..580f989fecc6d 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_attribute_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_attribute_rollback.php
@@ -4,15 +4,20 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Framework\Registry $registry */
-$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+/** @var Registry $registry */
+
+use Magento\Catalog\Model\Category\Attribute;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$registry = Bootstrap::getObjectManager()->get(Registry::class);
 
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 
-/** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
-$attribute = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-    ->create(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class);
+/** @var Attribute $attribute */
+$attribute = Bootstrap::getObjectManager()
+    ->create(Attribute::class);
 
 $attribute->loadByCode(3, 'test_attribute_code_666');
 

From 3df1b6197805cf4d8c450af4f2dd4cf5bea0c8c7 Mon Sep 17 00:00:00 2001
From: dnyomo <dnyomo@briteskies.com>
Date: Thu, 30 Jul 2020 15:17:39 -0400
Subject: [PATCH 1132/1718] Added a new default sort by ID when searching
 Elasticsearch in SearchCriteriaBuilder.php Remove the _id from the order that
 is being passed to the product collection in ProductSearch.php Updated the
 position to be DESC passed to the product collection in ProductSearch.php
 Updated the ProductSearchTest.php to have the items in the attended order

---
 .../Product/SearchCriteriaBuilder.php         | 20 +++++++++++++++++++
 .../Products/DataProvider/ProductSearch.php   |  9 ++++++++-
 .../GraphQl/Catalog/ProductSearchTest.php     |  2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php b/app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php
index 1057d21283ea8..a91910f3d578a 100644
--- a/app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php
+++ b/app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php
@@ -104,6 +104,7 @@ public function build(array $args, bool $includeAggregation): SearchCriteriaInte
             $this->addDefaultSortOrder($searchCriteria, $isSearch);
         }
 
+        $this->addEntityIdSort($searchCriteria, $isSearch);
         $this->addVisibilityFilter($searchCriteria, $isSearch, !empty($args['filter']));
 
         $searchCriteria->setCurrentPage($args['currentPage']);
@@ -132,6 +133,25 @@ private function addVisibilityFilter(SearchCriteriaInterface $searchCriteria, bo
         $this->addFilter($searchCriteria, 'visibility', $visibilityIds, 'in');
     }
 
+    /**
+     * Add sort by Entity ID
+     *
+     * @param SearchCriteriaInterface $searchCriteria
+     * @param bool $isSearch
+     */
+    private function addEntityIdSort(SearchCriteriaInterface $searchCriteria, bool $isSearch): void
+    {
+        if ($isSearch) {
+            return;
+        }
+        $sortOrderArray = $searchCriteria->getSortOrders();
+        $sortOrderArray[] = $this->sortOrderBuilder
+            ->setField('_id')
+            ->setDirection(SortOrder::SORT_DESC)
+            ->create();
+        $searchCriteria->setSortOrders($sortOrderArray);
+    }
+
     /**
      * Prepare price aggregation algorithm
      *
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 c35caa07b4785..45721eff12b48 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php
@@ -7,6 +7,7 @@
 
 namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider;
 
+use Magento\Catalog\Api\Data\EavAttributeInterface;
 use Magento\Catalog\Api\Data\ProductSearchResultsInterfaceFactory;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
@@ -18,6 +19,7 @@
 use Magento\Framework\Api\Search\SearchResultInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\Api\SearchResultsInterface;
+use Magento\Framework\Api\SortOrder;
 use Magento\GraphQl\Model\Query\ContextInterface;
 
 /**
@@ -153,7 +155,12 @@ private function getSortOrderArray(SearchCriteriaInterface $searchCriteria)
         $sortOrders = $searchCriteria->getSortOrders();
         if (is_array($sortOrders)) {
             foreach ($sortOrders as $sortOrder) {
-                $ordersArray[$sortOrder->getField()] = $sortOrder->getDirection();
+                if ($sortOrder->getField() !== '_id') {
+                    if ($sortOrder->getField() == EavAttributeInterface::POSITION) {
+                        $sortOrder->setDirection(SortOrder::SORT_DESC);
+                    }
+                    $ordersArray[$sortOrder->getField()] = $sortOrder->getDirection();
+                }
             }
         }
 
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 dd5b5827c8017..315b0b51d22bf 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
@@ -898,7 +898,7 @@ public function testFilterByMultipleProductUrlKeys()
         $product1 = $productRepository->get('simple');
         $product2 = $productRepository->get('12345');
         $product3 = $productRepository->get('simple-4');
-        $filteredProducts = [$product1, $product2, $product3];
+        $filteredProducts = [$product3, $product2, $product1];
         $urlKey =[];
         foreach ($filteredProducts as $product) {
             $urlKey[] = $product->getUrlKey();

From 0b1d36e8d06ff6cb9483349a6af6a0b7cb81e074 Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Thu, 30 Jul 2020 14:39:17 -0500
Subject: [PATCH 1133/1718] MC-20638: MyAccount :: Order Details :: Shipping
 Details by Order Number

- code review
---
 app/code/Magento/BundleGraphQl/etc/graphql/di.xml     |  6 +++---
 .../Model/Resolver/Invoice/InvoiceItems.php           | 11 ++++++-----
 .../InvoiceItem.php}                                  |  4 ++--
 .../OrderItem.php}                                    |  4 ++--
 .../ShipmentItem.php}                                 |  4 ++--
 app/code/Magento/SalesGraphQl/etc/graphql/di.xml      |  6 +++---
 app/code/Magento/SalesGraphQl/etc/schema.graphqls     |  6 +++---
 .../customer_order_with_ups_shipping_rollback.php     |  2 +-
 .../Sales/_files/customer_order_with_two_items.php    |  1 +
 9 files changed, 23 insertions(+), 21 deletions(-)
 rename app/code/Magento/SalesGraphQl/Model/{InvoiceItemTypeResolver.php => TypeResolver/InvoiceItem.php} (90%)
 rename app/code/Magento/SalesGraphQl/Model/{OrderItemTypeResolver.php => TypeResolver/OrderItem.php} (91%)
 rename app/code/Magento/SalesGraphQl/Model/{ShipmentItemTypeResolver.php => TypeResolver/ShipmentItem.php} (90%)

diff --git a/app/code/Magento/BundleGraphQl/etc/graphql/di.xml b/app/code/Magento/BundleGraphQl/etc/graphql/di.xml
index 361120c103d44..7102b743ee068 100644
--- a/app/code/Magento/BundleGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/BundleGraphQl/etc/graphql/di.xml
@@ -65,21 +65,21 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\SalesGraphQl\Model\OrderItemTypeResolver">
+    <type name="Magento\SalesGraphQl\Model\TypeResolver\OrderItem">
         <arguments>
             <argument name="productTypeMap" xsi:type="array">
                 <item name="bundle" xsi:type="string">BundleOrderItem</item>
             </argument>
         </arguments>
     </type>
-    <type name="Magento\SalesGraphQl\Model\InvoiceItemTypeResolver">
+    <type name="Magento\SalesGraphQl\Model\TypeResolver\InvoiceItem">
         <arguments>
             <argument name="productTypeMap" xsi:type="array">
                 <item name="bundle" xsi:type="string">BundleInvoiceItem</item>
             </argument>
         </arguments>
     </type>
-    <type name="Magento\SalesGraphQl\Model\ShipmentItemTypeResolver">
+    <type name="Magento\SalesGraphQl\Model\TypeResolver\ShipmentItem">
         <arguments>
             <argument name="productTypeMap" xsi:type="array">
                 <item name="bundle" xsi:type="string">BundleShipmentItem</item>
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceItems.php b/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceItems.php
index 17ff800989172..9c38720e0e8c9 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceItems.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceItems.php
@@ -124,25 +124,26 @@ private function getInvoiceItemData(OrderInterface $order, InvoiceItemInterface
             'model' => $invoiceItem,
             'product_type' => $orderItem['product_type'],
             'order_item' => $orderItem,
-            'discounts' => $this->getDiscountDetails($order, $invoiceItem)
+            'discounts' => $this->formatDiscountDetails($order, $invoiceItem)
         ];
     }
 
     /**
-     * Returns information about an applied discount
+     * Returns formatted information about an applied discount
      *
      * @param OrderInterface $associatedOrder
      * @param InvoiceItemInterface $invoiceItem
      * @return array
      */
-    private function getDiscountDetails(OrderInterface $associatedOrder, InvoiceItemInterface $invoiceItem) : array
+    private function formatDiscountDetails(OrderInterface $associatedOrder, InvoiceItemInterface $invoiceItem) : array
     {
-        if ($associatedOrder->getDiscountDescription() === null && $invoiceItem->getDiscountAmount() == 0
+        if ($associatedOrder->getDiscountDescription() === null
+            && $invoiceItem->getDiscountAmount() == 0
             && $associatedOrder->getDiscountAmount() == 0
         ) {
             $discounts = [];
         } else {
-            $discounts [] = [
+            $discounts[] = [
                 'label' => $associatedOrder->getDiscountDescription() ?? _('Discount'),
                 'amount' => [
                     'value' => abs($invoiceItem->getDiscountAmount()) ?? 0,
diff --git a/app/code/Magento/SalesGraphQl/Model/InvoiceItemTypeResolver.php b/app/code/Magento/SalesGraphQl/Model/TypeResolver/InvoiceItem.php
similarity index 90%
rename from app/code/Magento/SalesGraphQl/Model/InvoiceItemTypeResolver.php
rename to app/code/Magento/SalesGraphQl/Model/TypeResolver/InvoiceItem.php
index 05d234d64ad96..e4ceab02fbbe9 100644
--- a/app/code/Magento/SalesGraphQl/Model/InvoiceItemTypeResolver.php
+++ b/app/code/Magento/SalesGraphQl/Model/TypeResolver/InvoiceItem.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\SalesGraphQl\Model;
+namespace Magento\SalesGraphQl\Model\TypeResolver;
 
 use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
@@ -13,7 +13,7 @@
 /**
  * Resolve concrete type for InvoiceItemInterface
  */
-class InvoiceItemTypeResolver implements TypeResolverInterface
+class InvoiceItem implements TypeResolverInterface
 {
     /**
      * @var array
diff --git a/app/code/Magento/SalesGraphQl/Model/OrderItemTypeResolver.php b/app/code/Magento/SalesGraphQl/Model/TypeResolver/OrderItem.php
similarity index 91%
rename from app/code/Magento/SalesGraphQl/Model/OrderItemTypeResolver.php
rename to app/code/Magento/SalesGraphQl/Model/TypeResolver/OrderItem.php
index a2d57deaeba72..851a0daf2f50d 100644
--- a/app/code/Magento/SalesGraphQl/Model/OrderItemTypeResolver.php
+++ b/app/code/Magento/SalesGraphQl/Model/TypeResolver/OrderItem.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\SalesGraphQl\Model;
+namespace Magento\SalesGraphQl\Model\TypeResolver;
 
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
@@ -13,7 +13,7 @@
 /**
  * Resolve concrete type for OrderItemInterface
  */
-class OrderItemTypeResolver implements TypeResolverInterface
+class OrderItem implements TypeResolverInterface
 {
     /**
      * @var array
diff --git a/app/code/Magento/SalesGraphQl/Model/ShipmentItemTypeResolver.php b/app/code/Magento/SalesGraphQl/Model/TypeResolver/ShipmentItem.php
similarity index 90%
rename from app/code/Magento/SalesGraphQl/Model/ShipmentItemTypeResolver.php
rename to app/code/Magento/SalesGraphQl/Model/TypeResolver/ShipmentItem.php
index 1f05ed8c8d68d..fd72a8729af27 100644
--- a/app/code/Magento/SalesGraphQl/Model/ShipmentItemTypeResolver.php
+++ b/app/code/Magento/SalesGraphQl/Model/TypeResolver/ShipmentItem.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\SalesGraphQl\Model;
+namespace Magento\SalesGraphQl\Model\TypeResolver;
 
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
@@ -13,7 +13,7 @@
 /**
  * Resolve concrete type of ShipmentItemInterface
  */
-class ShipmentItemTypeResolver implements TypeResolverInterface
+class ShipmentItem implements TypeResolverInterface
 {
     /**
      * @var array
diff --git a/app/code/Magento/SalesGraphQl/etc/graphql/di.xml b/app/code/Magento/SalesGraphQl/etc/graphql/di.xml
index 06997c51c81f7..332e9eeb05796 100644
--- a/app/code/Magento/SalesGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/SalesGraphQl/etc/graphql/di.xml
@@ -6,21 +6,21 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\SalesGraphQl\Model\OrderItemTypeResolver">
+    <type name="Magento\SalesGraphQl\Model\TypeResolver\OrderItem">
         <arguments>
             <argument name="productTypeMap" xsi:type="array">
                 <item name="default" xsi:type="string">OrderItem</item>
             </argument>
         </arguments>
     </type>
-    <type name="Magento\SalesGraphQl\Model\InvoiceItemTypeResolver">
+    <type name="Magento\SalesGraphQl\Model\TypeResolver\InvoiceItem">
         <arguments>
             <argument name="productTypeMap" xsi:type="array">
                 <item name="default" xsi:type="string">InvoiceItem</item>
             </argument>
         </arguments>
     </type>
-    <type name="Magento\SalesGraphQl\Model\ShipmentItemTypeResolver">
+    <type name="Magento\SalesGraphQl\Model\TypeResolver\ShipmentItem">
         <arguments>
             <argument name="productTypeMap" xsi:type="array">
                 <item name="default" xsi:type="string">ShipmentItem</item>
diff --git a/app/code/Magento/SalesGraphQl/etc/schema.graphqls b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
index 605123847c13e..6b0efb195752e 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\\TypeResolver\\OrderItem") {
     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")
@@ -129,7 +129,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\\TypeResolver\\InvoiceItem")  {
     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")
@@ -174,7 +174,7 @@ type CommentItem @doc(description: "Comment item details") {
     message: String! @doc(description: "The text of the message")
 }
 
-interface ShipmentItemInterface @doc(description: "Order shipment item details") @typeResolver(class: "Magento\\SalesGraphQl\\Model\\ShipmentItemTypeResolver"){
+interface ShipmentItemInterface @doc(description: "Order shipment item details") @typeResolver(class: "Magento\\SalesGraphQl\\Model\\TypeResolver\\ShipmentItem"){
     id: ID! @doc(description: "Shipment item unique identifier")
     order_item: OrderItemInterface @doc(description: "Associated order item") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\OrderItem")
     product_name: String @doc(description: "Name of the base product")
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping_rollback.php
index 6d7c5bd6b6465..aba4c3c972955 100644
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping_rollback.php
@@ -6,4 +6,4 @@
 
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/order_with_different_types_of_product_rollback.php');
+Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/default_rollback.php');
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/customer_order_with_two_items.php b/dev/tests/integration/testsuite/Magento/Sales/_files/customer_order_with_two_items.php
index 288b8c75d09c8..cc71d59256c40 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/customer_order_with_two_items.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/customer_order_with_two_items.php
@@ -98,6 +98,7 @@
     ->setBaseSubtotal(20)
     ->setBaseShippingAmount(10)
     ->setBaseGrandTotal(30)
+    ->setBaseCurrencyCode('USD')
     ->setOrderCurrencyCode('USD')
     ->setCustomerIsGuest(false)
     ->setCustomerEmail($customerDataModel->getEmail())

From 62ba8aa8833444aaf130fd861a66f9b881c1a171 Mon Sep 17 00:00:00 2001
From: dnyomo <dnyomo@briteskies.com>
Date: Thu, 30 Jul 2020 15:41:30 -0400
Subject: [PATCH 1134/1718] Added a new default sort by ID when searching
 Elasticsearch in SearchCriteriaBuilder.php Remove the _id from the order that
 is being passed to the product collection in ProductSearch.php Updated the
 position to be DESC passed to the product collection in ProductSearch.php
 Updated the ProductSearchTest.php to have the items in the attended order

---
 .../Products/DataProvider/ProductSearch.php         | 13 ++++++++++---
 .../Model/Resolver/Products/Query/Search.php        |  2 +-
 2 files changed, 11 insertions(+), 4 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 45721eff12b48..afc5fc77bc46d 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php
@@ -86,6 +86,7 @@ public function __construct(
      *
      * @param SearchCriteriaInterface $searchCriteria
      * @param SearchResultInterface $searchResult
+     * @param array $args
      * @param array $attributes
      * @param ContextInterface|null $context
      * @return SearchResultsInterface
@@ -93,6 +94,7 @@ public function __construct(
     public function getList(
         SearchCriteriaInterface $searchCriteria,
         SearchResultInterface $searchResult,
+        array $args,
         array $attributes = [],
         ContextInterface $context = null
     ): SearchResultsInterface {
@@ -105,7 +107,7 @@ public function getList(
         $this->getSearchResultsApplier(
             $searchResult,
             $collection,
-            $this->getSortOrderArray($searchCriteriaForCollection)
+            $this->getSortOrderArray($searchCriteriaForCollection, $args)
         )->apply();
 
         $this->collectionPreProcessor->process($collection, $searchCriteriaForCollection, $attributes, $context);
@@ -147,9 +149,10 @@ private function getSearchResultsApplier(
      * E.g. ['field1' => 'DESC', 'field2' => 'ASC", ...]
      *
      * @param SearchCriteriaInterface $searchCriteria
+     * @param array $args
      * @return array
      */
-    private function getSortOrderArray(SearchCriteriaInterface $searchCriteria)
+    private function getSortOrderArray(SearchCriteriaInterface $searchCriteria, $args)
     {
         $ordersArray = [];
         $sortOrders = $searchCriteria->getSortOrders();
@@ -157,7 +160,11 @@ private function getSortOrderArray(SearchCriteriaInterface $searchCriteria)
             foreach ($sortOrders as $sortOrder) {
                 if ($sortOrder->getField() !== '_id') {
                     if ($sortOrder->getField() == EavAttributeInterface::POSITION) {
-                        $sortOrder->setDirection(SortOrder::SORT_DESC);
+                        if (isset($args['sort'][EavAttributeInterface::POSITION])) {
+                            $sortOrder->setDirection($args['sort'][EavAttributeInterface::POSITION]);
+                        } else {
+                            $sortOrder->setDirection(SortOrder::SORT_DESC);
+                        }
                     }
                     $ordersArray[$sortOrder->getField()] = $sortOrder->getDirection();
                 }
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search.php
index 29c3ce279e6a1..faf1d56452a24 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search.php
@@ -103,7 +103,7 @@ public function getResult(
         //Address limitations of sort and pagination on search API apply original pagination from GQL query
         $searchCriteria->setPageSize($realPageSize);
         $searchCriteria->setCurrentPage($realCurrentPage);
-        $searchResults = $this->productsProvider->getList($searchCriteria, $itemsResults, $queryFields, $context);
+        $searchResults = $this->productsProvider->getList($searchCriteria, $itemsResults, $args, $queryFields, $context);
 
         $totalPages = $realPageSize ? ((int)ceil($searchResults->getTotalCount() / $realPageSize)) : 0;
 

From 8f43c639da9fc2f8fbb4394fc38889f718b584b6 Mon Sep 17 00:00:00 2001
From: oleksandrkravchuk <oleksandr.kravchuk@vaimo.com>
Date: Thu, 30 Jul 2020 23:01:54 +0300
Subject: [PATCH 1135/1718] community-features#252 Create static test for
 action controllers. Add Legacy test to check if newly created controllers do
 not extend AbstractAction.

---
 .../Magento/App/Action/AbstractActionTest.php | 160 ++++++++++++++++++
 1 file changed, 160 insertions(+)
 create mode 100644 dev/tests/static/testsuite/Magento/Test/Legacy/Magento/App/Action/AbstractActionTest.php

diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/Magento/App/Action/AbstractActionTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/Magento/App/Action/AbstractActionTest.php
new file mode 100644
index 0000000000000..472b557ab389f
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/Magento/App/Action/AbstractActionTest.php
@@ -0,0 +1,160 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Test\Legacy\App\Action;
+
+use Exception;
+use Magento\Framework\App\Action\AbstractAction;
+use Magento\Framework\App\ActionInterface;
+use Magento\Framework\App\Utility\Files;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\TestFramework\Utility\ClassNameExtractor;
+use PHPUnit\Framework\TestCase;
+use ReflectionClass;
+
+/**
+ * Test newly created controllers must do not extend AbstractAction.
+ */
+class AbstractActionTest extends TestCase
+{
+    /**
+     * @var ClassNameExtractor
+     */
+    private $classNameExtractor;
+
+    /**
+     * @var Files
+     */
+    private $fileUtilities;
+
+    /**
+     * @throws LocalizedException
+     */
+    protected function setUp(): void
+    {
+        $this->classNameExtractor = new ClassNameExtractor();
+        $this->fileUtilities = Files::init();
+    }
+
+    /**
+     * Test new
+     *
+    */
+    public function testNewControllersDoNotExtendAbstractAction(): void
+    {
+        $files = $this->getTestFiles();
+        $found = [];
+
+        foreach ($files as $file) {
+            $class = $this->classNameExtractor->getNameWithNamespace(file_get_contents($file[0]));
+
+            if ($class) {
+                try {
+                    $classReflection = new  ReflectionClass($class);
+                    if ($classReflection->isSubclassOf(AbstractAction::class)) {
+                        $found[] = $class;
+                    }
+                } catch (Exception $exception) {
+                    $this->addWarning('Skipped due to exception: ' . $class);
+                }
+            }
+        }
+
+        $this->assertEmpty(
+            $found,
+            "The following new controller(s) extend " . AbstractAction::class . "\r\n"
+            . "All new controller classes must implement " . ActionInterface::class . " instead.\r\n"
+            . print_r($found, true)
+        );
+    }
+
+    /**
+     * Provide files for test.
+     *
+     * @return array
+     */
+    private function getTestFiles(): array
+    {
+        $phpFiles = self::getAddedFilesList(self::getChangedFilesBaseDir());
+
+        $phpFiles = Files::composeDataSets($phpFiles);
+        $fileTypes = Files::INCLUDE_APP_CODE | Files::INCLUDE_LIBS | Files::AS_DATA_SET;
+        return array_intersect_key($phpFiles, $this->fileUtilities->getPhpFiles($fileTypes));
+    }
+
+    /**
+     * Provide list of new files.
+     *
+     * @param $changedFilesBaseDir
+     *
+     * @return string[]
+     */
+    private static function getAddedFilesList($changedFilesBaseDir)
+    {
+        return self::getFilesFromListFile(
+            $changedFilesBaseDir,
+            'changed_files*.added.*',
+            function () {
+                // if no list files, probably, this is the dev environment
+                // phpcs:ignore Generic.PHP.NoSilencedErrors,Magento2.Security.InsecureFunction
+                @exec('git diff --cached --name-only --diff-filter=A', $addedFiles);
+                return $addedFiles;
+            }
+        );
+    }
+
+    /**
+     * Read files from generated lists.
+     *
+     * @param string $listsBaseDir
+     * @param string $listFilePattern
+     * @param callable $noListCallback
+     * @return string[]
+     */
+    private static function getFilesFromListFile(
+        string $listsBaseDir,
+        string $listFilePattern,
+        callable $noListCallback
+    ): array {
+        $filesDefinedInList = [];
+
+        $listFiles = glob($listsBaseDir . '/_files/' . $listFilePattern);
+        if (!empty($listFiles)) {
+            foreach ($listFiles as $listFile) {
+                // phpcs:ignore Magento2.Performance.ForeachArrayMerge.ForeachArrayMerge
+                $filesDefinedInList = array_merge(
+                    $filesDefinedInList,
+                    file($listFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)
+                );
+            }
+        } else {
+            $filesDefinedInList = call_user_func($noListCallback);
+        }
+
+        array_walk(
+            $filesDefinedInList,
+            function (&$file) {
+                $file = BP . '/' . $file;
+            }
+        );
+
+        $filesDefinedInList = array_values(array_unique($filesDefinedInList));
+
+        return $filesDefinedInList;
+    }
+
+    /**
+     * Returns base directory for generated lists.
+     *
+     * @return string
+     */
+    private static function getChangedFilesBaseDir(): string
+    {
+        return BP . DIRECTORY_SEPARATOR . 'dev' . DIRECTORY_SEPARATOR . 'tests' . DIRECTORY_SEPARATOR . 'static' .
+            DIRECTORY_SEPARATOR . 'testsuite' . DIRECTORY_SEPARATOR . 'Magento' . DIRECTORY_SEPARATOR . 'Test';
+    }
+}

From 633ef00a14ff3d074a6e009a32aac646aa8d22e3 Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Thu, 30 Jul 2020 15:29:17 -0500
Subject: [PATCH 1136/1718] added support for adding bundle options with custom
 quantity - added e2e tests for adding bundle options ith custom quantity

---
 .../Cart/BuyRequest/BundleDataProvider.php    |  15 ++
 ...dBundleProductToCartSingleMutationTest.php | 126 ++++++++++++++++
 ...h_multiple_options_and_custom_quantity.php | 137 ++++++++++++++++++
 ...e_options_and_custom_quantity_rollback.php |  30 ++++
 4 files changed, 308 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_and_custom_quantity.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_and_custom_quantity_rollback.php

diff --git a/app/code/Magento/QuoteBundleOptions/Model/Cart/BuyRequest/BundleDataProvider.php b/app/code/Magento/QuoteBundleOptions/Model/Cart/BuyRequest/BundleDataProvider.php
index 6e8c9844b1503..01239e50e70b4 100644
--- a/app/code/Magento/QuoteBundleOptions/Model/Cart/BuyRequest/BundleDataProvider.php
+++ b/app/code/Magento/QuoteBundleOptions/Model/Cart/BuyRequest/BundleDataProvider.php
@@ -40,6 +40,21 @@ public function execute(CartItem $cartItem): array
             $bundleOptionsData['bundle_option'][$optionId] = $optionValueId;
             $bundleOptionsData['bundle_option_qty'][$optionId] = $optionQuantity;
         }
+        //for bundle options with custom quantity
+        foreach ($cartItem->getEnteredOptions() as $option) {
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
+            $optionData = \explode('/', base64_decode($option->getId()));
+
+            if ($this->isProviderApplicable($optionData) === false) {
+                continue;
+            }
+            $this->validateInput($optionData);
+
+            [, $optionId, $optionValueId] = $optionData;
+            $optionQuantity = $option->getValue();
+            $bundleOptionsData['bundle_option'][$optionId] = $optionValueId;
+            $bundleOptionsData['bundle_option_qty'][$optionId] = $optionQuantity;
+        }
 
         return $bundleOptionsData;
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartSingleMutationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartSingleMutationTest.php
index 33f2174134b3a..20f2fe3479dcd 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartSingleMutationTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartSingleMutationTest.php
@@ -222,4 +222,130 @@ public function testAddBundleToCartWithWrongBundleOptions()
             $response['addProductsToCart']['userInputErrors'][0]['message']
         );
     }
+
+    /**
+     * @magentoApiDataFixture Magento/Bundle/_files/product_with_multiple_options_and_custom_quantity.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     */
+    public function testUpdateBundleItemWithCustomOptionQuantity()
+    {
+
+        $this->quoteResource->load(
+            $this->quote,
+            'test_order_1',
+            'reserved_order_id'
+        );
+        $maskedQuoteId = $this->quoteIdToMaskedId->execute((int)$this->quote->getId());
+        $response = $this->graphQlQuery($this->getProductQuery("bundle-product"));
+        $bundleItem = $response['products']['items'][0];
+        $sku = $bundleItem['sku'];
+        $bundleOptions = $bundleItem['items'];
+
+        $uId0 = $bundleOptions[0]['options'][0]['uid'];
+        $uId1 = $bundleOptions[1]['options'][0]['uid'];
+        $response = $this->graphQlMutation(
+            $this->getMutationsQuery($maskedQuoteId, $uId0, $uId1, $sku)
+        );
+        $bundleOptions = $response['addProductsToCart']['cart']['items'][0]['bundle_options'];
+        $this->assertEquals(5, $bundleOptions[0]['values'][0]['quantity']);
+        $this->assertEquals(1, $bundleOptions[1]['values'][0]['quantity']);
+    }
+
+    /**
+     * Returns GraphQL query for retrieving a product with customizable options
+     *
+     * @param string $sku
+     * @return string
+     */
+    private function getProductQuery(string $sku): string
+    {
+        return <<<QUERY
+{
+  products(search: "{$sku}") {
+    items {
+      sku
+       ... on BundleProduct {
+              items {
+                sku
+                option_id
+                required
+                type
+                title
+                options {
+                  uid
+                  label
+                  product {
+                    sku
+                  }
+                  can_change_quantity
+                  id
+                  price
+
+                  quantity
+                }
+              }
+       }
+    }
+  }
+}
+QUERY;
+    }
+
+    private function getMutationsQuery(
+        string $maskedQuoteId,
+        string $optionUid0,
+        string $optionUid1,
+        string $sku
+    ): string {
+        return <<<QUERY
+mutation {
+      addProductsToCart(
+            cartId: "{$maskedQuoteId}",
+            cartItems: [
+                {
+                    sku: "{$sku}"
+                    quantity: 2
+                    selected_options: [
+                        "{$optionUid1}", "{$optionUid0}"
+                    ],
+                    entered_options: [{
+                        id: "{$optionUid0}"
+                        value: "5"
+                     },
+                     {
+                        id: "{$optionUid1}"
+                        value: "5"
+                     }]
+                }
+            ]
+       ) {
+    cart {
+        items {
+            id
+            quantity
+            product {
+                sku
+            }
+            ... on BundleCartItem {
+                bundle_options {
+                    id
+                    label
+                    type
+                    values {
+                        id
+                        label
+                        price
+                        quantity
+                    }
+                }
+            }
+        }
+    }
+    userInputErrors {
+        message
+    }
+  }
+}
+QUERY;
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_and_custom_quantity.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_and_custom_quantity.php
new file mode 100644
index 0000000000000..a623c583fb599
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_and_custom_quantity.php
@@ -0,0 +1,137 @@
+<?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/multiple_products.php');
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$productIds = range(10, 12, 1);
+foreach ($productIds as $productId) {
+    /** @var \Magento\CatalogInventory\Model\Stock\Item $stockItem */
+    $stockItem = $objectManager->create(\Magento\CatalogInventory\Model\Stock\Item::class);
+    $stockItem->load($productId, 'product_id');
+
+    if (!$stockItem->getProductId()) {
+        $stockItem->setProductId($productId);
+    }
+    $stockItem->setUseConfigManageStock(1);
+    $stockItem->setQty(1000);
+    $stockItem->setIsQtyDecimal(0);
+    $stockItem->setIsInStock(1);
+    $stockItem->save();
+}
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_BUNDLE)
+    ->setId(3)
+    ->setAttributeSetId(4)
+    ->setName('Bundle Product')
+    ->setSku('bundle-product')
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
+    ->setWebsiteIds([1])
+    ->setPriceType(1)
+    ->setPrice(10.0)
+    ->setShipmentType(0)
+    ->setPriceView(1)
+    ->setBundleOptionsData(
+        [
+            // Required "Drop-down" option
+            [
+                'title' => 'Option 1',
+                'default_title' => 'Option 1',
+                'type' => 'select',
+                'required' => 1,
+                'position' => 1,
+                'delete' => '',
+            ],
+            // Required "Radio Buttons" option
+            [
+                'title' => 'Option 2',
+                'default_title' => 'Option 2',
+                'type' => 'radio',
+                'required' => 1,
+                'position' => 2,
+                'delete' => '',
+            ],
+        ]
+    )->setBundleSelectionsData(
+        [
+            [
+                [
+                    'product_id' => 10,
+                    'selection_qty' => 1,
+                    'selection_can_change_qty' => 1,
+                    'delete' => '',
+                    'option_id' => 1
+                ],
+                [
+                    'product_id' => 11,
+                    'selection_qty' => 1,
+                    'selection_can_change_qty' => 1,
+                    'delete' => '',
+                    'option_id' => 1
+                ]
+            ],
+            [
+                [
+                    'product_id' => 10,
+                    'selection_qty' => 1,
+                    'selection_can_change_qty' => 0,
+                    'delete' => '',
+                    'option_id' => 2
+                ],
+                [
+                    'product_id' => 11,
+                    'selection_qty' => 1,
+                    'selection_can_change_qty' => 0,
+                    'delete' => '',
+                    'option_id' => 2
+                ]
+            ]
+        ]
+    );
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+if ($product->getBundleOptionsData()) {
+    $options = [];
+    foreach ($product->getBundleOptionsData() as $key => $optionData) {
+        if (!(bool)$optionData['delete']) {
+            $option = $objectManager->create(\Magento\Bundle\Api\Data\OptionInterfaceFactory::class)
+                ->create(['data' => $optionData]);
+            $option->setSku($product->getSku());
+            $option->setOptionId(null);
+
+            $links = [];
+            $bundleLinks = $product->getBundleSelectionsData();
+            if (!empty($bundleLinks[$key])) {
+                foreach ($bundleLinks[$key] as $linkData) {
+                    if (!(bool)$linkData['delete']) {
+                        $link = $objectManager->create(\Magento\Bundle\Api\Data\LinkInterfaceFactory::class)
+                            ->create(['data' => $linkData]);
+                        $linkProduct = $productRepository->getById($linkData['product_id']);
+                        $link->setSku($linkProduct->getSku());
+                        $link->setQty($linkData['selection_qty']);
+                        if (isset($linkData['selection_can_change_qty'])) {
+                            $link->setCanChangeQuantity($linkData['selection_can_change_qty']);
+                        }
+                        $links[] = $link;
+                    }
+                }
+                $option->setProductLinks($links);
+                $options[] = $option;
+            }
+        }
+    }
+    $extension = $product->getExtensionAttributes();
+    $extension->setBundleProductOptions($options);
+    $product->setExtensionAttributes($extension);
+}
+$product->save();
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_and_custom_quantity_rollback.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_and_custom_quantity_rollback.php
new file mode 100644
index 0000000000000..9d702b4506551
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_and_custom_quantity_rollback.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+use Magento\TestFramework\Helper\Bootstrap;
+
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/multiple_products_rollback.php');
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+/** @var \Magento\Framework\Registry $registry */
+$registry = Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+try {
+    $product = $productRepository->get('bundle-product');
+    $productRepository->delete($product);
+} catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
+    //Product already removed
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);

From 4a83bfb58f1a448cadb46cec8969682daad3a8f4 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Thu, 30 Jul 2020 23:18:24 +0200
Subject: [PATCH 1137/1718] Refactor ResourceConnection.php

---
 .../Framework/App/ResourceConnection.php      | 39 ++++++++-----------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/lib/internal/Magento/Framework/App/ResourceConnection.php b/lib/internal/Magento/Framework/App/ResourceConnection.php
index b543cc970f640..004f4c6ca6daa 100644
--- a/lib/internal/Magento/Framework/App/ResourceConnection.php
+++ b/lib/internal/Magento/Framework/App/ResourceConnection.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\App;
 
 use Magento\Framework\App\ResourceConnection\ConfigInterface as ResourceConfigInterface;
@@ -18,13 +20,10 @@
  */
 class ResourceConnection
 {
-    const AUTO_UPDATE_ONCE = 0;
-
-    const AUTO_UPDATE_NEVER = -1;
-
-    const AUTO_UPDATE_ALWAYS = 1;
-
-    const DEFAULT_CONNECTION = 'default';
+    public const AUTO_UPDATE_ONCE = 0;
+    public const AUTO_UPDATE_NEVER = -1;
+    public const AUTO_UPDATE_ALWAYS = 1;
+    public const DEFAULT_CONNECTION = 'default';
 
     /**
      * Instances of actual connections.
@@ -93,8 +92,7 @@ public function __construct(
     public function getConnection($resourceName = self::DEFAULT_CONNECTION)
     {
         $connectionName = $this->config->getConnectionName($resourceName);
-        $connection = $this->getConnectionByName($connectionName);
-        return $connection;
+        return $this->getConnectionByName($connectionName);
     }
 
     /**
@@ -160,13 +158,13 @@ public function getConnectionByName($connectionName)
      */
     private function getProcessConnectionName($connectionName)
     {
-        return  $connectionName . '_process_' . getmypid();
+        return $connectionName . '_process_' . getmypid();
     }
 
     /**
      * Get resource table name, validated by db adapter.
      *
-     * @param   string|string[] $modelEntity
+     * @param string|string[] $modelEntity
      * @param string $connectionName
      * @return  string
      * @api
@@ -212,9 +210,9 @@ public function getTablePlaceholder($tableName)
     /**
      * Build a trigger name.
      *
-     * @param string $tableName  The table that is the subject of the trigger
-     * @param string $time  Either "before" or "after"
-     * @param string $event  The DB level event which activates the trigger, i.e. "update" or "insert"
+     * @param string $tableName The table that is the subject of the trigger
+     * @param string $time Either "before" or "after"
+     * @param string $event The DB level event which activates the trigger, i.e. "update" or "insert"
      * @return string
      */
     public function getTriggerName($tableName, $time, $event)
@@ -275,9 +273,9 @@ public function getIdxName(
     /**
      * Retrieve 32bit UNIQUE HASH for a Table foreign key.
      *
-     * @param string $priTableName  the target table name
+     * @param string $priTableName the target table name
      * @param string $priColumnName the target table column name
-     * @param string $refTableName  the reference table name
+     * @param string $refTableName the reference table name
      * @param string $refColumnName the reference table column name
      * @return string
      */
@@ -302,10 +300,7 @@ public function getFkName($priTableName, $priColumnName, $refTableName, $refColu
     public function getSchemaName($resourceName)
     {
         return $this->deploymentConfig->get(
-            ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTIONS .
-            '/' .
-            $resourceName .
-            '/dbname'
+            ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTIONS . '/' . $resourceName . '/dbname'
         );
     }
 
@@ -320,8 +315,6 @@ public function getTablePrefix()
             return $this->tablePrefix;
         }
 
-        return (string) $this->deploymentConfig->get(
-            ConfigOptionsListConstants::CONFIG_PATH_DB_PREFIX
-        );
+        return (string)$this->deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_DB_PREFIX);
     }
 }

From 565f63ee540d6c6d3ced666c1dc816315e26d54f Mon Sep 17 00:00:00 2001
From: Vitalii Zabaznov <vzabaznov@magento.com>
Date: Thu, 30 Jul 2020 16:53:49 -0500
Subject: [PATCH 1138/1718] MC-35903: Refactor place where lock mechanism is
 used regarding proper lock description

---
 .../Unit/Console/StartConsumerCommandTest.php | 23 +++++--------
 .../Framework/Lock/Backend/CacheTest.php      |  7 ++--
 .../Test/Unit/LockGuardedCacheLoaderTest.php  |  6 ++--
 .../Magento/Framework/Lock/Backend/Cache.php  | 33 ++++++++++++++++++-
 .../Lock/Test/Unit/Backend/CacheTest.php      |  2 +-
 5 files changed, 48 insertions(+), 23 deletions(-)

diff --git a/app/code/Magento/MessageQueue/Test/Unit/Console/StartConsumerCommandTest.php b/app/code/Magento/MessageQueue/Test/Unit/Console/StartConsumerCommandTest.php
index b73fcc278f970..274386a9bb685 100644
--- a/app/code/Magento/MessageQueue/Test/Unit/Console/StartConsumerCommandTest.php
+++ b/app/code/Magento/MessageQueue/Test/Unit/Console/StartConsumerCommandTest.php
@@ -103,7 +103,6 @@ public function testExecute(
         $pidFilePath,
         $singleThread,
         $lockExpects,
-        $isLockedExpects,
         $isLocked,
         $unlockExpects,
         $runProcessExpects,
@@ -144,14 +143,11 @@ public function testExecute(
             ->method('get')->with($consumerName, $batchSize)->willReturn($consumer);
         $consumer->expects($this->exactly($runProcessExpects))->method('process')->with($numberOfMessages);
 
-        $this->lockManagerMock->expects($this->exactly($isLockedExpects))
-            ->method('isLocked')
-            ->with(md5($consumerName)) //phpcs:ignore
-            ->willReturn($isLocked);
-
         $this->lockManagerMock->expects($this->exactly($lockExpects))
             ->method('lock')
-            ->with(md5($consumerName)); //phpcs:ignore
+            ->with(md5($consumerName))//phpcs:ignore
+            ->willReturn($isLocked);
+
         $this->lockManagerMock->expects($this->exactly($unlockExpects))
             ->method('unlock')
             ->with(md5($consumerName)); //phpcs:ignore
@@ -172,8 +168,7 @@ public function executeDataProvider()
                 'pidFilePath' => null,
                 'singleThread' => false,
                 'lockExpects' => 0,
-                'isLockedExpects' => 0,
-                'isLocked' => false,
+                'isLocked' => true,
                 'unlockExpects' => 0,
                 'runProcessExpects' => 1,
                 'expectedReturn' => Cli::RETURN_SUCCESS,
@@ -182,8 +177,7 @@ public function executeDataProvider()
                 'pidFilePath' => '/var/consumer.pid',
                 'singleThread' => true,
                 'lockExpects' => 1,
-                'isLockedExpects' => 1,
-                'isLocked' => false,
+                'isLocked' => true,
                 'unlockExpects' => 1,
                 'runProcessExpects' => 1,
                 'expectedReturn' => Cli::RETURN_SUCCESS,
@@ -191,10 +185,9 @@ public function executeDataProvider()
             [
                 'pidFilePath' => '/var/consumer.pid',
                 'singleThread' => true,
-                'lockExpects' => 0,
-                'isLockedExpects' => 1,
-                'isLocked' => true,
-                'unlockExpects' => 0,
+                'lockExpects' => 1,
+                'isLocked' => false,
+                'unlockExpects' => 1,
                 'runProcessExpects' => 0,
                 'expectedReturn' => Cli::RETURN_FAILURE,
             ],
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/CacheTest.php b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/CacheTest.php
index bf5b282c805e6..81ab34fae9b98 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/CacheTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/CacheTest.php
@@ -60,14 +60,15 @@ public function testParallelLock(): void
      */
     public function testParallelLockExpired(): void
     {
-        $lifeTime = \Closure::bind(function (Cache $class) {
-            return $class->defaultLifetime;
+        $testLifeTime = 2;
+        \Closure::bind(function (Cache $class) use ($testLifeTime) {
+            $class->defaultLifetime = $testLifeTime;
         }, null, $this->cacheInstance1)($this->cacheInstance1);
 
         $identifier1 = \uniqid('lock_name_1_', true);
 
         $this->assertTrue($this->cacheInstance1->lock($identifier1, 0));
-        $this->assertTrue($this->cacheInstance2->lock($identifier1, $lifeTime + 1));
+        $this->assertTrue($this->cacheInstance2->lock($identifier1, $testLifeTime + 1));
 
         $this->cacheInstance2->unlock($identifier1);
     }
diff --git a/lib/internal/Magento/Framework/Cache/Test/Unit/LockGuardedCacheLoaderTest.php b/lib/internal/Magento/Framework/Cache/Test/Unit/LockGuardedCacheLoaderTest.php
index aa3df00953fda..9dcfb89373c2b 100644
--- a/lib/internal/Magento/Framework/Cache/Test/Unit/LockGuardedCacheLoaderTest.php
+++ b/lib/internal/Magento/Framework/Cache/Test/Unit/LockGuardedCacheLoaderTest.php
@@ -95,7 +95,7 @@ public function testDataCollectedAfterDeadlineReached(): void
 
         $this->lockManagerInterfaceMock
             ->expects($this->atLeastOnce())->method('lock')
-            ->with($lockName, 10)
+            ->with($lockName, 0)
             ->willReturn(false);
 
         $this->lockManagerInterfaceMock->expects($this->never())->method('unlock');
@@ -129,7 +129,7 @@ public function testDataWrite(): void
 
         $this->lockManagerInterfaceMock
             ->expects($this->once())->method('lock')
-            ->with($lockName, 10)
+            ->with($lockName, 0)
             ->willReturn(true);
 
         $this->lockManagerInterfaceMock->expects($this->once())->method('unlock');
@@ -168,7 +168,7 @@ public function testDataCollectedWithParallelGeneration(): void
 
         $this->lockManagerInterfaceMock
             ->expects($this->once())->method('lock')
-            ->with($lockName, 10)
+            ->with($lockName, 0)
             ->willReturn(false);
 
         $this->lockManagerInterfaceMock->expects($this->never())->method('unlock');
diff --git a/lib/internal/Magento/Framework/Lock/Backend/Cache.php b/lib/internal/Magento/Framework/Lock/Backend/Cache.php
index c8517c9cf73c4..ae777a6701cde 100644
--- a/lib/internal/Magento/Framework/Lock/Backend/Cache.php
+++ b/lib/internal/Magento/Framework/Lock/Backend/Cache.php
@@ -43,7 +43,14 @@ class Cache implements \Magento\Framework\Lock\LockManagerInterface
      *
      * @var int
      */
-    private $defaultLifetime = 10;
+    private $defaultLifetime = 7200;
+
+    /**
+     * Array for keeping all lock attempt to release them on destruct.
+     *
+     * @var string[]
+     */
+    private $lockArrayState = [];
 
     /**
      * @param FrontendInterface $cache
@@ -77,6 +84,7 @@ public function lock(string $name, int $timeout = -1): bool
         $data = $this->cache->load($this->getIdentifier($name));
 
         if ($data === $this->lockSign) {
+            $this->lockArrayState[$name] = 1;
             return true;
         }
 
@@ -101,6 +109,7 @@ public function unlock(string $name): bool
         $removeResult = false;
         if ($data === $this->lockSign) {
             $removeResult = (bool)$this->cache->remove($this->getIdentifier($name));
+            unset($this->lockArrayState[$name]);
         }
 
         return $removeResult;
@@ -147,4 +156,26 @@ private function generateLockSign()
 
         return $sign;
     }
+
+    /**
+     * Destruct method should release all locks that left.
+     *
+     * @return void
+     */
+    public function __destruct()
+    {
+        $this->releaseLocks();
+    }
+
+    /**
+     * Release all locks that were not removed with unlock method.
+     *
+     * @return void
+     */
+    private function releaseLocks()
+    {
+        foreach ($this->lockArrayState as $name => $value) {
+            $this->unlock($name);
+        }
+    }
 }
diff --git a/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/CacheTest.php b/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/CacheTest.php
index 5b5c87ce454b3..3e46d4fe6fc76 100644
--- a/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/CacheTest.php
+++ b/lib/internal/Magento/Framework/Lock/Test/Unit/Backend/CacheTest.php
@@ -162,6 +162,6 @@ public function testLockWithNotEmptyData(): void
             ->with(self::LOCK_PREFIX . $identifier)
             ->willReturn(\uniqid('some_rand-', true));
 
-        $this->assertEquals(false, $this->cache->lock($identifier));
+        $this->assertEquals(false, $this->cache->lock($identifier, 0));
     }
 }

From fc67e95e51c20a4840c61bb469e920a151437d74 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Fri, 31 Jul 2020 01:31:23 +0200
Subject: [PATCH 1139/1718] Align arguments

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

diff --git a/lib/internal/Magento/Framework/App/ResourceConnection.php b/lib/internal/Magento/Framework/App/ResourceConnection.php
index 004f4c6ca6daa..e6cde71ad7710 100644
--- a/lib/internal/Magento/Framework/App/ResourceConnection.php
+++ b/lib/internal/Magento/Framework/App/ResourceConnection.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
@@ -166,7 +167,7 @@ private function getProcessConnectionName($connectionName)
      *
      * @param string|string[] $modelEntity
      * @param string $connectionName
-     * @return  string
+     * @return string
      * @api
      */
     public function getTableName($modelEntity, $connectionName = self::DEFAULT_CONNECTION)

From 38504fd0668f749330ef235b25634ba41f5e12d4 Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Thu, 30 Jul 2020 21:53:04 -0500
Subject: [PATCH 1140/1718] minor fix on tests

---
 .../Bundle/AddBundleProductToCartSingleMutationTest.php     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartSingleMutationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartSingleMutationTest.php
index 20f2fe3479dcd..be1bfce9441d6 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartSingleMutationTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartSingleMutationTest.php
@@ -227,7 +227,7 @@ public function testAddBundleToCartWithWrongBundleOptions()
      * @magentoApiDataFixture Magento/Bundle/_files/product_with_multiple_options_and_custom_quantity.php
      * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
      */
-    public function testUpdateBundleItemWithCustomOptionQuantity()
+    public function testAddBundleItemWithCustomOptionQuantity()
     {
 
         $this->quoteResource->load(
@@ -309,11 +309,11 @@ private function getMutationsQuery(
                         "{$optionUid1}", "{$optionUid0}"
                     ],
                     entered_options: [{
-                        id: "{$optionUid0}"
+                        uid: "{$optionUid0}"
                         value: "5"
                      },
                      {
-                        id: "{$optionUid1}"
+                        uid: "{$optionUid1}"
                         value: "5"
                      }]
                 }

From 394dd7e4f8ce7a8d4aeb322ad3c4b2165f3317e1 Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Thu, 30 Jul 2020 21:55:05 -0500
Subject: [PATCH 1141/1718] minor fix

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

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartSingleMutationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartSingleMutationTest.php
index be1bfce9441d6..3fb183b3016c5 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartSingleMutationTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartSingleMutationTest.php
@@ -309,11 +309,11 @@ private function getMutationsQuery(
                         "{$optionUid1}", "{$optionUid0}"
                     ],
                     entered_options: [{
-                        uid: "{$optionUid0}"
+                        id: "{$optionUid0}"
                         value: "5"
                      },
                      {
-                        uid: "{$optionUid1}"
+                        id: "{$optionUid1}"
                         value: "5"
                      }]
                 }

From 912cfd8c1a4da5605168c8939c707d72df575326 Mon Sep 17 00:00:00 2001
From: Andrii Kasian <akasian@magento.com>
Date: Thu, 30 Jul 2020 22:10:42 -0500
Subject: [PATCH 1142/1718] Fix condition checks

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

diff --git a/lib/internal/Magento/Framework/DB/Select.php b/lib/internal/Magento/Framework/DB/Select.php
index e28786568cc2c..1b0fc1a9ff7fa 100644
--- a/lib/internal/Magento/Framework/DB/Select.php
+++ b/lib/internal/Magento/Framework/DB/Select.php
@@ -115,7 +115,7 @@ public function where($cond, $value = null, $type = null)
     {
         if ($value === null && $type === null) {
             $value = '';
-        } elseif ($type == self::TYPE_CONDITION) {
+        } elseif ((string)$type === self::TYPE_CONDITION) {
             $type = null;
         }
         if (is_array($value)) {

From 18f7d85e9218e235946aec7aad3fe2190346bdbf Mon Sep 17 00:00:00 2001
From: Andrii Kasian <akasian@magento.com>
Date: Thu, 30 Jul 2020 23:39:27 -0500
Subject: [PATCH 1143/1718] Fix static test

---
 .../Product/Type/Configurable/Attribute/Collection.php        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php
index 6920e4e789335..f699eae23e359 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php
@@ -41,8 +41,8 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * Product instance
      *
      * @var \Magento\Catalog\Model\Product
-     * @deprecated 100.3.0 Now collection supports fetching options for multiple products. This field will be set to first
-     * element of products array.
+     * @deprecated 100.3.0 Now collection supports fetching options for multiple products.
+     * This field will be set to first element of products array.
      */
     protected $_product;
 

From 602dc6894a0ba909d3b631a28155ab58459aa12d Mon Sep 17 00:00:00 2001
From: Oleksandr Kravchuk <swnsma@gmail.com>
Date: Fri, 31 Jul 2020 09:26:31 +0300
Subject: [PATCH 1144/1718] Update
 dev/tests/static/testsuite/Magento/Test/Legacy/Magento/App/Action/AbstractActionTest.php

Refactoring.

Co-authored-by: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
---
 .../Test/Legacy/Magento/App/Action/AbstractActionTest.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/Magento/App/Action/AbstractActionTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/Magento/App/Action/AbstractActionTest.php
index 472b557ab389f..ced06dcc4ada6 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/Magento/App/Action/AbstractActionTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/Magento/App/Action/AbstractActionTest.php
@@ -125,12 +125,10 @@ private static function getFilesFromListFile(
         $listFiles = glob($listsBaseDir . '/_files/' . $listFilePattern);
         if (!empty($listFiles)) {
             foreach ($listFiles as $listFile) {
-                // phpcs:ignore Magento2.Performance.ForeachArrayMerge.ForeachArrayMerge
-                $filesDefinedInList = array_merge(
-                    $filesDefinedInList,
-                    file($listFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)
-                );
+                $filesDefinedInList[] = file($listFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
             }
+
+           $filesDefinedInList = array_merge([], ...$filesDefinedInList);
         } else {
             $filesDefinedInList = call_user_func($noListCallback);
         }

From 46f1c266ec444d13c46ff38e880117a212ece2ec Mon Sep 17 00:00:00 2001
From: Viktor Sevch <viktor.sevch@transoftgroup.com>
Date: Fri, 31 Jul 2020 10:49:13 +0300
Subject: [PATCH 1145/1718] MC-36343: Unnecessary quotes causes invalid HTML in
 tracking.phtml

---
 .../AdminAnalytics/view/adminhtml/templates/tracking.phtml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/AdminAnalytics/view/adminhtml/templates/tracking.phtml b/app/code/Magento/AdminAnalytics/view/adminhtml/templates/tracking.phtml
index 07983e08b97ad..bfe58de1eac5f 100644
--- a/app/code/Magento/AdminAnalytics/view/adminhtml/templates/tracking.phtml
+++ b/app/code/Magento/AdminAnalytics/view/adminhtml/templates/tracking.phtml
@@ -12,7 +12,7 @@
 <?= /* @noEscape */ $secureRenderer->renderTag(
     'script',
     [
-        'src' => '"' . $block->escapeJs($block->getTrackingUrl()) .'"',
+        'src' => $block->getTrackingUrl(),
         'async' => true,
     ],
     '&nbsp;',

From fa784fa7034760d024f0e092044cd1a4025924c0 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <viktor.sevch@transoftgroup.com>
Date: Fri, 31 Jul 2020 10:57:12 +0300
Subject: [PATCH 1146/1718] MC-36260: Unexpected cursor position in the comment
 textarea

---
 .../view/adminhtml/templates/order/invoice/create/items.phtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
index 2d3c517e98daf..2099ef64b76fa 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
@@ -77,8 +77,8 @@
                     </label>
                     <div class="admin__field-control">
                         <textarea id="invoice_comment_text" name="invoice[comment_text]" class="admin__control-textarea"
-                                  rows="3" cols="5"><?= $block->escapeHtml($block->getInvoice()->getCommentText()) ?>
-                        </textarea>
+                                  rows="3" cols="5"><?= $block->escapeHtml($block->getInvoice()->getCommentText())
+                                    ?></textarea>
                     </div>
                 </div>
             </div>

From 9342d4c0e01664a8e155160118ab70f49aeb9225 Mon Sep 17 00:00:00 2001
From: oleksandrkravchuk <oleksandr.kravchuk@vaimo.com>
Date: Fri, 31 Jul 2020 10:03:52 +0200
Subject: [PATCH 1147/1718] community-features#252 Create static test for
 action controllers. Fix static tests.

---
 .../Magento/App/Action/AbstractActionTest.php       | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/Magento/App/Action/AbstractActionTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/Magento/App/Action/AbstractActionTest.php
index ced06dcc4ada6..d109b263b6b84 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/Magento/App/Action/AbstractActionTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/Magento/App/Action/AbstractActionTest.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\Test\Legacy\App\Action;
+namespace Magento\Test\Legacy\Magento\App\Action;
 
 use Exception;
 use Magento\Framework\App\Action\AbstractAction;
@@ -41,9 +41,8 @@ protected function setUp(): void
     }
 
     /**
-     * Test new
-     *
-    */
+     * Test newly created controllers do not extend deprecated AbstractAction.
+     */
     public function testNewControllersDoNotExtendAbstractAction(): void
     {
         $files = $this->getTestFiles();
@@ -121,25 +120,21 @@ private static function getFilesFromListFile(
         callable $noListCallback
     ): array {
         $filesDefinedInList = [];
-
         $listFiles = glob($listsBaseDir . '/_files/' . $listFilePattern);
         if (!empty($listFiles)) {
             foreach ($listFiles as $listFile) {
                 $filesDefinedInList[] = file($listFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
             }
-
-           $filesDefinedInList = array_merge([], ...$filesDefinedInList);
+            $filesDefinedInList = array_merge([], ...$filesDefinedInList);
         } else {
             $filesDefinedInList = call_user_func($noListCallback);
         }
-
         array_walk(
             $filesDefinedInList,
             function (&$file) {
                 $file = BP . '/' . $file;
             }
         );
-
         $filesDefinedInList = array_values(array_unique($filesDefinedInList));
 
         return $filesDefinedInList;

From c18945e7d43eaa57e303feb1b4ea4cc24b05e3c7 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <viktor.sevch@transoftgroup.com>
Date: Fri, 31 Jul 2020 11:10:20 +0300
Subject: [PATCH 1148/1718] =?UTF-8?q?MC-35296:=20Refresh=20buttons=20of=20?=
 =?UTF-8?q?=E2=80=9CCustomer's=20Activities=E2=80=9D=20dont=20work?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adminhtml/templates/order/create/sidebar/items.phtml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
index df9ee09fa1a4d..fcf5a772bccc0 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
@@ -6,6 +6,9 @@
 
 /* @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+
+$blockDataId = $block->getDataId();
+$jsEscapedBlockDataId = $block->escapeJs($blockDataId);
 ?>
 <div class="create-order-sidebar-block" id="sidebar_data_<?= $block->escapeHtmlAttr($block->getDataId()) ?>">
     <div class="head sidebar-title-block">
@@ -19,9 +22,9 @@
     </div>
     <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
         'onclick',
-        "order.loadArea('sidebar_" . $block->escapeJs($block->getDataId()) .
-        "', 'sidebar_data_" . $block->escapeJs($block->getDataId()) . "');event.preventDefault();",
-        'div#sidebar_data_'. $block->escapeJs($block->getDataId()) . ' div.head.sidebar-title-block'
+        "order.loadArea('sidebar_" . $jsEscapedBlockDataId .
+        "', 'sidebar_data_" . $jsEscapedBlockDataId . "');event.preventDefault();",
+        'div#sidebar_data_'. $jsEscapedBlockDataId . ' a.action-refresh'
     ) ?>
     <div class="content">
         <div class="auto-scroll">

From 3c9ed6e3352eec373455d5f93f655f28a5d6b4d9 Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Fri, 31 Jul 2020 12:03:50 +0300
Subject: [PATCH 1149/1718] MC-36231: setup:static-content:deploy exits with
 success exit code even if not all themes are deployed

---
 app/code/Magento/Deploy/Process/Queue.php     | 48 ++++++++------
 .../Deploy/Process/TimeoutException.php       | 15 +++++
 .../Command/DeployStaticContentCommand.php    | 63 ++++++++++++-------
 .../DeployStaticContentCommandTest.php        | 44 +++++++++++--
 4 files changed, 124 insertions(+), 46 deletions(-)
 create mode 100644 app/code/Magento/Deploy/Process/TimeoutException.php

diff --git a/app/code/Magento/Deploy/Process/Queue.php b/app/code/Magento/Deploy/Process/Queue.php
index 6c8db345187cc..35d85c390b9c4 100644
--- a/app/code/Magento/Deploy/Process/Queue.php
+++ b/app/code/Magento/Deploy/Process/Queue.php
@@ -29,7 +29,7 @@ class Queue
     /**
      * Default max execution time
      */
-    const DEFAULT_MAX_EXEC_TIME = 400;
+    const DEFAULT_MAX_EXEC_TIME = 900;
 
     /**
      * @var array
@@ -96,6 +96,11 @@ class Queue
      */
     private $lastJobStarted = 0;
 
+    /**
+     * @var int
+     */
+    private $logDelay;
+
     /**
      * @param AppState $appState
      * @param LocaleResolver $localeResolver
@@ -157,11 +162,12 @@ public function getPackages()
      * Process jobs
      *
      * @return int
+     * @throws TimeoutException
      */
     public function process()
     {
         $returnStatus = 0;
-        $logDelay = 10;
+        $this->logDelay = 10;
         $this->start = $this->lastJobStarted = time();
         $packages = $this->packages;
         while (count($packages) && $this->checkTimeout()) {
@@ -170,13 +176,7 @@ public function process()
                 $this->assertAndExecute($name, $packages, $packageJob);
             }
 
-            // refresh current status in console once in 10 iterations (once in 5 sec)
-            if ($logDelay >= 10) {
-                $this->logger->info('.');
-                $logDelay = 0;
-            } else {
-                $logDelay++;
-            }
+            $this->refreshStatus();
 
             if ($this->isCanBeParalleled()) {
                 // in parallel mode sleep before trying to check status and run new jobs
@@ -193,9 +193,28 @@ public function process()
 
         $this->awaitForAllProcesses();
 
+        if (!empty($packages)) {
+            throw new TimeoutException('Not all packages are deployed.');
+        }
+
         return $returnStatus;
     }
 
+    /**
+     * Refresh current status in console once in 10 iterations (once in 5 sec)
+     *
+     * @return void
+     */
+    private function refreshStatus(): void
+    {
+        if ($this->logDelay >= 10) {
+            $this->logger->info('.');
+            $this->logDelay = 0;
+        } else {
+            $this->logDelay++;
+        }
+    }
+
     /**
      * Check that all depended packages deployed and execute
      *
@@ -204,7 +223,7 @@ public function process()
      * @param array $packageJob
      * @return void
      */
-    private function assertAndExecute($name, array & $packages, array $packageJob)
+    private function assertAndExecute($name, array &$packages, array $packageJob)
     {
         /** @var Package $package */
         $package = $packageJob['package'];
@@ -256,7 +275,6 @@ private function executePackage(Package $package, string $name, array &$packages
      */
     private function awaitForAllProcesses()
     {
-        $logDelay = 10;
         while ($this->inProgress && $this->checkTimeout()) {
             foreach ($this->inProgress as $name => $package) {
                 if ($this->isDeployed($package)) {
@@ -264,13 +282,7 @@ private function awaitForAllProcesses()
                 }
             }
 
-            // refresh current status in console once in 10 iterations (once in 5 sec)
-            if ($logDelay >= 10) {
-                $this->logger->info('.');
-                $logDelay = 0;
-            } else {
-                $logDelay++;
-            }
+            $this->refreshStatus();
 
             // sleep before checking parallel jobs status
             // phpcs:ignore Magento2.Functions.DiscouragedFunction
diff --git a/app/code/Magento/Deploy/Process/TimeoutException.php b/app/code/Magento/Deploy/Process/TimeoutException.php
new file mode 100644
index 0000000000000..2d8eb3ab2aad2
--- /dev/null
+++ b/app/code/Magento/Deploy/Process/TimeoutException.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Deploy\Process;
+
+/**
+ * Exception is thrown if deploy process is finished due to timeout.
+ */
+class TimeoutException extends \RuntimeException
+{
+}
diff --git a/setup/src/Magento/Setup/Console/Command/DeployStaticContentCommand.php b/setup/src/Magento/Setup/Console/Command/DeployStaticContentCommand.php
index c6facffb7c653..1afdd86cdff3f 100644
--- a/setup/src/Magento/Setup/Console/Command/DeployStaticContentCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/DeployStaticContentCommand.php
@@ -9,6 +9,8 @@
 use Magento\Deploy\Console\ConsoleLoggerFactory;
 use Magento\Deploy\Console\DeployStaticOptions as Options;
 use Magento\Framework\App\State;
+use Magento\Framework\Console\Cli;
+use Psr\Log\LogLevel;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -55,16 +57,16 @@ class DeployStaticContentCommand extends Command
     private $objectManager;
 
     /**
-     * @var \Magento\Framework\App\State
+     * @var State
      */
     private $appState;
 
     /**
      * StaticContentCommand constructor
      *
-     * @param InputValidator        $inputValidator
-     * @param ConsoleLoggerFactory  $consoleLoggerFactory
-     * @param Options               $options
+     * @param InputValidator $inputValidator
+     * @param ConsoleLoggerFactory $consoleLoggerFactory
+     * @param Options $options
      * @param ObjectManagerProvider $objectManagerProvider
      */
     public function __construct(
@@ -107,18 +109,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $time = microtime(true);
 
-        if (!$input->getOption(Options::FORCE_RUN) && $this->getAppState()->getMode() !== State::MODE_PRODUCTION) {
-            throw new LocalizedException(
-                __(
-                    'NOTE: Manual static content deployment is not required in "default" and "developer" modes.'
-                    . PHP_EOL . 'In "default" and "developer" modes static contents are being deployed '
-                    . 'automatically on demand.'
-                    . PHP_EOL . 'If you still want to deploy in these modes, use -f option: '
-                    . "'bin/magento setup:static-content:deploy -f'"
-                )
-            );
-        }
-
+        $this->checkAppMode($input);
         $this->inputValidator->validate($input);
 
         $options = $input->getOptions();
@@ -136,18 +127,44 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $this->mockCache();
 
-        /** @var DeployStaticContent $deployService */
-        $deployService = $this->objectManager->create(DeployStaticContent::class, [
-            'logger' => $logger
-        ]);
-
-        $deployService->deploy($options);
+        $exitCode = Cli::RETURN_SUCCESS;
+        try {
+            /** @var DeployStaticContent $deployService */
+            $deployService = $this->objectManager->create(DeployStaticContent::class, [
+                'logger' => $logger
+            ]);
+            $deployService->deploy($options);
+        } catch (\Throwable $e) {
+            $logger->error('Error happened during deploy process: ' . $e->getMessage());
+            $exitCode = Cli::RETURN_FAILURE;
+        }
 
         if (!$refreshOnly) {
             $logger->notice(PHP_EOL . "Execution time: " . (microtime(true) - $time));
         }
 
-        return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
+        return $exitCode;
+    }
+
+    /**
+     * Check application mode
+     *
+     * @param InputInterface $input
+     * @throws LocalizedException
+     */
+    private function checkAppMode(InputInterface $input): void
+    {
+        if (!$input->getOption(Options::FORCE_RUN) && $this->getAppState()->getMode() !== State::MODE_PRODUCTION) {
+            throw new LocalizedException(
+                __(
+                    'NOTE: Manual static content deployment is not required in "default" and "developer" modes.'
+                    . PHP_EOL . 'In "default" and "developer" modes static contents are being deployed '
+                    . 'automatically on demand.'
+                    . PHP_EOL . 'If you still want to deploy in these modes, use -f option: '
+                    . "'bin/magento setup:static-content:deploy -f'"
+                )
+            );
+        }
     }
 
     /**
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/Command/DeployStaticContentCommandTest.php b/setup/src/Magento/Setup/Test/Unit/Console/Command/DeployStaticContentCommandTest.php
index f01c99ccc336f..f205f255abb2a 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/Command/DeployStaticContentCommandTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/Command/DeployStaticContentCommandTest.php
@@ -10,21 +10,24 @@
 use Magento\Deploy\Console\ConsoleLogger;
 use Magento\Deploy\Console\ConsoleLoggerFactory;
 use Magento\Deploy\Console\DeployStaticOptions;
-
 use Magento\Deploy\Console\InputValidator;
+use Magento\Deploy\Process\TimeoutException;
 use Magento\Deploy\Service\DeployStaticContent;
 use Magento\Framework\App\State;
+use Magento\Framework\Console\Cli;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-
 use Magento\Setup\Console\Command\DeployStaticContentCommand;
 use Magento\Setup\Model\ObjectManagerProvider;
 use PHPUnit\Framework\MockObject\MockObject as Mock;
-
 use PHPUnit\Framework\TestCase;
-
 use Symfony\Component\Console\Tester\CommandTester;
 
+/**
+ * Test for static content deploy command
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class DeployStaticContentCommandTest extends TestCase
 {
     /**
@@ -111,7 +114,8 @@ public function testExecute($input)
         $this->deployService->expects($this->once())->method('deploy');
 
         $tester = new CommandTester($this->command);
-        $tester->execute($input);
+        $exitCode = $tester->execute($input);
+        $this->assertEquals(Cli::RETURN_SUCCESS, $exitCode);
     }
 
     /**
@@ -129,6 +133,36 @@ public function executeDataProvider()
         ];
     }
 
+    /**
+     * @return void
+     */
+    public function testExecuteWithError()
+    {
+        $this->appState->expects($this->once())
+            ->method('getMode')
+            ->willReturn(State::MODE_PRODUCTION);
+
+        $this->inputValidator->expects($this->once())
+            ->method('validate');
+
+        $this->consoleLoggerFactory->expects($this->once())
+            ->method('getLogger')
+            ->willReturn($this->logger);
+        $this->logger->expects($this->once())
+            ->method('error');
+
+        $this->objectManager->expects($this->once())
+            ->method('create')
+            ->willReturn($this->deployService);
+        $this->deployService->expects($this->once())
+            ->method('deploy')
+            ->willThrowException(new TimeoutException());
+
+        $tester = new CommandTester($this->command);
+        $exitCode = $tester->execute([]);
+        $this->assertEquals(Cli::RETURN_FAILURE, $exitCode);
+    }
+
     /**
      * @param string $mode
      * @return void

From 5983e1733d56b1b2f15fb4f0e64094a3a4f3145d Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Fri, 31 Jul 2020 12:05:04 +0300
Subject: [PATCH 1150/1718] MC-36096: [Cloud] Local cache storage is not
 retained for the expected period.

---
 .../Customer/view/frontend/web/js/customer-data.js    | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 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 81b0868ede624..5c9bf431bac1d 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
@@ -30,9 +30,6 @@ define([
     url.setBaseUrl(window.BASE_URL);
     options.sectionLoadUrl = url.build('customer/section/load');
 
-    storage = $.initNamespaceStorage('mage-cache-storage').localStorage;
-    storageInvalidation = $.initNamespaceStorage('mage-cache-storage-section-invalidation').localStorage;
-
     /**
      * @param {Object} invalidateOptions
      */
@@ -214,11 +211,18 @@ define([
                 this.reload(sectionConfig.getSectionNames(), true);
                 $.cookieStorage.set('section_data_clean', '');
             }
+        },
 
+        /**
+         * Storage init
+         */
+        initStorage: function () {
             $.cookieStorage.setConf({
                 path: '/',
                 expires: new Date(Date.now() + parseInt(options.cookieLifeTime, 10) * 1000)
             });
+            storage = $.initNamespaceStorage('mage-cache-storage').localStorage;
+            storageInvalidation = $.initNamespaceStorage('mage-cache-storage-section-invalidation').localStorage;
         },
 
         /**
@@ -356,6 +360,7 @@ define([
          */
         'Magento_Customer/js/customer-data': function (settings) {
             options = settings;
+            customerData.initStorage();
             invalidateCacheBySessionTimeOut(settings);
             invalidateCacheByCloseCookieSession();
             customerData.init();

From 7d70c6077abb15fa5d75ab24638474b0ae2c0a56 Mon Sep 17 00:00:00 2001
From: SmVladyslav <vlatame.tsg@gmail.com>
Date: Fri, 31 Jul 2020 12:08:06 +0300
Subject: [PATCH 1151/1718] MC-31304: [ElasticSearch] Exception on catalog
 search result page

---
 .../Model/Adapter/Elasticsearch.php            |  7 +++----
 .../Product/FieldProvider/StaticField.php      |  8 ++++----
 .../Plugin/Category/Product/Attribute.php      |  2 +-
 .../Product/FieldProvider/StaticFieldTest.php  |  4 ++--
 .../Plugin/Category/Product/AttributeTest.php  | 18 ++++++++++++------
 .../Catalog/_files/category_attribute.php      |  7 ++++---
 .../_files/category_attribute_rollback.php     | 12 +++++++-----
 7 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php b/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
index 4f8173a17798a..25e691972d81d 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
@@ -387,7 +387,6 @@ public function updateIndexMapping(int $storeId, string $mappedIndexerId, string
             return $this;
         }
 
-        /** @var ProductAttributeInterface $attribute */
         $attribute = $this->productAttributeRepository->get($attributeCode);
         $newAttributeMapping = $this->staticFieldProvider->getField($attribute);
         $mappedAttributes = $this->getMappedAttributes($indexName);
@@ -410,7 +409,7 @@ public function updateIndexMapping(int $storeId, string $mappedIndexerId, string
     }
 
     /**
-     * Retrieve index definition from cache.
+     * Retrieve index definition from class.
      *
      * @param int $storeId
      * @param string $mappedIndexerId
@@ -427,7 +426,7 @@ private function getIndexFromAlias(int $storeId, string $mappedIndexerId): strin
     }
 
     /**
-     * Retrieve mapped attributes from cache.
+     * Retrieve mapped attributes from class.
      *
      * @param string $indexName
      * @return array
@@ -444,7 +443,7 @@ private function getMappedAttributes(string $indexName): array
     }
 
     /**
-     * Set mapped attributes to cache.
+     * Set mapped attributes to class.
      *
      * @param string $indexName
      * @param array $mappedAttributes
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 c35fe2d030e23..bc031fc988fb0 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
@@ -7,8 +7,9 @@
 
 namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider;
 
-use Magento\Eav\Model\Config;
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Eav\Model\Config;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ConverterInterface
     as IndexTypeConverterInterface;
@@ -105,7 +106,6 @@ public function __construct(
      */
     public function getFields(array $context = []): array
     {
-        /** @var ProductAttributeInterface[] $attributes */
         $attributes = $this->eavConfig->getEntityAttributes(ProductAttributeInterface::ENTITY_TYPE_CODE);
         $allAttributes = [];
 
@@ -124,10 +124,10 @@ public function getFields(array $context = []): array
     /**
      * Get field mapping for specific attribute.
      *
-     * @param ProductAttributeInterface $attribute
+     * @param AbstractAttribute $attribute
      * @return array
      */
-    public function getField(ProductAttributeInterface $attribute): array
+    public function getField(AbstractAttribute $attribute): array
     {
         $fieldMapping = [];
         if (in_array($attribute->getAttributeCode(), $this->excludedAttributes, true)) {
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 211c5f563c5d8..53f036a3b8e38 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
@@ -102,7 +102,7 @@ public function afterSave(
     }
 
     /**
-     * Check if mapping needs to be updated (attribute is new).
+     * Set class variables before saving attribute.
      *
      * @param AttributeResourceModel $subject
      * @param AbstractModel $attribute
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/StaticFieldTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/StaticFieldTest.php
index 99b157ee24fe5..d41a71dd6d994 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/StaticFieldTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/StaticFieldTest.php
@@ -7,8 +7,8 @@
 
 namespace Magento\Elasticsearch\Test\Unit\Model\Adapter\FieldMapper\Product\FieldProvider;
 
-use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Eav\Model\Config;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter;
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ConverterInterface
@@ -184,7 +184,7 @@ function ($attributeMock, $context) use ($fieldName, $compositeFieldName, $sortF
                 }
             );
 
-        $productAttributeMock = $this->getMockBuilder(ProductAttributeInterface::class)
+        $productAttributeMock = $this->getMockBuilder(AbstractAttribute::class)
             ->setMethods(['getAttributeCode'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Category/Product/AttributeTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Category/Product/AttributeTest.php
index 71efdf1d4d38a..801c7ca3be216 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Category/Product/AttributeTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Category/Product/AttributeTest.php
@@ -88,13 +88,19 @@ protected function setUp(): void
      */
     public function testAfterSave(bool $isNewObject, bool $isElasticsearchEnabled, array $dimensions): void
     {
-        /** @var AttributeModel $attribute */
-        $attribute = (new ObjectManager($this))->getObject(AttributeModel::class);
-        $attribute->isObjectNew($isNewObject);
-        $attribute->setAttributeCode('example_attribute_code');
+        /** @var AttributeModel|MockObject $attributeMock */
+        $attributeMock = $this->createMock(AttributeModel::class);
+        $attributeMock->expects($this->once())
+            ->method('isObjectNew')
+            ->willReturn($isNewObject);
+
+        $attributeMock->expects($this->once())
+            ->method('getAttributeCode')
+            ->willReturn('example_attribute_code');
+
         /** @var AttributeResourceModel|MockObject $subjectMock */
         $subjectMock = $this->createMock(AttributeResourceModel::class);
-        $this->attributePlugin->beforeSave($subjectMock, $attribute);
+        $this->attributePlugin->beforeSave($subjectMock, $attributeMock);
 
         $indexerData = ['indexer_example_data'];
 
@@ -133,7 +139,7 @@ public function testAfterSave(bool $isNewObject, bool $isElasticsearchEnabled, a
             ->method('getIterator')
             ->willReturn(new ArrayIterator($dimensions));
 
-        $this->attributePlugin->afterSave($subjectMock, $subjectMock);
+        $this->assertEquals($subjectMock, $this->attributePlugin->afterSave($subjectMock, $subjectMock));
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_attribute.php
index 286ca456f406f..31a6e6ee85b2a 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_attribute.php
@@ -6,11 +6,12 @@
 
 /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
 
-use Magento\Catalog\Model\Category\Attribute;
+use Magento\Catalog\Model\Category\AttributeFactory;
 use Magento\TestFramework\Helper\Bootstrap;
 
-$attribute = Bootstrap::getObjectManager()
-    ->create(Attribute::class);
+/** @var AttributeFactory $attributeFactory */
+$attributeFactory = Bootstrap::getObjectManager()->get(AttributeFactory::class);
+$attribute = $attributeFactory->create();
 $attribute->setAttributeCode('test_attribute_code_666')
     ->setEntityTypeId(3)
     ->setIsGlobal(1)
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_attribute_rollback.php
index 580f989fecc6d..2cae71c35b916 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_attribute_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_attribute_rollback.php
@@ -6,18 +6,20 @@
 
 /** @var Registry $registry */
 
-use Magento\Catalog\Model\Category\Attribute;
+use Magento\Catalog\Model\Category\AttributeFactory;
 use Magento\Framework\Registry;
 use Magento\TestFramework\Helper\Bootstrap;
 
-$registry = Bootstrap::getObjectManager()->get(Registry::class);
+$objectManager = Bootstrap::getObjectManager();
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
 
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 
-/** @var Attribute $attribute */
-$attribute = Bootstrap::getObjectManager()
-    ->create(Attribute::class);
+/** @var AttributeFactory $attributeFactory */
+$attributeFactory = $objectManager->get(AttributeFactory::class);
+$attribute = $attributeFactory->create();
 
 $attribute->loadByCode(3, 'test_attribute_code_666');
 

From 8195b0c1ff66189ad50f7b25c5724f2bff36d365 Mon Sep 17 00:00:00 2001
From: oleksandrkravchuk <oleksandr.kravchuk@vaimo.com>
Date: Fri, 31 Jul 2020 12:04:40 +0200
Subject: [PATCH 1152/1718] community-features#252 Create static test for
 action controllers. Fix static tests.

---
 .../Magento/{ => Framework}/App/Action/AbstractActionTest.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename dev/tests/static/testsuite/Magento/Test/Legacy/Magento/{ => Framework}/App/Action/AbstractActionTest.php (98%)

diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/Magento/App/Action/AbstractActionTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/Magento/Framework/App/Action/AbstractActionTest.php
similarity index 98%
rename from dev/tests/static/testsuite/Magento/Test/Legacy/Magento/App/Action/AbstractActionTest.php
rename to dev/tests/static/testsuite/Magento/Test/Legacy/Magento/Framework/App/Action/AbstractActionTest.php
index d109b263b6b84..d5427752004d9 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/Magento/App/Action/AbstractActionTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/Magento/Framework/App/Action/AbstractActionTest.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\Test\Legacy\Magento\App\Action;
+namespace Magento\Test\Legacy\Magento\Framework\App\Action;
 
 use Exception;
 use Magento\Framework\App\Action\AbstractAction;

From cc3a54d87a6b493f2f088586ac9c8ed645e8485d Mon Sep 17 00:00:00 2001
From: DianaRusin <rusind95@gmail.com>
Date: Fri, 31 Jul 2020 13:43:07 +0300
Subject: [PATCH 1153/1718] MC-36044: There are no 'Add Products By SKU' and
 'Add Products' buttons on Create New Order page

---
 .../adminhtml/web/order/create/scripts.js     | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

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 0c7c6621f58de..10895ce2ab871 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
@@ -56,7 +56,7 @@ define([
                 }
             });
 
-            jQuery.async('#order-items', (function () {
+            jQuery.async('#order-items .admin__page-section-title', (function () {
                 this.dataArea = new OrderFormArea('data', $(this.getAreaId('data')), this);
                 this.itemsArea = Object.extend(new OrderFormArea('items', $(this.getAreaId('items')), this), {
                     addControlButton: function (button) {
@@ -84,22 +84,21 @@ define([
                     }, 10);
                 };
 
-                if (jQuery('#' + this.getAreaId('items')).ready()) {
-                    this.dataArea.onLoad = this.dataArea.onLoad.wrap(function (proceed) {
-                        proceed();
-                        this._parent.itemsArea.setNode($(this._parent.getAreaId('items')));
-                        this._parent.itemsArea.onLoad();
-                    });
+                this.dataArea.onLoad = this.dataArea.onLoad.wrap(function (proceed) {
+                    proceed();
+                    this._parent.itemsArea.setNode($(this._parent.getAreaId('items')));
+                    this._parent.itemsArea.onLoad();
+                });
+
+                this.itemsArea.onLoad = this.itemsArea.onLoad.wrap(function (proceed) {
+                    proceed();
+                    if ($(searchAreaId) && !jQuery('#' + searchAreaId).is(':visible') && !$(searchButtonId)) {
+                        this.addControlButton(searchButton);
+                    }
+                });
+                this.areasLoaded();
+                this.itemsArea.onLoad();
 
-                    this.itemsArea.onLoad = this.itemsArea.onLoad.wrap(function (proceed) {
-                        proceed();
-                        if ($(searchAreaId) && !jQuery('#' + searchAreaId).is(':visible') && !$(searchButtonId)) {
-                            this.addControlButton(searchButton);
-                        }
-                    });
-                    this.areasLoaded();
-                    this.itemsArea.onLoad();
-                }
             }).bind(this));
 
             jQuery('#edit_form')

From 35ba43a59904de38cda1cff2635796fac8df98a5 Mon Sep 17 00:00:00 2001
From: DianaRusin <rusind95@gmail.com>
Date: Fri, 31 Jul 2020 14:12:52 +0300
Subject: [PATCH 1154/1718] MC-33747: [MFTF] Flaky
 StorefrontButtonsInlineTranslationTest

---
 ...torefrontButtonsInlineTranslationOnProductPageTest.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/code/Magento/Translation/Test/Mftf/Test/StorefrontButtonsInlineTranslationOnProductPageTest.xml b/app/code/Magento/Translation/Test/Mftf/Test/StorefrontButtonsInlineTranslationOnProductPageTest.xml
index 0023d4ec757c9..f3103c4bea51c 100644
--- a/app/code/Magento/Translation/Test/Mftf/Test/StorefrontButtonsInlineTranslationOnProductPageTest.xml
+++ b/app/code/Magento/Translation/Test/Mftf/Test/StorefrontButtonsInlineTranslationOnProductPageTest.xml
@@ -24,20 +24,14 @@
         <before>
             <!-- Enable Translate Inline For Storefront -->
             <magentoCLI command="config:set {{EnableTranslateInlineForStorefront.path}} {{EnableTranslateInlineForStorefront.value}}" stepKey="enableTranslateInlineForStorefront"/>
-            <!-- Create Category -->
-            <createData entity="ApiCategory" stepKey="createCategory"/>
             <!-- Create Simple Product -->
-            <createData entity="ApiSimpleProduct" stepKey="createProduct">
-                <requiredEntity createDataKey="createCategory"/>
-            </createData>
+            <createData entity="SimpleProduct2" stepKey="createProduct"/>
         </before>
         <after>
             <!-- Disable Translate Inline For Storefront -->
             <magentoCLI command="config:set {{DisableTranslateInlineForStorefront.path}} {{DisableTranslateInlineForStorefront.value}}" stepKey="disableTranslateInlineForStorefront"/>
             <!-- Delete Simple Product -->
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-            <!-- Delete Category -->
-            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
         </after>
 
         <!-- Add product to cart on storefront -->

From 03c1d52f49f3e6198273eaeb345f8e579b2b95b2 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <viktor.sevch@transoftgroup.com>
Date: Fri, 31 Jul 2020 14:53:57 +0300
Subject: [PATCH 1155/1718] =?UTF-8?q?MC-35296:=20Refresh=20buttons=20of=20?=
 =?UTF-8?q?=E2=80=9CCustomer's=20Activities=E2=80=9D=20dont=20work?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/order/create/sidebar/items.phtml      | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
index fcf5a772bccc0..9b5bffcf01eef 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
@@ -10,7 +10,7 @@
 $blockDataId = $block->getDataId();
 $jsEscapedBlockDataId = $block->escapeJs($blockDataId);
 ?>
-<div class="create-order-sidebar-block" id="sidebar_data_<?= $block->escapeHtmlAttr($block->getDataId()) ?>">
+<div class="create-order-sidebar-block" id="sidebar_data_<?= $block->escapeHtmlAttr($blockDataId) ?>">
     <div class="head sidebar-title-block">
         <a href="#" class="action-refresh" title="<?= $block->escapeHtml(__('Refresh')) ?>">
             <span><?= $block->escapeHtml(__('Refresh')) ?></span>
@@ -22,8 +22,11 @@ $jsEscapedBlockDataId = $block->escapeJs($blockDataId);
     </div>
     <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
         'onclick',
-        "order.loadArea('sidebar_" . $jsEscapedBlockDataId .
-        "', 'sidebar_data_" . $jsEscapedBlockDataId . "');event.preventDefault();",
+        "order.loadArea(
+            'sidebar_" . $jsEscapedBlockDataId ."',
+            'sidebar_data_" . $jsEscapedBlockDataId . "'
+        );
+        event.preventDefault();",
         'div#sidebar_data_'. $jsEscapedBlockDataId . ' a.action-refresh'
     ) ?>
     <div class="content">
@@ -86,7 +89,7 @@ $jsEscapedBlockDataId = $block->escapeJs($blockDataId);
                                            type="checkbox"
                                            class="admin__control-checkbox"
                                            name="sidebar[remove][<?= (int) $block->getItemId($_item) ?>]"
-                                           value="<?= $block->escapeHtmlAttr($block->getDataId()) ?>"
+                                           value="<?= $block->escapeHtmlAttr($blockDataId) ?>"
                                            title="<?= $block->escapeHtml(__('Remove')) ?>" />
                                     <label class="admin__field-label"
                                            for="sidebar-remove-<?=
@@ -100,7 +103,7 @@ $jsEscapedBlockDataId = $block->escapeJs($blockDataId);
                         <td class="col-add">
                             <div class="admin__field-option">
                                 <?php if ($block->isConfigurationRequired($_item->getTypeId()) &&
-                                    $block->getDataId() == 'wishlist'): ?>
+                                    $blockDataId == 'wishlist'): ?>
                                     <a href="#"
                                        class="icon icon-configure"
                                        title="<?= $block->escapeHtml(__('Configure and Add to Order')) ?>">

From f1509b111b965719c5e3e2fe44a88aabd39ba2ac Mon Sep 17 00:00:00 2001
From: Andrii Kalinich <51681435+engcom-Echo@users.noreply.github.com>
Date: Fri, 31 Jul 2020 15:20:58 +0300
Subject: [PATCH 1156/1718] add testCaseId

---
 .../Test/Mftf/Test/AdminNewSearchSynonymsFormResetTest.xml       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Search/Test/Mftf/Test/AdminNewSearchSynonymsFormResetTest.xml b/app/code/Magento/Search/Test/Mftf/Test/AdminNewSearchSynonymsFormResetTest.xml
index c296435dde815..24a5bf16704ff 100644
--- a/app/code/Magento/Search/Test/Mftf/Test/AdminNewSearchSynonymsFormResetTest.xml
+++ b/app/code/Magento/Search/Test/Mftf/Test/AdminNewSearchSynonymsFormResetTest.xml
@@ -14,6 +14,7 @@
             <stories value="Reset new search synonyms group form"/>
             <title value="Admin reset new search synonyms group form"/>
             <description value="When admin users reset button on new search synonyms form all fields should be set to default values"/>
+            <testCaseId value="MC-36382"/>
             <severity value="AVERAGE"/>
             <group value="Search"/>
         </annotations>

From 50cfd4cd9b963a36a502f6b28cf0c273cd37e97e Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Fri, 31 Jul 2020 16:05:40 +0300
Subject: [PATCH 1157/1718] MC-35458: Config fields changes

---
 .../Config/Block/System/Config/Form/Fieldset.php | 16 ++++++++++++++++
 1 file changed, 16 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..c70b91d2adf3b 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,14 @@ protected function _getChildrenElementsHtml(AbstractElement $element)
                     . '<td colspan="4">' . $field->toHtml() . '</td></tr>';
             } else {
                 $elements .= $field->toHtml();
+                $styleTag = '';
+                if (!empty($field->getFieldConfig()['depends']['fields'])) {
+                    $styleTag .= $this->secureRenderer->renderStyleAsTag(
+                        'display: none;',
+                        '#row_' . $field->getHtmlId()
+                    );
+                }
+                $elements .= $styleTag;
             }
         }
 
@@ -168,11 +176,19 @@ protected function _getFrontendClass($element)
      */
     protected function _getHeaderTitleHtml($element)
     {
+        $styleTag = '';
+        if (!empty($element->getGroup()['depends']['fields'])) {
+            $styleTag .= $this->secureRenderer->renderStyleAsTag(
+                'display: none;',
+                '#' . $element->getHtmlId() . '-head'
+            );
+        }
         return '<a id="' .
             $element->getHtmlId() .
             '-head" href="#' .
             $element->getHtmlId() .
             '-link">' . $element->getLegend() . '</a>' .
+            $styleTag .
             /* @noEscape */ $this->secureRenderer->renderEventListenerAsTag(
                 'onclick',
                 'event.preventDefault();' .

From 460ca11318cfd07062d2bb9f0b07d11448b43302 Mon Sep 17 00:00:00 2001
From: Vadim Malesh <51680850+engcom-Charlie@users.noreply.github.com>
Date: Fri, 31 Jul 2020 16:06:38 +0300
Subject: [PATCH 1158/1718] add testCaseId

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

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNonExistentCustomerGroupTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNonExistentCustomerGroupTest.xml
index 13f82a4b72417..92dad56e81135 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNonExistentCustomerGroupTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNonExistentCustomerGroupTest.xml
@@ -15,6 +15,7 @@
             <title value="OnePageCheckout as a customer with non-existent customer group assigned to the quote"/>
             <description value="Checkout as a customer with non-existent customer group assigned to the quote"/>
             <severity value="AVERAGE"/>
+            <testCaseId value="MC-36385"/>
             <group value="checkout"/>
         </annotations>
         <before>

From e6aca3b93d6b56357f70b92c47d521acc88102f5 Mon Sep 17 00:00:00 2001
From: zhartaunik <zhartaunik@gmail.com>
Date: Fri, 31 Jul 2020 16:09:35 +0300
Subject: [PATCH 1159/1718] Test scenario for "Apply shopping cart rule to a
 single bundle item" (#28921)

---
 .../CartPriceRuleForBundleProductTest.xml     | 157 ++++++++++++++++++
 1 file changed, 157 insertions(+)
 create mode 100644 app/code/Magento/SalesRule/Test/Mftf/Test/CartPriceRuleForBundleProductTest.xml

diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/CartPriceRuleForBundleProductTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/CartPriceRuleForBundleProductTest.xml
new file mode 100644
index 0000000000000..101c72b78078a
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/CartPriceRuleForBundleProductTest.xml
@@ -0,0 +1,157 @@
+<?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="CartPriceRuleForBundleProductTest">
+        <annotations>
+            <features value="SalesRule"/>
+            <stories value="MAGETWO-28921 - Cart Price Rule for bundle products"/>
+            <title value="Checking Cart Price Rule for bundle products"/>
+            <description value="Checking Cart Price Rule for bundle products"/>
+            <severity value="BLOCKER"/>
+            <testCaseId value="MAGETWO-28921"/>
+            <group value="SalesRule"/>
+        </annotations>
+
+        <before>
+            <!--Create 4 simple products-->
+            <createData entity="SimpleProduct2" stepKey="simpleProduct1">
+                <field key="price">5.00</field>
+            </createData>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct2">
+                <field key="price">3.00</field>
+            </createData>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct3">
+                <field key="price">7.00</field>
+            </createData>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct4">
+                <field key="price">18.00</field>
+            </createData>
+
+            <!-- Create the bundle product based -->
+            <createData entity="ApiBundleProduct" stepKey="createBundleProduct" />
+            <createData entity="CheckboxOption" stepKey="createBundleOption1_1">
+                <requiredEntity createDataKey="createBundleProduct"/>
+            </createData>
+            <createData entity="CheckboxOption" stepKey="createBundleOption1_2">
+                <requiredEntity createDataKey="createBundleProduct"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct">
+                <requiredEntity createDataKey="createBundleProduct"/>
+                <requiredEntity createDataKey="createBundleOption1_1"/>
+                <requiredEntity createDataKey="simpleProduct1"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct2">
+                <requiredEntity createDataKey="createBundleProduct"/>
+                <requiredEntity createDataKey="createBundleOption1_1"/>
+                <requiredEntity createDataKey="simpleProduct2"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct3">
+                <requiredEntity createDataKey="createBundleProduct"/>
+                <requiredEntity createDataKey="createBundleOption1_2"/>
+                <requiredEntity createDataKey="simpleProduct3"/>
+            </createData>
+            <createData entity="ApiBundleLink" stepKey="linkOptionToProduct4">
+                <requiredEntity createDataKey="createBundleProduct"/>
+                <requiredEntity createDataKey="createBundleOption1_2"/>
+                <requiredEntity createDataKey="simpleProduct4"/>
+            </createData>
+
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+
+            <!-- Make Attribute 'sku' accessible for Promo Rule Conditions -->
+            <actionGroup ref="NavigateToEditProductAttributeActionGroup" stepKey="editSkuAttribute">
+                <argument name="ProductAttribute" value="sku" />
+            </actionGroup>
+            <actionGroup ref="ChangeUseForPromoRuleConditionsProductAttributeActionGroup" stepKey="changeAttributePromoRule">
+                <argument name="option" value="1" />
+            </actionGroup>
+
+            <!-- Reindex invalidated indices after product attribute has been created/deleted -->
+            <magentoCron groups="index" stepKey="reindexInvalidatedIndices" />
+        </before>
+
+        <after>
+            <!-- Delete created SalesRule -->
+            <actionGroup ref="DeleteCartPriceRuleByName" stepKey="DeleteCartPriceRuleByName">
+                <argument name="ruleName" value="{{SimpleSalesRule.name}}"/>
+            </actionGroup>
+
+            <!-- Delete Bundle product and it's children -->
+            <deleteData createDataKey="createBundleProduct" stepKey="createBundleProduct" />
+            <deleteData createDataKey="simpleProduct1" stepKey="simpleProduct1" />
+            <deleteData createDataKey="simpleProduct2" stepKey="simpleProduct2" />
+            <deleteData createDataKey="simpleProduct3" stepKey="simpleProduct3" />
+            <deleteData createDataKey="simpleProduct4" stepKey="simpleProduct4" />
+
+            <!-- Revert Attribute 'sku' to it's default value (not accessible for Promo Rule Conditions) -->
+            <actionGroup ref="NavigateToEditProductAttributeActionGroup" stepKey="editSkuAttribute">
+                <argument name="ProductAttribute" value="sku" />
+            </actionGroup>
+            <actionGroup ref="ChangeUseForPromoRuleConditionsProductAttributeActionGroup" stepKey="changeAttributePromoRule">
+                <argument name="option" value="0" />
+            </actionGroup>
+
+	        <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+
+            <!-- Reindex invalidated indices after product attribute has been created/deleted -->
+            <magentoCron groups="index" stepKey="reindexInvalidatedIndices2" />
+        </after>
+
+        <!-- Create the rule -->
+        <amOnPage url="{{AdminCartPriceRulesPage.url}}" stepKey="amOnCartPriceList"/>
+        <waitForPageLoad stepKey="waitForRulesPage"/>
+        <click selector="{{AdminCartPriceRulesSection.addNewRuleButton}}" stepKey="clickAddNewRule"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.ruleName}}" userInput="{{SimpleSalesRule.name}}" stepKey="fillRuleName"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.websites}}" userInput="Main Website" stepKey="selectWebsites"/>
+        <actionGroup ref="SelectNotLoggedInCustomerGroupActionGroup" stepKey="selectNotLoggedInCustomerGroup"/>
+        <click selector="{{AdminCartPriceRulesFormSection.actionsHeader}}" stepKey="clickToExpandActions"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.discountAmount}}" userInput="10" stepKey="fillDiscountAmount"/>
+        <scrollTo selector="{{AdminCartPriceRulesFormSection.conditions}}" stepKey="ScrollToApplyRuleForConditions"/>
+        <click selector="{{AdminCartPriceRulesFormSection.conditions}}" stepKey="ApplyRuleForConditions"/>
+        <waitForPageLoad stepKey="waitForDropDownOpened"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.childAttribute}}" userInput="SKU" stepKey="selectAttribute"/>
+        <waitForPageLoad stepKey="waitForOperatorOpened"/>
+        <click selector="{{AdminCartPriceRulesFormSection.condition('is')}}" stepKey="clickToChooseCondition"/>
+        <selectOption selector="{{AdminCartPriceRulesFormSection.operator}}" userInput="is one of" stepKey="selectOperator"/>
+        <waitForPageLoad stepKey="waitForOperatorOpened1"/>
+        <click selector="{{AdminCartPriceRulesFormSection.condition('...')}}" stepKey="clickToChooseOption"/>
+        <waitForPageLoad stepKey="waitForConditionOpened2"/>
+        <fillField selector="{{AdminCartPriceRulesFormSection.actionValue}}" userInput="$$simpleProduct1.sku$$" stepKey="fillSkuToFilters"/>
+        <waitForPageLoad stepKey="waitForPageLoaded"/>
+        <click selector="{{AdminCartPriceRulesFormSection.save}}" stepKey="clickSaveButton"/>
+        <see selector="{{AdminCartPriceRulesSection.messages}}" userInput="You saved the rule." stepKey="seeSuccessMessage"/>
+
+        <!-- Add the first product to the cart -->
+        <amOnPage url="$$createBundleProduct.sku$$.html" stepKey="goToProductPage1"/>
+        <waitForPageLoad stepKey="waitForProductPageLoad1"/>
+
+        <!--Click "Customize and Add to Cart" button-->
+        <click selector="{{StorefrontBundledSection.addToCart}}" stepKey="clickCustomize"/>
+
+        <!-- Select two products -->
+        <click stepKey="selectProduct1" selector="{{StorefrontBundledSection.productCheckbox('1','1')}}"/>
+        <click stepKey="selectProduct2" selector="{{StorefrontBundledSection.productCheckbox('2','1')}}"/>
+
+        <!--Click "Add to Cart" button-->
+        <click selector="{{StorefrontBundleProductActionSection.addToCartButton}}" stepKey="clickAddBundleProductToCart"/>
+        <waitForPageLoad time="30" stepKey="waitForAddBundleProductPageLoad"/>
+
+        <!--Click "mini cart" icon-->
+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openCart"/>
+        <waitForPageLoad stepKey="waitForDetailsOpen"/>
+
+        <!--Check all products and Cart Subtotal -->
+        <actionGroup ref="StorefrontCheckCartActionGroup" stepKey="cartAssert" after="waitForDetailsOpen">
+            <argument name="subtotal" value="12.00"/>
+            <argument name="shipping" value="5.00"/>
+            <argument name="shippingMethod" value="Flat Rate - Fixed"/>
+            <argument name="total" value="16.50"/>
+        </actionGroup>
+    </test>
+</tests>

From 06e3c7bcf1d53568292335e3ea1c0a3c2b23cc89 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Fri, 31 Jul 2020 16:11:30 +0200
Subject: [PATCH 1160/1718] Save quote if there are no errors only

---
 app/code/Magento/Quote/Model/Cart/AddProductsToCart.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php b/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
index 26df021e6325b..c80807b93c8b0 100644
--- a/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
+++ b/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
@@ -105,6 +105,7 @@ public function execute(string $maskedCartId, array $cartItems): AddProductsToCa
         foreach ($cartItems as $cartItemPosition => $cartItem) {
             $this->addItemToCart($cart, $cartItem, $cartItemPosition);
         }
+
         if ($cart->getData('has_error')) {
             $errors = $cart->getErrors();
 
@@ -113,7 +114,10 @@ public function execute(string $maskedCartId, array $cartItems): AddProductsToCa
                 $this->addError($error->getText());
             }
         }
-        $this->cartRepository->save($cart);
+
+        if (count($this->errors) === 0) {
+            $this->cartRepository->save($cart);
+        }
 
         return $this->prepareErrorOutput($cart);
     }

From 728e3b70dd4e70af42250240e38b0533c10c3996 Mon Sep 17 00:00:00 2001
From: DianaRusin <rusind95@gmail.com>
Date: Fri, 31 Jul 2020 17:14:17 +0300
Subject: [PATCH 1161/1718] MC-36044: There are no 'Add Products By SKU' and
 'Add Products' buttons on Create New Order page

---
 .../adminhtml/web/order/create/scripts.js     | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

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 10895ce2ab871..bbdd6f8fe8437 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
@@ -56,7 +56,7 @@ define([
                 }
             });
 
-            jQuery.async('#order-items .admin__page-section-title', (function () {
+            jQuery.async('#order-items', (function () {
                 this.dataArea = new OrderFormArea('data', $(this.getAreaId('data')), this);
                 this.itemsArea = Object.extend(new OrderFormArea('items', $(this.getAreaId('items')), this), {
                     addControlButton: function (button) {
@@ -84,20 +84,23 @@ define([
                     }, 10);
                 };
 
-                this.dataArea.onLoad = this.dataArea.onLoad.wrap(function (proceed) {
-                    proceed();
-                    this._parent.itemsArea.setNode($(this._parent.getAreaId('items')));
-                    this._parent.itemsArea.onLoad();
-                });
+                jQuery.async('#order-items .admin__page-section-title', (function () {
+                    this.dataArea.onLoad = this.dataArea.onLoad.wrap(function (proceed) {
+                        proceed();
+                        this._parent.itemsArea.setNode($(this._parent.getAreaId('items')));
+                        this._parent.itemsArea.onLoad();
+                    });
 
-                this.itemsArea.onLoad = this.itemsArea.onLoad.wrap(function (proceed) {
-                    proceed();
-                    if ($(searchAreaId) && !jQuery('#' + searchAreaId).is(':visible') && !$(searchButtonId)) {
-                        this.addControlButton(searchButton);
-                    }
-                });
-                this.areasLoaded();
-                this.itemsArea.onLoad();
+                    this.itemsArea.onLoad = this.itemsArea.onLoad.wrap(function (proceed) {
+                        proceed();
+                        if ($(searchAreaId) && !jQuery('#' + searchAreaId).is(':visible') && !$(searchButtonId)) {
+                            this.addControlButton(searchButton);
+                        }
+                    });
+                    this.areasLoaded();
+                    this.itemsArea.onLoad();
+
+                }).bind(this));
 
             }).bind(this));
 

From 340001779400e91f82c58ef2e34f6cc55b79e292 Mon Sep 17 00:00:00 2001
From: dnyomo <dnyomo@briteskies.com>
Date: Fri, 31 Jul 2020 10:21:23 -0400
Subject: [PATCH 1162/1718] Updated tests to cover changes to the sort orders

---
 .../Catalog/CategoriesQuery/CategoriesFilterTest.php      | 8 ++++----
 .../GraphQl/Catalog/CategoriesQuery/CategoryTreeTest.php  | 4 ++--
 .../Magento/GraphQl/Catalog/CategoryListTest.php          | 8 ++++----
 .../Magento/GraphQl/Catalog/ProductSearchTest.php         | 2 +-
 .../testsuite/Magento/GraphQl/Catalog/ProductViewTest.php | 8 ++++----
 5 files changed, 15 insertions(+), 15 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 4444b81619bd3..e8246ac36f406 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
@@ -187,9 +187,9 @@ public function testQueryChildCategoriesWithProducts()
         $this->assertArrayHasKey('products', $baseCategory);
         //Check base category products
         $expectedBaseCategoryProducts = [
-            ['sku' => 'simple', 'name' => 'Simple Product'],
             ['sku' => 'simple-4', 'name' => 'Simple Product Three'],
-            ['sku' => '12345', 'name' => 'Simple Product Two']
+            ['sku' => '12345', 'name' => 'Simple Product Two'],
+            ['sku' => 'simple', 'name' => 'Simple Product']
         ];
         $this->assertCategoryProducts($baseCategory, $expectedBaseCategoryProducts);
         //Check base category children
@@ -280,9 +280,9 @@ public function testQueryCategoryWithDisabledChildren()
         $this->assertArrayHasKey('products', $baseCategory);
         //Check base category products
         $expectedBaseCategoryProducts = [
-            ['sku' => 'simple', 'name' => 'Simple Product'],
             ['sku' => 'simple-4', 'name' => 'Simple Product Three'],
-            ['sku' => '12345', 'name' => 'Simple Product Two']
+            ['sku' => '12345', 'name' => 'Simple Product Two'],
+            ['sku' => 'simple', 'name' => 'Simple Product']
         ];
         $this->assertCategoryProducts($baseCategory, $expectedBaseCategoryProducts);
         //Check base category children
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoryTreeTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoryTreeTest.php
index c2e82e734cd9b..ad9ffa9eb7edd 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoryTreeTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoryTreeTest.php
@@ -441,7 +441,7 @@ public function testCategoryProducts()
         $this->assertArrayHasKey('products', $response['categories']['items'][0]);
         $baseCategory = $response['categories']['items'][0];
         $this->assertArrayHasKey('total_count', $baseCategory['products']);
-        $this->assertGreaterThanOrEqual(1, $baseCategory['products']['total_count']);
+        //$this->assertGreaterThanOrEqual(1, $baseCategory['products']['total_count']);
         $this->assertEquals(1, $baseCategory['products']['page_info']['current_page']);
         $this->assertEquals(20, $baseCategory['products']['page_info']['page_size']);
         $this->assertArrayHasKey('sku', $baseCategory['products']['items'][0]);
@@ -453,7 +453,7 @@ public function testCategoryProducts()
         $this->assertAttributes($firstProduct);
         $this->assertWebsites($firstProductModel, $firstProduct['websites']);
         $this->assertEquals('Category 1', $firstProduct['categories'][0]['name']);
-        $this->assertEquals('category-1/category-1-1', $firstProduct['categories'][1]['url_path']);
+        $this->assertEquals('movable-position-2', $firstProduct['categories'][1]['url_path']);
         $this->assertCount(3, $firstProduct['categories']);
     }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php
index c49baf7333dde..3dcba3277dfa7 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php
@@ -186,9 +186,9 @@ public function testQueryChildCategoriesWithProducts()
         $this->assertArrayHasKey('products', $baseCategory);
         //Check base category products
         $expectedBaseCategoryProducts = [
-            ['sku' => 'simple', 'name' => 'Simple Product'],
             ['sku' => 'simple-4', 'name' => 'Simple Product Three'],
-            ['sku' => '12345', 'name' => 'Simple Product Two']
+            ['sku' => '12345', 'name' => 'Simple Product Two'],
+            ['sku' => 'simple', 'name' => 'Simple Product']
         ];
         $this->assertCategoryProducts($baseCategory, $expectedBaseCategoryProducts);
         //Check base category children
@@ -277,9 +277,9 @@ public function testQueryCategoryWithDisabledChildren()
         $this->assertArrayHasKey('products', $baseCategory);
         //Check base category products
         $expectedBaseCategoryProducts = [
-            ['sku' => 'simple', 'name' => 'Simple Product'],
             ['sku' => 'simple-4', 'name' => 'Simple Product Three'],
-            ['sku' => '12345', 'name' => 'Simple Product Two']
+            ['sku' => '12345', 'name' => 'Simple Product Two'],
+            ['sku' => 'simple', 'name' => 'Simple Product']
         ];
         $this->assertCategoryProducts($baseCategory, $expectedBaseCategoryProducts);
         //Check base category children
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 315b0b51d22bf..226f240a247ec 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
@@ -313,7 +313,7 @@ public function testFilterProductsByDropDownCustomAttribute()
         $product1 = $productRepository->get('simple');
         $product2 = $productRepository->get('12345');
         $product3 = $productRepository->get('simple-4');
-        $filteredProducts = [$product1, $product2, $product3 ];
+        $filteredProducts = [$product3, $product2, $product1];
         $countOfFilteredProducts = count($filteredProducts);
         $this->reIndexAndCleanCache();
         $response = $this->graphQlQuery($query);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php
index c6719f1862ddc..87f8b62ed84a1 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php
@@ -232,7 +232,7 @@ public function testQueryAllFieldsSimpleProduct()
             special_from_date
             special_price
             special_to_date
-            swatch_image            
+            swatch_image
             tier_price
             tier_prices
             {
@@ -578,8 +578,8 @@ public function testProductLinks()
      */
     public function testProductPrices()
     {
-        $firstProductSku = 'simple-249';
-        $secondProductSku = 'simple-156';
+        $firstProductSku = 'simple-156';
+        $secondProductSku = 'simple-249';
         $query = <<<QUERY
        {
            products(filter: {price: {from: "150.0", to: "250.0"}})
@@ -1050,7 +1050,7 @@ public function testProductInNonAnchoredSubCategories()
     {
         $query = <<<QUERY
 {
-    products(filter: 
+    products(filter:
              {
              sku: {in:["12345"]}
              }

From a9538f0349fccdafaff4c233c48514f5a0a3d0da Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Fri, 31 Jul 2020 09:26:54 -0500
Subject: [PATCH 1163/1718] MC-20639: MyAccount :: Order Details :: Refund
 (creditMemo) Details by Order Number

- fix base currency
---
 .../Magento/QuoteGraphQl/etc/schema.graphqls  |  4 +++
 .../Resolver/CreditMemo/CreditMemoItems.php   |  2 +-
 .../Resolver/CreditMemo/CreditMemoTotal.php   | 33 +++++++++--------
 .../Model/Resolver/Invoice/InvoiceTotal.php   | 36 +++++++++++--------
 .../Magento/SalesGraphQl/etc/schema.graphqls  |  2 +-
 .../Magento/GraphQl/Sales/CreditmemoTest.php  | 18 +++++-----
 6 files changed, 54 insertions(+), 41 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
index 955ee1cc2429a..44810b5205db8 100644
--- a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -335,6 +335,10 @@ type Discount @doc(description:"Defines an individual discount. A discount can b
     label: String! @doc(description:"A description of the discount")
 }
 
+type ShippingDiscount @doc(description:"Defines an individual shipping discount. This discount can be applied to shipping.") {
+    amount: Money! @doc(description:"The amount of the discount")
+}
+
 type CartItemPrices {
     price: Money!
     row_total: Money!
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoItems.php b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoItems.php
index 9b1b71e84c2d6..9464e0aadf477 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoItems.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoItems.php
@@ -16,7 +16,7 @@
 use Magento\Sales\Api\Data\CreditmemoItemInterface;
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\OrderItemInterface;
-use Magento\SalesGraphQl\Model\Resolver\OrderItem\DataProvider as OrderItemProvider;
+use Magento\SalesGraphQl\Model\OrderItem\DataProvider as OrderItemProvider;
 
 /**
  * Resolve credit memos items data
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoTotal.php b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoTotal.php
index 6212994bff6db..b9a2c2930611f 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoTotal.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoTotal.php
@@ -99,7 +99,7 @@ public function resolve(
                     'value' => $creditMemo->getShippingAmount() ?? 0,
                     'currency' => $currency
                 ],
-                'discounts' => $this->getShippingDiscountDetails($creditMemo),
+                'discounts' => $this->getShippingDiscountDetails($creditMemo, $orderModel),
                 'taxes' => $this->formatTaxes(
                     $orderModel,
                     $this->shippingTaxCalculator->calculateShippingTaxes($orderModel, $creditMemo),
@@ -115,23 +115,26 @@ public function resolve(
     /**
      * Return information about an applied discount on shipping
      *
-     * @param CreditmemoInterface $creditmemo
+     * @param CreditmemoInterface $creditmemoModel
+     * @param OrderInterface $orderModel
      * @return array
      */
-    private function getShippingDiscountDetails(CreditmemoInterface $creditmemo)
+    private function getShippingDiscountDetails(CreditmemoInterface $creditmemoModel, $orderModel)
     {
-        $shippingDiscounts = [];
-        if (!($creditmemo->getDiscountDescription() === null
-            && $creditmemo->getShippingDiscountTaxCompensationAmount() == 0)) {
-            $shippingDiscounts[] =
-                [
-                    'label' => $creditmemo->getDiscountDescription() ?? __('Discount'),
-                    'amount' => [
-                        'value' => abs($creditmemo->getShippingDiscountTaxCompensationAmount()),
-                        'currency' => $creditmemo->getOrderCurrencyCode()
-                    ]
-                ];
-        }
+        $creditmemoShippingAmount = (float) $this->taxHelper->applyTaxAfterDiscount() ?
+            $creditmemoModel->getShippingAmount() : $creditmemoModel->getShippingInclTax();
+        $orderShippingAmount = (float)$this->taxHelper->applyTaxAfterDiscount() ?
+            $orderModel->getShippingAmount() : $orderModel->getShippingInclTax();
+        $calculatedShippingRatio = (float)$creditmemoShippingAmount > 0 && $orderShippingAmount > 0 ?
+            ($creditmemoShippingAmount / $orderShippingAmount) : 0;
+        $orderShippingDiscount = (float)$orderModel->getShippingDiscountAmount();
+        $calculatedCreditmemoShippingDiscount = $orderShippingDiscount * $calculatedShippingRatio;
+        $shippingDiscounts[] = [
+            'amount' => [
+                'value' => $calculatedCreditmemoShippingDiscount,
+                'currency' => $creditmemoModel->getOrderCurrencyCode()
+            ]
+        ];
         return $shippingDiscounts;
     }
 
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceTotal.php b/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceTotal.php
index 012b18f91cf98..ead2668a58b6c 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceTotal.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceTotal.php
@@ -100,7 +100,7 @@ public function resolve(
                     'value' => $invoiceModel->getShippingAmount() ?? 0,
                     'currency' => $currency
                 ],
-                'discounts' => $this->getShippingDiscountDetails($invoiceModel),
+                'discounts' => $this->getShippingDiscountDetails($invoiceModel, $orderModel),
                 'taxes' => $this->formatTaxes(
                     $orderModel,
                     $this->shippingTaxCalculator->calculateShippingTaxes($orderModel, $invoiceModel),
@@ -112,23 +112,29 @@ public function resolve(
     /**
      * Return information about an applied discount on shipping
      *
-     * @param InvoiceInterface $invoice
+     * @param InvoiceInterface $invoiceModel
+     * @param OrderInterface $invoiceModel
      * @return array
      */
-    private function getShippingDiscountDetails(InvoiceInterface $invoice)
+    private function getShippingDiscountDetails(InvoiceInterface $invoiceModel, OrderInterface $orderModel)
     {
-        $shippingDiscounts = [];
-        if (!($invoice->getDiscountDescription() === null
-             && $invoice->getShippingDiscountTaxCompensationAmount() == 0)) {
-            $shippingDiscounts[] =
-                [
-                    'label' => $invoice->getDiscountDescription() ?? __('Discount'),
-                    'amount' => [
-                        'value' => abs($invoice->getShippingDiscountTaxCompensationAmount()),
-                        'currency' => $invoice->getOrderCurrencyCode()
-                    ]
-                ];
-        }
+        // choose including or excluding depending on setting apply before or after tax;
+        $invoiceShippingAmount = (float) $this->taxHelper->applyTaxAfterDiscount() ?
+            $invoiceModel->getShippingAmount() : $invoiceModel->getShippingInclTax();
+        $orderShippingAmount = (float) $this->taxHelper->applyTaxAfterDiscount() ?
+            $orderModel->getShippingAmount() : $orderModel->getShippingInclTax();
+        $calculatedShippingRatioFromOriginal = $invoiceShippingAmount > 0 && $orderShippingAmount > 0 ?
+            ( $invoiceShippingAmount / $orderShippingAmount) : 0;
+        $orderShippingDiscount = (float)$orderModel->getShippingDiscountAmount();
+        $calculatedInvoiceShippingDiscount = $orderShippingDiscount * $calculatedShippingRatioFromOriginal;
+
+        $shippingDiscounts[] =
+            [
+                'amount' => [
+                    'value' => $calculatedInvoiceShippingDiscount,
+                    'currency' => $invoiceModel->getOrderCurrencyCode()
+                ]
+            ];
         return $shippingDiscounts;
     }
 
diff --git a/app/code/Magento/SalesGraphQl/etc/schema.graphqls b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
index 0db80b883184b..1c9a125164bef 100644
--- a/app/code/Magento/SalesGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
@@ -159,7 +159,7 @@ type ShippingHandling @doc(description: "The Shipping handling details") {
     amount_including_tax: Money @doc(description: "The shipping amount, including tax")
     amount_excluding_tax: Money @doc(description: "The shipping amount, excluding tax")
     taxes: [TaxItem] @doc(description: "Contains details about taxes applied for shipping")
-    discounts: [Discount] @doc(description: "The applied discounts to the shipping")
+    discounts: [ShippingDiscount] @doc(description: "The applied discounts to the shipping")
 }
 
 type OrderShipment @doc(description: "Order shipment details") {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
index 15959d9ebb52b..d4d1180b9977d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
@@ -133,7 +133,7 @@ public function testCreditMemoForLoggedInCustomerQuery(): void
                             'value' => 0
                         ],
                         'taxes' => [],
-                        // 'discounts' => [],
+                        'discounts' => [],
                     ],
                     'adjustment' => [
                         'value' => 1.23
@@ -234,7 +234,7 @@ public function testCreditMemoForBundledProductsWithPartialRefund()
                             'value' => 10
                         ],
                         'taxes' => [],
-                        // 'discounts' => [],
+                        'discounts' => [],
                     ],
                     'adjustment' => [
                         'value' => 2
@@ -343,16 +343,16 @@ public function testCreditMemoForBundleProductWithTaxesAndDiscounts()
                         ],
                         'taxes'=> [
                             0 => [
-                                'amount'=>['value' => 0.67],
+                                'amount' => ['value' => 0.67],
                                 'title' => 'US-TEST-*-Rate-1',
                                 'rate' => 7.5
                             ]
                         ],
-                      //  'discounts' => [
-                      //      0 => ['amount'=>['value'=> 1],
-                      //          'label' => 'Discount Label for 10% off'
-                      //      ]
-                      //  ],
+                        'discounts' => [
+                            [
+                                'amount'=> ['value'=> 1],
+                            ]
+                        ],
                     ],
                     'adjustment' => [
                         'value' => 0
@@ -774,7 +774,7 @@ private function getCustomerOrderWithCreditMemoQuery(): array
                          amount_excluding_tax{value}
                          total_amount{value}
                          taxes {amount{value} title rate}
-                         # discounts {amount{value} label}
+                         discounts {amount{value}}
                     }
                     adjustment {
                         value

From b14022fcee93b94009e64f1e0ba05fe165d1e973 Mon Sep 17 00:00:00 2001
From: Roman Lytvynenko <lytvynen@adobe.com>
Date: Fri, 31 Jul 2020 10:26:54 -0500
Subject: [PATCH 1164/1718] MC-36227: Page builder content is getting cropped.

---
 app/code/Magento/Catalog/etc/db_schema.xml | 4 ++--
 app/code/Magento/Eav/etc/db_schema.xml     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Catalog/etc/db_schema.xml b/app/code/Magento/Catalog/etc/db_schema.xml
index a0aa48fb76b13..ddd66a5bf04bd 100644
--- a/app/code/Magento/Catalog/etc/db_schema.xml
+++ b/app/code/Magento/Catalog/etc/db_schema.xml
@@ -154,7 +154,7 @@
                 default="0" comment="Store ID"/>
         <column xsi:type="int" name="entity_id" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Entity ID"/>
-        <column xsi:type="text" name="value" nullable="true" comment="Value"/>
+        <column xsi:type="mediumtext" name="value" nullable="true" comment="Value"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="value_id"/>
         </constraint>
@@ -408,7 +408,7 @@
                 default="0" comment="Store ID"/>
         <column xsi:type="int" name="entity_id" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Entity ID"/>
-        <column xsi:type="text" name="value" nullable="true" comment="Value"/>
+        <column xsi:type="mediumtext" name="value" nullable="true" comment="Value"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="value_id"/>
         </constraint>
diff --git a/app/code/Magento/Eav/etc/db_schema.xml b/app/code/Magento/Eav/etc/db_schema.xml
index 5decc27ea8f26..a166e463f601c 100644
--- a/app/code/Magento/Eav/etc/db_schema.xml
+++ b/app/code/Magento/Eav/etc/db_schema.xml
@@ -205,7 +205,7 @@
                 default="0" comment="Store ID"/>
         <column xsi:type="int" name="entity_id" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Entity ID"/>
-        <column xsi:type="text" name="value" nullable="false" comment="Attribute Value"/>
+        <column xsi:type="mediumtext" name="value" nullable="false" comment="Attribute Value"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="value_id"/>
         </constraint>

From 80d89571af89ccf4d0ccc2ff42277331db6c5e3e Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Fri, 31 Jul 2020 12:08:40 -0500
Subject: [PATCH 1165/1718] MC-34573: Update TinyMCE

- Corrected deprecation for mftf
---
 .../Mftf/Section/TinyMCESection/MediaGallerySection.xml   | 3 +--
 .../Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml | 8 ++++----
 .../AdminTinymce3FileldsSection/TinyMCESection.xml        | 6 ++----
 .../Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml      | 4 ++--
 4 files changed, 9 insertions(+), 12 deletions(-)

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 8841ce4668aa5..725d050554f2d 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/MediaGallerySection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/MediaGallerySection.xml
@@ -17,8 +17,7 @@
         <element name="imageSelected" type="text" selector="//small[text()='{{var1}}']/parent::*[@class='filecnt selected']" parameterized="true"/>
         <element name="ImageSource" type="input" selector=".mce-combobox.mce-abs-layout-item.mce-last.mce-has-open"/>
         <element name="ImageDescription" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-last"/>
-        <!-- Deprecated New element was introduced. Please use 'ImageDescriptionTinyMCE4'-->
-        <element name="ImageDescriptionTinyMCE3" type="input" selector="#alt"/>
+        <element name="ImageDescriptionTinyMCE3" type="input" selector="#alt" deprecated="Deprecated New element was introduced. Please use 'ImageDescriptionTinyMCE4'"/>
         <element name="ImageDescriptionTinyMCE4" type="input" selector="#alt" />
         <element name="Height" type="input" selector=".mce-textbox.mce-abs-layout-item.mce-first"/>
         <element name="UploadImage" type="file" selector=".fileupload"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml
index 3cbee520f731e..3f9648e5ad4d6 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml
@@ -37,11 +37,11 @@
         <waitForPageLoad stepKey="wait5"/>
         <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle2"/>
         <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab2" />
-        <waitForElementVisible selector="{{TinyMCESection.TinyMCE3}}" stepKey="waitForTinyMCE3"/>
-        <seeElement selector="{{TinyMCESection.TinyMCE3}}" stepKey="seeTinyMCE3" />
+        <comment userInput="removing deprecated element" stepKey="waitForTinyMCE3"/>
+        <comment userInput="removing deprecated element" stepKey="seeTinyMCE3" />
         <wait time="3" stepKey="waiting"/>
         <comment userInput="Click Insert image button" stepKey="clickImageButton"/>
-        <click selector="{{TinyMCESection.InsertImageBtnTinyMCE3}}" stepKey="clickInsertImage" />
+        <comment userInput="removing deprecated element" stepKey="clickInsertImage" />
         <waitForPageLoad stepKey="waitForiFrameToLoad" />
         <!-- Switch to the Edit/Insert Image iFrame -->
         <comment userInput="Switching to iFrame" stepKey="insertImageiFrame"/>
@@ -62,7 +62,7 @@
         <executeJS function="document.querySelector('.clearlooks2 iframe').setAttribute('name', 'insert-image');" stepKey="makeIFrameInteractable2"/>
         <switchToIFrame selector="insert-image" stepKey="switchToIFrame2"/>
         <waitForElementVisible selector="{{MediaGallerySection.insertBtn}}" stepKey="waitForInsertBtnOnIFrame" />
-        <fillField selector="{{MediaGallerySection.ImageDescriptionTinyMCE3}}" userInput="{{ImageUpload.content}}" stepKey="fillImageDescription" />
+        <comment userInput="removing deprecated element" stepKey="fillImageDescription" />
         <click selector="{{MediaGallerySection.insertBtn}}" stepKey="clickInsertBtn" />
         <waitForPageLoad stepKey="wait3"/>
         <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
diff --git a/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/TinyMCESection.xml b/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/TinyMCESection.xml
index 5a8242defeb90..38b2d907ecf44 100644
--- a/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/TinyMCESection.xml
+++ b/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/TinyMCESection.xml
@@ -8,9 +8,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="TinyMCESection">
-        <!-- Deprecated this version of TinyMCE is no longer supported -->
-        <element name="TinyMCE3" type="text" selector="#cms_page_form_content_tbl"/>
-        <!-- Deprecated this version of TinyMCE is no longer supported -->
-        <element name="InsertImageBtnTinyMCE3" type="button" selector="#cms_page_form_content_image"/>
+        <element name="TinyMCE3" type="text" selector="#cms_page_form_content_tbl" deprecated="Deprecated this version of TinyMCE is no longer supported"/>
+        <element name="InsertImageBtnTinyMCE3" type="button" selector="#cms_page_form_content_image" deprecated="Deprecated this version of TinyMCE is no longer supported"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml b/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml
index 3fdc99c29faf6..01b2101d3346c 100644
--- a/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml
+++ b/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml
@@ -66,8 +66,8 @@
         <waitForPageLoad stepKey="wait5"/>
         <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle2"/>
         <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab2" />
-        <waitForElementVisible selector="{{TinyMCESection.TinyMCE3}}" stepKey="waitForTinyMCE3"/>
-        <seeElement selector="{{TinyMCESection.TinyMCE3}}" stepKey="seeTinyMCE3" />
+        <comment userInput="removing deprecated element" stepKey="waitForTinyMCE3"/>
+        <comment userInput="removing deprecated element" stepKey="seeTinyMCE3" />
         <executeJS function="tinyMCE.activeEditor.setContent('Hello TinyMCE3!');" stepKey="executeJSFillContent2"/>
         <click selector="{{CmsWYSIWYGSection.ShowHideBtn}}" stepKey="clickShowHideBtn2" />
         <scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab2" />

From aad9bff96c4f619e575a3288c4e48f69ea2cd6cc Mon Sep 17 00:00:00 2001
From: dnyomo <dnyomo@briteskies.com>
Date: Fri, 31 Jul 2020 13:12:57 -0400
Subject: [PATCH 1166/1718] Remove the position from the filter and replaced it
 with Entity Id

---
 .../Product/SearchCriteriaBuilder.php         | 28 +++++++++++++------
 .../Products/DataProvider/ProductSearch.php   | 20 +++++++------
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php b/app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php
index a91910f3d578a..6a686cf301fcc 100644
--- a/app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php
+++ b/app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php
@@ -101,7 +101,7 @@ public function build(array $args, bool $includeAggregation): SearchCriteriaInte
         }
 
         if (!$searchCriteria->getSortOrders()) {
-            $this->addDefaultSortOrder($searchCriteria, $isSearch);
+            $this->addDefaultSortOrder($searchCriteria, $args, $isSearch);
         }
 
         $this->addEntityIdSort($searchCriteria, $isSearch);
@@ -199,18 +199,28 @@ private function addFilter(
      * Sort by relevance DESC by default
      *
      * @param SearchCriteriaInterface $searchCriteria
+     * @param array $args
      * @param bool $isSearch
      */
-    private function addDefaultSortOrder(SearchCriteriaInterface $searchCriteria, $isSearch = false): void
+    private function addDefaultSortOrder(SearchCriteriaInterface $searchCriteria, array $args, $isSearch = false): void
     {
-        $sortField = $isSearch ? 'relevance' : EavAttributeInterface::POSITION;
-        $sortDirection = $isSearch ? SortOrder::SORT_DESC : SortOrder::SORT_ASC;
-        $defaultSortOrder = $this->sortOrderBuilder
-            ->setField($sortField)
-            ->setDirection($sortDirection)
-            ->create();
+        $defaultSortOrder = [];
+        if ($isSearch) {
+            $defaultSortOrder[] = $this->sortOrderBuilder
+                ->setField('relevance')
+                ->setDirection(SortOrder::SORT_DESC)
+                ->create();
+        } else {
+            $categoryIdFilter = isset($args['filter']['category_id']) ? $args['filter']['category_id'] : false;
+            if ($categoryIdFilter && count($categoryIdFilter[array_key_first($categoryIdFilter)]) <= 1) {
+                $defaultSortOrder[] = $this->sortOrderBuilder
+                    ->setField(EavAttributeInterface::POSITION)
+                    ->setDirection(SortOrder::SORT_ASC)
+                    ->create();
+            }
+        }
 
-        $searchCriteria->setSortOrders([$defaultSortOrder]);
+        $searchCriteria->setSortOrders($defaultSortOrder);
     }
 
     /**
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 afc5fc77bc46d..e51c7c60648ac 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php
@@ -20,6 +20,7 @@
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\Api\SearchResultsInterface;
 use Magento\Framework\Api\SortOrder;
+use Magento\Framework\Exception\InputException;
 use Magento\GraphQl\Model\Query\ContextInterface;
 
 /**
@@ -151,6 +152,7 @@ private function getSearchResultsApplier(
      * @param SearchCriteriaInterface $searchCriteria
      * @param array $args
      * @return array
+     * @throws InputException
      */
     private function getSortOrderArray(SearchCriteriaInterface $searchCriteria, $args)
     {
@@ -158,16 +160,18 @@ private function getSortOrderArray(SearchCriteriaInterface $searchCriteria, $arg
         $sortOrders = $searchCriteria->getSortOrders();
         if (is_array($sortOrders)) {
             foreach ($sortOrders as $sortOrder) {
-                if ($sortOrder->getField() !== '_id') {
-                    if ($sortOrder->getField() == EavAttributeInterface::POSITION) {
-                        if (isset($args['sort'][EavAttributeInterface::POSITION])) {
-                            $sortOrder->setDirection($args['sort'][EavAttributeInterface::POSITION]);
-                        } else {
-                            $sortOrder->setDirection(SortOrder::SORT_DESC);
-                        }
+                if ($sortOrder->getField() === '_id') {
+                    $sortOrder->setField('entity_id');
+                    $categoryIdFilter = isset($args['filter']['category_id']) ? $args['filter']['category_id'] : false;
+                    if ($categoryIdFilter && count($categoryIdFilter[array_key_first($categoryIdFilter)]) <= 1) {
+                        $sortOrder->setDirection(SortOrder::SORT_ASC);
                     }
-                    $ordersArray[$sortOrder->getField()] = $sortOrder->getDirection();
                 }
+                $ordersArray[$sortOrder->getField()] = $sortOrder->getDirection();
+            }
+            if (isset($ordersArray[EavAttributeInterface::POSITION])) {
+                $ordersArray['entity_id'] = $ordersArray[EavAttributeInterface::POSITION];
+                unset($ordersArray[EavAttributeInterface::POSITION]);
             }
         }
 

From d38515b57c620ece59cc0b778d688c105ae1a1c5 Mon Sep 17 00:00:00 2001
From: Alex Kolesnyk <kolesnyk@adobe.com>
Date: Fri, 31 Jul 2020 12:13:01 -0500
Subject: [PATCH 1167/1718] MQE-2044: Integration Coverage - Jenkins
 Implementation

---
 .../Setup/Console/Command/GenerateFixturesCommandTest.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/GenerateFixturesCommandTest.php b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/GenerateFixturesCommandTest.php
index 75db44f30e58a..3ec185e71a1e5 100644
--- a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/GenerateFixturesCommandTest.php
+++ b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/GenerateFixturesCommandTest.php
@@ -80,14 +80,6 @@ protected function setUp(): void
         parent::setUp();
     }
 
-    /**
-     * @return string
-     */
-    private function getEdition()
-    {
-        return trim(file_get_contents(__DIR__  . '/_files/edition'));
-    }
-
     /**
      * teardown
      */

From 30c79f336b42cb381ed57a6c23654b469e261313 Mon Sep 17 00:00:00 2001
From: dnyomo <dnyomo@briteskies.com>
Date: Fri, 31 Jul 2020 13:48:15 -0400
Subject: [PATCH 1168/1718] Removed bad code that was not needed

---
 .../Resolver/Products/DataProvider/ProductSearch.php      | 8 --------
 1 file changed, 8 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 e51c7c60648ac..e4823b4aa557a 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php
@@ -162,17 +162,9 @@ private function getSortOrderArray(SearchCriteriaInterface $searchCriteria, $arg
             foreach ($sortOrders as $sortOrder) {
                 if ($sortOrder->getField() === '_id') {
                     $sortOrder->setField('entity_id');
-                    $categoryIdFilter = isset($args['filter']['category_id']) ? $args['filter']['category_id'] : false;
-                    if ($categoryIdFilter && count($categoryIdFilter[array_key_first($categoryIdFilter)]) <= 1) {
-                        $sortOrder->setDirection(SortOrder::SORT_ASC);
-                    }
                 }
                 $ordersArray[$sortOrder->getField()] = $sortOrder->getDirection();
             }
-            if (isset($ordersArray[EavAttributeInterface::POSITION])) {
-                $ordersArray['entity_id'] = $ordersArray[EavAttributeInterface::POSITION];
-                unset($ordersArray[EavAttributeInterface::POSITION]);
-            }
         }
 
         return $ordersArray;

From fdec8aae766f0b7ec7d6e39f7f548468bd2ea178 Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Fri, 31 Jul 2020 12:59:34 -0500
Subject: [PATCH 1169/1718] MC-20638: MyAccount :: Order Details :: Shipping
 Details by Order Number

---
 .../customer_order_with_ups_shipping_rollback.php      |  2 +-
 .../Sales/_files/order_with_customer_rollback.php      | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/_files/order_with_customer_rollback.php

diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping_rollback.php b/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping_rollback.php
index aba4c3c972955..bbb90e0326aec 100644
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping_rollback.php
@@ -6,4 +6,4 @@
 
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/default_rollback.php');
+Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/order_with_customer_rollback.php');
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_customer_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_customer_rollback.php
new file mode 100644
index 0000000000000..dffb191d142a1
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_customer_rollback.php
@@ -0,0 +1,10 @@
+<?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_rollback.php');
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_rollback.php');

From 5fb051baf0041ddc7fce70c370dc21cf323a969a Mon Sep 17 00:00:00 2001
From: Roman Lytvynenko <lytvynen@adobe.com>
Date: Fri, 31 Jul 2020 13:22:20 -0500
Subject: [PATCH 1170/1718] MC-36227: Page builder content is getting cropped.

---
 app/code/Magento/Eav/etc/db_schema.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Eav/etc/db_schema.xml b/app/code/Magento/Eav/etc/db_schema.xml
index a166e463f601c..5decc27ea8f26 100644
--- a/app/code/Magento/Eav/etc/db_schema.xml
+++ b/app/code/Magento/Eav/etc/db_schema.xml
@@ -205,7 +205,7 @@
                 default="0" comment="Store ID"/>
         <column xsi:type="int" name="entity_id" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Entity ID"/>
-        <column xsi:type="mediumtext" name="value" nullable="false" comment="Attribute Value"/>
+        <column xsi:type="text" name="value" nullable="false" comment="Attribute Value"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="value_id"/>
         </constraint>

From 3c9406da38d53cb0c1430aed258b0a3d29af2c79 Mon Sep 17 00:00:00 2001
From: Anusha Vattam <avattam@adobe.com>
Date: Fri, 31 Jul 2020 13:43:09 -0500
Subject: [PATCH 1171/1718] Added few new assertions on to
 SaveCartDataWithPayflowProTest

---
 .../Resolver/Customer/SaveCartDataWithPayflowProTest.php  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/SaveCartDataWithPayflowProTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/SaveCartDataWithPayflowProTest.php
index 0de3e696613b4..ebe8a579cc56a 100644
--- a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/SaveCartDataWithPayflowProTest.php
+++ b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/SaveCartDataWithPayflowProTest.php
@@ -63,6 +63,10 @@ public function testPlaceOrderAndSaveDataForFuturePayflowPro(): void
         $responseData = $this->placeOrderPayflowPro('is_active_payment_token_enabler: true');
         $this->assertArrayHasKey('data', $responseData);
         $this->assertArrayHasKey('createPayflowProToken', $responseData['data']);
+        $this->assertNotEmpty($this->getVaultCartData()->getPublicHash());
+        $this->assertNotEmpty($this->getVaultCartData()->getTokenDetails());
+        $this->assertNotEmpty($this->getVaultCartData()->getGatewayToken());
+        $this->assertNotEmpty($this->getVaultCartData()->getPublicHash());
         $this->assertTrue($this->getVaultCartData()->getIsActive());
         $this->assertTrue($this->getVaultCartData()->getIsVisible());
     }
@@ -87,6 +91,10 @@ public function testPlaceOrderAndNotSaveDataForFuturePayflowPro(): void
         $responseData = $this->placeOrderPayflowPro('is_active_payment_token_enabler: false');
         $this->assertArrayHasKey('data', $responseData);
         $this->assertArrayHasKey('createPayflowProToken', $responseData['data']);
+        $this->assertNotEmpty($this->getVaultCartData()->getPublicHash());
+        $this->assertNotEmpty($this->getVaultCartData()->getTokenDetails());
+        $this->assertNotEmpty($this->getVaultCartData()->getGatewayToken());
+        $this->assertNotEmpty($this->getVaultCartData()->getPublicHash());
         $this->assertTrue($this->getVaultCartData()->getIsActive());
         $this->assertFalse($this->getVaultCartData()->getIsVisible());
     }

From 57dfd6ff249df82c790dda918a80a175214159eb Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Fri, 31 Jul 2020 21:24:07 -0500
Subject: [PATCH 1172/1718] MC-20639: MyAccount :: Order Details :: Refund
 (creditMemo) Details by Order Number

- fix base currency
---
 .../Magento/QuoteGraphQl/etc/schema.graphqls  |  4 ---
 .../Resolver/CreditMemo/CreditMemoTotal.php   | 24 +++++++++--------
 .../Model/Resolver/Invoice/InvoiceTotal.php   | 27 +++++++++----------
 .../Magento/SalesGraphQl/etc/schema.graphqls  |  4 +++
 .../Magento/GraphQl/Sales/InvoiceTest.php     | 25 +++++++----------
 .../Sales/RetrieveOrdersByOrderNumberTest.php | 10 +++----
 ...dersWithBundleProductByOrderNumberTest.php |  6 ++---
 .../Sales/_files/order_with_totals.php        |  3 ++-
 .../Sales/_files/orders_with_customer.php     | 12 ++++++++-
 ...orders_with_order_items_two_storeviews.php |  2 ++
 .../testsuite/Magento/Sales/_files/order.php  |  1 +
 11 files changed, 60 insertions(+), 58 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
index 44810b5205db8..955ee1cc2429a 100644
--- a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -335,10 +335,6 @@ type Discount @doc(description:"Defines an individual discount. A discount can b
     label: String! @doc(description:"A description of the discount")
 }
 
-type ShippingDiscount @doc(description:"Defines an individual shipping discount. This discount can be applied to shipping.") {
-    amount: Money! @doc(description:"The amount of the discount")
-}
-
 type CartItemPrices {
     price: Money!
     row_total: Money!
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoTotal.php b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoTotal.php
index b9a2c2930611f..fa08c2d1bfdb4 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoTotal.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoTotal.php
@@ -121,20 +121,22 @@ public function resolve(
      */
     private function getShippingDiscountDetails(CreditmemoInterface $creditmemoModel, $orderModel)
     {
-        $creditmemoShippingAmount = (float) $this->taxHelper->applyTaxAfterDiscount() ?
-            $creditmemoModel->getShippingAmount() : $creditmemoModel->getShippingInclTax();
-        $orderShippingAmount = (float)$this->taxHelper->applyTaxAfterDiscount() ?
-            $orderModel->getShippingAmount() : $orderModel->getShippingInclTax();
-        $calculatedShippingRatio = (float)$creditmemoShippingAmount > 0 && $orderShippingAmount > 0 ?
+        $creditmemoShippingAmount = (float)$creditmemoModel->getShippingAmount();
+        $orderShippingAmount = (float)$orderModel->getShippingAmount();
+        $calculatedShippingRatio = (float)$creditmemoShippingAmount != 0 && $orderShippingAmount != 0 ?
             ($creditmemoShippingAmount / $orderShippingAmount) : 0;
         $orderShippingDiscount = (float)$orderModel->getShippingDiscountAmount();
         $calculatedCreditmemoShippingDiscount = $orderShippingDiscount * $calculatedShippingRatio;
-        $shippingDiscounts[] = [
-            'amount' => [
-                'value' => $calculatedCreditmemoShippingDiscount,
-                'currency' => $creditmemoModel->getOrderCurrencyCode()
-            ]
-        ];
+
+        $shippingDiscounts = [];
+        if ($calculatedCreditmemoShippingDiscount != 0) {
+            $shippingDiscounts[] = [
+                'amount' => [
+                    'value' => sprintf('%.2f', abs($calculatedCreditmemoShippingDiscount)),
+                    'currency' => $creditmemoModel->getOrderCurrencyCode()
+                ]
+            ];
+        }
         return $shippingDiscounts;
     }
 
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceTotal.php b/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceTotal.php
index ead2668a58b6c..38235e94ed372 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceTotal.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceTotal.php
@@ -118,23 +118,22 @@ public function resolve(
      */
     private function getShippingDiscountDetails(InvoiceInterface $invoiceModel, OrderInterface $orderModel)
     {
-        // choose including or excluding depending on setting apply before or after tax;
-        $invoiceShippingAmount = (float) $this->taxHelper->applyTaxAfterDiscount() ?
-            $invoiceModel->getShippingAmount() : $invoiceModel->getShippingInclTax();
-        $orderShippingAmount = (float) $this->taxHelper->applyTaxAfterDiscount() ?
-            $orderModel->getShippingAmount() : $orderModel->getShippingInclTax();
-        $calculatedShippingRatioFromOriginal = $invoiceShippingAmount > 0 && $orderShippingAmount > 0 ?
+        $invoiceShippingAmount = (float)$invoiceModel->getShippingAmount();
+        $orderShippingAmount = (float)$orderModel->getShippingAmount();
+        $calculatedShippingRatioFromOriginal = $invoiceShippingAmount != 0 && $orderShippingAmount != 0 ?
             ( $invoiceShippingAmount / $orderShippingAmount) : 0;
         $orderShippingDiscount = (float)$orderModel->getShippingDiscountAmount();
         $calculatedInvoiceShippingDiscount = $orderShippingDiscount * $calculatedShippingRatioFromOriginal;
-
-        $shippingDiscounts[] =
-            [
-                'amount' => [
-                    'value' => $calculatedInvoiceShippingDiscount,
-                    'currency' => $invoiceModel->getOrderCurrencyCode()
-                ]
-            ];
+        $shippingDiscounts = [];
+        if ($calculatedInvoiceShippingDiscount != 0) {
+            $shippingDiscounts[] =
+                [
+                    'amount' => [
+                        'value' => sprintf('%.2f', abs($calculatedInvoiceShippingDiscount)),
+                        'currency' => $invoiceModel->getOrderCurrencyCode()
+                    ]
+                ];
+        }
         return $shippingDiscounts;
     }
 
diff --git a/app/code/Magento/SalesGraphQl/etc/schema.graphqls b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
index 1c9a125164bef..a9f9130261dad 100644
--- a/app/code/Magento/SalesGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
@@ -162,6 +162,10 @@ type ShippingHandling @doc(description: "The Shipping handling details") {
     discounts: [ShippingDiscount] @doc(description: "The applied discounts to the shipping")
 }
 
+type ShippingDiscount @doc(description:"Defines an individual shipping discount. This discount can be applied to shipping.") {
+    amount: Money! @doc(description:"The amount of the discount")
+}
+
 type OrderShipment @doc(description: "Order shipment details") {
     id: ID! @doc(description: "The unique ID of the shipment")
     number: String! @doc(description: "The sequential credit shipment number")
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/InvoiceTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/InvoiceTest.php
index 5a4b553d081ed..8b18d4bd07d1b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/InvoiceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/InvoiceTest.php
@@ -94,7 +94,7 @@ public function testSingleInvoiceForLoggedInCustomerQuery()
                             'currency' => 'USD'
                         ],
                         'taxes' => [],
-                        // 'discounts' => []
+                        'discounts' => []
                     ],
                     'taxes' => [],
                     'discounts' => [],
@@ -174,7 +174,7 @@ public function testMultipleInvoiceForLoggedInCustomerQuery()
                             'currency' => 'USD'
                         ],
                         'taxes' => [],
-                        // 'discounts' => [],
+                        'discounts' => [],
                     ],
                     'taxes' => [],
                     'discounts' => [],
@@ -228,7 +228,7 @@ public function testMultipleInvoiceForLoggedInCustomerQuery()
                             'currency' => 'USD'
                         ],
                         'taxes' => [],
-                        // 'discounts' => [],
+                        'discounts' => [],
                     ],
                     'taxes' => [],
                     'discounts' => [],
@@ -466,12 +466,9 @@ private function assertTotalsAndShippingWithTaxesAndDiscounts(array $customerOrd
                         'rate' => 7.5
                     ]
                 ],
-                // 'discounts'=> [
-                //     0 => [
-                //         'amount'=>['value' => 0.07, 'currency'=> 'USD'],
-                //         'label' => 'Discount Label for 10% off'
-                //     ]
-                // ],
+                 'discounts'=> [
+                     0 => ['amount'=>['value' => 1, 'currency'=> 'USD']]
+                 ],
             ]
         ];
         $this->assertResponseFields($customerOrderItemTotal, $assertionMap);
@@ -509,12 +506,8 @@ private function assertTotalsAndShippingWithTaxesAndDiscountsForOneQty(array $cu
                         'rate' => 7.5
                     ]
                 ],
-                // 'discounts'=> [
-                //     0 => [
-                //         'amount'=>['value' => 0.07, 'currency'=> 'USD'],
-                //         'label' => 'Discount Label for 10% off'
-                //     ]
-                // ],
+                 'discounts'=> [['amount'=>['value' => 1, 'currency'=> 'USD']]
+                 ],
             ]
         ];
         $this->assertResponseFields($customerOrderItemTotal, $assertionMap);
@@ -827,7 +820,7 @@ private function getCustomerInvoicesBasedOnOrderNumber($orderNumber): array
                amount_excluding_tax{value currency}
                total_amount{value currency}
                taxes {amount{value} title rate}
-               # discounts {amount{value currency} label}
+               discounts {amount{value currency}}
              }
            }
             }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php
index d0caa90731887..299bccc5a1277 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php
@@ -186,9 +186,7 @@ private function assertTotalsWithTaxesAndDiscounts(array $customerOrderItemTotal
                 'amount_excluding_tax' => ['value' => 20],
                 'total_amount' => ['value' => 20, 'currency' =>'USD'],
                 'discounts' => [
-                    0 => ['amount'=>['value'=> 2, 'currency' =>'USD'],
-                        'label' => 'Discount Label for 10% off'
-                    ]
+                    0 => ['amount'=>['value'=> 2, 'currency' =>'USD']]
                 ],
                 'taxes'=> [
                     0 => [
@@ -271,9 +269,7 @@ private function assertTotalsWithTaxesAndDiscountsWithTwoRules(array $customerOr
                 'amount_excluding_tax' => ['value' => 20],
                 'total_amount' => ['value' => 20, 'currency' =>'USD'],
                 'discounts' => [
-                    0 => ['amount'=>['value'=> 2, 'currency' =>'USD'],
-                        'label' => 'Discount Label for 10% off'
-                    ]
+                    0 => ['amount'=>['value'=> 2, 'currency' =>'USD']]
                 ],
                 'taxes'=> [
                     0 => [
@@ -1245,7 +1241,7 @@ private function getCustomerOrderQuery($orderNumber): array
                amount_excluding_tax{value}
                total_amount{value currency}
                taxes {amount{value} title rate}
-               discounts {amount{value currency} label}
+               discounts {amount{value currency}}
              }
 
            }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithBundleProductByOrderNumberTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithBundleProductByOrderNumberTest.php
index 7202456049fc9..b4c9bd4962cc2 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithBundleProductByOrderNumberTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithBundleProductByOrderNumberTest.php
@@ -189,9 +189,7 @@ private function assertTotalsOnBundleProductWithTaxesAndDiscounts(array $custome
                 'amount_excluding_tax' => ['value' => 20],
                 'total_amount' => ['value' => 20],
                 'discounts' => [
-                    0 => ['amount'=>['value'=> 2],
-                        'label' => 'Discount Label for 10% off'
-                    ]
+                    0 => ['amount'=>['value'=> 2]]
                 ],
                 'taxes'=> [
                     0 => [
@@ -266,7 +264,7 @@ private function getCustomerOrderQueryBundleProduct($orderNumber)
                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}
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/order_with_totals.php b/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/order_with_totals.php
index 8e9161f1ec628..f8dd55c6fdbeb 100644
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/order_with_totals.php
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/order_with_totals.php
@@ -59,13 +59,14 @@
     ->setState(Order::STATE_PROCESSING)
     ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_PROCESSING))
     ->setSubtotal(110)
-    ->setOrderCurrencyCode("USD")
     ->setShippingAmount(10.0)
     ->setBaseShippingAmount(10.0)
     ->setTaxAmount(5.0)
     ->setGrandTotal(100)
     ->setBaseSubtotal(100)
     ->setBaseGrandTotal(100)
+    ->setOrderCurrencyCode("USD")
+    ->setBaseCurrencyCode('USD')
     ->setCustomerIsGuest(false)
     ->setCustomerId(1)
     ->setCustomerEmail('customer@example.com')
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/orders_with_customer.php b/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/orders_with_customer.php
index f1124ba135285..3caa1410c65e9 100644
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/orders_with_customer.php
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/orders_with_customer.php
@@ -30,6 +30,7 @@
         'state' => \Magento\Sales\Model\Order::STATE_NEW,
         'status' => 'processing',
         'order_currency_code' =>'USD',
+        'base_currency_code' =>'USD',
         'grand_total' => 120.00,
         'subtotal' => 120.00,
         'base_grand_total' => 120.00,
@@ -40,6 +41,8 @@
         'increment_id' => '100000003',
         'state' => \Magento\Sales\Model\Order::STATE_PROCESSING,
         'status' => 'processing',
+        'order_currency_code' =>'USD',
+        'base_currency_code' =>'USD',
         'grand_total' => 130.00,
         'base_grand_total' => 130.00,
         'subtotal' => 130.00,
@@ -51,6 +54,8 @@
         'increment_id' => '100000004',
         'state' => \Magento\Sales\Model\Order::STATE_PROCESSING,
         'status' => 'closed',
+        'order_currency_code' =>'USD',
+        'base_currency_code' =>'USD',
         'grand_total' => 140.00,
         'base_grand_total' => 140.00,
         'subtotal' => 140.00,
@@ -61,6 +66,8 @@
         'increment_id' => '100000005',
         'state' => \Magento\Sales\Model\Order::STATE_COMPLETE,
         'status' => 'complete',
+        'order_currency_code' =>'USD',
+        'base_currency_code' =>'USD',
         'grand_total' => 150.00,
         'base_grand_total' => 150.00,
         'subtotal' => 150.00,
@@ -72,6 +79,8 @@
         'increment_id' => '100000006',
         'state' => \Magento\Sales\Model\Order::STATE_PROCESSING,
         'status' => 'Processing',
+        'order_currency_code' =>'USD',
+        'base_currency_code' =>'USD',
         'grand_total' => 160.00,
         'base_grand_total' => 160.00,
         'subtotal' => 160.00,
@@ -84,6 +93,7 @@
         'state' => \Magento\Sales\Model\Order::STATE_PROCESSING,
         'status' => 'Processing',
         'order_currency_code' =>'USD',
+        'base_currency_code' =>'USD',
         'grand_total' => 180.00,
         'base_grand_total' => 180.00,
         'subtotal' => 170.00,
@@ -98,6 +108,7 @@
         'state' => \Magento\Sales\Model\Order::STATE_PROCESSING,
         'status' => 'Processing',
         'order_currency_code' =>'USD',
+        'base_currency_code' =>'USD',
         'grand_total' => 190.00,
         'base_grand_total' => 190.00,
         'subtotal' => 180.00,
@@ -139,7 +150,6 @@
         ->setName($product->getName())
         ->setSku($product->getSku());
 
-
     $order->setData($orderData)
         ->addItem($orderItem)
         ->setCustomerIsGuest(false)
diff --git a/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/two_orders_with_order_items_two_storeviews.php b/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/two_orders_with_order_items_two_storeviews.php
index cb61f5e398630..c10ca26e640f1 100644
--- a/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/two_orders_with_order_items_two_storeviews.php
+++ b/dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/two_orders_with_order_items_two_storeviews.php
@@ -78,6 +78,7 @@
     ->setCustomerId($customerIdFromFixture)
     ->setCustomerEmail('customer@null.com')
     ->setOrderCurrencyCode('USD')
+    ->setBaseCurrencyCode('USD')
     ->setBillingAddress($billingAddress)
     ->setShippingAddress($shippingAddress)
     ->setStoreId($objectManager->get(StoreManagerInterface::class)->getStore()->getId())
@@ -128,6 +129,7 @@
     ->setCustomerId($customerIdFromFixture)
     ->setCustomerEmail('customer@null.com')
     ->setOrderCurrencyCode('USD')
+    ->setBaseCurrencyCode('USD')
     ->setBillingAddress($billingAddress)
     ->setShippingAddress($shippingAddress)
     ->setStoreId($secondStore->load('fixture_second_store')->getId())
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
index 4b21abfb6ef91..924562781e16b 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
@@ -62,6 +62,7 @@
     ->setBaseSubtotal(100)
     ->setBaseGrandTotal(100)
     ->setOrderCurrencyCode('USD')
+    ->setBaseCurrencyCode('USD')
     ->setCustomerIsGuest(true)
     ->setCustomerEmail('customer@null.com')
     ->setBillingAddress($billingAddress)

From c24c12b609eb74c10ffb1f6eda12b06a93bc6dbc Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Sun, 2 Aug 2020 14:04:52 +0200
Subject: [PATCH 1173/1718] Revert quote items in case of an error

---
 app/code/Magento/Quote/Model/Cart/AddProductsToCart.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php b/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
index c80807b93c8b0..8707f7755e2fb 100644
--- a/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
+++ b/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
@@ -117,6 +117,9 @@ public function execute(string $maskedCartId, array $cartItems): AddProductsToCa
 
         if (count($this->errors) === 0) {
             $this->cartRepository->save($cart);
+        } else {
+            /* Revert changes introduced by add to cart processes in case of an error */
+            $cart->getItemsCollection()->clear();
         }
 
         return $this->prepareErrorOutput($cart);

From c137e0ec7cd852e5a8ed66e685cd9613504d01f0 Mon Sep 17 00:00:00 2001
From: dnyomo <dnyomo@briteskies.com>
Date: Sun, 2 Aug 2020 09:59:22 -0400
Subject: [PATCH 1174/1718] Updated the default sort to check if the category
 id is passed as an array. Reverted the tests back to check on products

---
 .../DataProvider/Product/SearchCriteriaBuilder.php           | 5 ++++-
 .../GraphQl/Catalog/CategoriesQuery/CategoriesFilterTest.php | 4 ++--
 .../GraphQl/Catalog/CategoriesQuery/CategoryTreeTest.php     | 2 +-
 .../testsuite/Magento/GraphQl/Catalog/CategoryListTest.php   | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php b/app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php
index 6a686cf301fcc..173d055180119 100644
--- a/app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php
+++ b/app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php
@@ -212,7 +212,10 @@ private function addDefaultSortOrder(SearchCriteriaInterface $searchCriteria, ar
                 ->create();
         } else {
             $categoryIdFilter = isset($args['filter']['category_id']) ? $args['filter']['category_id'] : false;
-            if ($categoryIdFilter && count($categoryIdFilter[array_key_first($categoryIdFilter)]) <= 1) {
+            if ($categoryIdFilter &&
+                !is_array($categoryIdFilter[array_key_first($categoryIdFilter)]) ||
+                count($categoryIdFilter[array_key_first($categoryIdFilter)]) <= 1
+            ) {
                 $defaultSortOrder[] = $this->sortOrderBuilder
                     ->setField(EavAttributeInterface::POSITION)
                     ->setDirection(SortOrder::SORT_ASC)
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 e8246ac36f406..3ba7805ba2d25 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
@@ -280,9 +280,9 @@ public function testQueryCategoryWithDisabledChildren()
         $this->assertArrayHasKey('products', $baseCategory);
         //Check base category products
         $expectedBaseCategoryProducts = [
+            ['sku' => 'simple', 'name' => 'Simple Product'],
             ['sku' => 'simple-4', 'name' => 'Simple Product Three'],
-            ['sku' => '12345', 'name' => 'Simple Product Two'],
-            ['sku' => 'simple', 'name' => 'Simple Product']
+            ['sku' => '12345', 'name' => 'Simple Product Two']
         ];
         $this->assertCategoryProducts($baseCategory, $expectedBaseCategoryProducts);
         //Check base category children
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoryTreeTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoryTreeTest.php
index ad9ffa9eb7edd..d4089161cd894 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoryTreeTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoryTreeTest.php
@@ -441,7 +441,7 @@ public function testCategoryProducts()
         $this->assertArrayHasKey('products', $response['categories']['items'][0]);
         $baseCategory = $response['categories']['items'][0];
         $this->assertArrayHasKey('total_count', $baseCategory['products']);
-        //$this->assertGreaterThanOrEqual(1, $baseCategory['products']['total_count']);
+        $this->assertGreaterThanOrEqual(1, $baseCategory['products']['total_count']);
         $this->assertEquals(1, $baseCategory['products']['page_info']['current_page']);
         $this->assertEquals(20, $baseCategory['products']['page_info']['page_size']);
         $this->assertArrayHasKey('sku', $baseCategory['products']['items'][0]);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php
index 3dcba3277dfa7..03e0aefa3a732 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php
@@ -186,9 +186,9 @@ public function testQueryChildCategoriesWithProducts()
         $this->assertArrayHasKey('products', $baseCategory);
         //Check base category products
         $expectedBaseCategoryProducts = [
+            ['sku' => 'simple', 'name' => 'Simple Product'],
             ['sku' => 'simple-4', 'name' => 'Simple Product Three'],
-            ['sku' => '12345', 'name' => 'Simple Product Two'],
-            ['sku' => 'simple', 'name' => 'Simple Product']
+            ['sku' => '12345', 'name' => 'Simple Product Two']
         ];
         $this->assertCategoryProducts($baseCategory, $expectedBaseCategoryProducts);
         //Check base category children

From 34cf76dc80633e2a558aa9f583e8f51604f13417 Mon Sep 17 00:00:00 2001
From: dnyomo <dnyomo@briteskies.com>
Date: Sun, 2 Aug 2020 13:27:36 -0400
Subject: [PATCH 1175/1718] Updated the default sort to check if the category
 id is passed as an array. Reverted the tests back to check on products

---
 .../Product/SearchCriteriaBuilder.php             | 15 +++++++--------
 .../CategoriesQuery/CategoriesFilterTest.php      |  6 +++---
 .../Catalog/CategoriesQuery/CategoryTreeTest.php  |  2 +-
 .../Magento/GraphQl/Catalog/CategoryListTest.php  | 10 +++++-----
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php b/app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php
index 173d055180119..fe7272b933f75 100644
--- a/app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php
+++ b/app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php
@@ -212,14 +212,13 @@ private function addDefaultSortOrder(SearchCriteriaInterface $searchCriteria, ar
                 ->create();
         } else {
             $categoryIdFilter = isset($args['filter']['category_id']) ? $args['filter']['category_id'] : false;
-            if ($categoryIdFilter &&
-                !is_array($categoryIdFilter[array_key_first($categoryIdFilter)]) ||
-                count($categoryIdFilter[array_key_first($categoryIdFilter)]) <= 1
-            ) {
-                $defaultSortOrder[] = $this->sortOrderBuilder
-                    ->setField(EavAttributeInterface::POSITION)
-                    ->setDirection(SortOrder::SORT_ASC)
-                    ->create();
+            if ($categoryIdFilter) {
+                if (!is_array($categoryIdFilter[array_key_first($categoryIdFilter)]) || count($categoryIdFilter[array_key_first($categoryIdFilter)]) <= 1) {
+                    $defaultSortOrder[] = $this->sortOrderBuilder
+                        ->setField(EavAttributeInterface::POSITION)
+                        ->setDirection(SortOrder::SORT_ASC)
+                        ->create();
+                }
             }
         }
 
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 3ba7805ba2d25..679d7659cbf9e 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
@@ -187,9 +187,9 @@ public function testQueryChildCategoriesWithProducts()
         $this->assertArrayHasKey('products', $baseCategory);
         //Check base category products
         $expectedBaseCategoryProducts = [
+            ['sku' => 'simple', 'name' => 'Simple Product'],
             ['sku' => 'simple-4', 'name' => 'Simple Product Three'],
             ['sku' => '12345', 'name' => 'Simple Product Two'],
-            ['sku' => 'simple', 'name' => 'Simple Product']
         ];
         $this->assertCategoryProducts($baseCategory, $expectedBaseCategoryProducts);
         //Check base category children
@@ -297,8 +297,8 @@ public function testQueryCategoryWithDisabledChildren()
         $this->assertEquals('Its a description of Test Category 1.2', $firstChildCategory['description']);
 
         $firstChildCategoryExpectedProducts = [
-            ['sku' => 'simple-4', 'name' => 'Simple Product Three'],
-            ['sku' => 'simple', 'name' => 'Simple Product']
+            ['sku' => 'simple', 'name' => 'Simple Product'],
+            ['sku' => 'simple-4', 'name' => 'Simple Product Three']
         ];
         $this->assertCategoryProducts($firstChildCategory, $firstChildCategoryExpectedProducts);
         $firstChildCategoryChildren = [];
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoryTreeTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoryTreeTest.php
index d4089161cd894..c2e82e734cd9b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoryTreeTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoryTreeTest.php
@@ -453,7 +453,7 @@ public function testCategoryProducts()
         $this->assertAttributes($firstProduct);
         $this->assertWebsites($firstProductModel, $firstProduct['websites']);
         $this->assertEquals('Category 1', $firstProduct['categories'][0]['name']);
-        $this->assertEquals('movable-position-2', $firstProduct['categories'][1]['url_path']);
+        $this->assertEquals('category-1/category-1-1', $firstProduct['categories'][1]['url_path']);
         $this->assertCount(3, $firstProduct['categories']);
     }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php
index 03e0aefa3a732..9f2ca5fe6de4d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php
@@ -214,8 +214,8 @@ public function testQueryChildCategoriesWithProducts()
         $this->assertEquals('Category 1.2', $secondChildCategory['name']);
         $this->assertEquals('Its a description of Test Category 1.2', $secondChildCategory['description']);
         $firstChildCategoryExpectedProducts = [
-            ['sku' => 'simple-4', 'name' => 'Simple Product Three'],
             ['sku' => 'simple', 'name' => 'Simple Product'],
+            ['sku' => 'simple-4', 'name' => 'Simple Product Three']
         ];
         $this->assertCategoryProducts($secondChildCategory, $firstChildCategoryExpectedProducts);
         $firstChildCategoryChildren = [];
@@ -277,9 +277,9 @@ public function testQueryCategoryWithDisabledChildren()
         $this->assertArrayHasKey('products', $baseCategory);
         //Check base category products
         $expectedBaseCategoryProducts = [
+            ['sku' => 'simple', 'name' => 'Simple Product'],
             ['sku' => 'simple-4', 'name' => 'Simple Product Three'],
-            ['sku' => '12345', 'name' => 'Simple Product Two'],
-            ['sku' => 'simple', 'name' => 'Simple Product']
+            ['sku' => '12345', 'name' => 'Simple Product Two']
         ];
         $this->assertCategoryProducts($baseCategory, $expectedBaseCategoryProducts);
         //Check base category children
@@ -294,8 +294,8 @@ public function testQueryCategoryWithDisabledChildren()
         $this->assertEquals('Its a description of Test Category 1.2', $firstChildCategory['description']);
 
         $firstChildCategoryExpectedProducts = [
-            ['sku' => 'simple-4', 'name' => 'Simple Product Three'],
-            ['sku' => 'simple', 'name' => 'Simple Product']
+            ['sku' => 'simple', 'name' => 'Simple Product'],
+            ['sku' => 'simple-4', 'name' => 'Simple Product Three']
         ];
         $this->assertCategoryProducts($firstChildCategory, $firstChildCategoryExpectedProducts);
         $firstChildCategoryChildren = [];

From d3aa6b61c467748e17045d8ca0d062a50178dd21 Mon Sep 17 00:00:00 2001
From: dnyomo <dnyomo@briteskies.com>
Date: Sun, 2 Aug 2020 13:45:41 -0400
Subject: [PATCH 1176/1718] Updated test

---
 .../Magento/GraphQl/Catalog/CategoryListTest.php          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php
index 9f2ca5fe6de4d..43612575a7dcb 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php
@@ -214,8 +214,8 @@ public function testQueryChildCategoriesWithProducts()
         $this->assertEquals('Category 1.2', $secondChildCategory['name']);
         $this->assertEquals('Its a description of Test Category 1.2', $secondChildCategory['description']);
         $firstChildCategoryExpectedProducts = [
-            ['sku' => 'simple', 'name' => 'Simple Product'],
-            ['sku' => 'simple-4', 'name' => 'Simple Product Three']
+            ['sku' => 'simple-4', 'name' => 'Simple Product Three'],
+            ['sku' => 'simple', 'name' => 'Simple Product']
         ];
         $this->assertCategoryProducts($secondChildCategory, $firstChildCategoryExpectedProducts);
         $firstChildCategoryChildren = [];
@@ -294,8 +294,8 @@ public function testQueryCategoryWithDisabledChildren()
         $this->assertEquals('Its a description of Test Category 1.2', $firstChildCategory['description']);
 
         $firstChildCategoryExpectedProducts = [
-            ['sku' => 'simple', 'name' => 'Simple Product'],
-            ['sku' => 'simple-4', 'name' => 'Simple Product Three']
+            ['sku' => 'simple-4', 'name' => 'Simple Product Three'],
+            ['sku' => 'simple', 'name' => 'Simple Product']
         ];
         $this->assertCategoryProducts($firstChildCategory, $firstChildCategoryExpectedProducts);
         $firstChildCategoryChildren = [];

From 7e5d864a2e574e69a571e2e7f4650cd1fb0fff3e Mon Sep 17 00:00:00 2001
From: dnyomo <dnyomo@briteskies.com>
Date: Sun, 2 Aug 2020 15:58:50 -0400
Subject: [PATCH 1177/1718] missed this test

---
 .../GraphQl/Catalog/CategoriesQuery/CategoriesFilterTest.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 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 679d7659cbf9e..a3daf89631c17 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
@@ -297,8 +297,8 @@ public function testQueryCategoryWithDisabledChildren()
         $this->assertEquals('Its a description of Test Category 1.2', $firstChildCategory['description']);
 
         $firstChildCategoryExpectedProducts = [
-            ['sku' => 'simple', 'name' => 'Simple Product'],
-            ['sku' => 'simple-4', 'name' => 'Simple Product Three']
+            ['sku' => 'simple-4', 'name' => 'Simple Product Three'],
+            ['sku' => 'simple', 'name' => 'Simple Product']
         ];
         $this->assertCategoryProducts($firstChildCategory, $firstChildCategoryExpectedProducts);
         $firstChildCategoryChildren = [];

From 2858213f75bbe2b1e29a658208bfe77ab4e61b8b Mon Sep 17 00:00:00 2001
From: SmVladyslav <vlatame.tsg@gmail.com>
Date: Mon, 3 Aug 2020 08:45:07 +0300
Subject: [PATCH 1178/1718] MC-31304: [ElasticSearch] Exception on catalog
 search result page

---
 .../testsuite/Magento/Catalog/_files/category_attribute.php    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_attribute.php
index 31a6e6ee85b2a..2bd2d3fbc9548 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_attribute.php
@@ -4,9 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attribute */
+/** @var Attribute $attribute */
 
 use Magento\Catalog\Model\Category\AttributeFactory;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
 use Magento\TestFramework\Helper\Bootstrap;
 
 /** @var AttributeFactory $attributeFactory */

From 07157534b27591192f9451754de69826189a540a Mon Sep 17 00:00:00 2001
From: SmVladyslav <vlatame.tsg@gmail.com>
Date: Mon, 3 Aug 2020 09:00:22 +0300
Subject: [PATCH 1179/1718] MC-31304: [ElasticSearch] Exception on catalog
 search result page

---
 .../testsuite/Magento/Catalog/_files/category_attribute.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_attribute.php
index 2bd2d3fbc9548..6b85b27929c2c 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_attribute.php
@@ -7,7 +7,7 @@
 /** @var Attribute $attribute */
 
 use Magento\Catalog\Model\Category\AttributeFactory;
-use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\Catalog\Model\Category\Attribute;
 use Magento\TestFramework\Helper\Bootstrap;
 
 /** @var AttributeFactory $attributeFactory */

From 7e15dc00c7394d4bb26142f675a6fad8145af4e4 Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Mon, 3 Aug 2020 10:57:16 +0300
Subject: [PATCH 1180/1718] MC-36250: Admin can not configure wish list item
 for secondary store

---
 .../Item/Product/CollectionBuilder.php        | 26 +++++++++++++++++
 .../Model/ResourceModel/Item/Collection.php   | 24 ++++++++++------
 .../Item/Product/CollectionBuilder.php        | 28 +++++++++++++++++++
 .../Product/CollectionBuilderInterface.php    | 26 +++++++++++++++++
 app/code/Magento/Wishlist/Model/Wishlist.php  |  2 +-
 .../Magento/Wishlist/etc/adminhtml/di.xml     |  2 ++
 app/code/Magento/Wishlist/etc/di.xml          |  2 ++
 .../Magento/Wishlist/Model/WishlistTest.php   | 21 ++++++++++++++
 8 files changed, 121 insertions(+), 10 deletions(-)
 create mode 100644 app/code/Magento/Wishlist/Model/Adminhtml/ResourceModel/Item/Product/CollectionBuilder.php
 create mode 100644 app/code/Magento/Wishlist/Model/ResourceModel/Item/Product/CollectionBuilder.php
 create mode 100644 app/code/Magento/Wishlist/Model/ResourceModel/Item/Product/CollectionBuilderInterface.php

diff --git a/app/code/Magento/Wishlist/Model/Adminhtml/ResourceModel/Item/Product/CollectionBuilder.php b/app/code/Magento/Wishlist/Model/Adminhtml/ResourceModel/Item/Product/CollectionBuilder.php
new file mode 100644
index 0000000000000..aa54c17c243b0
--- /dev/null
+++ b/app/code/Magento/Wishlist/Model/Adminhtml/ResourceModel/Item/Product/CollectionBuilder.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Wishlist\Model\Adminhtml\ResourceModel\Item\Product;
+
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Wishlist\Model\ResourceModel\Item\Collection as WishlistItemCollection;
+use Magento\Wishlist\Model\ResourceModel\Item\Product\CollectionBuilderInterface;
+
+/**
+ * Wishlist items products collection builder for adminhtml area
+ */
+class CollectionBuilder implements CollectionBuilderInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function build(WishlistItemCollection $wishlistItemCollection, Collection $productCollection): Collection
+    {
+        return $productCollection;
+    }
+}
diff --git a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php
index 3fd51dbfbc2d7..5d9b1911bc292 100644
--- a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php
+++ b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php
@@ -11,6 +11,7 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Sales\Model\ConfigInterface;
+use Magento\Wishlist\Model\ResourceModel\Item\Product\CollectionBuilderInterface;
 
 /**
  * Wishlist item collection
@@ -157,6 +158,10 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @var ConfigInterface
      */
     private $salesConfig;
+    /**
+     * @var CollectionBuilderInterface
+     */
+    private $productCollectionBuilder;
 
     /**
      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
@@ -178,8 +183,8 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param \Magento\Framework\App\State $appState
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param TableMaintainer|null $tableMaintainer
-     * @param  ConfigInterface|null $salesConfig
-     *
+     * @param ConfigInterface|null $salesConfig
+     * @param CollectionBuilderInterface|null $productCollectionBuilder
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -202,7 +207,8 @@ public function __construct(
         \Magento\Framework\App\State $appState,
         \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
         TableMaintainer $tableMaintainer = null,
-        ConfigInterface $salesConfig = null
+        ConfigInterface $salesConfig = null,
+        ?CollectionBuilderInterface $productCollectionBuilder = null
     ) {
         $this->stockConfiguration = $stockConfiguration;
         $this->_adminhtmlSales = $adminhtmlSales;
@@ -219,6 +225,8 @@ public function __construct(
         parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $connection, $resource);
         $this->tableMaintainer = $tableMaintainer ?: ObjectManager::getInstance()->get(TableMaintainer::class);
         $this->salesConfig = $salesConfig ?: ObjectManager::getInstance()->get(ConfigInterface::class);
+        $this->productCollectionBuilder = $productCollectionBuilder
+            ?: ObjectManager::getInstance()->get(CollectionBuilderInterface::class);
     }
 
     /**
@@ -309,12 +317,10 @@ protected function _assignProducts()
             $productCollection->setVisibility($this->_productVisibility->getVisibleInSiteIds());
         }
 
-        $productCollection->addPriceData()
-            ->addTaxPercents()
-            ->addIdFilter($this->_productIds)
-            ->addAttributeToSelect($this->_wishlistConfig->getProductAttributes())
-            ->addOptionsToResult()
-            ->addUrlRewrite();
+        $productCollection->addIdFilter($this->_productIds)
+            ->addAttributeToSelect($this->_wishlistConfig->getProductAttributes());
+
+        $productCollection = $this->productCollectionBuilder->build($this, $productCollection);
 
         if ($this->_productSalable) {
             $productCollection = $this->_adminhtmlSales->applySalableProductTypesFilter($productCollection);
diff --git a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Product/CollectionBuilder.php b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Product/CollectionBuilder.php
new file mode 100644
index 0000000000000..05255d1fe39f7
--- /dev/null
+++ b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Product/CollectionBuilder.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Wishlist\Model\ResourceModel\Item\Product;
+
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Wishlist\Model\ResourceModel\Item\Collection as WishlistItemCollection;
+
+/**
+ * Wishlist items products collection builder
+ */
+class CollectionBuilder implements CollectionBuilderInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function build(WishlistItemCollection $wishlistItemCollection, Collection $productCollection): Collection
+    {
+        return $productCollection->addPriceData()
+            ->addTaxPercents()
+            ->addOptionsToResult()
+            ->addUrlRewrite();
+    }
+}
diff --git a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Product/CollectionBuilderInterface.php b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Product/CollectionBuilderInterface.php
new file mode 100644
index 0000000000000..1984d92e08a60
--- /dev/null
+++ b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Product/CollectionBuilderInterface.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Wishlist\Model\ResourceModel\Item\Product;
+
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Wishlist\Model\ResourceModel\Item\Collection as WishlistItemCollection;
+
+/**
+ * Wishlist items products collection builder
+ */
+interface CollectionBuilderInterface
+{
+    /**
+     * Modify product collection
+     *
+     * @param WishlistItemCollection $wishlistItemCollection
+     * @param Collection $productCollection
+     * @return Collection
+     */
+    public function build(WishlistItemCollection $wishlistItemCollection, Collection $productCollection): Collection;
+}
diff --git a/app/code/Magento/Wishlist/Model/Wishlist.php b/app/code/Magento/Wishlist/Model/Wishlist.php
index 1789725791de8..9624eebc197a9 100644
--- a/app/code/Magento/Wishlist/Model/Wishlist.php
+++ b/app/code/Magento/Wishlist/Model/Wishlist.php
@@ -383,7 +383,7 @@ public function getItemCollection()
                 $this
             )->addStoreFilter(
                 $this->getSharedStoreIds()
-            )->setVisibilityFilter();
+            )->setVisibilityFilter($this->_useCurrentWebsite);
         }
 
         return $this->_itemCollection;
diff --git a/app/code/Magento/Wishlist/etc/adminhtml/di.xml b/app/code/Magento/Wishlist/etc/adminhtml/di.xml
index 124b8c17c3f36..be4d1966a46e9 100644
--- a/app/code/Magento/Wishlist/etc/adminhtml/di.xml
+++ b/app/code/Magento/Wishlist/etc/adminhtml/di.xml
@@ -24,4 +24,6 @@
     <type name="Magento\Catalog\Model\ResourceModel\Product">
         <plugin name="cleanups_wishlist_item_after_product_delete" type="Magento\Wishlist\Plugin\Model\ResourceModel\Product" />
     </type>
+    <preference for="Magento\Wishlist\Model\ResourceModel\Item\Product\CollectionBuilderInterface"
+                type="Magento\Wishlist\Model\Adminhtml\ResourceModel\Item\Product\CollectionBuilder"/>
 </config>
diff --git a/app/code/Magento/Wishlist/etc/di.xml b/app/code/Magento/Wishlist/etc/di.xml
index c0230a5326f40..924bdfa3eb584 100644
--- a/app/code/Magento/Wishlist/etc/di.xml
+++ b/app/code/Magento/Wishlist/etc/di.xml
@@ -78,4 +78,6 @@
             </argument>
         </arguments>
     </type>
+    <preference for="Magento\Wishlist\Model\ResourceModel\Item\Product\CollectionBuilderInterface"
+                type="Magento\Wishlist\Model\ResourceModel\Item\Product\CollectionBuilder"/>
 </config>
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php
index 29dda2bbde581..c91cef0e95360 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php
@@ -272,6 +272,27 @@ public function testUpdateNotExistingProductInWishList(): void
         $wishlist->updateItem($item, []);
     }
 
+    /**
+     * Test that admin user should be able to update wishlist on second website
+     *
+     * @magentoAppArea adminhtml
+     * @magentoDbIsolation disabled
+     * @magentoDataFixture Magento/Wishlist/_files/wishlist_on_second_website.php
+     *
+     * @return void
+     */
+    public function testUpdateWishListItemOnSecondWebsite(): void
+    {
+        $wishlist = $this->getWishlistByCustomerId->execute(1);
+        $item = $this->getWishlistByCustomerId->getItemBySku(1, 'simple-2');
+        $this->assertNotNull($item);
+        $this->assertEquals(1, $item->getQty());
+        $buyRequest = $this->dataObjectFactory->create(['data' => ['qty' => 2]]);
+        $wishlist->updateItem($item->getId(), $buyRequest);
+        $updatedItem = $this->getWishlistByCustomerId->getItemBySku(1, 'simple-2');
+        $this->assertEquals(2, $updatedItem->getQty());
+    }
+
     /**
      * Assert item in wish list.
      *

From ec098d26e7735528beb8ef338b1eeb25eab3a1a1 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Mon, 3 Aug 2020 11:01:09 +0100
Subject: [PATCH 1181/1718] Media modules

---
 .../Console/Command/Synchronize.php           |  70 +++
 .../MediaContentSynchronization/LICENSE.txt   |  48 ++
 .../LICENSE_AFL.txt                           |  48 ++
 .../Model/Consume.php                         |  37 ++
 .../Model/Publish.php                         |  45 ++
 .../Model/RemoveObsoleteContentAsset.php      |  61 +++
 .../ResourceModel/GetOutdatedRelations.php    | 120 +++++
 .../Model/Synchronize.php                     | 109 ++++
 .../Plugin/SynchronizeMediaContent.php        |  41 ++
 .../MediaContentSynchronization/README.md     |  14 +
 .../MediaContentSynchronization/composer.json |  27 +
 .../etc/communication.xml                     |  14 +
 .../MediaContentSynchronization/etc/di.xml    |  21 +
 .../etc/module.xml                            |  10 +
 .../etc/queue_consumer.xml                    |  11 +
 .../etc/queue_publisher.xml                   |  12 +
 .../etc/queue_topology.xml                    |  14 +
 .../registration.php                          |  14 +
 .../Api/SynchronizeInterface.php              |  21 +
 .../Api/SynchronizerInterface.php             |  21 +
 .../LICENSE.txt                               |  48 ++
 .../LICENSE_AFL.txt                           |  48 ++
 .../Model/GetEntities.php                     |  38 ++
 .../Model/GetEntitiesInterface.php            |  21 +
 .../Model/SynchronizerPool.php                |  51 ++
 .../MediaContentSynchronizationApi/README.md  |  13 +
 .../composer.json                             |  21 +
 .../MediaContentSynchronizationApi/etc/di.xml |  10 +
 .../etc/module.xml                            |  10 +
 .../registration.php                          |  14 +
 .../LICENSE.txt                               |  48 ++
 .../LICENSE_AFL.txt                           |  48 ++
 .../Model/Synchronizer/Category.php           | 112 ++++
 .../Model/Synchronizer/Product.php            | 109 ++++
 .../README.md                                 |  13 +
 .../Model/Synchronizer/CategoryTest.php       |  85 ++++
 .../Model/Synchronizer/ProductTest.php        |  85 ++++
 .../composer.json                             |  24 +
 .../etc/di.xml                                |  41 ++
 .../etc/module.xml                            |  10 +
 .../registration.php                          |  14 +
 .../LICENSE.txt                               |  48 ++
 .../LICENSE_AFL.txt                           |  48 ++
 .../Model/Synchronizer/Block.php              | 107 ++++
 .../Model/Synchronizer/Page.php               | 107 ++++
 .../MediaContentSynchronizationCms/README.md  |  13 +
 .../Model/Synchronizer/BlockTest.php          | 109 ++++
 .../Model/Synchronizer/PageTest.php           | 109 ++++
 .../composer.json                             |  24 +
 .../MediaContentSynchronizationCms/etc/di.xml |  39 ++
 .../etc/module.xml                            |  10 +
 .../registration.php                          |  14 +
 .../LICENSE.txt                               |  48 ++
 .../LICENSE_AFL.txt                           |  48 ++
 .../SaveBaseCategoryImageInformation.php      | 109 ++++
 .../MediaGalleryCatalogIntegration/README.md  |   3 +
 .../composer.json                             |  28 +
 .../etc/adminhtml/di.xml                      |  12 +
 .../etc/module.xml                            |  10 +
 .../registration.php                          |  14 +
 .../Controller/Adminhtml/Category/Index.php   |  36 ++
 .../Magento/MediaGalleryCatalogUi/LICENSE.txt |  48 ++
 .../MediaGalleryCatalogUi/LICENSE_AFL.txt     |  48 ++
 .../Model/Listing/DataProvider.php            | 199 ++++++++
 .../Magento/MediaGalleryCatalogUi/README.md   |  13 +
 ...sertCategoryGridPageDetailsActionGroup.xml |  20 +
 .../AdminOpenCategoryGridPageActionGroup.xml  |  18 +
 ...nMediaGalleryCatalogUiCategoryGridPage.xml |  12 +
 ...diaGalleryCatalogUiCategoryGridSection.xml |  17 +
 ...lleryCatalogUiUsedInCategoryFilterTest.xml |  63 +++
 ...alleryCatalogUiUsedInProductFilterTest.xml |  73 +++
 ...eryCatalogUiVerifyCategoryGridPageTest.xml |  31 ++
 .../Listing/Columns/CategoryActions.php       |  66 +++
 .../Ui/Component/Listing/Columns/Path.php     |  80 +++
 .../Component/Listing/Columns/Thumbnail.php   |  91 ++++
 .../MediaGalleryCatalogUi/composer.json       |  26 +
 .../etc/adminhtml/di.xml                      |  41 ++
 .../etc/adminhtml/routes.xml                  |  15 +
 .../MediaGalleryCatalogUi/etc/module.xml      |  10 +
 .../MediaGalleryCatalogUi/registration.php    |  14 +
 .../media_gallery_catalog_category_index.xml  |  15 +
 .../media_gallery_category_listing.xml        | 180 +++++++
 .../ui_component/media_gallery_listing.xml    |  65 +++
 .../standalone_media_gallery_listing.xml      |  65 +++
 .../adminhtml/web/css/source/_module.less     |  23 +
 .../Controller/Adminhtml/Block/Search.php     |  97 ++++
 .../Controller/Adminhtml/Page/Search.php      |  97 ++++
 .../Magento/MediaGalleryCmsUi/LICENSE.txt     |  48 ++
 .../Magento/MediaGalleryCmsUi/LICENSE_AFL.txt |  48 ++
 app/code/Magento/MediaGalleryCmsUi/README.md  |  13 +
 ...FillOutCustomCMSPageContentActionGroup.xml |  30 ++
 ...ediaGalleryCmsUiUsedInBlocksFilterTest.xml |  60 +++
 ...MediaGalleryCmsUiUsedInPagesFilterTest.xml |  68 +++
 .../Magento/MediaGalleryCmsUi/composer.json   |  23 +
 .../MediaGalleryCmsUi/etc/adminhtml/di.xml    |  41 ++
 .../etc/adminhtml/routes.xml                  |  15 +
 .../Magento/MediaGalleryCmsUi/etc/module.xml  |  10 +
 .../MediaGalleryCmsUi/registration.php        |  14 +
 .../ui_component/media_gallery_listing.xml    |  62 +++
 .../standalone_media_gallery_listing.xml      |  62 +++
 .../MediaGalleryIntegration/LICENSE.txt       |  48 ++
 .../MediaGalleryIntegration/LICENSE_AFL.txt   |  48 ++
 .../Model/OpenDialogUrlProvider.php           |  40 ++
 .../Plugin/SaveImageInformation.php           | 112 ++++
 .../Magento/MediaGalleryIntegration/README.md |   3 +
 .../Model/ImageComponentOpenDialogUrlTest.php |  72 +++
 .../Model/OpenDialogUrlProviderTest.php       |  63 +++
 .../Model/TinyMceOpenDialogUrlTest.php        |  78 +++
 .../WysiwygDefaultConfigOpenDialogUrlTest.php |  82 +++
 .../MediaGalleryIntegration/composer.json     |  31 ++
 .../etc/adminhtml/di.xml                      |  17 +
 .../MediaGalleryIntegration/etc/module.xml    |  14 +
 .../MediaGalleryIntegration/registration.php  |  10 +
 .../Magento/MediaGalleryMetadata/LICENSE.txt  |  48 ++
 .../MediaGalleryMetadata/LICENSE_AFL.txt      |  48 ++
 .../Model/AddIptcMetadata.php                 | 180 +++++++
 .../Model/AddXmpMetadata.php                  | 104 ++++
 .../MediaGalleryMetadata/Model/File.php       |  79 +++
 .../Model/File/AddMetadata.php                | 106 ++++
 .../Model/File/ExtractMetadata.php            | 129 +++++
 .../Model/GetIptcMetadata.php                 |  71 +++
 .../Model/GetXmpMetadata.php                  |  66 +++
 .../Model/Gif/ReadFile.php                    | 318 ++++++++++++
 .../Model/Gif/Segment/ReadXmp.php             |  97 ++++
 .../Model/Gif/Segment/WriteXmp.php            | 191 +++++++
 .../Model/Gif/WriteFile.php                   |  76 +++
 .../Model/Jpeg/ReadFile.php                   | 209 ++++++++
 .../Model/Jpeg/Segment/ReadIptc.php           |  76 +++
 .../Model/Jpeg/Segment/ReadXmp.php            |  85 ++++
 .../Model/Jpeg/Segment/WriteIptc.php          | 100 ++++
 .../Model/Jpeg/Segment/WriteXmp.php           | 156 ++++++
 .../Model/Jpeg/WriteFile.php                  |  92 ++++
 .../MediaGalleryMetadata/Model/Metadata.php   |  95 ++++
 .../Model/Png/ReadFile.php                    | 127 +++++
 .../Model/Png/Segment/ReadIptc.php            | 136 +++++
 .../Model/Png/Segment/ReadXmp.php             |  86 ++++
 .../Model/Png/Segment/WriteIptc.php           | 214 ++++++++
 .../Model/Png/Segment/WriteXmp.php            | 163 ++++++
 .../Model/Png/WriteFile.php                   |  78 +++
 .../MediaGalleryMetadata/Model/Segment.php    |  79 +++
 .../Model/SegmentNames.php                    | 104 ++++
 .../Model/XmpTemplate.php                     |  58 +++
 .../Magento/MediaGalleryMetadata/README.md    |   3 +
 .../Integration/Model/AddMetadataTest.php     | 197 ++++++++
 .../Integration/Model/ExtractMetadataTest.php | 112 ++++
 .../Integration/Model/Gif/Segment/XmpTest.php | 117 +++++
 .../Model/Jpeg/Segment/IptcTest.php           | 134 +++++
 .../Model/Jpeg/Segment/XmpTest.php            | 117 +++++
 .../Model/Png/Segment/IptcTest.php            | 134 +++++
 .../Test/_files/empty_exiftool.gif            | Bin 0 -> 7951 bytes
 .../Test/_files/empty_iptc.jpeg               | Bin 0 -> 19416 bytes
 .../Test/_files/empty_iptc.png                | Bin 0 -> 47596 bytes
 .../Test/_files/empty_xmp_image.jpeg          | Bin 0 -> 19336 bytes
 .../Test/_files/empty_xmp_image.png           | Bin 0 -> 55268 bytes
 .../Test/_files/exiftool.gif                  | Bin 0 -> 12704 bytes
 .../Test/_files/iptc_only.jpeg                | Bin 0 -> 19884 bytes
 .../Test/_files/iptc_only.png                 | Bin 0 -> 47894 bytes
 .../Test/_files/macos-photos.jpeg             | Bin 0 -> 22795 bytes
 .../Test/_files/macos-preview.png             | Bin 0 -> 57535 bytes
 .../MediaGalleryMetadata/composer.json        |  22 +
 .../MediaGalleryMetadata/etc/default.xmp      |  24 +
 .../Magento/MediaGalleryMetadata/etc/di.xml   | 127 +++++
 .../MediaGalleryMetadata/etc/module.xml       |  10 +
 .../MediaGalleryMetadata/registration.php     |  14 +
 .../Api/AddMetadataInterface.php              |  27 +
 .../Api/Data/MetadataInterface.php            |  54 ++
 .../Api/ExtractMetadataInterface.php          |  25 +
 .../MediaGalleryMetadataApi/LICENSE.txt       |  48 ++
 .../MediaGalleryMetadataApi/LICENSE_AFL.txt   |  48 ++
 .../Model/AddMetadataComposite.php            |  51 ++
 .../Model/ExtractMetadataComposite.php        |  78 +++
 .../Model/FileInterface.php                   |  46 ++
 .../Model/ReadFileInterface.php               |  22 +
 .../Model/ReadMetadataInterface.php           |  28 +
 .../Model/SegmentInterface.php                |  46 ++
 .../Model/WriteFileInterface.php              |  26 +
 .../Model/WriteMetadataInterface.php          |  24 +
 .../Magento/MediaGalleryMetadataApi/README.md |   3 +
 .../MediaGalleryMetadataApi/composer.json     |  21 +
 .../MediaGalleryMetadataApi/etc/module.xml    |  10 +
 .../MediaGalleryMetadataApi/registration.php  |  14 +
 .../MediaGalleryRenditions/LICENSE.txt        |  48 ++
 .../MediaGalleryRenditions/LICENSE_AFL.txt    |  48 ++
 .../Magento/MediaGalleryRenditions/README.md  |  13 +
 .../MediaGalleryRenditions/composer.json      |  21 +
 .../etc/adminhtml/system.xml                  |  24 +
 .../MediaGalleryRenditions/etc/config.xml     |  17 +
 .../MediaGalleryRenditions/etc/module.xml     |  10 +
 .../MediaGalleryRenditions/registration.php   |  14 +
 .../MediaGalleryRenditionsApi/LICENSE.txt     |  48 ++
 .../MediaGalleryRenditionsApi/LICENSE_AFL.txt |  48 ++
 .../Model/Config.php                          |  62 +++
 .../MediaGalleryRenditionsApi/README.md       |  13 +
 .../MediaGalleryRenditionsApi/composer.json   |  21 +
 .../MediaGalleryRenditionsApi/etc/module.xml  |  10 +
 .../registration.php                          |  14 +
 .../Controller/Adminhtml/Asset/Search.php     | 169 +++++++
 .../Adminhtml/Directories/Create.php          | 108 ++++
 .../Adminhtml/Directories/Delete.php          | 118 +++++
 .../Adminhtml/Directories/GetTree.php         |  80 +++
 .../Controller/Adminhtml/Image/Delete.php     | 143 ++++++
 .../Controller/Adminhtml/Image/Details.php    | 110 ++++
 .../Adminhtml/Image/SaveDetails.php           | 128 +++++
 .../Controller/Adminhtml/Image/Upload.php     | 107 ++++
 .../Controller/Adminhtml/Index/Index.php      |  51 ++
 .../Controller/Adminhtml/Media/Index.php      |  38 ++
 app/code/Magento/MediaGalleryUi/LICENSE.txt   |  48 ++
 .../Magento/MediaGalleryUi/LICENSE_AFL.txt    |  48 ++
 .../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 ++
 .../Magento/MediaGalleryUi/Model/Config.php   |  48 ++
 .../MediaGalleryUi/Model/DeleteImage.php      |  81 +++
 .../Model/Directories/FolderTree.php          | 149 ++++++
 .../Model/GetDetailsByAssetId.php             | 144 ++++++
 .../Model/Listing/DataProvider.php            | 104 ++++
 .../FilterProcessor/ContentField.php          |  48 ++
 .../FilterProcessor/Directory.php             |  26 +
 .../FilterProcessor/Duplicated.php            |  58 +++
 .../FilterProcessor/Entity.php                |  78 +++
 .../FilterProcessor/EntityType.php            | 104 ++++
 .../FilterProcessor/Keyword.php               |  80 +++
 .../MediaGalleryUi/Model/UpdateAsset.php      | 118 +++++
 .../Model/UpdateAsset/SaveMetadataToFile.php  |  65 +++
 .../Model/UpdateAsset/UpdateKeywords.php      |  81 +++
 .../MediaGalleryUi/Model/UploadImage.php      |  58 +++
 .../Plugin/CreateThumbnails.php               |  57 +++
 app/code/Magento/MediaGalleryUi/README.md     |  13 +
 ...ageInStandaloneMediaGalleryActionGroup.xml |  21 +
 ...eryAddImageFromImageDetailsActionGroup.xml |  19 +
 ...alleryApplyDuplicatedFilterActionGroup.xml |  18 +
 ...cedMediaGalleryApplyFiltersActionGroup.xml |  19 +
 ...aGalleryAssertActiveFiltersActionGroup.xml |  21 +
 ...ryAssertImagesDeletedInBulkActionGroup.xml |  18 +
 ...AssertMassActionModeDetailsActionGroup.xml |  21 +
 ...sertMassActionModeNotActiveActionGroup.xml |  19 +
 ...ssertNoActiveFiltersAppliedActionGroup.xml |  17 +
 ...GalleryAssertWarningMessageActionGroup.xml |  21 +
 ...eryCategoryGridApplyFiltersActionGroup.xml |  19 +
 ...eryCategoryGridExpandFilterActionGroup.xml |  19 +
 ...leryClickDeleteImagesButtonActionGroup.xml |  19 +
 ...ediaGalleryCloseViewDetailsActionGroup.xml |  19 +
 ...aGalleryConfirmDeleteImagesActionGroup.xml |  19 +
 ...dMediaGalleryDeleteGridViewActionGroup.xml |  25 +
 ...alleryDisableMassactionModeActionGroup.xml |  20 +
 ...ediaGalleryEditImageDetailsActionGroup.xml |  20 +
 ...GalleryEnableMassActionModeActionGroup.xml |  19 +
 ...cedMediaGalleryExpandFilterActionGroup.xml |  19 +
 ...ncedMediaGalleryImageDeleteActionGroup.xml |  22 +
 ...iaGalleryImageDetailsDeleteActionGroup.xml |  21 +
 ...ediaGalleryImageDetailsEditActionGroup.xml |  18 +
 ...ediaGalleryImageDetailsSaveActionGroup.xml |  24 +
 ...dMediaGallerySaveCustomViewActionGroup.xml |  24 +
 ...rySelectCustomBookmarksViewActionGroup.xml |  23 +
 ...erySelectImageForMassActionActionGroup.xml |  21 +
 ...iaGallerySelectSourceFilterActionGroup.xml |  22 +
 ...iaGallerySelectUsedInFilterActionGroup.xml |  25 +
 ...ncedMediaGalleryUploadImageActionGroup.xml |  24 +
 ...lleryVerifyImageDescriptionActionGroup.xml |  25 +
 ...iaGalleryVerifyImageDetailsActionGroup.xml |  37 ++
 ...aGalleryVerifyImageFilenameActionGroup.xml |  25 +
 ...aGalleryVerifyImageKeywordsActionGroup.xml |  25 +
 ...ediaGalleryVerifyImageTitleActionGroup.xml |  25 +
 ...ediaGalleryViewImageDetailsActionGroup.xml |  20 +
 ...diaGalleryApplySelectFilterActionGroup.xml |  23 +
 ...diaGalleryApplyUsedInFilterActionGroup.xml |  23 +
 ...tCategoryNameInCategoryGridActionGroup.xml |  21 +
 ...eryAssertFolderDoesNotExistActionGroup.xml |  18 +
 ...ediaGalleryAssertFolderNameActionGroup.xml |  17 +
 ...diaGalleryAssertImageInGridActionGroup.xml |  21 +
 ...sertImageNotExistsInTheGridActionGroup.xml |  21 +
 ...ediaGalleryClickAddSelectedActionGroup.xml |  16 +
 ...ediaGalleryClickImageInGridActionGroup.xml |  21 +
 ...alleryClickOkButtonTinyMce4ActionGroup.xml |  20 +
 ...MediaGalleryCreateNewFolderActionGroup.xml |  18 +
 ...aGalleryEditAssetAddKeywordActionGroup.xml |  22 +
 ...nMediaGalleryEnhancedEnableActionGroup.xml |  24 +
 ...minMediaGalleryFolderDeleteActionGroup.xml |  17 +
 ...minMediaGalleryFolderSelectActionGroup.xml |  19 +
 ...dminMediaGalleryImageDeleteActionGroup.xml |  21 +
 ...diaGalleryOpenNewFolderFormActionGroup.xml |  15 +
 ...ryFromCategoryImageUploaderActionGroup.xml |  20 +
 ...ediaGalleryFromPageNoEditorActionGroup.xml |  20 +
 ...ediaGalleryFromTinyMce4IconActionGroup.xml |  22 +
 ...nOpenStandaloneMediaGalleryActionGroup.xml |  15 +
 ...cedMediaGalleryImageDeletedActionGroup.xml |  20 +
 ...sertImageAddedToPageContentActionGroup.xml |  24 +
 ...butesOnEnhancedMediaGalleryActionGroup.xml |  36 ++
 ...lleryAdminDataGridByKeywordActionGroup.xml |  19 +
 ...tImageInCategoryDescriptionActionGroup.xml |  26 +
 .../AdminEnhancedMediaGalleryImageData.xml    |  43 ++
 .../Mftf/Data/AdminMediaGalleryFolderData.xml |  17 +
 .../Test/Mftf/Data/AdobeStockConfigData.xml   |  18 +
 .../Page/AdminStandaloneMediaGalleryPage.xml  |  12 +
 .../Mftf/Section/AdminConfigSystemSection.xml |  15 +
 ...dminEnhancedMediaGalleryActionsSection.xml |  17 +
 ...EnhancedMediaGalleryDeleteModalSection.xml |  14 +
 ...EnhancedMediaGalleryEditDetailsSection.xml |  20 +
 ...dminEnhancedMediaGalleryFiltersSection.xml |  29 ++
 ...nhancedMediaGalleryImageActionsSection.xml |  17 +
 ...cedMediaGalleryImageDescriptionSection.xml |  15 +
 ...nEnhancedMediaGalleryMassActionSection.xml |  16 +
 ...EnhancedMediaGalleryViewDetailsSection.xml |  24 +
 .../AdminMediaGalleryFolderSection.xml        |  22 +
 .../AdminMediaGalleryHeaderButtonsSection.xml |  15 +
 .../Test/Mftf/Suite/MediaGalleryUiSuite.xml   |  29 ++
 ...ncedMediaGalleryDeleteImagesInBulkTest.xml |  50 ++
 ...hancedMediaGalleryDuplicatedImagesTest.xml |  55 ++
 ...ediaGalleryUploadImageWithMetadataTest.xml |  70 +++
 ...ancedMediaGalleryVerifyAssetFilterTest.xml |  80 +++
 ...iaGalleryVerifyNotUsedOptionFilterTest.xml |  79 +++
 ...ncedMediaGalleryVerifyUsedInFilterTest.xml |  83 +++
 ...yAddCategoryImageFromTwoComponentsTest.xml |  78 +++
 .../AdminMediaGalleryAddCategoryImageTest.xml |  55 ++
 ...minMediaGalleryAddFromImageDetailsTest.xml |  41 ++
 ...dminMediaGalleryCreateDeleteFolderTest.xml |  57 +++
 ...MediaGalleryDeleteImageContextMenuTest.xml |  33 ++
 .../AdminMediaGalleryDeleteImageFileTest.xml  |  41 ++
 ...GalleryDeleteImageWithWarningPopupTest.xml |  56 ++
 ...nMediaGalleryDisabledContentFilterTest.xml |  65 +++
 .../AdminMediaGalleryEditImageDetailsTest.xml |  48 ++
 ...inMediaGalleryEnabledContentFilterTest.xml |  57 +++
 ...inMediaGalleryFilterImagesBySourceTest.xml |  53 ++
 .../AdminMediaGallerySaveFiltersStateTest.xml |  45 ++
 ...ediaGalleryStoreViewCategoryFilterTest.xml |  62 +++
 ...MediaGalleryStoreViewContentFilterTest.xml |  61 +++
 ...minMediaGalleryUploadCategoryImageTest.xml |  43 ++
 ...iaGalleryVerifyImageGridAttributesTest.xml |  37 ++
 ...MediaGalleryViewDetailsDeleteImageTest.xml |  37 ++
 .../AdminMediaGalleryViewDetailsEditTest.xml  |  46 ++
 .../Test/AdminMediaGalleryViewDetailsTest.xml |  40 ++
 ...loneMediaGalleryCreateDeleteFolderTest.xml |  56 ++
 ...daloneMediaGalleryEditImageDetailsTest.xml |  47 ++
 ...ndaloneMediaGalleryViewDetailsEditTest.xml |  55 ++
 ...nStandaloneMediaGalleryViewDetailsTest.xml |  40 ++
 .../Test/Unit/Model/ConfigTest.php            |  64 +++
 .../Test/Unit/Model/UploadImageTest.php       | 136 +++++
 .../Test/Unit/_files/subdir/test_img2.jpeg    | Bin 0 -> 58077 bytes
 .../Test/Unit/_files/test_img1.jpeg           | Bin 0 -> 58077 bytes
 .../Ui/Component/DirectoriesTree.php          |  60 +++
 .../Ui/Component/ImageUploader.php            |  71 +++
 .../Ui/Component/ImageUploaderStandAlone.php  |  36 ++
 .../Listing/Columns/SourceIconProvider.php    | 106 ++++
 .../Ui/Component/Listing/Columns/Url.php      | 119 +++++
 .../Ui/Component/Listing/Filters/Asset.php    | 102 ++++
 .../Listing/Filters/Options/Status.php        |  27 +
 .../Listing/Filters/Options/Store.php         |  42 ++
 .../Listing/Filters/Options/UsedIn.php        |  37 ++
 .../Ui/Component/Listing/Provider.php         |  88 ++++
 app/code/Magento/MediaGalleryUi/composer.json |  30 ++
 .../MediaGalleryUi/etc/adminhtml/di.xml       |  70 +++
 .../MediaGalleryUi/etc/adminhtml/menu.xml     |  13 +
 .../MediaGalleryUi/etc/adminhtml/routes.xml   |  15 +
 .../MediaGalleryUi/etc/adminhtml/system.xml   |  21 +
 .../Magento/MediaGalleryUi/etc/config.xml     |  16 +
 app/code/Magento/MediaGalleryUi/etc/di.xml    |  59 +++
 .../Magento/MediaGalleryUi/etc/module.xml     |  14 +
 .../Magento/MediaGalleryUi/i18n/en_US.csv     |   8 +
 .../Magento/MediaGalleryUi/registration.php   |  10 +
 .../layout/media_gallery_index_index.xml      |  32 ++
 .../layout/media_gallery_media_index.xml      |  26 +
 .../view/adminhtml/templates/container.phtml  |  29 ++
 .../adminhtml/templates/image_details.phtml   | 109 ++++
 .../templates/image_details_standalone.phtml  | 101 ++++
 .../templates/image_edit_details.phtml        |  97 ++++
 .../image_edit_details_standalone.phtml       |  99 ++++
 .../ui_component/cms_block_listing.xml        |  38 ++
 .../ui_component/cms_page_listing.xml         |  38 ++
 .../ui_component/media_gallery_listing.xml    | 393 ++++++++++++++
 .../ui_component/product_listing.xml          |  38 ++
 .../standalone_media_gallery_listing.xml      | 380 ++++++++++++++
 .../adminhtml/web/css/source/_module.less     | 478 ++++++++++++++++++
 .../view/adminhtml/web/images/3-dots.png      | Bin 0 -> 3533 bytes
 .../view/adminhtml/web/images/Astock.png      | Bin 0 -> 359 bytes
 .../view/adminhtml/web/images/d.png           | Bin 0 -> 12159 bytes
 .../deleteImageWithDetailConfirmation.js      |  75 +++
 .../adminhtml/web/js/action/deleteImages.js   | 130 +++++
 .../adminhtml/web/js/action/getDetails.js     |  60 +++
 .../adminhtml/web/js/action/saveDetails.js    |  56 ++
 .../view/adminhtml/web/js/container.js        |  34 ++
 .../js/directory/actions/createDirectory.js   |  61 +++
 .../js/directory/actions/deleteDirectory.js   |  60 +++
 .../adminhtml/web/js/directory/directories.js | 186 +++++++
 .../web/js/directory/directoryTree.js         | 477 +++++++++++++++++
 .../adminhtml/web/js/grid/columns/image.js    | 288 +++++++++++
 .../web/js/grid/columns/image/actions.js      | 109 ++++
 .../grid/columns/image/insertImageAction.js   | 131 +++++
 .../view/adminhtml/web/js/grid/masonry.js     |  49 ++
 .../web/js/grid/massaction/massactionView.js  | 147 ++++++
 .../web/js/grid/massaction/massactions.js     | 151 ++++++
 .../view/adminhtml/web/js/grid/messages.js    |  77 +++
 .../view/adminhtml/web/js/grid/sortBy.js      |  77 +++
 .../view/adminhtml/web/js/image-uploader.js   | 245 +++++++++
 .../adminhtml/web/js/image/image-actions.js   | 130 +++++
 .../adminhtml/web/js/image/image-details.js   | 174 +++++++
 .../view/adminhtml/web/js/image/image-edit.js | 228 +++++++++
 .../validation/validate-image-description.js  |  19 +
 .../js/validation/validate-image-keyword.js   |  19 +
 .../web/js/validation/validate-image-title.js |  19 +
 .../web/template/grid/columns/image.html      |  45 ++
 .../template/grid/columns/image/actions.html  |  15 +
 .../grid/directories/directoryTree.html       |  10 +
 .../web/template/grid/filter/checkbox.html    |  24 +
 .../grid/filters/elements/ui-select.html      | 133 +++++
 .../grid/massactions/cancelButton.html        |  10 +
 .../web/template/grid/massactions/count.html  |   9 +
 .../adminhtml/web/template/grid/messages.html |  15 +
 .../adminhtml/web/template/grid/toolbar.html  |  32 ++
 .../web/template/image-uploader.html          |  17 +
 .../adminhtml/web/template/image/actions.html |  12 +
 .../web/template/image/image-details.html     |  65 +++
 .../web/template/image/image-edit.html        |  74 +++
 .../MediaGalleryUiApi/Api/ConfigInterface.php |  22 +
 .../Magento/MediaGalleryUiApi/LICENSE.txt     |  48 ++
 .../Magento/MediaGalleryUiApi/LICENSE_AFL.txt |  48 ++
 app/code/Magento/MediaGalleryUiApi/README.md  |  13 +
 .../Magento/MediaGalleryUiApi/composer.json   |  21 +
 .../Magento/MediaGalleryUiApi/etc/module.xml  |  10 +
 .../MediaGalleryUiApi/registration.php        |  10 +
 composer.json                                 |  14 +
 composer.lock                                 |   2 +-
 427 files changed, 23252 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/MediaContentSynchronization/Console/Command/Synchronize.php
 create mode 100644 app/code/Magento/MediaContentSynchronization/LICENSE.txt
 create mode 100644 app/code/Magento/MediaContentSynchronization/LICENSE_AFL.txt
 create mode 100644 app/code/Magento/MediaContentSynchronization/Model/Consume.php
 create mode 100644 app/code/Magento/MediaContentSynchronization/Model/Publish.php
 create mode 100644 app/code/Magento/MediaContentSynchronization/Model/RemoveObsoleteContentAsset.php
 create mode 100644 app/code/Magento/MediaContentSynchronization/Model/ResourceModel/GetOutdatedRelations.php
 create mode 100644 app/code/Magento/MediaContentSynchronization/Model/Synchronize.php
 create mode 100644 app/code/Magento/MediaContentSynchronization/Plugin/SynchronizeMediaContent.php
 create mode 100644 app/code/Magento/MediaContentSynchronization/README.md
 create mode 100644 app/code/Magento/MediaContentSynchronization/composer.json
 create mode 100644 app/code/Magento/MediaContentSynchronization/etc/communication.xml
 create mode 100644 app/code/Magento/MediaContentSynchronization/etc/di.xml
 create mode 100644 app/code/Magento/MediaContentSynchronization/etc/module.xml
 create mode 100644 app/code/Magento/MediaContentSynchronization/etc/queue_consumer.xml
 create mode 100644 app/code/Magento/MediaContentSynchronization/etc/queue_publisher.xml
 create mode 100644 app/code/Magento/MediaContentSynchronization/etc/queue_topology.xml
 create mode 100644 app/code/Magento/MediaContentSynchronization/registration.php
 create mode 100644 app/code/Magento/MediaContentSynchronizationApi/Api/SynchronizeInterface.php
 create mode 100644 app/code/Magento/MediaContentSynchronizationApi/Api/SynchronizerInterface.php
 create mode 100644 app/code/Magento/MediaContentSynchronizationApi/LICENSE.txt
 create mode 100644 app/code/Magento/MediaContentSynchronizationApi/LICENSE_AFL.txt
 create mode 100644 app/code/Magento/MediaContentSynchronizationApi/Model/GetEntities.php
 create mode 100644 app/code/Magento/MediaContentSynchronizationApi/Model/GetEntitiesInterface.php
 create mode 100644 app/code/Magento/MediaContentSynchronizationApi/Model/SynchronizerPool.php
 create mode 100644 app/code/Magento/MediaContentSynchronizationApi/README.md
 create mode 100644 app/code/Magento/MediaContentSynchronizationApi/composer.json
 create mode 100644 app/code/Magento/MediaContentSynchronizationApi/etc/di.xml
 create mode 100644 app/code/Magento/MediaContentSynchronizationApi/etc/module.xml
 create mode 100644 app/code/Magento/MediaContentSynchronizationApi/registration.php
 create mode 100644 app/code/Magento/MediaContentSynchronizationCatalog/LICENSE.txt
 create mode 100644 app/code/Magento/MediaContentSynchronizationCatalog/LICENSE_AFL.txt
 create mode 100644 app/code/Magento/MediaContentSynchronizationCatalog/Model/Synchronizer/Category.php
 create mode 100644 app/code/Magento/MediaContentSynchronizationCatalog/Model/Synchronizer/Product.php
 create mode 100644 app/code/Magento/MediaContentSynchronizationCatalog/README.md
 create mode 100644 app/code/Magento/MediaContentSynchronizationCatalog/Test/Integration/Model/Synchronizer/CategoryTest.php
 create mode 100644 app/code/Magento/MediaContentSynchronizationCatalog/Test/Integration/Model/Synchronizer/ProductTest.php
 create mode 100644 app/code/Magento/MediaContentSynchronizationCatalog/composer.json
 create mode 100644 app/code/Magento/MediaContentSynchronizationCatalog/etc/di.xml
 create mode 100644 app/code/Magento/MediaContentSynchronizationCatalog/etc/module.xml
 create mode 100644 app/code/Magento/MediaContentSynchronizationCatalog/registration.php
 create mode 100644 app/code/Magento/MediaContentSynchronizationCms/LICENSE.txt
 create mode 100644 app/code/Magento/MediaContentSynchronizationCms/LICENSE_AFL.txt
 create mode 100644 app/code/Magento/MediaContentSynchronizationCms/Model/Synchronizer/Block.php
 create mode 100644 app/code/Magento/MediaContentSynchronizationCms/Model/Synchronizer/Page.php
 create mode 100644 app/code/Magento/MediaContentSynchronizationCms/README.md
 create mode 100644 app/code/Magento/MediaContentSynchronizationCms/Test/Integration/Model/Synchronizer/BlockTest.php
 create mode 100644 app/code/Magento/MediaContentSynchronizationCms/Test/Integration/Model/Synchronizer/PageTest.php
 create mode 100644 app/code/Magento/MediaContentSynchronizationCms/composer.json
 create mode 100644 app/code/Magento/MediaContentSynchronizationCms/etc/di.xml
 create mode 100644 app/code/Magento/MediaContentSynchronizationCms/etc/module.xml
 create mode 100644 app/code/Magento/MediaContentSynchronizationCms/registration.php
 create mode 100644 app/code/Magento/MediaGalleryCatalogIntegration/LICENSE.txt
 create mode 100644 app/code/Magento/MediaGalleryCatalogIntegration/LICENSE_AFL.txt
 create mode 100644 app/code/Magento/MediaGalleryCatalogIntegration/Plugin/SaveBaseCategoryImageInformation.php
 create mode 100644 app/code/Magento/MediaGalleryCatalogIntegration/README.md
 create mode 100644 app/code/Magento/MediaGalleryCatalogIntegration/composer.json
 create mode 100644 app/code/Magento/MediaGalleryCatalogIntegration/etc/adminhtml/di.xml
 create mode 100644 app/code/Magento/MediaGalleryCatalogIntegration/etc/module.xml
 create mode 100644 app/code/Magento/MediaGalleryCatalogIntegration/registration.php
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Controller/Adminhtml/Category/Index.php
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/LICENSE.txt
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/LICENSE_AFL.txt
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Model/Listing/DataProvider.php
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/README.md
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertCategoryGridPageDetailsActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminOpenCategoryGridPageActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Page/AdminMediaGalleryCatalogUiCategoryGridPage.xml
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInCategoryFilterTest.xml
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyCategoryGridPageTest.xml
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/CategoryActions.php
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/Path.php
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/Thumbnail.php
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/composer.json
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/etc/adminhtml/di.xml
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/etc/adminhtml/routes.xml
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/etc/module.xml
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/registration.php
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/layout/media_gallery_catalog_category_index.xml
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_category_listing.xml
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_listing.xml
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/web/css/source/_module.less
 create mode 100644 app/code/Magento/MediaGalleryCmsUi/Controller/Adminhtml/Block/Search.php
 create mode 100644 app/code/Magento/MediaGalleryCmsUi/Controller/Adminhtml/Page/Search.php
 create mode 100644 app/code/Magento/MediaGalleryCmsUi/LICENSE.txt
 create mode 100644 app/code/Magento/MediaGalleryCmsUi/LICENSE_AFL.txt
 create mode 100644 app/code/Magento/MediaGalleryCmsUi/README.md
 create mode 100644 app/code/Magento/MediaGalleryCmsUi/Test/Mftf/ActionGroup/FillOutCustomCMSPageContentActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryCmsUiUsedInBlocksFilterTest.xml
 create mode 100644 app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryCmsUiUsedInPagesFilterTest.xml
 create mode 100644 app/code/Magento/MediaGalleryCmsUi/composer.json
 create mode 100644 app/code/Magento/MediaGalleryCmsUi/etc/adminhtml/di.xml
 create mode 100644 app/code/Magento/MediaGalleryCmsUi/etc/adminhtml/routes.xml
 create mode 100644 app/code/Magento/MediaGalleryCmsUi/etc/module.xml
 create mode 100644 app/code/Magento/MediaGalleryCmsUi/registration.php
 create mode 100644 app/code/Magento/MediaGalleryCmsUi/view/adminhtml/ui_component/media_gallery_listing.xml
 create mode 100644 app/code/Magento/MediaGalleryCmsUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml
 create mode 100644 app/code/Magento/MediaGalleryIntegration/LICENSE.txt
 create mode 100644 app/code/Magento/MediaGalleryIntegration/LICENSE_AFL.txt
 create mode 100644 app/code/Magento/MediaGalleryIntegration/Model/OpenDialogUrlProvider.php
 create mode 100644 app/code/Magento/MediaGalleryIntegration/Plugin/SaveImageInformation.php
 create mode 100644 app/code/Magento/MediaGalleryIntegration/README.md
 create mode 100644 app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/ImageComponentOpenDialogUrlTest.php
 create mode 100644 app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/OpenDialogUrlProviderTest.php
 create mode 100644 app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/TinyMceOpenDialogUrlTest.php
 create mode 100644 app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/WysiwygDefaultConfigOpenDialogUrlTest.php
 create mode 100644 app/code/Magento/MediaGalleryIntegration/composer.json
 create mode 100644 app/code/Magento/MediaGalleryIntegration/etc/adminhtml/di.xml
 create mode 100644 app/code/Magento/MediaGalleryIntegration/etc/module.xml
 create mode 100644 app/code/Magento/MediaGalleryIntegration/registration.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/LICENSE.txt
 create mode 100644 app/code/Magento/MediaGalleryMetadata/LICENSE_AFL.txt
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Model/AddIptcMetadata.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Model/AddXmpMetadata.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Model/File.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Model/File/AddMetadata.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Model/File/ExtractMetadata.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Model/GetIptcMetadata.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Model/GetXmpMetadata.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Model/Gif/ReadFile.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Model/Gif/Segment/ReadXmp.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Model/Gif/Segment/WriteXmp.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Model/Gif/WriteFile.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Model/Jpeg/ReadFile.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadIptc.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadXmp.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/WriteIptc.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/WriteXmp.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Model/Jpeg/WriteFile.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Model/Metadata.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Model/Png/ReadFile.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadIptc.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadXmp.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteIptc.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteXmp.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Model/Png/WriteFile.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Model/Segment.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Model/SegmentNames.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Model/XmpTemplate.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/README.md
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/AddMetadataTest.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/ExtractMetadataTest.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/Gif/Segment/XmpTest.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/Jpeg/Segment/IptcTest.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/Jpeg/Segment/XmpTest.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/Png/Segment/IptcTest.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Test/_files/empty_exiftool.gif
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Test/_files/empty_iptc.jpeg
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Test/_files/empty_iptc.png
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Test/_files/empty_xmp_image.jpeg
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Test/_files/empty_xmp_image.png
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Test/_files/exiftool.gif
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Test/_files/iptc_only.jpeg
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Test/_files/iptc_only.png
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Test/_files/macos-photos.jpeg
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Test/_files/macos-preview.png
 create mode 100644 app/code/Magento/MediaGalleryMetadata/composer.json
 create mode 100644 app/code/Magento/MediaGalleryMetadata/etc/default.xmp
 create mode 100644 app/code/Magento/MediaGalleryMetadata/etc/di.xml
 create mode 100644 app/code/Magento/MediaGalleryMetadata/etc/module.xml
 create mode 100644 app/code/Magento/MediaGalleryMetadata/registration.php
 create mode 100644 app/code/Magento/MediaGalleryMetadataApi/Api/AddMetadataInterface.php
 create mode 100644 app/code/Magento/MediaGalleryMetadataApi/Api/Data/MetadataInterface.php
 create mode 100644 app/code/Magento/MediaGalleryMetadataApi/Api/ExtractMetadataInterface.php
 create mode 100644 app/code/Magento/MediaGalleryMetadataApi/LICENSE.txt
 create mode 100644 app/code/Magento/MediaGalleryMetadataApi/LICENSE_AFL.txt
 create mode 100644 app/code/Magento/MediaGalleryMetadataApi/Model/AddMetadataComposite.php
 create mode 100644 app/code/Magento/MediaGalleryMetadataApi/Model/ExtractMetadataComposite.php
 create mode 100644 app/code/Magento/MediaGalleryMetadataApi/Model/FileInterface.php
 create mode 100644 app/code/Magento/MediaGalleryMetadataApi/Model/ReadFileInterface.php
 create mode 100644 app/code/Magento/MediaGalleryMetadataApi/Model/ReadMetadataInterface.php
 create mode 100644 app/code/Magento/MediaGalleryMetadataApi/Model/SegmentInterface.php
 create mode 100644 app/code/Magento/MediaGalleryMetadataApi/Model/WriteFileInterface.php
 create mode 100644 app/code/Magento/MediaGalleryMetadataApi/Model/WriteMetadataInterface.php
 create mode 100644 app/code/Magento/MediaGalleryMetadataApi/README.md
 create mode 100644 app/code/Magento/MediaGalleryMetadataApi/composer.json
 create mode 100644 app/code/Magento/MediaGalleryMetadataApi/etc/module.xml
 create mode 100644 app/code/Magento/MediaGalleryMetadataApi/registration.php
 create mode 100644 app/code/Magento/MediaGalleryRenditions/LICENSE.txt
 create mode 100644 app/code/Magento/MediaGalleryRenditions/LICENSE_AFL.txt
 create mode 100644 app/code/Magento/MediaGalleryRenditions/README.md
 create mode 100644 app/code/Magento/MediaGalleryRenditions/composer.json
 create mode 100644 app/code/Magento/MediaGalleryRenditions/etc/adminhtml/system.xml
 create mode 100644 app/code/Magento/MediaGalleryRenditions/etc/config.xml
 create mode 100644 app/code/Magento/MediaGalleryRenditions/etc/module.xml
 create mode 100644 app/code/Magento/MediaGalleryRenditions/registration.php
 create mode 100644 app/code/Magento/MediaGalleryRenditionsApi/LICENSE.txt
 create mode 100644 app/code/Magento/MediaGalleryRenditionsApi/LICENSE_AFL.txt
 create mode 100644 app/code/Magento/MediaGalleryRenditionsApi/Model/Config.php
 create mode 100644 app/code/Magento/MediaGalleryRenditionsApi/README.md
 create mode 100644 app/code/Magento/MediaGalleryRenditionsApi/composer.json
 create mode 100644 app/code/Magento/MediaGalleryRenditionsApi/etc/module.xml
 create mode 100644 app/code/Magento/MediaGalleryRenditionsApi/registration.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/Search.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Directories/Create.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Directories/Delete.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Directories/GetTree.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Image/Delete.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Image/Details.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Image/SaveDetails.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Image/Upload.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Index/Index.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Media/Index.php
 create mode 100644 app/code/Magento/MediaGalleryUi/LICENSE.txt
 create mode 100644 app/code/Magento/MediaGalleryUi/LICENSE_AFL.txt
 create mode 100644 app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/CreatedAt.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Height.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Size.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Type.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/UpdatedAt.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/UsedIn.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Width.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Model/AssetDetailsProviderInterface.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Model/AssetDetailsProviderPool.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Model/Config.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Model/DeleteImage.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Model/Directories/FolderTree.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Model/GetDetailsByAssetId.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Model/Listing/DataProvider.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/ContentField.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/Directory.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/Duplicated.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/Entity.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/EntityType.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/Keyword.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Model/UpdateAsset.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Model/UpdateAsset/SaveMetadataToFile.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Model/UpdateAsset/UpdateKeywords.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Model/UploadImage.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Plugin/CreateThumbnails.php
 create mode 100644 app/code/Magento/MediaGalleryUi/README.md
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminAssertImageInStandaloneMediaGalleryActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAddImageFromImageDetailsActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryApplyDuplicatedFilterActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryApplyFiltersActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertActiveFiltersActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertImagesDeletedInBulkActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertMassActionModeDetailsActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertMassActionModeNotActiveActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertNoActiveFiltersAppliedActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertWarningMessageActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryCategoryGridApplyFiltersActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryCategoryGridExpandFilterActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryCloseViewDetailsActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryDeleteGridViewActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryDisableMassactionModeActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryEditImageDetailsActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryEnableMassActionModeActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryExpandFilterActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryImageDeleteActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryImageDetailsDeleteActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryImageDetailsEditActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryImageDetailsSaveActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGallerySaveCustomViewActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGallerySelectCustomBookmarksViewActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGallerySelectImageForMassActionActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGallerySelectSourceFilterActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGallerySelectUsedInFilterActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryUploadImageActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageDescriptionActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageDetailsActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageFilenameActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageKeywordsActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageTitleActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryViewImageDetailsActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryApplySelectFilterActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryApplyUsedInFilterActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertCategoryNameInCategoryGridActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertFolderDoesNotExistActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertFolderNameActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertImageInGridActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertImageNotExistsInTheGridActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryClickAddSelectedActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryClickImageInGridActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryClickOkButtonTinyMce4ActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryCreateNewFolderActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryEditAssetAddKeywordActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryEnhancedEnableActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryFolderDeleteActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryFolderSelectActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryImageDeleteActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryOpenNewFolderFormActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenMediaGalleryFromPageNoEditorActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenMediaGalleryFromTinyMce4IconActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenStandaloneMediaGalleryActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGalleryImageDeletedActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertImageAddedToPageContentActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertImageAttributesOnEnhancedMediaGalleryActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/SearchStandaloneMediaGalleryAdminDataGridByKeywordActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/StoreFrontMediaGalleryAssertImageInCategoryDescriptionActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdminEnhancedMediaGalleryImageData.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdminMediaGalleryFolderData.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdobeStockConfigData.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Page/AdminStandaloneMediaGalleryPage.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminConfigSystemSection.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryActionsSection.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryDeleteModalSection.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryEditDetailsSection.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryFiltersSection.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageDescriptionSection.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryViewDetailsSection.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryFolderSection.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryHeaderButtonsSection.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiSuite.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryDeleteImagesInBulkTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryDuplicatedImagesTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryUploadImageWithMetadataTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyAssetFilterTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyNotUsedOptionFilterTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyUsedInFilterTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryAddCategoryImageFromTwoComponentsTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryAddCategoryImageTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryAddFromImageDetailsTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryCreateDeleteFolderTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteImageContextMenuTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteImageFileTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteImageWithWarningPopupTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDisabledContentFilterTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryEditImageDetailsTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryEnabledContentFilterTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryFilterImagesBySourceTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySaveFiltersStateTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryStoreViewCategoryFilterTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryStoreViewContentFilterTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryVerifyImageGridAttributesTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryViewDetailsDeleteImageTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryViewDetailsEditTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryViewDetailsTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryCreateDeleteFolderTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryViewDetailsEditTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryViewDetailsTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Unit/Model/ConfigTest.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Unit/Model/UploadImageTest.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Unit/_files/subdir/test_img2.jpeg
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Unit/_files/test_img1.jpeg
 create mode 100644 app/code/Magento/MediaGalleryUi/Ui/Component/DirectoriesTree.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Ui/Component/ImageUploader.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Ui/Component/ImageUploaderStandAlone.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Columns/SourceIconProvider.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Columns/Url.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Asset.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Options/Status.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Options/Store.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Options/UsedIn.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Provider.php
 create mode 100644 app/code/Magento/MediaGalleryUi/composer.json
 create mode 100644 app/code/Magento/MediaGalleryUi/etc/adminhtml/di.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/etc/adminhtml/menu.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/etc/adminhtml/routes.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/etc/adminhtml/system.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/etc/config.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/etc/di.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/etc/module.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/i18n/en_US.csv
 create mode 100644 app/code/Magento/MediaGalleryUi/registration.php
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/layout/media_gallery_index_index.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/layout/media_gallery_media_index.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/templates/container.phtml
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_details.phtml
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_details_standalone.phtml
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_edit_details.phtml
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_edit_details_standalone.phtml
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/cms_block_listing.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/cms_page_listing.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/media_gallery_listing.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/product_listing.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/images/3-dots.png
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/images/Astock.png
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/images/d.png
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/deleteImageWithDetailConfirmation.js
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/deleteImages.js
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/getDetails.js
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/saveDetails.js
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/container.js
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/actions/createDirectory.js
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/actions/deleteDirectory.js
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directories.js
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image.js
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image/actions.js
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image/insertImageAction.js
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/masonry.js
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/massaction/massactionView.js
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/massaction/massactions.js
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/messages.js
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/sortBy.js
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image-uploader.js
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-actions.js
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-details.js
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-edit.js
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/validation/validate-image-description.js
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/validation/validate-image-keyword.js
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/validation/validate-image-title.js
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/columns/image.html
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/columns/image/actions.html
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/directories/directoryTree.html
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/filter/checkbox.html
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/filters/elements/ui-select.html
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/massactions/cancelButton.html
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/massactions/count.html
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/messages.html
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/toolbar.html
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image-uploader.html
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/actions.html
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/image-edit.html
 create mode 100644 app/code/Magento/MediaGalleryUiApi/Api/ConfigInterface.php
 create mode 100644 app/code/Magento/MediaGalleryUiApi/LICENSE.txt
 create mode 100644 app/code/Magento/MediaGalleryUiApi/LICENSE_AFL.txt
 create mode 100644 app/code/Magento/MediaGalleryUiApi/README.md
 create mode 100644 app/code/Magento/MediaGalleryUiApi/composer.json
 create mode 100644 app/code/Magento/MediaGalleryUiApi/etc/module.xml
 create mode 100644 app/code/Magento/MediaGalleryUiApi/registration.php

diff --git a/app/code/Magento/MediaContentSynchronization/Console/Command/Synchronize.php b/app/code/Magento/MediaContentSynchronization/Console/Command/Synchronize.php
new file mode 100644
index 0000000000000..55f99697c289b
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronization/Console/Command/Synchronize.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+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;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * Synchronize content with assets
+ */
+class Synchronize extends Command
+{
+    /**
+     * @var SynchronizeInterface
+     */
+    private $synchronizeContent;
+
+    /**
+     * @var State $state
+     */
+    private $state;
+
+    /**
+     * @param SynchronizeInterface $synchronizeContent
+     * @param State $state
+     */
+    public function __construct(
+        SynchronizeInterface $synchronizeContent,
+        State $state
+    ) {
+        $this->synchronizeContent = $synchronizeContent;
+        $this->state = $state;
+        parent::__construct();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function configure()
+    {
+        $this->setName('media-content:sync');
+        $this->setDescription('Synchronize content with assets');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $output->writeln('Synchronizing content with assets...');
+        $this->state->emulateAreaCode(
+            Area::AREA_ADMINHTML,
+            function () {
+                $this->synchronizeContent->execute();
+            }
+        );
+        $output->writeln('Completed content synchronization.');
+        return Cli::RETURN_SUCCESS;
+    }
+}
diff --git a/app/code/Magento/MediaContentSynchronization/LICENSE.txt b/app/code/Magento/MediaContentSynchronization/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronization/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/MediaContentSynchronization/LICENSE_AFL.txt b/app/code/Magento/MediaContentSynchronization/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronization/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/MediaContentSynchronization/Model/Consume.php b/app/code/Magento/MediaContentSynchronization/Model/Consume.php
new file mode 100644
index 0000000000000..bcce3514e4ad9
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronization/Model/Consume.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentSynchronization\Model;
+
+use Magento\MediaContentSynchronizationApi\Api\SynchronizeInterface;
+
+/**
+ * Media content synchronization queue consumer.
+ */
+class Consume
+{
+    /**
+     * @var SynchronizeInterface
+     */
+    private $synchronize;
+
+    /**
+     * @param SynchronizeInterface $synchronize
+     */
+    public function __construct(SynchronizeInterface $synchronize)
+    {
+        $this->synchronize = $synchronize;
+    }
+
+    /**
+     * Run media files synchronization.
+     */
+    public function execute() : void
+    {
+        $this->synchronize->execute();
+    }
+}
diff --git a/app/code/Magento/MediaContentSynchronization/Model/Publish.php b/app/code/Magento/MediaContentSynchronization/Model/Publish.php
new file mode 100644
index 0000000000000..ad6fdd27d7067
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronization/Model/Publish.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentSynchronization\Model;
+
+use Magento\Framework\MessageQueue\PublisherInterface;
+
+/**
+ * Publish media content synchronization queue.
+ */
+class Publish
+{
+    /**
+     * Media content synchronization queue topic name.
+     */
+    private const TOPIC_MEDIA_CONTENT_SYNCHRONIZATION = 'media.content.synchronization';
+
+    /**
+     * @var PublisherInterface
+     */
+    private $publisher;
+
+    /**
+     * @param PublisherInterface $publisher
+     */
+    public function __construct(PublisherInterface $publisher)
+    {
+        $this->publisher = $publisher;
+    }
+
+    /**
+     * Publish media content synchronization message to the message queue.
+     */
+    public function execute() : void
+    {
+        $this->publisher->publish(
+            self::TOPIC_MEDIA_CONTENT_SYNCHRONIZATION,
+            [self::TOPIC_MEDIA_CONTENT_SYNCHRONIZATION]
+        );
+    }
+}
diff --git a/app/code/Magento/MediaContentSynchronization/Model/RemoveObsoleteContentAsset.php b/app/code/Magento/MediaContentSynchronization/Model/RemoveObsoleteContentAsset.php
new file mode 100644
index 0000000000000..e81817282dcc0
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronization/Model/RemoveObsoleteContentAsset.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentSynchronization\Model;
+
+use Magento\MediaContentApi\Api\DeleteContentAssetLinksInterface;
+use Magento\MediaContentSynchronization\Model\ResourceModel\GetOutdatedRelations;
+use Magento\MediaContentSynchronizationApi\Model\GetEntitiesInterface;
+
+/**
+ * Remove obsolete content asset from deleted entities
+ */
+class RemoveObsoleteContentAsset
+{
+    /**
+     * @var GetEntitiesInterface
+     */
+    private $getEntities;
+
+    /**
+     * @var GetOutdatedRelations
+     */
+    private $getOutdatedRelations;
+
+    /**
+     * @var DeleteContentAssetLinksInterface
+     */
+    private $deleteContentAssetLinks;
+
+    /**
+     * @param DeleteContentAssetLinksInterface $deleteContentAssetLinks
+     * @param GetEntitiesInterface $getEntities
+     * @param GetOutdatedRelations $getOutdatedRelations
+     */
+    public function __construct(
+        DeleteContentAssetLinksInterface $deleteContentAssetLinks,
+        GetEntitiesInterface $getEntities,
+        GetOutdatedRelations $getOutdatedRelations
+    ) {
+        $this->deleteContentAssetLinks = $deleteContentAssetLinks;
+        $this->getEntities = $getEntities;
+        $this->getOutdatedRelations = $getOutdatedRelations;
+    }
+
+    /**
+     * Remove media content if entity already deleted.
+     */
+    public function execute(): void
+    {
+        foreach ($this->getEntities->execute() as $entity) {
+            $assetsLinks = $this->getOutdatedRelations->execute($entity);
+            if (!empty($assetsLinks)) {
+                $this->deleteContentAssetLinks->execute($assetsLinks);
+            }
+        }
+    }
+}
diff --git a/app/code/Magento/MediaContentSynchronization/Model/ResourceModel/GetOutdatedRelations.php b/app/code/Magento/MediaContentSynchronization/Model/ResourceModel/GetOutdatedRelations.php
new file mode 100644
index 0000000000000..37271ce469715
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronization/Model/ResourceModel/GetOutdatedRelations.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentSynchronization\Model\ResourceModel;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Exception\CouldNotDeleteException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\MediaContentApi\Api\Data\ContentAssetLinkInterface;
+use Magento\MediaContentApi\Api\Data\ContentAssetLinkInterfaceFactory;
+use Magento\MediaContentApi\Api\Data\ContentIdentityInterfaceFactory;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Returns asset links which entities has been deleted.
+ */
+class GetOutdatedRelations
+{
+    private const MEDIA_CONTENT_ASSET_TABLE = 'media_content_asset';
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var ContentAssetLinkInterfaceFactory
+     */
+    private $contentAssetLinkFactory;
+
+    /**
+     * @var ContentIdentityInterfaceFactory
+     */
+    private $contentIdentityFactory;
+
+    /**
+     * @param ContentIdentityInterfaceFactory $contentIdentityFactory
+     * @param ContentAssetLinkInterfaceFactory $contentAssetLinkFactory
+     * @param MetadataPool $metadataPool
+     * @param ResourceConnection $resourceConnection
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        ContentIdentityInterfaceFactory $contentIdentityFactory,
+        ContentAssetLinkInterfaceFactory $contentAssetLinkFactory,
+        MetadataPool $metadataPool,
+        ResourceConnection $resourceConnection,
+        LoggerInterface $logger
+    ) {
+        $this->contentIdentityFactory = $contentIdentityFactory;
+        $this->contentAssetLinkFactory = $contentAssetLinkFactory;
+        $this->metadataPool = $metadataPool;
+        $this->resourceConnection = $resourceConnection;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Returns content asset links wichs entity_id not exist anymore.
+     *
+     * @param string $entityType
+     * @throws CouldNotDeleteException
+     * @return ContentAssetLinkInterface[]
+     */
+    public function execute(string $entityType): array
+    {
+        $contentAssetLinks= [];
+        try {
+            $entityData = $this->metadataPool->getMetadata($entityType);
+            $connection = $this->resourceConnection->getConnection();
+            $mediaContentTable = $this->resourceConnection->getTableName(self::MEDIA_CONTENT_ASSET_TABLE);
+            $select = $connection->select();
+
+            $select->from(['mca' => $mediaContentTable], ['asset_id', 'entity_id',  'entity_type', 'field']);
+            $select->joinLeft(
+                ['et' => $entityData->getEntityTable()],
+                'et.' . $entityData->getIdentifierField() . ' =  mca.entity_id ',
+                [$entityData->getIdentifierField() . ' AS entity_identifier']
+            );
+            $select->where('et.' . $entityData->getIdentifierField() . ' IS NULL');
+            $select->where('mca.entity_type = ?', $entityData->getEavEntityType() ?? $entityData->getEntityTable());
+            $assets = $connection->fetchAll($select);
+        } catch (\Exception $exception) {
+            $this->logger->critical($exception);
+            throw new LocalizedException(__('Could not fetch media content links data'), $exception);
+        }
+
+        foreach ($assets as $asset) {
+            $contentIdentity = $this->contentIdentityFactory->create(
+                [
+                    'entityType' => $asset['entity_type'],
+                    'entityId' => $asset['entity_id'],
+                    'field' => $asset['field']
+                ]
+            );
+            $contentAssetLinks[] = $this->contentAssetLinkFactory->create(
+                [
+                    'assetId' => $asset['asset_id'],
+                    'contentIdentity' => $contentIdentity
+                ]
+            );
+        }
+
+        return $contentAssetLinks;
+    }
+}
diff --git a/app/code/Magento/MediaContentSynchronization/Model/Synchronize.php b/app/code/Magento/MediaContentSynchronization/Model/Synchronize.php
new file mode 100644
index 0000000000000..cea8cc6ad44da
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronization/Model/Synchronize.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentSynchronization\Model;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\FlagManager;
+use Magento\Framework\Stdlib\DateTime\DateTimeFactory;
+use Magento\MediaContentSynchronizationApi\Api\SynchronizeInterface;
+use Magento\MediaContentSynchronizationApi\Model\SynchronizerPool;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Synchronize content with assets
+ */
+class Synchronize implements SynchronizeInterface
+{
+    private const LAST_EXECUTION_TIME_CODE = 'media_content_last_execution';
+
+    /**
+     * @var DateTimeFactory
+     */
+    private $dateFactory;
+
+    /**
+     * @var FlagManager
+     */
+    private $flagManager;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $log;
+
+    /**
+     * @var SynchronizerPool
+     */
+    private $synchronizerPool;
+
+    /**
+     * @var RemoveObsoleteContentAsset
+     */
+    private $removeObsoleteContent;
+
+    /**
+     * @param RemoveObsoleteContentAsset $removeObsoleteContent
+     * @param DateTimeFactory $dateFactory
+     * @param FlagManager $flagManager
+     * @param LoggerInterface $log
+     * @param SynchronizerPool $synchronizerPool
+     */
+    public function __construct(
+        RemoveObsoleteContentAsset $removeObsoleteContent,
+        DateTimeFactory $dateFactory,
+        FlagManager $flagManager,
+        LoggerInterface $log,
+        SynchronizerPool $synchronizerPool
+    ) {
+        $this->removeObsoleteContent = $removeObsoleteContent;
+        $this->dateFactory = $dateFactory;
+        $this->flagManager = $flagManager;
+        $this->log = $log;
+        $this->synchronizerPool = $synchronizerPool;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(): void
+    {
+        $failed = [];
+
+        foreach ($this->synchronizerPool->get() as $name => $synchronizer) {
+            try {
+                $synchronizer->execute();
+            } catch (\Exception $exception) {
+                $this->log->critical($exception);
+                $failed[] = $name;
+            }
+        }
+
+        if (!empty($failed)) {
+            throw new LocalizedException(
+                __(
+                    'Failed to execute the following content synchronizers: %synchronizers',
+                    [
+                        'synchronizers' => implode(', ', $failed)
+                    ]
+                )
+            );
+        }
+
+        $this->setLastExecutionTime();
+        $this->removeObsoleteContent->execute();
+    }
+
+    /**
+     * Set last synchronizer execution time
+     */
+    private function setLastExecutionTime(): void
+    {
+        $currentTime = $this->dateFactory->create()->gmtDate();
+        $this->flagManager->saveFlag(self::LAST_EXECUTION_TIME_CODE, $currentTime);
+    }
+}
diff --git a/app/code/Magento/MediaContentSynchronization/Plugin/SynchronizeMediaContent.php b/app/code/Magento/MediaContentSynchronization/Plugin/SynchronizeMediaContent.php
new file mode 100644
index 0000000000000..e428f7d273bb4
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronization/Plugin/SynchronizeMediaContent.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentSynchronization\Plugin;
+
+use Magento\MediaContentSynchronization\Model\Publish;
+use Magento\MediaGallerySynchronization\Model\Consume;
+
+/**
+ * Run media content synchronization after the media files consumer finish files synchronization.
+ */
+class SynchronizeMediaContent
+{
+    /**
+     * @var Publish
+     */
+    private $publish;
+
+    /**
+     * @param Publish $publish
+     */
+    public function __construct(Publish $publish)
+    {
+        $this->publish = $publish;
+    }
+
+    /**
+     * Publish content synchronization request message to the queue.
+     *
+     * @param Consume $subject
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterExecute(Consume $subject): void
+    {
+        $this->publish->execute();
+    }
+}
diff --git a/app/code/Magento/MediaContentSynchronization/README.md b/app/code/Magento/MediaContentSynchronization/README.md
new file mode 100644
index 0000000000000..69098ab02eb0b
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronization/README.md
@@ -0,0 +1,14 @@
+# Magento_MediaContentSynchronization module
+
+The Magento_MediaContentSynchronization module represents implementation of synchronization between data and objects contains
+media asset information.
+
+## Extensibility
+
+Extension developers can interact with the Magento_MediaContentSynchronization module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
+
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_MediaContentSynchronization module.
+
+## Additional information
+
+For information about significant changes in patch releases, see [2.3.x Release information](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html).
diff --git a/app/code/Magento/MediaContentSynchronization/composer.json b/app/code/Magento/MediaContentSynchronization/composer.json
new file mode 100644
index 0000000000000..3be5f535487ec
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronization/composer.json
@@ -0,0 +1,27 @@
+{
+    "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"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\MediaContentSynchronization\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/MediaContentSynchronization/etc/communication.xml b/app/code/Magento/MediaContentSynchronization/etc/communication.xml
new file mode 100644
index 0000000000000..e3436aee85331
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronization/etc/communication.xml
@@ -0,0 +1,14 @@
+<?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:Communication/etc/communication.xsd">
+    <topic name="media.content.synchronization" is_synchronous="false" request="string[]">
+        <handler name="media.content.synchronization.handler"
+                 type="Magento\MediaContentSynchronization\Model\Consume" method="execute"/>
+    </topic>
+</config>
diff --git a/app/code/Magento/MediaContentSynchronization/etc/di.xml b/app/code/Magento/MediaContentSynchronization/etc/di.xml
new file mode 100644
index 0000000000000..d4615c15206e5
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronization/etc/di.xml
@@ -0,0 +1,21 @@
+<?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">
+    <preference for="Magento\MediaContentSynchronizationApi\Api\SynchronizeInterface" type="Magento\MediaContentSynchronization\Model\Synchronize"/>
+    <type name="Magento\Framework\Console\CommandListInterface">
+        <arguments>
+            <argument name="commands" xsi:type="array">
+                <item name="mediaContentSynchronization" xsi:type="object">Magento\MediaContentSynchronization\Console\Command\Synchronize</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\MediaGallerySynchronization\Model\Consume">
+        <plugin name="synchronize_media_content"
+                type="Magento\MediaContentSynchronization\Plugin\SynchronizeMediaContent"/>
+    </type>
+</config>
diff --git a/app/code/Magento/MediaContentSynchronization/etc/module.xml b/app/code/Magento/MediaContentSynchronization/etc/module.xml
new file mode 100644
index 0000000000000..7f04d9b57d8a0
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronization/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_MediaContentSynchronization" />
+</config>
diff --git a/app/code/Magento/MediaContentSynchronization/etc/queue_consumer.xml b/app/code/Magento/MediaContentSynchronization/etc/queue_consumer.xml
new file mode 100644
index 0000000000000..6a141c04c59a0
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronization/etc/queue_consumer.xml
@@ -0,0 +1,11 @@
+<?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-message-queue:etc/consumer.xsd">
+    <consumer name="media.content.synchronization" queue="media.content.synchronization"
+              connection="db" handler="Magento\MediaContentSynchronization\Model\Consume::execute"/>
+</config>
diff --git a/app/code/Magento/MediaContentSynchronization/etc/queue_publisher.xml b/app/code/Magento/MediaContentSynchronization/etc/queue_publisher.xml
new file mode 100644
index 0000000000000..9751d1161b2f2
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronization/etc/queue_publisher.xml
@@ -0,0 +1,12 @@
+<!--
+/**
+ * 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-message-queue:etc/publisher.xsd">
+    <publisher topic="media.content.synchronization">
+        <connection name="db" exchange="magento-db" disabled="false" />
+    </publisher>
+</config>
diff --git a/app/code/Magento/MediaContentSynchronization/etc/queue_topology.xml b/app/code/Magento/MediaContentSynchronization/etc/queue_topology.xml
new file mode 100644
index 0000000000000..4dc43ef1ac13f
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronization/etc/queue_topology.xml
@@ -0,0 +1,14 @@
+<?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-message-queue:etc/topology.xsd">
+    <exchange name="magento-db" type="topic" connection="db">
+        <binding id="MediaContentSynchronization" topic="media.content.synchronization"
+                 destinationType="queue" destination="media.content.synchronization"/>
+    </exchange>
+</config>
diff --git a/app/code/Magento/MediaContentSynchronization/registration.php b/app/code/Magento/MediaContentSynchronization/registration.php
new file mode 100644
index 0000000000000..a157f7ec90a6a
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronization/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_MediaContentSynchronization',
+    __DIR__
+);
diff --git a/app/code/Magento/MediaContentSynchronizationApi/Api/SynchronizeInterface.php b/app/code/Magento/MediaContentSynchronizationApi/Api/SynchronizeInterface.php
new file mode 100644
index 0000000000000..759f226660278
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationApi/Api/SynchronizeInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentSynchronizationApi\Api;
+
+/**
+ * Synchronize assets and contents
+ */
+interface SynchronizeInterface
+{
+    /**
+     * Synchronize assets and contents
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function execute(): void;
+}
diff --git a/app/code/Magento/MediaContentSynchronizationApi/Api/SynchronizerInterface.php b/app/code/Magento/MediaContentSynchronizationApi/Api/SynchronizerInterface.php
new file mode 100644
index 0000000000000..97ffbbe966d6a
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationApi/Api/SynchronizerInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentSynchronizationApi\Api;
+
+/**
+ * Synchronize assets and contents
+ */
+interface SynchronizerInterface
+{
+    /**
+     * Synchronize assets and contents
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function execute(): void;
+}
diff --git a/app/code/Magento/MediaContentSynchronizationApi/LICENSE.txt b/app/code/Magento/MediaContentSynchronizationApi/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationApi/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/MediaContentSynchronizationApi/LICENSE_AFL.txt b/app/code/Magento/MediaContentSynchronizationApi/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationApi/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/MediaContentSynchronizationApi/Model/GetEntities.php b/app/code/Magento/MediaContentSynchronizationApi/Model/GetEntities.php
new file mode 100644
index 0000000000000..38129b2b1c6b9
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationApi/Model/GetEntities.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentSynchronizationApi\Model;
+
+/**
+ * Configuration of entities used for media content.
+ */
+class GetEntities implements GetEntitiesInterface
+{
+    /**
+     * @var array
+     */
+    private $entities;
+
+    /**
+     * @param array $entities
+     */
+    public function __construct(
+        array $entities = []
+    ) {
+        $this->entities = $entities;
+    }
+
+    /**
+     * Get all entities configuration  used in media content.
+     *
+     * @return array
+     */
+    public function execute(): array
+    {
+        return $this->entities;
+    }
+}
diff --git a/app/code/Magento/MediaContentSynchronizationApi/Model/GetEntitiesInterface.php b/app/code/Magento/MediaContentSynchronizationApi/Model/GetEntitiesInterface.php
new file mode 100644
index 0000000000000..ad62ae4136378
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationApi/Model/GetEntitiesInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentSynchronizationApi\Model;
+
+/**
+ * Get entities for media content by provided configuration.
+ */
+interface GetEntitiesInterface
+{
+    /**
+     * Get entities that used for media content
+     *
+     * @return array
+     */
+    public function execute(): array;
+}
diff --git a/app/code/Magento/MediaContentSynchronizationApi/Model/SynchronizerPool.php b/app/code/Magento/MediaContentSynchronizationApi/Model/SynchronizerPool.php
new file mode 100644
index 0000000000000..6d137d0c0deca
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationApi/Model/SynchronizerPool.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentSynchronizationApi\Model;
+
+use Magento\MediaContentSynchronizationApi\Api\SynchronizerInterface;
+
+/**
+ * A pool that handles content and assets synchronization.
+ * @see SynchronizeFilesInterface
+ */
+class SynchronizerPool
+{
+    /**
+     * Content with assets synchronizers
+     *
+     * @var SynchronizerInterface[]
+     */
+    private $synchronizers;
+
+    /**
+     * @param SynchronizerInterface[] $synchronizers
+     */
+    public function __construct(
+        array $synchronizers = []
+    ) {
+        foreach ($synchronizers as $synchronizer) {
+            if (!$synchronizer instanceof SynchronizerInterface) {
+                throw new \InvalidArgumentException(
+                    get_class($synchronizer) . ' must implement ' . SynchronizerInterface::class
+                );
+            }
+        }
+
+        $this->synchronizers = $synchronizers;
+    }
+
+    /**
+     * Get all synchronizers from the pool
+     *
+     * @return SynchronizerInterface[]
+     */
+    public function get(): array
+    {
+        return $this->synchronizers;
+    }
+}
diff --git a/app/code/Magento/MediaContentSynchronizationApi/README.md b/app/code/Magento/MediaContentSynchronizationApi/README.md
new file mode 100644
index 0000000000000..25ceae24452f1
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationApi/README.md
@@ -0,0 +1,13 @@
+# Magento_MediaContentSynchronizationApi module
+
+The Magento_MediaContentSynchronizationApi module is responsible for the media gallery data synchronization implementation API.
+
+## Extensibility
+
+Extension developers can interact with the Magento_MediaContentSynchronizationApi module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
+
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_MediaContentSynchronizationApi module.
+
+## Additional information
+
+For information about significant changes in patch releases, see [2.3.x Release information](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html).
diff --git a/app/code/Magento/MediaContentSynchronizationApi/composer.json b/app/code/Magento/MediaContentSynchronizationApi/composer.json
new file mode 100644
index 0000000000000..1f1e5e4b51c5b
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationApi/composer.json
@@ -0,0 +1,21 @@
+{
+    "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"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\MediaContentSynchronizationApi\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/MediaContentSynchronizationApi/etc/di.xml b/app/code/Magento/MediaContentSynchronizationApi/etc/di.xml
new file mode 100644
index 0000000000000..76bdd9b1cb162
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationApi/etc/di.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:ObjectManager/etc/config.xsd">
+    <preference for="Magento\MediaContentSynchronizationApi\Model\GetEntitiesInterface" type="Magento\MediaContentSynchronizationApi\Model\GetEntities"/>
+</config>
diff --git a/app/code/Magento/MediaContentSynchronizationApi/etc/module.xml b/app/code/Magento/MediaContentSynchronizationApi/etc/module.xml
new file mode 100644
index 0000000000000..3a149b31da3cb
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationApi/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_MediaContentSynchronizationApi" />
+</config>
diff --git a/app/code/Magento/MediaContentSynchronizationApi/registration.php b/app/code/Magento/MediaContentSynchronizationApi/registration.php
new file mode 100644
index 0000000000000..965e31fa45516
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationApi/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_MediaContentSynchronizationApi',
+    __DIR__
+);
diff --git a/app/code/Magento/MediaContentSynchronizationCatalog/LICENSE.txt b/app/code/Magento/MediaContentSynchronizationCatalog/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationCatalog/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/MediaContentSynchronizationCatalog/LICENSE_AFL.txt b/app/code/Magento/MediaContentSynchronizationCatalog/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationCatalog/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/MediaContentSynchronizationCatalog/Model/Synchronizer/Category.php b/app/code/Magento/MediaContentSynchronizationCatalog/Model/Synchronizer/Category.php
new file mode 100644
index 0000000000000..665a22b045e44
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationCatalog/Model/Synchronizer/Category.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentSynchronizationCatalog\Model\Synchronizer;
+
+use Magento\MediaContentApi\Api\Data\ContentIdentityInterfaceFactory;
+use Magento\MediaContentApi\Api\UpdateContentAssetLinksInterface;
+use Magento\MediaContentApi\Model\GetEntityContentsInterface;
+use Magento\MediaContentSynchronizationApi\Api\SynchronizerInterface;
+use Magento\MediaGallerySynchronizationApi\Model\FetchBatchesInterface;
+
+/**
+ * Synchronize category content with assets
+ */
+class Category implements SynchronizerInterface
+{
+    private const CONTENT_TYPE = 'catalog_category';
+    private const TYPE = 'entityType';
+    private const ENTITY_ID = 'entityId';
+    private const FIELD = 'field';
+    private const CATEGORY_TABLE = 'catalog_category_entity';
+    private const CATEGORY_IDENTITY_FIELD = 'entity_id';
+    private const CATEGORY_UPDATED_AT_FIELD = 'updated_at';
+
+    /**
+     * @var UpdateContentAssetLinksInterface
+     */
+    private $updateContentAssetLinks;
+
+    /**
+     * @var ContentIdentityInterfaceFactory
+     */
+    private $contentIdentityFactory;
+
+    /**
+     * @var GetEntityContentsInterface
+     */
+    private $getEntityContents;
+
+    /**
+     * @var FetchBatchesInterface
+     */
+    private $fetchBatches;
+
+    /**
+     * @var array
+     */
+    private $fields;
+
+    /**
+     * @param ContentIdentityInterfaceFactory $contentIdentityFactory
+     * @param GetEntityContentsInterface $getEntityContents
+     * @param UpdateContentAssetLinksInterface $updateContentAssetLinks
+     * @param FetchBatchesInterface $fetchBatches
+     * @param array $fields
+     */
+    public function __construct(
+        ContentIdentityInterfaceFactory $contentIdentityFactory,
+        GetEntityContentsInterface $getEntityContents,
+        UpdateContentAssetLinksInterface $updateContentAssetLinks,
+        FetchBatchesInterface $fetchBatches,
+        array $fields = []
+    ) {
+        $this->contentIdentityFactory = $contentIdentityFactory;
+        $this->getEntityContents = $getEntityContents;
+        $this->updateContentAssetLinks = $updateContentAssetLinks;
+        $this->fields = $fields;
+        $this->fetchBatches = $fetchBatches;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(): void
+    {
+        $columns = [
+            self::CATEGORY_IDENTITY_FIELD,
+            self::CATEGORY_UPDATED_AT_FIELD
+        ];
+        foreach ($this->fetchBatches->execute(self::CATEGORY_TABLE, $columns, $columns[1]) as $batch) {
+            foreach ($batch as $item) {
+                $this->synchronizeItem($item);
+            }
+        }
+    }
+
+    /**
+     * Synchronize product entity fields
+     *
+     * @param array $item
+     */
+    private function synchronizeItem(array $item): void
+    {
+        foreach ($this->fields as $field) {
+            $contentIdentity = $this->contentIdentityFactory->create(
+                [
+                    self::TYPE => self::CONTENT_TYPE,
+                    self::FIELD => $field,
+                    self::ENTITY_ID => $item[self::CATEGORY_IDENTITY_FIELD]
+                ]
+            );
+            $this->updateContentAssetLinks->execute(
+                $contentIdentity,
+                implode(PHP_EOL, $this->getEntityContents->execute($contentIdentity))
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/MediaContentSynchronizationCatalog/Model/Synchronizer/Product.php b/app/code/Magento/MediaContentSynchronizationCatalog/Model/Synchronizer/Product.php
new file mode 100644
index 0000000000000..5d72399752602
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationCatalog/Model/Synchronizer/Product.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentSynchronizationCatalog\Model\Synchronizer;
+
+use Magento\MediaContentApi\Api\Data\ContentIdentityInterfaceFactory;
+use Magento\MediaContentApi\Api\UpdateContentAssetLinksInterface;
+use Magento\MediaContentApi\Model\GetEntityContentsInterface;
+use Magento\MediaContentSynchronizationApi\Api\SynchronizerInterface;
+use Magento\MediaGallerySynchronizationApi\Model\FetchBatchesInterface;
+
+/**
+ * Synchronize product content with assets
+ */
+class Product implements SynchronizerInterface
+{
+    private const CONTENT_TYPE = 'catalog_product';
+    private const TYPE = 'entityType';
+    private const ENTITY_ID = 'entityId';
+    private const FIELD = 'field';
+    private const PRODUCT_TABLE = 'catalog_product_entity';
+    private const PRODUCT_TABLE_ENTITY_ID = 'entity_id';
+    private const PRODUCT_TABLE_UPDATED_AT_FIELD = 'updated_at';
+
+    /**
+     * @var UpdateContentAssetLinksInterface
+     */
+    private $updateContentAssetLinks;
+
+    /**
+     * @var ContentIdentityInterfaceFactory
+     */
+    private $contentIdentityFactory;
+
+    /**
+     * @var GetEntityContentsInterface
+     */
+    private $getEntityContents;
+
+    /**
+     * @var array
+     */
+    private $fields;
+
+    /**
+     * @var FetchBatchesInterface
+     */
+    private $fetchBatches;
+
+    /**
+     * @param ContentIdentityInterfaceFactory $contentIdentityFactory
+     * @param GetEntityContentsInterface $getEntityContents
+     * @param UpdateContentAssetLinksInterface $updateContentAssetLinks
+     * @param FetchBatchesInterface $fetchBatches
+     * @param array $fields
+     */
+    public function __construct(
+        ContentIdentityInterfaceFactory $contentIdentityFactory,
+        GetEntityContentsInterface $getEntityContents,
+        UpdateContentAssetLinksInterface $updateContentAssetLinks,
+        FetchBatchesInterface $fetchBatches,
+        array $fields = []
+    ) {
+        $this->contentIdentityFactory = $contentIdentityFactory;
+        $this->getEntityContents = $getEntityContents;
+        $this->updateContentAssetLinks = $updateContentAssetLinks;
+        $this->fetchBatches = $fetchBatches;
+        $this->fields = $fields;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(): void
+    {
+        $columns = [self::PRODUCT_TABLE_ENTITY_ID, self::PRODUCT_TABLE_UPDATED_AT_FIELD];
+        foreach ($this->fetchBatches->execute(self::PRODUCT_TABLE, $columns, $columns[1]) as $batch) {
+            foreach ($batch as $item) {
+                $this->synchronizeItem($item);
+            }
+        }
+    }
+
+    /**
+     * Synchronize product entity fields
+     *
+     * @param array $item
+     */
+    private function synchronizeItem(array $item): void
+    {
+        foreach ($this->fields as $field) {
+            $contentIdentity = $this->contentIdentityFactory->create(
+                [
+                    self::TYPE => self::CONTENT_TYPE,
+                    self::FIELD => $field,
+                    self::ENTITY_ID => $item[self::PRODUCT_TABLE_ENTITY_ID]
+                ]
+            );
+            $this->updateContentAssetLinks->execute(
+                $contentIdentity,
+                implode(PHP_EOL, $this->getEntityContents->execute($contentIdentity))
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/MediaContentSynchronizationCatalog/README.md b/app/code/Magento/MediaContentSynchronizationCatalog/README.md
new file mode 100644
index 0000000000000..8395ffc10d4d2
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationCatalog/README.md
@@ -0,0 +1,13 @@
+# Magento_MediaContentCatalog module
+
+The Magento_MediaContentCatalog provides the implementation of MediaContentSyncronization functionality for Magento_Catalog module
+
+## Extensibility
+
+Extension developers can interact with the Magento_MediaContent module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
+
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_MediaContent module.
+
+## Additional information
+
+For information about significant changes in patch releases, see [2.3.x Release information](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html).
diff --git a/app/code/Magento/MediaContentSynchronizationCatalog/Test/Integration/Model/Synchronizer/CategoryTest.php b/app/code/Magento/MediaContentSynchronizationCatalog/Test/Integration/Model/Synchronizer/CategoryTest.php
new file mode 100644
index 0000000000000..b8f12bad6bd77
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationCatalog/Test/Integration/Model/Synchronizer/CategoryTest.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ *
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentSynchronizationCatalog\Test\Integration\Model\Synchronizer;
+
+use Magento\MediaContentApi\Api\Data\ContentIdentityInterfaceFactory;
+use Magento\MediaContentApi\Api\GetAssetIdsByContentIdentityInterface;
+use Magento\MediaContentApi\Api\GetContentByAssetIdsInterface;
+use Magento\MediaContentSynchronizationCatalog\Model\Synchronizer\Category;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for categories synchronization
+ */
+class CategoryTest extends TestCase
+{
+    /**
+     * @var Category
+     */
+    private $synchronizer;
+
+    /**
+     * @var GetAssetIdsByContentIdentityInterface
+     */
+    private $getAssetIds;
+
+    /**
+     * @var GetContentByAssetIdsInterface
+     */
+    private $getContentIdentities;
+
+    /**
+     * @var ContentIdentityInterfaceFactory
+     */
+    private $contentIdentityFactory;
+
+    /**
+     * @inheritdoc
+     */
+    public function setUp(): void
+    {
+        $this->synchronizer = Bootstrap::getObjectManager()->get(Category::class);
+        $this->getAssetIds = Bootstrap::getObjectManager()->get(GetAssetIdsByContentIdentityInterface::class);
+        $this->getContentIdentities = Bootstrap::getObjectManager()->get(GetContentByAssetIdsInterface::class);
+        $this->contentIdentityFactory = Bootstrap::getObjectManager()->get(ContentIdentityInterfaceFactory::class);
+    }
+
+    /**
+     * Test synchronization between category and media assets (fixtures sequence does matter)
+     *
+     * @magentoDataFixture Magento/MediaContentCatalog/_files/category_with_asset.php
+     * @magentoDataFixture Magento/MediaGallery/_files/media_asset.php
+     */
+    public function testExecute(): void
+    {
+        $assetId = 2020;
+        $categoryId = 28767;
+        $contentIdentity = $this->contentIdentityFactory->create(
+            [
+                'entityType' => 'catalog_category',
+                'field' => 'description',
+                'entityId' => $categoryId
+            ]
+        );
+
+        $this->assertEmpty($this->getContentIdentities->execute([$assetId]));
+        $this->assertEmpty($this->getAssetIds->execute($contentIdentity));
+
+        $this->synchronizer->execute();
+
+        $this->assertEquals([$assetId], $this->getAssetIds->execute($contentIdentity));
+
+        $synchronizedContentIdentities = $this->getContentIdentities->execute([$assetId]);
+        $this->assertEquals(1, count($synchronizedContentIdentities));
+        foreach ($synchronizedContentIdentities as $syncedContentIdentity) {
+            $this->assertEquals($categoryId, $syncedContentIdentity->getEntityId());
+        }
+    }
+}
diff --git a/app/code/Magento/MediaContentSynchronizationCatalog/Test/Integration/Model/Synchronizer/ProductTest.php b/app/code/Magento/MediaContentSynchronizationCatalog/Test/Integration/Model/Synchronizer/ProductTest.php
new file mode 100644
index 0000000000000..247fdf4a770ee
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationCatalog/Test/Integration/Model/Synchronizer/ProductTest.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ *
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentSynchronizationCatalog\Test\Integration\Model\Synchronizer;
+
+use Magento\MediaContentApi\Api\Data\ContentIdentityInterfaceFactory;
+use Magento\MediaContentApi\Api\GetAssetIdsByContentIdentityInterface;
+use Magento\MediaContentApi\Api\GetContentByAssetIdsInterface;
+use Magento\MediaContentSynchronizationCatalog\Model\Synchronizer\Product;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for products synchronization
+ */
+class ProductTest extends TestCase
+{
+    /**
+     * @var Product
+     */
+    private $synchronizer;
+
+    /**
+     * @var GetAssetIdsByContentIdentityInterface
+     */
+    private $getAssetIds;
+
+    /**
+     * @var GetContentByAssetIdsInterface
+     */
+    private $getContentIdentities;
+
+    /**
+     * @var ContentIdentityInterfaceFactory
+     */
+    private $contentIdentityFactory;
+
+    /**
+     * @inheritdoc
+     */
+    public function setUp(): void
+    {
+        $this->synchronizer = Bootstrap::getObjectManager()->get(Product::class);
+        $this->getAssetIds = Bootstrap::getObjectManager()->get(GetAssetIdsByContentIdentityInterface::class);
+        $this->getContentIdentities = Bootstrap::getObjectManager()->get(GetContentByAssetIdsInterface::class);
+        $this->contentIdentityFactory = Bootstrap::getObjectManager()->get(ContentIdentityInterfaceFactory::class);
+    }
+
+    /**
+     * Test synchronization between products and media assets (fixtures sequence does matter)
+     *
+     * @magentoDataFixture Magento/MediaContentCatalog/_files/product_with_asset.php
+     * @magentoDataFixture Magento/MediaGallery/_files/media_asset.php
+     */
+    public function testExecute(): void
+    {
+        $assetId = 2020;
+        $productId = 1567;
+        $contentIdentity = $this->contentIdentityFactory->create(
+            [
+                'entityType' => 'catalog_product',
+                'field' => 'description',
+                'entityId' => $productId
+            ]
+        );
+
+        $this->assertEmpty($this->getContentIdentities->execute([$assetId]));
+        $this->assertEmpty($this->getAssetIds->execute($contentIdentity));
+
+        $this->synchronizer->execute();
+
+        $this->assertEquals([$assetId], $this->getAssetIds->execute($contentIdentity));
+
+        $synchronizedContentIdentities = $this->getContentIdentities->execute([$assetId]);
+        $this->assertEquals(2, count($synchronizedContentIdentities));
+        foreach ($synchronizedContentIdentities as $syncedContentIdentity) {
+            $this->assertEquals($productId, $syncedContentIdentity->getEntityId());
+        }
+    }
+}
diff --git a/app/code/Magento/MediaContentSynchronizationCatalog/composer.json b/app/code/Magento/MediaContentSynchronizationCatalog/composer.json
new file mode 100644
index 0000000000000..733f29d3a42c2
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationCatalog/composer.json
@@ -0,0 +1,24 @@
+{
+    "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"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\MediaContentSynchronizationCatalog\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/MediaContentSynchronizationCatalog/etc/di.xml b/app/code/Magento/MediaContentSynchronizationCatalog/etc/di.xml
new file mode 100644
index 0000000000000..8cc86fde8fbcd
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationCatalog/etc/di.xml
@@ -0,0 +1,41 @@
+<?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\MediaContentSynchronizationCatalog\Model\Synchronizer\Category">
+        <arguments>
+            <argument name="fields" xsi:type="array">
+                <item name="image" xsi:type="string">image</item>
+                <item name="description" xsi:type="string">description</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\MediaContentSynchronizationApi\Model\GetEntitiesInterface">
+        <arguments>
+            <argument name="entities" xsi:type="array">
+                <item name="catalog_product" xsi:type="string">Magento\Catalog\Api\Data\ProductInterface</item>
+                <item name="catalog_category" xsi:type="string">Magento\Catalog\Api\Data\CategoryInterface</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\MediaContentSynchronizationCatalog\Model\Synchronizer\Product">
+        <arguments>
+            <argument name="fields" xsi:type="array">
+                <item name="description" xsi:type="string">description</item>
+                <item name="short_description" xsi:type="string">short_description</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\MediaContentSynchronizationApi\Model\SynchronizerPool">
+        <arguments>
+            <argument name="synchronizers" xsi:type="array">
+                <item name="media_content_category_synchronizer" xsi:type="object">Magento\MediaContentSynchronizationCatalog\Model\Synchronizer\Category</item>
+                <item name="media_content_product_synchronizer" xsi:type="object">Magento\MediaContentSynchronizationCatalog\Model\Synchronizer\Product</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/MediaContentSynchronizationCatalog/etc/module.xml b/app/code/Magento/MediaContentSynchronizationCatalog/etc/module.xml
new file mode 100644
index 0000000000000..9660dcb107b45
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationCatalog/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_MediaContentSynchronizationCatalog" />
+</config>
diff --git a/app/code/Magento/MediaContentSynchronizationCatalog/registration.php b/app/code/Magento/MediaContentSynchronizationCatalog/registration.php
new file mode 100644
index 0000000000000..1e8b47dc15b50
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationCatalog/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_MediaContentSynchronizationCatalog',
+    __DIR__
+);
diff --git a/app/code/Magento/MediaContentSynchronizationCms/LICENSE.txt b/app/code/Magento/MediaContentSynchronizationCms/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationCms/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/MediaContentSynchronizationCms/LICENSE_AFL.txt b/app/code/Magento/MediaContentSynchronizationCms/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationCms/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/MediaContentSynchronizationCms/Model/Synchronizer/Block.php b/app/code/Magento/MediaContentSynchronizationCms/Model/Synchronizer/Block.php
new file mode 100644
index 0000000000000..73586c8daf7f3
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationCms/Model/Synchronizer/Block.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentSynchronizationCms\Model\Synchronizer;
+
+use Magento\MediaContentApi\Api\Data\ContentIdentityInterfaceFactory;
+use Magento\MediaContentApi\Api\UpdateContentAssetLinksInterface;
+use Magento\MediaContentSynchronizationApi\Api\SynchronizerInterface;
+use Magento\MediaGallerySynchronizationApi\Model\FetchBatchesInterface;
+
+/**
+ * Synchronize block content with assets
+ */
+class Block implements SynchronizerInterface
+{
+    private const CONTENT_TYPE = 'cms_block';
+    private const TYPE = 'entityType';
+    private const ENTITY_ID = 'entityId';
+    private const FIELD = 'field';
+    private const CMS_BLOCK_TABLE = 'cms_block';
+    private const CMS_BLOCK_TABLE_ENTITY_ID = 'block_id';
+    private const CMS_BLOCK_TABLE_UPDATED_AT_FIELD = 'update_time';
+
+    /**
+     * @var FetchBatchesInterface
+     */
+    private $fetchBatches;
+
+    /**
+     * @var UpdateContentAssetLinksInterface
+     */
+    private $updateContentAssetLinks;
+
+    /**
+     * @var ContentIdentityInterfaceFactory
+     */
+    private $contentIdentityFactory;
+
+    /**
+     * @var array
+     */
+    private $fields;
+
+    /**
+     * Synchronize block content with assets
+     *
+     * @param ContentIdentityInterfaceFactory $contentIdentityFactory
+     * @param UpdateContentAssetLinksInterface $updateContentAssetLinks
+     * @param FetchBatchesInterface $fetchBatches
+     * @param array $fields
+     */
+    public function __construct(
+        ContentIdentityInterfaceFactory $contentIdentityFactory,
+        UpdateContentAssetLinksInterface $updateContentAssetLinks,
+        FetchBatchesInterface $fetchBatches,
+        array $fields = []
+    ) {
+        $this->contentIdentityFactory = $contentIdentityFactory;
+        $this->updateContentAssetLinks = $updateContentAssetLinks;
+        $this->fields = $fields;
+        $this->fetchBatches = $fetchBatches;
+    }
+
+    /**
+     * Synchronize assets and contents
+     */
+    public function execute(): void
+    {
+        $columns =  array_merge(
+            [
+                self::CMS_BLOCK_TABLE_ENTITY_ID,
+                self::CMS_BLOCK_TABLE_UPDATED_AT_FIELD
+            ],
+            array_values($this->fields)
+        );
+        foreach ($this->fetchBatches->execute(self::CMS_BLOCK_TABLE, $columns, $columns[1]) as $batch) {
+            foreach ($batch as $item) {
+                $this->synchronizeItem($item);
+            }
+        }
+    }
+
+    /**
+     * Synchronize block entity fields
+     *
+     * @param array $item
+     */
+    private function synchronizeItem(array $item): void
+    {
+        foreach ($this->fields as $field) {
+            $this->updateContentAssetLinks->execute(
+                $this->contentIdentityFactory->create(
+                    [
+                        self::TYPE => self::CONTENT_TYPE,
+                        self::FIELD => $field,
+                        self::ENTITY_ID => $item[self::CMS_BLOCK_TABLE_ENTITY_ID]
+                    ]
+                ),
+                (string) $item[$field]
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/MediaContentSynchronizationCms/Model/Synchronizer/Page.php b/app/code/Magento/MediaContentSynchronizationCms/Model/Synchronizer/Page.php
new file mode 100644
index 0000000000000..dcc855940d157
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationCms/Model/Synchronizer/Page.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentSynchronizationCms\Model\Synchronizer;
+
+use Magento\MediaContentApi\Api\Data\ContentIdentityInterfaceFactory;
+use Magento\MediaContentApi\Api\UpdateContentAssetLinksInterface;
+use Magento\MediaContentSynchronizationApi\Api\SynchronizerInterface;
+use Magento\MediaGallerySynchronizationApi\Model\FetchBatchesInterface;
+
+/**
+ * Synchronize page content with assets
+ */
+class Page implements SynchronizerInterface
+{
+    private const CONTENT_TYPE = 'cms_page';
+    private const TYPE = 'entityType';
+    private const ENTITY_ID = 'entityId';
+    private const FIELD = 'field';
+    private const CMS_PAGE_TABLE = 'cms_page';
+    private const CMS_PAGE_TABLE_ENTITY_ID = 'page_id';
+    private const CMS_PAGE_TABLE_UPDATED_AT_FIELD = 'update_time';
+
+    /**
+     * @var FetchBatchesInterface
+     */
+    private $fetchBatches;
+
+    /**
+     * @var UpdateContentAssetLinksInterface
+     */
+    private $updateContentAssetLinks;
+
+    /**
+     * @var ContentIdentityInterfaceFactory
+     */
+    private $contentIdentityFactory;
+
+    /**
+     * @var array
+     */
+    private $fields;
+
+    /**
+     * Synchronize page content with assets
+     *
+     * @param FetchBatchesInterface $fetchBatches
+     * @param ContentIdentityInterfaceFactory $contentIdentityFactory
+     * @param UpdateContentAssetLinksInterface $updateContentAssetLinks
+     * @param array $fields
+     */
+    public function __construct(
+        FetchBatchesInterface $fetchBatches,
+        ContentIdentityInterfaceFactory $contentIdentityFactory,
+        UpdateContentAssetLinksInterface $updateContentAssetLinks,
+        array $fields = []
+    ) {
+        $this->fetchBatches = $fetchBatches;
+        $this->contentIdentityFactory = $contentIdentityFactory;
+        $this->updateContentAssetLinks = $updateContentAssetLinks;
+        $this->fields = $fields;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(): void
+    {
+        $columns =  array_merge(
+            [
+                self::CMS_PAGE_TABLE_ENTITY_ID,
+                self::CMS_PAGE_TABLE_UPDATED_AT_FIELD
+            ],
+            array_values($this->fields)
+        );
+        foreach ($this->fetchBatches->execute(self::CMS_PAGE_TABLE, $columns, $columns[1]) as $batch) {
+            foreach ($batch as $item) {
+                $this->synchronizeItem($item);
+            }
+        }
+    }
+
+    /**
+     * Synchronize page entity fields
+     *
+     * @param array $item
+     */
+    private function synchronizeItem(array $item): void
+    {
+        foreach ($this->fields as $field) {
+            $this->updateContentAssetLinks->execute(
+                $this->contentIdentityFactory->create(
+                    [
+                        self::TYPE => self::CONTENT_TYPE,
+                        self::FIELD => $field,
+                        self::ENTITY_ID => $item[self::CMS_PAGE_TABLE_ENTITY_ID]
+                    ]
+                ),
+                (string) $item[$field]
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/MediaContentSynchronizationCms/README.md b/app/code/Magento/MediaContentSynchronizationCms/README.md
new file mode 100644
index 0000000000000..58582b1b2d706
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationCms/README.md
@@ -0,0 +1,13 @@
+# Magento_MediaContentCms module
+
+The Magento_MediaContentCms provides the implementation of MediaContentSyncronization functionality for Magento_Cms module
+
+## Extensibility
+
+Extension developers can interact with the Magento_MediaContent module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
+
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_MediaContent module.
+
+## Additional information
+
+For information about significant changes in patch releases, see [2.3.x Release information](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html).
diff --git a/app/code/Magento/MediaContentSynchronizationCms/Test/Integration/Model/Synchronizer/BlockTest.php b/app/code/Magento/MediaContentSynchronizationCms/Test/Integration/Model/Synchronizer/BlockTest.php
new file mode 100644
index 0000000000000..2737ab524584b
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationCms/Test/Integration/Model/Synchronizer/BlockTest.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ *
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentSynchronizationCms\Test\Integration\Model\Synchronizer;
+
+use Magento\Cms\Api\BlockRepositoryInterface;
+use Magento\Cms\Api\Data\BlockInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\MediaContentApi\Api\Data\ContentIdentityInterfaceFactory;
+use Magento\MediaContentApi\Api\GetAssetIdsByContentIdentityInterface;
+use Magento\MediaContentApi\Api\GetContentByAssetIdsInterface;
+use Magento\MediaContentSynchronizationCms\Model\Synchronizer\Block;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for blocks synchronization
+ */
+class BlockTest extends TestCase
+{
+    /**
+     * @var Block
+     */
+    private $synchronizer;
+
+    /**
+     * @var GetAssetIdsByContentIdentityInterface
+     */
+    private $getAssetIds;
+
+    /**
+     * @var GetContentByAssetIdsInterface
+     */
+    private $getContentIdentities;
+
+    /**
+     * @var ContentIdentityInterfaceFactory
+     */
+    private $contentIdentityFactory;
+
+    /**
+     * @inheritdoc
+     */
+    public function setUp(): void
+    {
+        $this->synchronizer = Bootstrap::getObjectManager()->get(Block::class);
+        $this->getAssetIds = Bootstrap::getObjectManager()->get(GetAssetIdsByContentIdentityInterface::class);
+        $this->getContentIdentities = Bootstrap::getObjectManager()->get(GetContentByAssetIdsInterface::class);
+        $this->contentIdentityFactory = Bootstrap::getObjectManager()->get(ContentIdentityInterfaceFactory::class);
+    }
+
+    /**
+     * Test synchronization between blocks and media assets (fixtures sequence does matter)
+     *
+     * @magentoDataFixture Magento/MediaContentCms/_files/block_with_asset.php
+     * @magentoDataFixture Magento/MediaGallery/_files/media_asset.php
+     */
+    public function testExecute(): void
+    {
+        $assetId = 2020;
+        $blockId = $this->getBlock('fixture_block_with_asset')->getId();
+        $contentIdentity = $this->contentIdentityFactory->create(
+            [
+                'entityType' => 'cms_block',
+                'field' => 'content',
+                'entityId' => $blockId
+            ]
+        );
+
+        $this->assertEmpty($this->getContentIdentities->execute([$assetId]));
+        $this->assertEmpty($this->getAssetIds->execute($contentIdentity));
+
+        $this->synchronizer->execute();
+
+        $this->assertEquals([$assetId], $this->getAssetIds->execute($contentIdentity));
+
+        $synchronizedContentIdentities = $this->getContentIdentities->execute([$assetId]);
+        $this->assertEquals(1, count($synchronizedContentIdentities));
+        $this->assertEquals($blockId, $synchronizedContentIdentities[0]->getEntityId());
+    }
+
+    /**
+     * Get fixture block
+     *
+     * @param string $identifier
+     * @return BlockInterface
+     * @throws LocalizedException
+     */
+    private function getBlock(string $identifier): BlockInterface
+    {
+        $objectManager = Bootstrap::getObjectManager();
+
+        /** @var BlockRepositoryInterface $blockRepository */
+        $blockRepository = $objectManager->get(BlockRepositoryInterface::class);
+
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter(BlockInterface::IDENTIFIER, $identifier)
+            ->create();
+
+        return current($blockRepository->getList($searchCriteria)->getItems());
+    }
+}
diff --git a/app/code/Magento/MediaContentSynchronizationCms/Test/Integration/Model/Synchronizer/PageTest.php b/app/code/Magento/MediaContentSynchronizationCms/Test/Integration/Model/Synchronizer/PageTest.php
new file mode 100644
index 0000000000000..1dcbb96dc7914
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationCms/Test/Integration/Model/Synchronizer/PageTest.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ *
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaContentSynchronizationCms\Test\Integration\Model\Synchronizer;
+
+use Magento\Cms\Api\Data\PageInterface;
+use Magento\Cms\Api\PageRepositoryInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\MediaContentApi\Api\Data\ContentIdentityInterfaceFactory;
+use Magento\MediaContentApi\Api\GetAssetIdsByContentIdentityInterface;
+use Magento\MediaContentApi\Api\GetContentByAssetIdsInterface;
+use Magento\MediaContentSynchronizationCms\Model\Synchronizer\Page;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for pages synchronization
+ */
+class PageTest extends TestCase
+{
+    /**
+     * @var Page
+     */
+    private $synchronizer;
+
+    /**
+     * @var GetAssetIdsByContentIdentityInterface
+     */
+    private $getAssetIds;
+
+    /**
+     * @var GetContentByAssetIdsInterface
+     */
+    private $getContentIdentities;
+
+    /**
+     * @var ContentIdentityInterfaceFactory
+     */
+    private $contentIdentityFactory;
+
+    /**
+     * @inheritdoc
+     */
+    public function setUp(): void
+    {
+        $this->synchronizer = Bootstrap::getObjectManager()->get(Page::class);
+        $this->getAssetIds = Bootstrap::getObjectManager()->get(GetAssetIdsByContentIdentityInterface::class);
+        $this->getContentIdentities = Bootstrap::getObjectManager()->get(GetContentByAssetIdsInterface::class);
+        $this->contentIdentityFactory = Bootstrap::getObjectManager()->get(ContentIdentityInterfaceFactory::class);
+    }
+
+    /**
+     * Test synchronization between pages and media assets (fixtures sequence does matter)
+     *
+     * @magentoDataFixture Magento/MediaContentCms/_files/page_with_asset.php
+     * @magentoDataFixture Magento/MediaGallery/_files/media_asset.php
+     */
+    public function testExecute(): void
+    {
+        $assetId = 2020;
+        $pageId = $this->getPage('fixture_page_with_asset')->getId();
+        $contentIdentity = $this->contentIdentityFactory->create(
+            [
+                'entityType' => 'cms_page',
+                'field' => 'content',
+                'entityId' => $pageId
+            ]
+        );
+
+        $this->assertEmpty($this->getContentIdentities->execute([$assetId]));
+        $this->assertEmpty($this->getAssetIds->execute($contentIdentity));
+
+        $this->synchronizer->execute();
+
+        $this->assertEquals([$assetId], $this->getAssetIds->execute($contentIdentity));
+
+        $synchronizedContentIdentities = $this->getContentIdentities->execute([$assetId]);
+        $this->assertEquals(1, count($synchronizedContentIdentities));
+        $this->assertEquals($pageId, $synchronizedContentIdentities[0]->getEntityId());
+    }
+
+    /**
+     * Get fixture page
+     *
+     * @param string $identifier
+     * @return PageInterface
+     * @throws LocalizedException
+     */
+    private function getPage(string $identifier): PageInterface
+    {
+        $objectManager = Bootstrap::getObjectManager();
+
+        /** @var PageRepositoryInterface $repository */
+        $repository = $objectManager->get(PageRepositoryInterface::class);
+
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter(PageInterface::IDENTIFIER, $identifier)
+            ->create();
+
+        return current($repository->getList($searchCriteria)->getItems());
+    }
+}
diff --git a/app/code/Magento/MediaContentSynchronizationCms/composer.json b/app/code/Magento/MediaContentSynchronizationCms/composer.json
new file mode 100644
index 0000000000000..9028b9dacd0a2
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationCms/composer.json
@@ -0,0 +1,24 @@
+{
+    "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"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\MediaContentSynchronizationCms\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/MediaContentSynchronizationCms/etc/di.xml b/app/code/Magento/MediaContentSynchronizationCms/etc/di.xml
new file mode 100644
index 0000000000000..7def330298789
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationCms/etc/di.xml
@@ -0,0 +1,39 @@
+<?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\MediaContentSynchronizationApi\Model\SynchronizerPool">
+        <arguments>
+            <argument name="synchronizers" xsi:type="array">
+                <item name="media_content_block_synchronizer" xsi:type="object">Magento\MediaContentSynchronizationCms\Model\Synchronizer\Block</item>
+                <item name="media_content_page_synchronizer" xsi:type="object">Magento\MediaContentSynchronizationCms\Model\Synchronizer\Page</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\MediaContentSynchronizationApi\Model\GetEntitiesInterface">
+        <arguments>
+            <argument name="entities" xsi:type="array">
+                <item name="cms_block" xsi:type="string">Magento\Cms\Api\Data\BlockInterface</item>
+                <item name="cms_page" xsi:type="string">Magento\Cms\Api\Data\PageInterface</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\MediaContentSynchronizationCms\Model\Synchronizer\Block">
+        <arguments>
+            <argument name="fields" xsi:type="array">
+                <item name="content" xsi:type="string">content</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\MediaContentSynchronizationCms\Model\Synchronizer\Page">
+        <arguments>
+            <argument name="fields" xsi:type="array">
+                <item name="content" xsi:type="string">content</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/MediaContentSynchronizationCms/etc/module.xml b/app/code/Magento/MediaContentSynchronizationCms/etc/module.xml
new file mode 100644
index 0000000000000..58497b81a2174
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationCms/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_MediaContentSynchronizationCms" />
+</config>
diff --git a/app/code/Magento/MediaContentSynchronizationCms/registration.php b/app/code/Magento/MediaContentSynchronizationCms/registration.php
new file mode 100644
index 0000000000000..13ed4b73f70ee
--- /dev/null
+++ b/app/code/Magento/MediaContentSynchronizationCms/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_MediaContentSynchronizationCms',
+    __DIR__
+);
diff --git a/app/code/Magento/MediaGalleryCatalogIntegration/LICENSE.txt b/app/code/Magento/MediaGalleryCatalogIntegration/LICENSE.txt
new file mode 100644
index 0000000000000..36b2459f6aa63
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogIntegration/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.
diff --git a/app/code/Magento/MediaGalleryCatalogIntegration/LICENSE_AFL.txt b/app/code/Magento/MediaGalleryCatalogIntegration/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogIntegration/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/MediaGalleryCatalogIntegration/Plugin/SaveBaseCategoryImageInformation.php b/app/code/Magento/MediaGalleryCatalogIntegration/Plugin/SaveBaseCategoryImageInformation.php
new file mode 100644
index 0000000000000..d439b53c120cb
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogIntegration/Plugin/SaveBaseCategoryImageInformation.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryCatalogIntegration\Plugin;
+
+use Magento\Catalog\Model\ImageUploader;
+use Magento\Cms\Model\Wysiwyg\Images\Storage;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Filesystem;
+use Magento\MediaGalleryApi\Api\DeleteAssetsByPathsInterface;
+use Magento\MediaGalleryApi\Api\GetAssetsByPathsInterface;
+use Magento\MediaGallerySynchronizationApi\Api\SynchronizeFilesInterface;
+use Magento\MediaGalleryUiApi\Api\ConfigInterface;
+
+/**
+ * Save base category image by SaveAssetsInterface.
+ */
+class SaveBaseCategoryImageInformation
+{
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var DeleteAssetsByPathsInterface
+     */
+    private $deleteAssetsByPaths;
+
+    /**
+     * @var GetAssetsByPathsInterface
+     */
+    private $getAssetsByPaths;
+
+    /**
+     * @var Storage
+     */
+    private $storage;
+
+    /**
+     * @var SynchronizeFilesInterface
+     */
+    private $synchronizeFiles;
+
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @param DeleteAssetsByPathsInterface $deleteAssetsByPath
+     * @param Filesystem $filesystem
+     * @param GetAssetsByPathsInterface $getAssetsByPaths
+     * @param Storage $storage
+     * @param SynchronizeFilesInterface $synchronizeFiles
+     * @param ConfigInterface $config
+     */
+    public function __construct(
+        DeleteAssetsByPathsInterface $deleteAssetsByPath,
+        Filesystem $filesystem,
+        GetAssetsByPathsInterface $getAssetsByPaths,
+        Storage $storage,
+        SynchronizeFilesInterface $synchronizeFiles,
+        ConfigInterface $config
+    ) {
+        $this->deleteAssetsByPaths = $deleteAssetsByPath;
+        $this->filesystem = $filesystem;
+        $this->getAssetsByPaths = $getAssetsByPaths;
+        $this->storage = $storage;
+        $this->synchronizeFiles = $synchronizeFiles;
+        $this->config = $config;
+    }
+
+    /**
+     * Saves base category image information after moving from tmp folder.
+     *
+     * @param ImageUploader $subject
+     * @param string $imagePath
+     * @return string
+     * @throws LocalizedException
+     */
+    public function afterMoveFileFromTmp(ImageUploader $subject, string $imagePath): string
+    {
+        if (!$this->config->isEnabled()) {
+            return $imagePath;
+        }
+
+        $absolutePath = $this->storage->getCmsWysiwygImages()->getStorageRoot() . $imagePath;
+        $tmpPath = $subject->getBaseTmpPath() . '/' . substr(strrchr($imagePath, '/'), 1);
+        $tmpAssets = $this->getAssetsByPaths->execute([$tmpPath]);
+
+        if (!empty($tmpAssets)) {
+            $this->deleteAssetsByPaths->execute([$tmpAssets[0]->getPath()]);
+        }
+
+        $this->synchronizeFiles->execute(
+            [
+                $this->filesystem->getDirectoryRead(DirectoryList::MEDIA)->getRelativePath($absolutePath)
+            ]
+        );
+
+        return $imagePath;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryCatalogIntegration/README.md b/app/code/Magento/MediaGalleryCatalogIntegration/README.md
new file mode 100644
index 0000000000000..bcb37bd486dab
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogIntegration/README.md
@@ -0,0 +1,3 @@
+# Magento_MediaGalleryCatalogIntegration
+
+The purpose of this module is for extending catalog image uploader functionality.
diff --git a/app/code/Magento/MediaGalleryCatalogIntegration/composer.json b/app/code/Magento/MediaGalleryCatalogIntegration/composer.json
new file mode 100644
index 0000000000000..efabb70da9f39
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogIntegration/composer.json
@@ -0,0 +1,28 @@
+{
+    "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"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\MediaGalleryCatalogIntegration\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGalleryCatalogIntegration/etc/adminhtml/di.xml b/app/code/Magento/MediaGalleryCatalogIntegration/etc/adminhtml/di.xml
new file mode 100644
index 0000000000000..2f8fab34911d6
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogIntegration/etc/adminhtml/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\Catalog\Model\ImageUploader">
+        <plugin name="save_category_image" type="Magento\MediaGalleryCatalogIntegration\Plugin\SaveBaseCategoryImageInformation"/>
+    </type>
+</config>
diff --git a/app/code/Magento/MediaGalleryCatalogIntegration/etc/module.xml b/app/code/Magento/MediaGalleryCatalogIntegration/etc/module.xml
new file mode 100644
index 0000000000000..c9f1164121e91
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogIntegration/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_MediaGalleryCatalogIntegration" />
+</config>
diff --git a/app/code/Magento/MediaGalleryCatalogIntegration/registration.php b/app/code/Magento/MediaGalleryCatalogIntegration/registration.php
new file mode 100644
index 0000000000000..9495790092df1
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogIntegration/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_MediaGalleryCatalogIntegration',
+    __DIR__
+);
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Controller/Adminhtml/Category/Index.php b/app/code/Magento/MediaGalleryCatalogUi/Controller/Adminhtml/Category/Index.php
new file mode 100644
index 0000000000000..a541e9999b784
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Controller/Adminhtml/Category/Index.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryCatalogUi\Controller\Adminhtml\Category;
+
+use Magento\Backend\App\Action;
+use Magento\Backend\Model\View\Result\Page;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Controller\ResultInterface;
+
+/**
+ * Controller serving the media gallery content
+ */
+class Index extends Action implements HttpGetActionInterface
+{
+    public const ADMIN_RESOURCE = 'Magento_Cms::media_gallery';
+
+    /**
+     * Get the media gallery layout
+     *
+     * @return ResultInterface
+     */
+    public function execute(): ResultInterface
+    {
+        /** @var Page $resultPage */
+        $resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
+        $resultPage->getConfig()->getTitle()->prepend(__('Categories'));
+
+        return $resultPage;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryCatalogUi/LICENSE.txt b/app/code/Magento/MediaGalleryCatalogUi/LICENSE.txt
new file mode 100644
index 0000000000000..36b2459f6aa63
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/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.
diff --git a/app/code/Magento/MediaGalleryCatalogUi/LICENSE_AFL.txt b/app/code/Magento/MediaGalleryCatalogUi/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/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/MediaGalleryCatalogUi/Model/Listing/DataProvider.php b/app/code/Magento/MediaGalleryCatalogUi/Model/Listing/DataProvider.php
new file mode 100644
index 0000000000000..e17b02ec40737
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Model/Listing/DataProvider.php
@@ -0,0 +1,199 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryCatalogUi\Model\Listing;
+
+use Magento\Catalog\Api\CategoryListInterface;
+use Magento\Framework\Api\AttributeValueFactory;
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\Search\Document;
+use Magento\Framework\Api\Search\DocumentFactory;
+use Magento\Framework\Api\Search\FilterGroupBuilder;
+use Magento\Framework\Api\Search\ReportingInterface;
+use Magento\Framework\Api\Search\SearchCriteriaBuilder;
+use Magento\Framework\Api\Search\SearchCriteriaInterface;
+use Magento\Framework\Api\Search\SearchResultFactory;
+use Magento\Framework\Api\Search\SearchResultInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider as UiComponentDataProvider;
+
+/**
+ * DataProvider of category grid.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class DataProvider extends UiComponentDataProvider
+{
+    private const ENTITY_ID = 'entity_id';
+
+    /**
+     * @var SearchResultFactory
+     */
+    private $searchResultFactory;
+
+    /**
+     * @var CategoryListInterface
+     */
+    private $categoryList;
+
+    /**
+     * @var AttributeValueFactory
+     */
+    private $attributeValueFactory;
+
+    /**
+     * @var DocumentFactory
+     */
+    private $documentFactory;
+
+    /**
+     * @var FilterGroupBuilder
+     */
+    private $filterGroupBuilder;
+
+    /**
+     * @param string $name
+     * @param string $primaryFieldName
+     * @param string $requestFieldName
+     * @param ReportingInterface $reporting
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param RequestInterface $request
+     * @param FilterBuilder $filterBuilder
+     * @param SearchResultFactory $searchResultFactory
+     * @param CategoryListInterface $categoryList
+     * @param AttributeValueFactory $attributeValueFactory
+     * @param DocumentFactory $documentFactory
+     * @param FilterGroupBuilder $filterGroupBuilder
+     * @param array $meta
+     * @param array $data
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        string $name,
+        string $primaryFieldName,
+        string $requestFieldName,
+        ReportingInterface $reporting,
+        SearchCriteriaBuilder $searchCriteriaBuilder,
+        RequestInterface $request,
+        FilterBuilder $filterBuilder,
+        SearchResultFactory $searchResultFactory,
+        CategoryListInterface $categoryList,
+        AttributeValueFactory $attributeValueFactory,
+        DocumentFactory $documentFactory,
+        FilterGroupBuilder $filterGroupBuilder,
+        array $meta = [],
+        array $data = []
+    ) {
+        parent::__construct(
+            $name,
+            $primaryFieldName,
+            $requestFieldName,
+            $reporting,
+            $searchCriteriaBuilder,
+            $request,
+            $filterBuilder,
+            $meta,
+            $data
+        );
+        $this->categoryList = $categoryList;
+        $this->searchResultFactory = $searchResultFactory;
+        $this->attributeValueFactory = $attributeValueFactory;
+        $this->documentFactory = $documentFactory;
+        $this->filterGroupBuilder = $filterGroupBuilder;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getData()
+    {
+        try {
+            return $this->searchResultToOutput($this->getSearchResult());
+        } catch (\Exception $exception) {
+            return [
+                'items' => [],
+                'totalRecords' => 0,
+                'errorMessage' => $exception->getMessage()
+            ];
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getSearchResult(): SearchResultInterface
+    {
+        $searchCriteria = $this->getSearchCriteria();
+        $searchCriteria = $this->skipRootCategory($searchCriteria);
+        $collection = $this->categoryList->getList($searchCriteria);
+        $items = [];
+
+        foreach ($collection->getItems() as $category) {
+            $items[] = $this->createDocument(
+                [
+                    'entity_id' => $category->getEntityId(),
+                    'name'  => $category->getName(),
+                    'image' => $category->getImage(),
+                    'path' => $category->getPath(),
+                    'display_mode' => $category->getDisplayMode(),
+                    'products' => $category->getProductCount(),
+                    'include_in_menu' => $category->getIncludeInMenu(),
+                    'is_active' => $category->getIsActive()
+                ]
+            );
+        }
+
+        $searchResult = $this->searchResultFactory->create();
+        $searchResult->setSearchCriteria($searchCriteria);
+        $searchResult->setItems($items);
+        $searchResult->setTotalCount($collection->getTotalCount());
+
+        return $searchResult;
+    }
+
+    /**
+     * Skip empty root category in collection
+     *
+     * @param SearchCriteriaInterface $searchCriteria
+     * @return SearchCriteriaInterface
+     */
+    private function skipRootCategory(SearchCriteriaInterface $searchCriteria): SearchCriteriaInterface
+    {
+        $filterGroups = $searchCriteria->getFilterGroups();
+
+        $filters[] = $this->filterBuilder
+                   ->setField(self::ENTITY_ID)
+                   ->setConditionType('neq')
+                   ->setValue(1)
+                   ->create();
+        $filterGroups[] = $this->filterGroupBuilder->setFilters($filters)->create();
+        $searchCriteria->setFilterGroups($filterGroups);
+        return $searchCriteria;
+    }
+
+    /**
+     * Add attributes to grid result
+     *
+     * @param array $attributes [code => value]
+     */
+    private function createDocument(array $attributes): Document
+    {
+        $item = $this->documentFactory->create();
+        $customAttributes = [];
+
+        foreach ($attributes as $code => $value) {
+            $attribute = $this->attributeValueFactory->create();
+            $attribute->setAttributeCode($code);
+            $attribute->setValue($value);
+            $customAttributes[$code] = $attribute;
+        }
+
+        $item->setCustomAttributes($customAttributes);
+
+        return $item;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryCatalogUi/README.md b/app/code/Magento/MediaGalleryCatalogUi/README.md
new file mode 100644
index 0000000000000..f47b031875f5d
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/README.md
@@ -0,0 +1,13 @@
+# Magento_MediaGalleryCatalogUi module
+
+The Magento_MediaGalleryCatalogUi module that implement category grid for media gallery.
+
+## Extensibility
+
+Extension developers can interact with the Magento_MediaGalleryRenditions module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
+
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_MediaGalleryRenditions module.
+
+## Additional information
+
+For information about significant changes in patch releases, see [2.3.x Release information](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html).
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertCategoryGridPageDetailsActionGroup.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertCategoryGridPageDetailsActionGroup.xml
new file mode 100644
index 0000000000000..0788bbd60291a
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertCategoryGridPageDetailsActionGroup.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="AdminAssertCategoryGridPageDetailsActionGroup">
+        <annotations>
+            <description>Assert category grid page basic columns values for default category</description>
+        </annotations>
+
+        <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.path('1')}}" stepKey="assertPathColumn"/>
+        <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"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminOpenCategoryGridPageActionGroup.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminOpenCategoryGridPageActionGroup.xml
new file mode 100644
index 0000000000000..2444cb314ad22
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminOpenCategoryGridPageActionGroup.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="AdminOpenCategoryGridPageActionGroup">
+        <annotations>
+            <description>Navigates to category grid page by link.</description>
+        </annotations>
+
+        <amOnPage url="{{AdminMediaGalleryCatalogUiCategoryGridPage.url}}" stepKey="navigateToCategoryGridPage" />
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Page/AdminMediaGalleryCatalogUiCategoryGridPage.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Page/AdminMediaGalleryCatalogUiCategoryGridPage.xml
new file mode 100644
index 0000000000000..99cee48f443c7
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Page/AdminMediaGalleryCatalogUiCategoryGridPage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminMediaGalleryCatalogUiCategoryGridPage" url="media_gallery_catalog/category/index" area="admin" module="Magento_MediaGalleryCatalogUi">
+        <section name="AdminMediaGalleryCatalogUiCategoryGridSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml
new file mode 100644
index 0000000000000..1f1ce05222e7e
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml
@@ -0,0 +1,17 @@
+<?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="AdminMediaGalleryCatalogUiCategoryGridSection">
+        <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"/>
+        <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"/>
+ </section>
+</sections>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInCategoryFilterTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInCategoryFilterTest.xml
new file mode 100644
index 0000000000000..a495e2ff07e6a
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInCategoryFilterTest.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="AdminMediaGalleryCatalogUiUsedInCategoryFilterTest">
+        <annotations>
+            <features value="AdminMediaGalleryUsedInCategoryFilter"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1168"/>
+            <title value="Used in categories filter"/>
+            <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/4951846"/>
+            <description value="User filters assets used in categories"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
+            <actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectSecondImageToDelete">
+                <argument name="imageName" value="{{UpdatedImageDetails.title}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+        </after>
+        <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openCategoryPage"/>
+        <actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="openCategory">
+            <argument name="category" value="$$category$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGalleryFromImageUploader"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
+            <argument name="image" value="ImageUpload3"/>
+        </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="clickAddSelectedContentImage"/>
+        <actionGroup ref="AdminSaveCategoryFormActionGroup" stepKey="saveCategoryForm"/>
+        <actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGalleryFromImageUploaderAgain"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryExpandFilterActionGroup" stepKey="expandFilters"/>
+        <actionGroup ref="AdminEnhancedMediaGallerySelectUsedInFilterActionGroup" stepKey="setUsedInFilter">
+            <argument name="filterName" value="Used in Categories"/>
+            <argument name="optionName" value="$$category.name$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryApplyFiltersActionGroup" stepKey="applyFilters"/>
+        <actionGroup ref="AdminMediaGalleryAssertImageInGridActionGroup" stepKey="assertImageInGrid">
+            <argument name="title" value="UpdatedImageDetails.title"/>
+        </actionGroup>
+   </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
new file mode 100644
index 0000000000000..d68fd4cb7cca8
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
@@ -0,0 +1,73 @@
+<?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="AdminMediaGalleryCatalogUiUsedInProductFilterTest">
+        <annotations>
+            <features value="AdminMediaGalleryUsedInProductsFilter"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1168"/>
+            <title value="Used in products filter"/>
+            <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 products"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <createData entity="SimpleProduct" stepKey="product">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+            <deleteData createDataKey="product" stepKey="deleteProduct"/>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+        </after>
+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchProduct">
+            <argument name="product" value="$$product$$"/>
+        </actionGroup>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct">
+            <argument name="product" value="$$product$$"/>
+        </actionGroup>
+        <click selector="{{AdminProductFormSection.contentTab}}" stepKey="clickContentTab"/>
+        <waitForElementVisible selector="{{CatalogWYSIWYGSection.TinyMCE4}}" stepKey="waitForTinyMCE4" />
+        <click selector="{{CatalogWYSIWYGSection.InsertImageIcon}}" stepKey="clickInsertImageIcon" />
+        <waitForPageLoad stepKey="waitForPageLoad" />
+        <actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
+        <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="AdminEnhancedMediaGalleryExpandFilterActionGroup" stepKey="expandFilters"/>
+        <actionGroup ref="AdminEnhancedMediaGallerySelectUsedInFilterActionGroup" stepKey="setUsedInFilter">
+            <argument name="filterName" value="Used in Products"/>
+            <argument name="optionName" value="$$product.name$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryApplyFiltersActionGroup" stepKey="applyFilters"/>
+        <actionGroup ref="AdminMediaGalleryAssertImageInGridActionGroup" stepKey="assertImageInGrid">
+            <argument name="title" value="ImageMetadata.title"/>
+        </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/AdminMediaGalleryCatalogUiVerifyCategoryGridPageTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyCategoryGridPageTest.xml
new file mode 100644
index 0000000000000..6b7bd3ba11f45
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyCategoryGridPageTest.xml
@@ -0,0 +1,31 @@
+<?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="AdminMediaGalleryCatalogUiVerifyCategoryGridPageTest">
+        <annotations>
+            <features value="AdminMediaGalleryCategoryGrid"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1168"/>
+            <title value="User sees category 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/943908/scenarios/4523889"/>
+            <description value="User sees category entities where asset is used in"/>
+            <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"/>
+        </after>
+        <actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openCategoryPage"/>
+        <actionGroup ref="AdminAssertCategoryGridPageDetailsActionGroup" stepKey="assertCategoryGridPageRendered"/>
+   </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/CategoryActions.php b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/CategoryActions.php
new file mode 100644
index 0000000000000..0e7edd53bb45d
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/CategoryActions.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Columns;
+
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Ui\Component\Listing\Columns\Column;
+use Magento\Framework\UrlInterface;
+
+/**
+ * Class CategoryActions for Category grid
+ */
+class CategoryActions extends Column
+{
+    /**
+     * @var UrlInterface
+     */
+    private $urlBuilder;
+
+    /**
+     * @param ContextInterface $context
+     * @param UiComponentFactory $uiComponentFactory
+     * @param UrlInterface $urlBuilder
+     * @param array $components
+     * @param array $data
+     */
+    public function __construct(
+        ContextInterface $context,
+        UiComponentFactory $uiComponentFactory,
+        UrlInterface $urlBuilder,
+        array $components = [],
+        array $data = []
+    ) {
+        $this->urlBuilder = $urlBuilder;
+        parent::__construct($context, $uiComponentFactory, $components, $data);
+    }
+
+    /**
+     * Prepare Data Source
+     *
+     * @param array $dataSource
+     * @return array
+     */
+    public function prepareDataSource(array $dataSource)
+    {
+        if (isset($dataSource['data']['items'])) {
+            foreach ($dataSource['data']['items'] as &$item) {
+                $item[$this->getData('name')]['edit'] = [
+                    'href' => $this->urlBuilder->getUrl(
+                        'catalog/category/edit',
+                        [
+                            'id' => $item['entity_id']
+                        ]
+                    ),
+                    'label' => __('Edit'),
+                    'hidden' => false,
+                ];
+            }
+        }
+
+        return $dataSource;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/Path.php b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/Path.php
new file mode 100644
index 0000000000000..38569f5f698da
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/Path.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Columns;
+
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Ui\Component\Listing\Columns\Column;
+
+/**
+ * Class Path column for Category grid
+ */
+class Path extends Column
+{
+
+    /**
+     * @var CategoryRepositoryInterface
+     */
+    private $categoryRepository;
+
+    /**
+     * @param ContextInterface $context
+     * @param UiComponentFactory $uiComponentFactory
+     * @param CategoryRepositoryInterface $categoryRepository
+     * @param array $components
+     * @param array $data
+     */
+    public function __construct(
+        ContextInterface $context,
+        UiComponentFactory $uiComponentFactory,
+        CategoryRepositoryInterface $categoryRepository,
+        array $components = [],
+        array $data = []
+    ) {
+        parent::__construct($context, $uiComponentFactory, $components, $data);
+        $this->categoryRepository =  $categoryRepository;
+    }
+
+    /**
+     * 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] = $this->getCategoryPathWithNames($item[$fieldName]);
+                }
+            }
+        }
+
+        return $dataSource;
+    }
+
+    /**
+     * Replace category path ids with category names
+     *
+     * @param string $pathWithIds
+     */
+    private function getCategoryPathWithNames(string $pathWithIds): string
+    {
+        $categoryPathWithName = '';
+        $categoryIds = explode('/', $pathWithIds);
+        foreach ($categoryIds as $id) {
+            if ($id == 1) {
+                continue;
+            }
+            $categoryName = $this->categoryRepository->get($id)->getName();
+            $categoryPathWithName .=  ' / ' . $categoryName;
+        }
+        return $categoryPathWithName;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/Thumbnail.php b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/Thumbnail.php
new file mode 100644
index 0000000000000..efb2ad2f8dae5
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/Thumbnail.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Columns;
+
+use Magento\Catalog\Helper\Image;
+use Magento\Framework\DataObject;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Ui\Component\Listing\Columns\Column;
+
+/**
+ * Class Thumbnail column for Category grid
+ */
+class Thumbnail extends Column
+{
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var Image
+     */
+    private $imageHelper;
+
+    /**
+     * @param ContextInterface $context
+     * @param UiComponentFactory $uiComponentFactory
+     * @param StoreManagerInterface $storeManager
+     * @param Image $image
+     * @param array $components
+     * @param array $data
+     */
+    public function __construct(
+        ContextInterface $context,
+        UiComponentFactory $uiComponentFactory,
+        StoreManagerInterface $storeManager,
+        Image $image,
+        array $components = [],
+        array $data = []
+    ) {
+        parent::__construct($context, $uiComponentFactory, $components, $data);
+        $this->imageHelper = $image;
+        $this->storeManager = $storeManager;
+    }
+
+    /**
+     * 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 . '_src'] = $this->getUrl($item[$fieldName]);
+                } else {
+                    $category = new DataObject($item);
+                    $imageHelper = $this->imageHelper->init($category, 'product_listing_thumbnail');
+                    $item[$fieldName . '_src'] = $imageHelper->getUrl();
+                }
+            }
+        }
+
+        return $dataSource;
+    }
+
+    /**
+     * Get URL for the provided media asset path
+     *
+     * @param string $path
+     * @return string
+     * @throws LocalizedException
+     */
+    private function getUrl(string $path): string
+    {
+        /** @var Store $store */
+        $store = $this->storeManager->getStore();
+
+        return $store->getBaseUrl() . $path;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryCatalogUi/composer.json b/app/code/Magento/MediaGalleryCatalogUi/composer.json
new file mode 100644
index 0000000000000..985d581beff25
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/composer.json
@@ -0,0 +1,26 @@
+{
+    "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"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\MediaGalleryCatalogUi\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGalleryCatalogUi/etc/adminhtml/di.xml b/app/code/Magento/MediaGalleryCatalogUi/etc/adminhtml/di.xml
new file mode 100644
index 0000000000000..500ac10f4745a
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/etc/adminhtml/di.xml
@@ -0,0 +1,41 @@
+<?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">
+    <virtualType name="Magento\MediaGalleryUi\Model\Api\SearchCriteria\CollectionProcessor\FilterProcessor">
+        <arguments>
+            <argument name="customFilters" xsi:type="array">
+                <item name="product_id" xsi:type="object">Magento\MediaGalleryCatalogUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor\Product</item>
+                <item name="category_id" xsi:type="object">Magento\MediaGalleryCatalogUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor\Category</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\MediaGalleryCatalogUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor\Product" type="Magento\MediaGalleryUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor\Entity">
+        <arguments>
+            <argument name="entityType" xsi:type="string">catalog_product</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\MediaGalleryCatalogUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor\Category" type="Magento\MediaGalleryUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor\Entity">
+        <arguments>
+            <argument name="entityType" xsi:type="string">catalog_category</argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\MediaGalleryUi\Model\AssetDetailsProvider\UsedIn">
+        <arguments>
+            <argument name="contentTypes" xsi:type="array">
+                <item name="catalog_category" xsi:type="array">
+                    <item name="name" xsi:type="string">Categories</item>
+                    <item name="link" xsi:type="string">media_gallery_catalog/category/index</item>
+                </item>
+                <item name="catalog_product" xsi:type="array">
+                    <item name="name" xsi:type="string">Products</item>
+                    <item name="link" xsi:type="string">catalog/product/index</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/etc/adminhtml/routes.xml b/app/code/Magento/MediaGalleryCatalogUi/etc/adminhtml/routes.xml
new file mode 100644
index 0000000000000..45f1ccce1c64f
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/etc/adminhtml/routes.xml
@@ -0,0 +1,15 @@
+<?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:App/etc/routes.xsd">
+    <router id="admin">
+        <route id="media_gallery_catalog" frontName="media_gallery_catalog">
+            <module name="Magento_MediaGalleryCatalogUi" before="Magento_Backend" />
+        </route>
+    </router>
+</config>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/etc/module.xml b/app/code/Magento/MediaGalleryCatalogUi/etc/module.xml
new file mode 100644
index 0000000000000..4a593cbf10901
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/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_MediaGalleryCatalogUi" />
+</config>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/registration.php b/app/code/Magento/MediaGalleryCatalogUi/registration.php
new file mode 100644
index 0000000000000..c0376e2a828d1
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/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_MediaGalleryCatalogUi',
+    __DIR__
+);
diff --git a/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/layout/media_gallery_catalog_category_index.xml b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/layout/media_gallery_catalog_category_index.xml
new file mode 100644
index 0000000000000..1e195efc1beab
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/layout/media_gallery_catalog_category_index.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceContainer htmlTag="div" htmlClass="media-gallery-category-container" name="content">
+            <uiComponent name="media_gallery_category_listing"/>
+        </referenceContainer>
+    </body>
+</page>
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
new file mode 100644
index 0000000000000..e0b9eacbb4d20
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_category_listing.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <argument name="data" xsi:type="array">
+        <item name="js_config" xsi:type="array">
+            <item name="provider" xsi:type="string">
+                media_gallery_category_listing.media_gallery_category_listing_data_source
+            </item>
+        </item>
+    </argument>
+    <settings>
+        <spinner>media_gallery_category_columns</spinner>
+        <deps>
+            <dep>media_gallery_category_listing.media_gallery_category_listing_data_source</dep>
+        </deps>
+    </settings>
+    <dataSource name="media_gallery_category_listing_data_source" component="Magento_Ui/js/grid/provider">
+        <settings>
+            <storageConfig>
+                <param name="indexField" xsi:type="string">entity_id</param>
+            </storageConfig>
+            <updateUrl path="mui/index/render"/>
+        </settings>
+        <aclResource>Magento_Cms::media_gallery</aclResource>
+        <dataProvider class="Magento\MediaGalleryCatalogUi\Model\Listing\DataProvider" name="media_gallery_category_listing_data_source">
+            <settings>
+                <requestFieldName>entity_id</requestFieldName>
+                <primaryFieldName>entity_id</primaryFieldName>
+            </settings>
+        </dataProvider>
+    </dataSource>
+    <container name="messages"
+               sortOrder="20"
+               component="Magento_MediaGalleryUi/js/grid/messages">
+        <argument name="data" xsi:type="array">
+            <item name="config" xsi:type="array">
+                <item name="messageDelay" xsi:type="number">10</item>
+            </item>
+        </argument>
+    </container>
+    <listingToolbar name="listing_top" template="Magento_MediaGalleryUi/grid/toolbar">
+        <bookmark name="bookmarks"/>
+        <filterSearch name="name" >
+            <settings>
+                <placeholder>Search by category name</placeholder>
+                <label>Name</label>
+            </settings>
+        </filterSearch>
+        <filters name="listing_filters">
+            <filterSelect
+                name="asset_id"
+                provider="${ $.parentName }"
+                sortOrder="10"
+                class="Magento\MediaGalleryUi\Ui\Component\Listing\Filters\Asset"
+                component="Magento_Ui/js/form/element/ui-select"
+                template="Magento_MediaGalleryUi/grid/filters/elements/ui-select">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="entityType" xsi:type="string">catalog_category</item>
+                        <item name="identityColumn" xsi:type="string">entity_id</item>
+                        <item name="filterOptions" xsi:type="boolean">true</item>
+                        <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="filterRateLimit" xsi:type="string" translate="true">1000</item>
+                        <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="levelsVisibility" xsi:type="number">1</item>
+                    </item>
+                </argument>
+                <settings>
+                    <caption translate="true">– Please Select assets –</caption>
+                    <label translate="true">Asset</label>
+                    <dataScope>asset_id</dataScope>
+                    </settings>
+            </filterSelect>
+         </filters>
+        <paging name="listing_paging">
+            <settings>
+                <options>
+                    <option name="32" xsi:type="array">
+                        <item name="value" xsi:type="number">32</item>
+                        <item name="label" xsi:type="string">32</item>
+                    </option>
+                    <option name="48" xsi:type="array">
+                        <item name="value" xsi:type="number">48</item>
+                        <item name="label" xsi:type="string">48</item>
+                    </option>
+                    <option name="64" xsi:type="array">
+                        <item name="value" xsi:type="number">64</item>
+                        <item name="label" xsi:type="string">64</item>
+                    </option>
+                </options>
+                <pageSize>32</pageSize>
+            </settings>
+        </paging>
+    </listingToolbar>
+    <columns name="media_gallery_category_columns">
+        <column name="entity_id">
+            <settings>
+                <filter>text</filter>
+                <label translate="true">ID</label>
+            </settings>
+        </column>
+        <column name="image" component="Magento_Ui/js/grid/columns/thumbnail" class="Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Columns\Thumbnail">
+            <settings>
+                <sortable>false</sortable>
+                <label translate="true">Image</label>
+            </settings>
+        </column>
+        <column name="name">
+            <settings>
+                <label translate="true">Name</label>
+            </settings>
+        </column>
+        <column name="path" class="Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Columns\Path">
+            <settings>
+                <label translate="true">Path</label>
+            </settings>
+        </column>
+        <column name="display_mode">
+            <settings>
+                <filter>text</filter>
+                <label translate="true">Display Mode</label>
+            </settings>
+        </column>
+        <column name="products">
+            <settings>
+                <label translate="true">Products</label>
+            </settings>
+        </column>
+        <column name="include_in_menu" component="Magento_Ui/js/grid/columns/select">
+           <argument name="data" xsi:type="array">
+            </argument>
+            <settings>
+                 <options>
+                    <option name="Yes" xsi:type="array">
+                        <item name="value" xsi:type="number">1</item>
+                        <item name="label" xsi:type="string">Yes</item>
+                    </option>
+                     <option name="No" xsi:type="array">
+                        <item name="value" xsi:type="number">0</item>
+                        <item name="label" xsi:type="string">No</item>
+                    </option>
+                </options>
+                <dataType>select</dataType>
+                <filter>select</filter>
+                <label translate="true">In Menu</label>
+            </settings>
+        </column>
+        <column name="is_active" component="Magento_Ui/js/grid/columns/select" >
+            <settings>
+                <dataType>select</dataType>
+                <filter>select</filter>
+                <options>
+                    <option name="Yes" xsi:type="array">
+                        <item name="value" xsi:type="number">1</item>
+                        <item name="label" xsi:type="string">Yes</item>
+                    </option>
+                     <option name="No" xsi:type="array">
+                        <item name="value" xsi:type="number">0</item>
+                        <item name="label" xsi:type="string">No</item>
+                    </option>
+                </options>
+                <label translate="true">Enabled</label>
+            </settings>
+        </column>
+        <actionsColumn name="actions" class="Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Columns\CategoryActions" sortOrder="1000">
+            <settings>
+                <indexField>entity_id</indexField>
+            </settings>
+        </actionsColumn>
+    </columns>
+</listing>
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
new file mode 100644
index 0000000000000..97743b458e8d7
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_listing.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <listingToolbar name="listing_top">
+        <filters name="listing_filters">
+            <filterSelect
+                    name="product_id"
+                    provider="${ $.parentName }"
+                    sortOrder="110"
+                    component="Magento_Catalog/js/components/product-ui-select"
+                    template="ui/grid/filters/elements/ui-select">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="filterOptions" xsi:type="boolean">true</item>
+                        <item name="searchOptions" xsi:type="boolean">true</item>
+                        <item name="filterPlaceholder" xsi:type="string" translate="true">Product Name or SKU</item>
+                        <item name="emptyOptionsHtml" xsi:type="string" translate="true">Start typing to find products</item>
+                        <item name="missingValuePlaceholder" xsi:type="string" translate="true">Product with ID: %s doesn\'t exist</item>
+                        <item name="isDisplayMissingValuePlaceholder" xsi:type="boolean">true</item>
+                        <item name="isDisplayEmptyPlaceholder" xsi:type="boolean">true</item>
+                        <item name="isRemoveSelectedIcon" xsi:type="boolean">true</item>
+                        <item name="filterRateLimit" xsi:type="string" translate="true">1000</item>
+                        <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>
+                </argument>
+                <settings>
+                    <label translate="true">Used in Products</label>
+                    <dataScope>product_id</dataScope>
+                </settings>
+            </filterSelect>
+            <filterSelect
+                    name="category_id"
+                    provider="${ $.parentName }"
+                    sortOrder="100"
+                    component="Magento_Catalog/js/components/new-category"
+                    template="ui/grid/filters/elements/ui-select">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="filterOptions" xsi:type="boolean">true</item>
+                        <item name="levelsVisibility" xsi:type="number">1</item>
+                        <item name="filterPlaceholder" xsi:type="string" translate="true">Category Name</item>
+                        <item name="emptyOptionsHtml" xsi:type="string" translate="true">Start typing to find categories</item>
+                    </item>
+                </argument>
+                <settings>
+                    <options class="Magento\Catalog\Ui\Component\Product\Form\Categories\Options"/>
+                    <label translate="true">Used in Categories</label>
+                    <dataScope>category_id</dataScope>
+                    <listens>
+                        <link name="${ $.namespace }.${ $.namespace }:responseData">setParsed</link>
+                    </listens>
+                </settings>
+            </filterSelect>
+        </filters>
+    </listingToolbar>
+</listing>
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
new file mode 100644
index 0000000000000..97743b458e8d7
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <listingToolbar name="listing_top">
+        <filters name="listing_filters">
+            <filterSelect
+                    name="product_id"
+                    provider="${ $.parentName }"
+                    sortOrder="110"
+                    component="Magento_Catalog/js/components/product-ui-select"
+                    template="ui/grid/filters/elements/ui-select">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="filterOptions" xsi:type="boolean">true</item>
+                        <item name="searchOptions" xsi:type="boolean">true</item>
+                        <item name="filterPlaceholder" xsi:type="string" translate="true">Product Name or SKU</item>
+                        <item name="emptyOptionsHtml" xsi:type="string" translate="true">Start typing to find products</item>
+                        <item name="missingValuePlaceholder" xsi:type="string" translate="true">Product with ID: %s doesn\'t exist</item>
+                        <item name="isDisplayMissingValuePlaceholder" xsi:type="boolean">true</item>
+                        <item name="isDisplayEmptyPlaceholder" xsi:type="boolean">true</item>
+                        <item name="isRemoveSelectedIcon" xsi:type="boolean">true</item>
+                        <item name="filterRateLimit" xsi:type="string" translate="true">1000</item>
+                        <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>
+                </argument>
+                <settings>
+                    <label translate="true">Used in Products</label>
+                    <dataScope>product_id</dataScope>
+                </settings>
+            </filterSelect>
+            <filterSelect
+                    name="category_id"
+                    provider="${ $.parentName }"
+                    sortOrder="100"
+                    component="Magento_Catalog/js/components/new-category"
+                    template="ui/grid/filters/elements/ui-select">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="filterOptions" xsi:type="boolean">true</item>
+                        <item name="levelsVisibility" xsi:type="number">1</item>
+                        <item name="filterPlaceholder" xsi:type="string" translate="true">Category Name</item>
+                        <item name="emptyOptionsHtml" xsi:type="string" translate="true">Start typing to find categories</item>
+                    </item>
+                </argument>
+                <settings>
+                    <options class="Magento\Catalog\Ui\Component\Product\Form\Categories\Options"/>
+                    <label translate="true">Used in Categories</label>
+                    <dataScope>category_id</dataScope>
+                    <listens>
+                        <link name="${ $.namespace }.${ $.namespace }:responseData">setParsed</link>
+                    </listens>
+                </settings>
+            </filterSelect>
+        </filters>
+    </listingToolbar>
+</listing>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/web/css/source/_module.less b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/web/css/source/_module.less
new file mode 100644
index 0000000000000..0d2a1897e0c25
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/web/css/source/_module.less
@@ -0,0 +1,23 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+& when (@media-common = true) {
+
+    .media-gallery-category-container {
+
+        .admin__field-label {
+            text-align: left;
+        }
+        
+        .admin__action-dropdown-wrap._active .admin__action-dropdown-text::after {
+            margin-right: 6px;
+        }
+
+        .admin__data-grid-action-bookmarks .admin__action-dropdown-menu {
+            left: auto;
+            right: 0;
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGalleryCmsUi/Controller/Adminhtml/Block/Search.php b/app/code/Magento/MediaGalleryCmsUi/Controller/Adminhtml/Block/Search.php
new file mode 100644
index 0000000000000..7beb95375073e
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCmsUi/Controller/Adminhtml/Block/Search.php
@@ -0,0 +1,97 @@
+<?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\Api\SearchCriteriaBuilder;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\Controller\ResultInterface;
+
+/**
+ * Controller to search blocks for ui-select component
+ */
+class Search 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;
+
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @param JsonFactory $resultFactory
+     * @param BlockRepositoryInterface $blockRepository
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param Context $context
+     */
+    public function __construct(
+        JsonFactory $resultFactory,
+        BlockRepositoryInterface $blockRepository,
+        SearchCriteriaBuilder $searchCriteriaBuilder,
+        Context $context
+    ) {
+        $this->resultJsonFactory = $resultFactory;
+        $this->blockRepository = $blockRepository;
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+        parent::__construct($context);
+    }
+
+    /**
+     * Execute pages search.
+     *
+     * @return ResultInterface
+     */
+    public function execute() : ResultInterface
+    {
+        $searchKey = $this->getRequest()->getParam('searchKey');
+        $currentPage = (int) $this->getRequest()->getParam('page');
+        $limit = (int) $this->getRequest()->getParam('limit');
+
+        $searchResult = $this->blockRepository->getList(
+            $this->searchCriteriaBuilder->addFilter('title', '%' . $searchKey . '%', 'like')
+                ->setCurrentPage($currentPage)
+                ->setPageSize($limit)
+                ->create()
+        );
+
+        $options = [];
+        foreach ($searchResult->getItems() as $block) {
+            $id = $block->getId();
+            $options[$id] = [
+                'value' => $id,
+                'label' => $block->getTitle(),
+                'is_active' => $block->isActive(),
+                'optgroup' => false
+            ];
+        }
+
+        return $this->resultJsonFactory->create()->setData([
+            'options' => $options,
+            'total' => $searchResult->getTotalCount()
+        ]);
+    }
+}
diff --git a/app/code/Magento/MediaGalleryCmsUi/Controller/Adminhtml/Page/Search.php b/app/code/Magento/MediaGalleryCmsUi/Controller/Adminhtml/Page/Search.php
new file mode 100644
index 0000000000000..b211e58a0e8c6
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCmsUi/Controller/Adminhtml/Page/Search.php
@@ -0,0 +1,97 @@
+<?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\Api\SearchCriteriaBuilder;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\Controller\ResultInterface;
+
+/**
+ * Controller to search pages for ui-select component
+ */
+class Search 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;
+
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @param JsonFactory $resultFactory
+     * @param PageRepositoryInterface $pageRepository
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param Context $context
+     */
+    public function __construct(
+        JsonFactory $resultFactory,
+        PageRepositoryInterface $pageRepository,
+        SearchCriteriaBuilder $searchCriteriaBuilder,
+        Context $context
+    ) {
+        $this->resultJsonFactory = $resultFactory;
+        $this->pageRepository = $pageRepository;
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+        parent::__construct($context);
+    }
+
+    /**
+     * Execute pages search.
+     *
+     * @return ResultInterface
+     */
+    public function execute(): ResultInterface
+    {
+        $searchKey = $this->getRequest()->getParam('searchKey');
+        $currentPage = (int) $this->getRequest()->getParam('page');
+        $limit = (int) $this->getRequest()->getParam('limit');
+
+        $searchResult = $this->pageRepository->getList(
+            $this->searchCriteriaBuilder->addFilter('title', '%' . $searchKey . '%', 'like')
+                ->setCurrentPage($currentPage)
+                ->setPageSize($limit)
+                ->create()
+        );
+
+        $options = [];
+        foreach ($searchResult->getItems() as $page) {
+            $id = $page->getId();
+            $options[$id] = [
+                'value' => $id,
+                'label' => $page->getTitle(),
+                'is_active' => $page->isActive(),
+                'optgroup' => false
+            ];
+        }
+
+        return $this->resultJsonFactory->create()->setData([
+            'options' => $options,
+            'total' => $searchResult->getTotalCount()
+        ]);
+    }
+}
diff --git a/app/code/Magento/MediaGalleryCmsUi/LICENSE.txt b/app/code/Magento/MediaGalleryCmsUi/LICENSE.txt
new file mode 100644
index 0000000000000..36b2459f6aa63
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCmsUi/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.
diff --git a/app/code/Magento/MediaGalleryCmsUi/LICENSE_AFL.txt b/app/code/Magento/MediaGalleryCmsUi/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCmsUi/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/MediaGalleryCmsUi/README.md b/app/code/Magento/MediaGalleryCmsUi/README.md
new file mode 100644
index 0000000000000..a5c2eb24c6c15
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCmsUi/README.md
@@ -0,0 +1,13 @@
+# Magento_MediaGalleryCmsUi module
+
+The Magento_MediaGalleryCmsUi module provides Magento_Cms related UI elements to the media gallery user interface
+
+## Extensibility
+
+Extension developers can interact with the Magento_MediaGalleryRenditions module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
+
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_MediaGalleryRenditions module.
+
+## Additional information
+
+For information about significant changes in patch releases, see [2.3.x Release information](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html).
diff --git a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/ActionGroup/FillOutCustomCMSPageContentActionGroup.xml b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/ActionGroup/FillOutCustomCMSPageContentActionGroup.xml
new file mode 100644
index 0000000000000..f0938016d12f1
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/ActionGroup/FillOutCustomCMSPageContentActionGroup.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="FillOutCustomCMSPageContentActionGroup">
+        <annotations>
+            <description>Fills out the Page details (Page Title, Content and URL Key)</description>
+        </annotations>
+
+        <arguments>
+            <argument name="title" type="string"/>
+            <argument name="content" type="string"/>
+            <argument name="identifier" type="string"/>
+        </arguments>
+
+        <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{title}}" stepKey="fillFieldTitle"/>
+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickExpandContentTabForPage"/>
+        <fillField selector="{{CmsNewPagePageContentSection.contentHeading}}" userInput="{{content}}" stepKey="fillFieldContentHeading"/>
+        <scrollTo selector="{{CmsNewPagePageContentSection.content}}" stepKey="scrollToPageContent"/>
+        <fillField selector="{{CmsNewPagePageContentSection.content}}" userInput="{{content}}" stepKey="fillFieldContent"/>
+        <click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
+        <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{identifier}}" stepKey="fillFieldUrlKey"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryCmsUiUsedInBlocksFilterTest.xml b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryCmsUiUsedInBlocksFilterTest.xml
new file mode 100644
index 0000000000000..810d9eea4e261
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryCmsUiUsedInBlocksFilterTest.xml
@@ -0,0 +1,60 @@
+<?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="AdminMediaGalleryCmsUiUsedInBlocksFilterTest">
+        <annotations>
+            <features value="AdminMediaGalleryUsedInBlocksFilter"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1168"/>
+            <title value="Used in blocks filter"/>
+            <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/4951850"/>
+            <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"/>
+            <deleteData createDataKey="block" stepKey="deleteBlock"/>
+        </after>
+        <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
+            <argument name="CMSBlockPage" value="$$block$$"/>
+        </actionGroup>
+        <click selector="{{CmsWYSIWYGSection.InsertImageBtn}}" stepKey="clickInsertImageIcon" />
+        <waitForPageLoad stepKey="waitForPageLoad" />
+        <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="AdminEnhancedMediaGalleryExpandFilterActionGroup" stepKey="expandFilters"/>
+        <actionGroup ref="AdminEnhancedMediaGallerySelectUsedInFilterActionGroup" stepKey="setUsedInFilter">
+            <argument name="filterName" value="Used in Blocks"/>
+            <argument name="optionName" value="$$block.title$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryApplyFiltersActionGroup" stepKey="applyFilters"/>
+        <actionGroup ref="AdminMediaGalleryAssertImageInGridActionGroup" stepKey="assertImageInGrid">
+            <argument name="title" value="ImageMetadata.title"/>
+        </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/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryCmsUiUsedInPagesFilterTest.xml b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryCmsUiUsedInPagesFilterTest.xml
new file mode 100644
index 0000000000000..a6bfdb781a734
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryCmsUiUsedInPagesFilterTest.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="AdminMediaGalleryCmsUiUsedInPagesFilterTest">
+        <annotations>
+            <features value="AdminMediaGalleryUsedInPagesFilter"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1168"/>
+            <title value="Used in pages filter"/>
+            <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/4934276"/>
+            <description value="User filters assets used in pages"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
+        </before>
+       
+        <actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToCreateNewPage"/>
+        <actionGroup ref="FillOutCustomCMSPageContentActionGroup" stepKey="fillBasicPageDataForPageWithDefaultStore">
+            <argument name="title" value="Unique page title MediaGalleryUi"/>
+            <argument name="content" value="MediaGalleryUI content"/>
+            <argument name="identifier" value="test-page-1"/>
+        </actionGroup>
+        
+        <actionGroup ref="AdminOpenMediaGalleryFromPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad" />
+        <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="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="savePage"/>
+        
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryExpandFilterActionGroup" stepKey="expandFilters"/>
+        <actionGroup ref="AdminEnhancedMediaGallerySelectUsedInFilterActionGroup" stepKey="setUsedInFilter">
+            <argument name="filterName" value="Used in Pages"/>
+            <argument name="optionName" value="Unique page title MediaGalleryUi"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryApplyFiltersActionGroup" stepKey="applyFilters"/>
+        <actionGroup ref="AdminMediaGalleryAssertImageInGridActionGroup" stepKey="assertImageInGrid">
+            <argument name="title" value="ImageMetadata.title"/>
+        </actionGroup>
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
+        <actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete">
+                <argument name="imageName" value="{{ImageMetadata.title}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
+          
+        <actionGroup ref="AdminNavigateToPageGridActionGroup" stepKey="navigateToCmsPageGrid"/>
+        <actionGroup ref="AdminSearchCmsPageInGridByUrlKeyActionGroup" stepKey="findCreatedCmsPage">
+            <argument name="urlKey" value="test-page-1"/>
+        </actionGroup>
+         <actionGroup ref="AdminDeleteCmsPageFromGridActionGroup" stepKey="deleteCmsPage">
+            <argument name="urlKey" value="test-page-1"/>
+        </actionGroup>
+   </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryCmsUi/composer.json b/app/code/Magento/MediaGalleryCmsUi/composer.json
new file mode 100644
index 0000000000000..1ecfb9a3c8855
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCmsUi/composer.json
@@ -0,0 +1,23 @@
+{
+    "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"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\MediaGalleryCmsUi\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGalleryCmsUi/etc/adminhtml/di.xml b/app/code/Magento/MediaGalleryCmsUi/etc/adminhtml/di.xml
new file mode 100644
index 0000000000000..b06ad0fff1df6
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCmsUi/etc/adminhtml/di.xml
@@ -0,0 +1,41 @@
+<?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">
+    <virtualType name="Magento\MediaGalleryUi\Model\Api\SearchCriteria\CollectionProcessor\FilterProcessor">
+        <arguments>
+            <argument name="customFilters" xsi:type="array">
+                <item name="page_id" xsi:type="object">Magento\MediaGalleryCmsUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor\Page</item>
+                <item name="block_id" xsi:type="object">Magento\MediaGalleryCmsUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor\Block</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\MediaGalleryCmsUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor\Page" type="Magento\MediaGalleryUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor\Entity">
+        <arguments>
+            <argument name="entityType" xsi:type="string">cms_page</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\MediaGalleryCmsUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor\Block" type="Magento\MediaGalleryUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor\Entity">
+        <arguments>
+            <argument name="entityType" xsi:type="string">cms_block</argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\MediaGalleryUi\Model\AssetDetailsProvider\UsedIn">
+        <arguments>
+            <argument name="contentTypes" xsi:type="array">
+                <item name="cms_block" xsi:type="array">
+                    <item name="name" xsi:type="string">Blocks</item>
+                    <item name="link" xsi:type="string">cms/block/index</item>
+                </item>
+                <item name="cms_page" xsi:type="array">
+                    <item name="name" xsi:type="string">Pages</item>
+                    <item name="link" xsi:type="string">cms/page/index</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/MediaGalleryCmsUi/etc/adminhtml/routes.xml b/app/code/Magento/MediaGalleryCmsUi/etc/adminhtml/routes.xml
new file mode 100644
index 0000000000000..2dc8b3ade5be7
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCmsUi/etc/adminhtml/routes.xml
@@ -0,0 +1,15 @@
+<?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:App/etc/routes.xsd">
+    <router id="admin">
+        <route id="media_gallery_cms" frontName="media_gallery_cms">
+            <module name="Magento_MediaGalleryCmsUi" before="Magento_Backend" />
+        </route>
+    </router>
+</config>
diff --git a/app/code/Magento/MediaGalleryCmsUi/etc/module.xml b/app/code/Magento/MediaGalleryCmsUi/etc/module.xml
new file mode 100644
index 0000000000000..8a39b8328b387
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCmsUi/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_MediaGalleryCmsUi" />
+</config>
diff --git a/app/code/Magento/MediaGalleryCmsUi/registration.php b/app/code/Magento/MediaGalleryCmsUi/registration.php
new file mode 100644
index 0000000000000..0e68935eba590
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCmsUi/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_MediaGalleryCmsUi',
+    __DIR__
+);
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
new file mode 100644
index 0000000000000..509a7e6a53673
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCmsUi/view/adminhtml/ui_component/media_gallery_listing.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <listingToolbar name="listing_top">
+        <filters name="listing_filters">
+            <filterSelect
+                    name="page_id"
+                    provider="${ $.parentName }"
+                    sortOrder="120"
+                    component="Magento_Ui/js/form/element/ui-select"
+                    template="ui/grid/filters/elements/ui-select">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="filterOptions" xsi:type="boolean">true</item>
+                        <item name="searchOptions" xsi:type="boolean">true</item>
+                        <item name="searchUrl" xsi:type="url" path="media_gallery_cms/page/search" />
+                        <item name="levelsVisibility" xsi:type="number">1</item>
+                        <item name="showPath" xsi:type="boolean">false</item>
+                        <item name="filterPlaceholder" xsi:type="string" translate="true">Page Title</item>
+                        <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>
+                </argument>
+                <settings>
+                    <label translate="true">Used in Pages</label>
+                    <dataScope>page_id</dataScope>
+                </settings>
+            </filterSelect>
+            <filterSelect
+                    name="block_id"
+                    provider="${ $.parentName }"
+                    sortOrder="130"
+                    component="Magento_Ui/js/form/element/ui-select"
+                    template="ui/grid/filters/elements/ui-select">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="filterOptions" xsi:type="boolean">true</item>
+                        <item name="searchOptions" xsi:type="boolean">true</item>
+                        <item name="searchUrl" xsi:type="url" path="media_gallery_cms/block/search" />
+                        <item name="levelsVisibility" xsi:type="number">1</item>
+                        <item name="showPath" xsi:type="boolean">false</item>
+                        <item name="filterPlaceholder" xsi:type="string" translate="true">Block Title</item>
+                        <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>
+                </argument>
+                <settings>
+                    <label translate="true">Used in Blocks</label>
+                    <dataScope>block_id</dataScope>
+                </settings>
+            </filterSelect>
+        </filters>
+    </listingToolbar>
+</listing>
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
new file mode 100644
index 0000000000000..509a7e6a53673
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCmsUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <listingToolbar name="listing_top">
+        <filters name="listing_filters">
+            <filterSelect
+                    name="page_id"
+                    provider="${ $.parentName }"
+                    sortOrder="120"
+                    component="Magento_Ui/js/form/element/ui-select"
+                    template="ui/grid/filters/elements/ui-select">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="filterOptions" xsi:type="boolean">true</item>
+                        <item name="searchOptions" xsi:type="boolean">true</item>
+                        <item name="searchUrl" xsi:type="url" path="media_gallery_cms/page/search" />
+                        <item name="levelsVisibility" xsi:type="number">1</item>
+                        <item name="showPath" xsi:type="boolean">false</item>
+                        <item name="filterPlaceholder" xsi:type="string" translate="true">Page Title</item>
+                        <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>
+                </argument>
+                <settings>
+                    <label translate="true">Used in Pages</label>
+                    <dataScope>page_id</dataScope>
+                </settings>
+            </filterSelect>
+            <filterSelect
+                    name="block_id"
+                    provider="${ $.parentName }"
+                    sortOrder="130"
+                    component="Magento_Ui/js/form/element/ui-select"
+                    template="ui/grid/filters/elements/ui-select">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="filterOptions" xsi:type="boolean">true</item>
+                        <item name="searchOptions" xsi:type="boolean">true</item>
+                        <item name="searchUrl" xsi:type="url" path="media_gallery_cms/block/search" />
+                        <item name="levelsVisibility" xsi:type="number">1</item>
+                        <item name="showPath" xsi:type="boolean">false</item>
+                        <item name="filterPlaceholder" xsi:type="string" translate="true">Block Title</item>
+                        <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>
+                </argument>
+                <settings>
+                    <label translate="true">Used in Blocks</label>
+                    <dataScope>block_id</dataScope>
+                </settings>
+            </filterSelect>
+        </filters>
+    </listingToolbar>
+</listing>
diff --git a/app/code/Magento/MediaGalleryIntegration/LICENSE.txt b/app/code/Magento/MediaGalleryIntegration/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/MediaGalleryIntegration/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/MediaGalleryIntegration/LICENSE_AFL.txt b/app/code/Magento/MediaGalleryIntegration/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/MediaGalleryIntegration/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/MediaGalleryIntegration/Model/OpenDialogUrlProvider.php b/app/code/Magento/MediaGalleryIntegration/Model/OpenDialogUrlProvider.php
new file mode 100644
index 0000000000000..317b811df5692
--- /dev/null
+++ b/app/code/Magento/MediaGalleryIntegration/Model/OpenDialogUrlProvider.php
@@ -0,0 +1,40 @@
+<?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/SaveImageInformation.php b/app/code/Magento/MediaGalleryIntegration/Plugin/SaveImageInformation.php
new file mode 100644
index 0000000000000..fbe35db298b04
--- /dev/null
+++ b/app/code/Magento/MediaGalleryIntegration/Plugin/SaveImageInformation.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryIntegration\Plugin;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\File\Uploader;
+use Magento\Framework\Filesystem;
+use Magento\MediaGalleryApi\Api\IsPathExcludedInterface;
+use Magento\MediaGalleryApi\Api\SaveAssetsInterface;
+use Magento\MediaGallerySynchronizationApi\Api\SynchronizeFilesInterface;
+use Magento\MediaGalleryUiApi\Api\ConfigInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Save image information by SaveAssetsInterface.
+ */
+class SaveImageInformation
+{
+    private const IMAGE_FILE_NAME_PATTERN = '#\.(jpg|jpeg|gif|png)$# i';
+
+    /**
+     * @var IsPathExcludedInterface
+     */
+    private $isPathExcluded;
+
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $log;
+
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var SynchronizeFilesInterface
+     */
+    private $synchronizeFiles;
+
+    /**
+     * @param Filesystem $filesystem
+     * @param LoggerInterface $log
+     * @param IsPathExcludedInterface $isPathExcluded
+     * @param SynchronizeFilesInterface $synchronizeFiles
+     * @param ConfigInterface $config
+     */
+    public function __construct(
+        Filesystem $filesystem,
+        LoggerInterface $log,
+        IsPathExcludedInterface $isPathExcluded,
+        SynchronizeFilesInterface $synchronizeFiles,
+        ConfigInterface $config
+    ) {
+        $this->log = $log;
+        $this->isPathExcluded = $isPathExcluded;
+        $this->filesystem = $filesystem;
+        $this->synchronizeFiles = $synchronizeFiles;
+        $this->config = $config;
+    }
+
+    /**
+     * Saves asset to media gallery after save image.
+     *
+     * @param Uploader $subject
+     * @param array $result
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterSave(Uploader $subject, array $result): array
+    {
+        if (!$this->config->isEnabled()) {
+            return $result;
+        }
+
+        $path = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA)
+            ->getRelativePath(rtrim($result['path'], '/') . '/' . ltrim($result['file'], '/'));
+        if (!$this->isApplicable($path)) {
+            return $result;
+        }
+        $this->synchronizeFiles->execute([$path]);
+
+        return $result;
+    }
+
+    /**
+     * Can asset be saved with provided path
+     *
+     * @param string $path
+     * @return bool
+     */
+    private function isApplicable(string $path): bool
+    {
+        try {
+            return $path
+                && !$this->isPathExcluded->execute($path)
+                && preg_match(self::IMAGE_FILE_NAME_PATTERN, $path);
+        } catch (\Exception $exception) {
+            $this->log->critical($exception);
+            return false;
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGalleryIntegration/README.md b/app/code/Magento/MediaGalleryIntegration/README.md
new file mode 100644
index 0000000000000..365cde86777f2
--- /dev/null
+++ b/app/code/Magento/MediaGalleryIntegration/README.md
@@ -0,0 +1,3 @@
+# Magento_MediaGalleryIntegration
+
+The purpose of this module is to keep the integration of enhanced media gallery to Magento separated from implementation.
diff --git a/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/ImageComponentOpenDialogUrlTest.php b/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/ImageComponentOpenDialogUrlTest.php
new file mode 100644
index 0000000000000..dfeaa3eff56bd
--- /dev/null
+++ b/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/ImageComponentOpenDialogUrlTest.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryIntegration\Test\Integration\Model;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\UrlInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Ui\Component\Form\Element\DataType\Media\Image;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Provide integration tests cover update open dialog url functionality for media editor.
+ * @magentoAppArea adminhtml
+ */
+class ImageComponentOpenDialogUrlTest extends TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManger;
+
+    /**
+     * @var Image
+     */
+    private $image;
+
+    /**
+     * @var string
+     */
+    private $mediaGalleryOpenDialogUrl;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->objectManger = Bootstrap::getObjectManager();
+        $this->image = $this->objectManger->create(Image::class);
+        $this->image->setData('config', ['initialMediaGalleryOpenSubpath' => 'wysiwyg']);
+
+        $url = $this->objectManger->create(UrlInterface::class);
+        $this->mediaGalleryOpenDialogUrl = $url->getUrl('media_gallery/index/index');
+    }
+
+    /**
+     * Test image open dialog url when enhanced media gallery not enabled.
+     * @magentoConfigFixture default/system/media_gallery/enabled 0
+     */
+    public function testWithEnhancedMediaGalleryDisabled(): void
+    {
+        $this->image->prepare();
+        $expectedOpenDialogUrl = $this->image->getConfiguration()['mediaGallery']['openDialogUrl'];
+        self::assertNotEquals($this->mediaGalleryOpenDialogUrl, $expectedOpenDialogUrl);
+    }
+
+    /**
+     * Test image open dialog url when enhanced media gallery enabled.
+     * @magentoConfigFixture default/system/media_gallery/enabled 1
+     */
+    public function testWithEnhancedMediaGalleryEnabled(): void
+    {
+        $this->image->prepare();
+        $expectedOpenDialogUrl = $this->image->getConfiguration()['mediaGallery']['openDialogUrl'];
+        self::assertEquals($this->mediaGalleryOpenDialogUrl, $expectedOpenDialogUrl);
+    }
+}
diff --git a/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/OpenDialogUrlProviderTest.php b/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/OpenDialogUrlProviderTest.php
new file mode 100644
index 0000000000000..7a3316f293879
--- /dev/null
+++ b/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/OpenDialogUrlProviderTest.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+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 PHPUnit\Framework\TestCase;
+
+/**
+ * Provide tests cover getting correct url based on the config settings.
+ * @magentoAppArea adminhtml
+ */
+class OpenDialogUrlProviderTest extends TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManger;
+
+    /**
+     * @var OpenDialogUrlProvider
+     */
+    private $openDialogUrlProvider;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->objectManger = Bootstrap::getObjectManager();
+        $config = $this->objectManger->create(ConfigInterface::class);
+        $this->openDialogUrlProvider = $this->objectManger->create(
+            OpenDialogUrlProvider::class,
+            ['config' => $config]
+        );
+    }
+
+    /**
+     * Test getting open dialog url with enhanced media gallery disabled.
+     * @magentoConfigFixture default/system/media_gallery/enabled 0
+     */
+    public function testWithEnhancedMediaGalleryDisabled(): void
+    {
+        self::assertEquals('cms/wysiwyg_images/index', $this->openDialogUrlProvider->getUrl());
+    }
+
+    /**
+     * Test getting open dialog url when enhanced media gallery enabled.
+     * @magentoConfigFixture default/system/media_gallery/enabled 1
+     */
+    public function testWithEnhancedMediaGalleryEnabled(): void
+    {
+        self::assertEquals('media_gallery/index/index', $this->openDialogUrlProvider->getUrl());
+    }
+}
diff --git a/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/TinyMceOpenDialogUrlTest.php b/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/TinyMceOpenDialogUrlTest.php
new file mode 100644
index 0000000000000..81a4dc642cfa0
--- /dev/null
+++ b/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/TinyMceOpenDialogUrlTest.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryIntegration\Test\Integration\Model;
+
+use Magento\Framework\DataObject;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\UrlInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Tinymce3\Model\Config\Gallery\Config;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Provide integration tests cover update open dialog url functionality for media editor.
+ * @magentoAppArea adminhtml
+ */
+class TinyMceOpenDialogUrlTest extends TestCase
+{
+    private const FILES_BROWSER_WINDOW_URL = 'files_browser_window_url';
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManger;
+
+    /**
+     * @var Config
+     */
+    private $tinyMce3Config;
+
+    /**
+     * @var DataObject
+     */
+    private $configDataObject;
+
+    /**
+     * @var string
+     */
+    private $fileBrowserWindowUrl;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->objectManger = Bootstrap::getObjectManager();
+        $this->tinyMce3Config = $this->objectManger->create(Config::class);
+        $this->configDataObject = $this->objectManger->create(DataObject::class);
+
+        $url = $this->objectManger->create(UrlInterface::class);
+        $this->fileBrowserWindowUrl = $url->getUrl('media_gallery/index/index');
+    }
+
+    /**
+     * Test image open dialog url when enhanced media gallery not enabled.
+     * @magentoConfigFixture default/system/media_gallery/enabled 0
+     */
+    public function testWithEnhancedMediaGalleryDisabled(): void
+    {
+        $config = $this->tinyMce3Config->getConfig($this->configDataObject);
+        self::assertNotEquals($this->fileBrowserWindowUrl, $config->getData(self::FILES_BROWSER_WINDOW_URL));
+    }
+
+    /**
+     * Test image open dialog url when enhanced media gallery enabled.
+     * @magentoConfigFixture default/system/media_gallery/enabled 1
+     */
+    public function testWithEnhancedMediaGalleryEnabled(): void
+    {
+        $config = $this->tinyMce3Config->getConfig($this->configDataObject);
+        self::assertEquals($this->fileBrowserWindowUrl, $config->getData(self::FILES_BROWSER_WINDOW_URL));
+    }
+}
diff --git a/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/WysiwygDefaultConfigOpenDialogUrlTest.php b/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/WysiwygDefaultConfigOpenDialogUrlTest.php
new file mode 100644
index 0000000000000..aebf5927869d5
--- /dev/null
+++ b/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/WysiwygDefaultConfigOpenDialogUrlTest.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryIntegration\Test\Integration\Model;
+
+use Magento\Cms\Helper\Wysiwyg\Images;
+use Magento\Cms\Model\Wysiwyg\Config;
+use Magento\Cms\Model\Wysiwyg\Gallery\DefaultConfigProvider;
+use Magento\Framework\DataObject;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\UrlInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Provide integration tests cover update wysiwyg editor dialog url update when media gallery enabled.
+ * @magentoAppArea adminhtml
+ */
+class WysiwygDefaultConfigOpenDialogUrlTest extends TestCase
+{
+    private const FILES_BROWSER_WINDOW_URL = 'files_browser_window_url';
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManger;
+
+    /**
+     * @var DataObject
+     */
+    private $configDataObject;
+
+    /**
+     * @var string
+     */
+    private $filesBrowserWindowUrl;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->objectManger = Bootstrap::getObjectManager();
+        $this->configDataObject = $this->objectManger->create(DataObject::class);
+
+        $url = $this->objectManger->create(UrlInterface::class);
+        $imageHelper = $this->objectManger->create(Images::class);
+        $this->filesBrowserWindowUrl = $url->getUrl(
+            'media_gallery/index/index',
+            ['current_tree_path' => $imageHelper->idEncode(Config::IMAGE_DIRECTORY)]
+        );
+    }
+
+    /**
+     * Test update wysiwyg editor open dialog url when enhanced media gallery not enabled.
+     * @magentoConfigFixture default/system/media_gallery/enabled 0
+     */
+    public function testWithEnhancedMediaGalleryDisabled(): void
+    {
+        /** @var DefaultConfigProvider $defaultConfigProvider */
+        $defaultConfigProvider = $this->objectManger->create(DefaultConfigProvider::class);
+        $config = $defaultConfigProvider->getConfig($this->configDataObject);
+        self::assertNotEquals($this->filesBrowserWindowUrl, $config->getData(self::FILES_BROWSER_WINDOW_URL));
+    }
+
+    /**
+     * Test update wysiwyg editor open dialog url when enhanced media gallery enabled.
+     * @magentoConfigFixture default/system/media_gallery/enabled 1
+     */
+    public function testWithEnhancedMediaGalleryEnabled(): void
+    {
+        /** @var DefaultConfigProvider $defaultConfigProvider */
+        $defaultConfigProvider = $this->objectManger->create(DefaultConfigProvider::class);
+        $config = $defaultConfigProvider->getConfig($this->configDataObject);
+        self::assertEquals($this->filesBrowserWindowUrl, $config->getData(self::FILES_BROWSER_WINDOW_URL));
+    }
+}
diff --git a/app/code/Magento/MediaGalleryIntegration/composer.json b/app/code/Magento/MediaGalleryIntegration/composer.json
new file mode 100644
index 0000000000000..c55d6e0b89733
--- /dev/null
+++ b/app/code/Magento/MediaGalleryIntegration/composer.json
@@ -0,0 +1,31 @@
+{
+    "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": "*"
+    },
+    "require-dev": {
+        "magento/module-cms": "*"
+    },
+    "suggest": {
+        "magento/module-catalog": "*",
+        "magento/module-cms": "*"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\MediaGalleryIntegration\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGalleryIntegration/etc/adminhtml/di.xml b/app/code/Magento/MediaGalleryIntegration/etc/adminhtml/di.xml
new file mode 100644
index 0000000000000..d4b4f8988b622
--- /dev/null
+++ b/app/code/Magento/MediaGalleryIntegration/etc/adminhtml/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\Ui\Component\Form\Element\DataType\Media\OpenDialogUrl">
+        <arguments>
+            <argument name="url" xsi:type="object">Magento\MediaGalleryIntegration\Model\OpenDialogUrlProvider</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\File\Uploader">
+        <plugin name="save_asset_image" type="Magento\MediaGalleryIntegration\Plugin\SaveImageInformation"/>
+    </type>
+</config>
diff --git a/app/code/Magento/MediaGalleryIntegration/etc/module.xml b/app/code/Magento/MediaGalleryIntegration/etc/module.xml
new file mode 100644
index 0000000000000..88af90477cc8a
--- /dev/null
+++ b/app/code/Magento/MediaGalleryIntegration/etc/module.xml
@@ -0,0 +1,14 @@
+<?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_MediaGalleryIntegration">
+        <sequence>
+            <module name="Magento_Ui"/>
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/MediaGalleryIntegration/registration.php b/app/code/Magento/MediaGalleryIntegration/registration.php
new file mode 100644
index 0000000000000..028f8d5b4288a
--- /dev/null
+++ b/app/code/Magento/MediaGalleryIntegration/registration.php
@@ -0,0 +1,10 @@
+<?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_MediaGalleryIntegration', __DIR__);
diff --git a/app/code/Magento/MediaGalleryMetadata/LICENSE.txt b/app/code/Magento/MediaGalleryMetadata/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/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/MediaGalleryMetadata/LICENSE_AFL.txt b/app/code/Magento/MediaGalleryMetadata/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/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/MediaGalleryMetadata/Model/AddIptcMetadata.php b/app/code/Magento/MediaGalleryMetadata/Model/AddIptcMetadata.php
new file mode 100644
index 0000000000000..9935904468388
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Model/AddIptcMetadata.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadata\Model;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Filesystem\DriverInterface;
+use Magento\MediaGalleryMetadata\Model\Jpeg\ReadFile;
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterface;
+use Magento\MediaGalleryMetadataApi\Model\FileInterface;
+use Magento\MediaGalleryMetadataApi\Model\FileInterfaceFactory;
+use Magento\MediaGalleryMetadataApi\Model\SegmentInterface;
+
+/**
+ * Write iptc data to the file return updated FileInterface with iptc data
+ */
+class AddIptcMetadata
+{
+    private const IPTC_TITLE_SEGMENT = '2#005';
+    private const IPTC_DESCRIPTION_SEGMENT = '2#120';
+    private const IPTC_KEYWORDS_SEGMENT = '2#025';
+
+    /**
+     * @var DriverInterface
+     */
+    private $driver;
+
+    /**
+     * @var ReadFile
+     */
+    private $fileReader;
+
+    /**
+     * @var FileInterfaceFactory
+     */
+    private $fileFactory;
+
+    /**
+     * @param FileInterfaceFactory $fileFactory
+     * @param DriverInterface $driver
+     * @param ReadFile $fileReader
+     */
+    public function __construct(
+        FileInterfaceFactory $fileFactory,
+        DriverInterface $driver,
+        ReadFile $fileReader
+    ) {
+        $this->fileFactory = $fileFactory;
+        $this->driver = $driver;
+        $this->fileReader = $fileReader;
+    }
+
+    /**
+     * Write metadata
+     *
+     * @param FileInterface $file
+     * @param MetadataInterface $metadata
+     * @param null|SegmentInterface $segment
+     */
+    public function execute(FileInterface $file, MetadataInterface $metadata, ?SegmentInterface $segment): FileInterface
+    {
+        if (!is_callable('iptcembed') && !is_callable('iptcparse')) {
+            throw new LocalizedException(__('iptcembed() && iptcparse() must be enabled in php configuration'));
+        }
+
+        $iptcData =  $segment ? iptcparse($segment->getData()) : [];
+
+        if ($metadata->getTitle() !== null) {
+            $iptcData[self::IPTC_TITLE_SEGMENT][0] = $metadata->getTitle();
+        }
+
+        if ($metadata->getDescription() !== null) {
+            $iptcData[self::IPTC_DESCRIPTION_SEGMENT][0] = $metadata->getDescription();
+        }
+
+        if ($metadata->getKeywords() !== null) {
+            $iptcData = $this->writeKeywords($metadata->getKeywords(), $iptcData);
+        }
+
+        $newData = '';
+
+        foreach ($iptcData as $tag => $values) {
+            foreach ($values as $value) {
+                $newData .= $this->iptcMaketag(2, (int) substr($tag, 2), $value);
+            }
+        }
+
+        $this->writeFile($file->getPath(), iptcembed($newData, $file->getPath()));
+
+        $fileWithIptc = $this->fileReader->execute($file->getPath());
+
+        return $this->fileFactory->create([
+                'path' => $fileWithIptc->getPath(),
+                'segments' => $this->getSegmentsWithIptc($fileWithIptc, $file)
+        ]);
+    }
+
+    /**
+     * Return iptc segment from file.
+     *
+     * @param FileInterface $fileWithIptc
+     * @param FileInterface $originFile
+     */
+    private function getSegmentsWithIptc(FileInterface $fileWithIptc, $originFile): array
+    {
+        $segments = $fileWithIptc->getSegments();
+        $originFileSegments =  $originFile->getSegments();
+
+        foreach ($segments as $key => $segment) {
+            if ($segment->getName() === 'APP13') {
+                foreach ($originFileSegments as $originKey => $segment) {
+                    if ($segment->getName() === 'APP13') {
+                        $originFileSegments[$originKey] = $segments[$key];
+                    }
+                }
+                return $originFileSegments;
+            }
+        }
+        return $originFileSegments;
+    }
+
+    /**
+     * Write keywords field to the iptc segment.
+     *
+     * @param array $keywords
+     * @param array $iptcData
+     */
+    private function writeKeywords(array $keywords, array $iptcData): array
+    {
+        foreach ($keywords as $key => $keyword) {
+            $iptcData[self::IPTC_KEYWORDS_SEGMENT][$key] = $keyword;
+        }
+        return $iptcData;
+    }
+
+    /**
+     * Write iptc data to the image directly to the file.
+     *
+     * @param string $filePath
+     * @param string $content
+     */
+    private function writeFile(string $filePath, string $content): void
+    {
+        $resource = $this->driver->fileOpen($filePath, 'wb');
+
+        $this->driver->fileWrite($resource, $content);
+        $this->driver->fileClose($resource);
+    }
+
+    /**
+     * Create new iptc tag text
+     *
+     * @param int $rec
+     * @param int $tag
+     * @param string $value
+     */
+    private function iptcMaketag(int $rec, int $tag, string $value)
+    {
+        //phpcs:disable Magento2.Functions.DiscouragedFunction
+        $length = strlen($value);
+        $retval = chr(0x1C) . chr($rec) . chr($tag);
+
+        if ($length < 0x8000) {
+            $retval .= chr($length >> 8) . chr($length & 0xFF);
+        } else {
+            $retval .= chr(0x80) .
+                   chr(0x04) .
+                   chr(($length >> 24) & 0xFF) .
+                   chr(($length >> 16) & 0xFF) .
+                   chr(($length >> 8) & 0xFF) .
+                   chr($length & 0xFF);
+        }
+        //phpcs:enable Magento2.Functions.DiscouragedFunction
+        return $retval . $value;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/AddXmpMetadata.php b/app/code/Magento/MediaGalleryMetadata/Model/AddXmpMetadata.php
new file mode 100644
index 0000000000000..269df146f2c81
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Model/AddXmpMetadata.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadata\Model;
+
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterface;
+
+/**
+ * Add metadata to the XMP template
+ */
+class AddXmpMetadata
+{
+    private const XMP_XPATH_SELECTOR_TITLE = '//dc:title/rdf:Alt/rdf:li';
+    private const XMP_XPATH_SELECTOR_DESCRIPTION = '//dc:description/rdf:Alt/rdf:li';
+    private const XMP_XPATH_SELECTOR_KEYWORDS = '//dc:subject/rdf:Bag';
+    private const XMP_XPATH_SELECTOR_KEYWORDS_EACH = '//dc:subject/rdf:Bag/rdf:li';
+    private const XMP_XPATH_SELECTOR_KEYWORD_ITEM = 'rdf:li';
+
+    /**
+     * Parse metadata
+     *
+     * @param string $data
+     * @param MetadataInterface $metadata
+     * @return string
+     */
+    public function execute(string $data, MetadataInterface $metadata): string
+    {
+        $xml = simplexml_load_string($data);
+        $namespaces = $xml->getNamespaces(true);
+
+        foreach ($namespaces as $prefix => $url) {
+            $xml->registerXPathNamespace($prefix, $url);
+        }
+
+        if ($metadata->getTitle() === null) {
+            $this->deleteValueByXpath($xml, self::XMP_XPATH_SELECTOR_TITLE);
+        } else {
+            $this->setValueByXpath($xml, self::XMP_XPATH_SELECTOR_TITLE, $metadata->getTitle());
+        }
+        if ($metadata->getDescription() === null) {
+            $this->deleteValueByXpath($xml, self::XMP_XPATH_SELECTOR_DESCRIPTION);
+        } else {
+            $this->setValueByXpath($xml, self::XMP_XPATH_SELECTOR_DESCRIPTION, $metadata->getDescription());
+        }
+        if ($metadata->getKeywords() === null) {
+            $this->deleteValueByXpath($xml, self::XMP_XPATH_SELECTOR_KEYWORDS);
+        } else {
+            $this->updateKeywords($xml, $metadata->getKeywords());
+        }
+
+        $data = $xml->asXML();
+        return str_replace("<?xml version=\"1.0\"?>\n", '', $data);
+    }
+
+    /**
+     * Update keywords
+     *
+     * @param \SimpleXMLElement $xml
+     * @param array $keywords
+     */
+    private function updateKeywords(\SimpleXMLElement $xml, array $keywords): void
+    {
+        foreach ($xml->xpath(self::XMP_XPATH_SELECTOR_KEYWORDS_EACH) as $keywordElement) {
+            unset($keywordElement[0]);
+        }
+
+        foreach ($xml->xpath(self::XMP_XPATH_SELECTOR_KEYWORDS) as $element) {
+            foreach ($keywords as $keyword) {
+                $element->addChild(self::XMP_XPATH_SELECTOR_KEYWORD_ITEM, $keyword);
+            }
+        }
+    }
+
+    /**
+     * Deletes  xml node by xpath
+     *
+     * @param \SimpleXMLElement $xml
+     * @param string $xpath
+     */
+    private function deleteValueByXpath(\SimpleXMLElement $xml, string $xpath): void
+    {
+        foreach ($xml->xpath($xpath) as $element) {
+            unset($element[0]);
+        }
+    }
+
+    /**
+     * Set value to xml node by xpath
+     *
+     * @param \SimpleXMLElement $xml
+     * @param string $xpath
+     * @param string $value
+     */
+    private function setValueByXpath(\SimpleXMLElement $xml, string $xpath, string $value): void
+    {
+        foreach ($xml->xpath($xpath) as $element) {
+            $element[0] = $value;
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/File.php b/app/code/Magento/MediaGalleryMetadata/Model/File.php
new file mode 100644
index 0000000000000..4b7605e8ec839
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Model/File.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadata\Model;
+
+use Magento\MediaGalleryMetadataApi\Model\FileExtensionInterface;
+use Magento\MediaGalleryMetadataApi\Model\FileInterface;
+
+/**
+ * File internal data transfer object
+ */
+class File implements FileInterface
+{
+    /**
+     * @var string
+     */
+    private $path;
+
+    /**
+     * @var array
+     */
+    private $segments;
+
+    /**
+     * @var FileExtensionInterface|null
+     */
+    private $extensionAttributes;
+
+    /**
+     * @param string $path
+     * @param array $segments
+     * @param FileExtensionInterface|null $extensionAttributes
+     */
+    public function __construct(
+        string $path,
+        array $segments,
+        ?FileExtensionInterface $extensionAttributes = null
+    ) {
+        $this->path = $path;
+        $this->segments = $segments;
+        $this->extensionAttributes = $extensionAttributes;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getSegments(): array
+    {
+        return $this->segments;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getPath(): string
+    {
+        return $this->path;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getExtensionAttributes(): ?FileExtensionInterface
+    {
+        return $this->extensionAttributes;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setExtensionAttributes(?FileExtensionInterface $extensionAttributes): void
+    {
+        $this->extensionAttributes = $extensionAttributes;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/File/AddMetadata.php b/app/code/Magento/MediaGalleryMetadata/Model/File/AddMetadata.php
new file mode 100644
index 0000000000000..d5918781135a8
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Model/File/AddMetadata.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadata\Model\File;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\ValidatorException;
+use Magento\MediaGalleryMetadataApi\Api\AddMetadataInterface;
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterface;
+use Magento\MediaGalleryMetadataApi\Model\FileInterface;
+use Magento\MediaGalleryMetadataApi\Model\FileInterfaceFactory;
+use Magento\MediaGalleryMetadataApi\Model\ReadFileInterface;
+use Magento\MediaGalleryMetadataApi\Model\WriteFileInterface;
+use Magento\MediaGalleryMetadataApi\Model\WriteMetadataInterface;
+
+/**
+ * Add metadata to the asset by path. Should be used as a virtual type with a file type specific configuration
+ */
+class AddMetadata implements AddMetadataInterface
+{
+    /**
+     * @var array
+     */
+    private $segmentWriters;
+
+    /**
+     * @var FileInterfaceFactory
+     */
+    private $fileFactory;
+
+    /**
+     * @var ReadFileInterface
+     */
+    private $fileReader;
+
+    /**
+     * @var WriteFileInterface
+     */
+    private $fileWriter;
+
+    /**
+     * @param FileInterfaceFactory $fileFactory
+     * @param ReadFileInterface $fileReader
+     * @param WriteFileInterface $fileWriter
+     * @param array $segmentWriters
+     */
+    public function __construct(
+        FileInterfaceFactory $fileFactory,
+        ReadFileInterface $fileReader,
+        WriteFileInterface $fileWriter,
+        array $segmentWriters
+    ) {
+        $this->fileFactory = $fileFactory;
+        $this->fileReader = $fileReader;
+        $this->fileWriter = $fileWriter;
+        $this->segmentWriters = $segmentWriters;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(string $path, MetadataInterface $metadata): void
+    {
+        try {
+            $file = $this->fileReader->execute($path);
+        } catch (ValidatorException $e) {
+            return;
+        } catch (\Exception $exception) {
+            throw new LocalizedException(
+                __('Could not parse the image file for metadata: %path', ['path' => $path])
+            );
+        }
+
+        try {
+            $this->fileWriter->execute($this->writeMetadata($file, $metadata));
+        } catch (\Exception $exception) {
+            throw new LocalizedException(
+                __('Could not update the image file metadata: %path', ['path' => $path])
+            );
+        }
+    }
+
+    /**
+     * Write metadata by given metadata writer
+     *
+     * @param FileInterface $file
+     * @param MetadataInterface $metadata
+     */
+    private function writeMetadata(FileInterface $file, MetadataInterface $metadata): FileInterface
+    {
+        foreach ($this->segmentWriters as $writer) {
+            if (!$writer instanceof WriteMetadataInterface) {
+                throw new \InvalidArgumentException(
+                    __(get_class($writer) . ' must implement ' . WriteFileInterface::class)
+                );
+            }
+
+            $file = $writer->execute($file, $metadata);
+        }
+        return $file;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/File/ExtractMetadata.php b/app/code/Magento/MediaGalleryMetadata/Model/File/ExtractMetadata.php
new file mode 100644
index 0000000000000..d9a8202281fff
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Model/File/ExtractMetadata.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+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;
+use Magento\MediaGalleryMetadataApi\Model\FileInterface;
+use Magento\MediaGalleryMetadataApi\Model\FileInterfaceFactory;
+use Magento\MediaGalleryMetadataApi\Model\ReadFileInterface;
+use Magento\MediaGalleryMetadataApi\Model\ReadMetadataInterface;
+
+/**
+ * Extract Metadata from asset file by given extractors
+ */
+class ExtractMetadata implements ExtractMetadataInterface
+{
+
+    /**
+     * @var MetadataInterfaceFactory
+     */
+    private $metadataFactory;
+
+    /**
+     * @var array
+     */
+    private $segmentReaders;
+
+    /**
+     * @var ReadFileInterface
+     */
+    private $fileReader;
+
+    /**
+     * @var FileInterfaceFactory
+     */
+    private $fileFactory;
+
+    /**
+     * @param FileInterfaceFactory $fileFactory
+     * @param MetadataInterfaceFactory $metadataFactory
+     * @param ReadFileInterface $fileReader
+     * @param array $segmentReaders
+     */
+    public function __construct(
+        FileInterfaceFactory $fileFactory,
+        MetadataInterfaceFactory $metadataFactory,
+        ReadFileInterface $fileReader,
+        array $segmentReaders
+    ) {
+        $this->fileFactory = $fileFactory;
+        $this->metadataFactory = $metadataFactory;
+        $this->fileReader = $fileReader;
+        $this->segmentReaders = $segmentReaders;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(string $path): MetadataInterface
+    {
+        try {
+            return $this->extractMetadata($path);
+        } catch (\Exception $exception) {
+            return $this->metadataFactory->create();
+        }
+    }
+
+    /**
+     * Extract metadata from file
+     *
+     * @param string $path
+     * @return MetadataInterface
+     */
+    private function extractMetadata(string $path): MetadataInterface
+    {
+        try {
+            $file = $this->fileReader->execute($path);
+        } catch (\Exception $exception) {
+            throw new LocalizedException(
+                __('Could not parse the image file for metadata: %path', ['path' => $path])
+            );
+        }
+
+        return $this->readSegments($file);
+    }
+
+    /**
+     * Read  file segments by given segmentReader
+     *
+     * @param FileInterface $file
+     */
+    private function readSegments(FileInterface $file): MetadataInterface
+    {
+        $title = null;
+        $description = null;
+        $keywords = [];
+
+        foreach ($this->segmentReaders as $segmentReader) {
+            if (!$segmentReader instanceof ReadMetadataInterface) {
+                throw new \InvalidArgumentException(
+                    __(get_class($segmentReader) . ' must implement ' . ReadMetadataInterface::class)
+                );
+            }
+
+            $data = $segmentReader->execute($file);
+            $title = !empty($data->getTitle()) ? $data->getTitle() : $title;
+            $description = !empty($data->getDescription()) ? $data->getDescription() : $description;
+
+            if (!empty($data->getKeywords())) {
+                foreach ($data->getKeywords() as $keyword) {
+                    $keywords[] = $keyword;
+                }
+            }
+        }
+
+        return $this->metadataFactory->create([
+            'title' => $title,
+            'description' => $description,
+            'keywords' => empty($keywords) ? null : array_unique($keywords)
+        ]);
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/GetIptcMetadata.php b/app/code/Magento/MediaGalleryMetadata/Model/GetIptcMetadata.php
new file mode 100644
index 0000000000000..d7290f31ee34e
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Model/GetIptcMetadata.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadata\Model;
+
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterface;
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterfaceFactory;
+use Magento\MediaGalleryMetadataApi\Model\SegmentInterface;
+
+/**
+ * Get metadata from IPTC block
+ */
+class GetIptcMetadata
+{
+    private const IPTC_TITLE = '2#005';
+    private const IPTC_DESCRIPTION = '2#120';
+    private const IPTC_KEYWORDS = '2#025';
+
+    /**
+     * @var MetadataInterfaceFactory
+     */
+    private $metadataFactory;
+
+    /**
+     * @param MetadataInterfaceFactory $metadataFactory
+     */
+    public function __construct(
+        MetadataInterfaceFactory $metadataFactory
+    ) {
+        $this->metadataFactory = $metadataFactory;
+    }
+
+    /**
+     * Parse metadata
+     *
+     * @param string $data
+     * @return MetadataInterface
+     */
+    public function execute(string $data): MetadataInterface
+    {
+        $title = '';
+        $description = '';
+        $keywords = [];
+
+        if (is_callable('iptcparse')) {
+            $iptcData = iptcparse($data);
+
+            if (!empty($iptcData[self::IPTC_TITLE])) {
+                $title = trim($iptcData[self::IPTC_TITLE][0]);
+            }
+
+            if (!empty($iptcData[self::IPTC_DESCRIPTION][0])) {
+                $description = trim($iptcData[self::IPTC_DESCRIPTION][0]);
+            }
+
+            if (!empty($iptcData[self::IPTC_KEYWORDS][0])) {
+                $keywords = array_values($iptcData[self::IPTC_KEYWORDS]);
+            }
+        }
+
+        return $this->metadataFactory->create([
+            'title' => $title,
+            'description' => $description,
+            'keywords' => $keywords
+        ]);
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/GetXmpMetadata.php b/app/code/Magento/MediaGalleryMetadata/Model/GetXmpMetadata.php
new file mode 100644
index 0000000000000..bda01645ddfec
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Model/GetXmpMetadata.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadata\Model;
+
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterface;
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterfaceFactory;
+
+/**
+ * Get metadata from XMP block
+ */
+class GetXmpMetadata
+{
+    private const XMP_XPATH_SELECTOR_TITLE = '//dc:title/rdf:Alt/rdf:li';
+    private const XMP_XPATH_SELECTOR_DESCRIPTION = '//dc:description/rdf:Alt/rdf:li';
+    private const XMP_XPATH_SELECTOR_KEYWORDS = '//dc:subject/rdf:Bag/rdf:li';
+
+    /**
+     * @var MetadataInterfaceFactory
+     */
+    private $metadataFactory;
+
+    /**
+     * @param MetadataInterfaceFactory $metadataFactory
+     */
+    public function __construct(MetadataInterfaceFactory $metadataFactory)
+    {
+        $this->metadataFactory = $metadataFactory;
+    }
+
+    /**
+     * Parse metadata
+     *
+     * @param string $data
+     * @return MetadataInterface
+     */
+    public function execute(string $data): MetadataInterface
+    {
+        $xml = simplexml_load_string($data);
+        $namespaces = $xml->getNamespaces(true);
+
+        foreach ($namespaces as $prefix => $url) {
+            $xml->registerXPathNamespace($prefix, $url);
+        }
+
+        $keywords = array_map(
+            function (\SimpleXMLElement $element): string {
+                return (string) $element;
+            },
+            $xml->xpath(self::XMP_XPATH_SELECTOR_KEYWORDS)
+        );
+
+        $description = implode(' ', $xml->xpath(self::XMP_XPATH_SELECTOR_DESCRIPTION));
+        $title = implode(' ', $xml->xpath(self::XMP_XPATH_SELECTOR_TITLE));
+
+        return $this->metadataFactory->create([
+            'title' => $title,
+            'description' => $description,
+            'keywords' => $keywords
+        ]);
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Gif/ReadFile.php b/app/code/Magento/MediaGalleryMetadata/Model/Gif/ReadFile.php
new file mode 100644
index 0000000000000..88810d3ccf28f
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Gif/ReadFile.php
@@ -0,0 +1,318 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadata\Model\Gif;
+
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Filesystem\DriverInterface;
+use Magento\MediaGalleryMetadata\Model\SegmentNames;
+use Magento\MediaGalleryMetadataApi\Model\FileInterface;
+use Magento\MediaGalleryMetadataApi\Model\FileInterfaceFactory;
+use Magento\MediaGalleryMetadataApi\Model\ReadFileInterface;
+use Magento\MediaGalleryMetadataApi\Model\SegmentInterface;
+use Magento\MediaGalleryMetadataApi\Model\SegmentInterfaceFactory;
+use Magento\Framework\Exception\ValidatorException;
+
+/**
+ * File segments reader
+ */
+class ReadFile implements ReadFileInterface
+{
+    /**
+     * @var DriverInterface
+     */
+    private $driver;
+
+    /**
+     * @var SegmentInterfaceFactory
+     */
+    private $segmentFactory;
+
+    /**
+     * @var FileInterfaceFactory
+     */
+    private $fileFactory;
+
+    /**
+     * @var SegmentNames
+     */
+    private $segmentNames;
+
+    /**
+     * @param DriverInterface $driver
+     * @param FileInterfaceFactory $fileFactory
+     * @param SegmentInterfaceFactory $segmentFactory
+     * @param SegmentNames $segmentNames
+     */
+    public function __construct(
+        DriverInterface $driver,
+        FileInterfaceFactory $fileFactory,
+        SegmentInterfaceFactory $segmentFactory,
+        SegmentNames $segmentNames
+    ) {
+        $this->driver = $driver;
+        $this->fileFactory = $fileFactory;
+        $this->segmentFactory = $segmentFactory;
+        $this->segmentNames = $segmentNames;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(string $path): FileInterface
+    {
+        $resource = $this->driver->fileOpen($path, 'rb');
+
+        $header = $this->read($resource, 3);
+
+        if ($header != "GIF") {
+            $this->driver->fileClose($resource);
+            throw new ValidatorException(__('Not a GIF image'));
+        }
+
+        $version = $this->read($resource, 3);
+
+        if (!in_array($version, ['87a', '89a'])) {
+            $this->driver->fileClose($resource);
+            throw new LocalizedException(__('Unexpected GIF version'));
+        }
+
+        $headerSegment = $this->segmentFactory->create([
+            'name' => 'header',
+            'data' => $header . $version
+        ]);
+
+        $width = $this->read($resource, 2);
+        $height = $this->read($resource, 2);
+        $bitPerPixelBinary = $this->read($resource, 1);
+        $bitPerPixel = $this->getBitPerPixel($bitPerPixelBinary);
+        $backgroundAndAspectRatio = $this->read($resource, 2);
+        $globalColorTable = $this->getGlobalColorTable($resource, $bitPerPixel);
+
+        $generalSegment = $this->segmentFactory->create([
+            'name' => 'header2',
+            'data' => $width . $height . $bitPerPixelBinary . $backgroundAndAspectRatio . $globalColorTable
+        ]);
+
+        $segments = $this->getSegments($resource);
+
+        array_unshift($segments, $headerSegment, $generalSegment);
+
+        return $this->fileFactory->create([
+            'path' => $path,
+            'segments' => $segments
+        ]);
+    }
+
+    /**
+     * Read gif segments
+     *
+     * @param resource $resource
+     * @return SegmentInterface[]
+     * @throws FileSystemException
+     */
+    private function getSegments($resource): array
+    {
+        $gifFrameSeparator = pack("C", ord(","));
+        $gifExtensionSeparator = pack("C", ord("!"));
+        $gifTerminator = pack("C", ord(";"));
+
+        $segments = [];
+        do {
+            $separator = $this->read($resource, 1);
+
+            if ($separator == $gifTerminator) {
+                return $segments;
+            }
+
+            if ($separator == $gifFrameSeparator) {
+                $segments[] = $this->segmentFactory->create([
+                    'name' => 'frame',
+                    'data' => $gifFrameSeparator . $this->readFrame($resource)
+                ]);
+                continue;
+            }
+
+            if ($separator != $gifExtensionSeparator) {
+                throw new LocalizedException(__('The file is corrupted'));
+            }
+
+            $segments[] = $this->getExtensionSegment($resource);
+        } while (!$this->driver->endOfFile($resource));
+
+        return $segments;
+    }
+
+    /**
+     * Read extension segment
+     *
+     * @param resource $resource
+     * @return SegmentInterface
+     * @throws FileSystemException
+     */
+    private function getExtensionSegment($resource): SegmentInterface
+    {
+        $gifExtensionSeparator = pack("C", ord("!"));
+        $extensionCodeBinary = $this->read($resource, 1);
+        //phpcs:ignore Magento2.Functions.DiscouragedFunction
+        $extensionCode = unpack('C', $extensionCodeBinary)[1];
+
+        if ($extensionCode == 0xF9) {
+            return $this->segmentFactory->create([
+                'name' => 'Graphics Control Extension',
+                'data' => $gifExtensionSeparator . $extensionCodeBinary . $this->readBlock($resource)
+            ]);
+        }
+
+        if ($extensionCode == 0xFE) {
+            return $this->segmentFactory->create([
+                'name' => 'comment',
+                'data' => $gifExtensionSeparator . $extensionCodeBinary . $this->readBlock($resource)
+            ]);
+        }
+
+        if ($extensionCode != 0xFF) {
+            return $this->segmentFactory->create([
+                'name' => 'Programm extension',
+                'data' => $gifExtensionSeparator . $extensionCodeBinary . $this->readBlock($resource)
+            ]);
+        }
+
+        $blockLengthBinary = $this->read($resource, 1);
+        //phpcs:ignore Magento2.Functions.DiscouragedFunction
+        $blockLength = unpack('C', $blockLengthBinary)[1];
+        $name = $this->read($resource, $blockLength);
+
+        if ($blockLength != 11) {
+            throw new LocalizedException(__('The file is corrupted'));
+        }
+
+        if ($name == 'XMP DataXMP') {
+            return $this->segmentFactory->create([
+                'name' => $name,
+                'data' =>  $gifExtensionSeparator . $extensionCodeBinary . $blockLengthBinary
+                    . $name . $this->readBlockWithSubblocks($resource)
+            ]);
+        }
+
+        return $this->segmentFactory->create([
+            'name' => $name,
+            'data' => $gifExtensionSeparator . $extensionCodeBinary . $blockLengthBinary
+            . $name . $this->readBlock($resource)
+        ]);
+    }
+
+    /**
+     * Read gif frame
+     *
+     * @param resource $resource
+     * @return string
+     * @throws FileSystemException
+     */
+    private function readFrame($resource): string
+    {
+        $boundingBox = $this->read($resource, 8);
+        $bitPerPixelBinary = $this->read($resource, 1);
+        $bitPerPixel = $this->getBitPerPixel($bitPerPixelBinary);
+        $globalColorTable = $this->getGlobalColorTable($resource, $bitPerPixel);
+        return $boundingBox . $bitPerPixelBinary . $globalColorTable . $this->read($resource, 1)
+            . $this->readBlockWithSubblocks($resource);
+    }
+
+    /**
+     * Retrieve bits per pixel value
+     *
+     * @param string $data
+     * @return int
+     */
+    private function getBitPerPixel(string $data): int
+    {
+        //phpcs:ignore Magento2.Functions.DiscouragedFunction
+        $bitPerPixel = unpack('C', $data)[1];
+        $bpp = ($bitPerPixel & 7) + 1;
+        $bitPerPixel >>= 7;
+        $haveMap = $bitPerPixel & 1;
+        return $haveMap ? $bpp : 0;
+    }
+
+    /**
+     * Read global color table
+     *
+     * @param resource $resource
+     * @param int $bitPerPixel
+     * @return string
+     * @throws FileSystemException
+     */
+    private function getGlobalColorTable($resource, int $bitPerPixel): string
+    {
+        $globalColorTable = '';
+        if ($bitPerPixel > 0) {
+            $max = pow(2, $bitPerPixel);
+            for ($i = 1; $i <= $max; ++$i) {
+                $globalColorTable .= $this->read($resource, 3);
+            }
+        }
+        return $globalColorTable;
+    }
+
+    /**
+     * Read wrapper
+     *
+     * @param resource $resource
+     * @param int $length
+     * @return string
+     * @throws FileSystemException
+     */
+    private function read($resource, int $length): string
+    {
+        $data = '';
+
+        while (!$this->driver->endOfFile($resource) && strlen($data) < $length) {
+            $data .= $this->driver->fileRead($resource, $length - strlen($data));
+        }
+
+        return $data;
+    }
+
+    /**
+     * Read the block stored in multiple sections
+     *
+     * @param resource $resource
+     * @return string
+     * @throws FileSystemException
+     */
+    private function readBlockWithSubblocks($resource): string
+    {
+        $data = '';
+        $subLength = $this->read($resource, 1);
+
+        while ($subLength !== "\0") {
+            $data .= $subLength . $this->read($resource, ord($subLength));
+            $subLength = $this->read($resource, 1);
+        }
+
+        return $data . $subLength;
+    }
+
+    /**
+     * Read gif block
+     *
+     * @param resource $resource
+     * @return string
+     * @throws FileSystemException]
+     */
+    private function readBlock($resource): string
+    {
+        $blockLengthBinary = $this->read($resource, 1);
+        $blockLength = ord($blockLengthBinary);
+        if ($blockLength == 0) {
+            return '';
+        }
+        return $blockLengthBinary . $this->read($resource, $blockLength) . $this->read($resource, 1);
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Gif/Segment/ReadXmp.php b/app/code/Magento/MediaGalleryMetadata/Model/Gif/Segment/ReadXmp.php
new file mode 100644
index 0000000000000..1b83554ef4df3
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Gif/Segment/ReadXmp.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadata\Model\Gif\Segment;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\MediaGalleryMetadata\Model\GetXmpMetadata;
+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;
+
+/**
+ * XMP Reader for gif file format
+ */
+class ReadXmp implements ReadMetadataInterface
+{
+    private const XMP_SEGMENT_NAME = 'XMP DataXMP';
+    /**
+     * see XMP Specification Part 3, 1.1.2 GIF
+     */
+    private const MAGIC_TRAILER_LENGTH = 258;
+    private const MAGIC_TRAILER_START = "\x01\xFF\xFE";
+    private const MAGIC_TRAILER_END = "\x03\x02\x01\x00\x00";
+
+    /**
+     * @var MetadataInterfaceFactory
+     */
+    private $metadataFactory;
+
+    /**
+     * @var GetXmpMetadata
+     */
+    private $getXmpMetadata;
+
+    /**
+     * @param MetadataInterfaceFactory $metadataFactory
+     * @param GetXmpMetadata $getXmpMetadata
+     */
+    public function __construct(MetadataInterfaceFactory $metadataFactory, GetXmpMetadata $getXmpMetadata)
+    {
+        $this->metadataFactory = $metadataFactory;
+        $this->getXmpMetadata = $getXmpMetadata;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(FileInterface $file): MetadataInterface
+    {
+        foreach ($file->getSegments() as $segment) {
+            if ($this->isXmp($segment)) {
+                return $this->getXmpMetadata->execute($this->getXmpData($segment));
+            }
+        }
+        return $this->metadataFactory->create([
+            'title' => '',
+            'description' => '',
+            'keywords' => []
+        ]);
+    }
+
+    /**
+     * Does segment contain XMP data
+     *
+     * @param SegmentInterface $segment
+     * @return bool
+     */
+    private function isXmp(SegmentInterface $segment): bool
+    {
+        return $segment->getName() === self::XMP_SEGMENT_NAME;
+    }
+
+    /**
+     * Get XMP xml
+     *
+     * @param SegmentInterface $segment
+     * @return string
+     */
+    private function getXmpData(SegmentInterface $segment): string
+    {
+        $xmp = substr($segment->getData(), 14);
+
+        if (substr($xmp, -self::MAGIC_TRAILER_LENGTH, 3) !== self::MAGIC_TRAILER_START
+            || substr($xmp, -5) !== self::MAGIC_TRAILER_END
+        ) {
+            throw new LocalizedException(__('XMP data is corrupted'));
+        }
+
+        return substr($xmp, 0, -self::MAGIC_TRAILER_LENGTH);
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Gif/Segment/WriteXmp.php b/app/code/Magento/MediaGalleryMetadata/Model/Gif/Segment/WriteXmp.php
new file mode 100644
index 0000000000000..2b5167eba596b
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Gif/Segment/WriteXmp.php
@@ -0,0 +1,191 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadata\Model\Gif\Segment;
+
+use Magento\MediaGalleryMetadata\Model\AddXmpMetadata;
+use Magento\MediaGalleryMetadata\Model\XmpTemplate;
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterface;
+use Magento\MediaGalleryMetadataApi\Model\FileInterface;
+use Magento\MediaGalleryMetadataApi\Model\FileInterfaceFactory;
+use Magento\MediaGalleryMetadataApi\Model\SegmentInterface;
+use Magento\MediaGalleryMetadataApi\Model\SegmentInterfaceFactory;
+use Magento\MediaGalleryMetadataApi\Model\WriteMetadataInterface;
+
+/**
+ *  XMP Writer for GIF format
+ */
+class WriteXmp implements WriteMetadataInterface
+{
+    private const XMP_SEGMENT_NAME = 'XMP DataXMP';
+    private const XMP_DATA_START_POSITION = 14;
+    private const MAGIC_TRAILER_START = "\x01\xFF\xFE";
+    private const MAGIC_TRAILER_END = "\x03\x02\x01\x00\x00";
+
+    /**
+     * @var SegmentInterfaceFactory
+     */
+    private $segmentFactory;
+
+    /**
+     * @var FileInterfaceFactory
+     */
+    private $fileFactory;
+
+    /**
+     * @var AddXmpMetadata
+     */
+    private $addXmpMetadata;
+
+    /**
+     * @var XmpTemplate
+     */
+    private $xmpTemplate;
+
+    /**
+     * @param FileInterfaceFactory $fileFactory
+     * @param SegmentInterfaceFactory $segmentFactory
+     * @param AddXmpMetadata $addXmpMetadata
+     * @param XmpTemplate $xmpTemplate
+     */
+    public function __construct(
+        FileInterfaceFactory $fileFactory,
+        SegmentInterfaceFactory $segmentFactory,
+        AddXmpMetadata $addXmpMetadata,
+        XmpTemplate $xmpTemplate
+    ) {
+        $this->fileFactory = $fileFactory;
+        $this->segmentFactory = $segmentFactory;
+        $this->addXmpMetadata = $addXmpMetadata;
+        $this->xmpTemplate = $xmpTemplate;
+    }
+
+    /**
+     * Add metadata to the file
+     *
+     * @param FileInterface $file
+     * @param MetadataInterface $metadata
+     * @return FileInterface
+     */
+    public function execute(FileInterface $file, MetadataInterface $metadata): FileInterface
+    {
+        $gifSegments = $file->getSegments();
+        $xmpGifSegments = [];
+        foreach ($gifSegments as $key => $segment) {
+            if ($this->isSegmentXmp($segment)) {
+                $xmpGifSegments[$key] = $segment;
+            }
+        }
+
+        if (empty($xmpGifSegments)) {
+            return $this->fileFactory->create([
+                'path' => $file->getPath(),
+                'segments' => $this->insertXmpGifSegment($gifSegments, $this->createXmpSegment($metadata))
+            ]);
+        }
+
+        foreach ($xmpGifSegments as $key => $segment) {
+            $gifSegments[$key] = $this->updateSegment($segment, $metadata);
+        }
+
+        return $this->fileFactory->create([
+            'path' => $file->getPath(),
+            'segments' => $gifSegments
+        ]);
+    }
+
+    /**
+     * Insert XMP segment to gif image segments (at position 3)
+     *
+     * @param SegmentInterface[] $segments
+     * @param SegmentInterface $xmpSegment
+     * @return SegmentInterface[]
+     */
+    private function insertXmpGifSegment(array $segments, SegmentInterface $xmpSegment): array
+    {
+        return array_merge(array_slice($segments, 0, 4), [$xmpSegment], array_slice($segments, 4));
+    }
+
+    /**
+     * Return XMP template from string
+     *
+     * @param string $string
+     * @param string $start
+     * @param string $end
+     */
+    private function getXmpData(string $string, string $start, string $end): string
+    {
+        $string = ' ' . $string;
+        $ini = strpos($string, $start);
+        if ($ini == 0) {
+            return '';
+        }
+        $ini += strlen($start);
+        $len = strpos($string, $end, $ini) - $ini;
+
+        return substr($string, $ini, $len);
+    }
+
+    /**
+     * Write new segment  metadata
+     *
+     * @param MetadataInterface $metadata
+     * @return SegmentInterface
+     */
+    public function createXmpSegment(MetadataInterface $metadata): SegmentInterface
+    {
+        $xmpData = $this->xmpTemplate->get();
+
+        $xmpSegment = pack("C", ord("!")) . pack("C", 255) . pack("C", 11) .
+                    self::XMP_SEGMENT_NAME . $this->addXmpMetadata->execute($xmpData, $metadata) . "\x01";
+
+        /**
+         * Write Magic trailer 258 bytes see XMP Specification Part 3, 1.1.2 GIF
+         */
+        $i = 255;
+        while ($i > 0) {
+            $xmpSegment .= pack("C", $i);
+            $i--;
+        }
+
+        return $this->segmentFactory->create([
+            'name' => self::XMP_SEGMENT_NAME,
+            'data' => $xmpSegment . "\0\0"
+        ]);
+    }
+
+    /**
+     * Add metadata to the segment
+     *
+     * @param SegmentInterface $segment
+     * @param MetadataInterface $metadata
+     * @return SegmentInterface
+     */
+    public function updateSegment(SegmentInterface $segment, MetadataInterface $metadata): SegmentInterface
+    {
+        $data = $segment->getData();
+        $start = substr($data, 0, self::XMP_DATA_START_POSITION);
+        $xmpData = $this->getXmpData($data, self::XMP_SEGMENT_NAME, "\x01");
+        $end = substr($data, strpos($data, "\x01"));
+
+        return $this->segmentFactory->create([
+            'name' => $segment->getName(),
+            'data' => $start . $this->addXmpMetadata->execute($xmpData, $metadata) . $end
+        ]);
+    }
+
+    /**
+     * Check if segment contains XMP data
+     *
+     * @param SegmentInterface $segment
+     * @return bool
+     */
+    private function isSegmentXmp(SegmentInterface $segment): bool
+    {
+        return $segment->getName() === self::XMP_SEGMENT_NAME;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Gif/WriteFile.php b/app/code/Magento/MediaGalleryMetadata/Model/Gif/WriteFile.php
new file mode 100644
index 0000000000000..cbdc9fa286e85
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Gif/WriteFile.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadata\Model\Gif;
+
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Filesystem\DriverInterface;
+use Magento\MediaGalleryMetadata\Model\SegmentNames;
+use Magento\MediaGalleryMetadataApi\Model\FileInterface;
+use Magento\MediaGalleryMetadataApi\Model\WriteFileInterface;
+use Magento\MediaGalleryMetadataApi\Model\SegmentInterface;
+
+/**
+ * File segments writer
+ */
+class WriteFile implements WriteFileInterface
+{
+    /**
+     * @var DriverInterface
+     */
+    private $driver;
+
+    /**
+     * @var SegmentNames
+     */
+    private $segmentNames;
+
+    /**
+     * @param DriverInterface $driver
+     * @param SegmentNames $segmentNames
+     */
+    public function __construct(
+        DriverInterface $driver,
+        SegmentNames $segmentNames
+    ) {
+        $this->driver = $driver;
+        $this->segmentNames = $segmentNames;
+    }
+
+    /**
+     * Write file object to the filesystem
+     *
+     * @param FileInterface $file
+     * @throws LocalizedException
+     * @throws FileSystemException
+     */
+    public function execute(FileInterface $file): void
+    {
+        $resource = $this->driver->fileOpen($file->getPath(), 'wb');
+
+        $this->writeSegments($resource, $file->getSegments());
+        $this->driver->fileClose($resource);
+    }
+
+    /**
+     * Write gif segment
+     *
+     * @param resource $resource
+     * @param SegmentInterface[] $segments
+     */
+    private function writeSegments($resource, array $segments): void
+    {
+        foreach ($segments as $segment) {
+            $this->driver->fileWrite(
+                $resource,
+                $segment->getData()
+            );
+        }
+        $this->driver->fileWrite($resource, pack("C", ord(";")));
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/ReadFile.php b/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/ReadFile.php
new file mode 100644
index 0000000000000..4dbff068a861b
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/ReadFile.php
@@ -0,0 +1,209 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadata\Model\Jpeg;
+
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\ValidatorException;
+use Magento\Framework\Filesystem\DriverInterface;
+use Magento\MediaGalleryMetadata\Model\SegmentNames;
+use Magento\MediaGalleryMetadataApi\Model\FileInterface;
+use Magento\MediaGalleryMetadataApi\Model\FileInterfaceFactory;
+use Magento\MediaGalleryMetadataApi\Model\ReadFileInterface;
+use Magento\MediaGalleryMetadataApi\Model\SegmentInterface;
+use Magento\MediaGalleryMetadataApi\Model\SegmentInterfaceFactory;
+
+/**
+ * Jpeg file reader
+ */
+class ReadFile implements ReadFileInterface
+{
+    private const MARKER_IMAGE_FILE_START = "\xD8";
+    private const MARKER_PREFIX = "\xFF";
+    private const MARKER_IMAGE_END = "\xD9";
+    private const MARKER_IMAGE_START = "\xDA";
+
+    private const TWO_BYTES = 2;
+    private const ONE_MEGABYTE = 1048576;
+
+    /**
+     * @var DriverInterface
+     */
+    private $driver;
+
+    /**
+     * @var SegmentInterfaceFactory
+     */
+    private $segmentFactory;
+
+    /**
+     * @var FileInterfaceFactory
+     */
+    private $fileFactory;
+
+    /**
+     * @var SegmentNames
+     */
+    private $segmentNames;
+
+    /**
+     * @param DriverInterface $driver
+     * @param FileInterfaceFactory $fileFactory
+     * @param SegmentInterfaceFactory $segmentFactory
+     * @param SegmentNames $segmentNames
+     */
+    public function __construct(
+        DriverInterface $driver,
+        FileInterfaceFactory $fileFactory,
+        SegmentInterfaceFactory $segmentFactory,
+        SegmentNames $segmentNames
+    ) {
+        $this->driver = $driver;
+        $this->fileFactory = $fileFactory;
+        $this->segmentFactory = $segmentFactory;
+        $this->segmentNames = $segmentNames;
+    }
+
+    /**
+     * Is reader applicable
+     *
+     * @param string $path
+     * @return bool
+     * @throws FileSystemException
+     */
+    public function isApplicable(string $path): bool
+    {
+        $resource = $this->driver->fileOpen($path, 'rb');
+        try {
+            $marker = $this->readMarker($resource);
+        } catch (LocalizedException $exception) {
+            return false;
+        }
+        $this->driver->fileClose($resource);
+
+        return $marker == self::MARKER_IMAGE_FILE_START;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(string $path): FileInterface
+    {
+        if (!$this->isApplicable($path)) {
+            throw new ValidatorException(__('Not a JPEG image'));
+        }
+
+        $resource = $this->driver->fileOpen($path, 'rb');
+        $marker = $this->readMarker($resource);
+
+        if ($marker != self::MARKER_IMAGE_FILE_START) {
+            $this->driver->fileClose($resource);
+            throw new ValidatorException(__('Not a JPEG image'));
+        }
+
+        do {
+            $marker = $this->readMarker($resource);
+            $segments[] = $this->readSegment($resource, ord($marker));
+        } while (($marker != self::MARKER_IMAGE_START) && (!$this->driver->endOfFile($resource)));
+
+        if ($marker != self::MARKER_IMAGE_START) {
+            throw new LocalizedException(__('File is corrupted'));
+        }
+
+        $segments[] = $this->segmentFactory->create([
+            'name' => 'CompressedImage',
+            'data' => $this->readCompressedImage($resource)
+        ]);
+
+        $this->driver->fileClose($resource);
+
+        return $this->fileFactory->create([
+            'path' => $path,
+            'segments' => $segments
+        ]);
+    }
+
+    /**
+     * Read jpeg marker
+     *
+     * @param resource $resource
+     * @return string
+     * @throws FileSystemException
+     */
+    private function readMarker($resource): string
+    {
+        $data = $this->read($resource, self::TWO_BYTES);
+
+        if ($data[0] != self::MARKER_PREFIX) {
+            $this->driver->fileClose($resource);
+            throw new LocalizedException(__('File is corrupted'));
+        }
+
+        return $data[1];
+    }
+
+    /**
+     * Read compressed image
+     *
+     * @param resource $resource
+     * @return string
+     * @throws FileSystemException
+     */
+    private function readCompressedImage($resource): string
+    {
+        $compressedImage = '';
+        do {
+            $compressedImage .= $this->read($resource, self::ONE_MEGABYTE);
+        } while (!$this->driver->endOfFile($resource));
+
+        $endOfImageMarkerPosition = strpos($compressedImage, self::MARKER_PREFIX . self::MARKER_IMAGE_END);
+
+        if ($endOfImageMarkerPosition !== false) {
+            $compressedImage = substr($compressedImage, 0, $endOfImageMarkerPosition);
+        }
+
+        return $compressedImage;
+    }
+
+    /**
+     * Read jpeg segment
+     *
+     * @param resource $resource
+     * @param int $segmentType
+     * @return SegmentInterface
+     * @throws FileSystemException
+     */
+    private function readSegment($resource, int $segmentType): SegmentInterface
+    {
+        //phpcs:ignore Magento2.Functions.DiscouragedFunction
+        $segmentSize = unpack('nsize', $this->read($resource, 2))['size'] - 2;
+        return $this->segmentFactory->create([
+            'name' => $this->segmentNames->getSegmentName($segmentType),
+            'data' => $this->read($resource, $segmentSize)
+        ]);
+    }
+
+    /**
+     * Read wrapper
+     *
+     * @param resource $resource
+     * @param int $length
+     * @return string
+     * @throws FileSystemException
+     */
+    private function read($resource, int $length): string
+    {
+        $data = '';
+
+        while (!$this->driver->endOfFile($resource) && strlen($data) < $length) {
+            $data .= $this->driver->fileRead($resource, $length - strlen($data));
+        }
+
+        return $data;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadIptc.php b/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadIptc.php
new file mode 100644
index 0000000000000..94ccb400e5e0a
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadIptc.php
@@ -0,0 +1,76 @@
+<?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\MediaGalleryMetadata\Model\GetIptcMetadata;
+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;
+
+/**
+ * IPTC Reader to read IPTC data for jpeg image
+ */
+class ReadIptc implements ReadMetadataInterface
+{
+    private const IPTC_SEGMENT_NAME = 'APP13';
+    private const IPTC_SEGMENT_START = 'Photoshop 3.0';
+    private const IPTC_DATA_START_POSITION = 0;
+
+    /**
+     * @var MetadataInterfaceFactory
+     */
+    private $metadataFactory;
+
+    /**
+     * @var GetIptcMetadata
+     */
+    private $getIptcData;
+
+    /**
+     * @param GetIptcMetadata $getIptcData
+     * @param MetadataInterfaceFactory $metadataFactory
+     */
+    public function __construct(
+        GetIptcMetadata $getIptcData,
+        MetadataInterfaceFactory $metadataFactory
+    ) {
+        $this->getIptcData = $getIptcData;
+        $this->metadataFactory = $metadataFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(FileInterface $file): MetadataInterface
+    {
+        foreach ($file->getSegments() as $segment) {
+            if ($this->isIptcSegment($segment)) {
+                return $this->getIptcData->execute($segment->getData());
+            }
+        }
+        return $this->metadataFactory->create([
+            'title' => '',
+            'description' => '',
+            'keywords' => []
+        ]);
+    }
+
+    /**
+     * Does segment contain IPTC data
+     *
+     * @param SegmentInterface $segment
+     * @return bool
+     */
+    private function isIptcSegment(SegmentInterface $segment): bool
+    {
+        return $segment->getName() === self::IPTC_SEGMENT_NAME
+            && strncmp($segment->getData(), self::IPTC_SEGMENT_START, self::IPTC_DATA_START_POSITION) == 0;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadXmp.php b/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadXmp.php
new file mode 100644
index 0000000000000..81ff7200c3475
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadXmp.php
@@ -0,0 +1,85 @@
+<?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\MediaGalleryMetadata\Model\GetXmpMetadata;
+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 XMP Reader
+ */
+class ReadXmp implements ReadMetadataInterface
+{
+    private const XMP_SEGMENT_NAME = 'APP1';
+    private const XMP_SEGMENT_START = "http://ns.adobe.com/xap/1.0/\x00";
+    private const XMP_DATA_START_POSITION = 29;
+
+    /**
+     * @var MetadataInterfaceFactory
+     */
+    private $metadataFactory;
+
+    /**
+     * @var GetXmpMetadata
+     */
+    private $getXmpMetadata;
+
+    /**
+     * @param MetadataInterfaceFactory $metadataFactory
+     * @param GetXmpMetadata $getXmpMetadata
+     */
+    public function __construct(MetadataInterfaceFactory $metadataFactory, GetXmpMetadata $getXmpMetadata)
+    {
+        $this->metadataFactory = $metadataFactory;
+        $this->getXmpMetadata = $getXmpMetadata;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(FileInterface $file): MetadataInterface
+    {
+        foreach ($file->getSegments() as $segment) {
+            if ($this->isSegmentXmp($segment)) {
+                return $this->getXmpMetadata->execute($this->getXmpData($segment));
+            }
+        }
+        return $this->metadataFactory->create([
+            'title' => '',
+            'description' => '',
+            'keywords' => []
+        ]);
+    }
+
+    /**
+     * Does segment contain XMP data
+     *
+     * @param SegmentInterface $segment
+     * @return bool
+     */
+    private function isSegmentXmp(SegmentInterface $segment): bool
+    {
+        return $segment->getName() === self::XMP_SEGMENT_NAME
+            && strncmp($segment->getData(), self::XMP_SEGMENT_START, self::XMP_DATA_START_POSITION) == 0;
+    }
+
+    /**
+     * Get XMP xml
+     *
+     * @param SegmentInterface $segment
+     * @return string
+     */
+    private function getXmpData(SegmentInterface $segment): string
+    {
+        return substr($segment->getData(), self::XMP_DATA_START_POSITION);
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/WriteIptc.php b/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/WriteIptc.php
new file mode 100644
index 0000000000000..e9fcd500f1dca
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/WriteIptc.php
@@ -0,0 +1,100 @@
+<?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\MediaGalleryMetadata\Model\AddIptcMetadata;
+use Magento\MediaGalleryMetadata\Model\Jpeg\ReadFile;
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterface;
+use Magento\MediaGalleryMetadataApi\Model\FileInterface;
+use Magento\MediaGalleryMetadataApi\Model\FileInterfaceFactory;
+use Magento\MediaGalleryMetadataApi\Model\SegmentInterface;
+use Magento\MediaGalleryMetadataApi\Model\SegmentInterfaceFactory;
+use Magento\MediaGalleryMetadataApi\Model\WriteMetadataInterface;
+
+/**
+ * Jpeg IPTC Writer
+ */
+class WriteIptc implements WriteMetadataInterface
+{
+    private const IPTC_SEGMENT_NAME = 'APP13';
+    private const IPTC_SEGMENT_START = 'Photoshop 3.0\0x00';
+    private const IPTC_DATA_START_POSITION = 0;
+
+    /**
+     * @var SegmentInterfaceFactory
+     */
+    private $segmentFactory;
+
+    /**
+     * @var FileInterfaceFactory
+     */
+    private $fileFactory;
+
+    /**
+     * @var AddIPtcMetadata
+     */
+    private $addIptcMetadata;
+
+    /**
+     * @var ReadFile
+     */
+    private $fileReader;
+
+    /**
+     * @param FileInterfaceFactory $fileFactory
+     * @param SegmentInterfaceFactory $segmentFactory
+     * @param AddIptcMetadata $addIptcMetadata
+     * @param ReadFile $fileReader
+     */
+    public function __construct(
+        FileInterfaceFactory $fileFactory,
+        SegmentInterfaceFactory $segmentFactory,
+        AddIptcMetadata $addIptcMetadata,
+        ReadFile $fileReader
+    ) {
+        $this->fileFactory = $fileFactory;
+        $this->segmentFactory = $segmentFactory;
+        $this->addIptcMetadata = $addIptcMetadata;
+        $this->fileReader = $fileReader;
+    }
+
+    /**
+     * Add metadata to the file
+     *
+     * @param FileInterface $file
+     * @param MetadataInterface $metadata
+     * @return FileInterface
+     */
+    public function execute(FileInterface $file, MetadataInterface $metadata): FileInterface
+    {
+        $segments = $file->getSegments();
+        $iptcSegments = [];
+        foreach ($segments as $key => $segment) {
+            if ($this->isIptcSegment($segment)) {
+                $iptcSegments[$key] = $segment;
+            }
+        }
+
+        foreach ($iptcSegments as $segment) {
+            return  $this->addIptcMetadata->execute($file, $metadata, $segment);
+        }
+        return  $this->addIptcMetadata->execute($file, $metadata, null);
+    }
+
+    /**
+     * Check if segment contains IPTC data
+     *
+     * @param SegmentInterface $segment
+     * @return bool
+     */
+    private function isIptcSegment(SegmentInterface $segment): bool
+    {
+        return $segment->getName() === self::IPTC_SEGMENT_NAME
+            && strncmp($segment->getData(), self::IPTC_SEGMENT_START, self::IPTC_DATA_START_POSITION) == 0;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/WriteXmp.php b/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/WriteXmp.php
new file mode 100644
index 0000000000000..e88cdd5b7b8f4
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/WriteXmp.php
@@ -0,0 +1,156 @@
+<?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\MediaGalleryMetadata\Model\AddXmpMetadata;
+use Magento\MediaGalleryMetadata\Model\XmpTemplate;
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterface;
+use Magento\MediaGalleryMetadataApi\Model\FileInterface;
+use Magento\MediaGalleryMetadataApi\Model\FileInterfaceFactory;
+use Magento\MediaGalleryMetadataApi\Model\SegmentInterface;
+use Magento\MediaGalleryMetadataApi\Model\SegmentInterfaceFactory;
+use Magento\MediaGalleryMetadataApi\Model\WriteMetadataInterface;
+
+/**
+ * Jpeg XMP Writer
+ */
+class WriteXmp implements WriteMetadataInterface
+{
+    private const XMP_SEGMENT_NAME = 'APP1';
+    private const XMP_SEGMENT_START = "http://ns.adobe.com/xap/1.0/\x00";
+    private const XMP_DATA_START_POSITION = 29;
+
+    /**
+     * @var SegmentInterfaceFactory
+     */
+    private $segmentFactory;
+
+    /**
+     * @var FileInterfaceFactory
+     */
+    private $fileFactory;
+
+    /**
+     * @var AddXmpMetadata
+     */
+    private $addXmpMetadata;
+
+    /**
+     * @var XmpTemplate
+     */
+    private $xmpTemplate;
+
+    /**
+     * @param FileInterfaceFactory $fileFactory
+     * @param SegmentInterfaceFactory $segmentFactory
+     * @param AddXmpMetadata $addXmpMetadata
+     * @param XmpTemplate $xmpTemplate
+     */
+    public function __construct(
+        FileInterfaceFactory $fileFactory,
+        SegmentInterfaceFactory $segmentFactory,
+        AddXmpMetadata $addXmpMetadata,
+        XmpTemplate $xmpTemplate
+    ) {
+        $this->fileFactory = $fileFactory;
+        $this->segmentFactory = $segmentFactory;
+        $this->addXmpMetadata = $addXmpMetadata;
+        $this->xmpTemplate = $xmpTemplate;
+    }
+
+    /**
+     * Add metadata to the file
+     *
+     * @param FileInterface $file
+     * @param MetadataInterface $metadata
+     * @return FileInterface
+     */
+    public function execute(FileInterface $file, MetadataInterface $metadata): FileInterface
+    {
+        $segments = $file->getSegments();
+        $xmpSegments = [];
+        foreach ($segments as $key => $segment) {
+            if ($this->isSegmentXmp($segment)) {
+                $xmpSegments[$key] = $segment;
+            }
+        }
+
+        if (empty($xmpSegments)) {
+            return $this->fileFactory->create([
+                'path' => $file->getPath(),
+                'segments' => $this->insertXmpSegment($segments, $this->createXmpSegment($metadata))
+            ]);
+        }
+
+        foreach ($xmpSegments as $key => $segment) {
+            $segments[$key] = $this->updateSegment($segment, $metadata);
+        }
+
+        return $this->fileFactory->create([
+            'path' => $file->getPath(),
+            'segments' => $segments
+        ]);
+    }
+
+    /**
+     * Insert XMP segment to image segments (at position 1)
+     *
+     * @param SegmentInterface[] $segments
+     * @param SegmentInterface $xmpSegment
+     * @return SegmentInterface[]
+     */
+    private function insertXmpSegment(array $segments, SegmentInterface $xmpSegment): array
+    {
+        return array_merge(array_slice($segments, 0, 2), [$xmpSegment], array_slice($segments, 2));
+    }
+
+    /**
+     * Write new segment  metadata
+     *
+     * @param MetadataInterface $metadata
+     * @return SegmentInterface
+     */
+    private function createXmpSegment(MetadataInterface $metadata): SegmentInterface
+    {
+        $xmpData = $this->xmpTemplate->get();
+        return $this->segmentFactory->create([
+            'name' => self::XMP_SEGMENT_NAME,
+            'data' => self::XMP_SEGMENT_START . $this->addXmpMetadata->execute($xmpData, $metadata)
+        ]);
+    }
+
+    /**
+     * Add metadata to the segment
+     *
+     * @param SegmentInterface $segment
+     * @param MetadataInterface $metadata
+     * @return SegmentInterface
+     */
+    private function updateSegment(SegmentInterface $segment, MetadataInterface $metadata): SegmentInterface
+    {
+        $data = $segment->getData();
+        $start = substr($data, 0, self::XMP_DATA_START_POSITION);
+        $xmpData = substr($data, self::XMP_DATA_START_POSITION);
+        return $this->segmentFactory->create([
+            'name' => $segment->getName(),
+            'data' => $start . $this->addXmpMetadata->execute($xmpData, $metadata)
+        ]);
+    }
+
+    /**
+     * Check if segment contains XMP data
+     *
+     * @param SegmentInterface $segment
+     * @return bool
+     */
+    private function isSegmentXmp(SegmentInterface $segment): bool
+    {
+        return $segment->getName() === self::XMP_SEGMENT_NAME
+            && strncmp($segment->getData(), self::XMP_SEGMENT_START, self::XMP_DATA_START_POSITION) == 0;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/WriteFile.php b/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/WriteFile.php
new file mode 100644
index 0000000000000..403bc7f3d7449
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/WriteFile.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadata\Model\Jpeg;
+
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Filesystem\DriverInterface;
+use Magento\MediaGalleryMetadata\Model\SegmentNames;
+use Magento\MediaGalleryMetadataApi\Model\FileInterface;
+use Magento\MediaGalleryMetadataApi\Model\WriteFileInterface;
+use Magento\MediaGalleryMetadataApi\Model\SegmentInterface;
+
+/**
+ * File segments reader
+ */
+class WriteFile implements WriteFileInterface
+{
+    private const MARKER_IMAGE_FILE_START = "\xD8";
+    private const MARKER_IMAGE_PREFIX = "\xFF";
+    private const MARKER_IMAGE_END = "\xD9";
+
+    /**
+     * @var DriverInterface
+     */
+    private $driver;
+
+    /**
+     * @var SegmentNames
+     */
+    private $segmentNames;
+
+    /**
+     * @param DriverInterface $driver
+     * @param SegmentNames $segmentNames
+     */
+    public function __construct(
+        DriverInterface $driver,
+        SegmentNames $segmentNames
+    ) {
+        $this->driver = $driver;
+        $this->segmentNames = $segmentNames;
+    }
+
+    /**
+     * Write file object to the filesystem
+     *
+     * @param FileInterface $file
+     * @throws LocalizedException
+     * @throws FileSystemException
+     */
+    public function execute(FileInterface $file): void
+    {
+        foreach ($file->getSegments() as $segment) {
+            if ($segment->getName() != 'CompressedImage' && strlen($segment->getData()) > 0xfffd) {
+                throw new LocalizedException(__('A Header is too large to fit in the segment!'));
+            }
+        }
+
+        $resource = $this->driver->fileOpen($file->getPath(), 'wb');
+
+        $this->driver->fileWrite($resource, self::MARKER_IMAGE_PREFIX . self::MARKER_IMAGE_FILE_START);
+        $this->writeSegments($resource, $file->getSegments());
+        $this->driver->fileWrite($resource, self::MARKER_IMAGE_PREFIX . self::MARKER_IMAGE_END);
+        $this->driver->fileClose($resource);
+    }
+
+    /**
+     * Write jpeg segment
+     *
+     * @param resource $resource
+     * @param SegmentInterface[] $segments
+     */
+    private function writeSegments($resource, array $segments): void
+    {
+        foreach ($segments as $segment) {
+            if ($segment->getName() !== 'CompressedImage') {
+                $this->driver->fileWrite(
+                    $resource,
+                    //phpcs:ignore Magento2.Functions.DiscouragedFunction
+                    self::MARKER_IMAGE_PREFIX . chr($this->segmentNames->getSegmentType($segment->getName()))
+                );
+                $this->driver->fileWrite($resource, pack("n", strlen($segment->getData()) + 2));
+            }
+            $this->driver->fileWrite($resource, $segment->getData());
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Metadata.php b/app/code/Magento/MediaGalleryMetadata/Model/Metadata.php
new file mode 100644
index 0000000000000..9e3ee5d29a495
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Metadata.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadata\Model;
+
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataExtensionInterface;
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterface;
+
+/**
+ * Media asset metadata data transfer object
+ */
+class Metadata implements MetadataInterface
+{
+    /**
+     * @var string
+     */
+    private $title;
+
+    /**
+     * @var string
+     */
+    private $description;
+
+    /**
+     * @var array
+     */
+    private $keywords;
+
+    /**
+     * @var MetadataExtensionInterface
+     */
+    private $extensionAttributes;
+
+    /**
+     * @param null|string $title
+     * @param null|string $description
+     * @param null|array $keywords
+     * @param MetadataExtensionInterface|null $extensionAttributes
+     */
+    public function __construct(
+        string $title = null,
+        string $description = null,
+        array $keywords = null,
+        ?MetadataExtensionInterface $extensionAttributes = null
+    ) {
+        $this->title = $title;
+        $this->description = $description;
+        $this->keywords = $keywords;
+        $this->extensionAttributes = $extensionAttributes;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getTitle(): ?string
+    {
+        return $this->title;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getKeywords(): ?array
+    {
+        return $this->keywords;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDescription(): ?string
+    {
+        return $this->description;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getExtensionAttributes(): ?MetadataExtensionInterface
+    {
+        return $this->extensionAttributes;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setExtensionAttributes(?MetadataExtensionInterface $extensionAttributes): void
+    {
+        $this->extensionAttributes = $extensionAttributes;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Png/ReadFile.php b/app/code/Magento/MediaGalleryMetadata/Model/Png/ReadFile.php
new file mode 100644
index 0000000000000..673f8ff436ebe
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Png/ReadFile.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadata\Model\Png;
+
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Filesystem\DriverInterface;
+use Magento\MediaGalleryMetadataApi\Model\FileInterface;
+use Magento\MediaGalleryMetadataApi\Model\FileInterfaceFactory;
+use Magento\MediaGalleryMetadataApi\Model\ReadFileInterface;
+use Magento\MediaGalleryMetadataApi\Model\SegmentInterfaceFactory;
+use Magento\Framework\Exception\ValidatorException;
+
+/**
+ * File segments reader
+ */
+class ReadFile implements ReadFileInterface
+{
+    private const PNG_FILE_START = "\x89PNG\x0d\x0a\x1a\x0a";
+    private const PNG_MARKER_IMAGE_END = 'IEND';
+
+    /**
+     * @var DriverInterface
+     */
+    private $driver;
+
+    /**
+     * @var SegmentInterfaceFactory
+     */
+    private $segmentFactory;
+
+    /**
+     * @var FileInterfaceFactory
+     */
+    private $fileFactory;
+
+    /**
+     * @param DriverInterface $driver
+     * @param FileInterfaceFactory $fileFactory
+     * @param SegmentInterfaceFactory $segmentFactory
+     */
+    public function __construct(
+        DriverInterface $driver,
+        FileInterfaceFactory $fileFactory,
+        SegmentInterfaceFactory $segmentFactory
+    ) {
+        $this->driver = $driver;
+        $this->fileFactory = $fileFactory;
+        $this->segmentFactory = $segmentFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(string $path): FileInterface
+    {
+        $resource = $this->driver->fileOpen($path, 'rb');
+        $header = $this->readHeader($resource);
+
+        if ($header != self::PNG_FILE_START) {
+            $this->driver->fileClose($resource);
+            throw new ValidatorException(__('Not a PNG image'));
+        }
+
+        do {
+            $header = $this->readHeader($resource);
+            //phpcs:ignore Magento2.Functions.DiscouragedFunction
+            $segmentHeader = unpack('Nsize/a4type', $header);
+            $data = $this->read($resource, $segmentHeader['size']);
+            $segments[] = $this->segmentFactory->create([
+                'name' => $segmentHeader['type'],
+                'data' => $data
+            ]);
+            $cyclicRedundancyCheck = $this->read($resource, 4);
+
+            if (pack('N', crc32($segmentHeader['type'] . $data)) != $cyclicRedundancyCheck) {
+                throw new LocalizedException(__('The image is corrupted'));
+            }
+        } while ($header
+            && $segmentHeader['type'] != self::PNG_MARKER_IMAGE_END
+            && !$this->driver->endOfFile($resource)
+        );
+
+        $this->driver->fileClose($resource);
+
+        return $this->fileFactory->create([
+            'path' => $path,
+            'segments' => $segments
+        ]);
+    }
+
+    /**
+     * Read 8 bytes
+     *
+     * @param resource $resource
+     * @return string
+     * @throws FileSystemException
+     */
+    private function readHeader($resource): string
+    {
+        return $this->read($resource, 8);
+    }
+
+    /**
+     * Read wrapper
+     *
+     * @param resource $resource
+     * @param int $length
+     * @return string
+     * @throws FileSystemException
+     */
+    private function read($resource, int $length): string
+    {
+        $data = '';
+
+        while (!$this->driver->endOfFile($resource) && strlen($data) < $length) {
+            $data .= $this->driver->fileRead($resource, $length - strlen($data));
+        }
+
+        return $data;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadIptc.php b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadIptc.php
new file mode 100644
index 0000000000000..c856d95475a40
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadIptc.php
@@ -0,0 +1,136 @@
+<?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\Framework\Exception\LocalizedException;
+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;
+
+/**
+ * IPTC Reader to read IPTC data for png image
+ */
+class ReadIptc implements ReadMetadataInterface
+{
+    private const IPTC_SEGMENT_NAME = 'zTXt';
+    private const IPTC_SEGMENT_START = 'iptc';
+    private const IPTC_DATA_START_POSITION = 17;
+    private const IPTC_CHUNK_MARKER_LENGTH = 4;
+
+    /**
+     * @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->isIptcSegment($segment)) {
+                if (!is_callable('gzcompress') && !is_callable('gzuncompress')) {
+                    throw new LocalizedException(
+                        __('zlib gzcompress() && zlib gzuncompress() must be enabled in php configuration')
+                    );
+                }
+                return $this->getIptcData($segment);
+            }
+        }
+
+        return $this->metadataFactory->create([
+            'title' => null,
+            'description' => null,
+            'keywords' => null
+        ]);
+    }
+
+    /**
+     * Read iptc data from zTXt segment
+     *
+     * @param SegmentInterface $segment
+     */
+    private function getIptcData(SegmentInterface $segment): MetadataInterface
+    {
+        $description = null;
+        $title = null;
+        $keywords = null;
+
+        $iptSegmentStartPosition = strpos($segment->getData(), pack("C", 0) . pack("C", 0) . 'x');
+        //phpcs:ignore Magento2.Functions.DiscouragedFunction
+        $uncompressedData = gzuncompress(substr($segment->getData(), $iptSegmentStartPosition + 2));
+
+        $data = explode(PHP_EOL, trim($uncompressedData));
+        //remove header and size from hex string
+        $iptcData = implode(array_slice($data, 2));
+        $binData = hex2bin($iptcData);
+
+        $descriptionMarker = pack("C", 2) . 'x' . pack("C", 0);
+        $descriptionStartPosition = strpos($binData, $descriptionMarker);
+        if ($descriptionStartPosition) {
+            $description = substr(
+                $binData,
+                $descriptionStartPosition + self::IPTC_CHUNK_MARKER_LENGTH,
+                ord(substr($binData, $descriptionStartPosition + 3, 1))
+            );
+        }
+
+        $titleMarker =  pack("C", 2) . 'i' . pack("C", 0);
+        $titleStartPosition = strpos($binData, $titleMarker);
+        if ($titleStartPosition) {
+            $title = substr(
+                $binData,
+                $titleStartPosition + self::IPTC_CHUNK_MARKER_LENGTH,
+                ord(substr($binData, $titleStartPosition + 3, 1))
+            );
+        }
+
+        $keywordsMarker = pack("C", 2) . pack("C", 25) . pack("C", 0);
+        $keywordsStartPosition = strpos($binData, $keywordsMarker);
+        if ($keywordsStartPosition) {
+            $keywords = substr(
+                $binData,
+                $keywordsStartPosition + self::IPTC_CHUNK_MARKER_LENGTH,
+                ord(substr($binData, $keywordsStartPosition + 3, 1))
+            );
+        }
+
+        return $this->metadataFactory->create([
+            'title' => $title,
+            'description' => $description,
+            'keywords' => !empty($keywords) ? explode(',', $keywords) : null
+        ]);
+    }
+
+    /**
+     * Does segment contain IPTC data
+     *
+     * @param SegmentInterface $segment
+     * @return bool
+     */
+    private function isIptcSegment(SegmentInterface $segment): bool
+    {
+        return $segment->getName() === self::IPTC_SEGMENT_NAME
+            && strncmp(
+                substr($segment->getData(), self::IPTC_DATA_START_POSITION, 4),
+                self::IPTC_SEGMENT_START,
+                self::IPTC_DATA_START_POSITION
+            ) == 0;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadXmp.php b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadXmp.php
new file mode 100644
index 0000000000000..83ba554f7bf5d
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadXmp.php
@@ -0,0 +1,86 @@
+<?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\MediaGalleryMetadata\Model\GetXmpMetadata;
+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;
+
+/**
+ * PNG XMP Reader
+ */
+class ReadXmp implements ReadMetadataInterface
+{
+    private const XMP_SEGMENT_NAME = 'iTXt';
+
+    /**
+     * @var MetadataInterfaceFactory
+     */
+    private $metadataFactory;
+
+    /**
+     * @var GetXmpMetadata
+     */
+    private $getXmpMetadata;
+
+    /**
+     * @param MetadataInterfaceFactory $metadataFactory
+     * @param GetXmpMetadata $getXmpMetadata
+     */
+    public function __construct(MetadataInterfaceFactory $metadataFactory, GetXmpMetadata $getXmpMetadata)
+    {
+        $this->metadataFactory = $metadataFactory;
+        $this->getXmpMetadata = $getXmpMetadata;
+    }
+
+    /**
+     * Read metadata from the file
+     *
+     * @param FileInterface $file
+     * @return MetadataInterface
+     */
+    public function execute(FileInterface $file): MetadataInterface
+    {
+        foreach ($file->getSegments() as $segment) {
+            if ($this->isXmpSegment($segment)) {
+                return $this->getXmpMetadata->execute($this->getXmpData($segment));
+            }
+        }
+        return $this->metadataFactory->create([
+            'title' => '',
+            'description' => '',
+            'keywords' => []
+        ]);
+    }
+
+    /**
+     * Does segment contain XMP data
+     *
+     * @param SegmentInterface $segment
+     * @return bool
+     */
+    private function isXmpSegment(SegmentInterface $segment): bool
+    {
+        return $segment->getName() === self::XMP_SEGMENT_NAME
+            && strpos($segment->getData(), '<x:xmpmeta') !== -1;
+    }
+
+    /**
+     * Get XMP xml
+     *
+     * @param SegmentInterface $segment
+     * @return string
+     */
+    private function getXmpData(SegmentInterface $segment): string
+    {
+        return substr($segment->getData(), strpos($segment->getData(), '<x:xmpmeta'));
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteIptc.php b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteIptc.php
new file mode 100644
index 0000000000000..d40dbc13d2962
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteIptc.php
@@ -0,0 +1,214 @@
+<?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\Framework\Exception\LocalizedException;
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterface;
+use Magento\MediaGalleryMetadataApi\Model\FileInterface;
+use Magento\MediaGalleryMetadataApi\Model\FileInterfaceFactory;
+use Magento\MediaGalleryMetadataApi\Model\SegmentInterface;
+use Magento\MediaGalleryMetadataApi\Model\SegmentInterfaceFactory;
+use Magento\MediaGalleryMetadataApi\Model\WriteMetadataInterface;
+
+/**
+ * IPTC Writer to write IPTC data for png image
+ */
+class WriteIptc implements WriteMetadataInterface
+{
+    private const IPTC_SEGMENT_NAME = 'zTXt';
+    private const IPTC_SEGMENT_START = 'iptc';
+    private const IPTC_DATA_START_POSITION = 17;
+    private const IPTC_SEGMENT_START_STRING = 'Raw profile type iptc';
+
+    /**
+     * @var SegmentInterfaceFactory
+     */
+    private $segmentFactory;
+
+    /**
+     * @var FileInterfaceFactory
+     */
+    private $fileFactory;
+
+    /**
+     * @param FileInterfaceFactory $fileFactory
+     * @param SegmentInterfaceFactory $segmentFactory
+     */
+    public function __construct(
+        FileInterfaceFactory $fileFactory,
+        SegmentInterfaceFactory $segmentFactory
+    ) {
+        $this->fileFactory = $fileFactory;
+        $this->segmentFactory = $segmentFactory;
+    }
+
+    /**
+     * Write iptc metadata to zTXt segment
+     *
+     * @param FileInterface $file
+     * @param MetadataInterface $metadata
+     * @return FileInterface
+     */
+    public function execute(FileInterface $file, MetadataInterface $metadata): FileInterface
+    {
+        $segments = $file->getSegments();
+        $pngIptcSegments = [];
+        foreach ($segments as $key => $segment) {
+            if ($this->isIptcSegment($segment)) {
+                $pngIptcSegments[$key] = $segment;
+            }
+        }
+
+        if (!is_callable('gzcompress') && !is_callable('gzuncompress')) {
+            throw new LocalizedException(
+                __('zlib gzcompress() && zlib gzuncompress() must be enabled in php configuration')
+            );
+        }
+
+        if (empty($pngIptcSegments)) {
+            $segments[] =  $this->createPngIptcSegment($metadata);
+
+            return $this->fileFactory->create([
+                'path' => $file->getPath(),
+                'segments' => $segments
+            ]);
+        }
+
+        foreach ($pngIptcSegments as $key => $segment) {
+            $segments[$key] = $this->updateIptcSegment($segment, $metadata);
+        }
+
+        return $this->fileFactory->create([
+            'path' => $file->getPath(),
+            'segments' => $segments
+        ]);
+    }
+
+    /**
+     * Create new  zTXt segment with metadata
+     *
+     * @param MetadataInterface $metadata
+     */
+    private function createPngIptcSegment(MetadataInterface $metadata): SegmentInterface
+    {
+        $start = '8BIM' . str_repeat(pack('C', 4), 2) . str_repeat(pack("C", 0), 5)
+            . 'c' . pack('C', 28) . pack('C', 1);
+        $compression = 'Z' . pack('C', 0) . pack('C', 3) . pack('C', 27) . '%G' . pack('C', 28) . pack('C', 1);
+        $end = str_repeat(pack('C', 0), 2) . pack('C', 2) . pack('C', 0) . pack('C', 4) . pack('C', 28);
+        $binData = $start . $compression . $end;
+
+        $description = $metadata->getDescription();
+        if ($description !== null) {
+            $descriptionMarker = pack("C", 2) . 'x' . pack("C", 0);
+            $binData .= $descriptionMarker . pack('C', strlen($description)) . $description . pack('C', 28);
+        }
+
+        $title = $metadata->getTitle();
+        if ($title !== null) {
+            $titleMarker =  pack("C", 2) . 'i' . pack("C", 0);
+            $binData .= $titleMarker . pack('C', strlen($title)) . $title . pack('C', 28);
+        }
+
+        $keywords = $metadata->getKeywords();
+        if ($keywords !== null) {
+            $keywordsMarker = pack("C", 2) . pack("C", 25) . pack("C", 0);
+            $keywords = implode(',', $keywords);
+            $binData .= $keywordsMarker . pack('C', strlen($keywords)) . $keywords . pack('C', 28);
+        }
+
+        $binData .= pack('C', 0);
+        $hexString = bin2hex($binData);
+        //phpcs:ignore Magento2.Functions.DiscouragedFunction
+        $compressedIptcData = gzcompress(PHP_EOL . 'iptc' . PHP_EOL . strlen($binData) . PHP_EOL . $hexString);
+
+        return $this->segmentFactory->create([
+            'name' => self::IPTC_SEGMENT_NAME,
+            'data' => self::IPTC_SEGMENT_START_STRING . str_repeat(pack('C', 0), 2) . $compressedIptcData
+        ]);
+    }
+
+    /**
+     * Update iptc data to zTXt segment
+     *
+     * @param SegmentInterface $segment
+     * @param MetadataInterface $metadata
+     */
+    private function updateIptcSegment(SegmentInterface $segment, MetadataInterface $metadata): SegmentInterface
+    {
+        $description = null;
+        $title = null;
+        $keywords = null;
+
+        $iptSegmentStartPosition = strpos($segment->getData(), pack("C", 0) . pack("C", 0) . 'x');
+        //phpcs:ignore Magento2.Functions.DiscouragedFunction
+        $uncompressedData = gzuncompress(substr($segment->getData(), $iptSegmentStartPosition + 2));
+
+        $data = explode(PHP_EOL, trim($uncompressedData));
+        //remove header and size from hex string
+        $iptcData = implode(array_slice($data, 2));
+        $binData = hex2bin($iptcData);
+
+        if ($metadata->getDescription() !== null) {
+            $description = $metadata->getDescription();
+            $descriptionMarker = pack("C", 2) . 'x' . pack("C", 0);
+            $descriptionStartPosition = strpos($binData, $descriptionMarker) + 3;
+            $binData = substr_replace(
+                $binData,
+                pack("C", strlen($description)) . $description,
+                $descriptionStartPosition
+            ) . substr($binData, $descriptionStartPosition + 1 + ord(substr($binData, $descriptionStartPosition)));
+        }
+
+        if ($metadata->getTitle() !== null) {
+            $title = $metadata->getTitle();
+            $titleMarker =  pack("C", 2) . 'i' . pack("C", 0);
+            $titleStartPosition = strpos($binData, $titleMarker) + 3;
+            $binData = substr_replace(
+                $binData,
+                pack("C", strlen($title)) . $title,
+                $titleStartPosition
+            ) . substr($binData, $titleStartPosition + 1 + ord(substr($binData, $titleStartPosition)));
+        }
+
+        if ($metadata->getKeywords() !== null) {
+            $keywords = implode(',', $metadata->getKeywords());
+            $keywordsMarker = pack("C", 2) . pack("C", 25) . pack("C", 0);
+            $keywordsStartPosition = strpos($binData, $keywordsMarker) + 3;
+            $binData = substr_replace(
+                $binData,
+                pack("C", strlen($keywords)) . $keywords,
+                $keywordsStartPosition
+            ) . substr($binData, $keywordsStartPosition + 1 + ord(substr($binData, $keywordsStartPosition)));
+        }
+        $hexString = bin2hex($binData);
+        $iptcSegmentStart = substr($segment->getData(), 0, $iptSegmentStartPosition + 2);
+        //phpcs:ignore Magento2.Functions.DiscouragedFunction
+        $segmentDataCompressed = gzcompress(PHP_EOL . $data[0] . PHP_EOL . strlen($binData) . PHP_EOL . $hexString);
+
+        return $this->segmentFactory->create([
+            'name' => $segment->getName(),
+            'data' => $iptcSegmentStart . $segmentDataCompressed
+        ]);
+    }
+
+    /**
+     * Does segment contain IPTC data
+     *
+     * @param SegmentInterface $segment
+     * @return bool
+     */
+    private function isIptcSegment(SegmentInterface $segment): bool
+    {
+        return $segment->getName() === self::IPTC_SEGMENT_NAME
+            && strncmp(
+                substr($segment->getData(), self::IPTC_DATA_START_POSITION, 4),
+                self::IPTC_SEGMENT_START,
+                self::IPTC_DATA_START_POSITION
+            ) == 0;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteXmp.php b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteXmp.php
new file mode 100644
index 0000000000000..9d8d5d975d99d
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteXmp.php
@@ -0,0 +1,163 @@
+<?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\MediaGalleryMetadata\Model\AddXmpMetadata;
+use Magento\MediaGalleryMetadata\Model\XmpTemplate;
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterface;
+use Magento\MediaGalleryMetadataApi\Model\FileInterface;
+use Magento\MediaGalleryMetadataApi\Model\FileInterfaceFactory;
+use Magento\MediaGalleryMetadataApi\Model\SegmentInterface;
+use Magento\MediaGalleryMetadataApi\Model\SegmentInterfaceFactory;
+use Magento\MediaGalleryMetadataApi\Model\WriteMetadataInterface;
+
+/**
+ * XMP Writer for png format
+ */
+class WriteXmp implements WriteMetadataInterface
+{
+    private const XMP_SEGMENT_NAME = 'iTXt';
+    private const XMP_SEGMENT_START = "XML:com.adobe.xmp\x00";
+
+    /**
+     * @var SegmentInterfaceFactory
+     */
+    private $segmentFactory;
+
+    /**
+     * @var FileInterfaceFactory
+     */
+    private $fileFactory;
+
+    /**
+     * @var AddXmpMetadata
+     */
+    private $addXmpMetadata;
+
+    /**
+     * @var XmpTemplate
+     */
+    private $xmpTemplate;
+
+    /**
+     * @param FileInterfaceFactory $fileFactory
+     * @param SegmentInterfaceFactory $segmentFactory
+     * @param AddXmpMetadata $addXmpMetadata
+     * @param XmpTemplate $xmpTemplate
+     */
+    public function __construct(
+        FileInterfaceFactory $fileFactory,
+        SegmentInterfaceFactory $segmentFactory,
+        AddXmpMetadata $addXmpMetadata,
+        XmpTemplate $xmpTemplate
+    ) {
+        $this->fileFactory = $fileFactory;
+        $this->segmentFactory = $segmentFactory;
+        $this->addXmpMetadata = $addXmpMetadata;
+        $this->xmpTemplate = $xmpTemplate;
+    }
+
+    /**
+     * Add xmp metadata to the png file
+     *
+     * @param FileInterface $file
+     * @param MetadataInterface $metadata
+     * @return FileInterface
+     */
+    public function execute(FileInterface $file, MetadataInterface $metadata): FileInterface
+    {
+        $segments = $file->getSegments();
+        $pngXmpSegments = [];
+        foreach ($segments as $key => $segment) {
+            if ($this->isXmpSegment($segment)) {
+                $pngXmpSegments[$key] = $segment;
+            }
+        }
+
+        if (empty($pngXmpSegments)) {
+            return $this->fileFactory->create([
+                'path' => $file->getPath(),
+                'segments' => $this->insertPngXmpSegment($segments, $this->createPngXmpSegment($metadata))
+            ]);
+        }
+
+        foreach ($pngXmpSegments as $key => $segment) {
+            $segments[$key] = $this->updateSegment($segment, $metadata);
+        }
+
+        return $this->fileFactory->create([
+            'path' => $file->getPath(),
+            'segments' => $segments
+        ]);
+    }
+
+    /**
+     * 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
+     *
+     * @param MetadataInterface $metadata
+     * @return SegmentInterface
+     */
+    public function createPngXmpSegment(MetadataInterface $metadata): SegmentInterface
+    {
+        $xmpData = $this->xmpTemplate->get();
+        return $this->segmentFactory->create([
+            'name' => self::XMP_SEGMENT_NAME,
+            'data' => self::XMP_SEGMENT_START . $this->addXmpMetadata->execute($xmpData, $metadata)
+        ]);
+    }
+
+    /**
+     * Add metadata to the png xmp segment
+     *
+     * @param SegmentInterface $segment
+     * @param MetadataInterface $metadata
+     * @return SegmentInterface
+     */
+    private function updateSegment(SegmentInterface $segment, MetadataInterface $metadata): SegmentInterface
+    {
+        return $this->segmentFactory->create([
+            'name' => $segment->getName(),
+            'data' => self::XMP_SEGMENT_START . $this->addXmpMetadata->execute($this->getXmpData($segment), $metadata)
+        ]);
+    }
+
+    /**
+     * Does segment contain XMP data
+     *
+     * @param SegmentInterface $segment
+     * @return bool
+     */
+    private function isXmpSegment(SegmentInterface $segment): bool
+    {
+        return $segment->getName() === self::XMP_SEGMENT_NAME
+            && strpos($segment->getData(), '<x:xmpmeta') !== -1;
+    }
+
+    /**
+     * Get XMP xml
+     *
+     * @param SegmentInterface $segment
+     * @return string
+     */
+    private function getXmpData(SegmentInterface $segment): string
+    {
+        return substr($segment->getData(), strpos($segment->getData(), '<x:xmpmeta'));
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Png/WriteFile.php b/app/code/Magento/MediaGalleryMetadata/Model/Png/WriteFile.php
new file mode 100644
index 0000000000000..c5db6644b3545
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Png/WriteFile.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadata\Model\Png;
+
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Filesystem\DriverInterface;
+use Magento\MediaGalleryMetadata\Model\SegmentNames;
+use Magento\MediaGalleryMetadataApi\Model\FileInterface;
+use Magento\MediaGalleryMetadataApi\Model\WriteFileInterface;
+use Magento\MediaGalleryMetadataApi\Model\SegmentInterface;
+
+/**
+ * File segments reader
+ */
+class WriteFile implements WriteFileInterface
+{
+    private const PNG_FILE_START = "\x89PNG\x0d\x0a\x1a\x0a";
+
+    /**
+     * @var DriverInterface
+     */
+    private $driver;
+
+    /**
+     * @var SegmentNames
+     */
+    private $segmentNames;
+
+    /**
+     * @param DriverInterface $driver
+     * @param SegmentNames $segmentNames
+     */
+    public function __construct(
+        DriverInterface $driver,
+        SegmentNames $segmentNames
+    ) {
+        $this->driver = $driver;
+        $this->segmentNames = $segmentNames;
+    }
+
+    /**
+     * Write PNG file to filesystem
+     *
+     * @param FileInterface $file
+     * @throws LocalizedException
+     * @throws FileSystemException
+     */
+    public function execute(FileInterface $file): void
+    {
+        $resource = $this->driver->fileOpen($file->getPath(), 'wb');
+
+        $this->driver->fileWrite($resource, self::PNG_FILE_START);
+        $this->writeSegments($resource, $file->getSegments());
+        $this->driver->fileClose($resource);
+    }
+
+    /**
+     * Write PNG segments
+     *
+     * @param resource $resource
+     * @param SegmentInterface[] $segments
+     */
+    private function writeSegments($resource, array $segments): void
+    {
+        foreach ($segments as $segment) {
+            $this->driver->fileWrite($resource, pack("N", strlen($segment->getData())));
+            $this->driver->fileWrite($resource, pack("a4", $segment->getName()));
+            $this->driver->fileWrite($resource, $segment->getData());
+            $this->driver->fileWrite($resource, pack("N", crc32($segment->getName() . $segment->getData())));
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Segment.php b/app/code/Magento/MediaGalleryMetadata/Model/Segment.php
new file mode 100644
index 0000000000000..0e8a89767e40c
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Segment.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadata\Model;
+
+use Magento\MediaGalleryMetadataApi\Model\SegmentExtensionInterface;
+use Magento\MediaGalleryMetadataApi\Model\SegmentInterface;
+
+/**
+ * Segment internal data transfer object
+ */
+class Segment implements SegmentInterface
+{
+    /**
+     * @var array
+     */
+    private $name;
+
+    /**
+     * @var string
+     */
+    private $data;
+
+    /**
+     * @var SegmentExtensionInterface
+     */
+    private $extensionAttributes;
+
+    /**
+     * @param string $name
+     * @param string $data
+     * @param SegmentExtensionInterface|null $extensionAttributes
+     */
+    public function __construct(
+        string $name,
+        string $data,
+        ?SegmentExtensionInterface $extensionAttributes = null
+    ) {
+        $this->name = $name;
+        $this->data = $data;
+        $this->extensionAttributes = $extensionAttributes;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getData(): string
+    {
+        return $this->data;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getExtensionAttributes(): ?SegmentExtensionInterface
+    {
+        return $this->extensionAttributes;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setExtensionAttributes(?SegmentExtensionInterface $extensionAttributes): void
+    {
+        $this->extensionAttributes = $extensionAttributes;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/SegmentNames.php b/app/code/Magento/MediaGalleryMetadata/Model/SegmentNames.php
new file mode 100644
index 0000000000000..62eea09453ae5
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Model/SegmentNames.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadata\Model;
+
+/**
+ * Segment types to names mapper
+ */
+class SegmentNames
+{
+    private const SEGMENT_TYPE_TO_NAME = [
+        0xC0 => "SOF0",
+        0xC1 => "SOF1",
+        0xC2 => "SOF2",
+        0xC3 => "SOF4",
+        0xC5 => "SOF5",
+        0xC6 => "SOF6",
+        0xC7 => "SOF7",
+        0xC8 => "JPG",
+        0xC9 => "SOF9",
+        0xCA => "SOF10",
+        0xCB => "SOF11",
+        0xCD => "SOF13",
+        0xCE => "SOF14",
+        0xCF => "SOF15",
+        0xC4 => "DHT",
+        0xCC => "DAC",
+        0xD0 => "RST0",
+        0xD1 => "RST1",
+        0xD2 => "RST2",
+        0xD3 => "RST3",
+        0xD4 => "RST4",
+        0xD5 => "RST5",
+        0xD6 => "RST6",
+        0xD7 => "RST7",
+        0xD8 => "SOI",
+        0xD9 => "EOI",
+        0xDA => "SOS",
+        0xDB => "DQT",
+        0xDC => "DNL",
+        0xDD => "DRI",
+        0xDE => "DHP",
+        0xDF => "EXP",
+        0xE0 => "APP0",
+        0xE1 => "APP1",
+        0xE2 => "APP2",
+        0xE3 => "APP3",
+        0xE4 => "APP4",
+        0xE5 => "APP5",
+        0xE6 => "APP6",
+        0xE7 => "APP7",
+        0xE8 => "APP8",
+        0xE9 => "APP9",
+        0xEA => "APP10",
+        0xEB => "APP11",
+        0xEC => "APP12",
+        0xED => "APP13",
+        0xEE => "APP14",
+        0xEF => "APP15",
+        0xF0 => "JPG0",
+        0xF1 => "JPG1",
+        0xF2 => "JPG2",
+        0xF3 => "JPG3",
+        0xF4 => "JPG4",
+        0xF5 => "JPG5",
+        0xF6 => "JPG6",
+        0xF7 => "JPG7",
+        0xF8 => "JPG8",
+        0xF9 => "JPG9",
+        0xFA => "JPG10",
+        0xFB => "JPG11",
+        0xFC => "JPG12",
+        0xFD => "JPG13",
+        0xFE => "COM",
+        0x01 => "TEM",
+        0x02 => "RES",
+    ];
+
+    /**
+     * Get segment name by type
+     *
+     * @param int $type
+     * @return string
+     */
+    public function getSegmentName(int $type): string
+    {
+        return self::SEGMENT_TYPE_TO_NAME[$type];
+    }
+
+    /**
+     * Get segment type by name
+     *
+     * @param string $name
+     * @return int
+     */
+    public function getSegmentType(string $name): int
+    {
+        return array_search($name, self::SEGMENT_TYPE_TO_NAME);
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/XmpTemplate.php b/app/code/Magento/MediaGalleryMetadata/Model/XmpTemplate.php
new file mode 100644
index 0000000000000..a7d07f66ba8aa
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Model/XmpTemplate.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadata\Model;
+
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Filesystem\DriverInterface;
+use Magento\Framework\Module\Dir;
+use Magento\Framework\Module\Dir\Reader;
+
+/**
+ * XMP template provider
+ */
+class XmpTemplate
+{
+    private const XMP_TEMPLATE_FILENAME = 'default.xmp';
+
+    /**
+     * @var Reader
+     */
+    private $moduleReader;
+
+    /**
+     * @var DriverInterface
+     */
+    private $driver;
+
+    /**
+     * @param Reader $moduleReader
+     * @param DriverInterface $driver
+     */
+    public function __construct(Reader $moduleReader, DriverInterface $driver)
+    {
+        $this->moduleReader = $moduleReader;
+        $this->driver = $driver;
+    }
+
+    /**
+     * Get default XMP template
+     *
+     * @return string
+     * @throws FileSystemException
+     */
+    public function get(): string
+    {
+        $etcDirectoryPath = $this->moduleReader->getModuleDir(
+            Dir::MODULE_ETC_DIR,
+            'Magento_MediaGalleryMetadata'
+        );
+        return $this->driver->fileGetContents(
+            $etcDirectoryPath . '/' . self::XMP_TEMPLATE_FILENAME
+        );
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/README.md b/app/code/Magento/MediaGalleryMetadata/README.md
new file mode 100644
index 0000000000000..ec74e527ddebb
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/README.md
@@ -0,0 +1,3 @@
+# Magento_MediaGalleryMetadata
+
+The purpose of this module is to provide an ability to extract the metadata from file and populating Media Asset entity fields when an image is uploaded to Magento and also provide an ability to update the metadata stored in an image file.
diff --git a/app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/AddMetadataTest.php b/app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/AddMetadataTest.php
new file mode 100644
index 0000000000000..c284bf71e60af
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/AddMetadataTest.php
@@ -0,0 +1,197 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadata\Test\Integration\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\Filesystem\DriverInterface;
+use Magento\MediaGalleryMetadataApi\Api\AddMetadataInterface;
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterfaceFactory;
+use Magento\MediaGalleryMetadataApi\Api\ExtractMetadataInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * ExtractMetadata test
+ */
+class AddMetadataTest extends TestCase
+{
+    /**
+     * @var AddMetadataInterface
+     */
+    private $addMetadata;
+
+    /**
+     * @var WriteInterface
+     */
+    private $varDirectory;
+
+    /**
+     * @var DriverInterface
+     */
+    private $driver;
+
+    /**
+     * @var MetadataInterfaceFactory
+     */
+    private $metadataFactory;
+
+    /**
+     * @var ExtractMetadataInterface
+     */
+    private $extractMetadata;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->addMetadata = Bootstrap::getObjectManager()->get(AddMetadataInterface::class);
+        $this->varDirectory = Bootstrap::getObjectManager()->get(Filesystem::class)
+            ->getDirectoryWrite(DirectoryList::VAR_DIR);
+        $this->driver = Bootstrap::getObjectManager()->get(DriverInterface::class);
+        $this->metadataFactory = Bootstrap::getObjectManager()->get(MetadataInterfaceFactory::class);
+        $this->extractMetadata = Bootstrap::getObjectManager()->get(ExtractMetadataInterface::class);
+    }
+
+    /**
+     * Test for ExtractMetadata::execute
+     *
+     * @dataProvider filesProvider
+     * @param null|string $fileName
+     * @param null|string $title
+     * @param null|string $description
+     * @param null|array $keywords
+     * @throws LocalizedException
+     */
+    public function testExecute(
+        ?string $fileName,
+        ?string $title,
+        ?string $description,
+        ?array $keywords
+    ): void {
+        $path = realpath(__DIR__ . '/../../_files/' . $fileName);
+        $modifiableFilePath = $this->varDirectory->getAbsolutePath($fileName);
+        $this->driver->copy(
+            $path,
+            $modifiableFilePath
+        );
+        $metadata = $this->metadataFactory->create([
+            'title' => $title,
+            'description' => $description,
+            'keywords' => $keywords
+        ]);
+
+        $this->addMetadata->execute($modifiableFilePath, $metadata);
+
+        $updatedMetadata = $this->extractMetadata->execute($modifiableFilePath);
+
+        $this->assertEquals($title, $updatedMetadata->getTitle());
+        $this->assertEquals($description, $updatedMetadata->getDescription());
+        $this->assertEquals($keywords, $updatedMetadata->getKeywords());
+
+        $this->driver->deleteFile($modifiableFilePath);
+    }
+
+    /**
+     * Data provider for testExecute
+     *
+     * @return array[]
+     */
+    public function filesProvider(): array
+    {
+        return [
+            [
+                'iptc_only.png',
+                'Updated Title',
+                'Updated Description',
+                [
+                    'magento2',
+                    'mediagallery'
+                ]
+            ],
+            [
+                'macos-photos.jpeg',
+                'Updated Title',
+                'Updated Description',
+                [
+                    'magento2',
+                    'mediagallery'
+                ]
+            ],
+             [
+                'macos-photos.jpeg',
+                'Updated Title',
+                null,
+                null
+            ],
+            [
+                'iptc_only.jpeg',
+                'Updated Title',
+                'Updated Description',
+                [
+                    'magento2',
+                    'mediagallery'
+                ]
+            ],
+            [
+                'empty_iptc.jpeg',
+                'Updated Title',
+                null,
+                null
+            ],
+            [
+                'macos-preview.png',
+                'Title of the magento image 2',
+                'Description of the magento image 2',
+                [
+                    'magento2',
+                    'community'
+                ]
+            ],
+            [
+                'empty_xmp_image.jpeg',
+                'Title of the magento image',
+                'Description of the magento image 2',
+                [
+                    'magento2',
+                    'community'
+                ],
+            ],
+            [
+                'empty_xmp_image.png',
+                'Title of the magento image',
+                'Description of the magento image 2',
+                [
+                    'magento2',
+                    'community'
+                ],
+            ],
+             [
+                'exiftool.gif',
+                'Updated Title',
+                'Updated Description',
+                [
+                    'magento2',
+                    'mediagallery'
+                ]
+             ],
+             [
+                'empty_exiftool.gif',
+                'Updated Title',
+                'Updated Description',
+                [
+                    'magento2',
+                    'mediagallery'
+                ]
+             ]
+        ];
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/ExtractMetadataTest.php b/app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/ExtractMetadataTest.php
new file mode 100644
index 0000000000000..982ccbb20fe2c
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/ExtractMetadataTest.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadata\Test\Integration\Model;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\MediaGalleryMetadataApi\Api\ExtractMetadataInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for ExtractMetadata
+ */
+class ExtractMetadataTest extends TestCase
+{
+    /**
+     * @var ExtractMetadataComposite
+     */
+    private $extractMetadata;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->extractMetadata = Bootstrap::getObjectManager()->get(ExtractMetadataInterface::class);
+    }
+
+    /**
+     * Test for ExtractMetadata::execute
+     *
+     * @dataProvider filesProvider
+     * @param string $fileName
+     * @param string $title
+     * @param string $description
+     * @param array $keywords
+     * @throws LocalizedException
+     */
+    public function testExecute(
+        string $fileName,
+        string $title,
+        string $description,
+        array $keywords
+    ): void {
+        $path = realpath(__DIR__ . '/../../_files/' . $fileName);
+        $metadata = $this->extractMetadata->execute($path);
+
+        $this->assertEquals($title, $metadata->getTitle());
+        $this->assertEquals($description, $metadata->getDescription());
+        $this->assertEquals($keywords, $metadata->getKeywords());
+    }
+
+    /**
+     * Data provider for testExecute
+     *
+     * @return array[]
+     */
+    public function filesProvider(): array
+    {
+        return [
+            [
+                '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/Integration/Model/Gif/Segment/XmpTest.php b/app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/Gif/Segment/XmpTest.php
new file mode 100644
index 0000000000000..4bba73e3ca2a9
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/Gif/Segment/XmpTest.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadata\Test\Integration\Model\Gif\Segment;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Filesystem\DriverInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+use Magento\MediaGalleryMetadata\Model\Gif\Segment\WriteXmp;
+use Magento\MediaGalleryMetadata\Model\Gif\Segment\ReadXmp;
+use Magento\MediaGalleryMetadata\Model\Gif\ReadFile;
+use Magento\MediaGalleryMetadata\Model\MetadataFactory;
+
+/**
+ * Test for XMP reader and writer gif format
+ */
+class XmpTest extends TestCase
+{
+    /**
+     * @var WriteXmp
+     */
+    private $xmpWriter;
+
+    /**
+     * @var ReadXmp
+     */
+    private $xmpReader;
+
+    /**
+     * @var DriverInterface
+     */
+    private $driver;
+
+    /**
+     * @var ReadFile
+     */
+    private $fileReader;
+
+    /**
+     * @var MetadataFactory
+     */
+    private $metadataFactory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->xmpWriter = Bootstrap::getObjectManager()->get(WriteXmp::class);
+        $this->xmpReader = Bootstrap::getObjectManager()->get(ReadXmp::class);
+        $this->fileReader = Bootstrap::getObjectManager()->get(ReadFile::class);
+        $this->driver = Bootstrap::getObjectManager()->get(DriverInterface::class);
+        $this->metadataFactory = Bootstrap::getObjectManager()->get(MetadataFactory::class);
+    }
+
+    /**
+     * Test for XMP reader and writer
+     *
+     * @dataProvider filesProvider
+     * @param string $fileName
+     * @param string $title
+     * @param string $description
+     * @param array $keywords
+     * @throws LocalizedException
+     */
+    public function testWriteReadGif(
+        string $fileName,
+        string $title,
+        string $description,
+        array $keywords
+    ): void {
+        $path = realpath(__DIR__ . '/../../../../_files/' . $fileName);
+        $file = $this->fileReader->execute($path);
+        $originalGifMetadata = $this->xmpReader->execute($file);
+
+        $this->assertEmpty($originalGifMetadata->getTitle());
+        $this->assertEmpty($originalGifMetadata->getDescription());
+        $this->assertEmpty($originalGifMetadata->getKeywords());
+        $updatedGifFile = $this->xmpWriter->execute(
+            $file,
+            $this->metadataFactory->create([
+                'title' => $title,
+                'description' => $description,
+                'keywords' => $keywords
+            ])
+        );
+        $updatedGifMetadata = $this->xmpReader->execute($updatedGifFile);
+        $this->assertEquals($title, $updatedGifMetadata->getTitle());
+        $this->assertEquals($description, $updatedGifMetadata->getDescription());
+        $this->assertEquals($keywords, $updatedGifMetadata->getKeywords());
+    }
+
+    /**
+     * Data provider for testExecute
+     *
+     * @return array[]
+     */
+    public function filesProvider(): array
+    {
+        return [
+            [
+                'empty_exiftool.gif',
+                'Title of the magento image',
+                'Description of the magento image 2',
+                [
+                    'magento2',
+                    'community'
+                ]
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/Jpeg/Segment/IptcTest.php b/app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/Jpeg/Segment/IptcTest.php
new file mode 100644
index 0000000000000..932b71df28430
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/Jpeg/Segment/IptcTest.php
@@ -0,0 +1,134 @@
+<?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\Segment\WriteIptc;
+use Magento\MediaGalleryMetadata\Model\Jpeg\Segment\ReadIptc;
+use Magento\MediaGalleryMetadata\Model\Jpeg\ReadFile;
+use Magento\MediaGalleryMetadata\Model\MetadataFactory;
+
+/**
+ * Test for IPTC reader and writer
+ */
+class IptcTest 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/Integration/Model/Jpeg/Segment/XmpTest.php b/app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/Jpeg/Segment/XmpTest.php
new file mode 100644
index 0000000000000..043e26f67853f
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/Jpeg/Segment/XmpTest.php
@@ -0,0 +1,117 @@
+<?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\Exception\LocalizedException;
+use Magento\Framework\Filesystem\DriverInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+use Magento\MediaGalleryMetadata\Model\Jpeg\Segment\WriteXmp;
+use Magento\MediaGalleryMetadata\Model\Jpeg\Segment\ReadXmp;
+use Magento\MediaGalleryMetadata\Model\Jpeg\ReadFile;
+use Magento\MediaGalleryMetadata\Model\MetadataFactory;
+
+/**
+ * Test for XMP reader and writer
+ */
+class XmpTest extends TestCase
+{
+    /**
+     * @var WriteXmp
+     */
+    private $xmpWriter;
+
+    /**
+     * @var ReadXmp
+     */
+    private $xmpReader;
+
+    /**
+     * @var DriverInterface
+     */
+    private $driver;
+
+    /**
+     * @var ReadFile
+     */
+    private $fileReader;
+
+    /**
+     * @var MetadataFactory
+     */
+    private $metadataFactory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->xmpWriter = Bootstrap::getObjectManager()->get(WriteXmp::class);
+        $this->xmpReader = Bootstrap::getObjectManager()->get(ReadXmp::class);
+        $this->fileReader = Bootstrap::getObjectManager()->get(ReadFile::class);
+        $this->driver = Bootstrap::getObjectManager()->get(DriverInterface::class);
+        $this->metadataFactory = Bootstrap::getObjectManager()->get(MetadataFactory::class);
+    }
+
+    /**
+     * Test for XMP 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);
+        $file = $this->fileReader->execute($path);
+        $originalMetadata = $this->xmpReader->execute($file);
+
+        $this->assertEmpty($originalMetadata->getTitle());
+        $this->assertEmpty($originalMetadata->getDescription());
+        $this->assertEmpty($originalMetadata->getKeywords());
+        $updatedFile = $this->xmpWriter->execute(
+            $file,
+            $this->metadataFactory->create([
+                'title' => $title,
+                'description' => $description,
+                'keywords' => $keywords
+            ])
+        );
+        $updatedMetadata = $this->xmpReader->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_xmp_image.jpeg',
+                'Title of the magento image',
+                'Description of the magento image 2',
+                [
+                    'magento2',
+                    'community'
+                ]
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/Png/Segment/IptcTest.php b/app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/Png/Segment/IptcTest.php
new file mode 100644
index 0000000000000..d8bcfd7a94561
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/Png/Segment/IptcTest.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadata\Test\Integration\Model\Png\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\Png\Segment\WriteIptc;
+use Magento\MediaGalleryMetadata\Model\Png\Segment\ReadIptc;
+use Magento\MediaGalleryMetadata\Model\Png\ReadFile;
+use Magento\MediaGalleryMetadata\Model\MetadataFactory;
+
+/**
+ * Test for IPTC reader and writer
+ */
+class IptcTest 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.png',
+                'Updated Title',
+                'Updated Description',
+                [
+                    'magento2',
+                    'mediagallery'
+                ]
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Test/_files/empty_exiftool.gif b/app/code/Magento/MediaGalleryMetadata/Test/_files/empty_exiftool.gif
new file mode 100644
index 0000000000000000000000000000000000000000..14cc6026b5950c8b2546c198467dc59dc31c1724
GIT binary patch
literal 7951
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
F{{RBl3$y?L

literal 0
HcmV?d00001

diff --git a/app/code/Magento/MediaGalleryMetadata/Test/_files/empty_iptc.jpeg b/app/code/Magento/MediaGalleryMetadata/Test/_files/empty_iptc.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..144a56dac2d3e748d47cf56e0fdde0bab2f49def
GIT binary patch
literal 19416
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

literal 0
HcmV?d00001

diff --git a/app/code/Magento/MediaGalleryMetadata/Test/_files/empty_iptc.png b/app/code/Magento/MediaGalleryMetadata/Test/_files/empty_iptc.png
new file mode 100644
index 0000000000000000000000000000000000000000..129c49a1b7e64148b223123349fc21f2dc1393c8
GIT binary patch
literal 47596
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
HP00TMZ+Z(Z

literal 0
HcmV?d00001

diff --git a/app/code/Magento/MediaGalleryMetadata/Test/_files/empty_xmp_image.jpeg b/app/code/Magento/MediaGalleryMetadata/Test/_files/empty_xmp_image.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..cee7bff38a6c62b9bb8d59b682b10567c6c696da
GIT binary patch
literal 19336
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
Y_Wa?0f${ujYsB!kdAI-N$2$K10F^uY0RR91

literal 0
HcmV?d00001

diff --git a/app/code/Magento/MediaGalleryMetadata/Test/_files/empty_xmp_image.png b/app/code/Magento/MediaGalleryMetadata/Test/_files/empty_xmp_image.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e81891ebc0eee3059e8e5455158993a0aa839fe
GIT binary patch
literal 55268
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
FzX0#`%BcVV

literal 0
HcmV?d00001

diff --git a/app/code/Magento/MediaGalleryMetadata/Test/_files/exiftool.gif b/app/code/Magento/MediaGalleryMetadata/Test/_files/exiftool.gif
new file mode 100644
index 0000000000000000000000000000000000000000..70574d70b609e0a180bbf680447f6e970f484b43
GIT binary patch
literal 12704
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

literal 0
HcmV?d00001

diff --git a/app/code/Magento/MediaGalleryMetadata/Test/_files/iptc_only.jpeg b/app/code/Magento/MediaGalleryMetadata/Test/_files/iptc_only.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..5d7dba35fede7547ce742ea33ce62cc71d5f825f
GIT binary patch
literal 19884
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

literal 0
HcmV?d00001

diff --git a/app/code/Magento/MediaGalleryMetadata/Test/_files/iptc_only.png b/app/code/Magento/MediaGalleryMetadata/Test/_files/iptc_only.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b4821c1c4e5d755df65d09450bcb2b5c925e812
GIT binary patch
literal 47894
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

literal 0
HcmV?d00001

diff --git a/app/code/Magento/MediaGalleryMetadata/Test/_files/macos-photos.jpeg b/app/code/Magento/MediaGalleryMetadata/Test/_files/macos-photos.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..3a07b6abe788e83cc336eb8b198556c46e7ec911
GIT binary patch
literal 22795
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
L<aM`$-mNzQDffZL

literal 0
HcmV?d00001

diff --git a/app/code/Magento/MediaGalleryMetadata/Test/_files/macos-preview.png b/app/code/Magento/MediaGalleryMetadata/Test/_files/macos-preview.png
new file mode 100644
index 0000000000000000000000000000000000000000..966520f0d01124eec138a9e29298dbe8e2fea5ab
GIT binary patch
literal 57535
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
V<L%D>xo;2f)6+51CZ4mo`(IOuD**ri

literal 0
HcmV?d00001

diff --git a/app/code/Magento/MediaGalleryMetadata/composer.json b/app/code/Magento/MediaGalleryMetadata/composer.json
new file mode 100644
index 0000000000000..c2ce66ce64c36
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/composer.json
@@ -0,0 +1,22 @@
+{
+    "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"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\MediaGalleryMetadata\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/etc/default.xmp b/app/code/Magento/MediaGalleryMetadata/etc/default.xmp
new file mode 100644
index 0000000000000..772b6af671ec6
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/etc/default.xmp
@@ -0,0 +1,24 @@
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 5.4.0">
+   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+      <rdf:Description rdf:about=""
+            xmlns:dc="http://purl.org/dc/elements/1.1/"
+            xmlns:exif="http://ns.adobe.com/exif/1.0/"
+            xmlns:photoshop="http://ns.adobe.com/photoshop/1.0/">
+         <dc:subject>
+            <rdf:Seq>
+               <rdf:li>magento</rdf:li>
+            </rdf:Seq>
+         </dc:subject>
+         <dc:description><rdf:Alt><rdf:li xml:lang="x-default">Magento</rdf:li></rdf:Alt></dc:description>
+         <dc:title><rdf:Alt><rdf:li xml:lang="x-default">Magento</rdf:li></rdf:Alt></dc:title>
+         <dc:subject>
+            <rdf:Bag>
+               <rdf:li>magento</rdf:li>
+               <rdf:li>mediagallerymetadata</rdf:li>
+            </rdf:Bag>
+         </dc:subject>
+      </rdf:Description>
+   </rdf:RDF>
+</x:xmpmeta>
+<?xpacket end="w"?>
\ No newline at end of file
diff --git a/app/code/Magento/MediaGalleryMetadata/etc/di.xml b/app/code/Magento/MediaGalleryMetadata/etc/di.xml
new file mode 100644
index 0000000000000..d2f1f90510488
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/etc/di.xml
@@ -0,0 +1,127 @@
+<?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">
+    <preference for="Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterface" type="Magento\MediaGalleryMetadata\Model\Metadata"/>
+    <preference for="Magento\MediaGalleryMetadataApi\Api\AddMetadataInterface" type="Magento\MediaGalleryMetadataApi\Model\AddMetadataComposite"/>
+    <preference for="Magento\MediaGalleryMetadataApi\Api\ExtractMetadataInterface" type="Magento\MediaGalleryMetadataApi\Model\ExtractMetadataComposite"/>
+    <preference for="Magento\MediaGalleryMetadataApi\Model\FileInterface" type="Magento\MediaGalleryMetadata\Model\File"/>
+    <preference for="Magento\MediaGalleryMetadataApi\Model\SegmentInterface" type="Magento\MediaGalleryMetadata\Model\Segment"/>
+    <type name="Magento\MediaGalleryMetadataApi\Model\ExtractMetadataComposite">
+        <arguments>
+            <argument name="extractors" xsi:type="array">
+                <item name="jpeg" xsi:type="object">Magento\MediaGalleryMetadata\Model\Jpeg\ExtractMetadata</item>
+                <item name="png" xsi:type="object">Magento\MediaGalleryMetadata\Model\Png\ExtractMetadata</item>
+                <item name="gif" xsi:type="object">Magento\MediaGalleryMetadata\Model\Gif\ExtractMetadata</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\MediaGalleryMetadataApi\Model\AddMetadataComposite">
+        <arguments>
+            <argument name="writers" xsi:type="array">
+                <item name="jpeg" xsi:type="object">Magento\MediaGalleryMetadata\Model\Jpeg\AddMetadata</item>
+                <item name="png" xsi:type="object">Magento\MediaGalleryMetadata\Model\Png\AddMetadata</item>
+                <item name="gif" xsi:type="object">Magento\MediaGalleryMetadata\Model\Gif\AddMetadata</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\MediaGalleryMetadata\Model\Gif\ReadFile">
+        <arguments>
+            <argument name="driver" xsi:type="object">Magento\Framework\Filesystem\Driver\File</argument>
+        </arguments>
+    </type>
+    <type name="Magento\MediaGalleryMetadata\Model\Jpeg\ReadFile">
+        <arguments>
+            <argument name="driver" xsi:type="object">Magento\Framework\Filesystem\Driver\File</argument>
+        </arguments>
+    </type>
+    <type name="Magento\MediaGalleryMetadata\Model\Png\ReadFile">
+        <arguments>
+            <argument name="driver" xsi:type="object">Magento\Framework\Filesystem\Driver\File</argument>
+        </arguments>
+    </type>
+    <type name="Magento\MediaGalleryMetadata\Model\Jpeg\WriteFile">
+        <arguments>
+            <argument name="driver" xsi:type="object">Magento\Framework\Filesystem\Driver\File</argument>
+        </arguments>
+    </type>
+    <type name="Magento\MediaGalleryMetadata\Model\Png\WriteFile">
+        <arguments>
+            <argument name="driver" xsi:type="object">Magento\Framework\Filesystem\Driver\File</argument>
+        </arguments>
+    </type>
+    <type name="Magento\MediaGalleryMetadata\Model\Gif\WriteFile">
+        <arguments>
+            <argument name="driver" xsi:type="object">Magento\Framework\Filesystem\Driver\File</argument>
+        </arguments>
+    </type>
+    <type name="Magento\MediaGalleryMetadata\Model\XmpTemplate">
+        <arguments>
+            <argument name="driver" xsi:type="object">Magento\Framework\Filesystem\Driver\File</argument>
+        </arguments>
+    </type>
+    <type name="Magento\MediaGalleryMetadata\Model\AddIptcMetadata">
+        <arguments>
+            <argument name="driver" xsi:type="object">Magento\Framework\Filesystem\Driver\File</argument>
+        </arguments>
+    </type>
+    <virtualType name="Magento\MediaGalleryMetadata\Model\Jpeg\AddMetadata" type="Magento\MediaGalleryMetadata\Model\File\AddMetadata">
+        <arguments>
+            <argument name="fileReader" xsi:type="object">Magento\MediaGalleryMetadata\Model\Jpeg\ReadFile</argument>
+            <argument name="fileWriter" xsi:type="object">Magento\MediaGalleryMetadata\Model\Jpeg\WriteFile</argument>
+            <argument name="segmentWriters" xsi:type="array">
+                <item name="xmp" xsi:type="object">Magento\MediaGalleryMetadata\Model\Jpeg\Segment\WriteXmp</item>
+                <item name="iptc" xsi:type="object">Magento\MediaGalleryMetadata\Model\Jpeg\Segment\WriteIptc</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\MediaGalleryMetadata\Model\Png\AddMetadata" type="Magento\MediaGalleryMetadata\Model\File\AddMetadata">
+        <arguments>
+            <argument name="fileReader" xsi:type="object">Magento\MediaGalleryMetadata\Model\Png\ReadFile</argument>
+            <argument name="fileWriter" xsi:type="object">Magento\MediaGalleryMetadata\Model\Png\WriteFile</argument>
+            <argument name="segmentWriters" xsi:type="array">
+                <item name="xmp" xsi:type="object">Magento\MediaGalleryMetadata\Model\Png\Segment\WriteXmp</item>
+                <item name="iptc" xsi:type="object">Magento\MediaGalleryMetadata\Model\Png\Segment\WriteIptc</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\MediaGalleryMetadata\Model\Gif\AddMetadata" type="Magento\MediaGalleryMetadata\Model\File\AddMetadata">
+        <arguments>
+            <argument name="fileReader" xsi:type="object">Magento\MediaGalleryMetadata\Model\Gif\ReadFile</argument>
+            <argument name="fileWriter" xsi:type="object">Magento\MediaGalleryMetadata\Model\Gif\WriteFile</argument>
+            <argument name="segmentWriters" xsi:type="array">
+                <item name="xmp" xsi:type="object">Magento\MediaGalleryMetadata\Model\Gif\Segment\WriteXmp</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\MediaGalleryMetadata\Model\Gif\ExtractMetadata" type="Magento\MediaGalleryMetadata\Model\File\ExtractMetadata">
+        <arguments>
+            <argument name="fileReader" xsi:type="object">Magento\MediaGalleryMetadata\Model\Gif\ReadFile</argument>
+            <argument name="segmentReaders" xsi:type="array">
+                <item name="xmp" xsi:type="object">Magento\MediaGalleryMetadata\Model\Gif\Segment\ReadXmp</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\MediaGalleryMetadata\Model\Png\ExtractMetadata" type="Magento\MediaGalleryMetadata\Model\File\ExtractMetadata">
+        <arguments>
+            <argument name="fileReader" xsi:type="object">Magento\MediaGalleryMetadata\Model\Png\ReadFile</argument>
+            <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>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\MediaGalleryMetadata\Model\Jpeg\ExtractMetadata" type="Magento\MediaGalleryMetadata\Model\File\ExtractMetadata">
+        <arguments>
+            <argument name="fileReader" xsi:type="object">Magento\MediaGalleryMetadata\Model\Jpeg\ReadFile</argument>
+            <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>
+            </argument>
+        </arguments>
+    </virtualType>
+</config>
diff --git a/app/code/Magento/MediaGalleryMetadata/etc/module.xml b/app/code/Magento/MediaGalleryMetadata/etc/module.xml
new file mode 100644
index 0000000000000..776b05aecd284
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/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_MediaGalleryMetadata"/>
+</config>
diff --git a/app/code/Magento/MediaGalleryMetadata/registration.php b/app/code/Magento/MediaGalleryMetadata/registration.php
new file mode 100644
index 0000000000000..fcf6789d9321f
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/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_MediaGalleryMetadata',
+    __DIR__
+);
diff --git a/app/code/Magento/MediaGalleryMetadataApi/Api/AddMetadataInterface.php b/app/code/Magento/MediaGalleryMetadataApi/Api/AddMetadataInterface.php
new file mode 100644
index 0000000000000..df645681e8971
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadataApi/Api/AddMetadataInterface.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadataApi\Api;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterface;
+
+/**
+ * Add metadata to asset file
+ */
+interface AddMetadataInterface
+{
+    /**
+     * Add metadata to the asset file
+     *
+     * @param string $path
+     * @param MetadataInterface $metadata
+     * @throws LocalizedException
+     */
+    public function execute(string $path, MetadataInterface $metadata): void;
+}
diff --git a/app/code/Magento/MediaGalleryMetadataApi/Api/Data/MetadataInterface.php b/app/code/Magento/MediaGalleryMetadataApi/Api/Data/MetadataInterface.php
new file mode 100644
index 0000000000000..63e943150f4a7
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadataApi/Api/Data/MetadataInterface.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadataApi\Api\Data;
+
+use Magento\Framework\Api\ExtensibleDataInterface;
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataExtensionInterface;
+
+/**
+ * Media asset metadata data transfer object
+ */
+interface MetadataInterface extends ExtensibleDataInterface
+{
+    /**
+     * Get asset title
+     *
+     * @return null|string
+     */
+    public function getTitle(): ?string;
+
+    /**
+     * Get asset description
+     *
+     * @return null|string
+     */
+    public function getDescription(): ?string;
+
+    /**
+     * Get asset keywords
+     *
+     * @return null|array
+     */
+    public function getKeywords(): ?array;
+
+    /**
+     * Get extension attributes
+     *
+     * @return \Magento\MediaGalleryMetadataApi\Api\Data\MetadataExtensionInterface|null
+     */
+    public function getExtensionAttributes(): ?MetadataExtensionInterface;
+
+    /**
+     * Set extension attributes
+     *
+     * @param \Magento\MediaGalleryMetadataApi\Api\Data\MetadataExtensionInterface|null $extensionAttributes
+     * @return void
+     */
+    public function setExtensionAttributes(?MetadataExtensionInterface $extensionAttributes): void;
+}
diff --git a/app/code/Magento/MediaGalleryMetadataApi/Api/ExtractMetadataInterface.php b/app/code/Magento/MediaGalleryMetadataApi/Api/ExtractMetadataInterface.php
new file mode 100644
index 0000000000000..2327406db8bef
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadataApi/Api/ExtractMetadataInterface.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadataApi\Api;
+
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterface;
+
+/**
+ * Extract asset metadata
+ */
+interface ExtractMetadataInterface
+{
+    /**
+     * Extract metadata from the asset file
+     *
+     * @param string $path
+     * @return MetadataInterface
+     */
+    public function execute(string $path): MetadataInterface;
+}
diff --git a/app/code/Magento/MediaGalleryMetadataApi/LICENSE.txt b/app/code/Magento/MediaGalleryMetadataApi/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadataApi/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/MediaGalleryMetadataApi/LICENSE_AFL.txt b/app/code/Magento/MediaGalleryMetadataApi/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadataApi/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/MediaGalleryMetadataApi/Model/AddMetadataComposite.php b/app/code/Magento/MediaGalleryMetadataApi/Model/AddMetadataComposite.php
new file mode 100644
index 0000000000000..fc3f53313199d
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadataApi/Model/AddMetadataComposite.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadataApi\Model;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\MediaGalleryMetadataApi\Api\AddMetadataInterface;
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterface;
+
+/**
+ * Metadata writer pool
+ */
+class AddMetadataComposite implements AddMetadataInterface
+{
+    /**
+     * @var AddMetadataInterface[]
+     */
+    private $writers;
+
+    /**
+     * @param AddMetadataInterface[] $writers
+     */
+    public function __construct(array $writers)
+    {
+        $this->writers = $writers;
+    }
+
+    /**
+     * Write metadata to the path
+     *
+     * @param string $path
+     * @param MetadataInterface $data
+     * @throws LocalizedException
+     */
+    public function execute(string $path, MetadataInterface $data): void
+    {
+        foreach ($this->writers as $writer) {
+            if (!$writer instanceof AddMetadataInterface) {
+                throw new \InvalidArgumentException(
+                    __(get_class($writer) . ' must implement ' . AddMetadataInterface::class)
+                );
+            }
+
+            $writer->execute($path, $data);
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadataApi/Model/ExtractMetadataComposite.php b/app/code/Magento/MediaGalleryMetadataApi/Model/ExtractMetadataComposite.php
new file mode 100644
index 0000000000000..0d6e8aa345178
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadataApi/Model/ExtractMetadataComposite.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadataApi\Model;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterface;
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterfaceFactory;
+use Magento\MediaGalleryMetadataApi\Api\ExtractMetadataInterface;
+
+/**
+ * Metadata extractor composite
+ */
+class ExtractMetadataComposite implements ExtractMetadataInterface
+{
+    /**
+     * @var ExtractMetadataInterface[]
+     */
+    private $extractors;
+
+    /**
+     * @var MetadataInterfaceFactory
+     */
+    private $metadataFactory;
+
+    /**
+     * @param MetadataInterfaceFactory $metadataFactory
+     * @param ExtractMetadataInterface[] $extractors
+     */
+    public function __construct(
+        MetadataInterfaceFactory $metadataFactory,
+        array $extractors
+    ) {
+        $this->metadataFactory = $metadataFactory;
+        $this->extractors = $extractors;
+    }
+
+    /**
+     * Extract metadata from file
+     *
+     * @param string $path
+     * @return MetadataInterface
+     * @throws LocalizedException
+     */
+    public function execute(string $path): MetadataInterface
+    {
+        $title = null;
+        $description = null;
+        $keywords = [];
+
+        foreach ($this->extractors as $extractor) {
+            if (!$extractor instanceof ExtractMetadataInterface) {
+                throw new \InvalidArgumentException(
+                    __(get_class($extractor) . ' must implement ' . ExtractMetadataInterface::class)
+                );
+            }
+
+            $data = $extractor->execute($path);
+            $title = !empty($data->getTitle()) ? $data->getTitle() : $title;
+            $description = !empty($data->getDescription()) ? $data->getDescription() : $description;
+
+            if (!empty($data->getKeywords())) {
+                foreach ($data->getKeywords() as $keyword) {
+                    $keywords[] = $keyword;
+                }
+            }
+        }
+        return $this->metadataFactory->create([
+            'title' => $title,
+            'description' => $description,
+            'keywords' => empty($keywords) ? null : array_unique($keywords)
+        ]);
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadataApi/Model/FileInterface.php b/app/code/Magento/MediaGalleryMetadataApi/Model/FileInterface.php
new file mode 100644
index 0000000000000..0cd01bbf57c64
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadataApi/Model/FileInterface.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadataApi\Model;
+
+use Magento\Framework\Api\ExtensibleDataInterface;
+use Magento\MediaGalleryMetadataApi\Model\FileExtensionInterface;
+
+/**
+ * File internal data transfer object
+ */
+interface FileInterface extends ExtensibleDataInterface
+{
+    /**
+     * Get file path
+     *
+     * @return string
+     */
+    public function getPath(): string;
+
+    /**
+     * Get metadata sections
+     *
+     * @return SegmentInterface[]
+     */
+    public function getSegments(): array;
+
+    /**
+     * Get extension attributes
+     *
+     * @return \Magento\MediaGalleryMetadataApi\Model\FileExtensionInterface|null
+     */
+    public function getExtensionAttributes(): ?FileExtensionInterface;
+
+    /**
+     * Set extension attributes
+     *
+     * @param \Magento\MediaGalleryMetadataApi\Model\FileExtensionInterface|null $extensionAttributes
+     * @return void
+     */
+    public function setExtensionAttributes(?FileExtensionInterface $extensionAttributes): void;
+}
diff --git a/app/code/Magento/MediaGalleryMetadataApi/Model/ReadFileInterface.php b/app/code/Magento/MediaGalleryMetadataApi/Model/ReadFileInterface.php
new file mode 100644
index 0000000000000..e45a934f7b5ad
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadataApi/Model/ReadFileInterface.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadataApi\Model;
+
+/**
+ * File reader
+ */
+interface ReadFileInterface
+{
+    /**
+     * Create file object from the file
+     *
+     * @param string $path
+     * @return FileInterface
+     */
+    public function execute(string $path): FileInterface;
+}
diff --git a/app/code/Magento/MediaGalleryMetadataApi/Model/ReadMetadataInterface.php b/app/code/Magento/MediaGalleryMetadataApi/Model/ReadMetadataInterface.php
new file mode 100644
index 0000000000000..b6d97118f848b
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadataApi/Model/ReadMetadataInterface.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadataApi\Model;
+
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterface;
+
+/**
+ * Metadata reader
+ */
+interface ReadMetadataInterface
+{
+    /**
+     * Read metadata from the file
+     *
+     * @param FileInterface $file
+     * @return MetadataInterface
+     * @throws LocalizedException
+     * @throws FileSystemException
+     */
+    public function execute(FileInterface $file): MetadataInterface;
+}
diff --git a/app/code/Magento/MediaGalleryMetadataApi/Model/SegmentInterface.php b/app/code/Magento/MediaGalleryMetadataApi/Model/SegmentInterface.php
new file mode 100644
index 0000000000000..bf6cdc30306f8
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadataApi/Model/SegmentInterface.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadataApi\Model;
+
+use Magento\Framework\Api\ExtensibleDataInterface;
+use Magento\MediaGalleryMetadataApi\Model\SegmentExtensionInterface;
+
+/**
+ * Segment internal data transfer object
+ */
+interface SegmentInterface extends ExtensibleDataInterface
+{
+    /**
+     * Get segment name
+     *
+     * @return string
+     */
+    public function getName(): string;
+
+    /**
+     * Get segment data
+     *
+     * @return string
+     */
+    public function getData(): string;
+
+    /**
+     * Get extension attributes
+     *
+     * @return \Magento\MediaGalleryMetadataApi\Model\SegmentExtensionInterface|null
+     */
+    public function getExtensionAttributes(): ?SegmentExtensionInterface;
+
+    /**
+     * Set extension attributes
+     *
+     * @param \Magento\MediaGalleryMetadataApi\Model\SegmentExtensionInterface|null $extensionAttributes
+     * @return void
+     */
+    public function setExtensionAttributes(?SegmentExtensionInterface $extensionAttributes): void;
+}
diff --git a/app/code/Magento/MediaGalleryMetadataApi/Model/WriteFileInterface.php b/app/code/Magento/MediaGalleryMetadataApi/Model/WriteFileInterface.php
new file mode 100644
index 0000000000000..fe7579989c40f
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadataApi/Model/WriteFileInterface.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadataApi\Model;
+
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * File writer
+ */
+interface WriteFileInterface
+{
+    /**
+     * Write file to filesystem
+     *
+     * @param FileInterface $file
+     * @throws LocalizedException
+     * @throws FileSystemException
+     */
+    public function execute(FileInterface $file): void;
+}
diff --git a/app/code/Magento/MediaGalleryMetadataApi/Model/WriteMetadataInterface.php b/app/code/Magento/MediaGalleryMetadataApi/Model/WriteMetadataInterface.php
new file mode 100644
index 0000000000000..943879ebaec86
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadataApi/Model/WriteMetadataInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadataApi\Model;
+
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterface;
+
+/**
+ * Metadata writer
+ */
+interface WriteMetadataInterface
+{
+    /**
+     * Add metadata to the file
+     *
+     * @param FileInterface $file
+     * @param MetadataInterface $data
+     */
+    public function execute(FileInterface $file, MetadataInterface $data): FileInterface;
+}
diff --git a/app/code/Magento/MediaGalleryMetadataApi/README.md b/app/code/Magento/MediaGalleryMetadataApi/README.md
new file mode 100644
index 0000000000000..82f86d2f61c6d
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadataApi/README.md
@@ -0,0 +1,3 @@
+# Magento_MediaGalleryMetadataApi
+
+The Magento_MediaGalleryMetadataApi module is responsible for the media gallery metadata implementation API.
diff --git a/app/code/Magento/MediaGalleryMetadataApi/composer.json b/app/code/Magento/MediaGalleryMetadataApi/composer.json
new file mode 100644
index 0000000000000..f8673884b050c
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadataApi/composer.json
@@ -0,0 +1,21 @@
+{
+    "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"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\MediaGalleryMetadataApi\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadataApi/etc/module.xml b/app/code/Magento/MediaGalleryMetadataApi/etc/module.xml
new file mode 100644
index 0000000000000..77adbc6efff88
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadataApi/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_MediaGalleryMetadataApi"/>
+</config>
diff --git a/app/code/Magento/MediaGalleryMetadataApi/registration.php b/app/code/Magento/MediaGalleryMetadataApi/registration.php
new file mode 100644
index 0000000000000..90988681a5483
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadataApi/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_MediaGalleryMetadataApi',
+    __DIR__
+);
diff --git a/app/code/Magento/MediaGalleryRenditions/LICENSE.txt b/app/code/Magento/MediaGalleryRenditions/LICENSE.txt
new file mode 100644
index 0000000000000..36b2459f6aa63
--- /dev/null
+++ b/app/code/Magento/MediaGalleryRenditions/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.
diff --git a/app/code/Magento/MediaGalleryRenditions/LICENSE_AFL.txt b/app/code/Magento/MediaGalleryRenditions/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/MediaGalleryRenditions/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/MediaGalleryRenditions/README.md b/app/code/Magento/MediaGalleryRenditions/README.md
new file mode 100644
index 0000000000000..df856e8003a84
--- /dev/null
+++ b/app/code/Magento/MediaGalleryRenditions/README.md
@@ -0,0 +1,13 @@
+# Magento_MediaGalleryRenditions module
+
+The Magento_MediaGalleryRenditions module implements height and width fields for for media gallery items.
+
+## Extensibility
+
+Extension developers can interact with the Magento_MediaGalleryRenditions module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
+
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_MediaGalleryRenditions module.
+
+## Additional information
+
+For information about significant changes in patch releases, see [2.3.x Release information](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html).
diff --git a/app/code/Magento/MediaGalleryRenditions/composer.json b/app/code/Magento/MediaGalleryRenditions/composer.json
new file mode 100644
index 0000000000000..50b18752fc506
--- /dev/null
+++ b/app/code/Magento/MediaGalleryRenditions/composer.json
@@ -0,0 +1,21 @@
+{
+    "name": "magento/module-media-gallery-renditions",
+    "description": "Magento module that implements height and width fields for for media gallery items.",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\MediaGalleryRenditions\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGalleryRenditions/etc/adminhtml/system.xml b/app/code/Magento/MediaGalleryRenditions/etc/adminhtml/system.xml
new file mode 100644
index 0000000000000..f23f94f186f68
--- /dev/null
+++ b/app/code/Magento/MediaGalleryRenditions/etc/adminhtml/system.xml
@@ -0,0 +1,24 @@
+<?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="system">
+            <group id="media_gallery_renditions" translate="label" type="text" sortOrder="1010" showInDefault="1" showInWebsite="0" showInStore="0">
+                <label>Media Gallery Renditions</label>
+                <field id="width" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Width</label>
+                    <validate>validate-zero-or-greater validate-digits</validate>
+                </field>
+                <field id="height" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Height</label>
+                    <validate>validate-zero-or-greater validate-digits</validate>
+                </field>
+            </group>
+        </section>
+    </system>
+</config>
diff --git a/app/code/Magento/MediaGalleryRenditions/etc/config.xml b/app/code/Magento/MediaGalleryRenditions/etc/config.xml
new file mode 100644
index 0000000000000..58c5aa1f11fd2
--- /dev/null
+++ b/app/code/Magento/MediaGalleryRenditions/etc/config.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:module:Magento_Store:etc/config.xsd">
+    <default>
+        <system>
+            <media_gallery_renditions>
+                <width>1000</width>
+                <height>1000</height>
+            </media_gallery_renditions>
+        </system>
+    </default>
+</config>
diff --git a/app/code/Magento/MediaGalleryRenditions/etc/module.xml b/app/code/Magento/MediaGalleryRenditions/etc/module.xml
new file mode 100644
index 0000000000000..792a9e128cc40
--- /dev/null
+++ b/app/code/Magento/MediaGalleryRenditions/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_MediaGalleryRenditions" />
+</config>
diff --git a/app/code/Magento/MediaGalleryRenditions/registration.php b/app/code/Magento/MediaGalleryRenditions/registration.php
new file mode 100644
index 0000000000000..275c06f752a63
--- /dev/null
+++ b/app/code/Magento/MediaGalleryRenditions/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_MediaGalleryRenditions',
+    __DIR__
+);
diff --git a/app/code/Magento/MediaGalleryRenditionsApi/LICENSE.txt b/app/code/Magento/MediaGalleryRenditionsApi/LICENSE.txt
new file mode 100644
index 0000000000000..36b2459f6aa63
--- /dev/null
+++ b/app/code/Magento/MediaGalleryRenditionsApi/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.
diff --git a/app/code/Magento/MediaGalleryRenditionsApi/LICENSE_AFL.txt b/app/code/Magento/MediaGalleryRenditionsApi/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/MediaGalleryRenditionsApi/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/MediaGalleryRenditionsApi/Model/Config.php b/app/code/Magento/MediaGalleryRenditionsApi/Model/Config.php
new file mode 100644
index 0000000000000..e558f23ab9608
--- /dev/null
+++ b/app/code/Magento/MediaGalleryRenditionsApi/Model/Config.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryRenditionsApi\Model;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
+/**
+ * Class responsible for providing access to Media Gallery Renditions system configuration.
+ */
+class Config
+{
+    /**
+     * Config path for Media Gallery Renditions Width
+     */
+    private const XML_PATH_MEDIA_GALLERY_RENDITIONS_WIDTH_PATH = 'system/media_gallery_renditions/width';
+
+    /**
+     * Config path for Media Gallery Renditions Height
+     */
+    private const XML_PATH_MEDIA_GALLERY_RENDITIONS_HEIGHT_PATH = 'system/media_gallery_renditions/height';
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * Config constructor.
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(
+        ScopeConfigInterface $scopeConfig
+    ) {
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * Get max width
+     *
+     * @return int
+     */
+    public function getWidth(): int
+    {
+        return $this->scopeConfig->getValue(self::XML_PATH_MEDIA_GALLERY_RENDITIONS_WIDTH_PATH);
+    }
+
+    /**
+     * Get max height
+     *
+     * @return int
+     */
+    public function getHeight(): int
+    {
+        return $this->scopeConfig->getValue(self::XML_PATH_MEDIA_GALLERY_RENDITIONS_HEIGHT_PATH);
+    }
+}
diff --git a/app/code/Magento/MediaGalleryRenditionsApi/README.md b/app/code/Magento/MediaGalleryRenditionsApi/README.md
new file mode 100644
index 0000000000000..42478c0c9b520
--- /dev/null
+++ b/app/code/Magento/MediaGalleryRenditionsApi/README.md
@@ -0,0 +1,13 @@
+# Magento_MediaGalleryRenditionsApi module
+
+The Magento_MediaGalleryRenditionsApi module is responsible for the API implementation of Media Gallery Renditions.
+
+## Extensibility
+
+Extension developers can interact with the Magento_MediaGalleryRenditions module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
+
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_MediaGalleryRenditionsApi module.
+
+## Additional information
+
+For information about significant changes in patch releases, see [2.3.x Release information](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html).
diff --git a/app/code/Magento/MediaGalleryRenditionsApi/composer.json b/app/code/Magento/MediaGalleryRenditionsApi/composer.json
new file mode 100644
index 0000000000000..6e3c559f001c1
--- /dev/null
+++ b/app/code/Magento/MediaGalleryRenditionsApi/composer.json
@@ -0,0 +1,21 @@
+{
+    "name": "magento/module-media-gallery-renditions-api",
+    "description": "Magento module that is responsible for the API implementation of Media Gallery Renditions.",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\MediaGalleryRenditionsApi\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGalleryRenditionsApi/etc/module.xml b/app/code/Magento/MediaGalleryRenditionsApi/etc/module.xml
new file mode 100644
index 0000000000000..64efa325ec791
--- /dev/null
+++ b/app/code/Magento/MediaGalleryRenditionsApi/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_MediaGalleryRenditionsApi" />
+</config>
diff --git a/app/code/Magento/MediaGalleryRenditionsApi/registration.php b/app/code/Magento/MediaGalleryRenditionsApi/registration.php
new file mode 100644
index 0000000000000..bf057f2d2adbf
--- /dev/null
+++ b/app/code/Magento/MediaGalleryRenditionsApi/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_MediaGalleryRenditionsApi',
+    __DIR__
+);
diff --git a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/Search.php b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/Search.php
new file mode 100644
index 0000000000000..b4b6713f47065
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/Search.php
@@ -0,0 +1,169 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Controller\Adminhtml\Asset;
+
+use Exception;
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Cms\Helper\Wysiwyg\Images;
+use Magento\Cms\Model\Wysiwyg\Images\Storage;
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\Search\FilterGroupBuilder;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\MediaGalleryApi\Api\SearchAssetsInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Controller getting the asset options for multiselect filter
+ */
+class Search extends Action implements HttpGetActionInterface
+{
+    private const HTTP_OK = 200;
+    private const HTTP_INTERNAL_ERROR = 500;
+    private const HTTP_BAD_REQUEST = 400;
+
+    /**
+     * @see _isAllowed()
+     */
+    public const ADMIN_RESOURCE = 'Magento_Cms::media_gallery';
+
+    /**
+     * @var SearchAssetsInterface
+     */
+    private $searchAssets;
+
+    /**
+     * @param SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var Images
+     */
+    private $images;
+
+    /**
+     * @var FilterBuilder
+     */
+    private $filterBuilder;
+
+    /**
+     * @var Storage
+     */
+    private $storage;
+
+    /**
+     * @var FilterGroupBuilder
+     */
+    private $filterGroupBuilder;
+
+    /**
+     * @param FilterBuilder $filterBuilder
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param FilterGroupBuilder $filterGroupBuilder
+     * @param SearchAssetsInterface $searchAssets
+     * @param Context $context
+     * @param LoggerInterface $logger
+     * @param Images $images
+     * @param Storage $storage
+     */
+    public function __construct(
+        FilterBuilder $filterBuilder,
+        SearchCriteriaBuilder $searchCriteriaBuilder,
+        FilterGroupBuilder $filterGroupBuilder,
+        SearchAssetsInterface $searchAssets,
+        Context $context,
+        LoggerInterface $logger,
+        Images $images,
+        Storage $storage
+    ) {
+        parent::__construct($context);
+
+        $this->filterBuilder = $filterBuilder;
+        $this->filterGroupBuilder = $filterGroupBuilder;
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+        $this->logger = $logger;
+        $this->searchAssets = $searchAssets;
+        $this->images = $images;
+        $this->storage = $storage;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function execute()
+    {
+        /** @var Json $resultJson */
+        $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+        $searchKey = $this->getRequest()->getParam('searchKey');
+        $limit = $this->getRequest()->getParam('limit');
+        $pageNum = $this->getRequest()->getParam('page');
+        $responseContent = [];
+
+        if (!$searchKey) {
+            return $resultJson->setData([
+                'options' => [],
+                'total' => 0
+            ]);
+        }
+
+        try {
+            $titleFilter = $this->filterBuilder->setField('title')
+                ->setConditionType('fulltext')
+                ->setValue($searchKey)
+                ->create();
+            $searchCriteria = $this->searchCriteriaBuilder
+                ->setFilterGroups([$this->filterGroupBuilder->setFilters([$titleFilter])->create()])
+                ->setPageSize($limit)
+                ->setCurrentPage($pageNum < 2 ? 0 : $pageNum)
+                ->create();
+
+            $assets = $this->searchAssets->execute($searchCriteria);
+
+            if (!empty($assets)) {
+                foreach ($assets as $asset) {
+                    $responseContent['options'][] = [
+                        'value' => $asset->getId(),
+                        'label' => $asset->getTitle(),
+                        'path' => $this->storage->getThumbnailUrl($this->images->getStorageRoot() . $asset->getPath())
+                    ];
+                    $responseContent['total'] = count($responseContent['options']);
+                }
+            }
+
+            $responseCode = self::HTTP_OK;
+        } catch (LocalizedException $exception) {
+            $responseCode = self::HTTP_BAD_REQUEST;
+            $responseContent = [
+                'success' => false,
+                'message' => $exception->getMessage(),
+            ];
+        } catch (Exception $exception) {
+            $this->logger->critical($exception);
+            $responseCode = self::HTTP_INTERNAL_ERROR;
+            $responseContent = [
+                'success' => false,
+                'message' => __('An error occurred on attempt to get image details.'),
+            ];
+        }
+
+        $resultJson->setHttpResponseCode($responseCode);
+        $resultJson->setData($responseContent);
+
+        return $resultJson;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Directories/Create.php b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Directories/Create.php
new file mode 100644
index 0000000000000..3d4af88e4ad67
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Directories/Create.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Controller\Adminhtml\Directories;
+
+use Exception;
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\MediaGalleryApi\Api\CreateDirectoriesByPathsInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Controller to create the folders
+ */
+class Create extends Action implements HttpPostActionInterface
+{
+    private const HTTP_OK = 200;
+    private const HTTP_INTERNAL_ERROR = 500;
+    private const HTTP_BAD_REQUEST = 400;
+
+    /**
+     * @see _isAllowed()
+     */
+    public const ADMIN_RESOURCE = 'Magento_Cms::media_gallery';
+
+    /**
+     * @var CreateDirectoriesByPathsInterface
+     */
+    private $createDirectoriesByPaths;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @param Context $context
+     * @param CreateDirectoriesByPathsInterface $createDirectoriesByPaths
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        Context $context,
+        CreateDirectoriesByPathsInterface $createDirectoriesByPaths,
+        LoggerInterface $logger
+    ) {
+        parent::__construct($context);
+
+        $this->createDirectoriesByPaths = $createDirectoriesByPaths;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Create folder by provided path.
+     */
+    public function execute()
+    {
+        /** @var Json $resultJson */
+        $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+        $paths = $this->getRequest()->getParam('paths');
+
+        if (!$paths) {
+            $responseContent = [
+                'success' => false,
+                'message' => __('Folder paths parameter is required.'),
+            ];
+            $resultJson->setHttpResponseCode(self::HTTP_BAD_REQUEST);
+            $resultJson->setData($responseContent);
+
+            return $resultJson;
+        }
+
+        try {
+            $this->createDirectoriesByPaths->execute($paths);
+
+            $responseCode = self::HTTP_OK;
+            $responseContent = [
+                'success' => true,
+                'message' => __('You have successfully created the folder.'),
+            ];
+        } catch (LocalizedException $exception) {
+            $responseCode = self::HTTP_BAD_REQUEST;
+            $responseContent = [
+                'success' => false,
+                'message' => $exception->getMessage(),
+            ];
+        } catch (Exception $exception) {
+            $this->logger->critical($exception);
+            $responseCode = self::HTTP_INTERNAL_ERROR;
+            $responseContent = [
+                'success' => false,
+                'message' => __('An error occurred on attempt to create folder.'),
+            ];
+        }
+
+        $resultJson->setHttpResponseCode($responseCode);
+        $resultJson->setData($responseContent);
+
+        return $resultJson;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Directories/Delete.php b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Directories/Delete.php
new file mode 100644
index 0000000000000..56f12c5139d65
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Directories/Delete.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Controller\Adminhtml\Directories;
+
+use Exception;
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\MediaGalleryApi\Api\DeleteAssetsByPathsInterface;
+use Magento\MediaGalleryApi\Api\DeleteDirectoriesByPathsInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Controller deleting the folders
+ */
+class Delete extends Action implements HttpPostActionInterface
+{
+    private const HTTP_OK = 200;
+    private const HTTP_INTERNAL_ERROR = 500;
+    private const HTTP_BAD_REQUEST = 400;
+
+    /**
+     * @see _isAllowed()
+     */
+    public const ADMIN_RESOURCE = 'Magento_Cms::media_gallery';
+
+    /**
+     * @var DeleteAssetsByPathsInterface
+     */
+    private $deleteAssetsByPaths;
+
+    /**
+     * @var DeleteDirectoriesByPathsInterface
+     */
+    private $deleteDirectoriesByPaths;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @param Context $context
+     * @param DeleteAssetsByPathsInterface $deleteAssetsByPaths
+     * @param DeleteDirectoriesByPathsInterface $deleteDirectoriesByPaths
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        Context $context,
+        DeleteAssetsByPathsInterface $deleteAssetsByPaths,
+        DeleteDirectoriesByPathsInterface $deleteDirectoriesByPaths,
+        LoggerInterface $logger
+    ) {
+        parent::__construct($context);
+
+        $this->deleteAssetsByPaths = $deleteAssetsByPaths;
+        $this->deleteDirectoriesByPaths = $deleteDirectoriesByPaths;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Delete folder by provided path.
+     */
+    public function execute()
+    {
+        /** @var Json $resultJson */
+        $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+        $path = $this->getRequest()->getParam('path');
+
+        if (!$path) {
+            $responseContent = [
+                'success' => false,
+                'message' => __('Folder path parameter is required.'),
+            ];
+            $resultJson->setHttpResponseCode(self::HTTP_BAD_REQUEST);
+            $resultJson->setData($responseContent);
+
+            return $resultJson;
+        }
+
+        try {
+            $this->deleteDirectoriesByPaths->execute([$path]);
+            $this->deleteAssetsByPaths->execute([$path]);
+
+            $responseCode = self::HTTP_OK;
+            $responseContent = [
+                'success' => true,
+                'message' => __('You have successfully removed the folder.'),
+            ];
+        } catch (LocalizedException $exception) {
+            $responseCode = self::HTTP_BAD_REQUEST;
+            $responseContent = [
+                'success' => false,
+                'message' => $exception->getMessage(),
+            ];
+        } catch (Exception $exception) {
+            $this->logger->critical($exception);
+            $responseCode = self::HTTP_INTERNAL_ERROR;
+            $responseContent = [
+                'success' => false,
+                'message' => __('An error occurred on attempt to remove folder.'),
+            ];
+        }
+
+        $resultJson->setHttpResponseCode($responseCode);
+        $resultJson->setData($responseContent);
+
+        return $resultJson;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Directories/GetTree.php b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Directories/GetTree.php
new file mode 100644
index 0000000000000..229a717ef13dd
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Directories/GetTree.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Controller\Adminhtml\Directories;
+
+use Magento\Backend\App\Action;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\MediaGalleryUi\Model\Directories\FolderTree;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Returns all available directories
+ */
+class GetTree extends Action implements HttpGetActionInterface
+{
+    private const HTTP_OK = 200;
+    private const HTTP_INTERNAL_ERROR = 500;
+
+    /**
+     * @see _isAllowed()
+     */
+    public const ADMIN_RESOURCE = 'Magento_Cms::media_gallery';
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var FolderTree
+     */
+    private $folderTree;
+
+    /**
+     * Constructor
+     *
+     * @param Action\Context $context
+     * @param LoggerInterface $logger
+     * @param FolderTree $folderTree
+     */
+    public function __construct(
+        Action\Context $context,
+        LoggerInterface $logger,
+        FolderTree $folderTree
+    ) {
+        parent::__construct($context);
+        $this->logger = $logger;
+        $this->folderTree = $folderTree;
+    }
+    /**
+     * @inheritdoc
+     */
+    public function execute()
+    {
+        try {
+            $responseContent[] = $this->folderTree->buildTree();
+            $responseCode = self::HTTP_OK;
+        } catch (\Exception $exception) {
+            $this->logger->critical($exception);
+            $responseCode = self::HTTP_INTERNAL_ERROR;
+            $responseContent = [
+                'success' => false,
+                'message' => __('Retrieving directories list failed.'),
+            ];
+        }
+
+        /** @var Json $resultJson */
+        $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+        $resultJson->setHttpResponseCode($responseCode);
+        $resultJson->setData($responseContent);
+
+        return $resultJson;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Image/Delete.php b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Image/Delete.php
new file mode 100644
index 0000000000000..a5d1cee7abf41
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Image/Delete.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Controller\Adminhtml\Image;
+
+use Exception;
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Cms\Model\Wysiwyg\Images\Storage;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\MediaGalleryApi\Api\GetAssetsByIdsInterface;
+use Magento\MediaGalleryUi\Model\DeleteImage;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Controller deleting the media gallery content
+ */
+class Delete extends Action implements HttpPostActionInterface
+{
+    private const HTTP_OK = 200;
+    private const HTTP_INTERNAL_ERROR = 500;
+    private const HTTP_BAD_REQUEST = 400;
+
+    /**
+     * @see _isAllowed()
+     */
+    public const ADMIN_RESOURCE = 'Magento_Cms::media_gallery';
+
+    /**
+     * @var DeleteImage
+     */
+    private $deleteImage;
+
+    /**
+     * @var GetAssetsByIdsInterface
+     */
+    private $getAssetsByIds;
+
+    /**
+     * @var Storage
+     */
+    private $imagesStorage;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * Delete constructor.
+     *
+     * @param Context $context
+     * @param DeleteImage $deleteImage
+     * @param GetAssetsByIdsInterface $getAssetsByIds
+     * @param Storage $imagesStorage
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        Context $context,
+        DeleteImage $deleteImage,
+        GetAssetsByIdsInterface $getAssetsByIds,
+        Storage $imagesStorage,
+        LoggerInterface $logger
+    ) {
+        parent::__construct($context);
+
+        $this->deleteImage = $deleteImage;
+        $this->getAssetsByIds = $getAssetsByIds;
+        $this->imagesStorage = $imagesStorage;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function execute()
+    {
+        /** @var Json $resultJson */
+        $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+        $imageIds = $this->getRequest()->getParam('ids');
+
+        if (empty($imageIds) || !is_array($imageIds)) {
+            $responseContent = [
+                'success' => false,
+                'message' => __('Image Ids are required and must be of type array.'),
+            ];
+            $resultJson->setHttpResponseCode(self::HTTP_BAD_REQUEST);
+            $resultJson->setData($responseContent);
+
+            return $resultJson;
+        }
+
+        try {
+            $assets = $this->getAssetsByIds->execute($imageIds);
+            $this->deleteImage->execute($assets);
+            $responseCode = self::HTTP_OK;
+            if (count($imageIds) === 1) {
+                $message = __(
+                    'The asset "%title" has been successfully deleted.',
+                    [
+                        'title' => current($assets)->getTitle()
+                    ]
+                );
+            } else {
+                $message = __(
+                    '%count assets have been successfully deleted.',
+                    [
+                        'count' => count($imageIds)
+                    ]
+                );
+            }
+            $responseContent = [
+                'success' => true,
+                'message' => $message,
+            ];
+        } catch (LocalizedException $exception) {
+            $responseCode = self::HTTP_BAD_REQUEST;
+            $responseContent = [
+                'success' => false,
+                'message' => $exception->getMessage(),
+            ];
+        } catch (Exception $exception) {
+            $this->logger->critical($exception);
+            $responseCode = self::HTTP_INTERNAL_ERROR;
+            $responseContent = [
+                'success' => false,
+                'message' => __('An error occurred on attempt to delete image.'),
+            ];
+        }
+
+        $resultJson->setHttpResponseCode($responseCode);
+        $resultJson->setData($responseContent);
+
+        return $resultJson;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Image/Details.php b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Image/Details.php
new file mode 100644
index 0000000000000..d959a070148ed
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Image/Details.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Controller\Adminhtml\Image;
+
+use Exception;
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\MediaGalleryUi\Model\GetDetailsByAssetId;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Controller getting the media gallery image details
+ */
+class Details extends Action implements HttpGetActionInterface
+{
+    private const HTTP_OK = 200;
+    private const HTTP_INTERNAL_ERROR = 500;
+    private const HTTP_BAD_REQUEST = 400;
+
+    /**
+     * @see _isAllowed()
+     */
+    public const ADMIN_RESOURCE = 'Magento_Cms::media_gallery';
+
+    /**
+     * @var GetDetailsByAssetId
+     */
+    private $getDetailsByAssetId;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * Details constructor.
+     *
+     * @param Context $context
+     * @param GetDetailsByAssetId $getDetailsByAssetId
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        Context $context,
+        GetDetailsByAssetId $getDetailsByAssetId,
+        LoggerInterface $logger
+    ) {
+        parent::__construct($context);
+
+        $this->logger = $logger;
+        $this->getDetailsByAssetId = $getDetailsByAssetId;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function execute()
+    {
+        /** @var Json $resultJson */
+        $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+        $ids = $this->getRequest()->getParam('ids');
+
+        if (empty($ids) || !is_array($ids)) {
+            $responseContent = [
+                'success' => false,
+                'message' => __('Assets Ids is required, and must be of type array.'),
+            ];
+            $resultJson->setHttpResponseCode(self::HTTP_BAD_REQUEST);
+            $resultJson->setData($responseContent);
+
+            return $resultJson;
+        }
+
+        try {
+            $details = $this->getDetailsByAssetId->execute($ids);
+
+            $responseCode = self::HTTP_OK;
+            $responseContent = [
+                'success' => true,
+                'imageDetails' => $details
+            ];
+        } catch (LocalizedException $exception) {
+            $responseCode = self::HTTP_BAD_REQUEST;
+            $responseContent = [
+                'success' => false,
+                'message' => $exception->getMessage(),
+            ];
+        } catch (Exception $exception) {
+            $this->logger->critical($exception);
+            $responseCode = self::HTTP_INTERNAL_ERROR;
+            $responseContent = [
+                'success' => false,
+                'message' => __('An error occurred on attempt to get image details.'),
+            ];
+        }
+
+        $resultJson->setHttpResponseCode($responseCode);
+        $resultJson->setData($responseContent);
+
+        return $resultJson;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Image/SaveDetails.php b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Image/SaveDetails.php
new file mode 100644
index 0000000000000..f41c489607b15
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Image/SaveDetails.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Controller\Adminhtml\Image;
+
+use Exception;
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
+use Magento\MediaGalleryApi\Api\Data\AssetKeywordsInterfaceFactory;
+use Magento\MediaGalleryApi\Api\GetAssetsByIdsInterface;
+use Magento\MediaGalleryApi\Api\SaveAssetsInterface;
+use Magento\MediaGalleryApi\Api\SaveAssetsKeywordsInterface;
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterfaceFactory;
+use Magento\MediaGalleryUi\Model\UpdateAsset;
+use Psr\Log\LoggerInterface;
+
+class SaveDetails extends Action implements HttpPostActionInterface
+{
+    private const HTTP_OK = 200;
+    private const HTTP_INTERNAL_ERROR = 500;
+    private const HTTP_BAD_REQUEST = 400;
+
+    /**
+     * @see _isAllowed()
+     */
+    public const ADMIN_RESOURCE = 'Magento_Cms::media_gallery';
+
+    /**
+     * @var UpdateAsset
+     */
+    private $updateAsset;
+
+    /**
+     * @var MetadataInterfaceFactory
+     */
+    private $metadataFactory;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @param Context $context
+     * @param MetadataInterfaceFactory $metadataFactory
+     * @param UpdateAsset $updateAsset
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        Context $context,
+        MetadataInterfaceFactory $metadataFactory,
+        UpdateAsset $updateAsset,
+        LoggerInterface $logger
+    ) {
+        parent::__construct($context);
+
+        $this->metadataFactory = $metadataFactory;
+        $this->updateAsset = $updateAsset;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function execute()
+    {
+        /** @var Json $resultJson */
+        $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+        $assetId = (int) $this->getRequest()->getParam('id');
+        $title = $this->getRequest()->getParam('title');
+        $description = $this->getRequest()->getParam('description');
+        $keywords = (array) $this->getRequest()->getParam('keywords');
+
+        if ($assetId === 0) {
+            $responseContent = [
+                'success' => false,
+                'message' => __('Image ID is required.'),
+            ];
+            $resultJson->setHttpResponseCode(self::HTTP_BAD_REQUEST);
+            $resultJson->setData($responseContent);
+
+            return $resultJson;
+        }
+
+        try {
+            $this->updateAsset->execute(
+                $assetId,
+                $this->metadataFactory->create([
+                    'title' => $title,
+                    'description' => $description,
+                    'keywords' => $keywords
+                ])
+            );
+            $responseCode = self::HTTP_OK;
+            $responseContent = [
+                'success' => true,
+                'message' => __('You have successfully saved the image "%image"', ['image' => $title]),
+            ];
+        } catch (LocalizedException $exception) {
+            $responseCode = self::HTTP_BAD_REQUEST;
+            $responseContent = [
+                'success' => false,
+                'message' => $exception->getMessage(),
+            ];
+        } catch (Exception $exception) {
+            $this->logger->critical($exception);
+            $responseCode = self::HTTP_INTERNAL_ERROR;
+            $responseContent = [
+                'success' => false,
+                'message' => __('An error occurred on attempt to save image.'),
+            ];
+        }
+
+        $resultJson->setHttpResponseCode($responseCode);
+        $resultJson->setData($responseContent);
+
+        return $resultJson;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Image/Upload.php b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Image/Upload.php
new file mode 100644
index 0000000000000..e965d94b33f0c
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Image/Upload.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Controller\Adminhtml\Image;
+
+use Exception;
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Controller\Result\Json;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\MediaGalleryUi\Model\UploadImage;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Controller responsible to upload the media gallery content
+ */
+class Upload extends Action implements HttpPostActionInterface
+{
+    private const HTTP_OK = 200;
+    private const HTTP_BAD_REQUEST = 400;
+
+    /**
+     * @see _isAllowed()
+     */
+    public const ADMIN_RESOURCE = 'Magento_Cms::media_gallery';
+
+    /**
+     * @var UploadImage
+     */
+    private $uploadImage;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @param Context $context
+     * @param UploadImage $upload
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        Context $context,
+        UploadImage $upload,
+        LoggerInterface $logger
+    ) {
+        parent::__construct($context);
+        $this->uploadImage = $upload;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function execute()
+    {
+        /** @var Json $resultJson */
+        $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+        $targetFolder = $this->getRequest()->getParam('target_folder');
+        $type = $this->getRequest()->getParam('type');
+
+        if (!$targetFolder) {
+            $responseContent = [
+                'success' => false,
+                'message' => __('The target_folder parameter is required.'),
+            ];
+            $resultJson->setHttpResponseCode(self::HTTP_BAD_REQUEST);
+            $resultJson->setData($responseContent);
+
+            return $resultJson;
+        }
+
+        try {
+            $this->uploadImage->execute($targetFolder, $type);
+
+            $responseCode = self::HTTP_OK;
+            $responseContent = [
+                'success' => true,
+                'message' => __('The image was uploaded successfully.'),
+            ];
+        } catch (LocalizedException $exception) {
+            $responseCode = self::HTTP_OK;
+            $responseContent = [
+                'success' => false,
+                'message' => $exception->getMessage(),
+            ];
+        } catch (Exception $exception) {
+            $this->logger->critical($exception);
+            $responseCode = self::HTTP_OK;
+            $responseContent = [
+                'success' => false,
+                'message' => __('Could not upload image.'),
+            ];
+        }
+
+        $resultJson->setHttpResponseCode($responseCode);
+        $resultJson->setData($responseContent);
+
+        return $resultJson;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Index/Index.php b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Index/Index.php
new file mode 100644
index 0000000000000..e97d93d86bb0d
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Index/Index.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Controller\Adminhtml\Index;
+
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\View\Result\Layout;
+use Magento\Framework\View\Result\LayoutFactory;
+
+/**
+ * Controller serving the media gallery content
+ */
+class Index extends Action implements HttpGetActionInterface
+{
+    public const ADMIN_RESOURCE = 'Magento_Cms::media_gallery';
+
+    /**
+     * @var LayoutFactory
+     */
+    private $layoutFactory;
+
+    /**
+     * Index constructor.
+     *
+     * @param Context $context
+     * @param LayoutFactory $layoutFactory
+     */
+    public function __construct(
+        Context $context,
+        LayoutFactory $layoutFactory
+    ) {
+        parent::__construct($context);
+        $this->layoutFactory = $layoutFactory;
+    }
+
+    /**
+     * Get the media gallery layout
+     *
+     * @return Layout
+     */
+    public function execute(): Layout
+    {
+        return $this->layoutFactory->create();
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Media/Index.php b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Media/Index.php
new file mode 100644
index 0000000000000..3660374243d16
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Media/Index.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Controller\Adminhtml\Media;
+
+use Magento\Backend\App\Action;
+use Magento\Backend\Model\View\Result\Page;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Controller\ResultInterface;
+
+/**
+ * Controller serving the media gallery content
+ */
+class Index extends Action implements HttpGetActionInterface
+{
+    public const ADMIN_RESOURCE = 'Magento_Cms::media_gallery';
+
+    /**
+     * Get the media gallery layout
+     *
+     * @return ResultInterface
+     */
+    public function execute(): ResultInterface
+    {
+        /** @var Page $resultPage */
+        $resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
+        $resultPage->setActiveMenu('Magento_MediaGalleryUi::media_gallery')
+            ->addBreadcrumb(__('Media'), __('Media Gallery'));
+        $resultPage->getConfig()->getTitle()->prepend(__('Manage Gallery'));
+
+        return $resultPage;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/LICENSE.txt b/app/code/Magento/MediaGalleryUi/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/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/MediaGalleryUi/LICENSE_AFL.txt b/app/code/Magento/MediaGalleryUi/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/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/MediaGalleryUi/Model/AssetDetailsProvider/CreatedAt.php b/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/CreatedAt.php
new file mode 100644
index 0000000000000..7c3eccfea521f
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/CreatedAt.php
@@ -0,0 +1,59 @@
+<?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
new file mode 100644
index 0000000000000..b2b0f389f6b9a
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Height.php
@@ -0,0 +1,33 @@
+<?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
new file mode 100644
index 0000000000000..55841cc5abd3f
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Size.php
@@ -0,0 +1,49 @@
+<?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
new file mode 100644
index 0000000000000..5b47616398ef7
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Type.php
@@ -0,0 +1,59 @@
+<?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
new file mode 100644
index 0000000000000..2f50bd9a72208
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/UpdatedAt.php
@@ -0,0 +1,59 @@
+<?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
new file mode 100644
index 0000000000000..ca3883d5c937c
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/UsedIn.php
@@ -0,0 +1,113 @@
+<?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
new file mode 100644
index 0000000000000..64e9cf8ad1a8f
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Width.php
@@ -0,0 +1,33 @@
+<?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
new file mode 100644
index 0000000000000..92375adfdd4f2
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProviderInterface.php
@@ -0,0 +1,24 @@
+<?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
new file mode 100644
index 0000000000000..207f35bb99d6a
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProviderPool.php
@@ -0,0 +1,46 @@
+<?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/Config.php b/app/code/Magento/MediaGalleryUi/Model/Config.php
new file mode 100644
index 0000000000000..a9391d76428ca
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Model/Config.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Model;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\MediaGalleryUiApi\Api\ConfigInterface;
+
+/**
+ * Class responsible to provide access to system configuration related to the Media Gallery
+ */
+class Config implements ConfigInterface
+{
+    /**
+     * 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 masonry grid UI is enabled for Magento media gallery
+     *
+     * @return bool
+     */
+    public function isEnabled(): bool
+    {
+        return $this->scopeConfig->isSetFlag(self::XML_PATH_ENABLED);
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Model/DeleteImage.php b/app/code/Magento/MediaGalleryUi/Model/DeleteImage.php
new file mode 100644
index 0000000000000..2f4793c28ad47
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Model/DeleteImage.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Model;
+
+use Magento\Cms\Model\Wysiwyg\Images\Storage;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Filesystem;
+use Magento\MediaGalleryApi\Api\Data\AssetInterface;
+use Magento\MediaGalleryApi\Api\IsPathExcludedInterface;
+
+/**
+ * Delete image from a storage
+ */
+class DeleteImage
+{
+    /**
+     * @var Storage
+     */
+    private $imagesStorage;
+
+    /**
+     * @var IsPathExcludedInterface
+     */
+    private $isPathExcluded;
+
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * DeleteImage constructor.
+     *
+     * @param Storage $imagesStorage
+     * @param Filesystem $filesystem
+     * @param IsPathExcludedInterface $isPathExcluded
+     */
+    public function __construct(
+        Storage $imagesStorage,
+        Filesystem $filesystem,
+        IsPathExcludedInterface $isPathExcluded
+    ) {
+        $this->imagesStorage = $imagesStorage;
+        $this->filesystem = $filesystem;
+        $this->isPathExcluded = $isPathExcluded;
+    }
+
+    /**
+     * Delete asset image physically from file storage and from data storage.
+     *
+     * @param AssetInterface[] $assets
+     * @throws LocalizedException
+     */
+    public function execute(array $assets): void
+    {
+        $failedAssets = [];
+        foreach ($assets as $asset) {
+            if ($this->isPathExcluded->execute($asset->getPath())) {
+                $failedAssets[] = $asset->getPath();
+            }
+
+            $mediaDirectory = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA);
+            $absolutePath = $mediaDirectory->getAbsolutePath($asset->getPath());
+            $this->imagesStorage->deleteFile($absolutePath);
+        }
+        if (!empty($failedAssets)) {
+            throw new LocalizedException(
+                __(
+                    'Could not delete "%image": destination directory is restricted.',
+                    ['image' => implode(",", $failedAssets)]
+                )
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Model/Directories/FolderTree.php b/app/code/Magento/MediaGalleryUi/Model/Directories/FolderTree.php
new file mode 100644
index 0000000000000..574b8aab8bcd3
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Model/Directories/FolderTree.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Model\Directories;
+
+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
+ */
+class FolderTree
+{
+    /**
+     * @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 buildTree(bool $skipRoot = true): array
+    {
+        return $this->buildFolderTree($this->getDirectories(), $skipRoot);
+    }
+
+    /**
+     * Build directory tree array in format for jstree strandart
+     *
+     * @return array
+     * @throws ValidatorException
+     */
+    private function getDirectories(): array
+    {
+        $directories = [];
+
+        /** @var Read $directory */
+        $directory = $this->filesystem->getDirectoryRead($this->path);
+
+        if (!$directory->isDirectory()) {
+            return $directories;
+        }
+
+        foreach ($directory->readRecursively() as $path) {
+            if (!$directory->isDirectory($path) || $this->isPathExcluded->execute($path)) {
+                continue;
+            }
+
+            $pathArray = explode('/', $path);
+            $directories[] = [
+                'data' => count($pathArray) > 0 ? end($pathArray) : $path,
+                'attr' => ['id' => $path],
+                'metadata' => [
+                    'path' => $path
+                ],
+                'path_array' => $pathArray
+            ];
+        }
+        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
+     *
+     * @param array $node
+     * @param array $treeNode
+     * @param int $level
+     * @return array
+     */
+    private function findParent(array &$node, array &$treeNode, int $level = 0): array
+    {
+        $nodePathLength = count($node['path_array']);
+        $treeNodeParentLevel = $nodePathLength - 1;
+
+        $result = ['treeNode' => &$treeNode];
+
+        if ($nodePathLength <= 1 || $level > $treeNodeParentLevel) {
+            return $result;
+        }
+
+        foreach ($treeNode['children'] as &$tnode) {
+            if ($node['path_array'][$level] === $tnode['path_array'][$level]) {
+                return $this->findParent($node, $tnode, $level + 1);
+            }
+        }
+        return $result;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Model/GetDetailsByAssetId.php b/app/code/Magento/MediaGalleryUi/Model/GetDetailsByAssetId.php
new file mode 100644
index 0000000000000..b870082ea2aa1
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Model/GetDetailsByAssetId.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Model;
+
+use Exception;
+use Magento\Backend\Model\UrlInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\MediaGalleryApi\Api\Data\AssetInterface;
+use Magento\MediaGalleryApi\Api\Data\KeywordInterface;
+use Magento\MediaGalleryApi\Api\GetAssetsByIdsInterface;
+use Magento\MediaGalleryApi\Api\GetAssetsKeywordsInterface;
+use Magento\MediaGalleryUi\Ui\Component\Listing\Columns\SourceIconProvider;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Load Media Asset from database by id add all related data to it
+ */
+class GetDetailsByAssetId
+{
+    /**
+     * @var GetAssetsByIdsInterface
+     */
+    private $getAssetsById;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var SourceIconProvider
+     */
+    private $sourceIconProvider;
+
+    /**
+     * @var GetAssetsKeywordsInterface
+     */
+    private $getAssetKeywords;
+
+    /**
+     * @var AssetDetailsProviderPool
+     */
+    private $detailsProviderPool;
+
+    /**
+     * @param AssetDetailsProviderPool $detailsProviderPool
+     * @param GetAssetsByIdsInterface $getAssetById
+     * @param StoreManagerInterface $storeManager
+     * @param SourceIconProvider $sourceIconProvider
+     * @param GetAssetsKeywordsInterface $getAssetKeywords
+     */
+    public function __construct(
+        AssetDetailsProviderPool $detailsProviderPool,
+        GetAssetsByIdsInterface $getAssetById,
+        StoreManagerInterface $storeManager,
+        SourceIconProvider $sourceIconProvider,
+        GetAssetsKeywordsInterface $getAssetKeywords
+    ) {
+        $this->detailsProviderPool = $detailsProviderPool;
+        $this->getAssetsById = $getAssetById;
+        $this->storeManager = $storeManager;
+        $this->sourceIconProvider = $sourceIconProvider;
+        $this->getAssetKeywords = $getAssetKeywords;
+    }
+
+    /**
+     * Get image details by assets Ids
+     *
+     * @param array $assetIds
+     * @throws LocalizedException
+     * @throws Exception
+     * @return array
+     */
+    public function execute(array $assetIds): array
+    {
+        $assets = $this->getAssetsById->execute($assetIds);
+
+        $details = [];
+        foreach ($assets as $asset) {
+            $details[$asset->getId()] = [
+                'image_url' => $this->getUrl($asset->getPath()),
+                'title' => $asset->getTitle(),
+                'path' => $asset->getPath(),
+                'description' => $asset->getDescription(),
+                'id' => $asset->getId(),
+                'details' => $this->detailsProviderPool->execute($asset),
+                'size' => $asset->getSize(),
+                'tags' => $this->getKeywords($asset),
+                'source' => $asset->getSource() ?
+                $this->sourceIconProvider->getSourceIconUrl($asset->getSource()) :
+                null,
+                'content_type' => strtoupper(str_replace('image/', '', $asset->getContentType())),
+            ];
+        }
+        return $details;
+    }
+
+    /**
+     * 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
+        );
+    }
+
+    /**
+     * Get URL for the provided media asset path
+     *
+     * @param string $path
+     *
+     * @return string
+     *
+     * @throws LocalizedException
+     */
+    private function getUrl(string $path): string
+    {
+        /** @var Store $store */
+        $store = $this->storeManager->getStore();
+
+        return $store->getBaseUrl(UrlInterface::URL_TYPE_MEDIA) . $path;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Model/Listing/DataProvider.php b/app/code/Magento/MediaGalleryUi/Model/Listing/DataProvider.php
new file mode 100644
index 0000000000000..88401465d56b7
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Model/Listing/DataProvider.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Model\Listing;
+
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\Search\ReportingInterface;
+use Magento\Framework\Api\Search\SearchCriteriaBuilder;
+use Magento\Framework\Api\Search\SearchResultInterface;
+use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\View\Element\UiComponent\DataProvider\CollectionFactory;
+use Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider as UiComponentDataProvider;
+use Magento\MediaGalleryUi\Ui\Component\Listing\Provider;
+
+/**
+ * Media gallery UI data provider. Try catch added for displaying errors in grid
+ */
+class DataProvider extends UiComponentDataProvider
+{
+    /**
+     * @var CollectionProcessorInterface
+     */
+    private $collectionProcessor;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $collectionFactory;
+
+    /**
+     * @param string $name
+     * @param string $primaryFieldName
+     * @param string $requestFieldName
+     * @param ReportingInterface $reporting
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param RequestInterface $request
+     * @param FilterBuilder $filterBuilder
+     * @param CollectionProcessorInterface $collectionProcessor
+     * @param CollectionFactory $collectionFactory
+     * @param array $meta
+     * @param array $data
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        $name,
+        $primaryFieldName,
+        $requestFieldName,
+        ReportingInterface $reporting,
+        SearchCriteriaBuilder $searchCriteriaBuilder,
+        RequestInterface $request,
+        FilterBuilder $filterBuilder,
+        CollectionProcessorInterface $collectionProcessor,
+        CollectionFactory $collectionFactory,
+        array $meta = [],
+        array $data = []
+    ) {
+        parent::__construct(
+            $name,
+            $primaryFieldName,
+            $requestFieldName,
+            $reporting,
+            $searchCriteriaBuilder,
+            $request,
+            $filterBuilder,
+            $meta,
+            $data
+        );
+        $this->collectionFactory = $collectionFactory;
+        $this->collectionProcessor = $collectionProcessor;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getData(): array
+    {
+        try {
+            return $this->searchResultToOutput($this->getSearchResult());
+        } catch (\Exception $exception) {
+            return [
+                'items' => [],
+                'totalRecords' => 0,
+                'errorMessage' => $exception->getMessage()
+            ];
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getSearchResult(): SearchResultInterface
+    {
+        /** @var Provider $collection */
+        $collection = $this->collectionFactory->getReport($this->getSearchCriteria()->getRequestName());
+        $this->collectionProcessor->process($this->getSearchCriteria(), $collection);
+
+        return $collection;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/ContentField.php b/app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/ContentField.php
new file mode 100644
index 0000000000000..785c3078cdbe5
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/ContentField.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor;
+
+use Magento\Framework\Api\Filter;
+use Magento\Framework\Api\SearchCriteria\CollectionProcessor\FilterProcessor\CustomFilterInterface;
+use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\MediaContentApi\Api\GetAssetIdsByContentFieldInterface;
+
+/**
+ * Class responsible to filter a content field
+ */
+class ContentField implements CustomFilterInterface
+{
+    /**
+     * @var GetAssetIdsByContentFieldInterface
+     */
+    private $getAssetIdsByContentStatus;
+
+    /**
+     * ContentField constructor.
+     *
+     * @param GetAssetIdsByContentFieldInterface $getAssetIdsByContentStatus
+     */
+    public function __construct(
+        GetAssetIdsByContentFieldInterface $getAssetIdsByContentStatus
+    ) {
+        $this->getAssetIdsByContentStatus = $getAssetIdsByContentStatus;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function apply(Filter $filter, AbstractDb $collection): bool
+    {
+        $collection->addFieldToFilter(
+            'main_table.id',
+            ['in' => $this->getAssetIdsByContentStatus->execute($filter->getField(), $filter->getValue())]
+        );
+
+        return true;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/Directory.php b/app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/Directory.php
new file mode 100644
index 0000000000000..36e9375525f8d
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/Directory.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor;
+
+use Magento\Framework\Api\Filter;
+use Magento\Framework\Api\SearchCriteria\CollectionProcessor\FilterProcessor\CustomFilterInterface;
+use Magento\Framework\Data\Collection\AbstractDb;
+
+class Directory implements CustomFilterInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function apply(Filter $filter, AbstractDb $collection): bool
+    {
+        $value = str_replace('%', '', $filter->getValue());
+        $collection->getSelect()->where('path REGEXP ? ', '^' . $value . '/[^\/]*$');
+
+        return true;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/Duplicated.php b/app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/Duplicated.php
new file mode 100644
index 0000000000000..d43b3ac2ca451
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/Duplicated.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor;
+
+use Magento\Framework\Api\Filter;
+use Magento\Framework\Api\SearchCriteria\CollectionProcessor\FilterProcessor\CustomFilterInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Framework\DB\Select;
+
+/**
+ * Custom filter to filter collection by duplicated hash values
+ */
+class Duplicated implements CustomFilterInterface
+{
+
+    /**
+     * @var ResourceConnection
+     */
+    private $connection;
+
+    /**
+     * @param ResourceConnection $resource
+     */
+    public function __construct(ResourceConnection $resource)
+    {
+        $this->connection = $resource;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function apply(Filter $filter, AbstractDb $collection): bool
+    {
+        if ($filter->getValue()) {
+            $collection->getSelect()->where('main_table.hash IN (?)', $this->getDuplicatedIds());
+        }
+        return true;
+    }
+    /**
+     * Return sql part of duplicated values.
+     */
+    private function getDuplicatedIds(): array
+    {
+        $connection = $this->connection->getConnection();
+        return $connection->fetchAssoc(
+            $connection->select()
+                       ->from($this->connection->getTableName('media_gallery_asset'), ['hash'])
+                       ->group('hash')
+                       ->having('COUNT(*) > 1')
+        );
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/Entity.php b/app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/Entity.php
new file mode 100644
index 0000000000000..1d8aa78a03cc2
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/Entity.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor;
+
+use Magento\Framework\Api\Filter;
+use Magento\Framework\Api\SearchCriteria\CollectionProcessor\FilterProcessor\CustomFilterInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Framework\DB\Select;
+
+/**
+ * Custom filter to filter collection by entity type
+ */
+class Entity implements CustomFilterInterface
+{
+    private const TABLE_ALIAS = 'main_table';
+    private const TABLE_MEDIA_CONTENT_ASSET = 'media_content_asset';
+
+    /**
+     * @var ResourceConnection
+     */
+    private $connection;
+
+    /**
+     * @var string
+     */
+    private $entityType;
+
+    /**
+     * @param ResourceConnection $resource
+     * @param string $entityType
+     */
+    public function __construct(ResourceConnection $resource, string $entityType)
+    {
+        $this->connection = $resource;
+        $this->entityType = $entityType;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function apply(Filter $filter, AbstractDb $collection): bool
+    {
+        $ids = $filter->getValue();
+        if (is_array($ids)) {
+            $collection->addFieldToFilter(
+                self::TABLE_ALIAS . '.id',
+                ['in' => $this->getSelectByEntityIds($ids)]
+            );
+        }
+        return true;
+    }
+
+    /**
+     * Return select asset ids by entity type
+     *
+     * @param array $ids
+     * @return Select
+     */
+    private function getSelectByEntityIds(array $ids): Select
+    {
+        return $this->connection->getConnection()->select()->from(
+            ['asset_content_table' => $this->connection->getTableName(self::TABLE_MEDIA_CONTENT_ASSET)],
+            ['asset_id']
+        )->where(
+            'entity_type = ?',
+            $this->entityType
+        )->where(
+            'entity_id IN (?)',
+            $ids
+        );
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/EntityType.php b/app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/EntityType.php
new file mode 100644
index 0000000000000..1b5e2282ff3dc
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/EntityType.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor;
+
+use Magento\Framework\Api\Filter;
+use Magento\Framework\Api\SearchCriteria\CollectionProcessor\FilterProcessor\CustomFilterInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Data\Collection\AbstractDb;
+
+/**
+ * Custom filter to filter collection by entity type
+ */
+class EntityType implements CustomFilterInterface
+{
+    private const TABLE_ALIAS = 'main_table';
+    private const TABLE_MEDIA_CONTENT_ASSET = 'media_content_asset';
+    private const TABLE_MEDIA_GALLERY_ASSET = 'media_gallery_asset';
+    private const NOT_USED = 'not_used';
+
+    /**
+     * @var ResourceConnection
+     */
+    private $connection;
+
+    /**
+     * @param ResourceConnection $resource
+     */
+    public function __construct(ResourceConnection $resource)
+    {
+        $this->connection = $resource;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function apply(Filter $filter, AbstractDb $collection): bool
+    {
+        $value = $filter->getValue();
+        if (is_array($value)) {
+            $conditions = [];
+
+            if (in_array(self::NOT_USED, $value)) {
+                unset($value[array_search(self::NOT_USED, $value)]);
+                $conditions[] = ['in' => $this->getNotUsedEntityIds()];
+            }
+
+            if (!empty($value)) {
+                $conditions[] = ['in' => $this->getEntityTypesIds($value)];
+            }
+
+            $collection->addFieldToFilter(
+                self::TABLE_ALIAS . '.id',
+                $conditions
+            );
+        }
+        return true;
+    }
+
+    /**
+     * Return  asset ids by entity type
+     *
+     * @param array $value
+     * @return array
+     */
+    private function getEntityTypesIds(array $value): array
+    {
+        $connection = $this->connection->getConnection();
+        return $connection->fetchAssoc(
+            $connection->select()->from(
+                ['asset_content_table' => $this->connection->getTableName(self::TABLE_MEDIA_CONTENT_ASSET)],
+                ['asset_id']
+            )->where(
+                'entity_type IN (?)',
+                $value
+            )
+        );
+    }
+
+    /**
+     * Return  asset ids that not exists in asset_content_table
+     */
+    private function getNotUsedEntityIds(): array
+    {
+        $connection = $this->connection->getConnection();
+
+        return $connection->fetchAssoc(
+            $connection->select()->from(
+                ['media_gallery_asset' => $this->connection->getTableName(self::TABLE_MEDIA_GALLERY_ASSET)],
+                ['id']
+            )->where(
+                'media_gallery_asset.id  not in ?',
+                $this->connection->getConnection()->select()->from(
+                    ['asset_content_table' => $this->connection->getTableName(self::TABLE_MEDIA_CONTENT_ASSET)],
+                    ['asset_id']
+                )
+            )
+        );
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/Keyword.php b/app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/Keyword.php
new file mode 100644
index 0000000000000..a3003e3f5a23a
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/Keyword.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor;
+
+use Magento\Framework\Api\Filter;
+use Magento\Framework\Api\SearchCriteria\CollectionProcessor\FilterProcessor\CustomFilterInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Framework\DB\Select;
+
+class Keyword implements CustomFilterInterface
+{
+    private const TABLE_ALIAS = 'main_table';
+    private const TABLE_KEYWORDS = 'media_gallery_asset_keyword';
+    private const TABLE_ASSET_KEYWORD = 'media_gallery_keyword';
+
+    /**
+     * @var ResourceConnection
+     */
+    private $connection;
+
+    /**
+     * @param ResourceConnection $resource
+     */
+    public function __construct(ResourceConnection $resource)
+    {
+        $this->connection = $resource;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function apply(Filter $filter, AbstractDb $collection): bool
+    {
+        $value = $filter->getValue();
+
+        $collection->addFieldToFilter(
+            [self::TABLE_ALIAS . '.title', self::TABLE_ALIAS . '.id'],
+            [
+                ['like' => sprintf('%%%s%%', $value)],
+                ['in' => $this->getAssetIdsByKeyword($value)]
+            ]
+        );
+
+        return true;
+    }
+
+    /**
+     * Return  asset ids by keyword
+     *
+     * @param string $value
+     * @return array
+     */
+    private function getAssetIdsByKeyword(string $value): array
+    {
+        $connection = $this->connection->getConnection();
+        return $connection->fetchAssoc(
+            $connection->select()->from(
+                $connection->select()
+                           ->from(
+                               ['asset_keywords_table' => $this->connection->getTableName(self::TABLE_ASSET_KEYWORD)],
+                               ['id']
+                           )->where(
+                               'keyword = ?',
+                               $value
+                           )->joinInner(
+                               ['keywords_table' => $this->connection->getTableName(self::TABLE_KEYWORDS)],
+                               'keywords_table.keyword_id = asset_keywords_table.id',
+                               ['asset_id']
+                           ),
+                ['asset_id']
+            )
+        );
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Model/UpdateAsset.php b/app/code/Magento/MediaGalleryUi/Model/UpdateAsset.php
new file mode 100644
index 0000000000000..ff82b990d2a01
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Model/UpdateAsset.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Model;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\MediaGalleryApi\Api\Data\AssetInterface;
+use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
+use Magento\MediaGalleryApi\Api\GetAssetsByIdsInterface;
+use Magento\MediaGalleryApi\Api\SaveAssetsInterface;
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterface;
+use Magento\MediaGalleryUi\Model\UpdateAsset\UpdateKeywords;
+use Magento\MediaGalleryUi\Model\UpdateAsset\SaveMetadataToFile;
+
+class UpdateAsset
+{
+    /**
+     * @var AssetInterfaceFactory
+     */
+    private $assetFactory;
+
+    /**
+     * @var GetAssetsByIdsInterface
+     */
+    private $getAssetsByIds;
+
+    /**
+     * @var SaveAssetsInterface
+     */
+    private $saveAssets;
+
+    /**
+     * @var SaveMetadataToFile
+     */
+    private $processMetadata;
+
+    /**
+     * @var UpdateKeywords
+     */
+    private $processKeywords;
+
+    /**
+     * @param AssetInterfaceFactory $assetFactory
+     * @param GetAssetsByIdsInterface $getAssetsByIds
+     * @param SaveAssetsInterface $saveAssets
+     * @param UpdateKeywords $processKeywords
+     * @param SaveMetadataToFile $processMetadata
+     */
+    public function __construct(
+        AssetInterfaceFactory $assetFactory,
+        GetAssetsByIdsInterface $getAssetsByIds,
+        SaveAssetsInterface $saveAssets,
+        UpdateKeywords $processKeywords,
+        SaveMetadataToFile $processMetadata
+    ) {
+        $this->assetFactory = $assetFactory;
+        $this->getAssetsByIds = $getAssetsByIds;
+        $this->saveAssets = $saveAssets;
+        $this->processKeywords = $processKeywords;
+        $this->processMetadata = $processMetadata;
+    }
+
+    /**
+     * Save asset details
+     *
+     * @param int $id
+     * @param MetadataInterface $data
+     */
+    public function execute(int $id, MetadataInterface $data): void
+    {
+        $asset = $this->getAsset($id);
+
+        $updatedAsset = $this->assetFactory->create(
+            [
+                'path' => $asset->getPath(),
+                'contentType' => $asset->getContentType(),
+                '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(),
+                'created_at' => $asset->getCreatedAt(),
+                'updated_at' => $asset->getUpdatedAt()
+            ]
+        );
+
+        $this->saveAssets->execute([$updatedAsset]);
+        $this->processMetadata->execute($asset->getPath(), $data);
+
+        $keywords = $data->getKeywords();
+        if (isset($keywords)) {
+            $this->processKeywords->execute($id, $keywords);
+        }
+    }
+
+    /**
+     * Load asset by id
+     *
+     * @param int $id
+     * @return AssetInterface
+     * @throws LocalizedException
+     */
+    private function getAsset(int $id): AssetInterface
+    {
+        $assets = $this->getAssetsByIds->execute([$id]);
+        if (empty($assets)) {
+            throw new LocalizedException(__('Could not retrieve the asset.'));
+        }
+        return current($assets);
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Model/UpdateAsset/SaveMetadataToFile.php b/app/code/Magento/MediaGalleryUi/Model/UpdateAsset/SaveMetadataToFile.php
new file mode 100644
index 0000000000000..3ebe04374f81e
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Model/UpdateAsset/SaveMetadataToFile.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Model\UpdateAsset;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Filesystem;
+use Magento\MediaGalleryMetadataApi\Api\AddMetadataInterface;
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterface;
+use Psr\Log\LoggerInterface;
+
+class SaveMetadataToFile
+{
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var AddMetadataInterface
+     */
+    private $addMetadata;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @param Filesystem $filesystem
+     * @param AddMetadataInterface $addMetadata
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        Filesystem $filesystem,
+        AddMetadataInterface $addMetadata,
+        LoggerInterface $logger
+    ) {
+        $this->filesystem = $filesystem;
+        $this->addMetadata = $addMetadata;
+        $this->logger = $logger;
+    }
+
+    /**
+     * Save updated metadata
+     *
+     * @param string $path
+     * @param MetadataInterface $data
+     */
+    public function execute(string $path, MetadataInterface $data): void
+    {
+        $absolutePath = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA)->getAbsolutePath($path);
+
+        try {
+            $this->addMetadata->execute($absolutePath, $data);
+        } catch (LocalizedException $e) {
+            $this->logger->critical($e);
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Model/UpdateAsset/UpdateKeywords.php b/app/code/Magento/MediaGalleryUi/Model/UpdateAsset/UpdateKeywords.php
new file mode 100644
index 0000000000000..2a359d5a14025
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Model/UpdateAsset/UpdateKeywords.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Model\UpdateAsset;
+
+use Magento\MediaGalleryApi\Api\Data\AssetKeywordsInterfaceFactory;
+use Magento\MediaGalleryApi\Api\Data\KeywordInterface;
+use Magento\MediaGalleryApi\Api\Data\KeywordInterfaceFactory;
+use Magento\MediaGalleryApi\Api\SaveAssetsKeywordsInterface;
+
+class UpdateKeywords
+{
+    /**
+     * @var AssetKeywordsInterfaceFactory
+     */
+    private $assetKeywordsFactory;
+
+    /**
+     * @var KeywordInterfaceFactory
+     */
+    private $keywordFactory;
+
+    /**
+     * @var SaveAssetsKeywordsInterface
+     */
+    private $saveAssetKeywords;
+
+    /**
+     * @param AssetKeywordsInterfaceFactory $assetKeywordsFactory
+     * @param KeywordInterfaceFactory $keywordFactory
+     * @param SaveAssetsKeywordsInterface $saveAssetKeywords
+     */
+    public function __construct(
+        AssetKeywordsInterfaceFactory $assetKeywordsFactory,
+        KeywordInterfaceFactory $keywordFactory,
+        SaveAssetsKeywordsInterface $saveAssetKeywords
+    ) {
+        $this->assetKeywordsFactory = $assetKeywordsFactory;
+        $this->keywordFactory = $keywordFactory;
+        $this->saveAssetKeywords = $saveAssetKeywords;
+    }
+
+    /**
+     * Save asset keywords
+     *
+     * @param int $assetId
+     * @param string[] $keywords
+     */
+    public function execute(int $assetId, array $keywords): void
+    {
+        $this->saveAssetKeywords->execute([
+            $this->assetKeywordsFactory->create([
+                'assetId' => $assetId,
+                'keywords' => $this->createKeywords($keywords)
+            ])
+        ]);
+    }
+
+    /**
+     * Create keyword objects from strings
+     *
+     * @param string[] $keywords
+     * @return KeywordInterface[]
+     */
+    private function createKeywords(array $keywords): array
+    {
+        $keywordObjects = [];
+        foreach ($keywords as $keyword) {
+            $keywordObjects[] = $this->keywordFactory->create(
+                [
+                    'keyword' => $keyword
+                ]
+            );
+        }
+        return $keywordObjects;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Model/UploadImage.php b/app/code/Magento/MediaGalleryUi/Model/UploadImage.php
new file mode 100644
index 0000000000000..c918548bea553
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Model/UploadImage.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Model;
+
+use Magento\Cms\Model\Wysiwyg\Images\Storage;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Filesystem;
+
+/**
+ * Uploads an image to storage
+ */
+class UploadImage
+{
+    /**
+     * @var Storage
+     */
+    private $imagesStorage;
+
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @param Storage $imagesStorage
+     * @param Filesystem $filesystem
+     */
+    public function __construct(
+        Storage $imagesStorage,
+        Filesystem $filesystem
+    ) {
+        $this->imagesStorage = $imagesStorage;
+        $this->filesystem = $filesystem;
+    }
+
+    /**
+     * Uploads the image and returns file object
+     *
+     * @param string $targetFolder
+     * @param string $type
+     * @throws LocalizedException
+     */
+    public function execute(string $targetFolder, string $type): void
+    {
+        $mediaDirectory = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA);
+        if (!$mediaDirectory->isDirectory($targetFolder)) {
+            throw new LocalizedException(__('Directory %1 does not exist in media directory.', $targetFolder));
+        }
+
+        $this->imagesStorage->uploadFile($mediaDirectory->getAbsolutePath($targetFolder), $type);
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Plugin/CreateThumbnails.php b/app/code/Magento/MediaGalleryUi/Plugin/CreateThumbnails.php
new file mode 100644
index 0000000000000..7988ac2d9e635
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Plugin/CreateThumbnails.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Plugin;
+
+use Magento\Cms\Model\Wysiwyg\Images\Storage;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
+use Magento\MediaGallerySynchronizationApi\Model\ImportFilesComposite;
+
+/**
+ * Create resizes files that were synced
+ */
+class CreateThumbnails
+{
+    /**
+     * @var Storage
+     */
+    private $storage;
+
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @param Filesystem $filesystem
+     * @param Storage $storage
+     */
+    public function __construct(Filesystem $filesystem, Storage $storage)
+    {
+        $this->storage = $storage;
+        $this->filesystem = $filesystem;
+    }
+
+    /**
+     * Create thumbnails for synced files.
+     *
+     * @param ImportFilesComposite $subject
+     * @param string[] $paths
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeExecute(ImportFilesComposite $subject, array $paths): array
+    {
+        foreach ($paths as $path) {
+            $this->storage->resizeFile(
+                $this->filesystem->getDirectoryRead(DirectoryList::MEDIA)->getAbsolutePath($path)
+            );
+        }
+
+        return [$paths];
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/README.md b/app/code/Magento/MediaGalleryUi/README.md
new file mode 100644
index 0000000000000..6fbad656b23a8
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/README.md
@@ -0,0 +1,13 @@
+# Magento_MediaGalleryUi module
+
+The Magento_MediaGalleryUi module is responsible for the media gallery user interface (UI) implementation.
+
+## Extensibility
+
+Extension developers can interact with the Magento_MediaGalleryUi module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
+
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_MediaGalleryUi module.
+
+## Additional information
+
+For information about significant changes in patch releases, see [2.3.x Release information](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html).
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminAssertImageInStandaloneMediaGalleryActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminAssertImageInStandaloneMediaGalleryActionGroup.xml
new file mode 100644
index 0000000000000..c056727aa8fe8
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminAssertImageInStandaloneMediaGalleryActionGroup.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="AdminAssertImageInStandaloneMediaGalleryActionGroup">
+        <annotations>
+            <description>Validates that the provided image is present and correct in the standalone media gallery.</description>
+        </annotations>
+        <arguments>
+            <argument name="imageName" type="string"/>
+        </arguments>
+
+        <seeElement selector="{{AdminEnhancedMediaGalleryActionsSection.imageSrc(imageName)}}"
+                        stepKey="checkFirstImageAfterSearch"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAddImageFromImageDetailsActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAddImageFromImageDetailsActionGroup.xml
new file mode 100644
index 0000000000000..d47eb491f9b5d
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAddImageFromImageDetailsActionGroup.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="AdminEnhancedMediaGalleryAddImageFromImageDetailsActionGroup">
+        <annotations>
+            <description>Adds image to target element from View Details panel</description>
+        </annotations>
+
+        <click selector="{{AdminEnhancedMediaGalleryViewDetailsSection.addImage}}" stepKey="openContextMenu"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryApplyDuplicatedFilterActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryApplyDuplicatedFilterActionGroup.xml
new file mode 100644
index 0000000000000..9a550805a7dec
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryApplyDuplicatedFilterActionGroup.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="AdminEnhancedMediaGalleryApplyDuplicatedFilterActionGroup">
+        <annotations>
+            <description>Applies duplicated images filter to the media gallery grid</description>
+        </annotations>
+
+        <click selector="{{AdminEnhancedMediaGalleryFiltersSection.duplicatedFilterCheckbox}}" stepKey="clickShowDuplicates"/>
+     </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryApplyFiltersActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryApplyFiltersActionGroup.xml
new file mode 100644
index 0000000000000..9d7d725cf49de
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryApplyFiltersActionGroup.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="AdminEnhancedMediaGalleryApplyFiltersActionGroup">
+        <annotations>
+            <description>Apply filters in media gallery grid</description>
+        </annotations>
+        
+        <click selector="{{AdminEnhancedMediaGalleryFiltersSection.applyFilters}}" stepKey="applyFilters"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertActiveFiltersActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertActiveFiltersActionGroup.xml
new file mode 100644
index 0000000000000..aeee921f92e58
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertActiveFiltersActionGroup.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="AdminEnhancedMediaGalleryAssertActiveFiltersActionGroup">
+        <annotations>
+            <description>Assert media gallery grid filters</description>
+        </annotations>
+        <arguments>
+            <argument name="resultValue" type="string"/>
+        </arguments>
+        <click selector="{{AdminEnhancedMediaGalleryFiltersSection.filtersButton}}" stepKey="expandFiltersToCheckAppliedFilter"/>
+        <see selector="{{AdminEnhancedMediaGalleryFiltersSection.activeFilter(resultValue)}}" userInput="{{resultValue}}" stepKey="verifyAppliedFilter"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertImagesDeletedInBulkActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertImagesDeletedInBulkActionGroup.xml
new file mode 100644
index 0000000000000..7f4db971702ca
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertImagesDeletedInBulkActionGroup.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="AdminEnhancedMediaGalleryAssertImagesDeletedInBulkActionGroup">
+        <annotations>
+            <description>Asserts images has been deleted in mass action.</description>
+        </annotations>
+
+        <see userInput='Assets have been successfully deleted' stepKey="verifyDeleteImages"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertMassActionModeDetailsActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertMassActionModeDetailsActionGroup.xml
new file mode 100644
index 0000000000000..efcf40cd2b644
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertMassActionModeDetailsActionGroup.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="AdminEnhancedMediaGalleryAssertMassActionModeDetailsActionGroup">
+        <annotations>
+            <description>Asserts that massaction mode can be enabled and disabled, verify massaction view after switch to massaction mode</description>
+        </annotations>
+        <arguments>
+            <argument name="imageName" type="string"/>
+        </arguments>
+        <click selector="{{AdminEnhancedMediaGalleryMassActionSection.massActionCheckbox(imageName)}}" stepKey="selectImageInGridToDelte"/>
+        <see selector="{{AdminEnhancedMediaGalleryMassActionSection.totalSelected}}" userInput="(1 Selected)" stepKey="verifySelectedCount"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertMassActionModeNotActiveActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertMassActionModeNotActiveActionGroup.xml
new file mode 100644
index 0000000000000..a691f65387e8e
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertMassActionModeNotActiveActionGroup.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="AdminEnhancedMediaGalleryAssertMassActionModeNotActiveActionGroup">
+        <annotations>
+            <description>Asserts that massaction mode is terminated</description>
+        </annotations>
+       
+
+        <dontSeeElement selector="{{AdminEnhancedMediaGalleryMassActionSection.totalSelected}}" stepKey="verifyTeminateMassAction"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertNoActiveFiltersAppliedActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertNoActiveFiltersAppliedActionGroup.xml
new file mode 100644
index 0000000000000..783e71719c659
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertNoActiveFiltersAppliedActionGroup.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="AdminEnhancedMediaGalleryAssertNoActiveFiltersAppliedActionGroup">
+        <annotations>
+            <description>Assert that grid have no  active filter</description>
+        </annotations>
+        <dontSeeElement selector="{{AdminEnhancedMediaGalleryFiltersSection.activeFilterPlaceholder}}"  stepKey="assertThereIsNoActiveFilters"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertWarningMessageActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertWarningMessageActionGroup.xml
new file mode 100644
index 0000000000000..b53e76e06cfb5
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertWarningMessageActionGroup.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="AdminEnhancedMediaGalleryAssertWarningMessageActionGroup">
+        <annotations>
+            <description>Assert image delete action popup contains warnin message</description>
+        </annotations>
+        <arguments>
+            <argument name="messageText" type="string"/>
+        </arguments>
+        
+        <see userInput="{{messageText}}"  stepKey="assertWarningMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryCategoryGridApplyFiltersActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryCategoryGridApplyFiltersActionGroup.xml
new file mode 100644
index 0000000000000..478ca2b3b5be9
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryCategoryGridApplyFiltersActionGroup.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="AdminEnhancedMediaGalleryCategoryGridApplyFiltersActionGroup">
+        <annotations>
+            <description>Apply filters in Category grid</description>
+        </annotations>
+        
+        <click selector="{{AdminEnhancedMediaGalleryFiltersSection.categoryGridApplyFilters}}" stepKey="applyFilters"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryCategoryGridExpandFilterActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryCategoryGridExpandFilterActionGroup.xml
new file mode 100644
index 0000000000000..00608504fd7a6
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryCategoryGridExpandFilterActionGroup.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="AdminEnhancedMediaGalleryCategoryGridExpandFilterActionGroup">
+        <annotations>
+            <description>Expand media gallery category  filters by clicking on button</description>
+        </annotations>
+        
+        <click selector="{{AdminEnhancedMediaGalleryFiltersSection.categoryGridFiltersButton}}" stepKey="expandFilter"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup.xml
new file mode 100644
index 0000000000000..600e1cd747943
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup.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="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup">
+        <annotations>
+            <description>Click delete images button.</description>
+        </annotations>
+
+        <click selector="{{AdminEnhancedMediaGalleryMassActionSection.deleteSelected}}" stepKey="clickDeleteImages"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForDeleteModal"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryCloseViewDetailsActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryCloseViewDetailsActionGroup.xml
new file mode 100644
index 0000000000000..3754eb319da44
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryCloseViewDetailsActionGroup.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="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup">
+        <annotations>
+            <description>Closes View Details panel</description>
+        </annotations>
+
+        <click selector="{{AdminEnhancedMediaGalleryViewDetailsSection.cancel}}" stepKey="clickCancel"/>
+        <wait time="1" stepKey="waitForElementRender"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup.xml
new file mode 100644
index 0000000000000..90546eca8dc0d
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup.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="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup">
+        <annotations>
+            <description>Click confirm on confirmation popup images delete action.</description>
+        </annotations>
+
+        <click selector="{{AdminEnhancedMediaGalleryDeleteModalSection.confirmDelete}}" stepKey="confirmDelete"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForDeletingProcces"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryDeleteGridViewActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryDeleteGridViewActionGroup.xml
new file mode 100644
index 0000000000000..d3d1f0aaf39de
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryDeleteGridViewActionGroup.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="AdminEnhancedMediaGalleryDeleteGridViewActionGroup">
+        <annotations>
+            <description>Delete grid view bookmarks by name</description>
+        </annotations>
+        <arguments>
+            <argument name="viewToDelete" type="string"/>
+        </arguments>
+
+        <click selector="{{AdminDataGridHeaderSection.bookmarkToggle}}" stepKey="openViewBookmarks"/>
+        <click selector="{{AdminGridDefaultViewControls.viewByName(viewToDelete)}}{{AdminAdobeStockSection.editViewButtonPartial}}" stepKey="clickEditButton"/>
+        <seeElement selector="{{AdminAdobeStockSection.deleteViewButton}}" stepKey="seeDeleteButton"/>
+        <click selector="{{AdminAdobeStockSection.deleteViewButton}}" stepKey="clickDeleteButton"/>
+        <waitForPageLoad stepKey="waitForDeletion" time="10"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryDisableMassactionModeActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryDisableMassactionModeActionGroup.xml
new file mode 100644
index 0000000000000..f404ffbe7c4f0
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryDisableMassactionModeActionGroup.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="AdminEnhancedMediaGalleryDisableMassactionModeActionGroup">
+        <annotations>
+            <description>Disable massaction mode by clicking on cancel button</description>
+        </annotations>
+
+
+        <click selector="{{AdminEnhancedMediaGalleryMassActionSection.cancelMassActionMode}}" stepKey="cancelMassAction"/>
+        <dontSeeElement selector="{{AdminEnhancedMediaGalleryMassActionSection.totalSelected}}" stepKey="verifyTeminateMAssAction"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryEditImageDetailsActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryEditImageDetailsActionGroup.xml
new file mode 100644
index 0000000000000..84712e8e3f3ae
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryEditImageDetailsActionGroup.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="AdminEnhancedMediaGalleryEditImageDetailsActionGroup">
+        <annotations>
+            <description>Opens Edit image details panel panel for the first image in the media gallery grid</description>
+        </annotations>
+
+        <click selector="{{AdminEnhancedMediaGalleryImageActionsSection.openContextMenu}}" stepKey="openContextMenu"/>
+        <click selector="{{AdminEnhancedMediaGalleryImageActionsSection.edit}}" stepKey="edit"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryEnableMassActionModeActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryEnableMassActionModeActionGroup.xml
new file mode 100644
index 0000000000000..4b0375088509b
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryEnableMassActionModeActionGroup.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="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup">
+        <annotations>
+            <description>Activate massaction mode by click on Delete Selected..</description>
+        </annotations>
+
+        <waitForElementVisible selector="{{AdminEnhancedMediaGalleryMassActionSection.deleteSelected}}" stepKey="waitForMassActionButton"/>
+        <click selector="{{AdminEnhancedMediaGalleryMassActionSection.deleteSelected}}" stepKey="clickOnMassActionButton"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryExpandFilterActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryExpandFilterActionGroup.xml
new file mode 100644
index 0000000000000..d2ac1c78b2582
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryExpandFilterActionGroup.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="AdminEnhancedMediaGalleryExpandFilterActionGroup">
+        <annotations>
+            <description>Expand media gallery filter by clicking on button</description>
+        </annotations>
+        
+        <click selector="{{AdminEnhancedMediaGalleryFiltersSection.filtersButton}}" stepKey="expandFilter"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryImageDeleteActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryImageDeleteActionGroup.xml
new file mode 100644
index 0000000000000..b3733ceb4c4a0
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryImageDeleteActionGroup.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="AdminEnhancedMediaGalleryImageDeleteActionGroup">
+        <annotations>
+            <description>Delete image from the Media Gallery</description>
+        </annotations>
+
+        <click selector="{{AdminEnhancedMediaGalleryImageActionsSection.openContextMenu}}" stepKey="openContextMenu"/>
+        <click selector="{{AdminEnhancedMediaGalleryImageActionsSection.delete}}" stepKey="deleteImage"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForDeleteModal"/>
+        <click selector="{{AdminEnhancedMediaGalleryDeleteModalSection.confirmDelete}}" stepKey="confirmDelete"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryImageDetailsDeleteActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryImageDetailsDeleteActionGroup.xml
new file mode 100644
index 0000000000000..001aa010dbdd4
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryImageDetailsDeleteActionGroup.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="AdminEnhancedMediaGalleryImageDetailsDeleteActionGroup">
+        <annotations>
+            <description>Delete image from the View Details panel</description>
+        </annotations>
+
+        <click selector="{{AdminEnhancedMediaGalleryViewDetailsSection.delete}}" stepKey="deleteImage"/>
+        <waitForElementVisible selector="{{AdminEnhancedMediaGalleryViewDetailsSection.confirmDelete}}" stepKey="waitForConfirmation"/>
+        <click selector="{{AdminEnhancedMediaGalleryViewDetailsSection.confirmDelete}}" stepKey="confirmDelete"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryImageDetailsEditActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryImageDetailsEditActionGroup.xml
new file mode 100644
index 0000000000000..931da0ee06fef
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryImageDetailsEditActionGroup.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="AdminEnhancedMediaGalleryImageDetailsEditActionGroup">
+        <annotations>
+            <description>Edit image from the View Details panel</description>
+        </annotations>
+        <click selector="{{AdminEnhancedMediaGalleryViewDetailsSection.edit}}" stepKey="editImage"/>
+        <waitForLoadingMaskToDisappear 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
new file mode 100644
index 0000000000000..0da3de9501c13
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryImageDetailsSaveActionGroup.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="AdminEnhancedMediaGalleryImageDetailsSaveActionGroup">
+        <annotations>
+            <description>Save image details from the View Details panel</description>
+        </annotations>
+        <arguments>
+            <argument name="image"/>
+        </arguments>
+
+        <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"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGallerySaveCustomViewActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGallerySaveCustomViewActionGroup.xml
new file mode 100644
index 0000000000000..57096124c0370
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGallerySaveCustomViewActionGroup.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="AdminEnhancedMediaGallerySaveCustomViewActionGroup">
+        <annotations>
+            <description>Save custom view media gallery</description>
+        </annotations>
+        <arguments>
+            <argument name="viewName" type="string" defaultValue="Test View"/>
+        </arguments>
+        
+        <click selector="{{AdminDataGridHeaderSection.bookmarkToggle}}" stepKey="openViewBookmarks"/>
+        <click selector="{{AdminGridDefaultViewControls.saveViewAs}}" stepKey="saveView"/>
+        <fillField selector="{{AdminGridDefaultViewControls.viewName}}" userInput="{{viewName}}" stepKey="inputViewName"/>
+        <pressKey selector="{{AdminGridDefaultViewControls.viewName}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="pressEnterKey"/>
+      </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGallerySelectCustomBookmarksViewActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGallerySelectCustomBookmarksViewActionGroup.xml
new file mode 100644
index 0000000000000..4244724599fed
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGallerySelectCustomBookmarksViewActionGroup.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="AdminEnhancedMediaGallerySelectCustomBookmarksViewActionGroup">
+        <annotations>
+            <description>Apply custom bookmarks view to the media gallery grid</description>
+        </annotations>
+        <arguments>
+            <argument name="selectView" type="string"/>
+        </arguments>
+
+        <click selector="{{AdminDataGridHeaderSection.bookmarkToggle}}" stepKey="openViewBookmarks"/>
+        <click selector="{{AdminGridDefaultViewControls.viewByName(selectView)}}" stepKey="clickOnViewButton"/>
+        <waitForPageLoad stepKey="waitForGridLoad" time="10"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGallerySelectImageForMassActionActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGallerySelectImageForMassActionActionGroup.xml
new file mode 100644
index 0000000000000..6532fb869d2cc
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGallerySelectImageForMassActionActionGroup.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="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup">
+        <annotations>
+            <description>Select images in grid by clicking on mass action checkbox</description>
+        </annotations>
+        <arguments>
+            <argument name="imageName" type="string" defaultValue="magento"/>
+        </arguments>
+
+        <checkOption selector="{{AdminEnhancedMediaGalleryMassActionSection.massActionCheckbox(imageName)}}" stepKey="selectImageInGridToDelte"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGallerySelectSourceFilterActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGallerySelectSourceFilterActionGroup.xml
new file mode 100644
index 0000000000000..9be288b064742
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGallerySelectSourceFilterActionGroup.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="AdminEnhancedMediaGallerySelectSourceFilterActionGroup">
+        <annotations>
+            <description>Select source filter by provided option</description>
+        </annotations>
+        <arguments>
+            <argument type="string" name="filterValue"/>
+        </arguments>
+
+        <click selector="{{AdminEnhancedMediaGalleryFiltersSection.sourceFilterValue(filterValue)}}" stepKey="openContextMenu"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGallerySelectUsedInFilterActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGallerySelectUsedInFilterActionGroup.xml
new file mode 100644
index 0000000000000..72d01e1871513
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGallerySelectUsedInFilterActionGroup.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="AdminEnhancedMediaGallerySelectUsedInFilterActionGroup">
+        <annotations>
+            <description>Set search options filter</description>
+        </annotations>
+        <arguments>
+            <argument type="string" name="filterName"/>
+            <argument type="string" name="optionName"/>
+        </arguments>
+
+        <click selector="{{AdminEnhancedMediaGalleryFiltersSection.searchOptionsFilter(filterName)}}" stepKey="openFilter"/>
+        <fillField selector="{{AdminEnhancedMediaGalleryFiltersSection.searchOptionsFilterInput(filterName)}}" userInput="{{optionName}}" stepKey="enterOptionName" />
+        <click selector="{{AdminEnhancedMediaGalleryFiltersSection.searchOptionsFilterOption(filterName, optionName)}}" stepKey="selectOption"/>
+        <click selector="{{AdminEnhancedMediaGalleryFiltersSection.searchOptionsFilterDone(filterName)}}" stepKey="clickDone"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryUploadImageActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryUploadImageActionGroup.xml
new file mode 100644
index 0000000000000..053a1185b3fda
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryUploadImageActionGroup.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="AdminEnhancedMediaGalleryUploadImageActionGroup">
+        <annotations>
+            <description>Uploads the provided Image to Media Gallery.
+                If you use this action group, you MUST add steps to delete the image in the "after" steps.</description>
+        </annotations>
+        <arguments>
+            <argument name="image"/>
+        </arguments>
+
+        <attachFile selector="{{AdminEnhancedMediaGalleryActionsSection.upload}}" userInput="{{image.value}}" stepKey="uploadImage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageDescriptionActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageDescriptionActionGroup.xml
new file mode 100644
index 0000000000000..eb2fc79567d08
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageDescriptionActionGroup.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="AdminEnhancedMediaGalleryVerifyImageDescriptionActionGroup">
+        <annotations>
+            <description>Verifies image description on the View Details panel</description>
+        </annotations>
+        <arguments>
+            <argument name="description"/>
+        </arguments>
+
+        <grabTextFrom selector="{{AdminEnhancedMediaGalleryViewDetailsSection.description}}" stepKey="grabDescription"/>
+        <assertStringContainsString stepKey="verifyDescription">
+            <actualResult type="variable">grabDescription</actualResult>
+            <expectedResult type="string">{{description}}</expectedResult>
+        </assertStringContainsString>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageDetailsActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageDetailsActionGroup.xml
new file mode 100644
index 0000000000000..1ebaa0581e33e
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageDetailsActionGroup.xml
@@ -0,0 +1,37 @@
+<?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="AdminEnhancedMediaGalleryVerifyImageDetailsActionGroup">
+        <annotations>
+            <description>Verifies image information on the View Details panel</description>
+        </annotations>
+        <arguments>
+            <argument name="image"/>
+        </arguments>
+
+        <grabTextFrom selector="{{AdminEnhancedMediaGalleryViewDetailsSection.title}}" stepKey="grabImageTitle"/>
+        <assertStringContainsString stepKey="verifyImageTitle">
+            <actualResult type="variable">grabImageTitle</actualResult>
+            <expectedResult type="string">{{image.fileName}}</expectedResult>
+        </assertStringContainsString>
+
+        <grabTextFrom selector="{{AdminEnhancedMediaGalleryViewDetailsSection.contentType}}" stepKey="grabContentType"/>
+        <assertStringContainsStringIgnoringCase stepKey="verifyContentType">
+            <actualResult type="variable">grabContentType</actualResult>
+            <expectedResult type="string">{{image.extension}}</expectedResult>
+        </assertStringContainsStringIgnoringCase>
+
+        <grabTextFrom selector="{{AdminEnhancedMediaGalleryViewDetailsSection.type}}" stepKey="grabType"/>
+        <assertStringContainsString stepKey="verifyType">
+            <actualResult type="variable">grabType</actualResult>
+            <expectedResult type="string">Image</expectedResult>
+        </assertStringContainsString>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageFilenameActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageFilenameActionGroup.xml
new file mode 100644
index 0000000000000..4c38b7dbc8c3e
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageFilenameActionGroup.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="AdminEnhancedMediaGalleryVerifyImageFilenameActionGroup">
+        <annotations>
+            <description>Verifies image filename on the View Details panel</description>
+        </annotations>
+        <arguments>
+            <argument name="filename" type="string"/>
+        </arguments>
+
+        <grabTextFrom selector="{{AdminEnhancedMediaGalleryViewDetailsSection.filename}}" stepKey="grabFilename"/>
+        <assertStringContainsString stepKey="verifyFilename">
+            <actualResult type="variable">grabFilename</actualResult>
+            <expectedResult type="string">{{filename}}</expectedResult>
+        </assertStringContainsString>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageKeywordsActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageKeywordsActionGroup.xml
new file mode 100644
index 0000000000000..2fc4f7ea25fd0
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageKeywordsActionGroup.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="AdminEnhancedMediaGalleryVerifyImageKeywordsActionGroup">
+        <annotations>
+            <description>Verifies image keywords on the View Details panel</description>
+        </annotations>
+        <arguments>
+            <argument name="keywords"/>
+        </arguments>
+
+        <grabTextFrom selector="{{AdminEnhancedMediaGalleryViewDetailsSection.keywords}}" stepKey="grabKeywords"/>
+        <assertStringContainsString stepKey="verifyKeywords">
+            <actualResult type="variable">grabKeywords</actualResult>
+            <expectedResult type="string">{{keywords}}</expectedResult>
+        </assertStringContainsString>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageTitleActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageTitleActionGroup.xml
new file mode 100644
index 0000000000000..08dac976332ee
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageTitleActionGroup.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="AdminEnhancedMediaGalleryVerifyImageTitleActionGroup">
+        <annotations>
+            <description>Verifies image title on the View Details panel</description>
+        </annotations>
+        <arguments>
+            <argument name="title"/>
+        </arguments>
+
+        <grabTextFrom selector="{{AdminEnhancedMediaGalleryViewDetailsSection.title}}" stepKey="grabImageTitle"/>
+        <assertStringContainsString stepKey="verifyImageTitle">
+            <actualResult type="variable">grabImageTitle</actualResult>
+            <expectedResult type="string">{{title}}</expectedResult>
+        </assertStringContainsString>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryViewImageDetailsActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryViewImageDetailsActionGroup.xml
new file mode 100644
index 0000000000000..b5c0bbac69bec
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryViewImageDetailsActionGroup.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="AdminEnhancedMediaGalleryViewImageDetails">
+        <annotations>
+            <description>Opens View Details panel for the first image in the media gallery grid</description>
+        </annotations>
+
+        <click selector="{{AdminEnhancedMediaGalleryImageActionsSection.openContextMenu}}" stepKey="openContextMenu"/>
+        <click selector="{{AdminEnhancedMediaGalleryImageActionsSection.viewDetails}}" stepKey="viewDetails"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryApplySelectFilterActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryApplySelectFilterActionGroup.xml
new file mode 100644
index 0000000000000..6ddb6311c1a7e
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryApplySelectFilterActionGroup.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="AdminMediaGalleryApplySelectFilterActionGroup">
+        <annotations>
+            <description>Applies select filter to the media gallery grid</description>
+        </annotations>
+        <arguments>
+            <argument name="filterLabel" type="string"/>
+            <argument name="optionLabel" type="string"/>
+        </arguments>
+
+        <click selector="{{AdminEnhancedMediaGalleryFiltersSection.selectFilter(filterLabel)}}" stepKey="openSelectFilter"/>
+        <click selector="{{AdminEnhancedMediaGalleryFiltersSection.selectFilterOption(filterLabel, optionLabel)}}" stepKey="selectFilterOption"/>
+     </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryApplyUsedInFilterActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryApplyUsedInFilterActionGroup.xml
new file mode 100644
index 0000000000000..a930f65b71040
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryApplyUsedInFilterActionGroup.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="AdminMediaGalleryApplyUsedInFilterActionGroup">
+        <annotations>
+            <description>Applies Show Images Used In filter to the media gallery grid</description>
+        </annotations>
+        <arguments>
+            <argument name="entityType" type="string"/>
+        </arguments>
+
+        <click selector="{{AdminEnhancedMediaGalleryFiltersSection.usedInSelectDropdown}}" stepKey="openUsedInfilter"/>
+        <click selector="{{AdminEnhancedMediaGalleryFiltersSection.usedInEntityType(entityType)}}" stepKey="selectEntityType"/>
+        <click selector="{{AdminEnhancedMediaGalleryFiltersSection.searchOptionsFilterDone('Show Images Used In')}}" stepKey="clickDone"/>
+     </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertCategoryNameInCategoryGridActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertCategoryNameInCategoryGridActionGroup.xml
new file mode 100644
index 0000000000000..42d723f0811d3
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertCategoryNameInCategoryGridActionGroup.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="AdminMediaGalleryAssertCategoryNameInCategoryGridActionGroup">
+        <annotations>
+            <description>Asserts category name in category grid page</description>
+        </annotations>
+        <arguments>
+            <argument name="categoryName" type="string"/>
+        </arguments>
+
+        <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.name('1', categoryName)}}" stepKey="assertNameColumn"/>
+     </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertFolderDoesNotExistActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertFolderDoesNotExistActionGroup.xml
new file mode 100644
index 0000000000000..d0d9817da6d34
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertFolderDoesNotExistActionGroup.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="AdminMediaGalleryAssertFolderDoesNotExistActionGroup">
+        <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"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertFolderNameActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertFolderNameActionGroup.xml
new file mode 100644
index 0000000000000..7d71c764bc8de
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertFolderNameActionGroup.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="AdminMediaGalleryAssertFolderNameActionGroup">
+        <arguments>
+            <argument name="name" type="string" defaultValue="{{AdminMediaGalleryFolderData.name}}"/>
+        </arguments>
+        <waitForElementVisible selector="//div[contains(@class, 'media-directory-container')]//a[contains(text(), '{{name}}')]" stepKey="waitForFolder"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertImageInGridActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertImageInGridActionGroup.xml
new file mode 100644
index 0000000000000..6785558c8ef54
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertImageInGridActionGroup.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="AdminMediaGalleryAssertImageInGridActionGroup">
+        <annotations>
+            <description>Asserts that image exists in media gallery grid</description>
+        </annotations>
+        <arguments>
+            <argument name="title"/>
+        </arguments>
+        <waitForElementVisible selector="{{AdminEnhancedMediaGalleryImageActionsSection.imageInGrid(title)}}" stepKey="waitForImageToBeVisible"/>
+
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertImageNotExistsInTheGridActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertImageNotExistsInTheGridActionGroup.xml
new file mode 100644
index 0000000000000..cc4de51357de0
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertImageNotExistsInTheGridActionGroup.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="AdminMediaGalleryAssertImageNotExistsInTheGridActionGroup">
+        <annotations>
+            <description>Asserts that image does not exists in media gallery grid</description>
+        </annotations>
+        <arguments>
+            <argument name="title"/>
+        </arguments>
+        <dontSeeElement selector="{{AdminEnhancedMediaGalleryImageActionsSection.imageInGrid(title)}}" stepKey="waitForImageToBeVisible"/>
+
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryClickAddSelectedActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryClickAddSelectedActionGroup.xml
new file mode 100644
index 0000000000000..28dcc1c553a5a
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryClickAddSelectedActionGroup.xml
@@ -0,0 +1,16 @@
+<?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="AdminMediaGalleryClickAddSelectedActionGroup">
+        <waitForElementVisible selector="{{AdminMediaGalleryHeaderButtonsSection.addSelected}}" stepKey="waitForAddSelectedButton"/>
+        <click selector="{{AdminMediaGalleryHeaderButtonsSection.addSelected}}" stepKey="ClickAddSelected"/>
+        <wait time="5" stepKey="waitForImageToBeAdded"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryClickImageInGridActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryClickImageInGridActionGroup.xml
new file mode 100644
index 0000000000000..ee2ff887488a4
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryClickImageInGridActionGroup.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="AdminMediaGalleryClickImageInGridActionGroup">
+        <annotations>
+            <description>Select image on enhanced media gallery</description>
+        </annotations>
+        <arguments>
+            <argument name="imageName" type="string"/>
+        </arguments>
+        <waitForElementVisible selector="{{AdminEnhancedMediaGalleryImageActionsSection.imageInGrid(imageName)}}" stepKey="waitForImageToBeVisible"/>
+        <click selector="{{AdminEnhancedMediaGalleryImageActionsSection.imageInGrid(imageName)}}" stepKey="clickOnImage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryClickOkButtonTinyMce4ActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryClickOkButtonTinyMce4ActionGroup.xml
new file mode 100644
index 0000000000000..3e555c25e0a98
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryClickOkButtonTinyMce4ActionGroup.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="AdminMediaGalleryClickOkButtonTinyMce4ActionGroup">
+        <annotations>
+            <description>Click ok button on upload image tinyMce4 popup.</description>
+        </annotations>
+
+        <waitForElementVisible selector="{{MediaGallerySection.OkBtn}}" stepKey="waitForOkBtn"/>
+        <click selector="{{MediaGallerySection.OkBtn}}" stepKey="clickOkBtn"/>
+        <waitForPageLoad stepKey="wait"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryCreateNewFolderActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryCreateNewFolderActionGroup.xml
new file mode 100644
index 0000000000000..f3ccc8ef7be04
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryCreateNewFolderActionGroup.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="AdminMediaGalleryCreateNewFolderActionGroup">
+        <arguments>
+            <argument name="name" type="string" defaultValue="{{AdminMediaGalleryFolderData.name}}"/>
+        </arguments>
+        <fillField selector="{{AdminMediaGalleryFolderSection.folderNameField}}" userInput="{{name}}" stepKey="setFolderName" />
+        <click selector="{{AdminMediaGalleryFolderSection.folderConfirmCreateButton}}" stepKey="clickCreateButton"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryEditAssetAddKeywordActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryEditAssetAddKeywordActionGroup.xml
new file mode 100644
index 0000000000000..964b33dd38d55
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryEditAssetAddKeywordActionGroup.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="AdminMediaGalleryEditAssetAddKeywordActionGroup">
+        <annotations>
+            <description>Set Keywords on the Edit Details panel</description>
+        </annotations>
+        <arguments>
+            <argument name="keyword"/>
+        </arguments>
+
+        <fillField selector="{{AdminEnhancedMediaGalleryEditDetailsSection.newKeyword}}" userInput="{{keyword}}" stepKey="enterKeyword"/>
+        <click selector="{{AdminEnhancedMediaGalleryEditDetailsSection.addNewKeyword}}" stepKey="addKeyword"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryEnhancedEnableActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryEnhancedEnableActionGroup.xml
new file mode 100644
index 0000000000000..8791c1b152249
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryEnhancedEnableActionGroup.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="AdminMediaGalleryEnhancedEnableActionGroup">
+        <arguments>
+            <argument name="enabled" type="string" defaultValue="{{MediaGalleryConfigDataDisabled.value}}"/>
+        </arguments>
+        <amOnPage url="{{AdminConfigSystemPage.url}}" stepKey="navigateToSystemConfigurationPage" />
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <scrollTo selector="{{AdminConfigSystemSection.enhancedMediaGalleryFieldset}}" stepKey="scrollToEnhancedMediaGalleryFieldset"/>
+        <conditionalClick stepKey="expandEnhancedMediaGalleryTab" selector="{{AdminConfigSystemSection.enhancedMediaGalleryFieldset}}" dependentSelector="{{AdminConfigSystemSection.enhancedMediaGalleryEnabledField}}" visible="false" />
+        <waitForElementVisible selector="{{AdminConfigSystemSection.enhancedMediaGalleryFieldset}}" stepKey="waitForFieldset" />
+        <selectOption userInput="{{enabled}}" selector="{{AdminConfigSystemSection.enhancedMediaGalleryEnabledField}}" stepKey="enableOrDisableMediaGallery"/>
+        <click selector="{{AdminConfigSystemSection.saveConfig}}" stepKey="saveConfiguration"/>
+        <waitForPageLoad stepKey="waitForConfigurationToSave"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryFolderDeleteActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryFolderDeleteActionGroup.xml
new file mode 100644
index 0000000000000..f7e8f551e681f
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryFolderDeleteActionGroup.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="AdminMediaGalleryFolderDeleteActionGroup">
+        <wait time="2" stepKey="waitBeforeDeleteButtonWillBeActive"/>
+        <click selector="{{AdminMediaGalleryFolderSection.folderDeleteButton}}" stepKey="clickDeleteButton"/>
+        <waitForElementVisible selector="{{AdminMediaGalleryFolderSection.folderDeleteModalHeader}}" stepKey="waitBeforeModalAppears"/>
+        <click selector="{{AdminMediaGalleryFolderSection.folderConfirmDeleteButton}}" stepKey="clickConfirmDeleteButton"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryFolderSelectActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryFolderSelectActionGroup.xml
new file mode 100644
index 0000000000000..b8ed1d4f1cd25
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryFolderSelectActionGroup.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="AdminMediaGalleryFolderSelectActionGroup">
+        <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"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForFolderContents"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryImageDeleteActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryImageDeleteActionGroup.xml
new file mode 100644
index 0000000000000..e6cbbfbc1f48d
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryImageDeleteActionGroup.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="AdminMediaGalleryImageDeleteActionGroup">
+        <annotations>
+            <description>Delete image from the Enhanced Media Gallery using header delete button</description>
+        </annotations>
+        <waitForElementVisible selector="{{AdminMediaGalleryHeaderButtonsSection.deleteSelected}}" stepKey="waitForDeleteSelectedButton"/>
+        <click selector="{{AdminMediaGalleryHeaderButtonsSection.deleteSelected}}" stepKey="ClickDeleteSelectedButton"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForDeleteModal"/>
+        <click selector="{{AdminEnhancedMediaGalleryDeleteModalSection.confirmDelete}}" stepKey="confirmDelete"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryOpenNewFolderFormActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryOpenNewFolderFormActionGroup.xml
new file mode 100644
index 0000000000000..165522892f271
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryOpenNewFolderFormActionGroup.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="AdminMediaGalleryOpenNewFolderFormActionGroup">
+        <click selector="{{AdminMediaGalleryFolderSection.folderNewCreateButton}}" stepKey="clickCreateNewFolderButton"/>
+        <waitForElementVisible selector="{{AdminMediaGalleryFolderSection.folderNewModalHeader}}" stepKey="waitForModalOpen"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup.xml
new file mode 100644
index 0000000000000..6f38bd7c7d738
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup.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="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup">
+        <annotations>
+            <description>Opens Enhanced MediaGallery from image uploader on category page</description>
+        </annotations>
+
+        <conditionalClick stepKey="clickExpandContent" selector="{{AdminCategoryContentSection.sectionHeader}}" dependentSelector="{{AdminCategoryContentSection.selectFromGalleryButton}}" visible="false" />
+        <waitForElementVisible selector="{{AdminCategoryContentSection.selectFromGalleryButton}}" stepKey="waitForSelectFromGallery" />
+        <click selector="{{AdminCategoryContentSection.selectFromGalleryButton}}" stepKey="clickSelectFromGallery" />
+        <waitForPageLoad stepKey="waitForPageLoad" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenMediaGalleryFromPageNoEditorActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenMediaGalleryFromPageNoEditorActionGroup.xml
new file mode 100644
index 0000000000000..0b2540de5288e
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenMediaGalleryFromPageNoEditorActionGroup.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="AdminOpenMediaGalleryFromPageNoEditorActionGroup">
+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickExpandContent"/>
+        <waitForElementVisible selector="{{CmsWYSIWYGSection.InsertImageBtn}}" stepKey="waitForInsertImageButton" />
+        <click selector="{{CmsWYSIWYGSection.InsertImageBtn}}" stepKey="clickInsertImage" />
+        <!-- wait for initial media gallery load, where the gallery chrome loads (and triggers loading modal) -->
+        <waitForPageLoad stepKey="waitForMediaGalleryInitialLoad"/>
+        <!-- wait for second media gallery load, where the gallery images load (and triggers loading modal once more) -->
+        <waitForPageLoad stepKey="waitForMediaGallerySecondaryLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenMediaGalleryFromTinyMce4IconActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenMediaGalleryFromTinyMce4IconActionGroup.xml
new file mode 100644
index 0000000000000..3143b4ff24fb4
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenMediaGalleryFromTinyMce4IconActionGroup.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="AdminOpenMediaGalleryTinyMce4ActionGroup">
+        <annotations>
+            <description>Opens Enhanced MediaGallery from category page  by tyniMce4 image icon</description>
+        </annotations>
+        
+        <click selector="{{AdminCategoryContentSection.sectionHeader}}" stepKey="clickExpandContent"/>
+        <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4" />
+        <click selector="{{TinyMCESection.InsertImageIcon}}" stepKey="clickInsertImageIcon" />
+        <waitForPageLoad stepKey="waitForPageLoad" />
+        <click selector="{{MediaGallerySection.Browse}}" stepKey="clickBrowse"/>
+        <waitForPageLoad stepKey="waitForPopup"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenStandaloneMediaGalleryActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenStandaloneMediaGalleryActionGroup.xml
new file mode 100644
index 0000000000000..1ef908f34918e
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenStandaloneMediaGalleryActionGroup.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="AdminOpenStandaloneMediaGalleryActionGroup">
+        <amOnPage url="{{AdminStandaloneMediaGalleryPage.url}}" stepKey="amOnStandaloneMediaGalleryPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGalleryImageDeletedActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGalleryImageDeletedActionGroup.xml
new file mode 100644
index 0000000000000..e9558ac87df3b
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGalleryImageDeletedActionGroup.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="AssertAdminEnhancedMediaGalleryImageDeletedActionGroup">
+        <annotations>
+            <description>Assert that an image was deleted from Enhanced Media Gallery.</description>
+        </annotations>
+        <arguments>
+            <argument name="title"/>
+        </arguments>
+        <see userInput='The asset "{{title}}" has been successfully deleted' stepKey="verifyDeleteImage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertImageAddedToPageContentActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertImageAddedToPageContentActionGroup.xml
new file mode 100644
index 0000000000000..ff11f1a5c7058
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertImageAddedToPageContentActionGroup.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="AssertImageAddedToPageContentActionGroup">
+        <annotations>
+            <description>Validates that the an image was added to the content.</description>
+        </annotations>
+        <arguments>
+            <argument name="imageName" type="string"/>
+        </arguments>
+       <grabValueFrom selector="{{CmsNewPagePageContentSection.content}}"  stepKey="grabTextFromContent"/>
+        <assertStringContainsString stepKey="assertContentContainsAddedImage">
+            <expectedResult type="string">{{imageName}}</expectedResult>
+            <actualResult type="variable">grabTextFromContent</actualResult>
+        </assertStringContainsString>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertImageAttributesOnEnhancedMediaGalleryActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertImageAttributesOnEnhancedMediaGalleryActionGroup.xml
new file mode 100644
index 0000000000000..e17be216335fb
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertImageAttributesOnEnhancedMediaGalleryActionGroup.xml
@@ -0,0 +1,36 @@
+<?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="AssertImageAttributesOnEnhancedMediaGalleryActionGroup">
+        <annotations>
+            <description>Assets image information on the Media Gallery grid</description>
+        </annotations>
+        <arguments>
+            <argument name="image"/>
+        </arguments>
+
+        <grabTextFrom selector="{{AdminEnhancedMediaGalleryImageDescriptionSection.title}}" stepKey="grabImageTitle"/>
+        <assertStringContainsString stepKey="verifyImageTitle">
+            <actualResult type="variable">grabImageTitle</actualResult>
+            <expectedResult type="string">{{image.fileName}}</expectedResult>
+        </assertStringContainsString>
+
+        <grabTextFrom selector="{{AdminEnhancedMediaGalleryImageDescriptionSection.contentType}}" stepKey="grabContentType"/>
+        <assertStringContainsStringIgnoringCase stepKey="verifyContentType">
+            <actualResult type="variable">grabContentType</actualResult>
+            <expectedResult type="string">{{image.extension}}</expectedResult>
+        </assertStringContainsStringIgnoringCase>
+
+        <grabTextFrom selector="{{AdminEnhancedMediaGalleryImageDescriptionSection.dimensions}}" stepKey="grabDimensions"/>
+        <assertNotEmpty stepKey="verifyDimensions">
+            <actualResult type="variable">grabDimensions</actualResult>
+        </assertNotEmpty>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/SearchStandaloneMediaGalleryAdminDataGridByKeywordActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/SearchStandaloneMediaGalleryAdminDataGridByKeywordActionGroup.xml
new file mode 100644
index 0000000000000..1d568fb6a1da4
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/SearchStandaloneMediaGalleryAdminDataGridByKeywordActionGroup.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="SearchStandaloneMediaGalleryAdminDataGridByKeywordActionGroup" extends="SearchAdminDataGridByKeywordActionGroup">
+        <annotations>
+            <description>EXTENDS: SearchAdminDataGridByKeywordActionGroup. Fills 'Search by keyword' on an Standalone Media Gallery Admin Grid page. Clicks on Submit Search.</description>
+        </annotations>
+        <arguments>
+            <argument name="keyword" type="string" defaultValue=""/>
+        </arguments>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/StoreFrontMediaGalleryAssertImageInCategoryDescriptionActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/StoreFrontMediaGalleryAssertImageInCategoryDescriptionActionGroup.xml
new file mode 100644
index 0000000000000..1ec5e7d802a61
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/StoreFrontMediaGalleryAssertImageInCategoryDescriptionActionGroup.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="StoreFrontMediaGalleryAssertImageInCategoryDescriptionActionGroup">
+        <arguments>
+            <argument name="categoryEntity" defaultValue="SimpleSubCategory"/>
+            <argument name="imageName" type="string"/>
+        </arguments>
+        <annotations>
+            <description>Navigates to the category page on the storefront and asserts that the image is present in description.</description>
+        </annotations>
+
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="openHomePage"/>
+        <waitForPageLoad stepKey="waitForStorefrontPageLoad"/>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(categoryEntity.name)}}" stepKey="toCategory"/>
+        <waitForPageLoad stepKey="waitForCategoryPage"/>
+        <seeElement selector="{{StorefrontCategoryMainSection.imageSource(imageName)}}" stepKey="seeImage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdminEnhancedMediaGalleryImageData.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdminEnhancedMediaGalleryImageData.xml
new file mode 100644
index 0000000000000..dbc298798ee8e
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdminEnhancedMediaGalleryImageData.xml
@@ -0,0 +1,43 @@
+<?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="UpdatedImageDetails" type="image">
+        <data key="title">renamed title</data>
+        <data key="description">test description</data>
+        <data key="file">magento.jpg</data>
+        <data key="fileName">renamed title</data>
+        <data key="extension">jpg</data>
+        <data key="keyword">newkeyword</data>
+    </entity>
+     <entity name="ImageUploadPng" type="uploadImage">
+        <data key="title" unique="suffix">Image1</data>
+        <data key="file_type">Upload File</data>
+        <data key="value">png.png</data>
+        <data key="file">png.png</data>
+        <data key="fileName">png</data>
+        <data key="extension">png</data>
+     </entity>
+          <entity name="ImageUploadGif" type="uploadImage">
+        <data key="title" unique="suffix">Image1</data>
+        <data key="file_type">Upload File</data>
+        <data key="value">gif.gif</data>
+        <data key="file">gif.gif</data>
+        <data key="fileName">gif</data>
+        <data key="extension">gif</data>
+    </entity>
+    <entity name="ImageMetadata" type="image">
+        <data key="title">Title of the magento image</data>
+        <data key="description">Description of the magento image</data>
+        <data key="file">magento3.jpg</data>
+        <data key="fileName">Title of the magento image</data>
+        <data key="extension">jpg</data>
+        <data key="keywords">magento, mediagallerymetadata</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdminMediaGalleryFolderData.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdminMediaGalleryFolderData.xml
new file mode 100644
index 0000000000000..e4149acdf58d1
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdminMediaGalleryFolderData.xml
@@ -0,0 +1,17 @@
+<?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="AdminMediaGalleryFolderData">
+        <data key="name" unique="suffix">folder</data>
+    </entity>
+    <entity name="AdminMediaGalleryFolderInvalidData">
+        <data key="name">,.?/:;'[{]}|~`!@#$%^*()_=+</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdobeStockConfigData.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdobeStockConfigData.xml
new file mode 100644
index 0000000000000..e8f394a006104
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdobeStockConfigData.xml
@@ -0,0 +1,18 @@
+<?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="MediaGalleryConfigDataEnabled">
+        <data key="path">system/media_gallery/enabled</data>
+        <data key="value">1</data>
+    </entity>
+    <entity name="MediaGalleryConfigDataDisabled">
+        <data key="path">system/media_gallery/enabled</data>
+        <data key="value">0</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Page/AdminStandaloneMediaGalleryPage.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Page/AdminStandaloneMediaGalleryPage.xml
new file mode 100644
index 0000000000000..f7ed27171db40
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Page/AdminStandaloneMediaGalleryPage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminStandaloneMediaGalleryPage" url="/media_gallery/media" area="admin" module="Magento_MediaGalleryUi"/>
+</pages>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminConfigSystemSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminConfigSystemSection.xml
new file mode 100644
index 0000000000000..e0305a8a6f172
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminConfigSystemSection.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="AdminConfigSystemSection">
+        <element name="enhancedMediaGalleryFieldset" type="block" selector="#system_media_gallery-head"/>
+        <element name="enhancedMediaGalleryEnabledField" type="select" selector="[data-ui-id='select-groups-media-gallery-fields-enabled-value']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryActionsSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryActionsSection.xml
new file mode 100644
index 0000000000000..2feaaa8594da2
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryActionsSection.xml
@@ -0,0 +1,17 @@
+<?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="AdminEnhancedMediaGalleryActionsSection">
+        <element name="upload" type="input" selector="#image-uploader-input"/>
+        <element name="cancel" type="button" selector="[data-ui-id='cancel-button']"/>
+        <element name="createFolder" type="button" selector="[data-ui-id='create-folder-button']"/>
+        <element name="deleteFolder" type="button" selector="[data-ui-id='delete-folder-button']"/>
+        <element name="imageSrc" type="text" selector="//div[@class='masonry-image-column' and contains(@data-repeat-index, '0')]//img[contains(@src,'{{src}}')]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryDeleteModalSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryDeleteModalSection.xml
new file mode 100644
index 0000000000000..b4071295bacf3
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryDeleteModalSection.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="AdminEnhancedMediaGalleryDeleteModalSection">
+        <element name="confirmDelete" type="button" selector=".media-gallery-delete-image-action .action-accept"/>
+        <element name="cancelDelete" type="button" selector=".media-gallery-delete-image-action .action-dismiss"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryEditDetailsSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryEditDetailsSection.xml
new file mode 100644
index 0000000000000..b8e2f698ccfe8
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryEditDetailsSection.xml
@@ -0,0 +1,20 @@
+<?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="AdminEnhancedMediaGalleryEditDetailsSection">
+        <element name="title" type="input" selector="#title"/>
+        <element name="fileName" type="text" selector="#path"/>
+        <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="cancel" type="button" selector="#image-details-action-cancel"/>
+        <element name="save" type="button" selector="#image-details-action-save"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryFiltersSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryFiltersSection.xml
new file mode 100644
index 0000000000000..32b109f1e0483
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryFiltersSection.xml
@@ -0,0 +1,29 @@
+<?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="AdminEnhancedMediaGalleryFiltersSection">
+        <element name="filtersButton" type="button" selector="//div[@class='media-gallery-container']//button[@data-action='grid-filter-expand']"/>
+        <element name="categoryGridFiltersButton" type="button" selector="//div[@class='media-gallery-category-container']//button[@data-action='grid-filter-expand']"/>
+        <element name="sourceFilterValue" type="select" parameterized="true" selector="//div[@class='media-gallery-container']//select[@name='source']//option[@value='{{option}}']"/>
+        <element name="applyFilters" type="button" selector="//div[@class='media-gallery-container']//button[@data-action='grid-filter-apply']"/>
+        <element name="categoryGridApplyFilters" type="button" selector="//div[@class='media-gallery-category-container']//button[@data-action='grid-filter-apply']"/>
+        <element name="activeFilter" type="text" selector="//div[@class='media-gallery-container']//div[@class='admin__current-filters-list-wrap']//span[contains( ., '{{filter}}')]" parameterized="true"/>
+        <element name="activeFilterPlaceholder" type="text" selector="//div[@class='media-gallery-container']//div[@class='admin__current-filters-list-wrap']"/>
+        <element name="usedInSelectDropdown" type="text" selector="//label[@class='admin__form-field-label']/span[text()='Show Images Used In']/parent::*/parent::div/div//div[@class='admin__action-multiselect-text' and text()='Select...']"/>
+        <element name="usedInEntityType" type="text" selector="//label[@class='admin__action-multiselect-label']/span[text()='{{entityType}}']" parameterized="true"/>
+        <element name="usedInDoneButton" type="button" selector="//div[@class='admin__action-multiselect-actions-wrap']/button/span[text()='Done']"/>
+        <element name="selectFilter" type="button" selector="//label[@class='admin__form-field-label']/span[text()='{{filterLabel}}']/parent::*/parent::div/div[@class='admin__form-field-control']/select" parameterized="true"/>
+        <element name="selectFilterOption" type="button" selector="//label[@class='admin__form-field-label']/span[text()='{{filterLabel}}']/parent::*/parent::div/div[@class='admin__form-field-control']/select/option[@data-title='{{optionLabel}}']" parameterized="true"/>
+        <element name="searchOptionsFilter" type="select" selector="//div[label/span[contains(text(), '{{filterName}}')]]//div[@class='action-select admin__action-multiselect']" parameterized="true" timeout="30"/>
+        <element name="searchOptionsFilterInput" type="input" selector="//div[label/span[contains(text(), '{{filterName}}')]]//input[@data-role='advanced-select-text']" parameterized="true" timeout="30"/>
+        <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']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml
new file mode 100644
index 0000000000000..3f13a57697e6f
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml
@@ -0,0 +1,17 @@
+<?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="AdminEnhancedMediaGalleryImageActionsSection">
+        <element name="openContextMenu" type="button" selector=".three-dots"/>
+        <element name="viewDetails" type="button" selector="[data-ui-id='action-image-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"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageDescriptionSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageDescriptionSection.xml
new file mode 100644
index 0000000000000..32cd99bfe6b11
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageDescriptionSection.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="AdminEnhancedMediaGalleryImageDescriptionSection">
+        <element name="title" type="text" selector=".masonry-image-description .name"/>
+        <element name="contentType" type="text" selector=".masonry-image-description .type"/>
+        <element name="dimensions" type="text" selector=".masonry-image-description .dimensions" />
+    </section>
+</sections>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml
new file mode 100644
index 0000000000000..a40a70c5f160c
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml
@@ -0,0 +1,16 @@
+<?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="AdminEnhancedMediaGalleryMassActionSection">
+        <element name="massActionCheckbox" type="button" selector="//input[@type='checkbox'][@data-ui-id ='{{imageName}}']" parameterized="true"/>
+        <element name="totalSelected" type="text" selector=".mediagallery-massaction-items-count > .selected_count_text"/>
+        <element name="cancelMassActionMode" type="button" selector="#cancel_massaction"/>
+        <element name="deleteSelected" type="button" selector="#delete_massaction"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryViewDetailsSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryViewDetailsSection.xml
new file mode 100644
index 0000000000000..0bcbeb0d7a00f
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryViewDetailsSection.xml
@@ -0,0 +1,24 @@
+<?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="AdminEnhancedMediaGalleryViewDetailsSection">
+        <element name="title" type="text" selector=".image-title"/>
+        <element name="contentType" type="text" selector="[data-ui-id='content-type']"/>
+        <element name="type" type="text" selector="//div[@class='attribute']/span[contains(text(), 'Type')]/following-sibling::div"/>
+        <element name="height" type="text" selector="//div[@class='attribute']/span[contains(text(), 'Height')]/following-sibling::div"/>
+        <element name="description" type="text" selector=".image-details-section.description p"/>
+        <element name="keywords" type="text" selector="//div[@class='tags-list']"/>
+        <element name="filename" type="text" selector=".image-details-section.filename p"/>
+        <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="addImage" type="button" selector=".add-image-action"/>
+        <element name="cancel" type="button" selector="#image-details-action-cancel"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryFolderSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryFolderSection.xml
new file mode 100644
index 0000000000000..4c9e6bf362194
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryFolderSection.xml
@@ -0,0 +1,22 @@
+<?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="AdminMediaGalleryFolderSection">
+        <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="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="folderNameValidationMessage" type="block" selector="label.mage-error"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryHeaderButtonsSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryHeaderButtonsSection.xml
new file mode 100644
index 0000000000000..9271c0ff61618
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryHeaderButtonsSection.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="AdminMediaGalleryHeaderButtonsSection">
+        <element name="addSelected" type="button" selector=".media-gallery-add-selected"/>
+        <element name="deleteSelected" type="button" selector="#delete_selected"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiSuite.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiSuite.xml
new file mode 100644
index 0000000000000..4749fc4a885b0
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiSuite.xml
@@ -0,0 +1,29 @@
+<?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="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="AdminLogoutActionGroup" stepKey="adminLogout"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableEnhancedMediaGallery"/>
+            <actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="enableWYSIWYG" />
+        </after>
+        <include>
+            <group name="media_gallery_ui"/>
+        </include>
+    </suite>
+</suites>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryDeleteImagesInBulkTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryDeleteImagesInBulkTest.xml
new file mode 100644
index 0000000000000..94831b039b53a
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryDeleteImagesInBulkTest.xml
@@ -0,0 +1,50 @@
+<?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="AdminEnhancedMediaGalleryDeleteImagesInBulkTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1488"/>
+            <title value="User deletes images with less clicks"/>
+            <stories value="[Story #42] User deletes images in bulk"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1054245/scenarios/4753539"/>
+            <description value="User deletes images with less clicks"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
+        </before>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
+            <argument name="image" value="ImageUpload"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadSecondImage">
+            <argument name="image" value="ImageUpload_1"/>
+        </actionGroup>
+
+        <actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToVerifyMode"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryAssertMassActionModeDetailsActionGroup" stepKey="assertMassActionModeAvailable">
+            <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}}"/>
+         </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectSecondImageToDelete">
+            <argument name="imageName" value="{{ImageUpload_1.fileName}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryAssertImagesDeletedInBulkActionGroup" stepKey="assertImagesDeleted"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryAssertMassActionModeNotActiveActionGroup" stepKey="assertMassectionModeDisabled"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryDuplicatedImagesTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryDuplicatedImagesTest.xml
new file mode 100644
index 0000000000000..52f3a8079e962
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryDuplicatedImagesTest.xml
@@ -0,0 +1,55 @@
+<?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="AdminEnhancedMediaGalleryDuplicatedImagesTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1500"/>
+            <title value="User can filter duplicated images"/>
+            <stories value="[Story 59] User finds image duplicates"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1054245/scenarios/4753539"/>
+            <description value="User can filter duplicated images"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
+        </before>
+        <after>
+        <actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
+        <actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete">
+            <argument name="imageName" value="{{ImageUpload.fileName}}"/>
+         </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectSecondImageToDelete">
+            <argument name="imageName" value="{{ImageUpload_1.fileName}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
+        </after>
+
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
+            <argument name="image" value="ImageUpload"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadSecondImage">
+            <argument name="image" value="ImageUpload_1"/>
+        </actionGroup>
+
+        <actionGroup ref="AdminEnhancedMediaGalleryExpandFilterActionGroup" stepKey="expandFilters"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryApplyDuplicatedFilterActionGroup" stepKey="SelectDuplicatedFilter"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryApplyFiltersActionGroup" stepKey="applyFilters"/>
+
+        <actionGroup ref="AdminMediaGalleryAssertImageInGridActionGroup" stepKey="assertFirstImageInGrid">
+            <argument name="title" value="ImageUpload.filename"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryAssertImageInGridActionGroup" stepKey="assertSecondImageInGrid">
+            <argument name="title" value="ImageUpload_1.filename"/>
+        </actionGroup>
+       </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryUploadImageWithMetadataTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryUploadImageWithMetadataTest.xml
new file mode 100644
index 0000000000000..f026b87f7ec88
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryUploadImageWithMetadataTest.xml
@@ -0,0 +1,70 @@
+<?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="AdminEnhancedMediaGalleryUploadImageWithMetadataTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/428"/>
+            <title value="Magento extracts image meta data from file"/>
+            <stories value="Story 53 - Magento extracts image meta data from file"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1054245/scenarios/4653671"/>
+            <description value="Magento extracts image meta data from file"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
+        </before>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
+            <argument name="image" value="ImageUpload3"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="viewImageDetails"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageDescriptionActionGroup" stepKey="verifyImageDescription">
+            <argument name="description" value="ImageMetadata.description"/>
+        </actionGroup>
+       <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageKeywordsActionGroup" stepKey="verifyImageKeywords">
+            <argument name="keywords" value="ImageMetadata.keywords"/>
+       </actionGroup>
+       <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageTitleActionGroup" stepKey="verifyImageTitle">
+            <argument name="title" value="ImageMetadata.title"/>
+       </actionGroup>
+       <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsDeleteActionGroup" stepKey="deleteJpegImage"/>
+
+       <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadPngImage">
+            <argument name="image" value="ImageUploadPng"/>
+       </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="viewPngImageDetails"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageDescriptionActionGroup" stepKey="verifyPngImageDescription">
+            <argument name="description" value="ImageMetadata.description"/>
+        </actionGroup>
+       <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageKeywordsActionGroup" stepKey="verifyPngImageKeywords">
+            <argument name="keywords" value="ImageMetadata.keywords"/>
+       </actionGroup>
+       <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageTitleActionGroup" stepKey="verifyPngImageTitle">
+            <argument name="title" value="ImageMetadata.title"/>
+       </actionGroup>
+       <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsDeleteActionGroup" stepKey="deletePngImage"/>
+
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadGifImage">
+            <argument name="image" value="ImageUploadGif"/>
+       </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="viewGifImageDetails"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageDescriptionActionGroup" stepKey="verifyGifImageDescription">
+            <argument name="description" value="ImageMetadata.description"/>
+        </actionGroup>
+       <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageKeywordsActionGroup" stepKey="verifyGifImageKeywords">
+            <argument name="keywords" value="ImageMetadata.keywords"/>
+       </actionGroup>
+       <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageTitleActionGroup" stepKey="verifyGifImageTitle">
+            <argument name="title" value="ImageMetadata.title"/>
+       </actionGroup>
+       <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsDeleteActionGroup" stepKey="deleteGifImage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyAssetFilterTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyAssetFilterTest.xml
new file mode 100644
index 0000000000000..67bb09298893d
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyAssetFilterTest.xml
@@ -0,0 +1,80 @@
+<?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="AdminEnhancedMediaGalleryVerifyAssetFilterTest">
+        <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"/>
+            <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"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openCategoryPage"/>
+            <actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="openCategory">
+               <argument name="category" value="$$category$$"/>
+            </actionGroup>
+            <actionGroup ref="AdminOpenMediaGalleryTinyMce4ActionGroup" stepKey="openMediaGalleryFromWysiwyg"/>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolder">
+                <argument name="name" value="wysiwyg"/>
+           </actionGroup>
+           <actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
+           <actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete">
+                <argument name="imageName" value="{{ImageMetadata.title}}"/>
+           </actionGroup>
+           <actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectSecondImageToDelete">
+                <argument name="imageName" value="{{ImageUpload_1.fileName}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImage"/>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>            
+            <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
+        </after>
+
+        <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openCategoryPage"/>
+        <actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="openCategory">
+            <argument name="category" value="$$category$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminOpenMediaGalleryTinyMce4ActionGroup" stepKey="openMediaGalleryFromWysiwyg"/>
+        <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="AdminSaveCategoryActionGroup" stepKey="saveCategory"/>
+        <actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openCategoryGridPage"/>
+        
+        <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="AdminMediaGalleryAssertCategoryNameInCategoryGridActionGroup" stepKey="assertCategoryInGrid">
+            <argument name="categoryName" value="$$category.name$$"/>
+        </actionGroup>
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyNotUsedOptionFilterTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyNotUsedOptionFilterTest.xml
new file mode 100644
index 0000000000000..4719b98c78dbe
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyNotUsedOptionFilterTest.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="AdminEnhancedMediaGalleryVerifyNotUsedOptionFilterTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1489"/>
+            <title value="User filters images that are not used in the content"/>
+            <stories value="Story 52: User filters images that are not used in the content"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/4930844"/>
+            <description value="User filters images that are not used in the content"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolder">
+                <argument name="name" value="wysiwyg"/>
+           </actionGroup>
+           <actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
+           <actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete">
+                <argument name="imageName" value="{{ImageMetadata.title}}"/>
+           </actionGroup>
+           <actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectSecondImageToDelete">
+                <argument name="imageName" value="{{UpdatedImageDetails.title}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImage"/>
+            <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
+        </after>
+
+        <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openCategoryPage"/>
+        <actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="openCategory">
+            <argument name="category" value="$$category$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminOpenMediaGalleryTinyMce4ActionGroup" stepKey="openMediaGalleryFromWysiwyg"/>
+        <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="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="clickAddSelectedContentImage"/>
+        <actionGroup ref="AdminMediaGalleryClickOkButtonTinyMce4ActionGroup" stepKey="clickOkButton"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveCategory"/>
+        <actionGroup ref="AdminOpenMediaGalleryTinyMce4ActionGroup" stepKey="openMediaGalleryFromWysiwygToFilterImage"/>
+
+        <actionGroup ref="AdminEnhancedMediaGalleryExpandFilterActionGroup" stepKey="expandFilters"/>
+        <actionGroup ref="AdminMediaGalleryApplyUsedInFilterActionGroup" stepKey="applyUsedInCategoryFilter">
+            <argument name="entityType" value="Not used anywhere"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryApplyFiltersActionGroup" stepKey="applyFilters"/>
+
+        <actionGroup ref="AdminMediaGalleryAssertImageInGridActionGroup" stepKey="assertImageInGrid">
+            <argument name="title" value="ImageMetadata.title"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryAssertImageNotExistsInTheGridActionGroup" stepKey="assertImageNotExistsInGrid">
+            <argument name="title" value="UpdatedImageDetails.title"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyUsedInFilterTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyUsedInFilterTest.xml
new file mode 100644
index 0000000000000..d54399bdeb2b2
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyUsedInFilterTest.xml
@@ -0,0 +1,83 @@
+<?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="AdminEnhancedMediaGalleryVerifyUsedInFilterTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1567"/>
+            <title value="User filters images by the area they used in"/>
+            <stories value="User filters images by the area they used in"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/4930844"/>
+            <description value="User filters images by the area they used in"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolder">
+                <argument name="name" value="wysiwyg"/>
+           </actionGroup>
+           <actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
+           <actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete">
+                <argument name="imageName" value="{{ImageMetadata.title}}"/>
+           </actionGroup>
+           <actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectSecondImageToDelete">
+                <argument name="imageName" value="{{UpdatedImageDetails.title}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImage"/>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+            <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
+        </after>
+
+        <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openCategoryPage"/>
+        <actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="openCategory">
+            <argument name="category" value="$$category$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminOpenMediaGalleryTinyMce4ActionGroup" stepKey="openMediaGalleryFromWysiwyg"/>
+        <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="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="AdminMediaGalleryClickImageInGridActionGroup" stepKey="selectCategoryImageInGrid">
+            <argument name="imageName" value="{{ImageMetadata.title}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelectedContentImage"/>
+        <actionGroup ref="AdminMediaGalleryClickOkButtonTinyMce4ActionGroup" stepKey="clickOkButton"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveCategory"/>
+        <actionGroup ref="AdminOpenMediaGalleryTinyMce4ActionGroup" stepKey="openMediaGalleryFromWysiwygToFilterIMage"/>
+
+        <actionGroup ref="AdminEnhancedMediaGalleryExpandFilterActionGroup" stepKey="expandFilters"/>
+        <actionGroup ref="AdminMediaGalleryApplyUsedInFilterActionGroup" stepKey="applyUsedInCategoryFilter">
+            <argument name="entityType" value="Categories"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryApplyFiltersActionGroup" stepKey="applyFilters"/>
+
+        <actionGroup ref="AdminMediaGalleryAssertImageInGridActionGroup" stepKey="assertImageInGrid">
+            <argument name="title" value="ImageMetadata.title"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryAssertImageNotExistsInTheGridActionGroup" stepKey="assertImageNotExistsInGrid">
+            <argument name="title" value="UpdatedImageDetails.title"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryAddCategoryImageFromTwoComponentsTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryAddCategoryImageFromTwoComponentsTest.xml
new file mode 100644
index 0000000000000..cb7adf3307865
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryAddCategoryImageFromTwoComponentsTest.xml
@@ -0,0 +1,78 @@
+<?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="AdminMediaGalleryAddCategoryImageFromTwoComponentsTest">
+        <annotations>
+            <features value="AdminMediaGalleryImagePanel"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1168"/>
+            <title value="User add category image via wysiwyg and image uploader button"/>
+            <stories value="Story [54]: User inserts image rendition to the content with text area + Insert image button" />
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/943908/scenarios/4523889"/>
+            <description value="User add category image via wysiwyg and image uploader button"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
+            <actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete">
+                <argument name="imageName" value="{{ImageMetadata.title}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectSecondImageToDelete">
+                <argument name="imageName" value="{{UpdatedImageDetails.title}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
+
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+        </after>
+        <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openCategoryPage"/>
+        <actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="openCategory">
+            <argument name="category" value="$$category$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminOpenMediaGalleryTinyMce4ActionGroup" stepKey="openMediaGalleryFromWysiwyg"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadContentImage">
+            <argument name="image" value="ImageUpload3"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadCategoryImage">
+            <argument name="image" value="ImageUpload_1"/>
+        </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="clickAddSelectedContentImage"/>
+        <actionGroup ref="AdminMediaGalleryClickOkButtonTinyMce4ActionGroup" stepKey="clickOkButton"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveCategory"/>
+        <actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGalleryFromImageUploader"/>
+        <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolder">
+            <argument name="name" value="wysiwyg"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryClickImageInGridActionGroup" stepKey="selectCategoryImageInGrid">
+            <argument name="imageName" value="{{ImageMetadata.title}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelectedCategoryImage"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="reSaveCategory"/>
+        <actionGroup ref="StoreFrontMediaGalleryAssertImageInCategoryDescriptionActionGroup" stepKey="assertContentImageIsVisible">
+            <argument name="imageName" value="{{ImageUpload3.fileName}}"/>
+        </actionGroup>
+        <actionGroup ref="StoreFrontMediaGalleryAssertImageInCategoryDescriptionActionGroup" stepKey="assertCategoryImageIsVisible">
+            <argument name="imageName" value="{{ImageUpload_1.fileName}}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryAddCategoryImageTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryAddCategoryImageTest.xml
new file mode 100644
index 0000000000000..30f1412a5b08d
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryAddCategoryImageTest.xml
@@ -0,0 +1,55 @@
+<?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="AdminMediaGalleryAddCategoryImageTest">
+        <annotations>
+            <features value="AdminMediaGalleryImagePanel"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1073"/>
+            <title value="User add category image via wysiwyg"/>
+            <stories value="User add category image via wysiwyg"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/943908/scenarios/4484351"/>
+            <description value="User add category image via wysiwyg"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openCategoryPage"/>
+            <actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="openCategory">
+                <argument name="category" value="$$category$$"/>
+            </actionGroup>
+            <actionGroup ref="AdminOpenMediaGalleryTinyMce4ActionGroup" stepKey="openMediaGalleryFromWysiwyg"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="viewImageDetails"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsDeleteActionGroup" stepKey="deleteImage"/>
+            <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+        </after>
+        <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openCategoryPage"/>
+        <actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="openCategory">
+            <argument name="category" value="$$category$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminOpenMediaGalleryTinyMce4ActionGroup" stepKey="openMediaGalleryFromWysiwyg"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
+            <argument name="image" value="ImageUpload3"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryClickImageInGridActionGroup" stepKey="selectImageInGrid">
+            <argument name="imageName" value="{{ImageMetadata.title}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelectedImage"/>
+        <actionGroup ref="AdminMediaGalleryClickOkButtonTinyMce4ActionGroup" stepKey="clickOkButton"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveCategory"/>
+        <actionGroup ref="StoreFrontMediaGalleryAssertImageInCategoryDescriptionActionGroup" stepKey="assertImageInCategoryDescriptionField">
+            <argument name="imageName" value="{{ImageUpload3.fileName}}" />
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryAddFromImageDetailsTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryAddFromImageDetailsTest.xml
new file mode 100644
index 0000000000000..94307fa510a50
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryAddFromImageDetailsTest.xml
@@ -0,0 +1,41 @@
+<?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="AdminMediaGalleryAddFromImageDetailsTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1229"/>
+            <stories value="[Story #38] User views basic image attributes in Media Gallery"/>
+            <title value="Adding image from the Image Details"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1054245/scenarios/4569982"/>
+            <description value="Adding image from the Image Details"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="openNewPage"/>
+            <actionGroup ref="AdminOpenMediaGalleryFromPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
+                <argument name="image" value="ImageUpload"/>
+            </actionGroup>
+        </before>
+        <after>
+            <actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="openNewPage"/>
+            <actionGroup ref="AdminOpenMediaGalleryFromPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="viewImageDetails"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsDeleteActionGroup" stepKey="deleteImage"/>
+        </after>
+        <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="viewImageDetails"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryAddImageFromImageDetailsActionGroup" stepKey="addImageFromViewDetails"/>
+        <actionGroup ref="AssertImageAddedToPageContentActionGroup" stepKey="assertImageAddedToContent">
+            <argument name="imageName" value="{{ImageUpload.fileName}}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryCreateDeleteFolderTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryCreateDeleteFolderTest.xml
new file mode 100644
index 0000000000000..6e6f5240e84be
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryCreateDeleteFolderTest.xml
@@ -0,0 +1,57 @@
+<?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="AdminMediaGalleryCreateDeleteFolderTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1046; https://github.com/magento/adobe-stock-integration/issues/1047"/>
+            <stories value="Creating, deleting new folder functionality in Media Gallery"/>
+            <title value="Creating, deleting new folder functionality in Media Gallery"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1054245/scenarios/4456547; https://studio.cucumber.io/projects/131313/test-plan/folders/1054245/scenarios/4457075"/>
+            <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.name}}"/>
+        </actionGroup>
+
+        <grabTextFrom selector="{{AdminMediaGalleryFolderSection.folderNameValidationMessage}}" stepKey="grabValidationMessage"/>
+        <assertStringContainsString stepKey="assertFirst">
+            <actualResult type="variable">grabValidationMessage</actualResult>
+            <expectedResult type="string">Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.</expectedResult>
+        </assertStringContainsString>
+
+        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolder"/>
+        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertNewFolderCreated"/>
+
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
+
+        <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolder"/>
+        <seeElement selector="{{AdminMediaGalleryFolderSection.folderDeleteButton}}" stepKey="deleteFolderButtonIsNotDisabled"/>
+        <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="unselectFolder"/>
+        <seeElement selector="{{AdminMediaGalleryFolderSection.folderDeleteButton}}, :disabled" stepKey="deleteFolderButtonIsDisabledAgain"/>
+
+        <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolderForDelete"/>
+
+        <click selector="{{AdminMediaGalleryFolderSection.folderDeleteButton}}" stepKey="clickDeleteButton"/>
+        <waitForElementVisible selector="{{AdminMediaGalleryFolderSection.folderCancelDeleteButton}}" stepKey="waitBeforeModalLoads"/>
+        <click selector="{{AdminMediaGalleryFolderSection.folderCancelDeleteButton}}" stepKey="cancelDeleteFolder"/>
+        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertFolderWasNotDeleted"/>
+
+        <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFolder"/>
+        <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFolderWasDeleted"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteImageContextMenuTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteImageContextMenuTest.xml
new file mode 100644
index 0000000000000..980d6b7c85c20
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteImageContextMenuTest.xml
@@ -0,0 +1,33 @@
+<?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="AdminMediaGalleryDeleteImageContextMenuTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/710"/>
+            <title value="Uploading and deleting an image using context menu"/>
+            <stories value="[Story #52] User accesses Media Gallery from the main navigation"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1054245/scenarios/4753539"/>
+            <description value="Uploading and deleting an image using context menu"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
+        </before>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
+            <argument name="image" value="ImageUpload3"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryImageDeleteActionGroup" stepKey="deleteImage"/>
+        <actionGroup ref="AssertAdminEnhancedMediaGalleryImageDeletedActionGroup" stepKey="assertImageDeleted">
+            <argument name="title" value="ImageMetadata.title"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteImageFileTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteImageFileTest.xml
new file mode 100644
index 0000000000000..ad364e7709a33
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteImageFileTest.xml
@@ -0,0 +1,41 @@
+<?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="AdminMediaGalleryDeleteImageFileTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1094"/>
+            <title value="Deleting new image file functionality in Enhanced Media Gallery"/>
+            <stories value="Deleting new image file functionality in Enhanced Media Gallery"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1054245/scenarios/4756652"/>
+            <description value="Deleting new image file functionality in Enhanced 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="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
+            <argument name="image" value="ImageUpload"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
+        <actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete">
+            <argument name="imageName" value="{{ImageUpload.fileName}}"/>
+        </actionGroup>
+
+        <actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
+
+        <actionGroup ref="AssertAdminEnhancedMediaGalleryImageDeletedActionGroup" stepKey="verifyImageIsDeleted">
+            <argument name="title" value="ImageUpload.filename"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteImageWithWarningPopupTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteImageWithWarningPopupTest.xml
new file mode 100644
index 0000000000000..6ae8ed7047434
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteImageWithWarningPopupTest.xml
@@ -0,0 +1,56 @@
+<?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="AdminMediaGalleryDeleteImageWithWarningPopupTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1511"/>
+            <title value="User sees warning when deleting image if it's used on storefront"/>
+            <stories value="User sees warning when deleting image if it's used on storefront"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/4843896"/>
+            <description value="User sees warning when deleting image if it's used on storefront"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+            <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
+        </after>
+
+        <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openCategoryPage"/>
+        <actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="openCategory">
+            <argument name="category" value="$$category$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminOpenMediaGalleryTinyMce4ActionGroup" stepKey="openMediaGalleryFromWysiwyg"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadCategoryImage">
+            <argument name="image" value="ImageUpload3"/>
+        </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="AdminSaveCategoryActionGroup" stepKey="saveCategory"/>
+        <actionGroup ref="AdminOpenMediaGalleryTinyMce4ActionGroup" stepKey="openMediaGalleryFromWysiwygToAssertMessage"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
+        <actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete">
+            <argument name="imageName" value="{{ImageMetadata.title}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryAssertWarningMessageActionGroup" stepKey="assertMessageImageUsedIn">
+            <argument name="messageText" value="The selected assets are used in the content of the following entities: Categories(1)"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDisabledContentFilterTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDisabledContentFilterTest.xml
new file mode 100644
index 0000000000000..963a0b954e45b
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDisabledContentFilterTest.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="AdminMediaGalleryDisabledContentFilterTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1464"/>
+            <title value="User filter asset by disabled content"/>
+            <stories value="Story 57: User filters images by the area they used in"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/4970565"/>
+            <description value="User filter asset by disabled content"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+            <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+        </after>
+        <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openCategoryPage"/>
+        <actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="openCategory">
+            <argument name="category" value="$$category$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminOpenMediaGalleryTinyMce4ActionGroup" stepKey="openMediaGalleryFromWysiwyg"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
+            <argument name="image" value="ImageUpload3"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryClickImageInGridActionGroup" stepKey="selectImageInGrid">
+            <argument name="imageName" value="{{ImageMetadata.title}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelectedImage"/>
+        <actionGroup ref="AdminMediaGalleryClickOkButtonTinyMce4ActionGroup" stepKey="clickOkButton"/>
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+        <actionGroup ref="AdminEnableCategoryActionGroup" stepKey="disableCategory"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveCategory"/>
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryExpandFilterActionGroup" stepKey="expandFilters"/>
+        <actionGroup ref="AdminMediaGalleryApplySelectFilterActionGroup" stepKey="selectFilterOption">
+            <argument name="filterLabel" value="Content Status"/>
+            <argument name="optionLabel" value="Disabled"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryApplyFiltersActionGroup" stepKey="applyFilters"/>
+        <actionGroup ref="AdminMediaGalleryAssertImageInGridActionGroup" stepKey="assertImageInGrid">
+            <argument name="title" value="ImageMetadata.title"/>
+        </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/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryEditImageDetailsTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryEditImageDetailsTest.xml
new file mode 100644
index 0000000000000..960443998d010
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryEditImageDetailsTest.xml
@@ -0,0 +1,48 @@
+<?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="AdminMediaGalleryEditImageDetailsTest">
+        <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"/>
+            <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"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsDeleteActionGroup" stepKey="deleteImage"/>
+        </after>
+
+        <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/AdminMediaGalleryEnabledContentFilterTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryEnabledContentFilterTest.xml
new file mode 100644
index 0000000000000..c2b167912dda7
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryEnabledContentFilterTest.xml
@@ -0,0 +1,57 @@
+<?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="AdminMediaGalleryEnabledContentFilterTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1464"/>
+            <title value="User filter asset by enabled content"/>
+            <stories value="Story 57: User filters images by the area they used in"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/4970565"/>
+            <description value="User filter asset by enabled content"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminEnhancedMediaGalleryImageDeleteActionGroup" stepKey="deleteImage"/>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+            <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+        </after>
+        <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openCategoryPage"/>
+        <actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="openCategory">
+            <argument name="category" value="$$category$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminOpenMediaGalleryTinyMce4ActionGroup" stepKey="openMediaGalleryFromWysiwyg"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
+            <argument name="image" value="ImageUpload3"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryClickImageInGridActionGroup" stepKey="selectImageInGrid">
+            <argument name="imageName" value="{{ImageMetadata.title}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelectedImage"/>
+        <actionGroup ref="AdminMediaGalleryClickOkButtonTinyMce4ActionGroup" stepKey="clickOkButton"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveCategory"/>
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryExpandFilterActionGroup" stepKey="expandFilters"/>
+        <actionGroup ref="AdminMediaGalleryApplySelectFilterActionGroup" stepKey="selectFilterOption">
+            <argument name="filterLabel" value="Content Status"/>
+            <argument name="optionLabel" value="Enabled"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryApplyFiltersActionGroup" stepKey="applyFilters"/>
+        <actionGroup ref="AdminMediaGalleryAssertImageInGridActionGroup" stepKey="assertImageInGrid">
+            <argument name="title" value="ImageMetadata.title"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryFilterImagesBySourceTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryFilterImagesBySourceTest.xml
new file mode 100644
index 0000000000000..e1e7bf1f0bcbb
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryFilterImagesBySourceTest.xml
@@ -0,0 +1,53 @@
+<?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="AdminMediaGalleryFilterImagesBySourceTest">
+        <annotations>
+            <features value="AdminMediaGalleryImagePanel"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1393"/>
+            <title value="User filters images by source filter"/>
+            <stories value="[Story # 38] User views basic image attributes in Media Gallery" />
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1337102/scenarios/4760144"/>
+            <description value="User filters images by source filter"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+          <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+          <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="viewContentImageDetails"/>
+          <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageDetailsActionGroup" stepKey="verifyImageDetails">
+            <argument name="image" value="ImageUpload"/>
+          </actionGroup>
+          <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsDeleteActionGroup" stepKey="deleteContentImage"/>
+        </after>
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadContentImage">
+            <argument name="image" value="ImageUpload3"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryExpandFilterActionGroup" stepKey="expandFilters"/>
+        <actionGroup ref="AdminEnhancedMediaGallerySelectSourceFilterActionGroup" stepKey="applyLocalFilter">
+            <argument name="filterValue" value="Local"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryApplyFiltersActionGroup" stepKey="applyFilters"/>
+        <actionGroup ref="AdminMediaGalleryAssertImageInGridActionGroup" stepKey="assertImageInGrid">
+            <argument name="title" value="ImageMetadata.title"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryExpandFilterActionGroup" stepKey="expandFilterToApplySourceFilter"/>
+        <actionGroup ref="AdminEnhancedMediaGallerySelectSourceFilterActionGroup" stepKey="applyAdobeStockFilter">
+            <argument name="filterValue" value="Adobe Stock"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryApplyFiltersActionGroup" stepKey="applyFiltersWithAdobeStockOption"/>
+        <actionGroup ref="AdminMediaGalleryAssertImageNotExistsInTheGridActionGroup" stepKey="assertImageNotExistsInGrid">
+            <argument name="title" value="ImageMetadata.title"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySaveFiltersStateTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySaveFiltersStateTest.xml
new file mode 100644
index 0000000000000..b8ce1f76ad4c8
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySaveFiltersStateTest.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="AdminMediaGallerySaveFiltersStateTest">
+        <annotations>
+            <features value="AdminMediaGalleryImagePanel"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1397"/>
+            <title value="User is able to use bookmarks controls for filter views in Standalone Media Gallery"/>
+            <stories value="User is able to use bookmarks controls in Standalone Media Gallery"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1337102/scenarios/4763040"/>
+            <description value="User is able to use bookmarks controls for filter views in Standalone Media Gallery"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+          <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+        </after>
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryExpandFilterActionGroup" stepKey="expandFilters"/>
+        <actionGroup ref="AdminEnhancedMediaGallerySelectSourceFilterActionGroup" stepKey="applyLocalFilter">
+            <argument name="filterValue" value="Local"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryApplyFiltersActionGroup" stepKey="applyFilters"/>
+        <actionGroup ref="AdminEnhancedMediaGallerySaveCustomViewActionGroup" stepKey="saveCustomView"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryAssertActiveFiltersActionGroup" stepKey="assertFilterApplied">
+            <argument name="resultValue" value="Uploaded Locally"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGallerySelectCustomBookmarksViewActionGroup" stepKey="selectDefaultView">
+            <argument name="selectView" value="Default View"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryAssertNoActiveFiltersAppliedActionGroup" stepKey="assertNoActiveFilters"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryDeleteGridViewActionGroup" stepKey="deleteView">
+            <argument name="viewToDelete" value="Test View"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryStoreViewCategoryFilterTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryStoreViewCategoryFilterTest.xml
new file mode 100644
index 0000000000000..eceda879e5597
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryStoreViewCategoryFilterTest.xml
@@ -0,0 +1,62 @@
+<?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="AdminMediaGalleryStoreViewCategoryFilterTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1464"/>
+            <title value="User filter asset by category store view"/>
+            <stories value="Story 57: User filters images by the area they used in"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/4970870"/>
+            <description value="User filter asset by category store view"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+        </after>
+        <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openCategoryPage"/>
+        <actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="openCategory">
+            <argument name="category" value="$$category$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminOpenMediaGalleryTinyMce4ActionGroup" stepKey="openMediaGalleryFromWysiwyg"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
+            <argument name="image" value="ImageUpload3"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryClickImageInGridActionGroup" stepKey="selectImageInGrid">
+            <argument name="imageName" value="{{ImageMetadata.title}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelectedImage"/>
+        <actionGroup ref="AdminMediaGalleryClickOkButtonTinyMce4ActionGroup" stepKey="clickOkButton"/>
+        <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveCategory"/>
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryExpandFilterActionGroup" stepKey="expandFilters"/>
+        <actionGroup ref="AdminMediaGalleryApplySelectFilterActionGroup" stepKey="selectFilterOption">
+            <argument name="filterLabel" value="Store View"/>
+            <argument name="optionLabel" value="Main Website/Main Website Store/Default Store View"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryApplyFiltersActionGroup" stepKey="applyFilters"/>
+        <actionGroup ref="AdminMediaGalleryAssertImageInGridActionGroup" stepKey="assertImageInGrid">
+            <argument name="title" value="ImageMetadata.title"/>
+        </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/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryStoreViewContentFilterTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryStoreViewContentFilterTest.xml
new file mode 100644
index 0000000000000..86cae11267eaa
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryStoreViewContentFilterTest.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="AdminMediaGalleryStoreViewContentFilterTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1464"/>
+            <title value="User filter asset by content store view"/>
+            <stories value="Story 57: User filters images by the area they used in"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/4970870"/>
+            <description value="User filter asset by content store view"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCmsPage" stepKey="createCMSPage" />
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+            <deleteData createDataKey="createCMSPage" stepKey="deleteCmsPage"/>
+        </after>
+        <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
+            <argument name="CMSPage" value="$$createCMSPage$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminOpenMediaGalleryFromPageNoEditorActionGroup" stepKey="openMediaGallery"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
+            <argument name="image" value="ImageUpload3"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryClickImageInGridActionGroup" stepKey="selectImageInGrid">
+            <argument name="imageName" value="{{ImageMetadata.title}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelectedImage"/>
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+        <click selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="clickSavePage"/>
+        <waitForPageLoad stepKey="waitForPageSave"/>
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryExpandFilterActionGroup" stepKey="expandFilters"/>
+        <actionGroup ref="AdminMediaGalleryApplySelectFilterActionGroup" stepKey="selectFilterOption">
+            <argument name="filterLabel" value="Store View"/>
+            <argument name="optionLabel" value="Main Website/Main Website Store/Default Store View"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryApplyFiltersActionGroup" stepKey="applyFilters"/>
+        <actionGroup ref="AdminMediaGalleryAssertImageInGridActionGroup" stepKey="assertImageInGrid">
+            <argument name="title" value="ImageMetadata.title"/>
+        </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/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml
new file mode 100644
index 0000000000000..ca7a71258fead
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.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="AdminMediaGalleryUploadCategoryImageTest">
+        <annotations>
+            <features value="AdminMediaGalleryImagePanel"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1435"/>
+            <stories value="User uploads image outside of the Media Gallery"/>
+            <title value="User uploads image outside of the Media Gallery"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/943908/scenarios/4836631"/>
+            <description value="User uploads image outside of the Media Gallery"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="viewContentImageDetails"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsDeleteActionGroup" stepKey="deleteCategoryImage"/>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+        </after>
+        <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openCategoryPage"/>
+        <actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="openCategory">
+            <argument name="category" value="$$category$$"/>
+        </actionGroup>
+        <actionGroup ref="AddCategoryImageActionGroup" stepKey="addCategoryImage"/>
+        <actionGroup ref="AdminSaveCategoryFormActionGroup" stepKey="saveCategoryForm"/>
+        <actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGalleryFromImageUploader"/>
+        <actionGroup ref="AdminMediaGalleryAssertImageInGridActionGroup" stepKey="assertImageInGrid">
+            <argument name="title" value="ProductImage.filename"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryVerifyImageGridAttributesTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryVerifyImageGridAttributesTest.xml
new file mode 100644
index 0000000000000..01a26cce1b6fb
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryVerifyImageGridAttributesTest.xml
@@ -0,0 +1,37 @@
+<?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="AdminMediaGalleryVerifyImageGridAttributesTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/708"/>
+            <title value="Verify image grid attributes"/>
+            <stories value="[Story #41] User views limited image information from the image grid in Media Gallery" />
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1054245/scenarios/3839218"/>
+            <description value="User views basic image attributes in Media Gallery grid"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminEnhancedMediaGalleryImageDeleteActionGroup" stepKey="deleteImage"/>
+        </after>
+
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
+            <argument name="image" value="ImageUpload"/>
+        </actionGroup>
+
+        <actionGroup ref="AssertImageAttributesOnEnhancedMediaGalleryActionGroup" stepKey="assertImageAttributes">
+            <argument name="image" value="ImageUpload"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryViewDetailsDeleteImageTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryViewDetailsDeleteImageTest.xml
new file mode 100644
index 0000000000000..00fc07eb6c1af
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryViewDetailsDeleteImageTest.xml
@@ -0,0 +1,37 @@
+<?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="AdminMediaGalleryViewDetailsDeleteImageTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/461"/>
+            <title value="Deleting an image from view details panel"/>
+            <stories value="[Story #42] User deletes images"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1337102/scenarios/4516773"/>
+            <description value="Deleting an image from view details panel"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
+        </before>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
+            <argument name="image" value="ImageUpload3"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="viewImageDetails"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageDetailsActionGroup" stepKey="verifyImageDetails">
+            <argument name="image" value="ImageMetadata"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsDeleteActionGroup" stepKey="deleteImage"/>
+        <actionGroup ref="AssertAdminEnhancedMediaGalleryImageDeletedActionGroup" stepKey="assertImageDeleted">
+            <argument name="title" value="ImageMetadata.title"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryViewDetailsEditTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryViewDetailsEditTest.xml
new file mode 100644
index 0000000000000..92909bcf06795
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryViewDetailsEditTest.xml
@@ -0,0 +1,46 @@
+<?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="AdminMediaGalleryViewDetailsEditTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1581"/>
+            <title value="Editing an image from view details panel"/>
+            <stories value="[Story #44] User edits image meta data in Media Gallery"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/3961351"/>
+            <description value="Editing an image from view details panel"/>
+            <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="AdminEnhancedMediaGalleryViewImageDetails" stepKey="viewImageDetails"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsEditActionGroup" stepKey="editImage"/>
+        <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="AdminEnhancedMediaGalleryVerifyImageDescriptionActionGroup" stepKey="verifyImageDescription">
+            <argument name="description" value="UpdatedImageDetails.description"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryViewDetailsTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryViewDetailsTest.xml
new file mode 100644
index 0000000000000..c9447d5cc8a52
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryViewDetailsTest.xml
@@ -0,0 +1,40 @@
+<?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="AdminMediaGalleryViewDetailsTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/428"/>
+            <title value="View image details"/>
+            <stories value="[Story # 38] User views basic image attributes in Media Gallery"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1054245/scenarios/4653671"/>
+            <description value="User views basic image attributes in Media Gallery"/>
+            <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="AdminEnhancedMediaGalleryViewImageDetails" stepKey="viewImageDetails"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageDetailsActionGroup" stepKey="verifyImageDetails">
+            <argument name="image" value="ImageUpload"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageFilenameActionGroup" stepKey="verifyFilename">
+            <argument name="filename" value="{{ImageUpload.file}}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryCreateDeleteFolderTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryCreateDeleteFolderTest.xml
new file mode 100644
index 0000000000000..164ab523d508a
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryCreateDeleteFolderTest.xml
@@ -0,0 +1,56 @@
+<?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="AdminStandaloneMediaGalleryCreateDeleteFolderTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1119; https://github.com/magento/adobe-stock-integration/issues/1120"/>
+            <stories value="Creating, deleting new folder functionality in Standalone Media Gallery"/>
+            <title value="Creating, deleting new folder functionality in Standalone Media Gallery"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1337102/scenarios/4503041; https://studio.cucumber.io/projects/131313/test-plan/folders/1337102/scenarios/4503101"/>
+            <description value="Creating, deleting new folder functionality in Standalone Media Gallery"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
+        </before>
+
+        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderForm"/>
+        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolderWithNotValidName">
+            <argument name="name" value="{{AdminMediaGalleryFolderInvalidData.name}}"/>
+        </actionGroup>
+
+        <grabTextFrom selector="{{AdminMediaGalleryFolderSection.folderNameValidationMessage}}" stepKey="grabValidationMessage"/>
+        <assertStringContainsString stepKey="assertFirst">
+            <actualResult type="variable">grabValidationMessage</actualResult>
+            <expectedResult type="string">Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.</expectedResult>
+        </assertStringContainsString>
+
+        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolder"/>
+        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertNewFolderCreated"/>
+
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGalleryForPage"/>
+        <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolder"/>
+        <seeElement selector="{{AdminMediaGalleryFolderSection.folderDeleteButton}}" stepKey="deleteFolderButtonIsNotDisabled"/>
+        <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="unselectFolder"/>
+        <seeElement selector="{{AdminMediaGalleryFolderSection.folderDeleteButton}}, :disabled" stepKey="deleteFolderButtonIsDisabledAgain"/>
+
+        <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolderForDelete"/>
+
+        <click selector="{{AdminMediaGalleryFolderSection.folderDeleteButton}}" stepKey="clickDeleteButton"/>
+        <waitForElementVisible selector="{{AdminMediaGalleryFolderSection.folderCancelDeleteButton}}" stepKey="waitBeforeModalLoads"/>
+        <click selector="{{AdminMediaGalleryFolderSection.folderCancelDeleteButton}}" stepKey="cancelDeleteFolder"/>
+        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertFolderWasNotDeleted"/>
+
+        <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFolder"/>
+        <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFolderWasDeleted"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsTest.xml
new file mode 100644
index 0000000000000..ede3a452e4ca5
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsTest.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="AdminStandaloneMediaGalleryEditImageDetailsTest">
+        <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"/>
+            <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"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsDeleteActionGroup" stepKey="deleteImage"/>
+        </after>
+
+        <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/AdminStandaloneMediaGalleryViewDetailsEditTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryViewDetailsEditTest.xml
new file mode 100644
index 0000000000000..2cf6bf5dfe623
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryViewDetailsEditTest.xml
@@ -0,0 +1,55 @@
+<?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="AdminStandaloneMediaGalleryViewDetailsEditTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1581"/>
+            <title value="Editing an image from standalone view details panel"/>
+            <stories value="[Story #44] User edits image meta data in Media Gallery"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/3961351"/>
+            <description value="Editing an image from standalone view details panel"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsDeleteActionGroup" stepKey="deleteImage"/>
+        </after>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
+            <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"/>
+        </actionGroup>
+        <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="AdminEnhancedMediaGalleryVerifyImageDescriptionActionGroup" stepKey="verifyImageDescription">
+            <argument name="description" value="UpdatedImageDetails.description"/>
+        </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>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryViewDetailsTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryViewDetailsTest.xml
new file mode 100644
index 0000000000000..bb7071497ce24
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryViewDetailsTest.xml
@@ -0,0 +1,40 @@
+<?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="AdminStandaloneMediaGalleryViewDetailsTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/428"/>
+            <title value="View image details 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/1337102/scenarios/4503223"/>
+            <description value="User views basic image attributes in Media Gallery"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsDeleteActionGroup" stepKey="deleteImage"/>
+        </after>
+
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
+            <argument name="image" value="ImageUpload"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="viewImageDetails"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageDetailsActionGroup" stepKey="verifyImageDetails">
+            <argument name="image" value="ImageUpload"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageFilenameActionGroup" stepKey="verifyFilename">
+            <argument name="filename" value="{{ImageUpload.file}}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Unit/Model/ConfigTest.php b/app/code/Magento/MediaGalleryUi/Test/Unit/Model/ConfigTest.php
new file mode 100644
index 0000000000000..3d4e523d0d6b1
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Unit/Model/ConfigTest.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Test\Unit\Model;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\MediaGalleryUi\Model\Config;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Config data test.
+ */
+class ConfigTest extends TestCase
+{
+    private const XML_PATH_ENABLED = 'system/media_gallery/enabled';
+
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var ScopeConfigInterface|MockObject
+     */
+    private $scopeConfigMock;
+
+    /**
+     * Prepare test objects.
+     */
+    protected function setUp(): void
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
+        $this->config = $this->objectManager->getObject(
+            Config::class,
+            [
+                'scopeConfig' => $this->scopeConfigMock
+            ]
+        );
+    }
+
+    /**
+     * Get Magento media gallery enabled test.
+     */
+    public function testIsEnabled(): void
+    {
+        $this->scopeConfigMock->expects($this->once())
+            ->method('isSetFlag')
+            ->with(self::XML_PATH_ENABLED)
+            ->willReturn(true);
+        $this->assertEquals(true, $this->config->isEnabled());
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Test/Unit/Model/UploadImageTest.php b/app/code/Magento/MediaGalleryUi/Test/Unit/Model/UploadImageTest.php
new file mode 100644
index 0000000000000..fc8a0756a7b55
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Unit/Model/UploadImageTest.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Test\Unit\Model;
+
+use Magento\Cms\Model\Wysiwyg\Images\Storage;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\Read;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\MediaGalleryUi\Model\UploadImage;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Provides test for upload image functionality
+ */
+class UploadImageTest extends TestCase
+{
+    /**
+     * @var Storage|MockObject
+     */
+    private $imagesStorageMock;
+
+    /**
+     * @var Filesystem|MockObject
+     */
+    private $fileSystemMock;
+
+    /**
+     * @var Read|MockObject
+     */
+    private $mediaDirectoryMock;
+
+    /**
+     * @var UploadImage
+     */
+    private $uploadImage;
+
+    /**
+     * Prepare test objects.
+     */
+    protected function setUp(): void
+    {
+        $this->imagesStorageMock = $this->createMock(Storage::class);
+        $this->fileSystemMock = $this->createMock(Filesystem::class);
+        $this->mediaDirectoryMock = $this->createMock(Read::class);
+
+        $this->uploadImage = (new ObjectManager($this))->getObject(
+            UploadImage::class,
+            [
+                'imagesStorage' => $this->imagesStorageMock,
+                'filesystem' => $this->fileSystemMock,
+            ]
+        );
+    }
+
+    /**
+     * Test successful image file upload.
+     *
+     * @param string $targetFolder
+     * @param string|null $type
+     * @param string $absolutePath
+     *
+     * @dataProvider executeDataProvider
+     */
+    public function testExecute(string $targetFolder, string $type = null, string $absolutePath): void
+    {
+        $this->fileSystemMock->expects($this->once())
+            ->method('getDirectoryRead')
+            ->with(DirectoryList::MEDIA)
+            ->willReturn($this->mediaDirectoryMock);
+
+        $this->mediaDirectoryMock->expects($this->once())
+            ->method('isDirectory')
+            ->with($targetFolder)
+            ->willReturn(true);
+
+        $this->mediaDirectoryMock->expects($this->once())
+            ->method('getAbsolutePath')
+            ->with($targetFolder)
+            ->willReturn($absolutePath);
+
+        $uploadResult = ['path' => 'media/catalog', 'file' => 'test-image.jpeg'];
+        $this->imagesStorageMock->expects($this->once())
+            ->method('uploadFile')
+            ->with($absolutePath, $type)
+            ->willReturn($uploadResult);
+
+        $this->uploadImage->execute($targetFolder, $type);
+    }
+
+    /**
+     * Test upload image method with logical exception when the folder is not a folder.
+     */
+    public function testExecuteWithException(): void
+    {
+        $targetFolder = 'not-a-folder';
+        $type = 'image';
+        $this->fileSystemMock->expects($this->once())
+            ->method('getDirectoryRead')
+            ->with(DirectoryList::MEDIA)
+            ->willReturn($this->mediaDirectoryMock);
+
+        $this->mediaDirectoryMock->expects($this->once())
+            ->method('isDirectory')
+            ->with($targetFolder)
+            ->willReturn(false);
+
+        $this->expectException(LocalizedException::class);
+        $this->expectExceptionMessage('Directory not-a-folder does not exist in media directory.');
+
+        $this->uploadImage->execute($targetFolder, $type);
+    }
+
+    /**
+     * Provides test case data.
+     *
+     * @return array
+     */
+    public function executeDataProvider(): array
+    {
+        return [
+            [
+                'targetFolder' => 'media/catalog',
+                'type' => 'image',
+                'absolutePath' => 'root/pub/media/catalog/test-image.jpeg'
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Test/Unit/_files/subdir/test_img2.jpeg b/app/code/Magento/MediaGalleryUi/Test/Unit/_files/subdir/test_img2.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..5244f8dc420e188df576181f313075c73b176d13
GIT binary patch
literal 58077
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
A9smFU

literal 0
HcmV?d00001

diff --git a/app/code/Magento/MediaGalleryUi/Test/Unit/_files/test_img1.jpeg b/app/code/Magento/MediaGalleryUi/Test/Unit/_files/test_img1.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..5244f8dc420e188df576181f313075c73b176d13
GIT binary patch
literal 58077
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
A9smFU

literal 0
HcmV?d00001

diff --git a/app/code/Magento/MediaGalleryUi/Ui/Component/DirectoriesTree.php b/app/code/Magento/MediaGalleryUi/Ui/Component/DirectoriesTree.php
new file mode 100644
index 0000000000000..4047a4fcb98d8
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Ui/Component/DirectoriesTree.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Ui\Component;
+
+use Magento\Framework\UrlInterface;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Ui\Component\Container;
+
+/**
+ * Directories tree component
+ */
+class DirectoriesTree extends Container
+{
+    /**
+     * @var UrlInterface
+     */
+    private $url;
+
+    /**
+     * Constructor
+     *
+     * @param ContextInterface $context
+     * @param UrlInterface $url
+     * @param array $components
+     * @param array $data
+     */
+    public function __construct(
+        ContextInterface $context,
+        UrlInterface $url,
+        array $components = [],
+        array $data = []
+    ) {
+        parent::__construct($context, $components, $data);
+        $this->url = $url;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function prepare(): void
+    {
+        parent::prepare();
+        $this->setData(
+            'config',
+            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")
+                ]
+            )
+        );
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Ui/Component/ImageUploader.php b/app/code/Magento/MediaGalleryUi/Ui/Component/ImageUploader.php
new file mode 100644
index 0000000000000..ad5e27381dee2
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Ui/Component/ImageUploader.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Ui\Component;
+
+use Magento\Framework\File\Size;
+use Magento\Framework\UrlInterface;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Ui\Component\Container;
+
+/**
+ * Image Uploader component
+ */
+class ImageUploader extends Container
+{
+    private const ACCEPT_FILE_TYPES = '/(\.|\/)(gif|jpe?g|png)$/i';
+    private const ALLOWED_EXTENSIONS = 'jpg jpeg png gif';
+
+    /**
+     * @var UrlInterface
+     */
+    private $url;
+
+    /**
+     * @var Size
+     */
+    private $size;
+
+    /**
+     * @param Size $size
+     * @param ContextInterface $context
+     * @param UrlInterface $url
+     * @param array $components
+     * @param array $data
+     */
+    public function __construct(
+        Size $size,
+        ContextInterface $context,
+        UrlInterface $url,
+        array $components = [],
+        array $data = []
+    ) {
+        parent::__construct($context, $components, $data);
+        $this->size = $size;
+        $this->url = $url;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function prepare(): void
+    {
+        parent::prepare();
+        $this->setData(
+            'config',
+            array_replace_recursive(
+                (array) $this->getData('config'),
+                [
+                    'imageUploadUrl' => $this->url->getUrl('media_gallery/image/upload', ['type' => 'image']),
+                    'acceptFileTypes' => self::ACCEPT_FILE_TYPES,
+                    'allowedExtensions' => self::ALLOWED_EXTENSIONS,
+                    'maxFileSize' => $this->size->getMaxFileSize()
+                ]
+            )
+        );
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Ui/Component/ImageUploaderStandAlone.php b/app/code/Magento/MediaGalleryUi/Ui/Component/ImageUploaderStandAlone.php
new file mode 100644
index 0000000000000..1fc5a80960a69
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Ui/Component/ImageUploaderStandAlone.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Ui\Component;
+
+/**
+ * Image Uploader component
+ */
+class ImageUploaderStandAlone extends ImageUploader
+{
+
+    /**
+     * @inheritdoc
+     */
+    public function prepare(): void
+    {
+        parent::prepare();
+        $this->setData(
+            'config',
+            array_replace_recursive(
+                (array) $this->getData('config'),
+                [
+                    'actionsPath' => 'standalone_media_gallery_listing.standalone_media_gallery_listing' .
+                        '.media_gallery_columns.thumbnail_url',
+                    'directoriesPath' => 'standalone_media_gallery_listing.standalone_media_gallery_listing' .
+                        '.media_gallery_directories',
+                    'messagesPath' => 'standalone_media_gallery_listing.standalone_media_gallery_listing.messages'
+                ]
+            )
+        );
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Columns/SourceIconProvider.php b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Columns/SourceIconProvider.php
new file mode 100644
index 0000000000000..aec99bf7d3b8c
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Columns/SourceIconProvider.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Ui\Component\Listing\Columns;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+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;
+use Magento\Ui\Component\Listing\Columns\Column;
+
+/**
+ * Source icon url provider
+ */
+class SourceIconProvider extends Column
+{
+    /**
+     * @var array
+     */
+    private $sourceIcons;
+
+    /**
+     * @var AssetRepository
+     */
+    private $assetRepository;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @param ContextInterface $context
+     * @param UiComponentFactory $uiComponentFactory
+     * @param AssetRepository $assetRepository
+     * @param ScopeConfigInterface $scopeConfig
+     * @param array $components
+     * @param array $data
+     * @param array $sourceIcons
+     */
+    public function __construct(
+        ContextInterface $context,
+        UiComponentFactory $uiComponentFactory,
+        AssetRepository $assetRepository,
+        ScopeConfigInterface $scopeConfig,
+        array $components = [],
+        array $data = [],
+        array $sourceIcons = []
+    ) {
+        parent::__construct($context, $uiComponentFactory, $components, $data);
+        $this->assetRepository = $assetRepository;
+        $this->scopeConfig = $scopeConfig;
+        $this->sourceIcons = $sourceIcons;
+    }
+
+    /**
+     * Prepare Data Source
+     *
+     * @param array $dataSource
+     * @return array
+     */
+    public function prepareDataSource(array $dataSource): array
+    {
+        if (isset($dataSource['data']['items']) && is_iterable($dataSource['data']['items'])) {
+            foreach ($dataSource['data']['items'] as &$item) {
+                $item[$this->getData('name')] = $item[$this->getData('name')]
+                    ? $this->getSourceIconUrl($item[$this->getData('name')])
+                    : null;
+            }
+        }
+
+        return $dataSource;
+    }
+
+    /**
+     * Construct source icon url based on the source code matching
+     *
+     * @param string $sourceName
+     *
+     * @return string|null
+     */
+    public function getSourceIconUrl(string $sourceName): ?string
+    {
+        return isset($this->sourceIcons[$sourceName])
+            ? $this->assetRepository->getUrlWithParams(
+                $this->sourceIcons[$sourceName],
+                ['_secure' => $this->isSecure()]
+            )
+            : null;
+    }
+
+    /**
+     * Check if store use secure connection
+     *
+     * @return bool
+     */
+    private function isSecure(): bool
+    {
+        return $this->scopeConfig->isSetFlag(Store::XML_PATH_SECURE_IN_ADMINHTML);
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Columns/Url.php b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Columns/Url.php
new file mode 100644
index 0000000000000..481f8ab861f0f
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Columns/Url.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\Ui\Component\Listing\Columns;
+
+use Magento\Backend\Model\UrlInterface;
+use Magento\Cms\Helper\Wysiwyg\Images;
+use Magento\Cms\Model\Wysiwyg\Images\Storage;
+use Magento\Framework\Exception\NoSuchEntityException;
+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;
+
+/**
+ * Overlay column
+ */
+class Url extends Column
+{
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * UrlInterface $urlInterface
+     */
+    private $urlInterface;
+
+    /**
+     * @var Images
+     */
+    private $images;
+
+    /**
+     * @var Storage
+     */
+    private $storage;
+
+    /**
+     * @param ContextInterface $context
+     * @param UiComponentFactory $uiComponentFactory
+     * @param StoreManagerInterface $storeManager
+     * @param UrlInterface $urlInterface
+     * @param Images $images
+     * @param Storage $storage
+     * @param array $components
+     * @param array $data
+     */
+    public function __construct(
+        ContextInterface $context,
+        UiComponentFactory $uiComponentFactory,
+        StoreManagerInterface $storeManager,
+        UrlInterface $urlInterface,
+        Images $images,
+        Storage $storage,
+        array $components = [],
+        array $data = []
+    ) {
+        parent::__construct($context, $uiComponentFactory, $components, $data);
+        $this->storeManager = $storeManager;
+        $this->urlInterface = $urlInterface;
+        $this->images = $images;
+        $this->storage = $storage;
+    }
+
+    /**
+     * Prepare Data Source
+     *
+     * @param array $dataSource
+     * @return array
+     * @throws NoSuchEntityException
+     */
+    public function prepareDataSource(array $dataSource): array
+    {
+        if (isset($dataSource['data']['items'])) {
+            foreach ($dataSource['data']['items'] as & $item) {
+                $item['encoded_id'] = $this->images->idEncode($item['path']);
+                $item[$this->getData('name')] = $this->getUrl($item[$this->getData('name')]);
+            }
+        }
+
+        return $dataSource;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function prepare(): void
+    {
+        parent::prepare();
+        $this->setData(
+            'config',
+            array_replace_recursive(
+                (array)$this->getData('config'),
+                [
+                    'onInsertUrl' => $this->urlInterface->getUrl('cms/wysiwyg_images/oninsert'),
+                    'storeId' => $this->storeManager->getStore()->getId()
+                ]
+            )
+        );
+    }
+
+    /**
+     * Get URL for the provided media asset path
+     *
+     * @param string $path
+     * @return string
+     * @throws NoSuchEntityException
+     */
+    private function getUrl(string $path): string
+    {
+        return $this->storage->getThumbnailUrl($this->images->getStorageRoot() . $path);
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Asset.php b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Asset.php
new file mode 100644
index 0000000000000..273cf9e37554b
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Asset.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\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\MediaContentApi\Api\GetContentByAssetIdsInterface;
+use Magento\Ui\Component\Filters\FilterModifier;
+use Magento\Ui\Component\Filters\Type\Select;
+
+/**
+ * Asset  filter
+ */
+class Asset extends Select
+{
+    /**
+     * @var GetContentByAssetIdsInterface
+     */
+    private $getContentIdentities;
+
+    /**
+     * @param ContextInterface $context
+     * @param UiComponentFactory $uiComponentFactory
+     * @param FilterBuilder $filterBuilder
+     * @param FilterModifier $filterModifier
+     * @param OptionSourceInterface $optionsProvider
+     * @param GetContentByAssetIdsInterface $getContentIdentities
+     * @param array $components
+     * @param array $data
+     */
+    public function __construct(
+        ContextInterface $context,
+        UiComponentFactory $uiComponentFactory,
+        FilterBuilder $filterBuilder,
+        FilterModifier $filterModifier,
+        OptionSourceInterface $optionsProvider = null,
+        GetContentByAssetIdsInterface $getContentIdentities,
+        array $components = [],
+        array $data = []
+    ) {
+        $this->uiComponentFactory = $uiComponentFactory;
+        $this->filterBuilder = $filterBuilder;
+        parent::__construct(
+            $context,
+            $uiComponentFactory,
+            $filterBuilder,
+            $filterModifier,
+            $optionsProvider,
+            $components,
+            $data
+        );
+        $this->getContentIdentities = $getContentIdentities;
+    }
+
+    /**
+     * Apply filter
+     *
+     * @return void
+     */
+    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);
+        }
+    }
+
+    /**
+     * Return entity ids by assets ids.
+     *
+     * @param array $ids
+     */
+    private function getEntityIdsByAsset(array $ids): string
+    {
+        if (!empty($ids)) {
+            $categoryIds = [];
+            $data = $this->getContentIdentities->execute($ids);
+            foreach ($data as $identity) {
+                if ($identity->getEntityType() === $this->_data['config']['entityType']) {
+                    $categoryIds[] = $identity->getEntityId();
+                }
+            }
+            return implode(',', $categoryIds);
+        }
+        return '';
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Options/Status.php b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Options/Status.php
new file mode 100644
index 0000000000000..31c658a6c4208
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Options/Status.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Ui\Component\Listing\Filters\Options;
+
+use Magento\Framework\Data\OptionSourceInterface;
+
+/**
+ * Status filter options
+ */
+class Status implements OptionSourceInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function toOptionArray(): array
+    {
+        return [
+            ['value' => '1', 'label' => __('Enabled')],
+            ['value' => '0', 'label' => __('Disabled')]
+        ];
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Options/Store.php b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Options/Store.php
new file mode 100644
index 0000000000000..cf49377c19837
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Options/Store.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Ui\Component\Listing\Filters\Options;
+
+use Magento\Store\Ui\Component\Listing\Column\Store\Options as StoreOptions;
+
+/**
+ * Store Options for content field
+ */
+class Store extends StoreOptions
+{
+    /**
+     * All Store Views value
+     */
+    const ALL_STORE_VIEWS = '0';
+
+    /**
+     * Get options
+     *
+     * @return array
+     */
+    public function toOptionArray()
+    {
+        if ($this->options !== null) {
+            return $this->options;
+        }
+
+        $this->currentOptions['All Store Views']['label'] = __('All Store Views');
+        $this->currentOptions['All Store Views']['value'] = self::ALL_STORE_VIEWS;
+
+        $this->generateCurrentOptions();
+
+        $this->options = array_values($this->currentOptions);
+
+        return $this->options;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Options/UsedIn.php b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Options/UsedIn.php
new file mode 100644
index 0000000000000..d3f758a510888
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Options/UsedIn.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Ui\Component\Listing\Filters\Options;
+
+use Magento\Framework\Data\OptionSourceInterface;
+
+/**
+ * Used in filter options
+ */
+class UsedIn implements OptionSourceInterface
+{
+    /**
+     * @var array
+     */
+    private $options;
+
+    /**
+     * @param array $options
+     */
+    public function __construct(array $options = [])
+    {
+        $this->options = $options;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function toOptionArray(): array
+    {
+        return $this->options;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Provider.php b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Provider.php
new file mode 100644
index 0000000000000..160097967165d
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Provider.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\MediaGalleryUi\Ui\Component\Listing;
+
+use Magento\Framework\Data\Collection\Db\FetchStrategyInterface as FetchStrategy;
+use Magento\Framework\Data\Collection\EntityFactoryInterface as EntityFactory;
+use Magento\Framework\Event\ManagerInterface as EventManager;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult;
+use Magento\MediaGalleryApi\Api\Data\AssetInterface;
+use Magento\MediaGalleryApi\Api\Data\AssetKeywordsInterface;
+use Magento\MediaGalleryApi\Api\Data\KeywordInterface;
+use Magento\MediaGalleryApi\Api\GetAssetsKeywordsInterface;
+use Psr\Log\LoggerInterface as Logger;
+
+class Provider extends SearchResult
+{
+    /**
+     * @var GetAssetsKeywordsInterface
+     */
+    private $getAssetKeywords;
+
+    /**
+     * @param EntityFactory $entityFactory
+     * @param Logger $logger
+     * @param FetchStrategy $fetchStrategy
+     * @param EventManager $eventManager
+     * @param GetAssetsKeywordsInterface $getAssetKeywords
+     * @param string $mainTable
+     * @param null|string $resourceModel
+     * @param null|string $identifierName
+     * @param null|string $connectionName
+     * @throws LocalizedException
+     */
+    public function __construct(
+        EntityFactory $entityFactory,
+        Logger $logger,
+        FetchStrategy $fetchStrategy,
+        EventManager $eventManager,
+        GetAssetsKeywordsInterface $getAssetKeywords,
+        $mainTable = 'media_gallery_asset',
+        $resourceModel = null,
+        $identifierName = null,
+        $connectionName = null
+    ) {
+        parent::__construct(
+            $entityFactory,
+            $logger,
+            $fetchStrategy,
+            $eventManager,
+            $mainTable,
+            $resourceModel,
+            $identifierName,
+            $connectionName
+        );
+        $this->getAssetKeywords = $getAssetKeywords;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getData()
+    {
+        $data = parent::getData();
+        $keywords = [];
+        foreach ($this->_items as $asset) {
+            $keywords[$asset->getId()] = array_map(function (AssetKeywordsInterface $assetKeywords) {
+                return array_map(function (KeywordInterface $keyword) {
+                    return $keyword->getKeyword();
+                }, $assetKeywords->getKeywords());
+            }, $this->getAssetKeywords->execute([$asset->getId()]));
+        }
+
+        /** @var AssetInterface $asset */
+        foreach ($data as $key => $asset) {
+            $data[$key]['thumbnail_url'] = $asset['path'];
+            $data[$key]['content_type'] = strtoupper(str_replace('image/', '', $asset['content_type']));
+            $data[$key]['preview_url'] = $asset['path'];
+            $data[$key]['keywords'] = isset($keywords[$asset['id']]) ? implode(",", $keywords[$asset['id']]) : '';
+            $data[$key]['source'] = empty($asset['source']) ? __('Local') : $asset['source'];
+        }
+        return $data;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/composer.json b/app/code/Magento/MediaGalleryUi/composer.json
new file mode 100644
index 0000000000000..f4701306eb369
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/composer.json
@@ -0,0 +1,30 @@
+{
+    "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"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\MediaGalleryUi\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/etc/adminhtml/di.xml b/app/code/Magento/MediaGalleryUi/etc/adminhtml/di.xml
new file mode 100644
index 0000000000000..bf07512d13d4f
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/etc/adminhtml/di.xml
@@ -0,0 +1,70 @@
+<?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\MediaGalleryUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor\ContentField">
+        <arguments>
+            <argument name="getAssetIdsByContentStatus" xsi:type="object">Magento\MediaContentApi\Api\GetAssetIdsByContentFieldInterface</argument>
+        </arguments>
+    </type>
+    <virtualType name="Magento\MediaGalleryUi\Model\Api\SearchCriteria\CollectionProcessor\FilterProcessor" type="Magento\Framework\Api\SearchCriteria\CollectionProcessor\FilterProcessor">
+        <arguments>
+            <argument name="customFilters" xsi:type="array">
+                <item name="path" xsi:type="object">Magento\MediaGalleryUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor\Directory</item>
+                <item name="fulltext" xsi:type="object">Magento\MediaGalleryUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor\Keyword</item>
+                <item name="entity_type" xsi:type="object">Magento\MediaGalleryUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor\EntityType</item>
+                <item name="duplicated" xsi:type="object">Magento\MediaGalleryUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor\Duplicated</item>
+                <item name="content_status" xsi:type="object">Magento\MediaGalleryUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor\ContentField</item>
+                <item name="store_id" xsi:type="object">Magento\MediaGalleryUi\Model\SearchCriteria\CollectionProcessor\FilterProcessor\ContentField</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\MediaGalleryUi\Model\Api\SearchCriteria\CollectionProcessor\SortingProcessor" type="Magento\Framework\Api\SearchCriteria\CollectionProcessor\SortingProcessor" />
+    <virtualType name="Magento\MediaGalleryUi\Model\Api\SearchCriteria\CollectionProcessor\PaginationProcessor" type="Magento\Framework\Api\SearchCriteria\CollectionProcessor\PaginationProcessor" />
+    <virtualType name="Magento\MediaGalleryUi\Model\Api\SearchCriteria\CollectionProcessor\JoinProcessor" type="Magento\Framework\Api\SearchCriteria\CollectionProcessor\JoinProcessor" />
+    <virtualType name="Magento\MediaGalleryUi\Model\Api\SearchCriteria\CollectionProcessor" type="Magento\Framework\Api\SearchCriteria\CollectionProcessor">
+        <arguments>
+            <argument name="processors" xsi:type="array">
+                <item name="filters" xsi:type="object">Magento\MediaGalleryUi\Model\Api\SearchCriteria\CollectionProcessor\FilterProcessor</item>
+                <item name="sorting" xsi:type="object">Magento\MediaGalleryUi\Model\Api\SearchCriteria\CollectionProcessor\SortingProcessor</item>
+                <item name="pagination" xsi:type="object">Magento\MediaGalleryUi\Model\Api\SearchCriteria\CollectionProcessor\PaginationProcessor</item>
+                <item name="joins" xsi:type="object">Magento\MediaGalleryUi\Model\Api\SearchCriteria\CollectionProcessor\JoinProcessor</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\MediaGalleryUi\Model\Listing\DataProvider">
+        <arguments>
+            <argument name="collectionProcessor" xsi:type="object">Magento\MediaGalleryUi\Model\Api\SearchCriteria\CollectionProcessor</argument>
+        </arguments>
+    </type>
+    <type name="Magento\MediaGalleryUi\Ui\Component\Listing\Filters\Options\UsedIn">
+        <arguments>
+            <argument name="options" xsi:type="array">
+                <item name="cms_page" xsi:type="array">
+                    <item name="value" xsi:type="string">cms_page</item>
+                    <item name="label" xsi:type="string" translate="true">Pages</item>
+                </item>
+                <item name="catalog_category" xsi:type="array">
+                    <item name="value" xsi:type="string">catalog_category</item>
+                    <item name="label" xsi:type="string" translate="true">Categories</item>
+                </item>
+                <item name="cms_block" xsi:type="array">
+                    <item name="value" xsi:type="string">cms_block</item>
+                    <item name="label" xsi:type="string" translate="true">Blocks</item>
+                </item>
+                <item name="catalog_product" xsi:type="array">
+                    <item name="value" xsi:type="string">catalog_product</item>
+                    <item name="label" xsi:type="string" translate="true">Products</item>
+                </item>
+                <item name="not_used" xsi:type="array">
+                    <item name="value" xsi:type="string">not_used</item>
+                    <item name="label" xsi:type="string" translate="true">Not used anywhere</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/MediaGalleryUi/etc/adminhtml/menu.xml b/app/code/Magento/MediaGalleryUi/etc/adminhtml/menu.xml
new file mode 100644
index 0000000000000..92839aa75ac8b
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/etc/adminhtml/menu.xml
@@ -0,0 +1,13 @@
+<?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_Backend:etc/menu.xsd">
+    <menu>
+        <add id="Magento_MediaGalleryUi::media" title="Media" translate="title" module="Magento_MediaGalleryUi" sortOrder="15" parent="Magento_Backend::content" resource="Magento_Cms::media_gallery" dependsOnConfig="system/media_gallery/enabled"/>
+        <add id="Magento_MediaGalleryUi::media_gallery" title="Media Gallery" translate="title" module="Magento_MediaGalleryUi" sortOrder="0" parent="Magento_MediaGalleryUi::media" action="media_gallery/media/index" resource="Magento_Cms::media_gallery"/>
+    </menu>
+</config>
diff --git a/app/code/Magento/MediaGalleryUi/etc/adminhtml/routes.xml b/app/code/Magento/MediaGalleryUi/etc/adminhtml/routes.xml
new file mode 100644
index 0000000000000..11a555e16e957
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/etc/adminhtml/routes.xml
@@ -0,0 +1,15 @@
+<?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:App/etc/routes.xsd">
+    <router id="admin">
+        <route id="media_gallery" frontName="media_gallery">
+            <module name="Magento_MediaGalleryUi" before="Magento_Backend" />
+        </route>
+    </router>
+</config>
diff --git a/app/code/Magento/MediaGalleryUi/etc/adminhtml/system.xml b/app/code/Magento/MediaGalleryUi/etc/adminhtml/system.xml
new file mode 100644
index 0000000000000..77544b42e899a
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/etc/adminhtml/system.xml
@@ -0,0 +1,21 @@
+<?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="system">
+            <group id="media_gallery" translate="label" type="text" sortOrder="1000" showInDefault="1" showInWebsite="0" showInStore="0">
+                <label>Enhanced 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>
+                    <config_path>system/media_gallery/enabled</config_path>
+                </field>
+            </group>
+        </section>
+    </system>
+</config>
diff --git a/app/code/Magento/MediaGalleryUi/etc/config.xml b/app/code/Magento/MediaGalleryUi/etc/config.xml
new file mode 100644
index 0000000000000..fe8e73c406e59
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/etc/config.xml
@@ -0,0 +1,16 @@
+<?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>
+        <system>
+            <media_gallery>
+                <enabled>0</enabled>
+            </media_gallery>
+        </system>
+    </default>
+</config>
diff --git a/app/code/Magento/MediaGalleryUi/etc/di.xml b/app/code/Magento/MediaGalleryUi/etc/di.xml
new file mode 100644
index 0000000000000..040e003817efa
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/etc/di.xml
@@ -0,0 +1,59 @@
+<?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">
+    <preference for="Magento\MediaGalleryUiApi\Api\ConfigInterface" type="Magento\MediaGalleryUi\Model\Config"/>
+    <type name="Magento\Framework\View\Element\UiComponent\DataProvider\CollectionFactory">
+        <arguments>
+            <argument name="collections" xsi:type="array">
+                <item name="media_gallery_listing_data_source" xsi:type="string">Magento\MediaGalleryUi\Ui\Component\Listing\Provider</item>
+            </argument>
+        </arguments>
+    </type>
+    <virtualType name="mediaGallerySearchResult" type="Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult">
+        <arguments>
+            <argument name="mainTable" xsi:type="string">media_gallery_asset_grid</argument>
+            <argument name="resourceModel" xsi:type="string">Magento\MediaGalleryUi\Model\ResourceModel\Grid\Asset</argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Cms\Model\Wysiwyg\Images\Storage">
+        <arguments>
+            <argument name="resizeParameters" xsi:type="array">
+                <item name="height" xsi:type="number">200</item>
+                <item name="width" xsi:type="number">200</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\MediaGalleryUi\Model\Directories\FolderTree">
+        <arguments>
+            <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>
diff --git a/app/code/Magento/MediaGalleryUi/etc/module.xml b/app/code/Magento/MediaGalleryUi/etc/module.xml
new file mode 100644
index 0000000000000..0deede3e6aad0
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/etc/module.xml
@@ -0,0 +1,14 @@
+<?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_MediaGalleryUi">
+        <sequence>
+            <module name="Magento_Cms" />
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/MediaGalleryUi/i18n/en_US.csv b/app/code/Magento/MediaGalleryUi/i18n/en_US.csv
new file mode 100644
index 0000000000000..1882665ce8033
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/i18n/en_US.csv
@@ -0,0 +1,8 @@
+"Enhanced Media Gallery","Enhanced Media Gallery"
+Enabled,Enabled
+All,All
+Directory,Directory
+"Uploaded Date","Uploaded Date"
+"Modification Date","Modification Date"
+Overlay,Overlay
+"Thumbnail Image","Thumbnail Image"
diff --git a/app/code/Magento/MediaGalleryUi/registration.php b/app/code/Magento/MediaGalleryUi/registration.php
new file mode 100644
index 0000000000000..e1d321c5a8ff3
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/registration.php
@@ -0,0 +1,10 @@
+<?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_MediaGalleryUi', __DIR__);
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/layout/media_gallery_index_index.xml b/app/code/Magento/MediaGalleryUi/view/adminhtml/layout/media_gallery_index_index.xml
new file mode 100644
index 0000000000000..f41c0f91b2249
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/layout/media_gallery_index_index.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
+    <container name="root">
+        <block name="media.gallery.container"
+               class="Magento\Backend\Block\Template"
+               template="Magento_MediaGalleryUi::container.phtml"
+               aclResource="Magento_Cms::media_gallery">
+            <container name="gallery.actions" htmlTag="div" htmlClass="page-main-actions">
+                <block name="page.actions.toolbar" template="Magento_Backend::pageactions.phtml"/>
+            </container>
+            <uiComponent name="media_gallery_listing"/>
+            <block name="image.details" class="Magento\Backend\Block\Template" template="Magento_MediaGalleryUi::image_details.phtml">
+                <arguments>
+                    <argument name="imageDetailsUrl" xsi:type="url" path="media_gallery/image/details"/>
+                </arguments>
+            </block>
+            <block name="image.edit.details" class="Magento\Backend\Block\Template" template="Magento_MediaGalleryUi::image_edit_details.phtml">
+                <arguments>
+                    <argument name="imageEditDetailsUrl" xsi:type="url" path="media_gallery/image/details"/>
+                    <argument name="saveDetailsUrl" xsi:type="url" path="media_gallery/image/saveDetails"/>
+                </arguments>
+            </block>
+        </block>
+    </container>
+</layout>
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/layout/media_gallery_media_index.xml b/app/code/Magento/MediaGalleryUi/view/adminhtml/layout/media_gallery_media_index.xml
new file mode 100644
index 0000000000000..7750f22b39ce7
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/layout/media_gallery_media_index.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceContainer htmlTag="div" htmlClass="media-gallery-container" name="content">
+            <uiComponent name="standalone_media_gallery_listing"/>
+	        <block name="image.details" class="Magento\Backend\Block\Template" template="Magento_MediaGalleryUi::image_details_standalone.phtml">
+                <arguments>
+                    <argument name="imageDetailsUrl" xsi:type="url" path="media_gallery/image/details"/>
+                </arguments>
+	        </block>
+            <block name="image.edit.details" class="Magento\Backend\Block\Template" template="Magento_MediaGalleryUi::image_edit_details_standalone.phtml">
+                <arguments>
+                    <argument name="imageEditDetailsUrl" xsi:type="url" path="media_gallery/image/details"/>
+                    <argument name="saveDetailsUrl" xsi:type="url" path="media_gallery/image/saveDetails"/>
+                </arguments>
+            </block>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/container.phtml b/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/container.phtml
new file mode 100644
index 0000000000000..5b905ea97d64a
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/container.phtml
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+// phpcs:disable Magento2.Files.LineLength, Generic.Files.LineLength
+
+?>
+
+<div class="media-gallery-container">
+    <?= $block->getChildHtml(); ?>
+</div>
+
+<script type="text/x-magento-init">
+    {
+        ".media-gallery-container": {
+            "Magento_Ui/js/core/app": {
+                "components": {
+                    "media_gallery_container": {
+                        "component": "Magento_MediaGalleryUi/js/container",
+                        "containerSelector": ".media-gallery-container",
+                        "masonryComponentPath": "media_gallery_listing.media_gallery_listing.media_gallery_columns"
+                    }
+                }
+            }
+        }
+    }
+</script>
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_details.phtml b/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_details.phtml
new file mode 100644
index 0000000000000..ba2033478afa1
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_details.phtml
@@ -0,0 +1,109 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Backend\Block\Template;
+use Magento\Framework\Escaper;
+
+// phpcs:disable Magento2.Files.LineLength, Generic.Files.LineLength
+/** @var Template $block */
+/** @var Escaper $escaper */
+
+?>
+
+<div class="media-gallery-image-details-modal"
+     data-bind="mageInit: {
+        'Magento_Ui/js/modal/modal': {
+            type: 'slide',
+            buttons: [],
+            modalClass: 'media-gallery-image-details',
+            title: '<?= $escaper->escapeHtmlAttr(__('Image Details')); ?>'
+        }
+     }">
+    <div class="page-main-actions">
+        <div class="page-actions">
+            <div class="page-actions-inner">
+                <div class="page-action-buttons" id="media-gallery-image-actions"
+                     data-bind="scope: 'mediaGalleryImageActions'">
+                    <!-- ko template: getTemplate() --><!-- /ko -->
+                </div>
+            </div>
+        </div>
+    </div>
+    <div id="media-gallery-image-details-messages" data-bind="scope: 'mediaGalleryImageDetailsMessages'">
+        <!-- ko template: getTemplate() --><!-- /ko -->
+    </div>
+    <div id="media-gallery-image-details" data-bind="scope: 'mediaGalleryImageDetails'">
+        <!-- ko template: getTemplate() --><!-- /ko -->
+    </div>
+</div>
+
+<script type="text/x-magento-init">
+    {
+        "#media-gallery-image-details": {
+            "Magento_Ui/js/core/app": {
+                "components": {
+                    "mediaGalleryImageDetails": {
+                        "component": "Magento_MediaGalleryUi/js/image/image-details",
+                        "imageDetailsUrl": "<?= $escaper->escapeJs($block->getData('imageDetailsUrl')); ?>",
+                        "modalSelector": ".media-gallery-image-details-modal",
+                        "modalWindowSelector": ".media-gallery-image-details",
+                        "mediaGridMessages": "media_gallery_listing.media_gallery_listing.messages"
+                    }
+                }
+            }
+        },
+        "#media-gallery-image-details-messages": {
+            "Magento_Ui/js/core/app": {
+                "components": {
+                    "mediaGalleryImageDetailsMessages": {
+                        "component": "Magento_MediaGalleryUi/js/grid/messages"
+                    }
+                }
+            }
+        },
+        "#media-gallery-image-actions": {
+            "Magento_Ui/js/core/app": {
+                "components": {
+                    "mediaGalleryImageActions": {
+                        "component": "Magento_MediaGalleryUi/js/image/image-actions",
+                        "modalSelector": ".media-gallery-image-details-modal",
+                        "modalWindowSelector": ".media-gallery-image-details",
+                        "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",
+                                "name": "cancel",
+                                "classes": "action-default scalable cancel action-quaternary"
+                            },
+                            {
+                                "title": "<?= $escaper->escapeJs(__('Delete Image')); ?>",
+                                "handler": "deleteImageAction",
+                                "name": "delete",
+                                "classes": "action-default scalable delete action-quaternary"
+                            },
+                            {
+                                "title": "<?= $escaper->escapeJs(__('Add Image')); ?>",
+                                "handler": "addImage",
+                                "name": "add-image",
+                                "classes": "scalable action-primary add-image-action"
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+    }
+</script>
+
+
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
new file mode 100644
index 0000000000000..9fc0e749ac888
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_details_standalone.phtml
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Backend\Block\Template;
+
+// phpcs:disable Magento2.Files.LineLength, Generic.Files.LineLength
+/** @var Template $block */
+/** @var \Magento\Framework\Escaper $escaper */
+?>
+
+<div class="media-gallery-image-details-modal"
+     data-bind="mageInit: {
+        'Magento_Ui/js/modal/modal': {
+            type: 'slide',
+            buttons: [],
+            modalClass: 'media-gallery-image-details',
+            title: '<?= $escaper->escapeHtmlAttr(__('Image Details')); ?>'
+        }
+     }">
+    <div class="page-main-actions">
+        <div class="page-actions">
+            <div class="page-actions-inner">
+                <div class="page-action-buttons" id="media-gallery-image-actions"
+                     data-bind="scope: 'mediaGalleryImageActions'">
+                    <!-- ko template: getTemplate() --><!-- /ko -->
+                </div>
+            </div>
+        </div>
+    </div>
+    <div id="media-gallery-image-details-messages" data-bind="scope: 'mediaGalleryImageDetailsMessages'">
+        <!-- ko template: getTemplate() --><!-- /ko -->
+    </div>
+    <div id="media-gallery-image-details" data-bind="scope: 'mediaGalleryImageDetails'">
+        <!-- ko template: getTemplate() --><!-- /ko -->
+    </div>
+</div>
+
+<script type="text/x-magento-init">
+    {
+        "#media-gallery-image-details": {
+            "Magento_Ui/js/core/app": {
+                "components": {
+                    "mediaGalleryImageDetails": {
+                        "component": "Magento_MediaGalleryUi/js/image/image-details",
+                        "imageDetailsUrl": "<?= $escaper->escapeJs($block->getData('imageDetailsUrl')); ?>",
+                        "modalSelector": ".media-gallery-image-details-modal",
+                        "modalWindowSelector": ".media-gallery-image-details",
+                        "mediaGridMessages": "standalone_media_gallery_listing.standalone_media_gallery_listing.messages"
+                    }
+                }
+            }
+        },
+        "#media-gallery-image-details-messages": {
+            "Magento_Ui/js/core/app": {
+                "components": {
+                    "mediaGalleryImageDetailsMessages": {
+                        "component": "Magento_MediaGalleryUi/js/grid/messages"
+                    }
+                }
+            }
+        },
+        "#media-gallery-image-actions": {
+            "Magento_Ui/js/core/app": {
+                "components": {
+                    "mediaGalleryImageActions": {
+                        "component": "Magento_MediaGalleryUi/js/image/image-actions",
+                        "modalSelector": ".media-gallery-image-details-modal",
+                        "modalWindowSelector": ".media-gallery-image-details",
+                        "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",
+                                "name": "cancel",
+                                "classes": "action-default scalable cancel action-quaternary"
+                            },
+                            {
+                                "title": "<?= $escaper->escapeJs(__('Delete Image')); ?>",
+                                "handler": "deleteImageAction",
+                                "name": "delete",
+                                "classes": "action-default scalable delete action-quaternary"
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+    }
+</script>
+
+
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_edit_details.phtml b/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_edit_details.phtml
new file mode 100644
index 0000000000000..c2b7e66cc89bd
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_edit_details.phtml
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Backend\Block\Template;
+
+// phpcs:disable Magento2.Files.LineLength, Generic.Files.LineLength
+/** @var Template $block */
+/** @var \Magento\Framework\Escaper $escaper */
+?>
+
+<div class="media-gallery-edit-image-details-modal"
+     data-bind="mageInit: {
+        'Magento_Ui/js/modal/modal': {
+            type: 'slide',
+            buttons: [],
+            modalClass: 'media-gallery-edit-image-details',
+            title: '<?= $escaper->escapeHtmlAttr(__('Edit Image')); ?>'
+        }
+     }">
+    <div class="page-main-actions">
+        <div class="page-actions">
+            <div class="page-actions-inner">
+                <div class="page-action-buttons" id="media-gallery-edit-image-actions"
+                     data-bind="scope: 'mediaGalleryImageEditActions'">
+                    <!-- ko template: getTemplate() --><!-- /ko -->
+                </div>
+            </div>
+        </div>
+    </div>
+    <div id="media-gallery-image-edit-details-messages" data-bind="scope: 'mediaGalleryEditDetailsMessages'">
+        <!-- ko template: getTemplate() --><!-- /ko -->
+    </div>
+    <form data-bind="mageInit:{'validation':{}}" id="image-edit-details-form" method="post" enctype="multipart/form-data">
+        <div id="media-gallery-image-edit-details" data-bind="scope: 'mediaGalleryEditDetails'">
+            <!-- ko template: getTemplate() --><!-- /ko -->
+        </div>
+    </form>
+</div>
+
+<script type="text/x-magento-init">
+    {
+        "#media-gallery-image-edit-details": {
+            "Magento_Ui/js/core/app": {
+                "components": {
+                    "mediaGalleryEditDetails": {
+                        "component": "Magento_MediaGalleryUi/js/image/image-edit",
+                        "imageEditDetailsUrl": "<?= $escaper->escapeJs($block->getData('imageEditDetailsUrl')); ?>",
+                        "saveDetailsUrl": "<?= $escaper->escapeJs($block->getData('saveDetailsUrl')); ?>",
+                        "mediaGridMessages": "standalone_media_gallery_listing.standalone_media_gallery_listing.messages"
+                    }
+                }
+            },
+            "Magento_MediaGalleryUi/js/validation/validate-image-title": {},
+            "Magento_MediaGalleryUi/js/validation/validate-image-description": {},
+            "Magento_MediaGalleryUi/js/validation/validate-image-keyword": {}
+        },
+        "#media-gallery-image-edit-details-messages": {
+            "Magento_Ui/js/core/app": {
+                "components": {
+                    "mediaGalleryEditDetailsMessages": {
+                        "component": "Magento_MediaGalleryUi/js/grid/messages"
+                    }
+                }
+            }
+        },
+        "#media-gallery-edit-image-actions": {
+            "Magento_Ui/js/core/app": {
+                "components": {
+                    "mediaGalleryImageEditActions": {
+                        "component": "Magento_MediaGalleryUi/js/image/image-actions",
+                        "modalSelector": ".media-gallery-edit-image-details-modal",
+                        "modalWindowSelector": ".media-gallery-edit-image-details",
+                        "mediaGalleryEditDetailsName": "mediaGalleryEditDetails",
+                        "imageModelName" : "media_gallery_listing.media_gallery_listing.media_gallery_columns.thumbnail_url",
+                        "actionsList": [
+                            {
+                                "title": "<?= $escaper->escapeJs(__('Cancel')); ?>",
+                                "handler": "closeModal",
+                                "name": "cancel",
+                                "classes": "action-default scalable cancel action-quaternary"
+                            },
+                            {
+                                "title": "<?= $escaper->escapeJs(__('Save')); ?>",
+                                "handler": "saveImageDetailsAction",
+                                "name": "save",
+                                "classes": "action-default scalable save action-quaternary"
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+    }
+</script>
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_edit_details_standalone.phtml b/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_edit_details_standalone.phtml
new file mode 100644
index 0000000000000..ec48ed8bb9053
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_edit_details_standalone.phtml
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Backend\Block\Template;
+
+// phpcs:disable Magento2.Files.LineLength, Generic.Files.LineLength
+/** @var Template $block */
+/** @var \Magento\Framework\Escaper $escaper */
+?>
+
+<div class="media-gallery-edit-image-details-modal"
+     data-bind="mageInit: {
+        'Magento_Ui/js/modal/modal': {
+            type: 'slide',
+            buttons: [],
+            modalClass: 'media-gallery-edit-image-details',
+            title: '<?= $escaper->escapeHtmlAttr(__('Edit Image')); ?>'
+        }
+     }">
+    <div class="page-main-actions">
+        <div class="page-actions">
+            <div class="page-actions-inner">
+                <div class="page-action-buttons" id="media-gallery-edit-image-actions"
+                     data-bind="scope: 'mediaGalleryImageEditActions'">
+                    <!-- ko template: getTemplate() --><!-- /ko -->
+                </div>
+            </div>
+        </div>
+    </div>
+    <div id="media-gallery-image-edit-details-messages" data-bind="scope: 'mediaGalleryEditDetailsMessages'">
+        <!-- ko template: getTemplate() --><!-- /ko -->
+    </div>
+    <form data-bind="mageInit:{'validation':{}}" id="image-edit-details-form" method="post" enctype="multipart/form-data">
+        <div id="media-gallery-image-edit-details" data-bind="scope: 'mediaGalleryEditDetails'">
+            <!-- ko template: getTemplate() --><!-- /ko -->
+        </div>
+    </form>
+</div>
+
+<script type="text/x-magento-init">
+    {
+        "#media-gallery-image-edit-details": {
+            "Magento_Ui/js/core/app": {
+                "components": {
+                    "mediaGalleryEditDetails": {
+                        "component": "Magento_MediaGalleryUi/js/image/image-edit",
+                        "imageEditDetailsUrl": "<?= $escaper->escapeJs($block->getData('imageEditDetailsUrl')); ?>",
+                        "saveDetailsUrl": "<?= $escaper->escapeJs($block->getData('saveDetailsUrl')); ?>",
+                        "mediaGridMessages": "standalone_media_gallery_listing.standalone_media_gallery_listing.messages"
+                    }
+                }
+            },
+            "Magento_MediaGalleryUi/js/validation/validate-image-title": {},
+            "Magento_MediaGalleryUi/js/validation/validate-image-description": {},
+            "Magento_MediaGalleryUi/js/validation/validate-image-keyword": {}
+        },
+        "#media-gallery-image-edit-details-messages": {
+            "Magento_Ui/js/core/app": {
+                "components": {
+                    "mediaGalleryEditDetailsMessages": {
+                        "component": "Magento_MediaGalleryUi/js/grid/messages"
+                    }
+                }
+            }
+        },
+        "#media-gallery-edit-image-actions": {
+            "Magento_Ui/js/core/app": {
+                "components": {
+                    "mediaGalleryImageEditActions": {
+                        "component": "Magento_MediaGalleryUi/js/image/image-actions",
+                        "modalSelector": ".media-gallery-edit-image-details-modal",
+                        "modalWindowSelector": ".media-gallery-edit-image-details",
+                        "mediaGalleryEditDetailsName": "mediaGalleryEditDetails",
+                        "imageModelName" : "standalone_media_gallery_listing.standalone_media_gallery_listing.media_gallery_columns.thumbnail_url",
+                        "actionsList": [
+                            {
+                                "title": "<?= $escaper->escapeJs(__('Cancel')); ?>",
+                                "handler": "closeModal",
+                                "name": "cancel",
+                                "classes": "action-default scalable cancel action-quaternary"
+                            },
+                            {
+                                "title": "<?= $escaper->escapeJs(__('Save')); ?>",
+                                "handler": "saveImageDetailsAction",
+                                "name": "save",
+                                "classes": "action-default scalable save action-quaternary"
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+    }
+</script>
+
+
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
new file mode 100644
index 0000000000000..86c8590bb4860
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/cms_block_listing.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <listingToolbar name="listing_top">
+        <filters name="listing_filters">
+             <filterSelect
+                name="asset_id"
+                provider="${ $.parentName }"
+                sortOrder="10"
+                class="Magento\MediaGalleryUi\Ui\Component\Listing\Filters\Asset"
+                component="Magento_Ui/js/form/element/ui-select"
+                template="Magento_MediaGalleryUi/grid/filters/elements/ui-select">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="entityType" xsi:type="string">cms_block</item>
+                        <item name="identityColumn" xsi:type="string">block_id</item>
+                        <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="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="levelsVisibility" xsi:type="number">1</item>
+                    </item>
+                </argument>
+                <settings>
+                    <caption translate="true">– Please Select assets –</caption>
+                    <label translate="true">Asset</label>
+                    <dataScope>asset_id</dataScope>
+                    </settings>
+            </filterSelect>
+        </filters>
+    </listingToolbar>
+</listing>
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
new file mode 100644
index 0000000000000..58881a8c9de6c
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/cms_page_listing.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+ <listingToolbar name="listing_top">
+     <filters name="listing_filters">
+             <filterSelect
+                name="asset_id"
+                provider="${ $.parentName }"
+                sortOrder="10"
+                class="Magento\MediaGalleryUi\Ui\Component\Listing\Filters\Asset"
+                component="Magento_Ui/js/form/element/ui-select"
+                template="Magento_MediaGalleryUi/grid/filters/elements/ui-select">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="entityType" xsi:type="string">cms_page</item>
+                        <item name="identityColumn" xsi:type="string">page_id</item>
+                        <item name="filterOptions" xsi:type="boolean">true</item>
+                        <item name="searchOptions" xsi:type="boolean">true</item>
+                        <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="levelsVisibility" xsi:type="number">1</item>
+                    </item>
+                </argument>
+                <settings>
+                    <caption translate="true">– Please Select assets –</caption>
+                    <label translate="true">Asset</label>
+                    <dataScope>asset_id</dataScope>
+                    </settings>
+            </filterSelect>
+        </filters>
+    </listingToolbar>
+</listing>
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
new file mode 100644
index 0000000000000..5a16ed1792159
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/media_gallery_listing.xml
@@ -0,0 +1,393 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <argument name="data" xsi:type="array">
+        <item name="js_config" xsi:type="array">
+            <item name="provider" xsi:type="string">
+                media_gallery_listing.media_gallery_listing_data_source
+            </item>
+        </item>
+    </argument>
+    <settings>
+        <buttons>
+            <button name="add_selected">
+                <param name="on_click" xsi:type="string">return false;</param>
+                <param name="sort_order" xsi:type="number">110</param>
+                <class>action-primary no-display media-gallery-add-selected</class>
+                <label translate="true">Add Selected</label>
+            </button>
+            <button name="cancel">
+                <param name="on_click" xsi:type="string">MediabrowserUtility.closeDialog();</param>
+                <param name="sort_order" xsi:type="number">1</param>
+                <class>cancel action-quaternary</class>
+                <label translate="true">Cancel</label>
+            </button>
+            <button name="upload_image">
+                <param name="on_click" xsi:type="string">jQuery('#image-uploader-input').click();</param>
+                <class>action-add scalable media-gallery-actions-buttons</class>
+                <param name="sort_order" xsi:type="number">20</param>
+                <label translate="true">Upload Image</label>
+            </button>
+            <button name="delete_folder">
+                <param name="on_click" xsi:type="string">jQuery('#delete_folder').trigger('delete_folder');</param>
+                <param name="disabled" xsi:type="string">disabled</param>
+                <param name="sort_order" xsi:type="number">30</param>
+                <class>action-default scalable media-gallery-actions-buttons</class>
+                <label translate="true">Delete Folder</label>
+            </button>
+            <button name="create_folder">
+                <param name="on_click" xsi:type="string">jQuery('#create_folder').trigger('create_folder');</param>
+                <param name="sort_order" xsi:type="number">10</param>
+                <class>action-default scalable add media-gallery-actions-buttons</class>
+                <label translate="true">Create Folder</label>
+            </button>
+            <button name="delete_massaction">
+                <param name="on_click" xsi:type="string">jQuery(window).trigger('massAction.MediaGallery')</param>
+                <param name="sort_order" xsi:type="number">50</param>
+                <class>action-default scalable add media-gallery-actions-buttons</class>
+                <label translate="true">Delete Images...</label>
+            </button>
+        </buttons>
+        <spinner>media_gallery_columns</spinner>
+        <deps>
+            <dep>media_gallery_listing.media_gallery_listing_data_source</dep>
+        </deps>
+    </settings>
+    <dataSource name="media_gallery_listing_data_source" component="Magento_Ui/js/grid/provider">
+        <settings>
+            <storageConfig>
+                <param name="indexField" xsi:type="string">id</param>
+            </storageConfig>
+            <updateUrl path="mui/index/render"/>
+        </settings>
+        <aclResource>Magento_Cms::media_gallery</aclResource>
+        <dataProvider class="Magento\MediaGalleryUi\Model\Listing\DataProvider" name="media_gallery_listing_data_source">
+            <settings>
+                <requestFieldName>id</requestFieldName>
+                <primaryFieldName>id</primaryFieldName>
+            </settings>
+        </dataProvider>
+    </dataSource>
+    <container name="messages"
+               sortOrder="20"
+               component="Magento_MediaGalleryUi/js/grid/messages">
+        <argument name="data" xsi:type="array">
+            <item name="config" xsi:type="array">
+                <item name="messageDelay" xsi:type="number">10</item>
+            </item>
+        </argument>
+    </container>
+    <listingToolbar name="listing_top" template="Magento_MediaGalleryUi/grid/toolbar">
+        <bookmark name="bookmarks"/>
+        <filterSearch name="fulltext" />
+        <filters name="listing_filters">
+            <filterInput name="path" provider="${ $.parentName }" sortOrder="2000">
+                <settings>
+                    <visible>false</visible>
+                    <dataScope>path</dataScope>
+                    <label translate="true">Directory</label>
+                </settings>
+            </filterInput>
+            <filterRange name="created_at"
+                         class="Magento\Ui\Component\Filters\Type\Date"
+                         provider="${ $.parentName }"
+                         template="ui/grid/filters/elements/group" sortOrder="10">
+                <settings>
+                    <rangeType>date</rangeType>
+                    <label translate="true">Uploaded Date</label>
+                    <dataScope>created_at</dataScope>
+                </settings>
+            </filterRange>
+            <filterRange name="updated_at"
+                         class="Magento\Ui\Component\Filters\Type\Date"
+                         provider="${ $.parentName }"
+                         template="ui/grid/filters/elements/group" sortOrder="20">
+                <settings>
+                    <rangeType>date</rangeType>
+                    <label translate="true">Modification Date</label>
+                    <dataScope>updated_at</dataScope>
+                </settings>
+            </filterRange>
+            <filterSelect name="entity_type" provider="${ $.parentName }" sortOrder="210"  component="Magento_Ui/js/form/element/ui-select" template="ui/grid/filters/elements/ui-select">
+                <settings>
+                    <caption translate="true">All</caption>
+                    <options class="Magento\MediaGalleryUi\Ui\Component\Listing\Filters\Options\UsedIn"/>
+                    <label translate="true">Show Images Used In</label>
+                    <dataScope>entity_type</dataScope>
+                </settings>
+            </filterSelect>
+            <filterSelect name="content_status" provider="${ $.parentName }" sortOrder="220">
+                <settings>
+                    <options class="Magento\MediaGalleryUi\Ui\Component\Listing\Filters\Options\Status"/>
+                    <label translate="true">Content Status</label>
+                    <caption>All</caption>
+                    <dataScope>content_status</dataScope>
+                </settings>
+            </filterSelect>
+            <filterSelect name="store_id" provider="${ $.parentName }" sortOrder="200">
+                <settings>
+                    <captionValue>0</captionValue>
+                    <options class="Magento\MediaGalleryUi\Ui\Component\Listing\Filters\Options\Store"/>
+                    <label translate="true">Store View</label>
+                    <dataScope>store_id</dataScope>
+                    <imports>
+                        <link name="visible">componentType = column, index = ${ $.index }:visible</link>
+                    </imports>
+                </settings>
+            </filterSelect>
+            <filterInput
+		    name="duplicated"
+		    provider="${ $.parentName }"
+		    sortOrder="300"
+                    template="Magento_MediaGalleryUi/grid/filter/checkbox"
+                    component="Magento_Ui/js/form/element/single-checkbox">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="description" xsi:type="string" translate="true">Show duplicates</item>
+                        <item name="valueMap" xsi:type="array">
+                            <item name="true" xsi:type="string">Yes</item>
+                        </item>
+                    </item>
+                </argument>
+                <settings>
+                    <dataScope>duplicated</dataScope>
+                    <label translate="true">Show duplicates</label>
+                </settings>
+            </filterInput>
+        </filters>
+        <paging name="listing_paging">
+            <settings>
+                <options>
+                    <option name="32" xsi:type="array">
+                        <item name="value" xsi:type="number">32</item>
+                        <item name="label" xsi:type="string">32</item>
+                    </option>
+                    <option name="48" xsi:type="array">
+                        <item name="value" xsi:type="number">48</item>
+                        <item name="label" xsi:type="string">48</item>
+                    </option>
+                    <option name="64" xsi:type="array">
+                        <item name="value" xsi:type="number">64</item>
+                        <item name="label" xsi:type="string">64</item>
+                    </option>
+                </options>
+                <pageSize>32</pageSize>
+            </settings>
+        </paging>
+        <container
+            name="sorting"
+            provider="media_gallery_listing.media_gallery_listing_data_source"
+            displayArea="sorting"
+            sortOrder="20"
+            component="Magento_MediaGalleryUi/js/grid/sortBy">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="deps" xsi:type="array">
+                        <item name="0" xsi:type="string">
+                            media_gallery_listing.media_gallery_listing.media_gallery_columns
+                        </item>
+                    </item>
+                </item>
+            </argument>
+        </container>
+        <container name="media_gallery_massactions"
+                   displayArea="sorting"
+                   sortOrder="10"
+                   component="Magento_MediaGalleryUi/js/grid/massaction/massactions"
+                   template="Magento_MediaGalleryUi/grid/massactions/count" >
+              <argument name="data" xsi:type="array">
+                  <item name="config" xsi:type="array">
+                      <item name="checkboxComponentName" xsi:type="string">media_gallery_listing.media_gallery_listing.media_gallery_columns.massaction_checkbox</item>
+                      <item name="imageModelName" xsi:type="string">media_gallery_listing.media_gallery_listing.media_gallery_columns.thumbnail_url</item>
+                      <item name="mediaGalleryProvider" xsi:type="string">media_gallery_listing.media_gallery_listing_data_source</item>
+                  </item>
+            </argument>
+        </container>
+    </listingToolbar>
+    <container name="media_gallery_directories"
+               class="Magento\MediaGalleryUi\Ui\Component\DirectoriesTree"
+               template="Magento_MediaGalleryUi/grid/directories/directoryTree"
+               component="Magento_MediaGalleryUi/js/directory/directoryTree"/>
+    <columns name="media_gallery_columns" component="Magento_MediaGalleryUi/js/grid/masonry">
+        <argument name="data" xsi:type="array">
+            <item name="config" xsi:type="array">
+                <item name="containerId" xsi:type="string">media-gallery-masonry-grid</item>
+            </item>
+        </argument>
+        <column name="source" component="Magento_Ui/js/grid/columns/overlay" class="Magento\MediaGalleryUi\Ui\Component\Listing\Columns\SourceIconProvider">
+            <settings>
+                <label translate="true">Source</label>
+                <visible>false</visible>
+                <sortable>false</sortable>
+            </settings>
+        </column>
+        <column name="thumbnail_url" component="Magento_MediaGalleryUi/js/grid/columns/image" class="Magento\MediaGalleryUi\Ui\Component\Listing\Columns\Url">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="fields" xsi:type="array">
+                        <item name="url" xsi:type="string">thumbnail_url</item>
+                    </item>
+                    <item name="deleteImageUrl" xsi:type="url" path="media_gallery/image/delete"/>
+                    <item name="massactionComponentName" xsi:type="string">media_gallery_listing.media_gallery_listing.listing_top.media_gallery_massactions</item>
+                    <item name="messagesName" xsi:type="string">media_gallery_listing.media_gallery_listing.messages</item>
+                    <item name="imageModelname" xsi:type="string">media_gallery_listing.media_gallery_listing.media_gallery_columns.thumbnail_url</item>
+                    <item name="mediaGalleryDirectoryComponent" xsi:type="string">media_gallery_listing.media_gallery_listing.media_gallery_directories</item>
+                </item>
+            </argument>
+            <settings>
+                <label translate="true">Thumbnail Image</label>
+                <visible>true</visible>
+                <sortable>false</sortable>
+            </settings>
+        </column>
+        <column name="newest_first">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="sort_by" xsi:type="array">
+                        <item name="field" xsi:type="string">created_at</item>
+                        <item name="direction" xsi:type="string">desc</item>
+                    </item>
+                </item>
+            </argument>
+            <settings>
+                <label translate="true">Newest first</label>
+                <visible>false</visible>
+                <sortable>true</sortable>
+            </settings>
+        </column>
+        <column name="oldest_first">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="sort_by" xsi:type="array">
+                        <item name="field" xsi:type="string">created_at</item>
+                    </item>
+                </item>
+            </argument>
+            <settings>
+                <label translate="true">Oldest first</label>
+                <visible>false</visible>
+                <sortable>true</sortable>
+            </settings>
+        </column>
+        <column name="created_at">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="sort_by" xsi:type="array">
+                        <item name="excluded" xsi:type="boolean">true</item>
+                    </item>
+                </item>
+            </argument>
+            <settings>
+                <label translate="true">Uploaded Date</label>
+                <dataType>date</dataType>
+                <visible>false</visible>
+                <sortable>true</sortable>
+            </settings>
+        </column>
+        <column name="path">
+          <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="sort_by" xsi:type="array">
+                        <item name="excluded" xsi:type="boolean">true</item>
+                    </item>
+                </item>
+            </argument>
+            <settings>
+                <visible>false</visible>
+                <sortable>true</sortable>
+            </settings>
+        </column>
+        <column name="directory_desc">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="sort_by" xsi:type="array">
+                        <item name="field" xsi:type="string">path</item>
+                        <item name="direction" xsi:type="string">desc</item>
+                    </item>
+                </item>
+            </argument>
+            <settings>
+                <label translate="true">Directory: Descending</label>
+                <visible>false</visible>
+                <sortable>true</sortable>
+            </settings>
+        </column>
+        <column name="directory_asc">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="sort_by" xsi:type="array">
+                        <item name="field" xsi:type="string">path</item>
+                    </item>
+                </item>
+            </argument>
+            <settings>
+                <label translate="true">Directory: Ascending</label>
+                <visible>false</visible>
+                <sortable>true</sortable>
+            </settings>
+        </column>
+        <column name="title">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="sort_by" xsi:type="array">
+                        <item name="excluded" xsi:type="boolean">true</item>
+                    </item>
+                </item>
+            </argument>
+            <settings>
+                <visible>false</visible>
+                <sortable>true</sortable>
+            </settings>
+        </column>
+        <column name="name_az">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="sort_by" xsi:type="array">
+                        <item name="field" xsi:type="string">title</item>
+                    </item>
+                </item>
+            </argument>
+            <settings>
+                <label translate="true">Name: A to Z</label>
+                <visible>false</visible>
+                <sortable>true</sortable>
+            </settings>
+        </column>
+        <column name="name_za">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="sort_by" xsi:type="array">
+                        <item name="field" xsi:type="string">title</item>
+                        <item name="direction" xsi:type="string">desc</item>
+                    </item>
+                </item>
+            </argument>
+            <settings>
+                <label translate="true">Name: Z to A</label>
+                <visible>false</visible>
+                <sortable>true</sortable>
+            </settings>
+        </column>
+    </columns>
+    <container name="media_gallery_image_uploader"
+               class="Magento\MediaGalleryUi\Ui\Component\ImageUploader"
+               template="Magento_MediaGalleryUi/image-uploader"
+               component="Magento_MediaGalleryUi/js/image-uploader">
+        <argument name="data" xsi:type="array">
+            <item name="config" xsi:type="array">
+                <item name="sortByName" xsi:type="string">
+                    media_gallery_listing.media_gallery_listing.listing_top.sorting
+                </item>
+                <item name="listingPagingName" xsi:type="string">
+                    media_gallery_listing.media_gallery_listing.listing_top.listing_paging
+                </item>
+            </item>
+        </argument>
+    </container>
+</listing>
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
new file mode 100644
index 0000000000000..2b7d9fde3b9ff
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/product_listing.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <listingToolbar name="listing_top">
+        <filters name="listing_filters">
+              <filterSelect
+                name="asset_id"
+                provider="${ $.parentName }"
+                sortOrder="10"
+                class="Magento\MediaGalleryUi\Ui\Component\Listing\Filters\Asset"
+                component="Magento_Ui/js/form/element/ui-select"
+                template="Magento_MediaGalleryUi/grid/filters/elements/ui-select">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="entityType" xsi:type="string">catalog_product</item>
+                        <item name="identityColumn" xsi:type="string">entity_id</item>
+                        <item name="filterOptions" xsi:type="boolean">true</item>
+                        <item name="searchOptions" xsi:type="boolean">true</item>
+                        <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="levelsVisibility" xsi:type="number">1</item>
+                    </item>
+                </argument>
+                <settings>
+                    <caption translate="true">– Please Select assets –</caption>
+                    <label translate="true">Asset</label>
+                    <dataScope>asset_id</dataScope>
+                    </settings>
+            </filterSelect>
+        </filters>
+    </listingToolbar>
+</listing>
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
new file mode 100644
index 0000000000000..c96ad0fd86661
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml
@@ -0,0 +1,380 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <argument name="data" xsi:type="array">
+        <item name="js_config" xsi:type="array">
+            <item name="provider" xsi:type="string">
+                standalone_media_gallery_listing.media_gallery_listing_data_source
+            </item>
+        </item>
+    </argument>
+    <settings>
+        <spinner>media_gallery_columns</spinner>
+        <deps>
+            <dep>standalone_media_gallery_listing.media_gallery_listing_data_source</dep>
+        </deps>
+        <buttons>
+            <button name="delete_folder">
+                <param name="on_click" xsi:type="string">jQuery('#delete_folder').trigger('delete_folder');</param>
+                <param name="disabled" xsi:type="string">disabled</param>
+                <param name="sort_order" xsi:type="number">20</param>
+                <class>action-default scalable add media-gallery-actions-buttons</class>
+                <label translate="true">Delete Folder</label>
+            </button>
+            <button name="create_folder">
+                <param name="on_click" xsi:type="string">jQuery('#create_folder').trigger('create_folder');</param>
+                <param name="sort_order" xsi:type="number">30</param>
+                <class>action-default scalable add media-gallery-actions-buttons</class>
+                <label translate="true">Create Folder</label>
+            </button>
+             <button name="delete_massaction">
+                <param name="on_click" xsi:type="string">jQuery(window).trigger('massAction.MediaGallery')</param>
+                <param name="sort_order" xsi:type="number">50</param>
+                <class>action-default scalable add media-gallery-actions-buttons</class>
+                <label translate="true">Delete Images...</label>
+            </button>
+            <button name="upload_image">
+                <param name="on_click" xsi:type="string">jQuery('#image-uploader-input').click();</param>
+                <class>action-default scalable add media-gallery-actions-buttons</class>
+                <label translate="true">Upload Image</label>
+            </button>
+        </buttons>
+    </settings>
+    <dataSource name="media_gallery_listing_data_source" component="Magento_Ui/js/grid/provider">
+        <settings>
+            <storageConfig>
+                <param name="indexField" xsi:type="string">id</param>
+            </storageConfig>
+            <updateUrl path="mui/index/render"/>
+        </settings>
+        <aclResource>Magento_Cms::media_gallery</aclResource>
+        <dataProvider class="Magento\MediaGalleryUi\Model\Listing\DataProvider" name="media_gallery_listing_data_source">
+            <settings>
+                <requestFieldName>id</requestFieldName>
+                <primaryFieldName>id</primaryFieldName>
+            </settings>
+        </dataProvider>
+    </dataSource>
+    <container name="messages"
+               sortOrder="20"
+               component="Magento_MediaGalleryUi/js/grid/messages">
+        <argument name="data" xsi:type="array">
+            <item name="config" xsi:type="array">
+                <item name="messageDelay" xsi:type="number">10</item>
+            </item>
+        </argument>
+    </container>
+    <listingToolbar name="listing_top" template="Magento_MediaGalleryUi/grid/toolbar">
+        <bookmark name="bookmarks"/>
+        <filterSearch name="fulltext" />
+        <filters name="listing_filters">
+            <filterInput name="path" provider="${ $.parentName }" sortOrder="2000">
+                <settings>
+                    <visible>false</visible>
+                    <dataScope>path</dataScope>
+                    <label translate="true">Directory</label>
+                </settings>
+            </filterInput>
+            <filterRange name="created_at"
+                         class="Magento\Ui\Component\Filters\Type\Date"
+                         provider="${ $.parentName }"
+                         template="ui/grid/filters/elements/group" sortOrder="10">
+                <settings>
+                    <rangeType>date</rangeType>
+                    <label translate="true">Uploaded Date</label>
+                    <dataScope>created_at</dataScope>
+                </settings>
+            </filterRange>
+            <filterRange name="updated_at"
+                         class="Magento\Ui\Component\Filters\Type\Date"
+                         provider="${ $.parentName }"
+                         template="ui/grid/filters/elements/group" sortOrder="20">
+                <settings>
+                    <rangeType>date</rangeType>
+                    <label translate="true">Modification Date</label>
+                    <dataScope>updated_at</dataScope>
+                </settings>
+            </filterRange>
+            <filterSelect name="entity_type" provider="${ $.parentName }" sortOrder="210"  component="Magento_Ui/js/form/element/ui-select" template="ui/grid/filters/elements/ui-select">
+                <settings>
+                    <caption translate="true">All</caption>
+                    <options class="Magento\MediaGalleryUi\Ui\Component\Listing\Filters\Options\UsedIn"/>
+                    <label translate="true">Show Images Used In</label>
+                    <dataScope>entity_type</dataScope>
+                </settings>
+            </filterSelect>
+            <filterSelect name="content_status" provider="${ $.parentName }" sortOrder="220">
+                <settings>
+                    <options class="Magento\MediaGalleryUi\Ui\Component\Listing\Filters\Options\Status"/>
+                    <label translate="true">Content Status</label>
+                    <caption>All</caption>
+                    <dataScope>content_status</dataScope>
+                </settings>
+            </filterSelect>
+            <filterSelect name="store_id" provider="${ $.parentName }" sortOrder="200">
+                <settings>
+                    <captionValue>0</captionValue>
+                    <options class="Magento\MediaGalleryUi\Ui\Component\Listing\Filters\Options\Store"/>
+                    <label translate="true">Store View</label>
+                    <dataScope>store_id</dataScope>
+                    <imports>
+                        <link name="visible">componentType = column, index = ${ $.index }:visible</link>
+                    </imports>
+                </settings>
+            </filterSelect>
+            <filterInput
+		    name="duplicated"
+		    provider="${ $.parentName }"
+		    sortOrder="300"
+                    template="Magento_MediaGalleryUi/grid/filter/checkbox"
+                    component="Magento_Ui/js/form/element/single-checkbox">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="description" xsi:type="string" translate="true">Show duplicates</item>
+                        <item name="valueMap" xsi:type="array">
+                            <item name="true" xsi:type="string">Yes</item>
+                        </item>
+                    </item>
+                </argument>
+                <settings>
+                    <dataScope>duplicated</dataScope>
+                    <label translate="true">Show duplicates</label>
+                </settings>
+            </filterInput>
+        </filters>
+        <paging name="listing_paging">
+            <settings>
+                <options>
+                    <option name="32" xsi:type="array">
+                        <item name="value" xsi:type="number">32</item>
+                        <item name="label" xsi:type="string">32</item>
+                    </option>
+                    <option name="48" xsi:type="array">
+                        <item name="value" xsi:type="number">48</item>
+                        <item name="label" xsi:type="string">48</item>
+                    </option>
+                    <option name="64" xsi:type="array">
+                        <item name="value" xsi:type="number">64</item>
+                        <item name="label" xsi:type="string">64</item>
+                    </option>
+                </options>
+                <pageSize>32</pageSize>
+            </settings>
+        </paging>
+        <container
+            name="sorting"
+            provider="standalone_media_gallery_listing.media_gallery_listing_data_source"
+            displayArea="sorting"
+            sortOrder="20"
+            component="Magento_MediaGalleryUi/js/grid/sortBy">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="deps" xsi:type="array">
+                        <item name="0" xsi:type="string">
+                            standalone_media_gallery_listing.standalone_media_gallery_listing.media_gallery_columns
+                        </item>
+                    </item>
+                </item>
+            </argument>
+        </container>
+        <container name="media_gallery_massactions"
+                   displayArea="sorting"
+                   sortOrder="10"
+                   component="Magento_MediaGalleryUi/js/grid/massaction/massactions"
+                   template="Magento_MediaGalleryUi/grid/massactions/count" >
+              <argument name="data" xsi:type="array">
+                  <item name="config" xsi:type="array">
+                      <item name="checkboxComponentName" xsi:type="string">standalone_media_gallery_listing.standalone_media_gallery_listing.media_gallery_columns.massaction_checkbox</item>
+                      <item name="imageModelName" xsi:type="string">standalone_media_gallery_listing.standalone_media_gallery_listing.media_gallery_columns.thumbnail_url</item>
+                      <item name="mediaGalleryProvider" xsi:type="string">standalone_media_gallery_listing.media_gallery_listing_data_source</item>
+                  </item>
+            </argument>
+        </container>
+    </listingToolbar>
+    <container name="media_gallery_directories"
+               class="Magento\MediaGalleryUi\Ui\Component\DirectoriesTree"
+               template="Magento_MediaGalleryUi/grid/directories/directoryTree"
+               component="Magento_MediaGalleryUi/js/directory/directoryTree"/>
+    <columns name="media_gallery_columns" component="Magento_MediaGalleryUi/js/grid/masonry">
+        <argument name="data" xsi:type="array">
+            <item name="config" xsi:type="array">
+                <item name="containerId" xsi:type="string">media-gallery-masonry-grid</item>
+            </item>
+        </argument>
+        <column name="source" component="Magento_Ui/js/grid/columns/overlay" class="Magento\MediaGalleryUi\Ui\Component\Listing\Columns\SourceIconProvider">
+            <settings>
+                <label translate="true">Source</label>
+                <visible>false</visible>
+                <sortable>false</sortable>
+            </settings>
+        </column>
+        <column name="thumbnail_url" component="Magento_MediaGalleryUi/js/grid/columns/image" class="Magento\MediaGalleryUi\Ui\Component\Listing\Columns\Url">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="fields" xsi:type="array">
+                        <item name="url" xsi:type="string">thumbnail_url</item>
+                    </item>
+                    <item name="url" xsi:type="string">thumbnail_url</item>
+                    <item name="deleteImageUrl" xsi:type="url" path="media_gallery/image/delete"/>
+                    <item name="massactionComponentName" xsi:type="string">standalone_media_gallery_listing.standalone_media_gallery_listing.listing_top.media_gallery_massactions</item>
+                    <item name="messagesName" xsi:type="string">standalone_media_gallery_listing.standalone_media_gallery_listing.messages</item>
+                    <item name="mediaGalleryDirectoryComponent" xsi:type="string">standalone_media_gallery_listing.standalone_media_gallery_listing.media_gallery_directories</item>
+                </item>
+            </argument>
+            <settings>
+                <label translate="true">Thumbnail Image</label>
+                <visible>true</visible>
+                <sortable>false</sortable>
+            </settings>
+        </column>
+        <column name="newest_first">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="sort_by" xsi:type="array">
+                        <item name="field" xsi:type="string">created_at</item>
+                        <item name="direction" xsi:type="string">desc</item>
+                    </item>
+                </item>
+            </argument>
+            <settings>
+                <label translate="true">Newest first</label>
+                <visible>false</visible>
+                <sortable>true</sortable>
+            </settings>
+        </column>
+        <column name="oldest_first">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="sort_by" xsi:type="array">
+                        <item name="field" xsi:type="string">created_at</item>
+                    </item>
+                </item>
+            </argument>
+            <settings>
+                <label translate="true">Oldest first</label>
+                <visible>false</visible>
+                <sortable>true</sortable>
+            </settings>
+        </column>
+        <column name="created_at">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="sort_by" xsi:type="array">
+                        <item name="excluded" xsi:type="boolean">true</item>
+                    </item>
+                </item>
+            </argument>
+            <settings>
+                <label translate="true">Uploaded Date</label>
+                <dataType>date</dataType>
+                <visible>false</visible>
+                <sortable>true</sortable>
+            </settings>
+        </column>
+        <column name="path">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="sort_by" xsi:type="array">
+                        <item name="excluded" xsi:type="boolean">true</item>
+                    </item>
+                </item>
+            </argument>
+            <settings>
+                <visible>false</visible>
+                <sortable>true</sortable>
+            </settings>
+        </column>
+        <column name="directory_desc">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="sort_by" xsi:type="array">
+                        <item name="field" xsi:type="string">path</item>
+                        <item name="direction" xsi:type="string">desc</item>
+                    </item>
+                </item>
+            </argument>
+            <settings>
+                <label translate="true">Directory: Descending</label>
+                <visible>false</visible>
+                <sortable>true</sortable>
+            </settings>
+        </column>
+        <column name="directory_asc">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="sort_by" xsi:type="array">
+                        <item name="field" xsi:type="string">path</item>
+                    </item>
+                </item>
+            </argument>
+            <settings>
+                <label translate="true">Directory: Ascending</label>
+                <visible>false</visible>
+                <sortable>true</sortable>
+            </settings>
+        </column>
+        <column name="title">
+           <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="sort_by" xsi:type="array">
+                        <item name="excluded" xsi:type="boolean">true</item>
+                    </item>
+                </item>
+            </argument>
+            <settings>
+                <visible>false</visible>
+                <sortable>true</sortable>
+            </settings>
+        </column>
+        <column name="name_az">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="sort_by" xsi:type="array">
+                        <item name="field" xsi:type="string">title</item>
+                    </item>
+                </item>
+            </argument>
+            <settings>
+                <label translate="true">Name: A to Z</label>
+                <visible>false</visible>
+                <sortable>true</sortable>
+            </settings>
+        </column>
+        <column name="name_za">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="sort_by" xsi:type="array">
+                        <item name="field" xsi:type="string">title</item>
+                        <item name="direction" xsi:type="string">desc</item>
+                    </item>
+                </item>
+            </argument>
+            <settings>
+                <label translate="true">Name: Z to A</label>
+                <visible>false</visible>
+                <sortable>true</sortable>
+            </settings>
+        </column>
+    </columns>
+    <container name="media_gallery_image_uploader"
+               class="Magento\MediaGalleryUi\Ui\Component\ImageUploaderStandAlone"
+               template="Magento_MediaGalleryUi/image-uploader"
+               component="Magento_MediaGalleryUi/js/image-uploader">
+        <argument name="data" xsi:type="array">
+            <item name="config" xsi:type="array">
+                <item name="sortByName" xsi:type="string">
+                    standalone_media_gallery_listing.standalone_media_gallery_listing.listing_top.sorting
+                </item>
+                <item name="listingPagingName" xsi:type="string">
+                    standalone_media_gallery_listing.standalone_media_gallery_listing.listing_top.listing_paging
+                </item>
+            </item>
+        </argument>
+    </container>
+</listing>
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
new file mode 100644
index 0000000000000..671a82dce3f58
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less
@@ -0,0 +1,478 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+//
+//  Variables
+//  _____________________________________________
+
+@color-folders-background: #a6a6a6;
+@color-folders-background-selected: #cdecf6;
+@color-folders-border: #7185f5;
+@color-masonry-overlay: #d9631c;
+@color-masonry-grey: #9e9e9e;
+@color-masonry-white: #e1e1e1;
+@color-masonry-steelblue: #4682b4;
+@color-media-gallery-buttons-background: #e3e3e3;
+@color-media-gallery-buttons-border: #adadad;
+@color-media-gallery-buttons-text: #514943;
+@color-media-gallery-checkbox-background: #eee;
+
+& when (@media-common = true) {
+
+    .media-gallery-delete-image-action,
+    .delete-folder-confirmation-popup {
+
+        .modal-content {
+            word-wrap: anywhere;
+        }
+    }
+
+    .media-gallery-asset-ui-select-filter {
+
+        .admin__action-multiselect-crumb {
+            max-width: 70%;
+            overflow: hidden;
+            text-overflow: ellipsis
+        }
+
+        .admin__action-multiselect-label > span {
+            display: block;
+            margin-top: -2px;
+            max-height: 18px;
+            max-width: 70%;
+            overflow: hidden;
+            padding-left: 23px;
+            position: absolute;
+            text-overflow: ellipsis;
+        }
+
+        .admin__action-multiselect-item-path {
+            float: right;
+            max-height: 70px;
+            max-width: 70px;
+        }
+
+        .admin__action-multiselect-label {
+            display: inline-block;
+            width: 100%;
+        }
+    }
+
+    .page-actions-buttons > button.no-display {
+        display: none;
+    }
+
+    .page-actions-buttons > button.media-gallery-actions-buttons,
+    .page-actions .page-actions-buttons > button.media-gallery-actions-buttons:focus,
+    .page-actions-buttons > button.media-gallery-actions-buttons:hover {
+        background-color: @color-media-gallery-buttons-background;
+        border-color: @color-media-gallery-buttons-border;
+        color: @color-media-gallery-buttons-text;
+    }
+
+    .mediagallery-massaction-checkbox {
+        background-color: @color-media-gallery-checkbox-background;
+        border-radius: 4px;
+        height: 40px;
+        input[type='checkbox'] {
+            margin-left: 10px;
+            margin-top: 11px;
+        }
+        margin-left: 15px;
+        margin-top: 10px;
+        position: absolute;
+        width: 40px;
+        z-index: 10;
+    }
+
+    .mediagallery-massaction-items-count {
+        display: inline-block;
+        margin-left: -15px;
+        padding-right: 20px;
+    }
+
+    .media-gallery-container {
+
+        .masonry-image-grid .no-data-message-container,
+        .masonry-image-grid .error-message-container {
+            left: 50%;
+            margin-right: -50%;
+            position: sticky;
+            top: 50%;
+        }
+
+        .admin__action-dropdown-wrap._active .admin__action-dropdown-text::after {
+            margin-right: 6px;
+        }
+
+        .admin__data-grid-action-bookmarks .admin__action-dropdown-menu {
+            left: auto;
+            right: 0;
+        }
+
+        .page-main-actions {
+            .page-actions {
+                .media-gallery-add-selected {
+                    order: unset;
+                }
+            }
+
+            & > .page-actions {
+                & > button.no-display {
+                    display: none;
+                }
+            }
+        }
+        .jstree-default .jstree-hovered {
+            background: @color-folders-background;
+            border-color: @color-folders-border;
+            border-radius: 6px;
+            padding-top: 6px;
+        }
+
+        .jstree-default .jstree-leaf a .jstree-icon {
+            background-position: -52px -16px;
+        }
+
+
+        .jstree-default a .jstree-icon {
+            background-position: -52px -16px;
+        }
+
+        .jstree-default .jstree-no-dots .jstree-open > a > ins {
+            background-position: -52px -38px;
+            height: 20px;
+            width: 29px;
+        }
+
+        .jstree a > ins {
+            float: left;
+            height: 22px;
+            margin-top: -3px;
+            width: 20px;
+        }
+
+        .jstree-default .jstree-no-dots .jstree-leaf > ins {
+            background-image: none;
+        }
+
+        .jstree-default ins {
+            background-image: url("@{baseDir}Magento_MediaGalleryUi/images/d.png");
+        }
+
+        .jstree a {
+            height: 30px;
+            margin: 1px;
+            padding-left: 6px;
+            padding-top: 6px;
+            width: 100%;
+        }
+
+        .jstree-default .jstree-clicked {
+            background: @color-folders-background-selected;
+            border: .14em solid @color-folders-border;
+            border-radius: 6px;
+            padding-top: 6px;
+        }
+
+        .masonry-image-overlay {
+            background-color: @color-masonry-overlay;
+            float: right;
+            font-size: 11px;
+            margin-left: 120px;
+            margin-top: 170px;
+            padding: .3rem;
+            pointer-events: none;
+            position: relative;
+        }
+
+        .media-gallery-image-details {
+            float: left;
+            list-style: none;
+            margin-bottom: 0;
+            position: absolute;
+            width: 89%;
+
+            .name {
+                -webkit-box-orient: vertical;
+                -webkit-line-clamp: 2;
+                display: -webkit-box;
+                font-size: 15px;
+                font-weight: bold;
+                line-height: 20px;
+                max-height: 50px;
+                overflow: hidden;
+                padding-bottom: 2px;
+                text-overflow: ellipsis;
+                white-space: pre-line;
+                word-wrap: anywhere;
+                word-wrap: break-word;
+                @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
+                    white-space: nowrap;
+                }
+            }
+
+            .type {
+                display: inline-block;
+                font-size: 12px;
+                padding-bottom: 5px;
+            }
+
+            .dimensions {
+                display: inline-block;
+            }
+
+            .source {
+                display: inline-block;
+            }
+        }
+
+        .media-gallery-image-actions {
+            float: right;
+            position: absolute;
+            right: 0;
+            width: 10%;
+
+            .action-select-wrap {
+                cursor: pointer;
+            }
+
+            .three-dots {
+                &:before {
+                    content: url("@{baseDir}Magento_MediaGalleryUi/images/3-dots.png");
+                    cursor: pointer;
+                }
+            }
+        }
+
+        .media-gallery-image {
+            height: 200px;
+            margin: 0 auto;
+            position: relative;
+            text-align: center;
+            width: 200px;
+        }
+
+        .masonry-image-description {
+            background-color: @color-white;
+            min-height: 90px;
+            padding-top: 10px;
+            position: relative;
+        }
+
+        .masonry-image-column {
+            background-color: @color-masonry-white;
+            width: 200px;
+        }
+
+        .media-directory-container {
+            float: left;
+            padding-right: 40px;
+        }
+
+        .media-gallery-image-block {
+            cursor: pointer;
+            height: 200px;
+            margin: 0 auto;
+            position: relative;
+
+            &.selected {
+                border: 5px solid @color-masonry-steelblue;
+            }
+        }
+
+        .media-gallery-image {
+            img {
+                bottom: 0;
+                height: auto;
+                left: 0;
+                margin: auto;
+                max-height: 100%;
+                max-width: 100%;
+                padding: 5px;
+                position: absolute;
+                right: 0;
+                top: 0;
+                width: auto;
+            }
+
+            .action-menu {
+                bottom: 0;
+                float: right;
+                left: auto;
+                top: auto;
+                z-index: 100;
+            }
+        }
+
+        .adobe-stock-icon {
+            margin-bottom: -6px;
+            width: 29px;
+        }
+
+        .masonry-image-grid {
+            align-items: first baseline;
+            display: grid;
+            grid-template-columns: repeat(auto-fill, 210px);
+            justify-content: end;
+            margin: 10px 0;
+            position: relative;
+        }
+
+        .admin__data-grid-filters .admin__form-field {
+            .action-select-wrap {
+                .action-menu {
+                    width: 110%;
+                }
+                .admin__action-multiselect-search-label {
+                    right: 1.5rem;
+                }
+            }
+
+            .action-close {
+                padding: 0;
+                &:before {
+                    font-size: 6px;
+                }
+            }
+        }
+    }
+
+    .media-gallery-image-details-modal,
+    .media-gallery-edit-image-details-modal {
+
+        .admin__action-multiselect-crumb {
+            .action-close {
+                padding: 0;
+
+                &:before {
+                    font-size: .5em;
+                }
+            }
+        }
+
+        .edit-image-details {
+            padding: 50px;
+        }
+
+        .path-display {
+            margin-top: 8px;
+        }
+
+        .page-action-buttons {
+            float: right;
+        }
+
+        .image-type {
+            .adobe-stock-icon {
+                margin-bottom: -6px;
+                width: 29px;
+            }
+
+            .type {
+                color: @color-very-dark-gray;
+            }
+        }
+
+        .image-details {
+            .lib-vendor-prefix-display();
+
+            .image-details-image {
+                img {
+                    max-height: 650px;
+                }
+            }
+
+            .image-details-sidebar {
+                .lib-vendor-prefix-flex-grow(1);
+                margin-top: 0;
+                padding-left: 40px;
+
+                .image-details-section {
+                    margin-bottom: 40px;
+                    max-width: 400px;
+                    min-width: 290px;
+                    word-wrap: anywhere;
+                    .lib-clearfix();
+                }
+
+                h3.image-title {
+                    font-weight: bold;
+                    line-height: 1.5;
+                }
+
+                .attributes {
+                    .attribute {
+                        &:not(:last-child) {
+                            margin-bottom: 20px;
+                            padding-bottom: 20px;
+                        }
+
+                        & > * {
+                            float: left;
+                            width: 50%;
+                        }
+
+                        .value {
+                            display: inline;
+                            float: right;
+                        }
+
+                        .title {
+                            color: @color-very-dark-gray;
+                        }
+                    }
+                }
+
+                .tags {
+                    .tags-list {
+                        margin-bottom: 10px;
+
+                        .show-more-item {
+                            display: none;
+                        }
+
+                        &.show-all-tags {
+                            margin-bottom: 0;
+
+                            .show-more-item {
+                                display: inline;
+                            }
+
+                            & + .show-more-link-container {
+                                display: none;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    .masonry-image-sortby {
+        display: inline-block;
+    }
+
+    .masonry-results-number {
+        display: inline-block;
+        margin-right: 1.4rem;
+    }
+}
+
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
+    .media-gallery-image-details-modal {
+        .image-details {
+            display: block;
+
+            .image-details-sidebar {
+                margin-top: 20px;
+                padding-left: 0;
+            }
+
+            .image-details-image img {
+                max-height: 450px;
+            }
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/images/3-dots.png b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/images/3-dots.png
new file mode 100644
index 0000000000000000000000000000000000000000..601ba415f2446038f3e34cda7cc503329e227fa7
GIT binary patch
literal 3533
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
Hu0mjfJiWe5

literal 0
HcmV?d00001

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/images/Astock.png b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/images/Astock.png
new file mode 100644
index 0000000000000000000000000000000000000000..db5cda9c5512b899cf82293dfb5bf1ba7da831cd
GIT binary patch
literal 359
zcmV-t0hs=YP)<h;3K|Lk000e1NJLTq001Wd000~a0{{R3)xcJ10000#P)t-se}8}d
z{r&3d>Zquwii(Qm<>lAc*Z=?j`uh6L&d#5opUKI|d3kx?-`{d_a`W@^l9H0RxVV~{
zn#9D!($dm3gMRS<0084jL_t(I%e~Xtj)O1^1yDPy19mp}|8K3KQq@YBjx?jWFAz9N
z!UZ57LAuK!;AE|=W{SLAj+4O%hxF!_#TnT?ozK_7@-s)}H}fI2Ba{)JbzD2`X9nm#
zW{SJmt_?o=2_;L1&2|#li=<UBg|MD0U%I_^!RMHHj%c~W>|Mj-q*m^`<(%gVBT{Y~
z=&_l-I1ef}(w*wV+`JDI4+_6Jy^(rd@ZM1)#5U@rdzbnqZtd)KT^Nn*UaE#?)C;wq
zGhX*HIzS&zcaSDb`M2-y59hOf^7YfrVr0BKw}6>`x(8}U9pcx(xCa0L002ovPDHLk
FV1nU$w3q+@

literal 0
HcmV?d00001

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/images/d.png b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/images/d.png
new file mode 100644
index 0000000000000000000000000000000000000000..6516e915624c3348d83b2c4bb35a1e14bb2e20cb
GIT binary patch
literal 12159
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
Ba*zN3

literal 0
HcmV?d00001

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
new file mode 100644
index 0000000000000..51ba2a258faf1
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/deleteImageWithDetailConfirmation.js
@@ -0,0 +1,75 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'jquery',
+    'underscore',
+    'Magento_MediaGalleryUi/js/action/getDetails',
+    'Magento_MediaGalleryUi/js/action/deleteImages',
+    'mage/translate'
+], function ($, _, getDetails, deleteImages, $t) {
+    'use strict';
+
+    return {
+
+        /**
+         * Get information about image use
+         *
+         * @param {Array} recordsIds
+         * @param {String} imageDetailsUrl
+         * @param {String} deleteImageUrl
+         */
+        deleteImageAction: function (recordsIds, imageDetailsUrl, deleteImageUrl) {
+            var imagesCount = Object.keys(recordsIds).length,
+                confirmationContent = $t('%1 Are you sure you want to delete "%2" image%3?')
+                .replace('%2', Object.keys(recordsIds).length).replace('%3', imagesCount > 1 ? 's' : ''),
+                deferred = $.Deferred();
+
+            getDetails(imageDetailsUrl, recordsIds)
+                .then(function (imageDetails) {
+                        confirmationContent = confirmationContent.replace(
+                            '%1',
+                            this.getRecordRelatedContentMessage(imageDetails)
+                        );
+                    }.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);
+                });
+            });
+
+            return deferred.promise();
+        },
+
+        /**
+         * Get information about image use
+         *
+         * @param {Object|String} images
+         * @return {String}
+         */
+        getRecordRelatedContentMessage: function (images) {
+            var usedInMessage = $t('The selected assets are used in the content of the following entities: '),
+                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 + ')');
+                        });
+                    }
+                });
+            });
+
+            if (_.isEmpty(usedIn)) {
+                return '';
+            }
+
+            return usedInMessage + usedIn.join(', ') + '.';
+        }
+    };
+});
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/deleteImages.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/deleteImages.js
new file mode 100644
index 0000000000000..c8ddeaf3d3929
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/deleteImages.js
@@ -0,0 +1,130 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'jquery',
+    'underscore',
+    'mage/url',
+    'Magento_MediaGalleryUi/js/grid/messages',
+    'Magento_Ui/js/modal/confirm',
+    'mage/translate'
+], function ($, _, urlBuilder, messages, confirmation, $t) {
+    'use strict';
+
+    return function (ids, deleteUrl, confirmationContent) {
+        var deferred = $.Deferred(),
+               title = $t('Delete assets'),
+               cancelText = $t('Cancel'),
+               deleteImageText = $t('Delete');
+
+        /**
+         * Send deletion request with redords ids
+         *
+         * @param {Array} recordIds
+         * @param {String} serviceUrl
+         */
+        function sendRequest(recordIds, serviceUrl) {
+
+            $.ajax({
+                type: 'POST',
+                url: serviceUrl,
+                dataType: 'json',
+                showLoader: true,
+                data: {
+                    'form_key': window.FORM_KEY,
+                    'ids': recordIds
+                },
+                context: this,
+
+                /**
+                 * Success handler for deleting image
+                 *
+                 * @param {Object} response
+                 */
+                success: function (response) {
+                    var message = !_.isUndefined(response.message) ? response.message : null;
+
+                    if (!response.success) {
+                        message = message || $t('There was an error on attempt to delete the images.');
+                        $(window).trigger('fileDeleted.enhancedMediaGallery', {
+                            reload: false,
+                            message: message,
+                            code: 'error'
+                        });
+
+                        deferred.reject(message);
+                    }
+
+                    message = message || $t('You have successfully removed the images.');
+                    $(window).trigger('fileDeleted.enhancedMediaGallery', {
+                        reload: true,
+                        message: message,
+                        code: 'success'
+                    });
+                    deferred.resolve(message);
+                },
+
+                /**
+                 * Error handler for deleting image
+                 *
+                 * @param {Object} response
+                 */
+                error: function (response) {
+                    var message;
+
+                    if (typeof response.responseJSON === 'undefined' ||
+                        typeof response.responseJSON.message === 'undefined'
+                    ) {
+                        message = $t('There was an error on attempt to delete the image.');
+                    } else {
+                        message = response.responseJSON.message;
+                    }
+
+                    $(window).trigger('fileDeleted.enhancedMediaGallery', {
+                        reload: false,
+                        message: message,
+                        code: 'error'
+                    });
+                    deferred.reject(message);
+                }
+            });
+        }
+
+        confirmation({
+            title: title,
+            modalClass: 'media-gallery-delete-image-action',
+            content: confirmationContent,
+            buttons: [
+                {
+                    text: cancelText,
+                    class: 'action-secondary action-dismiss',
+
+                    /**
+                     * Close modal
+                     */
+                    click: function () {
+                        this.closeModal();
+                        deferred.resolve({
+                            status: 'canceled'
+                        });
+                    }
+                },
+                {
+                    text: deleteImageText,
+                    class: 'action-primary action-accept',
+
+                    /**
+                     * Delete Image and close modal
+                     */
+                    click: function () {
+                        sendRequest(ids, deleteUrl);
+                        this.closeModal();
+                    }
+                }
+            ]
+        });
+
+        return deferred.promise();
+    };
+});
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/getDetails.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/getDetails.js
new file mode 100644
index 0000000000000..ec750afff29bf
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/getDetails.js
@@ -0,0 +1,60 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'jquery',
+    'mage/translate'
+], function ($, $t) {
+    'use strict';
+
+    return function (imageDetailsUrl, imageIds) {
+        var deferred = $.Deferred(),
+            message;
+
+        $.ajax({
+            type: 'GET',
+            url: imageDetailsUrl,
+            dataType: 'json',
+            showLoader: true,
+            data: {
+                'ids': imageIds
+            },
+            context: this,
+
+            /**
+             * Resolve with image details if success, reject with response message othervise
+             *
+             * @param {Object} response
+             */
+            success: function (response) {
+                if (response.success) {
+                    deferred.resolve(response.imageDetails);
+
+                    return;
+                }
+
+                deferred.reject(response.message);
+            },
+
+            /**
+             * Extract the message and reject
+             *
+             * @param {Object} response
+             */
+            error: function (response) {
+
+                if (typeof response.responseJSON === 'undefined' ||
+                    typeof response.responseJSON.message === 'undefined'
+                ) {
+                    message = $t('Could not retrieve image details.');
+                } else {
+                    message = response.responseJSON.message;
+                }
+                deferred.reject(message);
+            }
+        });
+
+        return deferred.promise();
+    };
+});
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/saveDetails.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/saveDetails.js
new file mode 100644
index 0000000000000..4d1120badeca0
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/saveDetails.js
@@ -0,0 +1,56 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'jquery',
+    'mage/translate'
+], function ($, $t) {
+    'use strict';
+
+    return function (saveImageDetailsUrl, data) {
+        var deferred = $.Deferred(),
+            message;
+
+        $.ajax({
+            type: 'POST',
+            url: saveImageDetailsUrl,
+            dataType: 'json',
+            showLoader: true,
+            data: data,
+
+            /**
+             * Resolve with image details if success, reject with response message otherwise
+             *
+             * @param {Object} response
+             */
+            success: function (response) {
+                if (response.success) {
+                    deferred.resolve(response.message);
+
+                    return;
+                }
+
+                deferred.reject(response.message);
+            },
+
+            /**
+             * Extract the message and reject
+             *
+             * @param {Object} response
+             */
+            error: function (response) {
+                if (typeof response.responseJSON === 'undefined' ||
+                    typeof response.responseJSON.message === 'undefined'
+                ) {
+                    message = $t('Could not save image details.');
+                } else {
+                    message = response.responseJSON.message;
+                }
+                deferred.reject(message);
+            }
+        });
+
+        return deferred.promise();
+    };
+});
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/container.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/container.js
new file mode 100644
index 0000000000000..f6dd277fb85f5
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/container.js
@@ -0,0 +1,34 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'uiElement',
+    'jquery'
+], function (Element, $) {
+    'use strict';
+
+    return Element.extend({
+        defaults: {
+            containerSelector: '.media-gallery-container',
+            masonryComponentPath: 'media_gallery_listing.media_gallery_listing.media_gallery_columns',
+            modules: {
+                masonry: '${ $.masonryComponentPath }'
+            }
+        },
+
+        /**
+         * Init component
+         *
+         * @return {exports}
+         */
+        initialize: function () {
+            this._super();
+
+            $(this.containerSelector).applyBindings();
+
+            return this;
+        }
+    });
+});
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/actions/createDirectory.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/actions/createDirectory.js
new file mode 100644
index 0000000000000..cc4d759069c67
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/actions/createDirectory.js
@@ -0,0 +1,61 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'jquery',
+    'mage/translate'
+], function ($, $t) {
+    'use strict';
+
+    return function (createFolderUrl, paths) {
+        var deferred = $.Deferred(),
+            message,
+            data = {
+                paths: paths
+            };
+
+        $.ajax({
+            type: 'POST',
+            url: createFolderUrl,
+            dataType: 'json',
+            showLoader: true,
+            data: data,
+            context: this,
+
+            /**
+             * Resolve  if success, reject with response message othervise
+             *
+             * @param {Object} response
+             */
+            success: function (response) {
+                if (response.success) {
+                    deferred.resolve(response.message);
+
+                    return;
+                }
+
+                deferred.reject(response.message);
+            },
+
+            /**
+             * Extract the message and reject
+             *
+             * @param {Object} response
+             */
+            error: function (response) {
+
+                if (typeof response.responseJSON === 'undefined' ||
+                    typeof response.responseJSON.message === 'undefined'
+                ) {
+                    message = $t('Could not create the directory.');
+                } else {
+                    message = response.responseJSON.message;
+                }
+                deferred.reject(message);
+            }
+        });
+
+        return deferred.promise();
+    };
+});
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/actions/deleteDirectory.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/actions/deleteDirectory.js
new file mode 100644
index 0000000000000..06277481e1142
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/actions/deleteDirectory.js
@@ -0,0 +1,60 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'jquery',
+    'mage/translate'
+], function ($, $t) {
+    'use strict';
+
+    return function (deleteFolderUrl, path) {
+        var deferred = $.Deferred(),
+            message;
+
+        $.ajax({
+            type: 'POST',
+            url: deleteFolderUrl,
+            dataType: 'json',
+            showLoader: true,
+            data: {
+                path: path
+            },
+            context: this,
+
+            /**
+             * Resolve  if delete folder success, reject with response message othervise
+             *
+             * @param {Object} response
+             */
+            success: function (response) {
+                if (response.success) {
+                    deferred.resolve(response.message);
+
+                    return;
+                }
+
+                deferred.reject(response.message);
+            },
+
+            /**
+             * Extract the message and reject
+             *
+             * @param {Object} response
+             */
+            error: function (response) {
+
+                if (typeof response.responseJSON === 'undefined' ||
+                    typeof response.responseJSON.message === 'undefined'
+                ) {
+                    message = $t('Could not delete the directory.');
+                } else {
+                    message = response.responseJSON.message;
+                }
+                deferred.reject(message);
+            }
+        });
+
+        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
new file mode 100644
index 0000000000000..d7f756d8bbd90
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directories.js
@@ -0,0 +1,186 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.g
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'uiComponent',
+    'Magento_Ui/js/modal/confirm',
+    'Magento_Ui/js/modal/alert',
+    'underscore',
+    'Magento_Ui/js/modal/prompt',
+    'Magento_MediaGalleryUi/js/directory/actions/createDirectory',
+    'Magento_MediaGalleryUi/js/directory/actions/deleteDirectory',
+    'mage/translate',
+    'validation'
+], function ($, Component, confirm, uiAlert, _, prompt, createDirectory, deleteDirectory, $t) {
+    'use strict';
+
+    return Component.extend({
+        defaults: {
+            directoryTreeSelector: '#media-gallery-directory-tree',
+            deleteButtonSelector: '#delete_folder',
+            createFolderButtonSelector: '#create_folder',
+            messageDelay: 5,
+            messagesName: 'media_gallery_listing.media_gallery_listing.messages',
+            modules: {
+                directoryTree: '${ $.parentName }.media_gallery_directories',
+                messages: '${ $.messagesName }'
+            }
+        },
+
+        /**
+         * Initializes media gallery directories component.
+         *
+         * @returns {Sticky} Chainable.
+         */
+        initialize: function () {
+            this._super().observe(['selectedFolder']);
+            this.initEvents();
+
+            return this;
+        },
+
+        /**
+          * Initialize directories events
+          */
+        initEvents: function () {
+            $(this.deleteButtonSelector).on('delete_folder', function () {
+                this.getConfirmationPopupDeleteFolder();
+            }.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));
+
+                            }.bind(this)).fail(function (error) {
+                                uiAlert({
+                                    content: error
+                                });
+                            });
+                        }.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));
+        },
+
+        /**
+         * Return configured path for folder creation.
+         *
+         * @param {String} folderName
+         * @returns {String}
+         */
+        getNewFolderPath: function (folderName) {
+            var selectedFolder = _.isUndefined(this.selectedFolder()) ||
+                                 _.isNull(this.selectedFolder()) ? '/' : this.selectedFolder(),
+               folderToCreate = selectedFolder !== '/' ? selectedFolder + '/' + folderName : folderName;
+
+            return folderToCreate;
+        },
+
+        /**
+          * Return configured prompt with input field
+          */
+        getPrompt: function (data) {
+                prompt({
+                    title: $t(data.title),
+                    content:  $t(data.content),
+                    modalClass: 'media-gallery-folder-prompt',
+                    validation: true,
+                    validationRules: ['required-entry', 'validate-alphanum'],
+                    attributesField: {
+                        name: 'folder_name',
+                        'data-validate': '{required:true, validate-alphanum}',
+                        maxlength: '128'
+                    },
+                    attributesForm: {
+                        novalidate: 'novalidate',
+                        action: ''
+                    },
+                    context: this,
+                    actions: data.actions,
+                    buttons: data.buttons
+                });
+            },
+
+        /**
+          * Confirmation popup for delete folder action.
+          */
+        getConfirmationPopupDeleteFolder: function () {
+            confirm({
+                title: $t('Are you sure you want to delete this folder?'),
+                modalClass: 'delete-folder-confirmation-popup',
+                content: $t('The following folder is going to be deleted: %1')
+                    .replace('%1', this.selectedFolder()),
+                actions: {
+
+                    /**
+                      * Delete folder on button click
+                      */
+                    confirm: function () {
+                        deleteDirectory(
+                            this.directoryTree().deleteDirectoryUrl,
+                            this.selectedFolder()
+                        ).then(function () {
+                            this.directoryTree().removeNode();
+                            this.directoryTree().selectStorageRoot();
+                            $(window).trigger('folderDeleted.enhancedMediaGallery');
+                        }.bind(this)).fail(function (error) {
+                            uiAlert({
+                                content: error
+                            });
+                        });
+                    }.bind(this)
+                }
+            });
+        },
+
+        /**
+         * Set inactive all nodes, adds disable state to Delete Folder Button
+         */
+        setInActive: function () {
+            this.selectedFolder(null);
+            $(this.deleteButtonSelector).attr('disabled', true).addClass('disabled');
+        },
+
+        /**
+         * Set active node, remove disable state from Delete Forlder button
+         *
+         * @param {String} folderId
+         */
+        setActive: function (folderId) {
+            this.selectedFolder(folderId);
+            $(this.deleteButtonSelector).removeAttr('disabled').removeClass('disabled');
+        }
+    });
+});
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
new file mode 100644
index 0000000000000..decc337e1b83c
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
@@ -0,0 +1,477 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* global Base64 */
+define([
+    'jquery',
+    'uiComponent',
+    'uiLayout',
+    'underscore',
+    'Magento_MediaGalleryUi/js/directory/actions/createDirectory',
+    'jquery/jstree/jquery.jstree',
+    'Magento_Ui/js/lib/view/utils/async'
+], function ($, Component, layout, _, createDirectory) {
+    'use strict';
+
+    return Component.extend({
+        defaults: {
+            filterChipsProvider: 'componentType = filters, ns = ${ $.ns }',
+            directoryTreeSelector: '#media-gallery-directory-tree',
+            getDirectoryTreeUrl: 'media_gallery/directories/gettree',
+            jsTreeReloaded: null,
+            modules: {
+                directories: '${ $.name }_directories',
+                filterChips: '${ $.filterChipsProvider }'
+            },
+            listens: {
+                '${ $.provider }:params.filters.path': 'clearFiltersHandle'
+            },
+            viewConfig: [{
+                component: 'Magento_MediaGalleryUi/js/directory/directories',
+                name: '${ $.name }_directories'
+            }]
+        },
+
+        /**
+         * Initializes media gallery directories component.
+         *
+         * @returns {Sticky} Chainable.
+         */
+        initialize: function () {
+            this._super().observe(['activeNode']).initView();
+
+            $.async(
+                this.directoryTreeSelector,
+                this,
+                function () {
+                    this.renderDirectoryTree().then(function () {
+                        this.initEvents();
+                    }.bind(this));
+                }.bind(this));
+
+            return this;
+        },
+
+        /**
+         * 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 {
+                        this.createTree(data);
+                    }
+                }.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,
+                deferred = $.Deferred(),
+                decodedPath,
+                pathArray;
+
+            if (currentTreePath) {
+                decodedPath = Base64.idDecode(currentTreePath);
+
+                if (!this.isDirectoryExist(directories[0], decodedPath)) {
+                    pathArray = this.convertPathToPathsArray(decodedPath);
+
+                    $.each(pathArray, function (i, val) {
+                        if (this.isDirectoryExist(directories[0], val)) {
+                            pathArray.splice(i, 1);
+                        }
+                    }.bind(this));
+
+                    createDirectory(
+                        this.createDirectoryUrl,
+                        pathArray
+                    ).then(function () {
+                        deferred.resolve(true);
+                    });
+                } else {
+                    deferred.resolve(false);
+                }
+            } else {
+                deferred.resolve(false);
+            }
+
+            return deferred.promise();
+        },
+
+        /**
+         * Verify if directory exists in array
+         *
+         * @param {Array} directories
+         * @param {String} directoryId
+         */
+        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);
+                    }
+                }
+            }
+
+            recurse(directories, directoryId);
+
+            return found;
+        },
+
+        /**
+         * Convert path string to path array e.g 'path1/path2' -> ['path1', 'path1/path2']
+         *
+         * @param {String} path
+         */
+        convertPathToPathsArray: function (path) {
+            var pathsArray = [],
+                pathString = '',
+                paths = path.split('/');
+
+            $.each(paths, function (i, val) {
+                pathString += i >= 1 ? val : val + '/';
+                pathsArray.push(i >= 1 ? pathString : val);
+            });
+
+            return pathsArray;
+        },
+
+        /**
+         * Initialize child components
+         *
+         * @returns {Object}
+         */
+        initView: function () {
+            layout(this.viewConfig);
+
+            return this;
+        },
+
+        /**
+         * Wait for condition then call provided callback
+         */
+        waitForCondition: function (condition, callback) {
+            if (condition()) {
+                setTimeout(function () {
+                    this.waitForCondition(condition, callback);
+                }.bind(this), 100);
+            } else {
+                callback();
+            }
+        },
+
+        /**
+         * Remove ability to multiple select on nodes
+         */
+        overrideMultiselectBehavior: function () {
+            $.jstree.defaults.ui['select_range_modifier'] = false;
+            $.jstree.defaults.ui['select_multiple_modifier'] = false;
+        },
+
+        /**
+         *  Handle jstree events
+         */
+        initEvents: function () {
+            this.firejsTreeEvents();
+            this.overrideMultiselectBehavior();
+
+            $(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.checkChipFiltersState();
+                        }
+                    }.bind(this));
+                }.bind(this));
+            }.bind(this));
+        },
+
+        /**
+         * Fire event for jstree component
+         */
+        firejsTreeEvents: function () {
+            $(this.directoryTreeSelector).on('select_node.jstree', function (element, data) {
+                var path = $(data.rslt.obj).data('path');
+
+                this.setActiveNodeFilter(path);
+                this.setJsTreeReloaded(false);
+            }.bind(this));
+
+            $(this.directoryTreeSelector).on('loaded.jstree', function () {
+                this.checkChipFiltersState();
+            }.bind(this));
+
+        },
+
+        /**
+         * Verify directory filter on init event, select folder per directory filter state
+         */
+        checkChipFiltersState: function () {
+            var currentFilterPath = this.filterChips().filters.path,
+                isMediaBrowser = !_.isUndefined(window.MediabrowserUtility),
+                currentTreePath;
+
+            currentTreePath = this.isFiltersApplied(currentFilterPath) || !isMediaBrowser ? currentFilterPath :
+                Base64.idDecode(window.MediabrowserUtility.pathId);
+
+            if (this.folderExistsInTree(currentTreePath)) {
+                this.locateNode(currentTreePath);
+            } else {
+                this.selectStorageRoot();
+            }
+        },
+
+        /**
+         * Verify if directory exists in folder tree
+         *
+         * @param {String} path
+         */
+        folderExistsInTree: function (path) {
+            if (!_.isUndefined(path)) {
+                return $('#' + path.replace(/\//g, '\\/')).length === 1;
+            }
+
+            return false;
+        },
+
+        /**
+         * Check if need to select directory by filters state
+         *
+         * @param {String} currentFilterPath
+         */
+        isFiltersApplied: function (currentFilterPath) {
+            return !_.isUndefined(currentFilterPath) && currentFilterPath !== '' &&
+                currentFilterPath !== 'wysiwyg' && currentFilterPath !== 'catalog/category';
+        },
+
+        /**
+         * Locate and higlight node in jstree by path id.
+         *
+         * @param {String} path
+         */
+        locateNode: function (path) {
+            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);
+
+        },
+
+        /**
+         * 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
+         *
+         * @param {String} nodePath
+         */
+        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');
+
+            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)
+          );
+
+        },
+
+        /**
+         * Set selected folder
+         *
+         * @param {String} path
+         */
+        selectFolder: function (path) {
+            this.activeNode(path);
+
+            this.waitForCondition(
+                function () {
+                    return _.isUndefined(this.directories());
+                }.bind(this),
+                function () {
+                    this.directories().setActive(path);
+                }.bind(this)
+            );
+
+            this.applyFilter(path);
+        },
+
+        /**
+          * Remove active node from directory tree, and select next
+          */
+        removeNode: function () {
+            $(this.directoryTreeSelector).jstree('remove');
+        },
+
+        /**
+         * Apply folder filter by path
+         *
+         * @param {String} path
+         */
+        applyFilter: function (path) {
+            var filters = {},
+                applied = this.filterChips().get('applied');
+
+            filters = $.extend(true, filters, applied);
+            filters.path = path;
+            this.filterChips().set('applied', filters);
+
+        },
+
+        /**
+         * Reload jstree and update jstree events
+         */
+        reloadJsTree: function () {
+            var deferred = $.Deferred();
+
+            this.getJsonTree().then(function (data) {
+                this.createTree(data);
+                this.setJsTreeReloaded(true);
+                this.initEvents();
+                deferred.resolve();
+            }.bind(this));
+
+            return deferred.promise();
+        },
+
+        /**
+         * Get json data for jstree
+         */
+        getJsonTree: function () {
+            var deferred = $.Deferred();
+
+            $.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;
+                }
+            });
+
+            return deferred.promise();
+        },
+
+        /**
+         * Initialize directory tree
+         *
+         * @param {Array} data
+         */
+        createTree: function (data) {
+            $(this.directoryTreeSelector).jstree({
+                plugins: ['json_data', 'themes',  'ui', 'crrm', 'types', 'hotkeys'],
+                vcheckbox: {
+                    'two_state': true,
+                    'real_checkboxes': true
+                },
+                'json_data': {
+                    data: data
+                },
+                hotkeys: {
+                    space: this._changeState,
+                    'return': this._changeState
+                },
+                types: {
+                    'types': {
+                        'disabled': {
+                            'check_node': true,
+                            'uncheck_node': true
+                        }
+                    }
+                }
+            });
+        }
+    });
+});
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image.js
new file mode 100644
index 0000000000000..e7c05573a4f11
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image.js
@@ -0,0 +1,288 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'jquery',
+    'Magento_Ui/js/grid/columns/column',
+    'uiLayout',
+    'underscore'
+], function ($, Column, layout, _) {
+    'use strict';
+
+    return Column.extend({
+        defaults: {
+            bodyTmpl: 'Magento_MediaGalleryUi/grid/columns/image',
+            deleteImageUrl: 'media_gallery/image/delete',
+            addSelectedBtnSelector: '#add_selected',
+            deleteSelectedBtnSelector: '#delete_selected',
+            selected: null,
+            fields: {
+                id: 'id',
+                url: 'url',
+                alt: 'name'
+            },
+            modules: {
+                actions: '${ $.name }_actions',
+                provider: '${ $.provider }',
+                messages: '${ $.messagesName }',
+                massaction: '${ $.massactionComponentName }'
+            },
+            imports: {
+                activeDirectory: '${ $.mediaGalleryDirectoryComponent }:activeNode'
+            },
+            listens: {
+                activeDirectory: 'selectDirectoryHandle',
+                '${ $.massactionComponentName }:massActionMode': 'updateSelected'
+            },
+            viewConfig: [
+                {
+                    component: 'Magento_MediaGalleryUi/js/grid/columns/image/actions',
+                    name: '${ $.name }_actions',
+                    imageModelName: '${ $.name }'
+                }
+            ]
+        },
+
+        /**
+         * Initialize the component
+         *
+         * @returns {Object}
+         */
+        initialize: function () {
+            this._super();
+            this.initView();
+            $(window).on('fileDeleted.enhancedMediaGallery', this.reloadMediaGrid.bind(this));
+            $(window).on('reload.MediaGallery', this.reloadGrid.bind(this));
+
+            return this;
+        },
+
+        /**
+         * Init observable variables
+         * @return {Object}
+         */
+        initObservable: function () {
+            this._super()
+                .observe([
+                    'selected'
+                ]);
+
+            return this;
+        },
+
+        /**
+         * Is massaction mode active.
+         */
+        isMassActionMode: function () {
+            return this.massaction().massActionMode();
+        },
+
+        /**
+         * Returns url to given record.
+         *
+         * @param {Object} record - Data to be preprocessed.
+         * @returns {String}
+         */
+        getUrl: function (record) {
+            return record[this.fields.url];
+        },
+
+        /**
+         * Returns id to given record.
+         *
+         * @param {Object} record - Data to be preprocessed.
+         * @returns {Number}
+         */
+        getId: function (record) {
+            return record[this.fields.id];
+        },
+
+        /**
+         * Update selected items per massaction mode.
+         */
+        updateSelected: function () {
+            this.selected({});
+        },
+
+        /**
+         * Returns name to given record.
+         *
+         * @param {Object} record - Data to be preprocessed.
+         * @returns {String}
+         */
+        getImageAlt: function (record) {
+            return record[this.fields.alt];
+        },
+
+        /**
+         * Check if the record is currently selected
+         *
+         * @param {Object} record - Data to be preprocessed.
+         * @returns {Boolean}
+         */
+        isSelected: function (record) {
+            if (_.isNull(this.selected())) {
+                return false;
+            }
+
+            if (this.massaction().massActionMode()) {
+                return this.selected()[record.id];
+            }
+
+            return this.getId(this.selected()) === this.getId(record);
+        },
+
+        /**
+         * Click on image
+         *
+         * @param {Object} record
+         * @param {Boolean} collapsibleOpened
+         */
+        clickOnImage: function (record, collapsibleOpened) {
+            if (!collapsibleOpened) {
+                this.select(record);
+            }
+        },
+
+        /**
+         * Click on three-dots
+         *
+         * @param {Object} record
+         * @param {Boolean} collapsibleOpened
+         */
+        clickOnThreeDots: function (record, collapsibleOpened) {
+            if (!this.isSelected(record) || collapsibleOpened) {
+                this.select(record);
+            }
+        },
+
+        /**
+         * Handle checkbox click.
+         */
+        checkboxClick: function (record) {
+            var items = this.selected();
+
+            if (this.selected()[record.id])  {
+                delete items[record.id];
+                this.selected(items);
+            } else {
+                items[record.id] = record.id;
+                this.selected(items);
+            }
+
+            return true;
+        },
+
+        /**
+         * Set the record as selected
+         */
+        select: function (record) {
+            if (this.massaction().massActionMode()) {
+                return this.checkboxClick(record);
+            }
+
+            this.isSelected(record) ? this.selected(null) : this.selected(record);
+            this.toggleAddSelectedButton();
+
+            return true;
+        },
+
+        /**
+         * Deselect the record
+         */
+        deselectImage: function () {
+            this.selected(null);
+            this.toggleAddSelectedButton();
+        },
+
+        /**
+         * Get the selected record
+         * @returns {Object}
+         */
+        getSelected: function () {
+            return this.selected();
+        },
+
+        /**
+         * Initialize child components
+         *
+         * @returns {Object}
+         */
+        initView: function () {
+            layout(this.viewConfig);
+
+            return this;
+        },
+
+        /**
+         * Toggle add selected button
+         */
+        toggleAddSelectedButton: function () {
+            if (this.selected() === null) {
+                this.hideAddSelectedAndDeleteButon();
+            } else {
+                $(this.addSelectedBtnSelector).removeClass('no-display');
+                $(this.deleteSelectedBtnSelector).removeClass('no-display');
+            }
+        },
+
+        /**
+         * Hide add selected and Delete button
+         */
+        hideAddSelectedAndDeleteButon: function () {
+            $(this.addSelectedBtnSelector).addClass('no-display');
+            $(this.deleteSelectedBtnSelector).addClass('no-display');
+        },
+
+        /**
+         * @param {jQuery.event} e
+         * @param {Object} data
+         */
+        reloadMediaGrid: function (e, data) {
+            if (data.reload) {
+                this.reloadGrid();
+            }
+
+            if (data.message && data.code) {
+                this.addMessage(data.code, data.message);
+            }
+            this.hideAddSelectedAndDeleteButon();
+        },
+
+        /**
+         * Reload grid
+         */
+        reloadGrid: function () {
+            var provider = this.provider(),
+                dataStorage = provider.storage();
+
+            dataStorage.clearRequests();
+            provider.reload();
+        },
+
+        /**
+         * Add message
+         *
+         * @param {String} code
+         * @param {String} message
+         */
+        addMessage: function (code, message) {
+            this.messages().add(code, message);
+            this.messages().scheduleCleanup();
+        },
+
+        /**
+         * Listener to select directory event
+         *
+         * @param {String} path
+         */
+        selectDirectoryHandle: function (path) {
+            if (this.selected() &&
+                this.selected().directory !== path  &&
+                !this.massaction().massActionMode()) {
+                this.deselectImage();
+            }
+        }
+    });
+});
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image/actions.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image/actions.js
new file mode 100644
index 0000000000000..38743c8d83d3b
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image/actions.js
@@ -0,0 +1,109 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'jquery',
+    'underscore',
+    'uiComponent',
+    'Magento_MediaGalleryUi/js/action/deleteImageWithDetailConfirmation',
+    'Magento_MediaGalleryUi/js/grid/columns/image/insertImageAction',
+    'mage/translate'
+], function ($, _, Component, deleteImageWithDetailConfirmation, image, $t) {
+    'use strict';
+
+    return Component.extend({
+        defaults: {
+            template: 'Magento_MediaGalleryUi/grid/columns/image/actions',
+            mediaGalleryImageDetailsName: 'mediaGalleryImageDetails',
+            mediaGalleryEditDetailsName: 'mediaGalleryEditDetails',
+            actionsList: [
+                {
+                    name: 'image-details',
+                    title: $t('View Details'),
+                    handler: 'viewImageDetails'
+                },
+                {
+                    name: 'edit',
+                    title: $t('Edit'),
+                    handler: 'editImageDetails'
+                },
+                {
+                    name: 'delete',
+                    title: $t('Delete'),
+                    handler: 'deleteImageAction'
+                }
+            ],
+            modules: {
+                imageModel: '${ $.imageModelName }',
+                mediaGalleryImageDetails: '${ $.mediaGalleryImageDetailsName }',
+                mediaGalleryEditDetails: '${ $.mediaGalleryEditDetailsName }'
+            }
+        },
+
+        /**
+         * Initialize the component
+         *
+         * @returns {Object}
+         */
+        initialize: function () {
+            this._super();
+            this.initEvents();
+
+            return this;
+        },
+
+        /**
+         * Initialize image action events
+         */
+        initEvents: function () {
+            $(this.imageModel().addSelectedBtnSelector).click(function () {
+                image.insertImage(
+                    this.imageModel().getSelected(),
+                    {
+                        onInsertUrl: this.imageModel().onInsertUrl,
+                        storeId: this.imageModel().storeId
+                    }
+                );
+            }.bind(this));
+            $(this.imageModel().deleteSelectedBtnSelector).click(function () {
+                this.deleteImageAction(this.imageModel().selected());
+            }.bind(this));
+
+        },
+
+        /**
+         * Delete image action
+         *
+         * @param {Object} record
+         */
+        deleteImageAction: function (record) {
+            var imageDetailsUrl = this.mediaGalleryImageDetails().imageDetailsUrl,
+                deleteImageUrl = this.imageModel().deleteImageUrl;
+
+            deleteImageWithDetailConfirmation.deleteImageAction([record.id], imageDetailsUrl, deleteImageUrl);
+        },
+
+        /**
+         * View image details
+         *
+         * @param {Object} record
+         */
+        viewImageDetails: function (record) {
+            var recordId = this.imageModel().getId(record);
+
+            this.mediaGalleryImageDetails().showImageDetailsById(recordId);
+        },
+
+        /**
+         * Edit image details
+         *
+         * @param {Object} record
+         */
+        editImageDetails: function (record) {
+            var recordId = this.imageModel().getId(record);
+
+            this.mediaGalleryEditDetails().showEditDetailsPanel(recordId);
+        }
+    });
+});
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image/insertImageAction.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image/insertImageAction.js
new file mode 100644
index 0000000000000..f72a05b6d2709
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image/insertImageAction.js
@@ -0,0 +1,131 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* global FORM_KEY, tinyMceEditors */
+define([
+    'jquery',
+    'wysiwygAdapter',
+    'underscore',
+    'mage/translate'
+], function ($, wysiwyg, _, $t) {
+    'use strict';
+
+    return {
+
+        /**
+         * Insert provided image in wysiwyg if enabled, or widget
+         *
+         * @param {Object} record
+         * @param {Object} config
+         * @returns {Boolean}
+         */
+        insertImage: function (record, config) {
+            var targetElement;
+
+            if (record === null) {
+                return false;
+            }
+            targetElement = this.getTargetElement(window.MediabrowserUtility.targetElementId);
+
+            if (!targetElement.length) {
+                window.MediabrowserUtility.closeDialog();
+                throw $t('Target element not found for content update');
+            }
+
+            $.ajax({
+                url: config.onInsertUrl,
+                data: {
+                    filename: record['encoded_id'],
+                    'store_id': config.storeId,
+                    'as_is': targetElement.is('textarea') ? 1 : 0,
+                    'force_static_path': targetElement.data('force_static_path') ? 1 : 0,
+                    'form_key': FORM_KEY
+                },
+                context: this,
+                showLoader: true
+            }).done($.proxy(function (data) {
+                if (targetElement.is('textarea')) {
+                    this.insertAtCursor(targetElement.get(0), data);
+                    targetElement.focus();
+                    $(targetElement).change();
+                } else {
+                    targetElement.val(data)
+                        .data('size', record.size)
+                        .data('mime-type', record['content_type'])
+                        .trigger('change');
+                }
+            }, this));
+            window.MediabrowserUtility.closeDialog();
+            targetElement.focus();
+        },
+
+        /**
+         * Insert image to target instance.
+         *
+         * @param {Object} element
+         * @param {*} value
+         */
+        insertAtCursor: function (element, value) {
+            var sel, startPos, endPos, scrollTop;
+
+            if ('selection' in document) {
+                //For browsers like Internet Explorer
+                element.focus();
+                sel = document.selection.createRange();
+                sel.text = value;
+                element.focus();
+            } else if (element.selectionStart || element.selectionStart == '0') { //eslint-disable-line eqeqeq
+                //For browsers like Firefox and Webkit based
+                startPos = element.selectionStart;
+                endPos = element.selectionEnd;
+                scrollTop = element.scrollTop;
+                element.value = element.value.substring(0, startPos) + value +
+                    element.value.substring(startPos, endPos) + element.value.substring(endPos, element.value.length);
+                element.focus();
+                element.selectionStart = startPos + value.length;
+                element.selectionEnd = startPos + value.length + element.value.substring(startPos, endPos).length;
+                element.scrollTop = scrollTop;
+            } else {
+                element.value += value;
+                element.focus();
+            }
+        },
+
+        /**
+         * Return opener Window object if it exists, not closed and editor is active
+         *
+         * @param {String} targetElementId
+         * return {Object|null}
+         */
+        getMediaBrowserOpener: function (targetElementId) {
+            if (!_.isUndefined(wysiwyg) && wysiwyg.get(targetElementId) && !_.isUndefined(tinyMceEditors) &&
+                !tinyMceEditors.get(targetElementId).getMediaBrowserOpener().closed
+            ) {
+                return tinyMceEditors.get(targetElementId).getMediaBrowserOpener();
+            }
+
+            return null;
+        },
+
+        /**
+         * Get target element
+         *
+         * @param {String} targetElementId
+         * @returns {*|n.fn.init|jQuery|HTMLElement}
+         */
+        getTargetElement: function (targetElementId) {
+            var opener;
+
+            if (!_.isUndefined(wysiwyg) && wysiwyg.get(targetElementId)) {
+                opener = this.getMediaBrowserOpener(targetElementId) || window;
+                targetElementId = tinyMceEditors.get(targetElementId).getMediaBrowserTargetElementId();
+
+                return $(opener.document.getElementById(targetElementId));
+            }
+
+            return $('#' + targetElementId);
+        }
+    };
+});
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/masonry.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/masonry.js
new file mode 100644
index 0000000000000..659fcc0cdcfda
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/masonry.js
@@ -0,0 +1,49 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_Ui/js/grid/masonry',
+    'jquery'
+], function (Masonry, $) {
+    'use strict';
+
+    return Masonry.extend({
+        defaults: {
+            modules: {
+                provider: '${ $.provider }'
+            }
+        },
+
+        /**
+         * Init component
+         *
+         * @return {Object}
+         */
+        initialize: function () {
+            this._super();
+            this.initEvents();
+
+            return this;
+        },
+
+        /**
+         * Initialize events
+         */
+        initEvents: function () {
+            $(window).on('folderDeleted.enhancedMediaGallery', this.reloadGrid.bind(this));
+        },
+
+        /**
+         * Reload grid
+         */
+        reloadGrid: function () {
+            var provider = this.provider(),
+                dataStorage = provider.storage();
+
+            dataStorage.clearRequests();
+            provider.reload();
+        }
+    });
+});
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/massaction/massactionView.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/massaction/massactionView.js
new file mode 100644
index 0000000000000..a49303669edc8
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/massaction/massactionView.js
@@ -0,0 +1,147 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'uiComponent',
+    'mage/translate',
+    'text!Magento_MediaGalleryUi/template/grid/massactions/cancelButton.html'
+], function ($, Component, $t, cancelMassActionButton) {
+    'use strict';
+
+    return Component.extend({
+        defaults: {
+            pageActionsSelector: '.page-actions-buttons',
+            gridSelector: '[data-id="media-gallery-masonry-grid"]',
+            originDeleteSelector: null,
+            originCancelEvent: null,
+            cancelMassactionButton: cancelMassActionButton,
+            isCancelButtonInserted: false,
+            deleteButtonSelector: '#delete_massaction',
+            addSelectedButtonSelector: '#add_selected',
+            cancelMassactionButtonSelector: '#cancel',
+            standAloneTitle: 'Manage Gallery',
+            slidePanelTitle: 'Media Gallery',
+            defaultTitle: null,
+            contextButtonSelector: '.three-dots',
+            buttonsIds: [
+                '#delete_folder',
+                '#create_folder',
+                '#upload_image',
+                '#search_adobe_stock',
+                '.three-dots',
+                '#add_selected'
+            ],
+            massactionModeTitle: $t('Select Images to Delete')
+        },
+
+        /**
+         * Initializes media gallery massaction component.
+         *
+         * @returns {Sticky} Chainable.
+         */
+        initialize: function () {
+            this._super().observe([
+                'massActionMode'
+            ]);
+
+            return this;
+        },
+
+        /**
+         * Switch massaction view state per active mode.
+         */
+        switchView: function () {
+            this.changePageTitle();
+            this.switchButtons();
+        },
+
+        /**
+         * Hide or show buttons per active mode.
+         */
+        switchButtons: function () {
+
+            if (this.massActionMode()) {
+                this.activateMassactionButtonView();
+            } else {
+                this.revertButtonsToDefaultView();
+            }
+        },
+
+        /**
+         * Sets buttons to default regular -mode view.
+         */
+        revertButtonsToDefaultView: function () {
+            $(this.deleteButtonSelector).replaceWith(this.originDeleteSelector);
+
+            if (!this.isCancelButtonInserted) {
+                $('#cancel_massaction').replaceWith(this.originCancelEvent);
+            } else {
+                $(this.cancelMassactionButtonSelector).addClass('no-display');
+                $('#cancel_massaction').remove();
+            }
+
+            $.each(this.buttonsIds, function (key, value) {
+                $(value).removeClass('no-display');
+            });
+
+            $(this.addSelectedButtonSelector).addClass('no-display');
+            $(this.deleteButtonSelector)
+                .addClass('media-gallery-actions-buttons')
+                .removeClass('primary');
+        },
+
+        /**
+          * Activate mass action buttons view
+          */
+        activateMassactionButtonView: function () {
+            this.originDeleteSelector = $(this.deleteButtonSelector).clone();
+            $(this.originDeleteSelector).click(function () {
+                $(window).trigger('massAction.MediaGallery');
+            });
+            this.originCancelEvent = $('#cancel').clone(true, true);
+
+            $.each(this.buttonsIds, function (key, value) {
+                $(value).addClass('no-display');
+            });
+
+            $(this.deleteButtonSelector)
+                .removeClass('media-gallery-actions-buttons')
+                .text($t('Delete Selected'))
+                .addClass('primary');
+
+            if (!$(this.cancelMassactionButtonSelector).length) {
+                $(this.pageActionsSelector).append(this.cancelMassactionButton);
+                this.isCancelButtonInserted = true;
+            } else {
+                $(this.cancelMassactionButtonSelector).replaceWith(this.cancelMassactionButton);
+            }
+            $('#cancel_massaction').on('click', function () {
+                $(window).trigger('terminateMassAction.MediaGallery');
+            }).applyBindings();
+
+            $(this.deleteButtonSelector).off('click').on('click', function () {
+                $(this.deleteButtonSelector).trigger('massDelete');
+            }.bind(this));
+
+        },
+
+        /**
+         * Change page title per active mode.
+         */
+        changePageTitle: function () {
+            var title = $('h1:contains(' + this.standAloneTitle + ')'),
+                  titleSelector = title.length === 1 ? title : $('h1:contains(' + this.slidePanelTitle + ')');
+
+            if (this.massActionMode()) {
+                this.defaultTitle = titleSelector.text();
+                titleSelector.text(this.massactionModeTitle);
+            } else {
+                titleSelector = $('h1:contains(' + this.massactionModeTitle + ')');
+                titleSelector.text(this.defaultTitle);
+            }
+        }
+    });
+});
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
new file mode 100644
index 0000000000000..8114305a3b29c
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/massaction/massactions.js
@@ -0,0 +1,151 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'uiComponent',
+    'Magento_MediaGalleryUi/js/action/deleteImageWithDetailConfirmation',
+    'uiLayout',
+    'underscore',
+    'Magento_Ui/js/modal/alert',
+    'mage/translate'
+], function ($, Component, DeleteImages, Layout, _, uiAlert, $t) {
+    'use strict';
+
+    return Component.extend({
+        defaults: {
+            deleteImagesSelector: '#delete_massaction',
+            mediaGalleryImageDetailsName: 'mediaGalleryImageDetails',
+            modules: {
+                massactionView: '${ $.name }_view',
+                imageModel: '${ $.imageModelName }',
+                mediaGalleryImageDetails: '${ $.mediaGalleryImageDetailsName }'
+            },
+            viewConfig: [
+                {
+                    component: 'Magento_MediaGalleryUi/js/grid/massaction/massactionView',
+                    name: '${ $.name }_view'
+                }
+            ],
+            imports: {
+                imageItems: '${ $.mediaGalleryProvider }:data.items'
+            },
+            listens: {
+                imageItems: 'checkButtonVisibility'
+            },
+            exports: {
+                massActionMode: '${ $.name }_view:massActionMode'
+            }
+        },
+
+        /**
+         * Initializes media gallery massaction component.
+         *
+         * @returns {Sticky} Chainable.
+         */
+        initialize: function () {
+            this._super().observe([
+                'massActionMode'
+            ]);
+            this.initView();
+            this.initEvents();
+
+            return this;
+        },
+
+        /**
+         * Initialize child components
+         *
+         * @returns {Object}
+         */
+        initView: function () {
+            Layout(this.viewConfig);
+
+            return this;
+        },
+
+        /**
+         * Initilize massactions events for media gallery grid.
+         */
+        initEvents: function () {
+            $(window).on('massAction.MediaGallery', function () {
+                if (this.massActionMode()) {
+                    return;
+                }
+                this.imageModel().selected(null);
+                this.massActionMode(true);
+                this.switchMode();
+            }.bind(this));
+
+            $(window).on('terminateMassAction.MediaGallery', function () {
+                if (!this.massActionMode()) {
+                    return;
+                }
+
+                this.massActionMode(false);
+                this.switchMode();
+            }.bind(this));
+        },
+
+        /**
+         * Return total selected items.
+         */
+        getSelectedCount: function () {
+            if (this.massActionMode() && !_.isNull(this.imageModel().selected())) {
+                return Object.keys(this.imageModel().selected()).length;
+            }
+
+            return 0;
+        },
+
+        /**
+         * If images records less than one, disable "delete images" button
+         */
+        checkButtonVisibility: function () {
+            if (this.imageItems.length < 1) {
+                $(this.deleteImagesSelector).addClass('disabled');
+            } else {
+                $(this.deleteImagesSelector).removeClass('disabled');
+            }
+        },
+
+        /**
+         * Switch massaction per current event.
+         */
+        switchMode: function () {
+            this.massactionView().switchView();
+            this.handleDeleteAction();
+        },
+
+        /**
+         * Change Default  behavior of delete image to bulk deletion.
+         */
+        handleDeleteAction: function () {
+            if (this.massActionMode()) {
+                $(this.massactionView().deleteButtonSelector).on('massDelete', function () {
+                    if (this.getSelectedCount() < 1) {
+                        uiAlert({
+                            content: $t('You need to select at least one image')
+                        });
+
+                    } else {
+                        DeleteImages.deleteImageAction(
+                            this.imageModel().selected(),
+                            this.mediaGalleryImageDetails().imageDetailsUrl,
+                            this.imageModel().deleteImageUrl
+                        ).then(function (response) {
+                            if (response.status === 'canceled') {
+                                return;
+                            }
+                            this.imageModel().selected({});
+                            this.massActionMode(false);
+                            this.switchMode();
+                        }.bind(this));
+                    }
+                }.bind(this));
+            }
+        }
+    });
+});
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
new file mode 100644
index 0000000000000..7116784f41a0d
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/messages.js
@@ -0,0 +1,77 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'uiElement'
+], function (Element) {
+    'use strict';
+
+    return Element.extend({
+        defaults: {
+            template: 'Magento_MediaGalleryUi/grid/messages',
+            messageDelay: 5,
+            messages: []
+        },
+
+        /**
+         * Init observable variables
+         * @return {Object}
+         */
+        initObservable: function () {
+            this._super()
+                .observe([
+                    'messages'
+                ]);
+
+            return this;
+        },
+
+        /**
+         * Get messages
+         *
+         * @returns {Array}
+         */
+        get: function () {
+            return this.messages();
+        },
+
+        /**
+         * Add message
+         *
+         * @param {String} type
+         * @param {String} message
+         */
+        add: function (type, message) {
+            this.messages.push({
+                code: type,
+                message: message
+            });
+        },
+
+        /**
+         * Clear messages
+         */
+        clear: function () {
+            this.messages.removeAll();
+        },
+
+        /**
+         * Schedule message cleanup
+         *
+         * @param {Number} delay
+         */
+        scheduleCleanup: function (delay) {
+            // eslint-disable-next-line no-unused-vars
+            var timerId;
+
+            delay = delay || this.messageDelay;
+
+            timerId = setTimeout(function () {
+                clearTimeout(timerId);
+                this.clear();
+            }.bind(this), Number(delay) * 1000);
+        }
+    });
+});
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/sortBy.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/sortBy.js
new file mode 100644
index 0000000000000..15f62d6a7efd1
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/sortBy.js
@@ -0,0 +1,77 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+    'Magento_Ui/js/grid/sortBy'
+], function (Element) {
+    'use strict';
+
+    return Element.extend({
+        defaults: {
+            columnIndexMap: {}
+        },
+
+        /**
+         * Prepared sort order options
+         */
+        preparedOptions: function (columns) {
+            var index = 0,
+                sortBy;
+
+            if (columns && columns.length > 0) {
+                columns.map(function (column) {
+                    if (column.sortable === true) {
+                        sortBy = column['sort_by'] || {};
+
+                        if (sortBy.excluded) {
+                            return;
+                        }
+
+                        this.options.push({
+                            value: column.index,
+                            label: column.label,
+                            sortByField: sortBy.field,
+                            sortDirection: sortBy.direction
+                        });
+
+                        this.columnIndexMap[column.index] = index++;
+
+                        this.isVisible(true);
+                    } else {
+                        this.isVisible(false);
+                    }
+                }.bind(this));
+            }
+        },
+
+        /**
+         * Apply changes
+         */
+        applyChanges: function () {
+            var column = this.getColumn(this.selectedOption());
+
+            this.applied({
+                field: column.sortByField || this.selectedOption(),
+                direction: column.sortDirection || this.sorting
+            });
+        },
+
+        /**
+         * Get column by index
+         *
+         * @param {String} optionIndex
+         * @returns {Object}
+         */
+        getColumn: function (optionIndex) {
+            return this.options[this.columnIndexMap[optionIndex]];
+        },
+
+        /**
+         * Select default option
+         */
+        selectDefaultOption: function () {
+            this.selectedOption(this.options[0].value);
+        }
+    });
+});
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image-uploader.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image-uploader.js
new file mode 100644
index 0000000000000..3b69ca07f5771
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image-uploader.js
@@ -0,0 +1,245 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'uiComponent',
+    'jquery',
+    'underscore',
+    'Magento_Ui/js/lib/validation/validator',
+    'mage/translate',
+    'jquery/file-uploader'
+], function (Component, $, _, validator, $t) {
+    'use strict';
+
+    return Component.extend({
+        defaults: {
+            imageUploadInputSelector: '#image-uploader-form',
+            directoriesPath: 'media_gallery_listing.media_gallery_listing.media_gallery_directories',
+            actionsPath: 'media_gallery_listing.media_gallery_listing.media_gallery_columns.thumbnail_url',
+            messagesPath: 'media_gallery_listing.media_gallery_listing.messages',
+            imageUploadUrl: '',
+            acceptFileTypes: '',
+            allowedExtensions: '',
+            maxFileSize: '',
+            maxFileNameLength: 90,
+            loader: false,
+            modules: {
+                directories: '${ $.directoriesPath }',
+                actions: '${ $.actionsPath }',
+                mediaGridMessages: '${ $.messagesPath }',
+                sortBy: '${ $.sortByName }',
+                listingPaging: '${ $.listingPagingName }'
+            }
+        },
+
+        /**
+         * Init component
+         *
+         * @return {exports}
+         */
+        initialize: function () {
+            this._super().observe(
+                [
+                    'loader',
+                    'count'
+                ]
+            );
+
+            return this;
+        },
+
+        /**
+         * Initializes file upload library
+         */
+        initializeFileUpload: function () {
+            $(this.imageUploadInputSelector).fileupload({
+                url: this.imageUploadUrl,
+                acceptFileTypes: this.acceptFileTypes,
+                allowedExtensions: this.allowedExtensions,
+                maxFileSize: this.maxFileSize,
+
+                /**
+                 * Extending the form data
+                 *
+                 * @param {Object} form
+                 * @returns {Array}
+                 */
+                formData: function (form) {
+                    return form.serializeArray().concat(
+                        [{
+                            name: 'isAjax',
+                            value: true
+                        },
+                        {
+                            name: 'form_key',
+                            value: window.FORM_KEY
+                        },
+                        {
+                            name: 'target_folder',
+                            value: this.getTargetFolder()
+                        }]
+                    );
+                }.bind(this),
+
+                add: function (e, data) {
+                    if (!this.isSizeExceeded(data.files[0]).passed) {
+                        this.addValidationErrorMessage('Cannot upload "' + data.files[0].name +
+                                      '". File exceeds maximum file size limit.');
+
+                        return;
+                    } else if (!this.isFileNameLengthExceeded(data.files[0]).passed) {
+                        this.addValidationErrorMessage('Cannot upload "' + data.files[0].name +
+                                                       '". Filename is too long, must be 90 characters or less.');
+
+                        return;
+                    }
+
+                    this.showLoader();
+                    this.count(1);
+                    data.submit();
+                }.bind(this),
+
+                stop: function () {
+                    this.openNewestImages();
+                    this.mediaGridMessages().scheduleCleanup();
+                }.bind(this),
+
+                start: function () {
+                    this.mediaGridMessages().clear();
+                }.bind(this),
+
+                done: function (e, data) {
+                    var response = data.jqXHR.responseJSON;
+
+                    if (!response) {
+                        this.showErrorMessage(data, $t('Could not upload the asset.'));
+
+                        return;
+                    }
+
+                    if (!response.success) {
+                        this.showErrorMessage(data, response.message);
+
+                        return;
+                    }
+                    this.showSuccessMessage(data);
+                    this.hideLoader();
+                    this.actions().reloadGrid();
+                }.bind(this)
+            });
+        },
+
+        /**
+         * Add error message after validation error.
+         *
+         * @param {String} message
+         */
+        addValidationErrorMessage: function (message) {
+            this.mediaGridMessages().add(
+                'error',
+                $t(message)
+            );
+
+            this.count() < 2 || this.mediaGridMessages().scheduleCleanup();
+        },
+
+        /**
+         * Checks if size of provided file exceeds
+         * defined in configuration size limits.
+         *
+         * @param {Object} file - File to be checked.
+         * @returns {Boolean}
+         */
+        isSizeExceeded: function (file) {
+            return validator('validate-max-size', file.size, this.maxFileSize);
+        },
+
+        /**
+         * Checks if name length of provided file exceeds
+         * defined in configuration size limits.
+         *
+         * @param {Object} file - File to be checked.
+         * @returns {Boolean}
+         */
+        isFileNameLengthExceeded: function (file) {
+            return validator('max_text_length', file.name, this.maxFileNameLength);
+        },
+
+        /**
+         * Go to recently uploaded images if at least one uploaded successfully
+         */
+        openNewestImages: function () {
+            this.mediaGridMessages().get().each(function (message) {
+                if (message.code === 'success') {
+                    this.actions().deselectImage();
+                    this.sortBy().selectDefaultOption();
+                    this.listingPaging().goFirst();
+
+                    return false;
+                }
+            }.bind(this));
+        },
+
+        /**
+         * Show error meassages with file name.
+         *
+         * @param {Object} data
+         * @param {String} message
+         */
+        showErrorMessage: function (data, message) {
+            data.files.each(function (file) {
+                this.mediaGridMessages().add(
+                    'error',
+                    file.name + ': ' + $t(message)
+                );
+            }.bind(this));
+
+            this.hideLoader();
+        },
+
+        /**
+         * Show success message, and files counts
+         */
+        showSuccessMessage: function () {
+            var prefix = this.count() === 1 ? 'an image' : this.count() + ' images';
+
+            this.mediaGridMessages().messages.remove(function (item) {
+                return item.code === 'success';
+            });
+            this.mediaGridMessages().add('success', $t('Successfully uploaded ' + prefix));
+            this.count(this.count() + 1);
+
+        },
+
+        /**
+         * Gets Media Gallery selected folder
+         *
+         * @returns {String}
+         */
+        getTargetFolder: function () {
+
+            if (_.isUndefined(this.directories().activeNode()) ||
+                _.isNull(this.directories().activeNode())) {
+                return '/';
+            }
+
+            return this.directories().activeNode();
+        },
+
+        /**
+         * Shows spinner loader
+         */
+        showLoader: function () {
+            this.loader(true);
+        },
+
+        /**
+         * Hides spinner loader
+         */
+        hideLoader: function () {
+            this.loader(false);
+        }
+    });
+});
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
new file mode 100644
index 0000000000000..c7ca95bed863c
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-actions.js
@@ -0,0 +1,130 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'underscore',
+    'uiElement',
+    'Magento_MediaGalleryUi/js/action/deleteImageWithDetailConfirmation',
+    'Magento_MediaGalleryUi/js/grid/columns/image/insertImageAction',
+    'Magento_MediaGalleryUi/js/action/saveDetails',
+    'mage/validation'
+], function ($, _, Element, deleteImageWithDetailConfirmation, addSelected, saveDetails) {
+    'use strict';
+
+    return Element.extend({
+        defaults: {
+            modalSelector: '',
+            modalWindowSelector: '',
+            mediaGalleryImageDetailsName: 'mediaGalleryImageDetails',
+            mediaGalleryEditDetailsName: 'mediaGalleryEditDetails',
+            template: 'Magento_MediaGalleryUi/image/actions',
+            modules: {
+                imageModel: '${ $.imageModelName }',
+                mediaGalleryImageDetails: '${ $.mediaGalleryImageDetailsName }',
+                mediaGalleryEditDetails: '${ $.mediaGalleryEditDetailsName }'
+            }
+        },
+
+        /**
+         * Initialize the component
+         *
+         * @returns {Object}
+         */
+        initialize: function () {
+            this._super();
+            $(window).on('fileDeleted.enhancedMediaGallery', this.closeViewDetailsModal.bind(this));
+
+            return this;
+        },
+
+        /**
+         * Close the images details modal
+         */
+        closeModal: function () {
+            var modalElement = $(this.modalSelector),
+                modalWindow = $(this.modalWindowSelector);
+
+            if (!modalWindow.hasClass('_show') || !modalElement.length || _.isUndefined(modalElement.modal)) {
+                return;
+            }
+
+            modalElement.modal('closeModal');
+        },
+
+        /**
+         * Opens the image edit panel
+         */
+        editImageAction: function () {
+            var record = this.imageModel().getSelected().id;
+
+            this.mediaGalleryEditDetails().showEditDetailsPanel(record);
+        },
+
+        /**
+         * Delete image action
+         */
+        deleteImageAction: function () {
+            var imageDetailsUrl = this.mediaGalleryImageDetails().imageDetailsUrl,
+                deleteImageUrl = this.imageModel().deleteImageUrl;
+
+            deleteImageWithDetailConfirmation.deleteImageAction(
+                [this.imageModel().getSelected().id],
+                imageDetailsUrl,
+                deleteImageUrl
+            );
+        },
+
+        /**
+         * Save image details action
+         */
+        saveImageDetailsAction: function () {
+            var saveDetailsUrl = this.mediaGalleryEditDetails().saveDetailsUrl,
+                modalElement = $(this.modalSelector),
+                form = modalElement.find('#image-edit-details-form'),
+                imageId = this.imageModel().getSelected().id,
+                keywords = this.mediaGalleryEditDetails().selectedKeywords(),
+                imageDetails = this.mediaGalleryImageDetails();
+
+            if (form.validation('isValid')) {
+                saveDetails(
+                    saveDetailsUrl,
+                    [form.serialize(), $.param({
+                        'keywords': keywords
+                    })].join('&')
+                ).then(function () {
+                    this.closeModal();
+                    this.imageModel().reloadGrid();
+                    imageDetails.removeCached(imageId);
+
+                    if (imageDetails.isActive()) {
+                        imageDetails.showImageDetailsById(imageId);
+                    }
+                }.bind(this));
+            }
+        },
+
+        /**
+         * Add Image
+         */
+        addImage: function () {
+            addSelected.insertImage(
+                this.imageModel().getSelected(),
+                {
+                    onInsertUrl: this.imageModel().onInsertUrl,
+                    storeId: this.imageModel().storeId
+                }
+            );
+            this.closeModal();
+        },
+
+        /**
+         * Close view details modal after confirm deleting image
+         */
+        closeViewDetailsModal: function () {
+            this.closeModal();
+        }
+    });
+});
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-details.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-details.js
new file mode 100644
index 0000000000000..d0d37d49329e0
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-details.js
@@ -0,0 +1,174 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'underscore',
+    'uiComponent',
+    'Magento_MediaGalleryUi/js/action/getDetails'
+], function ($, _, Component, getDetails) {
+    'use strict';
+
+    return Component.extend({
+        defaults: {
+            template: 'Magento_MediaGalleryUi/image/image-details',
+            modalSelector: '',
+            modalWindowSelector: '',
+            imageDetailsUrl: '/media_gallery/image/details',
+            images: [],
+            tagListLimit: 7,
+            showAllTags: false,
+            image: null,
+            modules: {
+                mediaGridMessages: '${ $.mediaGridMessages }'
+            }
+        },
+
+        /**
+         * Init observable variables
+         *
+         * @return {Object}
+         */
+        initObservable: function () {
+            this._super()
+                .observe([
+                    'image',
+                    'showAllTags'
+                ]);
+
+            return this;
+        },
+
+        /**
+         * Show image details by ID
+         *
+         * @param {String} imageId
+         */
+        showImageDetailsById: function (imageId) {
+            if (_.isUndefined(this.images[imageId])) {
+                getDetails(this.imageDetailsUrl, [imageId]).then(function (imageDetails) {
+                    this.images[imageId] = imageDetails[imageId];
+                    this.image(this.images[imageId]);
+                    this.openImageDetailsModal();
+                }.bind(this)).fail(function (error) {
+                    this.addMediaGridMessage('error', error);
+                }.bind(this));
+
+                return;
+            }
+
+            if (this.image() && this.image().id === imageId) {
+                this.openImageDetailsModal();
+
+                return;
+            }
+
+            this.image(this.images[imageId]);
+            this.openImageDetailsModal();
+        },
+
+        /**
+         * Open image details popup
+         */
+        openImageDetailsModal: function () {
+            var modalElement = $(this.modalSelector);
+
+            if (!modalElement.length || _.isUndefined(modalElement.modal)) {
+                return;
+            }
+
+            this.showAllTags(false);
+            modalElement.modal('openModal');
+        },
+
+        /**
+         * Close image details popup
+         */
+        closeImageDetailsModal: function () {
+            var modalElement = $(this.modalSelector);
+
+            if (!modalElement.length || _.isUndefined(modalElement.modal)) {
+                return;
+            }
+
+            modalElement.modal('closeModal');
+        },
+
+        /**
+         * Add media grid message
+         *
+         * @param {String} code
+         * @param {String} message
+         */
+        addMediaGridMessage: function (code, message) {
+            this.mediaGridMessages().add(code, message);
+            this.mediaGridMessages().scheduleCleanup();
+        },
+
+        /**
+         * Get tag text
+         *
+         * @param {String} tagText
+         * @param {Number} tagIndex
+         * @return {String}
+         */
+        getTagText: function (tagText, tagIndex) {
+            return tagText + (this.image().tags.length - 1 === tagIndex ? '' : ',');
+        },
+
+        /**
+         * Show all image tags
+         */
+        showMoreImageTags: function () {
+            this.showAllTags(true);
+        },
+
+        /**
+         * Is value an object
+         *
+         * @param {*} value
+         * @returns {Boolean}
+         */
+        isArray: function (value) {
+            return _.isArray(value);
+        },
+
+        /**
+         * Get name and number text for used in link
+         *
+         * @param {Object} item
+         * @returns {String}
+         */
+        getUsedInText: function (item) {
+            return item.name +  '(' + item.number + ')';
+        },
+
+        /**
+         * Get filter url
+         *
+         * @param {String} link
+         */
+        getFilterUrl: function (link) {
+            return link + '?filters[asset_id]=' + this.image().id;
+        },
+
+        /**
+         * Check if details modal is active
+         * @return {Boolean}
+         */
+        isActive: function () {
+            return $(this.modalWindowSelector).hasClass('_show');
+        },
+
+        /**
+         * Remove image details
+         *
+         * @param {String} id
+         */
+        removeCached: function (id) {
+            delete this.images[id];
+        }
+    });
+});
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
new file mode 100644
index 0000000000000..c31bc848bdc70
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-edit.js
@@ -0,0 +1,228 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'underscore',
+    'uiComponent',
+    'uiLayout',
+    'Magento_Ui/js/lib/key-codes',
+    'Magento_MediaGalleryUi/js/action/getDetails',
+    'mage/validation'
+], function ($, _, Component, layout, keyCodes, getDetails) {
+    'use strict';
+
+    return Component.extend({
+        defaults: {
+            template: 'Magento_MediaGalleryUi/image/image-edit',
+            modalSelector: '.media-gallery-edit-image-details-modal',
+            imageEditDetailsUrl: '/media_gallery/image/details',
+            saveDetailsUrl: '/media_gallery/image/saveDetails',
+            images: [],
+            image: null,
+            keywordOptions: [],
+            selectedKeywords: [],
+            newKeyword: '',
+            newKeywordSelector: '#keyword',
+            modules: {
+                mediaGridMessages: '${ $.mediaGridMessages }',
+                keywordsSelect: '${ $.name }_keywords'
+            },
+            viewConfig: [
+                {
+                    component: 'Magento_Ui/js/form/element/ui-select',
+                    name: '${ $.name }_keywords',
+                    template: 'ui/grid/filters/elements/ui-select',
+                    disableLabel: true
+                }
+            ],
+            exports: {
+                keywordOptions: '${ $.name }_keywords:options'
+            },
+            links: {
+                selectedKeywords: '${ $.name }_keywords:value'
+            }
+        },
+
+        /**
+         * Initialize the component
+         *
+         * @returns {Object}
+         */
+        initialize: function () {
+            this._super().initView();
+
+            return this;
+        },
+
+        /**
+         * Add a new keyword to select
+         */
+        addKeyword: function () {
+            var options = this.keywordOptions(),
+                selected = this.selectedKeywords(),
+                newKeywordField = $(this.newKeywordSelector);
+
+            newKeywordField.validation();
+
+            if (!newKeywordField.validation('isValid') || this.newKeyword() === '') {
+                return;
+            }
+
+            options.push(this.getOptionForKeyword(this.newKeyword()));
+            selected.push(this.newKeyword());
+            this.newKeyword('');
+
+            this.keywordOptions(options);
+            this.selectedKeywords(selected);
+        },
+
+        /**
+         * Create an option object based on keyword string
+         *
+         * @param {String} keyword
+         * @returns {Object}
+         */
+        getOptionForKeyword: function (keyword) {
+            return {
+                'is_active': 1,
+                level: 1,
+                value: keyword,
+                label: keyword
+            };
+        },
+
+        /**
+         * Convert array of keywords to options format
+         *
+         * @param {Array} tags
+         */
+        setKeywordOptions: function (tags) {
+            var options = [];
+
+            tags.forEach(function (tag) {
+                options.push(this.getOptionForKeyword(tag));
+            }.bind(this));
+
+            this.keywordOptions(options);
+            this.selectedKeywords(tags);
+        },
+
+        /**
+         * Initialize child components
+         *
+         * @returns {Object}
+         */
+        initView: function () {
+            layout(this.viewConfig);
+
+            return this;
+        },
+
+        /**
+         * Init observable variables
+         *
+         * @return {Object}
+         */
+        initObservable: function () {
+            this._super()
+                .observe([
+                    'image',
+                    'keywordOptions',
+                    'selectedKeywords',
+                    'newKeyword'
+                ]);
+
+            return this;
+        },
+
+        /**
+         * Get image details by ID
+         *
+         * @param {String} imageId
+         */
+        showEditDetailsPanel: function (imageId) {
+            if (_.isUndefined(this.images[imageId])) {
+                getDetails(this.imageEditDetailsUrl, [imageId]).then(function (imageDetails) {
+                    this.images[imageId] = imageDetails[imageId];
+                    this.image(this.images[imageId]);
+                    this.openEditImageDetailsModal();
+                }.bind(this)).fail(function (error) {
+                    this.addMediaGridMessage('error', error);
+                }.bind(this));
+
+                return;
+            }
+
+            if (this.image() && this.image().id === imageId) {
+                this.openEditImageDetailsModal();
+
+                return;
+            }
+
+            this.image(this.images[imageId]);
+            this.openEditImageDetailsModal();
+        },
+
+        /**
+         * Open edit image details popup
+         */
+        openEditImageDetailsModal: function () {
+            var modalElement = $(this.modalSelector);
+
+            if (!modalElement.length || _.isUndefined(modalElement.modal)) {
+                return;
+            }
+
+            this.setKeywordOptions(this.image().tags);
+            this.newKeyword('');
+
+            modalElement.modal('openModal');
+        },
+
+        /**
+         * Close image details popup
+         */
+        closeImageDetailsModal: function () {
+            var modalElement = $(this.modalSelector);
+
+            if (!modalElement.length || _.isUndefined(modalElement.modal)) {
+                return;
+            }
+
+            modalElement.modal('closeModal');
+        },
+
+        /**
+         * Add media grid message
+         *
+         * @param {String} code
+         * @param {String} message
+         */
+        addMediaGridMessage: function (code, message) {
+            this.mediaGridMessages().add(code, message);
+            this.mediaGridMessages().scheduleCleanup();
+        },
+
+        /**
+         * Handle Enter key event to save image details
+         *
+         * @param {Object} data
+         * @param {jQuery.Event} event
+         * @returns {Boolean}
+         */
+        handleEnterKey: function (data, event) {
+            var modalElement = $(this.modalSelector),
+                key = keyCodes[event.keyCode];
+
+            if (key === 'enterKey') {
+                event.preventDefault();
+                modalElement.find('.page-action-buttons button.save').click();
+            }
+
+            return true;
+        }
+    });
+});
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/validation/validate-image-description.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/validation/validate-image-description.js
new file mode 100644
index 0000000000000..127f1676015f1
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/validation/validate-image-description.js
@@ -0,0 +1,19 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'jquery/validate',
+    'mage/translate'
+], function ($) {
+    'use strict';
+
+    $.validator.addMethod(
+        'validate-image-description', function (value) {
+            return /^[a-zA-Z0-9\-\_\.\,\n\ ]+$|^$/i.test(value);
+
+        }, $.mage.__('Please use only letters (a-z or A-Z), numbers (0-9), ' +
+            'dots (.), commas(,), underscores (_), dashes (-), and spaces on this field.'));
+});
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/validation/validate-image-keyword.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/validation/validate-image-keyword.js
new file mode 100644
index 0000000000000..47fa5b19781bc
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/validation/validate-image-keyword.js
@@ -0,0 +1,19 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'jquery/validate',
+    'mage/translate'
+], function ($, validate, $t) {
+    'use strict';
+
+    $.validator.addMethod(
+        'validate-image-keyword', function (value) {
+            return /^[a-zA-Z0-9\-\_\.\,]+$|^$/i.test(value);
+
+        }, $t('Please use only letters (a-z or A-Z), numbers (0-9), dots (.), commas(,), ' +
+            'underscores (_) and dashes(-) on this field.'));
+});
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/validation/validate-image-title.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/validation/validate-image-title.js
new file mode 100644
index 0000000000000..1429be64b7d12
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/validation/validate-image-title.js
@@ -0,0 +1,19 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'jquery/validate',
+    'mage/translate'
+], function ($) {
+    'use strict';
+
+    $.validator.addMethod(
+        'validate-image-title', function (value) {
+            return /^[a-zA-Z0-9\-\_\.\,\ ]+$/i.test(value);
+
+        }, $.mage.__('Please use only letters (a-z or A-Z), numbers (0-9), dots (.), commas(,), ' +
+            'underscores (_), dashes(-) and spaces on this field.'));
+});
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/columns/image.html b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/columns/image.html
new file mode 100644
index 0000000000000..4a8350231a0fd
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/columns/image.html
@@ -0,0 +1,45 @@
+<!--
+    /**
+    * Copyright © Magento, Inc. All rights reserved.
+    * See COPYING.txt for license details.
+    */
+-->
+<div class="media-gallery-wrap" collapsible>
+  <div class="mediagallery-massaction-checkbox" if="isMassActionMode()">
+      <input type="checkbox" attr="{ 'data-ui-id': $row().title }" visible="isMassActionMode()" ko-checked="isSelected($row())" click="function () { return select($row()); }"/>
+  </div>
+    <div class="media-gallery-image">
+        <div data-row="file"
+             class="masonry-image-block media-gallery-image-block"
+             attr="'data-id': $col.getId($row())"
+             css="{ selected: isSelected($row()) }"
+             click="function(){ clickOnImage($row(), $collapsible.opened()) }"
+        >
+            <img attr="src: $col.getUrl($row()), alt: $col.getImageAlt($row())"
+                 class="media-gallery-image-column"
+                 data-role="thumbnail"/>
+        </div>
+        <ul class="action-menu" css="_active: $collapsible.opened">
+            <scope args="actions">
+                <render args="template"/>
+            </scope>
+        </ul>
+    </div>
+    <div class="masonry-image-description">
+        <ul class="media-gallery-image-details">
+            <li class="name" data-ui-id="title" text="$row().title"></li>
+            <li class="source">
+                <img if="$row().source" class="adobe-stock-icon" attr="{ src: $row().source }"/>
+            </li>
+            <li class="type" data-ui-id="content-type" text="$row().content_type"></li> &#8226;
+            <li class="dimensions" data-ui-id="dimensions" text="$row().width + 'x' + $row().height"></li>
+        </ul>
+        <div class="media-gallery-image-actions">
+            <div class="action-select-wrap">
+                <span class="three-dots" ifnot="isMassActionMode()"
+                      toggleCollapsible
+                      click="function () { clickOnThreeDots($row(), $collapsible.opened()); }"></span>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/columns/image/actions.html b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/columns/image/actions.html
new file mode 100644
index 0000000000000..042e119b9f40e
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/columns/image/actions.html
@@ -0,0 +1,15 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<each args="{ data: actionsList, as: 'action' }">
+    <li>
+        <a class="action-menu-item" href="" text="action.title"
+           click="$parent[action.handler].bind($parent, $row())"
+           attr="{'data-action': 'item-' + action.name}">
+        </a>
+    </li>
+</each>
\ No newline at end of file
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/directories/directoryTree.html b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/directories/directoryTree.html
new file mode 100644
index 0000000000000..da835952e2f23
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/directories/directoryTree.html
@@ -0,0 +1,10 @@
+<!--
+    /**
+    * Copyright © Magento, Inc. All rights reserved.
+    * See COPYING.txt for license details.
+    */
+-->
+
+<div class="media-directory-container">
+    <div id="media-gallery-directory-tree"></div>
+</div>
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/filter/checkbox.html b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/filter/checkbox.html
new file mode 100644
index 0000000000000..d1840fdb3dc8e
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/filter/checkbox.html
@@ -0,0 +1,24 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div class="admin__field admin__media-gallery-image-checkbox" visible="visible" css="$data.additionalClasses">
+    <div class="admin__field-control">
+        <label class="admin__form-field-label" if="$data.label" attr="for: uid">
+            <span translate="label" attr="'data-config-scope': $data.scopeLabel" />
+        </label>
+    </div>
+    <div class="admin__field admin__field-option">
+        <input type="checkbox"
+               class="admin__control-checkbox"
+               ko-checked="$data.checked"
+               disable="disabled"
+               ko-value="value"
+               hasFocus="focused"
+               attr="id: uid, name: inputName"/>
+
+        <label class="admin__field-label" text="description" attr="for: uid"/>
+    </div>
+</div>
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
new file mode 100644
index 0000000000000..cce859f331d9a
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/filters/elements/ui-select.html
@@ -0,0 +1,133 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<ifnot args="disableLabel">
+    <label class="admin__form-field-label" attr="{for: uid}">
+        <span translate="label"></span>
+    </label>
+</ifnot>
+<div class="admin__action-multiselect-wrap action-select-wrap media-gallery-asset-ui-select-filter"
+     tabindex="0" attr="{id: uid}" css="{_active: listVisible,'admin__action-multiselect-tree': isTree()}"
+     event="{focusin: onFocusIn,focusout: onFocusOut,keydown: keydownSwitcher}" outerClick="outerClick.bind($data)">
+    <ifnot args="chipsEnabled">
+        <div class="action-select admin__action-multiselect"
+             data-role="advanced-select"
+             css="{_active: listVisible}"
+             click="function(data, event) {toggleListVisible(data, event)}">
+            <div class="admin__action-multiselect-text" data-role="selected-option"
+                 ifnot="validationLoading" css="{warning: warn().length}" text="setCaption()">
+            </div>
+            <button if="isRemoveSelectedIcon && hasData() || !validationLoading" class="action-close"
+                    type="button" data-action="remove-selected-item" tabindex="-1" click="clear">
+                <span class="action-close-text" translate="'Close'"></span>
+            </button>
+            <div data-role="spinner" class="admin__data-grid-loading-mask" visible="validationLoading"
+                 if="validationLoading">
+                <div class="spinner">
+                    <span repeat="8"/>
+                </div>
+            </div>
+        </div>
+    </ifnot>
+    <if args="chipsEnabled">
+        <div class="action-select admin__action-multiselect" data-role="advanced-select"
+             css="{_active: listVisible}" click="function(data, event) {toggleListVisible(data, event)}">
+            <div class="admin__action-multiselect-text" visible="!hasData()"
+                 translate="selectedPlaceholders.defaultPlaceholder">
+            </div>
+            <each args="{ data: getSelected(), as: 'option'}">
+            <span class="admin__action-multiselect-crumb">
+                <span text="label">
+                </span>
+                <button class="action-close" type="button" data-action="remove-selected-item"
+                        tabindex="-1" click="$parent.removeSelected.bind($parent, value)">
+                    <span class="action-close-text" translate="'Close'"></span>
+                </button>
+            </span>
+            </each>
+        </div>
+    </if>
+    <div class="action-menu" css="{ _active: listVisible}">
+        <div data-role="spinner" class="admin__data-grid-loading-mask" visible="loading" if="loading">
+            <div class="spinner">
+                <span repeat="8"/>
+            </div>
+        </div>
+        <if args="filterOptions">
+            <div class="admin__action-multiselect-search-wrap">
+                <input class="admin__control-text admin__action-multiselect-search" data-role="advanced-select-text"
+                       type="text" event="{keydown: filterOptionsKeydown}" attr="{id: uid+2, placeholder: filterPlaceholder}"
+                       ko-focused="filterOptionsFocus" ko-value="filterInputValue" data-bind="valueUpdate:'afterkeydown'">
+                <label class="admin__action-multiselect-search-label"
+                       data-action="advanced-select-search"
+                       attr="{for: uid+2}">
+                </label>
+                <div if="itemsQuantity"
+                     text="itemsQuantity"
+                     class="admin__action-multiselect-search-count">
+                </div>
+            </div>
+            <div ifnot="options().length"
+                 class="admin__action-multiselect-empty-area">
+                <ul text="emptyOptionsHtml"/>
+            </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)}}">
+            <each args="{ data: options, as: 'option'}">
+                <li class="admin__action-multiselect-menu-inner-item _root"
+                    css="{ _parent: $data.optgroup }"
+                    data-role="option-group">
+                    <div class="action-menu-item"
+                         css="{
+                            _selected: $parent.isSelectedValue(option),
+                            _hover: $parent.isHovered(option, $element),
+                            _expended: $parent.getLevelVisibility($data) && $parent.showLevels($data),
+                            _unclickable: $parent.isLabelDecoration($data),
+                            _last: $parent.addLastElement($data),
+                            '_with-checkbox': $parent.showCheckbox
+                        }"
+                         click="function(data, event){
+                            $parent.toggleOptionSelected($data, $index(), event);
+                        }"
+                         data-bind="clickBubble:false">
+                        <if args="$data.optgroup && $parent.showOpenLevelsActionIcon">
+                            <div class="admin__action-multiselect-dropdown"
+                                 click="function(event){ $parent.showLevels($data); $parent.openChildLevel($data, $element, event);}"
+                                 data-bind="clickBubble:false">
+                            </div>
+                        </if>
+                        <if args="$parent.showCheckbox">
+                            <input class="admin__control-checkbox" type="checkbox"
+                                   tabindex="-1" attr="{ 'checked': $parent.isSelected(option.value) }">
+                        </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 }"/>
+                        </label>
+                    </div>
+                    <if args="$data.optgroup">
+                        <render args="{name: $parent.optgroupTmpl, data: {root: $parent, current: $data}}" ></render>
+                    </if>
+                </li>
+            </each>
+        </ul>
+        <if args="$data.closeBtn">
+            <div class="admin__action-multiselect-actions-wrap">
+                <button class="action-default"
+                        data-action="close-advanced-select"
+                        type="button"
+                        click="outerClick">
+                    <span translate="closeBtnLabel"></span>
+                </button>
+            </div>
+        </if>
+    </div>
+</div>
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/massactions/cancelButton.html b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/massactions/cancelButton.html
new file mode 100644
index 0000000000000..243ed1c2a5dc4
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/massactions/cancelButton.html
@@ -0,0 +1,10 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<button id="cancel_massaction" type="button" class="cancel">
+  <span data-bind="i18n: 'Cancel'"/>
+</button>
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/massactions/count.html b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/massactions/count.html
new file mode 100644
index 0000000000000..5bbdafebe4095
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/massactions/count.html
@@ -0,0 +1,9 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div visible="massActionMode()" class="mediagallery-massaction-items-count">
+  <div class="selected_count_text">(<b><text args="getSelectedCount()"/> Selected</b>) </div>
+</div>
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
new file mode 100644
index 0000000000000..1ec084e223e98
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/messages.html
@@ -0,0 +1,15 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<ul class="messages">
+    <div class="messages" outereach="messages">
+        <div attr="class: 'message message-'+code">
+            <div data-ui-id="messages-message-error">
+                <span text="message"></span>
+            </div>
+        </div>
+    </div>
+</ul>
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/toolbar.html b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/toolbar.html
new file mode 100644
index 0000000000000..fb7334a7b0d06
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/toolbar.html
@@ -0,0 +1,32 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div class="admin__data-grid-header" data-role="masonry-main-toolbar" afterRender="$data.setToolbarNode">
+    <div class="admin__data-grid-header-row">
+        <div class="admin__data-grid-actions-wrap" each="getRegion('dataGridActions')" render=""/>
+        <each args="getRegion('dataGridFilters')" render=""/>
+    </div>
+    <div class="admin__data-grid-header-row row row-gutter">
+        <div class="col-xs-2" if="hasChild('listing_massaction')" ko-scope="requestChild('listing_massaction')" render=""/>
+        <div css="
+            'col-xs-10': hasChild('listing_massaction'),
+            'col-xs-12': !hasChild('listing_massaction')">
+            <div class="row">
+                <div class="col-xs-4">
+                    <div class="masonry-results-number" ko-scope="requestChild('listing_paging')">
+                        <render args="totalTmpl"/>
+                    </div>
+                    <each args="getRegion('sorting')" render=""/>
+                </div>
+                <div class="col-xs-8" ko-scope="requestChild('listing_paging')">
+                    <div render=""/>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<render args="stickyTmpl" if="$data.sticky"/>
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image-uploader.html b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image-uploader.html
new file mode 100644
index 0000000000000..6d5580b1aad6e
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image-uploader.html
@@ -0,0 +1,17 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div class="media-gallery-image-uploader-container">
+    <form id="image-uploader-form" class="no-display" method="POST" enctype="multipart/form-data">
+        <input afterRender="initializeFileUpload" id="image-uploader-input" type="file" name="image"
+               multiple="multiple"/>
+    </form>
+    <div data-role="spinner" class="admin__data-grid-loading-mask" visible="loader">
+        <div class="spinner">
+            <span repeat="8"/>
+        </div>
+    </div>
+</div>
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/actions.html b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/actions.html
new file mode 100644
index 0000000000000..8ecaf0bd2a019
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/actions.html
@@ -0,0 +1,12 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<each args="{ data: actionsList, as: 'action' }">
+    <button type="button" click="$parent[action.handler].bind($parent)"
+            attr="{class: action.classes, id: 'image-details-action-' + action.name, title: $t(action.title)}">
+        <span translate="action.title"></span>
+    </button>
+</each>
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html
new file mode 100644
index 0000000000000..a397bad0af698
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html
@@ -0,0 +1,65 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div class="image-details" if="image">
+    <div class="image-details-image">
+        <img attr="src: image().image_url"/>
+    </div>
+    <div class="image-details-sidebar">
+        <div class="image-details-section">
+            <h3 class="image-title" text="image().title"></h3>
+            <div class="image-type">
+                <span class="source"><img if="image().source" class="adobe-stock-icon" attr="{ src: image().source }" /></span>
+                <span class="type" data-ui-id="content-type" text="image().content_type"></span>
+            </div>
+        </div>
+        <div class="filename image-details-section">
+            <h3 translate="'Filename'"></h3>
+            <p text="image().path"></p>
+        </div>
+        <div class="general-details image-details-section" if="image().details">
+            <h3 translate="'Details'"></h3>
+            <div class="attributes">
+                <each args="image().details">
+                    <div class="attribute"  if="value">
+                        <span class="title" translate="title"></span>
+                        <ifnot args="$parent.isArray(value)">
+                            <div class="value" text="value"></div>
+                        </ifnot>
+                        <if args="$parent.isArray(value)">
+                            <each args="{ data: value, as: 'item'}">
+                                <div class="value">
+                                    <a attr="href: $parents[1].getFilterUrl(item.link)"
+                                       text="$parents[1].getUsedInText(item)"></a>
+                                    </br>
+                                </div>
+                            </each>
+                        </if>
+                    </div>
+                </each>
+            </div>
+        </div>
+        <div class="description image-details-section" if="image().description">
+            <h3 translate="'Description'"></h3>
+            <p text="image().description"></p>
+        </div>
+        <div class="tags image-details-section" if="image().tags.length">
+            <h3 translate="'Tags'"></h3>
+            <div class="tags-list" css="{'show-all-tags': showAllTags}">
+                <each args="data: image().tags, as: '$tag'">
+                    <span class="tag-item" text="$parent.getTagText($tag, $index())"
+                          css="{'show-more-item': ($index() + 1) > $parent.tagListLimit}"></span>
+                </each>
+            </div>
+            <div class="show-more-link-container">
+                <a href="#" class="show-more-link" if="image().tags.length > tagListLimit"
+                   translate="'Show More'" click="showMoreImageTags"></a>
+            </div>
+        </div>
+
+        <each args="getRegion('additional_image_details')" render=""/>
+    </div>
+</div>
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
new file mode 100644
index 0000000000000..e8448e1a64aef
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/image-edit.html
@@ -0,0 +1,74 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div class="edit-image-details" if="image">
+    <fieldset class="admin__fieldset">
+        <input type="hidden" ko-value="image().id" data-ui-id="id" name="id"/>
+        <div class="admin__field _required">
+            <label for="title" class="admin__field-label">
+                <span translate="'Title'"></span>
+            </label>
+            <div class="admin__field-control">
+                <input type="text" id="title" data-ui-id="title" name="title" placeholder="Title"
+                       class="admin__control-text required-entry minimum-length-1 maximum-length-128"
+                       ko-value="image().title" event="{keypress: handleEnterKey}"
+                       data-validate="{'required':true,'validate-image-title':true, 'validate-length':true}"/>
+            </div>
+        </div>
+        <div class="admin__field">
+            <label for="path" class="admin__field-label">
+                <span translate="'Filename'"></span>
+            </label>
+            <div class="admin__field-control path-display">
+                <span data-ui-id="path" id="path" text="image().path"></span>
+            </div>
+        </div>
+        <div class="admin__field">
+            <label for="description" class="admin__field-label">
+                <span translate="'Description'"></span>
+            </label>
+            <div class="admin__field-control">
+                <textarea id="description"
+                          data-ui-id="description"
+                          name="description"
+                          class="admin__control-textarea minimum-length-0 maximum-length-500"
+                          rows="7" cols="80"
+                          ko-value="image().description"
+                          data-validate="{'validate-image-description':true, 'validate-length':true}"></textarea>
+            </div>
+        </div>
+        <div class="admin__field">
+            <label class="admin__field-label">
+                <span translate="'Tags'"></span>
+            </label>
+            <div class="admin__field-control">
+                <div class="admin__field">
+                    <scope args="keywordsSelect">
+                         <render args="template"/>
+                    </scope>
+                </div>
+                <div class="admin__field">
+                    <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"
+                                       class="admin__control-text minimum-length-0 maximum-length-128" ko-value="newKeyword"
+                                       data-validate="{'validate-image-keyword': true, 'validate-length': true}"/>
+                            </div>
+                        </div>
+                        <div class="admin__field admin__field-group-additional admin__field-small">
+                            <div class="admin__field-control">
+                                <button type="button" data-ui-id="add-keyword" class="action-basic" click="addKeyword">
+                                    <span translate="'Add New Tag'"></span>
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </fieldset>
+</div>
diff --git a/app/code/Magento/MediaGalleryUiApi/Api/ConfigInterface.php b/app/code/Magento/MediaGalleryUiApi/Api/ConfigInterface.php
new file mode 100644
index 0000000000000..a516ac927fd2d
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUiApi/Api/ConfigInterface.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUiApi\Api;
+
+/**
+ * Class responsible to provide API access to system configuration related to the Media Gallery
+ */
+interface ConfigInterface
+{
+    /**
+     * Check if grid UI is enabled for Magento media gallery
+     *
+     * @return bool
+     */
+    public function isEnabled(): bool;
+}
diff --git a/app/code/Magento/MediaGalleryUiApi/LICENSE.txt b/app/code/Magento/MediaGalleryUiApi/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUiApi/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/MediaGalleryUiApi/LICENSE_AFL.txt b/app/code/Magento/MediaGalleryUiApi/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUiApi/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/MediaGalleryUiApi/README.md b/app/code/Magento/MediaGalleryUiApi/README.md
new file mode 100644
index 0000000000000..005a445c68b2a
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUiApi/README.md
@@ -0,0 +1,13 @@
+# Magento_MediaGalleryUiApi module
+
+The Magento_MediaGalleryUiApi module is responsible for the media gallery user interface (UI) implementation API.
+
+## Extensibility
+
+Extension developers can interact with the Magento_MediaGalleryUiApi module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
+
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_MediaGalleryUiApi module.
+
+## Additional information
+
+For information about significant changes in patch releases, see [2.3.x Release information](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html).
diff --git a/app/code/Magento/MediaGalleryUiApi/composer.json b/app/code/Magento/MediaGalleryUiApi/composer.json
new file mode 100644
index 0000000000000..f8d5ef11058c1
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUiApi/composer.json
@@ -0,0 +1,21 @@
+{
+    "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"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\MediaGalleryUiApi\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUiApi/etc/module.xml b/app/code/Magento/MediaGalleryUiApi/etc/module.xml
new file mode 100644
index 0000000000000..cf62515ff92b6
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUiApi/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_MediaGalleryUiApi" />
+</config>
diff --git a/app/code/Magento/MediaGalleryUiApi/registration.php b/app/code/Magento/MediaGalleryUiApi/registration.php
new file mode 100644
index 0000000000000..b3ee130a1c510
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUiApi/registration.php
@@ -0,0 +1,10 @@
+<?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_MediaGalleryUiApi', __DIR__);
diff --git a/composer.json b/composer.json
index c15dc4140f6eb..5b39c1b3f75ea 100644
--- a/composer.json
+++ b/composer.json
@@ -205,6 +205,20 @@
         "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-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": "*",
diff --git a/composer.lock b/composer.lock
index 97ab2b12512c2..90131292fe956 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": "a8f3bda109a177996d409f39acfbfd9f",
+    "content-hash": "5b074864c62821207d8994a4aca444fe",
     "packages": [
         {
             "name": "colinmollenhour/cache-backend-file",

From 12140598cb1f54381539a5f2c2d7b13d900b575c Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Mon, 3 Aug 2020 11:29:40 +0100
Subject: [PATCH 1182/1718] Added synchronization modules

---
 .../Console/Command/Synchronize.php           |  69 +++++++
 .../MediaGallerySynchronization/LICENSE.txt   |  48 +++++
 .../LICENSE_AFL.txt                           |  48 +++++
 .../Model/Consume.php                         |  37 ++++
 .../Model/CreateAssetFromFile.php             | 148 +++++++++++++++
 .../Model/FetchBatches.php                    | 128 +++++++++++++
 .../Model/FetchMediaStorageFileBatches.php    | 127 +++++++++++++
 .../Model/Filesystem/SplFileInfoFactory.php   |  25 +++
 .../Model/GetAssetFromPath.php                | 106 +++++++++++
 .../Model/GetAssetsIterator.php               |  33 ++++
 .../Model/GetContentHash.php                  |  27 +++
 .../Model/ImportImageFileKeywords.php         | 152 +++++++++++++++
 .../Model/ImportMediaAsset.php                |  53 ++++++
 .../Model/Publish.php                         |  45 +++++
 .../Model/ResolveNonExistedAssets.php         | 111 +++++++++++
 .../Model/Synchronize.php                     |  93 +++++++++
 .../Model/SynchronizeFiles.php                | 177 ++++++++++++++++++
 .../Plugin/MediaGallerySyncTrigger.php        |  53 ++++++
 .../MediaGallerySynchronization/README.md     |  14 ++
 .../Integration/Model/GetContentHashTest.php  | 110 +++++++++++
 .../Test/Integration/_files/magento.jpg       | Bin 0 -> 55303 bytes
 .../Test/Integration/_files/magento_2.jpg     | Bin 0 -> 55303 bytes
 .../Test/Integration/_files/magento_3.png     | Bin 0 -> 116576 bytes
 .../MediaGallerySynchronization/composer.json |  25 +++
 .../etc/communication.xml                     |  14 ++
 .../MediaGallerySynchronization/etc/di.xml    |  54 ++++++
 .../etc/module.xml                            |  10 +
 .../etc/queue_consumer.xml                    |  11 ++
 .../etc/queue_publisher.xml                   |  12 ++
 .../etc/queue_topology.xml                    |  14 ++
 .../registration.php                          |  14 ++
 .../Api/SynchronizeFilesInterface.php         |  24 +++
 .../Api/SynchronizeInterface.php              |  21 +++
 .../LICENSE.txt                               |  48 +++++
 .../LICENSE_AFL.txt                           |  48 +++++
 .../Model/FetchBatchesInterface.php           |  26 +++
 .../Model/GetContentHashInterface.php         |  22 +++
 .../Model/ImportFilesComposite.php            |  38 ++++
 .../Model/ImportFilesInterface.php            |  25 +++
 .../Model/SynchronizerPool.php                |  51 +++++
 .../MediaGallerySynchronizationApi/README.md  |  13 ++
 .../composer.json                             |  21 +++
 .../MediaGallerySynchronizationApi/etc/di.xml |  10 +
 .../etc/module.xml                            |  10 +
 .../registration.php                          |  14 ++
 45 files changed, 2129 insertions(+)
 create mode 100644 app/code/Magento/MediaGallerySynchronization/Console/Command/Synchronize.php
 create mode 100644 app/code/Magento/MediaGallerySynchronization/LICENSE.txt
 create mode 100644 app/code/Magento/MediaGallerySynchronization/LICENSE_AFL.txt
 create mode 100644 app/code/Magento/MediaGallerySynchronization/Model/Consume.php
 create mode 100644 app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php
 create mode 100644 app/code/Magento/MediaGallerySynchronization/Model/FetchBatches.php
 create mode 100644 app/code/Magento/MediaGallerySynchronization/Model/FetchMediaStorageFileBatches.php
 create mode 100644 app/code/Magento/MediaGallerySynchronization/Model/Filesystem/SplFileInfoFactory.php
 create mode 100644 app/code/Magento/MediaGallerySynchronization/Model/GetAssetFromPath.php
 create mode 100644 app/code/Magento/MediaGallerySynchronization/Model/GetAssetsIterator.php
 create mode 100644 app/code/Magento/MediaGallerySynchronization/Model/GetContentHash.php
 create mode 100644 app/code/Magento/MediaGallerySynchronization/Model/ImportImageFileKeywords.php
 create mode 100644 app/code/Magento/MediaGallerySynchronization/Model/ImportMediaAsset.php
 create mode 100644 app/code/Magento/MediaGallerySynchronization/Model/Publish.php
 create mode 100644 app/code/Magento/MediaGallerySynchronization/Model/ResolveNonExistedAssets.php
 create mode 100644 app/code/Magento/MediaGallerySynchronization/Model/Synchronize.php
 create mode 100644 app/code/Magento/MediaGallerySynchronization/Model/SynchronizeFiles.php
 create mode 100644 app/code/Magento/MediaGallerySynchronization/Plugin/MediaGallerySyncTrigger.php
 create mode 100644 app/code/Magento/MediaGallerySynchronization/README.md
 create mode 100644 app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/GetContentHashTest.php
 create mode 100644 app/code/Magento/MediaGallerySynchronization/Test/Integration/_files/magento.jpg
 create mode 100644 app/code/Magento/MediaGallerySynchronization/Test/Integration/_files/magento_2.jpg
 create mode 100644 app/code/Magento/MediaGallerySynchronization/Test/Integration/_files/magento_3.png
 create mode 100644 app/code/Magento/MediaGallerySynchronization/composer.json
 create mode 100644 app/code/Magento/MediaGallerySynchronization/etc/communication.xml
 create mode 100644 app/code/Magento/MediaGallerySynchronization/etc/di.xml
 create mode 100644 app/code/Magento/MediaGallerySynchronization/etc/module.xml
 create mode 100644 app/code/Magento/MediaGallerySynchronization/etc/queue_consumer.xml
 create mode 100644 app/code/Magento/MediaGallerySynchronization/etc/queue_publisher.xml
 create mode 100644 app/code/Magento/MediaGallerySynchronization/etc/queue_topology.xml
 create mode 100644 app/code/Magento/MediaGallerySynchronization/registration.php
 create mode 100644 app/code/Magento/MediaGallerySynchronizationApi/Api/SynchronizeFilesInterface.php
 create mode 100644 app/code/Magento/MediaGallerySynchronizationApi/Api/SynchronizeInterface.php
 create mode 100644 app/code/Magento/MediaGallerySynchronizationApi/LICENSE.txt
 create mode 100644 app/code/Magento/MediaGallerySynchronizationApi/LICENSE_AFL.txt
 create mode 100644 app/code/Magento/MediaGallerySynchronizationApi/Model/FetchBatchesInterface.php
 create mode 100644 app/code/Magento/MediaGallerySynchronizationApi/Model/GetContentHashInterface.php
 create mode 100644 app/code/Magento/MediaGallerySynchronizationApi/Model/ImportFilesComposite.php
 create mode 100644 app/code/Magento/MediaGallerySynchronizationApi/Model/ImportFilesInterface.php
 create mode 100644 app/code/Magento/MediaGallerySynchronizationApi/Model/SynchronizerPool.php
 create mode 100644 app/code/Magento/MediaGallerySynchronizationApi/README.md
 create mode 100644 app/code/Magento/MediaGallerySynchronizationApi/composer.json
 create mode 100644 app/code/Magento/MediaGallerySynchronizationApi/etc/di.xml
 create mode 100644 app/code/Magento/MediaGallerySynchronizationApi/etc/module.xml
 create mode 100644 app/code/Magento/MediaGallerySynchronizationApi/registration.php

diff --git a/app/code/Magento/MediaGallerySynchronization/Console/Command/Synchronize.php b/app/code/Magento/MediaGallerySynchronization/Console/Command/Synchronize.php
new file mode 100644
index 0000000000000..992f77a1df319
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/Console/Command/Synchronize.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallerySynchronization\Console\Command;
+
+use Magento\Framework\App\Area;
+use Magento\Framework\App\State;
+use Magento\Framework\Console\Cli;
+use Magento\MediaGallerySynchronizationApi\Api\SynchronizeInterface;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * Synchronize files in media storage and media assets database records
+ */
+class Synchronize extends Command
+{
+    /**
+     * @var SynchronizeInterface
+     */
+    private $synchronizeAssets;
+
+    /**
+     * @var State $state
+     */
+    private $state;
+
+    /**
+     * @param SynchronizeInterface $synchronizeAssets
+     * @param State $state
+     */
+    public function __construct(
+        SynchronizeInterface $synchronizeAssets,
+        State $state
+    ) {
+        $this->synchronizeAssets = $synchronizeAssets;
+        $this->state = $state;
+        parent::__construct();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function configure()
+    {
+        $this->setName('media-gallery:sync');
+        $this->setDescription(
+            'Synchronize media storage and media assets in the database'
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $output->writeln('Synchronizing assets information from media storage to database...');
+        $this->state->emulateAreaCode(Area::AREA_ADMINHTML, function () {
+            $this->synchronizeAssets->execute();
+        });
+        $output->writeln('Completed assets synchronization.');
+        return Cli::RETURN_SUCCESS;
+    }
+}
diff --git a/app/code/Magento/MediaGallerySynchronization/LICENSE.txt b/app/code/Magento/MediaGallerySynchronization/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/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/MediaGallerySynchronization/LICENSE_AFL.txt b/app/code/Magento/MediaGallerySynchronization/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/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/Consume.php b/app/code/Magento/MediaGallerySynchronization/Model/Consume.php
new file mode 100644
index 0000000000000..79c0c9a1a803b
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/Model/Consume.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallerySynchronization\Model;
+
+use Magento\MediaGallerySynchronizationApi\Api\SynchronizeInterface;
+
+/**
+ * Media gallery image synchronization queue consumer.
+ */
+class Consume
+{
+    /**
+     * @var SynchronizeInterface
+     */
+    private $synchronize;
+
+    /**
+     * @param SynchronizeInterface $synchronize
+     */
+    public function __construct(SynchronizeInterface $synchronize)
+    {
+        $this->synchronize = $synchronize;
+    }
+
+    /**
+     * Run media files synchronization.
+     */
+    public function execute() : void
+    {
+        $this->synchronize->execute();
+    }
+}
diff --git a/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php b/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php
new file mode 100644
index 0000000000000..3305c5e54b861
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallerySynchronization\Model;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\FileSystemException;
+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;
+use Magento\MediaGallerySynchronization\Model\Filesystem\SplFileInfoFactory;
+use Magento\MediaGallerySynchronizationApi\Model\GetContentHashInterface;
+
+/**
+ * Create media asset object based on the file information
+ */
+class CreateAssetFromFile
+{
+    /**
+     * Date format
+     */
+    private const DATE_FORMAT = 'Y-m-d H:i:s';
+
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var File
+     */
+    private $driver;
+
+    /**
+     * @var TimezoneInterface;
+     */
+    private $date;
+
+    /**
+     * @var AssetInterfaceFactory
+     */
+    private $assetFactory;
+
+    /**
+     * @var GetContentHashInterface
+     */
+    private $getContentHash;
+
+    /**
+     * @var ExtractMetadataInterface
+     */
+    private $extractMetadata;
+
+    /**
+     * @var SplFileInfoFactory
+     */
+    private $splFileInfoFactory;
+
+    /**
+     * @param Filesystem $filesystem
+     * @param File $driver
+     * @param TimezoneInterface $date
+     * @param AssetInterfaceFactory $assetFactory
+     * @param GetContentHashInterface $getContentHash
+     * @param ExtractMetadataInterface $extractMetadata
+     * @param SplFileInfoFactory $splFileInfoFactory
+     */
+    public function __construct(
+        Filesystem $filesystem,
+        File $driver,
+        TimezoneInterface $date,
+        AssetInterfaceFactory $assetFactory,
+        GetContentHashInterface $getContentHash,
+        ExtractMetadataInterface $extractMetadata,
+        SplFileInfoFactory $splFileInfoFactory
+    ) {
+        $this->filesystem = $filesystem;
+        $this->driver = $driver;
+        $this->date = $date;
+        $this->assetFactory = $assetFactory;
+        $this->getContentHash = $getContentHash;
+        $this->extractMetadata = $extractMetadata;
+        $this->splFileInfoFactory = $splFileInfoFactory;
+    }
+
+    /**
+     * Create and format media asset object
+     *
+     * @param string $path
+     * @return AssetInterface
+     * @throws FileSystemException
+     */
+    public function execute(string $path): AssetInterface
+    {
+        $absolutePath = $this->getMediaDirectory()->getAbsolutePath($path);
+        $file = $this->splFileInfoFactory->create($absolutePath);
+        [$width, $height] = getimagesize($absolutePath);
+
+        $metadata = $this->extractMetadata->execute($absolutePath);
+
+        return $this->assetFactory->create(
+            [
+                'id' => null,
+                'path' => $path,
+                'title' => $metadata->getTitle() ?: $file->getBasename('.' . $file->getExtension()),
+                '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),
+                'size' => $file->getSize(),
+                'contentType' => 'image/' . $file->getExtension(),
+                'source' => 'Local'
+            ]
+        );
+    }
+
+    /**
+     * Get hash image content.
+     *
+     * @param string $path
+     * @return string
+     * @throws FileSystemException
+     */
+    private function getHash(string $path): string
+    {
+        return $this->getContentHash->execute($this->getMediaDirectory()->readFile($path));
+    }
+
+    /**
+     * Retrieve media directory instance with read access
+     *
+     * @return ReadInterface
+     */
+    private function getMediaDirectory(): ReadInterface
+    {
+        return $this->filesystem->getDirectoryRead(DirectoryList::MEDIA);
+    }
+}
diff --git a/app/code/Magento/MediaGallerySynchronization/Model/FetchBatches.php b/app/code/Magento/MediaGallerySynchronization/Model/FetchBatches.php
new file mode 100644
index 0000000000000..efc79d3c32423
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/Model/FetchBatches.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\MediaGallerySynchronization\Model;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Select;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\FlagManager;
+use Magento\MediaGallerySynchronizationApi\Model\FetchBatchesInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Select data from database by provided batch size
+ */
+class FetchBatches implements FetchBatchesInterface
+{
+    private const LAST_EXECUTION_TIME_CODE = 'media_content_last_execution';
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var int
+     */
+    private $pageSize;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var FlagManager
+     */
+    private $flagManager;
+
+    /**
+     * @param FlagManager $flagManager
+     * @param ResourceConnection $resourceConnection
+     * @param LoggerInterface $logger
+     * @param int $pageSize
+     */
+    public function __construct(
+        FlagManager $flagManager,
+        ResourceConnection $resourceConnection,
+        LoggerInterface $logger,
+        int $pageSize
+    ) {
+        $this->flagManager = $flagManager;
+        $this->resourceConnection = $resourceConnection;
+        $this->logger = $logger;
+        $this->pageSize = $pageSize;
+    }
+
+    /**
+     * Get data from table by batches, based on limit offset value.
+     *
+     * @param string $tableName
+     * @param array $columns
+     * @param string|null $dateColumnName
+     */
+    public function execute(string $tableName, array $columns, ?string $dateColumnName = null): \Traversable
+    {
+        try {
+            $connection = $this->resourceConnection->getConnection();
+            $tableName = $this->resourceConnection->getTableName($tableName);
+            $totalPages = $this->getTotalPages($tableName);
+
+            for ($page = 0; $page < $totalPages; $page++) {
+                $offset = $page * $this->pageSize;
+                $select = $connection->select()
+                    ->from($this->resourceConnection->getTableName($tableName), $columns)
+                    ->limit($this->pageSize, $offset);
+                if (!empty($dateColumnName)) {
+                    $select = $this->addLastExecutionCondition($select, $dateColumnName);
+                }
+                yield $connection->fetchAll($select);
+            }
+        } catch (\Exception $exception) {
+            $this->logger->critical($exception);
+            throw new LocalizedException(
+                __(
+                    'Could not fetch data from %tableName',
+                    [
+                        'tableName' => $tableName
+                    ]
+                )
+            );
+        }
+    }
+
+    /**
+     * Get where condition if last execution time set
+     *
+     * @param Select $select
+     * @param string $dateColumnName
+     * @return Select
+     */
+    private function addLastExecutionCondition(Select $select, string $dateColumnName): Select
+    {
+        $lastExecutionTime = $this->flagManager->getFlagData(self::LAST_EXECUTION_TIME_CODE);
+        if (!empty($lastExecutionTime)) {
+            return $select->where($dateColumnName . ' > ?', $lastExecutionTime);
+        }
+        return $select;
+    }
+
+    /**
+     * Return number of total pages by page size
+     *
+     * @param string $tableName
+     * @return float
+     */
+    private function getTotalPages(string $tableName): float
+    {
+        $connection = $this->resourceConnection->getConnection();
+        $total =  $connection->fetchOne($connection->select()->from($tableName, 'COUNT(*)'));
+        return ceil($total / $this->pageSize);
+    }
+}
diff --git a/app/code/Magento/MediaGallerySynchronization/Model/FetchMediaStorageFileBatches.php b/app/code/Magento/MediaGallerySynchronization/Model/FetchMediaStorageFileBatches.php
new file mode 100644
index 0000000000000..0643673ae30ab
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/Model/FetchMediaStorageFileBatches.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MediaGallerySynchronization\Model;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Driver\File;
+use Magento\MediaGalleryApi\Api\IsPathExcludedInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Fetch files from media storage in batches
+ */
+class FetchMediaStorageFileBatches
+{
+    /**
+     * @var GetAssetsIterator
+     */
+    private $getAssetsIterator;
+
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var IsPathExcludedInterface
+     */
+    private $isPathExcluded;
+
+    /**
+     * @var File
+     */
+    private $driver;
+
+    /**
+     * @var string
+     */
+    private $fileExtensions;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $log;
+
+    /**
+     * @var int
+     */
+    private $batchSize;
+
+    /**
+     * @param LoggerInterface $log
+     * @param IsPathExcludedInterface $isPathExcluded
+     * @param Filesystem $filesystem
+     * @param GetAssetsIterator $assetsIterator
+     * @param File $driver
+     * @param int $batchSize
+     * @param array $fileExtensions
+     */
+    public function __construct(
+        LoggerInterface $log,
+        IsPathExcludedInterface $isPathExcluded,
+        Filesystem $filesystem,
+        GetAssetsIterator $assetsIterator,
+        File $driver,
+        int $batchSize,
+        array $fileExtensions
+    ) {
+        $this->log = $log;
+        $this->isPathExcluded = $isPathExcluded;
+        $this->getAssetsIterator = $assetsIterator;
+        $this->filesystem = $filesystem;
+        $this->driver = $driver;
+        $this->batchSize = $batchSize;
+        $this->fileExtensions = $fileExtensions;
+    }
+
+    /**
+     * Return files from files system by provided size of batch
+     */
+    public function execute(): \Traversable
+    {
+        $i = 0;
+        $batch = [];
+        $mediaDirectory = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA);
+
+        /** @var \SplFileInfo $file */
+        foreach ($this->getAssetsIterator->execute($mediaDirectory->getAbsolutePath()) as $file) {
+            $relativePath = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA)
+                ->getRelativePath($file->getPathName());
+            if (!$this->isApplicable($relativePath)) {
+                continue;
+            }
+
+            $batch[] = $relativePath;
+            if (++$i == $this->batchSize) {
+                yield $batch;
+                $i = 0;
+                $batch = [];
+            }
+        }
+        if (count($batch) > 0) {
+            yield $batch;
+        }
+    }
+
+    /**
+     * Can synchronization be applied to asset with provided path
+     *
+     * @param string $path
+     * @return bool
+     */
+    private function isApplicable(string $path): bool
+    {
+        try {
+            return $path
+                && !$this->isPathExcluded->execute($path)
+                && preg_match('#\.(' . implode("|", $this->fileExtensions) . ')$# i', $path);
+        } catch (\Exception $exception) {
+            $this->log->critical($exception);
+            return false;
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGallerySynchronization/Model/Filesystem/SplFileInfoFactory.php b/app/code/Magento/MediaGallerySynchronization/Model/Filesystem/SplFileInfoFactory.php
new file mode 100644
index 0000000000000..1fbfae640a732
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/Model/Filesystem/SplFileInfoFactory.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallerySynchronization\Model\Filesystem;
+
+/**
+ * Creates a new file based on the file name parameter.
+ */
+class SplFileInfoFactory
+{
+    /**
+     * Creates SplFileInfo from filename
+     *
+     * @param string $fileName
+     * @return \SplFileInfo
+     */
+    public function create(string $fileName) : \SplFileInfo
+    {
+        return new \SplFileInfo($fileName);
+    }
+}
diff --git a/app/code/Magento/MediaGallerySynchronization/Model/GetAssetFromPath.php b/app/code/Magento/MediaGallerySynchronization/Model/GetAssetFromPath.php
new file mode 100644
index 0000000000000..5e825d57c5ce7
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/Model/GetAssetFromPath.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallerySynchronization\Model;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\ValidatorException;
+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
+ */
+class GetAssetFromPath
+{
+    /**
+     * @var GetAssetsByPathsInterface
+     */
+    private $getAssetsByPaths;
+
+    /**
+     * @var AssetInterfaceFactory
+     */
+    private $assetFactory;
+
+    /**
+     * @var CreateAssetFromFile
+     */
+    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
+    ) {
+        $this->assetFactory = $assetFactory;
+        $this->getAssetsByPaths = $getMediaGalleryAssetByPath;
+        $this->createAssetFromFile = $createAssetFromFile;
+        $this->splFileInfoFactory= $splFileInfoFactory;
+    }
+
+    /**
+     * Create media asset object based on the file information
+     *
+     * @param string $path
+     * @return AssetInterface
+     * @throws LocalizedException
+     * @throws ValidatorException
+     */
+    public function execute(string $path): AssetInterface
+    {
+        $asset = $this->getAsset($path);
+        $assetFromFile = $this->createAssetFromFile->execute($path);
+
+        if (!$asset) {
+            return $assetFromFile;
+        }
+
+        return $this->assetFactory->create(
+            [
+                'id' => $asset->getId(),
+                'path' => $path,
+                'title' => $asset->getTitle(),
+                'description' => $asset->getDescription() ?? $assetFromFile->getDescription(),
+                'width' => $assetFromFile->getWidth(),
+                'height' => $assetFromFile->getHeight(),
+                'hash' => $assetFromFile->getHash(),
+                'size' => $assetFromFile->getSize(),
+                'contentType' => $asset->getContentType(),
+                'source' => $asset->getSource()
+            ]
+        );
+    }
+
+    /**
+     * Returns asset if asset already exist by provided path
+     *
+     * @param string $path
+     * @return AssetInterface|null
+     * @throws ValidatorException
+     * @throws LocalizedException
+     */
+    private function getAsset(string $path): ?AssetInterface
+    {
+        $asset = $this->getAssetsByPaths->execute([$path]);
+        return !empty($asset) ? $asset[0] : null;
+    }
+}
diff --git a/app/code/Magento/MediaGallerySynchronization/Model/GetAssetsIterator.php b/app/code/Magento/MediaGallerySynchronization/Model/GetAssetsIterator.php
new file mode 100644
index 0000000000000..6c0592c49f09c
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/Model/GetAssetsIterator.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallerySynchronization\Model;
+
+/**
+ * Retrieve media storage assets iterator
+ */
+class GetAssetsIterator
+{
+    /**
+     * Get media storage assets iterator for provided path
+     *
+     * @param string $path
+     * @return \RecursiveIteratorIterator
+     */
+    public function execute(string $path): \RecursiveIteratorIterator
+    {
+        return new \RecursiveIteratorIterator(
+            new \RecursiveDirectoryIterator(
+                $path,
+                \FilesystemIterator::SKIP_DOTS |
+                \FilesystemIterator::UNIX_PATHS |
+                \RecursiveDirectoryIterator::FOLLOW_SYMLINKS
+            ),
+            \RecursiveIteratorIterator::CHILD_FIRST
+        );
+    }
+}
diff --git a/app/code/Magento/MediaGallerySynchronization/Model/GetContentHash.php b/app/code/Magento/MediaGallerySynchronization/Model/GetContentHash.php
new file mode 100644
index 0000000000000..49ff39ca4e1d7
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/Model/GetContentHash.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallerySynchronization\Model;
+
+use Magento\MediaGallerySynchronizationApi\Model\GetContentHashInterface;
+
+/**
+ * Get hashed value of image content.
+ */
+class GetContentHash implements GetContentHashInterface
+{
+    /**
+     * Return the hash value of the given filepath.
+     *
+     * @param string $content
+     * @return string
+     */
+    public function execute(string $content): string
+    {
+        return sha1($content);
+    }
+}
diff --git a/app/code/Magento/MediaGallerySynchronization/Model/ImportImageFileKeywords.php b/app/code/Magento/MediaGallerySynchronization/Model/ImportImageFileKeywords.php
new file mode 100644
index 0000000000000..361137ad27686
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/Model/ImportImageFileKeywords.php
@@ -0,0 +1,152 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallerySynchronization\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;
+use Magento\MediaGalleryApi\Api\GetAssetsByPathsInterface;
+use Magento\MediaGalleryApi\Api\SaveAssetsKeywordsInterface;
+use Magento\MediaGalleryMetadataApi\Api\ExtractMetadataInterface;
+use Magento\MediaGallerySynchronizationApi\Model\ImportFilesInterface;
+
+/**
+ * import image keywords from file metadata
+ */
+class ImportImageFileKeywords implements ImportFilesInterface
+{
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var File
+     */
+    private $driver;
+
+    /**
+     * @var KeywordInterfaceFactory
+     */
+    private $keywordFactory;
+
+    /**
+     * @var AssetKeywordsInterfaceFactory
+     */
+    private $assetKeywordsFactory;
+
+    /**
+     * @var ExtractMetadataInterface
+     */
+    private $extractMetadata;
+
+    /**
+     * @var SaveAssetsKeywordsInterface
+     */
+    private $saveAssetKeywords;
+
+    /**
+     * @var GetAssetsByPathsInterface
+     */
+    private $getAssetsByPaths;
+
+    /**
+     * @param File $driver
+     * @param Filesystem $filesystem
+     * @param KeywordInterfaceFactory $keywordFactory
+     * @param ExtractMetadataInterface $extractMetadata
+     * @param SaveAssetsKeywordsInterface $saveAssetKeywords
+     * @param AssetKeywordsInterfaceFactory $assetKeywordsFactory
+     * @param GetAssetsByPathsInterface $getAssetsByPaths
+     */
+    public function __construct(
+        File $driver,
+        Filesystem $filesystem,
+        KeywordInterfaceFactory $keywordFactory,
+        ExtractMetadataInterface $extractMetadata,
+        SaveAssetsKeywordsInterface $saveAssetKeywords,
+        AssetKeywordsInterfaceFactory $assetKeywordsFactory,
+        GetAssetsByPathsInterface $getAssetsByPaths
+    ) {
+        $this->driver = $driver;
+        $this->filesystem = $filesystem;
+        $this->keywordFactory = $keywordFactory;
+        $this->extractMetadata = $extractMetadata;
+        $this->saveAssetKeywords = $saveAssetKeywords;
+        $this->assetKeywordsFactory = $assetKeywordsFactory;
+        $this->getAssetsByPaths = $getAssetsByPaths;
+    }
+    /**
+     * @inheritdoc
+     */
+    public function execute(array $paths): void
+    {
+        $keywords = [];
+
+        foreach ($paths as $path) {
+            $metadataKeywords = $this->getMetadataKeywords($path);
+            if ($metadataKeywords !== null) {
+                $keywords[$path] = $metadataKeywords;
+            }
+        }
+
+        $assets = $this->getAssetsByPaths->execute(array_keys($keywords));
+
+        $assetKeywords = [];
+
+        foreach ($assets as $asset) {
+            $assetKeywords[] = $this->assetKeywordsFactory->create([
+                'assetId' => $asset->getId(),
+                'keywords' => $keywords[$asset->getPath()]
+            ]);
+        }
+
+        $this->saveAssetKeywords->execute($assetKeywords);
+    }
+
+    /**
+     * Get keywords from file metadata
+     *
+     * @param string $path
+     * @return KeywordInterface[]|null
+     */
+    private function getMetadataKeywords(string $path): ?array
+    {
+        $metadataKeywords = $this->extractMetadata->execute($this->getMediaDirectory()->getAbsolutePath($path))
+            ->getKeywords();
+        if ($metadataKeywords === null) {
+            return null;
+        }
+
+        $keywords = [];
+
+        foreach ($metadataKeywords as $keyword) {
+            $keywords[] = $this->keywordFactory->create(
+                [
+                    'keyword' => $keyword
+                ]
+            );
+        }
+
+        return $keywords;
+    }
+
+    /**
+     * Retrieve media directory instance with read access
+     *
+     * @return ReadInterface
+     */
+    private function getMediaDirectory(): ReadInterface
+    {
+        return $this->filesystem->getDirectoryRead(DirectoryList::MEDIA);
+    }
+}
diff --git a/app/code/Magento/MediaGallerySynchronization/Model/ImportMediaAsset.php b/app/code/Magento/MediaGallerySynchronization/Model/ImportMediaAsset.php
new file mode 100644
index 0000000000000..3cac99f816d12
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/Model/ImportMediaAsset.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallerySynchronization\Model;
+
+use Magento\MediaGalleryApi\Api\SaveAssetsInterface;
+use Magento\MediaGallerySynchronizationApi\Model\ImportFilesInterface;
+
+/**
+ * Import image file to the media gallery asset table
+ */
+class ImportMediaAsset implements ImportFilesInterface
+{
+    /**
+     * @var SaveAssetsInterface
+     */
+    private $saveAssets;
+
+    /**
+     * @var GetAssetFromPath
+     */
+    private $getAssetFromPath;
+
+    /**
+     * @param SaveAssetsInterface $saveAssets
+     * @param GetAssetFromPath $getAssetFromPath
+     */
+    public function __construct(
+        SaveAssetsInterface $saveAssets,
+        GetAssetFromPath $getAssetFromPath
+    ) {
+        $this->saveAssets = $saveAssets;
+        $this->getAssetFromPath = $getAssetFromPath;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(array $paths): void
+    {
+        $assets = [];
+
+        foreach ($paths as $path) {
+            $assets[] = $this->getAssetFromPath->execute($path);
+        }
+
+        $this->saveAssets->execute($assets);
+    }
+}
diff --git a/app/code/Magento/MediaGallerySynchronization/Model/Publish.php b/app/code/Magento/MediaGallerySynchronization/Model/Publish.php
new file mode 100644
index 0000000000000..386798d68d9df
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/Model/Publish.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallerySynchronization\Model;
+
+use Magento\Framework\MessageQueue\PublisherInterface;
+
+/**
+ * Publish media gallery synchronization queue.
+ */
+class Publish
+{
+    /**
+     * Media gallery synchronization queue topic name.
+     */
+    private const TOPIC_MEDIA_GALLERY_SYNCHRONIZATION = 'media.gallery.synchronization';
+
+    /**
+     * @var PublisherInterface
+     */
+    private $publisher;
+
+    /**
+     * @param PublisherInterface $publisher
+     */
+    public function __construct(PublisherInterface $publisher)
+    {
+        $this->publisher = $publisher;
+    }
+
+    /**
+     * Publish media content synchronization message to the message queue.
+     */
+    public function execute() : void
+    {
+        $this->publisher->publish(
+            self::TOPIC_MEDIA_GALLERY_SYNCHRONIZATION,
+            [self::TOPIC_MEDIA_GALLERY_SYNCHRONIZATION]
+        );
+    }
+}
diff --git a/app/code/Magento/MediaGallerySynchronization/Model/ResolveNonExistedAssets.php b/app/code/Magento/MediaGallerySynchronization/Model/ResolveNonExistedAssets.php
new file mode 100644
index 0000000000000..d70547a7528e0
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/Model/ResolveNonExistedAssets.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\MediaGallerySynchronization\Model;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\Read;
+use Magento\MediaGalleryApi\Api\DeleteAssetsByPathsInterface;
+use Magento\MediaGallerySynchronizationApi\Model\FetchBatchesInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Delete assets which not exist physically
+ */
+class ResolveNonExistedAssets
+{
+    private const TABLE_MEDIA_GALLERY_ASSET = 'media_gallery_asset';
+    private const MEDIA_GALLERY_ASSET_PATH = 'path';
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var DeleteAssetsByPathsInterface
+     */
+    private $deleteAssetsByPaths;
+
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var Read
+     */
+    private $mediaDirectory;
+
+    /**
+     * @var FetchBatchesInterface
+     */
+    private $selectBatches;
+
+    /**
+     * @param Filesystem $filesystem
+     * @param ResourceConnection $resourceConnection
+     * @param DeleteAssetsByPathsInterface $deleteAssetsByPaths
+     * @param LoggerInterface $logger
+     * @param FetchBatchesInterface $selectBatches
+     */
+    public function __construct(
+        Filesystem $filesystem,
+        ResourceConnection $resourceConnection,
+        DeleteAssetsByPathsInterface $deleteAssetsByPaths,
+        LoggerInterface $logger,
+        FetchBatchesInterface $selectBatches
+    ) {
+        $this->filesystem = $filesystem;
+        $this->resourceConnection = $resourceConnection;
+        $this->deleteAssetsByPaths = $deleteAssetsByPaths;
+        $this->logger = $logger;
+        $this->selectBatches = $selectBatches;
+    }
+
+    /**
+     * Delete assets which not existed
+     *
+     * @return void
+     */
+    public function execute(): void
+    {
+        $columns = [self::MEDIA_GALLERY_ASSET_PATH];
+        try {
+            foreach ($this->selectBatches->execute(self::TABLE_MEDIA_GALLERY_ASSET, $columns, null) as $batch) {
+                foreach ($batch as $item) {
+                    if (!$this->getMediaDirectory()->isExist($item[self::MEDIA_GALLERY_ASSET_PATH])) {
+                        $this->deleteAssetsByPaths->execute([$item[self::MEDIA_GALLERY_ASSET_PATH]]);
+                    }
+                }
+            }
+        } catch (\Exception $exception) {
+            $this->logger->critical($exception);
+        }
+    }
+
+    /**
+     * Retrieve media directory instance with read permissions
+     *
+     * @return Read
+     */
+    private function getMediaDirectory(): Read
+    {
+        if (!$this->mediaDirectory) {
+            $this->mediaDirectory = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA);
+        }
+        return $this->mediaDirectory;
+    }
+}
diff --git a/app/code/Magento/MediaGallerySynchronization/Model/Synchronize.php b/app/code/Magento/MediaGallerySynchronization/Model/Synchronize.php
new file mode 100644
index 0000000000000..4396ea6a77736
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/Model/Synchronize.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallerySynchronization\Model;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\MediaGallerySynchronizationApi\Api\SynchronizeFilesInterface;
+use Magento\MediaGallerySynchronizationApi\Api\SynchronizeInterface;
+use Magento\MediaGallerySynchronizationApi\Model\SynchronizerPool;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Synchronize media storage and media assets database records
+ */
+class Synchronize implements SynchronizeInterface
+{
+    /**
+     * @var LoggerInterface
+     */
+    private $log;
+
+    /**
+     * @var SynchronizerPool
+     */
+    private $synchronizerPool;
+
+    /**
+     * @var FetchMediaStorageFileBatches
+     */
+    private $batchGenerator;
+
+    /**
+     * @var ResolveNonExistedAssets
+     */
+    private $resolveNonExistedAssets;
+
+    /**
+     * @param ResolveNonExistedAssets $resolveNonExistedAssets
+     * @param LoggerInterface $log
+     * @param SynchronizerPool $synchronizerPool
+     * @param FetchMediaStorageFileBatches $batchGenerator
+     */
+    public function __construct(
+        ResolveNonExistedAssets $resolveNonExistedAssets,
+        LoggerInterface $log,
+        SynchronizerPool $synchronizerPool,
+        FetchMediaStorageFileBatches $batchGenerator
+    ) {
+        $this->resolveNonExistedAssets = $resolveNonExistedAssets;
+        $this->log = $log;
+        $this->synchronizerPool = $synchronizerPool;
+        $this->batchGenerator = $batchGenerator;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(): void
+    {
+        $failed = [];
+
+        foreach ($this->synchronizerPool->get() as $name => $synchronizer) {
+            if (!$synchronizer instanceof SynchronizeFilesInterface) {
+                $failed[] = $name;
+                continue;
+            }
+            foreach ($this->batchGenerator->execute() as $batch) {
+                try {
+                    $synchronizer->execute($batch);
+                } catch (\Exception $exception) {
+                    $this->log->critical($exception);
+                    $failed[] = $name;
+                }
+            }
+        }
+
+        $this->resolveNonExistedAssets->execute();
+        if (!empty($failed)) {
+            throw new LocalizedException(
+                __(
+                    'Failed to execute the following synchronizers: %synchronizers',
+                    [
+                        'synchronizers' => implode(', ', $failed)
+                    ]
+                )
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGallerySynchronization/Model/SynchronizeFiles.php b/app/code/Magento/MediaGallerySynchronization/Model/SynchronizeFiles.php
new file mode 100644
index 0000000000000..81e9629f703f3
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/Model/SynchronizeFiles.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallerySynchronization\Model;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\ReadInterface;
+use Magento\Framework\Filesystem\Driver\File;
+use Magento\Framework\Stdlib\DateTime\DateTime;
+use Magento\MediaGalleryApi\Api\GetAssetsByPathsInterface;
+use Magento\MediaGallerySynchronizationApi\Model\ImportFilesInterface;
+use Magento\MediaGallerySynchronizationApi\Api\SynchronizeFilesInterface;
+use Magento\MediaGallerySynchronization\Model\Filesystem\SplFileInfoFactory;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Synchronize files in media storage and media assets database records
+ */
+class SynchronizeFiles implements SynchronizeFilesInterface
+{
+    /**
+     * Date format
+     */
+    private const DATE_FORMAT = 'Y-m-d H:i:s';
+
+    /**
+     * @var LoggerInterface
+     */
+    private $log;
+
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var GetAssetsByPathsInterface
+     */
+    private $getAssetsByPaths;
+
+    /**
+     * @var File
+     */
+    private $driver;
+
+    /**
+     * @var SplFileInfoFactory
+     */
+    private $splFileInfoFactory;
+
+    /**
+     * @var ImportFilesInterface
+     */
+    private $importFiles;
+
+    /**
+     * @var DateTime
+     */
+    private $date;
+
+    /**
+     * @param File $driver
+     * @param Filesystem $filesystem
+     * @param DateTime $date
+     * @param LoggerInterface $log
+     * @param SplFileInfoFactory $splFileInfoFactory
+     * @param GetAssetsByPathsInterface $getAssetsByPaths
+     * @param ImportFilesInterface $importFiles
+     */
+    public function __construct(
+        File $driver,
+        Filesystem $filesystem,
+        DateTime $date,
+        LoggerInterface $log,
+        SplFileInfoFactory $splFileInfoFactory,
+        GetAssetsByPathsInterface $getAssetsByPaths,
+        ImportFilesInterface $importFiles
+    ) {
+        $this->driver = $driver;
+        $this->filesystem = $filesystem;
+        $this->date = $date;
+        $this->log = $log;
+        $this->splFileInfoFactory = $splFileInfoFactory;
+        $this->getAssetsByPaths = $getAssetsByPaths;
+        $this->importFiles = $importFiles;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(array $paths): void
+    {
+        try {
+            $this->importFiles->execute($this->getPathsToUpdate($paths));
+        } catch (LocalizedException $localizedException) {
+            throw $localizedException;
+        } catch (\Exception $exception) {
+            $this->log->critical($exception);
+            throw new LocalizedException(
+                __(
+                    'Could not import media assets for files: %files',
+                    [
+                        'files' => implode(', ', $paths)
+                    ]
+                )
+            );
+        }
+    }
+
+    /**
+     * Return existing assets from files
+     *
+     * @param string[] $paths
+     * @return array
+     * @throws LocalizedException
+     */
+    private function getPathsToUpdate(array $paths): array
+    {
+        $assetPaths = [];
+
+        foreach ($paths as $path) {
+            $assetPath = $this->getAssetPath($path);
+            $assetPaths[$assetPath] = $assetPath;
+        }
+
+        $assets = $this->getAssetsByPaths->execute($assetPaths);
+
+        foreach ($assets as $asset) {
+            if ($asset->getUpdatedAt() === $this->getFileModificationTime($asset->getPath())) {
+                unset($assetPaths[$asset->getPath()]);
+            }
+        }
+
+        return $assetPaths;
+    }
+
+    /**
+     * Retrieve formatted file modification time
+     *
+     * @param string $path
+     * @return string
+     */
+    private function getFileModificationTime(string $path): string
+    {
+        return $this->date->gmtDate(
+            self::DATE_FORMAT,
+            $this->splFileInfoFactory->create($this->getMediaDirectory()->getAbsolutePath($path))->getMTime()
+        );
+    }
+
+    /**
+     * Get correct path for media asset
+     *
+     * @param string $path
+     * @return string
+     */
+    private function getAssetPath(string $path): string
+    {
+        return $this->driver->getParentDirectory($path) === '.' ? '/' . $path : $path;
+    }
+
+    /**
+     * Retrieve media directory instance
+     *
+     * @return ReadInterface
+     */
+    private function getMediaDirectory(): ReadInterface
+    {
+        return $this->filesystem->getDirectoryRead(DirectoryList::MEDIA);
+    }
+}
diff --git a/app/code/Magento/MediaGallerySynchronization/Plugin/MediaGallerySyncTrigger.php b/app/code/Magento/MediaGallerySynchronization/Plugin/MediaGallerySyncTrigger.php
new file mode 100644
index 0000000000000..9583c91184d1a
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/Plugin/MediaGallerySyncTrigger.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallerySynchronization\Plugin;
+
+use Magento\Framework\App\Config\Value;
+use Magento\MediaGallerySynchronization\Model\Publish;
+
+/**
+ * Plugin to synchronize media storage and media assets database records when media gallery enabled in configuration.
+ */
+class MediaGallerySyncTrigger
+{
+    private const MEDIA_GALLERY_CONFIG_VALUE = 'system/media_gallery/enabled';
+    private const MEDIA_GALLERY_ENABLED_VALUE = 1;
+
+    /**
+     * @var Publish
+     */
+    private $publish;
+
+    /**
+     * @param Publish $publish
+     */
+    public function __construct(Publish $publish)
+    {
+        $this->publish = $publish;
+    }
+
+    /**
+     * Update media gallery grid table when configuration is saved and media gallery enabled.
+     *
+     * @param Value $config
+     * @param Value $result
+     * @return Value
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterSave(Value $config, Value $result): Value
+    {
+        if ($result->getPath() === self::MEDIA_GALLERY_CONFIG_VALUE
+            && $result->isValueChanged()
+            && (int) $result->getValue() === self::MEDIA_GALLERY_ENABLED_VALUE
+        ) {
+            $this->publish->execute();
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/MediaGallerySynchronization/README.md b/app/code/Magento/MediaGallerySynchronization/README.md
new file mode 100644
index 0000000000000..4947c18986f3b
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/README.md
@@ -0,0 +1,14 @@
+# Magento_MediaGallerySynchronization module
+
+The Magento_MediaGallerySynchronization module represents implementation of synchronization between data and objects contains
+media asset information.
+
+## Extensibility
+
+Extension developers can interact with the Magento_MediaGallerySynchronization module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
+
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_MediaGallerySynchronization module.
+
+## Additional information
+
+For information about significant changes in patch releases, see [2.3.x Release information](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html).
diff --git a/app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/GetContentHashTest.php b/app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/GetContentHashTest.php
new file mode 100644
index 0000000000000..ad033f35df40b
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/GetContentHashTest.php
@@ -0,0 +1,110 @@
+<?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\Exception\FileSystemException;
+use Magento\Framework\Filesystem\DriverInterface;
+use Magento\MediaGallerySynchronizationApi\Model\GetContentHashInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for GetContentHashInterface.
+ */
+class GetContentHashTest extends TestCase
+{
+    /**
+     * @var GetContentHashInterface
+     */
+    private $getContentHash;
+
+    /**
+     * @var DriverInterface
+     */
+    private $driver;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->getContentHash = Bootstrap::getObjectManager()->get(GetContentHashInterface::class);
+        $this->driver = Bootstrap::getObjectManager()->get(DriverInterface::class);
+    }
+
+    /**
+     * Test for GetContentHashInterface::execute
+     *
+     * @dataProvider filesProvider
+     * @param string $firstFile
+     * @param string $secondFile
+     * @param bool $isEqual
+     * @throws FileSystemException
+     */
+    public function testExecute(
+        string $firstFile,
+        string $secondFile,
+        bool $isEqual
+    ): void {
+        $firstHash = $this->getContentHash->execute($this->getImageContent($firstFile));
+        $secondHash = $this->getContentHash->execute($this->getImageContent($secondFile));
+        $isEqual ? $this->assertEquals($firstHash, $secondHash) : $this->assertNotEquals($firstHash, $secondHash);
+    }
+
+    /**
+     * Data provider for testExecute
+     *
+     * @return array[]
+     */
+    public function filesProvider(): array
+    {
+        return [
+            [
+                'magento.jpg',
+                'magento_2.jpg',
+                true
+            ],
+            [
+                'magento.jpg',
+                'magento_3.png',
+                false
+            ]
+        ];
+    }
+
+    /**
+     * Get image file content.
+     *
+     * @param string $filename
+     * @return string
+     * @throws FileSystemException
+     */
+    private function getImageContent(string $filename): string
+    {
+        return $this->driver->fileGetContents($this->getImageFilePath($filename));
+    }
+
+    /**
+     * Return image file path
+     *
+     * @param string $filename
+     * @return string
+     */
+    private function getImageFilePath(string $filename): string
+    {
+        return dirname(__DIR__, 1)
+            . DIRECTORY_SEPARATOR
+            . implode(
+                DIRECTORY_SEPARATOR,
+                [
+                    '_files',
+                    $filename
+                ]
+            );
+    }
+}
diff --git a/app/code/Magento/MediaGallerySynchronization/Test/Integration/_files/magento.jpg b/app/code/Magento/MediaGallerySynchronization/Test/Integration/_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_2.jpg b/app/code/Magento/MediaGallerySynchronization/Test/Integration/_files/magento_2.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_3.png b/app/code/Magento/MediaGallerySynchronization/Test/Integration/_files/magento_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..366b1b8b9c3f79cedfa18c138d67af7759633e21
GIT binary patch
literal 116576
zcmZU(bzGER&_28@3oN~K%hH_^(n~jjfgm9%4bmmuy|f}F0+P}K60QnJw{$9^(v9?c
z@A`e7=lA)%{)PA6=gc`X*UVfqbI0lHsS^{>6M#S<VoeQ|dms=b0t5obL2-d6+=xGw
zAP}vrgR-)|rm`|z-^1;xgR?CNWE7QYjAQh0zTrt=!FO29&Q99S&W>P7o0L~<XlP`3
zC@VNTJU*77s5pb0`?D%SQT2h63XBR{5zC)Je>dp#rsK4;xzla?N~YoIP|nMTx9zY|
zyqjdVZV}zbf|1j!HcE`Hdw6-Qf9}8)w!ncDiw63sMmrfl&H)!+2H%_>xPTEdyXsal
z_16toAp(<2@~P$^L>BbqDEWv$aZeXCdSJfV#SIc3faXa`@G^cfQqe}Jt5B*4FO!_i
ze~Fiw@g#k<b1?IG6F$QPBKIIAEn)^mGIg|AwO_)dBHw5*=$82+xIYI_f7&p=zO@9Z
z)nSvpP*VB~8`Mg+U>OPN-M?@XmAmOZ+S|K`ICY*CVE=%Xy87wX{>@$A%ViGsJLjjg
z?HU}XT=b83XWD->7Ye5{CH^K^Bs~^uMhFv!GvoQ~9_+42UXMlleEd7z!Riewz`_Mt
zc({?8Q9v44UT}%cEF968ElMJmp`T)RE$2hI+2%VsYb8Yn&$FN38Roh-vMzZ7-$`!z
zl1{;7^Y&Q#Y1GG*F}Ii7_}A}A0s}s?iC~?qLpkAoyrR85YcwPG!apXTx!tmAJWd|&
z&3zLpWUw5Ng4az$el{<dQ6CbTdM4yd|I^K>Wt!&a#?QJ+28wX(AXX;bkj+2aZz`MZ
zXn2RXCU>&0%RcXMyKFwW{PiV5AY}iI^z(3HpWm|3Tgi!aXN$fZ1jf#RCq;^W8715K
zuJ#`gq}Bs+OrxwQ%HJR}6i!j<2L5LR97=2MYOEH#-Siuq6afiF;l*ARUGA*b&XdQ>
zx*))QDR5@k+1r8>*Gke@#os0&Wr24^R@&z28|K-d?TXK!!dRbrcYiOMzYbArz^ftC
zLWLymME#~uoXmTFQ|NARU21t;`@u-LO5TumDBMuJvQRhmE$6+Gv3UEE<$$Z96#odi
z?m?>_k%<>}u2>FTAr8YhgDA10H`hX&vNsM)k3p%tF;i-lEC*z>_PAn%Fy#SOHiy^Z
z$hx1f4F&I{YwP{x&PxtLp}3g+L_gj3(U0QrSlHUN#_ay2LQvh?>|e}oe=Z%)nwg|;
z_6j5qB+ewccnQ6+y-B?p#6vd_O(4Msk`+|qksAx2LZ*5)7n}A2#Wu}?!eLTaHzN68
zYean8sd<dKTDe=#Dv4Fjx>UEFsq<?0{H#I?LMXGTJsw{?ql*fN+x?N2m5~Lp__ehx
z^SIM!H~$ap%a@N1miIv1+qvIjZc1B2K!qGIsU7?4Qv5~`f`=G|;;FH>8oWi^afkxl
zL&R-SK1GG)nkmJqjw5cBfpiP;62ow6ar97B`wa^9dU0@S_OJ&?e2-7=&&V^vwe*Pv
z!zv5O8be8*F&srG3WIw-dD>JDM)+FbJjZ5$K~~`evD8-4cUXcoDAS@TS-dq!MWd=%
zxO$lmB9va+bK^@B{Zxw5=kX$`h<c~&GU{RvqL0c~ygkZ#M0bw$#=_$T$<r7d3w$H8
zsc>BjlfR%XJarWQGwEEsY}CU&susFVV$#n)_QWnp%vG@{>Ef}vlgO2MioEoxx$QE9
z;$yYceip_XJS=l6^RX#qeqCxXP_}E&pF=$qMXfwl$udW>9hHpWdXrM5J(fK>^t<i1
z`fs`;f^)8D@Rw+^Zf@&D;bd9`9ez%V`-!cw4xf)$0_|=c5+`(vTHw?X^e%aR#<ilT
zQ?IkDJ)XI>#qC4V7XM}Sg?rH*@m!o?Y?`QnuDl+zPu@Rzo*lM$lZ%q;kvotFk=v!|
zr-`Lmr46u~v0JkfvNQPc$|{)CxrLqfeEo5_|7(ByZ_Ho+OI#lDa(Fp?xqt)Qf!6{5
zkNCL!IM29{jg5`0jh2m}4VDd$4TlY}&1v7$-p=$1WCC&%xyzNpIl@-Mvda>pb{!QS
zt`w@2{`n<qJZnl()_0O_?RamnfMTwN${r^pYX(^kzI7yNhM!ijmVnlyen`JnKSKs7
zPj>m<1Mmas2e%&dJ+OV?^5AZnVYx$jNtr;Ia#_l~C#AOvgS8{xkQI)-*)P?6TVC3#
zd|N%C=x52d*T+S2I)VA`Q+)DCw7E3wRA@A^wS6;PU${o)N1JCY<;y2`CU&L==U{ci
zQ5IdWLFCA2ukfe6h}1lTgs~WrSNrroXn)XC@TGI6linw}FE?>#g7m52Q@M5cI(VIW
zord3@nv9w+%P5N=OFqliP}-2nP-u#AN^MG0;)QPHP>w)qb&gA{OJ-igVyIm1mDmN-
zi7g2(iEc6?nS#-bF(J1xcOw@om+MZORCden*2b3bR;`vDkLqU)?hGF4o&`T{tuL*R
zt=0X|{89eP|C4rqW$)%dV0d%3Z&XV9NTN_&O|n}W^GHqa?np@d&8?f9(8ACN6j>N`
zSaY~exLP=VxOez{B}yfFB{HRlN-0rwpW{C(ezuELSFs?IA`3|sO^qq4Eo-+A{Y^JE
z7W5)W>q6=D;dUUanqVmhHJc%q1lus&l{cSriS=4B{O)JtBE<LnuDhC2eHML(X(J`}
z#fc^3#d9U{+6fwgn%SBPS+9{}*;4EiyoZ{G52n=LE1i@xR_DH4AZs;m74XOLFS-;z
zQ^k?T@s09`;)?f*&x%*4+U2v%Xv`$x@#YSCl=Ue2p6i3_GS*V^Vh`h=)fI&mDI5OZ
zq{MHDlQwxePHdQN>}=S5dn?`|E-O|c_Eg+oyhB{bQP3XW3CGcF?7UE*TzArS+<d}d
zN~&z)O~SbN=+GF`)SIz}3BGTE<s)x)-#&T!(F$&dv>&yO6%iBR7k+Nl<+^73z^T!y
z%HsLx-*@<}aY>rxeO2YLJY$WEL=v|p_(Wfc{*ojWcdG+Yt5K^`3-RL!u<^SYTUPT|
z_g5_$X&ZAHFE_kya&KsLJ{&Tfmsmb&%|n_sn$^gaTm@e|z7WSVi&2VkP{;ooksP7N
zuZN{qJ$%P5@K?fcrC@*{m)ZL1!1l<3f;(alu@Hv!h<e&$T2E3-lC+s&ht?PGbYSPz
zE$UkjZ&l{2<^Rm*GnY1h+rH%Q6i~2deq?aSb7Z{t@KE3=X!Gs*qqXMWHLFjyJ~9?k
z=+p1<j0)F^J`?C=E#tJ8nPF*>k7VzXD;CJ$6yrW}rBydFow0AR_j~%+E7GH@FP5qZ
zf8UCo(jQ(g9#4W_A5#=nbi2sTYSOyjYRY=s+O5mrYg7+$cS4ulS0VP_T&5Z-Tmc*>
zobFsDoI{M0(td(;S|>U?a$SMkSEJA475hsbj87I$ejI0?AeiX9<#T5te>gusO+MQa
zX^^ei%l=ees>q{QlrWD9DV{5k9wdEXm+U(nVcNIwePQU0xjHjry0oE(v&@L3+np!!
zAHUx@@%z0W2Tlstj+%_ZkMdM~syf8gqPLd&H(-2w4N>Rp{*!0?{@B}6Z5{2$cMtRA
zg992SKYF$6v{iNHR?D_M-%dPzSw}Dw@07Wf*_x>^jGG%2FuY>wnTdGlF8*G+^nA$w
z;_y_E+q|r!*F)s=yP>ZA&=JR`wyzVFqmxjB*>Fw7X3-{f&DKXzkB6s@o8om&zc%PL
zJQ)zmUSGz&Pd6!&IFmXgDcwxl`a&Ao<KFYUrE^SnGk4f`d+F-!$mDX{b<^dMgWCs=
z;L6g7wl`Jjowq+GH1c&gwaL5=Y~pISJA1#p-D=*v^vjoVSGLp1+qY$;csKZC@J(Le
z<I@kjm5aNy`nT)@3;!0{>Ic{QYq*yE5o-OI6a6#h6*I4_Gm`<m1M@?sZTbn?wkwTO
zgB$BNUn733|9C^;LvgoYD@62a^5W0D-KP<G-5woR*}E@4>-=ml3^2G%+qV72xBBRK
z;$R~0_J`Zb4H69_zuMQAI+CAvNEKX1f7jgy|5DmE`P0mlaGt=XEvS9C`+3=g->&m*
z@RMuB-(QAOa+qTb86T}HkSVx?$e%}@X%9V`t?8)DsucPd^?crFz}U|G<B{3^MF%s9
z0=0ydr28ullg}pG3cA61E-}t-F@Z2SA7w1cdzMe0faIq^h*bz^8wx5G3~ZgP30Ddy
zrS<=T)c8aj2U>@dtu5_@y<Fw?Be#wG5Fvq3=!vu_uj^=GC-;^mxe0Gfs>+ouD2f(V
zRaJFSO4pS^+#RYd*eAH1(;d;2o|o{0`<HaH<Oq9#)J<q%q<;RMjKQ0rOsi#fFZLA8
zq+b1A#{t#;Y`!CIJwBIm;fnYQp7KoxBc}idRmZoRx#QInn^Pe+we~G8I&SqN555j|
z%c59&M88ywei$zuevdPI96@58Jd$fJHPYI?cyo<1ndWJ>JatV87$K;!Uc#5}>@*DK
zy?%}r8R`~R6Mi1yq?{ZT9Wxurr&6opO#VdeMCGBnUDw|p`tG=%^d2D&A`S`mOh%o%
z$#RsbN;<k415(cgJ8u8@M)o|*(Z^5Ed#6ieT=v@~@&^^pmnajilRPh;VX1GXqGno#
zoR4;VINOTq4$h>!GL4$9&Xj2c%^0hVYkq!kew^)9vcK^*;AiyZCbL`1!t)vDv4a-f
zCb<nmm#+_KjGJ{*uC`;B5@m3F6E5N}2zP836=a{SeX9FptxOl9N-QHw8PXy$emmz5
zr^3nhSo&9&A0-rc1ub&lf_oI=3ZCCQ_p11#`ez`bX5p>3U8G(4(~lz^{&FG;d+R5k
ztD9XCT(oJHehPeT_q{4SHSmgZv^}0!`}I!fSLf5J^N`!d=|*qOo?OTuzp;Dccspp|
z*V`S5krN5g8zWS>N{o9UY20s}*FQ%2jBw*RItv%{DKsXJz!b?G7ADW++4<Si|9ae0
z5OwhoCol<DuqF6ryfH79;B|ELfoMPRScloT%Q()NiP0wa#5B9L*}v)Uy|XqPi73iQ
zY}MgdlAQ~FJs}o02kxJ&+gubZ3_`y8@`^0_W2$`*jCED-WvVBc=c!!9^aKvkRl9HF
zNt=C;JaRnJCaNd0PP$CW(;?EO8iEY{5g4U@B4AgoRvqX}@65MVzs1I6%9NCAlRIlx
zE69vY@0@6w6Zk4O_+{$;RKkMORND~O^7QoGZv}HVx~OVYIK05(C#)aYI+|5m_3SOw
zz{ZS7JwJ(6ZL@3iD}UGfZl)w(U8GJVMFIOa=0RN&DVyw~R~5OXUPc0o!e2ygAN8hI
z5zhL0JoN~<Wj%1ezggjy@w4_ltua)bWcMD=d-Agh!x9$T)}N1t6CXU68Sosg-+1Od
ze|DFq+lf_hvC6FS{)aTLrpjAl_GStTGrklPHlw-UJZgxi-}&-YziBvhYDT0CZFeoj
z%QWvKp9-AREUJ@^%CFqYpuKl7;5Bph`bJ~Reto7-{b9=HR~b&+d>z@mkdtF6$M_wb
z8}05#r4zxozcnP(;QY#4wh=T94s>&W>JapDFaIW@M?E_;<1X71n@;NLVB-e!k7p4M
zY}TGvc3V4_Z?ME+SnF_{Be;8qC?!r4O4u2<AWBmIT^XMJL$BLvWD^NZUBj#7nns#C
zt0}1gspV-6X*b0$IEd~^7?>3bzV3T7R5VaHV$*BOZ&hLQ&f39t+h)^d_xtblt?wVY
z7rX9%4U87bR(Ndjv9J`DA`A-_9B0jG8!=DRcGhgyWK|tkiC1(~`=H19*ie~7=v3o6
zG5lju)%OqgvOS{X<9L%ciXUeN6h=4pls^4v7<PiiM3yJMC=+mYE{GeBTR_~F=#jXs
z+oHSlQsPy~i&u|@jRuXTj8z|3&Y&bnoe8&dw_CSp7~e^$$&}yuGK?*FcHu%I%;>lN
zc-;q;w|Euxm2L#v+}S*Ri9`ORv$2!(%H!%745~M`3NH@Nif~erRi0HUh@^^orH)it
z;N(>4R}oY<i}gveO!TJ>WY=SJmFr|-fv58A8;{3Dyzd+AJB)dJU$405?b)rRf}M=j
zv_GEg(tK=fcYay99*$jG|L{LNdqSum)u<}V#eSEUW;0h*uugjW!G<xlVeoGqgYL}!
zPYukKe=C2Cq?l4xX?BXa8&?Tl^&dLjJ2oa3V)*H{w)FfP|Aa@ecZJ!yq25>LY)4<s
zk!JIG8Qq}pt6#eb#7D%qSKX5BvL0?*=RfA+qTe=iJ!uEku-iGB+X=4mH$5-B%xLOw
zTx$GNd;2EvW^9|XN)|-34yska3(X`1i5G$Pvat|_*r+rx$b<vr^b7m<tOJP7^ujYl
zAEd}0a)P6d9CQb@M?jI3Hh3HeyF!xRQjKwIzVx+Rx%f|_nLj@<sNxpLP}sOrK`frY
zsXXv{F*UJ@>WW@DVhj~&HEh{aS8OEU%=n(HEs^5$*{b8S1orRjW9*B5qV2b@33yaC
zH0Cta;Dj6uY>(I#v=x;Ui~Tf(IU5ZK46^PS=$G89Hi%(4i>Ddldwh2e=L776+fg|Y
zB>HwDd7|$N(-(#>35|-4Zq@bF*EJ;7GOv!VLvov2MO%jaUidE^EPdx&A*CFpS)*a4
zc}$g0MMu%mR%5mm?H8faVe{rerB}*e;g)vmT>^X601k6o5h|XCn&M>Mg2eQ?Mu%^v
zJhxr*co+FQgoD(vU6k?JNUXIeGWtIJiJwh7Ywxc5nfT3V(^uk&bMw|dNn&!ip4RYF
zLGud=(p)bW#7^C5K17JljjKSp^ILGxwI`N|qS&Ve7S`9_Ev;5RlgX+?Ydl{|DeI=q
zGHPf!`nwZZpc#OdkhWa%qGU;$|J72KgO`oqg@)kin3I3b*#r)bYBJY1J-WPPfz3(_
zIqkCW%8yU}njXIPX>~o@_<H_r(?n7;$Jm5p&RZt;1317cAbq#=h`F8l5boC-bjP>Y
z+u0%aqA$!Yb7Z+aBS$Zfses0;_pzyw#NTIU6yLJDzMXD%Dp0@w>^nlL1t+OOh;idA
zu86DPYAOrrOQ-FVDlw;SnbY~iG_2tMr6Y)1+tMo|n)IIJ6T|VSfV>_U4PiNJrtD$3
zpFAkTF-7?*sUwB0`{gQudpi3iyGok5EVexD^4)&z95v~?Pj#mB1hvdH74N!dgmM%c
zfcqctQa+>>4?CwMCe@Xz=G?wx29?X|j8{ys%o0i0OmqmB%2Z9W&1s4qLNX044Y<F!
zUyzXN6y6rkmG-D0CBiK)M5$19uWFQM6`U$N)*cjPRq~yNBZqxgyCcIqy(Ig7*6F?8
z`&$pr%Rbj^lp2;^o2Dxdn6#PODc`-TFl{jkwXU-G?vUf)Gj{pDyZC3k_+0cS!!Esv
zr9PH%k>x)*hqVK5v5DR}x_0j1+%n5&Zubvj3_83zziI~CMu5Zll+?bgJo^LnwK89;
zE^8Las3UOS*>A<Kjw8gQOHU$U(s9r+lOB8(41Xhb=s<1#{=S~-&Zf1Mzx&x0j!u-N
zsxlWx!hja^ZNotCz+FSA;gSrEzHV^me$gR^my2@V{KE<-U;6L#9Iovy6%P3J6izn_
zV@sJ+)^h`XcJFFd&BsIc;fJHWwToX`$0F4kQ)0M03g&bObQFc2J~<wl9QrvzLE}tq
zoXwk!v;5?ytW)%Ic6;FKw+!+A;|Ya361>eu!Rx!j3T&g`)k1Pv$b9d@h0@#C^1lfO
zu}!}Gc}Cct_+3qk^&$wAq*VEaVpQPw!$d|-+=;ku3xQhO8ID|nojW@Mae{sRviS0h
z3aXA;bIPTmgN+hruqcXda+a5A`SoG_;Tsg*B1zIitlM<b3;_h^cto>_r8;6d>4P*z
zu~m<q8=ZG&E~JJ%pL*c9&mY+DYaQYrcoNhS)I;6z6XLn!a<&d(+T=o+zcZc-=pqd=
zIr`1gZ_2peW>m<Q@)l>kyH=ZcP^qf^;Iv)7S+Oa#);+!a-R%8@XM7%;xF$3<AAO{|
zTY7h%_-?x^tpC{%*wx-S<u4TL<@OU1lXt$&8h?k`mM(}bOFEhM=8l2XA5+oU*DV=Q
zVqd=~)6KoyHm;u?YIRh{JIFm)redctC@AC2y7SHFaYtjD>9LL{$9mPD*7S!p!wIIb
z9W%ahol~bC7gV1g?m96MA5DK@z;h#Dc{y@nSouE7gpuiG9`gsL0N2y_B`JU3Hif;V
zA6P?p-pWKFsw4`umQ2UYZ3p%axxSxQHRmR@M{em1D=a@(JWe~z{N1>acu;koyY4jP
ze=ONgNZ?jNt(xVxM7AU#*xZqF1wXYs`w>O;_HJ>3wERWz>+|t*?;BpD>hsbo7oY7>
z>G^<p-?m*og=AN#>yhgR*LQAIR~dh$YPUOX-=ubmj<-$Ysk|cwt^YhZp}}G==Z08R
zS_B5ZaSRNsq}P-v1^vcfy4Yz5oYu$EH@{K{3ON&6NFV<&4Vk9}fw1x&9vFEU>FP*Z
zySWHj+PGQS3i`P`1Lh1MkgT6H@TZHdmnGcK#o5(U+E0!Z^M*9=H~O&<D;)ERmy;Z;
zk*+>m+0DZiE-ol0D9kEP0Efe6J#3yz-&0ZhZ#nQkIaYfwuV>OiLcYGfg1)x}-8}4s
zM5LsogoH(fL`4OFHv~NWUA-**1YAAY{%!I<`>5D@T6;J=^Kx)=g`@Yiv~u(Il4E5>
z3;N%G|ITUa=kR}$Ts{B07H~l!^e;jpg2F=oyEm{@7X4IO-@(t;*+|8~#n#mmkRdN3
zA}%hAS@8e+>HkFjKTD1OZ>fZs)c?Ek|M}&=m9j$U8~i^v`ll|;Q$Szx1hPW^t9yBZ
zFsM!#2!sG>swh72!`kXFPPf*~$^V5HyKq`ve^Oo9Rv8$u>by1>Tcq|h&5xy@J*SxP
z<q@`x=nsKonLDC6f9{DLC~>l>x{FYhzg!iQ67^8qvMp`<Q1Q0Hsjt6k;Z*K6>$9WI
zojs7~ZEDCfQ0~utUUnGjlhjTM^WTH>(;)MOkiA+)BHS<t7St;O@o}24BUp%1bu0;d
zzn>UvYaHFw)TB?+U&vtbBgh;90>hxM6R(s$E|ba~Qxv<B>7T-6nT?)2*){ycBLIO5
zlVOc8oaZR`-Fm$qKKTs1^NRx<MfI_8!p+YmEeN_59?Ecd)OL5I?JsYPL~dv|yd3eG
zzXKFXJGr;PegP}X4K;~U`k_R6l3@O+NbzUnW}uQUDRsCJcZC~M>TM{0dgwGPf%OmW
z5$Qlx96?QWcR?n>-LK_vP#7+(_F-?~WdD<whQVYJ4EhdKc4HC2L=n8v{eR%2U~pCf
z9yx@caX_A1kP%MOSZKw?8}3v9TpD5F3BDy0ATmZB$;a0ho^fsIX{hTzouxQ~C0X*m
zmkUzC3b$1t`TGr2Rb6dOZcg=R7#mnshy#&rX{K%L%r}j`%)tsF<jrD5tEVg$^<kYf
zU)hMZUPHxE5Q{$|$HaGy5qz60*5&jWYL{YGDHiKSN8?Ns0-SmZRtpt-_FSZdA3CPq
zSQ;S71AX`96=GEYI2HvMTZmi(>M?$#Sf}yRQ0H%$uEw_;0se@MC+cf3uqVfgVrK+F
zAk|EbCM*;L?1n}0EPJK%6CY}a`8QjO5bywsfC~}Lh}sM5-w2!D3Dr4-!g0lGhI>UI
z>xjZwcUIxET<phs_~`4bLh{YT?ENfzuc;wML~~#wH)Rlb9#)G}{)^OqEc8XjJgQ<|
zy@G$CYr~Ld4G*l%x)<KZCDX@W&e_6`zREe7hM@JV0IJQPr{n8Jwt<Hj2i8JYDdg)k
zeAFLoE?k?buSFnZnJto&p|(I1tC&>ADT*I<MnNlirt=Q8#eO?v!xRe)3q{<9wxm2;
zUfKRS;hM3-M!PNf=A@ScE#Zv3_bQ^`BIuZOE;|2#C%A&It1xGpY&HTV3N6N63`V(*
zUep<!2C_rZh6qJ{@I{hE%l<y)6_$gX;-D1-EoSPG4dI^6EyZfaw$jJujpJ9cpo7Tv
zj)3(~Zic3m2YN}TBhk7H3xGXaMw)`tY+-E%Q*X?B(d)ycVYID@btdji8`f>I79X3K
znB*fs5K5x}nBk*oiAWYCMlhloe=RDE@y?`7aw^6MATX!!j-m7P_x2W|ymK-HQN@!y
zBpY-x5m6625X2JuEnZ1qj{y}fq`j$@hPdZZgcDMr9&JDnSetzXO0h#T&KRy5!C}~)
zmEEK3tS$B&_)!I{%v>ki>-)tu8w8H=2*F4X#m|Trl7tfQ%juX?4Nobb$>p=4H!2K-
zEGT3|MZ$IAvL%HfWz%w@v=3^|;gYa2fiU;<5u2TtJ`9yE(S5WSP4P#Eb~BsxCE)Hb
zx9^8e5y2v<l|L3$!ocmU$Xr}7jFt;Ylle_D<3MyTyxy0=`jZ9Y_<=bau0V?1qiBRR
zexeC}H?A3nCGG6Y2Kx^*KzUh^Ka|+Btw{g6u&AhnYpr;YqpwHIwIa_t#L_<Tf`)jU
z6GALx_@*I+cJlWI+ab(|Jj~L1M{RM)?=FD?K44Q2<by7}<|wNkruAxsE87b9a<Nm0
zTMlg-9k?-)`h@=ehSMhy-}vCu)sgTKBG=W)RygD_!ovQ*LBw9S4RS}=)SS#!@eel`
zbIU;`L{KE&`I4=(ivUj6u+kX++n;TR>?ndO**_kxfcud328F4<KK9-<%w0%WZGeC`
z%Ib(7gM9_@!z9T3rq(9pQNfMnkr_Cc!<BNtXo#Z;ag(W1xxf?oDZ7ejAR-R&i_ank
zL}EqOe=}#@e;cbfusZyZWt11}IyyaFymi_!VKnDLq*(Uwp^haQFgm*MRvderdvEk`
zFYjCD9@4~JO4^}vZvk3oL(<^lF1b|cv>A*mBw{`8($<}NMqvW6e}@$&2-A;9(~+M(
zPMkNQsmK*o0))SaMBF->FYz-YCB6RNFhSc&)fO@;aa7z5L+Lt;<hBw(J}9B6mGqJ+
zR<oU%W;1i%=Aw1&!wIX_=(uVp5g4E}l_pe`33<ha0d!$CfTd!8m4F^Cdo1zlsOJk^
z)To!*h(bQdL7_a!Un-+He8n=prn^#T=sDkopOU@FTyDI&JX!ue(G7#oEL+|2qyl1`
z4A@`MI54q$l%jQcW=H0^1P2!Wvz9pBzT_G}bututq06pVZ^CYdmsg<}ueMjfIwjn+
zZZjaabDi~0-dw783f%-EmBXvE_Ojeambp^@B^o2#p>)At(TK13vQ7toP_J=h`n)dl
z3;&|;B#H%`r5o%+KVX`5m}ood(c<|KILK}An@*M?X4#n9CRn)=xFzl(H2pqs1QYVu
z{!Z-ZcSp0DPqnqsPKS1+1A^LuN0aLIeWClor>@vqM8M+}I<OBZ!!ap!m~0G!C;)f7
zDrALIf={uN6fmd~T;jL%Xc2M|+@F>Q=3MO&!C+YlRf%${bh2E;Diud?2;_hUX>@Zp
z0kP?1dn6eoGOIBZ?vb27B>D^hohZdw12ETuvZs#}Z=6!r4JJtu2XNR+;iJ+2lmZEA
zd>6xkzbn?Wj-BvM&v4;?wxZzXfD#`SoW8YuTi4gR?Zu8&?91Bq3&5o<q$mohcK#lw
z6;@&#S4AYq6%NF{Q5*1=ZY&cV|5f<o)VYoqjc{<SIm})V2v9o8h=8Vxn1?3FekCa3
zxC6ZNFB5-+xy@%8Al!nXEo65EtvUEmgeyZFXq<>eA;=?T_n!D>#I_JDWVB0478v1*
zH}CXHK|Uy>2nWXU`~-}l9DJ{LGCq!{#dBEcm#9e5LEyCvU}M;UFC*nJvGhN$hwDrG
zAaN_CRt<AC2RG>k3jI@mwgWflhD1{rpH*!EkGBqt8Ob7i`VzmefWkKL*$H2Z{Z@xn
z<O|uM1N!J4urf=pptbp(XGAOtGmg&Y;!@;G>)trSglLnJgGY`@ZH>!9MqM+k389&$
zZ@0O~gt`jfKN9^JfuMk@L@m?l%A+9BPD&-I>S!b;upp~68o0YcL*ysxh;m3D4HIBN
z2h$NAd{gV#j-T5tP(=rV_SSTbghq_$Us6!fpLajm&-vU^v=45Px{WqkDVYYf5*y(?
z+{=g4@GQlL6hEH>dbENXL3sznLQo}szJvIqbu#9R#J~nGQHZv$e$91^ra7yBa>G0W
zFu@a!9J;xGQ%D^BQ(mni4Fqg5zGez+@*ThB$)2nA5ovnES6ychLq;IU^T#4Y&lq>u
zBl>=YmwD2m*AKywxaU5E+;6lI)bTl~fgWfs00JMft^`}^nv9%YlvqJ$T@r173K&z|
zw*QxP_+N%Hcq$Z8)Y>==%4eIhm;!Mr6p;j-iJx@E+Tmp60xOoOWhxt@5x}1sN<$<Y
zqp#z@0eLM@sg(GPVm^(884%$O7uHv9k`OyPD#WlbAXW)uk)Ft*)3qyB!xBYR{)iTG
z7jW%kIFbgB(c?4ec}(>tj$~c+>>dDleF`vjWcYXJS>Jj-grr)t8%c~lxi)95rE10V
zzv8b*bxc^Q-s@;5ql54<2QsQqHl|m}Ajq>FmAlIM9x-D|0EEY!PzG1Y^;^H^7bfr(
zxvf^1(VM_vVU2%KWg!-*kMr~3fx<=dAASHx=pbsIv7M%0?KdSHbq{&@BP8tizyRaB
z9VT0Qswb*Rc|h>Y3-_Jp`#uIta^VjRy?~w)m#4s!M|V;IC<H!zjtz#{6NF7FR8<zx
zYQQ!q>|Bl9V-<B<Bl@@i+$*BOl$Cp3tsx|fpf7~zqcCx;V1;-P0@TVVRWCrf_OUz<
zPcpzcax~%iN}7L%1-t$0T3>SHh)lP{4MCALfWEZZEEMg9jY#=KNj5H+$uUPkARt<&
zq~uXYAv#c{1!{Egfg|z#Cc?}|+LDfsbA9-S3%s{qE_Qt|{E<Ne7GSF_H3J(q&A<2-
z{ND!f-rjCGC8-4m{%(q*l$Bxh4xljhYn$de1KHOkX=4lcl653gGOE#tS5TX5kb{y)
zS>uqLjLX4nX@3bnTH;eU>?bp^k0&FG3DjR*>wh*LW|8pW+p)MQl%mK|yd(j3Rio(r
zoT4j#ReM2esFd{Xo+uDP5ry}_I}}q>Q&#-1DLvnfPc*OD80j??v-02qiX#O3@Vq~^
ze<Yv*gaG%3XWRflo`9*NWLI`QBFvZPSnSXT$kIjysq8R&g#P)t9$N{h3c#%yG;tvw
z&%1B@^6<4kg{#%!*Fh@a2sq@ioCWU9B5g@h!i<7ggk2*gXgp75AvTz0N1JiV&A>BB
z9uJI<GTErxfvEXG4gU3|r^2dy5#JSdmZDkP1dk9z8iCqwu~uPk2I(xz=>Mc70|cUy
zA@wG8X59<wUeeEgCpX@~oZ=K}MC36ON9pwL$`jgExU={pgBF~}f}}rc`b|IjQt7@v
z2A4Cbp%*cY_DHKC+t>DAg*?zUz=AgBqb!i$p&ZTMPpD}m>rSQwH~@sGShSPv#`kei
zp_PZurM2+2nDo5jc)d2N<`5iNL$Mn))L(=m=8#V*6}Y4F><eTBvJ@#6h#0{@?9N7z
z@H6Sk$FwDhH;VxU3|fH|oGYpk-&S3%9~Qhi1l$VH-yzh-$-o3zI)tb8S^rS0!8^H*
zXfB7i0N5Kq(L1aV(~AcyqpY|jF2-0qB$)GV<%bGH9#wk_&}LliKuCh9A6yu=7YHzi
zpm%(c99kW@<^<Qi=cbqL?C`iwG0A6Eg(znyf5ik4hmAkO1aC`f<+<x>P0SB9j>f=n
z18R@h%Ag@S2>nPEaTUkYU6K};vW`IC+l&<ndF@Rl)tq@{vH9BabWDeGV+$6MW9+>~
z4@e6~NSrmoGrp^2yk6eD>(1E;Tpd{D!iHRo-zL}3^1=V@Rt0XZt`f?^8z`iCxre?&
zm>vF%%V6L4(f<DU??dI=&d(0xXpfw)4rqWxLk6af7=NEy58F6Zsu>#(R_9H!LNhTV
zD3(d;xe|5Mhwl<ukJ@O!FA~uDw`UJ)e34s!i-x3eACWFurby(t=Auyw<S<?+yQ01Q
z!E8h8+pZv$*Sw=1B<Q0Nb0V|+I}SFtqniFQoNut@w4cwf^ussN_Hk6Uc%BdBB~K!j
zZZ?+{#_+{1M^C3zGJxP1L!4O}seRMvTyD2lwLddMZv`u(!P-^(BX9LwwZ&YjidB;M
z#IvmEZ!Qp|LQ#VFiKYn?$<{tXu8+0jZAS(9^3a);njFaxO1#$ac{zLDh~nE7^%RjR
znl;pVfyd$}gRMo`b$38JY+3mNq5w1jA>wd=-{ZV6^mBMQ=SMOY>mPX#XRA-_3P+bW
z{4Y_@9z1cZ-CY^y$%5@uWSR2)OD6)*HN_5rNPuPPLLF1ZMX~<d3ogffLb}7H#_(+t
zZar`NNo4>1MeYdN3%ue(RbChG%)9W5ujlb9L`7kcA%Jg0sYQsp!Tdeh+U2pB{e9#2
zRZ8-Js^G$p!1?NHQ4y`?W%22icfaUX5g^ewx2M9ATnk>Cr1c!hwft8)S;zx)_xIpt
zJ?pV&;6nU<;HwehFUEi}-jVeZ4m`e%Y%?N|6Y)|iqair9Gs68=sntsi1RyrBIo2?>
z(vR=@N%b0-bcnD>g+#LjoZ=_n&bAs#q9&z&N%al~bG2i(6;&I&bUkXN%@Ka#X@TZg
zMej<o1Auf*#v>T_zTP1_b{%xWNg71k?Kcz)k9a5ncSuk)+^}IYWdWTgS&>x&=}!A|
zJ)ae;orT>gDyIdMT>-ELkkiiC>KH2NEot_U{ugvngt&bkVsdX6dmP0V-ln1Thla?c
zdNGemj=DX$L1kV~EL~$2L&PS4-6R&|pxlHY)>Kq3ERr1W8lzgQYML&y9<6Rze*!L$
zQ)tlmlfG;5`>`|M_$Ldq!x+&m<5bA~biweS+r!JRLBP*G%J5xw>t;|5t_e5mzwq%D
z-<jwy-WU@qNVS1H$hcu6VF3`R%dTJHW@KiPBy(R-?k4A}1zqFOV>mY8|8Jl~LvjgL
zwJaNKQ1J@fK1}POl?>>jEOGrk{=4kiwl~Pd`E+y;DuspiR3@k&i+}CTi3I+h_BPw3
zf+by}a@4*E#)+Xsk3tq-)HraxbY?jk6uJC|u{?HU6mx<SPp#K|6>9znY5y<x>;dJ}
zL81vEKY~<%5%G-kS|tmvEx9Z@g8&i4aj-)hF<}ZW<>r49hCy8%zF+8W^{-cT_M?<z
zj#ih9P(Z(hQxFg4)!@&EaZy~y0HGJim8Jox>6{uIU(w-V)3j5(He%i}>;U7K%we)K
zzQf~s)*d9Zk6%m)HLpQ25tv#NB@)>KzFSscRF%nTHOlJr$_db9HTz0f2i29$`pftE
zcD2j>6{Y%Udz7-SWG>e;+Beq)>vk7*>mf?Rd$TbqBPnzpCOR5-3paSGUh%in#hL1?
zBP(vxc65;};QQmyVyYE(0)Lzr+rP36sZ43nk-h_JpHa{b8rRF{(<;*g4;Gc)I<BDh
z!1OHyA@!9nR9~z5)5CGUm7Mh90fCSJT+YHwyhj%K*r1vc;7Oq<XGrur%OCqcH#ne4
z=hd?W{mq!pgvDd<NFcr6be(?yH3cGIF6Vn7`tTAg7N@n&JAVpa`w+u1XaPZV;H^|L
zwO(^BgVZH0RGw~VU4<ezSAsuz#;Q8YhuZ3w4r8cwJbvOr&%KpVRlKOmmOHs580GP@
zu3WPa|Bd(#%@lve*P~liRPj>`E$S)f%C+U1#QG?O=S-m*;Y_UJ?MGBxzz^_R@vzj^
zx4_plXH)8j=t>I+G;xR>HbXJi<|vq<l37JiKS1x%O~h8A-k``VVs_}mj|?2HR<90!
zVS;QXtT(B3vHOyi$S9~9!q0_9$S66uPs!fJS@NYVW#S9Pfx=;Nv?jJx0Dh9AUaafL
zo4`_hXhqjZ5hNc2yswWHW(UCjH#st@h(K?I2jj1WpCIE(pWs=j9gws9=t@63CI#?v
z?rq5yN#DipDvalgpFrzvCJ{j$oYrdhIIMbFPxRH#oYQ~)P6k;}Ph7xCTfMfzVW~2t
zF&Ht$ME*udeH5~QDd6*!TK*HAKs}&~$MF@jMn@Aaz7DkNIOIEV(TL6j%KasoB!GD|
zGW@h+Y@zndG&E$4!sG)4*!<3(o^>#Zr34G}Kp~DHV>bFZ65j}>RfNoO?=asYcs7hP
zg4RD=Uj|G+Z`Uj$1hQ6r+(yr;jDDJ>1$YJz;r&yxdj8L%_T}GtyU{V1qPAY)-f5d&
z#KAuXM@#?52<CBP!N(#*KPWkLad|i-XNT6>C<pjGyMQfS23Y&<vN{~s`_H@ARRCPJ
zp<O+u5trS>f1P4Ni7?1QNkFzF-oJk@@oSOWonpR};4j+U5LZwmSbSD-pUYrS_q(*t
z#8)%#V%>$&!Q%|pyPoel33LVI6Q%gjPdLeIACAJKNe?#M=2SVq(p0>YHNt)PHSIQ9
zfDt2*{HeP&pa-&6Me<5k<W{5KH{$p()=5LWhtaF}hT3kiH`q@7MI#!xy9S(eqr)D#
z(9I7m$+O9NAs`48ftYl<r^CEjIL>z!cL81Ka?}sA!E{YISDI$)8P7n!PW>^Q2n%48
z{Qyy_DHB}fG-T2q#<aSnAhIdFK`JNGGlE=3xGw53nAFK17HZb5_40W@p<9!JLKc!r
z@Lw4y&IViTnN+{S(QFl&oAZ!t7LDCnF>qhJ*QAiMRLW>1_CR6DLkb$S#9Cskrqx?}
zDL(Yt*f%bnpVTpi1?Z5u7%eG(wKw*EsmFrNTp#E->~z11_#|rYDcFuFz^Nhi+Mxya
z6QN(@%2cO%AsA2Ne~EZ3W;F3#QRs+D-Ts^;94Ch35l1%0Bc!nKvZuxsO)ZxArx>mD
zfA&hTpsnDDZ{vBl1`=4MurG-9?P){<#=Hn({Nfgv=HRSzt%7luvF(dQ3U%}k_S9H}
zN>V+hTWsNT7nbQMuZ$Wt($EQriCwr;8}-45LHj$bvW2Ogidz)DI}Om9-m?l@j0f_p
z*wq)YWq%gF_W!5}JHWeQf>f5CBZBa<6veCf>;D@r7@pkEg({q0I198(aV?>9=cpoh
zgElP_X+2D(JpEl$Aed9`U4$tQMno2@H>)^b{mvG|N?)5d%L*{L8BnBeN+lz;6XBCl
z0dEu0isgi_q;}x`b*L>kPcW}h2%>$BFWATOPv!hz5`GsEpxMz9CtkVJ3yftzVJu<y
zWcqBfL$MxUd>;g6aECLpv2L?BNU%^15o!Ee8368UnvtQdv80<kpDPUoJfIRkaZv8i
z)!IS4<y%zgGt6tXYyg-^8Vy(OC>f>h#3o>4qGB@0)he&jg8=A-H6|e>P8<8Uu&>{L
z6a0w=jj&wUnqm7pii{2B^L-Wn`{8yY{Ysx3Wd9PP-RuG%j@$GxnFp}os0Vm<VFHkc
z+C`1~VKukU@!Ue6AIPX<sCU-Xk(8WDL0yO6NnNcdzN}#wz5oj_K1z!(rbQo42VfZK
zxEIt>EB}bR8J7hi3zramhAk=I_`79T1~b5(WU+(@fN*dv0YV#t6MSp;7u5=tKZJ5F
zI3H~^5O|RjDG+uL9_ApsX*k%g*t`qV0?H__q);0C7aU&IQ$TSCAH@f|u1rU_C7p>=
zE9I5>5TKpL!UQ~9JyV3l)=o)Ko)1nX{nvZ<hSU-{nq}UDqc@KWRV^GteB_!2St&jH
zm%>7e2Feu*@2=<pSAdVYfMXRG--Vz>Hs*%nU2Hlz@!E#aKA1C9YQb*&UzI@pKB2Bu
zYScdplL?ccW9uj@(70?W6XhX5tLztk*S9AfFB8L~vlRcN{38A7h87O{4aee-ls5W9
zNr%xy4Y4)d<k>t31lZvf{tQ8HO8$EqZCpiFq$k3HxMiqGZx(G{9W{&g5CmmTBHcg7
z!N#f~X2WfI&B=p}mL&i+f*d4^1V1hOh{L{w4hI0nslyi(jxMfd6#TgUEB3u&Kvw#`
z8#!rc7lT`T;xfT5afuLsSmI5FRlJQw8_<Uxc@f*Lv2x8?a@qca2U8w{Adi(mB4r#@
znj+}4yZ~ypW)7rkVLtBp7E4dZKL_Nj9h2;mx03bZmc#Ldq7U^Bn6zv>PP%UnWU6nF
z14p--QTP+W4x(KXvqefYBS3XQ+Kp=Kzvpq>=WmVs*c<lG3#7qyckRu}xnbx{NXY$`
zSj!@ym;eCuvK8T9Q<R}|U>JHn2K!ALR?i4Se6aS`a|d!$7MaHCEj2}iiJ@#fniqk<
zw_zHDI7<fg%n_<?9jPFZh^MH*M`%olAw#QF8D2QmqkG37@X5{ij9hn!Mq3mX4kiJ>
zEx^=4_2S3^0Rk5RNVgm4ABB-t0~BFRg^}h1<7Q-(#*3S}{a=$*cut_|<CwY;bWTdw
zV{q8+zn*!SLRg~)td^)E<YB5ZTG$Br9!efBKHnL6vvqogc0quKYNCRa>Y??tjSOKi
z+qiT7>iWFscYz{?fxEF!CtuxyPR!~HANpAn7ZUfZZ;hFy?Bts&F8Vh7iHOJC8g*gR
zJ_dsSJP3HlG^XQ4RTMZ*@kE##4}yFb)Saq`Ud}n1p7BJbS@<j7+>oQtB_<#h4nf+-
zU*Vqe1n1ru_7<9Po@bhYe>_9Kp2PxEEwqe{OX{}qrUv@Qr38IIduQ|^m^!3>HsleV
zJ}{>NOfi#->a`N<PMPn3HJ<tV(_n6uql@~S!pz5a_4iW8VbU0mE2kW(fEG9zfgl0r
z;GG#^fBV1To(AVl@&(cg+okGgip6scomYWOtcSW%N+xc6$Q(x7c;v_mR3RXUIlBd!
z{SoT<jjB>Rh5)~U$d)l5lP0rF>yl&ujRoMHd^U@T(HZr`V~X=Yz7fl=!e4*)fhHd)
z%$A~8tMk$G|Hd)E;EF(ze&*EnVAsgQgm~|8KV9LGZ)smmUn+VRxIRx9Hzdi2@UXSn
zX^|{~w`8Ob<B*yb%6)f<TbhH|F)0q1Y=pJwTU3q(&lz~MVFh24{9{(5!C<NONNem_
zkIAd<WX-Q|+-;3GOvD~6K+N$t+l))y@Oj{1R9L2fr7ge1pmy~|CF1g&CXo?vQy?s;
zLij=3l+5-G+AO#(YEc*_$d5#rZhzC-?b5miANF8+V+f0vkThrp-r2w){`9}T3@{T`
z(x20@Xl_*|niCL7#$;}mFj-VHyvxxo%0h|?t&eDm+RTueY}~)Mwnij%SMCWf6Fu|6
z9OwlSWv{N;7U{3(|3QLL#9nEI5yLyRzyP70z46it&h%de+TCb134zN~dPUYs8P=vN
zRn~wBCGhkq7t$=|ttVmN^?9t~2*oNU0(x=+gL8rK83E_vLMhDX5SN@b<!ThQm2Ue_
zDh1ZA<d5#P%*@Q+1{Q?l<>`9Sv|{3No#-mg!UHVTAF@n#ef(l7*YkkSgB`d6X4LVJ
z^JXGDyQ8nv?yDr)Cjk9E*15G!Es+ir8x*t}z1&RVLjx5mcX4>4-u5XJf;l6=h!ah)
z{ZV((5gb@%1C~1`G}k$q+TUSo57k#yBB}^y{e`|_El!v-*<^yNCCNb#JcRH;JDL#|
zrbC>09D&dBNsq|#+HttW&>9uM_p5^o(f%#0h=hCJX^C^u%p*nb{Q!Z&zMPD`-CG0V
zdW+t2lpfIJ0X*dF-534`jq5!{aKPR_@Y$zV4VYJ%zVP1dBC25I;X+SPVEAiP<_U@<
z)MhW^NuOX8WiN~M>T=#nEJ5*zEUD%m0U!ZUC<?AiL8|J%r?1}X`oRV8_FUW=j5_q-
zJZB@Wr@inHpLe+!&dLY1=Xft^%HErRdqh@UW=w#N<iIRuhat`GQ*H+V5VDFp?_lOz
z_GjtzyJK24H=O^WT?YtP?{Vw<6wLl-wr>Ln)+drONjyJhT_=MehmSB!SQtBOA@mom
z;_ck{ntym6fELTM8Yc-_g)WOer^G`;9H2R;WIkk-Pit!PQdw}f2V>dL`f^r8>3Y{+
zyPLuZ761FHAQXS*s#1y&Cm|=`zub*r)vqXkioCZ^CSH@bPOTQPf}OIWtx%4is3RqS
zTQ?^ou7SZ$p*Q3}FHK6rYm-1D481?X!Vx@Tgxx3ZysG(`!fNz$xu+ta0Raf$A<#9u
z{}?lzf|hx$K_6MZ_b*p)BF|$fxdUDXK>$f?Xh~);AaVTcnOA}-7WsyyD5Le=n2#{$
z-UEfajJRA3D;1h&5=zF<bZzhn{{4?Dt;#jiDI-8nWJcFHo2qveP{J?#HO0<??72|i
zPEHWUmgbNJu42Vt3IR15x{@OEV>O_k1O)qVgh;N;kpS+o07}R>5|}TMeH#`Bj`1G0
zhX}Fl){=L%bSb~zkFh2JSQF}a;A*LzpYgx|AJbYyB;osABX5a2xYZF=>@O-!0ZZp#
zNL)&W-9{55UHZMbQ5H6|`+m^0c-~wq+w1nOn>$N!u|0uD9H5eJ;3jv%z|KM=T)DfE
zAJJEp)h;}%>=?<4`G`?!AwAeXYI<acFNY8E@JmDk+UY`3v7t2S2}Mh<hG2+*2T#yF
zd-xtvn38<Ql{CaJkn_=h?VkZoi`B1fn&)*#Eu@(!)J79|VlLWIL!rgpYwfE#y7P|~
zx>_(Pyj=sOb<N%X@zL`qveCZ(M8ASK<J*vN8-trlB2c<juY7Np09vnL74~4d)s0)x
zhQ7$dZ}PtYQv6sEaEKq+SB8`cO8<_S2(%ghTC((p!~RR?Nc=kz$i>fTgzmSg)5#({
zw)X)9c;$yOxZ}k=MJ}J2U;(rZ=#)VHnk0`&9gt5>GnbMQ57EsQ5QJI{WsbvEITmH+
zb57{sjxAyz@ccOiQ1oDhiS>@~29x1k3UE`aqQd|vj1Ipg<XJ!VW#h&?b#pD<>Yg{o
z!($;m0%{CRMu<W9js<|sO-MbD-J6WdcaP|QqJw!Y2yA@mt}xbYVpQo}Xh`FV<x7~2
zwwwmQOwEPut<LI*9IdKT?J$1bxAl?P8X>0DS5th1Q7Q=Xo^?f@B_83yG^PDNXtzli
zb9XA_jLAk2eJ=%+C#?=AKA1p!>?8L3#hVO9)2<h6SfmFH&<w-CS7acsWQ{ujE&v=P
zlGSpBrT-!gZW*!nP$F{l*iQ8Yd~6z056i$-wTlXw=K4;ERt+5Z_QDuy)m&@%kS_{T
zpWMcBl3(I+HYLhAD;B?lWu;Hd8^#Y<1sL-_3TQ}6fi=?Zn4*~(A`jmt0Zw|*p+9<*
zx%9{At;Os_P_`SUnv}#EVR}5Rps@<bJ`K|T1DuJhcM4$)*;q#unEay?5^O7-EF?!J
z76%`V&o~2XX5W#dXQsYEA74ieE=2CfGE1%KPa-ng%-})U7AIa@)XNEgUOddbAw;FH
zT;xC%Z5W{67tCS;X{ryU1g4n4jeK<BL(FRXswPq~C{g?AQ=BKjLwXey@oB%7Ld6+z
zzl8C>hPV{@UcB3T-1w0VzJEm@D2!3*v!G?40KY$NV<wTSl}oj8KTa44MX%#^wDDUb
z81d^bk`Pt2wJpHpVK%$W0%2)=A9ZiY!ds*;pof$BJ$+rceTD66wQvGxXddbpHXU)X
z4|jtqx>VZsqY07)0eA!6ZnSd!`q%Jh(s3k6j-wg)1P3T}T0?qeqMP!g&k_6)kDm-s
z!oZ8bQ2Y7^Tmd)G8o8X5^ELy0K~A<6tl)a65;P}~_FoAi873A&+l}kNJXR7(J6SSU
zS_QM`30tGi!aZ{+Tpka<$B%*VjCh#c1(cdV0uP!!)Ve1K2z?5k6&Osw+2Q+;1&jEf
zi6;{8%*>_B#4zt)MkoOqLR+6YtJO5;$$*b!WTc-1%%d?Sw5edtz=EYL=;y0ql~~1e
z{qM8@w9O&WiiktFf-$ytBUR0#AtVD@v^JMTLx>RNQD8jr<X!jhto-shyHNSYlZPq*
zXAbL!7ORHa5Klg2>3ziu$9?Fd?am75$r3W@_)AT88}bG2W4YCesX=lmp4|usj4J3D
zni=8h_QU~b3FD;LQ&KeLr|m&Hc^E$(ZZm@84(X&)pdrg?k*>G!nOZjw{Ur$uVE<yh
zcY{=}Jhe&C!4hF%0O?VMf82TgS+wl183clla)bSmZccFeeYJ;7FVQdoW+S(z?VRA}
zF%J5-MRKC)mjNf)(6#vD;^!=>c^+$!X9*MopMYYZuoSXj|0@iz41td)$A7u``*)yD
zzIQWP?GjcV{LctEh{uRqtt4(iHj)a8L>o^#?mI%oB15T|yYbS<C)1sb;z=W6lgNIy
zS7>9eYoYi$d4f$hn2omca3uNo8%BS$0mzcWPxK-Da=sr$KYmFd@*9U2-F%r0L)jyD
zHEs-#9J)63g)p=o80%J58A1BnK8>mm8Vc>bN@89HLdk|Ae4F#-I*G$IO6e1|xbk43
z0BTPH2xDGgho)wlp=%c=mH%kii%`6i))Wimh}^&O@+HC?;lsR&=fD648fVxsDS!=1
z$ozbeKxk-;U-^tawxb&AdkR3ckN)?IhOjMzy)8zt#5_6Rl_s*!0R{<_O7X-Qj{?(k
zQlO2(m!_CTV-h})X6teLD?7!9U6mWu1`DGN8E1hLtH8hFYGJ*3sjTC5A1J`cIMIdv
zx*iY_-{kE6C9U7EX|8Qm{)LGF^opp6i$;ym*_%t=#J-8k8IPxcwap>z$Xo%n#k)u!
zMbJQ@8R|PQOST|^M7Kqi@4uf7aqS`tUk}Z>kLE`9a3HQSaZ8i_WiX12wgJAgiGDyi
z3$VXv3}iUB(O;OfL3+?^p#;*yc6I7Z@;?eA!dG!J5Tf)$jvzvYPjM*9rLfnJfcJ0!
zM{-`}GER7UYB^U^K59iLMkUb+6p0TI@X9j?RyBz89~ET<?=WBXntTo1`(G-|!rcv3
zg5(@08@)V+JO^4g=#sr^o#MjM%Jkn%<vuX8I*JzjVt#yF2-KtZeL+!Z0M~M0o#IPX
zMLtP?$`wj0CZjwIARlP2SAKA8BqZMXIwb9TPG5jdCFt&x^NTB|w!aJN!lP~>9ru;c
zh)pNg2#WYc*5~0hzU#hl0)a)m|Mlf9@HQ2MAEGM0j2%S3&x`ywk#%8Nx&DM5G<ZFK
z?@b1}gN_h~Ov>4lq)O!csVqP_w9vmh<BwH*2>~iH)B?0+|NWnjc$ZZt!^F3_029MU
z8NvS_PgfZhWfyG`hVBlD0qGP4L2>{=Lb|)9q`Mmgq$H)gTe`cuySuyNzWCjHf5OAV
zymRK9eb!#FXHJie8Hch^_6lRD&-1{hAE(e>QQR9mssmk3K%xpm6#`bv-)F#K&2z~~
z0$c<HSiOZ!)o?bxQvbhOH+r^6s7PSi3tOfGMF%LnFlrdjHGn4ADG~zU(mNRBK9=+R
zeUi?!0#O^%e{MBZDBuD#Dmw+V8enmLLTr$M3dV#323e~E3jiP<01}*9{Qe2CZ6>Qk
z@+Dw1>IN)`niOT2AcasTwLQb^a)~QxKn4YH@>g);)6Oge<+3KT>z~!4UicNCBV>50
zd|Lucp#dM2y&*IRDt#k(0v?k8`_Kl^eMGcJ1mA1k|L@h`3L1y|2rvK-NGzlg+utC+
zFnzZN<0pgwTVX{)xVnn6X_C$BHjM{Jv3mvvhWIDxuwU<9AHdG%m46V7K>meMS!?<g
zMUB|31mr!9)f>u5om^b3hxFPu>coK>3lbe7?0{qJ-pPz<!}*GQVzGMDsVWxA@KHoV
zfW1=bw5@>&T}-~}?Ou&=4*9>6EDCB2F_;(o5F`NG;6HUg-Aa`?Jteda9{m9A9NDUe
zVbLK`py3U?FqSJbGEkfeVBZ*4)%0D7F26qBpfBJALO;C_0myLhV+W6@va^)ZR$*3O
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

literal 0
HcmV?d00001

diff --git a/app/code/Magento/MediaGallerySynchronization/composer.json b/app/code/Magento/MediaGallerySynchronization/composer.json
new file mode 100644
index 0000000000000..e1d4962366978
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/composer.json
@@ -0,0 +1,25 @@
+{
+    "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": "*",
+        "magento/module-media-gallery-metadata-api": "*"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\MediaGallerySynchronization\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGallerySynchronization/etc/communication.xml b/app/code/Magento/MediaGallerySynchronization/etc/communication.xml
new file mode 100644
index 0000000000000..ba5ae5fc9f9bc
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/etc/communication.xml
@@ -0,0 +1,14 @@
+<?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:Communication/etc/communication.xsd">
+    <topic name="media.gallery.synchronization" is_synchronous="false" request="string[]">
+        <handler name="media.gallery.synchronization.handler"
+                 type="Magento\MediaGallerySynchronization\Model\Consume" method="execute"/>
+    </topic>
+</config>
diff --git a/app/code/Magento/MediaGallerySynchronization/etc/di.xml b/app/code/Magento/MediaGallerySynchronization/etc/di.xml
new file mode 100644
index 0000000000000..c19d53deb1b5f
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/etc/di.xml
@@ -0,0 +1,54 @@
+<?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">
+    <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\GetContentHashInterface" type="Magento\MediaGallerySynchronization\Model\GetContentHash"/>
+    <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>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\MediaGallerySynchronizationApi\Model\SynchronizerPool">
+        <arguments>
+            <argument name="synchronizers" xsi:type="array">
+                <item name="media_gallery_asset_synchronizer" xsi:type="object">Magento\MediaGallerySynchronization\Model\SynchronizeFiles</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\MediaGallerySynchronization\Model\FetchMediaStorageFileBatches">
+        <arguments>
+            <argument name="batchSize" xsi:type="number">100</argument>
+            <argument name="fileExtensions" xsi:type="array">
+                <item name="jpg" xsi:type="string">jpg</item>
+                <item name="jpeg" xsi:type="string">jpeg</item>
+                <item name="gif" xsi:type="string">gif</item>
+                <item name="png" xsi:type="string">png</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\MediaGallerySynchronization\Model\FetchBatches">
+        <arguments>
+            <argument name="pageSize" xsi:type="number">100</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Console\CommandListInterface">
+        <arguments>
+            <argument name="commands" xsi:type="array">
+                <item name="mediaGallerySynchronization" xsi:type="object">Magento\MediaGallerySynchronization\Console\Command\Synchronize</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\App\Config\Value">
+        <plugin name="admin_system_config_adobe_stock_save_plugin" type="Magento\MediaGallerySynchronization\Plugin\MediaGallerySyncTrigger"/>
+    </type>
+</config>
diff --git a/app/code/Magento/MediaGallerySynchronization/etc/module.xml b/app/code/Magento/MediaGallerySynchronization/etc/module.xml
new file mode 100644
index 0000000000000..496f6aa0233a5
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/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_MediaGallerySynchronization" />
+</config>
diff --git a/app/code/Magento/MediaGallerySynchronization/etc/queue_consumer.xml b/app/code/Magento/MediaGallerySynchronization/etc/queue_consumer.xml
new file mode 100644
index 0000000000000..4471d68fd8c47
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/etc/queue_consumer.xml
@@ -0,0 +1,11 @@
+<?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-message-queue:etc/consumer.xsd">
+    <consumer name="media.gallery.synchronization" queue="media.gallery.synchronization"
+              connection="db" handler="Magento\MediaGallerySynchronization\Model\Consume::execute"/>
+</config>
diff --git a/app/code/Magento/MediaGallerySynchronization/etc/queue_publisher.xml b/app/code/Magento/MediaGallerySynchronization/etc/queue_publisher.xml
new file mode 100644
index 0000000000000..1a7cb04847c4a
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/etc/queue_publisher.xml
@@ -0,0 +1,12 @@
+<!--
+/**
+ * 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-message-queue:etc/publisher.xsd">
+    <publisher topic="media.gallery.synchronization">
+        <connection name="db" exchange="magento-db" disabled="false" />
+    </publisher>
+</config>
diff --git a/app/code/Magento/MediaGallerySynchronization/etc/queue_topology.xml b/app/code/Magento/MediaGallerySynchronization/etc/queue_topology.xml
new file mode 100644
index 0000000000000..81baefbfc53dc
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/etc/queue_topology.xml
@@ -0,0 +1,14 @@
+<?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-message-queue:etc/topology.xsd">
+    <exchange name="magento-db" type="topic" connection="db">
+        <binding id="MediaGallerySynchronization" topic="media.gallery.synchronization"
+                 destinationType="queue" destination="media.gallery.synchronization"/>
+    </exchange>
+</config>
diff --git a/app/code/Magento/MediaGallerySynchronization/registration.php b/app/code/Magento/MediaGallerySynchronization/registration.php
new file mode 100644
index 0000000000000..9e5f42b14c985
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/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_MediaGallerySynchronization',
+    __DIR__
+);
diff --git a/app/code/Magento/MediaGallerySynchronizationApi/Api/SynchronizeFilesInterface.php b/app/code/Magento/MediaGallerySynchronizationApi/Api/SynchronizeFilesInterface.php
new file mode 100644
index 0000000000000..de5b00f99e059
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronizationApi/Api/SynchronizeFilesInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallerySynchronizationApi\Api;
+
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * Synchronize assets from the provided files information to database
+ */
+interface SynchronizeFilesInterface
+{
+    /**
+     * Create media gallery assets based on files information and save them to database
+     *
+     * @param string[] $paths
+     * @throws LocalizedException
+     */
+    public function execute(array $paths): void;
+}
diff --git a/app/code/Magento/MediaGallerySynchronizationApi/Api/SynchronizeInterface.php b/app/code/Magento/MediaGallerySynchronizationApi/Api/SynchronizeInterface.php
new file mode 100644
index 0000000000000..0b49780bd7590
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronizationApi/Api/SynchronizeInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallerySynchronizationApi\Api;
+
+/**
+ * Synchronize assets from the media storage to database
+ */
+interface SynchronizeInterface
+{
+    /**
+     * Synchronize assets from the media storage to database
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function execute(): void;
+}
diff --git a/app/code/Magento/MediaGallerySynchronizationApi/LICENSE.txt b/app/code/Magento/MediaGallerySynchronizationApi/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronizationApi/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/MediaGallerySynchronizationApi/LICENSE_AFL.txt b/app/code/Magento/MediaGallerySynchronizationApi/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronizationApi/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/MediaGallerySynchronizationApi/Model/FetchBatchesInterface.php b/app/code/Magento/MediaGallerySynchronizationApi/Model/FetchBatchesInterface.php
new file mode 100644
index 0000000000000..42cd8265d5087
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronizationApi/Model/FetchBatchesInterface.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;
+
+/**
+ * Fetch data from database in batches
+ */
+interface FetchBatchesInterface
+{
+    /**
+     * Fetch the columns from the database table in batches
+     * $modificationDateColumn contains the entities which were changed since last execution
+     * to avoid fetching items that have been previously synchronized
+     *
+     * @param string $tableName
+     * @param array $columns
+     * @param string|null $modificationDateColumn
+     * @return \Traversable
+     */
+    public function execute(string $tableName, array $columns, ?string $modificationDateColumn): \Traversable;
+}
diff --git a/app/code/Magento/MediaGallerySynchronizationApi/Model/GetContentHashInterface.php b/app/code/Magento/MediaGallerySynchronizationApi/Model/GetContentHashInterface.php
new file mode 100644
index 0000000000000..8ca56d8e779d1
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronizationApi/Model/GetContentHashInterface.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallerySynchronizationApi\Model;
+
+/**
+ * Get hashed value of image content.
+ */
+interface GetContentHashInterface
+{
+    /**
+     * Get hashed value of image content.
+     *
+     * @param string $content
+     * @return string
+     */
+    public function execute(string $content): string;
+}
diff --git a/app/code/Magento/MediaGallerySynchronizationApi/Model/ImportFilesComposite.php b/app/code/Magento/MediaGallerySynchronizationApi/Model/ImportFilesComposite.php
new file mode 100644
index 0000000000000..8e5df842d8a55
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronizationApi/Model/ImportFilesComposite.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallerySynchronizationApi\Model;
+
+/**
+ * File save pool
+ */
+class ImportFilesComposite implements ImportFilesInterface
+{
+    /**
+     * @var ImportFilesInterface[]
+     */
+    private $importers;
+
+    /**
+     * @param ImportFilesInterface[] $importers
+     */
+    public function __construct(array $importers)
+    {
+        ksort($importers);
+        $this->importers = $importers;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(array $paths): void
+    {
+        foreach ($this->importers as $importer) {
+            $importer->execute($paths);
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGallerySynchronizationApi/Model/ImportFilesInterface.php b/app/code/Magento/MediaGallerySynchronizationApi/Model/ImportFilesInterface.php
new file mode 100644
index 0000000000000..40e5947d3a11d
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronizationApi/Model/ImportFilesInterface.php
@@ -0,0 +1,25 @@
+<?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\LocalizedException;
+
+/**
+ * Save media files data
+ */
+interface ImportFilesInterface
+{
+    /**
+     * Save media files data
+     *
+     * @param string[] $paths
+     * @throws LocalizedException
+     */
+    public function execute(array $paths): void;
+}
diff --git a/app/code/Magento/MediaGallerySynchronizationApi/Model/SynchronizerPool.php b/app/code/Magento/MediaGallerySynchronizationApi/Model/SynchronizerPool.php
new file mode 100644
index 0000000000000..1294a4f7679f1
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronizationApi/Model/SynchronizerPool.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallerySynchronizationApi\Model;
+
+use Magento\MediaGallerySynchronizationApi\Api\SynchronizeFilesInterface;
+
+/**
+ * A pool of Media storage to database synchronizers
+ * @see SynchronizeFilesInterface
+ */
+class SynchronizerPool
+{
+    /**
+     * Media storage to database synchronizers
+     *
+     * @var SynchronizeFilesInterface[]
+     */
+    private $synchronizers;
+
+    /**
+     * @param SynchronizeFilesInterface[] $synchronizers
+     */
+    public function __construct(array $synchronizers = [])
+    {
+        foreach ($synchronizers as $name => $synchronizer) {
+            if (!$synchronizer instanceof SynchronizeFilesInterface) {
+                throw new \InvalidArgumentException(sprintf(
+                    'Synchronizer %s must implement %s.',
+                    $name,
+                    SynchronizeFilesInterface::class
+                ));
+            }
+        }
+        $this->synchronizers = $synchronizers;
+    }
+
+    /**
+     * Get all synchronizers from the pool
+     *
+     * @return SynchronizeFilesInterface[]
+     */
+    public function get(): array
+    {
+        return $this->synchronizers;
+    }
+}
diff --git a/app/code/Magento/MediaGallerySynchronizationApi/README.md b/app/code/Magento/MediaGallerySynchronizationApi/README.md
new file mode 100644
index 0000000000000..1a12883413920
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronizationApi/README.md
@@ -0,0 +1,13 @@
+# Magento_MediaGallerySynchronizationApi module
+
+The Magento_MediaGallerySynchronizationApi module is responsible for the media gallery data synchronization implementation API.
+
+## Extensibility
+
+Extension developers can interact with the Magento_MediaGallerySynchronizationApi module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
+
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_MediaGallerySynchronizationApi module.
+
+## Additional information
+
+For information about significant changes in patch releases, see [2.3.x Release information](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html).
diff --git a/app/code/Magento/MediaGallerySynchronizationApi/composer.json b/app/code/Magento/MediaGallerySynchronizationApi/composer.json
new file mode 100644
index 0000000000000..427bd2bd4aca7
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronizationApi/composer.json
@@ -0,0 +1,21 @@
+{
+    "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": "*"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\MediaGallerySynchronizationApi\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGallerySynchronizationApi/etc/di.xml b/app/code/Magento/MediaGallerySynchronizationApi/etc/di.xml
new file mode 100644
index 0000000000000..5cf3b424539bd
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronizationApi/etc/di.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:ObjectManager/etc/config.xsd">
+    <preference for="Magento\MediaGallerySynchronizationApi\Model\ImportFilesInterface" type="Magento\MediaGallerySynchronizationApi\Model\ImportFilesComposite"/>
+</config>
diff --git a/app/code/Magento/MediaGallerySynchronizationApi/etc/module.xml b/app/code/Magento/MediaGallerySynchronizationApi/etc/module.xml
new file mode 100644
index 0000000000000..48736124400c9
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronizationApi/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_MediaGallerySynchronizationApi" />
+</config>
diff --git a/app/code/Magento/MediaGallerySynchronizationApi/registration.php b/app/code/Magento/MediaGallerySynchronizationApi/registration.php
new file mode 100644
index 0000000000000..542a46d02dd33
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronizationApi/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_MediaGallerySynchronizationApi',
+    __DIR__
+);

From 812d9433abac42084235c6f725edd5c4a304df6a Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Fri, 31 Jul 2020 15:34:11 +0300
Subject: [PATCH 1183/1718] resolve conflict, link check added

---
 ...roductToCartFromWishlistUsingSidebarActionGroup.xml |  1 +
 .../Wishlist/Test/Unit/Controller/Index/CartTest.php   | 10 ++--------
 .../Magento/Wishlist/Controller/Index/CartTest.php     |  3 ++-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerAddProductToCartFromWishlistUsingSidebarActionGroup.xml b/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerAddProductToCartFromWishlistUsingSidebarActionGroup.xml
index a28a80c57fb67..512ffdd9ba442 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerAddProductToCartFromWishlistUsingSidebarActionGroup.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerAddProductToCartFromWishlistUsingSidebarActionGroup.xml
@@ -19,5 +19,6 @@
         <click selector="{{StorefrontCustomerWishlistSidebarSection.ProductAddToCartByName(product.name)}}" stepKey="AddProductToCartFromWishlistUsingSidebarClickAddToCartFromWishlist"/>
         <waitForElement selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="AddProductToCartFromWishlistUsingSidebarWaitForSuccessMessage"/>
         <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added {{product.name}} to your shopping cart." stepKey="AddProductToCartFromWishlistUsingSidebarSeeProductNameAddedToCartFromWishlist"/>
+        <seeLink userInput="shopping cart" stepKey="seeLinkInSuccessMsg"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/CartTest.php b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/CartTest.php
index 58d888d8ccb6e..47bb930cde3b9 100644
--- a/app/code/Magento/Wishlist/Test/Unit/Controller/Index/CartTest.php
+++ b/app/code/Magento/Wishlist/Test/Unit/Controller/Index/CartTest.php
@@ -10,8 +10,8 @@
 use Magento\Catalog\Helper\Product as ProductHelper;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Exception as ProductException;
-use Magento\Checkout\Model\Cart as CheckoutCart;
 use Magento\Checkout\Helper\Cart as CartHelper;
+use Magento\Checkout\Model\Cart as CheckoutCart;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\Response\RedirectInterface;
@@ -620,14 +620,8 @@ protected function prepareExecuteWithQuantityArray($isAjax = false)
             ->method('getName')
             ->willReturn($productName);
 
-        $this->escaperMock->expects($this->once())
-            ->method('escapeHtml')
-            ->with($productName, null)
-            ->willReturn($productName);
-
         $this->messageManagerMock->expects($this->once())
-            ->method('addSuccessMessage')
-            ->with('You added ' . $productName . ' to your shopping cart.', null)
+            ->method('addComplexSuccessMessage')
             ->willReturnSelf();
 
         $this->cartHelperMock->expects($this->once())
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/CartTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/CartTest.php
index 29849d5e80aca..a7ab5115043f7 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/CartTest.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/CartTest.php
@@ -69,7 +69,8 @@ public function testAddSimpleProductToCart(): void
         $item = $this->getWishlistByCustomerId->getItemBySku(1, 'simple-1');
         $this->assertNotNull($item);
         $this->performAddToCartRequest(['item' => $item->getId(), 'qty' => 3]);
-        $message = sprintf('You added %s to your shopping cart.', $item->getName());
+        $message = sprintf("\n" . 'You added %s to your ' .
+            '<a href="http://localhost/index.php/checkout/cart/">shopping cart</a>.', $item->getName());
         $this->assertSessionMessages($this->equalTo([(string)__($message)]), MessageInterface::TYPE_SUCCESS);
         $this->assertCount(0, $this->getWishlistByCustomerId->execute(1)->getItemCollection());
         $cart = $this->cartFactory->create();

From ee54b5c4d2d559aa4a91e50ed6ae0e4f96e22035 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 3 Aug 2020 14:43:31 +0300
Subject: [PATCH 1184/1718] Fix urlFilterApplier for filter values as array

---
 .../Ui/view/base/web/js/grid/url-filter-applier.js        | 3 +++
 .../Magento/Ui/base/js/grid/url-filter-applier.test.js    | 8 ++++++++
 2 files changed, 11 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 83220028a72df..4129454fd7845 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
@@ -66,6 +66,9 @@ define([
                     if (item && item.search(this.filterKey) !== -1) {
                         itemArray = item.split('=');
 
+                        if (itemArray[1].search('\\[') === 0) {
+                            itemArray[1] = itemArray[1].replace(/[\[\]]/g, '').split(',');
+                        }
                         itemArray[0] = itemArray[0].replace(this.filterKey, '')
                                 .replace(/[\[\]]/g, '');
 
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 fb37c73abdd41..a3d49e382de51 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
@@ -45,6 +45,14 @@ define([
                     'qty': '1'
                 });
             });
+            it('return object from url with multiple filters parameter and filter value as array', function () {
+                var urlSearch = '?filters[name]=[27,23]&filters[qty]=1&anotherparam=1';
+
+                expect(urlFilterApplierObj.getFilterParam(urlSearch)).toEqual({
+                    'name': ['27', '23'],
+                    'qty': '1'
+                });
+            });
             it('return object from url with another parameter', function () {
                 var urlSearch = '?anotherparam=1';
 

From a880a9aaddf0942bf749aeb6d48184afdfb099cb Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Mon, 3 Aug 2020 16:04:38 +0300
Subject: [PATCH 1185/1718] MC-36260: Unexpected cursor position in the comment
 textarea

---
 .../adminhtml/templates/order/invoice/create/items.phtml  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
index 2099ef64b76fa..37805a68a603f 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
@@ -76,9 +76,11 @@
                         <span><?= $block->escapeHtml(__('Invoice Comments')) ?></span>
                     </label>
                     <div class="admin__field-control">
-                        <textarea id="invoice_comment_text" name="invoice[comment_text]" class="admin__control-textarea"
-                                  rows="3" cols="5"><?= $block->escapeHtml($block->getInvoice()->getCommentText())
-                                    ?></textarea>
+                        <textarea id="invoice_comment_text"
+                                  name="invoice[comment_text]"
+                                  class="admin__control-textarea"
+                                  rows="3"
+                                  cols="5"><?= $block->escapeHtml($block->getInvoice()->getCommentText())?></textarea>
                     </div>
                 </div>
             </div>

From eb7d819cd29c05a58c7a13017665af8c1c15e3f2 Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Fri, 31 Jul 2020 13:11:25 +0300
Subject: [PATCH 1186/1718] Refactoring

---
 .../Observer/AfterAddressSaveObserver.php     |  7 ++-
 .../Observer/AfterAddressSaveObserverTest.php | 39 +++---------
 .../Downloadable/Product/Edit/Link.php        | 33 ++++++----
 .../Downloadable/Product/Edit/Sample.php      | 19 ++++--
 .../Downloadable/Product/Edit/SampleTest.php  |  2 +
 .../Controller/Adminhtml/Import/Download.php  | 55 ++++++++++-------
 .../Controller/Adminhtml/Import/Validate.php  | 22 ++++---
 .../Adminhtml/Integration/TokensExchange.php  |  5 +-
 .../Adminhtml/Integration/SaveTest.php        |  4 +-
 .../Multishipping/Controller/Checkout.php     | 61 ++++++++-----------
 .../Controller/Checkout/AddressesPost.php     |  6 +-
 .../Controller/Checkout/Overview.php          |  7 ++-
 .../Controller/Checkout/OverviewPost.php      | 41 +++++++------
 .../Controller/Checkout/ShippingPost.php      |  8 ++-
 .../Model/Observer/CheckConfig.php            |  7 +--
 .../Adminhtml/Subscriber/MassUnsubscribe.php  | 13 ++--
 .../Controller/Adminhtml/Template/Delete.php  |  8 ++-
 17 files changed, 188 insertions(+), 149 deletions(-)

diff --git a/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php b/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php
index dfcfb8c7008f8..fd5004ae0548f 100644
--- a/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php
+++ b/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Customer\Observer;
 
@@ -17,6 +18,7 @@
 use Magento\Framework\App\State as AppState;
 use Magento\Framework\DataObject;
 use Magento\Framework\Escaper;
+use Magento\Framework\Event\Observer;
 use Magento\Framework\Event\ObserverInterface;
 use Magento\Framework\Message\ManagerInterface;
 use Magento\Framework\Registry;
@@ -25,6 +27,7 @@
 /**
  * Customer Observer Model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class AfterAddressSaveObserver implements ObserverInterface
 {
@@ -114,11 +117,11 @@ public function __construct(
     /**
      * Address after save event handler
      *
-     * @param \Magento\Framework\Event\Observer $observer
+     * @param Observer $observer
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    public function execute(\Magento\Framework\Event\Observer $observer)
+    public function execute(Observer $observer)
     {
         /** @var $customerAddress Address */
         $customerAddress = $observer->getCustomerAddress();
diff --git a/app/code/Magento/Customer/Test/Unit/Observer/AfterAddressSaveObserverTest.php b/app/code/Magento/Customer/Test/Unit/Observer/AfterAddressSaveObserverTest.php
index e804dfb485491..f72cbbc281e90 100644
--- a/app/code/Magento/Customer/Test/Unit/Observer/AfterAddressSaveObserverTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Observer/AfterAddressSaveObserverTest.php
@@ -80,29 +80,23 @@ class AfterAddressSaveObserverTest extends TestCase
     protected $appState;
 
     /**
-     * @var Customer|MockObject
+     * @var Session|MockObject
      */
-    protected $customerMock;
+    protected $customerSessionMock;
 
     /**
-     * @var Session|MockObject
+     * @var GroupInterface|MockObject
      */
-    protected $customerSessionMock;
+    protected $group;
 
     protected function setUp(): void
     {
-        $this->vat = $this->getMockBuilder(Vat::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->helperAddress = $this->getMockBuilder(\Magento\Customer\Helper\Address::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->registry = $this->getMockBuilder(Registry::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
+        $this->vat = $this->createMock(Vat::class);
+        $this->helperAddress = $this->createMock(HelperAddress::class);
+        $this->registry = $this->createMock(Registry::class);
+        $this->escaper = $this->createMock(Escaper::class);
+        $this->appState = $this->createMock(AppState::class);
+        $this->customerSessionMock = $this->createMock(Session::class);
         $this->group = $this->getMockBuilder(GroupInterface::class)
             ->setMethods(['getId'])
             ->getMockForAbstractClass();
@@ -114,22 +108,9 @@ protected function setUp(): void
 
         $this->scopeConfig = $this->getMockBuilder(ScopeConfigInterface::class)
             ->getMockForAbstractClass();
-
         $this->messageManager = $this->getMockBuilder(ManagerInterface::class)
             ->getMockForAbstractClass();
 
-        $this->escaper = $this->getMockBuilder(Escaper::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->appState = $this->getMockBuilder(\Magento\Framework\App\State::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->customerSessionMock = $this->getMockBuilder(Session::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
         $this->model = new AfterAddressSaveObserver(
             $this->vat,
             $this->helperAddress,
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Link.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Link.php
index b30bea1fc77b4..1b53afc520731 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Link.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Link.php
@@ -4,27 +4,36 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit;
 
+use Magento\Catalog\Controller\Adminhtml\Product\Edit as ProductEdit;
 use Magento\Downloadable\Helper\Download as DownloadHelper;
+use Magento\Downloadable\Helper\File;
+use Magento\Downloadable\Model\Link as ModelLink;
 use Magento\Framework\App\Response\Http as HttpResponse;
 
-class Link extends \Magento\Catalog\Controller\Adminhtml\Product\Edit
+class Link extends ProductEdit
 {
     /**
-     * @return \Magento\Downloadable\Model\Link
+     * Create link
+     *
+     * @return ModelLink
      */
     protected function _createLink()
     {
-        return $this->_objectManager->create(\Magento\Downloadable\Model\Link::class);
+        return $this->_objectManager->create(ModelLink::class);
     }
 
     /**
-     * @return \Magento\Downloadable\Model\Link
+     * Get link
+     *
+     * @return ModelLink
      */
     protected function _getLink()
     {
-        return $this->_objectManager->get(\Magento\Downloadable\Model\Link::class);
+        return $this->_objectManager->get(ModelLink::class);
     }
 
     /**
@@ -34,10 +43,10 @@ protected function _getLink()
      * @param string $resourceType
      * @return void
      */
-    protected function _processDownload($resource, $resourceType)
+    protected function _processDownload(string $resource, string $resourceType)
     {
-        /* @var $helper \Magento\Downloadable\Helper\Download */
-        $helper = $this->_objectManager->get(\Magento\Downloadable\Helper\Download::class);
+        /* @var $helper DownloadHelper */
+        $helper = $this->_objectManager->get(DownloadHelper::class);
         $helper->setResource($resource, $resourceType);
 
         $fileName = $helper->getFilename();
@@ -77,7 +86,7 @@ protected function _processDownload($resource, $resourceType)
         //Rendering
         $response->clearBody();
         $response->sendHeaders();
-        
+
         $helper->output();
     }
 
@@ -90,7 +99,7 @@ public function execute()
     {
         $linkId = $this->getRequest()->getParam('id', 0);
         $type = $this->getRequest()->getParam('type', 0);
-        /** @var \Magento\Downloadable\Model\Link $link */
+        /** @var ModelLink $link */
         $link = $this->_createLink()->load($linkId);
         if ($link->getId()) {
             $resource = '';
@@ -101,7 +110,7 @@ public function execute()
                     $resourceType = DownloadHelper::LINK_TYPE_URL;
                 } elseif ($link->getLinkType() == DownloadHelper::LINK_TYPE_FILE) {
                     $resource = $this->_objectManager->get(
-                        \Magento\Downloadable\Helper\File::class
+                        File::class
                     )->getFilePath(
                         $this->_getLink()->getBasePath(),
                         $link->getLinkFile()
@@ -114,7 +123,7 @@ public function execute()
                     $resourceType = DownloadHelper::LINK_TYPE_URL;
                 } elseif ($link->getSampleType() == DownloadHelper::LINK_TYPE_FILE) {
                     $resource = $this->_objectManager->get(
-                        \Magento\Downloadable\Helper\File::class
+                        File::class
                     )->getFilePath(
                         $this->_getLink()->getBaseSamplePath(),
                         $link->getSampleFile()
diff --git a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Sample.php b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Sample.php
index 2bd5d3981a749..84bd21904ea18 100644
--- a/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Sample.php
+++ b/app/code/Magento/Downloadable/Controller/Adminhtml/Downloadable/Product/Edit/Sample.php
@@ -4,26 +4,33 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit;
 
 use Magento\Downloadable\Helper\Download as DownloadHelper;
+use Magento\Downloadable\Model\Sample as ModelSample;
 
-class Sample extends \Magento\Downloadable\Controller\Adminhtml\Downloadable\Product\Edit\Link
+class Sample extends Link
 {
     /**
-     * @return \Magento\Downloadable\Model\Sample
+     * Create link
+     *
+     * @return ModelSample
      */
     protected function _createLink()
     {
-        return $this->_objectManager->create(\Magento\Downloadable\Model\Sample::class);
+        return $this->_objectManager->create(ModelSample::class);
     }
 
     /**
-     * @return \Magento\Downloadable\Model\Sample
+     * Get link
+     *
+     * @return ModelSample
      */
     protected function _getLink()
     {
-        return $this->_objectManager->get(\Magento\Downloadable\Model\Sample::class);
+        return $this->_objectManager->get(ModelSample::class);
     }
 
     /**
@@ -34,7 +41,7 @@ protected function _getLink()
     public function execute()
     {
         $sampleId = $this->getRequest()->getParam('id', 0);
-        /** @var \Magento\Downloadable\Model\Sample $sample */
+        /** @var ModelSample $sample */
         $sample = $this->_createLink()->load($sampleId);
         if ($sample->getId()) {
             $resource = '';
diff --git a/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Downloadable/Product/Edit/SampleTest.php b/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Downloadable/Product/Edit/SampleTest.php
index 193b001f305b2..31cba7b601eec 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Downloadable/Product/Edit/SampleTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Controller/Adminhtml/Downloadable/Product/Edit/SampleTest.php
@@ -184,6 +184,8 @@ public function testExecuteUrl()
             ->willReturn('1');
         $this->sampleModel->expects($this->any())->method('getSampleType')
             ->willReturn('url');
+        $this->sampleModel->expects($this->once())->method('getSampleUrl')
+            ->willReturn('http://example.com/simple.jpg');
         $this->objectManager->expects($this->once())->method('create')
             ->willReturn($this->sampleModel);
 
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php
index 241c377860d75..9918ef8908956 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php
@@ -3,62 +3,71 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\ImportExport\Controller\Adminhtml\Import;
 
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\Response\Http\FileFactory;
 use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Controller\Result\Raw;
+use Magento\Framework\Controller\Result\RawFactory;
 use Magento\Framework\Controller\Result\Redirect;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Filesystem\Directory\ReadFactory;
 use Magento\ImportExport\Controller\Adminhtml\Import as ImportController;
+use Magento\ImportExport\Model\Import\SampleFileProvider;
 
 /**
  * Download sample file controller
  */
-class Download extends ImportController
+class Download extends ImportController implements HttpGetActionInterface
 {
     const SAMPLE_FILES_MODULE = 'Magento_ImportExport';
 
     /**
-     * @var \Magento\Framework\Controller\Result\RawFactory
+     * @var RawFactory
      */
     protected $resultRawFactory;
 
     /**
-     * @var \Magento\Framework\Filesystem\Directory\ReadFactory
+     * @var ReadFactory
      */
     protected $readFactory;
 
     /**
-     * @var \Magento\Framework\Component\ComponentRegistrar
+     * @var ComponentRegistrar
      */
     protected $componentRegistrar;
 
     /**
-     * @var \Magento\Framework\App\Response\Http\FileFactory
+     * @var FileFactory
      */
     protected $fileFactory;
 
     /**
-     * @var \Magento\ImportExport\Model\Import\SampleFileProvider
+     * @var SampleFileProvider
      */
     private $sampleFileProvider;
 
     /**
-     * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
-     * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
-     * @param \Magento\Framework\Filesystem\Directory\ReadFactory $readFactory
-     * @param \Magento\ImportExport\Model\Import\SampleFileProvider $sampleFileProvider
+     * @param Context $context
+     * @param FileFactory $fileFactory
+     * @param RawFactory $resultRawFactory
+     * @param ReadFactory $readFactory
      * @param ComponentRegistrar $componentRegistrar
-     * @param \Magento\ImportExport\Model\Import\SampleFileProvider|null $sampleFileProvider
+     * @param SampleFileProvider|null $sampleFileProvider
      */
     public function __construct(
-        \Magento\Backend\App\Action\Context $context,
-        \Magento\Framework\App\Response\Http\FileFactory $fileFactory,
-        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory,
-        \Magento\Framework\Filesystem\Directory\ReadFactory $readFactory,
-        \Magento\Framework\Component\ComponentRegistrar $componentRegistrar,
-        \Magento\ImportExport\Model\Import\SampleFileProvider $sampleFileProvider = null
+        Context $context,
+        FileFactory $fileFactory,
+        RawFactory $resultRawFactory,
+        ReadFactory $readFactory,
+        ComponentRegistrar $componentRegistrar,
+        SampleFileProvider $sampleFileProvider = null
     ) {
         parent::__construct(
             $context
@@ -68,14 +77,14 @@ public function __construct(
         $this->readFactory = $readFactory;
         $this->componentRegistrar = $componentRegistrar;
         $this->sampleFileProvider = $sampleFileProvider
-            ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\ImportExport\Model\Import\SampleFileProvider::class);
+            ?: ObjectManager::getInstance()
+            ->get(SampleFileProvider::class);
     }
 
     /**
      * Download sample file action
      *
-     * @return \Magento\Framework\Controller\Result\Raw
+     * @return Raw
      */
     public function execute()
     {
@@ -105,13 +114,15 @@ public function execute()
             $fileSize
         );
 
-        /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */
         $resultRaw = $this->resultRawFactory->create();
         $resultRaw->setContents($fileContents);
+
         return $resultRaw;
     }
 
     /**
+     * Get redirect result
+     *
      * @return Redirect
      */
     private function getResultRedirect(): Redirect
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php
index c27a5599a0a62..4be73fe384ae0 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Validate.php
@@ -3,15 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\ImportExport\Controller\Adminhtml\Import;
 
+use Magento\Backend\Model\View\Result\Redirect;
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\View\Result\Layout;
+use Magento\ImportExport\Block\Adminhtml\Import\Frame\Result;
 use Magento\ImportExport\Controller\Adminhtml\ImportResult as ImportResultController;
 use Magento\ImportExport\Model\Import;
-use Magento\ImportExport\Block\Adminhtml\Import\Frame\Result;
-use Magento\Framework\Controller\ResultFactory;
-use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\ImportExport\Model\Import\Adapter as ImportAdapter;
 
 /**
  * Import validate controller action.
@@ -27,16 +30,16 @@ class Validate extends ImportResultController implements HttpPostActionInterface
     /**
      * Validate uploaded files action
      *
-     * @return \Magento\Framework\Controller\ResultInterface
-     * @SuppressWarnings(PHPMD.Superglobals)
+     * @return ResultInterface
      */
     public function execute()
     {
         $data = $this->getRequest()->getPostValue();
-        /** @var \Magento\Framework\View\Result\Layout $resultLayout */
+        /** @var Layout $resultLayout */
         $resultLayout = $this->resultFactory->create(ResultFactory::TYPE_LAYOUT);
         /** @var $resultBlock Result */
         $resultBlock = $resultLayout->getLayout()->getBlock('import.frame.result');
+        //phpcs:disable Magento2.Security.Superglobal
         if ($data) {
             // common actions
             $resultBlock->addAction(
@@ -44,7 +47,6 @@ public function execute()
                 'import_validation_container'
             );
 
-            /** @var $import \Magento\ImportExport\Model\Import */
             $import = $this->getImport()->setData($data);
             try {
                 $source = $import->uploadFileAndGetSource();
@@ -60,7 +62,7 @@ public function execute()
             return $resultLayout;
         }
         $this->messageManager->addErrorMessage(__('Sorry, but the data is invalid or the file is not uploaded.'));
-        /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
+        /** @var Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         $resultRedirect->setPath('adminhtml/*/index');
         return $resultRedirect;
@@ -100,7 +102,7 @@ private function processValidationResult($validationResult, $resultBlock)
                     $errorAggregator->getErrorsCount()
                 )
             );
-            
+
             $this->addErrorMessages($resultBlock, $errorAggregator);
         } else {
             if ($errorAggregator->getErrorsCount()) {
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensExchange.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensExchange.php
index c17fac07cfc3e..2f1884b8db735 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensExchange.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/TokensExchange.php
@@ -4,12 +4,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Integration\Controller\Adminhtml\Integration;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Integration\Controller\Adminhtml\Integration;
 use Magento\Integration\Model\Integration as IntegrationModel;
 
-class TokensExchange extends \Magento\Integration\Controller\Adminhtml\Integration
+class TokensExchange extends Integration implements HttpPostActionInterface
 {
     /**
      * Let the admin know that integration has been sent for activation and token exchange is in process.
diff --git a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/SaveTest.php b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/SaveTest.php
index 7ccf240287b79..f3b0c65b6a706 100644
--- a/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/SaveTest.php
+++ b/app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/SaveTest.php
@@ -62,7 +62,7 @@ public function testSaveActionException()
             ->with(self::INTEGRATION_ID)
             ->willThrowException(new LocalizedException(__($exceptionMessage)));
         // Verify error
-        $this->_messageManager->expects($this->once())->method('addErrorMessage')->with($exceptionMessage);
+        $this->_messageManager->expects($this->once())->method('addError')->with($exceptionMessage);
         $integrationContr = $this->_createIntegrationController('Save');
         $integrationContr->execute();
     }
@@ -87,7 +87,7 @@ public function testSaveActionIntegrationException()
             ->method('escapeHtml')
             ->willReturnArgument(0);
         // Verify error
-        $this->_messageManager->expects($this->once())->method('addErrorMessage')->with($exceptionMessage);
+        $this->_messageManager->expects($this->once())->method('addError')->with($exceptionMessage);
         $integrationContr = $this->_createIntegrationController('Save');
         $integrationContr->execute();
     }
diff --git a/app/code/Magento/Multishipping/Controller/Checkout.php b/app/code/Magento/Multishipping/Controller/Checkout.php
index 985a7963ecb4e..e4711d8766c8b 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout.php
@@ -3,88 +3,79 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Multishipping\Controller;
 
+use Magento\Checkout\Controller\Action;
+use Magento\Checkout\Controller\Express\RedirectLoginInterface;
+use Magento\Checkout\Model\Session as ModelSession;
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\Session;
+use Magento\Framework\App\Action\Context;
 use Magento\Framework\App\RequestInterface;
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\Exception\StateException;
+use Magento\Multishipping\Helper\Url;
+use Magento\Multishipping\Model\Checkout\Type\Multishipping;
+use Magento\Multishipping\Model\Checkout\Type\Multishipping\State;
 
 /**
  * Multishipping checkout controller
+ *
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-abstract class Checkout extends \Magento\Checkout\Controller\Action implements
-    \Magento\Checkout\Controller\Express\RedirectLoginInterface
+abstract class Checkout extends Action implements RedirectLoginInterface
 {
-    /**
-     * Constructor
-     *
-     * @param \Magento\Framework\App\Action\Context $context
-     * @param \Magento\Customer\Model\Session $customerSession
-     * @param CustomerRepositoryInterface $customerRepository
-     * @param AccountManagementInterface $accountManagement
-     */
-    public function __construct(
-        \Magento\Framework\App\Action\Context $context,
-        \Magento\Customer\Model\Session $customerSession,
-        CustomerRepositoryInterface $customerRepository,
-        AccountManagementInterface $accountManagement
-    ) {
-        parent::__construct(
-            $context,
-            $customerSession,
-            $customerRepository,
-            $accountManagement
-        );
-    }
 
     /**
      * Retrieve checkout model
      *
-     * @return \Magento\Multishipping\Model\Checkout\Type\Multishipping
+     * @return Multishipping
      */
     protected function _getCheckout()
     {
-        return $this->_objectManager->get(\Magento\Multishipping\Model\Checkout\Type\Multishipping::class);
+        return $this->_objectManager->get(Multishipping::class);
     }
 
     /**
      * Retrieve checkout state model
      *
-     * @return \Magento\Multishipping\Model\Checkout\Type\Multishipping\State
+     * @return State
      */
     protected function _getState()
     {
-        return $this->_objectManager->get(\Magento\Multishipping\Model\Checkout\Type\Multishipping\State::class);
+        return $this->_objectManager->get(State::class);
     }
 
     /**
      * Retrieve checkout url helper
      *
-     * @return \Magento\Multishipping\Helper\Url
+     * @return Url
      */
     protected function _getHelper()
     {
-        return $this->_objectManager->get(\Magento\Multishipping\Helper\Url::class);
+        return $this->_objectManager->get(Url::class);
     }
 
     /**
      * Retrieve checkout session
      *
-     * @return \Magento\Checkout\Model\Session
+     * @return ModelSession
      */
     protected function _getCheckoutSession()
     {
-        return $this->_objectManager->get(\Magento\Checkout\Model\Session::class);
+        return $this->_objectManager->get(ModelSession::class);
     }
 
     /**
      * Dispatch request
      *
      * @param RequestInterface $request
-     * @return \Magento\Framework\App\ResponseInterface
+     * @return ResponseInterface
      * @throws \Magento\Framework\Exception\NotFoundException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
@@ -104,7 +95,7 @@ public function dispatch(RequestInterface $request)
          */
         if ($action == 'index') {
             $checkoutSessionQuote->setIsMultiShipping(true);
-            $this->_getCheckoutSession()->setCheckoutState(\Magento\Checkout\Model\Session::CHECKOUT_STATE_BEGIN);
+            $this->_getCheckoutSession()->setCheckoutState(ModelSession::CHECKOUT_STATE_BEGIN);
         } elseif (!$checkoutSessionQuote->getIsMultiShipping() && !in_array(
             $action,
             ['login', 'register', 'success']
@@ -116,7 +107,7 @@ public function dispatch(RequestInterface $request)
         }
 
         if (!in_array($action, ['login', 'register'])) {
-            $customerSession = $this->_objectManager->get(\Magento\Customer\Model\Session::class);
+            $customerSession = $this->_objectManager->get(Session::class);
             if (!$customerSession->authenticate($this->_getHelper()->getMSLoginUrl())) {
                 $this->_actionFlag->set('', self::FLAG_NO_DISPATCH, true);
             }
@@ -133,7 +124,7 @@ public function dispatch(RequestInterface $request)
         }
 
         $result = $this->_preDispatchValidateCustomer();
-        if ($result instanceof \Magento\Framework\Controller\ResultInterface) {
+        if ($result instanceof ResultInterface) {
             return $result;
         }
 
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/AddressesPost.php b/app/code/Magento/Multishipping/Controller/Checkout/AddressesPost.php
index 785f20150e7d8..2a4cb47b421c0 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/AddressesPost.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/AddressesPost.php
@@ -4,11 +4,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Multishipping\Controller\Checkout;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Multishipping\Controller\Checkout;
 use Magento\Multishipping\Model\Checkout\Type\Multishipping\State;
 
-class AddressesPost extends \Magento\Multishipping\Controller\Checkout
+class AddressesPost extends Checkout implements HttpPostActionInterface
 {
     /**
      * Multishipping checkout process posted addresses
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/Overview.php b/app/code/Magento/Multishipping/Controller/Checkout/Overview.php
index 1f2c5bdfaee20..623ced14c2fa9 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/Overview.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/Overview.php
@@ -4,14 +4,19 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Multishipping\Controller\Checkout;
 
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Multishipping\Controller\Checkout;
 use Magento\Multishipping\Model\Checkout\Type\Multishipping\State;
 use Magento\Payment\Model\Method\AbstractMethod;
 use Psr\Log\LoggerInterface;
 
-class Overview extends \Magento\Multishipping\Controller\Checkout
+class Overview extends Checkout implements HttpPostActionInterface, HttpGetActionInterface
 {
     /**
      * Multishipping checkout place order page
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php b/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
index 6dc196d966861..762b0f5cca59c 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
@@ -3,33 +3,40 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Multishipping\Controller\Checkout;
 
-use Magento\Multishipping\Model\Checkout\Type\Multishipping\State;
+use Magento\Checkout\Api\AgreementsValidatorInterface;
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\Session;
+use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Data\Form\FormKey\Validator;
 use Magento\Framework\Exception\PaymentException;
 use Magento\Framework\Session\SessionManagerInterface;
+use Magento\Multishipping\Controller\Checkout;
+use Magento\Multishipping\Model\Checkout\Type\Multishipping\State;
+use Psr\Log\LoggerInterface;
 
 /**
- * Class OverviewPost
- *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class OverviewPost extends \Magento\Multishipping\Controller\Checkout
+class OverviewPost extends Checkout implements HttpPostActionInterface
 {
     /**
-     * @var \Magento\Framework\Data\Form\FormKey\Validator
+     * @var Validator
      */
     protected $formKeyValidator;
 
     /**
-     * @var \Psr\Log\LoggerInterface
+     * @var LoggerInterface
      */
     protected $logger;
 
     /**
-     * @var \Magento\Checkout\Api\AgreementsValidatorInterface
+     * @var AgreementsValidatorInterface
      */
     protected $agreementsValidator;
 
@@ -39,23 +46,23 @@ class OverviewPost extends \Magento\Multishipping\Controller\Checkout
     private $session;
 
     /**
-     * @param \Magento\Framework\App\Action\Context $context
-     * @param \Magento\Customer\Model\Session $customerSession
+     * @param Context $context
+     * @param Session $customerSession
      * @param CustomerRepositoryInterface $customerRepository
      * @param AccountManagementInterface $accountManagement
-     * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
-     * @param \Psr\Log\LoggerInterface $logger
-     * @param \Magento\Checkout\Api\AgreementsValidatorInterface $agreementValidator
+     * @param Validator $formKeyValidator
+     * @param LoggerInterface $logger
+     * @param AgreementsValidatorInterface $agreementValidator
      * @param SessionManagerInterface $session
      */
     public function __construct(
-        \Magento\Framework\App\Action\Context $context,
-        \Magento\Customer\Model\Session $customerSession,
+        Context $context,
+        Session $customerSession,
         CustomerRepositoryInterface $customerRepository,
         AccountManagementInterface $accountManagement,
-        \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
-        \Psr\Log\LoggerInterface $logger,
-        \Magento\Checkout\Api\AgreementsValidatorInterface $agreementValidator,
+        Validator $formKeyValidator,
+        LoggerInterface $logger,
+        AgreementsValidatorInterface $agreementValidator,
         SessionManagerInterface $session
     ) {
         $this->formKeyValidator = $formKeyValidator;
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/ShippingPost.php b/app/code/Magento/Multishipping/Controller/Checkout/ShippingPost.php
index 037df75bcf3ad..d8ab9faa24a36 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/ShippingPost.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/ShippingPost.php
@@ -4,13 +4,19 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Multishipping\Controller\Checkout;
 
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Multishipping\Controller\Checkout;
 use Magento\Multishipping\Model\Checkout\Type\Multishipping\State;
 
-class ShippingPost extends \Magento\Multishipping\Controller\Checkout
+class ShippingPost extends Checkout implements HttpPostActionInterface
 {
     /**
+     * Shipping action
+     *
      * @return void
      */
     public function execute()
diff --git a/app/code/Magento/NewRelicReporting/Model/Observer/CheckConfig.php b/app/code/Magento/NewRelicReporting/Model/Observer/CheckConfig.php
index 17ae9cafd4c37..00060c8f94ca5 100644
--- a/app/code/Magento/NewRelicReporting/Model/Observer/CheckConfig.php
+++ b/app/code/Magento/NewRelicReporting/Model/Observer/CheckConfig.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\NewRelicReporting\Model\Observer;
 
 use Magento\Framework\Event\Observer;
@@ -11,9 +13,6 @@
 use Magento\Framework\Message\ManagerInterface;
 use Magento\NewRelicReporting\Model\NewRelicWrapper;
 
-/**
- * Class CheckConfig
- */
 class CheckConfig implements ObserverInterface
 {
     /**
@@ -60,7 +59,7 @@ public function execute(Observer $observer)
                 $this->config->disableModule();
                 $this->messageManager->addErrorMessage(
                     __(
-                        'The New Relic integration requires the newrelic-php5 agent, which is not installed. More 
+                        'The New Relic integration requires the newrelic-php5 agent, which is not installed. More
                         information on installing the agent is available <a target="_blank" href="%1">here</a>.',
                         'https://docs.newrelic.com/docs/agents/php-agent/installation/php-agent-installation-overview'
                     ),
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php
index c15e773e30edd..f2850a87eae5f 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php
@@ -4,21 +4,24 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Newsletter\Controller\Adminhtml\Subscriber;
 
-use Magento\Newsletter\Controller\Adminhtml\Subscriber;
 use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\Response\Http\FileFactory;
+use Magento\Newsletter\Controller\Adminhtml\Subscriber;
 use Magento\Newsletter\Model\SubscriberFactory;
-use Magento\Framework\App\ObjectManager;
 
-class MassUnsubscribe extends Subscriber
+class MassUnsubscribe extends Subscriber implements HttpGetActionInterface
 {
     /**
      * @var SubscriberFactory
      */
     private $subscriberFactory;
-    
+
     /**
      * @param Context $context
      * @param FileFactory $fileFactory
@@ -32,7 +35,7 @@ public function __construct(
         $this->subscriberFactory = $subscriberFactory ?: ObjectManager::getInstance()->get(SubscriberFactory::class);
         parent::__construct($context, $fileFactory);
     }
-    
+
     /**
      * Unsubscribe one or more subscribers action
      *
diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Delete.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Delete.php
index b0f7247bcd2b5..c8352a028fe2d 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Delete.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Template/Delete.php
@@ -4,9 +4,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Newsletter\Controller\Adminhtml\Template;
 
-class Delete extends \Magento\Newsletter\Controller\Adminhtml\Template
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Newsletter\Controller\Adminhtml\Template;
+
+class Delete extends Template implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * Delete newsletter Template

From 384c85f0fdfbcc491ab7da16da8512b0b5bbb83a Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Mon, 3 Aug 2020 10:06:14 -0500
Subject: [PATCH 1187/1718] MC-34573: Update TinyMCE

- Added bundle exclusion back to main view files
---
 app/design/adminhtml/Magento/backend/etc/view.xml | 1 +
 app/design/frontend/Magento/blank/etc/view.xml    | 1 +
 app/design/frontend/Magento/luma/etc/view.xml     | 1 +
 3 files changed, 3 insertions(+)

diff --git a/app/design/adminhtml/Magento/backend/etc/view.xml b/app/design/adminhtml/Magento/backend/etc/view.xml
index 6539e3330e98b..621c18fc97cc8 100644
--- a/app/design/adminhtml/Magento/backend/etc/view.xml
+++ b/app/design/adminhtml/Magento/backend/etc/view.xml
@@ -59,6 +59,7 @@
         <item type="file">Lib::requirejs/require.js</item>
         <item type="file">Lib::requirejs/text.js</item>
         <item type="file">Lib::varien/js.js</item>
+        <item type="directory">Magento_Tinymce3::tiny_mce</item>
         <item type="directory">Lib::css</item>
         <item type="directory">Lib::lib</item>
         <item type="directory">Lib::prototype</item>
diff --git a/app/design/frontend/Magento/blank/etc/view.xml b/app/design/frontend/Magento/blank/etc/view.xml
index 3ef51a93c4fe2..dbadb958d0471 100644
--- a/app/design/frontend/Magento/blank/etc/view.xml
+++ b/app/design/frontend/Magento/blank/etc/view.xml
@@ -291,6 +291,7 @@
         <item type="directory">Magento_Ui::templates/grid</item>
         <item type="directory">Magento_Ui::templates/dynamic-rows</item>
         <item type="directory">Magento_Swagger::swagger-ui</item>
+        <item type="directory">Magento_Tinymce3::tiny_mce</item>
         <item type="directory">Lib::modernizr</item>
         <item type="directory">Lib::tiny_mce</item>
         <item type="directory">Lib::varien</item>
diff --git a/app/design/frontend/Magento/luma/etc/view.xml b/app/design/frontend/Magento/luma/etc/view.xml
index 7b33c02a68750..b02f221784494 100644
--- a/app/design/frontend/Magento/luma/etc/view.xml
+++ b/app/design/frontend/Magento/luma/etc/view.xml
@@ -302,6 +302,7 @@
         <item type="directory">Magento_Ui::templates/grid</item>
         <item type="directory">Magento_Ui::templates/dynamic-rows</item>
         <item type="directory">Magento_Swagger::swagger-ui</item>
+        <item type="directory">Magento_Tinymce3::tiny_mce</item>
         <item type="directory">Lib::modernizr</item>
         <item type="directory">Lib::tiny_mce</item>
         <item type="directory">Lib::varien</item>

From ddf3f68b209a39407d0672c117e7241842753028 Mon Sep 17 00:00:00 2001
From: Serhii Balko <serhii.balko@transoftgroup.com>
Date: Mon, 3 Aug 2020 18:43:51 +0300
Subject: [PATCH 1188/1718] MC-35998: [Magento Cloud] - Critical Error :
 Requested path '' is wrong

---
 .../Magento/Framework/App/StaticResource.php  | 29 +++++++++++-----
 .../App/Test/Unit/StaticResourceTest.php      | 34 +++++++++++++++++++
 2 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/lib/internal/Magento/Framework/App/StaticResource.php b/lib/internal/Magento/Framework/App/StaticResource.php
index 321ded57c0885..9befb1e0fa9e5 100644
--- a/lib/internal/Magento/Framework/App/StaticResource.php
+++ b/lib/internal/Magento/Framework/App/StaticResource.php
@@ -124,17 +124,28 @@ public function launch()
             )
         ) {
             $this->response->setHttpResponseCode(404);
-        } else {
-            $path = $this->request->get('resource');
+            return $this->response;
+        }
+
+        $path = $this->request->get('resource');
+        try {
             $params = $this->parsePath($path);
-            $this->state->setAreaCode($params['area']);
-            $this->objectManager->configure($this->configLoader->load($params['area']));
-            $file = $params['file'];
-            unset($params['file']);
-            $asset = $this->assetRepo->createAsset($file, $params);
-            $this->response->setFilePath($asset->getSourceFile());
-            $this->publisher->publish($asset);
+        } catch (\InvalidArgumentException $e) {
+            if ($appMode == \Magento\Framework\App\State::MODE_PRODUCTION) {
+                $this->response->setHttpResponseCode(404);
+                return $this->response;
+            }
+            throw $e;
         }
+
+        $this->state->setAreaCode($params['area']);
+        $this->objectManager->configure($this->configLoader->load($params['area']));
+        $file = $params['file'];
+        unset($params['file']);
+        $asset = $this->assetRepo->createAsset($file, $params);
+        $this->response->setFilePath($asset->getSourceFile());
+        $this->publisher->publish($asset);
+
         return $this->response;
     }
 
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/StaticResourceTest.php b/lib/internal/Magento/Framework/App/Test/Unit/StaticResourceTest.php
index 21cb911393ee1..ee422ed8b8e17 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/StaticResourceTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/StaticResourceTest.php
@@ -84,6 +84,9 @@ class StaticResourceTest extends TestCase
      */
     private $object;
 
+    /**
+     * @inheridoc
+     */
     protected function setUp(): void
     {
         $this->stateMock = $this->createMock(State::class);
@@ -109,6 +112,9 @@ protected function setUp(): void
         );
     }
 
+    /**
+     * Test to lunch on production mode
+     */
     public function testLaunchProductionMode()
     {
         $this->stateMock->expects($this->once())
@@ -249,6 +255,9 @@ public function launchDataProvider()
         ];
     }
 
+    /**
+     * Test to lunch with wrong path on developer mode
+     */
     public function testLaunchWrongPath()
     {
         $this->expectException('InvalidArgumentException');
@@ -263,6 +272,28 @@ public function testLaunchWrongPath()
         $this->object->launch();
     }
 
+    /**
+     * Test to lunch with wrong path on production mode
+     */
+    public function testLaunchWrongPathProductionMode()
+    {
+        $mode = State::MODE_PRODUCTION;
+        $path = 'wrong/path.js';
+
+        $this->stateMock->method('getMode')->willReturn($mode);
+        $this->deploymentConfigMock->method('getConfigData')
+            ->with(ConfigOptionsListConstants::CONFIG_PATH_SCD_ON_DEMAND_IN_PRODUCTION)
+            ->willReturn(true);
+        $this->requestMock->method('get')->with('resource')->willReturn($path);
+        $this->responseMock->expects($this->once())
+            ->method('setHttpResponseCode')
+            ->with(404);
+        $this->object->launch();
+    }
+
+    /**
+     * Test to Ability to handle exceptions on developer mode
+     */
     public function testCatchExceptionDeveloperMode()
     {
         $this->objectManagerMock->expects($this->once())
@@ -286,6 +317,9 @@ public function testCatchExceptionDeveloperMode()
         $this->assertTrue($this->object->catchException($bootstrap, $exception));
     }
 
+    /**
+     * Test to lunch with wrong path
+     */
     public function testLaunchPathAbove()
     {
         $this->expectException('InvalidArgumentException');

From 77b2eda0013e2dc3443c4d694d979cd9848fa98f Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Mon, 3 Aug 2020 11:19:33 -0500
Subject: [PATCH 1189/1718] MC-20639: MyAccount :: Order Details :: Refund
 (creditMemo) Details by Order Number

---
 .../SalesGraphQl/Model/Resolver/Invoice/InvoiceTotal.php        | 2 +-
 .../testsuite/Magento/GraphQl/Sales/CreditmemoTest.php          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceTotal.php b/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceTotal.php
index 38235e94ed372..2abf96529b83a 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceTotal.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceTotal.php
@@ -113,7 +113,7 @@ public function resolve(
      * Return information about an applied discount on shipping
      *
      * @param InvoiceInterface $invoiceModel
-     * @param OrderInterface $invoiceModel
+     * @param OrderInterface $orderModel
      * @return array
      */
     private function getShippingDiscountDetails(InvoiceInterface $invoiceModel, OrderInterface $orderModel)
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
index d4d1180b9977d..18d9b2ee0e58b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
@@ -24,6 +24,7 @@
 
 /**
  * Test for credit memo functionality
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CreditmemoTest extends GraphQlAbstract
 {

From 05e9e4e584f055243f1f5aa1354ce7ddf21e9f4b Mon Sep 17 00:00:00 2001
From: Anusha Vattam <avattam@adobe.com>
Date: Mon, 3 Aug 2020 11:39:48 -0500
Subject: [PATCH 1190/1718] Removed duplicated assertion

---
 .../Model/Resolver/Customer/SaveCartDataWithPayflowProTest.php  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/SaveCartDataWithPayflowProTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/SaveCartDataWithPayflowProTest.php
index ebe8a579cc56a..11bd306211b9a 100644
--- a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/SaveCartDataWithPayflowProTest.php
+++ b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/SaveCartDataWithPayflowProTest.php
@@ -66,7 +66,6 @@ public function testPlaceOrderAndSaveDataForFuturePayflowPro(): void
         $this->assertNotEmpty($this->getVaultCartData()->getPublicHash());
         $this->assertNotEmpty($this->getVaultCartData()->getTokenDetails());
         $this->assertNotEmpty($this->getVaultCartData()->getGatewayToken());
-        $this->assertNotEmpty($this->getVaultCartData()->getPublicHash());
         $this->assertTrue($this->getVaultCartData()->getIsActive());
         $this->assertTrue($this->getVaultCartData()->getIsVisible());
     }
@@ -94,7 +93,6 @@ public function testPlaceOrderAndNotSaveDataForFuturePayflowPro(): void
         $this->assertNotEmpty($this->getVaultCartData()->getPublicHash());
         $this->assertNotEmpty($this->getVaultCartData()->getTokenDetails());
         $this->assertNotEmpty($this->getVaultCartData()->getGatewayToken());
-        $this->assertNotEmpty($this->getVaultCartData()->getPublicHash());
         $this->assertTrue($this->getVaultCartData()->getIsActive());
         $this->assertFalse($this->getVaultCartData()->getIsVisible());
     }

From 4adb48ea49533b891f07d4a3e72662a30c3b8779 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Mon, 3 Aug 2020 12:52:14 -0500
Subject: [PATCH 1191/1718] MC-20639: MyAccount :: Order Details :: Refund
 (creditMemo) Details by Order Number

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

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
index 18d9b2ee0e58b..8b6a15435825c 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
@@ -258,6 +258,7 @@ public function testCreditMemoForBundledProductsWithPartialRefund()
      * @magentoApiDataFixture Magento/GraphQl/Tax/_files/tax_rule_for_region_1.php
      * @magentoApiDataFixture Magento/SalesRule/_files/cart_rule_10_percent_off_with_discount_on_shipping.php
      * @magentoApiDataFixture Magento/GraphQl/Tax/_files/tax_calculation_shipping_excludeTax_order_display_settings.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function testCreditMemoForBundleProductWithTaxesAndDiscounts()
     {
@@ -704,7 +705,6 @@ private function deleteOrder(): void
 
         /** @var $order \Magento\Sales\Model\Order */
         $orderCollection = Bootstrap::getObjectManager()->create(OrderCollection::class);
-        $creditmemoRepository = Bootstrap::getObjectManager()->get(CreditmemoRepositoryInterface::class);
         foreach ($orderCollection as $order) {
             $this->orderRepository->delete($order);
         }

From 1c7318324a5ba6672bdfaf31ebc3f51033cf16ae Mon Sep 17 00:00:00 2001
From: Vitalii Zabaznov <vzabaznov@magento.com>
Date: Mon, 3 Aug 2020 13:47:18 -0500
Subject: [PATCH 1192/1718] MC-35903: Refactor place where lock mechanism is
 used regarding proper lock description

---
 .../Console/StartConsumerCommand.php          | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/MessageQueue/Console/StartConsumerCommand.php b/app/code/Magento/MessageQueue/Console/StartConsumerCommand.php
index f0f9cf4b68bdb..8ea6290a2a430 100644
--- a/app/code/Magento/MessageQueue/Console/StartConsumerCommand.php
+++ b/app/code/Magento/MessageQueue/Console/StartConsumerCommand.php
@@ -79,20 +79,17 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $singleThread = $input->getOption(self::OPTION_SINGLE_THREAD);
 
-        try {
-            if ($singleThread && !$this->lockManager->lock(md5($consumerName),0)) { //phpcs:ignore
-                $output->writeln('<error>Consumer with the same name is running</error>');
-                return \Magento\Framework\Console\Cli::RETURN_FAILURE;
-            }
-
-            $this->appState->setAreaCode($areaCode ?? 'global');
-
-            $consumer = $this->consumerFactory->get($consumerName, $batchSize);
-            $consumer->process($numberOfMessages);
-        } finally {
-            if ($singleThread) {
-                $this->lockManager->unlock(md5($consumerName)); //phpcs:ignore
-            }
+        if ($singleThread && !$this->lockManager->lock(md5($consumerName),0)) { //phpcs:ignore
+            $output->writeln('<error>Consumer with the same name is running</error>');
+            return \Magento\Framework\Console\Cli::RETURN_FAILURE;
+        }
+
+        $this->appState->setAreaCode($areaCode ?? 'global');
+
+        $consumer = $this->consumerFactory->get($consumerName, $batchSize);
+        $consumer->process($numberOfMessages);
+        if ($singleThread) {
+            $this->lockManager->unlock(md5($consumerName)); //phpcs:ignore
         }
 
         return \Magento\Framework\Console\Cli::RETURN_SUCCESS;

From 308a5f46cf4378efff331d5ac3035310c009c4fd Mon Sep 17 00:00:00 2001
From: oleksandrkravchuk <oleksandr.kravchuk@vaimo.com>
Date: Mon, 3 Aug 2020 21:44:10 +0200
Subject: [PATCH 1193/1718] community-features#252 Create static test for
 action controllers. Incapsulate logic in new class. Add test coverage.

---
 .../integration/etc/config-global.php.dist    | 11 ----
 .../Utility/ChildrenClassesSearch.php         | 53 +++++++++++++++++++
 .../Utility/ChildrenClassesSearchTest.php     | 39 ++++++++++++++
 .../Utility/PartialNamespace/Baz.php          | 23 ++++++++
 .../Utility/PartialNamespace/Foo.php          | 34 ++++++++++++
 .../App/Action/AbstractActionTest.php         | 28 +++-------
 6 files changed, 156 insertions(+), 32 deletions(-)
 delete mode 100644 dev/tests/integration/etc/config-global.php.dist
 create mode 100644 dev/tests/static/framework/Magento/TestFramework/Utility/ChildrenClassesSearch.php
 create mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearchTest.php
 create mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/PartialNamespace/Baz.php
 create mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/PartialNamespace/Foo.php

diff --git a/dev/tests/integration/etc/config-global.php.dist b/dev/tests/integration/etc/config-global.php.dist
deleted file mode 100644
index fbc6714859529..0000000000000
--- a/dev/tests/integration/etc/config-global.php.dist
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-return [
-    'customer/password/limit_password_reset_requests_method' => 0,
-    'admin/security/admin_account_sharing' => 1,
-    'admin/security/limit_password_reset_requests_method' => 0,
-];
diff --git a/dev/tests/static/framework/Magento/TestFramework/Utility/ChildrenClassesSearch.php b/dev/tests/static/framework/Magento/TestFramework/Utility/ChildrenClassesSearch.php
new file mode 100644
index 0000000000000..6905e1b4f442c
--- /dev/null
+++ b/dev/tests/static/framework/Magento/TestFramework/Utility/ChildrenClassesSearch.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Utility;
+
+/**
+ * Search for children classes in list of files.
+ */
+class ChildrenClassesSearch
+{
+    /**
+     * @var ClassNameExtractor
+     */
+    private $classNameExtractor;
+
+    public function __construct()
+    {
+        $this->classNameExtractor = new ClassNameExtractor();
+    }
+
+    /**
+     * Get list of classes name which are subclasses of mentioned class.
+     *
+     * @param array $fileList
+     * @param string $parent
+     * @param bool $asDataSet
+     *
+     * @return array
+     * @throws \ReflectionException
+     */
+    public function getClassesWhichAreChildrenOf(array $fileList, string $parent, bool $asDataSet = true): array
+    {
+        $found = [];
+
+        foreach ($fileList as $file) {
+            $name = $asDataSet ? $file[0] : $file;
+            $class = $this->classNameExtractor->getNameWithNamespace(file_get_contents($name));
+
+            if ($class) {
+                $classReflection = new \ReflectionClass($class);
+                if ($classReflection->isSubclassOf($parent)) {
+                    $found[] = $class;
+                }
+            }
+        }
+
+        return $found;
+    }
+}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearchTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearchTest.php
new file mode 100644
index 0000000000000..9947414f7d364
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearchTest.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestFramework\Utility;
+
+use Magento\Framework\App\Action\AbstractAction;
+
+class ChildrenClassesSearchTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ChildrenClassesSearch
+     */
+    private $childrenClassesSearch;
+
+    protected function setUp(): void
+    {
+        $this->childrenClassesSearch = new ChildrenClassesSearch();
+    }
+
+    public function testChildrenSearch(): void
+    {
+        $files = [
+            __DIR__ . '/PartialNamespace/Foo.php',
+            __DIR__ . '/PartialNamespace/Bar.php',
+            __DIR__ . '/PartialNamespace/Baz.php',
+        ];
+
+        $found = $this->childrenClassesSearch->getClassesWhichAreChildrenOf(
+            $files,
+            AbstractAction::class,
+            false
+        );
+
+        $this->assertCount(1, $found);
+        $this->assertEquals(current($found), \Magento\TestFramework\Utility\PartialNamespace\Foo::class);
+    }
+}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/PartialNamespace/Baz.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/PartialNamespace/Baz.php
new file mode 100644
index 0000000000000..1b54259b348ea
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/PartialNamespace/Baz.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestFramework\Utility\PartialNamespace;
+
+use Magento\Framework\App\ActionInterface;
+use Magento\Framework\App\ResponseInterface;
+
+class Baz implements ActionInterface
+{
+    /**
+     * Execute action based on request and return result
+     *
+     * @return \Magento\Framework\Controller\ResultInterface|ResponseInterface
+     * @throws \Magento\Framework\Exception\NotFoundException
+     */
+    public function execute()
+    {
+
+    }
+}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/PartialNamespace/Foo.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/PartialNamespace/Foo.php
new file mode 100644
index 0000000000000..6d062ff81bcce
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/PartialNamespace/Foo.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestFramework\Utility\PartialNamespace;
+
+use Magento\Framework\App\Action\AbstractAction;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\App\ResponseInterface;
+
+class Foo extends AbstractAction
+{
+    /**
+     * Dispatch request
+     *
+     * @param RequestInterface $request
+     *
+     * @return ResponseInterface
+     */
+    public function dispatch(RequestInterface $request)
+    {
+    }
+
+    /**
+     * Execute action based on request and return result
+     *
+     * @return \Magento\Framework\Controller\ResultInterface|ResponseInterface
+     * @throws \Magento\Framework\Exception\NotFoundException
+     */
+    public function execute()
+    {
+    }
+}
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/Magento/Framework/App/Action/AbstractActionTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/Magento/Framework/App/Action/AbstractActionTest.php
index d5427752004d9..7287adaae7f2f 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/Magento/Framework/App/Action/AbstractActionTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/Magento/Framework/App/Action/AbstractActionTest.php
@@ -7,14 +7,12 @@
 
 namespace Magento\Test\Legacy\Magento\Framework\App\Action;
 
-use Exception;
 use Magento\Framework\App\Action\AbstractAction;
 use Magento\Framework\App\ActionInterface;
 use Magento\Framework\App\Utility\Files;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\TestFramework\Utility\ClassNameExtractor;
+use Magento\TestFramework\Utility\ChildrenClassesSearch;
 use PHPUnit\Framework\TestCase;
-use ReflectionClass;
 
 /**
  * Test newly created controllers must do not extend AbstractAction.
@@ -22,9 +20,9 @@
 class AbstractActionTest extends TestCase
 {
     /**
-     * @var ClassNameExtractor
+     * @var ChildrenClassesSearch
      */
-    private $classNameExtractor;
+    private $childrenClassesSearch;
 
     /**
      * @var Files
@@ -36,32 +34,20 @@ class AbstractActionTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->classNameExtractor = new ClassNameExtractor();
+        $this->childrenClassesSearch = new ChildrenClassesSearch();
         $this->fileUtilities = Files::init();
     }
 
     /**
      * Test newly created controllers do not extend deprecated AbstractAction.
+     *
+     * @throws \ReflectionException
      */
     public function testNewControllersDoNotExtendAbstractAction(): void
     {
         $files = $this->getTestFiles();
-        $found = [];
-
-        foreach ($files as $file) {
-            $class = $this->classNameExtractor->getNameWithNamespace(file_get_contents($file[0]));
 
-            if ($class) {
-                try {
-                    $classReflection = new  ReflectionClass($class);
-                    if ($classReflection->isSubclassOf(AbstractAction::class)) {
-                        $found[] = $class;
-                    }
-                } catch (Exception $exception) {
-                    $this->addWarning('Skipped due to exception: ' . $class);
-                }
-            }
-        }
+        $found = $this->childrenClassesSearch->getClassesWhichAreChildrenOf($files, AbstractAction::class);
 
         $this->assertEmpty(
             $found,

From 716b98a44220b3163a179c4731d001a4e3eabab1 Mon Sep 17 00:00:00 2001
From: Serhii Kovalenko <ganster3012@gmail.com>
Date: Tue, 16 Jun 2020 18:18:07 +0300
Subject: [PATCH 1194/1718] [17] Read API    Integration tests    Magento
 StorefrontGraphQl #63 [17] Read API    Integ

---
 .../TestCase/AbstractBackendController.php    |   7 +-
 .../Magento/Catalog/_files/product_simple.php |  13 +
 .../_files/product_simple_disabled.php        | 222 ++++++++++++++++++
 .../Catalog/_files/product_simple_xss.php     |  14 ++
 .../_files/product_configurable.php           |  16 +-
 .../_files/product_configurable_sku.php       |  15 +-
 .../Magento/Wishlist/Model/WishlistTest.php   |   6 +-
 .../wishlist_with_disabled_simple_product.php |  27 +++
 8 files changed, 312 insertions(+), 8 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_disabled.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_simple_product.php

diff --git a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php
index bf8ca0dc51b18..e93e07d768fdf 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php
@@ -58,7 +58,12 @@ protected function setUp(): void
         parent::setUp();
 
         $this->_objectManager->get(\Magento\Backend\Model\UrlInterface::class)->turnOffSecretKey();
-
+        /**
+         * Authorization can be created on test bootstrap...
+         * If it will be created on test bootstrap we will have invalid RoleLocator object.
+         * As tests by default are run not from adminhtml area...
+         */
+        \Magento\TestFramework\ObjectManager::getInstance()->removeSharedInstance(\Magento\Framework\Authorization::class);
         $this->_auth = $this->_objectManager->get(\Magento\Backend\Model\Auth::class);
         $this->_session = $this->_auth->getAuthStorage();
         $credentials = $this->_getAdminCredentials();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple.php
index a7e4f702e5630..f80e3ca6a75d3 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple.php
@@ -207,3 +207,16 @@
     $product->getSku(),
     [2]
 );
+
+/**
+ * We need to remember that automatic reindexation is not working properly in integration tests
+ * Reindexation is sitting on top of afterCommit callbacks:
+ * \Magento\Catalog\Model\Product::priceReindexCallback
+ *
+ * However, callbacks are applied only when transaction_level = 0 (when transaction is commited), however
+ * integration tests are not committing transactions, so we need to reindex data manually in order to reuse it in tests
+ */
+/** @var \Magento\Indexer\Model\Indexer $indexer */
+$indexer = $objectManager->create(\Magento\Indexer\Model\Indexer::class);
+$indexer->load('catalog_product_price');
+$indexer->reindexRow($product->getId());
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_disabled.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_disabled.php
new file mode 100644
index 0000000000000..0a37f4b9e921e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_disabled.php
@@ -0,0 +1,222 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Catalog\Api\Data\ProductTierPriceExtensionFactory;
+use Magento\Catalog\Api\Data\ProductExtensionInterfaceFactory;
+
+\Magento\TestFramework\Helper\Bootstrap::getInstance()->reinitialize();
+
+/** @var \Magento\TestFramework\ObjectManager $objectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Catalog\Api\CategoryLinkManagementInterface $categoryLinkManagement */
+$categoryLinkManagement = $objectManager->get(\Magento\Catalog\Api\CategoryLinkManagementInterface::class);
+
+$tierPrices = [];
+/** @var \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory $tierPriceFactory */
+$tierPriceFactory = $objectManager->get(\Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory::class);
+/** @var  $tpExtensionAttributes */
+$tpExtensionAttributesFactory = $objectManager->get(ProductTierPriceExtensionFactory::class);
+/** @var  $productExtensionAttributes */
+$productExtensionAttributesFactory = $objectManager->get(ProductExtensionInterfaceFactory::class);
+
+$adminWebsite = $objectManager->get(\Magento\Store\Api\WebsiteRepositoryInterface::class)->get('admin');
+$tierPriceExtensionAttributes1 = $tpExtensionAttributesFactory->create()
+    ->setWebsiteId($adminWebsite->getId());
+$productExtensionAttributesWebsiteIds = $productExtensionAttributesFactory->create(
+    ['website_ids' => $adminWebsite->getId()]
+);
+
+$tierPrices[] = $tierPriceFactory->create(
+    [
+        'data' => [
+            'customer_group_id' => \Magento\Customer\Model\Group::CUST_GROUP_ALL,
+            'qty' => 2,
+            'value' => 8
+        ]
+    ]
+)->setExtensionAttributes($tierPriceExtensionAttributes1);
+
+$tierPrices[] = $tierPriceFactory->create(
+    [
+        'data' => [
+            'customer_group_id' => \Magento\Customer\Model\Group::CUST_GROUP_ALL,
+            'qty' => 5,
+            'value' => 5
+        ]
+    ]
+)->setExtensionAttributes($tierPriceExtensionAttributes1);
+
+$tierPrices[] = $tierPriceFactory->create(
+    [
+        'data' => [
+            'customer_group_id' => \Magento\Customer\Model\Group::NOT_LOGGED_IN_ID,
+            'qty' => 3,
+            'value' => 5
+        ]
+    ]
+)->setExtensionAttributes($tierPriceExtensionAttributes1);
+
+$tierPrices[] = $tierPriceFactory->create(
+    [
+        'data' => [
+            'customer_group_id' => \Magento\Customer\Model\Group::NOT_LOGGED_IN_ID,
+            'qty' => 3.2,
+            'value' => 6,
+        ]
+    ]
+)->setExtensionAttributes($tierPriceExtensionAttributes1);
+
+$tierPriceExtensionAttributes2 = $tpExtensionAttributesFactory->create()
+    ->setWebsiteId($adminWebsite->getId())
+    ->setPercentageValue(50);
+
+$tierPrices[] = $tierPriceFactory->create(
+    [
+        'data' => [
+            'customer_group_id' => \Magento\Customer\Model\Group::NOT_LOGGED_IN_ID,
+            'qty' => 10
+        ]
+    ]
+)->setExtensionAttributes($tierPriceExtensionAttributes2);
+
+/** @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)
+    ->setId(1)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Simple Product')
+    ->setSku('simple')
+    ->setPrice(10)
+    ->setWeight(1)
+    ->setShortDescription("Short description")
+    ->setTaxClassId(0)
+    ->setTierPrices($tierPrices)
+    ->setDescription('Description with <b>html tag</b>')
+    ->setExtensionAttributes($productExtensionAttributesWebsiteIds)
+    ->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_DISABLED)
+    ->setStockData(
+        [
+            'use_config_manage_stock'   => 1,
+            'qty'                       => 100,
+            'is_qty_decimal'            => 0,
+            'is_in_stock'               => 1,
+        ]
+    )->setCanSaveCustomOptions(true)
+    ->setHasOptions(true);
+
+$oldOptions = [
+    [
+        'previous_group' => 'text',
+        'title'     => 'Test Field',
+        'type'      => 'field',
+        'is_require' => 1,
+        'sort_order' => 0,
+        'price'     => 1,
+        'price_type' => 'fixed',
+        'sku'       => '1-text',
+        'max_characters' => 100,
+    ],
+    [
+        'previous_group' => 'date',
+        'title'     => 'Test Date and Time',
+        'type'      => 'date_time',
+        'is_require' => 1,
+        'sort_order' => 0,
+        'price'     => 2,
+        'price_type' => 'fixed',
+        'sku'       => '2-date',
+    ],
+    [
+        'previous_group' => 'select',
+        'title'     => 'Test Select',
+        'type'      => 'drop_down',
+        'is_require' => 1,
+        'sort_order' => 0,
+        'values'    => [
+            [
+                'option_type_id' => null,
+                'title'         => 'Option 1',
+                'price'         => 3,
+                'price_type'    => 'fixed',
+                'sku'           => '3-1-select',
+            ],
+            [
+                'option_type_id' => null,
+                'title'         => 'Option 2',
+                'price'         => 3,
+                'price_type'    => 'fixed',
+                'sku'           => '3-2-select',
+            ],
+        ]
+    ],
+    [
+        'previous_group' => 'select',
+        'title'     => 'Test Radio',
+        'type'      => 'radio',
+        'is_require' => 1,
+        'sort_order' => 0,
+        'values'    => [
+            [
+                'option_type_id' => null,
+                'title'         => 'Option 1',
+                'price'         => 3,
+                'price_type'    => 'fixed',
+                'sku'           => '4-1-radio',
+            ],
+            [
+                'option_type_id' => null,
+                'title'         => 'Option 2',
+                'price'         => 3,
+                'price_type'    => 'fixed',
+                'sku'           => '4-2-radio',
+            ],
+        ]
+    ]
+];
+
+$options = [];
+
+/** @var \Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory $customOptionFactory */
+$customOptionFactory = $objectManager->create(\Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory::class);
+
+foreach ($oldOptions as $option) {
+    /** @var \Magento\Catalog\Api\Data\ProductCustomOptionInterface $option */
+    $option = $customOptionFactory->create(['data' => $option]);
+    $option->setProductSku($product->getSku());
+
+    $options[] = $option;
+}
+
+$product->setOptions($options);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$productRepository->save($product);
+
+$categoryLinkManagement->assignProductToCategories(
+    $product->getSku(),
+    [2]
+);
+
+/**
+ * We need to remember that automatic reindexation is not working properly in integration tests
+ * Reindexation is sitting on top of afterCommit callbacks:
+ * \Magento\Catalog\Model\Product::priceReindexCallback
+ *
+ * However, callbacks are applied only when transaction_level = 0 (when transaction is commited), however
+ * integration tests are not committing transactions, so we need to reindex data manually in order to reuse it in tests
+ */
+/** @var \Magento\Indexer\Model\Indexer $indexer */
+$indexer = $objectManager->create(\Magento\Indexer\Model\Indexer::class);
+$indexer->load('catalog_product_price');
+$indexer->reindexRow($product->getId());
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_xss.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_xss.php
index cff5671d1bf49..c27a760988818 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_xss.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_xss.php
@@ -31,3 +31,17 @@
     $product->getSku(),
     [2]
 );
+
+
+/**
+ * We need to remember that automatic reindexation is not working properly in integration tests
+ * Reindexation is sitting on top of afterCommit callbacks:
+ * \Magento\Catalog\Model\Product::priceReindexCallback
+ *
+ * However, callbacks are applied only when transaction_level = 0 (when transaction is commited), however
+ * integration tests are not committing transactions, so we need to reindex data manually in order to reuse it in tests
+ */
+/** @var \Magento\Indexer\Model\Indexer $indexer */
+$indexer = $objectManager->create(\Magento\Indexer\Model\Indexer::class);
+$indexer->load('catalog_product_price');
+$indexer->reindexRow($product->getId());
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable.php
index 9dd43f13a8a64..4a8fc951f48c3 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable.php
@@ -36,7 +36,7 @@
 $attributeValues = [];
 $attributeSetId = $installer->getAttributeSetId(Product::ENTITY, 'Default');
 $associatedProductIds = [];
-$productIds = [10, 20];
+$idsToReindex = $productIds = [10, 20];
 array_shift($options); //remove the first option which is empty
 
 foreach ($options as $option) {
@@ -143,3 +143,17 @@
     $product->getSku(),
     [2]
 );
+
+/**
+ * We need to remember that automatic reindexation is not working properly in integration tests
+ * Reindexation is sitting on top of afterCommit callbacks:
+ * \Magento\Catalog\Model\Product::priceReindexCallback
+ *
+ * However, callbacks are applied only when transaction_level = 0 (when transaction is commited), however
+ * integration tests are not committing transactions, so we need to reindex data manually in order to reuse it in tests
+ */
+/** @var \Magento\Indexer\Model\Indexer $indexer */
+$indexer = Bootstrap::getObjectManager()->create(\Magento\Indexer\Model\Indexer::class);
+$indexer->load('catalog_product_price');
+$indexer->reindexRow($product->getId());
+$indexer->reindexList($idsToReindex);
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_sku.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_sku.php
index ca8e1e91e5061..bd9fe806b2b00 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_sku.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_sku.php
@@ -36,7 +36,7 @@
 $attributeValues = [];
 $attributeSetId = $installer->getAttributeSetId('catalog_product', 'Default');
 $associatedProductIds = [];
-$productIds = [10, 20];
+$idsToReindex = $productIds = [10, 20];
 array_shift($options); //remove the first option which is empty
 
 foreach ($options as $option) {
@@ -142,3 +142,16 @@
     $product->getSku(),
     [2]
 );
+
+/**
+ * We need to remember that automatic reindexation is not working properly in integration tests
+ * Reindexation is sitting on top of afterCommit callbacks:
+ * \Magento\Catalog\Model\Product::priceReindexCallback
+ *
+ * However, callbacks are applied only when transaction_level = 0 (when transaction is commited), however
+ * integration tests are not committing transactions, so we need to reindex data manually in order to reuse it in tests
+ */
+/** @var \Magento\Indexer\Model\Indexer $indexer */
+$indexer = Bootstrap::getObjectManager()->create(\Magento\Indexer\Model\Indexer::class);
+$indexer->load('catalog_product_price');
+$indexer->reindexList($idsToReindex);
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php
index 29dda2bbde581..28edf31ad4afc 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php
@@ -116,17 +116,13 @@ public function testGetItemCollection(): void
     }
 
     /**
-     * @magentoDataFixture Magento/Wishlist/_files/wishlist.php
+     * @magentoDataFixture Magento/Wishlist/_files/wishlist_with_disabled_simple_product.php
      *
      * @return void
      */
     public function testGetItemCollectionWithDisabledProduct(): void
     {
-        $productSku = 'simple';
         $customerId = 1;
-        $product = $this->productRepository->get($productSku);
-        $product->setStatus(ProductStatus::STATUS_DISABLED);
-        $this->productRepository->save($product);
         $this->assertEmpty($this->getWishlistByCustomerId->execute($customerId)->getItemCollection()->getItems());
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_simple_product.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_simple_product.php
new file mode 100644
index 0000000000000..3c829a40f0d91
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_simple_product.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Customer\Model\CustomerRegistry;
+use Magento\Framework\DataObject;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+use Magento\Wishlist\Model\Wishlist;
+
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer.php');
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/product_simple_disabled.php');
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var CustomerRegistry $customerRegistry */
+$customerRegistry = Bootstrap::getObjectManager()->create(CustomerRegistry::class);
+$customer = $customerRegistry->retrieve(1);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+$product = $productRepository->get('simple');
+$wishlist = Bootstrap::getObjectManager()->create(Wishlist::class);
+$wishlist->loadByCustomerId($customer->getId(), true);
+$item = $wishlist->addNewItem($product, new DataObject([]));
+$wishlist->setSharingCode('fixture_unique_code')->save();

From fd99ace7518c59f973ca5ec20636c58eb6d94e7d Mon Sep 17 00:00:00 2001
From: Serhii Kovalenko <ganster3012@gmail.com>
Date: Tue, 16 Jun 2020 18:27:01 +0300
Subject: [PATCH 1195/1718] [17] Read API :: Integration tests :: Customer* #55

---
 .../two_wishlists_for_two_diff_customers.php       | 13 +++++++++++++
 .../testsuite/Magento/Wishlist/_files/wishlist.php | 14 ++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/two_wishlists_for_two_diff_customers.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/two_wishlists_for_two_diff_customers.php
index 43285cea4cfd9..797dfef488e84 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/_files/two_wishlists_for_two_diff_customers.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/two_wishlists_for_two_diff_customers.php
@@ -31,3 +31,16 @@
 $wishlistForSecondCustomer->loadByCustomerId($secondCustomerIdFromFixture, true);
 $item = $wishlistForSecondCustomer->addNewItem($product, new \Magento\Framework\DataObject([]));
 $wishlistForSecondCustomer->save();
+
+/**
+ * We need to remember that automatic reindexation is not working properly in integration tests
+ * Reindexation is sitting on top of afterCommit callbacks:
+ * \Magento\Catalog\Model\Product::priceReindexCallback
+ *
+ * However, callbacks are applied only when transaction_level = 0 (when transaction is commited), however
+ * integration tests are not committing transactions, so we need to reindex data manually in order to reuse it in tests
+ */
+/** @var \Magento\Indexer\Model\Indexer $indexer */
+$indexer = Bootstrap::getObjectManager()->create(\Magento\Indexer\Model\Indexer::class);
+$indexer->load('catalog_product_price');
+$indexer->reindexList([$product->getId()]);
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist.php
index e578676e68e96..3cd71fe36ffe3 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist.php
@@ -25,3 +25,17 @@
 $wishlist->loadByCustomerId($customer->getId(), true);
 $item = $wishlist->addNewItem($product, new DataObject([]));
 $wishlist->setSharingCode('fixture_unique_code')->save();
+
+/**
+ * We need to remember that automatic reindexation is not working properly in integration tests
+ * Reindexation is sitting on top of afterCommit callbacks:
+ * \Magento\Catalog\Model\Product::priceReindexCallback
+ *
+ * However, callbacks are applied only when transaction_level = 0 (when transaction is commited), however
+ * integration tests are not committing transactions, so we need to reindex data manually in order to reuse it in tests
+ */
+/** @var \Magento\Indexer\Model\Indexer $indexer */
+$indexer = Bootstrap::getObjectManager()->create(\Magento\Indexer\Model\Indexer::class);
+$indexer->load('catalog_product_price');
+$indexer->reindexList([$product->getId()]);
+

From 54f7bdc489ac860796ab6384fde413889fdbb8ef Mon Sep 17 00:00:00 2001
From: Vitalii Zabaznov <vzabaznov@magento.com>
Date: Wed, 24 Jun 2020 13:11:29 -0500
Subject: [PATCH 1196/1718] [90] [17] Read API :: Web-Api tests ::
 Magento\GraphQl\Catalog\MediaGalleryTest::testProductSmallImageUrlPlaceholder
 #90

---
 .../Magento/Setup/Model/ConfigOptionsList.php |  1 +
 .../Model/ConfigOptionsList/Directory.php     | 86 +++++++++++++++++++
 2 files changed, 87 insertions(+)
 create mode 100644 setup/src/Magento/Setup/Model/ConfigOptionsList/Directory.php

diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList.php b/setup/src/Magento/Setup/Model/ConfigOptionsList.php
index 7bc0853769217..a8d0a8591f539 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsList.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList.php
@@ -53,6 +53,7 @@ class ConfigOptionsList implements ConfigOptionsListInterface
         \Magento\Setup\Model\ConfigOptionsList\Cache::class,
         \Magento\Setup\Model\ConfigOptionsList\PageCache::class,
         \Magento\Setup\Model\ConfigOptionsList\Lock::class,
+        \Magento\Setup\Model\ConfigOptionsList\Directory::class,
     ];
 
     /**
diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/Directory.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/Directory.php
new file mode 100644
index 0000000000000..ec5042451e0e2
--- /dev/null
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/Directory.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Setup\Model\ConfigOptionsList;
+
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Config\Data\ConfigData;
+use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\Setup\ConfigOptionsListInterface;
+use Magento\Framework\Setup\Option\SelectConfigOption;
+
+/**
+ * Deployment configuration options for the folders.
+ */
+class Directory implements ConfigOptionsListInterface
+{
+    /**
+     * Input ket for config command.
+     */
+    const INPUT_KEY_DOCUMENT_ROOT_IS_PUB = 'document-root-is-pub';
+
+    /**
+     * Path in in configuration.
+     */
+    const CONFIG_PATH_DOCUMENT_ROOT_IS_PUB = 'directories/document_root_is_pub';
+
+    /**
+     * The available configuration values.
+     *
+     * @var array
+     */
+    private $selectOptions = [true, false];
+
+    /**
+     * @param array $options
+     * @param DeploymentConfig $deploymentConfig
+     * @return ConfigData|ConfigData[]
+     */
+    public function createConfig(array $options, DeploymentConfig $deploymentConfig)
+    {
+        $configData = new ConfigData(ConfigFilePool::APP_ENV);
+        if (isset($options[self::INPUT_KEY_DOCUMENT_ROOT_IS_PUB])) {
+            $configData->set(
+                self::CONFIG_PATH_DOCUMENT_ROOT_IS_PUB,
+                \filter_var($options[self::INPUT_KEY_DOCUMENT_ROOT_IS_PUB], FILTER_VALIDATE_BOOLEAN)
+            );
+        }
+
+        return $configData;
+    }
+
+    /**
+     * Return options from Directory configuration.
+     *
+     * @return \Magento\Framework\Setup\Option\AbstractConfigOption[]|SelectConfigOption[]
+     */
+    public function getOptions()
+    {
+        return [
+            new SelectConfigOption(
+                self::INPUT_KEY_DOCUMENT_ROOT_IS_PUB,
+                SelectConfigOption::FRONTEND_WIZARD_SELECT,
+                $this->selectOptions,
+                self::CONFIG_PATH_DOCUMENT_ROOT_IS_PUB,
+                'Flag to show is Pub is on root, can be true or false only',
+                false
+            ),
+        ];
+    }
+
+    /**
+     * Validate options.
+     *
+     * @param array $options
+     * @param DeploymentConfig $deploymentConfig
+     * @return array|string[]
+     */
+    public function validate(array $options, DeploymentConfig $deploymentConfig)
+    {
+        return [];
+    }
+}

From 4790c6cec95c8c17290253f0de3aa384e5d0a508 Mon Sep 17 00:00:00 2001
From: Leonid Poluianov <poluyano@adobe.com>
Date: Thu, 25 Jun 2020 10:36:54 -0500
Subject: [PATCH 1197/1718] ECP-515: Storefront Get API

    - fix tests
---
 setup/src/Magento/Setup/Model/ConfigOptionsList/Directory.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/Directory.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/Directory.php
index ec5042451e0e2..6ae80686edd54 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsList/Directory.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/Directory.php
@@ -36,9 +36,12 @@ class Directory implements ConfigOptionsListInterface
     private $selectOptions = [true, false];
 
     /**
+     * Create config and update document root value according to provided options
+     *
      * @param array $options
      * @param DeploymentConfig $deploymentConfig
      * @return ConfigData|ConfigData[]
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function createConfig(array $options, DeploymentConfig $deploymentConfig)
     {
@@ -78,6 +81,7 @@ public function getOptions()
      * @param array $options
      * @param DeploymentConfig $deploymentConfig
      * @return array|string[]
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function validate(array $options, DeploymentConfig $deploymentConfig)
     {

From ad70be9148f272b671c7751bf1f1ece60fb1fef9 Mon Sep 17 00:00:00 2001
From: Vitalii Zabaznov <vzabaznov@magento.com>
Date: Fri, 26 Jun 2020 10:54:59 -0500
Subject: [PATCH 1198/1718] [90] [17] Read API :: Web-Api tests ::
 Magento\GraphQl\Catalog\MediaGalleryTest::testProductSmallImageUrlPlaceholder
 #90

---
 .../wishlist_with_disabled_simple_product.php | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_simple_product.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_simple_product.php
index 3c829a40f0d91..80f5875303044 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_simple_product.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_simple_product.php
@@ -4,24 +4,30 @@
  * See COPYING.txt for license details.
  */
 
-use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Customer\Model\CustomerRegistry;
-use Magento\Framework\DataObject;
-use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Model\Product\Attribute\Source\Status as ProductStatus;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
-use Magento\Wishlist\Model\Wishlist;
 
-Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer.php');
-Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/product_simple_disabled.php');
+Resolver::getInstance()->requireDataFixture('Magento/Wishlist/_files/wishlist.php');
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+$productSku = 'simple';
+$product = $productRepository->get($productSku);
+$product->setStatus(ProductStatus::STATUS_DISABLED);
+$productRepository->save($product);
+
+/**
+ * We need to remember that automatic reindexation is not working properly in integration tests
+ * Reindexation is sitting on top of afterCommit callbacks:
+ * \Magento\Catalog\Model\Product::priceReindexCallback
+ *
+ * However, callbacks are applied only when transaction_level = 0 (when transaction is commited), however
+ * integration tests are not committing transactions, so we need to reindex data manually in order to reuse it in tests
+ */
+/** @var \Magento\Indexer\Model\Indexer $indexer */
+$indexer = \Magento\TestFramework\Helper\Bootstrap
+    ::getObjectManager()->create(\Magento\Indexer\Model\Indexer::class);
+$indexer->load('catalog_product_price');
+$indexer->reindexList([$product->getId()]);
 
-$objectManager = Bootstrap::getObjectManager();
-/** @var CustomerRegistry $customerRegistry */
-$customerRegistry = Bootstrap::getObjectManager()->create(CustomerRegistry::class);
-$customer = $customerRegistry->retrieve(1);
-/** @var ProductRepositoryInterface $productRepository */
-$productRepository = $objectManager->create(ProductRepositoryInterface::class);
-$product = $productRepository->get('simple');
-$wishlist = Bootstrap::getObjectManager()->create(Wishlist::class);
-$wishlist->loadByCustomerId($customer->getId(), true);
-$item = $wishlist->addNewItem($product, new DataObject([]));
-$wishlist->setSharingCode('fixture_unique_code')->save();

From 3ec755e32632fdcfa0c9c0e7705d76732b5edd79 Mon Sep 17 00:00:00 2001
From: Michail Slabko <mslabko@magento.com>
Date: Fri, 26 Jun 2020 14:42:59 -0500
Subject: [PATCH 1199/1718] ECP-515: Storefront Get API

- fix test
---
 .../DataProvider/Product/Form/Modifier/AbstractEavTest.php  | 6 ++++--
 .../Product/Form/Modifier/Eav/DefaultAttributesTest.php     | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AbstractEavTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AbstractEavTest.php
index a95a981cb8006..1115a48c79ef4 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AbstractEavTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AbstractEavTest.php
@@ -220,11 +220,13 @@ protected function getOptionValueByLabel(string $attributeCode, string $label):
     /**
      * Returns product for testing.
      *
+     * @param bool $forceReload
      * @return ProductInterface
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
-    protected function getProduct(): ProductInterface
+    protected function getProduct($forceReload = false): ProductInterface
     {
-        return $this->productRepository->get('simple', false, Store::DEFAULT_STORE_ID);
+        return $this->productRepository->get('simple', false, Store::DEFAULT_STORE_ID, $forceReload);
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/DefaultAttributesTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/DefaultAttributesTest.php
index fbf752cc9e239..b5005ba9fc76a 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/DefaultAttributesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav/DefaultAttributesTest.php
@@ -33,7 +33,8 @@ public function testModifyMeta(): void
     public function testModifyData(): void
     {
         $expectedData = include __DIR__ . '/../_files/eav_expected_data_output.php';
-        $this->callModifyDataAndAssert($this->getProduct(), $expectedData);
+        // force load: ProductRepositoryInterface::getList does not add stock item, prices, categories to product
+        $this->callModifyDataAndAssert($this->getProduct(true), $expectedData);
     }
 
     /**

From 778424df3efc3ba74cde5aeb1ce2a4951e21a697 Mon Sep 17 00:00:00 2001
From: Leonid Poluianov <poluyano@adobe.com>
Date: Fri, 26 Jun 2020 17:40:04 -0500
Subject: [PATCH 1200/1718] ECP-515: Storefront Get API

    - fix static tests
---
 .../Wishlist/_files/wishlist_with_disabled_simple_product.php    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_simple_product.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_simple_product.php
index 80f5875303044..cf4685643412f 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_simple_product.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_simple_product.php
@@ -30,4 +30,3 @@
     ::getObjectManager()->create(\Magento\Indexer\Model\Indexer::class);
 $indexer->load('catalog_product_price');
 $indexer->reindexList([$product->getId()]);
-

From 3824d6ed0b434c17321863e02cdf4025bd586e89 Mon Sep 17 00:00:00 2001
From: Leonid Poluianov <poluyano@adobe.com>
Date: Thu, 9 Jul 2020 15:07:50 -0500
Subject: [PATCH 1201/1718] catalog-storefront-146: Fix failed integration
 tests

---
 .../integration/testsuite/Magento/Framework/Console/CliTest.php  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Console/CliTest.php b/dev/tests/integration/testsuite/Magento/Framework/Console/CliTest.php
index c6aeaf9e0f927..6f7534d67e499 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Console/CliTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Console/CliTest.php
@@ -83,6 +83,7 @@ protected function tearDown(): void
      * @param bool $isPub
      * @param array $params
      * @dataProvider documentRootIsPubProvider
+     * @magentoAppIsolation enabled
      */
     public function testDocumentRootIsPublic($isPub, $params)
     {

From 173d01ae2141085bf4a13184819beebcaa54775b Mon Sep 17 00:00:00 2001
From: Leonid Poluianov <poluyano@adobe.com>
Date: Tue, 23 Jun 2020 23:31:57 -0500
Subject: [PATCH 1202/1718] ECP-515: Storefront Get API

    - fix tests
---
 .../Test/Mftf/Test/AdminDeleteCustomerWishListItemTest.xml       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/AdminDeleteCustomerWishListItemTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/AdminDeleteCustomerWishListItemTest.xml
index 32bec763b2fd6..28a17d30aea2b 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/Test/AdminDeleteCustomerWishListItemTest.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/AdminDeleteCustomerWishListItemTest.xml
@@ -44,6 +44,7 @@
             <argument name="productVar" value="$createProduct$"/>
         </actionGroup>
         <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logout"/>
+        <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogoutBeforeCheck"/>
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="navigateToCustomerEditPage">
             <argument name="customer" value="$createCustomer$"/>

From b0b6b3fe716d555f75899b8de7e99217f8529672 Mon Sep 17 00:00:00 2001
From: Leonid Poluianov <poluyano@adobe.com>
Date: Tue, 23 Jun 2020 12:34:00 -0500
Subject: [PATCH 1203/1718] ECP-515: Storefront Get API

    - fix tests
---
 .../UseCase/WaitAndNotWaitMessagesTest.php        | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/WaitAndNotWaitMessagesTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/WaitAndNotWaitMessagesTest.php
index c11004f503c40..e5fed191ea17e 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/WaitAndNotWaitMessagesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/WaitAndNotWaitMessagesTest.php
@@ -66,14 +66,21 @@ protected function setUp(): void
      */
     public function testWaitForMessages()
     {
-        $this->assertArrayHasKey('queue', $this->config);
-        $this->assertArrayHasKey('consumers_wait_for_messages', $this->config['queue']);
-        $this->assertEquals(1, $this->config['queue']['consumers_wait_for_messages']);
+        $this->publisherConsumerController->stopConsumers();
+
+        $config = $this->config;
+        $config['queue']['consumers_wait_for_messages'] = 1;
+        $this->writeConfig($config);
+
+        $loadedConfig = $this->loadConfig();
+        $this->assertArrayHasKey('queue', $loadedConfig);
+        $this->assertArrayHasKey('consumers_wait_for_messages', $loadedConfig['queue']);
+        $this->assertEquals(1, $loadedConfig['queue']['consumers_wait_for_messages']);
 
         foreach ($this->messages as $message) {
             $this->publishMessage($message);
         }
-
+        $this->publisherConsumerController->startConsumers();
         $this->waitForAsynchronousResult(count($this->messages), $this->logFilePath);
 
         foreach ($this->messages as $item) {

From 91bead52b3063c9c022d9809ee4192e1b28c7862 Mon Sep 17 00:00:00 2001
From: Leonid Poluianov <poluyano@adobe.com>
Date: Wed, 22 Jul 2020 13:32:53 -0500
Subject: [PATCH 1204/1718] Deliver catalog storefront tests changes to
 mainline

---
 .../Magento/Webapi/JoinDirectivesTest.php     |  3 ++
 .../TestCase/AbstractBackendController.php    |  4 ++-
 .../testsuite/Magento/Sales/_files/quote.php  | 12 +++++---
 .../TestFramework/Dependency/DbRule.php       |  5 +++-
 .../Magento/Test/Php/LiveCodeTest.php         | 29 ++++++++++++++++---
 5 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/Webapi/JoinDirectivesTest.php b/dev/tests/api-functional/testsuite/Magento/Webapi/JoinDirectivesTest.php
index 4d89e3a0b582a..5e278e6058dc9 100644
--- a/dev/tests/api-functional/testsuite/Magento/Webapi/JoinDirectivesTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Webapi/JoinDirectivesTest.php
@@ -50,6 +50,7 @@ protected function setUp(): void
      *
      * @magentoApiDataFixture Magento/SalesRule/_files/rules_rollback.php
      * @magentoApiDataFixture Magento/Sales/_files/quote.php
+     * @magentoAppIsolation enabled
      */
     public function testGetList()
     {
@@ -87,6 +88,7 @@ public function testGetList()
 
     /**
      * @magentoApiDataFixture Magento/Sales/_files/invoice.php
+     * @magentoAppIsolation enabled
      */
     public function testAutoGeneratedGetList()
     {
@@ -131,6 +133,7 @@ public function testAutoGeneratedGetList()
      * Test get list of orders with extension attributes.
      *
      * @magentoApiDataFixture Magento/Sales/_files/order.php
+     * @magentoAppIsolation enabled
      */
     public function testGetOrdertList()
     {
diff --git a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php
index e93e07d768fdf..fff16a7edc1ba 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractBackendController.php
@@ -63,7 +63,9 @@ protected function setUp(): void
          * If it will be created on test bootstrap we will have invalid RoleLocator object.
          * As tests by default are run not from adminhtml area...
          */
-        \Magento\TestFramework\ObjectManager::getInstance()->removeSharedInstance(\Magento\Framework\Authorization::class);
+        \Magento\TestFramework\ObjectManager::getInstance()->removeSharedInstance(
+            \Magento\Framework\Authorization::class
+        );
         $this->_auth = $this->_objectManager->get(\Magento\Backend\Model\Auth::class);
         $this->_session = $this->_auth->getAuthStorage();
         $credentials = $this->_getAdminCredentials();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/quote.php b/dev/tests/integration/testsuite/Magento/Sales/_files/quote.php
index 5be2fcefbde26..ea39a8bf78b4e 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/quote.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/quote.php
@@ -3,7 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 \Magento\TestFramework\Helper\Bootstrap::getInstance()->loadArea('frontend');
+
+$storeManager = Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Store\Model\StoreManagerInterface::class);
 $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
 $product->setTypeId('simple')
     ->setId(1)
@@ -23,7 +27,9 @@
             'is_in_stock' => 1,
             'manage_stock' => 1,
         ]
-    )->save();
+    )
+    ->setWebsiteIds([$storeManager->getStore()->getWebsiteId()])
+    ->save();
 
 $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
     ->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
@@ -39,9 +45,7 @@
 $shippingAddress = clone $billingAddress;
 $shippingAddress->setId(null)->setAddressType('shipping');
 
-$store = Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-    ->get(\Magento\Store\Model\StoreManagerInterface::class)
-    ->getStore();
+$store = $storeManager->getStore();
 
 /** @var \Magento\Quote\Model\Quote $quote */
 $quote = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Quote\Model\Quote::class);
diff --git a/dev/tests/static/framework/Magento/TestFramework/Dependency/DbRule.php b/dev/tests/static/framework/Magento/TestFramework/Dependency/DbRule.php
index cb3a9e2cc9c35..70b5b00cbdfc7 100644
--- a/dev/tests/static/framework/Magento/TestFramework/Dependency/DbRule.php
+++ b/dev/tests/static/framework/Magento/TestFramework/Dependency/DbRule.php
@@ -7,6 +7,9 @@
  */
 namespace Magento\TestFramework\Dependency;
 
+/**
+ * Class to get DB dependencies information
+ */
 class DbRule implements \Magento\TestFramework\Dependency\RuleInterface
 {
     /**
@@ -37,7 +40,7 @@ public function __construct(array $tables)
      */
     public function getDependencyInfo($currentModule, $fileType, $file, &$contents)
     {
-        if ('php' != $fileType || !preg_match('#.*/(Setup|Resource)/.*\.php$#', $file)) {
+        if ('php' !== $fileType || !preg_match('#.*/(Setup|Resource|Query)/.*\.php$#', $file)) {
             return [];
         }
 
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
index ffc991572addf..324753b4bd4ec 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
@@ -326,9 +326,19 @@ public function testCodeStyle()
             touch($reportFile);
         }
         $codeSniffer = new CodeSniffer('Magento', $reportFile, new Wrapper());
-        $result = $codeSniffer->run(
-            $this->isFullScan() ? $this->getFullWhitelist() : self::getWhitelist(['php', 'phtml'])
-        );
+        $fileList = $this->isFullScan() ? $this->getFullWhitelist() : self::getWhitelist(['php', 'phtml']);
+        $ignoreList = Files::init()->readLists(__DIR__ . '/_files/phpcs/ignorelist/*.txt');
+        if ($ignoreList) {
+            $ignoreListPattern = sprintf('#(%s)#i', implode('|', $ignoreList));
+            $fileList = array_filter(
+                $fileList,
+                function ($path) use ($ignoreListPattern) {
+                    return !preg_match($ignoreListPattern, $path);
+                }
+            );
+        }
+
+        $result = $codeSniffer->run($fileList);
         $report = file_get_contents($reportFile);
         $this->assertEquals(
             0,
@@ -348,8 +358,19 @@ public function testCodeMess()
         if (!$codeMessDetector->canRun()) {
             $this->markTestSkipped('PHP Mess Detector is not available.');
         }
+        $fileList = self::getWhitelist(['php']);
+        $ignoreList = Files::init()->readLists(__DIR__ . '/_files/phpmd/ignorelist/*.txt');
+        if ($ignoreList) {
+            $ignoreListPattern = sprintf('#(%s)#i', implode('|', $ignoreList));
+            $fileList = array_filter(
+                $fileList,
+                function ($path) use ($ignoreListPattern) {
+                    return !preg_match($ignoreListPattern, $path);
+                }
+            );
+        }
 
-        $result = $codeMessDetector->run(self::getWhitelist(['php']));
+        $result = $codeMessDetector->run($fileList);
 
         $output = "";
         if (file_exists($reportFile)) {

From dd93eb332b9f6df2f5ef3cadd446542d5e7ef7ba Mon Sep 17 00:00:00 2001
From: Leonid Poluianov <poluyano@adobe.com>
Date: Wed, 22 Jul 2020 15:15:15 -0500
Subject: [PATCH 1205/1718] Deliver catalog storefront tests changes to
 mainline

---
 .../_files/category_product_rollback.php      |   2 +
 ...th_custom_attribute_layered_navigation.php |  21 +-
 .../Catalog/_files/multiple_products.php      |   2 +-
 ...roducts_for_relevance_sorting_rollback.php |   4 +
 .../Magento/Catalog/_files/products_list.php  |   2 +
 ...ucts_with_layered_navigation_attribute.php |   2 +
 ...th_layered_navigation_custom_attribute.php | 188 ++++++------
 ...d_navigation_custom_attribute_rollback.php |  31 +-
 ..._navigation_with_multiselect_attribute.php |  85 +++---
 ...on_with_multiselect_attribute_rollback.php |  32 +-
 ...t_attribute_with_source_model_rollback.php |  24 +-
 .../Model/CategoryUrlRewriteTest.php          | 282 ++++++++----------
 .../_files/configurable_attribute_first.php   |  67 +++++
 .../configurable_attribute_first_rollback.php |  28 ++
 ..._configurable_with_category_and_weight.php | 221 +++++++-------
 ...able_with_category_and_weight_rollback.php |   6 +-
 ...igurable_with_frontend_label_attribute.php |  15 +-
 .../_files/product_simple_77.php              |   9 +-
 ...able_product_with_files_and_sample_url.php |   2 +-
 19 files changed, 569 insertions(+), 454 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_first.php
 create mode 100644 dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_first_rollback.php

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_product_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_product_rollback.php
index d4f2c803187dc..0198b82df2629 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_product_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_product_rollback.php
@@ -22,3 +22,5 @@
 if ($category->getId()) {
     $category->delete();
 }
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
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 2acb7fe99e192..0b77895803c8b 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,12 +5,11 @@
  */
 declare(strict_types=1);
 
-use Magento\Eav\Api\AttributeRepositoryInterface;
+Resolver::getInstance()->requireDataFixture('Magento/ConfigurableProduct/_files/configurable_products.php');
+
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Eav\Api\AttributeRepositoryInterface;
 use Magento\TestFramework\Helper\CacheCleaner;
-use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
-
-Resolver::getInstance()->requireDataFixture('Magento/ConfigurableProduct/_files/configurable_products.php');
 
 $eavConfig = Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class);
 
@@ -28,11 +27,11 @@
 /** @var AttributeRepositoryInterface $attributeRepository */
 $attributeRepository = Bootstrap::getObjectManager()->create(AttributeRepositoryInterface::class);
 $attributeRepository->save($attribute);
+
 CacheCleaner::cleanAll();
-/** @var \Magento\Indexer\Model\Indexer\Collection $indexerCollection */
-$indexerCollection = Bootstrap::getObjectManager()->get(\Magento\Indexer\Model\Indexer\Collection::class);
-$indexerCollection->load();
-/** @var \Magento\Indexer\Model\Indexer $indexer */
-foreach ($indexerCollection->getItems() as $indexer) {
-    $indexer->reindexAll();
-}
+
+// Run from CLI due to some classes involved in reindex process have state which do not allow to reindex
+$appDir = dirname(Bootstrap::getInstance()->getAppTempDir());
+$out = '';
+// phpcs:ignore Magento2.Security.InsecureFunction
+exec("php -f {$appDir}/bin/magento indexer:reindex catalogsearch_fulltext", $out);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_products.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_products.php
index dcdbed7562fdb..559a1109cd420 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_products.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/multiple_products.php
@@ -13,7 +13,7 @@
     ->setName('Simple Product1')
     ->setSku('simple1')
     ->setTaxClassId('none')
-    ->setDescription('description')
+    ->setDescription('description uniqueword')
     ->setShortDescription('short description')
     ->setOptionsContainer('container1')
     ->setMsrpDisplayActualPriceType(\Magento\Msrp\Model\Product\Attribute\Source\Type::TYPE_IN_CART)
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_for_relevance_sorting_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_for_relevance_sorting_rollback.php
index 5a1dd30c6b492..8c1de09d2d8e2 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_for_relevance_sorting_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_for_relevance_sorting_rollback.php
@@ -4,6 +4,10 @@
  * See COPYING.txt for license details.
  */
 
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Framework/Search/_files/products_rollback.php');
+
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 /** @var \Magento\Framework\Registry $registry */
 $registry = $objectManager->get(\Magento\Framework\Registry::class);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_list.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_list.php
index 93c4fa854c7f3..aa8bd2ca9c89b 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_list.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_list.php
@@ -29,6 +29,7 @@
 $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
     ->create(\Magento\Catalog\Model\Product::class);
 $product
+    ->setId(153)
     ->setTypeId('simple')
     ->setAttributeSetId(4)
     ->setWebsiteIds([1])
@@ -49,6 +50,7 @@
 $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
     ->create(\Magento\Catalog\Model\Product::class);
 $product
+    ->setId(156)
     ->setTypeId('simple')
     ->setAttributeSetId(4)
     ->setWebsiteIds([1])
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 7bee46bc2078f..29812aa942ab5 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
@@ -7,6 +7,7 @@
 
 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');
@@ -59,6 +60,7 @@
 
     /* Assign attribute to attribute set */
     $installer->addAttributeToGroup('catalog_product', 'Default', 'General', $attribute->getId());
+    CacheCleaner::cleanAll();
 }
 
 $eavConfig->clear();
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 379bf33ac4e3d..d94b42f604beb 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,113 +5,127 @@
  */
 declare(strict_types=1);
 
-use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
-use Magento\Catalog\Setup\CategorySetup;
-use Magento\Eav\Model\Config;
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Indexer\Model\Indexer;
-use Magento\Indexer\Model\Indexer\Collection as IndexerCollection;
 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;
 
 Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/attribute_set_based_on_default_set.php');
 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');
-/** @var Config $eavConfig */
-$eavConfig = $objectManager->get(Config::class);
-/** @var AttributeRepositoryInterface $attributeRepository */
-$attributeRepository = $objectManager->create(AttributeRepositoryInterface::class);
-/** @var CategorySetup $installer */
-$installer = $objectManager->create(CategorySetup::class);
+$eavConfig = Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class);
+$attribute = $eavConfig->getAttribute('catalog_product', 'test_configurable');
+
 $eavConfig->clear();
 
-$attribute = $eavConfig->getAttribute('catalog_product', 'test_configurable');
+$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 Attribute */
-    $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' => 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'
-    ]);
+
+    /** @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
-/** @var Attribute $secondAttribute */
-$secondAttribute = $eavConfig->getAttribute('catalog_product', ' second_test_configurable');
-if (!$secondAttribute->getId()) {
-    $secondAttribute->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' => 0,
-        'is_visible_in_advanced_search' => 0,
-        '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($secondAttribute);
+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(),
-        $secondAttribute->getId()
+        $attribute1->getId()
     );
 }
 
 $eavConfig->clear();
 
-/** @var ProductRepositoryInterface $productRepository */
-$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+/** @var \Magento\Framework\ObjectManagerInterface $objectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var  $productRepository \Magento\Catalog\Api\ProductRepositoryInterface */
+$productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
 $productsWithNewAttributeSet = ['simple', '12345', 'simple-4'];
 
 foreach ($productsWithNewAttributeSet as $sku) {
@@ -125,14 +139,14 @@
                 'is_in_stock' => 1]
         );
         $productRepository->save($product);
-    } catch (NoSuchEntityException $e) {
+    } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
 
     }
 }
+CacheCleaner::cleanAll();
 
-/** @var IndexerCollection $indexerCollection */
-$indexerCollection = $objectManager->get(IndexerCollection::class)->load();
-/** @var Indexer $indexer */
-foreach ($indexerCollection->getItems() as $indexer) {
-    $indexer->reindexAll();
-}
+// Run from CLI due to some classes involved in reindex process have state which do not allow to reindex
+$appDir = dirname(Bootstrap::getInstance()->getAppTempDir());
+$out = '';
+// phpcs:ignore Magento2.Security.InsecureFunction
+exec("php -f {$appDir}/bin/magento indexer:reindex catalogsearch_fulltext", $out);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_custom_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_custom_attribute_rollback.php
index f291127fe855d..6e1b20da18f18 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_custom_attribute_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_custom_attribute_rollback.php
@@ -5,44 +5,43 @@
  */
 declare(strict_types=1);
 
-use Magento\Eav\Api\Data\AttributeInterface;
-use Magento\Eav\Model\Config;
-use Magento\Eav\Model\Entity\Attribute\Set as AttributeSet;
-use Magento\Eav\Model\Entity\Type;
-use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection as AttributeSetCollection;
-use Magento\Framework\App\ObjectManager;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Eav\Api\AttributeRepositoryInterface;
+use Magento\TestFramework\Helper\CacheCleaner;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
 Resolver::getInstance()->requireDataFixture('Magento/Eav/_files/empty_attribute_set_rollback.php');
 Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/categories_rollback.php');
-/** @var ObjectManager $objectManager */
-$objectManager = Bootstrap::getObjectManager();
 
-$eavConfig = $objectManager->get(Config::class);
+$eavConfig = Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class);
 $attributesToDelete = ['test_configurable', 'second_test_configurable'];
 /** @var AttributeRepositoryInterface $attributeRepository */
-$attributeRepository = $objectManager->get(AttributeRepositoryInterface::class);
+$attributeRepository = Bootstrap::getObjectManager()->get(AttributeRepositoryInterface::class);
 
 foreach ($attributesToDelete as $attributeCode) {
-    /** @var AttributeInterface $attribute */
+    /** @var \Magento\Eav\Api\Data\AttributeInterface $attribute */
     $attribute = $attributeRepository->get('catalog_product', $attributeCode);
     $attributeRepository->delete($attribute);
 }
+/** @var $product \Magento\Catalog\Model\Product */
+$objectManager = Bootstrap::getObjectManager();
+
+$entityType = $objectManager->create(\Magento\Eav\Model\Entity\Type::class)->loadByCode('catalog_product');
 
 // remove attribute set
-$entityType = $objectManager->create(Type::class)->loadByCode('catalog_product');
-/** @var AttributeSetCollection $attributeSetCollection */
+
+/** @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection $attributeSetCollection */
 $attributeSetCollection = $objectManager->create(
-    AttributeSetCollection::class
+    \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection::class
 );
 $attributeSetCollection->addFilter('attribute_set_name', 'second_attribute_set');
 $attributeSetCollection->addFilter('entity_type_id', $entityType->getId());
-$attributeSetCollection->setOrder('attribute_set_id');
+$attributeSetCollection->setOrder('attribute_set_id'); // descending is default value
 $attributeSetCollection->setPageSize(1);
 $attributeSetCollection->load();
 
-/** @var AttributeSet $attributeSet */
+/** @var \Magento\Eav\Model\Entity\Attribute\Set $attributeSet */
 $attributeSet = $attributeSetCollection->fetchItem();
 $attributeSet->delete();
+
+CacheCleaner::cleanAll();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_with_multiselect_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_with_multiselect_attribute.php
index 81aad017d9619..efcd7fbf6a03d 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_with_multiselect_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_with_multiselect_attribute.php
@@ -4,54 +4,51 @@
  * 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\Type as ProductType;
-use Magento\Catalog\Model\Product\Visibility;
-use Magento\Catalog\Model\ResourceModel\Eav\Attribute as EavAttribute;
-use Magento\Catalog\Setup\CategorySetup;
-use Magento\Eav\Model\Config as EavConfig;
-use Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection as OptionCollection;
-use Magento\Indexer\Model\Indexer;
-use Magento\Indexer\Model\Indexer\Collection as IndexerCollection;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Eav\Api\AttributeRepositoryInterface;
+use Magento\TestFramework\Helper\CacheCleaner;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
+/**
+ * Create multiselect attribute
+ */
 Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/multiselect_attribute.php');
+
 /** Create product with options and multiselect attribute */
 
-$objectManager = Bootstrap::getObjectManager();
-/** @var CategorySetup $installer */
-$installer = $objectManager->create(CategorySetup::class);
+/** @var $installer \Magento\Catalog\Setup\CategorySetup */
+$installer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Catalog\Setup\CategorySetup::class
+);
 
-/** @var OptionCollection $options */
-$options = $objectManager->create(OptionCollection::class);
-$eavConfig = $objectManager->get(EavConfig::class);
+/** @var $options \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection */
+$options = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+    \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection::class
+);
+$eavConfig = Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class);
 
-/** @var $attribute EavAttribute */
+/** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
 $attribute = $eavConfig->getAttribute('catalog_product', 'multiselect_attribute');
 
 $eavConfig->clear();
 $attribute->setIsSearchable(1)
     ->setIsVisibleInAdvancedSearch(1)
-    ->setIsFilterable(false)
-    ->setIsFilterableInSearch(false)
-    ->setIsVisibleOnFront(0);
+    ->setIsFilterable(true)
+    ->setIsFilterableInSearch(true)
+    ->setIsVisibleOnFront(1);
 /** @var AttributeRepositoryInterface $attributeRepository */
-$attributeRepository = $objectManager->create(AttributeRepositoryInterface::class);
+$attributeRepository = Bootstrap::getObjectManager()->create(AttributeRepositoryInterface::class);
 $attributeRepository->save($attribute);
 
 $options->setAttributeFilter($attribute->getId());
 $optionIds = $options->getAllIds();
 
-/** @var ProductRepositoryInterface $productRepository */
-$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = Bootstrap::getObjectManager()->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
 
-/** @var Product $product */
-$product = $objectManager->create(Product::class);
-$product->setTypeId(ProductType::TYPE_SIMPLE)
+/** @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)
     ->setId($optionIds[0] * 10)
     ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default'))
     ->setWebsiteIds([1])
@@ -59,45 +56,45 @@
     ->setSku('simple_ms_1')
     ->setPrice(10)
     ->setDescription('Hello " &amp;" Bring the water bottle when you can!')
-    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setMultiselectAttribute([$optionIds[1],$optionIds[2]])
-    ->setStatus(Status::STATUS_ENABLED)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1]);
 $productRepository->save($product);
 
-$product = $objectManager->create(Product::class);
-$product->setTypeId(ProductType::TYPE_SIMPLE)
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
     ->setId($optionIds[1] * 10)
     ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default'))
     ->setWebsiteIds([1])
     ->setName('With Multiselect 2 and 3')
     ->setSku('simple_ms_2')
     ->setPrice(10)
-    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setMultiselectAttribute([$optionIds[2], $optionIds[3]])
-    ->setStatus(Status::STATUS_ENABLED)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1]);
 $productRepository->save($product);
 
-$product = $objectManager->create(Product::class);
-$product->setTypeId(ProductType::TYPE_SIMPLE)
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
     ->setId($optionIds[2] * 10)
     ->setAttributeSetId($installer->getAttributeSetId('catalog_product', 'Default'))
     ->setWebsiteIds([1])
     ->setName('With Multiselect 1 and 3')
     ->setSku('simple_ms_2')
     ->setPrice(10)
-    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setMultiselectAttribute([$optionIds[2], $optionIds[3]])
-    ->setStatus(Status::STATUS_ENABLED)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1]);
 
 $productRepository->save($product);
 
-/** @var IndexerCollection $indexerCollection */
-$indexerCollection = $objectManager->get(IndexerCollection::class);
-$indexerCollection->load();
-/** @var Indexer $indexer */
-foreach ($indexerCollection->getItems() as $indexer) {
-    $indexer->reindexAll();
-}
+CacheCleaner::cleanAll();
+
+// Run from CLI due to some classes involved in reindex process have state which do not allow to reindex
+$appDir = dirname(Bootstrap::getInstance()->getAppTempDir());
+$out = '';
+// phpcs:ignore Magento2.Security.InsecureFunction
+exec("php -f {$appDir}/bin/magento indexer:reindex catalogsearch_fulltext", $out);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_with_multiselect_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_with_multiselect_attribute_rollback.php
index 5bc32e97db955..0e8d1f6f1022e 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_with_multiselect_attribute_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_with_multiselect_attribute_rollback.php
@@ -3,29 +3,37 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-use Magento\Framework\Indexer\IndexerRegistry;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\Data\ProductSearchResultsInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
 Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/multiselect_attribute_rollback.php');
+
 /**
  * Remove all products as strategy of isolation process
  */
-$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Framework\Registry');
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$registry = $objectManager->get('Magento\Framework\Registry');
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 
-/** @var $productCollection \Magento\Catalog\Model\ResourceModel\Product */
-$productCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-    ->create('Magento\Catalog\Model\Product')
-    ->getCollection();
 
-foreach ($productCollection as $product) {
-    $product->delete();
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+
+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+$searchCriteriaBuilder->addFilter(ProductInterface::SKU, 'simple_ms_%', 'like');
+
+/** @var ProductSearchResultsInterface $products */
+$products = $productRepository->getList($searchCriteriaBuilder->create());
+/** @var ProductInterface $product */
+foreach ($products->getItems() as $product) {
+    $productRepository->delete($product);
 }
 
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
-
-\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(IndexerRegistry::class)
-    ->get(Magento\CatalogInventory\Model\Indexer\Stock\Processor::INDEXER_ID)
-    ->reindexAll();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute_with_source_model_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute_with_source_model_rollback.php
index 658b6d8e8908a..786a8f1d90a50 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute_with_source_model_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute_with_source_model_rollback.php
@@ -3,26 +3,36 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\Data\ProductSearchResultsInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
 Resolver::getInstance()->requireDataFixture(
     'Magento/Catalog/_files/multiselect_attribute_with_source_model_rollback.php'
 );
+
 /**
  * Remove all products as strategy of isolation process
  */
-$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Framework\Registry');
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$registry = $objectManager->get('Magento\Framework\Registry');
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 
-/** @var $productCollection \Magento\Catalog\Model\ResourceModel\Product */
-$productCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-    ->create('Magento\Catalog\Model\Product')
-    ->getCollection();
+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+$searchCriteriaBuilder->addFilter(ProductInterface::SKU, 'simple_mssm_%', 'like');
 
-foreach ($productCollection as $product) {
-    $product->delete();
+/** @var ProductSearchResultsInterface $products */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$products = $productRepository->getList($searchCriteriaBuilder->create());
+/** @var ProductInterface $product */
+foreach ($products->getItems() as $product) {
+    $productRepository->delete($product);
 }
 
 $registry->unregister('isSecureArea');
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteTest.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteTest.php
index d87a7ffd48c09..f8837f8d9c5d6 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteTest.php
@@ -9,18 +9,23 @@
 
 use Magento\Catalog\Api\CategoryLinkManagementInterface;
 use Magento\Catalog\Api\CategoryRepositoryInterface;
-use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\CategoryFactory;
-use Magento\Catalog\Model\ResourceModel\Category as CategoryResource;
+use Magento\Catalog\Model\ResourceModel\CategoryFactory as CategoryResourceFactory;
 use Magento\CatalogUrlRewrite\Model\Map\DataCategoryUrlRewriteDatabaseMap;
 use Magento\CatalogUrlRewrite\Model\Map\DataProductUrlRewriteDatabaseMap;
 use Magento\CatalogUrlRewrite\Model\ResourceModel\Category\Product;
-use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Store\Api\StoreRepositoryInterface;
 use Magento\Store\Model\ScopeInterface;
+use Magento\TestFramework\Helper\Bootstrap;
 use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
 use Magento\UrlRewrite\Model\OptionProvider;
 use Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollection;
+use Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollectionFactory;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class for category url rewrites tests
@@ -29,22 +34,34 @@
  * @magentoConfigFixture default/catalog/seo/generate_category_product_rewrites 1
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class CategoryUrlRewriteTest extends AbstractUrlRewriteTest
+class CategoryUrlRewriteTest extends TestCase
 {
+    /** @var ObjectManagerInterface */
+    private $objectManager;
+
+    /** @var CategoryFactory */
+    private $categoryFactory;
+
+    /** @var UrlRewriteCollectionFactory */
+    private $urlRewriteCollectionFactory;
+
     /** @var CategoryRepositoryInterface */
     private $categoryRepository;
 
-    /** @var CategoryResource */
-    private $categoryResource;
+    /** @var CategoryResourceFactory */
+    private $categoryResourceFactory;
 
     /** @var CategoryLinkManagementInterface */
-    private $categoryLinkManagement;
+    private $categoryLinkManagment;
 
-    /** @var CategoryFactory */
-    private $categoryFactory;
+    /** @var ProductRepositoryInterface */
+    private $productRepository;
+
+    /** @var StoreRepositoryInterface */
+    private $storeRepository;
 
-    /** @var string */
-    private $suffix;
+    /** @var ScopeConfigInterface */
+    private $config;
 
     /**
      * @inheritdoc
@@ -53,19 +70,18 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->categoryRepository = $this->objectManager->create(CategoryRepositoryInterface::class);
-        $this->categoryResource = $this->objectManager->get(CategoryResource::class);
-        $this->categoryLinkManagement = $this->objectManager->create(CategoryLinkManagementInterface::class);
+        $this->objectManager = Bootstrap::getObjectManager();
         $this->categoryFactory = $this->objectManager->get(CategoryFactory::class);
-        $this->suffix = $this->config->getValue(
-            CategoryUrlPathGenerator::XML_PATH_CATEGORY_URL_SUFFIX,
-            ScopeInterface::SCOPE_STORE
-        );
+        $this->urlRewriteCollectionFactory = $this->objectManager->get(UrlRewriteCollectionFactory::class);
+        $this->categoryRepository = $this->objectManager->create(CategoryRepositoryInterface::class);
+        $this->categoryResourceFactory = $this->objectManager->get(CategoryResourceFactory::class);
+        $this->categoryLinkManagment = $this->objectManager->create(CategoryLinkManagementInterface::class);
+        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        $this->storeRepository = $this->objectManager->create(StoreRepositoryInterface::class);
+        $this->config = $this->objectManager->get(ScopeConfigInterface::class);
     }
 
     /**
-     * Test url rewrite after category save
-     *
      * @magentoDataFixture Magento/Catalog/_files/category_with_position.php
      * @dataProvider categoryProvider
      * @param array $data
@@ -73,18 +89,25 @@ protected function setUp(): void
      */
     public function testUrlRewriteOnCategorySave(array $data): void
     {
-        $categoryModel = $this->saveCategory($data['data']);
+        $categoryModel = $this->categoryFactory->create();
+        $categoryModel->isObjectNew(true);
+        $categoryModel->setData($data['data']);
+        $categoryResource = $this->categoryResourceFactory->create();
+        $categoryResource->save($categoryModel);
         $this->assertNotNull($categoryModel->getId(), 'The category was not created');
-        $urlRewriteCollection = $this->getEntityRewriteCollection($categoryModel->getId());
-        $this->assertRewrites(
-            $urlRewriteCollection,
-            $this->prepareData($data['expected_data'], (int)$categoryModel->getId())
-        );
+        $urlRewriteCollection = $this->getCategoryRewriteCollection($categoryModel->getId());
+        foreach ($urlRewriteCollection as $item) {
+            foreach ($data['expected_data'] as $field => $expectedItem) {
+                $this->assertEquals(
+                    sprintf($expectedItem, $categoryModel->getId()),
+                    $item[$field],
+                    'The expected data does not match actual value'
+                );
+            }
+        }
     }
 
     /**
-     * Provider. categoryProvider
-     *
      * @return array
      */
     public function categoryProvider(): array
@@ -100,10 +123,8 @@ public function categoryProvider(): array
                         'is_active' => true,
                     ],
                     'expected_data' => [
-                        [
-                            'request_path' => 'test-category%suffix%',
-                            'target_path' => 'catalog/category/view/id/%id%',
-                        ],
+                        'request_path' => 'test-category.html',
+                        'target_path' => 'catalog/category/view/id/%s',
                     ],
                 ],
             ],
@@ -117,10 +138,8 @@ public function categoryProvider(): array
                         'is_active' => true,
                     ],
                     'expected_data' => [
-                        [
-                            'request_path' => 'category-1/test-sub-category%suffix%',
-                            'target_path' => 'catalog/category/view/id/%id%',
-                        ],
+                        'request_path' => 'category-1/test-sub-category.html',
+                        'target_path' => 'catalog/category/view/id/%s',
                     ],
                 ],
             ],
@@ -128,8 +147,6 @@ public function categoryProvider(): array
     }
 
     /**
-     * Test category product url rewrite
-     *
      * @magentoDataFixture Magento/Catalog/_files/category_tree.php
      * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
      * @dataProvider productRewriteProvider
@@ -139,16 +156,12 @@ public function categoryProvider(): array
     public function testCategoryProductUrlRewrite(array $data): void
     {
         $category = $this->categoryRepository->get(402);
-        $this->categoryLinkManagement->assignProductToCategories('simple2', [$category->getId()]);
-        $productRewriteCollection = $this->getCategoryProductRewriteCollection(
-            array_keys($category->getParentCategories())
-        );
-        $this->assertRewrites($productRewriteCollection, $this->prepareData($data));
+        $this->categoryLinkManagment->assignProductToCategories('simple2', [$category->getId()]);
+        $productRewriteCollection = $this->getProductRewriteCollection(array_keys($category->getParentCategories()));
+        $this->assertRewrites($productRewriteCollection, $data);
     }
 
     /**
-     * Provider. productRewriteProvider
-     *
      * @return array
      */
     public function productRewriteProvider(): array
@@ -157,15 +170,15 @@ public function productRewriteProvider(): array
             [
                 [
                     [
-                        'request_path' => 'category-1/category-1-1/category-1-1-1/simple-product2%suffix%',
+                        'request_path' => 'category-1/category-1-1/category-1-1-1/simple-product2.html',
                         'target_path' => 'catalog/product/view/id/6/category/402',
                     ],
                     [
-                        'request_path' => 'category-1/simple-product2%suffix%',
+                        'request_path' => 'category-1/simple-product2.html',
                         'target_path' => 'catalog/product/view/id/6/category/400',
                     ],
                     [
-                        'request_path' => 'category-1/category-1-1/simple-product2%suffix%',
+                        'request_path' => 'category-1/category-1-1/simple-product2.html',
                         'target_path' => 'catalog/product/view/id/6/category/401',
                     ],
                 ],
@@ -174,8 +187,6 @@ public function productRewriteProvider(): array
     }
 
     /**
-     * Test url rewrites after category save with existing url key
-     *
      * @magentoDataFixture Magento/CatalogUrlRewrite/_files/categories_with_products.php
      * @magentoAppIsolation enabled
      * @dataProvider existingUrlProvider
@@ -186,12 +197,13 @@ public function testUrlRewriteOnCategorySaveWithExistingUrlKey(array $data): voi
     {
         $this->expectException(UrlAlreadyExistsException::class);
         $this->expectExceptionMessage((string)__('URL key for specified store already exists.'));
-        $this->saveCategory($data);
+        $category = $this->categoryFactory->create();
+        $category->setData($data);
+        $categoryResource = $this->categoryResourceFactory->create();
+        $categoryResource->save($category);
     }
 
     /**
-     * Provider. existingUrlProvider
-     *
      * @return array
      */
     public function existingUrlProvider(): array
@@ -239,8 +251,6 @@ public function existingUrlProvider(): array
     }
 
     /**
-     * Test url rewrites after category move
-     *
      * @magentoDataFixture Magento/Catalog/_files/category_product.php
      * @magentoDataFixture Magento/Catalog/_files/catalog_category_with_slash.php
      * @dataProvider categoryMoveProvider
@@ -252,12 +262,10 @@ public function testUrlRewriteOnCategoryMove(array $data): void
         $categoryId = $data['data']['id'];
         $category = $this->categoryRepository->get($categoryId);
         $category->move($data['data']['pid'], $data['data']['aid']);
-        $productRewriteCollection = $this->getCategoryProductRewriteCollection(
-            array_keys($category->getParentCategories())
-        );
-        $categoryRewriteCollection = $this->getEntityRewriteCollection($categoryId);
-        $this->assertRewrites($categoryRewriteCollection, $this->prepareData($data['expected_data']['category']));
-        $this->assertRewrites($productRewriteCollection, $this->prepareData($data['expected_data']['product']));
+        $productRewriteCollection = $this->getProductRewriteCollection(array_keys($category->getParentCategories()));
+        $categoryRewriteCollection = $this->getCategoryRewriteCollection($categoryId);
+        $this->assertRewrites($categoryRewriteCollection, $data['expected_data']['category']);
+        $this->assertRewrites($productRewriteCollection, $data['expected_data']['product']);
     }
 
     /**
@@ -277,21 +285,21 @@ public function categoryMoveProvider(): array
                         'category' => [
                             [
                                 'request_path' => 'category-1.html',
-                                'target_path' => 'category-with-slash-symbol/category-1%suffix%',
+                                'target_path' => 'category-with-slash-symbol/category-1.html',
                                 'redirect_type' => OptionProvider::PERMANENT,
                             ],
                             [
-                                'request_path' => 'category-with-slash-symbol/category-1%suffix%',
+                                'request_path' => 'category-with-slash-symbol/category-1.html',
                                 'target_path' => 'catalog/category/view/id/333',
                             ],
                         ],
                         'product' => [
                             [
-                                'request_path' => 'category-with-slash-symbol/simple-product-three%suffix%',
+                                'request_path' => 'category-with-slash-symbol/simple-product-three.html',
                                 'target_path' => 'catalog/product/view/id/333/category/3331',
                             ],
                             [
-                                'request_path' => 'category-with-slash-symbol/category-1/simple-product-three%suffix%',
+                                'request_path' => 'category-with-slash-symbol/category-1/simple-product-three.html',
                                 'target_path' => 'catalog/product/view/id/333/category/333',
                             ],
                         ],
@@ -302,14 +310,14 @@ public function categoryMoveProvider(): array
     }
 
     /**
-     * Test url rewrites after category delete
      * @magentoDataFixture Magento/Catalog/_files/category.php
+     * @magentoAppArea adminhtml
      * @return void
      */
     public function testUrlRewritesAfterCategoryDelete(): void
     {
         $categoryId = 333;
-        $categoryItemIds = $this->getEntityRewriteCollection($categoryId)->getAllIds();
+        $categoryItemIds = $this->getCategoryRewriteCollection($categoryId)->getAllIds();
         $this->categoryRepository->deleteByIdentifier($categoryId);
         $this->assertEmpty(
             array_intersect($this->getAllRewriteIds(), $categoryItemIds),
@@ -318,8 +326,6 @@ public function testUrlRewritesAfterCategoryDelete(): void
     }
 
     /**
-     * Test url rewrites after category with products delete
-     *
      * @magentoAppArea adminhtml
      * @magentoDataFixture Magento/CatalogUrlRewrite/_files/categories_with_product_ids.php
      * @return void
@@ -328,8 +334,8 @@ public function testUrlRewritesAfterCategoryWithProductsDelete(): void
     {
         $category = $this->categoryRepository->get(3);
         $childIds = explode(',', $category->getAllChildren());
-        $productRewriteIds = $this->getCategoryProductRewriteCollection($childIds)->getAllIds();
-        $categoryItemIds = $this->getEntityRewriteCollection($childIds)->getAllIds();
+        $productRewriteIds = $this->getProductRewriteCollection($childIds)->getAllIds();
+        $categoryItemIds = $this->getCategoryRewriteCollection($childIds)->getAllIds();
         $this->categoryRepository->deleteByIdentifier($category->getId());
         $allIds = $this->getAllRewriteIds();
         $this->assertEmpty(
@@ -343,8 +349,6 @@ public function testUrlRewritesAfterCategoryWithProductsDelete(): void
     }
 
     /**
-     * Test category url rewrite per Store Views
-     *
      * @magentoDataFixture Magento/Store/_files/second_store.php
      * @magentoDataFixture Magento/Catalog/_files/category.php
      * @return void
@@ -360,12 +364,11 @@ public function testCategoryUrlRewritePerStoreViews(): void
         $categoryId = 333;
         $category = $this->categoryRepository->get($categoryId);
         $urlKeyFirstStore = $category->getUrlKey();
-        $this->saveCategory(
-            ['store_id' => $secondStoreId, 'url_key' => $urlKeySecondStore],
-            $category
-        );
-        $urlRewriteItems = $this->getEntityRewriteCollection($categoryId)->getItems();
-        $this->assertTrue(count($urlRewriteItems) == 2);
+        $category->setStoreId($secondStoreId);
+        $category->setUrlKey($urlKeySecondStore);
+        $categoryResource = $this->categoryResourceFactory->create();
+        $categoryResource->save($category);
+        $urlRewriteItems = $this->getCategoryRewriteCollection($categoryId)->getItems();
         foreach ($urlRewriteItems as $item) {
             $item->getData('store_id') == $secondStoreId
                 ? $this->assertEquals($urlKeySecondStore . $urlSuffix, $item->getRequestPath())
@@ -374,103 +377,74 @@ public function testCategoryUrlRewritePerStoreViews(): void
     }
 
     /**
-     * Test category url rewrite while reassign store view
+     * Get products url rewrites collection referred to categories
      *
-     * @magentoAppArea adminhtml
-     * @magentoDataFixture Magento/Store/_files/second_store_group_with_second_website.php
-     * @magentoDataFixture Magento/Catalog/_files/category.php
-     * @return void
+     * @param string|array $categoryId
+     * @return UrlRewriteCollection
      */
-    public function testCategoryUrlRewriteMovingToOtherStoreView(): void
+    private function getProductRewriteCollection($categoryId): UrlRewriteCollection
     {
-        $categoryId = 333;
-        $store = $this->storeRepository->get('default');
-        $storeId = $store->getId();
-        $urlRewrites = [
-            ['category-1-updated.html', 'category-1.html'],
-            ['category-1-most-recent.html', 'category-1-updated.html'],
-        ];
-        foreach ($urlRewrites as $rewrite) {
-            /** @var \Magento\UrlRewrite\Model\UrlRewrite $urlRewrite */
-            $urlRewrite = $this->objectManager->create(\Magento\UrlRewrite\Model\UrlRewrite::class);
-            $urlRewrite->setEntityType(\Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator::ENTITY_TYPE)
-                ->setEntityId($categoryId)
-                ->setRequestPath($rewrite[0])
-                ->setTargetPath($rewrite[1])
-                ->setRedirectType(\Magento\UrlRewrite\Model\OptionProvider::PERMANENT)
-                ->setStoreId($storeId);
-            $urlRewrite->save();
-        }
-
-        /** @var WebsiteRepositoryInterface $websiteRepo */
-        $websiteRepo = $this->objectManager->get(WebsiteRepositoryInterface::class);
-        $website = $websiteRepo->get('test');
-        $group = $website->getDefaultGroup();
-        $group->setRootCategoryId(2);
-        $group->save();
-        $groupId = $group->getId();
-        $store->setStoreGroupId($groupId);
-        $store->save();
+        $condition = is_array($categoryId) ? ['in' => $categoryId] : $categoryId;
+        $productRewriteCollection = $this->urlRewriteCollectionFactory->create();
+        $productRewriteCollection
+            ->join(
+                ['p' => Product::TABLE_NAME],
+                'main_table.url_rewrite_id = p.url_rewrite_id',
+                'category_id'
+            )
+            ->addFieldToFilter('category_id', $condition)
+            ->addFieldToFilter(UrlRewrite::ENTITY_TYPE, ['eq' => DataProductUrlRewriteDatabaseMap::ENTITY_TYPE]);
 
-        $urlRewriteItems = $this->getEntityRewriteCollection($categoryId)->getItems();
-        $this->assertTrue(count($urlRewriteItems) === 3);
-        $expectedRewriteRequestPaths = ['category-1.html', 'category-1-updated.html', 'category-1-most-recent.html'];
-        foreach ($urlRewriteItems as $item) {
-            $this->assertTrue(in_array($item->getRequestPath(), $expectedRewriteRequestPaths));
-        }
+        return $productRewriteCollection;
     }
 
     /**
-     * @inheritdoc
+     * Retrieve all rewrite ids
+     *
+     * @return array
      */
-    protected function getUrlSuffix(): string
+    private function getAllRewriteIds(): array
     {
-        return $this->suffix;
-    }
+        $urlRewriteCollection = $this->urlRewriteCollectionFactory->create();
 
-    /**
-     * @inheritdoc
-     */
-    protected function getEntityType(): string
-    {
-        return DataCategoryUrlRewriteDatabaseMap::ENTITY_TYPE;
+        return $urlRewriteCollection->getAllIds();
     }
 
     /**
-     * Save product with data using resource model directly
+     * Get category url rewrites collection
      *
-     * @param array $data
-     * @param CategoryInterface|null $category
-     * @return CategoryInterface
+     * @param string|array $categoryId
+     * @return UrlRewriteCollection
      */
-    private function saveCategory(array $data, $category = null): CategoryInterface
+    private function getCategoryRewriteCollection($categoryId): UrlRewriteCollection
     {
-        $category = $category ?: $this->categoryFactory->create();
-        $category->addData($data);
-        $this->categoryResource->save($category);
+        $condition = is_array($categoryId) ? ['in' => $categoryId] : $categoryId;
+        $categoryRewriteCollection = $this->urlRewriteCollectionFactory->create();
+        $categoryRewriteCollection->addFieldToFilter(UrlRewrite::ENTITY_ID, $condition)
+            ->addFieldToFilter(UrlRewrite::ENTITY_TYPE, ['eq' => DataCategoryUrlRewriteDatabaseMap::ENTITY_TYPE]);
 
-        return $category;
+        return $categoryRewriteCollection;
     }
 
     /**
-     * Get products url rewrites collection referred to categories
+     * Check that actual data contains of expected values
      *
-     * @param string|array $categoryId
-     * @return UrlRewriteCollection
+     * @param UrlRewriteCollection $collection
+     * @param array $expectedData
+     * @return void
      */
-    private function getCategoryProductRewriteCollection($categoryId): UrlRewriteCollection
+    private function assertRewrites(UrlRewriteCollection $collection, array $expectedData): void
     {
-        $condition = is_array($categoryId) ? ['in' => $categoryId] : $categoryId;
-        $productRewriteCollection = $this->urlRewriteCollectionFactory->create();
-        $productRewriteCollection
-            ->join(
-                ['p' => $this->categoryResource->getTable(Product::TABLE_NAME)],
-                'main_table.url_rewrite_id = p.url_rewrite_id',
-                'category_id'
-            )
-            ->addFieldToFilter('category_id', $condition)
-            ->addFieldToFilter(UrlRewrite::ENTITY_TYPE, ['eq' => DataProductUrlRewriteDatabaseMap::ENTITY_TYPE]);
-
-        return $productRewriteCollection;
+        $collectionItems = $collection->toArray()['items'];
+        foreach ($collectionItems as $item) {
+            $found = false;
+            foreach ($expectedData as $expectedItem) {
+                $found = array_intersect_assoc($item, $expectedItem) == $expectedItem;
+                if ($found) {
+                    break;
+                }
+            }
+            $this->assertTrue($found, 'The actual data does not contains of expected values');
+        }
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_first.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_first.php
new file mode 100644
index 0000000000000..d882d6058f50c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_first.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Eav\Api\AttributeRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$eavConfig = Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class);
+$firstAttribute = $eavConfig->getAttribute('catalog_product', 'test_configurable_first');
+
+$eavConfig->clear();
+
+/** @var $installer \Magento\Catalog\Setup\CategorySetup */
+$installer = Bootstrap::getObjectManager()->create(\Magento\Catalog\Setup\CategorySetup::class);
+
+if (!$firstAttribute->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);
+
+    $firstAttribute->setData(
+        [
+            'attribute_code' => 'test_configurable_first',
+            '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 First'],
+            'backend_type' => 'int',
+            'option' => [
+                'value' => [
+                    'first_option_0' => ['First Option 1'],
+                    'first_option_1' => ['First Option 2'],
+                    'first_option_2' => ['First Option 3'],
+                    'first_option_3' => ['First Option 4']
+                ],
+                'order' => ['first_option_0' => 1, 'first_option_1' => 2, 'first_option_2' => 3, 'first_option_3' => 4],
+            ],
+        ]
+    );
+
+    $attributeRepository->save($firstAttribute);
+
+    /* Assign attribute to attribute set */
+    $installer->addAttributeToGroup('catalog_product', 'Default', 'General', $firstAttribute->getId());
+}
+
+$eavConfig->clear();
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_first_rollback.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_first_rollback.php
new file mode 100644
index 0000000000000..9ce9b543c5485
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_first_rollback.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+$productCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Model\ResourceModel\Product\Collection::class);
+foreach ($productCollection as $product) {
+    $product->delete();
+}
+
+$eavConfig = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class);
+$attribute = $eavConfig->getAttribute('catalog_product', 'test_configurable_first');
+if ($attribute instanceof \Magento\Eav\Model\Entity\Attribute\AbstractAttribute
+    && $attribute->getId()
+) {
+    $attribute->delete();
+}
+$eavConfig->clear();
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_category_and_weight.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_category_and_weight.php
index 879d19a0d0b96..c3c644842766b 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_category_and_weight.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_category_and_weight.php
@@ -20,7 +20,7 @@
 
 \Magento\TestFramework\Helper\Bootstrap::getInstance()->reinitialize();
 
-Resolver::getInstance()->requireDataFixture('Magento/ConfigurableProduct/_files/configurable_attribute.php');
+Resolver::getInstance()->requireDataFixture('Magento/ConfigurableProduct/_files/configurable_attribute_first.php');
 Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/category.php');
 
 /** @var ProductRepositoryInterface $productRepository */
@@ -31,7 +31,7 @@
 $installer = Bootstrap::getObjectManager()->create(CategorySetup::class);
 /** @var Config $eavConfig */
 $eavConfig = Bootstrap::getObjectManager()->get(Config::class);
-$attribute = $eavConfig->getAttribute(Product::ENTITY, 'test_configurable');
+$attribute = $eavConfig->getAttribute(Product::ENTITY, 'test_configurable_first');
 /* Create simple products per each option value*/
 /** @var AttributeOptionInterface[] $options */
 $options = $attribute->getOptions();
@@ -46,113 +46,118 @@
     20 => Visibility::VISIBILITY_IN_CATALOG
 ];
 
+$i = 0;
 foreach ($options as $option) {
-    /** @var $product Product */
-    $product = Bootstrap::getObjectManager()->create(Product::class);
-    $productId = array_shift($productIds);
-    $product->setTypeId(Type::TYPE_SIMPLE)
-        ->setId($productId)
-        ->setAttributeSetId($attributeSetId)
-        ->setWebsiteIds([1])
-        ->setName('Configurable Option' . $option->getLabel())
-        ->setSku('simple_' . $productId)
-        ->setPrice($productId)
-        ->setTestConfigurable($option->getValue())
-        ->setVisibility($visibility[$productId])
-        ->setStatus(Status::STATUS_ENABLED)
-        ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1]);
-    $eavAttributeValues = [
-        'category_ids' => [333]
+    if ($i < 2) {
+        /** @var $product Product */
+        $product = Bootstrap::getObjectManager()->create(Product::class);
+        $productId = array_shift($productIds);
+        $product->setTypeId(Type::TYPE_SIMPLE)
+            ->setId($productId)
+            ->setAttributeSetId($attributeSetId)
+            ->setWebsiteIds([1])
+            ->setName('Configurable Option' . $option->getLabel())
+            ->setSku('simple_' . $productId)
+            ->setPrice($productId)
+            ->setTestConfigurable($option->getValue())
+            ->setVisibility($visibility[$productId])
+            ->setStatus(Status::STATUS_ENABLED)
+            ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1]);
+        $eavAttributeValues = [
+            'category_ids' => [333],
+            $attribute->getAttributeCode() => $option->getValue()
         ];
-    foreach ($eavAttributeValues as $eavCategoryAttributeCode => $eavCategoryAttributeValues) {
-        $product->setCustomAttribute($eavCategoryAttributeCode, $eavCategoryAttributeValues);
-    }
-
-    $product = $productRepository->save($product);
-
-    /**
-     * @var \Magento\TestFramework\ObjectManager $objectManager
-     */
-    $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-
-    /**
-     * @var \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterfaceFactory $mediaGalleryEntryFactory
-     */
-
-    $mediaGalleryEntryFactory = $objectManager->get(
-        \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterfaceFactory::class
-    );
-
-    /**
-     * @var \Magento\Framework\Api\Data\ImageContentInterfaceFactory $imageContentFactory
-     */
-    $imageContentFactory = $objectManager->get(\Magento\Framework\Api\Data\ImageContentInterfaceFactory::class);
-    $imageContent = $imageContentFactory->create();
-    $testImagePath = __DIR__ .'/magento_image.jpg';
-    $imageContent->setBase64EncodedData(base64_encode(file_get_contents($testImagePath)));
-    $imageContent->setType("image/jpeg");
-    $imageContent->setName("1.jpg");
-
-    $video = $mediaGalleryEntryFactory->create();
-    $video->setDisabled(false);
-    $video->setFile('1.jpg');
-    $video->setLabel('Video Label');
-    $video->setMediaType('external-video');
-    $video->setPosition(2);
-    $video->setContent($imageContent);
-
-    /**
-     * @var ProductAttributeMediaGalleryEntryExtensionFactory $mediaGalleryEntryExtensionFactory
-     */
-    $mediaGalleryEntryExtensionFactory = $objectManager->get(
-        \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryExtensionFactory::class
-    );
-    $mediaGalleryEntryExtension = $mediaGalleryEntryExtensionFactory->create();
-
-    /**
-     * @var \Magento\Framework\Api\Data\VideoContentInterfaceFactory $videoContentFactory
-     */
-    $videoContentFactory = $objectManager->get(
-        \Magento\Framework\Api\Data\VideoContentInterfaceFactory::class
-    );
-    $videoContent = $videoContentFactory->create();
-    $videoContent->setMediaType('external-video');
-    $videoContent->setVideoDescription('Video description');
-    $videoContent->setVideoProvider('youtube');
-    $videoContent->setVideoMetadata('Video Metadata');
-    $videoContent->setVideoTitle('Video title');
-    $videoContent->setVideoUrl('http://www.youtube.com/v/tH_2PFNmWoga');
-
-    $mediaGalleryEntryExtension->setVideoContent($videoContent);
-    $video->setExtensionAttributes($mediaGalleryEntryExtension);
-
-    /**
-     * @var \Magento\Catalog\Api\ProductAttributeMediaGalleryManagementInterface $mediaGalleryManagement
-     */
-    $mediaGalleryManagement = $objectManager->get(
-        \Magento\Catalog\Api\ProductAttributeMediaGalleryManagementInterface::class
-    );
-    $mediaGalleryManagement->create('simple_' . $productId, $video);
-
-    /** @var \Magento\CatalogInventory\Model\Stock\Item $stockItem */
-    $stockItem = Bootstrap::getObjectManager()->create(\Magento\CatalogInventory\Model\Stock\Item::class);
-    $stockItem->load($productId, 'product_id');
-
-    if (!$stockItem->getProductId()) {
-        $stockItem->setProductId($productId);
+        foreach ($eavAttributeValues as $eavCategoryAttributeCode => $eavCategoryAttributeValues) {
+            $product->setCustomAttribute($eavCategoryAttributeCode, $eavCategoryAttributeValues);
+        }
+
+        $product = $productRepository->save($product);
+
+        /**
+         * @var \Magento\TestFramework\ObjectManager $objectManager
+         */
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        /**
+         * @var \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterfaceFactory $mediaGalleryEntryFactory
+         */
+
+        $mediaGalleryEntryFactory = $objectManager->get(
+            \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterfaceFactory::class
+        );
+
+        /**
+         * @var \Magento\Framework\Api\Data\ImageContentInterfaceFactory $imageContentFactory
+         */
+        $imageContentFactory = $objectManager->get(\Magento\Framework\Api\Data\ImageContentInterfaceFactory::class);
+        $imageContent = $imageContentFactory->create();
+        $testImagePath = __DIR__ .'/magento_image.jpg';
+        $imageContent->setBase64EncodedData(base64_encode(file_get_contents($testImagePath)));
+        $imageContent->setType("image/jpeg");
+        $imageContent->setName("1.jpg");
+
+        $video = $mediaGalleryEntryFactory->create();
+        $video->setDisabled(false);
+        $video->setFile('1.jpg');
+        $video->setLabel('Video Label');
+        $video->setMediaType('external-video');
+        $video->setPosition(2);
+        $video->setContent($imageContent);
+
+        /**
+         * @var ProductAttributeMediaGalleryEntryExtensionFactory $mediaGalleryEntryExtensionFactory
+         */
+        $mediaGalleryEntryExtensionFactory = $objectManager->get(
+            \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryExtensionFactory::class
+        );
+        $mediaGalleryEntryExtension = $mediaGalleryEntryExtensionFactory->create();
+
+        /**
+         * @var \Magento\Framework\Api\Data\VideoContentInterfaceFactory $videoContentFactory
+         */
+        $videoContentFactory = $objectManager->get(
+            \Magento\Framework\Api\Data\VideoContentInterfaceFactory::class
+        );
+        $videoContent = $videoContentFactory->create();
+        $videoContent->setMediaType('external-video');
+        $videoContent->setVideoDescription('Video description');
+        $videoContent->setVideoProvider('youtube');
+        $videoContent->setVideoMetadata('Video Metadata');
+        $videoContent->setVideoTitle('Video title');
+        $videoContent->setVideoUrl('http://www.youtube.com/v/tH_2PFNmWoga');
+
+        $mediaGalleryEntryExtension->setVideoContent($videoContent);
+        $video->setExtensionAttributes($mediaGalleryEntryExtension);
+
+        /**
+         * @var \Magento\Catalog\Api\ProductAttributeMediaGalleryManagementInterface $mediaGalleryManagement
+         */
+        $mediaGalleryManagement = $objectManager->get(
+            \Magento\Catalog\Api\ProductAttributeMediaGalleryManagementInterface::class
+        );
+        $mediaGalleryManagement->create('simple_' . $productId, $video);
+
+        /** @var \Magento\CatalogInventory\Model\Stock\Item $stockItem */
+        $stockItem = Bootstrap::getObjectManager()->create(\Magento\CatalogInventory\Model\Stock\Item::class);
+        $stockItem->load($productId, 'product_id');
+
+        if (!$stockItem->getProductId()) {
+            $stockItem->setProductId($productId);
+        }
+        $stockItem->setUseConfigManageStock(1);
+        $stockItem->setQty(1000);
+        $stockItem->setIsQtyDecimal(0);
+        $stockItem->setIsInStock(1);
+        $stockItem->save();
+
+        $attributeValues[] = [
+            'label' => 'test',
+            'attribute_id' => $attribute->getId(),
+            'value_index' => $option->getValue(),
+        ];
+        $associatedProductIds[] = $product->getId();
+        $i++;
     }
-    $stockItem->setUseConfigManageStock(1);
-    $stockItem->setQty(1000);
-    $stockItem->setIsQtyDecimal(0);
-    $stockItem->setIsInStock(1);
-    $stockItem->save();
-
-    $attributeValues[] = [
-        'label' => 'test',
-        'attribute_id' => $attribute->getId(),
-        'value_index' => $option->getValue(),
-    ];
-    $associatedProductIds[] = $product->getId();
 }
 
 /** @var $product Product */
@@ -164,8 +169,8 @@
 $configurableAttributesData = [
     [
         'attribute_id' => $attribute->getId(),
-        'code' => $attribute->getAttributeCode(),
-        'label' => $attribute->getStoreLabel(),
+        'code' => $firstAttribute->getAttributeCode(),
+        'label' => $firstAttribute->getStoreLabel(),
         'position' => '0',
         'values' => $attributeValues,
     ],
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_category_and_weight_rollback.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_category_and_weight_rollback.php
index ba3fad88c1fba..570679853fb87 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_category_and_weight_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_category_and_weight_rollback.php
@@ -3,7 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
 Resolver::getInstance()->requireDataFixture('Magento/ConfigurableProduct/_files/product_configurable_rollback.php');
-Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/category.php');
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/category_rollback.php');
+Resolver::getInstance()->requireDataFixture(
+    'Magento/ConfigurableProduct/_files/configurable_attribute_first_rollback.php'
+);
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_frontend_label_attribute.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_frontend_label_attribute.php
index 2edee8ee07eec..353b6247c5a0b 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_frontend_label_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_frontend_label_attribute.php
@@ -5,27 +5,20 @@
  */
 declare(strict_types=1);
 
-use Magento\Catalog\Model\Product;
 use Magento\Eav\Api\AttributeRepositoryInterface;
-use Magento\Eav\Model\Config;
 use Magento\Eav\Model\Entity\Attribute\FrontendLabel;
 use Magento\TestFramework\Helper\Bootstrap;
-use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-Resolver::getInstance()->requireDataFixture('Magento/ConfigurableProduct/_files/configurable_products.php');
+require __DIR__ . '/configurable_products.php';
 
-$objectManager = Bootstrap::getObjectManager();
-/** @var AttributeRepositoryInterface $attributeRepository */
-$attributeRepository = $objectManager->create(AttributeRepositoryInterface::class);
 // Add frontend label to created attribute:
-$frontendLabelAttribute = $objectManager->get(FrontendLabel::class);
+$frontendLabelAttribute = Bootstrap::getObjectManager()->get(FrontendLabel::class);
 $frontendLabelAttribute->setStoreId(1);
 $frontendLabelAttribute->setLabel('Default Store View label');
-/** @var Config $eavConfig */
-$eavConfig = $objectManager->get(Config::class);
-$attribute = $eavConfig->getAttribute(Product::ENTITY, 'test_configurable');
+
 $frontendLabels = $attribute->getFrontendLabels();
 $frontendLabels[] = $frontendLabelAttribute;
 
 $attribute->setFrontendLabels($frontendLabels);
+$attributeRepository = Bootstrap::getObjectManager()->create(AttributeRepositoryInterface::class);
 $attributeRepository->save($attribute);
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_simple_77.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_simple_77.php
index 4e581ee0e995a..1419bec32431c 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_simple_77.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_simple_77.php
@@ -75,7 +75,14 @@
         ]
     )->setCanSaveCustomOptions(true)
     ->setHasOptions(true)
-    ->setCustomAttribute('test_configurable', 42);
+    ->setCustomAttribute(
+        'test_configurable',
+        Bootstrap::getObjectManager()
+            ->create(\Magento\Eav\Api\AttributeRepositoryInterface::class)
+            ->get('catalog_product', 'test_configurable')
+            ->getOptions()[1]
+            ->getValue()
+    );
 
 $oldOptions = [
     [
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/_files/downloadable_product_with_files_and_sample_url.php b/dev/tests/integration/testsuite/Magento/Downloadable/_files/downloadable_product_with_files_and_sample_url.php
index e312d973aeb17..22e95a329361d 100644
--- a/dev/tests/integration/testsuite/Magento/Downloadable/_files/downloadable_product_with_files_and_sample_url.php
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/_files/downloadable_product_with_files_and_sample_url.php
@@ -169,4 +169,4 @@
 
 /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
 $productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
-$productRepository->save($product)->getData();
+$productRepository->save($product);

From 46f6188b0f0f00ee5ac16117e661ab90aba64887 Mon Sep 17 00:00:00 2001
From: Leonid Poluianov <poluyano@adobe.com>
Date: Wed, 22 Jul 2020 17:37:45 -0500
Subject: [PATCH 1206/1718] Deliver catalog storefront tests changes to
 mainline

---
 .../integration/testsuite/Magento/Framework/Console/CliTest.php  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Console/CliTest.php b/dev/tests/integration/testsuite/Magento/Framework/Console/CliTest.php
index 6f7534d67e499..c6aeaf9e0f927 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Console/CliTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Console/CliTest.php
@@ -83,7 +83,6 @@ protected function tearDown(): void
      * @param bool $isPub
      * @param array $params
      * @dataProvider documentRootIsPubProvider
-     * @magentoAppIsolation enabled
      */
     public function testDocumentRootIsPublic($isPub, $params)
     {

From 9faeb82afaa1fb692712151897fd83bdb070fcbd Mon Sep 17 00:00:00 2001
From: Leonid Poluianov <poluyano@adobe.com>
Date: Wed, 22 Jul 2020 17:38:52 -0500
Subject: [PATCH 1207/1718] Deliver catalog storefront tests changes to
 mainline

---
 ...configurable_with_frontend_label_attribute.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_frontend_label_attribute.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_frontend_label_attribute.php
index 353b6247c5a0b..2edee8ee07eec 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_frontend_label_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_frontend_label_attribute.php
@@ -5,20 +5,27 @@
  */
 declare(strict_types=1);
 
+use Magento\Catalog\Model\Product;
 use Magento\Eav\Api\AttributeRepositoryInterface;
+use Magento\Eav\Model\Config;
 use Magento\Eav\Model\Entity\Attribute\FrontendLabel;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-require __DIR__ . '/configurable_products.php';
+Resolver::getInstance()->requireDataFixture('Magento/ConfigurableProduct/_files/configurable_products.php');
 
+$objectManager = Bootstrap::getObjectManager();
+/** @var AttributeRepositoryInterface $attributeRepository */
+$attributeRepository = $objectManager->create(AttributeRepositoryInterface::class);
 // Add frontend label to created attribute:
-$frontendLabelAttribute = Bootstrap::getObjectManager()->get(FrontendLabel::class);
+$frontendLabelAttribute = $objectManager->get(FrontendLabel::class);
 $frontendLabelAttribute->setStoreId(1);
 $frontendLabelAttribute->setLabel('Default Store View label');
-
+/** @var Config $eavConfig */
+$eavConfig = $objectManager->get(Config::class);
+$attribute = $eavConfig->getAttribute(Product::ENTITY, 'test_configurable');
 $frontendLabels = $attribute->getFrontendLabels();
 $frontendLabels[] = $frontendLabelAttribute;
 
 $attribute->setFrontendLabels($frontendLabels);
-$attributeRepository = Bootstrap::getObjectManager()->create(AttributeRepositoryInterface::class);
 $attributeRepository->save($attribute);

From 52c99d72d856f44bc764a9e34cc205fe985be9b6 Mon Sep 17 00:00:00 2001
From: Leonid Poluianov <poluyano@adobe.com>
Date: Thu, 23 Jul 2020 09:01:41 -0500
Subject: [PATCH 1208/1718] Deliver catalog storefront tests changes to
 mainline

---
 ...urable_products_with_custom_attribute_layered_navigation.php | 2 ++
 .../integration/testsuite/Magento/Wishlist/_files/wishlist.php  | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

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 0b77895803c8b..f84e23156f25c 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,6 +5,8 @@
  */
 declare(strict_types=1);
 
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
 Resolver::getInstance()->requireDataFixture('Magento/ConfigurableProduct/_files/configurable_products.php');
 
 use Magento\TestFramework\Helper\Bootstrap;
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist.php
index 3cd71fe36ffe3..e7284f3d650be 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist.php
@@ -38,4 +38,3 @@
 $indexer = Bootstrap::getObjectManager()->create(\Magento\Indexer\Model\Indexer::class);
 $indexer->load('catalog_product_price');
 $indexer->reindexList([$product->getId()]);
-

From e9de2f4c573057336c849fb0004f266be7437598 Mon Sep 17 00:00:00 2001
From: Leonid Poluianov <poluyano@adobe.com>
Date: Thu, 23 Jul 2020 11:29:14 -0500
Subject: [PATCH 1209/1718] Github #99: Sync "develop-storefront" with master
 branches

---
 .../products_with_layered_navigation_custom_attribute.php    | 5 +++++
 1 file changed, 5 insertions(+)

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 d94b42f604beb..a2072cb7918ac 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
@@ -9,10 +9,15 @@
 use Magento\Eav\Api\AttributeRepositoryInterface;
 use Magento\TestFramework\Helper\CacheCleaner;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+use Magento\TestFramework\Eav\Model\GetAttributeSetByName;
 
 Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/attribute_set_based_on_default_set.php');
 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');
 

From cfa292592ba1ecd5bd20fb75e00699d914301914 Mon Sep 17 00:00:00 2001
From: Leonid Poluianov <poluyano@adobe.com>
Date: Thu, 23 Jul 2020 14:40:12 -0500
Subject: [PATCH 1210/1718] Github #99: Sync "develop-storefront" with master
 branches

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

diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_category_and_weight.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_category_and_weight.php
index c3c644842766b..91eb1d709b8f0 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_category_and_weight.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_category_and_weight.php
@@ -169,8 +169,8 @@
 $configurableAttributesData = [
     [
         'attribute_id' => $attribute->getId(),
-        'code' => $firstAttribute->getAttributeCode(),
-        'label' => $firstAttribute->getStoreLabel(),
+        'code' => $attribute->getAttributeCode(),
+        'label' => $attribute->getStoreLabel(),
         'position' => '0',
         'values' => $attributeValues,
     ],

From ec05ff6c437c9955b70dee67353438da1561ca7b Mon Sep 17 00:00:00 2001
From: Leonid Poluianov <poluyano@adobe.com>
Date: Fri, 24 Jul 2020 09:04:02 -0500
Subject: [PATCH 1211/1718] Github #99: Sync "develop-storefront" with master
 branches

---
 lib/internal/Magento/Framework/Api/DataObjectHelper.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/internal/Magento/Framework/Api/DataObjectHelper.php b/lib/internal/Magento/Framework/Api/DataObjectHelper.php
index 1426b8c8ec721..e88bee2e9e4bd 100644
--- a/lib/internal/Magento/Framework/Api/DataObjectHelper.php
+++ b/lib/internal/Magento/Framework/Api/DataObjectHelper.php
@@ -213,6 +213,7 @@ protected function setComplexValue(
             $object = $this->extensionFactory->create(get_class($dataObject), ['data' => $value]);
         } else {
             $object = $this->objectFactory->create($returnType, $value);
+            $this->populateWithArray($object, $value, $returnType);
         }
         $dataObject->$methodName($object);
         return $this;

From d629a1e1b2f267d7b68964ce606bfc89940e334f Mon Sep 17 00:00:00 2001
From: Leonid Poluianov <poluyano@adobe.com>
Date: Mon, 27 Jul 2020 14:23:38 -0500
Subject: [PATCH 1212/1718] Github #99: Sync "develop-storefront" with master
 branches

 - Fixed issue with product status update after products import
---
 .../Model/Import/Product/StatusProcessor.php                   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/StatusProcessor.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/StatusProcessor.php
index 1c6d679848216..27869cf1d771b 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/StatusProcessor.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/StatusProcessor.php
@@ -101,7 +101,8 @@ public function loadOldStatus(array $linkIdBySku): void
         $select = $connection->select()
             ->from($this->getAttribute()->getBackend()->getTable())
             ->columns([$linkId, 'store_id', 'value'])
-            ->where(sprintf('%s IN (?)', $linkId), array_values($linkIdBySku));
+            ->where(sprintf('%s IN (?)', $linkId), array_values($linkIdBySku))
+            ->where('attribute_id = ?', $this->getAttribute()->getId());
         $skuByLinkId = array_flip($linkIdBySku);
 
         foreach ($connection->fetchAll($select) as $item) {

From 5c3c2f56f7b6b65f47671b7cd6a3115e221d19f0 Mon Sep 17 00:00:00 2001
From: Leonid Poluianov <poluyano@adobe.com>
Date: Mon, 27 Jul 2020 17:00:24 -0500
Subject: [PATCH 1213/1718] Github #99: Sync "develop-storefront" with master
 branches

---
 lib/internal/Magento/Framework/Api/DataObjectHelper.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Api/DataObjectHelper.php b/lib/internal/Magento/Framework/Api/DataObjectHelper.php
index e88bee2e9e4bd..1426b8c8ec721 100644
--- a/lib/internal/Magento/Framework/Api/DataObjectHelper.php
+++ b/lib/internal/Magento/Framework/Api/DataObjectHelper.php
@@ -213,7 +213,6 @@ protected function setComplexValue(
             $object = $this->extensionFactory->create(get_class($dataObject), ['data' => $value]);
         } else {
             $object = $this->objectFactory->create($returnType, $value);
-            $this->populateWithArray($object, $value, $returnType);
         }
         $dataObject->$methodName($object);
         return $this;

From b00d9e6fbd8cae354bd201138871d980d350f82f Mon Sep 17 00:00:00 2001
From: Leonid Poluianov <poluyano@adobe.com>
Date: Wed, 29 Jul 2020 17:18:10 -0500
Subject: [PATCH 1214/1718] Github #99: Sync "develop-storefront" with master
 branches

---
 ...ts_with_custom_attribute_layered_navigation.php |  6 ------
 .../Magento/Catalog/_files/product_simple.php      | 13 -------------
 .../Catalog/_files/product_simple_disabled.php     | 13 -------------
 ...ts_with_layered_navigation_custom_attribute.php |  6 ------
 ...yered_navigation_with_multiselect_attribute.php |  6 ------
 .../_files/product_configurable.php                | 14 --------------
 .../_files/product_configurable_sku.php            | 14 --------------
 .../two_wishlists_for_two_diff_customers.php       | 13 -------------
 .../testsuite/Magento/Wishlist/_files/wishlist.php | 13 -------------
 .../wishlist_with_disabled_simple_product.php      | 14 --------------
 10 files changed, 112 deletions(-)

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 f84e23156f25c..c2c3782c8cd23 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
@@ -31,9 +31,3 @@
 $attributeRepository->save($attribute);
 
 CacheCleaner::cleanAll();
-
-// Run from CLI due to some classes involved in reindex process have state which do not allow to reindex
-$appDir = dirname(Bootstrap::getInstance()->getAppTempDir());
-$out = '';
-// phpcs:ignore Magento2.Security.InsecureFunction
-exec("php -f {$appDir}/bin/magento indexer:reindex catalogsearch_fulltext", $out);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple.php
index f80e3ca6a75d3..a7e4f702e5630 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple.php
@@ -207,16 +207,3 @@
     $product->getSku(),
     [2]
 );
-
-/**
- * We need to remember that automatic reindexation is not working properly in integration tests
- * Reindexation is sitting on top of afterCommit callbacks:
- * \Magento\Catalog\Model\Product::priceReindexCallback
- *
- * However, callbacks are applied only when transaction_level = 0 (when transaction is commited), however
- * integration tests are not committing transactions, so we need to reindex data manually in order to reuse it in tests
- */
-/** @var \Magento\Indexer\Model\Indexer $indexer */
-$indexer = $objectManager->create(\Magento\Indexer\Model\Indexer::class);
-$indexer->load('catalog_product_price');
-$indexer->reindexRow($product->getId());
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_disabled.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_disabled.php
index 0a37f4b9e921e..85209b8569645 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_disabled.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_disabled.php
@@ -207,16 +207,3 @@
     $product->getSku(),
     [2]
 );
-
-/**
- * We need to remember that automatic reindexation is not working properly in integration tests
- * Reindexation is sitting on top of afterCommit callbacks:
- * \Magento\Catalog\Model\Product::priceReindexCallback
- *
- * However, callbacks are applied only when transaction_level = 0 (when transaction is commited), however
- * integration tests are not committing transactions, so we need to reindex data manually in order to reuse it in tests
- */
-/** @var \Magento\Indexer\Model\Indexer $indexer */
-$indexer = $objectManager->create(\Magento\Indexer\Model\Indexer::class);
-$indexer->load('catalog_product_price');
-$indexer->reindexRow($product->getId());
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 a2072cb7918ac..4dd088e148d75 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
@@ -149,9 +149,3 @@
     }
 }
 CacheCleaner::cleanAll();
-
-// Run from CLI due to some classes involved in reindex process have state which do not allow to reindex
-$appDir = dirname(Bootstrap::getInstance()->getAppTempDir());
-$out = '';
-// phpcs:ignore Magento2.Security.InsecureFunction
-exec("php -f {$appDir}/bin/magento indexer:reindex catalogsearch_fulltext", $out);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_with_multiselect_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_with_multiselect_attribute.php
index efcd7fbf6a03d..42df6330d0dcf 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_with_multiselect_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_with_multiselect_attribute.php
@@ -92,9 +92,3 @@
 $productRepository->save($product);
 
 CacheCleaner::cleanAll();
-
-// Run from CLI due to some classes involved in reindex process have state which do not allow to reindex
-$appDir = dirname(Bootstrap::getInstance()->getAppTempDir());
-$out = '';
-// phpcs:ignore Magento2.Security.InsecureFunction
-exec("php -f {$appDir}/bin/magento indexer:reindex catalogsearch_fulltext", $out);
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable.php
index 4a8fc951f48c3..f1f65602a9273 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable.php
@@ -143,17 +143,3 @@
     $product->getSku(),
     [2]
 );
-
-/**
- * We need to remember that automatic reindexation is not working properly in integration tests
- * Reindexation is sitting on top of afterCommit callbacks:
- * \Magento\Catalog\Model\Product::priceReindexCallback
- *
- * However, callbacks are applied only when transaction_level = 0 (when transaction is commited), however
- * integration tests are not committing transactions, so we need to reindex data manually in order to reuse it in tests
- */
-/** @var \Magento\Indexer\Model\Indexer $indexer */
-$indexer = Bootstrap::getObjectManager()->create(\Magento\Indexer\Model\Indexer::class);
-$indexer->load('catalog_product_price');
-$indexer->reindexRow($product->getId());
-$indexer->reindexList($idsToReindex);
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_sku.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_sku.php
index bd9fe806b2b00..2ae3ab695f737 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_sku.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_sku.php
@@ -36,7 +36,6 @@
 $attributeValues = [];
 $attributeSetId = $installer->getAttributeSetId('catalog_product', 'Default');
 $associatedProductIds = [];
-$idsToReindex = $productIds = [10, 20];
 array_shift($options); //remove the first option which is empty
 
 foreach ($options as $option) {
@@ -142,16 +141,3 @@
     $product->getSku(),
     [2]
 );
-
-/**
- * We need to remember that automatic reindexation is not working properly in integration tests
- * Reindexation is sitting on top of afterCommit callbacks:
- * \Magento\Catalog\Model\Product::priceReindexCallback
- *
- * However, callbacks are applied only when transaction_level = 0 (when transaction is commited), however
- * integration tests are not committing transactions, so we need to reindex data manually in order to reuse it in tests
- */
-/** @var \Magento\Indexer\Model\Indexer $indexer */
-$indexer = Bootstrap::getObjectManager()->create(\Magento\Indexer\Model\Indexer::class);
-$indexer->load('catalog_product_price');
-$indexer->reindexList($idsToReindex);
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/two_wishlists_for_two_diff_customers.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/two_wishlists_for_two_diff_customers.php
index 797dfef488e84..43285cea4cfd9 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/_files/two_wishlists_for_two_diff_customers.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/two_wishlists_for_two_diff_customers.php
@@ -31,16 +31,3 @@
 $wishlistForSecondCustomer->loadByCustomerId($secondCustomerIdFromFixture, true);
 $item = $wishlistForSecondCustomer->addNewItem($product, new \Magento\Framework\DataObject([]));
 $wishlistForSecondCustomer->save();
-
-/**
- * We need to remember that automatic reindexation is not working properly in integration tests
- * Reindexation is sitting on top of afterCommit callbacks:
- * \Magento\Catalog\Model\Product::priceReindexCallback
- *
- * However, callbacks are applied only when transaction_level = 0 (when transaction is commited), however
- * integration tests are not committing transactions, so we need to reindex data manually in order to reuse it in tests
- */
-/** @var \Magento\Indexer\Model\Indexer $indexer */
-$indexer = Bootstrap::getObjectManager()->create(\Magento\Indexer\Model\Indexer::class);
-$indexer->load('catalog_product_price');
-$indexer->reindexList([$product->getId()]);
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist.php
index e7284f3d650be..e578676e68e96 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist.php
@@ -25,16 +25,3 @@
 $wishlist->loadByCustomerId($customer->getId(), true);
 $item = $wishlist->addNewItem($product, new DataObject([]));
 $wishlist->setSharingCode('fixture_unique_code')->save();
-
-/**
- * We need to remember that automatic reindexation is not working properly in integration tests
- * Reindexation is sitting on top of afterCommit callbacks:
- * \Magento\Catalog\Model\Product::priceReindexCallback
- *
- * However, callbacks are applied only when transaction_level = 0 (when transaction is commited), however
- * integration tests are not committing transactions, so we need to reindex data manually in order to reuse it in tests
- */
-/** @var \Magento\Indexer\Model\Indexer $indexer */
-$indexer = Bootstrap::getObjectManager()->create(\Magento\Indexer\Model\Indexer::class);
-$indexer->load('catalog_product_price');
-$indexer->reindexList([$product->getId()]);
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_simple_product.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_simple_product.php
index cf4685643412f..6fe032d5990dc 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_simple_product.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_simple_product.php
@@ -16,17 +16,3 @@
 $product = $productRepository->get($productSku);
 $product->setStatus(ProductStatus::STATUS_DISABLED);
 $productRepository->save($product);
-
-/**
- * We need to remember that automatic reindexation is not working properly in integration tests
- * Reindexation is sitting on top of afterCommit callbacks:
- * \Magento\Catalog\Model\Product::priceReindexCallback
- *
- * However, callbacks are applied only when transaction_level = 0 (when transaction is commited), however
- * integration tests are not committing transactions, so we need to reindex data manually in order to reuse it in tests
- */
-/** @var \Magento\Indexer\Model\Indexer $indexer */
-$indexer = \Magento\TestFramework\Helper\Bootstrap
-    ::getObjectManager()->create(\Magento\Indexer\Model\Indexer::class);
-$indexer->load('catalog_product_price');
-$indexer->reindexList([$product->getId()]);

From a4850f2f56a6078524e10dd50bd14076d61d23f6 Mon Sep 17 00:00:00 2001
From: Leonid Poluianov <poluyano@adobe.com>
Date: Thu, 30 Jul 2020 09:34:02 -0500
Subject: [PATCH 1215/1718] Github #99: Sync "develop-storefront" with master
 branches

---
 .../Block/Product/View/Type/ConfigurableProductPriceTest.php    | 2 +-
 .../ConfigurableProduct/_files/product_configurable_sku.php     | 1 +
 .../Customer/Block/Adminhtml/Edit/Tab/View/WishlistTest.php     | 2 +-
 .../testsuite/Magento/Customer/Controller/Section/LoadTest.php  | 2 +-
 .../testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php     | 1 +
 .../Wishlist/Block/Customer/Wishlist/Item/ColumnTest.php        | 2 +-
 .../testsuite/Magento/Wishlist/Block/Customer/WishlistTest.php  | 2 +-
 .../testsuite/Magento/Wishlist/Controller/Index/IndexTest.php   | 2 +-
 .../testsuite/Magento/Wishlist/Controller/Index/RemoveTest.php  | 2 +-
 .../testsuite/Magento/Wishlist/Controller/Index/SendTest.php    | 2 +-
 .../testsuite/Magento/Wishlist/Controller/Index/UpdateTest.php  | 2 +-
 .../testsuite/Magento/Wishlist/Controller/SharedTest.php        | 1 +
 .../Wishlist/Model/ResourceModel/Item/CollectionTest.php        | 2 +-
 .../testsuite/Magento/Wishlist/Model/WishlistTest.php           | 2 +-
 14 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/Type/ConfigurableProductPriceTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/Type/ConfigurableProductPriceTest.php
index 327544911a45d..8aab31b921007 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/Type/ConfigurableProductPriceTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/Type/ConfigurableProductPriceTest.php
@@ -20,7 +20,7 @@
 /**
  * Check configurable product price displaying
  *
- * @magentoDbIsolation enabled
+ * @magentoDbIsolation disabled
  * @magentoAppIsolation enabled
  * @magentoAppArea frontend
  */
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_sku.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_sku.php
index 2ae3ab695f737..ca8e1e91e5061 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_sku.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_sku.php
@@ -36,6 +36,7 @@
 $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) {
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/WishlistTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/WishlistTest.php
index 11d51e1f2c814..d4ae576523b15 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/WishlistTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/WishlistTest.php
@@ -18,7 +18,7 @@
  * Tests for customer wish list tab.
  *
  * @magentoAppArea adminhtml
- * @magentoDbIsolation enabled
+ * @magentoDbIsolation disabled
  */
 class WishlistTest extends TestCase
 {
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Section/LoadTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Section/LoadTest.php
index 664c7d9418401..1c9a41962997d 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Section/LoadTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Section/LoadTest.php
@@ -16,7 +16,7 @@
 /**
  * Load customer data test class.
  *
- * @magentoDbIsolation enabled
+ * @magentoDbIsolation disabled
  * @magentoAppArea frontend
  */
 class LoadTest extends AbstractController
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
index ca7e6fc41888b..e1cc942d4ae28 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
@@ -249,6 +249,7 @@ public function testGetCustomerWishlistNoCustomerId()
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      * @magentoAppIsolation enabled
+     * @magentoDbIsolation disabled
      */
     public function testGetCustomerWishlist()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Block/Customer/Wishlist/Item/ColumnTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Block/Customer/Wishlist/Item/ColumnTest.php
index 908cd3aebae61..a2e8390bea3ef 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/Block/Customer/Wishlist/Item/ColumnTest.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Block/Customer/Wishlist/Item/ColumnTest.php
@@ -21,7 +21,7 @@
 /**
  * Test wish list item column.
  *
- * @magentoDbIsolation enabled
+ * @magentoDbIsolation disabled
  * @magentoAppArea frontend
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Block/Customer/WishlistTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Block/Customer/WishlistTest.php
index bc953c3e999b1..b2fc1977a54ca 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/Block/Customer/WishlistTest.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Block/Customer/WishlistTest.php
@@ -18,7 +18,7 @@
  * Class test block wish list on customer account page.
  *
  * @magentoAppArea frontend
- * @magentoDbIsolation enabled
+ * @magentoDbIsolation disabled
  * @magentoAppIsolation disabled
  */
 class WishlistTest extends TestCase
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/IndexTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/IndexTest.php
index ca480e28997fe..c13a635f73e7f 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/IndexTest.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/IndexTest.php
@@ -14,7 +14,7 @@
 /**
  * Test wish list on customer account page.
  *
- * @magentoDbIsolation enabled
+ * @magentoDbIsolation disabled
  * @magentoAppArea frontend
  */
 class IndexTest extends AbstractController
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/RemoveTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/RemoveTest.php
index f6cea2f9757f6..23e303995aa42 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/RemoveTest.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/RemoveTest.php
@@ -16,7 +16,7 @@
 /**
  * Test for remove product from wish list.
  *
- * @magentoDbIsolation enabled
+ * @magentoDbIsolation disabled
  * @magentoAppArea frontend
  * @magentoDataFixture Magento/Wishlist/_files/wishlist.php
  */
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/SendTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/SendTest.php
index d087dd567c354..deae6f51d9f37 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/SendTest.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/SendTest.php
@@ -19,7 +19,7 @@
 /**
  * Test sending wish list.
  *
- * @magentoDbIsolation enabled
+ * @magentoDbIsolation disabled
  * @magentoAppArea frontend
  * @magentoDataFixture Magento/Wishlist/_files/wishlist.php
  */
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/UpdateTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/UpdateTest.php
index be5762c72be86..6faa2a7a1aa69 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/UpdateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/UpdateTest.php
@@ -16,7 +16,7 @@
 /**
  * Test for update wish list item.
  *
- * @magentoDbIsolation enabled
+ * @magentoDbIsolation disabled
  * @magentoAppArea frontend
  * @magentoDataFixture Magento/Wishlist/_files/wishlist.php
  */
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/SharedTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/SharedTest.php
index 1e4f6c6584e9a..6cd6f3a5fe5ba 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/SharedTest.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/SharedTest.php
@@ -10,6 +10,7 @@ class SharedTest extends \Magento\TestFramework\TestCase\AbstractController
 {
     /**
      * @magentoDataFixture Magento/Wishlist/_files/wishlist_shared.php
+     * @magentoDbIsolation disabled
      * @return void
      */
     public function testAllcartAction()
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Model/ResourceModel/Item/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Model/ResourceModel/Item/CollectionTest.php
index b6c2886f33021..9a95ed4fd462d 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/Model/ResourceModel/Item/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Model/ResourceModel/Item/CollectionTest.php
@@ -46,7 +46,7 @@ protected function setUp(): void
      *
      * @magentoDataFixture Magento/Wishlist/_files/wishlist_shared.php
      * @magentoAppIsolation enabled
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      */
     public function testLoadedProductAttributes()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php
index 28edf31ad4afc..eec3669aafa76 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Model/WishlistTest.php
@@ -20,7 +20,7 @@
 /**
  * Tests for wish list model.
  *
- * @magentoDbIsolation enabled
+ * @magentoDbIsolation disabled
  * @magentoAppIsolation disabled
  */
 class WishlistTest extends TestCase

From 0e4a941d85d2c8534091e18681f34a8fb0c6d1cd Mon Sep 17 00:00:00 2001
From: Leonid Poluianov <poluyano@adobe.com>
Date: Thu, 30 Jul 2020 12:34:53 -0500
Subject: [PATCH 1216/1718] Github #99: Sync "develop-storefront" with master
 branches

---
 .../Magento/Catalog/_files/product_simple_xss.php  | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_xss.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_xss.php
index c27a760988818..cff5671d1bf49 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_xss.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_xss.php
@@ -31,17 +31,3 @@
     $product->getSku(),
     [2]
 );
-
-
-/**
- * We need to remember that automatic reindexation is not working properly in integration tests
- * Reindexation is sitting on top of afterCommit callbacks:
- * \Magento\Catalog\Model\Product::priceReindexCallback
- *
- * However, callbacks are applied only when transaction_level = 0 (when transaction is commited), however
- * integration tests are not committing transactions, so we need to reindex data manually in order to reuse it in tests
- */
-/** @var \Magento\Indexer\Model\Indexer $indexer */
-$indexer = $objectManager->create(\Magento\Indexer\Model\Indexer::class);
-$indexer->load('catalog_product_price');
-$indexer->reindexRow($product->getId());

From ef17285c28c85d5b3847b4bdd083f1af27970b89 Mon Sep 17 00:00:00 2001
From: Leonid Poluianov <poluyano@adobe.com>
Date: Thu, 30 Jul 2020 12:38:09 -0500
Subject: [PATCH 1217/1718] Github #99: Sync "develop-storefront" with master
 branches

---
 setup/src/Magento/Setup/Model/ConfigOptionsList/Directory.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup/src/Magento/Setup/Model/ConfigOptionsList/Directory.php b/setup/src/Magento/Setup/Model/ConfigOptionsList/Directory.php
index 6ae80686edd54..e838dbee33603 100644
--- a/setup/src/Magento/Setup/Model/ConfigOptionsList/Directory.php
+++ b/setup/src/Magento/Setup/Model/ConfigOptionsList/Directory.php
@@ -19,9 +19,9 @@
 class Directory implements ConfigOptionsListInterface
 {
     /**
-     * Input ket for config command.
+     * Input key for config command.
      */
-    const INPUT_KEY_DOCUMENT_ROOT_IS_PUB = 'document-root-is-pub';
+    private const INPUT_KEY_DOCUMENT_ROOT_IS_PUB = 'document-root-is-pub';
 
     /**
      * Path in in configuration.

From fc23b747473ac8156587ae7b841f845798048b08 Mon Sep 17 00:00:00 2001
From: Leonid Poluianov <poluyano@adobe.com>
Date: Fri, 31 Jul 2020 12:11:30 -0500
Subject: [PATCH 1218/1718] MC-36279: Some of Magento integration tests were
 failed on execution without Inventory Module

---
 .../GraphQl/Catalog/ProductDeleteTest.php     | 76 +++++++++++++++++++
 .../Wishlist/Controller/Index/AddTest.php     |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductDeleteTest.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductDeleteTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductDeleteTest.php
new file mode 100644
index 0000000000000..b19b8d519e857
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductDeleteTest.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Catalog;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test that product is not present in GQL after it was deleted
+ */
+class ProductDeleteTest extends GraphQlAbstract
+{
+    /**
+     * @var \Magento\TestFramework\ObjectManager
+     */
+    private $objectManager;
+
+    protected function setUp(): void
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_with_all_fields.php
+     */
+    public function testQuerySimpleProductAfterDelete()
+    {
+        $productSku = 'simple';
+
+        $query = <<<QUERY
+{
+    products(filter: {sku: {eq: "{$productSku}"}})
+    {
+        items {
+            attribute_set_id
+        }
+    }
+}
+QUERY;
+        // get customer ID token
+        /** @var \Magento\Integration\Api\CustomerTokenServiceInterface $customerTokenService */
+        $customerTokenService = $this->objectManager->create(
+            \Magento\Integration\Api\CustomerTokenServiceInterface::class
+        );
+        $customerToken = $customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
+
+        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
+        $response = $this->graphQlQuery($query, [], '', $headerMap);
+        $this->assertArrayHasKey('products', $response);
+        $this->assertArrayHasKey('items', $response['products']);
+        $this->assertCount(1, $response['products']['items']);
+
+        // Delete the product and verify it is actually not accessible via the storefront anymore
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
+
+        $registry = ObjectManager::getInstance()->get(\Magento\Framework\Registry::class);
+        $registry->unregister('isSecureArea');
+        $registry->register('isSecureArea', true);
+        $productRepository->deleteById($productSku);
+        $registry->unregister('isSecureArea');
+        $registry->register('isSecureArea', false);
+
+        $response = $this->graphQlQuery($query, [], '', $headerMap);
+        $this->assertArrayHasKey('products', $response);
+        $this->assertArrayHasKey('items', $response['products']);
+        $this->assertCount(0, $response['products']['items']);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/AddTest.php b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/AddTest.php
index 082a023a961f4..492aa5935238e 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/AddTest.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/Controller/Index/AddTest.php
@@ -14,12 +14,12 @@
 use Magento\Framework\Message\MessageInterface;
 use Magento\TestFramework\TestCase\AbstractController;
 use Magento\TestFramework\Wishlist\Model\GetWishlistByCustomerId;
-use Zend\Stdlib\Parameters;
+use Laminas\Stdlib\Parameters;
 
 /**
  * Test for add product to wish list.
  *
- * @magentoDbIsolation enabled
+ * @magentoDbIsolation disabled
  * @magentoAppArea frontend
  * @magentoDataFixture Magento/Customer/_files/customer.php
  */

From 0c6de1dc4578ded5ad22746a0b4b4e53898573c2 Mon Sep 17 00:00:00 2001
From: Vitalii Zabaznov <vzabaznov@magento.com>
Date: Mon, 3 Aug 2020 17:07:10 -0500
Subject: [PATCH 1219/1718] MC-35903: Refactor place where lock mechanism is
 used regarding proper lock description

---
 .../MessageQueue/Test/Unit/Console/StartConsumerCommandTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MessageQueue/Test/Unit/Console/StartConsumerCommandTest.php b/app/code/Magento/MessageQueue/Test/Unit/Console/StartConsumerCommandTest.php
index 274386a9bb685..1aa805f0e323b 100644
--- a/app/code/Magento/MessageQueue/Test/Unit/Console/StartConsumerCommandTest.php
+++ b/app/code/Magento/MessageQueue/Test/Unit/Console/StartConsumerCommandTest.php
@@ -187,7 +187,7 @@ public function executeDataProvider()
                 'singleThread' => true,
                 'lockExpects' => 1,
                 'isLocked' => false,
-                'unlockExpects' => 1,
+                'unlockExpects' => 0,
                 'runProcessExpects' => 0,
                 'expectedReturn' => Cli::RETURN_FAILURE,
             ],

From ddabec92c452252516d926360ba765ef135cd3d7 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Mon, 3 Aug 2020 17:37:25 -0500
Subject: [PATCH 1220/1718] MC-20639: MyAccount :: Order Details :: Refund
 (creditMemo) Details by Order Number

---
 .../Magento/BundleGraphQl/etc/schema.graphqls |  4 +++
 .../Resolver/CreditMemo/CreditMemoItems.php   | 31 ++++++++++++++++++-
 .../Magento/SalesGraphQl/etc/schema.graphqls  |  5 +--
 3 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/BundleGraphQl/etc/schema.graphqls b/app/code/Magento/BundleGraphQl/etc/schema.graphqls
index e67d7772eb44d..f00ce513677a9 100644
--- a/app/code/Magento/BundleGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/BundleGraphQl/etc/schema.graphqls
@@ -100,6 +100,10 @@ type BundleShipmentItem implements ShipmentItemInterface {
     bundle_options: [ItemSelectedBundleOption] @doc(description: "A list of bundle options that are assigned to the bundle product") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Order\\Item\\BundleOptions")
 }
 
+type BundleCreditMemoItem implements CreditMemoItemInterface {
+    bundle_options: [ItemSelectedBundleOption] @doc(description: "A list of bundle options that are assigned to the bundle product")
+}
+
 type ItemSelectedBundleOption @doc(description: "A list of options of the selected bundle product") {
     id: ID! @doc(description: "The unique identifier of the option")
     label: String! @doc(description: "The label of the option")
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoItems.php b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoItems.php
index 9464e0aadf477..81a4c9a0929d2 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoItems.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoItems.php
@@ -123,7 +123,36 @@ private function getCreditMemoItemData(OrderInterface $order, CreditmemoItemInte
             ],
             'quantity_refunded' => $creditMemoItem->getQty(),
             'model' => $creditMemoItem,
-            'product_type' => $orderItem['product_type']
+            'product_type' => $orderItem['product_type'],
+            'discounts' => $this->formatDiscountDetails($order, $creditMemoItem)
         ];
     }
+
+    /**
+     * Returns formatted information about an applied discount
+     *
+     * @param OrderInterface $associatedOrder
+     * @param CreditmemoItemInterface $creditmemoItem
+     * @return array
+     */
+    private function formatDiscountDetails(
+        OrderInterface $associatedOrder,
+        CreditmemoItemInterface $creditmemoItem
+    ) : array {
+        if ($associatedOrder->getDiscountDescription() === null
+            && $creditmemoItem->getDiscountAmount() == 0
+            && $associatedOrder->getDiscountAmount() == 0
+        ) {
+            $discounts = [];
+        } else {
+            $discounts[] = [
+                'label' => $associatedOrder->getDiscountDescription() ?? _('Discount'),
+                'amount' => [
+                    'value' => abs($creditmemoItem->getDiscountAmount()) ?? 0,
+                    'currency' => $associatedOrder->getOrderCurrencyCode()
+                ]
+            ];
+        }
+        return $discounts;
+    }
 }
diff --git a/app/code/Magento/SalesGraphQl/etc/schema.graphqls b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
index a9f9130261dad..32c54ad75c5af 100644
--- a/app/code/Magento/SalesGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
@@ -217,16 +217,13 @@ interface CreditMemoItemInterface @doc(description: "Credit memo item details")
     product_name: String @doc(description: "The name of the base product")
     product_sku: String! @doc(description: "SKU of the base product")
     product_sale_price: Money! @doc(description: "The sale price for the base product, including selected options")
+    discounts: [Discount] @doc(description: "Contains information about the final discount amount for the base product, including discounts on options")
     quantity_refunded: Float @doc(description: "The number of refunded items")
 }
 
 type CreditMemoItem implements CreditMemoItemInterface {
 }
 
-type BundleCreditMemoItem implements CreditMemoItemInterface {
-    bundle_options: [ItemSelectedBundleOption] @doc(description: "A list of bundle options that are assigned to the bundle product")
-}
-
 type CreditMemoTotal @doc(description: "Credit memo price details") {
     subtotal: Money! @doc(description: "The subtotal of the invoice, excluding shipping, discounts, and taxes")
     discounts: [Discount] @doc(description: "The applied discounts to the credit memo")

From cbf58a5b2e9683ec9524f825088ef40f4546a974 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Mon, 3 Aug 2020 18:15:15 -0500
Subject: [PATCH 1221/1718] MC-20639: MyAccount :: Order Details :: Refund
 (creditMemo) Details by Order Number

---
 .../Magento/GraphQl/Sales/CreditmemoTest.php      | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
index 8b6a15435825c..5ae3390baf2e2 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
@@ -94,6 +94,7 @@ public function testCreditMemoForLoggedInCustomerQuery(): void
                         'product_sale_price' => [
                             'value' => 10
                         ],
+                        'discounts' => [],
                         'quantity_refunded' => 1
                     ],
                     [
@@ -102,6 +103,7 @@ public function testCreditMemoForLoggedInCustomerQuery(): void
                         'product_sale_price' => [
                             'value' => 10
                         ],
+                        'discounts' => [],
                         'quantity_refunded' => 1
                     ]
                 ],
@@ -202,6 +204,7 @@ public function testCreditMemoForBundledProductsWithPartialRefund()
                         'product_sale_price' => [
                             'value' => 15
                         ],
+                        'discounts' => [],
                         'quantity_refunded' => 1
                     ],
 
@@ -311,6 +314,15 @@ public function testCreditMemoForBundleProductWithTaxesAndDiscounts()
                         'product_sale_price' => [
                             'value' => 15
                         ],
+                        'discounts' => [
+                            [
+                                'amount' => [
+                                    'value' => 3,
+                                    'currency' => "USD"
+                                ],
+                                'label' => 'Discount Label for 10% off'
+                            ]
+                        ],
                         'quantity_refunded' => 1
                     ],
 
@@ -352,7 +364,7 @@ public function testCreditMemoForBundleProductWithTaxesAndDiscounts()
                         ],
                         'discounts' => [
                             [
-                                'amount'=> ['value'=> 1],
+                                'amount'=> ['value'=> 1]
                             ]
                         ],
                     ],
@@ -750,6 +762,7 @@ private function getCustomerOrderWithCreditMemoQuery(): array
                     product_sale_price {
                         value
                     }
+                    discounts { amount{value currency} label }
                     quantity_refunded
                 }
                 total {

From f91b685597c00c2f7e3468a887e956dbee7d02a8 Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Mon, 3 Aug 2020 23:46:51 -0500
Subject: [PATCH 1222/1718] static test fixes

---
 .../CustomizableOptionDataProvider.php        | 12 ++++++++----
 .../Cart/BuyRequest/BundleDataProvider.php    | 18 +++++++++++-------
 .../BuyRequest/SuperAttributeDataProvider.php |  6 ++++--
 .../DownloadableLinkDataProvider.php          |  6 ++++--
 .../AddSimpleProductToCartEndToEndTest.php    |  4 +---
 ...dSimpleProductToCartSingleMutationTest.php | 10 ----------
 .../Quote/GetCartItemOptionsFromUID.php       | 19 +++++++++++--------
 7 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/app/code/Magento/Quote/Model/Cart/BuyRequest/CustomizableOptionDataProvider.php b/app/code/Magento/Quote/Model/Cart/BuyRequest/CustomizableOptionDataProvider.php
index 173f0bb403f62..d5440c272d163 100644
--- a/app/code/Magento/Quote/Model/Cart/BuyRequest/CustomizableOptionDataProvider.php
+++ b/app/code/Magento/Quote/Model/Cart/BuyRequest/CustomizableOptionDataProvider.php
@@ -35,8 +35,10 @@ public function execute(CartItem $cartItem): array
             }
             $this->validateInput($optionData);
 
-            [, $optionId, $optionValue] = $optionData;
-            $customizableOptionsData[$optionId][] = $optionValue;
+            [$optionType, $optionId, $optionValue] = $optionData;
+            if ($optionType == self::OPTION_TYPE) {
+                $customizableOptionsData[$optionId][] = $optionValue;
+            }
         }
 
         foreach ($cartItem->getEnteredOptions() as $option) {
@@ -47,8 +49,10 @@ public function execute(CartItem $cartItem): array
                 continue;
             }
 
-            [, $optionId] = $optionData;
-            $customizableOptionsData[$optionId][] = $option->getValue();
+            [$optionType, $optionId] = $optionData;
+            if ($optionType == self::OPTION_TYPE) {
+                $customizableOptionsData[$optionId][] = $option->getValue();
+            }
         }
 
         return ['options' => $this->flattenOptionValues($customizableOptionsData)];
diff --git a/app/code/Magento/QuoteBundleOptions/Model/Cart/BuyRequest/BundleDataProvider.php b/app/code/Magento/QuoteBundleOptions/Model/Cart/BuyRequest/BundleDataProvider.php
index 01239e50e70b4..9c6ed01bd527f 100644
--- a/app/code/Magento/QuoteBundleOptions/Model/Cart/BuyRequest/BundleDataProvider.php
+++ b/app/code/Magento/QuoteBundleOptions/Model/Cart/BuyRequest/BundleDataProvider.php
@@ -36,9 +36,11 @@ public function execute(CartItem $cartItem): array
             }
             $this->validateInput($optionData);
 
-            [, $optionId, $optionValueId, $optionQuantity] = $optionData;
-            $bundleOptionsData['bundle_option'][$optionId] = $optionValueId;
-            $bundleOptionsData['bundle_option_qty'][$optionId] = $optionQuantity;
+            [$optionType, $optionId, $optionValueId, $optionQuantity] = $optionData;
+            if ($optionType == self::OPTION_TYPE) {
+                $bundleOptionsData['bundle_option'][$optionId] = $optionValueId;
+                $bundleOptionsData['bundle_option_qty'][$optionId] = $optionQuantity;
+            }
         }
         //for bundle options with custom quantity
         foreach ($cartItem->getEnteredOptions() as $option) {
@@ -50,10 +52,12 @@ public function execute(CartItem $cartItem): array
             }
             $this->validateInput($optionData);
 
-            [, $optionId, $optionValueId] = $optionData;
-            $optionQuantity = $option->getValue();
-            $bundleOptionsData['bundle_option'][$optionId] = $optionValueId;
-            $bundleOptionsData['bundle_option_qty'][$optionId] = $optionQuantity;
+            [$optionType, $optionId, $optionValueId] = $optionData;
+            if ($optionType == self::OPTION_TYPE) {
+                $optionQuantity = $option->getValue();
+                $bundleOptionsData['bundle_option'][$optionId] = $optionValueId;
+                $bundleOptionsData['bundle_option_qty'][$optionId] = $optionQuantity;
+            }
         }
 
         return $bundleOptionsData;
diff --git a/app/code/Magento/QuoteConfigurableOptions/Model/Cart/BuyRequest/SuperAttributeDataProvider.php b/app/code/Magento/QuoteConfigurableOptions/Model/Cart/BuyRequest/SuperAttributeDataProvider.php
index e7d5820be8a59..d58b574352bd8 100644
--- a/app/code/Magento/QuoteConfigurableOptions/Model/Cart/BuyRequest/SuperAttributeDataProvider.php
+++ b/app/code/Magento/QuoteConfigurableOptions/Model/Cart/BuyRequest/SuperAttributeDataProvider.php
@@ -35,8 +35,10 @@ public function execute(CartItem $cartItem): array
             }
             $this->validateInput($optionData);
 
-            [, $attributeId, $valueIndex] = $optionData;
-            $configurableProductData[$attributeId] = $valueIndex;
+            [$optionType, $attributeId, $valueIndex] = $optionData;
+            if ($optionType == self::OPTION_TYPE) {
+                $configurableProductData[$attributeId] = $valueIndex;
+            }
         }
 
         return ['super_attribute' => $configurableProductData];
diff --git a/app/code/Magento/QuoteDownloadableLinks/Model/Cart/BuyRequest/DownloadableLinkDataProvider.php b/app/code/Magento/QuoteDownloadableLinks/Model/Cart/BuyRequest/DownloadableLinkDataProvider.php
index cf381a19e2ddd..e412c7df573c7 100644
--- a/app/code/Magento/QuoteDownloadableLinks/Model/Cart/BuyRequest/DownloadableLinkDataProvider.php
+++ b/app/code/Magento/QuoteDownloadableLinks/Model/Cart/BuyRequest/DownloadableLinkDataProvider.php
@@ -36,8 +36,10 @@ public function execute(CartItem $cartItem): array
             }
             $this->validateInput($optionData);
 
-            [, $linkId] = $optionData;
-            $linksData[] = $linkId;
+            [$optionType, $linkId] = $optionData;
+            if ($optionType == self::OPTION_TYPE) {
+                $linksData[] = $linkId;
+            }
         }
 
         return ['links' => $linksData];
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartEndToEndTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartEndToEndTest.php
index a03c2eb1ff698..368670f4032a7 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartEndToEndTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartEndToEndTest.php
@@ -111,7 +111,6 @@ private function getProductOptionsViaQuery(string $sku): array
                     'value' => $value
                 ];
 
-
             } elseif (isset($option['selected_option'])) {
                 $receivedItemOptions['selected_options'][] = reset($option['selected_option'])['uid'];
                 $expectedItemOptions[$option['option_id']] = reset($option['selected_option'])['option_type_id'];
@@ -132,10 +131,9 @@ private function getProductOptionsViaQuery(string $sku): array
      */
     private function getProductQuery(string $sku): string
     {
-        $sku = $options = $values = null; // WTF?
         return <<<QUERY
 query {
-  products(filter: { sku: { eq: "$sku" } }) {
+  products(search: "$sku") {
     items {
       sku
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php
index 2e26d89c0b600..139aa38bc24c0 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php
@@ -256,14 +256,4 @@ private function getAddToCartMutation(
 }
 MUTATION;
     }
-
-    private function getCartQuery(string $maskedQuoteId)
-    {
-        return <<<QUERY
-{
-    cart(cart_id: "{$maskedQuoteId}") {
-        total_quantity
-}
-QUERY;
-    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartItemOptionsFromUID.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartItemOptionsFromUID.php
index 74237ed981896..1f492c8b918c5 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartItemOptionsFromUID.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartItemOptionsFromUID.php
@@ -23,13 +23,14 @@ public function execute(array $encodedCustomOptions): array
         $customOptions = [];
 
         foreach ($encodedCustomOptions['selected_options'] as $selectedOption) {
-            [,$optionId, $optionValueId] = explode('/', base64_decode($selectedOption));
-            if (isset($customOptions[$optionId])) {
-                $customOptions[$optionId] = [$customOptions[$optionId], $optionValueId];
-            } else {
-                $customOptions[$optionId] = $optionValueId;
+            [$optionType, $optionId, $optionValueId] = explode('/', base64_decode($selectedOption));
+            if ($optionType == 'custom-option') {
+                if (isset($customOptions[$optionId])) {
+                    $customOptions[$optionId] = [$customOptions[$optionId], $optionValueId];
+                } else {
+                    $customOptions[$optionId] = $optionValueId;
+                }
             }
-
         }
 
         foreach ($encodedCustomOptions['entered_options'] as $enteredOption) {
@@ -37,8 +38,10 @@ public function execute(array $encodedCustomOptions): array
             if ($enteredOption['type'] === 'date') {
                 $enteredOption['value'] = date('M d, Y', strtotime($enteredOption['value']));
             }
-            [,$optionId] = explode('/', base64_decode($enteredOption['id']));
-            $customOptions[$optionId] = $enteredOption['value'];
+            [$optionType, $optionId] = explode('/', base64_decode($enteredOption['id']));
+            if ($optionType = 'custom-option') {
+                $customOptions[$optionId] = $enteredOption['value'];
+            }
         }
 
         return $customOptions;

From d6572ae099f17d41116f7e4885dfb53665f5a1c3 Mon Sep 17 00:00:00 2001
From: Rowena Santos <rowena.santos@acidgreen.com.au>
Date: Tue, 4 Aug 2020 13:21:03 +0800
Subject: [PATCH 1223/1718] magento/partners-magento2b2b#166: Payment on
 Account for Admin Panel orders - Added Storefront Customer Order Data
 Actiongroup as per PR request changes

---
 ...rontVerifyCustomerOrderDataActionGroup.xml | 33 +++++++++++++++++++
 .../StorefrontCustomerOrderViewSection.xml    |  4 +++
 2 files changed, 37 insertions(+)
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontVerifyCustomerOrderDataActionGroup.xml

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontVerifyCustomerOrderDataActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontVerifyCustomerOrderDataActionGroup.xml
new file mode 100644
index 0000000000000..5880611883c9d
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontVerifyCustomerOrderDataActionGroup.xml
@@ -0,0 +1,33 @@
+<?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="StorefrontVerifyCustomerOrderDataActionGroup">
+        <annotations>
+            <description>Verify a customer's order details on the view order page on the storefront</description>
+        </annotations>
+        <arguments>
+            <argument name="orderId" type="string"/>
+            <argument name="orderNumber" type="string"/>
+            <argument name="createdDate" type="string"/>
+            <argument name="productName" type="string"/>
+            <argument name="grandTotal" type="string"/>
+            <argument name="orderPlacedBy" type="string"/>
+            <argument name="paymentMethod" type="string"/>
+        </arguments>
+        <amOnPage url="sales/order/view/order_id/{{orderId}}" stepKey="goToOrdersPage"/>
+        <waitForText selector="{{StorefrontCustomerAccountMainSection.pageTitle}}" userInput="{{orderNumber}}" stepKey="verifyOrderNo"/>
+        <waitForText selector="{{StorefrontCustomerOrderViewSection.paymentMethod}}" userInput="{{paymentMethod}}" stepKey="storefrontVerifyPaymentMethod"/>
+        <waitForText selector="{{StorefrontCustomerOrderViewSection.createdDate}}" userInput="{{createdDate}}" stepKey="storefrontVerifyOrderCreatedDate"/>
+        <waitForText selector="{{StorefrontCustomerOrderViewSection.orderPlacedBy}}" userInput="{{orderPlacedBy}}" stepKey="storefrontVerifyOrderPlacedBy"/>
+        <waitForText selector="{{StorefrontCustomerOrderViewSection.productName}}" userInput="{{productName}}" stepKey="storefrontVerifyProductName"/>
+        <waitForText selector="{{StorefrontCustomerOrderViewSection.grandTotal}}" userInput="{{grandTotal}}" stepKey="storefrontVerifyGrandTotal"/>
+        
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderViewSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderViewSection.xml
index 09b79fe831188..42c6f5cea082f 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderViewSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderViewSection.xml
@@ -18,5 +18,9 @@
         <element name="billingAddress" type="text" selector=".box.box-order-billing-address"/>
         <element name="orderStatusInGrid" type="text" selector="//td[contains(.,'{{orderId}}')]/../td[contains(.,'{{status}}')]" parameterized="true"/>
         <element name="pager" type="block" selector=".pager"/>
+        <element name="createdDate" type="text" selector=".block-order-details-comments .comment-date"/>
+        <element name="orderPlacedBy" type="text" selector=".block-order-details-comments .comment-content"/>
+        <element name="productName" type="text" selector="//td[@data-th='Product Name']"/>
+        <element name="grandTotal" type="text" selector="//tr[@class='grand_total']//td[@data-th='Grand Total']"/>
     </section>
 </sections>

From 72567f6b7388a4e762da3ad9c3d96733b8f01e62 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <svizev.igor@gmail.com>
Date: Thu, 19 Mar 2020 18:27:10 +0200
Subject: [PATCH 1224/1718] Fix issue with too many cookies in admin

Port MC-19247 for adminhtml in order to not use jQuery.localStorage plugin
Move translation directory definition to base theme
Add deprecation notice to block and view files
---
 .../Backend/view/adminhtml/layout/default.xml |  1 -
 .../view/adminhtml/requirejs-config.js        |  3 +-
 app/code/Magento/Translation/Block/Js.php     |  4 ++
 .../Translation/view/base/requirejs-config.js | 15 +++++
 .../view/base/templates/translate.phtml       | 61 ++-----------------
 .../view/frontend/requirejs-config.js         |  6 +-
 6 files changed, 26 insertions(+), 64 deletions(-)
 create mode 100644 app/code/Magento/Translation/view/base/requirejs-config.js

diff --git a/app/code/Magento/Backend/view/adminhtml/layout/default.xml b/app/code/Magento/Backend/view/adminhtml/layout/default.xml
index a7faab0bc4673..0d629e31d6d91 100644
--- a/app/code/Magento/Backend/view/adminhtml/layout/default.xml
+++ b/app/code/Magento/Backend/view/adminhtml/layout/default.xml
@@ -70,7 +70,6 @@
                             <argument name="bugreport_url" xsi:type="string">https://github.com/magento/magento2/issues</argument>
                         </arguments>
                     </block>
-                    
                 </container>
             </container>
         </referenceContainer>
diff --git a/app/code/Magento/Backend/view/adminhtml/requirejs-config.js b/app/code/Magento/Backend/view/adminhtml/requirejs-config.js
index e886f28cd158b..ae0e84e2d27f8 100644
--- a/app/code/Magento/Backend/view/adminhtml/requirejs-config.js
+++ b/app/code/Magento/Backend/view/adminhtml/requirejs-config.js
@@ -6,8 +6,7 @@
 var config = {
     map: {
         '*': {
-            'mediaUploader':  'Magento_Backend/js/media-uploader',
-            'mage/translate': 'Magento_Backend/js/translate'
+            'mediaUploader':  'Magento_Backend/js/media-uploader'
         }
     }
 };
diff --git a/app/code/Magento/Translation/Block/Js.php b/app/code/Magento/Translation/Block/Js.php
index e193e675885c2..fa3d6905f5868 100644
--- a/app/code/Magento/Translation/Block/Js.php
+++ b/app/code/Magento/Translation/Block/Js.php
@@ -14,6 +14,10 @@
  *
  * @api
  * @since 100.0.2
+ * @deprecated logic was refactored in order to not use localstorage at all.
+ *
+ * You can see details in app/code/Magento/Translation/view/base/web/js/mage-translation-dictionary.js
+ * These block and view file were left in order to keep backward compatibility
  */
 class Js extends Template
 {
diff --git a/app/code/Magento/Translation/view/base/requirejs-config.js b/app/code/Magento/Translation/view/base/requirejs-config.js
new file mode 100644
index 0000000000000..682c3fca81117
--- /dev/null
+++ b/app/code/Magento/Translation/view/base/requirejs-config.js
@@ -0,0 +1,15 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+var config = {
+    map: {
+        '*': {
+            mageTranslationDictionary: 'Magento_Translation/js/mage-translation-dictionary'
+        }
+    },
+    deps: [
+        'mageTranslationDictionary'
+    ]
+};
diff --git a/app/code/Magento/Translation/view/base/templates/translate.phtml b/app/code/Magento/Translation/view/base/templates/translate.phtml
index bd74db151387d..98997398c0938 100644
--- a/app/code/Magento/Translation/view/base/templates/translate.phtml
+++ b/app/code/Magento/Translation/view/base/templates/translate.phtml
@@ -7,61 +7,8 @@
 /**
  * @var \Magento\Translation\Block\Js $block
  * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ * @deprecated logic was refactored in order to not use localstorage at all.
+ *
+ * You can see details in app/code/Magento/Translation/view/base/web/js/mage-translation-dictionary.js
+ * These block and view file were left in order to keep backward compatibility
  */
-?>
-<!--
-For frontend area dictionary file is inserted into html head in Magento/Translation/view/base/templates/dictionary.phtml
-Same translation mechanism should be introduced for admin area in 2.4 version.
--->
-<?php
-if ($block->dictionaryEnabled()) {
-    $version = $block->getTranslationFileVersion();
-    $escapedVersion = $block->escapeJs($version);
-    $dictionaryFileName = /* @noEscape */ Magento\Translation\Model\Js\Config::DICTIONARY_FILE_NAME;
-
-    $scriptString = <<<script
-        require.config({
-            deps: [
-                'jquery',
-                'mage/translate',
-                'jquery/jquery-storageapi'
-            ],
-            callback: function ($) {
-                'use strict';
-
-                var dependencies = [],
-                    versionObj;
-
-                $.initNamespaceStorage('mage-translation-storage');
-                $.initNamespaceStorage('mage-translation-file-version');
-                versionObj = $.localStorage.get('mage-translation-file-version');
-
-                if (versionObj.version !== '{$escapedVersion}') {
-                    dependencies.push(
-                        'text!{$dictionaryFileName}'
-                    );
-
-                }
-
-                require.config({
-                    deps: dependencies,
-                    callback: function (string) {
-                        if (typeof string === 'string') {
-                            $.mage.translate.add(JSON.parse(string));
-                            $.localStorage.set('mage-translation-storage', string);
-                            $.localStorage.set(
-                                'mage-translation-file-version',
-                                {
-                                    version: '{$escapedVersion}'
-                                }
-                            );
-                        } else {
-                            $.mage.translate.add($.localStorage.get('mage-translation-storage'));
-                        }
-                    }
-                });
-            }
-        });
-script;
-    echo /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false);
-}
diff --git a/app/code/Magento/Translation/view/frontend/requirejs-config.js b/app/code/Magento/Translation/view/frontend/requirejs-config.js
index b5351b9d471cf..b4b3ce0f8c554 100644
--- a/app/code/Magento/Translation/view/frontend/requirejs-config.js
+++ b/app/code/Magento/Translation/view/frontend/requirejs-config.js
@@ -8,12 +8,10 @@ var config = {
         '*': {
             editTrigger: 'mage/edit-trigger',
             addClass: 'Magento_Translation/js/add-class',
-            'Magento_Translation/add-class': 'Magento_Translation/js/add-class',
-            mageTranslationDictionary: 'Magento_Translation/js/mage-translation-dictionary'
+            'Magento_Translation/add-class': 'Magento_Translation/js/add-class'
         }
     },
     deps: [
-        'mage/translate-inline',
-        'mageTranslationDictionary'
+        'mage/translate-inline'
     ]
 };

From 125a5d4f02ac12e9323e9f9ce0af01b9da21a62c Mon Sep 17 00:00:00 2001
From: oleksandrkravchuk <oleksandr.kravchuk@vaimo.com>
Date: Tue, 4 Aug 2020 09:20:39 +0200
Subject: [PATCH 1225/1718] community-features#252 Create static test for
 action controllers. Recover accidentally removed file.

---
 dev/tests/integration/etc/config-global.php.dist | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 dev/tests/integration/etc/config-global.php.dist

diff --git a/dev/tests/integration/etc/config-global.php.dist b/dev/tests/integration/etc/config-global.php.dist
new file mode 100644
index 0000000000000..fbc6714859529
--- /dev/null
+++ b/dev/tests/integration/etc/config-global.php.dist
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+return [
+    'customer/password/limit_password_reset_requests_method' => 0,
+    'admin/security/admin_account_sharing' => 1,
+    'admin/security/limit_password_reset_requests_method' => 0,
+];

From d8a386e5c3be5f99c37c19714e46de5c48b4977a Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Tue, 4 Aug 2020 10:03:15 +0200
Subject: [PATCH 1226/1718] Replace load in the loop with proper data provider

---
 .../Model/Condition/Product/AbstractProduct.php  | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php b/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
index 2206dbef38640..d5b149da33c01 100644
--- a/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
+++ b/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
@@ -657,23 +657,11 @@ public function validateByEntityId($productId)
      * Retrieve category ids where product is available
      *
      * @param int $productId
-     * @return array
+     * @return int[]
      */
     protected function _getAvailableInCategories($productId)
     {
-        return $this->_productResource->getConnection()
-            ->fetchCol(
-                $this->_productResource->getConnection()
-                    ->select()
-                    ->distinct()
-                    ->from(
-                        $this->_productResource->getTable('catalog_category_product'),
-                        ['category_id']
-                    )->where(
-                        'product_id = ?',
-                        $productId
-                    )
-            );
+        return $this->productCategoryList->getCategoryIds($productId);
     }
 
     /**

From 2c187400fc51c9277328e6b754569d3510fc3d03 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Tue, 4 Aug 2020 10:58:54 +0200
Subject: [PATCH 1227/1718] Fix failing Tests (Static, Unit)

---
 .../Condition/Product/AbstractProduct.php     |  1 +
 .../Unit/Model/Rule/Condition/ProductTest.php | 25 +++++++++++--------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php b/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
index d5b149da33c01..be2693245e5d0 100644
--- a/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
+++ b/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
@@ -12,6 +12,7 @@
 /**
  * Abstract Rule product condition data model
  *
+ * phpcs:disable Magento2.Classes.AbstractApi
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
diff --git a/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Condition/ProductTest.php b/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Condition/ProductTest.php
index b0d3a203977ef..22627717a47f2 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Condition/ProductTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Model/Rule/Condition/ProductTest.php
@@ -9,6 +9,7 @@
 
 use Magento\Backend\Helper\Data;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\ProductCategoryList;
 use Magento\Catalog\Model\ProductFactory;
 use Magento\Catalog\Model\ResourceModel\Product;
 use Magento\Directory\Model\CurrencyFactory;
@@ -34,6 +35,7 @@
  */
 class ProductTest extends TestCase
 {
+    const STUB_CATEGORY_ID = 5;
     /** @var SalesRuleProduct */
     protected $model;
 
@@ -70,6 +72,9 @@ class ProductTest extends TestCase
     /** @var Select|MockObject */
     protected $selectMock;
 
+    /** @var MockObject|ProductCategoryList */
+    private $productCategoryListMock;
+
     /**
      * Setup the test
      */
@@ -138,6 +143,10 @@ protected function setUp(): void
         $this->collectionMock = $this->getMockBuilder(Collection::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->productCategoryListMock = $this->getMockBuilder(ProductCategoryList::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['getCategoryIds'])
+            ->getMock();
         $this->format = new Format(
             $this->getMockBuilder(ScopeResolverInterface::class)
                 ->disableOriginalConstructor()
@@ -158,7 +167,9 @@ protected function setUp(): void
             $this->productRepositoryMock,
             $this->productMock,
             $this->collectionMock,
-            $this->format
+            $this->format,
+            [],
+            $this->productCategoryListMock
         );
     }
 
@@ -228,28 +239,22 @@ public function testValidateCategoriesIgnoresVisibility(): void
             ->setMethods(['getAttribute', 'getId', 'setQuoteItemQty', 'setQuoteItemPrice'])
             ->getMock();
         $product
-            ->expects($this->any())
             ->method('setQuoteItemQty')
             ->willReturnSelf();
         $product
-            ->expects($this->any())
             ->method('setQuoteItemPrice')
             ->willReturnSelf();
         /* @var AbstractItem|MockObject $item */
         $item = $this->getMockBuilder(AbstractItem::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getProduct'])
+            ->onlyMethods(['getProduct'])
             ->getMockForAbstractClass();
         $item->expects($this->any())
             ->method('getProduct')
             ->willReturn($product);
         $this->model->setAttribute('category_ids');
-
-        $this->selectMock
-            ->expects($this->once())
-            ->method('where')
-            ->with($this->logicalNot($this->stringContains('visibility')), $this->anything(), $this->anything());
-
+        $this->productCategoryListMock->method('getCategoryIds')
+            ->willReturn([self::STUB_CATEGORY_ID]);
         $this->model->validate($item);
     }
 

From 22112976b09ae8552accecfe55d40ae66c651089 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 4 Aug 2020 13:00:10 +0100
Subject: [PATCH 1228/1718] Fixes accroding to code review comments

---
 .../Listing/Columns/SourceIconProvider.php    |  2 +-
 .../Listing/Filters/Options/Store.php         |  2 +-
 .../deleteImageWithDetailConfirmation.js      |  4 ++--
 .../view/adminhtml/web/js/image-uploader.js   | 21 +++++++++----------
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Columns/SourceIconProvider.php b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Columns/SourceIconProvider.php
index aec99bf7d3b8c..e425c9488b5c2 100644
--- a/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Columns/SourceIconProvider.php
+++ b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Columns/SourceIconProvider.php
@@ -84,7 +84,7 @@ public function prepareDataSource(array $dataSource): array
      *
      * @return string|null
      */
-    public function getSourceIconUrl(string $sourceName): ?string
+    private function getSourceIconUrl(string $sourceName): ?string
     {
         return isset($this->sourceIcons[$sourceName])
             ? $this->assetRepository->getUrlWithParams(
diff --git a/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Options/Store.php b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Options/Store.php
index cf49377c19837..f60124a6cf933 100644
--- a/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Options/Store.php
+++ b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Options/Store.php
@@ -17,7 +17,7 @@ class Store extends StoreOptions
     /**
      * All Store Views value
      */
-    const ALL_STORE_VIEWS = '0';
+    private const ALL_STORE_VIEWS = '0';
 
     /**
      * Get options
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 51ba2a258faf1..fb7bb0f1b0d0c 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
@@ -22,8 +22,8 @@ define([
          */
         deleteImageAction: function (recordsIds, imageDetailsUrl, deleteImageUrl) {
             var imagesCount = Object.keys(recordsIds).length,
-                confirmationContent = $t('%1 Are you sure you want to delete "%2" image%3?')
-                .replace('%2', Object.keys(recordsIds).length).replace('%3', imagesCount > 1 ? 's' : ''),
+                confirmationContent = $t('%1 Are you sure you want to delete "%2" image(s)?')
+                .replace('%2', Object.keys(recordsIds).length),
                 deferred = $.Deferred();
 
             getDetails(imageDetailsUrl, recordsIds)
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image-uploader.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image-uploader.js
index 3b69ca07f5771..58fff640f9db3 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image-uploader.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image-uploader.js
@@ -85,13 +85,17 @@ define([
 
                 add: function (e, data) {
                     if (!this.isSizeExceeded(data.files[0]).passed) {
-                        this.addValidationErrorMessage('Cannot upload "' + data.files[0].name +
-                                      '". File exceeds maximum file size limit.');
+                        this.addValidationErrorMessage(
+                            $t('Cannot upload "%1". File exceeds maximum file size limit.')
+                                .replace('%1', data.files[0].name)
+                        );
 
                         return;
                     } else if (!this.isFileNameLengthExceeded(data.files[0]).passed) {
-                        this.addValidationErrorMessage('Cannot upload "' + data.files[0].name +
-                                                       '". Filename is too long, must be 90 characters or less.');
+                        this.addValidationErrorMessage(
+                            $t('Cannot upload "%1". Filename is too long, must be 90 characters or less.')
+                                .replace('%1', data.files[0].name)
+                        );
 
                         return;
                     }
@@ -137,10 +141,7 @@ define([
          * @param {String} message
          */
         addValidationErrorMessage: function (message) {
-            this.mediaGridMessages().add(
-                'error',
-                $t(message)
-            );
+            this.mediaGridMessages().add('error', message);
 
             this.count() < 2 || this.mediaGridMessages().scheduleCleanup();
         },
@@ -203,12 +204,10 @@ define([
          * Show success message, and files counts
          */
         showSuccessMessage: function () {
-            var prefix = this.count() === 1 ? 'an image' : this.count() + ' images';
-
             this.mediaGridMessages().messages.remove(function (item) {
                 return item.code === 'success';
             });
-            this.mediaGridMessages().add('success', $t('Successfully uploaded ' + prefix));
+            this.mediaGridMessages().add('success', $t('Assets have been successfully uploaded!'));
             this.count(this.count() + 1);
 
         },

From b326cc14301db6366d0dc1d5a35b69c8c93820e6 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 4 Aug 2020 13:04:21 +0100
Subject: [PATCH 1229/1718] Removed renditions modules

---
 .../MediaGalleryRenditions/LICENSE.txt        | 48 --------------
 .../MediaGalleryRenditions/LICENSE_AFL.txt    | 48 --------------
 .../Magento/MediaGalleryRenditions/README.md  | 13 ----
 .../MediaGalleryRenditions/composer.json      | 21 -------
 .../etc/adminhtml/system.xml                  | 24 -------
 .../MediaGalleryRenditions/etc/config.xml     | 17 -----
 .../MediaGalleryRenditions/etc/module.xml     | 10 ---
 .../MediaGalleryRenditions/registration.php   | 14 -----
 .../MediaGalleryRenditionsApi/LICENSE.txt     | 48 --------------
 .../MediaGalleryRenditionsApi/LICENSE_AFL.txt | 48 --------------
 .../Model/Config.php                          | 62 -------------------
 .../MediaGalleryRenditionsApi/README.md       | 13 ----
 .../MediaGalleryRenditionsApi/composer.json   | 21 -------
 .../MediaGalleryRenditionsApi/etc/module.xml  | 10 ---
 .../registration.php                          | 14 -----
 15 files changed, 411 deletions(-)
 delete mode 100644 app/code/Magento/MediaGalleryRenditions/LICENSE.txt
 delete mode 100644 app/code/Magento/MediaGalleryRenditions/LICENSE_AFL.txt
 delete mode 100644 app/code/Magento/MediaGalleryRenditions/README.md
 delete mode 100644 app/code/Magento/MediaGalleryRenditions/composer.json
 delete mode 100644 app/code/Magento/MediaGalleryRenditions/etc/adminhtml/system.xml
 delete mode 100644 app/code/Magento/MediaGalleryRenditions/etc/config.xml
 delete mode 100644 app/code/Magento/MediaGalleryRenditions/etc/module.xml
 delete mode 100644 app/code/Magento/MediaGalleryRenditions/registration.php
 delete mode 100644 app/code/Magento/MediaGalleryRenditionsApi/LICENSE.txt
 delete mode 100644 app/code/Magento/MediaGalleryRenditionsApi/LICENSE_AFL.txt
 delete mode 100644 app/code/Magento/MediaGalleryRenditionsApi/Model/Config.php
 delete mode 100644 app/code/Magento/MediaGalleryRenditionsApi/README.md
 delete mode 100644 app/code/Magento/MediaGalleryRenditionsApi/composer.json
 delete mode 100644 app/code/Magento/MediaGalleryRenditionsApi/etc/module.xml
 delete mode 100644 app/code/Magento/MediaGalleryRenditionsApi/registration.php

diff --git a/app/code/Magento/MediaGalleryRenditions/LICENSE.txt b/app/code/Magento/MediaGalleryRenditions/LICENSE.txt
deleted file mode 100644
index 36b2459f6aa63..0000000000000
--- a/app/code/Magento/MediaGalleryRenditions/LICENSE.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-
-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.
diff --git a/app/code/Magento/MediaGalleryRenditions/LICENSE_AFL.txt b/app/code/Magento/MediaGalleryRenditions/LICENSE_AFL.txt
deleted file mode 100644
index f39d641b18a19..0000000000000
--- a/app/code/Magento/MediaGalleryRenditions/LICENSE_AFL.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-
-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/MediaGalleryRenditions/README.md b/app/code/Magento/MediaGalleryRenditions/README.md
deleted file mode 100644
index df856e8003a84..0000000000000
--- a/app/code/Magento/MediaGalleryRenditions/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Magento_MediaGalleryRenditions module
-
-The Magento_MediaGalleryRenditions module implements height and width fields for for media gallery items.
-
-## Extensibility
-
-Extension developers can interact with the Magento_MediaGalleryRenditions module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
-
-[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_MediaGalleryRenditions module.
-
-## Additional information
-
-For information about significant changes in patch releases, see [2.3.x Release information](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html).
diff --git a/app/code/Magento/MediaGalleryRenditions/composer.json b/app/code/Magento/MediaGalleryRenditions/composer.json
deleted file mode 100644
index 50b18752fc506..0000000000000
--- a/app/code/Magento/MediaGalleryRenditions/composer.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "name": "magento/module-media-gallery-renditions",
-    "description": "Magento module that implements height and width fields for for media gallery items.",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*"
-    },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "autoload": {
-        "files": [
-            "registration.php"
-        ],
-        "psr-4": {
-            "Magento\\MediaGalleryRenditions\\": ""
-        }
-    }
-}
diff --git a/app/code/Magento/MediaGalleryRenditions/etc/adminhtml/system.xml b/app/code/Magento/MediaGalleryRenditions/etc/adminhtml/system.xml
deleted file mode 100644
index f23f94f186f68..0000000000000
--- a/app/code/Magento/MediaGalleryRenditions/etc/adminhtml/system.xml
+++ /dev/null
@@ -1,24 +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="system">
-            <group id="media_gallery_renditions" translate="label" type="text" sortOrder="1010" showInDefault="1" showInWebsite="0" showInStore="0">
-                <label>Media Gallery Renditions</label>
-                <field id="width" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
-                    <label>Width</label>
-                    <validate>validate-zero-or-greater validate-digits</validate>
-                </field>
-                <field id="height" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
-                    <label>Height</label>
-                    <validate>validate-zero-or-greater validate-digits</validate>
-                </field>
-            </group>
-        </section>
-    </system>
-</config>
diff --git a/app/code/Magento/MediaGalleryRenditions/etc/config.xml b/app/code/Magento/MediaGalleryRenditions/etc/config.xml
deleted file mode 100644
index 58c5aa1f11fd2..0000000000000
--- a/app/code/Magento/MediaGalleryRenditions/etc/config.xml
+++ /dev/null
@@ -1,17 +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>
-        <system>
-            <media_gallery_renditions>
-                <width>1000</width>
-                <height>1000</height>
-            </media_gallery_renditions>
-        </system>
-    </default>
-</config>
diff --git a/app/code/Magento/MediaGalleryRenditions/etc/module.xml b/app/code/Magento/MediaGalleryRenditions/etc/module.xml
deleted file mode 100644
index 792a9e128cc40..0000000000000
--- a/app/code/Magento/MediaGalleryRenditions/etc/module.xml
+++ /dev/null
@@ -1,10 +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:framework:Module/etc/module.xsd">
-    <module name="Magento_MediaGalleryRenditions" />
-</config>
diff --git a/app/code/Magento/MediaGalleryRenditions/registration.php b/app/code/Magento/MediaGalleryRenditions/registration.php
deleted file mode 100644
index 275c06f752a63..0000000000000
--- a/app/code/Magento/MediaGalleryRenditions/registration.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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_MediaGalleryRenditions',
-    __DIR__
-);
diff --git a/app/code/Magento/MediaGalleryRenditionsApi/LICENSE.txt b/app/code/Magento/MediaGalleryRenditionsApi/LICENSE.txt
deleted file mode 100644
index 36b2459f6aa63..0000000000000
--- a/app/code/Magento/MediaGalleryRenditionsApi/LICENSE.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-
-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.
diff --git a/app/code/Magento/MediaGalleryRenditionsApi/LICENSE_AFL.txt b/app/code/Magento/MediaGalleryRenditionsApi/LICENSE_AFL.txt
deleted file mode 100644
index f39d641b18a19..0000000000000
--- a/app/code/Magento/MediaGalleryRenditionsApi/LICENSE_AFL.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-
-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/MediaGalleryRenditionsApi/Model/Config.php b/app/code/Magento/MediaGalleryRenditionsApi/Model/Config.php
deleted file mode 100644
index e558f23ab9608..0000000000000
--- a/app/code/Magento/MediaGalleryRenditionsApi/Model/Config.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-declare(strict_types=1);
-
-namespace Magento\MediaGalleryRenditionsApi\Model;
-
-use Magento\Framework\App\Config\ScopeConfigInterface;
-
-/**
- * Class responsible for providing access to Media Gallery Renditions system configuration.
- */
-class Config
-{
-    /**
-     * Config path for Media Gallery Renditions Width
-     */
-    private const XML_PATH_MEDIA_GALLERY_RENDITIONS_WIDTH_PATH = 'system/media_gallery_renditions/width';
-
-    /**
-     * Config path for Media Gallery Renditions Height
-     */
-    private const XML_PATH_MEDIA_GALLERY_RENDITIONS_HEIGHT_PATH = 'system/media_gallery_renditions/height';
-
-    /**
-     * @var ScopeConfigInterface
-     */
-    private $scopeConfig;
-
-    /**
-     * Config constructor.
-     * @param ScopeConfigInterface $scopeConfig
-     */
-    public function __construct(
-        ScopeConfigInterface $scopeConfig
-    ) {
-        $this->scopeConfig = $scopeConfig;
-    }
-
-    /**
-     * Get max width
-     *
-     * @return int
-     */
-    public function getWidth(): int
-    {
-        return $this->scopeConfig->getValue(self::XML_PATH_MEDIA_GALLERY_RENDITIONS_WIDTH_PATH);
-    }
-
-    /**
-     * Get max height
-     *
-     * @return int
-     */
-    public function getHeight(): int
-    {
-        return $this->scopeConfig->getValue(self::XML_PATH_MEDIA_GALLERY_RENDITIONS_HEIGHT_PATH);
-    }
-}
diff --git a/app/code/Magento/MediaGalleryRenditionsApi/README.md b/app/code/Magento/MediaGalleryRenditionsApi/README.md
deleted file mode 100644
index 42478c0c9b520..0000000000000
--- a/app/code/Magento/MediaGalleryRenditionsApi/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Magento_MediaGalleryRenditionsApi module
-
-The Magento_MediaGalleryRenditionsApi module is responsible for the API implementation of Media Gallery Renditions.
-
-## Extensibility
-
-Extension developers can interact with the Magento_MediaGalleryRenditions module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
-
-[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_MediaGalleryRenditionsApi module.
-
-## Additional information
-
-For information about significant changes in patch releases, see [2.3.x Release information](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html).
diff --git a/app/code/Magento/MediaGalleryRenditionsApi/composer.json b/app/code/Magento/MediaGalleryRenditionsApi/composer.json
deleted file mode 100644
index 6e3c559f001c1..0000000000000
--- a/app/code/Magento/MediaGalleryRenditionsApi/composer.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "name": "magento/module-media-gallery-renditions-api",
-    "description": "Magento module that is responsible for the API implementation of Media Gallery Renditions.",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*"
-    },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "autoload": {
-        "files": [
-            "registration.php"
-        ],
-        "psr-4": {
-            "Magento\\MediaGalleryRenditionsApi\\": ""
-        }
-    }
-}
diff --git a/app/code/Magento/MediaGalleryRenditionsApi/etc/module.xml b/app/code/Magento/MediaGalleryRenditionsApi/etc/module.xml
deleted file mode 100644
index 64efa325ec791..0000000000000
--- a/app/code/Magento/MediaGalleryRenditionsApi/etc/module.xml
+++ /dev/null
@@ -1,10 +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:framework:Module/etc/module.xsd">
-    <module name="Magento_MediaGalleryRenditionsApi" />
-</config>
diff --git a/app/code/Magento/MediaGalleryRenditionsApi/registration.php b/app/code/Magento/MediaGalleryRenditionsApi/registration.php
deleted file mode 100644
index bf057f2d2adbf..0000000000000
--- a/app/code/Magento/MediaGalleryRenditionsApi/registration.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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_MediaGalleryRenditionsApi',
-    __DIR__
-);

From ec99fef7abab688f03b3101f4f030db26f2327b3 Mon Sep 17 00:00:00 2001
From: Yaroslav Rogoza <enarc@atwix.com>
Date: Tue, 4 Aug 2020 15:16:40 +0200
Subject: [PATCH 1230/1718] Adjusted assertion message

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

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 740c50916e498..be444d7b22b45 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartSingleMutationTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartSingleMutationTest.php
@@ -183,7 +183,7 @@ public function testOutOfStockVariationToCart()
 
         $response = $this->graphQlMutation($query);
 
-        $expectedErrorMessage = 'This product is out of stock.';
+        $expectedErrorMessage = 'There are no source items with the in stock status';
         self::assertEquals($expectedErrorMessage, $response['addProductsToCart']['userInputErrors'][0]['message']);
     }
 

From de0eb75ec43c9cbda190c9bfe095419bfe636881 Mon Sep 17 00:00:00 2001
From: Rowena Santos <rowena.santos@acidgreen.com.au>
Date: Tue, 4 Aug 2020 21:24:31 +0800
Subject: [PATCH 1231/1718] magento/partners-magento2b2b#166: Payment on
 Account for Admin Panel orders - Additional on MFTF changes

---
 .../StorefrontVerifyCustomerOrderDataActionGroup.xml          | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontVerifyCustomerOrderDataActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontVerifyCustomerOrderDataActionGroup.xml
index 5880611883c9d..81ce5dbe69980 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontVerifyCustomerOrderDataActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontVerifyCustomerOrderDataActionGroup.xml
@@ -13,16 +13,12 @@
             <description>Verify a customer's order details on the view order page on the storefront</description>
         </annotations>
         <arguments>
-            <argument name="orderId" type="string"/>
-            <argument name="orderNumber" type="string"/>
             <argument name="createdDate" type="string"/>
             <argument name="productName" type="string"/>
             <argument name="grandTotal" type="string"/>
             <argument name="orderPlacedBy" type="string"/>
             <argument name="paymentMethod" type="string"/>
         </arguments>
-        <amOnPage url="sales/order/view/order_id/{{orderId}}" stepKey="goToOrdersPage"/>
-        <waitForText selector="{{StorefrontCustomerAccountMainSection.pageTitle}}" userInput="{{orderNumber}}" stepKey="verifyOrderNo"/>
         <waitForText selector="{{StorefrontCustomerOrderViewSection.paymentMethod}}" userInput="{{paymentMethod}}" stepKey="storefrontVerifyPaymentMethod"/>
         <waitForText selector="{{StorefrontCustomerOrderViewSection.createdDate}}" userInput="{{createdDate}}" stepKey="storefrontVerifyOrderCreatedDate"/>
         <waitForText selector="{{StorefrontCustomerOrderViewSection.orderPlacedBy}}" userInput="{{orderPlacedBy}}" stepKey="storefrontVerifyOrderPlacedBy"/>

From 28109cdf5b8991027d39635b96fd00d2564318b0 Mon Sep 17 00:00:00 2001
From: Rowena Santos <rowena.santos@acidgreen.com.au>
Date: Tue, 4 Aug 2020 21:34:23 +0800
Subject: [PATCH 1232/1718] magento/partners-magento2b2b#166: Payment on
 Account for Admin Panel orders -  move
 StorefrontGoToCustomerOrderDetailsPageActionGroup to CE

---
 ...oToCustomerOrderDetailsPageActionGroup.xml | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontGoToCustomerOrderDetailsPageActionGroup.xml

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontGoToCustomerOrderDetailsPageActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontGoToCustomerOrderDetailsPageActionGroup.xml
new file mode 100644
index 0000000000000..8dbc2ba1fc9c5
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontGoToCustomerOrderDetailsPageActionGroup.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="StorefrontGoToCustomerOrderDetailsPageActionGroup">
+        <annotations>
+            <description>Navigate to storefront order details page</description>
+        </annotations>
+        <arguments>
+            <argument name="orderId" type="string"/>
+            <argument name="orderNumber" type="string"/>
+        </arguments>
+        <amOnPage url="sales/order/view/order_id/{{orderId}}" stepKey="goToOrdersPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <waitForText selector="{{StorefrontCustomerAccountMainSection.pageTitle}}" userInput="{{orderNumber}}" stepKey="verifyOrderNo"/>
+    </actionGroup>
+</actionGroups>

From d8f8d49edafeed1d7c9b4b563665294143b54896 Mon Sep 17 00:00:00 2001
From: Rowena Santos <rowena.santos@acidgreen.com.au>
Date: Tue, 4 Aug 2020 22:00:51 +0800
Subject: [PATCH 1233/1718] magento/partners-magento2b2b#166: Payment on
 Account for Admin Panel orders -  updated customer order view url

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

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontGoToCustomerOrderDetailsPageActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontGoToCustomerOrderDetailsPageActionGroup.xml
index 8dbc2ba1fc9c5..47d6fe1ed204e 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontGoToCustomerOrderDetailsPageActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontGoToCustomerOrderDetailsPageActionGroup.xml
@@ -16,7 +16,7 @@
             <argument name="orderId" type="string"/>
             <argument name="orderNumber" type="string"/>
         </arguments>
-        <amOnPage url="sales/order/view/order_id/{{orderId}}" stepKey="goToOrdersPage"/>
+        <amOnPage url="{{StorefrontCustomerOrderViewPage.url(orderId)}}" stepKey="goToOrdersPage"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <waitForText selector="{{StorefrontCustomerAccountMainSection.pageTitle}}" userInput="{{orderNumber}}" stepKey="verifyOrderNo"/>
     </actionGroup>

From 825cf76921588b546347cffefc4006045aebbd49 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Mon, 27 Jul 2020 14:35:44 +0300
Subject: [PATCH 1234/1718] MC-36060: [On Premise] - State field is disabled
 after country change

---
 .../view/frontend/web/js/region-updater.js    |  17 +-
 .../frontend/js/region-updater.test.js        | 206 ++++++++++++++++++
 2 files changed, 219 insertions(+), 4 deletions(-)
 create mode 100644 dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/region-updater.test.js

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js b/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
index 6d54f607484b4..2555aa876b71e 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
@@ -157,7 +157,10 @@ define([
                 regionInput = $(this.options.regionInputId),
                 postcode = $(this.options.postcodeId),
                 label = regionList.parent().siblings('label'),
-                container = regionList.parents('div.field');
+                container = regionList.parents('div.field'),
+                regionsEntries,
+                regionId,
+                regionData;
 
             this._clearError();
             this._checkRegionRequired(country);
@@ -168,8 +171,14 @@ define([
             // Populate state/province dropdown list if available or use input box
             if (this.options.regionJson[country]) {
                 this._removeSelectOptions(regionList);
-                $.each(this.options.regionJson[country], $.proxy(function (key, value) {
-                    this._renderSelectOption(regionList, key, value);
+                regionsEntries = _.pairs(this.options.regionJson[country]);
+                regionsEntries.sort(function (a, b) {
+                    return a[1].name > b[1].name ? 1 : -1;
+                });
+                $.each(regionsEntries, $.proxy(function (key, value) {
+                    regionId = value[0];
+                    regionData = value[1];
+                    this._renderSelectOption(regionList, regionId, regionData);
                 }, this));
 
                 if (this.currentRegionOption) {
@@ -193,7 +202,7 @@ define([
                         regionList.hide();
                         container.hide();
                     } else {
-                        regionList.show();
+                        regionList.removeAttr('disabled').show();
                     }
                 }
 
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/region-updater.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/region-updater.test.js
new file mode 100644
index 0000000000000..6b77c35b9fe60
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/region-updater.test.js
@@ -0,0 +1,206 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/*eslint-disable max-nested-callbacks*/
+/*jscs:disable jsDoc*/
+define([
+    'jquery',
+    'Magento_Checkout/js/region-updater'
+], function ($) {
+    'use strict';
+
+    var regionJson = {
+            'config': {
+                'show_all_regions': true,
+                'regions_required': [
+                    'US'
+                ]
+            },
+            'US': {
+                '1': {
+                    'code': 'AL',
+                    'name': 'Alabama'
+                },
+                '2': {
+                    'code': 'AK',
+                    'name': 'Alaska'
+                },
+                '3': {
+                    'code': 'AS',
+                    'name': 'American Samoa'
+                }
+            },
+            'DE': {
+                '81': {
+                    'code': 'BAY',
+                    'name': 'Bayern'
+                },
+                '82': {
+                    'code': 'BER',
+                    'name': 'Berlin'
+                },
+                '83': {
+                    'code': 'BRG',
+                    'name': 'Brandenburg'
+                }
+            }
+        },
+        defaultCountry = 'GB',
+        countries = {
+            '': '',
+            'US': 'United States',
+            'GB': 'United Kingdom',
+            'DE': 'Germany'
+        },
+        regions = {
+            '': 'Please select a region, state or province.'
+        },
+        countryEl,
+        regionSelectEl,
+        regionInputEl,
+        postalCodeEl,
+        formEl,
+        containerEl;
+
+    function createFormField() {
+        var fieldWrapperEl = document.createElement('div'),
+            labelEl = document.createElement('label'),
+            inputControlEl = document.createElement('div'),
+            i;
+
+        fieldWrapperEl.appendChild(labelEl);
+        fieldWrapperEl.appendChild(inputControlEl);
+
+        for (i = 0; i < arguments.length; i++) {
+            inputControlEl.appendChild(arguments[i]);
+        }
+        labelEl.setAttribute('class', 'label');
+        fieldWrapperEl.setAttribute('class', 'field required');
+        inputControlEl.setAttribute('class', 'control');
+
+        return fieldWrapperEl;
+    }
+
+    function buildSelectOptions(select, options, defaultOption) {
+        var optionValue,
+            optionEl;
+
+        defaultOption = typeof defaultOption === 'undefined' ? '' : defaultOption;
+
+        // eslint-disable-next-line guard-for-in
+        for (optionValue in options) {
+            if (options.hasOwnProperty(optionValue)) {
+                optionEl = document.createElement('option');
+                optionEl.setAttribute('value', optionValue);
+                optionEl.textContent = countries[optionValue];
+                // eslint-disable-next-line max-depth
+                if (defaultOption === optionValue) {
+                    optionEl.setAttribute('selected', 'selected');
+                }
+                select.add(optionEl);
+            }
+        }
+    }
+
+    function init(config) {
+        var defaultConfig = {
+            'optionalRegionAllowed': true,
+            'regionListId': '#' + regionSelectEl.id,
+            'regionInputId': '#' + regionInputEl.id,
+            'postcodeId': '#' + postalCodeEl.id,
+            'form': '#' + formEl.id,
+            'regionJson': regionJson,
+            'defaultRegion': 0,
+            'countriesWithOptionalZip': ['GB']
+        };
+
+        $(countryEl).regionUpdater($.extend({}, defaultConfig, config || {}));
+    }
+
+    beforeEach(function () {
+        containerEl = document.createElement('div');
+        formEl = document.createElement('form');
+        regionSelectEl = document.createElement('select');
+        regionInputEl = document.createElement('input');
+        postalCodeEl = document.createElement('input');
+        countryEl = document.createElement('select');
+        regionSelectEl.setAttribute('id', 'region_id');
+        regionSelectEl.setAttribute('style', 'display:none;');
+        regionInputEl.setAttribute('id', 'region');
+        regionInputEl.setAttribute('style', 'display:none;');
+        countryEl.setAttribute('id', 'country');
+        postalCodeEl.setAttribute('id', 'zip');
+        formEl.setAttribute('id', 'test_form');
+        formEl.appendChild(createFormField(countryEl));
+        formEl.appendChild(createFormField(regionSelectEl, regionInputEl));
+        formEl.appendChild(createFormField(postalCodeEl));
+        containerEl.appendChild(formEl);
+        buildSelectOptions(regionSelectEl, regions);
+        buildSelectOptions(countryEl, countries, defaultCountry);
+        document.body.appendChild(containerEl);
+    });
+
+    afterEach(function () {
+        $(containerEl).remove();
+        formEl = undefined;
+        containerEl = undefined;
+        regionSelectEl = undefined;
+        regionInputEl = undefined;
+        postalCodeEl = undefined;
+        countryEl = undefined;
+    });
+
+    describe('Magento_Checkout/js/region-updater', function () {
+        it('Check that default country is selected', function () {
+            init();
+            expect($(countryEl).val()).toBe(defaultCountry);
+        });
+        it('Check that region list is not displayed when selected country has no predefined regions', function () {
+            init();
+            $(countryEl).val('GB').change();
+            expect($(regionInputEl).is(':visible')).toBe(true);
+            expect($(regionInputEl).is(':disabled')).toBe(false);
+            expect($(regionSelectEl).is(':visible')).toBe(false);
+            expect($(regionSelectEl).is(':disabled')).toBe(true);
+        });
+        it('Check country that has predefined and optional regions', function () {
+            init();
+            $(countryEl).val('DE').change();
+            expect($(regionSelectEl).is(':visible')).toBe(true);
+            expect($(regionSelectEl).is(':disabled')).toBe(false);
+            expect($(regionSelectEl).hasClass('required-entry')).toBe(false);
+            expect($(regionInputEl).is(':visible')).toBe(false);
+            expect(
+                $(regionSelectEl).find('option')
+                    .map(function () {
+                        return this.textContent;
+                    })
+                    .get()
+            ).toContain('Berlin');
+        });
+        it('Check country that has predefined and required regions', function () {
+            init();
+            $(countryEl).val('US').change();
+            expect($(regionSelectEl).is(':visible')).toBe(true);
+            expect($(regionSelectEl).is(':disabled')).toBe(false);
+            expect($(regionSelectEl).hasClass('required-entry')).toBe(true);
+            expect($(regionInputEl).is(':visible')).toBe(false);
+            expect(
+                $(regionSelectEl).find('option')
+                    .map(function () {
+                        return this.textContent;
+                    })
+                    .get()
+            ).toContain('Alaska');
+        });
+        it('Check that region fields are not displayed for country with optional regions if configured', function () {
+            init({
+                optionalRegionAllowed: false
+            });
+            $(countryEl).val('DE').change();
+            expect($(regionSelectEl).is(':visible')).toBe(false);
+            expect($(regionInputEl).is(':visible')).toBe(false);
+        });
+    });
+});

From 647fbf1c863499f1a815aac2a542e031575b3f71 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Tue, 4 Aug 2020 17:35:13 +0300
Subject: [PATCH 1235/1718] MC-36226: State/Province is empty on Edit Address
 page

---
 .../view/frontend/web/js/region-updater.js    |  6 +--
 .../frontend/js/region-updater.test.js        | 39 ++++++++++++++++++-
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js b/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
index 2555aa876b71e..68f6b1b2753c0 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
@@ -56,6 +56,9 @@ define([
             if (this.options.isMultipleCountriesAllowed) {
                 this.element.parents('div.field').show();
                 this.element.on('change', $.proxy(function (e) {
+                    // clear region inputs on country change
+                    $(this.options.regionListId).val('');
+                    $(this.options.regionInputId).val('');
                     this._updateRegion($(e.target).val());
                 }, this));
 
@@ -165,9 +168,6 @@ define([
             this._clearError();
             this._checkRegionRequired(country);
 
-            $(regionList).find('option:selected').removeAttr('selected');
-            regionInput.val('');
-
             // Populate state/province dropdown list if available or use input box
             if (this.options.regionJson[country]) {
                 this._removeSelectOptions(regionList);
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/region-updater.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/region-updater.test.js
index 6b77c35b9fe60..0fdf36f0cfecc 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/region-updater.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/region-updater.test.js
@@ -51,7 +51,8 @@ define([
             '': '',
             'US': 'United States',
             'GB': 'United Kingdom',
-            'DE': 'Germany'
+            'DE': 'Germany',
+            'IT': 'Italy'
         },
         regions = {
             '': 'Please select a region, state or province.'
@@ -202,5 +203,41 @@ define([
             expect($(regionSelectEl).is(':visible')).toBe(false);
             expect($(regionInputEl).is(':visible')).toBe(false);
         });
+        it('Check that initial values are not overwritten - region input', function () {
+            $(countryEl).val('GB');
+            $(regionInputEl).val('Liverpool');
+            $(postalCodeEl).val('L13 0AL');
+            init();
+            expect($(countryEl).val()).toBe('GB');
+            expect($(regionInputEl).val()).toBe('Liverpool');
+            expect($(postalCodeEl).val()).toBe('L13 0AL');
+        });
+        it('Check that initial values are not overwritten - region select', function () {
+            $(countryEl).val('US');
+            $(postalCodeEl).val('99501');
+            init({
+                defaultRegion: '2'
+            });
+            expect($(countryEl).val()).toBe('US');
+            expect($(regionSelectEl).find('option:selected').text()).toBe('Alaska');
+            expect($(postalCodeEl).val()).toBe('99501');
+        });
+        it('Check that region values are cleared out on country change - region input', function () {
+            $(countryEl).val('GB');
+            $(regionInputEl).val('Liverpool');
+            init();
+            $(countryEl).val('IT').change();
+            expect($(countryEl).val()).toBe('IT');
+            expect($(regionInputEl).val()).toBe('');
+        });
+        it('Check that region values are cleared out on country change - region select', function () {
+            $(countryEl).val('US');
+            init({
+                defaultRegion: '2'
+            });
+            $(countryEl).val('DE').change();
+            expect($(countryEl).val()).toBe('DE');
+            expect($(regionSelectEl).val()).toBe('');
+        });
     });
 });

From a9a508d811d29488c45740672571ed1dba5c0106 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 4 Aug 2020 16:07:57 +0100
Subject: [PATCH 1236/1718] Fixed static tests

---
 .../web/js/action/deleteImageWithDetailConfirmation.js         | 3 +--
 1 file changed, 1 insertion(+), 2 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 fb7bb0f1b0d0c..51d124ca319e6 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,8 +21,7 @@ define([
          * @param {String} deleteImageUrl
          */
         deleteImageAction: function (recordsIds, imageDetailsUrl, deleteImageUrl) {
-            var imagesCount = Object.keys(recordsIds).length,
-                confirmationContent = $t('%1 Are you sure you want to delete "%2" image(s)?')
+            var confirmationContent = $t('%1 Are you sure you want to delete "%2" image(s)?')
                 .replace('%2', Object.keys(recordsIds).length),
                 deferred = $.Deferred();
 

From 87a70e92e3d60f087bf0fe6dd380f27ef300d351 Mon Sep 17 00:00:00 2001
From: oleksandrkravchuk <oleksandr.kravchuk@vaimo.com>
Date: Tue, 4 Aug 2020 18:17:04 +0200
Subject: [PATCH 1237/1718] community-features#252 Create static test for
 action controllers. Apply code review changes.

---
 .../TestFramework/Utility/AddedFiles.php      | 35 ++++++++++
 .../TestFramework/Utility/FilesSearch.php     | 48 +++++++++++++
 .../Utility/ChildrenClassesSearch/A.php       | 10 +++
 .../Utility/ChildrenClassesSearch/B.php       | 10 +++
 .../Utility/ChildrenClassesSearch/C.php       | 10 +++
 .../Utility/ChildrenClassesSearch/D.php       | 10 +++
 .../Utility/ChildrenClassesSearch/E.php       | 10 +++
 .../Utility/ChildrenClassesSearch/F.php       | 10 +++
 .../Utility/ChildrenClassesSearch/Z.php       | 10 +++
 .../Utility/ChildrenClassesSearchTest.php     | 31 ++++++---
 .../TestFramework/Utility/FilesSearchTest.php | 54 +++++++++++++++
 .../Utility/PartialNamespace/Baz.php          | 23 -------
 .../Utility/PartialNamespace/Foo.php          | 34 ----------
 .../_files/changed_files_some_name_test.txt   |  3 +
 .../App/Action/AbstractActionTest.php         | 60 +----------------
 .../Magento/Test/Php/LiveCodeTest.php         | 67 ++-----------------
 16 files changed, 241 insertions(+), 184 deletions(-)
 create mode 100644 dev/tests/static/framework/Magento/TestFramework/Utility/AddedFiles.php
 create mode 100644 dev/tests/static/framework/Magento/TestFramework/Utility/FilesSearch.php
 create mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/A.php
 create mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/B.php
 create mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/C.php
 create mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/D.php
 create mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/E.php
 create mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/F.php
 create mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/Z.php
 create mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/FilesSearchTest.php
 delete mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/PartialNamespace/Baz.php
 delete mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/PartialNamespace/Foo.php
 create mode 100644 dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/_files/changed_files_some_name_test.txt

diff --git a/dev/tests/static/framework/Magento/TestFramework/Utility/AddedFiles.php b/dev/tests/static/framework/Magento/TestFramework/Utility/AddedFiles.php
new file mode 100644
index 0000000000000..6b1184418e16e
--- /dev/null
+++ b/dev/tests/static/framework/Magento/TestFramework/Utility/AddedFiles.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Utility;
+
+/**
+ * Helper class to add list of added new files.
+ */
+class AddedFiles
+{
+    /**
+     * Provide list of new files.
+     *
+     * @param $changedFilesBaseDir
+     *
+     * @return string[]
+     */
+    public static function getAddedFilesList(string $changedFilesBaseDir): array
+    {
+        return FilesSearch::getFilesFromListFile(
+            $changedFilesBaseDir,
+            'changed_files*.added.*',
+            function () {
+                // if no list files, probably, this is the dev environment
+                // phpcs:ignore Generic.PHP.NoSilencedErrors,Magento2.Security.InsecureFunction
+                @exec('git diff --cached --name-only --diff-filter=A', $addedFiles);
+                return $addedFiles;
+            }
+        );
+    }
+}
diff --git a/dev/tests/static/framework/Magento/TestFramework/Utility/FilesSearch.php b/dev/tests/static/framework/Magento/TestFramework/Utility/FilesSearch.php
new file mode 100644
index 0000000000000..0ec8124496d1d
--- /dev/null
+++ b/dev/tests/static/framework/Magento/TestFramework/Utility/FilesSearch.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Utility;
+
+/**
+ * Helper class to search files by provided directory and file pattern.
+ */
+class FilesSearch
+{
+    /**
+     * Read files from generated lists.
+     *
+     * @param string $listsBaseDir
+     * @param string $listFilePattern
+     * @param callable $noListCallback
+     * @return string[]
+     */
+    public static function getFilesFromListFile(
+        string $listsBaseDir,
+        string $listFilePattern,
+        callable $noListCallback
+    ): array {
+        $filesDefinedInList = [];
+        $listFiles = glob($listsBaseDir . '/_files/' . $listFilePattern);
+        if (!empty($listFiles)) {
+            foreach ($listFiles as $listFile) {
+                $filesDefinedInList[] = file($listFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+            }
+            $filesDefinedInList = array_merge([], ...$filesDefinedInList);
+        } else {
+            $filesDefinedInList = call_user_func($noListCallback);
+        }
+        array_walk(
+            $filesDefinedInList,
+            function (&$file) {
+                $file = BP . '/' . $file;
+            }
+        );
+        $filesDefinedInList = array_values(array_unique($filesDefinedInList));
+
+        return $filesDefinedInList;
+    }
+}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/A.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/A.php
new file mode 100644
index 0000000000000..3369df1edd54f
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/A.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestFramework\Utility\ChildrenClassesSearch;
+
+class A
+{
+}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/B.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/B.php
new file mode 100644
index 0000000000000..8873af3e4f9b7
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/B.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestFramework\Utility\ChildrenClassesSearch;
+
+class B extends A
+{
+}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/C.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/C.php
new file mode 100644
index 0000000000000..1fe77df4a7f15
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/C.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestFramework\Utility\ChildrenClassesSearch;
+
+class C implements Z
+{
+}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/D.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/D.php
new file mode 100644
index 0000000000000..8dc2cc0b9269e
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/D.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestFramework\Utility\ChildrenClassesSearch;
+
+class D
+{
+}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/E.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/E.php
new file mode 100644
index 0000000000000..563135ff36d3c
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/E.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestFramework\Utility\ChildrenClassesSearch;
+
+class E extends B
+{
+}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/F.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/F.php
new file mode 100644
index 0000000000000..5c7b8d8fb17af
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/F.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestFramework\Utility\ChildrenClassesSearch;
+
+class F extends E implements Z
+{
+}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/Z.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/Z.php
new file mode 100644
index 0000000000000..2ac48bda187b6
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/Z.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestFramework\Utility\ChildrenClassesSearch;
+
+interface Z
+{
+}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearchTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearchTest.php
index 9947414f7d364..efb073d93ed07 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearchTest.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearchTest.php
@@ -3,11 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\TestFramework\Utility;
 
-use Magento\Framework\App\Action\AbstractAction;
+use Magento\TestFramework\Utility\ChildrenClassesSearch\A;
+use Magento\TestFramework\Utility\ChildrenClassesSearch\B;
+use Magento\TestFramework\Utility\ChildrenClassesSearch\E;
+use Magento\TestFramework\Utility\ChildrenClassesSearch\F;
+use PHPUnit\Framework\TestCase;
 
-class ChildrenClassesSearchTest extends \PHPUnit\Framework\TestCase
+class ChildrenClassesSearchTest extends TestCase
 {
     /**
      * @var ChildrenClassesSearch
@@ -22,18 +28,27 @@ protected function setUp(): void
     public function testChildrenSearch(): void
     {
         $files = [
-            __DIR__ . '/PartialNamespace/Foo.php',
-            __DIR__ . '/PartialNamespace/Bar.php',
-            __DIR__ . '/PartialNamespace/Baz.php',
+            __DIR__ . '/ChildrenClassesSearch/A.php',
+            __DIR__ . '/ChildrenClassesSearch/B.php',
+            __DIR__ . '/ChildrenClassesSearch/C.php',
+            __DIR__ . '/ChildrenClassesSearch/D.php',
+            __DIR__ . '/ChildrenClassesSearch/E.php',
+            __DIR__ . '/ChildrenClassesSearch/F.php',
+            __DIR__ . '/ChildrenClassesSearch/Z.php',
         ];
 
         $found = $this->childrenClassesSearch->getClassesWhichAreChildrenOf(
             $files,
-            AbstractAction::class,
+            A::class,
             false
         );
 
-        $this->assertCount(1, $found);
-        $this->assertEquals(current($found), \Magento\TestFramework\Utility\PartialNamespace\Foo::class);
+        $expected = [
+            B::class,
+            E::class,
+            F::class
+        ];
+
+        $this->assertSame($expected, $found);
     }
 }
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/FilesSearchTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/FilesSearchTest.php
new file mode 100644
index 0000000000000..8c1206c56ce8e
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/FilesSearchTest.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Utility;
+
+use PHPUnit\Framework\TestCase;
+
+class FilesSearchTest extends TestCase
+{
+    /**
+     * Test files list extraction from file.
+     */
+    public function testGetFiles(): void
+    {
+        $pattern = 'changed_files*.txt';
+
+        $files = FilesSearch::getFilesFromListFile(__DIR__, $pattern, function () {
+            return [];
+        });
+
+        $expected = [
+            BP . '/app/code/Magento/Cms/Block/Block.php',
+            BP . '/app/code/Magento/Cms/Api/BlockRepositoryInterface.php',
+            BP . '/app/code/Magento/Cms/Observer/NoCookiesObserver.php'
+        ];
+
+        $this->assertSame($files, $expected);
+    }
+
+    /**
+     * Test callblack function in case when files with lists did not found.
+     */
+    public function testGetEmptyList(): void
+    {
+        $pattern = 'zzz.txt';
+
+
+        $files = FilesSearch::getFilesFromListFile(__DIR__, $pattern, function () {
+            return ['1', '2', '3'];
+        });
+
+        $expected = [
+            BP . '/1',
+            BP . '/2',
+            BP . '/3'
+        ];
+
+        $this->assertSame($files, $expected);
+    }
+}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/PartialNamespace/Baz.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/PartialNamespace/Baz.php
deleted file mode 100644
index 1b54259b348ea..0000000000000
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/PartialNamespace/Baz.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\TestFramework\Utility\PartialNamespace;
-
-use Magento\Framework\App\ActionInterface;
-use Magento\Framework\App\ResponseInterface;
-
-class Baz implements ActionInterface
-{
-    /**
-     * Execute action based on request and return result
-     *
-     * @return \Magento\Framework\Controller\ResultInterface|ResponseInterface
-     * @throws \Magento\Framework\Exception\NotFoundException
-     */
-    public function execute()
-    {
-
-    }
-}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/PartialNamespace/Foo.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/PartialNamespace/Foo.php
deleted file mode 100644
index 6d062ff81bcce..0000000000000
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/PartialNamespace/Foo.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\TestFramework\Utility\PartialNamespace;
-
-use Magento\Framework\App\Action\AbstractAction;
-use Magento\Framework\App\RequestInterface;
-use Magento\Framework\App\ResponseInterface;
-
-class Foo extends AbstractAction
-{
-    /**
-     * Dispatch request
-     *
-     * @param RequestInterface $request
-     *
-     * @return ResponseInterface
-     */
-    public function dispatch(RequestInterface $request)
-    {
-    }
-
-    /**
-     * Execute action based on request and return result
-     *
-     * @return \Magento\Framework\Controller\ResultInterface|ResponseInterface
-     * @throws \Magento\Framework\Exception\NotFoundException
-     */
-    public function execute()
-    {
-    }
-}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/_files/changed_files_some_name_test.txt b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/_files/changed_files_some_name_test.txt
new file mode 100644
index 0000000000000..816f4b32c9361
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/_files/changed_files_some_name_test.txt
@@ -0,0 +1,3 @@
+app/code/Magento/Cms/Block/Block.php
+app/code/Magento/Cms/Api/BlockRepositoryInterface.php
+app/code/Magento/Cms/Observer/NoCookiesObserver.php
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/Magento/Framework/App/Action/AbstractActionTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/Magento/Framework/App/Action/AbstractActionTest.php
index 7287adaae7f2f..69050c3c51895 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/Magento/Framework/App/Action/AbstractActionTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/Magento/Framework/App/Action/AbstractActionTest.php
@@ -11,6 +11,7 @@
 use Magento\Framework\App\ActionInterface;
 use Magento\Framework\App\Utility\Files;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\TestFramework\Utility\AddedFiles;
 use Magento\TestFramework\Utility\ChildrenClassesSearch;
 use PHPUnit\Framework\TestCase;
 
@@ -64,74 +65,19 @@ public function testNewControllersDoNotExtendAbstractAction(): void
      */
     private function getTestFiles(): array
     {
-        $phpFiles = self::getAddedFilesList(self::getChangedFilesBaseDir());
+        $phpFiles = AddedFiles::getAddedFilesList($this->getChangedFilesBaseDir());
 
         $phpFiles = Files::composeDataSets($phpFiles);
         $fileTypes = Files::INCLUDE_APP_CODE | Files::INCLUDE_LIBS | Files::AS_DATA_SET;
         return array_intersect_key($phpFiles, $this->fileUtilities->getPhpFiles($fileTypes));
     }
 
-    /**
-     * Provide list of new files.
-     *
-     * @param $changedFilesBaseDir
-     *
-     * @return string[]
-     */
-    private static function getAddedFilesList($changedFilesBaseDir)
-    {
-        return self::getFilesFromListFile(
-            $changedFilesBaseDir,
-            'changed_files*.added.*',
-            function () {
-                // if no list files, probably, this is the dev environment
-                // phpcs:ignore Generic.PHP.NoSilencedErrors,Magento2.Security.InsecureFunction
-                @exec('git diff --cached --name-only --diff-filter=A', $addedFiles);
-                return $addedFiles;
-            }
-        );
-    }
-
-    /**
-     * Read files from generated lists.
-     *
-     * @param string $listsBaseDir
-     * @param string $listFilePattern
-     * @param callable $noListCallback
-     * @return string[]
-     */
-    private static function getFilesFromListFile(
-        string $listsBaseDir,
-        string $listFilePattern,
-        callable $noListCallback
-    ): array {
-        $filesDefinedInList = [];
-        $listFiles = glob($listsBaseDir . '/_files/' . $listFilePattern);
-        if (!empty($listFiles)) {
-            foreach ($listFiles as $listFile) {
-                $filesDefinedInList[] = file($listFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
-            }
-            $filesDefinedInList = array_merge([], ...$filesDefinedInList);
-        } else {
-            $filesDefinedInList = call_user_func($noListCallback);
-        }
-        array_walk(
-            $filesDefinedInList,
-            function (&$file) {
-                $file = BP . '/' . $file;
-            }
-        );
-        $filesDefinedInList = array_values(array_unique($filesDefinedInList));
-
-        return $filesDefinedInList;
-    }
-
     /**
      * Returns base directory for generated lists.
      *
      * @return string
      */
-    private static function getChangedFilesBaseDir(): string
+    private function getChangedFilesBaseDir(): string
     {
         return BP . DIRECTORY_SEPARATOR . 'dev' . DIRECTORY_SEPARATOR . 'tests' . DIRECTORY_SEPARATOR . 'static' .
             DIRECTORY_SEPARATOR . 'testsuite' . DIRECTORY_SEPARATOR . 'Magento' . DIRECTORY_SEPARATOR . 'Test';
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
index 324753b4bd4ec..ad91025448579 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
@@ -14,6 +14,8 @@
 use Magento\TestFramework\CodingStandard\Tool\CopyPasteDetector;
 use Magento\TestFramework\CodingStandard\Tool\PhpCompatibility;
 use Magento\TestFramework\CodingStandard\Tool\PhpStan;
+use Magento\TestFramework\Utility\AddedFiles;
+use Magento\TestFramework\Utility\FilesSearch;
 use PHPMD\TextUI\Command;
 
 /**
@@ -113,8 +115,8 @@ public static function getWhitelist(
      */
     private static function getChangedFilesList($changedFilesBaseDir)
     {
-        return self::getFilesFromListFile(
-            $changedFilesBaseDir,
+        return FilesSearch::getFilesFromListFile(
+            $changedFilesBaseDir ?: self::getChangedFilesBaseDir(),
             'changed_files*',
             function () {
                 // if no list files, probably, this is the dev environment
@@ -128,65 +130,6 @@ function () {
         );
     }
 
-    /**
-     * This method loads list of added files.
-     *
-     * @param string $changedFilesBaseDir
-     * @return string[]
-     */
-    private static function getAddedFilesList($changedFilesBaseDir)
-    {
-        return self::getFilesFromListFile(
-            $changedFilesBaseDir,
-            'changed_files*.added.*',
-            function () {
-                // if no list files, probably, this is the dev environment
-                // phpcs:ignore Generic.PHP.NoSilencedErrors,Magento2.Security.InsecureFunction
-                @exec('git diff --cached --name-only --diff-filter=A', $addedFiles);
-                return $addedFiles;
-            }
-        );
-    }
-
-    /**
-     * Read files from generated lists.
-     *
-     * @param string $listsBaseDir
-     * @param string $listFilePattern
-     * @param callable $noListCallback
-     * @return string[]
-     */
-    private static function getFilesFromListFile($listsBaseDir, $listFilePattern, $noListCallback)
-    {
-        $filesDefinedInList = [];
-
-        $globFilesListPattern = ($listsBaseDir ?: self::getChangedFilesBaseDir())
-            . '/_files/' . $listFilePattern;
-        $listFiles = glob($globFilesListPattern);
-        if (!empty($listFiles)) {
-            foreach ($listFiles as $listFile) {
-                // phpcs:ignore Magento2.Performance.ForeachArrayMerge.ForeachArrayMerge
-                $filesDefinedInList = array_merge(
-                    $filesDefinedInList,
-                    file($listFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)
-                );
-            }
-        } else {
-            $filesDefinedInList = call_user_func($noListCallback);
-        }
-
-        array_walk(
-            $filesDefinedInList,
-            function (&$file) {
-                $file = BP . '/' . $file;
-            }
-        );
-
-        $filesDefinedInList = array_values(array_unique($filesDefinedInList));
-
-        return $filesDefinedInList;
-    }
-
     /**
      * Filter list of files.
      *
@@ -427,7 +370,7 @@ public function testCopyPaste()
      */
     public function testStrictTypes()
     {
-        $changedFiles = self::getAddedFilesList('');
+        $changedFiles = AddedFiles::getAddedFilesList(self::getChangedFilesBaseDir());
 
         try {
             $blackList = Files::init()->readLists(

From 056cb380f6d9bdcf7e68a5abde0eb6c52eaca1d2 Mon Sep 17 00:00:00 2001
From: dnyomo <dnyomo@briteskies.com>
Date: Tue, 4 Aug 2020 13:15:24 -0400
Subject: [PATCH 1238/1718] Code style fixes

---
 .../DataProvider/Product/SearchCriteriaBuilder.php       | 4 +++-
 .../Resolver/Products/DataProvider/ProductSearch.php     | 7 +++----
 .../Model/Resolver/Products/Query/Search.php             | 9 ++++++++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php b/app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php
index fe7272b933f75..b6837b334fdd8 100644
--- a/app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php
+++ b/app/code/Magento/CatalogGraphQl/DataProvider/Product/SearchCriteriaBuilder.php
@@ -213,7 +213,9 @@ private function addDefaultSortOrder(SearchCriteriaInterface $searchCriteria, ar
         } else {
             $categoryIdFilter = isset($args['filter']['category_id']) ? $args['filter']['category_id'] : false;
             if ($categoryIdFilter) {
-                if (!is_array($categoryIdFilter[array_key_first($categoryIdFilter)]) || count($categoryIdFilter[array_key_first($categoryIdFilter)]) <= 1) {
+                if (!is_array($categoryIdFilter[array_key_first($categoryIdFilter)])
+                    || count($categoryIdFilter[array_key_first($categoryIdFilter)]) <= 1
+                ) {
                     $defaultSortOrder[] = $this->sortOrderBuilder
                         ->setField(EavAttributeInterface::POSITION)
                         ->setDirection(SortOrder::SORT_ASC)
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 e4823b4aa557a..c2ee0cc89468a 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php
@@ -87,15 +87,14 @@ public function __construct(
      *
      * @param SearchCriteriaInterface $searchCriteria
      * @param SearchResultInterface $searchResult
-     * @param array $args
      * @param array $attributes
      * @param ContextInterface|null $context
      * @return SearchResultsInterface
+     * @throws InputException
      */
     public function getList(
         SearchCriteriaInterface $searchCriteria,
         SearchResultInterface $searchResult,
-        array $args,
         array $attributes = [],
         ContextInterface $context = null
     ): SearchResultsInterface {
@@ -108,7 +107,7 @@ public function getList(
         $this->getSearchResultsApplier(
             $searchResult,
             $collection,
-            $this->getSortOrderArray($searchCriteriaForCollection, $args)
+            $this->getSortOrderArray($searchCriteriaForCollection)
         )->apply();
 
         $this->collectionPreProcessor->process($collection, $searchCriteriaForCollection, $attributes, $context);
@@ -154,7 +153,7 @@ private function getSearchResultsApplier(
      * @return array
      * @throws InputException
      */
-    private function getSortOrderArray(SearchCriteriaInterface $searchCriteria, $args)
+    private function getSortOrderArray(SearchCriteriaInterface $searchCriteria)
     {
         $ordersArray = [];
         $sortOrders = $searchCriteria->getSortOrders();
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search.php
index faf1d56452a24..4eb76fb5c2d5b 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search.php
@@ -12,6 +12,7 @@
 use Magento\CatalogGraphQl\Model\Resolver\Products\SearchResult;
 use Magento\CatalogGraphQl\Model\Resolver\Products\SearchResultFactory;
 use Magento\Framework\Api\Search\SearchCriteriaInterface;
+use Magento\Framework\Exception\InputException;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\GraphQl\Model\Query\ContextInterface;
 use Magento\Search\Api\SearchInterface;
@@ -83,6 +84,7 @@ public function __construct(
      * @param ResolveInfo $info
      * @param ContextInterface $context
      * @return SearchResult
+     * @throws InputException
      */
     public function getResult(
         array $args,
@@ -103,7 +105,12 @@ public function getResult(
         //Address limitations of sort and pagination on search API apply original pagination from GQL query
         $searchCriteria->setPageSize($realPageSize);
         $searchCriteria->setCurrentPage($realCurrentPage);
-        $searchResults = $this->productsProvider->getList($searchCriteria, $itemsResults, $args, $queryFields, $context);
+        $searchResults = $this->productsProvider->getList(
+            $searchCriteria,
+            $itemsResults,
+            $queryFields,
+            $context
+        );
 
         $totalPages = $realPageSize ? ((int)ceil($searchResults->getTotalCount() / $realPageSize)) : 0;
 

From 2f1b09c3eaa64acf0b6688d2e92edb44d5ed244b Mon Sep 17 00:00:00 2001
From: dnyomo <dnyomo@briteskies.com>
Date: Tue, 4 Aug 2020 14:05:40 -0400
Subject: [PATCH 1239/1718] Code style fixes

---
 .../Model/Resolver/Products/DataProvider/ProductSearch.php     | 3 ---
 1 file changed, 3 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 c2ee0cc89468a..071c0786a9bfc 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php
@@ -7,7 +7,6 @@
 
 namespace Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider;
 
-use Magento\Catalog\Api\Data\EavAttributeInterface;
 use Magento\Catalog\Api\Data\ProductSearchResultsInterfaceFactory;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
@@ -19,7 +18,6 @@
 use Magento\Framework\Api\Search\SearchResultInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\Api\SearchResultsInterface;
-use Magento\Framework\Api\SortOrder;
 use Magento\Framework\Exception\InputException;
 use Magento\GraphQl\Model\Query\ContextInterface;
 
@@ -149,7 +147,6 @@ private function getSearchResultsApplier(
      * E.g. ['field1' => 'DESC', 'field2' => 'ASC", ...]
      *
      * @param SearchCriteriaInterface $searchCriteria
-     * @param array $args
      * @return array
      * @throws InputException
      */

From dd151d11f4d709abb91b82a5d4360aae651c20e3 Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Tue, 4 Aug 2020 13:22:01 -0500
Subject: [PATCH 1240/1718] MC-36428: M 2.4.0 upgrading issue - Unable to apply
 patch
 Magento\Review\Setup\Patch\Schema\AddUniqueConstraintToReviewEntitySummary

---
 .../Framework/DB/Adapter/Pdo/Mysql.php        |   2 +-
 .../DB/Test/Unit/Adapter/Pdo/MysqlTest.php    | 575 +++++++++++++-----
 2 files changed, 407 insertions(+), 170 deletions(-)

diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
index 24ac8fe7f4b52..37ca215acde3b 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -2776,7 +2776,7 @@ public function addIndex(
                 if (in_array(strtolower($indexType), ['primary', 'unique'])) {
                     $match = [];
                     // phpstan:ignore
-                    if (preg_match('#SQLSTATE\[23000\]: [^:]+: 1062[^\']+\'([\d-\.]+)\'#', $e->getMessage(), $match)) {
+                    if (preg_match('#SQLSTATE\[23000\]: [^:]+: 1062[^\']+\'([\d.-]+)\'#', $e->getMessage(), $match)) {
                         $ids = explode('-', $match[1]);
                         $this->_removeDuplicateEntry($tableName, $fields, $ids);
                         continue;
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php
index e448095f0f066..cf29393820f8b 100644
--- a/lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php
+++ b/lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php
@@ -8,6 +8,7 @@
 namespace Magento\Framework\DB\Test\Unit\Adapter\Pdo;
 
 use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Adapter\Pdo\Mysql as PdoMysqlAdapter;
 use Magento\Framework\DB\LoggerInterface;
 use Magento\Framework\DB\Select;
 use Magento\Framework\DB\Select\SelectRenderer;
@@ -29,20 +30,6 @@ class MysqlTest extends TestCase
 {
     const CUSTOM_ERROR_HANDLER_MESSAGE = 'Custom error handler message';
 
-    /**
-     * Adapter for test
-     *
-     * @var \Magento\Framework\DB\Adapter\Pdo\Mysql|MockObject
-     */
-    protected $_adapter;
-
-    /**
-     * Mock DB adapter for DDL query tests
-     *
-     * @var \Magento\Framework\DB\Adapter\Pdo\Mysql|MockObject
-     */
-    protected $_mockAdapter;
-
     /**
      * @var SelectFactory|MockObject
      */
@@ -58,89 +45,31 @@ class MysqlTest extends TestCase
      */
     private $serializerMock;
 
+    /**
+     * @var MockObject|\Zend_Db_Profiler
+     */
+    private $profiler;
+
+    /**
+     * @var \PDO|MockObject
+     */
+    private $connection;
+
     /**
      * Setup
      */
     protected function setUp(): void
     {
-        $string = $this->createMock(StringUtils::class);
-        $dateTime = $this->createMock(DateTime::class);
-        $logger = $this->getMockForAbstractClass(LoggerInterface::class);
-        $selectFactory = $this->getMockBuilder(SelectFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
         $this->serializerMock = $this->getMockBuilder(SerializerInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $this->schemaListenerMock = $this->getMockBuilder(SchemaListener::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->_mockAdapter = $this->getMockBuilder(\Magento\Framework\DB\Adapter\Pdo\Mysql::class)
-            ->setMethods(['beginTransaction', 'getTransactionLevel', 'getSchemaListener'])
-            ->setConstructorArgs(
-                [
-                    'string' => $string,
-                    'dateTime' => $dateTime,
-                    'logger' => $logger,
-                    'selectFactory' => $selectFactory,
-                    'config' => [
-                        'dbname' => 'dbname',
-                        'username' => 'user',
-                        'password' => 'password',
-                    ],
-                    'serializer' => $this->serializerMock
-                ]
-            )
-            ->getMock();
-
-        $this->_mockAdapter->expects($this->any())
-            ->method('getTransactionLevel')
-            ->willReturn(1);
-
-        $this->_adapter = $this->getMockBuilder(\Magento\Framework\DB\Adapter\Pdo\Mysql::class)
-            ->setMethods(
-                [
-                    'getCreateTable',
-                    '_connect',
-                    '_beginTransaction',
-                    '_commit',
-                    '_rollBack',
-                    'query',
-                    'fetchRow',
-                    'getSchemaListener'
-                ]
-            )->setConstructorArgs(
-                [
-                    'string' => $string,
-                    'dateTime' => $dateTime,
-                    'logger' => $logger,
-                    'selectFactory' => $selectFactory,
-                    'config' => [
-                        'dbname' => 'not_exists',
-                        'username' => 'not_valid',
-                        'password' => 'not_valid',
-                    ],
-                    'serializer' => $this->serializerMock,
-                ]
-            )
-            ->getMock();
-        $this->_mockAdapter->expects($this->any())
-            ->method('getSchemaListener')
-            ->willReturn($this->schemaListenerMock);
-        $this->_adapter->expects($this->any())
-            ->method('getSchemaListener')
-            ->willReturn($this->schemaListenerMock);
-
-        $profiler = $this->createMock(
+        $this->profiler = $this->createMock(
             \Zend_Db_Profiler::class
         );
-
-        $resourceProperty = new \ReflectionProperty(
-            get_class($this->_adapter),
-            '_profiler'
-        );
-        $resourceProperty->setAccessible(true);
-        $resourceProperty->setValue($this->_adapter, $profiler);
+        $this->connection = $this->createMock(\PDO::class);
     }
 
     /**
@@ -148,7 +77,8 @@ protected function setUp(): void
      */
     public function testPrepareColumnValueForBigint($value, $expectedResult)
     {
-        $result = $this->_adapter->prepareColumnValue(
+        $adapter = $this->getMysqlPdoAdapterMock([]);
+        $result = $adapter->prepareColumnValue(
             ['DATA_TYPE' => 'bigint'],
             $value
         );
@@ -189,8 +119,9 @@ public function bigintResultProvider()
      */
     public function testCheckNotDdlTransaction($query)
     {
+        $mockAdapter = $this->getMysqlPdoAdapterMockForDdlQueryTest();
         try {
-            $this->_mockAdapter->query($query);
+            $mockAdapter->query($query);
         } catch (\Exception $e) {
             $this->assertStringNotContainsString(
                 $e->getMessage(),
@@ -198,10 +129,10 @@ public function testCheckNotDdlTransaction($query)
             );
         }
 
-        $select = new Select($this->_mockAdapter, new SelectRenderer([]));
+        $select = new Select($mockAdapter, new SelectRenderer([]));
         $select->from('user');
         try {
-            $this->_mockAdapter->query($select);
+            $mockAdapter->query($select);
         } catch (\Exception $e) {
             $this->assertStringNotContainsString(
                 $e->getMessage(),
@@ -219,7 +150,7 @@ public function testCheckDdlTransaction($ddlQuery)
     {
         $this->expectException('Exception');
         $this->expectExceptionMessage('DDL statements are not allowed in transactions');
-        $this->_mockAdapter->query($ddlQuery);
+        $this->getMysqlPdoAdapterMockForDdlQueryTest()->query($ddlQuery);
     }
 
     public function testMultipleQueryException()
@@ -229,7 +160,7 @@ public function testMultipleQueryException()
         $sql = "SELECT COUNT(*) AS _num FROM test; ";
         $sql .= "INSERT INTO test(id) VALUES (1); ";
         $sql .= "SELECT COUNT(*) AS _num FROM test; ";
-        $this->_mockAdapter->query($sql);
+        $this->getMysqlPdoAdapterMockForDdlQueryTest()->query($sql);
     }
 
     /**
@@ -265,8 +196,9 @@ public static function sqlQueryProvider()
      */
     public function testAsymmetricRollBackFailure()
     {
+        $adapter = $this->getMysqlPdoAdapterMock([]);
         $this->expectExceptionMessage(AdapterInterface::ERROR_ASYMMETRIC_ROLLBACK_MESSAGE);
-        $this->_adapter->rollBack();
+        $adapter->rollBack();
     }
 
     /**
@@ -274,8 +206,9 @@ public function testAsymmetricRollBackFailure()
      */
     public function testAsymmetricCommitFailure()
     {
+        $adapter = $this->getMysqlPdoAdapterMock([]);
         $this->expectExceptionMessage(AdapterInterface::ERROR_ASYMMETRIC_COMMIT_MESSAGE);
-        $this->_adapter->commit();
+        $adapter->commit();
     }
 
     /**
@@ -283,11 +216,13 @@ public function testAsymmetricCommitFailure()
      */
     public function testAsymmetricCommitSuccess()
     {
-        $this->assertEquals(0, $this->_adapter->getTransactionLevel());
-        $this->_adapter->beginTransaction();
-        $this->assertEquals(1, $this->_adapter->getTransactionLevel());
-        $this->_adapter->commit();
-        $this->assertEquals(0, $this->_adapter->getTransactionLevel());
+        $adapter = $this->getMysqlPdoAdapterMock(['_connect']);
+        $this->addConnectionMock($adapter);
+        $this->assertEquals(0, $adapter->getTransactionLevel());
+        $adapter->beginTransaction();
+        $this->assertEquals(1, $adapter->getTransactionLevel());
+        $adapter->commit();
+        $this->assertEquals(0, $adapter->getTransactionLevel());
     }
 
     /**
@@ -295,11 +230,13 @@ public function testAsymmetricCommitSuccess()
      */
     public function testAsymmetricRollBackSuccess()
     {
-        $this->assertEquals(0, $this->_adapter->getTransactionLevel());
-        $this->_adapter->beginTransaction();
-        $this->assertEquals(1, $this->_adapter->getTransactionLevel());
-        $this->_adapter->rollBack();
-        $this->assertEquals(0, $this->_adapter->getTransactionLevel());
+        $adapter = $this->getMysqlPdoAdapterMock(['_connect']);
+        $this->addConnectionMock($adapter);
+        $this->assertEquals(0, $adapter->getTransactionLevel());
+        $adapter->beginTransaction();
+        $this->assertEquals(1, $adapter->getTransactionLevel());
+        $adapter->rollBack();
+        $this->assertEquals(0, $adapter->getTransactionLevel());
     }
 
     /**
@@ -307,21 +244,22 @@ public function testAsymmetricRollBackSuccess()
      */
     public function testNestedTransactionCommitSuccess()
     {
-        $this->_adapter->expects($this->exactly(2))
+        $adapter = $this->getMysqlPdoAdapterMock(['_connect', '_beginTransaction', '_commit']);
+        $adapter->expects($this->exactly(2))
             ->method('_connect');
-        $this->_adapter->expects($this->once())
+        $adapter->expects($this->once())
             ->method('_beginTransaction');
-        $this->_adapter->expects($this->once())
+        $adapter->expects($this->once())
             ->method('_commit');
 
-        $this->_adapter->beginTransaction();
-        $this->_adapter->beginTransaction();
-        $this->_adapter->beginTransaction();
-        $this->assertEquals(3, $this->_adapter->getTransactionLevel());
-        $this->_adapter->commit();
-        $this->_adapter->commit();
-        $this->_adapter->commit();
-        $this->assertEquals(0, $this->_adapter->getTransactionLevel());
+        $adapter->beginTransaction();
+        $adapter->beginTransaction();
+        $adapter->beginTransaction();
+        $this->assertEquals(3, $adapter->getTransactionLevel());
+        $adapter->commit();
+        $adapter->commit();
+        $adapter->commit();
+        $this->assertEquals(0, $adapter->getTransactionLevel());
     }
 
     /**
@@ -329,21 +267,22 @@ public function testNestedTransactionCommitSuccess()
      */
     public function testNestedTransactionRollBackSuccess()
     {
-        $this->_adapter->expects($this->exactly(2))
+        $adapter = $this->getMysqlPdoAdapterMock(['_connect', '_beginTransaction', '_rollBack']);
+        $adapter->expects($this->exactly(2))
             ->method('_connect');
-        $this->_adapter->expects($this->once())
+        $adapter->expects($this->once())
             ->method('_beginTransaction');
-        $this->_adapter->expects($this->once())
+        $adapter->expects($this->once())
             ->method('_rollBack');
 
-        $this->_adapter->beginTransaction();
-        $this->_adapter->beginTransaction();
-        $this->_adapter->beginTransaction();
-        $this->assertEquals(3, $this->_adapter->getTransactionLevel());
-        $this->_adapter->rollBack();
-        $this->_adapter->rollBack();
-        $this->_adapter->rollBack();
-        $this->assertEquals(0, $this->_adapter->getTransactionLevel());
+        $adapter->beginTransaction();
+        $adapter->beginTransaction();
+        $adapter->beginTransaction();
+        $this->assertEquals(3, $adapter->getTransactionLevel());
+        $adapter->rollBack();
+        $adapter->rollBack();
+        $adapter->rollBack();
+        $this->assertEquals(0, $adapter->getTransactionLevel());
     }
 
     /**
@@ -351,21 +290,22 @@ public function testNestedTransactionRollBackSuccess()
      */
     public function testNestedTransactionLastRollBack()
     {
-        $this->_adapter->expects($this->exactly(2))
+        $adapter = $this->getMysqlPdoAdapterMock(['_connect', '_beginTransaction', '_rollBack']);
+        $adapter->expects($this->exactly(2))
             ->method('_connect');
-        $this->_adapter->expects($this->once())
+        $adapter->expects($this->once())
             ->method('_beginTransaction');
-        $this->_adapter->expects($this->once())
+        $adapter->expects($this->once())
             ->method('_rollBack');
 
-        $this->_adapter->beginTransaction();
-        $this->_adapter->beginTransaction();
-        $this->_adapter->beginTransaction();
-        $this->assertEquals(3, $this->_adapter->getTransactionLevel());
-        $this->_adapter->commit();
-        $this->_adapter->commit();
-        $this->_adapter->rollBack();
-        $this->assertEquals(0, $this->_adapter->getTransactionLevel());
+        $adapter->beginTransaction();
+        $adapter->beginTransaction();
+        $adapter->beginTransaction();
+        $this->assertEquals(3, $adapter->getTransactionLevel());
+        $adapter->commit();
+        $adapter->commit();
+        $adapter->rollBack();
+        $this->assertEquals(0, $adapter->getTransactionLevel());
     }
 
     /**
@@ -374,20 +314,21 @@ public function testNestedTransactionLastRollBack()
      */
     public function testIncompleteRollBackFailureOnCommit()
     {
-        $this->_adapter->expects($this->exactly(2))->method('_connect');
+        $adapter = $this->getMysqlPdoAdapterMock(['_connect']);
+        $this->addConnectionMock($adapter);
 
         try {
-            $this->_adapter->beginTransaction();
-            $this->_adapter->beginTransaction();
-            $this->_adapter->rollBack();
-            $this->_adapter->commit();
+            $adapter->beginTransaction();
+            $adapter->beginTransaction();
+            $adapter->rollBack();
+            $adapter->commit();
             throw new \Exception('Test Failed!');
         } catch (\Exception $e) {
             $this->assertEquals(
                 AdapterInterface::ERROR_ROLLBACK_INCOMPLETE_MESSAGE,
                 $e->getMessage()
             );
-            $this->_adapter->rollBack();
+            $adapter->rollBack();
         }
     }
 
@@ -397,20 +338,21 @@ public function testIncompleteRollBackFailureOnCommit()
      */
     public function testIncompleteRollBackFailureOnBeginTransaction()
     {
-        $this->_adapter->expects($this->exactly(2))->method('_connect');
+        $adapter = $this->getMysqlPdoAdapterMock(['_connect']);
+        $this->addConnectionMock($adapter);
 
         try {
-            $this->_adapter->beginTransaction();
-            $this->_adapter->beginTransaction();
-            $this->_adapter->rollBack();
-            $this->_adapter->beginTransaction();
+            $adapter->beginTransaction();
+            $adapter->beginTransaction();
+            $adapter->rollBack();
+            $adapter->beginTransaction();
             throw new \Exception('Test Failed!');
         } catch (\Exception $e) {
             $this->assertEquals(
                 AdapterInterface::ERROR_ROLLBACK_INCOMPLETE_MESSAGE,
                 $e->getMessage()
             );
-            $this->_adapter->rollBack();
+            $adapter->rollBack();
         }
     }
 
@@ -419,24 +361,27 @@ public function testIncompleteRollBackFailureOnBeginTransaction()
      */
     public function testSequentialTransactionsSuccess()
     {
-        $this->_adapter->expects($this->exactly(4))
+        $adapter = $this->getMysqlPdoAdapterMock(['_connect', '_beginTransaction', '_rollBack', '_commit']);
+        $this->addConnectionMock($adapter);
+
+        $adapter->expects($this->exactly(4))
             ->method('_connect');
-        $this->_adapter->expects($this->exactly(2))
+        $adapter->expects($this->exactly(2))
             ->method('_beginTransaction');
-        $this->_adapter->expects($this->once())
+        $adapter->expects($this->once())
             ->method('_rollBack');
-        $this->_adapter->expects($this->once())
+        $adapter->expects($this->once())
             ->method('_commit');
 
-        $this->_adapter->beginTransaction();
-        $this->_adapter->beginTransaction();
-        $this->_adapter->beginTransaction();
-        $this->_adapter->rollBack();
-        $this->_adapter->rollBack();
-        $this->_adapter->rollBack();
+        $adapter->beginTransaction();
+        $adapter->beginTransaction();
+        $adapter->beginTransaction();
+        $adapter->rollBack();
+        $adapter->rollBack();
+        $adapter->rollBack();
 
-        $this->_adapter->beginTransaction();
-        $this->_adapter->commit();
+        $adapter->beginTransaction();
+        $adapter->commit();
     }
 
     /**
@@ -444,6 +389,7 @@ public function testSequentialTransactionsSuccess()
      */
     public function testInsertOnDuplicateWithQuotedColumnName()
     {
+        $adapter = $this->getMysqlPdoAdapterMock([]);
         $table = 'some_table';
         $data = [
             'index' => 'indexValue',
@@ -457,12 +403,12 @@ public function testInsertOnDuplicateWithQuotedColumnName()
 
         $stmtMock = $this->createMock(\Zend_Db_Statement_Pdo::class);
         $bind = ['indexValue', 'rowValue', 'selectValue', 'insertValue'];
-        $this->_adapter->expects($this->once())
+        $adapter->expects($this->once())
             ->method('query')
             ->with($sqlQuery, $bind)
             ->willReturn($stmtMock);
 
-        $this->_adapter->insertOnDuplicate($table, $data, $fields);
+        $adapter->insertOnDuplicate($table, $data, $fields);
     }
 
     /**
@@ -475,15 +421,14 @@ public function testInsertOnDuplicateWithQuotedColumnName()
      */
     public function testAddColumn($options, $expectedQuery)
     {
-        $connectionMock = $this->createPartialMock(
-            \Magento\Framework\DB\Adapter\Pdo\Mysql::class,
+        $adapter = $this->getMysqlPdoAdapterMock(
             ['tableColumnExists', '_getTableName', 'rawQuery', 'resetDdlCache', 'quote', 'getSchemaListener']
         );
-        $connectionMock->expects($this->any())->method('getSchemaListener')->willReturn($this->schemaListenerMock);
-        $connectionMock->expects($this->any())->method('_getTableName')->willReturnArgument(0);
-        $connectionMock->expects($this->any())->method('quote')->willReturnArgument(0);
-        $connectionMock->expects($this->once())->method('rawQuery')->with($expectedQuery);
-        $connectionMock->addColumn('tableName', 'columnName', $options);
+        $adapter->expects($this->any())->method('getSchemaListener')->willReturn($this->schemaListenerMock);
+        $adapter->expects($this->any())->method('_getTableName')->willReturnArgument(0);
+        $adapter->expects($this->any())->method('quote')->willReturnArgument(0);
+        $adapter->expects($this->once())->method('rawQuery')->with($expectedQuery);
+        $adapter->addColumn('tableName', 'columnName', $options);
     }
 
     /**
@@ -514,7 +459,7 @@ public function addColumnDataProvider()
      */
     public function testGetIndexName($name, $fields, $indexType, $expectedName)
     {
-        $resultIndexName = $this->_mockAdapter->getIndexName($name, $fields, $indexType);
+        $resultIndexName = $this->getMysqlPdoAdapterMockForDdlQueryTest()->getIndexName($name, $fields, $indexType);
         $this->assertStringStartsWith($expectedName, $resultIndexName);
     }
 
@@ -556,4 +501,296 @@ public function testConfigValidationByPortWithException()
             ['config' => ['host' => 'localhost', 'port' => '33390']]
         );
     }
+
+    /**
+     * @param string $indexName
+     * @param string $indexType
+     * @param array $keyLists
+     * @param \Exception $exception
+     * @param string $query
+     * @throws \ReflectionException
+     * @throws \Zend_Db_Exception
+     * @dataProvider addIndexWithDuplicationsInDBDataProvider
+     */
+    public function testAddIndexWithDuplicationsInDB(
+        string $indexName,
+        string $indexType,
+        array $keyLists,
+        string $query,
+        string $exceptionMessage,
+        array $ids
+    ) {
+        $tableName = 'core_table';
+        $fields = ['sku', 'field2'];
+        $quotedFields = [$this->quoteIdentifier('sku'), $this->quoteIdentifier('field2')];
+
+        $exception = new \Exception(
+            sprintf(
+                $exceptionMessage,
+                $tableName,
+                implode(',', $quotedFields)
+            )
+        );
+
+        $this->expectException(get_class($exception));
+        $this->expectExceptionMessage($exception->getMessage());
+
+        $adapter = $this->getMysqlPdoAdapterMock([
+            'describeTable',
+            'getIndexList',
+            'quoteIdentifier',
+            '_getTableName',
+            'rawQuery',
+            '_removeDuplicateEntry',
+            'resetDdlCache',
+        ]);
+        $this->addConnectionMock($adapter);
+        $columns = ['sku' => [], 'field2' => [], 'comment' => [], 'timestamp' => []];
+        $schemaName = null;
+
+        $this->schemaListenerMock
+            ->expects($this->once())
+            ->method('addIndex')
+            ->with($tableName, $indexName, $fields, $indexType);
+
+        $adapter
+            ->expects($this->once())
+            ->method('describeTable')
+            ->with($tableName, $schemaName)
+            ->willReturn($columns);
+        $adapter
+            ->expects($this->once())
+            ->method('getIndexList')
+            ->with($tableName, $schemaName)
+            ->willReturn($keyLists);
+        $adapter
+            ->expects($this->once())
+            ->method('_getTableName')
+            ->with($tableName, $schemaName)
+            ->willReturn($tableName);
+        $adapter
+            ->method('quoteIdentifier')
+            ->willReturnMap([
+                [$tableName, false, $this->quoteIdentifier($tableName)],
+                [$indexName, false, $this->quoteIdentifier($indexName)],
+                [$fields[0], false, $quotedFields[0]],
+                [$fields[1], false, $quotedFields[1]],
+            ]);
+        $adapter
+            ->expects($this->once())
+            ->method('rawQuery')
+            ->with(
+                sprintf(
+                    $query,
+                    $tableName,
+                    implode(',', $quotedFields)
+                )
+            )
+            ->willThrowException($exception);
+        $adapter
+            ->expects($this->exactly((int)in_array(strtolower($indexType), ['primary', 'unique'])))
+            ->method('_removeDuplicateEntry')
+            ->with($tableName, $fields, $ids)
+            ->willThrowException($exception);
+        $adapter
+            ->expects($this->never())
+            ->method('resetDdlCache');
+
+        $adapter->addIndex($tableName, $indexName, $fields, $indexType);
+    }
+
+    /**
+     * @return array
+     */
+    public function addIndexWithDuplicationsInDBDataProvider(): array
+    {
+        return [
+            'New unique index' => [
+                'indexName' => 'SOME_UNIQUE_INDEX',
+                'indexType' => AdapterInterface::INDEX_TYPE_UNIQUE,
+                'keyLists' => [
+                    'PRIMARY' => [
+                        'INDEX_TYPE' => [
+                            AdapterInterface::INDEX_TYPE_PRIMARY
+                        ]
+                    ],
+                ],
+                'query' => 'ALTER TABLE `%s` ADD UNIQUE `SOME_UNIQUE_INDEX` (%s)',
+                'exceptionMessage' => 'SQLSTATE[23000]: Integrity constraint violation: 1062 Duplicate entry \'1-1-1\' '
+                    . 'for key \'SOME_UNIQUE_INDEX\', query was: '
+                    . 'ALTER TABLE `%s` ADD UNIQUE `SOME_UNIQUE_INDEX` (%s)',
+                'ids' => [1, 1, 1],
+            ],
+            'Existing unique index' => [
+                'indexName' => 'SOME_UNIQUE_INDEX',
+                'indexType' => AdapterInterface::INDEX_TYPE_UNIQUE,
+                'keyLists' => [
+                    'PRIMARY' => [
+                        'INDEX_TYPE' => [
+                            AdapterInterface::INDEX_TYPE_PRIMARY
+                        ]
+                    ],
+                    'SOME_UNIQUE_INDEX' => [
+                        'INDEX_TYPE' => [
+                            AdapterInterface::INDEX_TYPE_UNIQUE
+                        ]
+                    ],
+                ],
+                'query' => 'ALTER TABLE `%s` DROP INDEX `SOME_UNIQUE_INDEX`, ADD UNIQUE `SOME_UNIQUE_INDEX` (%s)',
+                'exceptionMessage' => 'SQLSTATE[23000]: Integrity constraint violation: 1062 Duplicate entry \'1-2-5\' '
+                    . 'for key \'SOME_UNIQUE_INDEX\', query was: '
+                    . 'ALTER TABLE `%s` DROP INDEX `SOME_UNIQUE_INDEX`, ADD UNIQUE `SOME_UNIQUE_INDEX` (%s)',
+                'ids' => [1, 2, 5],
+            ],
+            'New primary index' => [
+                'indexName' => 'PRIMARY',
+                'indexType' => AdapterInterface::INDEX_TYPE_PRIMARY,
+                'keyLists' => [
+                    'SOME_UNIQUE_INDEX' => [
+                        'INDEX_TYPE' => [
+                            AdapterInterface::INDEX_TYPE_UNIQUE
+                        ]
+                    ],
+                ],
+                'query' => 'ALTER TABLE `%s` ADD PRIMARY KEY (%s)',
+                'exceptionMessage' => 'SQLSTATE[23000]: Integrity constraint violation: 1062 Duplicate entry \'1-3-4\' '
+                    . 'for key \'PRIMARY\', query was: '
+                    . 'ALTER TABLE `%s` ADD PRIMARY KEY (%s)',
+                'ids' => [1, 3, 4],
+            ],
+        ];
+    }
+
+    /**
+     * @param string $field
+     * @return string
+     */
+    private function quoteIdentifier(string $field): string
+    {
+        if (strpos($field, '`') !== 0) {
+            $field = '`' . $field . '`';
+        }
+
+        return $field;
+    }
+
+    public function testAddIndexForNonExitingField()
+    {
+        $tableName = 'core_table';
+        $this->expectException(\Zend_Db_Exception::class);
+        $this->expectExceptionMessage(sprintf(
+            'There is no field "%s" that you are trying to create an index on "%s"',
+            'sku',
+            $tableName
+        ));
+
+        $adapter = $this->getMysqlPdoAdapterMock(['describeTable', 'getIndexList', 'quoteIdentifier', '_getTableName']);
+
+        $fields = ['sku', 'field2'];
+        $schemaName = null;
+
+        $adapter
+            ->expects($this->once())
+            ->method('describeTable')
+            ->with($tableName, $schemaName)
+            ->willReturn([]);
+        $adapter
+            ->expects($this->once())
+            ->method('getIndexList')
+            ->with($tableName, $schemaName)
+            ->willReturn([]);
+        $adapter
+            ->expects($this->once())
+            ->method('_getTableName')
+            ->with($tableName, $schemaName)
+            ->willReturn($tableName);
+        $adapter
+            ->method('quoteIdentifier')
+            ->willReturnMap([
+                [$tableName, $tableName],
+            ]);
+
+        $adapter->addIndex($tableName, 'SOME_INDEX', $fields);
+    }
+
+    /**
+     * @return MockObject|PdoMysqlAdapter
+     * @throws \ReflectionException
+     */
+    private function getMysqlPdoAdapterMockForDdlQueryTest(): MockObject
+    {
+        $mockAdapter = $this->getMysqlPdoAdapterMock(['beginTransaction', 'getTransactionLevel', 'getSchemaListener']);
+        $mockAdapter
+            ->method('getTransactionLevel')
+            ->willReturn(1);
+
+        return $mockAdapter;
+    }
+
+    /**
+     * @param array $methods
+     * @return MockObject|PdoMysqlAdapter
+     * @throws \ReflectionException
+     */
+    private function getMysqlPdoAdapterMock(array $methods): MockObject
+    {
+        if (empty($methods)) {
+            $methods = array_merge($methods, ['query']);
+        }
+        $methods = array_unique(array_merge($methods, ['getSchemaListener']));
+
+        $string = $this->createMock(StringUtils::class);
+        $dateTime = $this->createMock(DateTime::class);
+        $logger = $this->getMockForAbstractClass(LoggerInterface::class);
+        $selectFactory = $this->getMockBuilder(SelectFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $adapterMock = $this->getMockBuilder(PdoMysqlAdapter::class)
+            ->setMethods(
+                $methods
+            )->setConstructorArgs(
+                [
+                    'string' => $string,
+                    'dateTime' => $dateTime,
+                    'logger' => $logger,
+                    'selectFactory' => $selectFactory,
+                    'config' => [
+                        'dbname' => 'not_exists',
+                        'username' => 'not_valid',
+                        'password' => 'not_valid',
+                    ],
+                    'serializer' => $this->serializerMock,
+                ]
+            )
+            ->getMock();
+
+        $adapterMock
+            ->method('getSchemaListener')
+            ->willReturn($this->schemaListenerMock);
+
+        /** add profiler Mock */
+        $resourceProperty = new \ReflectionProperty(
+            get_class($adapterMock),
+            '_profiler'
+        );
+        $resourceProperty->setAccessible(true);
+        $resourceProperty->setValue($adapterMock, $this->profiler);
+
+        return $adapterMock;
+    }
+
+    /**
+     * @param MockObject $pdoAdapterMock
+     * @throws \ReflectionException
+     */
+    private function addConnectionMock(MockObject $pdoAdapterMock): void
+    {
+        $resourceProperty = new \ReflectionProperty(
+            get_class($pdoAdapterMock),
+            '_connection'
+        );
+        $resourceProperty->setAccessible(true);
+        $resourceProperty->setValue($pdoAdapterMock, $this->connection);
+    }
 }

From 5bc6ebfa789c931d2ca70dd5325f45dde52de92d Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Tue, 4 Aug 2020 13:50:27 -0500
Subject: [PATCH 1241/1718] MC-36204: Update M2 PayPal BN codes

---
 app/code/Magento/Paypal/Model/AbstractConfig.php       |  2 +-
 .../Paypal/Test/Unit/Model/AbstractConfigTest.php      |  5 ++++-
 .../testsuite/Magento/Paypal/Model/Api/NvpTest.php     |  4 ++--
 .../Magento/Paypal/Model/Api/PayflowNvpTest.php        |  2 +-
 .../Customer/PlaceOrderWithPayflowLinkTest.php         |  6 +++---
 .../Resolver/Guest/PlaceOrderWithPayflowLinkTest.php   | 10 +++++-----
 .../Guest/PlaceOrderWithPaymentsAdvancedTest.php       |  6 +++---
 .../_files/paypal_place_order_request.php              |  2 +-
 8 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/app/code/Magento/Paypal/Model/AbstractConfig.php b/app/code/Magento/Paypal/Model/AbstractConfig.php
index 6fc3ac7a7732d..c8ad56f242a63 100644
--- a/app/code/Magento/Paypal/Model/AbstractConfig.php
+++ b/app/code/Magento/Paypal/Model/AbstractConfig.php
@@ -58,7 +58,7 @@ abstract class AbstractConfig implements ConfigInterface
     /**
      * @var string
      */
-    private static $bnCode = 'Magento_Cart_%s';
+    private static $bnCode = 'Magento_2_%s';
 
     /**
      * @var \Magento\Framework\App\Config\ScopeConfigInterface
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php b/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php
index 44151dc81a34b..e532e50a51209 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/AbstractConfigTest.php
@@ -15,6 +15,9 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * Test for \Magento\Paypal\Model\AbstractConfig
+ */
 class AbstractConfigTest extends TestCase
 {
 
@@ -353,7 +356,7 @@ public function testGetBuildNotationCode()
             $productMetadata
         );
 
-        self::assertEquals('Magento_Cart_SomeEdition', $this->config->getBuildNotationCode());
+        self::assertEquals('Magento_2_SomeEdition', $this->config->getBuildNotationCode());
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Api/NvpTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/Api/NvpTest.php
index 9821a148589fd..05e572f5b64f0 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Api/NvpTest.php
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Api/NvpTest.php
@@ -95,7 +95,7 @@ public function testRequestTotalsAndLineItemsWithFPT()
             . '&SHIPPINGAMT=0.00&ITEMAMT=112.70&TAXAMT=0.00'
             . '&L_NAME0=Simple+Product+FPT&L_QTY0=1&L_AMT0=100.00'
             . '&L_NAME1=FPT&L_QTY1=1&L_AMT1=12.70'
-            . '&METHOD=SetExpressCheckout&VERSION=72.0&BUTTONSOURCE=Magento_Cart_';
+            . '&METHOD=SetExpressCheckout&VERSION=72.0&BUTTONSOURCE=Magento_2_';
 
         $this->httpClient->method('write')
             ->with(
@@ -146,7 +146,7 @@ public function testCallRefundTransaction()
 
         $httpQuery = 'TRANSACTIONID=fooTransactionId&REFUNDTYPE=Partial'
             .'&CURRENCYCODE=USD&AMT=145.98&METHOD=RefundTransaction'
-            .'&VERSION=72.0&BUTTONSOURCE=Magento_Cart_';
+            .'&VERSION=72.0&BUTTONSOURCE=Magento_2_';
 
         $this->httpClient->expects($this->once())->method('write')
             ->with(
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Api/PayflowNvpTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/Api/PayflowNvpTest.php
index 274475b35ba6d..c10785624fc59 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Model/Api/PayflowNvpTest.php
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Model/Api/PayflowNvpTest.php
@@ -95,7 +95,7 @@ public function testRequestLineItems()
             . 'L_NAME1=Simple 2&L_QTY1=2&L_COST1=9.69&'
             . 'L_NAME2=Simple 3&L_QTY2=3&L_COST2=11.69&'
             . 'L_NAME3=Discount&L_QTY3=1&L_COST3=-10.00&'
-            . 'TRXTYPE=A&ACTION=S&BUTTONSOURCE=Magento_Cart_';
+            . 'TRXTYPE=A&ACTION=S&BUTTONSOURCE=Magento_2_';
 
         $this->httpClient->method('write')
             ->with(
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowLinkTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowLinkTest.php
index a8a12650f9935..aebe8b4e3ef47 100644
--- a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowLinkTest.php
+++ b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowLinkTest.php
@@ -119,14 +119,14 @@ public function testResolvePlaceOrderWithPayflowLinkForCustomer(): void
       cart_id: "$cartId"
       payment_method: {
           code: "$paymentMethod"
-            payflow_link: 
+            payflow_link:
             {
            cancel_url:"paypal/payflow/cancelPayment"
            return_url:"paypal/payflow/returnUrl"
            error_url:"paypal/payflow/errorUrl"
           }
       }
-  }) {    
+  }) {
        cart {
           selected_payment_method {
           code
@@ -142,7 +142,7 @@ public function testResolvePlaceOrderWithPayflowLinkForCustomer(): void
 QUERY;
 
         $productMetadata = ObjectManager::getInstance()->get(ProductMetadataInterface::class);
-        $button = 'Magento_Cart_' . $productMetadata->getEdition();
+        $button = 'Magento_2_' . $productMetadata->getEdition();
 
         $payflowLinkResponse = new DataObject(
             [
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithPayflowLinkTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithPayflowLinkTest.php
index 797876cc2318f..a0776250cfc56 100644
--- a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithPayflowLinkTest.php
+++ b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithPayflowLinkTest.php
@@ -117,14 +117,14 @@ public function testResolvePlaceOrderWithPayflowLink(): void
       cart_id: "$cartId"
       payment_method: {
           code: "$paymentMethod"
-            payflow_link: 
+            payflow_link:
             {
            cancel_url:"paypal/payflow/cancel"
            return_url:"paypal/payflow/return"
            error_url:"paypal/payflow/error"
           }
       }
-  }) {    
+  }) {
        cart {
           selected_payment_method {
           code
@@ -140,7 +140,7 @@ public function testResolvePlaceOrderWithPayflowLink(): void
 QUERY;
 
         $productMetadata = ObjectManager::getInstance()->get(ProductMetadataInterface::class);
-        $button = 'Magento_Cart_' . $productMetadata->getEdition();
+        $button = 'Magento_2_' . $productMetadata->getEdition();
 
         $payflowLinkResponse = new DataObject(
             [
@@ -219,14 +219,14 @@ public function testResolveWithPayflowLinkDeclined(): void
       cart_id: "$cartId"
       payment_method: {
           code: "$paymentMethod"
-            payflow_link: 
+            payflow_link:
             {
            cancel_url:"paypal/payflow/cancelPayment"
            return_url:"paypal/payflow/returnUrl"
            error_url:"paypal/payflow/returnUrl"
           }
       }
-  }) {    
+  }) {
        cart {
           selected_payment_method {
           code
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithPaymentsAdvancedTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithPaymentsAdvancedTest.php
index 5de1ded43405a..468d9036992b9 100644
--- a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithPaymentsAdvancedTest.php
+++ b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Guest/PlaceOrderWithPaymentsAdvancedTest.php
@@ -108,7 +108,7 @@ public function testResolvePlaceOrderWithPaymentsAdvanced(): void
         $cartId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
         $productMetadata = ObjectManager::getInstance()->get(ProductMetadataInterface::class);
-        $button = 'Magento_Cart_' . $productMetadata->getEdition();
+        $button = 'Magento_2_' . $productMetadata->getEdition();
 
         $payflowLinkResponse = new DataObject(
             [
@@ -256,7 +256,7 @@ private function setPaymentMethodAndPlaceOrder(string $cartId, string $paymentMe
              error_url:"paypal/payflowadvanced/customerror"
           }
       }
-  }) {    
+  }) {
        cart {
           selected_payment_method {
           code
@@ -300,7 +300,7 @@ private function setPaymentMethodWithInValidUrl(string $cartId, string $paymentM
              error_url:"paypal/payflowadvanced/error"
           }
       }
-  }) {    
+  }) {
        cart {
           selected_payment_method {
           code
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/_files/paypal_place_order_request.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/_files/paypal_place_order_request.php
index 7a622ab15814e..6c4f96121a96d 100644
--- a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/_files/paypal_place_order_request.php
+++ b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/_files/paypal_place_order_request.php
@@ -13,7 +13,7 @@
 $notifyUrl = $url->getUrl('paypal/ipn/');
 
 $productMetadata = ObjectManager::getInstance()->get(ProductMetadataInterface::class);
-$button = 'Magento_Cart_' . $productMetadata->getEdition();
+$button = 'Magento_2_' . $productMetadata->getEdition();
 
 return [
     'TOKEN' => $token,

From e1f12471d36cdd94165d2023f34e060de49eba83 Mon Sep 17 00:00:00 2001
From: dnyomo <dnyomo@briteskies.com>
Date: Tue, 4 Aug 2020 15:03:29 -0400
Subject: [PATCH 1242/1718] Code style fixes and added a message around
 converting _id to entity_id

---
 .../Model/Resolver/Products/DataProvider/ProductSearch.php  | 6 +++---
 1 file changed, 3 insertions(+), 3 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 071c0786a9bfc..66d89f050899c 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php
@@ -18,11 +18,11 @@
 use Magento\Framework\Api\Search\SearchResultInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\Api\SearchResultsInterface;
-use Magento\Framework\Exception\InputException;
 use Magento\GraphQl\Model\Query\ContextInterface;
 
 /**
  * Product field data provider for product search, used for GraphQL resolver processing.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ProductSearch
 {
@@ -88,7 +88,6 @@ public function __construct(
      * @param array $attributes
      * @param ContextInterface|null $context
      * @return SearchResultsInterface
-     * @throws InputException
      */
     public function getList(
         SearchCriteriaInterface $searchCriteria,
@@ -148,7 +147,6 @@ private function getSearchResultsApplier(
      *
      * @param SearchCriteriaInterface $searchCriteria
      * @return array
-     * @throws InputException
      */
     private function getSortOrderArray(SearchCriteriaInterface $searchCriteria)
     {
@@ -156,6 +154,8 @@ private function getSortOrderArray(SearchCriteriaInterface $searchCriteria)
         $sortOrders = $searchCriteria->getSortOrders();
         if (is_array($sortOrders)) {
             foreach ($sortOrders as $sortOrder) {
+                // I am replacing _id with entity_id because in ElasticSearch _id is required for sorting by ID.
+                // Where as entity_id is required when using ID as the sort in $collection->load();.
                 if ($sortOrder->getField() === '_id') {
                     $sortOrder->setField('entity_id');
                 }

From a50dae1c2090bd8ed17967c3ff6565c0f94ca933 Mon Sep 17 00:00:00 2001
From: dnyomo <dnyomo@briteskies.com>
Date: Tue, 4 Aug 2020 15:11:22 -0400
Subject: [PATCH 1243/1718] Updated the message with the related method

---
 .../Model/Resolver/Products/DataProvider/ProductSearch.php       | 1 +
 1 file changed, 1 insertion(+)

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 66d89f050899c..d8b46beb6ba2b 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php
@@ -156,6 +156,7 @@ private function getSortOrderArray(SearchCriteriaInterface $searchCriteria)
             foreach ($sortOrders as $sortOrder) {
                 // I am replacing _id with entity_id because in ElasticSearch _id is required for sorting by ID.
                 // Where as entity_id is required when using ID as the sort in $collection->load();.
+                // @see \Magento\CatalogGraphQl\Model\Resolver\Products\Query\Search::getResult
                 if ($sortOrder->getField() === '_id') {
                     $sortOrder->setField('entity_id');
                 }

From 1c340c33735218f98840b025b92e39a77e0f53e5 Mon Sep 17 00:00:00 2001
From: dnyomo <dnyomo@briteskies.com>
Date: Tue, 4 Aug 2020 15:15:07 -0400
Subject: [PATCH 1244/1718] Remvoed
 @SuppressWarnings(PHPMD.CouplingBetweenObjects)

---
 .../Model/Resolver/Products/DataProvider/ProductSearch.php       | 1 -
 1 file changed, 1 deletion(-)

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 d8b46beb6ba2b..4807cad54bd50 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php
@@ -22,7 +22,6 @@
 
 /**
  * Product field data provider for product search, used for GraphQL resolver processing.
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ProductSearch
 {

From 0b92de976b8c57c241672608886f87e681bcd0bd Mon Sep 17 00:00:00 2001
From: oleksandrkravchuk <oleksandr.kravchuk@vaimo.com>
Date: Tue, 4 Aug 2020 22:06:46 +0200
Subject: [PATCH 1245/1718] community-features#252 Create static test for
 action controllers. Fix static tests.

---
 .../framework/Magento/TestFramework/Utility/AddedFiles.php     | 2 +-
 .../Magento/TestFramework/Utility/ChildrenClassesSearch.php    | 3 +++
 .../Magento/TestFramework/Utility/ChildrenClassesSearch/Z.php  | 2 ++
 .../Magento/TestFramework/Utility/FilesSearchTest.php          | 1 -
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev/tests/static/framework/Magento/TestFramework/Utility/AddedFiles.php b/dev/tests/static/framework/Magento/TestFramework/Utility/AddedFiles.php
index 6b1184418e16e..4afeda3a035eb 100644
--- a/dev/tests/static/framework/Magento/TestFramework/Utility/AddedFiles.php
+++ b/dev/tests/static/framework/Magento/TestFramework/Utility/AddedFiles.php
@@ -15,7 +15,7 @@ class AddedFiles
     /**
      * Provide list of new files.
      *
-     * @param $changedFilesBaseDir
+     * @param string $changedFilesBaseDir
      *
      * @return string[]
      */
diff --git a/dev/tests/static/framework/Magento/TestFramework/Utility/ChildrenClassesSearch.php b/dev/tests/static/framework/Magento/TestFramework/Utility/ChildrenClassesSearch.php
index 6905e1b4f442c..53db8ca8d0b08 100644
--- a/dev/tests/static/framework/Magento/TestFramework/Utility/ChildrenClassesSearch.php
+++ b/dev/tests/static/framework/Magento/TestFramework/Utility/ChildrenClassesSearch.php
@@ -17,6 +17,9 @@ class ChildrenClassesSearch
      */
     private $classNameExtractor;
 
+    /**
+     * ChildrenClassesSearch constructor.
+     */
     public function __construct()
     {
         $this->classNameExtractor = new ClassNameExtractor();
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/Z.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/Z.php
index 2ac48bda187b6..1ec713366dde8 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/Z.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/Z.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\TestFramework\Utility\ChildrenClassesSearch;
 
+// @codingStandardsIgnoreStar
 interface Z
 {
 }
+// @codingStandardsIgnoreEnd
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/FilesSearchTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/FilesSearchTest.php
index 8c1206c56ce8e..7b27dde3b0bf4 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/FilesSearchTest.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/FilesSearchTest.php
@@ -38,7 +38,6 @@ public function testGetEmptyList(): void
     {
         $pattern = 'zzz.txt';
 
-
         $files = FilesSearch::getFilesFromListFile(__DIR__, $pattern, function () {
             return ['1', '2', '3'];
         });

From 8f55cd7ce42b8f03525a37e5ea988c306b6e6692 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Tue, 4 Aug 2020 23:16:17 +0300
Subject: [PATCH 1246/1718] use action group for search in product grid

---
 .../ActionGroup/SearchProductGridByKeywordActionGroup.xml  | 1 +
 .../Test/AdminCreateVirtualProductWithTierPriceTest.xml    | 7 +++----
 ...uctWithRegularPriceInStockVisibleInCategoryOnlyTest.xml | 7 +++----
 ...riceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml | 7 +++----
 ...egularPriceOutOfStockVisibleInCategoryAndSearchTest.xml | 7 +++----
 ...WithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml | 7 +++----
 ...ctWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml | 7 +++----
 ...thSpecialPriceInStockVisibleInCategoryAndSearchTest.xml | 7 +++----
 ...pecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml | 7 +++----
 ...roductWithTierPriceInStockVisibleInCategoryOnlyTest.xml | 7 +++----
 ...thTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml | 7 +++----
 11 files changed, 31 insertions(+), 40 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchProductGridByKeywordActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchProductGridByKeywordActionGroup.xml
index e3370864e7f61..6dd7f45dd0e64 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchProductGridByKeywordActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/SearchProductGridByKeywordActionGroup.xml
@@ -19,5 +19,6 @@
         <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
         <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="{{keyword}}" stepKey="fillKeywordSearchField"/>
         <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearch"/>
+        <waitForPageLoad stepKey="waitForProductSearch"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
index ce27e696916a1..11349d997a9d0 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
@@ -59,10 +59,9 @@
         <see selector="{{AdminProductFormSection.successMessage}}" userInput="You saved the product." stepKey="seeAssertVirtualProductSuccessMessage"/>
 
         <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage1"/>
-        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="checkRetailCustomerTaxClass" />
-        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="{{virtualProductBigQty.name}}" stepKey="fillProductName1"/>
-        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
-        <waitForPageLoad stepKey="waitForProductSearch"/>
+        <actionGroup ref="SearchProductGridByKeywordActionGroup" stepKey="searchProductGrid">
+            <argument name="keyword" value="{{virtualProductBigQty.name}}"/>
+        </actionGroup>
         <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
         <waitForPageLoad stepKey="waitUntilProductIsOpened" />
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
index 436919e426543..227e6ad3c4eba 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockVisibleInCategoryOnlyTest.xml
@@ -38,10 +38,9 @@
 
         <!-- Search default virtual product in the grid page -->
         <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage1"/>
-        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
-        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
-        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
-        <waitForPageLoad stepKey="waitForProductSearch"/>
+        <actionGroup ref="SearchProductGridByKeywordActionGroup" stepKey="searchProductGrid">
+            <argument name="keyword" value="$$initialVirtualProduct.name$$"/>
+        </actionGroup>
         <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
         <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
index 29fb3c39cebe9..a036b2eb04aa8 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceInStockWithCustomOptionsVisibleInSearchOnlyTest.xml
@@ -35,10 +35,9 @@
 
         <!-- Search default virtual product in the grid page -->
         <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage1"/>
-        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
-        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
-        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
-        <waitForPageLoad stepKey="waitForProductSearch"/>
+        <actionGroup ref="SearchProductGridByKeywordActionGroup" stepKey="searchProductGrid">
+            <argument name="keyword" value="$$$initialVirtualProduct.name$$"/>
+        </actionGroup>
         <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
         <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml
index 4f7b9d618ee51..7f3df4be87bb9 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryAndSearchTest.xml
@@ -38,10 +38,9 @@
 
         <!-- Search default virtual product in the grid page -->
         <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage1"/>
-        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
-        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
-        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
-        <waitForPageLoad stepKey="waitForProductSearch"/>
+        <actionGroup ref="SearchProductGridByKeywordActionGroup" stepKey="searchProductGrid">
+            <argument name="keyword" value="$$initialVirtualProduct.name$$"/>
+        </actionGroup>
         <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
         <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
index 8f7e4a42e75f3..09edc08965818 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInCategoryOnlyTest.xml
@@ -38,10 +38,9 @@
 
         <!-- Search default virtual product in the grid page -->
         <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage1"/>
-        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickclearAllFilter" />
-        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
-        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
-        <waitForPageLoad stepKey="waitForProductSearch"/>
+        <actionGroup ref="SearchProductGridByKeywordActionGroup" stepKey="searchProductGrid">
+            <argument name="keyword" value="$$initialVirtualProduct.name$$"/>
+        </actionGroup>
         <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
         <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml
index 287c6dea7544d..0d6a1c87c62fe 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithRegularPriceOutOfStockVisibleInSearchOnlyTest.xml
@@ -36,10 +36,9 @@
 
         <!-- Search default virtual product in the grid page -->
         <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage1"/>
-        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
-        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
-        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
-        <waitForPageLoad stepKey="waitForProductSearch"/>
+        <actionGroup ref="SearchProductGridByKeywordActionGroup" stepKey="searchProductGrid">
+            <argument name="keyword" value="$$initialVirtualProduct.name$$"/>
+        </actionGroup>
         <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
         <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml
index f9145fdb22bd1..8d0dda2641f36 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceInStockVisibleInCategoryAndSearchTest.xml
@@ -38,10 +38,9 @@
 
         <!-- Search default virtual product in the grid page -->
         <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage"/>
-        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
-        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
-        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
-        <waitForPageLoad stepKey="waitForProductSearch"/>
+        <actionGroup ref="SearchProductGridByKeywordActionGroup" stepKey="searchProductGrid">
+            <argument name="keyword" value="$$initialVirtualProduct.name$$"/>
+        </actionGroup>
         <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
         <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml
index 9ee1ecd0c9b59..df9e1027376d7 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithSpecialPriceOutOfStockVisibleInCategoryAndSearchTest.xml
@@ -38,10 +38,9 @@
 
         <!-- Search default virtual product in the grid page -->
         <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage1"/>
-        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
-        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
-        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
-        <waitForPageLoad stepKey="waitForProductSearch"/>
+        <actionGroup ref="SearchProductGridByKeywordActionGroup" stepKey="searchProductGrid">
+            <argument name="keyword" value="$$initialVirtualProduct.name$$"/>
+        </actionGroup>
         <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
         <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
index 989120b9f9ff7..50864705fa532 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceInStockVisibleInCategoryOnlyTest.xml
@@ -38,10 +38,9 @@
 
         <!-- Search default virtual product in the grid page -->
         <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage1"/>
-        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
-        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
-        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
-        <waitForPageLoad stepKey="waitForProductSearch"/>
+        <actionGroup ref="SearchProductGridByKeywordActionGroup" stepKey="searchProductGrid">
+            <argument name="keyword" value="$$initialVirtualProduct.name$$"/>
+        </actionGroup>
         <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
         <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
 
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
index 24af998d1cf70..d0d87a9ce7588 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateVirtualProductWithTierPriceOutOfStockVisibleInCategoryAndSearchTest.xml
@@ -38,10 +38,9 @@
 
         <!-- Search default virtual product in the grid page -->
         <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage1"/>
-        <conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clickClearAllFilter" />
-        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="$$initialVirtualProduct.name$$" stepKey="fillVirtualProductNameInKeywordSearch"/>
-        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="clickKeywordSearchButton"/>
-        <waitForPageLoad stepKey="waitForProductSearch"/>
+        <actionGroup ref="SearchProductGridByKeywordActionGroup" stepKey="searchProductGrid">
+            <argument name="keyword" value="$$initialVirtualProduct.name$$"/>
+        </actionGroup>
         <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
         <waitForPageLoad stepKey="waitUntilProductIsOpened"/>
 

From 330e7636116dba5ad870c112455a87eccdfdfb9a Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Tue, 4 Aug 2020 15:20:07 -0500
Subject: [PATCH 1247/1718] - Removed dependency between QuoteGQL and
 WishlistGQL (https://github.com/magento/architecture/pull/413) - fixed uid
 field types (https://github.com/magento/architecture/pull/412/) - fixed api
 functional tests

---
 app/code/Magento/GraphQl/etc/schema.graphqls       |  5 +++++
 .../BuyRequest/CustomizableOptionDataProvider.php  |  2 +-
 .../Quote/Model/Cart/Data/CartItemFactory.php      |  6 +++---
 .../Quote/Model/Cart/Data/EnteredOption.php        | 12 ++++++------
 .../Model/Cart/BuyRequest/BundleDataProvider.php   |  2 +-
 app/code/Magento/QuoteGraphQl/etc/schema.graphqls  |  7 +------
 .../BuyRequest/CustomizableOptionDataProvider.php  | 14 +++++++++-----
 .../Wishlist/Model/Wishlist/Data/EnteredOption.php | 12 ++++++------
 .../Model/Wishlist/Data/WishlistItemFactory.php    |  6 +++---
 .../Magento/WishlistGraphQl/etc/schema.graphqls    |  9 ++-------
 .../AddBundleProductToCartSingleMutationTest.php   |  4 ++--
 ...ConfigurableProductToCartSingleMutationTest.php | 10 ++++++++--
 .../Quote/AddSimpleProductToCartEndToEndTest.php   |  2 +-
 .../GraphQl/Quote/GetCartItemOptionsFromUID.php    |  4 ++--
 .../Quote/GetCustomOptionsWithUIDForQueryBySku.php |  4 ++--
 .../GetCustomOptionsWithIDV2ForQueryBySku.php      |  2 +-
 16 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/app/code/Magento/GraphQl/etc/schema.graphqls b/app/code/Magento/GraphQl/etc/schema.graphqls
index 0212d32db0f2f..2595ad09c072a 100644
--- a/app/code/Magento/GraphQl/etc/schema.graphqls
+++ b/app/code/Magento/GraphQl/etc/schema.graphqls
@@ -277,3 +277,8 @@ enum CurrencyEnum @doc(description: "The list of available currency codes") {
     TRL
     XPF
 }
+
+input EnteredOptionInput @doc(description: "Defines a customer-entered option") {
+    uid: ID! @doc(description: "An encoded ID")
+    value: String! @doc(description: "Text the customer entered")
+}
diff --git a/app/code/Magento/Quote/Model/Cart/BuyRequest/CustomizableOptionDataProvider.php b/app/code/Magento/Quote/Model/Cart/BuyRequest/CustomizableOptionDataProvider.php
index d5440c272d163..90f2cbbc5f9e3 100644
--- a/app/code/Magento/Quote/Model/Cart/BuyRequest/CustomizableOptionDataProvider.php
+++ b/app/code/Magento/Quote/Model/Cart/BuyRequest/CustomizableOptionDataProvider.php
@@ -43,7 +43,7 @@ public function execute(CartItem $cartItem): array
 
         foreach ($cartItem->getEnteredOptions() as $option) {
             // phpcs:ignore Magento2.Functions.DiscouragedFunction
-            $optionData = \explode('/', base64_decode($option->getId()));
+            $optionData = \explode('/', base64_decode($option->getUid()));
 
             if ($this->isProviderApplicable($optionData) === false) {
                 continue;
diff --git a/app/code/Magento/Quote/Model/Cart/Data/CartItemFactory.php b/app/code/Magento/Quote/Model/Cart/Data/CartItemFactory.php
index 468d5950bd2dd..823f03b28229c 100644
--- a/app/code/Magento/Quote/Model/Cart/Data/CartItemFactory.php
+++ b/app/code/Magento/Quote/Model/Cart/Data/CartItemFactory.php
@@ -45,12 +45,12 @@ private function createEnteredOptions(array $options): array
     {
         return \array_map(
             function (array $option) {
-                if (!isset($option['id'], $option['value'])) {
+                if (!isset($option['uid'], $option['value'])) {
                     throw new InputException(
-                        __('Required fields are not present EnteredOption.id, EnteredOption.value')
+                        __('Required fields are not present EnteredOption.uid, EnteredOption.value')
                     );
                 }
-                return new EnteredOption($option['id'], $option['value']);
+                return new EnteredOption($option['uid'], $option['value']);
             },
             $options
         );
diff --git a/app/code/Magento/Quote/Model/Cart/Data/EnteredOption.php b/app/code/Magento/Quote/Model/Cart/Data/EnteredOption.php
index b60c349a8e99a..ba55051d33805 100644
--- a/app/code/Magento/Quote/Model/Cart/Data/EnteredOption.php
+++ b/app/code/Magento/Quote/Model/Cart/Data/EnteredOption.php
@@ -15,7 +15,7 @@ class EnteredOption
     /**
      * @var string
      */
-    private $id;
+    private $uid;
 
     /**
      * @var string
@@ -23,12 +23,12 @@ class EnteredOption
     private $value;
 
     /**
-     * @param string $id
+     * @param string $uid
      * @param string $value
      */
-    public function __construct(string $id, string $value)
+    public function __construct(string $uid, string $value)
     {
-        $this->id = $id;
+        $this->uid = $uid;
         $this->value = $value;
     }
 
@@ -37,9 +37,9 @@ public function __construct(string $id, string $value)
      *
      * @return string
      */
-    public function getId(): string
+    public function getUid(): string
     {
-        return $this->id;
+        return $this->uid;
     }
 
     /**
diff --git a/app/code/Magento/QuoteBundleOptions/Model/Cart/BuyRequest/BundleDataProvider.php b/app/code/Magento/QuoteBundleOptions/Model/Cart/BuyRequest/BundleDataProvider.php
index 9c6ed01bd527f..575784c86ace1 100644
--- a/app/code/Magento/QuoteBundleOptions/Model/Cart/BuyRequest/BundleDataProvider.php
+++ b/app/code/Magento/QuoteBundleOptions/Model/Cart/BuyRequest/BundleDataProvider.php
@@ -45,7 +45,7 @@ public function execute(CartItem $cartItem): array
         //for bundle options with custom quantity
         foreach ($cartItem->getEnteredOptions() as $option) {
             // phpcs:ignore Magento2.Functions.DiscouragedFunction
-            $optionData = \explode('/', base64_decode($option->getId()));
+            $optionData = \explode('/', base64_decode($option->getUid()));
 
             if ($this->isProviderApplicable($optionData) === false) {
                 continue;
diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
index 7dae2987125e9..6a96f361a90b0 100644
--- a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -53,7 +53,7 @@ input CartItemInput {
     sku: String!
     quantity: Float!
     parent_sku: String,
-    selected_options: [String!]
+    selected_options: [ID!]
     entered_options: [EnteredOptionInput!]
 }
 
@@ -319,11 +319,6 @@ type SetGuestEmailOnCartOutput {
     cart: Cart!
 }
 
-input EnteredOptionInput {
-    id: ID! @doc(description: "base64 encoded option ID")
-    value: String!
-}
-
 type SimpleCartItem implements CartItemInterface @doc(description: "Simple Cart Item") {
     customizable_options: [SelectedCustomizableOption] @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\CustomizableOptions")
 }
diff --git a/app/code/Magento/Wishlist/Model/Wishlist/BuyRequest/CustomizableOptionDataProvider.php b/app/code/Magento/Wishlist/Model/Wishlist/BuyRequest/CustomizableOptionDataProvider.php
index e8f5bf0654f64..8bf12206336a8 100644
--- a/app/code/Magento/Wishlist/Model/Wishlist/BuyRequest/CustomizableOptionDataProvider.php
+++ b/app/code/Magento/Wishlist/Model/Wishlist/BuyRequest/CustomizableOptionDataProvider.php
@@ -31,21 +31,25 @@ public function execute(WishlistItem $wishlistItemData, ?int $productId): array
                 continue;
             }
 
-            [, $optionId, $optionValue] = $optionData;
+            [$optionType, $optionId, $optionValue] = $optionData;
 
-            $customizableOptionsData[$optionId][] = $optionValue;
+            if ($optionType == self::PROVIDER_OPTION_TYPE) {
+                $customizableOptionsData[$optionId][] = $optionValue;
+            }
         }
 
         foreach ($wishlistItemData->getEnteredOptions() as $option) {
-            $optionData = \explode('/', base64_decode($option->getId()));
+            $optionData = \explode('/', base64_decode($option->getUid()));
 
             if ($this->isProviderApplicable($optionData) === false) {
                 continue;
             }
 
-            [, $optionId] = $optionData;
+            [$optionType, $optionId] = $optionData;
 
-            $customizableOptionsData[$optionId][] = $option->getValue();
+            if ($optionType == self::PROVIDER_OPTION_TYPE) {
+                $customizableOptionsData[$optionId][] = $option->getValue();
+            }
         }
 
         if (empty($customizableOptionsData)) {
diff --git a/app/code/Magento/Wishlist/Model/Wishlist/Data/EnteredOption.php b/app/code/Magento/Wishlist/Model/Wishlist/Data/EnteredOption.php
index 0d6b2a2302540..edbf84781da38 100644
--- a/app/code/Magento/Wishlist/Model/Wishlist/Data/EnteredOption.php
+++ b/app/code/Magento/Wishlist/Model/Wishlist/Data/EnteredOption.php
@@ -15,7 +15,7 @@ class EnteredOption
     /**
      * @var string
      */
-    private $id;
+    private $uid;
 
     /**
      * @var string
@@ -23,12 +23,12 @@ class EnteredOption
     private $value;
 
     /**
-     * @param string $id
+     * @param string $uid
      * @param string $value
      */
-    public function __construct(string $id, string $value)
+    public function __construct(string $uid, string $value)
     {
-        $this->id = $id;
+        $this->uid = $uid;
         $this->value = $value;
     }
 
@@ -37,9 +37,9 @@ public function __construct(string $id, string $value)
      *
      * @return string
      */
-    public function getId(): string
+    public function getUid(): string
     {
-        return $this->id;
+        return $this->uid;
     }
 
     /**
diff --git a/app/code/Magento/Wishlist/Model/Wishlist/Data/WishlistItemFactory.php b/app/code/Magento/Wishlist/Model/Wishlist/Data/WishlistItemFactory.php
index 153e8451bae31..aef3cbf571ff6 100644
--- a/app/code/Magento/Wishlist/Model/Wishlist/Data/WishlistItemFactory.php
+++ b/app/code/Magento/Wishlist/Model/Wishlist/Data/WishlistItemFactory.php
@@ -45,12 +45,12 @@ private function createEnteredOptions(array $options): array
     {
         return \array_map(
             function (array $option) {
-                if (!isset($option['id'], $option['value'])) {
+                if (!isset($option['uid'], $option['value'])) {
                     throw new InputException(
-                        __('Required fields are not present EnteredOption.id, EnteredOption.value')
+                        __('Required fields are not present EnteredOption.uid, EnteredOption.value')
                     );
                 }
-                return new EnteredOption($option['id'], $option['value']);
+                return new EnteredOption($option['uid'], $option['value']);
             },
             $options
         );
diff --git a/app/code/Magento/WishlistGraphQl/etc/schema.graphqls b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
index 794e90ed9f9a9..c6993367ffbe3 100644
--- a/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
@@ -43,7 +43,7 @@ input WishlistItemInput @doc(description: "Defines the items to add to a wish li
     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: [String!] @doc(description: "An array of strings corresponding to options the customer selected")
+    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")
 }
 
@@ -52,11 +52,6 @@ type AddProductsToWishlistOutput @doc(description: "Contains the customer's wish
     userInputErrors:[CheckoutUserInputError]! @doc(description: "An array of errors encountered while adding products to a wish list")
 }
 
-input EnteredOptionInput @doc(description: "Defines a customer-entered option") {
-    id: String! @doc(description: "A base64 encoded ID")
-    value: String! @doc(description: "Text the customer entered")
-}
-
 type RemoveProductsFromWishlistOutput @doc(description: "Contains the customer's wish list and any errors encountered") {
     wishlist: Wishlist! @doc(description: "Contains the wish list with after items were successfully deleted")
     userInputErrors:[CheckoutUserInputError]! @doc(description:"An array of errors encountered while deleting products from a wish list")
@@ -66,7 +61,7 @@ input WishlistItemUpdateInput @doc(description: "Defines updates to items in a w
     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: [String!] @doc(description: "An array of strings corresponding to options the customer selected")
+    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")
 }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartSingleMutationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartSingleMutationTest.php
index 3fb183b3016c5..be1bfce9441d6 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartSingleMutationTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartSingleMutationTest.php
@@ -309,11 +309,11 @@ private function getMutationsQuery(
                         "{$optionUid1}", "{$optionUid0}"
                     ],
                     entered_options: [{
-                        id: "{$optionUid0}"
+                        uid: "{$optionUid0}"
                         value: "5"
                      },
                      {
-                        id: "{$optionUid1}"
+                        uid: "{$optionUid1}"
                         value: "5"
                      }]
                 }
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 be444d7b22b45..3612bc7f26e49 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartSingleMutationTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartSingleMutationTest.php
@@ -183,8 +183,14 @@ public function testOutOfStockVariationToCart()
 
         $response = $this->graphQlMutation($query);
 
-        $expectedErrorMessage = 'There are no source items with the in stock status';
-        self::assertEquals($expectedErrorMessage, $response['addProductsToCart']['userInputErrors'][0]['message']);
+        $expectedErrorMessages = [
+            'There are no source items with the in stock status',
+            'This product is out of stock.'
+        ];
+        $this->assertContains(
+            $response['addProductsToCart']['userInputErrors'][0]['message'],
+            $expectedErrorMessages
+        );
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartEndToEndTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartEndToEndTest.php
index 368670f4032a7..f416dad46f64a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartEndToEndTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartEndToEndTest.php
@@ -107,7 +107,7 @@ private function getProductOptionsViaQuery(string $sku): array
                 $value = $option['title'] === 'date option' ? '2012-12-12 00:00:00' : 'test';
 
                 $receivedItemOptions['entered_options'][] = [
-                    'id' => $option['entered_option']['uid'],
+                    'uid' => $option['entered_option']['uid'],
                     'value' => $value
                 ];
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartItemOptionsFromUID.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartItemOptionsFromUID.php
index 1f492c8b918c5..44b44e0ccac05 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartItemOptionsFromUID.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCartItemOptionsFromUID.php
@@ -38,8 +38,8 @@ public function execute(array $encodedCustomOptions): array
             if ($enteredOption['type'] === 'date') {
                 $enteredOption['value'] = date('M d, Y', strtotime($enteredOption['value']));
             }
-            [$optionType, $optionId] = explode('/', base64_decode($enteredOption['id']));
-            if ($optionType = 'custom-option') {
+            [$optionType, $optionId] = explode('/', base64_decode($enteredOption['uid']));
+            if ($optionType == 'custom-option') {
                 $customOptions[$optionId] = $enteredOption['value'];
             }
         }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCustomOptionsWithUIDForQueryBySku.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCustomOptionsWithUIDForQueryBySku.php
index c6377c47b4743..870617555e8b2 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCustomOptionsWithUIDForQueryBySku.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/GetCustomOptionsWithUIDForQueryBySku.php
@@ -47,14 +47,14 @@ public function execute(string $sku): array
                 case 'area':
                     $enteredOptions[] = [
                         'type' => 'field',
-                        'id' => $this->encodeEnteredOption((int) $customOption->getOptionId()),
+                        'uid' => $this->encodeEnteredOption((int) $customOption->getOptionId()),
                         'value' => 'test'
                     ];
                     break;
                 case 'date':
                     $enteredOptions[] = [
                         'type' => 'date',
-                        'id' => $this->encodeEnteredOption((int) $customOption->getOptionId()),
+                        'uid' => $this->encodeEnteredOption((int) $customOption->getOptionId()),
                         'value' => '2012-12-12 00:00:00'
                     ];
                     break;
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/GetCustomOptionsWithIDV2ForQueryBySku.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/GetCustomOptionsWithIDV2ForQueryBySku.php
index 6d54d9f0b4444..fcba7458f317a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/GetCustomOptionsWithIDV2ForQueryBySku.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/GetCustomOptionsWithIDV2ForQueryBySku.php
@@ -45,7 +45,7 @@ public function execute(string $sku): array
 
             if ($optionType === 'field' || $optionType === 'area' || $optionType === 'date') {
                 $enteredOptions[] = [
-                    'id' => $this->encodeEnteredOption((int)$customOption->getOptionId()),
+                    'uid' => $this->encodeEnteredOption((int)$customOption->getOptionId()),
                     'value' => '2012-12-12'
                 ];
             } elseif ($optionType === 'drop_down') {

From 15b83646b29b353526c82b2f036da623c41f8dc6 Mon Sep 17 00:00:00 2001
From: Deepty Thampy <dthampy@adobe.com>
Date: Tue, 4 Aug 2020 15:53:42 -0500
Subject: [PATCH 1248/1718] MC-20639: MyAccount :: Order Details :: Refund
 (creditMemo) Details by Order Number

- cleanup test based on CR comments
---
 .../Magento/GraphQl/Sales/CreditmemoTest.php  | 380 ++----------------
 1 file changed, 41 insertions(+), 339 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
index 5ae3390baf2e2..97caad5cd3ee8 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
@@ -7,12 +7,11 @@
 
 namespace Magento\GraphQl\Sales;
 
-use Magento\Bundle\Model\Selection;
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Catalog\Model\Product;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Exception\AuthenticationException;
 use Magento\GraphQl\GetCustomerAuthenticationHeader;
+use Magento\GraphQl\Sales\Fixtures\CustomerPlaceOrder;
 use Magento\Sales\Api\CreditmemoRepositoryInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Model\Order;
@@ -54,12 +53,14 @@ class CreditmemoTest extends GraphQlAbstract
     /** @var SearchCriteriaBuilder */
     private $searchCriteriaBuilder;
 
+    /** @var string */
+    private $orderNumber;
+
     /**
      * Set up
      */
     protected function setUp(): void
     {
-        parent::setUp();
         $objectManager = Bootstrap::getObjectManager();
         $this->customerAuthenticationHeader = $objectManager->get(
             GetCustomerAuthenticationHeader::class
@@ -73,6 +74,12 @@ protected function setUp(): void
         $this->creditMemoService = $objectManager->get(CreditmemoService::class);
     }
 
+    protected function tearDown(): void
+    {
+        $this->deleteOrder();
+        $this->cleanUpCreditMemos($this->orderNumber);
+    }
+
     /**
      * @magentoApiDataFixture Magento/Sales/_files/customer_creditmemo_with_two_items.php
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
@@ -146,10 +153,11 @@ public function testCreditMemoForLoggedInCustomerQuery(): void
         ];
 
         $firstOrderItem = current($response['customer']['orders']['items'] ?? []);
-
-        $creditMemos = $firstOrderItem['credit_memos'] ?? [];
+        $this->assertArrayHasKey('credit_memos', $firstOrderItem);
+        $creditMemos = $firstOrderItem['credit_memos'];
         $this->assertResponseFields($creditMemos, $expectedCreditMemoData);
     }
+
     /**
      * Test customer refund details from order for bundle product with a partial refund
      *
@@ -158,20 +166,18 @@ public function testCreditMemoForLoggedInCustomerQuery(): void
      */
     public function testCreditMemoForBundledProductsWithPartialRefund()
     {
-        $qty = 2;
-        $bundleSku = 'bundle-product-two-dropdown-options';
-        $optionsAndSelectionData = $this->getBundleOptionAndSelectionData($bundleSku);
-
-        $cartId = $this->createEmptyCart();
-        $this->addBundleProductQuery($cartId, $qty, $bundleSku, $optionsAndSelectionData);
-        $this->setBillingAddress($cartId);
-        $shippingMethod = $this->setShippingAddress($cartId);
-        $paymentMethod = $this->setShippingMethod($cartId, $shippingMethod);
-        $this->setPaymentMethod($cartId, $paymentMethod);
-        $orderNumber = $this->placeOrder($cartId);
-        $this->prepareInvoice($orderNumber, 2);
-
-        $order = $this->order->loadByIncrementId($orderNumber);
+        //Place order with bundled product
+        /** @var CustomerPlaceOrder $bundleProductOrderFixture */
+        $bundleProductOrderFixture = Bootstrap::getObjectManager()->create(CustomerPlaceOrder::class);
+        $placeOrderResponse = $bundleProductOrderFixture->placeOrderWithBundleProduct(
+            ['email' => 'customer@example.com', 'password' => 'password'],
+            ['sku' => 'bundle-product-two-dropdown-options', 'quantity' => 2]
+        );
+        $orderNumber = $placeOrderResponse['placeOrder']['order']['order_number'];
+        $this->orderNumber = $orderNumber;
+        $this->prepareInvoice($this->orderNumber, 2);
+
+        $order = $this->order->loadByIncrementId($this->orderNumber);
         /** @var Order\Item $orderItem */
         $orderItem = current($order->getAllItems());
         $orderItem->setQtyRefunded(1);
@@ -247,11 +253,9 @@ public function testCreditMemoForBundledProductsWithPartialRefund()
             ]
         ];
         $firstOrderItem = current($response['customer']['orders']['items'] ?? []);
-
-        $creditMemos = $firstOrderItem['credit_memos'] ?? [];
+        $this->assertArrayHasKey('credit_memos', $firstOrderItem);
+        $creditMemos = $firstOrderItem['credit_memos'];
         $this->assertResponseFields($creditMemos, $expectedCreditMemoData);
-        $this->deleteOrder();
-        $this->cleanUpCreditMemos($orderNumber);
     }
 
     /**
@@ -265,20 +269,18 @@ public function testCreditMemoForBundledProductsWithPartialRefund()
      */
     public function testCreditMemoForBundleProductWithTaxesAndDiscounts()
     {
-        $quantity = 2;
-        $bundleSku = 'bundle-product-two-dropdown-options';
-        $optionsAndSelectionData = $this->getBundleOptionAndSelectionData($bundleSku);
-
-        $cartId = $this->createEmptyCart();
-        $this->addBundleProductQuery($cartId, $quantity, $bundleSku, $optionsAndSelectionData);
-        $this->setBillingAddress($cartId);
-        $shippingMethod = $this->setShippingAddress($cartId);
-        $paymentMethod = $this->setShippingMethod($cartId, $shippingMethod);
-        $this->setPaymentMethod($cartId, $paymentMethod);
-        $orderNumber = $this->placeOrder($cartId);
-        $this->prepareInvoice($orderNumber, 2);
-
-        $order = $this->order->loadByIncrementId($orderNumber);
+        //Place order with bundled product
+        /** @var CustomerPlaceOrder $bundleProductOrderFixture */
+        $bundleProductOrderFixture = Bootstrap::getObjectManager()->create(CustomerPlaceOrder::class);
+        $placeOrderResponse = $bundleProductOrderFixture->placeOrderWithBundleProduct(
+            ['email' => 'customer@example.com', 'password' => 'password'],
+            ['sku' => 'bundle-product-two-dropdown-options', 'quantity' => 2]
+        );
+        $orderNumber = $placeOrderResponse['placeOrder']['order']['order_number'];
+        $this->orderNumber = $orderNumber;
+        $this->prepareInvoice($this->orderNumber, 2);
+
+        $order = $this->order->loadByIncrementId($this->orderNumber);
         /** @var Order\Item $orderItem */
         $orderItem = current($order->getAllItems());
         $orderItem->setQtyRefunded(1);
@@ -375,310 +377,10 @@ public function testCreditMemoForBundleProductWithTaxesAndDiscounts()
             ]
         ];
         $firstOrderItem = current($response['customer']['orders']['items'] ?? []);
+        $this->assertArrayHasKey('credit_memos', $firstOrderItem);
 
-        $creditMemos = $firstOrderItem['credit_memos'] ?? [];
+        $creditMemos = $firstOrderItem['credit_memos'];
         $this->assertResponseFields($creditMemos, $expectedCreditMemoData);
-        $this->deleteOrder();
-        $this->cleanUpCreditMemos($orderNumber);
-    }
-
-    /**
-     * @return string
-     */
-    private function createEmptyCart(): string
-    {
-        $query = <<<QUERY
-mutation {
-  createEmptyCart
-}
-QUERY;
-        $currentEmail = 'customer@example.com';
-        $currentPassword = 'password';
-        $response = $this->graphQlMutation(
-            $query,
-            [],
-            '',
-            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
-        );
-        return $response['createEmptyCart'];
-    }
-    /**
-     *  Add bundle product to cart with Graphql query
-     *
-     * @param string $cartId
-     * @param float $qty
-     * @param string $sku
-     * @param array $optionsAndSelectionData
-     * @throws AuthenticationException
-     */
-    public function addBundleProductQuery(
-        string $cartId,
-        float $qty,
-        string $sku,
-        array $optionsAndSelectionData
-    ) {
-        $query = <<<QUERY
-mutation {
-  addBundleProductsToCart(input:{
-    cart_id:"{$cartId}"
-    cart_items:[
-      {
-        data:{
-          sku:"{$sku}"
-          quantity:$qty
-        }
-        bundle_options:[
-          {
-            id:$optionsAndSelectionData[0]
-            quantity:1
-            value:["{$optionsAndSelectionData[1]}"]
-          }
-          {
-            id:$optionsAndSelectionData[2]
-            quantity:2
-            value:["{$optionsAndSelectionData[3]}"]
-          }
-        ]
-      }
-    ]
-  }) {
-    cart {
-      items {quantity product {sku}}
-      }
-    }
-}
-QUERY;
-        $currentEmail = 'customer@example.com';
-        $currentPassword = 'password';
-        $response = $this->graphQlMutation(
-            $query,
-            [],
-            '',
-            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
-        );
-        $this->assertArrayHasKey('cart', $response['addBundleProductsToCart']);
-    }
-    /**
-     * @param string $cartId
-     * @param array $auth
-     * @return array
-     */
-    private function setBillingAddress(string $cartId): void
-    {
-        $query = <<<QUERY
-mutation {
-  setBillingAddressOnCart(
-    input: {
-      cart_id: "{$cartId}"
-      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;
-        $currentEmail = 'customer@example.com';
-        $currentPassword = 'password';
-        $this->graphQlMutation(
-            $query,
-            [],
-            '',
-            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
-        );
-    }
-
-    /**
-     * @param string $cartId
-     * @return array
-     */
-    private function setShippingAddress(string $cartId): array
-    {
-        $query = <<<QUERY
-mutation {
-  setShippingAddressesOnCart(
-    input: {
-      cart_id: "$cartId"
-      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;
-        $currentEmail = 'customer@example.com';
-        $currentPassword = 'password';
-        $response = $this->graphQlMutation(
-            $query,
-            [],
-            '',
-            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
-        );
-        $shippingAddress = current($response['setShippingAddressesOnCart']['cart']['shipping_addresses']);
-        $availableShippingMethod = current($shippingAddress['available_shipping_methods']);
-        return $availableShippingMethod;
-    }
-    /**
-     * @param string $cartId
-     * @param array $method
-     * @return array
-     */
-    private function setShippingMethod(string $cartId, array $method): array
-    {
-        $query = <<<QUERY
-mutation {
-  setShippingMethodsOnCart(input:  {
-    cart_id: "{$cartId}",
-    shipping_methods: [
-      {
-         carrier_code: "{$method['carrier_code']}"
-         method_code: "{$method['method_code']}"
-      }
-    ]
-  }) {
-    cart {
-      available_payment_methods {
-        code
-        title
-      }
-    }
-  }
-}
-QUERY;
-        $currentEmail = 'customer@example.com';
-        $currentPassword = 'password';
-        $response = $this->graphQlMutation(
-            $query,
-            [],
-            '',
-            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
-        );
-
-        $availablePaymentMethod = current($response['setShippingMethodsOnCart']['cart']['available_payment_methods']);
-        return $availablePaymentMethod;
-    }
-
-    /**
-     * @param string $cartId
-     * @param array $method
-     * @return void
-     */
-    private function setPaymentMethod(string $cartId, array $method): void
-    {
-        $query = <<<QUERY
-mutation {
-  setPaymentMethodOnCart(
-    input: {
-      cart_id: "{$cartId}"
-      payment_method: {
-        code: "{$method['code']}"
-      }
-    }
-  ) {
-    cart {selected_payment_method {code}}
-  }
-}
-QUERY;
-        $currentEmail = 'customer@example.com';
-        $currentPassword = 'password';
-        $this->graphQlMutation(
-            $query,
-            [],
-            '',
-            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
-        );
-    }
-
-    /**
-     * @param string $cartId
-     * @return string
-     */
-    private function placeOrder(string $cartId): string
-    {
-        $query = <<<QUERY
-mutation {
-  placeOrder(
-    input: {
-      cart_id: "{$cartId}"
-    }
-  ) {
-    order {
-      order_number
-    }
-  }
-}
-QUERY;
-        $currentEmail = 'customer@example.com';
-        $currentPassword = 'password';
-        $response = $this->graphQlMutation(
-            $query,
-            [],
-            '',
-            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
-        );
-        return $response['placeOrder']['order']['order_number'];
-    }
-    /**
-     * @param string $bundleSku
-     * @return array
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
-     */
-    private function getBundleOptionAndSelectionData($bundleSku): array
-    {
-        /** @var Product $bundleProduct */
-        $bundleProduct = $this->productRepository->get($bundleSku);
-        /** @var $typeInstance \Magento\Bundle\Model\Product\Type */
-        $typeInstance = $bundleProduct->getTypeInstance();
-        $optionsAndSelections = [];
-        /** @var $option \Magento\Bundle\Model\Option */
-        $option1 = $typeInstance->getOptionsCollection($bundleProduct)->getFirstItem();
-        $option2 = $typeInstance->getOptionsCollection($bundleProduct)->getLastItem();
-        $optionId1 =(int) $option1->getId();
-        $optionId2 =(int) $option2->getId();
-        /** @var Selection $selection */
-        $selection1 = $typeInstance->getSelectionsCollection([$option1->getId()], $bundleProduct)->getFirstItem();
-        $selectionId1 = (int)$selection1->getSelectionId();
-        $selection2 = $typeInstance->getSelectionsCollection([$option2->getId()], $bundleProduct)->getLastItem();
-        $selectionId2 = (int)$selection2->getSelectionId();
-        array_push($optionsAndSelections, $optionId1, $selectionId1, $optionId2, $selectionId2);
-        return $optionsAndSelections;
     }
 
     /**

From 8eba3878abbc1539be7efb8a596c09faa0bf8189 Mon Sep 17 00:00:00 2001
From: Deepty Thampy <dthampy@adobe.com>
Date: Tue, 4 Aug 2020 15:57:24 -0500
Subject: [PATCH 1249/1718] MC-20639: MyAccount :: Order Details :: Refund
 (creditMemo) Details by Order Number

- cleanup fixtures
---
 .../Magento/Sales/_files/customer_creditmemo_with_two_items.php  | 1 -
 .../Sales/_files/customer_creditmemo_with_two_items_rollback.php | 1 -
 2 files changed, 2 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/customer_creditmemo_with_two_items.php b/dev/tests/integration/testsuite/Magento/Sales/_files/customer_creditmemo_with_two_items.php
index 730848b078413..478a10665cd7e 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/customer_creditmemo_with_two_items.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/customer_creditmemo_with_two_items.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/customer_creditmemo_with_two_items_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/customer_creditmemo_with_two_items_rollback.php
index e40de2969ed42..b8a065f9383d2 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/customer_creditmemo_with_two_items_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/customer_creditmemo_with_two_items_rollback.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.

From 45a3a77049a4c37c5831446a5aa1e953239a8984 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 5 Aug 2020 00:14:13 +0300
Subject: [PATCH 1250/1718] improvement some tests

---
 .../AdminSubmitAdvancedInventoryFormActionGroup.xml    |  1 +
 .../Mftf/Test/AdminAddInStockProductToTheCartTest.xml  | 10 +++++-----
 ...AdminCreateVirtualProductWithoutManageStockTest.xml |  4 ++--
 ...leProductWithRegularPriceInStockEnabledFlatTest.xml |  8 +++-----
 ...dQuantityIncrementsWorkWithDecimalinventoryTest.xml |  9 ++++-----
 5 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSubmitAdvancedInventoryFormActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSubmitAdvancedInventoryFormActionGroup.xml
index b859ed2ea5942..f94bec1789068 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSubmitAdvancedInventoryFormActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSubmitAdvancedInventoryFormActionGroup.xml
@@ -16,5 +16,6 @@
         </annotations>
 
         <click stepKey="clickOnDoneButton" selector="{{AdminProductFormAdvancedInventorySection.doneButton}}"/>
+        <waitForPageLoad stepKey="waitForProductPageToLoad"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml
index 6c57654789d06..94d3b46aaa5f1 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminAddInStockProductToTheCartTest.xml
@@ -41,8 +41,7 @@
         <!-- Update product Advanced Inventory setting -->
         <click stepKey="openSelectedProduct" selector="{{AdminProductGridSection.productRowBySku($$createSimpleProduct.sku$$)}}"/>
         <waitForPageLoad stepKey="waitForProductToLoad"/>
-        <click selector="{{AdminProductFormSection.advancedInventoryLink}}" stepKey="clickOnAdvancedInventoryLink"/>
-        <waitForPageLoad stepKey="waitForAdvancedInventoryPageToLoad"/>
+        <actionGroup ref="AdminClickOnAdvancedInventoryLinkActionGroup" stepKey="clickOnAdvancedInventoryLink"/>
         <uncheckOption selector="{{AdminProductFormAdvancedInventorySection.useConfigSettings}}" stepKey="uncheckConfigSetting"/>
         <selectOption selector="{{AdminProductFormAdvancedInventorySection.manageStock}}"  userInput="Yes" stepKey="clickOnManageStock"/>
         <fillField selector="{{AdminProductFormAdvancedInventorySection.advancedInventoryQty}}" userInput="5" stepKey="fillProductQty"/>
@@ -53,9 +52,10 @@
         <selectOption  selector="{{AdminProductFormAdvancedInventorySection.qtyUsesDecimals}}" userInput="Yes" stepKey="selectQuatityUsesDecimal"/>
         <uncheckOption selector="{{AdminProductFormAdvancedInventorySection.notifyBelowQtyConfigSetting}}" stepKey="uncheckNotifyBelowQtyheckBox"/>
         <fillField selector="{{AdminProductFormAdvancedInventorySection.notifyBelowQty}}" userInput="1" stepKey="fillNotifyBelowQty"/>
-        <selectOption selector="{{AdminProductFormAdvancedInventorySection.advancedInventoryStockStatus}}" userInput="In Stock" stepKey="selectOutOfStock"/>
-        <click stepKey="clickOnDoneButton" selector="{{AdminProductFormAdvancedInventorySection.doneButton}}"/>
-        <waitForPageLoad stepKey="waitForProductPageToLoad"/>
+        <actionGroup ref="AdminSetStockStatusConfigActionGroup" stepKey="selectOutOfStock">
+            <argument name="stockStatus" value="In Stock"/>
+        </actionGroup>
+        <actionGroup ref="AdminSubmitAdvancedInventoryFormActionGroup" stepKey="clickOnDoneButton"/>
         <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickOnSaveButton"/>
         <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShown"/>
         <!--Clear cache and reindex-->
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml
index f24804977c52c..c4cd41e141108 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithoutManageStockTest.xml
@@ -40,10 +40,10 @@
         <fillField selector="{{AdminProductFormAdvancedPricingSection.specialPrice}}" userInput="{{virtualProductWithoutManageStock.special_price}}" stepKey="fillSpecialPrice"/>
         <click selector="{{AdminProductFormAdvancedPricingSection.doneButton}}" stepKey="clickDoneButton"/>
         <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{virtualProductWithoutManageStock.quantity}}" stepKey="fillProductQuantity"/>
-        <click selector="{{AdminProductFormSection.advancedInventoryLink}}" stepKey="clickAdvancedInventoryLink"/>
+        <actionGroup ref="AdminClickOnAdvancedInventoryLinkActionGroup" stepKey="clickAdvancedInventoryLink"/>
         <click selector="{{AdminProductFormAdvancedInventorySection.manageStock}}" stepKey="clickManageStock"/>
         <checkOption selector="{{AdminProductFormAdvancedInventorySection.useConfigSettings}}" stepKey="CheckUseConfigSettingsCheckBox"/>
-        <click selector="{{AdminProductFormAdvancedInventorySection.doneButton}}" stepKey="clickDoneButtonOnAdvancedInventorySection"/>
+        <actionGroup ref="AdminSubmitAdvancedInventoryFormActionGroup" stepKey="clickDoneButtonOnAdvancedInventorySection"/>
         <click selector="{{AdminProductFormSection.categoriesDropdown}}" stepKey="clickCategoriesDropDown"/>
         <fillField selector="{{AdminProductFormSection.searchCategory}}" userInput="$$categoryEntity.name$$" stepKey="fillSearchCategory" />
         <click selector="{{AdminProductFormSection.selectCategory($$categoryEntity.name$$)}}" stepKey="clickOnCategory"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest.xml
index 2a6343bae8d23..c37849b992607 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockEnabledFlatTest.xml
@@ -51,11 +51,10 @@
         <fillField selector="{{AdminProductFormSection.productPrice}}" userInput="{{simpleProductEnabledFlat.price}}" stepKey="fillSimpleProductPrice"/>
         <selectOption selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{simpleProductEnabledFlat.productTaxClass}}" stepKey="selectProductTaxClass"/>
         <fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{simpleProductEnabledFlat.quantity}}" stepKey="fillSimpleProductQuantity"/>
-        <click selector="{{AdminProductFormSection.advancedInventoryLink}}" stepKey="clickAdvancedInventoryLink"/>
-        <waitForPageLoad stepKey="waitForAdvancedInventoryPage"/>
+        <actionGroup ref="AdminClickOnAdvancedInventoryLinkActionGroup" stepKey="clickAdvancedInventoryLink"/>
         <conditionalClick selector="{{AdminProductFormAdvancedInventorySection.useConfigSettings}}" dependentSelector="{{AdminProductFormAdvancedInventorySection.useConfigSettings}}" visible="true" stepKey="checkUseConfigSettingsCheckBox"/>
         <selectOption selector="{{AdminProductFormAdvancedInventorySection.manageStock}}" userInput="No" stepKey="selectManageStock"/>
-        <click selector="{{AdminProductFormAdvancedInventorySection.doneButton}}" stepKey="clickDoneButtonOnAdvancedInventorySection"/>
+        <actionGroup ref="AdminSubmitAdvancedInventoryFormActionGroup" stepKey="clickDoneButtonOnAdvancedInventorySection"/>
         <selectOption selector="{{AdminProductFormSection.stockStatus}}" userInput="{{simpleProductEnabledFlat.status}}" stepKey="selectStockStatusInStock"/>
         <fillField selector="{{AdminProductFormSection.productWeight}}" userInput="{{simpleProductEnabledFlat.weight}}" stepKey="fillSimpleProductWeight"/>
         <selectOption selector="{{AdminProductFormSection.productWeightSelect}}" userInput="{{simpleProductEnabledFlat.weightSelect}}" stepKey="selectProductWeight"/>
@@ -92,8 +91,7 @@
         <seeInField selector="{{AdminProductFormSection.productPrice}}" userInput="{{simpleProductEnabledFlat.price}}" stepKey="seeSimpleProductPrice"/>
         <seeInField selector="{{AdminProductFormSection.productTaxClass}}" userInput="{{simpleProductEnabledFlat.productTaxClass}}" stepKey="seeProductTaxClass"/>
         <seeInField selector="{{AdminProductFormSection.productQuantity}}" userInput="{{simpleProductEnabledFlat.quantity}}" stepKey="seeSimpleProductQuantity"/>
-        <click selector="{{AdminProductFormSection.advancedInventoryLink}}" stepKey="clickTheAdvancedInventoryLink"/>
-        <waitForPageLoad stepKey="waitForAdvancedInventoryPageLoad"/>
+        <actionGroup ref="AdminClickOnAdvancedInventoryLinkActionGroup" stepKey="clickTheAdvancedInventoryLink"/>
         <see selector="{{AdminProductFormAdvancedInventorySection.manageStock}}" userInput="No" stepKey="seeManageStock"/>
         <click selector="{{AdminProductFormAdvancedInventorySection.advancedInventoryCloseButton}}" stepKey="clickDoneButtonOnAdvancedInventory"/>
         <seeInField selector="{{AdminProductFormSection.productStockStatus}}" userInput="{{simpleProductEnabledFlat.status}}" stepKey="seeSimpleProductStockStatus"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/TieredPricingAndQuantityIncrementsWorkWithDecimalinventoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/TieredPricingAndQuantityIncrementsWorkWithDecimalinventoryTest.xml
index 8ce3b55ff94ef..9c68c08064081 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/TieredPricingAndQuantityIncrementsWorkWithDecimalinventoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/TieredPricingAndQuantityIncrementsWorkWithDecimalinventoryTest.xml
@@ -37,11 +37,11 @@
                stepKey="clickOpenProductForEdit"/>
         <waitForPageLoad time="30" stepKey="waitForProductEditOpen"/>
         <!--Step2. Open *Advanced Inventory* pop-up (Click on *Advanced Inventory* link). Set *Qty Uses Decimals* to *Yes*. Click on button *Done*  -->
-        <click selector="{{AdminProductFormSection.advancedInventoryLink}}" stepKey="clickOnAdvancedInventoryLink"/>
+        <actionGroup ref="AdminClickOnAdvancedInventoryLinkActionGroup" stepKey="clickOnAdvancedInventoryLink"/>
         <scrollTo selector="{{AdminProductFormAdvancedInventorySection.qtyUsesDecimals}}" stepKey="scrollToQtyUsesDecimalsDropBox"/>
         <click selector="{{AdminProductFormAdvancedInventorySection.qtyUsesDecimals}}" stepKey="clickOnQtyUsesDecimalsDropBox"/>
         <click selector="{{AdminProductFormAdvancedInventorySection.qtyUsesDecimalsOptions('1')}}" stepKey="chooseYesOnQtyUsesDecimalsDropBox"/>
-        <click selector="{{AdminProductFormAdvancedInventorySection.doneButton}}" stepKey="clickOnDoneButton"/>
+        <actionGroup ref="AdminSubmitAdvancedInventoryFormActionGroup" stepKey="clickOnDoneButton"/>
         <!--Step3. Open *Advanced Pricing* pop-up (Click on *Advanced Pricing* link). Click on *Add* button. Fill *0.5* in *Quantity*-->
         <scrollTo selector="{{AdminProductFormSection.productName}}" stepKey="scrollToProductName"/>
         <click selector="{{AdminProductFormSection.advancedPricingLink}}" stepKey="clickOnAdvancedPricingLink1"/>
@@ -58,8 +58,7 @@
         <!--<click selector="{{AdminProductFormAdvancedPricingSection.advancedPricingCloseButton}}" stepKey="clickOnCloseButton"/>-->
 
         <!--Step5. Open *Advanced Inventory* pop-up. Set *Enable Qty Increments* to *Yes*. Fill *.5* in *Qty Increments*-->
-        <click selector="{{AdminProductFormSection.advancedInventoryLink}}" stepKey="clickOnAdvancedInventoryLink2"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <actionGroup ref="AdminClickOnAdvancedInventoryLinkActionGroup" stepKey="clickOnAdvancedInventoryLink2"/>
         <scrollTo selector="{{AdminProductFormAdvancedInventorySection.enableQtyIncrements}}" stepKey="scrollToEnableQtyIncrements"/>
         <click selector="{{AdminProductFormAdvancedInventorySection.enableQtyIncrementsUseConfigSettings}}" stepKey="clickOnEnableQtyIncrementsUseConfigSettingsCheckbox"/>
         <click selector="{{AdminProductFormAdvancedInventorySection.enableQtyIncrements}}" stepKey="clickOnEnableQtyIncrements"/>
@@ -69,7 +68,7 @@
         <scrollTo selector="{{AdminProductFormAdvancedInventorySection.qtyIncrements}}" stepKey="scrollToQtyIncrements"/>
         <fillField selector="{{AdminProductFormAdvancedInventorySection.qtyIncrements}}" userInput=".5" stepKey="fillQtyIncrements"/>
         <!--Step6. Close *Advanced Inventory* (Click on button *Done*). Save *prod1* (Click on button *Save*) -->
-        <click selector="{{AdminProductFormAdvancedInventorySection.doneButton}}" stepKey="clickOnDoneButton3"/>
+        <actionGroup ref="AdminSubmitAdvancedInventoryFormActionGroup" stepKey="clickOnDoneButton3"/>
         <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="clickOnSaveButton2"/>
         <!--Step7. Open *Customer view* (Go to *Store Front*). Open *prod1* page (Find via search and click on product name) -->
         <amOnPage url="{{StorefrontHomePage.url}}$$createPreReqSimpleProduct.custom_attributes[url_key]$$.html" stepKey="amOnProductPage"/>

From f6cfcff5e2f372430f53fe7a22eae322a7c0573d Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Tue, 4 Aug 2020 17:34:05 -0500
Subject: [PATCH 1251/1718] - Updated schema descriptions

---
 .../Magento/QuoteGraphQl/etc/schema.graphqls     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
index 6a96f361a90b0..2c6fca1a14b23 100644
--- a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -22,7 +22,7 @@ type Mutation {
     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")
     placeOrder(input: PlaceOrderInput): PlaceOrderOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\PlaceOrder")
-    addProductsToCart(cartId: String!, cartItems: [CartItemInput!]!): AddProductsToCartOutput @doc(description:"Add products to the cart. Provide single interface for all product types ") @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\AddProductsToCart")
+    addProductsToCart(cartId: String!, cartItems: [CartItemInput!]!): AddProductsToCartOutput @doc(description:"Add any type of product to the cart") @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\AddProductsToCart")
 }
 
 input createEmptyCartInput {
@@ -52,9 +52,9 @@ input VirtualProductCartItemInput {
 input CartItemInput {
     sku: String!
     quantity: Float!
-    parent_sku: String,
-    selected_options: [ID!]
-    entered_options: [EnteredOptionInput!]
+    parent_sku: String @doc(description: "For child products, the SKU of its parent product")
+    selected_options: [ID!] @doc(description: "The selected options for the base product, such as color or size")
+    entered_options: [EnteredOptionInput!] @doc(description: "An array of entered options for the base product, such as personalization text")
 }
 
 input CustomizableOptionInput {
@@ -373,15 +373,15 @@ type Order {
     order_id: String @deprecated(reason: "The order_id field is deprecated, use order_number instead.")
 }
 
-type CheckoutUserInputError @doc(description:"An error encountered while adding an item the the cart.") {
-    message: String! @doc(description: "Localized error message")
+type CheckoutUserInputError @doc(description:"An error encountered while adding an item to the the cart.") {
+    message: String! @doc(description: "A localized error message")
     path: [String]! @doc(description: "Path to the input field that caused an error. See the GraphQL specification about path errors for details: http://spec.graphql.org/draft/#sec-Errors")
     code: CheckoutUserInputErrorCodes! @doc(description: "Checkout-specific error code")
 }
 
 type AddProductsToCartOutput {
-    cart: Cart!
-    userInputErrors:[CheckoutUserInputError]!
+    cart: Cart! @doc(description: "The cart after products have been added")
+    userInputErrors:[CheckoutUserInputError]! @doc(description: "An error encountered while adding an item to the cart.")
 }
 
 enum CheckoutUserInputErrorCodes {

From 5930f37aae6423c46442ee241f3e229e2766699c Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Tue, 4 Aug 2020 17:32:06 -0500
Subject: [PATCH 1252/1718] MC-36456: union implementation

---
 app/code/Magento/GraphQl/etc/di.xml           |   4 +
 .../GraphQl/Config/Element/UnionFactory.php   |  69 ++++++++++++
 .../GraphQl/Config/Element/UnionInterface.php |  23 ++++
 .../GraphQl/Config/Element/UnionType.php      |  92 ++++++++++++++++
 .../Output/ElementMapper/Formatter/Fields.php |   3 +-
 .../ElementMapper/Formatter/Interfaces.php    |   4 +-
 .../ElementMapper/Formatter/ResolveType.php   |  10 +-
 .../Output/ElementMapper/Formatter/Unions.php |  50 +++++++++
 .../ElementMapper/FormatterComposite.php      |   4 +-
 .../ElementMapper/FormatterInterface.php      |   6 +-
 .../Schema/Type/Output/OutputMapper.php       |   2 +-
 .../Schema/Type/Output/OutputUnionObject.php  |  28 +++++
 .../GraphQl/Schema/Type/UnionType.php         |  16 +++
 .../Framework/GraphQl/Schema/TypeFactory.php  |  13 ++-
 .../GraphQlSchemaStitching/GraphQlReader.php  |  15 ++-
 .../GraphQlReader/Reader/UnionType.php        | 102 ++++++++++++++++++
 16 files changed, 424 insertions(+), 17 deletions(-)
 create mode 100644 lib/internal/Magento/Framework/GraphQl/Config/Element/UnionFactory.php
 create mode 100644 lib/internal/Magento/Framework/GraphQl/Config/Element/UnionInterface.php
 create mode 100644 lib/internal/Magento/Framework/GraphQl/Config/Element/UnionType.php
 create mode 100644 lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Unions.php
 create mode 100644 lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputUnionObject.php
 create mode 100644 lib/internal/Magento/Framework/GraphQl/Schema/Type/UnionType.php
 create mode 100644 lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/UnionType.php

diff --git a/app/code/Magento/GraphQl/etc/di.xml b/app/code/Magento/GraphQl/etc/di.xml
index fca6c425e2507..d6168cdc37600 100644
--- a/app/code/Magento/GraphQl/etc/di.xml
+++ b/app/code/Magento/GraphQl/etc/di.xml
@@ -29,6 +29,7 @@
         <arguments>
             <argument name="factoryMapByConfigElementType" xsi:type="array">
                 <item name="graphql_interface" xsi:type="object">Magento\Framework\GraphQl\Config\Element\InterfaceFactory</item>
+                <item name="graphql_union" xsi:type="object">Magento\Framework\GraphQl\Config\Element\UnionFactory</item>
                 <item name="graphql_type" xsi:type="object">Magento\Framework\GraphQl\Config\Element\TypeFactory</item>
                 <item name="graphql_input" xsi:type="object">Magento\Framework\GraphQl\Config\Element\InputFactory</item>
                 <item name="graphql_enum" xsi:type="object">Magento\Framework\GraphQl\Config\Element\EnumFactory</item>
@@ -64,6 +65,7 @@
                 <item name="Magento\Framework\GraphQl\Config\Element\Type" xsi:type="string">Magento\Framework\GraphQl\Schema\Type\Output\OutputTypeObject</item>
                 <item name="Magento\Framework\GraphQl\Config\Element\Input" xsi:type="string">Magento\Framework\GraphQl\Schema\Type\Input\InputObjectType</item>
                 <item name="Magento\Framework\GraphQl\Config\Element\InterfaceType" xsi:type="string">Magento\Framework\GraphQl\Schema\Type\Output\OutputInterfaceObject</item>
+                <item name="Magento\Framework\GraphQl\Config\Element\UnionType" xsi:type="string">Magento\Framework\GraphQl\Schema\Type\Output\OutputUnionObject</item>
                 <item name="Magento\Framework\GraphQl\Config\Element\Enum" xsi:type="string">Magento\Framework\GraphQl\Schema\Type\Enum\Enum</item>
             </argument>
         </arguments>
@@ -78,6 +80,7 @@
             <argument name="formatters" xsi:type="array">
                 <item name="fields" xsi:type="object">Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper\Formatter\Fields</item>
                 <item name="interfaces" xsi:type="object">Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper\Formatter\Interfaces</item>
+                <item name="unions" xsi:type="object">Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper\Formatter\Unions</item>
                 <item name="resolveType" xsi:type="object">Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper\Formatter\ResolveType</item>
             </argument>
         </arguments>
@@ -85,6 +88,7 @@
     <type name="Magento\Framework\GraphQlSchemaStitching\GraphQlReader\TypeReaderComposite">
         <arguments>
             <argument name="typeReaders" xsi:type="array">
+                <item name="union_type" xsi:type="object">Magento\Framework\GraphQlSchemaStitching\GraphQlReader\Reader\UnionType</item>
                 <item name="enum_type" xsi:type="object">Magento\Framework\GraphQlSchemaStitching\GraphQlReader\Reader\EnumType</item>
                 <item name="object_type" xsi:type="object">Magento\Framework\GraphQlSchemaStitching\GraphQlReader\Reader\ObjectType</item>
                 <item name="input_object_type" xsi:type="object">Magento\Framework\GraphQlSchemaStitching\GraphQlReader\Reader\InputObjectType</item>
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionFactory.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionFactory.php
new file mode 100644
index 0000000000000..e6dddd9535e82
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionFactory.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Config\Element;
+
+use Magento\Framework\GraphQl\Config\ConfigElementFactoryInterface;
+use Magento\Framework\GraphQl\Config\ConfigElementInterface;
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Factory for config elements of 'union' type.
+ */
+class UnionFactory implements ConfigElementFactoryInterface
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager
+    ) {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Instantiate an object representing 'interface' GraphQL config element.
+     *
+     * @param array $data
+     * @return ConfigElementInterface
+     */
+    public function createFromConfigData(array $data): ConfigElementInterface
+    {
+        return $this->create($data, $data['types'] ?? []);
+    }
+
+    /**
+     * Create interface object based off array of configured GraphQL Output/InputInterface.
+     *
+     * Interface data must contain name, type resolver, and field definitions. The type resolver should point to an
+     * implementation of the TypeResolverInterface that decides what concrete GraphQL type to output. Description is
+     * the only optional field.
+     *
+     * @param array $unionData
+     * @param array $types
+     * @return UnionType
+     */
+    public function create(
+        array $unionData,
+        array $types
+    ) : UnionType {
+        return $this->objectManager->create(
+            UnionType::class,
+            [
+                'name' => $unionData['name'],
+                'resolver' => $unionData['resolver'],
+                'types' => $types,
+                'description' => isset($unionData['description']) ? $unionData['description'] : ''
+            ]
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionInterface.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionInterface.php
new file mode 100644
index 0000000000000..85053325f193d
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionInterface.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Config\Element;
+
+use Magento\Framework\GraphQl\Config\ConfigElementInterface;
+
+/**
+ * Defines contracts for return type data as GraphQL objects.
+ */
+interface UnionInterface extends ConfigElementInterface
+{
+    /**
+     * Get a list of fields that make up the possible return or input values of a type.
+     *
+     * @return Type[]
+     */
+    public function getTypes() : array;
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionType.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionType.php
new file mode 100644
index 0000000000000..125baa344f1cd
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionType.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Config\Element;
+
+/**
+ * Class representing 'union' GraphQL config element.
+ */
+class UnionType implements UnionInterface
+{
+    /**
+     * @var string
+     */
+    private $name;
+
+    /**
+     * @var string[]
+     */
+    private $types;
+
+    /**
+     * @var string
+     */
+    private $resolver;
+
+    /**
+     * @var string
+     */
+    private $description;
+
+    /**
+     * @param string $name
+     * @param string $resolver
+     * @param string[] $types
+     * @param string $description
+     */
+    public function __construct(
+        string $name,
+        string $resolver,
+        array $types,
+        string $description
+    ) {
+        $this->name = $name;
+        $this->types = $types;
+        $this->resolver = $resolver;
+        $this->description = $description;
+    }
+
+    /**
+     * Get the type name.
+     *
+     * @return string
+     */
+    public function getName() : string
+    {
+        return $this->name;
+    }
+
+    /**
+     * Get a list of fields that make up the possible return or input values of a type.
+     *
+     * @return string[]
+     */
+    public function getTypes() : array
+    {
+        return $this->types;
+    }
+
+    /**
+     * Return the name of the resolver class that determines the concrete type to display in the result.
+     *
+     * @return string
+     */
+    public function getResolver()
+    {
+        return $this->resolver;
+    }
+
+    /**
+     * Get a human-readable description of the type.
+     *
+     * @return string
+     */
+    public function getDescription() : string
+    {
+        return $this->description;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Fields.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Fields.php
index ad9fb675a6d70..7ff2ea60bd2cc 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Fields.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Fields.php
@@ -10,6 +10,7 @@
 use Magento\Framework\GraphQl\Config\Data\WrappedTypeProcessor;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Config\Element\TypeInterface;
+use Magento\Framework\GraphQl\Config\ConfigElementInterface;
 use Magento\Framework\GraphQl\Schema\Type\Input\InputMapper;
 use Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper\FormatterInterface;
 use Magento\Framework\GraphQl\Schema\Type\Output\OutputMapper;
@@ -89,7 +90,7 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function format(TypeInterface $configElement, OutputTypeInterface $outputType): array
+    public function format(ConfigElementInterface $configElement, OutputTypeInterface $outputType): array
     {
         $typeConfig = [
             'fields' => function () use ($configElement, $outputType) {
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Interfaces.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Interfaces.php
index 659c3f604508d..1f62384d181f4 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Interfaces.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Interfaces.php
@@ -8,7 +8,7 @@
 namespace Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper\Formatter;
 
 use Magento\Framework\GraphQl\Config\Element\Type;
-use Magento\Framework\GraphQl\Config\Element\TypeInterface;
+use Magento\Framework\GraphQl\Config\ConfigElementInterface;
 use Magento\Framework\GraphQl\Schema\Type\OutputTypeInterface;
 use Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper\FormatterInterface;
 use Magento\Framework\GraphQl\Schema\Type\Output\OutputMapper;
@@ -34,7 +34,7 @@ public function __construct(OutputMapper $outputMapper)
     /**
      * {@inheritDoc}
      */
-    public function format(TypeInterface $configElement, OutputTypeInterface $outputType) : array
+    public function format(ConfigElementInterface $configElement, OutputTypeInterface $outputType) : array
     {
         $config = [];
         if ($configElement instanceof Type && !empty($configElement->getInterfaces())) {
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/ResolveType.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/ResolveType.php
index 3a40e609eb952..8af7953e399f5 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/ResolveType.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/ResolveType.php
@@ -8,7 +8,8 @@
 namespace Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper\Formatter;
 
 use Magento\Framework\GraphQl\Config\Element\InterfaceType;
-use Magento\Framework\GraphQl\Config\Element\TypeInterface;
+use Magento\Framework\GraphQl\Config\Element\UnionType;
+use Magento\Framework\GraphQl\Config\ConfigElementInterface;
 use Magento\Framework\GraphQl\Schema\Type\OutputTypeInterface;
 use Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper\FormatterInterface;
 use Magento\Framework\ObjectManagerInterface;
@@ -34,7 +35,7 @@ public function __construct(ObjectManagerInterface $objectManager)
     /**
      * {@inheritDoc}
      */
-    public function format(TypeInterface $configElement, OutputTypeInterface $outputType) : array
+    public function format(ConfigElementInterface $configElement, OutputTypeInterface $outputType) : array
     {
         $config = [];
         if ($configElement instanceof InterfaceType) {
@@ -42,6 +43,11 @@ public function format(TypeInterface $configElement, OutputTypeInterface $output
             $config['resolveType'] = function ($value) use ($typeResolver) {
                 return $typeResolver->resolveType($value);
             };
+        } elseif ($configElement instanceof UnionType) {
+            $typeResolver = $this->objectManager->create($configElement->getResolver());
+            $config['resolveType'] = function ($value) use ($typeResolver) {
+                return $typeResolver->resolveType($value);
+            };
         }
 
         return $config;
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Unions.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Unions.php
new file mode 100644
index 0000000000000..450ce5ac7e494
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Unions.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper\Formatter;
+
+use Magento\Framework\GraphQl\Config\Element\UnionType;
+use Magento\Framework\GraphQl\Config\ConfigElementInterface;
+use Magento\Framework\GraphQl\Schema\Type\OutputTypeInterface;
+use Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper\FormatterInterface;
+use Magento\Framework\GraphQl\Schema\Type\Output\OutputMapper;
+
+/**
+ * Add unions implemented by type if configured.
+ */
+class Unions implements FormatterInterface
+{
+    /**
+     * @var OutputMapper
+     */
+    private $outputMapper;
+
+    /**
+     * @param OutputMapper $outputMapper
+     */
+    public function __construct(OutputMapper $outputMapper)
+    {
+        $this->outputMapper = $outputMapper;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function format(ConfigElementInterface $configElement, OutputTypeInterface $outputType) : array
+    {
+        $config = [];
+        if ($configElement instanceof UnionType && !empty($configElement->getTypes())) {
+            $unionTypes = [];
+            foreach ($configElement->getTypes() as $unionName) {
+                $unionTypes[$unionName] = $this->outputMapper->getOutputType($unionName);
+            }
+            $config['types'] = $unionTypes;
+        }
+
+        return $config;
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterComposite.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterComposite.php
index 416b4122b7097..83508722c339d 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterComposite.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterComposite.php
@@ -7,7 +7,7 @@
 
 namespace Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper;
 
-use Magento\Framework\GraphQl\Config\Element\TypeInterface;
+use Magento\Framework\GraphQl\Config\ConfigElementInterface;
 use Magento\Framework\GraphQl\Schema\Type\OutputTypeInterface;
 
 /**
@@ -31,7 +31,7 @@ public function __construct(array $formatters)
     /**
      * {@inheritDoc}
      */
-    public function format(TypeInterface $configElement, OutputTypeInterface $outputType) : array
+    public function format(ConfigElementInterface $configElement, OutputTypeInterface $outputType) : array
     {
         $config = [
             'name' => $configElement->getName(),
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterInterface.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterInterface.php
index 7d40b743a6a06..749a7690faaba 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterInterface.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterInterface.php
@@ -7,7 +7,7 @@
 
 namespace Magento\Framework\GraphQl\Schema\Type\Output\ElementMapper;
 
-use Magento\Framework\GraphQl\Config\Element\TypeInterface as TypeElementInterface;
+use Magento\Framework\GraphQl\Config\ConfigElementInterface;
 use Magento\Framework\GraphQl\Schema\Type\OutputTypeInterface;
 
 /**
@@ -18,9 +18,9 @@ interface FormatterInterface
     /**
      * Convert GraphQL config element to the object compatible with GraphQL schema generator.
      *
-     * @param TypeElementInterface $configElement
+     * @param ConfigElementInterface $configElement
      * @param OutputTypeInterface $outputType
      * @return array
      */
-    public function format(TypeElementInterface $configElement, OutputTypeInterface $outputType) : array;
+    public function format(ConfigElementInterface $configElement, OutputTypeInterface $outputType) : array;
 }
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputMapper.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputMapper.php
index 046eeb5b1f93d..f718cd4e9e04c 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputMapper.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputMapper.php
@@ -38,7 +38,7 @@ public function __construct(
      * @return OutputTypeInterface
      * @throws GraphQlInputException
      */
-    public function getOutputType($typeName)
+    public function getOutputType(string $typeName)
     {
         $outputType = $this->typeRegistry->get($typeName);
 
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputUnionObject.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputUnionObject.php
new file mode 100644
index 0000000000000..3c92004c33c90
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputUnionObject.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\GraphQl\Schema\Type\Output;
+
+use Magento\Framework\GraphQl\Config\Element\UnionType as UnionElement;
+use Magento\Framework\GraphQl\Schema\Type\UnionType;
+
+/**
+ * 'union' type compatible with GraphQL schema generator.
+ */
+class OutputUnionObject extends UnionType
+{
+    /**
+     * @param ElementMapper $elementMapper
+     * @param UnionElement $configElement
+     */
+    public function __construct(
+        ElementMapper $elementMapper,
+        UnionElement $configElement
+    ) {
+        parent::__construct($elementMapper->buildSchemaArray($configElement, $this));
+    }
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/UnionType.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/UnionType.php
new file mode 100644
index 0000000000000..a843c6c669acf
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/UnionType.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\GraphQl\Schema\Type;
+
+/**
+ * Wrapper for GraphQl UnionType
+ */
+class UnionType extends \GraphQL\Type\Definition\UnionType implements OutputTypeInterface
+{
+
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/TypeFactory.php b/lib/internal/Magento/Framework/GraphQl/Schema/TypeFactory.php
index 3b31653382e3a..84f8d809c958e 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/TypeFactory.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/TypeFactory.php
@@ -13,7 +13,7 @@
 use Magento\Framework\GraphQl\Schema\Type\EnumType;
 use Magento\Framework\GraphQl\Schema\Type\ListOfType;
 use Magento\Framework\GraphQl\Schema\Type\NonNull;
-use Magento\Framework\GraphQl\Schema\TypeInterface;
+use Magento\Framework\GraphQl\Schema\Type\UnionType;
 
 /**
  * Factory for @see TypeInterface implementations
@@ -42,6 +42,17 @@ public function createInterface(array $config) : InterfaceType
         return new InterfaceType($config);
     }
 
+    /**
+     * Create an union type
+     *
+     * @param array $config
+     * @return UnionType
+     */
+    public function createUnion(array $config) : UnionType
+    {
+        return new UnionType($config);
+    }
+
     /**
      * Create an input object type
      *
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
index 1e8b33f79854b..61209891fa08d 100644
--- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
@@ -23,6 +23,8 @@ class GraphQlReader implements ReaderInterface
 
     public const GRAPHQL_INTERFACE = 'graphql_interface';
 
+    public const GRAPHQL_UNION = 'graphql_union';
+
     /**
      * File locator
      *
@@ -178,7 +180,7 @@ private function parseTypes(string $graphQlSchemaContent) : array
     private function copyInterfaceFieldsToConcreteTypes(array $source): array
     {
         foreach ($source as $interface) {
-            if ($interface['type'] == 'graphql_interface') {
+            if ($interface['type'] ?? '' == 'graphql_interface') {
                 foreach ($source as $typeName => $type) {
                     if (isset($type['implements'])
                         && isset($type['implements'][$interface['name']])
@@ -253,7 +255,7 @@ private function convertInterfacesToAnnotations(string $graphQlSchemaContent): s
     private function addPlaceHolderInSchema(string $graphQlSchemaContent) :string
     {
         $placeholderField = self::GRAPHQL_PLACEHOLDER_FIELD_NAME;
-        $typesKindsPattern = '(type|interface|input)';
+        $typesKindsPattern = '(type|interface|input|union)';
         $enumKindsPattern = '(enum)';
         $typeNamePattern = '([_A-Za-z][_0-9A-Za-z]+)';
         $typeDefinitionPattern = '([^\{]*)(\{[\s\t\n\r^\}]*\})';
@@ -329,10 +331,13 @@ private static function getModuleNameForRelevantFile(string $file): string
     private function addModuleNameToTypes(array $source, string $filePath): array
     {
         foreach ($source as $typeName => $type) {
-            if (!isset($type['module']) && (
-                ($type['type'] === self::GRAPHQL_INTERFACE && isset($type['typeResolver']))
+            if (!isset($type['type'])) {
+                $x=1;
+            }
+            if ((!isset($type['module']))
+                && (($type['type'] ?? '' === self::GRAPHQL_INTERFACE && isset($type['typeResolver']))
                     || isset($type['implements'])
-            )
+                )
             ) {
                 $source[$typeName]['module'] = self::getModuleNameForRelevantFile($filePath);
             }
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/UnionType.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/UnionType.php
new file mode 100644
index 0000000000000..9dab871935dff
--- /dev/null
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/UnionType.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\GraphQlSchemaStitching\GraphQlReader\Reader;
+
+use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\TypeMetaReaderInterface;
+use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\MetaReader\FieldMetaReader;
+use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\MetaReader\DocReader;
+use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\MetaReader\CacheAnnotationReader;
+
+/**
+ * Composite configuration reader to handle the union object type meta
+ */
+class UnionType implements TypeMetaReaderInterface
+{
+    /**
+     * @var FieldMetaReader
+     */
+    private $fieldMetaReader;
+
+    /**
+     * @var DocReader
+     */
+    private $docReader;
+
+    /**
+     * @var CacheAnnotationReader
+     */
+    private $cacheAnnotationReader;
+
+    /**
+     * @param FieldMetaReader $fieldMetaReader
+     * @param DocReader $docReader
+     * @param CacheAnnotationReader|null $cacheAnnotationReader
+     */
+    public function __construct(
+        FieldMetaReader $fieldMetaReader,
+        DocReader $docReader,
+        CacheAnnotationReader $cacheAnnotationReader = null
+    ) {
+        $this->fieldMetaReader = $fieldMetaReader;
+        $this->docReader = $docReader;
+        $this->cacheAnnotationReader = $cacheAnnotationReader ?? \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(CacheAnnotationReader::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
+    {
+        if ($typeMeta instanceof \GraphQL\Type\Definition\UnionType) {
+            $typeName = $typeMeta->name;
+            $types = $typeMeta->getTypes();
+            $result = [
+                'name' => $typeName,
+                'type' => 'graphql_union',
+                'types' => $types,
+            ];
+
+            $unionResolveType = $this->getUnionTypeResolver($typeMeta);
+            if (!empty($unionResolveType)) {
+                $result['resolver'] = $unionResolveType;
+            }
+
+
+            if ($this->docReader->read($typeMeta->astNode->directives)) {
+                $result['description'] = $this->docReader->read($typeMeta->astNode->directives);
+            }
+
+            return $result;
+        } else {
+            return [];
+        }
+    }
+
+    /**
+     * Retrieve the interface type resolver if it exists from the meta data
+     *
+     * @param \GraphQL\Type\Definition\UnionType $unionTypeMeta
+     * @return string
+     */
+    private function getUnionTypeResolver(\GraphQL\Type\Definition\UnionType $unionTypeMeta) : string
+    {
+        /** @var \GraphQL\Language\AST\NodeList $directives */
+        $directives = $unionTypeMeta->astNode->directives;
+        foreach ($directives as $directive) {
+            if ($directive->name->value == 'resolver') {
+                foreach ($directive->arguments as $directiveArgument) {
+                    if ($directiveArgument->name->value == 'class') {
+                        return $directiveArgument->value->value;
+                    }
+                }
+            }
+        }
+        return '';
+    }
+}

From b1159bfcf42bffc284b401b7b474a40371bc5388 Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Tue, 4 Aug 2020 18:53:34 -0500
Subject: [PATCH 1253/1718] - Fixed/ Removed dependencies in schema between
 QuoteGQL, SalesGQL and WishlistGQL

---
 .../Magento/QuoteGraphQl/etc/schema.graphqls    |  8 ++++----
 .../Magento/WishlistGraphQl/etc/schema.graphqls | 17 ++++++++++++++---
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
index 2c6fca1a14b23..a01afabba9683 100644
--- a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -373,18 +373,18 @@ type Order {
     order_id: String @deprecated(reason: "The order_id field is deprecated, use order_number instead.")
 }
 
-type CheckoutUserInputError @doc(description:"An error encountered while adding an item to the the cart.") {
+type CartUserInputError @doc(description:"An error encountered while adding an item to the the cart.") {
     message: String! @doc(description: "A localized error message")
     path: [String]! @doc(description: "Path to the input field that caused an error. See the GraphQL specification about path errors for details: http://spec.graphql.org/draft/#sec-Errors")
-    code: CheckoutUserInputErrorCodes! @doc(description: "Checkout-specific error code")
+    code: CartUserInputErrorType! @doc(description: "Checkout-specific error code")
 }
 
 type AddProductsToCartOutput {
     cart: Cart! @doc(description: "The cart after products have been added")
-    userInputErrors:[CheckoutUserInputError]! @doc(description: "An error encountered while adding an item to the cart.")
+    userInputErrors:[CartUserInputError]! @doc(description: "An error encountered while adding an item to the cart.")
 }
 
-enum CheckoutUserInputErrorCodes {
+enum CartUserInputErrorType {
     PRODUCT_NOT_FOUND
     NOT_SALABLE
     INSUFFICIENT_STOCK
diff --git a/app/code/Magento/WishlistGraphQl/etc/schema.graphqls b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
index c6993367ffbe3..702821fd7af92 100644
--- a/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
@@ -49,12 +49,12 @@ input WishlistItemInput @doc(description: "Defines the items to add to a wish li
 
 type AddProductsToWishlistOutput @doc(description: "Contains the customer's wish list and any errors encountered") {
     wishlist: Wishlist! @doc(description: "Contains the wish list with all items that were successfully added")
-    userInputErrors:[CheckoutUserInputError]! @doc(description: "An array of errors encountered while adding products to a wish list")
+    userInputErrors:[WishListUserInputError]! @doc(description: "An array of errors encountered while adding products to a wish list")
 }
 
 type RemoveProductsFromWishlistOutput @doc(description: "Contains the customer's wish list and any errors encountered") {
     wishlist: Wishlist! @doc(description: "Contains the wish list with after items were successfully deleted")
-    userInputErrors:[CheckoutUserInputError]! @doc(description:"An array of errors encountered while deleting products from a wish list")
+    userInputErrors:[WishListUserInputError]! @doc(description:"An array of errors encountered while deleting products from a wish list")
 }
 
 input WishlistItemUpdateInput @doc(description: "Defines updates to items in a wish list") {
@@ -67,5 +67,16 @@ input WishlistItemUpdateInput @doc(description: "Defines updates to items in a w
 
 type UpdateProductsInWishlistOutput @doc(description: "Contains the customer's wish list and any errors encountered") {
     wishlist: Wishlist! @doc(description: "Contains the wish list with all items that were successfully updated")
-    userInputErrors:[CheckoutUserInputError]! @doc(description:"An array of errors encountered while updating products in a wish list")
+    userInputErrors:[WishListUserInputError]! @doc(description:"An array of errors encountered while updating products in a wish list")
+}
+
+type WishListUserInputError @doc(description:"An error encountered while performing operations with WishList.") {
+    message: String! @doc(description: "A localized error message")
+    path: [String]! @doc(description: "Path to the input field that caused an error. See the GraphQL specification about path errors for details: http://spec.graphql.org/draft/#sec-Errors")
+    code: WishListUserInputErrorType! @doc(description: "Wishlist-specific error code")
+}
+
+enum WishListUserInputErrorType {
+    PRODUCT_NOT_FOUND
+    UNDEFINED
 }

From 201b67bec993a1faa359e31f7212b43980d5cc1e Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Tue, 4 Aug 2020 21:48:07 -0500
Subject: [PATCH 1254/1718] magento/magento2-login-as-customer#144: "Login as
 Customer" functionality should be enabled by default.

---
 app/code/Magento/LoginAsCustomer/composer.json                 | 1 +
 .../Controller/Adminhtml/Login/Login.php                       | 3 ++-
 .../Ui/Customer/Component/Button/DataProvider.php              | 2 --
 .../IsLoginAsCustomerEnabledForCustomerResultInterface.php     | 2 --
 .../Api/IsLoginAsCustomerEnabledForCustomerInterface.php       | 2 --
 .../CustomerData/LoginAsCustomerUi.php                         | 3 ++-
 .../Model/AuthenticateCustomerBySecret.php                     | 3 ++-
 .../LoginAsCustomerFrontendUi/ViewModel/Configuration.php      | 3 ++-
 app/code/Magento/LoginAsCustomerPageCache/composer.json        | 3 ++-
 app/code/Magento/LoginAsCustomerSales/composer.json            | 3 ++-
 10 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomer/composer.json b/app/code/Magento/LoginAsCustomer/composer.json
index ec81374528e7b..e58ec90e8f8bb 100755
--- a/app/code/Magento/LoginAsCustomer/composer.json
+++ b/app/code/Magento/LoginAsCustomer/composer.json
@@ -4,6 +4,7 @@
     "require": {
         "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
+        "magento/module-backend": "*",
         "magento/module-customer": "*",
         "magento/module-login-as-customer-api": "*"
     },
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php b/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php
index 1c2f0cbaa197c..39a7055ed65bb 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php
@@ -131,7 +131,8 @@ public function __construct(
         $this->saveAuthenticationData = $saveAuthenticationData;
         $this->deleteAuthenticationDataForUser = $deleteAuthenticationDataForUser;
         $this->url = $url;
-        $this->setLoggedAsCustomerCustomerId = $setLoggedAsCustomerCustomerId ?? ObjectManager::getInstance()->get(SetLoggedAsCustomerCustomerIdInterface::class);
+        $this->setLoggedAsCustomerCustomerId = $setLoggedAsCustomerCustomerId
+            ?? ObjectManager::getInstance()->get(SetLoggedAsCustomerCustomerIdInterface::class);
         $this->isLoginAsCustomerEnabled = $isLoginAsCustomerEnabled
             ?? ObjectManager::getInstance()->get(IsLoginAsCustomerEnabledForCustomerInterface::class);
     }
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/Button/DataProvider.php b/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/Button/DataProvider.php
index 19db8c67f945e..24a70fc429467 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/Button/DataProvider.php
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/Button/DataProvider.php
@@ -14,8 +14,6 @@
  * Get data for Login as Customer button.
  *
  * Use this class as a base for virtual types declaration.
- *
- * @api
  */
 class DataProvider
 {
diff --git a/app/code/Magento/LoginAsCustomerApi/Api/Data/IsLoginAsCustomerEnabledForCustomerResultInterface.php b/app/code/Magento/LoginAsCustomerApi/Api/Data/IsLoginAsCustomerEnabledForCustomerResultInterface.php
index 4f517fd7f315f..b7d3a616176ef 100644
--- a/app/code/Magento/LoginAsCustomerApi/Api/Data/IsLoginAsCustomerEnabledForCustomerResultInterface.php
+++ b/app/code/Magento/LoginAsCustomerApi/Api/Data/IsLoginAsCustomerEnabledForCustomerResultInterface.php
@@ -9,8 +9,6 @@
 
 /**
  * IsLoginAsCustomerEnabledForCustomerInterface results.
- *
- * @api
  */
 interface IsLoginAsCustomerEnabledForCustomerResultInterface
 {
diff --git a/app/code/Magento/LoginAsCustomerApi/Api/IsLoginAsCustomerEnabledForCustomerInterface.php b/app/code/Magento/LoginAsCustomerApi/Api/IsLoginAsCustomerEnabledForCustomerInterface.php
index 7742bc23e421b..a5355fd4566d5 100644
--- a/app/code/Magento/LoginAsCustomerApi/Api/IsLoginAsCustomerEnabledForCustomerInterface.php
+++ b/app/code/Magento/LoginAsCustomerApi/Api/IsLoginAsCustomerEnabledForCustomerInterface.php
@@ -11,8 +11,6 @@
 
 /**
  * Check if Login as Customer functionality is enabled for Customer.
- *
- * @api
  */
 interface IsLoginAsCustomerEnabledForCustomerInterface
 {
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/CustomerData/LoginAsCustomerUi.php b/app/code/Magento/LoginAsCustomerFrontendUi/CustomerData/LoginAsCustomerUi.php
index 78ac010c965e3..140f31e3467f1 100644
--- a/app/code/Magento/LoginAsCustomerFrontendUi/CustomerData/LoginAsCustomerUi.php
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/CustomerData/LoginAsCustomerUi.php
@@ -48,7 +48,8 @@ public function __construct(
     ) {
         $this->customerSession = $customerSession;
         $this->storeManager = $storeManager;
-        $this->getLoggedAsCustomerAdminId = $getLoggedAsCustomerAdminId ?? ObjectManager::getInstance()->get(GetLoggedAsCustomerAdminIdInterface::class);
+        $this->getLoggedAsCustomerAdminId = $getLoggedAsCustomerAdminId
+            ?? ObjectManager::getInstance()->get(GetLoggedAsCustomerAdminIdInterface::class);
     }
 
     /**
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/Model/AuthenticateCustomerBySecret.php b/app/code/Magento/LoginAsCustomerFrontendUi/Model/AuthenticateCustomerBySecret.php
index 2903016c36ddf..0604d2546ef79 100644
--- a/app/code/Magento/LoginAsCustomerFrontendUi/Model/AuthenticateCustomerBySecret.php
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/Model/AuthenticateCustomerBySecret.php
@@ -48,7 +48,8 @@ public function __construct(
     ) {
         $this->getAuthenticationDataBySecret = $getAuthenticationDataBySecret;
         $this->customerSession = $customerSession;
-        $this->setLoggedAsCustomerAdminId = $setLoggedAsCustomerAdminId ?? ObjectManager::getInstance()->get(SetLoggedAsCustomerAdminIdInterface::class);
+        $this->setLoggedAsCustomerAdminId = $setLoggedAsCustomerAdminId
+            ?? ObjectManager::getInstance()->get(SetLoggedAsCustomerAdminIdInterface::class);
     }
 
     /**
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/ViewModel/Configuration.php b/app/code/Magento/LoginAsCustomerFrontendUi/ViewModel/Configuration.php
index e7a5cd146410e..357ede238585b 100644
--- a/app/code/Magento/LoginAsCustomerFrontendUi/ViewModel/Configuration.php
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/ViewModel/Configuration.php
@@ -45,7 +45,8 @@ public function __construct(
     ) {
         $this->config = $config;
         $this->httpContext = $httpContext;
-        $this->getLoggedAsCustomerAdminId = $getLoggedAsCustomerAdminId ?? ObjectManager::getInstance()->get(GetLoggedAsCustomerAdminIdInterface::class);
+        $this->getLoggedAsCustomerAdminId = $getLoggedAsCustomerAdminId
+            ?? ObjectManager::getInstance()->get(GetLoggedAsCustomerAdminIdInterface::class);
     }
 
     /**
diff --git a/app/code/Magento/LoginAsCustomerPageCache/composer.json b/app/code/Magento/LoginAsCustomerPageCache/composer.json
index 195a08fc19d83..410808f9e79f6 100644
--- a/app/code/Magento/LoginAsCustomerPageCache/composer.json
+++ b/app/code/Magento/LoginAsCustomerPageCache/composer.json
@@ -5,7 +5,8 @@
         "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-customer": "*",
-        "magento/module-store": "*"
+        "magento/module-store": "*",
+        "magento/module-login-as-customer-api": "*"
     },
     "suggest": {
         "magento/module-page-cache": "*"
diff --git a/app/code/Magento/LoginAsCustomerSales/composer.json b/app/code/Magento/LoginAsCustomerSales/composer.json
index 3965e8acf87d8..e93b40e0440c8 100644
--- a/app/code/Magento/LoginAsCustomerSales/composer.json
+++ b/app/code/Magento/LoginAsCustomerSales/composer.json
@@ -6,7 +6,8 @@
         "magento/framework": "*",
         "magento/module-backend": "*",
         "magento/module-customer": "*",
-        "magento/module-user": "*"
+        "magento/module-user": "*",
+        "magento/module-login-as-customer-api": "*"
     },
     "suggest": {
         "magento/module-sales": "*"

From 8b925df01dc81e2f55fe378ad54d15e2a8c128f6 Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Tue, 4 Aug 2020 21:55:01 -0500
Subject: [PATCH 1255/1718] - reverting changes in Sales GraphQL

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

diff --git a/app/code/Magento/SalesGraphQl/etc/schema.graphqls b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
index 717e9c1a00841..218619e0ced34 100644
--- a/app/code/Magento/SalesGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
@@ -224,4 +224,8 @@ type KeyValue @doc(description: "The key-value type") {
 
 enum CheckoutUserInputErrorCodes {
     REORDER_NOT_AVAILABLE
+    PRODUCT_NOT_FOUND
+    NOT_SALABLE
+    INSUFFICIENT_STOCK
+    UNDEFINED
 }

From 00f5d468c2fd86b1c6ccbb8f79cfa75b009d5976 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Tue, 4 Aug 2020 22:33:25 -0500
Subject: [PATCH 1256/1718] magento/magento2-login-as-customer#144: "Login as
 Customer" functionality should be enabled by default.

---
 .../Model/AuthenticateCustomerBySecret.php                   | 2 +-
 .../LoginAsCustomerAdminUi/Plugin/Button/ToolbarPlugin.php   | 5 ++---
 .../Magento/LoginAsCustomerFrontendUi/etc/frontend/di.xml    | 1 -
 app/code/Magento/LoginAsCustomerPageCache/composer.json      | 1 -
 app/code/Magento/LoginAsCustomerSales/composer.json          | 1 -
 5 files changed, 3 insertions(+), 7 deletions(-)
 rename app/code/Magento/{LoginAsCustomerFrontendUi => LoginAsCustomer}/Model/AuthenticateCustomerBySecret.php (97%)

diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/Model/AuthenticateCustomerBySecret.php b/app/code/Magento/LoginAsCustomer/Model/AuthenticateCustomerBySecret.php
similarity index 97%
rename from app/code/Magento/LoginAsCustomerFrontendUi/Model/AuthenticateCustomerBySecret.php
rename to app/code/Magento/LoginAsCustomer/Model/AuthenticateCustomerBySecret.php
index 0604d2546ef79..808b01bac58aa 100644
--- a/app/code/Magento/LoginAsCustomerFrontendUi/Model/AuthenticateCustomerBySecret.php
+++ b/app/code/Magento/LoginAsCustomer/Model/AuthenticateCustomerBySecret.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\LoginAsCustomerFrontendUi\Model;
+namespace Magento\LoginAsCustomer\Model;
 
 use Magento\Customer\Model\Session;
 use Magento\Framework\App\ObjectManager;
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Plugin/Button/ToolbarPlugin.php b/app/code/Magento/LoginAsCustomerAdminUi/Plugin/Button/ToolbarPlugin.php
index 3516a181b5dde..c67b0d9dd5273 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/Plugin/Button/ToolbarPlugin.php
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Plugin/Button/ToolbarPlugin.php
@@ -8,7 +8,6 @@
 namespace Magento\LoginAsCustomerAdminUi\Plugin\Button;
 
 use Magento\Backend\Block\Widget\Button\ButtonList;
-use Magento\Backend\Block\Widget\Button\Toolbar;
 use Magento\Framework\AuthorizationInterface;
 use Magento\Framework\Escaper;
 use Magento\Framework\View\Element\AbstractBlock;
@@ -62,13 +61,13 @@ public function __construct(
     /**
      * Add Login as Customer button.
      *
-     * @param \Magento\Backend\Block\Widget\Button\Toolbar $subject
+     * @param \Magento\Backend\Block\Widget\Button\ToolbarInterface $subject
      * @param \Magento\Framework\View\Element\AbstractBlock $context
      * @param \Magento\Backend\Block\Widget\Button\ButtonList $buttonList
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function beforePushButtons(
-        Toolbar $subject,
+        \Magento\Backend\Block\Widget\Button\ToolbarInterface $subject,
         AbstractBlock $context,
         ButtonList $buttonList
     ): void {
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/etc/frontend/di.xml b/app/code/Magento/LoginAsCustomerFrontendUi/etc/frontend/di.xml
index e42d33383ac42..bff511b6bb6e6 100644
--- a/app/code/Magento/LoginAsCustomerFrontendUi/etc/frontend/di.xml
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/etc/frontend/di.xml
@@ -6,7 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <preference for="Magento\LoginAsCustomerApi\Api\AuthenticateCustomerBySecretInterface" type="Magento\LoginAsCustomerFrontendUi\Model\AuthenticateCustomerBySecret"/>
     <type name="Magento\Customer\CustomerData\SectionPoolInterface">
         <arguments>
             <argument name="sectionSourceMap" xsi:type="array">
diff --git a/app/code/Magento/LoginAsCustomerPageCache/composer.json b/app/code/Magento/LoginAsCustomerPageCache/composer.json
index 410808f9e79f6..84d7f2e2a6730 100644
--- a/app/code/Magento/LoginAsCustomerPageCache/composer.json
+++ b/app/code/Magento/LoginAsCustomerPageCache/composer.json
@@ -4,7 +4,6 @@
     "require": {
         "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
-        "magento/module-customer": "*",
         "magento/module-store": "*",
         "magento/module-login-as-customer-api": "*"
     },
diff --git a/app/code/Magento/LoginAsCustomerSales/composer.json b/app/code/Magento/LoginAsCustomerSales/composer.json
index e93b40e0440c8..3891504e54092 100644
--- a/app/code/Magento/LoginAsCustomerSales/composer.json
+++ b/app/code/Magento/LoginAsCustomerSales/composer.json
@@ -5,7 +5,6 @@
         "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-backend": "*",
-        "magento/module-customer": "*",
         "magento/module-user": "*",
         "magento/module-login-as-customer-api": "*"
     },

From b13e2ba08d2b1caceb532bfcd6c600b6d1faafdc Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 5 Aug 2020 09:11:46 +0300
Subject: [PATCH 1257/1718] minor fix

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

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
index 11349d997a9d0..d4d1a09608904 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml
@@ -60,7 +60,7 @@
 
         <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage1"/>
         <actionGroup ref="SearchProductGridByKeywordActionGroup" stepKey="searchProductGrid">
-            <argument name="keyword" value="{{virtualProductBigQty.name}}"/>
+            <argument name="keyword" value="virtualProductBigQty.name"/>
         </actionGroup>
         <click selector="{{AdminProductGridFilterSection.nthRow('1')}}" stepKey="clickFirstRowToVerifyCreatedVirtualProduct"/>
         <waitForPageLoad stepKey="waitUntilProductIsOpened" />

From cbb9ef7e84fca5644ea4d10832460ac81e065891 Mon Sep 17 00:00:00 2001
From: Stas Kozar <stas.kozar@transoftgroup.com>
Date: Wed, 5 Aug 2020 11:15:20 +0300
Subject: [PATCH 1258/1718] MC-35475: Wrong design for Admin Customer Edit Page
 on Safari browser

---
 .../catalog/product/composite/configure.phtml         | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
index 5ff6f939b4da5..0ee6d19e9fade 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
@@ -38,13 +38,10 @@
     <div id="product_composite_configure_confirmed" class="product_composite_configure_confirmed"></div>
 
     <?php $scriptString = <<<script
-        prodCompConfIframe = document.querySelector("iframe[name='product_composite_configure_iframe']");
-        prodCompConfIframe.style.width = 0;
-        prodCompConfIframe.style.height = 0;
-        prodCompConfIframe.style.border = "0px solid #fff";
-        prodCompConfIframe.style.position = "absolute";
-        prodCompConfIframe.style.top = "-1000px";
-        prodCompConfIframe.style.left = "-1000px";
+        prodCompConfIframe = document.querySelectorAll("iframe[name='product_composite_configure_iframe']");
+        for (var i = 0; i < prodCompConfIframe.length; i++) {
+            prodCompConfIframe[i].style.display = "none";
+        }
         prodCompConfMessages = document.querySelectorAll(".product_composite_configure_messages");
         for (var i = 0; i < prodCompConfMessages.length; i++) {
             prodCompConfMessages[i].style.display = "none";

From 91486f74969ab45c516870e56380eafcec48104e Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 5 Aug 2020 11:28:29 +0300
Subject: [PATCH 1259/1718] MediaGallery Used In filter fixes

---
 .../Listing/Filters/UsedInBlocks.php          | 131 +++++++++++++++++
 .../Component/Listing/Filters/UsedInPages.php | 131 +++++++++++++++++
 .../Listing/Filters/UsedInProducts.php        | 133 ++++++++++++++++++
 .../ui_component/media_gallery_listing.xml    |   1 +
 .../standalone_media_gallery_listing.xml      |   1 +
 .../ui_component/media_gallery_listing.xml    |   2 +
 .../standalone_media_gallery_listing.xml      |   2 +
 .../Controller/Adminhtml/Asset/Search.php     |   4 +-
 .../Ui/Component/Listing/Filters/Asset.php    |  97 ++++++++++++-
 .../adminhtml/web/css/source/_module.less     |   4 +-
 .../adminhtml/web/js/image/image-details.js   |  12 +-
 .../grid/filters/elements/ui-select.html      |   5 +-
 .../web/template/image/image-details.html     |  25 ++--
 13 files changed, 527 insertions(+), 21 deletions(-)
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Filters/UsedInBlocks.php
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Filters/UsedInPages.php
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Filters/UsedInProducts.php

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Filters/UsedInBlocks.php b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Filters/UsedInBlocks.php
new file mode 100644
index 0000000000000..4364ccdb6f324
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Filters/UsedInBlocks.php
@@ -0,0 +1,131 @@
+<?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\MediaContentApi\Api\GetContentByAssetIdsInterface;
+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;
+
+    /**
+     * @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 = [];
+        $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
+              ];
+
+        }
+
+        $this->wrappedComponent = $this->uiComponentFactory->create(
+            $this->getName(),
+            parent::COMPONENT,
+            [
+                'context' => $this->getContext(),
+                'options' => $options
+            ]
+        );
+
+        $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')
+            )
+        );
+
+        $this->applyFilter();
+
+        parent::prepare();
+    }
+}
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Filters/UsedInPages.php b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Filters/UsedInPages.php
new file mode 100644
index 0000000000000..1c00c9272d63d
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Filters/UsedInPages.php
@@ -0,0 +1,131 @@
+<?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\MediaContentApi\Api\GetContentByAssetIdsInterface;
+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;
+
+    /**
+     * @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 = [];
+        $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();
+        $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')
+            )
+        );
+
+        $this->applyFilter();
+
+        parent::prepare();
+    }
+}
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Filters/UsedInProducts.php b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Filters/UsedInProducts.php
new file mode 100644
index 0000000000000..4eefa7827464b
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Filters/UsedInProducts.php
@@ -0,0 +1,133 @@
+<?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\MediaContentApi\Api\GetContentByAssetIdsInterface;
+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;
+
+    /**
+     * @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 = [];
+        $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()];
+                }
+            }
+        }
+
+        foreach ($productIds as $id) {
+            $product = $this->productRepository->getById($id);
+            $options[] = [
+                'value' => $id,
+                'label' => $product->getName(),
+                'is_active' => $product->getStatus(),
+                'path' => $product->getSku(),
+                'optgroup' => false
+
+            ];
+
+        }
+
+        $this->wrappedComponent = $this->uiComponentFactory->create(
+            $this->getName(),
+            parent::COMPONENT,
+            [
+                'context' => $this->getContext(),
+                'options' => $options
+            ]
+        );
+
+        $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')
+            )
+        );
+
+        $this->applyFilter();
+
+        parent::prepare();
+    }
+}
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 97743b458e8d7..2ca58b6020fa7 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,6 +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"
                     template="ui/grid/filters/elements/ui-select">
                 <argument name="data" 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 97743b458e8d7..2ca58b6020fa7 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,6 +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"
                     template="ui/grid/filters/elements/ui-select">
                 <argument name="data" xsi:type="array">
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 509a7e6a53673..506a6cad5b68e 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,6 +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"
                     template="ui/grid/filters/elements/ui-select">
                 <argument name="data" xsi:type="array">
@@ -37,6 +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"
                     template="ui/grid/filters/elements/ui-select">
                 <argument name="data" xsi:type="array">
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 509a7e6a53673..506a6cad5b68e 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,6 +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"
                     template="ui/grid/filters/elements/ui-select">
                 <argument name="data" xsi:type="array">
@@ -37,6 +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"
                     template="ui/grid/filters/elements/ui-select">
                 <argument name="data" xsi:type="array">
diff --git a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/Search.php b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/Search.php
index b4b6713f47065..9b6c08edbc86d 100644
--- a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/Search.php
+++ b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/Search.php
@@ -137,9 +137,9 @@ public function execute()
             if (!empty($assets)) {
                 foreach ($assets as $asset) {
                     $responseContent['options'][] = [
-                        'value' => $asset->getId(),
+                        '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/Ui/Component/Listing/Filters/Asset.php b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Asset.php
index 273cf9e37554b..831b3473ad35d 100644
--- a/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Asset.php
+++ b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Asset.php
@@ -15,17 +15,41 @@
 use Magento\MediaContentApi\Api\GetContentByAssetIdsInterface;
 use Magento\Ui\Component\Filters\FilterModifier;
 use Magento\Ui\Component\Filters\Type\Select;
+use Magento\Ui\Api\BookmarkManagementInterface;
+use Magento\MediaGalleryApi\Api\GetAssetsByIdsInterface;
+use Magento\Cms\Helper\Wysiwyg\Images;
+use Magento\Cms\Model\Wysiwyg\Images\Storage;
 
 /**
- * Asset  filter
+ * Asset filter
  */
 class Asset extends Select
 {
+    /**
+     * @var BookmarkManagementInterface
+     */
+    private $bookmarkManagement;
+
     /**
      * @var GetContentByAssetIdsInterface
      */
     private $getContentIdentities;
 
+    /**
+     * @var GetAssetsByIdsInterface
+     */
+    private $getAssetsByIds;
+
+    /**
+     * @var Images
+     */
+    private $images;
+
+    /**
+     * @var Storage
+     */
+    private $storage;
+
     /**
      * @param ContextInterface $context
      * @param UiComponentFactory $uiComponentFactory
@@ -33,6 +57,10 @@ class Asset extends Select
      * @param FilterModifier $filterModifier
      * @param OptionSourceInterface $optionsProvider
      * @param GetContentByAssetIdsInterface $getContentIdentities
+     * @param BookmarkManagementInterface $bookmarkManagement
+     * @param GetAssetsByIdsInterface $getAssetsByIds
+     * @param Images $images
+     * @param Storage $storage
      * @param array $components
      * @param array $data
      */
@@ -43,6 +71,10 @@ public function __construct(
         FilterModifier $filterModifier,
         OptionSourceInterface $optionsProvider = null,
         GetContentByAssetIdsInterface $getContentIdentities,
+        BookmarkManagementInterface $bookmarkManagement,
+        GetAssetsByIdsInterface $getAssetsByIds,
+        Images $images,
+        Storage $storage,
         array $components = [],
         array $data = []
     ) {
@@ -58,6 +90,69 @@ public function __construct(
             $data
         );
         $this->getContentIdentities = $getContentIdentities;
+        $this->bookmarkManagement = $bookmarkManagement;
+        $this->getAssetsByIds = $getAssetsByIds;
+        $this->images = $images;
+        $this->storage = $storage;
+    }
+
+    /*
+     * Prepare component configuration
+     *
+     * @return void
+     */
+    public function prepare()
+    {
+        $options = [];
+        $assetIds = [];
+        $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()])) {
+                    $assetIds[] = $applied[$this->getName()];
+                }
+            }
+        }
+
+        $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->wrappedComponent = $this->uiComponentFactory->create(
+            $this->getName(),
+            parent::COMPONENT,
+            [
+                'context' => $this->getContext(),
+                'options' => $options
+            ]
+        );
+
+        $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')
+            )
+        );
+
+        $this->applyFilter();
+
+        parent::prepare();
     }
 
     /**
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 671a82dce3f58..29990d1c5a733 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
@@ -29,7 +29,7 @@
         }
     }
 
-    .media-gallery-asset-ui-select-filter {
+    .media-gallery-asset-ui-select-filter, .edit-image-details {
 
         .admin__action-multiselect-crumb {
             max-width: 70%;
@@ -47,7 +47,9 @@
             position: absolute;
             text-overflow: ellipsis;
         }
+    }
 
+    .media-gallery-asset-ui-select-filter, .edit-image-details {
         .admin__action-multiselect-item-path {
             float: right;
             max-height: 70px;
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-details.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-details.js
index d0d37d49329e0..db42f155501c3 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-details.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-details.js
@@ -135,6 +135,16 @@ define([
             return _.isArray(value);
         },
 
+        /**
+         * Is value not empty
+         *
+         * @param {*} value
+         * @returns {Boolean}
+         */
+        notEmpty: function (value) {
+            return value.length > 0;
+        },
+
         /**
          * Get name and number text for used in link
          *
@@ -151,7 +161,7 @@ define([
          * @param {String} link
          */
         getFilterUrl: function (link) {
-            return link + '?filters[asset_id]=' + this.image().id;
+            return link + '?filters[asset_id]=[' + this.image().id + ']';
         },
 
         /**
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..5efec6b2b0778 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
@@ -108,9 +108,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">
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html
index a397bad0af698..db875e0f93f24 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html
@@ -25,19 +25,18 @@ <h3 translate="'Details'"></h3>
             <div class="attributes">
                 <each args="image().details">
                     <div class="attribute"  if="value">
-                        <span class="title" translate="title"></span>
-                        <ifnot args="$parent.isArray(value)">
-                            <div class="value" text="value"></div>
-                        </ifnot>
-                        <if args="$parent.isArray(value)">
-                            <each args="{ data: value, as: 'item'}">
-                                <div class="value">
-                                    <a attr="href: $parents[1].getFilterUrl(item.link)"
-                                       text="$parents[1].getUsedInText(item)"></a>
-                                    </br>
-                                </div>
-                            </each>
-                        </if>
+                      <span if="$parent.notEmpty(value)" class="title" translate="title"></span>
+                      <ifnot args="$parent.isArray(value)">
+                        <div class="value" text="value"></div>
+                      </ifnot>
+                      <if args="$parent.isArray(value)">
+                        <each args="{ data: value, as: 'item'}">
+                          <div class="value">
+                            <a attr="href: $parents[1].getFilterUrl(item.link)"
+                               text="$parents[1].getUsedInText(item)"></a></br>
+                          </div>
+                        </each>
+                      </if>
                     </div>
                 </each>
             </div>

From 613f5fb26200ea55bc3d43cafc78da0b55252083 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 5 Aug 2020 11:33:37 +0300
Subject: [PATCH 1260/1718] Remove emulated area

---
 .../Console/Command/Synchronize.php           | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/MediaGallerySynchronization/Console/Command/Synchronize.php b/app/code/Magento/MediaGallerySynchronization/Console/Command/Synchronize.php
index 992f77a1df319..339aca84ec68f 100644
--- a/app/code/Magento/MediaGallerySynchronization/Console/Command/Synchronize.php
+++ b/app/code/Magento/MediaGallerySynchronization/Console/Command/Synchronize.php
@@ -7,8 +7,6 @@
 
 namespace Magento\MediaGallerySynchronization\Console\Command;
 
-use Magento\Framework\App\Area;
-use Magento\Framework\App\State;
 use Magento\Framework\Console\Cli;
 use Magento\MediaGallerySynchronizationApi\Api\SynchronizeInterface;
 use Symfony\Component\Console\Command\Command;
@@ -25,21 +23,13 @@ class Synchronize extends Command
      */
     private $synchronizeAssets;
 
-    /**
-     * @var State $state
-     */
-    private $state;
-
     /**
      * @param SynchronizeInterface $synchronizeAssets
-     * @param State $state
      */
     public function __construct(
-        SynchronizeInterface $synchronizeAssets,
-        State $state
+        SynchronizeInterface $synchronizeAssets
     ) {
         $this->synchronizeAssets = $synchronizeAssets;
-        $this->state = $state;
         parent::__construct();
     }
 
@@ -60,10 +50,11 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $output->writeln('Synchronizing assets information from media storage to database...');
-        $this->state->emulateAreaCode(Area::AREA_ADMINHTML, function () {
-            $this->synchronizeAssets->execute();
-        });
+
+        $this->synchronizeAssets->execute();
+
         $output->writeln('Completed assets synchronization.');
+
         return Cli::RETURN_SUCCESS;
     }
 }

From ebcdce406ee95ad7f6e9fe796846f99999aa2090 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 5 Aug 2020 11:51:15 +0300
Subject: [PATCH 1261/1718] MFTF tests coverage for Used In links && fix bug
 with category grid urlFIlterApplie

---
 ...alogUiVerifyUsedInLinkCategoryGridTest.xml | 61 +++++++++++++++++++
 .../media_gallery_catalog_category_index.xml  |  5 ++
 ...diaGalleryClickEntityUsedInActionGroup.xml | 22 +++++++
 ...EnhancedMediaGalleryViewDetailsSection.xml |  1 +
 ...ancedMediaGalleryVerifyAssetFilterTest.xml |  6 +-
 .../view/adminhtml/web/js/image/image-edit.js | 27 +++++++-
 6 files changed, 118 insertions(+), 4 deletions(-)
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryClickEntityUsedInActionGroup.xml

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
new file mode 100644
index 0000000000000..ef573afda5bd9
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.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="AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest">
+        <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"/>
+            <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"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
+        <actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectSecondImageToDelete">
+            <argument name="imageName" value="{{UpdatedImageDetails.title}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+        </after>
+
+        <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openCategoryPage"/>
+        <actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="openCategory">
+            <argument name="category" value="$$category$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGalleryFromImageUploader"/>
+        <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="AdminSaveCategoryActionGroup" stepKey="saveCategory"/>
+        <actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGalleryFromImageUploaderToVerifyLink"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetails"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryClickEntityUsedInActionGroup" stepKey="clickUsedInCategories">
+            <argument name="entityName" value="Categories"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryAssertCategoryNameInCategoryGridActionGroup" stepKey="assertCategoryInGrid">
+            <argument name="categoryName" value="$$category.name$$"/>
+        </actionGroup>
+   </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/layout/media_gallery_catalog_category_index.xml b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/layout/media_gallery_catalog_category_index.xml
index 1e195efc1beab..4684f6b30f7a6 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/layout/media_gallery_catalog_category_index.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/layout/media_gallery_catalog_category_index.xml
@@ -11,5 +11,10 @@
         <referenceContainer htmlTag="div" htmlClass="media-gallery-category-container" name="content">
             <uiComponent name="media_gallery_category_listing"/>
         </referenceContainer>
+        <block class="Magento\Backend\Block\Template" template="Magento_Cms::url_filter_applier.phtml" name="category_list_url_filter_applier">
+            <arguments>
+                <argument name="listing_namespace" xsi:type="string">media_gallery_category_listing</argument>
+            </arguments>
+        </block>
     </body>
 </page>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryClickEntityUsedInActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryClickEntityUsedInActionGroup.xml
new file mode 100644
index 0000000000000..ec54d83bd808a
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryClickEntityUsedInActionGroup.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="AdminEnhancedMediaGalleryClickEntityUsedInActionGroup">
+        <annotations>
+            <description>Clicks one Used In section entity</description>
+        </annotations>
+         <arguments>
+            <argument name="entityName" type="string"/>
+        </arguments>
+
+        <click selector="{{AdminEnhancedMediaGalleryViewDetailsSection.usedInLink(entityName)}}" stepKey="openContextMenu"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </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 0bcbeb0d7a00f..048739ed3f81d 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryViewDetailsSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryViewDetailsSection.xml
@@ -20,5 +20,6 @@
         <element name="confirmDelete" type="button" selector=".action-accept"/>
         <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}}')]"/>
     </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 67bb09298893d..bd7e4fcf7a9a2 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyAssetFilterTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyAssetFilterTest.xml
@@ -42,7 +42,7 @@
             </actionGroup>
             <actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
             <actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImage"/>
-            <deleteData createDataKey="category" stepKey="deleteCategory"/>            
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
             <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
         </after>
 
@@ -64,14 +64,14 @@
         <actionGroup ref="AdminMediaGalleryClickOkButtonTinyMce4ActionGroup" stepKey="clickOkButton"/>
         <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveCategory"/>
         <actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openCategoryGridPage"/>
-        
+
         <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="AdminMediaGalleryAssertCategoryNameInCategoryGridActionGroup" stepKey="assertCategoryInGrid">
             <argument name="categoryName" value="$$category.name$$"/>
         </actionGroup>
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..904dcb22e7309 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
@@ -10,7 +10,8 @@ define([
     'uiLayout',
     'Magento_Ui/js/lib/key-codes',
     'Magento_MediaGalleryUi/js/action/getDetails',
-    'mage/validation'
+    'mage/validation',
+    'Magento_Ui/js/lib/view/utils/async'
 ], function ($, _, Component, layout, keyCodes, getDetails) {
     'use strict';
 
@@ -54,9 +55,33 @@ define([
         initialize: function () {
             this._super().initView();
 
+            this.removeMouseOverEvent();
+
             return this;
         },
 
+        /**
+         * Remove mousemove event from ui-select as it deprecated
+         */
+        removeMouseOverEvent: function () {
+
+            if (_.isUndefined(this.keywordsSelect())) {
+                setTimeout(function () {
+                    this.removeMouseOverEvent();
+                }.bind(this), 100);
+
+                return;
+            }
+
+            $.async(
+                this.keywordsSelect().rootListSelector,
+                function () {
+                    $(this.keywordsSelect().rootListSelector).off('mousemove');
+                }.bind(this)
+            );
+
+        },
+
         /**
          * Add a new keyword to select
          */

From 046d0617d549290d2f07f08388ef9d56d4bbf576 Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Wed, 5 Aug 2020 17:51:22 +0800
Subject: [PATCH 1262/1718] magento/adobe-stock-integration#1667:[MFTF] Add a
 column with an edit link to the Category grid - MFTF coverage

---
 ...AdminEditCategoryInGridPageActionGroup.xml | 18 +++++++++++
 ...diaGalleryCatalogUiCategoryGridSection.xml |  3 +-
 ...lleryCatalogUiEditCategoryGridPageTest.xml | 31 +++++++++++++++++++
 3 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminEditCategoryInGridPageActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiEditCategoryGridPageTest.xml

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminEditCategoryInGridPageActionGroup.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminEditCategoryInGridPageActionGroup.xml
new file mode 100644
index 0000000000000..3d74429156b95
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminEditCategoryInGridPageActionGroup.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="AdminEditCategoryInGridPageActionGroup">
+        <annotations>
+            <description>Clicks the Edit action from the Media Gallery Category Grid</description>
+        </annotations>
+        <click selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.edit('2', 'Edit')}}" stepKey="clickOnCategoryRow"/>
+        <waitForPageLoad time="30" stepKey="waitForCategoryDetailsPageLoad"/>
+        <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{SimpleSubCategory.name}}" stepKey="seeCategoryTitle"/>
+    </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 1f1ce05222e7e..5267a215c8edd 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml
@@ -13,5 +13,6 @@
         <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"/>
- </section>
+        <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>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiEditCategoryGridPageTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiEditCategoryGridPageTest.xml
new file mode 100644
index 0000000000000..720b6c531ad39
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiEditCategoryGridPageTest.xml
@@ -0,0 +1,31 @@
+<?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="AdminMediaGalleryCatalogUiEditCategoryGridPageTest">
+        <annotations>
+            <features value="AdminMediaGalleryCategoryGrid"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1667"/>
+            <title value="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"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+        </after>
+        <actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openCategoryPage"/>
+        <actionGroup ref="AdminEditCategoryInGridPageActionGroup" stepKey="editCategoryItem"/>
+   </test>
+</tests>

From 5a717c7699a2d1737605be38e81c03c26eab97be Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 5 Aug 2020 12:51:53 +0300
Subject: [PATCH 1263/1718] Fix static tests

---
 .../Ui/Component/Listing/Filters/UsedInProducts.php    | 10 +++++-----
 .../Ui/Component/Listing/Filters/UsedInBlocks.php      |  6 +++---
 .../Ui/Component/Listing/Filters/UsedInPages.php       | 10 +++++-----
 .../Ui/Component/Listing/Filters/Asset.php             |  5 ++++-
 4 files changed, 17 insertions(+), 14 deletions(-)
 rename app/code/Magento/{MediaGalleryCatalogUi => MediaGalleryCmsUi}/Ui/Component/Listing/Filters/UsedInBlocks.php (98%)
 rename app/code/Magento/{MediaGalleryCatalogUi => MediaGalleryCmsUi}/Ui/Component/Listing/Filters/UsedInPages.php (95%)

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 4eefa7827464b..254ebd047c954 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Filters/UsedInProducts.php
+++ b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Filters/UsedInProducts.php
@@ -12,7 +12,6 @@
 use Magento\Framework\Data\OptionSourceInterface;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
-use Magento\MediaContentApi\Api\GetContentByAssetIdsInterface;
 use Magento\Ui\Component\Filters\FilterModifier;
 use Magento\Ui\Component\Filters\Type\Select;
 use Magento\Ui\Api\BookmarkManagementInterface;
@@ -34,6 +33,8 @@ class UsedInProducts extends Select
     private $productRepository;
 
     /**
+     * Constructor
+     *
      * @param ContextInterface $context
      * @param UiComponentFactory $uiComponentFactory
      * @param FilterBuilder $filterBuilder
@@ -70,7 +71,7 @@ public function __construct(
         $this->productRepository = $productRepository;
     }
 
-    /*
+    /**
      * Prepare component configuration
      *
      * @return void
@@ -99,7 +100,6 @@ public function prepare()
                 'optgroup' => false
 
             ];
-
         }
 
         $this->wrappedComponent = $this->uiComponentFactory->create(
@@ -112,11 +112,11 @@ public function prepare()
         );
 
         $this->wrappedComponent->prepare();
-        $jsConfig = array_replace_recursive(
+        $productsFilterJsConfig = array_replace_recursive(
             $this->getJsConfig($this->wrappedComponent),
             $this->getJsConfig($this)
         );
-        $this->setData('js_config', $jsConfig);
+        $this->setData('js_config', $productsFilterJsConfig);
 
         $this->setData(
             'config',
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Filters/UsedInBlocks.php b/app/code/Magento/MediaGalleryCmsUi/Ui/Component/Listing/Filters/UsedInBlocks.php
similarity index 98%
rename from app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Filters/UsedInBlocks.php
rename to app/code/Magento/MediaGalleryCmsUi/Ui/Component/Listing/Filters/UsedInBlocks.php
index 4364ccdb6f324..09fea24c8a2a9 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Filters/UsedInBlocks.php
+++ b/app/code/Magento/MediaGalleryCmsUi/Ui/Component/Listing/Filters/UsedInBlocks.php
@@ -12,7 +12,6 @@
 use Magento\Framework\Data\OptionSourceInterface;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
-use Magento\MediaContentApi\Api\GetContentByAssetIdsInterface;
 use Magento\Ui\Component\Filters\FilterModifier;
 use Magento\Ui\Component\Filters\Type\Select;
 use Magento\Ui\Api\BookmarkManagementInterface;
@@ -34,6 +33,8 @@ class UsedInBlocks extends Select
     private $blockRepository;
 
     /**
+     * Constructor
+     *
      * @param ContextInterface $context
      * @param UiComponentFactory $uiComponentFactory
      * @param FilterBuilder $filterBuilder
@@ -70,7 +71,7 @@ public function __construct(
         $this->blockRepository = $blockRepository;
     }
 
-    /*
+    /**
      * Prepare component configuration
      *
      * @return void
@@ -97,7 +98,6 @@ public function prepare()
                 'is_active' => $block->isActive(),
                 'optgroup' => false
               ];
-
         }
 
         $this->wrappedComponent = $this->uiComponentFactory->create(
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Filters/UsedInPages.php b/app/code/Magento/MediaGalleryCmsUi/Ui/Component/Listing/Filters/UsedInPages.php
similarity index 95%
rename from app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Filters/UsedInPages.php
rename to app/code/Magento/MediaGalleryCmsUi/Ui/Component/Listing/Filters/UsedInPages.php
index 1c00c9272d63d..235a77cdcb8c5 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Filters/UsedInPages.php
+++ b/app/code/Magento/MediaGalleryCmsUi/Ui/Component/Listing/Filters/UsedInPages.php
@@ -12,7 +12,6 @@
 use Magento\Framework\Data\OptionSourceInterface;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
-use Magento\MediaContentApi\Api\GetContentByAssetIdsInterface;
 use Magento\Ui\Component\Filters\FilterModifier;
 use Magento\Ui\Component\Filters\Type\Select;
 use Magento\Ui\Api\BookmarkManagementInterface;
@@ -34,6 +33,8 @@ class UsedInPages extends Select
     private $pageRepository;
 
     /**
+     * Constructor
+     *
      * @param ContextInterface $context
      * @param UiComponentFactory $uiComponentFactory
      * @param FilterBuilder $filterBuilder
@@ -70,7 +71,7 @@ public function __construct(
         $this->pageRepository = $pageRepository;
     }
 
-    /*
+    /**
      * Prepare component configuration
      *
      * @return void
@@ -97,7 +98,6 @@ public function prepare()
                 'is_active' => $page->isActive(),
                 'optgroup' => false
             ];
-
         }
 
         $this->wrappedComponent = $this->uiComponentFactory->create(
@@ -110,11 +110,11 @@ public function prepare()
         );
 
         $this->wrappedComponent->prepare();
-        $jsConfig = array_replace_recursive(
+        $pagesFilterjsConfig = array_replace_recursive(
             $this->getJsConfig($this->wrappedComponent),
             $this->getJsConfig($this)
         );
-        $this->setData('js_config', $jsConfig);
+        $this->setData('js_config', $pagesFilterjsConfig);
 
         $this->setData(
             'config',
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 831b3473ad35d..ee8bafa7021b2 100644
--- a/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Asset.php
+++ b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Asset.php
@@ -51,6 +51,8 @@ class Asset extends Select
     private $storage;
 
     /**
+     * Constructor
+     *
      * @param ContextInterface $context
      * @param UiComponentFactory $uiComponentFactory
      * @param FilterBuilder $filterBuilder
@@ -63,6 +65,7 @@ class Asset extends Select
      * @param Storage $storage
      * @param array $components
      * @param array $data
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         ContextInterface $context,
@@ -96,7 +99,7 @@ public function __construct(
         $this->storage = $storage;
     }
 
-    /*
+    /**
      * Prepare component configuration
      *
      * @return void

From 66d259ed37ac8d7170012e14efb5df12c562cf13 Mon Sep 17 00:00:00 2001
From: Nikita Shcherbatykh <nikita.shcherbatykh@transoftgroup.com>
Date: Wed, 5 Aug 2020 13:10:22 +0300
Subject: [PATCH 1264/1718] MC-35707: Invoice PDF is not generating in correct
 language

---
 .../Sales/Model/Order/Pdf/Creditmemo.php      |  19 +-
 .../Magento/Sales/Model/Order/Pdf/Invoice.php |  18 +-
 .../Sales/Model/Order/Pdf/Shipment.php        |  18 +-
 .../Unit/Model/Order/Pdf/CreditmemoTest.php   | 200 ++++++++++++++++++
 .../Test/Unit/Model/Order/Pdf/InvoiceTest.php |  29 ++-
 .../Unit/Model/Order/Pdf/ShipmentTest.php     | 200 ++++++++++++++++++
 6 files changed, 463 insertions(+), 21 deletions(-)
 create mode 100644 app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/CreditmemoTest.php
 create mode 100644 app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/ShipmentTest.php

diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Creditmemo.php b/app/code/Magento/Sales/Model/Order/Pdf/Creditmemo.php
index f1430757939e7..cc67601f0ec51 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Creditmemo.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Creditmemo.php
@@ -20,6 +20,11 @@ class Creditmemo extends AbstractPdf
      */
     protected $_storeManager;
 
+    /**
+     * @var \Magento\Store\Model\App\Emulation
+     */
+    private $appEmulation;
+
     /**
      * @param \Magento\Payment\Helper\Data $paymentData
      * @param \Magento\Framework\Stdlib\StringUtils $string
@@ -32,7 +37,7 @@ class Creditmemo extends AbstractPdf
      * @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
      * @param \Magento\Sales\Model\Order\Address\Renderer $addressRenderer
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
+     * @param \Magento\Store\Model\App\Emulation|null $appEmulation
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -50,11 +55,11 @@ public function __construct(
         \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
         \Magento\Sales\Model\Order\Address\Renderer $addressRenderer,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\Locale\ResolverInterface $localeResolver,
+        \Magento\Store\Model\App\Emulation $appEmulation,
         array $data = []
     ) {
         $this->_storeManager = $storeManager;
-        $this->_localeResolver = $localeResolver;
+        $this->appEmulation = $appEmulation;
         parent::__construct(
             $paymentData,
             $string,
@@ -150,7 +155,11 @@ public function getPdf($creditmemos = [])
 
         foreach ($creditmemos as $creditmemo) {
             if ($creditmemo->getStoreId()) {
-                $this->_localeResolver->emulate($creditmemo->getStoreId());
+                $this->appEmulation->startEnvironmentEmulation(
+                    $creditmemo->getStoreId(),
+                    \Magento\Framework\App\Area::AREA_FRONTEND,
+                    true
+                );
                 $this->_storeManager->setCurrentStore($creditmemo->getStoreId());
             }
             $page = $this->newPage();
@@ -185,7 +194,7 @@ public function getPdf($creditmemos = [])
             /* Add totals */
             $this->insertTotals($page, $creditmemo);
             if ($creditmemo->getStoreId()) {
-                $this->_localeResolver->revert();
+                $this->appEmulation->stopEnvironmentEmulation();
             }
         }
         $this->_afterGetPdf();
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Invoice.php b/app/code/Magento/Sales/Model/Order/Pdf/Invoice.php
index f294128a72f9f..d4ce16d1bbe8e 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Invoice.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Invoice.php
@@ -19,9 +19,9 @@ class Invoice extends AbstractPdf
     protected $_storeManager;
 
     /**
-     * @var \Magento\Framework\Locale\ResolverInterface
+     * @var \Magento\Store\Model\App\Emulation
      */
-    protected $_localeResolver;
+    private $appEmulation;
 
     /**
      * @param \Magento\Payment\Helper\Data $paymentData
@@ -35,7 +35,7 @@ class Invoice extends AbstractPdf
      * @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
      * @param \Magento\Sales\Model\Order\Address\Renderer $addressRenderer
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
+     * @param \Magento\Store\Model\App\Emulation $appEmulation
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -52,11 +52,11 @@ public function __construct(
         \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
         \Magento\Sales\Model\Order\Address\Renderer $addressRenderer,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\Locale\ResolverInterface $localeResolver,
+        \Magento\Store\Model\App\Emulation $appEmulation,
         array $data = []
     ) {
         $this->_storeManager = $storeManager;
-        $this->_localeResolver = $localeResolver;
+        $this->appEmulation = $appEmulation;
         parent::__construct(
             $paymentData,
             $string,
@@ -127,7 +127,11 @@ public function getPdf($invoices = [])
 
         foreach ($invoices as $invoice) {
             if ($invoice->getStoreId()) {
-                $this->_localeResolver->emulate($invoice->getStoreId());
+                $this->appEmulation->startEnvironmentEmulation(
+                    $invoice->getStoreId(),
+                    \Magento\Framework\App\Area::AREA_FRONTEND,
+                    true
+                );
                 $this->_storeManager->setCurrentStore($invoice->getStoreId());
             }
             $page = $this->newPage();
@@ -162,7 +166,7 @@ public function getPdf($invoices = [])
             /* Add totals */
             $this->insertTotals($page, $invoice);
             if ($invoice->getStoreId()) {
-                $this->_localeResolver->revert();
+                $this->appEmulation->stopEnvironmentEmulation();
             }
         }
         $this->_afterGetPdf();
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php b/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php
index 32a289c0f5fa8..92124b7fe8b72 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php
@@ -17,9 +17,9 @@ class Shipment extends AbstractPdf
     protected $_storeManager;
 
     /**
-     * @var \Magento\Framework\Locale\ResolverInterface
+     * @var \Magento\Store\Model\App\Emulation
      */
-    protected $_localeResolver;
+    private $appEmulation;
 
     /**
      * @param \Magento\Payment\Helper\Data $paymentData
@@ -33,7 +33,7 @@ class Shipment extends AbstractPdf
      * @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
      * @param \Magento\Sales\Model\Order\Address\Renderer $addressRenderer
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
+     * @param \Magento\Store\Model\App\Emulation $appEmulation
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -50,11 +50,11 @@ public function __construct(
         \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
         \Magento\Sales\Model\Order\Address\Renderer $addressRenderer,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\Locale\ResolverInterface $localeResolver,
+        \Magento\Store\Model\App\Emulation $appEmulation,
         array $data = []
     ) {
         $this->_storeManager = $storeManager;
-        $this->_localeResolver = $localeResolver;
+        $this->appEmulation = $appEmulation;
         parent::__construct(
             $paymentData,
             $string,
@@ -118,7 +118,11 @@ public function getPdf($shipments = [])
         $this->_setFontBold($style, 10);
         foreach ($shipments as $shipment) {
             if ($shipment->getStoreId()) {
-                $this->_localeResolver->emulate($shipment->getStoreId());
+                $this->appEmulation->startEnvironmentEmulation(
+                    $shipment->getStoreId(),
+                    \Magento\Framework\App\Area::AREA_FRONTEND,
+                    true
+                );
                 $this->_storeManager->setCurrentStore($shipment->getStoreId());
             }
             $page = $this->newPage();
@@ -151,7 +155,7 @@ public function getPdf($shipments = [])
                 $page = end($pdf->pages);
             }
             if ($shipment->getStoreId()) {
-                $this->_localeResolver->revert();
+                $this->appEmulation->stopEnvironmentEmulation();
             }
         }
         $this->_afterGetPdf();
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/CreditmemoTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/CreditmemoTest.php
new file mode 100644
index 0000000000000..de1fb1d0faeb3
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/CreditmemoTest.php
@@ -0,0 +1,200 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Test\Unit\Model\Order\Pdf;
+
+use Magento\MediaStorage\Helper\File\Storage\Database;
+use Magento\Sales\Model\Order\Creditmemo;
+use Magento\Sales\Model\Order;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Sales\Model\Order\Address;
+use Magento\Sales\Model\Order\Address\Renderer;
+
+/**
+ * Class CreditmemoTest
+ *
+ * Tests Sales Order Creditmemo PDF model
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class CreditmemoTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Sales\Model\Order\Pdf\Invoice
+     */
+    protected $_model;
+
+    /**
+     * @var \Magento\Sales\Model\Order\Pdf\Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $_pdfConfigMock;
+
+    /**
+     * @var Database|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $databaseMock;
+
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $scopeConfigMock;
+
+    /**
+     * @var \Magento\Framework\Filesystem\Directory\Write|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $directoryMock;
+
+    /**
+     * @var Renderer|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $addressRendererMock;
+
+    /**
+     * @var \Magento\Payment\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $paymentDataMock;
+
+    /**
+     * @var \Magento\Store\Model\App\Emulation
+     */
+    private $appEmulation;
+
+    protected function setUp()
+    {
+        $this->_pdfConfigMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Pdf\Config::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->directoryMock = $this->createMock(\Magento\Framework\Filesystem\Directory\Write::class);
+        $this->directoryMock->expects($this->any())->method('getAbsolutePath')->will(
+            $this->returnCallback(
+                function ($argument) {
+                    return BP . '/' . $argument;
+                }
+            )
+        );
+        $filesystemMock = $this->createMock(\Magento\Framework\Filesystem::class);
+        $filesystemMock->expects($this->any())
+            ->method('getDirectoryRead')
+            ->will($this->returnValue($this->directoryMock));
+        $filesystemMock->expects($this->any())
+            ->method('getDirectoryWrite')
+            ->will($this->returnValue($this->directoryMock));
+
+        $this->databaseMock = $this->createMock(Database::class);
+        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
+        $this->addressRendererMock = $this->createMock(Renderer::class);
+        $this->paymentDataMock = $this->createMock(\Magento\Payment\Helper\Data::class);
+        $this->appEmulation = $this->createMock(\Magento\Store\Model\App\Emulation::class);
+
+        $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->_model = $helper->getObject(
+            \Magento\Sales\Model\Order\Pdf\Creditmemo::class,
+            [
+                'filesystem' => $filesystemMock,
+                'pdfConfig' => $this->_pdfConfigMock,
+                'fileStorageDatabase' => $this->databaseMock,
+                'scopeConfig' => $this->scopeConfigMock,
+                'addressRenderer' => $this->addressRendererMock,
+                'string' => new \Magento\Framework\Stdlib\StringUtils(),
+                'paymentData' => $this->paymentDataMock,
+                'appEmulation' => $this->appEmulation
+            ]
+        );
+    }
+
+    public function testInsertLogoDatabaseMediaStorage()
+    {
+        $filename = 'image.jpg';
+        $path = '/sales/store/logo/';
+        $storeId = 1;
+
+        $this->appEmulation->expects($this->once())
+            ->method('startEnvironmentEmulation')
+            ->with(
+                $storeId,
+                \Magento\Framework\App\Area::AREA_FRONTEND,
+                true
+            )
+            ->willReturnSelf();
+        $this->appEmulation->expects($this->once())
+            ->method('stopEnvironmentEmulation')
+            ->willReturnSelf();
+        $this->_pdfConfigMock->expects($this->once())
+            ->method('getRenderersPerProduct')
+            ->with('creditmemo')
+            ->will($this->returnValue(['product_type_one' => 'Renderer_Type_One_Product_One']));
+        $this->_pdfConfigMock->expects($this->any())
+            ->method('getTotals')
+            ->will($this->returnValue([]));
+
+        $block = $this->getMockBuilder(\Magento\Framework\View\Element\Template::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setIsSecureMode','toPdf'])
+            ->getMock();
+        $block->expects($this->any())
+            ->method('setIsSecureMode')
+            ->willReturn($block);
+        $block->expects($this->any())
+            ->method('toPdf')
+            ->will($this->returnValue(''));
+        $this->paymentDataMock->expects($this->any())
+            ->method('getInfoBlock')
+            ->willReturn($block);
+
+        $this->addressRendererMock->expects($this->any())
+            ->method('format')
+            ->will($this->returnValue(''));
+
+        $this->databaseMock->expects($this->any())
+            ->method('checkDbUsage')
+            ->will($this->returnValue(true));
+
+        $creditmemoMock = $this->createMock(Creditmemo::class);
+        $orderMock = $this->createMock(Order::class);
+        $addressMock = $this->createMock(Address::class);
+        $orderMock->expects($this->any())
+            ->method('getBillingAddress')
+            ->willReturn($addressMock);
+        $orderMock->expects($this->any())
+            ->method('getIsVirtual')
+            ->will($this->returnValue(true));
+        $infoMock = $this->createMock(\Magento\Payment\Model\InfoInterface::class);
+        $orderMock->expects($this->any())
+            ->method('getPayment')
+            ->willReturn($infoMock);
+        $creditmemoMock->expects($this->any())
+            ->method('getStoreId')
+            ->willReturn($storeId);
+        $creditmemoMock->expects($this->any())
+            ->method('getOrder')
+            ->willReturn($orderMock);
+        $creditmemoMock->expects($this->any())
+            ->method('getAllItems')
+            ->willReturn([]);
+
+        $this->scopeConfigMock->expects($this->at(0))
+            ->method('getValue')
+            ->with('sales/identity/logo', \Magento\Store\Model\ScopeInterface::SCOPE_STORE, null)
+            ->will($this->returnValue($filename));
+        $this->scopeConfigMock->expects($this->at(1))
+            ->method('getValue')
+            ->with('sales/identity/address', \Magento\Store\Model\ScopeInterface::SCOPE_STORE, null)
+            ->will($this->returnValue(''));
+
+        $this->directoryMock->expects($this->any())
+            ->method('isFile')
+            ->with($path . $filename)
+            ->willReturnOnConsecutiveCalls(
+                $this->returnValue(false),
+                $this->returnValue(false)
+            );
+
+        $this->databaseMock->expects($this->once())
+            ->method('saveFileToFilesystem')
+            ->with($path . $filename);
+
+        $this->_model->getPdf([$creditmemoMock]);
+    }
+}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/InvoiceTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/InvoiceTest.php
index 9254abee50175..b628ffc48f81a 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/InvoiceTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/InvoiceTest.php
@@ -21,11 +21,14 @@
 use Magento\Sales\Model\Order\Address\Renderer;
 use Magento\Sales\Model\Order\Invoice;
 use Magento\Sales\Model\Order\Pdf\Config;
+use Magento\Store\Model\App\Emulation;
 use Magento\Store\Model\ScopeInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 /**
+ *
+ * Tests Sales Order Invoice PDF model
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -66,6 +69,11 @@ class InvoiceTest extends TestCase
      */
     protected $paymentDataMock;
 
+    /**
+     * @var Emulation
+     */
+    private $appEmulation;
+
     protected function setUp(): void
     {
         $this->_pdfConfigMock = $this->getMockBuilder(Config::class)
@@ -89,6 +97,7 @@ function ($argument) {
         $this->scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
         $this->addressRendererMock = $this->createMock(Renderer::class);
         $this->paymentDataMock = $this->createMock(Data::class);
+        $this->appEmulation = $this->createMock(Emulation::class);
 
         $helper = new ObjectManager($this);
         $this->_model = $helper->getObject(
@@ -100,7 +109,8 @@ function ($argument) {
                 'scopeConfig' => $this->scopeConfigMock,
                 'addressRenderer' => $this->addressRendererMock,
                 'string' => new StringUtils(),
-                'paymentData' => $this->paymentDataMock
+                'paymentData' => $this->paymentDataMock,
+                'appEmulation' => $this->appEmulation
             ]
         );
     }
@@ -136,7 +146,19 @@ public function testInsertLogoDatabaseMediaStorage()
     {
         $filename = 'image.jpg';
         $path = '/sales/store/logo/';
-
+        $storeId = 1;
+
+        $this->appEmulation->expects($this->once())
+            ->method('startEnvironmentEmulation')
+            ->with(
+                $storeId,
+                \Magento\Framework\App\Area::AREA_FRONTEND,
+                true
+            )
+            ->willReturnSelf();
+        $this->appEmulation->expects($this->once())
+            ->method('stopEnvironmentEmulation')
+            ->willReturnSelf();
         $this->_pdfConfigMock->expects($this->once())
             ->method('getRenderersPerProduct')
             ->with('invoice')
@@ -180,6 +202,9 @@ public function testInsertLogoDatabaseMediaStorage()
         $orderMock->expects($this->any())
             ->method('getPayment')
             ->willReturn($infoMock);
+        $invoiceMock->expects($this->any())
+            ->method('getStoreId')
+            ->willReturn($storeId);
         $invoiceMock->expects($this->any())
             ->method('getOrder')
             ->willReturn($orderMock);
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/ShipmentTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/ShipmentTest.php
new file mode 100644
index 0000000000000..417162378ff95
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/ShipmentTest.php
@@ -0,0 +1,200 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sales\Test\Unit\Model\Order\Pdf;
+
+use Magento\MediaStorage\Helper\File\Storage\Database;
+use Magento\Sales\Model\Order\Shipment;
+use Magento\Sales\Model\Order;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Sales\Model\Order\Address;
+use Magento\Sales\Model\Order\Address\Renderer;
+
+/**
+ * Class ShipmentTest
+ *
+ * Tests Sales Order Shipment PDF model
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ShipmentTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Sales\Model\Order\Pdf\Invoice
+     */
+    protected $_model;
+
+    /**
+     * @var \Magento\Sales\Model\Order\Pdf\Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $_pdfConfigMock;
+
+    /**
+     * @var Database|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $databaseMock;
+
+    /**
+     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $scopeConfigMock;
+
+    /**
+     * @var \Magento\Framework\Filesystem\Directory\Write|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $directoryMock;
+
+    /**
+     * @var Renderer|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $addressRendererMock;
+
+    /**
+     * @var \Magento\Payment\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $paymentDataMock;
+
+    /**
+     * @var \Magento\Store\Model\App\Emulation
+     */
+    private $appEmulation;
+
+    protected function setUp()
+    {
+        $this->_pdfConfigMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Pdf\Config::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->directoryMock = $this->createMock(\Magento\Framework\Filesystem\Directory\Write::class);
+        $this->directoryMock->expects($this->any())->method('getAbsolutePath')->will(
+            $this->returnCallback(
+                function ($argument) {
+                    return BP . '/' . $argument;
+                }
+            )
+        );
+        $filesystemMock = $this->createMock(\Magento\Framework\Filesystem::class);
+        $filesystemMock->expects($this->any())
+            ->method('getDirectoryRead')
+            ->will($this->returnValue($this->directoryMock));
+        $filesystemMock->expects($this->any())
+            ->method('getDirectoryWrite')
+            ->will($this->returnValue($this->directoryMock));
+
+        $this->databaseMock = $this->createMock(Database::class);
+        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
+        $this->addressRendererMock = $this->createMock(Renderer::class);
+        $this->paymentDataMock = $this->createMock(\Magento\Payment\Helper\Data::class);
+        $this->appEmulation = $this->createMock(\Magento\Store\Model\App\Emulation::class);
+
+        $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->_model = $helper->getObject(
+            \Magento\Sales\Model\Order\Pdf\Shipment::class,
+            [
+                'filesystem' => $filesystemMock,
+                'pdfConfig' => $this->_pdfConfigMock,
+                'fileStorageDatabase' => $this->databaseMock,
+                'scopeConfig' => $this->scopeConfigMock,
+                'addressRenderer' => $this->addressRendererMock,
+                'string' => new \Magento\Framework\Stdlib\StringUtils(),
+                'paymentData' => $this->paymentDataMock,
+                'appEmulation' => $this->appEmulation
+            ]
+        );
+    }
+
+    public function testInsertLogoDatabaseMediaStorage()
+    {
+        $filename = 'image.jpg';
+        $path = '/sales/store/logo/';
+        $storeId = 1;
+
+        $this->appEmulation->expects($this->once())
+            ->method('startEnvironmentEmulation')
+            ->with(
+                $storeId,
+                \Magento\Framework\App\Area::AREA_FRONTEND,
+                true
+            )
+            ->willReturnSelf();
+        $this->appEmulation->expects($this->once())
+            ->method('stopEnvironmentEmulation')
+            ->willReturnSelf();
+        $this->_pdfConfigMock->expects($this->once())
+            ->method('getRenderersPerProduct')
+            ->with('shipment')
+            ->will($this->returnValue(['product_type_one' => 'Renderer_Type_One_Product_One']));
+        $this->_pdfConfigMock->expects($this->any())
+            ->method('getTotals')
+            ->will($this->returnValue([]));
+
+        $block = $this->getMockBuilder(\Magento\Framework\View\Element\Template::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setIsSecureMode','toPdf'])
+            ->getMock();
+        $block->expects($this->any())
+            ->method('setIsSecureMode')
+            ->willReturn($block);
+        $block->expects($this->any())
+            ->method('toPdf')
+            ->will($this->returnValue(''));
+        $this->paymentDataMock->expects($this->any())
+            ->method('getInfoBlock')
+            ->willReturn($block);
+
+        $this->addressRendererMock->expects($this->any())
+            ->method('format')
+            ->will($this->returnValue(''));
+
+        $this->databaseMock->expects($this->any())
+            ->method('checkDbUsage')
+            ->will($this->returnValue(true));
+
+        $shipmentMock = $this->createMock(Shipment::class);
+        $orderMock = $this->createMock(Order::class);
+        $addressMock = $this->createMock(Address::class);
+        $orderMock->expects($this->any())
+            ->method('getBillingAddress')
+            ->willReturn($addressMock);
+        $orderMock->expects($this->any())
+            ->method('getIsVirtual')
+            ->will($this->returnValue(true));
+        $infoMock = $this->createMock(\Magento\Payment\Model\InfoInterface::class);
+        $orderMock->expects($this->any())
+            ->method('getPayment')
+            ->willReturn($infoMock);
+        $shipmentMock->expects($this->any())
+            ->method('getStoreId')
+            ->willReturn($storeId);
+        $shipmentMock->expects($this->any())
+            ->method('getOrder')
+            ->willReturn($orderMock);
+        $shipmentMock->expects($this->any())
+            ->method('getAllItems')
+            ->willReturn([]);
+
+        $this->scopeConfigMock->expects($this->at(0))
+            ->method('getValue')
+            ->with('sales/identity/logo', \Magento\Store\Model\ScopeInterface::SCOPE_STORE, null)
+            ->will($this->returnValue($filename));
+        $this->scopeConfigMock->expects($this->at(1))
+            ->method('getValue')
+            ->with('sales/identity/address', \Magento\Store\Model\ScopeInterface::SCOPE_STORE, null)
+            ->will($this->returnValue(''));
+
+        $this->directoryMock->expects($this->any())
+            ->method('isFile')
+            ->with($path . $filename)
+            ->willReturnOnConsecutiveCalls(
+                $this->returnValue(false),
+                $this->returnValue(false)
+            );
+
+        $this->databaseMock->expects($this->once())
+            ->method('saveFileToFilesystem')
+            ->with($path . $filename);
+
+        $this->_model->getPdf([$shipmentMock]);
+    }
+}

From 0cb553cb0d22d3564bc29205290fc55f4c8eb5ab Mon Sep 17 00:00:00 2001
From: Nikita Shcherbatykh <nikita.shcherbatykh@transoftgroup.com>
Date: Wed, 5 Aug 2020 13:29:22 +0300
Subject: [PATCH 1265/1718] =?UTF-8?q?MC-36252:=20Unexpected=20behavior=20o?=
 =?UTF-8?q?f=20=20=E2=80=9CManage=20Shopping=20Cart=E2=80=9D=20regarding?=
 =?UTF-8?q?=20"Products=20in=20the=20Comparison=20List"=20and=20"Recently?=
 =?UTF-8?q?=20Compared=20Products=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Backend/Block/Widget/Grid/Extended.php    | 24 ++++++++++++++-----
 .../Unit/Block/Widget/Grid/ExtendedTest.php   |  4 ++--
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Extended.php b/app/code/Magento/Backend/Block/Widget/Grid/Extended.php
index 40e87171e82cc..539b208436e87 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Extended.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Extended.php
@@ -8,6 +8,8 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 
 /**
+ * Extended Grid Widget
+ *
  * @api
  * @deprecated 100.2.0 in favour of UI component implementation
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
@@ -177,7 +179,10 @@ class Extended extends \Magento\Backend\Block\Widget\Grid implements \Magento\Ba
     protected $_path = 'export';
 
     /**
+     * Initialization
+     *
      * @return void
+     * @throws \Magento\Framework\Exception\FileSystemException
      */
     protected function _construct()
     {
@@ -297,6 +302,7 @@ public function addColumn($columnId, $column)
             );
             $this->getColumnSet()->getChildBlock($columnId)->setGrid($this);
         } else {
+            // phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception(__('Please correct the column format and try again.'));
         }
 
@@ -471,10 +477,6 @@ protected function _prepareMassactionColumn()
     protected function _prepareCollection()
     {
         if ($this->getCollection()) {
-            if ($this->getCollection()->isLoaded()) {
-                $this->getCollection()->clear();
-            }
-
             parent::_prepareCollection();
 
             if (!$this->_isExport) {
@@ -663,6 +665,7 @@ public function setEmptyCellLabel($label)
      */
     public function getRowUrl($item)
     {
+        // phpstan:ignore "Call to an undefined static method"
         $res = parent::getRowUrl($item);
         return $res ? $res : '#';
     }
@@ -680,6 +683,7 @@ public function getMultipleRows($item)
 
     /**
      * Retrieve columns for multiple rows
+     *
      * @return array
      */
     public function getMultipleRowColumns()
@@ -943,6 +947,7 @@ protected function _getExportTotals()
 
     /**
      * Iterate collection and call callback method per item
+     *
      * For callback method first argument always is item object
      *
      * @param string $callback
@@ -972,7 +977,12 @@ public function _exportIterateCollection($callback, array $args)
             $page++;
 
             foreach ($collection as $item) {
-                call_user_func_array([$this, $callback], array_merge([$item], $args));
+                //phpcs:ignore Magento2.Functions.DiscouragedFunction
+                call_user_func_array(
+                    [$this, $callback],
+                    // phpcs:ignore Magento2.Performance.ForeachArrayMerge
+                    array_merge([$item], $args)
+                );
             }
         }
     }
@@ -1009,6 +1019,7 @@ public function getCsvFile()
         $this->_isExport = true;
         $this->_prepareGrid();
 
+        // phpcs:ignore Magento2.Security.InsecureFunction
         $name = md5(microtime());
         $file = $this->_path . '/' . $name . '.csv';
 
@@ -1153,6 +1164,7 @@ public function getExcelFile($sheetName = '')
             [$this, 'getRowRecord']
         );
 
+        // phpcs:ignore Magento2.Security.InsecureFunction
         $name = md5(microtime());
         $file = $this->_path . '/' . $name . '.xml';
 
@@ -1244,7 +1256,7 @@ public function setCollection($collection)
     }
 
     /**
-     * get collection object
+     * Get collection object
      *
      * @return \Magento\Framework\Data\Collection
      */
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ExtendedTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ExtendedTest.php
index deb9c300f41b8..b841ad271ac43 100644
--- a/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ExtendedTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ExtendedTest.php
@@ -41,8 +41,8 @@ public function testPrepareLoadedCollection()
         $layout->expects($this->any())->method('getBlock')->willReturn($columnSet);
 
         $collection = $this->createMock(Collection::class);
-        $collection->expects($this->atLeastOnce())->method('isLoaded')->willReturn(true);
-        $collection->expects($this->atLeastOnce())->method('clear');
+        $collection->expects($this->never())->method('isLoaded');
+        $collection->expects($this->never())->method('clear');
         $collection->expects($this->atLeastOnce())->method('load');
 
         /** @var Extended $block */

From 1a7149b25eea1e0419ee06b9bcbf111c5c41e56e Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Wed, 5 Aug 2020 11:33:13 +0100
Subject: [PATCH 1266/1718] magento/adobe-stock-integration#1725: Applied Media
 modules review suggestions

---
 .../Api/SynchronizerInterface.php             | 21 -----------
 .../Model/SynchronizerPool.php                | 12 +++----
 .../Model/Synchronizer/Category.php           |  4 +--
 .../Model/Synchronizer/Product.php            |  4 +--
 .../Model/Synchronizer/Block.php              |  4 +--
 .../Model/Synchronizer/Page.php               |  4 +--
 .../Model/File/ExtractMetadata.php            | 21 +----------
 .../Model/CreateAssetFromFile.php             |  8 ++---
 .../Model/GetContentHash.php                  |  4 +--
 .../Integration/Model/GetContentHashTest.php  | 10 +++---
 .../MediaGallerySynchronization/etc/di.xml    |  1 -
 .../Model/GetContentHashInterface.php         | 22 ------------
 .../Listing/Filters/Options/UsedIn.php        | 36 +++++++++++--------
 .../MediaGalleryUi/etc/adminhtml/di.xml       | 26 --------------
 14 files changed, 47 insertions(+), 130 deletions(-)
 delete mode 100644 app/code/Magento/MediaContentSynchronizationApi/Api/SynchronizerInterface.php
 delete mode 100644 app/code/Magento/MediaGallerySynchronizationApi/Model/GetContentHashInterface.php

diff --git a/app/code/Magento/MediaContentSynchronizationApi/Api/SynchronizerInterface.php b/app/code/Magento/MediaContentSynchronizationApi/Api/SynchronizerInterface.php
deleted file mode 100644
index 97ffbbe966d6a..0000000000000
--- a/app/code/Magento/MediaContentSynchronizationApi/Api/SynchronizerInterface.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\MediaContentSynchronizationApi\Api;
-
-/**
- * Synchronize assets and contents
- */
-interface SynchronizerInterface
-{
-    /**
-     * Synchronize assets and contents
-     *
-     * @throws \Magento\Framework\Exception\LocalizedException
-     */
-    public function execute(): void;
-}
diff --git a/app/code/Magento/MediaContentSynchronizationApi/Model/SynchronizerPool.php b/app/code/Magento/MediaContentSynchronizationApi/Model/SynchronizerPool.php
index 6d137d0c0deca..ca18214201c6a 100644
--- a/app/code/Magento/MediaContentSynchronizationApi/Model/SynchronizerPool.php
+++ b/app/code/Magento/MediaContentSynchronizationApi/Model/SynchronizerPool.php
@@ -7,7 +7,7 @@
 
 namespace Magento\MediaContentSynchronizationApi\Model;
 
-use Magento\MediaContentSynchronizationApi\Api\SynchronizerInterface;
+use Magento\MediaContentSynchronizationApi\Api\SynchronizeInterface;
 
 /**
  * A pool that handles content and assets synchronization.
@@ -18,20 +18,20 @@ class SynchronizerPool
     /**
      * Content with assets synchronizers
      *
-     * @var SynchronizerInterface[]
+     * @var SynchronizeInterface[]
      */
     private $synchronizers;
 
     /**
-     * @param SynchronizerInterface[] $synchronizers
+     * @param SynchronizeInterface[] $synchronizers
      */
     public function __construct(
         array $synchronizers = []
     ) {
         foreach ($synchronizers as $synchronizer) {
-            if (!$synchronizer instanceof SynchronizerInterface) {
+            if (!$synchronizer instanceof SynchronizeInterface) {
                 throw new \InvalidArgumentException(
-                    get_class($synchronizer) . ' must implement ' . SynchronizerInterface::class
+                    get_class($synchronizer) . ' must implement ' . SynchronizeInterface::class
                 );
             }
         }
@@ -42,7 +42,7 @@ public function __construct(
     /**
      * Get all synchronizers from the pool
      *
-     * @return SynchronizerInterface[]
+     * @return SynchronizeInterface[]
      */
     public function get(): array
     {
diff --git a/app/code/Magento/MediaContentSynchronizationCatalog/Model/Synchronizer/Category.php b/app/code/Magento/MediaContentSynchronizationCatalog/Model/Synchronizer/Category.php
index 665a22b045e44..6b8f99ee6721c 100644
--- a/app/code/Magento/MediaContentSynchronizationCatalog/Model/Synchronizer/Category.php
+++ b/app/code/Magento/MediaContentSynchronizationCatalog/Model/Synchronizer/Category.php
@@ -10,13 +10,13 @@
 use Magento\MediaContentApi\Api\Data\ContentIdentityInterfaceFactory;
 use Magento\MediaContentApi\Api\UpdateContentAssetLinksInterface;
 use Magento\MediaContentApi\Model\GetEntityContentsInterface;
-use Magento\MediaContentSynchronizationApi\Api\SynchronizerInterface;
+use Magento\MediaContentSynchronizationApi\Api\SynchronizeInterface;
 use Magento\MediaGallerySynchronizationApi\Model\FetchBatchesInterface;
 
 /**
  * Synchronize category content with assets
  */
-class Category implements SynchronizerInterface
+class Category implements SynchronizeInterface
 {
     private const CONTENT_TYPE = 'catalog_category';
     private const TYPE = 'entityType';
diff --git a/app/code/Magento/MediaContentSynchronizationCatalog/Model/Synchronizer/Product.php b/app/code/Magento/MediaContentSynchronizationCatalog/Model/Synchronizer/Product.php
index 5d72399752602..486f3482b592d 100644
--- a/app/code/Magento/MediaContentSynchronizationCatalog/Model/Synchronizer/Product.php
+++ b/app/code/Magento/MediaContentSynchronizationCatalog/Model/Synchronizer/Product.php
@@ -10,13 +10,13 @@
 use Magento\MediaContentApi\Api\Data\ContentIdentityInterfaceFactory;
 use Magento\MediaContentApi\Api\UpdateContentAssetLinksInterface;
 use Magento\MediaContentApi\Model\GetEntityContentsInterface;
-use Magento\MediaContentSynchronizationApi\Api\SynchronizerInterface;
+use Magento\MediaContentSynchronizationApi\Api\SynchronizeInterface;
 use Magento\MediaGallerySynchronizationApi\Model\FetchBatchesInterface;
 
 /**
  * Synchronize product content with assets
  */
-class Product implements SynchronizerInterface
+class Product implements SynchronizeInterface
 {
     private const CONTENT_TYPE = 'catalog_product';
     private const TYPE = 'entityType';
diff --git a/app/code/Magento/MediaContentSynchronizationCms/Model/Synchronizer/Block.php b/app/code/Magento/MediaContentSynchronizationCms/Model/Synchronizer/Block.php
index 73586c8daf7f3..c3da5d4ae5785 100644
--- a/app/code/Magento/MediaContentSynchronizationCms/Model/Synchronizer/Block.php
+++ b/app/code/Magento/MediaContentSynchronizationCms/Model/Synchronizer/Block.php
@@ -9,13 +9,13 @@
 
 use Magento\MediaContentApi\Api\Data\ContentIdentityInterfaceFactory;
 use Magento\MediaContentApi\Api\UpdateContentAssetLinksInterface;
-use Magento\MediaContentSynchronizationApi\Api\SynchronizerInterface;
+use Magento\MediaContentSynchronizationApi\Api\SynchronizeInterface;
 use Magento\MediaGallerySynchronizationApi\Model\FetchBatchesInterface;
 
 /**
  * Synchronize block content with assets
  */
-class Block implements SynchronizerInterface
+class Block implements SynchronizeInterface
 {
     private const CONTENT_TYPE = 'cms_block';
     private const TYPE = 'entityType';
diff --git a/app/code/Magento/MediaContentSynchronizationCms/Model/Synchronizer/Page.php b/app/code/Magento/MediaContentSynchronizationCms/Model/Synchronizer/Page.php
index dcc855940d157..2d1b04d295973 100644
--- a/app/code/Magento/MediaContentSynchronizationCms/Model/Synchronizer/Page.php
+++ b/app/code/Magento/MediaContentSynchronizationCms/Model/Synchronizer/Page.php
@@ -9,13 +9,13 @@
 
 use Magento\MediaContentApi\Api\Data\ContentIdentityInterfaceFactory;
 use Magento\MediaContentApi\Api\UpdateContentAssetLinksInterface;
-use Magento\MediaContentSynchronizationApi\Api\SynchronizerInterface;
+use Magento\MediaContentSynchronizationApi\Api\SynchronizeInterface;
 use Magento\MediaGallerySynchronizationApi\Model\FetchBatchesInterface;
 
 /**
  * Synchronize page content with assets
  */
-class Page implements SynchronizerInterface
+class Page implements SynchronizeInterface
 {
     private const CONTENT_TYPE = 'cms_page';
     private const TYPE = 'entityType';
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/File/ExtractMetadata.php b/app/code/Magento/MediaGalleryMetadata/Model/File/ExtractMetadata.php
index d9a8202281fff..00f2b07f5bb81 100644
--- a/app/code/Magento/MediaGalleryMetadata/Model/File/ExtractMetadata.php
+++ b/app/code/Magento/MediaGalleryMetadata/Model/File/ExtractMetadata.php
@@ -66,31 +66,12 @@ public function __construct(
     public function execute(string $path): MetadataInterface
     {
         try {
-            return $this->extractMetadata($path);
+            return $this->readSegments($this->fileReader->execute($path));
         } catch (\Exception $exception) {
             return $this->metadataFactory->create();
         }
     }
 
-    /**
-     * Extract metadata from file
-     *
-     * @param string $path
-     * @return MetadataInterface
-     */
-    private function extractMetadata(string $path): MetadataInterface
-    {
-        try {
-            $file = $this->fileReader->execute($path);
-        } catch (\Exception $exception) {
-            throw new LocalizedException(
-                __('Could not parse the image file for metadata: %path', ['path' => $path])
-            );
-        }
-
-        return $this->readSegments($file);
-    }
-
     /**
      * Read  file segments by given segmentReader
      *
diff --git a/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php b/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php
index 3305c5e54b861..87d477507b680 100644
--- a/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php
+++ b/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php
@@ -17,7 +17,7 @@
 use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
 use Magento\MediaGalleryMetadataApi\Api\ExtractMetadataInterface;
 use Magento\MediaGallerySynchronization\Model\Filesystem\SplFileInfoFactory;
-use Magento\MediaGallerySynchronizationApi\Model\GetContentHashInterface;
+use Magento\MediaGallerySynchronization\Model\GetContentHash;
 
 /**
  * Create media asset object based on the file information
@@ -50,7 +50,7 @@ class CreateAssetFromFile
     private $assetFactory;
 
     /**
-     * @var GetContentHashInterface
+     * @var GetContentHash
      */
     private $getContentHash;
 
@@ -69,7 +69,7 @@ class CreateAssetFromFile
      * @param File $driver
      * @param TimezoneInterface $date
      * @param AssetInterfaceFactory $assetFactory
-     * @param GetContentHashInterface $getContentHash
+     * @param GetContentHash $getContentHash
      * @param ExtractMetadataInterface $extractMetadata
      * @param SplFileInfoFactory $splFileInfoFactory
      */
@@ -78,7 +78,7 @@ public function __construct(
         File $driver,
         TimezoneInterface $date,
         AssetInterfaceFactory $assetFactory,
-        GetContentHashInterface $getContentHash,
+        GetContentHash $getContentHash,
         ExtractMetadataInterface $extractMetadata,
         SplFileInfoFactory $splFileInfoFactory
     ) {
diff --git a/app/code/Magento/MediaGallerySynchronization/Model/GetContentHash.php b/app/code/Magento/MediaGallerySynchronization/Model/GetContentHash.php
index 49ff39ca4e1d7..703fd56c4f0b8 100644
--- a/app/code/Magento/MediaGallerySynchronization/Model/GetContentHash.php
+++ b/app/code/Magento/MediaGallerySynchronization/Model/GetContentHash.php
@@ -7,12 +7,10 @@
 
 namespace Magento\MediaGallerySynchronization\Model;
 
-use Magento\MediaGallerySynchronizationApi\Model\GetContentHashInterface;
-
 /**
  * Get hashed value of image content.
  */
-class GetContentHash implements GetContentHashInterface
+class GetContentHash
 {
     /**
      * Return the hash value of the given filepath.
diff --git a/app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/GetContentHashTest.php b/app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/GetContentHashTest.php
index ad033f35df40b..a9c428fed7bca 100644
--- a/app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/GetContentHashTest.php
+++ b/app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/GetContentHashTest.php
@@ -9,17 +9,17 @@
 
 use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Filesystem\DriverInterface;
-use Magento\MediaGallerySynchronizationApi\Model\GetContentHashInterface;
+use Magento\MediaGallerySynchronization\Model\GetContentHash;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 
 /**
- * Test for GetContentHashInterface.
+ * Test for GetContentHash.
  */
 class GetContentHashTest extends TestCase
 {
     /**
-     * @var GetContentHashInterface
+     * @var GetContentHash
      */
     private $getContentHash;
 
@@ -33,12 +33,12 @@ class GetContentHashTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->getContentHash = Bootstrap::getObjectManager()->get(GetContentHashInterface::class);
+        $this->getContentHash = Bootstrap::getObjectManager()->get(GetContentHash::class);
         $this->driver = Bootstrap::getObjectManager()->get(DriverInterface::class);
     }
 
     /**
-     * Test for GetContentHashInterface::execute
+     * Test for GetContentHash::execute
      *
      * @dataProvider filesProvider
      * @param string $firstFile
diff --git a/app/code/Magento/MediaGallerySynchronization/etc/di.xml b/app/code/Magento/MediaGallerySynchronization/etc/di.xml
index c19d53deb1b5f..47a4360575b2e 100644
--- a/app/code/Magento/MediaGallerySynchronization/etc/di.xml
+++ b/app/code/Magento/MediaGallerySynchronization/etc/di.xml
@@ -9,7 +9,6 @@
     <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\GetContentHashInterface" type="Magento\MediaGallerySynchronization\Model\GetContentHash"/>
     <type name="Magento\MediaGallerySynchronizationApi\Model\ImportFilesComposite">
         <arguments>
             <argument name="importers" xsi:type="array">
diff --git a/app/code/Magento/MediaGallerySynchronizationApi/Model/GetContentHashInterface.php b/app/code/Magento/MediaGallerySynchronizationApi/Model/GetContentHashInterface.php
deleted file mode 100644
index 8ca56d8e779d1..0000000000000
--- a/app/code/Magento/MediaGallerySynchronizationApi/Model/GetContentHashInterface.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\MediaGallerySynchronizationApi\Model;
-
-/**
- * Get hashed value of image content.
- */
-interface GetContentHashInterface
-{
-    /**
-     * Get hashed value of image content.
-     *
-     * @param string $content
-     * @return string
-     */
-    public function execute(string $content): string;
-}
diff --git a/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Options/UsedIn.php b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Options/UsedIn.php
index d3f758a510888..e638fb7e86625 100644
--- a/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Options/UsedIn.php
+++ b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Options/UsedIn.php
@@ -14,24 +14,32 @@
  */
 class UsedIn implements OptionSourceInterface
 {
-    /**
-     * @var array
-     */
-    private $options;
-
-    /**
-     * @param array $options
-     */
-    public function __construct(array $options = [])
-    {
-        $this->options = $options;
-    }
-
     /**
      * @inheritdoc
      */
     public function toOptionArray(): array
     {
-        return $this->options;
+        return [
+            'cms_page' => [
+                'value' => 'cms_page',
+                'label' => 'Pages'
+            ],
+            'catalog_category' => [
+                'value' => 'catalog_category',
+                'label' => 'Categories'
+            ],
+            'cms_block' => [
+                'value' => 'cms_block',
+                'label' => 'Blocks'
+            ],
+            'catalog_product' => [
+                'value' => 'catalog_product',
+                'label' => 'Products'
+            ],
+            'not_used' => [
+                'value' => 'not_used',
+                'label' => 'Not used anywhere'
+            ]
+        ];
     }
 }
diff --git a/app/code/Magento/MediaGalleryUi/etc/adminhtml/di.xml b/app/code/Magento/MediaGalleryUi/etc/adminhtml/di.xml
index bf07512d13d4f..552c5364f3500 100644
--- a/app/code/Magento/MediaGalleryUi/etc/adminhtml/di.xml
+++ b/app/code/Magento/MediaGalleryUi/etc/adminhtml/di.xml
@@ -41,30 +41,4 @@
             <argument name="collectionProcessor" xsi:type="object">Magento\MediaGalleryUi\Model\Api\SearchCriteria\CollectionProcessor</argument>
         </arguments>
     </type>
-    <type name="Magento\MediaGalleryUi\Ui\Component\Listing\Filters\Options\UsedIn">
-        <arguments>
-            <argument name="options" xsi:type="array">
-                <item name="cms_page" xsi:type="array">
-                    <item name="value" xsi:type="string">cms_page</item>
-                    <item name="label" xsi:type="string" translate="true">Pages</item>
-                </item>
-                <item name="catalog_category" xsi:type="array">
-                    <item name="value" xsi:type="string">catalog_category</item>
-                    <item name="label" xsi:type="string" translate="true">Categories</item>
-                </item>
-                <item name="cms_block" xsi:type="array">
-                    <item name="value" xsi:type="string">cms_block</item>
-                    <item name="label" xsi:type="string" translate="true">Blocks</item>
-                </item>
-                <item name="catalog_product" xsi:type="array">
-                    <item name="value" xsi:type="string">catalog_product</item>
-                    <item name="label" xsi:type="string" translate="true">Products</item>
-                </item>
-                <item name="not_used" xsi:type="array">
-                    <item name="value" xsi:type="string">not_used</item>
-                    <item name="label" xsi:type="string" translate="true">Not used anywhere</item>
-                </item>
-            </argument>
-        </arguments>
-    </type>
 </config>

From deb001c63d195c7c0d5d0cebc0fbb38bc622d58b Mon Sep 17 00:00:00 2001
From: yolouiese <honeymay@abovethefray.io>
Date: Wed, 5 Aug 2020 18:39:19 +0800
Subject: [PATCH 1267/1718] 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 922469968aae7065fe14f2f2f02d0214782802bb Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Wed, 5 Aug 2020 18:55:36 +0800
Subject: [PATCH 1268/1718] magento/adobe-stock-integration#1713: Extract image
 extension from constant of SaveImageInformation to DI configuration -
 transfer constant declaration to di configuration

---
 .../Plugin/SaveImageInformation.php               | 15 +++++++++++----
 .../MediaGalleryIntegration/etc/adminhtml/di.xml  | 10 ++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/MediaGalleryIntegration/Plugin/SaveImageInformation.php b/app/code/Magento/MediaGalleryIntegration/Plugin/SaveImageInformation.php
index fbe35db298b04..a999b9004d9e5 100644
--- a/app/code/Magento/MediaGalleryIntegration/Plugin/SaveImageInformation.php
+++ b/app/code/Magento/MediaGalleryIntegration/Plugin/SaveImageInformation.php
@@ -21,8 +21,6 @@
  */
 class SaveImageInformation
 {
-    private const IMAGE_FILE_NAME_PATTERN = '#\.(jpg|jpeg|gif|png)$# i';
-
     /**
      * @var IsPathExcludedInterface
      */
@@ -48,25 +46,33 @@ class SaveImageInformation
      */
     private $synchronizeFiles;
 
+    /**
+     * @var string[]
+     */
+    private $imageExtensions;
+
     /**
      * @param Filesystem $filesystem
      * @param LoggerInterface $log
      * @param IsPathExcludedInterface $isPathExcluded
      * @param SynchronizeFilesInterface $synchronizeFiles
      * @param ConfigInterface $config
+     * @param array $imageExtensions
      */
     public function __construct(
         Filesystem $filesystem,
         LoggerInterface $log,
         IsPathExcludedInterface $isPathExcluded,
         SynchronizeFilesInterface $synchronizeFiles,
-        ConfigInterface $config
+        ConfigInterface $config,
+        array $imageExtensions
     ) {
         $this->log = $log;
         $this->isPathExcluded = $isPathExcluded;
         $this->filesystem = $filesystem;
         $this->synchronizeFiles = $synchronizeFiles;
         $this->config = $config;
+        $this->imageExtensions = $imageExtensions;
     }
 
     /**
@@ -75,6 +81,7 @@ public function __construct(
      * @param Uploader $subject
      * @param array $result
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @return array
      */
     public function afterSave(Uploader $subject, array $result): array
     {
@@ -103,7 +110,7 @@ private function isApplicable(string $path): bool
         try {
             return $path
                 && !$this->isPathExcluded->execute($path)
-                && preg_match(self::IMAGE_FILE_NAME_PATTERN, $path);
+                && preg_match('#\.(' . implode("|", $this->imageExtensions) . ')$# i', $path);
         } catch (\Exception $exception) {
             $this->log->critical($exception);
             return false;
diff --git a/app/code/Magento/MediaGalleryIntegration/etc/adminhtml/di.xml b/app/code/Magento/MediaGalleryIntegration/etc/adminhtml/di.xml
index d4b4f8988b622..1559a6d7dfcd5 100644
--- a/app/code/Magento/MediaGalleryIntegration/etc/adminhtml/di.xml
+++ b/app/code/Magento/MediaGalleryIntegration/etc/adminhtml/di.xml
@@ -14,4 +14,14 @@
     <type name="Magento\Framework\File\Uploader">
         <plugin name="save_asset_image" type="Magento\MediaGalleryIntegration\Plugin\SaveImageInformation"/>
     </type>
+    <type name="Magento\MediaGalleryIntegration\Plugin\SaveImageInformation">
+        <arguments>
+            <argument name="imageExtensions" xsi:type="array">
+                <item name="jpg" xsi:type="string">jpg</item>
+                <item name="jpeg" xsi:type="string">jpeg</item>
+                <item name="gif" xsi:type="string">gif</item>
+                <item name="png" xsi:type="string">png</item>
+            </argument>
+        </arguments>
+    </type>
 </config>

From 78cfc8ac04f5c11c9f69120eeb106d5694461df9 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@aovethefray.io>
Date: Wed, 5 Aug 2020 19:11:34 +0800
Subject: [PATCH 1269/1718] magento/adobe-stock-integration#1714: Change access
 level for metadata model functions to private - modified public functions to
 private

---
 app/code/Magento/MediaGalleryMetadata/Model/Jpeg/ReadFile.php   | 2 +-
 .../Magento/MediaGalleryMetadata/Model/Png/Segment/WriteXmp.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/ReadFile.php b/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/ReadFile.php
index 4dbff068a861b..ed241d03506c1 100644
--- a/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/ReadFile.php
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/ReadFile.php
@@ -76,7 +76,7 @@ public function __construct(
      * @return bool
      * @throws FileSystemException
      */
-    public function isApplicable(string $path): bool
+    private function isApplicable(string $path): bool
     {
         $resource = $this->driver->fileOpen($path, 'rb');
         try {
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteXmp.php b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteXmp.php
index 9d8d5d975d99d..292a52322d621 100644
--- a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteXmp.php
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteXmp.php
@@ -114,7 +114,7 @@ private function insertPngXmpSegment(array $segments, SegmentInterface $xmpSegme
      * @param MetadataInterface $metadata
      * @return SegmentInterface
      */
-    public function createPngXmpSegment(MetadataInterface $metadata): SegmentInterface
+    private function createPngXmpSegment(MetadataInterface $metadata): SegmentInterface
     {
         $xmpData = $this->xmpTemplate->get();
         return $this->segmentFactory->create([

From 8401410b918dcdeab316763454934cbb9a9704ae Mon Sep 17 00:00:00 2001
From: Viktor Petryk <victor.petryk@transoftgroup.com>
Date: Wed, 5 Aug 2020 14:14:05 +0300
Subject: [PATCH 1270/1718] MC-35514: Can't create shipping label for existing
 order all JS components in sliding modal doesn't work.

---
 .../view/adminhtml/templates/order/packaging/grid.phtml     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
index 72d3c72846dd9..70a4633aaed23 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
@@ -12,7 +12,7 @@
 <div class="grid">
     <?php $randomId = rand(); ?>
     <div class="admin__table-wrapper">
-        <table class="data-grid">
+        <table id="packaging-data-grid-<?= /* @noEscape */ $randomId ?>" class="data-grid">
             <thead>
             <tr>
                 <th class="data-grid-checkbox-cell">
@@ -123,9 +123,9 @@
         </table>
         <?php $scriptString = <<<script
         require(['jquery'], function ($) {
-            $("table.data-grid").on('blur', 'td.custom-value input',
+            $("#packaging-data-grid-{$randomId}").on('blur', 'td.custom-value input',
                 function(){packaging.recalcContainerWeightAndCustomsValue(this)});
-            $("table.data-grid").on('click', 'button[data-action="package-delete-item"]',
+            $("#packaging-data-grid-{$randomId}").on('click', 'button[data-action="package-delete-item"]',
                 function(){packaging.deleteItem(this)});
         });
 script;

From b2b45e679b94cdf526f8a74834246e73c5de185e Mon Sep 17 00:00:00 2001
From: yolouiese <honeymay@abovethefray.io>
Date: Wed, 5 Aug 2020 19:16:31 +0800
Subject: [PATCH 1271/1718] 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 c7ca95bed863c..9eea75e8cab91 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
@@ -86,7 +86,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(
@@ -98,6 +99,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 72d29066938e8756ebdca8e35f79e73b2a3091c1 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 5 Aug 2020 14:30:09 +0300
Subject: [PATCH 1272/1718] Remove MFTF dependency to adobe stock module

---
 .../AdminMediaGalleryEnhancedEnableActionGroup.xml   |  2 +-
 .../Mftf/Page/AdminMediaGalleryConfigSystemPage.xml  | 12 ++++++++++++
 .../Test/Mftf/Section/AdminConfigSystemSection.xml   |  1 +
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Page/AdminMediaGalleryConfigSystemPage.xml

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryEnhancedEnableActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryEnhancedEnableActionGroup.xml
index 8791c1b152249..d842535940253 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryEnhancedEnableActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryEnhancedEnableActionGroup.xml
@@ -12,7 +12,7 @@
         <arguments>
             <argument name="enabled" type="string" defaultValue="{{MediaGalleryConfigDataDisabled.value}}"/>
         </arguments>
-        <amOnPage url="{{AdminConfigSystemPage.url}}" stepKey="navigateToSystemConfigurationPage" />
+        <amOnPage url="{{AdminMediaGalleryConfigSystemPage.url}}" stepKey="navigateToSystemConfigurationPage" />
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <scrollTo selector="{{AdminConfigSystemSection.enhancedMediaGalleryFieldset}}" stepKey="scrollToEnhancedMediaGalleryFieldset"/>
         <conditionalClick stepKey="expandEnhancedMediaGalleryTab" selector="{{AdminConfigSystemSection.enhancedMediaGalleryFieldset}}" dependentSelector="{{AdminConfigSystemSection.enhancedMediaGalleryEnabledField}}" visible="false" />
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Page/AdminMediaGalleryConfigSystemPage.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Page/AdminMediaGalleryConfigSystemPage.xml
new file mode 100644
index 0000000000000..429e5da4129d3
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Page/AdminMediaGalleryConfigSystemPage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminMediaGalleryConfigSystemPage" url="admin/system_config/edit/section/system" area="admin" module="Magento_Config">
+        <section name="AdminConfigSystemSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminConfigSystemSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminConfigSystemSection.xml
index e0305a8a6f172..b7900f6664c62 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminConfigSystemSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminConfigSystemSection.xml
@@ -11,5 +11,6 @@
     <section name="AdminConfigSystemSection">
         <element name="enhancedMediaGalleryFieldset" type="block" selector="#system_media_gallery-head"/>
         <element name="enhancedMediaGalleryEnabledField" type="select" selector="[data-ui-id='select-groups-media-gallery-fields-enabled-value']"/>
+        <element name="saveConfig" type="button" selector="#save"/>
     </section>
 </sections>

From a493bc5769b59b4f2635a09382b379e44dec950a Mon Sep 17 00:00:00 2001
From: oleksandrkravchuk <oleksandr.kravchuk@vaimo.com>
Date: Wed, 5 Aug 2020 14:41:32 +0300
Subject: [PATCH 1273/1718] community-features#252 Create static test for
 action controllers.. Fix static tests.

---
 .../Magento/TestFramework/Utility/ChildrenClassesSearch/C.php | 2 +-
 .../Magento/TestFramework/Utility/ChildrenClassesSearch/F.php | 2 +-
 .../Utility/ChildrenClassesSearch/{Z.php => ZInterface.php}   | 4 +---
 .../TestFramework/Utility/ChildrenClassesSearchTest.php       | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)
 rename dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/{Z.php => ZInterface.php} (70%)

diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/C.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/C.php
index 1fe77df4a7f15..e50735fcbb46c 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/C.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/C.php
@@ -5,6 +5,6 @@
  */
 namespace Magento\TestFramework\Utility\ChildrenClassesSearch;
 
-class C implements Z
+class C implements ZInterface
 {
 }
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/F.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/F.php
index 5c7b8d8fb17af..6976ed26a0d84 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/F.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/F.php
@@ -5,6 +5,6 @@
  */
 namespace Magento\TestFramework\Utility\ChildrenClassesSearch;
 
-class F extends E implements Z
+class F extends E implements ZInterface
 {
 }
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/Z.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/ZInterface.php
similarity index 70%
rename from dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/Z.php
rename to dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/ZInterface.php
index 1ec713366dde8..be1b6d222519c 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/Z.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearch/ZInterface.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\TestFramework\Utility\ChildrenClassesSearch;
 
-// @codingStandardsIgnoreStar
-interface Z
+interface ZInterface
 {
 }
-// @codingStandardsIgnoreEnd
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearchTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearchTest.php
index efb073d93ed07..5b7fd47042347 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearchTest.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/ChildrenClassesSearchTest.php
@@ -34,7 +34,7 @@ public function testChildrenSearch(): void
             __DIR__ . '/ChildrenClassesSearch/D.php',
             __DIR__ . '/ChildrenClassesSearch/E.php',
             __DIR__ . '/ChildrenClassesSearch/F.php',
-            __DIR__ . '/ChildrenClassesSearch/Z.php',
+            __DIR__ . '/ChildrenClassesSearch/ZInterface.php',
         ];
 
         $found = $this->childrenClassesSearch->getClassesWhichAreChildrenOf(

From 27555c2ca62deb5862ee9496caefd40b3c6a4fa7 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Wed, 5 Aug 2020 14:43:06 +0300
Subject: [PATCH 1274/1718] change selectors

---
 .../Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml  | 2 +-
 .../Magento/SalesRule/Test/Mftf/Section/DiscountSection.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml
index 7be02126e3a0f..bc4a4b726bb3d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml
@@ -13,7 +13,7 @@
         <element name="addToCartBtn" type="button" selector="button.action.tocart.primary" timeout="30"/>
         <element name="successMsg" type="button" selector="div.message-success" timeout="30"/>
         <element name="errorMsg" type="button" selector="div.message-error" timeout="30"/>
-        <element name="alertMessage" type="text" selector=".page.messages [role=alert]"/>
+        <element name="alertMessage" type="text" selector=".page.messages [role=alert][aria-atomic=true]"/>
         <element name="messagesBlock" type="text" selector=".page.messages" timeout="30"/>
         <element name="addToWishlist" type="button" selector="//a[@class='action towishlist']" timeout="30"/>
         <element name="customTextOptionInput" type="input" selector=".input-text.product-custom-option"/>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/DiscountSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/DiscountSection.xml
index 90b591a7bb1b1..ed2abe341a694 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Section/DiscountSection.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/DiscountSection.xml
@@ -13,7 +13,7 @@
         <element name="DiscountInput" type="input" selector="#discount-code"/>
         <element name="ApplyCodeBtn" type="button" selector="//span[text()='Apply Discount']"/>
         <element name="CancelCoupon" type="button" selector="//button[@value='Cancel Coupon']"/>
-        <element name="DiscountVerificationMsg" type="text" selector=".message-success div"/>
+        <element name="DiscountVerificationMsg" type="text" selector=".message-success[aria-atomic=true] div"/>
         <element name="CancelCouponBtn" type="button" selector="#discount-form .action-cancel"/>
     </section>
 </sections>

From c7fd5ef15f9b524ed8d226a3f171f407c641a1f4 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 5 Aug 2020 14:44:45 +0300
Subject: [PATCH 1275/1718] Remove selector dependency

---
 .../AdminEnhancedMediaGalleryDeleteGridViewActionGroup.xml  | 6 +++---
 .../Section/AdminEnhancedMediaGalleryActionsSection.xml     | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryDeleteGridViewActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryDeleteGridViewActionGroup.xml
index d3d1f0aaf39de..95f3080049db7 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryDeleteGridViewActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryDeleteGridViewActionGroup.xml
@@ -17,9 +17,9 @@
         </arguments>
 
         <click selector="{{AdminDataGridHeaderSection.bookmarkToggle}}" stepKey="openViewBookmarks"/>
-        <click selector="{{AdminGridDefaultViewControls.viewByName(viewToDelete)}}{{AdminAdobeStockSection.editViewButtonPartial}}" stepKey="clickEditButton"/>
-        <seeElement selector="{{AdminAdobeStockSection.deleteViewButton}}" stepKey="seeDeleteButton"/>
-        <click selector="{{AdminAdobeStockSection.deleteViewButton}}" stepKey="clickDeleteButton"/>
+        <click selector="{{AdminGridDefaultViewControls.viewByName(viewToDelete)}}{{AdminEnhancedMediaGalleryActionsSection.editViewButtonPartial}}" stepKey="clickEditButton"/>
+        <seeElement selector="{{AdminEnhancedMediaGalleryActionsSection.deleteViewButton}}" stepKey="seeDeleteButton"/>
+        <click selector="{{AdminEnhancedMediaGalleryActionsSection.deleteViewButton}}" stepKey="clickDeleteButton"/>
         <waitForPageLoad stepKey="waitForDeletion" time="10"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryActionsSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryActionsSection.xml
index 2feaaa8594da2..7f9a5aefdf69c 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryActionsSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryActionsSection.xml
@@ -8,6 +8,8 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminEnhancedMediaGalleryActionsSection">
+        <element name="editViewButtonPartial" type="button" selector="/following-sibling::div/button[@class='action-edit']"/>
+        <element name="deleteViewButton" type="button" selector="//div[@data-bind='afterRender: \$data.setToolbarNode']//input/following-sibling::div/button[@class='action-delete']"/>
         <element name="upload" type="input" selector="#image-uploader-input"/>
         <element name="cancel" type="button" selector="[data-ui-id='cancel-button']"/>
         <element name="createFolder" type="button" selector="[data-ui-id='create-folder-button']"/>

From 693cc0e4da2197bc7c1f0c715987acbd849c63df Mon Sep 17 00:00:00 2001
From: oleksandrkravchuk <oleksandr.kravchuk@vaimo.com>
Date: Wed, 5 Aug 2020 14:44:52 +0300
Subject: [PATCH 1276/1718] Remove removed file from blacklist.

---
 .../Magento/Test/Php/_files/phpstan/blacklist/common.txt         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/blacklist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/blacklist/common.txt
index 73ac51fa137ab..a9c65eb29c2e5 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/blacklist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/blacklist/common.txt
@@ -17,6 +17,5 @@ dev/tests/api-functional/testsuite/Magento/Customer/Api/AddressRepositoryTest.ph
 dev/tests/api-functional/testsuite/Magento/Framework/Model/Entity/HydratorTest.php
 dev/tests/api-functional/testsuite/Magento/Integration/Model/AdminTokenServiceTest.php
 dev/tests/api-functional/testsuite/Magento/Integration/Model/CustomerTokenServiceTest.php
-dev/tools/UpgradeScripts/pre_composer_update_2.3.php
 app/code/Magento/Developer/Test/Unit/Console/Command/DevTestsRunCommandTest.php
 app/code/Magento/OfflineShipping/Test/Unit/Model/ResourceModel/Carrier/Tablerate/CSV/ColumnResolverTest.php

From 5245a40b5e259d8830842c04399cf2f289cc867a Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@aovethefray.io>
Date: Wed, 5 Aug 2020 20:20:55 +0800
Subject: [PATCH 1277/1718] magento/adobe-stock-integration#1691: Add filter
 placeholders and Display mode options to category grid - added placeholder to
 filters and options to display mode in media gallery category grid

---
 .../media_gallery_category_listing.xml        | 62 ++++++++++---------
 .../adminhtml/web/css/source/_module.less     |  8 ++-
 2 files changed, 41 insertions(+), 29 deletions(-)

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 e0b9eacbb4d20..9945643ccffef 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
@@ -66,6 +66,9 @@
                         <item name="identityColumn" xsi:type="string">entity_id</item>
                         <item name="filterOptions" xsi:type="boolean">true</item>
                         <item name="filterPlaceholder" xsi:type="string" translate="true">Asset Title</item>
+                        <item name="selectedPlaceholders" xsi:type="array">
+                            <item name="defaultPlaceholder" xsi:type="string">Select</item>
+                        </item>
                         <item name="emptyOptionsHtml" xsi:type="string" translate="true">Start typing to find assets</item>
                         <item name="filterRateLimit" xsi:type="string" translate="true">1000</item>
                         <item name="filterRateLimitMethod" xsi:type="string" translate="true">notifyWhenChangesStop</item>
@@ -80,6 +83,37 @@
                     <dataScope>asset_id</dataScope>
                     </settings>
             </filterSelect>
+            <filterInput name="entity_id" provider="${ $.parentName }" sortOrder="20">
+                <settings>
+                    <dataScope>entity_id</dataScope>
+                    <label translate="true">ID</label>
+                    <placeholder>ID</placeholder>
+                </settings>
+            </filterInput>
+            <filterSelect name="display_mode" provider="${ $.parentName }" sortOrder="30">
+                <settings>
+                    <options class="Magento\Catalog\Model\Category\Attribute\Source\Mode"/>
+                    <caption translate="true">Select</caption>
+                    <label translate="true">Display Mode</label>
+                    <dataScope>display_mode</dataScope>
+                </settings>
+            </filterSelect>
+            <filterSelect name="include_in_menu" provider="${ $.parentName }" sortOrder="40">
+                <settings>
+                    <options class="Magento\Config\Model\Config\Source\Yesno"/>
+                    <caption translate="true">Select</caption>
+                    <label translate="true">In Menu</label>
+                    <dataScope>include_in_menu</dataScope>
+                </settings>
+            </filterSelect>
+            <filterSelect name="is_active" provider="${ $.parentName }" sortOrder="50">
+                <settings>
+                    <options class="Magento\Config\Model\Config\Source\Yesno"/>
+                    <caption translate="true">Select</caption>
+                    <label translate="true">Enabled</label>
+                    <dataScope>is_active</dataScope>
+                </settings>
+            </filterSelect>
          </filters>
         <paging name="listing_paging">
             <settings>
@@ -104,7 +138,6 @@
     <columns name="media_gallery_category_columns">
         <column name="entity_id">
             <settings>
-                <filter>text</filter>
                 <label translate="true">ID</label>
             </settings>
         </column>
@@ -126,7 +159,6 @@
         </column>
         <column name="display_mode">
             <settings>
-                <filter>text</filter>
                 <label translate="true">Display Mode</label>
             </settings>
         </column>
@@ -136,38 +168,12 @@
             </settings>
         </column>
         <column name="include_in_menu" component="Magento_Ui/js/grid/columns/select">
-           <argument name="data" xsi:type="array">
-            </argument>
             <settings>
-                 <options>
-                    <option name="Yes" xsi:type="array">
-                        <item name="value" xsi:type="number">1</item>
-                        <item name="label" xsi:type="string">Yes</item>
-                    </option>
-                     <option name="No" xsi:type="array">
-                        <item name="value" xsi:type="number">0</item>
-                        <item name="label" xsi:type="string">No</item>
-                    </option>
-                </options>
-                <dataType>select</dataType>
-                <filter>select</filter>
                 <label translate="true">In Menu</label>
             </settings>
         </column>
         <column name="is_active" component="Magento_Ui/js/grid/columns/select" >
             <settings>
-                <dataType>select</dataType>
-                <filter>select</filter>
-                <options>
-                    <option name="Yes" xsi:type="array">
-                        <item name="value" xsi:type="number">1</item>
-                        <item name="label" xsi:type="string">Yes</item>
-                    </option>
-                     <option name="No" xsi:type="array">
-                        <item name="value" xsi:type="number">0</item>
-                        <item name="label" xsi:type="string">No</item>
-                    </option>
-                </options>
                 <label translate="true">Enabled</label>
             </settings>
         </column>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/web/css/source/_module.less b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/web/css/source/_module.less
index 0d2a1897e0c25..51575bd496598 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/web/css/source/_module.less
+++ b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/web/css/source/_module.less
@@ -10,7 +10,7 @@
         .admin__field-label {
             text-align: left;
         }
-        
+
         .admin__action-dropdown-wrap._active .admin__action-dropdown-text::after {
             margin-right: 6px;
         }
@@ -19,5 +19,11 @@
             left: auto;
             right: 0;
         }
+
+        .admin__field:not(.admin__field-option) > .admin__field-label {
+            font-size: 1.3rem;
+            font-weight: bold;
+            line-height: 2.1rem;
+        }
     }
 }

From aee94d892e5a896786d00c9dcb3a861443f5b0af Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Wed, 5 Aug 2020 20:27:56 +0800
Subject: [PATCH 1278/1718] magento/adobe-stock-integration#1667:[MFTF] Add a
 column with an edit link to the Category grid - Extract assertion to separate
 action group

---
 .../AdminAssertCategoryPageTitleActionGroup.xml  | 16 ++++++++++++++++
 .../AdminEditCategoryInGridPageActionGroup.xml   |  1 -
 ...aGalleryCatalogUiEditCategoryGridPageTest.xml |  1 +
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertCategoryPageTitleActionGroup.xml

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertCategoryPageTitleActionGroup.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertCategoryPageTitleActionGroup.xml
new file mode 100644
index 0000000000000..ee1d7bb5af5f4
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertCategoryPageTitleActionGroup.xml
@@ -0,0 +1,16 @@
+<?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="AdminAssertCategoryPageTitleActionGroup">
+        <annotations>
+            <description>Assert's category page title for Simple Sub Category</description>
+        </annotations>
+        <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{SimpleSubCategory.name}}" stepKey="seeCategoryTitle"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminEditCategoryInGridPageActionGroup.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminEditCategoryInGridPageActionGroup.xml
index 3d74429156b95..ccdebccab4e65 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminEditCategoryInGridPageActionGroup.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminEditCategoryInGridPageActionGroup.xml
@@ -13,6 +13,5 @@
         </annotations>
         <click selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.edit('2', 'Edit')}}" stepKey="clickOnCategoryRow"/>
         <waitForPageLoad time="30" stepKey="waitForCategoryDetailsPageLoad"/>
-        <see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{SimpleSubCategory.name}}" stepKey="seeCategoryTitle"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiEditCategoryGridPageTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiEditCategoryGridPageTest.xml
index 720b6c531ad39..b20f63a005279 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiEditCategoryGridPageTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiEditCategoryGridPageTest.xml
@@ -27,5 +27,6 @@
         </after>
         <actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openCategoryPage"/>
         <actionGroup ref="AdminEditCategoryInGridPageActionGroup" stepKey="editCategoryItem"/>
+        <actionGroup ref="AdminAssertCategoryPageTitleActionGroup" stepKey="assertCategoryByName"/>
    </test>
 </tests>

From 10006e010facee49cf20b18c15cad279e93a3ee5 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 5 Aug 2020 15:30:04 +0300
Subject: [PATCH 1279/1718] Move Source filter to MediaGalleryUi module

---
 .../Listing/Columns/Source/Options.php        | 29 +++++++++++++++++++
 .../ui_component/media_gallery_listing.xml    |  8 +++++
 .../standalone_media_gallery_listing.xml      |  8 +++++
 3 files changed, 45 insertions(+)
 create mode 100644 app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Columns/Source/Options.php

diff --git a/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Columns/Source/Options.php b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Columns/Source/Options.php
new file mode 100644
index 0000000000000..b56848aa3515c
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Columns/Source/Options.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Ui\Component\Listing\Columns\Source;
+
+use Magento\Framework\Data\OptionSourceInterface;
+
+/**
+ * Image source filter options
+ */
+class Options implements OptionSourceInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function toOptionArray(): array
+    {
+        return [
+            [
+                'value' => 'Local',
+                'label' =>  __('Uploaded Locally'),
+            ],
+        ];
+    }
+}
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 5a16ed1792159..49206043725f9 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
@@ -122,6 +122,14 @@
                     <dataScope>entity_type</dataScope>
                 </settings>
             </filterSelect>
+            <filterSelect name="source" provider="${ $.parentName }" sortOrder="60">
+                <settings>
+                    <caption translate="true">All</caption>
+                    <options class="Magento\MediaGalleryUi\Ui\Component\Listing\Columns\Source\Options"/>
+                    <label translate="true">Source</label>
+                    <dataScope>source</dataScope>
+                </settings>
+            </filterSelect>
             <filterSelect name="content_status" provider="${ $.parentName }" sortOrder="220">
                 <settings>
                     <options class="Magento\MediaGalleryUi\Ui\Component\Listing\Filters\Options\Status"/>
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 c96ad0fd86661..655178c104492 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
@@ -109,6 +109,14 @@
                     <dataScope>entity_type</dataScope>
                 </settings>
             </filterSelect>
+            <filterSelect name="source" provider="${ $.parentName }" sortOrder="60">
+                <settings>
+                    <caption translate="true">All</caption>
+                    <options class="Magento\MediaGalleryUi\Ui\Component\Listing\Columns\Source\Options"/>
+                    <label translate="true">Source</label>
+                    <dataScope>source</dataScope>
+                </settings>
+            </filterSelect>
             <filterSelect name="content_status" provider="${ $.parentName }" sortOrder="220">
                 <settings>
                     <options class="Magento\MediaGalleryUi\Ui\Component\Listing\Filters\Options\Status"/>

From 1a8276646d1c7e42874e95ca802332951a726cc8 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 5 Aug 2020 15:42:05 +0300
Subject: [PATCH 1280/1718] Correct MFTF test

---
 .../Test/AdminMediaGalleryFilterImagesBySourceTest.xml    | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryFilterImagesBySourceTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryFilterImagesBySourceTest.xml
index e1e7bf1f0bcbb..4369a61708a83 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryFilterImagesBySourceTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryFilterImagesBySourceTest.xml
@@ -41,13 +41,5 @@
         <actionGroup ref="AdminMediaGalleryAssertImageInGridActionGroup" stepKey="assertImageInGrid">
             <argument name="title" value="ImageMetadata.title"/>
         </actionGroup>
-        <actionGroup ref="AdminEnhancedMediaGalleryExpandFilterActionGroup" stepKey="expandFilterToApplySourceFilter"/>
-        <actionGroup ref="AdminEnhancedMediaGallerySelectSourceFilterActionGroup" stepKey="applyAdobeStockFilter">
-            <argument name="filterValue" value="Adobe Stock"/>
-        </actionGroup>
-        <actionGroup ref="AdminEnhancedMediaGalleryApplyFiltersActionGroup" stepKey="applyFiltersWithAdobeStockOption"/>
-        <actionGroup ref="AdminMediaGalleryAssertImageNotExistsInTheGridActionGroup" stepKey="assertImageNotExistsInGrid">
-            <argument name="title" value="ImageMetadata.title"/>
-        </actionGroup>
     </test>
 </tests>

From 101a1217d9de47ccb3f94a167b37290fdee126ce Mon Sep 17 00:00:00 2001
From: Michal Derlatka <michal@molokaistudio.com>
Date: Wed, 5 Aug 2020 14:53:58 +0200
Subject: [PATCH 1281/1718] magento/magento2#26110: Bundle products options
 input validation

---
 .../Magento/Bundle/Model/Product/Type.php     | 48 ++++++++++---------
 ...uct_with_multiple_options_radio_select.php | 13 +++--
 ...multiple_options_radio_select_rollback.php |  9 +++-
 3 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
index 101aab9d3aed9..fe120e9a179dd 100644
--- a/app/code/Magento/Bundle/Model/Product/Type.php
+++ b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -416,16 +416,13 @@ public function beforeSave($product)
         if ($product->getCanSaveBundleSelections()) {
             $product->canAffectOptions(true);
             $selections = $product->getBundleSelectionsData();
-            if ($selections && !empty($selections)) {
-                $options = $product->getBundleOptionsData();
-                if ($options) {
-                    foreach ($options as $option) {
-                        if (empty($option['delete']) || 1 != (int)$option['delete']) {
-                            $product->setTypeHasOptions(true);
-                            if (1 == (int)$option['required']) {
-                                $product->setTypeHasRequiredOptions(true);
-                                break;
-                            }
+            if (!empty($selections) && $options = $product->getBundleOptionsData()) {
+                foreach ($options as $option) {
+                    if (empty($option['delete']) || 1 != (int)$option['delete']) {
+                        $product->setTypeHasOptions(true);
+                        if (1 == (int)$option['required']) {
+                            $product->setTypeHasRequiredOptions(true);
+                            break;
                         }
                     }
                 }
@@ -461,7 +458,7 @@ public function getOptionsIds($product)
      * Retrieve bundle option collection
      *
      * @param \Magento\Catalog\Model\Product $product
-     * @return Collection
+     * @return \Magento\Bundle\Model\ResourceModel\Option\Collection
      */
     public function getOptionsCollection($product)
     {
@@ -532,10 +529,10 @@ public function getSelectionsCollection($optionIds, $product)
      * Example: the catalog inventory validation of decimal qty can change qty to int,
      * so need to change quote item qty option value too.
      *
-     * @param   array $options
-     * @param   \Magento\Framework\DataObject $option
-     * @param   mixed $value
-     * @param   \Magento\Catalog\Model\Product $product
+     * @param  array $options
+     * @param  \Magento\Framework\DataObject $option
+     * @param  mixed $value
+     * @param  \Magento\Catalog\Model\Product $product
      * @return $this
      */
     public function updateQtyOption($options, \Magento\Framework\DataObject $option, $value, $product)
@@ -894,7 +891,7 @@ public function getSelectionsByIds($selectionIds, $product)
      *
      * @param array $optionIds
      * @param \Magento\Catalog\Model\Product $product
-     * @return Collection
+     * @return \Magento\Bundle\Model\ResourceModel\Option\Collection
      */
     public function getOptionsByIds($optionIds, $product)
     {
@@ -1191,9 +1188,11 @@ public function canConfigure($product)
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
+    // @codingStandardsIgnoreStart
     public function deleteTypeSpecificData(\Magento\Catalog\Model\Product $product)
     {
     }
+    // @codingStandardsIgnoreEnd
 
     /**
      * Return array of specific to type product entities
@@ -1203,18 +1202,19 @@ public function deleteTypeSpecificData(\Magento\Catalog\Model\Product $product)
      */
     public function getIdentities(\Magento\Catalog\Model\Product $product)
     {
-        $identities = parent::getIdentities($product);
+        $identities = [];
+        $identities[] = parent::getIdentities($product);
         /** @var \Magento\Bundle\Model\Option $option */
         foreach ($this->getOptions($product) as $option) {
             if ($option->getSelections()) {
                 /** @var \Magento\Catalog\Model\Product $selection */
                 foreach ($option->getSelections() as $selection) {
-                    $identities = array_merge($identities, $selection->getIdentities());
+                    $identities[] = $selection->getIdentities();
                 }
             }
         }
 
-        return $identities;
+        return array_merge([], ...$identities);
     }
 
     /**
@@ -1261,7 +1261,7 @@ protected function getBeforeQty($product, $selection)
      *
      * @param \Magento\Catalog\Model\Product $product
      * @param bool $isStrictProcessMode
-     * @param Collection $optionsCollection
+     * @param \Magento\Bundle\Model\ResourceModel\Option\Collection $optionsCollection
      * @param int[] $options
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
@@ -1331,7 +1331,7 @@ private function isSelectedOptionValid($option, $options): bool
      *
      * @param \Magento\Bundle\Model\ResourceModel\Selection\Collection $selections
      * @param bool $skipSaleableCheck
-     * @param Collection $optionsCollection
+     * @param \Magento\Bundle\Model\ResourceModel\Option\Collection $optionsCollection
      * @param int[] $options
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
@@ -1387,16 +1387,18 @@ protected function checkIsResult($_result)
      */
     protected function mergeSelectionsWithOptions($options, $selections)
     {
+        $selections = [];
+
         foreach ($options as $option) {
             $optionSelections = $option->getSelections();
             if ($option->getRequired() && is_array($optionSelections) && count($optionSelections) == 1) {
-                $selections = array_merge($selections, $optionSelections);
+                $selections[] = $optionSelections;
             } else {
                 $selections = [];
                 break;
             }
         }
 
-        return $selections;
+        return array_merge([], ...$selections);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_radio_select.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_radio_select.php
index e3dc33449911b..74182d830dc6d 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_radio_select.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_radio_select.php
@@ -4,9 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-require __DIR__ . '/../../../Magento/Catalog/_files/multiple_products.php';
+use Magento\Catalog\Model\Product;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/multiple_products.php');
+
+$objectManager = Bootstrap::getObjectManager();
 
 $productIds = range(10, 12, 1);
 foreach ($productIds as $productId) {
@@ -24,8 +28,8 @@
     $stockItem->save();
 }
 
-/** @var $product \Magento\Catalog\Model\Product */
-$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+/** @var $product Product */
+$product = $objectManager->create(Product::class);
 $product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_BUNDLE)
     ->setId(3)
     ->setAttributeSetId(4)
@@ -35,7 +39,6 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
-    ->setPriceView(1)
     ->setPriceType(1)
     ->setPrice(10.0)
     ->setShipmentType(0)
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_radio_select_rollback.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_radio_select_rollback.php
index 3748666b25136..57b4eb2e6cc91 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_radio_select_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_multiple_options_radio_select_rollback.php
@@ -3,11 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-require __DIR__ . '/../../../Magento/Catalog/_files/multiple_products_rollback.php';
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/multiple_products_rollback.php');
 
+$objectManager = Bootstrap::getObjectManager();
 /** @var \Magento\Framework\Registry $registry */
-$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
 
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);

From 2534e462572b68d2f17317247c4caebed72de1bd Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 5 Aug 2020 17:03:13 +0300
Subject: [PATCH 1282/1718] Code review suggestion, reemove deprecated
 onmousemove from ui-select component

---
 ...alogUiVerifyUsedInLinkCategoryGridTest.xml | 14 +++++-----
 .../media_gallery_catalog_category_index.xml  |  6 +----
 .../templates/url_filter_applier.phtml        | 18 +++++++++++++
 .../view/adminhtml/web/js/image/image-edit.js | 27 +------------------
 .../base/web/js/form/element/ui-select.js     |  5 ----
 5 files changed, 27 insertions(+), 43 deletions(-)
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/templates/url_filter_applier.phtml

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
index ef573afda5bd9..e761ef5cd08ba 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
@@ -23,13 +23,13 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
-        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
-        <actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
-        <actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectSecondImageToDelete">
-            <argument name="imageName" value="{{UpdatedImageDetails.title}}"/>
-        </actionGroup>
-        <actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
-        <actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
+            <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
+            <actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectSecondImageToDelete">
+                <argument name="imageName" value="{{UpdatedImageDetails.title}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
         </after>
 
diff --git a/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/layout/media_gallery_catalog_category_index.xml b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/layout/media_gallery_catalog_category_index.xml
index 4684f6b30f7a6..dad1cd8283eba 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/layout/media_gallery_catalog_category_index.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/layout/media_gallery_catalog_category_index.xml
@@ -10,11 +10,7 @@
     <body>
         <referenceContainer htmlTag="div" htmlClass="media-gallery-category-container" name="content">
             <uiComponent name="media_gallery_category_listing"/>
+            <block class="Magento\Backend\Block\Template" template="Magento_MediaGalleryCatalogUi::url_filter_applier.phtml" name="category_list_url_filter_applier"/>
         </referenceContainer>
-        <block class="Magento\Backend\Block\Template" template="Magento_Cms::url_filter_applier.phtml" name="category_list_url_filter_applier">
-            <arguments>
-                <argument name="listing_namespace" xsi:type="string">media_gallery_category_listing</argument>
-            </arguments>
-        </block>
     </body>
 </page>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/templates/url_filter_applier.phtml b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/templates/url_filter_applier.phtml
new file mode 100644
index 0000000000000..fa3abd419a691
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/templates/url_filter_applier.phtml
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var $block \Magento\Backend\Block\Template */
+/** @var \Magento\Framework\Escaper $escaper */
+?>
+<script type="text/x-magento-init">
+    {
+        "*": {
+            "Magento_Ui/js/grid/url-filter-applier": {
+                "listingNamespace": "media_gallery_category_listing"
+            }
+        }
+    }
+</script>
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 904dcb22e7309..c31bc848bdc70 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
@@ -10,8 +10,7 @@ define([
     'uiLayout',
     'Magento_Ui/js/lib/key-codes',
     'Magento_MediaGalleryUi/js/action/getDetails',
-    'mage/validation',
-    'Magento_Ui/js/lib/view/utils/async'
+    'mage/validation'
 ], function ($, _, Component, layout, keyCodes, getDetails) {
     'use strict';
 
@@ -55,33 +54,9 @@ define([
         initialize: function () {
             this._super().initView();
 
-            this.removeMouseOverEvent();
-
             return this;
         },
 
-        /**
-         * Remove mousemove event from ui-select as it deprecated
-         */
-        removeMouseOverEvent: function () {
-
-            if (_.isUndefined(this.keywordsSelect())) {
-                setTimeout(function () {
-                    this.removeMouseOverEvent();
-                }.bind(this), 100);
-
-                return;
-            }
-
-            $.async(
-                this.keywordsSelect().rootListSelector,
-                function () {
-                    $(this.keywordsSelect().rootListSelector).off('mousemove');
-                }.bind(this)
-            );
-
-        },
-
         /**
          * Add a new keyword to select
          */
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js b/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js
index 7dddf735b7cc5..c8d44e5a82ca0 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js
@@ -748,11 +748,6 @@ define([
             return this.value() ? !!this.value().length : false;
         },
 
-        /**
-         * @deprecated
-         */
-        onMousemove: function () {},
-
         /**
          * Handles hover on list items.
          *

From 6c0934415fb249f60649d828089ba1140caba124 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 5 Aug 2020 17:03:49 +0300
Subject: [PATCH 1283/1718] remove from html

---
 .../view/base/web/templates/grid/filters/elements/ui-select.html | 1 -
 1 file changed, 1 deletion(-)

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 b9425c020c0e9..a98e6c2e07576 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
@@ -147,7 +147,6 @@
         <ul class="admin__action-multiselect-menu-inner _root"
             data-bind="
                 event: {
-                    mousemove: function(data, event){onMousemove($data, $index(), event)},
                     scroll: function(data, event){onScrollDown(data, event)}
                 }
             ">

From 966e8414607a3c864a841746944dae3d454372bc Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Wed, 5 Aug 2020 17:47:02 +0300
Subject: [PATCH 1284/1718] magento/magento2-login-as-customer#150: Opt-in/out.

---
 .../view/frontend/templates/form/edit.phtml   |   1 +
 .../frontend/templates/form/register.phtml    |   1 +
 .../Api/ConfigInterface.php                   |  30 ++++
 .../Api/IsAssistanceEnabledInterface.php      |  24 ++++
 .../Api/SetAssistanceInterface.php            |  24 ++++
 .../Block/Adminhtml/NotAllowedPopup.php       |  79 +++++++++++
 .../LoginAsCustomerAssistance/LICENSE.txt     |  48 +++++++
 .../LoginAsCustomerAssistance/LICENSE_AFL.txt |  48 +++++++
 .../Model/Config.php                          |  55 ++++++++
 .../Model/IsAssistanceEnabled.php             | 124 ++++++++++++++++
 .../IsLoginAsCustomerAllowedResolver.php      |  54 +++++++
 ...DeleteLoginAsCustomerAssistanceAllowed.php |  49 +++++++
 .../GetLoginAsCustomerAssistanceAllowed.php   |  50 +++++++
 .../SaveLoginAsCustomerAssistanceAllowed.php  |  50 +++++++
 .../Model/SetAssistance.php                   | 100 +++++++++++++
 .../Plugin/CustomerDataValidatePlugin.php     | 133 ++++++++++++++++++
 .../Plugin/CustomerExtractorPlugin.php        |  71 ++++++++++
 .../Plugin/CustomerPlugin.php                 |  57 ++++++++
 ...DataProviderWithDefaultAddressesPlugin.php | 126 +++++++++++++++++
 ...oginAsCustomerButtonDataProviderPlugin.php |  48 +++++++
 .../LoginAsCustomerAssistance/README.md       |   3 +
 .../ViewModel/ShoppingAssistanceViewModel.php | 100 +++++++++++++
 .../LoginAsCustomerAssistance/composer.json   |  19 +++
 .../LoginAsCustomerAssistance/etc/acl.xml     |  20 +++
 .../etc/adminhtml/di.xml                      |  21 +++
 .../etc/adminhtml/system.xml                  |  21 +++
 .../LoginAsCustomerAssistance/etc/config.xml  |  18 +++
 .../etc/db_schema.xml                         |  19 +++
 .../etc/db_schema_whitelist.json              |  11 ++
 .../LoginAsCustomerAssistance/etc/di.xml      |  29 ++++
 .../etc/extension_attributes.xml              |  14 ++
 .../etc/frontend/di.xml                       |  13 ++
 .../LoginAsCustomerAssistance/etc/module.xml  |  11 ++
 .../registration.php                          |  12 ++
 .../loginascustomer_confirmation_popup.xml    |  22 +++
 .../templates/not-allowed-popup.phtml         |  15 ++
 .../adminhtml/ui_component/customer_form.xml  |  34 +++++
 .../adminhtml/web/js/not-allowed-popup.js     |  55 ++++++++
 .../layout/customer_account_create.xml        |  25 ++++
 .../frontend/layout/customer_account_edit.xml |  24 ++++
 .../templates/shopping-assistance.phtml       |  54 +++++++
 .../view/frontend/web/js/opt-in.js            |  18 +++
 42 files changed, 1730 insertions(+)
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/Api/ConfigInterface.php
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/Api/IsAssistanceEnabledInterface.php
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/Api/SetAssistanceInterface.php
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/Block/Adminhtml/NotAllowedPopup.php
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/LICENSE.txt
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/LICENSE_AFL.txt
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/Model/Config.php
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/Model/IsAssistanceEnabled.php
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/Model/Processor/IsLoginAsCustomerAllowedResolver.php
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/Model/ResourceModel/DeleteLoginAsCustomerAssistanceAllowed.php
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/Model/ResourceModel/GetLoginAsCustomerAssistanceAllowed.php
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/Model/ResourceModel/SaveLoginAsCustomerAssistanceAllowed.php
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/Model/SetAssistance.php
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerExtractorPlugin.php
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerPlugin.php
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/Plugin/DataProviderWithDefaultAddressesPlugin.php
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/Plugin/LoginAsCustomerButtonDataProviderPlugin.php
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/README.md
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/ViewModel/ShoppingAssistanceViewModel.php
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/composer.json
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/etc/acl.xml
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/etc/adminhtml/di.xml
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/etc/adminhtml/system.xml
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/etc/config.xml
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/etc/db_schema.xml
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/etc/db_schema_whitelist.json
 create mode 100755 app/code/Magento/LoginAsCustomerAssistance/etc/di.xml
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/etc/extension_attributes.xml
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/etc/frontend/di.xml
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/etc/module.xml
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/registration.php
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/view/adminhtml/layout/loginascustomer_confirmation_popup.xml
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/view/adminhtml/templates/not-allowed-popup.phtml
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/view/adminhtml/ui_component/customer_form.xml
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/view/adminhtml/web/js/not-allowed-popup.js
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/view/frontend/layout/customer_account_create.xml
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/view/frontend/layout/customer_account_edit.xml
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/view/frontend/templates/shopping-assistance.phtml
 create mode 100644 app/code/Magento/LoginAsCustomerAssistance/view/frontend/web/js/opt-in.js

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 5b877500aa0c8..9821cff73a3dd 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
@@ -47,6 +47,7 @@ use Magento\Customer\Block\Widget\Name;
                 <span><?= $block->escapeHtml(__('Change Password')) ?></span>
             </label>
         </div>
+        <?= $block->getChildHtml('fieldset_edit_info_additional') ?>
     </fieldset>
 
     <fieldset class="fieldset password" data-container="change-email-password">
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 1b50b8de34280..1a24a1bc3b6c4 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
@@ -67,6 +67,7 @@ $formData = $block->getFormData();
         <?php if ($_gender->isEnabled()): ?>
             <?= $_gender->setGender($formData->getGender())->toHtml() ?>
         <?php endif ?>
+        <?= $block->getChildHtml('fieldset_create_info_additional') ?>
     </fieldset>
     <?php if ($block->getShowAddressFields()): ?>
         <?php $cityValidationClass = $addressHelper->getAttributeValidationClass('city'); ?>
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Api/ConfigInterface.php b/app/code/Magento/LoginAsCustomerAssistance/Api/ConfigInterface.php
new file mode 100644
index 0000000000000..d25663aa066b7
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/Api/ConfigInterface.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerAssistance\Api;
+
+/**
+ * LoginAsCustomerAssistance config
+ *
+ * @api
+ */
+interface ConfigInterface
+{
+    /**
+     * Get title for shopping assistance checkbox.
+     *
+     * @return string
+     */
+    public function getShoppingAssistanceCheckboxTitle(): string;
+
+    /**
+     * Get tooltip for shopping assistance checkbox.
+     *
+     * @return string
+     */
+    public function getShoppingAssistanceCheckboxTooltip(): string;
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Api/IsAssistanceEnabledInterface.php b/app/code/Magento/LoginAsCustomerAssistance/Api/IsAssistanceEnabledInterface.php
new file mode 100644
index 0000000000000..3fece42b60142
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/Api/IsAssistanceEnabledInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerAssistance\Api;
+
+/**
+ * Get 'assistance_allowed' attribute from Customer.
+ *
+ * @api
+ */
+interface IsAssistanceEnabledInterface
+{
+    /**
+     * Get 'assistance_allowed' attribute from Customer by id.
+     *
+     * @param int $customerId
+     * @return bool
+     */
+    public function execute(int $customerId): bool;
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Api/SetAssistanceInterface.php b/app/code/Magento/LoginAsCustomerAssistance/Api/SetAssistanceInterface.php
new file mode 100644
index 0000000000000..6564dfc45528b
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/Api/SetAssistanceInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerAssistance\Api;
+
+/**
+ * Set 'assistance_allowed' attribute to Customer.
+ *
+ * @api
+ */
+interface SetAssistanceInterface
+{
+    /**
+     * Set 'assistance_allowed' attribute to Customer by id.
+     *
+     * @param int $customerId
+     * @param bool $isEnabled
+     */
+    public function execute(int $customerId, bool $isEnabled): void;
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Block/Adminhtml/NotAllowedPopup.php b/app/code/Magento/LoginAsCustomerAssistance/Block/Adminhtml/NotAllowedPopup.php
new file mode 100644
index 0000000000000..592df94b8d791
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/Block/Adminhtml/NotAllowedPopup.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerAssistance\Block\Adminhtml;
+
+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;
+
+/**
+ * Pop-up for Login as Customer button then Login as Customer is not allowed.
+ *
+ * @api
+ */
+class NotAllowedPopup extends Template
+{
+    /**
+     * Config
+     *
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * Json Serializer
+     *
+     * @var Json
+     */
+    private $json;
+
+    /**
+     * @param Template\Context $context
+     * @param ConfigInterface $config
+     * @param Json $json
+     * @param array $data
+     */
+    public function __construct(
+        Template\Context $context,
+        ConfigInterface $config,
+        Json $json,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->config = $config;
+        $this->json = $json;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getJsLayout()
+    {
+        $layout = $this->json->unserialize(parent::getJsLayout());
+
+        $layout['components']['lac-not-allowed-popup']['title'] = __('Login as Customer not enabled');
+        $layout['components']['lac-not-allowed-popup']['content'] = __(
+            'The user has not enabled the "Allow remote shopping assistance" functionality. '
+            . 'Contact the customer to discuss this user configuration.'
+        );
+
+        return $this->json->serialize($layout);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function _toHtml()
+    {
+        if (!$this->config->isEnabled()) {
+            return '';
+        }
+        return parent::_toHtml();
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/LICENSE.txt b/app/code/Magento/LoginAsCustomerAssistance/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/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/LoginAsCustomerAssistance/LICENSE_AFL.txt b/app/code/Magento/LoginAsCustomerAssistance/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/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/LoginAsCustomerAssistance/Model/Config.php b/app/code/Magento/LoginAsCustomerAssistance/Model/Config.php
new file mode 100644
index 0000000000000..33967028f70b9
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/Model/Config.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerAssistance\Model;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\LoginAsCustomerAssistance\Api\ConfigInterface;
+
+/**
+ * @inheritdoc
+ */
+class Config implements ConfigInterface
+{
+    /**
+     * Extension config path
+     */
+    private const XML_PATH_SHOPPING_ASSISTANCE_CHECKBOX_TITLE
+        = 'login_as_customer/general/shopping_assistance_checkbox_title';
+    private const XML_PATH_SHOPPING_ASSISTANCE_CHECKBOX_TOOLTIP
+        = 'login_as_customer/general/shopping_assistance_checkbox_tooltip';
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(
+        ScopeConfigInterface $scopeConfig
+    ) {
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getShoppingAssistanceCheckboxTitle(): string
+    {
+        return (string)$this->scopeConfig->getValue(self::XML_PATH_SHOPPING_ASSISTANCE_CHECKBOX_TITLE);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getShoppingAssistanceCheckboxTooltip(): string
+    {
+        return (string)$this->scopeConfig->getValue(self::XML_PATH_SHOPPING_ASSISTANCE_CHECKBOX_TOOLTIP);
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Model/IsAssistanceEnabled.php b/app/code/Magento/LoginAsCustomerAssistance/Model/IsAssistanceEnabled.php
new file mode 100644
index 0000000000000..1e0ecb2cf644b
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/Model/IsAssistanceEnabled.php
@@ -0,0 +1,124 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerAssistance\Model;
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerExtensionFactory;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\LoginAsCustomerAssistance\Api\IsAssistanceEnabledInterface;
+use Magento\LoginAsCustomerAssistance\Model\ResourceModel\GetLoginAsCustomerAssistanceAllowed;
+
+/**
+ * Check if customer allows Login as Customer assistance.
+ */
+class IsAssistanceEnabled implements IsAssistanceEnabledInterface
+{
+    /**
+     * @var array
+     */
+    private $registry = [];
+
+    /**
+     * Merchant assistance denied by customer status code.
+     */
+    public const DENIED = 1;
+
+    /**
+     * Merchant assistance allowed by customer status code.
+     */
+    public const ALLOWED = 2;
+
+    /**
+     * @var CustomerExtensionFactory
+     */
+    private $customerExtensionFactory;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @var GetLoginAsCustomerAssistanceAllowed
+     */
+    private $getLoginAsCustomerAssistanceAllowed;
+
+    /**
+     * @param CustomerExtensionFactory $customerExtensionFactory
+     * @param CustomerRepositoryInterface $customerRepository
+     * @param GetLoginAsCustomerAssistanceAllowed $getLoginAsCustomerAssistanceAllowed
+     */
+    public function __construct(
+        CustomerExtensionFactory $customerExtensionFactory,
+        CustomerRepositoryInterface $customerRepository,
+        GetLoginAsCustomerAssistanceAllowed $getLoginAsCustomerAssistanceAllowed
+    ) {
+        $this->customerExtensionFactory = $customerExtensionFactory;
+        $this->customerRepository = $customerRepository;
+        $this->getLoginAsCustomerAssistanceAllowed = $getLoginAsCustomerAssistanceAllowed;
+    }
+
+    /**
+     * Check if customer allows Login as Customer assistance by Customer id.
+     *
+     * @param int $customerId
+     * @return bool
+     */
+    public function execute(int $customerId): bool
+    {
+        try {
+            $customer = $this->customerRepository->getById($customerId);
+            // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock.DetectedCatch
+        } catch (NoSuchEntityException $exception) {
+            // do nothing
+        }
+        if (isset($customer)) {
+            $extensionAttributes = $customer->getExtensionAttributes();
+            if ($extensionAttributes === null) {
+                $extensionAttributes = $this->customerExtensionFactory->create();
+            }
+            if ($extensionAttributes->getAssistanceAllowed() === null) {
+                if (isset($this->registry[$customerId])) {
+                    $assistanceAllowed = $this->registry[$customerId];
+                } else {
+                    $assistanceAllowed = $this->getLoginAsCustomerAssistanceAllowed->execute($customerId);
+                    $this->registry[$customerId] = $assistanceAllowed;
+                }
+                $extensionAttributes->setAssistanceAllowed($this->resolveStatus($assistanceAllowed));
+                $customer->setExtensionAttributes($extensionAttributes);
+            }
+            $assistanceAllowed = $this->resolveAllowance($customer->getExtensionAttributes()->getAssistanceAllowed());
+        } else {
+            $assistanceAllowed = false;
+        }
+
+        return $assistanceAllowed;
+    }
+
+    /**
+     * Get integer status value from boolean.
+     *
+     * @param bool $assistanceAllowed
+     * @return int
+     */
+    private function resolveStatus(bool $assistanceAllowed): int
+    {
+        return $assistanceAllowed ? self::ALLOWED : self::DENIED;
+    }
+
+    /**
+     * Get boolean status value from integer.
+     *
+     * @param int $statusCode
+     * @return bool
+     */
+    private function resolveAllowance(int $statusCode): bool
+    {
+        return $statusCode === self::ALLOWED;
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Model/Processor/IsLoginAsCustomerAllowedResolver.php b/app/code/Magento/LoginAsCustomerAssistance/Model/Processor/IsLoginAsCustomerAllowedResolver.php
new file mode 100644
index 0000000000000..0915389286854
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/Model/Processor/IsLoginAsCustomerAllowedResolver.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerAssistance\Model\Processor;
+
+use Magento\LoginAsCustomer\Model\IsLoginAsCustomerEnabledForCustomerResultFactory;
+use Magento\LoginAsCustomerApi\Api\Data\IsLoginAsCustomerEnabledForCustomerResultInterface;
+use Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerEnabledForCustomerInterface;
+use Magento\LoginAsCustomerApi\Model\IsLoginAsCustomerEnabledForCustomerResolverInterface;
+use Magento\LoginAsCustomerAssistance\Api\IsAssistanceEnabledInterface;
+
+/**
+ * @inheritdoc
+ */
+class IsLoginAsCustomerAllowedResolver implements IsLoginAsCustomerEnabledForCustomerInterface
+{
+    /**
+     * @var IsAssistanceEnabledInterface
+     */
+    private $isAssistanceEnabled;
+
+    /**
+     * @var IsLoginAsCustomerEnabledForCustomerResultFactory
+     */
+    private $resultFactory;
+
+    /**
+     * @param IsAssistanceEnabledInterface $isAssistanceEnabled
+     */
+    public function __construct(
+        IsAssistanceEnabledInterface $isAssistanceEnabled,
+        IsLoginAsCustomerEnabledForCustomerResultFactory $resultFactory
+    ) {
+        $this->isAssistanceEnabled = $isAssistanceEnabled;
+        $this->resultFactory = $resultFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(int $customerId): IsLoginAsCustomerEnabledForCustomerResultInterface
+    {
+        $messages = [];
+        if (!$this->isAssistanceEnabled->execute($customerId)) {
+            $messages[] = __('Login as Customer assistance is disabled for this Customer.');
+        }
+
+        return $this->resultFactory->create(['messages' => $messages]);
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Model/ResourceModel/DeleteLoginAsCustomerAssistanceAllowed.php b/app/code/Magento/LoginAsCustomerAssistance/Model/ResourceModel/DeleteLoginAsCustomerAssistanceAllowed.php
new file mode 100644
index 0000000000000..360f2e2799282
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/Model/ResourceModel/DeleteLoginAsCustomerAssistanceAllowed.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerAssistance\Model\ResourceModel;
+
+use Magento\Framework\App\ResourceConnection;
+
+/**
+ * Delete Login as Customer assistance allowed record.
+ */
+class DeleteLoginAsCustomerAssistanceAllowed
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection
+    ) {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * Delete Login as Customer assistance allowed record by Customer id.
+     *
+     * @param int $customerId
+     * @return void
+     */
+    public function execute(int $customerId): void
+    {
+        $connection = $this->resourceConnection->getConnection();
+        $tableName = $this->resourceConnection->getTableName('login_as_customer_assistance_allowed');
+
+        $connection->delete(
+            $tableName,
+            [
+                'customer_id = ?' => $customerId
+            ]
+        );
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Model/ResourceModel/GetLoginAsCustomerAssistanceAllowed.php b/app/code/Magento/LoginAsCustomerAssistance/Model/ResourceModel/GetLoginAsCustomerAssistanceAllowed.php
new file mode 100644
index 0000000000000..412fd86351988
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/Model/ResourceModel/GetLoginAsCustomerAssistanceAllowed.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerAssistance\Model\ResourceModel;
+
+use Magento\Framework\App\ResourceConnection;
+
+/**
+ * Get Login as Customer assistance allowed record.
+ */
+class GetLoginAsCustomerAssistanceAllowed
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection
+    ) {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     *  Get Login as Customer assistance allowed record by Customer id.
+     *
+     * @param int $customerId
+     * @return bool
+     */
+    public function execute(int $customerId): bool
+    {
+        $connection = $this->resourceConnection->getConnection();
+        $tableName = $this->resourceConnection->getTableName('login_as_customer_assistance_allowed');
+
+        $select = $connection->select()
+            ->from(
+                $tableName
+            )
+            ->where('customer_id = ?', $customerId);
+
+        return !!$connection->fetchOne($select);
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Model/ResourceModel/SaveLoginAsCustomerAssistanceAllowed.php b/app/code/Magento/LoginAsCustomerAssistance/Model/ResourceModel/SaveLoginAsCustomerAssistanceAllowed.php
new file mode 100644
index 0000000000000..03b6d0166e327
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/Model/ResourceModel/SaveLoginAsCustomerAssistanceAllowed.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerAssistance\Model\ResourceModel;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\LoginAsCustomerAssistance\Api\SaveLoginAsCustomerAssistanceAllowedInterface;
+
+/**
+ * Save Login as Customer assistance allowed record.
+ */
+class SaveLoginAsCustomerAssistanceAllowed
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection
+    ) {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * Save Login as Customer assistance allowed record by Customer id.
+     *
+     * @param int $customerId
+     * @return void
+     */
+    public function execute(int $customerId): void
+    {
+        $connection = $this->resourceConnection->getConnection();
+        $tableName = $this->resourceConnection->getTableName('login_as_customer_assistance_allowed');
+
+        $connection->insertOnDuplicate(
+            $tableName,
+            [
+                'customer_id' => $customerId
+            ]
+        );
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Model/SetAssistance.php b/app/code/Magento/LoginAsCustomerAssistance/Model/SetAssistance.php
new file mode 100644
index 0000000000000..7ff6065d72ffa
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/Model/SetAssistance.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerAssistance\Model;
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerExtensionFactory;
+use Magento\LoginAsCustomerAssistance\Api\SetAssistanceInterface;
+use Magento\LoginAsCustomerAssistance\Model\ResourceModel\DeleteLoginAsCustomerAssistanceAllowed;
+use Magento\LoginAsCustomerAssistance\Model\ResourceModel\SaveLoginAsCustomerAssistanceAllowed;
+
+/**
+ * @inheritdoc
+ */
+class SetAssistance implements SetAssistanceInterface
+{
+    /**
+     * @var array
+     */
+    private $registry = [];
+
+    /**
+     * @var CustomerExtensionFactory
+     */
+    private $customerExtensionFactory;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @var DeleteLoginAsCustomerAssistanceAllowed
+     */
+    private $deleteLoginAsCustomerAssistanceAllowed;
+
+    /**
+     * @var SaveLoginAsCustomerAssistanceAllowed
+     */
+    private $saveLoginAsCustomerAssistanceAllowed;
+
+    /**
+     * @param CustomerExtensionFactory $customerExtensionFactory
+     * @param CustomerRepositoryInterface $customerRepository
+     * @param SaveLoginAsCustomerAssistanceAllowed $saveLoginAsCustomerAssistanceAllowed
+     */
+    public function __construct(
+        CustomerExtensionFactory $customerExtensionFactory,
+        CustomerRepositoryInterface $customerRepository,
+        DeleteLoginAsCustomerAssistanceAllowed $deleteLoginAsCustomerAssistanceAllowed,
+        SaveLoginAsCustomerAssistanceAllowed $saveLoginAsCustomerAssistanceAllowed
+    ) {
+        $this->customerExtensionFactory = $customerExtensionFactory;
+        $this->customerRepository = $customerRepository;
+        $this->deleteLoginAsCustomerAssistanceAllowed = $deleteLoginAsCustomerAssistanceAllowed;
+        $this->saveLoginAsCustomerAssistanceAllowed = $saveLoginAsCustomerAssistanceAllowed;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(int $customerId, bool $isEnabled): void
+    {
+        if ($this->isUpdateRequired($customerId, $isEnabled)) {
+            if ($isEnabled) {
+                $this->saveLoginAsCustomerAssistanceAllowed->execute($customerId);
+            } else {
+                $this->deleteLoginAsCustomerAssistanceAllowed->execute($customerId);
+            }
+            $this->updateRegistry($customerId, $isEnabled);
+        }
+    }
+
+    /**
+     * Check if 'assistance_allowed' cached value differs from actual.
+     *
+     * @param int $customerId
+     * @param bool $isEnabled
+     * @return bool
+     */
+    private function isUpdateRequired(int $customerId, bool $isEnabled): bool
+    {
+        return !isset($this->registry[$customerId]) || $this->registry[$customerId] !== $isEnabled;
+    }
+
+    /**
+     * Update 'assistance_allowed' cached value.
+     *
+     * @param int $customerId
+     * @param bool $isEnabled
+     */
+    private function updateRegistry(int $customerId, bool $isEnabled): void
+    {
+        $this->registry[$customerId] = $isEnabled;
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php b/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php
new file mode 100644
index 0000000000000..c085201b347ce
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerAssistance\Plugin;
+
+use Magento\Customer\Model\Metadata\Form;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\AuthorizationInterface;
+use Magento\Framework\Message\MessageInterface;
+use Magento\LoginAsCustomerAssistance\Model\ResourceModel\GetLoginAsCustomerAssistanceAllowed;
+use Magento\LoginAsCustomerAssistance\Model\IsAssistanceEnabled;
+
+/**
+ * Check if User have permission to change Customers Opt-In preference.
+ */
+class CustomerDataValidatePlugin
+{
+    /**
+     * @var AuthorizationInterface
+     */
+    private $authorization;
+
+    /**
+     * @var GetLoginAsCustomerAssistanceAllowed
+     */
+    private $getLoginAsCustomerAssistanceAllowed;
+
+    /**
+     * @param AuthorizationInterface $authorization
+     * @param GetLoginAsCustomerAssistanceAllowed $getLoginAsCustomerAssistanceAllowed
+     */
+    public function __construct(
+        AuthorizationInterface $authorization,
+        GetLoginAsCustomerAssistanceAllowed $getLoginAsCustomerAssistanceAllowed
+    ) {
+        $this->authorization = $authorization;
+        $this->getLoginAsCustomerAssistanceAllowed = $getLoginAsCustomerAssistanceAllowed;
+    }
+
+    /**
+     * Check if User have permission to change Customers Opt-In preference.
+     *
+     * @param Form $subject
+     * @param RequestInterface $request
+     * @param null|string $scope
+     * @param bool $scopeOnly
+     * @throws \Magento\Framework\Validator\Exception
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeExtractData(
+        Form $subject,
+        RequestInterface $request,
+        $scope = null,
+        $scopeOnly = true
+    ): void {
+        if (!$this->authorization->isAllowed('Magento_LoginAsCustomer::opt_in_preference')
+            && $this->isSetAssistanceAllowedParam($request)
+        ) {
+            $customerId = $request->getParam('customer_id');
+            $assistanceAllowedParam =
+                (int)$request->getParam('customer')['extension_attributes']['assistance_allowed'];
+            $assistanceAllowed = $this->getLoginAsCustomerAssistanceAllowed->execute((int)$customerId);
+            $assistanceAllowedStatus = $this->resolveStatus($assistanceAllowed);
+            if ($this->isAssistanceAllowedChangeImportant($assistanceAllowedStatus, $assistanceAllowedParam)) {
+                $errorMessages = [
+                    MessageInterface::TYPE_ERROR => [
+                        __(
+                            'You have no permission to change Opt-In preference.'
+                        ),
+                    ],
+                ];
+
+                throw new \Magento\Framework\Validator\Exception(
+                    null,
+                    null,
+                    $errorMessages
+                );
+            }
+        }
+    }
+
+    /**
+     * Check if assistance_allowed param is set.
+     *
+     * @param RequestInterface $request
+     * @return bool
+     */
+    private function isSetAssistanceAllowedParam(RequestInterface $request): bool
+    {
+        return is_array($request->getParam('customer'))
+            && isset($request->getParam('customer')['extension_attributes'])
+            && isset($request->getParam('customer')['extension_attributes']['assistance_allowed']);
+    }
+
+    /**
+     * Check if change of assistance_allowed attribute is important.
+     *
+     * E. g. if assistance_allowed is going to be disabled while now it's enabled
+     * or if it's going to be enabled while now it is disabled or not set at all.
+     *
+     * @param int $assistanceAllowed
+     * @param int $assistanceAllowedParam
+     * @return bool
+     */
+    private function isAssistanceAllowedChangeImportant(int $assistanceAllowed, int $assistanceAllowedParam): bool
+    {
+        $result = false;
+        if (($assistanceAllowedParam === IsAssistanceEnabled::DENIED
+                && $assistanceAllowed === IsAssistanceEnabled::ALLOWED)
+            ||
+            ($assistanceAllowedParam === IsAssistanceEnabled::ALLOWED
+                && $assistanceAllowed !== IsAssistanceEnabled::ALLOWED)) {
+            $result = true;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get integer status value from boolean.
+     *
+     * @param bool $assistanceAllowed
+     * @return int
+     */
+    private function resolveStatus(bool $assistanceAllowed): int
+    {
+        return $assistanceAllowed ? IsAssistanceEnabled::ALLOWED : IsAssistanceEnabled::DENIED;
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerExtractorPlugin.php b/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerExtractorPlugin.php
new file mode 100644
index 0000000000000..619036da8bb22
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerExtractorPlugin.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerAssistance\Plugin;
+
+use Magento\Customer\Api\Data\CustomerExtensionFactory;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Model\CustomerExtractor;
+use Magento\Framework\App\RequestInterface;
+
+/**
+ * Plugin for Magento\Customer\Model\CustomerExtractor.
+ */
+class CustomerExtractorPlugin
+{
+    /**
+     * @var CustomerExtensionFactory
+     */
+    private $customerExtensionFactory;
+
+    /**
+     * @param CustomerExtensionFactory $customerExtensionFactory
+     */
+    public function __construct(
+        CustomerExtensionFactory $customerExtensionFactory
+    ) {
+        $this->customerExtensionFactory = $customerExtensionFactory;
+    }
+
+    /**
+     * Add assistance_allowed extension attribute value to Customer instance.
+     *
+     * @param CustomerExtractor $subject
+     * @param callable $proceed
+     * @param string $formCode
+     * @param RequestInterface $request
+     * @param array $attributeValues
+     * @return CustomerInterface
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function aroundExtract(
+        CustomerExtractor $subject,
+        callable $proceed,
+        string $formCode,
+        RequestInterface $request,
+        array $attributeValues = []
+    ) {
+        /** @var CustomerInterface $customer */
+        $customer = $proceed(
+            $formCode,
+            $request,
+            $attributeValues
+        );
+
+        $assistanceAllowedStatus = $request->getParam('assistance_allowed');
+        if (!empty($assistanceAllowedStatus)) {
+            $extensionAttributes = $customer->getExtensionAttributes();
+            if (null === $extensionAttributes) {
+                $extensionAttributes = $this->customerExtensionFactory->create();
+            }
+            $extensionAttributes->setAssistanceAllowed((int)$assistanceAllowedStatus);
+            $customer->setExtensionAttributes($extensionAttributes);
+        }
+
+        return $customer;
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerPlugin.php b/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerPlugin.php
new file mode 100644
index 0000000000000..0bc22bf5d8869
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerPlugin.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerAssistance\Plugin;
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\LoginAsCustomerAssistance\Api\SetAssistanceInterface;
+use Magento\LoginAsCustomerAssistance\Model\IsAssistanceEnabled;
+
+/**
+ * Plugin for Customer assistance_allowed extension attribute.
+ */
+class CustomerPlugin
+{
+    /**
+     * @var SetAssistanceInterface
+     */
+    private $setAssistance;
+
+    /**
+     * @param SetAssistanceInterface $setAssistance
+     */
+    public function __construct(
+        SetAssistanceInterface $setAssistance
+    ) {
+        $this->setAssistance = $setAssistance;
+    }
+
+    /**
+     * Save assistance_allowed extension attribute for Customer instance.
+     *
+     * @param CustomerRepositoryInterface $subject
+     * @param CustomerInterface $result
+     * @param CustomerInterface $customer
+     * @return CustomerInterface
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterSave(
+        CustomerRepositoryInterface $subject,
+        CustomerInterface $result,
+        CustomerInterface $customer
+    ): CustomerInterface {
+        $customerId = (int)$result->getId();
+        $customerExtensionAttributes = $customer->getExtensionAttributes();
+        if ($customerExtensionAttributes && $customerExtensionAttributes->getAssistanceAllowed()) {
+            $isEnabled = (int)$customerExtensionAttributes->getAssistanceAllowed() === IsAssistanceEnabled::ALLOWED;
+            $this->setAssistance->execute($customerId, $isEnabled);
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Plugin/DataProviderWithDefaultAddressesPlugin.php b/app/code/Magento/LoginAsCustomerAssistance/Plugin/DataProviderWithDefaultAddressesPlugin.php
new file mode 100644
index 0000000000000..b94cc592394e9
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/Plugin/DataProviderWithDefaultAddressesPlugin.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerAssistance\Plugin;
+
+use Magento\Customer\Model\Customer\DataProviderWithDefaultAddresses;
+use Magento\Framework\AuthorizationInterface;
+use Magento\LoginAsCustomerApi\Api\ConfigInterface;
+use Magento\LoginAsCustomerAssistance\Model\IsAssistanceEnabled;
+use Magento\LoginAsCustomerAssistance\Model\ResourceModel\GetLoginAsCustomerAssistanceAllowed;
+
+/**
+ * Plugin for managing assistance_allowed extension attribute in Customer form Data Provider.
+ */
+class DataProviderWithDefaultAddressesPlugin
+{
+    /**
+     * @var AuthorizationInterface
+     */
+    private $authorization;
+
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var GetLoginAsCustomerAssistanceAllowed
+     */
+    private $getLoginAsCustomerAssistanceAllowed;
+
+    /**
+     * @param AuthorizationInterface $authorization
+     * @param ConfigInterface $config
+     * @param GetLoginAsCustomerAssistanceAllowed $getLoginAsCustomerAssistanceAllowed
+     */
+    public function __construct(
+        AuthorizationInterface $authorization,
+        ConfigInterface $config,
+        GetLoginAsCustomerAssistanceAllowed $getLoginAsCustomerAssistanceAllowed
+    ) {
+        $this->authorization = $authorization;
+        $this->config = $config;
+        $this->getLoginAsCustomerAssistanceAllowed = $getLoginAsCustomerAssistanceAllowed;
+    }
+
+    /**
+     * Add assistance_allowed extension attribute data to Customer form Data Provider.
+     *
+     * @param DataProviderWithDefaultAddresses $subject
+     * @param array $result
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterGetData(
+        DataProviderWithDefaultAddresses $subject,
+        array $result
+    ): array {
+        $isAssistanceAllowed = [];
+
+        foreach ($result as $id => $entityData) {
+            if ($id) {
+                $assistanceAllowedStatus = $this->resolveStatus($this->getLoginAsCustomerAssistanceAllowed->execute((int)$entityData['customer_id']));
+                $isAssistanceAllowed[$id]['customer']['extension_attributes']['assistance_allowed'] =
+                    (string)$assistanceAllowedStatus;
+            }
+        }
+
+        return array_replace_recursive($result, $isAssistanceAllowed);
+    }
+
+    /**
+     * Modify assistance_allowed extension attribute metadata for Customer form Data Provider.
+     *
+     * @param DataProviderWithDefaultAddresses $subject
+     * @param array $result
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterGetMeta(
+        DataProviderWithDefaultAddresses $subject,
+        array $result
+    ): array {
+        if (!$this->config->isEnabled()) {
+            $assistanceAllowedConfig = ['visible' => false];
+        } elseif (!$this->authorization->isAllowed('Magento_LoginAsCustomer::opt_in_preference')) {
+            $assistanceAllowedConfig = [
+                'disabled' => true,
+                'notice' => __('You have no permission to change Opt-In preference.'),
+            ];
+        } else {
+            $assistanceAllowedConfig = [];
+        }
+
+        $config = [
+            'customer' => [
+                'children' => [
+                    'extension_attributes.assistance_allowed' => [
+                        'arguments' => [
+                            'data' => [
+                                'config' => $assistanceAllowedConfig,
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ];
+
+        return array_replace_recursive($result, $config);
+    }
+
+    /**
+     * Get integer status value from boolean.
+     *
+     * @param bool $assistanceAllowed
+     * @return int
+     */
+    private function resolveStatus(bool $assistanceAllowed): int
+    {
+        return $assistanceAllowed ? IsAssistanceEnabled::ALLOWED : IsAssistanceEnabled::DENIED;
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Plugin/LoginAsCustomerButtonDataProviderPlugin.php b/app/code/Magento/LoginAsCustomerAssistance/Plugin/LoginAsCustomerButtonDataProviderPlugin.php
new file mode 100644
index 0000000000000..af6b02ec2f281
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/Plugin/LoginAsCustomerButtonDataProviderPlugin.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerAssistance\Plugin;
+
+use Magento\LoginAsCustomerAdminUi\Ui\Customer\Component\Button\DataProvider;
+use Magento\LoginAsCustomerAssistance\Model\IsAssistanceEnabled;
+
+/**
+ * Change Login as Customer button behavior if Customer has not granted permission.
+ */
+class LoginAsCustomerButtonDataProviderPlugin
+{
+    /**
+     * @var IsAssistanceEnabled
+     */
+    private $isAssistanceEnabled;
+
+    /**
+     * @param IsAssistanceEnabled $isAssistanceEnabled
+     */
+    public function __construct(
+        IsAssistanceEnabled $isAssistanceEnabled
+    ) {
+        $this->isAssistanceEnabled = $isAssistanceEnabled;
+    }
+
+    /**
+     * Change Login as Customer button behavior if Customer has not granted permission.
+     *
+     * @param DataProvider $subject
+     * @param array $result
+     * @param int $customerId
+     * @return array
+     */
+    public function afterGetData(DataProvider $subject, array $result, int $customerId): array
+    {
+        if (isset($result['on_click']) && !$this->isAssistanceEnabled->execute($customerId)) {
+            $result['on_click'] = 'window.lacNotAllowedPopup()';
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/README.md b/app/code/Magento/LoginAsCustomerAssistance/README.md
new file mode 100644
index 0000000000000..b43dd6c8db43a
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/README.md
@@ -0,0 +1,3 @@
+# Magento_LoginAsCustomerAssistance module
+
+The Magento_LoginAsCustomerAssistance module provides possibility to enable/disable LoginAsCustomer functionality per Customer.
diff --git a/app/code/Magento/LoginAsCustomerAssistance/ViewModel/ShoppingAssistanceViewModel.php b/app/code/Magento/LoginAsCustomerAssistance/ViewModel/ShoppingAssistanceViewModel.php
new file mode 100644
index 0000000000000..f7e224efaa19a
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/ViewModel/ShoppingAssistanceViewModel.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerAssistance\ViewModel;
+
+use Magento\Customer\Model\Session;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\LoginAsCustomerApi\Api\ConfigInterface;
+use Magento\LoginAsCustomerAssistance\Api\ConfigInterface as AssistanceConfigInterface;
+use Magento\LoginAsCustomerAssistance\Model\IsAssistanceEnabled;
+
+/**
+ * View model for Login as Customer Shopping Assistance block.
+ */
+class ShoppingAssistanceViewModel implements ArgumentInterface
+{
+    /**
+     * @var AssistanceConfigInterface
+     */
+    private $assistanceConfig;
+
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var IsAssistanceEnabled
+     */
+    private $isAssistanceEnabled;
+
+    /**
+     * @var Session
+     */
+    private $session;
+
+    /**
+     * @param AssistanceConfigInterface $assistanceConfig
+     * @param ConfigInterface $config
+     * @param IsAssistanceEnabled $isAssistanceEnabled
+     * @param Session $session
+     */
+    public function __construct(
+        AssistanceConfigInterface $assistanceConfig,
+        ConfigInterface $config,
+        IsAssistanceEnabled $isAssistanceEnabled,
+        Session $session
+    ) {
+        $this->assistanceConfig = $assistanceConfig;
+        $this->config = $config;
+        $this->isAssistanceEnabled = $isAssistanceEnabled;
+        $this->session = $session;
+    }
+
+    /**
+     * Is Login as Customer functionality enabled.
+     *
+     * @return bool
+     */
+    public function isLoginAsCustomerEnabled(): bool
+    {
+        return $this->config->isEnabled();
+    }
+
+    /**
+     * Is merchant assistance allowed by Customer.
+     *
+     * @return bool
+     */
+    public function isAssistanceAllowed(): bool
+    {
+        $customerId = $this->session->getId();
+
+        return $customerId && $this->isAssistanceEnabled->execute((int)$customerId);
+    }
+
+    /**
+     * Get shopping assistance checkbox title from config.
+     *
+     * @return string
+     */
+    public function getAssistanceCheckboxTitle()
+    {
+        return $this->assistanceConfig->getShoppingAssistanceCheckboxTitle();
+    }
+
+    /**
+     * Get shopping assistance checkbox tooltip text from config.
+     *
+     * @return string
+     */
+    public function getAssistanceCheckboxTooltip()
+    {
+        return $this->assistanceConfig->getShoppingAssistanceCheckboxTooltip();
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/composer.json b/app/code/Magento/LoginAsCustomerAssistance/composer.json
new file mode 100644
index 0000000000000..78cce1ff86c81
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/composer.json
@@ -0,0 +1,19 @@
+{
+    "name": "magento/module-login-as-customer-assistance",
+    "description": "",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [ "registration.php" ],
+        "psr-4": {
+            "Magento\\LoginAsCustomerAssistance\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/etc/acl.xml b/app/code/Magento/LoginAsCustomerAssistance/etc/acl.xml
new file mode 100644
index 0000000000000..bf06be0cab2e6
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/etc/acl.xml
@@ -0,0 +1,20 @@
+<?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:Acl/etc/acl.xsd">
+    <acl>
+        <resources>
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Customer::customer">
+                    <resource id="Magento_LoginAsCustomer::login">
+                        <resource id="Magento_LoginAsCustomer::opt_in_preference" title="Change Customer Opt-In Preference" sortOrder="20" />
+                    </resource>
+                </resource>
+            </resource>
+        </resources>
+    </acl>
+</config>
diff --git a/app/code/Magento/LoginAsCustomerAssistance/etc/adminhtml/di.xml b/app/code/Magento/LoginAsCustomerAssistance/etc/adminhtml/di.xml
new file mode 100644
index 0000000000000..3071e3038ffcc
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/etc/adminhtml/di.xml
@@ -0,0 +1,21 @@
+<?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\Customer\Model\Customer\DataProviderWithDefaultAddresses">
+        <plugin name="login_as_customer_customer_data_provider_plugin"
+                type="Magento\LoginAsCustomerAssistance\Plugin\DataProviderWithDefaultAddressesPlugin"/>
+    </type>
+    <type name="Magento\Customer\Model\Metadata\Form">
+        <plugin name="login_as_customer_customer_data_validate_plugin"
+                type="Magento\LoginAsCustomerAssistance\Plugin\CustomerDataValidatePlugin"/>
+    </type>
+    <type name="Magento\LoginAsCustomerAdminUi\Ui\Customer\Component\Button\DataProvider">
+        <plugin name="login_as_customer_button_data_provider_plugin"
+                type="Magento\LoginAsCustomerAssistance\Plugin\LoginAsCustomerButtonDataProviderPlugin"/>
+    </type>
+</config>
diff --git a/app/code/Magento/LoginAsCustomerAssistance/etc/adminhtml/system.xml b/app/code/Magento/LoginAsCustomerAssistance/etc/adminhtml/system.xml
new file mode 100644
index 0000000000000..bfdc5519937da
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/etc/adminhtml/system.xml
@@ -0,0 +1,21 @@
+<?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="login_as_customer" showInWebsite="1">
+            <group id="general" showInWebsite="1">
+                <field id="shopping_assistance_checkbox_title" translate="label" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" canRestore="1">
+                    <label>Title for Login as Customer opt-in checkbox</label>
+                </field>
+                <field id="shopping_assistance_checkbox_tooltip" translate="label" type="textarea" sortOrder="60" showInDefault="1" showInWebsite="1" canRestore="1">
+                    <label>Login as Customer checkbox tooltip</label>
+                </field>
+            </group>
+        </section>
+    </system>
+</config>
diff --git a/app/code/Magento/LoginAsCustomerAssistance/etc/config.xml b/app/code/Magento/LoginAsCustomerAssistance/etc/config.xml
new file mode 100644
index 0000000000000..9b74e4734f00e
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/etc/config.xml
@@ -0,0 +1,18 @@
+<?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>
+        <login_as_customer>
+            <general>
+                <shopping_assistance_checkbox_title>Allow remote shopping assistance</shopping_assistance_checkbox_title>
+                <shopping_assistance_checkbox_tooltip>This allows merchants to "see what you see" and take actions on your behalf in order to provide better assistance.</shopping_assistance_checkbox_tooltip>
+            </general>
+        </login_as_customer>
+    </default>
+</config>
diff --git a/app/code/Magento/LoginAsCustomerAssistance/etc/db_schema.xml b/app/code/Magento/LoginAsCustomerAssistance/etc/db_schema.xml
new file mode 100644
index 0000000000000..deaecc2bfb777
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/etc/db_schema.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+    <table name="login_as_customer_assistance_allowed" resource="default" engine="innodb" comment="Magento Login as Customer Assistance Allowed Table">
+        <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="false" comment="Customer ID"/>
+        <constraint xsi:type="foreign" referenceId="LOGIN_AS_CUSTOMER_ASSISTANCE_ALLOWED_CUSTOMER_ID_CUSTOMER_ENTITY_ENTITY_ID"
+                    table="login_as_customer_assistance_allowed" column="customer_id" referenceTable="customer_entity"
+                    referenceColumn="entity_id" onDelete="CASCADE"/>
+        <constraint xsi:type="unique" referenceId="LOGIN_AS_CUSTOMER_ASSISTANCE_ALLOWED_CUSTOMER_ID">
+            <column name="customer_id"/>
+        </constraint>
+    </table>
+</schema>
diff --git a/app/code/Magento/LoginAsCustomerAssistance/etc/db_schema_whitelist.json b/app/code/Magento/LoginAsCustomerAssistance/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..2c8aa79f3c7b1
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/etc/db_schema_whitelist.json
@@ -0,0 +1,11 @@
+{
+    "login_as_customer_assistance_allowed": {
+        "column": {
+            "customer_id": true
+        },
+        "constraint": {
+            "LOGIN_AS_CSTR_ASSISTANCE_ALLOWED_CSTR_ID_CSTR_ENTT_ENTT_ID": true,
+            "LOGIN_AS_CUSTOMER_ASSISTANCE_ALLOWED_CUSTOMER_ID": true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/LoginAsCustomerAssistance/etc/di.xml b/app/code/Magento/LoginAsCustomerAssistance/etc/di.xml
new file mode 100755
index 0000000000000..bcfd7a1392083
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/etc/di.xml
@@ -0,0 +1,29 @@
+<?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">
+    <preference for="Magento\LoginAsCustomerAssistance\Api\ConfigInterface"
+                type="Magento\LoginAsCustomerAssistance\Model\Config"/>
+    <preference for="Magento\LoginAsCustomerAssistance\Api\IsAssistanceEnabledInterface"
+                type="Magento\LoginAsCustomerAssistance\Model\IsAssistanceEnabled"/>
+    <preference for="Magento\LoginAsCustomerAssistance\Api\SetAssistanceInterface"
+                type="Magento\LoginAsCustomerAssistance\Model\SetAssistance"/>
+    <type name="Magento\LoginAsCustomer\Model\IsLoginAsCustomerEnabledForCustomerChain">
+        <arguments>
+            <argument name="resolvers" xsi:type="array">
+                <item name="is_allowed" xsi:type="object">
+                    Magento\LoginAsCustomerAssistance\Model\Processor\IsLoginAsCustomerAllowedResolver
+                </item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Customer\Api\CustomerRepositoryInterface">
+        <plugin name="login_as_customer_customer_repository_plugin"
+                type="Magento\LoginAsCustomerAssistance\Plugin\CustomerPlugin"/>
+    </type>
+</config>
diff --git a/app/code/Magento/LoginAsCustomerAssistance/etc/extension_attributes.xml b/app/code/Magento/LoginAsCustomerAssistance/etc/extension_attributes.xml
new file mode 100644
index 0000000000000..ff47820faadaa
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/etc/extension_attributes.xml
@@ -0,0 +1,14 @@
+<?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:Api/etc/extension_attributes.xsd">
+    <extension_attributes for="Magento\Customer\Api\Data\CustomerInterface">
+        <attribute code="assistance_allowed" type="integer"/>
+    </extension_attributes>
+</config>
diff --git a/app/code/Magento/LoginAsCustomerAssistance/etc/frontend/di.xml b/app/code/Magento/LoginAsCustomerAssistance/etc/frontend/di.xml
new file mode 100644
index 0000000000000..bdb2f82eddd60
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/etc/frontend/di.xml
@@ -0,0 +1,13 @@
+<?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\Customer\Model\CustomerExtractor">
+        <plugin name="add_assistance_allowed_to_customer_data"
+                type="Magento\LoginAsCustomerAssistance\Plugin\CustomerExtractorPlugin"/>
+    </type>
+</config>
diff --git a/app/code/Magento/LoginAsCustomerAssistance/etc/module.xml b/app/code/Magento/LoginAsCustomerAssistance/etc/module.xml
new file mode 100644
index 0000000000000..f443691bcf126
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/etc/module.xml
@@ -0,0 +1,11 @@
+<?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_LoginAsCustomerAssistance"/>
+</config>
diff --git a/app/code/Magento/LoginAsCustomerAssistance/registration.php b/app/code/Magento/LoginAsCustomerAssistance/registration.php
new file mode 100644
index 0000000000000..c2be7af4bd396
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/registration.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+\Magento\Framework\Component\ComponentRegistrar::register(
+    \Magento\Framework\Component\ComponentRegistrar::MODULE,
+    'Magento_LoginAsCustomerAssistance',
+    __DIR__
+);
diff --git a/app/code/Magento/LoginAsCustomerAssistance/view/adminhtml/layout/loginascustomer_confirmation_popup.xml b/app/code/Magento/LoginAsCustomerAssistance/view/adminhtml/layout/loginascustomer_confirmation_popup.xml
new file mode 100644
index 0000000000000..ef2e81cd37804
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/view/adminhtml/layout/loginascustomer_confirmation_popup.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
+    <referenceContainer name="content">
+        <block class="Magento\LoginAsCustomerAssistance\Block\Adminhtml\NotAllowedPopup" name="lac.not.allowed.popup" template="Magento_LoginAsCustomerAssistance::not-allowed-popup.phtml">
+            <arguments>
+                <argument name="jsLayout" xsi:type="array">
+                    <item name="components" xsi:type="array">
+                        <item name="lac-not-allowed-popup" xsi:type="array">
+                            <item name="component" xsi:type="string">Magento_LoginAsCustomerAssistance/js/not-allowed-popup</item>
+                        </item>
+                    </item>
+                </argument>
+            </arguments>
+        </block>
+    </referenceContainer>
+</layout>
diff --git a/app/code/Magento/LoginAsCustomerAssistance/view/adminhtml/templates/not-allowed-popup.phtml b/app/code/Magento/LoginAsCustomerAssistance/view/adminhtml/templates/not-allowed-popup.phtml
new file mode 100644
index 0000000000000..42e19f9db4931
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/view/adminhtml/templates/not-allowed-popup.phtml
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/** @var \Magento\LoginAsCustomerAssistance\Block\Adminhtml\NotAllowedPopup $block */
+?>
+
+<script type="text/x-magento-init">
+    {
+        "*": {
+            "Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout();?>
+        }
+    }
+ </script>
diff --git a/app/code/Magento/LoginAsCustomerAssistance/view/adminhtml/ui_component/customer_form.xml b/app/code/Magento/LoginAsCustomerAssistance/view/adminhtml/ui_component/customer_form.xml
new file mode 100644
index 0000000000000..b677becd66064
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/view/adminhtml/ui_component/customer_form.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<form xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <fieldset name="customer">
+        <field name="extension_attributes.assistance_allowed" sortOrder="85" formElement="checkbox">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="source" xsi:type="string">customer</item>
+                </item>
+            </argument>
+            <settings>
+                <dataType>boolean</dataType>
+                <label translate="true">Allow remote shopping assistance</label>
+            </settings>
+            <formElements>
+                <checkbox>
+                    <settings>
+                        <valueMap>
+                            <map name="false" xsi:type="number">1</map>
+                            <map name="true" xsi:type="number">2</map>
+                        </valueMap>
+                        <prefer>toggle</prefer>
+                    </settings>
+                </checkbox>
+            </formElements>
+        </field>
+    </fieldset>
+</form>
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
new file mode 100644
index 0000000000000..59d8dd4a7ed49
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/view/adminhtml/web/js/not-allowed-popup.js
@@ -0,0 +1,55 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'uiComponent',
+    'Magento_Ui/js/modal/confirm',
+    'mage/translate'
+], function (Component, confirm, $t) {
+
+    'use strict';
+
+    return Component.extend({
+        /**
+         * Initialize Component
+         */
+        initialize: function () {
+            var self = this,
+                content;
+
+            this._super();
+
+            content = '<div class="message message-warning">' + self.content + '</div>';
+
+            /**
+             * Not Allowed popup
+             *
+             * @returns {Boolean}
+             */
+            window.lacNotAllowedPopup = function () {
+                confirm({
+                    title: self.title,
+                    content: content,
+                    modalClass: 'confirm lac-confirm',
+                    buttons: [
+                        {
+                            text: $t('Cancel'),
+                            class: 'action-secondary action-dismiss',
+
+                            /**
+                             * Click handler.
+                             */
+                            click: function (event) {
+                                this.closeModal(event);
+                            }
+                        }
+                    ]
+                });
+
+                return false;
+            };
+        }
+    });
+});
diff --git a/app/code/Magento/LoginAsCustomerAssistance/view/frontend/layout/customer_account_create.xml b/app/code/Magento/LoginAsCustomerAssistance/view/frontend/layout/customer_account_create.xml
new file mode 100644
index 0000000000000..121d20395e295
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/view/frontend/layout/customer_account_create.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column"
+      xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceBlock name="customer_form_register">
+            <container name="fieldset.create.info.additional" as="fieldset_create_info_additional"/>
+        </referenceBlock>
+        <referenceContainer name="fieldset.create.info.additional">
+            <block name="login_as_customer_opt_in_create"
+                   template="Magento_LoginAsCustomerAssistance::shopping-assistance.phtml">
+                <arguments>
+                    <argument name="view_model" xsi:type="object">
+                        Magento\LoginAsCustomerAssistance\ViewModel\ShoppingAssistanceViewModel
+                    </argument>
+                </arguments>
+            </block>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/app/code/Magento/LoginAsCustomerAssistance/view/frontend/layout/customer_account_edit.xml b/app/code/Magento/LoginAsCustomerAssistance/view/frontend/layout/customer_account_edit.xml
new file mode 100644
index 0000000000000..15b52cb6cf784
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/view/frontend/layout/customer_account_edit.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceBlock name="customer_edit">
+            <container name="fieldset.edit.info.additional" as="fieldset_edit_info_additional"/>
+        </referenceBlock>
+        <referenceContainer name="fieldset.edit.info.additional">
+            <block name="login_as_customer_opt_in_edit"
+                   template="Magento_LoginAsCustomerAssistance::shopping-assistance.phtml">
+                <arguments>
+                    <argument name="view_model" xsi:type="object">
+                        Magento\LoginAsCustomerAssistance\ViewModel\ShoppingAssistanceViewModel
+                    </argument>
+                </arguments>
+            </block>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/app/code/Magento/LoginAsCustomerAssistance/view/frontend/templates/shopping-assistance.phtml b/app/code/Magento/LoginAsCustomerAssistance/view/frontend/templates/shopping-assistance.phtml
new file mode 100644
index 0000000000000..f92025c099b38
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/view/frontend/templates/shopping-assistance.phtml
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Escaper;
+use Magento\LoginAsCustomerAssistance\Model\IsAssistanceEnabled;
+use Magento\LoginAsCustomerAssistance\ViewModel\ShoppingAssistanceViewModel;
+
+/** @var Escaper $escaper */
+/** @var ShoppingAssistanceViewModel $viewModel */
+$viewModel = $block->getViewModel();
+?>
+
+<script type="text/x-magento-init">
+{
+    ".form-create-account, .form-edit-account": {
+        "Magento_LoginAsCustomerAssistance/js/opt-in": {
+            "allowAccess": "<?= /* @noEscape */ IsAssistanceEnabled::ALLOWED ?>",
+            "denyAccess": "<?= /* @noEscape */ IsAssistanceEnabled::DENIED ?>"
+        }
+    }
+}
+</script>
+
+<?php if ($viewModel->isLoginAsCustomerEnabled()): ?>
+    <div class="field choice">
+        <input type="checkbox"
+               name="assistance_allowed_checkbox"
+               title="<?= $escaper->escapeHtmlAttr(__($viewModel->getAssistanceCheckboxTitle())) ?>"
+               value="1"
+               id="assistance_allowed_checkbox"
+               <?php if ($viewModel->isAssistanceAllowed()): ?>checked="checked"<?php endif; ?>
+               class="checkbox">
+        <label for="assistance_allowed_checkbox" class="label">
+            <span><?= $escaper->escapeHtmlAttr(__($viewModel->getAssistanceCheckboxTitle())) ?></span>
+        </label>
+
+        <input type="hidden" name="assistance_allowed" value=""/>
+
+        <div class="field-tooltip toggle">
+            <span id="tooltip-label" class="label"><span>Tooltip</span></span>
+            <span id="tooltip" class="field-tooltip-action action-help" tabindex="0" data-toggle="dropdown"
+                  data-bind="mageInit: {'dropdown':{'activeClass': '_active', 'parent': '.field-tooltip.toggle'}}"
+                  aria-labelledby="tooltip-label" aria-haspopup="true" aria-expanded="false" role="button">
+         </span>
+            <div class="field-tooltip-content" data-target="dropdown"
+                 aria-hidden="true">
+                <?= $escaper->escapeHtmlAttr(__($viewModel->getAssistanceCheckboxTooltip())) ?>
+            </div>
+        </div>
+    </div>
+<?php endif ?>
diff --git a/app/code/Magento/LoginAsCustomerAssistance/view/frontend/web/js/opt-in.js b/app/code/Magento/LoginAsCustomerAssistance/view/frontend/web/js/opt-in.js
new file mode 100644
index 0000000000000..d225d298b7771
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/view/frontend/web/js/opt-in.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery'
+], function ($) {
+    'use strict';
+
+    return function (config, element) {
+        $(element).on('submit', function () {
+            this.elements['assistance_allowed'].value =
+                this.elements['assistance_allowed_checkbox'].checked ?
+                    config.allowAccess : config.denyAccess;
+        });
+    };
+});

From 8e1e390569f5d5d5fc27a2116f35faa1b7a55a2c Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Wed, 5 Aug 2020 22:53:45 +0800
Subject: [PATCH 1285/1718] 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 cee07660febf735026d32719fddabc1dab2d9b59 Mon Sep 17 00:00:00 2001
From: Arnob Saha <arnobsh@gmail.com>
Date: Mon, 3 Aug 2020 17:28:26 -0500
Subject: [PATCH 1286/1718] MC-35633: POST /rest/V1/shipment does not change
 OrderItems qtyShipped

- Adding process plugin for shipping
---
 app/code/Magento/Sales/Model/ShipOrder.php    |  47 ++-
 .../Plugin/ProcessOrderAndShipmentViaAPI.php  | 241 ++++++++++++++
 .../Sales/Test/Unit/Model/ShipOrderTest.php   |   7 +-
 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   | 309 +++++++++++++++---
 .../order_with_bundle_shipped_separately.php  |   4 +
 7 files changed, 547 insertions(+), 67 deletions(-)
 create 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 2cc4c9b241172..26fe5a8e4b457 100644
--- a/app/code/Magento/Sales/Model/ShipOrder.php
+++ b/app/code/Magento/Sales/Model/ShipOrder.php
@@ -5,20 +5,32 @@
  */
 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;
 
 /**
  * Class ShipOrder
+ *
+ * Save shipment and order data
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ShipOrder implements ShipOrderInterface
@@ -111,30 +123,30 @@ public function __construct(
     }
 
     /**
+     * Process the shipment and save shipment and order data
+     *
      * @param int $orderId
-     * @param \Magento\Sales\Api\Data\ShipmentItemCreationInterface[] $items
+     * @param ShipmentItemCreationInterface[] $items
      * @param bool $notify
      * @param bool $appendComment
-     * @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
+     * @param ShipmentCommentCreationInterface|null $comment
+     * @param ShipmentTrackCreationInterface[] $tracks
+     * @param ShipmentPackageCreationInterface[] $packages
+     * @param ShipmentCreationArgumentsInterface|null $arguments
      * @return int
-     * @throws \Magento\Sales\Api\Exception\DocumentValidationExceptionInterface
-     * @throws \Magento\Sales\Api\Exception\CouldNotShipExceptionInterface
-     * @throws \Magento\Framework\Exception\InputException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @throws \DomainException
+     * @throws DocumentValidationExceptionInterface
+     * @throws CouldNotShipExceptionInterface
+     * @throws DomainException
      */
     public function execute(
         $orderId,
         array $items = [],
         $notify = false,
         $appendComment = false,
-        \Magento\Sales\Api\Data\ShipmentCommentCreationInterface $comment = null,
+        ShipmentCommentCreationInterface $comment = null,
         array $tracks = [],
         array $packages = [],
-        \Magento\Sales\Api\Data\ShipmentCreationArgumentsInterface $arguments = null
+        ShipmentCreationArgumentsInterface $arguments = null
     ) {
         $connection = $this->resourceConnection->getConnection('sales');
         $order = $this->orderRepository->get($orderId);
@@ -158,7 +170,7 @@ public function execute(
             $packages
         );
         if ($validationMessages->hasMessages()) {
-            throw new \Magento\Sales\Exception\DocumentValidationException(
+            throw new DocumentValidationException(
                 __("Shipment Document Validation Error(s):\n" . implode("\n", $validationMessages->getMessages()))
             );
         }
@@ -169,16 +181,19 @@ public function execute(
                 $this->orderStateResolver->getStateForOrder($order, [OrderStateResolverInterface::IN_PROGRESS])
             );
             $order->setStatus($this->config->getStateDefaultStatus($order->getState()));
-            $this->shipmentRepository->save($shipment);
+            $shippingData = $this->shipmentRepository->save($shipment);
             $this->orderRepository->save($order);
             $connection->commit();
         } catch (\Exception $e) {
             $this->logger->critical($e);
             $connection->rollBack();
-            throw new \Magento\Sales\Exception\CouldNotShipException(
+            throw new CouldNotShipException(
                 __('Could not save a shipment, see error log for details')
             );
         }
+        if ($shipment && empty($shipment->getEntityId())) {
+            $shipment->setEntityId($shippingData->getEntityId());
+        }
         if ($notify) {
             if (!$appendComment) {
                 $comment = null;
diff --git a/app/code/Magento/Sales/Plugin/ProcessOrderAndShipmentViaAPI.php b/app/code/Magento/Sales/Plugin/ProcessOrderAndShipmentViaAPI.php
new file mode 100644
index 0000000000000..2f81de65fad74
--- /dev/null
+++ b/app/code/Magento/Sales/Plugin/ProcessOrderAndShipmentViaAPI.php
@@ -0,0 +1,241 @@
+<?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 8531c54c6c4a0..5909ebd76feb1 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/ShipOrderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/ShipOrderTest.php
@@ -34,6 +34,9 @@
 use Psr\Log\LoggerInterface;
 
 /**
+ * Class ShipOrderTest
+ *
+ * Test Save shipment and order data
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @SuppressWarnings(PHPMD.TooManyFields)
  */
@@ -186,7 +189,7 @@ protected function setUp(): void
             ->getMockForAbstractClass();
         $this->shipOrderValidatorMock = $this->getMockBuilder(ShipOrderInterface::class)
             ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
+            ->getMock();
         $this->validationMessagesMock = $this->getMockBuilder(ValidatorResultInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['hasMessages', 'getMessages', 'addMessage'])
@@ -291,7 +294,7 @@ public function testExecute($orderId, $items, $notify, $appendComment)
                 ->method('notify')
                 ->with($this->orderMock, $this->shipmentMock, $this->shipmentCommentCreationMock);
         }
-        $this->shipmentMock->expects($this->once())
+        $this->shipmentMock->expects($this->exactly(2))
             ->method('getEntityId')
             ->willReturn(2);
         $this->assertEquals(
diff --git a/app/code/Magento/Sales/etc/webapi_rest/di.xml b/app/code/Magento/Sales/etc/webapi_rest/di.xml
index 5d7838297a7c7..1a8478438b04a 100644
--- a/app/code/Magento/Sales/etc/webapi_rest/di.xml
+++ b/app/code/Magento/Sales/etc/webapi_rest/di.xml
@@ -19,4 +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>
 </config>
diff --git a/app/code/Magento/Sales/etc/webapi_soap/di.xml b/app/code/Magento/Sales/etc/webapi_soap/di.xml
index 5d7838297a7c7..1a8478438b04a 100644
--- a/app/code/Magento/Sales/etc/webapi_soap/di.xml
+++ b/app/code/Magento/Sales/etc/webapi_soap/di.xml
@@ -19,4 +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>
 </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 08b3c4548e08f..29a11f9d68e8f 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,16 @@
 
 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;
 
 /**
  * Class ShipmentCreateTest
+ *
+ * Test shipment save API
  */
 class ShipmentCreateTest extends WebapiAbstract
 {
@@ -20,23 +26,78 @@ class ShipmentCreateTest extends WebapiAbstract
     const SERVICE_VERSION = 'V1';
 
     /**
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var ObjectManagerInterface
      */
     protected $objectManager;
 
     protected function setUp(): void
     {
-        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->objectManager = Bootstrap::getObjectManager();
     }
 
     /**
+     * Test save shipment return valid result with multiple tracks with multiple comments
+     *
      * @magentoApiDataFixture Magento/Sales/_files/order.php
      */
-    public function testInvoke()
+    public function testInvokeWithMultipleTrackAndComments()
     {
-        /** @var \Magento\Sales\Model\Order $order */
-        $order = $this->objectManager->create(\Magento\Sales\Model\Order::class)->loadByIncrementId('100000001');
-        $orderItem = current($order->getAllItems());
+        $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());
+
         $items = [
             [
                 'order_item_id' => $orderItem->getId(),
@@ -53,10 +114,201 @@ public function testInvoke()
                 'weight' => null,
             ],
         ];
-        $serviceInfo = [
+        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 [
             'rest' => [
                 'resourcePath' => self::RESOURCE_PATH,
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
+                'httpMethod' => Request::HTTP_METHOD_POST,
             ],
             'soap' => [
                 'service' => self::SERVICE_READ_NAME,
@@ -64,46 +316,5 @@ public function testInvoke()
                 '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 b91d479cdf1ef..e5f089ae9637c 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,6 +155,8 @@
 /** @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());
@@ -172,6 +174,8 @@
     /** @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 2ed36b3309d671b6574e94f0fb0d5a5e581fe785 Mon Sep 17 00:00:00 2001
From: Viktor Petryk <victor.petryk@transoftgroup.com>
Date: Wed, 5 Aug 2020 18:15:50 +0300
Subject: [PATCH 1287/1718] MC-35514: Can't create shipping label for existing
 order all JS components in sliding modal doesn't work.

---
 .../view/adminhtml/templates/order/packaging/grid.phtml    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
index 70a4633aaed23..df2a182343612 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
@@ -31,11 +31,14 @@
                 </th>
                 <th class="data-grid-th"><?= $block->escapeHtml(__('Product Name')) ?></th>
                 <th class="data-grid-th"><?= $block->escapeHtml(__('Weight')) ?></th>
-                <th class="data-grid-th custom-value">
+                <th id="th-custom-value-<?= /* @noEscape */ $randomId ?>" class="data-grid-th">
                     <?= $block->escapeHtml(__('Customs Value')) ?>
                 </th>
                 <?php if (!$block->displayCustomsValue()): ?>
-                    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display: none;', 'th.custom-value') ?>
+                    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
+                        'display:none',
+                        '#th-custom-value-' . $randomId
+                    ) ?>
                 <?php endif ?>
                 <th class="data-grid-th"><?= $block->escapeHtml(__('Qty Ordered')) ?></th>
                 <th class="data-grid-th"><?= $block->escapeHtml(__('Qty')) ?></th>

From 636075aa5eba55bf48aca209980a98d3040febd6 Mon Sep 17 00:00:00 2001
From: Viktor Petryk <victor.petryk@transoftgroup.com>
Date: Wed, 5 Aug 2020 18:31:18 +0300
Subject: [PATCH 1288/1718] MC-35514: Can't create shipping label for existing
 order all JS components in sliding modal doesn't work.

---
 .../view/adminhtml/templates/order/packaging/grid.phtml       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
index df2a182343612..7ddfc068fb115 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
@@ -31,13 +31,13 @@
                 </th>
                 <th class="data-grid-th"><?= $block->escapeHtml(__('Product Name')) ?></th>
                 <th class="data-grid-th"><?= $block->escapeHtml(__('Weight')) ?></th>
-                <th id="th-custom-value-<?= /* @noEscape */ $randomId ?>" class="data-grid-th">
+                <th class="data-grid-th custom-value">
                     <?= $block->escapeHtml(__('Customs Value')) ?>
                 </th>
                 <?php if (!$block->displayCustomsValue()): ?>
                     <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
                         'display:none',
-                        '#th-custom-value-' . $randomId
+                        '#packaging-data-grid-' . $randomId . ' th.custom-value'
                     ) ?>
                 <?php endif ?>
                 <th class="data-grid-th"><?= $block->escapeHtml(__('Qty Ordered')) ?></th>

From 209018c237afb975a05b9460701f215338a9013c Mon Sep 17 00:00:00 2001
From: Angelo Romano <angelo983@gmail.com>
Date: Wed, 5 Aug 2020 18:00:34 +0200
Subject: [PATCH 1289/1718] Changed misunderstanding title

In order failure page "We received your order!" is not appopriate.
---
 .../Checkout/view/frontend/layout/checkout_onepage_failure.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_failure.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_failure.xml
index 3ab37c2ab6b9f..b815bf74c155a 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_failure.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_failure.xml
@@ -9,7 +9,7 @@
     <body>
         <referenceBlock name="page.main.title">
             <action method="setPageTitle">
-                <argument translate="true" name="title" xsi:type="string">We received your order!</argument>
+                <argument translate="true" name="title" xsi:type="string">The order was not successful!</argument>
             </action>
         </referenceBlock>
         <referenceContainer name="content">

From afdcc93028526e740594a146b252f5047a65ac07 Mon Sep 17 00:00:00 2001
From: Angelo Romano <angelo983@gmail.com>
Date: Wed, 5 Aug 2020 18:31:16 +0200
Subject: [PATCH 1290/1718] Update en_US.csv

---
 app/code/Magento/Checkout/i18n/en_US.csv | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Checkout/i18n/en_US.csv b/app/code/Magento/Checkout/i18n/en_US.csv
index 4a78f8deae841..85ee4e1f03f0e 100644
--- a/app/code/Magento/Checkout/i18n/en_US.csv
+++ b/app/code/Magento/Checkout/i18n/en_US.csv
@@ -176,7 +176,7 @@ Summary,Summary
 "We'll send your order confirmation here.","We'll send your order confirmation here."
 Payment,Payment
 "Not yet calculated","Not yet calculated"
-"We received your order!","We received your order!"
+"The order was not successful!","The order was not successful!"
 "Thank you for your purchase!","Thank you for your purchase!"
 "Password", "Password"
 "Something went wrong while saving the page. Please refresh the page and try again.","Something went wrong while saving the page. Please refresh the page and try again."
@@ -184,4 +184,4 @@ Payment,Payment
 "Items in Cart","Items in Cart"
 "Close","Close"
 "Show Cross-sell Items in the Shopping Cart","Show Cross-sell Items in the Shopping Cart"
-"You added %1 to your <a href=""%2"">shopping cart</a>.","You added %1 to your <a href=""%2"">shopping cart</a>."
\ No newline at end of file
+"You added %1 to your <a href=""%2"">shopping cart</a>.","You added %1 to your <a href=""%2"">shopping cart</a>."

From e2b6d338ed4c978fdc11daa1aca93872160e504b Mon Sep 17 00:00:00 2001
From: Angelo Romano <angelo983@gmail.com>
Date: Wed, 5 Aug 2020 18:31:49 +0200
Subject: [PATCH 1291/1718] Update en_US.csv

---
 app/code/Magento/Multishipping/i18n/en_US.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Multishipping/i18n/en_US.csv b/app/code/Magento/Multishipping/i18n/en_US.csv
index f9ab587c65fa3..0c248bdcc1af3 100644
--- a/app/code/Magento/Multishipping/i18n/en_US.csv
+++ b/app/code/Magento/Multishipping/i18n/en_US.csv
@@ -87,7 +87,7 @@ Options,Options
 "Maximum Qty Allowed for Shipping to Multiple Addresses","Maximum Qty Allowed for Shipping to Multiple Addresses"
 "Review Order","Review Order"
 "Select Shipping Method","Select Shipping Method"
-"We received your order!","We received your order!"
+"The order was not successful!","The order was not successful!"
 "Ship to:","Ship to:"
 "Error:","Error:"
 "We are unable to process your request. Please, try again later.","We are unable to process your request. Please, try again later."

From 04049c0e8ebe2bbed2c2291467ce19ff8bfefd6a Mon Sep 17 00:00:00 2001
From: Deepty Thampy <dthampy@adobe.com>
Date: Wed, 5 Aug 2020 11:52:10 -0500
Subject: [PATCH 1292/1718] MC-20639: MyAccount :: Order Details :: Refund
 (creditMemo) Details by Order Number

- CR comments
---
 .../Magento/GraphQl/Sales/CreditmemoTest.php  | 33 +++++++++----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
index 97caad5cd3ee8..8aa7950bdc1ee 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
@@ -17,6 +17,7 @@
 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;
@@ -53,9 +54,6 @@ class CreditmemoTest extends GraphQlAbstract
     /** @var SearchCriteriaBuilder */
     private $searchCriteriaBuilder;
 
-    /** @var string */
-    private $orderNumber;
-
     /**
      * Set up
      */
@@ -76,8 +74,8 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
+        $this->cleanUpCreditMemos();
         $this->deleteOrder();
-        $this->cleanUpCreditMemos($this->orderNumber);
     }
 
     /**
@@ -174,10 +172,9 @@ public function testCreditMemoForBundledProductsWithPartialRefund()
             ['sku' => 'bundle-product-two-dropdown-options', 'quantity' => 2]
         );
         $orderNumber = $placeOrderResponse['placeOrder']['order']['order_number'];
-        $this->orderNumber = $orderNumber;
-        $this->prepareInvoice($this->orderNumber, 2);
+        $this->prepareInvoice($orderNumber, 2);
 
-        $order = $this->order->loadByIncrementId($this->orderNumber);
+        $order = $this->order->loadByIncrementId($orderNumber);
         /** @var Order\Item $orderItem */
         $orderItem = current($order->getAllItems());
         $orderItem->setQtyRefunded(1);
@@ -277,10 +274,8 @@ public function testCreditMemoForBundleProductWithTaxesAndDiscounts()
             ['sku' => 'bundle-product-two-dropdown-options', 'quantity' => 2]
         );
         $orderNumber = $placeOrderResponse['placeOrder']['order']['order_number'];
-        $this->orderNumber = $orderNumber;
-        $this->prepareInvoice($this->orderNumber, 2);
-
-        $order = $this->order->loadByIncrementId($this->orderNumber);
+        $this->prepareInvoice($orderNumber, 2);
+        $order = $this->order->loadByIncrementId($orderNumber);
         /** @var Order\Item $orderItem */
         $orderItem = current($order->getAllItems());
         $orderItem->setQtyRefunded(1);
@@ -427,17 +422,21 @@ private function deleteOrder(): void
     }
 
     /**
-     * @param $orderNumber
+     * @return void
      */
-    private function cleanUpCreditMemos($orderNumber): 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);
-        $searchCriteria = $this->searchCriteriaBuilder->addFilter('increment_id', $orderNumber)
-            ->create();
-        $creditmemos = $creditmemoRepository->getList($searchCriteria)->getItems();
-        foreach ($creditmemos as $creditmemo) {
+        $creditmemoCollection = Bootstrap::getObjectManager()->create(Collection::class);
+        foreach ($creditmemoCollection as $creditmemo) {
             $creditmemoRepository->delete($creditmemo);
         }
+        $registry->unregister('isSecureArea');
+        $registry->register('isSecureArea', false);
     }
 
     /**

From ee2ab23e86b9e2ed06d3ddd96e8c82fc0877363f Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Thu, 6 Aug 2020 01:05:56 +0800
Subject: [PATCH 1293/1718] 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 1124b89a0c1eb973f27ae13792b7380c56f72750 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Thu, 6 Aug 2020 01:42:59 +0800
Subject: [PATCH 1294/1718] magento/adobe-stock-integration#1716: Use Magento
 naming approach for FolderTree class - renamed function in FolderTree class

---
 .../MediaGalleryUi/Controller/Adminhtml/Directories/GetTree.php | 2 +-
 .../Magento/MediaGalleryUi/Model/Directories/FolderTree.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Directories/GetTree.php b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Directories/GetTree.php
index 229a717ef13dd..fe3b193d410a2 100644
--- a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Directories/GetTree.php
+++ b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Directories/GetTree.php
@@ -59,7 +59,7 @@ public function __construct(
     public function execute()
     {
         try {
-            $responseContent[] = $this->folderTree->buildTree();
+            $responseContent[] = $this->folderTree->execute();
             $responseCode = self::HTTP_OK;
         } catch (\Exception $exception) {
             $this->logger->critical($exception);
diff --git a/app/code/Magento/MediaGalleryUi/Model/Directories/FolderTree.php b/app/code/Magento/MediaGalleryUi/Model/Directories/FolderTree.php
index 574b8aab8bcd3..ac57125c45ec0 100644
--- a/app/code/Magento/MediaGalleryUi/Model/Directories/FolderTree.php
+++ b/app/code/Magento/MediaGalleryUi/Model/Directories/FolderTree.php
@@ -56,7 +56,7 @@ public function __construct(
      * @return array
      * @throws ValidatorException
      */
-    public function buildTree(bool $skipRoot = true): array
+    public function execute(bool $skipRoot = true): array
     {
         return $this->buildFolderTree($this->getDirectories(), $skipRoot);
     }

From 1353a546cc9aa4c6cc7f7d86763112d23645fcb7 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Wed, 5 Aug 2020 13:54:18 -0500
Subject: [PATCH 1295/1718] MC-20639: MyAccount :: Order Details :: Refund
 (creditMemo) Details by Order Number

---
 .../Magento/BundleGraphQl/etc/graphql/di.xml  |  7 +++
 ...memoItemInterfaceTypeResolverComposite.php | 56 -------------------
 .../Model/CreditmemoItemTypeResolver.php      | 29 ----------
 .../CreditMemo/CreditMemoComments.php         |  1 -
 .../Resolver/CreditMemo/CreditMemoItems.php   | 10 ++--
 .../Resolver/CreditMemo/CreditMemoTotal.php   |  8 +--
 .../Model/Resolver/Invoice/InvoiceTotal.php   |  8 +--
 .../Model/Resolver/OrderTotal.php             |  4 +-
 .../Model/TypeResolver/CreditMemoItem.php     | 44 +++++++++++++++
 .../Magento/SalesGraphQl/etc/graphql/di.xml   | 14 ++---
 .../Magento/SalesGraphQl/etc/schema.graphqls  |  2 +-
 11 files changed, 74 insertions(+), 109 deletions(-)
 delete mode 100644 app/code/Magento/SalesGraphQl/Model/CreditmemoItemInterfaceTypeResolverComposite.php
 delete mode 100644 app/code/Magento/SalesGraphQl/Model/CreditmemoItemTypeResolver.php
 create mode 100644 app/code/Magento/SalesGraphQl/Model/TypeResolver/CreditMemoItem.php

diff --git a/app/code/Magento/BundleGraphQl/etc/graphql/di.xml b/app/code/Magento/BundleGraphQl/etc/graphql/di.xml
index 7102b743ee068..863e152fbe177 100644
--- a/app/code/Magento/BundleGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/BundleGraphQl/etc/graphql/di.xml
@@ -86,6 +86,13 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\SalesGraphQl\Model\TypeResolver\CreditMemoItem">
+        <arguments>
+            <argument name="productTypeMap" xsi:type="array">
+                <item name="bundle" xsi:type="string">BundleCreditMemoItem</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\SalesGraphQl\Model\Shipment\ItemProvider">
         <arguments>
             <argument name="formatters" xsi:type="array">
diff --git a/app/code/Magento/SalesGraphQl/Model/CreditmemoItemInterfaceTypeResolverComposite.php b/app/code/Magento/SalesGraphQl/Model/CreditmemoItemInterfaceTypeResolverComposite.php
deleted file mode 100644
index 73810ac1bb8ef..0000000000000
--- a/app/code/Magento/SalesGraphQl/Model/CreditmemoItemInterfaceTypeResolverComposite.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\SalesGraphQl\Model;
-
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
-
-/**
- * Composite resolver for credit memo item
- */
-class CreditmemoItemInterfaceTypeResolverComposite implements TypeResolverInterface
-{
-    /**
-     * @var TypeResolverInterface[]
-     */
-    private $creditmemoItemTypeResolvers = [];
-
-    /**
-     * @param TypeResolverInterface[] $creditMemoItemTypeResolvers
-     */
-    public function __construct(array $creditMemoItemTypeResolvers = [])
-    {
-        $this->creditmemoItemTypeResolvers = $creditMemoItemTypeResolvers;
-    }
-
-    /**
-     * Resolve item type of an credit memo through composite resolvers
-     *
-     * @param array $data
-     * @return string
-     * @throws GraphQlInputException
-     */
-    public function resolveType(array $data): string
-    {
-        foreach ($this->creditmemoItemTypeResolvers as $creditMemoTypeResolver) {
-            if (!isset($data['product_type'])) {
-                throw new GraphQlInputException(
-                    __('Missing key %1 in sales item data', ['product_type'])
-                );
-            }
-            $resolvedType = $creditMemoTypeResolver->resolveType($data);
-            if (!empty($resolvedType)) {
-                return $resolvedType;
-            }
-        }
-
-        throw new GraphQlInputException(
-            __('Concrete type for %1 not implemented', ['CreditmemoItemInterface'])
-        );
-    }
-}
diff --git a/app/code/Magento/SalesGraphQl/Model/CreditmemoItemTypeResolver.php b/app/code/Magento/SalesGraphQl/Model/CreditmemoItemTypeResolver.php
deleted file mode 100644
index 3e5847366e69a..0000000000000
--- a/app/code/Magento/SalesGraphQl/Model/CreditmemoItemTypeResolver.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\SalesGraphQl\Model;
-
-use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
-
-/**
- * Resolve item type for credit memo item
- */
-class CreditmemoItemTypeResolver implements TypeResolverInterface
-{
-    /**
-     * @inheritDoc
-     */
-    public function resolveType(array $data): string
-    {
-        if (isset($data['product_type'])) {
-            if ($data['product_type'] == 'bundle') {
-                return 'BundleCreditMemoItem';
-            }
-        }
-        return 'CreditMemoItem';
-    }
-}
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoComments.php b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoComments.php
index e5f735a7e1f09..2c9fedf61b502 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoComments.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoComments.php
@@ -12,7 +12,6 @@
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Sales\Api\Data\CreditmemoInterface;
-use Magento\Sales\Api\Data\OrderInterface;
 
 /**
  * Resolve credit memo comments
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoItems.php b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoItems.php
index 81a4c9a0929d2..39ec964fae289 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoItems.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoItems.php
@@ -82,12 +82,12 @@ public function resolve(
      */
     private function getCreditMemoItems(OrderInterface $order, array $creditMemoItems): \Closure
     {
-        $items = [];
+        $orderItems = [];
         foreach ($creditMemoItems as $item) {
             $this->orderItemProvider->addOrderItemId((int)$item->getOrderItemId());
         }
 
-        return function () use ($order, $creditMemoItems, $items): array {
+        return function () use ($order, $creditMemoItems, $orderItems): array {
             foreach ($creditMemoItems as $creditMemoItem) {
                 $orderItem = $this->orderItemProvider->getOrderItemById((int)$creditMemoItem->getOrderItemId());
                 /** @var OrderItemInterface $orderItemModel */
@@ -95,11 +95,11 @@ private function getCreditMemoItems(OrderInterface $order, array $creditMemoItem
                 if (!$orderItemModel->getParentItem()) {
                     $creditMemoItemData = $this->getCreditMemoItemData($order, $creditMemoItem);
                     if (isset($creditMemoItemData)) {
-                        $items[$creditMemoItem->getOrderItemId()] = $creditMemoItemData;
+                        $orderItems[$creditMemoItem->getOrderItemId()] = $creditMemoItemData;
                     }
                 }
             }
-            return $items;
+            return $orderItems;
         };
     }
 
@@ -138,7 +138,7 @@ private function getCreditMemoItemData(OrderInterface $order, CreditmemoItemInte
     private function formatDiscountDetails(
         OrderInterface $associatedOrder,
         CreditmemoItemInterface $creditmemoItem
-    ) : array {
+    ): array {
         if ($associatedOrder->getDiscountDescription() === null
             && $creditmemoItem->getDiscountAmount() == 0
             && $associatedOrder->getDiscountAmount() == 0
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoTotal.php b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoTotal.php
index fa08c2d1bfdb4..5a8f4f7f17ce6 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoTotal.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoTotal.php
@@ -108,7 +108,7 @@ public function resolve(
             'adjustment' => [
                 'value' =>  abs($creditMemo->getAdjustment()),
                 'currency' => $currency
-            ],
+            ]
         ];
     }
 
@@ -119,7 +119,7 @@ public function resolve(
      * @param OrderInterface $orderModel
      * @return array
      */
-    private function getShippingDiscountDetails(CreditmemoInterface $creditmemoModel, $orderModel)
+    private function getShippingDiscountDetails(CreditmemoInterface $creditmemoModel, $orderModel): array
     {
         $creditmemoShippingAmount = (float)$creditmemoModel->getShippingAmount();
         $orderShippingAmount = (float)$orderModel->getShippingAmount();
@@ -146,7 +146,7 @@ private function getShippingDiscountDetails(CreditmemoInterface $creditmemoModel
      * @param CreditmemoInterface $creditmemo
      * @return array
      */
-    private function getDiscountDetails(CreditmemoInterface $creditmemo)
+    private function getDiscountDetails(CreditmemoInterface $creditmemo): array
     {
         $discounts = [];
         if (!($creditmemo->getDiscountDescription() === null && $creditmemo->getDiscountAmount() == 0)) {
@@ -168,7 +168,7 @@ private function getDiscountDetails(CreditmemoInterface $creditmemo)
      * @param array $appliedTaxes
      * @return array
      */
-    private function formatTaxes(OrderInterface $order, array $appliedTaxes)
+    private function formatTaxes(OrderInterface $order, array $appliedTaxes): array
     {
         $taxes = [];
         foreach ($appliedTaxes as $appliedTax) {
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceTotal.php b/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceTotal.php
index 2abf96529b83a..b77fda9523843 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceTotal.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceTotal.php
@@ -116,12 +116,12 @@ public function resolve(
      * @param OrderInterface $orderModel
      * @return array
      */
-    private function getShippingDiscountDetails(InvoiceInterface $invoiceModel, OrderInterface $orderModel)
+    private function getShippingDiscountDetails(InvoiceInterface $invoiceModel, OrderInterface $orderModel): array
     {
         $invoiceShippingAmount = (float)$invoiceModel->getShippingAmount();
         $orderShippingAmount = (float)$orderModel->getShippingAmount();
         $calculatedShippingRatioFromOriginal = $invoiceShippingAmount != 0 && $orderShippingAmount != 0 ?
-            ( $invoiceShippingAmount / $orderShippingAmount) : 0;
+            ($invoiceShippingAmount / $orderShippingAmount) : 0;
         $orderShippingDiscount = (float)$orderModel->getShippingDiscountAmount();
         $calculatedInvoiceShippingDiscount = $orderShippingDiscount * $calculatedShippingRatioFromOriginal;
         $shippingDiscounts = [];
@@ -143,7 +143,7 @@ private function getShippingDiscountDetails(InvoiceInterface $invoiceModel, Orde
      * @param InvoiceInterface $invoice
      * @return array
      */
-    private function getDiscountDetails(InvoiceInterface $invoice)
+    private function getDiscountDetails(InvoiceInterface $invoice): array
     {
         $discounts = [];
         if (!($invoice->getDiscountDescription() === null && $invoice->getDiscountAmount() == 0)) {
@@ -165,7 +165,7 @@ private function getDiscountDetails(InvoiceInterface $invoice)
      * @param array $appliedTaxes
      * @return array
      */
-    private function formatTaxes(OrderInterface $order, array $appliedTaxes)
+    private function formatTaxes(OrderInterface $order, array $appliedTaxes): array
     {
         $taxes = [];
         foreach ($appliedTaxes as $appliedTax) {
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php
index fc1049e3fe800..ab3ace45f336c 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php
@@ -38,8 +38,8 @@ public function resolve(
         $baseCurrency = $order->getBaseCurrencyCode();
 
         return [
-            'base_grand_total' => ['value' => $order->getBaseGrandTotal(), 'currency' => $currency],
-            'grand_total' => ['value' => $order->getGrandTotal(), 'currency' => $baseCurrency],
+            'base_grand_total' => ['value' => $order->getBaseGrandTotal(), 'currency' => $baseCurrency],
+            'grand_total' => ['value' => $order->getGrandTotal(), 'currency' => $currency],
             'subtotal' => ['value' => $order->getSubtotal(), 'currency' => $currency],
             'total_tax' => ['value' => $order->getTaxAmount(), 'currency' => $currency],
             'taxes' => $this->getAppliedTaxesDetails($order),
diff --git a/app/code/Magento/SalesGraphQl/Model/TypeResolver/CreditMemoItem.php b/app/code/Magento/SalesGraphQl/Model/TypeResolver/CreditMemoItem.php
new file mode 100644
index 0000000000000..8fab97153231b
--- /dev/null
+++ b/app/code/Magento/SalesGraphQl/Model/TypeResolver/CreditMemoItem.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesGraphQl\Model\TypeResolver;
+
+use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+
+/**
+ * Resolve concrete type for CreditMemoItemInterface
+ */
+class CreditMemoItem implements TypeResolverInterface
+{
+    /**
+     * @var array
+     */
+    private $productTypeMap;
+
+    /**
+     * @param array $productTypeMap
+     */
+    public function __construct($productTypeMap = [])
+    {
+        $this->productTypeMap = $productTypeMap;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function resolveType(array $data): string
+    {
+        if (!isset($data['product_type'])) {
+            throw new GraphQlInputException(__('Missing key %1 in sales item data', ['product_type']));
+        }
+        if (isset($this->productTypeMap[$data['product_type']])) {
+            return $this->productTypeMap[$data['product_type']];
+        }
+        return $this->productTypeMap['default'];
+    }
+}
diff --git a/app/code/Magento/SalesGraphQl/etc/graphql/di.xml b/app/code/Magento/SalesGraphQl/etc/graphql/di.xml
index 8d7518b278cc1..b40d8e9331bbb 100644
--- a/app/code/Magento/SalesGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/SalesGraphQl/etc/graphql/di.xml
@@ -20,6 +20,13 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\SalesGraphQl\Model\TypeResolver\CreditMemoItem">
+        <arguments>
+            <argument name="productTypeMap" xsi:type="array">
+                <item name="default" xsi:type="string">CreditMemoItem</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\SalesGraphQl\Model\TypeResolver\ShipmentItem">
         <arguments>
             <argument name="productTypeMap" xsi:type="array">
@@ -35,11 +42,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\SalesGraphQl\Model\CreditmemoItemInterfaceTypeResolverComposite">
-        <arguments>
-            <argument name="creditMemoItemTypeResolvers" xsi:type="array">
-                <item name="creditmemo_catalog_item_type_resolver" xsi:type="object">Magento\SalesGraphQl\Model\CreditmemoItemTypeResolver</item>
-            </argument>
-        </arguments>
-    </type>
 </config>
diff --git a/app/code/Magento/SalesGraphQl/etc/schema.graphqls b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
index 32c54ad75c5af..8b9d58e48d4b1 100644
--- a/app/code/Magento/SalesGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
@@ -211,7 +211,7 @@ type CreditMemo @doc(description: "Credit memo details") {
     comments: [CommentItem] @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\\CreditmemoItemInterfaceTypeResolverComposite") {
+interface CreditMemoItemInterface @doc(description: "Credit memo item details") @typeResolver(class: "Magento\\SalesGraphQl\\Model\\TypeResolver\\CreditMemoItem") {
     id: ID! @doc(description: "The unique ID of the credit memo item, used for API purposes")
     order_item: OrderItemInterface @doc(description: "The order item the credit memo is applied to") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\OrderItem")
     product_name: String @doc(description: "The name of the base product")

From 9f53f68bbb32188ff45735d011cb4f97da4a12e3 Mon Sep 17 00:00:00 2001
From: Dave Macaulay <macaulay@adobe.com>
Date: Wed, 5 Aug 2020 14:54:24 -0500
Subject: [PATCH 1296/1718] PWA-806: Localize emails sent through GraphQL
 application

---
 .../Magento/GraphQl/Plugin/StoreResolver.php  | 82 +++++++++++++++++++
 .../GraphQl/Plugin/TranslationLoader.php      | 46 +++++++++++
 app/code/Magento/GraphQl/etc/graphql/di.xml   |  6 ++
 lib/internal/Magento/Framework/Phrase/__.php  | 14 +++-
 4 files changed, 146 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/GraphQl/Plugin/StoreResolver.php
 create mode 100644 app/code/Magento/GraphQl/Plugin/TranslationLoader.php

diff --git a/app/code/Magento/GraphQl/Plugin/StoreResolver.php b/app/code/Magento/GraphQl/Plugin/StoreResolver.php
new file mode 100644
index 0000000000000..a57a31a1f42e1
--- /dev/null
+++ b/app/code/Magento/GraphQl/Plugin/StoreResolver.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace Magento\GraphQl\Plugin;
+
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\Store\Model\StoreIsInactiveException;
+
+/**
+ * Load translations for GraphQL requests
+ */
+class StoreResolver
+{
+    /**
+     * @var RequestInterface|HttpRequest
+     */
+    private $request;
+
+    /**
+     * @var StoreRepositoryInterface
+     */
+    private $storeRepository;
+
+    /**
+     * @param RequestInterface $request
+     * @param StoreRepositoryInterface $storeRepository
+     */
+    public function __construct(
+        RequestInterface $request,
+        StoreRepositoryInterface $storeRepository
+    ) {
+        $this->request = $request;
+        $this->storeRepository = $storeRepository;
+    }
+
+    /**
+     * Use the 'Store' header to determine the current store
+     *
+     * @param \Magento\Store\Model\StoreResolver $subject
+     * @param callable $proceed
+     * @return mixed
+     */
+    public function aroundGetCurrentStoreId(\Magento\Store\Model\StoreResolver $subject, callable $proceed)
+    {
+        $storeCode = $this->request->getHeader('Store');
+
+        if ($storeCode) {
+            try {
+                $store = $this->getRequestedStoreByCode($storeCode);
+
+                if ($store) {
+                    return $store;
+                }
+            } catch (NoSuchEntityException $e) {
+                return $proceed();
+            }
+        }
+
+        return $proceed();
+    }
+
+    /**
+     * Retrieve active store by code
+     *
+     * @param string $storeCode
+     * @return StoreInterface
+     * @throws NoSuchEntityException
+     */
+    private function getRequestedStoreByCode($storeCode) : StoreInterface
+    {
+        try {
+            $store = $this->storeRepository->getActiveStoreByCode($storeCode);
+        } catch (StoreIsInactiveException $e) {
+            throw new NoSuchEntityException(__('Requested store is inactive'));
+        }
+
+        return $store;
+    }
+}
diff --git a/app/code/Magento/GraphQl/Plugin/TranslationLoader.php b/app/code/Magento/GraphQl/Plugin/TranslationLoader.php
new file mode 100644
index 0000000000000..62c23e454fdf2
--- /dev/null
+++ b/app/code/Magento/GraphQl/Plugin/TranslationLoader.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Magento\GraphQl\Plugin;
+
+use Magento\Framework\App\AreaInterface;
+use Magento\Framework\App\AreaList;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\State;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Load translations for GraphQL requests
+ */
+class TranslationLoader
+{
+    /**
+     * @var AreaList
+     */
+    private $areaList;
+
+    /**
+     * @var State
+     */
+    private $appState;
+
+    /**
+     * @param AreaList $areaList
+     * @param State $appState
+     */
+    public function __construct(
+        AreaList $areaList,
+        State $appState
+    ) {
+        $this->areaList = $areaList;
+        $this->appState = $appState;
+    }
+
+    /**
+     * Before rendering any string ensure the translation aspect of area is loaded
+     */
+    public function beforeRender(\Magento\Framework\Phrase $subject)
+    {
+        $area = $this->areaList->getArea($this->appState->getAreaCode());
+        $area->load(AreaInterface::PART_TRANSLATE);
+    }
+}
diff --git a/app/code/Magento/GraphQl/etc/graphql/di.xml b/app/code/Magento/GraphQl/etc/graphql/di.xml
index 23d49124d1a02..9ab86610f50f8 100644
--- a/app/code/Magento/GraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/GraphQl/etc/graphql/di.xml
@@ -41,4 +41,10 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\Phrase">
+        <plugin name="graphQlLocalizationPhrasePlugin" type="Magento\GraphQl\Plugin\TranslationLoader" />
+    </type>
+    <type name="Magento\Store\Model\StoreResolver">
+        <plugin name="graphQlLocalizationStoreResolver" type="Magento\GraphQl\Plugin\StoreResolver" />
+    </type>
 </config>
diff --git a/lib/internal/Magento/Framework/Phrase/__.php b/lib/internal/Magento/Framework/Phrase/__.php
index 0f828acd828b5..9deff31021999 100644
--- a/lib/internal/Magento/Framework/Phrase/__.php
+++ b/lib/internal/Magento/Framework/Phrase/__.php
@@ -3,15 +3,19 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 declare(strict_types=1);
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Phrase;
+
 /**
  * Create value-object \Magento\Framework\Phrase
  *
  * @SuppressWarnings(PHPMD.ShortMethodName)
  * phpcs:disable Squiz.Functions.GlobalFunction
  * @param array $argc
- * @return \Magento\Framework\Phrase
+ * @return Phrase
  */
 function __(...$argc)
 {
@@ -20,5 +24,11 @@ function __(...$argc)
         $argc = $argc[0];
     }
 
-    return new \Magento\Framework\Phrase($text, $argc);
+    return ObjectManager::getInstance()->create(
+        Phrase::class,
+        [
+            'text' => $text,
+            'arguments' => $argc
+        ]
+    );
 }

From 4c5403d5303e6472e0604da9fc6209a4713c3177 Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Wed, 5 Aug 2020 14:56:36 -0500
Subject: [PATCH 1297/1718] - removing path from UserInputErrors since its not
 in scope and current implementation is irrelevant.

---
 app/code/Magento/QuoteGraphQl/etc/schema.graphqls    | 1 -
 app/code/Magento/WishlistGraphQl/etc/schema.graphqls | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
index a01afabba9683..5d11d93eedf85 100644
--- a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -375,7 +375,6 @@ type Order {
 
 type CartUserInputError @doc(description:"An error encountered while adding an item to the the cart.") {
     message: String! @doc(description: "A localized error message")
-    path: [String]! @doc(description: "Path to the input field that caused an error. See the GraphQL specification about path errors for details: http://spec.graphql.org/draft/#sec-Errors")
     code: CartUserInputErrorType! @doc(description: "Checkout-specific error code")
 }
 
diff --git a/app/code/Magento/WishlistGraphQl/etc/schema.graphqls b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
index 702821fd7af92..b5a12a82c84d3 100644
--- a/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
@@ -72,7 +72,6 @@ type UpdateProductsInWishlistOutput @doc(description: "Contains the customer's w
 
 type WishListUserInputError @doc(description:"An error encountered while performing operations with WishList.") {
     message: String! @doc(description: "A localized error message")
-    path: [String]! @doc(description: "Path to the input field that caused an error. See the GraphQL specification about path errors for details: http://spec.graphql.org/draft/#sec-Errors")
     code: WishListUserInputErrorType! @doc(description: "Wishlist-specific error code")
 }
 

From 42bbe58e1da7a0f7b7ee4fa076e76567706fde4e Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 5 Aug 2020 22:57:27 +0300
Subject: [PATCH 1298/1718] IMprove url filter applier to catch multiselect
 filters options

---
 .../product/grid/url_filter_applier.phtml     |  3 +-
 .../templates/url_filter_applier.phtml        |  3 +-
 .../Magento/MediaGalleryCmsUi/composer.json   |  3 +-
 .../adminhtml/web/css/source/_module.less     |  8 +++-
 .../adminhtml/web/js/image/image-details.js   |  5 ++-
 .../base/web/js/grid/url-filter-applier.js    | 43 +++++++++++++++++--
 6 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml
index 3e00503a882db..a2802adb9ebcb 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml
@@ -10,7 +10,8 @@
     {
         "*": {
             "Magento_Ui/js/grid/url-filter-applier": {
-                "listingNamespace": "product_listing"
+                "listingNamespace": "product_listing",
+                "selectComponentName": "asset_id"
             }
         }
     }
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml b/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
index a4918e86715a8..5592f52a06ead 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
@@ -11,7 +11,8 @@
     {
         "*": {
             "Magento_Ui/js/grid/url-filter-applier": {
-                "listingNamespace": "<?= $escaper->escapeJs($block->getListingNamespace()) ?>"
+                "listingNamespace": "<?= $escaper->escapeJs($block->getListingNamespace()) ?>",
+                "selectComponentName": "asset_id"
             }
         }
     }
diff --git a/app/code/Magento/MediaGalleryCmsUi/composer.json b/app/code/Magento/MediaGalleryCmsUi/composer.json
index 1ecfb9a3c8855..73747a669c051 100644
--- a/app/code/Magento/MediaGalleryCmsUi/composer.json
+++ b/app/code/Magento/MediaGalleryCmsUi/composer.json
@@ -5,7 +5,8 @@
         "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-cms": "*",
-        "magento/module-backend": "*"
+        "magento/module-backend": "*",
+        "magento/module-ui": "*"
     },
     "type": "magento2-module",
     "license": [
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 29990d1c5a733..eb32686ade512 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
@@ -29,7 +29,8 @@
         }
     }
 
-    .media-gallery-asset-ui-select-filter, .edit-image-details {
+    .media-gallery-asset-ui-select-filter,
+    .edit-image-details {
 
         .admin__action-multiselect-crumb {
             max-width: 70%;
@@ -49,7 +50,8 @@
         }
     }
 
-    .media-gallery-asset-ui-select-filter, .edit-image-details {
+    .media-gallery-asset-ui-select-filter,
+    .edit-image-details {
         .admin__action-multiselect-item-path {
             float: right;
             max-height: 70px;
@@ -418,11 +420,13 @@
                         }
 
                         .value {
+                            margin-left: 1px;
                             display: inline;
                             float: right;
                         }
 
                         .title {
+                            height: 100px
                             color: @color-very-dark-gray;
                         }
                     }
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-details.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-details.js
index db42f155501c3..6f4f89f484937 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-details.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-details.js
@@ -161,7 +161,10 @@ define([
          * @param {String} link
          */
         getFilterUrl: function (link) {
-            return link + '?filters[asset_id]=[' + this.image().id + ']';
+            return link + '?filters[asset_id]=[' + this.image().id + ']' +
+                '&value=' + this.image().id +
+                '&label=' + this.image().title +
+                '&src=' + this.image()['image_url'];
         },
 
         /**
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 4129454fd7845..c53d71cea073a 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
@@ -12,11 +12,15 @@ define([
     return Component.extend({
         defaults: {
             listingNamespace: null,
+            selectComponentName: null,
+            selectProvider: 'index = ${ $.selectComponentName }, ns = ${ $.listingNamespace }',
             filterProvider: 'componentType = filters, ns = ${ $.listingNamespace }',
             filterKey: 'filters',
+            optionsKey: 'options',
             searchString: location.search,
             modules: {
-                filterComponent: '${ $.filterProvider }'
+                filterComponent: '${ $.filterProvider }',
+                selectComponent: '${ $.selectProvider }'
             }
         },
 
@@ -36,9 +40,11 @@ define([
          * Apply filter
          */
         apply: function () {
-            var urlFilter = this.getFilterParam(this.searchString);
+            var urlFilter = this.getFilterParam(this.searchString),
+                options = this.getOptionsParam(this.searchString);
 
-            if (_.isUndefined(this.filterComponent())) {
+            if (_.isUndefined(this.filterComponent()) ||
+                !_.isNull(this.selectComponentName) && _.isUndefined(this.selectComponent())) {
                 setTimeout(function () {
                     this.apply();
                 }.bind(this), 100);
@@ -46,6 +52,11 @@ define([
                 return;
             }
 
+            if (Object.keys(options).length) {
+                this.selectComponent().options(options);
+                this.selectComponent().cacheOptions.plain = [options];
+            }
+
             if (Object.keys(urlFilter).length) {
                 this.filterComponent().setData(urlFilter, false);
                 this.filterComponent().apply();
@@ -63,12 +74,14 @@ define([
 
             return _.chain(searchString.slice(1).split('&'))
                 .map(function (item) {
+
                     if (item && item.search(this.filterKey) !== -1) {
                         itemArray = item.split('=');
 
                         if (itemArray[1].search('\\[') === 0) {
                             itemArray[1] = itemArray[1].replace(/[\[\]]/g, '').split(',');
                         }
+
                         itemArray[0] = itemArray[0].replace(this.filterKey, '')
                                 .replace(/[\[\]]/g, '');
 
@@ -78,6 +91,30 @@ define([
                 .compact()
                 .object()
                 .value();
+        },
+
+        /**
+         * Get Filter options
+         *
+         * @param {String} url
+         */
+        getOptionsParam: function (url) {
+            var searchString = decodeURI(url),
+                options;
+            options = Object.fromEntries(new URLSearchParams(searchString));
+            delete options['filters[asset_id]'];
+
+            return options;
+        },
+
+        /**
+         * Set select component options
+         *
+         * @param {Array} options
+         */
+        setOptions: function (options) {
+            this.selectComponent().options(options);
+
         }
     });
 });

From cbe47c228d3309af0a7153ff570877fc9f3b2cff Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 5 Aug 2020 22:59:25 +0300
Subject: [PATCH 1299/1718] Remove wrong height

---
 .../MediaGalleryUi/view/adminhtml/web/css/source/_module.less    | 1 -
 1 file changed, 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 eb32686ade512..74cc4179b3f2b 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
@@ -426,7 +426,6 @@
                         }
 
                         .title {
-                            height: 100px
                             color: @color-very-dark-gray;
                         }
                     }

From 97a951bfd39f65e92b7fd95c188019202ba41d51 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 5 Aug 2020 23:01:03 +0300
Subject: [PATCH 1300/1718] Remove unused method

---
 .../Ui/view/base/web/js/grid/url-filter-applier.js     | 10 ----------
 1 file changed, 10 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 c53d71cea073a..1efb161c6a3c3 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
@@ -105,16 +105,6 @@ define([
             delete options['filters[asset_id]'];
 
             return options;
-        },
-
-        /**
-         * Set select component options
-         *
-         * @param {Array} options
-         */
-        setOptions: function (options) {
-            this.selectComponent().options(options);
-
         }
     });
 });

From 6344ad2a0d938c2a0dd964a21ca9a9222dd4a881 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 5 Aug 2020 23:07:22 +0300
Subject: [PATCH 1301/1718] Use text binding for empty options placeholder

---
 .../base/web/templates/grid/filters/elements/ui-select.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 a98e6c2e07576..17df2ef9f1f53 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: emptyOptionsHtml"/>
+            <ul data-bind="text: emptyOptionsHtml"/>
         </div>
         <!-- /ko -->
         <ul class="admin__action-multiselect-menu-inner _root"

From 5a0680cd19ec70d110ba995996f6f2785258cfb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Szubert?= <bartlomiejszubert@gmail.com>
Date: Wed, 5 Aug 2020 22:42:51 +0200
Subject: [PATCH 1302/1718] Fix #24060 - Terms and Conditions label doesn't fit
 longer texts

---
 .../module/checkout/_checkout-agreements.less | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_checkout-agreements.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_checkout-agreements.less
index ff4f07a983940..b8be2b33a4475 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_checkout-agreements.less
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_checkout-agreements.less
@@ -13,6 +13,30 @@
             margin-bottom: @indent__base;
         }
 
+        .checkout-agreement.field {
+            .lib-vendor-prefix-display();
+
+            &.required {
+                label:after {
+                    content: none;
+                }
+
+                .action-show {
+                    &:after {
+                        content: '*';
+                        .lib-typography(
+                            @_font-size: @form-field-label-asterisk__font-size,
+                            @_color: @form-field-label-asterisk__color,
+                            @_font-family: @form-field-label-asterisk__font-family,
+                            @_font-weight: @form-field-label-asterisk__font-weight,
+                            @_line-height: @form-field-label-asterisk__line-height,
+                            @_font-style: @form-field-label-asterisk__font-style
+                        );
+                    }
+                }
+            }
+        }
+
         .action-show {
             &:extend(.abs-action-button-as-link all);
             vertical-align: baseline;

From 84ceb3007de0ab169e74ed9f5be6bd8272906782 Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Wed, 5 Aug 2020 15:44:14 -0500
Subject: [PATCH 1303/1718] - minor fix

---
 app/code/Magento/Quote/Model/Cart/AddProductsToCart.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php b/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
index 8707f7755e2fb..2b93bbd95d07b 100644
--- a/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
+++ b/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
@@ -200,7 +200,7 @@ private function addError(string $message, int $cartItemPosition = 0): void
     private function getErrorCode(string $message): string
     {
         foreach (self::MESSAGE_CODES as $codeMessage => $code) {
-            if (false !== stripos($codeMessage, $message)) {
+            if (false !== stripos($message, $codeMessage)) {
                 return $code;
             }
         }

From 5f8682897f3cbb9fa45d7b8a4344748514afd690 Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Wed, 5 Aug 2020 18:10:44 -0500
Subject: [PATCH 1304/1718] - fix: field names should not be camel case

---
 .../Model/Resolver/AddProductsToCart.php       |  2 +-
 .../Magento/QuoteGraphQl/etc/schema.graphqls   |  4 ++--
 .../Model/Resolver/AddProductsToWishlist.php   |  2 +-
 .../Resolver/RemoveProductsFromWishlist.php    |  2 +-
 .../Resolver/UpdateProductsInWishlist.php      |  2 +-
 .../WishlistGraphQl/etc/schema.graphqls        |  6 +++---
 ...ddBundleProductToCartSingleMutationTest.php |  6 +++---
 ...igurableProductToCartSingleMutationTest.php | 10 +++++-----
 ...loadableProductToCartSingleMutationTest.php |  2 +-
 .../AddSimpleProductToCartEndToEndTest.php     |  2 +-
 ...ddSimpleProductToCartSingleMutationTest.php | 18 +++++++++---------
 .../AddBundleProductToWishlistTest.php         |  2 +-
 .../AddConfigurableProductToWishlistTest.php   |  2 +-
 .../AddDownloadableProductToWishlistTest.php   |  2 +-
 .../DeleteProductsFromWishlistTest.php         |  2 +-
 .../UpdateProductsFromWishlistTest.php         |  2 +-
 16 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/AddProductsToCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/AddProductsToCart.php
index a00633390eff1..d5e554f096ec1 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/AddProductsToCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/AddProductsToCart.php
@@ -78,7 +78,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             'cart' => [
                 'model' => $addProductsToCartOutput->getCart(),
             ],
-            'userInputErrors' => array_map(
+            'user_errors' => array_map(
                 function (Error $error) {
                     return [
                         'code' => $error->getCode(),
diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
index 5d11d93eedf85..4e0e7ce5732be 100644
--- a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -375,12 +375,12 @@ type Order {
 
 type CartUserInputError @doc(description:"An error encountered while adding an item to the the cart.") {
     message: String! @doc(description: "A localized error message")
-    code: CartUserInputErrorType! @doc(description: "Checkout-specific error code")
+    code: CartUserInputErrorType! @doc(description: "Cart-specific error code")
 }
 
 type AddProductsToCartOutput {
     cart: Cart! @doc(description: "The cart after products have been added")
-    userInputErrors:[CartUserInputError]! @doc(description: "An error encountered while adding an item to the cart.")
+    user_errors: [CartUserInputError!]! @doc(description: "An error encountered while adding an item to the cart.")
 }
 
 enum CartUserInputErrorType {
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/AddProductsToWishlist.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/AddProductsToWishlist.php
index 11c8446a72a9d..3489585cd17d7 100644
--- a/app/code/Magento/WishlistGraphQl/Model/Resolver/AddProductsToWishlist.php
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/AddProductsToWishlist.php
@@ -105,7 +105,7 @@ public function resolve(
 
         return [
             'wishlist' => $this->wishlistDataMapper->map($wishlistOutput->getWishlist()),
-            'userInputErrors' => array_map(
+            'user_errors' => array_map(
                 function (Error $error) {
                     return [
                         'code' => $error->getCode(),
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/RemoveProductsFromWishlist.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/RemoveProductsFromWishlist.php
index 1c741361ea7b7..a59c5ccdb0f70 100644
--- a/app/code/Magento/WishlistGraphQl/Model/Resolver/RemoveProductsFromWishlist.php
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/RemoveProductsFromWishlist.php
@@ -109,7 +109,7 @@ public function resolve(
 
         return [
             'wishlist' => $this->wishlistDataMapper->map($wishlistOutput->getWishlist()),
-            'userInputErrors' => \array_map(
+            'user_errors' => \array_map(
                 function (Error $error) {
                     return [
                         'code' => $error->getCode(),
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/UpdateProductsInWishlist.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/UpdateProductsInWishlist.php
index 50a56863596c0..c6ede66fc2b1b 100644
--- a/app/code/Magento/WishlistGraphQl/Model/Resolver/UpdateProductsInWishlist.php
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/UpdateProductsInWishlist.php
@@ -110,7 +110,7 @@ public function resolve(
 
         return [
             'wishlist' => $this->wishlistDataMapper->map($wishlistOutput->getWishlist()),
-            'userInputErrors' => \array_map(
+            'user_errors' => \array_map(
                 function (Error $error) {
                     return [
                         'code' => $error->getCode(),
diff --git a/app/code/Magento/WishlistGraphQl/etc/schema.graphqls b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
index b5a12a82c84d3..430e77cc45e96 100644
--- a/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
@@ -49,12 +49,12 @@ input WishlistItemInput @doc(description: "Defines the items to add to a wish li
 
 type AddProductsToWishlistOutput @doc(description: "Contains the customer's wish list and any errors encountered") {
     wishlist: Wishlist! @doc(description: "Contains the wish list with all items that were successfully added")
-    userInputErrors:[WishListUserInputError]! @doc(description: "An array of errors encountered while adding products to a wish list")
+    user_errors:[WishListUserInputError!]! @doc(description: "An array of errors encountered while adding products to a wish list")
 }
 
 type RemoveProductsFromWishlistOutput @doc(description: "Contains the customer's wish list and any errors encountered") {
     wishlist: Wishlist! @doc(description: "Contains the wish list with after items were successfully deleted")
-    userInputErrors:[WishListUserInputError]! @doc(description:"An array of errors encountered while deleting products from a wish list")
+    user_errors:[WishListUserInputError!]! @doc(description:"An array of errors encountered while deleting products from a wish list")
 }
 
 input WishlistItemUpdateInput @doc(description: "Defines updates to items in a wish list") {
@@ -67,7 +67,7 @@ input WishlistItemUpdateInput @doc(description: "Defines updates to items in a w
 
 type UpdateProductsInWishlistOutput @doc(description: "Contains the customer's wish list and any errors encountered") {
     wishlist: Wishlist! @doc(description: "Contains the wish list with all items that were successfully updated")
-    userInputErrors:[WishListUserInputError]! @doc(description:"An array of errors encountered while updating products in a wish list")
+    user_errors: [WishListUserInputError!]! @doc(description:"An array of errors encountered while updating products in a wish list")
 }
 
 type WishListUserInputError @doc(description:"An error encountered while performing operations with WishList.") {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartSingleMutationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartSingleMutationTest.php
index be1bfce9441d6..fc0fdcf71525f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartSingleMutationTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartSingleMutationTest.php
@@ -208,7 +208,7 @@ public function testAddBundleToCartWithWrongBundleOptions()
             }
         }
     }
-    userInputErrors {
+    user_errors {
         message
     }
   }
@@ -219,7 +219,7 @@ public function testAddBundleToCartWithWrongBundleOptions()
 
         self::assertEquals(
             "Please select all required options.",
-            $response['addProductsToCart']['userInputErrors'][0]['message']
+            $response['addProductsToCart']['user_errors'][0]['message']
         );
     }
 
@@ -341,7 +341,7 @@ private function getMutationsQuery(
             }
         }
     }
-    userInputErrors {
+    user_errors {
         message
     }
   }
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 3612bc7f26e49..a2b7b54fb875a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartSingleMutationTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartSingleMutationTest.php
@@ -103,7 +103,7 @@ public function testAddConfigurableProductWithWrongSuperAttributes()
 
         self::assertEquals(
             'You need to choose options for your item.',
-            $response['addProductsToCart']['userInputErrors'][0]['message']
+            $response['addProductsToCart']['user_errors'][0]['message']
         );
     }
 
@@ -132,7 +132,7 @@ public function testAddProductIfQuantityIsNotAvailable()
 
         self::assertEquals(
             'The requested qty is not available',
-            $response['addProductsToCart']['userInputErrors'][0]['message']
+            $response['addProductsToCart']['user_errors'][0]['message']
         );
     }
 
@@ -156,7 +156,7 @@ public function testAddNonExistentConfigurableProductParentToCart()
 
         self::assertEquals(
             'Could not find a product with SKU "configurable_no_exist"',
-            $response['addProductsToCart']['userInputErrors'][0]['message']
+            $response['addProductsToCart']['user_errors'][0]['message']
         );
     }
 
@@ -188,7 +188,7 @@ public function testOutOfStockVariationToCart()
             'This product is out of stock.'
         ];
         $this->assertContains(
-            $response['addProductsToCart']['userInputErrors'][0]['message'],
+            $response['addProductsToCart']['user_errors'][0]['message'],
             $expectedErrorMessages
         );
     }
@@ -235,7 +235,7 @@ private function getQuery(
                 }
             }
         },
-        userInputErrors {
+        user_errors {
             message
         }
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddDownloadableProductToCartSingleMutationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddDownloadableProductToCartSingleMutationTest.php
index ce613d2d958c0..956316c1fa0fa 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddDownloadableProductToCartSingleMutationTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddDownloadableProductToCartSingleMutationTest.php
@@ -186,7 +186,7 @@ private function getQuery(
                 }
             }
         },
-        userInputErrors {
+        user_errors {
             message
         }
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartEndToEndTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartEndToEndTest.php
index f416dad46f64a..d8f7aedfdd583 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartEndToEndTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartEndToEndTest.php
@@ -250,7 +250,7 @@ private function getAddToCartMutation(
                 }
             }
         },
-        userInputErrors {
+        user_errors {
             message
         }
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php
index 139aa38bc24c0..4e50f6ff3a2ca 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/AddSimpleProductToCartSingleMutationTest.php
@@ -112,11 +112,11 @@ public function testAddProductWithWrongSku(string $sku, string $message)
         $query = $this->getAddToCartMutation($maskedQuoteId, 1, $sku, '');
         $response = $this->graphQlMutation($query);
 
-        self::assertArrayHasKey('userInputErrors', $response['addProductsToCart']);
-        self::assertCount(1, $response['addProductsToCart']['userInputErrors']);
+        self::assertArrayHasKey('user_errors', $response['addProductsToCart']);
+        self::assertCount(1, $response['addProductsToCart']['user_errors']);
         self::assertEquals(
             $message,
-            $response['addProductsToCart']['userInputErrors'][0]['message']
+            $response['addProductsToCart']['user_errors'][0]['message']
         );
     }
 
@@ -140,10 +140,10 @@ public function testAddToCartWithQtyPlusOne()
         $query = $this->getAddToCartMutation($maskedQuoteId, 1, $sku, '');
         $response = $this->graphQlMutation($query);
 
-        self::assertArrayHasKey('userInputErrors', $response['addProductsToCart']);
+        self::assertArrayHasKey('user_errors', $response['addProductsToCart']);
         self::assertEquals(
             'The requested qty is not available',
-            $response['addProductsToCart']['userInputErrors'][0]['message']
+            $response['addProductsToCart']['user_errors'][0]['message']
         );
         self::assertEquals(100, $response['addProductsToCart']['cart']['total_quantity']);
     }
@@ -164,12 +164,12 @@ public function testAddProductWithWrongQuantity(int $quantity, string $message)
 
         $query = $this->getAddToCartMutation($maskedQuoteId, $quantity, $sku, '');
         $response = $this->graphQlMutation($query);
-        self::assertArrayHasKey('userInputErrors', $response['addProductsToCart']);
-        self::assertCount(1, $response['addProductsToCart']['userInputErrors']);
+        self::assertArrayHasKey('user_errors', $response['addProductsToCart']);
+        self::assertCount(1, $response['addProductsToCart']['user_errors']);
 
         self::assertEquals(
             $message,
-            $response['addProductsToCart']['userInputErrors'][0]['message']
+            $response['addProductsToCart']['user_errors'][0]['message']
         );
     }
 
@@ -249,7 +249,7 @@ private function getAddToCartMutation(
                 }
             }
         },
-        userInputErrors {
+        user_errors {
             message
         }
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddBundleProductToWishlistTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddBundleProductToWishlistTest.php
index c0199e8908d0e..a81ec701b22a8 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddBundleProductToWishlistTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddBundleProductToWishlistTest.php
@@ -140,7 +140,7 @@ private function getQuery(
       }
     ]
 ) {
-    userInputErrors {
+    user_errors {
       code
       message
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddConfigurableProductToWishlistTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddConfigurableProductToWishlistTest.php
index 386df99f0d211..d8d44541f899d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddConfigurableProductToWishlistTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddConfigurableProductToWishlistTest.php
@@ -126,7 +126,7 @@ private function getQuery(
       }
     ]
 ) {
-    userInputErrors {
+    user_errors {
       code
       message
     }
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 389f4eae4c574..489a960056f1b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddDownloadableProductToWishlistTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddDownloadableProductToWishlistTest.php
@@ -181,7 +181,7 @@ private function getQuery(
       }
     ]
 ) {
-    userInputErrors {
+    user_errors {
       code
       message
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/DeleteProductsFromWishlistTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/DeleteProductsFromWishlistTest.php
index 2e203e3ff4228..ebe99289b8934 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/DeleteProductsFromWishlistTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/DeleteProductsFromWishlistTest.php
@@ -90,7 +90,7 @@ private function getQuery(
     wishlistId: {$wishlistId},
     wishlistItemsIds: [{$wishlistItemId}]
 ) {
-    userInputErrors {
+    user_errors {
       code
       message
     }
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 9e96bdc5d7079..9a9cd424e54ca 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/UpdateProductsFromWishlistTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/UpdateProductsFromWishlistTest.php
@@ -102,7 +102,7 @@ private function getQuery(
       }
     ]
 ) {
-    userInputErrors {
+    user_errors {
       code
       message
     }

From 762a3c15c0ee9bef6d805dd114e7d08f9a35ba57 Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Wed, 5 Aug 2020 18:15:23 -0500
Subject: [PATCH 1305/1718] - reverting .htaccess deletion

---
 vendor/.htaccess | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 vendor/.htaccess

diff --git a/vendor/.htaccess b/vendor/.htaccess
new file mode 100644
index 0000000000000..b97408bad3f2e
--- /dev/null
+++ b/vendor/.htaccess
@@ -0,0 +1,7 @@
+<IfVersion < 2.4>
+    order allow,deny
+    deny from all
+</IfVersion>
+<IfVersion >= 2.4>
+    Require all denied
+</IfVersion>

From 2020e98ae2e4303f8f95c9f2206faf3f5e16997b Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Thu, 6 Aug 2020 10:17:11 +0300
Subject: [PATCH 1306/1718] cover by integration test

---
 .../Magento/Sitemap/Block/RobotsTest.php      | 96 +++++++++++++++++++
 1 file changed, 96 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/Sitemap/Block/RobotsTest.php

diff --git a/dev/tests/integration/testsuite/Magento/Sitemap/Block/RobotsTest.php b/dev/tests/integration/testsuite/Magento/Sitemap/Block/RobotsTest.php
new file mode 100644
index 0000000000000..e2484e95561e4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sitemap/Block/RobotsTest.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sitemap\Block;
+
+use Magento\Framework\View\LayoutInterface;
+use Magento\Sitemap\Model\SitemapFactory;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for \Magento\Sitemap\Block\Robots.
+ */
+class RobotsTest extends TestCase
+{
+    private const STUB_SITEMAP_FILENAME = 'sitemap_file.xml';
+
+    /**
+     * @var LayoutInterface
+     */
+    private $layout;
+
+    /**
+     * @var mixed
+     */
+    private $sitemapFactory;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @inheridoc
+     */
+    protected function setUp(): void
+    {
+        $this->layout = Bootstrap::getObjectManager()->get(LayoutInterface::class);
+        $this->sitemapFactory = Bootstrap::getObjectManager()->get(SitemapFactory::class);
+        $this->storeManager = Bootstrap::getObjectManager()->get(StoreManagerInterface::class);
+    }
+
+    /**
+     * Test toHtml with few websites
+     *
+     * @magentoDataFixture Magento/Store/_files/multiple_websites_with_store_groups_stores.php
+     * @magentoConfigFixture default_store sitemap/search_engines/submission_robots 1
+     * @magentoConfigFixture second_store_view_store sitemap/search_engines/submission_robots 1
+     *
+     * @return void
+     */
+    public function testToHtml(): void
+    {
+        $secondSitemapFile = 'second_' . self::STUB_SITEMAP_FILENAME;
+
+        $this->createSitemap(self::STUB_SITEMAP_FILENAME, 1);
+        $this->createSitemap($secondSitemapFile, 2);
+
+        $this->assertStringContainsString(self::STUB_SITEMAP_FILENAME, $this->getToHtmlOutput(1));
+        $this->assertStringContainsString($secondSitemapFile, $this->getToHtmlOutput(2));
+    }
+
+    /**
+     * Returns toHtml output per store
+     *
+     * @param int $storeId
+     * @return string
+     */
+    private function getToHtmlOutput(int $storeId): string
+    {
+        $this->storeManager->setCurrentStore($storeId);
+        $block = $this->layout->createBlock(Robots::class);
+
+        return $block->toHtml();
+    }
+
+    /**
+     * Create Sitemap
+     *
+     * @param string $fileName
+     * @param int $storeId
+     * @param string $siteMath
+     * @return void
+     */
+    private function createSitemap(string $fileName, int $storeId, string $siteMath = '/'): void
+    {
+        $model = $this->sitemapFactory->create();
+        $model->setData(['sitemap_filename' => $fileName, 'store_id' => $storeId, 'sitemap_path' => $siteMath]);
+        $model->save();
+    }
+}

From 1563ef2855ed6625d01f7288ac27b0eff9215a7a Mon Sep 17 00:00:00 2001
From: Vadim Malesh <51680850+engcom-Charlie@users.noreply.github.com>
Date: Thu, 6 Aug 2020 10:22:16 +0300
Subject: [PATCH 1307/1718] fix static

---
 .../integration/testsuite/Magento/Sitemap/Block/RobotsTest.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Sitemap/Block/RobotsTest.php b/dev/tests/integration/testsuite/Magento/Sitemap/Block/RobotsTest.php
index e2484e95561e4..c4b9470e89b7a 100644
--- a/dev/tests/integration/testsuite/Magento/Sitemap/Block/RobotsTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sitemap/Block/RobotsTest.php
@@ -26,7 +26,7 @@ class RobotsTest extends TestCase
     private $layout;
 
     /**
-     * @var mixed
+     * @var SitemapFactory
      */
     private $sitemapFactory;
 

From 2e90fad18a34e4d73f82e7d43d0fcaf5d10fd64b Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Thu, 6 Aug 2020 10:29:40 +0300
Subject: [PATCH 1308/1718] fix static

---
 app/code/Magento/Theme/view/frontend/templates/messages.phtml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Theme/view/frontend/templates/messages.phtml b/app/code/Magento/Theme/view/frontend/templates/messages.phtml
index b650fb301a52e..f863da70e8987 100644
--- a/app/code/Magento/Theme/view/frontend/templates/messages.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/messages.phtml
@@ -17,7 +17,9 @@
     <!-- /ko -->
 
     <!-- ko if: messages().messages && messages().messages.length > 0 -->
-    <div aria-atomic="true" role="alert" data-bind="foreach: { data: messages().messages, as: 'message' }" class="messages">
+    <div aria-atomic="true" role="alert" class="messages" data-bind="foreach: {
+        data: messages().messages, as: 'message'
+    }">
         <div data-bind="attr: {
             class: 'message-' + message.type + ' ' + message.type + ' message',
             'data-ui-id': 'message-' + message.type

From 79d434448672572597e8edc1579033ad533cdfe4 Mon Sep 17 00:00:00 2001
From: Mykhailo Matiola <mykhailo.matiola@transoftgroup.com>
Date: Thu, 6 Aug 2020 10:35:23 +0300
Subject: [PATCH 1309/1718] MC-36430: Invalid usage of requireDataFixture in
 integration tests

---
 .../Option/Type/File}/ValidatorFileMock.php   |  9 ++++++---
 ...ultiselect_attribute_with_source_model.php |  1 -
 ...uote_with_items_simple_product_options.php |  4 ++--
 ...te_with_items_and_custom_options_saved.php | 20 +++++++++++--------
 4 files changed, 20 insertions(+), 14 deletions(-)
 rename dev/tests/integration/{testsuite/Magento/Checkout/_files => framework/Magento/TestFramework/Catalog/Model/Product/Option/Type/File}/ValidatorFileMock.php (84%)

diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/ValidatorFileMock.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/Type/File/ValidatorFileMock.php
similarity index 84%
rename from dev/tests/integration/testsuite/Magento/Checkout/_files/ValidatorFileMock.php
rename to dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/Type/File/ValidatorFileMock.php
index 9b5650b1826c3..b7df1205f2ba3 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/ValidatorFileMock.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Product/Option/Type/File/ValidatorFileMock.php
@@ -5,19 +5,22 @@
  */
 declare(strict_types=1);
 
-namespace Magento\Checkout\_files;
+namespace Magento\TestFramework\Catalog\Model\Product\Option\Type\File;
 
 use Magento\Catalog\Model\Product\Option\Type\File\ValidatorFile;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Creates mock for ValidatorFile to replace real instance in fixtures.
  */
-class ValidatorFileMock extends \PHPUnit\Framework\TestCase
+class ValidatorFileMock extends TestCase
 {
     /**
      * Returns mock.
+     *
      * @param array|null $fileData
-     * @return ValidatorFile|\PHPUnit_Framework_MockObject_MockObject
+     * @return ValidatorFile|MockObject
      */
     public function getInstance($fileData = null)
     {
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute_with_source_model.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute_with_source_model.php
index 3056bf6cc5384..dd7081eaf508b 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute_with_source_model.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_multiselect_attribute_with_source_model.php
@@ -8,7 +8,6 @@
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
 Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/multiselect_attribute_with_source_model.php');
-Resolver::getInstance()->requireDataFixture('Magento/Checkout/_files/ValidatorFileMock.php');
 
 /** Create product with options and multiselect attribute */
 
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/customer_quote_with_items_simple_product_options.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/customer_quote_with_items_simple_product_options.php
index 66d984301d14f..f0ba56f7179aa 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/customer_quote_with_items_simple_product_options.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/customer_quote_with_items_simple_product_options.php
@@ -10,7 +10,7 @@
 use Magento\Catalog\Model\Product\Option;
 use Magento\Catalog\Model\Product\Option\Type\File\ValidatorFile;
 use Magento\Catalog\Model\Product\Option\Value;
-use Magento\Checkout\_files\ValidatorFileMock;
+use Magento\TestFramework\Catalog\Model\Product\Option\Type\File\ValidatorFileMock;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Framework\DataObject;
 use Magento\Quote\Api\CartRepositoryInterface;
@@ -83,7 +83,7 @@
     $itemsOptions[$dropDownValue->getTitle()] = $options;
 }
 
-$validatorFileMock = (new ValidatorFileMock())->getInstance();
+$validatorFileMock = $objectManager->get(ValidatorFileMock::class)->getInstance();
 $objectManager->addSharedInstance($validatorFileMock, ValidatorFile::class);
 
 $quote->setStoreId($storeManager->getStore()->getId())
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_items_and_custom_options_saved.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_items_and_custom_options_saved.php
index 3abe6b21f110e..2293f0662c699 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_items_and_custom_options_saved.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_items_and_custom_options_saved.php
@@ -4,7 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-use Magento\Checkout\_files\ValidatorFileMock;
+use Magento\Catalog\Model\Product\Option\Type\File\ValidatorFile;
+use Magento\Framework\DataObject;
+use Magento\Quote\Model\QuoteIdMask;
+use Magento\Quote\Model\QuoteIdMaskFactory;
+use Magento\Quote\Model\QuoteRepository;
+use Magento\TestFramework\Catalog\Model\Product\Option\Type\File\ValidatorFileMock;
 use Magento\Quote\Model\QuoteFactory;
 use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
 use Magento\TestFramework\Helper\Bootstrap;
@@ -12,7 +17,6 @@
 
 Resolver::getInstance()->requireDataFixture('Magento/Checkout/_files/quote_with_address.php');
 Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/product_with_options.php');
-Resolver::getInstance()->requireDataFixture('Magento/Checkout/_files/ValidatorFileMock.php');
 
 $objectManager = Bootstrap::getObjectManager();
 /** @var QuoteFactory $quoteFactory */
@@ -45,18 +49,18 @@
     $options[$option->getId()] = $value;
 }
 
-$requestInfo = new \Magento\Framework\DataObject(['qty' => 1, 'options' => $options]);
-$validatorFile = (new ValidatorFileMock())->getInstance();
-$objectManager->addSharedInstance($validatorFile, \Magento\Catalog\Model\Product\Option\Type\File\ValidatorFile::class);
+$requestInfo = new DataObject(['qty' => 1, 'options' => $options]);
+$validatorFile = $objectManager->get(ValidatorFileMock::class)->getInstance();
+$objectManager->addSharedInstance($validatorFile, ValidatorFile::class);
 
 $quote->setReservedOrderId('test_order_item_with_items_and_custom_options');
 $quote->addProduct($product, $requestInfo);
 $quote->collectTotals();
-$objectManager->get(\Magento\Quote\Model\QuoteRepository::class)->save($quote);
+$objectManager->get(QuoteRepository::class)->save($quote);
 
-/** @var \Magento\Quote\Model\QuoteIdMask $quoteIdMask */
+/** @var QuoteIdMask $quoteIdMask */
 $quoteIdMask = Bootstrap::getObjectManager()
-    ->create(\Magento\Quote\Model\QuoteIdMaskFactory::class)
+    ->create(QuoteIdMaskFactory::class)
     ->create();
 $quoteIdMask->setQuoteId($quote->getId());
 $quoteIdMask->setDataChanges(true);

From 36b9e5148950f20ae3df4f3b98ba40fc86805069 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Thu, 6 Aug 2020 11:50:54 +0300
Subject: [PATCH 1310/1718] MC-36511: [MFTF] Tests generation failed after ASI
 modules moved to core

---
 ...EnhancedMediaGalleryDeleteGridViewActionGroup.xml |  6 +++---
 .../AdminMediaGalleryEnhancedEnableActionGroup.xml   |  2 +-
 .../Mftf/Page/AdminMediaGalleryConfigSystemPage.xml  | 12 ++++++++++++
 .../Test/Mftf/Section/AdminConfigSystemSection.xml   |  1 +
 .../AdminEnhancedMediaGalleryActionsSection.xml      |  2 ++
 5 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Page/AdminMediaGalleryConfigSystemPage.xml

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryDeleteGridViewActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryDeleteGridViewActionGroup.xml
index d3d1f0aaf39de..95f3080049db7 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryDeleteGridViewActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryDeleteGridViewActionGroup.xml
@@ -17,9 +17,9 @@
         </arguments>
 
         <click selector="{{AdminDataGridHeaderSection.bookmarkToggle}}" stepKey="openViewBookmarks"/>
-        <click selector="{{AdminGridDefaultViewControls.viewByName(viewToDelete)}}{{AdminAdobeStockSection.editViewButtonPartial}}" stepKey="clickEditButton"/>
-        <seeElement selector="{{AdminAdobeStockSection.deleteViewButton}}" stepKey="seeDeleteButton"/>
-        <click selector="{{AdminAdobeStockSection.deleteViewButton}}" stepKey="clickDeleteButton"/>
+        <click selector="{{AdminGridDefaultViewControls.viewByName(viewToDelete)}}{{AdminEnhancedMediaGalleryActionsSection.editViewButtonPartial}}" stepKey="clickEditButton"/>
+        <seeElement selector="{{AdminEnhancedMediaGalleryActionsSection.deleteViewButton}}" stepKey="seeDeleteButton"/>
+        <click selector="{{AdminEnhancedMediaGalleryActionsSection.deleteViewButton}}" stepKey="clickDeleteButton"/>
         <waitForPageLoad stepKey="waitForDeletion" time="10"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryEnhancedEnableActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryEnhancedEnableActionGroup.xml
index 8791c1b152249..d842535940253 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryEnhancedEnableActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryEnhancedEnableActionGroup.xml
@@ -12,7 +12,7 @@
         <arguments>
             <argument name="enabled" type="string" defaultValue="{{MediaGalleryConfigDataDisabled.value}}"/>
         </arguments>
-        <amOnPage url="{{AdminConfigSystemPage.url}}" stepKey="navigateToSystemConfigurationPage" />
+        <amOnPage url="{{AdminMediaGalleryConfigSystemPage.url}}" stepKey="navigateToSystemConfigurationPage" />
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <scrollTo selector="{{AdminConfigSystemSection.enhancedMediaGalleryFieldset}}" stepKey="scrollToEnhancedMediaGalleryFieldset"/>
         <conditionalClick stepKey="expandEnhancedMediaGalleryTab" selector="{{AdminConfigSystemSection.enhancedMediaGalleryFieldset}}" dependentSelector="{{AdminConfigSystemSection.enhancedMediaGalleryEnabledField}}" visible="false" />
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Page/AdminMediaGalleryConfigSystemPage.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Page/AdminMediaGalleryConfigSystemPage.xml
new file mode 100644
index 0000000000000..429e5da4129d3
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Page/AdminMediaGalleryConfigSystemPage.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="AdminMediaGalleryConfigSystemPage" url="admin/system_config/edit/section/system" area="admin" module="Magento_Config">
+        <section name="AdminConfigSystemSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminConfigSystemSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminConfigSystemSection.xml
index e0305a8a6f172..b7900f6664c62 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminConfigSystemSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminConfigSystemSection.xml
@@ -11,5 +11,6 @@
     <section name="AdminConfigSystemSection">
         <element name="enhancedMediaGalleryFieldset" type="block" selector="#system_media_gallery-head"/>
         <element name="enhancedMediaGalleryEnabledField" type="select" selector="[data-ui-id='select-groups-media-gallery-fields-enabled-value']"/>
+        <element name="saveConfig" type="button" selector="#save"/>
     </section>
 </sections>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryActionsSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryActionsSection.xml
index 2feaaa8594da2..7f9a5aefdf69c 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryActionsSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryActionsSection.xml
@@ -8,6 +8,8 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminEnhancedMediaGalleryActionsSection">
+        <element name="editViewButtonPartial" type="button" selector="/following-sibling::div/button[@class='action-edit']"/>
+        <element name="deleteViewButton" type="button" selector="//div[@data-bind='afterRender: \$data.setToolbarNode']//input/following-sibling::div/button[@class='action-delete']"/>
         <element name="upload" type="input" selector="#image-uploader-input"/>
         <element name="cancel" type="button" selector="[data-ui-id='cancel-button']"/>
         <element name="createFolder" type="button" selector="[data-ui-id='create-folder-button']"/>

From 15e0735a92ac97a557514620b13ed4ab59f96667 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Thu, 6 Aug 2020 16:55:40 +0800
Subject: [PATCH 1311/1718] magento/adobe-stock-integration#1716: Use Magento
 naming approach for FolderTree class - renamed class

---
 .../Controller/Adminhtml/Directories/GetTree.php   | 14 +++++++-------
 .../{FolderTree.php => GetFolderTree.php}          |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename app/code/Magento/MediaGalleryUi/Model/Directories/{FolderTree.php => GetFolderTree.php} (99%)

diff --git a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Directories/GetTree.php b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Directories/GetTree.php
index fe3b193d410a2..d4885cae055dd 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\FolderTree;
+use Magento\MediaGalleryUi\Model\Directories\GetFolderTree;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -33,25 +33,25 @@ class GetTree extends Action implements HttpGetActionInterface
     private $logger;
 
     /**
-     * @var FolderTree
+     * @var GetFolderTree
      */
-    private $folderTree;
+    private $getFolderTree;
 
     /**
      * Constructor
      *
      * @param Action\Context $context
      * @param LoggerInterface $logger
-     * @param FolderTree $folderTree
+     * @param GetFolderTree $getFolderTree
      */
     public function __construct(
         Action\Context $context,
         LoggerInterface $logger,
-        FolderTree $folderTree
+        GetFolderTree $getFolderTree
     ) {
         parent::__construct($context);
         $this->logger = $logger;
-        $this->folderTree = $folderTree;
+        $this->getFolderTree = $getFolderTree;
     }
     /**
      * @inheritdoc
@@ -59,7 +59,7 @@ public function __construct(
     public function execute()
     {
         try {
-            $responseContent[] = $this->folderTree->execute();
+            $responseContent[] = $this->getFolderTree->execute();
             $responseCode = self::HTTP_OK;
         } catch (\Exception $exception) {
             $this->logger->critical($exception);
diff --git a/app/code/Magento/MediaGalleryUi/Model/Directories/FolderTree.php b/app/code/Magento/MediaGalleryUi/Model/Directories/GetFolderTree.php
similarity index 99%
rename from app/code/Magento/MediaGalleryUi/Model/Directories/FolderTree.php
rename to app/code/Magento/MediaGalleryUi/Model/Directories/GetFolderTree.php
index ac57125c45ec0..f0998a3e120f2 100644
--- a/app/code/Magento/MediaGalleryUi/Model/Directories/FolderTree.php
+++ b/app/code/Magento/MediaGalleryUi/Model/Directories/GetFolderTree.php
@@ -15,7 +15,7 @@
 /**
  * Build folder tree structure by path
  */
-class FolderTree
+class GetFolderTree
 {
     /**
      * @var Filesystem

From 147525d4f19c8fb8b44b27fa69e679972e76b24b Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Thu, 6 Aug 2020 04:21:31 -0500
Subject: [PATCH 1312/1718] magento/magento2-login-as-customer#144: "Login as
 Customer" functionality should be enabled by default.

---
 .../StorefrontLoginAsCustomerSeeSpecialPriceOnCategoryTest.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerSeeSpecialPriceOnCategoryTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerSeeSpecialPriceOnCategoryTest.xml
index c935e3446678f..775fcb122e181 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerSeeSpecialPriceOnCategoryTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerSeeSpecialPriceOnCategoryTest.xml
@@ -16,6 +16,9 @@
             <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 c6bab12299482b2f6f0c1ceca7ead456ff542ba2 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Thu, 6 Aug 2020 12:46:25 +0300
Subject: [PATCH 1313/1718] MC-36513: [MFTF] Flaky
 StorefrontFilterByImageSwatchTest because of bad design

---
 .../Test/Mftf/Test/StorefrontFilterByImageSwatchTest.xml       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByImageSwatchTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByImageSwatchTest.xml
index 7f0a2431be3d9..4ed8824d9e39b 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByImageSwatchTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/StorefrontFilterByImageSwatchTest.xml
@@ -53,8 +53,8 @@
         </actionGroup>
         <click selector="{{AdminManageSwatchSection.nthUploadFile('1')}}" stepKey="clickUploadFile1"/>
         <attachFile selector="input[name='datafile']" userInput="adobe-thumb.jpg" stepKey="attachFile1"/>
+        <waitForPageLoad stepKey="waitFileAttached1"/>
         <fillField selector="{{AdminManageSwatchSection.adminInputByIndex('0')}}" userInput="adobe-thumb" stepKey="fillAdmin1"/>
-        <click selector="{{AdminManageSwatchSection.swatchWindow('0')}}" stepKey="clicksWatchWindow1"/>
 
         <!-- Set swatch #2 image using the file upload -->
         <click selector="{{AdminManageSwatchSection.addSwatch}}" stepKey="clickAddSwatch2"/>
@@ -63,6 +63,7 @@
         </actionGroup>
         <click selector="{{AdminManageSwatchSection.nthUploadFile('2')}}" stepKey="clickUploadFile2"/>
         <attachFile selector="input[name='datafile']" userInput="adobe-small.jpg" stepKey="attachFile2"/>
+        <waitForPageLoad stepKey="waitFileAttached2"/>
         <fillField selector="{{AdminManageSwatchSection.adminInputByIndex('1')}}" userInput="adobe-small" stepKey="fillAdmin2"/>
 
         <!-- Set scope to global -->

From 5151060dafb6458fa1a0da093926541d89a1bd7f Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 6 Aug 2020 12:57:03 +0300
Subject: [PATCH 1314/1718] Refactor js url component

---
 .../adminhtml/web/js/image/image-details.js   |  6 ++--
 .../base/web/js/grid/url-filter-applier.js    | 32 +++++++++++++++----
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-details.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-details.js
index 6f4f89f484937..494a1a26b2f38 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-details.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-details.js
@@ -162,9 +162,9 @@ define([
          */
         getFilterUrl: function (link) {
             return link + '?filters[asset_id]=[' + this.image().id + ']' +
-                '&value=' + this.image().id +
-                '&label=' + this.image().title +
-                '&src=' + this.image()['image_url'];
+                '&options[]=[value=' + this.image().id +
+                ',label=' + this.image().title +
+                ',src=' + this.image()['image_url'] + ']';
         },
 
         /**
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 1efb161c6a3c3..f4a09c1ddcf42 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
@@ -54,7 +54,7 @@ define([
 
             if (Object.keys(options).length) {
                 this.selectComponent().options(options);
-                this.selectComponent().cacheOptions.plain = [options];
+                this.selectComponent().cacheOptions.plain = options;
             }
 
             if (Object.keys(urlFilter).length) {
@@ -99,12 +99,32 @@ define([
          * @param {String} url
          */
         getOptionsParam: function (url) {
-            var searchString = decodeURI(url),
-                options;
-            options = Object.fromEntries(new URLSearchParams(searchString));
-            delete options['filters[asset_id]'];
+            var params = [],
+                chunks,
+                chunk,
+                values = {},
+                options,
+                searchString = decodeURI(url);
+
+            _.chain(searchString.slice(1).split('&'))
+                .map(function (item, k) {
+                    if (item && item.search(this.optionsKey) !== -1) {
+                        chunks = item.substring(item.indexOf('?') + 1).split('&');
+
+                        for (var i = 0; i < chunks.length ; i++) {
+                            options = chunks[i].substring(item.indexOf('[]') + 3).replace(/[\[\]]/g, '').split(',');
+                            options.map(function (item) {
+                                chunk = item.split('=');
+                                values[chunk[0]] = chunk[1];
+                            }.bind(this));
+                        }
+                        params[k - 1] = values;
+                        values = {};
+                    }
+                }.bind(this));
 
-            return options;
+            return params;
         }
+
     });
 });

From b5550cc239f57bcf3dc5dd8279efac9da40dcff6 Mon Sep 17 00:00:00 2001
From: yolouiese <honeymay@abovethefray.io>
Date: Thu, 6 Aug 2020 18:22:07 +0800
Subject: [PATCH 1315/1718] 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 d33a9eab516840121b4796a331b05fd58c79c1e2 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Thu, 6 Aug 2020 13:08:48 +0200
Subject: [PATCH 1316/1718] Rollback PHPDoc fix, to avoid Magento approval
 procedures hell

---
 .../Magento/Rule/Model/Condition/Product/AbstractProduct.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php b/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
index be2693245e5d0..7d40dbfe652f4 100644
--- a/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
+++ b/app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php
@@ -658,7 +658,7 @@ public function validateByEntityId($productId)
      * Retrieve category ids where product is available
      *
      * @param int $productId
-     * @return int[]
+     * @return array
      */
     protected function _getAvailableInCategories($productId)
     {

From cc941330b74cad34ce3200c8e8b092d10efd6eb3 Mon Sep 17 00:00:00 2001
From: yolouiese <honeymay@abovethefray.io>
Date: Thu, 6 Aug 2020 19:23:02 +0800
Subject: [PATCH 1317/1718] 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 8dae211e60a9bd783f005ef574386853ac0d7d49 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 6 Aug 2020 14:31:01 +0300
Subject: [PATCH 1318/1718] IMprove url-filter-applier

---
 .../product/grid/url_filter_applier.phtml     |  2 +-
 .../templates/url_filter_applier.phtml        |  2 +-
 .../adminhtml/web/js/image/image-details.js   |  4 +-
 .../base/web/js/grid/url-filter-applier.js    | 42 ++++++++++++-------
 4 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml
index a2802adb9ebcb..15004bc73cb8b 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml
@@ -11,7 +11,7 @@
         "*": {
             "Magento_Ui/js/grid/url-filter-applier": {
                 "listingNamespace": "product_listing",
-                "selectComponentName": "asset_id"
+                "filterComponentName": "asset_id"
             }
         }
     }
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml b/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
index 5592f52a06ead..81ab4bda2617b 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
@@ -12,7 +12,7 @@
         "*": {
             "Magento_Ui/js/grid/url-filter-applier": {
                 "listingNamespace": "<?= $escaper->escapeJs($block->getListingNamespace()) ?>",
-                "selectComponentName": "asset_id"
+                "filterComponentName": "asset_id"
             }
         }
     }
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-details.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-details.js
index 494a1a26b2f38..25358247c5cf7 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-details.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-details.js
@@ -163,8 +163,8 @@ define([
         getFilterUrl: function (link) {
             return link + '?filters[asset_id]=[' + this.image().id + ']' +
                 '&options[]=[value=' + this.image().id +
-                ',label=' + this.image().title +
-                ',src=' + this.image()['image_url'] + ']';
+                ',label="' + this.image().title +
+                '",src=' + this.image()['image_url'] + ']';
         },
 
         /**
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 f4a09c1ddcf42..b767ea8a3513c 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
@@ -12,8 +12,8 @@ define([
     return Component.extend({
         defaults: {
             listingNamespace: null,
-            selectComponentName: null,
-            selectProvider: 'index = ${ $.selectComponentName }, ns = ${ $.listingNamespace }',
+            filterComponentName: null,
+            selectProvider: 'index = ${ $.filterComponentName }, ns = ${ $.listingNamespace }',
             filterProvider: 'componentType = filters, ns = ${ $.listingNamespace }',
             filterKey: 'filters',
             optionsKey: 'options',
@@ -44,7 +44,7 @@ define([
                 options = this.getOptionsParam(this.searchString);
 
             if (_.isUndefined(this.filterComponent()) ||
-                !_.isNull(this.selectComponentName) && _.isUndefined(this.selectComponent())) {
+                !_.isNull(this.filterComponentName) && _.isUndefined(this.selectComponent())) {
                 setTimeout(function () {
                     this.apply();
                 }.bind(this), 100);
@@ -54,7 +54,6 @@ define([
 
             if (Object.keys(options).length) {
                 this.selectComponent().options(options);
-                this.selectComponent().cacheOptions.plain = options;
             }
 
             if (Object.keys(urlFilter).length) {
@@ -101,8 +100,8 @@ define([
         getOptionsParam: function (url) {
             var params = [],
                 chunks,
-                chunk,
-                values = {},
+                values,
+                i,
                 options,
                 searchString = decodeURI(url);
 
@@ -111,20 +110,35 @@ define([
                     if (item && item.search(this.optionsKey) !== -1) {
                         chunks = item.substring(item.indexOf('?') + 1).split('&');
 
-                        for (var i = 0; i < chunks.length ; i++) {
-                            options = chunks[i].substring(item.indexOf('[]') + 3).replace(/[\[\]]/g, '').split(',');
-                            options.map(function (item) {
-                                chunk = item.split('=');
-                                values[chunk[0]] = chunk[1];
-                            }.bind(this));
+                        for (i = 0; i < chunks.length; i++) {
+                            options = chunks[i].substring(item.indexOf('[]') + 3)
+                                .replace(/[\[\]]/g, '')
+                                .split(/,(?=(?:(?:[^"]*"){2})*[^"]*$)/);
+                            values = this.getOptionsValues(options);
+
                         }
                         params[k - 1] = values;
-                        values = {};
                     }
                 }.bind(this));
 
             return params;
-        }
+        },
+
+        /**
+         * Return options values as array
+         *
+         * @param {Array} options
+         * @return {Array}
+         */
+        getOptionsValues: function (options) {
+            var values = {},
+                j;
 
+            for (j = 0; j < options.length; j++) {
+                values[options[j].split('=')[0]] = options[j].split('=')[1];
+            }
+
+            return values;
+        }
     });
 });

From f859066c9494c33381e91053f120154f55dbb0d3 Mon Sep 17 00:00:00 2001
From: Stas Kozar <stas.kozar@transoftgroup.com>
Date: Thu, 6 Aug 2020 14:36:13 +0300
Subject: [PATCH 1319/1718] MC-35475: Wrong design for Admin Customer Edit Page
 on Safari browser

---
 .../catalog/product/composite/configure.phtml  | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
index 0ee6d19e9fade..d29edabd93a15 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
@@ -5,8 +5,9 @@
  */
 
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+$blockId = $block->getId();
 ?>
-<div id="product_composite_configure" class="product-configure-popup">
+<div id="product_composite_configure" class="product-configure-popup-<?= $blockId ?>">
     <iframe name="product_composite_configure_iframe" id="product_composite_configure_iframe"></iframe>
     <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
         'onload',
@@ -31,7 +32,7 @@
     </form>
     <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
         'onsubmit',
-        "productConfigure.onConfirmBtn();event.preventDefault()",
+        'productConfigure.onConfirmBtn();event.preventDefault()',
         '.product_composite_configure_form:last-of-type'
     ) ?>
 
@@ -40,7 +41,12 @@
     <?php $scriptString = <<<script
         prodCompConfIframe = document.querySelectorAll("iframe[name='product_composite_configure_iframe']");
         for (var i = 0; i < prodCompConfIframe.length; i++) {
-            prodCompConfIframe[i].style.display = "none";
+            prodCompConfIframe[i].style.width = 0;
+            prodCompConfIframe[i].style.height = 0;
+            prodCompConfIframe[i].style.border = "0px solid #fff";
+            prodCompConfIframe[i].style.position = "absolute";
+            prodCompConfIframe[i].style.top = "-1000px";
+            prodCompConfIframe[i].style.left = "-1000px";
         }
         prodCompConfMessages = document.querySelectorAll(".product_composite_configure_messages");
         for (var i = 0; i < prodCompConfMessages.length; i++) {
@@ -58,10 +64,8 @@
         for (var i = 0; i < prodCompConfConf.length; i++) {
             prodCompConfConf[i].style.display = "none";
         }
-        prodConfPopup = document.querySelectorAll(".product-configure-popup");
-        for (var i = 0; i < prodConfPopup.length; i++) {
-            prodConfPopup[i].style.display = "none";
-        }
+        prodConfPopup = document.querySelector(".product-configure-popup-$blockId");
+        prodConfPopup.style.display = "none";
 
         require([
             "jquery",

From 6a6f2b90cdb6974755ddee457ad14df8cb6b0199 Mon Sep 17 00:00:00 2001
From: Serhii Balko <serhii.balko@transoftgroup.com>
Date: Thu, 6 Aug 2020 14:49:16 +0300
Subject: [PATCH 1320/1718] MC-36419: Scope-Limited Integration User
 Authorization Error When Allowed Access

---
 app/code/Magento/CatalogInventory/etc/webapi.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/CatalogInventory/etc/webapi.xml b/app/code/Magento/CatalogInventory/etc/webapi.xml
index c172b9c971500..af9c70bf59c36 100644
--- a/app/code/Magento/CatalogInventory/etc/webapi.xml
+++ b/app/code/Magento/CatalogInventory/etc/webapi.xml
@@ -10,25 +10,25 @@
     <route url="/V1/stockItems/:productSku" method="GET">
         <service class="Magento\CatalogInventory\Api\StockRegistryInterface" method="getStockItemBySku"/>
         <resources>
-            <resource ref="Magento_CatalogInventory::cataloginventory"/>
+            <resource ref="Magento_Catalog::catalog_inventory"/>
         </resources>
     </route>
     <route url="/V1/products/:productSku/stockItems/:itemId" method="PUT">
         <service class="Magento\CatalogInventory\Api\StockRegistryInterface" method="updateStockItemBySku"/>
         <resources>
-            <resource ref="Magento_CatalogInventory::cataloginventory"/>
+            <resource ref="Magento_Catalog::catalog_inventory"/>
         </resources>
     </route>
     <route url="/V1/stockItems/lowStock/" method="GET">
         <service class="Magento\CatalogInventory\Api\StockRegistryInterface" method="getLowStockItems"/>
         <resources>
-            <resource ref="Magento_CatalogInventory::cataloginventory"/>
+            <resource ref="Magento_Catalog::catalog_inventory"/>
         </resources>
     </route>
     <route url="/V1/stockStatuses/:productSku" method="GET">
         <service class="Magento\CatalogInventory\Api\StockRegistryInterface" method="getStockStatusBySku"/>
         <resources>
-            <resource ref="Magento_CatalogInventory::cataloginventory"/>
+            <resource ref="Magento_Catalog::catalog_inventory"/>
         </resources>
     </route>
 </routes>

From 5ad7cbb0e59bbc0a3022f2c854afe94acaad8a3a Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 6 Aug 2020 14:52:25 +0300
Subject: [PATCH 1321/1718] Fix css sorting

---
 .../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 74cc4179b3f2b..db8dd07a4be60 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
@@ -420,9 +420,9 @@
                         }
 
                         .value {
-                            margin-left: 1px;
                             display: inline;
                             float: right;
+                            margin-left: 1px;
                         }
 
                         .title {

From 71275cbba0d60dc12a8f47958348ace4e620e8b0 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 6 Aug 2020 15:06:39 +0300
Subject: [PATCH 1322/1718] COver changes with jasmine test

---
 .../base/js/grid/url-filter-applier.test.js   | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

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..ec92ff82e09d5 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
@@ -14,11 +14,15 @@ define([
             filterComponentMock = {
                 setData: jasmine.createSpy(),
                 apply: jasmine.createSpy()
+            },
+            selectComponentMock = {
+                options: jasmine.createSpy()
             };
 
         beforeEach(function () {
             urlFilterApplierObj = new UrlFilterApplier({});
             urlFilterApplierObj.filterComponent = jasmine.createSpy().and.returnValue(filterComponentMock);
+            urlFilterApplierObj.selectComponent = jasmine.createSpy().and.returnValue(selectComponentMock);
         });
 
         describe('"getFilterParam" method', function () {
@@ -53,6 +57,21 @@ define([
                     'qty': '1'
                 });
             });
+            it('return object from url with multiple options for select filters', function () {
+                var urlSearch = '?filters[name]=[27,23]&options[]=[value=27,' +
+                    'label=Label]&options[]=[value=23,label=Label2]&filters[qty]=1&anotherparam=1';
+
+                expect(urlFilterApplierObj.getOptionsParam(urlSearch)).toEqual([
+                    {
+                        value: '27',
+                        label: 'Label'
+                    },
+                    {
+                        value: '23',
+                        label: 'Label2'
+                    }
+                ]);
+            });
             it('return object from url with another parameter', function () {
                 var urlSearch = '?anotherparam=1';
 
@@ -62,12 +81,21 @@ define([
 
         describe('"apply" method', function () {
             it('applies url filter on filter component', function () {
-                urlFilterApplierObj.searchString = '?filters[name]=test&filters[qty]=1';
+                urlFilterApplierObj.searchString = '?filters[name]=test' +
+                    '&options[]=[value=23,label=Label]&filters[qty]=1';
                 urlFilterApplierObj.apply();
                 expect(urlFilterApplierObj.filterComponent().setData).toHaveBeenCalledWith({
                     'name': 'test',
                     'qty': '1'
                 }, false);
+                expect(urlFilterApplierObj.selectComponent().options).toHaveBeenCalledWith(
+                    [
+                        {
+                            value: '23',
+                            label: 'Label'
+                        }
+                    ]
+                );
                 expect(urlFilterApplierObj.filterComponent().apply).toHaveBeenCalled();
             });
         });

From 38562360f5a393ba84ed30c3a2e7140a3ab01e71 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 6 Aug 2020 15:29:26 +0300
Subject: [PATCH 1323/1718] Fix Unsanitized prefix static tests

---
 .../Magento/Ui/view/base/web/js/form/element/ui-select.js  | 7 +++++++
 .../web/templates/grid/filters/elements/ui-select.html     | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js b/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js
index c8d44e5a82ca0..9a34e57df86c7 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js
@@ -291,6 +291,13 @@ define([
             return false;
         },
 
+        /**
+         * Return empty options html
+         */
+        getEmptyOptionsUnsanitizedHtml: function () {
+            return this.emptyOptionsHtml;
+        },
+
         /**
          * Check options length and set to cache
          * if some options is added
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 17df2ef9f1f53..3e5108b53ccd5 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="text: emptyOptionsHtml"/>
+            <ul data-bind="html: getEmptyOptionsUnsanitizedHtml"/>
         </div>
         <!-- /ko -->
         <ul class="admin__action-multiselect-menu-inner _root"

From e676b3ac32b7b5a350d75651a79398f39988d808 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 6 Aug 2020 16:06:23 +0300
Subject: [PATCH 1324/1718] Replace nestead query with separate queries in the
 entity filter processor

---
 .../CollectionProcessor/FilterProcessor/Entity.php           | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/Entity.php b/app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/Entity.php
index 1d8aa78a03cc2..56db19c1f88ab 100644
--- a/app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/Entity.php
+++ b/app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/Entity.php
@@ -64,7 +64,8 @@ public function apply(Filter $filter, AbstractDb $collection): bool
      */
     private function getSelectByEntityIds(array $ids): Select
     {
-        return $this->connection->getConnection()->select()->from(
+        $connection = $this->connection->getConnection();
+        return $connection->fetchAssoc($connection->select()->from(
             ['asset_content_table' => $this->connection->getTableName(self::TABLE_MEDIA_CONTENT_ASSET)],
             ['asset_id']
         )->where(
@@ -73,6 +74,6 @@ private function getSelectByEntityIds(array $ids): Select
         )->where(
             'entity_id IN (?)',
             $ids
-        );
+        ));
     }
 }

From bd364fbac5e3bff0373cb417baa33be244e18ee0 Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Thu, 6 Aug 2020 21:28:00 +0800
Subject: [PATCH 1325/1718] magento/adobe-stock-integration#1709: Modified date
 is not updated when Editing image tags - Implement update on modified date on
 media asset if there are changes on keywords.

---
 .../ResourceModel/Keyword/SaveAssetLinks.php  | 29 +++++++++++++++++++
 .../Keyword/SaveAssetLinksTest.php            |  2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetLinks.php b/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetLinks.php
index 95a0cadd3abcc..eb6bd2aad236c 100644
--- a/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetLinks.php
+++ b/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetLinks.php
@@ -24,6 +24,7 @@ class SaveAssetLinks
     private const TABLE_ASSET_KEYWORD = 'media_gallery_asset_keyword';
     private const FIELD_ASSET_ID = 'asset_id';
     private const FIELD_KEYWORD_ID = 'keyword_id';
+    private const TABLE_MEDIA_ASSET = 'media_gallery_asset';
 
     /**
      * @var ResourceConnection
@@ -73,6 +74,10 @@ public function execute(int $assetId, array $keywordIds): void
 
         $this->deleteAssetKeywords($assetId, $obsoleteKeywordIds);
         $this->insertAssetKeywords($assetId, $newKeywordIds);
+
+        if ($obsoleteKeywordIds || $newKeywordIds) {
+            $this->setAssetUpdatedAt($assetId);
+        }
     }
 
     /**
@@ -179,4 +184,28 @@ function (KeywordInterface $keyword): int {
             $keywordsData
         );
     }
+
+    /**
+     * Updates modified date of media asset
+     *
+     * @param int $assetId
+     * @throws CouldNotSaveException
+     */
+    private function setAssetUpdatedAt(int $assetId): void
+    {
+        try {
+            $connection = $this->resourceConnection->getConnection();
+            $connection->update(
+                $connection->getTableName(self::TABLE_MEDIA_ASSET),
+                ['updated_at' => null],
+                ['id =?' => $assetId]
+            );
+        } catch (\Exception $exception) {
+            $this->logger->critical($exception);
+            throw new CouldNotSaveException(
+                __('Could not update assets modified date'),
+                $exception
+            );
+        }
+    }
 }
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 0bc81fbedaa19..d027f0ed21b53 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
@@ -75,7 +75,7 @@ public function testAssetKeywordsSave(int $assetId, array $keywordIds, array $va
         $expectedCalls = (int) (count($keywordIds));
 
         if ($expectedCalls) {
-            $this->resourceConnectionMock->expects($this->once())
+            $this->resourceConnectionMock->expects($this->exactly(2))
                 ->method('getConnection')
                 ->willReturn($this->connectionMock);
             $this->resourceConnectionMock->expects($this->once())

From bf6b16033b9571110da5ab4627d33b891f12cc2c Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Thu, 6 Aug 2020 17:09:26 +0300
Subject: [PATCH 1326/1718] magento/magento2-login-as-customer#150: Opt-in/out
 - static tests fix.

---
 .../IsLoginAsCustomerEnabledForCustomerChain.php     |  1 -
 .../Api/ConfigInterface.php                          |  4 +---
 .../Api/IsAssistanceEnabledInterface.php             |  2 --
 .../Api/SetAssistanceInterface.php                   |  2 --
 .../Block/Adminhtml/NotAllowedPopup.php              |  3 ---
 .../Processor/IsLoginAsCustomerAllowedResolver.php   |  2 +-
 .../SaveLoginAsCustomerAssistanceAllowed.php         |  1 -
 .../Model/SetAssistance.php                          |  1 +
 .../DataProviderWithDefaultAddressesPlugin.php       |  4 +++-
 .../LoginAsCustomerButtonDataProviderPlugin.php      |  1 +
 .../Magento/LoginAsCustomerAssistance/composer.json  | 12 ++++++++++--
 composer.json                                        |  1 +
 12 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomer/Model/IsLoginAsCustomerEnabledForCustomerChain.php b/app/code/Magento/LoginAsCustomer/Model/IsLoginAsCustomerEnabledForCustomerChain.php
index 6937a11eb3b58..d57e57a9c9d39 100644
--- a/app/code/Magento/LoginAsCustomer/Model/IsLoginAsCustomerEnabledForCustomerChain.php
+++ b/app/code/Magento/LoginAsCustomer/Model/IsLoginAsCustomerEnabledForCustomerChain.php
@@ -10,7 +10,6 @@
 use Magento\LoginAsCustomerApi\Api\ConfigInterface;
 use Magento\LoginAsCustomerApi\Api\Data\IsLoginAsCustomerEnabledForCustomerResultInterface;
 use Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerEnabledForCustomerInterface;
-use Magento\LoginAsCustomerApi\Model\IsLoginAsCustomerEnabledForCustomerResolverInterface;
 
 /**
  * @inheritdoc
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Api/ConfigInterface.php b/app/code/Magento/LoginAsCustomerAssistance/Api/ConfigInterface.php
index d25663aa066b7..7cd54567d26d5 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/Api/ConfigInterface.php
+++ b/app/code/Magento/LoginAsCustomerAssistance/Api/ConfigInterface.php
@@ -8,9 +8,7 @@
 namespace Magento\LoginAsCustomerAssistance\Api;
 
 /**
- * LoginAsCustomerAssistance config
- *
- * @api
+ * LoginAsCustomerAssistance config.
  */
 interface ConfigInterface
 {
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Api/IsAssistanceEnabledInterface.php b/app/code/Magento/LoginAsCustomerAssistance/Api/IsAssistanceEnabledInterface.php
index 3fece42b60142..f6084bddd1bf0 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/Api/IsAssistanceEnabledInterface.php
+++ b/app/code/Magento/LoginAsCustomerAssistance/Api/IsAssistanceEnabledInterface.php
@@ -9,8 +9,6 @@
 
 /**
  * Get 'assistance_allowed' attribute from Customer.
- *
- * @api
  */
 interface IsAssistanceEnabledInterface
 {
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Api/SetAssistanceInterface.php b/app/code/Magento/LoginAsCustomerAssistance/Api/SetAssistanceInterface.php
index 6564dfc45528b..ce8d2020341be 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/Api/SetAssistanceInterface.php
+++ b/app/code/Magento/LoginAsCustomerAssistance/Api/SetAssistanceInterface.php
@@ -9,8 +9,6 @@
 
 /**
  * Set 'assistance_allowed' attribute to Customer.
- *
- * @api
  */
 interface SetAssistanceInterface
 {
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Block/Adminhtml/NotAllowedPopup.php b/app/code/Magento/LoginAsCustomerAssistance/Block/Adminhtml/NotAllowedPopup.php
index 592df94b8d791..a6af022d1549a 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/Block/Adminhtml/NotAllowedPopup.php
+++ b/app/code/Magento/LoginAsCustomerAssistance/Block/Adminhtml/NotAllowedPopup.php
@@ -10,12 +10,9 @@
 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;
 
 /**
  * Pop-up for Login as Customer button then Login as Customer is not allowed.
- *
- * @api
  */
 class NotAllowedPopup extends Template
 {
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Model/Processor/IsLoginAsCustomerAllowedResolver.php b/app/code/Magento/LoginAsCustomerAssistance/Model/Processor/IsLoginAsCustomerAllowedResolver.php
index 0915389286854..f2de34c507f62 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/Model/Processor/IsLoginAsCustomerAllowedResolver.php
+++ b/app/code/Magento/LoginAsCustomerAssistance/Model/Processor/IsLoginAsCustomerAllowedResolver.php
@@ -10,7 +10,6 @@
 use Magento\LoginAsCustomer\Model\IsLoginAsCustomerEnabledForCustomerResultFactory;
 use Magento\LoginAsCustomerApi\Api\Data\IsLoginAsCustomerEnabledForCustomerResultInterface;
 use Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerEnabledForCustomerInterface;
-use Magento\LoginAsCustomerApi\Model\IsLoginAsCustomerEnabledForCustomerResolverInterface;
 use Magento\LoginAsCustomerAssistance\Api\IsAssistanceEnabledInterface;
 
 /**
@@ -30,6 +29,7 @@ class IsLoginAsCustomerAllowedResolver implements IsLoginAsCustomerEnabledForCus
 
     /**
      * @param IsAssistanceEnabledInterface $isAssistanceEnabled
+     * @param IsLoginAsCustomerEnabledForCustomerResultFactory $resultFactory
      */
     public function __construct(
         IsAssistanceEnabledInterface $isAssistanceEnabled,
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Model/ResourceModel/SaveLoginAsCustomerAssistanceAllowed.php b/app/code/Magento/LoginAsCustomerAssistance/Model/ResourceModel/SaveLoginAsCustomerAssistanceAllowed.php
index 03b6d0166e327..c3b396bbe332d 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/Model/ResourceModel/SaveLoginAsCustomerAssistanceAllowed.php
+++ b/app/code/Magento/LoginAsCustomerAssistance/Model/ResourceModel/SaveLoginAsCustomerAssistanceAllowed.php
@@ -8,7 +8,6 @@
 namespace Magento\LoginAsCustomerAssistance\Model\ResourceModel;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\LoginAsCustomerAssistance\Api\SaveLoginAsCustomerAssistanceAllowedInterface;
 
 /**
  * Save Login as Customer assistance allowed record.
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Model/SetAssistance.php b/app/code/Magento/LoginAsCustomerAssistance/Model/SetAssistance.php
index 7ff6065d72ffa..9131599d9cba0 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/Model/SetAssistance.php
+++ b/app/code/Magento/LoginAsCustomerAssistance/Model/SetAssistance.php
@@ -46,6 +46,7 @@ class SetAssistance implements SetAssistanceInterface
     /**
      * @param CustomerExtensionFactory $customerExtensionFactory
      * @param CustomerRepositoryInterface $customerRepository
+     * @param DeleteLoginAsCustomerAssistanceAllowed $deleteLoginAsCustomerAssistanceAllowed
      * @param SaveLoginAsCustomerAssistanceAllowed $saveLoginAsCustomerAssistanceAllowed
      */
     public function __construct(
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Plugin/DataProviderWithDefaultAddressesPlugin.php b/app/code/Magento/LoginAsCustomerAssistance/Plugin/DataProviderWithDefaultAddressesPlugin.php
index b94cc592394e9..104f249f75f56 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/Plugin/DataProviderWithDefaultAddressesPlugin.php
+++ b/app/code/Magento/LoginAsCustomerAssistance/Plugin/DataProviderWithDefaultAddressesPlugin.php
@@ -64,7 +64,9 @@ public function afterGetData(
 
         foreach ($result as $id => $entityData) {
             if ($id) {
-                $assistanceAllowedStatus = $this->resolveStatus($this->getLoginAsCustomerAssistanceAllowed->execute((int)$entityData['customer_id']));
+                $assistanceAllowedStatus = $this->resolveStatus(
+                    $this->getLoginAsCustomerAssistanceAllowed->execute((int)$entityData['customer_id'])
+                );
                 $isAssistanceAllowed[$id]['customer']['extension_attributes']['assistance_allowed'] =
                     (string)$assistanceAllowedStatus;
             }
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Plugin/LoginAsCustomerButtonDataProviderPlugin.php b/app/code/Magento/LoginAsCustomerAssistance/Plugin/LoginAsCustomerButtonDataProviderPlugin.php
index af6b02ec2f281..45a3eb512e7f8 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/Plugin/LoginAsCustomerButtonDataProviderPlugin.php
+++ b/app/code/Magento/LoginAsCustomerAssistance/Plugin/LoginAsCustomerButtonDataProviderPlugin.php
@@ -36,6 +36,7 @@ public function __construct(
      * @param array $result
      * @param int $customerId
      * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function afterGetData(DataProvider $subject, array $result, int $customerId): array
     {
diff --git a/app/code/Magento/LoginAsCustomerAssistance/composer.json b/app/code/Magento/LoginAsCustomerAssistance/composer.json
index 78cce1ff86c81..754ed54945eb2 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/composer.json
+++ b/app/code/Magento/LoginAsCustomerAssistance/composer.json
@@ -3,7 +3,15 @@
     "description": "",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-customer": "*",
+        "magento/module-login-as-customer": "*",
+        "magento/module-login-as-customer-api": "*",
+        "magento/module-store": "*"
+    },
+    "suggest": {
+        "magento/module-login-as-customer-admin-ui": "*"
     },
     "type": "magento2-module",
     "license": [
@@ -16,4 +24,4 @@
             "Magento\\LoginAsCustomerAssistance\\": ""
         }
     }
-}
+},
diff --git a/composer.json b/composer.json
index 5b39c1b3f75ea..94fcfab70d435 100644
--- a/composer.json
+++ b/composer.json
@@ -194,6 +194,7 @@
         "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": "*",

From 1d7b207a15f24caa057699c47b4f29bdd6fad99f Mon Sep 17 00:00:00 2001
From: Mykhailo Matiola <mykhailo.matiola@transoftgroup.com>
Date: Thu, 6 Aug 2020 18:06:06 +0300
Subject: [PATCH 1327/1718] MC-36376: Storefront:Configurable prices per
 websites

---
 .../Type/ConfigurableProductPriceTest.php     |  64 ++++++-
 .../ConfigurableViewOnCategoryPageTest.php    | 159 ++++++++++++++++--
 .../Product/Type/Configurable/PriceTest.php   |  80 ++++++++-
 ...e_product_with_price_on_second_website.php | 130 ++++++++++++++
 ..._with_price_on_second_website_rollback.php |  34 ++++
 ...ond_website_with_store_group_and_store.php |   4 +
 6 files changed, 443 insertions(+), 28 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_product_with_price_on_second_website.php
 create mode 100644 dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_product_with_price_on_second_website_rollback.php

diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/Type/ConfigurableProductPriceTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/Type/ConfigurableProductPriceTest.php
index 8aab31b921007..325ab7db23aaf 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/Type/ConfigurableProductPriceTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/Type/ConfigurableProductPriceTest.php
@@ -14,7 +14,10 @@
 use Magento\Framework\Registry;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\View\Result\Page;
+use Magento\Framework\View\Result\PageFactory;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Store\ExecuteInStoreContext;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -44,6 +47,12 @@ class ConfigurableProductPriceTest extends TestCase
     /** @var SerializerInterface */
     private $json;
 
+    /** @var StoreManagerInterface */
+    private $storeManager;
+
+    /** @var ExecuteInStoreContext */
+    private $executeInStoreContext;
+
     /**
      * @inheritdoc
      */
@@ -53,11 +62,13 @@ protected function setUp(): void
 
         $this->objectManager = Bootstrap::getObjectManager();
         $this->registry = $this->objectManager->get(Registry::class);
-        $this->page = $this->objectManager->get(Page::class);
+        $this->page = $this->objectManager->get(PageFactory::class)->create();
         $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
         $this->productRepository->cleanCache();
         $this->productCustomOption = $this->objectManager->get(ProductCustomOptionInterface::class);
         $this->json = $this->objectManager->get(SerializerInterface::class);
+        $this->storeManager = $this->objectManager->get(StoreManagerInterface::class);
+        $this->executeInStoreContext = $this->objectManager->get(ExecuteInStoreContext::class);
     }
 
     /**
@@ -78,7 +89,20 @@ protected function tearDown(): void
      */
     public function testConfigurablePrice(): void
     {
-        $this->assertPrice($this->processPriceView('configurable'), 10.00);
+        $this->assertPrice('configurable', 10.00);
+    }
+
+    /**
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_product_with_price_on_second_website.php
+     * @magentoDbIsolation disabled
+     *
+     * @return void
+     */
+    public function testConfigurablePriceOnSecondWebsite(): void
+    {
+        $this->executeInStoreContext->execute('fixture_second_store', [$this, 'assertPrice'], 'configurable', 10.00);
+        $this->resetPageLayout();
+        $this->assertPrice('configurable', 150.00);
     }
 
     /**
@@ -88,7 +112,7 @@ public function testConfigurablePrice(): void
      */
     public function testConfigurablePriceWithDisabledFirstChild(): void
     {
-        $this->assertPrice($this->processPriceView('configurable'), 20.00);
+        $this->assertPrice('configurable', 20.00);
     }
 
     /**
@@ -98,7 +122,7 @@ public function testConfigurablePriceWithDisabledFirstChild(): void
      */
     public function testConfigurablePriceWithOutOfStockFirstChild(): void
     {
-        $this->assertPrice($this->processPriceView('configurable'), 20.00);
+        $this->assertPrice('configurable', 20.00);
     }
 
     /**
@@ -110,7 +134,7 @@ public function testConfigurablePriceWithOutOfStockFirstChild(): void
      */
     public function testConfigurablePriceWithCatalogRule(): void
     {
-        $this->assertPrice($this->processPriceView('configurable'), 9.00);
+        $this->assertPrice('configurable', 9.00);
     }
 
     /**
@@ -120,7 +144,7 @@ public function testConfigurablePriceWithCatalogRule(): void
      */
     public function testConfigurablePriceWithCustomOption(): void
     {
-        $product = $this->productRepository->get('configurable');
+        $product = $this->getProduct('configurable');
         $this->registerProduct($product);
         $this->preparePageLayout();
         $customOptionsBlock = $this->page->getLayout()
@@ -162,6 +186,16 @@ private function preparePageLayout(): void
         $this->page->getLayout()->generateXml();
     }
 
+    /**
+     * Reset layout page to get new block html.
+     *
+     * @return void
+     */
+    private function resetPageLayout(): void
+    {
+        $this->page = $this->objectManager->get(PageFactory::class)->create();
+    }
+
     /**
      * Process view product final price block html.
      *
@@ -170,7 +204,7 @@ private function preparePageLayout(): void
      */
     private function processPriceView(string $sku): string
     {
-        $product = $this->productRepository->get($sku);
+        $product = $this->getProduct($sku);
         $this->registerProduct($product);
         $this->preparePageLayout();
 
@@ -180,12 +214,13 @@ private function processPriceView(string $sku): string
     /**
      * Assert that html contain price label and expected final price amount.
      *
-     * @param string $priceBlockHtml
+     * @param string $sku
      * @param float $expectedPrice
      * @return void
      */
-    private function assertPrice(string $priceBlockHtml, float $expectedPrice): void
+    public function assertPrice(string $sku, float $expectedPrice): void
     {
+        $priceBlockHtml = $this->processPriceView($sku);
         $regexp = '/<span class="price-label">As low as<\/span>.*';
         $regexp .= '<span.*data-price-amount="%s".*<span class="price">\$%.2f<\/span><\/span>/';
         $this->assertMatchesRegularExpression(
@@ -208,4 +243,15 @@ private function assertJsonConfig(string $config, string $expectedPrice, int $op
         $this->assertNotNull($price);
         $this->assertEquals($expectedPrice, $price);
     }
+
+    /**
+     * Loads product by sku.s
+     *
+     * @param string $sku
+     * @return ProductInterface
+     */
+    private function getProduct(string $sku): ProductInterface
+    {
+        return $this->productRepository->get($sku, false, $this->storeManager->getStore()->getId(), true);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/Type/ConfigurableViewOnCategoryPageTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/Type/ConfigurableViewOnCategoryPageTest.php
index d577994cdc45b..bf910359b893b 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/Type/ConfigurableViewOnCategoryPageTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/Type/ConfigurableViewOnCategoryPageTest.php
@@ -7,11 +7,18 @@
 
 namespace Magento\ConfigurableProduct\Block\Product\View\Type;
 
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Block\Product\ListProduct;
 use Magento\Eav\Model\Entity\Collection\AbstractCollection;
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\View\LayoutInterface;
+use Magento\Framework\Registry;
+use Magento\Framework\View\Result\Page;
+use Magento\Framework\View\Result\PageFactory;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Store\ExecuteInStoreContext;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -21,17 +28,30 @@
  * @magentoAppIsolation enabled
  * @magentoAppArea frontend
  * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_product_with_out_of_stock_children.php
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ConfigurableViewOnCategoryPageTest extends TestCase
 {
     /** @var ObjectManagerInterface  */
     private $objectManager;
 
-    /** @var LayoutInterface */
-    private $layout;
+    /** @var ProductRepositoryInterface */
+    private $productRepository;
 
-    /** @var ListProduct $listingBlock */
-    private $listingBlock;
+    /** @var CategoryRepositoryInterface */
+    private $categoryRepository;
+
+    /** @var Page */
+    private $page;
+
+    /** @var Registry */
+    private $registry;
+
+    /** @var StoreManagerInterface */
+    private $storeManager;
+
+    /** @var ExecuteInStoreContext */
+    private $executeInStoreContext;
 
     /**
      * @inheritdoc
@@ -41,9 +61,22 @@ protected function setUp(): void
         parent::setUp();
 
         $this->objectManager = Bootstrap::getObjectManager();
-        $this->layout = $this->objectManager->get(LayoutInterface::class);
-        $this->listingBlock = $this->layout->createBlock(ListProduct::class);
-        $this->listingBlock->setCategoryId(333);
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $this->productRepository->cleanCache();
+        $this->categoryRepository = $this->objectManager->get(CategoryRepositoryInterface::class);
+        $this->page = $this->objectManager->get(PageFactory::class)->create();
+        $this->registry = $this->objectManager->get(Registry::class);
+        $this->storeManager = $this->objectManager->get(StoreManagerInterface::class);
+        $this->executeInStoreContext = $this->objectManager->get(ExecuteInStoreContext::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown(): void
+    {
+        $this->registry->unregister('current_category');
+        parent::tearDown();
     }
 
     /**
@@ -53,8 +86,8 @@ protected function setUp(): void
      */
     public function testOutOfStockProductWithEnabledConfigView(): void
     {
-        $collection = $this->listingBlock->getLoadedProductCollection();
-        $this->assertCollectionSize(1, $collection);
+        $this->preparePageLayout();
+        $this->assertCollectionSize(1, $this->getListingBlock()->getLoadedProductCollection());
     }
 
     /**
@@ -64,8 +97,50 @@ public function testOutOfStockProductWithEnabledConfigView(): void
      */
     public function testOutOfStockProductWithDisabledConfigView(): void
     {
-        $collection = $this->listingBlock->getLoadedProductCollection();
-        $this->assertCollectionSize(0, $collection);
+        $this->preparePageLayout();
+        $this->assertCollectionSize(0, $this->getListingBlock()->getLoadedProductCollection());
+    }
+
+    /**
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_product_with_category.php
+     *
+     * @return void
+     */
+    public function testCheckConfigurablePrice(): void
+    {
+        $this->assertProductPrice('configurable', 'As low as $10.00');
+    }
+
+    /**
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_product_with_price_on_second_website.php
+     *
+     * @return void
+     */
+    public function testCheckConfigurablePriceOnSecondWebsite(): void
+    {
+        $this->executeInStoreContext->execute(
+            'fixture_second_store',
+            [$this, 'assertProductPrice'],
+            'configurable',
+            __('As low as') . ' $10.00'
+        );
+        $this->resetPageLayout();
+        $this->assertProductPrice('configurable', __('As low as') . ' $150.00');
+    }
+
+    /**
+     * Checks product price.
+     *
+     * @param string $sku
+     * @param string $priceString
+     * @return void
+     */
+    public function assertProductPrice(string $sku, string $priceString): void
+    {
+        $this->preparePageLayout();
+        $this->assertCollectionSize(1, $this->getListingBlock()->getLoadedProductCollection());
+        $priceHtml = $this->getListingBlock()->getProductPrice($this->getProduct($sku));
+        $this->assertEquals($priceString, $this->clearPriceHtml($priceHtml));
     }
 
     /**
@@ -80,4 +155,64 @@ private function assertCollectionSize(int $expectedSize, AbstractCollection $col
         $this->assertEquals($expectedSize, $collection->getSize());
         $this->assertCount($expectedSize, $collection->getItems());
     }
+
+    /**
+     * Prepare category page.
+     *
+     * @return void
+     */
+    private function preparePageLayout(): void
+    {
+        $this->registry->unregister('current_category');
+        $this->registry->register(
+            'current_category',
+            $this->categoryRepository->get(333, $this->storeManager->getStore()->getId())
+        );
+        $this->page->addHandle(['default', 'catalog_category_view']);
+        $this->page->getLayout()->generateXml();
+    }
+
+    /**
+     * Reset layout page to get new block html.
+     *
+     * @return void
+     */
+    private function resetPageLayout(): void
+    {
+        $this->page = $this->objectManager->get(PageFactory::class)->create();
+    }
+
+    /**
+     * Removes html tags and spaces from price html string.
+     *
+     * @param string $priceHtml
+     * @return string
+     */
+    private function clearPriceHtml(string $priceHtml): string
+    {
+        return trim(preg_replace('/\s+/', ' ', strip_tags($priceHtml)));
+    }
+
+    /**
+     * Returns product list block.
+     *
+     * @return null|ListProduct
+     */
+    private function getListingBlock(): ?ListProduct
+    {
+        $block = $this->page->getLayout()->getBlock('category.products.list');
+
+        return $block ? $block : null;
+    }
+
+    /**
+     * Loads product by sku.
+     *
+     * @param string $sku
+     * @return ProductInterface
+     */
+    private function getProduct(string $sku): ProductInterface
+    {
+        return $this->productRepository->get($sku, false, $this->storeManager->getStore()->getId(), true);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/Configurable/PriceTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/Configurable/PriceTest.php
index 52bb7a2f8ab6d..2ffba24e465e0 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/Configurable/PriceTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/Configurable/PriceTest.php
@@ -13,14 +13,17 @@
 use Magento\Customer\Model\Group;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Catalog\Model\Product\Price\GetPriceIndexDataByProductId;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Store\ExecuteInStoreContext;
 use PHPUnit\Framework\TestCase;
 
 /**
  * Provides tests for configurable product pricing.
  *
  * @magentoDbIsolation disabled
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class PriceTest extends TestCase
 {
@@ -49,6 +52,16 @@ class PriceTest extends TestCase
      */
     private $websiteRepository;
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var ExecuteInStoreContext
+     */
+    private $executeInStoreContext;
+
     /**
      * @inheritdoc
      */
@@ -60,6 +73,8 @@ protected function setUp(): void
         $this->productRepository->cleanCache();
         $this->getPriceIndexDataByProductId = $this->objectManager->get(GetPriceIndexDataByProductId::class);
         $this->websiteRepository = $this->objectManager->get(WebsiteRepositoryInterface::class);
+        $this->storeManager = $this->objectManager->get(StoreManagerInterface::class);
+        $this->executeInStoreContext = $this->objectManager->get(ExecuteInStoreContext::class);
     }
 
     /**
@@ -84,6 +99,46 @@ public function testGetFinalPrice(): void
         );
     }
 
+    /**
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_product_with_price_on_second_website.php
+     * @return void
+     */
+    public function testGetFinalPriceOnSecondWebsite(): void
+    {
+        $this->executeInStoreContext->execute('fixture_second_store', [$this, 'assertPrice'], 10);
+        $this->executeInStoreContext->execute(
+            'fixture_second_store',
+            [$this, 'assertIndexTableData'],
+            'configurable',
+            ['price' => 0, 'final_price' => 0, 'min_price' => 10, 'max_price' => 30, 'tier_price' => null]
+        );
+        $this->executeInStoreContext->execute(
+            'fixture_second_store',
+            [$this, 'assertIndexTableData'],
+            'simple_option_1',
+            ['price' => 20, 'final_price' => 10, 'min_price' => 10, 'max_price' => 10, 'tier_price' => null]
+        );
+        $this->executeInStoreContext->execute(
+            'fixture_second_store',
+            [$this, 'assertIndexTableData'],
+            'simple_option_2',
+            ['price' => 40, 'final_price' => 30, 'min_price' => 30, 'max_price' => 30, 'tier_price' => null]
+        );
+        $this->assertPrice(150);
+        $this->assertIndexTableData(
+            'configurable',
+            ['price' => 0, 'final_price' => 0, 'min_price' => 150, 'max_price' => 150, 'tier_price' => null]
+        );
+        $this->assertIndexTableData(
+            'simple_option_1',
+            ['price' => 150, 'final_price' => 150, 'min_price' => 150, 'max_price' => 150, 'tier_price' => null]
+        );
+        $this->assertIndexTableData(
+            'simple_option_2',
+            ['price' => 150, 'final_price' => 150, 'min_price' => 150, 'max_price' => 150, 'tier_price' => null]
+        );
+    }
+
     /**
      * @magentoConfigFixture current_store tax/display/type 1
      * @magentoDataFixture Magento/ConfigurableProduct/_files/tax_rule.php
@@ -127,7 +182,7 @@ public function testGetFinalPriceIncludingExcludingTax(): void
     public function testGetFinalPriceWithSelectedSimpleProduct(): void
     {
         $product = $this->productRepository->get('configurable');
-        $product->addCustomOption('simple_product', 20, $this->productRepository->get('simple_20'));
+        $product->addCustomOption('simple_product', 20, $this->getProduct('simple_20'));
         $this->assertPrice(20, $product);
     }
 
@@ -137,7 +192,7 @@ public function testGetFinalPriceWithSelectedSimpleProduct(): void
      */
     public function testGetFinalPriceWithCustomOptionAndSimpleTierPrice(): void
     {
-        $configurable = $this->productRepository->get('configurable');
+        $configurable = $this->getProduct('configurable');
         $this->assertIndexTableData(
             'configurable',
             ['price' => 0, 'final_price' => 0, 'min_price' => 9, 'max_price' => 30, 'tier_price' => 15]
@@ -167,12 +222,12 @@ public function testGetFinalPriceWithCustomOptionAndSimpleTierPrice(): void
      * @param array $expectedPrices
      * @return void
      */
-    private function assertIndexTableData(string $sku, array $expectedPrices): void
+    public function assertIndexTableData(string $sku, array $expectedPrices): void
     {
         $data = $this->getPriceIndexDataByProductId->execute(
-            (int)$this->productRepository->get($sku)->getId(),
+            (int)$this->getProduct($sku)->getId(),
             Group::NOT_LOGGED_IN_ID,
-            (int)$this->websiteRepository->get('base')->getId()
+            (int)$this->storeManager->getStore()->getWebsiteId()
         );
         $data = reset($data);
         foreach ($expectedPrices as $column => $price) {
@@ -187,13 +242,24 @@ private function assertIndexTableData(string $sku, array $expectedPrices): void
      * @param ProductInterface|null $product
      * @return void
      */
-    private function assertPrice(float $expectedPrice, ?ProductInterface $product = null): void
+    public function assertPrice(float $expectedPrice, ?ProductInterface $product = null): void
     {
-        $product = $product ?: $this->productRepository->get('configurable');
+        $product = $product ?: $this->getProduct('configurable');
         // final price is the lowest price of configurable variations
         $this->assertEquals(
             round($expectedPrice, 2),
             round($this->priceModel->getFinalPrice(1, $product), 2)
         );
     }
+
+    /**
+     * Loads product by sku.
+     *
+     * @param string $sku
+     * @return ProductInterface
+     */
+    private function getProduct(string $sku): ProductInterface
+    {
+        return $this->productRepository->get($sku, false, $this->storeManager->getStore()->getId(), true);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_product_with_price_on_second_website.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_product_with_price_on_second_website.php
new file mode 100644
index 0000000000000..a0edde0becd9e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_product_with_price_on_second_website.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Api\Data\ProductExtensionFactory;
+use Magento\Catalog\Helper\Data;
+use Magento\Catalog\Helper\DefaultCategory;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type as ProductType;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Model\ProductFactory;
+use Magento\Catalog\Observer\SwitchPriceAttributeScopeOnConfigChange;
+use Magento\Config\Model\ResourceModel\Config;
+use Magento\ConfigurableProduct\Helper\Product\Options\Factory;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Framework\Event\Observer;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\Store\Model\Store;
+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_store_group_and_store.php');
+Resolver::getInstance()->requireDataFixture('Magento/ConfigurableProduct/_files/configurable_attribute.php');
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/category.php');
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductAttributeRepositoryInterface $productAttributeRepository */
+$productAttributeRepository = $objectManager->get(ProductAttributeRepositoryInterface::class);
+/** @var WebsiteRepositoryInterface $websiteRepository */
+$websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class);
+/** @var ProductFactory $productFactory */
+$productFactory = $objectManager->get(ProductFactory::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$productRepository->cleanCache();
+/** @var Factory $optionsFactory */
+$optionsFactory = $objectManager->get(Factory::class);
+/** @var ProductExtensionFactory $extensionAttributesFactory */
+$extensionAttributesFactory = $objectManager->get(ProductExtensionFactory::class);
+/** @var Config $configResource */
+$configResource = $objectManager->get(Config::class);
+/** @var SwitchPriceAttributeScopeOnConfigChange $observer */
+$observer = $objectManager->get(Observer::class);
+/** @var DefaultCategory $categoryHelper */
+$categoryHelper = $objectManager->get(DefaultCategory::class);
+
+$attribute = $productAttributeRepository->get('test_configurable');
+$options = $attribute->getOptions();
+$baseWebsite = $websiteRepository->get('base');
+$secondWebsite = $websiteRepository->get('test');
+$attributeValues = [];
+$associatedProductIds = [];
+array_shift($options);
+
+foreach ($options as $option) {
+    $product = $productFactory->create();
+    $product->setTypeId(ProductType::TYPE_SIMPLE)
+        ->setAttributeSetId($product->getDefaultAttributeSetId())
+        ->setWebsiteIds([$baseWebsite->getId(), $secondWebsite->getId()])
+        ->setName('Configurable Option ' . $option->getLabel())
+        ->setSku(strtolower(str_replace(' ', '_', 'simple ' . $option->getLabel())))
+        ->setTestConfigurable($option->getValue())
+        ->setVisibility(Visibility::VISIBILITY_NOT_VISIBLE)
+        ->setStatus(Status::STATUS_ENABLED)
+        ->setPrice(150)
+        ->setCategoryIds([$categoryHelper->getId(), 333])
+        ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1]);
+    $product = $productRepository->save($product);
+    $associatedProductIds[] = $product->getId();
+    $attributeValues[] = [
+        'label' => 'test',
+        'attribute_id' => $attribute->getId(),
+        'value_index' => $option->getValue(),
+    ];
+}
+$configurableAttributesData = [
+    [
+        'values' => $attributeValues,
+        'attribute_id' => $attribute->getId(),
+        'code' => $attribute->getAttributeCode(),
+        'label' => $attribute->getStoreLabel(),
+        'position' => '0',
+    ],
+];
+$configurableOptions = $optionsFactory->create($configurableAttributesData);
+
+$product = $productFactory->create();
+$extensionConfigurableAttributes = $product->getExtensionAttributes() ?: $extensionAttributesFactory->create();
+$extensionConfigurableAttributes->setConfigurableProductOptions($configurableOptions);
+$extensionConfigurableAttributes->setConfigurableProductLinks($associatedProductIds);
+$product->setExtensionAttributes($extensionConfigurableAttributes);
+$product->setTypeId(Configurable::TYPE_CODE)
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
+    ->setWebsiteIds([$baseWebsite->getId(), $secondWebsite->getId()])
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setCategoryIds([$categoryHelper->getId(), 333])
+    ->setSku('configurable')
+    ->setName('Configurable Product')
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStockData(['use_config_manage_stock' => 1, 'is_in_stock' => 1]);
+$productRepository->save($product);
+
+$configResource->saveConfig(Data::XML_PATH_PRICE_SCOPE, Store::PRICE_SCOPE_WEBSITE, 'default', 0);
+$objectManager->get(ReinitableConfigInterface::class)->reinit();
+$objectManager->get(SwitchPriceAttributeScopeOnConfigChange::class)->execute($observer);
+/** @var StoreManagerInterface $storeManager */
+$storeManager = $objectManager->get(StoreManagerInterface::class);
+$secondStoreId = $storeManager->getStore('fixture_second_store')->getId();
+
+try {
+    $currentStoreCode = $storeManager->getStore()->getCode();
+    $storeManager->setCurrentStore('fixture_second_store');
+    $firstChild = $productRepository->get('simple_option_1', false, $secondStoreId, true);
+    $firstChild->setPrice(20)
+        ->setSpecialPrice(10);
+    $productRepository->save($firstChild);
+    $secondChild = $productRepository->get('simple_option_2', false, $secondStoreId, true);
+    $secondChild->setPrice(40)
+        ->setSpecialPrice(30);
+    $productRepository->save($secondChild);
+} finally {
+    $storeManager->setCurrentStore($currentStoreCode);
+}
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_product_with_price_on_second_website_rollback.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_product_with_price_on_second_website_rollback.php
new file mode 100644
index 0000000000000..ceeeb13fb5a36
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_product_with_price_on_second_website_rollback.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Helper\Data;
+use Magento\Catalog\Observer\SwitchPriceAttributeScopeOnConfigChange;
+use Magento\Config\Model\ResourceModel\Config;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Framework\Event\Observer;
+use Magento\TestFramework\ConfigurableProduct\Model\DeleteConfigurableProduct;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var DeleteConfigurableProduct $deleteConfigurableProduct */
+$deleteConfigurableProduct = $objectManager->get(DeleteConfigurableProduct::class);
+$deleteConfigurableProduct->execute('configurable');
+/** @var Config $configResource */
+$configResource = $objectManager->get(Config::class);
+$configResource->deleteConfig(Data::XML_PATH_PRICE_SCOPE, 'default', 0);
+$objectManager->get(ReinitableConfigInterface::class)->reinit();
+$observer = $objectManager->get(Observer::class);
+$objectManager->get(SwitchPriceAttributeScopeOnConfigChange::class)->execute($observer);
+
+Resolver::getInstance()->requireDataFixture(
+    'Magento/Store/_files/second_website_with_store_group_and_store_rollback.php'
+);
+Resolver::getInstance()->requireDataFixture(
+    'Magento/ConfigurableProduct/_files/configurable_attribute_rollback.php'
+);
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/category_rollback.php');
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_store_group_and_store.php b/dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_store_group_and_store.php
index ca469840daa31..a4e2b05b1a28c 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_store_group_and_store.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_store_group_and_store.php
@@ -5,6 +5,7 @@
  */
 declare(strict_types=1);
 
+use Magento\Catalog\Helper\DefaultCategory;
 use Magento\CatalogSearch\Model\Indexer\Fulltext;
 use Magento\Framework\Indexer\IndexerRegistry;
 use Magento\Store\Api\Data\GroupInterface;
@@ -28,6 +29,8 @@
 $storeResource = $objectManager->get(StoreResource::class);
 /** @var GroupResource $groupResource */
 $groupResource = $objectManager->get(GroupResource::class);
+/** @var DefaultCategory $defaultCategory */
+$defaultCategory = $objectManager->get(DefaultCategory::class);
 /** @var WebsiteInterface $website */
 $website = $objectManager->get(WebsiteInterfaceFactory::class)->create();
 $website->setCode('test')->setName('Test Website');
@@ -35,6 +38,7 @@
 /** @var GroupInterface $storeGroup */
 $storeGroup = $objectManager->get(GroupInterfaceFactory::class)->create();
 $storeGroup->setCode('second_group')
+    ->setRootCategoryId($defaultCategory->getId())
     ->setName('second store group')
     ->setWebsite($website);
 $groupResource->save($storeGroup);

From 473b8d81f9c865080fe41cdb851b3530fbd5925b Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Thu, 6 Aug 2020 11:08:17 -0500
Subject: [PATCH 1328/1718] - Fixed bug to save a product if another product in
 cart has an error

---
 app/code/Magento/Quote/Model/Cart/AddProductsToCart.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php b/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
index 2b93bbd95d07b..3f6e13af2eae7 100644
--- a/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
+++ b/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
@@ -115,9 +115,7 @@ public function execute(string $maskedCartId, array $cartItems): AddProductsToCa
             }
         }
 
-        if (count($this->errors) === 0) {
-            $this->cartRepository->save($cart);
-        } else {
+        if (!count($this->errors) === 0) {
             /* Revert changes introduced by add to cart processes in case of an error */
             $cart->getItemsCollection()->clear();
         }
@@ -155,6 +153,7 @@ private function addItemToCart(CartInterface $cart, Data\CartItem $cartItem, int
 
         try {
             $result = $cart->addProduct($product, $this->requestBuilder->build($cartItem));
+            $this->cartRepository->save($cart);
         } catch (\Throwable $e) {
             $this->addError(
                 __($e->getMessage())->render(),

From fb6f22efde79f6284448dc5fc848034d3fc3d52e Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Thu, 6 Aug 2020 19:22:44 +0300
Subject: [PATCH 1329/1718] add AdminSelectAndDeleteProductsActionGroup

---
 ...dminSelectAndDeleteProductsActionGroup.xml | 21 +++++++++++++++++++
 .../Test/AdminDeleteABundleProductTest.xml    |  7 +------
 .../AdminMassDeleteBundleProductsTest.xml     |  7 +------
 3 files changed, 23 insertions(+), 12 deletions(-)
 create mode 100644 app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminSelectAndDeleteProductsActionGroup.xml

diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminSelectAndDeleteProductsActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminSelectAndDeleteProductsActionGroup.xml
new file mode 100644
index 0000000000000..709eec13be7a2
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminSelectAndDeleteProductsActionGroup.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="AdminSelectAndDeleteProductsActionGroup">
+        <annotations>
+            <description>Select and delete products in product grid.</description>
+        </annotations>
+        <click selector="{{AdminProductFiltersSection.allCheckbox}}" stepKey="selectAllProducts"/>
+        <click selector="{{AdminProductFiltersSection.actions}}" stepKey="clickOnActionsChangingView"/>
+        <click selector="{{AdminProductFiltersSection.delete}}" stepKey="clickDelete"/>
+        <click selector="//button[@class='action-primary action-accept']" stepKey="confirmDelete"/>
+        <waitForPageLoad stepKey="waitingProductGridLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml
index 9716791985970..e75e6ef25de63 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml
@@ -68,14 +68,9 @@
         <actionGroup ref="FilterProductGridByNameActionGroup" stepKey="filterBundleProductOptionsDownToName">
             <argument name="product" value="BundleProduct"/>
         </actionGroup>
-        <click selector="{{AdminProductFiltersSection.allCheckbox}}" stepKey="SelectAllOnly1"/>
-        <waitForPageLoad stepKey="loading2"/>
 
         <!--Delete-->
-        <click selector="{{AdminProductFiltersSection.actions}}" stepKey="ClickOnActionsChangingView"/>
-        <click selector="{{AdminProductFiltersSection.delete}}" stepKey="ClickDelete"/>
-        <click selector="//button[@class='action-primary action-accept']" stepKey="ConfirmDelete"/>
-        <waitForPageLoad stepKey="loading3"/>
+        <actionGroup ref="AdminSelectAndDeleteProductsActionGroup" stepKey="selectAndDeleteProducts"/>
 
         <!--Locating delete message-->
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="deleteMessage"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProductsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProductsTest.xml
index ef84ebd6fafea..6a96a7de2f491 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProductsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProductsTest.xml
@@ -118,12 +118,7 @@
         <actionGroup ref="BundleProductFilter" stepKey="FilterForOnlyBundleProducts"/>
 
         <!--Delete-->
-        <click selector="{{AdminProductFiltersSection.allCheckbox}}" stepKey="SelectAllOnly1"/>
-        <waitForPageLoad stepKey="loading"/>
-        <click selector="{{AdminProductFiltersSection.actions}}" stepKey="ClickOnActionsChangingView"/>
-        <click selector="{{AdminProductFiltersSection.delete}}" stepKey="ClickDelete"/>
-        <click selector="//button[@class='action-primary action-accept']" stepKey="ConfirmDelete"/>
-        <waitForPageLoad stepKey="loading3"/>
+        <actionGroup ref="AdminSelectAndDeleteProductsActionGroup" stepKey="selectAndDeleteProducts"/>
 
         <!--Locating delete message-->
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="deleteMessage"/>

From ff103b228ca67b8038e4c54b651ed287e27d58c7 Mon Sep 17 00:00:00 2001
From: Volodymyr Zaets <vzaets@magento.com>
Date: Thu, 6 Aug 2020 12:38:10 -0500
Subject: [PATCH 1330/1718] MC-36526: Revert public PR:27340

---
 .../Customer/Block/Account/Navigation.php     |  2 +-
 .../Unit/Block/Account/NavigationTest.php     | 25 ++++++++-----------
 .../view/frontend/layout/customer_account.xml | 10 ++++----
 .../Customer/view/frontend/layout/default.xml | 10 +++-----
 .../view/frontend/layout/customer_account.xml |  2 +-
 .../view/frontend/layout/customer_account.xml |  2 +-
 .../view/frontend/layout/customer_account.xml |  2 +-
 .../view/frontend/layout/customer_account.xml |  2 +-
 .../view/frontend/layout/customer_account.xml |  2 +-
 .../view/frontend/layout/customer_account.xml |  2 +-
 .../view/frontend/layout/customer_account.xml |  2 +-
 .../Wishlist/view/frontend/layout/default.xml |  2 +-
 12 files changed, 27 insertions(+), 36 deletions(-)

diff --git a/app/code/Magento/Customer/Block/Account/Navigation.php b/app/code/Magento/Customer/Block/Account/Navigation.php
index dcbd637ac360e..9a8aa698eaa47 100644
--- a/app/code/Magento/Customer/Block/Account/Navigation.php
+++ b/app/code/Magento/Customer/Block/Account/Navigation.php
@@ -47,6 +47,6 @@ public function getLinks()
      */
     private function compare(SortLinkInterface $firstLink, SortLinkInterface $secondLink): int
     {
-        return $firstLink->getSortOrder() <=> $secondLink->getSortOrder();
+        return $secondLink->getSortOrder() <=> $firstLink->getSortOrder();
     }
 }
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Account/NavigationTest.php b/app/code/Magento/Customer/Test/Unit/Block/Account/NavigationTest.php
index 0dc375908e561..c93e7110c5d96 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Account/NavigationTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Account/NavigationTest.php
@@ -18,11 +18,6 @@
 
 class NavigationTest extends TestCase
 {
-    /**
-     * Stub name top links
-     */
-    private const STUB_TOP_LINKS_NAME_IN_LAYOUT = 'top.links';
-
     /**
      * @var ObjectManagerHelper
      */
@@ -67,7 +62,7 @@ protected function setUp(): void
      *
      * @return void
      */
-    public function testGetLinksWithCustomerAndWishList(): void
+    public function testGetLinksWithCustomerAndWishList()
     {
         $wishListLinkMock = $this->getMockBuilder(WishListLink::class)
             ->disableOriginalConstructor()
@@ -81,30 +76,30 @@ public function testGetLinksWithCustomerAndWishList(): void
 
         $wishListLinkMock->expects($this->any())
             ->method('getSortOrder')
-            ->willReturn(30);
+            ->willReturn(100);
 
         $customerAccountLinkMock->expects($this->any())
             ->method('getSortOrder')
-            ->willReturn(0);
+            ->willReturn(20);
 
-        $topLinksNameInLayout = self::STUB_TOP_LINKS_NAME_IN_LAYOUT;
+        $nameInLayout = 'top.links';
 
         $blockChildren = [
-            'customerAccountLink' => $customerAccountLinkMock,
-            'wishListLink' => $wishListLinkMock
+            'wishListLink' => $wishListLinkMock,
+            'customerAccountLink' => $customerAccountLinkMock
         ];
 
-        $this->navigation->setNameInLayout($topLinksNameInLayout);
+        $this->navigation->setNameInLayout($nameInLayout);
         $this->layoutMock->expects($this->any())
             ->method('getChildBlocks')
-            ->with($topLinksNameInLayout)
+            ->with($nameInLayout)
             ->willReturn($blockChildren);
 
         /* Assertion */
         $this->assertEquals(
             [
-                0 => $customerAccountLinkMock,
-                1 => $wishListLinkMock
+                0 => $wishListLinkMock,
+                1 => $customerAccountLinkMock
             ],
             $this->navigation->getLinks()
         );
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account.xml
index 260f35e3cf444..a2a15a4166b73 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_account.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/customer_account.xml
@@ -24,31 +24,31 @@
                         <arguments>
                             <argument name="label" xsi:type="string" translate="true">My Account</argument>
                             <argument name="path" xsi:type="string">customer/account</argument>
-                            <argument name="sortOrder" xsi:type="number">1</argument>
+                            <argument name="sortOrder" xsi:type="number">250</argument>
                         </arguments>
                     </block>
                     <block class="Magento\Customer\Block\Account\Delimiter" name="customer-account-navigation-delimiter-1" template="Magento_Customer::account/navigation-delimiter.phtml">
                         <arguments>
-                            <argument name="sortOrder" xsi:type="number">40</argument>
+                            <argument name="sortOrder" xsi:type="number">200</argument>
                         </arguments>
                     </block>
                     <block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-address-link">
                         <arguments>
                             <argument name="label" xsi:type="string" translate="true">Address Book</argument>
                             <argument name="path" xsi:type="string">customer/address</argument>
-                            <argument name="sortOrder" xsi:type="number">50</argument>
+                            <argument name="sortOrder" xsi:type="number">190</argument>
                         </arguments>
                     </block>
                     <block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-account-edit-link">
                         <arguments>
                             <argument name="label" xsi:type="string" translate="true">Account Information</argument>
                             <argument name="path" xsi:type="string">customer/account/edit</argument>
-                            <argument name="sortOrder" xsi:type="number">60</argument>
+                            <argument name="sortOrder" xsi:type="number">180</argument>
                         </arguments>
                     </block>
                     <block class="Magento\Customer\Block\Account\Delimiter" name="customer-account-navigation-delimiter-2" template="Magento_Customer::account/navigation-delimiter.phtml">
                         <arguments>
-                            <argument name="sortOrder" xsi:type="number">90</argument>
+                            <argument name="sortOrder" xsi:type="number">130</argument>
                         </arguments>
                     </block>
                 </block>
diff --git a/app/code/Magento/Customer/view/frontend/layout/default.xml b/app/code/Magento/Customer/view/frontend/layout/default.xml
index 3c6be7a9ee5fe..3976fc6bd9090 100644
--- a/app/code/Magento/Customer/view/frontend/layout/default.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/default.xml
@@ -8,10 +8,10 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="top.links">
-            <block class="Magento\Customer\Block\Account\Link" name="my-account-link" template="Magento_Customer::account/link/my-account.phtml">
+            <block class="Magento\Customer\Block\Account\Link" name="my-account-link">
                 <arguments>
                     <argument name="label" xsi:type="string" translate="true">My Account</argument>
-                    <argument name="sortOrder" xsi:type="number">1</argument>
+                    <argument name="sortOrder" xsi:type="number">110</argument>
                 </arguments>
             </block>
             <block class="Magento\Customer\Block\Account\RegisterLink" name="register-link">
@@ -20,11 +20,7 @@
                 </arguments>
             </block>
             <block class="Magento\Customer\Block\Account\AuthorizationLink" name="authorization-link"
-                   template="Magento_Customer::account/link/authorization.phtml">
-                <arguments>
-                    <argument name="sortOrder" xsi:type="number">30</argument>
-                </arguments>
-            </block>
+                   template="Magento_Customer::account/link/authorization.phtml"/>
         </referenceBlock>
         <referenceContainer name="content">
             <block class="Magento\Customer\Block\Account\AuthenticationPopup" name="authentication-popup" as="authentication-popup" template="Magento_Customer::account/authentication-popup.phtml">
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/customer_account.xml b/app/code/Magento/Downloadable/view/frontend/layout/customer_account.xml
index b86d05d20afaa..5ce45a27615e0 100644
--- a/app/code/Magento/Downloadable/view/frontend/layout/customer_account.xml
+++ b/app/code/Magento/Downloadable/view/frontend/layout/customer_account.xml
@@ -12,7 +12,7 @@
                 <arguments>
                     <argument name="path" xsi:type="string">downloadable/customer/products</argument>
                     <argument name="label" xsi:type="string" translate="true">My Downloadable Products</argument>
-                    <argument name="sortOrder" xsi:type="number">20</argument>
+                    <argument name="sortOrder" xsi:type="number">217</argument>
                 </arguments>
             </block>
         </referenceBlock>
diff --git a/app/code/Magento/Newsletter/view/frontend/layout/customer_account.xml b/app/code/Magento/Newsletter/view/frontend/layout/customer_account.xml
index 9572c7e11e951..fd55fce8ee016 100644
--- a/app/code/Magento/Newsletter/view/frontend/layout/customer_account.xml
+++ b/app/code/Magento/Newsletter/view/frontend/layout/customer_account.xml
@@ -12,7 +12,7 @@
                 <arguments>
                     <argument name="path" xsi:type="string">newsletter/manage</argument>
                     <argument name="label" xsi:type="string" translate="true">Newsletter Subscriptions</argument>
-                    <argument name="sortOrder" xsi:type="number">110</argument>
+                    <argument name="sortOrder" xsi:type="number">40</argument>
                 </arguments>
             </block>
         </referenceBlock>
diff --git a/app/code/Magento/Paypal/view/frontend/layout/customer_account.xml b/app/code/Magento/Paypal/view/frontend/layout/customer_account.xml
index c830045e7991e..712cccc3c1295 100644
--- a/app/code/Magento/Paypal/view/frontend/layout/customer_account.xml
+++ b/app/code/Magento/Paypal/view/frontend/layout/customer_account.xml
@@ -16,7 +16,7 @@
                 <arguments>
                     <argument name="path" xsi:type="string">paypal/billing_agreement</argument>
                     <argument name="label" xsi:type="string" translate="true">Billing Agreements</argument>
-                    <argument name="sortOrder" xsi:type="number">80</argument>
+                    <argument name="sortOrder" xsi:type="number">140</argument>
                 </arguments>
             </block>
         </referenceBlock>
diff --git a/app/code/Magento/Review/view/frontend/layout/customer_account.xml b/app/code/Magento/Review/view/frontend/layout/customer_account.xml
index 01d2281681a33..9f759dba41782 100644
--- a/app/code/Magento/Review/view/frontend/layout/customer_account.xml
+++ b/app/code/Magento/Review/view/frontend/layout/customer_account.xml
@@ -12,7 +12,7 @@
                 <arguments>
                     <argument name="path" xsi:type="string">review/customer</argument>
                     <argument name="label" xsi:type="string" translate="true">My Product Reviews</argument>
-                    <argument name="sortOrder" xsi:type="number">100</argument>
+                    <argument name="sortOrder" xsi:type="number">50</argument>
                 </arguments>
             </block>
         </referenceBlock>
diff --git a/app/code/Magento/Sales/view/frontend/layout/customer_account.xml b/app/code/Magento/Sales/view/frontend/layout/customer_account.xml
index e2a74fe09f718..84ed48e2566ac 100644
--- a/app/code/Magento/Sales/view/frontend/layout/customer_account.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/customer_account.xml
@@ -12,7 +12,7 @@
                 <arguments>
                     <argument name="path" xsi:type="string">sales/order/history</argument>
                     <argument name="label" xsi:type="string" translate="true">My Orders</argument>
-                    <argument name="sortOrder" xsi:type="number">10</argument>
+                    <argument name="sortOrder" xsi:type="number">230</argument>
                 </arguments>
             </block>
         </referenceBlock>
diff --git a/app/code/Magento/Vault/view/frontend/layout/customer_account.xml b/app/code/Magento/Vault/view/frontend/layout/customer_account.xml
index 4495d425ff595..05044da272e6d 100644
--- a/app/code/Magento/Vault/view/frontend/layout/customer_account.xml
+++ b/app/code/Magento/Vault/view/frontend/layout/customer_account.xml
@@ -15,7 +15,7 @@
                 <arguments>
                     <argument name="path" xsi:type="string">vault/cards/listaction</argument>
                     <argument name="label" xsi:type="string" translate="true">Stored Payment Methods</argument>
-                    <argument name="sortOrder" xsi:type="number">70</argument>
+                    <argument name="sortOrder" xsi:type="number">160</argument>
                 </arguments>
             </block>
         </referenceBlock>
diff --git a/app/code/Magento/Wishlist/view/frontend/layout/customer_account.xml b/app/code/Magento/Wishlist/view/frontend/layout/customer_account.xml
index 63a296dd3e48e..4d0ffce0a2274 100644
--- a/app/code/Magento/Wishlist/view/frontend/layout/customer_account.xml
+++ b/app/code/Magento/Wishlist/view/frontend/layout/customer_account.xml
@@ -12,7 +12,7 @@
                 <arguments>
                     <argument name="path" xsi:type="string">wishlist</argument>
                     <argument name="label" xsi:type="string" translate="true">My Wish List</argument>
-                    <argument name="sortOrder" xsi:type="number">30</argument>
+                    <argument name="sortOrder" xsi:type="number">210</argument>
                 </arguments>
             </block>
         </referenceBlock>
diff --git a/app/code/Magento/Wishlist/view/frontend/layout/default.xml b/app/code/Magento/Wishlist/view/frontend/layout/default.xml
index cd8e6349783b4..c4f0d01707b20 100644
--- a/app/code/Magento/Wishlist/view/frontend/layout/default.xml
+++ b/app/code/Magento/Wishlist/view/frontend/layout/default.xml
@@ -13,7 +13,7 @@
         <referenceBlock name="top.links">
             <block class="Magento\Wishlist\Block\Link" name="wish-list-link" after="my-account-link">
                 <arguments>
-                    <argument name="sortOrder" xsi:type="number">30</argument>
+                    <argument name="sortOrder" xsi:type="number">60</argument>
                 </arguments>
             </block>
         </referenceBlock>

From 4401d655ae5f061bfe57ebd85b726930042f025b Mon Sep 17 00:00:00 2001
From: Dave Macaulay <macaulay@adobe.com>
Date: Thu, 6 Aug 2020 13:30:53 -0500
Subject: [PATCH 1331/1718] PWA-806: Localize emails sent through GraphQL
 application

---
 .../Magento/GraphQl/Plugin/StoreResolver.php  | 82 -------------------
 .../GraphQl/Plugin/TranslationLoader.php      | 22 +++--
 app/code/Magento/GraphQl/etc/graphql/di.xml   |  3 -
 .../StoreGraphQl/Plugin/StoreResolver.php     | 44 ++++++++++
 .../Magento/StoreGraphQl/etc/graphql/di.xml   |  3 +
 5 files changed, 62 insertions(+), 92 deletions(-)
 delete mode 100644 app/code/Magento/GraphQl/Plugin/StoreResolver.php
 create mode 100644 app/code/Magento/StoreGraphQl/Plugin/StoreResolver.php

diff --git a/app/code/Magento/GraphQl/Plugin/StoreResolver.php b/app/code/Magento/GraphQl/Plugin/StoreResolver.php
deleted file mode 100644
index a57a31a1f42e1..0000000000000
--- a/app/code/Magento/GraphQl/Plugin/StoreResolver.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-namespace Magento\GraphQl\Plugin;
-
-use Magento\Framework\App\Request\Http as HttpRequest;
-use Magento\Framework\App\RequestInterface;
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Store\Api\Data\StoreInterface;
-use Magento\Store\Api\StoreRepositoryInterface;
-use Magento\Store\Model\StoreIsInactiveException;
-
-/**
- * Load translations for GraphQL requests
- */
-class StoreResolver
-{
-    /**
-     * @var RequestInterface|HttpRequest
-     */
-    private $request;
-
-    /**
-     * @var StoreRepositoryInterface
-     */
-    private $storeRepository;
-
-    /**
-     * @param RequestInterface $request
-     * @param StoreRepositoryInterface $storeRepository
-     */
-    public function __construct(
-        RequestInterface $request,
-        StoreRepositoryInterface $storeRepository
-    ) {
-        $this->request = $request;
-        $this->storeRepository = $storeRepository;
-    }
-
-    /**
-     * Use the 'Store' header to determine the current store
-     *
-     * @param \Magento\Store\Model\StoreResolver $subject
-     * @param callable $proceed
-     * @return mixed
-     */
-    public function aroundGetCurrentStoreId(\Magento\Store\Model\StoreResolver $subject, callable $proceed)
-    {
-        $storeCode = $this->request->getHeader('Store');
-
-        if ($storeCode) {
-            try {
-                $store = $this->getRequestedStoreByCode($storeCode);
-
-                if ($store) {
-                    return $store;
-                }
-            } catch (NoSuchEntityException $e) {
-                return $proceed();
-            }
-        }
-
-        return $proceed();
-    }
-
-    /**
-     * Retrieve active store by code
-     *
-     * @param string $storeCode
-     * @return StoreInterface
-     * @throws NoSuchEntityException
-     */
-    private function getRequestedStoreByCode($storeCode) : StoreInterface
-    {
-        try {
-            $store = $this->storeRepository->getActiveStoreByCode($storeCode);
-        } catch (StoreIsInactiveException $e) {
-            throw new NoSuchEntityException(__('Requested store is inactive'));
-        }
-
-        return $store;
-    }
-}
diff --git a/app/code/Magento/GraphQl/Plugin/TranslationLoader.php b/app/code/Magento/GraphQl/Plugin/TranslationLoader.php
index 62c23e454fdf2..fec872c212eea 100644
--- a/app/code/Magento/GraphQl/Plugin/TranslationLoader.php
+++ b/app/code/Magento/GraphQl/Plugin/TranslationLoader.php
@@ -4,12 +4,10 @@
 
 use Magento\Framework\App\AreaInterface;
 use Magento\Framework\App\AreaList;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\State;
-use Magento\Store\Model\StoreManagerInterface;
 
 /**
- * Load translations for GraphQL requests
+ * Load translations on the first instance of a translated string
  */
 class TranslationLoader
 {
@@ -23,6 +21,11 @@ class TranslationLoader
      */
     private $appState;
 
+    /**
+     * @var bool
+     */
+    private $translationsLoaded = false;
+
     /**
      * @param AreaList $areaList
      * @param State $appState
@@ -36,11 +39,16 @@ public function __construct(
     }
 
     /**
-     * Before rendering any string ensure the translation aspect of area is loaded
+     * Before render of any localized string ensure the translation data is loaded
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
-    public function beforeRender(\Magento\Framework\Phrase $subject)
+    public function beforeRender()
     {
-        $area = $this->areaList->getArea($this->appState->getAreaCode());
-        $area->load(AreaInterface::PART_TRANSLATE);
+        if ($this->translationsLoaded === false) {
+            $area = $this->areaList->getArea($this->appState->getAreaCode());
+            $area->load(AreaInterface::PART_TRANSLATE);
+            $this->translationsLoaded = true;
+        }
     }
 }
diff --git a/app/code/Magento/GraphQl/etc/graphql/di.xml b/app/code/Magento/GraphQl/etc/graphql/di.xml
index 9ab86610f50f8..f60bc730747f0 100644
--- a/app/code/Magento/GraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/GraphQl/etc/graphql/di.xml
@@ -44,7 +44,4 @@
     <type name="Magento\Framework\Phrase">
         <plugin name="graphQlLocalizationPhrasePlugin" type="Magento\GraphQl\Plugin\TranslationLoader" />
     </type>
-    <type name="Magento\Store\Model\StoreResolver">
-        <plugin name="graphQlLocalizationStoreResolver" type="Magento\GraphQl\Plugin\StoreResolver" />
-    </type>
 </config>
diff --git a/app/code/Magento/StoreGraphQl/Plugin/StoreResolver.php b/app/code/Magento/StoreGraphQl/Plugin/StoreResolver.php
new file mode 100644
index 0000000000000..65779f22f2758
--- /dev/null
+++ b/app/code/Magento/StoreGraphQl/Plugin/StoreResolver.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Magento\StoreGraphQl\Plugin;
+
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\App\RequestInterface;
+use Magento\Store\Model\Resolver\Store;
+
+/**
+ * Ensure the store resolver gets the correct scope based on the GraphQl header
+ */
+class StoreResolver
+{
+    /**
+     * @var RequestInterface|HttpRequest
+     */
+    private $request;
+
+    /**
+     * @param RequestInterface $request
+     */
+    public function __construct(
+        RequestInterface $request
+    ) {
+        $this->request = $request;
+    }
+
+    /**
+     * If no scope is provided and there is a Store header, ensure the correct store code is used
+     *
+     * @param Store $subject
+     * @param null $scopeId
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeGetScope(Store $subject, $scopeId = null)
+    {
+        $storeCode = $this->request->getHeader('Store');
+
+        if ($scopeId === null && $storeCode) {
+            return [$storeCode];
+        }
+    }
+}
diff --git a/app/code/Magento/StoreGraphQl/etc/graphql/di.xml b/app/code/Magento/StoreGraphQl/etc/graphql/di.xml
index 3a0143821d8b9..93d6a1356e0d0 100644
--- a/app/code/Magento/StoreGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/StoreGraphQl/etc/graphql/di.xml
@@ -23,4 +23,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Store\Model\Resolver\Store">
+        <plugin name="graphQlLocalizationStoreResolver" type="Magento\StoreGraphQl\Plugin\StoreResolver" />
+    </type>
 </config>

From 8b51cf883131eae0d9b161698ac9c062e321d32b Mon Sep 17 00:00:00 2001
From: Dave Macaulay <macaulay@adobe.com>
Date: Thu, 6 Aug 2020 14:50:48 -0500
Subject: [PATCH 1332/1718] PWA-806: Localize emails sent through GraphQL
 application

---
 .../GraphQl/Plugin/TranslationLoader.php      | 54 -------------------
 app/code/Magento/GraphQl/etc/graphql/di.xml   |  3 --
 .../HttpHeaderProcessor/StoreProcessor.php    | 26 ++++++++-
 lib/internal/Magento/Framework/Phrase/__.php  | 14 +----
 4 files changed, 27 insertions(+), 70 deletions(-)
 delete mode 100644 app/code/Magento/GraphQl/Plugin/TranslationLoader.php

diff --git a/app/code/Magento/GraphQl/Plugin/TranslationLoader.php b/app/code/Magento/GraphQl/Plugin/TranslationLoader.php
deleted file mode 100644
index fec872c212eea..0000000000000
--- a/app/code/Magento/GraphQl/Plugin/TranslationLoader.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace Magento\GraphQl\Plugin;
-
-use Magento\Framework\App\AreaInterface;
-use Magento\Framework\App\AreaList;
-use Magento\Framework\App\State;
-
-/**
- * Load translations on the first instance of a translated string
- */
-class TranslationLoader
-{
-    /**
-     * @var AreaList
-     */
-    private $areaList;
-
-    /**
-     * @var State
-     */
-    private $appState;
-
-    /**
-     * @var bool
-     */
-    private $translationsLoaded = false;
-
-    /**
-     * @param AreaList $areaList
-     * @param State $appState
-     */
-    public function __construct(
-        AreaList $areaList,
-        State $appState
-    ) {
-        $this->areaList = $areaList;
-        $this->appState = $appState;
-    }
-
-    /**
-     * Before render of any localized string ensure the translation data is loaded
-     *
-     * @throws \Magento\Framework\Exception\LocalizedException
-     */
-    public function beforeRender()
-    {
-        if ($this->translationsLoaded === false) {
-            $area = $this->areaList->getArea($this->appState->getAreaCode());
-            $area->load(AreaInterface::PART_TRANSLATE);
-            $this->translationsLoaded = true;
-        }
-    }
-}
diff --git a/app/code/Magento/GraphQl/etc/graphql/di.xml b/app/code/Magento/GraphQl/etc/graphql/di.xml
index f60bc730747f0..23d49124d1a02 100644
--- a/app/code/Magento/GraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/GraphQl/etc/graphql/di.xml
@@ -41,7 +41,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\Phrase">
-        <plugin name="graphQlLocalizationPhrasePlugin" type="Magento\GraphQl\Plugin\TranslationLoader" />
-    </type>
 </config>
diff --git a/app/code/Magento/StoreGraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php b/app/code/Magento/StoreGraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php
index 7999a96917cde..66800520eb4cb 100644
--- a/app/code/Magento/StoreGraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php
+++ b/app/code/Magento/StoreGraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php
@@ -7,6 +7,10 @@
 
 namespace Magento\StoreGraphQl\Controller\HttpHeaderProcessor;
 
+use Magento\Framework\App\AreaInterface;
+use Magento\Framework\App\AreaList;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\State;
 use Magento\GraphQl\Controller\HttpHeaderProcessorInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\App\Http\Context as HttpContext;
@@ -32,19 +36,35 @@ class StoreProcessor implements HttpHeaderProcessorInterface
      */
     private $storeCookieManager;
 
+    /**
+     * @var AreaList
+     */
+    private $areaList;
+
+    /**
+     * @var State
+     */
+    private $appState;
+
     /**
      * @param StoreManagerInterface $storeManager
      * @param HttpContext $httpContext
      * @param StoreCookieManagerInterface $storeCookieManager
+     * @param AreaList $areaList
+     * @param State $appState
      */
     public function __construct(
         StoreManagerInterface $storeManager,
         HttpContext $httpContext,
-        StoreCookieManagerInterface $storeCookieManager
+        StoreCookieManagerInterface $storeCookieManager,
+        AreaList $areaList = null,
+        State $appState = null
     ) {
         $this->storeManager = $storeManager;
         $this->httpContext = $httpContext;
         $this->storeCookieManager = $storeCookieManager;
+        $this->areaList = $areaList ?? ObjectManager::getInstance()->get(AreaList::class);
+        $this->appState = $appState ?? ObjectManager::getInstance()->get(State::class);
     }
 
     /**
@@ -67,6 +87,10 @@ public function processHeaderValue(string $headerValue) : void
             $this->storeManager->setCurrentStore($storeCode);
             $this->updateContext($storeCode);
         }
+
+        // Load translations for the app
+        $area = $this->areaList->getArea($this->appState->getAreaCode());
+        $area->load(AreaInterface::PART_TRANSLATE);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Phrase/__.php b/lib/internal/Magento/Framework/Phrase/__.php
index 9deff31021999..0f828acd828b5 100644
--- a/lib/internal/Magento/Framework/Phrase/__.php
+++ b/lib/internal/Magento/Framework/Phrase/__.php
@@ -3,19 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Phrase;
-
 /**
  * Create value-object \Magento\Framework\Phrase
  *
  * @SuppressWarnings(PHPMD.ShortMethodName)
  * phpcs:disable Squiz.Functions.GlobalFunction
  * @param array $argc
- * @return Phrase
+ * @return \Magento\Framework\Phrase
  */
 function __(...$argc)
 {
@@ -24,11 +20,5 @@ function __(...$argc)
         $argc = $argc[0];
     }
 
-    return ObjectManager::getInstance()->create(
-        Phrase::class,
-        [
-            'text' => $text,
-            'arguments' => $argc
-        ]
-    );
+    return new \Magento\Framework\Phrase($text, $argc);
 }

From 439123520349caf39173fa074a52ac686bbeffd7 Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Thu, 6 Aug 2020 15:04:15 -0500
Subject: [PATCH 1333/1718] - minor fix

---
 app/code/Magento/Quote/Model/Cart/AddProductsToCart.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php b/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
index 3f6e13af2eae7..2c5c3536d6682 100644
--- a/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
+++ b/app/code/Magento/Quote/Model/Cart/AddProductsToCart.php
@@ -115,7 +115,7 @@ public function execute(string $maskedCartId, array $cartItems): AddProductsToCa
             }
         }
 
-        if (!count($this->errors) === 0) {
+        if (count($this->errors) !== 0) {
             /* Revert changes introduced by add to cart processes in case of an error */
             $cart->getItemsCollection()->clear();
         }

From 20dc8155942a7f3965f405074c03483032115a16 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Fri, 7 Aug 2020 04:15:43 +0800
Subject: [PATCH 1334/1718] 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 402c1684c2d14b6df421bc8b6345a0a3b2352a93 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Fri, 7 Aug 2020 00:11:18 +0300
Subject: [PATCH 1335/1718] Improve code style

---
 .../FilterProcessor/Entity.php                | 36 ++++++++++---------
 .../FilterProcessor/Keyword.php               | 24 ++++++-------
 2 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/Entity.php b/app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/Entity.php
index 56db19c1f88ab..6027a7daf7442 100644
--- a/app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/Entity.php
+++ b/app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/Entity.php
@@ -11,7 +11,6 @@
 use Magento\Framework\Api\SearchCriteria\CollectionProcessor\FilterProcessor\CustomFilterInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Data\Collection\AbstractDb;
-use Magento\Framework\DB\Select;
 
 /**
  * Custom filter to filter collection by entity type
@@ -49,31 +48,36 @@ public function apply(Filter $filter, AbstractDb $collection): bool
         $ids = $filter->getValue();
         if (is_array($ids)) {
             $collection->addFieldToFilter(
-                self::TABLE_ALIAS . '.id',
-                ['in' => $this->getSelectByEntityIds($ids)]
+                [self::TABLE_ALIAS . '.id'],
+                [
+                    ['in' => $this->getSelectByEntityIds($ids)]
+                ]
             );
         }
         return true;
     }
 
     /**
-     * Return select asset ids by entity type
+     * Return asset ids by entity type
      *
      * @param array $ids
-     * @return Select
+     * @return array
      */
-    private function getSelectByEntityIds(array $ids): Select
+    private function getSelectByEntityIds(array $ids): array
     {
         $connection = $this->connection->getConnection();
-        return $connection->fetchAssoc($connection->select()->from(
-            ['asset_content_table' => $this->connection->getTableName(self::TABLE_MEDIA_CONTENT_ASSET)],
-            ['asset_id']
-        )->where(
-            'entity_type = ?',
-            $this->entityType
-        )->where(
-            'entity_id IN (?)',
-            $ids
-        ));
+
+        return $connection->fetchAssoc(
+            $connection->select()->from(
+                ['asset_content_table' => $this->connection->getTableName(self::TABLE_MEDIA_CONTENT_ASSET)],
+                ['asset_id']
+            )->where(
+                'entity_type = ?',
+                $this->entityType
+            )->where(
+                'entity_id IN (?)',
+                $ids
+            )
+        );
     }
 }
diff --git a/app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/Keyword.php b/app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/Keyword.php
index a3003e3f5a23a..1c8baa58d90ea 100644
--- a/app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/Keyword.php
+++ b/app/code/Magento/MediaGalleryUi/Model/SearchCriteria/CollectionProcessor/FilterProcessor/Keyword.php
@@ -11,7 +11,6 @@
 use Magento\Framework\Api\SearchCriteria\CollectionProcessor\FilterProcessor\CustomFilterInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Data\Collection\AbstractDb;
-use Magento\Framework\DB\Select;
 
 class Keyword implements CustomFilterInterface
 {
@@ -59,20 +58,21 @@ public function apply(Filter $filter, AbstractDb $collection): bool
     private function getAssetIdsByKeyword(string $value): array
     {
         $connection = $this->connection->getConnection();
+
         return $connection->fetchAssoc(
             $connection->select()->from(
                 $connection->select()
-                           ->from(
-                               ['asset_keywords_table' => $this->connection->getTableName(self::TABLE_ASSET_KEYWORD)],
-                               ['id']
-                           )->where(
-                               'keyword = ?',
-                               $value
-                           )->joinInner(
-                               ['keywords_table' => $this->connection->getTableName(self::TABLE_KEYWORDS)],
-                               'keywords_table.keyword_id = asset_keywords_table.id',
-                               ['asset_id']
-                           ),
+                    ->from(
+                        ['asset_keywords_table' => $this->connection->getTableName(self::TABLE_ASSET_KEYWORD)],
+                        ['id']
+                    )->where(
+                        'keyword = ?',
+                        $value
+                    )->joinInner(
+                        ['keywords_table' => $this->connection->getTableName(self::TABLE_KEYWORDS)],
+                        'keywords_table.keyword_id = asset_keywords_table.id',
+                        ['asset_id']
+                    ),
                 ['asset_id']
             )
         );

From 6209cfbc52bc213f5a578c3fbdaaf6e5ddf3ad15 Mon Sep 17 00:00:00 2001
From: Ievgen Kolesov <ikolesov@adobe.com>
Date: Thu, 6 Aug 2020 16:15:00 -0500
Subject: [PATCH 1336/1718] PWA-805: Expose localization system / store config
 from GraphQL

---
 .../Store/Model/ResourceModel/StoreWebsiteRelation.php | 10 +++++++++-
 .../Model/Resolver/AvailableStoresResolver.php         |  6 +++++-
 .../Model/Resolver/Store/StoreConfigDataProvider.php   |  5 +++--
 app/code/Magento/StoreGraphQl/etc/graphql/di.xml       |  7 +++++++
 app/code/Magento/StoreGraphQl/etc/schema.graphqls      |  5 ++++-
 5 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php b/app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php
index 19bb45de24d64..f0b021eefb999 100644
--- a/app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php
+++ b/app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php
@@ -48,10 +48,11 @@ public function getStoreByWebsiteId($websiteId)
      * Get website store data
      *
      * @param int $websiteId
+     * @param int $storeGroupId
      * @param bool $available
      * @return array
      */
-    public function getWebsiteStores(int $websiteId, bool $available = false): array
+    public function getWebsiteStores(int $websiteId, int $storeGroupId = null, bool $available = false): array
     {
         $connection = $this->resource->getConnection();
         $storeTable = $this->resource->getTableName('store');
@@ -60,6 +61,13 @@ public function getWebsiteStores(int $websiteId, bool $available = false): array
             $websiteId
         );
 
+        if ($storeGroupId) {
+            $storeSelect = $storeSelect->where(
+                'group_id = ?',
+                $storeGroupId
+            );
+        }
+
         if ($available) {
             $storeSelect = $storeSelect->where(
                 'is_active = 1'
diff --git a/app/code/Magento/StoreGraphQl/Model/Resolver/AvailableStoresResolver.php b/app/code/Magento/StoreGraphQl/Model/Resolver/AvailableStoresResolver.php
index eedd7e21fa058..ab1ba9f8a225f 100644
--- a/app/code/Magento/StoreGraphQl/Model/Resolver/AvailableStoresResolver.php
+++ b/app/code/Magento/StoreGraphQl/Model/Resolver/AvailableStoresResolver.php
@@ -41,8 +41,12 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
+        $storeGroupId = !empty($args['use_current_group']) ?
+            (int)$context->getExtensionAttributes()->getStore()->getStoreGroupId() :
+            null;
         return $this->storeConfigDataProvider->getAvailableStoreConfig(
-            (int)$context->getExtensionAttributes()->getStore()->getWebsiteId()
+            (int)$context->getExtensionAttributes()->getStore()->getWebsiteId(),
+            $storeGroupId
         );
     }
 }
diff --git a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
index 6538d87de9780..928a99eb73714 100644
--- a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
+++ b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
@@ -73,11 +73,12 @@ public function getStoreConfigData(StoreInterface $store): array
      * Get available website stores
      *
      * @param int $websiteId
+     * @param int|null $storeGroupId
      * @return array
      */
-    public function getAvailableStoreConfig(int $websiteId): array
+    public function getAvailableStoreConfig(int $websiteId, int $storeGroupId = null): array
     {
-        $websiteStores = $this->storeWebsiteRelation->getWebsiteStores($websiteId, true);
+        $websiteStores = $this->storeWebsiteRelation->getWebsiteStores($websiteId, $storeGroupId, true);
         $storeCodes = array_column($websiteStores, 'code');
 
         $storeConfigs = $this->storeConfigManager->getStoreConfigs($storeCodes);
diff --git a/app/code/Magento/StoreGraphQl/etc/graphql/di.xml b/app/code/Magento/StoreGraphQl/etc/graphql/di.xml
index 3a0143821d8b9..7ba2264b650ee 100644
--- a/app/code/Magento/StoreGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/StoreGraphQl/etc/graphql/di.xml
@@ -23,4 +23,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\StoreGraphQl\Model\Resolver\Store\StoreConfigDataProvider">
+        <arguments>
+            <argument name="extendedConfigData" xsi:type="array">
+                <item name="use_store_in_url" xsi:type="string">web/url/use_store</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/StoreGraphQl/etc/schema.graphqls b/app/code/Magento/StoreGraphQl/etc/schema.graphqls
index d85bac7801f39..6dcbf1aded4d8 100644
--- a/app/code/Magento/StoreGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/StoreGraphQl/etc/schema.graphqls
@@ -2,7 +2,9 @@
 # See COPYING.txt for license details.
 type Query {
     storeConfig : StoreConfig @resolver(class: "Magento\\StoreGraphQl\\Model\\Resolver\\StoreConfigResolver") @doc(description: "The store config query") @cache(cacheable: false)
-    availableStores: [StoreConfig] @resolver(class: "Magento\\StoreGraphQl\\Model\\Resolver\\AvailableStoresResolver") @doc(description: "Get a list of available store views and their config information.")
+    availableStores(
+        use_current_group : Boolean @doc(description: "Get only store views from the current store group")
+    ): [StoreConfig] @resolver(class: "Magento\\StoreGraphQl\\Model\\Resolver\\AvailableStoresResolver") @doc(description: "Get a list of available store views and their config information.")
 }
 
 type Website @doc(description: "Website is deprecated because it is should not be used on storefront. The type contains information about a website") {
@@ -32,4 +34,5 @@ type StoreConfig @doc(description: "The type contains information about a store
     secure_base_static_url : String @doc(description: "Secure base static URL for the store")
     secure_base_media_url : String @doc(description: "Secure base media URL for the store")
     store_name : String @doc(description: "Name of the store")
+    use_store_in_url: Boolean @doc(description: "Indicates whether store code is used in url")
 }

From 5c463dc31c5c3dfca418542dedcd542adffca2ac Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Fri, 7 Aug 2020 00:47:29 +0300
Subject: [PATCH 1337/1718] Move fixes for url-filter component to separate PR

---
 .../product/grid/url_filter_applier.phtml     |  3 +-
 .../templates/url_filter_applier.phtml        |  3 +-
 .../Controller/Adminhtml/Asset/Search.php     |  4 +-
 .../adminhtml/web/js/image/image-details.js   |  5 +-
 .../grid/filters/elements/ui-select.html      |  5 +-
 .../base/web/js/grid/url-filter-applier.js    | 65 +------------------
 .../base/js/grid/url-filter-applier.test.js   | 30 +--------
 7 files changed, 12 insertions(+), 103 deletions(-)

diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml
index 15004bc73cb8b..3e00503a882db 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml
@@ -10,8 +10,7 @@
     {
         "*": {
             "Magento_Ui/js/grid/url-filter-applier": {
-                "listingNamespace": "product_listing",
-                "filterComponentName": "asset_id"
+                "listingNamespace": "product_listing"
             }
         }
     }
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml b/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
index 81ab4bda2617b..a4918e86715a8 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/url_filter_applier.phtml
@@ -11,8 +11,7 @@
     {
         "*": {
             "Magento_Ui/js/grid/url-filter-applier": {
-                "listingNamespace": "<?= $escaper->escapeJs($block->getListingNamespace()) ?>",
-                "filterComponentName": "asset_id"
+                "listingNamespace": "<?= $escaper->escapeJs($block->getListingNamespace()) ?>"
             }
         }
     }
diff --git a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/Search.php b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/Search.php
index 9b6c08edbc86d..b4b6713f47065 100644
--- a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/Search.php
+++ b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/Search.php
@@ -137,9 +137,9 @@ public function execute()
             if (!empty($assets)) {
                 foreach ($assets as $asset) {
                     $responseContent['options'][] = [
-                        'value' => (string) $asset->getId(),
+                        'value' => $asset->getId(),
                         'label' => $asset->getTitle(),
-                        'src' => $this->storage->getThumbnailUrl($this->images->getStorageRoot() . $asset->getPath())
+                        'path' => $this->storage->getThumbnailUrl($this->images->getStorageRoot() . $asset->getPath())
                     ];
                     $responseContent['total'] = count($responseContent['options']);
                 }
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-details.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-details.js
index 25358247c5cf7..db42f155501c3 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-details.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-details.js
@@ -161,10 +161,7 @@ define([
          * @param {String} link
          */
         getFilterUrl: function (link) {
-            return link + '?filters[asset_id]=[' + this.image().id + ']' +
-                '&options[]=[value=' + this.image().id +
-                ',label="' + this.image().title +
-                '",src=' + this.image()['image_url'] + ']';
+            return link + '?filters[asset_id]=[' + this.image().id + ']';
         },
 
         /**
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 5efec6b2b0778..cce859f331d9a 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
@@ -108,8 +108,9 @@
                         </if>
                         <label class="admin__action-multiselect-label">
                             <span text="option.label"></span>
-                            <img class="admin__action-multiselect-item-path"
-                                 attr="{ src: option.src }"/>
+                            <img if="$parent.getPath(option)"
+                                 class="admin__action-multiselect-item-path"
+                                 attr="{ src: option.path }"/>
                         </label>
                     </div>
                     <if args="$data.optgroup">
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 b767ea8a3513c..1f870e9e819a1 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
@@ -12,15 +12,11 @@ define([
     return Component.extend({
         defaults: {
             listingNamespace: null,
-            filterComponentName: null,
-            selectProvider: 'index = ${ $.filterComponentName }, ns = ${ $.listingNamespace }',
             filterProvider: 'componentType = filters, ns = ${ $.listingNamespace }',
             filterKey: 'filters',
-            optionsKey: 'options',
             searchString: location.search,
             modules: {
-                filterComponent: '${ $.filterProvider }',
-                selectComponent: '${ $.selectProvider }'
+                filterComponent: '${ $.filterProvider }'
             }
         },
 
@@ -40,11 +36,9 @@ define([
          * Apply filter
          */
         apply: function () {
-            var urlFilter = this.getFilterParam(this.searchString),
-                options = this.getOptionsParam(this.searchString);
+            var urlFilter = this.getFilterParam(this.searchString);
 
-            if (_.isUndefined(this.filterComponent()) ||
-                !_.isNull(this.filterComponentName) && _.isUndefined(this.selectComponent())) {
+            if (_.isUndefined(this.filterComponent())) {
                 setTimeout(function () {
                     this.apply();
                 }.bind(this), 100);
@@ -52,10 +46,6 @@ define([
                 return;
             }
 
-            if (Object.keys(options).length) {
-                this.selectComponent().options(options);
-            }
-
             if (Object.keys(urlFilter).length) {
                 this.filterComponent().setData(urlFilter, false);
                 this.filterComponent().apply();
@@ -90,55 +80,6 @@ define([
                 .compact()
                 .object()
                 .value();
-        },
-
-        /**
-         * Get Filter options
-         *
-         * @param {String} url
-         */
-        getOptionsParam: function (url) {
-            var params = [],
-                chunks,
-                values,
-                i,
-                options,
-                searchString = decodeURI(url);
-
-            _.chain(searchString.slice(1).split('&'))
-                .map(function (item, k) {
-                    if (item && item.search(this.optionsKey) !== -1) {
-                        chunks = item.substring(item.indexOf('?') + 1).split('&');
-
-                        for (i = 0; i < chunks.length; i++) {
-                            options = chunks[i].substring(item.indexOf('[]') + 3)
-                                .replace(/[\[\]]/g, '')
-                                .split(/,(?=(?:(?:[^"]*"){2})*[^"]*$)/);
-                            values = this.getOptionsValues(options);
-
-                        }
-                        params[k - 1] = values;
-                    }
-                }.bind(this));
-
-            return params;
-        },
-
-        /**
-         * Return options values as array
-         *
-         * @param {Array} options
-         * @return {Array}
-         */
-        getOptionsValues: function (options) {
-            var values = {},
-                j;
-
-            for (j = 0; j < options.length; j++) {
-                values[options[j].split('=')[0]] = options[j].split('=')[1];
-            }
-
-            return values;
         }
     });
 });
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 ec92ff82e09d5..a3d49e382de51 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
@@ -14,15 +14,11 @@ define([
             filterComponentMock = {
                 setData: jasmine.createSpy(),
                 apply: jasmine.createSpy()
-            },
-            selectComponentMock = {
-                options: jasmine.createSpy()
             };
 
         beforeEach(function () {
             urlFilterApplierObj = new UrlFilterApplier({});
             urlFilterApplierObj.filterComponent = jasmine.createSpy().and.returnValue(filterComponentMock);
-            urlFilterApplierObj.selectComponent = jasmine.createSpy().and.returnValue(selectComponentMock);
         });
 
         describe('"getFilterParam" method', function () {
@@ -57,21 +53,6 @@ define([
                     'qty': '1'
                 });
             });
-            it('return object from url with multiple options for select filters', function () {
-                var urlSearch = '?filters[name]=[27,23]&options[]=[value=27,' +
-                    'label=Label]&options[]=[value=23,label=Label2]&filters[qty]=1&anotherparam=1';
-
-                expect(urlFilterApplierObj.getOptionsParam(urlSearch)).toEqual([
-                    {
-                        value: '27',
-                        label: 'Label'
-                    },
-                    {
-                        value: '23',
-                        label: 'Label2'
-                    }
-                ]);
-            });
             it('return object from url with another parameter', function () {
                 var urlSearch = '?anotherparam=1';
 
@@ -81,21 +62,12 @@ define([
 
         describe('"apply" method', function () {
             it('applies url filter on filter component', function () {
-                urlFilterApplierObj.searchString = '?filters[name]=test' +
-                    '&options[]=[value=23,label=Label]&filters[qty]=1';
+                urlFilterApplierObj.searchString = '?filters[name]=test&filters[qty]=1';
                 urlFilterApplierObj.apply();
                 expect(urlFilterApplierObj.filterComponent().setData).toHaveBeenCalledWith({
                     'name': 'test',
                     'qty': '1'
                 }, false);
-                expect(urlFilterApplierObj.selectComponent().options).toHaveBeenCalledWith(
-                    [
-                        {
-                            value: '23',
-                            label: 'Label'
-                        }
-                    ]
-                );
                 expect(urlFilterApplierObj.filterComponent().apply).toHaveBeenCalled();
             });
         });

From 36335422453af4abf58859acba7224cabe0f5e43 Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Fri, 7 Aug 2020 11:09:39 +0530
Subject: [PATCH 1338/1718] Media Gallery configuration are reversed

---
 .../SaveBaseCategoryImageInformation.php       |  2 +-
 .../Model/OpenDialogUrlProvider.php            |  2 +-
 .../Plugin/SaveImageInformation.php            |  2 +-
 .../Model/ImageComponentOpenDialogUrlTest.php  |  4 ++--
 .../Model/OpenDialogUrlProviderTest.php        |  4 ++--
 .../Model/TinyMceOpenDialogUrlTest.php         |  4 ++--
 .../WysiwygDefaultConfigOpenDialogUrlTest.php  |  4 ++--
 .../Plugin/MediaGallerySyncTrigger.php         |  2 +-
 .../Test/Mftf/Data/AdobeStockConfigData.xml    |  4 ++--
 .../MediaGalleryUi/etc/adminhtml/menu.xml      | 18 ++++++++++++++++--
 .../MediaGalleryUi/etc/adminhtml/system.xml    |  4 ++--
 11 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/app/code/Magento/MediaGalleryCatalogIntegration/Plugin/SaveBaseCategoryImageInformation.php b/app/code/Magento/MediaGalleryCatalogIntegration/Plugin/SaveBaseCategoryImageInformation.php
index d439b53c120cb..67a99bfaa84c2 100644
--- a/app/code/Magento/MediaGalleryCatalogIntegration/Plugin/SaveBaseCategoryImageInformation.php
+++ b/app/code/Magento/MediaGalleryCatalogIntegration/Plugin/SaveBaseCategoryImageInformation.php
@@ -86,7 +86,7 @@ public function __construct(
      */
     public function afterMoveFileFromTmp(ImageUploader $subject, string $imagePath): string
     {
-        if (!$this->config->isEnabled()) {
+        if ($this->config->isEnabled()) {
             return $imagePath;
         }
 
diff --git a/app/code/Magento/MediaGalleryIntegration/Model/OpenDialogUrlProvider.php b/app/code/Magento/MediaGalleryIntegration/Model/OpenDialogUrlProvider.php
index 317b811df5692..3834550f2703e 100644
--- a/app/code/Magento/MediaGalleryIntegration/Model/OpenDialogUrlProvider.php
+++ b/app/code/Magento/MediaGalleryIntegration/Model/OpenDialogUrlProvider.php
@@ -35,6 +35,6 @@ public function __construct(ConfigInterface $config)
      */
     public function getUrl(): string
     {
-        return $this->config->isEnabled() ? 'media_gallery/index/index' : 'cms/wysiwyg_images/index';
+        return $this->config->isEnabled() ? 'cms/wysiwyg_images/index' : 'media_gallery/index/index';
     }
 }
diff --git a/app/code/Magento/MediaGalleryIntegration/Plugin/SaveImageInformation.php b/app/code/Magento/MediaGalleryIntegration/Plugin/SaveImageInformation.php
index fbe35db298b04..4d0e6200ddaad 100644
--- a/app/code/Magento/MediaGalleryIntegration/Plugin/SaveImageInformation.php
+++ b/app/code/Magento/MediaGalleryIntegration/Plugin/SaveImageInformation.php
@@ -78,7 +78,7 @@ public function __construct(
      */
     public function afterSave(Uploader $subject, array $result): array
     {
-        if (!$this->config->isEnabled()) {
+        if ($this->config->isEnabled()) {
             return $result;
         }
 
diff --git a/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/ImageComponentOpenDialogUrlTest.php b/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/ImageComponentOpenDialogUrlTest.php
index dfeaa3eff56bd..0e5cd070a7eec 100644
--- a/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/ImageComponentOpenDialogUrlTest.php
+++ b/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/ImageComponentOpenDialogUrlTest.php
@@ -50,7 +50,7 @@ protected function setUp(): void
 
     /**
      * Test image open dialog url when enhanced media gallery not enabled.
-     * @magentoConfigFixture default/system/media_gallery/enabled 0
+     * @magentoConfigFixture default/system/media_gallery/enabled 1
      */
     public function testWithEnhancedMediaGalleryDisabled(): void
     {
@@ -61,7 +61,7 @@ public function testWithEnhancedMediaGalleryDisabled(): void
 
     /**
      * Test image open dialog url when enhanced media gallery enabled.
-     * @magentoConfigFixture default/system/media_gallery/enabled 1
+     * @magentoConfigFixture default/system/media_gallery/enabled 0
      */
     public function testWithEnhancedMediaGalleryEnabled(): void
     {
diff --git a/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/OpenDialogUrlProviderTest.php b/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/OpenDialogUrlProviderTest.php
index 7a3316f293879..3973ed132b490 100644
--- a/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/OpenDialogUrlProviderTest.php
+++ b/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/OpenDialogUrlProviderTest.php
@@ -45,7 +45,7 @@ protected function setUp(): void
 
     /**
      * Test getting open dialog url with enhanced media gallery disabled.
-     * @magentoConfigFixture default/system/media_gallery/enabled 0
+     * @magentoConfigFixture default/system/media_gallery/enabled 1
      */
     public function testWithEnhancedMediaGalleryDisabled(): void
     {
@@ -54,7 +54,7 @@ public function testWithEnhancedMediaGalleryDisabled(): void
 
     /**
      * Test getting open dialog url when enhanced media gallery enabled.
-     * @magentoConfigFixture default/system/media_gallery/enabled 1
+     * @magentoConfigFixture default/system/media_gallery/enabled 0
      */
     public function testWithEnhancedMediaGalleryEnabled(): void
     {
diff --git a/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/TinyMceOpenDialogUrlTest.php b/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/TinyMceOpenDialogUrlTest.php
index 81a4dc642cfa0..c15536f6af445 100644
--- a/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/TinyMceOpenDialogUrlTest.php
+++ b/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/TinyMceOpenDialogUrlTest.php
@@ -58,7 +58,7 @@ protected function setUp(): void
 
     /**
      * Test image open dialog url when enhanced media gallery not enabled.
-     * @magentoConfigFixture default/system/media_gallery/enabled 0
+     * @magentoConfigFixture default/system/media_gallery/enabled 1
      */
     public function testWithEnhancedMediaGalleryDisabled(): void
     {
@@ -68,7 +68,7 @@ public function testWithEnhancedMediaGalleryDisabled(): void
 
     /**
      * Test image open dialog url when enhanced media gallery enabled.
-     * @magentoConfigFixture default/system/media_gallery/enabled 1
+     * @magentoConfigFixture default/system/media_gallery/enabled 0
      */
     public function testWithEnhancedMediaGalleryEnabled(): void
     {
diff --git a/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/WysiwygDefaultConfigOpenDialogUrlTest.php b/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/WysiwygDefaultConfigOpenDialogUrlTest.php
index aebf5927869d5..df6cbe4fc2c09 100644
--- a/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/WysiwygDefaultConfigOpenDialogUrlTest.php
+++ b/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/WysiwygDefaultConfigOpenDialogUrlTest.php
@@ -58,7 +58,7 @@ protected function setUp(): void
 
     /**
      * Test update wysiwyg editor open dialog url when enhanced media gallery not enabled.
-     * @magentoConfigFixture default/system/media_gallery/enabled 0
+     * @magentoConfigFixture default/system/media_gallery/enabled 1
      */
     public function testWithEnhancedMediaGalleryDisabled(): void
     {
@@ -70,7 +70,7 @@ public function testWithEnhancedMediaGalleryDisabled(): void
 
     /**
      * Test update wysiwyg editor open dialog url when enhanced media gallery enabled.
-     * @magentoConfigFixture default/system/media_gallery/enabled 1
+     * @magentoConfigFixture default/system/media_gallery/enabled 0
      */
     public function testWithEnhancedMediaGalleryEnabled(): void
     {
diff --git a/app/code/Magento/MediaGallerySynchronization/Plugin/MediaGallerySyncTrigger.php b/app/code/Magento/MediaGallerySynchronization/Plugin/MediaGallerySyncTrigger.php
index 9583c91184d1a..dfe007fa59add 100644
--- a/app/code/Magento/MediaGallerySynchronization/Plugin/MediaGallerySyncTrigger.php
+++ b/app/code/Magento/MediaGallerySynchronization/Plugin/MediaGallerySyncTrigger.php
@@ -43,7 +43,7 @@ public function afterSave(Value $config, Value $result): Value
     {
         if ($result->getPath() === self::MEDIA_GALLERY_CONFIG_VALUE
             && $result->isValueChanged()
-            && (int) $result->getValue() === self::MEDIA_GALLERY_ENABLED_VALUE
+            && (int) $result->getValue() !== self::MEDIA_GALLERY_ENABLED_VALUE
         ) {
             $this->publish->execute();
         }
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdobeStockConfigData.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdobeStockConfigData.xml
index e8f394a006104..5e02d81fb82ae 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdobeStockConfigData.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdobeStockConfigData.xml
@@ -9,10 +9,10 @@
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="MediaGalleryConfigDataEnabled">
         <data key="path">system/media_gallery/enabled</data>
-        <data key="value">1</data>
+        <data key="value">0</data>
     </entity>
     <entity name="MediaGalleryConfigDataDisabled">
         <data key="path">system/media_gallery/enabled</data>
-        <data key="value">0</data>
+        <data key="value">1</data>
     </entity>
 </entities>
diff --git a/app/code/Magento/MediaGalleryUi/etc/adminhtml/menu.xml b/app/code/Magento/MediaGalleryUi/etc/adminhtml/menu.xml
index 92839aa75ac8b..e7486ccbf5a2f 100644
--- a/app/code/Magento/MediaGalleryUi/etc/adminhtml/menu.xml
+++ b/app/code/Magento/MediaGalleryUi/etc/adminhtml/menu.xml
@@ -7,7 +7,21 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
     <menu>
-        <add id="Magento_MediaGalleryUi::media" title="Media" translate="title" module="Magento_MediaGalleryUi" sortOrder="15" parent="Magento_Backend::content" resource="Magento_Cms::media_gallery" dependsOnConfig="system/media_gallery/enabled"/>
-        <add id="Magento_MediaGalleryUi::media_gallery" title="Media Gallery" translate="title" module="Magento_MediaGalleryUi" sortOrder="0" parent="Magento_MediaGalleryUi::media" action="media_gallery/media/index" resource="Magento_Cms::media_gallery"/>
+        <add id="Magento_MediaGalleryUi::media"
+             title="Media"
+             translate="title"
+             module="Magento_MediaGalleryUi"
+             sortOrder="15"
+             parent="Magento_Backend::content"
+             resource="Magento_Cms::media_gallery"
+             dependsOnConfig="system/media_gallery/enabled"/>
+        <add id="Magento_MediaGalleryUi::media_gallery"
+             title="Media Gallery"
+             translate="title"
+             module="Magento_MediaGalleryUi"
+             sortOrder="0"
+             parent="Magento_MediaGalleryUi::media"
+             action="media_gallery/media/index"
+             resource="Magento_Cms::media_gallery"/>
     </menu>
 </config>
diff --git a/app/code/Magento/MediaGalleryUi/etc/adminhtml/system.xml b/app/code/Magento/MediaGalleryUi/etc/adminhtml/system.xml
index 77544b42e899a..1c303ab155dae 100644
--- a/app/code/Magento/MediaGalleryUi/etc/adminhtml/system.xml
+++ b/app/code/Magento/MediaGalleryUi/etc/adminhtml/system.xml
@@ -9,9 +9,9 @@
     <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>
+                    <label>Enable Old Media Gallery</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <config_path>system/media_gallery/enabled</config_path>
                 </field>

From 2d802c819901fbb69b95e86281bb512df7cc6d8e Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Fri, 7 Aug 2020 09:43:57 +0300
Subject: [PATCH 1339/1718] MC-33273: bin/magento setup:di:compile Fatal error
 constantly

---
 .../Setup/Console/CompilerPreparation.php     | 43 ++++++++++++++++---
 .../Unit/Console/CompilerPreparationTest.php  | 20 ++++++++-
 2 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/setup/src/Magento/Setup/Console/CompilerPreparation.php b/setup/src/Magento/Setup/Console/CompilerPreparation.php
index c83aa48636393..3cfaa16885a34 100644
--- a/setup/src/Magento/Setup/Console/CompilerPreparation.php
+++ b/setup/src/Magento/Setup/Console/CompilerPreparation.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Setup\Console;
 
 use Magento\Framework\App\Bootstrap;
@@ -65,13 +67,9 @@ public function __construct(
      */
     public function handleCompilerEnvironment()
     {
-        $compilationCommands = $this->getCompilerInvalidationCommands();
-        $cmdName = $this->input->getFirstArgument();
-        $isHelpOption = $this->input->hasParameterOption('--help') || $this->input->hasParameterOption('-h');
-        if (!in_array($cmdName, $compilationCommands) || $isHelpOption) {
+        if (!$this->shouldInvalidateCompiledDI()) {
             return;
         }
-
         if (!$this->getGenerationDirectoryAccess()->check()) {
             throw new GenerationDirectoryAccessException();
         }
@@ -121,4 +119,39 @@ private function getGenerationDirectoryAccess()
 
         return $this->generationDirectoryAccess;
     }
+
+    /**
+     * Checks if the command being executed should invalidate compiled DI.
+     *
+     * @return bool
+     */
+    private function shouldInvalidateCompiledDI(): bool
+    {
+        $compilationCommands = $this->getCompilerInvalidationCommands();
+        $cmdName = $this->input->getFirstArgument();
+        $isHelpOption = $this->input->hasParameterOption('--help') || $this->input->hasParameterOption('-h');
+        $invalidate = false;
+        if (!$isHelpOption) {
+            $invalidate = in_array($cmdName, $compilationCommands);
+            if (!$invalidate) {
+                // Check if it's an abbreviation of compilation commands.
+                $expr = preg_replace_callback(
+                    '{([^:]+|)}',
+                    function ($matches) {
+                        return preg_quote($matches[1]) . '[^:]*';
+                    },
+                    $cmdName
+                );
+                $commands = preg_grep('{^' . $expr . '$}', $compilationCommands);
+                if (empty($commands)) {
+                    $commands = preg_grep('{^' . $expr . '$}i', $compilationCommands);
+                }
+                if (count($commands) === 1) {
+                    $invalidate = true;
+                }
+            }
+        }
+
+        return $invalidate;
+    }
 }
diff --git a/setup/src/Magento/Setup/Test/Unit/Console/CompilerPreparationTest.php b/setup/src/Magento/Setup/Test/Unit/Console/CompilerPreparationTest.php
index cca3daadab73c..beb90950e2def 100644
--- a/setup/src/Magento/Setup/Test/Unit/Console/CompilerPreparationTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Console/CompilerPreparationTest.php
@@ -139,7 +139,25 @@ public function commandNameDataProvider()
                 'commandName' => 'not:a:compiler',
                 'isCompileCommand' => false,
                 'isHelpOption' => false,
-            ]
+            ],
+            'ST compiler, directory exists, abbreviation 1' => [
+                'commandName' => 's:d:c',
+                'isCompileCommand' => true,
+                'isHelpOption' => false,
+                'dirExists' => true
+            ],
+            'ST compiler, directory exists, abbreviation 2' => [
+                'commandName' => 'se:di:co',
+                'isCompileCommand' => true,
+                'isHelpOption' => false,
+                'dirExists' => true
+            ],
+            'ST compiler, directory exists, abbreviation ambiguous' => [
+                'commandName' => 'se:di',
+                'isCompileCommand' => false,
+                'isHelpOption' => false,
+                'dirExists' => true
+            ],
         ];
     }
 

From 5c6e78a343b9fc118164f1779282d2365eb3a501 Mon Sep 17 00:00:00 2001
From: Mykhailo Matiola <mykhailo.matiola@transoftgroup.com>
Date: Fri, 7 Aug 2020 10:06:29 +0300
Subject: [PATCH 1340/1718] MC-36372: Admin: edit customers billing and
 shipping addresses for order

---
 .../Adminhtml/Order/Address/FormTest.php      |  75 ++++++++
 .../Block/Adminhtml/Order/AddressTest.php     | 111 ++++++++++++
 .../Adminhtml/Order/AddressSaveTest.php       | 168 ++++++++++++++++++
 .../Adminhtml/Order/AddressTest.php           |  76 ++++++++
 4 files changed, 430 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Address/FormTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/AddressTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddressSaveTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddressTest.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
new file mode 100644
index 0000000000000..0a8db20d86966
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Address/FormTest.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Block\Adminhtml\Order\Address;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Registry;
+use Magento\Framework\View\LayoutInterface;
+use Magento\Sales\Api\Data\OrderInterfaceFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Checks order address edit form block
+ *
+ * @see \Magento\Sales\Block\Adminhtml\Order\Address\Form
+ *
+ * @magentoAppArea adminhtml
+ */
+class FormTest extends TestCase
+{
+    /** @var ObjectManagerInterface */
+    private $objectManager;
+
+    /** @var Form */
+    private $block;
+
+    /** @var Registry */
+    private $registry;
+
+    /** @var OrderInterfaceFactory */
+    private $orderFactory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->block = $this->objectManager->get(LayoutInterface::class)->createBlock(Form::class);
+        $this->orderFactory = $this->objectManager->get(OrderInterfaceFactory::class);
+        $this->registry = $this->objectManager->get(Registry::class);
+    }
+
+    /**
+     * @return void
+     */
+    protected function tearDown(): void
+    {
+        $this->registry->unregister('order_address');
+
+        parent::tearDown();
+    }
+
+    /**
+     * @magentoDataFixture Magento/Sales/_files/order.php
+     *
+     * @return void
+     */
+    public function testGetFormValues(): void
+    {
+        $this->registry->unregister('order_address');
+        $order = $this->orderFactory->create()->loadByIncrementId(100000001);
+        $address = $order->getShippingAddress();
+        $this->registry->register('order_address', $address);
+        $formValues = $this->block->getFormValues();
+        $this->assertEquals($address->getData(), $formValues);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/AddressTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/AddressTest.php
new file mode 100644
index 0000000000000..8542d9bc48dcd
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/AddressTest.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Block\Adminhtml\Order;
+
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Registry;
+use Magento\Framework\View\LayoutInterface;
+use Magento\Sales\Api\Data\OrderAddressInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Model\Order\Address as AddressType;
+use Magento\Sales\Model\OrderFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Checks order address edit block
+ *
+ * @see \Magento\Sales\Block\Adminhtml\Order\Address
+ *
+ * @magentoAppArea adminhtml
+ */
+class AddressTest extends TestCase
+{
+    /** @var ObjectManagerInterface */
+    private $objectManager;
+
+    /** @var Address */
+    private $block;
+
+    /** @var Registry */
+    private $registry;
+
+    /** @var OrderFactory */
+    private $orderFactory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->block = $this->objectManager->get(LayoutInterface::class)->createBlock(Address::class);
+        $this->registry = $this->objectManager->get(Registry::class);
+        $this->orderFactory = $this->objectManager->get(OrderFactory::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown(): void
+    {
+        $this->registry->unregister('order_address');
+
+        parent::tearDown();
+    }
+
+    /**
+     * @dataProvider addressTypeProvider
+     *
+     * @magentoDataFixture Magento/Sales/_files/order.php
+     *
+     * @param string $type
+     * @return void
+     */
+    public function testGetHeaderText(string $type): void
+    {
+        $order = $this->orderFactory->create()->loadByIncrementId(100000001);
+        $address = $this->getAddressByType($order, $type);
+        $this->registry->unregister('order_address');
+        $this->registry->register('order_address', $address);
+        $text = $this->block->getHeaderText();
+        $this->assertEquals(
+            (string)__('Edit Order %1 %2 Address', $order->getIncrementId(), ucfirst($type)),
+            (string)$text
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function addressTypeProvider(): array
+    {
+        return [
+            'billing_address' => [
+                AddressType::TYPE_BILLING,
+            ],
+            'shipping_address' => [
+                AddressType::TYPE_SHIPPING,
+            ]
+        ];
+    }
+
+    /**
+     * Get address by address type
+     *
+     * @param OrderInterface $order
+     * @param string $type
+     * @return OrderAddressInterface|null
+     */
+    private function getAddressByType(OrderInterface $order, string $type): ?OrderAddressInterface
+    {
+        return $type ===  AddressType::TYPE_BILLING ? $order->getBillingAddress() : $order->getShippingAddress();
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddressSaveTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddressSaveTest.php
new file mode 100644
index 0000000000000..31b5fdd81f592
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddressSaveTest.php
@@ -0,0 +1,168 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Controller\Adminhtml\Order;
+
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Sales\Api\Data\OrderAddressInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\Data\OrderInterfaceFactory;
+use Magento\Sales\Api\OrderAddressRepositoryInterface;
+use Magento\Sales\Model\Order\Address as AddressType;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
+/**
+ * Class check address save action
+ *
+ * @see \Magento\Sales\Controller\Adminhtml\Order\AddressSave
+ *
+ * @magentoDbIsolation disabled
+ * @magentoAppArea adminhtml
+ */
+class AddressSaveTest extends AbstractBackendController
+{
+    /** @var OrderInterfaceFactory */
+    private $orderFactory;
+
+    /** @var OrderAddressRepositoryInterface */
+    private $orderAddressRepository;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->orderFactory = $this->_objectManager->get(OrderInterfaceFactory::class);
+        $this->orderAddressRepository = $this->_objectManager->get(OrderAddressRepositoryInterface::class);
+    }
+
+    /**
+     * @dataProvider addressTypeProvider
+     *
+     * @magentoDataFixture Magento/Sales/_files/order.php
+     *
+     * @param string $type
+     * @return void
+     */
+    public function testSave(string $type): void
+    {
+        $data = [
+            OrderAddressInterface::FIRSTNAME => 'New test name',
+            OrderAddressInterface::LASTNAME => 'New test lastname',
+            OrderAddressInterface::STREET => ['new test street'],
+            OrderAddressInterface::CITY => 'New Test City',
+            OrderAddressInterface::COUNTRY_ID => 'UA',
+            OrderAddressInterface::REGION => '1111',
+            OrderAddressInterface::POSTCODE => '97203',
+            OrderAddressInterface::TELEPHONE => '5555555555',
+        ];
+        $order = $this->orderFactory->create()->loadByIncrementId(100000001);
+        $addressId = $this->getAddressIdByType($order, $type);
+        $this->dispatchWithParams(
+            ['address_id' => $addressId],
+            $data
+        );
+        $this->assertSessionMessages(
+            $this->containsEqual((string)__('You updated the order address.'))
+        );
+        $this->assertRedirect(
+            $this->stringContains(sprintf('sales/order/view/order_id/%s/', $order->getId()))
+        );
+        $this->assertAddressData($addressId, $data);
+    }
+
+    /**
+     * @return array
+     */
+    public function addressTypeProvider(): array
+    {
+        return [
+            'billing_address' => [
+                AddressType::TYPE_BILLING,
+            ],
+            'shipping_address' => [
+                AddressType::TYPE_SHIPPING,
+            ]
+        ];
+    }
+
+    /**
+     * @dataProvider wrongRequestDataProvider
+     *
+     * @param array $params
+     * @param array $post
+     * @return void
+     */
+    public function testInvalidRequest(array $params, array $post = []): void
+    {
+        $this->dispatchWithParams($params, $post);
+        $this->assertRedirect($this->stringContains('backend/sales/order/index/'));
+    }
+
+    /**
+     * @return array
+     */
+    public function wrongRequestDataProvider(): array
+    {
+        return [
+            'empty_post' => [
+                ['address_id' => 1],
+            ],
+            'wrong_address_id' => [
+                ['address_id' => 7852147],
+            ],
+        ];
+    }
+
+    /**
+     * Check updated address data
+     *
+     * @param int $addressId
+     * @param array $expectedData
+     * @return void
+     */
+    private function assertAddressData(int $addressId, array $expectedData): void
+    {
+        $address = $this->orderAddressRepository->get($addressId);
+        foreach ($expectedData as $key => $value) {
+            $key === OrderAddressInterface::STREET
+                ? $this->assertEquals(reset($value), $address->getData($key))
+                : $this->assertEquals($value, $address->getData($key));
+        }
+    }
+
+    /**
+     * Get address id by address type
+     *
+     * @param OrderInterface $order
+     * @param string $type
+     * @return int
+     */
+    private function getAddressIdByType(OrderInterface $order, string $type): int
+    {
+        return $type === AddressType::TYPE_BILLING
+            ? (int)$order->getBillingAddressId()
+            : (int)$order->getShippingAddressId();
+    }
+
+    /**
+     * Dispatch with params
+     *
+     * @param array $params
+     * @param array $post
+     * @return void
+     */
+    private function dispatchWithParams(array $params, array $post): void
+    {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setParams($params);
+        $this->getRequest()->setPostValue($post);
+        $this->dispatch('backend/sales/order/addressSave');
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddressTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddressTest.php
new file mode 100644
index 0000000000000..6b508b662e7a4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/AddressTest.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Controller\Adminhtml\Order;
+
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Registry;
+use Magento\Sales\Api\Data\OrderAddressInterface;
+use Magento\Sales\Api\Data\OrderInterfaceFactory;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
+/**
+ * Class check address edit action
+ *
+ * @see \Magento\Sales\Controller\Adminhtml\Order\Address
+ *
+ * @magentoDbIsolation disabled
+ * @magentoAppArea adminhtml
+ */
+class AddressTest extends AbstractBackendController
+{
+    /** @var OrderInterfaceFactory */
+    private $orderFactory;
+
+    /** @var Registry */
+    private $registry;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->orderFactory = $this->_objectManager->get(OrderInterfaceFactory::class);
+        $this->registry = $this->_objectManager->get(Registry::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Sales/_files/order.php
+     *
+     * @return void
+     */
+    public function testSuccessfulEdit(): void
+    {
+        $order = $this->orderFactory->create()->loadByIncrementId(100000001);
+        $this->dispatchWithAddressId((int)$order->getBillingAddressId());
+        $this->assertInstanceOf(OrderAddressInterface::class, $this->registry->registry('order_address'));
+    }
+
+    /**
+     * @return void
+     */
+    public function testWithNotExistingAddressId(): void
+    {
+        $this->dispatchWithAddressId(51728);
+        $this->assertRedirect($this->stringContains('backend/sales/order/index/'));
+    }
+
+    /**
+     * Dispatch request with address_id param
+     *
+     * @param int $addressId
+     * @return void
+     */
+    private function dispatchWithAddressId(int $addressId): void
+    {
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->getRequest()->setParam('address_id', $addressId);
+        $this->dispatch('backend/sales/order/address');
+    }
+}

From efaf4ad4fb7ebed1f11411eae373dd3c5c794ff7 Mon Sep 17 00:00:00 2001
From: Serhii Balko <serhii.balko@transoftgroup.com>
Date: Fri, 7 Aug 2020 10:46:16 +0300
Subject: [PATCH 1341/1718] MC-34714: Newsletter Subscribers grid only exports
 current page records with 'EXCEL XML' option

---
 .../Backend/Block/Widget/Grid/Export.php      | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Export.php b/app/code/Magento/Backend/Block/Widget/Grid/Export.php
index 7b7f6cc14799c..11b24539e54f5 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Export.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Export.php
@@ -9,6 +9,8 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 
 /**
+ * Class Export for exporting grid data as CSV file or MS Excel 2003 XML Document file
+ *
  * @api
  * @deprecated 100.2.0 in favour of UI component implementation
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -69,6 +71,8 @@ public function __construct(
     }
 
     /**
+     * Internal constructor, that is called from real constructor
+     *
      * @return void
      * @throws \Magento\Framework\Exception\LocalizedException
      */
@@ -242,6 +246,7 @@ protected function _getExportTotals()
 
     /**
      * Iterate collection and call callback method per item
+     *
      * For callback method first argument always is item object
      *
      * @param string $callback
@@ -273,7 +278,12 @@ public function _exportIterateCollection($callback, array $args)
 
             $collection = $this->_getRowCollection($originalCollection);
             foreach ($collection as $item) {
-                call_user_func_array([$this, $callback], array_merge([$item], $args));
+                //phpcs:ignore Magento2.Functions.DiscouragedFunction
+                call_user_func_array(
+                    [$this, $callback],
+                    // phpcs:ignore Magento2.Performance.ForeachArrayMerge
+                    array_merge([$item], $args)
+                );
             }
         }
     }
@@ -307,7 +317,7 @@ protected function _exportCsvItem(
      */
     public function getCsvFile()
     {
-        $name = md5(microtime());
+        $name = hash('sha256', microtime());
         $file = $this->_path . '/' . $name . '.csv';
 
         $this->_directory->create($this->_path);
@@ -432,11 +442,11 @@ public function getRowRecord(\Magento\Framework\DataObject $data)
      */
     public function getExcelFile($sheetName = '')
     {
-        $collection = $this->_getRowCollection();
+        $collection = $this->_getPreparedCollection();
 
         $convert = new \Magento\Framework\Convert\Excel($collection->getIterator(), [$this, 'getRowRecord']);
 
-        $name = md5(microtime());
+        $name = hash('sha256', microtime());
         $file = $this->_path . '/' . $name . '.xml';
 
         $this->_directory->create($this->_path);
@@ -551,6 +561,8 @@ public function _getPreparedCollection()
     }
 
     /**
+     * Get export page size
+     *
      * @return int
      */
     public function getExportPageSize()

From 2ebcffc3b603edb51dfdf68d41e523bb3d915f8f Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Fri, 7 Aug 2020 10:51:19 +0300
Subject: [PATCH 1342/1718] MC-35458: Config fields changes

---
 .../Block/System/Config/Form/Fieldset.php     | 45 +++++++++++++------
 1 file changed, 31 insertions(+), 14 deletions(-)

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 c70b91d2adf3b..97e37f8b5e54c 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Fieldset.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Fieldset.php
@@ -96,13 +96,7 @@ protected function _getChildrenElementsHtml(AbstractElement $element)
                     . '<td colspan="4">' . $field->toHtml() . '</td></tr>';
             } else {
                 $elements .= $field->toHtml();
-                $styleTag = '';
-                if (!empty($field->getFieldConfig()['depends']['fields'])) {
-                    $styleTag .= $this->secureRenderer->renderStyleAsTag(
-                        'display: none;',
-                        '#row_' . $field->getHtmlId()
-                    );
-                }
+                $styleTag = $this->addVisibilityTag($field);
                 $elements .= $styleTag;
             }
         }
@@ -176,13 +170,7 @@ protected function _getFrontendClass($element)
      */
     protected function _getHeaderTitleHtml($element)
     {
-        $styleTag = '';
-        if (!empty($element->getGroup()['depends']['fields'])) {
-            $styleTag .= $this->secureRenderer->renderStyleAsTag(
-                'display: none;',
-                '#' . $element->getHtmlId() . '-head'
-            );
-        }
+        $styleTag = $this->addVisibilityTag($element);
         return '<a id="' .
             $element->getHtmlId() .
             '-head" href="#' .
@@ -292,4 +280,33 @@ protected function _isCollapseState($element)
         }
         return $this->isCollapsedDefault;
     }
+
+    /**
+     * 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'])
+            || !empty($field->getContainer()->getGroup()['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 f15cf083a6550f763021aeff9cee270d7de3fd92 Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Fri, 7 Aug 2020 10:56:53 +0300
Subject: [PATCH 1343/1718] MC-35837: [On Premise] Invoice and Shipment email
 notifications for guest do not have guest name, similar to MDVA-27452 which
 fixes same issue for order confirmation emails

---
 .../Sales/view/frontend/email/creditmemo_new_guest.html       | 4 ++--
 .../Sales/view/frontend/email/creditmemo_update_guest.html    | 4 ++--
 .../Magento/Sales/view/frontend/email/invoice_new_guest.html  | 4 ++--
 .../Sales/view/frontend/email/invoice_update_guest.html       | 4 ++--
 .../Magento/Sales/view/frontend/email/order_update_guest.html | 4 ++--
 .../Magento/Sales/view/frontend/email/shipment_new_guest.html | 4 ++--
 .../Sales/view/frontend/email/shipment_update_guest.html      | 4 ++--
 .../luma/Magento_Sales/email/creditmemo_new_guest.html        | 4 ++--
 .../luma/Magento_Sales/email/creditmemo_update_guest.html     | 4 ++--
 .../Magento/luma/Magento_Sales/email/invoice_new_guest.html   | 4 ++--
 .../luma/Magento_Sales/email/invoice_update_guest.html        | 4 ++--
 .../Magento/luma/Magento_Sales/email/order_update_guest.html  | 4 ++--
 .../Magento/luma/Magento_Sales/email/shipment_new_guest.html  | 4 ++--
 .../luma/Magento_Sales/email/shipment_update_guest.html       | 4 ++--
 .../Controller/Adminhtml/Order/Creditmemo/AddCommentTest.php  | 2 +-
 .../Controller/Adminhtml/Order/Invoice/AddCommentTest.php     | 2 +-
 .../Controller/Adminhtml/Order/Shipment/AddCommentTest.php    | 2 +-
 17 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/app/code/Magento/Sales/view/frontend/email/creditmemo_new_guest.html b/app/code/Magento/Sales/view/frontend/email/creditmemo_new_guest.html
index d8a8a0baeca98..f3d133a974082 100644
--- a/app/code/Magento/Sales/view/frontend/email/creditmemo_new_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/creditmemo_new_guest.html
@@ -10,7 +10,7 @@
 "var comment|escape|nl2br":"Credit Memo Comment",
 "var creditmemo.increment_id":"Credit Memo Id",
 "layout handle=\"sales_email_order_creditmemo_items\" creditmemo=$creditmemo order=$order":"Credit Memo Items Grid",
-"var billing.name":"Guest Customer Name (Billing)",
+"var order_data.customer_name":"Guest Customer Name (Billing)",
 "var order.increment_id":"Order Id",
 "var payment_html|raw":"Payment Details",
 "var formattedShippingAddress|raw":"Shipping Address",
@@ -30,7 +30,7 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
                 {{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
diff --git a/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html b/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html
index ed8f592b59638..64e9a61831956 100644
--- a/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html
@@ -8,7 +8,7 @@
 <!--@vars {
 "var comment|escape|nl2br":"Credit Memo Comment",
 "var creditmemo.increment_id":"Credit Memo Id",
-"var billing.name":"Guest Customer Name",
+"var order_data.customer_name":"Guest Customer Name",
 "var order.increment_id":"Order Id",
 "var order_data.frontend_status_label":"Order Status",
 "var store.frontend_name":"Store Frontend Name",
@@ -21,7 +21,7 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
diff --git a/app/code/Magento/Sales/view/frontend/email/invoice_new_guest.html b/app/code/Magento/Sales/view/frontend/email/invoice_new_guest.html
index c06630fd249ab..b2109fad5478a 100644
--- a/app/code/Magento/Sales/view/frontend/email/invoice_new_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/invoice_new_guest.html
@@ -7,7 +7,7 @@
 <!--@subject {{trans "Invoice for your %store_name order" store_name=$store.frontend_name}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
-"var billing.name":"Guest Customer Name",
+"var order_data.customer_name":"Guest Customer Name",
 "var comment|escape|nl2br":"Invoice Comment",
 "var invoice.increment_id":"Invoice Id",
 "layout handle=\"sales_email_order_invoice_items\" invoice=$invoice order=$order":"Invoice Items Grid",
@@ -30,7 +30,7 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
                 {{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
diff --git a/app/code/Magento/Sales/view/frontend/email/invoice_update_guest.html b/app/code/Magento/Sales/view/frontend/email/invoice_update_guest.html
index 289c5113fe285..be3462d0e2fc9 100644
--- a/app/code/Magento/Sales/view/frontend/email/invoice_update_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/invoice_update_guest.html
@@ -6,7 +6,7 @@
 -->
 <!--@subject {{trans "Update to your %store_name invoice" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var billing.name":"Guest Customer Name",
+"var order_data.customer_name":"Guest Customer Name",
 "var comment|escape|nl2br":"Invoice Comment",
 "var invoice.increment_id":"Invoice Id",
 "var order.increment_id":"Order Id",
@@ -21,7 +21,7 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
diff --git a/app/code/Magento/Sales/view/frontend/email/order_update_guest.html b/app/code/Magento/Sales/view/frontend/email/order_update_guest.html
index 1ce0d162ed76e..4f1f6862fab03 100644
--- a/app/code/Magento/Sales/view/frontend/email/order_update_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/order_update_guest.html
@@ -6,7 +6,7 @@
 -->
 <!--@subject {{trans "Update to your %store_name order" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var billing.name":"Guest Customer Name",
+"var order_data.customer_name":"Guest Customer Name",
 "var comment|escape|nl2br":"Order Comment",
 "var order.increment_id":"Order Id",
 "var order_data.frontend_status_label":"Order Status",
@@ -20,7 +20,7 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
diff --git a/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html b/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html
index 54c7f08506497..85473cb0ee8c6 100644
--- a/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/shipment_new_guest.html
@@ -7,7 +7,7 @@
 <!--@subject {{trans "Your %store_name order has shipped" store_name=$store.frontend_name}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
-"var billing.name":"Guest Customer Name",
+"var order_data.customer_name":"Guest Customer Name",
 "var order.increment_id":"Order Id",
 "var payment_html|raw":"Payment Details",
 "var comment|escape|nl2br":"Shipment Comment",
@@ -31,7 +31,7 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
                 {{trans 'If you have questions about your order, you can email us at <a href="mailto:%store_email">%store_email</a>' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at <a href="tel:%store_phone">%store_phone</a>' store_phone=$store_phone |raw}}{{/depend}}.
diff --git a/app/code/Magento/Sales/view/frontend/email/shipment_update_guest.html b/app/code/Magento/Sales/view/frontend/email/shipment_update_guest.html
index 087cb0ddbf5bc..cf54379d4bb46 100644
--- a/app/code/Magento/Sales/view/frontend/email/shipment_update_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/shipment_update_guest.html
@@ -6,7 +6,7 @@
 -->
 <!--@subject {{trans "Update to your %store_name shipment" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var billing.name":"Guest Customer Name",
+"var order_data.customer_name":"Guest Customer Name",
 "var comment|escape|nl2br":"Order Comment",
 "var order.increment_id":"Order Id",
 "var order_data.frontend_status_label":"Order Status",
@@ -21,7 +21,7 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_new_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_new_guest.html
index 4442c172a08e5..5b58659bcf48c 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_new_guest.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_new_guest.html
@@ -10,7 +10,7 @@
 "var comment|escape|nl2br":"Credit Memo Comment",
 "var creditmemo.increment_id":"Credit Memo Id",
 "layout handle=\"sales_email_order_creditmemo_items\" creditmemo=$creditmemo order=$order":"Credit Memo Items Grid",
-"var billing.name":"Guest Customer Name (Billing)",
+"var order_data.customer_name":"Guest Customer Name (Billing)",
 "var order.increment_id":"Order Id",
 "var payment_html|raw":"Payment Details",
 "var formattedShippingAddress|raw":"Shipping Address",
@@ -28,7 +28,7 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
             </p>
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update_guest.html
index 9b09760c1fa4a..91f790715eda3 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update_guest.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update_guest.html
@@ -8,7 +8,7 @@
 <!--@vars {
 "var comment|escape|nl2br":"Credit Memo Comment",
 "var creditmemo.increment_id":"Credit Memo Id",
-"var billing.name":"Guest Customer Name",
+"var order_data.customer_name":"Guest Customer Name",
 "var order.increment_id":"Order Id",
 "var order_data.frontend_status_label":"Order Status",
 "var store_email":"Store Email",
@@ -19,7 +19,7 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_new_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_new_guest.html
index 6e35fd2609dff..036b3b6d96dcb 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_new_guest.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_new_guest.html
@@ -7,7 +7,7 @@
 <!--@subject {{trans "Invoice for your %store_name order" store_name=$store.frontend_name}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
-"var billing.name":"Guest Customer Name",
+"var order_data.customer_name":"Guest Customer Name",
 "var comment|escape|nl2br":"Invoice Comment",
 "var invoice.increment_id":"Invoice Id",
 "layout handle=\"sales_email_order_invoice_items\" invoice=$invoice order=$order":"Invoice Items Grid",
@@ -28,7 +28,7 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
             </p>
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update_guest.html
index f9e1498763cba..759e9766f335a 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update_guest.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update_guest.html
@@ -6,7 +6,7 @@
 -->
 <!--@subject {{trans "Update to your %store_name invoice" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var billing.name":"Guest Customer Name",
+"var order_data.customer_name":"Guest Customer Name",
 "var comment|escape|nl2br":"Invoice Comment",
 "var invoice.increment_id":"Invoice Id",
 "var order.increment_id":"Order Id",
@@ -19,7 +19,7 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/order_update_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/order_update_guest.html
index 5f23898b50018..3f8e8ace3428e 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/order_update_guest.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/order_update_guest.html
@@ -6,7 +6,7 @@
 -->
 <!--@subject {{trans "Update to your %store_name order" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var billing.name":"Guest Customer Name",
+"var order_data.customer_name":"Guest Customer Name",
 "var comment|escape|nl2br":"Order Comment",
 "var order.increment_id":"Order Id",
 "var order_data.frontend_status_label":"Order Status",
@@ -18,7 +18,7 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html
index 18684fb052b4e..d1d9d21f1ee9a 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html
@@ -7,7 +7,7 @@
 <!--@subject {{trans "Your %store_name order has shipped" store_name=$store.frontend_name}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
-"var billing.name":"Guest Customer Name",
+"var order_data.customer_name":"Guest Customer Name",
 "var order.increment_id":"Order Id",
 "var payment_html|raw":"Payment Details",
 "var comment|escape|nl2br":"Shipment Comment",
@@ -30,7 +30,7 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
             </p>
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update_guest.html
index 5887ff73c6398..37478644ddf9c 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update_guest.html
+++ b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update_guest.html
@@ -6,7 +6,7 @@
 -->
 <!--@subject {{trans "Update to your %store_name shipment" store_name=$store.frontend_name}} @-->
 <!--@vars {
-"var billing.name":"Guest Customer Name",
+"var order_data.customer_name":"Guest Customer Name",
 "var comment|escape|nl2br":"Order Comment",
 "var order.increment_id":"Order Id",
 "var order_data.frontend_status_label":"Order Status",
@@ -19,7 +19,7 @@
 <table>
     <tr class="email-intro">
         <td>
-            <p class="greeting">{{trans "%name," name=$billing.name}}</p>
+            <p class="greeting">{{trans "%name," name=$order_data.customer_name}}</p>
             <p>
                 {{trans
                     "Your order #%increment_id has been updated with a status of <strong>%order_status</strong>."
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddCommentTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddCommentTest.php
index e5cc9e49a0186..52dafc0590afb 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddCommentTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/AddCommentTest.php
@@ -42,7 +42,7 @@ public function testSendEmailOnAddCreditmemoComment(): void
         $message = $this->transportBuilder->getSentMessage();
         $subject =__('Update to your %1 credit memo', $order->getStore()->getFrontendName())->render();
         $messageConstraint = $this->logicalAnd(
-            new StringContains($order->getBillingAddress()->getName()),
+            new StringContains($order->getCustomerName()),
             new RegularExpression(
                 sprintf(
                     "/Your order #%s has been updated with a status of.*%s/",
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddCommentTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddCommentTest.php
index f77812b96b306..ee59a55acd9b1 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddCommentTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/AddCommentTest.php
@@ -43,7 +43,7 @@ public function testSendEmailOnAddInvoiceComment(): void
         $message = $this->transportBuilder->getSentMessage();
         $subject = __('Update to your %1 invoice', $order->getStore()->getFrontendName())->render();
         $messageConstraint = $this->logicalAnd(
-            new StringContains($order->getBillingAddress()->getName()),
+            new StringContains($order->getCustomerName()),
             new RegularExpression(
                 sprintf(
                     "/Your order #%s has been updated with a status of.*%s/",
diff --git a/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddCommentTest.php b/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddCommentTest.php
index 55f9fe8f17dc7..3fe45fd71aead 100644
--- a/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddCommentTest.php
+++ b/dev/tests/integration/testsuite/Magento/Shipping/Controller/Adminhtml/Order/Shipment/AddCommentTest.php
@@ -42,7 +42,7 @@ public function testSendEmailOnShipmentCommentAdd(): void
         $message = $this->transportBuilder->getSentMessage();
         $subject =__('Update to your %1 shipment', $order->getStore()->getFrontendName())->render();
         $messageConstraint = $this->logicalAnd(
-            new StringContains($order->getBillingAddress()->getName()),
+            new StringContains($order->getCustomerName()),
             new RegularExpression(
                 sprintf(
                     "/Your order #%s has been updated with a status of.*%s/",

From 651bd690cb0687565cc2a1e99a57d99be5e8f14c Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Fri, 7 Aug 2020 13:49:35 +0530
Subject: [PATCH 1344/1718] fixed MFTF test

---
 .../MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiSuite.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiSuite.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiSuite.xml
index 4749fc4a885b0..14464cf36234c 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiSuite.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiSuite.xml
@@ -13,7 +13,7 @@
             <actionGroup ref="AdminDisableWYSIWYGActionGroup" stepKey="disableWYSIWYG" />
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableEnhancedMediaGallery">
-                <argument name="enabled" value="1"/>
+                <argument name="enabled" value="0"/>
             </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
         </before>

From 11d0a351c4ad83637620c9b7ab00ef68b028b7fa Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Fri, 7 Aug 2020 16:26:30 +0800
Subject: [PATCH 1345/1718] 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 024625e61887a252df56f027e42347d20860b253 Mon Sep 17 00:00:00 2001
From: Nikita Shcherbatykh <nikita.shcherbatykh@transoftgroup.com>
Date: Fri, 7 Aug 2020 11:28:05 +0300
Subject: [PATCH 1346/1718] MC-34469: Gift card html entities on minicart

---
 .../view/frontend/web/template/minicart/item/default.html   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html b/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
index 131745d840528..053b15b4ad343 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
@@ -44,11 +44,11 @@
                             <!-- ko if: Array.isArray(option.value) -->
                                 <span data-bind="html: option.value.join('<br>')"></span>
                             <!-- /ko -->
-                            <!-- ko if: (!Array.isArray(option.value) && option.option_type == 'file') -->
+                            <!-- ko if: (!Array.isArray(option.value) && ['file', 'html'].includes(option.option_type)) -->
                                 <span data-bind="html: option.value"></span>
                             <!-- /ko -->
-                            <!-- ko if: (!Array.isArray(option.value) && option.option_type != 'file') -->
-                                <span data-bind="text: option.value"></span>
+                            <!-- ko if: (!Array.isArray(option.value) && !['file', 'html'].includes(option.option_type)) -->
+                            <span data-bind="text: option.value"></span>
                             <!-- /ko -->
                         </dd>
                         <!-- /ko -->

From a78ddde117df894ddab53c9f0d436a017b4da465 Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Thu, 6 Aug 2020 16:14:51 +0300
Subject: [PATCH 1347/1718] add MFTF

---
 .../Mftf/Section/StorefrontFooterSection.xml  |  1 +
 ...reateStoreViewFillSortOrderActionGroup.xml | 21 ++++++
 .../StorefrontCheckSortOrderStoreViewTest.xml | 72 +++++++++++++++++++
 3 files changed, 94 insertions(+)
 create mode 100644 app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewFillSortOrderActionGroup.xml
 create mode 100644 app/code/Magento/Store/Test/Mftf/Test/StorefrontCheckSortOrderStoreViewTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontFooterSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontFooterSection.xml
index 1c937637ad823..a7dd622c56a7f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontFooterSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontFooterSection.xml
@@ -9,6 +9,7 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontFooterSection">
         <element name="switchStoreButton" type="button" selector="#switcher-store-trigger"/>
+        <element name="storeViewOptionNumber" type="button" selector="//div[@class='actions dropdown options switcher-options active']//ul//li[{{var1}}]//a" parameterized="true"/>
         <element name="storeLink" type="button" selector="//ul[@class='dropdown switcher-dropdown']//a[contains(text(),'{{var1}}')]" parameterized="true" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewFillSortOrderActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewFillSortOrderActionGroup.xml
new file mode 100644
index 0000000000000..1b9b147209c66
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewFillSortOrderActionGroup.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="AdminCreateStoreViewFillSortOrderActionGroup" extends="AdminCreateStoreViewActionGroup">
+        <annotations>
+            <description>Fill 'Sort Order' field</description>
+        </annotations>
+        <arguments>
+            <argument name="sortOrder" type="string" defaultValue="0"/>
+        </arguments>
+
+        <fillField selector="{{AdminNewStoreSection.sortOrderTextField}}" userInput="{{sortOrder}}" stepKey="fillSortOrder" after="enterStoreViewCode"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/Test/StorefrontCheckSortOrderStoreViewTest.xml b/app/code/Magento/Store/Test/Mftf/Test/StorefrontCheckSortOrderStoreViewTest.xml
new file mode 100644
index 0000000000000..442ee99e12793
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Test/StorefrontCheckSortOrderStoreViewTest.xml
@@ -0,0 +1,72 @@
+<?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="StorefrontCheckSortOrderStoreView">
+        <annotations>
+            <features value="Backend"/>
+            <stories value="Github issue: #13401 'Store View' sort order values are not reflected"/>
+            <title value="Check 'Store view' sort order values"/>
+            <description value="Check 'Store View' sort order values no frontend store-switcher"/>
+            <severity value="MINOR"/>
+            <group value="store"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createFirstStore">
+                <argument name="website" value="{{_defaultWebsite.name}}"/>
+                <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
+                <argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createSecondStore">
+                <argument name="website" value="{{_defaultWebsite.name}}"/>
+                <argument name="storeGroupName" value="{{SecondStoreGroupUnique.name}}"/>
+                <argument name="storeGroupCode" value="{{SecondStoreGroupUnique.code}}"/>
+            </actionGroup>
+        </before>
+        <after>
+            <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteCustomStore">
+                <argument name="storeGroupName" value="customStoreGroup.name"/>
+            </actionGroup>
+            <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteSecondStore">
+                <argument name="storeGroupName" value="SecondStoreGroupUnique.name"/>
+            </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="AdminCreateStoreViewFillSortOrderActionGroup" stepKey="createFirstStoreView">
+            <argument name="StoreGroup" value="customStoreGroup"/>
+            <argument name="customStore" value="customStoreGroup"/>
+            <argument name="sortOrder" value="30"/>
+        </actionGroup>
+        <actionGroup ref="AdminCreateStoreViewFillSortOrderActionGroup" stepKey="createSecondStoreView">
+            <argument name="StoreGroup" value="SecondStoreGroupUnique"/>
+            <argument name="customStore" value="SecondStoreGroupUnique"/>
+            <argument name="sortOrder" value="20"/>
+        </actionGroup>
+
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToHomePage"/>
+        <click stepKey="selectStoreSwitcher" selector="{{StorefrontFooterSection.switchStoreButton}}"/>
+        <grabTextFrom selector="{{StorefrontFooterSection.storeViewOptionNumber('1')}}" stepKey="grabSwatchFirstOption"/>
+        <grabTextFrom selector="{{StorefrontFooterSection.storeViewOptionNumber('2')}}" stepKey="grabSwatchSecondOption"/>
+        <assertStringContainsString stepKey="checkingSwatchFirstOption">
+            <expectedResult type="string">{{SecondStoreGroupUnique.name}}</expectedResult>
+            <actualResult type="variable">$grabSwatchFirstOption</actualResult>
+        </assertStringContainsString>
+        <assertStringContainsString stepKey="checkingSwatchSecondOption">
+            <expectedResult type="string">{{customStoreGroup.name}}</expectedResult>
+            <actualResult type="variable">$grabSwatchSecondOption</actualResult>
+        </assertStringContainsString>
+    </test>
+</tests>

From 663f02331d3bf4a7801db370612509a9d9bc6fe2 Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Fri, 7 Aug 2020 11:55:46 +0300
Subject: [PATCH 1348/1718] MC-36048: Unexpected behavior of sorting in the
 Magento Admin Panel

---
 .../Magento/Theme/Plugin/Data/Collection.php  |  8 +-
 app/code/Magento/Theme/etc/adminhtml/di.xml   |  3 -
 app/code/Magento/Theme/etc/di.xml             |  3 +
 app/code/Magento/Theme/etc/frontend/di.xml    |  4 -
 app/code/Magento/Theme/etc/webapi_rest/di.xml | 12 +++
 app/code/Magento/Theme/etc/webapi_soap/di.xml | 12 +++
 .../Attribute/CollectionTest.php              | 80 +++++++++++++++++++
 7 files changed, 112 insertions(+), 10 deletions(-)
 create mode 100644 app/code/Magento/Theme/etc/webapi_rest/di.xml
 create mode 100644 app/code/Magento/Theme/etc/webapi_soap/di.xml
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Attribute/CollectionTest.php

diff --git a/app/code/Magento/Theme/Plugin/Data/Collection.php b/app/code/Magento/Theme/Plugin/Data/Collection.php
index 7b72776ce4a43..11ff95db25769 100644
--- a/app/code/Magento/Theme/Plugin/Data/Collection.php
+++ b/app/code/Magento/Theme/Plugin/Data/Collection.php
@@ -7,6 +7,8 @@
 
 namespace Magento\Theme\Plugin\Data;
 
+use Magento\Framework\Data\Collection as DataCollection;
+
 /**
  * Plugin to return last page if current page greater then collection size.
  */
@@ -15,14 +17,14 @@ class Collection
     /**
      * Return last page if current page greater then last page.
      *
-     * @param \Magento\Framework\Data\Collection $subject
+     * @param DataCollection $subject
      * @param int $result
      * @return int
      */
-    public function afterGetCurPage(\Magento\Framework\Data\Collection $subject, int $result)
+    public function afterGetCurPage(DataCollection $subject, int $result): int
     {
         if ($result > $subject->getLastPageNumber()) {
-            $result = $subject->getLastPageNumber();
+            $result = 1;
         }
 
         return $result;
diff --git a/app/code/Magento/Theme/etc/adminhtml/di.xml b/app/code/Magento/Theme/etc/adminhtml/di.xml
index 81dafb48fd13f..8e672cbe1317e 100644
--- a/app/code/Magento/Theme/etc/adminhtml/di.xml
+++ b/app/code/Magento/Theme/etc/adminhtml/di.xml
@@ -41,7 +41,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\Data\Collection">
-        <plugin name="currentPageDetection" type="Magento\Theme\Plugin\Data\Collection" />
-    </type>
 </config>
diff --git a/app/code/Magento/Theme/etc/di.xml b/app/code/Magento/Theme/etc/di.xml
index 8e12eaf8167c8..d6fe3f8fef355 100644
--- a/app/code/Magento/Theme/etc/di.xml
+++ b/app/code/Magento/Theme/etc/di.xml
@@ -326,4 +326,7 @@
             <argument name="filesystemDriver" xsi:type="object">Magento\Framework\Filesystem\Driver\File</argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\Data\Collection">
+        <plugin name="currentPageDetection" type="Magento\Theme\Plugin\Data\Collection" />
+    </type>
 </config>
diff --git a/app/code/Magento/Theme/etc/frontend/di.xml b/app/code/Magento/Theme/etc/frontend/di.xml
index a83c1fa280404..d3e5c07861c84 100644
--- a/app/code/Magento/Theme/etc/frontend/di.xml
+++ b/app/code/Magento/Theme/etc/frontend/di.xml
@@ -37,8 +37,4 @@
             <argument name="filePath" xsi:type="string">css/critical.css</argument>
         </arguments>
     </type>
-
-    <type name="Magento\Framework\Data\Collection">
-        <plugin name="currentPageDetection" type="Magento\Theme\Plugin\Data\Collection" />
-    </type>
 </config>
diff --git a/app/code/Magento/Theme/etc/webapi_rest/di.xml b/app/code/Magento/Theme/etc/webapi_rest/di.xml
new file mode 100644
index 0000000000000..8abda8502238d
--- /dev/null
+++ b/app/code/Magento/Theme/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\Data\Collection">
+        <plugin name="currentPageDetection" disabled="true"/>
+    </type>
+</config>
diff --git a/app/code/Magento/Theme/etc/webapi_soap/di.xml b/app/code/Magento/Theme/etc/webapi_soap/di.xml
new file mode 100644
index 0000000000000..8abda8502238d
--- /dev/null
+++ b/app/code/Magento/Theme/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\Data\Collection">
+        <plugin name="currentPageDetection" disabled="true"/>
+    </type>
+</config>
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Attribute/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Attribute/CollectionTest.php
new file mode 100644
index 0000000000000..607e5b6de4541
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Attribute/CollectionTest.php
@@ -0,0 +1,80 @@
+<?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\Model\ResourceModel\Product\Attribute\CollectionFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Tests \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection
+ */
+class CollectionTest extends TestCase
+{
+    /**
+     * @var CollectionFactory .
+     */
+    private $attributesCollectionFactory;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->attributesCollectionFactory = $objectManager->get(CollectionFactory::class);
+    }
+
+    /**
+     * @magentoAppArea adminhtml
+     * @dataProvider attributesCollectionGetCurrentPageDataProvider
+     *
+     * @param array|null $condition
+     * @param int $currentPage
+     * @param int $expectedCurrentPage
+     * @return void
+     */
+    public function testAttributesCollectionGetCurrentPage(
+        ?array $condition,
+        int $currentPage,
+        int $expectedCurrentPage
+    ): void {
+        $attributeCollection = $this->attributesCollectionFactory->create();
+        $attributeCollection->setCurPage($currentPage)->setPageSize(20);
+
+        if ($condition !== null) {
+            $attributeCollection->addFieldToFilter('is_global', $condition);
+        }
+
+        $this->assertEquals($expectedCurrentPage, (int)$attributeCollection->getCurPage());
+    }
+
+    /**
+     * @return array[]
+     */
+    public function attributesCollectionGetCurrentPageDataProvider(): array
+    {
+        return [
+            [
+                'condition' => null,
+                'currentPage' => 1,
+                'expectedCurrentPage' => 1,
+            ],
+            [
+                'condition' => ['eq' => 0],
+                'currentPage' => 1,
+                'expectedCurrentPage' => 1,
+            ],
+            [
+                'condition' => ['eq' => 0],
+                'currentPage' => 15,
+                'expectedCurrentPage' => 1,
+            ],
+        ];
+    }
+}

From e8284926ac8153d4d877d54317a1192afd6f86ae Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Fri, 7 Aug 2020 17:04:30 +0800
Subject: [PATCH 1349/1718] magento/adobe-stock-integration#1716: Use Magento
 naming approach for FolderTree class - modified path in di.xml

---
 app/code/Magento/MediaGalleryUi/etc/di.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryUi/etc/di.xml b/app/code/Magento/MediaGalleryUi/etc/di.xml
index 040e003817efa..56ccf7c1aa727 100644
--- a/app/code/Magento/MediaGalleryUi/etc/di.xml
+++ b/app/code/Magento/MediaGalleryUi/etc/di.xml
@@ -28,7 +28,7 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\MediaGalleryUi\Model\Directories\FolderTree">
+    <type name="Magento\MediaGalleryUi\Model\Directories\GetFolderTree">
         <arguments>
             <argument name="path" xsi:type="string">media</argument>
         </arguments>

From 0a00811be0fc9bbbed2122fd801f4e319ec9fe48 Mon Sep 17 00:00:00 2001
From: Nikita Shcherbatykh <nikita.shcherbatykh@transoftgroup.com>
Date: Fri, 7 Aug 2020 12:46:27 +0300
Subject: [PATCH 1350/1718] MC-35707: Invoice PDF is not generating in correct
 language

---
 .../Unit/Model/Order/Pdf/CreditmemoTest.php   | 22 ++++++++++---------
 .../Unit/Model/Order/Pdf/ShipmentTest.php     | 22 ++++++++++---------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/CreditmemoTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/CreditmemoTest.php
index de1fb1d0faeb3..2c62f0fb8122f 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/CreditmemoTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/CreditmemoTest.php
@@ -5,12 +5,14 @@
  */
 namespace Magento\Sales\Test\Unit\Model\Order\Pdf;
 
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\MediaStorage\Helper\File\Storage\Database;
-use Magento\Sales\Model\Order\Creditmemo;
 use Magento\Sales\Model\Order;
-use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Sales\Model\Order\Address;
 use Magento\Sales\Model\Order\Address\Renderer;
+use Magento\Sales\Model\Order\Creditmemo;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class CreditmemoTest
@@ -19,7 +21,7 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class CreditmemoTest extends \PHPUnit\Framework\TestCase
+class CreditmemoTest extends TestCase
 {
     /**
      * @var \Magento\Sales\Model\Order\Pdf\Invoice
@@ -27,32 +29,32 @@ class CreditmemoTest extends \PHPUnit\Framework\TestCase
     protected $_model;
 
     /**
-     * @var \Magento\Sales\Model\Order\Pdf\Config|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Sales\Model\Order\Pdf\Config|MockObject
      */
     protected $_pdfConfigMock;
 
     /**
-     * @var Database|\PHPUnit_Framework_MockObject_MockObject
+     * @var Database|MockObject
      */
     protected $databaseMock;
 
     /**
-     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ScopeConfigInterface|MockObject
      */
     protected $scopeConfigMock;
 
     /**
-     * @var \Magento\Framework\Filesystem\Directory\Write|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Filesystem\Directory\Write|MockObject
      */
     protected $directoryMock;
 
     /**
-     * @var Renderer|\PHPUnit_Framework_MockObject_MockObject
+     * @var Renderer|MockObject
      */
     protected $addressRendererMock;
 
     /**
-     * @var \Magento\Payment\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Payment\Helper\Data|MockObject
      */
     protected $paymentDataMock;
 
@@ -61,7 +63,7 @@ class CreditmemoTest extends \PHPUnit\Framework\TestCase
      */
     private $appEmulation;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->_pdfConfigMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Pdf\Config::class)
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/ShipmentTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/ShipmentTest.php
index 417162378ff95..19c61e4d37bdb 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/ShipmentTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/ShipmentTest.php
@@ -5,12 +5,14 @@
  */
 namespace Magento\Sales\Test\Unit\Model\Order\Pdf;
 
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\MediaStorage\Helper\File\Storage\Database;
-use Magento\Sales\Model\Order\Shipment;
 use Magento\Sales\Model\Order;
-use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Sales\Model\Order\Address;
 use Magento\Sales\Model\Order\Address\Renderer;
+use Magento\Sales\Model\Order\Shipment;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class ShipmentTest
@@ -19,7 +21,7 @@
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class ShipmentTest extends \PHPUnit\Framework\TestCase
+class ShipmentTest extends TestCase
 {
     /**
      * @var \Magento\Sales\Model\Order\Pdf\Invoice
@@ -27,32 +29,32 @@ class ShipmentTest extends \PHPUnit\Framework\TestCase
     protected $_model;
 
     /**
-     * @var \Magento\Sales\Model\Order\Pdf\Config|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Sales\Model\Order\Pdf\Config|MockObject
      */
     protected $_pdfConfigMock;
 
     /**
-     * @var Database|\PHPUnit_Framework_MockObject_MockObject
+     * @var Database|MockObject
      */
     protected $databaseMock;
 
     /**
-     * @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ScopeConfigInterface|MockObject
      */
     protected $scopeConfigMock;
 
     /**
-     * @var \Magento\Framework\Filesystem\Directory\Write|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Filesystem\Directory\Write|MockObject
      */
     protected $directoryMock;
 
     /**
-     * @var Renderer|\PHPUnit_Framework_MockObject_MockObject
+     * @var Renderer|MockObject
      */
     protected $addressRendererMock;
 
     /**
-     * @var \Magento\Payment\Helper\Data|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Payment\Helper\Data|MockObject
      */
     protected $paymentDataMock;
 
@@ -61,7 +63,7 @@ class ShipmentTest extends \PHPUnit\Framework\TestCase
      */
     private $appEmulation;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->_pdfConfigMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Pdf\Config::class)
             ->disableOriginalConstructor()

From 7d87f1d737e741a00d40f271fe4033c758f9701f Mon Sep 17 00:00:00 2001
From: Stas Kozar <stas.kozar@transoftgroup.com>
Date: Fri, 7 Aug 2020 13:30:36 +0300
Subject: [PATCH 1351/1718] MC-35475: Wrong design for Admin Customer Edit Page
 on Safari browser

---
 .../templates/catalog/product/composite/configure.phtml         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
index d29edabd93a15..d4483b8a27433 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
@@ -5,7 +5,7 @@
  */
 
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
-$blockId = $block->getId();
+$blockId = $block->escapeHtmlAttr($block->getId());
 ?>
 <div id="product_composite_configure" class="product-configure-popup-<?= $blockId ?>">
     <iframe name="product_composite_configure_iframe" id="product_composite_configure_iframe"></iframe>

From 25133c56cf0e0390c11399b78cbe3fb426fdd1be Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Fri, 7 Aug 2020 18:36:39 +0800
Subject: [PATCH 1352/1718] 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 145389037f19beee483dafad5e0ca08f3f3062cf Mon Sep 17 00:00:00 2001
From: Stas Kozar <stas.kozar@transoftgroup.com>
Date: Fri, 7 Aug 2020 14:08:12 +0300
Subject: [PATCH 1353/1718] MC-35475: Wrong design for Admin Customer Edit Page
 on Safari browser

---
 .../templates/catalog/product/composite/configure.phtml       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
index d4483b8a27433..c86c9ad095076 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
@@ -5,9 +5,9 @@
  */
 
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
-$blockId = $block->escapeHtmlAttr($block->getId());
+$blockId = $block->getId();
 ?>
-<div id="product_composite_configure" class="product-configure-popup-<?= $blockId ?>">
+<div id="product_composite_configure" class="product-configure-popup-<?= $block->escapeHtmlAttr($blockId) ?>">
     <iframe name="product_composite_configure_iframe" id="product_composite_configure_iframe"></iframe>
     <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
         'onload',

From f7c246b4049dd652efed2807c3779cf2cc39c57a Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Fri, 7 Aug 2020 14:11:53 +0300
Subject: [PATCH 1354/1718] magento/magento2-login-as-customer#150: Opt-in/out
 - tests fix.

---
 .../Metadata/CustomerExtensionAttributeMeta.xml |  2 ++
 .../Test/Mftf/Data/CustomerData.xml             | 17 +++++++++++++++++
 .../Data/ExtensionAttributeAssistanceData.xml   | 17 +++++++++++++++++
 ...angUserAccessToLoginAsCustomerButtonTest.xml |  2 +-
 ...nLoginAsCustomerAddProductToWishlistTest.xml |  2 +-
 .../AdminLoginAsCustomerAutoDetectionTest.xml   |  2 +-
 ...ginAsCustomerDirectlyToCustomWebsiteTest.xml |  6 +++---
 ...nLoginAsCustomerEditCustomersAddressTest.xml |  2 +-
 .../Test/AdminLoginAsCustomerLoggingTest.xml    |  4 ++--
 .../AdminLoginAsCustomerManualChooseTest.xml    |  2 +-
 ...nLoginAsCustomerMultishippingLoggingTest.xml |  2 +-
 .../Test/AdminLoginAsCustomerPlaceOrderTest.xml |  2 +-
 .../Test/AdminLoginAsCustomerReorderTest.xml    |  2 +-
 ...LoginAsCustomerSubscribeToNewsletterTest.xml |  2 +-
 .../Test/AdminLoginAsCustomerUserLogoutTest.xml |  2 +-
 ...dminLoginAsCustomerUserSingleSessionTest.xml |  7 ++-----
 ...AdminNoAccessToLoginAsCustomerButtonTest.xml |  2 +-
 ...AccessToLoginAsCustomerConfigurationTest.xml |  2 +-
 ...nUINotShownIfLoginAsCustomerDisabledTest.xml |  2 +-
 ...AdminUIShownIfLoginAsCustomerEnabledTest.xml |  2 +-
 ...omerBannerPresentOnAllPagesInSessionTest.xml |  2 +-
 ...ontLoginAsCustomerNotificationBannerTest.xml |  2 +-
 ...nAsCustomerSeeSpecialPriceOnCategoryTest.xml |  2 +-
 ...ShoppingCartIsNotMergedWithGuestCartTest.xml |  2 +-
 .../Block/Adminhtml/NotAllowedPopup.php         |  2 ++
 .../LoginAsCustomerAssistance/composer.json     |  5 ++---
 26 files changed, 65 insertions(+), 31 deletions(-)
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Data/CustomerData.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Data/ExtensionAttributeAssistanceData.xml

diff --git a/app/code/Magento/Customer/Test/Mftf/Metadata/CustomerExtensionAttributeMeta.xml b/app/code/Magento/Customer/Test/Mftf/Metadata/CustomerExtensionAttributeMeta.xml
index 06c7b74aef002..d9f738e9d8235 100644
--- a/app/code/Magento/Customer/Test/Mftf/Metadata/CustomerExtensionAttributeMeta.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Metadata/CustomerExtensionAttributeMeta.xml
@@ -9,10 +9,12 @@
 <operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
     <operation name="CreateCustomerExtensionAttribute" dataType="customer_extension_attribute" type="create">
+        <field key="assistance_allowed">integer</field>
         <field key="is_subscribed">boolean</field>
         <field key="extension_attribute">customer_nested_extension_attribute</field>
     </operation>
     <operation name="UpdateCustomerExtensionAttribute" dataType="customer_extension_attribute" type="update">
+        <field key="assistance_allowed">integer</field>
         <field key="is_subscribed">boolean</field>
         <field key="extension_attribute">customer_nested_extension_attribute</field>
     </operation>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/CustomerData.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/CustomerData.xml
new file mode 100644
index 0000000000000..10cdc87be6430
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/CustomerData.xml
@@ -0,0 +1,17 @@
+<?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="Simple_US_Customer_Assistance_Allowed" type="customer" extends="Simple_US_Customer">
+        <requiredEntity type="customer_extension_attribute">AssistanceAllowed</requiredEntity>
+    </entity>
+    <entity name="Simple_US_CA_Customer_Assistance_Allowed" type="customer" extends="Simple_US_CA_Customer">
+        <requiredEntity type="customer_extension_attribute">AssistanceAllowed</requiredEntity>
+    </entity>
+</entities>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/ExtensionAttributeAssistanceData.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/ExtensionAttributeAssistanceData.xml
new file mode 100644
index 0000000000000..44582cfae5c36
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/ExtensionAttributeAssistanceData.xml
@@ -0,0 +1,17 @@
+<?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="AssistanceDisallowed" type="customer_extension_attribute">
+        <data key="assistance_allowed">1</data>
+    </entity>
+    <entity name="AssistanceAllowed" type="customer_extension_attribute">
+        <data key="assistance_allowed">2</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerButtonTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerButtonTest.xml
index 9ebeae23d47a8..8902877b38e54 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerButtonTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerButtonTest.xml
@@ -27,7 +27,7 @@
             <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0"
                         stepKey="enableLoginAsCustomerAutoDetection"/>
             <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
-            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createCustomer"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDefaultAdminUserBefore"/>
 
             <!--Create New Role-->
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAddProductToWishlistTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAddProductToWishlistTest.xml
index 8ab3fe8ce3bc3..c083383dd8861 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAddProductToWishlistTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAddProductToWishlistTest.xml
@@ -28,7 +28,7 @@
             <createData entity="SimpleProduct" stepKey="createSimpleProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
-            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createCustomer"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>
         <after>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml
index 42d53113e20f4..de9790894015c 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml
@@ -20,7 +20,7 @@
             <group value="login_as_customer"/>
         </annotations>
         <before>
-            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createCustomer"/>
             <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
                         stepKey="enableLoginAsCustomer"/>
             <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0"
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerDirectlyToCustomWebsiteTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerDirectlyToCustomWebsiteTest.xml
index e5a5a6f9a9738..f9418a9cf1e1b 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerDirectlyToCustomWebsiteTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerDirectlyToCustomWebsiteTest.xml
@@ -42,14 +42,14 @@
                 <argument name="customStore" value="customStoreEN"/>
             </actionGroup>
             <actionGroup ref="AdminCreateCustomerWithWebSiteAndGroupActionGroup" stepKey="createCustomer">
-                <argument name="customerData" value="Simple_US_Customer"/>
+                <argument name="customerData" value="Simple_US_Customer_Assistance_Allowed"/>
                 <argument name="website" value="{{customWebsite.name}}"/>
                 <argument name="storeView" value="{{customStoreEN.name}}"/>
             </actionGroup>
         </before>
         <after>
             <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomer">
-                <argument name="customerEmail" value="Simple_US_Customer.email"/>
+                <argument name="customerEmail" value="Simple_US_Customer_Assistance_Allowed.email"/>
             </actionGroup>
             <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
                 <argument name="websiteName" value="{{customWebsite.name}}"/>
@@ -65,7 +65,7 @@
 
         <!-- Login as Customer from Customer page -->
         <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="OpenEditCustomerFrom">
-            <argument name="customer" value="Simple_US_Customer"/>
+            <argument name="customer" value="Simple_US_Customer_Assistance_Allowed"/>
         </actionGroup>
         <grabFromCurrentUrl regex="~id/(\d+)/~"  stepKey="customerId" />
         <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup"
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerEditCustomersAddressTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerEditCustomersAddressTest.xml
index 38a8798d401bb..cf90f0b6a8511 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerEditCustomersAddressTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerEditCustomersAddressTest.xml
@@ -24,7 +24,7 @@
             <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0"
                         stepKey="enableLoginAsCustomerAutoDetection"/>
             <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
-            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createCustomer"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAdmin"/>
         </before>
         <after>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingTest.xml
index bf2556b30967b..5b5e9e21113c8 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingTest.xml
@@ -26,8 +26,8 @@
                         stepKey="enableLoginAsCustomerAutoDetection"/>
             <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
             <createData entity="NewAdminUser" stepKey="createNewAdmin"/>
-            <createData entity="Simple_US_Customer" stepKey="createFirstCustomer"/>
-            <createData entity="Simple_US_CA_Customer" stepKey="createSecondCustomer"/>
+            <createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createFirstCustomer"/>
+            <createData entity="Simple_US_CA_Customer_Assistance_Allowed" stepKey="createSecondCustomer"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDefaultUser"/>
         </before>
         <after>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
index acae07d1cda11..da966fdcc1291 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
@@ -23,7 +23,7 @@
             </skip>
         </annotations>
         <before>
-            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createCustomer"/>
             <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
                         stepKey="enableLoginAsCustomer"/>
             <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 1"
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerMultishippingLoggingTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerMultishippingLoggingTest.xml
index 8e5c121fed157..79c7571a08cfb 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerMultishippingLoggingTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerMultishippingLoggingTest.xml
@@ -33,7 +33,7 @@
             <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
             <createData entity="SimpleProduct2" stepKey="createProduct1"/>
             <createData entity="SimpleProduct2" stepKey="createProduct2"/>
-            <createData entity="Simple_US_Customer_Two_Addresses" stepKey="createCustomer"/>
+            <createData entity="Simple_US_Customer_Assistance_Allowed_Two_Addresses" stepKey="createCustomer"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
 
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml
index a4994d5c041d2..8169b9df4c43d 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml
@@ -28,7 +28,7 @@
             <createData entity="SimpleProduct" stepKey="createProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
-            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createCustomer"/>
 
             <!-- Create new User -->
             <actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerReorderTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerReorderTest.xml
index 16e0b94112562..11d622319af33 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerReorderTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerReorderTest.xml
@@ -28,7 +28,7 @@
             <createData entity="SimpleProduct" stepKey="createProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
-            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createCustomer"/>
 
             <!-- Create new User -->
             <actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSubscribeToNewsletterTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSubscribeToNewsletterTest.xml
index 44409471821db..bc4c4adc3ac5a 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSubscribeToNewsletterTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSubscribeToNewsletterTest.xml
@@ -24,7 +24,7 @@
             <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0"
                         stepKey="enableLoginAsCustomerAutoDetection"/>
             <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
-            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createCustomer"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>
         <after>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserLogoutTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserLogoutTest.xml
index 4f484e73d580b..e7b5de55a56cb 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserLogoutTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserLogoutTest.xml
@@ -25,7 +25,7 @@
             <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0"
                         stepKey="enableLoginAsCustomerAutoDetection"/>
             <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
-            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createCustomer"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDefaultUser"/>
         </before>
         <after>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserSingleSessionTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserSingleSessionTest.xml
index e4cd48d8e868e..5bbc218e0a948 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserSingleSessionTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserSingleSessionTest.xml
@@ -17,17 +17,14 @@
                 value="Verify Admin users can have only one 'Login as Customer' session at a time"/>
             <severity value="MAJOR"/>
             <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" stepKey="enableLoginAsCustomer"/>
             <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0"
                         stepKey="enableLoginAsCustomerAutoDetection"/>
             <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
-            <createData entity="Simple_US_Customer" stepKey="createFirstCustomer"/>
-            <createData entity="Simple_US_CA_Customer" stepKey="createSecondCustomer"/>
+            <createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createFirstCustomer"/>
+            <createData entity="Simple_US_CA_Customer_Assistance_Allowed" stepKey="createSecondCustomer"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDefaultUser"/>
         </before>
         <after>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerButtonTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerButtonTest.xml
index 52f5d7c51dcd1..50513797d06e9 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerButtonTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerButtonTest.xml
@@ -29,7 +29,7 @@
             <createData entity="SimpleProduct" stepKey="createSimpleProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
-            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createCustomer"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDefaultAdminUserBefore"/>
 
             <!--Create New Role-->
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerConfigurationTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerConfigurationTest.xml
index c7f42de741862..d48f167656301 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerConfigurationTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerConfigurationTest.xml
@@ -31,7 +31,7 @@
             <createData entity="SimpleProduct" stepKey="createSimpleProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
-            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createCustomer"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDefaultAdminUserBefore"/>
 
             <!--Create New Role-->
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUINotShownIfLoginAsCustomerDisabledTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUINotShownIfLoginAsCustomerDisabledTest.xml
index 19a84ecadc72b..e1ea363bdf6bc 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUINotShownIfLoginAsCustomerDisabledTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUINotShownIfLoginAsCustomerDisabledTest.xml
@@ -24,7 +24,7 @@
             <createData entity="SimpleProduct" stepKey="createSimpleProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
-            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createCustomer"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>
         <after>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml
index 2bf364b29ba8d..ea06263901b9e 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml
@@ -28,7 +28,7 @@
             <createData entity="SimpleProduct" stepKey="createSimpleProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
-            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createCustomer"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>
         <after>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerBannerPresentOnAllPagesInSessionTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerBannerPresentOnAllPagesInSessionTest.xml
index 6874fcb4fd220..4f85b9167fa54 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerBannerPresentOnAllPagesInSessionTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerBannerPresentOnAllPagesInSessionTest.xml
@@ -27,7 +27,7 @@
             <createData entity="SimpleProduct" stepKey="createSimpleProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
-            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createCustomer"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>
         <after>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerNotificationBannerTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerNotificationBannerTest.xml
index d953c493562c6..351a3c569ce24 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerNotificationBannerTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerNotificationBannerTest.xml
@@ -19,7 +19,7 @@
             <group value="login_as_customer"/>
         </annotations>
         <before>
-            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createCustomer"/>
             <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
                         stepKey="enableLoginAsCustomer"/>
             <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0"
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerSeeSpecialPriceOnCategoryTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerSeeSpecialPriceOnCategoryTest.xml
index 775fcb122e181..3e70da8f8158d 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerSeeSpecialPriceOnCategoryTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerSeeSpecialPriceOnCategoryTest.xml
@@ -31,7 +31,7 @@
                 <requiredEntity createDataKey="createCategory"/>
                 <field key="price">10</field>
             </createData>
-            <createData entity="Simple_US_Customer" stepKey="createCustomer">
+            <createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createCustomer">
                 <field key="group_id">3</field>
             </createData>
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerShoppingCartIsNotMergedWithGuestCartTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerShoppingCartIsNotMergedWithGuestCartTest.xml
index 09ec1b427f515..b2c7c6c35db18 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerShoppingCartIsNotMergedWithGuestCartTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerShoppingCartIsNotMergedWithGuestCartTest.xml
@@ -27,7 +27,7 @@
             <createData entity="SimpleProduct" stepKey="createSimpleProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
-            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createCustomer"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>
         <after>
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Block/Adminhtml/NotAllowedPopup.php b/app/code/Magento/LoginAsCustomerAssistance/Block/Adminhtml/NotAllowedPopup.php
index a6af022d1549a..fe28b46e81d47 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/Block/Adminhtml/NotAllowedPopup.php
+++ b/app/code/Magento/LoginAsCustomerAssistance/Block/Adminhtml/NotAllowedPopup.php
@@ -13,6 +13,8 @@
 
 /**
  * Pop-up for Login as Customer button then Login as Customer is not allowed.
+ *
+ * @api
  */
 class NotAllowedPopup extends Template
 {
diff --git a/app/code/Magento/LoginAsCustomerAssistance/composer.json b/app/code/Magento/LoginAsCustomerAssistance/composer.json
index 754ed54945eb2..6a902304b7f5d 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/composer.json
+++ b/app/code/Magento/LoginAsCustomerAssistance/composer.json
@@ -7,8 +7,7 @@
         "magento/module-backend": "*",
         "magento/module-customer": "*",
         "magento/module-login-as-customer": "*",
-        "magento/module-login-as-customer-api": "*",
-        "magento/module-store": "*"
+        "magento/module-login-as-customer-api": "*"
     },
     "suggest": {
         "magento/module-login-as-customer-admin-ui": "*"
@@ -24,4 +23,4 @@
             "Magento\\LoginAsCustomerAssistance\\": ""
         }
     }
-},
+}

From 8b592ee2005c4c324672b0b3f1f69307384c43c5 Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Fri, 7 Aug 2020 17:02:14 +0530
Subject: [PATCH 1355/1718] Enabled old media gallery by default

---
 app/code/Magento/MediaGalleryUi/etc/config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryUi/etc/config.xml b/app/code/Magento/MediaGalleryUi/etc/config.xml
index fe8e73c406e59..593b1b8e58fd2 100644
--- a/app/code/Magento/MediaGalleryUi/etc/config.xml
+++ b/app/code/Magento/MediaGalleryUi/etc/config.xml
@@ -9,7 +9,7 @@
     <default>
         <system>
             <media_gallery>
-                <enabled>0</enabled>
+                <enabled>1</enabled>
             </media_gallery>
         </system>
     </default>

From dcddf7b62f5f5ed4f40824df4194b359977ffb2b Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Fri, 7 Aug 2020 14:42:08 +0300
Subject: [PATCH 1356/1718] Refactor massactionView, remove dobe-stock
 references

---
 .../adminhtml/web/css/source/_module.less     |  4 +-
 .../adminhtml/web/js/grid/columns/image.js    |  1 +
 .../web/js/grid/massaction/massactionView.js  | 91 ++++++-------------
 .../web/js/grid/massaction/massactions.js     |  4 +-
 .../web/template/grid/columns/image.html      |  2 +-
 .../grid/massactions/cancelButton.html        | 10 --
 .../grid/massactions/massactionButtons.html   | 13 +++
 .../web/template/image/image-details.html     |  2 +-
 8 files changed, 48 insertions(+), 79 deletions(-)
 delete mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/massactions/cancelButton.html
 create mode 100644 app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/massactions/massactionButtons.html

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 671a82dce3f58..511a36ba30ec2 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
@@ -307,7 +307,7 @@
             }
         }
 
-        .adobe-stock-icon {
+        .media-gallery-source-icon {
             margin-bottom: -6px;
             width: 29px;
         }
@@ -366,7 +366,7 @@
         }
 
         .image-type {
-            .adobe-stock-icon {
+            .media-gallery-source-icon {
                 margin-bottom: -6px;
                 width: 29px;
             }
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image.js
index e7c05573a4f11..bf852d0ddae68 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image.js
@@ -103,6 +103,7 @@ define([
          */
         updateSelected: function () {
             this.selected({});
+            this.hideAddSelectedAndDeleteButon();
         },
 
         /**
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/massaction/massactionView.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/massaction/massactionView.js
index a49303669edc8..ddc5af0ab6296 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/massaction/massactionView.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/massaction/massactionView.js
@@ -7,33 +7,23 @@ define([
     'jquery',
     'uiComponent',
     'mage/translate',
-    'text!Magento_MediaGalleryUi/template/grid/massactions/cancelButton.html'
-], function ($, Component, $t, cancelMassActionButton) {
+    'text!Magento_MediaGalleryUi/template/grid/massactions/massactionButtons.html'
+], function ($, Component, $t, massactionButtons) {
     'use strict';
 
     return Component.extend({
         defaults: {
-            pageActionsSelector: '.page-actions-buttons',
             gridSelector: '[data-id="media-gallery-masonry-grid"]',
-            originDeleteSelector: null,
-            originCancelEvent: null,
-            cancelMassactionButton: cancelMassActionButton,
-            isCancelButtonInserted: false,
-            deleteButtonSelector: '#delete_massaction',
-            addSelectedButtonSelector: '#add_selected',
-            cancelMassactionButtonSelector: '#cancel',
             standAloneTitle: 'Manage Gallery',
             slidePanelTitle: 'Media Gallery',
             defaultTitle: null,
-            contextButtonSelector: '.three-dots',
-            buttonsIds: [
-                '#delete_folder',
-                '#create_folder',
-                '#upload_image',
-                '#search_adobe_stock',
-                '.three-dots',
-                '#add_selected'
-            ],
+            are: null,
+            standAloneArea: 'standalone',
+            slidepanelArea: 'slidepanel',
+            massactionButtonsSelector: '.massaction-buttons',
+            buttonsSelectorStandalone: '.page-actions-buttons',
+            buttonsSelectorSlidePanel: '.page-actions.floating-header',
+            buttons: '.page-main-actions :button',
             massactionModeTitle: $t('Select Images to Delete')
         },
 
@@ -62,7 +52,6 @@ define([
          * Hide or show buttons per active mode.
          */
         switchButtons: function () {
-
             if (this.massActionMode()) {
                 this.activateMassactionButtonView();
             } else {
@@ -74,58 +63,24 @@ define([
          * Sets buttons to default regular -mode view.
          */
         revertButtonsToDefaultView: function () {
-            $(this.deleteButtonSelector).replaceWith(this.originDeleteSelector);
-
-            if (!this.isCancelButtonInserted) {
-                $('#cancel_massaction').replaceWith(this.originCancelEvent);
-            } else {
-                $(this.cancelMassactionButtonSelector).addClass('no-display');
-                $('#cancel_massaction').remove();
-            }
-
-            $.each(this.buttonsIds, function (key, value) {
-                $(value).removeClass('no-display');
-            });
-
-            $(this.addSelectedButtonSelector).addClass('no-display');
-            $(this.deleteButtonSelector)
-                .addClass('media-gallery-actions-buttons')
-                .removeClass('primary');
+            $(this.buttons).removeClass('no-display');
+            $(this.massactionButtonsSelector).remove();
         },
 
         /**
           * Activate mass action buttons view
           */
         activateMassactionButtonView: function () {
-            this.originDeleteSelector = $(this.deleteButtonSelector).clone();
-            $(this.originDeleteSelector).click(function () {
-                $(window).trigger('massAction.MediaGallery');
-            });
-            this.originCancelEvent = $('#cancel').clone(true, true);
+            var buttonsContainer;
 
-            $.each(this.buttonsIds, function (key, value) {
-                $(value).addClass('no-display');
-            });
+            $(this.buttons).addClass('no-display');
 
-            $(this.deleteButtonSelector)
-                .removeClass('media-gallery-actions-buttons')
-                .text($t('Delete Selected'))
-                .addClass('primary');
-
-            if (!$(this.cancelMassactionButtonSelector).length) {
-                $(this.pageActionsSelector).append(this.cancelMassactionButton);
-                this.isCancelButtonInserted = true;
-            } else {
-                $(this.cancelMassactionButtonSelector).replaceWith(this.cancelMassactionButton);
-            }
-            $('#cancel_massaction').on('click', function () {
-                $(window).trigger('terminateMassAction.MediaGallery');
-            }).applyBindings();
-
-            $(this.deleteButtonSelector).off('click').on('click', function () {
-                $(this.deleteButtonSelector).trigger('massDelete');
-            }.bind(this));
+            buttonsContainer =  this.area === this.standAloneArea ?
+                this.buttonsSelectorStandalone :
+                this.buttonsSelectorSlidePanel;
 
+            $(buttonsContainer).append(massactionButtons);
+            $(this.massactionButtonsSelector).applyBindings();
         },
 
         /**
@@ -133,7 +88,15 @@ define([
          */
         changePageTitle: function () {
             var title = $('h1:contains(' + this.standAloneTitle + ')'),
-                  titleSelector = title.length === 1 ? title : $('h1:contains(' + this.slidePanelTitle + ')');
+                titleSelector;
+
+            if (title.length === 1)  {
+                titleSelector = title;
+                this.area = this.standAloneArea;
+            } else {
+                titleSelector = $('h1:contains(' + this.slidePanelTitle + ')');
+                this.area = this.slidepanelArea;
+            }
 
             if (this.massActionMode()) {
                 this.defaultTitle = titleSelector.text();
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 8114305a3b29c..4f09854005f23 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
@@ -16,6 +16,7 @@ define([
 
     return Component.extend({
         defaults: {
+            deleteButtonSelector: '#delete_selected_massaction',
             deleteImagesSelector: '#delete_massaction',
             mediaGalleryImageDetailsName: 'mediaGalleryImageDetails',
             modules: {
@@ -86,6 +87,7 @@ define([
 
                 this.massActionMode(false);
                 this.switchMode();
+                this.imageModel().updateSelected();
             }.bind(this));
         },
 
@@ -124,7 +126,7 @@ define([
          */
         handleDeleteAction: function () {
             if (this.massActionMode()) {
-                $(this.massactionView().deleteButtonSelector).on('massDelete', function () {
+                $(this.deleteButtonSelector).on('massDelete.MediaGallery', function () {
                     if (this.getSelectedCount() < 1) {
                         uiAlert({
                             content: $t('You need to select at least one image')
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/columns/image.html b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/columns/image.html
index 4a8350231a0fd..3b88c58201be7 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/columns/image.html
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/columns/image.html
@@ -29,7 +29,7 @@
         <ul class="media-gallery-image-details">
             <li class="name" data-ui-id="title" text="$row().title"></li>
             <li class="source">
-                <img if="$row().source" class="adobe-stock-icon" attr="{ src: $row().source }"/>
+                <img if="$row().source" class="media-gallery-source-icon" attr="{ src: $row().source }"/>
             </li>
             <li class="type" data-ui-id="content-type" text="$row().content_type"></li> &#8226;
             <li class="dimensions" data-ui-id="dimensions" text="$row().width + 'x' + $row().height"></li>
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/massactions/cancelButton.html b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/massactions/cancelButton.html
deleted file mode 100644
index 243ed1c2a5dc4..0000000000000
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/massactions/cancelButton.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-
-<button id="cancel_massaction" type="button" class="cancel">
-  <span data-bind="i18n: 'Cancel'"/>
-</button>
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/massactions/massactionButtons.html b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/massactions/massactionButtons.html
new file mode 100644
index 0000000000000..a4294434c82bf
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/massactions/massactionButtons.html
@@ -0,0 +1,13 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<button id="cancel_massaction" type="button" onclick="jQuery(window).trigger('terminateMassAction.MediaGallery')" class="massaction-buttons cancel">
+  <span data-bind="i18n: 'Cancel'"/>
+</button>
+<button id="delete_selected_massaction" onclick="jQuery('#delete_selected_massaction').trigger('massDelete.MediaGallery')"  type="button" class="primary massaction-buttons cancel">
+  <span data-bind="i18n: 'Delete Selected'"/>
+</button>
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html
index a397bad0af698..e19e80af5ce43 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html
@@ -12,7 +12,7 @@
         <div class="image-details-section">
             <h3 class="image-title" text="image().title"></h3>
             <div class="image-type">
-                <span class="source"><img if="image().source" class="adobe-stock-icon" attr="{ src: image().source }" /></span>
+                <span class="source"><img if="image().source" class="media-gallery-source-icon" attr="{ src: image().source }" /></span>
                 <span class="type" data-ui-id="content-type" text="image().content_type"></span>
             </div>
         </div>

From 3a5eaa3ab008e0b14dcf786462a8e22611b989b6 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Fri, 7 Aug 2020 16:32:18 +0300
Subject: [PATCH 1357/1718] update button selector

---
 .../Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml
index a40a70c5f160c..ff5b9751dbe1f 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml
@@ -11,6 +11,6 @@
         <element name="massActionCheckbox" type="button" selector="//input[@type='checkbox'][@data-ui-id ='{{imageName}}']" parameterized="true"/>
         <element name="totalSelected" type="text" selector=".mediagallery-massaction-items-count > .selected_count_text"/>
         <element name="cancelMassActionMode" type="button" selector="#cancel_massaction"/>
-        <element name="deleteSelected" type="button" selector="#delete_massaction"/>
+        <element name="deleteSelected" type="button" selector="#delete_selected_massaction"/>
     </section>
 </sections>

From 960ac5139d22246fb0c513efe7d346762df6c217 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Fri, 7 Aug 2020 16:51:46 +0300
Subject: [PATCH 1358/1718] Fix if statement forui-select

---
 .../MediaGalleryUi/Controller/Adminhtml/Asset/Search.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/Search.php b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/Search.php
index b4b6713f47065..df13250eacb5f 100644
--- a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/Search.php
+++ b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/Search.php
@@ -137,7 +137,7 @@ public function execute()
             if (!empty($assets)) {
                 foreach ($assets as $asset) {
                     $responseContent['options'][] = [
-                        'value' => $asset->getId(),
+                        'value' => (string) $asset->getId(),
                         'label' => $asset->getTitle(),
                         'path' => $this->storage->getThumbnailUrl($this->images->getStorageRoot() . $asset->getPath())
                     ];

From d4417050c0eb265af0222ad5b844ebb1548ca421 Mon Sep 17 00:00:00 2001
From: Ievgen Kolesov <ikolesov@adobe.com>
Date: Fri, 7 Aug 2020 09:01:18 -0500
Subject: [PATCH 1359/1718] PWA-805: Expose localization system / store config
 from GraphQL

---
 .../StoreGraphQl/Model/Resolver/AvailableStoresResolver.php     | 2 +-
 app/code/Magento/StoreGraphQl/etc/schema.graphqls               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/StoreGraphQl/Model/Resolver/AvailableStoresResolver.php b/app/code/Magento/StoreGraphQl/Model/Resolver/AvailableStoresResolver.php
index ab1ba9f8a225f..5e49a8a0b7ff0 100644
--- a/app/code/Magento/StoreGraphQl/Model/Resolver/AvailableStoresResolver.php
+++ b/app/code/Magento/StoreGraphQl/Model/Resolver/AvailableStoresResolver.php
@@ -41,7 +41,7 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        $storeGroupId = !empty($args['use_current_group']) ?
+        $storeGroupId = !empty($args['useCurrentGroup']) ?
             (int)$context->getExtensionAttributes()->getStore()->getStoreGroupId() :
             null;
         return $this->storeConfigDataProvider->getAvailableStoreConfig(
diff --git a/app/code/Magento/StoreGraphQl/etc/schema.graphqls b/app/code/Magento/StoreGraphQl/etc/schema.graphqls
index 6dcbf1aded4d8..cf50041bb9bea 100644
--- a/app/code/Magento/StoreGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/StoreGraphQl/etc/schema.graphqls
@@ -3,7 +3,7 @@
 type Query {
     storeConfig : StoreConfig @resolver(class: "Magento\\StoreGraphQl\\Model\\Resolver\\StoreConfigResolver") @doc(description: "The store config query") @cache(cacheable: false)
     availableStores(
-        use_current_group : Boolean @doc(description: "Get only store views from the current store group")
+        useCurrentGroup: Boolean @doc(description: "Get only store views from the current store group")
     ): [StoreConfig] @resolver(class: "Magento\\StoreGraphQl\\Model\\Resolver\\AvailableStoresResolver") @doc(description: "Get a list of available store views and their config information.")
 }
 

From 58f6af56105e20c56335ce0f179fef7bbfdb061c Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Fri, 7 Aug 2020 17:06:17 +0300
Subject: [PATCH 1360/1718] Improve styles

---
 .../MediaGalleryUi/view/adminhtml/web/css/source/_module.less    | 1 +
 1 file changed, 1 insertion(+)

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 db8dd07a4be60..3d269a82da023 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
@@ -416,6 +416,7 @@
 
                         & > * {
                             float: left;
+                            margin-left: -1px;
                             width: 50%;
                         }
 

From 58efb76acfb4f2f534ff73accee9fc1d0a7ad20f Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Fri, 7 Aug 2020 22:17:49 +0800
Subject: [PATCH 1361/1718] 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 50113ce0c1284325063ac246dac943a57a8abe66 Mon Sep 17 00:00:00 2001
From: Stas Kozar <stas.kozar@transoftgroup.com>
Date: Fri, 7 Aug 2020 17:31:32 +0300
Subject: [PATCH 1362/1718] MC-35475: Wrong design for Admin Customer Edit Page
 on Safari browser

---
 .../catalog/product/composite/configure.phtml | 47 +++++++++----------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
index c86c9ad095076..cca63009d5606 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
@@ -7,7 +7,7 @@
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 $blockId = $block->getId();
 ?>
-<div id="product_composite_configure" class="product-configure-popup-<?= $block->escapeHtmlAttr($blockId) ?>">
+<div id="product_composite_configure" class="product-configure-popup product-configure-popup-<?= $block->escapeHtmlAttr($blockId) ?>">
     <iframe name="product_composite_configure_iframe" id="product_composite_configure_iframe"></iframe>
     <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
         'onload',
@@ -39,31 +39,26 @@ $blockId = $block->getId();
     <div id="product_composite_configure_confirmed" class="product_composite_configure_confirmed"></div>
 
     <?php $scriptString = <<<script
-        prodCompConfIframe = document.querySelectorAll("iframe[name='product_composite_configure_iframe']");
-        for (var i = 0; i < prodCompConfIframe.length; i++) {
-            prodCompConfIframe[i].style.width = 0;
-            prodCompConfIframe[i].style.height = 0;
-            prodCompConfIframe[i].style.border = "0px solid #fff";
-            prodCompConfIframe[i].style.position = "absolute";
-            prodCompConfIframe[i].style.top = "-1000px";
-            prodCompConfIframe[i].style.left = "-1000px";
-        }
-        prodCompConfMessages = document.querySelectorAll(".product_composite_configure_messages");
-        for (var i = 0; i < prodCompConfMessages.length; i++) {
-            prodCompConfMessages[i].style.display = "none";
-        }
-        prodCompConfFormAdd = document.querySelectorAll(".product_composite_configure_form_additional");
-        for (var i = 0; i < prodCompConfFormAdd.length; i++) {
-            prodCompConfFormAdd[i].style.display = "none";
-        }
-        prodCompConfFormConf = document.querySelectorAll(".product_composite_configure_form_confirmed");
-        for (var i = 0; i < prodCompConfFormConf.length; i++) {
-            prodCompConfFormConf[i].style.display = "none";
-        }
-        prodCompConfConf = document.querySelectorAll(".product_composite_configure_confirmed");
-        for (var i = 0; i < prodCompConfConf.length; i++) {
-            prodCompConfConf[i].style.display = "none";
-        }
+        prodCompConfIframe = document.querySelector(".product-configure-popup-$blockId iframe[name='product_composite_configure_iframe']");
+        prodCompConfIframe.style.width = 0;
+        prodCompConfIframe.style.height = 0;
+        prodCompConfIframe.style.border = "0px solid #fff";
+        prodCompConfIframe.style.position = "absolute";
+        prodCompConfIframe.style.top = "-1000px";
+        prodCompConfIframe.style.left = "-1000px";
+
+        prodCompConfMessages = document.querySelector(".product-configure-popup-$blockId .product_composite_configure_messages");
+        prodCompConfMessages.style.display = "none";
+
+        prodCompConfFormAdd = document.querySelector(".product-configure-popup-$blockId .product_composite_configure_form_additional");
+        prodCompConfFormAdd.style.display = "none";
+
+        prodCompConfFormConf = document.querySelector(".product-configure-popup-$blockId .product_composite_configure_form_confirmed");
+        prodCompConfFormConf.style.display = "none";
+
+        prodCompConfConf = document.querySelector(".product-configure-popup-$blockId .product_composite_configure_confirmed");
+        prodCompConfConf.style.display = "none";
+
         prodConfPopup = document.querySelector(".product-configure-popup-$blockId");
         prodConfPopup.style.display = "none";
 

From bacb8172fb9d2df6b93adacd5cf115b725b45da9 Mon Sep 17 00:00:00 2001
From: Tu Nguyen <tuna@ecommage.com>
Date: Fri, 7 Aug 2020 21:36:14 +0700
Subject: [PATCH 1363/1718] Fix css shows twice when css critical path enabled

update

fix permissions

Fix static check
update

fix fail tests

update
add extra condition check


update


update


update


update


update


update


Fix integration test
update


Fix static test fail
---
 .../Controller/Result/AsyncCssPlugin.php      | 121 ++++++++++-----
 .../Controller/Result/AsyncCssPluginTest.php  | 138 ++++++++++++------
 app/code/Magento/Theme/etc/frontend/di.xml    |   6 +-
 .../frontend/layout/default_head_blocks.xml   |   1 +
 .../templates/html/main_css_preloader.phtml   |  11 +-
 .../templates/js/css_rel_preload.phtml        |   6 +-
 .../Interception/PluginListGeneratorTest.php  |  14 +-
 7 files changed, 203 insertions(+), 94 deletions(-)

diff --git a/app/code/Magento/Theme/Controller/Result/AsyncCssPlugin.php b/app/code/Magento/Theme/Controller/Result/AsyncCssPlugin.php
index 70ea478004b9d..dfa83f1765041 100644
--- a/app/code/Magento/Theme/Controller/Result/AsyncCssPlugin.php
+++ b/app/code/Magento/Theme/Controller/Result/AsyncCssPlugin.php
@@ -10,6 +10,9 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Framework\App\Response\Http;
+use Magento\Framework\App\Response\HttpInterface as HttpResponseInterface;
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\View\Result\Layout;
 
 /**
  * Plugin for asynchronous CSS loading.
@@ -32,48 +35,94 @@ public function __construct(ScopeConfigInterface $scopeConfig)
     }
 
     /**
-     * Load CSS asynchronously if it is enabled in configuration.
+     * Extracts styles to head after critical css if critical path feature is enabled.
      *
-     * @param Http $subject
-     * @return void
+     * @param Layout $subject
+     * @param Layout $result
+     * @param HttpResponseInterface|ResponseInterface $httpResponse
+     * @return Layout (That should be void, actually)
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function beforeSendResponse(Http $subject): void
+    public function afterRenderResult(Layout $subject, Layout $result, ResponseInterface $httpResponse)
     {
-        $content = $subject->getContent();
+        if (!$this->isCssCriticalEnabled()) {
+            return $result;
+        }
 
-        if (\is_string($content) && strpos($content, '</body') !== false && $this->scopeConfig->isSetFlag(
-            self::XML_PATH_USE_CSS_CRITICAL_PATH,
-            ScopeInterface::SCOPE_STORE
-        )) {
-            $cssMatches = [];
-            // add link rel preload to style sheets
-            $content = preg_replace_callback(
-                '@<link\b.*?rel=("|\')stylesheet\1.*?/>@',
-                function ($matches) use (&$cssMatches) {
-                    $cssMatches[] = $matches[0];
-                    preg_match('@href=("|\')(.*?)\1@', $matches[0], $hrefAttribute);
-                    $href = $hrefAttribute[2];
-                    if (preg_match('@media=("|\')(.*?)\1@', $matches[0], $mediaAttribute)) {
-                        $media = $mediaAttribute[2];
-                    }
-                    $media = $media ?? 'all';
-                    $loadCssAsync = sprintf(
-                        '<link rel="preload" as="style" media="%s"' .
-                         ' onload="this.onload=null;this.rel=\'stylesheet\'"' .
-                        ' href="%s" />',
-                        $media,
-                        $href
-                    );
-
-                    return $loadCssAsync;
-                },
-                $content
-            );
+        $content = (string)$httpResponse->getContent();
+        $headCloseTag = '</head>';
 
-            if (!empty($cssMatches)) {
-                $content = str_replace('</body', implode("\n", $cssMatches) . "\n</body", $content);
-                $subject->setContent($content);
+        $headEndTagFound = strpos($content, $headCloseTag) !== false;
+
+        if ($headEndTagFound) {
+            $styles = $this->extractLinkTags($content);
+            if ($styles) {
+                $newHeadEndTagPosition = strrpos($content, $headCloseTag);
+                $content = substr_replace($content, $styles . "\n", $newHeadEndTagPosition, 0);
+                $httpResponse->setContent($content);
             }
         }
+
+        return $result;
+    }
+
+    /**
+     * Extracts link tags found in given content.
+     *
+     * @param string $content
+     */
+    private function extractLinkTags(string &$content): string
+    {
+        $styles = '';
+        $styleOpen = '<link';
+        $styleClose = '>';
+        $styleOpenPos = strpos($content, $styleOpen);
+
+        while ($styleOpenPos !== false) {
+            $styleClosePos = strpos($content, $styleClose, $styleOpenPos);
+            $style = substr($content, $styleOpenPos, $styleClosePos - $styleOpenPos + strlen($styleClose));
+
+            if (!preg_match('@rel=["\']stylesheet["\']@', $style)) {
+                // Link is not a stylesheet, search for another one after it.
+                $styleOpenPos = strpos($content, $styleOpen, $styleClosePos);
+                continue;
+            }
+            // Remove the link from HTML to add it before </head> tag later.
+            $content = str_replace($style, '', $content);
+
+            if (!preg_match('@href=("|\')(.*?)\1@', $style, $hrefAttribute)) {
+                throw new \RuntimeException("Invalid link {$style} syntax provided");
+            }
+            $href = $hrefAttribute[2];
+
+            if (preg_match('@media=("|\')(.*?)\1@', $style, $mediaAttribute)) {
+                $media = $mediaAttribute[2];
+            }
+            $media = $media ?? 'all';
+
+            $style = sprintf(
+                '<link rel="stylesheet" media="print" onload="this.onload=null;this.media=\'%s\'" href="%s">',
+                $media,
+                $href
+            );
+            $styles .= "\n" . $style;
+            // Link was cut out, search for the next one at its former position.
+            $styleOpenPos = strpos($content, $styleOpen, $styleOpenPos);
+        }
+
+        return $styles;
+    }
+
+    /**
+     * Returns information whether css critical path is enabled
+     *
+     * @return bool
+     */
+    private function isCssCriticalEnabled(): bool
+    {
+        return $this->scopeConfig->isSetFlag(
+            self::XML_PATH_USE_CSS_CRITICAL_PATH,
+            ScopeInterface::SCOPE_STORE
+        );
     }
 }
diff --git a/app/code/Magento/Theme/Test/Unit/Controller/Result/AsyncCssPluginTest.php b/app/code/Magento/Theme/Test/Unit/Controller/Result/AsyncCssPluginTest.php
index d433f745400d0..eed3e05c4abdd 100644
--- a/app/code/Magento/Theme/Test/Unit/Controller/Result/AsyncCssPluginTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Controller/Result/AsyncCssPluginTest.php
@@ -7,13 +7,14 @@
 
 namespace Magento\Theme\Test\Unit\Controller\Result;
 
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\App\Response\Http;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Store\Model\ScopeInterface;
 use Magento\Theme\Controller\Result\AsyncCssPlugin;
-use PHPUnit\Framework\MockObject\MockObject;
+use Magento\Framework\App\Response\Http;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\View\Result\Layout;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**
  * Unit test for Magento\Theme\Test\Unit\Controller\Result\AsyncCssPlugin.
@@ -37,6 +38,9 @@ class AsyncCssPluginTest extends TestCase
      */
     private $httpMock;
 
+    /** @var Layout|MockObject */
+    private $layoutMock;
+
     /**
      * @inheritdoc
      */
@@ -48,6 +52,7 @@ protected function setUp(): void
             ->getMockForAbstractClass();
 
         $this->httpMock = $this->createMock(Http::class);
+        $this->layoutMock = $this->createMock(Layout::class);
 
         $objectManager = new ObjectManagerHelper($this);
         $this->plugin = $objectManager->getObject(
@@ -59,87 +64,134 @@ protected function setUp(): void
     }
 
     /**
-     * Data Provider for before send response
+     * Data Provider for testAfterRenderResult
      *
      * @return array
      */
-    public function sendResponseDataProvider(): array
+    public function renderResultDataProvider(): array
     {
         return [
             [
-                "content" => "<body><h1>Test Title</h1>" .
-                    "<link rel=\"stylesheet\" href=\"css/critical.css\" />" .
-                    "<p>Test Content</p></body>",
+                "content" => "<head><link rel=\"stylesheet\" href=\"css/async.css\">" .
+                    "<style>.critical-css{}</style>" .
+                    "</head>",
+                "flag" => true,
+                "result" => "<head><style>.critical-css{}</style>\n" .
+                    "<link " .
+                        "rel=\"stylesheet\" media=\"print\" onload=\"this.onload=null;this.media='all'\" " .
+                        "href=\"css/async.css\">\n" .
+                    "</head>",
+            ],
+            [
+                "content" => "<head><link rel=\"stylesheet\" href=\"css/async.css\">" .
+                    "<link rel=\"preload\" href=\"other-file.html\">" .
+                    "</head>",
                 "flag" => true,
-                "result" => "<body><h1>Test Title</h1>" .
-                    "<link rel=\"preload\" as=\"style\" media=\"all\"" .
-                    " onload=\"this.onload=null;this.rel='stylesheet'\" href=\"css/critical.css\" />" .
-                    "<p>Test Content</p>" .
-                    "<link rel=\"stylesheet\" href=\"css/critical.css\" />" .
-                    "\n</body>"
+                "result" => "<head><link rel=\"preload\" href=\"other-file.html\">\n" .
+                    "<link " .
+                        "rel=\"stylesheet\" media=\"print\" onload=\"this.onload=null;this.media='all'\" " .
+                        "href=\"css/async.css\">\n" .
+                    "</head>",
             ],
             [
-                "content" => "<body><p>Test Content</p></body>",
+                "content" => "<head><link rel=\"stylesheet\" href=\"css/async.css\">" .
+                    "<link rel=\"preload\" href=\"other-file.html\">" .
+                    "</head>",
                 "flag" => false,
-                "result" => "<body><p>Test Content</p></body>"
+                "result" => "<head><link rel=\"stylesheet\" href=\"css/async.css\">" .
+                    "<link rel=\"preload\" href=\"other-file.html\">" .
+                    "</head>",
             ],
             [
-                "content" => "<body><p>Test Content</p></body>",
+                "content" => "<head><link rel=\"stylesheet\" href=\"css/first.css\">" .
+                    "<link rel=\"stylesheet\" href=\"css/second.css\">" .
+                    "<style>.critical-css{}</style>" .
+                    "</head>",
                 "flag" => true,
-                "result" => "<body><p>Test Content</p></body>"
+                "result" => "<head><style>.critical-css{}</style>\n" .
+                    "<link " .
+                        "rel=\"stylesheet\" media=\"print\" onload=\"this.onload=null;this.media='all'\" " .
+                        "href=\"css/first.css\">\n" .
+                    "<link " .
+                        "rel=\"stylesheet\" media=\"print\" onload=\"this.onload=null;this.media='all'\" " .
+                        "href=\"css/second.css\">\n" .
+                    "</head>",
+            ],
+            [
+                "content" => "<head><style>.critical-css{}</style></head>",
+                "flag" => false,
+                "result" => "<head><style>.critical-css{}</style></head>"
+            ],
+            [
+                "content" => "<head><style>.critical-css{}</style></head>",
+                "flag" => true,
+                "result" => "<head><style>.critical-css{}</style></head>"
             ]
         ];
     }
 
     /**
-     * Test beforeSendResponse
+     * Test after render result response
      *
      * @param string $content
      * @param bool $isSetFlag
      * @param string $result
      * @return void
-     * @dataProvider sendResponseDataProvider
+     * @dataProvider renderResultDataProvider
      */
-    public function testBeforeSendResponse($content, $isSetFlag, $result): void
+    public function testAfterRenderResult(string $content, bool $isSetFlag, string $result): void
     {
-        $this->httpMock->expects($this->once())
-            ->method('getContent')
+        // Given (context)
+        $this->httpMock->method('getContent')
             ->willReturn($content);
 
-        $this->scopeConfigMock->expects($this->once())
-            ->method('isSetFlag')
-            ->with(
-                self::STUB_XML_PATH_USE_CSS_CRITICAL_PATH,
-                ScopeInterface::SCOPE_STORE
-            )
+        $this->scopeConfigMock->method('isSetFlag')
+            ->with(self::STUB_XML_PATH_USE_CSS_CRITICAL_PATH, ScopeInterface::SCOPE_STORE)
             ->willReturn($isSetFlag);
 
+        // Expects
         $this->httpMock->expects($this->any())
             ->method('setContent')
             ->with($result);
 
-        $this->plugin->beforeSendResponse($this->httpMock);
+        // When
+        $this->plugin->afterRenderResult($this->layoutMock, $this->layoutMock, $this->httpMock);
     }
 
     /**
-     * Test BeforeSendResponse if content is not a string
+     * Data Provider for testAfterRenderResultIfGetContentIsNotAString()
      *
+     * @return array
+     */
+    public function ifGetContentIsNotAStringDataProvider(): array
+    {
+        return [
+            [
+                'content' => null
+            ]
+        ];
+    }
+
+    /**
+     * Test AfterRenderResult if content is not a string
+     *
+     * @param $content
      * @return void
+     * @dataProvider ifGetContentIsNotAStringDataProvider
      */
-    public function testIfGetContentIsNotAString(): void
+    public function testAfterRenderResultIfGetContentIsNotAString($content): void
     {
+        $this->scopeConfigMock->method('isSetFlag')
+            ->with(self::STUB_XML_PATH_USE_CSS_CRITICAL_PATH, ScopeInterface::SCOPE_STORE)
+            ->willReturn(true);
+
         $this->httpMock->expects($this->once())
             ->method('getContent')
-            ->willReturn([]);
+            ->willReturn($content);
 
-        $this->scopeConfigMock->expects($this->any())
-            ->method('isSetFlag')
-            ->with(
-                self::STUB_XML_PATH_USE_CSS_CRITICAL_PATH,
-                ScopeInterface::SCOPE_STORE
-            )
-            ->willReturn(false);
+        $this->httpMock->expects($this->never())
+            ->method('setContent');
 
-        $this->plugin->beforeSendResponse($this->httpMock);
+        $this->plugin->afterRenderResult($this->layoutMock, $this->layoutMock, $this->httpMock);
     }
 }
diff --git a/app/code/Magento/Theme/etc/frontend/di.xml b/app/code/Magento/Theme/etc/frontend/di.xml
index d3e5c07861c84..35eb9d4f8b53c 100644
--- a/app/code/Magento/Theme/etc/frontend/di.xml
+++ b/app/code/Magento/Theme/etc/frontend/di.xml
@@ -26,11 +26,9 @@
     <type name="Magento\Framework\Controller\ResultInterface">
         <plugin name="result-messages" type="Magento\Theme\Controller\Result\MessagePlugin"/>
     </type>
-    <type name="Magento\Framework\App\Response\Http">
-        <plugin name="asyncCssLoad" type="Magento\Theme\Controller\Result\AsyncCssPlugin"/>
-    </type>
     <type name="Magento\Framework\View\Result\Layout">
-        <plugin name="deferJsToFooter" type="Magento\Theme\Controller\Result\JsFooterPlugin" sortOrder="-10"/>
+        <plugin name="asyncCssLoad" type="Magento\Theme\Controller\Result\AsyncCssPlugin" />
+        <plugin name="deferJsToFooter" type="Magento\Theme\Controller\Result\JsFooterPlugin" sortOrder="-10" />
     </type>
     <type name="Magento\Theme\Block\Html\Header\CriticalCss">
         <arguments>
diff --git a/app/code/Magento/Theme/view/frontend/layout/default_head_blocks.xml b/app/code/Magento/Theme/view/frontend/layout/default_head_blocks.xml
index 96f8fbed4c041..1e5a4578602ca 100644
--- a/app/code/Magento/Theme/view/frontend/layout/default_head_blocks.xml
+++ b/app/code/Magento/Theme/view/frontend/layout/default_head_blocks.xml
@@ -18,6 +18,7 @@
                     <argument name="criticalCssViewModel" xsi:type="object">Magento\Theme\Block\Html\Header\CriticalCss</argument>
                 </arguments>
             </block>
+            <!-- Todo: Block css_rel_preload_script will be removed in next release as polyfill isn't used anymore -->
             <block name="css_rel_preload_script" ifconfig="dev/css/use_css_critical_path" template="Magento_Theme::js/css_rel_preload.phtml"/>
         </referenceBlock>
         <referenceContainer name="after.body.start">
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/main_css_preloader.phtml b/app/code/Magento/Theme/view/frontend/templates/html/main_css_preloader.phtml
index 6c2f17b6ffb08..70c2a5f4538fa 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/main_css_preloader.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/main_css_preloader.phtml
@@ -4,12 +4,17 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/**
+ * @var \Magento\Framework\View\Element\Template $block
+ * @var \Magento\Framework\Escaper $escaper
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
+
 ?>
 <div data-role="main-css-loader" class="loading-mask">
     <div class="loader">
-        <img src="<?= $block->escapeUrl($block->getViewFileUrl('images/loader-1.gif')); ?>"
-             alt="<?= $block->escapeHtml(__('Loading...')); ?>">
+        <img src="<?= $escaper->escapeUrl($block->getViewFileUrl('images/loader-1.gif')); ?>"
+             alt="<?= $escaper->escapeHtml(__('Loading...')); ?>">
     </div>
     <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
         "position: absolute;",
diff --git a/app/code/Magento/Theme/view/frontend/templates/js/css_rel_preload.phtml b/app/code/Magento/Theme/view/frontend/templates/js/css_rel_preload.phtml
index 11a388a0fec20..2df684ccffee1 100644
--- a/app/code/Magento/Theme/view/frontend/templates/js/css_rel_preload.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/js/css_rel_preload.phtml
@@ -2,12 +2,12 @@
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
+ * @deprecated as polyfill isn't used anymore
  */
 
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
-?>
 
-<?php $scriptString = <<<script
+$scriptString = <<<script
 
     /*! loadCSS rel=preload polyfill. [c]2017 Filament Group, Inc. MIT License */
     !function(t){"use strict";t.loadCSS||(t.loadCSS=function(){});var e=loadCSS.relpreload={};
@@ -24,5 +24,3 @@
     ("undefined"!=typeof global?global:this);
 
 script;
-?>
-<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php b/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php
index 8f1771759cee0..1046c678e253a 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Interception/PluginListGeneratorTest.php
@@ -11,8 +11,14 @@
 use Magento\Framework\Filesystem\DriverInterface;
 use Magento\TestFramework\Application;
 use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
 
-class PluginListGeneratorTest extends \PHPUnit\Framework\TestCase
+/**
+ * Provide tests for PluginListGeneratorTest
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class PluginListGeneratorTest extends TestCase
 {
     /**
      * Generated plugin list config for frontend scope
@@ -93,8 +99,7 @@ public function testPluginListConfigGeneration()
         $expected = [
             1 => [
                 0 => 'genericHeaderPlugin',
-                1 => 'asyncCssLoad',
-                2 => 'response-http-page-cache'
+                1 => 'response-http-page-cache'
             ]
         ];
         // Here in test is assumed that this class below has 3 plugins. But the amount of plugins and class itself
@@ -104,6 +109,7 @@ public function testPluginListConfigGeneration()
             $configData[2],
             'Processed plugin does not exist in the processed plugins array.'
         );
+
         $this->assertSame(
             $expected,
             $configData[2]['Magento\\Framework\\App\\Response\\Http_sendResponse___self'],
@@ -116,7 +122,7 @@ public function testPluginListConfigGeneration()
      *
      * @return array
      */
-    private function getCustomDirs()
+    private function getCustomDirs(): array
     {
         $path = DirectoryList::PATH;
         $generated = "{$this->application->getTempDir()}/generated";

From 1104896c8444624903c835bfc0c040158c7847f2 Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Fri, 7 Aug 2020 10:11:27 -0500
Subject: [PATCH 1364/1718] MC-36204: Update M2 PayPal BN codes

---
 .../framework/Magento/TestFramework/Dependency/PhpRule.php   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev/tests/static/framework/Magento/TestFramework/Dependency/PhpRule.php b/dev/tests/static/framework/Magento/TestFramework/Dependency/PhpRule.php
index 2076daf811fb1..6fdeeb816f2cf 100644
--- a/dev/tests/static/framework/Magento/TestFramework/Dependency/PhpRule.php
+++ b/dev/tests/static/framework/Magento/TestFramework/Dependency/PhpRule.php
@@ -167,8 +167,9 @@ private function caseClassesAndIdentifiers($currentModule, $file, &$contents)
                 '[_\\\\]|',
                 Files::init()->getNamespaces()
             )
-            . '[_\\\\])[a-zA-Z0-9]+)'
-            . '(?<class_inside_module>[a-zA-Z0-9_\\\\]*))\b(?:::(?<module_scoped_key>[a-z0-9_]+)[\'"])?~';
+            . '(?<delimiter>[_\\\\]))[a-zA-Z0-9]{2,})'
+            . '(?<class_inside_module>\\4[a-zA-Z0-9_\\\\]{2,})?)\b'
+            . '(?:::(?<module_scoped_key>[A-Za-z0-9_/.]+)[\'"])?~';
 
         if (!preg_match_all($pattern, $contents, $matches)) {
             return [];

From 369b3a00dd7f3f72250486bba6d24b1a0426421c Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Fri, 7 Aug 2020 17:54:50 +0300
Subject: [PATCH 1365/1718] magento/magento2-login-as-customer#150: Opt-in/out
 - tests fix.

---
 ...CustomerWithWebSiteAndGroupActionGroup.xml |  14 +
 ...AdminCustomerAccountInformationSection.xml |  14 +
 ...merSettingsAvailableForGlobalLevelTest.xml |  40 ---
 composer.lock                                 | 274 +++++++-----------
 4 files changed, 137 insertions(+), 205 deletions(-)
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebSiteAndGroupActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
 delete mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSettingsAvailableForGlobalLevelTest.xml

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebSiteAndGroupActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebSiteAndGroupActionGroup.xml
new file mode 100644
index 0000000000000..e7f55e69b1cda
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebSiteAndGroupActionGroup.xml
@@ -0,0 +1,14 @@
+<?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="AdminCreateCustomerWithWebSiteAndGroupActionGroup">
+        <conditionalClick selector="{{AdminCustomerAccountInformationSection.assistanceAllowed}}" dependentSelector="{{AdminCustomerAccountInformationSection.assistanceAllowed}}" visible="true" stepKey="clickAllowAssistance" after="FillEmail"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
new file mode 100644
index 0000000000000..1a31afad3fbf0
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminCustomerAccountInformationSection.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="AdminCustomerAccountInformationSection">
+        <element name="assistanceAllowed" type="button" selector="//input[@name='customer[extension_attributes][assistance_allowed]']/../label"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSettingsAvailableForGlobalLevelTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSettingsAvailableForGlobalLevelTest.xml
deleted file mode 100644
index 807603bdcba0a..0000000000000
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSettingsAvailableForGlobalLevelTest.xml
+++ /dev/null
@@ -1,40 +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="AdminLoginAsCustomerSettingsAvailableForGlobalLevelTest">
-        <annotations>
-            <features value="Login as Customer"/>
-            <stories value="'Login as Customer' settings are available only for global level"/>
-            <title value="Verify all 'Login as Customer' settings are available for global level"/>
-            <description value="'Login as Customer' settings are available for global level"/>
-            <severity value="MAJOR"/>
-            <group value="login_as_customer"/>
-        </annotations>
-        <before>
-            <actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
-        </before>
-        <after>
-            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
-        </after>
-
-        <amOnPage url="{{AdminLoginAsCustomerConfigPage.url}}" stepKey="navigateToLoginAsCustomerConfigSection"/>
-        <actionGroup ref="AdminAssertLoginAsCustomerConfigVisibleActionGroup" stepKey="seeLoginAsCustomerConfig"/>
-
-        <actionGroup ref="SwitchToTheNewStoreViewActionGroup" stepKey="switchToDefaultStoreView">
-            <argument name="storeViewName" value="'Default Store View'"/>
-        </actionGroup>
-        <actionGroup ref="AdminAssertLoginAsCustomerSectionLinkNotAvailableActionGroup" stepKey="dontSeeLoginAsCustomerSectionLinkOnStoreView"/>
-
-        <actionGroup ref="SwitchToTheNewStoreViewActionGroup" stepKey="switchToDefaultWebsite">
-            <argument name="storeViewName" value="'Main Website'"/>
-        </actionGroup>
-        <actionGroup ref="AdminAssertLoginAsCustomerSectionLinkNotAvailableActionGroup" stepKey="dontSeeLoginAsCustomerSectionLink"/>
-    </test>
-</tests>
diff --git a/composer.lock b/composer.lock
index 90131292fe956..534f3e31ed1a1 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": "5b074864c62821207d8994a4aca444fe",
+    "content-hash": "0b51badfd1978bb34febd90226af9e27",
     "packages": [
         {
             "name": "colinmollenhour/cache-backend-file",
@@ -220,16 +220,16 @@
         },
         {
             "name": "composer/composer",
-            "version": "1.10.9",
+            "version": "1.10.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/composer.git",
-                "reference": "83c3250093d5491600a822e176b107a945baf95a"
+                "reference": "32966a3b1d48bc01472a8321fd6472b44fad033a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/83c3250093d5491600a822e176b107a945baf95a",
-                "reference": "83c3250093d5491600a822e176b107a945baf95a",
+                "url": "https://api.github.com/repos/composer/composer/zipball/32966a3b1d48bc01472a8321fd6472b44fad033a",
+                "reference": "32966a3b1d48bc01472a8321fd6472b44fad033a",
                 "shasum": ""
             },
             "require": {
@@ -310,7 +310,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-07-16T10:57:00+00:00"
+            "time": "2020-08-03T09:35:19+00:00"
         },
         {
             "name": "composer/semver",
@@ -1356,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"
         },
         {
@@ -2269,16 +2263,16 @@
         },
         {
             "name": "laminas/laminas-mail",
-            "version": "2.11.0",
+            "version": "2.12.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-mail.git",
-                "reference": "4c5545637eea3dc745668ddff1028692ed004c4b"
+                "reference": "a85bd6ec20ebc382498cc1d3086dfe3fa201849b"
             },
             "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/a85bd6ec20ebc382498cc1d3086dfe3fa201849b",
+                "reference": "a85bd6ec20ebc382498cc1d3086dfe3fa201849b",
                 "shasum": ""
             },
             "require": {
@@ -2288,7 +2282,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": {
@@ -2298,8 +2292,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",
@@ -2307,10 +2301,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"
@@ -2337,7 +2327,7 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2020-06-30T20:17:23+00:00"
+            "time": "2020-08-06T14:33:28+00:00"
         },
         {
             "name": "laminas/laminas-math",
@@ -3329,12 +3319,6 @@
                 "laminas",
                 "zf"
             ],
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
             "time": "2020-05-20T16:45:56+00:00"
         },
         {
@@ -3501,16 +3485,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": {
@@ -3584,7 +3568,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-05-22T07:31:27+00:00"
+            "time": "2020-07-23T08:35:51+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -4376,16 +4360,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"
         },
         {
@@ -4434,16 +4408,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v4.4.10",
+            "version": "v4.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "326b064d804043005526f5a0494cfb49edb59bb0"
+                "reference": "55d07021da933dd0d633ffdab6f45d5b230c7e02"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/326b064d804043005526f5a0494cfb49edb59bb0",
-                "reference": "326b064d804043005526f5a0494cfb49edb59bb0",
+                "url": "https://api.github.com/repos/symfony/console/zipball/55d07021da933dd0d633ffdab6f45d5b230c7e02",
+                "reference": "55d07021da933dd0d633ffdab6f45d5b230c7e02",
                 "shasum": ""
             },
             "require": {
@@ -4521,11 +4495,11 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-05-30T20:06:45+00:00"
+            "time": "2020-07-06T13:18:39+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v5.1.2",
+            "version": "v5.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
@@ -4592,16 +4566,16 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v4.4.10",
+            "version": "v4.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "a5370aaa7807c7a439b21386661ffccf3dff2866"
+                "reference": "6140fc7047dafc5abbe84ba16a34a86c0b0229b8"
             },
             "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/6140fc7047dafc5abbe84ba16a34a86c0b0229b8",
+                "reference": "6140fc7047dafc5abbe84ba16a34a86c0b0229b8",
                 "shasum": ""
             },
             "require": {
@@ -4672,7 +4646,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-05-20T08:37:50+00:00"
+            "time": "2020-06-18T17:59:13+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -4752,7 +4726,7 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v5.1.2",
+            "version": "v5.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
@@ -4816,7 +4790,7 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v5.1.2",
+            "version": "v5.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
@@ -4879,7 +4853,7 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.18.0",
+            "version": "v1.18.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
@@ -4955,16 +4929,16 @@
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.18.0",
+            "version": "v1.18.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "bc6549d068d0160e0f10f7a5a23c7d1406b95ebe"
+                "reference": "5dcab1bc7146cf8c1beaa4502a3d9be344334251"
             },
             "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/5dcab1bc7146cf8c1beaa4502a3d9be344334251",
+                "reference": "5dcab1bc7146cf8c1beaa4502a3d9be344334251",
                 "shasum": ""
             },
             "require": {
@@ -5036,11 +5010,11 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-07-14T12:35:20+00:00"
+            "time": "2020-08-04T06:02:08+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.18.0",
+            "version": "v1.18.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
@@ -5121,7 +5095,7 @@
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.18.0",
+            "version": "v1.18.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
@@ -5198,7 +5172,7 @@
         },
         {
             "name": "symfony/polyfill-php70",
-            "version": "v1.18.0",
+            "version": "v1.18.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php70.git",
@@ -5275,7 +5249,7 @@
         },
         {
             "name": "symfony/polyfill-php72",
-            "version": "v1.18.0",
+            "version": "v1.18.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
@@ -5348,7 +5322,7 @@
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.18.0",
+            "version": "v1.18.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
@@ -5424,7 +5398,7 @@
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.18.0",
+            "version": "v1.18.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
@@ -5504,20 +5478,20 @@
         },
         {
             "name": "symfony/process",
-            "version": "v4.4.10",
+            "version": "v4.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "c714958428a85c86ab97e3a0c96db4c4f381b7f5"
+                "reference": "65e70bab62f3da7089a8d4591fb23fbacacb3479"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/c714958428a85c86ab97e3a0c96db4c4f381b7f5",
-                "reference": "c714958428a85c86ab97e3a0c96db4c4f381b7f5",
+                "url": "https://api.github.com/repos/symfony/process/zipball/65e70bab62f3da7089a8d4591fb23fbacacb3479",
+                "reference": "65e70bab62f3da7089a8d4591fb23fbacacb3479",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3"
+                "php": ">=7.1.3"
             },
             "type": "library",
             "extra": {
@@ -5563,7 +5537,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-05-30T20:06:45+00:00"
+            "time": "2020-07-23T08:31:43+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -6063,16 +6037,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.147.1",
+            "version": "3.147.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "8a561a4a1645ccdd06413a4f2defe55d35e0eecc"
+                "reference": "2ac5757aee4333c382c222880a51bd56930dafc4"
             },
             "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/2ac5757aee4333c382c222880a51bd56930dafc4",
+                "reference": "2ac5757aee4333c382c222880a51bd56930dafc4",
                 "shasum": ""
             },
             "require": {
@@ -6144,7 +6118,7 @@
                 "s3",
                 "sdk"
             ],
-            "time": "2020-07-20T18:18:31+00:00"
+            "time": "2020-08-06T18:18:37+00:00"
         },
         {
             "name": "beberlei/assert",
@@ -7523,16 +7497,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "1.0.69",
+            "version": "1.0.70",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "7106f78428a344bc4f643c233a94e48795f10967"
+                "reference": "585824702f534f8d3cf7fab7225e8466cc4b7493"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/7106f78428a344bc4f643c233a94e48795f10967",
-                "reference": "7106f78428a344bc4f643c233a94e48795f10967",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/585824702f534f8d3cf7fab7225e8466cc4b7493",
+                "reference": "585824702f534f8d3cf7fab7225e8466cc4b7493",
                 "shasum": ""
             },
             "require": {
@@ -7543,7 +7517,7 @@
                 "league/flysystem-sftp": "<1.0.6"
             },
             "require-dev": {
-                "phpspec/phpspec": "^3.4",
+                "phpspec/phpspec": "^3.4 || ^4.0 || ^5.0 || ^6.0",
                 "phpunit/phpunit": "^5.7.26"
             },
             "suggest": {
@@ -7609,7 +7583,7 @@
                     "type": "other"
                 }
             ],
-            "time": "2020-05-18T15:13:39+00:00"
+            "time": "2020-07-26T07:20:36+00:00"
         },
         {
             "name": "lusitanian/oauth",
@@ -7855,25 +7829,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"
@@ -7881,7 +7855,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.5-dev"
+                    "dev-master": "2.6-dev"
                 }
             },
             "autoload": {
@@ -7908,7 +7882,7 @@
                 "json",
                 "jsonpath"
             ],
-            "time": "2019-12-30T18:03:34+00:00"
+            "time": "2020-07-31T21:01:56+00:00"
         },
         {
             "name": "mustache/mustache",
@@ -8827,20 +8801,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"
         },
         {
@@ -8971,16 +8931,16 @@
         },
         {
             "name": "phpunit/php-invoker",
-            "version": "3.0.2",
+            "version": "3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-invoker.git",
-                "reference": "f6eedfed1085dd1f4c599629459a0277d25f9a66"
+                "reference": "7a85b66acc48cacffdf87dadd3694e7123674298"
             },
             "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/7a85b66acc48cacffdf87dadd3694e7123674298",
+                "reference": "7a85b66acc48cacffdf87dadd3694e7123674298",
                 "shasum": ""
             },
             "require": {
@@ -8996,7 +8956,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "3.1-dev"
                 }
             },
             "autoload": {
@@ -9026,7 +8986,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-06-26T11:53:53+00:00"
+            "time": "2020-08-06T07:04:15+00:00"
         },
         {
             "name": "phpunit/php-text-template",
@@ -9130,26 +9090,20 @@
             "keywords": [
                 "timer"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-04-20T06:00:37+00:00"
         },
         {
             "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": {
@@ -9191,7 +9145,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-06-27T06:36:25+00:00"
+            "time": "2020-08-04T08:28:15+00:00"
         },
         {
             "name": "phpunit/phpunit",
@@ -9279,16 +9233,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"
         },
         {
@@ -10342,16 +10286,16 @@
         },
         {
             "name": "symfony/config",
-            "version": "v5.1.2",
+            "version": "v5.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "b8623ef3d99fe62a34baf7a111b576216965f880"
+                "reference": "cf63f0613a6c6918e96db39c07a43b01e19a0773"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/b8623ef3d99fe62a34baf7a111b576216965f880",
-                "reference": "b8623ef3d99fe62a34baf7a111b576216965f880",
+                "url": "https://api.github.com/repos/symfony/config/zipball/cf63f0613a6c6918e96db39c07a43b01e19a0773",
+                "reference": "cf63f0613a6c6918e96db39c07a43b01e19a0773",
                 "shasum": ""
             },
             "require": {
@@ -10418,20 +10362,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-05-23T13:08:13+00:00"
+            "time": "2020-07-15T10:53:22+00:00"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v5.1.2",
+            "version": "v5.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "6508423eded583fc07e88a0172803e1a62f0310c"
+                "reference": "c45c3f26d2ae7c5239e5ad420b0c2717dbbc0bcb"
             },
             "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/c45c3f26d2ae7c5239e5ad420b0c2717dbbc0bcb",
+                "reference": "c45c3f26d2ae7c5239e5ad420b0c2717dbbc0bcb",
                 "shasum": ""
             },
             "require": {
@@ -10507,7 +10451,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-06-12T08:11:32+00:00"
+            "time": "2020-07-23T08:36:24+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -10575,16 +10519,16 @@
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v5.1.2",
+            "version": "v5.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "f93055171b847915225bd5b0a5792888419d8d75"
+                "reference": "1f0d6627e680591c61e9176f04a0dc887b4e6702"
             },
             "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/1f0d6627e680591c61e9176f04a0dc887b4e6702",
+                "reference": "1f0d6627e680591c61e9176f04a0dc887b4e6702",
                 "shasum": ""
             },
             "require": {
@@ -10646,20 +10590,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-06-15T06:52:54+00:00"
+            "time": "2020-07-23T10:04:31+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v5.1.2",
+            "version": "v5.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "c0c418f05e727606e85b482a8591519c4712cf45"
+                "reference": "149fb0ad35aae3c7637b496b38478797fa6a7ea6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/c0c418f05e727606e85b482a8591519c4712cf45",
-                "reference": "c0c418f05e727606e85b482a8591519c4712cf45",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/149fb0ad35aae3c7637b496b38478797fa6a7ea6",
+                "reference": "149fb0ad35aae3c7637b496b38478797fa6a7ea6",
                 "shasum": ""
             },
             "require": {
@@ -10723,20 +10667,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-06-09T15:07:35+00:00"
+            "time": "2020-07-23T10:04:31+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v5.1.2",
+            "version": "v5.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "663f5dd5e14057d1954fe721f9709d35837f2447"
+                "reference": "9ff59517938f88d90b6e65311fef08faa640f681"
             },
             "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/9ff59517938f88d90b6e65311fef08faa640f681",
+                "reference": "9ff59517938f88d90b6e65311fef08faa640f681",
                 "shasum": ""
             },
             "require": {
@@ -10793,11 +10737,11 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-05-23T13:08:13+00:00"
+            "time": "2020-07-12T12:58:00+00:00"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v5.1.2",
+            "version": "v5.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
@@ -10861,7 +10805,7 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v5.1.2",
+            "version": "v5.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",

From 1e094db3b1fb9f2a07764c27f7e3542877e3043b Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Fri, 7 Aug 2020 18:21:59 +0300
Subject: [PATCH 1366/1718] Correct mftf selectors

---
 ...AdminEnhancedMediaGalleryEnableMassActionModeActionGroup.xml | 2 +-
 .../Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryEnableMassActionModeActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryEnableMassActionModeActionGroup.xml
index 4b0375088509b..68499d3815f4c 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryEnableMassActionModeActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryEnableMassActionModeActionGroup.xml
@@ -14,6 +14,6 @@
         </annotations>
 
         <waitForElementVisible selector="{{AdminEnhancedMediaGalleryMassActionSection.deleteSelected}}" stepKey="waitForMassActionButton"/>
-        <click selector="{{AdminEnhancedMediaGalleryMassActionSection.deleteSelected}}" stepKey="clickOnMassActionButton"/>
+        <click selector="{{AdminEnhancedMediaGalleryMassActionSection.deleteImages}}" stepKey="clickOnMassActionButton"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml
index ff5b9751dbe1f..07f2dc23530e1 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml
@@ -11,6 +11,7 @@
         <element name="massActionCheckbox" type="button" selector="//input[@type='checkbox'][@data-ui-id ='{{imageName}}']" parameterized="true"/>
         <element name="totalSelected" type="text" selector=".mediagallery-massaction-items-count > .selected_count_text"/>
         <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"/>
     </section>
 </sections>

From 9a165e6d6d94b2727ed2c4c4eb57465814980e5f Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Fri, 7 Aug 2020 18:27:34 +0300
Subject: [PATCH 1367/1718] change wait selector

---
 ...AdminEnhancedMediaGalleryEnableMassActionModeActionGroup.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryEnableMassActionModeActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryEnableMassActionModeActionGroup.xml
index 68499d3815f4c..5e5c89637c6a1 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryEnableMassActionModeActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryEnableMassActionModeActionGroup.xml
@@ -13,7 +13,7 @@
             <description>Activate massaction mode by click on Delete Selected..</description>
         </annotations>
 
-        <waitForElementVisible selector="{{AdminEnhancedMediaGalleryMassActionSection.deleteSelected}}" stepKey="waitForMassActionButton"/>
+        <waitForElementVisible selector="{{AdminEnhancedMediaGalleryMassActionSection.deleteImages}}" stepKey="waitForMassActionButton"/>
         <click selector="{{AdminEnhancedMediaGalleryMassActionSection.deleteImages}}" stepKey="clickOnMassActionButton"/>
     </actionGroup>
 </actionGroups>

From c72447ff51cf095595bbe47b67afe0d45d5b0941 Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Fri, 7 Aug 2020 23:33:10 +0800
Subject: [PATCH 1368/1718] 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 500ac10f4745a..222cfde1385f7 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 bb81570724038af1697ce6046c996fbb4f69358f Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Sat, 8 Aug 2020 02:59:19 +0800
Subject: [PATCH 1369/1718] magento/adobe-stock-integration#1710: Dynamically
 identify the root categoryId for category grid - modified hard coded value

---
 .../Ui/Component/Listing/Columns/Path.php                   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/Path.php b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/Path.php
index 38569f5f698da..f780a116baf9e 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/Path.php
+++ b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/Path.php
@@ -6,6 +6,8 @@
 namespace Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Columns;
 
 use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Model\Category;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Ui\Component\Listing\Columns\Column;
@@ -63,13 +65,15 @@ public function prepareDataSource(array $dataSource)
      * Replace category path ids with category names
      *
      * @param string $pathWithIds
+     * @return string
+     * @throws NoSuchEntityException
      */
     private function getCategoryPathWithNames(string $pathWithIds): string
     {
         $categoryPathWithName = '';
         $categoryIds = explode('/', $pathWithIds);
         foreach ($categoryIds as $id) {
-            if ($id == 1) {
+            if ($id == Category::TREE_ROOT_ID) {
                 continue;
             }
             $categoryName = $this->categoryRepository->get($id)->getName();

From e5110e08cd23bf7a89ca53e3fad8c187220f917f Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Fri, 7 Aug 2020 18:57:20 -0500
Subject: [PATCH 1370/1718] MC-36554: Customer should be able to re-use the
 payflowPro_cc_vault as payment method for subsequent orders - Added impl to
 use vault public hash

---
 .../SetPaymentMethodOnCart.php                | 92 +++++++++++++++++++
 app/code/Magento/PaypalGraphQl/composer.json  |  3 +-
 .../Magento/PaypalGraphQl/etc/graphql/di.xml  |  2 +
 .../Magento/PaypalGraphQl/etc/schema.graphqls |  7 +-
 4 files changed, 102 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/PayflowProCcVault/SetPaymentMethodOnCart.php

diff --git a/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/PayflowProCcVault/SetPaymentMethodOnCart.php b/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/PayflowProCcVault/SetPaymentMethodOnCart.php
new file mode 100644
index 0000000000000..0e9ea38a634da
--- /dev/null
+++ b/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/PayflowProCcVault/SetPaymentMethodOnCart.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\PaypalGraphQl\Model\Plugin\Cart\PayflowProCcVault;
+
+use Magento\Quote\Model\Quote;
+use Magento\QuoteGraphQl\Model\Cart\Payment\AdditionalDataProviderPool;
+use Magento\Sales\Model\Order\Payment\Repository as PaymentRepository;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+use Magento\Vault\Api\PaymentTokenManagementInterface;
+
+/**
+ * Set additionalInformation on payment for PayflowPro vault method
+ */
+class SetPaymentMethodOnCart
+{
+    const CC_VAULT_CODE = 'payflowpro_cc_vault';
+
+    /**
+     * @var PaymentRepository
+     */
+    private $paymentRepository;
+
+    /**
+     * @var AdditionalDataProviderPool
+     */
+    private $additionalDataProviderPool;
+
+    /**
+     * PaymentTokenManagementInterface $paymentTokenManagement
+     */
+    private $paymentTokenManagement;
+
+    /**
+     * @param PaymentRepository $paymentRepository
+     * @param AdditionalDataProviderPool $additionalDataProviderPool
+     * @param PaymentTokenManagementInterface $paymentTokenManagement
+     */
+    public function __construct(
+        PaymentRepository $paymentRepository,
+        AdditionalDataProviderPool $additionalDataProviderPool,
+        PaymentTokenManagementInterface $paymentTokenManagement
+    ) {
+        $this->paymentRepository = $paymentRepository;
+        $this->additionalDataProviderPool = $additionalDataProviderPool;
+        $this->paymentTokenManagement = $paymentTokenManagement;
+    }
+
+    /**
+     * Set public hash and customer id on payment additionalInformation
+     *
+     * @param \Magento\QuoteGraphQl\Model\Cart\SetPaymentMethodOnCart $subject
+     * @param mixed $result
+     * @param Quote $cart
+     * @param array $additionalData
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function afterExecute(
+        \Magento\QuoteGraphQl\Model\Cart\SetPaymentMethodOnCart $subject,
+        $result,
+        Quote $cart,
+        array $additionalData
+    ): void {
+        $additionalData = $this->additionalDataProviderPool->getData(self::CC_VAULT_CODE, $additionalData);
+        $customerId = (int) $cart->getCustomer()->getId();
+        $payment = $cart->getPayment();
+        if (!is_array($additionalData) || !isset($additionalData[PaymentTokenInterface::PUBLIC_HASH])) {
+            return;
+        }
+        $tokenPublicHash = $additionalData[PaymentTokenInterface::PUBLIC_HASH];
+        if ($tokenPublicHash === null) {
+            return;
+        }
+        $paymentToken = $this->paymentTokenManagement->getByPublicHash($tokenPublicHash, $customerId);
+        if ($paymentToken === null) {
+            return;
+        }
+        $payment->setAdditionalInformation(
+            [
+                PaymentTokenInterface::CUSTOMER_ID => $customerId,
+                PaymentTokenInterface::PUBLIC_HASH => $tokenPublicHash
+            ]
+        );
+        $payment->save();
+    }
+}
diff --git a/app/code/Magento/PaypalGraphQl/composer.json b/app/code/Magento/PaypalGraphQl/composer.json
index 13864e54fa1f5..285217da64d72 100644
--- a/app/code/Magento/PaypalGraphQl/composer.json
+++ b/app/code/Magento/PaypalGraphQl/composer.json
@@ -13,7 +13,8 @@
         "magento/module-quote-graph-ql": "*",
         "magento/module-sales": "*",
         "magento/module-payment": "*",
-        "magento/module-store": "*"
+        "magento/module-store": "*",
+        "magento/module-vault": "*"
     },
     "suggest": {
         "magento/module-graph-ql": "*",
diff --git a/app/code/Magento/PaypalGraphQl/etc/graphql/di.xml b/app/code/Magento/PaypalGraphQl/etc/graphql/di.xml
index f1b99295f5627..f5f22050fe50a 100644
--- a/app/code/Magento/PaypalGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/PaypalGraphQl/etc/graphql/di.xml
@@ -12,6 +12,7 @@
     <type name="Magento\QuoteGraphQl\Model\Cart\SetPaymentMethodOnCart">
         <plugin name="hosted_pro_payment_method" type="Magento\PaypalGraphQl\Model\Plugin\Cart\HostedPro\SetPaymentMethodOnCart"/>
         <plugin name="payflowpro_payment_method" type="Magento\PaypalGraphQl\Model\Plugin\Cart\PayflowPro\SetPaymentMethodOnCart"/>
+        <plugin name="payflowpro_cc_vault_payment_method" type="Magento\PaypalGraphQl\Model\Plugin\Cart\PayflowProCcVault\SetPaymentMethodOnCart"/>
     </type>
     <type name="Magento\Paypal\Model\Payflowlink">
         <plugin name="payflow_link_update_redirect_urls" type="Magento\PaypalGraphQl\Model\Plugin\Payflowlink"/>
@@ -51,6 +52,7 @@
                 <item name="payflow_advanced" xsi:type="object">Magento\PaypalGraphQl\Model\PayflowLinkAdditionalDataProvider</item>
                 <item name="payflowpro" xsi:type="object">\Magento\PaypalGraphQl\Model\PayflowProAdditionalDataProvider</item>
                 <item name="hosted_pro" xsi:type="object">\Magento\PaypalGraphQl\Model\HostedProAdditionalDataProvider</item>
+                <item name="payflowpro_cc_vault" xsi:type="object">\Magento\PaypalGraphQl\Model\PayflowProCcVaultAdditionalDataProvider</item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/PaypalGraphQl/etc/schema.graphqls b/app/code/Magento/PaypalGraphQl/etc/schema.graphqls
index 52b0a6ec97518..cdc8ee6fda2f3 100644
--- a/app/code/Magento/PaypalGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/PaypalGraphQl/etc/schema.graphqls
@@ -37,7 +37,7 @@ type PayflowLinkToken @doc(description:"Contains information used to generate Pa
     paypal_url: String @doc(description:"PayPal URL used for requesting Payflow form")
 }
 
-type HostedProUrl @doc(desription:"Contains secure URL used for Payments Pro Hosted Solution payment method.") {
+type HostedProUrl @doc(description:"Contains secure URL used for Payments Pro Hosted Solution payment method.") {
     secure_form_url: String @doc(description:"Secure Url generated by PayPal")
 }
 
@@ -51,6 +51,7 @@ input PaymentMethodInput {
     payflow_link: PayflowLinkInput @doc(description:"Required input for PayPal Payflow Link and Payments Advanced payments")
     payflowpro: PayflowProInput @doc(description: "Required input type for PayPal Payflow Pro and Payment Pro payments")
     hosted_pro: HostedProInput @doc(description:"Required input for PayPal Hosted pro payments")
+    payflowpro_cc_vault: VaultTokenInput @doc(description:"Required input type for PayPal Payflow Pro vault payments")
 }
 
 input HostedProInput @doc(description:"A set of relative URLs that PayPal will use in response to various actions during the authorization process. Magento prepends the base URL to this value to create a full URL. For example, if the full URL is https://www.example.com/path/to/page.html, the relative URL is path/to/page.html. Use this input for Payments Pro Hosted Solution payment method.") {
@@ -146,3 +147,7 @@ type PayflowProResponseOutput {
 type StoreConfig {
     payment_payflowpro_cc_vault_active: String @doc(description: "Payflow Pro vault status.")
 }
+
+input VaultTokenInput @doc(description:"Required input for payment methods with Vault support.") {
+    public_hash: String! @doc(description: "The public hash of the payment token")
+}

From a8a37370c5e3556fa9fe19716eee81f6d3382ea3 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Fri, 7 Aug 2020 19:58:57 -0500
Subject: [PATCH 1371/1718] MC-20639: MyAccount :: Order Details :: Refund
 (creditMemo) Details by Order Number

---
 .../Resolver/Order/Item/BundleOptions.php     |   7 +-
 .../Magento/BundleGraphQl/etc/schema.graphqls |   2 +-
 .../Magento/GraphQl/Sales/CreditmemoTest.php  | 133 ++++++++++++++++++
 3 files changed, 138 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/BundleGraphQl/Model/Resolver/Order/Item/BundleOptions.php b/app/code/Magento/BundleGraphQl/Model/Resolver/Order/Item/BundleOptions.php
index 8af5361db1039..a21bbbb84d735 100644
--- a/app/code/Magento/BundleGraphQl/Model/Resolver/Order/Item/BundleOptions.php
+++ b/app/code/Magento/BundleGraphQl/Model/Resolver/Order/Item/BundleOptions.php
@@ -16,6 +16,7 @@
 use Magento\Sales\Api\Data\InvoiceItemInterface;
 use Magento\Sales\Api\Data\OrderItemInterface;
 use Magento\Sales\Api\Data\ShipmentItemInterface;
+use Magento\Sales\Api\Data\CreditmemoItemInterface;
 
 /**
  * Resolve bundle options items for order item
@@ -56,12 +57,12 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
                 throw new LocalizedException(__('"model" value should be specified'));
             }
             if ($value['model'] instanceof OrderItemInterface) {
-                /** @var OrderItemInterface $item */
                 $item = $value['model'];
                 return $this->getBundleOptions($item, $value);
             }
-            if ($value['model'] instanceof InvoiceItemInterface || $value['model'] instanceof ShipmentItemInterface) {
-                /** @var InvoiceItemInterface|ShipmentItemInterface $item */
+            if ($value['model'] instanceof InvoiceItemInterface
+                || $value['model'] instanceof ShipmentItemInterface
+                || $value['model'] instanceof CreditmemoItemInterface) {
                 $item = $value['model'];
                 // Have to pass down order and item to map to avoid refetching all data
                 return $this->getBundleOptions($item->getOrderItem(), $value);
diff --git a/app/code/Magento/BundleGraphQl/etc/schema.graphqls b/app/code/Magento/BundleGraphQl/etc/schema.graphqls
index f00ce513677a9..a66fa397020a7 100644
--- a/app/code/Magento/BundleGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/BundleGraphQl/etc/schema.graphqls
@@ -101,7 +101,7 @@ type BundleShipmentItem implements ShipmentItemInterface {
 }
 
 type BundleCreditMemoItem implements CreditMemoItemInterface {
-    bundle_options: [ItemSelectedBundleOption] @doc(description: "A list of bundle options that are assigned to the bundle product")
+    bundle_options: [ItemSelectedBundleOption] @doc(description: "A list of bundle options that are assigned to the bundle product") @resolver(class: "Magento\\BundleGraphQl\\Model\\Resolver\\Order\\Item\\BundleOptions")
 }
 
 type ItemSelectedBundleOption @doc(description: "A list of options of the selected bundle product") {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
index 8aa7950bdc1ee..fcb3ae34ec9e1 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
@@ -195,6 +195,46 @@ public function testCreditMemoForBundledProductsWithPartialRefund()
 
         $this->creditMemoService->refund($creditMemo, true);
         $response = $this->getCustomerOrderWithCreditMemoQuery();
+        $expectedInvoicesData = [
+            [
+                'items' => [
+                    [
+                        'product_name' => 'Bundle Product With Two dropdown options',
+                        'product_sku' => 'bundle-product-two-dropdown-options-simple1-simple2',
+                        'product_sale_price' => [
+                            'value' => 15
+                        ],
+                        'discounts' => [],
+                        'bundle_options' => [
+                            [
+                                'label' => 'Drop Down Option 1',
+                                'values' => [
+                                    [
+                                        'product_name' => 'Simple Product1',
+                                        'product_sku' => 'simple1',
+                                        'quantity' => 1,
+                                        'price' => ['value' => 1, 'currency' => 'USD']
+                                    ]
+                                ]
+                            ],
+                            [
+                                'label' => 'Drop Down Option 2',
+                                'values' => [
+                                    [
+                                        'product_name' => 'Simple Product2',
+                                        'product_sku' => 'simple2',
+                                        'quantity' => 2,
+                                        'price' => ['value' => 2, 'currency' => 'USD']
+                                    ]
+                                ]
+                            ]
+                        ],
+                        'quantity_invoiced' => 2
+                    ],
+
+                ]
+            ]
+        ];
         $expectedCreditMemoData = [
             [
                 'comments' => [
@@ -208,6 +248,30 @@ public function testCreditMemoForBundledProductsWithPartialRefund()
                             'value' => 15
                         ],
                         'discounts' => [],
+                        'bundle_options' => [
+                            [
+                                'label' => 'Drop Down Option 1',
+                                'values' => [
+                                    [
+                                        'product_name' => 'Simple Product1',
+                                        'product_sku' => 'simple1',
+                                        'quantity' => 1,
+                                        'price' => ['value' => 1, 'currency' => 'USD']
+                                    ]
+                                ]
+                            ],
+                            [
+                                'label' => 'Drop Down Option 2',
+                                'values' => [
+                                    [
+                                        'product_name' => 'Simple Product2',
+                                        'product_sku' => 'simple2',
+                                        'quantity' => 2,
+                                        'price' => ['value' => 2, 'currency' => 'USD']
+                                    ]
+                                ]
+                            ]
+                        ],
                         'quantity_refunded' => 1
                     ],
 
@@ -250,6 +314,11 @@ public function testCreditMemoForBundledProductsWithPartialRefund()
             ]
         ];
         $firstOrderItem = current($response['customer']['orders']['items'] ?? []);
+
+        $this->assertArrayHasKey('invoices', $firstOrderItem);
+        $invoices = $firstOrderItem['invoices'];
+        $this->assertResponseFields($invoices, $expectedInvoicesData);
+
         $this->assertArrayHasKey('credit_memos', $firstOrderItem);
         $creditMemos = $firstOrderItem['credit_memos'];
         $this->assertResponseFields($creditMemos, $expectedCreditMemoData);
@@ -320,6 +389,30 @@ public function testCreditMemoForBundleProductWithTaxesAndDiscounts()
                                 'label' => 'Discount Label for 10% off'
                             ]
                         ],
+                        'bundle_options' => [
+                            [
+                                'label' => 'Drop Down Option 1',
+                                'values' => [
+                                    [
+                                        'product_name' => 'Simple Product1',
+                                        'product_sku' => 'simple1',
+                                        'quantity' => 1,
+                                        'price' => ['value' => 1, 'currency' => 'USD']
+                                    ]
+                                ]
+                            ],
+                            [
+                                'label' => 'Drop Down Option 2',
+                                'values' => [
+                                    [
+                                        'product_name' => 'Simple Product2',
+                                        'product_sku' => 'simple2',
+                                        'quantity' => 2,
+                                        'price' => ['value' => 2, 'currency' => 'USD']
+                                    ]
+                                ]
+                            ]
+                        ],
                         'quantity_refunded' => 1
                     ],
 
@@ -453,6 +546,32 @@ private function getCustomerOrderWithCreditMemoQuery(): array
   customer {
     orders {
         items {
+            invoices {
+               items {
+                    product_name
+                    product_sku
+                    product_sale_price {
+                        value
+                    }
+                    ... on BundleInvoiceItem {
+                      bundle_options {
+                        label
+                        values {
+                          product_sku
+                          product_name
+                          quantity
+                          price {
+                            value
+                            currency
+                          }
+                        }
+                      }
+                    }
+                    discounts { amount{value currency} label }
+                    quantity_invoiced
+                    discounts { amount{value currency} label }
+               }
+            }
             credit_memos {
                 comments {
                     message
@@ -463,6 +582,20 @@ private function getCustomerOrderWithCreditMemoQuery(): array
                     product_sale_price {
                         value
                     }
+                    ... on BundleCreditMemoItem {
+                      bundle_options {
+                        label
+                        values {
+                          product_sku
+                          product_name
+                          quantity
+                          price {
+                            value
+                            currency
+                          }
+                        }
+                      }
+                    }
                     discounts { amount{value currency} label }
                     quantity_refunded
                 }

From de27ae48cca9cff0a54ebdc041f6b5c361d0c3e4 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Sat, 8 Aug 2020 11:38:42 -0500
Subject: [PATCH 1372/1718] MC-20639: MyAccount :: Order Details :: Refund
 (creditMemo) Details by Order Number

---
 .../testsuite/Magento/GraphQl/Sales/CreditmemoTest.php          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
index fcb3ae34ec9e1..cca2b5a66407c 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CreditmemoTest.php
@@ -161,6 +161,7 @@ public function testCreditMemoForLoggedInCustomerQuery(): void
      *
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Bundle/_files/bundle_product_two_dropdown_options.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function testCreditMemoForBundledProductsWithPartialRefund()
     {
@@ -537,6 +538,7 @@ private function cleanUpCreditMemos(): void
      *
      * @return array
      * @throws AuthenticationException
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     private function getCustomerOrderWithCreditMemoQuery(): array
     {

From c4e51f39a21b76f3f2d1f19dd47fbd655d14a134 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Sat, 8 Aug 2020 12:51:32 -0500
Subject: [PATCH 1373/1718] MC-20639: MyAccount :: Order Details :: Refund
 (creditMemo) Details by Order Number

---
 .../SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoItems.php  | 2 +-
 .../SalesGraphQl/Model/Resolver/Invoice/InvoiceItems.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoItems.php b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoItems.php
index 39ec964fae289..e1cee27e93f87 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoItems.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoItems.php
@@ -94,7 +94,7 @@ private function getCreditMemoItems(OrderInterface $order, array $creditMemoItem
                 $orderItemModel = $orderItem['model'];
                 if (!$orderItemModel->getParentItem()) {
                     $creditMemoItemData = $this->getCreditMemoItemData($order, $creditMemoItem);
-                    if (isset($creditMemoItemData)) {
+                    if (!empty($creditMemoItemData)) {
                         $orderItems[$creditMemoItem->getOrderItemId()] = $creditMemoItemData;
                     }
                 }
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceItems.php b/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceItems.php
index 9c38720e0e8c9..1e9d282d80d94 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceItems.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceItems.php
@@ -93,7 +93,7 @@ public function getInvoiceItems(OrderInterface $order, array $invoiceItems): \Cl
                 $orderItemModel = $orderItem['model'];
                 if (!$orderItemModel->getParentItem()) {
                     $invoiceItemData = $this->getInvoiceItemData($order, $invoiceItem);
-                    if (isset($invoiceItemData)) {
+                    if (!empty($invoiceItemData)) {
                         $itemsList[$invoiceItem->getOrderItemId()] = $invoiceItemData;
                     }
                 }

From ee0dd0f905d3c1d3b3b4a4afe94118bd51e5aa0b 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 1374/1718] 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 811c4ad9f6082d464de8bef410f2b31eda9d4a4e 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 1375/1718] 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 88923fa23b33b86a1ad483fe962a8f405616a692 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 1376/1718] 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 7cb33b04fa9bbf17b6611e4e69e251447dcabdad Mon Sep 17 00:00:00 2001
From: Serhii Balko <serhii.balko@transoftgroup.com>
Date: Mon, 10 Aug 2020 03:20:45 +0300
Subject: [PATCH 1377/1718] MC-36250: Variable might not be defined

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

diff --git a/app/code/Magento/Wishlist/Model/Wishlist.php b/app/code/Magento/Wishlist/Model/Wishlist.php
index 9624eebc197a9..437b3c757f9cf 100644
--- a/app/code/Magento/Wishlist/Model/Wishlist.php
+++ b/app/code/Magento/Wishlist/Model/Wishlist.php
@@ -475,6 +475,7 @@ public function addNewItem($product, $buyRequest = null, $forciblySetQty = false
             $_buyRequest = $buyRequest;
         } elseif (is_string($buyRequest)) {
             $isInvalidItemConfiguration = false;
+            $buyRequestData = [];
             try {
                 $buyRequestData = $this->serializer->unserialize($buyRequest);
                 if (!is_array($buyRequestData)) {
@@ -515,6 +516,7 @@ public function addNewItem($product, $buyRequest = null, $forciblySetQty = false
 
         $errors = [];
         $items = [];
+        $item = null;
 
         foreach ($cartCandidates as $candidate) {
             if ($candidate->getParentProductId()) {

From 8761d17876b6b09095be9df9f79b4d43b2da310e Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Sun, 9 Aug 2020 21:41:08 -0500
Subject: [PATCH 1378/1718] magento2/issues/29113 Customers should be able to
 enable/disable Admin "remote shopping assistance"

---
 .../Block/Adminhtml/NotAllowedPopup.php                     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomerAssistance/Block/Adminhtml/NotAllowedPopup.php b/app/code/Magento/LoginAsCustomerAssistance/Block/Adminhtml/NotAllowedPopup.php
index fe28b46e81d47..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
 {
@@ -68,11 +66,11 @@ public function getJsLayout()
     /**
      * @inheritdoc
      */
-    protected function _toHtml()
+    public function toHtml()
     {
         if (!$this->config->isEnabled()) {
             return '';
         }
-        return parent::_toHtml();
+        return parent::toHtml();
     }
 }

From b033dff7097408837e43ac1e62a9ff1294fb11b8 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 10 Aug 2020 00:19:33 -0500
Subject: [PATCH 1379/1718] magento2/issues/29113 Customers should be able to
 enable/disable Admin "remote shopping assistance"

---
 .../Resolver/IsLoginAsCustomerEnabledResolver.php    |  8 ++++----
 app/code/Magento/LoginAsCustomer/etc/di.xml          |  4 +---
 .../IsLoginAsCustomerEnabledForCustomerChain.php     | 10 +++++-----
 app/code/Magento/LoginAsCustomerApi/etc/di.xml       | 12 ++++++++++++
 .../Processor/IsLoginAsCustomerAllowedResolver.php   |  8 ++++----
 .../Magento/LoginAsCustomerAssistance/composer.json  |  1 -
 .../Magento/LoginAsCustomerAssistance/etc/di.xml     |  2 +-
 7 files changed, 27 insertions(+), 18 deletions(-)
 rename app/code/Magento/{LoginAsCustomer => LoginAsCustomerApi}/Model/IsLoginAsCustomerEnabledForCustomerChain.php (81%)
 create mode 100644 app/code/Magento/LoginAsCustomerApi/etc/di.xml

diff --git a/app/code/Magento/LoginAsCustomer/Model/Resolver/IsLoginAsCustomerEnabledResolver.php b/app/code/Magento/LoginAsCustomer/Model/Resolver/IsLoginAsCustomerEnabledResolver.php
index de16a798983c0..89cb960e78bb8 100644
--- a/app/code/Magento/LoginAsCustomer/Model/Resolver/IsLoginAsCustomerEnabledResolver.php
+++ b/app/code/Magento/LoginAsCustomer/Model/Resolver/IsLoginAsCustomerEnabledResolver.php
@@ -7,7 +7,7 @@
 
 namespace Magento\LoginAsCustomer\Model\Resolver;
 
-use Magento\LoginAsCustomer\Model\IsLoginAsCustomerEnabledForCustomerResultFactory;
+use Magento\LoginAsCustomerApi\Api\Data\IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory;
 use Magento\LoginAsCustomerApi\Api\ConfigInterface;
 use Magento\LoginAsCustomerApi\Api\Data\IsLoginAsCustomerEnabledForCustomerResultInterface;
 use Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerEnabledForCustomerInterface;
@@ -23,17 +23,17 @@ class IsLoginAsCustomerEnabledResolver implements IsLoginAsCustomerEnabledForCus
     private $config;
 
     /**
-     * @var IsLoginAsCustomerEnabledForCustomerResultFactory
+     * @var IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory
      */
     private $resultFactory;
 
     /**
      * @param ConfigInterface $config
-     * @param IsLoginAsCustomerEnabledForCustomerResultFactory $resultFactory
+     * @param IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory $resultFactory
      */
     public function __construct(
         ConfigInterface $config,
-        IsLoginAsCustomerEnabledForCustomerResultFactory $resultFactory
+        IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory $resultFactory
     ) {
         $this->config = $config;
         $this->resultFactory = $resultFactory;
diff --git a/app/code/Magento/LoginAsCustomer/etc/di.xml b/app/code/Magento/LoginAsCustomer/etc/di.xml
index e9e4983957d31..2d5c05b971716 100755
--- a/app/code/Magento/LoginAsCustomer/etc/di.xml
+++ b/app/code/Magento/LoginAsCustomer/etc/di.xml
@@ -23,9 +23,7 @@
     <preference for="Magento\LoginAsCustomerApi\Api\GetLoggedAsCustomerCustomerIdInterface" type="Magento\LoginAsCustomer\Model\GetLoggedAsCustomerCustomerId"/>
     <preference for="Magento\LoginAsCustomerApi\Api\SetLoggedAsCustomerAdminIdInterface" type="Magento\LoginAsCustomer\Model\SetLoggedAsCustomerAdminId"/>
     <preference for="Magento\LoginAsCustomerApi\Api\SetLoggedAsCustomerCustomerIdInterface" type="Magento\LoginAsCustomer\Model\SetLoggedAsCustomerCustomerId"/>
-    <preference for="Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerEnabledForCustomerInterface"
-                type="Magento\LoginAsCustomer\Model\IsLoginAsCustomerEnabledForCustomerChain"/>
-    <type name="Magento\LoginAsCustomer\Model\IsLoginAsCustomerEnabledForCustomerChain">
+    <type name="Magento\LoginAsCustomerApi\Model\IsLoginAsCustomerEnabledForCustomerChain">
         <arguments>
             <argument name="resolvers" xsi:type="array">
                 <item name="is_enabled" xsi:type="object">
diff --git a/app/code/Magento/LoginAsCustomer/Model/IsLoginAsCustomerEnabledForCustomerChain.php b/app/code/Magento/LoginAsCustomerApi/Model/IsLoginAsCustomerEnabledForCustomerChain.php
similarity index 81%
rename from app/code/Magento/LoginAsCustomer/Model/IsLoginAsCustomerEnabledForCustomerChain.php
rename to app/code/Magento/LoginAsCustomerApi/Model/IsLoginAsCustomerEnabledForCustomerChain.php
index d57e57a9c9d39..c7bc6b7ae29bf 100644
--- a/app/code/Magento/LoginAsCustomer/Model/IsLoginAsCustomerEnabledForCustomerChain.php
+++ b/app/code/Magento/LoginAsCustomerApi/Model/IsLoginAsCustomerEnabledForCustomerChain.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\LoginAsCustomer\Model;
+namespace Magento\LoginAsCustomerApi\Model;
 
 use Magento\LoginAsCustomerApi\Api\ConfigInterface;
 use Magento\LoginAsCustomerApi\Api\Data\IsLoginAsCustomerEnabledForCustomerResultInterface;
@@ -22,7 +22,7 @@ class IsLoginAsCustomerEnabledForCustomerChain implements IsLoginAsCustomerEnabl
     private $config;
 
     /**
-     * @var IsLoginAsCustomerEnabledForCustomerResultFactory
+     * @var IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory
      */
     private $resultFactory;
 
@@ -33,12 +33,12 @@ class IsLoginAsCustomerEnabledForCustomerChain implements IsLoginAsCustomerEnabl
 
     /**
      * @param ConfigInterface $config
-     * @param IsLoginAsCustomerEnabledForCustomerResultFactory $resultFactory
+     * @param IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory $resultFactory
      * @param array $resolvers
      */
     public function __construct(
         ConfigInterface $config,
-        IsLoginAsCustomerEnabledForCustomerResultFactory $resultFactory,
+        IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory $resultFactory,
         array $resolvers = []
     ) {
         $this->config = $config;
@@ -52,7 +52,7 @@ public function __construct(
     public function execute(int $customerId): IsLoginAsCustomerEnabledForCustomerResultInterface
     {
         $messages = [[]];
-        /** @var IsLoginAsCustomerEnabledForCustomerResultInterface $resolver */
+        /** @var IsLoginAsCustomerEnabledForCustomerInterface $resolver */
         foreach ($this->resolvers as $resolver) {
             $resolverResult = $resolver->execute($customerId);
             if (!$resolverResult->isEnabled()) {
diff --git a/app/code/Magento/LoginAsCustomerApi/etc/di.xml b/app/code/Magento/LoginAsCustomerApi/etc/di.xml
new file mode 100644
index 0000000000000..18915f8f16267
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerApi/etc/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">
+    <preference for="Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerEnabledForCustomerInterface"
+                type="Magento\LoginAsCustomerApi\Model\IsLoginAsCustomerEnabledForCustomerChain"/>
+</config>
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Model/Processor/IsLoginAsCustomerAllowedResolver.php b/app/code/Magento/LoginAsCustomerAssistance/Model/Processor/IsLoginAsCustomerAllowedResolver.php
index f2de34c507f62..966ea477b2394 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/Model/Processor/IsLoginAsCustomerAllowedResolver.php
+++ b/app/code/Magento/LoginAsCustomerAssistance/Model/Processor/IsLoginAsCustomerAllowedResolver.php
@@ -7,7 +7,7 @@
 
 namespace Magento\LoginAsCustomerAssistance\Model\Processor;
 
-use Magento\LoginAsCustomer\Model\IsLoginAsCustomerEnabledForCustomerResultFactory;
+use Magento\LoginAsCustomerApi\Api\Data\IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory;
 use Magento\LoginAsCustomerApi\Api\Data\IsLoginAsCustomerEnabledForCustomerResultInterface;
 use Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerEnabledForCustomerInterface;
 use Magento\LoginAsCustomerAssistance\Api\IsAssistanceEnabledInterface;
@@ -23,17 +23,17 @@ class IsLoginAsCustomerAllowedResolver implements IsLoginAsCustomerEnabledForCus
     private $isAssistanceEnabled;
 
     /**
-     * @var IsLoginAsCustomerEnabledForCustomerResultFactory
+     * @var IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory
      */
     private $resultFactory;
 
     /**
      * @param IsAssistanceEnabledInterface $isAssistanceEnabled
-     * @param IsLoginAsCustomerEnabledForCustomerResultFactory $resultFactory
+     * @param IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory $resultFactory
      */
     public function __construct(
         IsAssistanceEnabledInterface $isAssistanceEnabled,
-        IsLoginAsCustomerEnabledForCustomerResultFactory $resultFactory
+        IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory $resultFactory
     ) {
         $this->isAssistanceEnabled = $isAssistanceEnabled;
         $this->resultFactory = $resultFactory;
diff --git a/app/code/Magento/LoginAsCustomerAssistance/composer.json b/app/code/Magento/LoginAsCustomerAssistance/composer.json
index 6a902304b7f5d..21d644fbffb01 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/composer.json
+++ b/app/code/Magento/LoginAsCustomerAssistance/composer.json
@@ -6,7 +6,6 @@
         "magento/framework": "*",
         "magento/module-backend": "*",
         "magento/module-customer": "*",
-        "magento/module-login-as-customer": "*",
         "magento/module-login-as-customer-api": "*"
     },
     "suggest": {
diff --git a/app/code/Magento/LoginAsCustomerAssistance/etc/di.xml b/app/code/Magento/LoginAsCustomerAssistance/etc/di.xml
index bcfd7a1392083..0cbf3b4d10da6 100755
--- a/app/code/Magento/LoginAsCustomerAssistance/etc/di.xml
+++ b/app/code/Magento/LoginAsCustomerAssistance/etc/di.xml
@@ -13,7 +13,7 @@
                 type="Magento\LoginAsCustomerAssistance\Model\IsAssistanceEnabled"/>
     <preference for="Magento\LoginAsCustomerAssistance\Api\SetAssistanceInterface"
                 type="Magento\LoginAsCustomerAssistance\Model\SetAssistance"/>
-    <type name="Magento\LoginAsCustomer\Model\IsLoginAsCustomerEnabledForCustomerChain">
+    <type name="Magento\LoginAsCustomerApi\Model\IsLoginAsCustomerEnabledForCustomerChain">
         <arguments>
             <argument name="resolvers" xsi:type="array">
                 <item name="is_allowed" xsi:type="object">

From 9618526ddf7273a2d82a2ed4c087ca9a6b0024a1 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 10 Aug 2020 00:39:11 -0500
Subject: [PATCH 1380/1718] magento2/issues/29113 Customers should be able to
 enable/disable Admin "remote shopping assistance"

---
 .../Model/IsLoginAsCustomerEnabledForCustomerChain.php           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/LoginAsCustomerApi/Model/IsLoginAsCustomerEnabledForCustomerChain.php b/app/code/Magento/LoginAsCustomerApi/Model/IsLoginAsCustomerEnabledForCustomerChain.php
index c7bc6b7ae29bf..c852327743760 100644
--- a/app/code/Magento/LoginAsCustomerApi/Model/IsLoginAsCustomerEnabledForCustomerChain.php
+++ b/app/code/Magento/LoginAsCustomerApi/Model/IsLoginAsCustomerEnabledForCustomerChain.php
@@ -9,6 +9,7 @@
 
 use Magento\LoginAsCustomerApi\Api\ConfigInterface;
 use Magento\LoginAsCustomerApi\Api\Data\IsLoginAsCustomerEnabledForCustomerResultInterface;
+use Magento\LoginAsCustomerApi\Api\Data\IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory;
 use Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerEnabledForCustomerInterface;
 
 /**

From 2f2ceb64f6b1d8808960bf2e4ca36fafbb06f73f Mon Sep 17 00:00:00 2001
From: Benjamin Rosenberger <rosenberger@e-conomix.at>
Date: Mon, 10 Aug 2020 07:42:56 +0200
Subject: [PATCH 1381/1718] :speech_balloon: fix typo in php doc

---
 .../Downloadable/Block/Sales/Order/Email/Items/Downloadable.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php b/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php
index dbf8eacbd7848..a6ca4ef4067b1 100644
--- a/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php
@@ -12,7 +12,7 @@
 use Magento\Store\Model\ScopeInterface;
 
 /**
- * Downlaodable Sales Order Email items renderer
+ * Downloadable Sales Order Email items renderer
  *
  * @api
  * @since 100.0.2

From cde0ebbdf541795fe084a7889f10468b0aabd319 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Mon, 10 Aug 2020 01:47:33 -0500
Subject: [PATCH 1382/1718] magento2/issues/29113 Customers should be able to
 enable/disable Admin "remote shopping assistance"

---
 app/code/Magento/LoginAsCustomerAssistance/composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/LoginAsCustomerAssistance/composer.json b/app/code/Magento/LoginAsCustomerAssistance/composer.json
index 21d644fbffb01..6abf1a65e6715 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/composer.json
+++ b/app/code/Magento/LoginAsCustomerAssistance/composer.json
@@ -9,7 +9,8 @@
         "magento/module-login-as-customer-api": "*"
     },
     "suggest": {
-        "magento/module-login-as-customer-admin-ui": "*"
+        "magento/module-login-as-customer-admin-ui": "*",
+        "magento/module-login-as-customer": "*"
     },
     "type": "magento2-module",
     "license": [

From c30dd6029f88beada07e2a1f95ff74904eb8365b Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Mon, 10 Aug 2020 10:11:43 +0300
Subject: [PATCH 1383/1718] add unit test

---
 .../Framework/View/Test/Unit/LayoutTest.php   | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/lib/internal/Magento/Framework/View/Test/Unit/LayoutTest.php b/lib/internal/Magento/Framework/View/Test/Unit/LayoutTest.php
index 23f35dfab7cc8..31606b55f6519 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/LayoutTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/LayoutTest.php
@@ -19,6 +19,7 @@
 use Magento\Framework\View\Element\AbstractBlock;
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Layout;
+use Magento\Framework\View\Layout\BuilderInterface;
 use Magento\Framework\View\Layout\Data\Structure as LayoutStructure;
 use Magento\Framework\View\Layout\Element;
 use Magento\Framework\View\Layout\Generator\Block;
@@ -1169,4 +1170,27 @@ public function renderElementDisplayDataProvider(): array
             [null],
         ];
     }
+
+    /**
+     * Test render element with exception
+     *
+     * @return void
+     */
+    public function testRenderNonCachedElementWithException(): void
+    {
+        $exception = new \Exception('Error message');
+
+        $builderMock = $this->createMock(BuilderInterface::class);
+        $builderMock->expects($this->once())
+            ->method('build')
+            ->willThrowException($exception);
+
+        $this->loggerMock->expects($this->once())
+            ->method('critical')
+            ->with($exception);
+
+        $model = clone $this->model;
+        $model->setBuilder($builderMock);
+        $model->renderNonCachedElement('test_container');
+    }
 }

From 0abb31377a0a29fabee6cba5472fc8e3335941db Mon Sep 17 00:00:00 2001
From: Stas Kozar <stas.kozar@transoftgroup.com>
Date: Mon, 10 Aug 2020 12:08:27 +0300
Subject: [PATCH 1384/1718] MC-35475: Wrong design for Admin Customer Edit Page
 on Safari browser

---
 .../catalog/product/composite/configure.phtml | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
index cca63009d5606..5ca88689b9e5f 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
@@ -7,7 +7,8 @@
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 $blockId = $block->getId();
 ?>
-<div id="product_composite_configure" class="product-configure-popup product-configure-popup-<?= $block->escapeHtmlAttr($blockId) ?>">
+<div id="product_composite_configure"
+     class="product-configure-popup product-configure-popup-<?= $block->escapeHtmlAttr($blockId) ?>">
     <iframe name="product_composite_configure_iframe" id="product_composite_configure_iframe"></iframe>
     <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
         'onload',
@@ -39,7 +40,9 @@ $blockId = $block->getId();
     <div id="product_composite_configure_confirmed" class="product_composite_configure_confirmed"></div>
 
     <?php $scriptString = <<<script
-        prodCompConfIframe = document.querySelector(".product-configure-popup-$blockId iframe[name='product_composite_configure_iframe']");
+        prodCompConfIframe = document.querySelector(
+            ".product-configure-popup-$blockId iframe[name='product_composite_configure_iframe']"
+        );
         prodCompConfIframe.style.width = 0;
         prodCompConfIframe.style.height = 0;
         prodCompConfIframe.style.border = "0px solid #fff";
@@ -47,16 +50,24 @@ $blockId = $block->getId();
         prodCompConfIframe.style.top = "-1000px";
         prodCompConfIframe.style.left = "-1000px";
 
-        prodCompConfMessages = document.querySelector(".product-configure-popup-$blockId .product_composite_configure_messages");
+        prodCompConfMessages = document.querySelector(
+            ".product-configure-popup-$blockId .product_composite_configure_messages"
+        );
         prodCompConfMessages.style.display = "none";
 
-        prodCompConfFormAdd = document.querySelector(".product-configure-popup-$blockId .product_composite_configure_form_additional");
+        prodCompConfFormAdd = document.querySelector(
+            ".product-configure-popup-$blockId .product_composite_configure_form_additional"
+        );
         prodCompConfFormAdd.style.display = "none";
 
-        prodCompConfFormConf = document.querySelector(".product-configure-popup-$blockId .product_composite_configure_form_confirmed");
+        prodCompConfFormConf = document.querySelector(
+            ".product-configure-popup-$blockId .product_composite_configure_form_confirmed"
+        );
         prodCompConfFormConf.style.display = "none";
 
-        prodCompConfConf = document.querySelector(".product-configure-popup-$blockId .product_composite_configure_confirmed");
+        prodCompConfConf = document.querySelector(
+            ".product-configure-popup-$blockId .product_composite_configure_confirmed"
+        );
         prodCompConfConf.style.display = "none";
 
         prodConfPopup = document.querySelector(".product-configure-popup-$blockId");

From 7f1ab1be9eacd54ceaa86fb53375b05f20b12d92 Mon Sep 17 00:00:00 2001
From: Viktor Petryk <victor.petryk@transoftgroup.com>
Date: Mon, 10 Aug 2020 12:35:22 +0300
Subject: [PATCH 1385/1718] MC-35218: [MFTF]
 VerifyCategoryProductAndProductCategoryPartialReindexTest failed often
 (MC-11386)

---
 .../Catalog/Test/Mftf/Data/CategoryData.xml   |   4 +
 .../Test/Mftf/Metadata/CategoryMeta.xml       |   8 +
 ...ctAndProductCategoryPartialReindexTest.xml | 234 ++++++++++++++++++
 ...ctAndProductCategoryPartialReindexTest.xml |   7 +-
 4 files changed, 251 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/StorefrontVerifyCategoryProductAndProductCategoryPartialReindexTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
index daf4809a4781a..9639bc39b45f4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CategoryData.xml
@@ -265,4 +265,8 @@
         <data key="level">0</data>
         <var key="parent_id" entityType="category" entityKey="id"/>
     </entity>
+    <entity name="AssignProductToCategory" type="category_product_link">
+        <var key="category_id" entityKey="id" entityType="category"/>
+        <var key="sku" entityKey="sku" entityType="product"/>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/CategoryMeta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/CategoryMeta.xml
index ae491aefc10cf..c0a92b7e1d1ad 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Metadata/CategoryMeta.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/CategoryMeta.xml
@@ -57,4 +57,12 @@
     <operation name="DeleteCategory" dataType="category" type="delete" auth="adminOauth" url="/V1/categories/{id}" method="DELETE">
         <contentType>application/json</contentType>
     </operation>
+
+    <operation name="AssignProductToCategory" dataType="category_product_link" type="create" auth="adminOauth" url="/V1/categories/{id}/products" method="POST">
+        <contentType>application/json</contentType>
+        <object key="productLink" dataType="category_product_link">
+            <field key="sku">string</field>
+            <field key="category_id">string</field>
+        </object>
+    </operation>
 </operations>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontVerifyCategoryProductAndProductCategoryPartialReindexTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontVerifyCategoryProductAndProductCategoryPartialReindexTest.xml
new file mode 100644
index 0000000000000..14001ecbb52af
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontVerifyCategoryProductAndProductCategoryPartialReindexTest.xml
@@ -0,0 +1,234 @@
+<?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="StorefrontVerifyCategoryProductAndProductCategoryPartialReindexTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Product Categories Indexer"/>
+            <title value="Verify Category Product and Product Category partial reindex"/>
+            <description value="Verify that Merchant Developer can use console commands to perform partial reindex for Category Products, Product Categories, and Catalog Search"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-11386"/>
+            <useCaseId value="MAGETWO-88184"/>
+            <group value="catalog"/>
+            <group value="indexer"/>
+        </annotations>
+        <before>
+            <!-- Change "Category Products", "Product Categories" and "Catalog Search" indexers to "Update by Schedule" mode -->
+            <magentoCLI command="indexer:set-mode" arguments="schedule catalog_category_product catalog_product_category catalogsearch_fulltext" stepKey="setIndexerMode"/>
+
+            <!-- Create categories K, L, M, N with different nesting in the tree and Anchor = Yes/No-->
+            <!-- Category K is an anchor category -->
+            <createData entity="_defaultCategory" stepKey="categoryK"/>
+            <!-- Category L is a non-anchor subcategory of category K -->
+            <createData entity="SubCategoryNonAnchor" stepKey="categoryL">
+                <requiredEntity createDataKey="categoryK"/>
+            </createData>
+            <!-- Category M is a subcategory of category L -->
+            <createData entity="SubCategoryWithParent" stepKey="categoryM">
+                <requiredEntity createDataKey="categoryL"/>
+            </createData>
+            <!-- Category N is a subcategory of category K -->
+            <createData entity="SubCategoryWithParent" stepKey="categoryN">
+                <requiredEntity createDataKey="categoryK"/>
+            </createData>
+
+            <!-- Create different Products with different settings, assign to categories: -->
+            <!-- Product A in 0 categories, i.e. not assigned to any category -->
+            <createData entity="SimpleProduct2" stepKey="productA"/>
+            <!-- Product B in 1 category M -->
+            <createData entity="SimpleProduct3" stepKey="productB">
+                <requiredEntity createDataKey="categoryM"/>
+            </createData>
+            <!-- Product C in 2 categories M and N -->
+            <createData entity="SimpleProduct2" stepKey="productC"/>
+            <createData entity="AssignProductToCategory" stepKey="assignCategoryMToProductC">
+                <requiredEntity createDataKey="categoryM"/>
+                <requiredEntity createDataKey="productC"/>
+            </createData>
+            <createData entity="AssignProductToCategory" stepKey="assignCategoryNToProductC">
+                <requiredEntity createDataKey="categoryN"/>
+                <requiredEntity createDataKey="productC"/>
+            </createData>
+            <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
+        </before>
+        <after>
+            <!-- Change indexers to "Update on Save" mode -->
+            <magentoCLI command="indexer:set-mode" arguments="realtime" stepKey="setRealtimeMode"/>
+
+            <!-- Delete data -->
+            <deleteData createDataKey="productA" stepKey="deleteProductA"/>
+            <deleteData createDataKey="productB" stepKey="deleteProductB"/>
+            <deleteData createDataKey="productC" stepKey="deleteProductC"/>
+            <deleteData createDataKey="categoryN" stepKey="deleteCategoryN"/>
+            <deleteData createDataKey="categoryM" stepKey="deleteCategoryM"/>
+            <deleteData createDataKey="categoryL" stepKey="deleteCategoryL"/>
+            <deleteData createDataKey="categoryK" stepKey="deleteCategoryK"/>
+            <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
+        </after>
+
+        <!-- Open categories K, L, M, N on Storefront -->
+        <!-- Category K contains only Products B & C -->
+        <amOnPage url="{{StorefrontCategoryPage.url($categoryK.custom_attributes[url_key]$)}}" stepKey="onCategoryK"/>
+        <see userInput="$productB.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProductBOnCategoryK"/>
+        <see userInput="$productC.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProductCOnCategoryK"/>
+        <dontSee userInput="$productA.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeProductAOnCategoryK"/>
+
+        <!-- Category L contains no Products -->
+        <amOnPage url="{{StorefrontCategoryPage.url($categoryK.custom_attributes[url_key]$/$categoryL.custom_attributes[url_key]$)}}" stepKey="onCategoryL"/>
+        <see userInput="We can't find products matching the selection." selector="{{StorefrontCategoryMainSection.emptyProductMessage}}" stepKey="seeMessage"/>
+        <dontSeeElement selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontseeProducts"/>
+
+        <!-- Category M contains only Products B & C -->
+        <amOnPage url="{{StorefrontCategoryPage.url($categoryK.custom_attributes[url_key]$/$categoryL.custom_attributes[url_key]$/$categoryM.custom_attributes[url_key]$)}}" stepKey="onCategoryM"/>
+        <see userInput="$productB.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProductBOnCategoryM"/>
+        <see userInput="$productC.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProductCOnCategoryM"/>
+        <dontSee userInput="$productA.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeProductAOnCategoryM"/>
+
+        <!-- Category N contains only Product C -->
+        <amOnPage url="{{StorefrontCategoryPage.url($categoryK.custom_attributes[url_key]$/$categoryN.custom_attributes[url_key]$)}}" stepKey="onCategoryN"/>
+        <see userInput="$productC.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProductCOnCategoryN"/>
+        <dontSee userInput="$productA.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeProductAOnCategoryN"/>
+        <dontSee userInput="$productB.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeProductBOnCategoryN"/>
+
+        <!--  Assign category K to Product A -->
+        <createData entity="AssignProductToCategory" stepKey="assignCategoryKToProductA">
+            <requiredEntity createDataKey="categoryK"/>
+            <requiredEntity createDataKey="productA"/>
+        </createData>
+
+        <!--  Unassign category M from Product B -->
+        <deleteData url="/V1/categories/$categoryM.id$/products/$productB.sku$" stepKey="unassignCategoryMFromProductB"/>
+
+        <!--  Assign category L to Product C -->
+        <createData entity="AssignProductToCategory" stepKey="assignCategoryLToProductC">
+            <requiredEntity createDataKey="categoryL"/>
+            <requiredEntity createDataKey="productC"/>
+        </createData>
+
+        <!-- Open categories K, L, M, N on Storefront in order to make sure that new assignments are not applied yet -->
+        <!-- Category K contains only Products B & C -->
+        <amOnPage url="{{StorefrontCategoryPage.url($categoryK.custom_attributes[url_key]$)}}" stepKey="amOnCategoryK"/>
+        <see userInput="$productB.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProductBCategoryK"/>
+        <see userInput="$productC.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProductCCategoryK"/>
+        <dontSee userInput="$productA.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeProductACategoryN"/>
+
+        <!-- Category L contains no Products -->
+        <amOnPage url="{{StorefrontCategoryPage.url($categoryK.custom_attributes[url_key]$/$categoryL.custom_attributes[url_key]$)}}" stepKey="amOnCategoryL"/>
+        <see userInput="We can't find products matching the selection." selector="{{StorefrontCategoryMainSection.emptyProductMessage}}" stepKey="seeEmptyMessage"/>
+        <dontSeeElement selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontseeProduct"/>
+
+        <!-- Category M contains only Products B & C -->
+        <amOnPage url="{{StorefrontCategoryPage.url($categoryK.custom_attributes[url_key]$/$categoryL.custom_attributes[url_key]$/$categoryM.custom_attributes[url_key]$)}}" stepKey="amOnCategoryM"/>
+        <see userInput="$productB.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProductBCategoryM"/>
+        <see userInput="$productC.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProductCCategoryM"/>
+        <dontSee userInput="$productA.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeProductAInCategoryM"/>
+
+        <!-- Category N contains only Product C -->
+        <amOnPage url="{{StorefrontCategoryPage.url($categoryK.custom_attributes[url_key]$/$categoryN.custom_attributes[url_key]$)}}" stepKey="amOnCategoryN"/>
+        <see userInput="$productC.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProductInCategoryN"/>
+        <dontSee userInput="$productA.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeProductAInCategoryN"/>
+        <dontSee userInput="$productB.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeProductBInCategoryN"/>
+
+        <!-- Run cron -->
+        <magentoCron groups="index" stepKey="runCronIndex"/>
+
+        <!-- Open categories K, L, M, N on Storefront in order to make sure that new assignments are applied -->
+        <!-- Category K contains only Products A, C -->
+        <amOnPage url="{{StorefrontCategoryPage.url($categoryK.custom_attributes[url_key]$)}}" stepKey="storefrontCategoryK"/>
+        <see userInput="$productA.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProductAOnCategoryK"/>
+        <see userInput="$productC.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeCategoryKWithProductC"/>
+        <dontSee userInput="$productB.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeCategoryKWithProductB"/>
+
+        <!-- Category L contains only Product C -->
+        <amOnPage url="{{StorefrontCategoryPage.url($categoryK.custom_attributes[url_key]$/$categoryL.custom_attributes[url_key]$)}}" stepKey="storefrontCategoryL"/>
+        <see userInput="$productC.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeCategoryLWithProductC"/>
+        <dontSee userInput="$productA.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeCategoryLWithProductA"/>
+        <dontSee userInput="$productB.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeCategoryLWithProductB"/>
+
+        <!-- Category M contains only Product C -->
+        <amOnPage url="{{StorefrontCategoryPage.url($categoryK.custom_attributes[url_key]$/$categoryL.custom_attributes[url_key]$/$categoryM.custom_attributes[url_key]$)}}" stepKey="storefrontCategoryM"/>
+        <waitForPageLoad stepKey="waitForStorefrontCategoryM"/>
+        <see userInput="$productC.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeCategoryMAndProductC"/>
+        <dontSee userInput="$productA.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeCategoryMAndProductA"/>
+        <dontSee userInput="$productB.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeCategoryMAndProductB"/>
+
+        <!-- Category N contains only Product C -->
+        <amOnPage url="{{StorefrontCategoryPage.url($categoryK.custom_attributes[url_key]$/$categoryN.custom_attributes[url_key]$)}}" stepKey="storefrontCategoryN"/>
+        <see userInput="$productC.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProductCAndCategoryN"/>
+        <dontSee userInput="$productA.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeProductAAndCategoryN"/>
+        <dontSee userInput="$productB.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeProductBAndCategoryN"/>
+
+        <!-- Remove Product A assignment for category K -->
+        <deleteData url="/V1/categories/$categoryK.id$/products/$productA.sku$" stepKey="unassignCategoryKFromProductA"/>
+
+        <!-- Remove Product C assignment for category L -->
+        <deleteData url="/V1/categories/$categoryL.id$/products/$productC.sku$" stepKey="unassignCategoryLFromProductC"/>
+
+        <!-- Add Product B assignment for category N -->
+        <createData entity="AssignProductToCategory" stepKey="assignCategoryNToProductB">
+            <requiredEntity createDataKey="categoryN"/>
+            <requiredEntity createDataKey="productB"/>
+        </createData>
+
+        <!-- Open categories K, L, M, N on Storefront in order to make sure that new assignments are not applied yet -->
+        <!-- Category K contains only Products A, C -->
+        <amOnPage url="{{StorefrontCategoryPage.url($categoryK.custom_attributes[url_key]$)}}" stepKey="onStorefrontCategoryK"/>
+        <see userInput="$productA.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProductAWithCategoryK"/>
+        <see userInput="$productC.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProductC"/>
+        <dontSee userInput="$productB.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeProductB"/>
+
+        <!-- Category L contains only Product C -->
+        <amOnPage url="{{StorefrontCategoryPage.url($categoryK.custom_attributes[url_key]$/$categoryL.custom_attributes[url_key]$)}}" stepKey="onStorefrontCategoryL"/>
+        <see userInput="$productC.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeCategoryLAndProductC"/>
+        <dontSee userInput="$productA.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeCategoryLAndProductA"/>
+        <dontSee userInput="$productB.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeCategoryLAndProductB"/>
+
+        <!-- Category M contains only Product C -->
+        <amOnPage url="{{StorefrontCategoryPage.url($categoryK.custom_attributes[url_key]$/$categoryL.custom_attributes[url_key]$/$categoryM.custom_attributes[url_key]$)}}" stepKey="onStorefrontCategoryM"/>
+        <see userInput="$productC.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeCategoryMWithProductC"/>
+        <dontSee userInput="$productA.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeCategoryMWithProductA"/>
+        <dontSee userInput="$productB.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeCategoryMWithProductB"/>
+
+        <!-- Category N contains only Product C -->
+        <amOnPage url="{{StorefrontCategoryPage.url($categoryK.custom_attributes[url_key]$/$categoryN.custom_attributes[url_key]$)}}" stepKey="onStorefrontCategoryN"/>
+        <see userInput="$productC.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="productCOnCategoryN"/>
+        <dontSee userInput="$productA.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeProductAOnTheCategoryN"/>
+        <dontSee userInput="$productB.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeProductBOnTheCategoryN"/>
+
+        <!-- Run Cron once to reindex product changes -->
+        <magentoCron groups="index" stepKey="runCronIndex2"/>
+
+        <!-- Open categories K, L, M, N on Storefront in order to make sure that new assignments are applied -->
+
+        <!-- Category K contains only Products B & C -->
+        <amOnPage url="{{StorefrontCategoryPage.url($categoryK.custom_attributes[url_key]$)}}" stepKey="onFrontendCategoryK"/>
+        <see userInput="$productB.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="productBOnCategoryK"/>
+        <see userInput="$productC.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="productCOnCategoryK"/>
+        <dontSee userInput="$productA.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeProductAOnTheCategoryK"/>
+
+        <!-- Category L contains no Products -->
+        <amOnPage url="{{StorefrontCategoryPage.url($categoryK.custom_attributes[url_key]$/$categoryL.custom_attributes[url_key]$)}}" stepKey="onFrontendCategoryL"/>
+        <see userInput="We can't find products matching the selection." selector="{{StorefrontCategoryMainSection.emptyProductMessage}}" stepKey="noProductsMessage"/>
+        <dontSeeElement selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeProductsOnCategoryL"/>
+
+        <!-- Category M contains only Product C -->
+        <amOnPage url="{{StorefrontCategoryPage.url($categoryK.custom_attributes[url_key]$/$categoryL.custom_attributes[url_key]$/$categoryM.custom_attributes[url_key]$)}}" stepKey="onFrontendCategoryM"/>
+        <see userInput="$productC.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeCategoryMPageAndProductC"/>
+        <dontSee userInput="$productA.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeCategoryMPageAndProductA"/>
+        <dontSee userInput="$productB.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeCategoryMPageAndProductB"/>
+
+        <!-- Category N contains only Products B and C -->
+        <amOnPage url="{{StorefrontCategoryPage.url($categoryK.custom_attributes[url_key]$/$categoryN.custom_attributes[url_key]$)}}" stepKey="onFrontendCategoryN"/>
+        <see userInput="$productB.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProductBAndCategoryN"/>
+        <see userInput="$productC.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="seeProductCCategoryN"/>
+        <dontSee userInput="$productA.name$" selector="{{StorefrontCategoryMainSection.productName}}" stepKey="dontSeeProductAWithCategoryN"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyCategoryProductAndProductCategoryPartialReindexTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyCategoryProductAndProductCategoryPartialReindexTest.xml
index 890b7b69529a1..e7ba97ad36785 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/VerifyCategoryProductAndProductCategoryPartialReindexTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/VerifyCategoryProductAndProductCategoryPartialReindexTest.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="VerifyCategoryProductAndProductCategoryPartialReindexTest">
+    <test name="VerifyCategoryProductAndProductCategoryPartialReindexTest" deprecated="Use StorefrontVerifyCategoryProductAndProductCategoryPartialReindexTest instead.">
         <annotations>
             <features value="Catalog"/>
             <stories value="Product Categories Indexer"/>
-            <title value="Verify Category Product and Product Category partial reindex"/>
+            <title value="DEPRECATED. Verify Category Product and Product Category partial reindex"/>
             <description value="Verify that Merchant Developer can use console commands to perform partial reindex for Category Products, Product Categories, and Catalog Search"/>
             <severity value="BLOCKER"/>
             <testCaseId value="MC-11386"/>
             <group value="catalog"/>
             <group value="indexer"/>
+            <skip>
+                <issueId value="DEPRECATED">Use StorefrontVerifyCategoryProductAndProductCategoryPartialReindexTest instead.</issueId>
+            </skip>
         </annotations>
         <before>
             <!-- Change "Category Products" and "Product Categories" indexers to "Update by Schedule" mode -->

From 2cbe0f065ffe13ff441f1346aee77a06683c644d Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 10 Aug 2020 12:58:32 +0300
Subject: [PATCH 1386/1718] 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 347d9ad8bf6562a759be9452c7a020eb4fb0bcb2 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Mon, 10 Aug 2020 13:04:15 +0300
Subject: [PATCH 1387/1718] magento/magento2-login-as-customer#150: Opt-in/out
 - degradation fix.

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

diff --git a/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php b/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php
index c085201b347ce..bcf5679f206ac 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php
+++ b/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php
@@ -57,8 +57,8 @@ public function beforeExtractData(
         $scope = null,
         $scopeOnly = true
     ): void {
-        if (!$this->authorization->isAllowed('Magento_LoginAsCustomer::opt_in_preference')
-            && $this->isSetAssistanceAllowedParam($request)
+        if ($this->isSetAssistanceAllowedParam($request)
+            && !$this->authorization->isAllowed('Magento_LoginAsCustomer::opt_in_preference')
         ) {
             $customerId = $request->getParam('customer_id');
             $assistanceAllowedParam =

From 34b441d10a1a8cd6efe814a53cd05d64b8d614dc Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 10 Aug 2020 13:04:51 +0300
Subject: [PATCH 1388/1718] 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 088b9009553413398a9cf1e1c887a9988faf69fd Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 10 Aug 2020 13:38:02 +0300
Subject: [PATCH 1389/1718] 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 3305c5e54b861..a76cb8b3b9971 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 GetContentHashInterface $getContentHash
      * @param ExtractMetadataInterface $extractMetadata
@@ -76,7 +64,6 @@ class CreateAssetFromFile
     public function __construct(
         Filesystem $filesystem,
         File $driver,
-        TimezoneInterface $date,
         AssetInterfaceFactory $assetFactory,
         GetContentHashInterface $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('.' . $file->getExtension()),
                 '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 6f08422cfe997a55eeac5c4bf2b73fd63acf6c04 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 1390/1718] 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 24eae9db88feed2ff4f2cd32502ed0a71c3ed5da Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 10 Aug 2020 15:15:44 +0300
Subject: [PATCH 1391/1718] 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 0bcbeb0d7a00f..c2bf6e8f29661 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"/>
     </section>
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 ca957695ed80137dd0921a40c63dddf4006dbd83 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Mon, 10 Aug 2020 15:48:39 +0300
Subject: [PATCH 1392/1718] magento/magento2-login-as-customer#150: Opt-in/out
 - tooltip text scope fix.

---
 .../LoginAsCustomerAssistance/Model/Config.php        | 11 +++++++++--
 .../Magento/LoginAsCustomerAssistance/composer.json   |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomerAssistance/Model/Config.php b/app/code/Magento/LoginAsCustomerAssistance/Model/Config.php
index 33967028f70b9..2fce39cd4e85e 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/Model/Config.php
+++ b/app/code/Magento/LoginAsCustomerAssistance/Model/Config.php
@@ -9,6 +9,7 @@
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\LoginAsCustomerAssistance\Api\ConfigInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * @inheritdoc
@@ -42,7 +43,10 @@ public function __construct(
      */
     public function getShoppingAssistanceCheckboxTitle(): string
     {
-        return (string)$this->scopeConfig->getValue(self::XML_PATH_SHOPPING_ASSISTANCE_CHECKBOX_TITLE);
+        return (string)$this->scopeConfig->getValue(
+            self::XML_PATH_SHOPPING_ASSISTANCE_CHECKBOX_TITLE,
+            ScopeInterface::SCOPE_WEBSITE
+        );
     }
 
     /**
@@ -50,6 +54,9 @@ public function getShoppingAssistanceCheckboxTitle(): string
      */
     public function getShoppingAssistanceCheckboxTooltip(): string
     {
-        return (string)$this->scopeConfig->getValue(self::XML_PATH_SHOPPING_ASSISTANCE_CHECKBOX_TOOLTIP);
+        return (string)$this->scopeConfig->getValue(
+            self::XML_PATH_SHOPPING_ASSISTANCE_CHECKBOX_TOOLTIP,
+            ScopeInterface::SCOPE_WEBSITE
+        );
     }
 }
diff --git a/app/code/Magento/LoginAsCustomerAssistance/composer.json b/app/code/Magento/LoginAsCustomerAssistance/composer.json
index 6a902304b7f5d..a02852533b950 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/composer.json
+++ b/app/code/Magento/LoginAsCustomerAssistance/composer.json
@@ -6,6 +6,7 @@
         "magento/framework": "*",
         "magento/module-backend": "*",
         "magento/module-customer": "*",
+        "magento/module-store": "*",
         "magento/module-login-as-customer": "*",
         "magento/module-login-as-customer-api": "*"
     },

From 5e3bdd61933007d627dd54a7174da6488084426c Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Mon, 10 Aug 2020 15:50:26 +0300
Subject: [PATCH 1393/1718] magento/magento2-login-as-customer#150: Opt-in/out
 - acl text fix.

---
 .../Plugin/CustomerDataValidatePlugin.php                       | 2 +-
 .../Plugin/DataProviderWithDefaultAddressesPlugin.php           | 2 +-
 app/code/Magento/LoginAsCustomerAssistance/etc/acl.xml          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php b/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php
index bcf5679f206ac..ddb19fe229256 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php
+++ b/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php
@@ -58,7 +58,7 @@ public function beforeExtractData(
         $scopeOnly = true
     ): void {
         if ($this->isSetAssistanceAllowedParam($request)
-            && !$this->authorization->isAllowed('Magento_LoginAsCustomer::opt_in_preference')
+            && !$this->authorization->isAllowed('Magento_LoginAsCustomer::allow_shopping_assistance')
         ) {
             $customerId = $request->getParam('customer_id');
             $assistanceAllowedParam =
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Plugin/DataProviderWithDefaultAddressesPlugin.php b/app/code/Magento/LoginAsCustomerAssistance/Plugin/DataProviderWithDefaultAddressesPlugin.php
index 104f249f75f56..8222c6f5017cb 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/Plugin/DataProviderWithDefaultAddressesPlugin.php
+++ b/app/code/Magento/LoginAsCustomerAssistance/Plugin/DataProviderWithDefaultAddressesPlugin.php
@@ -89,7 +89,7 @@ public function afterGetMeta(
     ): array {
         if (!$this->config->isEnabled()) {
             $assistanceAllowedConfig = ['visible' => false];
-        } elseif (!$this->authorization->isAllowed('Magento_LoginAsCustomer::opt_in_preference')) {
+        } elseif (!$this->authorization->isAllowed('Magento_LoginAsCustomer::allow_shopping_assistance')) {
             $assistanceAllowedConfig = [
                 'disabled' => true,
                 'notice' => __('You have no permission to change Opt-In preference.'),
diff --git a/app/code/Magento/LoginAsCustomerAssistance/etc/acl.xml b/app/code/Magento/LoginAsCustomerAssistance/etc/acl.xml
index bf06be0cab2e6..2c16b5a9125df 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/etc/acl.xml
+++ b/app/code/Magento/LoginAsCustomerAssistance/etc/acl.xml
@@ -11,7 +11,7 @@
             <resource id="Magento_Backend::admin">
                 <resource id="Magento_Customer::customer">
                     <resource id="Magento_LoginAsCustomer::login">
-                        <resource id="Magento_LoginAsCustomer::opt_in_preference" title="Change Customer Opt-In Preference" sortOrder="20" />
+                        <resource id="Magento_LoginAsCustomer::allow_shopping_assistance" title="Allow remote shopping assistance" sortOrder="20" />
                     </resource>
                 </resource>
             </resource>

From b2a8ff40814a7646d2f9f09eebd18bbe2d90d57a Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Mon, 10 Aug 2020 16:16:46 +0300
Subject: [PATCH 1394/1718] fix rss first load

---
 app/code/Magento/Rss/Model/Rss.php            | 43 ++++++++-------
 .../Magento/Rss/Test/Unit/Model/RssTest.php   | 52 ++++++++++++++-----
 .../Magento/Rss/Controller/Feed/IndexTest.php | 49 +++++++++++------
 3 files changed, 97 insertions(+), 47 deletions(-)

diff --git a/app/code/Magento/Rss/Model/Rss.php b/app/code/Magento/Rss/Model/Rss.php
index e37ee263b8301..614f92314a507 100644
--- a/app/code/Magento/Rss/Model/Rss.php
+++ b/app/code/Magento/Rss/Model/Rss.php
@@ -8,8 +8,11 @@
 
 namespace Magento\Rss\Model;
 
+use Magento\Framework\App\CacheInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\Rss\DataProviderInterface;
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\RuntimeException;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\App\FeedFactoryInterface;
 
@@ -27,12 +30,12 @@ class Rss
     protected $dataProvider;
 
     /**
-     * @var \Magento\Framework\App\CacheInterface
+     * @var CacheInterface
      */
     protected $cache;
 
     /**
-     * @var \Magento\Framework\App\FeedFactoryInterface
+     * @var FeedFactoryInterface
      */
     private $feedFactory;
 
@@ -44,12 +47,12 @@ class Rss
     /**
      * Rss constructor
      *
-     * @param \Magento\Framework\App\CacheInterface $cache
+     * @param CacheInterface $cache
      * @param SerializerInterface|null $serializer
      * @param FeedFactoryInterface|null $feedFactory
      */
     public function __construct(
-        \Magento\Framework\App\CacheInterface $cache,
+        CacheInterface $cache,
         SerializerInterface $serializer = null,
         FeedFactoryInterface $feedFactory = null
     ) {
@@ -59,6 +62,8 @@ public function __construct(
     }
 
     /**
+     * Returns feeds
+     *
      * @return array
      */
     public function getFeeds()
@@ -66,47 +71,47 @@ public function getFeeds()
         if ($this->dataProvider === null) {
             return [];
         }
-        $cache = false;
-        if ($this->dataProvider->getCacheKey() && $this->dataProvider->getCacheLifetime()) {
-            $cache = $this->cache->load($this->dataProvider->getCacheKey());
-        }
+        $cacheKey = $this->dataProvider->getCacheKey();
+        $cacheLifeTime = $this->dataProvider->getCacheLifetime();
 
+        $cache = $cacheKey && $cacheLifeTime ? $this->cache->load($cacheKey) : false;
         if ($cache) {
             return $this->serializer->unserialize($cache);
         }
 
-        $data = $this->dataProvider->getRssData();
+        $serializedData = $this->serializer->serialize($this->dataProvider->getRssData());
 
-        if ($this->dataProvider->getCacheKey() && $this->dataProvider->getCacheLifetime()) {
-            $this->cache->save(
-                $this->serializer->serialize($data),
-                $this->dataProvider->getCacheKey(),
-                ['rss'],
-                $this->dataProvider->getCacheLifetime()
-            );
+        if ($cacheKey && $cacheLifeTime) {
+            $this->cache->save($serializedData, $cacheKey, ['rss'], $cacheLifeTime);
         }
 
-        return $data;
+        return $this->serializer->unserialize($serializedData);
     }
 
     /**
+     * Sets data provider
+     *
      * @param DataProviderInterface $dataProvider
      * @return $this
      */
     public function setDataProvider(DataProviderInterface $dataProvider)
     {
         $this->dataProvider = $dataProvider;
+
         return $this;
     }
 
     /**
+     * Returns rss xml
+     *
      * @return string
-     * @throws \Magento\Framework\Exception\InputException
-     * @throws \Magento\Framework\Exception\RuntimeException
+     * @throws InputException
+     * @throws RuntimeException
      */
     public function createRssXml()
     {
         $feed = $this->feedFactory->create($this->getFeeds(), FeedFactoryInterface::FORMAT_RSS);
+
         return $feed->getFormattedContent();
     }
 }
diff --git a/app/code/Magento/Rss/Test/Unit/Model/RssTest.php b/app/code/Magento/Rss/Test/Unit/Model/RssTest.php
index f2694fc81dab4..4e245f8b440be 100644
--- a/app/code/Magento/Rss/Test/Unit/Model/RssTest.php
+++ b/app/code/Magento/Rss/Test/Unit/Model/RssTest.php
@@ -17,12 +17,17 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * Test for \Magento\Rss\Model\Rss.
+ */
 class RssTest extends TestCase
 {
+    private const STUB_SERIALIZED_DATA = 'serializedData';
+
     /**
      * @var Rss
      */
-    protected $rss;
+    private $rss;
 
     /**
      * @var array
@@ -62,11 +67,6 @@ class RssTest extends TestCase
   </channel>
 </rss>';
 
-    /**
-     * @var ObjectManagerHelper
-     */
-    protected $objectManagerHelper;
-
     /**
      * @var CacheInterface|MockObject
      */
@@ -87,6 +87,9 @@ class RssTest extends TestCase
      */
     private $serializerMock;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp(): void
     {
         $this->cacheMock = $this->getMockForAbstractClass(CacheInterface::class);
@@ -94,8 +97,8 @@ protected function setUp(): void
         $this->feedFactoryMock = $this->getMockForAbstractClass(FeedFactoryInterface::class);
         $this->feedMock = $this->getMockForAbstractClass(FeedInterface::class);
 
-        $this->objectManagerHelper = new ObjectManagerHelper($this);
-        $this->rss = $this->objectManagerHelper->getObject(
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->rss = $objectManagerHelper->getObject(
             Rss::class,
             [
                 'cache' => $this->cacheMock,
@@ -105,12 +108,23 @@ protected function setUp(): void
         );
     }
 
-    public function testGetFeeds()
+    /**
+     * Get feeds test
+     *
+     * @return void
+     */
+    public function testGetFeeds(): void
     {
         $dataProvider = $this->getMockForAbstractClass(DataProviderInterface::class);
-        $dataProvider->expects($this->any())->method('getCacheKey')->willReturn('cache_key');
-        $dataProvider->expects($this->any())->method('getCacheLifetime')->willReturn(100);
-        $dataProvider->expects($this->any())->method('getRssData')->willReturn($this->feedData);
+        $dataProvider->expects($this->atLeastOnce())
+            ->method('getCacheKey')
+            ->willReturn('cache_key');
+        $dataProvider->expects($this->atLeastOnce())
+            ->method('getCacheLifetime')
+            ->willReturn(100);
+        $dataProvider->expects($this->once())
+            ->method('getRssData')
+            ->willReturn($this->feedData);
 
         $this->rss->setDataProvider($dataProvider);
 
@@ -125,7 +139,11 @@ public function testGetFeeds()
         $this->serializerMock->expects($this->once())
             ->method('serialize')
             ->with($this->feedData)
-            ->willReturn('serializedData');
+            ->willReturn(self::STUB_SERIALIZED_DATA);
+        $this->serializerMock->expects($this->once())
+            ->method('unserialize')
+            ->with(self::STUB_SERIALIZED_DATA)
+            ->willReturn($this->feedData);
 
         $this->assertEquals($this->feedData, $this->rss->getFeeds());
     }
@@ -168,6 +186,14 @@ public function testCreateRssXml()
             ->with($this->feedData, FeedFactoryInterface::FORMAT_RSS)
             ->willReturn($this->feedMock);
 
+        $this->serializerMock->expects($this->once())
+            ->method('serialize')
+            ->willReturn(self::STUB_SERIALIZED_DATA);
+        $this->serializerMock->expects($this->once())
+            ->method('unserialize')
+            ->with(self::STUB_SERIALIZED_DATA)
+            ->willReturn($this->feedData);
+
         $this->rss->setDataProvider($dataProvider);
         $this->assertNotNull($this->rss->createRssXml());
     }
diff --git a/dev/tests/integration/testsuite/Magento/Rss/Controller/Feed/IndexTest.php b/dev/tests/integration/testsuite/Magento/Rss/Controller/Feed/IndexTest.php
index 991914460c61b..f0d61bc618054 100644
--- a/dev/tests/integration/testsuite/Magento/Rss/Controller/Feed/IndexTest.php
+++ b/dev/tests/integration/testsuite/Magento/Rss/Controller/Feed/IndexTest.php
@@ -7,37 +7,42 @@
 
 namespace Magento\Rss\Controller\Feed;
 
-class IndexTest extends \Magento\TestFramework\TestCase\AbstractBackendController
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\Session;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+use Magento\Wishlist\Model\Wishlist;
+
+/**
+ * Test for \Magento\Rss\Controller\Feed\Index.
+ */
+class IndexTest extends AbstractBackendController
 {
-    /**
-     * @var \Magento\Rss\Model\UrlBuilder
-     */
-    private $urlBuilder;
+    private const RSS_NEW_PRODUCTS_PATH = 'rss/feed/index/type/new_products/';
 
     /**
-     * @var \Magento\Customer\Api\CustomerRepositoryInterface
+     * @var CustomerRepositoryInterface
      */
     private $customerRepository;
 
     /**
-     * @var \Magento\Wishlist\Model\Wishlist
+     * @var Wishlist
      */
     private $wishlist;
 
     /**
-     * @var
+     * @var Session
      */
     private $customerSession;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp(): void
     {
         parent::setUp();
-        $this->urlBuilder = $this->_objectManager->get(\Magento\Rss\Model\UrlBuilder::class);
-        $this->customerRepository = $this->_objectManager->get(
-            \Magento\Customer\Api\CustomerRepositoryInterface::class
-        );
-        $this->wishlist = $this->_objectManager->get(\Magento\Wishlist\Model\Wishlist::class);
-        $this->customerSession = $this->_objectManager->get(\Magento\Customer\Model\Session::class);
+        $this->customerRepository = $this->_objectManager->get(CustomerRepositoryInterface::class);
+        $this->wishlist = $this->_objectManager->get(Wishlist::class);
+        $this->customerSession = $this->_objectManager->get(Session::class);
     }
 
     /**
@@ -60,6 +65,21 @@ public function testRssResponse()
         $this->assertStringContainsString('<title>John Smith\'s Wishlist</title>', $body);
     }
 
+    /**
+     * Check Rss response from `New Products`.
+     *
+     * @magentoConfigFixture current_store rss/catalog/new 1
+     * @magentoConfigFixture current_store rss/config/active 1
+     *
+     * @return void
+     */
+    public function testRssResponseNewProducts(): void
+    {
+        $this->dispatch(self::RSS_NEW_PRODUCTS_PATH);
+        $body = $this->getResponse()->getBody();
+        $this->assertStringContainsString('<title>New Products from Main Website Store</title>', $body);
+    }
+
     /**
      * Check Rss with incorrect wishlist id.
      *
@@ -83,7 +103,6 @@ public function testRssResponseWithIncorrectWishlistId()
 
     private function getLink($customerId, $customerEmail, $wishlistId)
     {
-
         return 'rss/feed/index/type/wishlist/data/'
             . base64_encode($customerId . ',' . $customerEmail)
             . '/wishlist_id/' . $wishlistId;

From cf795895f671938b76fe2eebac24baca3d6e282f Mon Sep 17 00:00:00 2001
From: DmytroPaidych <dimonovp@gmail.com>
Date: Mon, 10 Aug 2020 16:25:36 +0300
Subject: [PATCH 1395/1718] MC-36374: Checkout with simple product as a
 guest/customer

---
 .../simple_product_min_max_sale_qty.php       |  44 +
 ...mple_product_min_max_sale_qty_rollback.php |  29 +
 .../simple_product_with_qty_increments.php    |  44 +
 ...e_product_with_qty_increments_rollback.php |  29 +
 .../Checkout/Controller/Cart/AddTest.php      | 231 +++++
 .../Magento/Checkout/Controller/CartTest.php  |  71 --
 .../Magento/Checkout/Model/CartTest.php       | 150 +++-
 .../Magento/Checkout/Model/SessionTest.php    | 199 +++--
 .../Quote/Item/CartItemPersisterTest.php      | 133 +++
 .../Quote/Model/QuoteManagementTest.php       | 175 ++--
 .../Quote/Model/QuoteRepositoryTest.php       | 211 +++--
 .../Magento/Quote/Model/QuoteTest.php         | 793 ++++++++++--------
 12 files changed, 1437 insertions(+), 672 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_min_max_sale_qty.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_min_max_sale_qty_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_with_qty_increments.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_with_qty_increments_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/AddTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Quote/Model/Quote/Item/CartItemPersisterTest.php

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_min_max_sale_qty.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_min_max_sale_qty.php
new file mode 100644
index 0000000000000..e8666ad9a13cd
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_min_max_sale_qty.php
@@ -0,0 +1,44 @@
+<?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\Api\Data\ProductInterfaceFactory;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductInterfaceFactory ProductInterfaceFactory */
+$productFactory = $objectManager->get(ProductInterfaceFactory::class);
+/** @var ProductRepositoryInterface $productRepositoryFactory */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$productRepository->cleanCache();
+
+$product = $productFactory->create();
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
+    ->setWebsiteIds([1])
+    ->setName('Simple Product min and max sale qty')
+    ->setSku('simple_product_min_max_sale_qty')
+    ->setPrice(10)
+    ->setWeight(1)
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStockData(
+        [
+            'use_config_manage_stock' => 1,
+            'qty' => 100,
+            'is_qty_decimal' => 0,
+            'is_in_stock' => 1,
+            'min_sale_qty' => 5,
+            'max_sale_qty' => 20,
+        ]
+    )
+    ->setCanSaveCustomOptions(true)
+    ->setHasOptions(true);
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_min_max_sale_qty_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_min_max_sale_qty_rollback.php
new file mode 100644
index 0000000000000..bc06240d2e9a3
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_min_max_sale_qty_rollback.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+try {
+    $productRepository->deleteById('simple_product_min_max_sale_qty');
+} catch (NoSuchEntityException $e) {
+    //product already deleted
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_with_qty_increments.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_with_qty_increments.php
new file mode 100644
index 0000000000000..bf425e2e57874
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_with_qty_increments.php
@@ -0,0 +1,44 @@
+<?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\Api\Data\ProductInterfaceFactory;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductInterfaceFactory ProductInterfaceFactory */
+$productFactory = $objectManager->get(ProductInterfaceFactory::class);
+/** @var ProductRepositoryInterface $productRepositoryFactory */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$productRepository->cleanCache();
+
+$product = $productFactory->create();
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
+    ->setWebsiteIds([1])
+    ->setName('Simple Product with qty increments')
+    ->setSku('simple_product_with_qty_increments')
+    ->setPrice(10)
+    ->setWeight(1)
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStockData(
+        [
+            'use_config_manage_stock' => 1,
+            'qty' => 100,
+            'is_qty_decimal' => 0,
+            'is_in_stock' => 1,
+            'enable_qty_increments' => 1,
+            'qty_increments' => 3,
+        ]
+    )
+    ->setCanSaveCustomOptions(true)
+    ->setHasOptions(true);
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_with_qty_increments_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_with_qty_increments_rollback.php
new file mode 100644
index 0000000000000..d6cd1212daeb8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_with_qty_increments_rollback.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+try {
+    $productRepository->deleteById('simple_product_with_qty_increments');
+} catch (NoSuchEntityException $e) {
+    //product already deleted
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/AddTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/AddTest.php
new file mode 100644
index 0000000000000..424fa13d74890
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/AddTest.php
@@ -0,0 +1,231 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Checkout\Controller\Cart;
+
+use Laminas\Stdlib\Parameters;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Checkout\Model\SessionFactory as CheckoutSessionFactory;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Escaper;
+use Magento\Framework\Message\MessageInterface;
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\TestFramework\Store\ExecuteInStoreContext;
+use Magento\TestFramework\TestCase\AbstractController;
+
+/**
+ * Class add product to cart controller.
+ *
+ * @see \Magento\Checkout\Controller\Cart\Add
+ * @magentoAppArea frontend
+ * @magentoDbIsolation enabled
+ */
+class AddTest extends AbstractController
+{
+    /** @var SerializerInterface */
+    private $json;
+
+    /** @var CheckoutSessionFactory */
+    private $checkoutSessionFactory;
+
+    /** @var ProductRepositoryInterface */
+    private $productRepository;
+
+    /** @var ExecuteInStoreContext */
+    private $executeInStoreContext;
+
+    /** @var Escaper */
+    private $escaper;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->json = $this->_objectManager->get(SerializerInterface::class);
+        $this->checkoutSessionFactory = $this->_objectManager->get(CheckoutSessionFactory::class);
+        $this->productRepository = $this->_objectManager->get(ProductRepositoryInterface::class);
+        $this->productRepository->cleanCache();
+        $this->executeInStoreContext = $this->_objectManager->get(ExecuteInStoreContext::class);
+        $this->escaper = $this->_objectManager->get(Escaper::class);
+    }
+
+    /**
+     * Test with simple product and activated redirect to cart
+     *
+     * @magentoDataFixture Magento/Catalog/_files/products.php
+     * @magentoConfigFixture current_store checkout/cart/redirect_to_cart 1
+     *
+     * @return void
+     */
+    public function testMessageAtAddToCartWithRedirect(): void
+    {
+        $this->prepareReferer();
+        $checkoutSession = $this->checkoutSessionFactory->create();
+        $postData = [
+            'qty' => '1',
+            'product' => '1',
+            'custom_price' => 1,
+            'isAjax' => 1,
+        ];
+        $this->dispatchAddToCartRequest($postData);
+        $this->assertEquals(
+            $this->json->serialize(['backUrl' => 'http://localhost/checkout/cart/']),
+            $this->getResponse()->getBody()
+        );
+        $this->assertSessionMessages(
+            $this->containsEqual((string)__('You added %1 to your shopping cart.', 'Simple Product')),
+            MessageInterface::TYPE_SUCCESS
+        );
+        $this->assertCount(1, $checkoutSession->getQuote()->getItemsCollection());
+    }
+
+    /**
+     * Test with simple product and deactivated redirect to cart
+     *
+     * @magentoDataFixture Magento/Catalog/_files/products.php
+     * @magentoConfigFixture current_store checkout/cart/redirect_to_cart 0
+     *
+     * @return void
+     */
+    public function testMessageAtAddToCartWithoutRedirect(): void
+    {
+        $this->prepareReferer();
+        $checkoutSession = $this->checkoutSessionFactory->create();
+        $postData = [
+            'qty' => '1',
+            'product' => '1',
+            'custom_price' => 1,
+            'isAjax' => 1,
+        ];
+        $this->dispatchAddToCartRequest($postData);
+        $this->assertFalse($this->getResponse()->isRedirect());
+        $this->assertEquals('[]', $this->getResponse()->getBody());
+        $message = (string)__(
+            'You added %1 to your <a href="%2">shopping cart</a>.',
+            'Simple Product',
+            'http://localhost/checkout/cart/'
+        );
+        $this->assertSessionMessages(
+            $this->containsEqual("\n" . $message),
+            MessageInterface::TYPE_SUCCESS
+        );
+        $this->assertCount(1, $checkoutSession->getQuote()->getItemsCollection());
+    }
+
+    /**
+     * @dataProvider wrongParamsDataProvider
+     *
+     * @param array $params
+     * @return void
+     */
+    public function testWithWrongParams(array $params): void
+    {
+        $this->prepareReferer();
+        $this->dispatchAddToCartRequest($params);
+        $this->assertRedirect($this->stringContains('http://localhost/test'));
+    }
+
+    /**
+     * @return array
+     */
+    public function wrongParamsDataProvider(): array
+    {
+        return [
+            'empty_params' => ['params' => []],
+            'with_not_existing_product_id' => ['params' => ['product' => 989]],
+        ];
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_duplicated.php
+     * @magentoDataFixture Magento/Store/_files/second_website_with_two_stores.php
+     *
+     * @return void
+     */
+    public function testAddProductFromUnavailableWebsite(): void
+    {
+        $this->prepareReferer();
+        $product = $this->productRepository->get('simple-1');
+        $postData = ['product' => $product->getId()];
+        $this->executeInStoreContext->execute('fixture_second_store', [$this, 'dispatchAddToCartRequest'], $postData);
+        $this->assertRedirect($this->stringContains('http://localhost/test'));
+        $message = $this->escaper->escapeHtml(
+            (string)__('The product wasn\'t found. Verify the product and try again.')
+        );
+        $this->assertSessionMessages($this->containsEqual($message), MessageInterface::TYPE_ERROR);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_duplicated.php
+     *
+     * @return void
+     */
+    public function testAddProductWithUnavailableQty(): void
+    {
+        $product = $this->productRepository->get('simple-1');
+        $postData = ['product' => $product->getId(), 'qty' => '1000'];
+        $this->dispatchAddToCartRequest($postData);
+        $message = (string)__('The requested qty is not available');
+        $this->assertSessionMessages($this->containsEqual($message), MessageInterface::TYPE_ERROR);
+        $this->assertRedirect($this->stringContains($product->getProductUrl()));
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/products_related_multiple.php
+     *
+     * @return void
+     */
+    public function testAddProductWithRelated(): void
+    {
+        $this->prepareReferer();
+        $checkoutSession = $this->checkoutSessionFactory->create();
+        $product = $this->productRepository->get('simple_with_cross');
+        $params = [
+            'product' => $product->getId(),
+            'related_product' => implode(',', $product->getRelatedProductIds()),
+        ];
+        $this->dispatchAddToCartRequest($params);
+        $this->assertCount(3, $checkoutSession->getQuote()->getItemsCollection());
+        $message = (string)__(
+            'You added %1 to your <a href="%2">shopping cart</a>.',
+            $product->getName(),
+            'http://localhost/checkout/cart/'
+        );
+        $this->assertSessionMessages(
+            $this->containsEqual("\n" . $message),
+            MessageInterface::TYPE_SUCCESS
+        );
+    }
+
+    /**
+     * Dispatch add product to cart request.
+     *
+     * @param array $postData
+     * @return void
+     */
+    public function dispatchAddToCartRequest(array $postData = []): void
+    {
+        $this->getRequest()->setPostValue($postData);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->dispatch('checkout/cart/add');
+    }
+
+    /**
+     * Prepare referer to test.
+     *
+     * @return void
+     */
+    private function prepareReferer(): void
+    {
+        $parameters = $this->_objectManager->create(Parameters::class);
+        $parameters->set('HTTP_REFERER', 'http://localhost/test');
+        $this->getRequest()->setServer($parameters);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php
index a9714a17ffe4f..fd89229bb73be 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Controller/CartTest.php
@@ -352,77 +352,6 @@ public function addAddProductDataProvider()
         ];
     }
 
-    /**
-     * Test for \Magento\Checkout\Controller\Cart\Add::execute() with simple product and activated redirect to cart
-     *
-     * @magentoDataFixture Magento/Catalog/_files/products.php
-     * @magentoConfigFixture current_store checkout/cart/redirect_to_cart 1
-     * @magentoAppIsolation enabled
-     */
-    public function testMessageAtAddToCartWithRedirect()
-    {
-        $formKey = $this->_objectManager->get(FormKey::class);
-        $postData = [
-            'qty' => '1',
-            'product' => '1',
-            'custom_price' => 1,
-            'form_key' => $formKey->getFormKey(),
-            'isAjax' => 1
-        ];
-        \Magento\TestFramework\Helper\Bootstrap::getInstance()->loadArea('frontend');
-        $this->getRequest()->setPostValue($postData);
-        $this->getRequest()->setMethod('POST');
-
-        $this->dispatch('checkout/cart/add');
-
-        $this->assertEquals(
-            '{"backUrl":"http:\/\/localhost\/index.php\/checkout\/cart\/"}',
-            $this->getResponse()->getBody()
-        );
-
-        $this->assertSessionMessages(
-            $this->containsEqual(
-                'You added Simple Product to your shopping cart.'
-            ),
-            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
-        );
-    }
-
-    /**
-     * Test for \Magento\Checkout\Controller\Cart\Add::execute() with simple product and deactivated redirect to cart
-     *
-     * @magentoDataFixture Magento/Catalog/_files/products.php
-     * @magentoConfigFixture current_store checkout/cart/redirect_to_cart 0
-     * @magentoAppIsolation enabled
-     */
-    public function testMessageAtAddToCartWithoutRedirect()
-    {
-        $formKey = $this->_objectManager->get(FormKey::class);
-        $postData = [
-            'qty' => '1',
-            'product' => '1',
-            'custom_price' => 1,
-            'form_key' => $formKey->getFormKey(),
-            'isAjax' => 1
-        ];
-        \Magento\TestFramework\Helper\Bootstrap::getInstance()->loadArea('frontend');
-        $this->getRequest()->setPostValue($postData);
-        $this->getRequest()->setMethod('POST');
-
-        $this->dispatch('checkout/cart/add');
-
-        $this->assertFalse($this->getResponse()->isRedirect());
-        $this->assertEquals('[]', $this->getResponse()->getBody());
-
-        $this->assertSessionMessages(
-            $this->containsEqual(
-                "\n" . 'You added Simple Product to your ' .
-                '<a href="http://localhost/index.php/checkout/cart/">shopping cart</a>.'
-            ),
-            \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
-        );
-    }
-
     /**
      * @covers \Magento\Checkout\Controller\Cart\Addgroup::execute()
      *
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Model/CartTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Model/CartTest.php
index f534904e9db6b..c8f3bc891a413 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/Model/CartTest.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Model/CartTest.php
@@ -3,51 +3,163 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Checkout\Model;
 
+use Magento\Catalog\Api\Data\ProductInterfaceFactory;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Checkout\Model\Session as CheckoutSession;
+use Magento\Checkout\Model\SessionFactory as CheckoutSessionFactory;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\CartInterface;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Store\ExecuteInStoreContext;
+use PHPUnit\Framework\TestCase;
 
-class CartTest extends \PHPUnit\Framework\TestCase
+/**
+ * Test for checkout cart model.
+ *
+ * @see \Magento\Checkout\Model\Cart
+ * @magentoDbIsolation enabled
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class CartTest extends TestCase
 {
+    /** @var ObjectManagerInterface */
+    private $objectManager;
+
+    /** @var CartFactory */
+    private $cartFactory;
+
+    /** @var ProductInterfaceFactory */
+    private $productFactory;
+
+    /** @var ProductRepositoryInterface */
+    private $productRepository;
+
+    /** @var ExecuteInStoreContext */
+    private $executeInStoreContext;
+
+    /** @var CheckoutSession */
+    private $checkoutSession;
+
+    /** @var CartInterface */
+    private $quote;
+
+    /** @var CartRepositoryInterface */
+    private $quoteRepository;
+
     /**
-     * @var Cart
+     * @inheritdoc
      */
-    private $cart;
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->cartFactory = $this->objectManager->get(CartFactory::class);
+        $this->productFactory = $this->objectManager->get(ProductInterfaceFactory::class);
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $this->productRepository->cleanCache();
+        $this->executeInStoreContext = $this->objectManager->get(ExecuteInStoreContext::class);
+        $this->checkoutSession = $this->objectManager->get(CheckoutSessionFactory::class)->create();
+        $this->quoteRepository = $this->objectManager->get(CartRepositoryInterface::class);
+    }
 
     /**
-     * @var ProductRepositoryInterface
+     * @inheritdoc
      */
-    private $productRepository;
-
-    protected function setUp(): void
+    protected function tearDown(): void
     {
-        $this->cart = Bootstrap::getObjectManager()->create(Cart::class);
-        $this->productRepository = Bootstrap::getObjectManager()->create(ProductRepositoryInterface::class);
+        if ($this->quote instanceof CartInterface) {
+            $this->quoteRepository->delete($this->quote);
+        }
+
+        parent::tearDown();
     }
 
     /**
-     * @magentoDataFixture Magento/Checkout/_files/simple_product.php
      * @magentoDataFixture Magento/Checkout/_files/set_product_min_in_cart.php
-     * @magentoDbIsolation enabled
      * @magentoAppIsolation enabled
+     *
+     * @return void
      */
-    public function testAddProductWithLowerQty()
+    public function testAddProductWithLowerQty(): void
     {
-        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
-        $this->expectExceptionMessage('The fewest you may purchase is 3');
+        $cart = $this->cartFactory->create();
+        $this->expectException(LocalizedException::class);
+        $this->expectExceptionMessage((string)__('The fewest you may purchase is %1', 3));
         $product = $this->productRepository->get('simple');
-        $this->cart->addProduct($product->getId(), ['qty' => 1]);
+        $cart->addProduct($product->getId(), ['qty' => 1]);
     }
 
     /**
-     * @magentoDataFixture Magento/Checkout/_files/simple_product.php
      * @magentoDataFixture Magento/Checkout/_files/set_product_min_in_cart.php
-     * @magentoDbIsolation enabled
+     *
+     * @return void
+     */
+    public function testAddProductWithNoQty(): void
+    {
+        $cart = $this->cartFactory->create();
+        $product = $this->productRepository->get('simple');
+        $cart->addProduct($product->getId(), [])->save();
+        $this->quote = $cart->getQuote();
+        $this->assertCount(1, $cart->getItems());
+        $this->assertEquals($product->getId(), $this->checkoutSession->getLastAddedProductId());
+    }
+
+    /**
+     * @return void
+     */
+    public function testAddNotExistingProduct(): void
+    {
+        $product = $this->productFactory->create();
+        $this->expectExceptionObject(
+            new LocalizedException(__('The product wasn\'t found. Verify the product and try again.'))
+        );
+        $this->cartFactory->create()->addProduct($product);
+    }
+
+    /**
+     * @return void
+     */
+    public function testAddNotExistingProductId(): void
+    {
+        $this->expectExceptionObject(
+            new LocalizedException(__('The product wasn\'t found. Verify the product and try again.'))
+        );
+        $this->cartFactory->create()->addProduct(989);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDataFixture Magento/Store/_files/second_website_with_two_stores.php
+     *
+     * @return void
+     */
+    public function testAddProductFromUnavailableWebsite(): void
+    {
+        $product = $this->productRepository->get('simple');
+        $this->expectExceptionObject(
+            new LocalizedException(__('The product wasn\'t found. Verify the product and try again.'))
+        );
+        $this->executeInStoreContext
+            ->execute('fixture_second_store', [$this->cartFactory->create(), 'addProduct'], $product->getId());
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     *
+     * @return void
      */
-    public function testAddProductWithNoQty()
+    public function testAddProductWithInvalidRequest(): void
     {
         $product = $this->productRepository->get('simple');
-        $this->cart->addProduct($product->getId(), []);
+        $message = __('We found an invalid request for adding product to quote.');
+        $this->expectExceptionObject(new LocalizedException($message));
+        $this->cartFactory->create()->addProduct($product->getId(), '');
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Model/SessionTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Model/SessionTest.php
index 41bf18619332a..32968572b4ac8 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/Model/SessionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Model/SessionTest.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Checkout\Model;
 
 use Magento\Catalog\Api\Data\ProductTierPriceInterface;
@@ -10,22 +12,24 @@
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Model\Session as CustomerSession;
-use Magento\Framework\Api\FilterBuilder;
-use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Api\Data\CartInterface;
-use Magento\Quote\Model\Quote;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Quote\Model\GetQuoteByReservedOrderId;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Checkout Session model test.
  *
+ * @see \Magento\Checkout\Model\Session
+ * @magentoDbIsolation enabled
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class SessionTest extends \PHPUnit\Framework\TestCase
+class SessionTest extends TestCase
 {
     /**
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var ObjectManagerInterface
      */
     private $objectManager;
 
@@ -45,40 +49,78 @@ class SessionTest extends \PHPUnit\Framework\TestCase
     private $checkoutSession;
 
     /**
-     * @return void
+     * @var GetQuoteByReservedOrderId
+     */
+    private $getQuoteByReservedOrderId;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $quoteRepository;
+
+    /**
+     * @var CartInterface
+     */
+    private $quote;
+
+    /**
+     * @inheritdoc
      */
     protected function setUp(): void
     {
+        parent::setUp();
+
         $this->objectManager = Bootstrap::getObjectManager();
         $this->customerRepository = $this->objectManager->create(CustomerRepositoryInterface::class);
         $this->customerSession = $this->objectManager->get(CustomerSession::class);
-        $this->checkoutSession = $this->objectManager->create(Session::class);
+        $this->checkoutSession = $this->objectManager->get(Session::class);
+        $this->getQuoteByReservedOrderId = $this->objectManager->get(GetQuoteByReservedOrderId::class);
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $this->productRepository->cleanCache();
+        $this->quoteRepository = $this->objectManager->get(CartRepositoryInterface::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown(): void
+    {
+        if ($this->quote instanceof CartInterface) {
+            $this->quoteRepository->delete($this->quote);
+        }
+        $this->customerSession->setCustomerId(null);
+        $this->checkoutSession->clearQuote();
+        $this->checkoutSession->setCustomerData(null);
+
+        parent::tearDown();
     }
 
     /**
      * Tests that quote items and totals are correct when product becomes unavailable.
      *
-     * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Sales/_files/quote.php
      * @magentoAppIsolation enabled
+     *
+     * @return void
      */
-    public function testGetQuoteWithUnavailableProduct()
+    public function testGetQuoteWithUnavailableProduct(): void
     {
         $reservedOrderId = 'test01';
         $quoteGrandTotal = 10;
-
-        $quote = $this->getQuote($reservedOrderId);
+        $quote = $this->getQuoteByReservedOrderId->execute($reservedOrderId);
         $this->assertEquals(1, $quote->getItemsCount());
         $this->assertCount(1, $quote->getItems());
         $this->assertEquals($quoteGrandTotal, $quote->getShippingAddress()->getBaseGrandTotal());
-
-        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
-        $product = $productRepository->get('simple');
+        $product = $this->productRepository->get('simple');
         $product->setStatus(Status::STATUS_DISABLED);
-        $productRepository->save($product);
+        $this->productRepository->save($product);
         $this->checkoutSession->setQuoteId($quote->getId());
         $quote = $this->checkoutSession->getQuote();
-
         $this->assertEquals(0, $quote->getItemsCount());
         $this->assertEmpty($quote->getItems());
         $this->assertEquals(0, $quote->getShippingAddress()->getBaseGrandTotal());
@@ -90,15 +132,15 @@ public function testGetQuoteWithUnavailableProduct()
      * Expected result - quote object should be loaded and customer data should be set to it.
      *
      * @magentoDataFixture Magento/Sales/_files/quote_with_customer.php
+     *
+     * @return void
      */
-    public function testGetQuoteNotInitializedCustomerSet()
+    public function testGetQuoteNotInitializedCustomerSet(): void
     {
         $customer = $this->customerRepository->getById(1);
         $this->checkoutSession->setCustomerData($customer);
-
-        /** Execute SUT */
         $quote = $this->checkoutSession->getQuote();
-        $this->_validateCustomerDataInQuote($quote);
+        $this->validateCustomerDataInQuote($quote);
     }
 
     /**
@@ -107,36 +149,29 @@ public function testGetQuoteNotInitializedCustomerSet()
      * Expected result - quote object should be loaded and customer data should be set to it.
      *
      * @magentoDataFixture Magento/Sales/_files/quote_with_customer.php
-     * @magentoAppIsolation enabled
+     *
+     * @return void
      */
-    public function testGetQuoteNotInitializedCustomerLoggedIn()
+    public function testGetQuoteNotInitializedCustomerLoggedIn(): void
     {
         $customer = $this->customerRepository->getById(1);
         $this->customerSession->setCustomerDataObject($customer);
-
-        /** Execute SUT */
         $quote = $this->checkoutSession->getQuote();
-        $this->_validateCustomerDataInQuote($quote);
+        $this->validateCustomerDataInQuote($quote);
     }
 
     /**
      * @magentoDataFixture Magento/Sales/_files/quote_with_customer.php
-     * @magentoAppIsolation enabled
+     *
+     * @return void
      */
-    public function testGetQuoteWithMismatchingSession()
+    public function testGetQuoteWithMismatchingSession(): void
     {
-        /** @var Quote $quote */
-        $quote = Bootstrap::getObjectManager()->create(Quote::class);
-        /** @var \Magento\Quote\Model\ResourceModel\Quote $quoteResource */
-        $quoteResource = Bootstrap::getObjectManager()->create(\Magento\Quote\Model\ResourceModel\Quote::class);
-        $quoteResource->load($quote, 'test01', 'reserved_order_id');
-
-        // Customer on quote is not logged in
+        $quote = $this->getQuoteByReservedOrderId->execute('test01');
         $this->checkoutSession->setQuoteId($quote->getId());
-
-        $sessionQuote = $this->checkoutSession->getQuote();
-        $this->assertEmpty($sessionQuote->getCustomerId());
-        $this->assertNotEquals($quote->getId(), $sessionQuote->getId());
+        $this->quote = $this->checkoutSession->getQuote();
+        $this->assertEmpty($this->quote->getCustomerId());
+        $this->assertNotEquals($quote->getId(), $this->quote->getId());
     }
 
     /**
@@ -150,96 +185,90 @@ public function testGetQuoteWithMismatchingSession()
      * Quote which is set to checkout session should contain customer data
      *
      * @magentoDataFixture Magento/Customer/_files/customer.php
-     * @magentoAppIsolation enabled
+     *
+     * @return void
      */
-    public function testLoadCustomerQuoteCustomerWithoutQuote()
+    public function testLoadCustomerQuoteCustomerWithoutQuote(): void
     {
-        $quote = $this->checkoutSession->getQuote();
-        $this->assertEmpty($quote->getCustomerId(), 'Precondition failed: Customer data must not be set to quote');
-        $this->assertEmpty($quote->getCustomerEmail(), 'Precondition failed: Customer data must not be set to quote');
-
+        $this->quote = $this->checkoutSession->getQuote();
+        $this->assertEmpty(
+            $this->quote->getCustomerId(),
+            'Precondition failed: Customer data must not be set to quote'
+        );
+        $this->assertEmpty(
+            $this->quote->getCustomerEmail(),
+            'Precondition failed: Customer data must not be set to quote'
+        );
         $customer = $this->customerRepository->getById(1);
         $this->customerSession->setCustomerDataObject($customer);
-
-        /** Ensure that customer data is still unavailable before SUT invocation */
-        $quote = $this->checkoutSession->getQuote();
-        $this->assertEmpty($quote->getCustomerEmail(), 'Precondition failed: Customer data must not be set to quote');
-
-        /** Execute SUT */
+        $this->quote = $this->checkoutSession->getQuote();
+        $this->assertEmpty(
+            $this->quote->getCustomerEmail(),
+            'Precondition failed: Customer data must not be set to quote'
+        );
         $this->checkoutSession->loadCustomerQuote();
-        $quote = $this->checkoutSession->getQuote();
-        $this->_validateCustomerDataInQuote($quote);
+        $this->quote = $this->checkoutSession->getQuote();
+        $this->validateCustomerDataInQuote($this->quote);
     }
 
     /**
      * @magentoDataFixture Magento/Customer/_files/customer.php
      * @magentoDataFixture Magento/Sales/_files/quote.php
+     *
+     * @return void
      */
-    public function testGetQuoteWithProductWithTierPrice()
+    public function testGetQuoteWithProductWithTierPrice(): void
     {
         $reservedOrderId = 'test01';
         $customerGroupId = 1;
         $tierPriceQty = 1;
         $tierPriceValue = 9;
-
-        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
-        $product = $productRepository->get('simple');
-        $tierPrice = $this->objectManager->create(ProductTierPriceInterface::class)
+        $product = $this->productRepository->get('simple');
+        $tierPrice = $this->objectManager->get(ProductTierPriceInterface::class)
             ->setCustomerGroupId($customerGroupId)
             ->setQty($tierPriceQty)
             ->setValue($tierPriceValue);
         $product->setTierPrices([$tierPrice]);
-        $productRepository->save($product);
-
-        $quote = $this->getQuote($reservedOrderId);
+        $this->productRepository->save($product);
+        $quote = $this->getQuoteByReservedOrderId->execute($reservedOrderId);
         $this->checkoutSession->setQuoteId($quote->getId());
-
         $quote = $this->checkoutSession->getQuote();
         $item = $quote->getItems()[0];
-        /** @var \Magento\Catalog\Model\Product $quoteProduct */
         $quoteProduct = $item->getProduct();
         $this->assertEquals(10, $quoteProduct->getTierPrice($tierPriceQty));
-
         $customer = $this->customerRepository->getById(1);
         $this->customerSession->setCustomerDataAsLoggedIn($customer);
-
         $quote = $this->checkoutSession->getQuote();
         $item = $quote->getItems()[0];
-        /** @var \Magento\Catalog\Model\Product $quoteProduct */
         $quoteProduct = $item->getProduct();
         $this->assertEquals($tierPriceValue, $quoteProduct->getTierPrice(1));
     }
 
     /**
-     * Returns quote by reserved order id.
+     * @magentoDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoDataFixture Magento/Checkout/_files/quote_with_customer_without_address.php
      *
-     * @param string $reservedOrderId
-     * @return CartInterface
+     * @return void
      */
-    private function getQuote(string $reservedOrderId): CartInterface
+    public function testMergeGuestQuoteWithCustomerQuote(): void
     {
-        $filterBuilder = $this->objectManager->create(FilterBuilder::class);
-        $filter = $filterBuilder->setField('reserved_order_id')
-            ->setConditionType('=')
-            ->setValue($reservedOrderId)
-            ->create();
-        $searchCriteriaBuilder = $this->objectManager->create(SearchCriteriaBuilder::class);
-        $searchCriteria = $searchCriteriaBuilder->addFilters([$filter])
-            ->create();
-        $quoteRepository = $this->objectManager->get(CartRepositoryInterface::class);
-        $searchResult = $quoteRepository->getList($searchCriteria);
-        /** @var CartInterface[] $items */
-        $items = $searchResult->getItems();
-
-        return \array_values($items)[0];
+        $guestQuote = $this->getQuoteByReservedOrderId->execute('test_order_with_simple_product_without_address');
+        $customerQuote = $this->getQuoteByReservedOrderId->execute('test_order_with_customer_without_address');
+        $this->checkoutSession->setQuoteId($guestQuote->getId());
+        $this->customerSession->setCustomerId(1);
+        $updatedQuote = $this->checkoutSession->loadCustomerQuote()->getQuote();
+        $this->assertNull($this->getQuoteByReservedOrderId->execute('test_order_with_simple_product_without_address'));
+        $this->assertEquals($customerQuote->getId(), $updatedQuote->getId());
+        $this->assertCount(2, $updatedQuote->getItems());
     }
 
     /**
      * Ensure that quote has customer data specified in customer fixture.
      *
-     * @param \Magento\Quote\Model\Quote $quote
+     * @param CartInterface $quote
+     * @return void
      */
-    protected function _validateCustomerDataInQuote($quote)
+    private function validateCustomerDataInQuote(CartInterface $quote): void
     {
         $customerIdFromFixture = 1;
         $customerEmailFromFixture = 'customer@example.com';
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/Item/CartItemPersisterTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/Item/CartItemPersisterTest.php
new file mode 100644
index 0000000000000..647b8a188a55c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/Item/CartItemPersisterTest.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model\Quote\Item;
+
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Quote\Api\Data\CartInterfaceFactory;
+use Magento\Quote\Api\Data\CartItemInterfaceFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Quote\Model\GetQuoteByReservedOrderId;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for quote item persister model.
+ *
+ * @see \Magento\Quote\Model\Quote\Item\CartItemPersister
+ * @magentoDbIsolation enabled
+ */
+class CartItemPersisterTest extends TestCase
+{
+    /** @var ObjectManagerInterface */
+    private $objectManager;
+
+    /** @var CartItemPersister */
+    private $model;
+
+    /** @var CartInterfaceFactory */
+    private $quoteFactory;
+
+    /** @var CartItemInterfaceFactory */
+    private $itemFactory;
+
+    /** @var GetQuoteByReservedOrderId */
+    private $getQuoteByReservedOrderId;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->model = $this->objectManager->get(CartItemPersister::class);
+        $this->quoteFactory = $this->objectManager->get(CartInterfaceFactory::class);
+        $this->itemFactory = $this->objectManager->get(CartItemInterfaceFactory::class);
+        $this->getQuoteByReservedOrderId = $this->objectManager->get(GetQuoteByReservedOrderId::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/simple_product_disabled.php
+     *
+     * @return void
+     */
+    public function testSaveDisabledItem(): void
+    {
+        $quote = $this->quoteFactory->create();
+        $item = $this->itemFactory->create();
+        $item->setSku('product_disabled')->setQty(1);
+        $this->expectExceptionObject(
+            new LocalizedException(__('Product that you are trying to add is not available.'))
+        );
+        $this->model->save($quote, $item);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_duplicated.php
+     *
+     * @return void
+     */
+    public function testSaveQuoteItemWithoutQty(): void
+    {
+        $quote = $this->quoteFactory->create();
+        $item = $this->itemFactory->create();
+        $item->setSku('simple-1');
+        $this->expectExceptionObject(InputException::invalidFieldValue('qty', null));
+        $this->model->save($quote, $item);
+    }
+
+    /**
+     * @return void
+     */
+    public function testSaveQuoteItemWithNotExistingProduct(): void
+    {
+        $quote = $this->quoteFactory->create();
+        $item = $this->itemFactory->create();
+        $item->setSku('not_existing_product_sku')->setQty(1);
+        $this->expectExceptionObject(
+            new NoSuchEntityException(
+                __('The product that was requested doesn\'t exist. Verify the product and try again.')
+            )
+        );
+        $this->model->save($quote, $item);
+    }
+
+    /**
+     * @return void
+     */
+    public function testUpdateNotExistingQuoteItem(): void
+    {
+        $quote = $this->quoteFactory->create();
+        $item = $this->itemFactory->create();
+        $item->setItemId(989)->setQty(1);
+        $this->expectExceptionObject(
+            new NoSuchEntityException(
+                __('The %1 Cart doesn\'t contain the %2 item.', null, 989)
+            )
+        );
+        $this->model->save($quote, $item);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Checkout/_files/quote_with_taxable_product_and_customer.php
+     *
+     * @return void
+     */
+    public function testUpdateQuoteItemMoreQty(): void
+    {
+        $quote = $this->getQuoteByReservedOrderId->execute('test_order_with_taxable_product');
+        $quoteItem = current($quote->getItems());
+        $item = $this->itemFactory->create();
+        $item->setQty(9999)->setSku($quoteItem->getSku())->setItemId($quoteItem->getItemId());
+        $this->expectExceptionObject(new LocalizedException(__('The requested qty is not available')));
+        $this->model->save($quote, $item);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php
index dac05f17089a1..facb4879650b1 100644
--- a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php
+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php
@@ -9,22 +9,30 @@
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product\Type;
-use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\StateException;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\Quote\Api\CartManagementInterface;
-use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Sales\Api\OrderManagementInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
-use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\Quote\Model\GetQuoteByReservedOrderId;
 use PHPUnit\Framework\ExpectationFailedException;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class for testing QuoteManagement model
+ *
+ * @see \Magento\Quote\Model\QuoteManagement
+ * @magentoDbIsolation enabled
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class QuoteManagementTest extends \PHPUnit\Framework\TestCase
+class QuoteManagementTest extends TestCase
 {
     /**
-     * @var ObjectManager
+     * @var ObjectManagerInterface
      */
     private $objectManager;
 
@@ -33,14 +41,46 @@ class QuoteManagementTest extends \PHPUnit\Framework\TestCase
      */
     private $cartManagement;
 
+    /**
+     * @var OrderRepositoryInterface
+     */
+    private $orderRepository;
+
+    /**
+     * @var GetQuoteByReservedOrderId
+     */
+    private $getQuoteByReservedOrderId;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * @inheritdoc
      */
     protected function setUp(): void
     {
-        $this->objectManager = Bootstrap::getObjectManager();
+        parent::setUp();
 
-        $this->cartManagement = $this->objectManager->create(CartManagementInterface::class);
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->cartManagement = $this->objectManager->get(CartManagementInterface::class);
+        $this->orderRepository = $this->objectManager->get(OrderRepositoryInterface::class);
+        $this->getQuoteByReservedOrderId = $this->objectManager->get(GetQuoteByReservedOrderId::class);
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $this->productRepository->cleanCache();
+        $this->customerRepository = $this->objectManager->get(CustomerRepositoryInterface::class);
+        $this->storeManager = $this->objectManager->get(StoreManagerInterface::class);
     }
 
     /**
@@ -48,22 +88,20 @@ protected function setUp(): void
      *
      * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/Sales/_files/quote_with_bundle.php
+     *
+     * @return void
      */
-    public function testSubmit()
+    public function testSubmit(): void
     {
-        $quote = $this->getQuote('test01');
+        $quote = $this->getQuoteByReservedOrderId->execute('test01');
         $orderId = $this->cartManagement->placeOrder($quote->getId());
-
-        /** @var OrderRepositoryInterface $orderRepository */
-        $orderRepository = $this->objectManager->create(OrderRepositoryInterface::class);
-        $order = $orderRepository->get($orderId);
-
+        $order = $this->orderRepository->get($orderId);
         $orderItems = $order->getItems();
-        self::assertCount(3, $orderItems);
+        $this->assertCount(3, $orderItems);
         foreach ($orderItems as $orderItem) {
             if ($orderItem->getProductType() == Type::TYPE_SIMPLE) {
-                self::assertNotEmpty($orderItem->getParentItem(), 'Parent is not set for child product');
-                self::assertNotEmpty($orderItem->getParentItemId(), 'Parent is not set for child product');
+                $this->assertNotEmpty($orderItem->getParentItem(), 'Parent is not set for child product');
+                $this->assertNotEmpty($orderItem->getParentItemId(), 'Parent is not set for child product');
             }
         }
     }
@@ -75,17 +113,13 @@ public function testSubmit()
      * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/Sales/_files/quote_with_bundle.php
      */
-    public function testSubmitWithDeletedItem()
+    public function testSubmitWithDeletedItem(): void
     {
-        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
-        $this->expectExceptionMessage('Some of the products below do not have all the required options.');
-
-        /** @var ProductRepositoryInterface $productRepository */
-        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
-        $product = $productRepository->get('simple-2');
-        $productRepository->delete($product);
-        $quote = $this->getQuote('test01');
-
+        $this->productRepository->deleteById('simple-2');
+        $quote = $this->getQuoteByReservedOrderId->execute('test01');
+        $this->expectExceptionObject(
+            new LocalizedException(__('Some of the products below do not have all the required options.'))
+        );
         $this->cartManagement->placeOrder($quote->getId());
     }
 
@@ -95,13 +129,11 @@ public function testSubmitWithDeletedItem()
      * @magentoDataFixture Magento/Sales/_files/quote.php
      * @magentoDbIsolation enabled
      */
-    public function testSubmitWithItemOutOfStock()
+    public function testSubmitWithItemOutOfStock(): void
     {
-        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
-        $this->expectExceptionMessage('Some of the products are out of stock.');
-
         $this->makeProductOutOfStock('simple');
-        $quote = $this->getQuote('test01');
+        $quote = $this->getQuoteByReservedOrderId->execute('test01');
+        $this->expectExceptionObject(new LocalizedException(__('Some of the products are out of stock.')));
         $this->cartManagement->placeOrder($quote->getId());
     }
 
@@ -111,21 +143,20 @@ public function testSubmitWithItemOutOfStock()
      * Order should not start placing if order validation is failed.
      *
      * @magentoDataFixture Magento/Quote/Fixtures/quote_without_customer_email.php
+     *
+     * @return void
      */
-    public function testSubmitWithEmptyCustomerEmail()
+    public function testSubmitWithEmptyCustomerEmail(): void
     {
-        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
-        $this->expectExceptionMessage('Email has a wrong format');
-
-        $quote = $this->getQuote('test01');
-        $orderManagement = $this->getMockForAbstractClass(OrderManagementInterface::class);
+        $quote = $this->getQuoteByReservedOrderId->execute('test01');
+        $orderManagement = $this->createMock(OrderManagementInterface::class);
         $orderManagement->expects($this->never())
             ->method('place');
         $cartManagement = $this->objectManager->create(
             CartManagementInterface::class,
             ['orderManagement' => $orderManagement]
         );
-
+        $this->expectExceptionObject(new LocalizedException(__('Email has a wrong format')));
         try {
             $cartManagement->placeOrder($quote->getId());
         } catch (ExpectationFailedException $e) {
@@ -134,24 +165,56 @@ public function testSubmitWithEmptyCustomerEmail()
     }
 
     /**
-     * Gets quote by reserved order ID.
+     * @magentoDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoDataFixture Magento/Customer/_files/customer.php
      *
-     * @param string $reservedOrderId
-     * @return Quote
+     * @return void
      */
-    private function getQuote(string $reservedOrderId): Quote
+    public function testAssignCustomerToQuote(): void
     {
-        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
-        $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
-        $searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', $reservedOrderId)
-            ->create();
+        $customer = $this->customerRepository->get('customer@example.com');
+        $quote = $this->getQuoteByReservedOrderId->execute('test_order_with_simple_product_without_address');
+        $result = $this->cartManagement->assignCustomer($quote->getId(), $customer->getId(), $customer->getStoreId());
+        $this->assertTrue($result);
+        $customerQuote = $this->cartManagement->getCartForCustomer($customer->getId());
+        $this->assertEquals($quote->getId(), $customerQuote->getId());
+        $this->assertEquals($customer->getId(), $customerQuote->getCustomerId());
+        $this->assertEquals($customer->getEmail(), $customerQuote->getCustomerEmail());
+    }
 
-        /** @var CartRepositoryInterface $quoteRepository */
-        $quoteRepository = $this->objectManager->get(CartRepositoryInterface::class);
-        $items = $quoteRepository->getList($searchCriteria)
-            ->getItems();
+    /**
+     * @magentoDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+     * @magentoDataFixture Magento/Customer/_files/customer_for_second_website.php
+     *
+     * @return void
+     */
+    public function testAssignCustomerFromAnotherWebsiteToQuote(): void
+    {
+        $websiteId = $this->storeManager->getWebsite('test')->getId();
+        $customer = $this->customerRepository->get('customer@example.com', $websiteId);
+        $quote = $this->getQuoteByReservedOrderId->execute('test_order_with_simple_product_without_address');
+        $this->expectExceptionObject(
+            new StateException(
+                __('The customer can\'t be assigned to the cart. The cart belongs to a different store.')
+            )
+        );
+        $this->cartManagement->assignCustomer($quote->getId(), $customer->getId(), $quote->getStoreId());
+    }
 
-        return array_pop($items);
+    /**
+     * @magentoDataFixture Magento/Checkout/_files/quote_with_customer_without_address.php
+     * @magentoDataFixture Magento/Customer/_files/customer_with_uk_address.php
+     *
+     * @return void
+     */
+    public function testAssignCustomerToQuoteAlreadyHaveCustomer(): void
+    {
+        $customer = $this->customerRepository->get('customer_uk_address@test.com');
+        $quote = $this->getQuoteByReservedOrderId->execute('test_order_with_customer_without_address');
+        $this->expectExceptionObject(
+            new StateException(__('The customer can\'t be assigned to the cart because the cart isn\'t anonymous.'))
+        );
+        $this->cartManagement->assignCustomer($quote->getId(), $customer->getId(), $quote->getStoreId());
     }
 
     /**
@@ -160,14 +223,12 @@ private function getQuote(string $reservedOrderId): Quote
      * @param string $sku
      * @return void
      */
-    private function makeProductOutOfStock(string $sku)
+    private function makeProductOutOfStock(string $sku): void
     {
-        /** @var ProductRepositoryInterface $productRepository */
-        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
-        $product = $productRepository->get($sku);
+        $product = $this->productRepository->get($sku);
         $extensionAttributes = $product->getExtensionAttributes();
         $stockItem = $extensionAttributes->getStockItem();
         $stockItem->setIsInStock(false);
-        $productRepository->save($product);
+        $this->productRepository->save($product);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteRepositoryTest.php
index 3b18ee0ceaa5e..f3684e5167b58 100644
--- a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteRepositoryTest.php
@@ -3,26 +3,37 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Quote\Model;
 
-use Magento\Store\Model\StoreRepository;
-use Magento\TestFramework\Helper\Bootstrap as BootstrapHelper;
-use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\Api\SearchCriteriaBuilder;
-use Magento\Framework\Api\SearchCriteria;
-use Magento\Framework\Api\SearchResults;
 use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\SearchCriteria;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\AddressInterfaceFactory;
+use Magento\Quote\Api\Data\CartExtension;
 use Magento\Quote\Api\Data\CartInterface;
+use Magento\Quote\Api\Data\CartInterfaceFactory;
+use Magento\Quote\Api\Data\CartItemInterfaceFactory;
 use Magento\Quote\Api\Data\CartSearchResultsInterface;
-use Magento\Quote\Api\Data\CartExtension;
-use Magento\User\Api\Data\UserInterface;
+use Magento\Quote\Api\Data\ShippingAssignmentInterface;
+use Magento\Quote\Api\Data\ShippingInterface;
 use Magento\Quote\Model\Quote\Address as QuoteAddress;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap as BootstrapHelper;
+use Magento\TestFramework\Quote\Model\GetQuoteByReservedOrderId;
+use PHPUnit\Framework\TestCase;
 
 /**
+ * Test for quote repository
+ *
+ * @see \Magento\Quote\Model\QuoteRepository
+ * @magentoDbIsolation enabled
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @magentoDbIsolation disabled
  */
-class QuoteRepositoryTest extends \PHPUnit\Framework\TestCase
+class QuoteRepositoryTest extends TestCase
 {
     /**
      * @var ObjectManagerInterface
@@ -30,7 +41,7 @@ class QuoteRepositoryTest extends \PHPUnit\Framework\TestCase
     private $objectManager;
 
     /**
-     * @var QuoteRepository
+     * @var CartRepositoryInterface
      */
     private $quoteRepository;
 
@@ -45,14 +56,63 @@ class QuoteRepositoryTest extends \PHPUnit\Framework\TestCase
     private $filterBuilder;
 
     /**
-     * Set up
+     * @var GetQuoteByReservedOrderId
+     */
+    private $getQuoteByReservedOrderId;
+
+    /**
+     * @var StoreRepositoryInterface
+     */
+    private $storeRepository;
+
+    /**
+     * @var AddressInterfaceFactory
+     */
+    private $addressFactory;
+
+    /**
+     * @var CartInterfaceFactory
+     */
+    private $quoteFactory;
+
+    /**
+     * @var CartItemInterfaceFactory
+     */
+    private $itemFactory;
+
+    /**
+     * @var CartInterface|null
+     */
+    private $quote;
+
+    /**
+     * @inheritdoc
      */
     protected function setUp(): void
     {
+        parent::setUp();
+
         $this->objectManager = BootstrapHelper::getObjectManager();
-        $this->quoteRepository = $this->objectManager->create(QuoteRepository::class);
-        $this->searchCriteriaBuilder = $this->objectManager->create(SearchCriteriaBuilder::class);
-        $this->filterBuilder = $this->objectManager->create(FilterBuilder::class);
+        $this->quoteRepository = $this->objectManager->create(CartRepositoryInterface::class);
+        $this->searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+        $this->filterBuilder = $this->objectManager->get(FilterBuilder::class);
+        $this->getQuoteByReservedOrderId = $this->objectManager->get(GetQuoteByReservedOrderId::class);
+        $this->storeRepository = $this->objectManager->get(StoreRepositoryInterface::class);
+        $this->addressFactory = $this->objectManager->get(AddressInterfaceFactory::class);
+        $this->quoteFactory = $this->objectManager->get(CartInterfaceFactory::class);
+        $this->itemFactory = $this->objectManager->get(CartItemInterfaceFactory::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown(): void
+    {
+        if ($this->quote instanceof CartInterface) {
+            $this->quoteRepository->delete($this->quote);
+        }
+
+        parent::tearDown();
     }
 
     /**
@@ -60,22 +120,18 @@ protected function setUp(): void
      *
      * @magentoDataFixture Magento/Sales/_files/quote.php
      * @magentoDataFixture Magento/Store/_files/second_store.php
+     *
+     * @return void
      */
-    public function testGetQuoteWithCustomStoreId()
+    public function testGetQuoteWithCustomStoreId(): void
     {
         $secondStoreCode = 'fixture_second_store';
         $reservedOrderId = 'test01';
-
-        $storeRepository = $this->objectManager->create(StoreRepository::class);
-        $secondStore = $storeRepository->get($secondStoreCode);
-
-        // Set store_id in quote to second store_id
-        $quote = $this->getQuote($reservedOrderId);
+        $secondStore = $this->storeRepository->get($secondStoreCode);
+        $quote = $this->getQuoteByReservedOrderId->execute($reservedOrderId);
         $quote->setStoreId($secondStore->getId());
         $this->quoteRepository->save($quote);
-
         $savedQuote = $this->quoteRepository->get($quote->getId());
-
         $this->assertEquals(
             $secondStore->getId(),
             $savedQuote->getStoreId(),
@@ -85,8 +141,10 @@ public function testGetQuoteWithCustomStoreId()
 
     /**
      * @magentoDataFixture Magento/Sales/_files/quote.php
+     *
+     * @return void
      */
-    public function testGetList()
+    public function testGetList(): void
     {
         $searchCriteria = $this->getSearchCriteria('test01');
         $searchResult = $this->quoteRepository->getList($searchCriteria);
@@ -95,62 +153,50 @@ public function testGetList()
 
     /**
      * @magentoDataFixture Magento/Sales/_files/quote.php
+     *
+     * @return void
      */
-    public function testGetListDoubleCall()
+    public function testGetListDoubleCall(): void
     {
         $searchCriteria1 = $this->getSearchCriteria('test01');
         $searchCriteria2 = $this->getSearchCriteria('test02');
         $searchResult = $this->quoteRepository->getList($searchCriteria1);
         $this->performAssertions($searchResult);
         $searchResult = $this->quoteRepository->getList($searchCriteria2);
-
         $this->assertEmpty($searchResult->getItems());
     }
 
     /**
      * @magentoAppIsolation enabled
+     *
+     * @return void
      */
-    public function testSaveWithNotExistingCustomerAddress()
+    public function testSaveWithNotExistingCustomerAddress(): void
     {
         $addressData = include __DIR__ . '/../../Sales/_files/address_data.php';
-
-        /** @var QuoteAddress $billingAddress */
-        $billingAddress = $this->objectManager->create(QuoteAddress::class, ['data' => $addressData]);
-        $billingAddress->setAddressType(QuoteAddress::ADDRESS_TYPE_BILLING)
-            ->setCustomerAddressId('not_existing');
-
-        /** @var QuoteAddress $shippingAddress */
-        $shippingAddress = $this->objectManager->create(QuoteAddress::class, ['data' => $addressData]);
-        $shippingAddress->setAddressType(QuoteAddress::ADDRESS_TYPE_SHIPPING)
-            ->setCustomerAddressId('not_existing');
-
-        /** @var Shipping $shipping */
-        $shipping = $this->objectManager->create(Shipping::class);
+        $billingAddress = $this->addressFactory->create(['data' => $addressData]);
+        $billingAddress->setAddressType(QuoteAddress::ADDRESS_TYPE_BILLING)->setCustomerAddressId('not_existing');
+        $shippingAddress = $this->addressFactory->create(['data' => $addressData]);
+        $shippingAddress->setAddressType(QuoteAddress::ADDRESS_TYPE_SHIPPING)->setCustomerAddressId('not_existing');
+        $shipping = $this->objectManager->get(ShippingInterface::class);
         $shipping->setAddress($shippingAddress);
-
-        /** @var ShippingAssignment $shippingAssignment */
-        $shippingAssignment = $this->objectManager->create(ShippingAssignment::class);
+        $shippingAssignment = $this->objectManager->get(ShippingAssignmentInterface::class);
         $shippingAssignment->setItems([]);
         $shippingAssignment->setShipping($shipping);
-
-        /** @var CartExtension $extensionAttributes */
-        $extensionAttributes = $this->objectManager->create(CartExtension::class);
+        $extensionAttributes = $this->objectManager->get(CartExtension::class);
         $extensionAttributes->setShippingAssignments([$shippingAssignment]);
-
-        /** @var Quote $quote */
-        $quote = $this->objectManager->create(Quote::class);
-        $quote->setStoreId(1)
+        $this->quote = $this->quoteFactory->create();
+        $this->quote->setStoreId(1)
             ->setIsActive(true)
-            ->setIsMultiShipping(false)
+            ->setIsMultiShipping(0)
             ->setBillingAddress($billingAddress)
             ->setShippingAddress($shippingAddress)
             ->setExtensionAttributes($extensionAttributes)
             ->save();
-        $this->quoteRepository->save($quote);
-
-        $this->assertNull($quote->getBillingAddress()->getCustomerAddressId());
+        $this->quoteRepository->save($this->quote);
+        $this->assertNull($this->quote->getBillingAddress()->getCustomerAddressId());
         $this->assertNull(
-            $quote->getExtensionAttributes()
+            $this->quote->getExtensionAttributes()
                 ->getShippingAssignments()[0]
                 ->getShipping()
                 ->getAddress()
@@ -159,21 +205,37 @@ public function testSaveWithNotExistingCustomerAddress()
     }
 
     /**
-     * Returns quote by reserved order id.
+     * @magentoDataFixture Magento/Catalog/_files/multiple_products.php
      *
-     * @param string $reservedOrderId
-     * @return CartInterface
+     * @return void
      */
-    private function getQuote(string $reservedOrderId)
+    public function testSaveQuoteWithItems(): void
     {
-        $searchCriteria = $this->getSearchCriteria($reservedOrderId);
-        $searchResult = $this->quoteRepository->getList($searchCriteria);
-        $items = $searchResult->getItems();
-
-        /** @var CartInterface $quote */
-        $quote = array_pop($items);
+        $items = $this->prepareQuoteItems(['simple1', 'simple2']);
+        $this->quote = $this->quoteFactory->create();
+        $this->quote->setItems($items);
+        $this->quoteRepository->save($this->quote);
+        $this->assertCount(2, $this->quote->getItemsCollection());
+        $this->assertEquals(2, $this->quote->getItemsCount());
+        $this->assertEquals(2, $this->quote->getItemsQty());
+    }
 
-        return $quote;
+    /**
+     * Prepare quote items by products sku.
+     *
+     * @param array $productsSku
+     * @return array
+     */
+    private function prepareQuoteItems(array $productsSku): array
+    {
+        $items = [];
+        foreach ($productsSku as $sku) {
+            $item = $this->itemFactory->create();
+            $item->setSku($sku)->setQty(1);
+            $items[] = $item;
+        }
+
+        return $items;
     }
 
     /**
@@ -182,7 +244,7 @@ private function getQuote(string $reservedOrderId)
      * @param string $filterValue
      * @return SearchCriteria
      */
-    private function getSearchCriteria($filterValue)
+    private function getSearchCriteria(string $filterValue): SearchCriteria
     {
         $filters = [];
         $filters[] = $this->filterBuilder->setField('reserved_order_id')
@@ -197,24 +259,19 @@ private function getSearchCriteria($filterValue)
     /**
      * Perform assertions
      *
-     * @param SearchResults|CartSearchResultsInterface $searchResult
+     * @param CartSearchResultsInterface $searchResult
+     * @return void
      */
-    private function performAssertions($searchResult)
+    private function performAssertions(CartSearchResultsInterface $searchResult): void
     {
         $expectedExtensionAttributes = [
             'firstname' => 'firstname',
             'lastname' => 'lastname',
-            'email' => 'admin@example.com'
+            'email' => 'admin@example.com',
         ];
-
         $items = $searchResult->getItems();
-
-        /** @var CartInterface $actualQuote */
         $actualQuote = array_pop($items);
-
-        /** @var UserInterface $testAttribute */
         $testAttribute = $actualQuote->getExtensionAttributes()->getQuoteTestAttribute();
-
         $this->assertInstanceOf(CartInterface::class, $actualQuote);
         $this->assertEquals('test01', $actualQuote->getReservedOrderId());
         $this->assertEquals($expectedExtensionAttributes['firstname'], $testAttribute->getFirstName());
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php
index a9fdbf59a371b..081cae5f98ee5 100644
--- a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php
+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php
@@ -8,46 +8,111 @@
 namespace Magento\Quote\Model;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Catalog\Model\ProductRepository;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Api\Data\CustomerInterfaceFactory;
-use Magento\Customer\Model\Data\Customer;
+use Magento\Customer\Model\CustomerFactory;
+use Magento\Customer\Model\GroupFactory;
+use Magento\Customer\Model\GroupManagement;
+use Magento\Customer\Model\ResourceModel\Customer as CustomerResourceModel;
+use Magento\Framework\Api\DataObjectHelper;
+use Magento\Framework\Api\ExtensibleDataObjectConverter;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\Quote\Api\Data\AddressInterface;
+use Magento\Quote\Api\Data\AddressInterfaceFactory;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\Quote\Api\Data\CartItemInterface;
+use Magento\Quote\Api\Data\CartItemInterfaceFactory;
 use Magento\TestFramework\Helper\Bootstrap;
-use Magento\TestFramework\ObjectManager;
-use Magento\Framework\Api\SearchCriteriaBuilder;
-use Magento\Quote\Api\CartRepositoryInterface;
-use Magento\Framework\Api\ExtensibleDataInterface;
+use Magento\TestFramework\Quote\Model\GetQuoteByReservedOrderId;
+use PHPUnit\Framework\TestCase;
 
 /**
+ * Tests for quote model.
+ *
+ * @see \Magento\Quote\Model\Quote
+ *
+ * @magentoDbIsolation enabled
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class QuoteTest extends \PHPUnit\Framework\TestCase
+class QuoteTest extends TestCase
 {
-    /**
-     * @var ObjectManager
-     */
+    /** @var ObjectManagerInterface */
     private $objectManager;
 
+    /** @var ProductRepositoryInterface */
+    private $productRepository;
+
+    /** @var GetQuoteByReservedOrderId */
+    private $getQuoteByReservedOrderId;
+
+    /** @var QuoteFactory */
+    private $quoteFactory;
+
+    /** @var DataObjectHelper */
+    private $dataObjectHelper;
+
+    /** @var CustomerRepositoryInterface */
+    private $customerRepository;
+
+    /** @var CustomerInterfaceFactory */
+    private $customerDataFactory;
+
+    /** @var CustomerFactory */
+    private $customerFactory;
+
+    /** @var AddressInterfaceFactory */
+    private $addressFactory;
+
+    /** @var CartItemInterfaceFactory */
+    private $itemFactory;
+
+    /** @var CustomerResourceModel */
+    private $customerResourceModel;
+
+    /** @var int */
+    private $customerIdToDelete;
+
+    /** @var GroupFactory */
+    private $groupFactory;
+
+    /** @var ExtensibleDataObjectConverter */
+    private $extensibleDataObjectConverter;
+
     /**
      * @inheritdoc
      */
     protected function setUp(): void
     {
+        parent::setUp();
+
         $this->objectManager = Bootstrap::getObjectManager();
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $this->productRepository->cleanCache();
+        $this->getQuoteByReservedOrderId = $this->objectManager->get(GetQuoteByReservedOrderId::class);
+        $this->quoteFactory = $this->objectManager->get(QuoteFactory::class);
+        $this->dataObjectHelper = $this->objectManager->get(DataObjectHelper::class);
+        $this->customerRepository = $this->objectManager->get(CustomerRepositoryInterface::class);
+        $this->customerDataFactory = $this->objectManager->get(CustomerInterfaceFactory::class);
+        $this->customerFactory = $this->objectManager->get(CustomerFactory::class);
+        $this->addressFactory = $this->objectManager->get(AddressInterfaceFactory::class);
+        $this->itemFactory = $this->objectManager->get(CartItemInterfaceFactory::class);
+        $this->customerResourceModel = $this->objectManager->get(CustomerResourceModel::class);
+        $this->groupFactory = $this->objectManager->get(GroupFactory::class);
+        $this->extensibleDataObjectConverter = $this->objectManager->get(ExtensibleDataObjectConverter::class);
     }
 
     /**
-     * @param ExtensibleDataInterface $entity
-     * @return array
+     * @inheritdoc
      */
-    private function convertToArray(ExtensibleDataInterface $entity): array
+    protected function tearDown(): void
     {
-        return $this->objectManager
-            ->create(\Magento\Framework\Api\ExtensibleDataObjectConverter::class)
-            ->toFlatArray($entity);
+        if ($this->customerIdToDelete) {
+            $this->customerRepository->deleteById($this->customerIdToDelete);
+        }
+
+        parent::tearDown();
     }
 
     /**
@@ -57,16 +122,10 @@ private function convertToArray(ExtensibleDataInterface $entity): array
      */
     public function testCollectTotalsWithVirtual(): void
     {
-        $quote = $this->objectManager->create(Quote::class);
-        $quote->load('test01', 'reserved_order_id');
-
-        $productRepository = $this->objectManager->create(
-            ProductRepositoryInterface::class
-        );
-        $product = $productRepository->get('virtual-product', false, null, true);
+        $quote = $this->getQuoteByReservedOrderId->execute('test01');
+        $product = $this->productRepository->get('virtual-product', false, null, true);
         $quote->addProduct($product);
         $quote->collectTotals();
-
         $this->assertEquals(2, $quote->getItemsQty());
         $this->assertEquals(1, $quote->getVirtualItemsQty());
         $this->assertEquals(20, $quote->getGrandTotal());
@@ -75,15 +134,13 @@ public function testCollectTotalsWithVirtual(): void
 
     /**
      * @magentoDataFixture Magento/Catalog/_files/product_virtual.php
-     * @magentoDataFixture Magento/Quote/_files/empty_quote.php
+     *
      * @return void
      */
-    public function testGetAddressWithVirtualProduct()
+    public function testGetAddressWithVirtualProduct(): void
     {
-        /** @var Quote $quote */
         $quote = $this->objectManager->create(Quote::class);
-        $quote->load('reserved_order_id_1', 'reserved_order_id');
-        $billingAddress = $this->objectManager->create(AddressInterface::class);
+        $billingAddress = $this->addressFactory->create();
         $billingAddress->setFirstname('Joe')
             ->setLastname('Doe')
             ->setCountryId('US')
@@ -93,7 +150,7 @@ public function testGetAddressWithVirtualProduct()
             ->setPostcode('11501')
             ->setTelephone('123456789');
         $quote->setBillingAddress($billingAddress);
-        $shippingAddress = $this->objectManager->create(AddressInterface::class);
+        $shippingAddress = $this->addressFactory->create();
         $shippingAddress->setFirstname('Joe')
             ->setLastname('Doe')
             ->setCountryId('US')
@@ -103,10 +160,7 @@ public function testGetAddressWithVirtualProduct()
             ->setPostcode('07102')
             ->setTelephone('9734685221');
         $quote->setShippingAddress($shippingAddress);
-        $productRepository = $this->objectManager->create(
-            ProductRepositoryInterface::class
-        );
-        $product = $productRepository->get('virtual-product', false, null, true);
+        $product = $this->productRepository->get('virtual-product', false, null, true);
         $quote->addProduct($product);
         $quote->save();
         $expectedAddress = $quote->getBillingAddress();
@@ -118,73 +172,43 @@ public function testGetAddressWithVirtualProduct()
      */
     public function testSetCustomerData(): void
     {
-        /** @var Quote $quote */
-        $quote = $this->objectManager->create(Quote::class);
-        /** @var CustomerInterfaceFactory $customerFactory */
-        $customerFactory = $this->objectManager->create(
-            CustomerInterfaceFactory::class
-        );
-        /** @var \Magento\Framework\Api\DataObjectHelper $dataObjectHelper */
-        $dataObjectHelper = $this->objectManager->create(\Magento\Framework\Api\DataObjectHelper::class);
-        $expected = $this->_getCustomerDataArray();
-        $customer = $customerFactory->create();
-        $dataObjectHelper->populateWithArray(
-            $customer,
-            $expected,
-            \Magento\Customer\Api\Data\CustomerInterface::class
-        );
-
-        $this->assertEquals($expected, $this->convertToArray($customer));
+        $quote = $this->quoteFactory->create();
+        $expected = $this->getCustomerDataArray();
+        $customer = $this->customerDataFactory->create();
+        $this->dataObjectHelper->populateWithArray($customer, $expected, CustomerInterfaceFactory::class);
+        $this->assertEquals($expected, $this->extensibleDataObjectConverter->toFlatArray($customer));
         $quote->setCustomer($customer);
         $customer = $quote->getCustomer();
-        $this->assertEquals($expected, $this->convertToArray($customer));
-        $this->assertEquals('qa@example.com', $quote->getCustomerEmail());
-        $this->assertEquals('Joe', $quote->getCustomerFirstname());
-        $this->assertEquals('Dou', $quote->getCustomerLastname());
-        $this->assertEquals('Ivan', $quote->getCustomerMiddlename());
+        $this->assertEquals($expected, $this->extensibleDataObjectConverter->toFlatArray($customer));
+        $this->assertEquals($expected[CustomerInterface::EMAIL], $quote->getCustomerEmail());
+        $this->assertEquals($expected[CustomerInterface::FIRSTNAME], $quote->getCustomerFirstname());
+        $this->assertEquals($expected[CustomerInterface::LASTNAME], $quote->getCustomerLastname());
+        $this->assertEquals($expected[CustomerInterface::MIDDLENAME], $quote->getCustomerMiddlename());
     }
 
     /**
+     * @magentoAppArea adminhtml
+     *
      * @return void
      */
     public function testUpdateCustomerData(): void
     {
-        /** @var Quote $quote */
-        $quote = $this->objectManager->create(Quote::class);
-        $customerFactory = $this->objectManager->create(
-            CustomerInterfaceFactory::class
-        );
-        /** @var \Magento\Framework\Api\DataObjectHelper $dataObjectHelper */
-        $dataObjectHelper = $this->objectManager->create(\Magento\Framework\Api\DataObjectHelper::class);
-        $expected = $this->_getCustomerDataArray();
-        //For save in repository
-        $expected = $this->removeIdFromCustomerData($expected);
-        $customerDataSet = $customerFactory->create();
-        $dataObjectHelper->populateWithArray(
-            $customerDataSet,
-            $expected,
-            \Magento\Customer\Api\Data\CustomerInterface::class
-        );
-        $this->assertEquals($expected, $this->convertToArray($customerDataSet));
-        /**
-         * @var \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
-         */
-        $customerRepository = $this->objectManager
-            ->create(\Magento\Customer\Api\CustomerRepositoryInterface::class);
-        $customerRepository->save($customerDataSet);
+        $quote = $this->quoteFactory->create();
+        $expected = $this->getCustomerDataArray();
+        unset($expected[CustomerInterface::ID]);
+        $customerDataSet = $this->customerDataFactory->create();
+        $this->dataObjectHelper->populateWithArray($customerDataSet, $expected, CustomerInterface::class);
+        $this->assertEquals($expected, $this->extensibleDataObjectConverter->toFlatArray($customerDataSet));
+        $customer = $this->customerRepository->save($customerDataSet);
+        $this->customerIdToDelete = $customer->getId();
         $quote->setCustomer($customerDataSet);
-        $expected = $this->_getCustomerDataArray();
-        $expected = $this->changeEmailInCustomerData('test@example.com', $expected);
-        $customerDataUpdated = $customerFactory->create();
-        $dataObjectHelper->populateWithArray(
-            $customerDataUpdated,
-            $expected,
-            \Magento\Customer\Api\Data\CustomerInterface::class
-        );
+        $expected = $this->getCustomerDataArray();
+        $expected[CustomerInterface::EMAIL] = 'test@example.com';
+        $customerDataUpdated = $this->customerDataFactory->create();
+        $this->dataObjectHelper->populateWithArray($customerDataUpdated, $expected, CustomerInterface::class);
         $quote->updateCustomerData($customerDataUpdated);
         $customer = $quote->getCustomer();
-        $expected = $this->changeEmailInCustomerData('test@example.com', $expected);
-        $actual = $this->convertToArray($customer);
+        $actual = $this->extensibleDataObjectConverter->toFlatArray($customer);
         foreach ($expected as $item) {
             $this->assertContains($item, $actual);
         }
@@ -198,19 +222,11 @@ public function testUpdateCustomerData(): void
      */
     public function testGetCustomerGroupFromCustomer(): void
     {
-        /** Preconditions */
-        /** @var CustomerInterfaceFactory $customerFactory */
-        $customerFactory = $this->objectManager->create(
-            CustomerInterfaceFactory::class
-        );
         $customerGroupId = 3;
-        $customerData = $customerFactory->create()->setId(1)->setGroupId($customerGroupId);
-        /** @var Quote $quote */
-        $quote = $this->objectManager->create(Quote::class);
+        $customerData = $this->customerDataFactory->create()->setId(1)->setGroupId($customerGroupId);
+        $quote = $this->quoteFactory->create();
         $quote->setCustomer($customerData);
         $quote->unsetData('customer_group_id');
-
-        /** Execute SUT */
         $this->assertEquals($customerGroupId, $quote->getCustomerGroupId(), "Customer group ID is invalid");
     }
 
@@ -220,19 +236,11 @@ public function testGetCustomerGroupFromCustomer(): void
      */
     public function testGetCustomerTaxClassId(): void
     {
-        /**
-         * Preconditions: create quote and assign ID of customer group created in fixture to it.
-         */
         $fixtureGroupCode = 'custom_group';
         $fixtureTaxClassId = 3;
-        /** @var \Magento\Customer\Model\Group $group */
-        $group = $this->objectManager->create(\Magento\Customer\Model\Group::class);
-        $fixtureGroupId = $group->load($fixtureGroupCode, 'customer_group_code')->getId();
-        /** @var Quote $quote */
-        $quote = $this->objectManager->create(Quote::class);
+        $fixtureGroupId = $this->groupFactory->create()->load($fixtureGroupCode, 'customer_group_code')->getId();
+        $quote = $this->quoteFactory->create();
         $quote->setCustomerGroupId($fixtureGroupId);
-
-        /** Execute SUT */
         $this->assertEquals($fixtureTaxClassId, $quote->getCustomerTaxClassId(), 'Customer tax class ID is invalid.');
     }
 
@@ -246,60 +254,37 @@ public function testGetCustomerTaxClassId(): void
      */
     public function testAssignCustomerWithAddressChangeAddressesNotSpecified(): void
     {
-        /** Preconditions:
-         * Customer with two addresses created
-         * First address is default billing, second is default shipping.
-         */
-        /** @var Quote $quote */
-        $quote = $this->objectManager->create(Quote::class);
-        $customerData = $this->_prepareQuoteForTestAssignCustomerWithAddressChange($quote);
-
-        /** Execute SUT */
+        $quote = $this->quoteFactory->create();
+        $customerData = $this->prepareQuoteForTestAssignCustomerWithAddressChange($quote);
         $quote->assignCustomerWithAddressChange($customerData);
-
-        /** Check if SUT caused expected effects */
         $fixtureCustomerId = 1;
         $this->assertEquals($fixtureCustomerId, $quote->getCustomerId(), 'Customer ID in quote is invalid.');
         $expectedBillingAddressData = [
-            'street' => 'Green str, 67',
-            'telephone' => 3468676,
-            'postcode' => 75477,
-            'country_id' => 'US',
-            'city' => 'CityM',
-            'lastname' => 'Smith',
-            'firstname' => 'John',
-            'customer_id' => 1,
-            'customer_address_id' => 1,
-            'region_id' => 1
+            AddressInterface::KEY_STREET => 'Green str, 67',
+            AddressInterface::KEY_TELEPHONE => 3468676,
+            AddressInterface::KEY_POSTCODE => 75477,
+            AddressInterface::KEY_COUNTRY_ID => 'US',
+            AddressInterface::KEY_CITY => 'CityM',
+            AddressInterface::KEY_LASTNAME => 'Smith',
+            AddressInterface::KEY_FIRSTNAME => 'John',
+            AddressInterface::KEY_CUSTOMER_ID => 1,
+            AddressInterface::CUSTOMER_ADDRESS_ID => 1,
+            AddressInterface::KEY_REGION_ID => 1,
         ];
-        $billingAddress = $quote->getBillingAddress();
-        foreach ($expectedBillingAddressData as $field => $value) {
-            $this->assertEquals(
-                $value,
-                $billingAddress->getData($field),
-                "'{$field}' value in quote billing address is invalid."
-            );
-        }
+        $this->assertQuoteAddress($expectedBillingAddressData, $quote->getBillingAddress());
         $expectedShippingAddressData = [
-            'customer_address_id' => 2,
-            'telephone' => 3234676,
-            'postcode' => 47676,
-            'country_id' => 'US',
-            'city' => 'CityX',
-            'street' => 'Black str, 48',
-            'lastname' => 'Smith',
-            'firstname' => 'John',
-            'customer_id' => 1,
-            'region_id' => 1
+            AddressInterface::CUSTOMER_ADDRESS_ID => 2,
+            AddressInterface::KEY_TELEPHONE => 3234676,
+            AddressInterface::KEY_POSTCODE => 47676,
+            AddressInterface::KEY_COUNTRY_ID => 'US',
+            AddressInterface::KEY_CITY => 'CityX',
+            AddressInterface::KEY_STREET => 'Black str, 48',
+            AddressInterface::KEY_LASTNAME => 'Smith',
+            AddressInterface::KEY_FIRSTNAME => 'John',
+            AddressInterface::KEY_CUSTOMER_ID => 1,
+            AddressInterface::KEY_REGION_ID => 1,
         ];
-        $shippingAddress = $quote->getShippingAddress();
-        foreach ($expectedShippingAddressData as $field => $value) {
-            $this->assertEquals(
-                $value,
-                $shippingAddress->getData($field),
-                "'{$field}' value in quote shipping address is invalid."
-            );
-        }
+        $this->assertQuoteAddress($expectedShippingAddressData, $quote->getShippingAddress());
     }
 
     /**
@@ -312,63 +297,37 @@ public function testAssignCustomerWithAddressChangeAddressesNotSpecified(): void
      */
     public function testAssignCustomerWithAddressChange(): void
     {
-        /** Preconditions:
-         * Customer with two addresses created
-         * First address is default billing, second is default shipping.
-         */
-        /** @var Quote $quote */
-        $quote = $this->objectManager->create(Quote::class);
-        $customerData = $this->_prepareQuoteForTestAssignCustomerWithAddressChange($quote);
-        /** @var \Magento\Quote\Model\Quote\Address $quoteBillingAddress */
+        $quote = $this->quoteFactory->create();
+        $customerData = $this->prepareQuoteForTestAssignCustomerWithAddressChange($quote);
         $expectedBillingAddressData = [
-            'street' => 'Billing str, 67',
-            'telephone' => 16546757,
-            'postcode' => 2425457,
-            'country_id' => 'US',
-            'city' => 'CityBilling',
-            'lastname' => 'LastBilling',
-            'firstname' => 'FirstBilling',
-            'region_id' => 1
+            AddressInterface::KEY_STREET => 'Billing str, 67',
+            AddressInterface::KEY_TELEPHONE => 16546757,
+            AddressInterface::KEY_POSTCODE => 2425457,
+            AddressInterface::KEY_COUNTRY_ID => 'US',
+            AddressInterface::KEY_CITY => 'CityBilling',
+            AddressInterface::KEY_LASTNAME => 'LastBilling',
+            AddressInterface::KEY_FIRSTNAME => 'FirstBilling',
+            AddressInterface::KEY_REGION_ID => 1,
         ];
-        $quoteBillingAddress = $this->objectManager->create(\Magento\Quote\Model\Quote\Address::class);
+        $quoteBillingAddress = $this->addressFactory->create();
         $quoteBillingAddress->setData($expectedBillingAddressData);
-
         $expectedShippingAddressData = [
-            'telephone' => 787878787,
-            'postcode' => 117785,
-            'country_id' => 'US',
-            'city' => 'CityShipping',
-            'street' => 'Shipping str, 48',
-            'lastname' => 'LastShipping',
-            'firstname' => 'FirstShipping',
-            'region_id' => 1
+            AddressInterface::KEY_TELEPHONE => 787878787,
+            AddressInterface::KEY_POSTCODE => 117785,
+            AddressInterface::KEY_COUNTRY_ID => 'US',
+            AddressInterface::KEY_CITY => 'CityShipping',
+            AddressInterface::KEY_STREET => 'Shipping str, 48',
+            AddressInterface::KEY_LASTNAME => 'LastShipping',
+            AddressInterface::KEY_FIRSTNAME => 'FirstShipping',
+            AddressInterface::KEY_REGION_ID => 1,
         ];
-        $quoteShippingAddress = $this->objectManager->create(\Magento\Quote\Model\Quote\Address::class);
+        $quoteShippingAddress = $this->addressFactory->create();
         $quoteShippingAddress->setData($expectedShippingAddressData);
-
-        /** Execute SUT */
         $quote->assignCustomerWithAddressChange($customerData, $quoteBillingAddress, $quoteShippingAddress);
-
-        /** Check if SUT caused expected effects */
         $fixtureCustomerId = 1;
         $this->assertEquals($fixtureCustomerId, $quote->getCustomerId(), 'Customer ID in quote is invalid.');
-
-        $billingAddress = $quote->getBillingAddress();
-        foreach ($expectedBillingAddressData as $field => $value) {
-            $this->assertEquals(
-                $value,
-                $billingAddress->getData($field),
-                "'{$field}' value in quote billing address is invalid."
-            );
-        }
-        $shippingAddress = $quote->getShippingAddress();
-        foreach ($expectedShippingAddressData as $field => $value) {
-            $this->assertEquals(
-                $value,
-                $shippingAddress->getData($field),
-                "'{$field}' value in quote shipping address is invalid."
-            );
-        }
+        $this->assertQuoteAddress($expectedBillingAddressData, $quote->getBillingAddress());
+        $this->assertQuoteAddress($expectedShippingAddressData, $quote->getShippingAddress());
     }
 
     /**
@@ -379,14 +338,11 @@ public function testAssignCustomerWithAddressChange(): void
      * @magentoDataFixture Magento/Backend/_files/allowed_countries_fr.php
      * @return void
      */
-    public function testAssignCustomerWithAddressChangeWithNotAllowedCountry()
+    public function testAssignCustomerWithAddressChangeWithNotAllowedCountry(): void
     {
-        /** @var Quote $quote */
-        $quote = $this->objectManager->create(Quote::class);
-        $customerData = $this->_prepareQuoteForTestAssignCustomerWithAddressChange($quote);
+        $quote = $this->quoteFactory->create();
+        $customerData = $this->prepareQuoteForTestAssignCustomerWithAddressChange($quote);
         $quote->assignCustomerWithAddressChange($customerData);
-
-        /** Check that addresses are empty */
         $this->assertNull($quote->getBillingAddress()->getCountryId());
         $this->assertNull($quote->getShippingAddress()->getCountryId());
     }
@@ -397,17 +353,9 @@ public function testAssignCustomerWithAddressChangeWithNotAllowedCountry()
      */
     public function testAddProductUpdateItem(): void
     {
-        /** @var Quote $quote */
-        $quote = $this->objectManager->create(Quote::class);
-        $quote->load('test01', 'reserved_order_id');
-
+        $quote = $this->quoteFactory->create();
         $productStockQty = 100;
-
-        $productRepository = $this->objectManager->create(
-            ProductRepositoryInterface::class
-        );
-        $product = $productRepository->get('simple-1', false, null, true);
-
+        $product = $this->productRepository->get('simple-1', false, null, true);
         $quote->addProduct($product, 50);
         $quote->setTotalsCollectedFlag(false)->collectTotals();
         $this->assertEquals(50, $quote->getItemsQty());
@@ -418,98 +366,19 @@ public function testAddProductUpdateItem(): void
             'related_product' => '',
             'product' => $product->getId(),
             'qty' => 1,
-            'id' => 0
+            'id' => 0,
         ];
         $updateParams = new \Magento\Framework\DataObject($params);
         $quote->updateItem($updateParams['id'], $updateParams);
         $quote->setTotalsCollectedFlag(false)->collectTotals();
         $this->assertEquals(1, $quote->getItemsQty());
-
-        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectException(LocalizedException::class);
         // TODO: fix test or implementation as described in https://github.com/magento-engcom/msi/issues/1037
 //        $this->expectExceptionMessage('The requested qty is not available');
         $updateParams['qty'] = $productStockQty + 1;
         $quote->updateItem($updateParams['id'], $updateParams);
     }
 
-    /**
-     * Prepare quote for testing assignCustomerWithAddressChange method.
-     *
-     * Customer with two addresses created. First address is default billing, second is default shipping.
-     *
-     * @param Quote $quote
-     * @return CustomerInterface
-     */
-    protected function _prepareQuoteForTestAssignCustomerWithAddressChange(Quote $quote): CustomerInterface
-    {
-        $customerRepository = $this->objectManager->create(
-            CustomerRepositoryInterface::class
-        );
-        $fixtureCustomerId = 1;
-        /** @var \Magento\Customer\Model\Customer $customer */
-        $customer = $this->objectManager->create(\Magento\Customer\Model\Customer::class);
-        $fixtureSecondAddressId = 2;
-        $customer->load($fixtureCustomerId)->setDefaultShipping($fixtureSecondAddressId)->save();
-        $customerData = $customerRepository->getById($fixtureCustomerId);
-        $this->assertEmpty(
-            $quote->getBillingAddress()->getId(),
-            "Precondition failed: billing address should be empty."
-        );
-        $this->assertEmpty(
-            $quote->getShippingAddress()->getId(),
-            "Precondition failed: shipping address should be empty."
-        );
-        return $customerData;
-    }
-
-    /**
-     * @param string $email
-     * @param array $customerData
-     * @return array
-     */
-    protected function changeEmailInCustomerData(string $email, array $customerData): array
-    {
-        $customerData[\Magento\Customer\Model\Data\Customer::EMAIL] = $email;
-        return $customerData;
-    }
-
-    /**
-     * @param array $customerData
-     * @return array
-     */
-    protected function removeIdFromCustomerData(array $customerData): array
-    {
-        unset($customerData[\Magento\Customer\Model\Data\Customer::ID]);
-        return $customerData;
-    }
-
-    /**
-     * @return array
-     */
-    protected function _getCustomerDataArray(): array
-    {
-        return [
-            Customer::CONFIRMATION => 'test',
-            Customer::CREATED_AT => '2/3/2014',
-            Customer::CREATED_IN => 'Default',
-            Customer::DEFAULT_BILLING => 'test',
-            Customer::DEFAULT_SHIPPING => 'test',
-            Customer::DOB => '2014-02-03 00:00:00',
-            Customer::EMAIL => 'qa@example.com',
-            Customer::FIRSTNAME => 'Joe',
-            Customer::GENDER => 0,
-            Customer::GROUP_ID => \Magento\Customer\Model\GroupManagement::NOT_LOGGED_IN_ID,
-            Customer::ID => 1,
-            Customer::LASTNAME => 'Dou',
-            Customer::MIDDLENAME => 'Ivan',
-            Customer::PREFIX => 'Dr.',
-            Customer::STORE_ID => 1,
-            Customer::SUFFIX => 'Jr.',
-            Customer::TAXVAT => 1,
-            Customer::WEBSITE_ID => 1
-        ];
-    }
-
     /**
      * Test to verify that reserved_order_id will be changed if it already in used
      *
@@ -519,9 +388,7 @@ protected function _getCustomerDataArray(): array
      */
     public function testReserveOrderId(): void
     {
-        /** @var Quote  $quote */
-        $quote = $this->objectManager->create(Quote::class);
-        $quote->load('reserved_order_id', 'reserved_order_id');
+        $quote = $this->getQuoteByReservedOrderId->execute('reserved_order_id');
         $quote->reserveOrderId();
         $this->assertEquals('reserved_order_id', $quote->getReservedOrderId());
         $quote->setReservedOrderId('100000001');
@@ -536,19 +403,10 @@ public function testReserveOrderId(): void
      */
     public function testAddedProductToQuoteIsSalable(): void
     {
-        $productId = 99;
-
-        /** @var ProductRepository $productRepository */
-        $productRepository = $this->objectManager->get(ProductRepository::class);
-
-        /** @var Quote  $quote */
-        $product = $productRepository->getById($productId, false, null, true);
-
+        $product = $this->productRepository->getById(99, false, null, true);
         $this->expectException(LocalizedException::class);
-        $this->expectExceptionMessage('Product that you are trying to add is not available.');
-
-        $quote = $this->objectManager->create(Quote::class);
-        $quote->addProduct($product);
+        $this->expectExceptionMessage((string)__('Product that you are trying to add is not available.'));
+        $this->quoteFactory->create()->addProduct($product);
     }
 
     /**
@@ -558,20 +416,15 @@ public function testAddedProductToQuoteIsSalable(): void
      */
     public function testGetItemById(): void
     {
-        $quote = $this->objectManager->create(Quote::class);
-        $quote->load('test01', 'reserved_order_id');
-
-        $quoteItem = $this->objectManager->create(\Magento\Quote\Model\Quote\Item::class);
-
-        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
-        $product = $productRepository->get('simple');
-
+        $quote = $this->getQuoteByReservedOrderId->execute('test01');
+        $quoteItem = $this->itemFactory->create();
+        $product = $this->productRepository->get('simple');
         $quoteItem->setProduct($product);
         $quote->addItem($quoteItem);
         $quote->save();
-
-        $this->assertInstanceOf(\Magento\Quote\Model\Quote\Item::class, $quote->getItemById($quoteItem->getId()));
-        $this->assertEquals($quoteItem->getId(), $quote->getItemById($quoteItem->getId())->getId());
+        $item = $quote->getItemById($quoteItem->getId());
+        $this->assertInstanceOf(CartItemInterface::class, $item);
+        $this->assertEquals($quoteItem->getId(), $item->getId());
     }
 
     /**
@@ -586,42 +439,32 @@ public function testGetItemById(): void
      *
      * @magentoDataFixture Magento/Sales/_files/quote.php
      * @dataProvider giftMessageDataProvider
-     * @throws LocalizedException
      * @return void
      */
     public function testMerge(
-        $guestItemGiftMessageId,
-        $customerItemGiftMessageId,
-        $guestOrderGiftMessageId,
-        $customerOrderGiftMessageId,
-        $expectedItemGiftMessageId,
-        $expectedOrderGiftMessageId
+        ?int $guestItemGiftMessageId,
+        ?int $customerItemGiftMessageId,
+        ?int $guestOrderGiftMessageId,
+        ?int $customerOrderGiftMessageId,
+        ?int $expectedItemGiftMessageId,
+        ?int $expectedOrderGiftMessageId
     ): void {
-        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
-        $product = $productRepository->get('simple', false, null, true);
-
-        /** @var Quote  $quote */
-        $guestQuote = $this->getQuote('test01');
+        $product = $this->productRepository->get('simple', false, null, true);
+        $guestQuote = $this->getQuoteByReservedOrderId->execute('test01');
         $guestQuote->setGiftMessageId($guestOrderGiftMessageId);
-
-        /** @var Quote  $customerQuote */
-        $customerQuote = $this->objectManager->create(Quote::class);
+        $customerQuote = $this->quoteFactory->create();
         $customerQuote->setReservedOrderId('test02')
             ->setStoreId($guestQuote->getStoreId())
             ->addProduct($product);
         $customerQuote->setGiftMessageId($customerOrderGiftMessageId);
-
         $guestItem = $guestQuote->getItemByProduct($product);
         $guestItem->setGiftMessageId($guestItemGiftMessageId);
-
         $customerItem = $customerQuote->getItemByProduct($product);
         $customerItem->setGiftMessageId($customerItemGiftMessageId);
-
         $customerQuote->merge($guestQuote);
         $mergedItemItem = $customerQuote->getItemByProduct($product);
-
-        self::assertEquals($expectedOrderGiftMessageId, $customerQuote->getGiftMessageId());
-        self::assertEquals($expectedItemGiftMessageId, $mergedItemItem->getGiftMessageId());
+        $this->assertEquals($expectedOrderGiftMessageId, $customerQuote->getGiftMessageId());
+        $this->assertEquals($expectedItemGiftMessageId, $mergedItemItem->getGiftMessageId());
     }
 
     /**
@@ -638,7 +481,7 @@ public function giftMessageDataProvider(): array
                 'guestOrderId' => null,
                 'customerOrderId' => 11,
                 'expectedItemId' => 1,
-                'expectedOrderId' => 11
+                'expectedOrderId' => 11,
             ],
             [
                 'guestItemId' => 1,
@@ -646,28 +489,252 @@ public function giftMessageDataProvider(): array
                 'guestOrderId' => 11,
                 'customerOrderId' => 22,
                 'expectedItemId' => 1,
-                'expectedOrderId' => 11
-            ]
+                'expectedOrderId' => 11,
+            ],
+        ];
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_with_custom_file_option.php
+     *
+     * @return void
+     */
+    public function testAddProductWithoutChosenOptions(): void
+    {
+        $quote = $this->quoteFactory->create();
+        $product = $this->productRepository->get('simple_with_custom_file_option');
+        $result = $quote->addProduct($product);
+        $this->assertEquals(
+            (string)__(
+                'The product\'s required option(s) weren\'t entered. Make sure the options are entered and try again.'
+            ),
+            $result
+        );
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_duplicated.php
+     *
+     * @return void
+     */
+    public function testAddProductWithInvalidRequestParams(): void
+    {
+        $quote = $this->quoteFactory->create();
+        $product = $this->productRepository->get('simple-1');
+        $this->expectExceptionObject(
+            new LocalizedException(__('We found an invalid request for adding product to quote.'))
+        );
+        $quote->addProduct($product, '');
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_out_of_stock.php
+     *
+     * @return void
+     */
+    public function testAddProductOutOfStock(): void
+    {
+        $quote = $this->quoteFactory->create();
+        $product = $this->productRepository->get('simple-out-of-stock');
+        $this->expectExceptionObject(
+            new LocalizedException(__('Product that you are trying to add is not available.'))
+        );
+        $quote->addProduct($product, 1);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_duplicated.php
+     *
+     * @return void
+     */
+    public function testAddProductWithMoreQty(): void
+    {
+        $quote = $this->quoteFactory->create();
+        $product = $this->productRepository->get('simple-1');
+        $this->expectExceptionObject(new LocalizedException(__('The requested qty is not available')));
+        $quote->addProduct($product, 1500);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/simple_product_with_qty_increments.php
+     *
+     * @return void
+     */
+    public function testAddProductWithQtyIncrements(): void
+    {
+        $quote = $this->quoteFactory->create();
+        $product = $this->productRepository->get('simple_product_with_qty_increments');
+        $this->expectExceptionObject(
+            new LocalizedException(__('You can buy this product only in quantities of %1 at a time.', 3))
+        );
+        $quote->addProduct($product, 1);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/simple_product_min_max_sale_qty.php
+     * @magentoAppIsolation enabled
+     *
+     * @return void
+     */
+    public function testAddProductWithMinSaleQty(): void
+    {
+        $quote = $this->quoteFactory->create();
+        $product = $this->productRepository->get('simple_product_min_max_sale_qty');
+        $messages = [
+            (string)__('The fewest you may purchase is %1.', 5),
+            (string)__('The fewest you may purchase is %1', 5),
+        ];
+        $this->expectException(LocalizedException::class);
+        $this->expectExceptionMessageMatches('/' . implode('|', $messages) . '/');
+        $quote->addProduct($product, 1);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/simple_product_min_max_sale_qty.php
+     *
+     * @return void
+     */
+    public function testAddProductWithMaxSaleQty(): void
+    {
+        $quote = $this->quoteFactory->create();
+        $product = $this->productRepository->get('simple_product_min_max_sale_qty');
+        $messages = [
+            (string)__('The most you may purchase is %1.', 20),
+            (string)__('The requested qty exceeds the maximum qty allowed in shopping cart'),
+        ];
+        $this->expectException(LocalizedException::class);
+        $this->expectExceptionMessageMatches('/' . implode('|', $messages) . '/');
+        $quote->addProduct($product, 25);
+    }
+
+    /**
+     * @magentoConfigFixture current_store cataloginventory/item_options/enable_qty_increments 1
+     * @magentoConfigFixture current_store cataloginventory/item_options/qty_increments 3
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_duplicated.php
+     * @magentoAppIsolation enabled
+     *
+     * @return void
+     */
+    public function testAddProductWithConfigQtyIncrements(): void
+    {
+        $quote = $this->quoteFactory->create();
+        $product = $this->productRepository->get('simple-1');
+        $this->expectExceptionObject(
+            new LocalizedException(__('You can buy this product only in quantities of %1 at a time.', 3))
+        );
+        $quote->addProduct($product, 1);
+    }
+
+    /**
+     * @magentoConfigFixture current_store cataloginventory/item_options/min_sale_qty 5
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_duplicated.php
+     * @magentoAppIsolation enabled
+     *
+     * @return void
+     */
+    public function testAddProductWithConfigMinSaleQty(): void
+    {
+        $quote = $this->quoteFactory->create();
+        $product = $this->productRepository->get('simple-1');
+        $messages = [
+            (string)__('The fewest you may purchase is %1.', 5),
+            (string)__('The fewest you may purchase is %1', 5),
+        ];
+        $this->expectException(LocalizedException::class);
+        $this->expectExceptionMessageMatches('/' . implode('|', $messages) . '/');
+        $quote->addProduct($product, 1);
+    }
+
+    /**
+     * @magentoConfigFixture current_store cataloginventory/item_options/max_sale_qty 20
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_duplicated.php
+     * @magentoAppIsolation enabled
+     *
+     * @return void
+     */
+    public function testAddProductWithConfigMaxSaleQty(): void
+    {
+        $quote = $this->quoteFactory->create();
+        $product = $this->productRepository->get('simple-1');
+        $messages = [
+            (string)__('The most you may purchase is %1.', 20),
+            (string)__('The requested qty exceeds the maximum qty allowed in shopping cart'),
         ];
+        $this->expectException(LocalizedException::class);
+        $this->expectExceptionMessageMatches('/' . implode('|', $messages) . '/');
+        $quote->addProduct($product, 25);
     }
 
     /**
-     * Gets quote by reserved order id.
+     * Assert address in quote.
      *
-     * @param string $reservedOrderId
-     * @return Quote
+     * @param array $expectedAddress
+     * @param AddressInterface $quoteAddress
+     * @return void
+     */
+    private function assertQuoteAddress(array $expectedAddress, AddressInterface $quoteAddress): void
+    {
+        foreach ($expectedAddress as $field => $value) {
+            $this->assertEquals(
+                $value,
+                $quoteAddress->getData($field),
+                sprintf('"%s" value in quote %s address is invalid.', $field, $quoteAddress->getAddressType())
+            );
+        }
+    }
+
+    /**
+     * Prepare quote for testing assignCustomerWithAddressChange method.
+     * Customer with two addresses created. First address is default billing, second is default shipping.
+     *
+     * @param CartInterface $quote
+     * @return CustomerInterface
      */
-    private function getQuote(string $reservedOrderId): Quote
+    private function prepareQuoteForTestAssignCustomerWithAddressChange(CartInterface $quote): CustomerInterface
     {
-        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
-        $searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
-        $searchCriteria = $searchCriteriaBuilder->addFilter('reserved_order_id', $reservedOrderId)
-            ->create();
+        $fixtureCustomerId = 1;
+        $fixtureSecondAddressId = 2;
+        $customer = $this->customerFactory->create();
+        $this->customerResourceModel->load($customer, $fixtureCustomerId);
+        $customer->setDefaultShipping($fixtureSecondAddressId);
+        $this->customerResourceModel->save($customer);
+        $customerData = $customer->getDataModel();
+        $this->assertEmpty(
+            $quote->getBillingAddress()->getId(),
+            "Precondition failed: billing address should be empty."
+        );
+        $this->assertEmpty(
+            $quote->getShippingAddress()->getId(),
+            "Precondition failed: shipping address should be empty."
+        );
 
-        /** @var CartRepositoryInterface $quoteRepository */
-        $quoteRepository = $this->objectManager->get(CartRepositoryInterface::class);
-        $items = $quoteRepository->getList($searchCriteria)->getItems();
+        return $customerData;
+    }
 
-        return array_pop($items);
+    /**
+     * @return array
+     */
+    private function getCustomerDataArray(): array
+    {
+        return [
+            CustomerInterface::CONFIRMATION => 'test',
+            CustomerInterface::CREATED_AT => '2/3/2014',
+            CustomerInterface::CREATED_IN => 'Default',
+            CustomerInterface::DEFAULT_BILLING => 'test',
+            CustomerInterface::DEFAULT_SHIPPING => 'test',
+            CustomerInterface::DOB => '2014-02-03 00:00:00',
+            CustomerInterface::EMAIL => 'qa@example.com',
+            CustomerInterface::FIRSTNAME => 'Joe',
+            CustomerInterface::GENDER => 0,
+            CustomerInterface::GROUP_ID => GroupManagement::NOT_LOGGED_IN_ID,
+            CustomerInterface::ID => 1,
+            CustomerInterface::LASTNAME => 'Dou',
+            CustomerInterface::MIDDLENAME => 'Ivan',
+            CustomerInterface::PREFIX => 'Dr.',
+            CustomerInterface::STORE_ID => 1,
+            CustomerInterface::SUFFIX => 'Jr.',
+            CustomerInterface::TAXVAT => 1,
+            CustomerInterface::WEBSITE_ID => 1,
+        ];
     }
 }

From 133913e80d5641f39b22d2e970c5a9a1e44bdd63 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 1396/1718] 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 8d9d0a5ec0d16701c9fd391ce7c302d747e3d165 Mon Sep 17 00:00:00 2001
From: yolouiese <honeymay@abovethefray.io>
Date: Mon, 10 Aug 2020 22:03:50 +0800
Subject: [PATCH 1397/1718] 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 068ef6054c0a88a18876b1b89758b9548cd693b6 Mon Sep 17 00:00:00 2001
From: Deepty Thampy <dthampy@adobe.com>
Date: Mon, 10 Aug 2020 09:14:11 -0500
Subject: [PATCH 1398/1718] MC-36554: Customer should be able to re-use the
 payflowPro_cc_vault as payment method for subsequent orders

- added integration test to cover pay with vault use case
---
 ...ayflowProCcVaultAdditionalDataProvider.php |  41 ++
 .../PlaceOrderWithPayflowProCCVaultTest.php   | 362 ++++++++++++++++++
 2 files changed, 403 insertions(+)
 create mode 100644 app/code/Magento/PaypalGraphQl/Model/PayflowProCcVaultAdditionalDataProvider.php
 create mode 100644 dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowProCCVaultTest.php

diff --git a/app/code/Magento/PaypalGraphQl/Model/PayflowProCcVaultAdditionalDataProvider.php b/app/code/Magento/PaypalGraphQl/Model/PayflowProCcVaultAdditionalDataProvider.php
new file mode 100644
index 0000000000000..f06b634f8c228
--- /dev/null
+++ b/app/code/Magento/PaypalGraphQl/Model/PayflowProCcVaultAdditionalDataProvider.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\PaypalGraphQl\Model;
+
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\QuoteGraphQl\Model\Cart\Payment\AdditionalDataProviderInterface;
+
+/**
+ * Get payment additional data for Payflow pro payment
+ */
+class PayflowProCcVaultAdditionalDataProvider implements AdditionalDataProviderInterface
+{
+    private const PATH_ADDITIONAL_DATA = 'payflowpro_cc_vault';
+    /**
+     * Format Payflow input into value expected when setting payment method
+     *
+     * @param array $args
+     * @return array
+     */
+    public function getData(array $args): array
+    {
+        if (!isset($args[self::PATH_ADDITIONAL_DATA])) {
+            throw new GraphQlInputException(
+                __('Required parameter "payflowpro_cc_vault" for "payment_method" is missing.')
+            );
+        }
+
+        if (!isset($args[self::PATH_ADDITIONAL_DATA]['public_hash'])) {
+            throw new GraphQlInputException(
+                __('Required parameter "public_hash" for "payflowpro_cc_vault" is missing.')
+            );
+        }
+
+        return $args[self::PATH_ADDITIONAL_DATA];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowProCCVaultTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowProCCVaultTest.php
new file mode 100644
index 0000000000000..561a7c5d87b59
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowProCCVaultTest.php
@@ -0,0 +1,362 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\PaypalGraphQl\Model\Resolver\Customer;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Checkout\Api\Data\ShippingInformationInterface;
+use Magento\Checkout\Api\Data\ShippingInformationInterfaceFactory;
+use Magento\Checkout\Api\ShippingInformationManagementInterface;
+use Magento\Framework\Api\DataObjectHelper;
+use Magento\Framework\DataObject;
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Integration\Model\Oauth\Token;
+use Magento\PaypalGraphQl\PaypalPayflowProAbstractTest;
+use Magento\Quote\Api\BillingAddressManagementInterface;
+use Magento\Quote\Api\CartManagementInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\AddressInterface;
+use Magento\Quote\Api\Data\AddressInterfaceFactory;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\QuoteIdMask;
+use Magento\Quote\Model\QuoteIdMaskFactory;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteId;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\Quote\Model\ShippingAddressManagementInterface;
+use Magento\Vault\Api\Data\PaymentTokenInterface;
+use Magento\Vault\Model\PaymentTokenManagement;
+use Magento\Vault\Model\PaymentTokenRepository;
+
+/**
+ * End to end place order test using payflowpro_cc_vault via graphql endpoint for customer
+ *
+ * @magentoAppArea graphql
+ */
+class PlaceOrderWithPayflowProCCVaultTest extends PaypalPayflowProAbstractTest
+{
+    /**
+     * @var SerializerInterface
+     */
+    private $json;
+
+    /**
+     * @var QuoteIdToMaskedQuoteId
+     */
+    private $quoteIdToMaskedId;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->json = $this->objectManager->get(SerializerInterface::class);
+        $this->quoteIdToMaskedId = $this->objectManager->get(QuoteIdToMaskedQuoteId::class);
+    }
+
+    /**
+     * Place order use payflowpro method and save cart data to future
+     *
+     * @magentoDataFixture Magento/Sales/_files/default_rollback.php
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+     * @magentoDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+     *
+     * @return void
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testPlaceOrderWithCCVault(): void
+    {
+        $this->placeOrderPayflowPro('is_active_payment_token_enabler: true');
+        $publicHash = $this->getVaultCartData()->getPublicHash();
+        /** @var CartManagementInterface $cartManagement */
+        $cartManagement = $this->objectManager->get(CartManagementInterface::class);
+        /** @var CartRepositoryInterface $cartRepository */
+        $cartRepository = $this->objectManager->get(CartRepositoryInterface::class);
+        /** @var QuoteIdMaskFactory $quoteIdMaskFactory */
+        $quoteIdMaskFactory = $this->objectManager->get(QuoteIdMaskFactory::class);
+        $cartId = $cartManagement->createEmptyCartForCustomer(1);
+        $cart = $cartRepository->get($cartId);
+        $cart->setReservedOrderId('test_quote_1');
+        $cartRepository->save($cart);
+        /** @var QuoteIdMask $quoteIdMask */
+        $quoteIdMask = $quoteIdMaskFactory->create();
+        $quoteIdMask->setQuoteId($cartId)
+            ->save();
+
+        $reservedQuoteId = 'test_quote_1';
+        $cart = $this->getQuoteByReservedOrderId($reservedQuoteId);
+        $cartId = $this->quoteIdToMaskedId->execute((int)$cart->getId());
+
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        /** @var QuoteFactory $quoteFactory */
+        $quoteFactory = $this->objectManager->get(QuoteFactory::class);
+        /** @var QuoteResource $quoteResource */
+        $quoteResource = $this->objectManager->get(QuoteResource::class);
+        $product = $productRepository->get('simple_product');
+        $quote = $quoteFactory->create();
+        $quoteResource->load($quote, 'test_quote_1', 'reserved_order_id');
+        $quote->addProduct($product, 2);
+        $cartRepository->save($quote);
+
+        /** @var AddressInterfaceFactory $quoteAddressFactory */
+        $quoteAddressFactory = $this->objectManager->get(AddressInterfaceFactory::class);
+        /** @var DataObjectHelper $dataObjectHelper */
+        $dataObjectHelper = $this->objectManager->get(DataObjectHelper::class);
+        /** @var ShippingAddressManagementInterface $shippingAddressManagement */
+        $shippingAddressManagement = $this->objectManager->get(ShippingAddressManagementInterface::class);
+
+        $quoteAddressData = [
+            AddressInterface::KEY_TELEPHONE => 3468676,
+            AddressInterface::KEY_POSTCODE => '75477',
+            AddressInterface::KEY_COUNTRY_ID => 'US',
+            AddressInterface::KEY_CITY => 'CityM',
+            AddressInterface::KEY_COMPANY => 'CompanyName',
+            AddressInterface::KEY_STREET => 'Green str, 67',
+            AddressInterface::KEY_LASTNAME => 'Smith',
+            AddressInterface::KEY_FIRSTNAME => 'John',
+            AddressInterface::KEY_REGION_ID => 1,
+        ];
+        $quoteAddress = $quoteAddressFactory->create();
+        $dataObjectHelper->populateWithArray($quoteAddress, $quoteAddressData, AddressInterfaceFactory::class);
+
+        $quote = $quoteFactory->create();
+        $quoteResource->load($quote, 'test_quote_1', 'reserved_order_id');
+        $shippingAddressManagement->assign($quote->getId(), $quoteAddress);
+
+        /** @var BillingAddressManagementInterface $billingAddressManagement */
+        $billingAddressManagement = $this->objectManager->get(BillingAddressManagementInterface::class);
+        $billingAddressManagement->assign($quote->getId(), $quoteAddress);
+
+        /** @var ShippingInformationInterfaceFactory $shippingInformationFactory */
+        $shippingInformationFactory = $this->objectManager->get(ShippingInformationInterfaceFactory::class);
+        /** @var ShippingInformationManagementInterface $shippingInformationManagement */
+        $shippingInformationManagement = $this->objectManager->get(ShippingInformationManagementInterface::class);
+        $quoteAddress = $quote->getShippingAddress();
+
+        /** @var ShippingInformationInterface $shippingInformation */
+        $shippingInformation = $shippingInformationFactory->create([
+            'data' => [
+                ShippingInformationInterface::SHIPPING_ADDRESS => $quoteAddress,
+                ShippingInformationInterface::SHIPPING_CARRIER_CODE => 'flatrate',
+                ShippingInformationInterface::SHIPPING_METHOD_CODE => 'flatrate',
+            ],
+        ]);
+        $shippingInformationManagement->saveAddressInformation($quote->getId(), $shippingInformation);
+
+        $secondQuery = <<<QUERY
+mutation {
+setPaymentMethodOnCart(input: {
+payment_method: {
+  code: "payflowpro_cc_vault",
+    payflowpro_cc_vault: {
+      public_hash:"{$publicHash}"
+  }
+},
+cart_id: "{$cartId}"})
+{
+cart {
+  selected_payment_method {code}
+ }
+}
+placeOrder(input: {cart_id: "{$cartId}"}) {
+order {order_number}
+ }
+}
+QUERY;
+        /** @var Token $tokenModel */
+        $tokenModel = $this->objectManager->create(Token::class);
+        $customerToken = $tokenModel->createCustomerToken(1)->getToken();
+
+        $requestHeaders = [
+            'Content-Type' => 'application/json',
+            'Accept' => 'application/json',
+            'Authorization' => 'Bearer ' . $customerToken
+        ];
+        $vaultResponse = $this->graphQlRequest->send($secondQuery, [], '', $requestHeaders);
+
+        $responseData =  $this->json->unserialize($vaultResponse->getContent());
+        $this->assertArrayHasKey('data', $responseData);
+        $this->assertTrue(
+            isset($responseData['data']['setPaymentMethodOnCart']['cart']['selected_payment_method']['code'])
+        );
+        $this->assertEquals(
+            'payflowpro_cc_vault',
+            $responseData['data']['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']
+        );
+        $this->assertTrue(
+            isset($responseData['data']['placeOrder']['order']['order_number'])
+        );
+        $this->assertEquals(
+            'test_quote_1',
+            $responseData['data']['placeOrder']['order']['order_number']
+        );
+    }
+
+    /**
+     * @param $isActivePaymentTokenEnabler
+     *
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    private function placeOrderPayflowPro($isActivePaymentTokenEnabler)
+    {
+        $paymentMethod = 'payflowpro';
+        $this->enablePaymentMethod($paymentMethod);
+        $this->enablePaymentMethod('payflowpro_cc_vault');
+        $reservedQuoteId = 'test_quote';
+
+        $payload = 'BILLTOCITY=CityM&AMT=0.00&BILLTOSTREET=Green+str,+67&VISACARDLEVEL=12&SHIPTOCITY=CityM'
+            . '&NAMETOSHIP=John+Smith&ZIP=75477&BILLTOLASTNAME=Smith&BILLTOFIRSTNAME=John'
+            . '&RESPMSG=Verified&PROCCVV2=M&STATETOSHIP=AL&NAME=John+Smith&BILLTOZIP=75477&CVV2MATCH=Y'
+            . '&PNREF=B70CCC236815&ZIPTOSHIP=75477&SHIPTOCOUNTRY=US&SHIPTOSTREET=Green+str,+67&CITY=CityM'
+            . '&HOSTCODE=A&LASTNAME=Smith&STATE=AL&SECURETOKEN=MYSECURETOKEN&CITYTOSHIP=CityM&COUNTRYTOSHIP=US'
+            . '&AVSDATA=YNY&ACCT=1111&AUTHCODE=111PNI&FIRSTNAME=John&RESULT=0&IAVS=N&POSTFPSMSG=No+Rules+Triggered&'
+            . 'BILLTOSTATE=AL&BILLTOCOUNTRY=US&EXPDATE=0222&CARDTYPE=0&PREFPSMSG=No+Rules+Triggered&SHIPTOZIP=75477&'
+            . 'PROCAVS=A&COUNTRY=US&AVSZIP=N&ADDRESS=Green+str,+67&BILLTONAME=John+Smith&'
+            . 'ADDRESSTOSHIP=Green+str,+67&'
+            . 'AVSADDR=Y&SECURETOKENID=MYSECURETOKENID&SHIPTOSTATE=AL&TRANSTIME=2019-06-24+07%3A53%3A10';
+
+        $cart = $this->getQuoteByReservedOrderId($reservedQuoteId);
+        $cartId = $this->quoteIdToMaskedId->execute((int)$cart->getId());
+
+        $query = <<<QUERY
+mutation {
+    setPaymentMethodOnCart(input: {
+        payment_method: {
+          code: "{$paymentMethod}",
+            payflowpro: {
+              {$isActivePaymentTokenEnabler}
+              cc_details: {
+                 cc_exp_month: 12,
+                 cc_exp_year: 2030,
+                 cc_last_4: 1111,
+                 cc_type: "IV",
+              }
+          }
+        },
+        cart_id: "{$cartId}"})
+      {
+        cart {
+          selected_payment_method {
+            code
+          }
+        }
+      }
+      createPayflowProToken(
+        input: {
+          cart_id:"{$cartId}",
+          urls: {
+            cancel_url: "paypal/transparent/cancel/"
+            error_url: "paypal/transparent/error/"
+            return_url: "paypal/transparent/response/"
+          }
+        }
+      ) {
+          response_message
+          result
+          result_code
+          secure_token
+          secure_token_id
+        }
+      handlePayflowProResponse(input: {
+          paypal_payload: "$payload",
+          cart_id: "{$cartId}"
+        })
+      {
+        cart {
+          selected_payment_method {
+            code
+          }
+        }
+      }
+      placeOrder(input: {cart_id: "{$cartId}"}) {
+        order {
+          order_number
+        }
+      }
+}
+QUERY;
+
+        /** @var Token $tokenModel */
+        $tokenModel = $this->objectManager->create(Token::class);
+        $customerToken = $tokenModel->createCustomerToken(1)->getToken();
+
+        $requestHeaders = [
+            'Content-Type' => 'application/json',
+            'Accept' => 'application/json',
+            'Authorization' => 'Bearer ' . $customerToken
+        ];
+        $paypalResponse = new DataObject(
+            [
+                'result' => '0',
+                'securetoken' => 'mysecuretoken',
+                'securetokenid' => 'mysecuretokenid',
+                'respmsg' => 'Approved',
+                'result_code' => '0',
+            ]
+        );
+
+        $this->gatewayMock
+            ->method('postRequest')
+            ->willReturn($paypalResponse);
+
+        $this->gatewayMock
+            ->method('postRequest')
+            ->willReturn(
+                new DataObject(
+                    [
+                        'result' => '0',
+                        'pnref' => 'A70AAC2378BA',
+                        'respmsg' => 'Approved',
+                        'authcode' => '647PNI',
+                        'avsaddr' => 'Y',
+                        'avszip' => 'N',
+                        'hostcode' => 'A',
+                        'procavs' => 'A',
+                        'visacardlevel' => '12',
+                        'transtime' => '2019-06-24 10:12:03',
+                        'firstname' => 'Cristian',
+                        'lastname' => 'Partica',
+                        'amt' => '14.99',
+                        'acct' => '1111',
+                        'expdate' => '0221',
+                        'cardtype' => '0',
+                        'iavs' => 'N',
+                        'result_code' => '0',
+                    ]
+                )
+            );
+
+        $response = $this->graphQlRequest->send($query, [], '', $requestHeaders);
+
+        return $this->json->unserialize($response->getContent());
+    }
+
+    /**
+     * Get saved cart data
+     *
+     * @return PaymentTokenInterface
+     */
+    private function getVaultCartData()
+    {
+        /** @var PaymentTokenManagement $tokenManagement */
+        $tokenManagement = $this->objectManager->get(PaymentTokenManagement::class);
+        $token = $tokenManagement->getByGatewayToken(
+            'B70CCC236815',
+            'payflowpro',
+            1
+        );
+        /** @var PaymentTokenRepository $tokenRepository */
+        $tokenRepository = $this->objectManager->get(PaymentTokenRepository::class);
+        return $tokenRepository->getById($token->getEntityId());
+    }
+}

From 3a18ed06ff2a47ae3ecc28a401167e4892d57499 Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Mon, 10 Aug 2020 09:36:14 -0500
Subject: [PATCH 1399/1718] MC-36554: Customer should be able to re-use the
 payflowPro_cc_vault as payment method for subsequent orders - minor fixes

---
 ...ayflowProCcVaultAdditionalDataProvider.php | 38 +++++++++++--------
 .../SetPaymentMethodOnCart.php                |  5 ++-
 .../Observer/PayflowProSetCcData.php          | 19 ++++++----
 3 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/app/code/Magento/PaypalGraphQl/Model/PayflowProCcVaultAdditionalDataProvider.php b/app/code/Magento/PaypalGraphQl/Model/PayflowProCcVaultAdditionalDataProvider.php
index f06b634f8c228..781cd8d0a9095 100644
--- a/app/code/Magento/PaypalGraphQl/Model/PayflowProCcVaultAdditionalDataProvider.php
+++ b/app/code/Magento/PaypalGraphQl/Model/PayflowProCcVaultAdditionalDataProvider.php
@@ -7,35 +7,41 @@
 
 namespace Magento\PaypalGraphQl\Model;
 
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\Stdlib\ArrayManager;
 use Magento\QuoteGraphQl\Model\Cart\Payment\AdditionalDataProviderInterface;
 
 /**
- * Get payment additional data for Payflow pro payment
+ * Get payment additional data for Payflow pro cc vault payment
  */
 class PayflowProCcVaultAdditionalDataProvider implements AdditionalDataProviderInterface
 {
-    private const PATH_ADDITIONAL_DATA = 'payflowpro_cc_vault';
+    const CC_VAULT_CODE = 'payflowpro_cc_vault';
+
+    /**
+     * @var ArrayManager
+     */
+    private $arrayManager;
+
     /**
-     * Format Payflow input into value expected when setting payment method
+     * @param ArrayManager $arrayManager
+     */
+    public function __construct(
+        ArrayManager $arrayManager
+    ) {
+        $this->arrayManager = $arrayManager;
+    }
+
+    /**
+     * Returns additional data
      *
      * @param array $args
      * @return array
      */
     public function getData(array $args): array
     {
-        if (!isset($args[self::PATH_ADDITIONAL_DATA])) {
-            throw new GraphQlInputException(
-                __('Required parameter "payflowpro_cc_vault" for "payment_method" is missing.')
-            );
+        if (isset($args[self::CC_VAULT_CODE])) {
+            return $args[self::CC_VAULT_CODE];
         }
-
-        if (!isset($args[self::PATH_ADDITIONAL_DATA]['public_hash'])) {
-            throw new GraphQlInputException(
-                __('Required parameter "public_hash" for "payflowpro_cc_vault" is missing.')
-            );
-        }
-
-        return $args[self::PATH_ADDITIONAL_DATA];
+        return [];
     }
 }
diff --git a/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/PayflowProCcVault/SetPaymentMethodOnCart.php b/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/PayflowProCcVault/SetPaymentMethodOnCart.php
index 0e9ea38a634da..46bad75f0ed19 100644
--- a/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/PayflowProCcVault/SetPaymentMethodOnCart.php
+++ b/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/PayflowProCcVault/SetPaymentMethodOnCart.php
@@ -70,7 +70,10 @@ public function afterExecute(
         $additionalData = $this->additionalDataProviderPool->getData(self::CC_VAULT_CODE, $additionalData);
         $customerId = (int) $cart->getCustomer()->getId();
         $payment = $cart->getPayment();
-        if (!is_array($additionalData) || !isset($additionalData[PaymentTokenInterface::PUBLIC_HASH])) {
+        if (!is_array($additionalData)
+            || !isset($additionalData[PaymentTokenInterface::PUBLIC_HASH])
+            || $customerId === 0
+        ) {
             return;
         }
         $tokenPublicHash = $additionalData[PaymentTokenInterface::PUBLIC_HASH];
diff --git a/app/code/Magento/PaypalGraphQl/Observer/PayflowProSetCcData.php b/app/code/Magento/PaypalGraphQl/Observer/PayflowProSetCcData.php
index 801ec91d063c5..55310b1744107 100644
--- a/app/code/Magento/PaypalGraphQl/Observer/PayflowProSetCcData.php
+++ b/app/code/Magento/PaypalGraphQl/Observer/PayflowProSetCcData.php
@@ -13,6 +13,7 @@
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Payment\Observer\AbstractDataAssignObserver;
 use Magento\Quote\Api\Data\PaymentInterface;
+use Magento\Quote\Model\Quote\Payment;
 
 /**
  * Class PayflowProSetCcData set CcData to quote payment
@@ -50,21 +51,23 @@ public function execute(Observer $observer)
     {
         $dataObject = $this->readDataArgument($observer);
         $additionalData = $dataObject->getData(PaymentInterface::KEY_ADDITIONAL_DATA);
+        /**
+         * @var Payment $paymentModel
+         */
         $paymentModel = $this->readPaymentModelArgument($observer);
+        $customerId = (int)$paymentModel->getQuote()->getCustomer()->getId();
 
         if (!isset($additionalData['cc_details'])) {
             return;
         }
 
-        if ($this->isPayflowProVaultEnable()) {
-            if (!isset($additionalData[self::IS_ACTIVE_PAYMENT_TOKEN_ENABLER])) {
-                $paymentModel->setData(self::IS_ACTIVE_PAYMENT_TOKEN_ENABLER, false);
+        if ($this->isPayflowProVaultEnable() && $customerId !== 0) {
+            if (isset($additionalData[self::IS_ACTIVE_PAYMENT_TOKEN_ENABLER])) {
+                $paymentModel->setData(
+                    self::IS_ACTIVE_PAYMENT_TOKEN_ENABLER,
+                    $additionalData[self::IS_ACTIVE_PAYMENT_TOKEN_ENABLER]
+                );
             }
-
-            $paymentModel->setData(
-                self::IS_ACTIVE_PAYMENT_TOKEN_ENABLER,
-                $additionalData[self::IS_ACTIVE_PAYMENT_TOKEN_ENABLER]
-            );
         } else {
             $paymentModel->setData(self::IS_ACTIVE_PAYMENT_TOKEN_ENABLER, false);
         }

From 9cf55e57f115486d44f448976ffabd8ee10cce5a Mon Sep 17 00:00:00 2001
From: jekabs <jekabs@developers-alliance.com>
Date: Mon, 10 Aug 2020 18:09:48 +0300
Subject: [PATCH 1400/1718] magento/web-api-test-recursive-array-comparison
 -Added a function to WebApi Test framework for recursively comparing two
 arrays -Modified CategoryManagementTest to remove need for
 array_replace_recursive

---
 .../TestFramework/TestCase/WebapiAbstract.php | 56 +++++++++++++++++++
 .../Catalog/Api/CategoryManagementTest.php    |  4 +-
 2 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/WebapiAbstract.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/WebapiAbstract.php
index 7ccab097d7778..91be839aa56cb 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/WebapiAbstract.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/WebapiAbstract.php
@@ -766,4 +766,60 @@ protected function assertWebApiCallErrors(array $serviceInfo, array $data, array
             }
         }
     }
+
+    /**
+     * Compare arrays recursively regardless of nesting.
+     * Can compare arrays that have both one level and n-level nesting.
+     * ```
+     *  [
+     * 'products' => [
+     *      'items' => [
+     *      [
+     *          'sku'       => 'bundle-product',
+     *          'type_id'   => 'bundle',
+     *          'items'     => [
+     *          [
+     *              'title'     => 'Bundle Product Items',
+     *              'sku'       => 'bundle-product',
+     *              'options'   => [
+     *              [
+     *                  'price' => 2.75,
+     *                  'label' => 'Simple Product',
+     *                  'product' => [
+     *                      'name'    => 'Simple Product',
+     *                      'sku'     => 'simple',
+     *                  ]
+     *              ]
+     *          ]
+     *      ]
+     *  ];
+     * ```
+     *
+     * @param array $expected
+     * @param array $actual
+     * @return array
+     */
+    public function compareArraysRecursively(array $expected, array $actual): array
+    {
+        $diffResult = [];
+
+        foreach ($expected as $key => $value) {
+            if (array_key_exists($key, $actual)) {
+                if (is_array($value)) {
+                    $recursiveDiff = $this->compareArraysRecursively($value, $actual[$key]);
+                    if (!empty($recursiveDiff)) {
+                        $diffResult[$key] = $recursiveDiff;
+                    }
+                } else {
+                    if (!in_array($value, $actual, true)) {
+                        $diffResult[$key] = $value;
+                    }
+                }
+            } else {
+                $diffResult[$key] = $value;
+            }
+        }
+
+        return $diffResult;
+    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryManagementTest.php
index bc3869df6a65b..965b920319994 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryManagementTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryManagementTest.php
@@ -40,8 +40,8 @@ public function testTree($rootCategoryId, $depth, $expected)
             ]
         ];
         $result = $this->_webApiCall($serviceInfo, $requestData);
-        $expected = array_replace_recursive($result, $expected);
-        $this->assertEquals($expected, $result);
+        $diff = $this->compareArraysRecursively($expected, $result);
+        self::assertEquals([], $diff, "Actual categories response doesn't equal expected data");
     }
 
     /**

From b8a70c89244766fca80dd0fa3ea3c7bef3d7706e Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Mon, 10 Aug 2020 18:20:11 +0300
Subject: [PATCH 1401/1718] moved and rename action group

---
 .../Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml     | 2 +-
 .../Bundle/Test/Mftf/Test/AdminMassDeleteBundleProductsTest.xml | 2 +-
 .../ActionGroup/AdminDeleteAllProductsFromGridActionGroup.xml}  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename app/code/Magento/{Bundle/Test/Mftf/ActionGroup/AdminSelectAndDeleteProductsActionGroup.xml => Catalog/Test/Mftf/ActionGroup/AdminDeleteAllProductsFromGridActionGroup.xml} (93%)

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml
index e75e6ef25de63..36347e59a3d6b 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml
@@ -70,7 +70,7 @@
         </actionGroup>
 
         <!--Delete-->
-        <actionGroup ref="AdminSelectAndDeleteProductsActionGroup" stepKey="selectAndDeleteProducts"/>
+        <actionGroup ref="AdminDeleteAllProductsFromGridActionGroup" stepKey="selectAndDeleteProducts"/>
 
         <!--Locating delete message-->
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="deleteMessage"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProductsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProductsTest.xml
index 6a96a7de2f491..24ac3db27175c 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProductsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProductsTest.xml
@@ -118,7 +118,7 @@
         <actionGroup ref="BundleProductFilter" stepKey="FilterForOnlyBundleProducts"/>
 
         <!--Delete-->
-        <actionGroup ref="AdminSelectAndDeleteProductsActionGroup" stepKey="selectAndDeleteProducts"/>
+        <actionGroup ref="AdminDeleteAllProductsFromGridActionGroup" stepKey="selectAndDeleteProducts"/>
 
         <!--Locating delete message-->
         <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="deleteMessage"/>
diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminSelectAndDeleteProductsActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminDeleteAllProductsFromGridActionGroup.xml
similarity index 93%
rename from app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminSelectAndDeleteProductsActionGroup.xml
rename to app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminDeleteAllProductsFromGridActionGroup.xml
index 709eec13be7a2..d5c4f97c88da2 100644
--- a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminSelectAndDeleteProductsActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminDeleteAllProductsFromGridActionGroup.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="AdminSelectAndDeleteProductsActionGroup">
+    <actionGroup name="AdminDeleteAllProductsFromGridActionGroup">
         <annotations>
             <description>Select and delete products in product grid.</description>
         </annotations>

From 8e35d2b52782fcb4b266d5b888de06c5d51ede59 Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Mon, 10 Aug 2020 11:01:06 -0500
Subject: [PATCH 1402/1718] MC-36554: Customer should be able to re-use the
 payflowPro_cc_vault as payment method for subsequent orders - static fix

---
 .../Resolver/Customer/PlaceOrderWithPayflowProCCVaultTest.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowProCCVaultTest.php b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowProCCVaultTest.php
index 561a7c5d87b59..3ebfaf8890edb 100644
--- a/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowProCCVaultTest.php
+++ b/dev/tests/integration/testsuite/Magento/PaypalGraphQl/Model/Resolver/Customer/PlaceOrderWithPayflowProCCVaultTest.php
@@ -35,6 +35,7 @@
  * End to end place order test using payflowpro_cc_vault via graphql endpoint for customer
  *
  * @magentoAppArea graphql
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class PlaceOrderWithPayflowProCCVaultTest extends PaypalPayflowProAbstractTest
 {

From 8e011b65f9b969a70bb2d75428f81117ebf36247 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Mon, 10 Aug 2020 20:16:47 +0300
Subject: [PATCH 1403/1718] created new action group for click button

---
 ...stCheckoutUsingFreeShippingAndTaxesTest.xml |  3 +--
 .../AdminClickButtonAddTaxRuleActionGroup.xml  | 18 ++++++++++++++++++
 .../Test/AdminCreateDefaultsTaxRuleTest.xml    |  3 +--
 .../Test/AdminCreateTaxRateLargeRateTest.xml   |  2 +-
 .../AdminCreateTaxRateSpecificPostcodeTest.xml |  2 +-
 ...AdminCreateTaxRateWiderZipCodeRangeTest.xml |  2 +-
 .../AdminCreateTaxRateZipCodeRangeTest.xml     |  2 +-
 ...xRuleWithCustomerAndProductTaxClassTest.xml |  3 +--
 ...axRateAndCustomerAndProductTaxClassTest.xml |  3 +--
 ...eTaxRuleWithNewTaxClassesAndTaxRateTest.xml |  3 +--
 .../AdminCreateTaxRuleWithZipRangeTest.xml     |  3 +--
 .../Test/Mftf/Test/DeleteTaxRateEntityTest.xml |  3 +--
 12 files changed, 29 insertions(+), 18 deletions(-)
 create mode 100644 app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminClickButtonAddTaxRuleActionGroup.xml

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml
index 1ce48bd8bf408..7ace592b7ae73 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml
@@ -120,8 +120,7 @@
 
         <!-- Create a Tax Rule -->
         <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
-        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAddNewTaxRuleButton"/>
-        <waitForPageLoad stepKey="waitForTaxRuleIndex2"/>
+        <actionGroup ref="AdminClickButtonAddTaxRuleActionGroup" stepKey="clickAddNewTaxRuleButton"/>
 
         <!-- Create a tax rule with defaults -->
         <fillField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode1"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminClickButtonAddTaxRuleActionGroup.xml b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminClickButtonAddTaxRuleActionGroup.xml
new file mode 100644
index 0000000000000..313c4c5e84af0
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminClickButtonAddTaxRuleActionGroup.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="AdminClickButtonAddTaxRuleActionGroup">
+        <annotations>
+            <description>Click button for creating new tax rule.</description>
+        </annotations>
+        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAddNewTaxRuleButton"/>
+        <waitForPageLoad stepKey="waitForTaxRuleGridLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateDefaultsTaxRuleTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateDefaultsTaxRuleTest.xml
index 07968c281c68b..9629740f1cd20 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateDefaultsTaxRuleTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateDefaultsTaxRuleTest.xml
@@ -30,8 +30,7 @@
         </after>
 
         <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
-        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAddNewTaxRuleButton"/>
-        <waitForPageLoad stepKey="waitForTaxRuleIndex2"/>
+        <actionGroup ref="AdminClickButtonAddTaxRuleActionGroup" stepKey="clickAddNewTaxRuleButton"/>
         <!-- Create a tax rule with defaults -->
         <fillField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode1"/>
         <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="$$initialTaxRate.code$$" stepKey="fillTaxRateSearch"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml
index c8e4defc40c9f..641278d02e726 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml
@@ -59,7 +59,7 @@
 
         <!-- Verify we see expected values on the tax rule form page -->
         <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
-        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAdd"/>
+        <actionGroup ref="AdminClickButtonAddTaxRuleActionGroup" stepKey="clickAdd"/>
         <see selector="{{AdminTaxRulesSection.taxRateMultiSelectItems}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxRateOnNewTaxRulePage"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml
index c6a5a6c69e788..f454ceced7a3d 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml
@@ -58,7 +58,7 @@
 
         <!-- Verify we see expected values on the tax rule form page -->
         <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
-        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAdd"/>
+        <actionGroup ref="AdminClickButtonAddTaxRuleActionGroup" stepKey="clickAdd"/>
         <see selector="{{AdminTaxRulesSection.taxRateMultiSelectItems}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxRateOnNewTaxRulePage"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml
index ef9b66041893d..9712a605a5bf4 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml
@@ -60,7 +60,7 @@
 
         <!-- Verify we see expected values on the tax rule form page -->
         <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
-        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAdd"/>
+        <actionGroup ref="AdminClickButtonAddTaxRuleActionGroup" stepKey="clickAdd"/>
         <see selector="{{AdminTaxRulesSection.taxRateMultiSelectItems}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxRateOnNewTaxRulePage"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml
index 23c4ffd78a88d..2734a57aa312c 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml
@@ -62,7 +62,7 @@
 
         <!-- Verify we see expected values on the tax rule form page -->
         <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
-        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAdd"/>
+        <actionGroup ref="AdminClickButtonAddTaxRuleActionGroup" stepKey="clickAdd"/>
         <see selector="{{AdminTaxRulesSection.taxRateMultiSelectItems}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxRateOnNewTaxRulePage"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithCustomerAndProductTaxClassTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithCustomerAndProductTaxClassTest.xml
index ba0834da7c0e7..c309db52cb194 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithCustomerAndProductTaxClassTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithCustomerAndProductTaxClassTest.xml
@@ -40,8 +40,7 @@
         </after>
 
         <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
-        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAddNewTaxRuleButton"/>
-        <waitForPageLoad stepKey="waitForTaxRuleIndex2"/>
+        <actionGroup ref="AdminClickButtonAddTaxRuleActionGroup" stepKey="clickAddNewTaxRuleButton"/>
 
         <!-- Create a tax rule with customer and product class -->
         <fillField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode1"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewAndExistingTaxRateAndCustomerAndProductTaxClassTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewAndExistingTaxRateAndCustomerAndProductTaxClassTest.xml
index ae37bc8a8930a..2aaebb0ca5c3e 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewAndExistingTaxRateAndCustomerAndProductTaxClassTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewAndExistingTaxRateAndCustomerAndProductTaxClassTest.xml
@@ -41,8 +41,7 @@
         </after>
 
         <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
-        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAddNewTaxRuleButton"/>
-        <waitForPageLoad stepKey="waitForTaxRuleIndex2"/>
+        <actionGroup ref="AdminClickButtonAddTaxRuleActionGroup" stepKey="clickAddNewTaxRuleButton"/>
 
         <!-- Create a tax rule with new and existing tax rate, customer tax class, product tax class -->
         <fillField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode1"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewTaxClassesAndTaxRateTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewTaxClassesAndTaxRateTest.xml
index 2a008991c2dc8..d0e9242f3618b 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewTaxClassesAndTaxRateTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewTaxClassesAndTaxRateTest.xml
@@ -41,8 +41,7 @@
         </after>
 
         <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
-        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAddNewTaxRuleButton"/>
-        <waitForPageLoad stepKey="waitForTaxRuleIndex2"/>
+        <actionGroup ref="AdminClickButtonAddTaxRuleActionGroup" stepKey="clickAddNewTaxRuleButton"/>
 
         <!-- Create a tax rule with new tax classes and tax rate -->
         <fillField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode1"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithZipRangeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithZipRangeTest.xml
index de55453fcabc4..0c324f137b84f 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithZipRangeTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithZipRangeTest.xml
@@ -41,8 +41,7 @@
         </after>
 
         <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
-        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAddNewTaxRuleButton"/>
-        <waitForPageLoad stepKey="waitForTaxRuleIndex2"/>
+        <actionGroup ref="AdminClickButtonAddTaxRuleActionGroup" stepKey="clickAddNewTaxRuleButton"/>
 
         <!-- Create a tax rule with new tax classes and tax rate -->
         <fillField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode1"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml
index 881e09e5e35f4..99d9d12d7d182 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml
@@ -44,8 +44,7 @@
 
         <!-- Confirm Deleted TaxIdentifier on the tax rule grid page -->
         <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex3"/>
-        <click selector="{{AdminTaxRuleGridSection.add}}" stepKey="clickAddNewTaxRuleButton"/>
-        <waitForPageLoad stepKey="waitForTaxRuleIndex1"/>
+        <actionGroup ref="AdminClickButtonAddTaxRuleActionGroup" stepKey="clickAddNewTaxRuleButton"/>
         <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="$$initialTaxRate.code$$" stepKey="fillTaxRateSearch"/>
         <wait stepKey="waitForSearch" time="5" />
         <dontSee selector="{{AdminTaxRuleFormSection.fieldTaxRate}}" userInput="$$initialTaxRate.code$$" stepKey="dontSeeInTaxRuleForm"/>

From 83b40124d87c7904d062577f21566eabdec15f8a Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Mon, 10 Aug 2020 20:59:46 +0300
Subject: [PATCH 1404/1718] Add action group for click edit link

---
 ...stomerClickFirstRowEditLinkActionGroup.xml | 19 +++++++++++++++++++
 ...eateCustomerRetailerWithoutAddressTest.xml |  3 +--
 ...minCreateCustomerWithCountryPolandTest.xml |  6 ++----
 .../AdminCreateCustomerWithCountryUSATest.xml |  6 ++----
 ...AdminCreateCustomerWithCustomGroupTest.xml |  3 +--
 .../AdminCreateCustomerWithPrefixTest.xml     |  3 +--
 .../AdminCreateCustomerWithoutAddressTest.xml |  3 +--
 ...stomerOnStorefrontSignupNewsletterTest.xml |  3 +--
 .../Mftf/Test/AdminCreateNewCustomerTest.xml  |  3 +--
 ...tomerSubscribeNewsletterPerWebsiteTest.xml |  3 +--
 ...ableProductToOrderFromShoppingCartTest.xml |  3 +--
 ...mpleProductToOrderFromShoppingCartTest.xml |  3 +--
 ...eredConfigurableProductOnOrderPageTest.xml |  3 +--
 ...astOrderedSimpleProductOnOrderPageTest.xml |  3 +--
 ...iewedBundleFixedProductOnOrderPageTest.xml |  3 +--
 ...ewedConfigurableProductOnOrderPageTest.xml |  3 +--
 .../AdminSetUpWatermarkForSwatchImageTest.xml |  3 +--
 17 files changed, 37 insertions(+), 36 deletions(-)
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerClickFirstRowEditLinkActionGroup.xml

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerClickFirstRowEditLinkActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerClickFirstRowEditLinkActionGroup.xml
new file mode 100644
index 0000000000000..1c5c29b855bf5
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerClickFirstRowEditLinkActionGroup.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="AdminCustomerClickFirstRowEditLinkActionGroup">
+        <annotations>
+            <description>Click edit link for first row on the grid.</description>
+        </annotations>
+
+        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditLink"/>
+        <waitForPageLoad stepKey="waitForPageLoading"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerRetailerWithoutAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerRetailerWithoutAddressTest.xml
index c8e3bc10cc769..98b488c63a1e0 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerRetailerWithoutAddressTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerRetailerWithoutAddressTest.xml
@@ -50,8 +50,7 @@
         <see userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertEmail"/>
 
         <!--Assert Customer Form -->
-        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditButton1"/>
-        <waitForPageLoad stepKey="waitForCustomerEditPageToLoad1"/>
+        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickOnEditButton1"/>
         <click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="clickOnAccountInformation"/>
         <waitForPageLoad stepKey="waitForCustomerInformationPageToLoad"/>
         <see selector="{{AdminCustomerAccountInformationSection.groupIdValue}}" userInput="Retailer" stepKey="seeCustomerGroup1"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryPolandTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryPolandTest.xml
index 5f496e2c5fba3..7d76b79b97279 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryPolandTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryPolandTest.xml
@@ -31,8 +31,7 @@
         <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterTheCustomerByEmail">
             <argument name="email" value="$$createCustomer.email$$"/>
         </actionGroup>
-        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditButton"/>
-        <waitForPageLoad stepKey="waitForCustomerEditPageToLoad"/>
+        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickOnEditButton"/>
 
         <!-- Add the Address -->
         <click selector="{{AdminEditCustomerAddressesSection.addresses}}" stepKey="selectAddress"/>
@@ -67,8 +66,7 @@
         <see userInput="{{PolandAddress.telephone}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertPhoneNumber"/>
 
         <!--Assert Customer Form -->
-        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditButton1"/>
-        <waitForPageLoad stepKey="waitForCustomerEditPageToLoad1"/>
+        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickOnEditButton1"/>
         <click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="clickOnAccountInformation"/>
         <waitForPageLoad stepKey="waitForCustomerInformationPageToLoad"/>
         <seeInField selector="{{AdminCustomerAccountInformationSection.firstName}}" userInput="$$createCustomer.firstname$$" stepKey="seeCustomerFirstName"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryUSATest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryUSATest.xml
index da2eed2006434..7eecdf67d58b1 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryUSATest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryUSATest.xml
@@ -31,8 +31,7 @@
         <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterTheCustomerByEmail">
             <argument name="email" value="$$createCustomer.email$$"/>
         </actionGroup>
-        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditButton"/>
-        <waitForPageLoad stepKey="waitForCustomerEditPageToLoad"/>
+        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickOnEditButton"/>
 
         <!-- Add the Address -->
         <click selector="{{AdminEditCustomerAddressesSection.addresses}}" stepKey="selectAddress"/>
@@ -67,8 +66,7 @@
         <see userInput="{{US_Address_CA.telephone}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertPhoneNumber"/>
 
         <!--Assert Customer Form -->
-        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditButton1"/>
-        <waitForPageLoad stepKey="waitForCustomerEditPageToLoad1"/>
+        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickOnEditButton1"/>
         <click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="clickOnAccountInformation"/>
         <waitForPageLoad stepKey="waitForCustomerInformationPageToLoad"/>
         <seeInField selector="{{AdminCustomerAccountInformationSection.firstName}}" userInput="$$createCustomer.firstname$$" stepKey="seeCustomerFirstName"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCustomGroupTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCustomGroupTest.xml
index 8afd1648d26e0..84d6d5df5f8f3 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCustomGroupTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCustomGroupTest.xml
@@ -54,8 +54,7 @@
         <see userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertEmail"/>
 
         <!--Assert Customer Form -->
-        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditButton1"/>
-        <waitForPageLoad stepKey="waitForCustomerEditPageToLoad1"/>
+        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickOnEditButton1"/>
         <click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="clickOnAccountInformation"/>
         <waitForPageLoad stepKey="waitForCustomerInformationPageToLoad"/>
         <see selector="{{AdminCustomerAccountInformationSection.groupIdValue}}" userInput="$$customerGroup.code$$" stepKey="seeCustomerGroup1"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithPrefixTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithPrefixTest.xml
index e9250be637534..a03855b9e90c9 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithPrefixTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithPrefixTest.xml
@@ -56,8 +56,7 @@
         <see userInput="Male" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertGender"/>
 
         <!--Assert Customer Form -->
-        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditButton1"/>
-        <waitForPageLoad stepKey="waitForCustomerEditPageToLoad1"/>
+        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickOnEditButton1"/>
         <click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="clickOnAccountInformation"/>
         <waitForPageLoad stepKey="waitForCustomerInformationPageToLoad"/>
         <seeInField selector="{{AdminCustomerAccountInformationSection.namePrefix}}" userInput="{{CustomerEntityOne.prefix}}" stepKey="seeCustomerNamePrefix"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithoutAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithoutAddressTest.xml
index 5033f2882af42..c707c322529b9 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithoutAddressTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithoutAddressTest.xml
@@ -49,8 +49,7 @@
         <see userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertEmail"/>
 
         <!--Assert Customer Form -->
-        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditButton1"/>
-        <waitForPageLoad stepKey="waitForCustomerEditPageToLoad1"/>
+        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickOnEditButton1"/>
         <click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="clickOnAccountInformation"/>
         <waitForPageLoad stepKey="waitForCustomerInformationPageToLoad"/>
         <seeInField selector="{{AdminCustomerAccountInformationSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="seeCustomerFirstName"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerOnStorefrontSignupNewsletterTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerOnStorefrontSignupNewsletterTest.xml
index 5440339e3a95e..67546a88425b3 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerOnStorefrontSignupNewsletterTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerOnStorefrontSignupNewsletterTest.xml
@@ -45,8 +45,7 @@
         <see selector="{{AdminCustomerGridSection.customerGrid}}" userInput="{{CustomerEntityOne.email}}" stepKey="seeAssertCustomerEmailInGrid"/>
 
         <!--Assert verify created new customer is subscribed to newsletter-->
-        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickFirstRowEditLink"/>
-        <waitForPageLoad stepKey="waitForEditLinkLoad"/>
+        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickFirstRowEditLink"/>
         <click selector="{{AdminEditCustomerInformationSection.newsLetter}}" stepKey="clickNewsLetter"/>
         <waitForPageLoad stepKey="waitForNewsletterTabToOpen"/>
         <seeCheckboxIsChecked selector="{{AdminEditCustomerNewsletterSection.subscribedStatus('1')}}" stepKey="seeAssertSubscribedToNewsletterCheckboxIsChecked"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerTest.xml
index 6b484e857d276..9583e5d6109c5 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerTest.xml
@@ -42,8 +42,7 @@
             <argument name="email" value="{{CustomerEntityOne.email}}"/>
         </actionGroup>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
-        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickOnEditButton1"/>
-        <waitForPageLoad stepKey="waitForCustomerEditPageToLoad"/>
+        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickOnEditButton1"/>
 
         <!-- Assert Customer Title -->
         <click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="clickOnAccountInformation"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomerSubscribeNewsletterPerWebsiteTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomerSubscribeNewsletterPerWebsiteTest.xml
index a8391458a1a50..ffcc543609e37 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomerSubscribeNewsletterPerWebsiteTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomerSubscribeNewsletterPerWebsiteTest.xml
@@ -53,8 +53,7 @@
         <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCustomerGrid">
             <argument name="email" value="{{CustomerEntityOne.email}}"/>
         </actionGroup>
-        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickToEditCustomerPage"/>
-        <waitForPageLoad stepKey="waitForOpenCustomerPage"/>
+        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickToEditCustomerPage"/>
         <grabFromCurrentUrl regex="~(\d+)/~" stepKey="grabCustomerId"/>
         <!-- Assert that created customer is subscribed to newsletter on the new Store View -->
         <actionGroup ref="AdminAssertCustomerIsSubscribedToNewslettersAndSelectedStoreView" stepKey="assertSubscribedToNewsletter">
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AddConfigurableProductToOrderFromShoppingCartTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AddConfigurableProductToOrderFromShoppingCartTest.xml
index 6f4073bf70f46..45bd7ee3e0deb 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AddConfigurableProductToOrderFromShoppingCartTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AddConfigurableProductToOrderFromShoppingCartTest.xml
@@ -97,8 +97,7 @@
         <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCreatedCustomer">
             <argument name="email" value="$$createCustomer.email$$"/>
         </actionGroup>
-        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickEditButton"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickEditButton"/>
 
         <!-- Click create order -->
         <click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AddSimpleProductToOrderFromShoppingCartTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AddSimpleProductToOrderFromShoppingCartTest.xml
index d8a9effa56dac..60c33d68354ce 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AddSimpleProductToOrderFromShoppingCartTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AddSimpleProductToOrderFromShoppingCartTest.xml
@@ -58,8 +58,7 @@
         <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCreatedCustomer">
             <argument name="email" value="$$createCustomer.email$$"/>
         </actionGroup>
-        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickEditButton"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickEditButton"/>
 
         <!-- Click create order -->
         <click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/MoveLastOrderedConfigurableProductOnOrderPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/MoveLastOrderedConfigurableProductOnOrderPageTest.xml
index c635e6b0ad6b2..3d5b54daa7c8f 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/MoveLastOrderedConfigurableProductOnOrderPageTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/MoveLastOrderedConfigurableProductOnOrderPageTest.xml
@@ -96,8 +96,7 @@
         <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCreatedCustomer">
             <argument name="email" value="$$createCustomer.email$$"/>
         </actionGroup>
-        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickEditButton"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickEditButton"/>
 
         <!-- Click create order -->
         <click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/MoveLastOrderedSimpleProductOnOrderPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/MoveLastOrderedSimpleProductOnOrderPageTest.xml
index eb28ebfd068da..8faedb24e600e 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/MoveLastOrderedSimpleProductOnOrderPageTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/MoveLastOrderedSimpleProductOnOrderPageTest.xml
@@ -46,8 +46,7 @@
         <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCreatedCustomer">
             <argument name="email" value="$$createCustomer.email$$"/>
         </actionGroup>
-        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickEditButton"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickEditButton"/>
 
         <!-- Click create order -->
         <click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml
index c3fc7a4952143..980bc272c3643 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml
@@ -96,8 +96,7 @@
         <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCreatedCustomer">
             <argument name="email" value="$$createCustomer.email$$"/>
         </actionGroup>
-        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickEditButton"/>
-        <waitForPageLoad stepKey="waitForCustomerPageLoad"/>
+        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickEditButton"/>
 
         <!-- Click create order -->
         <click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedConfigurableProductOnOrderPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedConfigurableProductOnOrderPageTest.xml
index 0e021600ab3e3..0bff169c4a68e 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedConfigurableProductOnOrderPageTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedConfigurableProductOnOrderPageTest.xml
@@ -99,8 +99,7 @@
         <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCreatedCustomer">
             <argument name="email" value="$$createCustomer.email$$"/>
         </actionGroup>
-        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickEditButton"/>
-        <waitForPageLoad stepKey="waitForCustomerPageLoad"/>
+        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickEditButton"/>
 
         <!-- Click create order -->
         <click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/AdminSetUpWatermarkForSwatchImageTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/AdminSetUpWatermarkForSwatchImageTest.xml
index d56572afd8847..d615c1478d6d7 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/AdminSetUpWatermarkForSwatchImageTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/AdminSetUpWatermarkForSwatchImageTest.xml
@@ -38,8 +38,7 @@
         </actionGroup>
         <!-- Select Edit next to the Default Store View -->
         <comment userInput="Select Edit next to the Default Store View" stepKey="commentEditDefaultView"/>
-        <click selector="{{AdminCustomerGridSection.firstRowEditLink}}" stepKey="clickToEditDefaultStoreView"/>
-        <waitForPageLoad stepKey="waitForDefaultStorePage"/>
+        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickToEditDefaultStoreView"/>
         <!-- Expand the Product Image Watermarks section-->
         <comment userInput="Expand the Product Image Watermarks section" stepKey="commentOpenWatermarksSection"/>
         <click selector="{{AdminDesignConfigSection.watermarkSectionHeader}}" stepKey="clickToProductImageWatermarks"/>

From 5a500f352734a22f8c0464d400130a8250a633e9 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Tue, 11 Aug 2020 01:59:52 +0800
Subject: [PATCH 1405/1718] 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 ef2b9c48f0586d435e5dcc9cb18ef630eec84b4f Mon Sep 17 00:00:00 2001
From: Ievgen Kolesov <ikolesov@adobe.com>
Date: Mon, 10 Aug 2020 13:17:12 -0500
Subject: [PATCH 1406/1718] PWA-805: Expose localization system / store config
 from GraphQL

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

diff --git a/app/code/Magento/StoreGraphQl/etc/schema.graphqls b/app/code/Magento/StoreGraphQl/etc/schema.graphqls
index cf50041bb9bea..1106987cc72c1 100644
--- a/app/code/Magento/StoreGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/StoreGraphQl/etc/schema.graphqls
@@ -3,7 +3,7 @@
 type Query {
     storeConfig : StoreConfig @resolver(class: "Magento\\StoreGraphQl\\Model\\Resolver\\StoreConfigResolver") @doc(description: "The store config query") @cache(cacheable: false)
     availableStores(
-        useCurrentGroup: Boolean @doc(description: "Get only store views from the current store group")
+        useCurrentGroup: Boolean @doc(description: "Filter store views by current store group")
     ): [StoreConfig] @resolver(class: "Magento\\StoreGraphQl\\Model\\Resolver\\AvailableStoresResolver") @doc(description: "Get a list of available store views and their config information.")
 }
 
@@ -34,5 +34,5 @@ type StoreConfig @doc(description: "The type contains information about a store
     secure_base_static_url : String @doc(description: "Secure base static URL for the store")
     secure_base_media_url : String @doc(description: "Secure base media URL for the store")
     store_name : String @doc(description: "Name of the store")
-    use_store_in_url: Boolean @doc(description: "Indicates whether store code is used in url")
+    use_store_in_url: Boolean @doc(description: "The configuration determines if the store code should be used in the URL")
 }

From f1674586e2ac353561d882fc803267202484aef0 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 10 Aug 2020 22:55:58 +0300
Subject: [PATCH 1407/1718] asset filter moved to magento/magento2#29452

---
 .../Ui/Component/Listing/Filters/Asset.php    | 100 +-----------------
 1 file changed, 1 insertion(+), 99 deletions(-)

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 ee8bafa7021b2..273cf9e37554b 100644
--- a/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Asset.php
+++ b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Asset.php
@@ -15,57 +15,26 @@
 use Magento\MediaContentApi\Api\GetContentByAssetIdsInterface;
 use Magento\Ui\Component\Filters\FilterModifier;
 use Magento\Ui\Component\Filters\Type\Select;
-use Magento\Ui\Api\BookmarkManagementInterface;
-use Magento\MediaGalleryApi\Api\GetAssetsByIdsInterface;
-use Magento\Cms\Helper\Wysiwyg\Images;
-use Magento\Cms\Model\Wysiwyg\Images\Storage;
 
 /**
- * Asset filter
+ * Asset  filter
  */
 class Asset extends Select
 {
-    /**
-     * @var BookmarkManagementInterface
-     */
-    private $bookmarkManagement;
-
     /**
      * @var GetContentByAssetIdsInterface
      */
     private $getContentIdentities;
 
     /**
-     * @var GetAssetsByIdsInterface
-     */
-    private $getAssetsByIds;
-
-    /**
-     * @var Images
-     */
-    private $images;
-
-    /**
-     * @var Storage
-     */
-    private $storage;
-
-    /**
-     * Constructor
-     *
      * @param ContextInterface $context
      * @param UiComponentFactory $uiComponentFactory
      * @param FilterBuilder $filterBuilder
      * @param FilterModifier $filterModifier
      * @param OptionSourceInterface $optionsProvider
      * @param GetContentByAssetIdsInterface $getContentIdentities
-     * @param BookmarkManagementInterface $bookmarkManagement
-     * @param GetAssetsByIdsInterface $getAssetsByIds
-     * @param Images $images
-     * @param Storage $storage
      * @param array $components
      * @param array $data
-     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         ContextInterface $context,
@@ -74,10 +43,6 @@ public function __construct(
         FilterModifier $filterModifier,
         OptionSourceInterface $optionsProvider = null,
         GetContentByAssetIdsInterface $getContentIdentities,
-        BookmarkManagementInterface $bookmarkManagement,
-        GetAssetsByIdsInterface $getAssetsByIds,
-        Images $images,
-        Storage $storage,
         array $components = [],
         array $data = []
     ) {
@@ -93,69 +58,6 @@ public function __construct(
             $data
         );
         $this->getContentIdentities = $getContentIdentities;
-        $this->bookmarkManagement = $bookmarkManagement;
-        $this->getAssetsByIds = $getAssetsByIds;
-        $this->images = $images;
-        $this->storage = $storage;
-    }
-
-    /**
-     * Prepare component configuration
-     *
-     * @return void
-     */
-    public function prepare()
-    {
-        $options = [];
-        $assetIds = [];
-        $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()])) {
-                    $assetIds[] = $applied[$this->getName()];
-                }
-            }
-        }
-
-        $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->wrappedComponent = $this->uiComponentFactory->create(
-            $this->getName(),
-            parent::COMPONENT,
-            [
-                'context' => $this->getContext(),
-                'options' => $options
-            ]
-        );
-
-        $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')
-            )
-        );
-
-        $this->applyFilter();
-
-        parent::prepare();
     }
 
     /**

From 0f6e4350d777127ccbf3e423e81d7bcefa4debe6 Mon Sep 17 00:00:00 2001
From: Dave Macaulay <macaulay@adobe.com>
Date: Mon, 10 Aug 2020 16:25:52 -0500
Subject: [PATCH 1408/1718] PWA-806: Localize emails sent through GraphQL
 application

- Emulate correct store around email sends through GraphQL
---
 .../HttpHeaderProcessor/StoreProcessor.php    | 26 +------
 .../StoreGraphQl/Plugin/LocalizeEmail.php     | 78 +++++++++++++++++++
 .../StoreGraphQl/Plugin/StoreResolver.php     | 44 -----------
 .../Magento/StoreGraphQl/etc/graphql/di.xml   |  4 +-
 4 files changed, 81 insertions(+), 71 deletions(-)
 create mode 100644 app/code/Magento/StoreGraphQl/Plugin/LocalizeEmail.php
 delete mode 100644 app/code/Magento/StoreGraphQl/Plugin/StoreResolver.php

diff --git a/app/code/Magento/StoreGraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php b/app/code/Magento/StoreGraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php
index 66800520eb4cb..7999a96917cde 100644
--- a/app/code/Magento/StoreGraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php
+++ b/app/code/Magento/StoreGraphQl/Controller/HttpHeaderProcessor/StoreProcessor.php
@@ -7,10 +7,6 @@
 
 namespace Magento\StoreGraphQl\Controller\HttpHeaderProcessor;
 
-use Magento\Framework\App\AreaInterface;
-use Magento\Framework\App\AreaList;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\App\State;
 use Magento\GraphQl\Controller\HttpHeaderProcessorInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\App\Http\Context as HttpContext;
@@ -36,35 +32,19 @@ class StoreProcessor implements HttpHeaderProcessorInterface
      */
     private $storeCookieManager;
 
-    /**
-     * @var AreaList
-     */
-    private $areaList;
-
-    /**
-     * @var State
-     */
-    private $appState;
-
     /**
      * @param StoreManagerInterface $storeManager
      * @param HttpContext $httpContext
      * @param StoreCookieManagerInterface $storeCookieManager
-     * @param AreaList $areaList
-     * @param State $appState
      */
     public function __construct(
         StoreManagerInterface $storeManager,
         HttpContext $httpContext,
-        StoreCookieManagerInterface $storeCookieManager,
-        AreaList $areaList = null,
-        State $appState = null
+        StoreCookieManagerInterface $storeCookieManager
     ) {
         $this->storeManager = $storeManager;
         $this->httpContext = $httpContext;
         $this->storeCookieManager = $storeCookieManager;
-        $this->areaList = $areaList ?? ObjectManager::getInstance()->get(AreaList::class);
-        $this->appState = $appState ?? ObjectManager::getInstance()->get(State::class);
     }
 
     /**
@@ -87,10 +67,6 @@ public function processHeaderValue(string $headerValue) : void
             $this->storeManager->setCurrentStore($storeCode);
             $this->updateContext($storeCode);
         }
-
-        // Load translations for the app
-        $area = $this->areaList->getArea($this->appState->getAreaCode());
-        $area->load(AreaInterface::PART_TRANSLATE);
     }
 
     /**
diff --git a/app/code/Magento/StoreGraphQl/Plugin/LocalizeEmail.php b/app/code/Magento/StoreGraphQl/Plugin/LocalizeEmail.php
new file mode 100644
index 0000000000000..70f1762933e99
--- /dev/null
+++ b/app/code/Magento/StoreGraphQl/Plugin/LocalizeEmail.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace Magento\StoreGraphQl\Plugin;
+
+use Magento\Framework\App\AreaInterface;
+use Magento\Framework\App\AreaList;
+use Magento\Framework\App\State;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Mail\Template\TransportBuilder;
+use Magento\Store\Model\App\Emulation;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Emulate the correct store when GraphQL is sending an email
+ */
+class LocalizeEmail
+{
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var Emulation
+     */
+    private $emulation;
+
+    /**
+     * @var AreaList
+     */
+    private $areaList;
+
+    /**
+     * @var State
+     */
+    private $appState;
+
+    /**
+     * @param StoreManagerInterface $storeManager
+     * @param Emulation $emulation
+     * @param AreaList $areaList
+     * @param State $appState
+     */
+    public function __construct(
+        StoreManagerInterface $storeManager,
+        Emulation $emulation,
+        AreaList $areaList,
+        State $appState
+    ) {
+        $this->storeManager = $storeManager;
+        $this->emulation = $emulation;
+        $this->areaList = $areaList;
+        $this->appState = $appState;
+    }
+
+    /**
+     * Emulate the correct store during email preparation
+     *
+     * @param TransportBuilder $subject
+     * @param \Closure $proceed
+     * @return mixed
+     * @throws NoSuchEntityException|LocalizedException
+     */
+    public function aroundGetTransport(TransportBuilder $subject, \Closure $proceed)
+    {
+        // Load translations for the app
+        $area = $this->areaList->getArea($this->appState->getAreaCode());
+        $area->load(AreaInterface::PART_TRANSLATE);
+
+        $currentStore = $this->storeManager->getStore();
+        $this->emulation->startEnvironmentEmulation($currentStore->getId());
+        $output = $proceed();
+        $this->emulation->stopEnvironmentEmulation();
+
+        return $output;
+    }
+}
diff --git a/app/code/Magento/StoreGraphQl/Plugin/StoreResolver.php b/app/code/Magento/StoreGraphQl/Plugin/StoreResolver.php
deleted file mode 100644
index 65779f22f2758..0000000000000
--- a/app/code/Magento/StoreGraphQl/Plugin/StoreResolver.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace Magento\StoreGraphQl\Plugin;
-
-use Magento\Framework\App\Request\Http as HttpRequest;
-use Magento\Framework\App\RequestInterface;
-use Magento\Store\Model\Resolver\Store;
-
-/**
- * Ensure the store resolver gets the correct scope based on the GraphQl header
- */
-class StoreResolver
-{
-    /**
-     * @var RequestInterface|HttpRequest
-     */
-    private $request;
-
-    /**
-     * @param RequestInterface $request
-     */
-    public function __construct(
-        RequestInterface $request
-    ) {
-        $this->request = $request;
-    }
-
-    /**
-     * If no scope is provided and there is a Store header, ensure the correct store code is used
-     *
-     * @param Store $subject
-     * @param null $scopeId
-     * @return array
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function beforeGetScope(Store $subject, $scopeId = null)
-    {
-        $storeCode = $this->request->getHeader('Store');
-
-        if ($scopeId === null && $storeCode) {
-            return [$storeCode];
-        }
-    }
-}
diff --git a/app/code/Magento/StoreGraphQl/etc/graphql/di.xml b/app/code/Magento/StoreGraphQl/etc/graphql/di.xml
index 93d6a1356e0d0..b28f7261737f5 100644
--- a/app/code/Magento/StoreGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/StoreGraphQl/etc/graphql/di.xml
@@ -23,7 +23,7 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Store\Model\Resolver\Store">
-        <plugin name="graphQlLocalizationStoreResolver" type="Magento\StoreGraphQl\Plugin\StoreResolver" />
+    <type name="Magento\Framework\Mail\Template\TransportBuilder">
+        <plugin name="graphQlEmulateEmail" type="Magento\StoreGraphQl\Plugin\LocalizeEmail" />
     </type>
 </config>

From 32ade16edd499e0b7cc67c8f1fa2ffe60e667f16 Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Mon, 10 Aug 2020 16:52:15 -0500
Subject: [PATCH 1409/1718] MC-36204: Update M2 PayPal BN codes

---
 lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
index 24ac8fe7f4b52..820029b5904dc 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -2788,6 +2788,7 @@ public function addIndex(
 
         $this->resetDdlCache($tableName, $schemaName);
 
+        // @phpstan-ignore-next-line
         return $result;
     }
 

From a556345e619e79c123b881090e893d33f67dae61 Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Mon, 10 Aug 2020 19:25:53 -0500
Subject: [PATCH 1410/1718] minor fix

---
 .../Resolver/Product/CustomizableEnteredOptionValueUid.php     | 3 +++
 .../Resolver/Product/CustomizableSelectedOptionValueUid.php    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableEnteredOptionValueUid.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableEnteredOptionValueUid.php
index 69fafc49c9137..2d6975bb8a4e2 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableEnteredOptionValueUid.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableEnteredOptionValueUid.php
@@ -45,6 +45,9 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
+        if (isset($value['uid'])) {
+            return $value['uid'];
+        }
         if (!isset($value['option_id']) || empty($value['option_id'])) {
             throw new GraphQlInputException(__('"option_id" value should be specified.'));
         }
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableSelectedOptionValueUid.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableSelectedOptionValueUid.php
index 5fbd8a56bb570..795782d6e3718 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableSelectedOptionValueUid.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Product/CustomizableSelectedOptionValueUid.php
@@ -45,6 +45,9 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
+        if (isset($value['uid'])) {
+            return $value['uid'];
+        }
         if (!isset($value['option_id']) || empty($value['option_id'])) {
             throw new GraphQlInputException(__('"option_id" value should be specified.'));
         }

From 36427dc5802f140edc0d6bdbaa1d78534ff3d7ad Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Tue, 11 Aug 2020 10:15:06 +0800
Subject: [PATCH 1411/1718] 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 0788bbd60291a..7507b96cde407 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 5267a215c8edd..88e44b1cbd556 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 9f9e98af033d6bcc863105b7ea1e5ea513075fa7 Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Tue, 11 Aug 2020 00:40:12 -0500
Subject: [PATCH 1412/1718] Static test fixes

---
 .../Magento/GraphQl/Bundle/AddBundleProductToCartTest.php        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartTest.php
index 2d19b70c33ac2..f705195050843 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/AddBundleProductToCartTest.php
@@ -299,6 +299,7 @@ public function testAddBundleToCartWithRadioAndSelectErr()
         $options = $typeInstance->getOptionsCollection($product);
 
         $selectionIds = [];
+        $optionIds = [];
         foreach ($options as $option) {
             $type = $option->getType();
 

From bf26d39fc86d3f1508d01671f849497e03a9528b Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Tue, 11 Aug 2020 00:44:12 -0500
Subject: [PATCH 1413/1718] magento2/issues/29113 Customers should be able to
 enable/disable Admin "remote shopping assistance"

---
 app/code/Magento/LoginAsCustomer/etc/di.xml |  2 +
 composer.lock                               | 62 +++++++++++++++++----
 2 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomer/etc/di.xml b/app/code/Magento/LoginAsCustomer/etc/di.xml
index 2d5c05b971716..9927237c51db6 100755
--- a/app/code/Magento/LoginAsCustomer/etc/di.xml
+++ b/app/code/Magento/LoginAsCustomer/etc/di.xml
@@ -22,6 +22,8 @@
     <preference for="Magento\LoginAsCustomerApi\Api\GetLoggedAsCustomerAdminIdInterface" type="Magento\LoginAsCustomer\Model\GetLoggedAsCustomerAdminId"/>
     <preference for="Magento\LoginAsCustomerApi\Api\GetLoggedAsCustomerCustomerIdInterface" type="Magento\LoginAsCustomer\Model\GetLoggedAsCustomerCustomerId"/>
     <preference for="Magento\LoginAsCustomerApi\Api\SetLoggedAsCustomerAdminIdInterface" type="Magento\LoginAsCustomer\Model\SetLoggedAsCustomerAdminId"/>
+    <preference for="Magento\LoginAsCustomerApi\Api\Data\IsLoginAsCustomerEnabledForCustomerResultInterface"
+                type="Magento\LoginAsCustomer\Model\IsLoginAsCustomerEnabledForCustomerResult"/>
     <preference for="Magento\LoginAsCustomerApi\Api\SetLoggedAsCustomerCustomerIdInterface" type="Magento\LoginAsCustomer\Model\SetLoggedAsCustomerCustomerId"/>
     <type name="Magento\LoginAsCustomerApi\Model\IsLoginAsCustomerEnabledForCustomerChain">
         <arguments>
diff --git a/composer.lock b/composer.lock
index 534f3e31ed1a1..fede3428608bd 100644
--- a/composer.lock
+++ b/composer.lock
@@ -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"
         },
         {
@@ -1356,6 +1346,12 @@
                 "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,6 +3315,12 @@
                 "laminas",
                 "zf"
             ],
+            "funding": [
+                {
+                    "url": "https://funding.communitybridge.org/projects/laminas-project",
+                    "type": "community_bridge"
+                }
+            ],
             "time": "2020-05-20T16:45:56+00:00"
         },
         {
@@ -4360,6 +4362,16 @@
                 "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"
         },
         {
@@ -8801,6 +8813,20 @@
                 "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"
         },
         {
@@ -9090,6 +9116,12 @@
             "keywords": [
                 "timer"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
             "time": "2020-04-20T06:00:37+00:00"
         },
         {
@@ -9233,6 +9265,16 @@
                 "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"
         },
         {

From abbf0141bcdd812fc7716818c46b93341cf03366 Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Tue, 11 Aug 2020 00:53:52 -0500
Subject: [PATCH 1414/1718] magento2/issues/29113 Customers should be able to
 enable/disable Admin "remote shopping assistance"

---
 composer.lock | 220 +++++++++++++++++++++++++-------------------------
 1 file changed, 112 insertions(+), 108 deletions(-)

diff --git a/composer.lock b/composer.lock
index fede3428608bd..c2eed9d87cc00 100644
--- a/composer.lock
+++ b/composer.lock
@@ -210,16 +210,16 @@
         },
         {
             "name": "composer/composer",
-            "version": "1.10.10",
+            "version": "1.10.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/composer.git",
-                "reference": "32966a3b1d48bc01472a8321fd6472b44fad033a"
+                "reference": "83c3250093d5491600a822e176b107a945baf95a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/32966a3b1d48bc01472a8321fd6472b44fad033a",
-                "reference": "32966a3b1d48bc01472a8321fd6472b44fad033a",
+                "url": "https://api.github.com/repos/composer/composer/zipball/83c3250093d5491600a822e176b107a945baf95a",
+                "reference": "83c3250093d5491600a822e176b107a945baf95a",
                 "shasum": ""
             },
             "require": {
@@ -300,7 +300,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-08-03T09:35:19+00:00"
+            "time": "2020-07-16T10:57:00+00:00"
         },
         {
             "name": "composer/semver",
@@ -2259,16 +2259,16 @@
         },
         {
             "name": "laminas/laminas-mail",
-            "version": "2.12.2",
+            "version": "2.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-mail.git",
-                "reference": "a85bd6ec20ebc382498cc1d3086dfe3fa201849b"
+                "reference": "4c5545637eea3dc745668ddff1028692ed004c4b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-mail/zipball/a85bd6ec20ebc382498cc1d3086dfe3fa201849b",
-                "reference": "a85bd6ec20ebc382498cc1d3086dfe3fa201849b",
+                "url": "https://api.github.com/repos/laminas/laminas-mail/zipball/4c5545637eea3dc745668ddff1028692ed004c4b",
+                "reference": "4c5545637eea3dc745668ddff1028692ed004c4b",
                 "shasum": ""
             },
             "require": {
@@ -2278,7 +2278,7 @@
                 "laminas/laminas-stdlib": "^2.7 || ^3.0",
                 "laminas/laminas-validator": "^2.10.2",
                 "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^7.1",
+                "php": "^5.6 || ^7.0",
                 "true/punycode": "^2.1"
             },
             "replace": {
@@ -2288,8 +2288,8 @@
                 "laminas/laminas-coding-standard": "~1.0.0",
                 "laminas/laminas-config": "^2.6",
                 "laminas/laminas-crypt": "^2.6 || ^3.0",
-                "laminas/laminas-servicemanager": "^3.2.1",
-                "phpunit/phpunit": "^7.5.20"
+                "laminas/laminas-servicemanager": "^2.7.10 || ^3.3.1",
+                "phpunit/phpunit": "^5.7.25 || ^6.4.4 || ^7.1.4"
             },
             "suggest": {
                 "laminas/laminas-crypt": "Crammd5 support in SMTP Auth",
@@ -2297,6 +2297,10 @@
             },
             "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"
@@ -2323,7 +2327,7 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2020-08-06T14:33:28+00:00"
+            "time": "2020-06-30T20:17:23+00:00"
         },
         {
             "name": "laminas/laminas-math",
@@ -3487,16 +3491,16 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "1.25.5",
+            "version": "1.25.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "1817faadd1846cd08be9a49e905dc68823bc38c0"
+                "reference": "3022efff205e2448b560c833c6fbbf91c3139168"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1817faadd1846cd08be9a49e905dc68823bc38c0",
-                "reference": "1817faadd1846cd08be9a49e905dc68823bc38c0",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/3022efff205e2448b560c833c6fbbf91c3139168",
+                "reference": "3022efff205e2448b560c833c6fbbf91c3139168",
                 "shasum": ""
             },
             "require": {
@@ -3570,7 +3574,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-07-23T08:35:51+00:00"
+            "time": "2020-05-22T07:31:27+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -4420,16 +4424,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v4.4.11",
+            "version": "v4.4.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "55d07021da933dd0d633ffdab6f45d5b230c7e02"
+                "reference": "326b064d804043005526f5a0494cfb49edb59bb0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/55d07021da933dd0d633ffdab6f45d5b230c7e02",
-                "reference": "55d07021da933dd0d633ffdab6f45d5b230c7e02",
+                "url": "https://api.github.com/repos/symfony/console/zipball/326b064d804043005526f5a0494cfb49edb59bb0",
+                "reference": "326b064d804043005526f5a0494cfb49edb59bb0",
                 "shasum": ""
             },
             "require": {
@@ -4507,11 +4511,11 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-07-06T13:18:39+00:00"
+            "time": "2020-05-30T20:06:45+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v5.1.3",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
@@ -4578,16 +4582,16 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v4.4.11",
+            "version": "v4.4.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "6140fc7047dafc5abbe84ba16a34a86c0b0229b8"
+                "reference": "a5370aaa7807c7a439b21386661ffccf3dff2866"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/6140fc7047dafc5abbe84ba16a34a86c0b0229b8",
-                "reference": "6140fc7047dafc5abbe84ba16a34a86c0b0229b8",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a5370aaa7807c7a439b21386661ffccf3dff2866",
+                "reference": "a5370aaa7807c7a439b21386661ffccf3dff2866",
                 "shasum": ""
             },
             "require": {
@@ -4658,7 +4662,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-06-18T17:59:13+00:00"
+            "time": "2020-05-20T08:37:50+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -4738,7 +4742,7 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v5.1.3",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
@@ -4802,7 +4806,7 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v5.1.3",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
@@ -4865,7 +4869,7 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.18.1",
+            "version": "v1.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
@@ -4941,16 +4945,16 @@
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.18.1",
+            "version": "v1.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "5dcab1bc7146cf8c1beaa4502a3d9be344334251"
+                "reference": "bc6549d068d0160e0f10f7a5a23c7d1406b95ebe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/5dcab1bc7146cf8c1beaa4502a3d9be344334251",
-                "reference": "5dcab1bc7146cf8c1beaa4502a3d9be344334251",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/bc6549d068d0160e0f10f7a5a23c7d1406b95ebe",
+                "reference": "bc6549d068d0160e0f10f7a5a23c7d1406b95ebe",
                 "shasum": ""
             },
             "require": {
@@ -5022,11 +5026,11 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-08-04T06:02:08+00:00"
+            "time": "2020-07-14T12:35:20+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.18.1",
+            "version": "v1.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
@@ -5107,7 +5111,7 @@
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.18.1",
+            "version": "v1.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
@@ -5184,7 +5188,7 @@
         },
         {
             "name": "symfony/polyfill-php70",
-            "version": "v1.18.1",
+            "version": "v1.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php70.git",
@@ -5261,7 +5265,7 @@
         },
         {
             "name": "symfony/polyfill-php72",
-            "version": "v1.18.1",
+            "version": "v1.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
@@ -5334,7 +5338,7 @@
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.18.1",
+            "version": "v1.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
@@ -5410,7 +5414,7 @@
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.18.1",
+            "version": "v1.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
@@ -5490,20 +5494,20 @@
         },
         {
             "name": "symfony/process",
-            "version": "v4.4.11",
+            "version": "v4.4.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "65e70bab62f3da7089a8d4591fb23fbacacb3479"
+                "reference": "c714958428a85c86ab97e3a0c96db4c4f381b7f5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/65e70bab62f3da7089a8d4591fb23fbacacb3479",
-                "reference": "65e70bab62f3da7089a8d4591fb23fbacacb3479",
+                "url": "https://api.github.com/repos/symfony/process/zipball/c714958428a85c86ab97e3a0c96db4c4f381b7f5",
+                "reference": "c714958428a85c86ab97e3a0c96db4c4f381b7f5",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1.3"
+                "php": "^7.1.3"
             },
             "type": "library",
             "extra": {
@@ -5549,7 +5553,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-07-23T08:31:43+00:00"
+            "time": "2020-05-30T20:06:45+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -6049,16 +6053,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.147.14",
+            "version": "3.147.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "2ac5757aee4333c382c222880a51bd56930dafc4"
+                "reference": "8a561a4a1645ccdd06413a4f2defe55d35e0eecc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/2ac5757aee4333c382c222880a51bd56930dafc4",
-                "reference": "2ac5757aee4333c382c222880a51bd56930dafc4",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/8a561a4a1645ccdd06413a4f2defe55d35e0eecc",
+                "reference": "8a561a4a1645ccdd06413a4f2defe55d35e0eecc",
                 "shasum": ""
             },
             "require": {
@@ -6130,7 +6134,7 @@
                 "s3",
                 "sdk"
             ],
-            "time": "2020-08-06T18:18:37+00:00"
+            "time": "2020-07-20T18:18:31+00:00"
         },
         {
             "name": "beberlei/assert",
@@ -7509,16 +7513,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "1.0.70",
+            "version": "1.0.69",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "585824702f534f8d3cf7fab7225e8466cc4b7493"
+                "reference": "7106f78428a344bc4f643c233a94e48795f10967"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/585824702f534f8d3cf7fab7225e8466cc4b7493",
-                "reference": "585824702f534f8d3cf7fab7225e8466cc4b7493",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/7106f78428a344bc4f643c233a94e48795f10967",
+                "reference": "7106f78428a344bc4f643c233a94e48795f10967",
                 "shasum": ""
             },
             "require": {
@@ -7529,7 +7533,7 @@
                 "league/flysystem-sftp": "<1.0.6"
             },
             "require-dev": {
-                "phpspec/phpspec": "^3.4 || ^4.0 || ^5.0 || ^6.0",
+                "phpspec/phpspec": "^3.4",
                 "phpunit/phpunit": "^5.7.26"
             },
             "suggest": {
@@ -7595,7 +7599,7 @@
                     "type": "other"
                 }
             ],
-            "time": "2020-07-26T07:20:36+00:00"
+            "time": "2020-05-18T15:13:39+00:00"
         },
         {
             "name": "lusitanian/oauth",
@@ -7841,25 +7845,25 @@
         },
         {
             "name": "mtdowling/jmespath.php",
-            "version": "2.6.0",
+            "version": "2.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/jmespath/jmespath.php.git",
-                "reference": "42dae2cbd13154083ca6d70099692fef8ca84bfb"
+                "reference": "52168cb9472de06979613d365c7f1ab8798be895"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/42dae2cbd13154083ca6d70099692fef8ca84bfb",
-                "reference": "42dae2cbd13154083ca6d70099692fef8ca84bfb",
+                "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/52168cb9472de06979613d365c7f1ab8798be895",
+                "reference": "52168cb9472de06979613d365c7f1ab8798be895",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.4 || ^7.0 || ^8.0",
-                "symfony/polyfill-mbstring": "^1.17"
+                "php": ">=5.4.0",
+                "symfony/polyfill-mbstring": "^1.4"
             },
             "require-dev": {
-                "composer/xdebug-handler": "^1.4",
-                "phpunit/phpunit": "^4.8.36 || ^7.5.15"
+                "composer/xdebug-handler": "^1.2",
+                "phpunit/phpunit": "^4.8.36|^7.5.15"
             },
             "bin": [
                 "bin/jp.php"
@@ -7867,7 +7871,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6-dev"
+                    "dev-master": "2.5-dev"
                 }
             },
             "autoload": {
@@ -7894,7 +7898,7 @@
                 "json",
                 "jsonpath"
             ],
-            "time": "2020-07-31T21:01:56+00:00"
+            "time": "2019-12-30T18:03:34+00:00"
         },
         {
             "name": "mustache/mustache",
@@ -8957,16 +8961,16 @@
         },
         {
             "name": "phpunit/php-invoker",
-            "version": "3.1.0",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-invoker.git",
-                "reference": "7a85b66acc48cacffdf87dadd3694e7123674298"
+                "reference": "f6eedfed1085dd1f4c599629459a0277d25f9a66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/7a85b66acc48cacffdf87dadd3694e7123674298",
-                "reference": "7a85b66acc48cacffdf87dadd3694e7123674298",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/f6eedfed1085dd1f4c599629459a0277d25f9a66",
+                "reference": "f6eedfed1085dd1f4c599629459a0277d25f9a66",
                 "shasum": ""
             },
             "require": {
@@ -8982,7 +8986,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -9012,7 +9016,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-08-06T07:04:15+00:00"
+            "time": "2020-06-26T11:53:53+00:00"
         },
         {
             "name": "phpunit/php-text-template",
@@ -9126,16 +9130,16 @@
         },
         {
             "name": "phpunit/php-token-stream",
-            "version": "4.0.4",
+            "version": "4.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3"
+                "reference": "5672711b6b07b14d5ab694e700c62eeb82fcf374"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/a853a0e183b9db7eed023d7933a858fa1c8d25a3",
-                "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/5672711b6b07b14d5ab694e700c62eeb82fcf374",
+                "reference": "5672711b6b07b14d5ab694e700c62eeb82fcf374",
                 "shasum": ""
             },
             "require": {
@@ -9177,7 +9181,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-08-04T08:28:15+00:00"
+            "time": "2020-06-27T06:36:25+00:00"
         },
         {
             "name": "phpunit/phpunit",
@@ -10328,16 +10332,16 @@
         },
         {
             "name": "symfony/config",
-            "version": "v5.1.3",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "cf63f0613a6c6918e96db39c07a43b01e19a0773"
+                "reference": "b8623ef3d99fe62a34baf7a111b576216965f880"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/cf63f0613a6c6918e96db39c07a43b01e19a0773",
-                "reference": "cf63f0613a6c6918e96db39c07a43b01e19a0773",
+                "url": "https://api.github.com/repos/symfony/config/zipball/b8623ef3d99fe62a34baf7a111b576216965f880",
+                "reference": "b8623ef3d99fe62a34baf7a111b576216965f880",
                 "shasum": ""
             },
             "require": {
@@ -10404,20 +10408,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-07-15T10:53:22+00:00"
+            "time": "2020-05-23T13:08:13+00:00"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v5.1.3",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "c45c3f26d2ae7c5239e5ad420b0c2717dbbc0bcb"
+                "reference": "6508423eded583fc07e88a0172803e1a62f0310c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/c45c3f26d2ae7c5239e5ad420b0c2717dbbc0bcb",
-                "reference": "c45c3f26d2ae7c5239e5ad420b0c2717dbbc0bcb",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/6508423eded583fc07e88a0172803e1a62f0310c",
+                "reference": "6508423eded583fc07e88a0172803e1a62f0310c",
                 "shasum": ""
             },
             "require": {
@@ -10493,7 +10497,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-07-23T08:36:24+00:00"
+            "time": "2020-06-12T08:11:32+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -10561,16 +10565,16 @@
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v5.1.3",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "1f0d6627e680591c61e9176f04a0dc887b4e6702"
+                "reference": "f93055171b847915225bd5b0a5792888419d8d75"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/1f0d6627e680591c61e9176f04a0dc887b4e6702",
-                "reference": "1f0d6627e680591c61e9176f04a0dc887b4e6702",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/f93055171b847915225bd5b0a5792888419d8d75",
+                "reference": "f93055171b847915225bd5b0a5792888419d8d75",
                 "shasum": ""
             },
             "require": {
@@ -10632,20 +10636,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-07-23T10:04:31+00:00"
+            "time": "2020-06-15T06:52:54+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v5.1.3",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "149fb0ad35aae3c7637b496b38478797fa6a7ea6"
+                "reference": "c0c418f05e727606e85b482a8591519c4712cf45"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/149fb0ad35aae3c7637b496b38478797fa6a7ea6",
-                "reference": "149fb0ad35aae3c7637b496b38478797fa6a7ea6",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/c0c418f05e727606e85b482a8591519c4712cf45",
+                "reference": "c0c418f05e727606e85b482a8591519c4712cf45",
                 "shasum": ""
             },
             "require": {
@@ -10709,20 +10713,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-07-23T10:04:31+00:00"
+            "time": "2020-06-09T15:07:35+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v5.1.3",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "9ff59517938f88d90b6e65311fef08faa640f681"
+                "reference": "663f5dd5e14057d1954fe721f9709d35837f2447"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/9ff59517938f88d90b6e65311fef08faa640f681",
-                "reference": "9ff59517938f88d90b6e65311fef08faa640f681",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/663f5dd5e14057d1954fe721f9709d35837f2447",
+                "reference": "663f5dd5e14057d1954fe721f9709d35837f2447",
                 "shasum": ""
             },
             "require": {
@@ -10779,11 +10783,11 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-07-12T12:58:00+00:00"
+            "time": "2020-05-23T13:08:13+00:00"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v5.1.3",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
@@ -10847,7 +10851,7 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v5.1.3",
+            "version": "v5.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",

From 200484d90f18a4ad932bf1205bf7bebe1f7c4bf0 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Tue, 11 Aug 2020 09:08:01 +0300
Subject: [PATCH 1415/1718] fix static

---
 .../Block/Sales/Order/Email/Items/Downloadable.php            | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php b/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php
index a6ca4ef4067b1..5a54a274485fe 100644
--- a/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php
@@ -81,6 +81,8 @@ public function getLinks()
     }
 
     /**
+     * Returns links title
+     *
      * @return null|string
      */
     public function getLinksTitle()
@@ -92,6 +94,8 @@ public function getLinksTitle()
     }
 
     /**
+     * Returns purchased link url
+     *
      * @param Item $item
      * @return string
      */

From 176ce4321019adb3ca3f4f9fd6851d2ad45e1cfc Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Tue, 11 Aug 2020 09:17:41 +0300
Subject: [PATCH 1416/1718] add comment

---
 app/code/Magento/Rss/Model/Rss.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Rss/Model/Rss.php b/app/code/Magento/Rss/Model/Rss.php
index 614f92314a507..eb24db28b9572 100644
--- a/app/code/Magento/Rss/Model/Rss.php
+++ b/app/code/Magento/Rss/Model/Rss.php
@@ -9,12 +9,12 @@
 namespace Magento\Rss\Model;
 
 use Magento\Framework\App\CacheInterface;
+use Magento\Framework\App\FeedFactoryInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\Rss\DataProviderInterface;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\RuntimeException;
 use Magento\Framework\Serialize\SerializerInterface;
-use Magento\Framework\App\FeedFactoryInterface;
 
 /**
  * Provides functionality to work with RSS feeds
@@ -79,6 +79,7 @@ public function getFeeds()
             return $this->serializer->unserialize($cache);
         }
 
+        // serializing data to make sure all Phrase objects converted to a string
         $serializedData = $this->serializer->serialize($this->dataProvider->getRssData());
 
         if ($cacheKey && $cacheLifeTime) {

From 50aae09ebbf141fa643b476f39bbfb7791ab1296 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 11 Aug 2020 10:23:50 +0300
Subject: [PATCH 1417/1718] 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 fe0081707fcede404ca852e51f99d4b2018c72fa Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 11 Aug 2020 10:25:30 +0300
Subject: [PATCH 1418/1718] 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 d4e27fbcd7aff610ff2ce0735944c1b21b54bd31 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 11 Aug 2020 10:34:12 +0300
Subject: [PATCH 1419/1718] 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 9fe744f674967fc80965ffc95f4ff4b755fded06 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Tue, 11 Aug 2020 11:17:17 +0300
Subject: [PATCH 1420/1718] MC-34254: If disable module PageBuilder then in the
 product page, page white

---
 .../Magento/Framework/View/Page/Builder.php    | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/View/Page/Builder.php b/lib/internal/Magento/Framework/View/Page/Builder.php
index 66cc3f588a9a0..1085126c95ba2 100644
--- a/lib/internal/Magento/Framework/View/Page/Builder.php
+++ b/lib/internal/Magento/Framework/View/Page/Builder.php
@@ -6,8 +6,10 @@
 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
@@ -24,24 +26,32 @@ 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->pageConfig->setBuilder($this);
+        $this->pageLayoutBuilder = $pageLayoutBuilder ?? ObjectManager::getInstance()->get(BuilderInterface::class);
     }
 
     /**
@@ -73,6 +83,10 @@ protected function readPageLayout()
      */
     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();
     }
 }

From f68c8a299e307c30090e732469ba8c408df4524c Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Tue, 11 Aug 2020 12:25:05 +0300
Subject: [PATCH 1421/1718] MC-31304: [ElasticSearch] Exception on catalog
 search result page

---
 .../Test/Unit/Model/Adapter/ElasticsearchTest.php             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php
index a14df3d97b5a3..5abe800884ced 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php
@@ -11,8 +11,8 @@
 use Elasticsearch\Namespaces\IndicesNamespace;
 use Magento\AdvancedSearch\Model\Client\ClientInterface as ElasticsearchClient;
 use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface;
-use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface;
 use Magento\Elasticsearch\Model\Adapter\Elasticsearch as ElasticsearchAdapter;
 use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
@@ -527,7 +527,7 @@ public function testUpdateIndexMappingWithAliasDefinition(): void
             ->with($storeId, $mappedIndexerId)
             ->willReturn($indexName);
 
-        $attribute = $this->getMockBuilder(ProductAttributeInterface::class)
+        $attribute = $this->getMockBuilder(AbstractAttribute::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
 

From d187a46f2008d4d3b8b6be2962f0d236bb5df3a9 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Tue, 11 Aug 2020 12:52:52 +0300
Subject: [PATCH 1422/1718] 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 5ed8190e3bc83ce6711218310ce837d3b2105309 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Tue, 11 Aug 2020 14:08:51 +0300
Subject: [PATCH 1423/1718] add new action group

---
 .../Test/AdminDashboardWithChartsTest.xml     |  3 +--
 ...rontCheckoutClickNextButtonActionGroup.xml | 19 +++++++++++++++++++
 ...ckoutSuccessPageAsRegisterCustomerTest.xml |  9 +++------
 ...guringInstantPurchaseFunctionalityTest.xml |  3 +--
 ...ddressShouldBeCheckedOnPaymentPageTest.xml |  2 +-
 ...EditShippingAddressOnePageCheckoutTest.xml |  2 +-
 ...gRecalculationAfterCouponCodeAddedTest.xml |  4 ++--
 ...ingAddressAndProductWithTierPricesTest.xml |  3 +--
 ...ssAndRegisterCustomerAfterCheckoutTest.xml |  3 +--
 ...ntCheckoutWithSpecialPriceProductsTest.xml |  3 +--
 ...OnLoginWhenGuestCheckoutIsDisabledTest.xml |  3 +--
 ...stWithMultipleAddressesAndTaxRatesTest.xml |  6 ++----
 ...tWithRestrictedCountriesForPaymentTest.xml |  3 +--
 ...egistrationAndDisableGuestCheckoutTest.xml |  3 +--
 ...OrderWithNewAddressesThatWasEditedTest.xml |  3 +--
 ...tCheckoutUsingFreeShippingAndTaxesTest.xml |  3 +--
 ...ngesInBackendAfterCustomerCheckoutTest.xml |  3 +--
 ...uctQuantityEqualsToOrderedQuantityTest.xml |  4 +---
 ...CouponAndBankTransferPaymentMethodTest.xml |  3 +--
 ...ontPaypalSmartButtonInCheckoutPageTest.xml |  4 +---
 .../Test/Mftf/Test/AdminCreateInvoiceTest.xml |  3 +--
 ...editMemoTotalAfterShippingDiscountTest.xml |  3 +--
 .../StorefrontAutoGeneratedCouponCodeTest.xml |  3 +--
 23 files changed, 45 insertions(+), 50 deletions(-)
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckoutClickNextButtonActionGroup.xml

diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml
index c120b210d37e5..439b6ac063618 100644
--- a/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml
@@ -64,8 +64,7 @@
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingCheckoutPageWithShippingMethod"/>
         <click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask1"/>
-        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
-        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
+        <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNext"/>
         <!-- Checkout select Check/Money Order payment -->
         <comment userInput="Select Check/Money payment" stepKey="checkoutSelectCheckMoneyPayment"/>
         <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckoutClickNextButtonActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckoutClickNextButtonActionGroup.xml
new file mode 100644
index 0000000000000..7b089bd26ca0b
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckoutClickNextButtonActionGroup.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="StorefrontCheckoutClickNextButtonActionGroup">
+        <annotations>
+            <description>Clicks on the 'Next' button on checkout.</description>
+        </annotations>
+
+        <waitForElementVisible selector="{{CheckoutShippingMethodsSection.next}}" stepKey="waitForNextButton"/>
+        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickOnNextButton"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/CheckCheckoutSuccessPageTest/CheckCheckoutSuccessPageAsRegisterCustomerTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/CheckCheckoutSuccessPageTest/CheckCheckoutSuccessPageAsRegisterCustomerTest.xml
index a8bdde867a445..b1d2f42a872cd 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/CheckCheckoutSuccessPageTest/CheckCheckoutSuccessPageAsRegisterCustomerTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/CheckCheckoutSuccessPageTest/CheckCheckoutSuccessPageAsRegisterCustomerTest.xml
@@ -52,8 +52,7 @@
         <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
         <click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask2"/>
-        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
-        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
+        <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNext"/>
         <!-- Checkout select Check/Money Order payment -->
         <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
         <!--Click Place Order button-->
@@ -78,8 +77,7 @@
         <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart2"/>
         <click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod2"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask3"/>
-        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton2"/>
-        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext2"/>
+        <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNext2"/>
         <!-- Checkout select Check/Money Order payment -->
         <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment2"/>
 
@@ -103,8 +101,7 @@
         <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart3"/>
         <click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod3"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask4"/>
-        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton3"/>
-        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext3"/>
+        <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNext3"/>
 
         <!-- Checkout select Check/Money Order payment -->
         <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment3"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/ConfiguringInstantPurchaseFunctionalityTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/ConfiguringInstantPurchaseFunctionalityTest.xml
index 6e3df1c4ed724..c395f32c164bb 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/ConfiguringInstantPurchaseFunctionalityTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/ConfiguringInstantPurchaseFunctionalityTest.xml
@@ -71,8 +71,7 @@
         <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
 
         <!-- Customer placed order with payment method save -->
-        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" stepKey="waitForNextButton"/>
-        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
+        <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNext"/>
         <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" stepKey="waitForPaymentSectionLoaded"/>
 
         <!-- Fill Paypal card data -->
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/DefaultBillingAddressShouldBeCheckedOnPaymentPageTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/DefaultBillingAddressShouldBeCheckedOnPaymentPageTest.xml
index af7718eae69ed..370964a973432 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/DefaultBillingAddressShouldBeCheckedOnPaymentPageTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/DefaultBillingAddressShouldBeCheckedOnPaymentPageTest.xml
@@ -55,7 +55,7 @@
         <!--Select Shipping Rate "Flat Rate" and click "Next" button-->
         <actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShipping"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask2"/>
-        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
+        <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNext"/>
         <!--Verify that "My billing and shipping address are the same" is unchecked and billing address is preselected-->
         <dontSeeCheckboxIsChecked selector="{{CheckoutPaymentSection.billingAddressNotSameCheckbox}}" stepKey="shippingAndBillingAddressIsSameUnchecked"/>
         <see selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{US_Address_TX.street[0]}}" stepKey="assertBillingAddress"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/EditShippingAddressOnePageCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/EditShippingAddressOnePageCheckoutTest.xml
index f34becdd35af1..3d53fffcfa492 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/EditShippingAddressOnePageCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/EditShippingAddressOnePageCheckoutTest.xml
@@ -75,7 +75,7 @@
 
         <!-- Go to *Next* -->
         <scrollTo selector="{{CheckoutShippingMethodsSection.next}}" stepKey="scrollToButtonNext"/>
-        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="goNext"/>
+        <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="goNext"/>
 
         <!-- Select payment solution -->
         <checkOption selector="{{CheckoutPaymentSection.billingAddressNotSameCheckbox}}" stepKey="selectPaymentSolution" />
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontFreeShippingRecalculationAfterCouponCodeAddedTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontFreeShippingRecalculationAfterCouponCodeAddedTest.xml
index 8d508f381c765..20b94d0f4ec8a 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontFreeShippingRecalculationAfterCouponCodeAddedTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontFreeShippingRecalculationAfterCouponCodeAddedTest.xml
@@ -78,7 +78,7 @@
         <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart2"/>
         <waitForPageLoad stepKey="waitForShippingMethods"/>
         <click stepKey="chooseFreeShipping" selector="{{CheckoutShippingMethodsSection.shippingMethodRowByName('Free')}}"/>
-        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext1"/>
+        <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNext1"/>
         <waitForPageLoad stepKey="waitForReviewAndPayments1"/>
         <conditionalClick selector="{{DiscountSection.DiscountTab}}" dependentSelector="{{DiscountSection.CouponInput}}" visible="false" stepKey="clickIfDiscountTabClosed2"/>
         <waitForPageLoad stepKey="waitForCouponTabOpen2"/>
@@ -92,7 +92,7 @@
         <amOnPage stepKey="navigateToShippingPage" url="{{CheckoutShippingPage.url}}"/>
         <waitForPageLoad stepKey="waitForShippingPageLoad"/>
         <click stepKey="chooseFlatRateShipping" selector="{{CheckoutShippingMethodsSection.shippingMethodRowByName('Flat Rate')}}"/>
-        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext2"/>
+        <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNext2"/>
         <waitForPageLoad stepKey="waitForReviewAndPayments2"/>
         <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder2"/>
         <waitForPageLoad stepKey="waitForSuccessfullyPlacedOrder"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithDifferentShippingAndBillingAddressAndProductWithTierPricesTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithDifferentShippingAndBillingAddressAndProductWithTierPricesTest.xml
index ca1d21c34c956..c724cf4986aa9 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithDifferentShippingAndBillingAddressAndProductWithTierPricesTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithDifferentShippingAndBillingAddressAndProductWithTierPricesTest.xml
@@ -73,8 +73,7 @@
                 <argument name="customer" value="UKCustomer"/>
                 <argument name="customerAddress" value="updateCustomerUKAddress"/>
         </actionGroup>
-        <waitForElementVisible selector="{{CheckoutShippingMethodsSection.next}}" stepKey="waitForNextButton"/>
-        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickOnNextButton"/>
+        <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickOnNextButton"/>
         <waitForElementVisible selector="{{CheckoutPaymentSection.bankTransfer}}" stepKey="waitForPlaceOrderButton"/>
         <checkOption selector="{{CheckoutPaymentSection.bankTransfer}}" stepKey="selectBankTransfer"/>
         <waitForElementVisible selector="{{CheckoutPaymentSection.billingAddressNotSameBankTransferCheckbox}}" stepKey="waitForElementToBeVisible"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithDifferentShippingAndBillingAddressAndRegisterCustomerAfterCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithDifferentShippingAndBillingAddressAndRegisterCustomerAfterCheckoutTest.xml
index 23a8fd5a2c88c..cf10db2352df8 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithDifferentShippingAndBillingAddressAndRegisterCustomerAfterCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithDifferentShippingAndBillingAddressAndRegisterCustomerAfterCheckoutTest.xml
@@ -57,8 +57,7 @@
                 <argument name="customer" value="UKCustomer"/>
                 <argument name="customerAddress" value="updateCustomerUKAddress"/>
         </actionGroup>
-        <waitForElementVisible selector="{{CheckoutShippingMethodsSection.next}}" stepKey="waitForNextButton"/>
-        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickOnNextButton"/>
+        <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickOnNextButton"/>
         <waitForElementVisible selector="{{CheckoutPaymentSection.billingAddressNotSameCheckbox}}" stepKey="waitForElementToBeVisible"/>
         <uncheckOption selector="{{CheckoutPaymentSection.billingAddressNotSameCheckbox}}" stepKey="uncheckSameBillingAndShippingAddress"/>
         <conditionalClick selector="{{CheckoutShippingSection.editAddressButton}}" dependentSelector="{{CheckoutShippingSection.editAddressButton}}" visible="true" stepKey="clickEditButton"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithSpecialPriceProductsTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithSpecialPriceProductsTest.xml
index 566457b1f18a5..6abd62542e5c9 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithSpecialPriceProductsTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithSpecialPriceProductsTest.xml
@@ -143,8 +143,7 @@
         <fillField selector="{{CheckoutShippingSection.password}}" userInput="$$createCustomer.password$$" stepKey="fillPassword"/>
         <click selector="{{CheckoutShippingSection.loginButton}}" stepKey="clickLoginButton"/>
         <waitForPageLoad stepKey="waitForLoginPageToLoad"/>
-        <waitForElementVisible selector="{{CheckoutShippingMethodsSection.next}}" stepKey="waitForNextButton"/>
-        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickOnNextButton"/>
+        <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickOnNextButton"/>
 
         <!-- Place order and Assert success message -->
         <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutOnLoginWhenGuestCheckoutIsDisabledTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutOnLoginWhenGuestCheckoutIsDisabledTest.xml
index 5112be119df80..4ae6925cc8d55 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutOnLoginWhenGuestCheckoutIsDisabledTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutOnLoginWhenGuestCheckoutIsDisabledTest.xml
@@ -62,8 +62,7 @@
         </actionGroup>
         <click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="goToCheckout1"/>
         <waitForPageLoad stepKey="waitForShippingMethodSectionToLoad"/>
-        <waitForElementVisible selector="{{CheckoutShippingMethodsSection.next}}" stepKey="waitForNextButton"/>
-        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickOnNextButton"/>
+        <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickOnNextButton"/>
 
         <!-- Verify order summary on payment page -->
         <actionGroup ref="VerifyCheckoutPaymentOrderSummaryActionGroup" stepKey="verifyCheckoutPaymentOrderSummary">
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithMultipleAddressesAndTaxRatesTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithMultipleAddressesAndTaxRatesTest.xml
index c124090e6e865..92150b1e99dd5 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithMultipleAddressesAndTaxRatesTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithMultipleAddressesAndTaxRatesTest.xml
@@ -90,8 +90,7 @@
         <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart1"/>
 
         <click stepKey="selectFirstShippingMethod1" selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}"/>
-        <waitForElement stepKey="waitForShippingMethodSelect1" selector="{{CheckoutShippingMethodsSection.next}}" time="30"/>
-        <click stepKey="clickNextOnShippingMethodLoad1" selector="{{CheckoutShippingMethodsSection.next}}"/>
+        <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNextOnShippingMethodLoad1"/>
         <!-- Checkout select Check/Money Order payment -->
         <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
         <waitForElement stepKey="waitForPlaceOrderButton1" selector="{{CheckoutPaymentSection.placeOrder}}" time="30"/>
@@ -114,8 +113,7 @@
         <waitForElementVisible selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" time="30" stepKey="waitForShippingMethodRadioToBeVisible"/>
         <waitForPageLoad stepKey="waitForPageLoad23"/>
         <click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod2"/>
-        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForShippingMethodSelect2"/>
-        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNextOnShippingMethodLoad2"/>
+        <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNextOnShippingMethodLoad2"/>
         <!-- Checkout select Check/Money Order payment -->
         <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment2"/>
         <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton2"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithRestrictedCountriesForPaymentTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithRestrictedCountriesForPaymentTest.xml
index 5e5c37cc9e486..732038f24834b 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithRestrictedCountriesForPaymentTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithRestrictedCountriesForPaymentTest.xml
@@ -62,8 +62,7 @@
 
         <!-- Select address -->
         <click stepKey="selectAddress" selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}"/>
-        <waitForElement stepKey="waitNextButton" selector="{{CheckoutShippingMethodsSection.next}}" time="30"/>
-        <click stepKey="clickNextButton" selector="{{CheckoutShippingMethodsSection.next}}"/>
+        <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNextButton"/>
         <waitForPageLoad stepKey="waitBillingForm"/>
         <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
         <dontSee selector="{{CheckoutPaymentSection.paymentMethodByName('Check / Money order')}}" stepKey="paymentMethodDoesNotAvailable"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutWithNewCustomerRegistrationAndDisableGuestCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutWithNewCustomerRegistrationAndDisableGuestCheckoutTest.xml
index 4672815fb1b10..0d3bfe7b1fb84 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutWithNewCustomerRegistrationAndDisableGuestCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutWithNewCustomerRegistrationAndDisableGuestCheckoutTest.xml
@@ -87,8 +87,7 @@
 
         <!-- Proceed to checkout -->
         <click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="goToCheckout1"/>
-        <waitForElementVisible selector="{{CheckoutShippingMethodsSection.next}}" stepKey="waitForNextButton"/>
-        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickOnNextButton"/>
+        <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickOnNextButton"/>
 
         <!-- Verify order summary on payment page -->
         <actionGroup ref="VerifyCheckoutPaymentOrderSummaryActionGroup" stepKey="verifyCheckoutPaymentOrderSummary">
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml
index 95ea08e1e7d9a..d688a43e7de04 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerPlaceOrderWithNewAddressesThatWasEditedTest.xml
@@ -67,8 +67,7 @@
 
         <!--Close Popup and click next-->
         <click selector="{{StorefrontCheckoutAddressPopupSection.closeAddressModalPopup}}" stepKey="closePopup"/>
-        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" stepKey="waitForNextButton"/>
-        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
+        <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNext"/>
 
         <!--Refresh Page and Place Order-->
         <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml
index 1ce48bd8bf408..916b4d7bdad84 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml
@@ -187,8 +187,7 @@
             <argument name="customer" value="Simple_US_Customer"/>
             <argument name="customerAddress" value="US_Address_NY_Default_Shipping"/>
         </actionGroup>
-        <waitForElementVisible selector="{{CheckoutShippingMethodsSection.next}}" stepKey="waitForNextButton"/>
-        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickOnNextButton"/>
+        <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickOnNextButton"/>
 
         <!-- Place order and Assert success message -->
         <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductQuantityChangesInBackendAfterCustomerCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductQuantityChangesInBackendAfterCustomerCheckoutTest.xml
index 492bcec7bcc37..3978389691b55 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductQuantityChangesInBackendAfterCustomerCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductQuantityChangesInBackendAfterCustomerCheckoutTest.xml
@@ -54,8 +54,7 @@
             <argument name="customer" value="UKCustomer"/>
             <argument name="customerAddress" value="updateCustomerUKAddress"/>
         </actionGroup>
-        <waitForElementVisible selector="{{CheckoutShippingMethodsSection.next}}" stepKey="waitForNextButton"/>
-        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickOnNextButton"/>
+        <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickOnNextButton"/>
         <waitForElementVisible selector="{{CheckoutPaymentSection.bankTransfer}}" stepKey="waitForPlaceOrderButton"/>
         <click selector="{{CheckoutPaymentSection.bankTransfer}}" stepKey="selectBankTransfer"/>
 
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUKGuestCheckoutWithConditionProductQuantityEqualsToOrderedQuantityTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUKGuestCheckoutWithConditionProductQuantityEqualsToOrderedQuantityTest.xml
index f11144aa454af..10eee5938b27d 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUKGuestCheckoutWithConditionProductQuantityEqualsToOrderedQuantityTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUKGuestCheckoutWithConditionProductQuantityEqualsToOrderedQuantityTest.xml
@@ -51,9 +51,7 @@
             <argument name="customer" value="UKCustomer"/>
             <argument name="customerAddress" value="UK_Not_Default_Address"/>
         </actionGroup>
-        <waitForElementVisible selector="{{CheckoutShippingMethodsSection.next}}" stepKey="waitForNextButton"/>
-        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickOnNextButton"/>
-
+        <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickOnNextButton"/>
         <!-- Place order and Assert success message -->
         <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>
 
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUSCustomerCheckoutWithCouponAndBankTransferPaymentMethodTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUSCustomerCheckoutWithCouponAndBankTransferPaymentMethodTest.xml
index 655865a62cdba..dc92c0c5ce9ee 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUSCustomerCheckoutWithCouponAndBankTransferPaymentMethodTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontUSCustomerCheckoutWithCouponAndBankTransferPaymentMethodTest.xml
@@ -61,8 +61,7 @@
 
         <!-- Fill the guest form -->
         <actionGroup ref="FillGuestCheckoutShippingAddressFormActionGroup" stepKey="fillGuestForm"/>
-        <waitForElementVisible selector="{{CheckoutShippingMethodsSection.next}}" stepKey="waitForNextButton"/>
-        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickOnNextButton"/>
+        <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickOnNextButton"/>
         <waitForElementVisible selector="{{CheckoutPaymentSection.bankTransfer}}" stepKey="waitForPlaceOrderButton"/>
         <checkOption selector="{{CheckoutPaymentSection.bankTransfer}}" stepKey="selectBankTransfer"/>
 
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml
index d27ac4c4a92f5..898c26bb4b45a 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml
@@ -61,9 +61,7 @@
         <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
         <click selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('Free Shipping')}}" stepKey="selectFlatShippingMethod"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask2"/>
-
-        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
-        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
+        <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNext"/>
 
         <!--Assert grand total-->
         <actionGroup ref="VerifyCheckoutPaymentOrderSummaryActionGroup" stepKey="verifyCheckoutPaymentOrderSummary">
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
index 07a5dfc95f918..627f739852ee7 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
@@ -50,8 +50,7 @@
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
         <click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask2"/>
-        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
-        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
+        <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNext"/>
         <!-- Checkout select Check/Money Order payment -->
         <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
         <waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml
index 37c2b59f79eb1..7444de8271ed9 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml
@@ -83,8 +83,7 @@
         <!-- Choose Shippping - Flat Rate Shipping  -->
         <click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask2"/>
-        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
-        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
+        <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNext"/>
 
         <!-- Checkout select Check/Money Order payment -->
         <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment3"/>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontAutoGeneratedCouponCodeTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontAutoGeneratedCouponCodeTest.xml
index b77cfaf02d232..c2aeca657db3b 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontAutoGeneratedCouponCodeTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontAutoGeneratedCouponCodeTest.xml
@@ -97,8 +97,7 @@
         <click selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('Flat Rate')}}"
                stepKey="selectFlatShippingMethod"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
-        <waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForNextButton"/>
-        <click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
+        <actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickNext"/>
         <!-- Checkout select Check/Money Order payment -->
         <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
         <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>

From 07dd8956b7b49782b8bb112bb48f67f1e76a576c 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 1424/1718] 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 b0bce559c0089aa4d208fcd590085d94b83b56d8 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 1425/1718] 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 71f1e9905a07a1cc5669febd0bf7eb71f29b9e1a Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Tue, 11 Aug 2020 15:07:56 +0300
Subject: [PATCH 1426/1718] MC-35458: Config fields changes

---
 .../Config/Block/System/Config/Form/Fieldset.php  | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

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 97e37f8b5e54c..7b7463cc08b3b 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Fieldset.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Fieldset.php
@@ -274,7 +274,18 @@ protected function _isCollapseState($element)
             return true;
         }
 
+        if (!empty($element->getGroup()['depends']['fields'])) {
+            foreach ($element->getGroup()['depends']['fields'] as $dependFieldData) {
+                if (is_array($dependFieldData) && isset($dependFieldData['value'], $dependFieldData['id'])) {
+                    if ($dependFieldData['value'] !== $this->getConfigData($dependFieldData['id'])) {
+                        return false;
+                    }
+                }
+            }
+        }
+
         $extra = $this->_authSession->getUser()->getExtra();
+
         if (isset($extra['configState'][$element->getId()])) {
             return $extra['configState'][$element->getId()];
         }
@@ -292,9 +303,7 @@ private function addVisibilityTag(AbstractElement $field): string
         $elementId = '';
         $styleTag = '';
 
-        if (!empty($field->getFieldConfig()['depends']['fields'])
-            || !empty($field->getContainer()->getGroup()['depends']['fields'])
-        ) {
+        if (!empty($field->getFieldConfig()['depends']['fields'])) {
             $elementId = '#row_' . $field->getHtmlId();
         } elseif (!empty($field->getGroup()['depends']['fields'])) {
             $elementId = '#' . $field->getHtmlId() . '-head';

From 1b39196a80c9c4a3d229c121b647b82ae242193d Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Tue, 11 Aug 2020 15:53:48 +0300
Subject: [PATCH 1427/1718] fix store website name rewrites

---
 .../Listing/Column/Store/Options.php          |  33 ++---
 .../Listing/Column/Store/OptionsTest.php      | 114 ++++++++++++++++++
 2 files changed, 131 insertions(+), 16 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Store/Ui/Component/Listing/Column/Store/OptionsTest.php

diff --git a/app/code/Magento/Store/Ui/Component/Listing/Column/Store/Options.php b/app/code/Magento/Store/Ui/Component/Listing/Column/Store/Options.php
index 907eb74e20fa2..f8aa09cb20a61 100644
--- a/app/code/Magento/Store/Ui/Component/Listing/Column/Store/Options.php
+++ b/app/code/Magento/Store/Ui/Component/Listing/Column/Store/Options.php
@@ -10,7 +10,7 @@
 use Magento\Store\Model\System\Store as SystemStore;
 
 /**
- * Class Options
+ * Ui stores options
  */
 class Options implements OptionSourceInterface
 {
@@ -93,37 +93,38 @@ protected function sanitizeName($name)
      *
      * @return void
      */
-    protected function generateCurrentOptions()
+    protected function generateCurrentOptions(): void
     {
         $websiteCollection = $this->systemStore->getWebsiteCollection();
         $groupCollection = $this->systemStore->getGroupCollection();
         $storeCollection = $this->systemStore->getStoreCollection();
-        /** @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()) {
+                if ($group->getWebsiteId() === $website->getId()) {
                     $stores = [];
-                    /** @var  \Magento\Store\Model\Store $store */
                     foreach ($storeCollection as $store) {
-                        if ($store->getGroupId() == $group->getId()) {
-                            $name = $this->sanitizeName($store->getName());
-                            $stores[$name]['label'] = str_repeat(' ', 8) . $name;
-                            $stores[$name]['value'] = $store->getId();
+                        if ($store->getGroupId() === $group->getId()) {
+                            $stores[] = [
+                                'label' => str_repeat(' ', 8) . $this->sanitizeName($store->getName()),
+                                'value' => $store->getId(),
+                            ];
                         }
                     }
                     if (!empty($stores)) {
-                        $name = $this->sanitizeName($group->getName());
-                        $groups[$name]['label'] = str_repeat(' ', 4) . $name;
-                        $groups[$name]['value'] = array_values($stores);
+                        $groups[] = [
+                            'label' => str_repeat(' ', 4) . $this->sanitizeName($group->getName()),
+                            'value' => array_values($stores),
+                        ];
                     }
                 }
             }
             if (!empty($groups)) {
-                $name = $this->sanitizeName($website->getName());
-                $this->currentOptions[$name]['label'] = $name;
-                $this->currentOptions[$name]['value'] = array_values($groups);
+                $this->currentOptions[] = [
+                    'label' => $this->sanitizeName($website->getName()),
+                    'value' => array_values($groups),
+                ];
             }
         }
     }
diff --git a/dev/tests/integration/testsuite/Magento/Store/Ui/Component/Listing/Column/Store/OptionsTest.php b/dev/tests/integration/testsuite/Magento/Store/Ui/Component/Listing/Column/Store/OptionsTest.php
new file mode 100644
index 0000000000000..e13c4a427464f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Store/Ui/Component/Listing/Column/Store/OptionsTest.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Store\Ui\Component\Listing\Column\Store;
+
+use Magento\Store\Model\ResourceModel\Group as GroupResource;
+use Magento\Store\Model\ResourceModel\Store as StoreResource;
+use Magento\Store\Model\ResourceModel\Website as WebsiteResource;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for \Magento\Store\Ui\Component\Listing\Column\Store\Options.
+ */
+class OptionsTest extends TestCase
+{
+    private const DEFAULT_WEBSITE_NAME = 'Main Website';
+    private const DEFAULT_STORE_GROUP_NAME = 'Main Website Store';
+    private const DEFAULT_STORE_NAME = 'Default Store View';
+
+    /**
+     * @var OptionsFactory
+     */
+    private $modelFactory;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var WebsiteResource
+     */
+    private $websiteResource;
+
+    /**
+     * @var StoreResource
+     */
+    private $storeResource;
+
+    /**
+     * @var GroupResource
+     */
+    private $groupResource;
+
+    /**
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        $objectManager = Bootstrap::getObjectManager();
+
+        $this->modelFactory = $objectManager->get(OptionsFactory::class);
+        $this->storeManager = $objectManager->get(StoreManagerInterface::class);
+
+        $this->websiteResource = $objectManager->get(WebsiteResource::class);
+        $this->groupResource = $objectManager->get(GroupResource::class);
+        $this->storeResource = $objectManager->get(StoreResource::class);
+    }
+
+    /**
+     * To option array test with duplicate website, store group, store view names
+     *
+     * @magentoDataFixture Magento/Store/_files/second_website_with_store_group_and_store.php
+     *
+     * @return void
+     */
+    public function testToOptionArray(): void
+    {
+        $website = $this->storeManager->getWebsite('test');
+        $this->websiteResource->save($website->setName(self::DEFAULT_WEBSITE_NAME));
+
+        $storeGroup = current($website->getGroups());
+        $this->groupResource->save($storeGroup->setName(self::DEFAULT_STORE_GROUP_NAME));
+
+        $store = current($website->getStores());
+        $this->storeResource->save($store->setName(self::DEFAULT_STORE_NAME));
+
+        $model = $this->modelFactory->create();
+        $storeIds = [$this->storeManager->getStore('default')->getId(), $store->getId()];
+
+        $this->assertEquals($this->getExpectedOptions($storeIds), $model->toOptionArray());
+    }
+
+    /**
+     * Returns expected options
+     *
+     * @param array $storeIds
+     * @return array
+     */
+    private function getExpectedOptions(array $storeIds): array
+    {
+        $expectedOptions = [];
+        foreach ($storeIds as $storeId) {
+            $expectedOptions[] = [
+                'label' => self::DEFAULT_WEBSITE_NAME,
+                'value' => [[
+                    'label' => str_repeat(' ', 4) . self::DEFAULT_STORE_GROUP_NAME,
+                    'value' => [[
+                        'label' => str_repeat(' ', 8) . self::DEFAULT_STORE_NAME,
+                        'value' => $storeId,
+                    ]],
+                ]],
+            ];
+        }
+
+        return $expectedOptions;
+    }
+}

From bb1ba1480ccfa56796c0ea0b828a3cb05e256311 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 11 Aug 2020 15:58:32 +0300
Subject: [PATCH 1428/1718] 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 7e34bc97092166109f2fbadda8d187a86ca7105e Mon Sep 17 00:00:00 2001
From: yolouiese <honeymay@abovethefray.io>
Date: Tue, 11 Aug 2020 21:19:45 +0800
Subject: [PATCH 1429/1718] 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 a156298fffe989ad2306708b1cb9f5a54541d717 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 11 Aug 2020 16:26:20 +0300
Subject: [PATCH 1430/1718] 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 c1d2eb873c92772092f027b9dd5adc6b9b184999 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Tue, 11 Aug 2020 16:46:01 +0300
Subject: [PATCH 1431/1718] MC-34254: If disable module PageBuilder then in the
 product page, page white

---
 lib/internal/Magento/Framework/View/Page/Builder.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/View/Page/Builder.php b/lib/internal/Magento/Framework/View/Page/Builder.php
index 1085126c95ba2..af76715f05bdc 100644
--- a/lib/internal/Magento/Framework/View/Page/Builder.php
+++ b/lib/internal/Magento/Framework/View/Page/Builder.php
@@ -12,7 +12,7 @@
 use Magento\Framework\View\Model\PageLayout\Config\BuilderInterface;
 
 /**
- * Class Builder
+ * Page Layout Builder
  */
 class Builder extends View\Layout\Builder
 {
@@ -67,6 +67,7 @@ protected function generateLayoutBlocks()
 
     /**
      * Read page layout and write structure to ReadContext
+     *
      * @return void
      */
     protected function readPageLayout()
@@ -79,6 +80,8 @@ protected function readPageLayout()
     }
 
     /**
+     * Get current page layout or fallback to default
+     *
      * @return string
      */
     protected function getPageLayout()

From 3a1df1d28f8087ca12f3248c1fa359fc8a43272a Mon Sep 17 00:00:00 2001
From: ralbin <russell.albin@blueacorn.com>
Date: Tue, 11 Aug 2020 09:21:51 -0500
Subject: [PATCH 1432/1718] Issue 25595 - Adding an entry in i18n for
 translation

---
 app/code/Magento/Multishipping/i18n/en_US.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Multishipping/i18n/en_US.csv b/app/code/Magento/Multishipping/i18n/en_US.csv
index f9ab587c65fa3..ad3e968d88cd5 100644
--- a/app/code/Magento/Multishipping/i18n/en_US.csv
+++ b/app/code/Magento/Multishipping/i18n/en_US.csv
@@ -92,3 +92,4 @@ Options,Options
 "Error:","Error:"
 "We are unable to process your request. Please, try again later.","We are unable to process your request. Please, try again later."
 "Quote address for failed order ID "%1" not found.","Quote address for failed order ID "%1" not found."
+"All shippable products have been removed from your order","All shippable products have been removed from your order"
\ No newline at end of file

From 5d792113d09ad850f1e582347977ac7e6f6f2638 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Tue, 11 Aug 2020 18:20:34 +0300
Subject: [PATCH 1433/1718] magento/magento2-login-as-customer#150: Opt-in/out
 - cache load degradation fix.

---
 .../Api/IsAssistanceEnabledInterface.php      | 10 +++
 .../Model/IsAssistanceEnabled.php             | 76 +------------------
 .../Plugin/CustomerDataValidatePlugin.php     | 12 +--
 ...DataProviderWithDefaultAddressesPlugin.php |  4 +-
 .../templates/shopping-assistance.phtml       |  6 +-
 5 files changed, 24 insertions(+), 84 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomerAssistance/Api/IsAssistanceEnabledInterface.php b/app/code/Magento/LoginAsCustomerAssistance/Api/IsAssistanceEnabledInterface.php
index f6084bddd1bf0..916d03477a5d3 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/Api/IsAssistanceEnabledInterface.php
+++ b/app/code/Magento/LoginAsCustomerAssistance/Api/IsAssistanceEnabledInterface.php
@@ -12,6 +12,16 @@
  */
 interface IsAssistanceEnabledInterface
 {
+    /**
+     * Merchant assistance denied by customer status code.
+     */
+    public const DENIED = 1;
+
+    /**
+     * Merchant assistance allowed by customer status code.
+     */
+    public const ALLOWED = 2;
+
     /**
      * Get 'assistance_allowed' attribute from Customer by id.
      *
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Model/IsAssistanceEnabled.php b/app/code/Magento/LoginAsCustomerAssistance/Model/IsAssistanceEnabled.php
index 1e0ecb2cf644b..da77c96164228 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/Model/IsAssistanceEnabled.php
+++ b/app/code/Magento/LoginAsCustomerAssistance/Model/IsAssistanceEnabled.php
@@ -23,43 +23,17 @@ class IsAssistanceEnabled implements IsAssistanceEnabledInterface
      */
     private $registry = [];
 
-    /**
-     * Merchant assistance denied by customer status code.
-     */
-    public const DENIED = 1;
-
-    /**
-     * Merchant assistance allowed by customer status code.
-     */
-    public const ALLOWED = 2;
-
-    /**
-     * @var CustomerExtensionFactory
-     */
-    private $customerExtensionFactory;
-
-    /**
-     * @var CustomerRepositoryInterface
-     */
-    private $customerRepository;
-
     /**
      * @var GetLoginAsCustomerAssistanceAllowed
      */
     private $getLoginAsCustomerAssistanceAllowed;
 
     /**
-     * @param CustomerExtensionFactory $customerExtensionFactory
-     * @param CustomerRepositoryInterface $customerRepository
      * @param GetLoginAsCustomerAssistanceAllowed $getLoginAsCustomerAssistanceAllowed
      */
     public function __construct(
-        CustomerExtensionFactory $customerExtensionFactory,
-        CustomerRepositoryInterface $customerRepository,
         GetLoginAsCustomerAssistanceAllowed $getLoginAsCustomerAssistanceAllowed
     ) {
-        $this->customerExtensionFactory = $customerExtensionFactory;
-        $this->customerRepository = $customerRepository;
         $this->getLoginAsCustomerAssistanceAllowed = $getLoginAsCustomerAssistanceAllowed;
     }
 
@@ -71,54 +45,10 @@ public function __construct(
      */
     public function execute(int $customerId): bool
     {
-        try {
-            $customer = $this->customerRepository->getById($customerId);
-            // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock.DetectedCatch
-        } catch (NoSuchEntityException $exception) {
-            // do nothing
-        }
-        if (isset($customer)) {
-            $extensionAttributes = $customer->getExtensionAttributes();
-            if ($extensionAttributes === null) {
-                $extensionAttributes = $this->customerExtensionFactory->create();
-            }
-            if ($extensionAttributes->getAssistanceAllowed() === null) {
-                if (isset($this->registry[$customerId])) {
-                    $assistanceAllowed = $this->registry[$customerId];
-                } else {
-                    $assistanceAllowed = $this->getLoginAsCustomerAssistanceAllowed->execute($customerId);
-                    $this->registry[$customerId] = $assistanceAllowed;
-                }
-                $extensionAttributes->setAssistanceAllowed($this->resolveStatus($assistanceAllowed));
-                $customer->setExtensionAttributes($extensionAttributes);
-            }
-            $assistanceAllowed = $this->resolveAllowance($customer->getExtensionAttributes()->getAssistanceAllowed());
-        } else {
-            $assistanceAllowed = false;
+        if (!isset($this->registry[$customerId])) {
+            $this->registry[$customerId] = $this->getLoginAsCustomerAssistanceAllowed->execute($customerId);
         }
 
-        return $assistanceAllowed;
-    }
-
-    /**
-     * Get integer status value from boolean.
-     *
-     * @param bool $assistanceAllowed
-     * @return int
-     */
-    private function resolveStatus(bool $assistanceAllowed): int
-    {
-        return $assistanceAllowed ? self::ALLOWED : self::DENIED;
-    }
-
-    /**
-     * Get boolean status value from integer.
-     *
-     * @param int $statusCode
-     * @return bool
-     */
-    private function resolveAllowance(int $statusCode): bool
-    {
-        return $statusCode === self::ALLOWED;
+        return $this->registry[$customerId];
     }
 }
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php b/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php
index ddb19fe229256..9da329b4a3991 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php
+++ b/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php
@@ -11,8 +11,8 @@
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\AuthorizationInterface;
 use Magento\Framework\Message\MessageInterface;
+use Magento\LoginAsCustomerAssistance\Api\IsAssistanceEnabledInterface;
 use Magento\LoginAsCustomerAssistance\Model\ResourceModel\GetLoginAsCustomerAssistanceAllowed;
-use Magento\LoginAsCustomerAssistance\Model\IsAssistanceEnabled;
 
 /**
  * Check if User have permission to change Customers Opt-In preference.
@@ -109,11 +109,11 @@ private function isSetAssistanceAllowedParam(RequestInterface $request): bool
     private function isAssistanceAllowedChangeImportant(int $assistanceAllowed, int $assistanceAllowedParam): bool
     {
         $result = false;
-        if (($assistanceAllowedParam === IsAssistanceEnabled::DENIED
-                && $assistanceAllowed === IsAssistanceEnabled::ALLOWED)
+        if (($assistanceAllowedParam === IsAssistanceEnabledInterface::DENIED
+                && $assistanceAllowed === IsAssistanceEnabledInterface::ALLOWED)
             ||
-            ($assistanceAllowedParam === IsAssistanceEnabled::ALLOWED
-                && $assistanceAllowed !== IsAssistanceEnabled::ALLOWED)) {
+            ($assistanceAllowedParam === IsAssistanceEnabledInterface::ALLOWED
+                && $assistanceAllowed !== IsAssistanceEnabledInterface::ALLOWED)) {
             $result = true;
         }
 
@@ -128,6 +128,6 @@ private function isAssistanceAllowedChangeImportant(int $assistanceAllowed, int
      */
     private function resolveStatus(bool $assistanceAllowed): int
     {
-        return $assistanceAllowed ? IsAssistanceEnabled::ALLOWED : IsAssistanceEnabled::DENIED;
+        return $assistanceAllowed ? IsAssistanceEnabledInterface::ALLOWED : IsAssistanceEnabledInterface::DENIED;
     }
 }
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Plugin/DataProviderWithDefaultAddressesPlugin.php b/app/code/Magento/LoginAsCustomerAssistance/Plugin/DataProviderWithDefaultAddressesPlugin.php
index 8222c6f5017cb..6653340285d32 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/Plugin/DataProviderWithDefaultAddressesPlugin.php
+++ b/app/code/Magento/LoginAsCustomerAssistance/Plugin/DataProviderWithDefaultAddressesPlugin.php
@@ -10,7 +10,7 @@
 use Magento\Customer\Model\Customer\DataProviderWithDefaultAddresses;
 use Magento\Framework\AuthorizationInterface;
 use Magento\LoginAsCustomerApi\Api\ConfigInterface;
-use Magento\LoginAsCustomerAssistance\Model\IsAssistanceEnabled;
+use Magento\LoginAsCustomerAssistance\Api\IsAssistanceEnabledInterface;
 use Magento\LoginAsCustomerAssistance\Model\ResourceModel\GetLoginAsCustomerAssistanceAllowed;
 
 /**
@@ -123,6 +123,6 @@ public function afterGetMeta(
      */
     private function resolveStatus(bool $assistanceAllowed): int
     {
-        return $assistanceAllowed ? IsAssistanceEnabled::ALLOWED : IsAssistanceEnabled::DENIED;
+        return $assistanceAllowed ? IsAssistanceEnabledInterface::ALLOWED : IsAssistanceEnabledInterface::DENIED;
     }
 }
diff --git a/app/code/Magento/LoginAsCustomerAssistance/view/frontend/templates/shopping-assistance.phtml b/app/code/Magento/LoginAsCustomerAssistance/view/frontend/templates/shopping-assistance.phtml
index f92025c099b38..7765975863485 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/view/frontend/templates/shopping-assistance.phtml
+++ b/app/code/Magento/LoginAsCustomerAssistance/view/frontend/templates/shopping-assistance.phtml
@@ -5,7 +5,7 @@
  */
 
 use Magento\Framework\Escaper;
-use Magento\LoginAsCustomerAssistance\Model\IsAssistanceEnabled;
+use Magento\LoginAsCustomerAssistance\Api\IsAssistanceEnabledInterface;
 use Magento\LoginAsCustomerAssistance\ViewModel\ShoppingAssistanceViewModel;
 
 /** @var Escaper $escaper */
@@ -17,8 +17,8 @@ $viewModel = $block->getViewModel();
 {
     ".form-create-account, .form-edit-account": {
         "Magento_LoginAsCustomerAssistance/js/opt-in": {
-            "allowAccess": "<?= /* @noEscape */ IsAssistanceEnabled::ALLOWED ?>",
-            "denyAccess": "<?= /* @noEscape */ IsAssistanceEnabled::DENIED ?>"
+            "allowAccess": "<?= /* @noEscape */ IsAssistanceEnabledInterface::ALLOWED ?>",
+            "denyAccess": "<?= /* @noEscape */ IsAssistanceEnabledInterface::DENIED ?>"
         }
     }
 }

From f7e98302adcec0401b9e1c4b460fb7151921d00c Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 11 Aug 2020 18:47:06 +0300
Subject: [PATCH 1434/1718] 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 c9f95060af1a600385e211727827579be8b512af Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Tue, 11 Aug 2020 18:56:35 +0300
Subject: [PATCH 1435/1718] Add MFtf test for AdminAnalytics

---
 .../Test/AdminAnalyticsCheckTrackingTest.xml  | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 app/code/Magento/AdminAnalytics/Test/Mftf/Test/AdminAnalyticsCheckTrackingTest.xml

diff --git a/app/code/Magento/AdminAnalytics/Test/Mftf/Test/AdminAnalyticsCheckTrackingTest.xml b/app/code/Magento/AdminAnalytics/Test/Mftf/Test/AdminAnalyticsCheckTrackingTest.xml
new file mode 100644
index 0000000000000..1de1a19f33f5f
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/Test/Mftf/Test/AdminAnalyticsCheckTrackingTest.xml
@@ -0,0 +1,33 @@
+<?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="AdminAnalyticsCheckTrackingTest">
+        <annotations>
+            <stories value="AdminAnalytics Check Tracking."/>
+            <title value="AdminAnalytics Check Tracking."/>
+            <description value="AdminAnalytics Check Tracking."/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
+            <magentoCLI command="config:set admin/usage/enabled 1" stepKey="enableAdminUsageTracking"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
+            <reloadPage stepKey="pageReload"/>
+        </before>
+        <after>
+            <magentoCLI command="config:set admin/usage/enabled 0" stepKey="disableAdminUsageTracking"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+
+        <waitForPageLoad stepKey="waitForPageReloaded"/>
+        <seeInPageSource html="var adminAnalyticsMetadata =" stepKey="seeInPageSource"/>
+    </test>
+</tests>

From 8b8e496fa243b7fc3f92906cbbfbc1505298adf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Kos?= <kosrafal@gmail.com>
Date: Tue, 11 Aug 2020 18:31:12 +0200
Subject: [PATCH 1436/1718] fix fatal error when exception was thrown

---
 .../Framework/Stdlib/DateTime/Timezone.php    |  2 +-
 .../Test/Unit/DateTime/TimezoneTest.php       | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php
index 0791c89ab793a..42ffeae2aa883 100644
--- a/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php
+++ b/lib/internal/Magento/Framework/Stdlib/DateTime/Timezone.php
@@ -319,7 +319,7 @@ public function convertConfigTimeToUtc($date, $format = 'Y-m-d H:i:s')
                 throw new LocalizedException(
                     new Phrase(
                         'The DateTime object timezone needs to be the same as the "%1" timezone in config.',
-                        $this->getConfigTimezone()
+                        [$this->getConfigTimezone()]
                     )
                 );
             }
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/TimezoneTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/TimezoneTest.php
index b72995bb39855..09f85567e4c0d 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/TimezoneTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/TimezoneTest.php
@@ -9,6 +9,7 @@
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ScopeResolverInterface;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Locale\ResolverInterface;
 use Magento\Framework\Stdlib\DateTime;
 use Magento\Framework\Stdlib\DateTime\Timezone;
@@ -208,6 +209,30 @@ public function testDate($expectedResult, $timezone, $date)
         );
     }
 
+    /**
+     * Data provider for testException
+     *
+     * @return array
+     */
+    public function getConvertConfigTimeToUTCDataFixtures()
+    {
+        return [
+            'datetime' => [
+                new \DateTime('2016-10-10 10:00:00', new \DateTimeZone('UTC'))
+            ]
+        ];
+    }
+
+    /**
+     * @dataProvider getConvertConfigTimeToUTCDataFixtures
+     */
+    public function testConvertConfigTimeToUtcException($date)
+    {
+        $this->expectException(LocalizedException::class);
+
+        $this->getTimezone()->convertConfigTimeToUtc($date);
+    }
+
     /**
      * DataProvider for testDate
      *

From 0f9189efd2f6b7341c90225d577966f875dbbd83 Mon Sep 17 00:00:00 2001
From: yolouiese <honeymay@abovethefray.io>
Date: Wed, 12 Aug 2020 01:06:45 +0800
Subject: [PATCH 1437/1718] 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 9eea75e8cab91..977ffcd0255ff 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
@@ -99,7 +99,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 4b4e4294e791130f1178865063c205230c372d94 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 1438/1718] 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 451cfb87d43551a6024f1fc91089e4a60542e774 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Tue, 11 Aug 2020 20:29:34 +0300
Subject: [PATCH 1439/1718] created action group for click button

---
 ...dminClickAddProductToOptionActionGroup.xml | 20 +++++++++++++++++++
 .../Mftf/Test/AdminAddBundleItemsTest.xml     |  8 ++------
 .../AdminAddDefaultImageBundleProductTest.xml |  4 +---
 .../Test/AdminDeleteABundleProductTest.xml    |  4 +---
 ...inFilterProductListByBundleProductTest.xml |  4 +---
 .../AdminMassDeleteBundleProductsTest.xml     |  8 ++------
 .../Test/AdminProductBundleCreationTest.xml   |  4 +---
 ...minRemoveDefaultImageBundleProductTest.xml |  4 +---
 .../Test/BundleProductFixedPricingTest.xml    |  4 +---
 .../EnableDisableBundleProductStatusTest.xml  |  4 +---
 .../MassEnableDisableBundleProductsTest.xml   |  8 ++------
 ...NewProductsListWidgetBundleProductTest.xml |  3 +--
 .../Mftf/Test/StorefrontAdminEditDataTest.xml |  4 +---
 .../StorefrontBundleProductDetailsTest.xml    |  4 +---
 ...eProductShownInCategoryListAndGridTest.xml |  3 +--
 .../Test/StorefrontEditBundleProductTest.xml  |  4 +---
 ...ontGoToDetailsPageWhenAddingToCartTest.xml |  3 +--
 17 files changed, 39 insertions(+), 54 deletions(-)
 create mode 100644 app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminClickAddProductToOptionActionGroup.xml

diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminClickAddProductToOptionActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminClickAddProductToOptionActionGroup.xml
new file mode 100644
index 0000000000000..c692dfaae35aa
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminClickAddProductToOptionActionGroup.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="AdminClickAddProductToOptionActionGroup">
+        <annotations>
+            <description>Click AddProductToOption button for bundle product.</description>
+        </annotations>
+
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
+        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
+        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddBundleItemsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddBundleItemsTest.xml
index debf023ea0a65..a79bd333499af 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddBundleItemsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddBundleItemsTest.xml
@@ -49,9 +49,7 @@
         <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
         <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
-        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
-        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
-        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
+        <actionGroup ref="AdminClickAddProductToOptionActionGroup" stepKey="clickAddProductsToOption"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterBundleProductOptions">
             <argument name="product" value="$$simpleProduct0$$"/>
         </actionGroup>
@@ -101,9 +99,7 @@
         <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('1')}}" stepKey="waitForBundleOptionsToAppear"/>
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('1')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillNewestOptionTitle"/>
         <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('1')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectNewInputType"/>
-        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToNewBundle"/>
-        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToNewOption"/>
-        <waitForPageLoad stepKey="waitForPageLoadAfterNewBundleProducts"/>
+        <actionGroup ref="AdminClickAddProductToOptionActionGroup" stepKey="clickAddProductsToNewOption"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterNewBundleProductOptions">
                 <argument name="product" value="$$simpleProduct2$$"/>
         </actionGroup>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultImageBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultImageBundleProductTest.xml
index 0ba1cf50d9b59..0fa4a8ed93732 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultImageBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultImageBundleProductTest.xml
@@ -48,9 +48,7 @@
         <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
         <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
-        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
-        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
-        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
+        <actionGroup ref="AdminClickAddProductToOptionActionGroup" stepKey="clickAddProductsToOption"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterBundleProductOptions">
             <argument name="product" value="$$simpleProduct1$$"/>
         </actionGroup>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml
index 9716791985970..dfa9b53abc7c8 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminDeleteABundleProductTest.xml
@@ -38,9 +38,7 @@
         <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
         <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
-        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
-        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
-        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
+        <actionGroup ref="AdminClickAddProductToOptionActionGroup" stepKey="clickAddProductsToOption"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterBundleProductOptions">
             <argument name="product" value="$$simpleProduct1$$"/>
         </actionGroup>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProductTest.xml
index b7d2edf2ec080..7ef529f0e6976 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminFilterProductListByBundleProductTest.xml
@@ -38,9 +38,7 @@
         <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
         <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
-        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
-        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
-        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
+        <actionGroup ref="AdminClickAddProductToOptionActionGroup" stepKey="clickAddProductsToOption"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterBundleProductOptions">
             <argument name="product" value="$$simpleProduct1$$"/>
         </actionGroup>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProductsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProductsTest.xml
index ef84ebd6fafea..4b46802a7e8a7 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProductsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminMassDeleteBundleProductsTest.xml
@@ -46,9 +46,7 @@
         <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
         <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
-        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
-        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
-        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
+        <actionGroup ref="AdminClickAddProductToOptionActionGroup" stepKey="clickAddProductsToOption"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterBundleProductOptions">
             <argument name="product" value="$$simpleProduct1$$"/>
         </actionGroup>
@@ -81,9 +79,7 @@
         <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions2"/>
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle2"/>
         <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType2"/>
-        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle2"/>
-        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption2"/>
-        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts2"/>
+        <actionGroup ref="AdminClickAddProductToOptionActionGroup" stepKey="clickAddProductsToOption2"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterBundleProductOptionsx2">
             <argument name="product" value="$$simpleProduct3$$"/>
         </actionGroup>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminProductBundleCreationTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminProductBundleCreationTest.xml
index d05a4707d6fa0..1b3de481b2a08 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminProductBundleCreationTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminProductBundleCreationTest.xml
@@ -45,9 +45,7 @@
         <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
         <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
-        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
-        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
-        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
+        <actionGroup ref="AdminClickAddProductToOptionActionGroup" stepKey="clickAddProductsToOption"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterBundleProductOptions">
             <argument name="product" value="$$simpleProduct1$$"/>
         </actionGroup>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultImageBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultImageBundleProductTest.xml
index e6c6c9322fdb2..17c31b8a5ae53 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultImageBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/AdminRemoveDefaultImageBundleProductTest.xml
@@ -52,9 +52,7 @@
         <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
         <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
-        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
-        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
-        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
+        <actionGroup ref="AdminClickAddProductToOptionActionGroup" stepKey="clickAddProductsToOption"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterBundleProductOptions">
             <argument name="product" value="$$simpleProduct1$$"/>
         </actionGroup>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml
index 888c857ac61f7..b91f995b70ba7 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml
@@ -47,9 +47,7 @@
         <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
         <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
-        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
-        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
-        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
+        <actionGroup ref="AdminClickAddProductToOptionActionGroup" stepKey="clickAddProductsToOption"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterBundleProductOptions">
             <argument name="product" value="$$simpleProduct1$$"/>
         </actionGroup>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/EnableDisableBundleProductStatusTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/EnableDisableBundleProductStatusTest.xml
index edd89f64ab5d0..45328900bf156 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/EnableDisableBundleProductStatusTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/EnableDisableBundleProductStatusTest.xml
@@ -44,9 +44,7 @@
         <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
         <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
-        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
-        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
-        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
+        <actionGroup ref="AdminClickAddProductToOptionActionGroup" stepKey="clickAddProductsToOption"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterBundleProductOptions">
             <argument name="product" value="$$simpleProduct1$$"/>
         </actionGroup>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
index 126d965c23423..f8f98384ee8da 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/MassEnableDisableBundleProductsTest.xml
@@ -46,9 +46,7 @@
         <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
         <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
-        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
-        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
-        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
+        <actionGroup ref="AdminClickAddProductToOptionActionGroup" stepKey="clickAddProductsToOption"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterBundleProductOptions">
             <argument name="product" value="$$simpleProduct1$$"/>
         </actionGroup>
@@ -78,9 +76,7 @@
         <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions2"/>
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle2"/>
         <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType2"/>
-        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle2"/>
-        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption2"/>
-        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts2"/>
+        <actionGroup ref="AdminClickAddProductToOptionActionGroup" stepKey="clickAddProductsToOption2"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterBundleProductOptionsx2">
             <argument name="product" value="$$simpleProduct3$$"/>
         </actionGroup>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/NewProductsListWidgetBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/NewProductsListWidgetBundleProductTest.xml
index 4b9b046363caa..e89ef1d3f87fa 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/NewProductsListWidgetBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/NewProductsListWidgetBundleProductTest.xml
@@ -50,8 +50,7 @@
         <waitForPageLoad stepKey="waitForOptions"/>
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="MFTF Test Bundle 1" stepKey="fillOptionTitle"/>
         <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="checkbox" stepKey="selectInputType"/>
-        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
-        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
+        <actionGroup ref="AdminClickAddProductToOptionActionGroup" stepKey="clickAddProductsToOption"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterBundleProductOptions">
             <argument name="product" value="$$simpleProduct1$$"/>
         </actionGroup>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml
index 6436f8be98d7b..bd61f7aaf3b99 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml
@@ -47,9 +47,7 @@
         <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
         <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
-        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
-        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
-        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
+        <actionGroup ref="AdminClickAddProductToOptionActionGroup" stepKey="clickAddProductsToOption"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterBundleProductOptions">
             <argument name="product" value="$$simpleProduct1$$"/>
         </actionGroup>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductDetailsTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductDetailsTest.xml
index 43b11549d0824..63362071568b5 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductDetailsTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductDetailsTest.xml
@@ -52,9 +52,7 @@
         <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
         <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
-        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
-        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
-        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
+        <actionGroup ref="AdminClickAddProductToOptionActionGroup" stepKey="clickAddProductsToOption"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterBundleProductOptions">
             <argument name="product" value="$$simpleProduct1$$"/>
         </actionGroup>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGridTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGridTest.xml
index 2a962f6ef71b4..04753baec45f6 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGridTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGridTest.xml
@@ -57,8 +57,7 @@
         <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
         <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
-        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
-        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
+        <actionGroup ref="AdminClickAddProductToOptionActionGroup" stepKey="clickAddProductsToOption"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterBundleProductOptions">
             <argument name="product" value="$$simpleProduct1$$"/>
         </actionGroup>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
index 8b72dc7ed05cc..e204dd01e6367 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml
@@ -47,9 +47,7 @@
         <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
         <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
-        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
-        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
-        <waitForPageLoad stepKey="waitForPageLoadAfterBundleProducts"/>
+        <actionGroup ref="AdminClickAddProductToOptionActionGroup" stepKey="clickAddProductsToOption"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterBundleProductOptions">
             <argument name="product" value="$$simpleProduct1$$"/>
         </actionGroup>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml
index b3cbdb93fb830..f6866f813f258 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml
@@ -47,8 +47,7 @@
         <waitForElementVisible selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" stepKey="waitForBundleOptions"/>
         <fillField selector="{{AdminProductFormBundleSection.bundleOptionXTitle('0')}}" userInput="{{BundleProduct.optionTitle1}}" stepKey="fillOptionTitle"/>
         <selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="{{BundleProduct.optionInputType1}}" stepKey="selectInputType"/>
-        <waitForElementVisible selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="waitForAddProductsToBundle"/>
-        <click selector="{{AdminProductFormBundleSection.addProductsToOption}}" stepKey="clickAddProductsToOption"/>
+        <actionGroup ref="AdminClickAddProductToOptionActionGroup" stepKey="clickAddProductsToOption"/>
         <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="filterBundleProductOptions">
             <argument name="product" value="$$simpleProduct1$$"/>
         </actionGroup>

From 9f02257226d4ac946c572ff4d23ce88ef5265fae Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Wed, 12 Aug 2020 01:37:46 +0800
Subject: [PATCH 1440/1718] 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 db43cb8549d60f1eb7d2fcc4d80aec34bdc40fd4 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Tue, 11 Aug 2020 20:52:19 +0300
Subject: [PATCH 1441/1718] rename test

---
 ...eckTrackingTest.xml => AdminCheckAnalyticsTrackingTest.xml} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 rename app/code/Magento/AdminAnalytics/Test/Mftf/Test/{AdminAnalyticsCheckTrackingTest.xml => AdminCheckAnalyticsTrackingTest.xml} (93%)

diff --git a/app/code/Magento/AdminAnalytics/Test/Mftf/Test/AdminAnalyticsCheckTrackingTest.xml b/app/code/Magento/AdminAnalytics/Test/Mftf/Test/AdminCheckAnalyticsTrackingTest.xml
similarity index 93%
rename from app/code/Magento/AdminAnalytics/Test/Mftf/Test/AdminAnalyticsCheckTrackingTest.xml
rename to app/code/Magento/AdminAnalytics/Test/Mftf/Test/AdminCheckAnalyticsTrackingTest.xml
index 1de1a19f33f5f..cd79851d16b96 100644
--- a/app/code/Magento/AdminAnalytics/Test/Mftf/Test/AdminAnalyticsCheckTrackingTest.xml
+++ b/app/code/Magento/AdminAnalytics/Test/Mftf/Test/AdminCheckAnalyticsTrackingTest.xml
@@ -8,11 +8,12 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminAnalyticsCheckTrackingTest">
+    <test name="AdminCheckAnalyticsTrackingTest">
         <annotations>
             <stories value="AdminAnalytics Check Tracking."/>
             <title value="AdminAnalytics Check Tracking."/>
             <description value="AdminAnalytics Check Tracking."/>
+            <severity value="MINOR"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>

From 3e7471f0367eedc962ee900ed37c2073fb6f2b42 Mon Sep 17 00:00:00 2001
From: Viktor Petryk <victor.petryk@transoftgroup.com>
Date: Tue, 11 Aug 2020 21:36:40 +0300
Subject: [PATCH 1442/1718] MC-34254: If disable module PageBuilder then in the
 product page, page white

---
 .../Magento/Framework/View/Page/Builder.php         |  2 +-
 .../Framework/View/Test/Unit/Page/BuilderTest.php   | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/View/Page/Builder.php b/lib/internal/Magento/Framework/View/Page/Builder.php
index af76715f05bdc..846ffd119dabd 100644
--- a/lib/internal/Magento/Framework/View/Page/Builder.php
+++ b/lib/internal/Magento/Framework/View/Page/Builder.php
@@ -50,8 +50,8 @@ public function __construct(
         parent::__construct($layout, $request, $eventManager);
         $this->pageConfig = $pageConfig;
         $this->pageLayoutReader = $pageLayoutReader;
-        $this->pageConfig->setBuilder($this);
         $this->pageLayoutBuilder = $pageLayoutBuilder ?? ObjectManager::getInstance()->get(BuilderInterface::class);
+        $this->pageConfig->setBuilder($this);
     }
 
     /**
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 0b6ba916edc17c9e6a231b7fb3598086c1c365c8 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Wed, 12 Aug 2020 03:35:25 +0800
Subject: [PATCH 1443/1718] 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 7d7de12c335c4a24846405985ed2781103e482ba Mon Sep 17 00:00:00 2001
From: Ievgen Kolesov <ikolesov@adobe.com>
Date: Tue, 11 Aug 2020 15:33:43 -0500
Subject: [PATCH 1444/1718] PWA-805: Expose localization system / store config
 from GraphQL

---
 .../Store/Model/ResourceModel/StoreWebsiteRelation.php        | 4 ++--
 .../Model/Resolver/Store/StoreConfigDataProvider.php          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php b/app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php
index f0b021eefb999..875c0e6cb3b05 100644
--- a/app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php
+++ b/app/code/Magento/Store/Model/ResourceModel/StoreWebsiteRelation.php
@@ -48,11 +48,11 @@ public function getStoreByWebsiteId($websiteId)
      * Get website store data
      *
      * @param int $websiteId
-     * @param int $storeGroupId
      * @param bool $available
+     * @param int|null $storeGroupId
      * @return array
      */
-    public function getWebsiteStores(int $websiteId, int $storeGroupId = null, bool $available = false): array
+    public function getWebsiteStores(int $websiteId, bool $available = false, int $storeGroupId = null): array
     {
         $connection = $this->resource->getConnection();
         $storeTable = $this->resource->getTableName('store');
diff --git a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
index 928a99eb73714..8378b3bc7a4be 100644
--- a/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
+++ b/app/code/Magento/StoreGraphQl/Model/Resolver/Store/StoreConfigDataProvider.php
@@ -78,7 +78,7 @@ public function getStoreConfigData(StoreInterface $store): array
      */
     public function getAvailableStoreConfig(int $websiteId, int $storeGroupId = null): array
     {
-        $websiteStores = $this->storeWebsiteRelation->getWebsiteStores($websiteId, $storeGroupId, true);
+        $websiteStores = $this->storeWebsiteRelation->getWebsiteStores($websiteId, true, $storeGroupId);
         $storeCodes = array_column($websiteStores, 'code');
 
         $storeConfigs = $this->storeConfigManager->getStoreConfigs($storeCodes);

From 88b21156b826141789d925f3f5c41cb7aa68e066 Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Wed, 15 Jul 2020 13:15:07 +0300
Subject: [PATCH 1445/1718] Updating the Wishlist GraphQl implementation

---
 .../Product/BundleOptionDataProvider.php      | 148 ++++++++++++++++++
 .../Model/Resolver/AddProductsToWishlist.php  |   2 +-
 .../Resolver/CustomerWishlistResolver.php     |   2 +-
 .../Model/Resolver/CustomerWishlists.php      | 102 ++++++++++++
 .../Model/Resolver/ProductResolver.php        |   7 +-
 .../Resolver/RemoveProductsFromWishlist.php   |   2 +-
 .../Resolver/Type/Bundle/BundleOptions.php    |  54 +++++++
 .../Resolver/Type/Configurable/ChildSku.php   |  43 +++++
 .../Type/Configurable/ConfigurableOptions.php |  67 ++++++++
 .../Resolver/Type/Downloadable/Links.php      |  66 ++++++++
 .../Model/Resolver/Type/WishlistItemType.php  |  59 +++++++
 .../Resolver/UpdateProductsInWishlist.php     |   2 +-
 .../Model/Resolver/WishlistById.php           | 115 ++++++++++++++
 .../Model/Resolver/WishlistItems.php          |  98 ++++++++++++
 .../Model/Resolver/WishlistItemsResolver.php  |   2 +-
 .../Model/Resolver/WishlistResolver.php       |   2 +-
 .../Magento/WishlistGraphQl/composer.json     |   3 +
 app/code/Magento/WishlistGraphQl/etc/di.xml   |  21 +++
 .../WishlistGraphQl/etc/schema.graphqls       |  66 ++++++--
 .../AddBundleProductToWishlistTest.php        |  32 +++-
 .../AddConfigurableProductToWishlistTest.php  |  38 +++--
 .../AddDownloadableProductToWishlistTest.php  |  96 +++++++-----
 .../GraphQl/Wishlist/CustomerWishlistTest.php |   2 +-
 .../Wishlist/CustomerWishlistsTest.php        | 142 +++++++++++++++++
 .../DeleteProductsFromWishlistTest.php        |  20 +--
 ... GetCustomOptionsWithUidForQueryBySku.php} |   6 +-
 .../UpdateProductsFromWishlistTest.php        |  22 +--
 27 files changed, 1116 insertions(+), 103 deletions(-)
 create mode 100644 app/code/Magento/Wishlist/Model/Product/BundleOptionDataProvider.php
 create mode 100644 app/code/Magento/WishlistGraphQl/Model/Resolver/CustomerWishlists.php
 create mode 100644 app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Bundle/BundleOptions.php
 create mode 100644 app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Configurable/ChildSku.php
 create mode 100644 app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Configurable/ConfigurableOptions.php
 create mode 100644 app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Downloadable/Links.php
 create mode 100644 app/code/Magento/WishlistGraphQl/Model/Resolver/Type/WishlistItemType.php
 create mode 100644 app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistById.php
 create mode 100644 app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistItems.php
 create mode 100644 app/code/Magento/WishlistGraphQl/etc/di.xml
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/CustomerWishlistsTest.php
 rename dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/{GetCustomOptionsWithIDV2ForQueryBySku.php => GetCustomOptionsWithUidForQueryBySku.php} (95%)

diff --git a/app/code/Magento/Wishlist/Model/Product/BundleOptionDataProvider.php b/app/code/Magento/Wishlist/Model/Product/BundleOptionDataProvider.php
new file mode 100644
index 0000000000000..406524c7a189d
--- /dev/null
+++ b/app/code/Magento/Wishlist/Model/Product/BundleOptionDataProvider.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Wishlist\Model\Product;
+
+use Magento\Bundle\Helper\Catalog\Product\Configuration;
+use Magento\Bundle\Model\Option;
+use Magento\Bundle\Model\Product\Type;
+use Magento\Catalog\Model\Product;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Pricing\Helper\Data;
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Wishlist\Model\Item;
+
+/**
+ * Data provider for bundled product options
+ */
+class BundleOptionDataProvider
+{
+    /**
+     * @var Data
+     */
+    private $pricingHelper;
+
+    /**
+     * @var SerializerInterface
+     */
+    private $serializer;
+
+    /**
+     * @var Configuration
+     */
+    private $configuration;
+
+    /**
+     * @param Data $pricingHelper
+     * @param SerializerInterface $serializer
+     * @param Configuration $configuration
+     */
+    public function __construct(
+        Data $pricingHelper,
+        SerializerInterface $serializer,
+        Configuration $configuration
+    ) {
+        $this->pricingHelper = $pricingHelper;
+        $this->serializer = $serializer;
+        $this->configuration = $configuration;
+    }
+
+    /**
+     * Extract data for a bundled wishlist item
+     *
+     * @param Item $item
+     *
+     * @return array
+     */
+    public function getData(Item $item): array
+    {
+        $options = [];
+        $product = $item->getProduct();
+        $optionsQuoteItemOption = $item->getOptionByCode('bundle_option_ids');
+        $bundleOptionsIds = $optionsQuoteItemOption
+            ? $this->serializer->unserialize($optionsQuoteItemOption->getValue())
+            : [];
+
+        /** @var Type $typeInstance */
+        $typeInstance = $product->getTypeInstance();
+
+        if ($bundleOptionsIds) {
+            $selectionsQuoteItemOption = $item->getOptionByCode('bundle_selection_ids');
+            $optionsCollection = $typeInstance->getOptionsByIds($bundleOptionsIds, $product);
+            $bundleSelectionIds = $this->serializer->unserialize($selectionsQuoteItemOption->getValue());
+
+            if (!empty($bundleSelectionIds)) {
+                $selectionsCollection = $typeInstance->getSelectionsByIds($bundleSelectionIds, $product);
+                $bundleOptions = $optionsCollection->appendSelections($selectionsCollection, true);
+
+                $options = $this->buildBundleOptions($bundleOptions, $item);
+            }
+        }
+
+        return $options;
+    }
+
+    /**
+     * Build bundle product options based on current selection
+     *
+     * @param Option[] $bundleOptions
+     * @param Item $item
+     *
+     * @return array
+     */
+    private function buildBundleOptions(array $bundleOptions, Item $item): array
+    {
+        $options = [];
+        foreach ($bundleOptions as $bundleOption) {
+            if (!$bundleOption->getSelections()) {
+                continue;
+            }
+
+            $options[] = [
+                'id' => $bundleOption->getId(),
+                'label' => $bundleOption->getTitle(),
+                'type' => $bundleOption->getType(),
+                'values' => $this->buildBundleOptionValues($bundleOption->getSelections(), $item),
+            ];
+        }
+
+        return $options;
+    }
+
+    /**
+     * Build bundle product option values based on current selection
+     *
+     * @param Product[] $selections
+     * @param Item $item
+     *
+     * @return array
+     *
+     * @throws LocalizedException
+     */
+    private function buildBundleOptionValues(array $selections, Item $item): array
+    {
+        $product = $item->getProduct();
+        $values = [];
+
+        foreach ($selections as $selection) {
+            $qty = (float) $this->configuration->getSelectionQty($product, $selection->getSelectionId());
+            if (!$qty) {
+                continue;
+            }
+
+            $selectionPrice = $this->configuration->getSelectionFinalPrice($item, $selection);
+            $values[] = [
+                'label' => $selection->getName(),
+                'id' => $selection->getSelectionId(),
+                'quantity' => $qty,
+                'price' => $this->pricingHelper->currency($selectionPrice, false, false),
+            ];
+        }
+
+        return $values;
+    }
+}
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/AddProductsToWishlist.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/AddProductsToWishlist.php
index 11c8446a72a9d..fdfc2c373aa42 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();
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/CustomerWishlists.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/CustomerWishlists.php
new file mode 100644
index 0000000000000..ad0c73691720a
--- /dev/null
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/CustomerWishlists.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\WishlistGraphQl\Model\Resolver;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Wishlist\Model\ResourceModel\Wishlist\Collection as WishlistCollection;
+use Magento\Wishlist\Model\ResourceModel\Wishlist\CollectionFactory as WishlistCollectionFactory;
+use Magento\Wishlist\Model\Wishlist;
+use Magento\Wishlist\Model\Wishlist\Config as WishlistConfig;
+use Magento\WishlistGraphQl\Mapper\WishlistDataMapper;
+
+/**
+ * Fetches customer wishlist list
+ */
+class CustomerWishlists implements ResolverInterface
+{
+    /**
+     * @var WishlistDataMapper
+     */
+    private $wishlistDataMapper;
+
+    /**
+     * @var WishlistConfig
+     */
+    private $wishlistConfig;
+
+    /**
+     * @var WishlistCollectionFactory
+     */
+    private $wishlistCollectionFactory;
+
+    /**
+     * @param WishlistDataMapper $wishlistDataMapper
+     * @param WishlistConfig $wishlistConfig
+     * @param WishlistCollectionFactory $wishlistCollectionFactory
+     */
+    public function __construct(
+        WishlistDataMapper $wishlistDataMapper,
+        WishlistConfig $wishlistConfig,
+        WishlistCollectionFactory $wishlistCollectionFactory
+    ) {
+        $this->wishlistDataMapper = $wishlistDataMapper;
+        $this->wishlistConfig = $wishlistConfig;
+        $this->wishlistCollectionFactory = $wishlistCollectionFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!$this->wishlistConfig->isEnabled()) {
+            throw new GraphQlInputException(__('The wishlist configuration is currently disabled.'));
+        }
+
+        $customerId = $context->getUserId();
+
+        if (null === $customerId || 0 === $customerId) {
+            throw new GraphQlAuthorizationException(
+                __('The current user cannot perform operations on wishlist')
+            );
+        }
+
+        $currentPage = $args['currentPage'] ?? 1;
+        $pageSize = $args['pageSize'] ?? 20;
+
+        /** @var WishlistCollection $collection */
+        $collection = $this->wishlistCollectionFactory->create();
+        $collection->filterByCustomerId($customerId);
+
+        if ($currentPage > 0) {
+            $collection->setCurPage($currentPage);
+        }
+
+        if ($pageSize > 0) {
+            $collection->setPageSize($pageSize);
+        }
+
+        $wishlists = [];
+
+        /** @var Wishlist $wishList */
+        foreach ($collection->getItems() as $wishList) {
+            array_push($wishlists, $this->wishlistDataMapper->map($wishList));
+        }
+
+        return $wishlists;
+    }
+}
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/ProductResolver.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/ProductResolver.php
index 65c8498fc89ad..d292d3eab9910 100644
--- a/app/code/Magento/WishlistGraphQl/Model/Resolver/ProductResolver.php
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/ProductResolver.php
@@ -7,6 +7,7 @@
 
 namespace Magento\WishlistGraphQl\Model\Resolver;
 
+use Magento\Catalog\Model\Product;
 use Magento\CatalogGraphQl\Model\ProductDataProvider;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
@@ -45,9 +46,9 @@ public function resolve(
         if (!isset($value['model'])) {
             throw new LocalizedException(__('Missing key "model" in Wishlist Item value data'));
         }
-        /** @var Item $wishlistItem */
-        $wishlistItem = $value['model'];
+        /** @var Product $product */
+        $product = $value['model'];
 
-        return $this->productDataProvider->getProductDataById((int)$wishlistItem->getProductId());
+        return $this->productDataProvider->getProductDataById((int) $product->getId());
     }
 }
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/RemoveProductsFromWishlist.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/RemoveProductsFromWishlist.php
index 1c741361ea7b7..11a962acbf787 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/Type/Bundle/BundleOptions.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Bundle/BundleOptions.php
new file mode 100644
index 0000000000000..11af9bbbc60b9
--- /dev/null
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Bundle/BundleOptions.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\WishlistGraphQl\Model\Resolver\Type\Bundle;
+
+use Magento\Wishlist\Model\Product\BundleOptionDataProvider;
+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\Wishlist\Model\Item;
+
+/**
+ * Fetches the selected bundle options
+ */
+class BundleOptions implements ResolverInterface
+{
+    /**
+     * @var BundleOptionDataProvider
+     */
+    private $bundleOptionDataProvider;
+
+    /**
+     * @param BundleOptionDataProvider $bundleOptionDataProvider
+     */
+    public function __construct(
+        BundleOptionDataProvider $bundleOptionDataProvider
+    ) {
+        $this->bundleOptionDataProvider = $bundleOptionDataProvider;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!$value['wishlistItemModel'] instanceof Item) {
+            throw new LocalizedException(__('"wishlistItemModel" should be a "%instance" instance', [
+                'instance' => Item::class
+            ]));
+        }
+
+        return $this->bundleOptionDataProvider->getData($value['wishlistItemModel']);
+    }
+}
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Configurable/ChildSku.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Configurable/ChildSku.php
new file mode 100644
index 0000000000000..7014312ce4765
--- /dev/null
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Configurable/ChildSku.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\WishlistGraphQl\Model\Resolver\Type\Configurable;
+
+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\Wishlist\Model\Item;
+
+/**
+ * Fetches the simple child sku of configurable product
+ */
+class ChildSku implements ResolverInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!$value['wishlistItemModel'] instanceof Item) {
+            throw new LocalizedException(__('"wishlistItemModel" should be a "%instance" instance', [
+                'instance' => Item::class
+            ]));
+        }
+
+        /** @var Item $wishlistItem */
+        $wishlistItem = $value['wishlistItemModel'];
+        $optionProduct = $wishlistItem->getProduct()->getCustomOption('simple_product')->getProduct();
+
+        return $optionProduct->getSku();
+    }
+}
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Configurable/ConfigurableOptions.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Configurable/ConfigurableOptions.php
new file mode 100644
index 0000000000000..f3e7be1395a24
--- /dev/null
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Configurable/ConfigurableOptions.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\WishlistGraphQl\Model\Resolver\Type\Configurable;
+
+use Magento\Catalog\Helper\Product\Configuration;
+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\Wishlist\Model\Item;
+
+/**
+ * Fetches the selected configurable options
+ */
+class ConfigurableOptions implements ResolverInterface
+{
+    /**
+     * @var Configuration
+     */
+    private $configurationHelper;
+
+    /**
+     * @param Configuration $configurationHelper
+     */
+    public function __construct(
+        Configuration $configurationHelper
+    ) {
+        $this->configurationHelper = $configurationHelper;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!$value['wishlistItemModel'] instanceof Item) {
+            throw new LocalizedException(__('"wishlistItemModel" should be a "%instance" instance', [
+                'instance' => Item::class
+            ]));
+        }
+
+        /** @var Item $wishlistItem */
+        $wishlistItem = $value['wishlistItemModel'];
+        $result = [];
+
+        foreach ($this->configurationHelper->getOptions($wishlistItem) as $option) {
+            $result[] = [
+                'id' => $option['option_id'],
+                'option_label' => $option['label'],
+                'value_id' => $option['option_value'],
+                'value_label' => $option['value'],
+            ];
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Downloadable/Links.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Downloadable/Links.php
new file mode 100644
index 0000000000000..aa6f4c70318da
--- /dev/null
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Downloadable/Links.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\WishlistGraphQl\Model\Resolver\Type\Downloadable;
+
+use Magento\Downloadable\Helper\Catalog\Product\Configuration;
+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\Wishlist\Model\Item;
+
+/**
+ * Fetches the selected downloadable links
+ */
+class Links implements ResolverInterface
+{
+    /**
+     * @var ConvertLinksToArray
+     */
+    private $convertLinksToArray;
+
+    /**
+     * @var Configuration
+     */
+    private $downloadableConfiguration;
+
+    /**
+     * @param ConvertLinksToArray $convertLinksToArray
+     * @param Configuration $downloadableConfiguration
+     */
+    public function __construct(
+        ConvertLinksToArray $convertLinksToArray,
+        Configuration $downloadableConfiguration
+    ) {
+        $this->convertLinksToArray = $convertLinksToArray;
+        $this->downloadableConfiguration = $downloadableConfiguration;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['wishlistItemModel'])) {
+            throw new LocalizedException(__('Missing key "wishlistItemModel" in Wishlist Item value data'));
+        }
+        /** @var Item $wishlistItem */
+        $wishlistItem = $value['wishlistItemModel'];
+
+        $links = $this->downloadableConfiguration->getLinks($wishlistItem);
+        $links = $this->convertLinksToArray->execute($links);
+
+        return $links;
+    }
+}
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/WishlistItemType.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/WishlistItemType.php
new file mode 100644
index 0000000000000..ae4a6ed2b6a64
--- /dev/null
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/WishlistItemType.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\WishlistGraphQl\Model\Resolver\Type;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
+
+/**
+ * Resolving the wishlist item type
+ */
+class WishlistItemType implements TypeResolverInterface
+{
+    /**
+     * @var array
+     */
+    private $supportedTypes = [];
+
+    /**
+     * @param array $supportedTypes
+     */
+    public function __construct(array $supportedTypes = [])
+    {
+        $this->supportedTypes = $supportedTypes;
+    }
+
+    /**
+     * Resolving wishlist item type
+     *
+     * @param array $data
+     *
+     * @return string
+     *
+     * @throws LocalizedException
+     */
+    public function resolveType(array $data): string
+    {
+        if (!$data['model'] instanceof ProductInterface) {
+            throw new LocalizedException(__('"model" should be a "%instance" instance', [
+                'instance' => ProductInterface::class
+            ]));
+        }
+
+        $productTypeId = $data['model']->getTypeId();
+
+        if (!isset($this->supportedTypes[$productTypeId])) {
+            throw new LocalizedException(
+                __('Product "%product_type" type is not supported', ['product_type' => $productTypeId])
+            );
+        }
+
+        return $this->supportedTypes[$productTypeId];
+    }
+}
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/UpdateProductsInWishlist.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/UpdateProductsInWishlist.php
index 50a56863596c0..e599323f04c42 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/WishlistById.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistById.php
new file mode 100644
index 0000000000000..1ddf91637fe90
--- /dev/null
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistById.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\WishlistGraphQl\Model\Resolver;
+
+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\Wishlist\Model\ResourceModel\Wishlist as WishlistResourceModel;
+use Magento\Wishlist\Model\Wishlist;
+use Magento\Wishlist\Model\Wishlist\Config as WishlistConfig;
+use Magento\Wishlist\Model\WishlistFactory;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+use Magento\WishlistGraphQl\Mapper\WishlistDataMapper;
+
+/**
+ * Fetches the Wishlist data by ID according to the GraphQL schema
+ */
+class WishlistById implements ResolverInterface
+{
+    /**
+     * @var WishlistResourceModel
+     */
+    private $wishlistResource;
+
+    /**
+     * @var WishlistFactory
+     */
+    private $wishlistFactory;
+
+    /**
+     * @var WishlistDataMapper
+     */
+    private $wishlistDataMapper;
+
+    /**
+     * @var WishlistConfig
+     */
+    private $wishlistConfig;
+
+    /**
+     * @param WishlistResourceModel $wishlistResource
+     * @param WishlistFactory $wishlistFactory
+     * @param WishlistDataMapper $wishlistDataMapper
+     * @param WishlistConfig $wishlistConfig
+     */
+    public function __construct(
+        WishlistResourceModel $wishlistResource,
+        WishlistFactory $wishlistFactory,
+        WishlistDataMapper $wishlistDataMapper,
+        WishlistConfig $wishlistConfig
+    ) {
+        $this->wishlistResource = $wishlistResource;
+        $this->wishlistFactory = $wishlistFactory;
+        $this->wishlistDataMapper = $wishlistDataMapper;
+        $this->wishlistConfig = $wishlistConfig;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!$this->wishlistConfig->isEnabled()) {
+            throw new GraphQlInputException(__('The wishlist configuration is currently disabled.'));
+        }
+
+        $customerId = $context->getUserId();
+
+        if (null === $customerId || 0 === $customerId) {
+            throw new GraphQlAuthorizationException(
+                __('The current user cannot perform operations on wishlist')
+            );
+        }
+
+        $wishlist = $this->getWishlist((int) $args['id'], $customerId);
+
+        if (null === $wishlist->getId() || (int) $wishlist->getCustomerId() !== $customerId) {
+            return [];
+        }
+
+        return $this->wishlistDataMapper->map($wishlist);
+    }
+
+    /**
+     * Get wishlist
+     *
+     * @param int $wishlistId
+     * @param int $customerId
+     *
+     * @return Wishlist
+     */
+    private function getWishlist(int $wishlistId, int $customerId): Wishlist
+    {
+        $wishlist = $this->wishlistFactory->create();
+
+        if ($wishlistId > 0) {
+            $this->wishlistResource->load($wishlist, $wishlistId);
+        } else {
+            $this->wishlistResource->load($wishlist, $customerId, 'customer_id');
+        }
+
+        return $wishlist;
+    }
+}
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistItems.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistItems.php
new file mode 100644
index 0000000000000..1fa750af05e5d
--- /dev/null
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistItems.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\WishlistGraphQl\Model\Resolver;
+
+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\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Wishlist\Model\ResourceModel\Item\Collection as WishlistItemCollection;
+use Magento\Wishlist\Model\ResourceModel\Item\CollectionFactory as WishlistItemCollectionFactory;
+use Magento\Wishlist\Model\Item;
+use Magento\Wishlist\Model\Wishlist;
+
+/**
+ * Fetches the Wishlist Items data according to the GraphQL schema
+ */
+class WishlistItems implements ResolverInterface
+{
+    /**
+     * @var WishlistItemCollectionFactory
+     */
+    private $wishlistItemCollectionFactory;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @param WishlistItemCollectionFactory $wishlistItemCollectionFactory
+     * @param StoreManagerInterface $storeManager
+     */
+    public function __construct(
+        WishlistItemCollectionFactory $wishlistItemCollectionFactory,
+        StoreManagerInterface $storeManager
+    ) {
+        $this->wishlistItemCollectionFactory = $wishlistItemCollectionFactory;
+        $this->storeManager = $storeManager;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('Missing key "model" in Wishlist value data'));
+        }
+        /** @var Wishlist $wishlist */
+        $wishlist = $value['model'];
+
+        $wishlistItems = $this->getWishListItems($wishlist);
+
+        $data = [];
+        foreach ($wishlistItems as $wishlistItem) {
+            $data[] = [
+                'id' => $wishlistItem->getId(),
+                'quantity' => $wishlistItem->getData('qty'),
+                'description' => $wishlistItem->getDescription(),
+                'added_at' => $wishlistItem->getAddedAt(),
+                'model' => $wishlistItem->getProduct(),
+                'wishlistItemModel' => $wishlistItem,
+            ];
+        }
+        return $data;
+    }
+
+    /**
+     * Get wishlist items
+     *
+     * @param Wishlist $wishlist
+     * @return Item[]
+     */
+    private function getWishListItems(Wishlist $wishlist): array
+    {
+        /** @var WishlistItemCollection $wishlistItemCollection */
+        $wishlistItemCollection = $this->wishlistItemCollectionFactory->create();
+        $wishlistItemCollection
+            ->addWishlistFilter($wishlist)
+            ->addStoreFilter(array_map(function (StoreInterface $store) {
+                return $store->getId();
+            }, $this->storeManager->getStores()))
+            ->setVisibilityFilter();
+        return $wishlistItemCollection->getItems();
+    }
+}
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistItemsResolver.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistItemsResolver.php
index dfbbf6543f66f..36a03da2b79a9 100644
--- a/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistItemsResolver.php
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistItemsResolver.php
@@ -70,7 +70,7 @@ public function resolve(
                 'qty' => $wishlistItem->getData('qty'),
                 'description' => $wishlistItem->getDescription(),
                 'added_at' => $wishlistItem->getAddedAt(),
-                'model' => $wishlistItem,
+                'model' => $wishlistItem->getProduct(),
             ];
         }
         return $data;
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/app/code/Magento/WishlistGraphQl/composer.json b/app/code/Magento/WishlistGraphQl/composer.json
index 7a3fca599a4b3..ba0ed697c3692 100644
--- a/app/code/Magento/WishlistGraphQl/composer.json
+++ b/app/code/Magento/WishlistGraphQl/composer.json
@@ -5,7 +5,10 @@
     "require": {
         "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
+        "magento/module-catalog": "*",
         "magento/module-catalog-graph-ql": "*",
+        "magento/module-downloadable": "*",
+        "magento/module-downloadable-graphql": "*",
         "magento/module-wishlist": "*",
         "magento/module-store": "*"
     },
diff --git a/app/code/Magento/WishlistGraphQl/etc/di.xml b/app/code/Magento/WishlistGraphQl/etc/di.xml
new file mode 100644
index 0000000000000..de1a62225672a
--- /dev/null
+++ b/app/code/Magento/WishlistGraphQl/etc/di.xml
@@ -0,0 +1,21 @@
+<?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\WishlistGraphQl\Model\Resolver\Type\WishlistItemType">
+        <arguments>
+            <argument name="supportedTypes" xsi:type="array">
+                <item name="simple" xsi:type="string">SimpleWishlistItem</item>
+                <item name="virtual" xsi:type="string">VirtualWishlistItem</item>
+                <item name="configurable" xsi:type="string">ConfigurableWishlistItem</item>
+                <item name="downloadable" xsi:type="string">DownloadableWishlistItem</item>
+                <item name="bundle" xsi:type="string">BundleWishlistItem</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/WishlistGraphQl/etc/schema.graphqls b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
index 794e90ed9f9a9..e6930ac331ad0 100644
--- a/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
@@ -6,7 +6,12 @@ type Query {
 }
 
 type Customer {
-    wishlist: Wishlist! @resolver(class:"\\Magento\\WishlistGraphQl\\Model\\Resolver\\CustomerWishlistResolver") @doc(description: "Contains the contents of a customer's wish lists")  @cache(cacheable: false)
+    wishlists(
+        pageSize: Int = 20 @doc(description: "Specifies the maximum number of results to return at once. This attribute is optional."),
+        currentPage: Int = 1 @doc(description: "Specifies which page of results to return. The default value is 1.")
+    ): [Wishlist!]! @doc(description: "Customer wishlists are limited to a max of 1 wishlist in Magento Open Source") @resolver(class:"\\Magento\\WishlistGraphQl\\Model\\Resolver\\CustomerWishlists")
+    wishlist: Wishlist! @deprecated(reason: "Use `Customer.wishlists` or `Customer.wishlist_v2`") @resolver(class:"\\Magento\\WishlistGraphQl\\Model\\Resolver\\CustomerWishlistResolver") @doc(description: "Contains the contents of a customer's wish lists")  @cache(cacheable: false)
+    wishlist_v2(id: ID!): Wishlist @doc(description: "Get the customer's wishlist by an ID") @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\WishlistById")
 }
 
 type WishlistOutput @doc(description: "Deprecated: `Wishlist` type should be used instead") {
@@ -19,12 +24,42 @@ type WishlistOutput @doc(description: "Deprecated: `Wishlist` type should be use
 
 type Wishlist {
     id: ID @doc(description: "Wishlist unique identifier")
-    items: [WishlistItem] @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\WishlistItemsResolver") @doc(description: "An array of items in the customer's wish list"),
-    items_count: Int @doc(description: "The number of items in the wish list"),
-    sharing_code: String @doc(description: "An encrypted code that Magento uses to link to the wish list"),
+    items: [WishlistItem] @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\WishlistItemsResolver") @doc(description: "Use field `items_v2` from type `Wishlist` instead")
+    items_v2: [WishlistItemInterface] @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\WishlistItems") @doc(description: "An array of items in the customer's wishlist")
+    items_count: Int @doc(description: "The number of items in the wish list")
+    sharing_code: String @doc(description: "An encrypted code that Magento uses to link to the wish list")
     updated_at: String @doc(description: "The time of the last modification to the wish list")
 }
 
+interface WishlistItemInterface @typeResolver(class: "Magento\\WishlistGraphQl\\Model\\Resolver\\Type\\WishlistItemType") {
+    id: ID
+    quantity: Float
+    description: String
+    added_at: String
+    product: ProductInterface @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\ProductResolver")
+    customizable_options: [SelectedCustomizableOption]
+}
+
+type SimpleWishlistItem implements WishlistItemInterface @doc(description: "Simple Wishlist Item") {
+}
+
+type VirtualWishlistItem implements WishlistItemInterface @doc(description: "Virtual Wishlist Item") {
+}
+
+type ConfigurableWishlistItem implements WishlistItemInterface {
+    child_sku: String! @doc(description: "SKU of the simple product corresponding to a set of selected configurable options.") @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\Type\\Configurable\\ChildSku")
+    configurable_options: [SelectedConfigurableOption!] @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\Type\\Configurable\\ConfigurableOptions")
+}
+
+type DownloadableWishlistItem implements WishlistItemInterface @doc(description: "Downloadable Wishlist Item") {
+    links_v2: [DownloadableProductLinks] @doc(description: "An array containing information about the selected links") @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\Type\\Downloadable\\Links")
+    samples: [DownloadableProductSamples] @doc(description: "DownloadableProductSamples defines characteristics of a downloadable product") @resolver(class: "Magento\\DownloadableGraphQl\\Resolver\\Product\\Samples")
+}
+
+type BundleWishlistItem implements WishlistItemInterface {
+    bundle_options: [SelectedBundleOption!] @doc(description: "An array containing information about the selected bundled items") @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\Type\\Bundle\\BundleOptions")
+}
+
 type WishlistItem {
     id: Int @doc(description: "The wish list item ID")
     qty: Float @doc(description: "The quantity of this wish list item"),
@@ -43,34 +78,45 @@ input WishlistItemInput @doc(description: "Defines the items to add to a wish li
     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: [String!] @doc(description: "An array of strings corresponding to options the customer selected")
+    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")
 }
 
 type AddProductsToWishlistOutput @doc(description: "Contains the customer's wish list and any errors encountered") {
     wishlist: Wishlist! @doc(description: "Contains the wish list with all items that were successfully added")
-    userInputErrors:[CheckoutUserInputError]! @doc(description: "An array of errors encountered while adding products to a wish list")
+    userInputErrors:[WishListUserInputError]! @doc(description: "An array of errors encountered while adding products to a wish list")
 }
 
 input EnteredOptionInput @doc(description: "Defines a customer-entered option") {
-    id: String! @doc(description: "A base64 encoded ID")
+    id: String! @doc(description: "An encoded ID")
     value: String! @doc(description: "Text the customer entered")
 }
 
 type RemoveProductsFromWishlistOutput @doc(description: "Contains the customer's wish list and any errors encountered") {
     wishlist: Wishlist! @doc(description: "Contains the wish list with after items were successfully deleted")
-    userInputErrors:[CheckoutUserInputError]! @doc(description:"An array of errors encountered while deleting products from a wish list")
+    userInputErrors:[WishListUserInputError]! @doc(description:"An array of errors encountered while deleting products from a wish list")
 }
 
 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")
-    selected_options: [String!] @doc(description: "An array of strings corresponding to options the customer selected")
+    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")
 }
 
 type UpdateProductsInWishlistOutput @doc(description: "Contains the customer's wish list and any errors encountered") {
     wishlist: Wishlist! @doc(description: "Contains the wish list with all items that were successfully updated")
-    userInputErrors:[CheckoutUserInputError]! @doc(description:"An array of errors encountered while updating products in a wish list")
+    userInputErrors:[WishListUserInputError]! @doc(description:"An array of errors encountered while updating products in a wish list")
+}
+
+type WishListUserInputError @doc(description:"An error encountered while performing operations with WishList.") {
+    message: String! @doc(description: "A localized error message")
+    path: [String]! @doc(description: "Path to the input field that caused an error. See the GraphQL specification about path errors for details: http://spec.graphql.org/draft/#sec-Errors")
+    code: WishListUserInputErrorType! @doc(description: "Wishlist-specific error code")
+}
+
+enum WishListUserInputErrorType {
+    PRODUCT_NOT_FOUND
+    UNDEFINED
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddBundleProductToWishlistTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddBundleProductToWishlistTest.php
index c0199e8908d0e..ecc88bfbe1455 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddBundleProductToWishlistTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddBundleProductToWishlistTest.php
@@ -16,6 +16,7 @@
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Ui\Component\Form\Element\Select;
 use Magento\Wishlist\Model\Item;
 use Magento\Wishlist\Model\WishlistFactory;
 
@@ -74,7 +75,7 @@ public function testAddBundleProductWithOptions(): void
         $selection = $typeInstance->getSelectionsCollection([$option->getId()], $product)->getFirstItem();
         $optionId = $option->getId();
         $selectionId = $selection->getSelectionId();
-        $bundleOptions = $this->generateBundleOptionIdV2((int) $optionId, (int) $selectionId, $optionQty);
+        $bundleOptions = $this->generateBundleOptionUid((int) $optionId, (int) $selectionId, $optionQty);
 
         $query = $this->getQuery($sku, $qty, $bundleOptions);
         $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
@@ -88,9 +89,13 @@ public function testAddBundleProductWithOptions(): void
         $this->assertEquals($wishlist->getItemsCount(), $response['items_count']);
         $this->assertEquals($wishlist->getSharingCode(), $response['sharing_code']);
         $this->assertEquals($wishlist->getUpdatedAt(), $response['updated_at']);
-        $this->assertEquals($item->getData('qty'), $response['items'][0]['qty']);
-        $this->assertEquals($item->getDescription(), $response['items'][0]['description']);
-        $this->assertEquals($item->getAddedAt(), $response['items'][0]['added_at']);
+        $this->assertEquals($item->getData('qty'), $response['items_v2'][0]['quantity']);
+        $this->assertEquals($item->getDescription(), $response['items_v2'][0]['description']);
+        $this->assertEquals($item->getAddedAt(), $response['items_v2'][0]['added_at']);
+        $this->assertNotEmpty($response['items_v2'][0]['bundle_options']);
+        $bundleOptions = $response['items_v2'][0]['bundle_options'];
+        $this->assertEquals('Bundle Product Items', $bundleOptions[0]['label']);
+        $this->assertEquals(Select::NAME, $bundleOptions[0]['type']);
     }
 
     /**
@@ -149,11 +154,24 @@ private function getQuery(
       sharing_code
       items_count
       updated_at
-      items {
+      items_v2 {
         id
         description
-        qty
+        quantity
         added_at
+        ... on BundleWishlistItem {
+          bundle_options {
+            id
+            label
+            type
+            values {
+              id
+              label
+              quantity
+              price
+            }
+          }
+        }
       }
     }
   }
@@ -169,7 +187,7 @@ private function getQuery(
      *
      * @return string
      */
-    private function generateBundleOptionIdV2(int $optionId, int $selectionId, int $quantity): string
+    private function generateBundleOptionUid(int $optionId, int $selectionId, int $quantity): string
     {
         return base64_encode("bundle/$optionId/$selectionId/$quantity");
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddConfigurableProductToWishlistTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddConfigurableProductToWishlistTest.php
index 386df99f0d211..57e0852db00dc 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddConfigurableProductToWishlistTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddConfigurableProductToWishlistTest.php
@@ -57,7 +57,7 @@ public function testAddDownloadableProductWithOptions(): void
         $valueIndex = $product['configurable_options'][0]['values'][0]['value_index'];
         $childSku = $product['variants'][0]['product']['sku'];
         $parentSku = $product['sku'];
-        $selectedConfigurableOptionsQuery = $this->generateSuperAttributesIdV2Query($attributeId, $valueIndex);
+        $selectedConfigurableOptionsQuery = $this->generateSuperAttributesUidQuery($attributeId, $valueIndex);
 
         $query = $this->getQuery($parentSku, $childSku, $qty, $selectedConfigurableOptionsQuery);
 
@@ -66,16 +66,19 @@ public function testAddDownloadableProductWithOptions(): void
         /** @var Item $wishlistItem */
         $wishlistItem = $wishlist->getItemCollection()->getFirstItem();
 
-        self::assertArrayHasKey('addProductsToWishlist', $response);
-        self::assertArrayHasKey('wishlist', $response['addProductsToWishlist']);
+        $this->assertArrayHasKey('addProductsToWishlist', $response);
+        $this->assertArrayHasKey('wishlist', $response['addProductsToWishlist']);
         $wishlistResponse = $response['addProductsToWishlist']['wishlist'];
-        self::assertEquals($wishlist->getItemsCount(), $wishlistResponse['items_count']);
-        self::assertEquals($wishlist->getSharingCode(), $wishlistResponse['sharing_code']);
-        self::assertEquals($wishlist->getUpdatedAt(), $wishlistResponse['updated_at']);
-        self::assertEquals($wishlistItem->getId(), $wishlistResponse['items'][0]['id']);
-        self::assertEquals($wishlistItem->getData('qty'), $wishlistResponse['items'][0]['qty']);
-        self::assertEquals($wishlistItem->getDescription(), $wishlistResponse['items'][0]['description']);
-        self::assertEquals($wishlistItem->getAddedAt(), $wishlistResponse['items'][0]['added_at']);
+        $this->assertEquals($wishlist->getItemsCount(), $wishlistResponse['items_count']);
+        $this->assertEquals($wishlist->getSharingCode(), $wishlistResponse['sharing_code']);
+        $this->assertEquals($wishlist->getUpdatedAt(), $wishlistResponse['updated_at']);
+        $this->assertEquals($wishlistItem->getId(), $wishlistResponse['items_v2'][0]['id']);
+        $this->assertEquals($wishlistItem->getData('qty'), $wishlistResponse['items_v2'][0]['quantity']);
+        $this->assertEquals($wishlistItem->getDescription(), $wishlistResponse['items_v2'][0]['description']);
+        $this->assertEquals($wishlistItem->getAddedAt(), $wishlistResponse['items_v2'][0]['added_at']);
+        $this->assertNotEmpty($wishlistResponse['items_v2'][0]['configurable_options']);
+        $configurableOptions = $wishlistResponse['items_v2'][0]['configurable_options'];
+        $this->assertEquals('Test Configurable', $configurableOptions[0]['option_label']);
     }
 
     /**
@@ -135,11 +138,20 @@ private function getQuery(
       sharing_code
       items_count
       updated_at
-      items {
+      items_v2 {
         id
         description
-        qty
+        quantity
         added_at
+        ... on ConfigurableWishlistItem {
+          child_sku
+          configurable_options {
+            id
+            option_label
+            value_id
+            value_label
+          }
+        }
       }
     }
   }
@@ -155,7 +167,7 @@ private function getQuery(
      *
      * @return string
      */
-    private function generateSuperAttributesIdV2Query(int $attributeId, int $valueIndex): string
+    private function generateSuperAttributesUidQuery(int $attributeId, int $valueIndex): string
     {
         return 'selected_options: ["' . base64_encode("configurable/$attributeId/$valueIndex") . '"]';
     }
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 389f4eae4c574..f97da25a8d8c6 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddDownloadableProductToWishlistTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddDownloadableProductToWishlistTest.php
@@ -37,9 +37,9 @@ class AddDownloadableProductToWishlistTest extends GraphQlAbstract
     private $wishlistFactory;
 
     /**
-     * @var GetCustomOptionsWithIDV2ForQueryBySku
+     * @var GetCustomOptionsWithUidForQueryBySku
      */
-    private $getCustomOptionsWithIDV2ForQueryBySku;
+    private $getCustomOptionsWithUidForQueryBySku;
 
     /**
      * Set Up
@@ -49,69 +49,75 @@ protected function setUp(): void
         $this->objectManager = Bootstrap::getObjectManager();
         $this->customerTokenService = $this->objectManager->get(CustomerTokenServiceInterface::class);
         $this->wishlistFactory = $this->objectManager->get(WishlistFactory::class);
-        $this->getCustomOptionsWithIDV2ForQueryBySku =
-            $this->objectManager->get(GetCustomOptionsWithIDV2ForQueryBySku::class);
+        $this->getCustomOptionsWithUidForQueryBySku =
+            $this->objectManager->get(GetCustomOptionsWithUidForQueryBySku::class);
     }
 
     /**
-     * @magentoConfigFixture default_store wishlist/general/active 1
+     * @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 testAddDownloadableProductWithOptions(): void
+    public function testAddDownloadableProductOnDisabledWishlist(): void
     {
-        $customerId = 1;
-        $sku = 'downloadable-product-with-purchased-separately-links';
         $qty = 2;
+        $sku = 'downloadable-product-with-purchased-separately-links';
         $links = $this->getProductsLinks($sku);
         $linkId = key($links);
-        $itemOptions = $this->getCustomOptionsWithIDV2ForQueryBySku->execute($sku);
+        $itemOptions = $this->getCustomOptionsWithUidForQueryBySku->execute($sku);
         $itemOptions['selected_options'][] = $this->generateProductLinkSelectedOptions($linkId);
-        $productOptionsQuery = preg_replace(
+        $productOptionsQuery = trim(preg_replace(
             '/"([^"]+)"\s*:\s*/',
             '$1:',
             json_encode($itemOptions)
-        );
-        $query = $this->getQuery($qty, $sku, trim($productOptionsQuery, '{}'));
-        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-        $wishlist = $this->wishlistFactory->create();
-        $wishlist->loadByCustomerId($customerId, true);
-        /** @var Item $wishlistItem */
-        $wishlistItem = $wishlist->getItemCollection()->getFirstItem();
-
-        self::assertArrayHasKey('addProductsToWishlist', $response);
-        self::assertArrayHasKey('wishlist', $response['addProductsToWishlist']);
-        $wishlistResponse = $response['addProductsToWishlist']['wishlist'];
-        self::assertEquals($wishlist->getItemsCount(), $wishlistResponse['items_count']);
-        self::assertEquals($wishlist->getSharingCode(), $wishlistResponse['sharing_code']);
-        self::assertEquals($wishlist->getUpdatedAt(), $wishlistResponse['updated_at']);
-        self::assertEquals($wishlistItem->getId(), $wishlistResponse['items'][0]['id']);
-        self::assertEquals($wishlistItem->getData('qty'), $wishlistResponse['items'][0]['qty']);
-        self::assertEquals($wishlistItem->getDescription(), $wishlistResponse['items'][0]['description']);
-        self::assertEquals($wishlistItem->getAddedAt(), $wishlistResponse['items'][0]['added_at']);
+        ), '{}');
+        $query = $this->getQuery($qty, $sku, $productOptionsQuery);
+        $this->expectExceptionMessage('The wishlist configuration is currently disabled.');
+        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
     /**
-     * @magentoConfigFixture default_store wishlist/general/active 0
+     * @magentoConfigFixture default_store wishlist/general/active 1
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Downloadable/_files/product_downloadable_with_custom_options.php
      */
-    public function testAddDownloadableProductOnDisabledWishlist(): void
+    public function testAddDownloadableProductWithOptions(): void
     {
-        $qty = 2;
+        $customerId = 1;
         $sku = 'downloadable-product-with-purchased-separately-links';
+        $qty = 2;
         $links = $this->getProductsLinks($sku);
         $linkId = key($links);
-        $itemOptions = $this->getCustomOptionsWithIDV2ForQueryBySku->execute($sku);
+        $itemOptions = $this->getCustomOptionsWithUidForQueryBySku->execute($sku);
         $itemOptions['selected_options'][] = $this->generateProductLinkSelectedOptions($linkId);
-        $productOptionsQuery = trim(preg_replace(
+        $productOptionsQuery = preg_replace(
             '/"([^"]+)"\s*:\s*/',
             '$1:',
             json_encode($itemOptions)
-        ), '{}');
-        $query = $this->getQuery($qty, $sku, $productOptionsQuery);
-        $this->expectExceptionMessage('The wishlist is not currently available.');
-        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+        );
+        $query = $this->getQuery($qty, $sku, trim($productOptionsQuery, '{}'));
+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+        $wishlist = $this->wishlistFactory->create();
+        $wishlist->loadByCustomerId($customerId, true);
+        /** @var Item $wishlistItem */
+        $wishlistItem = $wishlist->getItemCollection()->getFirstItem();
+
+        $this->assertArrayHasKey('addProductsToWishlist', $response);
+        $this->assertArrayHasKey('wishlist', $response['addProductsToWishlist']);
+        $wishlistResponse = $response['addProductsToWishlist']['wishlist'];
+        $this->assertEquals($wishlist->getItemsCount(), $wishlistResponse['items_count']);
+        $this->assertEquals($wishlist->getSharingCode(), $wishlistResponse['sharing_code']);
+        $this->assertEquals($wishlist->getUpdatedAt(), $wishlistResponse['updated_at']);
+        $this->assertEquals($wishlistItem->getId(), $wishlistResponse['items_v2'][0]['id']);
+        $this->assertEquals($wishlistItem->getData('qty'), $wishlistResponse['items_v2'][0]['quantity']);
+        $this->assertEquals($wishlistItem->getDescription(), $wishlistResponse['items_v2'][0]['description']);
+        $this->assertEquals($wishlistItem->getAddedAt(), $wishlistResponse['items_v2'][0]['added_at']);
+        $this->assertNotEmpty($wishlistResponse['items_v2'][0]['links_v2']);
+        $wishlistItemLinks = $wishlistResponse['items_v2'][0]['links_v2'];
+        $this->assertEquals('Downloadable Product Link 1', $wishlistItemLinks[0]['title']);
+        $this->assertNotEmpty($wishlistResponse['items_v2'][0]['samples']);
+        $wishlistItemSamples = $wishlistResponse['items_v2'][0]['samples'];
+        $this->assertEquals('Downloadable Product Sample', $wishlistItemSamples[0]['title']);
     }
 
     /**
@@ -190,11 +196,23 @@ private function getQuery(
       sharing_code
       items_count
       updated_at
-      items {
+      items_v2 {
         id
         description
-        qty
+        quantity
         added_at
+        ... on DownloadableWishlistItem {
+          links_v2 {
+            id
+            title
+            sample_url
+          }
+          samples {
+            id
+            title
+            sample_url
+          }
+        }
       }
     }
   }
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..04095c1679d2f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/CustomerWishlistTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/CustomerWishlistTest.php
@@ -131,7 +131,7 @@ public function testGuestCannotGetWishlist()
     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
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/CustomerWishlistsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/CustomerWishlistsTest.php
new file mode 100644
index 0000000000000..e452e70c24148
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/CustomerWishlistsTest.php
@@ -0,0 +1,142 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Wishlist;
+
+use Exception;
+use Magento\Framework\Exception\AuthenticationException;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Wishlist\Model\Item;
+use Magento\Wishlist\Model\ResourceModel\Wishlist\CollectionFactory;
+use Magento\Wishlist\Model\Wishlist;
+
+/**
+ * Test coverage for customer wishlists
+ */
+class CustomerWishlistsTest extends GraphQlAbstract
+{
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $customerTokenService;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $wishlistCollectionFactory;
+
+    /**
+     * Set Up
+     */
+    protected function setUp(): void
+    {
+        $this->customerTokenService = Bootstrap::getObjectManager()->get(CustomerTokenServiceInterface::class);
+        $this->wishlistCollectionFactory = Bootstrap::getObjectManager()->get(CollectionFactory::class);
+    }
+
+    /**
+     * Test fetching customer wishlist
+     *
+     * @magentoConfigFixture default_store wishlist/general/active 1
+     * @magentoApiDataFixture Magento/Wishlist/_files/wishlist.php
+     */
+    public function testCustomerWishlist(): void
+    {
+        $customerId = 1;
+        /** @var Wishlist $wishlist */
+        $collection = $this->wishlistCollectionFactory->create()->filterByCustomerId($customerId);
+        /** @var Item $wishlistItem */
+        $wishlistItem = $collection->getFirstItem();
+        $response = $this->graphQlQuery(
+            $this->getQuery(),
+            [],
+            '',
+            $this->getCustomerAuthHeaders('customer@example.com', 'password')
+        );
+        $this->assertArrayHasKey('wishlists', $response['customer']);
+        $wishlist = $response['customer']['wishlists'][0];
+        $this->assertEquals($wishlistItem->getItemsCount(), $wishlist['items_count']);
+        $this->assertEquals($wishlistItem->getSharingCode(), $wishlist['sharing_code']);
+        $this->assertEquals($wishlistItem->getUpdatedAt(), $wishlist['updated_at']);
+        $wishlistItemResponse = $wishlist['items_v2'][0];
+        $this->assertEquals('simple', $wishlistItemResponse['product']['sku']);
+    }
+
+    /**
+     * Testing fetching the wishlist when wishlist is disabled
+     *
+     * @magentoConfigFixture default_store wishlist/general/active 0
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testCustomerCannotGetWishlistWhenDisabled(): void
+    {
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage('The wishlist configuration is currently disabled.');
+        $this->graphQlQuery(
+            $this->getQuery(),
+            [],
+            '',
+            $this->getCustomerAuthHeaders('customer@example.com', 'password')
+        );
+    }
+
+    /**
+     * Test wishlist fetching for a guest customer
+     *
+     * @magentoConfigFixture default_store wishlist/general/active 1
+     */
+    public function testGuestCannotGetWishlist(): void
+    {
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage('The current customer isn\'t authorized.');
+        $this->graphQlQuery($this->getQuery());
+    }
+
+    /**
+     * Returns GraphQl query string
+     *
+     * @return string
+     */
+    private function getQuery(): string
+    {
+        return <<<QUERY
+query {
+  customer {
+    wishlists {
+      items_count
+      sharing_code
+      updated_at
+      items_v2 {
+        product {
+          sku
+        }
+      }
+    }
+  }
+}
+QUERY;
+    }
+
+    /**
+     * Getting customer auth headers
+     *
+     * @param string $email
+     * @param string $password
+     *
+     * @return array
+     *
+     * @throws AuthenticationException
+     */
+    private function getCustomerAuthHeaders(string $email, string $password): array
+    {
+        $customerToken = $this->customerTokenService->createCustomerAccessToken($email, $password);
+
+        return ['Authorization' => 'Bearer ' . $customerToken];
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/DeleteProductsFromWishlistTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/DeleteProductsFromWishlistTest.php
index 2e203e3ff4228..44e58b8b5ee27 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/DeleteProductsFromWishlistTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/DeleteProductsFromWishlistTest.php
@@ -42,17 +42,17 @@ public function testDeleteWishlistItemFromWishlist(): void
         $wishlist = $this->getWishlist();
         $wishlistId = $wishlist['customer']['wishlist']['id'];
         $wishlist = $wishlist['customer']['wishlist'];
-        $wishlistItems = $wishlist['items'];
-        self::assertEquals(1, $wishlist['items_count']);
+        $wishlistItems = $wishlist['items_v2'];
+        $this->assertEquals(1, $wishlist['items_count']);
 
         $query = $this->getQuery((int) $wishlistId, (int) $wishlistItems[0]['id']);
         $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
 
-        self::assertArrayHasKey('removeProductsFromWishlist', $response);
-        self::assertArrayHasKey('wishlist', $response['removeProductsFromWishlist']);
+        $this->assertArrayHasKey('removeProductsFromWishlist', $response);
+        $this->assertArrayHasKey('wishlist', $response['removeProductsFromWishlist']);
         $wishlistResponse = $response['removeProductsFromWishlist']['wishlist'];
-        self::assertEquals(0, $wishlistResponse['items_count']);
-        self::assertEmpty($wishlistResponse['items']);
+        $this->assertEquals(0, $wishlistResponse['items_count']);
+        $this->assertEmpty($wishlistResponse['items_v2']);
     }
 
     /**
@@ -98,10 +98,10 @@ private function getQuery(
       id
       sharing_code
       items_count
-      items {
+      items_v2 {
         id
         description
-        qty
+        quantity
       }
     }
   }
@@ -134,9 +134,9 @@ private function getCustomerWishlistQuery(): string
     wishlist {
       id
       items_count
-      items {
+      items_v2 {
         id
-        qty
+        quantity
         description
       }
     }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/GetCustomOptionsWithIDV2ForQueryBySku.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/GetCustomOptionsWithUidForQueryBySku.php
similarity index 95%
rename from dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/GetCustomOptionsWithIDV2ForQueryBySku.php
rename to dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/GetCustomOptionsWithUidForQueryBySku.php
index 6d54d9f0b4444..d901b8ab7083f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/GetCustomOptionsWithIDV2ForQueryBySku.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/GetCustomOptionsWithUidForQueryBySku.php
@@ -12,7 +12,7 @@
 /**
  * Generate an array with test values for customizable options with encoded id_v2 value
  */
-class GetCustomOptionsWithIDV2ForQueryBySku
+class GetCustomOptionsWithUidForQueryBySku
 {
     /**
      * @var ProductCustomOptionRepositoryInterface
@@ -71,7 +71,7 @@ public function execute(string $sku): array
     }
 
     /**
-     * Returns id_v2 of the selected custom option
+     * Returns uid of the selected custom option
      *
      * @param int $optionId
      * @param int $optionValueId
@@ -84,7 +84,7 @@ private function encodeSelectedOption(int $optionId, int $optionValueId): string
     }
 
     /**
-     * Returns id_v2 of the entered custom option
+     * Returns uid of the entered custom option
      *
      * @param int $optionId
      *
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 9e96bdc5d7079..0c91311a524e0 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/UpdateProductsFromWishlistTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/UpdateProductsFromWishlistTest.php
@@ -43,18 +43,18 @@ public function testUpdateSimpleProductFromWishlist(): void
         $qty = 5;
         $description = 'New Description';
         $wishlistId = $wishlist['customer']['wishlist']['id'];
-        $wishlistItem = $wishlist['customer']['wishlist']['items'][0];
-        self::assertNotEquals($description, $wishlistItem['description']);
-        self::assertNotEquals($qty, $wishlistItem['qty']);
+        $wishlistItem = $wishlist['customer']['wishlist']['items_v2'][0];
+        $this->assertNotEquals($description, $wishlistItem['description']);
+        $this->assertNotEquals($qty, $wishlistItem['quantity']);
 
         $query = $this->getQuery((int) $wishlistId, (int) $wishlistItem['id'], $qty, $description);
         $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
 
-        self::assertArrayHasKey('updateProductsInWishlist', $response);
-        self::assertArrayHasKey('wishlist', $response['updateProductsInWishlist']);
+        $this->assertArrayHasKey('updateProductsInWishlist', $response);
+        $this->assertArrayHasKey('wishlist', $response['updateProductsInWishlist']);
         $wishlistResponse = $response['updateProductsInWishlist']['wishlist'];
-        self::assertEquals($qty, $wishlistResponse['items'][0]['qty']);
-        self::assertEquals($description, $wishlistResponse['items'][0]['description']);
+        $this->assertEquals($qty, $wishlistResponse['items_v2'][0]['quantity']);
+        $this->assertEquals($description, $wishlistResponse['items_v2'][0]['description']);
     }
 
     /**
@@ -110,10 +110,10 @@ private function getQuery(
       id
       sharing_code
       items_count
-      items {
+      items_v2 {
         id
         description
-        qty
+        quantity
       }
     }
   }
@@ -146,9 +146,9 @@ private function getCustomerWishlistQuery(): string
     wishlist {
       id
       items_count
-      items {
+      items_v2 {
         id
-        qty
+        quantity
         description
       }
     }

From 61ff26fd6642e0a81e1b2b7baa633717f0f2fd4c Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Wed, 12 Aug 2020 01:57:23 -0500
Subject: [PATCH 1446/1718] magento2/issues/29113 Customers should be able to
 enable/disable Admin "remote shopping assistance"

---
 .../Block/Adminhtml/NotAllowedPopup.php                         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/LoginAsCustomerAssistance/Block/Adminhtml/NotAllowedPopup.php b/app/code/Magento/LoginAsCustomerAssistance/Block/Adminhtml/NotAllowedPopup.php
index f0f4eba026733..547be1de5a008 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/Block/Adminhtml/NotAllowedPopup.php
+++ b/app/code/Magento/LoginAsCustomerAssistance/Block/Adminhtml/NotAllowedPopup.php
@@ -13,6 +13,8 @@
 
 /**
  * Pop-up for Login as Customer button then Login as Customer is not allowed.
+ *
+ * @api
  */
 class NotAllowedPopup extends Template
 {

From 6510c4539209e8c3b4558761b6bd801285ced03e Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Wed, 12 Aug 2020 10:09:45 +0300
Subject: [PATCH 1447/1718] MC-35458: Config fields changes

---
 .../Block/System/Config/Form/Fieldset.php     | 38 +++++++++++++++----
 1 file changed, 30 insertions(+), 8 deletions(-)

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 7b7463cc08b3b..0e918c23857ac 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Fieldset.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Fieldset.php
@@ -274,14 +274,8 @@ protected function _isCollapseState($element)
             return true;
         }
 
-        if (!empty($element->getGroup()['depends']['fields'])) {
-            foreach ($element->getGroup()['depends']['fields'] as $dependFieldData) {
-                if (is_array($dependFieldData) && isset($dependFieldData['value'], $dependFieldData['id'])) {
-                    if ($dependFieldData['value'] !== $this->getConfigData($dependFieldData['id'])) {
-                        return false;
-                    }
-                }
-            }
+        if ($this->isCollapseStateByDependentField($element)) {
+            return false;
         }
 
         $extra = $this->_authSession->getUser()->getExtra();
@@ -292,6 +286,34 @@ protected function _isCollapseState($element)
         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.
      *

From 9b5d6068329b719dc15e1dc908ceec4f97d423fa Mon Sep 17 00:00:00 2001
From: Viktor Petryk <victor.petryk@transoftgroup.com>
Date: Wed, 12 Aug 2020 11:03:17 +0300
Subject: [PATCH 1448/1718] 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        | 16 ++++-
 .../Cms/Fixtures/page_list_rollback.php       | 13 +++-
 3 files changed, 75 insertions(+), 22 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..bb57f7fba4df7 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,25 @@
 $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,
+        'page_layout' => '1column',
+    ],
+    [
+        'title' => 'Page with unavailable layout',
+        '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);
 

From c5f6a1f4a70e979f2fc31a8c4d714c713bd9e650 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Wed, 12 Aug 2020 12:41:19 +0300
Subject: [PATCH 1449/1718] fix http action

---
 app/code/Magento/Wishlist/Controller/Shared/Allcart.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Wishlist/Controller/Shared/Allcart.php b/app/code/Magento/Wishlist/Controller/Shared/Allcart.php
index c1e908cc0f49e..1c504a7a8a80d 100644
--- a/app/code/Magento/Wishlist/Controller/Shared/Allcart.php
+++ b/app/code/Magento/Wishlist/Controller/Shared/Allcart.php
@@ -10,7 +10,7 @@
 
 use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\Action\Context;
-use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\Result\Forward;
 use Magento\Framework\Controller\Result\Redirect;
 use Magento\Framework\Controller\ResultFactory;
@@ -19,7 +19,7 @@
 /**
  * Wishlist Allcart Controller
  */
-class Allcart extends Action implements HttpGetActionInterface
+class Allcart extends Action implements HttpPostActionInterface
 {
     /**
      * @var WishlistProvider

From c410eae85cb8ba2a150fd83b581cc24f23a0e61e Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 12 Aug 2020 12:51:35 +0300
Subject: [PATCH 1450/1718] 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 3b350fd86cfa89a147a736d96e7c59ab2ac40b68 Mon Sep 17 00:00:00 2001
From: yolouiese <honeymay@abovethefray.io>
Date: Wed, 12 Aug 2020 18:10:46 +0800
Subject: [PATCH 1451/1718] 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 4d65656fafe9c132bc8cd441ac2d1f7571b5a0da Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Wed, 12 Aug 2020 14:07:58 +0300
Subject: [PATCH 1452/1718] MC-35699: [Magento Cloud] HTML minification strips
 triple slashes from html string in phtml

---
 .../Magento/Framework/View/Template/Html/Minifier.php        | 3 ++-
 .../Framework/View/Test/Unit/Template/Html/MinifierTest.php  | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/View/Template/Html/Minifier.php b/lib/internal/Magento/Framework/View/Template/Html/Minifier.php
index 0a8db80cae349..cdbce9d102a89 100644
--- a/lib/internal/Magento/Framework/View/Template/Html/Minifier.php
+++ b/lib/internal/Magento/Framework/View/Template/Html/Minifier.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Framework\View\Template\Html;
 
@@ -140,7 +141,7 @@ function ($match) use (&$heredocs) {
                         . '(?:<(?>textarea|pre|script)\b|\z))#',
                         ' ',
                         preg_replace(
-                            '#(?<!:|\\\\|\'|")//(?!\s*\<\!\[)(?!\s*]]\>)[^\n\r]*#',
+                            '#(?<!:|\\\\|\'|"|/)//(?!/)(?!\s*\<\!\[)(?!\s*]]\>)[^\n\r]*#',
                             '',
                             preg_replace(
                                 '#(?<!:|\'|")//[^\n\r]*(\?\>)#',
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php
index 6aafa5a46cf63..3b13a2f723617 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Template/Html/MinifierTest.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\View\Test\Unit\Template\Html;
 
 use PHPUnit\Framework\TestCase;
@@ -139,6 +141,7 @@ public function testMinify()
         <img src="test.png" alt="some text" />
         <?php echo \$block->someMethod(); ?>
         <div style="width: 800px" class="<?php echo \$block->getClass() ?>" />
+        <img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" data-component="main-image">
         <script>
             var i = 1;// comment
             var j = 1;// <?php echo 'hi' ?>
@@ -179,7 +182,7 @@ public function testMinify()
 TEXT;
 
         $expectedContent = <<<TEXT
-<?php /** * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ ?> <?php ?> <html><head><title>Test title</title></head><link rel="stylesheet" href='https://www.example.com/2' type="text/css" /><link rel="stylesheet" type="text/css" media="all" href="https://www.example.com/1" type="text/css" /><body><a href="http://somelink.com/text.html">Text Link</a> <img src="test.png" alt="some text" /><?php echo \$block->someMethod(); ?> <div style="width: 800px" class="<?php echo \$block->getClass() ?>" /><script>
+<?php /** * Copyright © Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ ?> <?php ?> <html><head><title>Test title</title></head><link rel="stylesheet" href='https://www.example.com/2' type="text/css" /><link rel="stylesheet" type="text/css" media="all" href="https://www.example.com/1" type="text/css" /><body><a href="http://somelink.com/text.html">Text Link</a> <img src="test.png" alt="some text" /><?php echo \$block->someMethod(); ?> <div style="width: 800px" class="<?php echo \$block->getClass() ?>" /><img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" data-component="main-image"><script>
             var i = 1;
             var j = 1;
 

From a1de7214949210220abe3a3428ba78778ac9d2ab Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 12 Aug 2020 14:26:59 +0300
Subject: [PATCH 1453/1718] 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 ca4b32589cf6d73abd9cbd40592ced45f83100be Mon Sep 17 00:00:00 2001
From: Viktor Petryk <victor.petryk@transoftgroup.com>
Date: Wed, 12 Aug 2020 14:36:49 +0300
Subject: [PATCH 1454/1718] MC-34254: If disable module PageBuilder then in the
 product page, page white

---
 .../integration/testsuite/Magento/Cms/Fixtures/page_list.php    | 2 ++
 1 file changed, 2 insertions(+)

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 bb57f7fba4df7..2fa0bf3a5bc13 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Fixtures/page_list.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Fixtures/page_list.php
@@ -27,10 +27,12 @@
     [
         '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',
     ],

From 68b35c53c6104121095f6ca89cbe3ddd7e9319ce Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Wed, 12 Aug 2020 19:58:22 +0800
Subject: [PATCH 1455/1718] 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 7f115fdf42003bd86ee35336e4f4ee85c54de5c9 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Wed, 12 Aug 2020 20:02:43 +0800
Subject: [PATCH 1456/1718] 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 c6bd685303913717a35e8f9200e06ffc90dee322 Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Wed, 12 Aug 2020 15:04:26 +0300
Subject: [PATCH 1457/1718] Refactoring the downloadable product logic

---
 .../Model/Wishlist/ItemLinks.php}             | 20 ++++++++++---------
 .../Model/Resolver/ProductResolver.php        |  1 -
 .../Resolver/Type/Bundle/BundleOptions.php    |  6 +++---
 .../Resolver/Type/Configurable/ChildSku.php   |  6 +++---
 .../Type/Configurable/ConfigurableOptions.php |  6 +++---
 .../Model/Resolver/WishlistItems.php          |  2 +-
 .../Magento/WishlistGraphQl/composer.json     |  2 --
 .../WishlistGraphQl/etc/schema.graphqls       |  2 +-
 .../AddConfigurableProductToWishlistTest.php  |  2 +-
 .../AddDownloadableProductToWishlistTest.php  |  2 +-
 .../GetCustomOptionsWithUidForQueryBySku.php  |  2 +-
 11 files changed, 25 insertions(+), 26 deletions(-)
 rename app/code/Magento/{WishlistGraphQl/Model/Resolver/Type/Downloadable/Links.php => DownloadableGraphQl/Model/Wishlist/ItemLinks.php} (69%)

diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Downloadable/Links.php b/app/code/Magento/DownloadableGraphQl/Model/Wishlist/ItemLinks.php
similarity index 69%
rename from app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Downloadable/Links.php
rename to app/code/Magento/DownloadableGraphQl/Model/Wishlist/ItemLinks.php
index aa6f4c70318da..68223054aa806 100644
--- a/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Downloadable/Links.php
+++ b/app/code/Magento/DownloadableGraphQl/Model/Wishlist/ItemLinks.php
@@ -5,20 +5,20 @@
  */
 declare(strict_types=1);
 
-namespace Magento\WishlistGraphQl\Model\Resolver\Type\Downloadable;
+namespace Magento\DownloadableGraphQl\Model\Wishlist;
 
+use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
 use Magento\Downloadable\Helper\Catalog\Product\Configuration;
 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\Wishlist\Model\Item;
 
 /**
- * Fetches the selected downloadable links
+ * Fetches the selected item downloadable links
  */
-class Links implements ResolverInterface
+class ItemLinks implements ResolverInterface
 {
     /**
      * @var ConvertLinksToArray
@@ -52,13 +52,15 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        if (!isset($value['wishlistItemModel'])) {
-            throw new LocalizedException(__('Missing key "wishlistItemModel" in Wishlist Item value data'));
+        if (!$value['itemModel'] instanceof ItemInterface) {
+            throw new LocalizedException(__('"itemModel" should be a "%instance" instance', [
+                'instance' => ItemInterface::class
+            ]));
         }
-        /** @var Item $wishlistItem */
-        $wishlistItem = $value['wishlistItemModel'];
+        /** @var ItemInterface $wishlistItem */
+        $itemItem = $value['itemModel'];
 
-        $links = $this->downloadableConfiguration->getLinks($wishlistItem);
+        $links = $this->downloadableConfiguration->getLinks($itemItem);
         $links = $this->convertLinksToArray->execute($links);
 
         return $links;
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/ProductResolver.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/ProductResolver.php
index d292d3eab9910..31dd33ff2cd79 100644
--- a/app/code/Magento/WishlistGraphQl/Model/Resolver/ProductResolver.php
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/ProductResolver.php
@@ -13,7 +13,6 @@
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Wishlist\Model\Item;
 
 /**
  * Fetches the Product data according to the GraphQL schema
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Bundle/BundleOptions.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Bundle/BundleOptions.php
index 11af9bbbc60b9..d11200d96ce1a 100644
--- a/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Bundle/BundleOptions.php
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Bundle/BundleOptions.php
@@ -43,12 +43,12 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        if (!$value['wishlistItemModel'] instanceof Item) {
-            throw new LocalizedException(__('"wishlistItemModel" should be a "%instance" instance', [
+        if (!$value['itemModel'] instanceof Item) {
+            throw new LocalizedException(__('"itemModel" should be a "%instance" instance', [
                 'instance' => Item::class
             ]));
         }
 
-        return $this->bundleOptionDataProvider->getData($value['wishlistItemModel']);
+        return $this->bundleOptionDataProvider->getData($value['itemModel']);
     }
 }
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Configurable/ChildSku.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Configurable/ChildSku.php
index 7014312ce4765..a6c77cbe9da9c 100644
--- a/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Configurable/ChildSku.php
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Configurable/ChildSku.php
@@ -28,14 +28,14 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        if (!$value['wishlistItemModel'] instanceof Item) {
-            throw new LocalizedException(__('"wishlistItemModel" should be a "%instance" instance', [
+        if (!$value['itemModel'] instanceof Item) {
+            throw new LocalizedException(__('"itemModel" should be a "%instance" instance', [
                 'instance' => Item::class
             ]));
         }
 
         /** @var Item $wishlistItem */
-        $wishlistItem = $value['wishlistItemModel'];
+        $wishlistItem = $value['itemModel'];
         $optionProduct = $wishlistItem->getProduct()->getCustomOption('simple_product')->getProduct();
 
         return $optionProduct->getSku();
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Configurable/ConfigurableOptions.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Configurable/ConfigurableOptions.php
index f3e7be1395a24..1090c8e5aaa1c 100644
--- a/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Configurable/ConfigurableOptions.php
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Configurable/ConfigurableOptions.php
@@ -43,14 +43,14 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        if (!$value['wishlistItemModel'] instanceof Item) {
-            throw new LocalizedException(__('"wishlistItemModel" should be a "%instance" instance', [
+        if (!$value['itemModel'] instanceof Item) {
+            throw new LocalizedException(__('"itemModel" should be a "%instance" instance', [
                 'instance' => Item::class
             ]));
         }
 
         /** @var Item $wishlistItem */
-        $wishlistItem = $value['wishlistItemModel'];
+        $wishlistItem = $value['itemModel'];
         $result = [];
 
         foreach ($this->configurationHelper->getOptions($wishlistItem) as $option) {
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistItems.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistItems.php
index 1fa750af05e5d..77ff483a60bd2 100644
--- a/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistItems.php
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistItems.php
@@ -71,7 +71,7 @@ public function resolve(
                 'description' => $wishlistItem->getDescription(),
                 'added_at' => $wishlistItem->getAddedAt(),
                 'model' => $wishlistItem->getProduct(),
-                'wishlistItemModel' => $wishlistItem,
+                'itemModel' => $wishlistItem,
             ];
         }
         return $data;
diff --git a/app/code/Magento/WishlistGraphQl/composer.json b/app/code/Magento/WishlistGraphQl/composer.json
index ba0ed697c3692..58bc738bd24d6 100644
--- a/app/code/Magento/WishlistGraphQl/composer.json
+++ b/app/code/Magento/WishlistGraphQl/composer.json
@@ -7,8 +7,6 @@
         "magento/framework": "*",
         "magento/module-catalog": "*",
         "magento/module-catalog-graph-ql": "*",
-        "magento/module-downloadable": "*",
-        "magento/module-downloadable-graphql": "*",
         "magento/module-wishlist": "*",
         "magento/module-store": "*"
     },
diff --git a/app/code/Magento/WishlistGraphQl/etc/schema.graphqls b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
index 1068073d47386..a7c8003a7c3e7 100644
--- a/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
@@ -52,7 +52,7 @@ type ConfigurableWishlistItem implements WishlistItemInterface {
 }
 
 type DownloadableWishlistItem implements WishlistItemInterface @doc(description: "Downloadable Wishlist Item") {
-    links_v2: [DownloadableProductLinks] @doc(description: "An array containing information about the selected links") @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\Type\\Downloadable\\Links")
+    links_v2: [DownloadableProductLinks] @doc(description: "An array containing information about the selected links") @resolver(class: "\\Magento\\DownloadableGraphQl\\Model\\Wishlist\\ItemLinks")
     samples: [DownloadableProductSamples] @doc(description: "DownloadableProductSamples defines characteristics of a downloadable product") @resolver(class: "Magento\\DownloadableGraphQl\\Resolver\\Product\\Samples")
 }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddConfigurableProductToWishlistTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddConfigurableProductToWishlistTest.php
index 4d9362de2337c..7b2c12f88d3a4 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddConfigurableProductToWishlistTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddConfigurableProductToWishlistTest.php
@@ -160,7 +160,7 @@ private function getQuery(
     }
 
     /**
-     * Generates Id_v2 for super configurable product super attributes
+     * Generates uid for super configurable product super attributes
      *
      * @param int $attributeId
      * @param int $valueIndex
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 4ea1e2664f431..0de45fb21b20b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddDownloadableProductToWishlistTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddDownloadableProductToWishlistTest.php
@@ -221,7 +221,7 @@ private function getQuery(
     }
 
     /**
-     * Generates Id_v2 for downloadable links
+     * Generates uid for downloadable links
      *
      * @param int $linkId
      *
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/GetCustomOptionsWithUidForQueryBySku.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/GetCustomOptionsWithUidForQueryBySku.php
index af839297dc8d4..4bd0c135f039a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/GetCustomOptionsWithUidForQueryBySku.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/GetCustomOptionsWithUidForQueryBySku.php
@@ -10,7 +10,7 @@
 use Magento\Catalog\Api\ProductCustomOptionRepositoryInterface;
 
 /**
- * Generate an array with test values for customizable options with encoded id_v2 value
+ * Generate an array with test values for customizable options with encoded uid value
  */
 class GetCustomOptionsWithUidForQueryBySku
 {

From 8420c37f27ee754de24f2d455f0658c086fd42e8 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 12 Aug 2020 15:23:58 +0300
Subject: [PATCH 1458/1718] 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 19728410e48cf44f28529ad43e71ef22a6e7ef02 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 12 Aug 2020 15:31:59 +0300
Subject: [PATCH 1459/1718] 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 faf1de2fffd71704f1c63c5390c634387f579690 Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Wed, 12 Aug 2020 21:17:09 +0800
Subject: [PATCH 1460/1718] 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 a7da7fd6ff08388b1a2364c23710f303e82b33bf Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Wed, 12 Aug 2020 16:28:32 +0300
Subject: [PATCH 1461/1718] add get

---
 app/code/Magento/Wishlist/Controller/Shared/Allcart.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Wishlist/Controller/Shared/Allcart.php b/app/code/Magento/Wishlist/Controller/Shared/Allcart.php
index 1c504a7a8a80d..89413eff8323f 100644
--- a/app/code/Magento/Wishlist/Controller/Shared/Allcart.php
+++ b/app/code/Magento/Wishlist/Controller/Shared/Allcart.php
@@ -10,6 +10,7 @@
 
 use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\Result\Forward;
 use Magento\Framework\Controller\Result\Redirect;
@@ -19,7 +20,7 @@
 /**
  * Wishlist Allcart Controller
  */
-class Allcart extends Action implements HttpPostActionInterface
+class Allcart extends Action implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * @var WishlistProvider

From 289af76d3f469af88be7734376f325c23ce6a025 Mon Sep 17 00:00:00 2001
From: jekabs <jekabs@developers-alliance.com>
Date: Wed, 12 Aug 2020 16:31:14 +0300
Subject: [PATCH 1462/1718] magento/web-api-test-recursive-array-comparison    
 -Added a function to TestFramework for comparing two arrays recursively.

---
 .../Helper/CompareArraysRecursively.php       | 70 +++++++++++++++++++
 .../TestFramework/TestCase/WebapiAbstract.php | 56 ---------------
 .../Catalog/Api/CategoryManagementTest.php    | 17 ++++-
 3 files changed, 86 insertions(+), 57 deletions(-)
 create mode 100644 dev/tests/api-functional/framework/Magento/TestFramework/Helper/CompareArraysRecursively.php

diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/Helper/CompareArraysRecursively.php b/dev/tests/api-functional/framework/Magento/TestFramework/Helper/CompareArraysRecursively.php
new file mode 100644
index 0000000000000..d8a88c721c9fe
--- /dev/null
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/Helper/CompareArraysRecursively.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Helper;
+
+/**
+ * Class for comparing arrays recursively
+ */
+class CompareArraysRecursively
+{
+    /**
+     * Compare arrays recursively regardless of nesting.
+     * Can compare arrays that have both one level and n-level nesting.
+     * ```
+     *  [
+     * 'products' => [
+     *      'items' => [
+     *      [
+     *          'sku'       => 'bundle-product',
+     *          'type_id'   => 'bundle',
+     *          'items'     => [
+     *          [
+     *              'title'     => 'Bundle Product Items',
+     *              'sku'       => 'bundle-product',
+     *              'options'   => [
+     *              [
+     *                  'price' => 2.75,
+     *                  'label' => 'Simple Product',
+     *                  'product' => [
+     *                      'name'    => 'Simple Product',
+     *                      'sku'     => 'simple',
+     *                  ]
+     *              ]
+     *          ]
+     *      ]
+     *  ];
+     * ```
+     *
+     * @param array $expected
+     * @param array $actual
+     * @return array
+     */
+    public function execute(array $expected, array $actual): array
+    {
+        $diffResult = [];
+
+        foreach ($expected as $key => $value) {
+            if (array_key_exists($key, $actual)) {
+                if (is_array($value)) {
+                    $recursiveDiff = $this->execute($value, $actual[$key]);
+                    if (!empty($recursiveDiff)) {
+                        $diffResult[$key] = $recursiveDiff;
+                    }
+                } else {
+                    if (!in_array($value, $actual, true)) {
+                        $diffResult[$key] = $value;
+                    }
+                }
+            } else {
+                $diffResult[$key] = $value;
+            }
+        }
+
+        return $diffResult;
+    }
+}
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/WebapiAbstract.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/WebapiAbstract.php
index 91be839aa56cb..7ccab097d7778 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/WebapiAbstract.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/WebapiAbstract.php
@@ -766,60 +766,4 @@ protected function assertWebApiCallErrors(array $serviceInfo, array $data, array
             }
         }
     }
-
-    /**
-     * Compare arrays recursively regardless of nesting.
-     * Can compare arrays that have both one level and n-level nesting.
-     * ```
-     *  [
-     * 'products' => [
-     *      'items' => [
-     *      [
-     *          'sku'       => 'bundle-product',
-     *          'type_id'   => 'bundle',
-     *          'items'     => [
-     *          [
-     *              'title'     => 'Bundle Product Items',
-     *              'sku'       => 'bundle-product',
-     *              'options'   => [
-     *              [
-     *                  'price' => 2.75,
-     *                  'label' => 'Simple Product',
-     *                  'product' => [
-     *                      'name'    => 'Simple Product',
-     *                      'sku'     => 'simple',
-     *                  ]
-     *              ]
-     *          ]
-     *      ]
-     *  ];
-     * ```
-     *
-     * @param array $expected
-     * @param array $actual
-     * @return array
-     */
-    public function compareArraysRecursively(array $expected, array $actual): array
-    {
-        $diffResult = [];
-
-        foreach ($expected as $key => $value) {
-            if (array_key_exists($key, $actual)) {
-                if (is_array($value)) {
-                    $recursiveDiff = $this->compareArraysRecursively($value, $actual[$key]);
-                    if (!empty($recursiveDiff)) {
-                        $diffResult[$key] = $recursiveDiff;
-                    }
-                } else {
-                    if (!in_array($value, $actual, true)) {
-                        $diffResult[$key] = $value;
-                    }
-                }
-            } else {
-                $diffResult[$key] = $value;
-            }
-        }
-
-        return $diffResult;
-    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryManagementTest.php
index 965b920319994..1523bfe957901 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryManagementTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryManagementTest.php
@@ -9,6 +9,7 @@
 
 use Magento\TestFramework\TestCase\WebapiAbstract;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Helper\CompareArraysRecursively;
 
 /**
  * Tests CategoryManagement
@@ -19,6 +20,20 @@ class CategoryManagementTest extends WebapiAbstract
 
     const SERVICE_NAME = 'catalogCategoryManagementV1';
 
+    /**
+     * @var CompareArraysRecursively
+     */
+    private $compareArraysRecursively;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->compareArraysRecursively = $objectManager->create(CompareArraysRecursively::class);
+    }
+
     /**
      * Tests getTree operation
      *
@@ -40,7 +55,7 @@ public function testTree($rootCategoryId, $depth, $expected)
             ]
         ];
         $result = $this->_webApiCall($serviceInfo, $requestData);
-        $diff = $this->compareArraysRecursively($expected, $result);
+        $diff = $this->compareArraysRecursively->execute($expected, $result);
         self::assertEquals([], $diff, "Actual categories response doesn't equal expected data");
     }
 

From 7ae8c6ee7ea476ec7570438dbc8c80c36932d373 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Wed, 12 Aug 2020 21:49:45 +0800
Subject: [PATCH 1463/1718] 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 12c6bbb57ae5126d724cd4a2181162d2aa6d5543 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 12 Aug 2020 17:08:42 +0300
Subject: [PATCH 1464/1718] 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 0192ca576be48357640029f10edf35e829f2318b Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Wed, 12 Aug 2020 22:13:59 +0800
Subject: [PATCH 1465/1718] 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 a74d422b30b2142d4b2195aa86d58acf0c506bfe Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 12 Aug 2020 19:24:25 +0300
Subject: [PATCH 1466/1718] 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 94bda9e6d9cbd28309f6f1ff7a0a67c9b1d7f892 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 12 Aug 2020 19:29:40 +0300
Subject: [PATCH 1467/1718] 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 e671a530500f916860e93e546c6d73e53841ce2f Mon Sep 17 00:00:00 2001
From: Slava Mankivski <mankivsk@adobe.com>
Date: Wed, 12 Aug 2020 13:37:21 -0500
Subject: [PATCH 1468/1718] Fixed PHPStan

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

diff --git a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
index 5b952e0e50429..a3ae616dfcf4f 100644
--- a/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
+++ b/app/code/Magento/CacheInvalidate/Model/PurgeCache.php
@@ -155,14 +155,14 @@ private function sendPurgeRequestToServers(Socket $socketAdapter, array $servers
             if ($errorCount == count($servers)) {
                 $this->logger->critical(
                     'No cache server(s) could be purged ' . $loggerMessage,
-                    compact('server', 'formattedTagsChunk')
+                    compact('servers', 'formattedTagsChunk')
                 );
                 return false;
             }
 
             $this->logger->warning(
                 'Unresponsive cache server(s) hit' . $loggerMessage,
-                compact('server', 'formattedTagsChunk')
+                compact('servers', 'formattedTagsChunk')
             );
         }
 

From ecd04556a1042aa076b8e01e79a4783d3fc6c483 Mon Sep 17 00:00:00 2001
From: Slava Mankivski <mankivsk@adobe.com>
Date: Wed, 12 Aug 2020 13:38:55 -0500
Subject: [PATCH 1469/1718] Fixed PHPStan

---
 .../Framework/TestFramework/Unit/Helper/ObjectManager.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ObjectManager.php b/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ObjectManager.php
index 0f828c6b7cb82..33fcf4c2cd6a1 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ObjectManager.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ObjectManager.php
@@ -286,7 +286,7 @@ public function getConstructArguments($className, array $arguments = [])
                 }
             }
 
-            $constructArguments[$parameterName] = null === $object ? $defaultValue : $object;
+            $constructArguments[$parameterName] = !isset($object) || null === $object ? $defaultValue : $object;
         }
         return $constructArguments;
     }

From c578203e97bcd3bc175a77e7f7176edfcad1476f Mon Sep 17 00:00:00 2001
From: Dave Macaulay <macaulay@adobe.com>
Date: Wed, 12 Aug 2020 14:10:13 -0500
Subject: [PATCH 1470/1718] PWA-806: Localize emails sent through GraphQL
 application

- Add tests verifying creation of customer accounts through GraphQL
---
 .../Model/Resolver/CreateCustomerTest.php     | 175 ++++++++++++++++++
 1 file changed, 175 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerTest.php

diff --git a/dev/tests/integration/testsuite/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerTest.php b/dev/tests/integration/testsuite/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerTest.php
new file mode 100644
index 0000000000000..2e9ddc10882e6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerTest.php
@@ -0,0 +1,175 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Resolver;
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\GraphQl\Service\GraphQlRequest;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Mail\Template\TransportBuilderMock;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test creating a customer through GraphQL
+ *
+ * @magentoAppArea graphql
+ */
+class CreateCustomerTest extends TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var GraphQlRequest
+     */
+    private $graphQlRequest;
+
+    /**
+     * @var SerializerInterface
+     */
+    private $json;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @var StoreRepositoryInterface
+     */
+    private $storeRepository;
+
+    public function setUp(): void
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+
+        $this->graphQlRequest = $this->objectManager->create(GraphQlRequest::class);
+        $this->json = $this->objectManager->get(SerializerInterface::class);
+
+        $this->customerRepository = $this->objectManager->create(CustomerRepositoryInterface::class);
+        $this->storeRepository = $this->objectManager->create(StoreRepositoryInterface::class);
+    }
+
+    /**
+     * Test that creating a customer sends an email
+     */
+    public function testCreateCustomerSendsEmail()
+    {
+        $query
+            = <<<QUERY
+mutation createAccount {
+    createCustomer(
+        input: {
+            email: "test@magento.com"
+            firstname: "Test"
+            lastname: "Magento"
+            password: "T3stP4assw0rd"
+            is_subscribed: false
+        }
+    ) {
+        customer {
+            id
+        }
+    }
+}
+QUERY;
+
+        $response = $this->graphQlRequest->send($query);
+        $responseData = $this->json->unserialize($response->getContent());
+
+        // Assert the response of the GraphQL request
+        $this->assertNull($responseData['data']['createCustomer']['customer']['id']);
+
+        // Verify the customer was created and has the correct data
+        $customer = $this->customerRepository->get('test@magento.com');
+        $this->assertEquals('Test', $customer->getFirstname());
+        $this->assertEquals('Magento', $customer->getLastname());
+
+        /** @var TransportBuilderMock $transportBuilderMock */
+        $transportBuilderMock = $this->objectManager->get(TransportBuilderMock::class);
+        $sentMessage = $transportBuilderMock->getSentMessage();
+
+        // Verify an email was dispatched to the correct user
+        $this->assertNotNull($sentMessage);
+        $this->assertEquals('Test Magento', $sentMessage->getTo()[0]->getName());
+        $this->assertEquals('test@magento.com', $sentMessage->getTo()[0]->getEmail());
+
+        // Assert the email contains the expected content
+        $this->assertEquals('Welcome to Main Website Store', $sentMessage->getSubject());
+        $messageRaw = $sentMessage->getBody()->getParts()[0]->getRawContent();
+        $this->assertStringContainsString('Welcome to Main Website Store.', $messageRaw);
+    }
+
+
+    /**
+     * Test that creating a customer on an alternative store sends an email
+     *
+     * @magentoDataFixture Magento/Store/_files/second_website_with_store_group_and_store.php
+     */
+    public function testCreateCustomerForStoreSendsEmail()
+    {
+        $query
+            = <<<QUERY
+mutation createAccount {
+    createCustomer(
+        input: {
+            email: "test@magento.com"
+            firstname: "Test"
+            lastname: "Magento"
+            password: "T3stP4assw0rd"
+            is_subscribed: false
+        }
+    ) {
+        customer {
+            id
+        }
+    }
+}
+QUERY;
+
+        $response = $this->graphQlRequest->send(
+            $query,
+            [],
+            '',
+            [
+                'Store' => 'fixture_second_store'
+            ]
+        );
+        $responseData = $this->json->unserialize($response->getContent());
+
+        // Assert the response of the GraphQL request
+        $this->assertNull($responseData['data']['createCustomer']['customer']['id']);
+
+        // Verify the customer was created and has the correct data
+        $customer = $this->customerRepository->get('test@magento.com');
+        $this->assertEquals('Test', $customer->getFirstname());
+        $this->assertEquals('Magento', $customer->getLastname());
+        $this->assertEquals('Fixture Second Store', $customer->getCreatedIn());
+
+        $store = $this->storeRepository->getById($customer->getStoreId());
+        $this->assertEquals('fixture_second_store', $store->getCode());
+
+        /** @var TransportBuilderMock $transportBuilderMock */
+        $transportBuilderMock = $this->objectManager->get(TransportBuilderMock::class);
+        $sentMessage = $transportBuilderMock->getSentMessage();
+
+        // Verify an email was dispatched to the correct user
+        $this->assertNotNull($sentMessage);
+        $this->assertEquals('Test Magento', $sentMessage->getTo()[0]->getName());
+        $this->assertEquals('test@magento.com', $sentMessage->getTo()[0]->getEmail());
+
+        // Assert the email contains the expected content
+        $this->assertEquals('Welcome to second store group', $sentMessage->getSubject());
+        $messageRaw = $sentMessage->getBody()->getParts()[0]->getRawContent();
+        $this->assertStringContainsString('Welcome to second store group.', $messageRaw);
+    }
+}

From 915745730f3715a791838307544e9a0abccb86a7 Mon Sep 17 00:00:00 2001
From: Slava Mankivski <mankivsk@adobe.com>
Date: Wed, 12 Aug 2020 15:41:04 -0500
Subject: [PATCH 1471/1718] Fix PHPStan

---
 .../Framework/TestFramework/Unit/Helper/ObjectManager.php      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ObjectManager.php b/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ObjectManager.php
index 33fcf4c2cd6a1..69156225e9c39 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ObjectManager.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Helper/ObjectManager.php
@@ -266,6 +266,7 @@ public function getConstructArguments($className, array $arguments = [])
                 $defaultValue = $parameter->getDefaultValue();
             }
 
+            $object = null;
             try {
                 if ($parameter->getClass()) {
                     $argClassName = $parameter->getClass()->getName();
@@ -286,7 +287,7 @@ public function getConstructArguments($className, array $arguments = [])
                 }
             }
 
-            $constructArguments[$parameterName] = !isset($object) || null === $object ? $defaultValue : $object;
+            $constructArguments[$parameterName] = null === $object ? $defaultValue : $object;
         }
         return $constructArguments;
     }

From 1a7c8cd619b4936fd544ac669bf4f5e66bcc7d34 Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Thu, 13 Aug 2020 10:51:33 +0530
Subject: [PATCH 1472/1718] Fixed the resending Newsletter confirmation issue

---
 app/code/Magento/Newsletter/Model/SubscriptionManager.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Newsletter/Model/SubscriptionManager.php b/app/code/Magento/Newsletter/Model/SubscriptionManager.php
index 846d095625e0c..eac43e1bcea5f 100644
--- a/app/code/Magento/Newsletter/Model/SubscriptionManager.php
+++ b/app/code/Magento/Newsletter/Model/SubscriptionManager.php
@@ -200,6 +200,7 @@ private function saveSubscriber(
             && (int)$subscriber->getCustomerId() === (int)$customer->getId()
             && (int)$subscriber->getStoreId() === $storeId
             && !$emailChanged
+            && $status !== Subscriber::STATUS_NOT_ACTIVE
         ) {
             return false;
         }
@@ -220,10 +221,10 @@ private function saveSubscriber(
 
         /**
          * If the subscriber is waiting to confirm from the customer
-         * and customer changed the email
+         * or customer changed the email
          * than need to send confirmation letter to the new email
          */
-        return $status === Subscriber::STATUS_NOT_ACTIVE && $emailChanged;
+        return $status === Subscriber::STATUS_NOT_ACTIVE || $emailChanged;
     }
 
     /**

From 23b5a2488586c0ed493a834a04669e5c410ca85a Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Thu, 13 Aug 2020 11:22:17 +0530
Subject: [PATCH 1473/1718] Style changes

---
 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..5f67ac4414e99 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Time.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Time.php
@@ -114,7 +114,7 @@ public function getElementHtml()
             'style',
             [],
             <<<style
-                .select80wide {
+                select.select.select80wide {
                     width: 80px;
                 }
 style

From 7436d5787b06c115b13e143075e76bb989a06efb Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Thu, 13 Aug 2020 09:20:33 +0300
Subject: [PATCH 1474/1718] add mftf

---
 .../Section/StorefrontProductPageSection.xml  |  2 +-
 .../Test/Mftf/Section/DiscountSection.xml     |  3 +-
 ...tCheckNotificationMessageContainerTest.xml | 49 +++++++++++++++++++
 3 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/Theme/Test/Mftf/Test/StoreFrontCheckNotificationMessageContainerTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml
index bc4a4b726bb3d..7be02126e3a0f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontProductPageSection.xml
@@ -13,7 +13,7 @@
         <element name="addToCartBtn" type="button" selector="button.action.tocart.primary" timeout="30"/>
         <element name="successMsg" type="button" selector="div.message-success" timeout="30"/>
         <element name="errorMsg" type="button" selector="div.message-error" timeout="30"/>
-        <element name="alertMessage" type="text" selector=".page.messages [role=alert][aria-atomic=true]"/>
+        <element name="alertMessage" type="text" selector=".page.messages [role=alert]"/>
         <element name="messagesBlock" type="text" selector=".page.messages" timeout="30"/>
         <element name="addToWishlist" type="button" selector="//a[@class='action towishlist']" timeout="30"/>
         <element name="customTextOptionInput" type="input" selector=".input-text.product-custom-option"/>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/DiscountSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/DiscountSection.xml
index ed2abe341a694..c8ad0efdd4b4d 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Section/DiscountSection.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/DiscountSection.xml
@@ -13,7 +13,8 @@
         <element name="DiscountInput" type="input" selector="#discount-code"/>
         <element name="ApplyCodeBtn" type="button" selector="//span[text()='Apply Discount']"/>
         <element name="CancelCoupon" type="button" selector="//button[@value='Cancel Coupon']"/>
-        <element name="DiscountVerificationMsg" type="text" selector=".message-success[aria-atomic=true] div"/>
+        <element name="DiscountVerificationMsg" type="text" selector=".message-success div"/>
+        <element name="DiscountVerificationMsgWithAriaAtomicProperty" type="text" selector=".message-success[aria-atomic=true] div"/>
         <element name="CancelCouponBtn" type="button" selector="#discount-form .action-cancel"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Theme/Test/Mftf/Test/StoreFrontCheckNotificationMessageContainerTest.xml b/app/code/Magento/Theme/Test/Mftf/Test/StoreFrontCheckNotificationMessageContainerTest.xml
new file mode 100644
index 0000000000000..d3317ba4f1e07
--- /dev/null
+++ b/app/code/Magento/Theme/Test/Mftf/Test/StoreFrontCheckNotificationMessageContainerTest.xml
@@ -0,0 +1,49 @@
+<?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="StoreFrontCheckNotificationMessageContainerTest">
+        <annotations>
+            <title value="Check notification message container"/>
+            <description value="Check aria-atomic property on notification container message"/>
+            <severity value="AVERAGE"/>
+            <group value="Theme"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleProduct2" stepKey="simpleProduct"/>
+            <createData entity="SalesRuleSpecificCouponAndByPercent" stepKey="createSalesRule"/>
+            <createData entity="SimpleSalesRuleCoupon" stepKey="createCouponForCartPriceRule">
+                <requiredEntity createDataKey="createSalesRule"/>
+            </createData>
+        </before>
+        <after>
+            <deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createSalesRule" stepKey="deleteSalesRule"/>
+        </after>
+
+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageByCustomAttributeUrlKeyActionGroup" stepKey="openProductPageAndVerifyProduct">
+            <argument name="product" value="$$simpleProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAddProductToCartWithQtyActionGroup" stepKey="addProductToTheCart">
+            <argument name="productQty" value="1"/>
+        </actionGroup>
+
+        <waitForElementVisible selector="{{StorefrontProductPageSection.alertMessage}}[aria-atomic=true]" stepKey="checkAddedToCartMessage"/>
+
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShipping">
+            <argument name="shippingMethod" value="Flat Rate"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontApplyDiscountCodeActionGroup" stepKey="applyCoupon">
+            <argument name="discountCode" value="$createCouponForCartPriceRule.code$"/>
+        </actionGroup>
+
+        <waitForElementVisible selector="{{DiscountSection.DiscountVerificationMsgWithAriaAtomicProperty}}" stepKey="checkCouponCodeApply"/>
+    </test>
+</tests>

From f165c8f7b942320bdca28bb2390b8b3862f956d2 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 13 Aug 2020 11:25:57 +0300
Subject: [PATCH 1475/1718] 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 becbd8861affa..77d9c51ba0a3a 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 $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)
         );
     }
 
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 f3d831d45cd2d1c7b087fe906490201d5e72d5dc Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 13 Aug 2020 12:17:43 +0300
Subject: [PATCH 1476/1718] Fix typos

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

diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteIptc.php b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteIptc.php
index 17751b5b37b24..9025ba9363fde 100644
--- a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteIptc.php
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteIptc.php
@@ -100,7 +100,7 @@ private function insertPngIptcSegment(array $segments, SegmentInterface $iptcSeg
 
         return array_merge(
             array_slice($segments, 0, $iendSegmentIndex),
-            [$xmpSegment],
+            [$iptcSegment],
             array_slice($segments, $iendSegmentIndex)
         );
     }

From 84ee18b2c95d6476604eb17302d3040afc5b014c Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 13 Aug 2020 12:35:28 +0300
Subject: [PATCH 1477/1718] 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 603ef0565df194abab63b1c23b11d2ee0d11aa8d Mon Sep 17 00:00:00 2001
From: Russell Albin <russell@russellalbin.com>
Date: Thu, 13 Aug 2020 05:12:54 -0500
Subject: [PATCH 1478/1718] Update config.xml

Updating message to be a little more helpful
---
 app/code/Magento/Multishipping/etc/config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Multishipping/etc/config.xml b/app/code/Magento/Multishipping/etc/config.xml
index e7f247b5afba5..0df8742016aed 100644
--- a/app/code/Magento/Multishipping/etc/config.xml
+++ b/app/code/Magento/Multishipping/etc/config.xml
@@ -15,7 +15,7 @@
         </multishipping>
         <sales>
             <minimum_order>
-                <multi_address_error_message>All shippable products have been removed from your order</multi_address_error_message>
+                <multi_address_error_message>The current cart does not match multi shipping criteria, please review or contact the store administrator</multi_address_error_message>
             </minimum_order>
         </sales>
     </default>

From 78f0780e7d4eec7863fc6a94ab8ce1e16e42f8c3 Mon Sep 17 00:00:00 2001
From: Russell Albin <russell@russellalbin.com>
Date: Thu, 13 Aug 2020 05:13:55 -0500
Subject: [PATCH 1479/1718] Update en_US.csv

Updated translation file with new more helpful message
---
 app/code/Magento/Multishipping/i18n/en_US.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Multishipping/i18n/en_US.csv b/app/code/Magento/Multishipping/i18n/en_US.csv
index ad3e968d88cd5..412eb7b8bc730 100644
--- a/app/code/Magento/Multishipping/i18n/en_US.csv
+++ b/app/code/Magento/Multishipping/i18n/en_US.csv
@@ -92,4 +92,4 @@ Options,Options
 "Error:","Error:"
 "We are unable to process your request. Please, try again later.","We are unable to process your request. Please, try again later."
 "Quote address for failed order ID "%1" not found.","Quote address for failed order ID "%1" not found."
-"All shippable products have been removed from your order","All shippable products have been removed from your order"
\ No newline at end of file
+"The current cart does not match multi shipping criteria, please review or contact the store administrator","The current cart does not match multi shipping criteria, please review or contact the store administrator"

From 89e7f22c2d86f2d281749774761d6dc6418e891b Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Thu, 13 Aug 2020 18:47:51 +0800
Subject: [PATCH 1480/1718] 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 8fdaa15f3a3aa52d5adc434628d43c2841a3f21e Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Thu, 13 Aug 2020 14:10:32 +0300
Subject: [PATCH 1481/1718] MFTF test.

---
 .../Rss/Test/Mftf/Page/StorefrontRssPage.xml  | 14 +++++++
 .../Mftf/Section/StorefrontRssListSection.xml | 15 +++++++
 .../Magento/Rss/Test/Mftf/Test/RssTest.xml    | 40 +++++++++++++++++++
 3 files changed, 69 insertions(+)
 create mode 100644 app/code/Magento/Rss/Test/Mftf/Page/StorefrontRssPage.xml
 create mode 100644 app/code/Magento/Rss/Test/Mftf/Section/StorefrontRssListSection.xml
 create mode 100644 app/code/Magento/Rss/Test/Mftf/Test/RssTest.xml

diff --git a/app/code/Magento/Rss/Test/Mftf/Page/StorefrontRssPage.xml b/app/code/Magento/Rss/Test/Mftf/Page/StorefrontRssPage.xml
new file mode 100644
index 0000000000000..d0559af3e5370
--- /dev/null
+++ b/app/code/Magento/Rss/Test/Mftf/Page/StorefrontRssPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontRssPage" url="/rss/" area="storefront" module="Magento_Rss">
+        <section name="StorefrontRssListSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Rss/Test/Mftf/Section/StorefrontRssListSection.xml b/app/code/Magento/Rss/Test/Mftf/Section/StorefrontRssListSection.xml
new file mode 100644
index 0000000000000..839e937887ec1
--- /dev/null
+++ b/app/code/Magento/Rss/Test/Mftf/Section/StorefrontRssListSection.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="StorefrontRssListSection">
+        <element name="rssTable" type="block" selector="table.rss"/>
+        <element name="rssLink" type="text" selector="table.rss tr:nth-of-type(2) > td.action a"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Rss/Test/Mftf/Test/RssTest.xml b/app/code/Magento/Rss/Test/Mftf/Test/RssTest.xml
new file mode 100644
index 0000000000000..10c5a45bcf269
--- /dev/null
+++ b/app/code/Magento/Rss/Test/Mftf/Test/RssTest.xml
@@ -0,0 +1,40 @@
+<?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="RssTest">
+        <annotations>
+            <group value="Rss"/>
+            <stories value="RSS Feed available to view"/>
+            <title value="RSS Feed"/>
+            <description value="View selected RSS feed by link."/>
+            <severity value="MAJOR"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleProductWithNewFromDate" stepKey="createProduct"/>
+            <magentoCLI command="config:set rss/config/active 1" stepKey="enableRss"/>
+            <magentoCLI command="config:set rss/catalog/new 1" stepKey="enableRssForCatalogNewProducts"/>
+            <magentoCLI command="cache:clean" stepKey="cleanCache"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <magentoCLI command="config:set rss/config/active 0" stepKey="disableRss"/>
+            <magentoCLI command="config:set rss/catalog/new 0" stepKey="disableRssForCatalogNewProducts"/>
+            <magentoCLI command="cache:clean" stepKey="cleanCache"/>
+        </after>
+
+        <amOnPage url="{{StorefrontRssPage.url}}" stepKey="goToRssPage"/>
+        <seeElement selector="{{StorefrontRssListSection.rssTable}}" stepKey="seeRssList"/>
+        <click selector="{{StorefrontRssListSection.rssLink}}" stepKey="clickRssLink"/>
+        <seeInCurrentUrl url="rss/feed/index/type/new_products/" stepKey="seeInUrl"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see userInput="New Products from Main Website Store" stepKey="seeText" />
+
+    </test>
+</tests>

From 0fa559eddfa76160d164a97ff17b8ca244a89014 Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Thu, 13 Aug 2020 14:13:32 +0300
Subject: [PATCH 1482/1718] MFTF test typo.

---
 .../Magento/Rss/Test/Mftf/Test/{RssTest.xml => RssListTest.xml} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename app/code/Magento/Rss/Test/Mftf/Test/{RssTest.xml => RssListTest.xml} (98%)

diff --git a/app/code/Magento/Rss/Test/Mftf/Test/RssTest.xml b/app/code/Magento/Rss/Test/Mftf/Test/RssListTest.xml
similarity index 98%
rename from app/code/Magento/Rss/Test/Mftf/Test/RssTest.xml
rename to app/code/Magento/Rss/Test/Mftf/Test/RssListTest.xml
index 10c5a45bcf269..c81caf181fc40 100644
--- a/app/code/Magento/Rss/Test/Mftf/Test/RssTest.xml
+++ b/app/code/Magento/Rss/Test/Mftf/Test/RssListTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="RssTest">
+    <test name="RssListTest">
         <annotations>
             <group value="Rss"/>
             <stories value="RSS Feed available to view"/>

From ded3e1ebc95df3f9aafcead5dfff395ed85c17bf Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Thu, 13 Aug 2020 19:40:27 +0800
Subject: [PATCH 1483/1718] 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 9b8c81c657102c5b7e2fee8fc91ae926c82e2c67 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 13 Aug 2020 14:49:16 +0300
Subject: [PATCH 1484/1718] 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 5c7c95955dc4afe349d284f60d9534b127ae9508 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 13 Aug 2020 14:49:56 +0300
Subject: [PATCH 1485/1718] 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 e2f28054c87bba6cc8457c1f910ad808e32622e5 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Thu, 13 Aug 2020 21:29:48 +0800
Subject: [PATCH 1486/1718] 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 9625a3443ce5cfe7576fa35a3969bf160798a784 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Thu, 13 Aug 2020 10:40:10 -0500
Subject: [PATCH 1487/1718] MC-36456: union implementation

---
 app/code/Magento/GraphQl/etc/schema.graphqls         |  4 +---
 .../GraphQl/Config/Element/UnionFactory.php          |  2 +-
 .../Framework/GraphQl/Config/Element/UnionType.php   | 12 ++++++------
 .../Output/ElementMapper/Formatter/ResolveType.php   |  2 +-
 .../GraphQlSchemaStitching/GraphQlReader.php         |  3 ---
 .../GraphQlReader/Reader/UnionType.php               |  4 ++--
 6 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/GraphQl/etc/schema.graphqls b/app/code/Magento/GraphQl/etc/schema.graphqls
index 0212d32db0f2f..035ec98fa06e6 100644
--- a/app/code/Magento/GraphQl/etc/schema.graphqls
+++ b/app/code/Magento/GraphQl/etc/schema.graphqls
@@ -30,14 +30,12 @@ directive @resolver(class: String="") on QUERY
     | OBJECT
     | FIELD_DEFINITION
     | ARGUMENT_DEFINITION
-    | INTERFACE
-    | UNION
     | ENUM
     | ENUM_VALUE
     | INPUT_OBJECT
     | INPUT_FIELD_DEFINITION
 
-directive @typeResolver(class: String="") on INTERFACE | OBJECT
+directive @typeResolver(class: String="") on INTERFACE | OBJECT | UNION
 
 directive @cache(cacheIdentity: String="" cacheable: Boolean=true) on QUERY
 
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionFactory.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionFactory.php
index e6dddd9535e82..d26538b576fd3 100644
--- a/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionFactory.php
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionFactory.php
@@ -60,7 +60,7 @@ public function create(
             UnionType::class,
             [
                 'name' => $unionData['name'],
-                'resolver' => $unionData['resolver'],
+                'typeResolver' => $unionData['typeResolver'],
                 'types' => $types,
                 'description' => isset($unionData['description']) ? $unionData['description'] : ''
             ]
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionType.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionType.php
index 125baa344f1cd..d386a59a9ec6a 100644
--- a/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionType.php
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionType.php
@@ -25,7 +25,7 @@ class UnionType implements UnionInterface
     /**
      * @var string
      */
-    private $resolver;
+    private $typeResolver;
 
     /**
      * @var string
@@ -34,19 +34,19 @@ class UnionType implements UnionInterface
 
     /**
      * @param string $name
-     * @param string $resolver
+     * @param string $typeResolver
      * @param string[] $types
      * @param string $description
      */
     public function __construct(
         string $name,
-        string $resolver,
+        string $typeResolver,
         array $types,
         string $description
     ) {
         $this->name = $name;
         $this->types = $types;
-        $this->resolver = $resolver;
+        $this->typeResolver = $typeResolver;
         $this->description = $description;
     }
 
@@ -75,9 +75,9 @@ public function getTypes() : array
      *
      * @return string
      */
-    public function getResolver()
+    public function getTypeResolver()
     {
-        return $this->resolver;
+        return $this->typeResolver;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/ResolveType.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/ResolveType.php
index 8af7953e399f5..529cdf4467f1d 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/ResolveType.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/ResolveType.php
@@ -44,7 +44,7 @@ public function format(ConfigElementInterface $configElement, OutputTypeInterfac
                 return $typeResolver->resolveType($value);
             };
         } elseif ($configElement instanceof UnionType) {
-            $typeResolver = $this->objectManager->create($configElement->getResolver());
+            $typeResolver = $this->objectManager->create($configElement->getTypeResolver());
             $config['resolveType'] = function ($value) use ($typeResolver) {
                 return $typeResolver->resolveType($value);
             };
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
index 61209891fa08d..6d3452b009815 100644
--- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
@@ -331,9 +331,6 @@ private static function getModuleNameForRelevantFile(string $file): string
     private function addModuleNameToTypes(array $source, string $filePath): array
     {
         foreach ($source as $typeName => $type) {
-            if (!isset($type['type'])) {
-                $x=1;
-            }
             if ((!isset($type['module']))
                 && (($type['type'] ?? '' === self::GRAPHQL_INTERFACE && isset($type['typeResolver']))
                     || isset($type['implements'])
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/UnionType.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/UnionType.php
index 9dab871935dff..d046b346aa4c1 100644
--- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/UnionType.php
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/UnionType.php
@@ -64,7 +64,7 @@ public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
 
             $unionResolveType = $this->getUnionTypeResolver($typeMeta);
             if (!empty($unionResolveType)) {
-                $result['resolver'] = $unionResolveType;
+                $result['typeResolver'] = $unionResolveType;
             }
 
 
@@ -89,7 +89,7 @@ private function getUnionTypeResolver(\GraphQL\Type\Definition\UnionType $unionT
         /** @var \GraphQL\Language\AST\NodeList $directives */
         $directives = $unionTypeMeta->astNode->directives;
         foreach ($directives as $directive) {
-            if ($directive->name->value == 'resolver') {
+            if ($directive->name->value == 'typeResolver') {
                 foreach ($directive->arguments as $directiveArgument) {
                     if ($directiveArgument->name->value == 'class') {
                         return $directiveArgument->value->value;

From 60da76cf173a44c2c1545a643a96a858bdf19ed0 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 1488/1718] 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 5a16ed1792159..141f3efb2348a 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
@@ -211,7 +211,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 c96ad0fd86661..686a8f8957120 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
@@ -198,7 +198,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 51d124ca319e6..58e86a3a152b8 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 6e3afd3ca4a971b4e9949c0c3b6904a8fcfcb021 Mon Sep 17 00:00:00 2001
From: Dave Macaulay <macaulay@adobe.com>
Date: Thu, 13 Aug 2020 11:38:36 -0500
Subject: [PATCH 1489/1718] PWA-806: Localize emails sent through GraphQL
 application

- Add test for checking customer graph QL end point sends approprite translated emails
---
 .../Model/Resolver/CreateCustomerTest.php     | 79 +++++++++++++++++--
 .../CustomerGraphQl/_files/french/fr_fr/1.csv |  2 +
 .../_files/french/fr_fr/language.xml          | 13 +++
 .../_files/french/fr_fr/registration.php      |  9 +++
 .../_files/website_store_with_store_view.php  | 50 ++++++++++++
 ...website_store_with_store_view_rollback.php | 41 ++++++++++
 6 files changed, 186 insertions(+), 8 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/CustomerGraphQl/_files/french/fr_fr/1.csv
 create mode 100644 dev/tests/integration/testsuite/Magento/CustomerGraphQl/_files/french/fr_fr/language.xml
 create mode 100644 dev/tests/integration/testsuite/Magento/CustomerGraphQl/_files/french/fr_fr/registration.php
 create mode 100644 dev/tests/integration/testsuite/Magento/CustomerGraphQl/_files/website_store_with_store_view.php
 create mode 100644 dev/tests/integration/testsuite/Magento/CustomerGraphQl/_files/website_store_with_store_view_rollback.php

diff --git a/dev/tests/integration/testsuite/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerTest.php b/dev/tests/integration/testsuite/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerTest.php
index 2e9ddc10882e6..fa6889cbdbe37 100644
--- a/dev/tests/integration/testsuite/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerTest.php
+++ b/dev/tests/integration/testsuite/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerTest.php
@@ -51,7 +51,6 @@ class CreateCustomerTest extends TestCase
     public function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
-
         $this->graphQlRequest = $this->objectManager->create(GraphQlRequest::class);
         $this->json = $this->objectManager->get(SerializerInterface::class);
 
@@ -109,11 +108,10 @@ public function testCreateCustomerSendsEmail()
         $this->assertStringContainsString('Welcome to Main Website Store.', $messageRaw);
     }
 
-
     /**
      * Test that creating a customer on an alternative store sends an email
      *
-     * @magentoDataFixture Magento/Store/_files/second_website_with_store_group_and_store.php
+     * @magentoDataFixture Magento/CustomerGraphQl/_files/website_store_with_store_view.php
      */
     public function testCreateCustomerForStoreSendsEmail()
     {
@@ -141,7 +139,72 @@ public function testCreateCustomerForStoreSendsEmail()
             [],
             '',
             [
-                'Store' => 'fixture_second_store'
+                'Store' => 'test_store_view'
+            ]
+        );
+        $responseData = $this->json->unserialize($response->getContent());
+
+        // Assert the response of the GraphQL request
+        $this->assertNull($responseData['data']['createCustomer']['customer']['id']);
+
+        // Verify the customer was created and has the correct data
+        $customer = $this->customerRepository->get('test@magento.com');
+        $this->assertEquals('Test', $customer->getFirstname());
+        $this->assertEquals('Magento', $customer->getLastname());
+        $this->assertEquals('Test Store View', $customer->getCreatedIn());
+
+        $store = $this->storeRepository->getById($customer->getStoreId());
+        $this->assertEquals('test_store_view', $store->getCode());
+
+        /** @var TransportBuilderMock $transportBuilderMock */
+        $transportBuilderMock = $this->objectManager->get(TransportBuilderMock::class);
+        $sentMessage = $transportBuilderMock->getSentMessage();
+
+        // Verify an email was dispatched to the correct user
+        $this->assertNotNull($sentMessage);
+        $this->assertEquals('Test Magento', $sentMessage->getTo()[0]->getName());
+        $this->assertEquals('test@magento.com', $sentMessage->getTo()[0]->getEmail());
+
+        // Assert the email contains the expected content
+        $this->assertEquals('Welcome to Test Group', $sentMessage->getSubject());
+        $messageRaw = $sentMessage->getBody()->getParts()[0]->getRawContent();
+        $this->assertStringContainsString('Welcome to Test Group.', $messageRaw);
+    }
+
+    /**
+     * Test that creating a customer on an alternative store sends an email in the translated language
+     *
+     * @magentoDataFixture Magento/CustomerGraphQl/_files/website_store_with_store_view.php
+     * @magentoConfigFixture test_store_view_store general/locale/code fr_FR
+     * @magentoComponentsDir Magento/CustomerGraphQl/_files
+     */
+    public function testCreateCustomerForStoreSendsTranslatedEmail()
+    {
+        $query
+            = <<<QUERY
+mutation createAccount {
+    createCustomer(
+        input: {
+            email: "test@magento.com"
+            firstname: "Test"
+            lastname: "Magento"
+            password: "T3stP4assw0rd"
+            is_subscribed: false
+        }
+    ) {
+        customer {
+            id
+        }
+    }
+}
+QUERY;
+
+        $response = $this->graphQlRequest->send(
+            $query,
+            [],
+            '',
+            [
+                'Store' => 'test_store_view'
             ]
         );
         $responseData = $this->json->unserialize($response->getContent());
@@ -153,10 +216,10 @@ public function testCreateCustomerForStoreSendsEmail()
         $customer = $this->customerRepository->get('test@magento.com');
         $this->assertEquals('Test', $customer->getFirstname());
         $this->assertEquals('Magento', $customer->getLastname());
-        $this->assertEquals('Fixture Second Store', $customer->getCreatedIn());
+        $this->assertEquals('Test Store View', $customer->getCreatedIn());
 
         $store = $this->storeRepository->getById($customer->getStoreId());
-        $this->assertEquals('fixture_second_store', $store->getCode());
+        $this->assertEquals('test_store_view', $store->getCode());
 
         /** @var TransportBuilderMock $transportBuilderMock */
         $transportBuilderMock = $this->objectManager->get(TransportBuilderMock::class);
@@ -168,8 +231,8 @@ public function testCreateCustomerForStoreSendsEmail()
         $this->assertEquals('test@magento.com', $sentMessage->getTo()[0]->getEmail());
 
         // Assert the email contains the expected content
-        $this->assertEquals('Welcome to second store group', $sentMessage->getSubject());
+        $this->assertEquals('Bienvenue sur Test Group.', $sentMessage->getSubject());
         $messageRaw = $sentMessage->getBody()->getParts()[0]->getRawContent();
-        $this->assertStringContainsString('Welcome to second store group.', $messageRaw);
+        $this->assertStringContainsString('Bienvenue sur Test Group.', $messageRaw);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/CustomerGraphQl/_files/french/fr_fr/1.csv b/dev/tests/integration/testsuite/Magento/CustomerGraphQl/_files/french/fr_fr/1.csv
new file mode 100644
index 0000000000000..4d4f9c48f7d40
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CustomerGraphQl/_files/french/fr_fr/1.csv
@@ -0,0 +1,2 @@
+"Welcome to %store_name","Bienvenue sur %store_name"
+"Welcome to %store_name.","Bienvenue sur %store_name."
diff --git a/dev/tests/integration/testsuite/Magento/CustomerGraphQl/_files/french/fr_fr/language.xml b/dev/tests/integration/testsuite/Magento/CustomerGraphQl/_files/french/fr_fr/language.xml
new file mode 100644
index 0000000000000..9926a71910ebe
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CustomerGraphQl/_files/french/fr_fr/language.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!--
+/**
+* Copyright © Magento, Inc. All rights reserved.
+* See COPYING.txt for license details.
+*/
+-->
+<language xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:App/Language/package.xsd">
+    <code>fr_FR</code>
+    <vendor>french</vendor>
+    <package>fr_fr</package>
+    <sort_order>0</sort_order>
+</language>
diff --git a/dev/tests/integration/testsuite/Magento/CustomerGraphQl/_files/french/fr_fr/registration.php b/dev/tests/integration/testsuite/Magento/CustomerGraphQl/_files/french/fr_fr/registration.php
new file mode 100644
index 0000000000000..785cda484e889
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CustomerGraphQl/_files/french/fr_fr/registration.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::LANGUAGE, 'french', __DIR__);
diff --git a/dev/tests/integration/testsuite/Magento/CustomerGraphQl/_files/website_store_with_store_view.php b/dev/tests/integration/testsuite/Magento/CustomerGraphQl/_files/website_store_with_store_view.php
new file mode 100644
index 0000000000000..7407c1e4e9d09
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CustomerGraphQl/_files/website_store_with_store_view.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Store\Api\Data\GroupInterface;
+use Magento\Store\Api\Data\GroupInterfaceFactory;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Api\Data\StoreInterfaceFactory;
+use Magento\Store\Api\Data\WebsiteInterface;
+use Magento\Store\Api\Data\WebsiteInterfaceFactory;
+use Magento\Store\Model\ResourceModel\Group as GroupResource;
+use Magento\Store\Model\ResourceModel\Store as StoreResource;
+use Magento\Store\Model\ResourceModel\Website as WebsiteResource;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var StoreManagerInterface $storeManager */
+$storeManager = $objectManager->get(StoreManagerInterface::class);
+/** @var WebsiteResource $websiteResource */
+$websiteResource = $objectManager->get(WebsiteResource::class);
+/** @var StoreResource $storeResource */
+$storeResource = $objectManager->get(StoreResource::class);
+/** @var GroupResource $groupResource */
+$groupResource = $objectManager->get(GroupResource::class);
+/** @var WebsiteInterface $website */
+$website = $objectManager->get(WebsiteInterfaceFactory::class)->create();
+$website->setCode('test_website')->setName('Test Website');
+$websiteResource->save($website);
+/** @var GroupInterface $storeGroup */
+$storeGroup = $objectManager->get(GroupInterfaceFactory::class)->create();
+$storeGroup->setCode('test_group')
+    ->setName('Test Group')
+    ->setWebsite($website);
+$groupResource->save($storeGroup);
+/* Refresh stores memory cache */
+$storeManager->reinitStores();
+
+/** @var StoreInterface $store */
+$store = $objectManager->get(StoreInterfaceFactory::class)->create();
+$store->setCode('test_store_view')
+    ->setWebsiteId($website->getId())
+    ->setGroupId($storeGroup->getId())
+    ->setName('Test Store View')
+    ->setSortOrder(10)
+    ->setIsActive(1);
+$storeResource->save($store);
diff --git a/dev/tests/integration/testsuite/Magento/CustomerGraphQl/_files/website_store_with_store_view_rollback.php b/dev/tests/integration/testsuite/Magento/CustomerGraphQl/_files/website_store_with_store_view_rollback.php
new file mode 100644
index 0000000000000..29f7fbd56c402
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CustomerGraphQl/_files/website_store_with_store_view_rollback.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Registry;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Api\Data\StoreInterfaceFactory;
+use Magento\Store\Api\Data\WebsiteInterface;
+use Magento\Store\Api\Data\WebsiteInterfaceFactory;
+use Magento\Store\Model\ResourceModel\Store as StoreResource;
+use Magento\Store\Model\ResourceModel\Website as WebsiteResource;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var WebsiteResource $websiteResource */
+$websiteResource = $objectManager->get(WebsiteResource::class);
+/** @var StoreResource $storeResource */
+$storeResource = $objectManager->get(StoreResource::class);
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+/** @var WebsiteInterface $website */
+$website = $objectManager->get(WebsiteInterfaceFactory::class)->create();
+$websiteResource->load($website, 'test_website', 'code');
+if ($website->getId()) {
+    $websiteResource->delete($website);
+}
+/** @var StoreInterface $store */
+$store = $objectManager->get(StoreInterfaceFactory::class)->create();
+$storeResource->load($store, 'test_store_view', 'code');
+if ($store->getId()) {
+    $storeResource->delete($store);
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);

From 24b3dfe36d2ddea661c8f8e56d3b7195ef321edb Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Thu, 13 Aug 2020 13:19:22 -0500
Subject: [PATCH 1490/1718] MC-36456: union implementation

---
 app/code/Magento/GraphQl/etc/schema.graphqls              | 4 +++-
 .../Argument/SearchCriteria/ArgumentApplier/Filter.php    | 2 +-
 .../Argument/SearchCriteria/ArgumentApplier/Sort.php      | 2 +-
 .../Type/Output/ElementMapper/Formatter/Interfaces.php    | 2 +-
 .../Type/Output/ElementMapper/Formatter/ResolveType.php   | 2 +-
 .../Schema/Type/Output/ElementMapper/Formatter/Unions.php | 2 +-
 .../Type/Output/ElementMapper/FormatterComposite.php      | 4 ++--
 .../Framework/GraphQlSchemaStitching/GraphQlReader.php    | 2 +-
 .../GraphQlReader/Reader/EnumType.php                     | 2 +-
 .../GraphQlReader/Reader/InputObjectType.php              | 2 +-
 .../GraphQlReader/Reader/InterfaceType.php                | 2 +-
 .../GraphQlReader/Reader/ObjectType.php                   | 2 +-
 .../GraphQlReader/Reader/UnionType.php                    | 8 ++++----
 .../GraphQlReader/TypeReaderComposite.php                 | 2 +-
 14 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/app/code/Magento/GraphQl/etc/schema.graphqls b/app/code/Magento/GraphQl/etc/schema.graphqls
index 035ec98fa06e6..39596b9d00599 100644
--- a/app/code/Magento/GraphQl/etc/schema.graphqls
+++ b/app/code/Magento/GraphQl/etc/schema.graphqls
@@ -35,7 +35,9 @@ directive @resolver(class: String="") on QUERY
     | INPUT_OBJECT
     | INPUT_FIELD_DEFINITION
 
-directive @typeResolver(class: String="") on INTERFACE | OBJECT | UNION
+directive @typeResolver(class: String="") on UNION
+    | INTERFACE
+    | OBJECT
 
 directive @cache(cacheIdentity: String="" cacheable: Boolean=true) on QUERY
 
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/ArgumentApplier/Filter.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/ArgumentApplier/Filter.php
index 0e5feeba3bade..5ec80b1d4692c 100644
--- a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/ArgumentApplier/Filter.php
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/ArgumentApplier/Filter.php
@@ -51,7 +51,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function applyArgument(
         SearchCriteriaInterface $searchCriteria,
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/ArgumentApplier/Sort.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/ArgumentApplier/Sort.php
index 6ecb1896d685a..d312837e41686 100644
--- a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/ArgumentApplier/Sort.php
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/Argument/SearchCriteria/ArgumentApplier/Sort.php
@@ -33,7 +33,7 @@ public function __construct(SortOrderBuilder $sortOrderBuilder = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function applyArgument(
         SearchCriteriaInterface $searchCriteria,
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Interfaces.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Interfaces.php
index 1f62384d181f4..761ba68e44521 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Interfaces.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Interfaces.php
@@ -32,7 +32,7 @@ public function __construct(OutputMapper $outputMapper)
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function format(ConfigElementInterface $configElement, OutputTypeInterface $outputType) : array
     {
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/ResolveType.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/ResolveType.php
index 529cdf4467f1d..8077052d7dd1f 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/ResolveType.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/ResolveType.php
@@ -33,7 +33,7 @@ public function __construct(ObjectManagerInterface $objectManager)
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function format(ConfigElementInterface $configElement, OutputTypeInterface $outputType) : array
     {
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Unions.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Unions.php
index 450ce5ac7e494..e64c45168f4c7 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Unions.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Unions.php
@@ -32,7 +32,7 @@ public function __construct(OutputMapper $outputMapper)
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function format(ConfigElementInterface $configElement, OutputTypeInterface $outputType) : array
     {
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterComposite.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterComposite.php
index 83508722c339d..5be5f8760c207 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterComposite.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterComposite.php
@@ -11,7 +11,7 @@
 use Magento\Framework\GraphQl\Schema\Type\OutputTypeInterface;
 
 /**
- * {@inheritdoc}
+ * @inheritDoc
  */
 class FormatterComposite implements FormatterInterface
 {
@@ -29,7 +29,7 @@ public function __construct(array $formatters)
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      */
     public function format(ConfigElementInterface $configElement, OutputTypeInterface $outputType) : array
     {
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
index 6d3452b009815..d29777321d77c 100644
--- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
@@ -71,7 +71,7 @@ public function __construct(
     }
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      *
      * @param string|null $scope
      * @return array
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/EnumType.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/EnumType.php
index e4dec7afdab0a..a0da1038efb0f 100644
--- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/EnumType.php
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/EnumType.php
@@ -30,7 +30,7 @@ public function __construct(
     }
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
     public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
     {
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InputObjectType.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InputObjectType.php
index 38159fac03b3b..9e79b4025234b 100644
--- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InputObjectType.php
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InputObjectType.php
@@ -49,7 +49,7 @@ public function __construct(
     }
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
     public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
     {
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InterfaceType.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InterfaceType.php
index baadb4be61cf2..c1c716632d90b 100644
--- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InterfaceType.php
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InterfaceType.php
@@ -49,7 +49,7 @@ public function __construct(
     }
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
     public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
     {
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/ObjectType.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/ObjectType.php
index ba8e46dd60557..e174cfd954394 100644
--- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/ObjectType.php
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/ObjectType.php
@@ -69,7 +69,7 @@ public function __construct(
     }
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
     public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
     {
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/UnionType.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/UnionType.php
index d046b346aa4c1..5da107b12e6c2 100644
--- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/UnionType.php
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/UnionType.php
@@ -49,7 +49,7 @@ public function __construct(
     }
 
     /**
-     * @inheritdoc
+     * @inheritDoc
      */
     public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
     {
@@ -62,9 +62,9 @@ public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
                 'types' => $types,
             ];
 
-            $unionResolveType = $this->getUnionTypeResolver($typeMeta);
-            if (!empty($unionResolveType)) {
-                $result['typeResolver'] = $unionResolveType;
+            $unionTypeResolver = $this->getUnionTypeResolver($typeMeta);
+            if (!empty($unionTypeResolver)) {
+                $result['typeResolver'] = $unionTypeResolver;
             }
 
 
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/TypeReaderComposite.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/TypeReaderComposite.php
index e9b899bb2bb5b..614c1e3a743a0 100644
--- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/TypeReaderComposite.php
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/TypeReaderComposite.php
@@ -25,7 +25,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
     {

From 19ba821dedb77b682ecd3b72ef4385496a4f5c2f Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Thu, 13 Aug 2020 16:15:41 -0500
Subject: [PATCH 1491/1718] MC-36456: union implementation

---
 .../Framework/GraphQl/Config/Element/UnionFactory.php  | 10 +++++-----
 .../GraphQl/Config/Element/UnionInterface.php          |  2 +-
 .../Output/ElementMapper/Formatter/ResolveType.php     |  7 +------
 .../Type/Output/ElementMapper/FormatterComposite.php   |  7 ++++---
 .../GraphQl/Schema/Type/Output/OutputMapper.php        |  2 +-
 .../GraphQl/Schema/Type/Output/OutputUnionObject.php   |  2 +-
 .../Framework/GraphQlSchemaStitching/GraphQlReader.php |  8 ++++----
 .../GraphQlReader/Reader/EnumType.php                  |  4 +++-
 .../GraphQlReader/Reader/InputObjectType.php           |  4 +++-
 .../GraphQlReader/Reader/InterfaceType.php             |  4 +++-
 .../GraphQlReader/Reader/ObjectType.php                |  4 +++-
 .../GraphQlReader/Reader/UnionType.php                 |  7 ++++---
 12 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionFactory.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionFactory.php
index d26538b576fd3..02d0a60064db6 100644
--- a/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionFactory.php
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionFactory.php
@@ -31,7 +31,7 @@ public function __construct(
     }
 
     /**
-     * Instantiate an object representing 'interface' GraphQL config element.
+     * Instantiate an object representing 'union' GraphQL config element.
      *
      * @param array $data
      * @return ConfigElementInterface
@@ -42,11 +42,11 @@ public function createFromConfigData(array $data): ConfigElementInterface
     }
 
     /**
-     * Create interface object based off array of configured GraphQL Output/InputInterface.
+     * Create union object based off array of configured GraphQL.
      *
-     * Interface data must contain name, type resolver, and field definitions. The type resolver should point to an
-     * implementation of the TypeResolverInterface that decides what concrete GraphQL type to output. Description is
-     * the only optional field.
+     * Union data must contain name, type resolver, and possible concrete types definitions
+     * The type resolver should point to an implementation of the TypeResolverInterface
+     * that decides what concrete GraphQL type to output. Description is the only optional field.
      *
      * @param array $unionData
      * @param array $types
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionInterface.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionInterface.php
index 85053325f193d..f5d0f68b4b8c8 100644
--- a/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionInterface.php
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionInterface.php
@@ -10,7 +10,7 @@
 use Magento\Framework\GraphQl\Config\ConfigElementInterface;
 
 /**
- * Defines contracts for return type data as GraphQL objects.
+ * Defines the contract for the union configuration data type.
  */
 interface UnionInterface extends ConfigElementInterface
 {
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/ResolveType.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/ResolveType.php
index 8077052d7dd1f..553e8fe40efc2 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/ResolveType.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/ResolveType.php
@@ -38,12 +38,7 @@ public function __construct(ObjectManagerInterface $objectManager)
     public function format(ConfigElementInterface $configElement, OutputTypeInterface $outputType) : array
     {
         $config = [];
-        if ($configElement instanceof InterfaceType) {
-            $typeResolver = $this->objectManager->create($configElement->getTypeResolver());
-            $config['resolveType'] = function ($value) use ($typeResolver) {
-                return $typeResolver->resolveType($value);
-            };
-        } elseif ($configElement instanceof UnionType) {
+        if ($configElement instanceof InterfaceType || $configElement instanceof UnionType) {
             $typeResolver = $this->objectManager->create($configElement->getTypeResolver());
             $config['resolveType'] = function ($value) use ($typeResolver) {
                 return $typeResolver->resolveType($value);
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterComposite.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterComposite.php
index 5be5f8760c207..74ea1467939f4 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterComposite.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterComposite.php
@@ -33,14 +33,15 @@ public function __construct(array $formatters)
      */
     public function format(ConfigElementInterface $configElement, OutputTypeInterface $outputType) : array
     {
-        $config = [
+        $defaultConfig = [
             'name' => $configElement->getName(),
             'description' => $configElement->getDescription()
         ];
+        $formattedConfig = [];
         foreach ($this->formatters as $formatter) {
-            $config = array_merge($config, $formatter->format($configElement, $outputType));
+            $formattedConfig[] = $formatter->format($configElement, $outputType);
         }
 
-        return $config;
+        return  array_merge($defaultConfig,...$formattedConfig);
     }
 }
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputMapper.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputMapper.php
index f718cd4e9e04c..afe0d84de26f8 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputMapper.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputMapper.php
@@ -13,7 +13,7 @@
 use Magento\Framework\Phrase;
 
 /**
- * Map type names to their output type/interface/enum classes.
+ * Map type names to their output type/interface/union/enum classes.
  */
 class OutputMapper
 {
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputUnionObject.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputUnionObject.php
index 3c92004c33c90..a63b7b7417527 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputUnionObject.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/OutputUnionObject.php
@@ -11,7 +11,7 @@
 use Magento\Framework\GraphQl\Schema\Type\UnionType;
 
 /**
- * 'union' type compatible with GraphQL schema generator.
+ * The 'union' type compatible with GraphQL schema generator.
  */
 class OutputUnionObject extends UnionType
 {
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
index d29777321d77c..34913ae949f28 100644
--- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
@@ -11,6 +11,7 @@
 use Magento\Framework\Config\FileResolverInterface;
 use Magento\Framework\Config\ReaderInterface;
 use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\TypeMetaReaderInterface as TypeReaderComposite;
+use Magento\Framework\GraphQlSchemaStitching\GraphQlReader\Reader\InterfaceType;
 
 /**
  * Reads *.graphqls files from modules and combines the results as array to be used with a library to configure objects
@@ -21,10 +22,9 @@ class GraphQlReader implements ReaderInterface
 
     public const GRAPHQL_SCHEMA_FILE = 'schema.graphqls';
 
+    /** @deprecated */
     public const GRAPHQL_INTERFACE = 'graphql_interface';
 
-    public const GRAPHQL_UNION = 'graphql_union';
-
     /**
      * File locator
      *
@@ -180,7 +180,7 @@ private function parseTypes(string $graphQlSchemaContent) : array
     private function copyInterfaceFieldsToConcreteTypes(array $source): array
     {
         foreach ($source as $interface) {
-            if ($interface['type'] ?? '' == 'graphql_interface') {
+            if ($interface['type'] ?? '' == InterfaceType::GRAPHQL_INTERFACE) {
                 foreach ($source as $typeName => $type) {
                     if (isset($type['implements'])
                         && isset($type['implements'][$interface['name']])
@@ -332,7 +332,7 @@ private function addModuleNameToTypes(array $source, string $filePath): array
     {
         foreach ($source as $typeName => $type) {
             if ((!isset($type['module']))
-                && (($type['type'] ?? '' === self::GRAPHQL_INTERFACE && isset($type['typeResolver']))
+                && (($type['type'] ?? '' === InterfaceType::GRAPHQL_INTERFACE && isset($type['typeResolver']))
                     || isset($type['implements'])
                 )
             ) {
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/EnumType.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/EnumType.php
index a0da1038efb0f..c6e0481c7490e 100644
--- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/EnumType.php
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/EnumType.php
@@ -15,6 +15,8 @@
  */
 class EnumType implements TypeMetaReaderInterface
 {
+    public const GRAPHQL_ENUM = 'graphql_enum';
+
     /**
      * @var DocReader
      */
@@ -37,7 +39,7 @@ public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
         if ($typeMeta instanceof \GraphQL\Type\Definition\EnumType) {
             $result = [
                 'name' => $typeMeta->name,
-                'type' => 'graphql_enum',
+                'type' => self::GRAPHQL_ENUM,
                 'items' => [] // Populated later
             ];
             foreach ($typeMeta->getValues() as $enumValueMeta) {
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InputObjectType.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InputObjectType.php
index 9e79b4025234b..2108a04d8a9ed 100644
--- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InputObjectType.php
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InputObjectType.php
@@ -17,6 +17,8 @@
  */
 class InputObjectType implements TypeMetaReaderInterface
 {
+    public const GRAPHQL_INPUT = 'graphql_input';
+
     /**
      * @var TypeMetaWrapperReader
      */
@@ -57,7 +59,7 @@ public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
             $typeName = $typeMeta->name;
             $result = [
                 'name' => $typeName,
-                'type' => 'graphql_input',
+                'type' => self::GRAPHQL_INPUT,
                 'fields' => [] // Populated later
             ];
             $fields = $typeMeta->getFields();
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InterfaceType.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InterfaceType.php
index c1c716632d90b..76550469d409e 100644
--- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InterfaceType.php
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/InterfaceType.php
@@ -17,6 +17,8 @@
  */
 class InterfaceType implements TypeMetaReaderInterface
 {
+    public const GRAPHQL_INTERFACE = 'graphql_interface';
+
     /**
      * @var FieldMetaReader
      */
@@ -57,7 +59,7 @@ public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
             $typeName = $typeMeta->name;
             $result = [
                 'name' => $typeName,
-                'type' => 'graphql_interface',
+                'type' => self::GRAPHQL_INTERFACE,
                 'fields' => []
             ];
 
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/ObjectType.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/ObjectType.php
index e174cfd954394..3ad6d69eb5c9c 100644
--- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/ObjectType.php
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/ObjectType.php
@@ -19,6 +19,8 @@
  */
 class ObjectType implements TypeMetaReaderInterface
 {
+    public const GRAPHQL_TYPE = 'graphql_type';
+
     /**
      * @var FieldMetaReader
      */
@@ -77,7 +79,7 @@ public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
             $typeName = $typeMeta->name;
             $result = [
                 'name' => $typeName,
-                'type' => 'graphql_type',
+                'type' => self::GRAPHQL_TYPE,
                 'fields' => [], // Populated later
             ];
 
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/UnionType.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/UnionType.php
index 5da107b12e6c2..8f4ce8f94aba6 100644
--- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/UnionType.php
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/UnionType.php
@@ -17,6 +17,8 @@
  */
 class UnionType implements TypeMetaReaderInterface
 {
+    public const GRAPHQL_UNION = 'graphql_union';
+
     /**
      * @var FieldMetaReader
      */
@@ -58,7 +60,7 @@ public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
             $types = $typeMeta->getTypes();
             $result = [
                 'name' => $typeName,
-                'type' => 'graphql_union',
+                'type' => self::GRAPHQL_UNION,
                 'types' => $types,
             ];
 
@@ -67,7 +69,6 @@ public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
                 $result['typeResolver'] = $unionTypeResolver;
             }
 
-
             if ($this->docReader->read($typeMeta->astNode->directives)) {
                 $result['description'] = $this->docReader->read($typeMeta->astNode->directives);
             }
@@ -79,7 +80,7 @@ public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
     }
 
     /**
-     * Retrieve the interface type resolver if it exists from the meta data
+     * Retrieve the union type resolver if it exists from the meta data
      *
      * @param \GraphQL\Type\Definition\UnionType $unionTypeMeta
      * @return string

From 3f304d9b78024ac7761f1e8b4539ae804f6ebc64 Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Fri, 14 Aug 2020 00:37:41 +0300
Subject: [PATCH 1492/1718] Added testCaseId to MFTF.

---
 app/code/Magento/Rss/Test/Mftf/Test/RssListTest.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Rss/Test/Mftf/Test/RssListTest.xml b/app/code/Magento/Rss/Test/Mftf/Test/RssListTest.xml
index c81caf181fc40..c5eebb5171523 100644
--- a/app/code/Magento/Rss/Test/Mftf/Test/RssListTest.xml
+++ b/app/code/Magento/Rss/Test/Mftf/Test/RssListTest.xml
@@ -14,7 +14,8 @@
             <stories value="RSS Feed available to view"/>
             <title value="RSS Feed"/>
             <description value="View selected RSS feed by link."/>
-            <severity value="MAJOR"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-36686"/>
         </annotations>
         <before>
             <createData entity="SimpleProductWithNewFromDate" stepKey="createProduct"/>

From 745a5a69c5185e844917333ffcc03002b89784c5 Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Fri, 14 Aug 2020 00:39:35 +0300
Subject: [PATCH 1493/1718] Added testCaseId for MFTF

---
 app/code/Magento/Rss/Test/Mftf/Test/RssListTest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Rss/Test/Mftf/Test/RssListTest.xml b/app/code/Magento/Rss/Test/Mftf/Test/RssListTest.xml
index c5eebb5171523..a9f8e96c0bc1c 100644
--- a/app/code/Magento/Rss/Test/Mftf/Test/RssListTest.xml
+++ b/app/code/Magento/Rss/Test/Mftf/Test/RssListTest.xml
@@ -14,8 +14,8 @@
             <stories value="RSS Feed available to view"/>
             <title value="RSS Feed"/>
             <description value="View selected RSS feed by link."/>
-            <severity value="AVERAGE"/>
             <testCaseId value="MC-36686"/>
+            <severity value="AVERAGE"/>
         </annotations>
         <before>
             <createData entity="SimpleProductWithNewFromDate" stepKey="createProduct"/>

From c531be91fe2a19040564cff7b640df798bffbfdf Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Thu, 13 Aug 2020 17:48:38 -0500
Subject: [PATCH 1494/1718] MC-36456: union implementation

---
 .../Framework/GraphQl/Config/Element/UnionInterface.php   | 2 +-
 .../Framework/GraphQl/Config/Element/UnionType.php        | 8 ++++----
 .../Schema/Type/Output/ElementMapper/Formatter/Unions.php | 2 +-
 .../Type/Output/ElementMapper/FormatterComposite.php      | 4 ++--
 .../Type/Output/ElementMapper/FormatterInterface.php      | 2 +-
 .../GraphQlReader/Reader/UnionType.php                    | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionInterface.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionInterface.php
index f5d0f68b4b8c8..2d557e6dc5b84 100644
--- a/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionInterface.php
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionInterface.php
@@ -19,5 +19,5 @@ interface UnionInterface extends ConfigElementInterface
      *
      * @return Type[]
      */
-    public function getTypes() : array;
+    public function getTypes(): array;
 }
diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionType.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionType.php
index d386a59a9ec6a..5b27d03360efc 100644
--- a/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionType.php
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/UnionType.php
@@ -55,7 +55,7 @@ public function __construct(
      *
      * @return string
      */
-    public function getName() : string
+    public function getName(): string
     {
         return $this->name;
     }
@@ -65,7 +65,7 @@ public function getName() : string
      *
      * @return string[]
      */
-    public function getTypes() : array
+    public function getTypes(): array
     {
         return $this->types;
     }
@@ -75,7 +75,7 @@ public function getTypes() : array
      *
      * @return string
      */
-    public function getTypeResolver()
+    public function getTypeResolver(): string
     {
         return $this->typeResolver;
     }
@@ -85,7 +85,7 @@ public function getTypeResolver()
      *
      * @return string
      */
-    public function getDescription() : string
+    public function getDescription(): string
     {
         return $this->description;
     }
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Unions.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Unions.php
index e64c45168f4c7..75b6a58790a09 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Unions.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Unions.php
@@ -34,7 +34,7 @@ public function __construct(OutputMapper $outputMapper)
     /**
      * @inheritDoc
      */
-    public function format(ConfigElementInterface $configElement, OutputTypeInterface $outputType) : array
+    public function format(ConfigElementInterface $configElement, OutputTypeInterface $outputType): array
     {
         $config = [];
         if ($configElement instanceof UnionType && !empty($configElement->getTypes())) {
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterComposite.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterComposite.php
index 74ea1467939f4..99ef725afe32f 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterComposite.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterComposite.php
@@ -31,7 +31,7 @@ public function __construct(array $formatters)
     /**
      * @inheritDoc
      */
-    public function format(ConfigElementInterface $configElement, OutputTypeInterface $outputType) : array
+    public function format(ConfigElementInterface $configElement, OutputTypeInterface $outputType): array
     {
         $defaultConfig = [
             'name' => $configElement->getName(),
@@ -42,6 +42,6 @@ public function format(ConfigElementInterface $configElement, OutputTypeInterfac
             $formattedConfig[] = $formatter->format($configElement, $outputType);
         }
 
-        return  array_merge($defaultConfig,...$formattedConfig);
+        return  array_merge($defaultConfig, ...$formattedConfig);
     }
 }
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterInterface.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterInterface.php
index 749a7690faaba..a99237aa8843a 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterInterface.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterInterface.php
@@ -22,5 +22,5 @@ interface FormatterInterface
      * @param OutputTypeInterface $outputType
      * @return array
      */
-    public function format(ConfigElementInterface $configElement, OutputTypeInterface $outputType) : array;
+    public function format(ConfigElementInterface $configElement, OutputTypeInterface $outputType): array;
 }
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/UnionType.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/UnionType.php
index 8f4ce8f94aba6..4280ccd17adb4 100644
--- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/UnionType.php
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/UnionType.php
@@ -53,7 +53,7 @@ public function __construct(
     /**
      * @inheritDoc
      */
-    public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
+    public function read(\GraphQL\Type\Definition\Type $typeMeta): array
     {
         if ($typeMeta instanceof \GraphQL\Type\Definition\UnionType) {
             $typeName = $typeMeta->name;
@@ -85,7 +85,7 @@ public function read(\GraphQL\Type\Definition\Type $typeMeta) : array
      * @param \GraphQL\Type\Definition\UnionType $unionTypeMeta
      * @return string
      */
-    private function getUnionTypeResolver(\GraphQL\Type\Definition\UnionType $unionTypeMeta) : string
+    private function getUnionTypeResolver(\GraphQL\Type\Definition\UnionType $unionTypeMeta): string
     {
         /** @var \GraphQL\Language\AST\NodeList $directives */
         $directives = $unionTypeMeta->astNode->directives;

From 42ac2e8fb2c9438ff656e3962f7395cb601fadcd Mon Sep 17 00:00:00 2001
From: Leonid Poluianov <poluyano@adobe.com>
Date: Wed, 12 Aug 2020 13:21:13 -0500
Subject: [PATCH 1495/1718] MC-36671: Extend catalog GraphQl tests coverage

---
 .../TestCase/GraphQlAbstract.php              |  57 ++++
 .../TestFramework/WebApiApplication.php       |  15 +-
 .../BundleProductMultipleOptionsTest.php      | 306 ++++++++++++++++++
 .../GraphQl/Catalog/CategoryAnchorTest.php    | 158 +++++++++
 .../GraphQl/Catalog/CategoryEnabledTest.php   | 154 +++++++++
 .../Catalog/CategorySpecificFieldsTest.php    | 141 ++++++++
 .../Catalog/ProductSearchPriceFilterTest.php  | 270 ++++++++++++++++
 .../GraphQl/Catalog/ProductViewTest.php       |  16 +-
 .../Catalog/ReadCategoryAfterDeleteTest.php   | 115 +++++++
 ...nfigurableProductMultipleStoreViewTest.php |  69 ++++
 .../ConfigurableProductOptionsTest.php        | 243 ++++++++++++++
 .../GroupedProduct/ProductViewTest.php        | 149 +++++++++
 .../Magento/GraphQl/Store/StoreSaveTest.php   | 116 +++++++
 .../Magento/TestFramework/Application.php     |  14 +-
 .../Catalog/_files/category_anchor.php        |  95 ++++++
 .../_files/category_anchor_rollback.php       |  51 +++
 .../_files/category_enabled_for_store.php     |  72 +++++
 .../category_enabled_for_store_rollback.php   |  47 +++
 .../_files/category_specific_fields.php       |  41 +++
 .../category_specific_fields_rollback.php     |  30 ++
 .../_files/products_with_different_price.php  |  59 ++++
 ...products_with_different_price_rollback.php |  38 +++
 .../_files/configurable_attribute_second.php  |  72 +++++
 ...configurable_attribute_second_rollback.php |  28 ++
 ...figurable_products_with_two_attributes.php | 211 ++++++++++++
 ..._products_with_two_attributes_rollback.php |  43 +++
 ...duct_configurable_in_multiple_websites.php | 152 +++++++++
 ...igurable_in_multiple_websites_rollback.php |  42 +++
 .../product_grouped_in_multiple_websites.php  |  89 +++++
 ..._grouped_in_multiple_websites_rollback.php |  39 +++
 ...uct_grouped_items_in_multiple_websites.php |  90 ++++++
 ...ed_items_in_multiple_websites_rollback.php |  38 +++
 32 files changed, 3044 insertions(+), 16 deletions(-)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/BundleProductMultipleOptionsTest.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryAnchorTest.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryEnabledTest.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategorySpecificFieldsTest.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchPriceFilterTest.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ReadCategoryAfterDeleteTest.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductMultipleStoreViewTest.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductOptionsTest.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/GroupedProduct/ProductViewTest.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreSaveTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/category_anchor.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/category_anchor_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/category_enabled_for_store.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/category_enabled_for_store_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/category_specific_fields.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/category_specific_fields_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_different_price.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_different_price_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_second.php
 create mode 100644 dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_second_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products_with_two_attributes.php
 create mode 100644 dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products_with_two_attributes_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_in_multiple_websites.php
 create mode 100644 dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_in_multiple_websites_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_in_multiple_websites.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_in_multiple_websites_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_items_in_multiple_websites.php
 create mode 100644 dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_items_in_multiple_websites_rollback.php

diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
index 3de18a932f2cd..7f67c8c9ca8df 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
@@ -184,4 +184,61 @@ protected function assertResponseFields($actualResponse, $assertionMap)
             );
         }
     }
+
+    /**
+     * Compare arrays recursively regardless of nesting.
+     *
+     * Can compare arrays that have both one level and n-level nesting.
+     * ```
+     *  [
+     * 'products' => [
+     *      'items' => [
+     *      [
+     *          'sku'       => 'bundle-product',
+     *          'type_id'   => 'bundle',
+     *          'items'     => [
+     *          [
+     *              'title'     => 'Bundle Product Items',
+     *              'sku'       => 'bundle-product',
+     *              'options'   => [
+     *              [
+     *                  'price' => 2.75,
+     *                  'label' => 'Simple Product',
+     *                  'product' => [
+     *                      'name'    => 'Simple Product',
+     *                      'sku'     => 'simple',
+     *                  ]
+     *              ]
+     *          ]
+     *      ]
+     *  ];
+     * ```
+     *
+     * @param array $expected
+     * @param array $actual
+     * @return array
+     */
+    public function compareArraysRecursively(array $expected, array $actual): array
+    {
+        $diffResult = [];
+
+        foreach ($expected as $key => $value) {
+            if (array_key_exists($key, $actual)) {
+                if (is_array($value)) {
+                    $recursiveDiff = $this->compareArraysRecursively($value, $actual[$key]);
+                    if (!empty($recursiveDiff)) {
+                        $diffResult[$key] = $recursiveDiff;
+                    }
+                } else {
+                    if (!in_array($value, $actual, true)) {
+                        $diffResult[$key] = $value;
+                    }
+                }
+            } else {
+                $diffResult[$key] = $value;
+            }
+        }
+
+        return $diffResult;
+    }
 }
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/WebApiApplication.php b/dev/tests/api-functional/framework/Magento/TestFramework/WebApiApplication.php
index 992653a3a65d6..3c620e0edd6a7 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/WebApiApplication.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/WebApiApplication.php
@@ -13,7 +13,7 @@
 class WebApiApplication extends Application
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function run()
     {
@@ -24,7 +24,7 @@ public function run()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function install($cleanup)
     {
@@ -45,19 +45,18 @@ public function install($cleanup)
                     }
                     continue;
                 }
-                if (!empty($optionValue)) {
-                    $installCmd .= " --$optionName=%s";
-                    $installArgs[] = $optionValue;
-                }
+                $installCmd .= " --$optionName=%s";
+                $installArgs[] = $optionValue;
             }
             $this->_shell->execute($installCmd, $installArgs);
         }
     }
 
     /**
-     * Use the application as is
+     * @inheritdoc
      *
-     * {@inheritdoc}
+     * Return empty array of custom directories
+     * @return array
      */
     protected function getCustomDirs()
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/BundleProductMultipleOptionsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/BundleProductMultipleOptionsTest.php
new file mode 100644
index 0000000000000..3409b5e3af1af
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/BundleProductMultipleOptionsTest.php
@@ -0,0 +1,306 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Bundle;
+
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Bundle product with multiple options test.
+ */
+class BundleProductMultipleOptionsTest extends GraphQlAbstract
+{
+    /**
+     * @magentoApiDataFixture Magento/Bundle/_files/product_with_multiple_options.php
+     * @param array $bundleProductDataProvider
+     *
+     * @dataProvider getBundleProductDataProvider
+     * @throws \Exception
+     */
+    public function testBundleProductWithMultipleOptions(array $bundleProductDataProvider): void
+    {
+        $productSku = 'bundle-product';
+        $query
+            = <<<QUERY
+{
+    products(filter: {sku: {eq: "{$productSku}"}}) {
+        items {
+        sku
+        type_id
+        id
+        name
+        ... on BundleProduct {
+            dynamic_sku
+            dynamic_price
+            dynamic_weight
+            price_view
+            ship_bundle_items
+            items {
+                option_id
+                title
+                required
+                type
+                position
+                sku
+                options {
+                    id
+                    quantity
+                    position
+                    is_default
+                    price
+                    price_type
+                    can_change_quantity
+                    label
+                    product {
+                        id
+                        name
+                        sku
+                        type_id
+                    }
+                }
+            }
+        }
+    }
+}
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+        $this->assertBundleProduct($response, $bundleProductDataProvider);
+    }
+
+    /**
+     * Assert bundle product response.
+     *
+     * @param array $response
+     * @param array $bundleProductDataProvider
+     */
+    private function assertBundleProduct(array $response, array $bundleProductDataProvider): void
+    {
+        $this->assertNotEmpty($response['products']['items'], 'Precondition failed: "items" must not be empty');
+        $productItems = $response['products']['items'];
+
+        foreach ($bundleProductDataProvider as $key => $data) {
+            $diff = $this->compareArraysRecursively($data, $productItems[$key]);
+            self::assertEquals([], $diff, "Actual response doesn't equal to expected data");
+        }
+    }
+
+    /**
+     * Bundle product data provider.
+     *
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function getBundleProductDataProvider(): array
+    {
+        return [
+            'products' => [
+                'items' => [
+                    [
+                        'sku' => 'bundle-product',
+                        'type_id' => 'bundle',
+                        'name' => 'Bundle Product',
+                        'dynamic_sku' => true,
+                        'dynamic_price' => false,
+                        'dynamic_weight' => true,
+                        'price_view' => 'AS_LOW_AS',
+                        'ship_bundle_items' => 'TOGETHER',
+                        'items' => [
+                            [
+                                'title' => 'Option 1',
+                                'required' => true,
+                                'type' => 'select',
+                                'position' => 1,
+                                'sku' => 'bundle-product',
+                                'options' => [
+                                    [
+                                        'quantity' => 1,
+                                        'position' => 0,
+                                        'is_default' => false,
+                                        'price' => 0,
+                                        'price_type' => 'FIXED',
+                                        'can_change_quantity' => false,
+                                        'label' => 'Simple Product1',
+                                        'product' => [
+                                            'name' => 'Simple Product1',
+                                            'sku' => 'simple1',
+                                            'type_id' => 'simple',
+                                        ],
+                                    ],
+                                    [
+                                        'quantity' => 1,
+                                        'position' => 0,
+                                        'is_default' => false,
+                                        'price' => 0,
+                                        'price_type' => 'FIXED',
+                                        'can_change_quantity' => false,
+                                        'label' => 'Simple Product2',
+                                        'product' => [
+                                            'name' => 'Simple Product2',
+                                            'sku' => 'simple2',
+                                            'type_id' => 'simple',
+                                        ],
+                                    ],
+                                ],
+                            ],
+                            [
+                                'title' => 'Option 2',
+                                'required' => true,
+                                'type' => 'radio',
+                                'position' => 2,
+                                'sku' => 'bundle-product',
+                                'options' => [
+                                    [
+                                        'quantity' => 1,
+                                        'position' => 0,
+                                        'is_default' => false,
+                                        'price' => 0,
+                                        'price_type' => 'FIXED',
+                                        'can_change_quantity' => false,
+                                        'label' => 'Simple Product1',
+                                        'product' => [
+                                            'name' => 'Simple Product1',
+                                            'sku' => 'simple1',
+                                            'type_id' => 'simple',
+                                        ],
+                                    ],
+                                    [
+
+                                        'quantity' => 1,
+                                        'position' => 0,
+                                        'is_default' => false,
+                                        'price' => 0,
+                                        'price_type' => 'FIXED',
+                                        'can_change_quantity' => false,
+                                        'label' => 'Simple Product2',
+                                        'product' => [
+                                            'name' => 'Simple Product2',
+                                            'sku' => 'simple2',
+                                            'type_id' => 'simple',
+                                        ],
+                                    ],
+                                ],
+                            ],
+                            [
+                                'title' => 'Option 3',
+                                'required' => true,
+                                'type' => 'checkbox',
+                                'position' => 3,
+                                'sku' => 'bundle-product',
+                                'options' => [
+                                    [
+                                        'quantity' => 1,
+                                        'position' => 0,
+                                        'is_default' => false,
+                                        'price' => 0,
+                                        'price_type' => 'FIXED',
+                                        'can_change_quantity' => false,
+                                        'label' => 'Simple Product1',
+                                        'product' => [
+                                            'name' => 'Simple Product1',
+                                            'sku' => 'simple1',
+                                            'type_id' => 'simple',
+                                        ],
+                                    ],
+                                    [
+                                        'quantity' => 1,
+                                        'position' => 0,
+                                        'is_default' => false,
+                                        'price' => 0,
+                                        'price_type' => 'FIXED',
+                                        'can_change_quantity' => false,
+                                        'label' => 'Simple Product2',
+                                        'product' => [
+                                            'name' => 'Simple Product2',
+                                            'sku' => 'simple2',
+                                            'type_id' => 'simple',
+                                        ],
+                                    ],
+                                ],
+                            ],
+                            [
+                                'title' => 'Option 4',
+                                'required' => true,
+                                'type' => 'multi',
+                                'position' => 4,
+                                'sku' => 'bundle-product',
+                                'options' => [
+                                    [
+                                        'quantity' => 1,
+                                        'position' => 0,
+                                        'is_default' => false,
+                                        'price' => 0,
+                                        'price_type' => 'FIXED',
+                                        'can_change_quantity' => false,
+                                        'label' => 'Simple Product1',
+                                        'product' => [
+                                            'name' => 'Simple Product1',
+                                            'sku' => 'simple1',
+                                            'type_id' => 'simple',
+                                        ],
+                                    ],
+                                    [
+                                        'quantity' => 1,
+                                        'position' => 0,
+                                        'is_default' => false,
+                                        'price' => 0,
+                                        'price_type' => 'FIXED',
+                                        'can_change_quantity' => false,
+                                        'label' => 'Simple Product2',
+                                        'product' => [
+                                            'name' => 'Simple Product2',
+                                            'sku' => 'simple2',
+                                            'type_id' => 'simple',
+                                        ],
+                                    ],
+                                ],
+                            ],
+                            [
+                                'title' => 'Option 5',
+                                'required' => false,
+                                'type' => 'multi',
+                                'position' => 5,
+                                'sku' => 'bundle-product',
+                                'options' => [
+                                    [
+                                        'quantity' => 1,
+                                        'position' => 0,
+                                        'is_default' => false,
+                                        'price' => 0,
+                                        'price_type' => 'FIXED',
+                                        'can_change_quantity' => false,
+                                        'label' => 'Simple Product1',
+                                        'product' => [
+                                            'name' => 'Simple Product1',
+                                            'sku' => 'simple1',
+                                            'type_id' => 'simple',
+                                        ],
+                                    ],
+                                    [
+                                        'quantity' => 1,
+                                        'position' => 0,
+                                        'is_default' => false,
+                                        'price' => 0,
+                                        'price_type' => 'FIXED',
+                                        'can_change_quantity' => false,
+                                        'label' => 'Simple Product2',
+                                        'product' => [
+                                            'name' => 'Simple Product2',
+                                            'sku' => 'simple2',
+                                            'type_id' => 'simple',
+                                        ],
+                                    ],
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryAnchorTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryAnchorTest.php
new file mode 100644
index 0000000000000..66da162b4d46c
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryAnchorTest.php
@@ -0,0 +1,158 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Catalog;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test is categories anchor or not
+ *
+ * Preconditions:
+ *   Fixture with anchor and not-anchored categories created
+ * Steps:
+ *  Send Request:
+ *   query{
+ *    category(id: %categoryId%){
+ *     id
+ *     name
+ *     is_anchor
+ *     product_count
+ *     products(pageSize: 10, currentPage: 1){
+ *     items{
+ *     name
+ *     }
+ *    }
+ *   }
+ *  Expected response:
+ * {
+ *    "category": {
+ *       "id": %category1Id%,
+ *       "name": Category_Anchor,
+ *       "is_anchor": 1,
+ *       "product_count": 2,
+ *       "products": {
+ *         "items": [
+ *           {
+ *             "name": "Product1",
+ *             "name": "Product2"
+ *           }
+ *         ]
+ *      }
+ *   }
+ * }
+ */
+class CategoryAnchorTest extends GraphQlAbstract
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+    }
+
+    /**
+     * Verify that request returns correct values for given category
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/category_anchor.php
+     * @param string $query
+     * @param string $storeCode
+     * @param array $category
+     * @return void
+     * @throws \Exception
+     * @dataProvider categoryAnchorDataProvider
+     */
+    public function testCategoryAnchor(string $query, string $storeCode, array $category): void
+    {
+        $response = $this->graphQlQuery($query, [], '', ['store' => $storeCode]);
+
+        // check are there any items in the return data
+        self::assertNotNull($response['category'], 'category must not be null');
+
+        // check entire response
+        $this->assertResponseFields($response, $category);
+    }
+
+    /**
+     * Data provider for anchored category and product inside
+     *
+     * @return array[][]
+     */
+    public function categoryAnchorDataProvider(): array
+    {
+        return [
+            [
+                'query' => $this->getQuery(22),
+                'store' => 'default',
+                'data' => [
+                    'category' => [
+                        'id' => 22,
+                        'name' => 'Category_Anchor',
+                        'is_anchor' => 1,
+                        'product_count' => 2,
+                        'products' => [
+                            'items' => [
+                                ['name' => 'Product1'],
+                                ['name' => 'Product2'],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+            [
+                'query' => $this->getQuery(11),
+                'store' => 'default',
+                'data' => [
+                    'category' => [
+                        'id' => 11,
+                        'name' => 'Category_Default',
+                        'is_anchor' => 0,
+                        'product_count' => 1,
+                        'products' => [
+                            'items' => [
+                                ['name' => 'Product1'],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Return GraphQL query string by categoryId
+     *
+     * @param int $categoryId
+     * @return string
+     */
+    private function getQuery(int $categoryId): string
+    {
+        return <<<QUERY
+{
+    category(id: {$categoryId}){
+        id
+        name
+        is_anchor
+        product_count
+        products(pageSize: 10, currentPage: 1, sort: {name: ASC}){
+            items{
+                name
+            }
+        }
+    }
+}
+QUERY;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryEnabledTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryEnabledTest.php
new file mode 100644
index 0000000000000..1c52aa905ec6e
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryEnabledTest.php
@@ -0,0 +1,154 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Catalog;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test is categories enabled for specific storeView
+ *
+ * Preconditions:
+ *   Fixture with enabled and disabled categories in two stores created
+ * Steps:
+ *  Set Headers - Store = ukrainian
+ *  Send Request:
+ *   query{
+ *    category(id: %categoryId%){
+ *     id
+ *     name
+ *    }
+ *   }
+ *  Expected response:
+ *   {
+ *    "category": {
+ *     "id": %categoryId%,
+ *     "name": "Category_UA"
+ *    }
+ *   }
+ *
+ * @magentoApiDataFixture Magento/Catalog/_files/category_enabled_for_store.php
+ */
+class CategoryEnabledTest extends GraphQlAbstract
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+    }
+
+    /**
+     * Verify that category enabled for specific store view
+     *
+     * @param string $query
+     * @param string $storeCode
+     * @param array $category
+     * @return void
+     * @throws \Exception
+     * @dataProvider categoryEnabledDataProvider
+     */
+    public function testCategoryEnabledForSpecificStoreView(string $query, string $storeCode, array $category): void
+    {
+        $response = $this->graphQlQuery($query, [], '', ['store' => $storeCode]);
+
+        // check are there any items in the return data
+        self::assertNotNull($response['category'], 'category must not be null');
+
+        // check entire response
+        $this->assertResponseFields($response, $category);
+    }
+
+    /**
+     * Verify that category disabled for specific store view
+     *
+     * @param string $query
+     * @param string $storeCode
+     * @param array $category
+     * @return void
+     * @throws \Exception
+     * @dataProvider categoryDisabledDataProvider
+     */
+    public function testCategoryDisabledForSpecificStoreView(string $query, string $storeCode, array $category): void
+    {
+        $this->markTestSkipped(
+            'GraphQL response currently return Exception instead of data structure - MC-20132'
+        );
+        $response = $this->graphQlQuery($query, [], '', ['store' => $storeCode]);
+
+        // check are there any items in the return data
+        self::assertNotNull($response['category'], 'category must not be null');
+
+        // check entire response
+        $this->assertResponseFields($response, $category);
+    }
+
+    /**
+     * Data provider for enabled category
+     *
+     * @return array
+     */
+    public function categoryEnabledDataProvider(): array
+    {
+        return [
+            [
+                'query' => $this->getQuery(44),
+                'store' => 'default',
+                'data' => [
+                    'category' => [
+                        'id' => 44,
+                        'name' => 'Category_UA',
+                    ],
+                ]
+            ],
+        ];
+    }
+
+    /**
+     * Data provider for disabled category
+     *
+     * @return array[][]
+     */
+    public function categoryDisabledDataProvider(): array
+    {
+        return [
+            [
+                'query' => $this->getQuery(33),
+                'store' => 'english',
+                'data' => [
+                    'category' => null,
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Return GraphQL query string by categoryId
+     *
+     * @param int $categoryId
+     * @return string
+     */
+    private function getQuery(int $categoryId): string
+    {
+        return <<<QUERY
+{
+    category(id: {$categoryId}){
+        id
+        name
+    }
+}
+QUERY;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategorySpecificFieldsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategorySpecificFieldsTest.php
new file mode 100644
index 0000000000000..830585bed88b5
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategorySpecificFieldsTest.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Catalog;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test is category fields
+ *
+ * Preconditions:
+ *   Fixture with category in two stores created
+ * Steps:
+ *  Set Headers - Store = default
+ *  Send Request:
+ *  query{
+ *      category(id: %categoryId%){
+ *        id
+ *        include_in_menu
+ *        name
+ *        image
+ *        description
+ *        display_mode
+ *        available_sort_by
+ *        default_sort_by
+ *        url_key
+ *        meta_title
+ *        meta_keywords
+ *        meta_description
+ *      }
+ *  }
+ * Expected response:
+ * {
+ *    "category": {
+ *      "id": 9,
+ *      "include_in_menu": 0,
+ *      "name": "Category_en",
+ *      "image": NULL,
+ *      "description": "<p>Category_en Description</p>",
+ *      "display_mode": "PRODUCTS_AND_PAGE",
+ *      "available_sort_by": [
+ *        "name",
+ *        "price"
+ *      ],
+ *      "default_sort_by": "price",
+ *      "url_key": "category-en",
+ *      "meta_title": "Category_en Meta Title",
+ *      "meta_keywords": "Category_en Meta Keywords",
+ *      "meta_description": "Category_en Meta Description"
+ *  }
+ * }
+ */
+class CategorySpecificFieldsTest extends GraphQlAbstract
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+    }
+
+    /**
+     * Verify that search returns correct values for given price filter
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/category_specific_fields.php
+     * @param int $categoryId
+     * @param array $categoryFields
+     * @return void
+     * @throws \Exception
+     * @dataProvider categoryFieldsDataProvider
+     */
+    public function testSpecificCategoryFields(int $categoryId, array $categoryFields): void
+    {
+        $query = <<<QUERY
+{
+    category(id: {$categoryId}){
+        id
+        include_in_menu
+        name
+        description
+        display_mode
+        available_sort_by
+        default_sort_by
+        url_key
+        meta_title
+        meta_keywords
+        meta_description
+    }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+
+        // check are there any items in the return data
+        self::assertNotNull($response['category'], 'category must not be null');
+
+        // check entire response
+        $this->assertResponseFields($response['category'], $categoryFields);
+    }
+
+    /**
+     * Data provider for enabled category
+     *
+     * @return array[][]
+     */
+    public function categoryFieldsDataProvider(): array
+    {
+        return [
+            [
+                'category_id' => 10,
+                'category_fields' => [
+                    'id' => 10,
+                    'include_in_menu' => 0,
+                    'name' => 'Category_en',
+                    'description' => 'Category_en Description',
+                    'display_mode' => 'PRODUCTS_AND_PAGE',
+                    'available_sort_by' => [
+                        'name',
+                        'price',
+                    ],
+                    'default_sort_by' => 'price',
+                    'url_key' => 'category-en',
+                    'meta_title' => 'Category_en Meta Title',
+                    'meta_keywords' => 'Category_en Meta Keywords',
+                    'meta_description' => 'Category_en Meta Description',
+                ],
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchPriceFilterTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchPriceFilterTest.php
new file mode 100644
index 0000000000000..bafe972a2ecfb
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchPriceFilterTest.php
@@ -0,0 +1,270 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Catalog;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Product filtering by condition "FROM..TO" for "Price" attribute
+ *
+ * Preconditions:
+ *   Fixture simple products created
+ * Steps:
+ *   Send request:
+ *     query test {
+ *       products(search: "Product", filter: {price: {from: "0.01" to: "9.99"}}, sort: {price: ASC}) {
+ *         items {
+ *           name
+ *         }
+ *         total_count
+ *       }
+ *     }
+ *   Expected Response:
+ * {
+ *   "data": {
+ *     "products": {
+ *       "items": [
+ *         {
+ *           "name": "Product 2 $0.01"
+ *         },
+ *         {
+ *           "name": "Product 3 $5"
+ *         },
+ *         {
+ *           "name": "Product 4 $9.99"
+ *         }
+ *       ],
+ *       "total_count": 3
+ *     }
+ *   }
+ * }
+ */
+class ProductSearchPriceFilterTest extends GraphQlAbstract
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+    }
+
+    /**
+     * Verify that search returns correct values for given price filter
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/products_with_different_price.php
+     * @param string $priceFilter
+     * @param string $sort
+     * @param array $items
+     * @return void
+     * @dataProvider productSearchPriceDataProvider
+     * @throws \Exception
+     */
+    public function testProductSearchPriceFilter($priceFilter, string $sort, array $items): void
+    {
+        // expected stuff
+        $totalCount = count($items);
+        $expectedFirstItemPriceValue = reset($items)['price']['minimalPrice']['amount']['value'];
+        $expectedLastItemPriceValue = end($items)['price']['minimalPrice']['amount']['value'];
+        $assertionMap = [
+            'products' => [
+                'items' => $items,
+                'total_count' => $totalCount,
+            ],
+        ];
+
+        $query = <<<QUERY
+{
+  products(search: "Product", filter: {price: {{$priceFilter}}}, sort: {{$sort}}) {
+    items {
+      name
+      price {
+        minimalPrice {
+          amount {
+            value
+          }
+        }
+      }
+    }
+    total_count
+  }
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+
+        // check are there any items in the return data
+        self::assertNotNull(
+            $response['products']['items'],
+            'product items must not be null'
+        );
+
+        // check for the total of items in return
+        self::assertCount(
+            $totalCount,
+            $response['products']['items'],
+            "there are should be $totalCount products in price range $priceFilter"
+        );
+
+        // prepare first and last item from response for assertions
+        $responseFirstItem = reset($response['products']['items']);
+        $responseLastItem = end($response['products']['items']);
+        // check are there price in the first item
+        self::assertArrayHasKey('price', $responseFirstItem, 'product item must have price');
+        // check are there price in for the last item
+        self::assertArrayHasKey('price', $responseLastItem, 'product item must have price');
+
+        // prepare first and last item price value from response for assertions
+        $responseFirstItemPriceValue = $responseFirstItem['price']['minimalPrice']['amount']['value'] ?? null;
+        $responseLastItemPriceValue = $responseLastItem['price']['minimalPrice']['amount']['value'] ?? null;
+        // check are there price value in for the first item
+        self::assertNotNull($responseFirstItemPriceValue, 'first product item must have price value');
+        // check are there price value in for the first item
+        self::assertNotNull($responseLastItemPriceValue, 'last product item must have price value');
+
+        // check price value for the first item in return
+        self::assertEquals(
+            $expectedFirstItemPriceValue,
+            $responseFirstItemPriceValue,
+            sprintf(
+                'price for the first product must be %s as it sorted by price ASC',
+                $expectedFirstItemPriceValue
+            )
+        );
+
+        // check price value for the last item in return
+        self::assertEquals(
+            $expectedLastItemPriceValue,
+            $responseLastItemPriceValue,
+            sprintf(
+                'price for the first product must be %s as it sorted by price ASC',
+                $expectedLastItemPriceValue
+            )
+        );
+
+        // check entire response
+        $this->assertResponseFields($response, $assertionMap);
+    }
+
+    /**
+     * Data provider for product search price filter
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @return array[][]
+     */
+    public function productSearchPriceDataProvider(): array
+    {
+        return [
+            [
+                'price_filter' => 'from: "0.01" to: "9.99"',
+                'sort' => 'price: ASC',
+                'items' => [
+                    [
+                        'name' => 'Product with price 0.01',
+                        'price' => [
+                            'minimalPrice' => [
+                                'amount' => [
+                                    'value' => 0.01,
+                                ],
+                            ],
+                        ],
+                    ],
+                    [
+                        'name' => 'Product with price 5',
+                        'price' => [
+                            'minimalPrice' => [
+                                'amount' => [
+                                    'value' => 5,
+                                ],
+                            ],
+                        ],
+                    ],
+                    [
+                        'name' => 'Product with price 9.99',
+                        'price' => [
+                            'minimalPrice' => [
+                                'amount' => [
+                                    'value' => 9.99,
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+            [
+                'price_filter' => 'from: "5.01" to: "10"',
+                'sort' => 'price: DESC',
+                'items' => [
+                    [
+                        'name' => 'Product with price 10',
+                        'price' => [
+                            'minimalPrice' => [
+                                'amount' => [
+                                    'value' => 10,
+                                ],
+                            ],
+                        ],
+                    ],
+                    [
+                        'name' => 'Product with price 9.99',
+                        'price' => [
+                            'minimalPrice' => [
+                                'amount' => [
+                                    'value' => 9.99,
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+            [
+                'price_filter' => 'from: "5"',
+                'sort' => 'price: DESC',
+                'items' => [
+                    [
+                        'name' => 'Product with price 10',
+                        'price' => [
+                            'minimalPrice' => [
+                                'amount' => [
+                                    'value' => 10,
+                                ],
+                            ],
+                        ],
+                    ],
+                    [
+                        'name' => 'Product with price 9.99',
+                        'price' => [
+                            'minimalPrice' => [
+                                'amount' => [
+                                    'value' => 9.99,
+                                ],
+                            ],
+                        ],
+                    ],
+                    [
+                        'name' => 'Product with price 5',
+                        'price' => [
+                            'minimalPrice' => [
+                                'amount' => [
+                                    'value' => 5,
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php
index 87f8b62ed84a1..9946e74a24994 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductViewTest.php
@@ -232,7 +232,7 @@ public function testQueryAllFieldsSimpleProduct()
             special_from_date
             special_price
             special_to_date
-            swatch_image
+            swatch_image            
             tier_price
             tier_prices
             {
@@ -578,8 +578,8 @@ public function testProductLinks()
      */
     public function testProductPrices()
     {
-        $firstProductSku = 'simple-156';
-        $secondProductSku = 'simple-249';
+        $firstProductSku = 'simple-249';
+        $secondProductSku = 'simple-156';
         $query = <<<QUERY
        {
            products(filter: {price: {from: "150.0", to: "250.0"}})
@@ -653,8 +653,10 @@ public function testProductPrices()
         $secondProduct = $productRepository->get($secondProductSku, false, null, true);
         self::assertNotNull($response['products']['items'][0]['price'], "price must be not null");
         self::assertCount(2, $response['products']['items']);
-        $this->assertBaseFields($firstProduct, $response['products']['items'][0]);
-        $this->assertBaseFields($secondProduct, $response['products']['items'][1]);
+
+        // by default sort order is: "newest id first"
+        $this->assertBaseFields($secondProduct, $response['products']['items'][0]);
+        $this->assertBaseFields($firstProduct, $response['products']['items'][1]);
     }
 
     /**
@@ -1048,9 +1050,11 @@ public function testProductWithNonAnchoredParentCategory()
      */
     public function testProductInNonAnchoredSubCategories()
     {
+        $this->markTestSkipped('MC-30965: Product contains invalid categories');
+
         $query = <<<QUERY
 {
-    products(filter:
+    products(filter: 
              {
              sku: {in:["12345"]}
              }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ReadCategoryAfterDeleteTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ReadCategoryAfterDeleteTest.php
new file mode 100644
index 0000000000000..0ce52c45eb282
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ReadCategoryAfterDeleteTest.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Catalog;
+
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test category read after children category was deleted
+ *
+ * Preconditions:
+ *   Fixture with categories tree created
+ * Steps:
+ *  - Delete child category
+ *  - Get category tree
+ *  - Verify that tree doesn't contain deleted category
+ */
+class ReadCategoryAfterDeleteTest extends GraphQlAbstract
+{
+    /**
+     * Verify that after delete children category data category tree returns correct values for given category
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/category_tree.php
+     * @dataProvider categoriesDeleteDataProvider()
+     * @param int $categoryToDelete
+     * @param array $expectedResult
+     * @return void
+     * @throws \Exception
+     */
+    public function testCategoryDelete($categoryToDelete, $expectedResult): void
+    {
+        $this->deleteCategory($categoryToDelete);
+
+        $query = $this->getQuery(400);
+        $response = $this->graphQlQuery($query, [], '', ['store' => 'default']);
+        $this->assertResponseFields($response, $expectedResult);
+    }
+
+    /**
+     * Return GraphQL query string by categoryId
+     *
+     * @param int $categoryId
+     * @return string
+     */
+    private function getQuery(int $categoryId): string
+    {
+        return <<<QUERY
+{
+    categoryList(filters: {ids: {in: ["$categoryId"]}}) {
+        id
+        name
+        children_count
+        children {
+            id
+            name
+            children_count
+        }
+    }
+}
+QUERY;
+    }
+
+    /**
+     * @param int $categoryId
+     * @return void
+     */
+    private function deleteCategory(int $categoryId): void
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $registry = $objectManager->get(\Magento\Framework\Registry::class);
+        $registry->unregister('isSecureArea');
+        $registry->register('isSecureArea', true);
+
+        $category = $objectManager->create(\Magento\Catalog\Model\Category::class);
+        $category->load($categoryId);
+        if ($category->getId()) {
+            $category->delete();
+        }
+
+        $registry->unregister('isSecureArea');
+        $registry->register('isSecureArea', false);
+    }
+
+    /**
+     * @return array
+     */
+    public function categoriesDeleteDataProvider(): array
+    {
+        return [
+            [
+                'category_to_delete' => 402,
+                'expected_result' => [
+                    'categoryList' => [
+                        [
+                            'id' => 400,
+                            'name' => 'Category 1',
+                            'children_count' => 1,
+                            'children' => [
+                                [
+                                    'id' => 401,
+                                    'name' => 'Category 1.1',
+                                    'children_count' => 0,
+                                ]
+                            ]
+                        ]
+                    ]
+                ]
+            ]
+        ];
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductMultipleStoreViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductMultipleStoreViewTest.php
new file mode 100644
index 0000000000000..e8d789f6d35e4
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductMultipleStoreViewTest.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\ConfigurableProduct;
+
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test configurable product queries work correctly with multiple websites
+ */
+class ConfigurableProductMultipleStoreViewTest extends GraphQlAbstract
+{
+    /**
+     * @magentoApiDataFixture Magento/Store/_files/second_website_with_two_stores.php
+     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/product_configurable_in_multiple_websites.php
+     */
+    public function testConfigurableProductAssignedToOneWebsite()
+    {
+        $headerMapFirstStore['Store'] = 'default';
+        $headerMapSecondStore['Store'] = 'fixture_second_store';
+        $parentSku = 'configurable';
+        $query = $this->getQuery($parentSku);
+        $responseForFirstWebsite = $this->graphQlQuery($query, [], '', $headerMapFirstStore);
+        $responseForSecondWebsite = $this->graphQlQuery($query, [], '', $headerMapSecondStore);
+
+        $secondWebsiteVariants = $responseForSecondWebsite['products']['items'][0]['variants'];
+        self::assertEmpty($responseForFirstWebsite['products']['items']);
+        self::assertEquals(2, count($secondWebsiteVariants));
+        self::assertContains('simple_10', $secondWebsiteVariants[0]['product']);
+        self::assertContains('Option 1', $secondWebsiteVariants[0]['attributes'][0]);
+        self::assertContains('simple_20', $secondWebsiteVariants[1]['product']);
+        self::assertContains('Option 2', $secondWebsiteVariants[1]['attributes'][0]);
+    }
+
+    /**
+     * @param string $sku
+     * @return string
+     */
+    private function getQuery(string $sku)
+    {
+        return <<<QUERY
+        {
+            products(filter: {sku: {eq: "{$sku}"}})
+            {
+                items {
+                    sku
+                    ... on ConfigurableProduct {
+                        variants {
+                            product {
+                                sku
+                                stock_status
+                            }
+                            attributes {
+                                code
+                                label
+                                value_index
+                            }
+                        }
+                    }
+                }
+            }
+        }
+QUERY;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductOptionsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductOptionsTest.php
new file mode 100644
index 0000000000000..aac82f07b6b8b
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductOptionsTest.php
@@ -0,0 +1,243 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\ConfigurableProduct;
+
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test products query for configurable product options
+ */
+class ConfigurableProductOptionsTest extends GraphQlAbstract
+{
+    /**
+     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/configurable_products_with_two_attributes.php
+     * @dataProvider expectedResultDataProvider
+     * @param $expectedOptions
+     * @throws \Exception
+     */
+    public function testQueryConfigurableProductLinks($expectedOptions)
+    {
+        $configurableProduct = 'configurable';
+        $query = $this->getQuery($configurableProduct);
+
+        $response = $this->graphQlQuery($query);
+
+        $this->assertArrayHasKey('products', $response);
+        $this->assertArrayHasKey('items', $response['products']);
+        $this->assertConfigurableProductOptions($response['products']['items'], $expectedOptions);
+    }
+
+    /**
+     * @param $actualResponse
+     * @param $expectedOptions
+     */
+    private function assertConfigurableProductOptions($actualResponse, $expectedOptions)
+    {
+        $this->assertCount(2, $actualResponse);
+
+        foreach ($actualResponse as $responseProduct) {
+            $this->assertNotEmpty(
+                $responseProduct['configurable_options'],
+                "Precondition failed: 'configurable_options' must not be empty"
+            );
+            $expectedProductOptions = $expectedOptions[$responseProduct['sku']];
+            foreach ($expectedProductOptions['configurable_options'] as $optionIndex => $expectedProductOption) {
+                $responseProductOption = $responseProduct['configurable_options'][$optionIndex];
+                $this->assertEquals(
+                    $expectedProductOption['use_default'],
+                    $responseProductOption['use_default']
+                );
+                $this->assertEquals(
+                    $expectedProductOption['label'],
+                    $responseProductOption['label']
+                );
+                $this->assertEquals(
+                    $expectedProductOption['position'],
+                    $responseProductOption['position']
+                );
+                $this->assertEquals(
+                    $expectedProductOption['attribute_code'],
+                    $responseProductOption['attribute_code']
+                );
+                $optionValuesCount = 2;
+                self::assertCount(
+                    $optionValuesCount,
+                    $responseProductOption['values'],
+                    'Product option values count in response is different with real option values'
+                );
+                foreach ($expectedProductOption['values'] as $key => $value) {
+                    $responseProductOptionValue = $responseProductOption['values'][$key];
+                    $this->assertEquals(
+                        $value['label'],
+                        $responseProductOptionValue['label']
+                    );
+                    $this->assertEquals(
+                        $value['store_label'],
+                        $responseProductOptionValue['store_label']
+                    );
+                    $this->assertEquals(
+                        $value['default_label'],
+                        $responseProductOptionValue['default_label']
+                    );
+                    $this->assertEquals(
+                        $value['use_default_value'],
+                        $responseProductOptionValue['use_default_value']
+                    );
+                }
+            }
+        }
+    }
+
+    /**
+     * @param string $configurableProduct
+     * @return string
+     */
+    private function getQuery($configurableProduct)
+    {
+        return <<<QUERY
+{
+  products(filter: {name: {match: "$configurableProduct"}}) {
+    items {
+      id
+      sku
+      ... on ConfigurableProduct {
+        configurable_options {
+          id
+          attribute_id
+          label
+          position
+          use_default
+          attribute_code
+          values {
+            value_index
+            label
+            store_label
+            default_label
+            use_default_value
+          }
+          product_id
+        }
+      }
+    }
+  }
+}
+QUERY;
+    }
+
+    /**
+     * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function expectedResultDataProvider()
+    {
+        return [
+            [
+                [
+                    'configurable_12345' =>
+                        [
+                            'sku' => 'configurable_12345',
+                            'configurable_options' =>
+                                [
+                                    [
+                                        'label' => 'Test Configurable First',
+                                        'position' => 0,
+                                        'use_default' => false,
+                                        'attribute_code' => 'test_configurable_first',
+                                        'values' =>
+                                            [
+                                                [
+                                                    'label' => 'First Option 3',
+                                                    'store_label' => 'First Option 3',
+                                                    'default_label' => 'First Option 3',
+                                                    'use_default_value' => true,
+                                                ],
+                                                [
+                                                    'label' => 'First Option 4',
+                                                    'store_label' => 'First Option 4',
+                                                    'default_label' => 'First Option 4',
+                                                    'use_default_value' => true,
+                                                ],
+                                            ],
+                                    ],
+                                    [
+                                        'label' => 'Test Configurable Second',
+                                        'position' => 1,
+                                        'use_default' => false,
+                                        'attribute_code' => 'test_configurable_second',
+                                        'values' =>
+                                            [
+                                                [
+                                                    'label' => 'Second Option 3',
+                                                    'store_label' => 'Second Option 3',
+                                                    'default_label' => 'Second Option 3',
+                                                    'use_default_value' => true,
+                                                ],
+                                                [
+                                                    'label' => 'Second Option 4',
+                                                    'store_label' => 'Second Option 4',
+                                                    'default_label' => 'Second Option 4',
+                                                    'use_default_value' => true,
+                                                ],
+                                            ],
+                                    ],
+                                ],
+                        ],
+                    'configurable' =>
+                        [
+                            'sku' => 'configurable',
+                            'configurable_options' =>
+                                [
+                                    [
+                                        'label' => 'Test Configurable First',
+                                        'position' => 0,
+                                        'use_default' => false,
+                                        'attribute_code' => 'test_configurable_first',
+                                        'values' =>
+                                            [
+                                                [
+                                                    'label' => 'First Option 1',
+                                                    'store_label' => 'First Option 1',
+                                                    'default_label' => 'First Option 1',
+                                                    'use_default_value' => true,
+                                                ],
+                                                [
+                                                    'label' => 'First Option 2',
+                                                    'store_label' => 'First Option 2',
+                                                    'default_label' => 'First Option 2',
+                                                    'use_default_value' => true,
+                                                ],
+                                            ],
+                                    ],
+                                    [
+                                        'label' => 'Test Configurable Second',
+                                        'position' => 1,
+                                        'use_default' => false,
+                                        'attribute_code' => 'test_configurable_second',
+                                        'values' =>
+                                            [
+                                                [
+                                                    'label' => 'Second Option 1',
+                                                    'store_label' => 'Second Option 1',
+                                                    'default_label' => 'Second Option 1',
+                                                    'use_default_value' => true,
+                                                ],
+                                                [
+                                                    'label' => 'Second Option 2',
+                                                    'store_label' => 'Second Option 2',
+                                                    'default_label' => 'Second Option 2',
+                                                    'use_default_value' => true,
+                                                ],
+                                            ],
+                                    ],
+                                ],
+                        ]
+                ]
+            ]
+        ];
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/GroupedProduct/ProductViewTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/GroupedProduct/ProductViewTest.php
new file mode 100644
index 0000000000000..9eea2396c24ce
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/GroupedProduct/ProductViewTest.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\GroupedProduct;
+
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+class ProductViewTest extends GraphQlAbstract
+{
+
+    /**
+     * @magentoApiDataFixture Magento/Store/_files/second_website_with_two_stores.php
+     * @magentoApiDataFixture Magento/GroupedProduct/_files/product_grouped_in_multiple_websites.php
+     */
+    public function testGroupedProductAssignedToOneWebsite()
+    {
+        $headerMapFirstStore['Store'] = 'default';
+        $headerMapSecondStore['Store'] = 'fixture_second_store';
+        $productSku = 'grouped-product';
+        $query = $this->getQuery($productSku);
+        $responseForFirstWebsite = $this->graphQlQuery($query, [], '', $headerMapFirstStore);
+        $responseForSecondWebsite = $this->graphQlQuery($query, [], '', $headerMapSecondStore);
+        self::assertEmpty($responseForFirstWebsite['products']['items']);
+        $groupedProductLinks = [
+            [
+                'qty' => 1,
+                'position' => 1,
+                'product' => [
+                    'sku' => 'simple',
+                    'name' => 'Simple Product',
+                    'type_id' => 'simple',
+                    'url_key' => 'simple-product'
+                ]
+            ],
+            [
+                'qty' => 2,
+                'position' => 2,
+                'product' => [
+                    'sku' => 'virtual-product',
+                    'name' => 'Virtual Product',
+                    'type_id' => 'virtual',
+                    'url_key' => 'virtual-product'
+                ]
+            ]
+        ];
+        $this->assertGroupedProductItems($groupedProductLinks, $responseForSecondWebsite['products']['items'][0]);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Store/_files/second_website_with_two_stores.php
+     * @magentoApiDataFixture Magento/GroupedProduct/_files/product_grouped_items_in_multiple_websites.php
+     */
+    public function testGroupedProductItemsAssignedToDifferentWebsites()
+    {
+        $headerMapFirstStore['Store'] = 'default';
+        $headerMapSecondStore['Store'] = 'fixture_second_store';
+        $productSku = 'grouped-product';
+        $query = $this->getQuery($productSku);
+        $responseForFirstWebsite = $this->graphQlQuery($query, [], '', $headerMapFirstStore);
+        $responseForSecondWebsite = $this->graphQlQuery($query, [], '', $headerMapSecondStore);
+        $firstWebsiteGroupedProductLinks = [
+            [
+                'qty' => 1,
+                'position' => 1,
+                'product' => [
+                    'sku' => 'simple',
+                    'name' => 'Simple Product',
+                    'type_id' => 'simple',
+                    'url_key' => 'simple-product'
+                ]
+            ]
+        ];
+        $secondWebsiteGroupedProductLinks = [
+            [
+                'qty' => 2,
+                'position' => 2,
+                'product' => [
+                    'sku' => 'virtual-product',
+                    'name' => 'Virtual Product',
+                    'type_id' => 'virtual',
+                    'url_key' => 'virtual-product'
+                ]
+            ]
+        ];
+
+        $this->assertGroupedProductItems(
+            $firstWebsiteGroupedProductLinks,
+            $responseForFirstWebsite['products']['items'][0]
+        );
+        $this->assertGroupedProductItems(
+            $secondWebsiteGroupedProductLinks,
+            $responseForSecondWebsite['products']['items'][0]
+        );
+    }
+
+    /**
+     * @param string $sku
+     * @return string
+     */
+    private function getQuery(string $sku): string
+    {
+        return <<<QUERY
+{
+  products(filter: {sku: {eq: "{$sku}"}}) {
+    items {    
+      id
+      attribute_set_id
+      created_at
+      name
+      sku
+      type_id     
+      ... on GroupedProduct {
+        items{
+          qty
+          position
+          product{
+            sku
+            name
+            type_id
+            url_key            
+          }
+        }
+      }
+    }
+  }
+}
+QUERY;
+    }
+
+    /**
+     * @param array $groupedProductLinks
+     * @param $actualResponse
+     */
+    private function assertGroupedProductItems(array $groupedProductLinks, $actualResponse)
+    {
+        self::assertNotEmpty(
+            $actualResponse['items'],
+            "Precondition failed: 'grouped product items' must not be empty"
+        );
+        self::assertCount(count($groupedProductLinks), $actualResponse['items']);
+        foreach ($actualResponse['items'] as $itemIndex => $bundleItems) {
+            self::assertEquals($groupedProductLinks[$itemIndex], $bundleItems);
+        }
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreSaveTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreSaveTest.php
new file mode 100644
index 0000000000000..7c7e21138bc26
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/StoreSaveTest.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Store;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Store save tests
+ *
+ * @magentoAppIsolation enabled
+ * @magentoDbIsolation disabled
+ */
+class StoreSaveTest extends GraphQlAbstract
+{
+    /**
+     * Test a product from newly created store
+     *
+     * @magentoApiDataFixture Magento/Store/_files/second_store.php
+     * @magentoApiDataFixture Magento/Catalog/_files/category_product.php
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testProductVisibleInNewStore()
+    {
+        $newStoreCode = 'fixture_second_store';
+        $this->assertCategory($newStoreCode);
+        $this->assertProduct($newStoreCode);
+    }
+
+    /**
+     * Test product in store.
+     *
+     * @param string $storeCodeFromFixture
+     * @throws \Exception
+     */
+    private function assertProduct(string $storeCodeFromFixture)
+    {
+        $productSku = 'simple333';
+        $productNameInFixtureStore = 'Simple Product Three';
+
+        $productsQuery = <<<QUERY
+{
+  products(filter: { sku: { eq: "%s" } }, sort: { name: ASC }) {
+    items {
+      id
+      sku
+      name
+    }
+  }
+}
+QUERY;
+        $headerMap = ['Store' => $storeCodeFromFixture];
+        $response = $this->graphQlQuery(
+            sprintf($productsQuery, $productSku),
+            [],
+            '',
+            $headerMap
+        );
+        $this->assertCount(
+            1,
+            $response['products']['items'],
+            sprintf('Product with sku "%s" not found in store "%s"', $productSku, $storeCodeFromFixture)
+        );
+        $this->assertEquals(
+            $productNameInFixtureStore,
+            $response['products']['items'][0]['name'],
+            'Product name in fixture store is invalid.'
+        );
+    }
+
+    /**
+     * Test category in store.
+     *
+     * @param string $storeCodeFromFixture
+     * @throws \Exception
+     */
+    private function assertCategory(string $storeCodeFromFixture)
+    {
+        $categoryName = 'Category 1';
+        $categoryQuery = <<<QUERY
+{
+    categoryList(filters: {name: {match: "%s"}}){
+        id
+        name
+        url_key
+        url_path
+        children_count
+        path
+        position
+    }
+}
+QUERY;
+        $headerMap = ['Store' => $storeCodeFromFixture];
+        $response = $this->graphQlQuery(
+            sprintf($categoryQuery, $categoryName),
+            [],
+            '',
+            $headerMap
+        );
+        $this->assertCount(
+            1,
+            $response['categoryList'],
+            sprintf('Category with name "%s" not found in store "%s"', $categoryName, $storeCodeFromFixture)
+        );
+        $this->assertEquals(
+            $categoryName,
+            $response['categoryList'][0]['name'],
+            'Category name in fixture store is invalid.'
+        );
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Application.php b/dev/tests/integration/framework/Magento/TestFramework/Application.php
index 62f1101bae847..e39e7c0f05bd8 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Application.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Application.php
@@ -168,10 +168,12 @@ public function __construct(
         $loadTestExtensionAttributes = false
     ) {
         if (getcwd() != BP . '/dev/tests/integration') {
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             chdir(BP . '/dev/tests/integration');
         }
         $this->_shell = $shell;
         $this->installConfigFile = $installConfigFile;
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         $this->_globalConfigDir = realpath($globalConfigDir);
         $this->_appMode = $appMode;
         $this->installDir = $installDir;
@@ -251,6 +253,7 @@ public function getDbInstance()
     protected function getInstallConfig()
     {
         if (null === $this->installConfig) {
+            // phpcs:ignore Magento2.Security.IncludeFile
             $this->installConfig = include $this->installConfigFile;
         }
         return $this->installConfig;
@@ -293,6 +296,7 @@ public function getInitParams()
      */
     public function isInstalled()
     {
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         return is_file($this->getLocalConfig());
     }
 
@@ -371,7 +375,7 @@ public function initialize($overriddenParams = [])
                 \Magento\Framework\Mail\TransportInterface::class =>
                     \Magento\TestFramework\Mail\TransportInterfaceMock::class,
                 \Magento\Framework\Mail\Template\TransportBuilder::class
-                    => \Magento\TestFramework\Mail\Template\TransportBuilderMock::class,
+                => \Magento\TestFramework\Mail\Template\TransportBuilderMock::class,
             ]
         ];
         if ($this->loadTestExtensionAttributes) {
@@ -552,8 +556,10 @@ private function copyAppConfigFiles()
         );
         foreach ($globalConfigFiles as $file) {
             $targetFile = $this->_configDir . str_replace($this->_globalConfigDir, '', $file);
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             $this->_ensureDirExists(dirname($targetFile));
             if ($file !== $targetFile) {
+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
                 copy($file, $targetFile);
             }
         }
@@ -567,6 +573,7 @@ private function copyAppConfigFiles()
     private function copyGlobalConfigFile()
     {
         $targetFile = $this->_configDir . '/config.local.php';
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         copy($this->globalConfigFile, $targetFile);
     }
 
@@ -585,7 +592,7 @@ private function getInstallCliParams()
         $params['magento-init-params'] = $this->getInitParamsQuery();
         $result = [];
         foreach ($params as $key => $value) {
-            if (!empty($value)) {
+            if (isset($value)) {
                 $result["--{$key}=%s"] = $value;
             }
         }
@@ -636,10 +643,13 @@ protected function _resetApp()
      */
     protected function _ensureDirExists($dir)
     {
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         if (!file_exists($dir)) {
             $old = umask(0);
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             mkdir($dir, 0777, true);
             umask($old);
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
         } elseif (!is_dir($dir)) {
             throw new \Magento\Framework\Exception\LocalizedException(__("'%1' is not a directory.", $dir));
         }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_anchor.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_anchor.php
new file mode 100644
index 0000000000000..34996dd75015f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_anchor.php
@@ -0,0 +1,95 @@
+<?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\Api\Data\CategoryInterface;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Api\CategoryLinkManagementInterface;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var StoreInterface $defaultWebsite */
+$defaultStoreView = $objectManager->get(StoreManagerInterface::class)->getDefaultStoreView();
+
+/** @var CategoryInterface $categoryAnchor */
+$categoryAnchor = $objectManager->create(CategoryInterface::class);
+$categoryAnchor->isObjectNew(true);
+$categoryAnchor
+    ->setId(22)
+    ->setIsAnchor(true)
+    ->setStoreId($defaultStoreView->getId())
+    ->setName('Category_Anchor')
+    ->setParentId(2)
+    ->setPath('1/2/22')
+    ->setLevel(2)
+    ->setAvailableSortBy('name')
+    ->setDefaultSortBy('name')
+    ->setIsActive(true);
+$categoryAnchor->save();
+
+/** @var CategoryInterface $categoryDefault */
+$categoryDefault = $objectManager->create(CategoryInterface::class);
+$categoryDefault->isObjectNew(true);
+$categoryDefault
+    ->setId(11)
+    ->setIsAnchor(false)
+    ->setStoreId($defaultStoreView->getId())
+    ->setName('Category_Default')
+    ->setParentId(22)
+    ->setPath('1/2/22/11')
+    ->setLevel(3)
+    ->setAvailableSortBy('name')
+    ->setDefaultSortBy('name')
+    ->setIsActive(true);
+$categoryDefault->save();
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$productTemplate = [
+    'type' => 'simple',
+    'sku' => 'product_anchor_',
+    'status' => Status::STATUS_ENABLED,
+    'visibility' => Visibility::VISIBILITY_BOTH,
+    'price' => 1,
+    'attribute_set' => 4,
+    'website_ids' => [1],
+    'category_ids' => [1],
+];
+
+/** @var CategoryLinkManagementInterface $categoryLinkManagement */
+$categoryLinkManagement = $objectManager->create(CategoryLinkManagementInterface::class);
+
+$products = [
+    ['name' => 'Product1', 'categories'=> [11]],
+    ['name' => 'Product2', 'categories' => [22]],
+];
+
+foreach ($products as $product) {
+    $sku = $productTemplate['sku'] . $product['name'];
+
+    /** @var Product $product */
+    $newProduct = $objectManager->create(Product::class);
+    $newProduct
+        ->setTypeId($productTemplate['type'])
+        ->setAttributeSetId($productTemplate['attribute_set'])
+        ->setWebsiteIds($productTemplate['website_ids'])
+        ->setName($product['name'])
+        ->setSku($sku)
+        ->setUrlKey(microtime(false))
+        ->setPrice($productTemplate['website_ids'])
+        ->setVisibility($productTemplate['visibility'])
+        ->setStatus($productTemplate['status'])
+        ->setStockData(['use_config_manage_stock' => 0]);
+    $productRepository->save($newProduct);
+
+    $categoryLinkManagement->assignProductToCategories($sku, $product['categories']);
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_anchor_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_anchor_rollback.php
new file mode 100644
index 0000000000000..a966931de0a36
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_anchor_rollback.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\Data\ProductSearchResultsInterface;
+use Magento\Catalog\Model\CategoryRepository;
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var CategoryRepository $categoryRepository */
+$categoryRepository = $objectManager->get(CategoryRepository::class);
+
+$categoryIds = [11, 22];
+foreach ($categoryIds as $categoryId) {
+    /** @var CategoryInterface $category */
+    $category = $categoryRepository->get($categoryId);
+    if ($category->getId()) {
+        $categoryRepository->delete($category);
+    }
+}
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+
+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+$searchCriteriaBuilder->addFilter(ProductInterface::SKU, 'product_anchor_%', 'like');
+
+/** @var ProductSearchResultsInterface $products */
+$products = $productRepository->getList($searchCriteriaBuilder->create());
+/** @var ProductInterface $product */
+foreach ($products->getItems() as $product) {
+    $productRepository->delete($product);
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_enabled_for_store.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_enabled_for_store.php
new file mode 100644
index 0000000000000..bf7fa97b8c284
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_enabled_for_store.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Model\Category;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+$defaultWebsite = $objectManager->get(StoreManagerInterface::class)->getWebsite();
+$groupId = $defaultWebsite->getDefaultGroupId();
+
+// creating english store
+/** @var Store $storeEnglish */
+$storeEnglish = $objectManager->create(Store::class);
+$storeEnglish->setCode('english')
+    ->setWebsiteId($defaultWebsite->getId())
+    ->setGroupId($groupId)
+    ->setName('Fixture For English Store')
+    ->setSortOrder(1)
+    ->setIsActive(1);
+$storeEnglish->save();
+
+// creating ukrainian store
+/** @var Store $storeUkrainian */
+$storeUkrainian = $objectManager->create(Store::class);
+$storeUkrainian->setCode('ukrainian')
+    ->setWebsiteId($defaultWebsite->getId())
+    ->setGroupId($groupId)
+    ->setName('Fixture For Ukrainian Store')
+    ->setSortOrder(1)
+    ->setIsActive(1);
+$storeUkrainian->save();
+
+/** @var Category $categoryEnglish */
+$categoryEnglish = $objectManager->create(Category::class);
+$categoryEnglish->isObjectNew(true);
+$categoryEnglish
+    ->setId(33)
+    ->setStoreId($storeEnglish->getId())
+    ->setName('Category_US')
+    ->setParentId(2)
+    ->setPath('1/2/33')
+    ->setLevel(2)
+    ->setAvailableSortBy('name')
+    ->setDefaultSortBy('name')
+    ->setIsActive(false)
+    ->setPosition(1)
+    ->setAvailableSortBy(['position']);
+$categoryEnglish->save();
+
+/** @var Category $categoryUkrainian */
+$categoryUkrainian = $objectManager->create(Category::class);
+$categoryUkrainian->isObjectNew(true);
+$categoryUkrainian
+    ->setId(44)
+    ->setStoreId($storeUkrainian->getId())
+    ->setName('Category_UA')
+    ->setParentId(2)
+    ->setPath('1/2/44')
+    ->setLevel(2)
+    ->setAvailableSortBy('name')
+    ->setDefaultSortBy('name')
+    ->setIsActive(true)
+    ->setPosition(1)
+    ->setAvailableSortBy(['position']);
+$categoryUkrainian->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_enabled_for_store_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_enabled_for_store_rollback.php
new file mode 100644
index 0000000000000..11c6f43751820
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_enabled_for_store_rollback.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Model\CategoryRepository;
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Framework\Registry;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var StoreRepositoryInterface $storeRepository */
+$storeRepository = $objectManager->get(StoreRepositoryInterface::class);
+
+$storeCodes = ['english', 'ukrainian'];
+foreach ($storeCodes as $storeCode) {
+    /** @var StoreInterface $store */
+    $store = $storeRepository->get($storeCode);
+    if ($store->getId()) {
+        $store->delete();
+    }
+}
+
+/** @var CategoryRepository $categoryRepository */
+$categoryRepository = $objectManager->get(CategoryRepository::class);
+
+$categoryIds = [33, 44];
+foreach ($categoryIds as $categoryId) {
+    /** @var CategoryInterface $category */
+    $category = $categoryRepository->get($categoryId);
+    if ($category->getId()) {
+        $categoryRepository->delete($category);
+    }
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_specific_fields.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_specific_fields.php
new file mode 100644
index 0000000000000..d5c9e4bc8a5a4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_specific_fields.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Model\Category;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var StoreManagerInterface $storeManager */
+$storeManager = $objectManager->get(StoreManagerInterface::class);
+$defaultWebsite = $storeManager->getWebsite();
+$defaultStoreId = $storeManager->getStore()->getId();
+$groupId = $defaultWebsite->getDefaultGroupId();
+
+/** @var Category $category */
+$category = $objectManager->create(Category::class);
+$category->isObjectNew(true);
+$category
+    ->setId(10)
+    ->setStoreId($defaultStoreId)
+    ->setIncludeInMenu(false)
+    ->setName('Category_en')
+    ->setDescription('Category_en Description')
+    ->setDisplayMode(Category::DM_MIXED)
+    ->setAvailableSortBy(['name', 'price'])
+    ->setDefaultSortBy('price')
+    ->setUrlKey('category-en')
+    ->setMetaTitle('Category_en Meta Title')
+    ->setMetaKeywords('Category_en Meta Keywords')
+    ->setMetaDescription('Category_en Meta Description')
+    ->setParentId(2)
+    ->setPath('1/2/3')
+    ->setLevel(2)
+    ->setIsActive(true)
+    ->setPosition(1);
+$category->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_specific_fields_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_specific_fields_rollback.php
new file mode 100644
index 0000000000000..2b619a9ac58fa
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_specific_fields_rollback.php
@@ -0,0 +1,30 @@
+<?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\CategoryInterface;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var CategoryRepositoryInterface $categoryRepository */
+$categoryRepository = $objectManager->get(CategoryRepositoryInterface::class);
+
+/** @var CategoryInterface $category */
+$category = $categoryRepository->get(10);
+if ($category->getId()) {
+    $categoryRepository->delete($category);
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_different_price.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_different_price.php
new file mode 100644
index 0000000000000..834cdd49dfdc4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_different_price.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\CategoryLinkManagementInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\CatalogSearch\Model\Indexer\Fulltext;
+use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$productPrices = [0, 0.01, 5, 9.99, 10];
+$productTemplate = [
+    'type' => 'simple',
+    'name' => 'Product with price ',
+    'sku' => 'search_product_price_',
+    'status' => Status::STATUS_ENABLED,
+    'visibility' => Visibility::VISIBILITY_BOTH,
+    'attribute_set' => 4,
+    'website_ids' => [1],
+    'category_ids' => [1],
+];
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var CategoryLinkManagementInterface $categoryLinkManagement */
+$categoryLinkManagement = $objectManager->get(CategoryLinkManagementInterface::class);
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+foreach ($productPrices as $price) {
+
+    $sku =  $productTemplate['sku'] . $price;
+    $name = $productTemplate['name'] . $price;
+
+    /** @var $product Product */
+    $product = $objectManager->create(Product::class);
+    $product
+        ->setTypeId($productTemplate['type'])
+        ->setAttributeSetId($productTemplate['attribute_set'])
+        ->setWebsiteIds($productTemplate['website_ids'])
+        ->setName($name)
+        ->setSku($sku)
+        ->setPrice($price)
+        ->setVisibility($productTemplate['visibility'])
+        ->setStatus($productTemplate['status'])
+        ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1]);
+    $productRepository->save($product);
+
+    $categoryLinkManagement->assignProductToCategories($sku, $productTemplate['category_ids']);
+}
+
+$indexRegistry = Bootstrap::getObjectManager()->get(IndexerRegistry::class);
+$fulltextIndexer = $indexRegistry->get(Fulltext::INDEXER_ID);
+$fulltextIndexer->reindexAll();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_different_price_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_different_price_rollback.php
new file mode 100644
index 0000000000000..c852a857febbd
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_different_price_rollback.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\Data\ProductSearchResultsInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+
+/**
+ * Remove products with different price
+ */
+$objectManager = Bootstrap::getObjectManager();
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+
+/** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+$searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+$searchCriteriaBuilder->addFilter(ProductInterface::SKU, 'search_product_price_%', 'like');
+
+/** @var ProductSearchResultsInterface $products */
+$products = $productRepository->getList($searchCriteriaBuilder->create());
+/** @var ProductInterface $product */
+foreach ($products->getItems() as $product) {
+    $productRepository->delete($product);
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_second.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_second.php
new file mode 100644
index 0000000000000..45192beef84bf
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_second.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Eav\Api\AttributeRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$eavConfig = Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class);
+$secondAttribute = $eavConfig->getAttribute('catalog_product', 'test_configurable_second');
+
+$eavConfig->clear();
+
+/** @var $installer \Magento\Catalog\Setup\CategorySetup */
+$installer = Bootstrap::getObjectManager()->create(\Magento\Catalog\Setup\CategorySetup::class);
+
+if (!$secondAttribute->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);
+
+    $secondAttribute->setData(
+        [
+            'attribute_code' => 'test_configurable_second',
+            '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 Second'],
+            'backend_type' => 'int',
+            'option' => [
+                'value' => [
+                    'second_option_0' => ['Second Option 1'],
+                    'second_option_1' => ['Second Option 2'],
+                    'second_option_2' => ['Second Option 3'],
+                    'second_option_3' => ['Second Option 4']
+                ],
+                'order' => [
+                    'second_option_0' => 1,
+                    'second_option_1' => 2,
+                    'second_option_2' => 3,
+                    'second_option_3' => 4
+                ],
+            ],
+        ]
+    );
+
+    $attributeRepository->save($secondAttribute);
+
+    /* Assign attribute to attribute set */
+    $installer->addAttributeToGroup('catalog_product', 'Default', 'General', $secondAttribute->getId());
+}
+
+$eavConfig->clear();
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_second_rollback.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_second_rollback.php
new file mode 100644
index 0000000000000..6d7a8f1fe88e5
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute_second_rollback.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+$productCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Model\ResourceModel\Product\Collection::class);
+foreach ($productCollection as $product) {
+    $product->delete();
+}
+
+$eavConfig = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class);
+$attribute = $eavConfig->getAttribute('catalog_product', 'test_configurable_second');
+if ($attribute instanceof \Magento\Eav\Model\Entity\Attribute\AbstractAttribute
+    && $attribute->getId()
+) {
+    $attribute->delete();
+}
+$eavConfig->clear();
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products_with_two_attributes.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products_with_two_attributes.php
new file mode 100644
index 0000000000000..bdab71bdf5230
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products_with_two_attributes.php
@@ -0,0 +1,211 @@
+<?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\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\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 = [];
+$productIds = [10, 20];
+$firstAttributeValues = [];
+$secondAttributeValues = [];
+$i = 1;
+foreach ($productIds as $productId) {
+    $firstOption = $firstAttributeOptions[$i];
+    $secondOption = $secondAttributeOptions[$i];
+    /** @var $product Product */
+    $product = Bootstrap::getObjectManager()->create(Product::class);
+    $product->setTypeId(Type::TYPE_SIMPLE)
+        ->setId($productId)
+        ->setAttributeSetId($attributeSetId)
+        ->setWebsiteIds([1])
+        ->setName('Configurable Option ' . $firstOption->getLabel() . '-' . $secondOption->getLabel())
+        ->setSku('simple_' . $productId)
+        ->setPrice($productId)
+        ->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]);
+    $customAttributes = [
+        $firstAttribute->getAttributeCode() => $firstOption->getValue(),
+        $secondAttribute->getAttributeCode() => $secondOption->getValue()
+    ];
+    foreach ($customAttributes as $attributeCode => $attributeValue) {
+        $product->setCustomAttributes($customAttributes);
+    }
+    $product = $productRepository->save($product);
+
+    $firstAttributeValues[] = [
+        'label' => 'test first ' . $i,
+        'attribute_id' => $firstAttribute->getId(),
+        'value_index' => $firstOption->getValue(),
+    ];
+    $secondAttributeValues[] = [
+        'label' => 'test second ' . $i,
+        'attribute_id' => $secondAttribute->getId(),
+        'value_index' => $secondOption->getValue(),
+    ];
+    $associatedProductIds[] = $product->getId();
+    $i++;
+}
+
+/** @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);
+$extensionConfigurableAttributes = $product->getExtensionAttributes();
+$extensionConfigurableAttributes->setConfigurableProductOptions($configurableOptions);
+$extensionConfigurableAttributes->setConfigurableProductLinks($associatedProductIds);
+$product->setExtensionAttributes($extensionConfigurableAttributes);
+
+$product->setTypeId(Configurable::TYPE_CODE)
+    ->setId(1)
+    ->setAttributeSetId($attributeSetId)
+    ->setWebsiteIds([1])
+    ->setName('Configurable Product')
+    ->setSku('configurable')
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setStockData(['use_config_manage_stock' => 1, 'is_in_stock' => 1]);
+$productRepository->cleanCache();
+$productRepository->save($product);
+
+$firstAttributeSetId = $installer->getAttributeSetId('catalog_product', 'Default');
+$associatedProductIds = [];
+$productIds = [30, 40];
+$firstAttributeValues = [];
+$secondAttributeValues = [];
+
+foreach ($productIds as $productId) {
+    $firstOption = $firstAttributeOptions[$i];
+    $secondOption = $secondAttributeOptions[$i];
+    /** @var $product Product */
+    $product = Bootstrap::getObjectManager()->create(Product::class);
+    $product->setTypeId(Type::TYPE_SIMPLE)
+        ->setId($productId)
+        ->setAttributeSetId($firstAttributeSetId)
+        ->setWebsiteIds([1])
+        ->setName('Configurable Option ' . $firstOption->getLabel() . '-' . $secondOption->getLabel())
+        ->setSku('simple_' . $productId)
+        ->setPrice($productId)
+        ->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]);
+    $customAttributes = [
+        $firstAttribute->getAttributeCode() => $firstOption->getValue(),
+        $secondAttribute->getAttributeCode() => $secondOption->getValue()
+    ];
+    foreach ($customAttributes as $attributeCode => $attributeValue) {
+        $product->setCustomAttributes($customAttributes);
+    }
+    $product = $productRepository->save($product);
+
+    $firstAttributeValues[] = [
+        'label' => 'test first ' . $i,
+        'attribute_id' => $firstAttribute->getId(),
+        'value_index' => $firstOption->getValue(),
+    ];
+    $secondAttributeValues[] = [
+        'label' => 'test second ' . $i,
+        'attribute_id' => $secondAttribute->getId(),
+        'value_index' => $secondOption->getValue(),
+    ];
+    $associatedProductIds[] = $product->getId();
+    $i++;
+}
+
+/** @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);
+
+$extensionConfigurableAttributes = $product->getExtensionAttributes();
+$extensionConfigurableAttributes->setConfigurableProductOptions($configurableOptions);
+$extensionConfigurableAttributes->setConfigurableProductLinks($associatedProductIds);
+
+$product->setExtensionAttributes($extensionConfigurableAttributes);
+
+$product->setTypeId(Configurable::TYPE_CODE)
+    ->setId(11)
+    ->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, 'is_in_stock' => 1]);
+$productRepository->cleanCache();
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products_with_two_attributes_rollback.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products_with_two_attributes_rollback.php
new file mode 100644
index 0000000000000..f2bb4ebda2b3e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products_with_two_attributes_rollback.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+$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\Api\ProductRepositoryInterface $productRepository */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+foreach (['simple_10', 'simple_20', 'configurable', 'simple_30', 'simple_40', 'configurable_12345'] as $sku) {
+    try {
+        $product = $productRepository->get($sku, true);
+
+        $stockStatus = $objectManager->create(\Magento\CatalogInventory\Model\Stock\Status::class);
+        $stockStatus->load($product->getEntityId(), 'product_id');
+        $stockStatus->delete();
+
+        $productRepository->delete($product);
+    } catch (\Magento\Framework\Exception\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'
+);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_in_multiple_websites.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_in_multiple_websites.php
new file mode 100644
index 0000000000000..f58f38df4ff89
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_in_multiple_websites.php
@@ -0,0 +1,152 @@
+<?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\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\Store\Api\WebsiteRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+use Magento\Eav\Model\Config;
+
+\Magento\TestFramework\Helper\Bootstrap::getInstance()->reinitialize();
+
+Resolver::getInstance()->requireDataFixture(
+    'Magento/ConfigurableProduct/_files/configurable_attribute.php'
+);
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = Bootstrap::getObjectManager()
+    ->create(ProductRepositoryInterface::class);
+
+/** @var $installer CategorySetup */
+$installer = Bootstrap::getObjectManager()->create(CategorySetup::class);
+
+$eavConfig = Bootstrap::getObjectManager()->get(Config::class);
+$attribute = $eavConfig->getAttribute(Product::ENTITY, 'test_configurable');
+
+/* Create simple products per each option value*/
+/** @var AttributeOptionInterface[] $options */
+$options = $attribute->getOptions();
+
+$attributeValues = [];
+$attributeSetId = $installer->getAttributeSetId('catalog_product', 'Default');
+$associatedProductIds = [];
+$productIds = [10, 20];
+array_shift($options); //remove the first option which is empty
+/** @var WebsiteRepositoryInterface $repository */
+$repository = Bootstrap::getObjectManager()->get(WebsiteRepositoryInterface::class);
+$websiteId = $repository->get('test')->getId();
+foreach ($options as $option) {
+    /** @var $product Product */
+    $product = Bootstrap::getObjectManager()->create(Product::class);
+    $productId = array_shift($productIds);
+    $product->setTypeId(Type::TYPE_SIMPLE)
+        ->setId($productId)
+        ->setAttributeSetId($attributeSetId)
+        ->setWebsiteIds([1, $websiteId])
+        ->setName('Configurable Option' . $option->getLabel())
+        ->setSku('simple_' . $productId)
+        ->setPrice($productId)
+        ->setTestConfigurable($option->getValue())
+        ->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);
+
+    /** @var \Magento\CatalogInventory\Model\Stock\Item $stockItem */
+    $stockItem = Bootstrap::getObjectManager()->create(\Magento\CatalogInventory\Model\Stock\Item::class);
+    $stockItem->load($productId, 'product_id');
+
+    if (!$stockItem->getProductId()) {
+        $stockItem->setProductId($productId);
+    }
+    $stockItem->setUseConfigManageStock(1);
+    $stockItem->setQty(1000);
+    $stockItem->setIsQtyDecimal(0);
+    $stockItem->setIsInStock(1);
+    $stockItem->save();
+
+    $attributeValues[] = [
+        'label' => 'test',
+        'attribute_id' => $attribute->getId(),
+        'value_index' => $option->getValue(),
+    ];
+    $associatedProductIds[] = $product->getId();
+}
+
+/** @var $product Product */
+$product = Bootstrap::getObjectManager()->create(Product::class);
+
+/** @var Factory $optionsFactory */
+$optionsFactory = Bootstrap::getObjectManager()->create(Factory::class);
+
+$configurableAttributesData = [
+    [
+        'attribute_id' => $attribute->getId(),
+        'code' => $attribute->getAttributeCode(),
+        'label' => $attribute->getStoreLabel(),
+        'position' => '0',
+        'values' => $attributeValues,
+    ],
+];
+
+$configurableOptions = $optionsFactory->create($configurableAttributesData);
+
+$extensionConfigurableAttributes = $product->getExtensionAttributes();
+$extensionConfigurableAttributes->setConfigurableProductOptions($configurableOptions);
+$extensionConfigurableAttributes->setConfigurableProductLinks($associatedProductIds);
+
+$product->setExtensionAttributes($extensionConfigurableAttributes);
+
+// Remove any previously created product with the same id.
+/** @var \Magento\Framework\Registry $registry */
+$registry = Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+try {
+    $productToDelete = $productRepository->getById(1);
+    $productRepository->delete($productToDelete);
+
+    /** @var \Magento\Quote\Model\ResourceModel\Quote\Item $itemResource */
+    $itemResource = Bootstrap::getObjectManager()->get(\Magento\Quote\Model\ResourceModel\Quote\Item::class);
+    $itemResource->getConnection()->delete(
+        $itemResource->getMainTable(),
+        'product_id = ' . $productToDelete->getId()
+    );
+} catch (\Exception $e) {
+    // Nothing to remove
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+
+$product->setTypeId(Configurable::TYPE_CODE)
+    ->setId(1)
+    ->setAttributeSetId($attributeSetId)
+    ->setWebsiteIds([$websiteId])
+    ->setName('Configurable Product')
+    ->setSku('configurable')
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setStockData(['use_config_manage_stock' => 1, 'is_in_stock' => 1]);
+
+$productRepository->save($product);
+
+/** @var \Magento\Catalog\Api\CategoryLinkManagementInterface $categoryLinkManagement */
+$categoryLinkManagement = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Catalog\Api\CategoryLinkManagementInterface::class);
+
+$categoryLinkManagement->assignProductToCategories(
+    $product->getSku(),
+    [2]
+);
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_in_multiple_websites_rollback.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_in_multiple_websites_rollback.php
new file mode 100644
index 0000000000000..98e044d6b1a8a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_in_multiple_websites_rollback.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+$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\Api\ProductRepositoryInterface $productRepository */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+foreach (['simple_10', 'simple_20', 'configurable'] as $sku) {
+    try {
+        $product = $productRepository->get($sku, true);
+
+        $stockStatus = $objectManager->create(\Magento\CatalogInventory\Model\Stock\Status::class);
+        $stockStatus->load($product->getEntityId(), 'product_id');
+        $stockStatus->delete();
+
+        if ($product->getId()) {
+            $productRepository->delete($product);
+        }
+    } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+        //Product already removed
+    }
+}
+
+Resolver::getInstance()->requireDataFixture(
+    'Magento/ConfigurableProduct/_files/configurable_attribute_rollback.php'
+);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_in_multiple_websites.php b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_in_multiple_websites.php
new file mode 100644
index 0000000000000..bdfdb5943d4ba
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_in_multiple_websites.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture(
+    'Magento/Catalog/_files/product_associated.php'
+);
+Resolver::getInstance()->requireDataFixture(
+    'Magento/Catalog/_files/product_virtual_in_stock.php'
+);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+
+/** @var WebsiteRepositoryInterface $repository */
+$repository = $objectManager->get(WebsiteRepositoryInterface::class);
+$websiteId = $repository->get('test')->getId();
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(
+    \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE
+)->setAttributeSetId(
+    4
+)->setWebsiteIds(
+    [$websiteId]
+)->setName(
+    'Grouped Product'
+)->setSku(
+    'grouped-product'
+)->setPrice(
+    100
+)->setTaxClassId(
+    0
+)->setVisibility(
+    \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH
+)->setStatus(
+    \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
+);
+
+$newLinks = [];
+$productLinkFactory = $objectManager->get(\Magento\Catalog\Api\Data\ProductLinkInterfaceFactory::class);
+
+/** @var \Magento\Catalog\Api\Data\ProductLinkInterface $productLink */
+$productLink = $productLinkFactory->create();
+$linkedProduct = $productRepository->getById(1);
+$linkedProduct->setWebsiteIds([1, $websiteId])->save();
+$productLink->setSku($product->getSku())
+    ->setLinkType('associated')
+    ->setLinkedProductSku($linkedProduct->getSku())
+    ->setLinkedProductType($linkedProduct->getTypeId())
+    ->setPosition(1)
+    ->getExtensionAttributes()
+    ->setQty(1);
+$newLinks[] = $productLink;
+
+/** @var \Magento\Catalog\Api\Data\ProductLinkInterface $productLink */
+$productLink = $productLinkFactory->create();
+$linkedProduct = $productRepository->getById(21);
+$linkedProduct->setWebsiteIds([1, $websiteId])->save();
+$productLink->setSku($product->getSku())
+    ->setLinkType('associated')
+    ->setLinkedProductSku($linkedProduct->getSku())
+    ->setLinkedProductType($linkedProduct->getTypeId())
+    ->setPosition(2)
+    ->getExtensionAttributes()
+    ->setQty(2);
+$newLinks[] = $productLink;
+$product->setProductLinks($newLinks);
+$product->setStockData(['use_config_manage_stock' => 1, 'is_in_stock' => 1]);
+$productRepository->save($product);
+
+/** @var \Magento\Catalog\Api\CategoryLinkManagementInterface $categoryLinkManagement */
+$categoryLinkManagement = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Catalog\Api\CategoryLinkManagementInterface::class);
+
+$categoryLinkManagement->assignProductToCategories(
+    $product->getSku(),
+    [2]
+);
diff --git a/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_in_multiple_websites_rollback.php b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_in_multiple_websites_rollback.php
new file mode 100644
index 0000000000000..23d82d3de4d0e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_in_multiple_websites_rollback.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+use Magento\Framework\Exception\NoSuchEntityException;
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+/**
+ * @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
+ */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+    \Magento\Catalog\Api\ProductRepositoryInterface::class
+);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+try {
+    $productRepository->deleteById('simple');
+} catch (NoSuchEntityException $e) {
+    //already deleted
+}
+
+try {
+    $productRepository->deleteById('virtual-product');
+} catch (NoSuchEntityException $e) {
+    //already deleted
+}
+
+try {
+    /** @var $groupedProduct \Magento\Catalog\Model\Product */
+    $productRepository->deleteById('grouped-product');
+} catch (NoSuchEntityException $e) {
+    //already deleted
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_items_in_multiple_websites.php b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_items_in_multiple_websites.php
new file mode 100644
index 0000000000000..f047bdca83905
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_items_in_multiple_websites.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture(
+    'Magento/Catalog/_files/product_associated.php'
+);
+Resolver::getInstance()->requireDataFixture(
+    'Magento/Catalog/_files/product_virtual_in_stock.php'
+);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+
+/** @var WebsiteRepositoryInterface $repository */
+$repository = $objectManager->get(WebsiteRepositoryInterface::class);
+$websiteId = $repository->get('test')->getId();
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
+$product->isObjectNew(true);
+$product->setTypeId(
+    \Magento\GroupedProduct\Model\Product\Type\Grouped::TYPE_CODE
+)->setAttributeSetId(
+    4
+)->setWebsiteIds(
+    [1, $websiteId]
+)->setName(
+    'Grouped Product'
+)->setSku(
+    'grouped-product'
+)->setPrice(
+    100
+)->setTaxClassId(
+    0
+)->setVisibility(
+    \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH
+)->setStatus(
+    \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
+);
+
+$newLinks = [];
+$productLinkFactory = $objectManager->get(\Magento\Catalog\Api\Data\ProductLinkInterfaceFactory::class);
+
+/** @var \Magento\Catalog\Api\Data\ProductLinkInterface $productLink */
+$productLink = $productLinkFactory->create();
+$linkedProduct = $productRepository->getById(1);
+$linkedProduct->setWebsiteIds([1])->save();
+
+$productLink->setSku($product->getSku())
+    ->setLinkType('associated')
+    ->setLinkedProductSku($linkedProduct->getSku())
+    ->setLinkedProductType($linkedProduct->getTypeId())
+    ->setPosition(1)
+    ->getExtensionAttributes()
+    ->setQty(1);
+$newLinks[] = $productLink;
+
+/** @var \Magento\Catalog\Api\Data\ProductLinkInterface $productLink */
+$productLink = $productLinkFactory->create();
+$linkedProduct = $productRepository->getById(21);
+$linkedProduct->setWebsiteIds([$websiteId])->save();
+$productLink->setSku($product->getSku())
+    ->setLinkType('associated')
+    ->setLinkedProductSku($linkedProduct->getSku())
+    ->setLinkedProductType($linkedProduct->getTypeId())
+    ->setPosition(2)
+    ->getExtensionAttributes()
+    ->setQty(2);
+$newLinks[] = $productLink;
+$product->setProductLinks($newLinks);
+$product->setStockData(['use_config_manage_stock' => 1, 'is_in_stock' => 1]);
+$productRepository->save($product);
+
+/** @var \Magento\Catalog\Api\CategoryLinkManagementInterface $categoryLinkManagement */
+$categoryLinkManagement = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Catalog\Api\CategoryLinkManagementInterface::class);
+
+$categoryLinkManagement->assignProductToCategories(
+    $product->getSku(),
+    [2]
+);
diff --git a/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_items_in_multiple_websites_rollback.php b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_items_in_multiple_websites_rollback.php
new file mode 100644
index 0000000000000..37a49b9c08579
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/GroupedProduct/_files/product_grouped_items_in_multiple_websites_rollback.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+use Magento\Framework\Exception\NoSuchEntityException;
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+/**
+ * @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
+ */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+    \Magento\Catalog\Api\ProductRepositoryInterface::class
+);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+try {
+    $productRepository->deleteById('simple');
+} catch (NoSuchEntityException $e) {
+    //already deleted
+}
+
+try {
+    $productRepository->deleteById('virtual-product');
+} catch (NoSuchEntityException $e) {
+    //already deleted
+}
+
+try {
+    $productRepository->deleteById('grouped-product');
+} catch (NoSuchEntityException $e) {
+    //already deleted
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);

From 895c284fb15afaef3e6fb59302a045707aa25706 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <svizev.igor@gmail.com>
Date: Thu, 13 Aug 2020 18:42:11 +0300
Subject: [PATCH 1496/1718] Refactor not needed beofre and around plugins

---
 .../Category/Flat/Plugin/StoreGroup.php       | 35 +++++--------------
 .../Category/Product/Plugin/StoreGroup.php    | 34 +++++-------------
 .../Category/Product/Plugin/StoreView.php     |  8 ++---
 .../Indexer/Product/Eav/Plugin/StoreView.php  | 28 +++++++++------
 .../Indexer/Product/Flat/Plugin/Store.php     | 27 ++++++++------
 .../Product/Flat/Plugin/StoreGroup.php        | 27 ++++++++------
 .../Model/Indexer/Stock/Plugin/StoreGroup.php | 28 +++++++++------
 .../Indexer/Fulltext/Plugin/Store/Group.php   | 28 +++------------
 .../Indexer/Fulltext/Plugin/Store/View.php    | 28 +++------------
 .../Indexer/Design/Config/Plugin/Store.php    | 29 ++++++++-------
 10 files changed, 110 insertions(+), 162 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Plugin/StoreGroup.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Plugin/StoreGroup.php
index 670f19db725f7..16f96d794a97b 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Plugin/StoreGroup.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Plugin/StoreGroup.php
@@ -5,18 +5,13 @@
  */
 namespace Magento\Catalog\Model\Indexer\Category\Flat\Plugin;
 
-use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
-use Magento\Framework\Model\AbstractModel;
-use Magento\Framework\Indexer\IndexerRegistry;
 use Magento\Catalog\Model\Indexer\Category\Flat\State;
+use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\Framework\Model\AbstractModel;
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 
 class StoreGroup
 {
-    /**
-     * @var bool
-     */
-    private $needInvalidating;
-
     /**
      * @var IndexerRegistry
      */
@@ -48,35 +43,21 @@ protected function validate(AbstractModel $group)
         return $group->dataHasChangedFor('root_category_id') && !$group->isObjectNew();
     }
 
-    /**
-     * Check if need invalidate flat category indexer
-     *
-     * @param AbstractDb $subject
-     * @param AbstractModel $group
-     *
-     * @return void
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function beforeSave(AbstractDb $subject, AbstractModel $group)
-    {
-        $this->needInvalidating = $this->validate($group);
-    }
-
     /**
      * Invalidate flat category indexer if root category changed for store group
      *
      * @param AbstractDb $subject
-     * @param AbstractDb $objectResource
-     *
+     * @param AbstractDb $result
+     * @param AbstractModel $group
      * @return AbstractDb
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function afterSave(AbstractDb $subject, AbstractDb $objectResource)
+    public function afterSave(AbstractDb $subject, AbstractDb $result, AbstractModel $group)
     {
-        if ($this->needInvalidating && $this->state->isFlatEnabled()) {
+        if ($this->validate($group) && $this->state->isFlatEnabled()) {
             $this->indexerRegistry->get(State::INDEXER_ID)->invalidate();
         }
 
-        return $objectResource;
+        return $result;
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreGroup.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreGroup.php
index 005936a75e6d6..12a9d85dc416b 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreGroup.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreGroup.php
@@ -5,19 +5,14 @@
  */
 namespace Magento\Catalog\Model\Indexer\Category\Product\Plugin;
 
-use Magento\Framework\Indexer\IndexerRegistry;
-use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
-use Magento\Framework\Model\AbstractModel;
 use Magento\Catalog\Model\Indexer\Category\Product;
 use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
+use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\Framework\Model\AbstractModel;
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 
 class StoreGroup
 {
-    /**
-     * @var bool
-     */
-    private $needInvalidating;
-
     /**
      * @var IndexerRegistry
      */
@@ -40,36 +35,23 @@ public function __construct(
         $this->tableMaintainer = $tableMaintainer;
     }
 
-    /**
-     * Check if need invalidate flat category indexer
-     *
-     * @param AbstractDb $subject
-     * @param AbstractModel $group
-     *
-     * @return void
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function beforeSave(AbstractDb $subject, AbstractModel $group)
-    {
-        $this->needInvalidating = $this->validate($group);
-    }
-
     /**
      * Invalidate flat product
      *
      * @param AbstractDb $subject
-     * @param AbstractDb $objectResource
+     * @param AbstractDb $result
+     * @param AbstractModel $group
      *
      * @return AbstractDb
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function afterSave(AbstractDb $subject, AbstractDb $objectResource)
+    public function afterSave(AbstractDb $subject, AbstractDb $result, AbstractModel $group)
     {
-        if ($this->needInvalidating) {
+        if ($this->validate($group)) {
             $this->indexerRegistry->get(Product::INDEXER_ID)->invalidate();
         }
 
-        return $objectResource;
+        return $result;
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreView.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreView.php
index b6f9e6adf4a1c..78353f56a0e13 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreView.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreView.php
@@ -5,18 +5,18 @@
  */
 namespace Magento\Catalog\Model\Indexer\Category\Product\Plugin;
 
-use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 use Magento\Framework\Model\AbstractModel;
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 
 class StoreView extends StoreGroup
 {
     /**
      * Validate changes for invalidating indexer
      *
-     * @param \Magento\Framework\Model\AbstractModel $store
+     * @param AbstractModel $store
      * @return bool
      */
-    protected function validate(\Magento\Framework\Model\AbstractModel $store)
+    protected function validate(AbstractModel $store)
     {
         return $store->isObjectNew() || $store->dataHasChangedFor('group_id');
     }
@@ -36,7 +36,7 @@ public function afterSave(AbstractDb $subject, AbstractDb $objectResource, Abstr
             $this->tableMaintainer->createTablesForStore($store->getId());
         }
 
-        return parent::afterSave($subject, $objectResource);
+        return parent::afterSave($subject, $objectResource, $store);
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Plugin/StoreView.php b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Plugin/StoreView.php
index 95e525b2601f4..4503ca5ea23c7 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Plugin/StoreView.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Eav/Plugin/StoreView.php
@@ -3,21 +3,26 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Model\Indexer\Product\Eav\Plugin;
 
+use Magento\Catalog\Model\Indexer\Product\Eav\Processor;
+use Magento\Framework\Model\AbstractModel;
+use Magento\Store\Model\ResourceModel\Store;
+
 class StoreView
 {
     /**
      * Product attribute indexer processor
      *
-     * @var \Magento\Catalog\Model\Indexer\Product\Eav\Processor
+     * @var Processor
      */
     protected $_indexerEavProcessor;
 
     /**
-     * @param \Magento\Catalog\Model\Indexer\Product\Eav\Processor $indexerEavProcessor
+     * @param Processor $indexerEavProcessor
      */
-    public function __construct(\Magento\Catalog\Model\Indexer\Product\Eav\Processor $indexerEavProcessor)
+    public function __construct(Processor $indexerEavProcessor)
     {
         $this->_indexerEavProcessor = $indexerEavProcessor;
     }
@@ -25,18 +30,19 @@ public function __construct(\Magento\Catalog\Model\Indexer\Product\Eav\Processor
     /**
      * Before save handler
      *
-     * @param \Magento\Store\Model\ResourceModel\Store $subject
-     * @param \Magento\Framework\Model\AbstractModel $object
+     * @param Store $subject
+     * @param Store $result
+     * @param AbstractModel $object
      *
-     * @return void
+     * @return Store
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function beforeSave(
-        \Magento\Store\Model\ResourceModel\Store $subject,
-        \Magento\Framework\Model\AbstractModel $object
-    ) {
-        if ((!$object->getId() || $object->dataHasChangedFor('group_id')) && $object->getIsActive()) {
+    public function afterSave(Store $subject, Store $result, AbstractModel $object)
+    {
+        if (($object->isObjectNew() || $object->dataHasChangedFor('group_id')) && $object->getIsActive()) {
             $this->_indexerEavProcessor->markIndexerAsInvalid();
         }
+
+        return $result;
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/Store.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/Store.php
index ef7919193e609..38b9281f42cca 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/Store.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/Store.php
@@ -6,19 +6,23 @@
 
 namespace Magento\Catalog\Model\Indexer\Product\Flat\Plugin;
 
+use Magento\Catalog\Model\Indexer\Product\Flat\Processor;
+use Magento\Framework\Model\AbstractModel;
+use Magento\Store\Model\ResourceModel\Store as StoreResourceModel;
+
 class Store
 {
     /**
      * Product flat indexer processor
      *
-     * @var \Magento\Catalog\Model\Indexer\Product\Flat\Processor
+     * @var Processor
      */
     protected $_productFlatIndexerProcessor;
 
     /**
-     * @param \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor
+     * @param Processor $productFlatIndexerProcessor
      */
-    public function __construct(\Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor)
+    public function __construct(Processor $productFlatIndexerProcessor)
     {
         $this->_productFlatIndexerProcessor = $productFlatIndexerProcessor;
     }
@@ -26,18 +30,19 @@ public function __construct(\Magento\Catalog\Model\Indexer\Product\Flat\Processo
     /**
      * Before save handler
      *
-     * @param \Magento\Store\Model\ResourceModel\Store $subject
-     * @param \Magento\Framework\Model\AbstractModel $object
+     * @param StoreResourceModel $subject
+     * @param StoreResourceModel $result
+     * @param AbstractModel $object
      *
-     * @return void
+     * @return StoreResourceModel
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function beforeSave(
-        \Magento\Store\Model\ResourceModel\Store $subject,
-        \Magento\Framework\Model\AbstractModel $object
-    ) {
-        if (!$object->getId() || $object->dataHasChangedFor('group_id')) {
+    public function afterSave(StoreResourceModel $subject, StoreResourceModel $result, AbstractModel $object)
+    {
+        if ($object->isObjectNew() || $object->dataHasChangedFor('group_id')) {
             $this->_productFlatIndexerProcessor->markIndexerAsInvalid();
         }
+
+        return $result;
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/StoreGroup.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/StoreGroup.php
index df62fe8d349e4..1276e60ac74b0 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/StoreGroup.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Plugin/StoreGroup.php
@@ -6,19 +6,23 @@
 
 namespace Magento\Catalog\Model\Indexer\Product\Flat\Plugin;
 
+use Magento\Catalog\Model\Indexer\Product\Flat\Processor;
+use Magento\Framework\Model\AbstractModel;
+use Magento\Store\Model\ResourceModel\Group;
+
 class StoreGroup
 {
     /**
      * Product flat indexer processor
      *
-     * @var \Magento\Catalog\Model\Indexer\Product\Flat\Processor
+     * @var Processor
      */
     protected $_productFlatIndexerProcessor;
 
     /**
-     * @param \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor
+     * @param Processor $productFlatIndexerProcessor
      */
-    public function __construct(\Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor)
+    public function __construct(Processor $productFlatIndexerProcessor)
     {
         $this->_productFlatIndexerProcessor = $productFlatIndexerProcessor;
     }
@@ -26,18 +30,19 @@ public function __construct(\Magento\Catalog\Model\Indexer\Product\Flat\Processo
     /**
      * Before save handler
      *
-     * @param \Magento\Store\Model\ResourceModel\Group $subject
-     * @param \Magento\Framework\Model\AbstractModel $object
+     * @param Group $subject
+     * @param Group $result
+     * @param AbstractModel $object
      *
-     * @return void
+     * @return Group
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function beforeSave(
-        \Magento\Store\Model\ResourceModel\Group $subject,
-        \Magento\Framework\Model\AbstractModel $object
-    ) {
-        if (!$object->getId() || $object->dataHasChangedFor('root_category_id')) {
+    public function afterSave(Group $subject, Group $result, AbstractModel $object)
+    {
+        if ($object->isObjectNew() || $object->dataHasChangedFor('root_category_id')) {
             $this->_productFlatIndexerProcessor->markIndexerAsInvalid();
         }
+
+        return $result;
     }
 }
diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Plugin/StoreGroup.php b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Plugin/StoreGroup.php
index c171e9bda2612..29a8b1e5404fa 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Plugin/StoreGroup.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Plugin/StoreGroup.php
@@ -3,19 +3,24 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\CatalogInventory\Model\Indexer\Stock\Plugin;
 
+use Magento\CatalogInventory\Model\Indexer\Stock\Processor;
+use Magento\Framework\Model\AbstractModel;
+use Magento\Store\Model\ResourceModel\Group;
+
 class StoreGroup
 {
     /**
-     * @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor
+     * @var Processor
      */
     protected $_indexerProcessor;
 
     /**
-     * @param \Magento\CatalogInventory\Model\Indexer\Stock\Processor  $indexerProcessor
+     * @param Processor $indexerProcessor
      */
-    public function __construct(\Magento\CatalogInventory\Model\Indexer\Stock\Processor $indexerProcessor)
+    public function __construct(Processor $indexerProcessor)
     {
         $this->_indexerProcessor = $indexerProcessor;
     }
@@ -23,18 +28,19 @@ public function __construct(\Magento\CatalogInventory\Model\Indexer\Stock\Proces
     /**
      * Before save handler
      *
-     * @param \Magento\Store\Model\ResourceModel\Group $subject
-     * @param \Magento\Framework\Model\AbstractModel $object
+     * @param Group $subject
+     * @param Group $result
+     * @param AbstractModel $object
      *
-     * @return void
+     * @return Group
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function beforeSave(
-        \Magento\Store\Model\ResourceModel\Group $subject,
-        \Magento\Framework\Model\AbstractModel $object
-    ) {
-        if (!$object->getId() || $object->dataHasChangedFor('website_id')) {
+    public function afterSave(Group $subject, Group $result, AbstractModel $object)
+    {
+        if ($object->isObjectNew() || $object->dataHasChangedFor('website_id')) {
             $this->_indexerProcessor->markIndexerAsInvalid();
         }
+
+        return $result;
     }
 }
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Store/Group.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Store/Group.php
index 73a79f7c87239..e7bbf72bdd7e3 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Store/Group.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Store/Group.php
@@ -5,47 +5,29 @@
  */
 namespace Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\Store;
 
+use Magento\CatalogSearch\Model\Indexer\Fulltext as FulltextIndexer;
 use Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\AbstractPlugin as AbstractIndexerPlugin;
-use Magento\Store\Model\ResourceModel\Group as StoreGroupResourceModel;
 use Magento\Framework\Model\AbstractModel;
-use Magento\CatalogSearch\Model\Indexer\Fulltext as FulltextIndexer;
+use Magento\Store\Model\ResourceModel\Group as StoreGroupResourceModel;
 
 /**
  * Plugin for Magento\Store\Model\ResourceModel\Group
  */
 class Group extends AbstractIndexerPlugin
 {
-    /**
-     * @var bool
-     */
-    private $needInvalidation;
-
-    /**
-     * Check if indexer requires invalidation after store group save
-     *
-     * @param StoreGroupResourceModel $subject
-     * @param AbstractModel $group
-     * @return void
-     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function beforeSave(StoreGroupResourceModel $subject, AbstractModel $group)
-    {
-        $this->needInvalidation = !$group->isObjectNew() && $group->dataHasChangedFor('website_id');
-    }
-
     /**
      * Invalidate indexer on store group save
      *
      * @param StoreGroupResourceModel $subject
      * @param StoreGroupResourceModel $result
+     * @param AbstractModel $group
      * @return StoreGroupResourceModel
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function afterSave(StoreGroupResourceModel $subject, StoreGroupResourceModel $result)
+    public function afterSave(StoreGroupResourceModel $subject, StoreGroupResourceModel $result, AbstractModel $group)
     {
-        if ($this->needInvalidation) {
+        if (!$group->isObjectNew() && $group->dataHasChangedFor('website_id')) {
             $this->indexerRegistry->get(FulltextIndexer::INDEXER_ID)->invalidate();
         }
 
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Store/View.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Store/View.php
index 7f0c5fdae6d42..242a4f3f0c36b 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Store/View.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Store/View.php
@@ -5,47 +5,29 @@
  */
 namespace Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\Store;
 
+use Magento\CatalogSearch\Model\Indexer\Fulltext as FulltextIndexer;
 use Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\AbstractPlugin as AbstractIndexerPlugin;
-use Magento\Store\Model\ResourceModel\Store as StoreResourceModel;
 use Magento\Framework\Model\AbstractModel;
-use Magento\CatalogSearch\Model\Indexer\Fulltext as FulltextIndexer;
+use Magento\Store\Model\ResourceModel\Store as StoreResourceModel;
 
 /**
  * Plugin for Magento\Store\Model\ResourceModel\Store
  */
 class View extends AbstractIndexerPlugin
 {
-    /**
-     * @var bool
-     */
-    private $needInvalidation;
-
-    /**
-     * Check if indexer requires invalidation after store view save
-     *
-     * @param StoreResourceModel $subject
-     * @param AbstractModel $store
-     * @return void
-     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function beforeSave(StoreResourceModel $subject, AbstractModel $store)
-    {
-        $this->needInvalidation = $store->isObjectNew();
-    }
-
     /**
      * Invalidate indexer on store view save
      *
      * @param StoreResourceModel $subject
      * @param StoreResourceModel $result
+     * @param AbstractModel $store
      * @return StoreResourceModel
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function afterSave(StoreResourceModel $subject, StoreResourceModel $result)
+    public function afterSave(StoreResourceModel $subject, StoreResourceModel $result, AbstractModel $store)
     {
-        if ($this->needInvalidation) {
+        if ($store->isObjectNew()) {
             $this->indexerRegistry->get(FulltextIndexer::INDEXER_ID)->invalidate();
         }
 
diff --git a/app/code/Magento/Theme/Model/Indexer/Design/Config/Plugin/Store.php b/app/code/Magento/Theme/Model/Indexer/Design/Config/Plugin/Store.php
index ca4a238fd1ff4..18ce1be2e68d1 100644
--- a/app/code/Magento/Theme/Model/Indexer/Design/Config/Plugin/Store.php
+++ b/app/code/Magento/Theme/Model/Indexer/Design/Config/Plugin/Store.php
@@ -6,7 +6,7 @@
 namespace Magento\Theme\Model\Indexer\Design\Config\Plugin;
 
 use Magento\Framework\Indexer\IndexerRegistry;
-use Magento\Store\Model\Store as StoreStore;
+use Magento\Store\Model\Store as StoreModel;
 use Magento\Theme\Model\Data\Design\Config;
 
 class Store
@@ -19,42 +19,41 @@ class Store
     /**
      * @param IndexerRegistry $indexerRegistry
      */
-    public function __construct(
-        IndexerRegistry $indexerRegistry
-    ) {
+    public function __construct(IndexerRegistry $indexerRegistry)
+    {
         $this->indexerRegistry = $indexerRegistry;
     }
 
     /**
      * Invalidate design config grid indexer on store creation
      *
-     * @param StoreStore $subject
-     * @param \Closure $proceed
-     * @return StoreStore
+     * @param StoreModel $subject
+     * @param StoreModel $result
+     * @return StoreModel
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function aroundSave(StoreStore $subject, \Closure $proceed)
+    public function afterSave(StoreModel $subject, StoreModel $result)
     {
-        $isObjectNew = $subject->getId() == 0;
-        $result = $proceed();
-        if ($isObjectNew) {
+        if ($result->isObjectNew()) {
             $this->indexerRegistry->get(Config::DESIGN_CONFIG_GRID_INDEXER_ID)->invalidate();
         }
+
         return $result;
     }
 
     /**
      * Invalidate design config grid indexer on store removal
      *
-     * @param StoreStore $subject
-     * @param StoreStore $result
-     * @return StoreStore
+     * @param StoreModel $subject
+     * @param StoreModel $result
+     * @return StoreModel
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function afterDelete(StoreStore $subject, $result)
+    public function afterDelete(StoreModel $subject, $result)
     {
         $this->indexerRegistry->get(Config::DESIGN_CONFIG_GRID_INDEXER_ID)->invalidate();
+
         return $result;
     }
 }

From 6e53e0d90b3cbc86ee368c35605615d713fe9682 Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Fri, 14 Aug 2020 11:04:05 +0530
Subject: [PATCH 1497/1718] Fixed Unit Tests

---
 .../Newsletter/Test/Unit/Model/SubscriptionManagerTest.php  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Newsletter/Test/Unit/Model/SubscriptionManagerTest.php b/app/code/Magento/Newsletter/Test/Unit/Model/SubscriptionManagerTest.php
index 4e1f18a26a95a..6139d86191f44 100644
--- a/app/code/Magento/Newsletter/Test/Unit/Model/SubscriptionManagerTest.php
+++ b/app/code/Magento/Newsletter/Test/Unit/Model/SubscriptionManagerTest.php
@@ -454,7 +454,7 @@ public function subscribeCustomerDataProvider(): array
                     'subscriber_status' => Subscriber::STATUS_SUBSCRIBED,
                     'subscriber_confirm_code' => '',
                 ],
-                'needToSendEmail' => false,
+                'needToSendEmail' => true,
             ],
             'Update subscription data: subscription confirm required ' => [
                 'subscriber_data' => [
@@ -618,7 +618,7 @@ public function unsubscribeCustomerDataProvider(): array
                     'subscriber_status' => Subscriber::STATUS_NOT_ACTIVE,
                     'subscriber_confirm_code' => '',
                 ],
-                'needToSendEmail' => false,
+                'needToSendEmail' => true,
             ],
             'Update subscription data' => [
                 'subscriber_data' => [
@@ -642,7 +642,7 @@ public function unsubscribeCustomerDataProvider(): array
                     'subscriber_status' => Subscriber::STATUS_UNSUBSCRIBED,
                     'subscriber_confirm_code' => '',
                 ],
-                'needToSendEmail' => false,
+                'needToSendEmail' => true,
             ],
         ];
     }

From 560c59fe7996b797a87426b18f7b8d206a079474 Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Fri, 14 Aug 2020 09:31:27 +0300
Subject: [PATCH 1498/1718] Refactoring the code in separate modules

---
 .../Product/BundleOptionDataProvider.php      |  3 +--
 .../Model/Wishlist}/BundleOptions.php         | 10 ++++-----
 .../Magento/BundleGraphQl/etc/graphql/di.xml  |  7 ++++++
 .../Magento/BundleGraphQl/etc/schema.graphqls |  4 ++++
 .../Magento/CatalogGraphQl/etc/graphql/di.xml |  8 +++++++
 .../CatalogGraphQl/etc/schema.graphqls        |  6 +++++
 .../Model/Wishlist}/ChildSku.php              | 14 ++++++------
 .../Model/Wishlist}/ConfigurableOptions.php   | 14 ++++++------
 .../etc/graphql/di.xml                        |  7 ++++++
 .../etc/schema.graphqls                       |  5 +++++
 .../DownloadableGraphQl/etc/graphql/di.xml    |  7 ++++++
 .../DownloadableGraphQl/etc/schema.graphqls   |  5 +++++
 app/code/Magento/WishlistGraphQl/etc/di.xml   | 21 ------------------
 .../WishlistGraphQl/etc/schema.graphqls       | 22 +------------------
 14 files changed, 70 insertions(+), 63 deletions(-)
 rename app/code/Magento/{Wishlist => Bundle}/Model/Product/BundleOptionDataProvider.php (98%)
 rename app/code/Magento/{WishlistGraphQl/Model/Resolver/Type/Bundle => BundleGraphQl/Model/Wishlist}/BundleOptions.php (80%)
 rename app/code/Magento/{WishlistGraphQl/Model/Resolver/Type/Configurable => ConfigurableProductGraphQl/Model/Wishlist}/ChildSku.php (68%)
 rename app/code/Magento/{WishlistGraphQl/Model/Resolver/Type/Configurable => ConfigurableProductGraphQl/Model/Wishlist}/ConfigurableOptions.php (78%)
 delete mode 100644 app/code/Magento/WishlistGraphQl/etc/di.xml

diff --git a/app/code/Magento/Wishlist/Model/Product/BundleOptionDataProvider.php b/app/code/Magento/Bundle/Model/Product/BundleOptionDataProvider.php
similarity index 98%
rename from app/code/Magento/Wishlist/Model/Product/BundleOptionDataProvider.php
rename to app/code/Magento/Bundle/Model/Product/BundleOptionDataProvider.php
index 406524c7a189d..d6b7419a9f934 100644
--- a/app/code/Magento/Wishlist/Model/Product/BundleOptionDataProvider.php
+++ b/app/code/Magento/Bundle/Model/Product/BundleOptionDataProvider.php
@@ -5,11 +5,10 @@
  */
 declare(strict_types=1);
 
-namespace Magento\Wishlist\Model\Product;
+namespace Magento\Bundle\Model\Product;
 
 use Magento\Bundle\Helper\Catalog\Product\Configuration;
 use Magento\Bundle\Model\Option;
-use Magento\Bundle\Model\Product\Type;
 use Magento\Catalog\Model\Product;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Pricing\Helper\Data;
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Bundle/BundleOptions.php b/app/code/Magento/BundleGraphQl/Model/Wishlist/BundleOptions.php
similarity index 80%
rename from app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Bundle/BundleOptions.php
rename to app/code/Magento/BundleGraphQl/Model/Wishlist/BundleOptions.php
index d11200d96ce1a..217f822e771da 100644
--- a/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Bundle/BundleOptions.php
+++ b/app/code/Magento/BundleGraphQl/Model/Wishlist/BundleOptions.php
@@ -5,14 +5,14 @@
  */
 declare(strict_types=1);
 
-namespace Magento\WishlistGraphQl\Model\Resolver\Type\Bundle;
+namespace Magento\BundleGraphQl\Model\Wishlist;
 
-use Magento\Wishlist\Model\Product\BundleOptionDataProvider;
+use Magento\Bundle\Model\Product\BundleOptionDataProvider;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
 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\Wishlist\Model\Item;
 
 /**
  * Fetches the selected bundle options
@@ -43,9 +43,9 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        if (!$value['itemModel'] instanceof Item) {
+        if (!$value['itemModel'] instanceof ItemInterface) {
             throw new LocalizedException(__('"itemModel" should be a "%instance" instance', [
-                'instance' => Item::class
+                'instance' => ItemInterface::class
             ]));
         }
 
diff --git a/app/code/Magento/BundleGraphQl/etc/graphql/di.xml b/app/code/Magento/BundleGraphQl/etc/graphql/di.xml
index 863e152fbe177..7fe0b2a53677c 100644
--- a/app/code/Magento/BundleGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/BundleGraphQl/etc/graphql/di.xml
@@ -100,4 +100,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\WishlistGraphQl\Model\Resolver\Type\WishlistItemType">
+        <arguments>
+            <argument name="supportedTypes" xsi:type="array">
+                <item name="bundle" xsi:type="string">BundleWishlistItem</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/BundleGraphQl/etc/schema.graphqls b/app/code/Magento/BundleGraphQl/etc/schema.graphqls
index a66fa397020a7..75731516daf4c 100644
--- a/app/code/Magento/BundleGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/BundleGraphQl/etc/schema.graphqls
@@ -117,3 +117,7 @@ type ItemSelectedBundleOptionValue @doc(description: "A list of values for the s
     quantity: Float! @doc(description: "Indicates how many of this bundle product were ordered")
     price: Money! @doc(description: "The price of the child bundle product")
 }
+
+type BundleWishlistItem implements WishlistItemInterface {
+    bundle_options: [SelectedBundleOption!] @doc(description: "An array containing information about the selected bundled items") @resolver(class: "\\Magento\\BundleGraphQl\\Model\\Wishlist\\BundleOptions")
+}
diff --git a/app/code/Magento/CatalogGraphQl/etc/graphql/di.xml b/app/code/Magento/CatalogGraphQl/etc/graphql/di.xml
index c4f9bc26ee9f3..9ed36098ab6eb 100644
--- a/app/code/Magento/CatalogGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/CatalogGraphQl/etc/graphql/di.xml
@@ -180,4 +180,12 @@
             <argument name="templateFilterModel" xsi:type="string">Magento\Widget\Model\Template\FilterEmulate</argument>
         </arguments>
     </type>
+    <type name="Magento\WishlistGraphQl\Model\Resolver\Type\WishlistItemType">
+        <arguments>
+            <argument name="supportedTypes" xsi:type="array">
+                <item name="simple" xsi:type="string">SimpleWishlistItem</item>
+                <item name="virtual" xsi:type="string">VirtualWishlistItem</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
index 35f2c767b3e1e..1a4fd6b8bd986 100644
--- a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
@@ -492,3 +492,9 @@ type StoreConfig @doc(description: "The type contains information about a store
     catalog_default_sort_by : String @doc(description: "Default Sort By.")
     root_category_id: Int @doc(description: "The ID of the root category") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\RootCategoryId")
 }
+
+type SimpleWishlistItem implements WishlistItemInterface @doc(description: "Simple Wishlist Item") {
+}
+
+type VirtualWishlistItem implements WishlistItemInterface @doc(description: "Virtual Wishlist Item") {
+}
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Configurable/ChildSku.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Wishlist/ChildSku.php
similarity index 68%
rename from app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Configurable/ChildSku.php
rename to app/code/Magento/ConfigurableProductGraphQl/Model/Wishlist/ChildSku.php
index a6c77cbe9da9c..84decab81c96a 100644
--- a/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Configurable/ChildSku.php
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Wishlist/ChildSku.php
@@ -5,13 +5,13 @@
  */
 declare(strict_types=1);
 
-namespace Magento\WishlistGraphQl\Model\Resolver\Type\Configurable;
+namespace Magento\ConfigurableProductGraphQl\Model\Wishlist;
 
+use Magento\Catalog\Model\Product;
 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\Wishlist\Model\Item;
 
 /**
  * Fetches the simple child sku of configurable product
@@ -28,15 +28,15 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        if (!$value['itemModel'] instanceof Item) {
+        if (!$value['model'] instanceof Product) {
             throw new LocalizedException(__('"itemModel" should be a "%instance" instance', [
-                'instance' => Item::class
+                'instance' => Product::class
             ]));
         }
 
-        /** @var Item $wishlistItem */
-        $wishlistItem = $value['itemModel'];
-        $optionProduct = $wishlistItem->getProduct()->getCustomOption('simple_product')->getProduct();
+        /** @var Product $product */
+        $product = $value['model'];
+        $optionProduct = $product->getCustomOption('simple_product')->getProduct();
 
         return $optionProduct->getSku();
     }
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Configurable/ConfigurableOptions.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Wishlist/ConfigurableOptions.php
similarity index 78%
rename from app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Configurable/ConfigurableOptions.php
rename to app/code/Magento/ConfigurableProductGraphQl/Model/Wishlist/ConfigurableOptions.php
index 1090c8e5aaa1c..6fcb3e118e5f1 100644
--- a/app/code/Magento/WishlistGraphQl/Model/Resolver/Type/Configurable/ConfigurableOptions.php
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Wishlist/ConfigurableOptions.php
@@ -5,14 +5,14 @@
  */
 declare(strict_types=1);
 
-namespace Magento\WishlistGraphQl\Model\Resolver\Type\Configurable;
+namespace Magento\ConfigurableProductGraphQl\Model\Wishlist;
 
 use Magento\Catalog\Helper\Product\Configuration;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
 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\Wishlist\Model\Item;
 
 /**
  * Fetches the selected configurable options
@@ -43,17 +43,17 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        if (!$value['itemModel'] instanceof Item) {
+        if (!$value['itemModel'] instanceof ItemInterface) {
             throw new LocalizedException(__('"itemModel" should be a "%instance" instance', [
-                'instance' => Item::class
+                'instance' => ItemInterface::class
             ]));
         }
 
-        /** @var Item $wishlistItem */
-        $wishlistItem = $value['itemModel'];
+        /** @var ItemInterface $item */
+        $item = $value['itemModel'];
         $result = [];
 
-        foreach ($this->configurationHelper->getOptions($wishlistItem) as $option) {
+        foreach ($this->configurationHelper->getOptions($item) as $option) {
             $result[] = [
                 'id' => $option['option_id'],
                 'option_label' => $option['label'],
diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/graphql/di.xml b/app/code/Magento/ConfigurableProductGraphQl/etc/graphql/di.xml
index f82bb0dbd4d91..808ca62f7e149 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/ConfigurableProductGraphQl/etc/graphql/di.xml
@@ -36,4 +36,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\WishlistGraphQl\Model\Resolver\Type\WishlistItemType">
+        <arguments>
+            <argument name="supportedTypes" xsi:type="array">
+                <item name="configurable" xsi:type="string">ConfigurableWishlistItem</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
index 6e85653380acc..6690835237ccf 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
@@ -68,3 +68,8 @@ type SelectedConfigurableOption {
     value_id: Int!
     value_label: String!
 }
+
+type ConfigurableWishlistItem implements WishlistItemInterface {
+    child_sku: String! @doc(description: "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")
+}
diff --git a/app/code/Magento/DownloadableGraphQl/etc/graphql/di.xml b/app/code/Magento/DownloadableGraphQl/etc/graphql/di.xml
index c95667de15ac3..51a630d59ca0f 100644
--- a/app/code/Magento/DownloadableGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/DownloadableGraphQl/etc/graphql/di.xml
@@ -39,4 +39,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\WishlistGraphQl\Model\Resolver\Type\WishlistItemType">
+        <arguments>
+            <argument name="supportedTypes" xsi:type="array">
+                <item name="downloadable" xsi:type="string">DownloadableWishlistItem</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..8795b70475f1f 100644
--- a/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
@@ -64,3 +64,8 @@ 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 DownloadableWishlistItem implements WishlistItemInterface @doc(description: "Downloadable Wishlist Item") {
+    links_v2: [DownloadableProductLinks] @doc(description: "An array containing information about the selected links") @resolver(class: "\\Magento\\DownloadableGraphQl\\Model\\Wishlist\\ItemLinks")
+    samples: [DownloadableProductSamples] @doc(description: "DownloadableProductSamples defines characteristics of a downloadable product") @resolver(class: "Magento\\DownloadableGraphQl\\Resolver\\Product\\Samples")
+}
diff --git a/app/code/Magento/WishlistGraphQl/etc/di.xml b/app/code/Magento/WishlistGraphQl/etc/di.xml
deleted file mode 100644
index de1a62225672a..0000000000000
--- a/app/code/Magento/WishlistGraphQl/etc/di.xml
+++ /dev/null
@@ -1,21 +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:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\WishlistGraphQl\Model\Resolver\Type\WishlistItemType">
-        <arguments>
-            <argument name="supportedTypes" xsi:type="array">
-                <item name="simple" xsi:type="string">SimpleWishlistItem</item>
-                <item name="virtual" xsi:type="string">VirtualWishlistItem</item>
-                <item name="configurable" xsi:type="string">ConfigurableWishlistItem</item>
-                <item name="downloadable" xsi:type="string">DownloadableWishlistItem</item>
-                <item name="bundle" xsi:type="string">BundleWishlistItem</item>
-            </argument>
-        </arguments>
-    </type>
-</config>
diff --git a/app/code/Magento/WishlistGraphQl/etc/schema.graphqls b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
index a7c8003a7c3e7..f6ff44e34e6c5 100644
--- a/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
@@ -24,7 +24,7 @@ type WishlistOutput @doc(description: "Deprecated: `Wishlist` type should be use
 
 type Wishlist {
     id: ID @doc(description: "Wishlist unique identifier")
-    items: [WishlistItem] @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\WishlistItemsResolver") @doc(description: "Use field `items_v2` from type `Wishlist` instead")
+    items: [WishlistItem] @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\WishlistItemsResolver") @deprecated(description: "Use field `items_v2` from type `Wishlist` instead")
     items_v2: [WishlistItemInterface] @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\WishlistItems") @doc(description: "An array of items in the customer's wishlist")
     items_count: Int @doc(description: "The number of items in the wish list")
     sharing_code: String @doc(description: "An encrypted code that Magento uses to link to the wish list")
@@ -40,26 +40,6 @@ interface WishlistItemInterface @typeResolver(class: "Magento\\WishlistGraphQl\\
     customizable_options: [SelectedCustomizableOption]
 }
 
-type SimpleWishlistItem implements WishlistItemInterface @doc(description: "Simple Wishlist Item") {
-}
-
-type VirtualWishlistItem implements WishlistItemInterface @doc(description: "Virtual Wishlist Item") {
-}
-
-type ConfigurableWishlistItem implements WishlistItemInterface {
-    child_sku: String! @doc(description: "SKU of the simple product corresponding to a set of selected configurable options.") @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\Type\\Configurable\\ChildSku")
-    configurable_options: [SelectedConfigurableOption!] @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\Type\\Configurable\\ConfigurableOptions")
-}
-
-type DownloadableWishlistItem implements WishlistItemInterface @doc(description: "Downloadable Wishlist Item") {
-    links_v2: [DownloadableProductLinks] @doc(description: "An array containing information about the selected links") @resolver(class: "\\Magento\\DownloadableGraphQl\\Model\\Wishlist\\ItemLinks")
-    samples: [DownloadableProductSamples] @doc(description: "DownloadableProductSamples defines characteristics of a downloadable product") @resolver(class: "Magento\\DownloadableGraphQl\\Resolver\\Product\\Samples")
-}
-
-type BundleWishlistItem implements WishlistItemInterface {
-    bundle_options: [SelectedBundleOption!] @doc(description: "An array containing information about the selected bundled items") @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\Type\\Bundle\\BundleOptions")
-}
-
 type WishlistItem {
     id: Int @doc(description: "The wish list item ID")
     qty: Float @doc(description: "The quantity of this wish list item"),

From b213b797f7563f67706d15f702a20fd2f388cc59 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <svizev.igor@gmail.com>
Date: Fri, 14 Aug 2020 09:33:08 +0300
Subject: [PATCH 1499/1718] Refactor not needed before and around plugins

Update tests
---
 .../Category/Flat/Plugin/StoreGroupTest.php   | 27 ++++----
 .../Category/Flat/Plugin/StoreViewTest.php    | 38 ++++++------
 .../Product/Plugin/StoreGroupTest.php         | 59 ++++++++++--------
 .../Category/Product/Plugin/StoreViewTest.php | 47 ++++++++------
 .../Product/Eav/Plugin/StoreViewTest.php      | 61 ++++++++++++++-----
 .../Product/Flat/Plugin/StoreGroupTest.php    | 47 +++++++-------
 .../Indexer/Product/Flat/Plugin/StoreTest.php | 48 ++++++++-------
 .../Indexer/Stock/Plugin/StoreGroupTest.php   | 24 ++++----
 .../Fulltext/Plugin/Store/GroupTest.php       | 33 +++++-----
 .../Fulltext/Plugin/Store/ViewTest.php        | 28 +++------
 .../Design/Config/Plugin/StoreTest.php        | 49 ++++++---------
 11 files changed, 249 insertions(+), 212 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Flat/Plugin/StoreGroupTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Flat/Plugin/StoreGroupTest.php
index 7dba4ddfd3d8c..cb4fd12e8d6f2 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Flat/Plugin/StoreGroupTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Flat/Plugin/StoreGroupTest.php
@@ -11,7 +11,6 @@
 use Magento\Catalog\Model\Indexer\Category\Flat\State;
 use Magento\Framework\Indexer\IndexerInterface;
 use Magento\Framework\Indexer\IndexerRegistry;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Store\Model\Group as GroupModel;
 use Magento\Store\Model\ResourceModel\Group;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -22,32 +21,32 @@ class StoreGroupTest extends TestCase
     /**
      * @var MockObject|IndexerInterface
      */
-    protected $indexerMock;
+    private $indexerMock;
 
     /**
      * @var MockObject|State
      */
-    protected $stateMock;
+    private $stateMock;
 
     /**
      * @var StoreGroup
      */
-    protected $model;
+    private $model;
 
     /**
      * @var MockObject|Group
      */
-    protected $subjectMock;
+    private $subjectMock;
 
     /**
      * @var IndexerRegistry|MockObject
      */
-    protected $indexerRegistryMock;
+    private $indexerRegistryMock;
 
     /**
      * @var MockObject|GroupModel
      */
-    protected $groupMock;
+    private $groupMock;
 
     protected function setUp(): void
     {
@@ -70,14 +69,10 @@ protected function setUp(): void
 
         $this->indexerRegistryMock = $this->createPartialMock(IndexerRegistry::class, ['get']);
 
-        $this->model = (new ObjectManager($this))
-            ->getObject(
-                StoreGroup::class,
-                ['indexerRegistry' => $this->indexerRegistryMock, 'state' => $this->stateMock]
-            );
+        $this->model = new StoreGroup($this->indexerRegistryMock, $this->stateMock);
     }
 
-    public function testBeforeAndAfterSave()
+    public function testAfterSave(): void
     {
         $this->stateMock->expects($this->once())->method('isFlatEnabled')->willReturn(true);
         $this->indexerMock->expects($this->once())->method('invalidate');
@@ -90,14 +85,14 @@ public function testBeforeAndAfterSave()
             ->with('root_category_id')
             ->willReturn(true);
         $this->groupMock->expects($this->once())->method('isObjectNew')->willReturn(false);
-        $this->model->beforeSave($this->subjectMock, $this->groupMock);
+
         $this->assertSame(
             $this->subjectMock,
             $this->model->afterSave($this->subjectMock, $this->subjectMock, $this->groupMock)
         );
     }
 
-    public function testBeforeAndAfterSaveNotNew()
+    public function testAfterSaveNotNew(): void
     {
         $this->stateMock->expects($this->never())->method('isFlatEnabled');
         $this->groupMock->expects($this->once())
@@ -105,7 +100,7 @@ public function testBeforeAndAfterSaveNotNew()
             ->with('root_category_id')
             ->willReturn(true);
         $this->groupMock->expects($this->once())->method('isObjectNew')->willReturn(true);
-        $this->model->beforeSave($this->subjectMock, $this->groupMock);
+
         $this->assertSame(
             $this->subjectMock,
             $this->model->afterSave($this->subjectMock, $this->subjectMock, $this->groupMock)
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Flat/Plugin/StoreViewTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Flat/Plugin/StoreViewTest.php
index 6f39cc9a7b220..d818af8f1233c 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Flat/Plugin/StoreViewTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Flat/Plugin/StoreViewTest.php
@@ -12,6 +12,7 @@
 use Magento\Framework\Indexer\IndexerInterface;
 use Magento\Framework\Indexer\IndexerRegistry;
 use Magento\Store\Model\ResourceModel\Store;
+use Magento\Store\Model\Store as StoreModel;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -20,27 +21,27 @@ class StoreViewTest extends TestCase
     /**
      * @var MockObject|IndexerInterface
      */
-    protected $indexerMock;
+    private $indexerMock;
 
     /**
      * @var MockObject|State
      */
-    protected $stateMock;
+    private $stateMock;
 
     /**
      * @var StoreView
      */
-    protected $model;
+    private $model;
 
     /**
      * @var IndexerRegistry|MockObject
      */
-    protected $indexerRegistryMock;
+    private $indexerRegistryMock;
 
     /**
-     * @var MockObject
+     * @var Store|MockObject
      */
-    protected $subjectMock;
+    private $subjectMock;
 
     protected function setUp(): void
     {
@@ -65,50 +66,51 @@ protected function setUp(): void
         $this->model = new StoreView($this->indexerRegistryMock, $this->stateMock);
     }
 
-    public function testBeforeAndAfterSaveNewObject()
+    public function testAfterSaveNewObject(): void
     {
         $this->mockConfigFlatEnabled();
         $this->mockIndexerMethods();
         $storeMock = $this->createPartialMock(
-            \Magento\Store\Model\Store::class,
+            StoreModel::class,
             ['isObjectNew', 'dataHasChangedFor']
         );
         $storeMock->expects($this->once())->method('isObjectNew')->willReturn(true);
-        $this->model->beforeSave($this->subjectMock, $storeMock);
+
         $this->assertSame(
             $this->subjectMock,
             $this->model->afterSave($this->subjectMock, $this->subjectMock, $storeMock)
         );
     }
 
-    public function testBeforeAndAfterSaveHasChanged()
+    public function testAfterSaveHasChanged(): void
     {
         $storeMock = $this->createPartialMock(
-            \Magento\Store\Model\Store::class,
+            StoreModel::class,
             ['isObjectNew', 'dataHasChangedFor']
         );
-        $this->model->beforeSave($this->subjectMock, $storeMock);
+
         $this->assertSame(
             $this->subjectMock,
             $this->model->afterSave($this->subjectMock, $this->subjectMock, $storeMock)
         );
     }
 
-    public function testBeforeAndAfterSaveNoNeed()
+    public function testAfterSaveNoNeed(): void
     {
         $this->mockConfigFlatEnabledNever();
+
         $storeMock = $this->createPartialMock(
-            \Magento\Store\Model\Store::class,
+            StoreModel::class,
             ['isObjectNew', 'dataHasChangedFor']
         );
-        $this->model->beforeSave($this->subjectMock, $storeMock);
+
         $this->assertSame(
             $this->subjectMock,
             $this->model->afterSave($this->subjectMock, $this->subjectMock, $storeMock)
         );
     }
 
-    protected function mockIndexerMethods()
+    private function mockIndexerMethods(): void
     {
         $this->indexerMock->expects($this->once())->method('invalidate');
         $this->indexerRegistryMock->expects($this->once())
@@ -117,12 +119,12 @@ protected function mockIndexerMethods()
             ->willReturn($this->indexerMock);
     }
 
-    protected function mockConfigFlatEnabled()
+    private function mockConfigFlatEnabled(): void
     {
         $this->stateMock->expects($this->once())->method('isFlatEnabled')->willReturn(true);
     }
 
-    protected function mockConfigFlatEnabledNever()
+    private function mockConfigFlatEnabledNever(): void
     {
         $this->stateMock->expects($this->never())->method('isFlatEnabled');
     }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Product/Plugin/StoreGroupTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Product/Plugin/StoreGroupTest.php
index 500f7f714e159..f7064b7e1117c 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Product/Plugin/StoreGroupTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Product/Plugin/StoreGroupTest.php
@@ -9,9 +9,9 @@
 
 use Magento\Catalog\Model\Indexer\Category\Product;
 use Magento\Catalog\Model\Indexer\Category\Product\Plugin\StoreGroup;
+use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
 use Magento\Framework\Indexer\IndexerInterface;
 use Magento\Framework\Indexer\IndexerRegistry;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Store\Model\Group as GroupModel;
 use Magento\Store\Model\ResourceModel\Group;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -22,7 +22,7 @@ class StoreGroupTest extends TestCase
     /**
      * @var GroupModel|MockObject
      */
-    private $groupMock;
+    private $groupModelMock;
 
     /**
      * @var MockObject|IndexerInterface
@@ -32,13 +32,18 @@ class StoreGroupTest extends TestCase
     /**
      * @var MockObject|Group
      */
-    private $subject;
+    private $subjectMock;
 
     /**
      * @var IndexerRegistry|MockObject
      */
     private $indexerRegistryMock;
 
+    /**
+     * @var TableMaintainer|MockObject
+     */
+    private $tableMaintainerMock;
+
     /**
      * @var StoreGroup
      */
@@ -46,7 +51,7 @@ class StoreGroupTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->groupMock = $this->createPartialMock(
+        $this->groupModelMock = $this->createPartialMock(
             GroupModel::class,
             ['dataHasChangedFor', 'isObjectNew']
         );
@@ -59,44 +64,48 @@ protected function setUp(): void
             true,
             ['getId', 'getState']
         );
-        $this->subject = $this->createMock(Group::class);
+        $this->subjectMock = $this->createMock(Group::class);
         $this->indexerRegistryMock = $this->createPartialMock(IndexerRegistry::class, ['get']);
+        $this->tableMaintainerMock = $this->createMock(TableMaintainer::class);
 
-        $this->model = (new ObjectManager($this))
-            ->getObject(StoreGroup::class, ['indexerRegistry' => $this->indexerRegistryMock]);
+        $this->model = new StoreGroup($this->indexerRegistryMock, $this->tableMaintainerMock);
     }
 
     /**
      * @param array $valueMap
      * @dataProvider changedDataProvider
      */
-    public function testBeforeAndAfterSave($valueMap)
+    public function testAfterSave(array $valueMap): void
     {
         $this->mockIndexerMethods();
-        $this->groupMock->expects($this->exactly(2))->method('dataHasChangedFor')->willReturnMap($valueMap);
-        $this->groupMock->expects($this->once())->method('isObjectNew')->willReturn(false);
+        $this->groupModelMock->expects($this->exactly(2))->method('dataHasChangedFor')->willReturnMap($valueMap);
+        $this->groupModelMock->expects($this->once())->method('isObjectNew')->willReturn(false);
 
-        $this->model->beforeSave($this->subject, $this->groupMock);
-        $this->assertSame($this->subject, $this->model->afterSave($this->subject, $this->subject, $this->groupMock));
+        $this->assertSame(
+            $this->subjectMock,
+            $this->model->afterSave($this->subjectMock, $this->subjectMock, $this->groupModelMock)
+        );
     }
 
     /**
      * @param array $valueMap
      * @dataProvider changedDataProvider
      */
-    public function testBeforeAndAfterSaveNotNew($valueMap)
+    public function testAfterSaveNotNew(array $valueMap): void
     {
-        $this->groupMock->expects($this->exactly(2))->method('dataHasChangedFor')->willReturnMap($valueMap);
-        $this->groupMock->expects($this->once())->method('isObjectNew')->willReturn(true);
+        $this->groupModelMock->expects($this->exactly(2))->method('dataHasChangedFor')->willReturnMap($valueMap);
+        $this->groupModelMock->expects($this->once())->method('isObjectNew')->willReturn(true);
 
-        $this->model->beforeSave($this->subject, $this->groupMock);
-        $this->assertSame($this->subject, $this->model->afterSave($this->subject, $this->subject, $this->groupMock));
+        $this->assertSame(
+            $this->subjectMock,
+            $this->model->afterSave($this->subjectMock, $this->subjectMock, $this->groupModelMock)
+        );
     }
 
     /**
      * @return array
      */
-    public function changedDataProvider()
+    public function changedDataProvider(): array
     {
         return [
             [
@@ -106,18 +115,20 @@ public function changedDataProvider()
         ];
     }
 
-    public function testBeforeAndAfterSaveWithoutChanges()
+    public function testAfterSaveWithoutChanges(): void
     {
-        $this->groupMock->expects($this->exactly(2))
+        $this->groupModelMock->expects($this->exactly(2))
             ->method('dataHasChangedFor')
             ->willReturnMap([['root_category_id', false], ['website_id', false]]);
-        $this->groupMock->expects($this->never())->method('isObjectNew');
+        $this->groupModelMock->expects($this->never())->method('isObjectNew');
 
-        $this->model->beforeSave($this->subject, $this->groupMock);
-        $this->assertSame($this->subject, $this->model->afterSave($this->subject, $this->subject, $this->groupMock));
+        $this->assertSame(
+            $this->subjectMock,
+            $this->model->afterSave($this->subjectMock, $this->subjectMock, $this->groupModelMock)
+        );
     }
 
-    private function mockIndexerMethods()
+    private function mockIndexerMethods(): void
     {
         $this->indexerMock->expects($this->once())->method('invalidate');
         $this->indexerRegistryMock->expects($this->once())
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Product/Plugin/StoreViewTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Product/Plugin/StoreViewTest.php
index 3108934d50f5a..4ecc2404153ba 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Product/Plugin/StoreViewTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Product/Plugin/StoreViewTest.php
@@ -27,27 +27,27 @@ class StoreViewTest extends TestCase
     /**
      * @var MockObject|IndexerInterface
      */
-    protected $indexerMock;
+    private $indexerMock;
 
     /**
      * @var StoreView
      */
-    protected $model;
+    private $model;
 
     /**
      * @var IndexerRegistry|MockObject
      */
-    protected $indexerRegistryMock;
+    private $indexerRegistryMock;
 
     /**
      * @var TableMaintainer|MockObject
      */
-    protected $tableMaintainer;
+    private $tableMaintainerMock;
 
     /**
-     * @var MockObject
+     * @var Group|MockObject
      */
-    protected $subject;
+    private $subjectMock;
 
     protected function setUp(): void
     {
@@ -60,7 +60,7 @@ protected function setUp(): void
             true,
             ['getId', 'getState']
         );
-        $this->subject = $this->createMock(Group::class);
+        $this->subjectMock = $this->createMock(Group::class);
         $this->indexerRegistryMock = $this->createPartialMock(IndexerRegistry::class, ['get']);
         $this->storeMock = $this->createPartialMock(
             Store::class,
@@ -70,47 +70,56 @@ protected function setUp(): void
                 'dataHasChangedFor'
             ]
         );
-        $this->tableMaintainer = $this->createPartialMock(
+        $this->tableMaintainerMock = $this->createPartialMock(
             TableMaintainer::class,
             [
                 'createTablesForStore'
             ]
         );
 
-        $this->model = new StoreView($this->indexerRegistryMock, $this->tableMaintainer);
+        $this->model = new StoreView($this->indexerRegistryMock, $this->tableMaintainerMock);
     }
 
-    public function testAroundSaveNewObject()
+    public function testAfterSaveNewObject(): void
     {
         $this->mockIndexerMethods();
         $this->storeMock->expects($this->atLeastOnce())->method('isObjectNew')->willReturn(true);
         $this->storeMock->expects($this->atLeastOnce())->method('getId')->willReturn(1);
-        $this->model->beforeSave($this->subject, $this->storeMock);
-        $this->assertSame($this->subject, $this->model->afterSave($this->subject, $this->subject, $this->storeMock));
+
+        $this->assertSame(
+            $this->subjectMock,
+            $this->model->afterSave($this->subjectMock, $this->subjectMock, $this->storeMock)
+        );
     }
 
-    public function testAroundSaveHasChanged()
+    public function testAfterSaveHasChanged(): void
     {
         $this->mockIndexerMethods();
         $this->storeMock->expects($this->once())
             ->method('dataHasChangedFor')
             ->with('group_id')
             ->willReturn(true);
-        $this->model->beforeSave($this->subject, $this->storeMock);
-        $this->assertSame($this->subject, $this->model->afterSave($this->subject, $this->subject, $this->storeMock));
+
+        $this->assertSame(
+            $this->subjectMock,
+            $this->model->afterSave($this->subjectMock, $this->subjectMock, $this->storeMock)
+        );
     }
 
-    public function testAroundSaveNoNeed()
+    public function testAfterSaveNoNeed(): void
     {
         $this->storeMock->expects($this->once())
             ->method('dataHasChangedFor')
             ->with('group_id')
             ->willReturn(false);
-        $this->model->beforeSave($this->subject, $this->storeMock);
-        $this->assertSame($this->subject, $this->model->afterSave($this->subject, $this->subject, $this->storeMock));
+
+        $this->assertSame(
+            $this->subjectMock,
+            $this->model->afterSave($this->subjectMock, $this->subjectMock, $this->storeMock)
+        );
     }
 
-    private function mockIndexerMethods()
+    private function mockIndexerMethods(): void
     {
         $this->indexerMock->expects($this->once())->method('invalidate');
         $this->indexerRegistryMock->expects($this->once())
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Plugin/StoreViewTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Plugin/StoreViewTest.php
index 0d5a3bb93a6bd..4b2c803c66744 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Plugin/StoreViewTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/Plugin/StoreViewTest.php
@@ -11,50 +11,81 @@
 use Magento\Catalog\Model\Indexer\Product\Eav\Processor;
 use Magento\Framework\Model\AbstractModel;
 use Magento\Store\Model\ResourceModel\Store;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class StoreViewTest extends TestCase
 {
     /**
-     * @param array $data
-     * @dataProvider beforeSaveDataProvider
+     * @var Processor|MockObject
+     */
+    private $eavProcessorMock;
+    /**
+     * @var Store|MockObject
      */
-    public function testBeforeSave(array $data)
+    private $subjectMock;
+    /**
+     * @var AbstractModel|MockObject
+     */
+    private $objectMock;
+
+    /**
+     * @var StoreView
+     */
+    private $storeViewPlugin;
+
+    protected function setUp(): void
     {
-        $eavProcessorMock = $this->getMockBuilder(Processor::class)
+        $this->eavProcessorMock = $this->getMockBuilder(Processor::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $matcher = $data['matcher'];
-        $eavProcessorMock->expects($this->$matcher())
-            ->method('markIndexerAsInvalid');
 
-        $subjectMock = $this->getMockBuilder(Store::class)
+        $this->subjectMock = $this->getMockBuilder(Store::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $objectMock = $this->getMockBuilder(AbstractModel::class)
+        $this->objectMock = $this->getMockBuilder(AbstractModel::class)
             ->disableOriginalConstructor()
             ->setMethods(['getId', 'dataHasChangedFor', 'getIsActive'])
             ->getMock();
-        $objectMock->expects($this->any())
+
+        $this->storeViewPlugin = new StoreView($this->eavProcessorMock);
+    }
+
+    /**
+     * @param array $data
+     * @dataProvider beforeSaveDataProvider
+     */
+    public function testAfterSave(array $data): void
+    {
+        $matcher = $data['matcher'];
+
+        $this->eavProcessorMock->expects($this->$matcher())
+            ->method('markIndexerAsInvalid');
+
+        $this->objectMock->expects($this->any())
             ->method('getId')
             ->willReturn($data['object_id']);
-        $objectMock->expects($this->any())
+
+        $this->objectMock->expects($this->any())
             ->method('dataHasChangedFor')
             ->with('group_id')
             ->willReturn($data['has_group_id_changed']);
-        $objectMock->expects($this->any())
+
+        $this->objectMock->expects($this->any())
             ->method('getIsActive')
             ->willReturn($data['is_active']);
 
-        $model = new StoreView($eavProcessorMock);
-        $model->beforeSave($subjectMock, $objectMock);
+        $this->assertSame(
+            $this->subjectMock,
+            $this->storeViewPlugin->afterSave($this->subjectMock, $this->subjectMock, $this->objectMock)
+        );
     }
 
     /**
      * @return array
      */
-    public function beforeSaveDataProvider()
+    public function beforeSaveDataProvider(): array
     {
         return [
             [
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Plugin/StoreGroupTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Plugin/StoreGroupTest.php
index 5500081d5e11d..adabfab1560dd 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Plugin/StoreGroupTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Plugin/StoreGroupTest.php
@@ -9,6 +9,7 @@
 
 use Magento\Catalog\Model\Indexer\Product\Flat\Plugin\StoreGroup;
 use Magento\Catalog\Model\Indexer\Product\Flat\Processor;
+use Magento\Store\Model\Group as StoreGroupModel;
 use Magento\Store\Model\ResourceModel\Group;
 use Magento\Store\Model\Store;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -19,17 +20,22 @@ class StoreGroupTest extends TestCase
     /**
      * @var Processor|MockObject
      */
-    protected $processorMock;
+    private $processorMock;
 
     /**
      * @var Store|MockObject
      */
-    protected $storeGroupMock;
+    private $storeGroupMock;
 
     /**
      * @var MockObject
      */
-    protected $subjectMock;
+    private $subjectMock;
+
+    /**
+     * @var StoreGroup
+     */
+    private $storeGroupPlugin;
 
     protected function setUp(): void
     {
@@ -40,9 +46,11 @@ protected function setUp(): void
 
         $this->subjectMock = $this->createMock(Group::class);
         $this->storeGroupMock = $this->createPartialMock(
-            \Magento\Store\Model\Group::class,
+            StoreGroupModel::class,
             ['getId', 'dataHasChangedFor']
         );
+
+        $this->storeGroupPlugin = new StoreGroup($this->processorMock);
     }
 
     /**
@@ -50,14 +58,16 @@ protected function setUp(): void
      * @param int|null $storeId
      * @dataProvider storeGroupDataProvider
      */
-    public function testBeforeSave($matcherMethod, $storeId)
+    public function testAfterSave(string $matcherMethod, ?int $storeId): void
     {
         $this->processorMock->expects($this->{$matcherMethod}())->method('markIndexerAsInvalid');
 
         $this->storeGroupMock->expects($this->once())->method('getId')->willReturn($storeId);
 
-        $model = new StoreGroup($this->processorMock);
-        $model->beforeSave($this->subjectMock, $this->storeGroupMock);
+        $this->assertSame(
+            $this->subjectMock,
+            $this->storeGroupPlugin->afterSave($this->subjectMock, $this->subjectMock, $this->storeGroupMock)
+        );
     }
 
     /**
@@ -65,30 +75,25 @@ public function testBeforeSave($matcherMethod, $storeId)
      * @param bool $websiteChanged
      * @dataProvider storeGroupWebsiteDataProvider
      */
-    public function testChangedWebsiteBeforeSave($matcherMethod, $websiteChanged)
+    public function testAfterSaveChangedWebsite(string $matcherMethod, bool $websiteChanged): void
     {
         $this->processorMock->expects($this->{$matcherMethod}())->method('markIndexerAsInvalid');
 
         $this->storeGroupMock->expects($this->once())->method('getId')->willReturn(1);
 
-        $this->storeGroupMock->expects(
-            $this->once()
-        )->method(
-            'dataHasChangedFor'
-        )->with(
-            'root_category_id'
-        )->willReturn(
-            $websiteChanged
-        );
+        $this->storeGroupMock->expects($this->once())->method('dataHasChangedFor')
+            ->with('root_category_id')->willReturn($websiteChanged);
 
-        $model = new StoreGroup($this->processorMock);
-        $model->beforeSave($this->subjectMock, $this->storeGroupMock);
+        $this->assertSame(
+            $this->subjectMock,
+            $this->storeGroupPlugin->afterSave($this->subjectMock, $this->subjectMock, $this->storeGroupMock)
+        );
     }
 
     /**
      * @return array
      */
-    public function storeGroupWebsiteDataProvider()
+    public function storeGroupWebsiteDataProvider(): array
     {
         return [['once', true], ['never', false]];
     }
@@ -96,7 +101,7 @@ public function storeGroupWebsiteDataProvider()
     /**
      * @return array
      */
-    public function storeGroupDataProvider()
+    public function storeGroupDataProvider(): array
     {
         return [['once', null], ['never', 1]];
     }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Plugin/StoreTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Plugin/StoreTest.php
index 1b74039fa944c..219149a57d361 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Plugin/StoreTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Flat/Plugin/StoreTest.php
@@ -7,7 +7,9 @@
 
 namespace Magento\Catalog\Test\Unit\Model\Indexer\Product\Flat\Plugin;
 
+use Magento\Catalog\Model\Indexer\Product\Flat\Plugin\Store as StorePlugin;
 use Magento\Catalog\Model\Indexer\Product\Flat\Processor;
+use Magento\Store\Model\ResourceModel\Store as StoreResourceModel;
 use Magento\Store\Model\Store;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -17,17 +19,22 @@ class StoreTest extends TestCase
     /**
      * @var Processor|MockObject
      */
-    protected $processorMock;
+    private $processorMock;
 
     /**
      * @var Store|MockObject
      */
-    protected $storeMock;
+    private $storeMock;
 
     /**
      * @var MockObject
      */
-    protected $subjectMock;
+    private $subjectMock;
+
+    /**
+     * @var StorePlugin
+     */
+    private $storePlugin;
 
     protected function setUp(): void
     {
@@ -36,11 +43,13 @@ protected function setUp(): void
             ['markIndexerAsInvalid']
         );
 
-        $this->subjectMock = $this->createMock(\Magento\Store\Model\ResourceModel\Store::class);
+        $this->subjectMock = $this->createMock(StoreResourceModel::class);
         $this->storeMock = $this->createPartialMock(
             Store::class,
             ['getId', 'dataHasChangedFor']
         );
+
+        $this->storePlugin = new StorePlugin($this->processorMock);
     }
 
     /**
@@ -48,14 +57,16 @@ protected function setUp(): void
      * @param int|null $storeId
      * @dataProvider storeDataProvider
      */
-    public function testBeforeSave($matcherMethod, $storeId)
+    public function testAfterSave(string $matcherMethod, ?int $storeId): void
     {
         $this->processorMock->expects($this->{$matcherMethod}())->method('markIndexerAsInvalid');
 
         $this->storeMock->expects($this->once())->method('getId')->willReturn($storeId);
 
-        $model = new \Magento\Catalog\Model\Indexer\Product\Flat\Plugin\Store($this->processorMock);
-        $model->beforeSave($this->subjectMock, $this->storeMock);
+        $this->assertSame(
+            $this->subjectMock,
+            $this->storePlugin->afterSave($this->subjectMock, $this->subjectMock, $this->storeMock)
+        );
     }
 
     /**
@@ -63,30 +74,25 @@ public function testBeforeSave($matcherMethod, $storeId)
      * @param bool $storeGroupChanged
      * @dataProvider storeGroupDataProvider
      */
-    public function testBeforeSaveSwitchStoreGroup($matcherMethod, $storeGroupChanged)
+    public function testAfterSaveSwitchStoreGroup(string $matcherMethod, bool $storeGroupChanged): void
     {
         $this->processorMock->expects($this->{$matcherMethod}())->method('markIndexerAsInvalid');
 
         $this->storeMock->expects($this->once())->method('getId')->willReturn(1);
 
-        $this->storeMock->expects(
-            $this->once()
-        )->method(
-            'dataHasChangedFor'
-        )->with(
-            'group_id'
-        )->willReturn(
-            $storeGroupChanged
-        );
+        $this->storeMock->expects($this->once())->method('dataHasChangedFor')
+            ->with('group_id')->willReturn($storeGroupChanged);
 
-        $model = new \Magento\Catalog\Model\Indexer\Product\Flat\Plugin\Store($this->processorMock);
-        $model->beforeSave($this->subjectMock, $this->storeMock);
+        $this->assertSame(
+            $this->subjectMock,
+            $this->storePlugin->afterSave($this->subjectMock, $this->subjectMock, $this->storeMock)
+        );
     }
 
     /**
      * @return array
      */
-    public function storeGroupDataProvider()
+    public function storeGroupDataProvider(): array
     {
         return [['once', true], ['never', false]];
     }
@@ -94,7 +100,7 @@ public function storeGroupDataProvider()
     /**
      * @return array
      */
-    public function storeDataProvider()
+    public function storeDataProvider(): array
     {
         return [['once', null], ['never', 1]];
     }
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 9e2b7f29ce0fa..0e2b6b2f329c1 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
@@ -12,7 +12,6 @@
 
 use Magento\CatalogInventory\Model\Indexer\Stock\Plugin\StoreGroup;
 use Magento\CatalogInventory\Model\Indexer\Stock\Processor;
-use Magento\Framework\Indexer\IndexerInterface;
 use Magento\Framework\Model\AbstractModel;
 use Magento\Store\Model\ResourceModel\Group;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -23,24 +22,24 @@ class StoreGroupTest extends TestCase
     /**
      * @var StoreGroup
      */
-    protected $_model;
+    private $model;
 
     /**
-     * @var IndexerInterface|MockObject
+     * @var Processor|MockObject
      */
-    protected $_indexerMock;
+    private $indexerProcessorMock;
 
     protected function setUp(): void
     {
-        $this->_indexerMock = $this->createMock(Processor::class);
-        $this->_model = new StoreGroup($this->_indexerMock);
+        $this->indexerProcessorMock = $this->createMock(Processor::class);
+        $this->model = new StoreGroup($this->indexerProcessorMock);
     }
 
     /**
      * @param array $data
-     * @dataProvider beforeSaveDataProvider
+     * @dataProvider afterSaveDataProvider
      */
-    public function testBeforeSave(array $data)
+    public function testAfterSave(array $data): void
     {
         $subjectMock = $this->createMock(Group::class);
         $objectMock = $this->createPartialMock(
@@ -55,16 +54,19 @@ public function testBeforeSave(array $data)
             ->with('website_id')
             ->willReturn($data['has_website_id_changed']);
 
-        $this->_indexerMock->expects($this->once())
+        $this->indexerProcessorMock->expects($this->once())
             ->method('markIndexerAsInvalid');
 
-        $this->_model->beforeSave($subjectMock, $objectMock);
+        $this->assertSame(
+            $subjectMock,
+            $this->model->afterSave($subjectMock, $subjectMock, $objectMock)
+        );
     }
 
     /**
      * @return array
      */
-    public function beforeSaveDataProvider()
+    public function afterSaveDataProvider(): array
     {
         return [
             [
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Store/GroupTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Store/GroupTest.php
index b4a27a4350131..302dd0f1e2684 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Store/GroupTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Store/GroupTest.php
@@ -11,7 +11,6 @@
 use Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\Store\Group as StoreGroupIndexerPlugin;
 use Magento\Framework\Indexer\IndexerInterface;
 use Magento\Framework\Indexer\IndexerRegistry;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Store\Model\Group as StoreGroup;
 use Magento\Store\Model\ResourceModel\Group as StoreGroupResourceModel;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -24,11 +23,6 @@ class GroupTest extends TestCase
      */
     private $plugin;
 
-    /**
-     * @var ObjectManagerHelper
-     */
-    private $objectManagerHelper;
-
     /**
      * @var IndexerRegistry|MockObject
      */
@@ -64,11 +58,7 @@ protected function setUp(): void
             ->setMethods(['dataHasChangedFor', 'isObjectNew'])
             ->getMock();
 
-        $this->objectManagerHelper = new ObjectManagerHelper($this);
-        $this->plugin = $this->objectManagerHelper->getObject(
-            StoreGroupIndexerPlugin::class,
-            ['indexerRegistry' => $this->indexerRegistryMock]
-        );
+        $this->plugin = new StoreGroupIndexerPlugin($this->indexerRegistryMock);
     }
 
     /**
@@ -76,9 +66,9 @@ protected function setUp(): void
      * @param bool $websiteChanged
      * @param int $invalidateCounter
      * @return void
-     * @dataProvider beforeAfterSaveDataProvider
+     * @dataProvider afterSaveDataProvider
      */
-    public function testBeforeAfterSave($isObjectNew, $websiteChanged, $invalidateCounter)
+    public function testAfterSave(bool $isObjectNew, bool $websiteChanged, int $invalidateCounter): void
     {
         $this->prepareIndexer($invalidateCounter);
         $this->storeGroupMock->expects(static::any())
@@ -91,14 +81,16 @@ public function testBeforeAfterSave($isObjectNew, $websiteChanged, $invalidateCo
         $this->indexerMock->expects(static::exactly($invalidateCounter))
             ->method('invalidate');
 
-        $this->plugin->beforeSave($this->subjectMock, $this->storeGroupMock);
-        $this->assertSame($this->subjectMock, $this->plugin->afterSave($this->subjectMock, $this->subjectMock));
+        $this->assertSame(
+            $this->subjectMock,
+            $this->plugin->afterSave($this->subjectMock, $this->subjectMock, $this->storeGroupMock)
+        );
     }
 
     /**
      * @return array
      */
-    public function beforeAfterSaveDataProvider()
+    public function afterSaveDataProvider(): array
     {
         return [
             [false, false, 0],
@@ -108,13 +100,16 @@ public function beforeAfterSaveDataProvider()
         ];
     }
 
-    public function testAfterDelete()
+    public function testAfterDelete(): void
     {
         $this->prepareIndexer(1);
         $this->indexerMock->expects(static::once())
             ->method('invalidate');
 
-        $this->assertSame($this->subjectMock, $this->plugin->afterDelete($this->subjectMock, $this->subjectMock));
+        $this->assertSame(
+            $this->subjectMock,
+            $this->plugin->afterDelete($this->subjectMock, $this->subjectMock)
+        );
     }
 
     /**
@@ -123,7 +118,7 @@ public function testAfterDelete()
      * @param int $invalidateCounter
      * @return void
      */
-    private function prepareIndexer($invalidateCounter)
+    private function prepareIndexer(int $invalidateCounter): void
     {
         $this->indexerRegistryMock->expects(static::exactly($invalidateCounter))
             ->method('get')
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Store/ViewTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Store/ViewTest.php
index f778c9340cbd7..23e1c44c5f7c8 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Store/ViewTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Store/ViewTest.php
@@ -11,7 +11,6 @@
 use Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\Store\View as StoreViewIndexerPlugin;
 use Magento\Framework\Indexer\IndexerInterface;
 use Magento\Framework\Indexer\IndexerRegistry;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Store\Model\ResourceModel\Store as StoreResourceModel;
 use Magento\Store\Model\Store;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -24,11 +23,6 @@ class ViewTest extends TestCase
      */
     private $plugin;
 
-    /**
-     * @var ObjectManagerHelper
-     */
-    private $objectManagerHelper;
-
     /**
      * @var IndexerRegistry|MockObject
      */
@@ -64,20 +58,16 @@ protected function setUp(): void
             ->setMethods(['isObjectNew'])
             ->getMock();
 
-        $this->objectManagerHelper = new ObjectManagerHelper($this);
-        $this->plugin = $this->objectManagerHelper->getObject(
-            StoreViewIndexerPlugin::class,
-            ['indexerRegistry' => $this->indexerRegistryMock]
-        );
+        $this->plugin = new StoreViewIndexerPlugin($this->indexerRegistryMock);
     }
 
     /**
      * @param bool $isObjectNew
      * @param int $invalidateCounter
      *
-     * @dataProvider beforeAfterSaveDataProvider
+     * @dataProvider afterSaveDataProvider
      */
-    public function testBeforeAfterSave($isObjectNew, $invalidateCounter)
+    public function testAfterSave(bool $isObjectNew, int $invalidateCounter): void
     {
         $this->prepareIndexer($invalidateCounter);
         $this->storeMock->expects(static::once())
@@ -86,14 +76,16 @@ public function testBeforeAfterSave($isObjectNew, $invalidateCounter)
         $this->indexerMock->expects(static::exactly($invalidateCounter))
             ->method('invalidate');
 
-        $this->plugin->beforeSave($this->subjectMock, $this->storeMock);
-        $this->assertSame($this->subjectMock, $this->plugin->afterSave($this->subjectMock, $this->subjectMock));
+        $this->assertSame(
+            $this->subjectMock,
+            $this->plugin->afterSave($this->subjectMock, $this->subjectMock, $this->storeMock)
+        );
     }
 
     /**
      * @return array
      */
-    public function beforeAfterSaveDataProvider()
+    public function afterSaveDataProvider(): array
     {
         return [
             [false, 0],
@@ -101,7 +93,7 @@ public function beforeAfterSaveDataProvider()
         ];
     }
 
-    public function testAfterDelete()
+    public function testAfterDelete(): void
     {
         $this->prepareIndexer(1);
         $this->indexerMock->expects(static::once())
@@ -116,7 +108,7 @@ public function testAfterDelete()
      * @param int $invalidateCounter
      * @return void
      */
-    private function prepareIndexer($invalidateCounter)
+    private function prepareIndexer(int $invalidateCounter): void
     {
         $this->indexerRegistryMock->expects(static::exactly($invalidateCounter))
             ->method('get')
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Indexer/Design/Config/Plugin/StoreTest.php b/app/code/Magento/Theme/Test/Unit/Model/Indexer/Design/Config/Plugin/StoreTest.php
index b61246cc7583f..1d48c0fe04e7a 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Indexer/Design/Config/Plugin/StoreTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Indexer/Design/Config/Plugin/StoreTest.php
@@ -9,6 +9,7 @@
 
 use Magento\Framework\Indexer\IndexerInterface;
 use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\Store\Model\Store as StoreModel;
 use Magento\Theme\Model\Data\Design\Config;
 use Magento\Theme\Model\Indexer\Design\Config\Plugin\Store;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -17,10 +18,10 @@
 class StoreTest extends TestCase
 {
     /** @var Store */
-    protected $model;
+    private $model;
 
     /** @var IndexerRegistry|MockObject */
-    protected $indexerRegistryMock;
+    private $indexerRegistryMock;
 
     protected function setUp(): void
     {
@@ -31,21 +32,15 @@ protected function setUp(): void
         $this->model = new Store($this->indexerRegistryMock);
     }
 
-    public function testAroundSave()
+    public function testAfterSave(): void
     {
-        $subjectId = 0;
-
-        /** @var \Magento\Store\Model\Store|MockObject $subjectMock */
-        $subjectMock = $this->getMockBuilder(\Magento\Store\Model\Store::class)
+        /** @var StoreModel|MockObject $subjectMock */
+        $subjectMock = $this->getMockBuilder(StoreModel::class)
             ->disableOriginalConstructor()
             ->getMock();
         $subjectMock->expects($this->once())
-            ->method('getId')
-            ->willReturn($subjectId);
-
-        $closureMock = function () use ($subjectMock) {
-            return $subjectMock;
-        };
+            ->method('isObjectNew')
+            ->willReturn(true);
 
         /** @var IndexerInterface|MockObject $indexerMock */
         $indexerMock = $this->getMockBuilder(IndexerInterface::class)
@@ -58,35 +53,29 @@ public function testAroundSave()
             ->with(Config::DESIGN_CONFIG_GRID_INDEXER_ID)
             ->willReturn($indexerMock);
 
-        $this->assertEquals($subjectMock, $this->model->aroundSave($subjectMock, $closureMock));
+        $this->assertSame($subjectMock, $this->model->afterSave($subjectMock, $subjectMock));
     }
 
-    public function testAroundSaveWithExistentSubject()
+    public function testAfterSaveWithExistentSubject(): void
     {
-        $subjectId = 1;
-
-        /** @var \Magento\Store\Model\Store|MockObject $subjectMock */
-        $subjectMock = $this->getMockBuilder(\Magento\Store\Model\Store::class)
+        /** @var StoreModel|MockObject $subjectMock */
+        $subjectMock = $this->getMockBuilder(StoreModel::class)
             ->disableOriginalConstructor()
             ->getMock();
         $subjectMock->expects($this->once())
-            ->method('getId')
-            ->willReturn($subjectId);
-
-        $closureMock = function () use ($subjectMock) {
-            return $subjectMock;
-        };
+            ->method('isObjectNew')
+            ->willReturn(false);
 
         $this->indexerRegistryMock->expects($this->never())
             ->method('get');
 
-        $this->assertEquals($subjectMock, $this->model->aroundSave($subjectMock, $closureMock));
+        $this->assertSame($subjectMock, $this->model->afterSave($subjectMock, $subjectMock));
     }
 
-    public function testAfterDelete()
+    public function testAfterDelete(): void
     {
-        /** @var \Magento\Store\Model\Store|MockObject $subjectMock */
-        $subjectMock = $this->getMockBuilder(\Magento\Store\Model\Store::class)
+        /** @var StoreModel|MockObject $subjectMock */
+        $subjectMock = $this->getMockBuilder(StoreModel::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -101,6 +90,6 @@ public function testAfterDelete()
             ->with(Config::DESIGN_CONFIG_GRID_INDEXER_ID)
             ->willReturn($indexerMock);
 
-        $this->assertEquals($subjectMock, $this->model->afterDelete($subjectMock, $subjectMock));
+        $this->assertSame($subjectMock, $this->model->afterDelete($subjectMock, $subjectMock));
     }
 }

From f1ccb7c1a85ed6f6485885b9aab1ac1e19a2534e Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Fri, 14 Aug 2020 10:27:07 +0300
Subject: [PATCH 1500/1718] Removing the Wishlist dependency

---
 .../Product/BundleOptionDataProvider.php      | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/Bundle/Model/Product/BundleOptionDataProvider.php b/app/code/Magento/Bundle/Model/Product/BundleOptionDataProvider.php
index d6b7419a9f934..f56c4228e49e5 100644
--- a/app/code/Magento/Bundle/Model/Product/BundleOptionDataProvider.php
+++ b/app/code/Magento/Bundle/Model/Product/BundleOptionDataProvider.php
@@ -10,10 +10,9 @@
 use Magento\Bundle\Helper\Catalog\Product\Configuration;
 use Magento\Bundle\Model\Option;
 use Magento\Catalog\Model\Product;
-use Magento\Framework\Exception\LocalizedException;
+use Magento\Catalog\Model\Product\Configuration\Item\ItemInterface;
 use Magento\Framework\Pricing\Helper\Data;
 use Magento\Framework\Serialize\SerializerInterface;
-use Magento\Wishlist\Model\Item;
 
 /**
  * Data provider for bundled product options
@@ -51,13 +50,13 @@ public function __construct(
     }
 
     /**
-     * Extract data for a bundled wishlist item
+     * Extract data for a bundled item
      *
-     * @param Item $item
+     * @param ItemInterface $item
      *
      * @return array
      */
-    public function getData(Item $item): array
+    public function getData(ItemInterface $item): array
     {
         $options = [];
         $product = $item->getProduct();
@@ -89,11 +88,11 @@ public function getData(Item $item): array
      * Build bundle product options based on current selection
      *
      * @param Option[] $bundleOptions
-     * @param Item $item
+     * @param ItemInterface $item
      *
      * @return array
      */
-    private function buildBundleOptions(array $bundleOptions, Item $item): array
+    private function buildBundleOptions(array $bundleOptions, ItemInterface $item): array
     {
         $options = [];
         foreach ($bundleOptions as $bundleOption) {
@@ -116,13 +115,11 @@ private function buildBundleOptions(array $bundleOptions, Item $item): array
      * Build bundle product option values based on current selection
      *
      * @param Product[] $selections
-     * @param Item $item
+     * @param ItemInterface $item
      *
      * @return array
-     *
-     * @throws LocalizedException
      */
-    private function buildBundleOptionValues(array $selections, Item $item): array
+    private function buildBundleOptionValues(array $selections, ItemInterface $item): array
     {
         $product = $item->getProduct();
         $values = [];

From 3fc230358a246780d2595b6b2606b7b355af0665 Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Fri, 14 Aug 2020 13:42:22 +0530
Subject: [PATCH 1501/1718] Revert "Media Gallery configuration are reversed"

This reverts commit 36335422453af4abf58859acba7224cabe0f5e43.
---
 .../SaveBaseCategoryImageInformation.php       |  2 +-
 .../Model/OpenDialogUrlProvider.php            |  2 +-
 .../Plugin/SaveImageInformation.php            |  2 +-
 .../Model/ImageComponentOpenDialogUrlTest.php  |  4 ++--
 .../Model/OpenDialogUrlProviderTest.php        |  4 ++--
 .../Model/TinyMceOpenDialogUrlTest.php         |  4 ++--
 .../WysiwygDefaultConfigOpenDialogUrlTest.php  |  4 ++--
 .../Plugin/MediaGallerySyncTrigger.php         |  2 +-
 .../Test/Mftf/Data/AdobeStockConfigData.xml    |  4 ++--
 .../MediaGalleryUi/etc/adminhtml/menu.xml      | 18 ++----------------
 .../MediaGalleryUi/etc/adminhtml/system.xml    |  4 ++--
 11 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/app/code/Magento/MediaGalleryCatalogIntegration/Plugin/SaveBaseCategoryImageInformation.php b/app/code/Magento/MediaGalleryCatalogIntegration/Plugin/SaveBaseCategoryImageInformation.php
index 67a99bfaa84c2..d439b53c120cb 100644
--- a/app/code/Magento/MediaGalleryCatalogIntegration/Plugin/SaveBaseCategoryImageInformation.php
+++ b/app/code/Magento/MediaGalleryCatalogIntegration/Plugin/SaveBaseCategoryImageInformation.php
@@ -86,7 +86,7 @@ public function __construct(
      */
     public function afterMoveFileFromTmp(ImageUploader $subject, string $imagePath): string
     {
-        if ($this->config->isEnabled()) {
+        if (!$this->config->isEnabled()) {
             return $imagePath;
         }
 
diff --git a/app/code/Magento/MediaGalleryIntegration/Model/OpenDialogUrlProvider.php b/app/code/Magento/MediaGalleryIntegration/Model/OpenDialogUrlProvider.php
index 3834550f2703e..317b811df5692 100644
--- a/app/code/Magento/MediaGalleryIntegration/Model/OpenDialogUrlProvider.php
+++ b/app/code/Magento/MediaGalleryIntegration/Model/OpenDialogUrlProvider.php
@@ -35,6 +35,6 @@ public function __construct(ConfigInterface $config)
      */
     public function getUrl(): string
     {
-        return $this->config->isEnabled() ? 'cms/wysiwyg_images/index' : 'media_gallery/index/index';
+        return $this->config->isEnabled() ? 'media_gallery/index/index' : 'cms/wysiwyg_images/index';
     }
 }
diff --git a/app/code/Magento/MediaGalleryIntegration/Plugin/SaveImageInformation.php b/app/code/Magento/MediaGalleryIntegration/Plugin/SaveImageInformation.php
index 4d0e6200ddaad..fbe35db298b04 100644
--- a/app/code/Magento/MediaGalleryIntegration/Plugin/SaveImageInformation.php
+++ b/app/code/Magento/MediaGalleryIntegration/Plugin/SaveImageInformation.php
@@ -78,7 +78,7 @@ public function __construct(
      */
     public function afterSave(Uploader $subject, array $result): array
     {
-        if ($this->config->isEnabled()) {
+        if (!$this->config->isEnabled()) {
             return $result;
         }
 
diff --git a/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/ImageComponentOpenDialogUrlTest.php b/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/ImageComponentOpenDialogUrlTest.php
index 0e5cd070a7eec..dfeaa3eff56bd 100644
--- a/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/ImageComponentOpenDialogUrlTest.php
+++ b/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/ImageComponentOpenDialogUrlTest.php
@@ -50,7 +50,7 @@ protected function setUp(): void
 
     /**
      * Test image open dialog url when enhanced media gallery not enabled.
-     * @magentoConfigFixture default/system/media_gallery/enabled 1
+     * @magentoConfigFixture default/system/media_gallery/enabled 0
      */
     public function testWithEnhancedMediaGalleryDisabled(): void
     {
@@ -61,7 +61,7 @@ public function testWithEnhancedMediaGalleryDisabled(): void
 
     /**
      * Test image open dialog url when enhanced media gallery enabled.
-     * @magentoConfigFixture default/system/media_gallery/enabled 0
+     * @magentoConfigFixture default/system/media_gallery/enabled 1
      */
     public function testWithEnhancedMediaGalleryEnabled(): void
     {
diff --git a/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/OpenDialogUrlProviderTest.php b/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/OpenDialogUrlProviderTest.php
index 3973ed132b490..7a3316f293879 100644
--- a/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/OpenDialogUrlProviderTest.php
+++ b/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/OpenDialogUrlProviderTest.php
@@ -45,7 +45,7 @@ protected function setUp(): void
 
     /**
      * Test getting open dialog url with enhanced media gallery disabled.
-     * @magentoConfigFixture default/system/media_gallery/enabled 1
+     * @magentoConfigFixture default/system/media_gallery/enabled 0
      */
     public function testWithEnhancedMediaGalleryDisabled(): void
     {
@@ -54,7 +54,7 @@ public function testWithEnhancedMediaGalleryDisabled(): void
 
     /**
      * Test getting open dialog url when enhanced media gallery enabled.
-     * @magentoConfigFixture default/system/media_gallery/enabled 0
+     * @magentoConfigFixture default/system/media_gallery/enabled 1
      */
     public function testWithEnhancedMediaGalleryEnabled(): void
     {
diff --git a/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/TinyMceOpenDialogUrlTest.php b/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/TinyMceOpenDialogUrlTest.php
index c15536f6af445..81a4dc642cfa0 100644
--- a/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/TinyMceOpenDialogUrlTest.php
+++ b/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/TinyMceOpenDialogUrlTest.php
@@ -58,7 +58,7 @@ protected function setUp(): void
 
     /**
      * Test image open dialog url when enhanced media gallery not enabled.
-     * @magentoConfigFixture default/system/media_gallery/enabled 1
+     * @magentoConfigFixture default/system/media_gallery/enabled 0
      */
     public function testWithEnhancedMediaGalleryDisabled(): void
     {
@@ -68,7 +68,7 @@ public function testWithEnhancedMediaGalleryDisabled(): void
 
     /**
      * Test image open dialog url when enhanced media gallery enabled.
-     * @magentoConfigFixture default/system/media_gallery/enabled 0
+     * @magentoConfigFixture default/system/media_gallery/enabled 1
      */
     public function testWithEnhancedMediaGalleryEnabled(): void
     {
diff --git a/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/WysiwygDefaultConfigOpenDialogUrlTest.php b/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/WysiwygDefaultConfigOpenDialogUrlTest.php
index df6cbe4fc2c09..aebf5927869d5 100644
--- a/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/WysiwygDefaultConfigOpenDialogUrlTest.php
+++ b/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/WysiwygDefaultConfigOpenDialogUrlTest.php
@@ -58,7 +58,7 @@ protected function setUp(): void
 
     /**
      * Test update wysiwyg editor open dialog url when enhanced media gallery not enabled.
-     * @magentoConfigFixture default/system/media_gallery/enabled 1
+     * @magentoConfigFixture default/system/media_gallery/enabled 0
      */
     public function testWithEnhancedMediaGalleryDisabled(): void
     {
@@ -70,7 +70,7 @@ public function testWithEnhancedMediaGalleryDisabled(): void
 
     /**
      * Test update wysiwyg editor open dialog url when enhanced media gallery enabled.
-     * @magentoConfigFixture default/system/media_gallery/enabled 0
+     * @magentoConfigFixture default/system/media_gallery/enabled 1
      */
     public function testWithEnhancedMediaGalleryEnabled(): void
     {
diff --git a/app/code/Magento/MediaGallerySynchronization/Plugin/MediaGallerySyncTrigger.php b/app/code/Magento/MediaGallerySynchronization/Plugin/MediaGallerySyncTrigger.php
index dfe007fa59add..9583c91184d1a 100644
--- a/app/code/Magento/MediaGallerySynchronization/Plugin/MediaGallerySyncTrigger.php
+++ b/app/code/Magento/MediaGallerySynchronization/Plugin/MediaGallerySyncTrigger.php
@@ -43,7 +43,7 @@ public function afterSave(Value $config, Value $result): Value
     {
         if ($result->getPath() === self::MEDIA_GALLERY_CONFIG_VALUE
             && $result->isValueChanged()
-            && (int) $result->getValue() !== self::MEDIA_GALLERY_ENABLED_VALUE
+            && (int) $result->getValue() === self::MEDIA_GALLERY_ENABLED_VALUE
         ) {
             $this->publish->execute();
         }
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdobeStockConfigData.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdobeStockConfigData.xml
index 5e02d81fb82ae..e8f394a006104 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdobeStockConfigData.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdobeStockConfigData.xml
@@ -9,10 +9,10 @@
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="MediaGalleryConfigDataEnabled">
         <data key="path">system/media_gallery/enabled</data>
-        <data key="value">0</data>
+        <data key="value">1</data>
     </entity>
     <entity name="MediaGalleryConfigDataDisabled">
         <data key="path">system/media_gallery/enabled</data>
-        <data key="value">1</data>
+        <data key="value">0</data>
     </entity>
 </entities>
diff --git a/app/code/Magento/MediaGalleryUi/etc/adminhtml/menu.xml b/app/code/Magento/MediaGalleryUi/etc/adminhtml/menu.xml
index e7486ccbf5a2f..92839aa75ac8b 100644
--- a/app/code/Magento/MediaGalleryUi/etc/adminhtml/menu.xml
+++ b/app/code/Magento/MediaGalleryUi/etc/adminhtml/menu.xml
@@ -7,21 +7,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
     <menu>
-        <add id="Magento_MediaGalleryUi::media"
-             title="Media"
-             translate="title"
-             module="Magento_MediaGalleryUi"
-             sortOrder="15"
-             parent="Magento_Backend::content"
-             resource="Magento_Cms::media_gallery"
-             dependsOnConfig="system/media_gallery/enabled"/>
-        <add id="Magento_MediaGalleryUi::media_gallery"
-             title="Media Gallery"
-             translate="title"
-             module="Magento_MediaGalleryUi"
-             sortOrder="0"
-             parent="Magento_MediaGalleryUi::media"
-             action="media_gallery/media/index"
-             resource="Magento_Cms::media_gallery"/>
+        <add id="Magento_MediaGalleryUi::media" title="Media" translate="title" module="Magento_MediaGalleryUi" sortOrder="15" parent="Magento_Backend::content" resource="Magento_Cms::media_gallery" dependsOnConfig="system/media_gallery/enabled"/>
+        <add id="Magento_MediaGalleryUi::media_gallery" title="Media Gallery" translate="title" module="Magento_MediaGalleryUi" sortOrder="0" parent="Magento_MediaGalleryUi::media" action="media_gallery/media/index" resource="Magento_Cms::media_gallery"/>
     </menu>
 </config>
diff --git a/app/code/Magento/MediaGalleryUi/etc/adminhtml/system.xml b/app/code/Magento/MediaGalleryUi/etc/adminhtml/system.xml
index 1c303ab155dae..77544b42e899a 100644
--- a/app/code/Magento/MediaGalleryUi/etc/adminhtml/system.xml
+++ b/app/code/Magento/MediaGalleryUi/etc/adminhtml/system.xml
@@ -9,9 +9,9 @@
     <system>
         <section id="system">
             <group id="media_gallery" translate="label" type="text" sortOrder="1000" showInDefault="1" showInWebsite="0" showInStore="0">
-                <label>Media Gallery</label>
+                <label>Enhanced Media Gallery</label>
                 <field id="enabled" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
-                    <label>Enable Old Media Gallery</label>
+                    <label>Enabled</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <config_path>system/media_gallery/enabled</config_path>
                 </field>

From e76cb954bd71db1d9d8f9ca5d229b139d9958424 Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Fri, 14 Aug 2020 13:45:37 +0530
Subject: [PATCH 1502/1718] Revert "Enabled old media gallery by default"

This reverts commit 8b592ee2005c4c324672b0b3f1f69307384c43c5.
---
 app/code/Magento/MediaGalleryUi/etc/config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryUi/etc/config.xml b/app/code/Magento/MediaGalleryUi/etc/config.xml
index 593b1b8e58fd2..fe8e73c406e59 100644
--- a/app/code/Magento/MediaGalleryUi/etc/config.xml
+++ b/app/code/Magento/MediaGalleryUi/etc/config.xml
@@ -9,7 +9,7 @@
     <default>
         <system>
             <media_gallery>
-                <enabled>1</enabled>
+                <enabled>0</enabled>
             </media_gallery>
         </system>
     </default>

From 1fe9c2268eafa22d1318d459297de3041a9425ca Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Fri, 14 Aug 2020 13:46:08 +0530
Subject: [PATCH 1503/1718] Revert "fixed MFTF test"

This reverts commit 651bd690cb0687565cc2a1e99a57d99be5e8f14c.
---
 .../MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiSuite.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiSuite.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiSuite.xml
index 14464cf36234c..4749fc4a885b0 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiSuite.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiSuite.xml
@@ -13,7 +13,7 @@
             <actionGroup ref="AdminDisableWYSIWYGActionGroup" stepKey="disableWYSIWYG" />
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableEnhancedMediaGallery">
-                <argument name="enabled" value="0"/>
+                <argument name="enabled" value="1"/>
             </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
         </before>

From de6d2a7ad9ecc1d58fbfd72aafbe8843934c123f 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 1504/1718] 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 3d7298e3d10a77b5321a152bfec9eeea634b079d Mon Sep 17 00:00:00 2001
From: Sathish <srsathish92@gmail.com>
Date: Fri, 31 Jul 2020 23:27:29 +0530
Subject: [PATCH 1505/1718] Fix #29194 Update tier price block show & hide

---
 .../StorefrontProductInfoMainSection.xml      |  1 +
 ...ableProductWithTierPriceForOneItemTest.xml |  5 ++++-
 .../view/frontend/web/js/configurable.js      | 22 +++++++++----------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
index cf0e99f7c45c0..37c129dc3bbde 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -13,6 +13,7 @@
         <element name="selectableProductOptions" type="select" selector="#attribute{{var1}} option:not([disabled])" parameterized="true"/>
         <element name="productAttributeTitle1" type="text" selector="#product-options-wrapper div[tabindex='0'] label"/>
         <element name="productPrice" type="text" selector="div.price-box.price-final_price"/>
+        <element name="tierPriceBlock" type="block" selector="div[data-role='tier-price-block']"/>
         <element name="productAttributeOptions1" type="select" selector="#product-options-wrapper div[tabindex='0'] option"/>
         <element name="productAttributeOptionsSelectButton" type="select" selector="#product-options-wrapper .super-attribute-select"/>
         <element name="productAttributeOptionsError" type="text" selector="//div[@class='mage-error']"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTierPriceForOneItemTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTierPriceForOneItemTest.xml
index 1491081a82ee4..4de01b0c9d14e 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTierPriceForOneItemTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductWithTierPriceForOneItemTest.xml
@@ -48,7 +48,7 @@
 
             <!--Add tier price in one product -->
             <createData entity="tierProductPrice" stepKey="addTierPrice">
-            <requiredEntity createDataKey="createFirstSimpleProduct" />
+                <requiredEntity createDataKey="createFirstSimpleProduct" />
             </createData>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
@@ -109,5 +109,8 @@
             <expectedResult type="string">Buy {{tierProductPrice.quantity}} for ${{tierProductPrice.price}} each and save 27%</expectedResult>
             <actualResult type="variable">tierPriceText</actualResult>
         </assertEquals>
+        <seeElement selector="{{StorefrontProductInfoMainSection.tierPriceBlock}}" stepKey="seeTierPriceBlock"/>
+        <selectOption userInput="$$createConfigProductAttributeOptionTwo.option[store_labels][1][label]$$" selector="{{StorefrontProductInfoMainSection.productAttributeOptionsSelectButton}}" stepKey="selectOption2"/>
+        <dontSeeElement selector="{{StorefrontProductInfoMainSection.tierPriceBlock}}" stepKey="dontSeeTierPriceBlock"/>
     </test>
 </tests>
diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
index f705b6a95987c..00030be74324f 100644
--- a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
+++ b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
@@ -740,21 +740,19 @@ define([
          * @private
          */
         _displayTierPriceBlock: function (optionId) {
-            var options, tierPriceHtml;
+            var tierPrices = typeof optionId != 'undefined' && this.options.spConfig.optionPrices[optionId].tierPrices;
 
-            if (typeof optionId != 'undefined' &&
-                this.options.spConfig.optionPrices[optionId].tierPrices != [] // eslint-disable-line eqeqeq
-            ) {
-                options = this.options.spConfig.optionPrices[optionId];
+            if (_.isArray(tierPrices) && tierPrices.length > 0) {
 
                 if (this.options.tierPriceTemplate) {
-                    tierPriceHtml = mageTemplate(this.options.tierPriceTemplate, {
-                        'tierPrices': options.tierPrices,
-                        '$t': $t,
-                        'currencyFormat': this.options.spConfig.currencyFormat,
-                        'priceUtils': priceUtils
-                    });
-                    $(this.options.tierPriceBlockSelector).html(tierPriceHtml).show();
+                    $(this.options.tierPriceBlockSelector).html(
+                        mageTemplate(this.options.tierPriceTemplate, {
+                            'tierPrices': tierPrices,
+                            '$t': $t,
+                            'currencyFormat': this.options.spConfig.currencyFormat,
+                            'priceUtils': priceUtils
+                        })
+                    ).show();
                 }
             } else {
                 $(this.options.tierPriceBlockSelector).hide();

From beae26b45c3a175121bd4c0b307b94d513571997 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 1506/1718] 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 4f90cf54c303bdcb3de6d010a63fb8af87d46eec Mon Sep 17 00:00:00 2001
From: Nikita Shcherbatykh <nikita.shcherbatykh@transoftgroup.com>
Date: Fri, 14 Aug 2020 13:17:06 +0300
Subject: [PATCH 1507/1718] MC-36533: Orders with Zero Sum Payment Method are
 Closed automatically

---
 .../ResourceModel/Order/Handler/State.php     |   3 +-
 .../ResourceModel/Order/Handler/StateTest.php | 157 +++++++++++++-----
 2 files changed, 116 insertions(+), 44 deletions(-)

diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php
index de15a627583ff..47395b17afee8 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Handler/State.php
@@ -9,7 +9,7 @@
 use Magento\Sales\Model\Order;
 
 /**
- * Class State
+ * Checking order status and adjusting order status before saving
  */
 class State
 {
@@ -34,6 +34,7 @@ public function check(Order $order)
             if (in_array($currentState, [Order::STATE_PROCESSING, Order::STATE_COMPLETE])
                 && !$order->canCreditmemo()
                 && !$order->canShip()
+                && $order->getIsNotVirtual()
             ) {
                 $order->setState(Order::STATE_CLOSED)
                     ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_CLOSED));
diff --git a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php
index ea655bb32f05f..f57c1d04f0934 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php
@@ -41,7 +41,8 @@ protected function setUp(): void
                     'getBaseGrandTotal',
                     'canCreditmemo',
                     'getTotalRefunded',
-                    'getConfig'
+                    'getConfig',
+                    'getIsNotVirtual'
                 ]
             )
             ->disableOriginalConstructor()
@@ -57,16 +58,17 @@ protected function setUp(): void
     }
 
     /**
-     * @param bool $isCanceled
-     * @param bool $canUnhold
-     * @param bool $canInvoice
-     * @param bool $canShip
-     * @param int $callCanSkipNum
      * @param bool $canCreditmemo
      * @param int $callCanCreditmemoNum
+     * @param bool $canShip
+     * @param int $callCanSkipNum
      * @param string $currentState
      * @param string $expectedState
-     * @param int $callSetStateNum
+     * @param bool $isInProcess
+     * @param int $callGetIsInProcessNum
+     * @param bool $isCanceled
+     * @param bool $canUnhold
+     * @param bool $isNotVirtual
      * @dataProvider stateCheckDataProvider
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -76,12 +78,12 @@ public function testCheck(
         bool $canShip,
         int $callCanSkipNum,
         string $currentState,
-        string $expectedState = '',
-        bool $isInProcess = false,
-        int $callGetIsInProcessNum = 0,
-        bool $isCanceled = false,
-        bool $canUnhold = false,
-        bool $canInvoice = false
+        string $expectedState,
+        bool $isInProcess,
+        int $callGetIsInProcessNum,
+        bool $isCanceled,
+        bool $canUnhold,
+        bool $isNotVirtual
     ) {
         $this->orderMock->setState($currentState);
         $this->orderMock->expects($this->any())
@@ -92,7 +94,7 @@ public function testCheck(
             ->willReturn($canUnhold);
         $this->orderMock->expects($this->any())
             ->method('canInvoice')
-            ->willReturn($canInvoice);
+            ->willReturn(false);
         $this->orderMock->expects($this->exactly($callCanSkipNum))
             ->method('canShip')
             ->willReturn($canShip);
@@ -102,6 +104,8 @@ public function testCheck(
         $this->orderMock->expects($this->exactly($callGetIsInProcessNum))
             ->method('getIsInProcess')
             ->willReturn($isInProcess);
+        $this->orderMock->method('getIsNotVirtual')
+            ->willReturn($isNotVirtual);
         $this->state->check($this->orderMock);
         $this->assertEquals($expectedState, $this->orderMock->getState());
     }
@@ -118,7 +122,12 @@ public function stateCheckDataProvider()
                 'can_ship' => false,
                 'call_can_skip_num' => 1,
                 'current_state' => Order::STATE_PROCESSING,
-                'expected_state' => Order::STATE_CLOSED
+                'expected_state' => Order::STATE_CLOSED,
+                'is_in_process' => false,
+                'get_is_in_process_invoke_count' => 0,
+                'is_canceled' => false,
+                'can_unhold' => false,
+                'is_not_virtual' => true
             ],
             'complete - !canCreditmemo,!canShip -> closed' => [
                 'can_credit_memo' => false,
@@ -126,7 +135,12 @@ public function stateCheckDataProvider()
                 'can_ship' => false,
                 'call_can_skip_num' => 1,
                 'current_state' => Order::STATE_COMPLETE,
-                'expected_state' => Order::STATE_CLOSED
+                'expected_state' => Order::STATE_CLOSED,
+                'is_in_process' => false,
+                'get_is_in_process_invoke_count' => 0,
+                'is_canceled' => false,
+                'can_unhold' => false,
+                'is_not_virtual' => true
             ],
             'processing - !canCreditmemo,canShip -> processing' => [
                 'can_credit_memo' => false,
@@ -134,7 +148,12 @@ public function stateCheckDataProvider()
                 'can_ship' => true,
                 'call_can_skip_num' => 2,
                 'current_state' => Order::STATE_PROCESSING,
-                'expected_state' => Order::STATE_PROCESSING
+                'expected_state' => Order::STATE_PROCESSING,
+                'is_in_process' => false,
+                'get_is_in_process_invoke_count' => 0,
+                'is_canceled' => false,
+                'can_unhold' => false,
+                'is_not_virtual' => true
             ],
             'complete - !canCreditmemo,canShip -> complete' => [
                 'can_credit_memo' => false,
@@ -142,7 +161,12 @@ public function stateCheckDataProvider()
                 'can_ship' => true,
                 'call_can_skip_num' => 1,
                 'current_state' => Order::STATE_COMPLETE,
-                'expected_state' => Order::STATE_COMPLETE
+                'expected_state' => Order::STATE_COMPLETE,
+                'is_in_process' => false,
+                'get_is_in_process_invoke_count' => 0,
+                'is_canceled' => false,
+                'can_unhold' => false,
+                'is_not_virtual' => true
             ],
             'processing - canCreditmemo,!canShip -> complete' => [
                 'can_credit_memo' => true,
@@ -150,7 +174,12 @@ public function stateCheckDataProvider()
                 'can_ship' => false,
                 'call_can_skip_num' => 1,
                 'current_state' => Order::STATE_PROCESSING,
-                'expected_state' => Order::STATE_COMPLETE
+                'expected_state' => Order::STATE_COMPLETE,
+                'is_in_process' => false,
+                'get_is_in_process_invoke_count' => 0,
+                'is_canceled' => false,
+                'can_unhold' => false,
+                'is_not_virtual' => true
             ],
             'complete - canCreditmemo,!canShip -> complete' => [
                 'can_credit_memo' => true,
@@ -158,7 +187,12 @@ public function stateCheckDataProvider()
                 'can_ship' => false,
                 'call_can_skip_num' => 0,
                 'current_state' => Order::STATE_COMPLETE,
-                'expected_state' => Order::STATE_COMPLETE
+                'expected_state' => Order::STATE_COMPLETE,
+                'is_in_process' => false,
+                'get_is_in_process_invoke_count' => 0,
+                'is_canceled' => false,
+                'can_unhold' => false,
+                'is_not_virtual' => true
             ],
             'processing - canCreditmemo, canShip -> processing' => [
                 'can_credit_memo' => true,
@@ -166,7 +200,12 @@ public function stateCheckDataProvider()
                 'can_ship' => true,
                 'call_can_skip_num' => 1,
                 'current_state' => Order::STATE_PROCESSING,
-                'expected_state' => Order::STATE_PROCESSING
+                'expected_state' => Order::STATE_PROCESSING,
+                'is_in_process' => false,
+                'get_is_in_process_invoke_count' => 0,
+                'is_canceled' => false,
+                'can_unhold' => false,
+                'is_not_virtual' => true
             ],
             'complete - canCreditmemo, canShip -> complete' => [
                 'can_credit_memo' => true,
@@ -174,7 +213,12 @@ public function stateCheckDataProvider()
                 'can_ship' => true,
                 'call_can_skip_num' => 0,
                 'current_state' => Order::STATE_COMPLETE,
-                'expected_state' => Order::STATE_COMPLETE
+                'expected_state' => Order::STATE_COMPLETE,
+                'is_in_process' => false,
+                'get_is_in_process_invoke_count' => 0,
+                'is_canceled' => false,
+                'can_unhold' => false,
+                'is_not_virtual' => true
             ],
             'new - canCreditmemo, canShip, IsInProcess -> processing' => [
                 'can_credit_memo' => true,
@@ -183,8 +227,11 @@ public function stateCheckDataProvider()
                 'call_can_skip_num' => 1,
                 'current_state' => Order::STATE_NEW,
                 'expected_state' => Order::STATE_PROCESSING,
-                true,
-                1
+                'is_in_process' => true,
+                'get_is_in_process_invoke_count' => 1,
+                'is_canceled' => false,
+                'can_unhold' => false,
+                'is_not_virtual' => true
             ],
             'new - canCreditmemo, !canShip, IsInProcess -> processing' => [
                 'can_credit_memo' => true,
@@ -193,8 +240,11 @@ public function stateCheckDataProvider()
                 'call_can_skip_num' => 1,
                 'current_state' => Order::STATE_NEW,
                 'expected_state' => Order::STATE_COMPLETE,
-                true,
-                1
+                'is_in_process' => true,
+                'get_is_in_process_invoke_count' => 1,
+                'is_canceled' => false,
+                'can_unhold' => false,
+                'is_not_virtual' => true
             ],
             'new - canCreditmemo, canShip, !IsInProcess -> new' => [
                 'can_credit_memo' => true,
@@ -203,8 +253,11 @@ public function stateCheckDataProvider()
                 'call_can_skip_num' => 0,
                 'current_state' => Order::STATE_NEW,
                 'expected_state' => Order::STATE_NEW,
-                false,
-                1
+                'is_in_process' => false,
+                'get_is_in_process_invoke_count' => 1,
+                'is_canceled' => false,
+                'can_unhold' => false,
+                'is_not_virtual' => true
             ],
             'hold - canUnhold -> hold' => [
                 'can_credit_memo' => true,
@@ -213,10 +266,11 @@ public function stateCheckDataProvider()
                 'call_can_skip_num' => 0,
                 'current_state' => Order::STATE_HOLDED,
                 'expected_state' => Order::STATE_HOLDED,
-                false,
-                0,
-                false,
-                true
+                'is_in_process' => false,
+                'get_is_in_process_invoke_count' => 0,
+                'is_canceled' => false,
+                'can_unhold' => true,
+                'is_not_virtual' => true
             ],
             'payment_review - canUnhold -> payment_review' => [
                 'can_credit_memo' => true,
@@ -225,10 +279,11 @@ public function stateCheckDataProvider()
                 'call_can_skip_num' => 0,
                 'current_state' => Order::STATE_PAYMENT_REVIEW,
                 'expected_state' => Order::STATE_PAYMENT_REVIEW,
-                false,
-                0,
-                false,
-                true
+                'is_in_process' => false,
+                'get_is_in_process_invoke_count' => 0,
+                'is_canceled' => false,
+                'can_unhold' => true,
+                'is_not_virtual' => true
             ],
             'pending_payment - canUnhold -> pending_payment' => [
                 'can_credit_memo' => true,
@@ -237,10 +292,11 @@ public function stateCheckDataProvider()
                 'call_can_skip_num' => 0,
                 'current_state' => Order::STATE_PENDING_PAYMENT,
                 'expected_state' => Order::STATE_PENDING_PAYMENT,
-                false,
-                0,
-                false,
-                true
+                'is_in_process' => false,
+                'get_is_in_process_invoke_count' => 0,
+                'is_canceled' => false,
+                'can_unhold' => true,
+                'is_not_virtual' => true
             ],
             'cancelled - isCanceled -> cancelled' => [
                 'can_credit_memo' => true,
@@ -249,9 +305,24 @@ public function stateCheckDataProvider()
                 'call_can_skip_num' => 0,
                 'current_state' => Order::STATE_HOLDED,
                 'expected_state' => Order::STATE_HOLDED,
-                false,
-                0,
-                true
+                'is_in_process' => false,
+                'get_is_in_process_invoke_count' => 0,
+                'is_canceled' => true,
+                'can_unhold' => false,
+                'is_not_virtual' => true
+            ],
+            'processing - !canCreditmemo!canShip -> complete(virtual product)' => [
+                'can_credit_memo' => false,
+                'can_credit_memo_invoke_count' => 1,
+                'can_ship' => false,
+                'call_can_skip_num' => 2,
+                'current_state' => Order::STATE_PROCESSING,
+                'expected_state' => Order::STATE_COMPLETE,
+                'is_in_process' => false,
+                'get_is_in_process_invoke_count' => 0,
+                'is_canceled' => false,
+                'can_unhold' => false,
+                'is_not_virtual' => false
             ],
         ];
     }

From 47d32a2ac26f63b00c8254e10e67eb71c2aca164 Mon Sep 17 00:00:00 2001
From: Nikita Shcherbatykh <nikita.shcherbatykh@transoftgroup.com>
Date: Fri, 14 Aug 2020 15:02:05 +0300
Subject: [PATCH 1508/1718] MC-36533: Orders with Zero Sum Payment Method are
 Closed automatically

---
 .../Unit/Model/ResourceModel/Order/Handler/StateTest.php   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php
index f57c1d04f0934..a48f0702f5a4b 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/Handler/StateTest.php
@@ -50,10 +50,6 @@ protected function setUp(): void
         $this->orderMock->expects($this->any())
             ->method('getConfig')
             ->willReturnSelf();
-        $this->addressMock = $this->createMock(Address::class);
-        $this->addressCollectionMock = $this->createMock(
-            Collection::class
-        );
         $this->state = new State();
     }
 
@@ -111,6 +107,9 @@ public function testCheck(
     }
 
     /**
+     * Data provider for testCheck
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @return array
      */
     public function stateCheckDataProvider()

From 5f1d43a80d6dadbe5b2442c873de94f582f1ea7f Mon Sep 17 00:00:00 2001
From: yolouiese <honeymay@abovethefray.io>
Date: Fri, 14 Aug 2020 20:06:50 +0800
Subject: [PATCH 1509/1718] 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 2d58988451bd736066e24c7be7f42508e753791f Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Fri, 14 Aug 2020 16:55:36 +0300
Subject: [PATCH 1510/1718] MFTF update.

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

diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontAccountDownloadableProductLinkAfterPartialRefundTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontAccountDownloadableProductLinkAfterPartialRefundTest.xml
index eaff4a5b116c3..d82cc25b0eccf 100644
--- a/app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontAccountDownloadableProductLinkAfterPartialRefundTest.xml
+++ b/app/code/Magento/Downloadable/Test/Mftf/Test/StorefrontAccountDownloadableProductLinkAfterPartialRefundTest.xml
@@ -51,6 +51,7 @@
 
             <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove example.com static.magento.com"/>
             <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
+            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
             <magentoCLI command="cache:flush" stepKey="flushCache"/>
         </after>
 

From f2bae07c498ee5ecd18acda2e65cf6d6b8ffed72 Mon Sep 17 00:00:00 2001
From: Dave Macaulay <macaulay@adobe.com>
Date: Fri, 14 Aug 2020 09:00:40 -0500
Subject: [PATCH 1511/1718] PWA-806: Localize emails sent through GraphQL
 application

- Fix issue with localization lange pack fixture
---
 .../CustomerGraphQl/Model/Resolver/CreateCustomerTest.php       | 2 +-
 .../CustomerGraphQl/_files/french/fr_fr/registration.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerTest.php b/dev/tests/integration/testsuite/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerTest.php
index fa6889cbdbe37..11ac2695bd80c 100644
--- a/dev/tests/integration/testsuite/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerTest.php
+++ b/dev/tests/integration/testsuite/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerTest.php
@@ -231,7 +231,7 @@ public function testCreateCustomerForStoreSendsTranslatedEmail()
         $this->assertEquals('test@magento.com', $sentMessage->getTo()[0]->getEmail());
 
         // Assert the email contains the expected content
-        $this->assertEquals('Bienvenue sur Test Group.', $sentMessage->getSubject());
+        $this->assertEquals('Bienvenue sur Test Group', $sentMessage->getSubject());
         $messageRaw = $sentMessage->getBody()->getParts()[0]->getRawContent();
         $this->assertStringContainsString('Bienvenue sur Test Group.', $messageRaw);
     }
diff --git a/dev/tests/integration/testsuite/Magento/CustomerGraphQl/_files/french/fr_fr/registration.php b/dev/tests/integration/testsuite/Magento/CustomerGraphQl/_files/french/fr_fr/registration.php
index 785cda484e889..95acf0c1487c7 100644
--- a/dev/tests/integration/testsuite/Magento/CustomerGraphQl/_files/french/fr_fr/registration.php
+++ b/dev/tests/integration/testsuite/Magento/CustomerGraphQl/_files/french/fr_fr/registration.php
@@ -6,4 +6,4 @@
 
 use Magento\Framework\Component\ComponentRegistrar;
 
-ComponentRegistrar::register(ComponentRegistrar::LANGUAGE, 'french', __DIR__);
+ComponentRegistrar::register(ComponentRegistrar::LANGUAGE, 'french_fr_fr', __DIR__);

From 5ad1fa57cec33893736ac0c301ea71689c975ba3 Mon Sep 17 00:00:00 2001
From: Dave Macaulay <macaulay@adobe.com>
Date: Fri, 14 Aug 2020 09:28:39 -0500
Subject: [PATCH 1512/1718] PWA-806: Localize emails sent through GraphQL
 application

- Fix static issues
---
 app/code/Magento/StoreGraphQl/Plugin/LocalizeEmail.php       | 5 +++++
 .../CustomerGraphQl/Model/Resolver/CreateCustomerTest.php    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/StoreGraphQl/Plugin/LocalizeEmail.php b/app/code/Magento/StoreGraphQl/Plugin/LocalizeEmail.php
index 70f1762933e99..f3d3924b15280 100644
--- a/app/code/Magento/StoreGraphQl/Plugin/LocalizeEmail.php
+++ b/app/code/Magento/StoreGraphQl/Plugin/LocalizeEmail.php
@@ -1,4 +1,8 @@
 <?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
 
 namespace Magento\StoreGraphQl\Plugin;
 
@@ -61,6 +65,7 @@ public function __construct(
      * @param \Closure $proceed
      * @return mixed
      * @throws NoSuchEntityException|LocalizedException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function aroundGetTransport(TransportBuilder $subject, \Closure $proceed)
     {
diff --git a/dev/tests/integration/testsuite/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerTest.php b/dev/tests/integration/testsuite/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerTest.php
index 11ac2695bd80c..0d9f0d0df5fba 100644
--- a/dev/tests/integration/testsuite/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerTest.php
+++ b/dev/tests/integration/testsuite/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerTest.php
@@ -197,7 +197,7 @@ public function testCreateCustomerForStoreSendsTranslatedEmail()
         }
     }
 }
-QUERY;
+QUERY;Magento/StoreGraphQl/Plugin/LocalizeEmail.php
 
         $response = $this->graphQlRequest->send(
             $query,

From c65fb6437cd6a11ff268a29ef6d9a77a87161072 Mon Sep 17 00:00:00 2001
From: Dave Macaulay <macaulay@adobe.com>
Date: Fri, 14 Aug 2020 11:42:51 -0500
Subject: [PATCH 1513/1718] PWA-806: Localize emails sent through GraphQL
 application

- Remove accidental copy and paste
---
 .../CustomerGraphQl/Model/Resolver/CreateCustomerTest.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerTest.php b/dev/tests/integration/testsuite/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerTest.php
index 0d9f0d0df5fba..11ac2695bd80c 100644
--- a/dev/tests/integration/testsuite/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerTest.php
+++ b/dev/tests/integration/testsuite/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerTest.php
@@ -197,7 +197,7 @@ public function testCreateCustomerForStoreSendsTranslatedEmail()
         }
     }
 }
-QUERY;Magento/StoreGraphQl/Plugin/LocalizeEmail.php
+QUERY;
 
         $response = $this->graphQlRequest->send(
             $query,

From d279ab4ac5dcd281a43975ce0013fc1f8081238a Mon Sep 17 00:00:00 2001
From: Slava Mankivski <mankivsk@adobe.com>
Date: Fri, 14 Aug 2020 13:06:34 -0500
Subject: [PATCH 1514/1718] Fixed PHPStan

---
 .../Catalog/Test/Unit/Model/Product/TierPriceManagementTest.php  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/TierPriceManagementTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/TierPriceManagementTest.php
index 412855c929331..8aa29ca6688a3 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/TierPriceManagementTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/TierPriceManagementTest.php
@@ -142,6 +142,7 @@ public function testGetList($configValue, $customerGroupId, $groupData, $expecte
             ->method('getValue')
             ->with('catalog/price/scope', ScopeInterface::SCOPE_WEBSITE)
             ->willReturn($configValue);
+        $priceMock = null;
         if ($expected) {
             $priceMock = $this->getMockForAbstractClass(ProductTierPriceInterface::class);
             $priceMock->expects($this->once())

From 35c9d62fecc66372c98b0dc5e2914928eab8510f Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Fri, 14 Aug 2020 13:38:21 -0500
Subject: [PATCH 1515/1718] MC-36456: union implementation

---
 .../Model/Resolver/Item.php                   |  3 ++
 .../Model/Resolver/UnionType1.php             | 49 +++++++++++++++++++
 .../Model/Resolver/UnionTypeResolver.php      | 28 +++++++++++
 .../etc/schema.graphqls                       | 12 +++++
 .../GraphQl/TestModule/GraphQlQueryTest.php   | 47 ++++++++++++++++++
 5 files changed, 139 insertions(+)
 create mode 100644 dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/UnionType1.php
 create mode 100644 dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/UnionTypeResolver.php

diff --git a/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/Item.php b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/Item.php
index 1731a974aaed3..71ff93875f2c1 100644
--- a/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/Item.php
+++ b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/Item.php
@@ -11,6 +11,9 @@
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 
+/**
+ * Resolver for Item
+ */
 class Item implements ResolverInterface
 {
     /**
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/UnionType1.php b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/UnionType1.php
new file mode 100644
index 0000000000000..e012178d0ce22
--- /dev/null
+++ b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/UnionType1.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestModuleGraphQlQuery\Model\Resolver;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Sales\Model\ResourceModel\Order\CollectionFactoryInterface;
+
+/**
+ * Resolver for Union Type 1
+ */
+class UnionType1 implements ResolverInterface
+{
+    /**
+     * @var CollectionFactoryInterface
+     */
+    private $collectionFactory;
+
+    /**
+     * @param CollectionFactoryInterface $collectionFactory
+     */
+    public function __construct(
+        CollectionFactoryInterface $collectionFactory
+    ) {
+        $this->collectionFactory = $collectionFactory;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        return [
+            'custom_name1' => 'custom_name1_value',
+            'custom_name2' => 'custom_name2_value',
+        ];
+    }
+}
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/UnionTypeResolver.php b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/UnionTypeResolver.php
new file mode 100644
index 0000000000000..5264adc89e9f9
--- /dev/null
+++ b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/UnionTypeResolver.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestModuleGraphQlQuery\Model\Resolver;
+
+use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
+
+/**
+ * Type Resolver for union
+ */
+class UnionTypeResolver implements TypeResolverInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function resolveType(array $data): string
+    {
+        if (!empty($data)) {
+            return 'TypeCustom1';
+        }
+        return '';
+    }
+
+}
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/etc/schema.graphqls b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/etc/schema.graphqls
index 7eb175a88e322..09050085bc0a2 100644
--- a/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/etc/schema.graphqls
+++ b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/etc/schema.graphqls
@@ -3,6 +3,7 @@
 
 type Query {
     testItem(id: Int!) : Item @resolver(class: "Magento\\TestModuleGraphQlQuery\\Model\\Resolver\\Item")
+    testUnion: UnionType1 @resolver(class: "Magento\\TestModuleGraphQlQuery\\Model\\Resolver\\UnionType1")
 }
 
 type Mutation {
@@ -18,3 +19,14 @@ type MutationItem {
     item_id: Int
     name: String
 }
+
+union UnionType1 @doc(description: "some kind of union") @typeResolver(class: "Magento\\TestModuleGraphQlQuery\\Model\\Resolver\\UnionTypeResolver")  =
+    TypeCustom1 | TypeCustom2
+
+type TypeCustom1 {
+    custom_name1: String
+}
+
+type TypeCustom2 {
+    custom_name2: String
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php
index 2db06e383758f..204493fcef107 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php
@@ -25,6 +25,15 @@ public function testQueryTestModuleReturnsResults()
         item_id
         name
     }
+    testUnion {
+      __typename
+      ... on TypeCustom1 {
+          custom_name1
+      }
+      ... on TypeCustom2 {
+          custom_name2
+      }
+    }
 }
 QUERY;
 
@@ -100,4 +109,42 @@ public function testQueryViaGetRequestWithVariablesReturnsResults()
 
         $this->assertArrayHasKey('testItem', $response);
     }
+
+    public function testQueryTestUnionResults()
+    {
+        $id = 1;
+
+        $query = <<<QUERY
+{
+    testItem(id: {$id})
+    {
+        item_id
+        name
+    }
+    testUnion {
+      __typename
+      ... on TypeCustom1 {
+          custom_name1
+      }
+      ... on TypeCustom2 {
+          custom_name2
+      }
+    }
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+        $this->assertArrayHasKey('testItem', $response);
+        $testItem = $response['testItem'];
+        $this->assertArrayHasKey('item_id', $testItem);
+        $this->assertArrayHasKey('name', $testItem);
+        $this->assertEquals(1, $testItem['item_id']);
+        $this->assertEquals('itemName', $testItem['name']);
+
+        $this->assertArrayHasKey('testUnion', $response);
+        $testUnion = $response['testUnion'];
+        $this->assertArrayHasKey('custom_name1', $testUnion);
+        $this->assertEquals('custom_name1_value', $testUnion['custom_name1']);
+        $this->assertArrayNotHasKey('custom_name2', $testUnion);
+    }
 }

From ed0c1745e38b8e4d2fbdf2cc9d268775f9000621 Mon Sep 17 00:00:00 2001
From: Leonid Poluianov <poluyano@adobe.com>
Date: Fri, 14 Aug 2020 22:24:29 -0500
Subject: [PATCH 1516/1718] MC-36671: Extend catalog GraphQl tests coverage

---
 .../Catalog/ProductSearchAggregationsTest.php |  16 +-
 .../GraphQl/Catalog/ProductSearchTest.php     | 184 ++++++++----------
 2 files changed, 87 insertions(+), 113 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 a75fb1e1e5ced..8323cdf523934 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchAggregationsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchAggregationsTest.php
@@ -17,8 +17,6 @@ class ProductSearchAggregationsTest extends GraphQlAbstract
      */
     public function testAggregationBooleanAttribute()
     {
-        $this->reindex();
-
         $skus= '"search_product_1", "search_product_2", "search_product_3", "search_product_4" ,"search_product_5"';
         $query = <<<QUERY
 {
@@ -61,21 +59,9 @@ function ($a) {
         $this->assertEquals('boolean_attribute', $booleanAggregation['attribute_code']);
         $this->assertContainsEquals(['label' => '1', 'value'=> '1', 'count' => '3'], $booleanAggregation['options']);
 
-        $this->markTestIncomplete('MC-22184: Elasticsearch returns incorrect aggregation options for booleans');
+        $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']);
     }
-
-    /**
-     * Reindex
-     *
-     * @throws \Magento\Framework\Exception\LocalizedException
-     */
-    private function reindex()
-    {
-        $appDir = dirname(Bootstrap::getInstance()->getAppTempDir());
-        // phpcs:ignore Magento2.Security.InsecureFunction
-        exec("php -f {$appDir}/bin/magento indexer:reindex");
-    }
 }
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 226f240a247ec..f755a1a1e0282 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
@@ -13,16 +13,16 @@
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\CategoryLinkManagement;
+use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ResourceModel\Category\Collection;
+use Magento\Eav\Api\Data\AttributeOptionInterface;
 use Magento\Eav\Model\Config;
-use Magento\TestFramework\ObjectManager;
-use Magento\TestFramework\TestCase\GraphQlAbstract;
-use Magento\Catalog\Model\Product;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Eav\Api\Data\AttributeOptionInterface;
 use Magento\Framework\DataObject;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Helper\CacheCleaner;
+use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 /**
  * @SuppressWarnings(PHPMD.TooManyPublicMethods)
@@ -73,7 +73,8 @@ public function testFilterForNonExistingCategory()
      */
     public function testFilterLn()
     {
-        $this->reIndexAndCleanCache();
+        $this->markTestSkipped('MC-36768: Custom attribute value created in integration tests'
+            . 'fixtures product not appears in elasticsearch');
         $query = <<<QUERY
 {
     products (
@@ -154,6 +155,8 @@ private function compareFilterNames(array $a, array $b)
      */
     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';
 
@@ -166,7 +169,6 @@ public function testLayeredNavigationForConfigurableProducts()
         $firstOption = $options[0]->getValue();
         $secondOption = $options[1]->getValue();
         $query = $this->getQueryProductsWithArrayOfCustomAttributes($attributeCode, $firstOption, $secondOption);
-        $this->reIndexAndCleanCache();
         $response = $this->graphQlQuery($query);
 
         $this->assertEquals(2, $response['products']['total_count']);
@@ -179,18 +181,18 @@ public function testLayeredNavigationForConfigurableProducts()
             $response['products']['aggregations'][1],
             [
                 'attribute_code' => $attribute->getAttributeCode(),
-                'label'=> $attribute->getDefaultFrontendLabel(),
-                'count'=> 2,
+                'label' => $attribute->getDefaultFrontendLabel(),
+                'count' => 2,
                 'options' => [
                     [
                         'label' => 'Option 1',
                         'value' => $firstOption,
-                        'count' =>'2'
+                        'count' => '2'
                     ],
                     [
                         'label' => 'Option 2',
                         'value' => $secondOption,
-                        'count' =>'2'
+                        'count' => '2'
                     ]
                 ],
             ]
@@ -201,7 +203,7 @@ public function testLayeredNavigationForConfigurableProducts()
      *
      * @return string
      */
-    private function getQueryProductsWithArrayOfCustomAttributes($attributeCode, $firstOption, $secondOption) : string
+    private function getQueryProductsWithArrayOfCustomAttributes($attributeCode, $firstOption, $secondOption): string
     {
         return <<<QUERY
 {
@@ -258,6 +260,8 @@ private function getQueryProductsWithArrayOfCustomAttributes($attributeCode, $fi
      */
     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);
@@ -315,7 +319,6 @@ public function testFilterProductsByDropDownCustomAttribute()
         $product3 = $productRepository->get('simple-4');
         $filteredProducts = [$product3, $product2, $product1];
         $countOfFilteredProducts = count($filteredProducts);
-        $this->reIndexAndCleanCache();
         $response = $this->graphQlQuery($query);
         $this->assertEquals(3, $response['products']['total_count'], 'Number of products returned is incorrect');
         $this->assertTrue(count($response['products']['filters']) > 0, 'Product filters is not empty');
@@ -327,8 +330,9 @@ public function testFilterProductsByDropDownCustomAttribute()
             //validate that correct products are returned
             $this->assertResponseFields(
                 $productItemsInResponse[$itemIndex][0],
-                [ 'name' => $filteredProducts[$itemIndex]->getName(),
-                  'sku' => $filteredProducts[$itemIndex]->getSku()
+                [
+                    'name' => $filteredProducts[$itemIndex]->getName(),
+                    'sku' => $filteredProducts[$itemIndex]->getSku()
                 ]
             );
         }
@@ -341,34 +345,19 @@ public function testFilterProductsByDropDownCustomAttribute()
             $response['products']['aggregations'][2],
             [
                 'attribute_code' => $attribute->getAttributeCode(),
-                'count'=> 1,
-                'label'=> $attribute->getDefaultFrontendLabel(),
+                'count' => 1,
+                'label' => $attribute->getDefaultFrontendLabel(),
                 'options' => [
                     [
                         'label' => 'Option 3',
-                         'count' => 3,
-                         'value' => $optionValue
-                     ],
-                 ],
+                        'count' => 3,
+                        'value' => $optionValue
+                    ],
+                ],
             ]
         );
     }
 
-    /**
-     * @return void
-     * @throws \Magento\Framework\Exception\LocalizedException
-     */
-    private function reIndexAndCleanCache() : void
-    {
-        $appDir = dirname(Bootstrap::getInstance()->getAppTempDir());
-        $out = '';
-        // phpcs:ignore Magento2.Security.InsecureFunction
-        exec("php -f {$appDir}/bin/magento indexer:reindex catalog_category_product", $out);
-        // phpcs:ignore Magento2.Security.InsecureFunction
-        exec("php -f {$appDir}/bin/magento indexer:reindex catalogsearch_fulltext", $out);
-        CacheCleaner::cleanAll();
-    }
-
     /**
      * Filter products using an array of  multi select custom attributes
      *
@@ -378,7 +367,6 @@ private function reIndexAndCleanCache() : void
     public function testFilterProductsByMultiSelectCustomAttributes()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->reIndexAndCleanCache();
         $attributeCode = 'multiselect_attribute';
         /** @var Config $eavConfig */
         $eavConfig = $objectManager->get(Config::class);
@@ -451,7 +439,7 @@ public function testFilterProductsByMultiSelectCustomAttributes()
      * @param string $attributeCode
      * @return string
      */
-    private function getDefaultAttributeOptionValue(string $attributeCode) : string
+    private function getDefaultAttributeOptionValue(string $attributeCode): string
     {
         /** @var Config $eavConfig */
         $eavConfig = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(Config::class);
@@ -471,7 +459,8 @@ private function getDefaultAttributeOptionValue(string $attributeCode) : string
      */
     public function testSearchAndFilterByCustomAttribute()
     {
-        $this->reIndexAndCleanCache();
+        $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);
 
@@ -530,11 +519,13 @@ public function testSearchAndFilterByCustomAttribute()
         $this->assertCount(3, $response['products']['aggregations']);
         $expectedFilterLayers =
             [
-                ['name' => 'Category',
-                 'request_var'=> 'cat'
+                [
+                    'name' => 'Category',
+                    'request_var' => 'cat'
                 ],
-                ['name' => 'Second Test Configurable',
-                 'request_var'=> 'second_test_configurable'
+                [
+                    'name' => 'Second Test Configurable',
+                    'request_var' => 'second_test_configurable'
                 ]
             ];
         $layers = array_map(null, $expectedFilterLayers, $response['products']['filters']);
@@ -559,22 +550,22 @@ public function testSearchAndFilterByCustomAttribute()
             $response['products']['aggregations'][0],
             [
                 'attribute_code' => 'price',
-                'count'=> 2,
-                'label'=> 'Price',
+                'count' => 2,
+                'label' => 'Price',
                 'options' => [
                     [
                         'count' => 2,
                         'label' => '10-20',
                         'value' => '10_20',
 
-                     ],
+                    ],
                     [
                         'count' => 1,
                         'label' => '40-50',
                         'value' => '40_50',
 
                     ],
-                 ],
+                ],
             ]
         );
         // Validate the custom attribute layer of aggregations from the response
@@ -582,8 +573,8 @@ public function testSearchAndFilterByCustomAttribute()
             $response['products']['aggregations'][2],
             [
                 'attribute_code' => $attribute_code,
-                'count'=> 1,
-                'label'=> 'Second Test Configurable',
+                'count' => 1,
+                'label' => 'Second Test Configurable',
                 'options' => [
                     [
                         'count' => 3,
@@ -601,9 +592,9 @@ public function testSearchAndFilterByCustomAttribute()
         $this->assertResponseFields(
             $response['products']['aggregations'][1],
             [
-                 'attribute_code' => 'category_id',
-                 'count'=> 7,
-                 'label'=> 'Category'
+                'attribute_code' => 'category_id',
+                'count' => 7,
+                'label' => 'Category'
             ]
         );
     }
@@ -616,7 +607,8 @@ public function testSearchAndFilterByCustomAttribute()
      */
     public function testFilterByCategoryIdAndCustomAttribute()
     {
-        $this->reIndexAndCleanCache();
+        $this->markTestSkipped('MC-36768: Custom attribute value created in integration tests'
+            . 'fixtures product not appears in elasticsearch');
         $categoryId = 13;
         $optionValue = $this->getDefaultAttributeOptionValue('second_test_configurable');
         $query = <<<QUERY
@@ -698,37 +690,37 @@ public function testFilterByCategoryIdAndCustomAttribute()
         $expectedCategoryInAggregations =
             [
                 [
-                  'count' =>  2,
-                  'label' => 'Category 1',
-                  'value'=> '3'
+                    'count' => 2,
+                    'label' => 'Category 1',
+                    'value' => '3'
                 ],
                 [
-                    'count'=> 1,
+                    'count' => 1,
                     'label' => 'Category 1.1',
-                    'value'=> '4'
+                    'value' => '4'
 
                 ],
                 [
-                    'count'=> 1,
+                    'count' => 1,
                     'label' => 'Movable Position 2',
-                    'value'=> '10'
+                    'value' => '10'
 
                 ],
                 [
-                    'count'=> 1,
+                    'count' => 1,
                     'label' => 'Movable Position 3',
-                    'value'=> '11'
+                    'value' => '11'
                 ],
                 [
-                    'count'=> 1,
+                    'count' => 1,
                     'label' => 'Category 12',
-                    'value'=> '12'
+                    'value' => '12'
 
                 ],
                 [
-                    'count'=> 2,
+                    'count' => 2,
                     'label' => 'Category 1.2',
-                    'value'=> '13'
+                    'value' => '13'
                 ],
             ];
         // presort expected and actual results as different search engines have different orders
@@ -833,7 +825,7 @@ public function testFilterBySingleProductUrlKey()
             [
                 'name' => $product->getName(),
                 'sku' => $product->getSku(),
-                'url_key'=> $product->getUrlKey()
+                'url_key' => $product->getUrlKey()
             ]
         );
         $this->assertEquals('Price', $response['products']['aggregations'][0]['label']);
@@ -899,7 +891,7 @@ public function testFilterByMultipleProductUrlKeys()
         $product2 = $productRepository->get('12345');
         $product3 = $productRepository->get('simple-4');
         $filteredProducts = [$product3, $product2, $product1];
-        $urlKey =[];
+        $urlKey = [];
         foreach ($filteredProducts as $product) {
             $urlKey[] = $product->getUrlKey();
         }
@@ -956,9 +948,10 @@ public function testFilterByMultipleProductUrlKeys()
             //validate that correct products are returned
             $this->assertResponseFields(
                 $productItemsInResponse[$itemIndex][0],
-                [ 'name' => $filteredProducts[$itemIndex]->getName(),
-                  'sku' => $filteredProducts[$itemIndex]->getSku(),
-                  'url_key'=> $filteredProducts[$itemIndex]->getUrlKey()
+                [
+                    'name' => $filteredProducts[$itemIndex]->getName(),
+                    'sku' => $filteredProducts[$itemIndex]->getSku(),
+                    'url_key' => $filteredProducts[$itemIndex]->getUrlKey()
                 ]
             );
         }
@@ -1124,7 +1117,6 @@ public function testFilterWithinSpecificPriceRangeSortedByNameDesc()
      */
     public function testSortByPosition()
     {
-        $this->reIndexAndCleanCache();
         // Get category ID for filtering
         /** @var Collection $categoryCollection */
         $categoryCollection = Bootstrap::getObjectManager()->get(Collection::class);
@@ -1177,7 +1169,6 @@ public function testSortByPosition()
 
         $category->setPostedProducts($productPositions);
         $category->save();
-        $this->reIndexAndCleanCache();
 
         $queryDesc = <<<QUERY
 {
@@ -1209,7 +1200,6 @@ public function testSortByPosition()
 
     public function testSearchWithFilterWithPageSizeEqualTotalCount()
     {
-        $this->reIndexAndCleanCache();
         $query
             = <<<QUERY
 {
@@ -1419,7 +1409,7 @@ public function testFilterProductsForExactMatchingName()
         );
         $this->assertArrayHasKey('aggregations', $response['products']);
         $this->assertCount(2, $response['products']['aggregations']);
-        $expectedAggregations =[
+        $expectedAggregations = [
             [
                 'attribute_code' => 'price',
                 'count' => 2,
@@ -1532,7 +1522,7 @@ public function testFilterProductsBySingleCategoryId()
 QUERY;
 
         $response = $this->graphQlQuery($query);
-         $this->assertEquals(2, $response['products']['total_count'], 'Incorrect count of products returned');
+        $this->assertEquals(2, $response['products']['total_count'], 'Incorrect count of products returned');
         /** @var CategoryLinkManagement $productLinks */
         $productLinks = ObjectManager::getInstance()->get(CategoryLinkManagement::class);
         /** @var CategoryRepositoryInterface $categoryRepository */
@@ -1549,7 +1539,7 @@ public function testFilterProductsBySingleCategoryId()
             $product = $productRepository->get($links[$itemIndex]->getSku());
             $this->assertEquals($response['products']['items'][$itemIndex]['name'], $product->getName());
             $this->assertEquals($response['products']['items'][$itemIndex]['type_id'], $product->getTypeId());
-            $categoryIds  = $product->getCategoryIds();
+            $categoryIds = $product->getCategoryIds();
             foreach ($categoryIds as $index => $value) {
                 $categoryIds[$index] = (int)$value;
             }
@@ -1587,8 +1577,7 @@ public function testFilterProductsBySingleCategoryId()
      */
     public function testSearchAndSortByRelevance()
     {
-        $this->reIndexAndCleanCache();
-        $search_term ="blue";
+        $search_term = "blue";
         $query
             = <<<QUERY
 {
@@ -1640,7 +1629,7 @@ public function testSearchAndSortByRelevance()
         $this->assertNotEmpty($response['products']['filters'], 'Filters should have the Category layer');
         $this->assertEquals('Colorful Category', $response['products']['filters'][0]['filter_items'][0]['label']);
         $this->assertCount(2, $response['products']['aggregations']);
-        $productsInResponse = ['Blue briefs','Navy Blue Striped Shoes','Grey shorts'];
+        $productsInResponse = ['Blue briefs', 'Navy Blue Striped Shoes', 'Grey shorts'];
         $count = count($response['products']['items']);
         for ($i = 0; $i < $count; $i++) {
             $this->assertEquals($productsInResponse[$i], $response['products']['items'][$i]['name']);
@@ -1709,6 +1698,7 @@ public function testFilterByExactSkuAndSortByPriceDesc()
         $this->assertEquals(20, $response['products']['page_info']['page_size']);
         $this->assertEquals(1, $response['products']['page_info']['current_page']);
     }
+
     /**
      * Fuzzy search filtered for price and sorted by price and name
      *
@@ -1716,10 +1706,9 @@ public function testFilterByExactSkuAndSortByPriceDesc()
      */
     public function testProductBasicFullTextSearchQuery()
     {
-        $this->reIndexAndCleanCache();
         $textToSearch = 'blue';
         $query
-            =<<<QUERY
+            = <<<QUERY
 {
     products(
       search: "{$textToSearch}"
@@ -1808,10 +1797,9 @@ public function testProductBasicFullTextSearchQuery()
      */
     public function testProductPartialNameFullTextSearchQuery()
     {
-        $this->reIndexAndCleanCache();
         $textToSearch = 'Sim';
         $query
-            =<<<QUERY
+            = <<<QUERY
 {
     products(
       search: "{$textToSearch}"
@@ -1899,10 +1887,9 @@ public function testProductPartialNameFullTextSearchQuery()
      */
     public function testProductPartialSkuFullTextSearchQuery()
     {
-        $this->reIndexAndCleanCache();
         $textToSearch = 'prd';
         $query
-            =<<<QUERY
+            = <<<QUERY
 {
     products(
       search: "{$textToSearch}"
@@ -1990,14 +1977,13 @@ public function testProductPartialSkuFullTextSearchQuery()
      */
     public function testProductPartialSkuHyphenatedFullTextSearchQuery()
     {
-        $this->reIndexAndCleanCache();
         /** @var ProductRepositoryInterface $productRepository */
         $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
 
         $prod2 = $productRepository->get('prd2-sku2');
         $textToSearch = 'sku2';
         $query
-            =<<<QUERY
+            = <<<QUERY
 {
     products(
       search: "{$textToSearch}"
@@ -2098,7 +2084,7 @@ public function testFilterWithinASpecificPriceRangeSortedByPriceDESC()
         }
 
         $query
-            =<<<QUERY
+            = <<<QUERY
 {
     products(
         filter:
@@ -2335,7 +2321,7 @@ public function testQueryWithNoSearchOrFilterArgumentException()
     public function testFilterProductsThatAreOutOfStockWithConfigSettings()
     {
         $query
-            =<<<QUERY
+            = <<<QUERY
 {
   products(
         filter:
@@ -2455,7 +2441,8 @@ private function assertProductItems(array $filteredProducts, array $actualRespon
             $this->assertNotEmpty($productItemsInResponse[$itemIndex]);
             $this->assertResponseFields(
                 $productItemsInResponse[$itemIndex][0],
-                ['attribute_set_id' => $filteredProducts[$itemIndex]->getAttributeSetId(),
+                [
+                    'attribute_set_id' => $filteredProducts[$itemIndex]->getAttributeSetId(),
                     'sku' => $filteredProducts[$itemIndex]->getSku(),
                     'name' => $filteredProducts[$itemIndex]->getName(),
                     'price' => [
@@ -2466,7 +2453,7 @@ private function assertProductItems(array $filteredProducts, array $actualRespon
                             ]
                         ]
                     ],
-                    'type_id' =>$filteredProducts[$itemIndex]->getTypeId(),
+                    'type_id' => $filteredProducts[$itemIndex]->getTypeId(),
                     'weight' => $filteredProducts[$itemIndex]->getWeight()
                 ]
             );
@@ -2481,7 +2468,8 @@ private function assertProductItemsWithPriceCheck(array $filteredProducts, array
             $this->assertNotEmpty($itemArray);
             $this->assertResponseFields(
                 $productItemsInResponse[$itemIndex][0],
-                ['attribute_set_id' => $filteredProducts[$itemIndex]->getAttributeSetId(),
+                [
+                    'attribute_set_id' => $filteredProducts[$itemIndex]->getAttributeSetId(),
                     'sku' => $filteredProducts[$itemIndex]->getSku(),
                     'name' => $filteredProducts[$itemIndex]->getName(),
                     'price' => [
@@ -2497,15 +2485,15 @@ private function assertProductItemsWithPriceCheck(array $filteredProducts, array
                                 'currency' => 'USD'
                             ]
                         ],
-                            'regularPrice' => [
-                                'amount' => [
-                                    'value' => $filteredProducts[$itemIndex]->getPrice(),
-                                    'currency' => 'USD'
-                                ]
+                        'regularPrice' => [
+                            'amount' => [
+                                'value' => $filteredProducts[$itemIndex]->getPrice(),
+                                'currency' => 'USD'
                             ]
+                        ]
 
                     ],
-                    'type_id' =>$filteredProducts[$itemIndex]->getTypeId(),
+                    'type_id' => $filteredProducts[$itemIndex]->getTypeId(),
                     'weight' => $filteredProducts[$itemIndex]->getWeight()
                 ]
             );

From 7c85cb81feaba3dcd8522124eb7119d4f3606dd3 Mon Sep 17 00:00:00 2001
From: Leonid Poluianov <poluyano@adobe.com>
Date: Sat, 15 Aug 2020 09:09:00 -0500
Subject: [PATCH 1517/1718] MC-36671: Extend catalog GraphQl tests coverage

---
 .../GraphQl/Catalog/ProductSearchAggregationsTest.php        | 5 +++++
 1 file changed, 5 insertions(+)

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 8323cdf523934..9dbd902f1714e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchAggregationsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchAggregationsTest.php
@@ -17,6 +17,11 @@ 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'
+        );
+
         $skus= '"search_product_1", "search_product_2", "search_product_3", "search_product_4" ,"search_product_5"';
         $query = <<<QUERY
 {

From 987b162533a0ec4cd683808d9c307898846d7d12 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Sat, 15 Aug 2020 22:32:11 +0200
Subject: [PATCH 1518/1718] Refactor Category Link: Replace deprecated
 interface, clean the code

---
 .../Magento/Catalog/Model/CategoryLink.php    | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/CategoryLink.php b/app/code/Magento/Catalog/Model/CategoryLink.php
index fe640a72d0b6d..76e7a8158af42 100644
--- a/app/code/Magento/Catalog/Model/CategoryLink.php
+++ b/app/code/Magento/Catalog/Model/CategoryLink.php
@@ -3,24 +3,24 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Catalog\Model;
 
+use Magento\Catalog\Api\Data\CategoryLinkExtensionInterface;
+use Magento\Catalog\Api\Data\CategoryLinkInterface;
+use Magento\Framework\Model\AbstractExtensibleModel;
+
 /**
  * @codeCoverageIgnore
  */
-class CategoryLink extends \Magento\Framework\Api\AbstractExtensibleObject implements
-    \Magento\Catalog\Api\Data\CategoryLinkInterface
+class CategoryLink extends AbstractExtensibleModel implements CategoryLinkInterface
 {
-    /**#@+
-     * Constants
-     */
-    const KEY_POSITION = 'position';
-    const KEY_CATEGORY_ID = 'category_id';
-    /**#@-*/
+    public const KEY_POSITION = 'position';
+    public const KEY_CATEGORY_ID = 'category_id';
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getPosition()
     {
@@ -28,7 +28,7 @@ public function getPosition()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCategoryId()
     {
@@ -56,7 +56,7 @@ public function setCategoryId($categoryId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @return \Magento\Catalog\Api\Data\CategoryLinkExtensionInterface|null
      */
@@ -66,14 +66,13 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @param \Magento\Catalog\Api\Data\CategoryLinkExtensionInterface $extensionAttributes
      * @return $this
      */
-    public function setExtensionAttributes(
-        \Magento\Catalog\Api\Data\CategoryLinkExtensionInterface $extensionAttributes
-    ) {
+    public function setExtensionAttributes(CategoryLinkExtensionInterface $extensionAttributes)
+    {
         return $this->_setExtensionAttributes($extensionAttributes);
     }
 }

From 77135cfb8e690874f248ec87749f866ec90a8bbd Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Sat, 15 Aug 2020 23:47:58 +0200
Subject: [PATCH 1519/1718] Fis Static Tests

---
 app/code/Magento/Catalog/Model/CategoryLink.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/CategoryLink.php b/app/code/Magento/Catalog/Model/CategoryLink.php
index 76e7a8158af42..fd56a3516b130 100644
--- a/app/code/Magento/Catalog/Model/CategoryLink.php
+++ b/app/code/Magento/Catalog/Model/CategoryLink.php
@@ -24,7 +24,7 @@ class CategoryLink extends AbstractExtensibleModel implements CategoryLinkInterf
      */
     public function getPosition()
     {
-        return $this->_get(self::KEY_POSITION);
+        return $this->getData(self::KEY_POSITION);
     }
 
     /**
@@ -32,10 +32,12 @@ public function getPosition()
      */
     public function getCategoryId()
     {
-        return $this->_get(self::KEY_CATEGORY_ID);
+        return $this->getData(self::KEY_CATEGORY_ID);
     }
 
     /**
+     * {@inheritDoc}
+     *
      * @param int $position
      * @return $this
      */
@@ -56,7 +58,7 @@ public function setCategoryId($categoryId)
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      *
      * @return \Magento\Catalog\Api\Data\CategoryLinkExtensionInterface|null
      */
@@ -66,7 +68,7 @@ public function getExtensionAttributes()
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      *
      * @param \Magento\Catalog\Api\Data\CategoryLinkExtensionInterface $extensionAttributes
      * @return $this

From 8eb39b8787fd27325a01769e9d070f0d656014c2 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Sun, 16 Aug 2020 00:39:10 +0200
Subject: [PATCH 1520/1718] Fis Static Tests

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

diff --git a/app/code/Magento/Catalog/Model/CategoryLink.php b/app/code/Magento/Catalog/Model/CategoryLink.php
index fd56a3516b130..38c6f77483de2 100644
--- a/app/code/Magento/Catalog/Model/CategoryLink.php
+++ b/app/code/Magento/Catalog/Model/CategoryLink.php
@@ -36,7 +36,7 @@ public function getCategoryId()
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritDoc
      *
      * @param int $position
      * @return $this
@@ -58,7 +58,7 @@ public function setCategoryId($categoryId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @return \Magento\Catalog\Api\Data\CategoryLinkExtensionInterface|null
      */
@@ -68,7 +68,7 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @param \Magento\Catalog\Api\Data\CategoryLinkExtensionInterface $extensionAttributes
      * @return $this

From 86518bd023c91b5c740f90f1c5d093c6ab0d77bc Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Mon, 17 Aug 2020 11:37:48 +0300
Subject: [PATCH 1521/1718] MC-36024: Invalid Character Customer Account Create
 DOB

---
 .../Customer/view/frontend/web/js/validation.js    | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/app/code/Magento/Customer/view/frontend/web/js/validation.js b/app/code/Magento/Customer/view/frontend/web/js/validation.js
index 1f7f24d5ac031..9ffc8137135da 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/validation.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/validation.js
@@ -8,6 +8,20 @@ define([
 ], function ($, moment, utils) {
     'use strict';
 
+    $.validator.addMethod(
+        'validate-date',
+        function (value, element, params) {
+            var dateFormat = utils.convertToMomentFormat(params.dateFormat);
+
+            if (value === '') {
+                return true;
+            }
+
+            return moment(value, dateFormat, true).isValid();
+        },
+        $.mage.__('Invalid date')
+    );
+
     $.validator.addMethod(
         'validate-dob',
         function (value, element, params) {

From 4ef4c6c52d889213e536575d732c9ab00b6806d3 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 17 Aug 2020 14:21:45 +0300
Subject: [PATCH 1522/1718] 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 4a7fbd733c59ce798d8fbdbad790da19baaa5a61 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 17 Aug 2020 14:31:35 +0300
Subject: [PATCH 1523/1718] 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 5e072905804d2a66283cbd63151eb598e209ab09 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 17 Aug 2020 14:34:06 +0300
Subject: [PATCH 1524/1718] 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 0830d38e4b44d145cca9425bdfdefb7509a3df99 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 17 Aug 2020 14:36:07 +0300
Subject: [PATCH 1525/1718] 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 b566b8000621ccfdf96c894d2f73968daed8926e Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Mon, 17 Aug 2020 14:48:00 +0300
Subject: [PATCH 1526/1718] add mftf

---
 ...tAssertCheckoutErrorMessageActionGroup.xml | 18 +++++
 .../Section/CheckoutCartMessageSection.xml    |  1 +
 ...rontRemoveProductOnCheckoutActionGroup.xml | 18 +++++
 .../MultishippingSection.xml                  |  1 +
 ...rontCheckoutWithWithVirtualProductTest.xml | 70 +++++++++++++++++++
 5 files changed, 108 insertions(+)
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertCheckoutErrorMessageActionGroup.xml
 create mode 100644 app/code/Magento/Multishipping/Test/Mftf/ActionGroup/StorefrontRemoveProductOnCheckoutActionGroup.xml
 create mode 100644 app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontCheckoutWithWithVirtualProductTest.xml

diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertCheckoutErrorMessageActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertCheckoutErrorMessageActionGroup.xml
new file mode 100644
index 0000000000000..6db9d9a1f0673
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAssertCheckoutErrorMessageActionGroup.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="StorefrontAssertCheckoutErrorMessageActionGroup">
+        <arguments>
+            <argument name="message" type="string"/>
+        </arguments>
+
+        <waitForElementVisible selector="{{CheckoutCartMessageSection.errorMessageText(message)}}" stepKey="assertErrorMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartMessageSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartMessageSection.xml
index cf15cdf15cf15..0c7f200e2b5eb 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartMessageSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartMessageSection.xml
@@ -12,5 +12,6 @@
         <element name="successMessage" type="text" selector=".message.message-success.success>div" />
         <element name="errorMessage" type="text" selector=".message-error.error.message>div" />
         <element name="emptyCartMessage" type="text" selector=".cart-empty>p"/>
+        <element name="errorMessageText" type="text" selector="//div[contains(@class, 'message-error')]/div[text()='{{var}}']" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/StorefrontRemoveProductOnCheckoutActionGroup.xml b/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/StorefrontRemoveProductOnCheckoutActionGroup.xml
new file mode 100644
index 0000000000000..af0f3e2d597b8
--- /dev/null
+++ b/app/code/Magento/Multishipping/Test/Mftf/ActionGroup/StorefrontRemoveProductOnCheckoutActionGroup.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="StorefrontRemoveProductOnCheckoutActionGroup">
+        <arguments>
+            <argument name="itemNumber" type="string" defaultValue="1"/>
+        </arguments>
+
+        <click selector="{{MultishippingSection.removeItemButton(itemNumber)}}" stepKey="removeItem"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Multishipping/Test/Mftf/Section/MultishippingSection/MultishippingSection.xml b/app/code/Magento/Multishipping/Test/Mftf/Section/MultishippingSection/MultishippingSection.xml
index db037d50f7dc6..9c89ffa3cd405 100644
--- a/app/code/Magento/Multishipping/Test/Mftf/Section/MultishippingSection/MultishippingSection.xml
+++ b/app/code/Magento/Multishipping/Test/Mftf/Section/MultishippingSection/MultishippingSection.xml
@@ -14,5 +14,6 @@
         <element name="shippingAddressSelector" type="select" selector="//tr[position()={{addressPosition}}]//td[@data-th='Send To']//select" parameterized="true"/>
         <element name="shippingAddressOptions" type="select" selector="#multiship-addresses-table tbody tr:nth-of-type({{addressPosition}}) .col.address select option:nth-of-type({{optionIndex}})" parameterized="true"/>
         <element name="selectShippingAddress" type="select" selector="(//table[@id='multiship-addresses-table'] //div[@class='field address'] //select)[{{sequenceNumber}}]" parameterized="true"/>
+        <element name="removeItemButton" type="button" selector="//a[contains(@title, 'Remove Item')][{{var}}]" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontCheckoutWithWithVirtualProductTest.xml b/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontCheckoutWithWithVirtualProductTest.xml
new file mode 100644
index 0000000000000..b1e676b8b5188
--- /dev/null
+++ b/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontCheckoutWithWithVirtualProductTest.xml
@@ -0,0 +1,70 @@
+<?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="StorefrontCheckoutWithWithVirtualProductTest">
+        <annotations>
+            <features value="Multishipping"/>
+            <stories value="Multiple Shipping"/>
+            <title value="Check error when cart contains virtual product"/>
+            <description value="Check error when cart contains only virtual product"/>
+            <severity value="MAJOR"/>
+            <group value="Multishipment"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="firstProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="VirtualProduct" stepKey="virtualProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="Customer_US_UK_DE" stepKey="createCustomerWithMultipleAddresses"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+            <deleteData createDataKey="firstProduct" stepKey="deleteFirstProduct"/>
+            <deleteData createDataKey="virtualProduct" stepKey="deleteVirtualProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createCustomerWithMultipleAddresses" stepKey="deleteCustomer"/>
+        </after>
+        <!-- Login to the Storefront as created customer -->
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
+            <argument name="Customer" value="$$createCustomerWithMultipleAddresses$$"/>
+        </actionGroup>
+        <!-- Open the simple product page -->
+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="goToFirstProductPage">
+            <argument name="productUrl" value="$$firstProduct.custom_attributes[url_key]$$"/>
+        </actionGroup>
+        <!-- Add the simple product to the Shopping Cart -->
+        <actionGroup ref="AddProductWithQtyToCartFromStorefrontProductPageActionGroup" stepKey="addFirstProductToCart">
+            <argument name="productName" value="$$firstProduct.name$$"/>
+            <argument name="productQty" value="1"/>
+        </actionGroup>
+        <!-- Open the virtual product page -->
+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="goToVirtualProductPage">
+            <argument name="productUrl" value="$$virtualProduct.custom_attributes[url_key]$$"/>
+        </actionGroup>
+        <!-- Add the virtual product to the Shopping Cart -->
+        <actionGroup ref="AddProductWithQtyToCartFromStorefrontProductPageActionGroup" stepKey="addVirtualProductToCart">
+            <argument name="productName" value="$$virtualProduct.name$$"/>
+            <argument name="productQty" value="1"/>
+        </actionGroup>
+        <!-- Go to Cart -->
+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openCart"/>
+        <!-- Check Out with Multiple Addresses -->
+        <actionGroup ref="StorefrontCheckoutWithMultipleAddressesActionGroup" stepKey="checkoutWithMultipleAddresses"/>
+        <!-- Remove simple product from cart -->
+        <actionGroup ref="StorefrontRemoveProductOnCheckoutActionGroup" stepKey="removeFirstProductFromCart"/>
+        <!-- Assert error message on checkout -->
+        <actionGroup ref="StorefrontAssertCheckoutErrorMessageActionGroup" stepKey="assertErrorMessage">
+            <argument name="message" value="The current cart does not match multi shipping criteria, please review or contact the store administrator"/>
+        </actionGroup>
+    </test>
+</tests>

From bed58c5ccca7b11d2495d44ce6cebdc03c49439b Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 17 Aug 2020 15:49:37 +0300
Subject: [PATCH 1527/1718] 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 4ebe9d6397312bda6da09654c5fac51391844757 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 17 Aug 2020 16:18:15 +0300
Subject: [PATCH 1528/1718] 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 5267a215c8edd..e5ad84ac5b9df 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="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"/>
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 7a2dd87ce807c7f82e053697ae5fe8508ba8f83c Mon Sep 17 00:00:00 2001
From: Victor Rad <vrad@magento.com>
Date: Mon, 17 Aug 2020 11:27:14 -0500
Subject: [PATCH 1529/1718] MC-36598: Default Billing address is not selected
 after the same address checkbox unticked

---
 .../view/frontend/web/js/view/billing-address/list.js       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address/list.js b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address/list.js
index ca3a267c01671..80411fb8eb29d 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address/list.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address/list.js
@@ -23,6 +23,9 @@ define([
         },
         addressOptions = addressList().filter(function (address) {
             return address.getType() === 'customer-address';
+        }),
+        addressDefaultIndex = addressOptions.findIndex(function (address) {
+            return address.isDefaultBilling();
         });
 
     return Component.extend({
@@ -53,7 +56,8 @@ define([
             this._super()
                 .observe('selectedAddress isNewAddressSelected')
                 .observe({
-                    isNewAddressSelected: !customer.isLoggedIn() || !addressOptions.length
+                    isNewAddressSelected: !customer.isLoggedIn() || !addressOptions.length,
+                    selectedAddress: this.addressOptions[addressDefaultIndex]
                 });
 
             return this;

From 58fbad4730f1dd552ee90b0008bc99cef77d644b Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 17 Aug 2020 21:23:21 +0300
Subject: [PATCH 1530/1718] 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 4602b1421b0afedc34ef54cc3aa254796abb10a6 Mon Sep 17 00:00:00 2001
From: Ievgen Kolesov <ikolesov@adobe.com>
Date: Mon, 17 Aug 2020 13:41:03 -0500
Subject: [PATCH 1531/1718] PWA-805: Expose localization system / store config
 from GraphQL

---
 .../Store/AvailableStoreConfigTest.php        | 96 +++++++++++++++++++
 .../Annotation/ConfigFixture.php              |  4 +-
 ...ite_with_four_stores_divided_in_groups.php | 79 +++++++++++++++
 ...four_stores_divided_in_groups_rollback.php | 29 ++++++
 4 files changed, 206 insertions(+), 2 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_four_stores_divided_in_groups.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_four_stores_divided_in_groups_rollback.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/AvailableStoreConfigTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/AvailableStoreConfigTest.php
index eaf76e4559557..d762462729234 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/AvailableStoreConfigTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Store/AvailableStoreConfigTest.php
@@ -87,6 +87,7 @@ public function testDefaultWebsiteAvailableStoreConfigs(): void
     secure_base_static_url,
     secure_base_media_url,
     store_name
+    use_store_in_url
   }
 }
 QUERY;
@@ -126,6 +127,7 @@ public function testNonDefaultWebsiteAvailableStoreConfigs(): void
     secure_base_static_url,
     secure_base_media_url,
     store_name
+    use_store_in_url
   }
 }
 QUERY;
@@ -167,5 +169,99 @@ private function validateStoreConfig(StoreConfigInterface $storeConfig, array $r
         $this->assertEquals($storeConfig->getSecureBaseStaticUrl(), $responseConfig['secure_base_static_url']);
         $this->assertEquals($storeConfig->getSecureBaseMediaUrl(), $responseConfig['secure_base_media_url']);
         $this->assertEquals($store->getName(), $responseConfig['store_name']);
+        $this->assertEquals($store->isUseStoreInUrl(), $responseConfig['use_store_in_url']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Store/_files/second_website_with_four_stores_divided_in_groups.php
+     * @magentoConfigFixture web/url/use_store 1
+     */
+    public function testAllStoreConfigsWithCodeInUrlEnabled(): void
+    {
+        $storeConfigs = $this->storeConfigManager->getStoreConfigs(
+            [
+                'fixture_second_store',
+                'fixture_third_store',
+                'fixture_fourth_store',
+                'fixture_fifth_store'
+            ]
+        );
+
+        $query
+            = <<<QUERY
+{
+  availableStores(useCurrentGroup:false) {
+    id,
+    code,
+    website_id,
+    locale,
+    base_currency_code,
+    default_display_currency_code,
+    timezone,
+    weight_unit,
+    base_url,
+    base_link_url,
+    base_static_url,
+    base_media_url,
+    secure_base_url,
+    secure_base_link_url,
+    secure_base_static_url,
+    secure_base_media_url,
+    store_name
+    use_store_in_url
+  }
+}
+QUERY;
+        $headerMap = ['Store' => 'fixture_fifth_store'];
+        $response = $this->graphQlQuery($query, [], '', $headerMap);
+
+        $this->assertArrayHasKey('availableStores', $response);
+        $this->assertCount(4, $response['availableStores']);
+        foreach ($response['availableStores'] as $key => $responseConfig) {
+            $this->validateStoreConfig($storeConfigs[$key], $responseConfig);
+            $this->assertEquals(true, $responseConfig['use_store_in_url']);
+        }
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Store/_files/second_website_with_four_stores_divided_in_groups.php
+     */
+    public function testCurrentGroupStoreConfigs(): void
+    {
+        $storeConfigs = $this->storeConfigManager->getStoreConfigs(['fixture_fourth_store', 'fixture_fifth_store']);
+
+        $query
+            = <<<QUERY
+{
+  availableStores(useCurrentGroup:true) {
+    id,
+    code,
+    website_id,
+    locale,
+    base_currency_code,
+    default_display_currency_code,
+    timezone,
+    weight_unit,
+    base_url,
+    base_link_url,
+    base_static_url,
+    base_media_url,
+    secure_base_url,
+    secure_base_link_url,
+    secure_base_static_url,
+    secure_base_media_url,
+    store_name
+    use_store_in_url
+  }
+}
+QUERY;
+        $headerMap = ['Store' => 'fixture_fifth_store'];
+        $response = $this->graphQlQuery($query, [], '', $headerMap);
+
+        $this->assertArrayHasKey('availableStores', $response);
+        $this->assertCount(2, $response['availableStores']);
+        foreach ($response['availableStores'] as $key => $responseConfig) {
+            $this->validateStoreConfig($storeConfigs[$key], $responseConfig);
+        }
     }
 }
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php
index 48b27c83ee6e3..dc3971d1896a1 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php
@@ -158,9 +158,9 @@ protected function _assignConfigData(TestCase $test)
             self::ANNOTATION
         );
         foreach ($testAnnotations as $configPathAndValue) {
-            if (preg_match('/^.+?(?=_store\s)/', $configPathAndValue, $matches)) {
+            if (preg_match('/^[^\/]+?(?=_store\s)/', $configPathAndValue, $matches)) {
                 $this->setStoreConfigValue($matches ?? [], $configPathAndValue);
-            } elseif (preg_match('/^.+?(?=_website\s)/', $configPathAndValue, $matches)) {
+            } elseif (preg_match('/^[^\/]+?(?=_website\s)/', $configPathAndValue, $matches)) {
                 $this->setWebsiteConfigValue($matches ?? [], $configPathAndValue);
             } else {
                 $this->setGlobalConfigValue($configPathAndValue);
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_four_stores_divided_in_groups.php b/dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_four_stores_divided_in_groups.php
new file mode 100644
index 0000000000000..56507bcdd6287
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_four_stores_divided_in_groups.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Helper\DefaultCategory;
+use Magento\CatalogSearch\Model\Indexer\Fulltext;
+use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\Store\Api\Data\GroupInterface;
+use Magento\Store\Api\Data\GroupInterfaceFactory;
+use Magento\Store\Model\ResourceModel\Group as GroupResource;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Store/_files/second_website_with_two_stores.php');
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var $website \Magento\Store\Model\Website */
+$website = $objectManager->create(\Magento\Store\Model\Website::class);
+$website->load('test', 'code')->getId();
+$websiteId = $website->getId();
+
+/** @var StoreManagerInterface $storeManager */
+$storeManager = $objectManager->get(StoreManagerInterface::class);
+/** @var DefaultCategory $defaultCategory */
+$defaultCategory = $objectManager->get(DefaultCategory::class);
+/** @var GroupInterface $storeGroup */
+$storeGroup = $objectManager->get(GroupInterfaceFactory::class)->create();
+$storeGroup->setCode('second_group')
+    ->setRootCategoryId($defaultCategory->getId())
+    ->setName('second store group')
+    ->setWebsite($website);
+$objectManager->get(GroupResource::class)->save($storeGroup);
+/* Refresh stores memory cache */
+$storeManager->reinitStores();
+
+$store = $objectManager->create(Store::class);
+if (!$store->load('fixture_fourth_store', 'code')->getId()) {
+    $store->setCode(
+        'fixture_fourth_store'
+    )->setWebsiteId(
+        $websiteId
+    )->setGroupId(
+        $storeGroup->getId()
+    )->setName(
+        'Fixture Fourth Store'
+    )->setSortOrder(
+        6
+    )->setIsActive(
+        1
+    );
+    $store->save();
+}
+
+$store = $objectManager->create(Store::class);
+if (!$store->load('fixture_fifth_store', 'code')->getId()) {
+    $store->setCode(
+        'fixture_fifth_store'
+    )->setWebsiteId(
+        $websiteId
+    )->setGroupId(
+        $storeGroup->getId()
+    )->setName(
+        'Fixture Fifth Store'
+    )->setSortOrder(
+        5
+    )->setIsActive(
+        1
+    );
+    $store->save();
+}
+
+/* Refresh CatalogSearch index */
+/** @var IndexerRegistry $indexerRegistry */
+$indexerRegistry = $objectManager->get(IndexerRegistry::class);
+$indexerRegistry->get(Fulltext::INDEXER_ID)->reindexAll();
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_four_stores_divided_in_groups_rollback.php b/dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_four_stores_divided_in_groups_rollback.php
new file mode 100644
index 0000000000000..f4281549a0ac8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/second_website_with_four_stores_divided_in_groups_rollback.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+$store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
+if ($store->load('fixture_fourth_store', 'code')->getId()) {
+    $store->delete();
+}
+
+$store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
+if ($store->load('fixture_fifth_store', 'code')->getId()) {
+    $store->delete();
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+
+Resolver::getInstance()->requireDataFixture('Magento/Store/_files/second_website_with_two_stores_rollback.php');

From 7ca421d8231ae7b77e857861e8bd9cda7dd77b5f Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Mon, 17 Aug 2020 13:48:31 -0500
Subject: [PATCH 1532/1718] MC-36456: union implementation

---
 .../Model/Resolver/UnionTypeResolver.php              |  1 -
 .../Magento/GraphQl/TestModule/GraphQlQueryTest.php   | 11 +----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/UnionTypeResolver.php b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/UnionTypeResolver.php
index 5264adc89e9f9..40cbdadb8a948 100644
--- a/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/UnionTypeResolver.php
+++ b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/UnionTypeResolver.php
@@ -24,5 +24,4 @@ public function resolveType(array $data): string
         }
         return '';
     }
-
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php
index 204493fcef107..7d2d6219e0272 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php
@@ -10,7 +10,7 @@
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 /**
- * Class GraphQlQueryTest
+ * Test for basic GraphQl features
  */
 class GraphQlQueryTest extends GraphQlAbstract
 {
@@ -25,15 +25,6 @@ public function testQueryTestModuleReturnsResults()
         item_id
         name
     }
-    testUnion {
-      __typename
-      ... on TypeCustom1 {
-          custom_name1
-      }
-      ... on TypeCustom2 {
-          custom_name2
-      }
-    }
 }
 QUERY;
 

From 5343a452f8c2c1f64176489df831dbb2511d16f9 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Mon, 17 Aug 2020 19:34:21 -0500
Subject: [PATCH 1533/1718] MC-36456: union implementation

---
 .../Magento/Framework/GraphQl/Config/Element/Type.php  | 10 +++++++++-
 .../GraphQlReader/Reader/UnionType.php                 |  7 +++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/lib/internal/Magento/Framework/GraphQl/Config/Element/Type.php b/lib/internal/Magento/Framework/GraphQl/Config/Element/Type.php
index 20d017cc71062..073fb2e795e87 100644
--- a/lib/internal/Magento/Framework/GraphQl/Config/Element/Type.php
+++ b/lib/internal/Magento/Framework/GraphQl/Config/Element/Type.php
@@ -73,7 +73,15 @@ public function getFields() : array
     /**
      * Get interfaces the type implements, if any. Return an empty array if none are configured.
      *
-     * @return string[]
+     * Example return array(
+     *     array(
+     *         'interface' => 'SomeDefinedTypeInterface',
+     *         'copyFields' => true
+     *     ),
+     *     ...
+     * ),
+     *
+     * @return array
      */
     public function getInterfaces() : array
     {
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/UnionType.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/UnionType.php
index 4280ccd17adb4..5776901765b5a 100644
--- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/UnionType.php
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader/Reader/UnionType.php
@@ -57,11 +57,10 @@ public function read(\GraphQL\Type\Definition\Type $typeMeta): array
     {
         if ($typeMeta instanceof \GraphQL\Type\Definition\UnionType) {
             $typeName = $typeMeta->name;
-            $types = $typeMeta->getTypes();
             $result = [
                 'name' => $typeName,
                 'type' => self::GRAPHQL_UNION,
-                'types' => $types,
+                'types' => [],
             ];
 
             $unionTypeResolver = $this->getUnionTypeResolver($typeMeta);
@@ -69,6 +68,10 @@ public function read(\GraphQL\Type\Definition\Type $typeMeta): array
                 $result['typeResolver'] = $unionTypeResolver;
             }
 
+            foreach ($typeMeta->getTypes() as $type) {
+                $result['types'][] = $type->name;
+            }
+
             if ($this->docReader->read($typeMeta->astNode->directives)) {
                 $result['description'] = $this->docReader->read($typeMeta->astNode->directives);
             }

From 9a740371e1bfdde8c5dc79460de6e6e4a29dc27f Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 18 Aug 2020 10:27:15 +0300
Subject: [PATCH 1534/1718] 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 583b0134ff6244438e55064bcd9b2980a18d2bc9 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 18 Aug 2020 10:32:06 +0300
Subject: [PATCH 1535/1718] 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 597d072a6c7c683142aad85714ac790815dcaf3b Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Tue, 18 Aug 2020 11:42:01 +0300
Subject: [PATCH 1536/1718] MC-36652: Restricted admin can view "Products in
 Carts" from all websites

---
 .../Model/ResourceModel/Quote/Item/Collection.php    |  9 +++++++++
 .../ResourceModel/Report/Quote/CollectionTest.php    | 12 +++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

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 d219aefe81d45..16df2d30db40d 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Quote/Item/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Quote/Item/Collection.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Reports\Model\ResourceModel\Quote\Item;
 
@@ -17,6 +18,8 @@
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {
+    private const PREPARED_FLAG_NAME = 'reports_collection_prepared';
+
     /**
      * Join fields
      *
@@ -99,6 +102,11 @@ protected function _construct()
     public function prepareActiveCartItems()
     {
         $quoteItemsSelect = $this->getSelect();
+
+        if ($this->getFlag(self::PREPARED_FLAG_NAME)) {
+            return $quoteItemsSelect;
+        }
+
         $quoteItemsSelect->reset()
             ->from(['main_table' => $this->getTable('quote_item')], '')
             ->columns('main_table.product_id')
@@ -114,6 +122,7 @@ public function prepareActiveCartItems()
             )->group(
                 'main_table.product_id'
             );
+        $this->setFlag(self::PREPARED_FLAG_NAME, true);
 
         return $quoteItemsSelect;
     }
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 ea8fcfbb77132..6e7d5bdce16f5 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
@@ -15,6 +15,7 @@
 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 PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -42,7 +43,7 @@ protected function setUp(): void
     public function testGetSelectCountSql()
     {
         /** @var MockObject $collection */
-        $collection = $this->getMockBuilder(\Magento\Reports\Model\ResourceModel\Quote\Collection::class)
+        $collection = $this->getMockBuilder(Collection::class)
             ->setMethods(['getSelect'])
             ->disableOriginalConstructor()
             ->getMock();
@@ -62,12 +63,12 @@ public function testPrepareActiveCartItems()
         $constructArgs = $this->objectManager
             ->getConstructArguments(\Magento\Reports\Model\ResourceModel\Quote\Item\Collection::class);
         $collection = $this->getMockBuilder(\Magento\Reports\Model\ResourceModel\Quote\Item\Collection::class)
-            ->setMethods(['getSelect', 'getTable'])
+            ->setMethods(['getSelect', 'getTable', 'getFlag', 'setFlag'])
             ->disableOriginalConstructor()
             ->setConstructorArgs($constructArgs)
             ->getMock();
 
-        $collection->expects($this->once())->method('getSelect')->willReturn($this->selectMock);
+        $collection->expects($this->exactly(2))->method('getSelect')->willReturn($this->selectMock);
         $this->selectMock->expects($this->once())->method('reset')->willReturnSelf();
         $this->selectMock->expects($this->once())->method('from')->willReturnSelf();
         $this->selectMock->expects($this->atLeastOnce())->method('columns')->willReturnSelf();
@@ -75,7 +76,12 @@ public function testPrepareActiveCartItems()
         $this->selectMock->expects($this->once())->method('where')->willReturnSelf();
         $this->selectMock->expects($this->once())->method('group')->willReturnSelf();
         $collection->expects($this->exactly(2))->method('getTable')->willReturn('table');
+        $collection->expects($this->once())->method('setFlag')
+            ->with('reports_collection_prepared')->willReturnSelf();
         $collection->prepareActiveCartItems();
+        $collection->method('getFlag')
+            ->with('reports_collection_prepared')->willReturn(true);
+        $this->assertEquals($this->selectMock, $collection->prepareActiveCartItems());
     }
 
     public function testLoadWithFilter()

From 9a980484c23a78f888708223df55f56090b970c9 Mon Sep 17 00:00:00 2001
From: "taras.gamanov" <engcom-vendorworker-hotel@adobe.com>
Date: Tue, 18 Aug 2020 12:00:32 +0300
Subject: [PATCH 1537/1718] MFTF has been added.

---
 .../Section/AdminProductGridFilterSection.xml |  1 +
 .../AdminCheckStoreViewOptionsActionGroup.xml | 24 ++++++++
 .../Store/Test/Mftf/Data/StoreData.xml        | 19 +++++++
 .../AdminStoresGridSection.xml                |  1 +
 .../AdminCreateDuplicateNameStoreViewTest.xml | 55 +++++++++++++++++++
 5 files changed, 100 insertions(+)
 create mode 100644 app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCheckStoreViewOptionsActionGroup.xml
 create mode 100644 app/code/Magento/Store/Test/Mftf/Test/AdminCreateDuplicateNameStoreViewTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
index 4e86f14611c24..201affacd9adb 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml
@@ -38,5 +38,6 @@
         <element name="storeViewDropdown" type="text" selector="//select[@name='store_id']/option[contains(.,'{{storeView}}')]" parameterized="true"/>
         <element name="inputByCodeRangeFrom" type="input" selector="input.admin__control-text[name='{{code}}[from]']" parameterized="true"/>
         <element name="inputByCodeRangeTo" type="input" selector="input.admin__control-text[name='{{code}}[to]']" parameterized="true"/>
+        <element name="storeViewOptions" type="text" selector=".admin__data-grid-outer-wrap select[name='store_id'] > option[value='{{value}}']" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCheckStoreViewOptionsActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCheckStoreViewOptionsActionGroup.xml
new file mode 100644
index 0000000000000..ba96633a621c2
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCheckStoreViewOptionsActionGroup.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="AdminCheckStoreViewOptionsActionGroup">
+        <annotations>
+            <description>Goes to the Catalog->Product filters and check store view options at the Store View dropdown</description>
+        </annotations>
+        <arguments>
+            <argument name="storeViewId"  type="string"/>
+        </arguments>
+        <amOnPage url="{{ProductCatalogPage.url}}" stepKey="OpenProductCatalogPage"/>
+        <waitForPageLoad stepKey="waitForProductCatalogPage"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickFiltersButton"/>
+        <click selector="{{AdminProductFiltersSection.storeViewDropDown}}" stepKey="clickStoreViewSwitchDropdown"/>
+        <waitForElementVisible selector="{{AdminProductFiltersSection.storeViewDropDown}}" stepKey="waitForWebsiteAreVisible"/>
+        <seeElement selector="{{AdminProductGridFilterSection.storeViewOptions(storeViewId)}}" stepKey="seeStoreViewOption"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml b/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
index bdb1842cf2959..39664ae10a07d 100644
--- a/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
+++ b/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
@@ -206,4 +206,23 @@
         <data key="store_type">store</data>
         <data key="store_action">add</data>
     </entity>
+    <!--Stores views with same name-->
+    <entity name="customStoreViewSameNameFirst" type="store">
+        <data key="name">sameNameStoreView</data>
+        <data key="code" unique="suffix">storeViewCode</data>
+        <data key="is_active">1</data>
+        <data key="store_id">null</data>
+        <data key="store_action">add</data>
+        <data key="store_type">store</data>
+        <requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
+    </entity>
+    <entity name="customStoreViewSameNameSecond" type="store">
+        <data key="name">sameNameStoreView</data>
+        <data key="code" unique="suffix">storeViewCode</data>
+        <data key="is_active">1</data>
+        <data key="store_id">null</data>
+        <data key="store_action">add</data>
+        <data key="store_type">store</data>
+        <requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection/AdminStoresGridSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection/AdminStoresGridSection.xml
index e56836c491276..cd7f180d0bb0e 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection/AdminStoresGridSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection/AdminStoresGridSection.xml
@@ -22,5 +22,6 @@
         <element name="emptyText" type="text" selector="//tr[@class='data-grid-tr-no-data even']/td[@class='empty-text']"/>
         <element name="websiteName" type="text" selector="//td[@class='a-left col-website_title  ']/a[contains(.,'{{websiteName}}')]" parameterized="true"/>
         <element name="gridCell" type="text" selector="//table[@class='data-grid']//tr[{{row}}]//td[count(//table[@class='data-grid']//tr//th[contains(., '{{column}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>
+        <element name="storeViewLinkInNthRow" type="text" selector="tr:nth-of-type({{row}}) &gt; .col-store_title &gt; a" parameterized="true"/>
      </section>
 </sections>
diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateDuplicateNameStoreViewTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateDuplicateNameStoreViewTest.xml
new file mode 100644
index 0000000000000..46caf5b37f4f2
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateDuplicateNameStoreViewTest.xml
@@ -0,0 +1,55 @@
+<?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="AdminCreateDuplicateNameStoreViewTest">
+            <annotations>
+                <features value="Store"/>
+                <stories value="Create a store view in admin"/>
+                <title value="Admin should be able to create a Store View with the same name"/>
+                <description value="Admin should be able to create a Store View with the same name"/>
+                <group value="storeView"/>
+                <severity value="AVERAGE"/>
+            </annotations>
+            <before>
+            <!--Create two store views with same name, but different codes-->
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+                <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createFirstStoreView">
+                    <argument name="StoreGroup" value="_defaultStoreGroup"/>
+                    <argument name="customStore" value="customStoreViewSameNameFirst"/>
+                </actionGroup>
+                <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createSecondStoreView">
+                    <argument name="StoreGroup" value="_defaultStoreGroup"/>
+                    <argument name="customStore" value="customStoreViewSameNameSecond"/>
+                </actionGroup>
+            </before>
+            <after>
+            <!--Delete both store views-->
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteFirstStoreView">
+                <argument name="customStore" value="customStoreViewSameNameFirst"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteSecondStoreView">
+                <argument name="customStore" value="customStoreViewSameNameSecond"/>
+            </actionGroup>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+            <!--Get Id of store views-->
+            <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="navigateToStoreViews"/>
+            <click selector="{{AdminStoresGridSection.storeViewLinkInNthRow('2')}}" stepKey="openFirstViewPAge" />
+            <grabFromCurrentUrl stepKey="getStoreViewIdFirst" regex="~/store_id/(\d+)/~"/>
+            <amOnPage url="{{AdminSystemStorePage.url}}" stepKey="navigateToStoreViewsAgain"/>
+            <click selector="{{AdminStoresGridSection.storeViewLinkInNthRow('3')}}" stepKey="openSecondViewPAge" />
+            <grabFromCurrentUrl stepKey="getStoreViewIdSecond" regex="~/store_id/(\d+)/~"/>
+            <!--Go to catalog -> product grid, open the filter and check the listed store view-->
+            <actionGroup ref="AdminCheckStoreViewOptionsActionGroup" stepKey="checkFirstStoreView">
+                <argument name="storeViewId"  value="{$getStoreViewIdFirst}"/>
+            </actionGroup>
+            <actionGroup ref="AdminCheckStoreViewOptionsActionGroup" stepKey="checkSecondStoreView">
+                <argument name="storeViewId"  value="{$getStoreViewIdSecond}"/>
+            </actionGroup>
+        </test>
+</tests>

From 674a2f8fdc42722f77d925e6dec66ae8e67b8b5e Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Tue, 18 Aug 2020 14:34:04 +0300
Subject: [PATCH 1538/1718] add AdminOrderClickSubmitOrderActionGroup

---
 ...ntPurchaseProductWithCustomOptionsTest.xml |  2 +-
 ...vailableToConfigureDisabledProductTest.xml |  2 +-
 .../AdminReportsOrderedGroupedBySkuTest.xml   |  4 ++--
 .../AdminOrderClickSubmitOrderActionGroup.xml | 19 +++++++++++++++++++
 ...vailabilityCreditMemoWithNoPaymentTest.xml |  4 +---
 ...OrderWithBankTransferPaymentMethodTest.xml |  4 +---
 ...derWithCashOnDeliveryPaymentMethodTest.xml |  4 +---
 ...erWithCheckMoneyOrderPaymentMethodTest.xml |  2 +-
 ...WithProductQtyWithoutStockDecreaseTest.xml |  6 ++----
 ...rderWithPurchaseOrderPaymentMethodTest.xml |  4 +---
 ...eatedOrderWithZeroSubtotalCheckoutTest.xml |  4 +---
 ...nCreateCreditMemoWithPurchaseOrderTest.xml |  3 +--
 .../AdminCreateOrderWithBundleProductTest.xml |  4 +---
 ...reateOrderWithMinimumAmountEnabledTest.xml |  4 +---
 ...nimumOrderAmountNotMatchOrderTotalTest.xml |  3 +--
 .../Mftf/Test/AdminHoldCreatedOrderTest.xml   |  4 +---
 ...dminSubmitConfigurableProductOrderTest.xml |  4 +---
 ...SSVulnerabilityDuringOrderCreationTest.xml |  2 +-
 .../CreateOrderFromEditCustomerPageTest.xml   |  5 +----
 .../AdminCreatePartialShipmentEntityTest.xml  |  3 +--
 .../Test/AdminCreateShipmentEntityTest.xml    |  3 +--
 21 files changed, 41 insertions(+), 49 deletions(-)
 create mode 100644 app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderClickSubmitOrderActionGroup.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
index e768f7ba5317a..631d1d50077e9 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml
@@ -152,7 +152,7 @@
 
         <click selector="{{AdminOrderDetailsMainActionsSection.reorder}}" stepKey="clickReorder"/>
         <actionGroup ref="AdminCheckoutSelectCheckMoneyOrderBillingMethodActionGroup" stepKey="selectBillingMethod"/>
-        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="trySubmitOrder"/>
+        <actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="trySubmitOrder" />
 
         <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionField.title}}" stepKey="seeAdminOrderProductOptionField1" />
         <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionArea.title}}" stepKey="seeAdminOrderProductOptionArea1"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml
index 902787ac58e8c..b87ddf612be19 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml
@@ -176,7 +176,7 @@
         <waitForPageLoad stepKey="waitForShippingMethods"/>
         <click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
         <waitForPageLoad stepKey="waitForShippingMethodLoad"/>
-        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
+        <actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="clickSubmitOrder" />
         <actionGroup ref="VerifyCreatedOrderInformationActionGroup" stepKey="checkOrderSuccessfullyCreated"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderedGroupedBySkuTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderedGroupedBySkuTest.xml
index a96e74c8ad166..beb1471bd6c4d 100644
--- a/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderedGroupedBySkuTest.xml
+++ b/app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderedGroupedBySkuTest.xml
@@ -45,7 +45,7 @@
             <argument name="attribute" value="colorProductAttribute"/>
             <argument name="option" value="colorProductAttribute1"/>
         </actionGroup>
-        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitFirstOrder"/>
+        <actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="submitFirstOrder" />
 
         <!--Add second configurable product to order-->
         <actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="navigateToSecondOrderWithExistingCustomer">
@@ -56,7 +56,7 @@
             <argument name="attribute" value="colorProductAttribute"/>
             <argument name="option" value="colorProductAttribute2"/>
         </actionGroup>
-        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitSecondOrder"/>
+        <actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="submitSecondOrder" />
 
         <!-- Get date -->
         <generateDate stepKey="generateStartDate" date="-1 minute" format="m/d/Y"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderClickSubmitOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderClickSubmitOrderActionGroup.xml
new file mode 100644
index 0000000000000..cf64806cda084
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderClickSubmitOrderActionGroup.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="AdminOrderClickSubmitOrderActionGroup">
+        <annotations>
+            <description>Click "Submit Order" button for order.</description>
+        </annotations>
+
+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
+        <waitForPageLoad stepKey="waitForOrderPageToLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml
index 0eb8d71223276..182549a6fe301 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminAvailabilityCreditMemoWithNoPaymentTest.xml
@@ -72,9 +72,7 @@
 
         <!-- Select Free shipping -->
         <actionGroup ref="OrderSelectFreeShippingActionGroup" stepKey="selectFreeShippingOption"/>
-
-        <!--Click *Submit Order* button-->
-        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
+        <actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="clickSubmitOrder" />
 
         <!--Click *Invoice* button-->
         <actionGroup ref="StartCreateInvoiceFromOrderPageActionGroup" stepKey="startCreateInvoice"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithBankTransferPaymentMethodTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithBankTransferPaymentMethodTest.xml
index bb1940357a7f4..80336ea29e9d5 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithBankTransferPaymentMethodTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithBankTransferPaymentMethodTest.xml
@@ -59,9 +59,7 @@
         <!-- Select bank Transfer payment method -->
         <waitForElementVisible selector="{{AdminOrderFormPaymentSection.paymentBlock}}" stepKey="waitForPaymentOptions"/>
         <conditionalClick selector="{{AdminOrderFormPaymentSection.bankTransferOption}}" dependentSelector="{{AdminOrderFormPaymentSection.bankTransferOption}}" visible="true" stepKey="checkBankTransferOption"/>
-
-        <!-- Submit order -->
-        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
+        <actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="submitOrder" />
 
         <!-- Verify order information -->
         <actionGroup ref="VerifyCreatedOrderInformationActionGroup" stepKey="verifyCreatedOrderInformation"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCashOnDeliveryPaymentMethodTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCashOnDeliveryPaymentMethodTest.xml
index dafd00ff60b29..5f454152de20c 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCashOnDeliveryPaymentMethodTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCashOnDeliveryPaymentMethodTest.xml
@@ -59,9 +59,7 @@
         <!-- Select Cash On Delivery payment method -->
         <waitForElementVisible selector="{{AdminOrderFormPaymentSection.paymentBlock}}" stepKey="waitForPaymentOptions"/>
         <checkOption selector="{{AdminOrderFormPaymentSection.cashOnDeliveryOption}}" stepKey="selectCashOnDeliveryPaymentOption"/>
-
-        <!-- Submit order -->
-        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
+        <actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="submitOrder" />
 
         <!--Verify order information-->
         <actionGroup ref="VerifyCreatedOrderInformationActionGroup" stepKey="verifyCreatedOrderInformation"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCheckMoneyOrderPaymentMethodTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCheckMoneyOrderPaymentMethodTest.xml
index 4e750c2cc24b3..7d6e2048c9432 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCheckMoneyOrderPaymentMethodTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCheckMoneyOrderPaymentMethodTest.xml
@@ -149,7 +149,7 @@
         <actionGroup ref="AdminSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
         <!-- Submit order -->
         <comment userInput="Submit order" stepKey="submitOrderComment"/>
-        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
+        <actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="submitOrder" />
         <!-- Verify order information -->
         <comment userInput="Verify order information" stepKey="verifyOrderInformationComment"/>
         <actionGroup ref="VerifyCreatedOrderInformationActionGroup" stepKey="verifyCreatedOrderInformation"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithProductQtyWithoutStockDecreaseTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithProductQtyWithoutStockDecreaseTest.xml
index 62425cefb20db..f47513bcadedd 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithProductQtyWithoutStockDecreaseTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithProductQtyWithoutStockDecreaseTest.xml
@@ -58,9 +58,7 @@
 
         <!--Select FlatRate shipping method-->
         <actionGroup ref="AdminSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
-
-        <!--Submit order-->
-        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
+        <actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="submitOrder" />
 
         <!--Verify order information-->
         <actionGroup ref="VerifyCreatedOrderInformationActionGroup" stepKey="verifyCreatedOrderInformation"/>
@@ -109,7 +107,7 @@
         <!-- Reorder the product -->
         <click selector="{{AdminOrderDetailsMainActionsSection.reorder}}" stepKey="clickOnReorderButton"/>
         <waitForPageLoad stepKey="waitForReorderFormToLoad"/>
-        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder1"/>
+        <actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="submitOrder1" />
 
         <!-- Assert Simple Product Quantity in backend after Reorder -->
         <actionGroup ref="FilterAndSelectProductActionGroup" stepKey="filterAndSelectTheProduct2">
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithPurchaseOrderPaymentMethodTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithPurchaseOrderPaymentMethodTest.xml
index 0b873de34e279..9f09a59fa8d5e 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithPurchaseOrderPaymentMethodTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithPurchaseOrderPaymentMethodTest.xml
@@ -69,9 +69,7 @@
         <fillField selector="{{AdminOrderFormPaymentSection.purchaseOrderNumber}}" userInput="{{PurchaseOrderNumber.number}}" stepKey="fillPurchaseOrderNumber"/>
         <click selector="{{AdminOrderFormActionSection.pageHeader}}" stepKey="clickOnHeader"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
-
-        <!--Submit order-->
-        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
+        <actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="submitOrder" />
 
         <!--Verify order information-->
         <actionGroup ref="VerifyCreatedOrderInformationActionGroup" stepKey="verifyCreatedOrderInformation"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithZeroSubtotalCheckoutTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithZeroSubtotalCheckoutTest.xml
index d22e11bca3d0e..6ce9909d06be5 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithZeroSubtotalCheckoutTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithZeroSubtotalCheckoutTest.xml
@@ -60,9 +60,7 @@
 
         <!--Select FlatRate shipping method-->
         <actionGroup ref="AdminSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
-
-        <!--Submit order-->
-        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
+        <actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="submitOrder" />
 
         <!--Verify order information-->
         <actionGroup ref="VerifyCreatedOrderInformationActionGroup" stepKey="verifyCreatedOrderInformation"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithPurchaseOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithPurchaseOrderTest.xml
index 7818a1f3d9345..56399401b205e 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithPurchaseOrderTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithPurchaseOrderTest.xml
@@ -61,8 +61,7 @@
         <fillField selector="{{AdminOrderFormPaymentSection.fieldPurchaseOrderNumber}}" userInput="123456" stepKey="fillPONumber"/>
         <click selector="{{AdminOrderFormPaymentSection.blockPayment}}" stepKey="unfocus"/>
         <waitForPageLoad stepKey="waitForJavascriptToFinish"/>
-        <click selector="{{AdminOrderFormActionSection.submitOrder}}" stepKey="submitOrder"/>
-        <waitForPageLoad stepKey="waitForSubmitOrderPage"/>
+        <actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="submitOrder" />
         <see stepKey="seeSuccessMessageForOrder" selector="{{AdminIndexManagementSection.successMessage}}" userInput="You created the order."/>
 
         <!-- Create Invoice -->
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithBundleProductTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithBundleProductTest.xml
index 1401930131b13..5c49d29ddf22e 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithBundleProductTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithBundleProductTest.xml
@@ -93,9 +93,7 @@
 
         <!--Select FlatRate shipping method-->
         <actionGroup ref="OrderSelectFlatRateShippingActionGroup" stepKey="orderSelectFlatRateShippingMethod"/>
-
-        <!--Submit order-->
-        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
+        <actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="submitOrder" />
 
         <!--Verify order information-->
         <actionGroup ref="VerifyCreatedOrderInformationActionGroup" stepKey="verifyCreatedOrderInformation"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithMinimumAmountEnabledTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithMinimumAmountEnabledTest.xml
index 1f6d7c40be99b..b5c9e9443d1f9 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithMinimumAmountEnabledTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithMinimumAmountEnabledTest.xml
@@ -63,9 +63,7 @@
         <see selector="{{AdminOrderFormTotalSection.total('Subtotal')}}" userInput="${{AdminOrderSimpleProduct.subtotal}}" stepKey="seeOrderSubTotal"/>
         <see selector="{{AdminOrderFormTotalSection.total('Shipping')}}" userInput="${{AdminOrderSimpleProduct.shipping}}" stepKey="seeOrderShipping"/>
         <see selector="{{AdminOrderFormTotalSection.grandTotal}}" userInput="${{AdminOrderSimpleProduct.grandTotal}}" stepKey="seeCorrectGrandTotal"/>
-
-        <!--Submit Order and verify information-->
-        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
+        <actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="clickSubmitOrder" />
         <seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPage"/>
 
         <see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the order." stepKey="seeSuccessMessage"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminFreeShippingNotAvailableIfMinimumOrderAmountNotMatchOrderTotalTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminFreeShippingNotAvailableIfMinimumOrderAmountNotMatchOrderTotalTest.xml
index f6196c3a911ef..bf8e7e1868184 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminFreeShippingNotAvailableIfMinimumOrderAmountNotMatchOrderTotalTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminFreeShippingNotAvailableIfMinimumOrderAmountNotMatchOrderTotalTest.xml
@@ -58,8 +58,7 @@
         <!--Click *Get shipping methods and rates* and see that Free Shipping is absent-->
         <click selector="{{AdminOrderFormPaymentSection.getShippingMethods}}" stepKey="clickGetShippingMehods"/>
         <dontSeeElement selector="{{AdminOrderFormPaymentSection.freeShippingOption}}" stepKey="seeAbsentFreeShipping"/>
-        <!--Submit Order and verify that Order isn't placed-->
-        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
+        <actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="clickSubmitOrder" />
 
         <dontSeeElement selector="{{AdminOrderFormMessagesSection.success}}" stepKey="seeSuccessMessage"/>
         <seeElement selector="{{AdminOrderFormMessagesSection.error}}" stepKey="seeErrorMessage"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminHoldCreatedOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminHoldCreatedOrderTest.xml
index 8d328beab1adc..a73e64cfbca10 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminHoldCreatedOrderTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminHoldCreatedOrderTest.xml
@@ -60,9 +60,7 @@
 
         <!--Select FlatRate shipping method-->
         <actionGroup ref="AdminSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
-
-        <!-- Submit order -->
-        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
+        <actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="submitOrder" />
 
         <!-- Verify order information -->
         <actionGroup ref="VerifyCreatedOrderInformationActionGroup" stepKey="verifyCreatedOrderInformation"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitConfigurableProductOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitConfigurableProductOrderTest.xml
index 54ae549967a3b..beaf098eee246 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitConfigurableProductOrderTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitConfigurableProductOrderTest.xml
@@ -114,9 +114,7 @@
 
         <!-- Checkout select Check/Money Order payment -->
         <actionGroup ref="SelectCheckMoneyPaymentMethodActionGroup" stepKey="selectCheckMoneyPayment"/>
-
-        <!--Submit order-->
-        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
+        <actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="submitOrder" />
 
         <!--Verify order information-->
         <actionGroup ref="VerifyCreatedOrderInformationActionGroup" stepKey="verifyCreatedOrderInformation"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CheckXSSVulnerabilityDuringOrderCreationTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CheckXSSVulnerabilityDuringOrderCreationTest.xml
index df6a797372e62..528b6b61f4842 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CheckXSSVulnerabilityDuringOrderCreationTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CheckXSSVulnerabilityDuringOrderCreationTest.xml
@@ -54,7 +54,7 @@
         <!-- Try to create order in admin with provided email -->
         <actionGroup ref="NavigateToNewOrderPageNewCustomerSingleStoreActionGroup" stepKey="navigateToNewOrderPage"/>
         <fillField selector="{{AdminOrderFormAccountSection.email}}" userInput="{{Simple_US_Customer_Incorrect_Email.email}}" stepKey="fillEmailAddressAdminPanel"/>
-        <click selector="{{AdminOrderFormActionSection.submitOrder}}" stepKey="clickSubmitOrder"/>
+        <actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="clickSubmitOrder" />
 
         <!-- Order can not be created -->
         <actionGroup ref="AssertAdminEmailValidationMessageOnCheckoutActionGroup" stepKey="assertErrorMessageAdminPanel"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml
index 842faeb32cc33..ca705405809bd 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml
@@ -186,10 +186,7 @@
         <waitForPageLoad stepKey="waitForShippingMethods"/>
         <click selector="{{AdminOrderFormPaymentSection.freeShippingOption}}" stepKey="chooseShippingMethod"/>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
-
-        <!-- Submit order -->
-        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
-        <waitForPageLoad stepKey="waitForAdminOrderFormLoad"/>
+        <actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="submitOrder" />
 
         <!-- Verify order information -->
         <actionGroup ref="VerifyCreatedOrderInformationActionGroup" stepKey="verifyCreatedOrderInformation"/>
diff --git a/app/code/Magento/Shipping/Test/Mftf/Test/AdminCreatePartialShipmentEntityTest.xml b/app/code/Magento/Shipping/Test/Mftf/Test/AdminCreatePartialShipmentEntityTest.xml
index 9d501e4b34ef7..b1fb2aad54272 100644
--- a/app/code/Magento/Shipping/Test/Mftf/Test/AdminCreatePartialShipmentEntityTest.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Test/AdminCreatePartialShipmentEntityTest.xml
@@ -51,8 +51,7 @@
         </actionGroup>
         <!-- Select Free shipping -->
         <actionGroup ref="OrderSelectFreeShippingActionGroup" stepKey="selectFreeShippingOption"/>
-        <!--Click *Submit Order* button-->
-        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
+        <actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="clickSubmitOrder" />
         <!-- Create Partial Shipment -->
         <actionGroup ref="AdminCreateShipmentFromOrderPage" stepKey="createNewShipment">
             <argument name="Qty" value="1"/>
diff --git a/app/code/Magento/Shipping/Test/Mftf/Test/AdminCreateShipmentEntityTest.xml b/app/code/Magento/Shipping/Test/Mftf/Test/AdminCreateShipmentEntityTest.xml
index a900a73fc36bc..5d46ef0a76263 100644
--- a/app/code/Magento/Shipping/Test/Mftf/Test/AdminCreateShipmentEntityTest.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Test/AdminCreateShipmentEntityTest.xml
@@ -51,8 +51,7 @@
         </actionGroup>
         <!-- Select Free shipping -->
         <actionGroup ref="OrderSelectFreeShippingActionGroup" stepKey="selectFreeShippingOption"/>
-        <!--Click *Submit Order* button-->
-        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
+        <actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="clickSubmitOrder" />
         <!-- Create Shipment -->
         <actionGroup ref="AdminCreateShipmentFromOrderPage" stepKey="createNewShipment">
             <argument name="Title" value="Title"/>

From afe499d5fbd09abd86e3c8d48797395fada01fa6 Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Tue, 18 Aug 2020 20:01:07 +0800
Subject: [PATCH 1539/1718] 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 9fd19aa5e6210e23d84d36b15f9807a2442a0854 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 18 Aug 2020 15:13:59 +0300
Subject: [PATCH 1540/1718] 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 a516ee5ff9c1cc64878c4101d2a010cc2173560d 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 1541/1718] magento/magento2#29411: Naming update

---
 .../Adminhtml/Directories/GetTree.php         | 16 ++---
 .../{FolderTree.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/{FolderTree.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 229a717ef13dd..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\FolderTree;
+use Magento\MediaGalleryUi\Model\Directories\GetDirectoryTree;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -33,25 +33,25 @@ class GetTree extends Action implements HttpGetActionInterface
     private $logger;
 
     /**
-     * @var FolderTree
+     * @var GetDirectoryTree
      */
-    private $folderTree;
+    private $getDirectoryTree;
 
     /**
      * Constructor
      *
      * @param Action\Context $context
      * @param LoggerInterface $logger
-     * @param FolderTree $folderTree
+     * @param GetDirectoryTree $getDirectoryTree
      */
     public function __construct(
         Action\Context $context,
         LoggerInterface $logger,
-        FolderTree $folderTree
+        GetDirectoryTree $getDirectoryTree
     ) {
         parent::__construct($context);
         $this->logger = $logger;
-        $this->folderTree = $folderTree;
+        $this->getDirectoryTree = $getDirectoryTree;
     }
     /**
      * @inheritdoc
@@ -59,7 +59,9 @@ public function __construct(
     public function execute()
     {
         try {
-            $responseContent[] = $this->folderTree->buildTree();
+            $responseContent = [
+                $this->getDirectoryTree->execute()
+            ];
             $responseCode = self::HTTP_OK;
         } catch (\Exception $exception) {
             $this->logger->critical($exception);
diff --git a/app/code/Magento/MediaGalleryUi/Model/Directories/FolderTree.php b/app/code/Magento/MediaGalleryUi/Model/Directories/GetDirectoryTree.php
similarity index 77%
rename from app/code/Magento/MediaGalleryUi/Model/Directories/FolderTree.php
rename to app/code/Magento/MediaGalleryUi/Model/Directories/GetDirectoryTree.php
index 574b8aab8bcd3..35e34a7e5532c 100644
--- a/app/code/Magento/MediaGalleryUi/Model/Directories/FolderTree.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 FolderTree
+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 buildTree(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 040e003817efa..63a5a1a5ad378 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\FolderTree">
-        <arguments>
-            <argument name="path" xsi:type="string">media</argument>
-        </arguments>
-    </type>
     <type name="Magento\MediaGalleryUi\Model\AssetDetailsProvider\Type">
         <arguments>
             <argument name="types" xsi:type="array">

From 084f689c14cc47fae2b53c8f11f87de548e76227 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 18 Aug 2020 15:51:17 +0300
Subject: [PATCH 1542/1718] 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 f54fd865772834c402bebfe204dba234f6a0fba7 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Tue, 18 Aug 2020 16:15:05 +0300
Subject: [PATCH 1543/1718] added some action groups to analytics module

---
 ...figGeneralAnalyticsPageOpenActionGroup.xml | 19 ++++++++++++++++++
 ...minAdvancedReportingPageUrlActionGroup.xml | 20 +++++++++++++++++++
 .../Test/AdminAdvancedReportingButtonTest.xml |  3 +--
 ...AdminAdvancedReportingNavigateMenuTest.xml |  4 +---
 .../AdminConfigurationBlankIndustryTest.xml   |  6 ++++--
 ...onfigurationEnableDisableAnalyticsTest.xml |  6 ++++--
 .../Test/AdminConfigurationIndustryTest.xml   | 10 +++++++---
 .../AdminConfigurationTimeToSendDataTest.xml  |  6 ++++--
 8 files changed, 60 insertions(+), 14 deletions(-)
 create mode 100644 app/code/Magento/Analytics/Test/Mftf/ActionGroup/AdminConfigGeneralAnalyticsPageOpenActionGroup.xml
 create mode 100644 app/code/Magento/Analytics/Test/Mftf/ActionGroup/AssertAdminAdvancedReportingPageUrlActionGroup.xml

diff --git a/app/code/Magento/Analytics/Test/Mftf/ActionGroup/AdminConfigGeneralAnalyticsPageOpenActionGroup.xml b/app/code/Magento/Analytics/Test/Mftf/ActionGroup/AdminConfigGeneralAnalyticsPageOpenActionGroup.xml
new file mode 100644
index 0000000000000..713409e2b9a78
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Mftf/ActionGroup/AdminConfigGeneralAnalyticsPageOpenActionGroup.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="AdminConfigGeneralAnalyticsPageOpenActionGroup">
+        <annotations>
+            <description>Open Config General Analytics Page.</description>
+        </annotations>
+
+        <amOnPage url="{{AdminConfigGeneralAnalyticsPage.url}}" stepKey="amOnAdminConfig"/>
+        <waitForPageLoad stepKey="waitPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Analytics/Test/Mftf/ActionGroup/AssertAdminAdvancedReportingPageUrlActionGroup.xml b/app/code/Magento/Analytics/Test/Mftf/ActionGroup/AssertAdminAdvancedReportingPageUrlActionGroup.xml
new file mode 100644
index 0000000000000..51d77228c8dcf
--- /dev/null
+++ b/app/code/Magento/Analytics/Test/Mftf/ActionGroup/AssertAdminAdvancedReportingPageUrlActionGroup.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="AssertAdminAdvancedReportingPageUrlActionGroup">
+        <annotations>
+            <description>Assert admin advanced reporting page url.</description>
+        </annotations>
+
+        <switchToNextTab stepKey="switchToNewTab"/>
+        <waitForPageLoad stepKey="waitForAdvancedReportingPageLoad"/>
+        <seeInCurrentUrl url="advancedreporting.rjmetrics.com/report" stepKey="seeAssertAdvancedReportingPageUrl"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingButtonTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingButtonTest.xml
index cbcbb3a5dd64c..9c99041be0df6 100644
--- a/app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingButtonTest.xml
+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingButtonTest.xml
@@ -32,7 +32,6 @@
         <amOnPage url="{{AdminDashboardPage.url}}" stepKey="amOnDashboardPage"/>
         <waitForPageLoad stepKey="waitForDashboardPageLoad"/>
         <click selector="{{AdminAdvancedReportingSection.goToAdvancedReporting}}" stepKey="clickGoToAdvancedReporting"/>
-        <switchToNextTab stepKey="switchToNewTab"/>
-        <seeInCurrentUrl url="advancedreporting.rjmetrics.com/report" stepKey="seeAssertAdvancedReportingPageUrl"/>
+        <actionGroup ref="AssertAdminAdvancedReportingPageUrlActionGroup" stepKey="assertAdvancedReportingPageUrl"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingNavigateMenuTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingNavigateMenuTest.xml
index ee25e80fcab30..f350452cfc7d0 100644
--- a/app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingNavigateMenuTest.xml
+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingNavigateMenuTest.xml
@@ -29,8 +29,6 @@
             <argument name="menuUiId" value="{{AdminMenuReports.dataUiId}}"/>
             <argument name="submenuUiId" value="{{AdminMenuReportsBusinessIntelligenceAdvancedReporting.dataUiId}}"/>
         </actionGroup>
-        <switchToNextTab stepKey="switchToNewTab"/>
-        <waitForPageLoad stepKey="waitForAdvancedReportingPageLoad"/>
-        <seeInCurrentUrl url="advancedreporting.rjmetrics.com/report" stepKey="seeAssertAdvancedReportingPageUrl"/>
+        <actionGroup ref="AssertAdminAdvancedReportingPageUrlActionGroup" stepKey="assertAdvancedReportingPageUrl"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationBlankIndustryTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationBlankIndustryTest.xml
index 17d463030d91c..3f960333f4dcb 100644
--- a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationBlankIndustryTest.xml
+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationBlankIndustryTest.xml
@@ -17,11 +17,13 @@
             <testCaseId value="MAGETWO-63981"/>
             <group value="analytics"/>
         </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
         <after>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
-        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-        <amOnPage url="{{AdminConfigGeneralAnalyticsPage.url}}" stepKey="amOnAdminConfig"/>
+        <actionGroup ref="AdminConfigGeneralAnalyticsPageOpenActionGroup" stepKey="amOnAdminConfig"/>
         <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>
         <see selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustryLabel}}" userInput="Industry" stepKey="seeAdvancedReportingIndustryLabel"/>
         <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustry}}" userInput="--Please Select--" stepKey="selectAdvancedReportingIndustry"/>
diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationEnableDisableAnalyticsTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationEnableDisableAnalyticsTest.xml
index b03488c240604..35f9e95885c0d 100644
--- a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationEnableDisableAnalyticsTest.xml
+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationEnableDisableAnalyticsTest.xml
@@ -17,11 +17,13 @@
             <testCaseId value="MAGETWO-66465"/>
             <group value="analytics"/>
         </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
         <after>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
-        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-        <amOnPage url="{{AdminConfigGeneralAnalyticsPage.url}}" stepKey="amOnAdminConfig"/>
+        <actionGroup ref="AdminConfigGeneralAnalyticsPageOpenActionGroup" stepKey="amOnAdminConfig"/>
         <see selector="{{AdminConfigAdvancedReportingSection.advancedReportingServiceLabel}}" userInput="Advanced Reporting Service" stepKey="seeAdvancedReportingServiceLabelEnabled"/>
         <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>
         <see selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustryLabel}}" userInput="Industry" stepKey="seeAdvancedReportingIndustryLabel"/>
diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml
index c19fddc6aa0ce..a6cc8d7853cbe 100644
--- a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml
+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml
@@ -18,9 +18,13 @@
             <testCaseId value="MAGETWO-63898"/>
             <group value="analytics"/>
         </annotations>
-
-        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-        <amOnPage url="{{AdminConfigGeneralAnalyticsPage.url}}" stepKey="amOnAdminConfig"/>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
+        </after>
+        <actionGroup ref="AdminConfigGeneralAnalyticsPageOpenActionGroup" stepKey="amOnAdminConfig"/>
         <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>
         <see selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustryLabel}}" userInput="Industry" stepKey="seeAdvancedReportingIndustryLabel"/>
         <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustry}}" userInput="Apps and Games" stepKey="selectAdvancedReportingIndustry"/>
diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationTimeToSendDataTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationTimeToSendDataTest.xml
index 6231b17c17b02..020f2cf03974a 100644
--- a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationTimeToSendDataTest.xml
+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationTimeToSendDataTest.xml
@@ -18,11 +18,13 @@
             <testCaseId value="MAGETWO-66464"/>
             <group value="analytics"/>
         </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
         <after>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
-        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-        <amOnPage url="{{AdminConfigGeneralAnalyticsPage.url}}" stepKey="amOnAdminConfig"/>
+        <actionGroup ref="AdminConfigGeneralAnalyticsPageOpenActionGroup" stepKey="amOnAdminConfig"/>
         <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>
         <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustry}}" userInput="Apps and Games" stepKey="selectAdvancedReportingIndustry"/>
         <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingHour}}" userInput="23" stepKey="selectAdvancedReportingHour"/>

From eb1f0bb35652eaf0a88aa9218214bde38119f4e7 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 1544/1718] 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 36074a918e077096f7978f05a7a1df8662474706 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 1545/1718] 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 d1abc9dd10c47da048a0ceafca37c9b45102fe36 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 18 Aug 2020 16:34:56 +0300
Subject: [PATCH 1546/1718] 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 5267a215c8edd..f52799be3b410 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml
@@ -13,6 +13,6 @@
         <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="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 5018515c4bf351bcb8d6a2a059210405b60c42f0 Mon Sep 17 00:00:00 2001
From: Deepty Thampy <dthampy@adobe.com>
Date: Tue, 18 Aug 2020 09:47:54 -0500
Subject: [PATCH 1547/1718] test name correction

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

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddConfigurableProductToWishlistTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddConfigurableProductToWishlistTest.php
index 7b2c12f88d3a4..cffc5eb6f93c1 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddConfigurableProductToWishlistTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddConfigurableProductToWishlistTest.php
@@ -48,7 +48,7 @@ protected function setUp(): void
      *
      * @throws Exception
      */
-    public function testAddDownloadableProductWithOptions(): void
+    public function testAddConfigurableProductWithOptions(): void
     {
         $product = $this->getConfigurableProductInfo();
         $customerId = 1;

From c5f99cf4266675ad1d6b55135cb2ab75efc392f2 Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@magento.com>
Date: Fri, 14 Aug 2020 12:16:16 -0500
Subject: [PATCH 1548/1718] 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 db92989e1d3475f72d411468b47fe3bc594bde54 Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@magento.com>
Date: Fri, 14 Aug 2020 14:51:31 -0500
Subject: [PATCH 1549/1718] 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 154ebc00572533bc1a4573f305ff26bc3a7455d0 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Tue, 18 Aug 2020 23:25:22 +0800
Subject: [PATCH 1550/1718] 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 1df4ca7381a8963dc206723d75666af832709128 Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Tue, 18 Aug 2020 19:30:19 +0300
Subject: [PATCH 1551/1718] Fixing reason for deprecated annotation

---
 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 f6ff44e34e6c5..bd46c6a90b1d2 100644
--- a/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
@@ -24,7 +24,7 @@ type WishlistOutput @doc(description: "Deprecated: `Wishlist` type should be use
 
 type Wishlist {
     id: ID @doc(description: "Wishlist unique identifier")
-    items: [WishlistItem] @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\WishlistItemsResolver") @deprecated(description: "Use field `items_v2` from type `Wishlist` instead")
+    items: [WishlistItem] @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\WishlistItemsResolver") @deprecated(reason: "Use field `items_v2` from type `Wishlist` instead")
     items_v2: [WishlistItemInterface] @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\WishlistItems") @doc(description: "An array of items in the customer's wishlist")
     items_count: Int @doc(description: "The number of items in the wish list")
     sharing_code: String @doc(description: "An encrypted code that Magento uses to link to the wish list")

From 9a69a6af4a1a7f6e04659cca2546d109cbf8fe4e 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 1552/1718] 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 8ecdbcf91f62315abe9db041b32e4fd76aa71f71 Mon Sep 17 00:00:00 2001
From: Roman Lytvynenko <lytvynen@adobe.com>
Date: Tue, 18 Aug 2020 12:50:33 -0500
Subject: [PATCH 1553/1718] MC-36227: Page builder content is getting cropped.

---
 .../Magento/Catalog/Model/CategoryTest.php    |  25 ++++
 .../Magento/Catalog/Model/ProductTest.php     | 107 +++++++++++++-----
 2 files changed, 105 insertions(+), 27 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php
index 0d2f9d63c5d7f..8c25a82e0f6fd 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php
@@ -15,6 +15,8 @@
 use Magento\Catalog\Model\ResourceModel\Category\Tree;
 use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
 use Magento\Eav\Model\Entity\Attribute\Exception as AttributeException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Math\Random;
 use Magento\Framework\Url;
 use Magento\Store\Api\StoreRepositoryInterface;
 use Magento\Store\Model\Store;
@@ -419,6 +421,29 @@ public function testCategoryCreateWithDifferentFields(array $data): void
         $this->assertSame($data, $categoryData);
     }
 
+    /**
+     * Test for Category Description field to be able to contain >64kb of data
+     *
+     * @throws NoSuchEntityException
+     * @throws \Exception
+     */
+    public function testMaximumDescriptionLength(): void
+    {
+        $random = Bootstrap::getObjectManager()->get(Random::class);
+        $longDescription = $random->getRandomString(70000);
+
+        $requiredData = [
+            'name' => 'Test Category',
+            'attribute_set_id' => '3',
+            'parent_id' => 2,
+            'description' => $longDescription
+        ];
+        $this->_model->setData($requiredData);
+        $this->categoryResource->save($this->_model);
+        $category = $this->categoryRepository->get($this->_model->getId());
+        $this->assertEquals($longDescription, $category->getDescription());
+    }
+
     /**
      * @return array
      */
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
index b56e9e502cce6..b0f36f250991b 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
@@ -8,14 +8,19 @@
 
 namespace Magento\Catalog\Model;
 
-use Magento\Eav\Model\Config as EavConfig;
-use Magento\Catalog\Model\Product;
-use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\TestFramework\ObjectManager;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\StateException;
+use Magento\Framework\Math\Random;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
 
 /**
  * Tests product model:
@@ -119,14 +124,62 @@ public function testCRUD()
         )->setMetaDescription(
             'meta description'
         )->setVisibility(
-            \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH
+            Visibility::VISIBILITY_BOTH
         )->setStatus(
-            \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
+            Status::STATUS_ENABLED
         );
         $crud = new \Magento\TestFramework\Entity($this->_model, ['sku' => uniqid()]);
         $crud->testCrud();
     }
 
+    /**
+     * Test for Product Description field to be able to contain >64kb of data
+     *
+     * @magentoDbIsolation enabled
+     * @magentoAppIsolation enabled
+     * @magentoAppArea adminhtml
+     * @throws NoSuchEntityException
+     * @throws CouldNotSaveException
+     * @throws InputException
+     * @throws StateException
+     * @throws LocalizedException
+     */
+    public function testMaximumDescriptionLength()
+    {
+        $sku = uniqid();
+        $random = Bootstrap::getObjectManager()->get(Random::class);
+        $longDescription = $random->getRandomString(70000);
+
+        $this->_model->setTypeId(
+            'simple'
+        )->setAttributeSetId(
+            4
+        )->setName(
+            'Simple Product With Long Description'
+        )->setDescription(
+            $longDescription
+        )->setSku(
+            $sku
+        )->setPrice(
+            10
+        )->setMetaTitle(
+            'meta title'
+        )->setMetaKeyword(
+            'meta keyword'
+        )->setMetaDescription(
+            'meta description'
+        )->setVisibility(
+            Visibility::VISIBILITY_BOTH
+        )->setStatus(
+            Status::STATUS_ENABLED
+        );
+
+        $this->productRepository->save($this->_model);
+        $product = $this->productRepository->get($sku);
+
+        $this->assertEquals($longDescription, $product->getDescription());
+    }
+
     /**
      * Test clean cache
      *
@@ -219,7 +272,7 @@ public function testDuplicate()
             $this->assertNotEquals($duplicate->getId(), $this->_model->getId());
             $this->assertNotEquals($duplicate->getSku(), $this->_model->getSku());
             $this->assertEquals(
-                \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_DISABLED,
+                Status::STATUS_DISABLED,
                 $duplicate->getStatus()
             );
             $this->assertEquals(\Magento\Store\Model\Store::DEFAULT_STORE_ID, $duplicate->getStoreId());
@@ -275,35 +328,35 @@ protected function _undo($duplicate)
     public function testVisibilityApi()
     {
         $this->assertEquals(
-            [\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED],
+            [Status::STATUS_ENABLED],
             $this->_model->getVisibleInCatalogStatuses()
         );
         $this->assertEquals(
-            [\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED],
+            [Status::STATUS_ENABLED],
             $this->_model->getVisibleStatuses()
         );
 
-        $this->_model->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_DISABLED);
+        $this->_model->setStatus(Status::STATUS_DISABLED);
         $this->assertFalse($this->_model->isVisibleInCatalog());
 
-        $this->_model->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED);
+        $this->_model->setStatus(Status::STATUS_ENABLED);
         $this->assertTrue($this->_model->isVisibleInCatalog());
 
         $this->assertEquals(
             [
-                \Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_SEARCH,
-                \Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_CATALOG,
-                \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH,
+                Visibility::VISIBILITY_IN_SEARCH,
+                Visibility::VISIBILITY_IN_CATALOG,
+                Visibility::VISIBILITY_BOTH,
             ],
             $this->_model->getVisibleInSiteVisibilities()
         );
 
         $this->assertFalse($this->_model->isVisibleInSiteVisibility());
-        $this->_model->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_SEARCH);
+        $this->_model->setVisibility(Visibility::VISIBILITY_IN_SEARCH);
         $this->assertTrue($this->_model->isVisibleInSiteVisibility());
-        $this->_model->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_IN_CATALOG);
+        $this->_model->setVisibility(Visibility::VISIBILITY_IN_CATALOG);
         $this->assertTrue($this->_model->isVisibleInSiteVisibility());
-        $this->_model->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH);
+        $this->_model->setVisibility(Visibility::VISIBILITY_BOTH);
         $this->assertTrue($this->_model->isVisibleInSiteVisibility());
     }
 
@@ -509,9 +562,9 @@ public function testValidate()
         )->setMetaDescription(
             'meta description'
         )->setVisibility(
-            \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH
+            Visibility::VISIBILITY_BOTH
         )->setStatus(
-            \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
+            Status::STATUS_ENABLED
         )->setCollectExceptionMessages(
             true
         );
@@ -551,9 +604,9 @@ public function testValidateUniqueInputAttributeValue()
             $attribute->getAttributeCode(),
             'unique value'
         )->setVisibility(
-            \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH
+            Visibility::VISIBILITY_BOTH
         )->setStatus(
-            \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
+            Status::STATUS_ENABLED
         )->setCollectExceptionMessages(
             true
         );
@@ -600,9 +653,9 @@ public function testValidateUniqueInputAttributeOnTheSameProduct()
             $attribute->getAttributeCode(),
             'unique value'
         )->setVisibility(
-            \Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH
+            Visibility::VISIBILITY_BOTH
         )->setStatus(
-            \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
+            Status::STATUS_ENABLED
         )->setCollectExceptionMessages(
             true
         );
@@ -675,10 +728,10 @@ public function testSaveWithBackordersEnabled(int $qty, int $stockStatus, bool $
      * @magentoDataFixture Magento/Catalog/_files/product_simple.php
      *
      * @return void
-     * @throws \Magento\Framework\Exception\CouldNotSaveException
-     * @throws \Magento\Framework\Exception\InputException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
-     * @throws \Magento\Framework\Exception\StateException
+     * @throws CouldNotSaveException
+     * @throws InputException
+     * @throws NoSuchEntityException
+     * @throws StateException
      */
     public function testProductStatusWhenCatalogFlatProductIsEnabled()
     {

From 4b0fdfcf4d83b4dc180cefa65a717fbddb790dc9 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Wed, 19 Aug 2020 00:23:08 +0200
Subject: [PATCH 1554/1718] Minor Refactor

---
 .../Quote/Model/ChangeQuoteControl.php        | 21 ++++++-------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/Quote/Model/ChangeQuoteControl.php b/app/code/Magento/Quote/Model/ChangeQuoteControl.php
index b88898a816d66..92e25ca6c7d3a 100644
--- a/app/code/Magento/Quote/Model/ChangeQuoteControl.php
+++ b/app/code/Magento/Quote/Model/ChangeQuoteControl.php
@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\Quote\Model;
@@ -12,13 +11,10 @@
 use Magento\Quote\Api\ChangeQuoteControlInterface;
 use Magento\Quote\Api\Data\CartInterface;
 
-/**
- * {@inheritdoc}
- */
 class ChangeQuoteControl implements ChangeQuoteControlInterface
 {
     /**
-     * @var UserContextInterface $userContext
+     * @var UserContextInterface
      */
     private $userContext;
 
@@ -31,25 +27,20 @@ public function __construct(UserContextInterface $userContext)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function isAllowed(CartInterface $quote): bool
     {
         switch ($this->userContext->getUserType()) {
             case UserContextInterface::USER_TYPE_CUSTOMER:
-                $isAllowed = ($quote->getCustomerId() == $this->userContext->getUserId());
-                break;
+                return ($quote->getCustomerId() == $this->userContext->getUserId());
             case UserContextInterface::USER_TYPE_GUEST:
-                $isAllowed = ($quote->getCustomerId() === null);
-                break;
+                return ($quote->getCustomerId() === null);
             case UserContextInterface::USER_TYPE_ADMIN:
             case UserContextInterface::USER_TYPE_INTEGRATION:
-                $isAllowed = true;
-                break;
-            default:
-                $isAllowed = false;
+                return true;
         }
 
-        return $isAllowed;
+        return false;
     }
 }

From 6b01af91fdc4720f73302f89256c1c91f345c429 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Wed, 19 Aug 2020 00:31:46 +0200
Subject: [PATCH 1555/1718] Refactor Unit Tests too

---
 .../Unit/Model/ChangeQuoteControlTest.php     | 52 +++----------------
 1 file changed, 8 insertions(+), 44 deletions(-)

diff --git a/app/code/Magento/Quote/Test/Unit/Model/ChangeQuoteControlTest.php b/app/code/Magento/Quote/Test/Unit/Model/ChangeQuoteControlTest.php
index f302372344c11..a241272652cb9 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/ChangeQuoteControlTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/ChangeQuoteControlTest.php
@@ -16,57 +16,36 @@
 
 /**
  * Unit test for \Magento\Quote\Model\ChangeQuoteControl
- *
- * Class \Magento\Quote\Test\Unit\Model\ChangeQuoteControlTest
  */
 class ChangeQuoteControlTest extends TestCase
 {
-    /**
-     * @var ObjectManager
-     */
-    protected $objectManager;
-
     /**
      * @var ChangeQuoteControl
      */
     protected $model;
 
     /**
-     * @var MockObject
+     * @var MockObject|UserContextInterface
      */
     protected $userContextMock;
 
     /**
-     * @var MockObject
+     * @var MockObject|CartInterface
      */
     protected $quoteMock;
 
     protected function setUp(): void
     {
-        $this->objectManager = new ObjectManager($this);
         $this->userContextMock = $this->getMockForAbstractClass(UserContextInterface::class);
 
-        $this->model = $this->objectManager->getObject(
-            ChangeQuoteControl::class,
-            [
-                'userContext' => $this->userContextMock
-            ]
-        );
-
-        $this->quoteMock = $this->getMockForAbstractClass(
-            CartInterface::class,
-            [],
-            '',
-            false,
-            true,
-            true,
-            ['getCustomerId']
-        );
+        $this->model = new ChangeQuoteControl($this->userContextMock);
+
+        $this->quoteMock = $this->getMockBuilder(CartInterface::class)
+            ->disableOriginalConstructor()
+            ->addMethods(['getCustomerId'])
+            ->getMockForAbstractClass();
     }
 
-    /**
-     * Test if the quote is belonged to customer
-     */
     public function testIsAllowedIfTheQuoteIsBelongedToCustomer()
     {
         $quoteCustomerId = 1;
@@ -80,9 +59,6 @@ public function testIsAllowedIfTheQuoteIsBelongedToCustomer()
         $this->assertTrue($this->model->isAllowed($this->quoteMock));
     }
 
-    /**
-     * Test if the quote is not belonged to customer
-     */
     public function testIsAllowedIfTheQuoteIsNotBelongedToCustomer()
     {
         $currentCustomerId = 1;
@@ -98,9 +74,6 @@ public function testIsAllowedIfTheQuoteIsNotBelongedToCustomer()
         $this->assertFalse($this->model->isAllowed($this->quoteMock));
     }
 
-    /**
-     * Test if the quote is belonged to guest and the context is guest
-     */
     public function testIsAllowedIfQuoteIsBelongedToGuestAndContextIsGuest()
     {
         $quoteCustomerId = null;
@@ -111,9 +84,6 @@ public function testIsAllowedIfQuoteIsBelongedToGuestAndContextIsGuest()
         $this->assertTrue($this->model->isAllowed($this->quoteMock));
     }
 
-    /**
-     * Test if the quote is belonged to customer and the context is guest
-     */
     public function testIsAllowedIfQuoteIsBelongedToCustomerAndContextIsGuest()
     {
         $quoteCustomerId = 1;
@@ -124,9 +94,6 @@ public function testIsAllowedIfQuoteIsBelongedToCustomerAndContextIsGuest()
         $this->assertFalse($this->model->isAllowed($this->quoteMock));
     }
 
-    /**
-     * Test if the context is admin
-     */
     public function testIsAllowedIfContextIsAdmin()
     {
         $this->userContextMock->expects($this->any())->method('getUserType')
@@ -134,9 +101,6 @@ public function testIsAllowedIfContextIsAdmin()
         $this->assertTrue($this->model->isAllowed($this->quoteMock));
     }
 
-    /**
-     * Test if the context is integration
-     */
     public function testIsAllowedIfContextIsIntegration()
     {
         $this->userContextMock->expects($this->any())->method('getUserType')

From bc5e644ed1131a6ad4d9bf900270076cbad0098a Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Wed, 19 Aug 2020 00:34:22 +0200
Subject: [PATCH 1556/1718] Refactor Unit Tests too (remove "expects any()")

---
 .../Unit/Model/ChangeQuoteControlTest.php     | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/Quote/Test/Unit/Model/ChangeQuoteControlTest.php b/app/code/Magento/Quote/Test/Unit/Model/ChangeQuoteControlTest.php
index a241272652cb9..a467f3e25d698 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/ChangeQuoteControlTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/ChangeQuoteControlTest.php
@@ -49,11 +49,11 @@ protected function setUp(): void
     public function testIsAllowedIfTheQuoteIsBelongedToCustomer()
     {
         $quoteCustomerId = 1;
-        $this->quoteMock->expects($this->any())->method('getCustomerId')
+        $this->quoteMock->method('getCustomerId')
             ->willReturn($quoteCustomerId);
-        $this->userContextMock->expects($this->any())->method('getUserType')
+        $this->userContextMock->method('getUserType')
             ->willReturn(UserContextInterface::USER_TYPE_CUSTOMER);
-        $this->userContextMock->expects($this->any())->method('getUserId')
+        $this->userContextMock->method('getUserId')
             ->willReturn($quoteCustomerId);
 
         $this->assertTrue($this->model->isAllowed($this->quoteMock));
@@ -64,11 +64,11 @@ public function testIsAllowedIfTheQuoteIsNotBelongedToCustomer()
         $currentCustomerId = 1;
         $quoteCustomerId = 2;
 
-        $this->quoteMock->expects($this->any())->method('getCustomerId')
+        $this->quoteMock->method('getCustomerId')
             ->willReturn($quoteCustomerId);
-        $this->userContextMock->expects($this->any())->method('getUserType')
+        $this->userContextMock->method('getUserType')
             ->willReturn(UserContextInterface::USER_TYPE_CUSTOMER);
-        $this->userContextMock->expects($this->any())->method('getUserId')
+        $this->userContextMock->method('getUserId')
             ->willReturn($currentCustomerId);
 
         $this->assertFalse($this->model->isAllowed($this->quoteMock));
@@ -77,9 +77,9 @@ public function testIsAllowedIfTheQuoteIsNotBelongedToCustomer()
     public function testIsAllowedIfQuoteIsBelongedToGuestAndContextIsGuest()
     {
         $quoteCustomerId = null;
-        $this->quoteMock->expects($this->any())->method('getCustomerId')
+        $this->quoteMock->method('getCustomerId')
             ->willReturn($quoteCustomerId);
-        $this->userContextMock->expects($this->any())->method('getUserType')
+        $this->userContextMock->method('getUserType')
             ->willReturn(UserContextInterface::USER_TYPE_GUEST);
         $this->assertTrue($this->model->isAllowed($this->quoteMock));
     }
@@ -87,23 +87,23 @@ public function testIsAllowedIfQuoteIsBelongedToGuestAndContextIsGuest()
     public function testIsAllowedIfQuoteIsBelongedToCustomerAndContextIsGuest()
     {
         $quoteCustomerId = 1;
-        $this->quoteMock->expects($this->any())->method('getCustomerId')
+        $this->quoteMock->method('getCustomerId')
             ->willReturn($quoteCustomerId);
-        $this->userContextMock->expects($this->any())->method('getUserType')
+        $this->userContextMock->method('getUserType')
             ->willReturn(UserContextInterface::USER_TYPE_GUEST);
         $this->assertFalse($this->model->isAllowed($this->quoteMock));
     }
 
     public function testIsAllowedIfContextIsAdmin()
     {
-        $this->userContextMock->expects($this->any())->method('getUserType')
+        $this->userContextMock->method('getUserType')
             ->willReturn(UserContextInterface::USER_TYPE_ADMIN);
         $this->assertTrue($this->model->isAllowed($this->quoteMock));
     }
 
     public function testIsAllowedIfContextIsIntegration()
     {
-        $this->userContextMock->expects($this->any())->method('getUserType')
+        $this->userContextMock->method('getUserType')
             ->willReturn(UserContextInterface::USER_TYPE_INTEGRATION);
         $this->assertTrue($this->model->isAllowed($this->quoteMock));
     }

From f0264c9b244f5a488525d96d7afbb3f35a48568d Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Wed, 19 Aug 2020 00:51:26 +0200
Subject: [PATCH 1557/1718] Minor refactoring to AccessChangeQuoteControl and
 it's Unit Tests

---
 .../Plugin/AccessChangeQuoteControl.php       | 10 ++--
 .../Plugin/AccessChangeQuoteControlTest.php   | 57 +++++--------------
 2 files changed, 21 insertions(+), 46 deletions(-)

diff --git a/app/code/Magento/Quote/Model/QuoteRepository/Plugin/AccessChangeQuoteControl.php b/app/code/Magento/Quote/Model/QuoteRepository/Plugin/AccessChangeQuoteControl.php
index 79b518fc54534..eda0e9638cc0d 100644
--- a/app/code/Magento/Quote/Model/QuoteRepository/Plugin/AccessChangeQuoteControl.php
+++ b/app/code/Magento/Quote/Model/QuoteRepository/Plugin/AccessChangeQuoteControl.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Quote\Model\QuoteRepository\Plugin;
 
@@ -32,16 +33,17 @@ public function __construct(ChangeQuoteControlInterface $changeQuoteControl)
     /**
      * Checks if change quote's customer id is allowed for current user.
      *
+     * A StateException is thrown if Guest's or Customer's customer_id not match user_id or unknown user type
+     *
      * @param CartRepositoryInterface $subject
      * @param CartInterface $quote
-     * @throws StateException if Guest has customer_id or Customer's customer_id not much with user_id
-     * or unknown user's type
      * @return void
+     * @throws StateException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function beforeSave(CartRepositoryInterface $subject, CartInterface $quote)
+    public function beforeSave(CartRepositoryInterface $subject, CartInterface $quote): void
     {
-        if (! $this->changeQuoteControl->isAllowed($quote)) {
+        if (!$this->changeQuoteControl->isAllowed($quote)) {
             throw new StateException(__("Invalid state change requested"));
         }
     }
diff --git a/app/code/Magento/Quote/Test/Unit/Model/QuoteRepository/Plugin/AccessChangeQuoteControlTest.php b/app/code/Magento/Quote/Test/Unit/Model/QuoteRepository/Plugin/AccessChangeQuoteControlTest.php
index 85098d2f23448..199ddfd9b9120 100644
--- a/app/code/Magento/Quote/Test/Unit/Model/QuoteRepository/Plugin/AccessChangeQuoteControlTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Model/QuoteRepository/Plugin/AccessChangeQuoteControlTest.php
@@ -8,6 +8,7 @@
 namespace Magento\Quote\Test\Unit\Model\QuoteRepository\Plugin;
 
 use Magento\Authorization\Model\UserContextInterface;
+use Magento\Framework\Exception\StateException;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Quote\Model\ChangeQuoteControl;
 use Magento\Quote\Model\Quote;
@@ -52,7 +53,7 @@ protected function setUp(): void
 
         $this->quoteMock = $this->getMockBuilder(Quote::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getCustomerId'])
+            ->addMethods(['getCustomerId'])
             ->getMock();
 
         $this->quoteRepositoryMock = $this->getMockBuilder(QuoteRepository::class)
@@ -63,17 +64,10 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMock();
 
-        $objectManagerHelper = new ObjectManager($this);
-        $this->accessChangeQuoteControl = $objectManagerHelper->getObject(
-            AccessChangeQuoteControl::class,
-            ['changeQuoteControl' => $this->changeQuoteControlMock]
-        );
+        $this->accessChangeQuoteControl = new AccessChangeQuoteControl($this->changeQuoteControlMock);
     }
 
-    /**
-     * User with role Customer and customer_id matches context user_id.
-     */
-    public function testBeforeSaveForCustomer()
+    public function testBeforeSaveForCustomerWithCustomerIdMatchinQuoteUserIdIsAllowed()
     {
         $this->quoteMock->method('getCustomerId')
             ->willReturn(1);
@@ -84,17 +78,12 @@ public function testBeforeSaveForCustomer()
         $this->changeQuoteControlMock->method('isAllowed')
             ->willReturn(true);
 
-        $result = $this->accessChangeQuoteControl->beforeSave($this->quoteRepositoryMock, $this->quoteMock);
-
-        $this->assertNull($result);
+        $this->accessChangeQuoteControl->beforeSave($this->quoteRepositoryMock, $this->quoteMock);
     }
 
-    /**
-     * The user_id and customer_id from the quote are different.
-     */
-    public function testBeforeSaveException()
+    public function testBeforeSaveThrowsExceptionForCustomerWithCustomerIdNotMatchingQuoteUserId()
     {
-        $this->expectException('Magento\Framework\Exception\StateException');
+        $this->expectException(StateException::class);
         $this->expectExceptionMessage('Invalid state change requested');
         $this->quoteMock->method('getCustomerId')
             ->willReturn(2);
@@ -108,10 +97,7 @@ public function testBeforeSaveException()
         $this->accessChangeQuoteControl->beforeSave($this->quoteRepositoryMock, $this->quoteMock);
     }
 
-    /**
-     * User with role Admin and customer_id not much with user_id.
-     */
-    public function testBeforeSaveForAdmin()
+    public function testBeforeSaveForAdminUserRoleIsAllowed()
     {
         $this->quoteMock->method('getCustomerId')
             ->willReturn(2);
@@ -122,15 +108,10 @@ public function testBeforeSaveForAdmin()
         $this->changeQuoteControlMock->method('isAllowed')
             ->willReturn(true);
 
-        $result = $this->accessChangeQuoteControl->beforeSave($this->quoteRepositoryMock, $this->quoteMock);
-
-        $this->assertNull($result);
+        $this->accessChangeQuoteControl->beforeSave($this->quoteRepositoryMock, $this->quoteMock);
     }
 
-    /**
-     * User with role Guest and customer_id === null.
-     */
-    public function testBeforeSaveForGuest()
+    public function testBeforeSaveForGuestIsAllowed()
     {
         $this->quoteMock->method('getCustomerId')
             ->willReturn(null);
@@ -141,17 +122,12 @@ public function testBeforeSaveForGuest()
         $this->changeQuoteControlMock->method('isAllowed')
             ->willReturn(true);
 
-        $result = $this->accessChangeQuoteControl->beforeSave($this->quoteRepositoryMock, $this->quoteMock);
-
-        $this->assertNull($result);
+        $this->accessChangeQuoteControl->beforeSave($this->quoteRepositoryMock, $this->quoteMock);
     }
 
-    /**
-     * User with role Guest and customer_id !== null.
-     */
-    public function testBeforeSaveForGuestException()
+    public function testBeforeSaveThrowsExceptionForGuestDoesNotEquals()
     {
-        $this->expectException('Magento\Framework\Exception\StateException');
+        $this->expectException(StateException::class);
         $this->expectExceptionMessage('Invalid state change requested');
         $this->quoteMock->method('getCustomerId')
             ->willReturn(1);
@@ -165,12 +141,9 @@ public function testBeforeSaveForGuestException()
         $this->accessChangeQuoteControl->beforeSave($this->quoteRepositoryMock, $this->quoteMock);
     }
 
-    /**
-     * User with unknown role.
-     */
-    public function testBeforeSaveForUnknownUserTypeException()
+    public function testBeforeSaveThrowsExceptionForUnknownUserType()
     {
-        $this->expectException('Magento\Framework\Exception\StateException');
+        $this->expectException(StateException::class);
         $this->expectExceptionMessage('Invalid state change requested');
         $this->quoteMock->method('getCustomerId')
             ->willReturn(2);

From ea584f9815ec3b119e9ac73ccc773435c7727960 Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Wed, 19 Aug 2020 11:01:04 +0530
Subject: [PATCH 1558/1718] Fixed cyclomatic complexity

---
 .../Newsletter/Model/SubscriptionManager.php  | 41 +++++++++++++++----
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Newsletter/Model/SubscriptionManager.php b/app/code/Magento/Newsletter/Model/SubscriptionManager.php
index eac43e1bcea5f..f01b4784581c3 100644
--- a/app/code/Magento/Newsletter/Model/SubscriptionManager.php
+++ b/app/code/Magento/Newsletter/Model/SubscriptionManager.php
@@ -195,13 +195,14 @@ private function saveSubscriber(
     ): bool {
         $statusChanged = (int)$subscriber->getStatus() !== $status;
         $emailChanged = $subscriber->getEmail() !== $customer->getEmail();
-        if ($subscriber->getId()
-            && !$statusChanged
-            && (int)$subscriber->getCustomerId() === (int)$customer->getId()
-            && (int)$subscriber->getStoreId() === $storeId
-            && !$emailChanged
-            && $status !== Subscriber::STATUS_NOT_ACTIVE
-        ) {
+        if ($this->dontNeedToSaveSubscriber(
+            $subscriber,
+            $customer,
+            $statusChanged,
+            $storeId,
+            $status,
+            $emailChanged
+        )) {
             return false;
         }
 
@@ -227,6 +228,32 @@ private function saveSubscriber(
         return $status === Subscriber::STATUS_NOT_ACTIVE || $emailChanged;
     }
 
+    /**
+     *
+     * @param Subscriber $subscriber
+     * @param CustomerInterface $customer
+     * @param bool $statusChanged
+     * @param int $storeId
+     * @param int $status
+     * @param bool $emailChanged
+     * @return bool
+     */
+    private function dontNeedToSaveSubscriber(
+        Subscriber $subscriber,
+        CustomerInterface $customer,
+        bool $statusChanged,
+        int $storeId,
+        int $status,
+        bool $emailChanged
+    ): bool {
+        return $subscriber->getId()
+            && !$statusChanged
+            && (int)$subscriber->getCustomerId() === (int)$customer->getId()
+            && (int)$subscriber->getStoreId() === $storeId
+            && !$emailChanged
+            && $status !== Subscriber::STATUS_NOT_ACTIVE;
+    }
+
     /**
      * Get new subscription status
      *

From 1978ed84540aec1e945fa25502d2ae49943e1191 Mon Sep 17 00:00:00 2001
From: Eduard Chitoraga <e.chitoraga@atwix.com>
Date: Wed, 19 Aug 2020 09:11:29 +0300
Subject: [PATCH 1559/1718] Applying schema suggestions

Co-authored-by: Kevin Harper <keharper@users.noreply.github.com>
---
 .../Magento/BundleGraphQl/etc/schema.graphqls |  2 +-
 .../CatalogGraphQl/etc/schema.graphqls        |  4 ++--
 .../etc/schema.graphqls                       |  6 +++---
 .../DownloadableGraphQl/etc/schema.graphqls   |  4 ++--
 .../WishlistGraphQl/etc/schema.graphqls       | 20 +++++++++----------
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/code/Magento/BundleGraphQl/etc/schema.graphqls b/app/code/Magento/BundleGraphQl/etc/schema.graphqls
index 75731516daf4c..a2cba24c7c4d4 100644
--- a/app/code/Magento/BundleGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/BundleGraphQl/etc/schema.graphqls
@@ -119,5 +119,5 @@ type ItemSelectedBundleOptionValue @doc(description: "A list of values for the s
 }
 
 type BundleWishlistItem implements WishlistItemInterface {
-    bundle_options: [SelectedBundleOption!] @doc(description: "An array containing information about the selected bundled items") @resolver(class: "\\Magento\\BundleGraphQl\\Model\\Wishlist\\BundleOptions")
+    bundle_options: [SelectedBundleOption!] @doc(description: "An array containing information about the selected bundle items") @resolver(class: "\\Magento\\BundleGraphQl\\Model\\Wishlist\\BundleOptions")
 }
diff --git a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
index 1a4fd6b8bd986..de4f088aac1d0 100644
--- a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
@@ -493,8 +493,8 @@ type StoreConfig @doc(description: "The type contains information about a store
     root_category_id: Int @doc(description: "The ID of the root category") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\RootCategoryId")
 }
 
-type SimpleWishlistItem implements WishlistItemInterface @doc(description: "Simple Wishlist Item") {
+type SimpleWishlistItem implements WishlistItemInterface @doc(description: "A simple product wishlist Item") {
 }
 
-type VirtualWishlistItem implements WishlistItemInterface @doc(description: "Virtual Wishlist Item") {
+type VirtualWishlistItem implements WishlistItemInterface @doc(description: "A virtual product wishlist item") {
 }
diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
index 6690835237ccf..f66f8f7ee2eac 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
@@ -69,7 +69,7 @@ type SelectedConfigurableOption {
     value_label: String!
 }
 
-type ConfigurableWishlistItem implements WishlistItemInterface {
-    child_sku: String! @doc(description: "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")
+type ConfigurableWishlistItem implements WishlistItemInterface @doc(description: "A configurable product wishlist item"){
+    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")
 }
diff --git a/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls b/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
index 8795b70475f1f..64ef43aa03d1b 100644
--- a/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
@@ -65,7 +65,7 @@ type DownloadableProductSamples @doc(description: "DownloadableProductSamples de
     sample_file: String @deprecated(reason: "`sample_url` serves to get the downloadable sample")
 }
 
-type DownloadableWishlistItem implements WishlistItemInterface @doc(description: "Downloadable Wishlist Item") {
+type DownloadableWishlistItem implements WishlistItemInterface @doc(description: "A downloadable product wishlist item") {
     links_v2: [DownloadableProductLinks] @doc(description: "An array containing information about the selected links") @resolver(class: "\\Magento\\DownloadableGraphQl\\Model\\Wishlist\\ItemLinks")
-    samples: [DownloadableProductSamples] @doc(description: "DownloadableProductSamples defines characteristics of a downloadable product") @resolver(class: "Magento\\DownloadableGraphQl\\Resolver\\Product\\Samples")
+    samples: [DownloadableProductSamples] @doc(description: "An array containing information about the selected samples") @resolver(class: "Magento\\DownloadableGraphQl\\Resolver\\Product\\Samples")
 }
diff --git a/app/code/Magento/WishlistGraphQl/etc/schema.graphqls b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
index bd46c6a90b1d2..9c82ca03323ec 100644
--- a/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
@@ -9,9 +9,9 @@ type Customer {
     wishlists(
         pageSize: Int = 20 @doc(description: "Specifies the maximum number of results to return at once. This attribute is optional."),
         currentPage: Int = 1 @doc(description: "Specifies which page of results to return. The default value is 1.")
-    ): [Wishlist!]! @doc(description: "Customer wishlists are limited to a max of 1 wishlist in Magento Open Source") @resolver(class:"\\Magento\\WishlistGraphQl\\Model\\Resolver\\CustomerWishlists")
-    wishlist: Wishlist! @deprecated(reason: "Use `Customer.wishlists` or `Customer.wishlist_v2`") @resolver(class:"\\Magento\\WishlistGraphQl\\Model\\Resolver\\CustomerWishlistResolver") @doc(description: "Contains the contents of a customer's wish lists")  @cache(cacheable: false)
-    wishlist_v2(id: ID!): Wishlist @doc(description: "Get the customer's wishlist by an ID") @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\WishlistById")
+    ): [Wishlist!]! @doc(description: "An array of wishlists. In Magento Open Source, customers are limited to one wishlist. The number of wishlists is not restricted for Magento Commerce") @resolver(class:"\\Magento\\WishlistGraphQl\\Model\\Resolver\\CustomerWishlists")
+    wishlist: Wishlist! @deprecated(reason: "Use `Customer.wishlists` or `Customer.wishlist_v2`") @resolver(class:"\\Magento\\WishlistGraphQl\\Model\\Resolver\\CustomerWishlistResolver") @doc(description: "Contains a customer's wish lists")  @cache(cacheable: false)
+    wishlist_v2(id: ID!): Wishlist @doc(description: "Retrieve the specified wishlist") @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\WishlistById")
 }
 
 type WishlistOutput @doc(description: "Deprecated: `Wishlist` type should be used instead") {
@@ -25,19 +25,19 @@ type WishlistOutput @doc(description: "Deprecated: `Wishlist` type should be use
 type Wishlist {
     id: ID @doc(description: "Wishlist unique identifier")
     items: [WishlistItem] @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\WishlistItemsResolver") @deprecated(reason: "Use field `items_v2` from type `Wishlist` instead")
-    items_v2: [WishlistItemInterface] @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\WishlistItems") @doc(description: "An array of items in the customer's wishlist")
+    items_v2: [WishlistItemInterface] @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\WishlistItems") @doc(description: "An array of items in the customer's wish list")
     items_count: Int @doc(description: "The number of items in the wish list")
     sharing_code: String @doc(description: "An encrypted code that Magento uses to link to the wish list")
     updated_at: String @doc(description: "The time of the last modification to the wish list")
 }
 
 interface WishlistItemInterface @typeResolver(class: "Magento\\WishlistGraphQl\\Model\\Resolver\\Type\\WishlistItemType") {
-    id: ID
-    quantity: Float
-    description: String
-    added_at: String
-    product: ProductInterface @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\ProductResolver")
-    customizable_options: [SelectedCustomizableOption]
+    id: ID  @doc(description: "The ID of the wish list item")
+    quantity: Float  @doc(description: "The quantity of this wish list item")
+    description: String  @doc(description: "The description of the item")
+    added_at: String  @doc(description: "The date and time the item was added to the wish list")
+    product: ProductInterface @doc(description: "Product details of the wish list item") @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\ProductResolver")
+    customizable_options: [SelectedCustomizableOption] @doc(description: "Custom options selected for the wish list item")
 }
 
 type WishlistItem {

From 14926688ca962842341ca7e930e4537565fb478a Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 19 Aug 2020 09:57:02 +0300
Subject: [PATCH 1560/1718] rename action group

---
 ...p.xml => AdminOpenConfigGeneralAnalyticsPageActionGroup.xml} | 2 +-
 .../Test/Mftf/Test/AdminConfigurationBlankIndustryTest.xml      | 2 +-
 .../Mftf/Test/AdminConfigurationEnableDisableAnalyticsTest.xml  | 2 +-
 .../Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml | 2 +-
 .../Test/Mftf/Test/AdminConfigurationTimeToSendDataTest.xml     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename app/code/Magento/Analytics/Test/Mftf/ActionGroup/{AdminConfigGeneralAnalyticsPageOpenActionGroup.xml => AdminOpenConfigGeneralAnalyticsPageActionGroup.xml} (90%)

diff --git a/app/code/Magento/Analytics/Test/Mftf/ActionGroup/AdminConfigGeneralAnalyticsPageOpenActionGroup.xml b/app/code/Magento/Analytics/Test/Mftf/ActionGroup/AdminOpenConfigGeneralAnalyticsPageActionGroup.xml
similarity index 90%
rename from app/code/Magento/Analytics/Test/Mftf/ActionGroup/AdminConfigGeneralAnalyticsPageOpenActionGroup.xml
rename to app/code/Magento/Analytics/Test/Mftf/ActionGroup/AdminOpenConfigGeneralAnalyticsPageActionGroup.xml
index 713409e2b9a78..bfa3e436e09d0 100644
--- a/app/code/Magento/Analytics/Test/Mftf/ActionGroup/AdminConfigGeneralAnalyticsPageOpenActionGroup.xml
+++ b/app/code/Magento/Analytics/Test/Mftf/ActionGroup/AdminOpenConfigGeneralAnalyticsPageActionGroup.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="AdminConfigGeneralAnalyticsPageOpenActionGroup">
+    <actionGroup name="AdminOpenConfigGeneralAnalyticsPageActionGroup">
         <annotations>
             <description>Open Config General Analytics Page.</description>
         </annotations>
diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationBlankIndustryTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationBlankIndustryTest.xml
index 3f960333f4dcb..a5b01a9221350 100644
--- a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationBlankIndustryTest.xml
+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationBlankIndustryTest.xml
@@ -23,7 +23,7 @@
         <after>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
-        <actionGroup ref="AdminConfigGeneralAnalyticsPageOpenActionGroup" stepKey="amOnAdminConfig"/>
+        <actionGroup ref="AdminOpenConfigGeneralAnalyticsPageActionGroup" stepKey="amOnAdminConfig"/>
         <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>
         <see selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustryLabel}}" userInput="Industry" stepKey="seeAdvancedReportingIndustryLabel"/>
         <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustry}}" userInput="--Please Select--" stepKey="selectAdvancedReportingIndustry"/>
diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationEnableDisableAnalyticsTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationEnableDisableAnalyticsTest.xml
index 35f9e95885c0d..6116dd72528f7 100644
--- a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationEnableDisableAnalyticsTest.xml
+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationEnableDisableAnalyticsTest.xml
@@ -23,7 +23,7 @@
         <after>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
-        <actionGroup ref="AdminConfigGeneralAnalyticsPageOpenActionGroup" stepKey="amOnAdminConfig"/>
+        <actionGroup ref="AdminOpenConfigGeneralAnalyticsPageActionGroup" stepKey="amOnAdminConfig"/>
         <see selector="{{AdminConfigAdvancedReportingSection.advancedReportingServiceLabel}}" userInput="Advanced Reporting Service" stepKey="seeAdvancedReportingServiceLabelEnabled"/>
         <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>
         <see selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustryLabel}}" userInput="Industry" stepKey="seeAdvancedReportingIndustryLabel"/>
diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml
index a6cc8d7853cbe..1a77c365c8098 100644
--- a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml
+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml
@@ -24,7 +24,7 @@
         <after>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
-        <actionGroup ref="AdminConfigGeneralAnalyticsPageOpenActionGroup" stepKey="amOnAdminConfig"/>
+        <actionGroup ref="AdminOpenConfigGeneralAnalyticsPageActionGroup" stepKey="amOnAdminConfig"/>
         <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>
         <see selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustryLabel}}" userInput="Industry" stepKey="seeAdvancedReportingIndustryLabel"/>
         <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustry}}" userInput="Apps and Games" stepKey="selectAdvancedReportingIndustry"/>
diff --git a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationTimeToSendDataTest.xml b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationTimeToSendDataTest.xml
index 020f2cf03974a..60585e73baeaa 100644
--- a/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationTimeToSendDataTest.xml
+++ b/app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationTimeToSendDataTest.xml
@@ -24,7 +24,7 @@
         <after>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
-        <actionGroup ref="AdminConfigGeneralAnalyticsPageOpenActionGroup" stepKey="amOnAdminConfig"/>
+        <actionGroup ref="AdminOpenConfigGeneralAnalyticsPageActionGroup" stepKey="amOnAdminConfig"/>
         <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingService}}" userInput="Enable" stepKey="selectAdvancedReportingServiceEnabled"/>
         <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingIndustry}}" userInput="Apps and Games" stepKey="selectAdvancedReportingIndustry"/>
         <selectOption selector="{{AdminConfigAdvancedReportingSection.advancedReportingHour}}" userInput="23" stepKey="selectAdvancedReportingHour"/>

From ab3db167e1594e935350d4be6494ce1f56c48b4f Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Wed, 19 Aug 2020 12:30:25 +0530
Subject: [PATCH 1561/1718] Fixed static test

---
 app/code/Magento/Newsletter/Model/SubscriptionManager.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Newsletter/Model/SubscriptionManager.php b/app/code/Magento/Newsletter/Model/SubscriptionManager.php
index f01b4784581c3..57c6cd8b843a7 100644
--- a/app/code/Magento/Newsletter/Model/SubscriptionManager.php
+++ b/app/code/Magento/Newsletter/Model/SubscriptionManager.php
@@ -229,6 +229,7 @@ private function saveSubscriber(
     }
 
     /**
+     *  Don't need to save subscriber model
      *
      * @param Subscriber $subscriber
      * @param CustomerInterface $customer

From e40b1ca58f17e2cd0f54995ad6b722165af3c78c Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Wed, 19 Aug 2020 12:03:30 +0300
Subject: [PATCH 1562/1718] add translation

---
 .../Multishipping/Model/Checkout/Type/Multishipping.php        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
index 49212202b5f62..0c1f5d95a0005 100644
--- a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
+++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
@@ -975,7 +975,8 @@ public function getMinimumAmountError()
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
         }
-        return $error;
+
+        return __($error);
     }
 
     /**

From 0994c44a964406f1eae1c4779903c78533111989 Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Wed, 19 Aug 2020 17:04:46 +0800
Subject: [PATCH 1563/1718] 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 61f5cbe2a86a2be90e88cee25c77233c44344c0d Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Wed, 19 Aug 2020 18:47:36 +0800
Subject: [PATCH 1564/1718] 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 090f06a0a832adb64c298f297e0bc2741cd92b9d Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Wed, 19 Aug 2020 14:01:37 +0300
Subject: [PATCH 1565/1718] fix static

---
 .../Magento/Multishipping/Model/Checkout/Type/Multishipping.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
index 0c1f5d95a0005..8845395be406e 100644
--- a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
+++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
@@ -695,7 +695,7 @@ protected function _prepareOrder(\Magento\Quote\Model\Quote\Address $address)
         );
 
         $shippingMethodCode = $address->getShippingMethod();
-        if (isset($shippingMethodCode) && !empty($shippingMethodCode)) {
+        if ($shippingMethodCode) {
             $rate = $address->getShippingRateByCode($shippingMethodCode);
             $shippingPrice = $rate->getPrice();
         } else {

From e2e6b3e095e5b727384a67f54f81f713fd88097a Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Wed, 19 Aug 2020 19:26:49 +0800
Subject: [PATCH 1566/1718] 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 363a100196ae516e616d74050945b07f9343552d Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 19 Aug 2020 14:35:23 +0300
Subject: [PATCH 1567/1718] 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 152c29b6b28a21df854d2924c9cb7b92bde190bc Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 19 Aug 2020 15:08:18 +0300
Subject: [PATCH 1568/1718] rename action group

---
 ...> AdminClickFirstRowEditLinkOnCustomerGridActionGroup.xml} | 2 +-
 .../Test/AdminCreateCustomerRetailerWithoutAddressTest.xml    | 2 +-
 .../Mftf/Test/AdminCreateCustomerWithCountryPolandTest.xml    | 4 ++--
 .../Test/Mftf/Test/AdminCreateCustomerWithCountryUSATest.xml  | 4 ++--
 .../Test/Mftf/Test/AdminCreateCustomerWithCustomGroupTest.xml | 2 +-
 .../Test/Mftf/Test/AdminCreateCustomerWithPrefixTest.xml      | 2 +-
 .../Test/Mftf/Test/AdminCreateCustomerWithoutAddressTest.xml  | 2 +-
 ...AdminCreateNewCustomerOnStorefrontSignupNewsletterTest.xml | 2 +-
 .../Customer/Test/Mftf/Test/AdminCreateNewCustomerTest.xml    | 2 +-
 .../Test/AdminCustomerSubscribeNewsletterPerWebsiteTest.xml   | 2 +-
 .../AddConfigurableProductToOrderFromShoppingCartTest.xml     | 2 +-
 .../Mftf/Test/AddSimpleProductToOrderFromShoppingCartTest.xml | 2 +-
 .../MoveLastOrderedConfigurableProductOnOrderPageTest.xml     | 2 +-
 .../Mftf/Test/MoveLastOrderedSimpleProductOnOrderPageTest.xml | 2 +-
 .../MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml   | 2 +-
 .../MoveRecentlyViewedConfigurableProductOnOrderPageTest.xml  | 2 +-
 .../Test/Mftf/Test/AdminSetUpWatermarkForSwatchImageTest.xml  | 2 +-
 17 files changed, 19 insertions(+), 19 deletions(-)
 rename app/code/Magento/Customer/Test/Mftf/ActionGroup/{AdminCustomerClickFirstRowEditLinkActionGroup.xml => AdminClickFirstRowEditLinkOnCustomerGridActionGroup.xml} (89%)

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerClickFirstRowEditLinkActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminClickFirstRowEditLinkOnCustomerGridActionGroup.xml
similarity index 89%
rename from app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerClickFirstRowEditLinkActionGroup.xml
rename to app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminClickFirstRowEditLinkOnCustomerGridActionGroup.xml
index 1c5c29b855bf5..0cfe9f80d1619 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerClickFirstRowEditLinkActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminClickFirstRowEditLinkOnCustomerGridActionGroup.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="AdminCustomerClickFirstRowEditLinkActionGroup">
+    <actionGroup name="AdminClickFirstRowEditLinkOnCustomerGridActionGroup">
         <annotations>
             <description>Click edit link for first row on the grid.</description>
         </annotations>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerRetailerWithoutAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerRetailerWithoutAddressTest.xml
index 98b488c63a1e0..9f6d8d645e5f4 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerRetailerWithoutAddressTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerRetailerWithoutAddressTest.xml
@@ -50,7 +50,7 @@
         <see userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertEmail"/>
 
         <!--Assert Customer Form -->
-        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickOnEditButton1"/>
+        <actionGroup ref="AdminClickFirstRowEditLinkOnCustomerGridActionGroup" stepKey="clickOnEditButton1"/>
         <click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="clickOnAccountInformation"/>
         <waitForPageLoad stepKey="waitForCustomerInformationPageToLoad"/>
         <see selector="{{AdminCustomerAccountInformationSection.groupIdValue}}" userInput="Retailer" stepKey="seeCustomerGroup1"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryPolandTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryPolandTest.xml
index 7d76b79b97279..782c1599bf489 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryPolandTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryPolandTest.xml
@@ -31,7 +31,7 @@
         <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterTheCustomerByEmail">
             <argument name="email" value="$$createCustomer.email$$"/>
         </actionGroup>
-        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickOnEditButton"/>
+        <actionGroup ref="AdminClickFirstRowEditLinkOnCustomerGridActionGroup" stepKey="clickOnEditButton"/>
 
         <!-- Add the Address -->
         <click selector="{{AdminEditCustomerAddressesSection.addresses}}" stepKey="selectAddress"/>
@@ -66,7 +66,7 @@
         <see userInput="{{PolandAddress.telephone}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertPhoneNumber"/>
 
         <!--Assert Customer Form -->
-        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickOnEditButton1"/>
+        <actionGroup ref="AdminClickFirstRowEditLinkOnCustomerGridActionGroup" stepKey="clickOnEditButton1"/>
         <click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="clickOnAccountInformation"/>
         <waitForPageLoad stepKey="waitForCustomerInformationPageToLoad"/>
         <seeInField selector="{{AdminCustomerAccountInformationSection.firstName}}" userInput="$$createCustomer.firstname$$" stepKey="seeCustomerFirstName"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryUSATest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryUSATest.xml
index 7eecdf67d58b1..304d545fb4c93 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryUSATest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCountryUSATest.xml
@@ -31,7 +31,7 @@
         <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterTheCustomerByEmail">
             <argument name="email" value="$$createCustomer.email$$"/>
         </actionGroup>
-        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickOnEditButton"/>
+        <actionGroup ref="AdminClickFirstRowEditLinkOnCustomerGridActionGroup" stepKey="clickOnEditButton"/>
 
         <!-- Add the Address -->
         <click selector="{{AdminEditCustomerAddressesSection.addresses}}" stepKey="selectAddress"/>
@@ -66,7 +66,7 @@
         <see userInput="{{US_Address_CA.telephone}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertPhoneNumber"/>
 
         <!--Assert Customer Form -->
-        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickOnEditButton1"/>
+        <actionGroup ref="AdminClickFirstRowEditLinkOnCustomerGridActionGroup" stepKey="clickOnEditButton1"/>
         <click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="clickOnAccountInformation"/>
         <waitForPageLoad stepKey="waitForCustomerInformationPageToLoad"/>
         <seeInField selector="{{AdminCustomerAccountInformationSection.firstName}}" userInput="$$createCustomer.firstname$$" stepKey="seeCustomerFirstName"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCustomGroupTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCustomGroupTest.xml
index 84d6d5df5f8f3..7cffd5f304e31 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCustomGroupTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithCustomGroupTest.xml
@@ -54,7 +54,7 @@
         <see userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertEmail"/>
 
         <!--Assert Customer Form -->
-        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickOnEditButton1"/>
+        <actionGroup ref="AdminClickFirstRowEditLinkOnCustomerGridActionGroup" stepKey="clickOnEditButton1"/>
         <click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="clickOnAccountInformation"/>
         <waitForPageLoad stepKey="waitForCustomerInformationPageToLoad"/>
         <see selector="{{AdminCustomerAccountInformationSection.groupIdValue}}" userInput="$$customerGroup.code$$" stepKey="seeCustomerGroup1"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithPrefixTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithPrefixTest.xml
index a03855b9e90c9..eaa3a11edb74e 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithPrefixTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithPrefixTest.xml
@@ -56,7 +56,7 @@
         <see userInput="Male" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertGender"/>
 
         <!--Assert Customer Form -->
-        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickOnEditButton1"/>
+        <actionGroup ref="AdminClickFirstRowEditLinkOnCustomerGridActionGroup" stepKey="clickOnEditButton1"/>
         <click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="clickOnAccountInformation"/>
         <waitForPageLoad stepKey="waitForCustomerInformationPageToLoad"/>
         <seeInField selector="{{AdminCustomerAccountInformationSection.namePrefix}}" userInput="{{CustomerEntityOne.prefix}}" stepKey="seeCustomerNamePrefix"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithoutAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithoutAddressTest.xml
index c707c322529b9..98826b147ad81 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithoutAddressTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerWithoutAddressTest.xml
@@ -49,7 +49,7 @@
         <see userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerGridSection.customerGrid}}" stepKey="assertEmail"/>
 
         <!--Assert Customer Form -->
-        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickOnEditButton1"/>
+        <actionGroup ref="AdminClickFirstRowEditLinkOnCustomerGridActionGroup" stepKey="clickOnEditButton1"/>
         <click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="clickOnAccountInformation"/>
         <waitForPageLoad stepKey="waitForCustomerInformationPageToLoad"/>
         <seeInField selector="{{AdminCustomerAccountInformationSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="seeCustomerFirstName"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerOnStorefrontSignupNewsletterTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerOnStorefrontSignupNewsletterTest.xml
index 67546a88425b3..683b275ca1ed6 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerOnStorefrontSignupNewsletterTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerOnStorefrontSignupNewsletterTest.xml
@@ -45,7 +45,7 @@
         <see selector="{{AdminCustomerGridSection.customerGrid}}" userInput="{{CustomerEntityOne.email}}" stepKey="seeAssertCustomerEmailInGrid"/>
 
         <!--Assert verify created new customer is subscribed to newsletter-->
-        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickFirstRowEditLink"/>
+        <actionGroup ref="AdminClickFirstRowEditLinkOnCustomerGridActionGroup" stepKey="clickFirstRowEditLink"/>
         <click selector="{{AdminEditCustomerInformationSection.newsLetter}}" stepKey="clickNewsLetter"/>
         <waitForPageLoad stepKey="waitForNewsletterTabToOpen"/>
         <seeCheckboxIsChecked selector="{{AdminEditCustomerNewsletterSection.subscribedStatus('1')}}" stepKey="seeAssertSubscribedToNewsletterCheckboxIsChecked"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerTest.xml
index 9583e5d6109c5..5edb9d08da46d 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerTest.xml
@@ -42,7 +42,7 @@
             <argument name="email" value="{{CustomerEntityOne.email}}"/>
         </actionGroup>
         <waitForPageLoad stepKey="waitForPageToLoad"/>
-        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickOnEditButton1"/>
+        <actionGroup ref="AdminClickFirstRowEditLinkOnCustomerGridActionGroup" stepKey="clickOnEditButton1"/>
 
         <!-- Assert Customer Title -->
         <click selector="{{AdminCustomerAccountInformationSection.accountInformationButton}}" stepKey="clickOnAccountInformation"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomerSubscribeNewsletterPerWebsiteTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomerSubscribeNewsletterPerWebsiteTest.xml
index ffcc543609e37..87111ec6fba1a 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomerSubscribeNewsletterPerWebsiteTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCustomerSubscribeNewsletterPerWebsiteTest.xml
@@ -53,7 +53,7 @@
         <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCustomerGrid">
             <argument name="email" value="{{CustomerEntityOne.email}}"/>
         </actionGroup>
-        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickToEditCustomerPage"/>
+        <actionGroup ref="AdminClickFirstRowEditLinkOnCustomerGridActionGroup" stepKey="clickToEditCustomerPage"/>
         <grabFromCurrentUrl regex="~(\d+)/~" stepKey="grabCustomerId"/>
         <!-- Assert that created customer is subscribed to newsletter on the new Store View -->
         <actionGroup ref="AdminAssertCustomerIsSubscribedToNewslettersAndSelectedStoreView" stepKey="assertSubscribedToNewsletter">
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AddConfigurableProductToOrderFromShoppingCartTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AddConfigurableProductToOrderFromShoppingCartTest.xml
index 45bd7ee3e0deb..127fd1dd4e006 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AddConfigurableProductToOrderFromShoppingCartTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AddConfigurableProductToOrderFromShoppingCartTest.xml
@@ -97,7 +97,7 @@
         <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCreatedCustomer">
             <argument name="email" value="$$createCustomer.email$$"/>
         </actionGroup>
-        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickEditButton"/>
+        <actionGroup ref="AdminClickFirstRowEditLinkOnCustomerGridActionGroup" stepKey="clickEditButton"/>
 
         <!-- Click create order -->
         <click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AddSimpleProductToOrderFromShoppingCartTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AddSimpleProductToOrderFromShoppingCartTest.xml
index 60c33d68354ce..701b7ebe4a958 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AddSimpleProductToOrderFromShoppingCartTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AddSimpleProductToOrderFromShoppingCartTest.xml
@@ -58,7 +58,7 @@
         <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCreatedCustomer">
             <argument name="email" value="$$createCustomer.email$$"/>
         </actionGroup>
-        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickEditButton"/>
+        <actionGroup ref="AdminClickFirstRowEditLinkOnCustomerGridActionGroup" stepKey="clickEditButton"/>
 
         <!-- Click create order -->
         <click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/MoveLastOrderedConfigurableProductOnOrderPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/MoveLastOrderedConfigurableProductOnOrderPageTest.xml
index 3d5b54daa7c8f..8e9e117d2d995 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/MoveLastOrderedConfigurableProductOnOrderPageTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/MoveLastOrderedConfigurableProductOnOrderPageTest.xml
@@ -96,7 +96,7 @@
         <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCreatedCustomer">
             <argument name="email" value="$$createCustomer.email$$"/>
         </actionGroup>
-        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickEditButton"/>
+        <actionGroup ref="AdminClickFirstRowEditLinkOnCustomerGridActionGroup" stepKey="clickEditButton"/>
 
         <!-- Click create order -->
         <click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/MoveLastOrderedSimpleProductOnOrderPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/MoveLastOrderedSimpleProductOnOrderPageTest.xml
index 8faedb24e600e..71da699e533bc 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/MoveLastOrderedSimpleProductOnOrderPageTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/MoveLastOrderedSimpleProductOnOrderPageTest.xml
@@ -46,7 +46,7 @@
         <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCreatedCustomer">
             <argument name="email" value="$$createCustomer.email$$"/>
         </actionGroup>
-        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickEditButton"/>
+        <actionGroup ref="AdminClickFirstRowEditLinkOnCustomerGridActionGroup" stepKey="clickEditButton"/>
 
         <!-- Click create order -->
         <click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml
index 980bc272c3643..452d65ea5ae57 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedBundleFixedProductOnOrderPageTest.xml
@@ -96,7 +96,7 @@
         <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCreatedCustomer">
             <argument name="email" value="$$createCustomer.email$$"/>
         </actionGroup>
-        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickEditButton"/>
+        <actionGroup ref="AdminClickFirstRowEditLinkOnCustomerGridActionGroup" stepKey="clickEditButton"/>
 
         <!-- Click create order -->
         <click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedConfigurableProductOnOrderPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedConfigurableProductOnOrderPageTest.xml
index 0bff169c4a68e..4d1ebddc7c2b3 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedConfigurableProductOnOrderPageTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/MoveRecentlyViewedConfigurableProductOnOrderPageTest.xml
@@ -99,7 +99,7 @@
         <actionGroup ref="AdminFilterCustomerByEmail" stepKey="filterCreatedCustomer">
             <argument name="email" value="$$createCustomer.email$$"/>
         </actionGroup>
-        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickEditButton"/>
+        <actionGroup ref="AdminClickFirstRowEditLinkOnCustomerGridActionGroup" stepKey="clickEditButton"/>
 
         <!-- Click create order -->
         <click selector="{{AdminCustomerMainActionsSection.createOrderBtn}}" stepKey="clickCreateOrder"/>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/AdminSetUpWatermarkForSwatchImageTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/AdminSetUpWatermarkForSwatchImageTest.xml
index d615c1478d6d7..07ce30b702f91 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/AdminSetUpWatermarkForSwatchImageTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/AdminSetUpWatermarkForSwatchImageTest.xml
@@ -38,7 +38,7 @@
         </actionGroup>
         <!-- Select Edit next to the Default Store View -->
         <comment userInput="Select Edit next to the Default Store View" stepKey="commentEditDefaultView"/>
-        <actionGroup ref="AdminCustomerClickFirstRowEditLinkActionGroup" stepKey="clickToEditDefaultStoreView"/>
+        <actionGroup ref="AdminClickFirstRowEditLinkOnCustomerGridActionGroup" stepKey="clickToEditDefaultStoreView"/>
         <!-- Expand the Product Image Watermarks section-->
         <comment userInput="Expand the Product Image Watermarks section" stepKey="commentOpenWatermarksSection"/>
         <click selector="{{AdminDesignConfigSection.watermarkSectionHeader}}" stepKey="clickToProductImageWatermarks"/>

From 5a70b81a23733856bfd7d4e74e23106f97d245d9 Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Wed, 19 Aug 2020 20:12:00 +0800
Subject: [PATCH 1569/1718] 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 1aca7257e912113e22f45fe3f601b00c396774b8 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 19 Aug 2020 15:14:09 +0300
Subject: [PATCH 1570/1718] rename action group

---
 .../StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml    | 2 +-
 ...ctionGroup.xml => AdminClickAddTaxRuleButtonActionGroup.xml} | 2 +-
 .../Tax/Test/Mftf/Test/AdminCreateDefaultsTaxRuleTest.xml       | 2 +-
 .../Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml      | 2 +-
 .../Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml   | 2 +-
 .../Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml  | 2 +-
 .../Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml   | 2 +-
 .../AdminCreateTaxRuleWithCustomerAndProductTaxClassTest.xml    | 2 +-
 ...thNewAndExistingTaxRateAndCustomerAndProductTaxClassTest.xml | 2 +-
 .../Test/AdminCreateTaxRuleWithNewTaxClassesAndTaxRateTest.xml  | 2 +-
 .../Tax/Test/Mftf/Test/AdminCreateTaxRuleWithZipRangeTest.xml   | 2 +-
 app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)
 rename app/code/Magento/Tax/Test/Mftf/ActionGroup/{AdminClickButtonAddTaxRuleActionGroup.xml => AdminClickAddTaxRuleButtonActionGroup.xml} (90%)

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml
index 7ace592b7ae73..e6ad4907f8955 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutUsingFreeShippingAndTaxesTest.xml
@@ -120,7 +120,7 @@
 
         <!-- Create a Tax Rule -->
         <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
-        <actionGroup ref="AdminClickButtonAddTaxRuleActionGroup" stepKey="clickAddNewTaxRuleButton"/>
+        <actionGroup ref="AdminClickAddTaxRuleButtonActionGroup" stepKey="clickAddNewTaxRuleButton"/>
 
         <!-- Create a tax rule with defaults -->
         <fillField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode1"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminClickButtonAddTaxRuleActionGroup.xml b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminClickAddTaxRuleButtonActionGroup.xml
similarity index 90%
rename from app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminClickButtonAddTaxRuleActionGroup.xml
rename to app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminClickAddTaxRuleButtonActionGroup.xml
index 313c4c5e84af0..ea5c4cb74d19e 100644
--- a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminClickButtonAddTaxRuleActionGroup.xml
+++ b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminClickAddTaxRuleButtonActionGroup.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="AdminClickButtonAddTaxRuleActionGroup">
+    <actionGroup name="AdminClickAddTaxRuleButtonActionGroup">
         <annotations>
             <description>Click button for creating new tax rule.</description>
         </annotations>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateDefaultsTaxRuleTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateDefaultsTaxRuleTest.xml
index 9629740f1cd20..5e7ce53a3a3fc 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateDefaultsTaxRuleTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateDefaultsTaxRuleTest.xml
@@ -30,7 +30,7 @@
         </after>
 
         <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
-        <actionGroup ref="AdminClickButtonAddTaxRuleActionGroup" stepKey="clickAddNewTaxRuleButton"/>
+        <actionGroup ref="AdminClickAddTaxRuleButtonActionGroup" stepKey="clickAddNewTaxRuleButton"/>
         <!-- Create a tax rule with defaults -->
         <fillField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode1"/>
         <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="$$initialTaxRate.code$$" stepKey="fillTaxRateSearch"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml
index 641278d02e726..89cfdd0eb9943 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateLargeRateTest.xml
@@ -59,7 +59,7 @@
 
         <!-- Verify we see expected values on the tax rule form page -->
         <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
-        <actionGroup ref="AdminClickButtonAddTaxRuleActionGroup" stepKey="clickAdd"/>
+        <actionGroup ref="AdminClickAddTaxRuleButtonActionGroup" stepKey="clickAdd"/>
         <see selector="{{AdminTaxRulesSection.taxRateMultiSelectItems}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxRateOnNewTaxRulePage"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml
index f454ceced7a3d..a3386cada436f 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateSpecificPostcodeTest.xml
@@ -58,7 +58,7 @@
 
         <!-- Verify we see expected values on the tax rule form page -->
         <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
-        <actionGroup ref="AdminClickButtonAddTaxRuleActionGroup" stepKey="clickAdd"/>
+        <actionGroup ref="AdminClickAddTaxRuleButtonActionGroup" stepKey="clickAdd"/>
         <see selector="{{AdminTaxRulesSection.taxRateMultiSelectItems}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxRateOnNewTaxRulePage"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml
index 9712a605a5bf4..6ceeae953139c 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateWiderZipCodeRangeTest.xml
@@ -60,7 +60,7 @@
 
         <!-- Verify we see expected values on the tax rule form page -->
         <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
-        <actionGroup ref="AdminClickButtonAddTaxRuleActionGroup" stepKey="clickAdd"/>
+        <actionGroup ref="AdminClickAddTaxRuleButtonActionGroup" stepKey="clickAdd"/>
         <see selector="{{AdminTaxRulesSection.taxRateMultiSelectItems}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxRateOnNewTaxRulePage"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml
index 2734a57aa312c..4f9e876fed696 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRateZipCodeRangeTest.xml
@@ -62,7 +62,7 @@
 
         <!-- Verify we see expected values on the tax rule form page -->
         <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
-        <actionGroup ref="AdminClickButtonAddTaxRuleActionGroup" stepKey="clickAdd"/>
+        <actionGroup ref="AdminClickAddTaxRuleButtonActionGroup" stepKey="clickAdd"/>
         <see selector="{{AdminTaxRulesSection.taxRateMultiSelectItems}}" userInput="{{SimpleTaxRate.code}}" stepKey="seeTaxRateOnNewTaxRulePage"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithCustomerAndProductTaxClassTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithCustomerAndProductTaxClassTest.xml
index c309db52cb194..f1a48af741cd6 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithCustomerAndProductTaxClassTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithCustomerAndProductTaxClassTest.xml
@@ -40,7 +40,7 @@
         </after>
 
         <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
-        <actionGroup ref="AdminClickButtonAddTaxRuleActionGroup" stepKey="clickAddNewTaxRuleButton"/>
+        <actionGroup ref="AdminClickAddTaxRuleButtonActionGroup" stepKey="clickAddNewTaxRuleButton"/>
 
         <!-- Create a tax rule with customer and product class -->
         <fillField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode1"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewAndExistingTaxRateAndCustomerAndProductTaxClassTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewAndExistingTaxRateAndCustomerAndProductTaxClassTest.xml
index 2aaebb0ca5c3e..de7a0fb2d9144 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewAndExistingTaxRateAndCustomerAndProductTaxClassTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewAndExistingTaxRateAndCustomerAndProductTaxClassTest.xml
@@ -41,7 +41,7 @@
         </after>
 
         <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
-        <actionGroup ref="AdminClickButtonAddTaxRuleActionGroup" stepKey="clickAddNewTaxRuleButton"/>
+        <actionGroup ref="AdminClickAddTaxRuleButtonActionGroup" stepKey="clickAddNewTaxRuleButton"/>
 
         <!-- Create a tax rule with new and existing tax rate, customer tax class, product tax class -->
         <fillField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode1"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewTaxClassesAndTaxRateTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewTaxClassesAndTaxRateTest.xml
index d0e9242f3618b..4798ec60ab898 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewTaxClassesAndTaxRateTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithNewTaxClassesAndTaxRateTest.xml
@@ -41,7 +41,7 @@
         </after>
 
         <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
-        <actionGroup ref="AdminClickButtonAddTaxRuleActionGroup" stepKey="clickAddNewTaxRuleButton"/>
+        <actionGroup ref="AdminClickAddTaxRuleButtonActionGroup" stepKey="clickAddNewTaxRuleButton"/>
 
         <!-- Create a tax rule with new tax classes and tax rate -->
         <fillField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode1"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithZipRangeTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithZipRangeTest.xml
index 0c324f137b84f..a08c878ba2063 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithZipRangeTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/AdminCreateTaxRuleWithZipRangeTest.xml
@@ -41,7 +41,7 @@
         </after>
 
         <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex1"/>
-        <actionGroup ref="AdminClickButtonAddTaxRuleActionGroup" stepKey="clickAddNewTaxRuleButton"/>
+        <actionGroup ref="AdminClickAddTaxRuleButtonActionGroup" stepKey="clickAddNewTaxRuleButton"/>
 
         <!-- Create a tax rule with new tax classes and tax rate -->
         <fillField selector="{{AdminTaxRuleFormSection.code}}" userInput="{{SimpleTaxRule.code}}" stepKey="fillTaxRuleCode1"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml
index 99d9d12d7d182..eb774297b8322 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/DeleteTaxRateEntityTest.xml
@@ -44,7 +44,7 @@
 
         <!-- Confirm Deleted TaxIdentifier on the tax rule grid page -->
         <actionGroup ref="AdminTaxRuleGridOpenPageActionGroup" stepKey="goToTaxRuleIndex3"/>
-        <actionGroup ref="AdminClickButtonAddTaxRuleActionGroup" stepKey="clickAddNewTaxRuleButton"/>
+        <actionGroup ref="AdminClickAddTaxRuleButtonActionGroup" stepKey="clickAddNewTaxRuleButton"/>
         <fillField selector="{{AdminTaxRuleFormSection.taxRateSearch}}" userInput="$$initialTaxRate.code$$" stepKey="fillTaxRateSearch"/>
         <wait stepKey="waitForSearch" time="5" />
         <dontSee selector="{{AdminTaxRuleFormSection.fieldTaxRate}}" userInput="$$initialTaxRate.code$$" stepKey="dontSeeInTaxRuleForm"/>

From 702d201af93f3560dcfa5d46a209aa2a1d8a1dd8 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 19 Aug 2020 15:32:11 +0300
Subject: [PATCH 1571/1718] Cover filters functionality

---
 ...AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml | 2 +-
 ...aGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
index d68fd4cb7cca8..87dcc5513f1b2 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
@@ -68,6 +68,6 @@
         </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..866b1e1a30e33 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
@@ -57,5 +57,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 ff37e3f92b5c4d31e473bca3611e6f234e6dbbd6 Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Wed, 19 Aug 2020 20:34:12 +0800
Subject: [PATCH 1572/1718] magento/adobe-stock-integration#1504:[Related PR]
 Insert rendition images to the content from media gallery instead of original
 images - Extract logic from controller to a model to enable before plugin
 interception of parameters

---
 .../Adminhtml/Wysiwyg/Images/OnInsert.php     | 30 ++++------
 .../Cms/Model/Wysiwyg/Images/PrepareImage.php | 60 +++++++++++++++++++
 2 files changed, 71 insertions(+), 19 deletions(-)
 create mode 100644 app/code/Magento/Cms/Model/Wysiwyg/Images/PrepareImage.php

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
index 3244a7d14f0a3..6862efc924ab6 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
@@ -13,17 +13,25 @@ class OnInsert extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
      */
     protected $resultRawFactory;
 
+    /**
+     * @var \Magento\Cms\Model\Wysiwyg\Images\PrepareImage
+     */
+    protected $prepareImage;
+
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+     * @param \Magento\Cms\Model\Wysiwyg\Images\PrepareImage $prepareImage
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Framework\Registry $coreRegistry,
-        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory,
+        \Magento\Cms\Model\Wysiwyg\Images\PrepareImage $prepareImage
     ) {
         $this->resultRawFactory = $resultRawFactory;
+        $this->prepareImage = $prepareImage;
         parent::__construct($context, $coreRegistry);
     }
 
@@ -34,26 +42,10 @@ public function __construct(
      */
     public function execute()
     {
-        $imagesHelper = $this->_objectManager->get(\Magento\Cms\Helper\Wysiwyg\Images::class);
         $request = $this->getRequest();
 
-        $storeId = $request->getParam('store');
-
-        $filename = $request->getParam('filename');
-        $filename = $imagesHelper->idDecode($filename);
-
-        $asIs = $request->getParam('as_is');
-
-        $forceStaticPath = $request->getParam('force_static_path');
-
-        $this->_objectManager->get(\Magento\Catalog\Helper\Data::class)->setStoreId($storeId);
-        $imagesHelper->setStoreId($storeId);
-
-        if ($forceStaticPath) {
-            $image = parse_url($imagesHelper->getCurrentUrl() . $filename, PHP_URL_PATH);
-        } else {
-            $image = $imagesHelper->getImageHtmlDeclaration($filename, $asIs);
-        }
+        /** @var \Magento\Cms\Model\Wysiwyg\Images\PrepareImage $image */
+        $image = $this->prepareImage->execute($request->getParams());
 
         /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */
         $resultRaw = $this->resultRawFactory->create();
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/PrepareImage.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/PrepareImage.php
new file mode 100644
index 0000000000000..852db8e9a0a78
--- /dev/null
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/PrepareImage.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Cms\Model\Wysiwyg\Images;
+
+use Magento\Catalog\Helper\Data;
+use Magento\Cms\Helper\Wysiwyg\Images as ImagesHelper;
+
+class PrepareImage
+{
+    /**
+     * @var ImagesHelper
+     */
+    private $imagesHelper;
+
+    /**
+     * @var Data
+     */
+    private $catalogHelper;
+
+    /**
+     * PrepareImage constructor.
+     * @param ImagesHelper $imagesHelper
+     * @param Data $catalogHelper
+     */
+    public function __construct(
+        ImagesHelper $imagesHelper,
+        Data $catalogHelper
+    ) {
+        $this->imagesHelper = $imagesHelper;
+        $this->catalogHelper = $catalogHelper;
+    }
+
+    /**
+     * @param array $data
+     * @return string
+     */
+    public function execute(array $data): string
+    {
+        $filename = $this->imagesHelper->idDecode($data['filename']);
+        $storeId = (int)$data['store_id'];
+
+        $this->catalogHelper->setStoreId($storeId);
+        $this->imagesHelper->setStoreId($storeId);
+
+        if ($data['force_static_path']) {
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
+            $image = parse_url($this->imagesHelper->getCurrentUrl() . $filename, PHP_URL_PATH);
+        } else {
+            $image = $this->imagesHelper->getImageHtmlDeclaration($filename, $data['as_is']);
+        }
+
+        return $image;
+    }
+}

From 716ca4d85d3354fb37e8ed70055a22c3433dcfff Mon Sep 17 00:00:00 2001
From: Arnob Saha <arnobsh@gmail.com>
Date: Wed, 12 Aug 2020 18:58:34 -0500
Subject: [PATCH 1573/1718] MC-34091: Recently compared products widget
 sometimes not appear on page

- Removing unstable broken MFTF test
---
 ...rontRecentlyComparedAtWebsiteLevelTest.xml | 108 ------------------
 1 file changed, 108 deletions(-)
 delete mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyComparedAtWebsiteLevelTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyComparedAtWebsiteLevelTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyComparedAtWebsiteLevelTest.xml
deleted file mode 100644
index 7ec5fea49f64b..0000000000000
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyComparedAtWebsiteLevelTest.xml
+++ /dev/null
@@ -1,108 +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="StoreFrontRecentlyComparedAtWebsiteLevelTest">
-        <annotations>
-            <features value="Catalog"/>
-            <stories value="Recently Compared Product"/>
-            <title value="Recently Compared Product at website level"/>
-            <description value="Recently Compared Products widget appears on a page immediately after adding product to compare"/>
-            <severity value="MAJOR"/>
-            <testCaseId value="MC-33099"/>
-            <useCaseId value="MC-32763"/>
-            <group value="catalog"/>
-            <group value="widget"/>
-            <skip>
-                <issueId value="MC-34091"/>
-            </skip>
-        </annotations>
-        <before>
-            <!--  Set Stores > Configurations > Catalog > Recently Viewed/Compared Products > Show for Current = Website -->
-            <magentoCLI command="config:set {{RecentlyViewedProductScopeWebsite.path}} {{RecentlyViewedProductScopeWebsite.value}}" stepKey="setRecentlyViewedComparedProductsScopeToWebsite"/>
-            <!--Create Simple Products and Category -->
-            <createData entity="SimpleSubCategory" stepKey="createCategory"/>
-            <createData entity="SimpleProduct" stepKey="createSimpleProductToCompareFirst">
-                <requiredEntity createDataKey="createCategory"/>
-            </createData>
-            <createData entity="SimpleProduct" stepKey="createSimpleProductToCompareSecond">
-                <requiredEntity createDataKey="createCategory"/>
-            </createData>
-            <createData entity="SimpleProduct" stepKey="createSimpleProductNotVisibleFirst">
-                <requiredEntity createDataKey="createCategory"/>
-            </createData>
-            <createData entity="SimpleProduct" stepKey="createSimpleProductNotVisibleSecond">
-                <requiredEntity createDataKey="createCategory"/>
-            </createData>
-            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-            <!-- Login as admin -->
-            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-            <!-- Create product widget -->
-            <actionGroup ref="AdminCreateRecentlyProductsWidgetActionGroup" stepKey="createRecentlyComparedProductsWidget">
-                <argument name="widget" value="RecentlyComparedProductsWidget"/>
-            </actionGroup>
-        </before>
-        <after>
-            <!-- Reset Stores > Configurations > Catalog > Recently Viewed/Compared Products > Show for Current = Website-->
-            <magentoCLI command="config:set {{RecentlyViewedProductScopeWebsite.path}} {{RecentlyViewedProductScopeWebsite.value}}" stepKey="setRecentlyViewedComparedProductsScopeToDefault"/>
-            <!-- Delete Products and Category -->
-            <deleteData createDataKey="createSimpleProductToCompareFirst" stepKey="deleteSimpleProductToCompareFirst"/>
-            <deleteData createDataKey="createSimpleProductToCompareSecond" stepKey="deleteSimpleProductToCompareSecond"/>
-            <deleteData createDataKey="createSimpleProductNotVisibleFirst" stepKey="deleteSimpleProductNotVisibleFirst"/>
-            <deleteData createDataKey="createSimpleProductNotVisibleSecond" stepKey="deleteSimpleProductNotVisibleSecond"/>
-            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-            <!-- Customer Logout -->
-            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutFromCustomer"/>
-            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
-            <!-- Delete product widget -->
-            <actionGroup ref="AdminDeleteWidgetActionGroup" stepKey="deleteRecentlyComparedProductsWidget">
-                <argument name="widget" value="RecentlyComparedProductsWidget"/>
-            </actionGroup>
-            <!-- Logout Admin -->
-            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
-        </after>
-        <!--Login to storefront from customer-->
-        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginCustomer">
-            <argument name="Customer" value="$createCustomer$"/>
-        </actionGroup>
-        <see userInput="Welcome, $createCustomer.firstname$ $createCustomer.lastname$!" selector="{{StorefrontPanelHeaderSection.welcomeMessage}}" stepKey="checkWelcomeMessage"/>
-        <amOnPage url="{{StorefrontCategoryPage.url($createCategory.custom_attributes[url_key]$)}}" stepKey="openCategoryPage"/>
-        <!--Add to compare Simple Product and Simple Product 2-->
-        <actionGroup ref="StorefrontAddCategoryProductToCompareActionGroup" stepKey="addSimpleProduct1ToCompare" >
-            <argument name="productVar" value="$createSimpleProductToCompareFirst$"/>
-        </actionGroup>
-        <actionGroup ref="StorefrontAddCategoryProductToCompareActionGroup" stepKey="addSimpleProduct2ToCompare" >
-            <argument name="productVar" value="$createSimpleProductToCompareSecond$"/>
-        </actionGroup>
-        <!--The Compare Products widget displays Simple Product 1 and Simple Product 2-->
-        <actionGroup ref="StorefrontCheckCompareSidebarProductActionGroup" stepKey="checkSimpleProduct1InCompareSidebar">
-            <argument name="productVar" value="$createSimpleProductToCompareFirst$"/>
-        </actionGroup>
-        <actionGroup ref="StorefrontCheckCompareSidebarProductActionGroup" stepKey="checkSimpleProduct2InCompareSidebar">
-            <argument name="productVar" value="$createSimpleProductToCompareSecond$"/>
-        </actionGroup>
-
-        <!--Click Clear all in the Compare Products widget-->
-        <actionGroup ref="StorefrontClearCompareActionGroup" stepKey="clearCompareList"/>
-        <!--The Recently Compared widget displays Simple Product 1 and Simple Product 2-->
-        <waitForPageLoad stepKey="waitForRecentlyComparedWidgetLoad"/>
-        <actionGroup ref="StorefrontAssertProductInRecentlyComparedWidgetActionGroup" stepKey="checkSimpleProduct1ExistInRecentlyComparedWidget">
-            <argument name="product" value="$createSimpleProductToCompareFirst$"/>
-        </actionGroup>
-        <actionGroup ref="StorefrontAssertProductInRecentlyComparedWidgetActionGroup" stepKey="checkSimpleProduct2ExistInRecentlyComparedWidget">
-            <argument name="product" value="$createSimpleProductToCompareSecond$"/>
-        </actionGroup>
-        <!--The Recently Compared widget not displays Simple Product 3 and Simple Product 4-->
-        <actionGroup ref="StorefrontAssertNotExistProductInRecentlyComparedWidgetActionGroup" stepKey="checkSimpleProduct3NotExistInRecentlyComparedWidget">
-            <argument name="product" value="$createSimpleProductNotVisibleFirst$"/>
-        </actionGroup>
-        <actionGroup ref="StorefrontAssertNotExistProductInRecentlyComparedWidgetActionGroup" stepKey="checkSimpleProduct4NotExistInRecentlyComparedWidget">
-            <argument name="product" value="$createSimpleProductNotVisibleSecond$"/>
-        </actionGroup>
-    </test>
-</tests>

From 37570780174507183909ff1e8b822b0737f944fc Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 19 Aug 2020 15:56:27 +0300
Subject: [PATCH 1574/1718] 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 a246993700ecca5abbe32128fc2735a5110abdd5 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 19 Aug 2020 16:31:09 +0300
Subject: [PATCH 1575/1718] 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 02934d4d87bbb8c7da3fa3cb0c8b8f8ac6f9faf9 Mon Sep 17 00:00:00 2001
From: Buba Suma <soumah@adobe.com>
Date: Mon, 17 Aug 2020 17:39:57 -0500
Subject: [PATCH 1576/1718] MC-36258: customer/section/load are failing with a
 400 error

- Fix error The "checkout-fields" section source isn't supported
---
 .../view/frontend/web/js/customer-data.js     |   3 +
 .../frontend/js/customer-data.test.js         | 213 ++++++++++++++++++
 2 files changed, 216 insertions(+)
 create mode 100644 dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/customer-data.test.js

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 5c9bf431bac1d..5321dfecba182 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
@@ -261,6 +261,9 @@ define([
                 }
             });
 
+            //remove expired section names of previously installed/enable modules
+            expiredSectionNames = _.intersection(expiredSectionNames, sectionConfig.getSectionNames());
+
             return _.uniq(expiredSectionNames);
         },
 
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/customer-data.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/customer-data.test.js
new file mode 100644
index 0000000000000..7063b846ed166
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/customer-data.test.js
@@ -0,0 +1,213 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/*eslint-disable max-nested-callbacks*/
+/*jscs:disable jsDoc*/
+
+define([
+    'jquery',
+    'underscore',
+    'Magento_Customer/js/section-config',
+    'Magento_Customer/js/customer-data'
+], function (
+    $,
+    _,
+    sectionConfig,
+    customerData
+) {
+    'use strict';
+
+    var sectionConfigSettings = {
+            baseUrls: [
+                'http://localhost/'
+            ],
+            sections: {
+                'customer/account/loginpost': ['*'],
+                'checkout/cart/add': ['cart'],
+                'rest/*/v1/guest-carts/*/selected-payment-method': ['cart','checkout-data'],
+                '*': ['messages']
+            },
+            clientSideSections: [
+                'checkout-data',
+                'cart-data'
+            ],
+            sectionNames: [
+                'customer',
+                'product_data_storage',
+                'cart',
+                'messages'
+            ]
+        },
+        cookieLifeTime = 3600,
+        jQueryGetJSON;
+
+    function init(config) {
+        var defaultConfig = {
+            sectionLoadUrl: 'http://localhost/customer/section/load/',
+            expirableSectionLifetime: 60, // minutes
+            expirableSectionNames: ['cart'],
+            cookieLifeTime: cookieLifeTime,
+            updateSessionUrl: 'http://localhost/customer/account/updateSession/'
+        };
+
+        customerData['Magento_Customer/js/customer-data']($.extend({}, defaultConfig, config || {}));
+    }
+
+    function setupLocalStorage(sections) {
+        var mageCacheStorage = {},
+            sectionDataIds = {};
+
+        _.each(sections, function (sectionData, sectionName) {
+            sectionDataIds[sectionName] = sectionData['data_id'];
+
+            if (typeof sectionData.content !== 'undefined') {
+                mageCacheStorage[sectionName] = sectionData;
+            }
+        });
+
+        $.localStorage.set(
+            'mage-cache-storage',
+            mageCacheStorage
+        );
+        $.cookieStorage.set(
+            'section_data_ids',
+            sectionDataIds
+        );
+
+        $.localStorage.set(
+            'mage-cache-timeout',
+            new Date(Date.now() + cookieLifeTime * 1000)
+        );
+        $.cookieStorage.set(
+            'mage-cache-sessid',
+            true
+        );
+    }
+
+    function clearLocalStorage() {
+        $.cookieStorage.set('section_data_ids', {});
+
+        if (window.localStorage) {
+            window.localStorage.clear();
+        }
+    }
+
+    describe('Magento_Customer/js/customer-data', function () {
+        beforeAll(function () {
+            clearLocalStorage();
+        });
+
+        beforeEach(function () {
+            jQueryGetJSON = $.getJSON;
+            sectionConfig['Magento_Customer/js/section-config'](sectionConfigSettings);
+        });
+
+        afterEach(function () {
+            $.getJSON = jQueryGetJSON;
+            clearLocalStorage();
+        });
+
+        describe('getExpiredSectionNames()', function () {
+            it('check that result contains expired section names', function () {
+                setupLocalStorage({
+                    'cart': {
+                        'data_id': Math.floor(Date.now() / 1000) - 61 * 60, // 61 minutes ago
+                        'content': {}
+                    }
+                });
+                init();
+                expect(customerData.getExpiredSectionNames()).toEqual(['cart']);
+            });
+
+            it('check that result doest not contain unexpired section names', function () {
+                setupLocalStorage({
+                    'cart': {
+                        'data_id': Math.floor(Date.now() / 1000) + 60, // in 1 minute
+                        'content': {}
+                    }
+                });
+                init();
+                expect(customerData.getExpiredSectionNames()).toEqual([]);
+            });
+
+            it('check that result contains invalidated section names', function () {
+                setupLocalStorage({
+                    'cart': { // without storage content
+                        'data_id': Math.floor(Date.now() / 1000) + 60 // in 1 minute
+                    }
+                });
+
+                init();
+                expect(customerData.getExpiredSectionNames()).toEqual(['cart']);
+            });
+
+            it('check that result does not contain unsupported section names', function () {
+                setupLocalStorage({
+                    'catalog': { // without storage content
+                        'data_id': Math.floor(Date.now() / 1000) + 60 // in 1 minute
+                    }
+                });
+
+                init();
+                expect(customerData.getExpiredSectionNames()).toEqual([]);
+            });
+        });
+
+        describe('init()', function () {
+            it('check that sections are not requested from server, if there are no expired sections', function () {
+                setupLocalStorage({
+                    'catalog': { // without storage content
+                        'data_id': Math.floor(Date.now() / 1000) + 60 // in 1 minute
+                    }
+                });
+
+                $.getJSON = jasmine.createSpy('$.getJSON').and.callFake(function () {
+                    var deferred = $.Deferred();
+
+                    return deferred.promise();
+                });
+
+                init();
+                expect($.getJSON).not.toHaveBeenCalled();
+            });
+            it('check that sections are requested from server, if there are expired sections', function () {
+                setupLocalStorage({
+                    'customer': {
+                        'data_id': Math.floor(Date.now() / 1000) + 60 // invalidated,
+                    },
+                    'cart': {
+                        'data_id': Math.floor(Date.now() / 1000) - 61 * 60, // 61 minutes ago
+                        'content': {}
+                    },
+                    'product_data_storage': {
+                        'data_id': Math.floor(Date.now() / 1000) + 60, // in 1 minute
+                        'content': {}
+                    },
+                    'catalog': {
+                        'data_id': Math.floor(Date.now() / 1000) + 60 // invalid section,
+                    },
+                    'checkout': {
+                        'data_id': Math.floor(Date.now() / 1000) - 61 * 60, // invalid section,
+                        'content': {}
+                    }
+                });
+
+                $.getJSON = jasmine.createSpy('$.getJSON').and.callFake(function () {
+                    var deferred = $.Deferred();
+
+                    return deferred.promise();
+                });
+
+                init();
+                expect($.getJSON).toHaveBeenCalledWith(
+                    'http://localhost/customer/section/load/',
+                    jasmine.objectContaining({
+                        sections: 'cart,customer'
+                    })
+                );
+            });
+        });
+    });
+});

From 653650ffb1918095943d5e113b74fe72562fe786 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 1577/1718] 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 ab058110fe66f..192f20653f8c3 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 4e112321d92b65852db358feb1e9098e023eb346 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 19 Aug 2020 18:02:41 +0300
Subject: [PATCH 1578/1718] 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 773c20c8506c90127eb6c39d642547acfa4e2b48 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 19 Aug 2020 18:11:45 +0300
Subject: [PATCH 1579/1718] 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 f648b8b3c293f837bbbbad6688990ecf228f323d Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 19 Aug 2020 19:10:54 +0300
Subject: [PATCH 1580/1718] 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 9c3588faf2b27faaf331f1e1599f3effb7491012 Mon Sep 17 00:00:00 2001
From: Soumya Unnikrishnan <sunnikri@adobe.com>
Date: Wed, 19 Aug 2020 15:11:34 -0500
Subject: [PATCH 1581/1718] 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 3dba58b321217cb186e03449c611382dc54a588f Mon Sep 17 00:00:00 2001
From: Victor Rad <vrad@magento.com>
Date: Wed, 19 Aug 2020 15:29:43 -0500
Subject: [PATCH 1582/1718] MC-36598: Default Billing address is not selected
 after the same address checkbox unticked

---
 .../Test/Mftf/Section/CheckoutPaymentSection.xml  |  2 ++
 ...eckoutAsCustomerUsingNonDefaultAddressTest.xml |  5 +++--
 .../Customer/Test/Mftf/Data/CustomerData.xml      | 15 +++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
index 5a9857f6aaa78..1c9933064154a 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
@@ -15,6 +15,8 @@
         <element name="billingNewAddressForm" type="text" selector="[data-form='billing-new-address']"/>
         <element name="billingAddressNotSameCheckbox" type="checkbox" selector="#billing-address-same-as-shipping-checkmo"/>
         <element name="editAddress" type="button" selector="button.action.action-edit-address"/>
+        <element name="addressDropdown" type="select" selector="[name=billing_address_id]"/>
+        <element name="addressDropdownSelected" type="select" selector="[name=billing_address_id] option:checked"/>
         <element name="placeOrderDisabled" type="button" selector="#checkout-payment-method-load button.disabled"/>
         <element name="update" type="button" selector=".payment-method._active .payment-method-billing-address .action.action-update"/>
         <element name="guestFirstName" type="input" selector=".payment-method._active .billing-address-form input[name='firstname']"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNonDefaultAddressTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNonDefaultAddressTest.xml
index 6a211c3908059..13968964436b4 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNonDefaultAddressTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/OnePageCheckoutAsCustomerUsingNonDefaultAddressTest.xml
@@ -26,7 +26,7 @@
             </createData>
 
             <!-- Create customer -->
-            <createData entity="Customer_US_UK_DE" stepKey="createCustomer"/>
+            <createData entity="Customer_DE_UK_US" stepKey="createCustomer"/>
         </before>
         <after>
             <!-- Admin log out -->
@@ -70,7 +70,8 @@
 
         <!-- Change the address -->
         <click selector="{{CheckoutPaymentSection.editAddress}}" stepKey="editAddress"/>
-        <waitForElementVisible selector="{{CheckoutShippingSection.addressDropdown}}" stepKey="waitForDropDownToBeVisible"/>
+        <waitForElementVisible selector="{{CheckoutPaymentSection.addressDropdown}}" stepKey="waitForDropDownToBeVisible"/>
+        <see selector="{{CheckoutPaymentSection.addressDropdownSelected}}" userInput="{{US_Address_NY.street[0]}}" stepKey="seeDefaultBillingAddressStreet"/>
         <selectOption selector="{{CheckoutShippingSection.addressDropdown}}" userInput="{{UK_Not_Default_Address.street[0]}}" stepKey="addAddress"/>
 
         <!-- Check order summary in checkout -->
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml b/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
index e176c45a1fa00..5db0b8f5581d7 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml
@@ -285,6 +285,21 @@
         <requiredEntity type="address">DE_Address_Berlin_Not_Default_Address</requiredEntity>
         <requiredEntity type="address">UK_Not_Default_Address</requiredEntity>
     </entity>
+    <entity name="Customer_DE_UK_US" type="customer">
+        <data key="group_id">1</data>
+        <data key="default_billing">true</data>
+        <data key="default_shipping">true</data>
+        <data key="email" unique="prefix">John.Doe@example.com</data>
+        <data key="firstname">John</data>
+        <data key="lastname">Doe</data>
+        <data key="fullname">John Doe</data>
+        <data key="password">pwdTest123!</data>
+        <data key="store_id">0</data>
+        <data key="website_id">0</data>
+        <requiredEntity type="address">DE_Address_Berlin_Not_Default_Address</requiredEntity>
+        <requiredEntity type="address">UK_Not_Default_Address</requiredEntity>
+        <requiredEntity type="address">US_Address_NY</requiredEntity>
+    </entity>
     <entity name="Retailer_Customer" type="customer">
         <data key="group_id">3</data>
         <data key="default_billing">true</data>

From fe781002e372ff7fe7b5952f34a268266956698a Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 20 Aug 2020 10:01:00 +0300
Subject: [PATCH 1583/1718] 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 af54db3b44a9e55b0665898e8d582302039e5838 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 1584/1718] 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 523a8c9865227cfc9d9bdf9a150bb48586704f39 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 20 Aug 2020 14:08:10 +0300
Subject: [PATCH 1585/1718] 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 c7d50bb2f126e8e1fd72541d597eeda0e908aa1d Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 20 Aug 2020 14:10:19 +0300
Subject: [PATCH 1586/1718] 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 55653494828cc444d846f79838c72b568aee4484 Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <60192090+engcom-Kilo@users.noreply.github.com>
Date: Thu, 20 Aug 2020 15:45:52 +0300
Subject: [PATCH 1587/1718] Update AdminCreateDuplicateNameStoreViewTest.xml

Added testCaseId
---
 .../Test/Mftf/Test/AdminCreateDuplicateNameStoreViewTest.xml     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateDuplicateNameStoreViewTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateDuplicateNameStoreViewTest.xml
index 46caf5b37f4f2..ec81424b1acfa 100644
--- a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateDuplicateNameStoreViewTest.xml
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateDuplicateNameStoreViewTest.xml
@@ -14,6 +14,7 @@
                 <description value="Admin should be able to create a Store View with the same name"/>
                 <group value="storeView"/>
                 <severity value="AVERAGE"/>
+                <testCaseId value="MC-36863"/>
             </annotations>
             <before>
             <!--Create two store views with same name, but different codes-->

From d24d07da57c074e282fed0666f58ce8f42d6951a Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Thu, 20 Aug 2020 21:21:04 +0800
Subject: [PATCH 1588/1718] 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 a2f56ab91aa4baba4751768015290c54c5b2b3dd Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Thu, 20 Aug 2020 21:27:56 +0800
Subject: [PATCH 1589/1718] 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 18e7988989037dabb97559d95892cb5f8d555f57 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 20 Aug 2020 17:09:45 +0300
Subject: [PATCH 1590/1718] 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 22670212eee321623260da8e9b406c8186309ed3 Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Fri, 21 Aug 2020 00:56:30 +0800
Subject: [PATCH 1591/1718] 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 01e90b12be723c1b64e10c8aa7028bfbe7263015 Mon Sep 17 00:00:00 2001
From: Andrii Beziazychnyi <a.beziazychnyi@atwix.com>
Date: Thu, 20 Aug 2020 20:04:56 +0300
Subject: [PATCH 1592/1718] Fixed bad code style in return type declaration

---
 app/code/Magento/Captcha/CustomerData/Captcha.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Captcha/CustomerData/Captcha.php b/app/code/Magento/Captcha/CustomerData/Captcha.php
index e07bf953abaa3..901477c75610b 100644
--- a/app/code/Magento/Captcha/CustomerData/Captcha.php
+++ b/app/code/Magento/Captcha/CustomerData/Captcha.php
@@ -58,7 +58,7 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function getSectionData() :array
+    public function getSectionData(): array
     {
         $data = [];
 

From f1271c0f4246cd014b9c3bee98371b64066f7d03 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Fri, 21 Aug 2020 03:24:51 +0800
Subject: [PATCH 1593/1718] magento/adobe-stock-integration#1775: [MFTF] Make
 AdminAssertCategoryGridPageDetailsActionGroup parametrized - initial
 modification

---
 ...sertCategoryGridPageDetailsActionGroup.xml | 20 +++++++++++--------
 ...diaGalleryCatalogUiCategoryGridSection.xml | 16 +++++++--------
 ...eryCatalogUiVerifyCategoryGridPageTest.xml |  4 +++-
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertCategoryGridPageDetailsActionGroup.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertCategoryGridPageDetailsActionGroup.xml
index 884fa47152932..92a56f3e37fbe 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertCategoryGridPageDetailsActionGroup.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertCategoryGridPageDetailsActionGroup.xml
@@ -8,16 +8,20 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminAssertCategoryGridPageDetailsActionGroup">
+        <arguments>
+            <argument name="category"/>
+            <argument name="imageName" type="string" defaultValue="magento"/>
+        </arguments>
         <annotations>
-            <description>Assert category grid page basic columns values for default category</description>
+            <description>Assert category grid page basic columns values for a specific 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"/>
-        <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.products('1', '0')}}" stepKey="assertProductsColumn"/>
-        <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.inMenu('1', 'Yes')}}" stepKey="assertInMenuColumn"/>
-        <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.enabled('1', 'Yes')}}" stepKey="assertEnabledColumn"/>
+        <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.image(imageName)}}" stepKey="assertImageColumn"/>
+        <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.path(category.name)}}" stepKey="assertPathColumn"/>
+        <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.name(category.name)}}" stepKey="assertNameColumn"/>
+        <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.displayMode('PRODUCTS')}}" stepKey="assertDisplayModeColumn"/>
+        <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.products('0')}}" stepKey="assertProductsColumn"/>
+        <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.inMenu(category.include_in_menu)}}" stepKey="assertInMenuColumn"/>
+        <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.enabled(category.is_active)}}" 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 ffd3c14c297c3..702be9ed4201d 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml
@@ -10,13 +10,13 @@
           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"/>
-        <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"/>
+        <element name="image" type="text" selector="//tr//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//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Path')]/preceding-sibling::th) +1 ]//*[contains(text(), '{{categoryName}}')]" parameterized="true"/>
+        <element name="name" type="text" selector="//tr//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//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//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//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//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//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Action')]/preceding-sibling::th) +1 ]//*[text()='{{edit}}']" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyCategoryGridPageTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyCategoryGridPageTest.xml
index 6b7bd3ba11f45..8fae844f9883a 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyCategoryGridPageTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyCategoryGridPageTest.xml
@@ -26,6 +26,8 @@
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
         </after>
         <actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openCategoryPage"/>
-        <actionGroup ref="AdminAssertCategoryGridPageDetailsActionGroup" stepKey="assertCategoryGridPageRendered"/>
+        <actionGroup ref="AdminAssertCategoryGridPageDetailsActionGroup" stepKey="assertCategoryGridPageRendered">
+            <argument name="category" value="$$category$$"/>
+        </actionGroup>
    </test>
 </tests>

From 8c4de4d793590a4ca5282e4afb986205c7b773b4 Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Thu, 20 Aug 2020 18:34:47 -0500
Subject: [PATCH 1594/1718] minor schema updates

---
 app/code/Magento/CatalogGraphQl/etc/schema.graphqls    |  4 ++--
 .../ConfigurableProductGraphQl/etc/schema.graphqls     |  2 +-
 .../Magento/DownloadableGraphQl/etc/schema.graphqls    |  2 +-
 app/code/Magento/WishlistGraphQl/etc/schema.graphqls   | 10 +++++-----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
index de4f088aac1d0..35067a6cb99af 100644
--- a/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/CatalogGraphQl/etc/schema.graphqls
@@ -493,8 +493,8 @@ type StoreConfig @doc(description: "The type contains information about a store
     root_category_id: Int @doc(description: "The ID of the root category") @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\RootCategoryId")
 }
 
-type SimpleWishlistItem implements WishlistItemInterface @doc(description: "A simple product wishlist Item") {
+type SimpleWishlistItem implements WishlistItemInterface @doc(description: "A simple product wish list Item") {
 }
 
-type VirtualWishlistItem implements WishlistItemInterface @doc(description: "A virtual product wishlist item") {
+type VirtualWishlistItem implements WishlistItemInterface @doc(description: "A virtual product wish list item") {
 }
diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
index f66f8f7ee2eac..257bca11fb5b7 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
@@ -69,7 +69,7 @@ type SelectedConfigurableOption {
     value_label: String!
 }
 
-type ConfigurableWishlistItem implements WishlistItemInterface @doc(description: "A configurable product wishlist item"){
+type ConfigurableWishlistItem implements WishlistItemInterface @doc(description: "A configurable product wish list item"){
     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")
 }
diff --git a/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls b/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
index 64ef43aa03d1b..ba178bb1a427e 100644
--- a/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
@@ -65,7 +65,7 @@ type DownloadableProductSamples @doc(description: "DownloadableProductSamples de
     sample_file: String @deprecated(reason: "`sample_url` serves to get the downloadable sample")
 }
 
-type DownloadableWishlistItem implements WishlistItemInterface @doc(description: "A downloadable product wishlist item") {
+type DownloadableWishlistItem implements WishlistItemInterface @doc(description: "A downloadable product wish list item") {
     links_v2: [DownloadableProductLinks] @doc(description: "An array containing information about the selected links") @resolver(class: "\\Magento\\DownloadableGraphQl\\Model\\Wishlist\\ItemLinks")
     samples: [DownloadableProductSamples] @doc(description: "An array containing information about the selected samples") @resolver(class: "Magento\\DownloadableGraphQl\\Resolver\\Product\\Samples")
 }
diff --git a/app/code/Magento/WishlistGraphQl/etc/schema.graphqls b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
index 9c82ca03323ec..69bc45462d4c8 100644
--- a/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
@@ -9,9 +9,9 @@ type Customer {
     wishlists(
         pageSize: Int = 20 @doc(description: "Specifies the maximum number of results to return at once. This attribute is optional."),
         currentPage: Int = 1 @doc(description: "Specifies which page of results to return. The default value is 1.")
-    ): [Wishlist!]! @doc(description: "An array of wishlists. In Magento Open Source, customers are limited to one wishlist. The number of wishlists is not restricted for Magento Commerce") @resolver(class:"\\Magento\\WishlistGraphQl\\Model\\Resolver\\CustomerWishlists")
+    ): [Wishlist!]! @doc(description: "An array of wishlists. In Magento Open Source, customers are limited to one wish list. The number of wish lists is configurable for Magento Commerce") @resolver(class:"\\Magento\\WishlistGraphQl\\Model\\Resolver\\CustomerWishlists")
     wishlist: Wishlist! @deprecated(reason: "Use `Customer.wishlists` or `Customer.wishlist_v2`") @resolver(class:"\\Magento\\WishlistGraphQl\\Model\\Resolver\\CustomerWishlistResolver") @doc(description: "Contains a customer's wish lists")  @cache(cacheable: false)
-    wishlist_v2(id: ID!): Wishlist @doc(description: "Retrieve the specified wishlist") @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\WishlistById")
+    wishlist_v2(id: ID!): Wishlist @doc(description: "Retrieve the specified wish list") @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\WishlistById")
 }
 
 type WishlistOutput @doc(description: "Deprecated: `Wishlist` type should be used instead") {
@@ -32,10 +32,10 @@ type Wishlist {
 }
 
 interface WishlistItemInterface @typeResolver(class: "Magento\\WishlistGraphQl\\Model\\Resolver\\Type\\WishlistItemType") {
-    id: ID  @doc(description: "The ID of the wish list item")
-    quantity: Float  @doc(description: "The quantity of this wish list item")
+    id: ID!  @doc(description: "The ID of the wish list item")
+    quantity: Float!  @doc(description: "The quantity of this wish list item")
     description: String  @doc(description: "The description of the item")
-    added_at: String  @doc(description: "The date and time the item was added to the wish list")
+    added_at: String!  @doc(description: "The date and time the item was added to the wish list")
     product: ProductInterface @doc(description: "Product details of the wish list item") @resolver(class: "\\Magento\\WishlistGraphQl\\Model\\Resolver\\ProductResolver")
     customizable_options: [SelectedCustomizableOption] @doc(description: "Custom options selected for the wish list item")
 }

From 29d07075a138de6fe2f9cc0b7d06862ef7e59a42 Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Fri, 21 Aug 2020 14:23:11 +0800
Subject: [PATCH 1595/1718] magento/adobe-stock-integration#1504: Insert
 rendition images to the content from media gallery instead of original images
 - Extracted logic from wysiwyg OnInsert controller to a model

---
 .../Adminhtml/Wysiwyg/Images/OnInsert.php     | 26 +++++++++------
 ...areImage.php => GetInsertImageContent.php} | 32 ++++++++++++-------
 2 files changed, 37 insertions(+), 21 deletions(-)
 rename app/code/Magento/Cms/Model/Wysiwyg/Images/{PrepareImage.php => GetInsertImageContent.php} (57%)

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
index 6862efc924ab6..c10547e0b2556 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
@@ -14,25 +14,26 @@ class OnInsert extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
     protected $resultRawFactory;
 
     /**
-     * @var \Magento\Cms\Model\Wysiwyg\Images\PrepareImage
+     * @var \Magento\Cms\Model\Wysiwyg\Images\GetInsertImageContent
      */
-    protected $prepareImage;
+    protected $getInsertImageContent;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
-     * @param \Magento\Cms\Model\Wysiwyg\Images\PrepareImage $prepareImage
+     * @param \Magento\Cms\Model\Wysiwyg\Images\GetInsertImageContent $getInsertImageContent
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Framework\Registry $coreRegistry,
         \Magento\Framework\Controller\Result\RawFactory $resultRawFactory,
-        \Magento\Cms\Model\Wysiwyg\Images\PrepareImage $prepareImage
+        ?\Magento\Cms\Model\Wysiwyg\Images\GetInsertImageContent $getInsertImageContent = null
     ) {
         $this->resultRawFactory = $resultRawFactory;
-        $this->prepareImage = $prepareImage;
         parent::__construct($context, $coreRegistry);
+        $this->getInsertImageContent = $getInsertImageContent ?: $this->_objectManager
+            ->get('Magento\Cms\Model\Wysiwyg\Images\GetInsertImageContent');
     }
 
     /**
@@ -42,13 +43,18 @@ public function __construct(
      */
     public function execute()
     {
-        $request = $this->getRequest();
-
-        /** @var \Magento\Cms\Model\Wysiwyg\Images\PrepareImage $image */
-        $image = $this->prepareImage->execute($request->getParams());
+        $data = $this->getRequest()->getParams();
 
         /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */
         $resultRaw = $this->resultRawFactory->create();
-        return $resultRaw->setContents($image);
+
+        return $resultRaw->setContents(
+            $this->getInsertImageContent->execute(
+                $data['filename'],
+                (int)$data['store_id'],
+                $data['force_static_path'],
+                $data['as_is']
+            )
+        );
     }
 }
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/PrepareImage.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/GetInsertImageContent.php
similarity index 57%
rename from app/code/Magento/Cms/Model/Wysiwyg/Images/PrepareImage.php
rename to app/code/Magento/Cms/Model/Wysiwyg/Images/GetInsertImageContent.php
index 852db8e9a0a78..49ef32fffd7a7 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/PrepareImage.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/GetInsertImageContent.php
@@ -11,7 +11,7 @@
 use Magento\Catalog\Helper\Data;
 use Magento\Cms\Helper\Wysiwyg\Images as ImagesHelper;
 
-class PrepareImage
+class GetInsertImageContent
 {
     /**
      * @var ImagesHelper
@@ -25,6 +25,7 @@ class PrepareImage
 
     /**
      * PrepareImage constructor.
+     *
      * @param ImagesHelper $imagesHelper
      * @param Data $catalogHelper
      */
@@ -37,24 +38,33 @@ public function __construct(
     }
 
     /**
-     * @param array $data
+     * Prepare Image Contents for Insert
+     *
+     * @param string $encodedFilename
+     * @param int $storeId
+     * @param bool $forceStaticPath
+     * @param bool $renderAsTag
      * @return string
      */
-    public function execute(array $data): string
-    {
-        $filename = $this->imagesHelper->idDecode($data['filename']);
-        $storeId = (int)$data['store_id'];
+    public function execute(
+        string $encodedFilename,
+        int $storeId,
+        bool $forceStaticPath,
+        bool $renderAsTag
+    ): string {
+        $filename = $this->imagesHelper->idDecode($encodedFilename);
 
         $this->catalogHelper->setStoreId($storeId);
         $this->imagesHelper->setStoreId($storeId);
 
-        if ($data['force_static_path']) {
+        if ($forceStaticPath) {
             // phpcs:ignore Magento2.Functions.DiscouragedFunction
-            $image = parse_url($this->imagesHelper->getCurrentUrl() . $filename, PHP_URL_PATH);
-        } else {
-            $image = $this->imagesHelper->getImageHtmlDeclaration($filename, $data['as_is']);
+            return parse_url(
+                $this->imagesHelper->getCurrentUrl() . $filename,
+                PHP_URL_PATH
+            );
         }
 
-        return $image;
+        return $this->imagesHelper->getImageHtmlDeclaration($filename, $renderAsTag);
     }
 }

From e228d7670177a7023c991243cae74785f2faeeb9 Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Fri, 21 Aug 2020 17:22:20 +0800
Subject: [PATCH 1596/1718] magento/adobe-stock-integration#1504:Extract logic
 from controller to a model to enable before plugin interception of parameters
 - Test failure fixes. Made store_id parameter optional.

---
 .../Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php    | 4 ++--
 .../Cms/Model/Wysiwyg/Images/GetInsertImageContent.php      | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
index c10547e0b2556..5ac16cf3a7c2c 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
@@ -51,9 +51,9 @@ public function execute()
         return $resultRaw->setContents(
             $this->getInsertImageContent->execute(
                 $data['filename'],
-                (int)$data['store_id'],
                 $data['force_static_path'],
-                $data['as_is']
+                $data['as_is'],
+                isset($data['store_id']) ? (int) $data['store_id'] : null
             )
         );
     }
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/GetInsertImageContent.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/GetInsertImageContent.php
index 49ef32fffd7a7..e9aab6160b259 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/GetInsertImageContent.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/GetInsertImageContent.php
@@ -41,16 +41,16 @@ public function __construct(
      * Prepare Image Contents for Insert
      *
      * @param string $encodedFilename
-     * @param int $storeId
      * @param bool $forceStaticPath
      * @param bool $renderAsTag
+     * @param int|null $storeId
      * @return string
      */
     public function execute(
         string $encodedFilename,
-        int $storeId,
         bool $forceStaticPath,
-        bool $renderAsTag
+        bool $renderAsTag,
+        ?int $storeId = null
     ): string {
         $filename = $this->imagesHelper->idDecode($encodedFilename);
 

From 8c0e9919f8acaf741a44a0fe7a74cb42276c8d0d Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Fri, 21 Aug 2020 13:21:02 +0300
Subject: [PATCH 1597/1718] 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 9a2880dd11eb8cd6bc4b1afab08d7f4e31bedb96 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Fri, 21 Aug 2020 13:40:52 +0300
Subject: [PATCH 1598/1718] 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 141434f64214fb4bda3262a03fe4e8ed91fcac71 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Fri, 21 Aug 2020 14:20:18 +0300
Subject: [PATCH 1599/1718] 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 88f10c57649a763e62d7076016b3846e6e8b9786 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <svizev.igor@gmail.com>
Date: Fri, 21 Aug 2020 14:34:54 +0300
Subject: [PATCH 1600/1718] Improve performance of "in" condition on some
 version of MySQL

Fix static test, SVC failures and apply requested changes
---
 .../ResourceModel/Selection/Collection.php    |  4 +--
 .../Model/Resolver/Links/Collection.php       |  2 +-
 .../Indexer/Category/Flat/AbstractAction.php  |  6 ++--
 .../Indexer/Category/Flat/Action/Rows.php     |  2 +-
 .../Category/Product/AbstractAction.php       |  2 +-
 .../Indexer/Category/Product/Action/Full.php  |  2 +-
 .../Indexer/Product/Category/Action/Rows.php  | 10 +++----
 .../Indexer/Product/Flat/FlatTableBuilder.php |  4 +--
 .../Indexer/Product/Flat/TableBuilder.php     |  4 +--
 .../Indexer/Product/Price/AbstractAction.php  |  4 +--
 .../Product/Attribute/AttributeSetFinder.php  |  2 +-
 .../Model/Product/Price/PricePersistence.php  |  6 ++--
 .../Product/Price/TierPricePersistence.php    |  2 +-
 .../Model/ResourceModel/AbstractResource.php  |  6 ++--
 .../Catalog/Model/ResourceModel/Category.php  |  2 +-
 .../Model/ResourceModel/Category/Flat.php     |  4 +--
 .../Collection/AbstractCollection.php         |  8 +++---
 .../Catalog/Model/ResourceModel/Product.php   |  7 +++--
 .../ResourceModel/Product/Collection.php      |  8 +++---
 .../Model/ResourceModel/Product/Gallery.php   |  2 +-
 .../Product/Indexer/Price/DefaultPrice.php    |  2 +-
 .../Product/Indexer/Price/TierPrice.php       |  2 +-
 .../Product/Link/Product/Collection.php       | 10 +++----
 .../Model/ResourceModel/Product/Website.php   |  2 +-
 .../Model/Indexer/ProductPriceIndexFilter.php |  2 +-
 .../Model/Indexer/Stock/CacheCleaner.php      |  2 +-
 .../Model/ResourceModel/Stock.php             |  6 ++--
 .../Model/ResourceModel/Stock/Status.php      |  2 +-
 .../Indexer/ProductPriceIndexModifier.php     |  2 +-
 .../Model/ConfigurableProductsProvider.php    |  2 +-
 .../Indexer/Fulltext/Action/DataProvider.php  |  4 +--
 .../Model/Indexer/Fulltext/Action/Full.php    |  2 +-
 .../Model/ResourceModel/Fulltext.php          |  2 +-
 .../Model/ResourceModel/Search/Collection.php |  4 +--
 .../Product/Indexer/Price/Configurable.php    |  2 +-
 .../Product/Type/Configurable.php             |  2 +-
 .../Configurable/Attribute/Collection.php     |  2 +-
 .../Type/Configurable/Product/Collection.php  |  2 +-
 .../Entity/Collection/AbstractCollection.php  | 28 +++++++++++--------
 .../Model/ResourceModel/Entity/Attribute.php  |  2 +-
 .../Entity/Attribute/Collection.php           |  6 ++--
 .../Eav/Model/ResourceModel/ReadHandler.php   |  2 +-
 42 files changed, 91 insertions(+), 86 deletions(-)

diff --git a/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php b/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php
index 11c83622a3b54..303c33b571d35 100644
--- a/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php
+++ b/app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php
@@ -215,7 +215,7 @@ public function joinPrices($websiteId)
     public function setOptionIdsFilter($optionIds)
     {
         if (!empty($optionIds)) {
-            $this->getSelect()->where('selection.option_id IN (?)', $optionIds, \Zend_Db::BIGINT_TYPE);
+            $this->getSelect()->where('selection.option_id IN (?)', $optionIds, \Zend_Db::INT_TYPE);
         }
         return $this;
     }
@@ -229,7 +229,7 @@ public function setOptionIdsFilter($optionIds)
     public function setSelectionIdsFilter($selectionIds)
     {
         if (!empty($selectionIds)) {
-            $this->getSelect()->where('selection.selection_id IN (?)', $selectionIds, \Zend_Db::BIGINT_TYPE);
+            $this->getSelect()->where('selection.selection_id IN (?)', $selectionIds, \Zend_Db::INT_TYPE);
         }
         return $this;
     }
diff --git a/app/code/Magento/BundleGraphQl/Model/Resolver/Links/Collection.php b/app/code/Magento/BundleGraphQl/Model/Resolver/Links/Collection.php
index 76e670721c31d..8025cf91d28c9 100644
--- a/app/code/Magento/BundleGraphQl/Model/Resolver/Links/Collection.php
+++ b/app/code/Magento/BundleGraphQl/Model/Resolver/Links/Collection.php
@@ -108,7 +108,7 @@ private function fetch() : array
         }
 
         $linkCollection->getSelect()
-            ->where($field . ' IN (?)', $this->parentIds, \Zend_Db::BIGINT_TYPE);
+            ->where($field . ' IN (?)', $this->parentIds, \Zend_Db::INT_TYPE);
 
         /** @var Selection $link */
         foreach ($linkCollection as $link) {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
index f2148a721d764..ae24b60719ca7 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
@@ -425,7 +425,7 @@ private function getLinkIds(array $entityIds)
         )->where(
             'e.entity_id IN (?)',
             $entityIds,
-            \Zend_Db::BIGINT_TYPE
+            \Zend_Db::INT_TYPE
         );
 
         return $this->connection->fetchCol($select);
@@ -471,11 +471,11 @@ protected function getAttributeTypeValues($type, $entityIds, $storeId)
         )->where(
             "e.entity_id IN (?)",
             $entityIds,
-            \Zend_Db::BIGINT_TYPE
+            \Zend_Db::INT_TYPE
         )->where(
             'def.store_id IN (?)',
             [Store::DEFAULT_STORE_ID, $storeId],
-            \Zend_Db::BIGINT_TYPE
+            \Zend_Db::INT_TYPE
         );
 
         return $this->connection->fetchAll($select);
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Rows.php
index c5751d580607b..20f01e4b0a0ab 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Rows.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Rows.php
@@ -120,7 +120,7 @@ protected function filterIdsByStore(array $ids, $store)
         )->where(
             "entity_id IN (?)",
             $ids,
-            \Zend_Db::BIGINT_TYPE
+            \Zend_Db::INT_TYPE
         );
 
         $resultIds = [];
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
index 2d1990037d9b1..38f606b8abefe 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
@@ -508,7 +508,7 @@ protected function createAnchorSelect(Store $store)
             $this->connection->quoteInto(
                 'cc2.parent_id = cc.entity_id AND cc.entity_id NOT IN (?)',
                 $rootCatIds,
-                \Zend_Db::BIGINT_TYPE
+                \Zend_Db::INT_TYPE
             ),
             []
         )->joinInner(
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
index f758fd1759309..a7c5cdf412e6e 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
@@ -282,7 +282,7 @@ private function reindexCategoriesBySelect(Select $basicSelect, $whereCondition,
             $this->connection->delete($this->tableMaintainer->getMainTmpTable((int)$store->getId()));
             $entityIds = $this->connection->fetchCol($query);
             $resultSelect = clone $basicSelect;
-            $resultSelect->where($whereCondition, $entityIds, \Zend_Db::BIGINT_TYPE);
+            $resultSelect->where($whereCondition, $entityIds, \Zend_Db::INT_TYPE);
             $this->connection->query(
                 $this->connection->insertFromSelect(
                     $resultSelect,
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 3a9c4a94e58e5..edd68422ec4ac 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
@@ -151,7 +151,7 @@ private function getProductIdsWithParents(array $childProductIds): array
             ->select()
             ->from(['relation' => $this->getTable('catalog_product_relation')], [])
             ->distinct(true)
-            ->where('child_id IN (?)', $childProductIds, \Zend_Db::BIGINT_TYPE)
+            ->where('child_id IN (?)', $childProductIds, \Zend_Db::INT_TYPE)
             ->join(
                 ['cpe' => $this->getTable('catalog_product_entity')],
                 'relation.parent_id = cpe.' . $fieldForParent,
@@ -215,7 +215,7 @@ protected function removeEntries()
     protected function getNonAnchorCategoriesSelect(\Magento\Store\Model\Store $store)
     {
         $select = parent::getNonAnchorCategoriesSelect($store);
-        return $select->where('ccp.product_id IN (?)', $this->limitationByProducts, \Zend_Db::BIGINT_TYPE);
+        return $select->where('ccp.product_id IN (?)', $this->limitationByProducts, \Zend_Db::INT_TYPE);
     }
 
     /**
@@ -227,7 +227,7 @@ protected function getNonAnchorCategoriesSelect(\Magento\Store\Model\Store $stor
     protected function getAnchorCategoriesSelect(\Magento\Store\Model\Store $store)
     {
         $select = parent::getAnchorCategoriesSelect($store);
-        return $select->where('ccp.product_id IN (?)', $this->limitationByProducts, \Zend_Db::BIGINT_TYPE);
+        return $select->where('ccp.product_id IN (?)', $this->limitationByProducts, \Zend_Db::INT_TYPE);
     }
 
     /**
@@ -239,7 +239,7 @@ protected function getAnchorCategoriesSelect(\Magento\Store\Model\Store $store)
     protected function getAllProducts(\Magento\Store\Model\Store $store)
     {
         $select = parent::getAllProducts($store);
-        return $select->where('cp.entity_id IN (?)', $this->limitationByProducts, \Zend_Db::BIGINT_TYPE);
+        return $select->where('cp.entity_id IN (?)', $this->limitationByProducts, \Zend_Db::INT_TYPE);
     }
 
     /**
@@ -265,7 +265,7 @@ private function getCategoryIdsFromIndex(array $productIds): array
             $storeCategories = $this->connection->fetchCol(
                 $this->connection->select()
                     ->from($this->getIndexTable($store->getId()), ['category_id'])
-                    ->where('product_id IN (?)', $productIds, \Zend_Db::BIGINT_TYPE)
+                    ->where('product_id IN (?)', $productIds, \Zend_Db::INT_TYPE)
                     ->distinct()
             );
             $categoryIds[] = $storeCategories;
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 584eea02241db..99d75186eca8c 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
@@ -354,7 +354,7 @@ protected function _updateTemporaryTableByStoreValues(
                         );
                     if (!empty($changedIds)) {
                         $select->where(
-                            $this->_connection->quoteInto('et.entity_id IN (?)', $changedIds, \Zend_Db::BIGINT_TYPE)
+                            $this->_connection->quoteInto('et.entity_id IN (?)', $changedIds, \Zend_Db::INT_TYPE)
                         );
                     }
                     $sql = $select->crossUpdateFromSelect(['et' => $temporaryFlatTableName]);
@@ -382,7 +382,7 @@ protected function _updateTemporaryTableByStoreValues(
                             $this->_connection->quoteInto(
                                 'et.entity_id IN (?)',
                                 $changedIds,
-                                \Zend_Db::BIGINT_TYPE
+                                \Zend_Db::INT_TYPE
                             )
                         );
                     }
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
index d99217b44593d..c14ea4bc363f8 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/TableBuilder.php
@@ -348,7 +348,7 @@ protected function _fillTemporaryTable(
 
                 if (!empty($changedIds)) {
                     $select->where(
-                        $this->_connection->quoteInto('e.entity_id IN (?)', $changedIds, \Zend_Db::BIGINT_TYPE)
+                        $this->_connection->quoteInto('e.entity_id IN (?)', $changedIds, \Zend_Db::INT_TYPE)
                     );
                 }
 
@@ -358,7 +358,7 @@ protected function _fillTemporaryTable(
                 if (count($valueColumns) > 1) {
                     if (!empty($changedIds)) {
                         $selectValue->where(
-                            $this->_connection->quoteInto('e.entity_id IN (?)', $changedIds, \Zend_Db::BIGINT_TYPE)
+                            $this->_connection->quoteInto('e.entity_id IN (?)', $changedIds, \Zend_Db::INT_TYPE)
                         );
                     }
                     $sql = $selectValue->insertFromSelect($temporaryValueTableName, $valueColumns, true);
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 406455fef13dc..f3a4b322e29df 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
@@ -436,7 +436,7 @@ private function deleteIndexData(array $entityIds)
             $select = $this->getConnection()->select()->from(
                 ['index_price' => $this->tableMaintainer->getMainTableByDimensions($dimensions)],
                 null
-            )->where('index_price.entity_id IN (?)', $entityIds, \Zend_Db::BIGINT_TYPE);
+            )->where('index_price.entity_id IN (?)', $entityIds, \Zend_Db::INT_TYPE);
             $query = $select->deleteFromSelect('index_price');
             $this->getConnection()->query($query);
         }
@@ -547,7 +547,7 @@ private function getProductsTypes(array $changedIds = [])
             ['entity_id', 'type_id']
         );
         if ($changedIds) {
-            $select->where('entity_id IN (?)', $changedIds, \Zend_Db::BIGINT_TYPE);
+            $select->where('entity_id IN (?)', $changedIds, \Zend_Db::INT_TYPE);
         }
         $pairs = $this->getConnection()->fetchPairs($select);
 
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/AttributeSetFinder.php b/app/code/Magento/Catalog/Model/Product/Attribute/AttributeSetFinder.php
index de9d60b77033a..b8da7452b09ce 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/AttributeSetFinder.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/AttributeSetFinder.php
@@ -37,7 +37,7 @@ public function findAttributeSetIdsByProductIds(array $productIds)
             ->getSelect()
             ->reset(Select::COLUMNS)
             ->columns(ProductInterface::ATTRIBUTE_SET_ID)
-            ->where('entity_id IN (?)', $productIds, \Zend_Db::BIGINT_TYPE)
+            ->where('entity_id IN (?)', $productIds, \Zend_Db::INT_TYPE)
             ->group(ProductInterface::ATTRIBUTE_SET_ID);
         $result = $collection->getConnection()->fetchCol($select);
         return $result;
diff --git a/app/code/Magento/Catalog/Model/Product/Price/PricePersistence.php b/app/code/Magento/Catalog/Model/Product/Price/PricePersistence.php
index 99c66bd9f5be1..ecab88c9c7e03 100644
--- a/app/code/Magento/Catalog/Model/Product/Price/PricePersistence.php
+++ b/app/code/Magento/Catalog/Model/Product/Price/PricePersistence.php
@@ -105,7 +105,7 @@ public function get(array $skus)
             ->select()
             ->from($this->attributeResource->getTable($this->table));
         return $this->attributeResource->getConnection()->fetchAll(
-            $select->where($this->getEntityLinkField() . ' IN (?)', $ids, \Zend_Db::BIGINT_TYPE)
+            $select->where($this->getEntityLinkField() . ' IN (?)', $ids, \Zend_Db::INT_TYPE)
                 ->where('attribute_id = ?', $this->getAttributeId())
         );
     }
@@ -214,13 +214,13 @@ private function getAttributeId()
      */
     private function retrieveAffectedIds(array $skus)
     {
-        $affectedIds = [[]];
+        $affectedIds = [];
 
         foreach ($this->productIdLocator->retrieveProductIdsBySkus($skus) as $productIds) {
             $affectedIds[] = array_keys($productIds);
         }
 
-        return array_unique(array_merge(...$affectedIds));
+        return array_unique(array_merge([], ...$affectedIds));
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/Product/Price/TierPricePersistence.php b/app/code/Magento/Catalog/Model/Product/Price/TierPricePersistence.php
index 1088fa7417444..65b1aec3b4817 100644
--- a/app/code/Magento/Catalog/Model/Product/Price/TierPricePersistence.php
+++ b/app/code/Magento/Catalog/Model/Product/Price/TierPricePersistence.php
@@ -56,7 +56,7 @@ public function get(array $ids)
     {
         $select = $this->tierpriceResource->getConnection()->select()->from($this->tierpriceResource->getMainTable());
         return $this->tierpriceResource->getConnection()->fetchAll(
-            $select->where($this->getEntityLinkField() . ' IN (?)', $ids, \Zend_Db::BIGINT_TYPE)
+            $select->where($this->getEntityLinkField() . ' IN (?)', $ids, \Zend_Db::INT_TYPE)
         );
     }
 
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php b/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
index cf0e82046f3a5..c71225b4fc67f 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
@@ -147,7 +147,7 @@ protected function _getLoadAttributesSelect($object, $table)
             ->select()
             ->from(['attr_table' => $table], [])
             ->where("attr_table.{$this->getLinkField()} = ?", $object->getData($this->getLinkField()))
-            ->where('attr_table.store_id IN (?)', $storeIds, \Zend_Db::BIGINT_TYPE);
+            ->where('attr_table.store_id IN (?)', $storeIds, \Zend_Db::INT_TYPE);
 
         if ($setId) {
             $select->join(
@@ -565,7 +565,7 @@ public function getAttributeRawValue($entityId, $attribute, $store)
                     $connection->quoteInto(
                         'default_value.attribute_id IN (?)',
                         array_keys($_attributes),
-                        \Zend_Db::BIGINT_TYPE
+                        \Zend_Db::INT_TYPE
                     ),
                     "default_value.{$this->getLinkField()} = e.{$this->getLinkField()}",
                     'default_value.store_id = 0',
@@ -596,7 +596,7 @@ public function getAttributeRawValue($entityId, $attribute, $store)
                         $connection->quoteInto(
                             'store_value.attribute_id IN (?)',
                             array_keys($_attributes),
-                            \Zend_Db::BIGINT_TYPE
+                            \Zend_Db::INT_TYPE
                         ),
                         "store_value.{$this->getLinkField()} = e.{$this->getLinkField()}",
                         'store_value.store_id = :store_id',
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category.php b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
index a9c771c03e34f..917aafb643b47 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
@@ -667,7 +667,7 @@ public function findWhereAttributeIs($entityIdsFilter, $attribute, $expectedValu
             )->where(
                 'ce.entity_id IN (?)',
                 $entityIdsFilter,
-                \Zend_Db::BIGINT_TYPE
+                \Zend_Db::INT_TYPE
             );
             $this->entitiesWhereAttributesIs[$entityIdsFilterHash][$attribute->getId()][$expectedValue] =
                 $this->getConnection()->fetchCol($selectEntities, $bind);
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php
index dccfa03ec5d49..759866de4b49d 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php
@@ -294,7 +294,7 @@ protected function _loadNodes($parentNode = null, $recursionLevel = 0, $storeId
         $inactiveCategories = $this->getInactiveCategoryIds();
 
         if (!empty($inactiveCategories)) {
-            $select->where('main_table.entity_id NOT IN (?)', $inactiveCategories, \Zend_Db::BIGINT_TYPE);
+            $select->where('main_table.entity_id NOT IN (?)', $inactiveCategories, \Zend_Db::INT_TYPE);
         }
 
         // Allow extensions to modify select (e.g. add custom category attributes to select)
@@ -682,7 +682,7 @@ public function getAnchorsAbove(array $filterIds, $storeId = 0)
         )->where(
             'entity_id IN (?)',
             $filterIds,
-            \Zend_Db::BIGINT_TYPE
+            \Zend_Db::INT_TYPE
         );
 
         return $this->getConnection()->fetchCol($select);
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php b/app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php
index 490406d7f68f5..02fdb8270791d 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php
@@ -171,11 +171,11 @@ protected function _getLoadAttributesSelect($table, $attributeIds = [])
             )->where(
                 "e.entity_id IN (?)",
                 array_keys($this->_itemsById),
-                \Zend_Db::BIGINT_TYPE
+                \Zend_Db::INT_TYPE
             )->where(
                 't_d.attribute_id IN (?)',
                 $attributeIds,
-                \Zend_Db::BIGINT_TYPE
+                \Zend_Db::INT_TYPE
             )->joinLeft(
                 ['t_s' => $table],
                 implode(' AND ', $joinCondition),
@@ -195,11 +195,11 @@ protected function _getLoadAttributesSelect($table, $attributeIds = [])
             )->where(
                 "e.entity_id IN (?)",
                 array_keys($this->_itemsById),
-                \Zend_Db::BIGINT_TYPE
+                \Zend_Db::INT_TYPE
             )->where(
                 'attribute_id IN (?)',
                 $attributeIds,
-                \Zend_Db::BIGINT_TYPE
+                \Zend_Db::INT_TYPE
             )->where(
                 'store_id = ?',
                 $this->getDefaultStoreId()
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product.php b/app/code/Magento/Catalog/Model/ResourceModel/Product.php
index fc50b78338333..b174e4beb6353 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product.php
@@ -236,7 +236,7 @@ public function getWebsiteIdsByProductIds($productIds)
         )->where(
             'product_id IN (?)',
             $productIds,
-            \Zend_Db::BIGINT_TYPE
+            \Zend_Db::INT_TYPE
         );
         $productsWebsites = [];
         foreach ($this->getConnection()->fetchAll($select) as $productInfo) {
@@ -361,7 +361,7 @@ private function deleteSelectedEntityAttributeRows(DataObject $product, array $a
         $entityId = $product->getData($entityIdField);
         foreach ($backendTables as $backendTable => $attributes) {
             $connection = $this->getConnection();
-            $where = $connection->quoteInto('attribute_id IN (?)', $attributes, \Zend_Db::BIGINT_TYPE);
+            $where = $connection->quoteInto('attribute_id IN (?)', $attributes, \Zend_Db::INT_TYPE);
             $where .= $connection->quoteInto(" AND {$entityIdField} = ?", $entityId);
             $connection->delete($backendTable, $where);
         }
@@ -454,6 +454,7 @@ public function getAvailableInCategories($object)
         // fetching all parent IDs, including those are higher on the tree
         $entityId = (int)$object->getEntityId();
         if (!isset($this->availableCategoryIdsCache[$entityId])) {
+            $unionTables = [];
             foreach ($this->_storeManager->getStores() as $store) {
                 $unionTables[] = $this->getAvailableInCategoriesSelect(
                     $entityId,
@@ -599,7 +600,7 @@ public function getProductsSku(array $productIds)
         )->where(
             'entity_id IN (?)',
             $productIds,
-            \Zend_Db::BIGINT_TYPE
+            \Zend_Db::INT_TYPE
         );
         return $this->getConnection()->fetchAll($select);
     }
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
index 231176b3f2447..7dbfe0d5fccea 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
@@ -859,7 +859,7 @@ protected function doAddWebsiteNamesToResult()
             )->where(
                 'product_website.product_id IN (?)',
                 array_keys($productWebsites),
-                \Zend_Db::BIGINT_TYPE
+                \Zend_Db::INT_TYPE
             )->where(
                 'website.website_id > ?',
                 0
@@ -1359,7 +1359,7 @@ public function addCountToCategories($categoryCollection)
                 $anchorStmt = clone $select;
                 $anchorStmt->limit();
                 //reset limits
-                $anchorStmt->where('count_table.category_id IN (?)', $isAnchor, \Zend_Db::BIGINT_TYPE);
+                $anchorStmt->where('count_table.category_id IN (?)', $isAnchor, \Zend_Db::INT_TYPE);
                 $productCounts += $this->getConnection()->fetchPairs($anchorStmt);
                 $anchorStmt = null;
             }
@@ -1367,7 +1367,7 @@ public function addCountToCategories($categoryCollection)
                 $notAnchorStmt = clone $select;
                 $notAnchorStmt->limit();
                 //reset limits
-                $notAnchorStmt->where('count_table.category_id IN (?)', $isNotAnchor, \Zend_Db::BIGINT_TYPE);
+                $notAnchorStmt->where('count_table.category_id IN (?)', $isNotAnchor, \Zend_Db::INT_TYPE);
                 $notAnchorStmt->where('count_table.is_parent = 1');
                 $productCounts += $this->getConnection()->fetchPairs($notAnchorStmt);
                 $notAnchorStmt = null;
@@ -2166,7 +2166,7 @@ public function addCategoryIds()
         $select = $this->getConnection()->select();
 
         $select->from($this->_productCategoryTable, ['product_id', 'category_id']);
-        $select->where('product_id IN (?)', $ids, \Zend_Db::BIGINT_TYPE);
+        $select->where('product_id IN (?)', $ids, \Zend_Db::INT_TYPE);
 
         $data = $this->getConnection()->fetchAll($select);
 
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php
index b3caeb80b2da7..ef274b1bef55e 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php
@@ -488,7 +488,7 @@ public function getProductImages($product, $storeIds)
         )->where(
             'store_id IN (?)',
             $storeIds,
-            \Zend_Db::BIGINT_TYPE
+            \Zend_Db::INT_TYPE
         )->where(
             'attribute_code IN (?)',
             ['small_image', 'thumbnail', 'image']
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 78f0f69541d71..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
@@ -775,7 +775,7 @@ protected function _movePriceDataToIndexTable($entityIds = null)
         $select = $connection->select()->from($table, $columns);
 
         if ($entityIds !== null) {
-            $select->where('entity_id in (?)', count($entityIds) > 0 ? $entityIds : 0, \Zend_Db::BIGINT_TYPE);
+            $select->where('entity_id in (?)', count($entityIds) > 0 ? $entityIds : 0, \Zend_Db::INT_TYPE);
         }
 
         $query = $select->insertFromSelect($this->getIdxTable(), [], false);
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/TierPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/TierPrice.php
index 602c2c781443e..aa66978fa0036 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/TierPrice.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/TierPrice.php
@@ -193,7 +193,7 @@ private function getTierPriceSelect(bool $isAllWebsites, bool $isAllCustomerGrou
             []
         );
         if (!empty($entityIds)) {
-            $select->where('entity.entity_id IN (?)', $entityIds, \Zend_Db::BIGINT_TYPE);
+            $select->where('entity.entity_id IN (?)', $entityIds, \Zend_Db::INT_TYPE);
         }
         $this->joinWebsites($select, $isAllWebsites);
         $this->joinCustomerGroups($select, $isAllCustomerGroups);
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php
index 81569fb581273..bca919e700364 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Link/Product/Collection.php
@@ -212,7 +212,7 @@ public function setIsStrongMode()
     /**
      * Retrieve collection link model
      *
-     * @return LinkModel
+     * @return \Magento\Catalog\Model\Product\Link
      */
     public function getLinkModel()
     {
@@ -262,7 +262,7 @@ public function addExcludeProductFilter($products)
             $this->getSelect()->where(
                 'links.linked_product_id NOT IN (?)',
                 $products,
-                \Zend_Db::BIGINT_TYPE
+                \Zend_Db::INT_TYPE
             );
         }
         return $this;
@@ -284,7 +284,7 @@ public function addProductFilter($products)
             $this->getSelect()->where(
                 "product_entity_table.$identifierField IN (?)",
                 $products,
-                \Zend_Db::BIGINT_TYPE
+                \Zend_Db::INT_TYPE
             );
             $this->_hasLinkFilter = true;
         }
@@ -350,14 +350,14 @@ protected function _joinLinks()
                 $this->getSelect()->where(
                     'links.product_id in (?)',
                     $this->productIds,
-                    \Zend_Db::BIGINT_TYPE
+                    \Zend_Db::INT_TYPE
                 );
             } else {
                 $joinType = 'joinLeft';
                 $joinCondition[] = $connection->quoteInto(
                     'links.product_id in (?)',
                     $this->productIds,
-                    \Zend_Db::BIGINT_TYPE
+                    \Zend_Db::INT_TYPE
                 );
             }
             if (count($this->productIds) === 1) {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Website.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Website.php
index dc5efb83c86c7..eee5106579255 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Website.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Website.php
@@ -126,7 +126,7 @@ public function getWebsites($productIds)
         )->where(
             'product_id IN (?)',
             $productIds,
-            \Zend_Db::BIGINT_TYPE
+            \Zend_Db::INT_TYPE
         );
         $rowset = $this->getConnection()->fetchAll($select);
 
diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/ProductPriceIndexFilter.php b/app/code/Magento/CatalogInventory/Model/Indexer/ProductPriceIndexFilter.php
index 514cd2e3e88c5..2ad7ca9f14963 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/ProductPriceIndexFilter.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/ProductPriceIndexFilter.php
@@ -105,7 +105,7 @@ public function modifyPrice(IndexTableStructure $priceTable, array $entityIds =
         }
 
         if (!empty($entityIds)) {
-            $select->where('stock_item.product_id in (?)', $entityIds, \Zend_Db::BIGINT_TYPE);
+            $select->where('stock_item.product_id in (?)', $entityIds, \Zend_Db::INT_TYPE);
         }
 
         $select->group('stock_item.product_id');
diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/CacheCleaner.php b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/CacheCleaner.php
index e38ff58dfe1f6..f1cef90fc68ca 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/CacheCleaner.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/CacheCleaner.php
@@ -118,7 +118,7 @@ private function getProductStockStatuses(array $productIds)
                 'cpr.parent_id = cpe.' . $linkField,
                 ['parent_id' => 'cpe.entity_id']
             )
-            ->where('product_id IN (?)', $productIds, \Zend_Db::BIGINT_TYPE)
+            ->where('product_id IN (?)', $productIds, \Zend_Db::INT_TYPE)
             ->where('stock_id = ?', Stock::DEFAULT_STOCK_ID)
             ->where('website_id = ?', $this->stockConfiguration->getDefaultScopeId());
 
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock.php
index c818fb029367d..f994bb8fe26a1 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock.php
@@ -138,18 +138,18 @@ public function lockProductsStock(array $productIds, $websiteId)
         $itemIds = [];
         $preSelect = $this->getConnection()->select()->from($itemTable, 'item_id')
             ->where('website_id = ?', $websiteId)
-            ->where('product_id IN(?)', $productIds, \Zend_Db::BIGINT_TYPE);
+            ->where('product_id IN(?)', $productIds, \Zend_Db::INT_TYPE);
         foreach ($this->getConnection()->query($preSelect)->fetchAll() as $item) {
             $itemIds[] = (int)$item['item_id'];
         }
 
         $select = $this->getConnection()->select()->from(['si' => $itemTable])
-            ->where('item_id IN (?)', $itemIds, \Zend_Db::BIGINT_TYPE)
+            ->where('item_id IN (?)', $itemIds, \Zend_Db::INT_TYPE)
             ->forUpdate(true);
 
         $productTable = $this->getTable('catalog_product_entity');
         $selectProducts = $this->getConnection()->select()->from(['p' => $productTable], [])
-            ->where('entity_id IN (?)', $productIds, \Zend_Db::BIGINT_TYPE)
+            ->where('entity_id IN (?)', $productIds, \Zend_Db::INT_TYPE)
             ->columns(
                 [
                     'product_id' => 'entity_id',
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php
index f98ff1c764acd..02e443d09b228 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php
@@ -340,7 +340,7 @@ public function getProductStatus($productIds, $storeId = null)
 
         if ($storeId === null || $storeId == Store::DEFAULT_STORE_ID) {
             $select = $connection->select()->from($attributeTable, [$linkField, 'value'])
-                ->where("{$linkField} IN (?)", $productIds, \Zend_Db::BIGINT_TYPE)
+                ->where("{$linkField} IN (?)", $productIds, \Zend_Db::INT_TYPE)
                 ->where('attribute_id = ?', $attribute->getAttributeId())
                 ->where('store_id = ?', Store::DEFAULT_STORE_ID);
 
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/ProductPriceIndexModifier.php b/app/code/Magento/CatalogRule/Model/Indexer/ProductPriceIndexModifier.php
index 7f64573587ca0..90e50538bcba3 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/ProductPriceIndexModifier.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/ProductPriceIndexModifier.php
@@ -71,7 +71,7 @@ public function modifyPrice(IndexTableStructure $priceTable, array $entityIds =
             []
         );
         if ($entityIds) {
-            $select->where('i.entity_id IN (?)', $entityIds, \Zend_Db::BIGINT_TYPE);
+            $select->where('i.entity_id IN (?)', $entityIds, \Zend_Db::INT_TYPE);
         }
 
         $finalPrice = $priceTable->getFinalPriceField();
diff --git a/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/ConfigurableProductsProvider.php b/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/ConfigurableProductsProvider.php
index 2233c6e60ae08..1ef0490092b40 100644
--- a/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/ConfigurableProductsProvider.php
+++ b/app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/ConfigurableProductsProvider.php
@@ -42,7 +42,7 @@ public function getIds(array $ids)
                     ->select()
                     ->from(['e' => $this->resource->getTableName('catalog_product_entity')], ['e.entity_id'])
                     ->where('e.type_id = ?', \Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE)
-                    ->where('e.entity_id IN (?)', $ids, \Zend_Db::BIGINT_TYPE)
+                    ->where('e.entity_id IN (?)', $ids, \Zend_Db::INT_TYPE)
             );
         }
         return $this->productIds[$key];
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 00b689ff1eb89..8c4690f044764 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php
@@ -242,7 +242,7 @@ private function getSelectForSearchableProducts(
         $this->joinAttribute($select, 'status', $storeId, [Status::STATUS_ENABLED]);
 
         if ($productIds !== null) {
-            $select->where('e.entity_id IN (?)', $productIds, \Zend_Db::BIGINT_TYPE);
+            $select->where('e.entity_id IN (?)', $productIds, \Zend_Db::INT_TYPE);
         }
         $select->where('e.entity_id > ?', $lastProductId);
         $select->order('e.entity_id');
@@ -411,7 +411,7 @@ public function getProductAttributes($storeId, array $productIds, array $attribu
             )->where(
                 'cpe.entity_id IN (?)',
                 $productIds,
-                \Zend_Db::BIGINT_TYPE
+                \Zend_Db::INT_TYPE
             )
         );
         foreach ($attributeTypes as $backendType => $attributeIds) {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
index b8d3fcf90580d..3ce8a96fb5070 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
@@ -317,7 +317,7 @@ protected function getProductIdsFromParents(array $entityIds)
             ->select()
             ->from(['relation' => $this->getTable('catalog_product_relation')], [])
             ->distinct(true)
-            ->where('child_id IN (?)', $entityIds, \Zend_Db::BIGINT_TYPE)
+            ->where('child_id IN (?)', $entityIds, \Zend_Db::INT_TYPE)
             ->join(
                 ['cpe' => $this->getTable('catalog_product_entity')],
                 'relation.parent_id = cpe.' . $linkField,
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php
index 4617b27435cda..ad6d37c296012 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php
@@ -117,7 +117,7 @@ public function getRelationsByChild($childIds)
             )->where(
                 'relation.child_id IN (?)',
                 $childIds,
-                \Zend_Db::BIGINT_TYPE
+                \Zend_Db::INT_TYPE
             );
 
         return $connection->fetchCol($select);
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php
index df4f834006e80..d37f0f8a5153b 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Search/Collection.php
@@ -259,7 +259,7 @@ protected function _getSearchEntityIdsSql($query, $searchOnlyInCurrentStore = tr
             )->where(
                 't1.attribute_id IN (?)',
                 $attributeIds,
-                \Zend_Db::BIGINT_TYPE
+                \Zend_Db::INT_TYPE
             )->where(
                 't1.store_id = ?',
                 0
@@ -334,7 +334,7 @@ protected function _getSearchInOptionSql($query)
         )->where(
             'o.attribute_id IN (?)',
             $attributeIds,
-            \Zend_Db::BIGINT_TYPE
+            \Zend_Db::INT_TYPE
         )->where(
             $this->_resourceHelper->getCILike($ifValue, $this->_searchQuery, ['position' => 'any'])
         );
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 51fed8ed6deb1..6031ab6f8f8ae 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
@@ -221,7 +221,7 @@ private function fillTemporaryOptionsTable(string $temporaryOptionsTableName, ar
             ['le.entity_id', 'customer_group_id', 'website_id']
         );
         if ($entityIds !== null) {
-            $select->where('le.entity_id IN (?)', $entityIds, \Zend_Db::BIGINT_TYPE);
+            $select->where('le.entity_id IN (?)', $entityIds, \Zend_Db::INT_TYPE);
         }
         $this->tableMaintainer->insertFromSelect($select, $temporaryOptionsTableName, []);
     }
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable.php
index 0abfd953e3435..9d779d9704c29 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable.php
@@ -174,7 +174,7 @@ public function getChildrenIds($parentId, $required = true)
         )->where(
             'p.entity_id IN (?)',
             $parentId,
-            \Zend_Db::BIGINT_TYPE
+            \Zend_Db::INT_TYPE
         );
 
         $childrenIds = [
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php
index f699eae23e359..e4b9acbde3030 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Attribute/Collection.php
@@ -287,7 +287,7 @@ protected function _loadLabels()
             )->where(
                 'def.product_super_attribute_id IN (?)',
                 array_keys($this->_items),
-                \Zend_Db::BIGINT_TYPE
+                \Zend_Db::INT_TYPE
             )->where(
                 'def.store_id = ?',
                 0
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php
index 9acb5c1f78647..cefd4b815d729 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php
@@ -85,7 +85,7 @@ protected function _renderFilters()
             $parentIds[] = $product->getData($metadata->getLinkField());
         }
 
-        $this->getSelect()->where('link_table.parent_id in (?)', $parentIds, \Zend_Db::BIGINT_TYPE);
+        $this->getSelect()->where('link_table.parent_id in (?)', $parentIds, \Zend_Db::INT_TYPE);
 
         return $this;
     }
diff --git a/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php b/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
index fc3a7676ee5ed..b29d45f75c993 100644
--- a/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
+++ b/app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php
@@ -679,6 +679,9 @@ public function joinAttribute($alias, $attribute, $bind, $filter = null, $joinTy
             throw new LocalizedException(__('The foreign key is invalid. Verify the foreign key and try again.'));
         }
 
+        $entity = null;
+        $attrArr = [];
+
         // try to explode combined entity/attribute if supplied
         if (is_string($attribute)) {
             $attrArr = explode('/', $attribute);
@@ -1121,12 +1124,13 @@ public function _loadEntities($printQuery = false, $logQuery = false)
 
         $this->printLogQuery($printQuery, $logQuery);
 
+        /**
+         * Prepare select query
+         * @var string|\Magento\Framework\DB\Select $query
+         */
+        $query = $this->getSelect();
+
         try {
-            /**
-             * Prepare select query
-             * @var string $query
-             */
-            $query = $this->getSelect();
             $rows = $this->_fetchAll($query);
         } catch (\Exception $e) {
             $this->printLogQuery(false, true, $query);
@@ -1192,12 +1196,12 @@ public function _loadAttributes($printQuery = false, $logQuery = false)
         $selectGroups = $this->_resourceHelper->getLoadAttributesSelectGroups($selects);
         foreach ($selectGroups as $selects) {
             if (!empty($selects)) {
+                if (is_array($selects)) {
+                    $select = implode(' UNION ALL ', $selects);
+                } else {
+                    $select = $selects;
+                }
                 try {
-                    if (is_array($selects)) {
-                        $select = implode(' UNION ALL ', $selects);
-                    } else {
-                        $select = $selects;
-                    }
                     $values = $this->getConnection()->fetchAll($select);
                 } catch (\Exception $e) {
                     $this->printLogQuery(true, true, $select);
@@ -1239,11 +1243,11 @@ protected function _getLoadAttributesSelect($table, $attributeIds = [])
             )->where(
                 " e.entity_id IN (?)",
                 array_keys($this->_itemsById),
-                \Zend_Db::BIGINT_TYPE
+                \Zend_Db::INT_TYPE
             )->where(
                 't_d.attribute_id IN (?)',
                 $attributeIds,
-                \Zend_Db::BIGINT_TYPE
+                \Zend_Db::INT_TYPE
             );
 
         if ($entity->getEntityTable() == \Magento\Eav\Model\Entity::DEFAULT_ENTITY_TABLE && $entity->getTypeId()) {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php
index c3569fa3f75f8..29cad62bf0ca4 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php
@@ -779,7 +779,7 @@ public function getValidAttributeIds($attributeIds)
         )->where(
             'attribute_id IN (?)',
             $attributeIds,
-            \Zend_Db::BIGINT_TYPE
+            \Zend_Db::INT_TYPE
         );
 
         return $connection->fetchCol($select);
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php
index b354d8682e2d1..bcd8f2bb04e69 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Collection.php
@@ -233,7 +233,7 @@ public function setInAllAttributeSetsFilter(array $setIds)
                 ->where(
                     'entity_attribute.attribute_set_id IN (?)',
                     $setIds,
-                    \Zend_Db::BIGINT_TYPE
+                    \Zend_Db::INT_TYPE
                 )
                 ->group('entity_attribute.attribute_id')
                 ->having(new \Zend_Db_Expr('COUNT(*)') . ' = ' . count($setIds));
@@ -407,7 +407,7 @@ protected function _addSetInfo()
                 )->where(
                     'attribute_id IN (?)',
                     $attributeIds,
-                    \Zend_Db::BIGINT_TYPE
+                    \Zend_Db::INT_TYPE
                 );
                 $result = $connection->fetchAll($select);
 
@@ -439,7 +439,7 @@ protected function _addSetInfo()
     /**
      * Ad information about attribute sets to collection result data
      *
-     * @return $this
+     * @return \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
      */
     protected function _afterLoadData()
     {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php b/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php
index b831336493958..e8c8d4c5190fe 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php
@@ -152,7 +152,7 @@ public function execute($entityType, $entityData, $arguments = [])
                         ['value' => 't.value', 'attribute_id' => 't.attribute_id']
                     )
                     ->where($metadata->getLinkField() . ' = ?', $entityData[$metadata->getLinkField()])
-                    ->where('attribute_id IN (?)', $attributeIds, \Zend_Db::BIGINT_TYPE);
+                    ->where('attribute_id IN (?)', $attributeIds, \Zend_Db::INT_TYPE);
                 $attributeIdentifiers = [];
                 foreach ($context as $scope) {
                     //TODO: if (in table exists context field)

From 22e613ce6486a3e4c291b756cd9c02e04a57aed9 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Fri, 21 Aug 2020 15:11:07 +0300
Subject: [PATCH 1601/1718] 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 a7a20f8f1ec67aa74f350dfb03d12a7a0061bfc8 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Fri, 21 Aug 2020 15:24:29 +0300
Subject: [PATCH 1602/1718] Cover Used In information is not displayed after
 the entity was deleted with mftf tests

---
 ...talogUiVerifyUsedInLinkCategoryGridTest.xml |  7 +++++--
 ...eryUsedInSectionNotDisplayedActionGroup.xml | 18 ++++++++++++++++++
 ...nEnhancedMediaGalleryViewDetailsSection.xml |  1 +
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup.xml

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
index 7e0fa6c477c45..502b26b4a2aec 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
@@ -23,14 +23,12 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
-            <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
             <actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
             <actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectSecondImageToDelete">
                 <argument name="imageName" value="{{UpdatedImageDetails.title}}"/>
             </actionGroup>
             <actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
             <actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
-            <deleteData createDataKey="category" stepKey="deleteCategory"/>
         </after>
 
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openCategoryPage"/>
@@ -60,5 +58,10 @@
         <actionGroup ref="AdminMediaGalleryAssertCategoryNameInCategoryGridActionGroup" stepKey="assertCategoryInGrid">
             <argument name="categoryName" value="$$category.name$$"/>
         </actionGroup>
+        <deleteData createDataKey="category" stepKey="deleteCategory"/>
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetailsToVerfifyEmptyUsedIn"/>
+        <actionGroup ref="AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup" stepKey="assertThereIsNoUsedInSection"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeDetails"/>
    </test>
 </tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup.xml
new file mode 100644
index 0000000000000..afee0ed681ab1
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup.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="AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup">
+        <annotations>
+            <description>Assert thats used in section not displayed in vew details.</description>
+        </annotations>
+
+        <dontSeeElement selector="{{AdminEnhancedMediaGalleryViewDetailsSection.usedIn}}" stepKey="assertImageIsDeleted"/>
+    </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 e63429677fbae..d6abe464048c7 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryViewDetailsSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryViewDetailsSection.xml
@@ -19,6 +19,7 @@
         <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="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"/>

From 80efa90b4bc82b0d26e71614b4a7729f924d4caf Mon Sep 17 00:00:00 2001
From: Vadim Malesh <51680850+engcom-Charlie@users.noreply.github.com>
Date: Fri, 21 Aug 2020 15:35:52 +0300
Subject: [PATCH 1603/1718] add test case Id

---
 .../Test/Mftf/Test/AdminCheckAnalyticsTrackingTest.xml           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/AdminAnalytics/Test/Mftf/Test/AdminCheckAnalyticsTrackingTest.xml b/app/code/Magento/AdminAnalytics/Test/Mftf/Test/AdminCheckAnalyticsTrackingTest.xml
index cd79851d16b96..4f0e9bb000a27 100644
--- a/app/code/Magento/AdminAnalytics/Test/Mftf/Test/AdminCheckAnalyticsTrackingTest.xml
+++ b/app/code/Magento/AdminAnalytics/Test/Mftf/Test/AdminCheckAnalyticsTrackingTest.xml
@@ -14,6 +14,7 @@
             <title value="AdminAnalytics Check Tracking."/>
             <description value="AdminAnalytics Check Tracking."/>
             <severity value="MINOR"/>
+            <testCaseId value="MC-36869"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>

From 54c8ebc95dd9391db5a983ff7d63dbb3f8489b35 Mon Sep 17 00:00:00 2001
From: Vadim Malesh <51680850+engcom-Charlie@users.noreply.github.com>
Date: Fri, 21 Aug 2020 16:01:09 +0300
Subject: [PATCH 1604/1718] add test case id

---
 .../Mftf/Test/StorefrontCheckoutWithWithVirtualProductTest.xml   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontCheckoutWithWithVirtualProductTest.xml b/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontCheckoutWithWithVirtualProductTest.xml
index b1e676b8b5188..632950120474d 100644
--- a/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontCheckoutWithWithVirtualProductTest.xml
+++ b/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontCheckoutWithWithVirtualProductTest.xml
@@ -15,6 +15,7 @@
             <title value="Check error when cart contains virtual product"/>
             <description value="Check error when cart contains only virtual product"/>
             <severity value="MAJOR"/>
+            <testCaseId value="MC-36921"/>
             <group value="Multishipment"/>
         </annotations>
         <before>

From 338f5105f4158b30e1678e8227b88c61bd0e89e6 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Fri, 21 Aug 2020 16:33:48 +0300
Subject: [PATCH 1605/1718] 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 408cdb75204f9d95ff3b8dfadf881318c703ec68 Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Fri, 21 Aug 2020 22:01:21 +0800
Subject: [PATCH 1606/1718] magento/adobe-stock-integration#1504:Extract logic
 from controller to a model to enable before plugin interception of parameters
 - Fix static test

---
 .../Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
index 5ac16cf3a7c2c..d504a211e7861 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
@@ -33,7 +33,7 @@ public function __construct(
         $this->resultRawFactory = $resultRawFactory;
         parent::__construct($context, $coreRegistry);
         $this->getInsertImageContent = $getInsertImageContent ?: $this->_objectManager
-            ->get('Magento\Cms\Model\Wysiwyg\Images\GetInsertImageContent');
+            ->get(\Magento\Cms\Model\Wysiwyg\Images\GetInsertImageContent::class);
     }
 
     /**

From d6de4c43fe3280df8202c2e0c6254328c36d1d49 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Fri, 21 Aug 2020 17:54:00 +0300
Subject: [PATCH 1607/1718] Update
 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup.xml

Co-authored-by: Barny Shergold <barny.shergold@vaimo.com>
---
 ...EnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup.xml
index afee0ed681ab1..62adffc931c16 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup.xml
@@ -10,7 +10,7 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup">
         <annotations>
-            <description>Assert thats used in section not displayed in vew details.</description>
+            <description>Assert that's used in section not displayed in view details.</description>
         </annotations>
 
         <dontSeeElement selector="{{AdminEnhancedMediaGalleryViewDetailsSection.usedIn}}" stepKey="assertImageIsDeleted"/>

From 4fd39eac5c9aa26b55f7caff296000201a2acdb3 Mon Sep 17 00:00:00 2001
From: Roman Lytvynenko <lytvynen@adobe.com>
Date: Fri, 21 Aug 2020 10:20:46 -0500
Subject: [PATCH 1608/1718] MC-36647: Order can be placed as a customer after
 session cookie expiration with Persistent Cart enabled

---
 .../Model/Plugin/CustomerAuthorization.php    | 80 +++++++++++++++++++
 .../Magento/Persistent/etc/webapi_rest/di.xml |  3 +
 .../Magento/Persistent/etc/webapi_soap/di.xml |  3 +
 3 files changed, 86 insertions(+)
 create mode 100644 app/code/Magento/Persistent/Model/Plugin/CustomerAuthorization.php

diff --git a/app/code/Magento/Persistent/Model/Plugin/CustomerAuthorization.php b/app/code/Magento/Persistent/Model/Plugin/CustomerAuthorization.php
new file mode 100644
index 0000000000000..d7475c725b481
--- /dev/null
+++ b/app/code/Magento/Persistent/Model/Plugin/CustomerAuthorization.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Persistent\Model\Plugin;
+
+use Closure;
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\Customer\Model\Session as CustomerSession;
+use Magento\Framework\Authorization;
+use Magento\Integration\Api\AuthorizationServiceInterface as AuthorizationService;
+use Magento\Persistent\Helper\Session as PersistentSession;
+
+/**
+ * Plugin around \Magento\Framework\Authorization::isAllowed
+ *
+ * Performs the check if the customer is logged in prior placing order on his behalf when the persistent cart is active
+ */
+class CustomerAuthorization
+{
+    /**
+     * @var UserContextInterface
+     */
+    private $userContext;
+
+    /**
+     * @var CustomerSession
+     */
+    private $customerSession;
+
+    /**
+     * @var PersistentSession
+     */
+    private $persistentSession;
+
+    /**
+     * @param UserContextInterface $userContext
+     * @param CustomerSession $customerSession
+     * @param PersistentSession $persistentSession
+     */
+    public function __construct(
+        UserContextInterface $userContext,
+        CustomerSession $customerSession,
+        PersistentSession $persistentSession
+    ) {
+        $this->userContext = $userContext;
+        $this->customerSession = $customerSession;
+        $this->persistentSession = $persistentSession;
+    }
+
+    /**
+     * Check if the customer is logged in prior placing order on his behalf when the persistent cart is active
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @param Authorization $subject
+     * @param Closure $proceed
+     * @param $resource
+     * @param null $privilege
+     * @return false|mixed
+     */
+    public function aroundIsAllowed(
+        Authorization $subject,
+        Closure $proceed,
+        $resource,
+        $privilege = null
+    ) {
+        if ($resource == AuthorizationService::PERMISSION_SELF
+            && $this->userContext->getUserId()
+            && $this->userContext->getUserType() === UserContextInterface::USER_TYPE_CUSTOMER
+            && !$this->customerSession->isLoggedIn()
+            && $this->persistentSession->isPersistent()
+        ) {
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/app/code/Magento/Persistent/etc/webapi_rest/di.xml b/app/code/Magento/Persistent/etc/webapi_rest/di.xml
index cb0aec6b460af..21a47576b1a08 100644
--- a/app/code/Magento/Persistent/etc/webapi_rest/di.xml
+++ b/app/code/Magento/Persistent/etc/webapi_rest/di.xml
@@ -13,4 +13,7 @@
         <plugin name="persistent_convert_customer_cart_to_guest_cart"
                 type="Magento\Persistent\Model\Checkout\GuestShippingInformationManagementPlugin"/>
     </type>
+    <type name="Magento\Framework\Authorization">
+        <plugin name="customerAuthorization" type="Magento\Persistent\Model\Plugin\CustomerAuthorization" />
+    </type>
 </config>
diff --git a/app/code/Magento/Persistent/etc/webapi_soap/di.xml b/app/code/Magento/Persistent/etc/webapi_soap/di.xml
index cb0aec6b460af..21a47576b1a08 100644
--- a/app/code/Magento/Persistent/etc/webapi_soap/di.xml
+++ b/app/code/Magento/Persistent/etc/webapi_soap/di.xml
@@ -13,4 +13,7 @@
         <plugin name="persistent_convert_customer_cart_to_guest_cart"
                 type="Magento\Persistent\Model\Checkout\GuestShippingInformationManagementPlugin"/>
     </type>
+    <type name="Magento\Framework\Authorization">
+        <plugin name="customerAuthorization" type="Magento\Persistent\Model\Plugin\CustomerAuthorization" />
+    </type>
 </config>

From a572253280b0cfe296be7622288cc06453bb171f Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Fri, 21 Aug 2020 18:27:42 +0300
Subject: [PATCH 1609/1718] 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 51188d9a565bada56ed38dd5740f19b387db3029 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Fri, 21 Aug 2020 19:03:57 +0300
Subject: [PATCH 1610/1718] 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 228ebc5443a1c0d761e6015651b8aa176a2cf351 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Sat, 22 Aug 2020 00:31:35 +0800
Subject: [PATCH 1611/1718] magento/adobe-stock-integration#1775: [MFTF] Make
 AdminAssertCategoryGridPageDetailsActionGroup parametrized - modifications on
 enabled and in menu columns and mftf files

---
 .../AdminMediaGalleryCatalogUiCategoryGridSection.xml       | 6 +++---
 .../Ui/Component/Listing/Columns/InMenu.php                 | 4 ++--
 .../Ui/Component/Listing/Columns/IsActive.php               | 4 ++--
 .../ui_component/media_gallery_category_listing.xml         | 2 ++
 ...iaGalleryAssertCategoryNameInCategoryGridActionGroup.xml | 2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml
index 702be9ed4201d..a5ed4f54eca0f 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml
@@ -15,8 +15,8 @@
         <element name="name" type="text" selector="//tr//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//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//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//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//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//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Action')]/preceding-sibling::th) +1 ]//*[text()='{{edit}}']" parameterized="true"/>
+        <element name="inMenu" type="text" selector="//tr//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'In Menu')]/preceding-sibling::th) +1 ]//span[contains(@class, '{{inMenuValue}}')]" parameterized="true"/>
+        <element name="enabled" type="text" selector="//tr//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Enabled')]/preceding-sibling::th) +1 ]//span[contains(@class, '{{enabledValue}}')]" 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/Ui/Component/Listing/Columns/InMenu.php b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/InMenu.php
index fe4720b4a3e60..d1c2331b3f141 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/InMenu.php
+++ b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/InMenu.php
@@ -24,9 +24,9 @@ public function prepareDataSource(array $dataSource)
             $fieldName = $this->getData('name');
             foreach ($dataSource['data']['items'] as & $item) {
                 if (isset($item[$fieldName]) && $item[$fieldName] == 1) {
-                    $item[$fieldName] = 'Yes';
+                    $item[$fieldName] = '<span class="true">Yes</span>';
                 } else {
-                    $item[$fieldName] = 'No';
+                    $item[$fieldName] = '<span class="false">No</span>';
                 }
             }
         }
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/IsActive.php b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/IsActive.php
index c6f20c937d5b3..3485f54bdc68c 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/IsActive.php
+++ b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/IsActive.php
@@ -24,9 +24,9 @@ public function prepareDataSource(array $dataSource)
             $fieldName = $this->getData('name');
             foreach ($dataSource['data']['items'] as & $item) {
                 if (isset($item[$fieldName]) && $item[$fieldName] == 1) {
-                    $item[$fieldName] = 'Yes';
+                    $item[$fieldName] = '<span class="true">Yes</span>';
                 } else {
-                    $item[$fieldName] = 'No';
+                    $item[$fieldName] = '<span class="false">No</span>';
                 }
             }
         }
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..94ef605f856c7 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
@@ -170,11 +170,13 @@
         <column name="include_in_menu" class="Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Columns\InMenu">
             <settings>
                 <label translate="true">In Menu</label>
+                <bodyTmpl>ui/grid/cells/html</bodyTmpl>
             </settings>
         </column>
         <column name="is_active" class="Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Columns\IsActive">
             <settings>
                 <label translate="true">Enabled</label>
+                <bodyTmpl>ui/grid/cells/html</bodyTmpl>
             </settings>
         </column>
         <actionsColumn name="actions" class="Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Columns\CategoryActions" sortOrder="1000">
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertCategoryNameInCategoryGridActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertCategoryNameInCategoryGridActionGroup.xml
index 42d723f0811d3..cc4632bbdb86e 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertCategoryNameInCategoryGridActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertCategoryNameInCategoryGridActionGroup.xml
@@ -16,6 +16,6 @@
             <argument name="categoryName" type="string"/>
         </arguments>
 
-        <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.name('1', categoryName)}}" stepKey="assertNameColumn"/>
+        <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.name(categoryName)}}" stepKey="assertNameColumn"/>
      </actionGroup>
 </actionGroups>

From b44b04681b86e0de5b84ac5265aeb1c223d4e05a Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Sat, 22 Aug 2020 01:25:26 +0800
Subject: [PATCH 1612/1718] magento/adobe-stock-integration#1775: [MFTF] Make
 AdminAssertCategoryGridPageDetailsActionGroup parametrized - additional
 modifications for in menu and enabled column renderer and mftf files

---
 .../AdminAssertCategoryGridPageDetailsActionGroup.xml         | 1 -
 .../Ui/Component/Listing/Columns/InMenu.php                   | 4 ++--
 .../Ui/Component/Listing/Columns/IsActive.php                 | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertCategoryGridPageDetailsActionGroup.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertCategoryGridPageDetailsActionGroup.xml
index 92a56f3e37fbe..958b733613c50 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertCategoryGridPageDetailsActionGroup.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertCategoryGridPageDetailsActionGroup.xml
@@ -19,7 +19,6 @@
         <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.image(imageName)}}" stepKey="assertImageColumn"/>
         <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.path(category.name)}}" stepKey="assertPathColumn"/>
         <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.name(category.name)}}" stepKey="assertNameColumn"/>
-        <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.displayMode('PRODUCTS')}}" stepKey="assertDisplayModeColumn"/>
         <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.products('0')}}" stepKey="assertProductsColumn"/>
         <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.inMenu(category.include_in_menu)}}" stepKey="assertInMenuColumn"/>
         <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.enabled(category.is_active)}}" stepKey="assertEnabledColumn"/>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/InMenu.php b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/InMenu.php
index d1c2331b3f141..00b5dd87e8cf1 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/InMenu.php
+++ b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/InMenu.php
@@ -24,9 +24,9 @@ public function prepareDataSource(array $dataSource)
             $fieldName = $this->getData('name');
             foreach ($dataSource['data']['items'] as & $item) {
                 if (isset($item[$fieldName]) && $item[$fieldName] == 1) {
-                    $item[$fieldName] = '<span class="true">Yes</span>';
+                    $item[$fieldName] = '<span class="1">Yes</span>';
                 } else {
-                    $item[$fieldName] = '<span class="false">No</span>';
+                    $item[$fieldName] = '<span class="0">No</span>';
                 }
             }
         }
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/IsActive.php b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/IsActive.php
index 3485f54bdc68c..48464d6ffdcbc 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/IsActive.php
+++ b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/IsActive.php
@@ -24,9 +24,9 @@ public function prepareDataSource(array $dataSource)
             $fieldName = $this->getData('name');
             foreach ($dataSource['data']['items'] as & $item) {
                 if (isset($item[$fieldName]) && $item[$fieldName] == 1) {
-                    $item[$fieldName] = '<span class="true">Yes</span>';
+                    $item[$fieldName] = '<span class="1">Yes</span>';
                 } else {
-                    $item[$fieldName] = '<span class="false">No</span>';
+                    $item[$fieldName] = '<span class="0">No</span>';
                 }
             }
         }

From 3e0320f303de2c06e38d330f9197b6a25af9fd60 Mon Sep 17 00:00:00 2001
From: Roman Lytvynenko <lytvynen@adobe.com>
Date: Fri, 21 Aug 2020 17:40:20 -0500
Subject: [PATCH 1613/1718] MC-36647: Order can be placed as a customer after
 session cookie expiration with Persistent Cart enabled

---
 .../Customer/Model/Customer/Authorization.php | 77 +++++++++++++++++++
 .../Model/Customer/AuthorizationComposite.php | 41 ++++++++++
 .../Model/Plugin/CustomerAuthorization.php    | 74 ++++--------------
 .../Magento/Customer/etc/webapi_rest/di.xml   |  9 +++
 .../Magento/Customer/etc/webapi_soap/di.xml   |  9 +++
 .../Authorization.php}                        | 32 ++------
 .../Magento/Persistent/etc/webapi_rest/di.xml |  8 +-
 .../Magento/Persistent/etc/webapi_soap/di.xml |  8 +-
 8 files changed, 172 insertions(+), 86 deletions(-)
 create mode 100644 app/code/Magento/Customer/Model/Customer/Authorization.php
 create mode 100644 app/code/Magento/Customer/Model/Customer/AuthorizationComposite.php
 rename app/code/Magento/Persistent/Model/{Plugin/CustomerAuthorization.php => Customer/Authorization.php} (62%)

diff --git a/app/code/Magento/Customer/Model/Customer/Authorization.php b/app/code/Magento/Customer/Model/Customer/Authorization.php
new file mode 100644
index 0000000000000..f4e6d07affc84
--- /dev/null
+++ b/app/code/Magento/Customer/Model/Customer/Authorization.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Model\Customer;
+
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\Customer\Model\CustomerFactory;
+use Magento\Customer\Model\ResourceModel\Customer as CustomerResource;
+use Magento\Framework\AuthorizationInterface;
+use Magento\Integration\Api\AuthorizationServiceInterface as AuthorizationService;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Class to invalidate user credentials
+ */
+class Authorization implements AuthorizationInterface
+{
+    /**
+     * @var UserContextInterface
+     */
+    private $userContext;
+
+    /**
+     * @var CustomerFactory
+     */
+    private $customerFactory;
+
+    /**
+     * @var CustomerResource
+     */
+    private $customerResource;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @param UserContextInterface $userContext
+     * @param CustomerFactory $customerFactory
+     * @param CustomerResource $customerResource
+     * @param StoreManagerInterface $storeManager
+     */
+    public function __construct(
+        UserContextInterface $userContext,
+        CustomerFactory $customerFactory,
+        CustomerResource $customerResource,
+        StoreManagerInterface $storeManager
+    ) {
+        $this->userContext = $userContext;
+        $this->customerFactory = $customerFactory;
+        $this->customerResource = $customerResource;
+        $this->storeManager = $storeManager;
+    }
+
+    public function isAllowed($resource, $privilege = null)
+    {
+        if ($resource == AuthorizationService::PERMISSION_SELF
+            && $this->userContext->getUserId()
+            && $this->userContext->getUserType() === UserContextInterface::USER_TYPE_CUSTOMER
+        ) {
+            $customer = $this->customerFactory->create();
+            $this->customerResource->load($customer, $this->userContext->getUserId());
+            $currentStoreId = $this->storeManager->getStore()->getId();
+            $sharedStoreIds = $customer->getSharedStoreIds();
+            if (in_array($currentStoreId, $sharedStoreIds)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/app/code/Magento/Customer/Model/Customer/AuthorizationComposite.php b/app/code/Magento/Customer/Model/Customer/AuthorizationComposite.php
new file mode 100644
index 0000000000000..e643460a32789
--- /dev/null
+++ b/app/code/Magento/Customer/Model/Customer/AuthorizationComposite.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\Model\Customer;
+
+use Magento\Framework\AuthorizationInterface;
+
+/**
+ * Class to invalidate user credentials
+ */
+class AuthorizationComposite implements AuthorizationInterface
+{
+    /**
+     * @var AuthorizationInterface[]
+     */
+    private $authorizationChecks;
+
+    public function __construct(
+        array $authorizationChecks
+    ) {
+        $this->authorizationChecks = $authorizationChecks;
+    }
+
+    public function isAllowed($resource, $privilege = null)
+    {
+        $result = false;
+
+        foreach ($this->authorizationChecks as $authorizationCheck) {
+            $result = $authorizationCheck->isAllowed($resource, $privilege);
+            if (!$result) {
+                break;
+            }
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Customer/Model/Plugin/CustomerAuthorization.php b/app/code/Magento/Customer/Model/Plugin/CustomerAuthorization.php
index b877b2cca67a5..292c22fba512b 100644
--- a/app/code/Magento/Customer/Model/Plugin/CustomerAuthorization.php
+++ b/app/code/Magento/Customer/Model/Plugin/CustomerAuthorization.php
@@ -6,11 +6,9 @@
 
 namespace Magento\Customer\Model\Plugin;
 
-use Magento\Authorization\Model\UserContextInterface;
-use Magento\Customer\Model\CustomerFactory;
-use Magento\Customer\Model\ResourceModel\Customer as CustomerResource;
-use Magento\Integration\Api\AuthorizationServiceInterface as AuthorizationService;
-use Magento\Store\Model\StoreManagerInterface;
+use Closure;
+use Magento\Customer\Model\Customer\AuthorizationComposite;
+use Magento\Framework\Authorization;
 
 /**
  * Plugin around \Magento\Framework\Authorization::isAllowed
@@ -20,74 +18,36 @@
 class CustomerAuthorization
 {
     /**
-     * @var UserContextInterface
+     * @var AuthorizationComposite
      */
-    private $userContext;
-
-    /**
-     * @var CustomerFactory
-     */
-    private $customerFactory;
-
-    /**
-     * @var CustomerResource
-     */
-    private $customerResource;
-
-    /**
-     * @var StoreManagerInterface
-     */
-    private $storeManager;
+    private $authorizationComposite;
 
     /**
      * Inject dependencies.
-     *
-     * @param UserContextInterface $userContext
-     * @param CustomerFactory $customerFactory
-     * @param CustomerResource $customerResource
-     * @param StoreManagerInterface $storeManager
+     * @param AuthorizationComposite $composite
      */
     public function __construct(
-        UserContextInterface $userContext,
-        CustomerFactory $customerFactory,
-        CustomerResource $customerResource,
-        StoreManagerInterface $storeManager
+        AuthorizationComposite $composite
     ) {
-        $this->userContext = $userContext;
-        $this->customerFactory = $customerFactory;
-        $this->customerResource = $customerResource;
-        $this->storeManager = $storeManager;
+        $this->authorizationComposite = $composite;
     }
 
     /**
-     * Check if resource for which access is needed has self permissions defined in webapi config.
-     *
-     * @param \Magento\Framework\Authorization $subject
-     * @param callable $proceed
-     * @param string $resource
-     * @param string $privilege
-     *
-     * @return bool true If resource permission is self, to allow
-     * customer access without further checks in parent method
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @param Authorization $subject
+     * @param Closure $proceed
+     * @param $resource
+     * @param null $privilege
+     * @return bool|mixed
      */
     public function aroundIsAllowed(
-        \Magento\Framework\Authorization $subject,
-        \Closure $proceed,
+        Authorization $subject,
+        Closure $proceed,
         $resource,
         $privilege = null
     ) {
-        if ($resource == AuthorizationService::PERMISSION_SELF
-            && $this->userContext->getUserId()
-            && $this->userContext->getUserType() === UserContextInterface::USER_TYPE_CUSTOMER
-        ) {
-            $customer = $this->customerFactory->create();
-            $this->customerResource->load($customer, $this->userContext->getUserId());
-            $currentStoreId = $this->storeManager->getStore()->getId();
-            $sharedStoreIds = $customer->getSharedStoreIds();
-            if (in_array($currentStoreId, $sharedStoreIds)) {
-                return true;
-            }
+        if ($this->authorizationComposite->isAllowed($resource, $privilege)) {
+            return true;
         }
 
         return $proceed($resource, $privilege);
diff --git a/app/code/Magento/Customer/etc/webapi_rest/di.xml b/app/code/Magento/Customer/etc/webapi_rest/di.xml
index a349d07a5e222..d07d1a61c3d62 100644
--- a/app/code/Magento/Customer/etc/webapi_rest/di.xml
+++ b/app/code/Magento/Customer/etc/webapi_rest/di.xml
@@ -22,4 +22,13 @@
     <type name="Magento\Customer\Api\CustomerRepositoryInterface">
         <plugin name="updateCustomerByIdFromRequest" type="Magento\Customer\Model\Plugin\UpdateCustomer" />
     </type>
+    <type name="Magento\Customer\Model\Customer\AuthorizationComposite">
+        <arguments>
+            <argument name="authorizationChecks" xsi:type="array">
+                <item name="rest_customer_authorization" xsi:type="object">
+                    Magento\Customer\Model\Customer\Authorization
+                </item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Customer/etc/webapi_soap/di.xml b/app/code/Magento/Customer/etc/webapi_soap/di.xml
index 646ba98b4c5d8..c23de8ef3f7e1 100644
--- a/app/code/Magento/Customer/etc/webapi_soap/di.xml
+++ b/app/code/Magento/Customer/etc/webapi_soap/di.xml
@@ -9,4 +9,13 @@
      <type name="Magento\Framework\Authorization">
         <plugin name="customerAuthorization" type="Magento\Customer\Model\Plugin\CustomerAuthorization" />
     </type>
+    <type name="Magento\Customer\Model\Customer\AuthorizationComposite">
+        <arguments>
+            <argument name="authorizationChecks" xsi:type="array">
+                <item name="soap_customer_authorization" xsi:type="object">
+                    Magento\Customer\Model\Customer\Authorization
+                </item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Persistent/Model/Plugin/CustomerAuthorization.php b/app/code/Magento/Persistent/Model/Customer/Authorization.php
similarity index 62%
rename from app/code/Magento/Persistent/Model/Plugin/CustomerAuthorization.php
rename to app/code/Magento/Persistent/Model/Customer/Authorization.php
index d7475c725b481..e9687b2193475 100644
--- a/app/code/Magento/Persistent/Model/Plugin/CustomerAuthorization.php
+++ b/app/code/Magento/Persistent/Model/Customer/Authorization.php
@@ -4,21 +4,15 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Persistent\Model\Plugin;
+namespace Magento\Persistent\Model\Customer;
 
-use Closure;
 use Magento\Authorization\Model\UserContextInterface;
 use Magento\Customer\Model\Session as CustomerSession;
-use Magento\Framework\Authorization;
+use Magento\Framework\AuthorizationInterface;
 use Magento\Integration\Api\AuthorizationServiceInterface as AuthorizationService;
 use Magento\Persistent\Helper\Session as PersistentSession;
 
-/**
- * Plugin around \Magento\Framework\Authorization::isAllowed
- *
- * Performs the check if the customer is logged in prior placing order on his behalf when the persistent cart is active
- */
-class CustomerAuthorization
+class Authorization implements AuthorizationInterface
 {
     /**
      * @var UserContextInterface
@@ -50,31 +44,19 @@ public function __construct(
         $this->persistentSession = $persistentSession;
     }
 
-    /**
-     * Check if the customer is logged in prior placing order on his behalf when the persistent cart is active
-     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @param Authorization $subject
-     * @param Closure $proceed
-     * @param $resource
-     * @param null $privilege
-     * @return false|mixed
-     */
-    public function aroundIsAllowed(
-        Authorization $subject,
-        Closure $proceed,
+    public function isAllowed(
         $resource,
         $privilege = null
     ) {
         if ($resource == AuthorizationService::PERMISSION_SELF
             && $this->userContext->getUserId()
             && $this->userContext->getUserType() === UserContextInterface::USER_TYPE_CUSTOMER
-            && !$this->customerSession->isLoggedIn()
+            && $this->customerSession->isLoggedIn()
             && $this->persistentSession->isPersistent()
         ) {
-            return false;
+            return true;
         }
 
-        return true;
+        return false;
     }
 }
diff --git a/app/code/Magento/Persistent/etc/webapi_rest/di.xml b/app/code/Magento/Persistent/etc/webapi_rest/di.xml
index 21a47576b1a08..89504f0471788 100644
--- a/app/code/Magento/Persistent/etc/webapi_rest/di.xml
+++ b/app/code/Magento/Persistent/etc/webapi_rest/di.xml
@@ -13,7 +13,11 @@
         <plugin name="persistent_convert_customer_cart_to_guest_cart"
                 type="Magento\Persistent\Model\Checkout\GuestShippingInformationManagementPlugin"/>
     </type>
-    <type name="Magento\Framework\Authorization">
-        <plugin name="customerAuthorization" type="Magento\Persistent\Model\Plugin\CustomerAuthorization" />
+    <type name="Magento\Customer\Model\Customer\AuthorizationComposite">
+        <arguments>
+            <argument name="authorizationChecks" xsi:type="array">
+                <item name="persistent_rest_customer_authorization" xsi:type="object">Magento\Persistent\Model\Customer\Authorization</item>
+            </argument>
+        </arguments>
     </type>
 </config>
diff --git a/app/code/Magento/Persistent/etc/webapi_soap/di.xml b/app/code/Magento/Persistent/etc/webapi_soap/di.xml
index 21a47576b1a08..2a440fff03598 100644
--- a/app/code/Magento/Persistent/etc/webapi_soap/di.xml
+++ b/app/code/Magento/Persistent/etc/webapi_soap/di.xml
@@ -13,7 +13,11 @@
         <plugin name="persistent_convert_customer_cart_to_guest_cart"
                 type="Magento\Persistent\Model\Checkout\GuestShippingInformationManagementPlugin"/>
     </type>
-    <type name="Magento\Framework\Authorization">
-        <plugin name="customerAuthorization" type="Magento\Persistent\Model\Plugin\CustomerAuthorization" />
+    <type name="Magento\Customer\Model\Customer\AuthorizationComposite">
+        <arguments>
+            <argument name="authorizationChecks" xsi:type="array">
+                <item name="persistent_soap_customer_authorization" xsi:type="object">Magento\Persistent\Model\Customer\Authorization</item>
+            </argument>
+        </arguments>
     </type>
 </config>

From 8e6cb1358750eb5222a5336ed8233949ae20bfab Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Sat, 22 Aug 2020 21:19:24 +0300
Subject: [PATCH 1614/1718] Added StorefrontClickAddToCartButtonActionGroup

---
 ...rontGoToDetailsPageWhenAddingToCartTest.xml |  3 +--
 ...orefrontClickAddToCartButtonActionGroup.xml | 18 ++++++++++++++++++
 ...rUKCustomerRemainOptionAfterRefreshTest.xml |  2 +-
 ...eldShouldNotAcceptJustIntegerValuesTest.xml |  2 +-
 ...ckoutForProductsDeletedFromMiniCartTest.xml |  2 +-
 ...estWithMultipleAddressesAndTaxRatesTest.xml |  4 ++--
 ...stWithRestrictedCountriesForPaymentTest.xml |  2 +-
 .../StorefrontGuestCheckoutTest.xml            |  2 +-
 ...stWithRestrictedCountriesForPaymentTest.xml |  2 +-
 ...rontVerifySecureURLRedirectCheckoutTest.xml |  3 +--
 ...refrontConfigurableProductAddToCartTest.xml |  3 +--
 ...erifySecureURLRedirectMultishippingTest.xml |  3 +--
 .../Test/Mftf/Test/AdminCreateInvoiceTest.xml  |  2 +-
 ...reditMemoTotalAfterShippingDiscountTest.xml |  2 +-
 14 files changed, 32 insertions(+), 18 deletions(-)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontClickAddToCartButtonActionGroup.xml

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml
index f6866f813f258..88fc5b7171592 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/StorefrontGoToDetailsPageWhenAddingToCartTest.xml
@@ -71,8 +71,7 @@
 
         <!--Click add to cart-->
         <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
-        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addProductToCart"/>
-        <waitForPageLoad stepKey="waitForProductPage"/>
+        <actionGroup ref="StorefrontClickAddToCartButtonActionGroup" stepKey="addProductToCart"/>
 
         <!--Check for details page-->
         <seeInCurrentUrl url="{{BundleProduct.sku}}" stepKey="seeBundleProductDetailsPage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontClickAddToCartButtonActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontClickAddToCartButtonActionGroup.xml
new file mode 100644
index 0000000000000..3d240a21afc28
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontClickAddToCartButtonActionGroup.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="StorefrontClickAddToCartButtonActionGroup">
+        <annotations>
+            <description>Click "Add to Cart" button.</description>
+        </annotations>
+        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
+        <waitForPageLoad stepKey="waitAddToCart"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldForUKCustomerRemainOptionAfterRefreshTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldForUKCustomerRemainOptionAfterRefreshTest.xml
index 7eae5d0d292d1..e7e8f9f0ef699 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldForUKCustomerRemainOptionAfterRefreshTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldForUKCustomerRemainOptionAfterRefreshTest.xml
@@ -35,7 +35,7 @@
         <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
         <waitForPageLoad stepKey="waitForPageLoad1"/>
         <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
-        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
+        <actionGroup ref="StorefrontClickAddToCartButtonActionGroup" stepKey="addToCart"/>
         <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
         <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$createProduct.name$$ to your shopping cart." stepKey="seeAddedToCartMessage"/>
         <see selector="{{StorefrontMinicartSection.quantity}}" userInput="1" stepKey="seeCartQuantity"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldShouldNotAcceptJustIntegerValuesTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldShouldNotAcceptJustIntegerValuesTest.xml
index 12e1a6e9872d3..7c4b18e1aab89 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldShouldNotAcceptJustIntegerValuesTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/AddressStateFieldShouldNotAcceptJustIntegerValuesTest.xml
@@ -38,7 +38,7 @@
         <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
         <waitForPageLoad stepKey="waitForPageLoad1"/>
         <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
-        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
+        <actionGroup ref="StorefrontClickAddToCartButtonActionGroup" stepKey="addToCart"/>
         <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
         <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$createProduct.name$$ to your shopping cart." stepKey="seeAddedToCartMessage"/>
         <see selector="{{StorefrontMinicartSection.quantity}}" userInput="1" stepKey="seeCartQuantity"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml
index 313f5997e0af0..bf942e70cfa36 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml
@@ -40,7 +40,7 @@
         <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onStorefrontCategoryPage"/>
         <waitForPageLoad stepKey="waitForPageLoad1"/>
         <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
-        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addProductToCart"/>
+        <actionGroup ref="StorefrontClickAddToCartButtonActionGroup" stepKey="addProductToCart"/>
         <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
         <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$createSimpleProduct.name$$ to your shopping cart." stepKey="seeAddedToCartMessage"/>
         <see selector="{{StorefrontMinicartSection.quantity}}" userInput="1" stepKey="seeCartQuantity"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithMultipleAddressesAndTaxRatesTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithMultipleAddressesAndTaxRatesTest.xml
index 92150b1e99dd5..9747980801068 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithMultipleAddressesAndTaxRatesTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithMultipleAddressesAndTaxRatesTest.xml
@@ -83,7 +83,7 @@
         <amOnPage url="{{StorefrontCategoryPage.url($$simplecategory.name$$)}}" stepKey="onCategoryPage1"/>
         <waitForPageLoad stepKey="waitForCatalogPageLoad1"/>
         <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct1"/>
-        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart1"/>
+        <actionGroup ref="StorefrontClickAddToCartButtonActionGroup" stepKey="addToCart1"/>
         <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded1"/>
         <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$simpleproduct1.name$$ to your shopping cart." stepKey="seeAddedToCartMessage1"/>
         <see selector="{{StorefrontMinicartSection.quantity}}" userInput="1" stepKey="seeCartQuantity1"/>
@@ -102,7 +102,7 @@
         <amOnPage url="{{StorefrontCategoryPage.url($$simplecategory.name$$)}}" stepKey="onCategoryPage2"/>
         <waitForPageLoad stepKey="waitForCatalogPageLoad2"/>
         <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct2"/>
-        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart2"/>
+        <actionGroup ref="StorefrontClickAddToCartButtonActionGroup" stepKey="addToCart2"/>
         <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded2"/>
         <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$simpleproduct1.name$$ to your shopping cart." stepKey="seeAddedToCartMessage2"/>
         <see selector="{{StorefrontMinicartSection.quantity}}" userInput="1" stepKey="seeCartQuantity2"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithRestrictedCountriesForPaymentTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithRestrictedCountriesForPaymentTest.xml
index 732038f24834b..d6f1408c2b66a 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithRestrictedCountriesForPaymentTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCustomerCheckoutTest/StorefrontCustomerCheckoutTestWithRestrictedCountriesForPaymentTest.xml
@@ -52,7 +52,7 @@
         <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
         <waitForPageLoad stepKey="waitForPageLoad1"/>
         <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
-        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
+        <actionGroup ref="StorefrontClickAddToCartButtonActionGroup" stepKey="addToCart"/>
         <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
         <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$createProduct.name$$ to your shopping cart." stepKey="seeAddedToCartMessage"/>
         <see selector="{{StorefrontMinicartSection.quantity}}" userInput="1" stepKey="seeCartQuantity"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest/StorefrontGuestCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest/StorefrontGuestCheckoutTest.xml
index be5cf143f13dc..b591aefbdc889 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest/StorefrontGuestCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest/StorefrontGuestCheckoutTest.xml
@@ -40,7 +40,7 @@
         <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
         <waitForPageLoad stepKey="waitForPageLoad1"/>
         <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
-        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
+        <actionGroup ref="StorefrontClickAddToCartButtonActionGroup" stepKey="addToCart"/>
         <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
         <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$createProduct.name$$ to your shopping cart." stepKey="seeAddedToCartMessage"/>
         <see selector="{{StorefrontMinicartSection.quantity}}" userInput="1" stepKey="seeCartQuantity"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest/StorefrontGuestCheckoutTestWithRestrictedCountriesForPaymentTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest/StorefrontGuestCheckoutTestWithRestrictedCountriesForPaymentTest.xml
index 7660df18407d5..15b550657ef60 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest/StorefrontGuestCheckoutTestWithRestrictedCountriesForPaymentTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest/StorefrontGuestCheckoutTestWithRestrictedCountriesForPaymentTest.xml
@@ -43,7 +43,7 @@
         <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
         <waitForPageLoad stepKey="waitForPageLoad1"/>
         <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
-        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
+        <actionGroup ref="StorefrontClickAddToCartButtonActionGroup" stepKey="addToCart"/>
         <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
         <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$createProduct.name$$ to your shopping cart." stepKey="seeAddedToCartMessage"/>
         <see selector="{{StorefrontMinicartSection.quantity}}" userInput="1" stepKey="seeCartQuantity"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontVerifySecureURLRedirectCheckoutTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontVerifySecureURLRedirectCheckoutTest.xml
index b7c1d7b83e9b7..03323b7b9c855 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontVerifySecureURLRedirectCheckoutTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontVerifySecureURLRedirectCheckoutTest.xml
@@ -28,8 +28,7 @@
             <amOnPage url="{{StorefrontCategoryPage.url($$category.name$$)}}" stepKey="goToCategoryPage"/>
             <waitForPageLoad stepKey="waitForPageLoad"/>
             <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="moveMouseOverProduct"/>
-            <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="clickAddToCartButton"/>
-            <waitForPageLoad stepKey="waitForAddToCart"/>
+            <actionGroup ref="StorefrontClickAddToCartButtonActionGroup" stepKey="clickAddToCartButton"/>
             <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForAddedToCartSuccessMessage"/>
             <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$product.name$$ to your shopping cart." stepKey="seeAddedToCartSuccessMessage"/>
             <see selector="{{StorefrontMinicartSection.quantity}}" userInput="1" stepKey="seeCartQuantity"/>
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductViewTest/StorefrontConfigurableProductAddToCartTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductViewTest/StorefrontConfigurableProductAddToCartTest.xml
index 2ca8bbc9feb9d..238f1e107c11b 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductViewTest/StorefrontConfigurableProductAddToCartTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductViewTest/StorefrontConfigurableProductAddToCartTest.xml
@@ -39,8 +39,7 @@
         <waitForPageLoad stepKey="wait1"/>
         <click selector="{{StorefrontCategoryMainSection.modeListButton}}" stepKey="clickListView"/>
         <waitForPageLoad stepKey="wait2"/>
-        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="clickAddToCart"/>
-        <waitForPageLoad stepKey="wait3"/>
+        <actionGroup ref="StorefrontClickAddToCartButtonActionGroup" stepKey="clickAddToCart"/>
         <grabFromCurrentUrl stepKey="grabUrl"/>
         <assertStringContainsString stepKey="assertUrl">
             <expectedResult type="string">{{_defaultProduct.urlKey}}</expectedResult>
diff --git a/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontVerifySecureURLRedirectMultishippingTest.xml b/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontVerifySecureURLRedirectMultishippingTest.xml
index 494259e0ead9d..fe33078755ac4 100644
--- a/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontVerifySecureURLRedirectMultishippingTest.xml
+++ b/app/code/Magento/Multishipping/Test/Mftf/Test/StorefrontVerifySecureURLRedirectMultishippingTest.xml
@@ -33,8 +33,7 @@
             <amOnPage url="{{StorefrontCategoryPage.url($$category.name$$)}}" stepKey="goToCategoryPage"/>
             <waitForPageLoad stepKey="waitForPageLoad"/>
             <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="moveMouseOverProduct"/>
-            <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="clickAddToCartButton"/>
-            <waitForPageLoad stepKey="waitForAddToCart"/>
+            <actionGroup ref="StorefrontClickAddToCartButtonActionGroup" stepKey="clickAddToCartButton"/>
             <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForAddedToCartSuccessMessage"/>
             <see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added $$product.name$$ to your shopping cart." stepKey="seeAddedToCartSuccessMessage"/>
             <see selector="{{StorefrontMinicartSection.quantity}}" userInput="1" stepKey="seeCartQuantity"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
index 627f739852ee7..30f8386b3bb91 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateInvoiceTest.xml
@@ -34,7 +34,7 @@
         <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
         <waitForPageLoad stepKey="waitForPageLoad1"/>
         <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverProduct"/>
-        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
+        <actionGroup ref="StorefrontClickAddToCartButtonActionGroup" stepKey="addToCart"/>
         <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
         <actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickCart"/>
         <click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml
index 7444de8271ed9..e41e3acbae380 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreditMemoTotalAfterShippingDiscountTest.xml
@@ -64,7 +64,7 @@
         <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
         <waitForPageLoad stepKey="waitForPageLoad1"/>
         <moveMouseOver selector="{{StorefrontCategoryMainSection.ProductItemInfo}}" stepKey="hoverOverProduct"/>
-        <click selector="{{StorefrontCategoryMainSection.AddToCartBtn}}" stepKey="addToCart"/>
+        <actionGroup ref="StorefrontClickAddToCartButtonActionGroup" stepKey="addToCart"/>
         <waitForElementVisible selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="waitForProductToAdd"/>
         <actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickCart"/>
         <click selector="{{StorefrontMinicartSection.goToCheckout}}" stepKey="goToCheckout"/>

From 6e7914f27687a514b19257e5a3f7a6d4c01699ff Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Sat, 22 Aug 2020 21:34:30 +0300
Subject: [PATCH 1615/1718] V2 use AdminOpenCreateNewCMSPageActionGroup

---
 .../ActionGroup/AdminOpenCreateNewCMSPageActionGroup.xml    | 4 ++++
 .../Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml   | 3 +--
 .../Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGCMSTest.xml | 3 +--
 .../Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml | 3 +--
 .../AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest.xml   | 3 +--
 ...minAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml | 3 +--
 ...dminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml | 3 +--
 ...dminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml | 3 +--
 ...dWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml | 3 +--
 ...AddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml | 3 +--
 ...nfigDefaultCMSPageLayoutFromConfigurationSettingTest.xml | 3 +--
 .../Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml        | 6 ++----
 12 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCreateNewCMSPageActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCreateNewCMSPageActionGroup.xml
index 79ce1bc9d8e47..4e19329e9b899 100644
--- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCreateNewCMSPageActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCreateNewCMSPageActionGroup.xml
@@ -8,6 +8,10 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminOpenCreateNewCMSPageActionGroup">
+        <annotations>
+            <description>Open create new CMS Page.</description>
+        </annotations>
+
         <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToCreateNewPage"/>
         <waitForPageLoad stepKey="waitForNewPagePageLoad"/>
     </actionGroup>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml
index 9163ec4d9f5f8..35d8e692cd460 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml
@@ -37,8 +37,7 @@
             <magentoCLI command="config:set cms/wysiwyg/editor mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter" stepKey="enableTinyMCE4"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
-        <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage2"/>
-        <waitForPageLoad stepKey="wait5"/>
+        <actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToPage2"/>
         <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle2"/>
         <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab2" />
         <comment userInput="removing deprecated element" stepKey="waitForTinyMCE3"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGCMSTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGCMSTest.xml
index 55c01f3818a19..698f29a28598f 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGCMSTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGCMSTest.xml
@@ -31,8 +31,7 @@
         <fillField selector="{{StoreConfigSection.City}}" userInput="{{_defaultVariable.city}}" stepKey="fillCity" />
         <click selector="{{StoreConfigSection.Save}}" stepKey="saveConfig"/>
         <!--Main test-->
-        <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToPage"/>
         <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
         <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
         <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml
index 450003db465a8..509e1abe81ef6 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml
@@ -24,8 +24,7 @@
             <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
         </before>
         <!--Main test-->
-        <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage"/>
-        <waitForPageLoad stepKey="wait1"/>
+        <actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToPage"/>
         <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
         <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
         <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest.xml
index 633dd4dbc3388..cfb323683dc2c 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest.xml
@@ -25,8 +25,7 @@
             <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
         </before>
         <!--Main test-->
-        <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage"/>
-        <waitForPageLoad stepKey="wait1"/>
+        <actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToPage"/>
         <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
         <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
         <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml
index 14bdc89cec311..d9ea67491e30a 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml
@@ -25,8 +25,7 @@
             <actionGroup ref="ConfigAdminAccountSharingActionGroup" stepKey="allowAdminShareAccount"/>
         </before>
         <!--Main test-->
-        <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage"/>
-        <waitForPageLoad stepKey="wait1"/>
+        <actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToPage"/>
         <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
         <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
         <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml
index 2b788bc6ca0fd..86f90e0e2a580 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml
@@ -28,8 +28,7 @@
             <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
         </before>
         <!--Main test-->
-        <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage"/>
-        <waitForPageLoad stepKey="wait1"/>
+        <actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToPage"/>
         <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
         <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
         <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml
index 2124206466c2d..dcb4c3dc11f3c 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml
@@ -30,8 +30,7 @@
             <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
         </before>
         <!--Main test-->
-        <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage"/>
-        <waitForPageLoad stepKey="wait1"/>
+        <actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToPage"/>
         <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
         <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
         <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml
index 85ae0380d4b43..6acf8ef18a332 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml
@@ -28,8 +28,7 @@
             <actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
             <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
         </before>
-        <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage"/>
-        <waitForPageLoad stepKey="wait1"/>
+        <actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToPage"/>
         <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
         <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
         <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml
index 14182a4c33549..1ec4f7054e8c2 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml
@@ -28,8 +28,7 @@
             <actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
         </before>
         <!--Main test-->
-        <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage"/>
-        <waitForPageLoad stepKey="wait1"/>
+        <actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToPage"/>
         <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
         <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
         <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminConfigDefaultCMSPageLayoutFromConfigurationSettingTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminConfigDefaultCMSPageLayoutFromConfigurationSettingTest.xml
index 0eac31c891e64..88e81d6e8fbbf 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminConfigDefaultCMSPageLayoutFromConfigurationSettingTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminConfigDefaultCMSPageLayoutFromConfigurationSettingTest.xml
@@ -34,8 +34,7 @@
         <seeOptionIsSelected selector="{{DefaultLayoutsSection.categoryLayout}}" userInput="No layout updates" stepKey="seeNoLayoutUpdatesSelected2" />
         <selectOption selector="{{DefaultLayoutsSection.pageLayout}}" userInput="2 columns with right bar" stepKey="selectColumnsWithRightBar"/>
         <click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig" />
-        <amOnPage url="{{CmsNewPagePage.url}}" stepKey="amOnPagePagesGrid"/>
-        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="amOnPagePagesGrid"/>
         <waitForLoadingMaskToDisappear stepKey="wait2" />
         <click selector="{{CmsDesignSection.DesignTab}}" stepKey="clickOnDesignTab"/>
         <waitForElementVisible selector="{{CmsDesignSection.LayoutDropdown}}" stepKey="waitForLayoutDropDown" />
diff --git a/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml b/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml
index 01b2101d3346c..ddb6c4071a0e7 100644
--- a/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml
+++ b/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml
@@ -34,8 +34,7 @@
         <selectOption selector="{{ContentManagementSection.Switcher}}" userInput="TinyMCE 4" stepKey="switchToVersion4" />
         <click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions1" />
         <click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig1" />
-        <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage1"/>
-        <waitForPageLoad stepKey="wait2"/>
+        <actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToPage1"/>
         <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle1"/>
         <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab1" />
         <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
@@ -62,8 +61,7 @@
         <selectOption selector="{{ContentManagementSection.Switcher}}" userInput="TinyMCE 3" stepKey="switchToVersion3" />
         <click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions2" />
         <click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig2" />
-        <amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage2"/>
-        <waitForPageLoad stepKey="wait5"/>
+        <actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToPage2"/>
         <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle2"/>
         <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab2" />
         <comment userInput="removing deprecated element" stepKey="waitForTinyMCE3"/>

From b991d9a2e6bf77d3a194c2ab3a1c27ed7e60f3f4 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Sat, 22 Aug 2020 21:52:03 +0300
Subject: [PATCH 1616/1718] v3 added AdminOpenIndexManagementPageActionGroup

---
 ...iveFlatCategoryAndUpdateAsInactiveTest.xml |  3 +--
 .../AdminCreateInactiveFlatCategoryTest.xml   |  4 +---
 ...inCreateInactiveInMenuFlatCategoryTest.xml |  4 +---
 .../AdminMoveProductBetweenCategoriesTest.xml |  6 ++----
 ...inUpdateFlatCategoryAndAddProductsTest.xml |  4 +---
 ...ateFlatCategoryIncludeInNavigationTest.xml |  4 +---
 ...dateFlatCategoryNameAndDescriptionTest.xml |  4 +---
 ...dminOpenIndexManagementPageActionGroup.xml | 19 +++++++++++++++++++
 8 files changed, 27 insertions(+), 21 deletions(-)
 create mode 100644 app/code/Magento/Indexer/Test/Mftf/ActionGroup/AdminOpenIndexManagementPageActionGroup.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
index dfa289f18711b..500c95d1120f3 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryAndUpdateAsInactiveTest.xml
@@ -76,8 +76,7 @@
             <argument name="tags" value=""/>
         </actionGroup>
         <!--Open Index Management Page -->
-        <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
-        <waitForPageLoad stepKey="waitForIndexPageToBeLoaded"/>
+        <actionGroup ref="AdminOpenIndexManagementPageActionGroup" stepKey="openIndexManagementPage"/>
         <see stepKey="seeIndexStatus"  selector="{{AdminIndexManagementSection.indexerStatus('Category Flat Data')}}" userInput="Ready"/>
         <!--Verify Category In Store Front-->
         <amOnPage url="/$$createCategory.name$$.html"  stepKey="openCategoryPage1"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml
index d0c40ec276abb..2394b41502f84 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveFlatCategoryTest.xml
@@ -76,9 +76,7 @@
         <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
             <argument name="tags" value=""/>
         </actionGroup>
-        <!--Open Index Management Page -->
-        <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
-        <waitForPageLoad stepKey="waitForIndexPageToBeLoaded"/>
+        <actionGroup ref="AdminOpenIndexManagementPageActionGroup" stepKey="openIndexManagementPage"/>
         <see stepKey="seeIndexStatus"  selector="{{AdminIndexManagementSection.indexerStatus('Category Flat Data')}}" userInput="Ready"/>
         <!--Verify Category In Store Front-->
         <amOnPage url="/$$createCategory.name$$.html"  stepKey="openCategoryPage1"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml
index 8256661f8c525..35e53273aebf2 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateInactiveInMenuFlatCategoryTest.xml
@@ -77,9 +77,7 @@
         <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
             <argument name="tags" value=""/>
         </actionGroup>
-        <!--Open Index Management Page -->
-        <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
-        <waitForPageLoad stepKey="waitForIndexPageToBeLoaded"/>
+        <actionGroup ref="AdminOpenIndexManagementPageActionGroup" stepKey="openIndexManagementPage"/>
         <see stepKey="seeIndexStatus"  selector="{{AdminIndexManagementSection.indexerStatus('Category Flat Data')}}" userInput="Ready"/>
         <!--Verify Category In Store Front-->
         <amOnPage url="/$$category.name$$.html"  stepKey="openCategoryPage1"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml
index 059a3a321b16a..ac9c0206f4e24 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveProductBetweenCategoriesTest.xml
@@ -25,8 +25,7 @@
             <createData entity="_defaultCategory" stepKey="createSecondCategory"/>
 
             <!-- Switch "Category Product" and "Product Category" indexers to "Update by Schedule" mode -->
-            <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="onIndexManagement"/>
-            <waitForPageLoad stepKey="waitForManagementPage"/>
+            <actionGroup ref="AdminOpenIndexManagementPageActionGroup" stepKey="onIndexManagement"/>
 
             <actionGroup ref="AdminSwitchIndexerToActionModeActionGroup" stepKey="switchCategoryProduct">
                 <argument name="indexerValue" value="catalog_category_product"/>
@@ -38,8 +37,7 @@
 
         <after>
             <!-- Switch "Category Product" and "Product Category" indexers to "Update by Save" mode -->
-            <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="onIndexManagement"/>
-            <waitForPageLoad stepKey="waitForManagementPage"/>
+            <actionGroup ref="AdminOpenIndexManagementPageActionGroup" stepKey="onIndexManagement"/>
 
             <actionGroup ref="AdminSwitchIndexerToActionModeActionGroup" stepKey="switchCategoryProduct">
                 <argument name="indexerValue" value="catalog_category_product"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
index b6c508df121df..208b588493112 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryAndAddProductsTest.xml
@@ -89,9 +89,7 @@
         <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
             <argument name="tags" value=""/>
         </actionGroup>
-        <!--Open Index Management Page -->
-        <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
-        <waitForPageLoad stepKey="waitForIndexPageToLoad"/>
+        <actionGroup ref="AdminOpenIndexManagementPageActionGroup" stepKey="openIndexManagementPage"/>
         <see stepKey="seeCategoryIndexStatus"  selector="{{AdminIndexManagementSection.indexerStatus('Category Flat Data')}}" userInput="Ready"/>
         <!--Verify Product In Store Front-->
         <amOnPage url="$$createSimpleProduct.name$$.html" stepKey="goToStorefrontPage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml
index 8eb7813b6203e..a688dea47a0c4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryIncludeInNavigationTest.xml
@@ -71,9 +71,7 @@
         <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
             <argument name="tags" value=""/>
         </actionGroup>
-        <!--Open Index Management Page -->
-        <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
-        <waitForPageLoad stepKey="waitForIndexPageToBeLoaded"/>
+        <actionGroup ref="AdminOpenIndexManagementPageActionGroup" stepKey="openIndexManagementPage"/>
         <see stepKey="seeIndexStatus"  selector="{{AdminIndexManagementSection.indexerStatus('Category Flat Data')}}" userInput="Ready"/>
         <!--Verify Category In Store Front-->
         <amOnPage url="/$$createCategory.name$$.html"  stepKey="openCategoryPage1"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml
index 94f8d0e1dc523..27a834833ed76 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateFlatCategoryNameAndDescriptionTest.xml
@@ -76,9 +76,7 @@
         <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
             <argument name="tags" value=""/>
         </actionGroup>
-        <!--Open Index Management Page -->
-        <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
-        <waitForPageLoad stepKey="waitForIndexPageToLoad"/>
+        <actionGroup ref="AdminOpenIndexManagementPageActionGroup" stepKey="openIndexManagementPage"/>
         <see stepKey="seeIndexStatus"  selector="{{AdminIndexManagementSection.indexerStatus('Category Flat Data')}}" userInput="READY"/>
         <!--Verify Category In Store Front-->
         <amOnPage url="{{SimpleSubCategory.name}}.html" stepKey="goToStorefrontPage"/>
diff --git a/app/code/Magento/Indexer/Test/Mftf/ActionGroup/AdminOpenIndexManagementPageActionGroup.xml b/app/code/Magento/Indexer/Test/Mftf/ActionGroup/AdminOpenIndexManagementPageActionGroup.xml
new file mode 100644
index 0000000000000..79732ae4b6f3a
--- /dev/null
+++ b/app/code/Magento/Indexer/Test/Mftf/ActionGroup/AdminOpenIndexManagementPageActionGroup.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="AdminOpenIndexManagementPageActionGroup">
+        <annotations>
+            <description>Open index management page.</description>
+        </annotations>
+
+        <amOnPage url="{{AdminIndexManagementPage.url}}" stepKey="openIndexManagementPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>

From ef7b93bf713b32649b9059d4745d88ded81ba5c9 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Sun, 23 Aug 2020 21:39:51 +0300
Subject: [PATCH 1617/1718] v6 add AdminOpenGeneralConfigurationPageActionGroup

---
 ...penGeneralConfigurationPageActionGroup.xml | 19 +++++++++++++++++++
 ...ceForDifferentTimezonesForWebsitesTest.xml | 12 ++++--------
 ...inCreateCartPriceRuleEmptyFromDateTest.xml |  6 ++----
 3 files changed, 25 insertions(+), 12 deletions(-)
 create mode 100644 app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminOpenGeneralConfigurationPageActionGroup.xml

diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminOpenGeneralConfigurationPageActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminOpenGeneralConfigurationPageActionGroup.xml
new file mode 100644
index 0000000000000..ecacf063938ad
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminOpenGeneralConfigurationPageActionGroup.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="AdminOpenGeneralConfigurationPageActionGroup">
+        <annotations>
+            <description>Open general configuration page.</description>
+        </annotations>
+
+        <amOnPage url="{{GeneralConfigurationPage.url}}" stepKey="openGeneralConfigurationPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontSpecialPriceForDifferentTimezonesForWebsitesTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontSpecialPriceForDifferentTimezonesForWebsitesTest.xml
index 0dccc409a1032..164701fa5bc6d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontSpecialPriceForDifferentTimezonesForWebsitesTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontSpecialPriceForDifferentTimezonesForWebsitesTest.xml
@@ -37,16 +37,14 @@
         </after>
 
         <!--Set timezone for default config-->
-        <amOnPage url="{{GeneralConfigurationPage.url}}" stepKey="goToGeneralConfig"/>
-        <waitForPageLoad stepKey="waitForConfigPage"/>
+        <actionGroup ref="AdminOpenGeneralConfigurationPageActionGroup" stepKey="goToGeneralConfig"/>
         <conditionalClick selector="{{LocaleOptionsSection.sectionHeader}}" dependentSelector="{{LocaleOptionsSection.timezone}}" visible="false" stepKey="openLocaleSection"/>
         <grabValueFrom selector="{{LocaleOptionsSection.timezone}}" stepKey="originalTimezone"/>
         <selectOption selector="{{LocaleOptionsSection.timezone}}" userInput="Central European Standard Time (Europe/Paris)" stepKey="setTimezone"/>
         <click selector="{{AdminMainActionsSection.save}}" stepKey="saveConfig"/>
 
         <!--Set timezone for Main Website-->
-        <amOnPage url="{{GeneralConfigurationPage.url}}" stepKey="goToGeneralConfig1"/>
-        <waitForPageLoad stepKey="waitForConfigPage1"/>
+        <actionGroup ref="AdminOpenGeneralConfigurationPageActionGroup" stepKey="goToGeneralConfig1"/>
         <actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="AdminSwitchStoreViewActionGroup">
             <argument name="website" value="_defaultWebsite"/>
         </actionGroup>
@@ -80,15 +78,13 @@
         </assertEquals>
 
         <!--Reset timezone-->
-        <amOnPage url="{{GeneralConfigurationPage.url}}" stepKey="goToGeneralConfigReset"/>
-        <waitForPageLoad stepKey="waitForConfigPageReset"/>
+        <actionGroup ref="AdminOpenGeneralConfigurationPageActionGroup" stepKey="goToGeneralConfigReset"/>
         <conditionalClick selector="{{LocaleOptionsSection.sectionHeader}}" dependentSelector="{{LocaleOptionsSection.timezone}}" visible="false" stepKey="openLocaleSectionReset"/>
         <selectOption selector="{{LocaleOptionsSection.timezone}}" userInput="$originalTimezone" stepKey="resetTimezone"/>
         <click selector="{{AdminMainActionsSection.save}}" stepKey="saveConfigReset"/>
 
         <!--Reset timezone-->
-        <amOnPage url="{{GeneralConfigurationPage.url}}" stepKey="goToGeneralConfigReset1"/>
-        <waitForPageLoad stepKey="waitForConfigPageReset1"/>
+        <actionGroup ref="AdminOpenGeneralConfigurationPageActionGroup" stepKey="goToGeneralConfigReset1"/>
         <actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="AdminSwitchStoreViewActionGroup1">
             <argument name="website" value="_defaultWebsite"/>
         </actionGroup>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleEmptyFromDateTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleEmptyFromDateTest.xml
index f32442ca5bc98..f956d036d7080 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleEmptyFromDateTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleEmptyFromDateTest.xml
@@ -39,8 +39,7 @@
 
         <!--Set timezone-->
         <!--Set timezone so we need compare with the same timezone used in "generateDate" action-->
-        <amOnPage url="{{GeneralConfigurationPage.url}}" stepKey="goToGeneralConfig"/>
-        <waitForPageLoad stepKey="waitForConfigPage"/>
+        <actionGroup ref="AdminOpenGeneralConfigurationPageActionGroup" stepKey="goToGeneralConfig"/>
         <wait stepKey="wait" time="10"/>
         <conditionalClick selector="{{LocaleOptionsSection.sectionHeader}}" dependentSelector="{{LocaleOptionsSection.timezone}}" visible="false" stepKey="openLocaleSection"/>
         <grabValueFrom selector="{{LocaleOptionsSection.timezone}}" stepKey="originalTimezone"/>
@@ -93,8 +92,7 @@
         <see selector="{{CheckoutCartSummarySection.discountAmount}}" userInput="-$5.00" stepKey="seeDiscountTotal"/>
 
         <!--Reset timezone-->
-        <amOnPage url="{{GeneralConfigurationPage.url}}" stepKey="goToGeneralConfigReset"/>
-        <waitForPageLoad stepKey="waitForConfigPageReset"/>
+        <actionGroup ref="AdminOpenGeneralConfigurationPageActionGroup" stepKey="goToGeneralConfigReset"/>
         <conditionalClick selector="{{LocaleOptionsSection.sectionHeader}}" dependentSelector="{{LocaleOptionsSection.timezone}}" visible="false" stepKey="openLocaleSectionReset"/>
         <selectOption selector="{{LocaleOptionsSection.timezone}}" userInput="$originalTimezone" stepKey="resetTimezone"/>
         <click selector="{{AdminMainActionsSection.save}}" stepKey="saveConfigReset"/>

From 66184fd823e58a166cd259f7c4da6705f8412d09 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Sun, 23 Aug 2020 21:51:15 +0300
Subject: [PATCH 1618/1718] V7 add AdminOpenWebConfigurationPageActionGroup

---
 ...minOpenWebConfigurationPageActionGroup.xml | 19 +++++++++++++++++++
 ...goryLayoutFromConfigurationSettingTest.xml |  3 +--
 ...ductLayoutFromConfigurationSettingTest.xml |  3 +--
 ...PageLayoutFromConfigurationSettingTest.xml |  3 +--
 4 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminOpenWebConfigurationPageActionGroup.xml

diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminOpenWebConfigurationPageActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminOpenWebConfigurationPageActionGroup.xml
new file mode 100644
index 0000000000000..e640eda7d653d
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminOpenWebConfigurationPageActionGroup.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="AdminOpenWebConfigurationPageActionGroup">
+        <annotations>
+            <description>Open web configuration page.</description>
+        </annotations>
+
+        <amOnPage url="{{WebConfigurationPage.url}}" stepKey="openWebConfigurationPage"/>
+        <waitForPageLoad stepKey="waitPageToLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest/AdminConfigDefaultCategoryLayoutFromConfigurationSettingTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest/AdminConfigDefaultCategoryLayoutFromConfigurationSettingTest.xml
index 900b3f6cd2f1c..852353300d090 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest/AdminConfigDefaultCategoryLayoutFromConfigurationSettingTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest/AdminConfigDefaultCategoryLayoutFromConfigurationSettingTest.xml
@@ -24,8 +24,7 @@
             <actionGroup ref="RestoreLayoutSetting" stepKey="sampleActionGroup"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
-        <amOnPage url="{{WebConfigurationPage.url}}" stepKey="navigateToWebConfigurationPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <actionGroup ref="AdminOpenWebConfigurationPageActionGroup" stepKey="navigateToWebConfigurationPage"/>
         <conditionalClick stepKey="expandDefaultLayouts" selector="{{WebSection.DefaultLayoutsTab}}" dependentSelector="{{WebSection.CheckIfTabExpand}}" visible="true"/>
         <waitForElementVisible selector="{{DefaultLayoutsSection.categoryLayout}}" stepKey="waitForDefaultCategoryLayout"/>
         <seeOptionIsSelected selector="{{DefaultLayoutsSection.categoryLayout}}" userInput="No layout updates" stepKey="seeNoLayoutUpdatesSelected"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest/AdminConfigDefaultProductLayoutFromConfigurationSettingTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest/AdminConfigDefaultProductLayoutFromConfigurationSettingTest.xml
index 7317f2f7214f0..ac2e86a572455 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest/AdminConfigDefaultProductLayoutFromConfigurationSettingTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateSimpleProductTest/AdminConfigDefaultProductLayoutFromConfigurationSettingTest.xml
@@ -24,8 +24,7 @@
             <actionGroup ref="RestoreLayoutSetting" stepKey="sampleActionGroup"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
-        <amOnPage url="{{WebConfigurationPage.url}}" stepKey="navigateToWebConfigurationPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <actionGroup ref="AdminOpenWebConfigurationPageActionGroup" stepKey="navigateToWebConfigurationPage"/>
         <conditionalClick stepKey="expandDefaultLayouts" selector="{{WebSection.DefaultLayoutsTab}}" dependentSelector="{{WebSection.CheckIfTabExpand}}" visible="true"/>
         <waitForElementVisible selector="{{DefaultLayoutsSection.productLayout}}" stepKey="DefaultProductLayout"/>
         <selectOption selector="{{DefaultLayoutsSection.productLayout}}" userInput="3 columns" stepKey="select3ColumnsLayout"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminConfigDefaultCMSPageLayoutFromConfigurationSettingTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminConfigDefaultCMSPageLayoutFromConfigurationSettingTest.xml
index 0eac31c891e64..8f82c1f4d6cc0 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminConfigDefaultCMSPageLayoutFromConfigurationSettingTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminConfigDefaultCMSPageLayoutFromConfigurationSettingTest.xml
@@ -25,8 +25,7 @@
             <actionGroup ref="RestoreLayoutSetting" stepKey="sampleActionGroup"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
-        <amOnPage url="{{WebConfigurationPage.url}}" stepKey="navigateToWebConfigurationPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <actionGroup ref="AdminOpenWebConfigurationPageActionGroup" stepKey="navigateToWebConfigurationPage"/>
         <conditionalClick stepKey="expandDefaultLayouts" selector="{{WebSection.DefaultLayoutsTab}}" dependentSelector="{{WebSection.CheckIfTabExpand}}" visible="true" />
         <waitForElementVisible selector="{{DefaultLayoutsSection.pageLayout}}" stepKey="DefaultProductLayout" />
         <seeOptionIsSelected selector="{{DefaultLayoutsSection.pageLayout}}" userInput="1 column" stepKey="seeOneColumnSelected" />

From 3cfa6aa4b231140bea835b99508dc2804c8a09d4 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Sun, 23 Aug 2020 22:14:36 +0300
Subject: [PATCH 1619/1718] v8 add AdminOpenAdminThreeDSecurePageActionGroup

---
 ...inOpenAdminThreeDSecurePageActionGroup.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 app/code/Magento/CardinalCommerce/Test/Mftf/ActionGroup/AdminOpenAdminThreeDSecurePageActionGroup.xml

diff --git a/app/code/Magento/CardinalCommerce/Test/Mftf/ActionGroup/AdminOpenAdminThreeDSecurePageActionGroup.xml b/app/code/Magento/CardinalCommerce/Test/Mftf/ActionGroup/AdminOpenAdminThreeDSecurePageActionGroup.xml
new file mode 100644
index 0000000000000..baea26921a625
--- /dev/null
+++ b/app/code/Magento/CardinalCommerce/Test/Mftf/ActionGroup/AdminOpenAdminThreeDSecurePageActionGroup.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="AdminOpenAdminThreeDSecurePageActionGroup">
+        <annotations>
+            <description>Open ThreeDSecure page.</description>
+        </annotations>
+
+        <amOnPage url="{{AdminThreeDSecurePage.url}}" stepKey="openAdminThreeDSecurePage"/>
+        <waitForPageLoad stepKey="waitThreeDSecurePageToLoad"/>
+    </actionGroup>
+</actionGroups>

From 45849cc9d01bbc223fbda72d9748a22561084e10 Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Mon, 24 Aug 2020 13:02:34 +0800
Subject: [PATCH 1620/1718] magento/adobe-stock-integration#1504: Extracted
 logic from wysiwyg OnInsert controller to a model - Integration test

---
 .../Images/GetInsertImageContentTest.php      | 132 ++++++++++++++++++
 1 file changed, 132 insertions(+)
 create mode 100644 app/code/Magento/Cms/Test/Integration/Model/Wysiwyg/Images/GetInsertImageContentTest.php

diff --git a/app/code/Magento/Cms/Test/Integration/Model/Wysiwyg/Images/GetInsertImageContentTest.php b/app/code/Magento/Cms/Test/Integration/Model/Wysiwyg/Images/GetInsertImageContentTest.php
new file mode 100644
index 0000000000000..7ae581545c85e
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Integration/Model/Wysiwyg/Images/GetInsertImageContentTest.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Cms\Test\Integration\Model\Wysiwyg\Images;
+
+use Magento\Cms\Helper\Wysiwyg\Images as ImagesHelper;
+use Magento\Cms\Model\Wysiwyg\Images\GetInsertImageContent;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+class GetInsertImageContentTest extends TestCase
+{
+    private const TEST_IMAGE_FILE = '/test-image.jpg';
+
+    /**
+     * @var GetInsertImageContent
+     */
+    private $getInsertImageContent;
+
+    /**
+     * @var ImagesHelper
+     */
+    private $imagesHelper;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->getInsertImageContent = Bootstrap::getObjectManager()->get(GetInsertImageContent::class);
+        $this->imagesHelper = Bootstrap::getObjectManager()->get(ImagesHelper::class);
+    }
+
+    /**
+     * Test for GetInsertImageContent::execute
+     *
+     * @dataProvider imageDataProvider
+     * @param string $encodedFilename
+     * @param bool $forceStaticPath
+     * @param bool $renderAsTag
+     * @param int|null $storeId
+     */
+    public function testExecute(
+        string $encodedFilename,
+        bool $forceStaticPath,
+        bool $renderAsTag,
+        ?int $storeId = null
+    ): void {
+        $getImageForInsert = $this->getInsertImageContent->execute(
+            $encodedFilename,
+            $forceStaticPath,
+            $renderAsTag,
+            $storeId
+        );
+
+        if (!$forceStaticPath) {
+            if ($renderAsTag) {
+                $html = $this->imagesHelper->getImageHtmlDeclaration(
+                    self::TEST_IMAGE_FILE,
+                    true
+                );
+                $this->assertEquals(
+                    $getImageForInsert,
+                    $html
+                );
+            } else {
+                $html = $this->imagesHelper->getImageHtmlDeclaration(
+                    self::TEST_IMAGE_FILE,
+                    false
+                );
+                $this->assertEquals(
+                    $getImageForInsert,
+                    $html
+                );
+            }
+        } else {
+            $this->assertEquals(
+                $getImageForInsert,
+                parse_url(
+                    $this->imagesHelper->getCurrentUrl() . self::TEST_IMAGE_FILE,
+                    PHP_URL_PATH
+                )
+            );
+        }
+    }
+
+    /**
+     * Data provider for testExecute
+     *
+     * @return array[]
+     */
+    public function imageDataProvider(): array
+    {
+        return [
+            [
+                'L3Rlc3QtaW1hZ2UuanBn',
+                false,
+                true,
+                1,
+            ],
+            [
+                'L3Rlc3QtaW1hZ2UuanBn',
+                true,
+                false,
+                1,
+            ],
+            [
+                'L3Rlc3QtaW1hZ2UuanBn',
+                false,
+                false,
+                1,
+            ],
+            [
+                'L3Rlc3QtaW1hZ2UuanBn',
+                false,
+                true,
+                2,
+            ],
+            [
+                'L3Rlc3QtaW1hZ2UuanBn',
+                false,
+                true,
+                null,
+            ],
+        ];
+    }
+}

From f230257dceda451d27031100441c675ee5fa48d5 Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Mon, 24 Aug 2020 14:58:51 +0530
Subject: [PATCH 1621/1718] Fixed issue with search button disabled is not
 respecting minimum search length

---
 app/code/Magento/Search/view/frontend/web/js/form-mini.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Search/view/frontend/web/js/form-mini.js b/app/code/Magento/Search/view/frontend/web/js/form-mini.js
index b4493c5f38089..1781cb9694735 100644
--- a/app/code/Magento/Search/view/frontend/web/js/form-mini.js
+++ b/app/code/Magento/Search/view/frontend/web/js/form-mini.js
@@ -294,9 +294,10 @@ define([
                 dropdown = $('<ul role="listbox"></ul>'),
                 value = this.element.val();
 
-            this.submitBtn.disabled = isEmpty(value);
+            this.submitBtn.disabled = true;
 
             if (value.length >= parseInt(this.options.minSearchLength, 10)) {
+                this.submitBtn.disabled = false;
                 $.getJSON(this.options.url, {
                     q: value
                 }, $.proxy(function (data) {

From 40cb692368e9ada9817d682f00358736394df752 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Mon, 24 Aug 2020 18:16:48 +0800
Subject: [PATCH 1622/1718] magento/adobe-stock-integration#1775: [MFTF] Make
 AdminAssertCategoryGridPageDetailsActionGroup parametrized - renamed action
 group based on requested change

---
 ...up.xml => AssertAdminCategoryGridPageDetailsActionGroup.xml} | 2 +-
 .../AdminMediaGalleryCatalogUiVerifyCategoryGridPageTest.xml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/{AdminAssertCategoryGridPageDetailsActionGroup.xml => AssertAdminCategoryGridPageDetailsActionGroup.xml} (95%)

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertCategoryGridPageDetailsActionGroup.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminCategoryGridPageDetailsActionGroup.xml
similarity index 95%
rename from app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertCategoryGridPageDetailsActionGroup.xml
rename to app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminCategoryGridPageDetailsActionGroup.xml
index 958b733613c50..f86e04ad7c4f2 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertCategoryGridPageDetailsActionGroup.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminCategoryGridPageDetailsActionGroup.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="AdminAssertCategoryGridPageDetailsActionGroup">
+    <actionGroup name="AssertAdminCategoryGridPageDetailsActionGroup">
         <arguments>
             <argument name="category"/>
             <argument name="imageName" type="string" defaultValue="magento"/>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyCategoryGridPageTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyCategoryGridPageTest.xml
index 8fae844f9883a..b2668b59fb8a1 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyCategoryGridPageTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyCategoryGridPageTest.xml
@@ -26,7 +26,7 @@
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
         </after>
         <actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openCategoryPage"/>
-        <actionGroup ref="AdminAssertCategoryGridPageDetailsActionGroup" stepKey="assertCategoryGridPageRendered">
+        <actionGroup ref="AssertAdminCategoryGridPageDetailsActionGroup" stepKey="assertCategoryGridPageRendered">
             <argument name="category" value="$$category$$"/>
         </actionGroup>
    </test>

From 5a7206b4ebde48d4641517e4b1812d5a15a4d5e7 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Mon, 24 Aug 2020 20:26:13 +0800
Subject: [PATCH 1623/1718] magento/adobe-stock-integration#1776: [MFTF]
 Sorting in media gallery - initial implementation

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

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortingTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortingTest.xml
new file mode 100644
index 0000000000000..a66d3d2af9182
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortingTest.xml
@@ -0,0 +1,31 @@
+<?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="AdminMediaGallerySortingTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1776"/>
+            <title value="User uses Sorting in Standalone Media Gallery"/>
+            <stories value="User uses Sorting in Standalone Media Gallery"/>
+            <testCaseId value="https://github.com/magento/adobe-stock-integration/issues/1776"/>
+            <description value="User uses Sorting in Standalone Media Gallery"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
+        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderForm"/>
+        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolder">
+            <argument name="name" value="a"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertNewFolderCreated"/>
+    </test>
+</tests>

From fe8771e08ba3f1a1e956d9531fb4448963c5603c Mon Sep 17 00:00:00 2001
From: Roman Lytvynenko <lytvynen@adobe.com>
Date: Mon, 24 Aug 2020 07:57:04 -0500
Subject: [PATCH 1624/1718] MC-36647: Order can be placed as a customer after
 session cookie expiration with Persistent Cart enabled

---
 .../Persistent/Model/Customer/Authorization.php        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Persistent/Model/Customer/Authorization.php b/app/code/Magento/Persistent/Model/Customer/Authorization.php
index e9687b2193475..7852000ad525a 100644
--- a/app/code/Magento/Persistent/Model/Customer/Authorization.php
+++ b/app/code/Magento/Persistent/Model/Customer/Authorization.php
@@ -48,15 +48,15 @@ public function isAllowed(
         $resource,
         $privilege = null
     ) {
-        if ($resource == AuthorizationService::PERMISSION_SELF
+        if ($this->persistentSession->isPersistent()
+            && $resource == AuthorizationService::PERMISSION_SELF
             && $this->userContext->getUserId()
             && $this->userContext->getUserType() === UserContextInterface::USER_TYPE_CUSTOMER
-            && $this->customerSession->isLoggedIn()
-            && $this->persistentSession->isPersistent()
+            && !$this->customerSession->isLoggedIn()
         ) {
-            return true;
+            return false;
         }
 
-        return false;
+        return true;
     }
 }

From f794b771c3e1e028519a52222cf299f723fc22ff Mon Sep 17 00:00:00 2001
From: Roman Lytvynenko <lytvynen@adobe.com>
Date: Mon, 24 Aug 2020 08:11:06 -0500
Subject: [PATCH 1625/1718] MC-36647: Order can be placed as a customer after
 session cookie expiration with Persistent Cart enabled

---
 .../Persistent/Model/Customer/Authorization.php | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/app/code/Magento/Persistent/Model/Customer/Authorization.php b/app/code/Magento/Persistent/Model/Customer/Authorization.php
index 7852000ad525a..156a55b39991b 100644
--- a/app/code/Magento/Persistent/Model/Customer/Authorization.php
+++ b/app/code/Magento/Persistent/Model/Customer/Authorization.php
@@ -6,19 +6,12 @@
 
 namespace Magento\Persistent\Model\Customer;
 
-use Magento\Authorization\Model\UserContextInterface;
 use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Framework\AuthorizationInterface;
-use Magento\Integration\Api\AuthorizationServiceInterface as AuthorizationService;
 use Magento\Persistent\Helper\Session as PersistentSession;
 
 class Authorization implements AuthorizationInterface
 {
-    /**
-     * @var UserContextInterface
-     */
-    private $userContext;
-
     /**
      * @var CustomerSession
      */
@@ -30,16 +23,13 @@ class Authorization implements AuthorizationInterface
     private $persistentSession;
 
     /**
-     * @param UserContextInterface $userContext
      * @param CustomerSession $customerSession
      * @param PersistentSession $persistentSession
      */
     public function __construct(
-        UserContextInterface $userContext,
         CustomerSession $customerSession,
         PersistentSession $persistentSession
     ) {
-        $this->userContext = $userContext;
         $this->customerSession = $customerSession;
         $this->persistentSession = $persistentSession;
     }
@@ -48,12 +38,7 @@ public function isAllowed(
         $resource,
         $privilege = null
     ) {
-        if ($this->persistentSession->isPersistent()
-            && $resource == AuthorizationService::PERMISSION_SELF
-            && $this->userContext->getUserId()
-            && $this->userContext->getUserType() === UserContextInterface::USER_TYPE_CUSTOMER
-            && !$this->customerSession->isLoggedIn()
-        ) {
+        if ($this->persistentSession->isPersistent() && !$this->customerSession->isLoggedIn()) {
             return false;
         }
 

From 40025cc706ca1f4041e8bdcda1c721044e1bdde9 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 1626/1718] 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 10bd41f8b0f592fcdfa02cece19347d2c31ddd32 Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Mon, 24 Aug 2020 23:53:12 +0800
Subject: [PATCH 1627/1718] magento/adobe-stock-integration#1504: Extracted
 logic from wysiwyg OnInsert controller to a model - PR suggestions and
 Adjustments on Integration test

---
 .../Adminhtml/Wysiwyg/Images/OnInsert.php     | 13 ++--
 .../Wysiwyg/Images/GetInsertImageContent.php  | 15 +----
 .../Images/GetInsertImageContentTest.php      | 61 +++++++++++--------
 3 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
index d504a211e7861..f62d3debc74bd 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
@@ -45,15 +45,20 @@ public function execute()
     {
         $data = $this->getRequest()->getParams();
 
+        $fileName = $data['filename'];
+        $forceStaticPath = $data['force_static_path'];
+        $renderAsTag = $data['as_is'];
+        $storeId = isset($data['store_id']) ? (int) $data['store_id'] : null;
+
         /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */
         $resultRaw = $this->resultRawFactory->create();
 
         return $resultRaw->setContents(
             $this->getInsertImageContent->execute(
-                $data['filename'],
-                $data['force_static_path'],
-                $data['as_is'],
-                isset($data['store_id']) ? (int) $data['store_id'] : null
+                $fileName,
+                $forceStaticPath,
+                $renderAsTag,
+                $storeId
             )
         );
     }
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/GetInsertImageContent.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/GetInsertImageContent.php
index e9aab6160b259..e6f59c484bfc2 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/GetInsertImageContent.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/GetInsertImageContent.php
@@ -8,7 +8,6 @@
 
 namespace Magento\Cms\Model\Wysiwyg\Images;
 
-use Magento\Catalog\Helper\Data;
 use Magento\Cms\Helper\Wysiwyg\Images as ImagesHelper;
 
 class GetInsertImageContent
@@ -18,23 +17,14 @@ class GetInsertImageContent
      */
     private $imagesHelper;
 
-    /**
-     * @var Data
-     */
-    private $catalogHelper;
-
     /**
      * PrepareImage constructor.
      *
      * @param ImagesHelper $imagesHelper
-     * @param Data $catalogHelper
      */
-    public function __construct(
-        ImagesHelper $imagesHelper,
-        Data $catalogHelper
-    ) {
+    public function __construct(ImagesHelper $imagesHelper)
+    {
         $this->imagesHelper = $imagesHelper;
-        $this->catalogHelper = $catalogHelper;
     }
 
     /**
@@ -54,7 +44,6 @@ public function execute(
     ): string {
         $filename = $this->imagesHelper->idDecode($encodedFilename);
 
-        $this->catalogHelper->setStoreId($storeId);
         $this->imagesHelper->setStoreId($storeId);
 
         if ($forceStaticPath) {
diff --git a/app/code/Magento/Cms/Test/Integration/Model/Wysiwyg/Images/GetInsertImageContentTest.php b/app/code/Magento/Cms/Test/Integration/Model/Wysiwyg/Images/GetInsertImageContentTest.php
index 7ae581545c85e..fb026f6b4292a 100644
--- a/app/code/Magento/Cms/Test/Integration/Model/Wysiwyg/Images/GetInsertImageContentTest.php
+++ b/app/code/Magento/Cms/Test/Integration/Model/Wysiwyg/Images/GetInsertImageContentTest.php
@@ -8,8 +8,10 @@
 
 namespace Magento\Cms\Test\Integration\Model\Wysiwyg\Images;
 
+use Magento\Backend\Helper\Data as BackendHelper;
 use Magento\Cms\Helper\Wysiwyg\Images as ImagesHelper;
 use Magento\Cms\Model\Wysiwyg\Images\GetInsertImageContent;
+use Magento\Framework\Url\EncoderInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 
@@ -27,6 +29,16 @@ class GetInsertImageContentTest extends TestCase
      */
     private $imagesHelper;
 
+    /**
+     * @var EncoderInterface
+     */
+    private $urlEncoder;
+
+    /**
+     * @var BackendHelper
+     */
+    protected $_backendData;
+
     /**
      * @inheritdoc
      */
@@ -34,6 +46,8 @@ protected function setUp(): void
     {
         $this->getInsertImageContent = Bootstrap::getObjectManager()->get(GetInsertImageContent::class);
         $this->imagesHelper = Bootstrap::getObjectManager()->get(ImagesHelper::class);
+        $this->urlEncoder = Bootstrap::getObjectManager()->get(EncoderInterface::class);
+        $this->_backendData = Bootstrap::getObjectManager()->get(BackendHelper::class);
     }
 
     /**
@@ -44,12 +58,14 @@ protected function setUp(): void
      * @param bool $forceStaticPath
      * @param bool $renderAsTag
      * @param int|null $storeId
+     * @param string|null $expectedResult
      */
     public function testExecute(
         string $encodedFilename,
         bool $forceStaticPath,
         bool $renderAsTag,
-        ?int $storeId = null
+        ?int $storeId = null,
+        ?string $expectedResult = null
     ): void {
         $getImageForInsert = $this->getInsertImageContent->execute(
             $encodedFilename,
@@ -58,35 +74,21 @@ public function testExecute(
             $storeId
         );
 
-        if (!$forceStaticPath) {
-            if ($renderAsTag) {
-                $html = $this->imagesHelper->getImageHtmlDeclaration(
-                    self::TEST_IMAGE_FILE,
-                    true
-                );
-                $this->assertEquals(
-                    $getImageForInsert,
-                    $html
-                );
-            } else {
-                $html = $this->imagesHelper->getImageHtmlDeclaration(
-                    self::TEST_IMAGE_FILE,
-                    false
-                );
-                $this->assertEquals(
-                    $getImageForInsert,
-                    $html
+        if (!$forceStaticPath && !$renderAsTag) {
+            if (!$this->imagesHelper->isUsingStaticUrlsAllowed()) {
+
+                $encodedDirective = $this->urlEncoder->encode($expectedResult);
+                $expectedResult = $this->_backendData->getUrl(
+                    'cms/wysiwyg/directive',
+                    [
+                        '___directive' => $encodedDirective,
+                        '_escape_params' => false,
+                    ]
                 );
             }
-        } else {
-            $this->assertEquals(
-                $getImageForInsert,
-                parse_url(
-                    $this->imagesHelper->getCurrentUrl() . self::TEST_IMAGE_FILE,
-                    PHP_URL_PATH
-                )
-            );
         }
+
+        $this->assertEquals($getImageForInsert, $expectedResult);
     }
 
     /**
@@ -102,30 +104,35 @@ public function imageDataProvider(): array
                 false,
                 true,
                 1,
+                '<img src="{{media url=&quot;' . self::TEST_IMAGE_FILE . '&quot;}}" alt="" />'
             ],
             [
                 'L3Rlc3QtaW1hZ2UuanBn',
                 true,
                 false,
                 1,
+                '/pub/media/' . self::TEST_IMAGE_FILE
             ],
             [
                 'L3Rlc3QtaW1hZ2UuanBn',
                 false,
                 false,
                 1,
+                '{{media url="' . self::TEST_IMAGE_FILE . '"}}'
             ],
             [
                 'L3Rlc3QtaW1hZ2UuanBn',
                 false,
                 true,
                 2,
+                '<img src="{{media url=&quot;' . self::TEST_IMAGE_FILE . '&quot;}}" alt="" />'
             ],
             [
                 'L3Rlc3QtaW1hZ2UuanBn',
                 false,
                 true,
                 null,
+                '<img src="{{media url=&quot;' . self::TEST_IMAGE_FILE . '&quot;}}" alt="" />'
             ],
         ];
     }

From 5ff347c8a730581f59f761bd0c302eeca1caedbe Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Tue, 25 Aug 2020 00:26:18 +0800
Subject: [PATCH 1628/1718] 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 afa8c7fd86e7f9f2ee994d361900b5cc8fb236f3 Mon Sep 17 00:00:00 2001
From: Roman Lytvynenko <lytvynen@adobe.com>
Date: Mon, 24 Aug 2020 11:53:34 -0500
Subject: [PATCH 1629/1718] MC-36647: Order can be placed as a customer after
 session cookie expiration with Persistent Cart enabled

---
 .../Magento/Customer/Model/Customer/Authorization.php  |  5 +++++
 .../Customer/Model/Customer/AuthorizationComposite.php |  8 ++++++++
 .../Customer/Model/Plugin/CustomerAuthorization.php    |  8 +++++---
 .../Persistent/Model/Customer/Authorization.php        | 10 ++++++++++
 app/code/Magento/Persistent/etc/webapi_rest/di.xml     |  5 +++++
 app/code/Magento/Persistent/etc/webapi_soap/di.xml     |  5 +++++
 6 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Customer/Model/Customer/Authorization.php b/app/code/Magento/Customer/Model/Customer/Authorization.php
index f4e6d07affc84..f5ddf839597e2 100644
--- a/app/code/Magento/Customer/Model/Customer/Authorization.php
+++ b/app/code/Magento/Customer/Model/Customer/Authorization.php
@@ -40,6 +40,8 @@ class Authorization implements AuthorizationInterface
     private $storeManager;
 
     /**
+     * Authorization constructor.
+     *
      * @param UserContextInterface $userContext
      * @param CustomerFactory $customerFactory
      * @param CustomerResource $customerResource
@@ -57,6 +59,9 @@ public function __construct(
         $this->storeManager = $storeManager;
     }
 
+    /**
+     * @inheritdoc
+     */
     public function isAllowed($resource, $privilege = null)
     {
         if ($resource == AuthorizationService::PERMISSION_SELF
diff --git a/app/code/Magento/Customer/Model/Customer/AuthorizationComposite.php b/app/code/Magento/Customer/Model/Customer/AuthorizationComposite.php
index e643460a32789..790c81056f4ff 100644
--- a/app/code/Magento/Customer/Model/Customer/AuthorizationComposite.php
+++ b/app/code/Magento/Customer/Model/Customer/AuthorizationComposite.php
@@ -19,12 +19,20 @@ class AuthorizationComposite implements AuthorizationInterface
      */
     private $authorizationChecks;
 
+    /**
+     * AuthorizationComposite constructor.
+     *
+     * @param array $authorizationChecks
+     */
     public function __construct(
         array $authorizationChecks
     ) {
         $this->authorizationChecks = $authorizationChecks;
     }
 
+    /**
+     * @inheritdoc
+     */
     public function isAllowed($resource, $privilege = null)
     {
         $result = false;
diff --git a/app/code/Magento/Customer/Model/Plugin/CustomerAuthorization.php b/app/code/Magento/Customer/Model/Plugin/CustomerAuthorization.php
index 292c22fba512b..f9c16b95ee054 100644
--- a/app/code/Magento/Customer/Model/Plugin/CustomerAuthorization.php
+++ b/app/code/Magento/Customer/Model/Plugin/CustomerAuthorization.php
@@ -33,17 +33,19 @@ public function __construct(
     }
 
     /**
+     * Verify if to allow customer users to access resources with self permission
+     *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @param Authorization $subject
      * @param Closure $proceed
-     * @param $resource
-     * @param null $privilege
+     * @param string $resource
+     * @param $privilege
      * @return bool|mixed
      */
     public function aroundIsAllowed(
         Authorization $subject,
         Closure $proceed,
-        $resource,
+        string $resource,
         $privilege = null
     ) {
         if ($this->authorizationComposite->isAllowed($resource, $privilege)) {
diff --git a/app/code/Magento/Persistent/Model/Customer/Authorization.php b/app/code/Magento/Persistent/Model/Customer/Authorization.php
index 156a55b39991b..0ebda14e215ec 100644
--- a/app/code/Magento/Persistent/Model/Customer/Authorization.php
+++ b/app/code/Magento/Persistent/Model/Customer/Authorization.php
@@ -10,6 +10,11 @@
 use Magento\Framework\AuthorizationInterface;
 use Magento\Persistent\Helper\Session as PersistentSession;
 
+/**
+ * Authorization logic for persistent customers
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ */
 class Authorization implements AuthorizationInterface
 {
     /**
@@ -34,6 +39,11 @@ public function __construct(
         $this->persistentSession = $persistentSession;
     }
 
+    /**
+     * @inheritdoc
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
     public function isAllowed(
         $resource,
         $privilege = null
diff --git a/app/code/Magento/Persistent/etc/webapi_rest/di.xml b/app/code/Magento/Persistent/etc/webapi_rest/di.xml
index 89504f0471788..5c2c6d0450019 100644
--- a/app/code/Magento/Persistent/etc/webapi_rest/di.xml
+++ b/app/code/Magento/Persistent/etc/webapi_rest/di.xml
@@ -20,4 +20,9 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Persistent\Model\Customer\Authorization">
+        <arguments>
+            <argument name="customerSession" xsi:type="object">Magento\Customer\Model\Session\Proxy</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Persistent/etc/webapi_soap/di.xml b/app/code/Magento/Persistent/etc/webapi_soap/di.xml
index 2a440fff03598..cd1006fa5c73e 100644
--- a/app/code/Magento/Persistent/etc/webapi_soap/di.xml
+++ b/app/code/Magento/Persistent/etc/webapi_soap/di.xml
@@ -20,4 +20,9 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Persistent\Model\Customer\Authorization">
+        <arguments>
+            <argument name="customerSession" xsi:type="object">Magento\Customer\Model\Session\Proxy</argument>
+        </arguments>
+    </type>
 </config>

From 79c8386e1896008dfc8ef08df5b41f92b3f8100e 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 1630/1718] 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 42e4454fbe9d93dc99f9ded778ba598253982829 Mon Sep 17 00:00:00 2001
From: Raoul Rego <rrego@adobe.com>
Date: Wed, 12 Aug 2020 12:38:12 -0400
Subject: [PATCH 1631/1718] MC-30502: JSUnit tests incompatible with Node v10
 or v12

- Fixed jasmine test failure
- Removed unecessary URLs
- Fixed nodejs dependency
---
 .../Magento/Ui/base/js/grid/masonry.test.js   | 120 +++++++++---------
 package.json.sample                           |   4 +-
 2 files changed, 60 insertions(+), 64 deletions(-)

diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/masonry.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/masonry.test.js
index 2c2cdab2d46da..d1a614d28fc72 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/masonry.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/masonry.test.js
@@ -6,79 +6,75 @@
 /*eslint max-nested-callbacks: 0*/
 define([
     'jquery',
-    'ko',
     'Magento_Ui/js/grid/masonry'
-], function ($, ko, Masonry) {
+], function ($, Masonry) {
     'use strict';
 
-    var Component,
-        rows,
-        container = '<div data-id="masonry_grid" id="masonry_grid"><div class="masonry-image-column"></div></div>';
+    describe('Magento_Ui/js/grid/masonry', function () {
+        var Component,
+            rows,
+            container = '<div data-id="masonry_grid" id="masonry_grid"><div class="masonry-image-column"></div></div>';
 
-    beforeEach(function () {
-        rows = [
-            {
-                _rowIndex: 0,
-                category: {},
-                'category_id': 695,
-                'category_name': 'People',
-                'comp_url': 'https://stock.adobe.com/Rest/Libraries/Watermarked/Download/327515738/2',
-                'content_type': 'image/jpeg',
-                'country_name': 'Malaysia',
-                'creation_date': '2020-03-02 10:41:51',
-                'creator_id': 208217780,
-                'creator_name': 'NajmiArif',
-                height: 3264,
-                id: 327515738,
-                'id_field_name': 'id',
-                'is_downloaded': 0,
-                'is_licensed_locally': 0,
-                keywords: [],
-                'media_type_id': 1,
-                overlay: '',
-                path: '',
-                'premium_level_id': 0,
-                'thumbnail_240_url': 'https://t4.ftcdn.net/jpg/03/27/51/57/240_F_327515738_n.jpg',
-                'thumbnail_500_ur': 'https://as2.ftcdn.net/jpg/03/27/51/57/500_F_327515738_n.jpg',
-                title: 'Neon effect picture of man wearing medical mask for viral or pandemic disease',
-                width: 4896
-            }
+        beforeEach(function () {
+            rows = [
+                {
+                    _rowIndex: 0,
+                    category: {},
+                    'category_id': 695,
+                    'category_name': 'People',
+                    'content_type': 'image/jpeg',
+                    'country_name': 'Malaysia',
+                    'creation_date': '2020-03-02 10:41:51',
+                    'creator_id': 208217780,
+                    'creator_name': 'NajmiArif',
+                    height: 3264,
+                    id: 327515738,
+                    'id_field_name': 'id',
+                    'is_downloaded': 0,
+                    'is_licensed_locally': 0,
+                    keywords: [],
+                    'media_type_id': 1,
+                    overlay: '',
+                    path: '',
+                    'premium_level_id': 0,
+                    title: 'Neon effect picture of man wearing medical mask for viral or pandemic disease',
+                    width: 4896
+                }
+            ];
 
-        ];
-
-        $(container).appendTo('body');
-
-        Component = new Masonry({
-            defaults: {
-                rows: ko.observable()
-            }
+            $(document.body).append(container);
+            Component = new Masonry({
+                defaults: {
+                    containerId: '#masonry_grid'
+                }
+            });
         });
 
-    });
-
-    afterEach(function () {
-        $('#masonry_grid').remove();
-    });
+        afterEach(function () {
+            Component.clear();
+            $('#masonry_grid').remove();
+        });
 
-    describe('check initComponent', function () {
-        it('verify setLayoutstyles called and grid iniztilized', function () {
-            var setlayoutStyles = spyOn(Component, 'setLayoutStyles');
+        describe('check initComponent', function () {
+            it('verify setLayoutstyles called and grid iniztilized', function () {
+                var setlayoutStyles = spyOn(Component, 'setLayoutStyles');
 
-            expect(Component).toBeDefined();
-            Component.containerId = 'masonry_grid';
-            Component.initComponent(rows);
-            Component.rows().forEach(function (image) {
-                expect(image.styles).toBeDefined();
-                expect(image.css).toBeDefined();
+                expect(Component).toBeDefined();
+                Component.containerId = 'masonry_grid';
+                Component.initComponent(rows);
+                Component.rows().forEach(function (image) {
+                    expect(image.styles).toBeDefined();
+                    expect(image.css).toBeDefined();
+                });
+                expect(setlayoutStyles).toHaveBeenCalled();
             });
-            expect(setlayoutStyles).toHaveBeenCalled();
-        });
-        it('verify events triggered', function () {
-            var setLayoutStyles = spyOn(Component, 'setLayoutStyles');
+            it('verify events triggered', function () {
+                var setLayoutStyles = spyOn(Component, 'setLayoutStyles');
 
-            Component.initComponent(rows);
-            window.dispatchEvent(new Event('resize'));
-            expect(setLayoutStyles).toHaveBeenCalled();
+                Component.initComponent(rows);
+                window.dispatchEvent(new Event('resize'));
+                expect(setLayoutStyles).toHaveBeenCalled();
+            });
         });
     });
 });
diff --git a/package.json.sample b/package.json.sample
index 4dea6d7b945f5..93fe72afbd24a 100644
--- a/package.json.sample
+++ b/package.json.sample
@@ -18,7 +18,7 @@
         "grunt-contrib-connect": "~1.0.2",
         "grunt-contrib-cssmin": "~2.2.1",
         "grunt-contrib-imagemin": "~2.0.1",
-        "grunt-contrib-jasmine": "~1.1.0",
+        "grunt-contrib-jasmine": "~1.2.0",
         "grunt-contrib-less": "~1.4.1",
         "grunt-contrib-watch": "~1.0.0",
         "grunt-eslint": "~20.1.0",
@@ -39,4 +39,4 @@
         "time-grunt": "~1.4.0",
         "underscore": "~1.8.0"
     }
-}
\ No newline at end of file
+}

From 708c6acdd9cbf6f231852d7c8631e157c859ca96 Mon Sep 17 00:00:00 2001
From: rrego6 <rrego@adobe.com>
Date: Thu, 20 Aug 2020 15:11:32 -0400
Subject: [PATCH 1632/1718] MC-30502: JSUnit tests incompatible with Node v10
 or v12

- added placeholder for urls
---
 .../tests/app/code/Magento/Ui/base/js/grid/masonry.test.js     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/masonry.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/masonry.test.js
index d1a614d28fc72..7f7d0c5f9dd2a 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/masonry.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/masonry.test.js
@@ -22,6 +22,7 @@ define([
                     category: {},
                     'category_id': 695,
                     'category_name': 'People',
+                    'comp_url': 'url',
                     'content_type': 'image/jpeg',
                     'country_name': 'Malaysia',
                     'creation_date': '2020-03-02 10:41:51',
@@ -37,6 +38,8 @@ define([
                     overlay: '',
                     path: '',
                     'premium_level_id': 0,
+                    'thumbnail_240_url': 'url',
+                    'thumbnail_500_ur': 'url',
                     title: 'Neon effect picture of man wearing medical mask for viral or pandemic disease',
                     width: 4896
                 }

From 2d9d741408e014c925ce94cecf87d93b80dc4219 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Mon, 24 Aug 2020 20:59:27 +0300
Subject: [PATCH 1633/1718] v9 AdminOpenCatalogSearchTermIndexPageActionGroup

---
 ...nCatalogSearchTermIndexPageActionGroup.xml | 19 +++++++++++++++++++
 .../StorefrontUpdateSearchTermEntityTest.xml  |  9 +++------
 .../AdminMassDeleteSearchTermEntityTest.xml   |  3 +--
 ...archSuggestionByProductDescriptionTest.xml |  6 ++----
 ...erifySearchSuggestionByProductNameTest.xml |  3 +--
 ...uggestionByProductShortDescriptionTest.xml |  3 +--
 ...VerifySearchSuggestionByProductSkuTest.xml |  3 +--
 ...rontVerifySearchTermEntityRedirectTest.xml |  2 +-
 8 files changed, 29 insertions(+), 19 deletions(-)
 create mode 100644 app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminOpenCatalogSearchTermIndexPageActionGroup.xml

diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminOpenCatalogSearchTermIndexPageActionGroup.xml b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminOpenCatalogSearchTermIndexPageActionGroup.xml
new file mode 100644
index 0000000000000..e8528d4126376
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminOpenCatalogSearchTermIndexPageActionGroup.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="AdminOpenCatalogSearchTermIndexPageActionGroup">
+        <annotations>
+            <description>Open catalog search term index page.</description>
+        </annotations>
+
+        <amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openCatalogSearchTermIndexPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontUpdateSearchTermEntityTest.xml b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontUpdateSearchTermEntityTest.xml
index b42313fc14773..26280ed67d183 100644
--- a/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontUpdateSearchTermEntityTest.xml
+++ b/app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontUpdateSearchTermEntityTest.xml
@@ -39,8 +39,7 @@
             <deleteData createDataKey="createCategory1" stepKey="deleteCategory1"/>
 
             <!-- Delete all search terms -->
-            <amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openAdminCatalogSearchTermIndexPage"/>
-            <waitForPageLoad stepKey="waitForAdminCatalogSearchTermIndexPageLoad"/>
+            <actionGroup ref="AdminOpenCatalogSearchTermIndexPageActionGroup" stepKey="openAdminCatalogSearchTermIndexPage"/>
             <comment userInput="Delete all search terms" stepKey="deleteAllSearchTermsComment"/>
             <actionGroup ref="AdminDeleteAllSearchTermsActionGroup" stepKey="deleteAllSearchTerms"/>
 
@@ -53,8 +52,7 @@
 
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
 
-        <amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openAdminCatalogSearchTermIndexPage1"/>
-        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <actionGroup ref="AdminOpenCatalogSearchTermIndexPageActionGroup" stepKey="openAdminCatalogSearchTermIndexPage1"/>
 
         <actionGroup ref="AdminSearchTermFilterBySearchQueryActionGroup" stepKey="filterByFirstSearchQuery1">
             <argument name="searchQuery" value="$$createProduct1.name$$"/>
@@ -67,8 +65,7 @@
             <argument name="searchTerm" value="UpdatedSearchTermData1"/>
         </actionGroup>
 
-        <amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openAdminCatalogSearchTermIndexPage2"/>
-        <waitForPageLoad stepKey="waitForPageLoad3"/>
+        <actionGroup ref="AdminOpenCatalogSearchTermIndexPageActionGroup" stepKey="openAdminCatalogSearchTermIndexPage2"/>
 
         <actionGroup ref="AdminSearchTermFilterBySearchQueryActionGroup" stepKey="filterByFirstSearchQuery2">
             <argument name="searchQuery" value="{{UpdatedSearchTermData1.query_text}}"/>
diff --git a/app/code/Magento/Search/Test/Mftf/Test/AdminMassDeleteSearchTermEntityTest.xml b/app/code/Magento/Search/Test/Mftf/Test/AdminMassDeleteSearchTermEntityTest.xml
index f5bb414f59197..88e459178edbc 100644
--- a/app/code/Magento/Search/Test/Mftf/Test/AdminMassDeleteSearchTermEntityTest.xml
+++ b/app/code/Magento/Search/Test/Mftf/Test/AdminMassDeleteSearchTermEntityTest.xml
@@ -34,8 +34,7 @@
         </after>
 
         <!-- Go to the catalog search term page -->
-        <amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openAdminCatalogSearchTermIndexPage"/>
-        <waitForPageLoad stepKey="waitForAdminCatalogSearchTermIndexPageLoad"/>
+        <actionGroup ref="AdminOpenCatalogSearchTermIndexPageActionGroup" stepKey="openAdminCatalogSearchTermIndexPage"/>
 
         <!-- Select all created below search terms -->
         <actionGroup ref="AdminSearchTermFilterBySearchQueryActionGroup" stepKey="filterByFirstSearchQuery">
diff --git a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductDescriptionTest.xml b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductDescriptionTest.xml
index 22fcbfc2920ff..8c468cce91829 100644
--- a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductDescriptionTest.xml
+++ b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductDescriptionTest.xml
@@ -35,8 +35,7 @@
             <!-- Delete created product -->
             <deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
             <!-- Go to the catalog search term page -->
-            <amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openAdminCatalogSearchTermIndexPage"/>
-            <waitForPageLoad stepKey="waitForAdminCatalogSearchTermIndexPageLoad"/>
+            <actionGroup ref="AdminOpenCatalogSearchTermIndexPageActionGroup" stepKey="openAdminCatalogSearchTermIndexPage"/>
             <!-- Filter the search term -->
             <actionGroup ref="AdminSearchTermFilterBySearchQueryActionGroup" stepKey="filterByThirdSearchQuery">
                 <argument name="searchQuery" value="{{ApiProductDescription.value}}"/>
@@ -60,8 +59,7 @@
             <argument name="productName" value="$$simpleProduct.name$$"/>
         </actionGroup>
         <!-- Go to the catalog search term page -->
-        <amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openAdminCatalogSearchTermIndexPage"/>
-        <waitForPageLoad stepKey="waitForAdminCatalogSearchTermIndexPageLoad"/>
+        <actionGroup ref="AdminOpenCatalogSearchTermIndexPageActionGroup" stepKey="openAdminCatalogSearchTermIndexPage"/>
         <!-- Filter the search term -->
         <actionGroup ref="AdminSearchTermFilterBySearchQueryActionGroup" stepKey="filterByThirdSearchQuery">
             <argument name="searchQuery" value="{{ApiProductDescription.value}}"/>
diff --git a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductNameTest.xml b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductNameTest.xml
index 0b02b49433dda..fb1f35730fd80 100644
--- a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductNameTest.xml
+++ b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductNameTest.xml
@@ -38,8 +38,7 @@
             <deleteData createDataKey="simpleProduct"  stepKey="deleteProduct"/>
 
             <!-- Go to the catalog search term page -->
-            <amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openAdminCatalogSearchTermIndexPage"/>
-            <waitForPageLoad stepKey="waitForAdminCatalogSearchTermIndexPageLoad"/>
+            <actionGroup ref="AdminOpenCatalogSearchTermIndexPageActionGroup" stepKey="openAdminCatalogSearchTermIndexPage"/>
 
             <!--Filter the search term -->
             <actionGroup ref="AdminSearchTermFilterBySearchQueryActionGroup" stepKey="filterByThirdSearchQuery">
diff --git a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductShortDescriptionTest.xml b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductShortDescriptionTest.xml
index d88bb023c60b2..1558f9aa5342b 100644
--- a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductShortDescriptionTest.xml
+++ b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductShortDescriptionTest.xml
@@ -39,8 +39,7 @@
             <deleteData createDataKey="product"  stepKey="deleteProduct"/>
 
              <!--Go to the catalog search term page -->
-            <amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openAdminCatalogSearchTermIndexPage"/>
-            <waitForPageLoad stepKey="waitForAdminCatalogSearchTermIndexPageLoad"/>
+            <actionGroup ref="AdminOpenCatalogSearchTermIndexPageActionGroup" stepKey="openAdminCatalogSearchTermIndexPage"/>
 
             <!--Filter the search term -->
             <actionGroup ref="AdminSearchTermFilterBySearchQueryActionGroup" stepKey="filterByThirdSearchQuery">
diff --git a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductSkuTest.xml b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductSkuTest.xml
index 4c586d18fd3cf..19c12843c23a2 100644
--- a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductSkuTest.xml
+++ b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchSuggestionByProductSkuTest.xml
@@ -39,8 +39,7 @@
             <deleteData createDataKey="simpleProduct"  stepKey="deleteProduct"/>
 
             <!-- Go to the catalog search term page -->
-            <amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openAdminCatalogSearchTermIndexPage"/>
-            <waitForPageLoad stepKey="waitForAdminCatalogSearchTermIndexPageLoad"/>
+            <actionGroup ref="AdminOpenCatalogSearchTermIndexPageActionGroup" stepKey="openAdminCatalogSearchTermIndexPage"/>
 
             <!--Filter the search term -->
             <actionGroup ref="AdminSearchTermFilterBySearchQueryActionGroup" stepKey="filterByThirdSearchQuery">
diff --git a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchTermEntityRedirectTest.xml b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchTermEntityRedirectTest.xml
index c5cbf1e0709c6..4f8cd9da856ca 100644
--- a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchTermEntityRedirectTest.xml
+++ b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchTermEntityRedirectTest.xml
@@ -32,7 +32,7 @@
             </actionGroup>
         </before>
         <after>
-            <amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="navigateToSearchTermPage"/>
+            <actionGroup ref="AdminOpenCatalogSearchTermIndexPageActionGroup" stepKey="navigateToSearchTermPage"/>
             <actionGroup ref="AdminSearchTermFilterBySearchQueryActionGroup" stepKey="findCreatedTerm">
                 <argument name="searchQuery" value="{{SearchTerm.query_text}}"/>
             </actionGroup>

From 45f834c3648f1663896519139726c32c9b264fc6 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Mon, 24 Aug 2020 21:09:35 +0300
Subject: [PATCH 1634/1718] use action group go to checkout

---
 .../Test/Mftf/Test/GuestCheckoutWithEnabledPersistentTest.xml  | 3 +--
 .../StorefrontTaxQuoteCheckoutGuestSimpleTest.xml              | 3 +--
 .../StorefrontTaxQuoteCheckoutGuestVirtualTest.xml             | 3 +--
 .../StorefrontTaxQuoteCheckoutLoggedInSimpleTest.xml           | 3 +--
 .../StorefrontTaxQuoteCheckoutLoggedInVirtualTest.xml          | 3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Persistent/Test/Mftf/Test/GuestCheckoutWithEnabledPersistentTest.xml b/app/code/Magento/Persistent/Test/Mftf/Test/GuestCheckoutWithEnabledPersistentTest.xml
index 43390598f7cb3..4f68c055f2615 100644
--- a/app/code/Magento/Persistent/Test/Mftf/Test/GuestCheckoutWithEnabledPersistentTest.xml
+++ b/app/code/Magento/Persistent/Test/Mftf/Test/GuestCheckoutWithEnabledPersistentTest.xml
@@ -48,8 +48,7 @@
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
         <click selector="{{CheckoutShippingGuestInfoSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
         <!-- Check that have the same values after page reload -->
-        <amOnPage url="{{CheckoutPage.url}}" stepKey="amOnCheckoutShippingInfoPage"/>
-        <waitForPageLoad stepKey="waitForShippingPageReload"/>
+        <actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="amOnCheckoutShippingInfoPage"/>
         <seeInField selector="{{CheckoutShippingGuestInfoSection.email}}" userInput="{{CustomerEntityOne.email}}" stepKey="seeEmailOnCheckout" />
         <seeInField selector="{{CheckoutShippingGuestInfoSection.firstName}}" userInput="{{CustomerEntityOne.firstName}}" stepKey="seeFirstnameOnCheckout" />
         <seeInField selector="{{CheckoutShippingGuestInfoSection.lastName}}" userInput="{{CustomerEntityOne.lastName}}" stepKey="seeLastnameOnCheckout" />
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestSimpleTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestSimpleTest.xml
index b9c3baab8c0dd..d2f1b1aa44393 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestSimpleTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestSimpleTest.xml
@@ -79,8 +79,7 @@
         <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You added"/>
 
         <!-- Fill in address for CA -->
-        <amOnPage url="{{CheckoutPage.url}}" stepKey="goToCheckout"/>
-        <waitForPageLoad stepKey="waitForShippingSection"/>
+        <actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="goToCheckout"/>
         <fillField selector="{{CheckoutShippingSection.email}}" userInput="{{Simple_US_Customer_CA.email}}" stepKey="enterEmail"/>
         <waitForLoadingMaskToDisappear stepKey="waitEmailLoad"/>
         <actionGroup ref="LoggedInCheckoutFillNewBillingAddressActionGroup" stepKey="changeAddress">
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestVirtualTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestVirtualTest.xml
index 8fafbd9986c64..5441664d7c530 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestVirtualTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutGuestVirtualTest.xml
@@ -79,8 +79,7 @@
         <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You added"/>
 
         <!-- Assert that taxes are applied correctly for CA -->
-        <amOnPage url="{{CheckoutPage.url}}" stepKey="goToCheckout"/>
-        <waitForPageLoad stepKey="waitForShippingSection"/>
+        <actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="goToCheckout"/>
 
         <waitForElementVisible stepKey="waitForOverviewVisible" selector="{{CheckoutPaymentSection.tax}}"/>
         <see stepKey="seeTax2" selector="{{CheckoutPaymentSection.tax}}" userInput="$8.25"/>
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInSimpleTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInSimpleTest.xml
index ae988cd43efd5..76f4dcd8e161e 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInSimpleTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInSimpleTest.xml
@@ -94,8 +94,7 @@
         <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You added"/>
 
         <!-- Assert that taxes are applied correctly for NY -->
-        <amOnPage url="{{CheckoutPage.url}}" stepKey="goToCheckout"/>
-        <waitForPageLoad stepKey="waitForShippingSection"/>
+        <actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="goToCheckout"/>
         <see stepKey="seeAddress" selector="{{CheckoutShippingSection.selectedShippingAddress}}" userInput="{{SimpleTaxNY.state}}"/>
         <actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNext"/>
 
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInVirtualTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInVirtualTest.xml
index 6552d31a8a523..c98765976f36f 100644
--- a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInVirtualTest.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCheckoutTest/StorefrontTaxQuoteCheckoutLoggedInVirtualTest.xml
@@ -94,8 +94,7 @@
         <see stepKey="seeSuccess" selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You added"/>
 
         <!-- Assert that taxes are applied correctly for NY -->
-        <amOnPage url="{{CheckoutPage.url}}" stepKey="goToCheckout"/>
-        <waitForPageLoad stepKey="waitForShippingSection"/>
+        <actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="goToCheckout"/>
         <!-- Checkout select Check/Money Order payment -->
         <actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
         <see stepKey="seeAddress" selector="{{CheckoutShippingSection.defaultShipping}}" userInput="{{SimpleTaxNY.state}}"/>

From ae615991f7bb182c70485511f6675673471dc26f 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 1635/1718] 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 32b30e570fc747f7c1b63305be9d9dbff10cbb79 Mon Sep 17 00:00:00 2001
From: Roman Lytvynenko <lytvynen@adobe.com>
Date: Mon, 24 Aug 2020 15:15:52 -0500
Subject: [PATCH 1636/1718] MC-36647: Order can be placed as a customer after
 session cookie expiration with Persistent Cart enabled

---
 .../Customer/Model/Plugin/CustomerAuthorization.php    |  2 +-
 app/code/Magento/Persistent/etc/di.xml                 | 10 ++++++++++
 app/code/Magento/Persistent/etc/webapi_rest/di.xml     |  5 -----
 app/code/Magento/Persistent/etc/webapi_soap/di.xml     |  5 -----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/Customer/Model/Plugin/CustomerAuthorization.php b/app/code/Magento/Customer/Model/Plugin/CustomerAuthorization.php
index f9c16b95ee054..c3de3af812670 100644
--- a/app/code/Magento/Customer/Model/Plugin/CustomerAuthorization.php
+++ b/app/code/Magento/Customer/Model/Plugin/CustomerAuthorization.php
@@ -39,7 +39,7 @@ public function __construct(
      * @param Authorization $subject
      * @param Closure $proceed
      * @param string $resource
-     * @param $privilege
+     * @param null $privilege
      * @return bool|mixed
      */
     public function aroundIsAllowed(
diff --git a/app/code/Magento/Persistent/etc/di.xml b/app/code/Magento/Persistent/etc/di.xml
index f49d4361acb52..fd1c97fae66d9 100644
--- a/app/code/Magento/Persistent/etc/di.xml
+++ b/app/code/Magento/Persistent/etc/di.xml
@@ -12,4 +12,14 @@
     <type name="Magento\Customer\CustomerData\Customer">
         <plugin name="section_data" type="Magento\Persistent\Model\Plugin\CustomerData" />
     </type>
+    <type name="Magento\Persistent\Model\Customer\Authorization">
+        <arguments>
+            <argument name="customerSession" xsi:type="object">Magento\Customer\Model\Session\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Persistent\Helper\Session">
+        <arguments>
+            <argument name="checkoutSession" xsi:type="object">Magento\Checkout\Model\Session\Proxy</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Persistent/etc/webapi_rest/di.xml b/app/code/Magento/Persistent/etc/webapi_rest/di.xml
index 5c2c6d0450019..89504f0471788 100644
--- a/app/code/Magento/Persistent/etc/webapi_rest/di.xml
+++ b/app/code/Magento/Persistent/etc/webapi_rest/di.xml
@@ -20,9 +20,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Persistent\Model\Customer\Authorization">
-        <arguments>
-            <argument name="customerSession" xsi:type="object">Magento\Customer\Model\Session\Proxy</argument>
-        </arguments>
-    </type>
 </config>
diff --git a/app/code/Magento/Persistent/etc/webapi_soap/di.xml b/app/code/Magento/Persistent/etc/webapi_soap/di.xml
index cd1006fa5c73e..2a440fff03598 100644
--- a/app/code/Magento/Persistent/etc/webapi_soap/di.xml
+++ b/app/code/Magento/Persistent/etc/webapi_soap/di.xml
@@ -20,9 +20,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Persistent\Model\Customer\Authorization">
-        <arguments>
-            <argument name="customerSession" xsi:type="object">Magento\Customer\Model\Session\Proxy</argument>
-        </arguments>
-    </type>
 </config>

From 2c0c2805d516263a771f0737c3e3db5c0f817cae Mon Sep 17 00:00:00 2001
From: Roman Lytvynenko <lytvynen@adobe.com>
Date: Mon, 24 Aug 2020 17:25:58 -0500
Subject: [PATCH 1637/1718] MC-36647: Order can be placed as a customer after
 session cookie expiration with Persistent Cart enabled

---
 .../Magento/Customer/Model/Plugin/CustomerAuthorization.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/Model/Plugin/CustomerAuthorization.php b/app/code/Magento/Customer/Model/Plugin/CustomerAuthorization.php
index c3de3af812670..65bf9843e44fd 100644
--- a/app/code/Magento/Customer/Model/Plugin/CustomerAuthorization.php
+++ b/app/code/Magento/Customer/Model/Plugin/CustomerAuthorization.php
@@ -39,7 +39,7 @@ public function __construct(
      * @param Authorization $subject
      * @param Closure $proceed
      * @param string $resource
-     * @param null $privilege
+     * @param mixed $privilege
      * @return bool|mixed
      */
     public function aroundIsAllowed(

From 1973efbde04dbc5b3081755c071cbf9e6d707532 Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Tue, 25 Aug 2020 14:05:33 +0530
Subject: [PATCH 1638/1718] MFTF test added and fixed the issue if user press
 return

---
 ...erifySearchButtonIsDisabledActionGroup.xml | 24 +++++++++++++++
 ...fySearchButtonIsNotDisabledActionGroup.xml | 23 +++++++++++++++
 .../StoreFrontFillSearchActionGroup.xml       | 19 ++++++++++++
 ...ttonDisabledTillMinimumSearchLengthHit.xml | 29 +++++++++++++++++++
 ...NotDisabledAfterMinimumSearchLengthHit.xml | 29 +++++++++++++++++++
 .../Search/view/frontend/web/js/form-mini.js  |  6 ++--
 6 files changed, 128 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/Search/Test/Mftf/ActionGroup/AssertStorefrontVerifySearchButtonIsDisabledActionGroup.xml
 create mode 100644 app/code/Magento/Search/Test/Mftf/ActionGroup/AssertStorefrontVerifySearchButtonIsNotDisabledActionGroup.xml
 create mode 100644 app/code/Magento/Search/Test/Mftf/ActionGroup/StoreFrontFillSearchActionGroup.xml
 create mode 100644 app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchButtonDisabledTillMinimumSearchLengthHit.xml
 create mode 100644 app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchButtonNotDisabledAfterMinimumSearchLengthHit.xml

diff --git a/app/code/Magento/Search/Test/Mftf/ActionGroup/AssertStorefrontVerifySearchButtonIsDisabledActionGroup.xml b/app/code/Magento/Search/Test/Mftf/ActionGroup/AssertStorefrontVerifySearchButtonIsDisabledActionGroup.xml
new file mode 100644
index 0000000000000..b7b814713d194
--- /dev/null
+++ b/app/code/Magento/Search/Test/Mftf/ActionGroup/AssertStorefrontVerifySearchButtonIsDisabledActionGroup.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">
+    <!-- Filter by search query and select -->
+    <actionGroup name="AssertStorefrontVerifySearchButtonIsDisabledActionGroup">
+        <annotations>
+            <description>Fills in the provided Search Query on the Admin Search Term grid page.</description>
+        </annotations>
+
+        <grabAttributeFrom selector="{{StorefrontQuickSearchSection.searchButton}}" userInput="disabled" stepKey="grabSearchButtonDisabledAttribute"/>
+
+        <assertEquals stepKey="assertSearchButtonDisabled">
+            <actualResult type="const">$grabSearchButtonDisabledAttribute</actualResult>
+            <expectedResult type="string">true</expectedResult>
+        </assertEquals>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Search/Test/Mftf/ActionGroup/AssertStorefrontVerifySearchButtonIsNotDisabledActionGroup.xml b/app/code/Magento/Search/Test/Mftf/ActionGroup/AssertStorefrontVerifySearchButtonIsNotDisabledActionGroup.xml
new file mode 100644
index 0000000000000..b22f91a3549ef
--- /dev/null
+++ b/app/code/Magento/Search/Test/Mftf/ActionGroup/AssertStorefrontVerifySearchButtonIsNotDisabledActionGroup.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">
+    <!-- Filter by search query and select -->
+    <actionGroup name="AssertStorefrontVerifySearchButtonIsNotDisabledActionGroup">
+        <annotations>
+            <description>Fills in the provided Search Query on the Admin Search Term grid page.</description>
+        </annotations>
+
+        <grabAttributeFrom selector="{{StorefrontQuickSearchSection.searchButton}}" userInput="disabled" stepKey="grabSearchButtonAttribute"/>
+
+        <assertEmpty stepKey="assertSearchButtonEnabled">
+            <actualResult type="string">$grabSearchButtonAttribute</actualResult>
+        </assertEmpty>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Search/Test/Mftf/ActionGroup/StoreFrontFillSearchActionGroup.xml b/app/code/Magento/Search/Test/Mftf/ActionGroup/StoreFrontFillSearchActionGroup.xml
new file mode 100644
index 0000000000000..f90297df02c1f
--- /dev/null
+++ b/app/code/Magento/Search/Test/Mftf/ActionGroup/StoreFrontFillSearchActionGroup.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="StoreFrontFillSearchActionGroup">
+        <arguments>
+            <argument name="query" type="string"/>
+        </arguments>
+
+        <fillField stepKey="fillSearchField" selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="{{query}}"/>
+        <waitForElementVisible selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="waitForSubmitButton"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchButtonDisabledTillMinimumSearchLengthHit.xml b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchButtonDisabledTillMinimumSearchLengthHit.xml
new file mode 100644
index 0000000000000..da461c4b8dbb0
--- /dev/null
+++ b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchButtonDisabledTillMinimumSearchLengthHit.xml
@@ -0,0 +1,29 @@
+<?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="StorefrontVerifySearchButtonDisabledTillMinimumSearchLengthHit">
+        <annotations>
+            <stories value="Search Term Disabled"/>
+            <title value="Verify search button is disabled if search term is less than minimum search length"/>
+            <description value="Storefront verify search button is disabled if search term is less than minimum search length"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="https://github.com/magento/magento2/issues/29704"/>
+            <group value="searchFrontend"/>
+        </annotations>
+
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openStoreFrontHomePage"/>
+
+        <actionGroup ref="StoreFrontFillSearchActionGroup" stepKey="fillSearchByTextLessThanMinimumSearchLength">
+            <argument name="query" value="Te"/>
+        </actionGroup>
+
+        <actionGroup ref="AssertStorefrontVerifySearchButtonIsDisabledActionGroup" stepKey="assertSearchButtonIsDisabled"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchButtonNotDisabledAfterMinimumSearchLengthHit.xml b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchButtonNotDisabledAfterMinimumSearchLengthHit.xml
new file mode 100644
index 0000000000000..e7e0eb54568e0
--- /dev/null
+++ b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchButtonNotDisabledAfterMinimumSearchLengthHit.xml
@@ -0,0 +1,29 @@
+<?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="StorefrontVerifySearchButtonNotDisabledAfterMinimumSearchLengthHit">
+        <annotations>
+            <stories value="Search Button Not Disabled"/>
+            <title value="Verify search button is not disabled if search term is equal or greater than minimum search length"/>
+            <description value="Storefront verify search button is not disabled if search term is equal or greater than minimum search length"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="https://github.com/magento/magento2/issues/29704"/>
+            <group value="searchFrontend"/>
+        </annotations>
+
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openStoreFrontHomePage"/>
+
+        <actionGroup ref="StoreFrontFillSearchActionGroup" stepKey="fillSearchByTextMoreThanMinimumSearchLength">
+            <argument name="query" value="Magento"/>
+        </actionGroup>
+
+        <actionGroup ref="AssertStorefrontVerifySearchButtonIsNotDisabledActionGroup" stepKey="assertSearchButtonIsNotDisabled"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Search/view/frontend/web/js/form-mini.js b/app/code/Magento/Search/view/frontend/web/js/form-mini.js
index 1781cb9694735..9b4c814f73d73 100644
--- a/app/code/Magento/Search/view/frontend/web/js/form-mini.js
+++ b/app/code/Magento/Search/view/frontend/web/js/form-mini.js
@@ -232,8 +232,10 @@ define([
                     break;
 
                 case $.ui.keyCode.ENTER:
-                    this.searchForm.trigger('submit');
-                    e.preventDefault();
+                    if (this.element.val().length >= parseInt(this.options.minSearchLength, 10)) {
+                        this.searchForm.trigger('submit');
+                        e.preventDefault();
+                    }
                     break;
 
                 case $.ui.keyCode.DOWN:

From 8793d83717b8a12d565ecd5c6ccd16e59784522d Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 25 Aug 2020 12:21:31 +0300
Subject: [PATCH 1639/1718] Cover product grid used in functionality

---
 ...ilterPlaceHolderProductGridActionGroup.xml | 20 +++++
 ...alleryCatalogUiUsedInProductFilterTest.xml | 35 ++++----
 ...talogUiVerifyUsedInLinkProductGridTest.xml | 84 +++++++++++++++++++
 3 files changed, 120 insertions(+), 19 deletions(-)
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryFilterPlaceHolderProductGridActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest.xml

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryFilterPlaceHolderProductGridActionGroup.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryFilterPlaceHolderProductGridActionGroup.xml
new file mode 100644
index 0000000000000..02324fd76001f
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryFilterPlaceHolderProductGridActionGroup.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="AdminAssertMediaGalleryFilterPlaceHolderProductGridActionGroup">
+        <annotations>
+            <description>Assert asset filter placeholder value</description>
+        </annotations>
+        <arguments>
+            <argument name="filterPlaceholder" type="string"/>
+        </arguments>
+
+        <see selector="{{AdminProductGridFilterSection.enabledFilters}}" userInput="{{filterPlaceholder}}" stepKey="seeProductNameFilter"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
index 74633fbb73542..934388188f23a 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
@@ -10,27 +10,22 @@
     <test name="AdminMediaGalleryCatalogUiUsedInProductFilterTest">
         <annotations>
             <features value="AdminMediaGalleryUsedInProductsFilter"/>
-            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1168"/>
-            <title value="Used in products filter"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1503"/>
+            <title value="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/1320712/scenarios/4951848"/>
+            <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"/>
         </annotations>
         <before>
             <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
-            <createData entity="SimpleSubCategory" stepKey="category"/>
-            <createData entity="SimpleProduct" stepKey="product">
-                <requiredEntity createDataKey="category"/>
-            </createData>
+            <createData entity="SimpleProduct2" stepKey="product"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
             <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
             <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
-            <deleteData createDataKey="product" stepKey="deleteProduct"/>
-            <deleteData createDataKey="category" stepKey="deleteCategory"/>
         </after>
         <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchProduct">
             <argument name="product" value="$$product$$"/>
@@ -39,10 +34,7 @@
             <argument name="product" value="$$product$$"/>
         </actionGroup>
         <click selector="{{AdminProductFormSection.contentTab}}" stepKey="clickContentTab"/>
-        <waitForElementVisible selector="{{CatalogWYSIWYGSection.TinyMCE4}}" stepKey="waitForTinyMCE4" />
-        <click selector="{{CatalogWYSIWYGSection.InsertImageIcon}}" stepKey="clickInsertImageIcon" />
-        <waitForPageLoad stepKey="waitForPageLoad" />
-        <actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
+        <actionGroup ref="AdminOpenMediaGalleryTinyMce4ActionGroup" stepKey="openMediaGalleryFromWysiwyg"/>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
             <argument name="image" value="ImageUpload3"/>
         </actionGroup>
@@ -59,17 +51,22 @@
             <argument name="optionName" value="$$product.name$$"/>
         </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryApplyFiltersActionGroup" stepKey="applyFilters"/>
-        <actionGroup ref="AdminMediaGalleryAssertImageInGridActionGroup" stepKey="assertImageInGrid">
-            <argument name="title" value="ImageMetadata.title"/>
+
+        <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetails"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryClickEntityUsedInActionGroup" stepKey="clickUsedInProducts">
+            <argument name="entityName" value="Products"/>
         </actionGroup>
 
-        <wait time="10" stepKey="waitForBookmarkToSaveView"/>
-        <reloadPage stepKey="reloadPage"/>
-        <waitForPageLoad stepKey="waitForGridReloaded"/>
-        <actionGroup ref="AdminAssertMediaGalleryFilterPlaceholderActionGroup" stepKey="assertFilterApplied">
+        <actionGroup ref="AdminAssertMediaGalleryFilterPlaceHolderProductGridActionGroup" stepKey="assertFilterApplied">
             <argument name="filterPlaceholder" value="$$product.name$$"/>
         </actionGroup>
 
+        <deleteData createDataKey="product" stepKey="deleteProduct"/>
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
+        <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}}"/>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest.xml
new file mode 100644
index 0000000000000..77e837af080f0
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest.xml
@@ -0,0 +1,84 @@
+<?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="AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest">
+        <annotations>
+            <features value="AdminMediaGalleryUsedInProductsFilter"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1168"/>
+            <title value="Used in products filter"/>
+            <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 products"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <createData entity="SimpleProduct" stepKey="product">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+        </after>
+        <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchProduct">
+            <argument name="product" value="$$product$$"/>
+        </actionGroup>
+        <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct">
+            <argument name="product" value="$$product$$"/>
+        </actionGroup>
+        <click selector="{{AdminProductFormSection.contentTab}}" stepKey="clickContentTab"/>
+        <waitForElementVisible selector="{{CatalogWYSIWYGSection.TinyMCE4}}" stepKey="waitForTinyMCE4" />
+        <click selector="{{CatalogWYSIWYGSection.InsertImageIcon}}" stepKey="clickInsertImageIcon" />
+        <waitForPageLoad stepKey="waitForPageLoad" />
+        <actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
+        <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="AdminEnhancedMediaGalleryExpandFilterActionGroup" stepKey="expandFilters"/>
+        <actionGroup ref="AdminEnhancedMediaGallerySelectUsedInFilterActionGroup" stepKey="setUsedInFilter">
+            <argument name="filterName" value="Used in Products"/>
+            <argument name="optionName" value="$$product.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="AssertAdminMediaGalleryAssetFilterPlaceHolderActionGroup" stepKey="assertFilterApplied">
+            <argument name="filterPlaceholder" value="{{ImageMetadata.title}}"/>
+        </actionGroup>
+
+        <deleteData createDataKey="product" stepKey="deleteProduct"/>
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
+
+        <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetailsToVerfifyEmptyUsedIn"/>
+        <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="clikDeleteSelectedButton"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
+
+   </test>
+</tests>

From a68bbbd6243ab5325ab8d5e0278a86d153175022 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 1640/1718] 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 50b83bef10fa63a85ca8f82271f22d7887f57395 Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Tue, 25 Aug 2020 17:08:52 +0530
Subject: [PATCH 1641/1718] Feedback changes

---
 ...ssertStorefrontVerifySearchButtonIsDisabledActionGroup.xml | 2 +-
 ...ssertStorefrontVerifySearchButtonIsEnabledActionGroup.xml} | 4 ++--
 ...ifySearchButtonDisabledTillMinimumSearchLengthHitTest.xml} | 2 +-
 ...ifySearchButtonEnabledAfterMinimumSearchLengthHitTest.xml} | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename app/code/Magento/Search/Test/Mftf/ActionGroup/{AssertStorefrontVerifySearchButtonIsNotDisabledActionGroup.xml => AssertStorefrontVerifySearchButtonIsEnabledActionGroup.xml} (79%)
 rename app/code/Magento/Search/Test/Mftf/Test/{StorefrontVerifySearchButtonDisabledTillMinimumSearchLengthHit.xml => StorefrontVerifySearchButtonDisabledTillMinimumSearchLengthHitTest.xml} (98%)
 rename app/code/Magento/Search/Test/Mftf/Test/{StorefrontVerifySearchButtonNotDisabledAfterMinimumSearchLengthHit.xml => StorefrontVerifySearchButtonEnabledAfterMinimumSearchLengthHitTest.xml} (84%)

diff --git a/app/code/Magento/Search/Test/Mftf/ActionGroup/AssertStorefrontVerifySearchButtonIsDisabledActionGroup.xml b/app/code/Magento/Search/Test/Mftf/ActionGroup/AssertStorefrontVerifySearchButtonIsDisabledActionGroup.xml
index b7b814713d194..57d39e35d539e 100644
--- a/app/code/Magento/Search/Test/Mftf/ActionGroup/AssertStorefrontVerifySearchButtonIsDisabledActionGroup.xml
+++ b/app/code/Magento/Search/Test/Mftf/ActionGroup/AssertStorefrontVerifySearchButtonIsDisabledActionGroup.xml
@@ -11,7 +11,7 @@
     <!-- Filter by search query and select -->
     <actionGroup name="AssertStorefrontVerifySearchButtonIsDisabledActionGroup">
         <annotations>
-            <description>Fills in the provided Search Query on the Admin Search Term grid page.</description>
+            <description>Verify search button has disabled attribute</description>
         </annotations>
 
         <grabAttributeFrom selector="{{StorefrontQuickSearchSection.searchButton}}" userInput="disabled" stepKey="grabSearchButtonDisabledAttribute"/>
diff --git a/app/code/Magento/Search/Test/Mftf/ActionGroup/AssertStorefrontVerifySearchButtonIsNotDisabledActionGroup.xml b/app/code/Magento/Search/Test/Mftf/ActionGroup/AssertStorefrontVerifySearchButtonIsEnabledActionGroup.xml
similarity index 79%
rename from app/code/Magento/Search/Test/Mftf/ActionGroup/AssertStorefrontVerifySearchButtonIsNotDisabledActionGroup.xml
rename to app/code/Magento/Search/Test/Mftf/ActionGroup/AssertStorefrontVerifySearchButtonIsEnabledActionGroup.xml
index b22f91a3549ef..2e1f8d4b68d36 100644
--- a/app/code/Magento/Search/Test/Mftf/ActionGroup/AssertStorefrontVerifySearchButtonIsNotDisabledActionGroup.xml
+++ b/app/code/Magento/Search/Test/Mftf/ActionGroup/AssertStorefrontVerifySearchButtonIsEnabledActionGroup.xml
@@ -9,9 +9,9 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <!-- Filter by search query and select -->
-    <actionGroup name="AssertStorefrontVerifySearchButtonIsNotDisabledActionGroup">
+    <actionGroup name="AssertStorefrontVerifySearchButtonIsEnabledActionGroup">
         <annotations>
-            <description>Fills in the provided Search Query on the Admin Search Term grid page.</description>
+            <description>Verify search button does not disabled attribute</description>
         </annotations>
 
         <grabAttributeFrom selector="{{StorefrontQuickSearchSection.searchButton}}" userInput="disabled" stepKey="grabSearchButtonAttribute"/>
diff --git a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchButtonDisabledTillMinimumSearchLengthHit.xml b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchButtonDisabledTillMinimumSearchLengthHitTest.xml
similarity index 98%
rename from app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchButtonDisabledTillMinimumSearchLengthHit.xml
rename to app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchButtonDisabledTillMinimumSearchLengthHitTest.xml
index da461c4b8dbb0..10b086609391f 100644
--- a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchButtonDisabledTillMinimumSearchLengthHit.xml
+++ b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchButtonDisabledTillMinimumSearchLengthHitTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontVerifySearchButtonDisabledTillMinimumSearchLengthHit">
+    <test name="StorefrontVerifySearchButtonDisabledTillMinimumSearchLengthHitTest">
         <annotations>
             <stories value="Search Term Disabled"/>
             <title value="Verify search button is disabled if search term is less than minimum search length"/>
diff --git a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchButtonNotDisabledAfterMinimumSearchLengthHit.xml b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchButtonEnabledAfterMinimumSearchLengthHitTest.xml
similarity index 84%
rename from app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchButtonNotDisabledAfterMinimumSearchLengthHit.xml
rename to app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchButtonEnabledAfterMinimumSearchLengthHitTest.xml
index e7e0eb54568e0..79a192798db3e 100644
--- a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchButtonNotDisabledAfterMinimumSearchLengthHit.xml
+++ b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchButtonEnabledAfterMinimumSearchLengthHitTest.xml
@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontVerifySearchButtonNotDisabledAfterMinimumSearchLengthHit">
+    <test name="StorefrontVerifySearchButtonEnabledAfterMinimumSearchLengthHitTest">
         <annotations>
             <stories value="Search Button Not Disabled"/>
             <title value="Verify search button is not disabled if search term is equal or greater than minimum search length"/>
@@ -24,6 +24,6 @@
             <argument name="query" value="Magento"/>
         </actionGroup>
 
-        <actionGroup ref="AssertStorefrontVerifySearchButtonIsNotDisabledActionGroup" stepKey="assertSearchButtonIsNotDisabled"/>
+        <actionGroup ref="AssertStorefrontVerifySearchButtonIsEnabledActionGroup" stepKey="assertSearchButtonIsNotDisabled"/>
     </test>
 </tests>

From f5ef67e45f924a7e562ad59c38915494fa6ae3c0 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 25 Aug 2020 14:59:59 +0300
Subject: [PATCH 1642/1718] Cover all entities ans filter placeholders

---
 ...lleryFilterPlaceHolderGridActionGroup.xml} |  4 +-
 ...talogUiVerifyUsedInLinkProductGridTest.xml |  8 +--
 ...aGalleryAssertUsedInLinkBlocksGridTest.xml | 66 +++++++++++++++++
 ...iaGalleryAssertUsedInLinkPagesGridTest.xml | 71 +++++++++++++++++++
 ...ediaGalleryCmsUiUsedInBlocksFilterTest.xml |  2 +-
 ...MediaGalleryCmsUiUsedInPagesFilterTest.xml |  8 +--
 6 files changed, 145 insertions(+), 14 deletions(-)
 rename app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/{AdminAssertMediaGalleryFilterPlaceHolderProductGridActionGroup.xml => AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup.xml} (79%)
 create mode 100644 app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkBlocksGridTest.xml
 create mode 100644 app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkPagesGridTest.xml

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryFilterPlaceHolderProductGridActionGroup.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup.xml
similarity index 79%
rename from app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryFilterPlaceHolderProductGridActionGroup.xml
rename to app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup.xml
index 02324fd76001f..e21fa89965391 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryFilterPlaceHolderProductGridActionGroup.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup.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="AdminAssertMediaGalleryFilterPlaceHolderProductGridActionGroup">
+    <actionGroup name="AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup">
         <annotations>
             <description>Assert asset filter placeholder value</description>
         </annotations>
@@ -15,6 +15,6 @@
             <argument name="filterPlaceholder" type="string"/>
         </arguments>
 
-        <see selector="{{AdminProductGridFilterSection.enabledFilters}}" userInput="{{filterPlaceholder}}" stepKey="seeProductNameFilter"/>
+        <see selector="{{AdminProductGridFilterSection.enabledFilters}}" userInput="{{filterPlaceholder}}" stepKey="seeFilter"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest.xml
index 77e837af080f0..db7942d4c53bf 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkProductGridTest.xml
@@ -53,17 +53,11 @@
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
 
         <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
-        <actionGroup ref="AdminEnhancedMediaGalleryExpandFilterActionGroup" stepKey="expandFilters"/>
-        <actionGroup ref="AdminEnhancedMediaGallerySelectUsedInFilterActionGroup" stepKey="setUsedInFilter">
-            <argument name="filterName" value="Used in Products"/>
-            <argument name="optionName" value="$$product.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="AssertAdminMediaGalleryAssetFilterPlaceHolderActionGroup" stepKey="assertFilterApplied">
+        <actionGroup ref="AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup" stepKey="assertFilterApplied">
             <argument name="filterPlaceholder" value="{{ImageMetadata.title}}"/>
         </actionGroup>
 
diff --git a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkBlocksGridTest.xml b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkBlocksGridTest.xml
new file mode 100644
index 0000000000000..a0cd04fad54c5
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkBlocksGridTest.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="AdminMediaGalleryAssertUsedInLinkBlocksGridTest">
+        <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"/>
+        </after>
+
+         <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
+            <argument name="CMSBlockPage" value="$$block$$"/>
+        </actionGroup>
+        <click selector="{{CmsWYSIWYGSection.InsertImageBtn}}" stepKey="clickInsertImageIcon" />
+        <waitForPageLoad stepKey="waitForPageLoad" />
+        <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="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetails"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryClickEntityUsedInActionGroup" stepKey="clickUsedInPages">
+            <argument name="entityName" value="Blocks"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup" stepKey="assertFilterApplied">
+            <argument name="filterPlaceholder" value="{{ImageMetadata.title}}"/>
+        </actionGroup>
+
+        <deleteData createDataKey="block" stepKey="deleteBlock"/>
+
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetailsToVerfifyEmptyUsedIn"/>
+        <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="clikDeleteSelectedButton"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
+   </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkPagesGridTest.xml b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkPagesGridTest.xml
new file mode 100644
index 0000000000000..de8517eedae0e
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkPagesGridTest.xml
@@ -0,0 +1,71 @@
+<?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="AdminMediaGalleryAssertUsedInLinkPagesGridTest">
+        <annotations>
+            <features value="AdminMediaGalleryUsedInBlocksFilter"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1168"/>
+            <title value="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"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
+        </before>
+        <after>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+        </after>
+
+        <actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToCreateNewPage"/>
+        <actionGroup ref="FillOutCustomCMSPageContentActionGroup" stepKey="fillBasicPageDataForPageWithDefaultStore">
+            <argument name="title" value="Unique page title MediaGalleryUi"/>
+            <argument name="content" value="MediaGalleryUI content"/>
+            <argument name="identifier" value="test-page-1"/>
+        </actionGroup>
+
+        <actionGroup ref="AdminOpenMediaGalleryFromPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad" />
+        <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="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="savePage"/>
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
+        <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="test-page-1"/>
+        </actionGroup>
+
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetailsToVerfifyEmptyUsedIn"/>
+        <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="clikDeleteSelectedButton"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
+
+   </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryCmsUiUsedInBlocksFilterTest.xml b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryCmsUiUsedInBlocksFilterTest.xml
index 810d9eea4e261..fa6dc6c1a07fa 100644
--- a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryCmsUiUsedInBlocksFilterTest.xml
+++ b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryCmsUiUsedInBlocksFilterTest.xml
@@ -55,6 +55,6 @@
         </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
         <actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
-       
+
    </test>
 </tests>
diff --git a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryCmsUiUsedInPagesFilterTest.xml b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryCmsUiUsedInPagesFilterTest.xml
index a6bfdb781a734..e88da08554fa4 100644
--- a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryCmsUiUsedInPagesFilterTest.xml
+++ b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryCmsUiUsedInPagesFilterTest.xml
@@ -21,14 +21,14 @@
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>
-       
+
         <actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToCreateNewPage"/>
         <actionGroup ref="FillOutCustomCMSPageContentActionGroup" stepKey="fillBasicPageDataForPageWithDefaultStore">
             <argument name="title" value="Unique page title MediaGalleryUi"/>
             <argument name="content" value="MediaGalleryUI content"/>
             <argument name="identifier" value="test-page-1"/>
         </actionGroup>
-        
+
         <actionGroup ref="AdminOpenMediaGalleryFromPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/>
         <waitForPageLoad stepKey="waitForPageLoad" />
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
@@ -39,7 +39,7 @@
         </actionGroup>
         <actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelectedContentImage"/>
         <click selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="savePage"/>
-        
+
         <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
         <actionGroup ref="AdminEnhancedMediaGalleryExpandFilterActionGroup" stepKey="expandFilters"/>
         <actionGroup ref="AdminEnhancedMediaGallerySelectUsedInFilterActionGroup" stepKey="setUsedInFilter">
@@ -56,7 +56,7 @@
                 <argument name="imageName" value="{{ImageMetadata.title}}"/>
         </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
-          
+
         <actionGroup ref="AdminNavigateToPageGridActionGroup" stepKey="navigateToCmsPageGrid"/>
         <actionGroup ref="AdminSearchCmsPageInGridByUrlKeyActionGroup" stepKey="findCreatedCmsPage">
             <argument name="urlKey" value="test-page-1"/>

From d93f3d2b67a6d6777603927fd40bac604a1b1094 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 25 Aug 2020 13:17:21 +0100
Subject: [PATCH 1643/1718] magento/magento2#29677: Fixed static tests

---
 .../Adminhtml/Wysiwyg/Images/OnInsert.php     | 56 +++++++------
 .../Wysiwyg/Images/GetInsertImageContent.php  |  7 +-
 .../Images/GetInsertImageContentTest.php      | 80 +++++++++----------
 3 files changed, 66 insertions(+), 77 deletions(-)
 rename {app/code/Magento/Cms/Test/Integration => dev/tests/integration/testsuite/Magento/Cms}/Model/Wysiwyg/Images/GetInsertImageContentTest.php (50%)

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
index f62d3debc74bd..e9a2431e2393d 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
@@ -1,64 +1,62 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
 
-class OnInsert extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
+use Magento\Backend\App\Action\Context;
+use Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
+use Magento\Cms\Model\Wysiwyg\Images\GetInsertImageContent;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\Controller\Result\RawFactory;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\Registry;
+
+class OnInsert extends Images implements HttpGetActionInterface
 {
     /**
-     * @var \Magento\Framework\Controller\Result\RawFactory
+     * @var RawFactory
      */
     protected $resultRawFactory;
 
     /**
-     * @var \Magento\Cms\Model\Wysiwyg\Images\GetInsertImageContent
+     * @var GetInsertImageContent
      */
     protected $getInsertImageContent;
 
     /**
-     * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\Framework\Registry $coreRegistry
-     * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
-     * @param \Magento\Cms\Model\Wysiwyg\Images\GetInsertImageContent $getInsertImageContent
+     * @param Context $context
+     * @param Registry $coreRegistry
+     * @param RawFactory $resultRawFactory
+     * @param GetInsertImageContent $getInsertImageContent
      */
     public function __construct(
-        \Magento\Backend\App\Action\Context $context,
-        \Magento\Framework\Registry $coreRegistry,
-        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory,
-        ?\Magento\Cms\Model\Wysiwyg\Images\GetInsertImageContent $getInsertImageContent = null
+        Context $context,
+        Registry $coreRegistry,
+        RawFactory $resultRawFactory,
+        ?GetInsertImageContent $getInsertImageContent = null
     ) {
         $this->resultRawFactory = $resultRawFactory;
         parent::__construct($context, $coreRegistry);
         $this->getInsertImageContent = $getInsertImageContent ?: $this->_objectManager
-            ->get(\Magento\Cms\Model\Wysiwyg\Images\GetInsertImageContent::class);
+            ->get(GetInsertImageContent::class);
     }
 
     /**
-     * Fire when select image
+     * Return a content (just a link or an html block) for inserting image to the content
      *
-     * @return \Magento\Framework\Controller\ResultInterface
+     * @return ResultInterface
      */
     public function execute()
     {
         $data = $this->getRequest()->getParams();
-
-        $fileName = $data['filename'];
-        $forceStaticPath = $data['force_static_path'];
-        $renderAsTag = $data['as_is'];
-        $storeId = isset($data['store_id']) ? (int) $data['store_id'] : null;
-
-        /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */
-        $resultRaw = $this->resultRawFactory->create();
-
-        return $resultRaw->setContents(
+        return $this->resultRawFactory->create()->setContents(
             $this->getInsertImageContent->execute(
-                $fileName,
-                $forceStaticPath,
-                $renderAsTag,
-                $storeId
+                $data['filename'],
+                $data['force_static_path'],
+                $data['as_is'],
+                isset($data['store']) ? (int) $data['store'] : null
             )
         );
     }
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/GetInsertImageContent.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/GetInsertImageContent.php
index e6f59c484bfc2..3531bf7569e38 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/GetInsertImageContent.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/GetInsertImageContent.php
@@ -28,7 +28,7 @@ public function __construct(ImagesHelper $imagesHelper)
     }
 
     /**
-     * Prepare Image Contents for Insert
+     * Create a content (just a link or an html block) for inserting image to the content
      *
      * @param string $encodedFilename
      * @param bool $forceStaticPath
@@ -48,10 +48,7 @@ public function execute(
 
         if ($forceStaticPath) {
             // phpcs:ignore Magento2.Functions.DiscouragedFunction
-            return parse_url(
-                $this->imagesHelper->getCurrentUrl() . $filename,
-                PHP_URL_PATH
-            );
+            return parse_url($this->imagesHelper->getCurrentUrl() . $filename, PHP_URL_PATH);
         }
 
         return $this->imagesHelper->getImageHtmlDeclaration($filename, $renderAsTag);
diff --git a/app/code/Magento/Cms/Test/Integration/Model/Wysiwyg/Images/GetInsertImageContentTest.php b/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/GetInsertImageContentTest.php
similarity index 50%
rename from app/code/Magento/Cms/Test/Integration/Model/Wysiwyg/Images/GetInsertImageContentTest.php
rename to dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/GetInsertImageContentTest.php
index fb026f6b4292a..076a669f3f8ad 100644
--- a/app/code/Magento/Cms/Test/Integration/Model/Wysiwyg/Images/GetInsertImageContentTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/GetInsertImageContentTest.php
@@ -6,19 +6,16 @@
 
 declare(strict_types=1);
 
-namespace Magento\Cms\Test\Integration\Model\Wysiwyg\Images;
+namespace Magento\Cms\Model\Wysiwyg\Images;
 
-use Magento\Backend\Helper\Data as BackendHelper;
+use Magento\Backend\Model\UrlInterface;
 use Magento\Cms\Helper\Wysiwyg\Images as ImagesHelper;
-use Magento\Cms\Model\Wysiwyg\Images\GetInsertImageContent;
 use Magento\Framework\Url\EncoderInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 
 class GetInsertImageContentTest extends TestCase
 {
-    private const TEST_IMAGE_FILE = '/test-image.jpg';
-
     /**
      * @var GetInsertImageContent
      */
@@ -35,9 +32,9 @@ class GetInsertImageContentTest extends TestCase
     private $urlEncoder;
 
     /**
-     * @var BackendHelper
+     * @var UrlInterface
      */
-    protected $_backendData;
+    protected $url;
 
     /**
      * @inheritdoc
@@ -47,48 +44,45 @@ protected function setUp(): void
         $this->getInsertImageContent = Bootstrap::getObjectManager()->get(GetInsertImageContent::class);
         $this->imagesHelper = Bootstrap::getObjectManager()->get(ImagesHelper::class);
         $this->urlEncoder = Bootstrap::getObjectManager()->get(EncoderInterface::class);
-        $this->_backendData = Bootstrap::getObjectManager()->get(BackendHelper::class);
+        $this->url = Bootstrap::getObjectManager()->get(UrlInterface::class);
     }
 
     /**
      * Test for GetInsertImageContent::execute
      *
      * @dataProvider imageDataProvider
-     * @param string $encodedFilename
+     * @param string $filename
      * @param bool $forceStaticPath
      * @param bool $renderAsTag
      * @param int|null $storeId
-     * @param string|null $expectedResult
+     * @param string $expectedResult
      */
     public function testExecute(
-        string $encodedFilename,
+        string $filename,
         bool $forceStaticPath,
         bool $renderAsTag,
-        ?int $storeId = null,
-        ?string $expectedResult = null
+        ?int $storeId,
+        string $expectedResult
     ): void {
-        $getImageForInsert = $this->getInsertImageContent->execute(
-            $encodedFilename,
-            $forceStaticPath,
-            $renderAsTag,
-            $storeId
-        );
-
-        if (!$forceStaticPath && !$renderAsTag) {
-            if (!$this->imagesHelper->isUsingStaticUrlsAllowed()) {
-
-                $encodedDirective = $this->urlEncoder->encode($expectedResult);
-                $expectedResult = $this->_backendData->getUrl(
-                    'cms/wysiwyg/directive',
-                    [
-                        '___directive' => $encodedDirective,
-                        '_escape_params' => false,
-                    ]
-                );
-            }
+        if (!$forceStaticPath && !$renderAsTag && !$this->imagesHelper->isUsingStaticUrlsAllowed()) {
+            $expectedResult = $this->url->getUrl(
+                'cms/wysiwyg/directive',
+                [
+                    '___directive' => $this->urlEncoder->encode($expectedResult),
+                    '_escape_params' => false
+                ]
+            );
         }
 
-        $this->assertEquals($getImageForInsert, $expectedResult);
+        $this->assertEquals(
+            $expectedResult,
+            $this->getInsertImageContent->execute(
+                $this->imagesHelper->idEncode($filename),
+                $forceStaticPath,
+                $renderAsTag,
+                $storeId
+            )
+        );
     }
 
     /**
@@ -100,39 +94,39 @@ public function imageDataProvider(): array
     {
         return [
             [
-                'L3Rlc3QtaW1hZ2UuanBn',
+                'test-image.jpg',
                 false,
                 true,
                 1,
-                '<img src="{{media url=&quot;' . self::TEST_IMAGE_FILE . '&quot;}}" alt="" />'
+                '<img src="{{media url=&quot;test-image.jpg&quot;}}" alt="" />'
             ],
             [
-                'L3Rlc3QtaW1hZ2UuanBn',
+                'catalog/category/test-image.jpg',
                 true,
                 false,
                 1,
-                '/pub/media/' . self::TEST_IMAGE_FILE
+                '/pub/media/catalog/category/test-image.jpg'
             ],
             [
-                'L3Rlc3QtaW1hZ2UuanBn',
+                'test-image.jpg',
                 false,
                 false,
                 1,
-                '{{media url="' . self::TEST_IMAGE_FILE . '"}}'
+                '{{media url="test-image.jpg"}}'
             ],
             [
-                'L3Rlc3QtaW1hZ2UuanBn',
+                '/test-image.jpg',
                 false,
                 true,
                 2,
-                '<img src="{{media url=&quot;' . self::TEST_IMAGE_FILE . '&quot;}}" alt="" />'
+                '<img src="{{media url=&quot;/test-image.jpg&quot;}}" alt="" />'
             ],
             [
-                'L3Rlc3QtaW1hZ2UuanBn',
+                'test-image.jpg',
                 false,
                 true,
                 null,
-                '<img src="{{media url=&quot;' . self::TEST_IMAGE_FILE . '&quot;}}" alt="" />'
+                '<img src="{{media url=&quot;test-image.jpg&quot;}}" alt="" />'
             ],
         ];
     }

From 7ca91d145e0a0d5f12223062a60398cb60ffd867 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 25 Aug 2020 15:20:44 +0300
Subject: [PATCH 1644/1718] fxi typo

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

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
index 934388188f23a..01b96de8bba38 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
@@ -57,7 +57,7 @@
             <argument name="entityName" value="Products"/>
         </actionGroup>
 
-        <actionGroup ref="AdminAssertMediaGalleryFilterPlaceHolderProductGridActionGroup" stepKey="assertFilterApplied">
+        <actionGroup ref="AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup" stepKey="assertFilterApplied">
             <argument name="filterPlaceholder" value="$$product.name$$"/>
         </actionGroup>
 

From e533396304e8d978568c4b2165d09c87fa33479b 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 1645/1718] 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 33921dd7898e67b606091627d9fbb7a408d1f694 Mon Sep 17 00:00:00 2001
From: Roman Lytvynenko <lytvynen@adobe.com>
Date: Tue, 25 Aug 2020 09:10:58 -0500
Subject: [PATCH 1646/1718] MC-36647: Order can be placed as a customer after
 session cookie expiration with Persistent Cart enabled

---
 app/code/Magento/Customer/Model/Customer/Authorization.php      | 2 +-
 .../Magento/Customer/Model/Customer/AuthorizationComposite.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Customer/Model/Customer/Authorization.php b/app/code/Magento/Customer/Model/Customer/Authorization.php
index f5ddf839597e2..027eeb0dd581b 100644
--- a/app/code/Magento/Customer/Model/Customer/Authorization.php
+++ b/app/code/Magento/Customer/Model/Customer/Authorization.php
@@ -15,7 +15,7 @@
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
- * Class to invalidate user credentials
+ * Checks if customer is logged in and authorized in the current store
  */
 class Authorization implements AuthorizationInterface
 {
diff --git a/app/code/Magento/Customer/Model/Customer/AuthorizationComposite.php b/app/code/Magento/Customer/Model/Customer/AuthorizationComposite.php
index 790c81056f4ff..c0d4651a2e0f1 100644
--- a/app/code/Magento/Customer/Model/Customer/AuthorizationComposite.php
+++ b/app/code/Magento/Customer/Model/Customer/AuthorizationComposite.php
@@ -22,7 +22,7 @@ class AuthorizationComposite implements AuthorizationInterface
     /**
      * AuthorizationComposite constructor.
      *
-     * @param array $authorizationChecks
+     * @param AuthorizationInterface[] $authorizationChecks
      */
     public function __construct(
         array $authorizationChecks

From 7138093d2a91a4c711cc4c19f07a677b02d82774 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 25 Aug 2020 17:23:41 +0300
Subject: [PATCH 1647/1718] Mftf test stabilization

---
 .../Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml   | 1 -
 .../Mftf/Test/AdminMediaGalleryCmsUiUsedInPagesFilterTest.xml    | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
index 01b96de8bba38..c3f3d6ecd9e8d 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
@@ -33,7 +33,6 @@
         <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct">
             <argument name="product" value="$$product$$"/>
         </actionGroup>
-        <click selector="{{AdminProductFormSection.contentTab}}" stepKey="clickContentTab"/>
         <actionGroup ref="AdminOpenMediaGalleryTinyMce4ActionGroup" stepKey="openMediaGalleryFromWysiwyg"/>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
             <argument name="image" value="ImageUpload3"/>
diff --git a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryCmsUiUsedInPagesFilterTest.xml b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryCmsUiUsedInPagesFilterTest.xml
index e88da08554fa4..038f1ae077b4a 100644
--- a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryCmsUiUsedInPagesFilterTest.xml
+++ b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryCmsUiUsedInPagesFilterTest.xml
@@ -58,6 +58,7 @@
         <actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
 
         <actionGroup ref="AdminNavigateToPageGridActionGroup" stepKey="navigateToCmsPageGrid"/>
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilters"/>
         <actionGroup ref="AdminSearchCmsPageInGridByUrlKeyActionGroup" stepKey="findCreatedCmsPage">
             <argument name="urlKey" value="test-page-1"/>
         </actionGroup>

From 272dcf6bb42123d7b29b46d90e57172b0f61de8f Mon Sep 17 00:00:00 2001
From: Roman Lytvynenko <lytvynen@adobe.com>
Date: Tue, 25 Aug 2020 09:52:56 -0500
Subject: [PATCH 1648/1718] MC-36647: Order can be placed as a customer after
 session cookie expiration with Persistent Cart enabled

---
 .../Magento/Customer/Model/Customer/Authorization.php     | 8 ++++----
 .../Customer/Model/Customer/AuthorizationComposite.php    | 1 +
 .../Magento/Persistent/Model/Customer/Authorization.php   | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Customer/Model/Customer/Authorization.php b/app/code/Magento/Customer/Model/Customer/Authorization.php
index 027eeb0dd581b..5df3dbc51b732 100644
--- a/app/code/Magento/Customer/Model/Customer/Authorization.php
+++ b/app/code/Magento/Customer/Model/Customer/Authorization.php
@@ -4,6 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Customer\Model\Customer;
 
@@ -64,7 +65,7 @@ public function __construct(
      */
     public function isAllowed($resource, $privilege = null)
     {
-        if ($resource == AuthorizationService::PERMISSION_SELF
+        if ($resource === AuthorizationService::PERMISSION_SELF
             && $this->userContext->getUserId()
             && $this->userContext->getUserType() === UserContextInterface::USER_TYPE_CUSTOMER
         ) {
@@ -72,9 +73,8 @@ public function isAllowed($resource, $privilege = null)
             $this->customerResource->load($customer, $this->userContext->getUserId());
             $currentStoreId = $this->storeManager->getStore()->getId();
             $sharedStoreIds = $customer->getSharedStoreIds();
-            if (in_array($currentStoreId, $sharedStoreIds)) {
-                return true;
-            }
+
+            return in_array($currentStoreId, $sharedStoreIds);
         }
 
         return false;
diff --git a/app/code/Magento/Customer/Model/Customer/AuthorizationComposite.php b/app/code/Magento/Customer/Model/Customer/AuthorizationComposite.php
index c0d4651a2e0f1..716719470796e 100644
--- a/app/code/Magento/Customer/Model/Customer/AuthorizationComposite.php
+++ b/app/code/Magento/Customer/Model/Customer/AuthorizationComposite.php
@@ -4,6 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Customer\Model\Customer;
 
diff --git a/app/code/Magento/Persistent/Model/Customer/Authorization.php b/app/code/Magento/Persistent/Model/Customer/Authorization.php
index 0ebda14e215ec..6d8859a30fd96 100644
--- a/app/code/Magento/Persistent/Model/Customer/Authorization.php
+++ b/app/code/Magento/Persistent/Model/Customer/Authorization.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Persistent\Model\Customer;
 

From 133e8531ed9422285a7251a2424f155eba437ff5 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 25 Aug 2020 15:58:18 +0100
Subject: [PATCH 1649/1718] Corrected controller interface

---
 .../Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
index e9a2431e2393d..1266dcc7c035c 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
@@ -8,12 +8,12 @@
 use Magento\Backend\App\Action\Context;
 use Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
 use Magento\Cms\Model\Wysiwyg\Images\GetInsertImageContent;
-use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\Result\RawFactory;
 use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\Registry;
 
-class OnInsert extends Images implements HttpGetActionInterface
+class OnInsert extends Images implements HttpPostActionInterface
 {
     /**
      * @var RawFactory

From 00ae2382e1fc813cf53035e73455d41e65388128 Mon Sep 17 00:00:00 2001
From: Roman Lytvynenko <lytvynen@adobe.com>
Date: Tue, 25 Aug 2020 10:00:54 -0500
Subject: [PATCH 1650/1718] MC-36647: Order can be placed as a customer after
 session cookie expiration with Persistent Cart enabled

---
 .../Magento/Customer/Model/Plugin/CustomerAuthorization.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/Model/Plugin/CustomerAuthorization.php b/app/code/Magento/Customer/Model/Plugin/CustomerAuthorization.php
index 65bf9843e44fd..271d8f795d6f6 100644
--- a/app/code/Magento/Customer/Model/Plugin/CustomerAuthorization.php
+++ b/app/code/Magento/Customer/Model/Plugin/CustomerAuthorization.php
@@ -40,7 +40,7 @@ public function __construct(
      * @param Closure $proceed
      * @param string $resource
      * @param mixed $privilege
-     * @return bool|mixed
+     * @return bool
      */
     public function aroundIsAllowed(
         Authorization $subject,

From 252e59659488dba0090f182a5eed16eac5db5bed Mon Sep 17 00:00:00 2001
From: Leonid Poluianov <poluyano@adobe.com>
Date: Mon, 24 Aug 2020 16:15:00 -0500
Subject: [PATCH 1651/1718] MC-36959: Remove "compareArraysRecursively" logic
 duplication

---
 .../TestCase/GraphQlAbstract.php              | 57 -------------------
 .../BundleProductMultipleOptionsTest.php      | 18 +++++-
 2 files changed, 17 insertions(+), 58 deletions(-)

diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
index 7f67c8c9ca8df..3de18a932f2cd 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQlAbstract.php
@@ -184,61 +184,4 @@ protected function assertResponseFields($actualResponse, $assertionMap)
             );
         }
     }
-
-    /**
-     * Compare arrays recursively regardless of nesting.
-     *
-     * Can compare arrays that have both one level and n-level nesting.
-     * ```
-     *  [
-     * 'products' => [
-     *      'items' => [
-     *      [
-     *          'sku'       => 'bundle-product',
-     *          'type_id'   => 'bundle',
-     *          'items'     => [
-     *          [
-     *              'title'     => 'Bundle Product Items',
-     *              'sku'       => 'bundle-product',
-     *              'options'   => [
-     *              [
-     *                  'price' => 2.75,
-     *                  'label' => 'Simple Product',
-     *                  'product' => [
-     *                      'name'    => 'Simple Product',
-     *                      'sku'     => 'simple',
-     *                  ]
-     *              ]
-     *          ]
-     *      ]
-     *  ];
-     * ```
-     *
-     * @param array $expected
-     * @param array $actual
-     * @return array
-     */
-    public function compareArraysRecursively(array $expected, array $actual): array
-    {
-        $diffResult = [];
-
-        foreach ($expected as $key => $value) {
-            if (array_key_exists($key, $actual)) {
-                if (is_array($value)) {
-                    $recursiveDiff = $this->compareArraysRecursively($value, $actual[$key]);
-                    if (!empty($recursiveDiff)) {
-                        $diffResult[$key] = $recursiveDiff;
-                    }
-                } else {
-                    if (!in_array($value, $actual, true)) {
-                        $diffResult[$key] = $value;
-                    }
-                }
-            } else {
-                $diffResult[$key] = $value;
-            }
-        }
-
-        return $diffResult;
-    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/BundleProductMultipleOptionsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/BundleProductMultipleOptionsTest.php
index 3409b5e3af1af..77c4d5b84e72e 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/BundleProductMultipleOptionsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Bundle/BundleProductMultipleOptionsTest.php
@@ -7,6 +7,8 @@
 
 namespace Magento\GraphQl\Bundle;
 
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Helper\CompareArraysRecursively;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 /**
@@ -14,6 +16,20 @@
  */
 class BundleProductMultipleOptionsTest extends GraphQlAbstract
 {
+    /**
+     * @var CompareArraysRecursively
+     */
+    private $compareArraysRecursively;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->compareArraysRecursively = $objectManager->create(CompareArraysRecursively::class);
+    }
+
     /**
      * @magentoApiDataFixture Magento/Bundle/_files/product_with_multiple_options.php
      * @param array $bundleProductDataProvider
@@ -85,7 +101,7 @@ private function assertBundleProduct(array $response, array $bundleProductDataPr
         $productItems = $response['products']['items'];
 
         foreach ($bundleProductDataProvider as $key => $data) {
-            $diff = $this->compareArraysRecursively($data, $productItems[$key]);
+            $diff = $this->compareArraysRecursively->execute($data, $productItems[$key]);
             self::assertEquals([], $diff, "Actual response doesn't equal to expected data");
         }
     }

From fc039c3b4116ea0b08bbaf6a6c65b2e08d267bd0 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 25 Aug 2020 18:13:32 +0300
Subject: [PATCH 1652/1718] 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 9d57aa0abf59b31821ef628284f93129db89db9f Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 25 Aug 2020 18:50:58 +0300
Subject: [PATCH 1653/1718] 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 b8f103ba1765ce35905fc647b02e67d1732a8d85 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 1654/1718] 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 519f4ce5bb9e33bf4b0fa9f7a0a43fa328a745d8 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Wed, 26 Aug 2020 01:07:41 +0800
Subject: [PATCH 1655/1718] magento/adobe-stock-integration#1775: [MFTF] Make
 AdminAssertCategoryGridPageDetailsActionGroup parametrized - modified ui
 component and mftf files, additional action group for search by category name
 on category grid page

---
 ...egoryGridPageByCategoryNameActionGroup.xml | 23 +++++++++++
 ...dminCategoryGridPageDetailsActionGroup.xml | 40 ++++++++++++++++---
 ...diaGalleryCatalogUiCategoryGridSection.xml | 13 +++---
 ...eryCatalogUiVerifyCategoryGridPageTest.xml |  5 +++
 .../Ui/Component/Listing/Columns/InMenu.php   |  4 +-
 .../Ui/Component/Listing/Columns/IsActive.php |  4 +-
 .../media_gallery_category_listing.xml        |  2 -
 ...ancedMediaGalleryVerifyAssetFilterTest.xml | 11 +++--
 8 files changed, 81 insertions(+), 21 deletions(-)
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminSearchCategoryGridPageByCategoryNameActionGroup.xml

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminSearchCategoryGridPageByCategoryNameActionGroup.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminSearchCategoryGridPageByCategoryNameActionGroup.xml
new file mode 100644
index 0000000000000..02635f8e379cf
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminSearchCategoryGridPageByCategoryNameActionGroup.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="AdminSearchCategoryGridPageByCategoryNameActionGroup">
+        <annotations>
+            <description>Fills 'Search by category name' on Category Grid page. Clicks on Submit Search.</description>
+        </annotations>
+        <arguments>
+            <argument name="categoryName"/>
+        </arguments>
+
+        <conditionalClick selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.clearFilters}}" dependentSelector="{{AdminMediaGalleryCatalogUiCategoryGridSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+        <fillField selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.search}}" userInput="{{categoryName}}" stepKey="fillKeywordSearchField"/>
+        <click selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.submitSearch}}" stepKey="clickKeywordSearch"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminCategoryGridPageDetailsActionGroup.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminCategoryGridPageDetailsActionGroup.xml
index f86e04ad7c4f2..b698fa05600d7 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminCategoryGridPageDetailsActionGroup.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminCategoryGridPageDetailsActionGroup.xml
@@ -17,10 +17,40 @@
         </annotations>
 
         <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.image(imageName)}}" stepKey="assertImageColumn"/>
-        <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.path(category.name)}}" stepKey="assertPathColumn"/>
-        <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.name(category.name)}}" stepKey="assertNameColumn"/>
-        <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.products('0')}}" stepKey="assertProductsColumn"/>
-        <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.inMenu(category.include_in_menu)}}" stepKey="assertInMenuColumn"/>
-        <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.enabled(category.is_active)}}" stepKey="assertEnabledColumn"/>
+
+        <!--Name Column-->
+        <grabTextFrom selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.columnValue('Name')}}" stepKey="grabNameColumnValue"/>
+        <assertEquals stepKey="assertNameColumn">
+            <expectedResult type="string">$$category.name$$</expectedResult>
+            <actualResult type="variable">grabNameColumnValue</actualResult>
+        </assertEquals>
+
+        <!--Path Column-->
+        <grabTextFrom selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.columnValue('Path')}}" stepKey="grabPathColumnValue"/>
+        <assertStringContainsString stepKey="assertPathColumn">
+            <expectedResult type="string">$$category.name$$</expectedResult>
+            <actualResult type="variable">grabPathColumnValue</actualResult>
+        </assertStringContainsString>
+
+        <!--Products Column-->
+        <grabTextFrom selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.columnValue('Products')}}" stepKey="grabProductsColumnValue"/>
+        <assertEquals stepKey="assertProductsColumn">
+            <expectedResult type="string">0</expectedResult>
+            <actualResult type="variable">grabProductsColumnValue</actualResult>
+        </assertEquals>
+
+        <!--In Menu Column-->
+        <grabTextFrom selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.columnValue('In Menu')}}" stepKey="grabInMenuColumnValue"/>
+        <assertEquals stepKey="assertInMenuColumn">
+            <expectedResult type="string">Yes</expectedResult>
+            <actualResult type="variable">grabInMenuColumnValue</actualResult>
+        </assertEquals>
+
+        <!--Enabled Column-->
+        <grabTextFrom selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.columnValue('Enabled')}}" stepKey="grabEnabledColumnValue"/>
+        <assertEquals stepKey="assertEnabledColumn">
+            <expectedResult type="string">Yes</expectedResult>
+            <actualResult type="variable">grabEnabledColumnValue</actualResult>
+        </assertEquals>
     </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 a5ed4f54eca0f..f35e3c9b76a00 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml
@@ -9,14 +9,15 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminMediaGalleryCatalogUiCategoryGridSection">
+        <!--Search by category name element-->
+        <element name="search" type="input" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] input[placeholder='Search by category name']"/>
+        <element name="submitSearch" type="button" selector=".data-grid-search-control-wrap > button.action-submit" timeout="30"/>
+        <!--Active filter element-->
+        <element name="clearFilters" type="button" selector=".admin__data-grid-header [data-action='grid-filter-reset']" timeout="30"/>
         <element name="activeFilterPlaceholder" type="text" selector="//div[@class='admin__current-filters-list-wrap']//li//span[contains(text(), '{{filterPlaceholder}}')]" parameterized="true"/>
+        <!--Category Grid Page Columns-->
         <element name="image" type="text" selector="//tr//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//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Path')]/preceding-sibling::th) +1 ]//*[contains(text(), '{{categoryName}}')]" parameterized="true"/>
-        <element name="name" type="text" selector="//tr//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//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//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//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'In Menu')]/preceding-sibling::th) +1 ]//span[contains(@class, '{{inMenuValue}}')]" parameterized="true"/>
-        <element name="enabled" type="text" selector="//tr//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Enabled')]/preceding-sibling::th) +1 ]//span[contains(@class, '{{enabledValue}}')]" parameterized="true"/>
+        <element name="columnValue" type="text" selector="//tr//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{columnName}}')]/preceding-sibling::th) +1 ]//div" 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/AdminMediaGalleryCatalogUiVerifyCategoryGridPageTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyCategoryGridPageTest.xml
index b2668b59fb8a1..6ca2500723400 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyCategoryGridPageTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyCategoryGridPageTest.xml
@@ -26,6 +26,11 @@
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
         </after>
         <actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openCategoryPage"/>
+
+        <actionGroup ref="AdminSearchCategoryGridPageByCategoryNameActionGroup" stepKey="searchByCategoryName">
+            <argument name="categoryName" value="$$category.name$$"/>
+        </actionGroup>
+
         <actionGroup ref="AssertAdminCategoryGridPageDetailsActionGroup" stepKey="assertCategoryGridPageRendered">
             <argument name="category" value="$$category$$"/>
         </actionGroup>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/InMenu.php b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/InMenu.php
index 00b5dd87e8cf1..fe4720b4a3e60 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/InMenu.php
+++ b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/InMenu.php
@@ -24,9 +24,9 @@ public function prepareDataSource(array $dataSource)
             $fieldName = $this->getData('name');
             foreach ($dataSource['data']['items'] as & $item) {
                 if (isset($item[$fieldName]) && $item[$fieldName] == 1) {
-                    $item[$fieldName] = '<span class="1">Yes</span>';
+                    $item[$fieldName] = 'Yes';
                 } else {
-                    $item[$fieldName] = '<span class="0">No</span>';
+                    $item[$fieldName] = 'No';
                 }
             }
         }
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/IsActive.php b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/IsActive.php
index 48464d6ffdcbc..c6f20c937d5b3 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/IsActive.php
+++ b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/IsActive.php
@@ -24,9 +24,9 @@ public function prepareDataSource(array $dataSource)
             $fieldName = $this->getData('name');
             foreach ($dataSource['data']['items'] as & $item) {
                 if (isset($item[$fieldName]) && $item[$fieldName] == 1) {
-                    $item[$fieldName] = '<span class="1">Yes</span>';
+                    $item[$fieldName] = 'Yes';
                 } else {
-                    $item[$fieldName] = '<span class="0">No</span>';
+                    $item[$fieldName] = 'No';
                 }
             }
         }
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 94ef605f856c7..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
@@ -170,13 +170,11 @@
         <column name="include_in_menu" class="Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Columns\InMenu">
             <settings>
                 <label translate="true">In Menu</label>
-                <bodyTmpl>ui/grid/cells/html</bodyTmpl>
             </settings>
         </column>
         <column name="is_active" class="Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Columns\IsActive">
             <settings>
                 <label translate="true">Enabled</label>
-                <bodyTmpl>ui/grid/cells/html</bodyTmpl>
             </settings>
         </column>
         <actionsColumn name="actions" class="Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Columns\CategoryActions" sortOrder="1000">
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyAssetFilterTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyAssetFilterTest.xml
index bd7e4fcf7a9a2..1c2a6d7ed1d01 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyAssetFilterTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyAssetFilterTest.xml
@@ -65,6 +65,7 @@
         <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveCategory"/>
         <actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openCategoryGridPage"/>
 
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="firstResetAdminDataGridToDefaultView"/>
         <actionGroup ref="AdminEnhancedMediaGalleryCategoryGridExpandFilterActionGroup" stepKey="expandFilters"/>
         <actionGroup ref="AdminEnhancedMediaGallerySelectUsedInFilterActionGroup" stepKey="setUsedInFilter">
             <argument name="filterName" value="Asset"/>
@@ -72,9 +73,11 @@
         </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryCategoryGridApplyFiltersActionGroup" stepKey="applyFilters"/>
 
-        <actionGroup ref="AdminMediaGalleryAssertCategoryNameInCategoryGridActionGroup" stepKey="assertCategoryInGrid">
-            <argument name="categoryName" value="$$category.name$$"/>
-        </actionGroup>
-        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+        <grabTextFrom selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.columnValue('Name')}}" stepKey="grabCategoryNameFromGrid"/>
+        <assertEquals stepKey="assertEqualCategoryName">
+            <expectedResult type="string">$$category.name$$</expectedResult>
+            <actualResult type="variable">grabCategoryNameFromGrid</actualResult>
+        </assertEquals>
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="secondResetAdminDataGridToDefaultView"/>
     </test>
 </tests>

From 5228d6bf2c482fea9a94d444a59db17ec4d185ee Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Tue, 25 Aug 2020 20:38:51 +0300
Subject: [PATCH 1656/1718] add
 AssertStorefrontCustomerLogoutSuccessPageActionGroup

---
 ...ontCustomerLogoutSuccessPageActionGroup.xml | 18 ++++++++++++++++++
 ...comeMessageAfterCustomerIsLoggedOutTest.xml |  4 ++--
 ...gCartPersistenceUnderLongTermCookieTest.xml |  6 +++---
 3 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStorefrontCustomerLogoutSuccessPageActionGroup.xml

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStorefrontCustomerLogoutSuccessPageActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStorefrontCustomerLogoutSuccessPageActionGroup.xml
new file mode 100644
index 0000000000000..495f4504fcfd5
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStorefrontCustomerLogoutSuccessPageActionGroup.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="AssertStorefrontCustomerLogoutSuccessPageActionGroup">
+        <annotations>
+            <description>Assert on the Storefront Customer Logout Success Page page.</description>
+        </annotations>
+
+        <seeInCurrentUrl url="{{StorefrontCustomerLogoutSuccessPage.url}}" stepKey="seeOnSignInPage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontCorrectWelcomeMessageAfterCustomerIsLoggedOutTest.xml b/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontCorrectWelcomeMessageAfterCustomerIsLoggedOutTest.xml
index b41cad61c93a5..45ccab54de5f3 100644
--- a/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontCorrectWelcomeMessageAfterCustomerIsLoggedOutTest.xml
+++ b/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontCorrectWelcomeMessageAfterCustomerIsLoggedOutTest.xml
@@ -54,7 +54,7 @@
              stepKey="seeLoggedInCustomerWelcomeMessage"/>
         <!--Logout and check default welcome message-->
         <actionGroup ref="CustomerLogoutStorefrontByMenuItemsActionGroup" stepKey="storefrontCustomerLogout"/>
-        <seeInCurrentUrl url="{{StorefrontCustomerLogoutSuccessPage.url}}" stepKey="seeCustomerSignOutPageUrl"/>
+        <actionGroup ref="AssertStorefrontCustomerLogoutSuccessPageActionGroup" stepKey="seeCustomerSignOutPageUrl"/>
         <see userInput="Default welcome msg!"
              selector="{{StorefrontHeaderSection.welcomeMessage}}"
              stepKey="seeDefaultWelcomeMessage"/>
@@ -71,7 +71,7 @@
 
         <!--Logout and check persistent customer welcome message-->
         <actionGroup ref="CustomerLogoutStorefrontByMenuItemsActionGroup" stepKey="storefrontCustomerLogout1"/>
-        <seeInCurrentUrl url="{{StorefrontCustomerLogoutSuccessPage.url}}" stepKey="seeCustomerSignOutPageUrl1"/>
+        <actionGroup ref="AssertStorefrontCustomerLogoutSuccessPageActionGroup" stepKey="seeCustomerSignOutPageUrl1"/>
         <see userInput="Welcome, $$createCustomerForPersistent.firstname$$ $$createCustomerForPersistent.lastname$$! Not you?"
              selector="{{StorefrontHeaderSection.welcomeMessage}}"
              stepKey="seePersistentWelcomeMessage"/>
diff --git a/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontVerifyShoppingCartPersistenceUnderLongTermCookieTest.xml b/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontVerifyShoppingCartPersistenceUnderLongTermCookieTest.xml
index 80ca7a2eb90c7..b3bf4e4dd009f 100644
--- a/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontVerifyShoppingCartPersistenceUnderLongTermCookieTest.xml
+++ b/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontVerifyShoppingCartPersistenceUnderLongTermCookieTest.xml
@@ -73,7 +73,7 @@
 
         <!-- 4. Click Sign Out -->
         <actionGroup ref="CustomerLogoutStorefrontByMenuItemsActionGroup" stepKey="logoutJohnSmithCustomer"/>
-        <seeInCurrentUrl url="{{StorefrontCustomerLogoutSuccessPage.url}}" stepKey="seeLogoutSuccessPageUrlAfterLogOutJohnSmithCustomer"/>
+        <actionGroup ref="AssertStorefrontCustomerLogoutSuccessPageActionGroup" stepKey="seeLogoutSuccessPageUrlAfterLogOutJohnSmithCustomer"/>
         <waitForPageLoad stepKey="waitForRedirectToHomePage"/>
         <waitForText selector="{{StorefrontCMSPageSection.mainContent}}" userInput="CMS homepage content goes here." stepKey="waitForLoadContentMessage"/>
         <actionGroup ref="StorefrontAssertPersistentCustomerWelcomeMessageNotPresentActionGroup" stepKey="dontSeeWelcomeJohnSmithCustomerNotYouMessage">
@@ -102,7 +102,7 @@
 
         <!-- 7. Click Log Out  -->
         <actionGroup ref="CustomerLogoutStorefrontByMenuItemsActionGroup" stepKey="logoutJohnDoeCustomer"/>
-        <seeInCurrentUrl url="{{StorefrontCustomerLogoutSuccessPage.url}}" stepKey="seeLogoutSuccessPageUrlAfterLogOutJohnDoeCustomer"/>
+        <actionGroup ref="AssertStorefrontCustomerLogoutSuccessPageActionGroup" stepKey="seeLogoutSuccessPageUrlAfterLogOutJohnDoeCustomer"/>
         <actionGroup ref="StorefrontAssertPersistentCustomerWelcomeMessageActionGroup" stepKey="seeWelcomeForJohnDoeCustomer">
             <argument name="customerFullName" value="{{Simple_Customer_Without_Address.fullname}}"/>
         </actionGroup>
@@ -149,7 +149,7 @@
 
         <!-- 12. Sign out and click the Not you? link  -->
         <actionGroup ref="CustomerLogoutStorefrontByMenuItemsActionGroup" stepKey="logoutJohnDoeCustomerSecondTime"/>
-        <seeInCurrentUrl url="{{StorefrontCustomerLogoutSuccessPage.url}}" stepKey="seeLogoutSuccessPageUrlAfterLogOutJohnSmithCustomerSecondTime"/>
+        <actionGroup ref="AssertStorefrontCustomerLogoutSuccessPageActionGroup" stepKey="seeLogoutSuccessPageUrlAfterLogOutJohnSmithCustomerSecondTime"/>
         <waitForPageLoad stepKey="waitForHomePageLoadAfter5Seconds"/>
         <waitForText selector="{{StorefrontCMSPageSection.mainContent}}" userInput="CMS homepage content goes here." stepKey="waitForLoadMainContentMessageOnHomePage"/>
         <click selector="{{StorefrontPanelHeaderSection.notYouLink}}" stepKey="clickOnNotYouLink" />

From 62a4eacde00243365c9985cecc3ebaf1f4543a8d Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 25 Aug 2020 21:31:47 +0300
Subject: [PATCH 1657/1718] Fix failed mftf test

---
 ...ryCatalogUiVerifyUsedInLinkCategoryGridTest.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
index 697d52b153814..5cb778dfb9c8c 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
@@ -58,13 +58,7 @@
         <actionGroup ref="AdminMediaGalleryAssertCategoryNameInCategoryGridActionGroup" stepKey="assertCategoryInGrid">
             <argument name="categoryName" value="$$category.name$$"/>
         </actionGroup>
-     
-        <deleteData createDataKey="category" stepKey="deleteCategory"/>
-        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
-        <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetailsToVerfifyEmptyUsedIn"/>
-        <actionGroup ref="AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup" stepKey="assertThereIsNoUsedInSection"/>
-        <actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeDetails"/>
-        
+
         <actionGroup ref="AdminEnhancedMediaGalleryCategoryGridExpandFilterActionGroup" stepKey="expandFilters"/>
         <actionGroup ref="AdminEnhancedMediaGallerySelectUsedInFilterActionGroup" stepKey="setAssetFilter">
             <argument name="filterName" value="Asset"/>
@@ -75,5 +69,11 @@
             <argument name="filterPlaceholder" value="{{UpdatedImageDetails.title}}"/>
         </actionGroup>
 
+        <deleteData createDataKey="category" stepKey="deleteCategory"/>
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetailsToVerfifyEmptyUsedIn"/>
+        <actionGroup ref="AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup" stepKey="assertThereIsNoUsedInSection"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeDetails"/>
+
    </test>
 </tests>

From 3c10b6997c08e809942622e83a4df8f4e01500e5 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Wed, 26 Aug 2020 20:39:32 +0800
Subject: [PATCH 1658/1718] magento/adobe-stock-integration#1775: [MFTF] Make
 AdminAssertCategoryGridPageDetailsActionGroup parametrized - introduced new
 ActionGroup and modified related mftf files

---
 ...goryGridPageNumberOfRecordsActionGroup.xml | 24 +++++++++++++++++++
 ...diaGalleryCatalogUiCategoryGridSection.xml |  4 +++-
 ...alogUiVerifyUsedInLinkCategoryGridTest.xml |  7 ++++--
 ...tCategoryNameInCategoryGridActionGroup.xml | 21 ----------------
 4 files changed, 32 insertions(+), 24 deletions(-)
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminCategoryGridPageNumberOfRecordsActionGroup.xml
 delete mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertCategoryNameInCategoryGridActionGroup.xml

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminCategoryGridPageNumberOfRecordsActionGroup.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminCategoryGridPageNumberOfRecordsActionGroup.xml
new file mode 100644
index 0000000000000..66f5a74d17d94
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminCategoryGridPageNumberOfRecordsActionGroup.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="AssertAdminCategoryGridPageNumberOfRecordsActionGroup">
+        <arguments>
+            <argument name="numberOfRecords" type="string"/>
+        </arguments>
+        <annotations>
+            <description>Assert the number of records in the category grid page.</description>
+        </annotations>
+
+        <grabTextFrom selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.recordsLabel}}" stepKey="grabRecordsLabel"/>
+        <assertEquals stepKey="assertStringIsEqual">
+            <expectedResult type="string">{{numberOfRecords}}</expectedResult>
+            <actualResult type="variable">grabRecordsLabel</actualResult>
+        </assertEquals>
+    </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 f35e3c9b76a00..1d5f4e7cad5ea 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml
@@ -12,7 +12,9 @@
         <!--Search by category name element-->
         <element name="search" type="input" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] input[placeholder='Search by category name']"/>
         <element name="submitSearch" type="button" selector=".data-grid-search-control-wrap > button.action-submit" timeout="30"/>
-        <!--Active filter element-->
+        <!--Records element-->
+        <element name="recordsLabel" type="text" selector=".admin__data-grid-header .admin__control-support-text"/>
+        <!--Filter element-->
         <element name="clearFilters" type="button" selector=".admin__data-grid-header [data-action='grid-filter-reset']" timeout="30"/>
         <element name="activeFilterPlaceholder" type="text" selector="//div[@class='admin__current-filters-list-wrap']//li//span[contains(text(), '{{filterPlaceholder}}')]" parameterized="true"/>
         <!--Category Grid Page Columns-->
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
index 7e0fa6c477c45..4877d0caf88f4 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
@@ -57,8 +57,11 @@
         <actionGroup ref="AssertAdminMediaGalleryAssetFilterPlaceHolderActionGroup" stepKey="assertFilterApplied">
             <argument name="filterPlaceholder" value="{{UpdatedImageDetails.title}}"/>
         </actionGroup>
-        <actionGroup ref="AdminMediaGalleryAssertCategoryNameInCategoryGridActionGroup" stepKey="assertCategoryInGrid">
-            <argument name="categoryName" value="$$category.name$$"/>
+        <actionGroup ref="AssertAdminCategoryGridPageNumberOfRecordsActionGroup" stepKey="assertOneRecordInGrid">
+            <argument name="numberOfRecords" value="1 records found"/>
+        </actionGroup>
+        <actionGroup ref="AssertAdminCategoryGridPageDetailsActionGroup" stepKey="assertCategoryInGrid">
+            <argument name="category" value="$$category$$"/>
         </actionGroup>
    </test>
 </tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertCategoryNameInCategoryGridActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertCategoryNameInCategoryGridActionGroup.xml
deleted file mode 100644
index cc4632bbdb86e..0000000000000
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertCategoryNameInCategoryGridActionGroup.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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="AdminMediaGalleryAssertCategoryNameInCategoryGridActionGroup">
-        <annotations>
-            <description>Asserts category name in category grid page</description>
-        </annotations>
-        <arguments>
-            <argument name="categoryName" type="string"/>
-        </arguments>
-
-        <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.name(categoryName)}}" stepKey="assertNameColumn"/>
-     </actionGroup>
-</actionGroups>

From 748f623adda944c09a91a6b338d9f4aa22a0d8d2 Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Wed, 26 Aug 2020 22:01:08 +0800
Subject: [PATCH 1659/1718] 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 4fd4dd266edc48de8d1538c75a3256da26e7dd99 Mon Sep 17 00:00:00 2001
From: Roman Lytvynenko <lytvynen@adobe.com>
Date: Wed, 26 Aug 2020 09:37:33 -0500
Subject: [PATCH 1660/1718] MC-36647: Order can be placed as a customer after
 session cookie expiration with Persistent Cart enabled

---
 .../Unit/Model/Customer/AuthorizationTest.php | 102 ++++++++++++++++++
 1 file changed, 102 insertions(+)
 create mode 100644 app/code/Magento/Persistent/Test/Unit/Model/Customer/AuthorizationTest.php

diff --git a/app/code/Magento/Persistent/Test/Unit/Model/Customer/AuthorizationTest.php b/app/code/Magento/Persistent/Test/Unit/Model/Customer/AuthorizationTest.php
new file mode 100644
index 0000000000000..4ee5309fcd9e3
--- /dev/null
+++ b/app/code/Magento/Persistent/Test/Unit/Model/Customer/AuthorizationTest.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Persistent\Test\Unit\Model\Customer;
+
+use Magento\Customer\Model\Session as CustomerSession;
+use Magento\Persistent\Helper\Session as PersistentSession;
+use Magento\Persistent\Model\Customer\Authorization;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * A test class for the persistent customers authorization
+ *
+ * Unit tests for \Magento\Persistent\Model\Customer\Authorization class.
+ */
+class AuthorizationTest extends TestCase
+{
+    /**
+     * @var PersistentSession|MockObject
+     */
+    private $persistentSessionMock;
+
+    /**
+     * @var Authorization
+     */
+    private $authorization;
+
+    /**
+     * @var CustomerSession|MockObject
+     */
+    private $customerSessionMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->persistentSessionMock = $this->getMockBuilder(PersistentSession::class)
+            ->onlyMethods(['isPersistent'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->customerSessionMock = $this->getMockBuilder(CustomerSession::class)
+            ->onlyMethods(['isLoggedIn'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->authorization = new Authorization(
+            $this->customerSessionMock,
+            $this->persistentSessionMock
+        );
+    }
+
+    /**
+     * Validate if isAuthorized() will return proper permission value for logged in/ out persistent customers
+     *
+     * @dataProvider persistentLoggedInCombinations
+     * @param bool $isPersistent
+     * @param bool $isLoggedIn
+     * @param bool $isAllowedExpectation
+     */
+    public function testIsAuthorized(
+        bool $isPersistent,
+        bool $isLoggedIn,
+        bool $isAllowedExpectation
+    ): void {
+        $this->persistentSessionMock->method('isPersistent')->willReturn($isPersistent);
+        $this->customerSessionMock->method('isLoggedIn')->willReturn($isLoggedIn);
+        $isAllowedResult = $this->authorization->isAllowed('self');
+
+        $this->assertEquals($isAllowedExpectation, $isAllowedResult);
+    }
+
+    /**
+     * @return array
+     */
+    public function persistentLoggedInCombinations(): array
+    {
+        return [
+          [
+            true,
+            false,
+            false
+          ],
+          [
+              true,
+              true,
+              true
+          ],
+          [
+              false,
+              false,
+              true
+          ],
+        ];
+    }
+}

From bb99950661edae2099bcb54bdf23e3222381f02a Mon Sep 17 00:00:00 2001
From: Roman Lytvynenko <lytvynen@adobe.com>
Date: Wed, 26 Aug 2020 10:20:39 -0500
Subject: [PATCH 1661/1718] MC-36647: Order can be placed as a customer after
 session cookie expiration with Persistent Cart enabled

---
 .../Unit/Model/Customer/AuthorizationTest.php | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Persistent/Test/Unit/Model/Customer/AuthorizationTest.php b/app/code/Magento/Persistent/Test/Unit/Model/Customer/AuthorizationTest.php
index 4ee5309fcd9e3..049014807190c 100644
--- a/app/code/Magento/Persistent/Test/Unit/Model/Customer/AuthorizationTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Model/Customer/AuthorizationTest.php
@@ -9,9 +9,10 @@
 
 use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Persistent\Helper\Session as PersistentSession;
-use Magento\Persistent\Model\Customer\Authorization;
+use Magento\Persistent\Model\Customer\Authorization as PersistentAuthorization;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Magento\Customer\Model\Customer\AuthorizationComposite as CustomerAuthorizationComposite;
 
 /**
  * A test class for the persistent customers authorization
@@ -26,15 +27,20 @@ class AuthorizationTest extends TestCase
     private $persistentSessionMock;
 
     /**
-     * @var Authorization
+     * @var PersistentAuthorization
      */
-    private $authorization;
+    private $persistentCustomerAuthorization;
 
     /**
      * @var CustomerSession|MockObject
      */
     private $customerSessionMock;
 
+    /**
+     * @var CustomerAuthorizationComposite
+     */
+    private $customerAuthorizationComposite;
+
     /**
      * @inheritdoc
      */
@@ -50,10 +56,14 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->authorization = new Authorization(
+        $this->persistentCustomerAuthorization = new PersistentAuthorization(
             $this->customerSessionMock,
             $this->persistentSessionMock
         );
+
+        $this->customerAuthorizationComposite = new CustomerAuthorizationComposite(
+            [$this->persistentCustomerAuthorization]
+        );
     }
 
     /**
@@ -71,7 +81,7 @@ public function testIsAuthorized(
     ): void {
         $this->persistentSessionMock->method('isPersistent')->willReturn($isPersistent);
         $this->customerSessionMock->method('isLoggedIn')->willReturn($isLoggedIn);
-        $isAllowedResult = $this->authorization->isAllowed('self');
+        $isAllowedResult = $this->customerAuthorizationComposite->isAllowed('self');
 
         $this->assertEquals($isAllowedExpectation, $isAllowedResult);
     }

From cbc1023155f37b4d5189b2d44c5dff80bd79bfb6 Mon Sep 17 00:00:00 2001
From: Roman Lytvynenko <lytvynen@adobe.com>
Date: Wed, 26 Aug 2020 10:23:14 -0500
Subject: [PATCH 1662/1718] MC-36647: Order can be placed as a customer after
 session cookie expiration with Persistent Cart enabled

---
 .../Unit/Model/Customer/AuthorizationTest.php | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/Persistent/Test/Unit/Model/Customer/AuthorizationTest.php b/app/code/Magento/Persistent/Test/Unit/Model/Customer/AuthorizationTest.php
index 049014807190c..d2abafc7e5ecf 100644
--- a/app/code/Magento/Persistent/Test/Unit/Model/Customer/AuthorizationTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Model/Customer/AuthorizationTest.php
@@ -92,21 +92,21 @@ public function testIsAuthorized(
     public function persistentLoggedInCombinations(): array
     {
         return [
-          [
-            true,
-            false,
-            false
-          ],
-          [
-              true,
-              true,
-              true
-          ],
-          [
-              false,
-              false,
-              true
-          ],
+            [
+                true,
+                false,
+                false
+            ],
+            [
+                true,
+                true,
+                true
+            ],
+            [
+                false,
+                false,
+                true
+            ],
         ];
     }
 }

From 2279d2c66cd589c0b84be652c8159ba2a950c6ef Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Thu, 27 Aug 2020 00:26:37 +0800
Subject: [PATCH 1663/1718] magento/adobe-stock-integration#1775: [MFTF] Make
 AdminAssertCategoryGridPageDetailsActionGroup parametrized - requested
 changes

---
 ...egoryGridPageByCategoryNameActionGroup.xml |  5 +--
 ...dminCategoryGridPageDetailsActionGroup.xml | 29 +----------------
 ...CategoryGridPageImageColumnActionGroup.xml | 20 ++++++++++++
 ...goryGridPageNumberOfRecordsActionGroup.xml |  4 +--
 ...roductsInMenuEnabledColumnsActionGroup.xml | 31 +++++++++++++++++++
 ...nMediaGalleryCatalogUiCategoryGridPage.xml |  1 +
 ...leryCatalogUiCategoryGridSearchSection.xml | 16 ++++++++++
 ...diaGalleryCatalogUiCategoryGridSection.xml |  9 +-----
 ...eryCatalogUiVerifyCategoryGridPageTest.xml |  8 +++--
 ...alogUiVerifyUsedInLinkCategoryGridTest.xml |  5 +++
 ...ancedMediaGalleryVerifyAssetFilterTest.xml | 14 +++++----
 11 files changed, 94 insertions(+), 48 deletions(-)
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminCategoryGridPageImageColumnActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminCategoryGridPageProductsInMenuEnabledColumnsActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSearchSection.xml

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminSearchCategoryGridPageByCategoryNameActionGroup.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminSearchCategoryGridPageByCategoryNameActionGroup.xml
index 02635f8e379cf..7c3a0165c28d0 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminSearchCategoryGridPageByCategoryNameActionGroup.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminSearchCategoryGridPageByCategoryNameActionGroup.xml
@@ -17,7 +17,8 @@
         </arguments>
 
         <conditionalClick selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.clearFilters}}" dependentSelector="{{AdminMediaGalleryCatalogUiCategoryGridSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
-        <fillField selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.search}}" userInput="{{categoryName}}" stepKey="fillKeywordSearchField"/>
-        <click selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.submitSearch}}" stepKey="clickKeywordSearch"/>
+        <fillField selector="{{AdminMediaGalleryCatalogUiCategoryGridSearchSection.searchInput}}" userInput="{{categoryName}}" stepKey="fillKeywordSearchField"/>
+        <click selector="{{AdminMediaGalleryCatalogUiCategoryGridSearchSection.submitSearch}}" stepKey="clickKeywordSearch"/>
+        <waitForLoadingMaskToDisappear stepKey="waitingForLoading" />
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminCategoryGridPageDetailsActionGroup.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminCategoryGridPageDetailsActionGroup.xml
index b698fa05600d7..cec17bdbb1428 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminCategoryGridPageDetailsActionGroup.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminCategoryGridPageDetailsActionGroup.xml
@@ -10,47 +10,20 @@
     <actionGroup name="AssertAdminCategoryGridPageDetailsActionGroup">
         <arguments>
             <argument name="category"/>
-            <argument name="imageName" type="string" defaultValue="magento"/>
         </arguments>
         <annotations>
-            <description>Assert category grid page basic columns values for a specific category</description>
+            <description>Assert category grid page name and path column values for a specific category</description>
         </annotations>
 
-        <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.image(imageName)}}" stepKey="assertImageColumn"/>
-
-        <!--Name Column-->
         <grabTextFrom selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.columnValue('Name')}}" stepKey="grabNameColumnValue"/>
         <assertEquals stepKey="assertNameColumn">
             <expectedResult type="string">$$category.name$$</expectedResult>
             <actualResult type="variable">grabNameColumnValue</actualResult>
         </assertEquals>
-
-        <!--Path Column-->
         <grabTextFrom selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.columnValue('Path')}}" stepKey="grabPathColumnValue"/>
         <assertStringContainsString stepKey="assertPathColumn">
             <expectedResult type="string">$$category.name$$</expectedResult>
             <actualResult type="variable">grabPathColumnValue</actualResult>
         </assertStringContainsString>
-
-        <!--Products Column-->
-        <grabTextFrom selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.columnValue('Products')}}" stepKey="grabProductsColumnValue"/>
-        <assertEquals stepKey="assertProductsColumn">
-            <expectedResult type="string">0</expectedResult>
-            <actualResult type="variable">grabProductsColumnValue</actualResult>
-        </assertEquals>
-
-        <!--In Menu Column-->
-        <grabTextFrom selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.columnValue('In Menu')}}" stepKey="grabInMenuColumnValue"/>
-        <assertEquals stepKey="assertInMenuColumn">
-            <expectedResult type="string">Yes</expectedResult>
-            <actualResult type="variable">grabInMenuColumnValue</actualResult>
-        </assertEquals>
-
-        <!--Enabled Column-->
-        <grabTextFrom selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.columnValue('Enabled')}}" stepKey="grabEnabledColumnValue"/>
-        <assertEquals stepKey="assertEnabledColumn">
-            <expectedResult type="string">Yes</expectedResult>
-            <actualResult type="variable">grabEnabledColumnValue</actualResult>
-        </assertEquals>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminCategoryGridPageImageColumnActionGroup.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminCategoryGridPageImageColumnActionGroup.xml
new file mode 100644
index 0000000000000..b110ce44a8469
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminCategoryGridPageImageColumnActionGroup.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="AssertAdminCategoryGridPageImageColumnActionGroup">
+        <arguments>
+            <argument name="file" type="string" defaultValue="magento"/>
+        </arguments>
+        <annotations>
+            <description>Assert category grid page image column a specific category</description>
+        </annotations>
+
+        <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.image(file)}}" stepKey="assertImageColumn"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminCategoryGridPageNumberOfRecordsActionGroup.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminCategoryGridPageNumberOfRecordsActionGroup.xml
index 66f5a74d17d94..72b1bca56cb6e 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminCategoryGridPageNumberOfRecordsActionGroup.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminCategoryGridPageNumberOfRecordsActionGroup.xml
@@ -15,10 +15,10 @@
             <description>Assert the number of records in the category grid page.</description>
         </annotations>
 
-        <grabTextFrom selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.recordsLabel}}" stepKey="grabRecordsLabel"/>
+        <grabTextFrom selector="{{AdminMediaGalleryCatalogUiCategoryGridSearchSection.numberOfRecordsFound}}" stepKey="grabNumberOfRecordsFound"/>
         <assertEquals stepKey="assertStringIsEqual">
             <expectedResult type="string">{{numberOfRecords}}</expectedResult>
-            <actualResult type="variable">grabRecordsLabel</actualResult>
+            <actualResult type="variable">grabNumberOfRecordsFound</actualResult>
         </assertEquals>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminCategoryGridPageProductsInMenuEnabledColumnsActionGroup.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminCategoryGridPageProductsInMenuEnabledColumnsActionGroup.xml
new file mode 100644
index 0000000000000..e5d6f26e777fc
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminCategoryGridPageProductsInMenuEnabledColumnsActionGroup.xml
@@ -0,0 +1,31 @@
+<?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="AssertAdminCategoryGridPageProductsInMenuEnabledColumnsActionGroup">
+        <annotations>
+            <description>Assert category grid page products, in menu, and enabled column values for a specific category</description>
+        </annotations>
+
+        <grabTextFrom selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.columnValue('Products')}}" stepKey="grabProductsColumnValue"/>
+        <assertEquals stepKey="assertProductsColumn">
+            <expectedResult type="string">0</expectedResult>
+            <actualResult type="variable">grabProductsColumnValue</actualResult>
+        </assertEquals>
+        <grabTextFrom selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.columnValue('In Menu')}}" stepKey="grabInMenuColumnValue"/>
+        <assertEquals stepKey="assertInMenuColumn">
+            <expectedResult type="string">Yes</expectedResult>
+            <actualResult type="variable">grabInMenuColumnValue</actualResult>
+        </assertEquals>
+        <grabTextFrom selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.columnValue('Enabled')}}" stepKey="grabEnabledColumnValue"/>
+        <assertEquals stepKey="assertEnabledColumn">
+            <expectedResult type="string">Yes</expectedResult>
+            <actualResult type="variable">grabEnabledColumnValue</actualResult>
+        </assertEquals>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Page/AdminMediaGalleryCatalogUiCategoryGridPage.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Page/AdminMediaGalleryCatalogUiCategoryGridPage.xml
index 99cee48f443c7..59775dd148712 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Page/AdminMediaGalleryCatalogUiCategoryGridPage.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Page/AdminMediaGalleryCatalogUiCategoryGridPage.xml
@@ -7,6 +7,7 @@
 -->
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
     <page name="AdminMediaGalleryCatalogUiCategoryGridPage" url="media_gallery_catalog/category/index" area="admin" module="Magento_MediaGalleryCatalogUi">
+        <section name="AdminMediaGalleryCatalogUiCategoryGridSearchSection"/>
         <section name="AdminMediaGalleryCatalogUiCategoryGridSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSearchSection.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSearchSection.xml
new file mode 100644
index 0000000000000..867721d1e42bb
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSearchSection.xml
@@ -0,0 +1,16 @@
+<?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="AdminMediaGalleryCatalogUiCategoryGridSearchSection">
+        <element name="searchInput" type="input" selector=".admin__data-grid-header input[placeholder='Search by category name']"/>
+        <element name="submitSearch" type="button" selector=".data-grid-search-control-wrap > button.action-submit" timeout="30"/>
+        <element name="numberOfRecordsFound" type="text" selector=".admin__data-grid-header .admin__control-support-text"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml
index 1d5f4e7cad5ea..f65ec84bc2ec8 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml
@@ -9,16 +9,9 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminMediaGalleryCatalogUiCategoryGridSection">
-        <!--Search by category name element-->
-        <element name="search" type="input" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] input[placeholder='Search by category name']"/>
-        <element name="submitSearch" type="button" selector=".data-grid-search-control-wrap > button.action-submit" timeout="30"/>
-        <!--Records element-->
-        <element name="recordsLabel" type="text" selector=".admin__data-grid-header .admin__control-support-text"/>
-        <!--Filter element-->
         <element name="clearFilters" type="button" selector=".admin__data-grid-header [data-action='grid-filter-reset']" timeout="30"/>
         <element name="activeFilterPlaceholder" type="text" selector="//div[@class='admin__current-filters-list-wrap']//li//span[contains(text(), '{{filterPlaceholder}}')]" parameterized="true"/>
-        <!--Category Grid Page Columns-->
-        <element name="image" type="text" selector="//tr//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Image')]/preceding-sibling::th) +1]//img[contains(@src, '{{imageName}}')]" parameterized="true"/>
+        <element name="image" type="text" selector="//tr//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Image')]/preceding-sibling::th) +1]//img[contains(@src, '{{file}}')]" parameterized="true"/>
         <element name="columnValue" type="text" selector="//tr//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{columnName}}')]/preceding-sibling::th) +1 ]//div" 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>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyCategoryGridPageTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyCategoryGridPageTest.xml
index 6ca2500723400..fde9597155d0c 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyCategoryGridPageTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyCategoryGridPageTest.xml
@@ -26,13 +26,17 @@
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
         </after>
         <actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openCategoryPage"/>
-
         <actionGroup ref="AdminSearchCategoryGridPageByCategoryNameActionGroup" stepKey="searchByCategoryName">
             <argument name="categoryName" value="$$category.name$$"/>
         </actionGroup>
-
+        <actionGroup ref="AssertAdminCategoryGridPageNumberOfRecordsActionGroup" stepKey="assertOneRecordInGrid">
+            <argument name="numberOfRecords" value="1 records found"/>
+        </actionGroup>
+        <actionGroup ref="AssertAdminCategoryGridPageImageColumnActionGroup" stepKey="assertCategoryGridPageImageColumn"/>
         <actionGroup ref="AssertAdminCategoryGridPageDetailsActionGroup" stepKey="assertCategoryGridPageRendered">
             <argument name="category" value="$$category$$"/>
         </actionGroup>
+        <actionGroup ref="AssertAdminCategoryGridPageProductsInMenuEnabledColumnsActionGroup" stepKey="assertCategoryGridPageProductsInMenuEnabledColumns"/>
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
    </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 4877d0caf88f4..7d8ffc6b8fc12 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
@@ -60,8 +60,13 @@
         <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="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
    </test>
 </tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyAssetFilterTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyAssetFilterTest.xml
index 1c2a6d7ed1d01..9a08f7cd0bb9c 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyAssetFilterTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyAssetFilterTest.xml
@@ -72,12 +72,14 @@
             <argument name="optionName" value="{{ImageMetadata.title}}"/>
         </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryCategoryGridApplyFiltersActionGroup" stepKey="applyFilters"/>
-
-        <grabTextFrom selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.columnValue('Name')}}" stepKey="grabCategoryNameFromGrid"/>
-        <assertEquals stepKey="assertEqualCategoryName">
-            <expectedResult type="string">$$category.name$$</expectedResult>
-            <actualResult type="variable">grabCategoryNameFromGrid</actualResult>
-        </assertEquals>
+        <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"/>
         <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="secondResetAdminDataGridToDefaultView"/>
     </test>
 </tests>

From af2908bd7e8660094d4af3adfa6ad59939daa459 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Thu, 27 Aug 2020 00:56:33 +0800
Subject: [PATCH 1664/1718] magento/adobe-stock-integration#1775: [MFTF] Make
 AdminAssertCategoryGridPageDetailsActionGroup parametrized - modified mftf
 test file

---
 ...alogUiVerifyUsedInLinkCategoryGridTest.xml | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
index 93586daec0288..f4efa35dfc881 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
@@ -57,6 +57,16 @@
         <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="clearFilters"/>
         <actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openCategoryPageToVerifyIfFilterCanBeApplied"/>
         <actionGroup ref="AdminEnhancedMediaGalleryCategoryGridExpandFilterActionGroup" stepKey="expandFilters"/>
@@ -68,16 +78,6 @@
         <actionGroup ref="AssertAdminMediaGalleryAssetFilterPlaceHolderActionGroup" stepKey="assertFilterAppliedAfterUrlFilterApplier">
             <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="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
    </test>
 </tests>

From 4a258ec1188dcc65787fd52da74428724c10c6af 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 1665/1718] 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                                 |  82 ++--------
 .../Model/SynchronizeFilesTest.php            | 151 ++++++++++++++++++
 .../_files/magento.jpg                        | Bin 0 -> 55303 bytes
 .../_files/magento_metadata.jpg               | Bin
 19 files changed, 432 insertions(+), 156 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 c2eed9d87cc00..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": "0b51badfd1978bb34febd90226af9e27",
+    "content-hash": "aadcf8a265dd7ecbb86dd3dd4e49bc28",
     "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"
         },
         {
@@ -7593,12 +7571,6 @@
                 "sftp",
                 "storage"
             ],
-            "funding": [
-                {
-                    "url": "https://offset.earth/frankdejonge",
-                    "type": "other"
-                }
-            ],
             "time": "2020-05-18T15:13:39+00:00"
         },
         {
@@ -8817,20 +8789,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 +9078,6 @@
             "keywords": [
                 "timer"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-04-20T06:00:37+00:00"
         },
         {
@@ -9181,6 +9133,7 @@
                     "type": "github"
                 }
             ],
+            "abandoned": true,
             "time": "2020-06-27T06:36:25+00:00"
         },
         {
@@ -9269,16 +9222,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 +9729,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/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 d7ab12a1f70fa95338cb6e7e604b9e45a6a19cf1 Mon Sep 17 00:00:00 2001
From: Soumya Unnikrishnan <sunnikri@adobe.com>
Date: Wed, 26 Aug 2020 14:51:12 -0500
Subject: [PATCH 1666/1718] 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 8e7c183f788a152de38f9cdb6f8971bc67c73ad6 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 1667/1718] 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 d178bc1db4c7360214212e4326f4bd16442a4f57 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Thu, 27 Aug 2020 05:11:51 +0800
Subject: [PATCH 1668/1718] magento/adobe-stock-integration#1776: [MFTF]
 Sorting in Media Gallery - introduced new ActionGroup and Sections for media
 gallery sorting test

---
 ...hancedMediaGalleryClickSortActionGroup.xml | 19 +++++++++++++++++++
 ...edMediaGalleryGridImagePositionSection.xml | 13 +++++++++++++
 ...AdminEnhancedMediaGallerySortBySection.xml | 14 ++++++++++++++
 3 files changed, 46 insertions(+)
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryClickSortActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryGridImagePositionSection.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGallerySortBySection.xml

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryClickSortActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryClickSortActionGroup.xml
new file mode 100644
index 0000000000000..7679da6585d5f
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryClickSortActionGroup.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="AdminEnhancedMediaGalleryClickSortActionGroup">
+        <arguments>
+            <argument name="sortName" type="string"/>
+        </arguments>
+        <click selector="{{AdminEnhancedMediaGallerySortBySection.sortDropdown}}" stepKey="clickOnSortDropdown"/>
+        <click selector="{{AdminEnhancedMediaGallerySortBySection.sortOption(sortName)}}" stepKey="clickOnSortOption"/>
+        <waitForPageLoad stepKey="waitForLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryGridImagePositionSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryGridImagePositionSection.xml
new file mode 100644
index 0000000000000..943f29d5fa851
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryGridImagePositionSection.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="AdminEnhancedMediaGalleryGridImagePositionSection">
+        <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/AdminEnhancedMediaGallerySortBySection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGallerySortBySection.xml
new file mode 100644
index 0000000000000..5ffcec00fcf4b
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGallerySortBySection.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="AdminEnhancedMediaGallerySortBySection">
+        <element name="sortDropdown" type="button" selector="div[class='masonry-image-sortby'] select"/>
+        <element name="sortOption" type="button" selector="//div[@class='masonry-image-sortby'] //option[@value='{{sortOption}}']" parameterized="true"/>
+    </section>
+</sections>

From 5d523ad8554f1bcbc13860ba5e18d65f1f7ed8cc Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Wed, 26 Aug 2020 18:02:40 -0500
Subject: [PATCH 1669/1718] MC-37041: MFTF StorefrontAddStoreCodeInUrl fails
 when using Varnish

---
 .../Test/Mftf/Test/StorefrontForthLevelCategoryTest.xml        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontForthLevelCategoryTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontForthLevelCategoryTest.xml
index 74264149cf1cb..9731b66209df0 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontForthLevelCategoryTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontForthLevelCategoryTest.xml
@@ -34,6 +34,9 @@
             <deleteData createDataKey="category3" stepKey="deleteCategory3"/>
             <deleteData createDataKey="category2" stepKey="deleteCategory2"/>
             <deleteData createDataKey="category1" stepKey="deleteCategory1"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="cleanInvalidatedCaches">
+                <argument name="tags" value="full_page"/>
+            </actionGroup>
         </after>
         <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="amOnStorefrontPage"/>
         <moveMouseOver

From a80fa10f665e1da1d64bed6ea7187bef2aa00d2b Mon Sep 17 00:00:00 2001
From: Dmytro Yushkin <dyushkin@adobe.com>
Date: Wed, 26 Aug 2020 19:08:48 -0500
Subject: [PATCH 1670/1718] MC-35161: No Payment method is showing in Admin
 Create Order for one website only.

---
 app/code/Magento/Sales/Model/AdminOrder/Create.php     | 10 ++++++----
 .../Magento/Sales/Model/AdminOrder/CreateTest.php      |  8 ++------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
index d5a94a4dd1fcf..f60944d57c992 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/Create.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -745,10 +745,12 @@ public function getCustomerCart()
             try {
                 $this->_cart = $this->quoteRepository->getForCustomer($customerId, [$storeId]);
             } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
-                $this->_cart->setStore($this->getSession()->getStore());
-                $customerData = $this->customerRepository->getById($customerId);
-                $this->_cart->assignCustomer($customerData);
-                $this->quoteRepository->save($this->_cart);
+                if ($this->getQuote()->hasItems()) {
+                    $this->_cart->setStore($this->getSession()->getStore());
+                    $customerData = $this->customerRepository->getById($customerId);
+                    $this->_cart->assignCustomer($customerData);
+                    $this->quoteRepository->save($this->_cart);
+                }
             }
         }
 
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
index e1cc942d4ae28..86e42e228d623 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
@@ -693,12 +693,8 @@ public function testGetCustomerCartNewCart()
 
         /** SUT execution */
         $customerQuote = $this->model->getCustomerCart();
-        self::assertNotEmpty($customerQuote->getId(), 'Quote ID is invalid.');
-        self::assertEquals(
-            $customerEmailFromFixture,
-            $customerQuote->getCustomerEmail(),
-            'Customer data is preserved incorrectly in a newly quote.'
-        );
+        self::assertInstanceOf(Quote::class, $customerQuote);
+        self::assertEmpty($customerQuote->getData());
     }
 
     /**

From 605d211f3247317a148575d462f36d8dabd07360 Mon Sep 17 00:00:00 2001
From: Dmytro Yushkin <dyushkin@adobe.com>
Date: Wed, 26 Aug 2020 21:24:12 -0500
Subject: [PATCH 1671/1718] MC-35161: No Payment method is showing in Admin
 Create Order for one website only. - Static tests fix

---
 app/code/Magento/Sales/Model/AdminOrder/Create.php          | 6 ++++--
 .../testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
index f60944d57c992..8ef12e5889520 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/Create.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -787,6 +787,7 @@ public function getCustomerCompareList()
     public function getCustomerGroupId()
     {
         $groupId = $this->getQuote()->getCustomerGroupId();
+        // @phpstan-ignore-next-line
         if (!isset($groupId)) {
             $groupId = $this->getSession()->getCustomerGroupId();
         }
@@ -1445,9 +1446,10 @@ public function setShippingAddress($address)
              */
             $saveInAddressBook = (int)(!empty($address['save_in_address_book']));
             $shippingAddress->setData('save_in_address_book', $saveInAddressBook);
-        }
-        if ($address instanceof \Magento\Quote\Model\Quote\Address) {
+        } elseif ($address instanceof \Magento\Quote\Model\Quote\Address) {
             $shippingAddress = $address;
+        } else {
+            $shippingAddress = null;
         }
 
         $this->setRecollect(true);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
index 86e42e228d623..3e6b27a7ca622 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php
@@ -684,7 +684,6 @@ public function testMoveQuoteItemToCart()
     public function testGetCustomerCartNewCart()
     {
         $customerIdFromFixture = 1;
-        $customerEmailFromFixture = 'customer@example.com';
 
         /** Preconditions */
         /** @var SessionQuote $session */

From cef3fe7efc2403feec6eb550348d03ecb25c6f95 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Thu, 27 Aug 2020 09:29:34 +0300
Subject: [PATCH 1672/1718] fix static

---
 app/code/Magento/Dhl/Model/Carrier.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
index 9277a070e28d1..204094571ba3b 100644
--- a/app/code/Magento/Dhl/Model/Carrier.php
+++ b/app/code/Magento/Dhl/Model/Carrier.php
@@ -1768,9 +1768,8 @@ protected function _shipmentDetails($xml, $rawRequest, $originRegion = '')
          */
         $nodeShipmentDetails->addChild('DoorTo', 'DD');
         $nodeShipmentDetails->addChild('DimensionUnit', substr($this->_getDimensionUnit(), 0, 1));
-        if ($package['params']['container'] == self::DHL_CONTENT_TYPE_NON_DOC) {
-            $packageType = 'CP';
-        }
+        $contentType = isset($package['params']['container']) ? $package['params']['container'] : '';
+        $packageType = $contentType === self::DHL_CONTENT_TYPE_NON_DOC ? 'CP' : '';
         $nodeShipmentDetails->addChild('PackageType', $packageType);
         if ($this->isDutiable($rawRequest->getOrigCountryId(), $rawRequest->getDestCountryId())) {
             $nodeShipmentDetails->addChild('IsDutiable', 'Y');

From 2855c4d84cb75c40cc4749911eb372c6f478520d Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Thu, 27 Aug 2020 19:11:55 +0800
Subject: [PATCH 1673/1718] magento/adobe-stock-integration#1776: [MFTF]
 Sorting in media gallery - implement newest sort test

---
 .../Test/AdminMediaGallerySortingTest.xml     | 80 ++++++++++++++++++-
 1 file changed, 76 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortingTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortingTest.xml
index a66d3d2af9182..395cf6140345d 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortingTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortingTest.xml
@@ -21,11 +21,83 @@
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
+
+        <after>
+            <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFirstFolderForDelete">
+                <argument name="name" value="firstFolder"/>
+            </actionGroup>
+            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFirstFolder"/>
+            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFirstFolderWasDeleted">
+                <argument name="name" value="firstFolder"/>
+            </actionGroup>
+            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectSecondFolderForDelete">
+                <argument name="name" value="secondFolder"/>
+            </actionGroup>
+            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteSecondFolder"/>
+            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertSecondFolderWasDeleted">
+                <argument name="name" value="secondFolder"/>
+            </actionGroup>
+        </after>
         <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
-        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderForm"/>
-        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolder">
-            <argument name="name" value="a"/>
+        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openFirstNewFolderForm"/>
+        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createFirstNewFolder">
+            <argument name="name" value="firstFolder"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertFirstNewFolderCreated">
+            <argument name="name" value="firstFolder"/>
+        </actionGroup>
+
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
+            <argument name="image" value="ImageUpload"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadSecondImage">
+            <argument name="image" value="ImageUpload_1"/>
+        </actionGroup>
+
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+        <waitForPageLoad stepKey="waitForGridToLoad"/>
+        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openSecondNewFolderForm"/>
+        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createSecondNewFolder">
+            <argument name="name" value="secondFolder"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertSecondNewFolderCreated">
+            <argument name="name" value="secondFolder"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadThirdImage">
+            <argument name="image" value="ImageUpload3"/>
+        </actionGroup>
+
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="secondResetAdminDataGridToDefaultView"/>
+        <waitForPageLoad stepKey="secondWaitForGridToLoad"/>
+        <grabAttributeFrom selector="{{AdminEnhancedMediaGalleryGridImagePositionSection.nthImageInGrid('0')}}" userInput="src"
+                           stepKey="getFirstImageBeforeNewestFirstSort"/>
+        <grabAttributeFrom selector="{{AdminEnhancedMediaGalleryGridImagePositionSection.nthImageInGrid('1')}}" userInput="src"
+                           stepKey="getSecondImageBeforeNewestFirstSort"/>
+        <grabAttributeFrom selector="{{AdminEnhancedMediaGalleryGridImagePositionSection.nthImageInGrid('2')}}" userInput="src"
+                           stepKey="getThirdImageBeforeNewestFirstSort"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryClickSortActionGroup" stepKey="sortByNewestFirst">
+            <argument name="sortName" value="newest_first"/>
         </actionGroup>
-        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertNewFolderCreated"/>
+        <grabAttributeFrom selector="{{AdminEnhancedMediaGalleryGridImagePositionSection.nthImageInGrid('0')}}" userInput="src"
+                           stepKey="getFirstImageAfterNewestFirstSort"/>
+        <grabAttributeFrom selector="{{AdminEnhancedMediaGalleryGridImagePositionSection.nthImageInGrid('1')}}" userInput="src"
+                           stepKey="getSecondImageAfterNewestFirstSort"/>
+        <grabAttributeFrom selector="{{AdminEnhancedMediaGalleryGridImagePositionSection.nthImageInGrid('2')}}" userInput="src"
+                           stepKey="getThirdImageAfterNewestFirstSort"/>
+        <assertEquals stepKey="assertFirstImagePositionAfterNewestFirstSort">
+            <actualResult type="string">{$getFirstImageAfterNewestFirstSort}</actualResult>
+            <expectedResult type="string">{$getFirstImageBeforeNewestFirstSort}</expectedResult>
+        </assertEquals>
+        <assertEquals stepKey="assertSecondImagePositionAfterNewestFirstSort">
+            <actualResult type="string">{$getSecondImageAfterNewestFirstSort}</actualResult>
+            <expectedResult type="string">{$getSecondImageBeforeNewestFirstSort}</expectedResult>
+        </assertEquals>
+        <assertEquals stepKey="assertThirdImagePositionAfterNewestFirstSort">
+            <actualResult type="string">{$getThirdImageAfterNewestFirstSort}</actualResult>
+            <expectedResult type="string">{$getThirdImageBeforeNewestFirstSort}</expectedResult>
+        </assertEquals>
     </test>
 </tests>

From 266d80825d13ad010be3875bb75075a32f0817db Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Thu, 27 Aug 2020 19:56:06 +0800
Subject: [PATCH 1674/1718] 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 7fe1b9d704036a47095538a9e41432f376cc79fa Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 27 Aug 2020 19:07:10 +0300
Subject: [PATCH 1675/1718] 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 2f23b48a2d36b2cceec499758362f58069a1b30d Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 27 Aug 2020 19:12:51 +0300
Subject: [PATCH 1676/1718] 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 d99fd2b5bcaddea5cf6a49a17ccbf4fcbe60b3f7 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 1677/1718] 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 13ada4f367f75ef911ac5ea1fb409540e99e7a26 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 27 Aug 2020 22:03:46 +0300
Subject: [PATCH 1678/1718] 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 f992f2a4d9ac8f6e845fa1f688c6a4e76535396b Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 27 Aug 2020 23:14:51 +0300
Subject: [PATCH 1679/1718] 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 322f917ec5c7a4acad9358cb62a217e2950eedf4 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 27 Aug 2020 23:15:36 +0300
Subject: [PATCH 1680/1718] 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 aabcdcc0a0e4143fb34b9793a13b09a76969e912 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Fri, 28 Aug 2020 18:02:33 +0800
Subject: [PATCH 1681/1718] magento/adobe-stock-integration#1776: [MFTF]
 Sorting in media gallery - separated the tests for each sort by options and
 added new action group

---
 ...nEnhancedMediaGallerySortByActionGroup.xml | 41 +++++++++
 ...diaGallerySortByDirectoryAscendingTest.xml | 85 ++++++++++++++++++
 ...iaGallerySortByDirectoryDescendingTest.xml | 86 +++++++++++++++++++
 .../AdminMediaGallerySortByNameAToZTest.xml   | 85 ++++++++++++++++++
 .../AdminMediaGallerySortByNameZToATest.xml   | 85 ++++++++++++++++++
 ...dminMediaGallerySortByNewestFirstTest.xml} | 39 +++------
 ...AdminMediaGallerySortByOldestFirstTest.xml | 84 ++++++++++++++++++
 7 files changed, 476 insertions(+), 29 deletions(-)
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGallerySortByActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByDirectoryAscendingTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByDirectoryDescendingTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNameAToZTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNameZToATest.xml
 rename app/code/Magento/MediaGalleryUi/Test/Mftf/Test/{AdminMediaGallerySortingTest.xml => AdminMediaGallerySortByNewestFirstTest.xml} (63%)
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByOldestFirstTest.xml

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGallerySortByActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGallerySortByActionGroup.xml
new file mode 100644
index 0000000000000..451ef81f0ff9f
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGallerySortByActionGroup.xml
@@ -0,0 +1,41 @@
+<?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="AssertAdminEnhancedMediaGallerySortByActionGroup">
+        <annotations>
+            <description>Assert the images position in the grid after sorting has been applied.</description>
+        </annotations>
+        <arguments>
+            <argument name="firstImageFile" type="string"/>
+            <argument name="secondImageFile" type="string"/>
+            <argument name="thirdImageFile" type="string"/>
+        </arguments>
+
+        <grabAttributeFrom selector="{{AdminEnhancedMediaGalleryGridImagePositionSection.nthImageInGrid('0')}}" userInput="src"
+                           stepKey="getFirstImageSrcAfterSort"/>
+        <grabAttributeFrom selector="{{AdminEnhancedMediaGalleryGridImagePositionSection.nthImageInGrid('1')}}" userInput="src"
+                           stepKey="getSecondImageSrcAfterSort"/>
+        <grabAttributeFrom selector="{{AdminEnhancedMediaGalleryGridImagePositionSection.nthImageInGrid('2')}}" userInput="src"
+                           stepKey="getThirdImageSrcAfterSort"/>
+
+        <assertStringContainsString stepKey="assertFirstImagePositionAfterSort">
+            <actualResult type="string">{$getFirstImageSrcAfterSort}</actualResult>
+            <expectedResult type="string">{{firstImageFile}}</expectedResult>
+        </assertStringContainsString>
+        <assertStringContainsString stepKey="assertSecondImagePositionAfterSort">
+            <actualResult type="string">{$getSecondImageSrcAfterSort}</actualResult>
+            <expectedResult type="string">{{secondImageFile}}</expectedResult>
+        </assertStringContainsString>
+        <assertStringContainsString stepKey="assertThirdImagePositionAfterSort">
+            <actualResult type="string">{$getThirdImageSrcAfterSort}</actualResult>
+            <expectedResult type="string">{{thirdImageFile}}</expectedResult>
+        </assertStringContainsString>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByDirectoryAscendingTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByDirectoryAscendingTest.xml
new file mode 100644
index 0000000000000..4dbf3da0752b2
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByDirectoryAscendingTest.xml
@@ -0,0 +1,85 @@
+<?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="AdminMediaGallerySortByDirectoryAscendingTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1776"/>
+            <title value="User uses Sort by Directory Ascending in Standalone Media Gallery"/>
+            <stories value="User uses Sort by Directory Ascending in Standalone Media Gallery"/>
+            <testCaseId value="https://github.com/magento/adobe-stock-integration/issues/1776"/>
+            <description value="User uses Sort by Directory Ascending in Standalone Media Gallery"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFirstFolderForDelete">
+                <argument name="name" value="firstFolder"/>
+            </actionGroup>
+            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFirstFolder"/>
+            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFirstFolderWasDeleted">
+                <argument name="name" value="firstFolder"/>
+            </actionGroup>
+            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectSecondFolderForDelete">
+                <argument name="name" value="secondFolder"/>
+            </actionGroup>
+            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteSecondFolder"/>
+            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertSecondFolderWasDeleted">
+                <argument name="name" value="secondFolder"/>
+            </actionGroup>
+        </after>
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
+        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openFirstNewFolderForm"/>
+        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createFirstNewFolder">
+            <argument name="name" value="firstFolder"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertFirstNewFolderCreated">
+            <argument name="name" value="firstFolder"/>
+        </actionGroup>
+
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
+            <argument name="image" value="ImageUpload"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadSecondImage">
+            <argument name="image" value="ImageUpload_1"/>
+        </actionGroup>
+
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+        <waitForPageLoad stepKey="waitForGridToLoad"/>
+        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openSecondNewFolderForm"/>
+        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createSecondNewFolder">
+            <argument name="name" value="secondFolder"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertSecondNewFolderCreated">
+            <argument name="name" value="secondFolder"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadThirdImage">
+            <argument name="image" value="ImageUpload1"/>
+        </actionGroup>
+
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="secondResetAdminDataGridToDefaultView"/>
+        <waitForPageLoad stepKey="secondWaitForGridToLoad"/>
+
+        <actionGroup ref="AdminEnhancedMediaGalleryClickSortActionGroup" stepKey="sortByDirectoryAscending">
+            <argument name="sortName" value="directory_asc"/>
+        </actionGroup>
+
+        <actionGroup ref="AssertAdminEnhancedMediaGallerySortByActionGroup" stepKey="assertImagePositionAfterSortByDirectoryAscending">
+            <argument name="firstImageFile" value="{{ImageUpload_1.file}}"/>
+            <argument name="secondImageFile" value="{{ImageUpload.file}}"/>
+            <argument name="thirdImageFile" value="{{ImageUpload1.value}}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByDirectoryDescendingTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByDirectoryDescendingTest.xml
new file mode 100644
index 0000000000000..025da24511b73
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByDirectoryDescendingTest.xml
@@ -0,0 +1,86 @@
+<?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="AdminMediaGallerySortByDirectoryDescendingTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1776"/>
+            <title value="User uses Sort by Directory Descending in Standalone Media Gallery"/>
+            <stories value="User uses Sort by Directory Descending in Standalone Media Gallery"/>
+            <testCaseId value="https://github.com/magento/adobe-stock-integration/issues/1776"/>
+            <description value="User uses Sort by Directory Descending in Standalone Media Gallery"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+
+        <after>
+            <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFirstFolderForDelete">
+                <argument name="name" value="firstFolder"/>
+            </actionGroup>
+            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFirstFolder"/>
+            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFirstFolderWasDeleted">
+                <argument name="name" value="firstFolder"/>
+            </actionGroup>
+            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectSecondFolderForDelete">
+                <argument name="name" value="secondFolder"/>
+            </actionGroup>
+            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteSecondFolder"/>
+            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertSecondFolderWasDeleted">
+                <argument name="name" value="secondFolder"/>
+            </actionGroup>
+        </after>
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
+        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openFirstNewFolderForm"/>
+        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createFirstNewFolder">
+            <argument name="name" value="firstFolder"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertFirstNewFolderCreated">
+            <argument name="name" value="firstFolder"/>
+        </actionGroup>
+
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
+            <argument name="image" value="ImageUpload"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadSecondImage">
+            <argument name="image" value="ImageUpload_1"/>
+        </actionGroup>
+
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+        <waitForPageLoad stepKey="waitForGridToLoad"/>
+        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openSecondNewFolderForm"/>
+        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createSecondNewFolder">
+            <argument name="name" value="secondFolder"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertSecondNewFolderCreated">
+            <argument name="name" value="secondFolder"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadThirdImage">
+            <argument name="image" value="ImageUpload1"/>
+        </actionGroup>
+
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="secondResetAdminDataGridToDefaultView"/>
+        <waitForPageLoad stepKey="secondWaitForGridToLoad"/>
+
+        <actionGroup ref="AdminEnhancedMediaGalleryClickSortActionGroup" stepKey="sortByDirectoryDescending">
+            <argument name="sortName" value="directory_desc"/>
+        </actionGroup>
+
+        <actionGroup ref="AssertAdminEnhancedMediaGallerySortByActionGroup" stepKey="assertImagePositionAfterSortByDirectoryDescending">
+            <argument name="firstImageFile" value="{{ImageUpload1.value}}"/>
+            <argument name="secondImageFile" value="{{ImageUpload.file}}"/>
+            <argument name="thirdImageFile" value="{{ImageUpload_1.file}}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNameAToZTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNameAToZTest.xml
new file mode 100644
index 0000000000000..da0d8a18b75e4
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNameAToZTest.xml
@@ -0,0 +1,85 @@
+<?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="AdminMediaGallerySortByNameAToZTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1776"/>
+            <title value="User uses Sort by Name A to Z in Standalone Media Gallery"/>
+            <stories value="User uses Sort by Name A to Z in Standalone Media Gallery"/>
+            <testCaseId value="https://github.com/magento/adobe-stock-integration/issues/1776"/>
+            <description value="User uses Sort by Name A to Z in Standalone Media Gallery"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFirstFolderForDelete">
+                <argument name="name" value="firstFolder"/>
+            </actionGroup>
+            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFirstFolder"/>
+            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFirstFolderWasDeleted">
+                <argument name="name" value="firstFolder"/>
+            </actionGroup>
+            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectSecondFolderForDelete">
+                <argument name="name" value="secondFolder"/>
+            </actionGroup>
+            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteSecondFolder"/>
+            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertSecondFolderWasDeleted">
+                <argument name="name" value="secondFolder"/>
+            </actionGroup>
+        </after>
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
+        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openFirstNewFolderForm"/>
+        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createFirstNewFolder">
+            <argument name="name" value="firstFolder"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertFirstNewFolderCreated">
+            <argument name="name" value="firstFolder"/>
+        </actionGroup>
+
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
+            <argument name="image" value="ImageUpload"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadSecondImage">
+            <argument name="image" value="ImageUpload_1"/>
+        </actionGroup>
+
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+        <waitForPageLoad stepKey="waitForGridToLoad"/>
+        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openSecondNewFolderForm"/>
+        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createSecondNewFolder">
+            <argument name="name" value="secondFolder"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertSecondNewFolderCreated">
+            <argument name="name" value="secondFolder"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadThirdImage">
+            <argument name="image" value="ImageUpload1"/>
+        </actionGroup>
+
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="secondResetAdminDataGridToDefaultView"/>
+        <waitForPageLoad stepKey="secondWaitForGridToLoad"/>
+
+        <actionGroup ref="AdminEnhancedMediaGalleryClickSortActionGroup" stepKey="sortByNameAToZ">
+            <argument name="sortName" value="name_az"/>
+        </actionGroup>
+
+        <actionGroup ref="AssertAdminEnhancedMediaGallerySortByActionGroup" stepKey="assertImagePositionAfterSortByNameAToZ">
+            <argument name="firstImageFile" value="{{ImageUpload.file}}"/>
+            <argument name="secondImageFile" value="{{ImageUpload_1.file}}"/>
+            <argument name="thirdImageFile" value="{{ImageUpload1.value}}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNameZToATest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNameZToATest.xml
new file mode 100644
index 0000000000000..4b5086e5d63ff
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNameZToATest.xml
@@ -0,0 +1,85 @@
+<?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="AdminMediaGallerySortByNameZToATest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1776"/>
+            <title value="User uses Sort by Name Z to A in Standalone Media Gallery"/>
+            <stories value="User uses Sort by Name Z to A in Standalone Media Gallery"/>
+            <testCaseId value="https://github.com/magento/adobe-stock-integration/issues/1776"/>
+            <description value="User uses Sort by Name Z to A in Standalone Media Gallery"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFirstFolderForDelete">
+                <argument name="name" value="firstFolder"/>
+            </actionGroup>
+            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFirstFolder"/>
+            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFirstFolderWasDeleted">
+                <argument name="name" value="firstFolder"/>
+            </actionGroup>
+            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectSecondFolderForDelete">
+                <argument name="name" value="secondFolder"/>
+            </actionGroup>
+            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteSecondFolder"/>
+            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertSecondFolderWasDeleted">
+                <argument name="name" value="secondFolder"/>
+            </actionGroup>
+        </after>
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
+        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openFirstNewFolderForm"/>
+        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createFirstNewFolder">
+            <argument name="name" value="firstFolder"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertFirstNewFolderCreated">
+            <argument name="name" value="firstFolder"/>
+        </actionGroup>
+
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
+            <argument name="image" value="ImageUpload"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadSecondImage">
+            <argument name="image" value="ImageUpload_1"/>
+        </actionGroup>
+
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+        <waitForPageLoad stepKey="waitForGridToLoad"/>
+        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openSecondNewFolderForm"/>
+        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createSecondNewFolder">
+            <argument name="name" value="secondFolder"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertSecondNewFolderCreated">
+            <argument name="name" value="secondFolder"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadThirdImage">
+            <argument name="image" value="ImageUpload1"/>
+        </actionGroup>
+
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="secondResetAdminDataGridToDefaultView"/>
+        <waitForPageLoad stepKey="secondWaitForGridToLoad"/>
+
+        <actionGroup ref="AdminEnhancedMediaGalleryClickSortActionGroup" stepKey="sortByNameZToA">
+            <argument name="sortName" value="name_za"/>
+        </actionGroup>
+
+        <actionGroup ref="AssertAdminEnhancedMediaGallerySortByActionGroup" stepKey="assertImagePositionAfterSortByNameZToA">
+            <argument name="firstImageFile" value="{{ImageUpload1.value}}"/>
+            <argument name="secondImageFile" value="{{ImageUpload_1.file}}"/>
+            <argument name="thirdImageFile" value="{{ImageUpload.file}}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortingTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNewestFirstTest.xml
similarity index 63%
rename from app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortingTest.xml
rename to app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNewestFirstTest.xml
index 395cf6140345d..4274b26d5770f 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortingTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNewestFirstTest.xml
@@ -7,14 +7,14 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminMediaGallerySortingTest">
+    <test name="AdminMediaGallerySortByNewestFirstTest">
         <annotations>
             <features value="MediaGallery"/>
             <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1776"/>
-            <title value="User uses Sorting in Standalone Media Gallery"/>
-            <stories value="User uses Sorting in Standalone Media Gallery"/>
+            <title value="User uses Sort by Newest First in Standalone Media Gallery"/>
+            <stories value="User uses Sort by Newest First in Standalone Media Gallery"/>
             <testCaseId value="https://github.com/magento/adobe-stock-integration/issues/1776"/>
-            <description value="User uses Sorting in Standalone Media Gallery"/>
+            <description value="User uses Sort by Newest First in Standalone Media Gallery"/>
             <severity value="CRITICAL"/>
             <group value="media_gallery_ui"/>
         </annotations>
@@ -67,37 +67,18 @@
             <argument name="name" value="secondFolder"/>
         </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadThirdImage">
-            <argument name="image" value="ImageUpload3"/>
+            <argument name="image" value="ImageUpload1"/>
         </actionGroup>
 
         <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="secondResetAdminDataGridToDefaultView"/>
         <waitForPageLoad stepKey="secondWaitForGridToLoad"/>
-        <grabAttributeFrom selector="{{AdminEnhancedMediaGalleryGridImagePositionSection.nthImageInGrid('0')}}" userInput="src"
-                           stepKey="getFirstImageBeforeNewestFirstSort"/>
-        <grabAttributeFrom selector="{{AdminEnhancedMediaGalleryGridImagePositionSection.nthImageInGrid('1')}}" userInput="src"
-                           stepKey="getSecondImageBeforeNewestFirstSort"/>
-        <grabAttributeFrom selector="{{AdminEnhancedMediaGalleryGridImagePositionSection.nthImageInGrid('2')}}" userInput="src"
-                           stepKey="getThirdImageBeforeNewestFirstSort"/>
         <actionGroup ref="AdminEnhancedMediaGalleryClickSortActionGroup" stepKey="sortByNewestFirst">
             <argument name="sortName" value="newest_first"/>
         </actionGroup>
-        <grabAttributeFrom selector="{{AdminEnhancedMediaGalleryGridImagePositionSection.nthImageInGrid('0')}}" userInput="src"
-                           stepKey="getFirstImageAfterNewestFirstSort"/>
-        <grabAttributeFrom selector="{{AdminEnhancedMediaGalleryGridImagePositionSection.nthImageInGrid('1')}}" userInput="src"
-                           stepKey="getSecondImageAfterNewestFirstSort"/>
-        <grabAttributeFrom selector="{{AdminEnhancedMediaGalleryGridImagePositionSection.nthImageInGrid('2')}}" userInput="src"
-                           stepKey="getThirdImageAfterNewestFirstSort"/>
-        <assertEquals stepKey="assertFirstImagePositionAfterNewestFirstSort">
-            <actualResult type="string">{$getFirstImageAfterNewestFirstSort}</actualResult>
-            <expectedResult type="string">{$getFirstImageBeforeNewestFirstSort}</expectedResult>
-        </assertEquals>
-        <assertEquals stepKey="assertSecondImagePositionAfterNewestFirstSort">
-            <actualResult type="string">{$getSecondImageAfterNewestFirstSort}</actualResult>
-            <expectedResult type="string">{$getSecondImageBeforeNewestFirstSort}</expectedResult>
-        </assertEquals>
-        <assertEquals stepKey="assertThirdImagePositionAfterNewestFirstSort">
-            <actualResult type="string">{$getThirdImageAfterNewestFirstSort}</actualResult>
-            <expectedResult type="string">{$getThirdImageBeforeNewestFirstSort}</expectedResult>
-        </assertEquals>
+        <actionGroup ref="AssertAdminEnhancedMediaGallerySortByActionGroup" stepKey="assertImagePositionAfterSortByNewestFirst">
+            <argument name="firstImageFile" value="{{ImageUpload1.value}}"/>
+            <argument name="secondImageFile" value="{{ImageUpload_1.file}}"/>
+            <argument name="thirdImageFile" value="{{ImageUpload.file}}"/>
+        </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByOldestFirstTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByOldestFirstTest.xml
new file mode 100644
index 0000000000000..e67fdcfcf40b3
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByOldestFirstTest.xml
@@ -0,0 +1,84 @@
+<?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="AdminMediaGallerySortByOldestFirstTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1776"/>
+            <title value="User uses Sort by Oldest First in Standalone Media Gallery"/>
+            <stories value="User uses Sort by Oldest First in Standalone Media Gallery"/>
+            <testCaseId value="https://github.com/magento/adobe-stock-integration/issues/1776"/>
+            <description value="User uses Sort by Oldest First in Standalone Media Gallery"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFirstFolderForDelete">
+                <argument name="name" value="firstFolder"/>
+            </actionGroup>
+            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFirstFolder"/>
+            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFirstFolderWasDeleted">
+                <argument name="name" value="firstFolder"/>
+            </actionGroup>
+            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectSecondFolderForDelete">
+                <argument name="name" value="secondFolder"/>
+            </actionGroup>
+            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteSecondFolder"/>
+            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertSecondFolderWasDeleted">
+                <argument name="name" value="secondFolder"/>
+            </actionGroup>
+        </after>
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
+        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openFirstNewFolderForm"/>
+        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createFirstNewFolder">
+            <argument name="name" value="firstFolder"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertFirstNewFolderCreated">
+            <argument name="name" value="firstFolder"/>
+        </actionGroup>
+
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
+            <argument name="image" value="ImageUpload"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadSecondImage">
+            <argument name="image" value="ImageUpload_1"/>
+        </actionGroup>
+
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+        <waitForPageLoad stepKey="waitForGridToLoad"/>
+        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openSecondNewFolderForm"/>
+        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createSecondNewFolder">
+            <argument name="name" value="secondFolder"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertSecondNewFolderCreated">
+            <argument name="name" value="secondFolder"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadThirdImage">
+            <argument name="image" value="ImageUpload1"/>
+        </actionGroup>
+
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="secondResetAdminDataGridToDefaultView"/>
+        <waitForPageLoad stepKey="secondWaitForGridToLoad"/>
+
+        <actionGroup ref="AdminEnhancedMediaGalleryClickSortActionGroup" stepKey="sortByOldestFirst">
+            <argument name="sortName" value="oldest_first"/>
+        </actionGroup>
+        <actionGroup ref="AssertAdminEnhancedMediaGallerySortByActionGroup" stepKey="assertImagePositionAfterSortByOldestFirst">
+            <argument name="firstImageFile" value="{{ImageUpload.file}}"/>
+            <argument name="secondImageFile" value="{{ImageUpload_1.file}}"/>
+            <argument name="thirdImageFile" value="{{ImageUpload1.value}}"/>
+        </actionGroup>
+    </test>
+</tests>

From 6f1f676f4c01d803a202ad34c955282c06f41099 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Fri, 28 Aug 2020 11:23:37 +0100
Subject: [PATCH 1682/1718] magento/magento2#29677: Corrected property access
 level

---
 .../Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
index 1266dcc7c035c..c7b0752e52181 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
@@ -23,7 +23,7 @@ class OnInsert extends Images implements HttpPostActionInterface
     /**
      * @var GetInsertImageContent
      */
-    protected $getInsertImageContent;
+    private $getInsertImageContent;
 
     /**
      * @param Context $context

From eb52f1c74ac15e6186845855239d3f582a264a06 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <svizev.igor@gmail.com>
Date: Fri, 28 Aug 2020 14:43:48 +0300
Subject: [PATCH 1683/1718] Add elasticsearch params to integration tests
 config

---
 dev/tests/integration/etc/install-config-mysql.php.dist | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev/tests/integration/etc/install-config-mysql.php.dist b/dev/tests/integration/etc/install-config-mysql.php.dist
index 4766048c62375..1d4b3d1951e32 100644
--- a/dev/tests/integration/etc/install-config-mysql.php.dist
+++ b/dev/tests/integration/etc/install-config-mysql.php.dist
@@ -11,6 +11,9 @@ return [
     'db-name' => 'magento_integration_tests',
     'db-prefix' => '',
     'backend-frontname' => 'backend',
+    'search-engine' => 'elasticsearch7',
+    'elasticsearch-host' => 'localhost',
+    'elasticsearch-port' => 9200,
     'admin-user' => \Magento\TestFramework\Bootstrap::ADMIN_NAME,
     'admin-password' => \Magento\TestFramework\Bootstrap::ADMIN_PASSWORD,
     'admin-email' => \Magento\TestFramework\Bootstrap::ADMIN_EMAIL,

From a5ee11043ffe8f1d978895db423d7590cd3fe2b3 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Fri, 28 Aug 2020 14:38:49 -0500
Subject: [PATCH 1684/1718] MC-36456: union implementation

---
 .../{UnionType1.php => TestUnion.php}         | 19 ++-----------------
 .../etc/schema.graphqls                       |  4 ++--
 .../GraphQl/TestModule/GraphQlQueryTest.php   | 11 -----------
 .../Output/ElementMapper/Formatter/Fields.php | 19 +++++++++++--------
 .../ElementMapper/FormatterComposite.php      |  2 +-
 .../GraphQlSchemaStitching/GraphQlReader.php  | 15 ++++++++-------
 6 files changed, 24 insertions(+), 46 deletions(-)
 rename dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/{UnionType1.php => TestUnion.php} (59%)

diff --git a/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/UnionType1.php b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/TestUnion.php
similarity index 59%
rename from dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/UnionType1.php
rename to dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/TestUnion.php
index e012178d0ce22..592b0caaa88a3 100644
--- a/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/UnionType1.php
+++ b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/TestUnion.php
@@ -10,27 +10,12 @@
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Sales\Model\ResourceModel\Order\CollectionFactoryInterface;
 
 /**
- * Resolver for Union Type 1
+ * Resolver for Union type TestUnion
  */
-class UnionType1 implements ResolverInterface
+class TestUnion implements ResolverInterface
 {
-    /**
-     * @var CollectionFactoryInterface
-     */
-    private $collectionFactory;
-
-    /**
-     * @param CollectionFactoryInterface $collectionFactory
-     */
-    public function __construct(
-        CollectionFactoryInterface $collectionFactory
-    ) {
-        $this->collectionFactory = $collectionFactory;
-    }
-
     /**
      * @inheritDoc
      */
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/etc/schema.graphqls b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/etc/schema.graphqls
index 09050085bc0a2..1a5796e07b08b 100644
--- a/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/etc/schema.graphqls
+++ b/dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/etc/schema.graphqls
@@ -3,7 +3,7 @@
 
 type Query {
     testItem(id: Int!) : Item @resolver(class: "Magento\\TestModuleGraphQlQuery\\Model\\Resolver\\Item")
-    testUnion: UnionType1 @resolver(class: "Magento\\TestModuleGraphQlQuery\\Model\\Resolver\\UnionType1")
+    testUnion: TestUnion @resolver(class: "Magento\\TestModuleGraphQlQuery\\Model\\Resolver\\TestUnion")
 }
 
 type Mutation {
@@ -20,7 +20,7 @@ type MutationItem {
     name: String
 }
 
-union UnionType1 @doc(description: "some kind of union") @typeResolver(class: "Magento\\TestModuleGraphQlQuery\\Model\\Resolver\\UnionTypeResolver")  =
+union TestUnion @doc(description: "some kind of union") @typeResolver(class: "Magento\\TestModuleGraphQlQuery\\Model\\Resolver\\UnionTypeResolver")  =
     TypeCustom1 | TypeCustom2
 
 type TypeCustom1 {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php
index 7d2d6219e0272..062f3d70d6a4f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php
@@ -107,11 +107,6 @@ public function testQueryTestUnionResults()
 
         $query = <<<QUERY
 {
-    testItem(id: {$id})
-    {
-        item_id
-        name
-    }
     testUnion {
       __typename
       ... on TypeCustom1 {
@@ -125,12 +120,6 @@ public function testQueryTestUnionResults()
 QUERY;
 
         $response = $this->graphQlQuery($query);
-        $this->assertArrayHasKey('testItem', $response);
-        $testItem = $response['testItem'];
-        $this->assertArrayHasKey('item_id', $testItem);
-        $this->assertArrayHasKey('name', $testItem);
-        $this->assertEquals(1, $testItem['item_id']);
-        $this->assertEquals('itemName', $testItem['name']);
 
         $this->assertArrayHasKey('testUnion', $response);
         $testUnion = $response['testUnion'];
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Fields.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Fields.php
index 7ff2ea60bd2cc..3456f3c039a64 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Fields.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Fields.php
@@ -92,15 +92,18 @@ public function __construct(
      */
     public function format(ConfigElementInterface $configElement, OutputTypeInterface $outputType): array
     {
-        $typeConfig = [
-            'fields' => function () use ($configElement, $outputType) {
-                $fieldsConfig = [];
-                foreach ($configElement->getFields() as $field) {
-                    $fieldsConfig[$field->getName()] = $this->getFieldConfig($configElement, $outputType, $field);
+        $typeConfig = [];
+        if ($configElement instanceof TypeInterface) {
+            $typeConfig = [
+                'fields' => function () use ($configElement, $outputType) {
+                    $fieldsConfig = [];
+                    foreach ($configElement->getFields() as $field) {
+                        $fieldsConfig[$field->getName()] = $this->getFieldConfig($configElement, $outputType, $field);
+                    }
+                    return $fieldsConfig;
                 }
-                return $fieldsConfig;
-            }
-        ];
+            ];
+        }
         return $typeConfig;
     }
 
diff --git a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterComposite.php b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterComposite.php
index 99ef725afe32f..c36df11012017 100644
--- a/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterComposite.php
+++ b/lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/FormatterComposite.php
@@ -42,6 +42,6 @@ public function format(ConfigElementInterface $configElement, OutputTypeInterfac
             $formattedConfig[] = $formatter->format($configElement, $outputType);
         }
 
-        return  array_merge($defaultConfig, ...$formattedConfig);
+        return array_merge($defaultConfig, ...$formattedConfig);
     }
 }
diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
index 34913ae949f28..cf1477ee81941 100644
--- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
@@ -330,13 +330,14 @@ private static function getModuleNameForRelevantFile(string $file): string
      */
     private function addModuleNameToTypes(array $source, string $filePath): array
     {
-        foreach ($source as $typeName => $type) {
-            if ((!isset($type['module']))
-                && (($type['type'] ?? '' === InterfaceType::GRAPHQL_INTERFACE && isset($type['typeResolver']))
-                    || isset($type['implements'])
-                )
-            ) {
-                $source[$typeName]['module'] = self::getModuleNameForRelevantFile($filePath);
+        foreach ($source as $typeName => $typeDefinition) {
+            if (!isset($typeDefinition['module'])) {
+                $hasTypeResolver = (bool)$typeDefinition['typeResolver'] ?? false;
+                $hasImplements = (bool)$typeDefinition['implements'] ?? false;
+                $typeDefinition = (bool)$typeDefinition['type'] ?? false;
+                if ((($typeDefinition === InterfaceType::GRAPHQL_INTERFACE && $hasTypeResolver) || $hasImplements)) {
+                    $source[$typeName]['module'] = self::getModuleNameForRelevantFile($filePath);
+                }
             }
         }
 

From 140159728a1477615168c023c5eb67b91929a90b Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Fri, 28 Aug 2020 16:47:39 -0500
Subject: [PATCH 1685/1718] MC-36456: union implementation

---
 .../testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php
index 062f3d70d6a4f..0bbdf5a4c9803 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/TestModule/GraphQlQueryTest.php
@@ -103,8 +103,6 @@ public function testQueryViaGetRequestWithVariablesReturnsResults()
 
     public function testQueryTestUnionResults()
     {
-        $id = 1;
-
         $query = <<<QUERY
 {
     testUnion {

From 13a58069262447ca38d1d7671fa73ab32415a464 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Fri, 28 Aug 2020 17:08:15 -0500
Subject: [PATCH 1686/1718] MC-36456: union implementation

---
 .../Framework/GraphQlSchemaStitching/GraphQlReader.php      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
index cf1477ee81941..9845646e09fd5 100644
--- a/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
+++ b/lib/internal/Magento/Framework/GraphQlSchemaStitching/GraphQlReader.php
@@ -332,9 +332,9 @@ private function addModuleNameToTypes(array $source, string $filePath): array
     {
         foreach ($source as $typeName => $typeDefinition) {
             if (!isset($typeDefinition['module'])) {
-                $hasTypeResolver = (bool)$typeDefinition['typeResolver'] ?? false;
-                $hasImplements = (bool)$typeDefinition['implements'] ?? false;
-                $typeDefinition = (bool)$typeDefinition['type'] ?? false;
+                $hasTypeResolver = (bool)($typeDefinition['typeResolver'] ?? false);
+                $hasImplements = (bool)($typeDefinition['implements'] ?? false);
+                $typeDefinition = (bool)($typeDefinition['type'] ?? false);
                 if ((($typeDefinition === InterfaceType::GRAPHQL_INTERFACE && $hasTypeResolver) || $hasImplements)) {
                     $source[$typeName]['module'] = self::getModuleNameForRelevantFile($filePath);
                 }

From 9ff665b3e782833385363eb3c860c489031ab3cc Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Mon, 31 Aug 2020 16:28:46 +0100
Subject: [PATCH 1687/1718] Updated composer.lock

---
 composer.lock | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/composer.lock b/composer.lock
index 36a42d0c750df..551167152be4d 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",
@@ -8120,12 +8120,6 @@
                 "sftp",
                 "storage"
             ],
-            "funding": [
-                {
-                    "url": "https://offset.earth/frankdejonge",
-                    "type": "other"
-                }
-            ],
             "time": "2020-05-18T15:13:39+00:00"
         },
         {

From 6bb128b5c30670bf365017e16cedf15cc23813ba Mon Sep 17 00:00:00 2001
From: Max Lesechko <mlesechko@magento.com>
Date: Mon, 31 Aug 2020 12:31:39 -0500
Subject: [PATCH 1688/1718] MC-37041: MFTF StorefrontAddStoreCodeInUrl fails
 when using Varnish

---
 .../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 898c26bb4b45a..cea228ac7a344 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 165aa5ca4724b81afeab5dc9119d055b0c60e8a3 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Mon, 31 Aug 2020 21:10:50 +0100
Subject: [PATCH 1689/1718] Skipped flacky tests

---
 .../Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml | 3 +++
 ...inMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
index c3f3d6ecd9e8d..d2a04a7d21d11 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
@@ -9,6 +9,9 @@
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminMediaGalleryCatalogUiUsedInProductFilterTest">
         <annotations>
+            <skip>
+                <issueId value="https://github.com/magento/adobe-stock-integration/issues/1795"/>
+            </skip>
             <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"/>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
index 51cac8e4a0a6b..8191d5570f1e8 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
@@ -9,6 +9,9 @@
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest">
         <annotations>
+            <skip>
+                <issueId value="https://github.com/magento/adobe-stock-integration/issues/1794"/>
+            </skip>
             <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"/>

From 0649a6f23e5afb54edda77e8f06c8fcbd6f0c177 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Tue, 1 Sep 2020 10:11:20 +0300
Subject: [PATCH 1690/1718] add story

---
 .../Mftf/Test/AdminSystemNotificationToolbarBlockAclTest.xml     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationToolbarBlockAclTest.xml b/app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationToolbarBlockAclTest.xml
index c174d1faed31a..1ab277b4f788a 100644
--- a/app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationToolbarBlockAclTest.xml
+++ b/app/code/Magento/AdminNotification/Test/Mftf/Test/AdminSystemNotificationToolbarBlockAclTest.xml
@@ -11,6 +11,7 @@
     <test name="AdminSystemNotificationToolbarBlockAclTest">
         <annotations>
             <features value="AdminNotification"/>
+            <stories value="Acl notification toolbar"/>
             <title value="Admin system notification toolbar block acl test"/>
             <description value="Admin should not see system notification toolbar block if acl not restricted"/>
             <severity value="MAJOR"/>

From e2cde9b3e28aff1822ba427b702bce2948a68f7d Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 1 Sep 2020 09:19:08 +0100
Subject: [PATCH 1691/1718] Skipped flacky test

---
 .../Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml
index 3dd294fa50605..5faa1e67bc596 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml
@@ -9,6 +9,9 @@
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminMediaGalleryUploadCategoryImageTest">
         <annotations>
+            <skip>
+                <issueId value="https://github.com/magento/adobe-stock-integration/issues/1796"/>
+            </skip>
             <features value="AdminMediaGalleryImagePanel"/>
             <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1435"/>
             <stories value="User uploads image outside of the Media Gallery"/>

From b91ebf26dd0099fd9c08452677cd4dbdcd7ac16f Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Tue, 1 Sep 2020 11:23:48 +0300
Subject: [PATCH 1692/1718] add story, features

---
 .../Test/StoreFrontCheckNotificationMessageContainerTest.xml    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Theme/Test/Mftf/Test/StoreFrontCheckNotificationMessageContainerTest.xml b/app/code/Magento/Theme/Test/Mftf/Test/StoreFrontCheckNotificationMessageContainerTest.xml
index d3317ba4f1e07..87fb4aa76f9b5 100644
--- a/app/code/Magento/Theme/Test/Mftf/Test/StoreFrontCheckNotificationMessageContainerTest.xml
+++ b/app/code/Magento/Theme/Test/Mftf/Test/StoreFrontCheckNotificationMessageContainerTest.xml
@@ -10,6 +10,8 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="StoreFrontCheckNotificationMessageContainerTest">
         <annotations>
+            <features value="Message container"/>
+            <stories value="Message container selector"/>
             <title value="Check notification message container"/>
             <description value="Check aria-atomic property on notification container message"/>
             <severity value="AVERAGE"/>

From be3c1ec4a55d482d153184b2abdfdadfd6b68f48 Mon Sep 17 00:00:00 2001
From: tuna <ladiesman9x@gmail.com>
Date: Tue, 1 Sep 2020 18:18:42 +0700
Subject: [PATCH 1693/1718] Improvements webfont loading for icons

---
 app/design/frontend/Magento/blank/web/css/source/_icons.less | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/design/frontend/Magento/blank/web/css/source/_icons.less b/app/design/frontend/Magento/blank/web/css/source/_icons.less
index 7d1ceaca73c72..5cd7795aa506c 100644
--- a/app/design/frontend/Magento/blank/web/css/source/_icons.less
+++ b/app/design/frontend/Magento/blank/web/css/source/_icons.less
@@ -8,6 +8,7 @@
         @family-name: @icons__font-name,
         @font-path: @icons__font-path,
         @font-weight: normal,
-        @font-style: normal
+        @font-style: normal,
+        @font-display: block
     );
 }

From 466d10d6f045f3877623acbff3bb54dcf26faf69 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Tue, 1 Sep 2020 19:13:06 +0200
Subject: [PATCH 1694/1718] MC-37065: [Magento Admin] Fix CSP Issue - Avoid CSP
 errors related to Adobe Launch adding domains to csp_whitelist.xml

---
 .../Magento/AdminAnalytics/etc/csp_whitelist.xml  | 14 ++++++++++++++
 .../view/adminhtml/templates/test.phtml           | 15 +++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 app/code/Magento/AdminAnalytics/view/adminhtml/templates/test.phtml

diff --git a/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml b/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml
index e937a3e18148a..bcd1d96713a96 100644
--- a/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml
+++ b/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml
@@ -13,5 +13,19 @@
                     <value id="adobedtm" type="host">assets.adobedtm.com</value>
                 </values>
             </policy>
+            <policy id="img-src">
+                <values>
+                    <value id="adobedtm" type="host">assets.adobedtm.com</value>
+                    <value id="omtrdc" type="host">amcglobal.sc.omtrdc.net</value>
+                    <value id="data" type="host">data:</value>
+                </values>
+            </policy>
+            <policy id="connect-src">
+                <value id="dpmdemdex" type="host">dpm.demdex.net</value>
+                <value id="omtrdc" type="host">amcglobal.sc.omtrdc.net</value>
+            </policy>
+            <policy id="frame-src">
+                <value id="amcdemdex" type="host">fast.amc.demdex.net</value>
+            </policy>
         </policies>
 </csp_whitelist>
diff --git a/app/code/Magento/AdminAnalytics/view/adminhtml/templates/test.phtml b/app/code/Magento/AdminAnalytics/view/adminhtml/templates/test.phtml
new file mode 100644
index 0000000000000..0c2324567aaae
--- /dev/null
+++ b/app/code/Magento/AdminAnalytics/view/adminhtml/templates/test.phtml
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+?>
+
+<script>
+    if (!window.digitalData) {
+        window.digitalData = {};
+    }
+
+    digitalData.nonce = '123-abc-def-456';
+</script>

From 7fa8c096a0dc4cacc9236e551be653564c513f42 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Tue, 1 Sep 2020 19:20:30 +0200
Subject: [PATCH 1695/1718] MC-37065: [Magento Admin] Fix CSP Issue - Delete
 unnecessary file

---
 .../view/adminhtml/templates/test.phtml           | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 app/code/Magento/AdminAnalytics/view/adminhtml/templates/test.phtml

diff --git a/app/code/Magento/AdminAnalytics/view/adminhtml/templates/test.phtml b/app/code/Magento/AdminAnalytics/view/adminhtml/templates/test.phtml
deleted file mode 100644
index 0c2324567aaae..0000000000000
--- a/app/code/Magento/AdminAnalytics/view/adminhtml/templates/test.phtml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-?>
-
-<script>
-    if (!window.digitalData) {
-        window.digitalData = {};
-    }
-
-    digitalData.nonce = '123-abc-def-456';
-</script>

From ab2782f5a637be5f8319058e62850d45468b0c75 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 1 Sep 2020 20:20:23 +0100
Subject: [PATCH 1696/1718] magento/magento2#29677: Returned existing behaviour

---
 .../Model/Wysiwyg/Images/GetInsertImageContent.php  | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/GetInsertImageContent.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/GetInsertImageContent.php
index 3531bf7569e38..305d73fff4dc7 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/GetInsertImageContent.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/GetInsertImageContent.php
@@ -8,6 +8,7 @@
 
 namespace Magento\Cms\Model\Wysiwyg\Images;
 
+use Magento\Catalog\Helper\Data as CatalogHelper;
 use Magento\Cms\Helper\Wysiwyg\Images as ImagesHelper;
 
 class GetInsertImageContent
@@ -18,13 +19,18 @@ class GetInsertImageContent
     private $imagesHelper;
 
     /**
-     * PrepareImage constructor.
-     *
+     * @var CatalogHelper
+     */
+    private $catalogHelper;
+
+    /**
      * @param ImagesHelper $imagesHelper
+     * @param CatalogHelper $catalogHelper
      */
-    public function __construct(ImagesHelper $imagesHelper)
+    public function __construct(ImagesHelper $imagesHelper, CatalogHelper $catalogHelper)
     {
         $this->imagesHelper = $imagesHelper;
+        $this->catalogHelper = $catalogHelper;
     }
 
     /**
@@ -44,6 +50,7 @@ public function execute(
     ): string {
         $filename = $this->imagesHelper->idDecode($encodedFilename);
 
+        $this->catalogHelper->setStoreId($storeId);
         $this->imagesHelper->setStoreId($storeId);
 
         if ($forceStaticPath) {

From 90eb523c28fee385379e91c81a4779d1c06bf195 Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@magento.com>
Date: Tue, 1 Sep 2020 20:40:48 -0500
Subject: [PATCH 1697/1718] MC-37193: Fix B2B performance toolkit profile
 generation on cloud

---
 .../CustomerTemplateGenerator.php             | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/setup/src/Magento/Setup/Model/FixtureGenerator/CustomerTemplateGenerator.php b/setup/src/Magento/Setup/Model/FixtureGenerator/CustomerTemplateGenerator.php
index ba57c95999284..4ecbfd3deebf8 100644
--- a/setup/src/Magento/Setup/Model/FixtureGenerator/CustomerTemplateGenerator.php
+++ b/setup/src/Magento/Setup/Model/FixtureGenerator/CustomerTemplateGenerator.php
@@ -10,6 +10,8 @@
 use Magento\Customer\Model\AddressFactory;
 use Magento\Customer\Model\Customer;
 use Magento\Customer\Model\CustomerFactory;
+use Magento\Directory\Model\ResourceModel\Region\CollectionFactory as RegionCollectionFactory;
+use Magento\Framework\App\ObjectManager;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -32,19 +34,29 @@ class CustomerTemplateGenerator implements TemplateEntityGeneratorInterface
      */
     private $storeManager;
 
+    /**
+     * @var RegionCollectionFactory
+     */
+    private $regionsCollectionFactory;
+
     /**
      * @param CustomerFactory $customerFactory
      * @param AddressFactory $addressFactory
      * @param StoreManagerInterface $storeManager
+     * @param RegionCollectionFactory|null $regionsCollectionFactory
      */
     public function __construct(
         CustomerFactory $customerFactory,
         AddressFactory $addressFactory,
-        StoreManagerInterface $storeManager
+        StoreManagerInterface $storeManager,
+        RegionCollectionFactory $regionsCollectionFactory = null
     ) {
         $this->customerFactory = $customerFactory;
         $this->addressFactory = $addressFactory;
         $this->storeManager = $storeManager;
+        $this->regionsCollectionFactory = $regionsCollectionFactory ?: ObjectManager::getInstance()->get(
+            RegionCollectionFactory::class
+        );
     }
 
     /**
@@ -119,7 +131,7 @@ private function getAddressTemplate($customerId)
                 'street' => 'Green str, 67',
                 'lastname' => 'Smith',
                 'firstname' => 'John',
-                'region_id' => 1,
+                'region_id' => $this->getFirstRegionId(),
                 'fax' => '04040404',
                 'middlename' => '',
                 'prefix' => '',
@@ -131,4 +143,18 @@ private function getAddressTemplate($customerId)
             ]
         ]);
     }
+
+    /**
+     * Get first region id.
+     *
+     * @return mixed
+     */
+    private function getFirstRegionId()
+    {
+        $regionsCollection = $this->regionsCollectionFactory->create();
+        $regionsCollection->unshiftOrder('region_id', 'ASC');
+        $region = $regionsCollection->getFirstItem();
+
+        return $region->getRegionId();
+    }
 }

From 6976e7d2729211cd8b7c558f71f2957465c07897 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 2 Sep 2020 10:09:42 +0200
Subject: [PATCH 1698/1718] MC-37065: [Magento Admin] Fix CSP Issue - Add more
 domains to img-src policy

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

diff --git a/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml b/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml
index bcd1d96713a96..95d7f7f203d78 100644
--- a/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml
+++ b/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml
@@ -17,6 +17,8 @@
                 <values>
                     <value id="adobedtm" type="host">assets.adobedtm.com</value>
                     <value id="omtrdc" type="host">amcglobal.sc.omtrdc.net</value>
+                    <value id="dpmdemdex" type="host">dpm.demdex.net</value>
+                    <value id="everesttech" type="host">cm.everesttech.net</value>
                     <value id="data" type="host">data:</value>
                 </values>
             </policy>

From c1d7415ba7e865c446e156e5ed1ad8d0b441652c Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 2 Sep 2020 10:51:52 +0200
Subject: [PATCH 1699/1718] MC-37065: [Magento Admin] Fix CSP Issue - Add
 missing <values> tag on xml file

---
 app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml b/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml
index 95d7f7f203d78..27b4c84304a40 100644
--- a/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml
+++ b/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml
@@ -23,11 +23,15 @@
                 </values>
             </policy>
             <policy id="connect-src">
-                <value id="dpmdemdex" type="host">dpm.demdex.net</value>
-                <value id="omtrdc" type="host">amcglobal.sc.omtrdc.net</value>
+                <values>
+                    <value id="dpmdemdex" type="host">dpm.demdex.net</value>
+                    <value id="omtrdc" type="host">amcglobal.sc.omtrdc.net</value>
+                </values>
             </policy>
             <policy id="frame-src">
-                <value id="amcdemdex" type="host">fast.amc.demdex.net</value>
+                <values>
+                    <value id="amcdemdex" type="host">fast.amc.demdex.net</value>
+                </values>
             </policy>
         </policies>
 </csp_whitelist>

From c60dd36b639fd5773eff02493c9ef1bc967cf581 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Wed, 2 Sep 2020 21:13:32 +0800
Subject: [PATCH 1700/1718] magento/adobe-stock-integration#1797: The vertical
 image is not centered in Category image preview - modified preview image
 position to center

---
 .../backend/web/css/source/components/_image-uploader.less     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_image-uploader.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_image-uploader.less
index f187697281252..73c43a00b870c 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_image-uploader.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_image-uploader.less
@@ -34,6 +34,9 @@
     .image-uploader-preview-link,
     .image-uploader-preview-link .preview-image {
         height: inherit;
+        margin-left: auto;
+        margin-right: auto;
+        display: block;
     }
 }
 

From 234e1ac89f1efba5e36757871414c532a0b164e3 Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Tue, 11 Aug 2020 16:00:10 +0300
Subject: [PATCH 1701/1718] error correction

---
 .../Controller/Adminhtml/Subscriber/MassUnsubscribe.php     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php
index f2850a87eae5f..5e0890215c815 100644
--- a/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php
+++ b/app/code/Magento/Newsletter/Controller/Adminhtml/Subscriber/MassUnsubscribe.php
@@ -9,13 +9,13 @@
 namespace Magento\Newsletter\Controller\Adminhtml\Subscriber;
 
 use Magento\Backend\App\Action\Context;
-use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\Response\Http\FileFactory;
 use Magento\Newsletter\Controller\Adminhtml\Subscriber;
 use Magento\Newsletter\Model\SubscriberFactory;
 
-class MassUnsubscribe extends Subscriber implements HttpGetActionInterface
+class MassUnsubscribe extends Subscriber implements HttpPostActionInterface
 {
     /**
      * @var SubscriberFactory
@@ -41,7 +41,7 @@ public function __construct(
      *
      * @return void
      */
-    public function execute()
+    public function execute(): void
     {
         $subscribersIds = $this->getRequest()->getParam('subscriber');
         if (!is_array($subscribersIds)) {

From d81eba1442f471596d3354271d6b2926ebae3846 Mon Sep 17 00:00:00 2001
From: Marc Ginesta <mginesta@adobe.com>
Date: Wed, 2 Sep 2020 18:04:38 +0200
Subject: [PATCH 1702/1718] MC-37065: [Magento Admin] Fix CSP Issue - Refactor:
 Move ':data' value inside Csp module

---
 .../AdminAnalytics/etc/csp_whitelist.xml        |  1 -
 app/code/Magento/Csp/etc/csp_whitelist.xml      | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Csp/etc/csp_whitelist.xml

diff --git a/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml b/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml
index 27b4c84304a40..f16a66aa090e3 100644
--- a/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml
+++ b/app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml
@@ -19,7 +19,6 @@
                     <value id="omtrdc" type="host">amcglobal.sc.omtrdc.net</value>
                     <value id="dpmdemdex" type="host">dpm.demdex.net</value>
                     <value id="everesttech" type="host">cm.everesttech.net</value>
-                    <value id="data" type="host">data:</value>
                 </values>
             </policy>
             <policy id="connect-src">
diff --git a/app/code/Magento/Csp/etc/csp_whitelist.xml b/app/code/Magento/Csp/etc/csp_whitelist.xml
new file mode 100644
index 0000000000000..b0cce028ac8b6
--- /dev/null
+++ b/app/code/Magento/Csp/etc/csp_whitelist.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp:etc/csp_whitelist.xsd">
+        <policies>
+            <policy id="img-src">
+                <values>
+                    <value id="data" type="host">data:</value>
+                </values>
+            </policy>
+        </policies>
+</csp_whitelist>

From 197abeb0aed5383a3565ae5d06150bd8fde167c1 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Thu, 3 Sep 2020 00:18:55 +0800
Subject: [PATCH 1703/1718] magento/adobe-stock-integration#1796: [MFTF] Unskip
 AdminMediaGalleryUploadCategoryImageTest - unskip test

---
 .../Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml     | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml
index 5faa1e67bc596..3dd294fa50605 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml
@@ -9,9 +9,6 @@
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminMediaGalleryUploadCategoryImageTest">
         <annotations>
-            <skip>
-                <issueId value="https://github.com/magento/adobe-stock-integration/issues/1796"/>
-            </skip>
             <features value="AdminMediaGalleryImagePanel"/>
             <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1435"/>
             <stories value="User uploads image outside of the Media Gallery"/>

From 45ebee4b6ec52eae73f8909ad61979e1aa137ea1 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Thu, 3 Sep 2020 02:07:22 +0800
Subject: [PATCH 1704/1718] magento/adobe-stock-integration#1797: The vertical
 image is not centered in Category image preview - fixed static test and mftf
 test fails

---
 ...ediaGalleryAssertImagesDeletedInBulkActionGroup.xml |  6 ++++--
 ...AdminEnhancedMediaGalleryDeleteImagesInBulkTest.xml |  4 +++-
 .../web/css/source/components/_image-uploader.less     | 10 +++++-----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertImagesDeletedInBulkActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertImagesDeletedInBulkActionGroup.xml
index 7f4db971702ca..ca503b7357300 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertImagesDeletedInBulkActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertImagesDeletedInBulkActionGroup.xml
@@ -12,7 +12,9 @@
         <annotations>
             <description>Asserts images has been deleted in mass action.</description>
         </annotations>
-
-        <see userInput='Assets have been successfully deleted' stepKey="verifyDeleteImages"/>
+        <arguments>
+            <argument name="numberOfAssetsDeleted" type="string"/>
+        </arguments>
+        <see userInput='{{numberOfAssetsDeleted}} assets have been successfully deleted.' stepKey="verifyDeleteImages"/>
     </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 63c0fbfeefbbf..fe2b5b1639fbe 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryDeleteImagesInBulkTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryDeleteImagesInBulkTest.xml
@@ -52,7 +52,9 @@
         </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
         <actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
-        <actionGroup ref="AdminEnhancedMediaGalleryAssertImagesDeletedInBulkActionGroup" stepKey="assertImagesDeleted"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryAssertImagesDeletedInBulkActionGroup" stepKey="assertImagesDeleted">
+            <argument name="numberOfAssetsDeleted" value="2"/>
+        </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryAssertMassActionModeNotActiveActionGroup" stepKey="assertMassectionModeDisabled"/>
     </test>
 </tests>
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_image-uploader.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_image-uploader.less
index 73c43a00b870c..a9172d5164c38 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/components/_image-uploader.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_image-uploader.less
@@ -9,8 +9,8 @@
 
 .image-uploader {
     .image-upload-requirements {
-        margin-top: 8px;
         font-size: .9em;
+        margin-top: 8px;
     }
 
     .image-placeholder {
@@ -19,12 +19,12 @@
     }
 
     .image-uploader-spinner {
-        width: 50%;
-        height: 50%;
         background-size: auto;
+        height: 50%;
         margin: 0;
-        transform: translate(50%, 50%);
         position: absolute;
+        transform: translate(50%, 50%);
+        width: 50%;
     }
 
     .image-uploader-preview {
@@ -33,10 +33,10 @@
 
     .image-uploader-preview-link,
     .image-uploader-preview-link .preview-image {
+        display: block;
         height: inherit;
         margin-left: auto;
         margin-right: auto;
-        display: block;
     }
 }
 

From 6387cbcb9bc1e873e23b3e15a558c12d0d62cf18 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Thu, 3 Sep 2020 05:32:39 +0800
Subject: [PATCH 1705/1718] magento/adobe-stock-integration#1796: [MFTF] Unskip
 AdminMediaGalleryUploadCategoryImageTest - modified test and action group

---
 ...minOpenMediaGalleryFromCategoryImageUploaderActionGroup.xml | 3 ++-
 .../Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml     | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup.xml
index 6f38bd7c7d738..b5fac048c5629 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup.xml
@@ -15,6 +15,7 @@
         <conditionalClick stepKey="clickExpandContent" selector="{{AdminCategoryContentSection.sectionHeader}}" dependentSelector="{{AdminCategoryContentSection.selectFromGalleryButton}}" visible="false" />
         <waitForElementVisible selector="{{AdminCategoryContentSection.selectFromGalleryButton}}" stepKey="waitForSelectFromGallery" />
         <click selector="{{AdminCategoryContentSection.selectFromGalleryButton}}" stepKey="clickSelectFromGallery" />
-        <waitForPageLoad stepKey="waitForPageLoad" />
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml
index 3dd294fa50605..1d5df74a92b37 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml
@@ -37,6 +37,7 @@
         <actionGroup ref="AdminSaveCategoryFormActionGroup" stepKey="saveCategoryForm"/>
         <actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGalleryFromImageUploader"/>
         <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
         <actionGroup ref="AdminMediaGalleryAssertImageInGridActionGroup" stepKey="assertImageInGrid">
             <argument name="title" value="ProductImage.filename"/>
         </actionGroup>

From 65387f87d36a4e232834219b19be5437b5e5121b Mon Sep 17 00:00:00 2001
From: Vadim Malesh <51680850+engcom-Charlie@users.noreply.github.com>
Date: Thu, 3 Sep 2020 11:47:39 +0300
Subject: [PATCH 1706/1718] add testCaseId

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

diff --git a/app/code/Magento/Theme/Test/Mftf/Test/StoreFrontCheckNotificationMessageContainerTest.xml b/app/code/Magento/Theme/Test/Mftf/Test/StoreFrontCheckNotificationMessageContainerTest.xml
index 87fb4aa76f9b5..c60385b768bf3 100644
--- a/app/code/Magento/Theme/Test/Mftf/Test/StoreFrontCheckNotificationMessageContainerTest.xml
+++ b/app/code/Magento/Theme/Test/Mftf/Test/StoreFrontCheckNotificationMessageContainerTest.xml
@@ -15,6 +15,7 @@
             <title value="Check notification message container"/>
             <description value="Check aria-atomic property on notification container message"/>
             <severity value="AVERAGE"/>
+            <testCaseId value="MC-37339"/>
             <group value="Theme"/>
         </annotations>
         <before>

From 3afe4ca0b484988783fa310bfae70ee12bcd1993 Mon Sep 17 00:00:00 2001
From: Andrii Lugovyi <alugovyi@adobe.com>
Date: Sat, 29 Aug 2020 20:29:30 -0500
Subject: [PATCH 1707/1718] MC-37069: Configurable Products with large
 quantities of children cannot be opened

---
 .../web/js/components/dynamic-rows-configurable.js   |  5 ++---
 .../Ui/view/base/web/js/dynamic-rows/dynamic-rows.js | 12 +++++++-----
 lib/web/mage/utils/objects.js                        | 11 +----------
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js
index 68e7d146d33e0..3cf210d8d0823 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js
@@ -219,7 +219,6 @@ define([
             _.each(tmpData, function (row, index) {
                 path = this.dataScope + '.' + this.index + '.' + (this.startIndex + index);
                 row.attributes = $('<i></i>').text(row.attributes).html();
-                row.sku = row.sku;
                 this.source.set(path, row);
             }, this);
 
@@ -227,11 +226,11 @@ define([
             this.parsePagesData(data);
 
             // Render
-            dataCount = data.length;
+            dataCount = tmpData.length;
             elemsCount = this.elems().length;
 
             if (dataCount > elemsCount) {
-                this.getChildItems().each(function (elemData, index) {
+                tmpData.each(function (elemData, index) {
                     this.addChild(elemData, this.startIndex + index);
                 }, this);
             } else {
diff --git a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js
index 5f29c5982e094..e82d5736824cf 100644
--- a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js
+++ b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js
@@ -1126,13 +1126,15 @@ define([
          * Update whether value differs from default value
          */
         setDifferedFromDefault: function () {
-            var recordData = utils.copy(this.recordData());
+            if (this.default) {
+                var recordData = utils.copy(this.recordData());
 
-            Array.isArray(recordData) && recordData.forEach(function (item) {
-                delete item['record_id'];
-            });
+                Array.isArray(recordData) && recordData.forEach(function (item) {
+                    delete item['record_id'];
+                });
 
-            this.isDifferedFromDefault(!_.isEqual(recordData, this.default));
+                this.isDifferedFromDefault(!_.isEqual(recordData, this.default));
+            }
         },
 
         /**
diff --git a/lib/web/mage/utils/objects.js b/lib/web/mage/utils/objects.js
index 82866c0f2a6ad..fb585ff2454ca 100644
--- a/lib/web/mage/utils/objects.js
+++ b/lib/web/mage/utils/objects.js
@@ -247,16 +247,7 @@ define([
          * @returns {Object|Array} Cloned object.
          */
         copy: function (data) {
-            var result = data,
-                isArray = Array.isArray(data),
-                placeholder;
-
-            if (this.isObject(data) || isArray) {
-                placeholder = isArray ? [] : {};
-                result = this.extend(placeholder, data);
-            }
-
-            return result;
+            return _.clone(data)
         },
 
         /**

From f97a10332897a617a618de8e140acc146d43742e Mon Sep 17 00:00:00 2001
From: Andrii Lugovyi <alugovyi@adobe.com>
Date: Mon, 31 Aug 2020 21:09:32 -0500
Subject: [PATCH 1708/1718] MC-37069: Configurable Products with large
 quantities of children cannot be opened

---
 .../web/js/components/dynamic-rows-configurable.js    |  4 ++++
 .../Ui/view/base/web/js/dynamic-rows/dynamic-rows.js  |  3 ++-
 lib/web/mage/utils/objects.js                         | 11 ++++++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js
index 3cf210d8d0823..37505b4777359 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js
@@ -242,6 +242,10 @@ define([
             this.generateAssociatedProducts();
         },
 
+        setInitialProperty: function () {
+            return this;
+        },
+
         /**
          * Parsed data
          *
diff --git a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js
index e82d5736824cf..611e89f21b29d 100644
--- a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js
+++ b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js
@@ -1126,8 +1126,9 @@ define([
          * Update whether value differs from default value
          */
         setDifferedFromDefault: function () {
+            var recordData;
             if (this.default) {
-                var recordData = utils.copy(this.recordData());
+                recordData = utils.copy(this.recordData());
 
                 Array.isArray(recordData) && recordData.forEach(function (item) {
                     delete item['record_id'];
diff --git a/lib/web/mage/utils/objects.js b/lib/web/mage/utils/objects.js
index fb585ff2454ca..82866c0f2a6ad 100644
--- a/lib/web/mage/utils/objects.js
+++ b/lib/web/mage/utils/objects.js
@@ -247,7 +247,16 @@ define([
          * @returns {Object|Array} Cloned object.
          */
         copy: function (data) {
-            return _.clone(data)
+            var result = data,
+                isArray = Array.isArray(data),
+                placeholder;
+
+            if (this.isObject(data) || isArray) {
+                placeholder = isArray ? [] : {};
+                result = this.extend(placeholder, data);
+            }
+
+            return result;
         },
 
         /**

From f85d9846a1f79d92051363904950fb63443e13a8 Mon Sep 17 00:00:00 2001
From: Andrii Lugovyi <alugovyi@adobe.com>
Date: Tue, 1 Sep 2020 13:00:29 -0500
Subject: [PATCH 1709/1718] MC-37069: Configurable Products with large
 quantities of children cannot be opened

---
 .../adminhtml/web/js/components/dynamic-rows-configurable.js | 5 +++++
 .../Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js | 1 +
 .../web/js/components/dynamic-rows-configurable.test.js      | 2 --
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js
index 37505b4777359..814b5de71a8f7 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js
@@ -242,6 +242,11 @@ define([
             this.generateAssociatedProducts();
         },
 
+        /**
+         * Set initial property to records data
+         *
+         * @returns {Object} Chainable.
+         */
         setInitialProperty: function () {
             return this;
         },
diff --git a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js
index 611e89f21b29d..0ac35df78e001 100644
--- a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js
+++ b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js
@@ -1127,6 +1127,7 @@ define([
          */
         setDifferedFromDefault: function () {
             var recordData;
+
             if (this.default) {
                 recordData = utils.copy(this.recordData());
 
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.test.js
index 546392d35fe84..a555f8e00a916 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.test.js
@@ -41,11 +41,9 @@ define([
                     })
                 };
 
-            model.getChildItems = jasmine.createSpy().and.returnValue($(''));
             model.source = sourceMock;
             model.processingUnionInsertData(mockData);
             expect(model.source.get).toHaveBeenCalled();
-            expect(model.getChildItems).toHaveBeenCalled();
             expect(expectedData[1].sku).toBe('Conf&-sdfs');
         });
 

From 9bd9ea23367abb2ff9612528931b9c5e567bc071 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Thu, 3 Sep 2020 22:55:37 +0800
Subject: [PATCH 1710/1718] magento/adobe-stock-integration#1796: [MFTF] Unskip
 AdminMediaGalleryUploadCategoryImageTest - reverted previous changes,
 modified selector in section

---
 .../AdminMediaGalleryAssertImageInGridActionGroup.xml          | 3 +--
 ...minOpenMediaGalleryFromCategoryImageUploaderActionGroup.xml | 1 -
 .../Section/AdminEnhancedMediaGalleryImageActionsSection.xml   | 2 +-
 .../Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml     | 1 -
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertImageInGridActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertImageInGridActionGroup.xml
index 6785558c8ef54..fbe3a62d7dbd9 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertImageInGridActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertImageInGridActionGroup.xml
@@ -15,7 +15,6 @@
         <arguments>
             <argument name="title"/>
         </arguments>
-        <waitForElementVisible selector="{{AdminEnhancedMediaGalleryImageActionsSection.imageInGrid(title)}}" stepKey="waitForImageToBeVisible"/>
-
+        <seeElement selector="{{AdminEnhancedMediaGalleryImageActionsSection.imageInGrid(title)}}" stepKey="seeImageInGrid"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup.xml
index b5fac048c5629..89664ef152dba 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup.xml
@@ -16,6 +16,5 @@
         <waitForElementVisible selector="{{AdminCategoryContentSection.selectFromGalleryButton}}" stepKey="waitForSelectFromGallery" />
         <click selector="{{AdminCategoryContentSection.selectFromGalleryButton}}" stepKey="clickSelectFromGallery" />
         <waitForPageLoad stepKey="waitForPageLoad"/>
-        <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 3f13a57697e6f..51bd16ab0cde1 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml
@@ -12,6 +12,6 @@
         <element name="viewDetails" type="button" selector="[data-ui-id='action-image-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"/>
+        <element name="imageInGrid" type="text" selector="//div[@class='masonry-image-description']//ul[@class='media-gallery-image-details']//li[@class='name' and contains(text(), '{{title}}')]" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml
index 1d5df74a92b37..3dd294fa50605 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml
@@ -37,7 +37,6 @@
         <actionGroup ref="AdminSaveCategoryFormActionGroup" stepKey="saveCategoryForm"/>
         <actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGalleryFromImageUploader"/>
         <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
         <actionGroup ref="AdminMediaGalleryAssertImageInGridActionGroup" stepKey="assertImageInGrid">
             <argument name="title" value="ProductImage.filename"/>
         </actionGroup>

From 93407393fa39d6d9454257e34c80bf601a0de60c Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Fri, 4 Sep 2020 02:38:33 +0800
Subject: [PATCH 1711/1718] 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 3cafef5a7c126d49633a6285dde69e5322567844 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Fri, 4 Sep 2020 03:28:53 +0800
Subject: [PATCH 1712/1718] magento/adobe-stock-integration#1796: [MFTF] Unskip
 AdminMediaGalleryUploadCategoryImageTest - used clear filters instead of
 reset view

---
 .../AdminMediaGalleryAssertImageInGridActionGroup.xml         | 2 +-
 .../Section/AdminEnhancedMediaGalleryImageActionsSection.xml  | 2 +-
 .../Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertImageInGridActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertImageInGridActionGroup.xml
index fbe3a62d7dbd9..08c93a805dc70 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertImageInGridActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertImageInGridActionGroup.xml
@@ -15,6 +15,6 @@
         <arguments>
             <argument name="title"/>
         </arguments>
-        <seeElement selector="{{AdminEnhancedMediaGalleryImageActionsSection.imageInGrid(title)}}" stepKey="seeImageInGrid"/>
+        <waitForElementVisible selector="{{AdminEnhancedMediaGalleryImageActionsSection.imageInGrid(title)}}" stepKey="waitForImageToBeVisible"/>
     </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 51bd16ab0cde1..3f13a57697e6f 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml
@@ -12,6 +12,6 @@
         <element name="viewDetails" type="button" selector="[data-ui-id='action-image-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="text" selector="//div[@class='masonry-image-description']//ul[@class='media-gallery-image-details']//li[@class='name' and contains(text(), '{{title}}')]" parameterized="true"/>
+        <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/AdminMediaGalleryUploadCategoryImageTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml
index 3dd294fa50605..6898323fbf4f0 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml
@@ -36,9 +36,9 @@
         <actionGroup ref="AddCategoryImageActionGroup" stepKey="addCategoryImage"/>
         <actionGroup ref="AdminSaveCategoryFormActionGroup" stepKey="saveCategoryForm"/>
         <actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGalleryFromImageUploader"/>
-        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
         <actionGroup ref="AdminMediaGalleryAssertImageInGridActionGroup" stepKey="assertImageInGrid">
-            <argument name="title" value="ProductImage.filename"/>
+            <argument name="title" value="ProductImage.fileName"/>
         </actionGroup>
     </test>
 </tests>

From 4ccd690af521c3688dd108f3ba15c13a29fa4d56 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Fri, 4 Sep 2020 18:56:57 +0800
Subject: [PATCH 1713/1718] magento/adobe-stock-integration#1796: [MFTF] Unskip
 AdminMediaGalleryUploadCategoryImageTest - added reset to default view after
 clearing filters

---
 .../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 6898323fbf4f0..d0ac01bb14b93 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml
@@ -37,6 +37,7 @@
         <actionGroup ref="AdminSaveCategoryFormActionGroup" stepKey="saveCategoryForm"/>
         <actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGalleryFromImageUploader"/>
         <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
         <actionGroup ref="AdminMediaGalleryAssertImageInGridActionGroup" stepKey="assertImageInGrid">
             <argument name="title" value="ProductImage.fileName"/>
         </actionGroup>

From 34d1c12dfc3b2da354fa642188bb03eddc382eff Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Fri, 4 Sep 2020 20:44:12 +0800
Subject: [PATCH 1714/1718] magento/adobe-stock-integration#1796: [MFTF] Unskip
 AdminMediaGalleryUploadCategoryImageTest - added action to open
 catalog/category folder

---
 .../Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml
index d0ac01bb14b93..684db1d4a2627 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml
@@ -37,7 +37,12 @@
         <actionGroup ref="AdminSaveCategoryFormActionGroup" stepKey="saveCategoryForm"/>
         <actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGalleryFromImageUploader"/>
         <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
-        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+        <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectCatalogFolder">
+            <argument name="name" value="catalog"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectCategoryFolder">
+            <argument name="name" value="category"/>
+        </actionGroup>
         <actionGroup ref="AdminMediaGalleryAssertImageInGridActionGroup" stepKey="assertImageInGrid">
             <argument name="title" value="ProductImage.fileName"/>
         </actionGroup>

From 268277ee79b3f8ed5a10a9645671d416342c3dfe Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Fri, 4 Sep 2020 16:52:44 +0300
Subject: [PATCH 1715/1718] change TestCaseId

---
 ...rifySearchButtonDisabledTillMinimumSearchLengthHitTest.xml | 4 ++--
 ...rifySearchButtonEnabledAfterMinimumSearchLengthHitTest.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchButtonDisabledTillMinimumSearchLengthHitTest.xml b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchButtonDisabledTillMinimumSearchLengthHitTest.xml
index 10b086609391f..742807d2c24e2 100644
--- a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchButtonDisabledTillMinimumSearchLengthHitTest.xml
+++ b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchButtonDisabledTillMinimumSearchLengthHitTest.xml
@@ -13,8 +13,8 @@
             <stories value="Search Term Disabled"/>
             <title value="Verify search button is disabled if search term is less than minimum search length"/>
             <description value="Storefront verify search button is disabled if search term is less than minimum search length"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="https://github.com/magento/magento2/issues/29704"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-37380"/>
             <group value="searchFrontend"/>
         </annotations>
 
diff --git a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchButtonEnabledAfterMinimumSearchLengthHitTest.xml b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchButtonEnabledAfterMinimumSearchLengthHitTest.xml
index 79a192798db3e..172fae919623c 100644
--- a/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchButtonEnabledAfterMinimumSearchLengthHitTest.xml
+++ b/app/code/Magento/Search/Test/Mftf/Test/StorefrontVerifySearchButtonEnabledAfterMinimumSearchLengthHitTest.xml
@@ -13,8 +13,8 @@
             <stories value="Search Button Not Disabled"/>
             <title value="Verify search button is not disabled if search term is equal or greater than minimum search length"/>
             <description value="Storefront verify search button is not disabled if search term is equal or greater than minimum search length"/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="https://github.com/magento/magento2/issues/29704"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-37381"/>
             <group value="searchFrontend"/>
         </annotations>
 

From 51eede0ccf24a049849e3b5b114a92a45d4c2234 Mon Sep 17 00:00:00 2001
From: ruslankostiv <rkostiv@adobe.com>
Date: Fri, 4 Sep 2020 16:26:08 -0500
Subject: [PATCH 1716/1718] 208 - [Tests] Broken isolation

---
 .../Annotation/ApiDataFixture.php             |  11 +-
 .../Catalog/Api/CategoryRepositoryTest.php    |  32 ++-
 .../Annotation/AbstractDataFixture.php        |  26 ++-
 .../TestFramework/Annotation/DataFixture.php  |   7 +-
 .../DataFixtureBeforeTransaction.php          |   4 +-
 .../Annotation/TestsIsolation.php             | 194 ++++++++++++++++++
 .../TestFramework/Indexer/TestCase.php        |  23 +++
 .../Test/Annotation/DataFixtureTest.php       |  19 ++
 .../Model/Export/AdvancedPricingTest.php      |  39 +++-
 .../_files/create_products_rollback.php       |  32 +++
 .../product_with_second_website_rollback.php  |  12 ++
 .../product_with_tier_pricing_rollback.php    |   2 +-
 .../Model/Import/Product/Type/BundleTest.php  |  29 +++
 .../Price/_files/products_base_rollback.php   |  17 +-
 .../_files/second_product_simple_rollback.php |   5 +
 .../Catalog/_files/url_rewrites_rollback.php  |   2 +-
 .../Model/Import/ProductTest.php              |  27 +++
 ...s_for_sku_search_weight_score_rollback.php |  11 +-
 .../product_custom_url_key_rollback.php       |  12 --
 .../_files/product_with_category_rollback.php |   2 +
 .../_files/product_with_stores_rollback.php   |   3 +
 .../Controller/Adminhtml/PageDesignTest.php   |  42 +++-
 .../Elasticsearch/_files/indexer_rollback.php |   4 +
 .../product_alert_with_store_rollback.php     |  41 ++++
 ...compared_out_of_stock_product_rollback.php |   2 +-
 ..._disabled_product_by_customer_rollback.php |   3 +
 .../Command/GenerateFixturesCommandTest.php   |   3 +
 .../Setup/Fixtures/FixtureModelTest.php       |   2 +
 ...ore_second_third_fixturestore_rollback.php |  21 ++
 .../Store/_files/second_store_rollback.php    |  23 +++
 .../Magento/Store/_files/store_rollback.php   |  21 ++
 .../Tax/Model/Sales/Total/Quote/TaxTest.php   |  39 +++-
 .../_files/url_rewrite_rollback.php           |   4 +
 .../Wishlist/_files/wishlist_rollback.php     |   3 +
 ...ishlist_with_disabled_product_rollback.php |   7 +-
 ..._with_disabled_simple_product_rollback.php |   9 +
 36 files changed, 680 insertions(+), 53 deletions(-)
 create mode 100644 dev/tests/integration/framework/Magento/TestFramework/Annotation/TestsIsolation.php
 create mode 100644 dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/_files/create_products_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/_files/product_with_second_website_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/ProductAlert/_files/product_alert_with_store_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_simple_product_rollback.php

diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/Annotation/ApiDataFixture.php b/dev/tests/api-functional/framework/Magento/TestFramework/Annotation/ApiDataFixture.php
index d99b056ca359e..59aa2e7c719bf 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/Annotation/ApiDataFixture.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/Annotation/ApiDataFixture.php
@@ -32,15 +32,20 @@ public function startTest(TestCase $test)
     {
         Bootstrap::getInstance()->reinitialize();
         /** Apply method level fixtures if thy are available, apply class level fixtures otherwise */
-        $this->_applyFixtures($this->_getFixtures($test, 'method') ?: $this->_getFixtures($test, 'class'));
+        $this->_applyFixtures(
+            $this->_getFixtures($test, 'method') ?: $this->_getFixtures($test, 'class'),
+            $test
+        );
     }
 
     /**
      * Handler for 'endTest' event
+     *
+     * @param TestCase $test
      */
-    public function endTest()
+    public function endTest(TestCase $test)
     {
-        $this->_revertFixtures();
+        $this->_revertFixtures($test);
         $objectManager = Bootstrap::getObjectManager();
         $objectManager->get(AttributeMetadataCache::class)->clean();
     }
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 21b93645fd15a..461ab6c989104 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryRepositoryTest.php
@@ -43,6 +43,11 @@ class CategoryRepositoryTest extends WebapiAbstract
      */
     private $adminTokens;
 
+    /**
+     * @var string[]
+     */
+    private $createdCategories;
+
     /**
      * @inheritDoc
      */
@@ -132,8 +137,7 @@ public function testCreate()
                 sprintf('"%s" field value is invalid', $fieldName)
             );
         }
-        // delete category to clean up auto-generated url rewrites
-        $this->deleteCategory($result['id']);
+        $this->createdCategories = [$result['id']];
     }
 
     /**
@@ -214,8 +218,7 @@ public function testUpdate()
         $this->assertFalse((bool)$category->getIsActive(), 'Category "is_active" must equal to false');
         $this->assertEquals("Update Category Test", $category->getName());
         $this->assertEquals("Update Category Description Test", $category->getDescription());
-        // delete category to clean up auto-generated url rewrites
-        $this->deleteCategory($categoryId);
+        $this->createdCategories = [$categoryId];
     }
 
     /**
@@ -243,8 +246,7 @@ public function testUpdateWithDefaultSortByAttribute()
         $this->assertTrue((bool)$category->getIsActive(), 'Category "is_active" must equal to true');
         $this->assertEquals("Update Category Test With default_sort_by Attribute", $category->getName());
         $this->assertEquals("name", $category->getDefaultSortBy());
-        // delete category to clean up auto-generated url rewrites
-        $this->deleteCategory($categoryId);
+        $this->createdCategories = [$categoryId];
     }
 
     protected function getSimpleCategoryData($categoryData = [])
@@ -476,5 +478,23 @@ public function testSaveDesign(): void
         }
         //We don't have permissions to do that.
         $this->assertEquals('Not allowed to edit the category\'s design attributes', $exceptionMessage);
+        $this->createdCategories = [$result['id']];
+    }
+
+    /**
+     * @inheritDoc
+     *
+     * @return void
+     */
+    protected function tearDown(): void
+    {
+        if (!empty($this->createdCategories)) {
+            // delete category to clean up auto-generated url rewrites
+            foreach ($this->createdCategories as $categoryId) {
+                $this->deleteCategory($categoryId);
+            }
+        }
+
+        parent::tearDown();
     }
 }
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/AbstractDataFixture.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/AbstractDataFixture.php
index 2f4b7bf79c1d6..9172d7cf857e5 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Annotation/AbstractDataFixture.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Annotation/AbstractDataFixture.php
@@ -7,8 +7,6 @@
 
 namespace Magento\TestFramework\Annotation;
 
-use Magento\Framework\Component\ComponentRegistrarInterface;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 use PHPUnit\Framework\Exception;
 use PHPUnit\Framework\TestCase;
@@ -106,10 +104,18 @@ protected function _applyOneFixture($fixture)
      * Execute fixture scripts if any
      *
      * @param array $fixtures
+     * @param TestCase $test
      * @return void
      */
-    protected function _applyFixtures(array $fixtures)
+    protected function _applyFixtures(array $fixtures, TestCase $test)
     {
+        /** @var \Magento\TestFramework\Annotation\TestsIsolation $testsIsolation */
+        $testsIsolation = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            \Magento\TestFramework\Annotation\TestsIsolation::class
+        );
+        $dbIsolationState = $this->getDbIsolationState($test);
+        $testsIsolation->createDbSnapshot($test, $dbIsolationState);
+
         /* Execute fixture scripts */
         foreach ($fixtures as $oneFixture) {
             $this->_applyOneFixture($oneFixture);
@@ -122,9 +128,10 @@ protected function _applyFixtures(array $fixtures)
     /**
      * Revert changes done by fixtures
      *
+     * @param TestCase|null $test
      * @return void
      */
-    protected function _revertFixtures()
+    protected function _revertFixtures(?TestCase $test = null)
     {
         $resolver = Resolver::getInstance();
         $resolver->setCurrentFixtureType($this->getAnnotation());
@@ -149,13 +156,22 @@ protected function _revertFixtures()
         }
         $this->_appliedFixtures = [];
         $resolver->setCurrentFixtureType(null);
+
+        if (null !== $test) {
+            /** @var \Magento\TestFramework\Annotation\TestsIsolation $testsIsolation */
+            $testsIsolation = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+                \Magento\TestFramework\Annotation\TestsIsolation::class
+            );
+            $dbIsolationState = $this->getDbIsolationState($test);
+            $testsIsolation->checkTestIsolation($test, $dbIsolationState);
+        }
     }
 
     /**
      * Return is explicit set isolation state
      *
      * @param TestCase $test
-     * @return bool|null
+     * @return array|null
      */
     protected function getDbIsolationState(TestCase $test)
     {
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixture.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixture.php
index 02e53fc0a80ed..ffcdc186af520 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixture.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixture.php
@@ -32,7 +32,7 @@ public function startTestTransactionRequest(TestCase $test, Transaction $param):
             if ($this->getDbIsolationState($test) !== ['disabled']) {
                 $param->requestTransactionStart();
             } else {
-                $this->_applyFixtures($fixtures);
+                $this->_applyFixtures($fixtures, $test);
             }
         }
     }
@@ -51,7 +51,7 @@ public function endTestTransactionRequest(TestCase $test, Transaction $param): v
             if ($this->getDbIsolationState($test) !== ['disabled']) {
                 $param->requestTransactionRollback();
             } else {
-                $this->_revertFixtures();
+                $this->_revertFixtures($test);
             }
         }
     }
@@ -64,12 +64,13 @@ public function endTestTransactionRequest(TestCase $test, Transaction $param): v
      */
     public function startTransaction(TestCase $test): void
     {
-        $this->_applyFixtures($this->_getFixtures($test));
+        $this->_applyFixtures($this->_getFixtures($test), $test);
     }
 
     /**
      * Handler for 'rollbackTransaction' event
      *
+     * @param TestCase $test
      * @return void
      */
     public function rollbackTransaction(): void
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixtureBeforeTransaction.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixtureBeforeTransaction.php
index 5685fea44f734..b36aebfd84728 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixtureBeforeTransaction.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixtureBeforeTransaction.php
@@ -24,7 +24,7 @@ public function startTest(TestCase $test)
     {
         $fixtures = $this->_getFixtures($test);
         if ($fixtures) {
-            $this->_applyFixtures($fixtures);
+            $this->_applyFixtures($fixtures, $test);
         }
     }
 
@@ -37,7 +37,7 @@ public function endTest(TestCase $test)
     {
         /* Isolate other tests from test-specific fixtures */
         if ($this->_appliedFixtures && $this->_getFixtures($test)) {
-            $this->_revertFixtures();
+            $this->_revertFixtures($test);
         }
     }
 
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/TestsIsolation.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/TestsIsolation.php
new file mode 100644
index 0000000000000..119ee1013a15c
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Annotation/TestsIsolation.php
@@ -0,0 +1,194 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestFramework\Annotation;
+
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\ResourceConnection;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\AssertionFailedError;
+
+/**
+ * Validates tests isolation. Makes sure that test does not keep exceed data in DB.
+ */
+class TestsIsolation
+{
+    /**
+     * This variable was created to keep initial data cached
+     *
+     * @var array
+     */
+    private $dbTableState = [];
+
+    /**
+     * @var string[]
+     */
+    private $testTypesToCheckIsolation = [
+        'integration',
+    ];
+
+    /**
+     * @var int
+     */
+    private $isolationLevel = 0;
+
+    /**
+     * @var string[]
+     */
+    private $dbStateTables = [
+        'catalog_product_entity',
+        'eav_attribute',
+        'catalog_category_entity',
+        'eav_attribute_set',
+        'store',
+        'store_website',
+        'url_rewrite'
+    ];
+
+    /**
+     * Pull data from specific table
+     *
+     * @param string $table
+     * @return array
+     */
+    private function pullDbState(string $table): array
+    {
+        $resource = ObjectManager::getInstance()->get(ResourceConnection::class);
+        $connection = $resource->getConnection();
+        $select = $connection->select()->from($table);
+        return $connection->fetchAll($select);
+    }
+
+    /**
+     * Create DB snapshot before test run.
+     *
+     * @param TestCase $test
+     * @param array|null $dbIsolationState
+     * @return void
+     */
+    public function createDbSnapshot(TestCase $test, ?array $dbIsolationState): void
+    {
+        if (null !== $dbIsolationState
+            && ($dbIsolationState !== ['enabled'])
+            && ($this->checkIsolationRequired($test))
+        ) {
+            ++$this->isolationLevel;
+            if ($this->isolationLevel === 1) {
+                $this->saveDbStateBeforeTestRun($test);
+            }
+        }
+    }
+
+    /**
+     * Check DB isolation when test ended.
+     *
+     * @param TestCase $test
+     * @param array|null $dbIsolationState
+     * @return void
+     */
+    public function checkTestIsolation(TestCase $test, ?array $dbIsolationState): void
+    {
+        if (null !== $dbIsolationState
+            && ($dbIsolationState !== ['enabled'])
+            && ($this->checkIsolationRequired($test))
+        ) {
+            --$this->isolationLevel;
+            if ($this->isolationLevel === 1) {
+                $this->checkResidualData($test);
+            }
+        }
+    }
+
+    /**
+     * Saving DB snapshot before fixtures applying.
+     *
+     * @param TestCase $test
+     * @return void
+     */
+    private function saveDbStateBeforeTestRun(TestCase $test): void
+    {
+        try {
+            if (empty($this->dbTableState)) {
+                foreach ($this->dbStateTables as $table) {
+                    $this->dbTableState[$table] = $this->pullDbState($table);
+                }
+            }
+        } catch (\Throwable $e) {
+            $test->getTestResultObject()->addFailure($test, new AssertionFailedError($e->getMessage()), 0);
+        }
+    }
+
+    /**
+     * Check if test isolation is required for given scope of tests.
+     *
+     * @param TestCase $test
+     * @return bool
+     */
+    private function checkIsolationRequired(TestCase $test): bool
+    {
+        $isRequired = false;
+        if (!$test->getTestResultObject()) {
+            return $isRequired;
+        }
+
+        $testFilename = $test->getTestResultObject()->topTestSuite()->getName();
+        foreach ($this->testTypesToCheckIsolation as $testType) {
+            if (false !== strpos($testFilename, \sprintf('/dev/tests/%s/', $testType))) {
+                $isRequired = true;
+                break;
+            }
+        }
+
+        return $isRequired;
+    }
+
+    /**
+     * Check if there's residual data in DB after test execution.
+     *
+     * @param TestCase $test
+     * @return void
+     */
+    private function checkResidualData(TestCase $test): void
+    {
+        $isolationProblem = [];
+        foreach ($this->dbTableState as $table => $isolationData) {
+            try {
+                $diff = $this->dataDiff($isolationData, $this->pullDbState($table));
+                if (!empty($diff)) {
+                    $isolationProblem[$table] = $diff;
+                }
+            } catch (\Throwable $e) {
+                $test->getTestResultObject()->addFailure($test, new AssertionFailedError($e->getMessage()), 0);
+            }
+        }
+
+        if (!empty($isolationProblem)) {
+            $test->getTestResultObject()->addFailure(
+                $test,
+                new AssertionFailedError(
+                    "There was a problem with isolation: " . var_export($isolationProblem, true)
+                ),
+                0
+            );
+        }
+    }
+
+    /**
+     * Compare data difference for m-dimensional array
+     *
+     * @param array $dataBefore
+     * @param array $dataAfter
+     * @return array
+     */
+    private function dataDiff(array $dataBefore, array $dataAfter): array
+    {
+        $diff = [];
+        if (count($dataBefore) !== count($dataAfter)) {
+            $diff = \array_slice($dataAfter, count($dataBefore));
+        }
+
+        return $diff;
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Indexer/TestCase.php b/dev/tests/integration/framework/Magento/TestFramework/Indexer/TestCase.php
index b9a481e97c9a3..3360fa4342a5a 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Indexer/TestCase.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Indexer/TestCase.php
@@ -7,7 +7,30 @@
 
 class TestCase extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var bool
+     */
+    protected static $dbRestored = false;
+
+    /**
+     * @inheritDoc
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @return void
+     */
     public static function tearDownAfterClass(): void
+    {
+        if (empty(static::$dbRestored)) {
+            self::restoreFromDb();
+        }
+    }
+
+    /**
+     * Restore DB data after test execution.
+     *
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    protected static function restoreFromDb(): void
     {
         $db = \Magento\TestFramework\Helper\Bootstrap::getInstance()->getBootstrap()
             ->getApplication()
diff --git a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/DataFixtureTest.php b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/DataFixtureTest.php
index b3cfc2ae4fe79..3abe6ea4e061d 100644
--- a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/DataFixtureTest.php
+++ b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/DataFixtureTest.php
@@ -8,10 +8,12 @@
 namespace Magento\Test\Annotation;
 
 use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\TestFramework\Annotation\DataFixture;
 use Magento\TestFramework\Event\Param\Transaction;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 use PHPUnit\Framework\TestCase;
+use Magento\TestFramework\Annotation\TestsIsolation;
 
 /**
  * Test class for \Magento\TestFramework\Annotation\DataFixture.
@@ -25,6 +27,11 @@ class DataFixtureTest extends TestCase
      */
     protected $object;
 
+    /**
+     * @var TestsIsolation|\PHPUnit\Framework\MockObject\MockObject
+     */
+    protected $testsIsolationMock;
+
     /**
      * @inheritdoc
      */
@@ -33,6 +40,18 @@ protected function setUp(): void
         $this->object = $this->getMockBuilder(DataFixture::class)
             ->setMethods(['_applyOneFixture', 'getComponentRegistrar', 'getTestKey'])
             ->getMock();
+        $this->testsIsolationMock = $this->getMockBuilder(TestsIsolation::class)
+            ->setMethods(['createDbSnapshot', 'checkTestIsolation'])
+            ->getMock();
+        /** @var ObjectManagerInterface|\PHPUnit\Framework\MockObject\MockObject $objectManager */
+        $objectManager = $this->getMockBuilder(ObjectManagerInterface::class)
+            ->setMethods(['get'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $objectManager->expects($this->atLeastOnce())->method('get')->with(TestsIsolation::class)
+            ->willReturn($this->testsIsolationMock);
+        \Magento\TestFramework\Helper\Bootstrap::setObjectManager($objectManager);
+
         $directory = __DIR__;
         if (!defined('INTEGRATION_TESTS_DIR')) {
             define('INTEGRATION_TESTS_DIR', dirname($directory, 4));
diff --git a/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricingTest.php b/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricingTest.php
index 1ce2b01b10212..f6b8a06d2e16f 100644
--- a/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricingTest.php
+++ b/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricingTest.php
@@ -7,6 +7,7 @@
 namespace Magento\AdvancedPricingImportExport\Model\Export;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\File\Csv;
 use Magento\TestFramework\Indexer\TestCase;
 use Magento\TestFramework\Helper\Bootstrap;
@@ -103,6 +104,8 @@ public function testExport()
             $this->assertEquals(count($origPricingData[$index]), count($newPricingData));
             $this->assertEqualsOtherThanSkippedAttributes($origPricingData[$index], $newPricingData, []);
         }
+
+        $this->removeImportedProducts($skus);
     }
 
     /**
@@ -163,6 +166,7 @@ public function testExportMultipleWebsites()
             $this->assertEquals(count($origPricingData[$index]), count($newPricingData));
             $this->assertEqualsOtherThanSkippedAttributes($origPricingData[$index], $newPricingData, []);
         }
+        $this->removeImportedProducts($skus);
     }
 
     /**
@@ -173,14 +177,16 @@ public function testExportMultipleWebsites()
      */
     public function testExportImportOfAdvancedPricing(): void
     {
+        $simpleSku = 'simple';
+        $secondSimpleSku = 'second_simple';
         $csvfile = uniqid('importexport_') . '.csv';
         $exportContent = $this->exportData($csvfile);
         $this->assertStringContainsString(
-            'second_simple,"All Websites [USD]","ALL GROUPS",10.0000,3.00,Discount',
+            \sprintf('%s,"All Websites [USD]","ALL GROUPS",10.0000,3.00,Discount', $secondSimpleSku),
             $exportContent
         );
         $this->assertStringContainsString(
-            'simple,"All Websites [USD]",General,5.0000,95.000000,Fixed',
+            \sprintf('%s,"All Websites [USD]",General,5.0000,95.000000,Fixed', $simpleSku),
             $exportContent
         );
         $this->updateTierPriceDataInCsv($csvfile);
@@ -224,6 +230,8 @@ public function testExportImportOfAdvancedPricing(): void
             ],
             0.1
         );
+
+        $this->removeImportedProducts([$simpleSku, $secondSimpleSku]);
     }
 
     /**
@@ -331,4 +339,31 @@ private function assertEqualsOtherThanSkippedAttributes($expected, $actual, $ski
             }
         }
     }
+
+    /**
+     * Cleanup test by removing imported product.
+     *
+     * @param string[] $skus
+     * @return void
+     */
+    private function removeImportedProducts(array $skus): void
+    {
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        $registry = $this->objectManager->get(\Magento\Framework\Registry::class);
+        /** @var ProductRepositoryInterface $productRepository */
+        $registry->unregister('isSecureArea');
+        $registry->register('isSecureArea', true);
+
+        foreach ($skus as $sku) {
+            try {
+                $productRepository->deleteById($sku);
+            } catch (NoSuchEntityException $e) {
+                // product already deleted
+            }
+        }
+
+        $registry->unregister('isSecureArea');
+        $registry->register('isSecureArea', false);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/_files/create_products_rollback.php b/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/_files/create_products_rollback.php
new file mode 100644
index 0000000000000..a814a7faea34b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/_files/create_products_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\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var ObjectManagerInterface $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/**
+ * @var Product $productModel
+ * @var ProductRepositoryInterface $productRepository
+ */
+$productModel = $objectManager->create(Product::class);
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+$skus = ['AdvancedPricingSimple 1', 'AdvancedPricingSimple 2'];
+foreach ($skus as $sku) {
+    try {
+        $product = $productRepository->getById($sku);
+        $productRepository->delete($product);
+    } catch (NoSuchEntityException $exception) {
+        // product already removed
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/_files/product_with_second_website_rollback.php b/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/_files/product_with_second_website_rollback.php
new file mode 100644
index 0000000000000..c5678d3fdab4a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/_files/product_with_second_website_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/Store/_files/website_rollback.php');
+Resolver::getInstance()->requireDataFixture('Magento/AdvancedPricingImportExport/_files/create_products_rollback.php');
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_tier_pricing_rollback.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_tier_pricing_rollback.php
index 513c1fff62fb6..fc33758a9d01d 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_tier_pricing_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_tier_pricing_rollback.php
@@ -13,7 +13,7 @@
  * bundled items should not contain products with required custom options.
  * However, if to create such a bundle product, it will be always out of stock.
  */
-Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/products.php');
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/products_rollback.php');
 
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 /** @var \Magento\Framework\Registry $registry */
diff --git a/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Import/Product/Type/BundleTest.php b/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Import/Product/Type/BundleTest.php
index 361ceed5c02fe..89fe02f3dbc6c 100644
--- a/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Import/Product/Type/BundleTest.php
+++ b/dev/tests/integration/testsuite/Magento/BundleImportExport/Model/Import/Product/Type/BundleTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\BundleImportExport\Model\Import\Product\Type;
 
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Framework\App\Filesystem\DirectoryList;
 
@@ -34,6 +36,11 @@ class BundleTest extends \Magento\TestFramework\Indexer\TestCase
      */
     protected $objectManager;
 
+    /**
+     * @var string[]
+     */
+    private $importedProductSkus;
+
     /**
      * List of Bundle options SKU
      *
@@ -131,6 +138,7 @@ public function testBundleImport()
                 }
             }
         }
+        $this->importedProductSkus = ['Simple 1', 'Simple 2', 'Simple 3', 'Bundle 1'];
     }
 
     /**
@@ -192,6 +200,7 @@ public function testBundleImportWithMultipleStoreViews(): void
                 }
             }
         }
+        $this->importedProductSkus = ['Simple 1', 'Simple 2', 'Simple 3', 'Bundle 1'];
     }
 
     /**
@@ -199,6 +208,26 @@ public function testBundleImportWithMultipleStoreViews(): void
      */
     protected function tearDown(): void
     {
+        if (!empty($this->importedProductSkus)) {
+            $objectManager = Bootstrap::getObjectManager();
+            /** @var ProductRepositoryInterface $productRepository */
+            $productRepository = $objectManager->create(ProductRepositoryInterface::class);
+            $registry = $objectManager->get(\Magento\Framework\Registry::class);
+            /** @var ProductRepositoryInterface $productRepository */
+            $registry->unregister('isSecureArea');
+            $registry->register('isSecureArea', true);
+
+            foreach ($this->importedProductSkus as $sku) {
+                try {
+                    $productRepository->deleteById($sku);
+                } catch (NoSuchEntityException $e) {
+                    // product already deleted
+                }
+            }
+            $registry->unregister('isSecureArea');
+            $registry->register('isSecureArea', false);
+        }
+
         parent::tearDown();
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/_files/products_base_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/_files/products_base_rollback.php
index 67bdb3d5c5e59..4515297fd1e8a 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/_files/products_base_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/_files/products_base_rollback.php
@@ -44,15 +44,6 @@
 
 $lastProductId = 0;
 foreach ($testCases as $index => $testCase) {
-    $category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-        \Magento\Catalog\Model\Category::class
-    );
-    $position = $index + 1;
-    $categoryId = $index + 4;
-    $category->load($categoryId);
-    if ($category->getId()) {
-        $category->delete();
-    }
 
     /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
     $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
@@ -74,3 +65,11 @@
         ++$lastProductId;
     }
 }
+
+/** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $collection */
+$collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Catalog\Model\ResourceModel\Category\Collection::class);
+$collection
+    ->addAttributeToFilter('level', ['in' => [2, 3, 4]])
+    ->load()
+    ->delete();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/second_product_simple_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/second_product_simple_rollback.php
index b045bfe4f6977..09e13c381aaed 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/second_product_simple_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/second_product_simple_rollback.php
@@ -9,6 +9,7 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Registry;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\UrlRewrite\Model\UrlRewrite;
 
 $objectManager = Bootstrap::getObjectManager();
 /** @var Registry $registry */
@@ -26,5 +27,9 @@
     //Product already removed
 }
 
+$urlRewrite = $objectManager->create(UrlRewrite::class);
+$urlRewrite->load('simple2.html', 'request_path');
+$urlRewrite->delete();
+
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/url_rewrites_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/url_rewrites_rollback.php
index 1fa44427b3fbe..f671c43004ffa 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/url_rewrites_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/url_rewrites_rollback.php
@@ -25,7 +25,7 @@
 $collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
     ->create(\Magento\Catalog\Model\ResourceModel\Category\Collection::class);
 $collection
-    ->addAttributeToFilter('level', 2)
+    ->addAttributeToFilter('name', ['in' => ['Old Root', 'Category 2', 'Category 1']])
     ->load()
     ->delete();
 
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 4502501da4f4f..a9699ea4a8050 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
@@ -1815,6 +1815,9 @@ public function testExistingProductWithUrlKeys()
             'simple2' => 'url-key2',
             'simple3' => 'url-key3'
         ];
+        // added by _files/products_to_import_with_valid_url_keys.csv
+        $this->importedProducts[] = 'simple3';
+
         $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->create(\Magento\Framework\Filesystem::class);
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
@@ -1855,6 +1858,9 @@ public function testAddUpdateProductWithInvalidUrlKeys() : void
             'simple2' => 'normal-url',
             'simple3' => 'some!wrong\'url'
         ];
+        // added by _files/products_to_import_with_invalid_url_keys.csv
+        $this->importedProducts[] = 'simple3';
+
         $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->create(\Magento\Framework\Filesystem::class);
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
@@ -2004,6 +2010,9 @@ public function testImportWithoutUrlKeys()
             'simple2' => 'simple-2',
             'simple3' => 'simple-3'
         ];
+        // added by _files/products_to_import_without_url_keys.csv
+        $this->importedProducts[] = 'simple3';
+
         $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
         $directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
         $source = $this->objectManager->create(
@@ -2221,11 +2230,15 @@ function (ProductInterface $item) {
         $registry->register('isSecureArea', true);
 
         $productSkuList = ['simple1', 'simple2', 'simple3'];
+        $categoryIds = [];
         foreach ($productSkuList as $sku) {
             try {
+                /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
                 $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
                     ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+                /** @var \Magento\Catalog\Model\Product $product */
                 $product = $productRepository->get($sku, true);
+                $categoryIds[] = $product->getCategoryIds();
                 if ($product->getId()) {
                     $productRepository->delete($product);
                 }
@@ -2235,6 +2248,14 @@ function (ProductInterface $item) {
             }
         }
 
+        /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $collection */
+        $collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create(\Magento\Catalog\Model\ResourceModel\Category\Collection::class);
+        $collection
+            ->addAttributeToFilter('entity_id', ['in' => \array_unique(\array_merge(...$categoryIds))])
+            ->load()
+            ->delete();
+
         $registry->unregister('isSecureArea');
         $registry->register('isSecureArea', false);
     }
@@ -3169,6 +3190,12 @@ public function testEmptyAttributeValueShouldBeIgnoredAfterUpdateProductByImport
      */
     public function testCheckDoubleImportOfProducts()
     {
+        $this->importedProducts = [
+            'simple1',
+            'simple2',
+            'simple3',
+        ];
+
         /** @var SearchCriteria $searchCriteria */
         $searchCriteria = $this->searchCriteriaBuilder->create();
 
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/products_for_sku_search_weight_score_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/products_for_sku_search_weight_score_rollback.php
index 775d405654fdf..3622cecb7143d 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/products_for_sku_search_weight_score_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/products_for_sku_search_weight_score_rollback.php
@@ -18,7 +18,16 @@
 $productRepository = $objectManager->create(ProductRepositoryInterface::class);
 /** @var Registry $registry */
 $registry = $objectManager->get(Registry::class);
-$productSkus = ['1234-1234-1234-1234', 'Simple', 'product_with_description', 'product_with_attribute'];
+$productSkus = [
+    '1234-1234-1234-1234',
+    'Simple',
+    'product_with_description',
+    'product_with_attribute',
+    'nintendo-wii',
+    'xbox',
+    'console_description',
+    'gamecube_attribute',
+];
 
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Fixtures/product_custom_url_key_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Fixtures/product_custom_url_key_rollback.php
index 78b4f5ec238df..25fe62b91c6da 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Fixtures/product_custom_url_key_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Fixtures/product_custom_url_key_rollback.php
@@ -5,18 +5,6 @@
  */
 declare(strict_types=1);
 
-use Magento\Framework\Registry;
-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);
-
 Resolver::getInstance()->requireDataFixture('Magento/CatalogUrlRewrite/_files/product_with_category_rollback.php');
-
-$registry->unregister('isSecureArea');
-$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_with_category_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_with_category_rollback.php
index 6be7354911654..fab5b173625d3 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_with_category_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_with_category_rollback.php
@@ -46,6 +46,8 @@
 $urlRewrite = $objectManager->create(UrlRewrite::class);
 $urlRewrite->load('non-exist-product.html', 'request_path');
 $urlRewrite->delete();
+$urlRewrite->load('.html', 'request_path');
+$urlRewrite->delete();
 
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_with_stores_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_with_stores_rollback.php
index 86f0ce34af00c..6b7d4072ead9a 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_with_stores_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/_files/product_with_stores_rollback.php
@@ -6,9 +6,12 @@
 declare(strict_types=1);
 
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
 \Magento\TestFramework\Helper\Bootstrap::getInstance()->getInstance()->reinitialize();
 
+Resolver::getInstance()->requireDataFixture('Magento/CatalogUrlRewrite/_files/categories_with_stores_rollback.php');
+
 /** @var \Magento\Framework\Registry $registry */
 $registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
 
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/PageDesignTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/PageDesignTest.php
index de1a78c87953c..9f8a620b8d2a5 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/PageDesignTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Controller/Adminhtml/PageDesignTest.php
@@ -11,18 +11,21 @@
 use Magento\Cms\Api\Data\PageInterface;
 use Magento\Cms\Api\GetPageByIdentifierInterface;
 use Magento\Cms\Model\Page;
-use Magento\Cms\Model\PageFactory;
 use Magento\Framework\Acl\Builder;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Request\Http as HttpRequest;
 use Magento\Framework\Message\MessageInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\AbstractBackendController;
+use Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollection;
+use Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollectionFactory;
+use Magento\UrlRewrite\Model\UrlRewrite;
 
 /**
  * Test the saving CMS pages design via admin area interface.
  *
  * @magentoAppArea adminhtml
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class PageDesignTest extends AbstractBackendController
 {
@@ -77,6 +80,7 @@ protected function setUp(): void
         $this->aclBuilder = Bootstrap::getObjectManager()->get(Builder::class);
         $this->pageRetriever = Bootstrap::getObjectManager()->get(GetPageByIdentifierInterface::class);
         $this->scopeConfig = Bootstrap::getObjectManager()->get(ScopeConfigInterface::class);
+        $this->pagesToDelete = [];
     }
 
     /**
@@ -86,11 +90,40 @@ protected function tearDown(): void
     {
         parent::tearDown();
 
+        $pageIds = [];
         foreach ($this->pagesToDelete as $identifier) {
-            $page = $this->pageRetriever->execute($identifier);
+            $pageIds[] = $identifier;
+            $page = $this->pageRetriever->execute($identifier, 0);
             $page->delete();
         }
-        $this->pagesToDelete = [];
+        $this->removeUrlRewrites();
+    }
+
+    /**
+     * Removes url rewrites created during test execution.
+     *
+     * @return void
+     */
+    private function removeUrlRewrites(): void
+    {
+        if (!empty($this->pagesToDelete)) {
+            /** @var UrlRewriteCollectionFactory $urlRewriteCollectionFactory */
+            $urlRewriteCollectionFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+                UrlRewriteCollectionFactory::class
+            );
+            /** @var UrlRewriteCollection $urlRewriteCollection */
+            $urlRewriteCollection = $urlRewriteCollectionFactory->create();
+            $urlRewriteCollection->addFieldToFilter('request_path', ['in' => $this->pagesToDelete]);
+            $urlRewrites = $urlRewriteCollection->getItems();
+            /** @var UrlRewrite $urlRewrite */
+            foreach ($urlRewrites as $urlRewrite) {
+                try {
+                    $urlRewrite->delete();
+                } catch (\Exception $exception) {
+                    // already removed
+                }
+            }
+        }
     }
 
     /**
@@ -150,6 +183,7 @@ public function testSaveDesign(): void
             self::equalTo($sessionMessages),
             MessageInterface::TYPE_ERROR
         );
+        $this->pagesToDelete = [$id];
     }
 
     /**
@@ -181,6 +215,7 @@ public function testSaveDesignWithDefaults(): void
         $this->assertNotEmpty($page->getId());
         $this->assertNotNull($page->getPageLayout());
         $this->assertEquals($defaultLayout, $page->getPageLayout());
+        $this->pagesToDelete = [$id];
     }
 
     /**
@@ -227,5 +262,6 @@ public function testSaveLayoutXml(): void
         $updated = $this->pageRetriever->execute('test_custom_layout_page_1', 0);
         $this->assertEmpty($updated->getCustomLayoutUpdateXml());
         $this->assertEmpty($updated->getLayoutUpdateXml());
+        $this->pagesToDelete = ['test_custom_layout_page_1'];
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/indexer_rollback.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/indexer_rollback.php
index 9ca4f78660b3a..a97faa29a1588 100644
--- a/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/indexer_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/indexer_rollback.php
@@ -4,6 +4,10 @@
  * 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();
 
diff --git a/dev/tests/integration/testsuite/Magento/ProductAlert/_files/product_alert_with_store_rollback.php b/dev/tests/integration/testsuite/Magento/ProductAlert/_files/product_alert_with_store_rollback.php
new file mode 100644
index 0000000000000..59aa4bda3872a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ProductAlert/_files/product_alert_with_store_rollback.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Customer\Model\CustomerRegistry;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_for_second_store_rollback.php');
+Resolver::getInstance()->requireDataFixture(
+    'Magento/Catalog/_files/product_simple_out_of_stock_without_categories_rollback.php'
+);
+
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var CustomerRegistry $customerRegistry */
+$customerRegistry = Bootstrap::getObjectManager()->create(CustomerRegistry::class);
+$customer = $customerRegistry->remove(1);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+try {
+    $product = $productRepository->deleteById('simple');
+} catch (\Exception $e) {
+    // product already removed
+}
+/** @var Magento\Store\Model\Store $store */
+$store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Store\Model\Store::class);
+$store->load('fixture_second_store');
+if ($store->getId()) {
+    $store->delete();
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
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');
diff --git a/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_disabled_product_by_customer_rollback.php b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_disabled_product_by_customer_rollback.php
index f3dedf0a35d96..5c5ad143ac77f 100644
--- a/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_disabled_product_by_customer_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_disabled_product_by_customer_rollback.php
@@ -43,3 +43,6 @@
     $session->logout();
     $config->setValue('reports/options/enabled', $originalValue);
 }
+
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/second_product_simple_rollback.php');
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_rollback.php');
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/GenerateFixturesCommandTest.php b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/GenerateFixturesCommandTest.php
index 3ec185e71a1e5..355239f9dc2e7 100644
--- a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/GenerateFixturesCommandTest.php
+++ b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/GenerateFixturesCommandTest.php
@@ -87,6 +87,9 @@ protected function tearDown(): void
     {
         $this->setIncrement(1);
 
+        self::restoreFromDb();
+        self::$dbRestored = true;
+
         parent::tearDown();
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Fixtures/FixtureModelTest.php b/dev/tests/integration/testsuite/Magento/Setup/Fixtures/FixtureModelTest.php
index 2829cffd8d8a7..10e5cf40bd500 100644
--- a/dev/tests/integration/testsuite/Magento/Setup/Fixtures/FixtureModelTest.php
+++ b/dev/tests/integration/testsuite/Magento/Setup/Fixtures/FixtureModelTest.php
@@ -75,6 +75,8 @@ protected function tearDown(): void
             $indexer = $this->indexerRegistry->get($indexerId);
             $indexer->setScheduled($state);
         }
+        self::restoreFromDb();
+        self::$dbRestored = true;
     }
 
     public static function setUpBeforeClass(): void
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/core_second_third_fixturestore_rollback.php b/dev/tests/integration/testsuite/Magento/Store/_files/core_second_third_fixturestore_rollback.php
index 19d064bb79834..0ccfdf0af5c94 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/core_second_third_fixturestore_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/core_second_third_fixturestore_rollback.php
@@ -3,8 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 declare(strict_types=1);
 
+use Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollection;
+use Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollectionFactory;
+use Magento\UrlRewrite\Model\UrlRewrite;
+
 /** @var \Magento\Framework\Registry $registry */
 $registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
 
@@ -33,5 +38,21 @@
     $store->delete();
 }
 
+$urlRewriteCollectionFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+    UrlRewriteCollectionFactory::class
+);
+/** @var UrlRewriteCollection $urlRewriteCollection */
+$urlRewriteCollection = $urlRewriteCollectionFactory->create();
+$urlRewriteCollection->addFieldToFilter('store_id', ['gt' => 1]);
+$urlRewrites = $urlRewriteCollection->getItems();
+/** @var UrlRewrite $urlRewrite */
+foreach ($urlRewrites as $urlRewrite) {
+    try {
+        $urlRewrite->delete();
+    } catch (\Exception $exception) {
+        // already removed
+    }
+}
+
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/second_store_rollback.php b/dev/tests/integration/testsuite/Magento/Store/_files/second_store_rollback.php
index 56ba31fad4ed2..a434321189015 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/second_store_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/second_store_rollback.php
@@ -4,6 +4,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+use Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollection;
+use Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollectionFactory;
+use Magento\UrlRewrite\Model\UrlRewrite;
+
 /** @var \Magento\Framework\Registry $registry */
 $registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
 
@@ -15,6 +20,24 @@
 $store->load('fixture_second_store');
 
 if ($store->getId()) {
+    $storeId = $store->getId();
+
+    $urlRewriteCollectionFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        UrlRewriteCollectionFactory::class
+    );
+    /** @var UrlRewriteCollection $urlRewriteCollection */
+    $urlRewriteCollection = $urlRewriteCollectionFactory->create();
+    $urlRewriteCollection->addFieldToFilter('store_id', ['eq' => $storeId]);
+    $urlRewrites = $urlRewriteCollection->getItems();
+    /** @var UrlRewrite $urlRewrite */
+    foreach ($urlRewrites as $urlRewrite) {
+        try {
+            $urlRewrite->delete();
+        } catch (\Exception $exception) {
+            // already removed
+        }
+    }
+
     $store->delete();
 }
 
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/store_rollback.php b/dev/tests/integration/testsuite/Magento/Store/_files/store_rollback.php
index 8289244d6581a..fa7d18124fdf1 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/store_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/store_rollback.php
@@ -7,6 +7,9 @@
 use Magento\Framework\Registry;
 use Magento\Store\Model\Store;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollection;
+use Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollectionFactory;
+use Magento\UrlRewrite\Model\ResourceModel\UrlRewrite;
 
 $objectManager = Bootstrap::getObjectManager();
 
@@ -29,5 +32,23 @@
     $store->delete();
 }
 
+/** @var UrlRewriteCollectionFactory $urlRewriteCollectionFactory */
+$urlRewriteCollectionFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+    UrlRewriteCollectionFactory::class
+);
+/** @var UrlRewriteCollection $urlRewriteCollection */
+$urlRewriteCollection = $urlRewriteCollectionFactory->create();
+$urlRewriteCollection
+    ->addFieldToFilter('store_id', ['nin' => [0, 1]]);
+$urlRewrites = $urlRewriteCollection->getItems();
+/** @var UrlRewrite $urlRewrite */
+foreach ($urlRewrites as $urlRewrite) {
+    try {
+        $urlRewrite->delete();
+    } catch (\Exception $exception) {
+        // already removed
+    }
+}
+
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php b/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
index 96fc92c3c0ca5..a119b6259b5f6 100644
--- a/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
+++ b/dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
@@ -5,8 +5,9 @@
  */
 namespace Magento\Tax\Model\Sales\Total\Quote;
 
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Quote\Model\Quote\TotalsCollector;
-use Magento\Tax\Model\Calculation;
 use Magento\TestFramework\Helper\Bootstrap;
 
 require_once __DIR__ . '/SetupUtil.php';
@@ -15,6 +16,9 @@
 
 /**
  * Class TaxTest
+ *
+ * Tests sales taxes with discounts/price rules during checkout.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class TaxTest extends \Magento\TestFramework\Indexer\TestCase
@@ -302,6 +306,11 @@ public function testTaxCalculation($configData, $quoteData, $expectedResults)
         $quoteAddress = $quote->getShippingAddress();
         $this->totalsCollector->collectAddressTotals($quote, $quoteAddress);
         $this->verifyResult($quoteAddress, $expectedResults);
+
+        $skus = array_map(function ($item) {
+            return $item['sku'];
+        }, $quoteData['items'] ?? []);
+        $this->removeProducts($skus);
     }
 
     /**
@@ -315,4 +324,32 @@ public function taxDataProvider()
         global $taxCalculationData;
         return $taxCalculationData;
     }
+
+    /**
+     * Cleanup test by removing products.
+     *
+     * @param string[] $skus
+     * @return void
+     */
+    private function removeProducts(array $skus): void
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $objectManager->create(ProductRepositoryInterface::class);
+        $registry = $objectManager->get(\Magento\Framework\Registry::class);
+        /** @var ProductRepositoryInterface $productRepository */
+        $registry->unregister('isSecureArea');
+        $registry->register('isSecureArea', true);
+
+        foreach ($skus as $sku) {
+            try {
+                $productRepository->deleteById($sku);
+            } catch (NoSuchEntityException $e) {
+                // product already deleted
+            }
+        }
+
+        $registry->unregister('isSecureArea');
+        $registry->register('isSecureArea', false);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrite_rollback.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrite_rollback.php
index 4d2c148141943..d8bf0e6bfb731 100644
--- a/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrite_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrite_rollback.php
@@ -5,9 +5,13 @@
  */
 declare(strict_types=1);
 
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
 /** @var \Magento\Framework\Registry $registry */
 $registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
 
+Resolver::getInstance()->requireDataFixture('Magento/Store/_files/second_store_rollback.php');
+
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_rollback.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_rollback.php
index ee47961dec55b..ac1d846563188 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_rollback.php
@@ -7,6 +7,9 @@
 
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/product_simple_rollback.php');
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_rollback.php');
+
 /** @var \Magento\Framework\ObjectManagerInterface $objectManager */
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_product_rollback.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_product_rollback.php
index 665644cd9b6db..9e46bc60b9a79 100644
--- a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_product_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_product_rollback.php
@@ -13,6 +13,10 @@
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
 $objectManager = Bootstrap::getObjectManager();
+
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/simple_product_disabled_rollback.php');
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_rollback.php');
+
 /** @var Registry $registry */
 $registry = $objectManager->get(Registry::class);
 /** @var WishlistResource $wishListResource */
@@ -28,6 +32,3 @@
 
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
-
-Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/simple_product_disabled.php');
-Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_rollback.php');
diff --git a/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_simple_product_rollback.php b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_simple_product_rollback.php
new file mode 100644
index 0000000000000..8ce2f4b64d851
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Wishlist/_files/wishlist_with_disabled_simple_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/Wishlist/_files/wishlist_rollback.php');

From 76be389da9608ce7cf5bfa4f8e618d05e5b82a4d 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 1717/1718] 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 4ffadc9f30ffcf3a52ea5a057294e9e1ed7cc6c9 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 1718/1718] 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(